diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-06-15 13:12:56 -0400 |
| commit | 9f01e33a0428f8a8c206b3f6018f526a41d65b43 (patch) | |
| tree | 7f3c8606ebbe0f882955761a899ec9f819412c17 /macros | |
| parent | 0bc1e91d217fb1a724c08ed6c5826c2379f10507 (diff) | |
Port miscellaneous recent updates from pokecrystal
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/predef.asm | 6 | ||||
| -rw-r--r-- | macros/scripts/trade_anims.asm | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/macros/predef.asm b/macros/predef.asm index 7850350a..a1c43bb5 100644 --- a/macros/predef.asm +++ b/macros/predef.asm @@ -1,15 +1,15 @@ -predef_id: MACRO +lda_predef: MACRO ; Some functions load the predef id ; without immediately calling Predef. ld a, (\1Predef - PredefPointers) / 3 ENDM predef: MACRO - predef_id \1 + lda_predef \1 call Predef ENDM predef_jump: MACRO - predef_id \1 + lda_predef \1 jp Predef ENDM diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm index 6fe55945..da937325 100644 --- a/macros/scripts/trade_anims.asm +++ b/macros/scripts/trade_anims.asm @@ -1,4 +1,4 @@ -; DoTradeAnimation.JumpTable indexes (see engine/trade/animation.asm) +; DoTradeAnimation.JumpTable indexes (see engine/movies/trade_animation.asm) enum_start enum tradeanim_next_command ; $00 |