pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

ANIM_MON_UNUSED → ANIM_MON_HOF

Browse Source
This commit is contained in:
Rangi 2018-07-22 23:42:50 -04:00
parent 5ba5a7df46
commit bdde60c64b
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/gfx_constants.asm
View File

@ -49,6 +49,6 @@ NUM_SPRITE_OAM_STRUCTS EQU 40 ; see wVirtualOAM
const ANIM_MON_TRADE const ANIM_MON_TRADE
const ANIM_MON_EVOLVE const ANIM_MON_EVOLVE
const ANIM_MON_HATCH const ANIM_MON_HATCH
const ANIM_MON_UNUSED const ANIM_MON_HOF
const ANIM_MON_EGG1 const ANIM_MON_EGG1
const ANIM_MON_EGG2 const ANIM_MON_EGG2

2
engine/battle/core.asm
View File

@ -9094,7 +9094,7 @@ BattleStartMessage:
jr .skip_cry ; cry is played during the animation jr .skip_cry ; cry is played during the animation
.cry_no_anim .cry_no_anim
ld a, $0f ld a, $f
ld [wCryTracks], a ld [wCryTracks], a
ld a, [wTempEnemyMonSpecies] ld a, [wTempEnemyMonSpecies]
call PlayStereoCry call PlayStereoCry

4
engine/events/halloffame.asm
View File

@ -124,7 +124,7 @@ AnimateHallOfFame:
call PlaceString call PlaceString
call WaitBGMap call WaitBGMap
decoord 6, 5 decoord 6, 5
ld c, $6 ld c, ANIM_MON_HOF
predef HOF_AnimateFrontpic predef HOF_AnimateFrontpic
ld c, 60 ld c, 60
call DelayFrames call DelayFrames
@ -390,7 +390,7 @@ _HallOfFamePC:
call GetSGBLayout call GetSGBLayout
call SetPalettes call SetPalettes
decoord 6, 5 decoord 6, 5
ld c, $6 ld c, ANIM_MON_HOF
predef HOF_AnimateFrontpic predef HOF_AnimateFrontpic
and a and a
ret ret

8
engine/gfx/pic_animation.asm
View File

@ -40,8 +40,8 @@ AnimateMon_Hatch:
call AnimateFrontpic call AnimateFrontpic
ret ret
AnimateMon_Unused: AnimateMon_HOF:
ld e, ANIM_MON_UNUSED ld e, ANIM_MON_HOF
ld d, $0 ld d, $0
call AnimateFrontpic call AnimateFrontpic
ret ret
@ -65,7 +65,7 @@ PokeAnims:
dw .Trade dw .Trade
dw .Evolve dw .Evolve
dw .Hatch dw .Hatch
dw .Unused ; same as .Menu dw .HOF
dw .Egg1 dw .Egg1
dw .Egg2 dw .Egg2
@ -75,7 +75,7 @@ PokeAnims:
.Trade: pokeanim Idle, Play2, Idle, Play, SetWait, Wait, Cry, Setup, Play .Trade: pokeanim Idle, Play2, Idle, Play, SetWait, Wait, Cry, Setup, Play
.Evolve: pokeanim Idle, Play, SetWait, Wait, CryNoWait, Setup, Play .Evolve: pokeanim Idle, Play, SetWait, Wait, CryNoWait, Setup, Play
.Hatch: pokeanim Idle, Play, CryNoWait, Setup, Play, SetWait, Wait, Idle, 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 .Egg1: pokeanim Setup, Play
.Egg2: pokeanim Idle, Play .Egg2: pokeanim Idle, Play