From 4b4c53c7ae7f61499304c69b60e39406c5d47126 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 9 Dec 2018 17:56:13 -0500
Subject: [PATCH 1/2] Format music macros like movement macros

---
 audio/engine.asm         |  4 ++--
 macros/scripts/audio.asm | 13 ++++++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/audio/engine.asm b/audio/engine.asm
index 551f1e0aa..a23b00fb2 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -1138,7 +1138,7 @@ ParseMusic:
 	call GetMusicByte ; store next byte in a
 	cp endchannel_cmd
 	jr z, .endchannel
-	cp first_music_cmd
+	cp FIRST_MUSIC_CMD
 	jr c, .readnote
 	; then it's a command
 .readcommand
@@ -1350,7 +1350,7 @@ ParseMusicCommand:
 	; reload command
 	ld a, [wCurMusicByte]
 	; get command #
-	sub first_music_cmd
+	sub FIRST_MUSIC_CMD
 	ld e, a
 	ld d, 0
 	; seek command pointer
diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm
index d4a3f7bb5..fc9e3397a 100644
--- a/macros/scripts/audio.asm
+++ b/macros/scripts/audio.asm
@@ -20,20 +20,23 @@ noise: MACRO
 ENDM
 
 ; MusicCommands indexes (see audio/engine.asm)
-	enum_start $d8
-first_music_cmd EQU __enum__ + -8
+	enum_start $d0, +8
+FIRST_MUSIC_CMD EQU __enum__
 
+	enum octave_cmd ; $d0
 octave: MACRO
-	db first_music_cmd + 8 - (\1)
+	db octave_cmd | 8 - (\1)
 ENDM
 
+__enumdir__ = +1
+
 	enum notetype_cmd ; $d8
 notetype: MACRO
 	db notetype_cmd
 	db \1 ; note_length
-	if _NARG >= 2
+if _NARG >= 2
 	db \2 ; intensity
-	endc
+endc
 ENDM
 
 	enum pitchoffset_cmd ; $d9

From e51339f01a52603820749249b625d2093b611a8e Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Sun, 9 Dec 2018 18:13:37 -0500
Subject: [PATCH 2/2] Formatting and comments

---
 engine/overworld/map_objects.asm     | 1 +
 engine/overworld/player_movement.asm | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm
index db10c917e..02b9cbdda 100644
--- a/engine/overworld/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -1822,6 +1822,7 @@ UpdateJumpPosition:
 .y
 	db  -4,  -6,  -8, -10, -11, -12, -12, -12
 	db -11, -10,  -9,  -8,  -6,  -4,   0,   0
+
 Function5000: ; unscripted?
 ; copy [wPlayerNextMovement] to [wPlayerMovement]
 	ld a, [wPlayerNextMovement]
diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm
index 26c11a522..e8f45d913 100644
--- a/engine/overworld/player_movement.asm
+++ b/engine/overworld/player_movement.asm
@@ -469,6 +469,7 @@ DoPlayerMovement::
 	ret
 
 .Steps:
+; entries correspond to STEP_* constants
 	dw .SlowStep
 	dw .NormalStep
 	dw .FastStep
@@ -514,10 +515,10 @@ DoPlayerMovement::
 	turn_step LEFT
 	turn_step RIGHT
 .FinishFacing:
-	db $80 + DOWN
-	db $80 + UP
-	db $80 + LEFT
-	db $80 + RIGHT
+	db $80 | DOWN
+	db $80 | UP
+	db $80 | LEFT
+	db $80 | RIGHT
 
 .StandInPlace:
 	ld a, 0