diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 41a67a648..70b243447 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -49,6 +49,6 @@ NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM const ANIM_MON_TRADE const ANIM_MON_EVOLVE const ANIM_MON_HATCH - const ANIM_MON_UNUSED + const ANIM_MON_HOF const ANIM_MON_EGG1 const ANIM_MON_EGG2 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index d1bd41b84..7e92a3e31 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -9094,7 +9094,7 @@ BattleStartMessage: jr .skip_cry ; cry is played during the animation .cry_no_anim - ld a, $0f + ld a, $f ld [wCryTracks], a ld a, [wTempEnemyMonSpecies] call PlayStereoCry diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 6cbc749d5..fcbcc1593 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -124,7 +124,7 @@ AnimateHallOfFame: call PlaceString call WaitBGMap decoord 6, 5 - ld c, $6 + ld c, ANIM_MON_HOF predef HOF_AnimateFrontpic ld c, 60 call DelayFrames @@ -390,7 +390,7 @@ _HallOfFamePC: call GetSGBLayout call SetPalettes decoord 6, 5 - ld c, $6 + ld c, ANIM_MON_HOF predef HOF_AnimateFrontpic and a ret diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index 843e5cba4..93852f3cf 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -40,8 +40,8 @@ AnimateMon_Hatch: call AnimateFrontpic ret -AnimateMon_Unused: - ld e, ANIM_MON_UNUSED +AnimateMon_HOF: + ld e, ANIM_MON_HOF ld d, $0 call AnimateFrontpic ret @@ -65,7 +65,7 @@ PokeAnims: dw .Trade dw .Evolve dw .Hatch - dw .Unused ; same as .Menu + dw .HOF dw .Egg1 dw .Egg2 @@ -75,7 +75,7 @@ PokeAnims: .Trade: pokeanim Idle, Play2, Idle, Play, SetWait, Wait, Cry, Setup, Play .Evolve: pokeanim Idle, Play, SetWait, Wait, CryNoWait, Setup, Play .Hatch: pokeanim Idle, Play, CryNoWait, Setup, Play, SetWait, Wait, Idle, Play -.Unused: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play +.HOF: pokeanim CryNoWait, Setup, Play, SetWait, Wait, Idle, Play .Egg1: pokeanim Setup, Play .Egg2: pokeanim Idle, Play