diff options
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/battle_commands.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/events.asm | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index 5933740f0..4ae8dbaf4 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -3,7 +3,7 @@ command: MACRO \1 EQUS "db \1_command" ENDM -; BattleCommandPointers indexes (see data/battle_command_pointers.asm) +; BattleCommandPointers indexes (see data/battle/effect_command_pointers.asm) enum_start 1 command checkturn ; 01 command checkobedience ; 02 diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm index 694a7cd12..40a5bbf46 100644 --- a/macros/scripts/events.asm +++ b/macros/scripts/events.asm @@ -424,9 +424,9 @@ readcoins: MACRO db \1 ; memory ENDM - enum RAM2MEM_command ; $3f -RAM2MEM: MACRO - db RAM2MEM_command + enum vartomem_command ; $3f +vartomem: MACRO + db vartomem_command db \1 ; memory ENDM @@ -483,7 +483,11 @@ ENDM enum refreshscreen_command ; $48 refreshscreen: MACRO db refreshscreen_command +if _NARG == 1 db \1 ; dummy +else + db 0 +endc ENDM enum closetext_command ; $49 |