diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-06-11 10:17:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-11 10:17:12 -0400 |
| commit | 0cf0a5b9b446c7d743355852667a987011839605 (patch) | |
| tree | de35c73058f041e5551a64e3f9d99e8a4fdfc5b5 /engine/gfx/pic_animation.asm | |
| parent | 32e7e368f4b3ae61bf4a219e89fc04ac8263f431 (diff) | |
| parent | 60c71add580aa3aa5b096beeadd9bb83145768f6 (diff) | |
Merge pull request #729 from Rangi42/master
Treat std scripts like specials and predefs
Diffstat (limited to 'engine/gfx/pic_animation.asm')
| -rw-r--r-- | engine/gfx/pic_animation.asm | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm index fda39e5c6..f2a59b75a 100644 --- a/engine/gfx/pic_animation.asm +++ b/engine/gfx/pic_animation.asm @@ -48,14 +48,10 @@ AnimateMon_HOF: pokeanim: MACRO rept _NARG -; Workaround for a bug where macro args can't come after the start of a symbol -if !DEF(\1_POKEANIM) -\1_POKEANIM EQUS "PokeAnim_\1_" -endc - db (\1_POKEANIM - PokeAnim_SetupCommands) / 2 + db (PokeAnim_\1_SetupCommand - PokeAnim_SetupCommands) / 2 shift endr - db (PokeAnim_Finish_ - PokeAnim_SetupCommands) / 2 + db (PokeAnim_Finish_SetupCommand - PokeAnim_SetupCommands) / 2 ENDM PokeAnims: @@ -132,22 +128,24 @@ SetUpPokeAnim: scf ret -PokeAnim_SetupCommands: -setup_command: MACRO -\1_: dw \1 +add_setup_command: MACRO +\1_SetupCommand: + dw \1 ENDM - setup_command PokeAnim_Finish - setup_command PokeAnim_BasePic - setup_command PokeAnim_SetWait - setup_command PokeAnim_Wait - setup_command PokeAnim_Setup - setup_command PokeAnim_Setup2 - setup_command PokeAnim_Idle - setup_command PokeAnim_Play - setup_command PokeAnim_Play2 - setup_command PokeAnim_Cry - setup_command PokeAnim_CryNoWait - setup_command PokeAnim_StereoCry + +PokeAnim_SetupCommands: + add_setup_command PokeAnim_Finish + add_setup_command PokeAnim_BasePic + add_setup_command PokeAnim_SetWait + add_setup_command PokeAnim_Wait + add_setup_command PokeAnim_Setup + add_setup_command PokeAnim_Setup2 + add_setup_command PokeAnim_Idle + add_setup_command PokeAnim_Play + add_setup_command PokeAnim_Play2 + add_setup_command PokeAnim_Cry + add_setup_command PokeAnim_CryNoWait + add_setup_command PokeAnim_StereoCry PokeAnim_SetWait: ld a, 18 |