diff options
| author | yenatch <yenatch@gmail.com> | 2018-07-19 00:46:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 00:46:59 -0400 |
| commit | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (patch) | |
| tree | d2ac10a6cc7f70e839f393706e1a3261cf95c2ae /macros/scripts | |
| parent | 3e14c1f26e91b1fc1d18eed389518ae8454e938f (diff) | |
| parent | 1cb364cc1825d1b149eb4e0fe09d1cab21006208 (diff) | |
Merge pull request #542 from mid-kid/master
Miscellaneous fixes
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/battle_anims.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/text.asm | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 76300e78f..f25b6da22 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -295,7 +295,7 @@ anim_call: MACRO dw \1 ; address ENDM - enum anim_ret_command ; $ff +anim_ret_command EQU -1 ; $ff anim_ret: MACRO db anim_ret_command ENDM diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index bff18c7ea..d1fec35db 100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -46,9 +46,9 @@ text_low: MACRO db TX_LOW ENDM - enum WAIT_BUTTON ; $06 + enum TX_WAIT_BUTTON ; $06 text_waitbutton: MACRO - db WAIT_BUTTON + db TX_WAIT_BUTTON ENDM enum TX_SCROLL ; $07 @@ -56,9 +56,9 @@ text_scroll: MACRO db TX_SCROLL ENDM - enum START_ASM ; $08 + enum TX_START_ASM ; $08 start_asm: MACRO - db START_ASM + db TX_START_ASM ENDM enum TX_NUM ; $09 |