diff options
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/audio.asm | 4 | ||||
| -rw-r--r-- | macros/scripts/battle_commands.asm | 4 | ||||
| -rw-r--r-- | macros/scripts/gfx_anims.asm | 40 | ||||
| -rw-r--r-- | macros/scripts/movement.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/text.asm | 2 | ||||
| -rw-r--r-- | macros/scripts/trade_anims.asm | 8 |
6 files changed, 30 insertions, 30 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index 1447ea62..2776c293 100644 --- a/macros/scripts/audio.asm +++ b/macros/scripts/audio.asm @@ -41,7 +41,7 @@ noise_note: MACRO ENDM ; MusicCommands indexes (see audio/engine.asm) - const_def $d0, 8 + const_def $d0 FIRST_MUSIC_CMD EQU const_value const octave_cmd ; $d0 @@ -49,7 +49,7 @@ octave: MACRO db octave_cmd | 8 - (\1) ; octave ENDM -const_inc = 1 + const_skip 7 ; all octave values const note_type_cmd ; $d8 note_type: MACRO diff --git a/macros/scripts/battle_commands.asm b/macros/scripts/battle_commands.asm index da694858..ad448019 100644 --- a/macros/scripts/battle_commands.asm +++ b/macros/scripts/battle_commands.asm @@ -181,6 +181,6 @@ ENDM command startloop ; ae command curl ; af - const_def $fe - command endturn ; fe + const_def -1, -1 command endmove ; ff + command endturn ; fe diff --git a/macros/scripts/gfx_anims.asm b/macros/scripts/gfx_anims.asm index ded61b87..61c18fa8 100644 --- a/macros/scripts/gfx_anims.asm +++ b/macros/scripts/gfx_anims.asm @@ -12,12 +12,16 @@ endc db x ENDM - const_def $fc + const_def -1, -1 - const delanim_command ; $fc -delanim: MACRO -; Removes the object from the screen, as opposed to `endanim` which just stops all motion - db delanim_command + const endanim_command ; $ff +endanim: MACRO + db endanim_command +ENDM + + const dorestart_command ; $fe +dorestart: MACRO + db dorestart_command ENDM const dowait_command ; $fd @@ -26,28 +30,24 @@ dowait: MACRO db \1 ; frames ENDM - const dorestart_command ; $fe -dorestart: MACRO - db dorestart_command -ENDM - - const endanim_command ; $ff -endanim: MACRO - db endanim_command + const delanim_command ; $fc +delanim: MACRO +; Removes the object from the screen, as opposed to `endanim` which just stops all motion + db delanim_command ENDM ; Used for pic animations -const_value = $fd - - const dorepeat_command ; $fd -dorepeat: MACRO - db dorepeat_command - db \1 ; command offset to jump to -ENDM + const_def -2, -1 const setrepeat_command ; $fe setrepeat: MACRO db setrepeat_command db \1 ; amount of times to repeat ENDM + + const dorepeat_command ; $fd +dorepeat: MACRO + db dorepeat_command + db \1 ; command offset to jump to +ENDM diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index 68dc9e51..2a8f034f 100644 --- a/macros/scripts/movement.asm +++ b/macros/scripts/movement.asm @@ -117,7 +117,7 @@ else endc ENDM -const_value = const_value + 8 + const_skip 8 ; all step_sleep values const movement_step_end ; $47 step_end: MACRO diff --git a/macros/scripts/text.asm b/macros/scripts/text.asm index 726294ca..2622cee5 100644 --- a/macros/scripts/text.asm +++ b/macros/scripts/text.asm @@ -137,7 +137,7 @@ text_far: MACRO db BANK(\1) ENDM - const_def $50 + const_next $50 const TX_END ; $50 text_end: MACRO diff --git a/macros/scripts/trade_anims.asm b/macros/scripts/trade_anims.asm index 11e5778d..2552f273 100644 --- a/macros/scripts/trade_anims.asm +++ b/macros/scripts/trade_anims.asm @@ -21,7 +21,7 @@ tradeanim_enter_link_tube: MACRO db tradeanim_enter_link_tube_command ENDM - const_def $05 + const_skip ; continues tradeanim_enter_link_tube_command const tradeanim_exit_link_tube_command ; $05 tradeanim_exit_link_tube: MACRO @@ -33,14 +33,14 @@ tradeanim_tube_to_ot: MACRO db tradeanim_tube_to_ot_command ENDM - const_def $0e + const_skip 7 ; continues tradeanim_tube_to_ot_command const tradeanim_tube_to_player_command ; $0e tradeanim_tube_to_player: MACRO db tradeanim_tube_to_player_command ENDM - const_def $16 + const_skip 7 ; continues tradeanim_tube_to_player_command const tradeanim_sent_to_ot_text_command ; $16 tradeanim_sent_to_ot_text: MACRO @@ -92,7 +92,7 @@ tradeanim_scroll_out_right: MACRO db tradeanim_scroll_out_right_command ENDM - const_def $21 + const_skip ; continues tradeanim_scroll_out_right_command const tradeanim_wait_80_command ; $21 tradeanim_wait_80: MACRO |