Replace Mirror Move with Scald

mueisme · Jun 29, 2016 · 7f27806 · 7f27806
1 parent 373172e
commit 7f27806
Show file tree

Hide file tree

Showing 18 changed files with 51 additions and 46 deletions.
diff --git a/README.md b/README.md
@@ -295,6 +295,7 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
    * Better Substitute sprites
    * Low-pitched cries when fainting
    * Big roofs like Pewter Museum on Silph Co. and Pokémon Tower
+   * Goldenrod Dept.Store and Celadon Mansion roofs should have dark sky at night
    * Add Young Couple and Double Team trainer classes
    * Add female Schoolkids? (replace Schoolboys)
    * Add river to Route 46 from HGSS

diff --git a/battle/anims.asm b/battle/anims.asm
@@ -118,7 +118,7 @@ BattleAnimations:: ; c906f
 	dw BattleAnim_FocusEnergy
 	dw BattleAnim_FlashCannon
 	dw BattleAnim_Metronome
-	dw BattleAnim_MirrorMove
+	dw BattleAnim_Scald
 	dw BattleAnim_Selfdestruct
 	dw BattleAnim_EggBomb
 	dw BattleAnim_Lick
@@ -281,7 +281,6 @@ BattleAnimations:: ; c906f
 ; c929b
 
 BattleAnim_0: ; c929b
-BattleAnim_MirrorMove: ; c929b
 	anim_ret
 ; c929c
 
@@ -329,6 +328,19 @@ BattleAnim_DisarmVoice:
 	anim_wait 64
 	anim_ret
 
+BattleAnim_Scald:
+; TODO: write an original animation
+	anim_1gfx ANIM_GFX_BUBBLE
+	anim_bgeffect ANIM_BG_SURF, $0, $0, $0
+	anim_obj ANIM_OBJ_22,  11, 0,  13, 0, $8
+.loop
+	anim_sound 0, 1, SFX_SURF
+	anim_wait 32
+	anim_loop 4, .loop
+	anim_incobj  1
+	anim_wait 56
+	anim_ret
+
 BattleAnim_SweetScent2:
 	anim_2gfx ANIM_GFX_FLOWER, ANIM_GFX_MISC
 	anim_obj ANIM_OBJ_FLOWER,   8, 0,  12, 0, $2

diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
@@ -209,12 +209,14 @@ CheckPlayerTurn:
 	bit FRZ, [hl]
 	jr z, .not_frozen
 
-	; Flame Wheel, Sacred Fire, and Flare Blitz thaw the user.
+	; Flame Wheel, Sacred Fire, Scald, and Flare Blitz thaw the user.
 	ld a, [CurPlayerMove]
 	cp FLAME_WHEEL
 	jr z, .not_frozen
 	cp SACRED_FIRE
 	jr z, .not_frozen
+	cp SCALD
+	jr z, .not_frozen
 	cp FLARE_BLITZ
 	jr z, .not_frozen
 
@@ -455,12 +457,14 @@ CheckEnemyTurn: ; 3421f
 	ld hl, EnemyMonStatus
 	bit FRZ, [hl]
 	jr z, .not_frozen
-	; Flame Wheel, Sacred Fire, and Flare Blitz thaw the user.
+	; Flame Wheel, Sacred Fire, Scald, and Flare Blitz thaw the user.
 	ld a, [CurEnemyMove]
 	cp FLAME_WHEEL
 	jr z, .not_frozen
 	cp SACRED_FIRE
 	jr z, .not_frozen
+	cp SCALD
+	jr z, .not_frozen
 	cp FLARE_BLITZ
 	jr z, .not_frozen
 
@@ -3910,8 +3914,6 @@ BattleCommand_Encore: ; 35864
 	jp z, .failed
 	cp ENCORE
 	jp z, .failed
-	cp MIRROR_MOVE
-	jp z, .failed
 	ld b, a
 
 .got_move

