Miscellaneous fixes from #694

2020-03-21 13:07:18 -04:00
parent 624864307e
commit 5a5f5ececd
6 changed files with 19 additions and 17 deletions
--- a/macros/enum.asm
+++ b/macros/enum.asm
@@ -9,7 +9,7 @@ endc
 if _NARG >= 2
 __enumdir__ = \2
 else
-__enumdir__ = +1
+__enumdir__ = 1
 endc
 ENDM

--- 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
--- 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