diff options
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/battle_anims.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/maps.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/text.asm | 8 | ||||
| -rw-r--r-- | macros/scripts/trade_anims.asm | 1 |
4 files changed, 5 insertions, 8 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/maps.asm b/macros/scripts/maps.asm index d5f5b00e1..7f5947a55 100644 --- a/macros/scripts/maps.asm +++ b/macros/scripts/maps.asm @@ -3,7 +3,6 @@ map_id: MACRO db GROUP_\1, MAP_\1 ENDM - scene_script: MACRO ;\1: script pointer dw \1 @@ -75,7 +74,6 @@ object_event: MACRO dw \9 ENDM - trainer: MACRO ;\1: trainer group ;\2: trainer id 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 diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm index 633047b82..6227f2022 100644 --- a/macros/scripts/trade_anims.asm +++ b/macros/scripts/trade_anims.asm @@ -166,7 +166,6 @@ tradeanim_wait_180_if_ot_egg: MACRO db tradeanim_wait_180_if_ot_egg_command ENDM - ; Mobile enum_start $01 |