diff --git a/battle/move_names.asm b/battle/move_names.asm
@@ -116,7 +116,7 @@
 	db "Focus Energy@"
 	db "Flash Cannon@"
 	db "Metronome@"
-	db "Mirror Move@"
+	db "Scald@"
 	db "SelfDestruct@"
 	db "Egg Bomb@"
 	db "Lick@"

diff --git a/battle/moves/move_descriptions.asm b/battle/moves/move_descriptions.asm
@@ -117,7 +117,7 @@
 	dw FocusEnergyDescription
 	dw FlashCannonDescription
 	dw MetronomeDescription
-	dw MirrorMoveDescription
+	dw ScaldDescription
 	dw SelfdestructDescription
 	dw EggBombDescription
 	dw LickDescription
@@ -336,6 +336,7 @@ FlamethrowerDescription:
 FireBlastDescription:
 FlameWheelDescription:
 SacredFireDescription:
+ScaldDescription:
 	db   "An attack that may"
 	next "inflict a burn.@"
 
@@ -744,10 +745,6 @@ MetronomeDescription:
 	db   "Randomly uses any"
 	next "#mon move.@"
 
-MirrorMoveDescription:
-	db   "Counters with the"
-	next "same move.@"
-
 SelfdestructDescription:
 	db   "Powerful but makes"
 	next "the user faint.@"

diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm
@@ -1218,13 +1218,6 @@ DreamEater:
 	buildopponentrage
 	endmove
 
-MirrorMove:
-	checkobedience
-	usedmovetext
-	doturn
-	mirrormove
-	endmove
-
 Whirlwind:
 Roar:
 	checkobedience
@@ -2313,6 +2306,13 @@ PsychUp:
 	psychup
 	endmove
 
+MirrorMove:
+	checkobedience
+	usedmovetext
+	doturn
+	mirrormove
+	endmove
+
 SkullBash:
 	checkcharge
 	checkobedience

diff --git a/battle/moves/move_effects_pointers.asm b/battle/moves/move_effects_pointers.asm
@@ -75,7 +75,6 @@
 	dw Trap
 	dw Explosion
 	dw DreamEater
-	dw MirrorMove
 	dw Whirlwind
 	dw Conversion
 	dw PayDay
@@ -157,5 +156,6 @@
 	dw Present
 	dw Frustration
 	dw PsychUp
+	dw MirrorMove
 	dw SkullBash
 	dw BeatUp
diff --git a/battle/moves/moves.asm b/battle/moves/moves.asm
@@ -130,7 +130,7 @@ ENDM
 	move FOCUS_ENERGY, EFFECT_FOCUS_ENERGY,        0, NORMAL,    100, 30,   0, STATUS
 	move FLASH_CANNON, EFFECT_SP_DEF_DOWN_HIT,    80, STEEL,     100, 10,  10, SPECIAL
 	move METRONOME,    EFFECT_METRONOME,           0, NORMAL,    100, 10,   0, STATUS
-	move MIRROR_MOVE,  EFFECT_MIRROR_MOVE,         0, FLYING,    100, 20,   0, STATUS
+	move SCALD,        EFFECT_BURN_HIT,           80, WATER,     100, 15,  30, SPECIAL
 	move SELFDESTRUCT, EFFECT_EXPLOSION,         200, NORMAL,    100,  5,   0, PHYSICAL
 	move EGG_BOMB,     EFFECT_NORMAL_HIT,        100, NORMAL,     75, 10,   0, PHYSICAL
 	move LICK,         EFFECT_PARALYZE_HIT,       30, GHOST,     100, 30,  30, PHYSICAL

diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm
@@ -242,7 +242,6 @@ SUBSTATUS_CURLED       EQU 0
 	const EFFECT_TRAP
 	const EFFECT_EXPLOSION
 	const EFFECT_DREAM_EATER
