diff options
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/audio.asm | 4 | ||||
| -rw-r--r-- | macros/scripts/battle_anims.asm | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index 127f2d1e3..e28dee7e1 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -50,8 +50,8 @@ FIRST_MUSIC_CMD EQU const_value const octave_cmd ; $d0 octave: MACRO - assert 0 < (\1) && (\1) < 8, "octave must be 1-8" - db octave_cmd | 8 - (\1) ; octave + assert 1 <= (\1) && (\1) <= 8, "octave must be 1-8" + db octave_cmd + 8 - (\1) ; octave ENDM const_skip 7 ; all octave values diff --git a/macros/scripts/battle_anims.asm b/macros/scripts/battle_anims.asm index 6dc21e5fc..9754574f7 100644 --- a/macros/scripts/battle_anims.asm +++ b/macros/scripts/battle_anims.asm @@ -1,12 +1,12 @@ -anim_wait: MACRO - assert (\1) < $d0, "anim_wait argument must be less than $d0" - db \1 -ENDM - ; BattleAnimCommands indexes (see engine/battle_anims/anim_commands.asm) const_def $d0 FIRST_BATTLE_ANIM_CMD EQU const_value +anim_wait: MACRO + assert (\1) < FIRST_BATTLE_ANIM_CMD, "anim_wait argument must be less than {FIRST_BATTLE_ANIM_CMD}" + db \1 +ENDM + const anim_obj_command ; $d0 anim_obj: MACRO db anim_obj_command |