diff options
author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-03-23 21:05:39 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-23 21:05:39 -0400 |
commit | 63798d56d05cf87ada77bd26727ea7725630b0b2 (patch) | |
tree | c90b2bebe86dffe78e6597d220f70196d3e69e25 /macros/scripts | |
parent | 624864307e4e7a5055c01d7f06145feec35527a7 (diff) | |
parent | 0345e4fb0e3f39a038e9eced72380a5a1ab6694f (diff) |
Merge pull request #699 from Rangi42/master
Resolve some miscellaneous issues
Diffstat (limited to 'macros/scripts')
-rw-r--r-- | macros/scripts/audio.asm | 4 | ||||
-rw-r--r-- | macros/scripts/gfx_anims.asm | 2 | ||||
-rw-r--r-- | macros/scripts/movement.asm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm index 92654ff9a..6f87bc3ec 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/gfx_anims.asm b/macros/scripts/gfx_anims.asm index 3756481dd..a6241a0d8 100644 --- a/macros/scripts/gfx_anims.asm +++ b/macros/scripts/gfx_anims.asm @@ -4,7 +4,7 @@ frame: MACRO db \1 x = \2 if _NARG > 2 -rept _NARG + -2 +rept _NARG - 2 x = x | (1 << (\3 + 1)) shift endr diff --git a/macros/scripts/movement.asm b/macros/scripts/movement.asm index eeda6bd83..e5981c0f9 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 |