-	const EFFECT_MIRROR_MOVE
 	const EFFECT_WHIRLWIND
 	const EFFECT_CONVERSION
 	const EFFECT_PAY_DAY
@@ -324,6 +323,7 @@ SUBSTATUS_CURLED       EQU 0
 	const EFFECT_PRESENT
 	const EFFECT_FRUSTRATION
 	const EFFECT_PSYCH_UP
+	const EFFECT_MIRROR_MOVE
 	const EFFECT_SKULL_BASH
 	const EFFECT_BEAT_UP
 

diff --git a/constants/event_flags.asm b/constants/event_flags.asm
@@ -213,7 +213,7 @@
 	const EVENT_CINNABAR_ROCKS_CLEARED
 	const EVENT_CLEARED_NUGGET_BRIDGE
 	const EVENT_TALKED_TO_WARDENS_GRANDDAUGHTER
-	const EVENT_GOT_TM55_CURSE
+	const EVENT_GOT_TM03_CURSE
 	const EVENT_GOT_CLEANSE_TAG
 	const EVENT_GOT_TM19_GIGA_DRAIN
 	const EVENT_GOT_TM06_TOXIC

diff --git a/constants/item_constants.asm b/constants/item_constants.asm
@@ -207,13 +207,13 @@
 
 	add_tm DYNAMICPUNCH ; $b6
 	add_tm DRAGON_CLAW  ; $b7
-	add_tm SWORDS_DANCE ; $b8
+	add_tm CURSE        ; $b8
 	add_tm CALM_MIND    ; $b9
 	add_tm ROAR         ; $ba
 	add_tm TOXIC        ; $bb
 	add_tm ROLLOUT      ; $bc
 	add_tm BULK_UP      ; $bd
-	add_tm TAKE_DOWN    ; $be
+	add_tm SWORDS_DANCE ; $be
 	add_tm HIDDEN_POWER ; $bf
 	add_tm SUNNY_DAY    ; $c0
 	add_tm ICY_WIND     ; $c1
@@ -259,7 +259,7 @@
 	add_tm FOCUS_BLAST  ; $e9
 	add_tm FLASH_CANNON ; $ea
 	add_tm FALSE_SWIPE  ; $eb
-	add_tm CURSE        ; $ec
+	add_tm SCALD        ; $ec
 	add_tm X_SCISSOR    ; $ed
 	add_tm DARK_PULSE   ; $ee
 	add_tm ENDURE       ; $ef

diff --git a/constants/move_constants.asm b/constants/move_constants.asm
@@ -119,7 +119,7 @@
 	const FOCUS_ENERGY ; $74
 	const FLASH_CANNON ; $75
 	const METRONOME    ; $76
-	const MIRROR_MOVE  ; $77
+	const SCALD        ; $77
 	const SELFDESTRUCT ; $78
 	const EGG_BOMB     ; $79
 	const LICK         ; $7a

diff --git a/data/base_stats/mew.asm b/data/base_stats/mew.asm
@@ -18,5 +18,5 @@
 	dn NO_EGGS, NO_EGGS ; egg groups
 
 	; tmhm
