8 files changed, 24 insertions, 26 deletions
diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm
index 87d08e18..eb47d62d 100644
--- a/audio/alternate_tempo.asm
+++ b/audio/alternate_tempo.asm
@@ -23,18 +23,17 @@ Music_RivalAlternateTempo::
 	ld a, MUSIC_MEET_RIVAL
 	call PlayMusic
 	ld de, Music_MeetRival_branch_b119
-	jr asm_99ed
+	jr FinishAlternateRivalMusic
 
 ; applies both the alternate start and alternate tempo
 Music_RivalAlternateStartAndTempo::
 	call Music_RivalAlternateStart
 	ld de, Music_MeetRival_branch_b19b
-asm_99ed:
+FinishAlternateRivalMusic:
 	ld hl, wChannelCommandPointers
 	jp Audio1_OverwriteChannelPointer
 
-; XXX
-	ret
+	ret ; unused
 
 ; an alternate tempo for Cities1 which is used for the Hall of Fame room
 Music_Cities1AlternateTempo::
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index a585cd43..df3281cb 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1,4 +1,4 @@
-; The first of three duplicated sound engines.
+; The first of four partially duplicated sound engines.
 
 Audio1_UpdateMusic::
 	ld c, Ch1
@@ -1064,7 +1064,7 @@ Audio1_IsCry:
 
 Audio1_96c3:
 	ld a, [wAudioROMBank]
-	cp BANK(AudioEngine2)
+	cp BANK("Audio Engine 2")
 	jr nz, .asm_96dc
 	ld a, [wChannelSoundIDs + Ch8]
 	ld b, a
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 65c25c20..800a2246 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1,4 +1,4 @@
-; The second of three duplicated sound engines.
+; The second of four partially duplicated sound engines.
 ; This copy has a few differences relating to battle sound effects
 ; and the low health alarm that plays in battle
 
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index 10893868..06698ca5 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -1,4 +1,4 @@
-; The third of three duplicated sound engines.
+; The third of four partially duplicated sound engines.
 
 Audio3_PlaySound::
 	ld [wSoundID], a
diff --git a/audio/engine_4.asm b/audio/engine_4.asm
index 850bb66a..b3ed422e 100644
--- a/audio/engine_4.asm
+++ b/audio/engine_4.asm
@@ -1,4 +1,4 @@
-; The fourth of three duplicated sound engines.
+; The fourth of four partially duplicated sound engines.
 
 Audio4_PlaySound::
 	ld [wSoundID], a
diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm
index 6bcb1fc0..445576bb 100644
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -6,10 +6,8 @@ Music_Dungeon1_Ch1::
 	vibrato 10, 1, 4
 	note_type 12, 4, -5
 	rest 8
-	; stereo_panning %1110, %1101
 	octave 4
 	note F#, 8
-	; stereo_panning %1111, %1111
 
 Music_Dungeon1_branch_7dee5::
 	note_type 12, 11, 2
diff --git a/audio/pikachu_cries.asm b/audio/pikachu_cries.asm
index a09425b3..1f6bc2c4 100644
--- a/audio/pikachu_cries.asm
+++ b/audio/pikachu_cries.asm
@@ -5,12 +5,14 @@ pcm: MACRO
 .End:
 ENDM
 
-SECTION "Pikachu Cries 1", ROMX ; BANK $21
+
+; All of the pcm data has one trailing byte that is never processed.
+
+SECTION "Pikachu Cries 1", ROMX
 
 PikachuCry1::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_1.pcm"
 	db $77 ; unused
-	; All of the pcm data has one trailing byte that is never processed.
 
 PikachuCry2::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_2.pcm"
@@ -25,7 +27,7 @@ PikachuCry4::
 	db $e0 ; unused
 
 
-SECTION "Pikachu Cries 2", ROMX ; BANK $22
+SECTION "Pikachu Cries 2", ROMX
 
 PikachuCry5::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_5.pcm"
@@ -40,7 +42,7 @@ PikachuCry7::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 3", ROMX ; BANK $23
+SECTION "Pikachu Cries 3", ROMX
 
 PikachuCry8::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_8.pcm"
@@ -55,7 +57,7 @@ PikachuCry10::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 4", ROMX ; BANK $24
+SECTION "Pikachu Cries 4", ROMX
 
 PikachuCry11::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_11.pcm"
@@ -70,7 +72,7 @@ PikachuCry13::
 	db $f0 ; unused
 
 
-SECTION "Pikachu Cries 5", ROMX ; BANK $25
+SECTION "Pikachu Cries 5", ROMX
 
 PikachuCry14::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_14.pcm"
@@ -80,7 +82,7 @@ PikachuCry15::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_15.pcm"
 	db $77 ; unused
 
-SECTION "Pikachu Cries 6", ROMX ; BANK $31
+SECTION "Pikachu Cries 6", ROMX
 
 PikachuCry16::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_16.pcm"
@@ -95,7 +97,7 @@ PikachuCry22::
 	db $7e ; unused
 
 
-SECTION "Pikachu Cries 7", ROMX ; BANK $32
+SECTION "Pikachu Cries 7", ROMX
 
 PikachuCry20::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_20.pcm"
@@ -106,7 +108,7 @@ PikachuCry21::
 	db $ff ; unused
 
 
-SECTION "Pikachu Cries 8", ROMX ; BANK $33
+SECTION "Pikachu Cries 8", ROMX
 
 PikachuCry19::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_19.pcm"
@@ -120,7 +122,7 @@ PikachuCry26::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_26.pcm"
 	db $00 ; unused
 
-SECTION "Pikachu Cries 9", ROMX ; BANK $34
+SECTION "Pikachu Cries 9", ROMX
 
 PikachuCry17::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_17.pcm"
@@ -135,7 +137,7 @@ PikachuCry25::
 	db $03 ; unused
 
 
-SECTION "Pikachu Cries 10", ROMX ; BANK $35
+SECTION "Pikachu Cries 10", ROMX
 
 PikachuCry27::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_27.pcm"
@@ -157,7 +159,7 @@ PikachuCry31::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_31.pcm"
 	db $00 ; unused
 
-SECTION "Pikachu Cries 11", ROMX ; BANK $36
+SECTION "Pikachu Cries 11", ROMX
 
 PikachuCry32::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_32.pcm"
@@ -176,7 +178,7 @@ PikachuCry41::
 	db $9b ; unused
 
 
-SECTION "Pikachu Cries 12", ROMX ; BANK $37
+SECTION "Pikachu Cries 12", ROMX
 
 PikachuCry35::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_35.pcm"
@@ -191,7 +193,7 @@ PikachuCry39::
 	db $0f ; unused
 
 
-SECTION "Pikachu Cries 13", ROMX ; BANK $38
+SECTION "Pikachu Cries 13", ROMX
 
 PikachuCry37::
 	pcm INCBIN "audio/pikachu_cries/pikachu_cry_37.pcm"
diff --git a/audio/wave_instruments.asm b/audio/wave_instruments.asm
index 5095cced..911ce873 100644
--- a/audio/wave_instruments.asm
+++ b/audio/wave_instruments.asm
@@ -8,7 +8,6 @@
 	dw .wave5 ; used in the Lavender Town and Pokemon Tower themes
 	dw .wave5 ; unused
 	dw .wave5 ; unused
-;	dw .wave5 ; unused
 
 ; these are the definitions for the channel 3 instruments
 ; each instrument definition is made up of 32 points (nibbles) that form