diff options
| author | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:33:13 -0400 |
|---|---|---|
| committer | entrpntr <entrpntr@gmail.com> | 2020-04-27 03:35:35 -0400 |
| commit | 70d3a3fdbc508eeb4557ddc43d78ba12ed41963e (patch) | |
| tree | 202f65e4131709331ae62cbe5eace4d6f8b6aa58 /macros/scripts | |
| parent | 75cf425d30db6a036743cf85c483c1b537063605 (diff) | |
Sync with the recent updates to pokecrystal.
Diffstat (limited to 'macros/scripts')
| -rw-r--r-- | macros/scripts/audio.asm | 4 | ||||
| -rw-r--r-- | macros/scripts/movement.asm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index 92654ff9..6f87bc3e 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) - enum_start $d0, +8 + enum_start $d0, 8 FIRST_MUSIC_CMD EQU __enum__ enum octave_cmd ; $d0 @@ -49,7 +49,7 @@ octave: MACRO db octave_cmd | 8 - (\1) ; octave ENDM -__enumdir__ = +1 +__enumdir__ = 1 enum note_type_cmd ; $d8 note_type: MACRO diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index 2896700e..f6ea46a6 100644 --- a/macros/scripts/movement.asm +++ b/macros/scripts/movement.asm @@ -1,5 +1,5 @@ ; MovementPointers indexes (see engine/overworld/movement.asm) - enum_start 0, +4 + enum_start 0, 4 ; Directional movements @@ -73,7 +73,7 @@ fast_jump_step: MACRO db movement_fast_jump_step | \1 ENDM -__enumdir__ = +1 +__enumdir__ = 1 ; Control enum movement_remove_sliding ; $38 |