-	tmhm DYNAMICPUNCH, DRAGON_CLAW, CURSE, CALM_MIND, ROAR, TOXIC, ZAP_CANNON, BULK_UP, HEADBUTT, HIDDEN_POWER, SUNNY_DAY, ROLLOUT, ICY_WIND, BLIZZARD, HYPER_BEAM, LIGHT_SCREEN, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, ICE_PUNCH, SOLARBEAM, IRON_TAIL, DRAGONBREATH, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, REFLECT, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, WILL_O_WISP, REST, ATTRACT, THIEF, STEEL_WING, FIRE_PUNCH, FURY_CUTTER, DAZZLINGLEAM, STONE_EDGE, AVALANCHE, WILD_CHARGE, POISON_JAB, SHADOW_CLAW, FOCUS_BLAST, DARK_PULSE, FLASH_CANNON, DRAGON_PULSE, X_SCISSOR, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ROCK_SMASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
+	tmhm DYNAMICPUNCH, DRAGON_CLAW, CURSE, CALM_MIND, ROAR, TOXIC, ROLLOUT, BULK_UP, SWORDS_DANCE, HIDDEN_POWER, SUNNY_DAY, ICY_WIND, ICE_BEAM, BLIZZARD, HYPER_BEAM, LIGHT_SCREEN, PROTECT, RAIN_DANCE, GIGA_DRAIN, SAFEGUARD, DRAGONBREATH, SOLARBEAM, IRON_TAIL, THUNDERBOLT, THUNDER, EARTHQUAKE, RETURN, DIG, PSYCHIC, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, REFLECT, SWAGGER, FLAMETHROWER, SLUDGE_BOMB, SANDSTORM, FIRE_BLAST, SWIFT, DEFENSE_CURL, STONE_EDGE, AVALANCHE, WILD_CHARGE, REST, ATTRACT, THIEF, BODY_SLAM, ROCK_SLIDE, FURY_CUTTER, SUBSTITUTE, STEEL_WING, FOCUS_BLAST, FLASH_CANNON, FALSE_SWIPE, SCALD, X_SCISSOR, DARK_PULSE, ENDURE, DRAGON_PULSE, DAZZLINGLEAM, WILL_O_WISP, POISON_JAB, THUNDER_WAVE, EXPLOSION, SHADOW_CLAW, CUT, FLY, SURF, STRENGTH, FLASH, WHIRLPOOL, WATERFALL, ROCK_SMASH, AQUA_TAIL, COUNTER, DOUBLE_EDGE, DREAM_EATER, EARTH_POWER, FIRE_PUNCH, HEADBUTT, HYPER_VOICE, ICE_PUNCH, IRON_HEAD, SEED_BOMB, SEISMIC_TOSS, SLEEP_TALK, THUNDERPUNCH, ZAP_CANNON, ZEN_HEADBUTT
 	; end
diff --git a/data/egg_moves.asm b/data/egg_moves.asm
@@ -249,7 +249,6 @@ if !_CRYSTAL
 	db STEEL_WING
 endc
 	db FORESIGHT
-	db MIRROR_MOVE
 	db GUST
 	db QUICK_ATTACK
 	db FLAIL
@@ -481,7 +480,6 @@ SentretEggMoves:
 	db $ff
 
 HoothootEggMoves:
-	db MIRROR_MOVE
 	db SUPERSONIC
 	db FAINT_ATTACK
 	db WING_ATTACK
@@ -524,7 +522,6 @@ MunchlaxEggMoves:
 	db $ff
 
 TogepiEggMoves:
-	db MIRROR_MOVE
 	db PECK
 	db FORESIGHT
 	db FUTURE_SIGHT
@@ -600,7 +597,6 @@ MurkrowEggMoves:
 	db WHIRLWIND
 	db DRILL_PECK
 	db QUICK_ATTACK
-	db MIRROR_MOVE
 	db WING_ATTACK
 if _CRYSTAL
 	db SKY_ATTACK

diff --git a/data/evos_attacks.asm b/data/evos_attacks.asm
@@ -233,8 +233,7 @@ PidgeyEvosAttacks:
 	db 21, WHIRLWIND
 	db 29, WING_ATTACK
 	db 37, AGILITY
-	db 47, MIRROR_MOVE
-	db 57, AIR_SLASH
+	db 47, AIR_SLASH
 	db 0 ; no more level-up moves
 
 PidgeottoEvosAttacks:
@@ -249,8 +248,7 @@ PidgeottoEvosAttacks:
 	db 23, WHIRLWIND
 	db 33, WING_ATTACK
 	db 43, AGILITY
-	db 55, MIRROR_MOVE
-	db 67, AIR_SLASH
+	db 55, AIR_SLASH
 	db 0 ; no more level-up moves
 
 PidgeotEvosAttacks:
