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

Define pokeanim setup commands like std scripts, predefs, and specials

Browse Source 
No need for a macro workaround in rgbds 0.4.0
This commit is contained in:
Rangi 2020-06-10 17:15:53 -04:00
parent 9ab2575727
commit 60c71add58
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
engine/gfx/pic_animation.asm
View File

@ -48,14 +48,10 @@ AnimateMon_HOF:
pokeanim: MACRO pokeanim: MACRO
rept _NARG rept _NARG
; Workaround for a bug where macro args can't come after the start of a symbol db (PokeAnim_\1_SetupCommand - PokeAnim_SetupCommands) / 2
if !DEF(\1_POKEANIM)
\1_POKEANIM EQUS "PokeAnim_\1_"
endc
db (\1_POKEANIM - PokeAnim_SetupCommands) / 2
shift shift
endr endr
db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2 db (PokeAnim_Finish_SetupCommand - PokeAnim_SetupCommands) / 2
ENDM ENDM
PokeAnims: PokeAnims:
@ -132,22 +128,24 @@ SetUpPokeAnim:
scf scf
ret ret
PokeAnim_SetupCommands: add_setup_command: MACRO
setup_command: MACRO \1_SetupCommand:
\1_: dw \1 dw \1
ENDM ENDM
setup_command PokeAnim_Finish
setup_command PokeAnim_BasePic PokeAnim_SetupCommands:
setup_command PokeAnim_SetWait add_setup_command PokeAnim_Finish
setup_command PokeAnim_Wait add_setup_command PokeAnim_BasePic
setup_command PokeAnim_Setup add_setup_command PokeAnim_SetWait
setup_command PokeAnim_Setup2 add_setup_command PokeAnim_Wait
setup_command PokeAnim_Idle add_setup_command PokeAnim_Setup
setup_command PokeAnim_Play add_setup_command PokeAnim_Setup2
setup_command PokeAnim_Play2 add_setup_command PokeAnim_Idle
setup_command PokeAnim_Cry add_setup_command PokeAnim_Play
setup_command PokeAnim_CryNoWait add_setup_command PokeAnim_Play2
setup_command PokeAnim_StereoCry add_setup_command PokeAnim_Cry
add_setup_command PokeAnim_CryNoWait
add_setup_command PokeAnim_StereoCry
PokeAnim_SetWait: PokeAnim_SetWait:
ld a, 18 ld a, 18