@@ -265,8 +263,7 @@ PidgeotEvosAttacks:
 	db 23, WHIRLWIND
 	db 33, WING_ATTACK
 	db 46, AGILITY
-	db 61, MIRROR_MOVE
-	db 75, AIR_SLASH
+	db 61, AIR_SLASH
 	db 0 ; no more level-up moves
 
 RattataEvosAttacks:

diff --git a/engine/tmhm.asm b/engine/tmhm.asm
@@ -48,13 +48,13 @@ GetTMHMMove: ; 1166a
 TMHMMoves: ; 1167a
 	db DYNAMICPUNCH ; TM01 (Chuck)
 	db DRAGON_CLAW  ; TM02 (Route 26)
-	db SWORDS_DANCE ; TM03 (Celadon Dept.Store)
+	db CURSE        ; TM03 (Celadon Mansion)
 	db CALM_MIND    ; TM04 (Celadon Dept.Store)
 	db ROAR         ; TM05 (Route 32)
 	db TOXIC        ; TM06 (Janine)
 	db ROLLOUT      ; TM07 (Route 35)
 	db BULK_UP      ; TM08 (Celadon Dept.Store)
-	db TAKE_DOWN    ; TM09
+	db SWORDS_DANCE ; TM09 (Celadon Dept.Store)
 	db HIDDEN_POWER ; TM10 (Lake of Rage, Celadon Dept.Store)
 	db SUNNY_DAY    ; TM11 (Radio Tower, Celadon Dept.Store)
 	db ICY_WIND     ; TM12 (Pryce)
@@ -100,7 +100,7 @@ TMHMMoves: ; 1167a
 	db FOCUS_BLAST  ; TM52
 	db FLASH_CANNON ; TM53 (Route 9)
 	db FALSE_SWIPE  ; TM54 (Goldenrod Dept.Store)
-	db CURSE        ; TM55 (Celadon Mansion)
+	db SCALD        ; TM55
 	db X_SCISSOR    ; TM56 (Underground Warehouse)
 	db DARK_PULSE   ; TM57 (Dark Cave)
 	db ENDURE       ; TM58 (Burned Tower)

diff --git a/maps/CeladonMansionRoofHouse.asm b/maps/CeladonMansionRoofHouse.asm
@@ -11,7 +11,7 @@ CeladonMansionRoofHouse_MapScriptHeader:
 PharmacistScript_0x71afd:
 	faceplayer
 	opentext
-	checkevent EVENT_GOT_TM55_CURSE
+	checkevent EVENT_GOT_TM03_CURSE
 	iftrue UnknownScript_0x71b21
 	writetext UnknownText_0x71b27
 	buttonsound
@@ -27,7 +27,7 @@ UnknownScript_0x71b14:
 	buttonsound
 	verbosegiveitem TM_CURSE
 	iffalse UnknownScript_0x71b25
-	setevent EVENT_GOT_TM55_CURSE
+	setevent EVENT_GOT_TM03_CURSE
 UnknownScript_0x71b21:
 	writetext UnknownText_0x71db3
 	waitbutton
@@ -103,11 +103,11 @@ UnknownText_0x71ba3:
 
 	para "For listening so"
 	line "patiently, you may"
-	cont "take this--TM55!"
+	cont "take this--TM03!"
 	done
 
 UnknownText_0x71db3:
-	text "TM55 is Curse."
+	text "TM03 is Curse."
 
 	para "It's a terrifying"
 	line "move that slowly"

diff --git a/trainers/trainers.asm b/trainers/trainers.asm
@@ -9834,7 +9834,7 @@ BlueGroup:
 		db QUICK_ATTACK
 		db FLY
 		db WING_ATTACK
-		db MIRROR_MOVE
+		db AIR_SLASH
 
 	db 56, ALAKAZAM, TWISTEDSPOON
 		db DISABLE