Merge pull request #231 from yenatch/sfx-cries

Dump cries and sound effects
author: Bryan Bishop <kanzure@gmail.com> 2014-02-06 20:25:54 -0600
committer: Bryan Bishop <kanzure@gmail.com> 2014-02-06 20:25:54 -0600
commit: 2d160dcece31b0cc0b6103a3d658a1dd0f7f0177 (patch)
tree: 362442c995c4bb4065fa3569a6aee6da3e010df8
parent: 709f495cdffbb7f70367d11804fc0053b79f74aa (diff)
parent: cb40ed08ddfc0930a96c56b205acb649c673b7bc (diff)
112 files changed, 9094 insertions, 974 deletions
diff --git a/audio.asm b/audio.asm
index 704edb501..58af4adaa 100644
--- a/audio.asm
+++ b/audio.asm
@@ -155,12 +155,12 @@ INCLUDE "audio/music/postcredits.asm"
 
 SECTION "Sound Effects", ROMX, BANK[SOUND_EFFECTS]
 
-INCBIN "baserom.gbc",$f0941, $f2787 - $f0941
+INCLUDE "audio/sfx.asm"
 
 
 SECTION "Crystal Sound Effects", ROMX, BANK[CRYSTAL_SOUND_EFFECTS]
 
-INCBIN "baserom.gbc",$17982d, $1799ef - $17982d
+INCLUDE "audio/sfx_crystal.asm"
 
 
 
@@ -168,6 +168,6 @@ SECTION "Cries", ROMX, BANK[CRIES]
 
 CryHeaders:: INCLUDE "audio/cry_headers.asm"
 
-INCBIN "baserom.gbc",$f2d69, $f3fb6 - $f2d69
+INCLUDE "audio/cries.asm"
 
 
diff --git a/audio/cries.asm b/audio/cries.asm
new file mode 100644
index 000000000..85abcc69c
--- /dev/null
+++ b/audio/cries.asm
@@ -0,0 +1,2306 @@
+Cry_26: ; f2d81
+	dbw $84, Cry_26_Ch5
+	dbw $05, Cry_26_Ch6
+	dbw $07, Cry_26_Ch8
+; f2d8a
+
+Cry_28: ; f2d8a
+	dbw $44, Cry_28_Ch5
+	dbw $05, Cry_28_Ch6
+; f2d90
+
+Cry_2C: ; f2d90
+	dbw $44, Cry_2C_Ch5
+	dbw $05, Cry_2C_Ch6
+; f2d96
+
+Cry_27: ; f2d96
+	dbw $84, Cry_27_Ch5
+	dbw $05, Cry_27_Ch6
+	dbw $07, Cry_27_Ch8
+; f2d9f
+
+Cry_2A: ; f2d9f
+	dbw $84, Cry_2A_Ch5
+	dbw $05, Cry_2A_Ch6
+	dbw $07, Cry_2A_Ch8
+; f2da8
+
+Cry_2D: ; f2da8
+	dbw $84, Cry_2D_Ch5
+	dbw $05, Cry_2D_Ch6
+	dbw $07, Cry_2D_Ch8
+; f2db1
+
+Cry_2E: ; f2db1
+	dbw $44, Cry_2E_Ch5
+	dbw $05, Cry_2E_Ch6
+; f2db7
+
+Cry_2F: ; f2db7
+	dbw $84, Cry_2F_Ch5
+	dbw $05, Cry_2F_Ch6
+	dbw $07, Cry_2F_Ch8
+; f2dc0
+
+Cry_2B: ; f2dc0
+	dbw $44, Cry_2B_Ch5
+	dbw $05, Cry_2B_Ch6
+; f2dc6
+
+Cry_30: ; f2dc6
+	dbw $84, Cry_30_Ch5
+	dbw $05, Cry_30_Ch6
+	dbw $07, Cry_30_Ch8
+; f2dcf
+
+Cry_31: ; f2dcf
+	dbw $84, Cry_31_Ch5
+	dbw $05, Cry_31_Ch6
+	dbw $07, Cry_31_Ch8
+; f2dd8
+
+Cry_33: ; f2dd8
+	dbw $44, Cry_33_Ch5
+	dbw $07, Cry_33_Ch8
+; f2dde
+
+Cry_29: ; f2dde
+	dbw $84, Cry_29_Ch5
+	dbw $05, Cry_29_Ch6
+	dbw $07, Cry_29_Ch8
+; f2de7
+
+Cry_35: ; f2de7
+	dbw $44, Cry_35_Ch5
+	dbw $07, Cry_35_Ch8
+; f2ded
+
+Cry_36: ; f2ded
+	dbw $84, Cry_36_Ch5
+	dbw $05, Cry_36_Ch6
+	dbw $07, Cry_36_Ch8
+; f2df6
+
+Cry_38: ; f2df6
+	dbw $84, Cry_38_Ch5
+	dbw $05, Cry_38_Ch6
+	dbw $07, Cry_38_Ch8
+; f2dff
+
+Cry_43: ; f2dff
+	dbw $84, Cry_43_Ch5
+	dbw $05, Cry_43_Ch6
+	dbw $07, Cry_43_Ch8
+; f2e08
+
+Cry_3A: ; f2e08
+	dbw $84, Cry_3A_Ch5
+	dbw $05, Cry_3A_Ch6
+	dbw $07, Cry_3A_Ch8
+; f2e11
+
+Cry_3B: ; f2e11
+	dbw $84, Cry_3B_Ch5
+	dbw $05, Cry_3B_Ch6
+	dbw $07, Cry_3B_Ch8
+; f2e1a
+
+Cry_3C: ; f2e1a
+	dbw $84, Cry_3C_Ch5
+	dbw $05, Cry_3C_Ch6
+	dbw $07, Cry_3C_Ch8
+; f2e23
+
+Cry_3D: ; f2e23
+	dbw $84, Cry_3D_Ch5
+	dbw $05, Cry_3D_Ch6
+	dbw $07, Cry_3D_Ch8
+; f2e2c
+
+Cry_3E: ; f2e2c
+	dbw $84, Cry_3E_Ch5
+	dbw $05, Cry_3E_Ch6
+	dbw $07, Cry_3E_Ch8
+; f2e35
+
+Cry_32: ; f2e35
+	dbw $84, Cry_32_Ch5
+	dbw $05, Cry_32_Ch6
+	dbw $07, Cry_32_Ch8
+; f2e3e
+
+Cry_34: ; f2e3e
+	dbw $84, Cry_34_Ch5
+	dbw $05, Cry_34_Ch6
+	dbw $07, Cry_34_Ch8
+; f2e47
+
+Cry_40: ; f2e47
+	dbw $84, Cry_40_Ch5
+	dbw $05, Cry_40_Ch6
+	dbw $07, Cry_40_Ch8
+; f2e50
+
+Cry_41: ; f2e50
+	dbw $84, Cry_41_Ch5
+	dbw $05, Cry_41_Ch6
+	dbw $07, Cry_41_Ch8
+; f2e59
+
+Cry_42: ; f2e59
+	dbw $84, Cry_42_Ch5
+	dbw $05, Cry_42_Ch6
+	dbw $07, Cry_42_Ch8
+; f2e62
+
+Cry_3F: ; f2e62
+	dbw $84, Cry_3F_Ch5
+	dbw $05, Cry_3F_Ch6
+	dbw $07, Cry_3F_Ch8
+; f2e6b
+
+Cry_37: ; f2e6b
+	dbw $84, Cry_37_Ch5
+	dbw $05, Cry_37_Ch6
+	dbw $07, Cry_37_Ch8
+; f2e74
+
+Cry_39: ; f2e74
+	dbw $84, Cry_39_Ch5
+	dbw $05, Cry_39_Ch6
+	dbw $07, Cry_39_Ch8
+; f2e7d
+
+Cry_37_Ch5: ; f2e7d
+	soundinput $ff
+	unknownmusic0xde $63
+	sound $1, $f8, $05f8
+	sound $8, $9f, $04d8
+	sound $6, $f8, $05c4
+	sound $14, $f2, $0574
+	soundinput $88
+	endchannel
+; f2e94
+
+Cry_37_Ch6: ; f2e94
+	unknownmusic0xde $33
+	sound $1, $c8, $0640
+	sound $6, $ff, $0668
+	sound $7, $a8, $0534
+	sound $14, $a2, $04a4
+	endchannel
+; f2ea7
+
+Cry_37_Ch8: ; f2ea7
+	noise $a, $d6, $6a
+	noise $6, $bc, $6c
+	noise $6, $e2, $5c
+	noise $20, $b4, $6c
+	endchannel
+; f2eb4
+
+Cry_3F_Ch5: ; f2eb4
+	unknownmusic0xde $c4
+	sound $4, $af, $0720
+	sound $2, $f8, $071c
+	sound $2, $f8, $0718
+	sound $2, $f8, $0708
+	sound $2, $f8, $070e
+	sound $c, $c8, $0712
+	sound $4, $91, $070e
+	endchannel
+; f2ed3
+
+Cry_3F_Ch6: ; f2ed3
+	unknownmusic0xde $a
+	sound $1, $b8, $0710
+	sound $3, $d8, $072c
+	sound $4, $d8, $0665
+	sound $1, $b8, $0656
+	sound $1, $d8, $065c
+	sound $c, $f8, $0760
+	sound $4, $c1, $0750
+	endchannel
+; f2ef2
+
+Cry_3F_Ch8: ; f2ef2
+	noise $2, $e8, $3b
+Cry_3F_branch_f2ef5: ; f2ef5
+	noise $1, $f1, $4e
+	loopchannel 5, Cry_3F_branch_f2ef5
+	noise $2, $d8, $3f
+	noise $14, $c2, $5f
+	endchannel
+; f2f03
+
+Cry_42_Ch5: ; f2f03
+	unknownmusic0xde $22
+	sound $1, $f8, $05b0
+	sound $1, $f8, $04b4
+	sound $1, $f8, $05b8
+	sound $3, $f8, $05c0
+	sound $8, $c8, $0490
+	sound $8, $c8, $0480
+	soundinput $fe
+	sound $10, $c3, $0490
+	soundinput $88
+	endchannel
+; f2f26
+
+Cry_42_Ch6: ; f2f26
+	unknownmusic0xde $22
+	sound $8, $b8, $04c8
+	sound $20, $b5, $0410
+	endchannel
+; f2f31
+
+Cry_42_Ch8: ; f2f31
+	noise $3, $ff, $4b
+	noise $3, $ef, $4c
+	noise $20, $b5, $5f
+	endchannel
+; f2f3b
+
+Cry_2F_Ch5: ; f2f3b
+	unknownmusic0xde $33
+	sound $2, $f1, $0550
+	sound $2, $f1, $0530
+	sound $2, $f1, $0510
+	sound $2, $f2, $0650
+	sound $2, $f2, $0640
+	sound $2, $f2, $0630
+	sound $10, $f2, $0550
+	endchannel
+; f2f5a
+
+Cry_2F_Ch6: ; f2f5a
+	unknownmusic0xde $f2
+	sound $4, $e1, $0620
+	sound $5, $e2, $0500
+	sound $6, $e1, $0620
+	sound $2, $e1, $0520
+	sound $10, $e2, $0500
+	endchannel
+; f2f71
+
+Cry_2F_Ch8: ; f2f71
+	noise $2, $8a, $5d
+	noise $2, $9a, $4c
+	noise $5, $9a, $5d
+	noise $2, $9a, $4d
+	noise $2, $9a, $4b
+	noise $2, $9a, $4d
+	noise $2, $9a, $5f
+	noise $10, $b2, $6f
+	endchannel
+; f2f8a
+
+Cry_40_Ch5: ; f2f8a
+	dutycycle $0
+	soundinput $f7
+	sound $2, $f8, $078d
+	sound $2, $f8, $0791
+	soundinput $ff
+	sound $2, $f8, $07ad
+	soundinput $88
+	sound $2, $f8, $07b4
+	soundinput $f7
+	sound $2, $f8, $07b8
+	soundinput $88
+	endchannel
+; f2fab
+
+Cry_40_Ch6: ; f2fab
+	unknownmusic0xde $10
+	sound $2, $c8, $076d
+	sound $2, $c8, $0771
+	sound $2, $c8, $078d
+	sound $2, $c8, $0794
+	sound $2, $c8, $0798
+	endchannel
+; f2fc2
+
+Cry_40_Ch8: ; f2fc2
+	noise $2, $b8, $1
+	noise $2, $b8, $19
+	noise $2, $c8, $18
+	noise $2, $b8, $10
+	noise $8, $c2, $18
+	endchannel
+; f2fd2
+
+Cry_26_Ch5: ; f2fd2
+	unknownmusic0xde $22
+	sound $2, $88, $06d8
+	sound $8, $e2, $06e0
+	sound $2, $61, $06e5
+	sound $2, $e8, $06c0
+	sound $2, $e8, $06b8
+	sound $2, $d8, $06b0
+	sound $8, $c1, $06aa
+	endchannel
+; f2ff1
+
+Cry_26_Ch6: ; f2ff1
+	unknownmusic0xde $63
+	sound $2, $68, $06b1
+	sound $5, $c1, $06b9
+	sound $5, $99, $0760
+	sound $2, $b8, $068c
+	sound $2, $a8, $0684
+	sound $a, $92, $067b
+	endchannel
+; f300c
+
+Cry_26_Ch8: ; f300c
+	noise $1, $99, $6c
+	noise $1, $92, $5c
+	noise $a, $62, $4c
+	noise $2, $68, $6a
+	noise $2, $68, $6b
+	noise $a, $62, $6c
+	endchannel
+; f301f
+
+Cry_28_Ch5: ; f301f
+	tone $0002
+Cry_28_Ch6: ; f3022
+Cry_2C_branch_f3022: ; f3022
+	unknownmusic0xde $52
+	sound $4, $f1, $0796
+	sound $4, $f1, $072d
+	sound $7, $0, $0000
+	sound $10, $f1, $07a7
+	endchannel
+; f3035
+
+Cry_2C_Ch5: ; f3035
+	tone $0002
+Cry_2C_Ch6: ; f3038
+Cry_2C_branch_f3038: ; f3038
+	callchannel Cry_2C_branch_f3022
+	loopchannel 2, Cry_2C_branch_f3038
+	sound $e, $0, $0000
+	sound $8, $f2, $07c2
+	endchannel
+; f3048
+
+Cry_27_Ch5: ; f3048
+	dutycycle $1
+	sound $3, $2c, $07c4
+	sound $1, $0, $0001
+	sound $5, $59, $07b9
+	sound $6, $b4, $07bb
+	endchannel
+; f305b
+
+Cry_27_Ch6: ; f305b
+	unknownmusic0xde $2a
+	sound $3, $2c, $07c7
+	sound $1, $0, $0000
+	sound $5, $59, $07be
+	sound $6, $b4, $07bd
+	endchannel
+; f306e
+
+Cry_27_Ch8: ; f306e
+	noise $3, $92, $10
+	noise $1, $39, $0
+	noise $5, $69, $10
+	noise $6, $93, $0
+	endchannel
+; f307b
+
+Cry_2A_Ch5: ; f307b
+	unknownmusic0xde $f8
+	sound $2, $f1, $04b0
+	sound $2, $f7, $0590
+	sound $8, $f8, $0510
+	sound $3, $f2, $06c0
+	sound $3, $f8, $06ba
+	sound $3, $f2, $06b0
+	sound $10, $f2, $0690
+	endchannel
+; f309a
+
+Cry_2A_Ch6: ; f309a
+	unknownmusic0xde $f2
+	sound $2, $f1, $0720
+	sound $2, $e1, $0650
+	sound $4, $f1, $0750
+	sound $4, $d1, $03a0
+	sound $3, $f1, $0670
+	sound $3, $e1, $0680
+	sound $3, $f2, $0690
+	sound $10, $e2, $06a0
+	endchannel
+; f30bd
+
+Cry_2A_Ch8: ; f30bd
+	noise $2, $89, $2e
+	noise $2, $99, $1f
+	noise $4, $89, $4e
+	noise $4, $89, $7b
+	noise $3, $d8, $4b
+	noise $3, $e7, $4c
+	noise $3, $ec, $4d
+	noise $10, $d2, $4f
+	endchannel
+; f30d6
+
+Cry_2D_Ch5: ; f30d6
+	unknownmusic0xde $66
+	sound $4, $78, $0650
+	sound $4, $f8, $0660
+	sound $4, $f8, $065c
+	sound $1, $f8, $067c
+	sound $4, $f8, $0680
+	sound $4, $f8, $067c
+	sound $4, $f8, $0678
+	sound $4, $f1, $0674
+	endchannel
+; f30f9
+
+Cry_2D_Ch6: ; f30f9
+	unknownmusic0xde $22
+Cry_2D_branch_f30fb: ; f30fb
+	sound $2, $a1, $0600
+	loopchannel 3, Cry_2D_branch_f30fb
+Cry_2D_branch_f3103: ; f3103
+	sound $2, $a1, $0630
+	loopchannel 4, Cry_2D_branch_f3103
+	sound $4, $a2, $0634
+	sound $4, $91, $0638
+	endchannel
+; f3114
+
+Cry_2D_Ch8: ; f3114
+	noise $1, $68, $36
+	noise $10, $88, $6a
+	noise $1, $98, $5e
+	noise $10, $a7, $6e
+	endchannel
+; f3121
+
+Cry_2E_Ch5: ; f3121
+	tone $0020
+	dutycycle $0
+	jumpchannel Cry_2E_branch_f312b
+; f3129
+
+Cry_2E_Ch6: ; f3129
+	unknownmusic0xde $1b
+Cry_2E_branch_f312b: ; f312b
+	sound $8, $39, $072d
+	sound $8, $f1, $0720
+	endchannel
+; f3134
+
+Cry_2E_Ch8: ; f3134
+	noise $8, $3b, $0
+	noise $8, $92, $0
+	endchannel
+; f313b
+
+Cry_2B_Ch5: ; f313b
+	tone $0020
+	dutycycle $0
+	jumpchannel Cry_2B_branch_f3145
+; f3143
+
+Cry_2B_Ch6: ; f3143
+	unknownmusic0xde $1
+Cry_2B_branch_f3145: ; f3145
+Cry_33_branch_f3145: ; f3145
+	sound $4, $3a, $073d
+	sound $6, $f8, $0762
+	sound $6, $f8, $0760
+	sound $6, $f1, $075e
+	endchannel
+; f3156
+
+Cry_30_Ch5: ; f3156
+	tone $0020
+Cry_30_Ch6: ; f3159
+	dutycycle $2
+	sound $8, $2f, $0107
+Cry_30_branch_f315f: ; f315f
+	sound $0, $e1, $0483
+	sound $0, $51, $044e
+	loopchannel 4, Cry_30_branch_f315f
+Cry_30_branch_f316b: ; f316b
+	sound $0, $e1, $03da
+	sound $1, $51, $0312
+	loopchannel 4, Cry_30_branch_f316b
+	endchannel
+; f3178
+
+Cry_30_Ch8: ; f3178
+Cry_33_Ch8: ; f3178
+	noise $8, $3f, $52
+	noise $20, $93, $4f
+	endchannel
+; f317f
+
+Cry_31_Ch5: ; f317f
+	tone $0020
+Cry_31_Ch6: ; f3182
+	unknownmusic0xde $21
+	sound $2, $c8, $0641
+	sound $2, $48, $0641
+	sound $6, $f8, $0790
+	sound $4, $f8, $078e
+	sound $4, $f1, $078b
+	endchannel
+; f3199
+
+Cry_31_Ch8: ; f3199
+	noise $4, $91, $10
+	noise $8, $94, $3
+	endchannel
+; f31a0
+
+Cry_33_Ch5: ; f31a0
+	unknownmusic0xde $a2
+	jumpchannel Cry_33_branch_f3145
+; f31a5
+
+Cry_29_Ch5: ; f31a5
+	dutycycle $1
+	tone $0004
+	jumpchannel Cry_29_branch_f31af
+; f31ad
+
+Cry_29_Ch6: ; f31ad
+	unknownmusic0xde $41
+Cry_29_branch_f31af: ; f31af
+	sound $4, $68, $0758
+	sound $2, $e8, $0760
+	sound $2, $e8, $0767
+	sound $2, $e8, $076c
+	sound $7, $f1, $0767
+	endchannel
+; f31c4
+
+Cry_29_Ch8: ; f31c4
+	noise $4, $29, $0
+	noise $2, $39, $1
+	noise $2, $49, $2
+	noise $2, $59, $1
+	noise $7, $41, $0
+	endchannel
+; f31d4
+
+Cry_35_Ch5: ; f31d4
+	unknownmusic0xde $91
+	sound $c, $f2, $07a6
+	sound $4, $f8, $07b0
+	sound $4, $e8, $03b0
+	sound $6, $f8, $03a0
+	sound $8, $e1, $0290
+	endchannel
+; f31eb
+
+Cry_35_Ch8: ; f31eb
+	noise $c, $b2, $50
+	noise $8, $a8, $60
+	noise $6, $a8, $5b
+	noise $8, $a1, $5c
+	endchannel
+; f31f8
+
+Cry_36_Ch5: ; f31f8
+	tone $0002
+	dutycycle $2
+	jumpchannel Cry_36_branch_f3202
+; f3200
+
+Cry_36_Ch6: ; f3200
+	unknownmusic0xde $1
+Cry_36_branch_f3202: ; f3202
+	sound $3, $f8, $0791
+	sound $3, $d8, $078d
+	sound $2, $0, $0000
+	sound $1, $78, $06c1
+	sound $1, $f8, $0741
+	sound $4, $e1, $0751
+	endchannel
+; f321b
+
+Cry_36_Ch8: ; f321b
+	noise $3, $59, $21
+	noise $3, $81, $0
+	noise $2, $20, $0
+	noise $1, $80, $21
+	noise $1, $80, $10
+	noise $4, $87, $0
+	endchannel
+; f322e
+
+Cry_38_Ch5: ; f322e
+Cry_43_Ch5: ; f322e
+	dutycycle $2
+	sound $2, $99, $0718
+	sound $4, $ab, $0722
+	sound $8, $ab, $0734
+	sound $4, $d6, $0716
+	sound $8, $d1, $0712
+	sound $8, $0, $0000
+	endchannel
+; f3249
+
+Cry_38_Ch6: ; f3249
+Cry_43_Ch6: ; f3249
+	unknownmusic0xde $7
+	sound $2, $b9, $0738
+	sound $4, $cb, $0742
+	sound $8, $cb, $0754
+	sound $4, $f6, $0736
+	sound $8, $f1, $0732
+	sound $8, $0, $0000
+	endchannel
+; f3264
+
+Cry_38_Ch8: ; f3264
+	noise $2, $5b, $4
+	noise $4, $68, $13
+	noise $8, $68, $20
+	noise $4, $68, $13
+	noise $10, $51, $4
+	endchannel
+; f3274
+
+Cry_43_Ch8: ; f3274
+	noise $2, $8b, $59
+	noise $4, $a8, $6a
+	noise $8, $a8, $70
+	noise $4, $a8, $69
+	noise $10, $92, $6c
+	endchannel
+; f3284
+
+Cry_3A_Ch5: ; f3284
+Cry_3C_Ch5: ; f3284
+	unknownmusic0xde $12
+Cry_3A_branch_f3286: ; f3286
+Cry_3C_branch_f3286: ; f3286
+	sound $3, $c1, $0791
+	loopchannel 3, Cry_3A_branch_f3286
+Cry_3A_branch_f328e: ; f328e
+Cry_3C_branch_f328e: ; f328e
+	sound $3, $d1, $04b1
+	loopchannel 6, Cry_3A_branch_f328e
+Cry_3A_branch_f3296: ; f3296
+Cry_3C_branch_f3296: ; f3296
+	sound $1, $d1, $0491
+	sound $1, $b1, $0451
+	loopchannel 6, Cry_3A_branch_f3296
+Cry_3A_branch_f32a2: ; f32a2
+Cry_3C_branch_f32a2: ; f32a2
+	sound $1, $a3, $0471
+	sound $1, $81, $0441
+	loopchannel 6, Cry_3A_branch_f32a2
+Cry_3A_branch_f32ae: ; f32ae
+Cry_3C_branch_f32ae: ; f32ae
+	sound $1, $41, $0421
+	sound $1, $21, $0401
+	loopchannel 4, Cry_3A_branch_f32ae
+	endchannel
+; f32bb
+
+Cry_3A_Ch6: ; f32bb
+Cry_3C_Ch6: ; f32bb
+	unknownmusic0xde $78
+	sound $8, $99, $0740
+	sound $8, $79, $0746
+	sound $10, $f6, $078d
+	sound $8, $f8, $0791
+	sound $8, $f8, $078d
+	sound $8, $f8, $0787
+	sound $18, $e2, $0783
+	endchannel
+; f32da
+
+Cry_3A_Ch8: ; f32da
+	noise $10, $a6, $16
+	noise $18, $98, $3d
+	noise $20, $98, $5c
+	noise $20, $75, $5f
+	endchannel
+; f32e7
+
+Cry_3B_Ch5: ; f32e7
+	unknownmusic0xde $de
+Cry_39_branch_f32e9: ; f32e9
+Cry_3D_branch_f32e9: ; f32e9
+	sound $4, $f8, $07b1
+	sound $4, $f8, $07b0
+	sound $4, $48, $07af
+Cry_39_branch_f32f5: ; f32f5
+	sound $4, $f8, $07b2
+	sound $4, $f8, $07b3
+	sound $4, $48, $07b4
+	endchannel
+; f3302
+
+Cry_39_branch_f3302: ; f3302
+Cry_3B_Ch6: ; f3302
+Cry_3D_Ch6: ; f3302
+	unknownmusic0xde $f2
+	sound $4, $f8, $07b2
+	sound $4, $f8, $07b1
+	sound $4, $28, $07b0
+Cry_39_branch_f3310: ; f3310
+	sound $4, $f8, $07b4
+	sound $4, $f8, $07b6
+	sound $4, $48, $07b8
+	endchannel
+; f331d
+
+Cry_39_branch_f331d: ; f331d
+Cry_3B_Ch8: ; f331d
+Cry_3D_Ch8: ; f331d
+	noise $4, $88, $5
+	noise $4, $88, $4
+	noise $4, $38, $3
+Cry_39_branch_f3326: ; f3326
+	noise $4, $88, $5
+	noise $4, $88, $4
+	noise $4, $87, $4
+	endchannel
+; f3330
+
+Cry_3C_Ch8: ; f3330
+	noise $8, $a6, $3a
+	noise $8, $a1, $5a
+	endchannel
+; f3337
+
+Cry_3D_Ch5: ; f3337
+	dutycycle $0
+	jumpchannel Cry_3D_branch_f32e9
+; f333c
+
+Cry_39_Ch5: ; f333c
+	dutycycle $0
+	callchannel Cry_39_branch_f32e9
+	callchannel Cry_39_branch_f32f5
+	endchannel
+; f3345
+
+Cry_39_Ch6: ; f3345
+	callchannel Cry_39_branch_f3302
+	callchannel Cry_39_branch_f3310
+	endchannel
+; f334c
+
+Cry_39_Ch8: ; f334c
+	callchannel Cry_39_branch_f331d
+	callchannel Cry_39_branch_f3326
+	endchannel
+; f3353
+
+Cry_3E_Ch5: ; f3353
+	unknownmusic0xde $de
+Cry_3E_branch_f3355: ; f3355
+	sound $1, $c1, $0520
+	sound $1, $a1, $0420
+	loopchannel 4, Cry_3E_branch_f3355
+	dutycycle $0
+	sound $4, $78, $0760
+	sound $4, $78, $0730
+	sound $18, $c2, $0420
+	endchannel
+; f3370
+
+Cry_3E_Ch6: ; f3370
+	unknownmusic0xde $32
+	sound $8, $f8, $0700
+	sound $7, $f8, $0720
+	sound $4, $f8, $0790
+	sound $4, $f8, $0760
+	sound $18, $f2, $0730
+	endchannel
+; f3387
+
+Cry_3E_Ch8: ; f3387
+	noise $4, $88, $6d
+	noise $4, $d8, $68
+	noise $7, $c8, $69
+	noise $4, $98, $3a
+	noise $4, $98, $3c
+	noise $18, $d2, $5b
+	endchannel
+; f339a
+
+Cry_32_Ch5: ; f339a
+	unknownmusic0xde $32
+	sound $8, $f8, $0330
+	sound $8, $f8, $0340
+	sound $8, $c8, $07b2
+	sound $8, $b8, $07b3
+	sound $20, $b2, $07b4
+	endchannel
+; f33b1
+
+Cry_32_Ch6: ; f33b1
+	unknownmusic0xde $12
+	sound $8, $e8, $0320
+	sound $8, $e8, $0328
+	sound $8, $98, $0780
+	sound $8, $88, $0782
+	sound $20, $72, $0784
+	endchannel
+; f33c8
+
+Cry_32_Ch8: ; f33c8
+	noise $2, $be, $49
+	noise $5, $be, $3a
+	noise $2, $be, $29
+	noise $28, $d3, $6e
+	endchannel
+; f33d5
+
+Cry_34_Ch5: ; f33d5
+	unknownmusic0xde $39
+	soundinput $ff
+	sound $2, $f8, $0720
+	sound $2, $f8, $0727
+	sound $2, $f8, $0780
+	soundinput $88
+	sound $2, $f8, $0779
+	sound $4, $f8, $0740
+	sound $4, $f8, $073c
+	soundinput $ff
+	sound $8, $f1, $0737
+	soundinput $88
+	endchannel
+; f33fc
+
+Cry_34_Ch6: ; f33fc
+	unknownmusic0xde $22
+	sound $6, $b2, $071e
+	sound $5, $92, $0779
+	sound $4, $82, $073e
+	sound $8, $a1, $0735
+	endchannel
+; f340f
+
+Cry_34_Ch8: ; f340f
+	noise $2, $64, $7f
+	noise $2, $84, $7d
+	noise $2, $a4, $6f
+	noise $2, $64, $6c
+	noise $2, $94, $6f
+	noise $2, $61, $6b
+	endchannel
+; f3422
+
+Cry_41_Ch5: ; f3422
+	unknownmusic0xde $d2
+	sound $3, $f8, $06b0
+	sound $1, $f8, $06a5
+	sound $1, $f8, $069d
+	sound $7, $f1, $068a
+	sound $3, $f8, $0736
+	sound $3, $f8, $0720
+	sound $14, $f2, $070e
+	endchannel
+; f3441
+
+Cry_41_Ch6: ; f3441
+	unknownmusic0xde $27
+Cry_41_branch_f3443: ; f3443
+	sound $1, $f1, $07b4
+	loopchannel 8, Cry_41_branch_f3443
+Cry_41_branch_f344b: ; f344b
+	sound $1, $c1, $0790
+	loopchannel 3, Cry_41_branch_f344b
+Cry_41_branch_f3453: ; f3453
+	sound $1, $b1, $078d
+	loopchannel 2, Cry_41_branch_f3453
+	sound $10, $92, $0795
+	endchannel
+; f3460
+
+Cry_41_Ch8: ; f3460
+Cry_41_branch_f3460: ; f3460
+	noise $0, $f1, $28
+	loopchannel 4, Cry_41_branch_f3460
+	noise $0, $91, $49
+	noise $1, $a8, $4a
+	noise $0, $e1, $4b
+	noise $5, $d2, $4f
+	noise $3, $c2, $4e
+	noise $3, $b2, $4d
+	noise $14, $a3, $4c
+	endchannel
+; f347d
+
+Cry_00: ; f347d
+	dbw $84, Cry_00_Ch5
+	dbw $05, Cry_00_Ch6
+	dbw $07, Cry_00_Ch8
+; f3486
+
+Cry_01: ; f3486
+	dbw $84, Cry_01_Ch5
+	dbw $05, Cry_01_Ch6
+	dbw $07, Cry_01_Ch8
+; f348f
+
+Cry_02: ; f348f
+	dbw $84, Cry_02_Ch5
+	dbw $05, Cry_02_Ch6
+	dbw $07, Cry_02_Ch8
+; f3498
+
+Cry_03: ; f3498
+	dbw $84, Cry_03_Ch5
+	dbw $05, Cry_03_Ch6
+	dbw $07, Cry_03_Ch8
+; f34a1
+
+Cry_04: ; f34a1
+	dbw $84, Cry_04_Ch5
+	dbw $05, Cry_04_Ch6
+	dbw $07, Cry_04_Ch8
+; f34aa
+
+Cry_05: ; f34aa
+	dbw $84, Cry_05_Ch5
+	dbw $05, Cry_05_Ch6
+	dbw $07, Cry_05_Ch8
+; f34b3
+
+Cry_06: ; f34b3
+	dbw $84, Cry_06_Ch5
+	dbw $05, Cry_06_Ch6
+	dbw $07, Cry_06_Ch8
+; f34bc
+
+Cry_07: ; f34bc
+	dbw $84, Cry_07_Ch5
+	dbw $05, Cry_07_Ch6
+	dbw $07, Cry_07_Ch8
+; f34c5
+
+Cry_08: ; f34c5
+	dbw $84, Cry_08_Ch5
+	dbw $05, Cry_08_Ch6
+	dbw $07, Cry_08_Ch8
+; f34ce
+
+Cry_09: ; f34ce
+	dbw $84, Cry_09_Ch5
+	dbw $05, Cry_09_Ch6
+	dbw $07, Cry_09_Ch8
+; f34d7
+
+Cry_0A: ; f34d7
+	dbw $84, Cry_0A_Ch5
+	dbw $05, Cry_0A_Ch6
+	dbw $07, Cry_0A_Ch8
+; f34e0
+
+Cry_0B: ; f34e0
+	dbw $84, Cry_0B_Ch5
+	dbw $05, Cry_0B_Ch6
+	dbw $07, Cry_0B_Ch8
+; f34e9
+
+Cry_0C: ; f34e9
+	dbw $84, Cry_0C_Ch5
+	dbw $05, Cry_0C_Ch6
+	dbw $07, Cry_0C_Ch8
+; f34f2
+
+Cry_0D: ; f34f2
+	dbw $84, Cry_0D_Ch5
+	dbw $05, Cry_0D_Ch6
+	dbw $07, Cry_0D_Ch8
+; f34fb
+
+Cry_0E: ; f34fb
+	dbw $84, Cry_0E_Ch5
+	dbw $05, Cry_0E_Ch6
+	dbw $07, Cry_0E_Ch8
+; f3504
+
+Cry_0F: ; f3504
+	dbw $84, Cry_0F_Ch5
+	dbw $05, Cry_0F_Ch6
+	dbw $07, Cry_0F_Ch8
+; f350d
+
+Cry_10: ; f350d
+	dbw $84, Cry_10_Ch5
+	dbw $05, Cry_10_Ch6
+	dbw $07, Cry_10_Ch8
+; f3516
+
+Cry_11: ; f3516
+	dbw $84, Cry_11_Ch5
+	dbw $05, Cry_11_Ch6
+	dbw $07, Cry_11_Ch8
+; f351f
+
+Cry_12: ; f351f
+	dbw $84, Cry_12_Ch5
+	dbw $05, Cry_12_Ch6
+	dbw $07, Cry_12_Ch8
+; f3528
+
+Cry_13: ; f3528
+	dbw $84, Cry_13_Ch5
+	dbw $05, Cry_13_Ch6
+	dbw $07, Cry_13_Ch8
+; f3531
+
+Cry_14: ; f3531
+	dbw $84, Cry_14_Ch5
+	dbw $05, Cry_14_Ch6
+	dbw $07, Cry_14_Ch8
+; f353a
+
+Cry_15: ; f353a
+	dbw $84, Cry_15_Ch5
+	dbw $05, Cry_15_Ch6
+	dbw $07, Cry_15_Ch8
+; f3543
+
+Cry_16: ; f3543
+	dbw $84, Cry_16_Ch5
+	dbw $05, Cry_16_Ch6
+	dbw $07, Cry_16_Ch8
+; f354c
+
+Cry_17: ; f354c
+	dbw $84, Cry_17_Ch5
+	dbw $05, Cry_17_Ch6
+	dbw $07, Cry_17_Ch8
+; f3555
+
+Cry_18: ; f3555
+	dbw $84, Cry_18_Ch5
+	dbw $05, Cry_18_Ch6
+	dbw $07, Cry_18_Ch8
+; f355e
+
+Cry_19: ; f355e
+	dbw $84, Cry_19_Ch5
+	dbw $05, Cry_19_Ch6
+	dbw $07, Cry_19_Ch8
+; f3567
+
+Cry_1A: ; f3567
+	dbw $84, Cry_1A_Ch5
+	dbw $05, Cry_1A_Ch6
+	dbw $07, Cry_1A_Ch8
+; f3570
+
+Cry_1B: ; f3570
+	dbw $84, Cry_1B_Ch5
+	dbw $05, Cry_1B_Ch6
+	dbw $07, Cry_1B_Ch8
+; f3579
+
+Cry_1C: ; f3579
+	dbw $84, Cry_1C_Ch5
+	dbw $05, Cry_1C_Ch6
+	dbw $07, Cry_1C_Ch8
+; f3582
+
+Cry_1D: ; f3582
+	dbw $84, Cry_1D_Ch5
+	dbw $05, Cry_1D_Ch6
+	dbw $07, Cry_1D_Ch8
+; f358b
+
+Cry_1E: ; f358b
+	dbw $84, Cry_1E_Ch5
+	dbw $05, Cry_1E_Ch6
+	dbw $07, Cry_1E_Ch8
+; f3594
+
+Cry_1F: ; f3594
+	dbw $84, Cry_1F_Ch5
+	dbw $05, Cry_1F_Ch6
+	dbw $07, Cry_1F_Ch8
+; f359d
+
+Cry_20: ; f359d
+	dbw $84, Cry_20_Ch5
+	dbw $05, Cry_20_Ch6
+	dbw $07, Cry_20_Ch8
+; f35a6
+
+Cry_21: ; f35a6
+	dbw $84, Cry_21_Ch5
+	dbw $05, Cry_21_Ch6
+	dbw $07, Cry_21_Ch8
+; f35af
+
+Cry_22: ; f35af
+	dbw $84, Cry_22_Ch5
+	dbw $05, Cry_22_Ch6
+	dbw $07, Cry_22_Ch8
+; f35b8
+
+Cry_23: ; f35b8
+	dbw $84, Cry_23_Ch5
+	dbw $05, Cry_23_Ch6
+	dbw $07, Cry_23_Ch8
+; f35c1
+
+Cry_24: ; f35c1
+	dbw $84, Cry_24_Ch5
+	dbw $05, Cry_24_Ch6
+	dbw $07, Cry_24_Ch8
+; f35ca
+
+Cry_25: ; f35ca
+	dbw $84, Cry_25_Ch5
+	dbw $05, Cry_25_Ch6
+	dbw $07, Cry_25_Ch8
+; f35d3
+
+Unknown_Cry_Ch5: ; f35d3
+	unknownmusic0xde $f0
+	sound $f, $e0, $0780
+	sound $f, $f0, $0784
+	sound $f, $c3, $05e0
+	sound $f, $c4, $0600
+	sound $a, $6c, $0780
+	sound $8, $71, $0784
+	endchannel
+; f35ee
+
+Unknown_Cry_Ch6: ; f35ee
+	unknownmusic0xde $5
+	sound $f, $a0, $0741
+	sound $f, $b0, $0743
+	sound $f, $93, $05b1
+	sound $f, $94, $05c1
+	sound $a, $4c, $0741
+	sound $8, $31, $0746
+	endchannel
+; f3609
+
+Unknown_Cry_Ch8: ; f3609
+	noise $2, $f2, $4c
+	noise $6, $e0, $3a
+	noise $f, $d0, $3a
+	noise $8, $d0, $2c
+	noise $6, $e6, $4c
+	noise $c, $7d, $4c
+	noise $f, $d3, $4c
+	endchannel
+; f361f
+
+Cry_09_Ch5: ; f361f
+	unknownmusic0xde $f0
+	sound $f, $f7, $07a0
+	sound $6, $e6, $07a3
+	sound $a, $f4, $07a0
+	unknownmusic0xde $a5
+	sound $a, $f6, $07d8
+	sound $4, $e3, $07d7
+	sound $f, $f2, $07d8
+	endchannel
+; f363c
+
+Cry_09_Ch6: ; f363c
+	unknownmusic0xde $5
+	sound $2, $8, $0000
+	sound $f, $a7, $06a1
+	sound $6, $86, $06a2
+	sound $a, $74, $06a1
+	unknownmusic0xde $5f
+	sound $a, $76, $06d6
+	sound $4, $83, $06d9
+	sound $f, $a2, $06d7
+	endchannel
+; f365d
+
+Cry_09_Ch8: ; f365d
+	noise $2, $f2, $3c
+	noise $8, $e4, $3e
+	noise $f, $d7, $3c
+	noise $6, $c5, $3b
+	noise $6, $e4, $3d
+	noise $8, $b6, $3c
+	noise $6, $d4, $3d
+	noise $8, $c1, $3b
+	endchannel
+; f3676
+
+Cry_23_Ch5: ; f3676
+	unknownmusic0xde $f0
+	sound $f, $f7, $07c0
+	sound $6, $e4, $07c1
+	sound $a, $f6, $07c0
+	sound $4, $d3, $07c2
+	sound $8, $c1, $07c0
+	endchannel
+; f368d
+
+Cry_23_Ch6: ; f368d
+	unknownmusic0xde $5f
+	sound $f, $97, $0781
+	sound $6, $84, $0780
+	sound $a, $96, $0781
+	sound $f, $83, $0781
+	endchannel
+; f36a0
+
+Cry_23_Ch8: ; f36a0
+	noise $3, $f2, $3c
+	noise $d, $e6, $2c
+	noise $f, $d7, $3c
+	noise $8, $c1, $2c
+	endchannel
+; f36ad
+
+Cry_24_Ch5: ; f36ad
+	unknownmusic0xde $f0
+	sound $f, $f7, $0680
+	sound $a, $e6, $0684
+	sound $f, $d7, $0690
+	sound $8, $d5, $0690
+	sound $6, $c4, $0688
+	sound $5, $d3, $0670
+	sound $4, $d3, $0660
+	sound $8, $c1, $0640
+	endchannel
+; f36d0
+
+Cry_24_Ch6: ; f36d0
+	unknownmusic0xde $5
+	sound $f, $b7, $0641
+	sound $a, $96, $0642
+	sound $f, $a7, $0651
+	sound $8, $a5, $0651
+	sound $6, $94, $0647
+	sound $5, $a3, $0631
+	sound $4, $93, $0622
+	sound $8, $71, $0601
+	endchannel
+; f36f3
+
+Cry_24_Ch8: ; f36f3
+	noise $f, $e4, $3c
+	noise $a, $c7, $4c
+	noise $a, $c7, $3c
+	noise $c, $b7, $4c
+	noise $f, $a2, $5c
+	endchannel
+; f3703
+
+Cry_11_Ch5: ; f3703
+	unknownmusic0xde $f0
+	sound $6, $f7, $07a0
+	sound $8, $e6, $07a4
+	sound $4, $d6, $07a0
+	sound $f, $d3, $0720
+	sound $8, $c3, $0723
+	sound $2, $c2, $0728
+	sound $8, $b1, $0730
+	endchannel
+; f3722
+
+Cry_11_Ch6: ; f3722
+	unknownmusic0xde $a
+	sound $4, $8, $0000
+	sound $6, $a7, $0741
+	sound $8, $86, $0743
+	sound $4, $76, $0741
+	sound $d, $83, $06c2
+	sound $7, $73, $06c1
+	sound $3, $82, $06cc
+	sound $8, $71, $06d8
+	endchannel
+; f3745
+
+Cry_11_Ch8: ; f3745
+	noise $2, $f2, $4c
+	noise $6, $e6, $3a
+	noise $4, $d7, $3a
+	noise $6, $d6, $2c
+	noise $8, $e5, $3c
+	noise $c, $d2, $3d
+	noise $8, $d1, $2c
+	endchannel
+; f375b
+
+Cry_25_Ch5: ; f375b
+	unknownmusic0xde $a5
+	sound $6, $f4, $0740
+	sound $f, $e3, $0730
+	sound $4, $f4, $0740
+	sound $5, $b3, $0748
+	sound $8, $d1, $0750
+	endchannel
+; f3772
+
+Cry_25_Ch6: ; f3772
+	unknownmusic0xde $77
+	sound $6, $c3, $0712
+	sound $f, $b3, $0704
+	sound $3, $c3, $0712
+	sound $4, $c3, $0721
+	sound $8, $b1, $0732
+	endchannel
+; f3789
+
+Cry_25_Ch8: ; f3789
+	noise $8, $d6, $2c
+	noise $c, $c6, $3c
+	noise $a, $b6, $2c
+	noise $8, $91, $1c
+	endchannel
+; f3796
+
+Cry_03_Ch5: ; f3796
+	unknownmusic0xde $f0
+	sound $4, $f7, $0608
+	sound $6, $e6, $0600
+	sound $6, $d7, $05f0
+	sound $6, $c4, $05e0
+	sound $5, $d3, $05c0
+	sound $4, $d3, $05a0
+	sound $8, $e1, $0580
+	endchannel
+; f37b5
+
+Cry_03_Ch6: ; f37b5
+	unknownmusic0xde $a
+	sound $4, $c7, $0504
+	sound $6, $a6, $0502
+	sound $6, $97, $04f1
+	sound $4, $b4, $04e1
+	sound $5, $a3, $04c2
+	sound $4, $b3, $04a3
+	sound $8, $c1, $0482
+	endchannel
+; f37d4
+
+Cry_03_Ch8: ; f37d4
+	noise $c, $e4, $4c
+	noise $a, $c7, $5c
+	noise $c, $b6, $4c
+	noise $f, $a2, $5c
+	endchannel
+; f37e1
+
+Cry_0F_Ch5: ; f37e1
+	unknownmusic0xde $f1
+	sound $4, $f7, $07c0
+	sound $c, $e6, $07c2
+	sound $6, $b5, $0680
+	sound $4, $c4, $0670
+	sound $4, $b5, $0660
+	sound $8, $c1, $0640
+	endchannel
+; f37fc
+
+Cry_0F_Ch6: ; f37fc
+	unknownmusic0xde $cc
+	sound $3, $c7, $0781
+	sound $c, $b6, $0780
+	sound $6, $a5, $0641
+	sound $4, $c4, $0632
+	sound $6, $b5, $0621
+	sound $8, $a1, $0602
+	endchannel
+; f3817
+
+Cry_0F_Ch8: ; f3817
+	noise $3, $e4, $3c
+	noise $c, $d6, $2c
+	noise $4, $e4, $3c
+	noise $8, $b7, $5c
+	noise $f, $c2, $5d
+	endchannel
+; f3827
+
+Cry_10_Ch5: ; f3827
+	unknownmusic0xde $c9
+	sound $8, $f7, $0680
+	sound $2, $f7, $0660
+	sound $1, $e7, $0640
+	sound $1, $e7, $0620
+	sound $f, $d1, $0600
+	sound $4, $c7, $0740
+	sound $4, $a7, $0730
+	sound $f, $91, $0720
+	endchannel
+; f384a
+
+Cry_10_Ch6: ; f384a
+	unknownmusic0xde $79
+	sound $a, $e7, $0682
+	sound $2, $e7, $0662
+	sound $1, $d7, $0642
+	sound $1, $d7, $0622
+	sound $f, $c1, $0602
+	sound $4, $b7, $0742
+	sound $2, $97, $0732
+	sound $f, $81, $0722
+	endchannel
+; f386d
+
+Cry_10_Ch8: ; f386d
+	noise $4, $74, $21
+	noise $4, $74, $10
+	noise $4, $71, $20
+	endchannel
+; f3877
+
+Cry_00_Ch5: ; f3877
+	unknownmusic0xde $f5
+	sound $4, $f3, $0718
+	sound $f, $e5, $0798
+	sound $8, $91, $0758
+	endchannel
+; f3886
+
+Cry_00_Ch6: ; f3886
+	unknownmusic0xde $a0
+	sound $5, $b3, $0708
+	sound $f, $c5, $0788
+	sound $8, $71, $0748
+	endchannel
+; f3895
+
+Cry_00_Ch8: ; f3895
+	noise $3, $a1, $1c
+	noise $e, $94, $2c
+	noise $8, $81, $1c
+	endchannel
+; f389f
+
+Cry_0E_Ch5: ; f389f
+	unknownmusic0xde $a5
+	sound $4, $e1, $0700
+	sound $4, $f2, $0780
+	sound $2, $92, $0740
+	sound $8, $e1, $0600
+	endchannel
+; f38b2
+
+Cry_0E_Ch6: ; f38b2
+	unknownmusic0xde $a
+	sound $4, $b1, $06e1
+	sound $3, $c2, $06e1
+	sound $3, $62, $0681
+	sound $8, $b1, $05e1
+	endchannel
+; f38c5
+
+Cry_0E_Ch8: ; f38c5
+	noise $2, $61, $32
+	noise $2, $61, $21
+	noise $8, $61, $11
+	endchannel
+; f38cf
+
+Cry_06_Ch5: ; f38cf
+	unknownmusic0xde $fa
+	sound $6, $83, $0247
+	sound $f, $62, $0226
+	sound $4, $52, $0245
+	sound $9, $63, $0206
+	sound $f, $82, $0225
+	sound $f, $42, $0207
+Cry_06_Ch6: ; f38e9
+	endchannel
+; f38ea
+
+Cry_06_Ch8: ; f38ea
+	noise $8, $d4, $8c
+	noise $4, $e2, $9c
+	noise $f, $c6, $8c
+	noise $8, $e4, $ac
+	noise $f, $d7, $9c
+	noise $f, $f2, $ac
+	endchannel
+; f38fd
+
+Cry_07_Ch5: ; f38fd
+	unknownmusic0xde $f0
+	sound $4, $f3, $06e0
+	sound $f, $e4, $0640
+	sound $8, $c1, $0620
+	endchannel
+; f390c
+
+Cry_07_Ch6: ; f390c
+	unknownmusic0xde $a
+	sound $3, $c3, $0683
+	sound $e, $b4, $0602
+	sound $8, $a1, $0601
+	endchannel
+; f391b
+
+Cry_07_Ch8: ; f391b
+	noise $4, $d3, $5c
+	noise $f, $e6, $4c
+	noise $8, $b1, $5c
+	endchannel
+; f3925
+
+Cry_05_Ch5: ; f3925
+	unknownmusic0xde $a
+	sound $6, $e2, $0500
+	sound $6, $e3, $0580
+	sound $6, $d3, $0570
+	sound $8, $a1, $0560
+	endchannel
+; f3938
+
+Cry_05_Ch6: ; f3938
+	unknownmusic0xde $f5
+	sound $6, $e2, $0482
+	sound $6, $d3, $0501
+	sound $6, $b2, $04e2
+	sound $8, $81, $04c1
+Cry_05_Ch8: ; f394a
+	endchannel
+; f394b
+
+Cry_0B_Ch5: ; f394b
+	unknownmusic0xde $cc
+	sound $4, $f1, $0700
+	sound $4, $e1, $0780
+	sound $4, $d1, $0740
+	sound $4, $e1, $0740
+	sound $4, $f1, $0780
+	sound $4, $d1, $0700
+	sound $4, $f1, $0701
+	sound $4, $d1, $0782
+	sound $4, $c1, $0742
+	sound $8, $b1, $0741
+	endchannel
+; f3976
+
+Cry_0B_Ch6: ; f3976
+	unknownmusic0xde $44
+	sound $c, $8, $0000
+	sound $4, $f1, $0701
+	sound $4, $e1, $0782
+	sound $4, $d1, $0741
+	sound $4, $e1, $0741
+	sound $4, $f1, $0782
+	sound $8, $d1, $0701
+	endchannel
+; f3995
+
+Cry_0B_Ch8: ; f3995
+	noise $f, $8, $0
+	noise $4, $8, $0
+	noise $4, $d1, $4c
+	noise $4, $b1, $2c
+	noise $4, $d1, $3c
+	noise $4, $b1, $3c
+	noise $4, $c1, $2c
+	noise $8, $a1, $4c
+	endchannel
+; f39ae
+
+Cry_0C_Ch5: ; f39ae
+	unknownmusic0xde $cc
+	sound $8, $f5, $0600
+	sound $2, $d2, $0638
+	sound $2, $c2, $0630
+	sound $2, $c2, $0628
+	sound $2, $b2, $0620
+	sound $2, $b2, $0610
+	sound $2, $a2, $0618
+	sound $2, $b2, $0610
+	sound $8, $c1, $0620
+	endchannel
+; f39d5
+
+Cry_0C_Ch6: ; f39d5
+	unknownmusic0xde $44
+	sound $c, $c3, $05c0
+	sound $3, $b1, $05f9
+	sound $2, $a1, $05f1
+	sound $2, $a1, $05e9
+	sound $2, $91, $05e1
+	sound $2, $91, $05d9
+	sound $2, $81, $05d1
+	sound $2, $91, $05d9
+	sound $8, $91, $05e1
+Cry_0C_Ch8: ; f39fb
+	endchannel
+; f39fc
+
+Cry_02_Ch5: ; f39fc
+	unknownmusic0xde $0
+	sound $8, $f5, $0480
+	sound $2, $e1, $05e0
+	sound $8, $d1, $05dc
+	endchannel
+; f3a0b
+
+Cry_02_Ch6: ; f3a0b
+	unknownmusic0xde $a5
+	sound $7, $95, $0441
+	sound $2, $81, $0521
+	sound $8, $61, $051a
+Cry_02_Ch8: ; f3a19
+	endchannel
+; f3a1a
+
+Cry_0D_Ch5: ; f3a1a
+Cry_0D_branch_f3a1a: ; f3a1a
+	unknownmusic0xde $88
+	sound $5, $f2, $0650
+	sound $9, $d1, $0660
+	sound $5, $e2, $0612
+	sound $9, $c1, $0622
+	sound $5, $f2, $0610
+	sound $6, $d1, $0620
+	loopchannel 2, Cry_0D_branch_f3a1a
+	endchannel
+; f3a39
+
+Cry_0D_Ch6: ; f3a39
+	unknownmusic0xde $40
+	sound $4, $8, $0000
+	sound $5, $f2, $0651
+	sound $9, $d1, $0661
+	sound $5, $e2, $0614
+	sound $8, $c1, $0624
+	sound $5, $f2, $0611
+	sound $c, $d1, $0621
+	sound $5, $e2, $0614
+	sound $8, $c1, $0624
+	sound $5, $f2, $0611
+	sound $4, $d1, $0621
+	endchannel
+; f3a68
+
+Cry_0D_Ch8: ; f3a68
+	noise $6, $d2, $1c
+	noise $9, $b1, $2c
+	noise $8, $c2, $2c
+	noise $9, $b1, $3c
+	noise $6, $c2, $2c
+	noise $9, $a2, $3c
+	noise $7, $c2, $2c
+	noise $5, $a1, $3c
+	noise $9, $c2, $2c
+	noise $4, $a1, $3c
+	endchannel
+; f3a87
+
+Cry_01_Ch5: ; f3a87
+	unknownmusic0xde $a0
+	sound $4, $f3, $0600
+	sound $8, $d5, $0760
+	sound $3, $e2, $0720
+	sound $8, $d1, $0710
+	endchannel
+; f3a9a
+
+Cry_01_Ch6: ; f3a9a
+	unknownmusic0xde $5a
+	sound $5, $b3, $06f1
+	sound $7, $c5, $0752
+	sound $3, $a2, $0711
+	sound $8, $b1, $0601
+	endchannel
+; f3aad
+
+Cry_01_Ch8: ; f3aad
+	noise $3, $a2, $3c
+	noise $c, $94, $2c
+	noise $3, $82, $1c
+	noise $8, $71, $2c
+	endchannel
+; f3aba
+
+Cry_0A_Ch5: ; f3aba
+	unknownmusic0xde $f0
+	sound $8, $f7, $06e0
+	sound $6, $e6, $06e5
+	sound $3, $f4, $06e0
+	sound $3, $f6, $06d0
+	sound $3, $e3, $06c0
+	sound $4, $f2, $06b0
+	sound $f, $a2, $06c8
+	endchannel
+; f3ad9
+
+Cry_0A_Ch6: ; f3ad9
+	unknownmusic0xde $5
+	sound $3, $8, $0000
+	sound $8, $a7, $06a1
+	sound $6, $86, $06a3
+	sound $3, $74, $06a1
+	sound $3, $76, $0691
+	sound $3, $83, $0682
+	sound $4, $a2, $0671
+	sound $f, $72, $0689
+	endchannel
+; f3afc
+
+Cry_0A_Ch8: ; f3afc
+	noise $2, $f2, $3c
+	noise $8, $e4, $3e
+	noise $8, $d7, $3c
+	noise $5, $c5, $3b
+	noise $3, $d4, $2c
+	noise $2, $b6, $3c
+	noise $3, $a4, $2c
+	noise $8, $91, $3c
+	endchannel
+; f3b15
+
+Cry_08_Ch5: ; f3b15
+	unknownmusic0xde $f0
+	sound $f, $f6, $0565
+	sound $a, $e4, $057c
+	sound $3, $c2, $055c
+	sound $f, $b2, $053c
+	endchannel
+; f3b28
+
+Cry_08_Ch6: ; f3b28
+	unknownmusic0xde $5a
+	sound $e, $d6, $0503
+	sound $9, $b4, $051b
+	sound $4, $92, $04fa
+	sound $f, $a2, $04db
+	endchannel
+; f3b3b
+
+Cry_08_Ch8: ; f3b3b
+	noise $c, $e6, $4c
+	noise $b, $d7, $5c
+	noise $f, $c2, $4c
+	endchannel
+; f3b45
+
+Cry_04_Ch5: ; f3b45
+	unknownmusic0xde $f0
+	sound $4, $f7, $06a0
+	sound $8, $e6, $06a4
+	sound $4, $d6, $06a0
+	sound $c, $d3, $0620
+	sound $8, $c3, $0624
+	sound $4, $c2, $0620
+	sound $8, $b1, $0610
+	endchannel
+; f3b64
+
+Cry_04_Ch6: ; f3b64
+	unknownmusic0xde $5a
+	sound $4, $e7, $0601
+	sound $8, $d6, $0603
+	sound $4, $c6, $0601
+	sound $c, $c3, $0581
+	sound $8, $b3, $0583
+	sound $4, $b2, $0582
+	sound $8, $a1, $0571
+	endchannel
+; f3b83
+
+Cry_04_Ch8: ; f3b83
+	noise $7, $d6, $5c
+	noise $8, $e6, $4c
+	noise $4, $d4, $5c
+	noise $4, $d4, $4c
+	noise $7, $c3, $4c
+	noise $8, $a1, $5c
+	endchannel
+; f3b96
+
+Cry_19_Ch5: ; f3b96
+	unknownmusic0xde $1b
+	sound $7, $d2, $0740
+	sound $f, $e5, $0760
+	sound $18, $c1, $0730
+	endchannel
+; f3ba5
+
+Cry_19_Ch6: ; f3ba5
+	unknownmusic0xde $81
+	sound $2, $c2, $0701
+	sound $4, $c2, $0708
+	sound $f, $d7, $0741
+	sound $18, $a2, $0701
+Cry_19_Ch8: ; f3bb7
+	endchannel
+; f3bb8
+
+Cry_16_Ch5: ; f3bb8
+	unknownmusic0xde $f0
+	sound $f, $d7, $0780
+	sound $4, $e6, $07a0
+	sound $f, $d2, $0740
+	endchannel
+; f3bc7
+
+Cry_16_Ch6: ; f3bc7
+	unknownmusic0xde $5a
+	sound $f, $c7, $0753
+	sound $5, $b6, $0772
+	sound $f, $c2, $0711
+	endchannel
+; f3bd6
+
+Cry_16_Ch8: ; f3bd6
+	noise $d, $f6, $4c
+	noise $4, $e6, $3c
+	noise $f, $f2, $4c
+	endchannel
+; f3be0
+
+Cry_1B_Ch5: ; f3be0
+	unknownmusic0xde $f0
+	sound $6, $f7, $06c0
+	sound $f, $e7, $0700
+	sound $4, $f4, $06f0
+	sound $4, $e4, $06e0
+	sound $8, $d1, $06d0
+	endchannel
+; f3bf7
+
+Cry_1B_Ch6: ; f3bf7
+	unknownmusic0xde $a
+	sound $7, $e6, $0681
+	sound $e, $d5, $06c1
+	sound $4, $c4, $06b1
+	sound $4, $d4, $06a1
+	sound $8, $c1, $0691
+	endchannel
+; f3c0e
+
+Cry_1B_Ch8: ; f3c0e
+	noise $a, $a6, $3c
+	noise $e, $94, $2c
+	noise $5, $a3, $3c
+	noise $8, $91, $2c
+	endchannel
+; f3c1b
+
+Cry_12_Ch5: ; f3c1b
+	unknownmusic0xde $a5
+	sound $c, $f2, $0440
+	sound $f, $e3, $04a0
+	sound $4, $d2, $0490
+	sound $8, $d1, $0480
+	endchannel
+; f3c2e
+
+Cry_12_Ch6: ; f3c2e
+	unknownmusic0xde $ee
+	sound $b, $d2, $0438
+	sound $e, $c6, $0498
+	sound $3, $b2, $0488
+	sound $8, $b1, $0478
+	endchannel
+; f3c41
+
+Cry_12_Ch8: ; f3c41
+	noise $a, $e6, $6c
+	noise $f, $d2, $5c
+	noise $3, $c2, $6c
+	noise $8, $d1, $5c
+	endchannel
+; f3c4e
+
+Cry_13_Ch5: ; f3c4e
+	unknownmusic0xde $33
+	sound $f, $f6, $05c0
+	sound $8, $e3, $05bc
+	sound $6, $d2, $05d0
+	sound $6, $b2, $05e0
+	sound $6, $c2, $05f0
+	sound $8, $b1, $0600
+	endchannel
+; f3c69
+
+Cry_13_Ch6: ; f3c69
+	unknownmusic0xde $99
+	sound $e, $c6, $04b1
+	sound $7, $c3, $04ad
+	sound $5, $b2, $04c1
+	sound $8, $92, $04d1
+	sound $6, $a2, $04e1
+	sound $8, $91, $04f1
+	endchannel
+; f3c84
+
+Cry_13_Ch8: ; f3c84
+	noise $a, $e6, $5c
+	noise $a, $d6, $6c
+	noise $4, $c2, $4c
+	noise $6, $d3, $5c
+	noise $8, $b3, $4c
+	noise $8, $a1, $5c
+	endchannel
+; f3c97
+
+Cry_14_Ch5: ; f3c97
+	unknownmusic0xde $f0
+	sound $8, $e4, $0790
+	sound $f, $f5, $07c0
+	sound $8, $d1, $07d8
+	endchannel
+; f3ca6
+
+Cry_14_Ch6: ; f3ca6
+	unknownmusic0xde $a5
+	sound $a, $c4, $0771
+	sound $f, $b6, $07a2
+	sound $8, $a1, $07b7
+	endchannel
+; f3cb5
+
+Cry_14_Ch8: ; f3cb5
+	noise $8, $e4, $4c
+	noise $e, $c4, $3c
+	noise $8, $d1, $2c
+	endchannel
+; f3cbf
+
+Cry_1E_Ch5: ; f3cbf
+	unknownmusic0xde $f0
+	sound $6, $f2, $0600
+	sound $6, $e2, $0640
+	sound $6, $d2, $0680
+	sound $6, $e2, $06c0
+	sound $6, $d2, $0700
+	sound $6, $c2, $0740
+	sound $6, $b2, $0780
+	sound $8, $a1, $07c0
+	endchannel
+; f3ce2
+
+Cry_1E_Ch6: ; f3ce2
+	unknownmusic0xde $11
+	sound $3, $8, $0001
+	sound $6, $c2, $05c1
+	sound $6, $b2, $0602
+	sound $6, $a2, $0641
+	sound $6, $b2, $0682
+	sound $6, $a2, $06c2
+	sound $6, $92, $0701
+	sound $6, $a2, $0742
+	sound $8, $81, $0781
+	endchannel
+; f3d09
+
+Cry_1E_Ch8: ; f3d09
+	noise $6, $8, $1
+	noise $5, $e2, $5c
+	noise $5, $c2, $4c
+	noise $5, $d2, $3c
+	noise $5, $b2, $2c
+	noise $5, $c2, $1c
+	noise $5, $a2, $1b
+	noise $5, $92, $1a
+	noise $8, $81, $18
+	endchannel
+; f3d25
+
+Cry_15_Ch5: ; f3d25
+	unknownmusic0xde $f0
+	sound $4, $f3, $0780
+	sound $f, $e7, $0700
+	sound $8, $d3, $0710
+	sound $4, $c2, $0700
+	sound $4, $d2, $06f0
+	sound $8, $c1, $06e0
+	endchannel
+; f3d40
+
+Cry_15_Ch6: ; f3d40
+	unknownmusic0xde $5a
+	sound $6, $c3, $0701
+	sound $e, $b7, $0681
+	sound $7, $b3, $0692
+	sound $3, $a2, $0681
+	sound $4, $b2, $0672
+	sound $8, $a1, $0661
+	endchannel
+; f3d5b
+
+Cry_15_Ch8: ; f3d5b
+	noise $6, $e3, $5c
+	noise $e, $d6, $4c
+	noise $6, $c6, $3c
+	noise $3, $b3, $4c
+	noise $3, $a2, $5c
+	noise $8, $b1, $6c
+	endchannel
+; f3d6e
+
+Cry_17_Ch5: ; f3d6e
+	unknownmusic0xde $f
+	sound $f, $f7, $0500
+	sound $f, $e7, $0508
+	sound $8, $b4, $0480
+	sound $f, $a2, $0460
+	endchannel
+; f3d81
+
+Cry_17_Ch6: ; f3d81
+	unknownmusic0xde $44
+	sound $e, $d7, $0481
+	sound $e, $c7, $0489
+	sound $a, $b4, $0401
+	sound $f, $c2, $03e1
+	endchannel
+; f3d94
+
+Cry_17_Ch8: ; f3d94
+	noise $e, $f7, $7c
+	noise $c, $f6, $6c
+	noise $9, $e4, $7c
+	noise $f, $e2, $6c
+	endchannel
+; f3da1
+
+Cry_1C_Ch5: ; f3da1
+	unknownmusic0xde $f5
+	sound $7, $d6, $07e1
+	sound $6, $c6, $07e2
+	sound $9, $d6, $07e1
+	sound $7, $c6, $07e0
+	sound $5, $b6, $07e2
+	sound $7, $c6, $07e1
+	sound $6, $b6, $07e0
+	sound $8, $a1, $07df
+	endchannel
+; f3dc4
+
+Cry_1C_Ch6: ; f3dc4
+	unknownmusic0xde $44
+	sound $6, $c3, $07c9
+	sound $6, $b3, $07c7
+	sound $a, $c4, $07c3
+	sound $8, $b4, $07c7
+	sound $6, $c3, $07c9
+	sound $f, $a2, $07c5
+	endchannel
+; f3ddf
+
+Cry_1C_Ch8: ; f3ddf
+	noise $d, $19, $7c
+	noise $d, $f7, $8c
+	noise $c, $d6, $7c
+	noise $8, $c4, $6c
+	noise $f, $b3, $5c
+	endchannel
+; f3def
+
+Cry_1A_Ch5: ; f3def
+	unknownmusic0xde $f0
+	sound $6, $f7, $0740
+	sound $c, $e6, $0744
+	sound $6, $d5, $0750
+	sound $4, $c3, $0760
+	sound $3, $c3, $0780
+	sound $8, $d1, $07a0
+	endchannel
+; f3e0a
+
+Cry_1A_Ch6: ; f3e0a
+	unknownmusic0xde $a
+	sound $6, $c7, $0701
+	sound $b, $b6, $0702
+	sound $6, $a5, $0711
+	sound $4, $93, $0721
+	sound $3, $a3, $0741
+	sound $8, $91, $0762
+	endchannel
+; f3e25
+
+Cry_1A_Ch8: ; f3e25
+	noise $3, $e2, $3c
+	noise $8, $d6, $4c
+	noise $5, $d4, $3c
+	noise $c, $c7, $4c
+	noise $2, $e2, $3c
+	noise $8, $d1, $2c
+	endchannel
+; f3e38
+
+Cry_1D_Ch5: ; f3e38
+	unknownmusic0xde $f4
+	sound $f, $f0, $0705
+	sound $a, $e0, $0700
+	sound $6, $b4, $0710
+	sound $4, $d3, $0700
+	sound $6, $b2, $0620
+	sound $8, $a1, $0624
+	endchannel
+; f3e53
+
+Cry_1D_Ch6: ; f3e53
+	unknownmusic0xde $22
+	sound $f, $b0, $06c3
+	sound $a, $a0, $06c1
+	sound $6, $84, $06d2
+	sound $4, $93, $06c1
+	sound $6, $82, $05e1
+	sound $8, $61, $05e8
+	endchannel
+; f3e6e
+
+Cry_1D_Ch8: ; f3e6e
+	noise $6, $e6, $4c
+	noise $f, $d6, $3c
+	noise $a, $c5, $4a
+	noise $1, $b2, $5b
+	noise $f, $c2, $4c
+	endchannel
+; f3e7e
+
+Cry_18_Ch5: ; f3e7e
+	unknownmusic0xde $50
+	sound $a, $f5, $0680
+	sound $3, $e2, $06a0
+	sound $3, $f2, $06c0
+	sound $3, $e2, $06e0
+	sound $3, $d2, $0700
+	sound $3, $c2, $06e0
+	sound $3, $d2, $06c0
+	sound $8, $c1, $06a0
+	endchannel
+; f3ea1
+
+Cry_18_Ch6: ; f3ea1
+	unknownmusic0xde $f
+	sound $9, $d5, $0631
+	sound $3, $d2, $0652
+	sound $3, $e2, $0671
+	sound $3, $b2, $0691
+	sound $3, $c2, $06b2
+	sound $3, $b2, $0691
+	sound $3, $c2, $0671
+	sound $8, $b1, $0651
+	endchannel
+; f3ec4
+
+Cry_18_Ch8: ; f3ec4
+	noise $6, $e3, $4c
+	noise $4, $c3, $3c
+	noise $5, $d4, $3c
+	noise $4, $c4, $2c
+	noise $6, $b4, $3c
+	noise $8, $c1, $2c
+	endchannel
+; f3ed7
+
+Cry_1F_Ch5: ; f3ed7
+	unknownmusic0xde $a5
+	sound $3, $f4, $0641
+	sound $d, $d6, $0721
+	sound $8, $f4, $0719
+	sound $8, $c1, $071a
+	endchannel
+; f3eea
+
+Cry_1F_Ch6: ; f3eea
+	unknownmusic0xde $cc
+	sound $4, $f4, $0580
+	sound $e, $e6, $06e0
+	sound $8, $d5, $06d8
+	sound $8, $d1, $06dc
+	endchannel
+; f3efd
+
+Cry_1F_Ch8: ; f3efd
+	noise $5, $c4, $46
+	noise $d, $a5, $44
+	noise $8, $c4, $45
+	noise $8, $b1, $44
+	endchannel
+; f3f0a
+
+Cry_20_Ch5: ; f3f0a
+	unknownmusic0xde $f0
+	sound $d, $f1, $0511
+	sound $d, $e1, $0515
+	sound $d, $e1, $0511
+	sound $8, $d1, $0511
+	endchannel
+; f3f1d
+
+Cry_20_Ch6: ; f3f1d
+	unknownmusic0xde $15
+	sound $c, $e1, $050c
+	sound $c, $d1, $0510
+	sound $e, $c1, $050c
+	sound $8, $c1, $050a
+	endchannel
+; f3f30
+
+Cry_20_Ch8: ; f3f30
+	noise $e, $f2, $65
+	noise $d, $e2, $55
+	noise $e, $d2, $56
+	noise $8, $d1, $66
+	endchannel
+; f3f3d
+
+Cry_21_Ch5: ; f3f3d
+	unknownmusic0xde $1b
+	sound $3, $f3, $0564
+	sound $2, $e2, $0544
+	sound $5, $d1, $0522
+	sound $2, $b2, $0484
+	sound $8, $d1, $04a2
+	sound $3, $f3, $0524
+	sound $4, $e4, $04e4
+	sound $8, $d1, $0502
+	endchannel
+; f3f60
+
+Cry_21_Ch6: ; f3f60
+	unknownmusic0xde $cc
+	sound $3, $d3, $0560
+	sound $2, $c2, $0540
+	sound $5, $c1, $0520
+	sound $2, $92, $0480
+	sound $8, $c1, $04a0
+	sound $3, $d3, $0520
+	sound $3, $c4, $04e0
+	sound $8, $c1, $0500
+Cry_21_Ch8: ; f3f82
+	endchannel
+; f3f83
+
+Cry_22_Ch5: ; f3f83
+	unknownmusic0xde $11
+	sound $2, $3d, $0381
+	sound $7, $f5, $0601
+	sound $1, $c2, $0481
+	sound $8, $91, $0381
+	endchannel
+; f3f96
+
+Cry_22_Ch6: ; f3f96
+	unknownmusic0xde $ee
+	sound $2, $3e, $05b0
+	sound $7, $d5, $075d
+	sound $1, $b2, $06b0
+	sound $8, $61, $05b0
+	endchannel
+; f3fa9
+
+Cry_22_Ch8: ; f3fa9
+	noise $2, $92, $49
+	noise $7, $b5, $29
+	noise $1, $a2, $39
+	noise $8, $91, $49
+	endchannel
+; f3fb6
diff --git a/audio/cry_headers.asm b/audio/cry_headers.asm
index 76ba19bdc..1a80e1434 100644
--- a/audio/cry_headers.asm
+++ b/audio/cry_headers.asm
@@ -1504,4 +1504,27 @@ CelebiCryHeader: ; 0xf2d63
 	db $01  ; echo
 	dw $111 ; length
 
+CryHeader252: ; 0xf2d69
+	dw 0    ; cry id
+	db 0    ; pitch
+	db 0    ; echo
+	dw 0    ; length
+
+CryHeader253: ; 0xf2d6f
+	dw 0    ; cry id
+	db 0    ; pitch
+	db 0    ; echo
+	dw 0    ; length
+
+CryHeader254: ; 0xf2d75
+	dw 0    ; cry id
+	db 0    ; pitch
+	db 0    ; echo
+	dw 0    ; length
+
+CryHeader255: ; 0xf2d7b
+	dw 0    ; cry id
+	db 0    ; pitch
+	db 0    ; echo
+	dw 0    ; length
 
diff --git a/audio/cry_pointers.asm b/audio/cry_pointers.asm
index 8dffe7277..d58a6f090 100644
--- a/audio/cry_pointers.asm
+++ b/audio/cry_pointers.asm
@@ -1,70 +1,70 @@
 ; e91b0
-	dbw $3c, $747d
-	dbw $3c, $7486
-	dbw $3c, $748f
-	dbw $3c, $7498
-	dbw $3c, $74a1
-	dbw $3c, $74aa
-	dbw $3c, $74b3
-	dbw $3c, $74bc
-	dbw $3c, $74c5
-	dbw $3c, $74ce
-	dbw $3c, $74d7
-	dbw $3c, $74e0
-	dbw $3c, $74e9
-	dbw $3c, $74f2
-	dbw $3c, $74fb
-	dbw $3c, $7504
-	dbw $3c, $750d
-	dbw $3c, $7516
-	dbw $3c, $751f
-	dbw $3c, $7528
-	dbw $3c, $7531
-	dbw $3c, $753a
-	dbw $3c, $7543
-	dbw $3c, $754c
-	dbw $3c, $7555
-	dbw $3c, $755e
-	dbw $3c, $7567
-	dbw $3c, $7570
-	dbw $3c, $7579
-	dbw $3c, $7582
-	dbw $3c, $758b
-	dbw $3c, $7594
-	dbw $3c, $759d
-	dbw $3c, $75a6
-	dbw $3c, $75af
-	dbw $3c, $75b8
-	dbw $3c, $75c1
-	dbw $3c, $75ca
-	dbw $3c, $6d81
-	dbw $3c, $6d96
-	dbw $3c, $6d8a
-	dbw $3c, $6dde
-	dbw $3c, $6d9f
-	dbw $3c, $6dc0
-	dbw $3c, $6d90
-	dbw $3c, $6da8
-	dbw $3c, $6db1
-	dbw $3c, $6db7
-	dbw $3c, $6dc6
-	dbw $3c, $6dcf
-	dbw $3c, $6e35
-	dbw $3c, $6dd8
-	dbw $3c, $6e3e
-	dbw $3c, $6de7
-	dbw $3c, $6ded
-	dbw $3c, $6e6b
-	dbw $3c, $6df6
-	dbw $3c, $6e74
-	dbw $3c, $6e08
-	dbw $3c, $6e11
-	dbw $3c, $6e1a
-	dbw $3c, $6e23
-	dbw $3c, $6e2c
-	dbw $3c, $6e62
-	dbw $3c, $6e47
-	dbw $3c, $6e50
-	dbw $3c, $6e59
-	dbw $3c, $6dff
+	dbw BANK(Cry_00), Cry_00
+	dbw BANK(Cry_01), Cry_01
+	dbw BANK(Cry_02), Cry_02
+	dbw BANK(Cry_03), Cry_03
+	dbw BANK(Cry_04), Cry_04
+	dbw BANK(Cry_05), Cry_05
+	dbw BANK(Cry_06), Cry_06
+	dbw BANK(Cry_07), Cry_07
+	dbw BANK(Cry_08), Cry_08
+	dbw BANK(Cry_09), Cry_09
+	dbw BANK(Cry_0A), Cry_0A
+	dbw BANK(Cry_0B), Cry_0B
+	dbw BANK(Cry_0C), Cry_0C
+	dbw BANK(Cry_0D), Cry_0D
+	dbw BANK(Cry_0E), Cry_0E
+	dbw BANK(Cry_0F), Cry_0F
+	dbw BANK(Cry_10), Cry_10
+	dbw BANK(Cry_11), Cry_11
+	dbw BANK(Cry_12), Cry_12
+	dbw BANK(Cry_13), Cry_13
+	dbw BANK(Cry_14), Cry_14
+	dbw BANK(Cry_15), Cry_15
+	dbw BANK(Cry_16), Cry_16
+	dbw BANK(Cry_17), Cry_17
+	dbw BANK(Cry_18), Cry_18
+	dbw BANK(Cry_19), Cry_19
+	dbw BANK(Cry_1A), Cry_1A
+	dbw BANK(Cry_1B), Cry_1B
+	dbw BANK(Cry_1C), Cry_1C
+	dbw BANK(Cry_1D), Cry_1D
+	dbw BANK(Cry_1E), Cry_1E
+	dbw BANK(Cry_1F), Cry_1F
+	dbw BANK(Cry_20), Cry_20
+	dbw BANK(Cry_21), Cry_21
+	dbw BANK(Cry_22), Cry_22
+	dbw BANK(Cry_23), Cry_23
+	dbw BANK(Cry_24), Cry_24
+	dbw BANK(Cry_25), Cry_25
+	dbw BANK(Cry_26), Cry_26
+	dbw BANK(Cry_27), Cry_27
+	dbw BANK(Cry_28), Cry_28
+	dbw BANK(Cry_29), Cry_29
+	dbw BANK(Cry_2A), Cry_2A
+	dbw BANK(Cry_2B), Cry_2B
+	dbw BANK(Cry_2C), Cry_2C
+	dbw BANK(Cry_2D), Cry_2D
+	dbw BANK(Cry_2E), Cry_2E
+	dbw BANK(Cry_2F), Cry_2F
+	dbw BANK(Cry_30), Cry_30
+	dbw BANK(Cry_31), Cry_31
+	dbw BANK(Cry_32), Cry_32
+	dbw BANK(Cry_33), Cry_33
+	dbw BANK(Cry_34), Cry_34
+	dbw BANK(Cry_35), Cry_35
+	dbw BANK(Cry_36), Cry_36
+	dbw BANK(Cry_37), Cry_37
+	dbw BANK(Cry_38), Cry_38
+	dbw BANK(Cry_39), Cry_39
+	dbw BANK(Cry_3A), Cry_3A
+	dbw BANK(Cry_3B), Cry_3B
+	dbw BANK(Cry_3C), Cry_3C
+	dbw BANK(Cry_3D), Cry_3D
+	dbw BANK(Cry_3E), Cry_3E
+	dbw BANK(Cry_3F), Cry_3F
+	dbw BANK(Cry_40), Cry_40
+	dbw BANK(Cry_41), Cry_41
+	dbw BANK(Cry_42), Cry_42
+	dbw BANK(Cry_43), Cry_43
 ; e927c
diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm
index b6683e2a8..3d06b88df 100644
--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -5,7 +5,6 @@ Music_AfterTheRivalFight: ; f5127
 	dbw $03, Music_AfterTheRivalFight_Ch4
 ; f5133
 
-
 Music_AfterTheRivalFight_Ch1: ; f5133
 	tempo 112
 	volume $77
@@ -24,6 +23,7 @@ Music_AfterTheRivalFight_Ch1: ; f5133
 	note G#, 2
 	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1
+; f5153
 
 Music_AfterTheRivalFight_Ch2: ; f5153
 	dutycycle $1
@@ -39,6 +39,7 @@ Music_AfterTheRivalFight_Ch2: ; f5153
 	note G#, 2
 	note G#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f502e
+; f516a
 
 Music_AfterTheRivalFight_Ch3: ; f516a
 	notetype $c, $28
@@ -52,6 +53,7 @@ Music_AfterTheRivalFight_Ch3: ; f516a
 	note F_, 2
 	note D#, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f509d
+; f517a
 
 Music_AfterTheRivalFight_Ch4: ; f517a
 	togglenoise $3
@@ -65,3 +67,5 @@ Music_AfterTheRivalFight_Ch4: ; f517a
 	note D_, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
 ; f518a
+
+
diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm
index 200849b6f..55365d9a7 100644
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -5,7 +5,6 @@ Music_AzaleaTown: ; f57e8
 	dbw $03, Music_AzaleaTown_Ch4
 ; f57f4
 
-
 Music_AzaleaTown_Ch1: ; f57f4
 	tempo 160
 	volume $77
@@ -13,7 +12,6 @@ Music_AzaleaTown_Ch1: ; f57f4
 	stereopanning $f
 	notetype $c, $a1
 	note __, 2
-
 Music_AzaleaTown_branch_f5801: ; f5801
 	intensity $a1
 	octave 3
@@ -29,7 +27,6 @@ Music_AzaleaTown_branch_f5801: ; f5801
 	note F_, 2
 	note F_, 2
 	loopchannel 2, Music_AzaleaTown_branch_f5801
-
 Music_AzaleaTown_branch_f5816: ; f5816
 	callchannel Music_AzaleaTown_branch_f588c
 	stereopanning $f0
@@ -233,6 +230,7 @@ Music_AzaleaTown_branch_f5912: ; f5912
 	intensity $a1
 	note A_, 8
 	endchannel
+; f591d
 
 Music_AzaleaTown_Ch2: ; f591d
 	vibrato $12, $23
@@ -270,7 +268,6 @@ Music_AzaleaTown_Ch2: ; f591d
 	dutycycle $1
 	octave 5
 	note C_, 1
-
 Music_AzaleaTown_branch_f5952: ; f5952
 	callchannel Music_AzaleaTown_branch_f59c7
 	note C#, 4
@@ -423,6 +420,7 @@ Music_AzaleaTown_branch_f59c7: ; f59c7
 	note D#, 12
 	intensity $b4
 	endchannel
+; f5a08
 
 Music_AzaleaTown_Ch3: ; f5a08
 	stereopanning $ff
@@ -448,7 +446,6 @@ Music_AzaleaTown_Ch3: ; f5a08
 	note C#, 1
 	note __, 1
 	note G#, 4
-
 Music_AzaleaTown_branch_f5a24: ; f5a24
 	callchannel Music_AzaleaTown_branch_f5a86
 	note G#, 4
@@ -634,12 +631,12 @@ Music_AzaleaTown_branch_f5acf: ; f5acf
 	note F_, 1
 	note __, 1
 	endchannel
+; f5ae5
 
 Music_AzaleaTown_Ch4: ; f5ae5
 	togglenoise $3
 	notetype $c
 	note F_, 2
-
 Music_AzaleaTown_branch_f5aea: ; f5aea
 	note D#, 2
 	note F#, 2
@@ -664,3 +661,5 @@ Music_AzaleaTown_branch_f5aea: ; f5aea
 	note F#, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5aea
 ; f5b03
+
+
diff --git a/audio/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm
index 11860a064..f4031b20d 100644
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -5,7 +5,6 @@ Music_BattleTowerLobby: ; 17948b
 	dbw $03, Music_BattleTowerLobby_Ch4
 ; 179497
 
-
 Music_BattleTowerLobby_Ch1: ; 179497
 	tempo 152
 	volume $77
@@ -14,7 +13,6 @@ Music_BattleTowerLobby_Ch1: ; 179497
 	vibrato $8, $22
 	stereopanning $f0
 	notetype $c, $72
-
 Music_BattleTowerLobby_branch_1794a9: ; 1794a9
 	notetype $c, $72
 	octave 3
@@ -118,13 +116,13 @@ Music_BattleTowerLobby_branch_1794a9: ; 1794a9
 	octave 2
 	note B_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_1794a9
+; 17953a
 
 Music_BattleTowerLobby_Ch2: ; 17953a
 	dutycycle $2
 	vibrato $10, $34
 	stereopanning $f
 	notetype $c, $82
-
 Music_BattleTowerLobby_branch_179544: ; 179544
 	notetype $c, $82
 	octave 4
@@ -203,10 +201,10 @@ Music_BattleTowerLobby_branch_179544: ; 179544
 	octave 4
 	note D#, 1
 	loopchannel 0, Music_BattleTowerLobby_branch_179544
+; 1795ae
 
 Music_BattleTowerLobby_Ch3: ; 1795ae
 	notetype $c, $11
-
 Music_BattleTowerLobby_branch_1795b1: ; 1795b1
 	octave 2
 	note B_, 2
@@ -300,10 +298,10 @@ Music_BattleTowerLobby_branch_1795b1: ; 1795b1
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_BattleTowerLobby_branch_1795b1
+; 179610
 
 Music_BattleTowerLobby_Ch4: ; 179610
 	togglenoise $0
-
 Music_BattleTowerLobby_branch_179612: ; 179612
 	notetype $c
 	note __, 2
@@ -313,3 +311,5 @@ Music_BattleTowerLobby_branch_179612: ; 179612
 	note F_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_179612
 ; 17961d
+
+
diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm
index 1aae03ab6..20782b846 100644
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -5,7 +5,6 @@ Music_BattleTowerTheme: ; 178889
 	dbw $03, Music_BattleTowerTheme_Ch4
 ; 178895
 
-
 Music_BattleTowerTheme_Ch1: ; 178895
 	tempo 141
 	volume $77
@@ -13,7 +12,6 @@ Music_BattleTowerTheme_Ch1: ; 178895
 	vibrato $12, $34
 	stereopanning $f
 	notetype $6, $94
-
 Music_BattleTowerTheme_branch_1788a5: ; 1788a5
 	note __, 16
 	note __, 16
@@ -204,10 +202,10 @@ Music_BattleTowerTheme_branch_17895e: ; 17895e
 	note __, 4
 	note A_, 4
 	endchannel
+; 17896d
 
 Music_BattleTowerTheme_Ch2: ; 17896d
 	vibrato $12, $34
-
 Music_BattleTowerTheme_branch_178970: ; 178970
 	dutycycle $3
 	notetype $6, $b8
@@ -361,11 +359,11 @@ Music_BattleTowerTheme_branch_178a15: ; 178a15
 	note A#, 4
 	note A_, 4
 	endchannel
+; 178a20
 
 Music_BattleTowerTheme_Ch3: ; 178a20
 	vibrato $12, $34
 	notetype $6, $16
-
 Music_BattleTowerTheme_branch_178a26: ; 178a26
 	stereopanning $ff
 	callchannel Music_BattleTowerTheme_branch_178afe
@@ -589,11 +587,11 @@ Music_BattleTowerTheme_branch_178afe: ; 178afe
 	note C_, 2
 	note __, 2
 	endchannel
+; 178b0d
 
 Music_BattleTowerTheme_Ch4: ; 178b0d
 	togglenoise $3
 	notetype $c
-
 Music_BattleTowerTheme_branch_178b11: ; 178b11
 	callchannel Music_BattleTowerTheme_branch_178b58
 	note D_, 2
@@ -605,7 +603,6 @@ Music_BattleTowerTheme_branch_178b11: ; 178b11
 	note C#, 1
 	note D_, 1
 	note C#, 1
-
 Music_BattleTowerTheme_branch_178b1d: ; 178b1d
 	callchannel Music_BattleTowerTheme_branch_178b58
 	callchannel Music_BattleTowerTheme_branch_178b61
@@ -618,7 +615,6 @@ Music_BattleTowerTheme_branch_178b1d: ; 178b1d
 	note D_, 1
 	note D_, 1
 	note D_, 8
-
 Music_BattleTowerTheme_branch_178b35: ; 178b35
 	callchannel Music_BattleTowerTheme_branch_178b76
 	note D_, 2
@@ -699,3 +695,5 @@ Music_BattleTowerTheme_branch_178b76: ; 178b76
 	note C#, 1
 	endchannel
 ; 178b81
+
+
diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm
index c892ddf90..0a1a68fda 100644
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -5,7 +5,6 @@ Music_Bicycle: ; ee119
 	dbw $03, Music_Bicycle_Ch4
 ; ee125
 
-
 Music_Bicycle_Ch1: ; ee125
 	tempo 140
 	volume $77
@@ -24,7 +23,6 @@ Music_Bicycle_Ch1: ; ee125
 	note A_, 8
 	intensity $b2
 	note F#, 2
-
 Music_Bicycle_branch_ee144: ; ee144
 	stereopanning $f
 	intensity $b2
@@ -171,6 +169,7 @@ Music_Bicycle_branch_ee144: ; ee144
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_Bicycle_branch_ee144
+; ee1de
 
 Music_Bicycle_Ch2: ; ee1de
 	dutycycle $2
@@ -196,7 +195,6 @@ Music_Bicycle_Ch2: ; ee1de
 	octave 3
 	note B_, 2
 	note A_, 2
-
 Music_Bicycle_branch_ee1fd: ; ee1fd
 	stereopanning $ff
 	dutycycle $2
@@ -288,6 +286,7 @@ Music_Bicycle_branch_ee263: ; ee263
 	note G_, 6
 	note E_, 4
 	endchannel
+; ee26d
 
 Music_Bicycle_Ch3: ; ee26d
 	notetype $c, $14
@@ -306,7 +305,6 @@ Music_Bicycle_Ch3: ; ee26d
 	octave 3
 	note A_, 1
 	note __, 1
-
 Music_Bicycle_branch_ee27f: ; ee27f
 	callchannel Music_Bicycle_branch_ee333
 	note E_, 1
@@ -410,7 +408,6 @@ Music_Bicycle_branch_ee27f: ; ee27f
 	note __, 1
 	note A_, 1
 	note __, 1
-
 Music_Bicycle_branch_ee2e9: ; ee2e9
 	note G_, 1
 	note __, 1
@@ -501,16 +498,15 @@ Music_Bicycle_branch_ee333: ; ee333
 	note B_, 1
 	note __, 1
 	endchannel
+; ee345
 
 Music_Bicycle_Ch4: ; ee345
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 16
-
 Music_Bicycle_branch_ee34b: ; ee34b
 	note __, 2
-
 Music_Bicycle_branch_ee34c: ; ee34c
 	stereopanning $f0
 	note F_, 4
@@ -523,3 +519,5 @@ Music_Bicycle_branch_ee34c: ; ee34c
 	note F_, 2
 	loopchannel 0, Music_Bicycle_branch_ee34b
 ; ee35e
+
+
diff --git a/audio/music/buenaspassword.asm b/audio/music/buenaspassword.asm
index 02e165ea5..6961159b3 100644
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -5,14 +5,12 @@ Music_BuenasPassword: ; 178153
 	dbw $03, Music_BuenasPassword_Ch4
 ; 17815f
 
-
 Music_BuenasPassword_Ch1: ; 17815f
 	tempo 136
 	volume $77
 	tone $0001
 	notetype $c, $b3
 	note __, 8
-
 Music_BuenasPassword_branch_17816b: ; 17816b
 	stereopanning $ff
 	note __, 16
@@ -191,7 +189,6 @@ Music_BuenasPassword_Ch2: ; 178231
 	note __, 7
 	octave 3
 	note F#, 1
-
 Music_BuenasPassword_branch_17823c: ; 17823c
 	stereopanning $ff
 	callchannel Music_BuenasPassword_branch_1782df
@@ -386,11 +383,11 @@ Music_BuenasPassword_branch_1782df: ; 1782df
 	note B_, 1
 	note G#, 3
 	endchannel
+; 178311
 
 Music_BuenasPassword_Ch3: ; 178311
 	notetype $c, $14
 	note __, 8
-
 Music_BuenasPassword_branch_178315: ; 178315
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
@@ -569,6 +566,7 @@ Music_BuenasPassword_branch_1783bc: ; 1783bc
 	octave 2
 	note G#, 2
 	endchannel
+; 1783d0
 
 Music_BuenasPassword_Ch4: ; 1783d0
 	togglenoise $3
@@ -578,7 +576,6 @@ Music_BuenasPassword_Ch4: ; 1783d0
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_BuenasPassword_branch_1783d9: ; 1783d9
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
@@ -646,3 +643,5 @@ Music_BuenasPassword_branch_178424: ; 178424
 	note D_, 1
 	endchannel
 ; 17843b
+
+
diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm
index e9eb852a0..f52d50458 100644
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -5,7 +5,6 @@ Music_BugCatchingContest: ; f7c16
 	dbw $03, Music_BugCatchingContest_Ch4
 ; f7c22
 
-
 Music_BugCatchingContest_Ch1: ; f7c22
 	tempo 144
 	volume $77
@@ -39,16 +38,13 @@ Music_BugCatchingContest_Ch1: ; f7c22
 	note __, 1
 	note E_, 1
 	note E_, 1
-
 Music_BugCatchingContest_branch_f7c4b: ; f7c4b
 	notetype $c, $b1
-
 Music_BugCatchingContest_branch_f7c4e: ; f7c4e
 	note __, 2
 	octave 2
 	note A_, 2
 	loopchannel 4, Music_BugCatchingContest_branch_f7c4e
-
 Music_BugCatchingContest_branch_f7c55: ; f7c55
 	note __, 2
 	note B_, 2
@@ -65,7 +61,6 @@ Music_BugCatchingContest_branch_f7c55: ; f7c55
 	note E_, 1
 	intensity $b1
 	dutycycle $2
-
 Music_BugCatchingContest_branch_f7c6b: ; f7c6b
 	note __, 2
 	octave 2
@@ -96,7 +91,6 @@ Music_BugCatchingContest_branch_f7c6b: ; f7c6b
 	note E_, 4
 	note __, 4
 	note E_, 4
-
 Music_BugCatchingContest_branch_f7c8e: ; f7c8e
 	note __, 4
 	octave 2
@@ -193,6 +187,7 @@ Music_BugCatchingContest_branch_f7c8e: ; f7c8e
 	note E_, 2
 	note E_, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7c4b
+; f7cf4
 
 Music_BugCatchingContest_Ch2: ; f7cf4
 	stereopanning $f0
@@ -200,7 +195,6 @@ Music_BugCatchingContest_Ch2: ; f7cf4
 	dutycycle $1
 	notetype $c, $c7
 	note __, 8
-
 Music_BugCatchingContest_branch_f7cff: ; f7cff
 	octave 4
 	note A_, 1
@@ -210,7 +204,6 @@ Music_BugCatchingContest_branch_f7cff: ; f7cff
 	note A_, 1
 	note A_, 1
 	loopchannel 4, Music_BugCatchingContest_branch_f7cff
-
 Music_BugCatchingContest_branch_f7d0a: ; f7d0a
 	dutycycle $0
 	callchannel Music_BugCatchingContest_branch_f7d8e
@@ -379,6 +372,7 @@ Music_BugCatchingContest_branch_f7d8e: ; f7d8e
 	note G_, 1
 	note __, 1
 	endchannel
+; f7db7
 
 Music_BugCatchingContest_Ch3: ; f7db7
 	stereopanning $ff
@@ -411,7 +405,6 @@ Music_BugCatchingContest_Ch3: ; f7db7
 	note __, 1
 	note C#, 1
 	note C#, 1
-
 Music_BugCatchingContest_branch_f7dda: ; f7dda
 	notetype $c, $14
 	note F#, 5
@@ -594,6 +587,7 @@ Music_BugCatchingContest_branch_f7dda: ; f7dda
 	note C#, 2
 	note C#, 2
 	loopchannel 0, Music_BugCatchingContest_branch_f7dda
+; f7e9a
 
 Music_BugCatchingContest_Ch4: ; f7e9a
 	togglenoise $4
@@ -613,7 +607,6 @@ Music_BugCatchingContest_Ch4: ; f7e9a
 	note E_, 2
 	note E_, 2
 	callchannel Music_BugCatchingContest_branch_f7ee2
-
 Music_BugCatchingContest_branch_f7eaf: ; f7eaf
 	note D_, 4
 	note D_, 4
@@ -679,3 +672,4 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2
 	note D_, 2
 	endchannel
 ; f7ef3
+
diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm
index afa246922..358a76c08 100644
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -5,7 +5,6 @@ Music_BurnedTower: ; f6a99
 	dbw $03, Music_BurnedTower_Ch4
 ; f6aa5
 
-
 Music_BurnedTower_Ch1: ; f6aa5
 	tempo 168
 	volume $77
@@ -28,7 +27,6 @@ Music_BurnedTower_Ch1: ; f6aa5
 	note D_, 2
 	intensity $80
 	note C#, 6
-
 Music_BurnedTower_branch_f6ac8: ; f6ac8
 	intensity $91
 	octave 2
@@ -39,7 +37,6 @@ Music_BurnedTower_branch_f6ac8: ; f6ac8
 	note A#, 6
 	loopchannel 2, Music_BurnedTower_branch_f6ac8
 	tempo 150
-
 Music_BurnedTower_branch_f6ad8: ; f6ad8
 	intensity $b1
 	octave 2
@@ -90,7 +87,6 @@ Music_BurnedTower_branch_f6ad8: ; f6ad8
 	note E_, 2
 	intensity $a0
 	note D#, 6
-
 Music_BurnedTower_branch_f6b17: ; f6b17
 	intensity $b1
 	octave 2
@@ -102,6 +98,7 @@ Music_BurnedTower_branch_f6b17: ; f6b17
 	note C_, 6
 	loopchannel 2, Music_BurnedTower_branch_f6b17
 	loopchannel 0, Music_BurnedTower_branch_f6ad8
+; f6b29
 
 Music_BurnedTower_Ch2: ; f6b29
 	dutycycle $2
@@ -110,7 +107,6 @@ Music_BurnedTower_Ch2: ; f6b29
 	notetype $c, $70
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c5
-
 Music_BurnedTower_branch_f6b39: ; f6b39
 	callchannel Music_BurnedTower_branch_f6b8e
 	intensity $c1
@@ -197,6 +193,7 @@ Music_BurnedTower_branch_f6b8e: ; f6b8e
 	note D_, 4
 	note E_, 16
 	endchannel
+; f6ba2
 
 Music_BurnedTower_Ch3: ; f6ba2
 	stereopanning $f
@@ -207,7 +204,6 @@ Music_BurnedTower_Ch3: ; f6ba2
 	note __, 12
 	octave 3
 	note D#, 4
-
 Music_BurnedTower_branch_f6bad: ; f6bad
 	octave 2
 	note A_, 2
@@ -228,7 +224,6 @@ Music_BurnedTower_branch_f6bad: ; f6bad
 	note E_, 2
 	note D#, 4
 	loopchannel 4, Music_BurnedTower_branch_f6bad
-
 Music_BurnedTower_branch_f6bc3: ; f6bc3
 	octave 2
 	note B_, 2
@@ -250,16 +245,15 @@ Music_BurnedTower_branch_f6bc3: ; f6bc3
 	note F_, 4
 	loopchannel 2, Music_BurnedTower_branch_f6bc3
 	loopchannel 0, Music_BurnedTower_branch_f6bad
+; f6bdd
 
 Music_BurnedTower_Ch4: ; f6bdd
 	togglenoise $0
 	notetype $c
-
 Music_BurnedTower_branch_f6be1: ; f6be1
 	note __, 16
 	loopchannel 4, Music_BurnedTower_branch_f6be1
 	note __, 2
-
 Music_BurnedTower_branch_f6be7: ; f6be7
 	stereopanning $f0
 	note G_, 2
@@ -269,3 +263,5 @@ Music_BurnedTower_branch_f6be7: ; f6be7
 	note G_, 4
 	loopchannel 0, Music_BurnedTower_branch_f6be7
 ; f6bf2
+
+
diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm
index ebea4f24c..12db4dada 100644
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -4,12 +4,10 @@ Music_CeladonCity: ; f435b
 	dbw $02, Music_CeladonCity_Ch3
 ; f4364
 
-
 Music_CeladonCity_Ch1: ; f4364
 	tempo 146
 	volume $77
 	tone $0001
-
 Music_CeladonCity_branch_f436c: ; f436c
 	stereopanning $f
 	notetype $c, $a6
@@ -22,7 +20,6 @@ Music_CeladonCity_branch_f436c: ; f436c
 	note E_, 2
 	note F#, 2
 	callchannel Music_CeladonCity_branch_f43cc
-
 Music_CeladonCity_branch_f437d: ; f437d
 	note D_, 2
 	note F#, 1
@@ -145,6 +142,7 @@ Music_CeladonCity_branch_f43fe: ; f43fe
 	note A_, 1
 	loopchannel 4, Music_CeladonCity_branch_f43fe
 	endchannel
+; f4406
 
 Music_CeladonCity_Ch2: ; f4406
 	vibrato $12, $34
@@ -161,7 +159,6 @@ Music_CeladonCity_Ch2: ; f4406
 	note F#, 1
 	note G_, 1
 	note A_, 8
-
 Music_CeladonCity_branch_f441a: ; f441a
 	callchannel Music_CeladonCity_branch_f4463
 	note A_, 4
@@ -273,10 +270,10 @@ Music_CeladonCity_branch_f4474: ; f4474
 	note D_, 2
 	note F#, 4
 	endchannel
+; f4492
 
 Music_CeladonCity_Ch3: ; f4492
 	vibrato $12, $24
-
 Music_CeladonCity_branch_f4495: ; f4495
 	notetype $c, $25
 	octave 3
@@ -286,7 +283,6 @@ Music_CeladonCity_branch_f4495: ; f4495
 	note __, 2
 	note D_, 8
 	callchannel Music_CeladonCity_branch_f44fd
-
 Music_CeladonCity_branch_f44a1: ; f44a1
 	octave 2
 	note A_, 2
@@ -398,3 +394,5 @@ Music_CeladonCity_branch_f4510: ; f4510
 	note B_, 2
 	endchannel
 ; f4518
+
+
diff --git a/audio/music/championbattle.asm b/audio/music/championbattle.asm
index 54748017c..a6da88930 100644
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -4,7 +4,6 @@ Music_ChampionBattle: ; ea9c1
 	dbw $02, Music_ChampionBattle_Ch3
 ; ea9ca
 
-
 Music_ChampionBattle_Ch1: ; ea9ca
 	tempo 98
 	volume $77
@@ -19,7 +18,6 @@ Music_ChampionBattle_Ch1: ; ea9ca
 	note A#, 4
 	intensity $b7
 	note B_, 4
-
 Music_ChampionBattle_branch_ea9e2: ; ea9e2
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
@@ -28,12 +26,10 @@ Music_ChampionBattle_branch_ea9e2: ; ea9e2
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
 	note E_, 4
-
 Music_ChampionBattle_branch_ea9f0: ; ea9f0
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 3, Music_ChampionBattle_branch_ea9f0
 	callchannel Music_ChampionBattle_branch_eab06
-
 Music_ChampionBattle_branch_ea9fa: ; ea9fa
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 7, Music_ChampionBattle_branch_ea9fa
@@ -77,14 +73,12 @@ Music_ChampionBattle_branch_ea9fa: ; ea9fa
 	octave 4
 	note C_, 1
 	note C#, 1
-
 Music_ChampionBattle_branch_eaa35: ; eaa35
 	callchannel Music_ChampionBattle_branch_eab0f
 	note E_, 2
 	note E_, 2
 	intensity $b7
 	note F#, 4
-
 Music_ChampionBattle_branch_eaa3d: ; eaa3d
 	intensity $b2
 	note E_, 2
@@ -173,7 +167,6 @@ Music_ChampionBattle_branch_eaa3d: ; eaa3d
 	intensity $90
 	note D#, 16
 	note C#, 16
-
 Music_ChampionBattle_branch_eaab1: ; eaab1
 	intensity $b2
 	octave 2
@@ -183,7 +176,6 @@ Music_ChampionBattle_branch_eaab1: ; eaab1
 	octave 3
 	note D#, 4
 	loopchannel 4, Music_ChampionBattle_branch_eaab1
-
 Music_ChampionBattle_branch_eaabe: ; eaabe
 	intensity $b2
 	note C_, 2
@@ -308,6 +300,7 @@ Music_ChampionBattle_branch_eab31: ; eab31
 	note C#, 4
 	intensity $b2
 	endchannel
+; eab4a
 
 Music_ChampionBattle_Ch2: ; eab4a
 	dutycycle $3
@@ -364,7 +357,6 @@ Music_ChampionBattle_Ch2: ; eab4a
 	note E_, 8
 	intensity $3c
 	note E_, 8
-
 Music_ChampionBattle_branch_eab9d: ; eab9d
 	intensity $c5
 	note D#, 6
@@ -433,7 +425,6 @@ Music_ChampionBattle_branch_eab9d: ; eab9d
 	note F_, 16
 	note F#, 16
 	intensity $c4
-
 Music_ChampionBattle_branch_eabef: ; eabef
 	octave 5
 	note D#, 4
@@ -558,10 +549,10 @@ Music_ChampionBattle_branch_eac79: ; eac79
 	note D#, 2
 	intensity $c5
 	endchannel
+; eac85
 
 Music_ChampionBattle_Ch3: ; eac85
 	notetype $c, $14
-
 Music_ChampionBattle_branch_eac88: ; eac88
 	octave 3
 	note D#, 1
@@ -610,12 +601,10 @@ Music_ChampionBattle_branch_eac88: ; eac88
 	note A#, 2
 	note F_, 2
 	note A_, 2
-
 Music_ChampionBattle_branch_eacc6: ; eacc6
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacc6
-
 Music_ChampionBattle_branch_eaccc: ; eaccc
 	note E_, 2
 	note B_, 2
@@ -628,12 +617,10 @@ Music_ChampionBattle_branch_eaccc: ; eaccc
 	note B_, 2
 	note G_, 2
 	note A_, 2
-
 Music_ChampionBattle_branch_eacda: ; eacda
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacda
-
 Music_ChampionBattle_branch_eace0: ; eace0
 	note E_, 2
 	note B_, 2
@@ -665,7 +652,6 @@ Music_ChampionBattle_branch_eace0: ; eace0
 	note D#, 8
 	note B_, 8
 	note D#, 8
-
 Music_ChampionBattle_branch_ead05: ; ead05
 	note D#, 2
 	note F#, 2
@@ -684,13 +670,11 @@ Music_ChampionBattle_branch_ead05: ; ead05
 	note D#, 2
 	note E_, 2
 	callchannel Music_ChampionBattle_branch_ead8e
-
 Music_ChampionBattle_branch_ead1d: ; ead1d
 	octave 3
 	note E_, 2
 	note B_, 2
 	loopchannel 4, Music_ChampionBattle_branch_ead1d
-
 Music_ChampionBattle_branch_ead24: ; ead24
 	note D#, 2
 	note A#, 2
@@ -703,7 +687,6 @@ Music_ChampionBattle_branch_ead24: ; ead24
 	note __, 2
 	note D#, 2
 	note __, 2
-
 Music_ChampionBattle_branch_ead32: ; ead32
 	note E_, 2
 	note B_, 2
@@ -716,19 +699,16 @@ Music_ChampionBattle_branch_ead32: ; ead32
 	note __, 2
 	note E_, 2
 	note __, 2
-
 Music_ChampionBattle_branch_ead40: ; ead40
 	note D#, 2
 	note G#, 2
 	loopchannel 8, Music_ChampionBattle_branch_ead40
-
 Music_ChampionBattle_branch_ead46: ; ead46
 	note D#, 2
 	note A#, 2
 	loopchannel 7, Music_ChampionBattle_branch_ead46
 	note B_, 2
 	note A#, 2
-
 Music_ChampionBattle_branch_ead4e: ; ead4e
 	octave 3
 	note D#, 2
@@ -809,3 +789,5 @@ Music_ChampionBattle_branch_ead8e: ; ead8e
 	note E_, 2
 	endchannel
 ; ead99
+
+
diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm
index 8c482198d..9751bd047 100644
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -5,7 +5,6 @@ Music_CherrygroveCity: ; f5b03
 	dbw $03, Music_CherrygroveCity_Ch4
 ; f5b0f
 
-
 Music_CherrygroveCity_Ch1: ; f5b0f
 	tempo 152
 	volume $77
@@ -19,7 +18,6 @@ Music_CherrygroveCity_Ch1: ; f5b0f
 	note C_, 2
 	note D_, 2
 	note E_, 2
-
 Music_CherrygroveCity_branch_f5b26: ; f5b26
 	note A_, 4
 	note G#, 2
@@ -94,6 +92,7 @@ Music_CherrygroveCity_branch_f5b26: ; f5b26
 	octave 3
 	note C_, 4
 	loopchannel 0, Music_CherrygroveCity_branch_f5b26
+; f5b74
 
 Music_CherrygroveCity_Ch2: ; f5b74
 	dutycycle $3
@@ -109,7 +108,6 @@ Music_CherrygroveCity_Ch2: ; f5b74
 	note G_, 2
 	note A_, 2
 	note A#, 2
-
 Music_CherrygroveCity_branch_f5b87: ; f5b87
 	intensity $c6
 	octave 4
@@ -175,6 +173,7 @@ Music_CherrygroveCity_branch_f5b87: ; f5b87
 	intensity $a7
 	note F_, 8
 	loopchannel 0, Music_CherrygroveCity_branch_f5b87
+; f5bd8
 
 Music_CherrygroveCity_Ch3: ; f5bd8
 	notetype $c, $16
@@ -187,7 +186,6 @@ Music_CherrygroveCity_Ch3: ; f5bd8
 	note G_, 2
 	note F_, 2
 	note E_, 2
-
 Music_CherrygroveCity_branch_f5be4: ; f5be4
 	note A_, 2
 	note F_, 2
@@ -286,12 +284,12 @@ Music_CherrygroveCity_branch_f5be4: ; f5be4
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5be4
+; f5c48
 
 Music_CherrygroveCity_Ch4: ; f5c48
 	togglenoise $3
 	notetype $c
 	note __, 16
-
 Music_CherrygroveCity_branch_f5c4d: ; f5c4d
 	note C#, 2
 	note __, 2
@@ -310,3 +308,5 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d
 	note G_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5c4d
 ; f5c60
+
+
diff --git a/audio/music/clair.asm b/audio/music/clair.asm
index ee0b217a3..65808d6ac 100644
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -5,7 +5,6 @@ Music_Clair: ; 1fa8d
 	dbw $03, Music_Clair_Ch4
 ; 1fa99
 
-
 Music_Clair_Ch1: ; 1fa99
 	tempo 136
 	volume $77
@@ -14,7 +13,6 @@ Music_Clair_Ch1: ; 1fa99
 	stereopanning $f
 	notetype $c, $93
 	dutycycle $3
-
 Music_Clair_branch_1faab: ; 1faab
 	octave 4
 	note F_, 1
@@ -39,7 +37,6 @@ Music_Clair_branch_1faab: ; 1faab
 	note D#, 4
 	note F_, 4
 	note G_, 4
-
 Music_Clair_branch_1fac9: ; 1fac9
 	intensity $93
 	callchannel Music_Clair_branch_1fb12
@@ -147,12 +144,12 @@ Music_Clair_branch_1fb2e: ; 1fb2e
 	note D#, 1
 	note F#, 1
 	endchannel
+; 1fb41
 
 Music_Clair_Ch2: ; 1fb41
 	dutycycle $3
 	vibrato $12, $34
 	notetype $6, $b7
-
 Music_Clair_branch_1fb49: ; 1fb49
 	octave 3
 	note A#, 2
@@ -192,7 +189,6 @@ Music_Clair_branch_1fb49: ; 1fb49
 	note G_, 2
 	note A#, 2
 	intensity $b7
-
 Music_Clair_branch_1fb77: ; 1fb77
 	callchannel Music_Clair_branch_1fba6
 	note F#, 2
@@ -254,6 +250,7 @@ Music_Clair_branch_1fba6: ; 1fba6
 	note D#, 16
 	note __, 4
 	endchannel
+; 1fbb9
 
 Music_Clair_Ch3: ; 1fbb9
 	notetype $c, $14
@@ -277,7 +274,6 @@ Music_Clair_Ch3: ; 1fbb9
 	note A#, 4
 	note G#, 4
 	note G_, 4
-
 Music_Clair_branch_1fbd1: ; 1fbd1
 	callchannel Music_Clair_branch_1fc3c
 	octave 2
@@ -397,6 +393,7 @@ Music_Clair_branch_1fc3c: ; 1fc3c
 	octave 1
 	note G#, 2
 	endchannel
+; 1fc4b
 
 Music_Clair_Ch4: ; 1fc4b
 	togglenoise $3
@@ -414,7 +411,6 @@ Music_Clair_Ch4: ; 1fc4b
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_Clair_branch_1fc5e: ; 1fc5e
 	stereopanning $ff
 	callchannel Music_Clair_branch_1fc6e
@@ -445,3 +441,5 @@ Music_Clair_branch_1fc6e: ; 1fc6e
 	note G_, 1
 	endchannel
 ; 1fc87
+
+
diff --git a/audio/music/contestresults.asm b/audio/music/contestresults.asm
index c2d66d490..7b0f48150 100644
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -5,12 +5,10 @@ Music_ContestResults: ; efb3e
 	dbw $03, Music_ContestResults_Ch4
 ; efb4a
 
-
 Music_ContestResults_Ch1: ; efb4a
 	tempo 144
 	volume $77
 	notetype $c, $51
-
 Music_ContestResults_branch_efb52: ; efb52
 	note __, 2
 	octave 2
@@ -50,10 +48,10 @@ Music_ContestResults_branch_efb52: ; efb52
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb52
+; efb7b
 
 Music_ContestResults_Ch2: ; efb7b
 	notetype $c, $61
-
 Music_ContestResults_branch_efb7e: ; efb7e
 	octave 2
 	note C_, 2
@@ -95,7 +93,6 @@ Music_ContestResults_branch_efb7e: ; efb7e
 	octave 3
 	note F_, 1
 	note __, 1
-
 Music_ContestResults_branch_efba6: ; efba6
 	octave 2
 	note D_, 2
@@ -129,11 +126,11 @@ Music_ContestResults_branch_efba6: ; efba6
 	note D_, 1
 	note __, 1
 	loopchannel 0, Music_ContestResults_branch_efb7e
+; efbcc
 
 Music_ContestResults_Ch3: ; efbcc
 	vibrato $8, $24
 	notetype $c, $23
-
 Music_ContestResults_branch_efbd2: ; efbd2
 	octave 4
 	note E_, 5
@@ -155,11 +152,11 @@ Music_ContestResults_branch_efbd2: ; efbd2
 	note A_, 8
 	note G_, 8
 	loopchannel 0, Music_ContestResults_branch_efbd2
+; efbe9
 
 Music_ContestResults_Ch4: ; efbe9
 	togglenoise $4
 	notetype $6
-
 Music_ContestResults_branch_efbed: ; efbed
 	note C#, 4
 	note C#, 4
@@ -179,3 +176,5 @@ Music_ContestResults_branch_efbed: ; efbed
 	note G_, 1
 	loopchannel 0, Music_ContestResults_branch_efbed
 ; efc01
+
+
diff --git a/audio/music/credits.asm b/audio/music/credits.asm
index a88dee3e5..f14f51342 100644
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -5,7 +5,6 @@ Music_Credits: ; 1f31c
 	dbw $03, Music_Credits_Ch4
 ; 1f328
 
-
 Music_Credits_Ch1: ; 1f328
 	tempo 139
 	volume $77
@@ -182,7 +181,6 @@ Music_Credits_Ch1: ; 1f328
 	octave 5
 	note C#, 6
 	notetype $c, $a7
-
 Music_Credits_branch_1f407: ; 1f407
 	octave 3
 	note A_, 1
@@ -563,6 +561,7 @@ Music_Credits_branch_1f582: ; 1f582
 	note F#, 6
 	note C#, 6
 	endchannel
+; 1f58d
 
 Music_Credits_Ch2: ; 1f58d
 	dutycycle $1
@@ -724,7 +723,6 @@ Music_Credits_Ch2: ; 1f58d
 	octave 2
 	note F#, 1
 	note __, 1
-
 Music_Credits_branch_1f657: ; 1f657
 	octave 1
 	note G_, 2
@@ -982,6 +980,7 @@ Music_Credits_branch_1f748: ; 1f748
 	octave 5
 	note C_, 4
 	endchannel
+; 1f772
 
 Music_Credits_Ch3: ; 1f772
 	vibrato $16, $23
@@ -1443,6 +1442,7 @@ Music_Credits_branch_1f94b: ; 1f94b
 	note G_, 2
 	note D_, 2
 	endchannel
+; 1f973
 
 Music_Credits_Ch4: ; 1f973
 	togglenoise $3
@@ -1480,7 +1480,6 @@ Music_Credits_Ch4: ; 1f973
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-
 Music_Credits_branch_1f9a8: ; 1f9a8
 	note A#, 2
 	note G_, 1
@@ -1509,7 +1508,6 @@ Music_Credits_branch_1f9a8: ; 1f9a8
 	note C#, 1
 	note D_, 1
 	note D_, 1
-
 Music_Credits_branch_1f9c6: ; 1f9c6
 	note A#, 2
 	note G_, 1
@@ -1544,7 +1542,6 @@ Music_Credits_branch_1f9c6: ; 1f9c6
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-
 Music_Credits_branch_1f9f2: ; 1f9f2
 	note A#, 2
 	note G_, 1
@@ -1695,3 +1692,5 @@ Music_Credits_branch_1fa6d: ; 1fa6d
 	note D_, 1
 	endchannel
 ; 1fa8d
+
+
diff --git a/audio/music/crystalopening.asm b/audio/music/crystalopening.asm
index 6426057e7..8e97c8183 100644
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -5,7 +5,6 @@ Music_CrystalOpening: ; 1786e8
 	dbw $03, Music_CrystalOpening_Ch4
 ; 1786f4
 
-
 Music_CrystalOpening_Ch1: ; 1786f4
 	tempo 136
 	volume $77
@@ -122,6 +121,7 @@ Music_CrystalOpening_Ch1: ; 1786f4
 	octave 2
 	note D_, 16
 	endchannel
+; 17877a
 
 Music_CrystalOpening_Ch2: ; 17877a
 	notetype $c, $a2
@@ -177,6 +177,7 @@ Music_CrystalOpening_Ch2: ; 17877a
 	octave 3
 	note D_, 16
 	endchannel
+; 1787c8
 
 Music_CrystalOpening_Ch3: ; 1787c8
 	notetype $c, $16
@@ -241,6 +242,7 @@ Music_CrystalOpening_Ch3: ; 1787c8
 	note D_, 1
 	note __, 15
 	endchannel
+; 178810
 
 Music_CrystalOpening_Ch4: ; 178810
 	stereopanning $f
@@ -360,3 +362,5 @@ Music_CrystalOpening_Ch4: ; 178810
 	note __, 16
 	endchannel
 ; 178889
+
+
diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm
index eeefad6ed..3070830b6 100644
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -4,8 +4,10 @@ Music_DancingHall: ; ef9bc
 	dbw $02, Music_DancingHall_Ch3
 ; ef9c5
 
+
 INCBIN "baserom.gbc", $ef9c5, $ef9c6 - $ef9c5
 
+
 Music_DancingHall_Ch1: ; ef9c6
 	tempo 208
 	volume $77
@@ -13,7 +15,6 @@ Music_DancingHall_Ch1: ; ef9c6
 	notetype $6, $b7
 	note __, 3
 	dutycycle $0
-
 Music_DancingHall_branch_ef9d3: ; ef9d3
 	notetype $c, $b7
 	callchannel Music_DancingHall_branch_efa17
@@ -89,6 +90,7 @@ Music_DancingHall_branch_efa17: ; efa17
 	note D_, 1
 	note __, 1
 	endchannel
+; efa2c
 
 Music_DancingHall_Ch2: ; efa2c
 	stereopanning $f0
@@ -96,7 +98,6 @@ Music_DancingHall_Ch2: ; efa2c
 	dutycycle $0
 	vibrato $10, $24
 	note __, 3
-
 Music_DancingHall_branch_efa37: ; efa37
 	notetype $6, $a2
 	callchannel Music_DancingHall_branch_efa7a
@@ -223,6 +224,7 @@ Music_DancingHall_branch_efa7a: ; efa7a
 	octave 4
 	note D_, 1
 	endchannel
+; efad6
 
 Music_DancingHall_Ch3: ; efad6
 	stereopanning $ff
@@ -233,7 +235,6 @@ Music_DancingHall_Ch3: ; efad6
 	note B_, 1
 	octave 6
 	note D_, 1
-
 Music_DancingHall_branch_efae3: ; efae3
 	note E_, 13
 	note D_, 1
@@ -310,3 +311,5 @@ Music_DancingHall_branch_efae3: ; efae3
 	note D_, 1
 	loopchannel 0, Music_DancingHall_branch_efae3
 ; efb3e
+
+
diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm
index beb8723d7..813c9dd53 100644
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -5,7 +5,6 @@ Music_DarkCave: ; ea2be
 	dbw $03, Music_DarkCave_Ch4
 ; ea2ca
 
-
 Music_DarkCave_Ch1: ; ea2ca
 	tempo 128
 	volume $77
@@ -14,7 +13,6 @@ Music_DarkCave_Ch1: ; ea2ca
 	vibrato $11, $15
 	stereopanning $f0
 	notetype $c, $a7
-
 Music_DarkCave_branch_ea2dc: ; ea2dc
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea2dc
@@ -24,7 +22,6 @@ Music_DarkCave_branch_ea2dc: ; ea2dc
 	note C#, 16
 	note C_, 16
 	intensity $a3
-
 Music_DarkCave_branch_ea2e8: ; ea2e8
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 3, Music_DarkCave_branch_ea2e8
@@ -46,7 +43,6 @@ Music_DarkCave_branch_ea2e8: ; ea2e8
 	note D#, 8
 	note C_, 8
 	intensity $a3
-
 Music_DarkCave_branch_ea303: ; ea303
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea303
@@ -78,7 +74,6 @@ Music_DarkCave_branch_ea303: ; ea303
 	note G_, 2
 	note G#, 4
 	intensity $a3
-
 Music_DarkCave_branch_ea328: ; ea328
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea328
@@ -141,13 +136,13 @@ Music_DarkCave_branch_ea333: ; ea333
 	octave 3
 	note A#, 2
 	endchannel
+; ea36a
 
 Music_DarkCave_Ch2: ; ea36a
 	dutycycle $1
 	vibrato $12, $36
 	stereopanning $f
 	notetype $c, $a7
-
 Music_DarkCave_branch_ea374: ; ea374
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea374
@@ -156,7 +151,6 @@ Music_DarkCave_branch_ea374: ; ea374
 	note A#, 16
 	note F_, 16
 	note G_, 16
-
 Music_DarkCave_branch_ea37e: ; ea37e
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea37e
@@ -353,14 +347,13 @@ Music_DarkCave_branch_ea37e: ; ea37e
 	note F_, 16
 	note D#, 16
 	loopchannel 0, Music_DarkCave_branch_ea37e
+; ea46e
 
 Music_DarkCave_Ch3: ; ea46e
 	notetype $c, $27
-
 Music_DarkCave_branch_ea471: ; ea471
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 2, Music_DarkCave_branch_ea471
-
 Music_DarkCave_branch_ea478: ; ea478
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 7, Music_DarkCave_branch_ea478
@@ -469,11 +462,11 @@ Music_DarkCave_branch_ea4ce: ; ea4ce
 	note C_, 2
 	note C#, 4
 	endchannel
+; ea4ea
 
 Music_DarkCave_Ch4: ; ea4ea
 	togglenoise $3
 	notetype $c
-
 Music_DarkCave_branch_ea4ee: ; ea4ee
 	stereopanning $ff
 	note D#, 8
@@ -497,3 +490,5 @@ Music_DarkCave_branch_ea4ee: ; ea4ee
 	note C#, 2
 	loopchannel 0, Music_DarkCave_branch_ea4ee
 ; ea50d
+
+
diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm
index f0a4750fb..44f3fc5a5 100644
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -5,7 +5,6 @@ Music_DragonsDen: ; eece8
 	dbw $03, Music_DragonsDen_Ch4
 ; eecf4
 
-
 Music_DragonsDen_Ch1: ; eecf4
 	tempo 144
 	volume $77
@@ -13,7 +12,6 @@ Music_DragonsDen_Ch1: ; eecf4
 	tone $0004
 	stereopanning $f0
 	notetype $c, $80
-
 Music_DragonsDen_branch_eed03: ; eed03
 	callchannel Music_DragonsDen_branch_eed1e
 	note __, 16
@@ -62,13 +60,13 @@ Music_DragonsDen_branch_eed2d: ; eed2d
 	note C#, 2
 	note C#, 2
 	endchannel
+; eed3c
 
 Music_DragonsDen_Ch2: ; eed3c
 	dutycycle $0
 	tone $0004
 	stereopanning $f
 	notetype $c, $90
-
 Music_DragonsDen_branch_eed46: ; eed46
 	callchannel Music_DragonsDen_branch_eed5e
 	note __, 16
@@ -99,7 +97,6 @@ Music_DragonsDen_branch_eed5e: ; eed5e
 
 Music_DragonsDen_branch_eed6b: ; eed6b
 	intensity $c1
-
 Music_DragonsDen_branch_eed6d: ; eed6d
 	octave 5
 	note C#, 4
@@ -109,9 +106,9 @@ Music_DragonsDen_branch_eed6d: ; eed6d
 	note G#, 4
 	loopchannel 2, Music_DragonsDen_branch_eed6d
 	endchannel
+; eed78
 
 Music_DragonsDen_Ch3: ; eed78
-
 Music_DragonsDen_branch_eed78: ; eed78
 	notetype $c, $14
 	octave 4
@@ -139,7 +136,6 @@ Music_DragonsDen_branch_eed78: ; eed78
 	loopchannel 15, Music_DragonsDen_branch_eed78
 	note __, 16
 	notetype $6, $27
-
 Music_DragonsDen_branch_eed99: ; eed99
 	octave 3
 	note C#, 4
@@ -165,13 +161,13 @@ Music_DragonsDen_branch_eed99: ; eed99
 	note C#, 2
 	loopchannel 16, Music_DragonsDen_branch_eed99
 	loopchannel 0, Music_DragonsDen_branch_eed78
+; eedb7
 
 Music_DragonsDen_Ch4: ; eedb7
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 16
-
 Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
 	note F_, 4
@@ -182,3 +178,5 @@ Music_DragonsDen_branch_eedbd: ; eedbd
 	note F#, 4
 	loopchannel 0, Music_DragonsDen_branch_eedbd
 ; eedcb
+
+
diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm
index a18ad3044..20a2c9fc8 100644
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@@ -4,14 +4,12 @@ Music_EcruteakCity: ; ef2d0
 	dbw $02, Music_EcruteakCity_Ch3
 ; ef2d9
 
-
 Music_EcruteakCity_Ch1: ; ef2d9
 	tempo 197
 	volume $77
 	stereopanning $f
 	vibrato $12, $25
 	dutycycle $2
-
 Music_EcruteakCity_branch_ef2e5: ; ef2e5
 	notetype $c, $57
 	note __, 10
@@ -213,7 +211,6 @@ Music_EcruteakCity_branch_ef391: ; ef391
 	note C_, 2
 	octave 3
 	note A_, 2
-
 Music_EcruteakCity_branch_ef3be: ; ef3be
 	octave 4
 	note F_, 2
@@ -230,7 +227,6 @@ Music_EcruteakCity_branch_ef3be: ; ef3be
 	note C_, 2
 	note F_, 2
 	loopchannel 2, Music_EcruteakCity_branch_ef3be
-
 Music_EcruteakCity_branch_ef3d0: ; ef3d0
 	octave 4
 	note G_, 2
@@ -253,12 +249,12 @@ Music_EcruteakCity_branch_ef3d0: ; ef3d0
 	note G_, 16
 	dutycycle $2
 	endchannel
+; ef3eb
 
 Music_EcruteakCity_Ch2: ; ef3eb
 	vibrato $12, $25
 	dutycycle $3
 	stereopanning $f0
-
 Music_EcruteakCity_branch_ef3f2: ; ef3f2
 	notetype $6, $67
 	note __, 16
@@ -476,10 +472,10 @@ Music_EcruteakCity_branch_ef3f2: ; ef3f2
 	note D_, 2
 	note E_, 16
 	loopchannel 0, Music_EcruteakCity_branch_ef3f2
+; ef4e1
 
 Music_EcruteakCity_Ch3: ; ef4e1
 	stereopanning $ff
-
 Music_EcruteakCity_branch_ef4e3: ; ef4e3
 	vibrato $12, $25
 	notetype $c, $25
@@ -676,3 +672,5 @@ Music_EcruteakCity_branch_ef569: ; ef569
 	note B_, 1
 	endchannel
 ; ef5b1
+
+
diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm
index 778884c46..86d8a7b86 100644
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -5,7 +5,6 @@ Music_ElmsLab: ; ea040
 	dbw $03, Music_ElmsLab_Ch4
 ; ea04c
 
-
 Music_ElmsLab_Ch1: ; ea04c
 	tempo 144
 	volume $77
@@ -35,7 +34,6 @@ Music_ElmsLab_Ch1: ; ea04c
 	note A_, 4
 	note A_, 4
 	note A_, 2
-
 Music_ElmsLab_branch_ea075: ; ea075
 	note __, 2
 	note A_, 2
@@ -184,6 +182,7 @@ Music_ElmsLab_branch_ea075: ; ea075
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea075
+; ea128
 
 Music_ElmsLab_Ch2: ; ea128
 	dutycycle $3
@@ -215,7 +214,6 @@ Music_ElmsLab_Ch2: ; ea128
 	note C_, 4
 	note C_, 2
 	stereopanning $ff
-
 Music_ElmsLab_branch_ea14f: ; ea14f
 	intensity $c6
 	octave 4
@@ -352,6 +350,7 @@ Music_ElmsLab_branch_ea14f: ; ea14f
 	octave 3
 	note E_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea14f
+; ea1fd
 
 Music_ElmsLab_Ch3: ; ea1fd
 	stereopanning $f
@@ -376,7 +375,6 @@ Music_ElmsLab_Ch3: ; ea1fd
 	note C_, 2
 	note D_, 2
 	note E_, 2
-
 Music_ElmsLab_branch_ea216: ; ea216
 	note F_, 2
 	note A_, 2
@@ -530,6 +528,7 @@ Music_ElmsLab_branch_ea216: ; ea216
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea216
+; ea2b1
 
 Music_ElmsLab_Ch4: ; ea2b1
 	stereopanning $f0
@@ -537,8 +536,9 @@ Music_ElmsLab_Ch4: ; ea2b1
 	notetype $c
 	note __, 16
 	note __, 2
-
 Music_ElmsLab_branch_ea2b9: ; ea2b9
 	note G_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea2b9
 ; ea2be
+
+
diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm
index f0dc48a07..29605f389 100644
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -5,7 +5,6 @@ Music_Evolution: ; f06e1
 	dbw $03, Music_Evolution_Ch4
 ; f06ed
 
-
 Music_Evolution_Ch1: ; f06ed
 	tempo 132
 	volume $77
@@ -25,7 +24,6 @@ Music_Evolution_Ch1: ; f06ed
 	note __, 4
 	dutycycle $3
 	stereopanning $f
-
 Music_Evolution_branch_f0713: ; f0713
 	callchannel Music_Evolution_branch_f0737
 	notetype $c, $a4
@@ -67,6 +65,7 @@ Music_Evolution_branch_f0743: ; f0743
 	note A_, 4
 	note D_, 4
 	endchannel
+; f074f
 
 Music_Evolution_Ch2: ; f074f
 	dutycycle $2
@@ -80,7 +79,6 @@ Music_Evolution_Ch2: ; f074f
 	note __, 4
 	dutycycle $3
 	stereopanning $f0
-
 Music_Evolution_branch_f0761: ; f0761
 	callchannel Music_Evolution_branch_f0787
 	notetype $c, $b5
@@ -124,11 +122,11 @@ Music_Evolution_branch_f0793: ; f0793
 	note E_, 4
 	note A_, 4
 	endchannel
+; f079f
 
 Music_Evolution_Ch3: ; f079f
 	notetype $c, $16
 	note __, 8
-
 Music_Evolution_branch_f07a3: ; f07a3
 	callchannel Music_Evolution_branch_f07bf
 	octave 3
@@ -194,12 +192,12 @@ Music_Evolution_branch_f07d5: ; f07d5
 	note A_, 2
 	note __, 2
 	endchannel
+; f07eb
 
 Music_Evolution_Ch4: ; f07eb
 	togglenoise $5
 	notetype $c
 	note __, 8
-
 Music_Evolution_branch_f07f0: ; f07f0
 	stereopanning $f0
 	note A#, 6
@@ -210,3 +208,5 @@ Music_Evolution_branch_f07f0: ; f07f0
 	note E_, 2
 	loopchannel 0, Music_Evolution_branch_f07f0
 ; f07fd
+
+
diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm
index 3d9ae36ab..4dd29e0a4 100644
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -5,14 +5,12 @@ Music_GameCorner: ; edd6d
 	dbw $03, Music_GameCorner_Ch4
 ; edd79
 
-
 Music_GameCorner_Ch1: ; edd79
 	tempo 147
 	volume $77
 	stereopanning $f
 	notetype $c, $91
 	note __, 8
-
 Music_GameCorner_branch_edd84: ; edd84
 	intensity $91
 	note __, 16
@@ -41,7 +39,6 @@ Music_GameCorner_branch_edd84: ; edd84
 	note G#, 2
 	note G_, 2
 	intensity $71
-
 Music_GameCorner_branch_eddb1: ; eddb1
 	octave 4
 	note G#, 1
@@ -50,7 +47,6 @@ Music_GameCorner_branch_eddb1: ; eddb1
 	note F_, 1
 	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_eddb1
-
 Music_GameCorner_branch_eddbb: ; eddbb
 	octave 4
 	note A#, 1
@@ -59,7 +55,6 @@ Music_GameCorner_branch_eddbb: ; eddbb
 	note G_, 1
 	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_eddbb
-
 Music_GameCorner_branch_eddc5: ; eddc5
 	octave 4
 	note D#, 1
@@ -69,7 +64,6 @@ Music_GameCorner_branch_eddc5: ; eddc5
 	octave 4
 	note G_, 1
 	loopchannel 4, Music_GameCorner_branch_eddc5
-
 Music_GameCorner_branch_eddd0: ; eddd0
 	octave 4
 	note F_, 1
@@ -79,7 +73,6 @@ Music_GameCorner_branch_eddd0: ; eddd0
 	octave 4
 	note A_, 1
 	loopchannel 4, Music_GameCorner_branch_eddd0
-
 Music_GameCorner_branch_edddb: ; edddb
 	octave 4
 	note G#, 1
@@ -88,7 +81,6 @@ Music_GameCorner_branch_edddb: ; edddb
 	note F_, 1
 	note C_, 1
 	loopchannel 4, Music_GameCorner_branch_edddb
-
 Music_GameCorner_branch_edde5: ; edde5
 	octave 4
 	note A#, 1
@@ -97,7 +89,6 @@ Music_GameCorner_branch_edde5: ; edde5
 	note G_, 1
 	note D_, 1
 	loopchannel 4, Music_GameCorner_branch_edde5
-
 Music_GameCorner_branch_eddef: ; eddef
 	octave 4
 	note B_, 1
@@ -144,13 +135,13 @@ Music_GameCorner_branch_ede13: ; ede13
 	note F_, 3
 	note F_, 2
 	endchannel
+; ede1c
 
 Music_GameCorner_Ch2: ; ede1c
 	stereopanning $ff
 	vibrato $8, $24
 	notetype $c, $a1
 	note __, 8
-
 Music_GameCorner_branch_ede25: ; ede25
 	intensity $92
 	dutycycle $1
@@ -328,12 +319,12 @@ Music_GameCorner_branch_ede75: ; ede75
 	note D_, 2
 	note D#, 2
 	endchannel
+; edee8
 
 Music_GameCorner_Ch3: ; edee8
 	vibrato $8, $22
 	notetype $c, $14
 	note __, 8
-
 Music_GameCorner_branch_edeef: ; edeef
 	stereopanning $ff
 	notetype $c, $14
@@ -674,6 +665,7 @@ Music_GameCorner_branch_ee03f: ; ee03f
 	octave 3
 	note D_, 1
 	endchannel
+; ee06f
 
 Music_GameCorner_Ch4: ; ee06f
 	togglenoise $3
@@ -688,10 +680,8 @@ Music_GameCorner_Ch4: ; ee06f
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_GameCorner_branch_ee07f: ; ee07f
 	callchannel Music_GameCorner_branch_ee106
-
 Music_GameCorner_branch_ee082: ; ee082
 	note A#, 2
 	note F#, 2
@@ -703,7 +693,6 @@ Music_GameCorner_branch_ee082: ; ee082
 	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee082
 	callchannel Music_GameCorner_branch_ee10f
-
 Music_GameCorner_branch_ee091: ; ee091
 	note A#, 2
 	note F#, 2
@@ -719,7 +708,6 @@ Music_GameCorner_branch_ee091: ; ee091
 	note D_, 1
 	note F#, 2
 	callchannel Music_GameCorner_branch_ee106
-
 Music_GameCorner_branch_ee0a4: ; ee0a4
 	note A#, 2
 	note F#, 2
@@ -731,7 +719,6 @@ Music_GameCorner_branch_ee0a4: ; ee0a4
 	note F#, 2
 	loopchannel 6, Music_GameCorner_branch_ee0a4
 	callchannel Music_GameCorner_branch_ee10f
-
 Music_GameCorner_branch_ee0b3: ; ee0b3
 	note A#, 2
 	note F#, 2
@@ -752,7 +739,6 @@ Music_GameCorner_branch_ee0b3: ; ee0b3
 	note D_, 1
 	note D_, 1
 	note D_, 1
-
 Music_GameCorner_branch_ee0c9: ; ee0c9
 	note A#, 2
 	note F#, 1
@@ -782,7 +768,6 @@ Music_GameCorner_branch_ee0c9: ; ee0c9
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_GameCorner_branch_ee0e8: ; ee0e8
 	note A#, 2
 	note F#, 1
@@ -834,3 +819,5 @@ Music_GameCorner_branch_ee10f: ; ee10f
 	note F#, 2
 	endchannel
 ; ee119
+
+
diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm
index 0f2f39f24..0a94a9956 100644
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -5,7 +5,6 @@ Music_GoldenrodCity: ; eb453
 	dbw $03, Music_GoldenrodCity_Ch4
 ; eb45f
 
-
 Music_GoldenrodCity_Ch1: ; eb45f
 	stereopanning $f
 	tempo 176
@@ -15,7 +14,6 @@ Music_GoldenrodCity_Ch1: ; eb45f
 	note __, 16
 	note __, 16
 	note __, 16
-
 Music_GoldenrodCity_branch_eb46d: ; eb46d
 	dutycycle $0
 	callchannel Music_GoldenrodCity_branch_eb4a9
@@ -176,13 +174,13 @@ Music_GoldenrodCity_branch_eb4d1: ; eb4d1
 	note D#, 1
 	note F#, 1
 	endchannel
+; eb519
 
 Music_GoldenrodCity_Ch2: ; eb519
 	stereopanning $f0
 	vibrato $12, $23
 	dutycycle $2
 	notetype $c, $97
-
 Music_GoldenrodCity_branch_eb523: ; eb523
 	intensity $97
 	callchannel Music_GoldenrodCity_branch_eb555
@@ -270,12 +268,12 @@ Music_GoldenrodCity_branch_eb572: ; eb572
 	note C_, 4
 	note D#, 2
 	endchannel
+; eb584
 
 Music_GoldenrodCity_Ch3: ; eb584
 	stereopanning $ff
 	vibrato $8, $23
 	notetype $c, $25
-
 Music_GoldenrodCity_branch_eb58c: ; eb58c
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5aa
@@ -394,6 +392,7 @@ Music_GoldenrodCity_branch_eb5d2: ; eb5d2
 	note __, 2
 	note G#, 1
 	endchannel
+; eb606
 
 Music_GoldenrodCity_Ch4: ; eb606
 	togglenoise $3
@@ -407,7 +406,6 @@ Music_GoldenrodCity_Ch4: ; eb606
 	note D_, 1
 	note D_, 1
 	note F#, 2
-
 Music_GoldenrodCity_branch_eb613: ; eb613
 	note D#, 2
 	note F#, 2
@@ -449,7 +447,6 @@ Music_GoldenrodCity_branch_eb613: ; eb613
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_GoldenrodCity_branch_eb650: ; eb650
 	note D#, 2
 	note F#, 2
@@ -488,3 +485,5 @@ Music_GoldenrodCity_branch_eb66d: ; eb66d
 	note G_, 1
 	endchannel
 ; eb676
+
+
diff --git a/audio/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm
index 701d654da..686382d66 100644
--- a/audio/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
@@ -4,7 +4,6 @@ Music_GoldSilverOpening: ; f7055
 	dbw $02, Music_GoldSilverOpening_Ch3
 ; f705e
 
-
 Music_GoldSilverOpening_Ch1: ; f705e
 	tempo 256
 	volume $77
@@ -129,6 +128,7 @@ Music_GoldSilverOpening_Ch1: ; f705e
 	note G_, 2
 	note A_, 16
 	endchannel
+; f70f8
 
 Music_GoldSilverOpening_Ch2: ; f70f8
 	tone $0001
@@ -309,6 +309,7 @@ Music_GoldSilverOpening_Ch2: ; f70f8
 	note C_, 4
 	note D#, 16
 	endchannel
+; f71c8
 
 Music_GoldSilverOpening_Ch3: ; f71c8
 	notetype $6, $10
@@ -616,3 +617,5 @@ Music_GoldSilverOpening_Ch3: ; f71c8
 	note __, 13
 	endchannel
 ; f7308
+
+
diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm
index 8294055e3..a7567d51f 100644
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -5,7 +5,6 @@ Music_GoldSilverOpening2: ; f7308
 	dbw $03, Music_GoldSilverOpening2_Ch4
 ; f7314
 
-
 Music_GoldSilverOpening2_Ch1: ; f7314
 	tempo 92
 	volume $77
@@ -15,7 +14,6 @@ Music_GoldSilverOpening2_Ch1: ; f7314
 	notetype $c, $3d
 	octave 3
 	note D#, 8
-
 Music_GoldSilverOpening2_branch_f7325: ; f7325
 	notetype $c, $c1
 	octave 3
@@ -54,6 +52,7 @@ Music_GoldSilverOpening2_branch_f7325: ; f7325
 	octave 4
 	note D_, 16
 	endchannel
+; f7358
 
 Music_GoldSilverOpening2_Ch2: ; f7358
 	dutycycle $3
@@ -106,6 +105,7 @@ Music_GoldSilverOpening2_Ch2: ; f7358
 	intensity $c2
 	note D_, 16
 	endchannel
+; f739c
 
 Music_GoldSilverOpening2_Ch3: ; f739c
 	notetype $c, $17
@@ -184,6 +184,7 @@ Music_GoldSilverOpening2_Ch3: ; f739c
 	note D_, 2
 	note __, 14
 	endchannel
+; f73ea
 
 Music_GoldSilverOpening2_Ch4: ; f73ea
 	togglenoise $0
@@ -197,7 +198,6 @@ Music_GoldSilverOpening2_Ch4: ; f73ea
 	note D_, 2
 	note D_, 2
 	notetype $c
-
 Music_GoldSilverOpening2_branch_f73f8: ; f73f8
 	note D_, 2
 	note D_, 2
@@ -220,3 +220,5 @@ Music_GoldSilverOpening2_branch_f73f8: ; f73f8
 	note C_, 16
 	endchannel
 ; f7411
+
+
diff --git a/audio/music/gym.asm b/audio/music/gym.asm
index 2900a31a9..089ef90d6 100644
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -5,7 +5,6 @@ Music_Gym: ; f48ae
 	dbw $03, Music_Gym_Ch4
 ; f48ba
 
-
 Music_Gym_Ch1: ; f48ba
 	tempo 156
 	volume $77
@@ -13,7 +12,6 @@ Music_Gym_Ch1: ; f48ba
 	vibrato $12, $24
 	dutycycle $1
 	notetype $c, $b7
-
 Music_Gym_branch_f48c9: ; f48c9
 	octave 4
 	note F#, 2
@@ -191,11 +189,11 @@ Music_Gym_branch_f48c9: ; f48c9
 	note F#, 1
 	note E_, 1
 	loopchannel 0, Music_Gym_branch_f48c9
+; f497c
 
 Music_Gym_Ch2: ; f497c
 	dutycycle $1
 	stereopanning $f0
-
 Music_Gym_branch_f4980: ; f4980
 	notetype $c, $c3
 	octave 2
@@ -372,11 +370,11 @@ Music_Gym_branch_f4a15: ; f4a15
 	note F#, 1
 	note F#, 1
 	endchannel
+; f4a37
 
 Music_Gym_Ch3: ; f4a37
 	vibrato $14, $23
 	stereopanning $ff
-
 Music_Gym_branch_f4a3c: ; f4a3c
 	notetype $c, $14
 	octave 6
@@ -508,10 +506,10 @@ Music_Gym_branch_f4ab3: ; f4ab3
 	note G_, 1
 	note A_, 4
 	endchannel
+; f4ac5
 
 Music_Gym_Ch4: ; f4ac5
 	togglenoise $4
-
 Music_Gym_branch_f4ac7: ; f4ac7
 	notetype $c
 	note D_, 2
@@ -537,7 +535,6 @@ Music_Gym_branch_f4ac7: ; f4ac7
 	note D_, 1
 	note D_, 1
 	notetype $6
-
 Music_Gym_branch_f4ae1: ; f4ae1
 	note D_, 6
 	note D_, 6
@@ -561,7 +558,6 @@ Music_Gym_branch_f4ae1: ; f4ae1
 	note D_, 4
 	note B_, 8
 	loopchannel 4, Music_Gym_branch_f4ae1
-
 Music_Gym_branch_f4afa: ; f4afa
 	note D#, 4
 	note F#, 4
@@ -576,3 +572,5 @@ Music_Gym_branch_f4afa: ; f4afa
 	loopchannel 8, Music_Gym_branch_f4afa
 	loopchannel 0, Music_Gym_branch_f4ac7
 ; f4b0c
+
+
diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm
index 759024707..0085b71e4 100644
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -5,7 +5,6 @@ Music_GymLeaderVictory: ; f462c
 	dbw $03, Music_GymLeaderVictory_Ch4
 ; f4638
 
-
 Music_GymLeaderVictory_Ch1: ; f4638
 	tempo 116
 	volume $77
@@ -28,7 +27,6 @@ Music_GymLeaderVictory_Ch1: ; f4638
 	octave 5
 	note D_, 8
 	stereopanning $f
-
 Music_GymLeaderVictory_branch_f4658: ; f4658
 	dutycycle $1
 	callchannel Music_GymLeaderVictory_branch_f4689
@@ -117,6 +115,7 @@ Music_GymLeaderVictory_branch_f46a0: ; f46a0
 	note C#, 1
 	note E_, 8
 	endchannel
+; f46bd
 
 Music_GymLeaderVictory_Ch2: ; f46bd
 	vibrato $12, $34
@@ -133,7 +132,6 @@ Music_GymLeaderVictory_Ch2: ; f46bd
 	octave 5
 	note D_, 1
 	note F#, 16
-
 Music_GymLeaderVictory_branch_f46d0: ; f46d0
 	dutycycle $3
 	intensity $a1
@@ -220,6 +218,7 @@ Music_GymLeaderVictory_branch_f4720: ; f4720
 	note C#, 8
 	note C#, 8
 	endchannel
+; f4737
 
 Music_GymLeaderVictory_Ch3: ; f4737
 	notetype $c, $25
@@ -232,7 +231,6 @@ Music_GymLeaderVictory_Ch3: ; f4737
 	octave 3
 	note C#, 2
 	stereopanning $f0
-
 Music_GymLeaderVictory_branch_f4744: ; f4744
 	note D_, 2
 	note __, 4
@@ -388,13 +386,13 @@ Music_GymLeaderVictory_branch_f479e: ; f479e
 	octave 2
 	note A_, 2
 	endchannel
+; f47e5
 
 Music_GymLeaderVictory_Ch4: ; f47e5
 	togglenoise $4
 	notetype $c
 	note B_, 16
 	note B_, 16
-
 Music_GymLeaderVictory_branch_f47eb: ; f47eb
 	callchannel Music_GymLeaderVictory_branch_f480b
 	note D#, 6
@@ -408,7 +406,6 @@ Music_GymLeaderVictory_branch_f47eb: ; f47eb
 	note C#, 1
 	note C#, 1
 	note C#, 1
-
 Music_GymLeaderVictory_branch_f47fb: ; f47fb
 	note D#, 2
 	note G_, 2
@@ -431,3 +428,5 @@ Music_GymLeaderVictory_branch_f480b: ; f480b
 	loopchannel 3, Music_GymLeaderVictory_branch_f480b
 	endchannel
 ; f4815
+
+
diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm
index 96bad8565..26b249a98 100644
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -5,7 +5,6 @@ Music_HallOfFame: ; f05bf
 	dbw $03, Music_HallOfFame_Ch4
 ; f05cb
 
-
 Music_HallOfFame_Ch1: ; f05cb
 	tempo 112
 	volume $77
@@ -23,7 +22,6 @@ Music_HallOfFame_Ch1: ; f05cb
 	note E_, 1
 	note F_, 1
 	note F#, 1
-
 Music_HallOfFame_branch_f05e6: ; f05e6
 	intensity $97
 	octave 4
@@ -48,11 +46,11 @@ Music_HallOfFame_branch_f05e6: ; f05e6
 	note __, 16
 	note __, 16
 	loopchannel 0, Music_HallOfFame_branch_f05e6
+; f060b
 
 Music_HallOfFame_Ch2: ; f060b
 	vibrato $8, $25
 	dutycycle $3
-
 Music_HallOfFame_branch_f0610: ; f0610
 	notetype $c, $c4
 	octave 3
@@ -79,12 +77,11 @@ Music_HallOfFame_branch_f0610: ; f0610
 	note A_, 4
 	note F_, 2
 	loopchannel 0, Music_HallOfFame_branch_f0610
+; f062e
 
 Music_HallOfFame_Ch3: ; f062e
-
 Music_HallOfFame_branch_f062e: ; f062e
 	notetype $c, $28
-
 Music_HallOfFame_branch_f0631: ; f0631
 	octave 3
 	note D_, 2
@@ -140,6 +137,7 @@ Music_HallOfFame_branch_f0631: ; f0631
 	note E_, 4
 	note G_, 4
 	loopchannel 0, Music_HallOfFame_branch_f062e
+; f066d
 
 Music_HallOfFame_Ch4: ; f066d
 	togglenoise $5
@@ -149,7 +147,6 @@ Music_HallOfFame_Ch4: ; f066d
 	note __, 16
 	note __, 16
 	notetype $6
-
 Music_HallOfFame_branch_f0677: ; f0677
 	stereopanning $f
 	note A#, 4
@@ -178,3 +175,5 @@ Music_HallOfFame_branch_f0677: ; f0677
 	note A#, 1
 	loopchannel 0, Music_HallOfFame_branch_f0677
 ; f0697
+
+
diff --git a/audio/music/healpokemon.asm b/audio/music/healpokemon.asm
index ff0fe1b12..53509fff2 100644
--- a/audio/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
@@ -4,7 +4,6 @@ Music_HealPokemon: ; f0697
 	dbw $02, Music_HealPokemon_Ch3
 ; f06a0
 
-
 Music_HealPokemon_Ch1: ; f06a0
 	tempo 144
 	volume $77
@@ -24,6 +23,7 @@ Music_HealPokemon_Ch1: ; f06a0
 	unknownmusic0xe0 $0, $40
 	note B_, 4
 	endchannel
+; f06c4
 
 Music_HealPokemon_Ch2: ; f06c4
 	dutycycle $2
@@ -37,6 +37,7 @@ Music_HealPokemon_Ch2: ; f06c4
 	octave 5
 	note E_, 8
 	endchannel
+; f06d4
 
 Music_HealPokemon_Ch3: ; f06d4
 	notetype $c, $10
@@ -51,3 +52,5 @@ Music_HealPokemon_Ch3: ; f06d4
 	note __, 2
 	endchannel
 ; f06e1
+
+
diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index 82bd15721..b76539a9f 100644
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -5,14 +5,12 @@ Music_IndigoPlateau: ; ee852
 	dbw $03, Music_IndigoPlateau_Ch4
 ; ee85e
 
-
 Music_IndigoPlateau_Ch1: ; ee85e
 	tempo 128
 	volume $77
 	dutycycle $3
 	tone $0002
 	stereopanning $f
-
 Music_IndigoPlateau_branch_ee86a: ; ee86a
 	callchannel Music_IndigoPlateau_branch_ee881
 	octave 3
@@ -42,12 +40,12 @@ Music_IndigoPlateau_branch_ee881: ; ee881
 	note A_, 2
 	intensity $a0
 	endchannel
+; ee892
 
 Music_IndigoPlateau_Ch2: ; ee892
 	dutycycle $3
 	vibrato $10, $22
 	stereopanning $f0
-
 Music_IndigoPlateau_branch_ee899: ; ee899
 	callchannel Music_IndigoPlateau_branch_ee8e9
 	note A_, 4
@@ -118,10 +116,10 @@ Music_IndigoPlateau_branch_ee8e9: ; ee8e9
 	note D_, 2
 	intensity $b0
 	endchannel
+; ee8fa
 
 Music_IndigoPlateau_Ch3: ; ee8fa
 	notetype $c, $19
-
 Music_IndigoPlateau_branch_ee8fd: ; ee8fd
 	callchannel Music_IndigoPlateau_branch_ee915
 	octave 3
@@ -154,12 +152,12 @@ Music_IndigoPlateau_branch_ee915: ; ee915
 	note A_, 1
 	note __, 3
 	endchannel
+; ee924
 
 Music_IndigoPlateau_Ch4: ; ee924
 	stereopanning $f0
 	togglenoise $0
 	notetype $c
-
 Music_IndigoPlateau_branch_ee92a: ; ee92a
 	note D#, 4
 	note D_, 2
@@ -190,3 +188,5 @@ Music_IndigoPlateau_branch_ee92a: ; ee92a
 	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee92a
 ; ee94b
+
+
diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm
index afa2c2eec..f6faa6c19 100644
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -4,7 +4,6 @@ Music_JohtoGymBattle: ; ea50d
 	dbw $02, Music_JohtoGymBattle_Ch3
 ; ea516
 
-
 Music_JohtoGymBattle_Ch1: ; ea516
 	tempo 101
 	volume $77
@@ -12,7 +11,6 @@ Music_JohtoGymBattle_Ch1: ; ea516
 	tone $0002
 	vibrato $12, $15
 	notetype $c, $b2
-
 Music_JohtoGymBattle_branch_ea526: ; ea526
 	octave 3
 	note A#, 1
@@ -20,7 +18,6 @@ Music_JohtoGymBattle_branch_ea526: ; ea526
 	note G#, 1
 	note A_, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea526
-
 Music_JohtoGymBattle_branch_ea52f: ; ea52f
 	note C#, 1
 	note C_, 1
@@ -61,7 +58,6 @@ Music_JohtoGymBattle_branch_ea52f: ; ea52f
 	octave 3
 	note G#, 2
 	note F_, 2
-
 Music_JohtoGymBattle_branch_ea55d: ; ea55d
 	intensity $b5
 	note D_, 6
@@ -290,13 +286,13 @@ Music_JohtoGymBattle_branch_ea55d: ; ea55d
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea55d
+; ea65f
 
 Music_JohtoGymBattle_Ch2: ; ea65f
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-
 Music_JohtoGymBattle_branch_ea66a: ; ea66a
 	octave 4
 	note F#, 1
@@ -304,7 +300,6 @@ Music_JohtoGymBattle_branch_ea66a: ; ea66a
 	note E_, 1
 	note A#, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea66a
-
 Music_JohtoGymBattle_branch_ea673: ; ea673
 	note F#, 1
 	note F_, 1
@@ -402,7 +397,6 @@ Music_JohtoGymBattle_branch_ea673: ; ea673
 	octave 3
 	note G#, 1
 	note A_, 1
-
 Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
 	intensity $c7
 	note A#, 8
@@ -619,6 +613,7 @@ Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
 	note B_, 16
 	note G_, 16
 	loopchannel 0, Music_JohtoGymBattle_branch_ea6ee
+; ea7f4
 
 Music_JohtoGymBattle_Ch3: ; ea7f4
 	notetype $c, $19
@@ -690,7 +685,6 @@ Music_JohtoGymBattle_Ch3: ; ea7f4
 	octave 3
 	note A#, 2
 	note G#, 2
-
 Music_JohtoGymBattle_branch_ea83f: ; ea83f
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea963
@@ -1036,3 +1030,5 @@ Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
 	note D#, 2
 	endchannel
 ; ea9c1
+
+
diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm
index 7f0055385..86736a626 100644
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@@ -4,7 +4,6 @@ Music_JohtoTrainerBattle: ; f6096
 	dbw $02, Music_JohtoTrainerBattle_Ch3
 ; f609f
 
-
 Music_JohtoTrainerBattle_Ch1: ; f609f
 	tempo 102
 	volume $77
@@ -87,7 +86,6 @@ Music_JohtoTrainerBattle_Ch1: ; f609f
 	note F_, 6
 	intensity $b7
 	note G_, 4
-
 Music_JohtoTrainerBattle_branch_f6102: ; f6102
 	intensity $b4
 	callchannel Music_JohtoTrainerBattle_branch_f629f
@@ -245,7 +243,6 @@ Music_JohtoTrainerBattle_branch_f6102: ; f6102
 	intensity $a7
 	note D#, 12
 	note __, 16
-
 Music_JohtoTrainerBattle_branch_f61bd: ; f61bd
 	intensity $b7
 	note F_, 8
@@ -454,6 +451,7 @@ Music_JohtoTrainerBattle_branch_f629f: ; f629f
 	note F_, 2
 	note D_, 2
 	endchannel
+; f62b3
 
 Music_JohtoTrainerBattle_Ch2: ; f62b3
 	dutycycle $3
@@ -549,7 +547,6 @@ Music_JohtoTrainerBattle_Ch2: ; f62b3
 	note E_, 2
 	intensity $c7
 	note B_, 4
-
 Music_JohtoTrainerBattle_branch_f632a: ; f632a
 	callchannel Music_JohtoTrainerBattle_branch_f64a3
 	intensity $3e
@@ -587,7 +584,6 @@ Music_JohtoTrainerBattle_branch_f632a: ; f632a
 	note A_, 16
 	intensity $b7
 	note A_, 16
-
 Music_JohtoTrainerBattle_branch_f635a: ; f635a
 	intensity $c3
 	octave 3
@@ -611,7 +607,6 @@ Music_JohtoTrainerBattle_branch_f635a: ; f635a
 	note G_, 2
 	note A_, 2
 	note A#, 2
-
 Music_JohtoTrainerBattle_branch_f6376: ; f6376
 	note G_, 2
 	note F_, 2
@@ -690,7 +685,6 @@ Music_JohtoTrainerBattle_branch_f6376: ; f6376
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
 	intensity $a2
 	callchannel Music_JohtoTrainerBattle_branch_f64b6
-
 Music_JohtoTrainerBattle_branch_f63dd: ; f63dd
 	octave 4
 	note D#, 2
@@ -911,6 +905,7 @@ Music_JohtoTrainerBattle_branch_f64d2: ; f64d2
 	note F_, 4
 	note D#, 4
 	endchannel
+; f64de
 
 Music_JohtoTrainerBattle_Ch3: ; f64de
 	notetype $c, $19
@@ -946,7 +941,6 @@ Music_JohtoTrainerBattle_Ch3: ; f64de
 	note A#, 2
 	note A_, 2
 	note G#, 2
-
 Music_JohtoTrainerBattle_branch_f6501: ; f6501
 	note A_, 2
 	note E_, 2
@@ -989,7 +983,6 @@ Music_JohtoTrainerBattle_branch_f6501: ; f6501
 	note A_, 2
 	note A#, 2
 	note G_, 2
-
 Music_JohtoTrainerBattle_branch_f6531: ; f6531
 	callchannel Music_JohtoTrainerBattle_branch_f6681
 	note E_, 2
@@ -1063,7 +1056,6 @@ Music_JohtoTrainerBattle_branch_f6531: ; f6531
 	note F_, 8
 	note E_, 8
 	note D#, 8
-
 Music_JohtoTrainerBattle_branch_f6591: ; f6591
 	octave 3
 	note D#, 2
@@ -1087,14 +1079,12 @@ Music_JohtoTrainerBattle_branch_f6591: ; f6591
 	note F_, 2
 	note D#, 2
 	note G_, 2
-
 Music_JohtoTrainerBattle_branch_f65ac: ; f65ac
 	note C#, 2
 	note G#, 2
 	loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac
 	note B_, 2
 	note A_, 2
-
 Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
 	note D_, 2
 	note A_, 2
@@ -1105,19 +1095,16 @@ Music_JohtoTrainerBattle_branch_f65b4: ; f65b4
 	note F#, 2
 	note G#, 2
 	note A_, 2
-
 Music_JohtoTrainerBattle_branch_f65c0: ; f65c0
 	note A#, 4
 	note D#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0
-
 Music_JohtoTrainerBattle_branch_f65c6: ; f65c6
 	octave 4
 	note G_, 4
 	octave 3
 	note A#, 4
 	loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6
-
 Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
 	callchannel Music_JohtoTrainerBattle_branch_f66b4
 	note D#, 2
@@ -1192,12 +1179,10 @@ Music_JohtoTrainerBattle_branch_f65ce: ; f65ce
 	note C_, 2
 	octave 3
 	note A#, 2
-
 Music_JohtoTrainerBattle_branch_f661e: ; f661e
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f661e
-
 Music_JohtoTrainerBattle_branch_f6624: ; f6624
 	note C#, 2
 	note G#, 2
@@ -1208,12 +1193,10 @@ Music_JohtoTrainerBattle_branch_f6624: ; f6624
 	octave 3
 	note A#, 2
 	note G#, 2
-
 Music_JohtoTrainerBattle_branch_f6630: ; f6630
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_JohtoTrainerBattle_branch_f6630
-
 Music_JohtoTrainerBattle_branch_f6636: ; f6636
 	note C#, 2
 	note G#, 2
@@ -1363,3 +1346,5 @@ Music_JohtoTrainerBattle_branch_f66b4: ; f66b4
 	note A#, 2
 	endchannel
 ; f66c3
+
+
diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm
index f2f1f3494..a3e0ef9ee 100644
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@@ -4,14 +4,12 @@ Music_JohtoWildBattle: ; f5dc5
 	dbw $02, Music_JohtoWildBattle_Ch3
 ; f5dce
 
-
 Music_JohtoWildBattle_Ch1: ; f5dce
 	tempo 104
 	volume $77
 	dutycycle $3
 	tone $0002
 	vibrato $12, $15
-
 Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
 	notetype $c, $b2
 	octave 4
@@ -89,7 +87,6 @@ Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb
 	note D_, 4
 	intensity $6f
 	note D#, 8
-
 Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
 	intensity $b6
 	octave 3
@@ -203,6 +200,7 @@ Music_JohtoWildBattle_branch_f5e2d: ; f5e2d
 	note F#, 4
 	note G_, 16
 	loopchannel 0, Music_JohtoWildBattle_branch_f5e2d
+; f5ea2
 
 Music_JohtoWildBattle_Ch2: ; f5ea2
 	dutycycle $3
@@ -212,7 +210,6 @@ Music_JohtoWildBattle_Ch2: ; f5ea2
 	notetype $c, $c2
 	octave 4
 	note G_, 6
-
 Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
 	octave 3
 	note D_, 6
@@ -242,7 +239,6 @@ Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2
 	note G_, 4
 	intensity $6f
 	note G#, 8
-
 Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
 	intensity $c4
 	octave 3
@@ -370,7 +366,6 @@ Music_JohtoWildBattle_branch_f5ed1: ; f5ed1
 ; f5f5d
 
 Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d
-
 Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
 	notetype $c, $c2
 	octave 4
@@ -422,10 +417,10 @@ Music_JohtoWildBattle_branch_f5f5d: ; f5f5d
 	octave 5
 	note G_, 1
 	endchannel
+; f5f91
 
 Music_JohtoWildBattle_Ch3: ; f5f91
 	notetype $c, $14
-
 Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
 	octave 4
 	note G_, 2
@@ -475,7 +470,6 @@ Music_JohtoWildBattleNight_branch_f5f94: ; f5f94
 	note D#, 2
 	note G_, 2
 	note F_, 2
-
 Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
 	note D_, 2
 	note G_, 2
@@ -493,7 +487,6 @@ Music_JohtoWildBattle_branch_f5fc6: ; f5fc6
 	note G_, 2
 	note F_, 2
 	note D#, 2
-
 Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
 	note D_, 2
 	note G_, 2
@@ -501,14 +494,12 @@ Music_JohtoWildBattle_branch_f5fdb: ; f5fdb
 	note F#, 4
 	callchannel Music_JohtoWildBattle_branch_f6055
 	callchannel Music_JohtoWildBattle_branch_f6055
-
 Music_JohtoWildBattle_branch_f5fe8: ; f5fe8
 	note D_, 2
 	note G_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f5fe8
 	note D_, 2
 	note A_, 2
-
 Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
 	note C_, 2
 	note F_, 2
@@ -527,7 +518,6 @@ Music_JohtoWildBattle_branch_f5ff0: ; f5ff0
 	note D#, 2
 	note G#, 2
 	note G_, 4
-
 Music_JohtoWildBattle_branch_f6006: ; f6006
 	note E_, 2
 	note A_, 2
@@ -557,12 +547,10 @@ Music_JohtoWildBattle_branch_f6006: ; f6006
 	note F#, 2
 	note F_, 2
 	note D#, 2
-
 Music_JohtoWildBattle_branch_f6027: ; f6027
 	note D_, 2
 	note G_, 2
 	loopchannel 8, Music_JohtoWildBattle_branch_f6027
-
 Music_JohtoWildBattle_branch_f602d: ; f602d
 	note C_, 2
 	note F_, 2
@@ -573,19 +561,16 @@ Music_JohtoWildBattle_branch_f602d: ; f602d
 	note G_, 4
 	note D_, 4
 	note G_, 4
-
 Music_JohtoWildBattle_branch_f6039: ; f6039
 	note D_, 2
 	note G_, 2
 	loopchannel 12, Music_JohtoWildBattle_branch_f6039
-
 Music_JohtoWildBattle_branch_f603f: ; f603f
 	note C_, 2
 	note E_, 2
 	loopchannel 7, Music_JohtoWildBattle_branch_f603f
 	note F_, 2
 	note F#, 2
-
 Music_JohtoWildBattle_branch_f6047: ; f6047
 	note D_, 2
 	note G_, 2
@@ -603,3 +588,5 @@ Music_JohtoWildBattle_branch_f6055: ; f6055
 	loopchannel 4, Music_JohtoWildBattle_branch_f6055
 	endchannel
 ; f605c
+
+
diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm
index a4fbbd655..402e87a1f 100644
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -4,7 +4,6 @@ Music_JohtoWildBattleNight: ; f605c
 	dbw $02, Music_JohtoWildBattleNight_Ch3
 ; f6065
 
-
 Music_JohtoWildBattleNight_Ch1: ; f6065
 	tempo 107
 	volume $77
@@ -12,6 +11,7 @@ Music_JohtoWildBattleNight_Ch1: ; f6065
 	tone $0002
 	vibrato $10, $25
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb
+; f6076
 
 Music_JohtoWildBattleNight_Ch2: ; f6076
 	dutycycle $3
@@ -24,8 +24,11 @@ Music_JohtoWildBattleNight_Ch2: ; f6076
 	tone $0001
 	dutycycle $2
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2
+; f608f
 
 Music_JohtoWildBattleNight_Ch3: ; f608f
 	notetype $c, $11
 	loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94
 ; f6096
+
+
diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm
index 0b5eccbf1..17fce2d6d 100644
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@@ -4,7 +4,6 @@ Music_KantoGymBattle: ; ec720
 	dbw $02, Music_KantoGymBattle_Ch3
 ; ec729
 
-
 Music_KantoGymBattle_Ch1: ; ec729
 	tempo 101
 	volume $77
@@ -87,7 +86,6 @@ Music_KantoGymBattle_Ch1: ; ec729
 	note E_, 4
 	note E_, 4
 	note E_, 2
-
 Music_KantoGymBattle_branch_ec78b: ; ec78b
 	callchannel Music_KantoGymBattle_branch_ec832
 	octave 2
@@ -254,13 +252,13 @@ Music_KantoGymBattle_branch_ec832: ; ec832
 	note D#, 2
 	note C#, 2
 	endchannel
+; ec847
 
 Music_KantoGymBattle_Ch2: ; ec847
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-
 Music_KantoGymBattle_branch_ec852: ; ec852
 	octave 4
 	note A#, 1
@@ -270,7 +268,6 @@ Music_KantoGymBattle_branch_ec852: ; ec852
 	note D#, 1
 	loopchannel 8, Music_KantoGymBattle_branch_ec852
 	octave 3
-
 Music_KantoGymBattle_branch_ec85d: ; ec85d
 	intensity $c2
 	note D#, 2
@@ -319,7 +316,6 @@ Music_KantoGymBattle_branch_ec85d: ; ec85d
 	intensity $c2
 	octave 4
 	loopchannel 2, Music_KantoGymBattle_branch_ec85d
-
 Music_KantoGymBattle_branch_ec894: ; ec894
 	callchannel Music_KantoGymBattle_branch_ec907
 	note E_, 8
@@ -441,13 +437,13 @@ Music_KantoGymBattle_branch_ec907: ; ec907
 	dutycycle $3
 	intensity $b0
 	endchannel
+; ec92e
 
 Music_KantoGymBattle_Ch3: ; ec92e
 	notetype $c, $19
 	octave 2
 	note E_, 1
 	note __, 1
-
 Music_KantoGymBattle_branch_ec934: ; ec934
 	note B_, 3
 	note __, 1
@@ -455,7 +451,6 @@ Music_KantoGymBattle_branch_ec934: ; ec934
 	note B_, 2
 	note G#, 2
 	note B_, 2
-
 Music_KantoGymBattle_branch_ec93d: ; ec93d
 	note D#, 1
 	note __, 1
@@ -494,13 +489,11 @@ Music_KantoGymBattle_branch_ec93d: ; ec93d
 	note __, 1
 	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec93d
-
 Music_KantoGymBattle_branch_ec965: ; ec965
 	octave 2
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec965
-
 Music_KantoGymBattle_branch_ec96c: ; ec96c
 	note E_, 2
 	note B_, 2
@@ -518,14 +511,12 @@ Music_KantoGymBattle_branch_ec96c: ; ec96c
 	note E_, 2
 	octave 2
 	note B_, 2
-
 Music_KantoGymBattle_branch_ec97f: ; ec97f
 	octave 2
 	note F#, 2
 	octave 3
 	note C#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec97f
-
 Music_KantoGymBattle_branch_ec987: ; ec987
 	octave 2
 	note E_, 2
@@ -535,7 +526,6 @@ Music_KantoGymBattle_branch_ec987: ; ec987
 	note E_, 2
 	octave 2
 	note B_, 2
-
 Music_KantoGymBattle_branch_ec992: ; ec992
 	note D#, 1
 	note __, 1
@@ -556,7 +546,6 @@ Music_KantoGymBattle_branch_ec992: ; ec992
 	note __, 1
 	note E_, 2
 	loopchannel 2, Music_KantoGymBattle_branch_ec992
-
 Music_KantoGymBattle_branch_ec9a8: ; ec9a8
 	note D#, 2
 	note A#, 2
@@ -574,13 +563,11 @@ Music_KantoGymBattle_branch_ec9a8: ; ec9a8
 	note B_, 2
 	octave 3
 	note E_, 2
-
 Music_KantoGymBattle_branch_ec9bb: ; ec9bb
 	octave 2
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_KantoGymBattle_branch_ec9bb
-
 Music_KantoGymBattle_branch_ec9c2: ; ec9c2
 	octave 2
 	note F#, 2
@@ -601,18 +588,15 @@ Music_KantoGymBattle_branch_ec9c2: ; ec9c2
 	note F#, 2
 	note E_, 2
 	note C#, 2
-
 Music_KantoGymBattle_branch_ec9d8: ; ec9d8
 	octave 2
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_KantoGymBattle_branch_ec9d8
-
 Music_KantoGymBattle_branch_ec9df: ; ec9df
 	note C#, 2
 	note G#, 2
 	loopchannel 8, Music_KantoGymBattle_branch_ec9df
-
 Music_KantoGymBattle_branch_ec9e5: ; ec9e5
 	note D#, 2
 	note A#, 2
@@ -630,3 +614,5 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5
 	note F_, 2
 	loopchannel 0, Music_KantoGymBattle_branch_ec965
 ; ec9fa
+
+
diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm
index 29de18e55..21d1a7e95 100644
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -4,8 +4,10 @@ Music_KantoTrainerBattle: ; ec9fa
 	dbw $02, Music_KantoTrainerBattle_Ch3
 ; eca03
 
+
 INCBIN "baserom.gbc", $eca03, $eca04 - $eca03
 
+
 Music_KantoTrainerBattle_Ch1: ; eca04
 	tempo 114
 	volume $77
@@ -127,7 +129,6 @@ Music_KantoTrainerBattle_Ch1: ; eca04
 	note D#, 2
 	note F_, 2
 	note F#, 2
-
 Music_KantoTrainerBattle_branch_eca88: ; eca88
 	notetype $c, $b7
 	note D#, 4
@@ -465,6 +466,7 @@ Music_KantoTrainerBattle_branch_eca88: ; eca88
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_eca88
+; ecbea
 
 Music_KantoTrainerBattle_Ch2: ; ecbea
 	forceoctave $1b
@@ -485,7 +487,6 @@ Music_KantoTrainerBattle_Ch2: ; ecbea
 	note F#, 1
 	dutycycle $3
 	intensity $62
-
 Music_KantoTrainerBattle_branch_ecc04: ; ecc04
 	octave 3
 	note G_, 1
@@ -543,7 +544,6 @@ Music_KantoTrainerBattle_branch_ecc04: ; ecc04
 	octave 3
 	note D_, 1
 	note F_, 1
-
 Music_KantoTrainerBattle_branch_ecc41: ; ecc41
 	notetype $c, $d7
 	octave 2
@@ -919,6 +919,7 @@ Music_KantoTrainerBattle_branch_ecc41: ; ecc41
 	octave 3
 	note B_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ecc41
+; ecdd2
 
 Music_KantoTrainerBattle_Ch3: ; ecdd2
 	forceoctave $1b
@@ -1051,7 +1052,6 @@ Music_KantoTrainerBattle_Ch3: ; ecdd2
 	note G_, 2
 	note A#, 2
 	note B_, 2
-
 Music_KantoTrainerBattle_branch_ece5a: ; ece5a
 	notetype $c, $14
 	octave 6
@@ -1540,3 +1540,5 @@ Music_KantoTrainerBattle_branch_ece5a: ; ece5a
 	note G_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
 ; ed06d
+
+
diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm
index 7ed436325..e14e8b85e 100644
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -4,8 +4,10 @@ Music_KantoWildBattle: ; ed06d
 	dbw $02, Music_KantoWildBattle_Ch3
 ; ed076
 
+
 INCBIN "baserom.gbc", $ed076, $ed077 - $ed076
 
+
 Music_KantoWildBattle_Ch1: ; ed077
 	tempo 112
 	volume $77
@@ -25,7 +27,6 @@ Music_KantoWildBattle_Ch1: ; ed077
 	note G_, 1
 	note F#, 1
 	note F_, 1
-
 Music_KantoWildBattle_branch_ed091: ; ed091
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed18a
@@ -209,7 +210,6 @@ Music_KantoWildBattle_branch_ed091: ; ed091
 	note D#, 1
 	note __, 5
 	note C#, 8
-
 Music_KantoWildBattle_branch_ed15b: ; ed15b
 	intensity $b1
 	octave 3
@@ -218,28 +218,24 @@ Music_KantoWildBattle_branch_ed15b: ; ed15b
 	note D_, 1
 	note C#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed15b
-
 Music_KantoWildBattle_branch_ed166: ; ed166
 	note C#, 1
 	note F_, 1
 	note E_, 1
 	note D#, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed166
-
 Music_KantoWildBattle_branch_ed16e: ; ed16e
 	note C_, 1
 	note D#, 1
 	note D_, 1
 	note C#, 1
 	loopchannel 16, Music_KantoWildBattle_branch_ed16e
-
 Music_KantoWildBattle_branch_ed176: ; ed176
 	note C#, 1
 	note E_, 1
 	note D#, 1
 	note D_, 1
 	loopchannel 8, Music_KantoWildBattle_branch_ed176
-
 Music_KantoWildBattle_branch_ed17e: ; ed17e
 	note C_, 1
 	note D#, 1
@@ -271,6 +267,7 @@ Music_KantoWildBattle_branch_ed18a: ; ed18a
 	note B_, 1
 	note __, 3
 	endchannel
+; ed19f
 
 Music_KantoWildBattle_Ch2: ; ed19f
 	dutycycle $1
@@ -309,7 +306,6 @@ Music_KantoWildBattle_Ch2: ; ed19f
 	note D#, 1
 	note D_, 1
 	note C#, 1
-
 Music_KantoWildBattle_branch_ed1c8: ; ed1c8
 	notetype $c, $b7
 	callchannel Music_KantoWildBattle_branch_ed2c6
@@ -677,6 +673,7 @@ Music_KantoWildBattle_branch_ed354: ; ed354
 	note C_, 2
 	note __, 2
 	endchannel
+; ed368
 
 Music_KantoWildBattle_Ch3: ; ed368
 	vibrato $14, $23
@@ -729,7 +726,6 @@ Music_KantoWildBattle_Ch3: ; ed368
 	note G_, 1
 	octave 4
 	note G_, 1
-
 Music_KantoWildBattle_branch_ed39e: ; ed39e
 	notetype $c, $14
 	octave 5
@@ -1230,3 +1226,5 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e
 	note G_, 16
 	loopchannel 0, Music_KantoWildBattle_branch_ed39e
 ; ed5c6
+
+
diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm
index ea52374a0..8a57ab381 100644
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -5,7 +5,6 @@ Music_LakeOfRage: ; ee6c5
 	dbw $03, Music_LakeOfRage_Ch4
 ; ee6d1
 
-
 Music_LakeOfRage_Ch1: ; ee6d1
 	tempo 144
 	volume $77
@@ -20,7 +19,6 @@ Music_LakeOfRage_Ch1: ; ee6d1
 	note D_, 6
 	note D_, 6
 	note E_, 4
-
 Music_LakeOfRage_branch_ee6e9: ; ee6e9
 	intensity $b5
 	note F#, 6
@@ -95,6 +93,7 @@ Music_LakeOfRage_branch_ee6e9: ; ee6e9
 	intensity $a7
 	note D_, 6
 	loopchannel 0, Music_LakeOfRage_branch_ee6e9
+; ee749
 
 Music_LakeOfRage_Ch2: ; ee749
 	dutycycle $3
@@ -109,7 +108,6 @@ Music_LakeOfRage_Ch2: ; ee749
 	note A_, 8
 	intensity $a7
 	note A_, 8
-
 Music_LakeOfRage_branch_ee75e: ; ee75e
 	notetype $8, $c7
 	octave 4
@@ -185,6 +183,7 @@ Music_LakeOfRage_branch_ee75e: ; ee75e
 	notetype $c, $c7
 	note A_, 16
 	loopchannel 0, Music_LakeOfRage_branch_ee75e
+; ee7c1
 
 Music_LakeOfRage_Ch3: ; ee7c1
 	stereopanning $f
@@ -199,7 +198,6 @@ Music_LakeOfRage_Ch3: ; ee7c1
 	note F#, 4
 	note __, 2
 	note E_, 4
-
 Music_LakeOfRage_branch_ee7d0: ; ee7d0
 	octave 3
 	note D_, 4
@@ -299,12 +297,12 @@ Music_LakeOfRage_branch_ee7d0: ; ee7d0
 	octave 2
 	note A_, 2
 	loopchannel 0, Music_LakeOfRage_branch_ee7d0
+; ee835
 
 Music_LakeOfRage_Ch4: ; ee835
 	stereopanning $f0
 	togglenoise $3
 	notetype $c
-
 Music_LakeOfRage_branch_ee83b: ; ee83b
 	note D_, 2
 	note D_, 1
@@ -327,3 +325,5 @@ Music_LakeOfRage_branch_ee83b: ; ee83b
 	note D_, 1
 	loopchannel 0, Music_LakeOfRage_branch_ee83b
 ; ee852
+
+
diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm
index da4bd51fa..2abd29318 100644
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -4,7 +4,6 @@ Music_LakeOfRageRocketRadio: ; ef5b1
 	dbw $02, Music_LakeOfRageRocketRadio_Ch3
 ; ef5ba
 
-
 Music_LakeOfRageRocketRadio_Ch1: ; ef5ba
 	tempo 160
 	volume $77
@@ -12,7 +11,6 @@ Music_LakeOfRageRocketRadio_Ch1: ; ef5ba
 	tone $1118
 	vibrato $0, $f0
 	stereopanning $f0
-
 Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
 	notetype $c, $a7
 	octave 7
@@ -22,6 +20,7 @@ Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9
 	note F#, 4
 	note __, 16
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+; ef5d6
 
 Music_LakeOfRageRocketRadio_Ch2: ; ef5d6
 	dutycycle $1
@@ -30,6 +29,7 @@ Music_LakeOfRageRocketRadio_Ch2: ; ef5d6
 	note __, 2
 	stereopanning $f
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
+; ef5e5
 
 Music_LakeOfRageRocketRadio_Ch3: ; ef5e5
 	notetype $c, $26
@@ -37,3 +37,5 @@ Music_LakeOfRageRocketRadio_Ch3: ; ef5e5
 	note __, 4
 	loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9
 ; ef5f0
+
+
diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm
index 96319158a..780bdc607 100644
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -4,8 +4,10 @@ Music_LavenderTown: ; ef72f
 	dbw $02, Music_LavenderTown_Ch3
 ; ef738
 
+
 INCBIN "baserom.gbc", $ef738, $ef739 - $ef738
 
+
 Music_LavenderTown_Ch1: ; ef739
 	tempo 160
 	volume $77
@@ -17,7 +19,6 @@ Music_LavenderTown_Ch1: ; ef739
 	note __, 16
 	note __, 16
 	note __, 16
-
 Music_LavenderTown_branch_ef74c: ; ef74c
 	callchannel Music_LavenderTown_branch_ef7fd
 	intensity $93
@@ -104,7 +105,6 @@ Music_LavenderTown_branch_ef74c: ; ef74c
 	octave 3
 	note A_, 2
 	note F_, 2
-
 Music_LavenderTown_branch_ef7ca: ; ef7ca
 	octave 3
 	note C_, 2
@@ -265,12 +265,12 @@ Music_LavenderTown_branch_ef87f: ; ef87f
 	intensity $43
 	note G_, 2
 	endchannel
+; ef899
 
 Music_LavenderTown_Ch2: ; ef899
 	dutycycle $1
 	vibrato $8, $24
 	stereopanning $ff
-
 Music_LavenderTown_branch_ef8a0: ; ef8a0
 	notetype $c, $a3
 	octave 5
@@ -307,7 +307,6 @@ Music_LavenderTown_branch_ef8a0: ; ef8a0
 	note D_, 2
 	intensity $63
 	note D_, 2
-
 Music_LavenderTown_branch_ef8d7: ; ef8d7
 	intensity $b5
 	callchannel Music_LavenderTown_branch_ef915
@@ -393,6 +392,7 @@ Music_LavenderTown_branch_ef915: ; ef915
 	note A_, 4
 	note C_, 4
 	endchannel
+; ef932
 
 Music_LavenderTown_Ch3: ; ef932
 	vibrato $12, $24
@@ -405,7 +405,6 @@ Music_LavenderTown_Ch3: ; ef932
 	octave 5
 	note E_, 4
 	note F_, 4
-
 Music_LavenderTown_branch_ef941: ; ef941
 	intensity $12
 	octave 5
@@ -522,3 +521,5 @@ Music_LavenderTown_branch_ef941: ; ef941
 	note F_, 2
 	loopchannel 0, Music_LavenderTown_branch_ef941
 ; ef9bc
+
+
diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm
index c65e0f81a..74abfcde3 100644
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -5,7 +5,6 @@ Music_Lighthouse: ; ee569
 	dbw $03, Music_Lighthouse_Ch4
 ; ee575
 
-
 Music_Lighthouse_Ch1: ; ee575
 	tempo 144
 	volume $77
@@ -13,7 +12,6 @@ Music_Lighthouse_Ch1: ; ee575
 	tone $0004
 	vibrato $8, $45
 	stereopanning $f
-
 Music_Lighthouse_branch_ee584: ; ee584
 	notetype $c, $b3
 	octave 3
@@ -130,12 +128,12 @@ Music_Lighthouse_branch_ee584: ; ee584
 	note A_, 2
 	note G#, 8
 	loopchannel 0, Music_Lighthouse_branch_ee584
+; ee5fc
 
 Music_Lighthouse_Ch2: ; ee5fc
 	dutycycle $3
 	tone $0002
 	vibrato $10, $45
-
 Music_Lighthouse_branch_ee604: ; ee604
 	notetype $c, $c5
 	octave 3
@@ -213,11 +211,11 @@ Music_Lighthouse_branch_ee604: ; ee604
 	note C#, 2
 	note C_, 8
 	loopchannel 0, Music_Lighthouse_branch_ee604
+; ee656
 
 Music_Lighthouse_Ch3: ; ee656
 	notetype $c, $19
 	stereopanning $f0
-
 Music_Lighthouse_branch_ee65b: ; ee65b
 	octave 2
 	note G#, 2
@@ -228,7 +226,6 @@ Music_Lighthouse_branch_ee65b: ; ee65b
 	note __, 2
 	note G_, 2
 	note __, 2
-
 Music_Lighthouse_branch_ee664: ; ee664
 	note G#, 2
 	note __, 2
@@ -258,7 +255,6 @@ Music_Lighthouse_branch_ee664: ; ee664
 	octave 3
 	note C_, 2
 	note __, 2
-
 Music_Lighthouse_branch_ee683: ; ee683
 	note C#, 2
 	note __, 2
@@ -281,7 +277,6 @@ Music_Lighthouse_branch_ee683: ; ee683
 	octave 3
 	note D#, 2
 	note F#, 2
-
 Music_Lighthouse_branch_ee69b: ; ee69b
 	note E_, 2
 	note __, 2
@@ -295,11 +290,11 @@ Music_Lighthouse_branch_ee69b: ; ee69b
 	note __, 2
 	loopchannel 8, Music_Lighthouse_branch_ee69b
 	loopchannel 0, Music_Lighthouse_branch_ee65b
+; ee6ad
 
 Music_Lighthouse_Ch4: ; ee6ad
 	togglenoise $0
 	notetype $c
-
 Music_Lighthouse_branch_ee6b1: ; ee6b1
 	stereopanning $f
 	note G#, 4
@@ -317,3 +312,5 @@ Music_Lighthouse_branch_ee6b1: ; ee6b1
 	note A_, 2
 	loopchannel 0, Music_Lighthouse_branch_ee6b1
 ; ee6c5
+
+
diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm
index 914170ccf..7f08f2ffc 100644
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -5,7 +5,6 @@ Music_LookBeauty: ; eee3e
 	dbw $03, Music_LookBeauty_Ch4
 ; eee4a
 
-
 Music_LookBeauty_Ch1: ; eee4a
 	stereopanning $f
 	vibrato $12, $25
@@ -18,7 +17,6 @@ Music_LookBeauty_Ch1: ; eee4a
 	octave 4
 	note C_, 8
 	dutycycle $3
-
 Music_LookBeauty_branch_eee5f: ; eee5f
 	note __, 4
 	octave 3
@@ -78,6 +76,7 @@ Music_LookBeauty_branch_eee5f: ; eee5f
 	octave 4
 	note C_, 1
 	loopchannel 0, Music_LookBeauty_branch_eee5f
+; eee9c
 
 Music_LookBeauty_Ch2: ; eee9c
 	stereopanning $f0
@@ -114,7 +113,6 @@ Music_LookBeauty_Ch2: ; eee9c
 	note F#, 1
 	note __, 1
 	dutycycle $3
-
 Music_LookBeauty_branch_eeec5: ; eeec5
 	notetype $c, $c7
 	note G_, 16
@@ -156,6 +154,7 @@ Music_LookBeauty_branch_eeec5: ; eeec5
 	note F#, 8
 	note A_, 8
 	loopchannel 0, Music_LookBeauty_branch_eeec5
+; eeefa
 
 Music_LookBeauty_Ch3: ; eeefa
 	stereopanning $ff
@@ -174,7 +173,6 @@ Music_LookBeauty_Ch3: ; eeefa
 	octave 3
 	note D_, 7
 	note F#, 1
-
 Music_LookBeauty_branch_eef0f: ; eef0f
 	note G_, 4
 	octave 4
@@ -297,13 +295,13 @@ Music_LookBeauty_branch_eef0f: ; eef0f
 	octave 3
 	note D_, 8
 	loopchannel 0, Music_LookBeauty_branch_eef0f
+; eef8b
 
 Music_LookBeauty_Ch4: ; eef8b
 	togglenoise $3
 	notetype $c
 	note __, 16
 	note __, 16
-
 Music_LookBeauty_branch_eef91: ; eef91
 	callchannel Music_LookBeauty_branch_eefa1
 	callchannel Music_LookBeauty_branch_eefa1
@@ -331,3 +329,5 @@ Music_LookBeauty_branch_eefa1: ; eefa1
 	note G_, 2
 	endchannel
 ; eefb2
+
+
diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm
index 3d96600ed..a213b49cb 100644
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -5,7 +5,6 @@ Music_LookHiker: ; f7411
 	dbw $03, Music_LookHiker_Ch4
 ; f741d
 
-
 Music_LookHiker_Ch1: ; f741d
 	tempo 132
 	volume $77
@@ -18,7 +17,6 @@ Music_LookHiker_Ch1: ; f741d
 	note F#, 2
 	note F_, 2
 	note F#, 8
-
 Music_LookHiker_branch_f7433: ; f7433
 	note D_, 2
 	note D#, 2
@@ -33,6 +31,7 @@ Music_LookHiker_branch_f7433: ; f7433
 	note F#, 2
 	note __, 6
 	loopchannel 0, Music_LookHiker_branch_f7433
+; f7443
 
 Music_LookHiker_Ch2: ; f7443
 	dutycycle $0
@@ -51,7 +50,6 @@ Music_LookHiker_Ch2: ; f7443
 	note F#, 1
 	note D_, 1
 	intensity $a1
-
 Music_LookHiker_branch_f7457: ; f7457
 	octave 1
 	note B_, 1
@@ -70,6 +68,7 @@ Music_LookHiker_branch_f7457: ; f7457
 	note F#, 1
 	note D_, 1
 	loopchannel 0, Music_LookHiker_branch_f7457
+; f746b
 
 Music_LookHiker_Ch3: ; f746b
 	vibrato $12, $24
@@ -79,7 +78,6 @@ Music_LookHiker_Ch3: ; f746b
 	note B_, 2
 	note A#, 2
 	note B_, 8
-
 Music_LookHiker_branch_f7477: ; f7477
 	octave 5
 	note D#, 2
@@ -106,13 +104,13 @@ Music_LookHiker_branch_f748a: ; f748a
 	note B_, 2
 	note __, 6
 	endchannel
+; f7494
 
 Music_LookHiker_Ch4: ; f7494
 	togglenoise $3
 	notetype $c
 	note F_, 4
 	note __, 16
-
 Music_LookHiker_branch_f749a: ; f749a
 	note D#, 2
 	note G_, 2
@@ -120,3 +118,5 @@ Music_LookHiker_branch_f749a: ; f749a
 	note G_, 2
 	loopchannel 0, Music_LookHiker_branch_f749a
 ; f74a2
+
+
diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm
index 15eea9914..32d4498db 100644
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -4,8 +4,10 @@ Music_LookKimonoGirl: ; f79b8
 	dbw $02, Music_LookKimonoGirl_Ch3
 ; f79c1
 
+
 INCBIN "baserom.gbc", $f79c1, $f79c2 - $f79c1
 
+
 Music_LookKimonoGirl_Ch1: ; f79c2
 	tempo 160
 	volume $77
@@ -15,7 +17,6 @@ Music_LookKimonoGirl_Ch1: ; f79c2
 	tone $0001
 	callchannel Music_LookKimonoGirl_branch_f7aa8
 	tone $0000
-
 Music_LookKimonoGirl_branch_f79d7: ; f79d7
 	notetype $c, $b2
 	callchannel Music_LookKimonoGirl_branch_f7a13
@@ -113,7 +114,6 @@ Music_LookKimonoGirl_Ch2: ; f7a55
 	notetype $6, $a7
 	stereopanning $f0
 	callchannel Music_LookKimonoGirl_branch_f7aa8
-
 Music_LookKimonoGirl_branch_f7a5f: ; f7a5f
 	dutycycle $3
 	notetype $c, $91
@@ -217,6 +217,7 @@ Music_LookKimonoGirl_branch_f7aa8: ; f7aa8
 	note E_, 1
 	note E_, 1
 	endchannel
+; f7ad4
 
 Music_LookKimonoGirl_Ch3: ; f7ad4
 	stereopanning $ff
@@ -234,7 +235,6 @@ Music_LookKimonoGirl_Ch3: ; f7ad4
 	octave 5
 	note D_, 2
 	note E_, 2
-
 Music_LookKimonoGirl_branch_f7aec: ; f7aec
 	octave 5
 	note D_, 4
@@ -273,3 +273,5 @@ Music_LookKimonoGirl_branch_f7aec: ; f7aec
 	note E_, 8
 	loopchannel 0, Music_LookKimonoGirl_branch_f7aec
 ; f7b13
+
+
diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm
index e2c0c63b9..17f44173c 100644
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -5,7 +5,6 @@ Music_LookLass: ; ed79b
 	dbw $03, Music_LookLass_Ch4
 ; ed7a7
 
-
 Music_LookLass_Ch1: ; ed7a7
 	tempo 132
 	volume $77
@@ -19,7 +18,6 @@ Music_LookLass_Ch1: ; ed7a7
 	note B_, 14
 	stereopanning $f
 	dutycycle $0
-
 Music_LookLass_branch_ed7bd: ; ed7bd
 	intensity $a2
 	octave 3
@@ -31,13 +29,13 @@ Music_LookLass_branch_ed7bd: ; ed7bd
 	intensity $a3
 	note B_, 2
 	loopchannel 0, Music_LookLass_branch_ed7bd
+; ed7cd
 
 Music_LookLass_Ch2: ; ed7cd
 	stereopanning $f0
 	dutycycle $0
 	notetype $c, $83
 	note __, 16
-
 Music_LookLass_branch_ed7d5: ; ed7d5
 	intensity $92
 	octave 2
@@ -50,6 +48,7 @@ Music_LookLass_branch_ed7d5: ; ed7d5
 	octave 3
 	note G#, 2
 	loopchannel 0, Music_LookLass_branch_ed7d5
+; ed7e6
 
 Music_LookLass_Ch3: ; ed7e6
 	notetype $c, $10
@@ -59,7 +58,6 @@ Music_LookLass_Ch3: ; ed7e6
 	note D#, 2
 	note C#, 2
 	note C_, 2
-
 Music_LookLass_branch_ed7ef: ; ed7ef
 	octave 5
 	note B_, 2
@@ -101,12 +99,12 @@ Music_LookLass_branch_ed7ef: ; ed7ef
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_LookLass_branch_ed7ef
+; ed81a
 
 Music_LookLass_Ch4: ; ed81a
 	togglenoise $4
 	notetype $c
 	note C_, 16
-
 Music_LookLass_branch_ed81f: ; ed81f
 	notetype $6
 	note D_, 8
@@ -119,3 +117,5 @@ Music_LookLass_branch_ed81f: ; ed81f
 	note C#, 1
 	loopchannel 0, Music_LookLass_branch_ed81f
 ; ed82d
+
+
diff --git a/audio/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm
index 29b4497a2..4aac6e690 100644
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -5,7 +5,6 @@ Music_LookMysticalMan: ; 17843b
 	dbw $03, Music_LookMysticalMan_Ch4
 ; 178447
 
-
 Music_LookMysticalMan_Ch1: ; 178447
 	tempo 136
 	volume $77
@@ -14,7 +13,6 @@ Music_LookMysticalMan_Ch1: ; 178447
 	stereopanning $f
 	notetype $c, $b3
 	note __, 8
-
 Music_LookMysticalMan_branch_178458: ; 178458
 	dutycycle $3
 	notetype $6, $96
@@ -96,7 +94,6 @@ Music_LookMysticalMan_branch_178458: ; 178458
 	note A#, 6
 	dutycycle $2
 	intensity $72
-
 Music_LookMysticalMan_branch_1784b4: ; 1784b4
 	octave 5
 	note D_, 2
@@ -127,7 +124,6 @@ Music_LookMysticalMan_branch_1784b4: ; 1784b4
 	note D_, 2
 	note F#, 2
 	note B_, 2
-
 Music_LookMysticalMan_branch_1784d4: ; 1784d4
 	octave 5
 	note D_, 2
@@ -196,13 +192,13 @@ Music_LookMysticalMan_branch_1784f9: ; 1784f9
 	note B_, 2
 	note A_, 6
 	endchannel
+; 17851a
 
 Music_LookMysticalMan_Ch2: ; 17851a
 	dutycycle $3
 	vibrato $a, $34
 	notetype $c, $b3
 	note __, 8
-
 Music_LookMysticalMan_branch_178523: ; 178523
 	stereopanning $f0
 	notetype $6, $b8
@@ -365,11 +361,11 @@ Music_LookMysticalMan_branch_1785c8: ; 1785c8
 	note __, 1
 	intensity $b8
 	endchannel
+; 1785db
 
 Music_LookMysticalMan_Ch3: ; 1785db
 	notetype $6, $16
 	note __, 16
-
 Music_LookMysticalMan_branch_1785df: ; 1785df
 	octave 2
 	note B_, 4
@@ -425,7 +421,6 @@ Music_LookMysticalMan_branch_1785df: ; 1785df
 	note A_, 2
 	octave 3
 	note E_, 2
-
 Music_LookMysticalMan_branch_178615: ; 178615
 	octave 2
 	note F#, 4
@@ -542,6 +537,7 @@ Music_LookMysticalMan_branch_178615: ; 178615
 	note B_, 8
 	note A#, 4
 	loopchannel 0, Music_LookMysticalMan_branch_1785df
+; 17868e
 
 Music_LookMysticalMan_Ch4: ; 17868e
 	togglenoise $3
@@ -551,7 +547,6 @@ Music_LookMysticalMan_Ch4: ; 17868e
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_LookMysticalMan_branch_178697: ; 178697
 	callchannel Music_LookMysticalMan_branch_1786d3
 	callchannel Music_LookMysticalMan_branch_1786d9
@@ -571,7 +566,6 @@ Music_LookMysticalMan_branch_178697: ; 178697
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_LookMysticalMan_branch_1786ba: ; 1786ba
 	note D_, 2
 	note D#, 2
@@ -623,3 +617,5 @@ Music_LookMysticalMan_branch_1786df: ; 1786df
 	note D_, 1
 	endchannel
 ; 1786e8
+
+
diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm
index 9c32a5859..31ff6e676 100644
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@@ -4,7 +4,6 @@ Music_LookOfficer: ; ed82d
 	dbw $02, Music_LookOfficer_Ch3
 ; ed836
 
-
 Music_LookOfficer_Ch1: ; ed836
 	tempo 116
 	volume $77
@@ -22,7 +21,6 @@ Music_LookOfficer_Ch1: ; ed836
 	intensity $2f
 	octave 3
 	note B_, 16
-
 Music_LookOfficer_branch_ed852: ; ed852
 	intensity $82
 	note __, 4
@@ -36,6 +34,7 @@ Music_LookOfficer_branch_ed852: ; ed852
 	note A#, 16
 	note A_, 16
 	loopchannel 0, Music_LookOfficer_branch_ed852
+; ed863
 
 Music_LookOfficer_Ch2: ; ed863
 	vibrato $12, $34
@@ -62,7 +61,6 @@ Music_LookOfficer_Ch2: ; ed863
 	note B_, 2
 	octave 2
 	note D#, 2
-
 Music_LookOfficer_branch_ed882: ; ed882
 	note E_, 2
 	note G#, 2
@@ -98,6 +96,7 @@ Music_LookOfficer_branch_ed89e: ; ed89e
 	octave 2
 	note C#, 2
 	endchannel
+; ed8ad
 
 Music_LookOfficer_Ch3: ; ed8ad
 	vibrato $14, $14
@@ -121,7 +120,6 @@ Music_LookOfficer_Ch3: ; ed8ad
 	note C#, 2
 	note __, 1
 	note D#, 2
-
 Music_LookOfficer_branch_ed8c8: ; ed8c8
 	note E_, 6
 	note D#, 6
@@ -142,3 +140,5 @@ Music_LookOfficer_branch_ed8c8: ; ed8c8
 	note C#, 8
 	loopchannel 0, Music_LookOfficer_branch_ed8c8
 ; ed8dd
+
+
diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm
index f2ec4c91e..5bbc86390 100644
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@@ -4,7 +4,6 @@ Music_LookPokemaniac: ; ebde1
 	dbw $02, Music_LookPokemaniac_Ch3
 ; ebdea
 
-
 Music_LookPokemaniac_Ch1: ; ebdea
 	stereopanning $f
 	tempo 144
@@ -13,7 +12,6 @@ Music_LookPokemaniac_Ch1: ; ebdea
 	tone $0002
 	notetype $c, $b3
 	note __, 8
-
 Music_LookPokemaniac_branch_ebdfb: ; ebdfb
 	note __, 4
 	octave 3
@@ -29,6 +27,7 @@ Music_LookPokemaniac_branch_ebdfb: ; ebdfb
 	note __, 3
 	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
 	loopchannel 0, Music_LookPokemaniac_branch_ebdfb
+; ebe12
 
 Music_LookPokemaniac_Ch2: ; ebe12
 	stereopanning $ff
@@ -42,7 +41,6 @@ Music_LookPokemaniac_Ch2: ; ebe12
 	note C_, 1
 	octave 1
 	note A_, 4
-
 Music_LookPokemaniac_branch_ebe24: ; ebe24
 	octave 2
 	note C_, 2
@@ -61,7 +59,6 @@ Music_LookPokemaniac_branch_ebe24: ; ebe24
 	note D#, 1
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe24
-
 Music_LookPokemaniac_branch_ebe38: ; ebe38
 	octave 1
 	note A_, 2
@@ -82,6 +79,7 @@ Music_LookPokemaniac_branch_ebe38: ; ebe38
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe38
 	loopchannel 0, Music_LookPokemaniac_branch_ebe24
+; ebe51
 
 Music_LookPokemaniac_Ch3: ; ebe51
 	stereopanning $f0
@@ -95,7 +93,6 @@ Music_LookPokemaniac_Ch3: ; ebe51
 	octave 5
 	note C_, 4
 	intensity $10
-
 Music_LookPokemaniac_branch_ebe62: ; ebe62
 	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $14
@@ -165,3 +162,5 @@ Music_LookPokemaniac_branch_ebe70: ; ebe70
 	note __, 1
 	endchannel
 ; ebeab
+
+
diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm
index f60bc90de..d86eb0747 100644
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -5,7 +5,6 @@ Music_LookRival: ; f4f79
 	dbw $03, Music_LookRival_Ch4
 ; f4f85
 
-
 Music_LookRival_Ch1: ; f4f85
 	tempo 112
 	volume $77
@@ -35,9 +34,7 @@ Music_LookRival_Ch1: ; f4f85
 	note G#, 8
 	intensity $a6
 	note F#, 8
-
 Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1
-
 Music_LookRival_branch_f4fb1: ; f4fb1
 	intensity $b5
 	note F_, 4
@@ -102,7 +99,6 @@ Music_LookRival_branch_f4fb1: ; f4fb1
 	note G#, 8
 	note F_, 6
 	note C_, 2
-
 Music_LookRival_branch_f4ff7: ; f4ff7
 	intensity $b2
 	note F_, 6
@@ -119,6 +115,7 @@ Music_LookRival_branch_f4ff7: ; f4ff7
 	note G#, 6
 	note F#, 4
 	loopchannel 0, Music_LookRival_branch_f4fb1
+; f5010
 
 Music_LookRival_Ch2: ; f5010
 	dutycycle $3
@@ -141,9 +138,7 @@ Music_LookRival_Ch2: ; f5010
 	note D#, 10
 	intensity $b7
 	note D#, 16
-
 Music_AfterTheRivalFight_branch_f502e: ; f502e
-
 Music_LookRival_branch_f502e: ; f502e
 	intensity $c7
 	note C_, 12
@@ -197,7 +192,6 @@ Music_LookRival_branch_f502e: ; f502e
 	note D#, 1
 	note D_, 1
 	note D#, 2
-
 Music_LookRival_branch_f5070: ; f5070
 	intensity $c2
 	note C_, 6
@@ -211,6 +205,7 @@ Music_LookRival_branch_f5070: ; f5070
 	intensity $c7
 	note D#, 10
 	loopchannel 0, Music_LookRival_branch_f502e
+; f5086
 
 Music_LookRival_Ch3: ; f5086
 	notetype $c, $28
@@ -234,9 +229,7 @@ Music_LookRival_Ch3: ; f5086
 	note C_, 2
 	note D#, 2
 	note F#, 2
-
 Music_AfterTheRivalFight_branch_f509d: ; f509d
-
 Music_LookRival_branch_f509d: ; f509d
 	callchannel Music_LookRival_branch_f50ef
 	loopchannel 3, Music_LookRival_branch_f509d
@@ -332,6 +325,7 @@ Music_LookRival_branch_f50ff: ; f50ff
 	note G_, 2
 	note G#, 2
 	endchannel
+; f5106
 
 Music_LookRival_Ch4: ; f5106
 	stereopanning $f0
@@ -349,9 +343,7 @@ Music_LookRival_Ch4: ; f5106
 	note D_, 2
 	note D_, 2
 	note D_, 2
-
 Music_AfterTheRivalFight_branch_f5118: ; f5118
-
 Music_LookRival_branch_f5118: ; f5118
 	note D#, 4
 	note D_, 2
@@ -366,3 +358,5 @@ Music_LookRival_branch_f5118: ; f5118
 	note D_, 2
 	loopchannel 0, Music_LookRival_branch_f5118
 ; f5127
+
+
diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm
index 924bba417..d02c7f5f2 100644
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -5,7 +5,6 @@ Music_LookRocket: ; f74a2
 	dbw $03, Music_LookRocket_Ch4
 ; f74ae
 
-
 Music_LookRocket_Ch1: ; f74ae
 	tempo 123
 	volume $77
@@ -19,7 +18,6 @@ Music_LookRocket_Ch1: ; f74ae
 	note D_, 1
 	callchannel Music_LookRocket_branch_f74e6
 	dutycycle $1
-
 Music_LookRocket_branch_f74c7: ; f74c7
 	intensity $a8
 	callchannel Music_LookRocket_branch_f74f7
@@ -38,7 +36,6 @@ Music_LookRocket_branch_f74c7: ; f74c7
 ; f74e6
 
 Music_LookRocket_branch_f74e6: ; f74e6
-
 Music_RocketTheme_branch_f74e6: ; f74e6
 	note D#, 1
 	note __, 1
@@ -60,7 +57,6 @@ Music_RocketTheme_branch_f74e6: ; f74e6
 ; f74f7
 
 Music_LookRocket_branch_f74f7: ; f74f7
-
 Music_RocketTheme_branch_f74f7: ; f74f7
 	note __, 2
 	octave 3
@@ -86,7 +82,6 @@ Music_RocketTheme_branch_f74f7: ; f74f7
 ; f750c
 
 Music_LookRocket_branch_f750c: ; f750c
-
 Music_RocketTheme_branch_f750c: ; f750c
 	note __, 2
 	octave 2
@@ -108,7 +103,6 @@ Music_LookRocket_Ch2: ; f7514
 	note C_, 1
 	note D_, 1
 	callchannel Music_LookRocket_branch_f7547
-
 Music_LookRocket_branch_f7526: ; f7526
 	intensity $b7
 	callchannel Music_LookRocket_branch_f758a
@@ -127,7 +121,6 @@ Music_LookRocket_branch_f7526: ; f7526
 ; f7547
 
 Music_LookRocket_branch_f7547: ; f7547
-
 Music_RocketTheme_branch_f7547: ; f7547
 	note D#, 1
 	note __, 1
@@ -144,7 +137,6 @@ Music_RocketTheme_branch_f7547: ; f7547
 ; f7554
 
 Music_LookRocket_branch_f7554: ; f7554
-
 Music_RocketTheme_branch_f7554: ; f7554
 	note __, 2
 	octave 4
@@ -169,7 +161,6 @@ Music_RocketTheme_branch_f7554: ; f7554
 ; f7568
 
 Music_LookRocket_branch_f7568: ; f7568
-
 Music_RocketTheme_branch_f7568: ; f7568
 	note __, 2
 	octave 3
@@ -181,7 +172,6 @@ Music_RocketTheme_branch_f7568: ; f7568
 ; f756f
 
 Music_LookRocket_branch_f756f: ; f756f
-
 Music_RocketTheme_branch_f756f: ; f756f
 	intensity $63
 	note G#, 1
@@ -209,7 +199,6 @@ Music_RocketTheme_branch_f756f: ; f756f
 ; f758a
 
 Music_LookRocket_branch_f758a: ; f758a
-
 Music_RocketTheme_branch_f758a: ; f758a
 	octave 3
 	note __, 2
@@ -224,6 +213,7 @@ Music_RocketTheme_branch_f758a: ; f758a
 	note A_, 1
 	note __, 1
 	endchannel
+; f7597
 
 Music_LookRocket_Ch3: ; f7597
 	forceoctave $2
@@ -232,7 +222,6 @@ Music_LookRocket_Ch3: ; f7597
 	stereopanning $f0
 	note __, 2
 	callchannel Music_LookRocket_branch_f75bf
-
 Music_LookRocket_branch_f75a5: ; f75a5
 	callchannel Music_LookRocket_branch_f75fe
 	callchannel Music_LookRocket_branch_f75fe
@@ -246,7 +235,6 @@ Music_LookRocket_branch_f75a5: ; f75a5
 ; f75bf
 
 Music_LookRocket_branch_f75bf: ; f75bf
-
 Music_RocketTheme_branch_f75bf: ; f75bf
 	octave 3
 	note F_, 1
@@ -264,7 +252,6 @@ Music_RocketTheme_branch_f75bf: ; f75bf
 ; f75cc
 
 Music_LookRocket_branch_f75cc: ; f75cc
-
 Music_RocketTheme_branch_f75cc: ; f75cc
 	octave 2
 	note G#, 1
@@ -290,7 +277,6 @@ Music_RocketTheme_branch_f75cc: ; f75cc
 ; f75e1
 
 Music_LookRocket_branch_f75e1: ; f75e1
-
 Music_RocketTheme_branch_f75e1: ; f75e1
 	intensity $24
 	octave 2
@@ -322,7 +308,6 @@ Music_RocketTheme_branch_f75e1: ; f75e1
 ; f75fe
 
 Music_LookRocket_branch_f75fe: ; f75fe
-
 Music_RocketTheme_branch_f75fe: ; f75fe
 	note C_, 1
 	note __, 1
@@ -364,7 +349,6 @@ Music_RocketTheme_branch_f75fe: ; f75fe
 ; f7623
 
 Music_LookRocket_branch_f7623: ; f7623
-
 Music_RocketTheme_branch_f7623: ; f7623
 	octave 2
 	note G#, 1
@@ -387,13 +371,13 @@ Music_RocketTheme_branch_f7623: ; f7623
 	note D#, 1
 	note C_, 1
 	endchannel
+; f7638
 
 Music_LookRocket_Ch4: ; f7638
 	togglenoise $3
 	notetype $c
 	note __, 2
 	callchannel Music_LookRocket_branch_f765c
-
 Music_LookRocket_branch_f7640: ; f7640
 	callchannel Music_LookRocket_branch_f7664
 	callchannel Music_LookRocket_branch_f7664
@@ -407,7 +391,6 @@ Music_LookRocket_branch_f7640: ; f7640
 ; f765c
 
 Music_LookRocket_branch_f765c: ; f765c
-
 Music_RocketTheme_branch_f765c: ; f765c
 	note C_, 8
 	note D_, 2
@@ -420,7 +403,6 @@ Music_RocketTheme_branch_f765c: ; f765c
 ; f7664
 
 Music_LookRocket_branch_f7664: ; f7664
-
 Music_RocketTheme_branch_f7664: ; f7664
 	note D#, 2
 	note F#, 2
@@ -432,3 +414,5 @@ Music_RocketTheme_branch_f7664: ; f7664
 	note F#, 2
 	endchannel
 ; f766d
+
+
diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm
index 922bcd642..f815d212c 100644
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@@ -3,7 +3,6 @@ Music_LookSage: ; ee35e
 	dbw $02, Music_LookSage_Ch3
 ; ee364
 
-
 Music_LookSage_Ch1: ; ee364
 	tempo 144
 	stereopanning $f
@@ -30,7 +29,6 @@ Music_LookSage_Ch1: ; ee364
 	note F_, 2
 	intensity $93
 	note F_, 2
-
 Music_LookSage_branch_ee38e: ; ee38e
 	intensity $b3
 	note D_, 2
@@ -124,6 +122,7 @@ Music_LookSage_branch_ee3fa: ; ee3fa
 	intensity $93
 	note A_, 2
 	endchannel
+; ee414
 
 Music_LookSage_Ch3: ; ee414
 	stereopanning $f0
@@ -145,7 +144,6 @@ Music_LookSage_Ch3: ; ee414
 	note E_, 14
 	note G_, 1
 	note G#, 1
-
 Music_LookSage_branch_ee430: ; ee430
 	note A_, 12
 	note B_, 4
@@ -182,3 +180,5 @@ Music_LookSage_branch_ee430: ; ee430
 	note G#, 1
 	loopchannel 0, Music_LookSage_branch_ee430
 ; ee45f
+
+
diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm
index ff7bd6bbd..7ae3ec957 100644
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -4,7 +4,6 @@ Music_LookYoungster: ; f66c3
 	dbw $02, Music_LookYoungster_Ch3
 ; f66cc
 
-
 Music_LookYoungster_Ch1: ; f66cc
 	tempo 118
 	volume $77
@@ -26,7 +25,6 @@ Music_LookYoungster_Ch1: ; f66cc
 	note __, 2
 	note C_, 6
 	intensity $b3
-
 Music_LookYoungster_branch_f66ea: ; f66ea
 	note __, 2
 	octave 3
@@ -61,8 +59,12 @@ Music_LookYoungster_branch_f66ea: ; f66ea
 	note __, 1
 	note __, 16
 	loopchannel 0, Music_LookYoungster_branch_f66ea
+; f670e
+
+
 INCBIN "baserom.gbc", $f670e, $f670f - $f670e
 
+
 Music_LookYoungster_Ch2: ; f670f
 	stereopanning $f0
 	vibrato $12, $26
@@ -84,7 +86,6 @@ Music_LookYoungster_Ch2: ; f670f
 	note F_, 4
 	note __, 2
 	note F#, 6
-
 Music_LookYoungster_branch_f672f: ; f672f
 	dutycycle $3
 	intensity $b3
@@ -159,8 +160,12 @@ Music_LookYoungster_branch_f672f: ; f672f
 	note C_, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f672f
+; f6783
+
+
 INCBIN "baserom.gbc", $f6783, $f6784 - $f6783
 
+
 Music_LookYoungster_Ch3: ; f6784
 	stereopanning $ff
 	vibrato $2, $24
@@ -197,7 +202,6 @@ Music_LookYoungster_Ch3: ; f6784
 	note __, 2
 	note G#, 6
 	intensity $25
-
 Music_LookYoungster_branch_f67ae: ; f67ae
 	octave 2
 	note G_, 1
@@ -296,4 +300,8 @@ Music_LookYoungster_branch_f67ae: ; f67ae
 	loopchannel 0, Music_LookYoungster_branch_f67ae
 ; f6810
 
+
 INCBIN "baserom.gbc", $f6810, $f6811 - $f6810
+
+
+
diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm
index 064b00c50..cb5647540 100644
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -5,7 +5,6 @@ Music_MagnetTrain: ; ef5f0
 	dbw $03, Music_MagnetTrain_Ch4
 ; ef5fc
 
-
 Music_MagnetTrain_Ch1: ; ef5fc
 	tempo 110
 	volume $77
@@ -69,6 +68,7 @@ Music_MagnetTrain_Ch1: ; ef5fc
 	notetype $c, $b7
 	note D_, 16
 	endchannel
+; ef648
 
 Music_MagnetTrain_Ch2: ; ef648
 	vibrato $14, $23
@@ -107,6 +107,7 @@ Music_MagnetTrain_Ch2: ; ef648
 	notetype $c, $d7
 	note A_, 16
 	endchannel
+; ef67d
 
 Music_MagnetTrain_Ch3: ; ef67d
 	stereopanning $ff
@@ -223,6 +224,7 @@ Music_MagnetTrain_Ch3: ; ef67d
 	octave 2
 	note D_, 16
 	endchannel
+; ef6f4
 
 Music_MagnetTrain_Ch4: ; ef6f4
 	togglenoise $3
@@ -247,20 +249,10 @@ Music_MagnetTrain_Ch4: ; ef6f4
 	note B_, 16
 	endchannel
 ; ef711
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	note G#, 1
-	note G_, 1
-	note G_, 1
-	endchannel
-; ef71e
+
+
+INCBIN "baserom.gbc", $ef711, $ef71e - $ef711
+
 
 Music_MagnetTrain_branch_ef71e: ; ef71e
 	note G#, 2
@@ -281,3 +273,5 @@ Music_MagnetTrain_branch_ef71e: ; ef71e
 	note G_, 2
 	endchannel
 ; ef72f
+
+
diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm
index 069c0f4d3..8ed8d4d6f 100644
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -5,7 +5,6 @@ Music_MainMenu: ; f78fd
 	dbw $03, Music_MainMenu_Ch4
 ; f7909
 
-
 Music_MainMenu_Ch1: ; f7909
 	tempo 160
 	volume $77
@@ -16,7 +15,6 @@ Music_MainMenu_Ch1: ; f7909
 	notetype $c, $f
 	octave 3
 	note D_, 8
-
 Music_MainMenu_branch_f791d: ; f791d
 	notetype $c, $92
 	octave 3
@@ -43,6 +41,7 @@ Music_MainMenu_branch_f791d: ; f791d
 	octave 3
 	note C_, 4
 	loopchannel 0, Music_MainMenu_branch_f791d
+; f7940
 
 Music_MainMenu_Ch2: ; f7940
 	dutycycle $3
@@ -50,7 +49,6 @@ Music_MainMenu_Ch2: ; f7940
 	notetype $c, $f
 	octave 3
 	note G_, 8
-
 Music_MainMenu_branch_f7949: ; f7949
 	notetype $c, $a2
 	note F#, 6
@@ -74,12 +72,12 @@ Music_MainMenu_branch_f7949: ; f7949
 	notetype $c, $a4
 	note F_, 4
 	loopchannel 0, Music_MainMenu_branch_f7949
+; f7969
 
 Music_MainMenu_Ch3: ; f7969
 	stereopanning $f0
 	notetype $c, $25
 	note __, 8
-
 Music_MainMenu_branch_f796f: ; f796f
 	octave 2
 	note F#, 1
@@ -114,6 +112,7 @@ Music_MainMenu_branch_f796f: ; f796f
 	note F_, 1
 	note __, 3
 	loopchannel 0, Music_MainMenu_branch_f796f
+; f7996
 
 Music_MainMenu_Ch4: ; f7996
 	stereopanning $f
@@ -128,7 +127,6 @@ Music_MainMenu_Ch4: ; f7996
 	note D_, 1
 	note D_, 1
 	note D_, 1
-
 Music_MainMenu_branch_f79a5: ; f79a5
 	note D_, 6
 	note D_, 1
@@ -147,3 +145,5 @@ Music_MainMenu_branch_f79a5: ; f79a5
 	note D_, 1
 	loopchannel 0, Music_MainMenu_branch_f79a5
 ; f79b8
+
+
diff --git a/audio/music/mobileadapter.asm b/audio/music/mobileadapter.asm
index a11730a52..6c0c7ca7b 100644
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -5,7 +5,6 @@ Music_MobileAdapter: ; 1fc87
 	dbw $03, Music_MobileAdapter_Ch4
 ; 1fc93
 
-
 Music_MobileAdapter_Ch1: ; 1fc93
 	tempo 132
 	volume $77
@@ -24,7 +23,6 @@ Music_MobileAdapter_Ch1: ; 1fc93
 	note D_, 1
 	note __, 1
 	note C#, 4
-
 Music_MobileAdapter_branch_1fcad: ; 1fcad
 	callchannel Music_MobileAdapter_branch_1fd39
 	note D_, 1
@@ -218,7 +216,6 @@ Music_MobileAdapter_Ch2: ; 1fd63
 	octave 4
 	note D_, 1
 	note F#, 1
-
 Music_MobileAdapter_branch_1fd80: ; 1fd80
 	callchannel Music_MobileAdapter_branch_1fdfe
 	note A_, 4
@@ -415,7 +412,6 @@ Music_MobileAdapter_Ch3: ; 1fe3d
 	note E_, 1
 	note __, 1
 	note A_, 4
-
 Music_MobileAdapter_branch_1fe4f: ; 1fe4f
 	callchannel Music_MobileAdapter_branch_1fecf
 	callchannel Music_MobileAdapter_branch_1fee3
@@ -529,7 +525,6 @@ Music_MobileAdapter_branch_1fecf: ; 1fecf
 	note A_, 1
 	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fecf
-
 Music_MobileAdapter_branch_1fed8: ; 1fed8
 	octave 2
 	note G_, 1
@@ -618,6 +613,7 @@ Music_MobileAdapter_branch_1ff09: ; 1ff09
 	note __, 6
 	loopchannel 2, Music_MobileAdapter_branch_1ff09
 	endchannel
+; 1ff2c
 
 Music_MobileAdapter_Ch4: ; 1ff2c
 	togglenoise $3
@@ -629,11 +625,9 @@ Music_MobileAdapter_Ch4: ; 1ff2c
 	note D_, 2
 	note D_, 1
 	note D_, 1
-
 Music_MobileAdapter_branch_1ff38: ; 1ff38
 	callchannel Music_MobileAdapter_branch_1ff60
 	callchannel Music_MobileAdapter_branch_1ff60
-
 Music_MobileAdapter_branch_1ff3e: ; 1ff3e
 	note __, 4
 	note D_, 8
@@ -643,7 +637,6 @@ Music_MobileAdapter_branch_1ff3e: ; 1ff3e
 	note D_, 3
 	note D_, 4
 	loopchannel 2, Music_MobileAdapter_branch_1ff3e
-
 Music_MobileAdapter_branch_1ff49: ; 1ff49
 	note __, 4
 	note D_, 4
@@ -675,3 +668,4 @@ Music_MobileAdapter_branch_1ff60: ; 1ff60
 	note D_, 1
 	endchannel
 ; 1ff6c
+
diff --git a/audio/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm
index c889d2730..90086aa67 100644
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@@ -4,7 +4,6 @@ Music_MobileAdapterMenu: ; 17801f
 	dbw $02, Music_MobileAdapterMenu_Ch3
 ; 178028
 
-
 Music_MobileAdapterMenu_Ch1: ; 178028
 	tempo 168
 	volume $77
@@ -13,7 +12,6 @@ Music_MobileAdapterMenu_Ch1: ; 178028
 	dutycycle $2
 	notetype $c, $66
 	note __, 2
-
 Music_MobileAdapterMenu_branch_178038: ; 178038
 	callchannel Music_MobileAdapterMenu_branch_178057
 	callchannel Music_MobileAdapterMenu_branch_178076
@@ -86,6 +84,7 @@ Music_MobileAdapterMenu_branch_178076: ; 178076
 	note __, 1
 	note C#, 4
 	endchannel
+; 178084
 
 Music_MobileAdapterMenu_Ch2: ; 178084
 	stereopanning $f0
@@ -94,7 +93,6 @@ Music_MobileAdapterMenu_Ch2: ; 178084
 	octave 4
 	note E_, 1
 	note G#, 1
-
 Music_MobileAdapterMenu_branch_17808e: ; 17808e
 	callchannel Music_MobileAdapterMenu_branch_1780ae
 	note E_, 8
@@ -175,12 +173,12 @@ Music_MobileAdapterMenu_branch_1780d7: ; 1780d7
 	note __, 1
 	note E_, 4
 	endchannel
+; 1780e2
 
 Music_MobileAdapterMenu_Ch3: ; 1780e2
 	vibrato $8, $34
 	notetype $c, $25
 	note __, 2
-
 Music_MobileAdapterMenu_branch_1780e9: ; 1780e9
 	callchannel Music_MobileAdapterMenu_branch_178119
 	octave 2
@@ -282,3 +280,5 @@ Music_MobileAdapterMenu_branch_178146: ; 178146
 	note A_, 4
 	endchannel
 ; 178153
+
+
diff --git a/audio/music/mobilecenter.asm b/audio/music/mobilecenter.asm
index 7075f94c4..0adc750ad 100644
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -5,7 +5,6 @@ Music_MobileCenter: ; 17961d
 	dbw $03, Music_MobileCenter_Ch4
 ; 179629
 
-
 Music_MobileCenter_Ch1: ; 179629
 	tempo 160
 	volume $77
@@ -21,7 +20,6 @@ Music_MobileCenter_Ch1: ; 179629
 	note G_, 2
 	note A_, 2
 	note B_, 4
-
 Music_MobileCenter_branch_179642: ; 179642
 	octave 3
 	note E_, 2
@@ -158,6 +156,7 @@ Music_MobileCenter_branch_179642: ; 179642
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_MobileCenter_branch_179642
+; 1796cc
 
 Music_MobileCenter_Ch2: ; 1796cc
 	notetype $c, $c2
@@ -167,7 +166,6 @@ Music_MobileCenter_Ch2: ; 1796cc
 	note G_, 2
 	note A_, 2
 	note B_, 2
-
 Music_MobileCenter_branch_1796d6: ; 1796d6
 	octave 2
 	note C_, 2
@@ -327,6 +325,7 @@ Music_MobileCenter_branch_1796d6: ; 1796d6
 	note E_, 2
 	note D_, 2
 	loopchannel 0, Music_MobileCenter_branch_1796d6
+; 179777
 
 Music_MobileCenter_Ch3: ; 179777
 	notetype $c, $24
@@ -340,7 +339,6 @@ Music_MobileCenter_Ch3: ; 179777
 	note C_, 2
 	note D_, 4
 	notetype $c, $25
-
 Music_MobileCenter_branch_179788: ; 179788
 	note C_, 2
 	octave 4
@@ -454,6 +452,7 @@ Music_MobileCenter_branch_179788: ; 179788
 	note C_, 8
 	vibrato $10, $34
 	loopchannel 0, Music_MobileCenter_branch_179788
+; 179807
 
 Music_MobileCenter_Ch4: ; 179807
 	togglenoise $3
@@ -465,7 +464,6 @@ Music_MobileCenter_Ch4: ; 179807
 	note C#, 1
 	note C#, 1
 	note C#, 1
-
 Music_MobileCenter_branch_179813: ; 179813
 	note A_, 2
 	note C#, 2
@@ -488,3 +486,4 @@ Music_MobileCenter_branch_179813: ; 179813
 	note C#, 1
 	loopchannel 0, Music_MobileCenter_branch_179813
 ; 17982d
+
diff --git a/audio/music/mom.asm b/audio/music/mom.asm
index 2413002a6..5ae89e853 100644
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -4,7 +4,6 @@ Music_Mom: ; f6bf2
 	dbw $03, Music_Mom_Ch4
 ; f6bfb
 
-
 Music_Mom_Ch2: ; f6bfb
 	tempo 144
 	volume $77
@@ -18,7 +17,6 @@ Music_Mom_Ch2: ; f6bfb
 	note G#, 1
 	note A_, 1
 	note B_, 8
-
 Music_Mom_branch_f6c0e: ; f6c0e
 	notetype $c, $b1
 	note __, 4
@@ -33,6 +31,7 @@ Music_Mom_branch_f6c0e: ; f6c0e
 	note A#, 2
 	note B_, 2
 	loopchannel 0, Music_Mom_branch_f6c0e
+; f6c20
 
 Music_Mom_Ch3: ; f6c20
 	stereopanning $f0
@@ -45,7 +44,6 @@ Music_Mom_Ch3: ; f6c20
 	note G#, 1
 	note E_, 8
 	intensity $23
-
 Music_Mom_branch_f6c2e: ; f6c2e
 	octave 2
 	note A_, 2
@@ -79,12 +77,12 @@ Music_Mom_branch_f6c2e: ; f6c2e
 	note D_, 2
 	note __, 2
 	loopchannel 0, Music_Mom_branch_f6c2e
+; f6c51
 
 Music_Mom_Ch4: ; f6c51
 	togglenoise $3
 	notetype $c
 	note __, 6
-
 Music_Mom_branch_f6c56: ; f6c56
 	note D#, 1
 	note __, 1
@@ -112,3 +110,5 @@ Music_Mom_branch_f6c56: ; f6c56
 	note __, 1
 	loopchannel 0, Music_Mom_branch_f6c56
 ; f6c72
+
+
diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm
index ca4b7bbda..c697daa78 100644
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -5,7 +5,6 @@ Music_MtMoon: ; edb29
 	dbw $03, Music_MtMoon_Ch4
 ; edb35
 
-
 Music_MtMoon_Ch1: ; edb35
 	tempo 208
 	volume $77
@@ -23,7 +22,6 @@ Music_MtMoon_Ch2: ; edb4c
 	dutycycle $2
 	notetype $c, $84
 	stereopanning $f
-
 Music_MtMoon_branch_edb56: ; edb56
 	octave 4
 	note D#, 6
@@ -74,12 +72,11 @@ Music_MtMoon_branch_edb56: ; edb56
 	note F#, 6
 	note E_, 4
 	loopchannel 0, Music_MtMoon_branch_edb56
+; edb8a
 
 Music_MtMoon_Ch3: ; edb8a
-
 Music_MtMoon_branch_edb8a: ; edb8a
 	notetype $c, $28
-
 Music_MtMoon_branch_edb8d: ; edb8d
 	octave 2
 	note B_, 2
@@ -108,7 +105,6 @@ Music_MtMoon_branch_edb8d: ; edb8d
 	note G_, 2
 	note D#, 2
 	note E_, 2
-
 Music_MtMoon_branch_edbab: ; edbab
 	note E_, 2
 	note G#, 2
@@ -124,11 +120,11 @@ Music_MtMoon_branch_edbab: ; edbab
 	note G#, 2
 	loopchannel 4, Music_MtMoon_branch_edbab
 	loopchannel 0, Music_MtMoon_branch_edb8a
+; edbbf
 
 Music_MtMoon_Ch4: ; edbbf
 	togglenoise $5
 	notetype $c
-
 Music_MtMoon_branch_edbc3: ; edbc3
 	stereopanning $f
 	note A#, 4
@@ -145,3 +141,5 @@ Music_MtMoon_branch_edbc3: ; edbc3
 	note A#, 8
 	loopchannel 0, Music_MtMoon_branch_edbc3
 ; edbd8
+
+
diff --git a/audio/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm
index 86e4d4fa3..d990cb0f0 100644
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@@ -3,17 +3,14 @@ Music_MtMoonSquare: ; f4815
 	dbw $01, Music_MtMoonSquare_Ch2
 ; f481b
 
-
 Music_MtMoonSquare_Ch1: ; f481b
 	tempo 112
 	volume $77
 	dutycycle $2
 	tone $0001
 	note __, 1
-
 Music_MtMoonSquare_branch_f4826: ; f4826
 	notetype $c, $44
-
 Music_MtMoonSquare_branch_f4829: ; f4829
 	octave 4
 	note D_, 2
@@ -24,7 +21,6 @@ Music_MtMoonSquare_branch_f4829: ; f4829
 	octave 5
 	note D_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4829
-
 Music_MtMoonSquare_branch_f4835: ; f4835
 	octave 4
 	note E_, 2
@@ -35,7 +31,6 @@ Music_MtMoonSquare_branch_f4835: ; f4835
 	octave 5
 	note E_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4835
-
 Music_MtMoonSquare_branch_f4841: ; f4841
 	octave 4
 	note C#, 2
@@ -46,7 +41,6 @@ Music_MtMoonSquare_branch_f4841: ; f4841
 	octave 5
 	note C#, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f4841
-
 Music_MtMoonSquare_branch_f484d: ; f484d
 	octave 4
 	note D_, 2
@@ -58,14 +52,13 @@ Music_MtMoonSquare_branch_f484d: ; f484d
 	note D_, 4
 	loopchannel 2, Music_MtMoonSquare_branch_f484d
 	loopchannel 0, Music_MtMoonSquare_branch_f4826
+; f485d
 
 Music_MtMoonSquare_Ch2: ; f485d
 	dutycycle $2
 	vibrato $18, $24
-
 Music_MtMoonSquare_branch_f4862: ; f4862
 	notetype $c, $82
-
 Music_MtMoonSquare_branch_f4865: ; f4865
 	octave 4
 	note D_, 2
@@ -78,7 +71,6 @@ Music_MtMoonSquare_branch_f4865: ; f4865
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4865
 	notetype $c, $82
-
 Music_MtMoonSquare_branch_f4877: ; f4877
 	octave 4
 	note E_, 2
@@ -91,7 +83,6 @@ Music_MtMoonSquare_branch_f4877: ; f4877
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4877
 	notetype $c, $82
-
 Music_MtMoonSquare_branch_f4889: ; f4889
 	octave 4
 	note C#, 2
@@ -104,7 +95,6 @@ Music_MtMoonSquare_branch_f4889: ; f4889
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f4889
 	notetype $c, $82
-
 Music_MtMoonSquare_branch_f489b: ; f489b
 	octave 4
 	note D_, 2
@@ -118,3 +108,5 @@ Music_MtMoonSquare_branch_f489b: ; f489b
 	loopchannel 2, Music_MtMoonSquare_branch_f489b
 	loopchannel 0, Music_MtMoonSquare_branch_f4862
 ; f48ae
+
+
diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm
index 2398e4931..7e7ccf28b 100644
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -5,7 +5,6 @@ Music_NationalPark: ; f54e8
 	dbw $03, Music_NationalPark_Ch4
 ; f54f4
 
-
 Music_NationalPark_Ch1: ; f54f4
 	tempo 192
 	volume $77
@@ -14,7 +13,6 @@ Music_NationalPark_Ch1: ; f54f4
 	dutycycle $1
 	notetype $c, $77
 	note __, 2
-
 Music_NationalPark_branch_f5504: ; f5504
 	callchannel Music_NationalPark_branch_f554a
 	callchannel Music_NationalPark_branch_f554a
@@ -299,6 +297,7 @@ Music_NationalPark_branch_f563a: ; f563a
 	note A_, 2
 	note __, 4
 	endchannel
+; f5652
 
 Music_NationalPark_Ch2: ; f5652
 	vibrato $14, $24
@@ -306,7 +305,6 @@ Music_NationalPark_Ch2: ; f5652
 	notetype $c, $a7
 	note __, 2
 	stereopanning $f0
-
 Music_NationalPark_branch_f565d: ; f565d
 	notetype $c, $a7
 	callchannel Music_NationalPark_branch_f56b8
@@ -484,6 +482,7 @@ Music_NationalPark_branch_f56f5: ; f56f5
 	note D_, 2
 	note C#, 2
 	endchannel
+; f5723
 
 Music_NationalPark_Ch3: ; f5723
 	vibrato $16, $24
@@ -492,7 +491,6 @@ Music_NationalPark_Ch3: ; f5723
 	note G#, 1
 	note A#, 1
 	stereopanning $ff
-
 Music_NationalPark_branch_f572e: ; f572e
 	callchannel Music_NationalPark_branch_f5756
 	octave 5
@@ -625,12 +623,12 @@ Music_NationalPark_branch_f578f: ; f578f
 	note F_, 1
 	note __, 1
 	endchannel
+; f57b8
 
 Music_NationalPark_Ch4: ; f57b8
 	togglenoise $3
 	notetype $c
 	note __, 2
-
 Music_NationalPark_branch_f57bd: ; f57bd
 	note __, 16
 	loopchannel 23, Music_NationalPark_branch_f57bd
@@ -640,7 +638,6 @@ Music_NationalPark_branch_f57bd: ; f57bd
 	note A#, 1
 	note D_, 1
 	note B_, 2
-
 Music_NationalPark_branch_f57c8: ; f57c8
 	note A#, 2
 	note G_, 1
@@ -669,3 +666,5 @@ Music_NationalPark_branch_f57c8: ; f57c8
 	note D#, 1
 	loopchannel 0, Music_NationalPark_branch_f57bd
 ; f57e8
+
+
diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm
index 37d88a6a2..a528a3985 100644
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -4,8 +4,10 @@ Music_NewBarkTown: ; eb2d3
 	dbw $02, Music_NewBarkTown_Ch3
 ; eb2dc
 
+
 INCBIN "baserom.gbc", $eb2dc, $eb2dd - $eb2dc
 
+
 Music_NewBarkTown_Ch1: ; eb2dd
 	tempo 187
 	volume $77
@@ -13,7 +15,6 @@ Music_NewBarkTown_Ch1: ; eb2dd
 	vibrato $12, $23
 	notetype $c, $87
 	note __, 4
-
 Music_NewBarkTown_branch_eb2eb: ; eb2eb
 	dutycycle $0
 	callchannel Music_NewBarkTown_branch_eb349
@@ -160,13 +161,13 @@ Music_NewBarkTown_branch_eb37c: ; eb37c
 	note A_, 4
 	note E_, 2
 	endchannel
+; eb38d
 
 Music_NewBarkTown_Ch2: ; eb38d
 	stereopanning $ff
 	vibrato $12, $23
 	notetype $6, $a7
 	note __, 8
-
 Music_NewBarkTown_branch_eb396: ; eb396
 	dutycycle $2
 	notetype $6, $a7
@@ -257,6 +258,7 @@ Music_NewBarkTown_branch_eb3f2: ; eb3f2
 	notetype $c, $97
 	note E_, 16
 	endchannel
+; eb400
 
 Music_NewBarkTown_Ch3: ; eb400
 	stereopanning $f0
@@ -264,7 +266,6 @@ Music_NewBarkTown_Ch3: ; eb400
 	octave 5
 	note D_, 2
 	note E_, 2
-
 Music_NewBarkTown_branch_eb408: ; eb408
 	vibrato $16, $23
 	note F#, 4
@@ -331,3 +332,5 @@ Music_NewBarkTown_branch_eb408: ; eb408
 	note E_, 1
 	loopchannel 0, Music_NewBarkTown_branch_eb408
 ; eb453
+
+
diff --git a/audio/music/nothing.asm b/audio/music/nothing.asm
index 55a8cac17..1cd933673 100644
--- a/audio/music/nothing.asm
+++ b/audio/music/nothing.asm
@@ -5,13 +5,10 @@ Music_Nothing: ; e91a3
 	dbw $03, Music_Nothing_Ch4
 ; e91af
 
-
 Music_Nothing_Ch1: ; e91af
-
 Music_Nothing_Ch2: ; e91af
-
 Music_Nothing_Ch3: ; e91af
-
 Music_Nothing_Ch4: ; e91af
 	endchannel
 ; e91b0
+
diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm
index 62979f6d8..6518cbd9f 100644
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -4,14 +4,12 @@ Music_PalletTown: ; f4b0c
 	dbw $02, Music_PalletTown_Ch3
 ; f4b15
 
-
 Music_PalletTown_Ch1: ; f4b15
 	tempo 188
 	volume $77
 	vibrato $12, $24
 	tone $0001
 	stereopanning $f
-
 Music_PalletTown_branch_f4b22: ; f4b22
 	dutycycle $2
 	notetype $c, $78
@@ -62,7 +60,6 @@ Music_PalletTown_branch_f4b22: ; f4b22
 	note B_, 8
 	intensity $77
 	note B_, 8
-
 Music_PalletTown_branch_f4b59: ; f4b59
 	dutycycle $3
 	intensity $92
@@ -121,12 +118,12 @@ Music_PalletTown_branch_f4b59: ; f4b59
 	intensity $1f
 	note F#, 8
 	loopchannel 0, Music_PalletTown_branch_f4b22
+; f4ba1
 
 Music_PalletTown_Ch2: ; f4ba1
 	vibrato $12, $44
 	dutycycle $2
 	stereopanning $f0
-
 Music_PalletTown_branch_f4ba8: ; f4ba8
 	notetype $c, $88
 	octave 1
@@ -187,7 +184,6 @@ Music_PalletTown_branch_f4ba8: ; f4ba8
 	octave 3
 	note C_, 2
 	note D_, 2
-
 Music_PalletTown_branch_f4be5: ; f4be5
 	intensity $a2
 	octave 3
@@ -248,10 +244,10 @@ Music_PalletTown_branch_f4be5: ; f4be5
 	note B_, 2
 	note A_, 2
 	loopchannel 0, Music_PalletTown_branch_f4ba8
+; f4c2a
 
 Music_PalletTown_Ch3: ; f4c2a
 	vibrato $14, $24
-
 Music_PalletTown_branch_f4c2d: ; f4c2d
 	notetype $c, $10
 	octave 6
@@ -363,3 +359,5 @@ Music_PalletTown_branch_f4c2d: ; f4c2d
 	note A_, 8
 	loopchannel 0, Music_PalletTown_branch_f4c2d
 ; f4c9f
+
+
diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm
index 63174fade..9256fe54c 100644
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@@ -4,7 +4,6 @@ Music_PokeFluteChannel: ; f7b13
 	dbw $02, Music_PokeFluteChannel_Ch3
 ; f7b1c
 
-
 Music_PokeFluteChannel_Ch1: ; f7b1c
 	tempo 240
 	volume $77
@@ -31,7 +30,6 @@ Music_PokeFluteChannel_Ch1: ; f7b1c
 	octave 2
 	note G_, 4
 	note A_, 8
-
 Music_PokeFluteChannel_branch_f7b40: ; f7b40
 	octave 3
 	note E_, 2
@@ -70,6 +68,7 @@ Music_PokeFluteChannel_branch_f7b40: ; f7b40
 	note G_, 4
 	note A_, 8
 	loopchannel 0, Music_PokeFluteChannel_branch_f7b40
+; f7b68
 
 Music_PokeFluteChannel_Ch2: ; f7b68
 	stereopanning $f
@@ -108,7 +107,6 @@ Music_PokeFluteChannel_Ch2: ; f7b68
 	octave 2
 	note E_, 2
 	note G_, 2
-
 Music_PokeFluteChannel_branch_f7b94: ; f7b94
 	octave 3
 	note C_, 2
@@ -172,13 +170,13 @@ Music_PokeFluteChannel_branch_f7b94: ; f7b94
 	note E_, 2
 	note G_, 2
 	loopchannel 0, Music_PokeFluteChannel_branch_f7b94
+; f7bd5
 
 Music_PokeFluteChannel_Ch3: ; f7bd5
 	vibrato $10, $14
 	notetype $c, $10
 	callchannel Music_PokeFluteChannel_branch_f7c05
 	callchannel Music_PokeFluteChannel_branch_f7c05
-
 Music_PokeFluteChannel_branch_f7be1: ; f7be1
 	note __, 4
 	octave 4
@@ -232,3 +230,5 @@ Music_PokeFluteChannel_branch_f7c05: ; f7c05
 	note G_, 4
 	endchannel
 ; f7c16
+
+
diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm
index 7fb56357f..9ea5c7da5 100644
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -5,14 +5,12 @@ Music_PokemonCenter: ; ed5c6
 	dbw $03, Music_PokemonCenter_Ch4
 ; ed5d2
 
-
 Music_PokemonCenter_Ch1: ; ed5d2
 	tempo 152
 	volume $77
 	dutycycle $2
 	vibrato $a, $14
 	tone $0001
-
 Music_PokemonCenter_branch_ed5df: ; ed5df
 	stereopanning $f
 	notetype $c, $83
@@ -151,10 +149,10 @@ Music_PokemonCenter_branch_ed5df: ; ed5df
 	note F#, 2
 	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed5df
+; ed671
 
 Music_PokemonCenter_Ch2: ; ed671
 	vibrato $10, $25
-
 Music_PokemonCenter_branch_ed674: ; ed674
 	stereopanning $ff
 	callchannel Music_PokemonCenter_branch_ed6d1
@@ -253,10 +251,10 @@ Music_PokemonCenter_branch_ed6e4: ; ed6e4
 	note E_, 4
 	note C#, 2
 	endchannel
+; ed6f3
 
 Music_PokemonCenter_Ch3: ; ed6f3
 	notetype $c, $28
-
 Music_PokemonCenter_branch_ed6f6: ; ed6f6
 	stereopanning $f0
 	octave 3
@@ -400,12 +398,12 @@ Music_PokemonCenter_branch_ed783: ; ed783
 	note A_, 1
 	note __, 1
 	endchannel
+; ed78c
 
 Music_PokemonCenter_Ch4: ; ed78c
 	togglenoise $3
 	notetype $c
 	stereopanning $ff
-
 Music_PokemonCenter_branch_ed792: ; ed792
 	note G_, 6
 	note G_, 4
@@ -414,3 +412,5 @@ Music_PokemonCenter_branch_ed792: ; ed792
 	note G_, 2
 	loopchannel 0, Music_PokemonCenter_branch_ed792
 ; ed79b
+
+
diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm
index d21e879b4..4cab1f28b 100644
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -5,7 +5,6 @@ Music_PokemonChannel: ; ee45f
 	dbw $03, Music_PokemonChannel_Ch4
 ; ee46b
 
-
 Music_PokemonChannel_Ch1: ; ee46b
 	tempo 128
 	volume $77
@@ -75,6 +74,7 @@ Music_PokemonChannel_Ch1: ; ee46b
 	note D_, 2
 	note __, 6
 	endchannel
+; ee4be
 
 Music_PokemonChannel_Ch2: ; ee4be
 	dutycycle $1
@@ -145,6 +145,7 @@ Music_PokemonChannel_Ch2: ; ee4be
 	note G_, 2
 	note __, 6
 	endchannel
+; ee50e
 
 Music_PokemonChannel_Ch3: ; ee50e
 	vibrato $8, $38
@@ -201,11 +202,11 @@ Music_PokemonChannel_Ch3: ; ee50e
 	note G_, 1
 	note __, 3
 	endchannel
+; ee549
 
 Music_PokemonChannel_Ch4: ; ee549
 	togglenoise $3
 	notetype $c
-
 Music_PokemonChannel_branch_ee54d: ; ee54d
 	note A#, 3
 	note A#, 1
@@ -233,3 +234,5 @@ Music_PokemonChannel_branch_ee54d: ; ee54d
 	note A#, 4
 	endchannel
 ; ee569
+
+
diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm
index d9fe27182..7abf53f91 100644
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@@ -4,13 +4,11 @@ Music_PokemonLullaby: ; f6d79
 	dbw $02, Music_PokemonLullaby_Ch3
 ; f6d82
 
-
 Music_PokemonLullaby_Ch1: ; f6d82
 	tempo 224
 	volume $77
 	dutycycle $3
 	tone $0001
-
 Music_PokemonLullaby_branch_f6d8c: ; f6d8c
 	notetype $c, $a7
 	octave 3
@@ -55,12 +53,12 @@ Music_PokemonLullaby_branch_f6d8c: ; f6d8c
 	octave 3
 	note B_, 8
 	loopchannel 0, Music_PokemonLullaby_branch_f6d8c
+; f6dc4
 
 Music_PokemonLullaby_Ch2: ; f6dc4
 	vibrato $10, $14
 	dutycycle $0
 	notetype $c, $b4
-
 Music_PokemonLullaby_branch_f6dcc: ; f6dcc
 	note __, 16
 	note __, 10
@@ -106,10 +104,10 @@ Music_PokemonLullaby_branch_f6dcc: ; f6dcc
 	note E_, 16
 	note __, 14
 	loopchannel 0, Music_PokemonLullaby_branch_f6dcc
+; f6e03
 
 Music_PokemonLullaby_Ch3: ; f6e03
 	notetype $c, $11
-
 Music_PokemonLullaby_branch_f6e06: ; f6e06
 	stereopanning $f0
 	octave 4
@@ -136,3 +134,5 @@ Music_PokemonLullaby_branch_f6e06: ; f6e06
 	note A_, 2
 	loopchannel 0, Music_PokemonLullaby_branch_f6e06
 ; f6e23
+
+
diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm
index 269314944..c939dd880 100644
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -5,7 +5,6 @@ Music_PokemonMarch: ; f6e23
 	dbw $03, Music_PokemonMarch_Ch4
 ; f6e2f
 
-
 Music_PokemonMarch_Ch1: ; f6e2f
 	tempo 144
 	volume $77
@@ -22,7 +21,6 @@ Music_PokemonMarch_Ch1: ; f6e2f
 	intensity $a2
 	note D_, 4
 	notetype $8, $a2
-
 Music_PokemonMarch_branch_f6e4c: ; f6e4c
 	callchannel Music_PokemonMarch_branch_f6eae
 	note D#, 2
@@ -124,6 +122,7 @@ Music_PokemonMarch_branch_f6eb8: ; f6eb8
 	note F_, 2
 	note __, 2
 	endchannel
+; f6ec1
 
 Music_PokemonMarch_Ch2: ; f6ec1
 	dutycycle $2
@@ -134,7 +133,6 @@ Music_PokemonMarch_Ch2: ; f6ec1
 	note G_, 4
 	note G_, 4
 	note G_, 4
-
 Music_PokemonMarch_branch_f6ece: ; f6ece
 	notetype $c, $b7
 	octave 3
@@ -236,13 +234,13 @@ Music_PokemonMarch_branch_f6ece: ; f6ece
 	note G_, 1
 	note __, 5
 	loopchannel 0, Music_PokemonMarch_branch_f6ece
+; f6f4d
 
 Music_PokemonMarch_Ch3: ; f6f4d
 	stereopanning $f
 	notetype $c, $16
 	note __, 16
 	notetype $8, $16
-
 Music_PokemonMarch_branch_f6f56: ; f6f56
 	callchannel Music_PokemonMarch_branch_f6fe8
 	note __, 2
@@ -275,7 +273,6 @@ Music_PokemonMarch_branch_f6f56: ; f6f56
 	note D#, 2
 	note G_, 2
 	note G#, 2
-
 Music_PokemonMarch_branch_f6f7b: ; f6f7b
 	octave 3
 	note A#, 2
@@ -401,13 +398,13 @@ Music_PokemonMarch_branch_f6fe8: ; f6fe8
 	octave 3
 	note G_, 2
 	endchannel
+; f6ffa
 
 Music_PokemonMarch_Ch4: ; f6ffa
 	stereopanning $f0
 	togglenoise $5
 	notetype $8
 	callchannel Music_PokemonMarch_branch_f704c
-
 Music_PokemonMarch_branch_f7003: ; f7003
 	callchannel Music_PokemonMarch_branch_f7042
 	note C_, 4
@@ -470,3 +467,5 @@ Music_PokemonMarch_branch_f704c: ; f704c
 	note C#, 2
 	endchannel
 ; f7055
+
+
diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm
index 119c73e2f..4402327f8 100644
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -3,8 +3,10 @@ Music_PostCredits: ; cfd9e
 	dbw $01, Music_PostCredits_Ch2
 ; cfda4
 
+
 INCBIN "baserom.gbc", $cfda4, $cfda5 - $cfda4
 
+
 Music_PostCredits_Ch1: ; cfda5
 	tempo 271
 	volume $77
@@ -12,7 +14,6 @@ Music_PostCredits_Ch1: ; cfda5
 	dutycycle $2
 	notetype $c, $93
 	note __, 8
-
 Music_PostCredits_branch_cfdb2: ; cfdb2
 	octave 3
 	note C_, 2
@@ -131,6 +132,7 @@ Music_PostCredits_branch_cfdb2: ; cfdb2
 	octave 2
 	note G_, 2
 	loopchannel 0, Music_PostCredits_branch_cfdb2
+; cfe48
 
 Music_PostCredits_Ch2: ; cfe48
 	forceoctave $3
@@ -144,7 +146,6 @@ Music_PostCredits_Ch2: ; cfe48
 	note F_, 2
 	intensity $73
 	note F_, 2
-
 Music_PostCredits_branch_cfe5a: ; cfe5a
 	intensity $a3
 	note G_, 2
@@ -266,3 +267,4 @@ Music_PostCredits_branch_cfe5a: ; cfe5a
 	note F_, 2
 	loopchannel 0, Music_PostCredits_branch_cfe5a
 ; cff04
+
diff --git a/audio/music/printer.asm b/audio/music/printer.asm
index 52b81d244..eed309721 100644
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@@ -2,7 +2,6 @@ Music_Printer: ; f07fd
 	dbw $02, Music_Printer_Ch3
 ; f0800
 
-
 Music_Printer_Ch3: ; f0800
 	tempo 256
 	notetype $c, $20
@@ -35,7 +34,6 @@ Music_Printer_Ch3: ; f0800
 	note __, 1
 	note F#, 1
 	note __, 1
-
 Music_Printer_branch_f0823: ; f0823
 	note E_, 1
 	note __, 1
@@ -321,3 +319,4 @@ Music_Printer_branch_f0823: ; f0823
 	note __, 1
 	loopchannel 0, Music_Printer_branch_f0823
 ; f0941
+
diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm
index 19645a225..c2b676082 100644
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@@ -4,7 +4,6 @@ Music_ProfOak: ; f4dea
 	dbw $02, Music_ProfOak_Ch3
 ; f4df3
 
-
 Music_ProfOak_Ch1: ; f4df3
 	tempo 118
 	volume $77
@@ -23,7 +22,6 @@ Music_ProfOak_Ch1: ; f4df3
 	note G#, 8
 	intensity $97
 	note G#, 8
-
 Music_ProfOak_branch_f4e10: ; f4e10
 	intensity $91
 	callchannel Music_ProfOak_branch_f4e42
@@ -31,7 +29,6 @@ Music_ProfOak_branch_f4e10: ; f4e10
 	callchannel Music_ProfOak_branch_f4e4d
 	callchannel Music_ProfOak_branch_f4e4d
 	loopchannel 2, Music_ProfOak_branch_f4e10
-
 Music_ProfOak_branch_f4e22: ; f4e22
 	callchannel Music_ProfOak_branch_f4e58
 	callchannel Music_ProfOak_branch_f4e58
@@ -108,6 +105,7 @@ Music_ProfOak_branch_f4e6c: ; f4e6c
 	note B_, 4
 	intensity $91
 	endchannel
+; f4e7e
 
 Music_ProfOak_Ch2: ; f4e7e
 	vibrato $12, $34
@@ -123,7 +121,6 @@ Music_ProfOak_Ch2: ; f4e7e
 	intensity $a7
 	note B_, 10
 	dutycycle $2
-
 Music_ProfOak_branch_f4e92: ; f4e92
 	intensity $b2
 	octave 3
@@ -162,7 +159,6 @@ Music_ProfOak_branch_f4e92: ; f4e92
 	loopchannel 2, Music_ProfOak_branch_f4e92
 	note __, 6
 	intensity $b4
-
 Music_ProfOak_branch_f4ebf: ; f4ebf
 	note C#, 6
 	octave 3
@@ -212,6 +208,7 @@ Music_ProfOak_branch_f4ebf: ; f4ebf
 	note E_, 1
 	note G#, 16
 	loopchannel 0, Music_ProfOak_branch_f4ebf
+; f4ef5
 
 Music_ProfOak_Ch3: ; f4ef5
 	stereopanning $f
@@ -233,14 +230,12 @@ Music_ProfOak_Ch3: ; f4ef5
 	note __, 1
 	note E_, 2
 	callchannel Music_ProfOak_branch_f4f3d
-
 Music_ProfOak_branch_f4f0d: ; f4f0d
 	callchannel Music_ProfOak_branch_f4f3d
 	callchannel Music_ProfOak_branch_f4f3d
 	callchannel Music_ProfOak_branch_f4f4c
 	callchannel Music_ProfOak_branch_f4f4c
 	loopchannel 2, Music_ProfOak_branch_f4f0d
-
 Music_ProfOak_branch_f4f1d: ; f4f1d
 	callchannel Music_ProfOak_branch_f4f5a
 	callchannel Music_ProfOak_branch_f4f5a
@@ -326,3 +321,5 @@ Music_ProfOak_branch_f4f69: ; f4f69
 	note B_, 2
 	endchannel
 ; f4f79
+
+
diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm
index fcd1c2f1c..578c0272d 100644
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -4,8 +4,10 @@ Music_ProfOaksPokemonTalk: ; f4c9f
 	dbw $02, Music_ProfOaksPokemonTalk_Ch3
 ; f4ca8
 
+
 INCBIN "baserom.gbc", $f4ca8, $f4ca9 - $f4ca8
 
+
 Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
 	tempo 164
 	volume $77
@@ -24,7 +26,6 @@ Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
 	note D#, 1
 	note E_, 1
 	note F#, 1
-
 Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3
 	note D#, 6
 	note C#, 1
@@ -133,6 +134,7 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3
 	note F#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3
+; f4d31
 
 Music_ProfOaksPokemonTalk_Ch2: ; f4d31
 	vibrato $8, $24
@@ -157,7 +159,6 @@ Music_ProfOaksPokemonTalk_Ch2: ; f4d31
 	note F#, 1
 	note G#, 1
 	note A#, 1
-
 Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d
 	note B_, 6
 	note A#, 1
@@ -209,6 +210,7 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d
 	note A#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d
+; f4d82
 
 Music_ProfOaksPokemonTalk_Ch3: ; f4d82
 	vibrato $6, $38
@@ -225,7 +227,6 @@ Music_ProfOaksPokemonTalk_Ch3: ; f4d82
 	note C#, 1
 	octave 2
 	note A#, 1
-
 Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95
 	note B_, 6
 	octave 3
@@ -310,3 +311,5 @@ Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
 ; f4dea
+
+
diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm
index 5942f5daf..343c884a7 100644
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@@ -4,7 +4,6 @@ Music_RivalBattle: ; e974f
 	dbw $02, Music_RivalBattle_Ch3
 ; e9758
 
-
 Music_RivalBattle_Ch1: ; e9758
 	tempo 102
 	volume $77
@@ -24,7 +23,6 @@ Music_RivalBattle_Ch1: ; e9758
 	intensity $b7
 	note C#, 6
 	note E_, 4
-
 Music_RivalBattle_branch_e9777: ; e9777
 	intensity $b2
 	octave 2
@@ -42,7 +40,6 @@ Music_RivalBattle_branch_e9777: ; e9777
 	note C#, 4
 	intensity $b7
 	note C#, 10
-
 Music_RivalBattle_branch_e978f: ; e978f
 	intensity $b2
 	octave 3
@@ -59,7 +56,6 @@ Music_RivalBattle_branch_e978f: ; e978f
 	note B_, 4
 	intensity $4d
 	note B_, 10
-
 Music_RivalBattle_branch_e97a6: ; e97a6
 	intensity $b7
 	note A#, 6
@@ -183,7 +179,6 @@ Music_RivalBattle_branch_e97a6: ; e97a6
 	note E_, 2
 	note D#, 2
 	note C#, 2
-
 Music_RivalBattle_branch_e9837: ; e9837
 	octave 3
 	note A#, 2
@@ -290,6 +285,7 @@ Music_RivalBattle_branch_e9837: ; e9837
 	octave 3
 	note C#, 10
 	loopchannel 0, Music_RivalBattle_branch_e97a6
+; e98af
 
 Music_RivalBattle_Ch2: ; e98af
 	dutycycle $3
@@ -341,7 +337,6 @@ Music_RivalBattle_Ch2: ; e98af
 	note F#, 6
 	intensity $c2
 	note G#, 4
-
 Music_RivalBattle_branch_e98ea: ; e98ea
 	intensity $c2
 	note D#, 6
@@ -359,7 +354,6 @@ Music_RivalBattle_branch_e98ea: ; e98ea
 	note B_, 1
 	octave 4
 	note C_, 1
-
 Music_RivalBattle_branch_e9903: ; e9903
 	intensity $c2
 	note C#, 6
@@ -375,7 +369,6 @@ Music_RivalBattle_branch_e9903: ; e9903
 	note E_, 4
 	intensity $b7
 	note E_, 6
-
 Music_RivalBattle_branch_e991a: ; e991a
 	callchannel Music_RivalBattle_branch_e99e0
 	intensity $b0
@@ -481,7 +474,6 @@ Music_RivalBattle_branch_e991a: ; e991a
 	note G#, 8
 	intensity $c7
 	note F_, 8
-
 Music_RivalBattle_branch_e99a6: ; e99a6
 	intensity $c2
 	octave 3
@@ -501,7 +493,6 @@ Music_RivalBattle_branch_e99a6: ; e99a6
 	note C#, 6
 	intensity $9a
 	note C#, 4
-
 Music_RivalBattle_branch_e99c1: ; e99c1
 	intensity $c2
 	octave 3
@@ -545,6 +536,7 @@ Music_RivalBattle_branch_e99e0: ; e99e0
 	intensity $b7
 	note F_, 8
 	endchannel
+; e99fb
 
 Music_RivalBattle_Ch3: ; e99fb
 	notetype $c, $19
@@ -562,7 +554,6 @@ Music_RivalBattle_Ch3: ; e99fb
 	octave 3
 	note C#, 2
 	note D_, 2
-
 Music_RivalBattle_branch_e9a0c: ; e9a0c
 	note D#, 2
 	note C#, 2
@@ -572,7 +563,6 @@ Music_RivalBattle_branch_e9a0c: ; e9a0c
 	note D#, 2
 	note C#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a0c
-
 Music_RivalBattle_branch_e9a17: ; e9a17
 	octave 3
 	note C#, 2
@@ -596,7 +586,6 @@ Music_RivalBattle_branch_e9a17: ; e9a17
 	note C_, 2
 	note C#, 2
 	note D_, 2
-
 Music_RivalBattle_branch_e9a30: ; e9a30
 	callchannel Music_RivalBattle_branch_e9b47
 	octave 2
@@ -644,7 +633,6 @@ Music_RivalBattle_branch_e9a30: ; e9a30
 	octave 3
 	note F_, 2
 	callchannel Music_RivalBattle_branch_e9b50
-
 Music_RivalBattle_branch_e9a66: ; e9a66
 	note C#, 2
 	note G#, 2
@@ -652,7 +640,6 @@ Music_RivalBattle_branch_e9a66: ; e9a66
 	callchannel Music_RivalBattle_branch_e9b5c
 	note G#, 2
 	note F#, 2
-
 Music_RivalBattle_branch_e9a71: ; e9a71
 	octave 2
 	note A#, 2
@@ -711,34 +698,28 @@ Music_RivalBattle_branch_e9a71: ; e9a71
 	note F#, 2
 	note G_, 2
 	note G#, 2
-
 Music_RivalBattle_branch_e9ab3: ; e9ab3
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab3
-
 Music_RivalBattle_branch_e9ab9: ; e9ab9
 	note D#, 2
 	note A_, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab9
-
 Music_RivalBattle_branch_e9abf: ; e9abf
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9abf
-
 Music_RivalBattle_branch_e9ac5: ; e9ac5
 	note D#, 2
 	note G_, 2
 	loopchannel 12, Music_RivalBattle_branch_e9ac5
-
 Music_RivalBattle_branch_e9acb: ; e9acb
 	octave 2
 	note B_, 2
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9acb
-
 Music_RivalBattle_branch_e9ad3: ; e9ad3
 	octave 2
 	note B_, 2
@@ -798,7 +779,6 @@ Music_RivalBattle_branch_e9ad3: ; e9ad3
 	note C#, 8
 	note D#, 8
 	note F_, 8
-
 Music_RivalBattle_branch_e9b10: ; e9b10
 	octave 2
 	note A#, 2
@@ -807,7 +787,6 @@ Music_RivalBattle_branch_e9b10: ; e9b10
 	loopchannel 7, Music_RivalBattle_branch_e9b10
 	note E_, 2
 	note D#, 2
-
 Music_RivalBattle_branch_e9b1a: ; e9b1a
 	octave 2
 	note A#, 2
@@ -820,7 +799,6 @@ Music_RivalBattle_branch_e9b1a: ; e9b1a
 	note F#, 2
 	note F_, 2
 	note E_, 2
-
 Music_RivalBattle_branch_e9b28: ; e9b28
 	octave 2
 	note G#, 2
@@ -829,7 +807,6 @@ Music_RivalBattle_branch_e9b28: ; e9b28
 	loopchannel 7, Music_RivalBattle_branch_e9b28
 	note D_, 2
 	note C#, 2
-
 Music_RivalBattle_branch_e9b32: ; e9b32
 	octave 2
 	note G#, 2
@@ -890,3 +867,5 @@ Music_RivalBattle_branch_e9b65: ; e9b65
 	loopchannel 2, Music_RivalBattle_branch_e9b65
 	endchannel
 ; e9b6f
+
+
diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm
index d45edccc8..c6566f26d 100644
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@@ -4,7 +4,6 @@ Music_RocketBattle: ; e9b6f
 	dbw $02, Music_RocketBattle_Ch3
 ; e9b78
 
-
 Music_RocketBattle_Ch1: ; e9b78
 	tempo 101
 	volume $77
@@ -49,7 +48,6 @@ Music_RocketBattle_Ch1: ; e9b78
 	note C_, 1
 	octave 2
 	note B_, 1
-
 Music_RocketBattle_branch_e9bad: ; e9bad
 	intensity $b2
 	octave 3
@@ -64,7 +62,6 @@ Music_RocketBattle_branch_e9bad: ; e9bad
 	note C_, 6
 	intensity $b7
 	note D_, 4
-
 Music_RocketBattle_branch_e9bc1: ; e9bc1
 	intensity $b2
 	octave 4
@@ -119,7 +116,6 @@ Music_RocketBattle_branch_e9bc1: ; e9bc1
 	note D#, 2
 	note D_, 2
 	note F_, 2
-
 Music_RocketBattle_branch_e9c02: ; e9c02
 	octave 4
 	note E_, 2
@@ -295,7 +291,6 @@ Music_RocketBattle_branch_e9c02: ; e9c02
 	intensity $b7
 	note A#, 2
 	note G_, 4
-
 Music_RocketBattle_branch_e9cc5: ; e9cc5
 	intensity $b2
 	note F_, 6
@@ -394,6 +389,7 @@ Music_RocketBattle_branch_e9cc5: ; e9cc5
 	note D_, 2
 	note F_, 2
 	loopchannel 0, Music_RocketBattle_branch_e9c02
+; e9d3e
 
 Music_RocketBattle_Ch2: ; e9d3e
 	dutycycle $3
@@ -442,7 +438,6 @@ Music_RocketBattle_Ch2: ; e9d3e
 	note G#, 1
 	note A_, 1
 	note G#, 1
-
 Music_RocketBattle_branch_e9d7b: ; e9d7b
 	intensity $c2
 	octave 3
@@ -459,7 +454,6 @@ Music_RocketBattle_branch_e9d7b: ; e9d7b
 	note A_, 6
 	intensity $4a
 	note G#, 4
-
 Music_RocketBattle_branch_e9d91: ; e9d91
 	intensity $c2
 	octave 4
@@ -482,7 +476,6 @@ Music_RocketBattle_branch_e9d91: ; e9d91
 	note F_, 16
 	intensity $b7
 	note F_, 16
-
 Music_RocketBattle_branch_e9db1: ; e9db1
 	callchannel Music_RocketBattle_branch_e9ea0
 	intensity $b0
@@ -612,7 +605,6 @@ Music_RocketBattle_branch_e9db1: ; e9db1
 	note G_, 1
 	note G#, 1
 	note A_, 8
-
 Music_RocketBattle_branch_e9e5a: ; e9e5a
 	intensity $c2
 	octave 3
@@ -677,6 +669,7 @@ Music_RocketBattle_branch_e9ea0: ; e9ea0
 	note G#, 6
 	note E_, 4
 	endchannel
+; e9eaa
 
 Music_RocketBattle_Ch3: ; e9eaa
 	notetype $c, $19
@@ -711,7 +704,6 @@ Music_RocketBattle_Ch3: ; e9eaa
 	octave 2
 	note B_, 2
 	note A#, 2
-
 Music_RocketBattle_branch_e9ecc: ; e9ecc
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9ecc
@@ -727,7 +719,6 @@ Music_RocketBattle_branch_e9ecc: ; e9ecc
 	note F_, 2
 	note E_, 2
 	note D_, 2
-
 Music_RocketBattle_branch_e9edf: ; e9edf
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9edf
@@ -749,7 +740,6 @@ Music_RocketBattle_branch_e9edf: ; e9edf
 	octave 3
 	note F_, 2
 	callchannel Music_RocketBattle_branch_ea01d
-
 Music_RocketBattle_branch_e9efe: ; e9efe
 	callchannel Music_RocketBattle_branch_e9ff3
 	callchannel Music_RocketBattle_branch_ea010
@@ -784,7 +774,6 @@ Music_RocketBattle_branch_e9efe: ; e9efe
 	note A_, 2
 	octave 3
 	note E_, 2
-
 Music_RocketBattle_branch_e9f25: ; e9f25
 	octave 2
 	note A#, 2
@@ -818,7 +807,6 @@ Music_RocketBattle_branch_e9f25: ; e9f25
 	note D_, 2
 	callchannel Music_RocketBattle_branch_ea02a
 	callchannel Music_RocketBattle_branch_ea02a
-
 Music_RocketBattle_branch_e9f4e: ; e9f4e
 	octave 2
 	note A_, 2
@@ -845,7 +833,6 @@ Music_RocketBattle_branch_e9f4e: ; e9f4e
 	note A_, 2
 	note G_, 2
 	note F_, 2
-
 Music_RocketBattle_branch_e9f6a: ; e9f6a
 	octave 2
 	note A#, 2
@@ -862,7 +849,6 @@ Music_RocketBattle_branch_e9f6a: ; e9f6a
 	note D_, 2
 	note C#, 2
 	note D_, 2
-
 Music_RocketBattle_branch_e9f7c: ; e9f7c
 	octave 2
 	note A_, 2
@@ -877,7 +863,6 @@ Music_RocketBattle_branch_e9f7c: ; e9f7c
 	note C_, 2
 	octave 2
 	note A#, 2
-
 Music_RocketBattle_branch_e9f8c: ; e9f8c
 	octave 2
 	note A_, 2
@@ -894,7 +879,6 @@ Music_RocketBattle_branch_e9f8c: ; e9f8c
 	note A_, 2
 	note G_, 2
 	note A#, 2
-
 Music_RocketBattle_branch_e9f9e: ; e9f9e
 	octave 2
 	note A#, 2
@@ -903,7 +887,6 @@ Music_RocketBattle_branch_e9f9e: ; e9f9e
 	loopchannel 7, Music_RocketBattle_branch_e9f9e
 	note E_, 2
 	note F_, 2
-
 Music_RocketBattle_branch_e9fa8: ; e9fa8
 	octave 2
 	note A#, 2
@@ -1055,3 +1038,5 @@ Music_RocketBattle_branch_ea033: ; ea033
 	note A_, 2
 	endchannel
 ; ea040
+
+
diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm
index ff83a9ea0..90f1fa82a 100644
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -5,7 +5,6 @@ Music_RocketHideout: ; eeb75
 	dbw $03, Music_RocketHideout_Ch4
 ; eeb81
 
-
 Music_RocketHideout_Ch1: ; eeb81
 	tempo 144
 	volume $77
@@ -14,11 +13,9 @@ Music_RocketHideout_Ch1: ; eeb81
 	vibrato $10, $44
 	notetype $c, $b3
 	stereopanning $f0
-
 Music_RocketHideout_branch_eeb93: ; eeb93
 	note __, 16
 	loopchannel 4, Music_RocketHideout_branch_eeb93
-
 Music_RocketHideout_branch_eeb98: ; eeb98
 	octave 2
 	note D#, 2
@@ -117,11 +114,11 @@ Music_RocketHideout_branch_eeb98: ; eeb98
 	note __, 16
 	note A_, 16
 	intensity $b3
-
 Music_RocketHideout_branch_eebfe: ; eebfe
 	note __, 16
 	loopchannel 4, Music_RocketHideout_branch_eebfe
 	loopchannel 0, Music_RocketHideout_branch_eeb93
+; eec07
 
 Music_RocketHideout_Ch2: ; eec07
 	dutycycle $3
@@ -129,7 +126,6 @@ Music_RocketHideout_Ch2: ; eec07
 	vibrato $0, $f0
 	notetype $c, $c4
 	stereopanning $f
-
 Music_RocketHideout_branch_eec14: ; eec14
 	octave 2
 	note D#, 2
@@ -225,10 +221,10 @@ Music_RocketHideout_branch_eec14: ; eec14
 	note G_, 2
 	note __, 8
 	loopchannel 0, Music_RocketHideout_branch_eec14
+; eec79
 
 Music_RocketHideout_Ch3: ; eec79
 	notetype $c, $19
-
 Music_RocketHideout_branch_eec7c: ; eec7c
 	octave 2
 	note D#, 2
@@ -241,7 +237,6 @@ Music_RocketHideout_branch_eec7c: ; eec7c
 	note A_, 2
 	note __, 8
 	loopchannel 6, Music_RocketHideout_branch_eec7c
-
 Music_RocketHideout_branch_eec8a: ; eec8a
 	note F_, 2
 	note __, 2
@@ -257,7 +252,6 @@ Music_RocketHideout_branch_eec8a: ; eec8a
 	note B_, 2
 	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eec8a
-
 Music_RocketHideout_branch_eec9b: ; eec9b
 	note C#, 2
 	note __, 2
@@ -267,7 +261,6 @@ Music_RocketHideout_branch_eec9b: ; eec9b
 	octave 3
 	note C#, 16
 	loopchannel 2, Music_RocketHideout_branch_eec9b
-
 Music_RocketHideout_branch_eeca6: ; eeca6
 	octave 2
 	note C#, 2
@@ -281,6 +274,7 @@ Music_RocketHideout_branch_eeca6: ; eeca6
 	note __, 8
 	loopchannel 2, Music_RocketHideout_branch_eeca6
 	loopchannel 0, Music_RocketHideout_branch_eec7c
+; eecb8
 
 Music_RocketHideout_Ch4: ; eecb8
 	togglenoise $0
@@ -293,7 +287,6 @@ Music_RocketHideout_Ch4: ; eecb8
 	note D#, 1
 	note D#, 1
 	callchannel Music_RocketHideout_branch_eecdb
-
 Music_RocketHideout_branch_eecc7: ; eecc7
 	callchannel Music_RocketHideout_branch_eecdb
 	note E_, 4
@@ -318,3 +311,5 @@ Music_RocketHideout_branch_eecdb: ; eecdb
 	note A_, 4
 	endchannel
 ; eece8
+
+
diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm
index 62ee7f002..3f53452e2 100644
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -5,7 +5,6 @@ Music_RocketTheme: ; f766d
 	dbw $03, Music_RocketTheme_Ch4
 ; f7679
 
-
 Music_RocketTheme_Ch1: ; f7679
 	tempo 128
 	volume $77
@@ -16,7 +15,6 @@ Music_RocketTheme_Ch1: ; f7679
 	octave 4
 	note C_, 1
 	note D_, 1
-
 Music_RocketTheme_branch_f768b: ; f768b
 	dutycycle $3
 	notetype $c, $a8
@@ -89,7 +87,6 @@ Music_RocketTheme_branch_f768b: ; f768b
 	note E_, 2
 	note D#, 2
 	note D_, 2
-
 Music_RocketTheme_branch_f76ef: ; f76ef
 	note __, 4
 	note F_, 2
@@ -106,22 +103,18 @@ Music_RocketTheme_branch_f76ef: ; f76ef
 	note __, 2
 	note D#, 2
 	note C_, 2
-
 Music_RocketTheme_branch_f7701: ; f7701
 	note F#, 2
 	note A_, 2
 	loopchannel 4, Music_RocketTheme_branch_f7701
-
 Music_RocketTheme_branch_f7707: ; f7707
 	note G_, 2
 	note A#, 2
 	loopchannel 4, Music_RocketTheme_branch_f7707
-
 Music_RocketTheme_branch_f770d: ; f770d
 	note G#, 2
 	note B_, 2
 	loopchannel 4, Music_RocketTheme_branch_f770d
-
 Music_RocketTheme_branch_f7713: ; f7713
 	octave 3
 	note A_, 2
@@ -161,6 +154,7 @@ Music_RocketTheme_branch_f7727: ; f7727
 	note A#, 2
 	note __, 10
 	endchannel
+; f773e
 
 Music_RocketTheme_Ch2: ; f773e
 	stereopanning $ff
@@ -170,7 +164,6 @@ Music_RocketTheme_Ch2: ; f773e
 	octave 5
 	note C_, 1
 	note D_, 1
-
 Music_RocketTheme_branch_f774b: ; f774b
 	notetype $c, $b7
 	callchannel Music_RocketTheme_branch_f7547
@@ -340,13 +333,13 @@ Music_RocketTheme_branch_f781c: ; f781c
 	note F_, 8
 	note C_, 4
 	endchannel
+; f7826
 
 Music_RocketTheme_Ch3: ; f7826
 	stereopanning $f0
 	vibrato $4, $22
 	notetype $c, $14
 	note __, 2
-
 Music_RocketTheme_branch_f782f: ; f782f
 	notetype $c, $14
 	callchannel Music_RocketTheme_branch_f75bf
@@ -454,12 +447,12 @@ Music_RocketTheme_branch_f782f: ; f782f
 	note G#, 1
 	note __, 1
 	loopchannel 0, Music_RocketTheme_branch_f782f
+; f78be
 
 Music_RocketTheme_Ch4: ; f78be
 	togglenoise $3
 	notetype $c
 	note __, 2
-
 Music_RocketTheme_branch_f78c3: ; f78c3
 	callchannel Music_RocketTheme_branch_f765c
 	callchannel Music_RocketTheme_branch_f7664
@@ -470,7 +463,6 @@ Music_RocketTheme_branch_f78c3: ; f78c3
 	callchannel Music_RocketTheme_branch_f7664
 	callchannel Music_RocketTheme_branch_f7664
 	callchannel Music_RocketTheme_branch_f765c
-
 Music_RocketTheme_branch_f78de: ; f78de
 	note A#, 2
 	note F#, 2
@@ -488,3 +480,5 @@ Music_RocketTheme_branch_f78de: ; f78de
 	callchannel Music_RocketTheme_branch_f765c
 	loopchannel 0, Music_RocketTheme_branch_f78c3
 ; f78fd
+
+
diff --git a/audio/music/route1.asm b/audio/music/route1.asm
index c7340f1d4..ef6de9f6f 100644
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -4,8 +4,10 @@ Music_Route1: ; ec000
 	dbw $02, Music_Route1_Ch3
 ; ec009
 
+
 INCBIN "baserom.gbc", $ec009, $ec00a - $ec009
 
+
 Music_Route1_Ch1: ; ec00a
 	stereopanning $f
 	tempo 184
@@ -60,7 +62,6 @@ Music_Route1_Ch1: ; ec00a
 	note D_, 2
 	intensity $83
 	note __, 2
-
 Music_Route1_branch_ec04a: ; ec04a
 	intensity $83
 	note __, 2
@@ -204,6 +205,7 @@ Music_Route1_branch_ec04a: ; ec04a
 	note D_, 2
 	note __, 2
 	loopchannel 0, Music_Route1_branch_ec04a
+; ec0eb
 
 Music_Route1_Ch2: ; ec0eb
 	stereopanning $f0
@@ -232,7 +234,6 @@ Music_Route1_Ch2: ; ec0eb
 	note D_, 1
 	note E_, 1
 	dutycycle $2
-
 Music_Route1_branch_ec112: ; ec112
 	intensity $82
 	callchannel Music_Route1_branch_ec188
@@ -381,6 +382,7 @@ Music_Route1_branch_ec1aa: ; ec1aa
 	octave 5
 	note D_, 2
 	endchannel
+; ec1b8
 
 Music_Route1_Ch3: ; ec1b8
 	stereopanning $ff
@@ -462,7 +464,6 @@ Music_Route1_Ch3: ; ec1b8
 	note __, 1
 	note A_, 1
 	note __, 3
-
 Music_Route1_branch_ec20c: ; ec20c
 	octave 3
 	note D_, 1
@@ -652,3 +653,5 @@ Music_Route1_branch_ec20c: ; ec20c
 	note __, 3
 	loopchannel 0, Music_Route1_branch_ec20c
 ; ec2ca
+
+
diff --git a/audio/music/route12.asm b/audio/music/route12.asm
index 5817a640c..0a35ab6b6 100644
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -5,7 +5,6 @@ Music_Route12: ; ec506
 	dbw $03, Music_Route12_Ch4
 ; ec512
 
-
 Music_Route12_Ch1: ; ec512
 	tempo 148
 	volume $77
@@ -30,7 +29,6 @@ Music_Route12_Ch1: ; ec512
 	note E_, 1
 	intensity $97
 	note D#, 12
-
 Music_Route12_branch_ec535: ; ec535
 	dutycycle $2
 	intensity $96
@@ -117,7 +115,6 @@ Music_Route12_branch_ec535: ; ec535
 	note F#, 8
 	note D#, 4
 	note F#, 4
-
 Music_Route12_branch_ec59b: ; ec59b
 	intensity $97
 	note G#, 1
@@ -165,6 +162,7 @@ Music_Route12_branch_ec5bf: ; ec5bf
 	note A_, 4
 	note F#, 4
 	endchannel
+; ec5ca
 
 Music_Route12_Ch2: ; ec5ca
 	dutycycle $3
@@ -188,7 +186,6 @@ Music_Route12_Ch2: ; ec5ca
 	note B_, 1
 	octave 4
 	note D#, 1
-
 Music_Route12_branch_ec5e5: ; ec5e5
 	dutycycle $3
 	intensity $b7
@@ -284,6 +281,7 @@ Music_Route12_branch_ec647: ; ec647
 	note G#, 4
 	note F#, 4
 	endchannel
+; ec657
 
 Music_Route12_Ch3: ; ec657
 	vibrato $12, $54
@@ -303,7 +301,6 @@ Music_Route12_Ch3: ; ec657
 	note F#, 2
 	note __, 2
 	note D#, 4
-
 Music_Route12_branch_ec66c: ; ec66c
 	callchannel Music_Route12_branch_ec6b4
 	note F#, 1
@@ -356,7 +353,6 @@ Music_Route12_branch_ec66c: ; ec66c
 	note E_, 8
 	note F#, 4
 	note D#, 4
-
 Music_Route12_branch_ec6a3: ; ec6a3
 	note E_, 1
 	note __, 1
@@ -398,6 +394,7 @@ Music_Route12_branch_ec6b4: ; ec6b4
 	note G#, 4
 	note E_, 4
 	endchannel
+; ec6ce
 
 Music_Route12_Ch4: ; ec6ce
 	togglenoise $4
@@ -413,7 +410,6 @@ Music_Route12_Ch4: ; ec6ce
 	note D_, 4
 	notetype $6
 	callchannel Music_Route12_branch_ec717
-
 Music_Route12_branch_ec6e1: ; ec6e1
 	note D_, 4
 	note D_, 8
@@ -422,7 +418,6 @@ Music_Route12_branch_ec6e1: ; ec6e1
 	note D_, 8
 	callchannel Music_Route12_branch_ec717
 	loopchannel 8, Music_Route12_branch_ec6e1
-
 Music_Route12_branch_ec6ed: ; ec6ed
 	notetype $c
 	note B_, 10
@@ -441,7 +436,6 @@ Music_Route12_branch_ec6ed: ; ec6ed
 	callchannel Music_Route12_branch_ec717
 	callchannel Music_Route12_branch_ec717
 	note B_, 16
-
 Music_Route12_branch_ec707: ; ec707
 	note D_, 4
 	note D_, 8
@@ -464,3 +458,5 @@ Music_Route12_branch_ec717: ; ec717
 	note C#, 1
 	endchannel
 ; ec720
+
+
diff --git a/audio/music/route2.asm b/audio/music/route2.asm
index bd31b6dbf..bb0ad13ba 100644
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -5,7 +5,6 @@ Music_Route2: ; ed8dd
 	dbw $03, Music_Route2_Ch4
 ; ed8e9
 
-
 Music_Route2_Ch1: ; ed8e9
 	tempo 151
 	volume $77
@@ -15,7 +14,6 @@ Music_Route2_Ch1: ; ed8e9
 	note __, 16
 	note __, 16
 	callchannel Music_Route2_branch_ed931
-
 Music_Route2_branch_ed8fb: ; ed8fb
 	intensity $b1
 	octave 3
@@ -163,13 +161,13 @@ Music_Route2_branch_ed971: ; ed971
 	octave 3
 	note A_, 2
 	endchannel
+; ed996
 
 Music_Route2_Ch2: ; ed996
 	stereopanning $ff
 	vibrato $8, $24
 	notetype $c, $b2
 	callchannel Music_Route2_branch_ed9ba
-
 Music_Route2_branch_ed9a1: ; ed9a1
 	intensity $b2
 	callchannel Music_Route2_branch_ed9ba
@@ -301,6 +299,7 @@ Music_Route2_branch_eda02: ; eda02
 	note G_, 1
 	note __, 1
 	endchannel
+; eda2c
 
 Music_Route2_Ch3: ; eda2c
 	stereopanning $f0
@@ -327,7 +326,6 @@ Music_Route2_Ch3: ; eda2c
 	callchannel Music_Route2_branch_eda9e
 	octave 3
 	note D_, 4
-
 Music_Route2_branch_eda4b: ; eda4b
 	notetype $c, $15
 	octave 3
@@ -462,11 +460,11 @@ Music_Route2_branch_edacb: ; edacb
 	note E_, 4
 	note F_, 16
 	endchannel
+; edadc
 
 Music_Route2_Ch4: ; edadc
 	togglenoise $5
 	notetype $c
-
 Music_Route2_branch_edae0: ; edae0
 	note A_, 4
 	note A_, 4
@@ -480,7 +478,6 @@ Music_Route2_branch_edae0: ; edae0
 	note A_, 2
 	note A_, 2
 	note D#, 4
-
 Music_Route2_branch_edaef: ; edaef
 	note A_, 4
 	note A_, 4
@@ -489,7 +486,6 @@ Music_Route2_branch_edaef: ; edaef
 	note B_, 2
 	note A_, 2
 	loopchannel 4, Music_Route2_branch_edaef
-
 Music_Route2_branch_edaf9: ; edaf9
 	note B_, 4
 	note A_, 2
@@ -504,7 +500,6 @@ Music_Route2_branch_edaf9: ; edaf9
 	note A_, 2
 	note A_, 2
 	note D#, 4
-
 Music_Route2_branch_edb09: ; edb09
 	note B_, 4
 	note C_, 4
@@ -517,7 +512,6 @@ Music_Route2_branch_edb09: ; edb09
 	note C#, 2
 	note C_, 2
 	note C#, 4
-
 Music_Route2_branch_edb17: ; edb17
 	note B_, 4
 	note C_, 4
@@ -532,3 +526,5 @@ Music_Route2_branch_edb17: ; edb17
 	note D#, 4
 	loopchannel 0, Music_Route2_branch_edaef
 ; edb29
+
+
diff --git a/audio/music/route26.asm b/audio/music/route26.asm
index b896df8a9..577f7807c 100644
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -5,7 +5,6 @@ Music_Route26: ; eefb2
 	dbw $03, Music_Route26_Ch4
 ; eefbe
 
-
 Music_Route26_Ch1: ; eefbe
 	stereopanning $f
 	vibrato $12, $23
@@ -28,7 +27,6 @@ Music_Route26_Ch1: ; eefbe
 	octave 3
 	note G#, 2
 	note F#, 2
-
 Music_Route26_branch_eefe0: ; eefe0
 	dutycycle $0
 	notetype $c, $a7
@@ -196,6 +194,7 @@ Music_Route26_branch_eefe0: ; eefe0
 	note B_, 4
 	note __, 4
 	loopchannel 0, Music_Route26_branch_eefe0
+; ef09d
 
 Music_Route26_Ch2: ; ef09d
 	stereopanning $f0
@@ -235,7 +234,6 @@ Music_Route26_Ch2: ; ef09d
 	octave 2
 	note C_, 2
 	note D#, 2
-
 Music_Route26_branch_ef0ce: ; ef0ce
 	dutycycle $2
 	notetype $c, $c2
@@ -285,7 +283,6 @@ Music_Route26_branch_ef0ce: ; ef0ce
 	note D#, 4
 	note D#, 4
 	notetype $8, $c2
-
 Music_Route26_branch_ef10e: ; ef10e
 	octave 2
 	note G#, 2
@@ -357,6 +354,7 @@ Music_Route26_branch_ef14e: ; ef14e
 	octave 1
 	note A#, 2
 	endchannel
+; ef15a
 
 Music_Route26_Ch3: ; ef15a
 	stereopanning $ff
@@ -394,7 +392,6 @@ Music_Route26_Ch3: ; ef15a
 	note F#, 2
 	note F_, 2
 	note D#, 2
-
 Music_Route26_branch_ef18a: ; ef18a
 	vibrato $18, $23
 	notetype $c, $14
@@ -553,18 +550,17 @@ Music_Route26_branch_ef22f: ; ef22f
 	note C#, 4
 	note D#, 4
 	endchannel
+; ef238
 
 Music_Route26_Ch4: ; ef238
 	togglenoise $4
 	notetype $c
-
 Music_Route26_branch_ef23c: ; ef23c
 	note B_, 6
 	note D_, 1
 	note D_, 1
 	loopchannel 3, Music_Route26_branch_ef23c
 	callchannel Music_Route26_branch_ef2b0
-
 Music_Route26_branch_ef246: ; ef246
 	notetype $6
 	callchannel Music_Route26_branch_ef29a
@@ -584,7 +580,6 @@ Music_Route26_branch_ef246: ; ef246
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef29a
 	notetype $8
-
 Music_Route26_branch_ef266: ; ef266
 	note D_, 2
 	note D_, 2
@@ -596,7 +591,6 @@ Music_Route26_branch_ef266: ; ef266
 	callchannel Music_Route26_branch_ef2a8
 	callchannel Music_Route26_branch_ef29a
 	callchannel Music_Route26_branch_ef2a8
-
 Music_Route26_branch_ef27c: ; ef27c
 	notetype $6
 	note D_, 1
@@ -679,3 +673,5 @@ Music_Route26_branch_ef2b0: ; ef2b0
 	note E_, 2
 	endchannel
 ; ef2d0
+
+
diff --git a/audio/music/route29.asm b/audio/music/route29.asm
index b83b7b4ee..3703e62ed 100644
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -5,7 +5,6 @@ Music_Route29: ; f0386
 	dbw $03, Music_Route29_Ch4
 ; f0392
 
-
 Music_Route29_Ch1: ; f0392
 	tempo 146
 	volume $77
@@ -15,7 +14,6 @@ Music_Route29_Ch1: ; f0392
 	stereopanning $f
 	notetype $c, $b2
 	note __, 2
-
 Music_Route29_branch_f03a5: ; f03a5
 	note __, 2
 	octave 4
@@ -170,6 +168,7 @@ Music_Route29_branch_f03a5: ; f03a5
 	note G_, 2
 	note G_, 4
 	loopchannel 0, Music_Route29_branch_f03a5
+; f044d
 
 Music_Route29_Ch2: ; f044d
 	dutycycle $3
@@ -178,7 +177,6 @@ Music_Route29_Ch2: ; f044d
 	octave 4
 	note C_, 1
 	note D_, 1
-
 Music_Route29_branch_f0458: ; f0458
 	callchannel Music_Route29_branch_f04de
 	note F_, 1
@@ -335,13 +333,13 @@ Music_Route29_branch_f04de: ; f04de
 	note E_, 2
 	note C_, 2
 	endchannel
+; f04fb
 
 Music_Route29_Ch3: ; f04fb
 	stereopanning $f0
 	notetype $c, $25
 	vibrato $9, $27
 	note __, 2
-
 Music_Route29_branch_f0504: ; f0504
 	note __, 2
 	octave 3
@@ -505,13 +503,13 @@ Music_Route29_branch_f0504: ; f0504
 	note C_, 1
 	note __, 3
 	loopchannel 0, Music_Route29_branch_f0504
+; f05a9
 
 Music_Route29_Ch4: ; f05a9
 	stereopanning $f
 	togglenoise $0
 	notetype $c
 	note __, 2
-
 Music_Route29_branch_f05b0: ; f05b0
 	note __, 2
 	note F_, 2
@@ -526,3 +524,5 @@ Music_Route29_branch_f05b0: ; f05b0
 	note F_, 4
 	loopchannel 0, Music_Route29_branch_f05b0
 ; f05bf
+
+
diff --git a/audio/music/route3.asm b/audio/music/route3.asm
index 29f41709a..5f7e66d99 100644
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -5,7 +5,6 @@ Music_Route3: ; ec2ca
 	dbw $03, Music_Route3_Ch4
 ; ec2d6
 
-
 Music_Route3_Ch1: ; ec2d6
 	stereopanning $f
 	tempo 160
@@ -47,7 +46,6 @@ Music_Route3_Ch1: ; ec2d6
 	note E_, 1
 	note F#, 1
 	note G#, 1
-
 Music_Route3_branch_ec307: ; ec307
 	callchannel Music_Route3_branch_ec3a4
 	note G_, 1
@@ -210,7 +208,6 @@ Music_Route3_branch_ec3a4: ; ec3a4
 	note E_, 1
 	note C#, 1
 	note E_, 1
-
 Music_Route3_branch_ec3b1: ; ec3b1
 	note A_, 1
 	note E_, 1
@@ -221,7 +218,6 @@ Music_Route3_branch_ec3b1: ; ec3b1
 	note E_, 1
 	note C#, 1
 	note E_, 1
-
 Music_Route3_branch_ec3bd: ; ec3bd
 	note G_, 1
 	note D_, 1
@@ -239,6 +235,7 @@ Music_Route3_branch_ec3bd: ; ec3bd
 	octave 3
 	note D_, 1
 	endchannel
+; ec3d0
 
 Music_Route3_Ch2: ; ec3d0
 	stereopanning $f0
@@ -269,7 +266,6 @@ Music_Route3_Ch2: ; ec3d0
 	note C#, 1
 	note E_, 1
 	note G#, 1
-
 Music_Route3_branch_ec3f5: ; ec3f5
 	intensity $7d
 	callchannel Music_Route3_branch_ec443
@@ -357,6 +353,7 @@ Music_Route3_branch_ec443: ; ec443
 	note G_, 6
 	note D_, 1
 	endchannel
+; ec45b
 
 Music_Route3_Ch3: ; ec45b
 	stereopanning $ff
@@ -387,7 +384,6 @@ Music_Route3_Ch3: ; ec45b
 	note __, 1
 	note G#, 2
 	callchannel Music_Route3_branch_ec4bd
-
 Music_Route3_branch_ec47f: ; ec47f
 	intensity $14
 	callchannel Music_Route3_branch_ec4bd
@@ -487,12 +483,12 @@ Music_Route3_branch_ec4ce: ; ec4ce
 	note G#, 2
 	note B_, 2
 	endchannel
+; ec4eb
 
 Music_Route3_Ch4: ; ec4eb
 	togglenoise $4
 	notetype $c
 	note __, 10
-
 Music_Route3_branch_ec4f0: ; ec4f0
 	notetype $c
 	note D_, 2
@@ -512,3 +508,5 @@ Music_Route3_branch_ec4f0: ; ec4f0
 	note C#, 1
 	loopchannel 0, Music_Route3_branch_ec4f0
 ; ec506
+
+
diff --git a/audio/music/route30.asm b/audio/music/route30.asm
index 16fabf3be..0ea33abb9 100644
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -5,7 +5,6 @@ Music_Route30: ; efc01
 	dbw $03, Music_Route30_Ch4
 ; efc0d
 
-
 Music_Route30_Ch1: ; efc0d
 	tempo 144
 	volume $77
@@ -28,7 +27,6 @@ Music_Route30_Ch1: ; efc0d
 	note D_, 2
 	intensity $4e
 	note C_, 4
-
 Music_Route30_branch_efc2e: ; efc2e
 	intensity $b6
 	note D_, 6
@@ -185,6 +183,7 @@ Music_Route30_branch_efc2e: ; efc2e
 	octave 4
 	note D_, 2
 	loopchannel 0, Music_Route30_branch_efc2e
+; efcda
 
 Music_Route30_Ch2: ; efcda
 	dutycycle $3
@@ -208,7 +207,6 @@ Music_Route30_Ch2: ; efcda
 	note E_, 1
 	note F_, 1
 	note F#, 1
-
 Music_Route30_branch_efcf6: ; efcf6
 	intensity $c7
 	note G_, 10
@@ -297,6 +295,7 @@ Music_Route30_branch_efcf6: ; efcf6
 	octave 3
 	note F#, 2
 	loopchannel 0, Music_Route30_branch_efcf6
+; efd5f
 
 Music_Route30_Ch3: ; efd5f
 	notetype $c, $27
@@ -323,7 +322,6 @@ Music_Route30_Ch3: ; efd5f
 	note __, 1
 	note G_, 1
 	note __, 1
-
 Music_Route30_branch_efd79: ; efd79
 	note G_, 1
 	note __, 1
@@ -579,13 +577,13 @@ Music_Route30_branch_efd79: ; efd79
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_Route30_branch_efd79
+; efe7a
 
 Music_Route30_Ch4: ; efe7a
 	togglenoise $3
 	notetype $c
 	callchannel Music_Route30_branch_efeb8
 	callchannel Music_Route30_branch_efec1
-
 Music_Route30_branch_efe84: ; efe84
 	callchannel Music_Route30_branch_efecd
 	callchannel Music_Route30_branch_efed7
@@ -679,3 +677,4 @@ Music_Route30_branch_efee1: ; efee1
 	notetype $c
 	endchannel
 ; efef5
+
diff --git a/audio/music/route36.asm b/audio/music/route36.asm
index cc2641724..cd605db58 100644
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -5,7 +5,6 @@ Music_Route36: ; e94e9
 	dbw $03, Music_Route36_Ch4
 ; e94f5
 
-
 Music_Route36_Ch1: ; e94f5
 	tempo 144
 	volume $77
@@ -27,7 +26,6 @@ Music_Route36_Ch1: ; e94f5
 	note A_, 1
 	intensity $5d
 	note A#, 4
-
 Music_Route36_branch_e9517: ; e9517
 	intensity $b5
 	note F_, 4
@@ -165,6 +163,7 @@ Music_Route36_branch_e9517: ; e9517
 	note D#, 2
 	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9517
+; e95af
 
 Music_Route36_Ch2: ; e95af
 	dutycycle $3
@@ -189,7 +188,6 @@ Music_Route36_Ch2: ; e95af
 	note F_, 8
 	octave 3
 	note G_, 4
-
 Music_Route36_branch_e95ce: ; e95ce
 	intensity $c7
 	octave 4
@@ -313,6 +311,7 @@ Music_Route36_branch_e95ce: ; e95ce
 	note A_, 1
 	note B_, 1
 	loopchannel 0, Music_Route36_branch_e95ce
+; e966b
 
 Music_Route36_Ch3: ; e966b
 	notetype $c, $25
@@ -338,7 +337,6 @@ Music_Route36_Ch3: ; e966b
 	octave 3
 	note D#, 2
 	note E_, 2
-
 Music_Route36_branch_e9684: ; e9684
 	note F_, 4
 	note C_, 2
@@ -470,20 +468,19 @@ Music_Route36_branch_e9684: ; e9684
 	note D#, 2
 	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9684
+; e9709
 
 Music_Route36_Ch4: ; e9709
 	togglenoise $1
 	notetype $c
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e9741
-
 Music_Route36_branch_e9713: ; e9713
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e973b
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e9741
 	loopchannel 2, Music_Route36_branch_e9713
-
 Music_Route36_branch_e9723: ; e9723
 	note A#, 4
 	note A_, 2
@@ -529,3 +526,5 @@ Music_Route36_branch_e9741: ; e9741
 	notetype $c
 	endchannel
 ; e974f
+
+
diff --git a/audio/music/route37.asm b/audio/music/route37.asm
index b786aae09..a8d40ccf8 100644
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -5,7 +5,6 @@ Music_Route37: ; ee94b
 	dbw $03, Music_Route37_Ch4
 ; ee957
 
-
 Music_Route37_Ch1: ; ee957
 	tempo 144
 	volume $77
@@ -15,7 +14,6 @@ Music_Route37_Ch1: ; ee957
 	notetype $c, $b3
 	note __, 16
 	note __, 16
-
 Music_Route37_branch_ee969: ; ee969
 	intensity $b3
 	note __, 2
@@ -70,7 +68,6 @@ Music_Route37_branch_ee969: ; ee969
 	note E_, 2
 	note D#, 4
 	stereopanning $f
-
 Music_Route37_branch_ee9a5: ; ee9a5
 	callchannel Music_Route37_branch_ee9da
 	octave 3
@@ -132,6 +129,7 @@ Music_Route37_branch_ee9e9: ; ee9e9
 	note B_, 2
 	intensity $b7
 	endchannel
+; ee9f8
 
 Music_Route37_Ch2: ; ee9f8
 	dutycycle $3
@@ -164,7 +162,6 @@ Music_Route37_Ch2: ; ee9f8
 	note B_, 1
 	intensity $c2
 	note B_, 2
-
 Music_Route37_branch_eea24: ; eea24
 	callchannel Music_Route37_branch_eeab7
 	intensity $c6
@@ -292,17 +289,16 @@ Music_Route37_branch_eeab7: ; eeab7
 	note F#, 2
 	note B_, 2
 	endchannel
+; eeac7
 
 Music_Route37_Ch3: ; eeac7
 	stereopanning $f0
 	notetype $c, $14
-
 Music_Route37_branch_eeacc: ; eeacc
 	octave 2
 	note F#, 2
 	note __, 6
 	loopchannel 4, Music_Route37_branch_eeacc
-
 Music_Route37_branch_eead3: ; eead3
 	callchannel Music_Route37_branch_eeb32
 	note A_, 2
@@ -315,7 +311,6 @@ Music_Route37_branch_eead3: ; eead3
 	note A_, 2
 	note F#, 2
 	note E_, 2
-
 Music_Route37_branch_eeae0: ; eeae0
 	note D#, 2
 	note F#, 2
@@ -335,14 +330,12 @@ Music_Route37_branch_eeae0: ; eeae0
 	octave 2
 	note A_, 2
 	callchannel Music_Route37_branch_eeb32
-
 Music_Route37_branch_eeafb: ; eeafb
 	octave 2
 	note B_, 2
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_Route37_branch_eeafb
-
 Music_Route37_branch_eeb03: ; eeb03
 	octave 2
 	note A_, 2
@@ -352,14 +345,12 @@ Music_Route37_branch_eeb03: ; eeb03
 	note E_, 2
 	note C#, 2
 	callchannel Music_Route37_branch_eeb3c
-
 Music_Route37_branch_eeb10: ; eeb10
 	octave 2
 	note B_, 2
 	octave 3
 	note F#, 2
 	loopchannel 4, Music_Route37_branch_eeb10
-
 Music_Route37_branch_eeb18: ; eeb18
 	octave 2
 	note A_, 2
@@ -370,7 +361,6 @@ Music_Route37_branch_eeb18: ; eeb18
 	note C#, 2
 	callchannel Music_Route37_branch_eeb3c
 	callchannel Music_Route37_branch_eeb32
-
 Music_Route37_branch_eeb28: ; eeb28
 	note F#, 2
 	note __, 6
@@ -409,11 +399,11 @@ Music_Route37_branch_eeb3c: ; eeb3c
 	octave 3
 	note D#, 2
 	endchannel
+; eeb4d
 
 Music_Route37_Ch4: ; eeb4d
 	stereopanning $f
 	togglenoise $0
-
 Music_Route37_branch_eeb51: ; eeb51
 	notetype $c
 	callchannel Music_Route37_branch_eeb6b
@@ -446,3 +436,5 @@ Music_Route37_branch_eeb6b: ; eeb6b
 	note D#, 1
 	endchannel
 ; eeb75
+
+
diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm
index 45f40b67c..615211260 100644
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@@ -4,7 +4,6 @@ Music_RuinsOfAlphInterior: ; ebd9e
 	dbw $02, Music_RuinsOfAlphInterior_Ch3
 ; ebda7
 
-
 Music_RuinsOfAlphInterior_Ch1: ; ebda7
 	tempo 224
 	volume $77
@@ -20,7 +19,6 @@ Music_RuinsOfAlphInterior_Ch2: ; ebdb8
 	dutycycle $0
 	stereopanning $f
 	notetype $c, $a4
-
 Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
 	octave 4
 	note C_, 4
@@ -37,10 +35,10 @@ Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
 	octave 3
 	note A#, 4
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
+; ebdd4
 
 Music_RuinsOfAlphInterior_Ch3: ; ebdd4
 	notetype $c, $10
-
 Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
 	octave 2
 	note G#, 2
@@ -50,3 +48,5 @@ Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
 	note __, 10
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
 ; ebde1
+
+
diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm
index 992e77719..a9676b603 100644
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -4,7 +4,6 @@ Music_RuinsOfAlphRadio: ; eedcb
 	dbw $02, Music_RuinsOfAlphRadio_Ch3
 ; eedd4
 
-
 Music_RuinsOfAlphRadio_Ch1: ; eedd4
 	tempo 160
 	volume $77
@@ -12,7 +11,6 @@ Music_RuinsOfAlphRadio_Ch1: ; eedd4
 	tone $0118
 	vibrato $0, $f0
 	stereopanning $f0
-
 Music_RuinsOfAlphRadio_branch_eede3: ; eede3
 	notetype $6, $71
 	callchannel Music_RuinsOfAlphRadio_branch_eee01
@@ -50,11 +48,11 @@ Music_RuinsOfAlphRadio_branch_eee08: ; eee08
 	octave 5
 	note C_, 8
 	endchannel
+; eee12
 
 Music_RuinsOfAlphRadio_Ch2: ; eee12
 	dutycycle $1
 	vibrato $1, $e0
-
 Music_RuinsOfAlphRadio_branch_eee17: ; eee17
 	stereopanning $f
 	notetype $6, $81
@@ -67,10 +65,10 @@ Music_RuinsOfAlphRadio_branch_eee17: ; eee17
 	notetype $c, $a1
 	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17
+; eee32
 
 Music_RuinsOfAlphRadio_Ch3: ; eee32
 	notetype $6, $26
-
 Music_RuinsOfAlphRadio_branch_eee35: ; eee35
 	octave 2
 	note C_, 1
@@ -79,3 +77,5 @@ Music_RuinsOfAlphRadio_branch_eee35: ; eee35
 	note __, 16
 	loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35
 ; eee3e
+
+
diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm
index 2a6211dc1..a0fc13fbc 100644
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -5,7 +5,6 @@ Music_ShowMeAround: ; edbd8
 	dbw $03, Music_ShowMeAround_Ch4
 ; edbe4
 
-
 Music_ShowMeAround_Ch1: ; edbe4
 	tempo 144
 	volume $77
@@ -29,7 +28,6 @@ Music_ShowMeAround_Ch1: ; edbe4
 	note D_, 1
 	note E_, 1
 	note G#, 8
-
 Music_ShowMeAround_branch_edc01: ; edc01
 	note __, 16
 	note __, 16
@@ -88,7 +86,6 @@ Music_ShowMeAround_Ch2: ; edc2a
 	note D_, 1
 	note E_, 8
 	dutycycle $1
-
 Music_ShowMeAround_branch_edc44: ; edc44
 	callchannel Music_ShowMeAround_branch_edc98
 	callchannel Music_ShowMeAround_branch_edc98
@@ -185,6 +182,7 @@ Music_ShowMeAround_branch_edc98: ; edc98
 	note B_, 1
 	note __, 1
 	endchannel
+; edca9
 
 Music_ShowMeAround_Ch3: ; edca9
 	stereopanning $f0
@@ -228,7 +226,6 @@ Music_ShowMeAround_Ch3: ; edca9
 	note F_, 1
 	note E_, 2
 	intensity $14
-
 Music_ShowMeAround_branch_edcd9: ; edcd9
 	callchannel Music_ShowMeAround_branch_edcef
 	callchannel Music_ShowMeAround_branch_edcef
@@ -308,6 +305,7 @@ Music_ShowMeAround_branch_edd0f: ; edd0f
 	note A_, 2
 	note __, 6
 	endchannel
+; edd30
 
 Music_ShowMeAround_Ch4: ; edd30
 	togglenoise $3
@@ -317,7 +315,6 @@ Music_ShowMeAround_Ch4: ; edd30
 	note D_, 2
 	note D#, 2
 	note F#, 4
-
 Music_ShowMeAround_branch_edd39: ; edd39
 	callchannel Music_ShowMeAround_branch_edd4f
 	callchannel Music_ShowMeAround_branch_edd4f
@@ -363,3 +360,5 @@ Music_ShowMeAround_branch_edd5e: ; edd5e
 	note F#, 2
 	endchannel
 ; edd6d
+
+
diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm
index 56b444175..b587ad044 100644
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -5,7 +5,6 @@ Music_SproutTower: ; f6974
 	dbw $03, Music_SproutTower_Ch4
 ; f6980
 
-
 Music_SproutTower_Ch1: ; f6980
 	tempo 176
 	volume $77
@@ -16,7 +15,6 @@ Music_SproutTower_Ch1: ; f6980
 	notetype $c, $a3
 	note __, 16
 	note __, 16
-
 Music_SproutTower_branch_f6994: ; f6994
 	note __, 6
 	octave 3
@@ -63,6 +61,7 @@ Music_SproutTower_branch_f6994: ; f6994
 	note D#, 4
 	note D#, 4
 	loopchannel 0, Music_SproutTower_branch_f6994
+; f69c8
 
 Music_SproutTower_Ch2: ; f69c8
 	dutycycle $3
@@ -78,7 +77,6 @@ Music_SproutTower_Ch2: ; f69c8
 	note F_, 4
 	note D#, 4
 	note D#, 4
-
 Music_SproutTower_branch_f69dc: ; f69dc
 	intensity $b5
 	octave 4
@@ -141,6 +139,7 @@ Music_SproutTower_branch_f69dc: ; f69dc
 	note C_, 16
 	note __, 16
 	loopchannel 0, Music_SproutTower_branch_f69dc
+; f6a25
 
 Music_SproutTower_Ch3: ; f6a25
 	vibrato $14, $e8
@@ -163,7 +162,6 @@ Music_SproutTower_Ch3: ; f6a25
 	note __, 2
 	note F#, 2
 	stereopanning $f0
-
 Music_SproutTower_branch_f6a3e: ; f6a3e
 	note __, 4
 	note C_, 2
@@ -222,12 +220,12 @@ Music_SproutTower_branch_f6a3e: ; f6a3e
 	note __, 2
 	note F_, 2
 	loopchannel 0, Music_SproutTower_branch_f6a3e
+; f6a7a
 
 Music_SproutTower_Ch4: ; f6a7a
 	togglenoise $0
 	notetype $c
 	note __, 4
-
 Music_SproutTower_branch_f6a7f: ; f6a7f
 	note F#, 4
 	stereopanning $f0
@@ -247,3 +245,5 @@ Music_SproutTower_branch_f6a7f: ; f6a7f
 	note F#, 4
 	loopchannel 0, Music_SproutTower_branch_f6a7f
 ; f6a99
+
+
diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm
index 33560cd3a..ae10d6395 100644
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -5,7 +5,6 @@ Music_SSAqua: ; ead99
 	dbw $03, Music_SSAqua_Ch4
 ; eada5
 
-
 Music_SSAqua_Ch1: ; eada5
 	tempo 117
 	volume $77
@@ -19,7 +18,6 @@ Music_SSAqua_Ch1: ; eada5
 	note __, 1
 	note G_, 1
 	note __, 1
-
 Music_SSAqua_branch_eadbc: ; eadbc
 	octave 2
 	note G_, 16
@@ -258,7 +256,6 @@ Music_SSAqua_Ch2: ; eaeca
 	vibrato $8, $33
 	notetype $c, $b7
 	note __, 2
-
 Music_SSAqua_branch_eaed5: ; eaed5
 	notetype $c, $b7
 	dutycycle $1
@@ -610,6 +607,7 @@ Music_SSAqua_branch_eb03e: ; eb03e
 	octave 3
 	note G_, 1
 	endchannel
+; eb056
 
 Music_SSAqua_Ch3: ; eb056
 	stereopanning $ff
@@ -620,7 +618,6 @@ Music_SSAqua_Ch3: ; eb056
 	note __, 1
 	note G_, 1
 	note __, 1
-
 Music_SSAqua_branch_eb063: ; eb063
 	note G_, 16
 	note __, 8
@@ -654,7 +651,6 @@ Music_SSAqua_branch_eb063: ; eb063
 	note E_, 1
 	callchannel Music_SSAqua_branch_eb14d
 	callchannel Music_SSAqua_branch_eb14d
-
 Music_SSAqua_branch_eb08d: ; eb08d
 	note G_, 2
 	note __, 2
@@ -1093,12 +1089,12 @@ Music_SSAqua_branch_eb230: ; eb230
 	note D#, 1
 	note __, 3
 	endchannel
+; eb249
 
 Music_SSAqua_Ch4: ; eb249
 	togglenoise $3
 	notetype $c
 	note __, 2
-
 Music_SSAqua_branch_eb24e: ; eb24e
 	note G#, 1
 	note G_, 1
@@ -1189,3 +1185,5 @@ Music_SSAqua_branch_eb2c7: ; eb2c7
 	note C_, 2
 	endchannel
 ; eb2d3
+
+
diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm
index 954416ee7..61ccc3eb9 100644
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@@ -4,7 +4,6 @@ Music_SuccessfulCapture: ; f4602
 	dbw $02, Music_SuccessfulCapture_Ch3
 ; f460b
 
-
 Music_SuccessfulCapture_Ch1: ; f460b
 	tempo 126
 	volume $77
@@ -12,14 +11,18 @@ Music_SuccessfulCapture_Ch1: ; f460b
 	tone $0001
 	notetype $c, $a1
 	jumpchannel Music_SuccessfulCapture_branch_f4536
+; f461b
 
 Music_SuccessfulCapture_Ch2: ; f461b
 	vibrato $12, $24
 	notetype $c, $c1
 	dutycycle $2
 	jumpchannel Music_SuccessfulCapture_branch_f4585
+; f4626
 
 Music_SuccessfulCapture_Ch3: ; f4626
 	notetype $c, $25
 	jumpchannel Music_SuccessfulCapture_branch_f45cf
 ; f462c
+
+
diff --git a/audio/music/suicunebattle.asm b/audio/music/suicunebattle.asm
index 26e1814d8..0c0dbb585 100644
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@@ -4,7 +4,6 @@ Music_SuicuneBattle: ; 178b81
 	dbw $02, Music_SuicuneBattle_Ch3
 ; 178b8a
 
-
 Music_SuicuneBattle_Ch1: ; 178b8a
 	tempo 101
 	volume $77
@@ -96,7 +95,6 @@ Music_SuicuneBattle_Ch1: ; 178b8a
 	octave 3
 	note E_, 1
 	note G#, 1
-
 Music_SuicuneBattle_branch_178bfc: ; 178bfc
 	notetype $c, $b4
 	octave 2
@@ -513,6 +511,7 @@ Music_SuicuneBattle_branch_178bfc: ; 178bfc
 	vibrato $12, $15
 	dutycycle $3
 	loopchannel 0, Music_SuicuneBattle_branch_178bfc
+; 178dec
 
 Music_SuicuneBattle_Ch2: ; 178dec
 	dutycycle $3
@@ -592,7 +591,6 @@ Music_SuicuneBattle_Ch2: ; 178dec
 	note E_, 8
 	note E_, 8
 	note E_, 4
-
 Music_SuicuneBattle_branch_178e4e: ; 178e4e
 	notetype $c, $c7
 	octave 3
@@ -1189,6 +1187,7 @@ Music_SuicuneBattle_branch_178e4e: ; 178e4e
 	note A_, 2
 	note B_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_178e4e
+; 179122
 
 Music_SuicuneBattle_Ch3: ; 179122
 	notetype $c, $18
@@ -1283,7 +1282,6 @@ Music_SuicuneBattle_Ch3: ; 179122
 	note D_, 2
 	note E_, 2
 	notetype $c, $16
-
 Music_SuicuneBattle_branch_179182: ; 179182
 	octave 1
 	note A_, 2
@@ -2060,3 +2058,5 @@ Music_SuicuneBattle_branch_179182: ; 179182
 	note E_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_179182
 ; 17948b
+
+
diff --git a/audio/music/surf.asm b/audio/music/surf.asm
index cc7a4ecd8..2d8d3fa1f 100644
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -4,14 +4,15 @@ Music_Surf: ; f518a
 	dbw $02, Music_Surf_Ch3
 ; f5193
 
+
 INCBIN "baserom.gbc", $f5193, $f5194 - $f5193
 
+
 Music_Surf_Ch1: ; f5194
 	tempo 108
 	volume $77
 	notetype $c, $a7
 	stereopanning $f
-
 Music_Surf_branch_f519e: ; f519e
 	dutycycle $2
 	vibrato $10, $24
@@ -342,15 +343,14 @@ Music_Surf_branch_f52d9: ; f52d9
 	octave 2
 	note B_, 8
 	endchannel
+; f5317
 
 Music_Surf_Ch2: ; f5317
-
 Music_Surf_branch_f5317: ; f5317
 	notetype $c, $c2
 	stereopanning $f0
 	dutycycle $2
 	vibrato $14, $23
-
 Music_Surf_branch_f5321: ; f5321
 	octave 1
 	note A#, 4
@@ -367,7 +367,6 @@ Music_Surf_branch_f5321: ; f5321
 	note __, 3
 	note A#, 1
 	note __, 3
-
 Music_Surf_branch_f5333: ; f5333
 	note D#, 4
 	note G_, 2
@@ -554,9 +553,9 @@ Music_Surf_branch_f5404: ; f5404
 	note G#, 8
 	note D#, 8
 	endchannel
+; f540c
 
 Music_Surf_Ch3: ; f540c
-
 Music_Surf_branch_f540c: ; f540c
 	stereopanning $ff
 	notetype $c, $15
@@ -736,3 +735,5 @@ Music_Surf_branch_f54c8: ; f54c8
 	note __, 3
 	endchannel
 ; f54e8
+
+
diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm
index 6437beb43..e9dd5c314 100644
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -5,14 +5,12 @@ Music_TinTower: ; f6811
 	dbw $03, Music_TinTower_Ch4
 ; f681d
 
-
 Music_TinTower_Ch1: ; f681d
 	tempo 208
 	volume $77
 	dutycycle $3
 	tone $0004
 	vibrato $8, $45
-
 Music_TinTower_branch_f682a: ; f682a
 	stereopanning $f0
 	notetype $c, $a5
@@ -97,15 +95,14 @@ Music_TinTower_branch_f682a: ; f682a
 	octave 3
 	note A#, 4
 	loopchannel 0, Music_TinTower_branch_f682a
+; f688b
 
 Music_TinTower_Ch2: ; f688b
 	dutycycle $3
 	tone $0002
 	vibrato $18, $44
-
 Music_TinTower_branch_f6893: ; f6893
 	stereopanning $ff
-
 Music_TinTower_branch_f6895: ; f6895
 	notetype $c, $b5
 	octave 4
@@ -188,10 +185,10 @@ Music_TinTower_branch_f6895: ; f6895
 	intensity $95
 	note C#, 2
 	loopchannel 0, Music_TinTower_branch_f6893
+; f68f8
 
 Music_TinTower_Ch3: ; f68f8
 	notetype $c, $14
-
 Music_TinTower_branch_f68fb: ; f68fb
 	note __, 16
 	note __, 16
@@ -263,11 +260,11 @@ Music_TinTower_branch_f68fb: ; f68fb
 	note __, 11
 	stereopanning $ff
 	loopchannel 0, Music_TinTower_branch_f68fb
+; f6948
 
 Music_TinTower_Ch4: ; f6948
 	togglenoise $0
 	notetype $c
-
 Music_TinTower_branch_f694c: ; f694c
 	stereopanning $f
 	note G_, 2
@@ -297,3 +294,5 @@ Music_TinTower_branch_f694c: ; f694c
 	note F_, 2
 	loopchannel 0, Music_TinTower_branch_f694c
 ; f6974
+
+
diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm
index a388066ef..20bf6b428 100644
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -5,7 +5,6 @@ Music_TitleScreen: ; eb808
 	dbw $03, Music_TitleScreen_Ch4
 ; eb814
 
-
 Music_TitleScreen_Ch1: ; eb814
 	tempo 134
 	volume $77
@@ -278,7 +277,6 @@ Music_TitleScreen_Ch1: ; eb814
 Music_TitleScreen_branch_eb96d: ; eb96d
 	notetype $c, $c3
 	note D_, 1
-
 Music_TitleScreen_branch_eb971: ; eb971
 	note __, 1
 	octave 2
@@ -294,6 +292,7 @@ Music_TitleScreen_branch_eb971: ; eb971
 	note A_, 1
 	notetype $8, $b7
 	endchannel
+; eb984
 
 Music_TitleScreen_Ch2: ; eb984
 	dutycycle $3
@@ -562,7 +561,6 @@ Music_TitleScreen_Ch2: ; eb984
 Music_TitleScreen_branch_ebae7: ; ebae7
 	notetype $c, $b2
 	note D_, 1
-
 Music_TitleScreen_branch_ebaeb: ; ebaeb
 	octave 3
 	note A_, 1
@@ -581,6 +579,7 @@ Music_TitleScreen_branch_ebaeb: ; ebaeb
 	note C_, 4
 	note C_, 4
 	endchannel
+; ebb01
 
 Music_TitleScreen_Ch3: ; ebb01
 	stereopanning $f
@@ -897,6 +896,7 @@ Music_TitleScreen_Ch3: ; ebb01
 	note G_, 1
 	note __, 11
 	endchannel
+; ebc5c
 
 Music_TitleScreen_Ch4: ; ebc5c
 	togglenoise $5
@@ -1081,7 +1081,6 @@ Music_TitleScreen_Ch4: ; ebc5c
 	note C#, 1
 	notetype $c
 	note G#, 16
-
 Music_TitleScreen_branch_ebd40: ; ebd40
 	note __, 16
 	loopchannel 6, Music_TitleScreen_branch_ebd40
@@ -1178,3 +1177,5 @@ Music_TitleScreen_branch_ebd93: ; ebd93
 	note C_, 4
 	endchannel
 ; ebd9e
+
+
diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm
index 8d267a346..5cea28fcd 100644
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@@ -4,7 +4,6 @@ Music_TrainerVictory: ; ebeab
 	dbw $02, Music_TrainerVictory_Ch3
 ; ebeb4
 
-
 Music_TrainerVictory_Ch1: ; ebeb4
 	tempo 120
 	volume $77
@@ -21,7 +20,6 @@ Music_TrainerVictory_Ch1: ; ebeb4
 	intensity $b6
 	note A_, 12
 	stereopanning $f
-
 Music_TrainerVictory_branch_ebecd: ; ebecd
 	intensity $72
 	callchannel Music_TrainerVictory_branch_ebf11
@@ -50,7 +48,6 @@ Music_TrainerVictory_branch_ebecd: ; ebecd
 	note __, 2
 	note G_, 2
 	note A#, 6
-
 Music_TrainerVictory_branch_ebef2: ; ebef2
 	intensity $72
 	octave 4
@@ -63,7 +60,6 @@ Music_TrainerVictory_branch_ebef2: ; ebef2
 	note A_, 2
 	octave 4
 	note D_, 2
-
 Music_TrainerVictory_branch_ebf01: ; ebf01
 	octave 4
 	note C#, 2
@@ -88,6 +84,7 @@ Music_TrainerVictory_branch_ebf11: ; ebf11
 	note E_, 2
 	note G_, 6
 	endchannel
+; ebf1b
 
 Music_TrainerVictory_Ch2: ; ebf1b
 	vibrato $12, $34
@@ -104,7 +101,6 @@ Music_TrainerVictory_Ch2: ; ebf1b
 	intensity $d6
 	note D_, 12
 	stereopanning $f0
-
 Music_TrainerVictory_branch_ebf30: ; ebf30
 	notetype $8, $82
 	callchannel Music_TrainerVictory_branch_ebf56
@@ -147,6 +143,7 @@ Music_TrainerVictory_branch_ebf56: ; ebf56
 	octave 4
 	note E_, 6
 	endchannel
+; ebf64
 
 Music_TrainerVictory_Ch3: ; ebf64
 	notetype $8, $25
@@ -163,7 +160,6 @@ Music_TrainerVictory_Ch3: ; ebf64
 	note C#, 2
 	octave 2
 	note B_, 2
-
 Music_TrainerVictory_branch_ebf74: ; ebf74
 	callchannel Music_TrainerVictory_branch_ebfb1
 	octave 3
@@ -238,3 +234,4 @@ Music_TrainerVictory_branch_ebfb1: ; ebfb1
 	note B_, 2
 	endchannel
 ; ebfc3
+
diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm
index cefe75d9b..f08926b12 100644
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -5,7 +5,6 @@ Music_UnionCave: ; f5c60
 	dbw $03, Music_UnionCave_Ch4
 ; f5c6c
 
-
 Music_UnionCave_Ch1: ; f5c6c
 	tempo 160
 	volume $77
@@ -13,14 +12,11 @@ Music_UnionCave_Ch1: ; f5c6c
 	tone $0002
 	vibrato $18, $34
 	stereopanning $f
-
 Music_UnionCave_branch_f5c7b: ; f5c7b
 	notetype $c, $b3
-
 Music_UnionCave_branch_f5c7e: ; f5c7e
 	callchannel Music_UnionCave_branch_f5ccf
 	loopchannel 4, Music_UnionCave_branch_f5c7e
-
 Music_UnionCave_branch_f5c85: ; f5c85
 	octave 2
 	note G#, 2
@@ -31,7 +27,6 @@ Music_UnionCave_branch_f5c85: ; f5c85
 	note E_, 2
 	note F_, 4
 	loopchannel 8, Music_UnionCave_branch_f5c85
-
 Music_UnionCave_branch_f5c91: ; f5c91
 	octave 2
 	note A_, 2
@@ -78,11 +73,11 @@ Music_UnionCave_branch_f5ccf: ; f5ccf
 	note C#, 2
 	note E_, 12
 	endchannel
+; f5cd5
 
 Music_UnionCave_Ch2: ; f5cd5
 	dutycycle $3
 	vibrato $8, $24
-
 Music_UnionCave_branch_f5cda: ; f5cda
 	notetype $c, $c4
 	callchannel Music_UnionCave_branch_f5d34
@@ -182,18 +177,17 @@ Music_UnionCave_branch_f5d52: ; f5d52
 	note C#, 2
 	note E_, 12
 	endchannel
+; f5d58
 
 Music_UnionCave_Ch3: ; f5d58
 	notetype $c, $16
 	stereopanning $f0
-
 Music_UnionCave_branch_f5d5d: ; f5d5d
 	note __, 16
 	loopchannel 7, Music_UnionCave_branch_f5d5d
 	note __, 14
 	octave 4
 	note C_, 2
-
 Music_UnionCave_branch_f5d65: ; f5d65
 	note __, 2
 	octave 3
@@ -206,7 +200,6 @@ Music_UnionCave_branch_f5d65: ; f5d65
 	octave 4
 	note C_, 2
 	loopchannel 4, Music_UnionCave_branch_f5d65
-
 Music_UnionCave_branch_f5d73: ; f5d73
 	note __, 2
 	octave 3
@@ -231,7 +224,6 @@ Music_UnionCave_branch_f5d73: ; f5d73
 	octave 3
 	note B_, 8
 	note A#, 8
-
 Music_UnionCave_branch_f5d8d: ; f5d8d
 	note A_, 4
 	note G_, 4
@@ -245,16 +237,15 @@ Music_UnionCave_branch_f5d8d: ; f5d8d
 	note A_, 4
 	note G_, 4
 	note A#, 8
-
 Music_UnionCave_branch_f5d9c: ; f5d9c
 	note __, 16
 	loopchannel 4, Music_UnionCave_branch_f5d9c
 	loopchannel 0, Music_UnionCave_branch_f5d5d
+; f5da5
 
 Music_UnionCave_Ch4: ; f5da5
 	togglenoise $1
 	notetype $c
-
 Music_UnionCave_branch_f5da9: ; f5da9
 	stereopanning $f0
 	note E_, 4
@@ -273,4 +264,8 @@ Music_UnionCave_branch_f5da9: ; f5da9
 	loopchannel 0, Music_UnionCave_branch_f5da9
 ; f5dc1
 
+
 INCBIN "baserom.gbc", $f5dc1, $f5dc5 - $f5dc1
+
+
+
diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm
index 46593e7ce..705c8a3ab 100644
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -4,8 +4,10 @@ Music_VermilionCity: ; eb676
 	dbw $02, Music_VermilionCity_Ch3
 ; eb67f
 
+
 INCBIN "baserom.gbc", $eb67f, $eb680 - $eb67f
 
+
 Music_VermilionCity_Ch1: ; eb680
 	stereopanning $f
 	tempo 176
@@ -30,7 +32,6 @@ Music_VermilionCity_Ch1: ; eb680
 	octave 5
 	note D_, 1
 	vibrato $10, $23
-
 Music_VermilionCity_branch_eb6a0: ; eb6a0
 	dutycycle $1
 	notetype $c, $85
@@ -141,6 +142,7 @@ Music_VermilionCity_branch_eb70c: ; eb70c
 	note B_, 2
 	note G#, 2
 	endchannel
+; eb721
 
 Music_VermilionCity_Ch2: ; eb721
 	stereopanning $ff
@@ -157,7 +159,6 @@ Music_VermilionCity_Ch2: ; eb721
 	note E_, 4
 	note F#, 4
 	note G#, 4
-
 Music_VermilionCity_branch_eb735: ; eb735
 	notetype $c, $97
 	callchannel Music_VermilionCity_branch_eb768
@@ -227,6 +228,7 @@ Music_VermilionCity_branch_eb77e: ; eb77e
 	note F#, 4
 	note E_, 4
 	endchannel
+; eb785
 
 Music_VermilionCity_Ch3: ; eb785
 	stereopanning $f0
@@ -249,7 +251,6 @@ Music_VermilionCity_Ch3: ; eb785
 	note D_, 1
 	octave 2
 	note B_, 1
-
 Music_VermilionCity_branch_eb79e: ; eb79e
 	notetype $c, $22
 	callchannel Music_VermilionCity_branch_eb7de
@@ -347,3 +348,5 @@ Music_VermilionCity_branch_eb7f5: ; eb7f5
 	note C#, 1
 	endchannel
 ; eb808
+
+
diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm
index 59773d378..babb91de1 100644
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -5,7 +5,6 @@ Music_VictoryRoad: ; f6c72
 	dbw $03, Music_VictoryRoad_Ch4
 ; f6c7e
 
-
 Music_VictoryRoad_Ch1: ; f6c7e
 	tempo 144
 	volume $77
@@ -13,11 +12,9 @@ Music_VictoryRoad_Ch1: ; f6c7e
 	dutycycle $3
 	tone $0002
 	notetype $c, $b3
-
 Music_VictoryRoad_branch_f6c8d: ; f6c8d
 	callchannel Music_VictoryRoad_branch_f6cb9
 	loopchannel 6, Music_VictoryRoad_branch_f6c8d
-
 Music_VictoryRoad_branch_f6c94: ; f6c94
 	intensity $b2
 	octave 2
@@ -40,7 +37,6 @@ Music_VictoryRoad_branch_f6c94: ; f6c94
 	octave 3
 	note G#, 3
 	loopchannel 2, Music_VictoryRoad_branch_f6c94
-
 Music_VictoryRoad_branch_f6cae: ; f6cae
 	callchannel Music_VictoryRoad_branch_f6cb9
 	loopchannel 2, Music_VictoryRoad_branch_f6cae
@@ -67,11 +63,11 @@ Music_VictoryRoad_branch_f6cb9: ; f6cb9
 	octave 3
 	note F#, 3
 	endchannel
+; f6cce
 
 Music_VictoryRoad_Ch2: ; f6cce
 	dutycycle $3
 	vibrato $10, $24
-
 Music_VictoryRoad_branch_f6cd3: ; f6cd3
 	notetype $c, $c2
 	callchannel Music_VictoryRoad_branch_f6d1e
@@ -140,15 +136,14 @@ Music_VictoryRoad_branch_f6d1e: ; f6d1e
 	note A_, 1
 	note A_, 1
 	endchannel
+; f6d2c
 
 Music_VictoryRoad_Ch3: ; f6d2c
 	stereopanning $f0
 	notetype $c, $28
-
 Music_VictoryRoad_branch_f6d31: ; f6d31
 	callchannel Music_VictoryRoad_branch_f6d52
 	loopchannel 6, Music_VictoryRoad_branch_f6d31
-
 Music_VictoryRoad_branch_f6d38: ; f6d38
 	note D_, 1
 	note __, 1
@@ -162,7 +157,6 @@ Music_VictoryRoad_branch_f6d38: ; f6d38
 	note D_, 1
 	note B_, 3
 	loopchannel 2, Music_VictoryRoad_branch_f6d38
-
 Music_VictoryRoad_branch_f6d47: ; f6d47
 	callchannel Music_VictoryRoad_branch_f6d52
 	loopchannel 2, Music_VictoryRoad_branch_f6d47
@@ -183,11 +177,11 @@ Music_VictoryRoad_branch_f6d52: ; f6d52
 	note C_, 1
 	note A_, 3
 	endchannel
+; f6d5f
 
 Music_VictoryRoad_Ch4: ; f6d5f
 	togglenoise $0
 	notetype $c
-
 Music_VictoryRoad_branch_f6d63: ; f6d63
 	note D_, 2
 	note D_, 2
@@ -209,3 +203,5 @@ Music_VictoryRoad_branch_f6d63: ; f6d63
 	note D#, 1
 	loopchannel 0, Music_VictoryRoad_branch_f6d63
 ; f6d79
+
+
diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm
index 017dbf0a4..c8580a2ab 100644
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -5,7 +5,6 @@ Music_VioletCity: ; f0000
 	dbw $03, Music_VioletCity_Ch4
 ; f000c
 
-
 Music_VioletCity_Ch1: ; f000c
 	tempo 164
 	volume $77
@@ -66,7 +65,6 @@ Music_VioletCity_Ch1: ; f000c
 	octave 3
 	note C#, 12
 	note __, 8
-
 Music_VioletCity_branch_f0056: ; f0056
 	notetype $6, $95
 	note __, 4
@@ -298,6 +296,7 @@ Music_VioletCity_branch_f0056: ; f0056
 	note C#, 4
 	note __, 4
 	loopchannel 0, Music_VioletCity_branch_f0056
+; f0162
 
 Music_VioletCity_Ch2: ; f0162
 	vibrato $12, $24
@@ -350,7 +349,6 @@ Music_VioletCity_Ch2: ; f0162
 	note __, 2
 	note D#, 1
 	note E_, 1
-
 Music_VioletCity_branch_f0199: ; f0199
 	intensity $b7
 	note F#, 4
@@ -505,6 +503,7 @@ Music_VioletCity_branch_f0199: ; f0199
 	note D#, 1
 	note E_, 1
 	loopchannel 0, Music_VioletCity_branch_f0199
+; f0247
 
 Music_VioletCity_Ch3: ; f0247
 	notetype $c, $25
@@ -531,7 +530,6 @@ Music_VioletCity_Ch3: ; f0247
 	note F#, 2
 	octave 2
 	note A#, 2
-
 Music_VioletCity_branch_f0261: ; f0261
 	notetype $c, $25
 	note B_, 1
@@ -710,6 +708,7 @@ Music_VioletCity_branch_f0311: ; f0311
 	octave 2
 	note A_, 4
 	endchannel
+; f031e
 
 Music_VioletCity_Ch4: ; f031e
 	togglenoise $3
@@ -730,7 +729,6 @@ Music_VioletCity_Ch4: ; f031e
 	note D_, 2
 	note C_, 8
 	note D#, 2
-
 Music_VioletCity_branch_f0338: ; f0338
 	callchannel Music_VioletCity_branch_f037a
 	callchannel Music_VioletCity_branch_f037a
@@ -782,3 +780,5 @@ Music_VioletCity_branch_f037a: ; f037a
 	note D#, 2
 	endchannel
 ; f0386
+
+
diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm
index 81d635fe8..82236a5f5 100644
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -5,7 +5,6 @@ Music_ViridianCity: ; f4000
 	dbw $03, Music_ViridianCity_Ch4
 ; f400c
 
-
 Music_ViridianCity_Ch1: ; f400c
 	tempo 157
 	volume $77
@@ -43,7 +42,6 @@ Music_ViridianCity_Ch1: ; f400c
 	note __, 4
 	note G_, 8
 	note __, 4
-
 Music_ViridianCity_branch_f4039: ; f4039
 	callchannel Music_ViridianCity_branch_f40c5
 	note __, 4
@@ -274,6 +272,7 @@ Music_ViridianCity_branch_f410f: ; f410f
 	note G_, 1
 	note __, 1
 	endchannel
+; f4125
 
 Music_ViridianCity_Ch2: ; f4125
 	vibrato $10, $46
@@ -309,7 +308,6 @@ Music_ViridianCity_Ch2: ; f4125
 	note __, 4
 	note E_, 8
 	note __, 4
-
 Music_ViridianCity_branch_f414c: ; f414c
 	callchannel Music_ViridianCity_branch_f41c0
 	note __, 4
@@ -514,6 +512,7 @@ Music_ViridianCity_branch_f4215: ; f4215
 	note D_, 2
 	note D#, 2
 	endchannel
+; f421e
 
 Music_ViridianCity_Ch3: ; f421e
 	vibrato $12, $24
@@ -551,7 +550,6 @@ Music_ViridianCity_Ch3: ; f421e
 	note D_, 8
 	note F#, 2
 	note G_, 2
-
 Music_ViridianCity_branch_f4246: ; f4246
 	intensity $13
 	callchannel Music_ViridianCity_branch_f42a2
@@ -698,13 +696,13 @@ Music_ViridianCity_branch_f42a2: ; f42a2
 	note __, 4
 	note D_, 8
 	endchannel
+; f42df
 
 Music_ViridianCity_Ch4: ; f42df
 	togglenoise $3
 	notetype $c
 	callchannel Music_ViridianCity_branch_f431d
 	callchannel Music_ViridianCity_branch_f432c
-
 Music_ViridianCity_branch_f42e9: ; f42e9
 	callchannel Music_ViridianCity_branch_f431d
 	callchannel Music_ViridianCity_branch_f431d
@@ -798,3 +796,5 @@ Music_ViridianCity_branch_f434b: ; f434b
 	note F#, 2
 	endchannel
 ; f435b
+
+
diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm
index c7d42107c..10b52e90b 100644
--- a/audio/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
@@ -4,7 +4,6 @@ Music_WildPokemonVictory: ; f4518
 	dbw $02, Music_WildPokemonVictory_Ch3
 ; f4521
 
-
 Music_WildPokemonVictory_Ch1: ; f4521
 	tempo 126
 	volume $77
@@ -18,10 +17,8 @@ Music_WildPokemonVictory_Ch1: ; f4521
 	note F#, 1
 	intensity $b6
 	note E_, 12
-
 Music_SuccessfulCapture_branch_f4536: ; f4536
 	stereopanning $f
-
 Music_WildPokemonVictory_branch_f4538: ; f4538
 	callchannel Music_WildPokemonVictory_branch_f455c
 	note F#, 2
@@ -71,6 +68,7 @@ Music_WildPokemonVictory_branch_f455c: ; f455c
 	note E_, 2
 	note A_, 2
 	endchannel
+; f4575
 
 Music_WildPokemonVictory_Ch2: ; f4575
 	vibrato $12, $24
@@ -83,10 +81,8 @@ Music_WildPokemonVictory_Ch2: ; f4575
 	note A_, 1
 	intensity $d6
 	note B_, 12
-
 Music_SuccessfulCapture_branch_f4585: ; f4585
 	stereopanning $f0
-
 Music_WildPokemonVictory_branch_f4587: ; f4587
 	callchannel Music_WildPokemonVictory_branch_f45b5
 	octave 4
@@ -136,6 +132,7 @@ Music_WildPokemonVictory_branch_f45b5: ; f45b5
 	note C#, 2
 	note C#, 4
 	endchannel
+; f45c4
 
 Music_WildPokemonVictory_Ch3: ; f45c4
 	notetype $c, $20
@@ -147,9 +144,7 @@ Music_WildPokemonVictory_Ch3: ; f45c4
 	note __, 3
 	note E_, 1
 	note __, 3
-
 Music_SuccessfulCapture_branch_f45cf: ; f45cf
-
 Music_WildPokemonVictory_branch_f45cf: ; f45cf
 	callchannel Music_WildPokemonVictory_branch_f45f4
 	note D#, 2
@@ -192,3 +187,5 @@ Music_WildPokemonVictory_branch_f45f4: ; f45f4
 	note C#, 2
 	endchannel
 ; f4602
+
+
diff --git a/audio/sfx.asm b/audio/sfx.asm
new file mode 100644
index 000000000..294173041
--- /dev/null
+++ b/audio/sfx.asm
@@ -0,0 +1,5694 @@
+Sfx_PokeballsPlacedOnTable: ; f0941
+	dbw $04, Sfx_PokeballsPlacedOnTable_Ch5
+; f0944
+
+Sfx_BallWiggle: ; f0944
+	dbw $04, Sfx_BallWiggle_Ch5
+; f0947
+
+Sfx_Potion: ; f0947
+	dbw $04, Sfx_Potion_Ch5
+; f094a
+
+Sfx_FullHeal: ; f094a
+	dbw $04, Sfx_FullHeal_Ch5
+; f094d
+
+Sfx_Menu: ; f094d
+	dbw $07, Sfx_Menu_Ch8
+; f0950
+
+Sfx_ReadText2: ; f0950
+Sfx_ReadText: ; f0950
+	dbw $04, Sfx_ReadText2_Ch5
+; f0953
+
+Sfx_Poison: ; f0953
+	dbw $04, Sfx_Poison_Ch5
+; f0956
+
+Sfx_GotSafariBalls: ; f0956
+	dbw $04, Sfx_GotSafariBalls_Ch5
+; f0959
+
+Sfx_BootPc: ; f0959
+	dbw $04, Sfx_BootPc_Ch5
+; f095c
+
+Sfx_ShutDownPc: ; f095c
+	dbw $04, Sfx_ShutDownPc_Ch5
+; f095f
+
+Sfx_ChoosePcOption: ; f095f
+	dbw $04, Sfx_ChoosePcOption_Ch5
+; f0962
+
+Sfx_EscapeRope: ; f0962
+	dbw $04, Sfx_EscapeRope_Ch5
+; f0965
+
+Sfx_PushButton: ; f0965
+	dbw $04, Sfx_PushButton_Ch5
+; f0968
+
+Sfx_SecondPartOfItemfinder: ; f0968
+	dbw $04, Sfx_SecondPartOfItemfinder_Ch5
+; f096b
+
+Sfx_WarpTo: ; f096b
+	dbw $04, Sfx_WarpTo_Ch5
+; f096e
+
+Sfx_WarpFrom: ; f096e
+	dbw $04, Sfx_WarpFrom_Ch5
+; f0971
+
+Sfx_ChangeDexMode: ; f0971
+	dbw $04, Sfx_ChangeDexMode_Ch5
+; f0974
+
+Sfx_JumpOverLedge: ; f0974
+	dbw $04, Sfx_JumpOverLedge_Ch5
+; f0977
+
+Sfx_GrassRustle: ; f0977
+	dbw $07, Sfx_GrassRustle_Ch8
+; f097a
+
+Sfx_Fly: ; f097a
+	dbw $07, Sfx_Fly_Ch8
+; f097d
+
+Sfx_Wrong: ; f097d
+	dbw $44, Sfx_Wrong_Ch5
+	dbw $05, Sfx_Wrong_Ch6
+; f0983
+
+Sfx_Squeak: ; f0983
+	dbw $04, Sfx_Squeak_Ch5
+; f0986
+
+Sfx_Strength: ; f0986
+	dbw $07, Sfx_Strength_Ch8
+; f0989
+
+Sfx_Boat: ; f0989
+	dbw $44, Sfx_Boat_Ch5
+	dbw $05, Sfx_Boat_Ch6
+; f098f
+
+Sfx_WallOpen: ; f098f
+	dbw $04, Sfx_WallOpen_Ch5
+; f0992
+
+Sfx_PlacePuzzlePieceDown: ; f0992
+	dbw $07, Sfx_PlacePuzzlePieceDown_Ch8
+; f0995
+
+Sfx_EnterDoor: ; f0995
+	dbw $07, Sfx_EnterDoor_Ch8
+; f0998
+
+Sfx_SwitchPokemon: ; f0998
+	dbw $44, Sfx_SwitchPokemon_Ch5
+	dbw $05, Sfx_SwitchPokemon_Ch6
+; f099e
+
+Sfx_Tally: ; f099e
+	dbw $44, Sfx_Tally_Ch5
+	dbw $05, Sfx_Tally_Ch6
+; f09a4
+
+Sfx_Transaction: ; f09a4
+	dbw $44, Sfx_Transaction_Ch5
+	dbw $05, Sfx_Transaction_Ch6
+; f09aa
+
+Sfx_Bump: ; f09aa
+	dbw $04, Sfx_Bump_Ch5
+; f09ad
+
+Sfx_ExitBuilding: ; f09ad
+	dbw $07, Sfx_ExitBuilding_Ch8
+; f09b0
+
+Sfx_Save: ; f09b0
+	dbw $44, Sfx_Save_Ch5
+	dbw $05, Sfx_Save_Ch6
+; f09b6
+
+Sfx_Save_Ch5: ; f09b6
+	dutycycle $2
+	sound $2, $f1, $0700
+	sound $1, $e1, $0600
+	sound $1, $e1, $0680
+	sound $1, $e1, $06c0
+	sound $2, $e1, $0700
+	sound $2, $e1, $07c0
+	sound $f, $f2, $07e0
+	endchannel
+; f09d5
+
+Sfx_Save_Ch6: ; f09d5
+	dutycycle $2
+	sound $2, $8, $0000
+	sound $2, $a1, $0701
+	sound $1, $91, $0601
+	sound $1, $91, $0681
+	sound $1, $91, $06c1
+	sound $2, $91, $0701
+	sound $2, $91, $07c1
+	sound $f, $d2, $07e1
+	endchannel
+; f09f8
+
+Sfx_Pokeflute: ; f09f8
+	dbw $06, Sfx_Pokeflute_Ch7
+; f09fb
+
+Sfx_ElevatorEnd: ; f09fb
+	dbw $04, Sfx_ElevatorEnd_Ch5
+; f09fe
+
+Sfx_ThrowBall: ; f09fe
+	dbw $44, Sfx_ThrowBall_Ch5
+	dbw $05, Sfx_ThrowBall_Ch6
+; f0a04
+
+Sfx_BallPoof: ; f0a04
+	dbw $44, Sfx_BallPoof_Ch5
+	dbw $07, Sfx_BallPoof_Ch8
+; f0a0a
+
+Sfx_Unknown3A: ; f0a0a
+	dbw $44, Sfx_Unknown3A_Ch5
+	dbw $07, Sfx_Unknown3A_Ch8
+; f0a10
+
+Sfx_Run: ; f0a10
+	dbw $07, Sfx_Run_Ch8
+; f0a13
+
+Sfx_SlotMachineStart: ; f0a13
+	dbw $44, Sfx_SlotMachineStart_Ch5
+	dbw $05, Sfx_SlotMachineStart_Ch6
+; f0a19
+
+Sfx_Call: ; f0a19
+	dbw $04, Sfx_Call_Ch5
+; f0a1c
+
+Sfx_Unknown60: ; f0a1c
+	dbw $07, Sfx_Unknown60_Ch8
+; f0a1f
+
+Sfx_Unknown61: ; f0a1f
+	dbw $07, Sfx_Unknown61_Ch8
+; f0a22
+
+Sfx_Unknown62: ; f0a22
+	dbw $07, Sfx_Unknown62_Ch8
+; f0a25
+
+Sfx_Unknown63: ; f0a25
+	dbw $07, Sfx_Unknown63_Ch8
+; f0a28
+
+Sfx_Burn: ; f0a28
+	dbw $07, Sfx_Burn_Ch8
+; f0a2b
+
+Sfx_TitleScreenEntrance: ; f0a2b
+	dbw $07, Sfx_TitleScreenEntrance_Ch8
+; f0a2e
+
+Sfx_Unknown66: ; f0a2e
+	dbw $04, Sfx_Unknown66_Ch5
+; f0a31
+
+Sfx_GetCoinFromSlots: ; f0a31
+	dbw $04, Sfx_GetCoinFromSlots_Ch5
+; f0a34
+
+Sfx_PayDay: ; f0a34
+	dbw $44, Sfx_PayDay_Ch5
+	dbw $05, Sfx_PayDay_Ch6
+; f0a3a
+
+Sfx_Metronome: ; f0a3a
+	dbw $04, Sfx_Metronome_Ch5
+; f0a3d
+
+Sfx_Peck: ; f0a3d
+	dbw $07, Sfx_Peck_Ch8
+; f0a40
+
+Sfx_Kinesis: ; f0a40
+	dbw $04, Sfx_Kinesis_Ch5
+; f0a43
+
+Sfx_Lick: ; f0a43
+	dbw $04, Sfx_Lick_Ch5
+; f0a46
+
+Sfx_Pound: ; f0a46
+	dbw $07, Sfx_Pound_Ch8
+; f0a49
+
+Sfx_MovePuzzlePiece: ; f0a49
+	dbw $07, Sfx_MovePuzzlePiece_Ch8
+; f0a4c
+
+Sfx_CometPunch: ; f0a4c
+	dbw $07, Sfx_CometPunch_Ch8
+; f0a4f
+
+Sfx_MegaPunch: ; f0a4f
+	dbw $07, Sfx_MegaPunch_Ch8
+; f0a52
+
+Sfx_Scratch: ; f0a52
+	dbw $07, Sfx_Scratch_Ch8
+; f0a55
+
+Sfx_Vicegrip: ; f0a55
+	dbw $07, Sfx_Vicegrip_Ch8
+; f0a58
+
+Sfx_RazorWind: ; f0a58
+	dbw $07, Sfx_RazorWind_Ch8
+; f0a5b
+
+Sfx_Cut: ; f0a5b
+	dbw $07, Sfx_Cut_Ch8
+; f0a5e
+
+Sfx_WingAttack: ; f0a5e
+	dbw $07, Sfx_WingAttack_Ch8
+; f0a61
+
+Sfx_Whirlwind: ; f0a61
+	dbw $07, Sfx_Whirlwind_Ch8
+; f0a64
+
+Sfx_Bind: ; f0a64
+	dbw $07, Sfx_Bind_Ch8
+; f0a67
+
+Sfx_VineWhip: ; f0a67
+	dbw $07, Sfx_VineWhip_Ch8
+; f0a6a
+
+Sfx_DoubleKick: ; f0a6a
+	dbw $07, Sfx_DoubleKick_Ch8
+; f0a6d
+
+Sfx_MegaKick: ; f0a6d
+	dbw $07, Sfx_MegaKick_Ch8
+; f0a70
+
+Sfx_Headbutt: ; f0a70
+	dbw $07, Sfx_Headbutt_Ch8
+; f0a73
+
+Sfx_HornAttack: ; f0a73
+	dbw $07, Sfx_HornAttack_Ch8
+; f0a76
+
+Sfx_Tackle: ; f0a76
+	dbw $07, Sfx_Tackle_Ch8
+; f0a79
+
+Sfx_PoisonSting: ; f0a79
+	dbw $07, Sfx_PoisonSting_Ch8
+; f0a7c
+
+Sfx_Powder: ; f0a7c
+	dbw $07, Sfx_Powder_Ch8
+; f0a7f
+
+Sfx_Doubleslap: ; f0a7f
+	dbw $07, Sfx_Doubleslap_Ch8
+; f0a82
+
+Sfx_Bite: ; f0a82
+	dbw $44, Sfx_Bite_Ch5
+	dbw $07, Sfx_Bite_Ch8
+; f0a88
+
+Sfx_JumpKick: ; f0a88
+	dbw $07, Sfx_JumpKick_Ch8
+; f0a8b
+
+Sfx_Stomp: ; f0a8b
+	dbw $07, Sfx_Stomp_Ch8
+; f0a8e
+
+Sfx_TailWhip: ; f0a8e
+	dbw $07, Sfx_TailWhip_Ch8
+; f0a91
+
+Sfx_KarateChop: ; f0a91
+	dbw $07, Sfx_KarateChop_Ch8
+; f0a94
+
+Sfx_Submission: ; f0a94
+	dbw $07, Sfx_Submission_Ch8
+; f0a97
+
+Sfx_WaterGun: ; f0a97
+	dbw $44, Sfx_WaterGun_Ch5
+	dbw $07, Sfx_WaterGun_Ch8
+; f0a9d
+
+Sfx_SwordsDance: ; f0a9d
+	dbw $07, Sfx_SwordsDance_Ch8
+; f0aa0
+
+Sfx_Thunder: ; f0aa0
+	dbw $07, Sfx_Thunder_Ch8
+; f0aa3
+
+Sfx_Supersonic: ; f0aa3
+	dbw $84, Sfx_Supersonic_Ch5
+	dbw $05, Sfx_Supersonic_Ch6
+	dbw $07, Sfx_Supersonic_Ch8
+; f0aac
+
+Sfx_Leer: ; f0aac
+	dbw $84, Sfx_Leer_Ch5
+	dbw $05, Sfx_Leer_Ch6
+	dbw $07, Sfx_Leer_Ch8
+; f0ab5
+
+Sfx_Ember: ; f0ab5
+	dbw $44, Sfx_Ember_Ch5
+	dbw $07, Sfx_Ember_Ch8
+; f0abb
+
+Sfx_Bubblebeam: ; f0abb
+	dbw $84, Sfx_Bubblebeam_Ch5
+	dbw $05, Sfx_Bubblebeam_Ch6
+	dbw $07, Sfx_Bubblebeam_Ch8
+; f0ac4
+
+Sfx_HydroPump: ; f0ac4
+	dbw $44, Sfx_HydroPump_Ch5
+	dbw $07, Sfx_HydroPump_Ch8
+; f0aca
+
+Sfx_Surf: ; f0aca
+	dbw $84, Sfx_Surf_Ch5
+	dbw $05, Sfx_Surf_Ch6
+	dbw $07, Sfx_Surf_Ch8
+; f0ad3
+
+Sfx_Psybeam: ; f0ad3
+	dbw $84, Sfx_Psybeam_Ch5
+	dbw $05, Sfx_Psybeam_Ch6
+	dbw $07, Sfx_Psybeam_Ch8
+; f0adc
+
+Sfx_Charge: ; f0adc
+	dbw $84, Sfx_Charge_Ch5
+	dbw $05, Sfx_Charge_Ch6
+	dbw $07, Sfx_Charge_Ch8
+; f0ae5
+
+Sfx_Thundershock: ; f0ae5
+	dbw $84, Sfx_Thundershock_Ch5
+	dbw $05, Sfx_Thundershock_Ch6
+	dbw $07, Sfx_Thundershock_Ch8
+; f0aee
+
+Sfx_Psychic: ; f0aee
+	dbw $84, Sfx_Psychic_Ch5
+	dbw $05, Sfx_Psychic_Ch6
+	dbw $07, Sfx_Psychic_Ch8
+; f0af7
+
+Sfx_Screech: ; f0af7
+	dbw $44, Sfx_Screech_Ch5
+	dbw $05, Sfx_Screech_Ch6
+; f0afd
+
+Sfx_BoneClub: ; f0afd
+	dbw $44, Sfx_BoneClub_Ch5
+	dbw $05, Sfx_BoneClub_Ch6
+; f0b03
+
+Sfx_Sharpen: ; f0b03
+	dbw $44, Sfx_Sharpen_Ch5
+	dbw $05, Sfx_Sharpen_Ch6
+; f0b09
+
+Sfx_EggBomb: ; f0b09
+	dbw $84, Sfx_EggBomb_Ch5
+	dbw $05, Sfx_EggBomb_Ch6
+	dbw $07, Sfx_EggBomb_Ch8
+; f0b12
+
+Sfx_Sing: ; f0b12
+	dbw $44, Sfx_Sing_Ch5
+	dbw $05, Sfx_Sing_Ch6
+; f0b18
+
+Sfx_HyperBeam: ; f0b18
+	dbw $84, Sfx_HyperBeam_Ch5
+	dbw $05, Sfx_HyperBeam_Ch6
+	dbw $07, Sfx_HyperBeam_Ch8
+; f0b21
+
+Sfx_Shine: ; f0b21
+	dbw $04, Sfx_Shine_Ch5
+; f0b24
+
+Sfx_Unknown5F: ; f0b24
+	dbw $84, Sfx_Unknown5F_Ch5
+	dbw $05, Sfx_Unknown5F_Ch6
+Sfx_Sandstorm: ; f0b2a
+	dbw $07, Sfx_Sandstorm_Ch8
+; f0b2d
+
+Sfx_HangUp: ; f0b2d
+	dbw $04, Sfx_HangUp_Ch5
+; f0b30
+
+Sfx_NoSignal: ; f0b30
+	dbw $04, Sfx_NoSignal_Ch5
+; f0b33
+
+Sfx_Elevator: ; f0b33
+	dbw $c4, Sfx_Elevator_Ch5
+	dbw $05, Sfx_Elevator_Ch6
+	dbw $06, Sfx_Elevator_Ch7
+	dbw $07, Sfx_Elevator_Ch8
+; f0b3f
+
+Sfx_DexFanfare5079: ; f0b3f
+Sfx_LevelUp: ; f0b3f
+	dbw $c4, Sfx_DexFanfare5079_Ch5
+	dbw $05, Sfx_DexFanfare5079_Ch6
+	dbw $06, Sfx_DexFanfare5079_Ch7
+	dbw $07, Sfx_DexFanfare5079_Ch8
+; f0b4b
+
+Sfx_DexFanfare5079_Ch5: ; f0b4b
+Sfx_LevelUp_Ch5: ; f0b4b
+	togglesfx
+	tempo 120
+	volume $77
+	dutycycle $2
+	notetype $8, $b1
+	octave 3
+	note B_, 2
+	note B_, 2
+	note B_, 2
+	intensity $b3
+	octave 4
+	note G#, 12
+	endchannel
+; f0b5f
+
+Sfx_DexFanfare5079_Ch6: ; f0b5f
+Sfx_LevelUp_Ch6: ; f0b5f
+	togglesfx
+	dutycycle $2
+	notetype $8, $c1
+	octave 4
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	intensity $c3
+	note B_, 12
+	endchannel
+; f0b6d
+
+Sfx_DexFanfare5079_Ch7: ; f0b6d
+Sfx_LevelUp_Ch7: ; f0b6d
+	togglesfx
+	notetype $8, $25
+	octave 4
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	octave 5
+	note E_, 5
+	intensity $35
+	note E_, 3
+	note __, 4
+	endchannel
+; f0b7f
+
+Sfx_DexFanfare5079_Ch8: ; f0b7f
+Sfx_LevelUp_Ch8: ; f0b7f
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 12
+	endchannel
+; f0b86
+
+Sfx_KeyItem: ; f0b86
+	dbw $c4, Sfx_KeyItem_Ch5
+	dbw $05, Sfx_KeyItem_Ch6
+	dbw $06, Sfx_KeyItem_Ch7
+	dbw $07, Sfx_KeyItem_Ch8
+; f0b92
+
+Sfx_KeyItem_Ch5: ; f0b92
+	togglesfx
+	tempo 120
+	volume $77
+	dutycycle $2
+	notetype $6, $b1
+	octave 3
+	note B_, 4
+	note B_, 2
+	note B_, 2
+	note B_, 4
+	octave 4
+	note E_, 4
+	intensity $b3
+	note G#, 16
+	endchannel
+; f0ba8
+
+Sfx_KeyItem_Ch6: ; f0ba8
+	togglesfx
+	dutycycle $2
+	notetype $6, $c1
+	octave 4
+	note E_, 4
+	note E_, 2
+	note E_, 2
+	note E_, 4
+	note G#, 4
+	intensity $c3
+	note B_, 16
+	endchannel
+; f0bb8
+
+Sfx_KeyItem_Ch7: ; f0bb8
+	togglesfx
+	notetype $6, $25
+	octave 4
+	note G#, 2
+	note __, 2
+	note G#, 1
+	note __, 1
+	note G#, 1
+	note __, 1
+	note G#, 2
+	note __, 2
+	note B_, 2
+	note __, 2
+	octave 5
+	note E_, 8
+	intensity $35
+	note E_, 4
+	note __, 4
+	endchannel
+; f0bce
+
+Sfx_KeyItem_Ch8: ; f0bce
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 16
+	endchannel
+; f0bd5
+
+Sfx_DexFanfare2049: ; f0bd5
+	dbw $c4, Sfx_DexFanfare2049_Ch5
+	dbw $05, Sfx_DexFanfare2049_Ch6
+	dbw $06, Sfx_DexFanfare2049_Ch7
+	dbw $07, Sfx_DexFanfare2049_Ch8
+; f0be1
+
+Sfx_DexFanfare2049_Ch5: ; f0be1
+	togglesfx
+	tempo 104
+	volume $77
+	dutycycle $2
+	notetype $c, $88
+	octave 3
+	note A_, 4
+	note __, 2
+	note A_, 1
+	note __, 1
+	note A#, 4
+	note __, 2
+	note A#, 1
+	note __, 1
+	octave 4
+	note C_, 2
+	note __, 2
+	octave 3
+	note A#, 2
+	note __, 2
+	note A_, 2
+	note __, 6
+	endchannel
+; f0bfe
+
+Sfx_DexFanfare2049_Ch6: ; f0bfe
+	togglesfx
+	dutycycle $2
+	notetype $c, $c1
+	octave 5
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	octave 4
+	note A#, 2
+	octave 5
+	note C_, 2
+	note D_, 2
+	note E_, 2
+	note F_, 4
+	note G_, 4
+	note F_, 8
+	endchannel
+; f0c13
+
+Sfx_DexFanfare2049_Ch7: ; f0c13
+	togglesfx
+	notetype $c, $25
+	octave 4
+	note F_, 4
+	note __, 2
+	note F_, 1
+	note __, 1
+	note F_, 4
+	note __, 2
+	note F_, 1
+	note __, 1
+	note A_, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note F_, 2
+	note __, 6
+	endchannel
+; f0c27
+
+Sfx_DexFanfare2049_Ch8: ; f0c27
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 16
+	note __, 16
+	endchannel
+; f0c2f
+
+Sfx_Item: ; f0c2f
+	dbw $c4, Sfx_Item_Ch5
+	dbw $05, Sfx_Item_Ch6
+	dbw $06, Sfx_Item_Ch7
+	dbw $07, Sfx_Item_Ch8
+; f0c3b
+
+Sfx_Item_Ch5: ; f0c3b
+	togglesfx
+	tempo 108
+	volume $77
+	vibrato $8, $27
+	dutycycle $2
+	notetype $8, $b2
+	octave 4
+	note C_, 6
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note F_, 12
+	note __, 12
+	endchannel
+; f0c54
+
+Sfx_Item_Ch6: ; f0c54
+	togglesfx
+	vibrato $8, $27
+	dutycycle $2
+	notetype $8, $c3
+	octave 4
+	note A_, 6
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	note A#, 4
+	note A#, 4
+	note A#, 4
+	note A_, 12
+	note __, 12
+	endchannel
+; f0c68
+
+Sfx_Item_Ch7: ; f0c68
+	togglesfx
+	notetype $8, $25
+	octave 4
+	note F_, 4
+	note __, 2
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	note D#, 2
+	note __, 2
+	note D#, 2
+	note __, 2
+	note E_, 2
+	note __, 2
+	note F_, 6
+	intensity $35
+	note F_, 4
+	note __, 14
+	endchannel
+; f0c81
+
+Sfx_Item_Ch8: ; f0c81
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 16
+	note __, 16
+	endchannel
+; f0c89
+
+Sfx_CaughtMon: ; f0c89
+	dbw $c4, Sfx_CaughtMon_Ch5
+	dbw $05, Sfx_CaughtMon_Ch6
+	dbw $06, Sfx_CaughtMon_Ch7
+	dbw $07, Sfx_CaughtMon_Ch8
+; f0c95
+
+Sfx_CaughtMon_Ch5: ; f0c95
+	togglesfx
+	tempo 112
+	volume $77
+	vibrato $8, $27
+	dutycycle $2
+	notetype $8, $b3
+	octave 4
+	note C_, 6
+	octave 3
+	note A_, 6
+	note F_, 12
+	intensity $b1
+	octave 4
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note D#, 2
+	note G_, 2
+	intensity $b3
+	note F_, 12
+	endchannel
+; f0cb5
+
+Sfx_CaughtMon_Ch6: ; f0cb5
+	togglesfx
+	dutycycle $2
+	vibrato $8, $27
+	notetype $8, $c3
+	octave 4
+	note A_, 6
+	note F_, 6
+	note C_, 12
+	intensity $c1
+	note A#, 2
+	note A#, 2
+	note A#, 2
+	note G_, 2
+	note G_, 2
+	note A#, 2
+	intensity $c3
+	note A_, 12
+	endchannel
+; f0cce
+
+Sfx_CaughtMon_Ch7: ; f0cce
+	togglesfx
+	notetype $8, $25
+	octave 3
+	note C_, 12
+	note C_, 6
+	octave 2
+	note A_, 2
+	octave 3
+	note C_, 2
+	note F_, 2
+	note G_, 6
+	note A#, 6
+	note A_, 6
+	intensity $35
+	note A_, 3
+	note __, 3
+	endchannel
+; f0ce2
+
+Sfx_CaughtMon_Ch8: ; f0ce2
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 16
+	note __, 16
+	endchannel
+; f0cea
+
+Sfx_DexFanfare80109: ; f0cea
+	dbw $c4, Sfx_DexFanfare80109_Ch5
+	dbw $05, Sfx_DexFanfare80109_Ch6
+	dbw $06, Sfx_DexFanfare80109_Ch7
+	dbw $07, Sfx_DexFanfare80109_Ch8
+; f0cf6
+
+Sfx_DexFanfare80109_Ch5: ; f0cf6
+	togglesfx
+	tempo 112
+	volume $77
+	vibrato $8, $27
+	dutycycle $2
+	notetype $c, $b1
+	octave 4
+	note D#, 2
+	note D#, 1
+	note D#, 1
+	octave 3
+	note A#, 2
+	note A#, 1
+	note A#, 1
+	octave 4
+	note D#, 2
+	note D#, 1
+	note D#, 1
+	note F_, 2
+	note F_, 1
+	note F_, 1
+	intensity $a5
+	note A#, 16
+	endchannel
+; f0d17
+
+Sfx_DexFanfare80109_Ch6: ; f0d17
+	togglesfx
+	vibrato $8, $27
+	dutycycle $2
+	notetype $c, $c1
+	octave 4
+	note G_, 2
+	note G_, 1
+	note G_, 1
+	note D#, 2
+	note D#, 1
+	note D#, 1
+	note G#, 2
+	note G#, 1
+	note G#, 1
+	note A#, 2
+	note A#, 1
+	note A#, 1
+	intensity $b5
+	octave 5
+	note D#, 16
+	endchannel
+; f0d32
+
+Sfx_DexFanfare80109_Ch7: ; f0d32
+	togglesfx
+	notetype $c, $25
+	octave 4
+	note D#, 1
+	note __, 1
+	octave 3
+	note A#, 2
+	octave 4
+	note D#, 1
+	note __, 1
+	octave 3
+	note A#, 2
+	octave 4
+	note D#, 1
+	note __, 1
+	note C_, 2
+	note D_, 1
+	note __, 1
+	octave 3
+	note A#, 2
+	note D#, 4
+	intensity $35
+	note D#, 3
+	note __, 9
+	endchannel
+; f0d4e
+
+Sfx_DexFanfare80109_Ch8: ; f0d4e
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 16
+	note __, 16
+	endchannel
+; f0d56
+
+Sfx_Fanfare2: ; f0d56
+	dbw $84, Sfx_Fanfare2_Ch5
+	dbw $05, Sfx_Fanfare2_Ch6
+	dbw $07, Sfx_Fanfare2_Ch8
+; f0d5f
+
+UnknownSfx: ; f0d5f
+	dbw $c4, UnknownSfx_Ch5
+	dbw $05, UnknownSfx_Ch6
+	dbw $06, UnknownSfx_Ch7
+	dbw $07, UnknownSfx_Ch8
+; f0d6b
+
+UnknownSfx_Ch5: ; f0d6b
+	togglesfx
+	tempo 124
+	volume $77
+	vibrato $8, $27
+	dutycycle $2
+	notetype $c, $b1
+	octave 4
+	note F_, 2
+	note F_, 1
+	note F_, 1
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	note E_, 2
+	note G_, 1
+	note G_, 1
+	note C_, 2
+	note E_, 1
+	note E_, 1
+	intensity $a5
+	note F_, 16
+	endchannel
+; f0d8a
+
+UnknownSfx_Ch6: ; f0d8a
+	togglesfx
+	vibrato $8, $27
+	dutycycle $2
+	notetype $c, $c1
+	octave 4
+	note A_, 2
+	note A_, 1
+	note A_, 1
+	note F_, 2
+	note F_, 1
+	note F_, 1
+	octave 5
+	note C_, 2
+	note C_, 1
+	note C_, 1
+	octave 4
+	note A#, 2
+	note A#, 1
+	note A#, 1
+	intensity $b5
+	note A_, 16
+	endchannel
+; f0da6
+
+UnknownSfx_Ch7: ; f0da6
+	togglesfx
+	notetype $c, $25
+	octave 4
+	note F_, 8
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	note A#, 2
+	note A_, 4
+	intensity $35
+	note A_, 3
+	note __, 9
+	endchannel
+; f0db6
+
+UnknownSfx_Ch8: ; f0db6
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 16
+	note __, 16
+	endchannel
+; f0dbe
+
+Sfx_Fanfare: ; f0dbe
+	dbw $84, Sfx_Fanfare_Ch5
+	dbw $05, Sfx_Fanfare_Ch6
+	dbw $07, Sfx_Fanfare_Ch8
+; f0dc7
+
+Sfx_RegisterPhoneNumber: ; f0dc7
+	dbw $c4, Sfx_RegisterPhoneNumber_Ch5
+	dbw $05, Sfx_RegisterPhoneNumber_Ch6
+	dbw $06, Sfx_RegisterPhoneNumber_Ch7
+	dbw $07, Sfx_RegisterPhoneNumber_Ch8
+; f0dd3
+
+Sfx_RegisterPhoneNumber_Ch5: ; f0dd3
+	togglesfx
+	tempo 124
+	volume $77
+	dutycycle $3
+	notetype $c, $a2
+	note __, 2
+	octave 3
+	note C_, 4
+	note G#, 4
+	octave 4
+	note C_, 2
+	octave 3
+	note F_, 1
+	note G#, 2
+	note C_, 1
+	note F_, 2
+	note A#, 3
+	octave 4
+	note C#, 3
+	note C_, 2
+	note __, 8
+	endchannel
+; f0def
+
+
+INCBIN "baserom.gbc", $f0def, $f0df0 - $f0def
+
+
+Sfx_RegisterPhoneNumber_Ch6: ; f0df0
+	togglesfx
+	dutycycle $3
+	notetype $c, $c2
+	note __, 2
+	octave 4
+	note D#, 2
+	note C#, 2
+	note C_, 2
+	note D#, 2
+	note F_, 2
+	note __, 1
+	note G#, 3
+	octave 5
+	note C_, 2
+	note D#, 3
+	octave 4
+	note G_, 3
+	note G#, 2
+	note __, 8
+	endchannel
+; f0e07
+
+
+INCBIN "baserom.gbc", $f0e07, $f0e08 - $f0e07
+
+
+Sfx_RegisterPhoneNumber_Ch7: ; f0e08
+	togglesfx
+	notetype $c, $25
+	note __, 2
+	octave 3
+	note D#, 7
+	note __, 1
+	note G#, 2
+	note __, 1
+	note C_, 2
+	note __, 1
+	note G#, 2
+	note G_, 2
+	note __, 1
+	note A#, 3
+	note G#, 2
+	note __, 8
+	endchannel
+; f0e1b
+
+
+INCBIN "baserom.gbc", $f0e1b, $f0e1c - $f0e1b
+
+
+Sfx_RegisterPhoneNumber_Ch8: ; f0e1c
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 2
+	note __, 16
+	note __, 16
+	endchannel
+; f0e25
+
+
+INCBIN "baserom.gbc", $f0e25, $f0e26 - $f0e25
+
+
+Sfx_3RdPlace: ; f0e26
+	dbw $84, Sfx_3RdPlace_Ch5
+	dbw $05, Sfx_3RdPlace_Ch6
+	dbw $06, Sfx_3RdPlace_Ch7
+; f0e2f
+
+Sfx_3RdPlace_Ch5: ; f0e2f
+	togglesfx
+	tempo 120
+	volume $77
+	dutycycle $2
+	notetype $c, $a4
+	octave 4
+	note F_, 1
+	note A_, 1
+	octave 5
+	note C_, 1
+	note F_, 1
+	note __, 1
+	note C_, 1
+	note D_, 6
+	endchannel
+; f0e44
+
+
+INCBIN "baserom.gbc", $f0e44, $f0e45 - $f0e44
+
+
+Sfx_3RdPlace_Ch6: ; f0e45
+	togglesfx
+	dutycycle $2
+	notetype $c, $b4
+	octave 4
+	note A_, 1
+	octave 5
+	note C_, 1
+	note F_, 1
+	note A_, 1
+	note __, 1
+	note F_, 1
+	note G_, 6
+	endchannel
+; f0e55
+
+
+INCBIN "baserom.gbc", $f0e55, $f0e56 - $f0e55
+
+
+Sfx_3RdPlace_Ch7: ; f0e56
+	togglesfx
+	notetype $c, $25
+	octave 3
+	note A_, 1
+	note F_, 1
+	note A_, 1
+	octave 4
+	note C_, 1
+	note __, 1
+	octave 3
+	note A_, 1
+	note B_, 6
+	endchannel
+; f0e65
+
+
+INCBIN "baserom.gbc", $f0e65, $f0e66 - $f0e65
+
+
+Sfx_GetEggFromDaycareLady: ; f0e66
+Sfx_GetEggFromDaycareMan: ; f0e66
+	dbw $c4, Sfx_GetEggFromDaycareLady_Ch5
+	dbw $05, Sfx_GetEggFromDaycareLady_Ch6
+	dbw $06, Sfx_GetEggFromDaycareLady_Ch7
+	dbw $07, Sfx_GetEggFromDaycareLady_Ch8
+; f0e72
+
+Sfx_GetEggFromDaycareLady_Ch5: ; f0e72
+Sfx_GetEggFromDaycareMan_Ch5: ; f0e72
+	togglesfx
+	tempo 120
+	volume $77
+	vibrato $12, $34
+	dutycycle $2
+	notetype $8, $a1
+	note __, 2
+	octave 3
+	note C_, 2
+	note F_, 2
+	note A_, 2
+	note F_, 2
+	note A#, 2
+	octave 4
+	note D_, 2
+	intensity $a2
+	note F_, 6
+	intensity $a1
+	dutycycle $3
+	octave 3
+	note E_, 2
+	note G_, 2
+	octave 4
+	note C_, 2
+	intensity $a4
+	note F_, 9
+	note __, 9
+	endchannel
+; f0e9a
+
+
+INCBIN "baserom.gbc", $f0e9a, $f0e9b - $f0e9a
+
+
+Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b
+Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b
+	togglesfx
+	vibrato $12, $34
+	dutycycle $3
+	notetype $8, $c2
+	note __, 2
+	octave 4
+	note F_, 2
+	note __, 2
+	note A_, 2
+	intensity $c1
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	intensity $c2
+	octave 5
+	note C_, 6
+	intensity $c1
+	octave 4
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	intensity $c4
+	note A_, 9
+	note __, 9
+	endchannel
+; f0ebd
+
+
+INCBIN "baserom.gbc", $f0ebd, $f0ebe - $f0ebd
+
+
+Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe
+Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe
+	togglesfx
+	notetype $8, $25
+	note __, 2
+	octave 3
+	note C_, 6
+	octave 2
+	note A#, 6
+	octave 3
+	note C_, 2
+	note F_, 2
+	note G_, 2
+	note A#, 6
+	note A_, 9
+	note __, 9
+	endchannel
+; f0ecf
+
+
+INCBIN "baserom.gbc", $f0ecf, $f0ed0 - $f0ecf
+
+
+Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0
+Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0
+	togglesfx
+	sfxtogglenoise $4
+	notetype $8
+	note __, 2
+	notetype $c
+	note __, 16
+	note __, 12
+	endchannel
+; f0edb
+
+
+INCBIN "baserom.gbc", $f0edb, $f0edc - $f0edb
+
+
+Sfx_MoveDeleted: ; f0edc
+	dbw $c4, Sfx_MoveDeleted_Ch5
+	dbw $05, Sfx_MoveDeleted_Ch6
+	dbw $06, Sfx_MoveDeleted_Ch7
+	dbw $07, Sfx_MoveDeleted_Ch8
+; f0ee8
+
+Sfx_MoveDeleted_Ch5: ; f0ee8
+	togglesfx
+	tempo 116
+	volume $77
+	dutycycle $2
+	vibrato $c, $44
+	notetype $c, $a4
+	note __, 8
+	octave 2
+	note G_, 1
+	note __, 2
+	note C#, 1
+	note E_, 1
+	note D#, 1
+	note E_, 4
+	intensity $a1
+	note G_, 2
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note G#, 2
+	note B_, 2
+	intensity $a6
+	octave 3
+	note D_, 10
+	note __, 6
+	endchannel
+; f0f0c
+
+
+INCBIN "baserom.gbc", $f0f0c, $f0f0d - $f0f0c
+
+
+Sfx_MoveDeleted_Ch6: ; f0f0d
+	togglesfx
+	dutycycle $3
+	vibrato $c, $44
+	notetype $c, $74
+	octave 1
+	note B_, 1
+	octave 2
+	note D_, 1
+	note F_, 1
+	note G#, 1
+	intensity $94
+	note D_, 1
+	note F_, 1
+	note G#, 1
+	note B_, 1
+	intensity $b4
+	octave 3
+	note C#, 1
+	note __, 2
+	octave 2
+	note A#, 1
+	octave 3
+	note C#, 4
+	note __, 2
+	intensity $b1
+	note C#, 2
+	note D#, 2
+	note E_, 2
+	intensity $b6
+	note F_, 16
+	note __, 6
+	endchannel
+; f0f36
+
+
+INCBIN "baserom.gbc", $f0f36, $f0f37 - $f0f36
+
+
+Sfx_MoveDeleted_Ch7: ; f0f37
+	togglesfx
+	notetype $6, $25
+	octave 2
+	note G#, 8
+	note A_, 8
+	note A#, 2
+	note __, 4
+	note A#, 1
+	note __, 1
+	note A#, 8
+	note __, 4
+	octave 3
+	note C#, 2
+	note __, 2
+	note C_, 2
+	note __, 2
+	octave 2
+	note A#, 2
+	note __, 2
+	notetype $c, $20
+	note B_, 16
+	note __, 6
+	endchannel
+; f0f52
+
+
+INCBIN "baserom.gbc", $f0f52, $f0f53 - $f0f52
+
+
+Sfx_MoveDeleted_Ch8: ; f0f53
+	togglesfx
+	sfxtogglenoise $3
+	notetype $c
+	note F_, 8
+	note __, 16
+	note __, 16
+	note __, 6
+	endchannel
+; f0f5d
+
+
+INCBIN "baserom.gbc", $f0f5d, $f0f5e - $f0f5d
+
+
+Sfx_2ndPlace: ; f0f5e
+	dbw $c4, Sfx_2ndPlace_Ch5
+	dbw $05, Sfx_2ndPlace_Ch6
+	dbw $06, Sfx_2ndPlace_Ch7
+	dbw $07, Sfx_2ndPlace_Ch8
+; f0f6a
+
+Sfx_2ndPlace_Ch5: ; f0f6a
+	togglesfx
+	tempo 116
+	volume $77
+	dutycycle $2
+	vibrato $c, $34
+	notetype $8, $a1
+	octave 4
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note C_, 2
+	octave 3
+	note A_, 2
+	note F_, 2
+	note A_, 2
+	octave 4
+	note C_, 2
+	note F_, 2
+	note C_, 2
+	octave 3
+	note A_, 2
+	octave 4
+	note F_, 2
+	note A_, 2
+	note A_, 2
+	note A_, 2
+	intensity $a7
+	note B_, 12
+	note __, 6
+	endchannel
+; f0f91
+
+
+INCBIN "baserom.gbc", $f0f91, $f0f92 - $f0f91
+
+
+Sfx_2ndPlace_Ch6: ; f0f92
+	togglesfx
+	dutycycle $2
+	notetype $8, $b1
+	octave 4
+	note G_, 2
+	note G_, 2
+	note G_, 2
+	note A_, 4
+	note B_, 2
+	intensity $b4
+	octave 5
+	note C_, 12
+	intensity $b1
+	note C_, 2
+	note C_, 2
+	note C_, 2
+	intensity $b7
+	note D_, 12
+	note __, 6
+	endchannel
+; f0fac
+
+
+INCBIN "baserom.gbc", $f0fac, $f0fad - $f0fac
+
+
+Sfx_2ndPlace_Ch7: ; f0fad
+	togglesfx
+	notetype $8, $25
+	octave 3
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 2
+	note F_, 2
+	note __, 2
+	octave 3
+	note F_, 2
+	octave 2
+	note F_, 2
+	note __, 2
+	octave 3
+	note F_, 2
+	octave 2
+	note F_, 2
+	note __, 2
+	octave 3
+	note F_, 2
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	octave 2
+	note G_, 12
+	note __, 6
+	endchannel
+; f0fd1
+
+
+INCBIN "baserom.gbc", $f0fd1, $f0fd2 - $f0fd1
+
+
+Sfx_2ndPlace_Ch8: ; f0fd2
+	togglesfx
+	sfxtogglenoise $3
+	notetype $8
+Sfx_2ndPlace_branch_f0fd7: ; f0fd7
+	note C#, 1
+	loopchannel 6, Sfx_2ndPlace_branch_f0fd7
+	note B_, 12
+	note B_, 12
+	note B_, 12
+	note __, 6
+	endchannel
+; f0fe1
+
+
+INCBIN "baserom.gbc", $f0fe1, $f0fe2 - $f0fe1
+
+
+Sfx_1stPlace: ; f0fe2
+	dbw $c4, Sfx_1stPlace_Ch5
+	dbw $05, Sfx_1stPlace_Ch6
+	dbw $06, Sfx_1stPlace_Ch7
+	dbw $07, Sfx_1stPlace_Ch8
+; f0fee
+
+Sfx_1stPlace_Ch5: ; f0fee
+	togglesfx
+	tempo 124
+	volume $77
+	dutycycle $3
+	vibrato $c, $34
+	notetype $c, $a1
+	octave 5
+	note D_, 2
+	octave 4
+	note B_, 2
+	octave 5
+	note D_, 2
+	note A#, 1
+	note F_, 1
+	note D_, 1
+	note F_, 1
+	intensity $91
+	note D_, 1
+	octave 4
+	note A#, 1
+	note F_, 1
+	note A#, 1
+	intensity $81
+	octave 5
+	note D_, 1
+	octave 4
+	note A#, 1
+	note F_, 1
+	note D_, 1
+	intensity $a1
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	intensity $a7
+	note A_, 10
+	note __, 6
+	endchannel
+; f101f
+
+
+INCBIN "baserom.gbc", $f101f, $f1020 - $f101f
+
+
+Sfx_1stPlace_Ch6: ; f1020
+	togglesfx
+	dutycycle $3
+	vibrato $c, $34
+	notetype $c, $c1
+	octave 3
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	intensity $b6
+	octave 4
+	note D_, 12
+	intensity $c1
+	note E_, 2
+	note G_, 2
+	octave 5
+	note C_, 2
+	intensity $b7
+	note D_, 10
+	note __, 6
+	endchannel
+; f103c
+
+
+INCBIN "baserom.gbc", $f103c, $f103d - $f103c
+
+
+Sfx_1stPlace_Ch7: ; f103d
+	togglesfx
+	notetype $c, $25
+	octave 2
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 6
+	note F_, 6
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	note D_, 10
+	note __, 6
+	endchannel
+; f1053
+
+
+INCBIN "baserom.gbc", $f1053, $f1054 - $f1053
+
+
+Sfx_1stPlace_Ch8: ; f1054
+	togglesfx
+	sfxtogglenoise $4
+	notetype $6
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note B_, 12
+	note B_, 10
+	note C#, 1
+	note C#, 1
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	notetype $c
+	note B_, 10
+	note __, 6
+	endchannel
+; f1068
+
+
+INCBIN "baserom.gbc", $f1068, $f1069 - $f1068
+
+
+Sfx_ChooseACard: ; f1069
+	dbw $c4, Sfx_ChooseACard_Ch5
+	dbw $05, Sfx_ChooseACard_Ch6
+	dbw $06, Sfx_ChooseACard_Ch7
+	dbw $07, Sfx_ChooseACard_Ch8
+; f1075
+
+Sfx_ChooseACard_Ch5: ; f1075
+	togglesfx
+	tempo 152
+	volume $77
+	dutycycle $3
+	notetype $6, $a4
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	octave 4
+	note C#, 4
+	octave 3
+	note F_, 1
+	note __, 1
+	note F_, 1
+	note __, 1
+	octave 4
+	note D_, 4
+	octave 3
+	note E_, 1
+	note __, 1
+	note E_, 1
+	note __, 1
+	octave 4
+	note E_, 4
+	intensity $71
+	octave 3
+	note E_, 1
+	note F#, 1
+	note G#, 1
+	note A_, 1
+	intensity $91
+	note B_, 1
+	octave 4
+	note C#, 1
+	note D_, 1
+	note D#, 1
+	intensity $a4
+	note E_, 4
+	note __, 12
+	endchannel
+; f10a8
+
+
+INCBIN "baserom.gbc", $f10a8, $f10a9 - $f10a8
+
+
+Sfx_ChooseACard_Ch6: ; f10a9
+	togglesfx
+	dutycycle $3
+	notetype $6, $b4
+	octave 3
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 4
+	note E_, 4
+	octave 3
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 4
+	note F_, 4
+	octave 3
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	octave 4
+	note G_, 4
+	note G#, 8
+	note A_, 4
+	note __, 12
+	endchannel
+; f10c8
+
+
+INCBIN "baserom.gbc", $f10c8, $f10c9 - $f10c8
+
+
+Sfx_ChooseACard_Ch7: ; f10c9
+	togglesfx
+	notetype $6, $25
+	octave 3
+	note C#, 1
+	note __, 1
+	note C#, 1
+	note __, 1
+	octave 2
+	note A_, 4
+	octave 3
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	octave 2
+	note A_, 4
+	octave 3
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	octave 2
+	note A_, 4
+	octave 3
+	note E_, 2
+	octave 2
+	note G#, 2
+	note B_, 2
+	note G#, 2
+	note A_, 4
+	note __, 12
+	endchannel
+; f10eb
+
+
+INCBIN "baserom.gbc", $f10eb, $f10ec - $f10eb
+
+
+Sfx_ChooseACard_Ch8: ; f10ec
+	togglesfx
+	sfxtogglenoise $4
+	notetype $6
+	note D_, 2
+	note C#, 2
+	note B_, 4
+	note D_, 2
+	note C#, 2
+	note B_, 4
+	note D_, 2
+	note C#, 2
+	note D_, 1
+	note C#, 1
+	note D_, 1
+	note C#, 1
+	note D_, 2
+	note C#, 2
+	note C#, 2
+	note D_, 2
+	note B_, 16
+	endchannel
+; f1103
+
+
+INCBIN "baserom.gbc", $f1103, $f1104 - $f1103
+
+
+Sfx_GetTm: ; f1104
+	dbw $c4, Sfx_GetTm_Ch5
+	dbw $05, Sfx_GetTm_Ch6
+	dbw $06, Sfx_GetTm_Ch7
+	dbw $07, Sfx_GetTm_Ch8
+; f1110
+
+Sfx_GetTm_Ch5: ; f1110
+	togglesfx
+	tempo 144
+	volume $77
+	dutycycle $3
+	vibrato $8, $24
+	notetype $c, $a3
+	octave 4
+	note D_, 1
+	note __, 1
+	octave 3
+	note B_, 1
+	octave 4
+	note D_, 1
+	note G_, 6
+	intensity $b1
+	note E_, 2
+	note F#, 2
+	note G_, 2
+	intensity $a5
+	note F#, 8
+	note __, 6
+	endchannel
+; f1130
+
+
+INCBIN "baserom.gbc", $f1130, $f1131 - $f1130
+
+
+Sfx_GetTm_Ch6: ; f1131
+	togglesfx
+	dutycycle $3
+	vibrato $8, $24
+	notetype $c, $b3
+	octave 4
+	note G_, 1
+	note __, 1
+	note D_, 1
+	note G_, 1
+	note B_, 6
+	intensity $c1
+	note A_, 2
+	note B_, 2
+	octave 5
+	note C_, 2
+	intensity $b5
+	note D_, 8
+	note __, 6
+	endchannel
+; f114b
+
+
+INCBIN "baserom.gbc", $f114b, $f114c - $f114b
+
+
+Sfx_GetTm_Ch7: ; f114c
+	togglesfx
+	notetype $6, $25
+	octave 2
+	note B_, 2
+	note __, 2
+	note G_, 2
+	note B_, 2
+	octave 3
+	note D_, 4
+	octave 2
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 4
+	octave 3
+	note C_, 2
+	note __, 2
+	octave 2
+	note B_, 2
+	note __, 2
+	octave 3
+	note C_, 4
+	octave 2
+	note A_, 16
+	note __, 6
+	endchannel
+; f1169
+
+
+INCBIN "baserom.gbc", $f1169, $f116a - $f1169
+
+
+Sfx_GetTm_Ch8: ; f116a
+	togglesfx
+	sfxtogglenoise $4
+	notetype $6
+	note D_, 4
+	note C#, 2
+	note D_, 2
+	note B_, 8
+	note D_, 4
+	note C#, 4
+	note D_, 4
+	note C#, 1
+	note C#, 1
+	note D_, 2
+	note B_, 16
+	note __, 6
+	endchannel
+; f117c
+
+
+INCBIN "baserom.gbc", $f117c, $f117d - $f117c
+
+
+Sfx_GetBadge: ; f117d
+	dbw $c4, Sfx_GetBadge_Ch5
+	dbw $05, Sfx_GetBadge_Ch6
+	dbw $06, Sfx_GetBadge_Ch7
+	dbw $07, Sfx_GetBadge_Ch8
+; f1189
+
+Sfx_GetBadge_Ch5: ; f1189
+	togglesfx
+	tempo 120
+	volume $77
+	dutycycle $2
+	vibrato $8, $24
+	notetype $6, $92
+	octave 4
+	note F_, 3
+	callchannel Sfx_GetBadge_branch_f11aa
+	note A#, 3
+	forceoctave $2
+	callchannel Sfx_GetBadge_branch_f11aa
+	forceoctave $0
+	intensity $a7
+	note A_, 16
+	note __, 6
+	endchannel
+; f11a9
+
+
+INCBIN "baserom.gbc", $f11a9, $f11aa - $f11a9
+
+
+Sfx_GetBadge_branch_f11aa: ; f11aa
+	note __, 5
+	octave 3
+	note F_, 2
+	note G#, 2
+	octave 4
+	note C#, 2
+	note F_, 2
+	note C#, 2
+	octave 3
+	note F_, 2
+	note G#, 2
+	octave 4
+	note C#, 2
+	octave 3
+	note F_, 2
+	note G#, 2
+	octave 4
+	note C#, 2
+	note F_, 2
+	endchannel
+; f11be
+
+Sfx_GetBadge_Ch6: ; f11be
+	togglesfx
+	dutycycle $3
+	vibrato $8, $24
+	notetype $6, $b5
+	octave 5
+	note C#, 3
+	note __, 3
+	octave 4
+	note G#, 1
+	note __, 1
+	note G#, 8
+	octave 3
+	note C#, 2
+	note __, 2
+	octave 2
+	note G#, 2
+	note __, 1
+	intensity $95
+	octave 5
+	note C_, 1
+	intensity $b5
+	note C#, 2
+	note __, 2
+	note D_, 2
+	note __, 2
+	note D#, 3
+	note __, 3
+	octave 4
+	note A#, 1
+	note __, 1
+	note A#, 8
+	octave 3
+	note D#, 2
+	note __, 2
+	octave 2
+	note A#, 2
+	note __, 1
+	intensity $95
+	octave 5
+	note D_, 1
+	intensity $b5
+	note D#, 8
+	note F_, 16
+	note __, 6
+	endchannel
+; f11f4
+
+
+INCBIN "baserom.gbc", $f11f4, $f11f5 - $f11f4
+
+
+Sfx_GetBadge_Ch7: ; f11f5
+	togglesfx
+	notetype $6, $25
+	octave 2
+	note G#, 3
+	note __, 3
+	octave 3
+	note C#, 1
+	note __, 1
+	note C#, 8
+	note G#, 2
+	note __, 2
+	note F_, 2
+	note __, 2
+	note C#, 2
+	note C_, 2
+	octave 2
+	note A#, 2
+	note G#, 2
+	note G_, 3
+	note __, 3
+	octave 3
+	note D#, 1
+	note __, 1
+	note D#, 8
+	note A#, 2
+	note __, 2
+	note G_, 2
+	note __, 2
+	note G_, 2
+	note F_, 2
+	note G_, 2
+	note D#, 2
+	note F_, 16
+	note __, 6
+	endchannel
+; f121a
+
+
+INCBIN "baserom.gbc", $f121a, $f121b - $f121a
+
+
+Sfx_GetBadge_Ch8: ; f121b
+	togglesfx
+	sfxtogglenoise $4
+	notetype $6
+Sfx_GetBadge_branch_f1220: ; f1220
+	note B_, 12
+	note D_, 1
+	note D_, 1
+	note D_, 2
+	note D_, 4
+	note D_, 4
+	note D_, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	loopchannel 2, Sfx_GetBadge_branch_f1220
+	note B_, 16
+	note __, 6
+	endchannel
+; f1235
+
+
+INCBIN "baserom.gbc", $f1235, $f1236 - $f1235
+
+
+Sfx_QuitSlots: ; f1236
+	dbw $c4, Sfx_QuitSlots_Ch5
+	dbw $05, Sfx_QuitSlots_Ch6
+	dbw $06, Sfx_QuitSlots_Ch7
+	dbw $07, Sfx_QuitSlots_Ch8
+; f1242
+
+Sfx_QuitSlots_Ch5: ; f1242
+	togglesfx
+	tempo 144
+	volume $77
+	dutycycle $2
+	notetype $8, $82
+	octave 3
+	note G#, 2
+	note __, 4
+	note C#, 2
+	note F_, 2
+	note G#, 2
+	note F_, 2
+	note G#, 2
+	octave 4
+	note D_, 2
+	note F_, 2
+	note D_, 2
+	octave 3
+	note B_, 2
+	note A#, 2
+	note F#, 2
+	note A#, 2
+	note G#, 2
+	note F#, 2
+	intensity $97
+	note G#, 14
+	note __, 6
+	endchannel
+; f1265
+
+
+INCBIN "baserom.gbc", $f1265, $f1266 - $f1265
+
+
+Sfx_QuitSlots_Ch6: ; f1266
+	togglesfx
+	dutycycle $2
+	notetype $8, $b3
+	note __, 3
+	octave 4
+	note B_, 1
+	octave 5
+	note C_, 2
+	octave 4
+	note G#, 4
+	note A#, 2
+	intensity $c1
+	note B_, 4
+	note A#, 2
+	note G#, 4
+	note F_, 2
+	note F#, 4
+	note F_, 2
+	note D#, 4
+	intensity $b7
+	note F_, 14
+	note __, 6
+	endchannel
+; f1282
+
+
+INCBIN "baserom.gbc", $f1282, $f1283 - $f1282
+
+
+Sfx_QuitSlots_Ch7: ; f1283
+	togglesfx
+	notetype $8, $25
+	octave 3
+	note C#, 2
+	note __, 2
+	note F_, 2
+	note D#, 2
+	note C#, 2
+	note G#, 2
+	note D_, 2
+	note __, 2
+	note D_, 2
+	octave 2
+	note G#, 2
+	note B_, 2
+	octave 3
+	note D_, 2
+	note D#, 2
+	note __, 2
+	octave 2
+	note A#, 2
+	octave 3
+	note C_, 2
+	note __, 2
+	note C#, 14
+	note __, 6
+	endchannel
+; f12a0
+
+
+INCBIN "baserom.gbc", $f12a0, $f12a1 - $f12a0
+
+
+Sfx_QuitSlots_Ch8: ; f12a1
+	togglesfx
+	sfxtogglenoise $3
+	notetype $8
+	note D#, 6
+	note D_, 4
+	note D#, 2
+	note D#, 4
+	note D#, 2
+	note D_, 4
+	note D#, 2
+	note D_, 4
+	note D#, 2
+	note D_, 4
+	note B_, 14
+	note __, 6
+	endchannel
+; f12b3
+
+
+INCBIN "baserom.gbc", $f12b3, $f12b4 - $f12b3
+
+
+Sfx_Protect: ; f12b4
+	dbw $44, Sfx_Protect_Ch5
+	dbw $07, Sfx_Protect_Ch8
+; f12ba
+
+Sfx_Protect_Ch5: ; f12ba
+	togglesfx
+	notetype $1, $f1
+	dutycycle $0
+Sfx_Protect_branch_f12c0: ; f12c0
+	octave 5
+	note F_, 5
+	note A_, 5
+	octave 6
+	note C_, 5
+	note E_, 5
+	octave 5
+	note F#, 5
+	note A#, 5
+	octave 6
+	note C#, 5
+	note E_, 5
+	loopchannel 3, Sfx_Protect_branch_f12c0
+	intensity $c1
+	octave 5
+	note F_, 5
+	note A_, 5
+	intensity $91
+	octave 6
+	note C_, 5
+	note E_, 5
+	intensity $71
+	octave 5
+	note F#, 5
+	note A#, 5
+	intensity $51
+	octave 6
+	note C#, 5
+	note E_, 5
+	endchannel
+; f12e5
+
+Sfx_Protect_Ch8: ; f12e5
+Sfx_Protect_branch_f12e5: ; f12e5
+	noise $9, $9e, $0
+	noise $9, $be, $11
+	loopchannel 6, Sfx_Protect_branch_f12e5
+	noise $9, $a7, $0
+	noise $10, $75, $11
+	endchannel
+; f12f6
+
+Sfx_Sketch: ; f12f6
+	dbw $04, Sfx_Sketch_Ch5
+; f12f9
+
+Sfx_Sketch_Ch5: ; f12f9
+	dutycycle $1
+	soundinput $a5
+Sfx_Sketch_branch_f12fd: ; f12fd
+	sound $2, $f1, $06e0
+	sound $d, $af, $05b0
+	sound $4, $0, $0000
+	sound $9, $f4, $0718
+	loopchannel 3, Sfx_Sketch_branch_f12fd
+	soundinput $8
+	endchannel
+; f1314
+
+Sfx_RainDance: ; f1314
+	dbw $07, Sfx_RainDance_Ch8
+; f1317
+
+Sfx_RainDance_Ch8: ; f1317
+Sfx_RainDance_branch_f1317: ; f1317
+	noise $b, $7d, $50
+	noise $6, $7d, $4f
+	noise $b, $7f, $47
+	noise $f, $6e, $22
+	loopchannel 3, Sfx_RainDance_branch_f1317
+	noise $6, $6d, $50
+	noise $5, $5d, $4f
+	noise $5, $4f, $47
+	noise $a, $32, $46
+	endchannel
+; f1334
+
+Sfx_Aeroblast: ; f1334
+	dbw $44, Sfx_Aeroblast_Ch5
+	dbw $07, Sfx_Aeroblast_Ch8
+; f133a
+
+Sfx_Aeroblast_Ch5: ; f133a
+	unknownmusic0xde $f2
+	soundinput $f5
+	sound $1c, $f8, $0580
+	soundinput $8
+	endchannel
+; f1345
+
+Sfx_Aeroblast_Ch8: ; f1345
+	noise $4, $f8, $6c
+	noise $4, $c8, $5c
+	noise $4, $78, $5b
+	noise $10, $31, $5a
+	endchannel
+; f1352
+
+Sfx_Spark: ; f1352
+	dbw $07, Sfx_Spark_Ch8
+; f1355
+
+Sfx_Spark_Ch8: ; f1355
+Sfx_Spark_branch_f1355: ; f1355
+	noise $4, $f8, $5d
+	noise $4, $d8, $6f
+	loopchannel 2, Sfx_Spark_branch_f1355
+	endchannel
+; f1360
+
+Sfx_Curse: ; f1360
+	dbw $44, Sfx_Curse_Ch5
+	dbw $07, Sfx_Curse_Ch8
+; f1366
+
+Sfx_Curse_Ch5: ; f1366
+	dutycycle $3
+	sound $4, $f2, $0483
+	sound $4, $f2, $0511
+	sound $4, $f2, $0589
+	sound $4, $f2, $05ed
+	endchannel
+; f1379
+
+Sfx_Curse_Ch8: ; f1379
+	noise $14, $9a, $9
+	endchannel
+; f137d
+
+Sfx_Rage: ; f137d
+	dbw $44, Sfx_Rage_Ch5
+	dbw $07, Sfx_Rage_Ch8
+; f1383
+
+Sfx_Rage_Ch5: ; f1383
+	dutycycle $0
+	sound $3, $d1, $07b0
+	sound $3, $d1, $07c2
+	sound $18, $d2, $07d5
+	endchannel
+; f1392
+
+Sfx_Rage_Ch8: ; f1392
+	noise $3, $f4, $1a
+	noise $3, $f4, $19
+	noise $18, $f2, $18
+	endchannel
+; f139c
+
+Sfx_Thief: ; f139c
+	dbw $07, Sfx_Thief_Ch8
+; f139f
+
+Sfx_Thief_Ch8: ; f139f
+Sfx_Thief_branch_f139f: ; f139f
+	noise $0, $0, $0
+	noise $4, $e1, $12
+	noise $0, $0, $0
+	noise $2, $b1, $22
+	loopchannel 2, Sfx_Thief_branch_f139f
+	endchannel
+; f13b0
+
+Sfx_Thief2: ; f13b0
+	dbw $04, Sfx_Thief2_Ch5
+; f13b3
+
+Sfx_Thief2_Ch5: ; f13b3
+	togglesfx
+	notetype $2, $f4
+	dutycycle $0
+	octave 4
+	note C#, 3
+	note A#, 3
+	intensity $d2
+	note C#, 3
+	note A#, 3
+	intensity $b1
+	note C_, 3
+	note A_, 3
+	intensity $81
+	note C_, 3
+	note A_, 3
+	togglesfx
+	endchannel
+; f13ca
+
+Sfx_SpiderWeb: ; f13ca
+	dbw $44, Sfx_SpiderWeb_Ch5
+	dbw $07, Sfx_SpiderWeb_Ch8
+; f13d0
+
+Sfx_SpiderWeb_Ch5: ; f13d0
+	dutycycle $0
+	sound $20, $7f, $0720
+	soundinput $95
+	sound $4, $f8, $0620
+	sound $4, $e8, $0630
+	sound $4, $d8, $0640
+	sound $4, $95, $0620
+	sound $4, $73, $0630
+	sound $4, $51, $0640
+	soundinput $8
+	endchannel
+; f13f3
+
+Sfx_SpiderWeb_Ch8: ; f13f3
+	noise $20, $ef, $0
+	endchannel
+; f13f7
+
+Sfx_MindReader: ; f13f7
+	dbw $44, Sfx_MindReader_Ch5
+	dbw $07, Sfx_MindReader_Ch8
+; f13fd
+
+Sfx_MindReader_Ch5: ; f13fd
+	togglesfx
+	dutycycle $2
+	notetype $2, $f1
+	octave 5
+	note C_, 3
+	intensity $41
+	note C_, 3
+	intensity $f1
+	note C#, 3
+	intensity $41
+	note C#, 3
+	intensity $f1
+	note D_, 3
+	intensity $41
+	note D_, 3
+	togglesfx
+	endchannel
+; f1416
+
+Sfx_MindReader_Ch8: ; f1416
+	noise $11, $af, $19
+	noise $12, $af, $18
+	endchannel
+; f141d
+
+Sfx_Nightmare: ; f141d
+	dbw $04, Sfx_Nightmare_Ch5
+; f1420
+
+Sfx_Nightmare_Ch5: ; f1420
+	dutycycle $0
+	soundinput $34
+Sfx_Nightmare_branch_f1424: ; f1424
+	sound $3, $ba, $0631
+	sound $2, $0, $0000
+	sound $3, $f8, $0621
+	sound $2, $0, $0000
+	sound $3, $f8, $0611
+	sound $2, $0, $0000
+	sound $3, $e8, $0601
+	sound $2, $0, $0000
+	sound $3, $e8, $05f1
+	sound $2, $0, $0000
+	loopchannel 2, Sfx_Nightmare_branch_f1424
+	soundinput $8
+	endchannel
+; f1453
+
+Sfx_Snore: ; f1453
+	dbw $07, Sfx_Snore_Ch8
+; f1456
+
+Sfx_Snore_Ch8: ; f1456
+	noise $2, $ea, $4b
+	noise $2, $ea, $5b
+	noise $2, $0, $0
+	noise $4, $ee, $47
+	noise $4, $ee, $46
+	noise $4, $ee, $45
+	endchannel
+; f1469
+
+Sfx_SweetKiss: ; f1469
+	dbw $04, Sfx_SweetKiss_Ch5
+; f146c
+
+Sfx_SweetKiss_Ch5: ; f146c
+	dutycycle $2
+Sfx_SweetKiss_branch_f146e: ; f146e
+	sound $2, $c1, $07c8
+	sound $2, $d1, $07da
+	loopchannel 2, Sfx_SweetKiss_branch_f146e
+	sound $1a, $f1, $07e2
+	endchannel
+; f147f
+
+Sfx_SweetKiss2: ; f147f
+	dbw $04, Sfx_SweetKiss2_Ch5
+; f1482
+
+Sfx_SweetKiss2_Ch5: ; f1482
+	dutycycle $0
+	soundinput $97
+	sound $2, $f4, $0772
+	sound $4, $0, $0000
+	sound $2, $c4, $0772
+	sound $4, $0, $0000
+	sound $2, $b4, $0772
+	sound $4, $0, $0000
+	sound $2, $a1, $0772
+	soundinput $8
+	endchannel
+; f14a5
+
+Sfx_BellyDrum: ; f14a5
+	dbw $44, Sfx_BellyDrum_Ch5
+	dbw $07, Sfx_BellyDrum_Ch8
+; f14ab
+
+Sfx_BellyDrum_Ch5: ; f14ab
+	dutycycle $2
+	soundinput $ac
+	sound $c, $f1, $05a3
+	soundinput $8
+	endchannel
+; f14b6
+
+Sfx_BellyDrum_Ch8: ; f14b6
+	noise $c, $b1, $6c
+	endchannel
+; f14ba
+
+Sfx_Unknown7F: ; f14ba
+	dbw $04, Sfx_Unknown7F_Ch5
+; f14bd
+
+Sfx_Unknown7F_Ch5: ; f14bd
+	dutycycle $2
+	soundinput $95
+	sound $2, $c9, $03b3
+	sound $5, $f8, $0463
+	sound $4, $d1, $0543
+	soundinput $8
+	endchannel
+; f14d0
+
+Sfx_SludgeBomb: ; f14d0
+	dbw $44, Sfx_SludgeBomb_Ch5
+	dbw $07, Sfx_SludgeBomb_Ch8
+; f14d6
+
+Sfx_SludgeBomb_Ch5: ; f14d6
+	dutycycle $2
+	soundinput $c5
+	sound $3, $f8, $0581
+	sound $1, $0, $0000
+	soundinput $cb
+	sound $10, $f2, $05d1
+	soundinput $8
+	endchannel
+; f14eb
+
+Sfx_SludgeBomb_Ch8: ; f14eb
+	noise $3, $e2, $6e
+	noise $1, $0, $0
+	noise $10, $e2, $6d
+	endchannel
+; f14f5
+
+Sfx_Foresight: ; f14f5
+	dbw $04, Sfx_Foresight_Ch5
+; f14f8
+
+Sfx_Foresight_Ch5: ; f14f8
+	sound $3, $f4, $07b5
+	sound $3, $f5, $07c8
+	sound $8, $f4, $07da
+	sound $2, $0, $0000
+	sound $8, $c1, $07da
+	sound $2, $0, $0000
+	sound $8, $91, $07da
+	endchannel
+; f1515
+
+Sfx_Spite: ; f1515
+	dbw $04, Sfx_Spite_Ch5
+; f1518
+
+Sfx_Spite_Ch5: ; f1518
+	togglesfx
+	vibrato $0, $12
+	dutycycle $3
+	soundinput $fd
+	notetype $3, $f8
+	octave 3
+	note F_, 3
+	note G#, 3
+	note B_, 3
+	note E_, 3
+	note G_, 3
+	note A#, 3
+	intensity $bf
+	note D#, 3
+	note F#, 3
+	note A_, 3
+	intensity $5f
+	note D_, 3
+	intensity $2f
+	note F_, 3
+	note G#, 3
+	soundinput $8
+	togglesfx
+	endchannel
+; f153a
+
+Sfx_Outrage: ; f153a
+	dbw $07, Sfx_Outrage_Ch8
+; f153d
+
+Sfx_Outrage_Ch8: ; f153d
+	noise $b, $ea, $6c
+	noise $b, $ea, $6b
+	noise $b, $ea, $6a
+	noise $b, $ea, $69
+	noise $b, $e1, $59
+	endchannel
+; f154d
+
+Sfx_PerishSong: ; f154d
+	dbw $44, Sfx_PerishSong_Ch5
+	dbw $05, Sfx_PerishSong_Ch6
+; f1553
+
+Sfx_PerishSong_Ch5: ; f1553
+	togglesfx
+	dutycycle $0
+	vibrato $12, $53
+	notetype $8, $af
+	octave 4
+	note A_, 9
+	note G#, 9
+	togglesfx
+	endchannel
+; f1561
+
+Sfx_PerishSong_Ch6: ; f1561
+	togglesfx
+	dutycycle $0
+	vibrato $12, $53
+	notetype $8, $af
+	octave 4
+	note C_, 9
+	octave 3
+	note B_, 9
+	togglesfx
+	endchannel
+; f1570
+
+Sfx_GigaDrain: ; f1570
+	dbw $44, Sfx_GigaDrain_Ch5
+	dbw $07, Sfx_GigaDrain_Ch8
+; f1576
+
+Sfx_GigaDrain_Ch5: ; f1576
+	dutycycle $2
+	soundinput $97
+	sound $4, $f8, $0680
+	sound $14, $f8, $0680
+	sound $14, $c8, $0660
+	sound $14, $a8, $0670
+	sound $14, $88, $0680
+	sound $14, $f8, $0561
+	sound $14, $c8, $0541
+	sound $14, $a8, $0521
+	sound $14, $88, $0511
+	soundinput $8
+	endchannel
+; f15a1
+
+Sfx_GigaDrain_Ch8: ; f15a1
+	noise $4, $c8, $44
+	noise $14, $c8, $50
+	noise $14, $c8, $52
+	noise $14, $c8, $54
+	noise $14, $c8, $56
+	noise $40, $c7, $57
+	endchannel
+; f15b4
+
+Sfx_Attract: ; f15b4
+	dbw $04, Sfx_Attract_Ch5
+; f15b7
+
+Sfx_Attract_Ch5: ; f15b7
+	dutycycle $0
+	soundinput $77
+	sound $4, $a9, $06f0
+	sound $c, $f8, $0720
+	soundinput $7f
+	sound $8, $f1, $0740
+	soundinput $8
+	endchannel
+; f15cc
+
+Sfx_Kinesis2: ; f15cc
+	dbw $04, Sfx_Kinesis2_Ch5
+; f15cf
+
+Sfx_Kinesis2_Ch5: ; f15cf
+	dutycycle $0
+	sound $2, $f3, $0796
+	sound $2, $23, $0796
+	sound $14, $f1, $07c4
+	endchannel
+; f15de
+
+Sfx_ZapCannon: ; f15de
+	dbw $07, Sfx_ZapCannon_Ch8
+; f15e1
+
+Sfx_ZapCannon_Ch8: ; f15e1
+Sfx_ZapCannon_branch_f15e1: ; f15e1
+	noise $2, $e1, $49
+	noise $0, $0, $0
+	loopchannel 8, Sfx_ZapCannon_branch_f15e1
+	noise $8, $e1, $49
+	endchannel
+; f15ef
+
+Sfx_MeanLook: ; f15ef
+	dbw $04, Sfx_MeanLook_Ch5
+; f15f2
+
+Sfx_MeanLook_Ch5: ; f15f2
+	soundinput $77
+	dutycycle $3
+	sound $2, $f8, $0720
+Sfx_MeanLook_branch_f15fa: ; f15fa
+	sound $1, $88, $0660
+	sound $2, $f8, $0790
+	loopchannel 5, Sfx_MeanLook_branch_f15fa
+	sound $c, $f8, $0700
+	sound $c, $c8, $0720
+	sound $c, $a8, $0700
+	sound $c, $78, $0720
+	sound $c, $48, $0700
+	sound $c, $28, $0720
+	soundinput $8
+	endchannel
+; f1621
+
+Sfx_HealBell: ; f1621
+	dbw $04, Sfx_HealBell_Ch5
+; f1624
+
+Sfx_HealBell_Ch5: ; f1624
+	dutycycle $1
+	sound $1, $f1, $07da
+	sound $1, $d1, $07d9
+	sound $1, $f1, $07da
+	sound $8, $d1, $07db
+	endchannel
+; f1637
+
+Sfx_Return: ; f1637
+	dbw $04, Sfx_Return_Ch5
+; f163a
+
+Sfx_Return_Ch5: ; f163a
+	dutycycle $0
+Sfx_Return_branch_f163c: ; f163c
+	soundinput $bf
+	sound $8, $f1, $0759
+	soundinput $57
+	sound $8, $f1, $0759
+	sound $10, $0, $0000
+	loopchannel 2, Sfx_Return_branch_f163c
+	soundinput $8
+	endchannel
+; f1653
+
+Sfx_ExpBar: ; f1653
+	dbw $04, Sfx_ExpBar_Ch5
+; f1656
+
+Sfx_ExpBar_Ch5: ; f1656
+	dutycycle $2
+	soundinput $d7
+	sound $8, $e1, $0750
+	soundinput $e7
+	sound $8, $48, $06e0
+	sound $8, $58, $06f8
+	sound $8, $68, $0710
+	sound $8, $78, $0728
+	sound $8, $88, $0740
+	sound $8, $98, $0758
+	sound $10, $a8, $0770
+	soundinput $8
+	endchannel
+; f167f
+
+Sfx_MilkDrink: ; f167f
+	dbw $04, Sfx_MilkDrink_Ch5
+; f1682
+
+Sfx_MilkDrink_Ch5: ; f1682
+	dutycycle $2
+Sfx_MilkDrink_branch_f1684: ; f1684
+	soundinput $a4
+	sound $2, $ea, $04e0
+	sound $d, $f7, $0290
+	soundinput $9e
+	sound $4, $c9, $05e1
+	sound $2, $0, $0000
+	loopchannel 6, Sfx_MilkDrink_branch_f1684
+	soundinput $8
+	endchannel
+; f169f
+
+Sfx_Present: ; f169f
+	dbw $04, Sfx_Present_Ch5
+; f16a2
+
+Sfx_Present_Ch5: ; f16a2
+	dutycycle $2
+	soundinput $d6
+Sfx_Present_branch_f16a6: ; f16a6
+	sound $2, $f1, $0740
+	sound $1, $0, $0000
+	loopchannel 3, Sfx_Present_branch_f16a6
+	sound $10, $f1, $0780
+	soundinput $8
+	endchannel
+; f16b9
+
+Sfx_MorningSun: ; f16b9
+	dbw $04, Sfx_MorningSun_Ch5
+; f16bc
+
+Sfx_MorningSun_Ch5: ; f16bc
+	dutycycle $3
+Sfx_MorningSun_branch_f16be: ; f16be
+	sound $2, $f1, $07e4
+	sound $2, $f1, $07e0
+	sound $5, $f2, $07e7
+	loopchannel 3, Sfx_MorningSun_branch_f16be
+	sound $1, $0, $0000
+	sound $8, $c2, $07e7
+	sound $1, $0, $0000
+	sound $8, $82, $07e7
+	endchannel
+; f16df
+
+Sfx_Moonlight: ; f16df
+	dbw $04, Sfx_Moonlight_Ch5
+; f16e2
+
+Sfx_Moonlight_Ch5: ; f16e2
+	dutycycle $2
+Sfx_Moonlight_branch_f16e4: ; f16e4
+	sound $1, $f8, $07d0
+	sound $4, $f1, $07e0
+	loopchannel 2, Sfx_Moonlight_branch_f16e4
+	sound $10, $f1, $07e0
+	sound $10, $d1, $07e0
+	sound $10, $81, $07e0
+	endchannel
+; f16fd
+
+Sfx_Encore: ; f16fd
+	dbw $44, Sfx_Encore_Ch5
+	dbw $07, Sfx_Encore_Ch8
+; f1703
+
+Sfx_Encore_Ch5: ; f1703
+	dutycycle $2
+	soundinput $ce
+	sound $10, $0, $0000
+Sfx_Encore_branch_f170b: ; f170b
+	sound $2, $f8, $0774
+	sound $24, $0, $0000
+	loopchannel 2, Sfx_Encore_branch_f170b
+	soundinput $8
+	endchannel
+; f171a
+
+Sfx_Encore_Ch8: ; f171a
+	noise $30, $1f, $36
+	noise $30, $76, $36
+	endchannel
+; f1721
+
+Sfx_BeatUp: ; f1721
+	dbw $07, Sfx_BeatUp_Ch8
+; f1724
+
+Sfx_BeatUp_Ch8: ; f1724
+	noise $2, $e8, $69
+	noise $6, $d8, $24
+	noise $2, $e8, $6c
+	noise $4, $c8, $46
+	noise $6, $d1, $24
+	endchannel
+; f1734
+
+Sfx_SweetScent: ; f1734
+	dbw $04, Sfx_SweetScent_Ch5
+; f1737
+
+Sfx_SweetScent_Ch5: ; f1737
+	dutycycle $2
+	soundinput $96
+	sound $6, $f8, $0760
+	sound $6, $e8, $0720
+	soundinput $df
+	sound $16, $f1, $0730
+	soundinput $8
+	endchannel
+; f174c
+
+Sfx_BatonPass: ; f174c
+	dbw $44, Sfx_BatonPass_Ch5
+	dbw $07, Sfx_BatonPass_Ch8
+; f1752
+
+Sfx_BatonPass_Ch5: ; f1752
+	dutycycle $2
+	soundinput $f7
+	sound $20, $f2, $0680
+	sound $1, $f1, $0760
+	sound $20, $0, $0000
+	sound $1, $f1, $0760
+	sound $1a, $0, $0000
+	sound $1, $f1, $0760
+	soundinput $8
+	endchannel
+; f1771
+
+Sfx_BatonPass_Ch8: ; f1771
+	noise $20, $f2, $20
+	endchannel
+; f1775
+
+Sfx_EggCrack: ; f1775
+	dbw $04, Sfx_EggCrack_Ch5
+; f1778
+
+Sfx_EggCrack_Ch5: ; f1778
+	togglesfx
+	notetype $1, $f1
+	dutycycle $0
+	octave 4
+	note D#, 1
+	note C_, 1
+	note __, 1
+	note F#, 1
+	endchannel
+; f1784
+
+Sfx_Evolved: ; f1784
+	dbw $04, Sfx_Evolved_Ch5
+; f1787
+
+Sfx_Evolved_Ch5: ; f1787
+	togglesfx
+	notetype $1, $c1
+	octave 4
+	note C_, 2
+	note E_, 2
+	note C_, 2
+	note E_, 3
+	note G_, 3
+	note B_, 3
+	octave 5
+	note E_, 2
+	note C_, 2
+	note E_, 2
+	note G_, 3
+	note B_, 3
+	octave 7
+	note C_, 16
+	endchannel
+; f179b
+
+Sfx_MasterBall: ; f179b
+	dbw $04, Sfx_MasterBall_Ch5
+; f179e
+
+Sfx_MasterBall_Ch5: ; f179e
+	togglesfx
+	dutycycle $1
+	notetype $2, $e1
+	octave 6
+	note B_, 2
+	octave 7
+	note D_, 2
+	octave 6
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	note A#, 2
+	note A_, 2
+	note A#, 2
+	note A_, 2
+	intensity $c1
+	note G#, 2
+	note G_, 2
+	note F#, 2
+	intensity $91
+	note F_, 2
+	note E_, 2
+	note D#, 2
+	intensity $61
+	note D_, 2
+	note C#, 2
+	note C_, 2
+	endchannel
+; f17c0
+
+Sfx_EggHatch: ; f17c0
+	dbw $04, Sfx_EggHatch_Ch5
+; f17c3
+
+Sfx_EggHatch_Ch5: ; f17c3
+	togglesfx
+	notetype $2, $f1
+	dutycycle $2
+	octave 5
+	note E_, 1
+	note C_, 1
+	note __, 1
+	note G_, 1
+	note D_, 1
+	intensity $e2
+	note B_, 7
+	intensity $82
+	note B_, 7
+	intensity $42
+	note B_, 7
+	endchannel
+; f17d9
+
+Sfx_GsIntroCharizardFireball: ; f17d9
+	dbw $07, Sfx_GsIntroCharizardFireball_Ch8
+; f17dc
+
+Sfx_GsIntroCharizardFireball_Ch8: ; f17dc
+	noise $8, $cf, $4d
+	noise $8, $f1, $37
+Sfx_GsIntroCharizardFireball_branch_f17e2: ; f17e2
+	noise $1, $f8, $4f
+	noise $0, $c8, $26
+	noise $1, $d8, $5f
+	noise $0, $a8, $37
+	loopchannel 12, Sfx_GsIntroCharizardFireball_branch_f17e2
+	noise $3, $f8, $6f
+	noise $4, $d8, $5f
+	noise $c, $d8, $5c
+	noise $28, $d3, $4f
+	endchannel
+; f17ff
+
+Sfx_GsIntroPokemonAppears: ; f17ff
+	dbw $07, Sfx_GsIntroPokemonAppears_Ch8
+; f1802
+
+Sfx_GsIntroPokemonAppears_Ch8: ; f1802
+	noise $1, $88, $4f
+	noise $2, $8f, $2
+	noise $2, $5f, $12
+	noise $2, $3f, $22
+	noise $0, $f8, $27
+	noise $1, $f8, $4f
+	noise $8, $f1, $0
+	endchannel
+; f1818
+
+Sfx_Flash: ; f1818
+	dbw $04, Sfx_Flash_Ch5
+; f181b
+
+Sfx_Flash_Ch5: ; f181b
+	dutycycle $1
+	soundinput $ef
+	sound $1, $40, $07e8
+	sound $1, $60, $07e8
+	sound $2, $80, $07e8
+	sound $5, $a0, $07e8
+	sound $6, $a0, $07e8
+	sound $7, $80, $07e8
+	sound $8, $60, $07e8
+	sound $9, $30, $07e8
+	sound $f, $12, $07e8
+	soundinput $8
+	endchannel
+; f1846
+
+Sfx_GameFreakLogoGs: ; f1846
+	dbw $04, Sfx_GameFreakLogoGs_Ch5
+; f1849
+
+Sfx_GameFreakLogoGs_Ch5: ; f1849
+	dutycycle $3
+	soundinput $7f
+	sound $4, $55, $07e2
+	sound $5, $75, $07e2
+	sound $6, $94, $07e2
+	sound $7, $b4, $07e2
+	sound $8, $b3, $07e2
+	sound $9, $93, $07e2
+	sound $a, $72, $07e2
+	sound $a, $53, $07e2
+	sound $a, $34, $07e2
+	sound $a, $15, $07e2
+	soundinput $8
+	endchannel
+; f1878
+
+Sfx_DexFanfareLessThan20: ; f1878
+	dbw $c4, Sfx_DexFanfareLessThan20_Ch5
+	dbw $05, Sfx_DexFanfareLessThan20_Ch6
+	dbw $06, Sfx_DexFanfareLessThan20_Ch7
+	dbw $07, Sfx_DexFanfareLessThan20_Ch8
+; f1884
+
+Sfx_DexFanfareLessThan20_Ch5: ; f1884
+	togglesfx
+	tempo 124
+	volume $77
+	notetype $8, $b1
+	octave 3
+	note A_, 4
+	note F#, 2
+	note A_, 4
+	note F#, 2
+	note C#, 6
+	note G_, 6
+	note F#, 6
+	note E_, 2
+	note E_, 2
+	note E_, 2
+	note D_, 6
+	endchannel
+; f189a
+
+
+INCBIN "baserom.gbc", $f189a, $f189b - $f189a
+
+
+Sfx_DexFanfareLessThan20_Ch6: ; f189b
+	togglesfx
+	notetype $8, $c1
+	octave 3
+	note B_, 4
+	note A_, 2
+	note B_, 4
+	note A_, 2
+	note D#, 6
+	note A#, 6
+	note A_, 6
+	note A_, 2
+	note A_, 2
+	note G_, 2
+	note F#, 6
+	endchannel
+; f18ac
+
+
+INCBIN "baserom.gbc", $f18ac, $f18ad - $f18ac
+
+
+Sfx_DexFanfareLessThan20_Ch7: ; f18ad
+	togglesfx
+	notetype $8, $25
+	octave 4
+	note D_, 6
+	octave 3
+	note A_, 2
+	note __, 2
+	note A_, 2
+	note A#, 4
+	note G_, 2
+	octave 4
+	note D#, 6
+	note D_, 2
+	note __, 4
+	octave 3
+	note E_, 1
+	note __, 1
+	note F#, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A_, 2
+	note __, 6
+	endchannel
+; f18c7
+
+
+INCBIN "baserom.gbc", $f18c7, $f18c8 - $f18c7
+
+
+Sfx_DexFanfareLessThan20_Ch8: ; f18c8
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C#, 6
+	note __, 16
+	note __, 12
+	endchannel
+; f18d1
+
+
+INCBIN "baserom.gbc", $f18d1, $f18d2 - $f18d1
+
+
+Sfx_DexFanfare140169: ; f18d2
+	dbw $c4, Sfx_DexFanfare140169_Ch5
+	dbw $05, Sfx_DexFanfare140169_Ch6
+	dbw $06, Sfx_DexFanfare140169_Ch7
+	dbw $07, Sfx_DexFanfare140169_Ch8
+; f18de
+
+Sfx_DexFanfare140169_Ch5: ; f18de
+	togglesfx
+	tempo 120
+	volume $77
+	dutycycle $3
+	vibrato $12, $34
+	notetype $6, $b1
+	note __, 8
+	octave 3
+	note E_, 4
+	note E_, 4
+	note A_, 4
+	octave 4
+	note C#, 4
+	intensity $a4
+	note D_, 4
+	note C_, 4
+	octave 3
+	note A_, 2
+	note G_, 2
+	note F#, 4
+	note G_, 16
+	octave 2
+	note B_, 8
+	note __, 8
+	endchannel
+; f1900
+
+
+INCBIN "baserom.gbc", $f1900, $f1901 - $f1900
+
+
+Sfx_DexFanfare140169_Ch6: ; f1901
+	togglesfx
+	dutycycle $2
+	vibrato $12, $34
+	notetype $6, $c1
+	octave 4
+	note E_, 4
+	note F#, 4
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	intensity $b4
+	note F#, 4
+	note G_, 4
+	note A_, 4
+	octave 5
+	note C_, 4
+	octave 4
+	note B_, 16
+	note G_, 8
+	note __, 8
+	endchannel
+; f191d
+
+
+INCBIN "baserom.gbc", $f191d, $f191e - $f191d
+
+
+Sfx_DexFanfare140169_Ch7: ; f191e
+	togglesfx
+	notetype $c, $25
+	note __, 4
+	octave 2
+	note A_, 1
+	octave 3
+	note C#, 1
+	note E_, 1
+	note A_, 3
+	note C#, 1
+	note __, 1
+	note D_, 1
+	note F#, 1
+	note A_, 1
+	octave 4
+	note D_, 3
+	octave 2
+	note A_, 1
+	note __, 1
+	note G_, 1
+	note B_, 1
+	octave 3
+	note D_, 1
+	note G_, 3
+	octave 2
+	note B_, 1
+	note __, 1
+	note G_, 4
+	note __, 4
+	endchannel
+; f193e
+
+
+INCBIN "baserom.gbc", $f193e, $f193f - $f193e
+
+
+Sfx_DexFanfare140169_Ch8: ; f193f
+	togglesfx
+	sfxtogglenoise $4
+	notetype $c
+	note C_, 4
+Sfx_DexFanfare140169_branch_f1945: ; f1945
+	note D_, 4
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	loopchannel 3, Sfx_DexFanfare140169_branch_f1945
+	note D_, 8
+	endchannel
+; f1950
+
+
+INCBIN "baserom.gbc", $f1950, $f1951 - $f1950
+
+
+Sfx_DexFanfare170199: ; f1951
+	dbw $c4, Sfx_DexFanfare170199_Ch5
+	dbw $05, Sfx_DexFanfare170199_Ch6
+	dbw $06, Sfx_DexFanfare170199_Ch7
+	dbw $07, Sfx_DexFanfare170199_Ch8
+; f195d
+
+Sfx_DexFanfare170199_Ch5: ; f195d
+	togglesfx
+	tempo 112
+	volume $77
+	vibrato $12, $34
+	dutycycle $3
+	notetype $8, $b4
+	octave 3
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 6
+	note __, 2
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	intensity $c1
+	note F_, 4
+	note G_, 4
+	note A_, 4
+	notetype $c, $a8
+	note A#, 12
+	note __, 4
+	endchannel
+; f1981
+
+
+INCBIN "baserom.gbc", $f1981, $f1982 - $f1981
+
+
+Sfx_DexFanfare170199_Ch6: ; f1982
+	togglesfx
+	vibrato $12, $34
+	dutycycle $3
+	notetype $8, $c4
+	octave 3
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note A#, 6
+	note __, 2
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	intensity $d1
+	octave 4
+	note D#, 4
+	note D#, 4
+	note D#, 4
+	notetype $c, $b8
+	note D_, 12
+	note __, 4
+	endchannel
+; f19a2
+
+
+INCBIN "baserom.gbc", $f19a2, $f19a3 - $f19a2
+
+
+Sfx_DexFanfare170199_Ch7: ; f19a3
+	togglesfx
+	notetype $8, $25
+	octave 3
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note D#, 6
+	note __, 2
+	note D#, 1
+	note __, 1
+	note D#, 1
+	note __, 1
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
+	note C_, 2
+	note __, 2
+	notetype $c, $25
+	octave 2
+	note A#, 12
+	note __, 4
+	endchannel
+; f19bf
+
+
+INCBIN "baserom.gbc", $f19bf, $f19c0 - $f19bf
+
+
+Sfx_DexFanfare170199_Ch8: ; f19c0
+	togglesfx
+	sfxtogglenoise $4
+	notetype $8
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note D_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 4
+	note D_, 4
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	notetype $c
+	note B_, 16
+	endchannel
+; f19d5
+
+
+INCBIN "baserom.gbc", $f19d5, $f19d6 - $f19d5
+
+
+Sfx_DexFanfare200229: ; f19d6
+	dbw $c4, Sfx_DexFanfare200229_Ch5
+	dbw $05, Sfx_DexFanfare200229_Ch6
+	dbw $06, Sfx_DexFanfare200229_Ch7
+	dbw $07, Sfx_DexFanfare200229_Ch8
+; f19e2
+
+Sfx_DexFanfare200229_Ch5: ; f19e2
+	togglesfx
+	tempo 124
+	volume $77
+	vibrato $12, $34
+	dutycycle $3
+	notetype $8, $b2
+	octave 3
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	octave 4
+	note C_, 4
+	octave 3
+	note B_, 4
+	note A_, 4
+	note A#, 4
+	octave 4
+	note D#, 4
+	note G_, 4
+	notetype $c, $a8
+	note F#, 12
+	note __, 4
+	endchannel
+; f1a03
+
+
+INCBIN "baserom.gbc", $f1a03, $f1a04 - $f1a03
+
+
+Sfx_DexFanfare200229_Ch6: ; f1a04
+	togglesfx
+	vibrato $12, $34
+	dutycycle $3
+	notetype $8, $b2
+	octave 3
+	note E_, 2
+	note G_, 2
+	octave 4
+	note C_, 2
+	note E_, 4
+	note D_, 4
+	note C_, 4
+	note D#, 4
+	note G_, 4
+	note A#, 4
+	notetype $c, $b8
+	note A_, 12
+	note __, 4
+	endchannel
+; f1a1e
+
+
+INCBIN "baserom.gbc", $f1a1e, $f1a1f - $f1a1e
+
+
+Sfx_DexFanfare200229_Ch7: ; f1a1f
+	togglesfx
+	notetype $8, $25
+	octave 3
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 1
+	note __, 1
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	octave 4
+	note C_, 2
+	octave 3
+	note C_, 4
+	note D#, 2
+	note G_, 2
+	note A#, 2
+	octave 4
+	note D#, 2
+	octave 3
+	note D#, 4
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	octave 2
+	note A_, 2
+	octave 3
+	note D_, 1
+	note __, 1
+	note D_, 1
+	note __, 1
+	octave 2
+	note A_, 2
+	octave 3
+	note D_, 6
+	note __, 6
+	endchannel
+; f1a49
+
+
+INCBIN "baserom.gbc", $f1a49, $f1a4a - $f1a49
+
+
+Sfx_DexFanfare200229_Ch8: ; f1a4a
+	togglesfx
+	sfxtogglenoise $4
+	notetype $8
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note D_, 4
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note D_, 4
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note B_, 12
+	endchannel
+; f1a65
+
+
+INCBIN "baserom.gbc", $f1a65, $f1a66 - $f1a65
+
+
+Sfx_DexFanfare230Plus: ; f1a66
+	dbw $c4, Sfx_DexFanfare230Plus_Ch5
+	dbw $05, Sfx_DexFanfare230Plus_Ch6
+	dbw $06, Sfx_DexFanfare230Plus_Ch7
+	dbw $07, Sfx_DexFanfare230Plus_Ch8
+; f1a72
+
+Sfx_DexFanfare230Plus_Ch5: ; f1a72
+	togglesfx
+	tempo 112
+	volume $77
+	vibrato $12, $34
+	dutycycle $3
+	notetype $8, $a5
+	octave 3
+	note B_, 2
+	note G_, 2
+	note B_, 2
+	octave 4
+	note D_, 14
+	note __, 2
+	dutycycle $2
+	intensity $85
+	octave 2
+	note F_, 1
+	note __, 1
+	note F_, 6
+	intensity $a5
+	dutycycle $3
+	octave 3
+	note A_, 2
+	note G_, 2
+	note F_, 10
+	note __, 2
+	dutycycle $2
+	intensity $85
+	octave 2
+	note F_, 1
+	note __, 1
+	note F_, 6
+	intensity $a5
+	dutycycle $3
+	octave 3
+	note A#, 12
+	intensity $b2
+	note G_, 4
+	note A_, 4
+	note A#, 4
+	notetype $c, $a8
+	note A_, 14
+	note __, 2
+	endchannel
+; f1ab1
+
+
+INCBIN "baserom.gbc", $f1ab1, $f1ab2 - $f1ab1
+
+
+Sfx_DexFanfare230Plus_Ch6: ; f1ab2
+	togglesfx
+	vibrato $12, $34
+	dutycycle $3
+	notetype $8, $b5
+	octave 4
+	note G_, 2
+	note D_, 2
+	note G_, 2
+	note F_, 14
+	note __, 4
+	note F_, 2
+	note E_, 2
+	note D_, 2
+	note C_, 2
+	octave 3
+	note B_, 2
+	note A_, 10
+	note __, 4
+	note A_, 2
+	octave 4
+	note C_, 2
+	note D_, 2
+	note D#, 12
+	intensity $c2
+	note G_, 4
+	note G_, 4
+	note G_, 4
+	notetype $c, $b8
+	note F#, 14
+	note __, 2
+	endchannel
+; f1ad9
+
+
+INCBIN "baserom.gbc", $f1ad9, $f1ada - $f1ad9
+
+
+Sfx_DexFanfare230Plus_Ch7: ; f1ada
+	togglesfx
+	notetype $8, $25
+	octave 3
+	note G_, 6
+	note A#, 4
+	note F_, 2
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note A#, 1
+	note __, 1
+	note A#, 2
+	note __, 2
+	note D_, 1
+	note __, 1
+	note D_, 6
+	note A_, 4
+	note F_, 2
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 1
+	note __, 1
+	note A_, 2
+	note __, 2
+	note C_, 1
+	note __, 1
+	note C_, 6
+	note G_, 4
+	note D#, 2
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note G_, 1
+	note __, 1
+	note A#, 4
+	note G_, 4
+	note D#, 4
+	notetype $c, $25
+	note D_, 14
+	note __, 2
+	endchannel
+; f1b0b
+
+
+INCBIN "baserom.gbc", $f1b0b, $f1b0c - $f1b0b
+
+
+Sfx_DexFanfare230Plus_Ch8: ; f1b0c
+	togglesfx
+	sfxtogglenoise $4
+	notetype $8
+	note D_, 2
+	note D_, 2
+	note D_, 2
+Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14
+	note D_, 6
+	note D_, 2
+	note D_, 2
+	note D_, 2
+	note D_, 6
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	loopchannel 2, Sfx_DexFanfare230Plus_branch_f1b14
+	note D_, 6
+	note D_, 2
+	note D_, 2
+	note C#, 1
+	note C#, 1
+	note D_, 4
+	note D_, 4
+	note D_, 4
+Sfx_DexFanfare230Plus_branch_f1b2b: ; f1b2b
+	note C#, 1
+	loopchannel 18, Sfx_DexFanfare230Plus_branch_f1b2b
+	note D_, 6
+	endchannel
+; f1b32
+
+
+INCBIN "baserom.gbc", $f1b32, $f1b33 - $f1b32
+
+
+Sfx_NotVeryEffective: ; f1b33
+	dbw $07, Sfx_NotVeryEffective_Ch8
+; f1b36
+
+Sfx_NotVeryEffective_Ch8: ; f1b36
+	noise $4, $f1, $5f
+	noise $1, $a0, $42
+	noise $10, $f1, $53
+	endchannel
+; f1b40
+
+Sfx_Damage: ; f1b40
+	dbw $07, Sfx_Damage_Ch8
+; f1b43
+
+Sfx_Damage_Ch8: ; f1b43
+	noise $4, $f1, $5e
+	noise $1, $a0, $12
+	noise $4, $f0, $32
+	noise $10, $f1, $44
+	endchannel
+; f1b50
+
+Sfx_SuperEffective: ; f1b50
+	dbw $07, Sfx_SuperEffective_Ch8
+; f1b53
+
+Sfx_SuperEffective_Ch8: ; f1b53
+	noise $3, $f1, $4f
+	noise $1, $c8, $22
+	noise $2, $f8, $3f
+	noise $3, $d0, $15
+	noise $20, $f2, $35
+	endchannel
+; f1b63
+
+Sfx_BallBounce: ; f1b63
+	dbw $44, Sfx_BallBounce_Ch5
+	dbw $05, Sfx_BallBounce_Ch6
+; f1b69
+
+Sfx_BallBounce_Ch5: ; f1b69
+	dutycycle $2
+	sound $8, $e1, $0740
+	sound $17, $0, $0000
+	sound $8, $b1, $0740
+	sound $17, $0, $0000
+	sound $8, $81, $0740
+	sound $17, $0, $0000
+	sound $8, $51, $0740
+	sound $17, $0, $0000
+	endchannel
+; f1b8c
+
+Sfx_BallBounce_Ch6: ; f1b8c
+	dutycycle $2
+	sound $2, $8, $0000
+	sound $8, $b1, $0741
+	sound $17, $0, $0000
+	sound $8, $81, $0741
+	sound $17, $0, $0000
+	sound $8, $51, $0741
+	sound $17, $0, $0000
+	sound $8, $21, $0741
+	sound $17, $0, $0000
+	endchannel
+; f1bb3
+
+Sfx_SweetScent2: ; f1bb3
+	dbw $44, Sfx_SweetScent2_Ch5
+	dbw $07, Sfx_SweetScent2_Ch8
+; f1bb9
+
+Sfx_SweetScent2_Ch5: ; f1bb9
+	soundinput $af
+	dutycycle $1
+	sound $6, $f8, $05f0
+	sound $2, $f1, $0620
+	sound $10, $f1, $0650
+	soundinput $8
+	endchannel
+; f1bcc
+
+Sfx_SweetScent2_Ch8: ; f1bcc
+	noise $2, $e8, $22
+	noise $11, $aa, $0
+Sfx_SweetScent2_branch_f1bd2: ; f1bd2
+	noise $4, $d9, $10
+	noise $8, $91, $0
+	noise $2, $61, $7
+	loopchannel 5, Sfx_SweetScent2_branch_f1bd2
+	noise $4, $99, $0
+	noise $a, $61, $0
+	noise $6, $59, $0
+	noise $2, $21, $7
+	endchannel
+; f1bec
+
+Sfx_HitEndOfExpBar: ; f1bec
+	dbw $44, Sfx_HitEndOfExpBar_Ch5
+	dbw $05, Sfx_HitEndOfExpBar_Ch6
+; f1bf2
+
+Sfx_HitEndOfExpBar_Ch5: ; f1bf2
+	dutycycle $2
+	sound $1, $e1, $0789
+	sound $1, $e1, $07a2
+	sound $10, $e1, $07b1
+	endchannel
+; f1c01
+
+Sfx_HitEndOfExpBar_Ch6: ; f1c01
+	dutycycle $2
+	sound $1, $e1, $07a2
+	sound $1, $e1, $07b1
+	sound $10, $e1, $07c4
+	endchannel
+; f1c10
+
+Sfx_GiveTrademon: ; f1c10
+	dbw $04, Sfx_GiveTrademon_Ch5
+; f1c13
+
+Sfx_GiveTrademon_Ch5: ; f1c13
+	sound $20, $0, $0000
+	dutycycle $1
+	soundinput $a7
+	sound $1b, $f4, $0750
+	sound $1b, $d4, $0750
+	sound $1b, $b4, $0750
+	sound $1b, $94, $0750
+	sound $1b, $74, $0750
+	sound $1b, $54, $0750
+	sound $1b, $34, $0750
+	sound $1b, $14, $0750
+	soundinput $8
+	endchannel
+; f1c3e
+
+Sfx_GetTrademon: ; f1c3e
+	dbw $04, Sfx_GetTrademon_Ch5
+; f1c41
+
+Sfx_GetTrademon_Ch5: ; f1c41
+	sound $20, $0, $0000
+	dutycycle $2
+	soundinput $bf
+	sound $1b, $14, $07bc
+	sound $1b, $34, $07bc
+	sound $1b, $54, $07bc
+	sound $1b, $74, $07bc
+	sound $1b, $94, $07bc
+	sound $1b, $b4, $07bc
+	sound $1b, $d4, $07bc
+	sound $1b, $f4, $07bc
+	soundinput $8
+	endchannel
+; f1c6c
+
+Sfx_TrainArrived: ; f1c6c
+	dbw $84, Sfx_TrainArrived_Ch5
+	dbw $05, Sfx_TrainArrived_Ch6
+	dbw $07, Sfx_TrainArrived_Ch8
+; f1c75
+
+Sfx_TrainArrived_Ch6: ; f1c75
+	tone $0008
+	sound $8, $0, $0000
+Sfx_TrainArrived_Ch5: ; f1c7c
+	dutycycle $2
+	sound $4, $5f, $0691
+	sound $4, $6f, $0694
+	sound $4, $78, $0697
+	sound $4, $7f, $069a
+	sound $4, $68, $06ae
+	sound $10, $6f, $06ab
+	sound $68, $65, $06a8
+	endchannel
+; f1c9b
+
+Sfx_TrainArrived_Ch8: ; f1c9b
+	noise $5, $af, $10
+	noise $4, $9f, $20
+	noise $4, $8f, $21
+	noise $4, $7f, $22
+	noise $4, $8f, $21
+	noise $4, $9f, $20
+	noise $4, $9f, $10
+	noise $68, $a3, $0
+	endchannel
+; f1cb4
+
+Sfx_2Boops: ; f1cb4
+	dbw $04, Sfx_2Boops_Ch5
+; f1cb7
+
+Sfx_2Boops_Ch5: ; f1cb7
+	dutycycle $2
+Sfx_2Boops_branch_f1cb9: ; f1cb9
+	soundinput $79
+	sound $1, $99, $0563
+	sound $4, $f2, $04b5
+	soundinput $43
+	sound $10, $f8, $05cd
+	loopchannel 2, Sfx_2Boops_branch_f1cb9
+	soundinput $8
+	endchannel
+; f1cd0
+
+Sfx_UnknownCB: ; f1cd0
+	dbw $07, Sfx_UnknownCB_Ch8
+; f1cd3
+
+Sfx_Menu_Ch8: ; f1cd3
+	noise $1, $e2, $33
+	noise $8, $e1, $22
+	endchannel
+; f1cda
+
+Sfx_Pokeflute_Ch7: ; f1cda
+	tempo 256
+	volume $77
+	togglesfx
+	vibrato $10, $14
+	notetype $c, $10
+	octave 5
+	note E_, 2
+	note F_, 2
+	note G_, 4
+	note A_, 2
+	note G_, 2
+	octave 6
+	note C_, 4
+	note C_, 2
+	note D_, 2
+	note C_, 2
+	octave 5
+	note G_, 2
+	note A_, 2
+	note F_, 2
+	note G_, 8
+	note __, 12
+	endchannel
+; f1cf8
+
+Sfx_PlacePuzzlePieceDown_Ch8: ; f1cf8
+	noise $2, $f7, $24
+	noise $2, $f7, $34
+	noise $4, $f7, $44
+	noise $8, $f4, $55
+	noise $8, $f1, $44
+	endchannel
+; f1d08
+
+Sfx_EnterDoor_Ch8: ; f1d08
+	noise $9, $f1, $44
+	noise $8, $d1, $43
+	endchannel
+; f1d0f
+
+Sfx_SwitchPokemon_Ch5: ; f1d0f
+	dutycycle $2
+	sound $8, $e1, $0740
+	endchannel
+; f1d16
+
+Sfx_SwitchPokemon_Ch6: ; f1d16
+	dutycycle $2
+	sound $2, $8, $0000
+	sound $8, $b1, $0741
+	endchannel
+; f1d21
+
+Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21
+	dutycycle $2
+	soundinput $3a
+	sound $4, $f2, $0200
+	soundinput $22
+	sound $8, $e2, $0200
+	soundinput $8
+	endchannel
+; f1d32
+
+Sfx_BallWiggle_Ch5: ; f1d32
+	dutycycle $2
+	soundinput $3a
+	sound $4, $f2, $0400
+	soundinput $22
+	sound $8, $e2, $0400
+	soundinput $8
+	endchannel
+; f1d43
+
+Sfx_Tally_Ch5: ; f1d43
+	dutycycle $2
+	sound $4, $f1, $0780
+	endchannel
+; f1d4a
+
+Sfx_Tally_Ch6: ; f1d4a
+	dutycycle $2
+	sound $1, $8, $0000
+	sound $4, $a1, $0761
+	endchannel
+; f1d55
+
+Sfx_Transaction_Ch5: ; f1d55
+	dutycycle $2
+	sound $4, $e1, $0700
+	sound $18, $f2, $07e0
+	endchannel
+; f1d60
+
+Sfx_Transaction_Ch6: ; f1d60
+	dutycycle $2
+	sound $1, $8, $0000
+	sound $4, $91, $06c1
+	sound $18, $a2, $07a1
+	endchannel
+; f1d6f
+
+Sfx_Bump_Ch5: ; f1d6f
+	dutycycle $2
+	soundinput $5a
+	sound $f, $f1, $0300
+	soundinput $8
+	endchannel
+; f1d7a
+
+Sfx_ExitBuilding_Ch8: ; f1d7a
+	noise $2, $f1, $54
+	noise $c, $71, $23
+	noise $2, $b1, $54
+	noise $c, $61, $23
+	noise $6, $41, $54
+	endchannel
+; f1d8a
+
+Sfx_ReadText2_Ch5: ; f1d8a
+Sfx_ReadText_Ch5: ; f1d8a
+	dutycycle $2
+	sound $0, $91, $07c0
+	sound $0, $81, $07d0
+	sound $0, $91, $07c0
+	sound $c, $a1, $07d0
+	endchannel
+; f1d9d
+
+Sfx_Potion_Ch5: ; f1d9d
+	dutycycle $2
+	soundinput $17
+	sound $f, $f0, $04f0
+	sound $f, $f2, $0650
+	soundinput $8
+	endchannel
+; f1dac
+
+Sfx_Poison_Ch5: ; f1dac
+Sfx_Poison_branch_f1dac: ; f1dac
+	dutycycle $0
+	soundinput $14
+	sound $4, $f2, $0600
+	loopchannel 4, Sfx_Poison_branch_f1dac
+	sound $f, $f3, $0600
+	soundinput $8
+	endchannel
+; f1dbf
+
+Sfx_FullHeal_Ch5: ; f1dbf
+	dutycycle $2
+	soundinput $14
+	sound $4, $f2, $0600
+	sound $4, $f2, $0600
+	soundinput $17
+	sound $f, $f2, $0600
+	soundinput $8
+	endchannel
+; f1dd4
+
+Sfx_GotSafariBalls_Ch5: ; f1dd4
+	dutycycle $2
+	soundinput $15
+	sound $f, $f0, $04f0
+	sound $f, $f2, $0650
+	soundinput $8
+	endchannel
+; f1de3
+
+Sfx_BootPc_Ch5: ; f1de3
+	dutycycle $2
+	sound $f, $f2, $07c0
+	sound $f, $0, $0000
+	sound $3, $a1, $0780
+	sound $3, $a1, $0700
+	sound $3, $a1, $0740
+	sound $3, $a1, $0700
+	sound $3, $a1, $0780
+	sound $3, $a1, $0700
+	sound $3, $a1, $07c0
+	sound $8, $a1, $0700
+	endchannel
+; f1e0e
+
+Sfx_ShutDownPc_Ch5: ; f1e0e
+	dutycycle $2
+	sound $4, $f0, $0600
+	sound $4, $f0, $0400
+	sound $4, $f0, $0200
+	sound $1, $0, $0000
+	endchannel
+; f1e21
+
+Sfx_ChoosePcOption_Ch5: ; f1e21
+	dutycycle $2
+	sound $6, $f0, $0700
+	sound $4, $0, $0000
+	sound $6, $f0, $0700
+	sound $1, $0, $0000
+	endchannel
+; f1e34
+
+Sfx_EscapeRope_Ch5: ; f1e34
+	dutycycle $1
+	soundinput $17
+	sound $f, $d7, $0600
+	sound $f, $b7, $0580
+	sound $f, $87, $0500
+	sound $f, $47, $0480
+	sound $f, $17, $0400
+	soundinput $8
+	endchannel
+; f1e4f
+
+Sfx_PushButton_Ch5: ; f1e4f
+	dutycycle $2
+	sound $4, $0, $0000
+	sound $2, $f1, $0680
+	sound $1, $0, $0000
+	sound $4, $f1, $0780
+	sound $4, $0, $0000
+	endchannel
+; f1e66
+
+Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
+	dutycycle $2
+	soundinput $2c
+	sound $4, $f2, $0500
+	soundinput $22
+	sound $2, $f1, $0500
+	soundinput $8
+	sound $1, $0, $0000
+	endchannel
+; f1e7b
+
+Sfx_WarpTo_Ch5: ; f1e7b
+	dutycycle $1
+	soundinput $17
+	sound $f, $d7, $0500
+	sound $f, $b7, $0580
+	sound $f, $87, $0600
+	sound $f, $47, $0680
+	sound $f, $17, $0700
+	soundinput $8
+	endchannel
+; f1e96
+
+Sfx_WarpFrom_Ch5: ; f1e96
+	dutycycle $1
+	soundinput $17
+	sound $f, $d7, $0700
+	sound $f, $b7, $0680
+	sound $f, $87, $0600
+	sound $f, $47, $0580
+	sound $f, $17, $0500
+	soundinput $8
+	endchannel
+; f1eb1
+
+Sfx_ChangeDexMode_Ch5: ; f1eb1
+	dutycycle $1
+	soundinput $16
+	sound $f, $d2, $0500
+	soundinput $8
+	endchannel
+; f1ebc
+
+Sfx_JumpOverLedge_Ch5: ; f1ebc
+	dutycycle $2
+	soundinput $95
+	sound $f, $f2, $0400
+	soundinput $8
+	endchannel
+; f1ec7
+
+Sfx_GrassRustle_Ch8: ; f1ec7
+	noise $2, $f1, $32
+	noise $2, $0, $0
+	noise $2, $f1, $22
+	noise $1, $0, $0
+	endchannel
+; f1ed4
+
+Sfx_Fly_Ch8: ; f1ed4
+	noise $2, $f1, $12
+	noise $2, $0, $0
+	noise $2, $a1, $12
+	noise $2, $0, $0
+	noise $2, $d1, $12
+	noise $2, $0, $0
+	noise $2, $81, $12
+	noise $2, $0, $0
+	noise $2, $b1, $12
+	noise $2, $0, $0
+	noise $2, $61, $12
+	noise $2, $0, $0
+	noise $2, $91, $12
+	noise $2, $0, $0
+	noise $2, $41, $12
+	noise $2, $0, $0
+	endchannel
+; f1f05
+
+Sfx_Wrong_Ch5: ; f1f05
+	dutycycle $3
+	soundinput $5a
+	sound $4, $f0, $0500
+	soundinput $8
+	sound $4, $0, $0000
+	sound $f, $f0, $0500
+	sound $1, $0, $0000
+	endchannel
+; f1f1c
+
+Sfx_Wrong_Ch6: ; f1f1c
+	dutycycle $3
+	sound $4, $f0, $0401
+	sound $4, $0, $0000
+	sound $f, $f0, $0401
+	sound $1, $0, $0000
+	endchannel
+; f1f2f
+
+Sfx_Squeak_Ch5: ; f1f2f
+	dutycycle $0
+	soundinput $17
+	sound $f, $d2, $0700
+	soundinput $8
+	endchannel
+; f1f3a
+
+Sfx_Strength_Ch8: ; f1f3a
+	noise $4, $a2, $23
+	noise $8, $f1, $34
+	noise $f, $0, $0
+	noise $2, $f7, $24
+	noise $2, $f7, $34
+	noise $4, $f7, $44
+	noise $8, $f4, $55
+	noise $8, $f1, $44
+	endchannel
+; f1f53
+
+Sfx_Boat_Ch5: ; f1f53
+	dutycycle $2
+	sound $f, $f0, $0500
+	sound $4, $0, $0000
+	sound $f, $f0, $0500
+	sound $f, $f0, $0500
+	sound $f, $f0, $0500
+	sound $f, $f0, $0500
+	sound $f, $f2, $0500
+	endchannel
+; f1f72
+
+Sfx_Boat_Ch6: ; f1f72
+	dutycycle $3
+	sound $f, $f0, $0482
+	sound $4, $0, $0000
+	sound $f, $f0, $0482
+	sound $f, $f0, $0482
+	sound $f, $f0, $0482
+	sound $f, $f0, $0482
+	sound $f, $f2, $0482
+	endchannel
+; f1f91
+
+Sfx_WallOpen_Ch5: ; f1f91
+	dutycycle $1
+	soundinput $3a
+	sound $4, $f2, $0500
+	soundinput $22
+	sound $4, $e2, $0500
+	soundinput $3a
+	sound $4, $f2, $0700
+	soundinput $22
+	sound $f, $e2, $0700
+	soundinput $8
+	endchannel
+; f1fae
+
+Sfx_ElevatorEnd_Ch5: ; f1fae
+	dutycycle $2
+	sound $f, $f3, $0730
+	sound $8, $65, $0730
+	sound $f, $f4, $0700
+	sound $f, $74, $0700
+	sound $f, $44, $0700
+	sound $f, $24, $0700
+	endchannel
+; f1fc9
+
+Sfx_ThrowBall_Ch5: ; f1fc9
+	dutycycle $2
+	soundinput $2f
+	sound $f, $f2, $0780
+	endchannel
+; f1fd2
+
+Sfx_ThrowBall_Ch6: ; f1fd2
+	dutycycle $2
+	sound $f, $c2, $0782
+	endchannel
+; f1fd9
+
+Sfx_Shine_Ch5: ; f1fd9
+	dutycycle $0
+	sound $0, $d2, $0700
+	sound $0, $d2, $0740
+	sound $0, $d2, $0780
+	sound $0, $d2, $07c0
+	sound $a, $e1, $07e0
+	sound $1, $0, $0000
+	endchannel
+; f1ff4
+
+Sfx_BallPoof_Ch5: ; f1ff4
+	dutycycle $2
+	soundinput $16
+	sound $f, $f2, $0400
+	soundinput $8
+	endchannel
+; f1fff
+
+Sfx_BallPoof_Ch8: ; f1fff
+	noise $f, $a2, $22
+	endchannel
+; f2003
+
+Sfx_Unknown3A_Ch5: ; f2003
+	sound $f, $d1, $0200
+	soundinput $8
+	endchannel
+; f200a
+
+Sfx_Unknown3A_Ch8: ; f200a
+	noise $4, $f5, $33
+	noise $8, $f4, $22
+	noise $f, $f2, $21
+	endchannel
+; f2014
+
+Sfx_Run_Ch8: ; f2014
+	noise $2, $61, $23
+	noise $2, $a1, $33
+	noise $2, $c1, $33
+	noise $2, $51, $11
+	noise $2, $f1, $33
+	noise $2, $41, $11
+	noise $2, $c1, $33
+	noise $2, $31, $11
+	noise $2, $81, $33
+	noise $2, $31, $11
+	noise $8, $41, $33
+	endchannel
+; f2036
+
+Sfx_SlotMachineStart_Ch5: ; f2036
+	dutycycle $2
+	soundinput $44
+	sound $f, $f0, $04f0
+	soundinput $17
+	sound $f, $f2, $0650
+	soundinput $8
+	endchannel
+; f2047
+
+Sfx_SlotMachineStart_Ch6: ; f2047
+	dutycycle $2
+	sound $f, $92, $0600
+	sound $f, $92, $0782
+	endchannel
+; f2052
+
+Sfx_Call_Ch5: ; f2052
+	soundinput $67
+	sound $4, $f7, $07a0
+	sound $4, $f7, $07a0
+	sound $4, $f7, $07a0
+	sound $4, $f7, $07a0
+	sound $4, $f7, $07a0
+	soundinput $8
+	sound $4, $0, $0000
+	endchannel
+; f206f
+
+Sfx_Peck_Ch8: ; f206f
+	noise $2, $a1, $12
+	endchannel
+; f2073
+
+Sfx_Kinesis_Ch5: ; f2073
+	dutycycle $1
+	soundinput $af
+	sound $f, $f2, $0780
+	soundinput $8
+	endchannel
+; f207e
+
+Sfx_Lick_Ch5: ; f207e
+	dutycycle $1
+	soundinput $97
+	sound $f, $f2, $0500
+	soundinput $8
+	endchannel
+; f2089
+
+Sfx_Pound_Ch8: ; f2089
+	noise $2, $a1, $22
+	endchannel
+; f208d
+
+Sfx_MovePuzzlePiece_Ch8: ; f208d
+	noise $8, $f1, $54
+	endchannel
+; f2091
+
+Sfx_CometPunch_Ch8: ; f2091
+	noise $f, $8f, $11
+	noise $4, $ff, $12
+	noise $a, $f1, $55
+	endchannel
+; f209b
+
+Sfx_MegaPunch_Ch8: ; f209b
+	noise $f, $8f, $34
+	noise $8, $f2, $35
+	noise $a, $f1, $55
+	endchannel
+; f20a5
+
+Sfx_Scratch_Ch8: ; f20a5
+	noise $f, $9f, $23
+	noise $8, $f1, $21
+	endchannel
+; f20ac
+
+Sfx_Vicegrip_Ch8: ; f20ac
+	noise $2, $e1, $4b
+	noise $a, $f1, $44
+	noise $2, $e1, $3a
+	noise $6, $f1, $34
+	endchannel
+; f20b9
+
+Sfx_RazorWind_Ch8: ; f20b9
+	noise $2, $f4, $44
+	noise $2, $f4, $14
+	noise $f, $f1, $32
+	endchannel
+; f20c3
+
+Sfx_Cut_Ch8: ; f20c3
+	noise $4, $8f, $55
+	noise $2, $f4, $44
+	noise $8, $f4, $22
+	noise $f, $f2, $21
+	endchannel
+; f20d0
+
+Sfx_WingAttack_Ch8: ; f20d0
+Sfx_WingAttack_branch_f20d0: ; f20d0
+	noise $8, $4f, $23
+	noise $4, $c4, $22
+	noise $6, $f2, $23
+	loopchannel 4, Sfx_WingAttack_branch_f20d0
+	endchannel
+; f20de
+
+Sfx_Whirlwind_Ch8: ; f20de
+	noise $8, $4f, $33
+	noise $4, $c4, $22
+	noise $6, $f2, $23
+	noise $f, $f2, $22
+	endchannel
+; f20eb
+
+Sfx_Bind_Ch8: ; f20eb
+	noise $8, $ff, $32
+	noise $8, $f4, $43
+	noise $8, $f2, $54
+	noise $8, $f1, $65
+	endchannel
+; f20f8
+
+Sfx_VineWhip_Ch8: ; f20f8
+	noise $1, $c2, $33
+	noise $2, $f2, $21
+	noise $1, $e2, $33
+	noise $1, $c2, $32
+	noise $1, $92, $12
+	noise $1, $b2, $31
+	noise $c, $91, $10
+	noise $8, $f2, $41
+	endchannel
+; f2111
+
+Sfx_DoubleKick_Ch8: ; f2111
+	noise $1, $94, $23
+	noise $1, $b4, $22
+	noise $8, $f1, $44
+	endchannel
+; f211b
+
+Sfx_MegaKick_Ch8: ; f211b
+	noise $2, $94, $33
+	noise $4, $b4, $22
+	noise $4, $f1, $44
+	noise $8, $f1, $55
+	endchannel
+; f2128
+
+Sfx_Headbutt_Ch8: ; f2128
+	noise $4, $ff, $55
+	noise $8, $f1, $65
+	endchannel
+; f212f
+
+Sfx_HornAttack_Ch8: ; f212f
+	noise $2, $84, $43
+	noise $2, $c4, $22
+	noise $8, $f2, $34
+	endchannel
+; f2139
+
+Sfx_Tackle_Ch8: ; f2139
+	noise $4, $f1, $34
+	noise $f, $f2, $64
+	endchannel
+; f2140
+
+Sfx_PoisonSting_Ch8: ; f2140
+	noise $2, $f1, $22
+	noise $f, $f2, $12
+	endchannel
+; f2147
+
+Sfx_Powder_Ch8: ; f2147
+	noise $2, $c2, $1
+	noise $f, $f4, $1
+	noise $f, $f2, $1
+	endchannel
+; f2151
+
+Sfx_Doubleslap_Ch8: ; f2151
+	noise $8, $f1, $32
+	noise $8, $f1, $33
+	endchannel
+; f2158
+
+Sfx_Bite_Ch5: ; f2158
+	dutycycle $0
+	soundinput $3a
+	sound $4, $f2, $0200
+	soundinput $22
+	sound $8, $e2, $0200
+	soundinput $8
+	endchannel
+; f2169
+
+Sfx_Bite_Ch8: ; f2169
+	noise $0, $d1, $42
+	noise $4, $a1, $32
+	noise $0, $d1, $22
+	noise $6, $a1, $32
+	endchannel
+; f2176
+
+Sfx_JumpKick_Ch8: ; f2176
+	noise $3, $92, $31
+	noise $3, $b2, $32
+	noise $3, $c2, $33
+	noise $8, $f1, $54
+	endchannel
+; f2183
+
+Sfx_Stomp_Ch8: ; f2183
+	noise $c, $f1, $54
+	noise $8, $f1, $64
+	endchannel
+; f218a
+
+Sfx_TailWhip_Ch8: ; f218a
+	noise $2, $f1, $33
+	noise $2, $c1, $32
+	noise $2, $a1, $31
+	noise $f, $82, $32
+	noise $8, $f1, $34
+	endchannel
+; f219a
+
+Sfx_KarateChop_Ch8: ; f219a
+	noise $2, $d2, $32
+	noise $f, $f2, $43
+	endchannel
+; f21a1
+
+Sfx_Submission_Ch8: ; f21a1
+	noise $2, $f2, $43
+	noise $4, $b5, $32
+	noise $9, $86, $31
+	noise $7, $64, $0
+	noise $f, $f2, $55
+	endchannel
+; f21b1
+
+Sfx_WaterGun_Ch5: ; f21b1
+	dutycycle $1
+	soundinput $97
+	sound $f, $f2, $0700
+	soundinput $8
+	endchannel
+; f21bc
+
+Sfx_WaterGun_Ch8: ; f21bc
+	noise $f, $3f, $22
+	noise $f, $f2, $21
+	endchannel
+; f21c3
+
+Sfx_SwordsDance_Ch8: ; f21c3
+	noise $f, $4f, $41
+	noise $8, $8f, $41
+	noise $8, $cf, $41
+	noise $8, $f2, $42
+	noise $f, $f2, $41
+	endchannel
+; f21d3
+
+Sfx_Thunder_Ch8: ; f21d3
+	noise $a, $ff, $50
+	noise $f, $ff, $51
+	noise $8, $f2, $51
+	noise $6, $ff, $52
+	noise $6, $ff, $53
+	noise $8, $ff, $54
+	noise $f, $f2, $54
+	endchannel
+; f21e9
+
+Sfx_Supersonic_Ch5: ; f21e9
+	dutycycle $2
+	sound $f, $3f, $07c0
+Sfx_Supersonic_branch_f21ef: ; f21ef
+	sound $f, $df, $07c0
+	loopchannel 4, Sfx_Supersonic_branch_f21ef
+	sound $f, $d1, $07c0
+	endchannel
+; f21fc
+
+Sfx_Supersonic_Ch6: ; f21fc
+	unknownmusic0xde $b3
+	sound $f, $2f, $07c8
+Sfx_Supersonic_branch_f2202: ; f2202
+	sound $f, $cf, $07c7
+	loopchannel 4, Sfx_Supersonic_branch_f2202
+	sound $f, $c1, $07c8
+	endchannel
+; f220f
+
+Sfx_Supersonic_Ch8: ; f220f
+Sfx_Supersonic_branch_f220f: ; f220f
+	noise $3, $97, $12
+	noise $3, $a1, $11
+	loopchannel 10, Sfx_Supersonic_branch_f220f
+	endchannel
+; f221a
+
+Sfx_Leer_Ch5: ; f221a
+Sfx_Leer_branch_f221a: ; f221a
+	dutycycle $0
+	sound $0, $f1, $07c0
+	sound $0, $f1, $0700
+	loopchannel 12, Sfx_Leer_branch_f221a
+	endchannel
+; f2229
+
+Sfx_Leer_Ch6: ; f2229
+Sfx_Leer_branch_f2229: ; f2229
+	unknownmusic0xde $b3
+	sound $0, $e1, $07c1
+	sound $0, $e1, $0701
+	loopchannel 12, Sfx_Leer_branch_f2229
+	endchannel
+; f2238
+
+Sfx_Leer_Ch8: ; f2238
+Sfx_Leer_branch_f2238: ; f2238
+	noise $1, $d1, $49
+	noise $1, $d1, $29
+	loopchannel 6, Sfx_Leer_branch_f2238
+	endchannel
+; f2243
+
+Sfx_Ember_Ch5: ; f2243
+Sfx_Ember_branch_f2243: ; f2243
+	unknownmusic0xde $c9
+	sound $b, $f3, $0120
+	sound $9, $d3, $0150
+	loopchannel 5, Sfx_Ember_branch_f2243
+	sound $8, $e3, $0130
+	sound $f, $c2, $0110
+	endchannel
+; f225a
+
+Sfx_Ember_Ch8: ; f225a
+Sfx_Ember_branch_f225a: ; f225a
+	noise $a, $f3, $35
+	noise $e, $f6, $45
+	loopchannel 4, Sfx_Ember_branch_f225a
+	noise $c, $f4, $bc
+	noise $c, $f5, $9c
+	noise $f, $f4, $ac
+	endchannel
+; f226e
+
+Sfx_Bubblebeam_Ch5: ; f226e
+Sfx_Bubblebeam_branch_f226e: ; f226e
+	unknownmusic0xde $39
+	sound $4, $f4, $0600
+	sound $3, $c4, $0500
+	sound $5, $b5, $0600
+	sound $d, $e2, $06c0
+	loopchannel 3, Sfx_Bubblebeam_branch_f226e
+	sound $8, $d1, $0600
+	endchannel
+; f2289
+
+Sfx_Bubblebeam_Ch6: ; f2289
+Sfx_Bubblebeam_branch_f2289: ; f2289
+	unknownmusic0xde $8d
+	sound $5, $e4, $05e0
+	sound $4, $b4, $04e0
+	sound $6, $a5, $05e8
+	sound $e, $d1, $06a0
+	loopchannel 3, Sfx_Bubblebeam_branch_f2289
+	endchannel
+; f22a0
+
+Sfx_Bubblebeam_Ch8: ; f22a0
+Sfx_Bubblebeam_branch_f22a0: ; f22a0
+	noise $5, $c3, $33
+	noise $3, $92, $43
+	noise $a, $b5, $33
+	noise $f, $c3, $32
+	loopchannel 2, Sfx_Bubblebeam_branch_f22a0
+	endchannel
+; f22b1
+
+Sfx_HydroPump_Ch5: ; f22b1
+Sfx_HydroPump_branch_f22b1: ; f22b1
+	unknownmusic0xde $d2
+	sound $3, $81, $0300
+	sound $3, $c1, $0400
+	sound $3, $f1, $0500
+	sound $3, $b1, $0400
+	sound $3, $71, $0300
+	loopchannel 5, Sfx_HydroPump_branch_f22b1
+	sound $8, $81, $0400
+	endchannel
+; f22d0
+
+Sfx_HydroPump_Ch8: ; f22d0
+Sfx_HydroPump_branch_f22d0: ; f22d0
+	noise $3, $62, $22
+	noise $3, $a2, $32
+	noise $3, $d2, $33
+	noise $3, $92, $23
+	noise $3, $52, $12
+	loopchannel 5, Sfx_HydroPump_branch_f22d0
+	noise $8, $81, $12
+	endchannel
+; f22e7
+
+Sfx_Surf_Ch5: ; f22e7
+Sfx_Surf_branch_f22e7: ; f22e7
+	unknownmusic0xde $39
+	sound $f, $f4, $0500
+	sound $f, $c4, $0400
+	sound $f, $e2, $05c0
+	loopchannel 3, Sfx_Surf_branch_f22e7
+	endchannel
+; f22fa
+
+Sfx_Surf_Ch6: ; f22fa
+Sfx_Surf_branch_f22fa: ; f22fa
+	unknownmusic0xde $8d
+	sound $7, $e4, $0430
+	sound $f, $b4, $0330
+	sound $f, $a2, $0438
+	loopchannel 4, Sfx_Surf_branch_f22fa
+	endchannel
+; f230d
+
+Sfx_Surf_Ch8: ; f230d
+Sfx_Surf_branch_f230d: ; f230d
+	noise $9, $f4, $44
+	noise $9, $f2, $43
+	noise $f, $f4, $42
+	noise $f, $f4, $41
+	loopchannel 3, Sfx_Surf_branch_f230d
+	endchannel
+; f231e
+
+Sfx_Psybeam_Ch5: ; f231e
+Sfx_Psybeam_branch_f231e: ; f231e
+	unknownmusic0xde $a1
+	sound $a, $f1, $0640
+	sound $a, $f3, $0680
+	sound $a, $f2, $0620
+	loopchannel 4, Sfx_Psybeam_branch_f231e
+	sound $a, $f1, $0640
+	endchannel
+; f2335
+
+Sfx_Psybeam_Ch6: ; f2335
+Sfx_Psybeam_branch_f2335: ; f2335
+	unknownmusic0xde $b3
+	sound $a, $f3, $0571
+	sound $7, $e3, $0531
+	sound $a, $f1, $0551
+	loopchannel 4, Sfx_Psybeam_branch_f2335
+	sound $a, $f1, $0571
+	endchannel
+; f234c
+
+Sfx_Psybeam_Ch8: ; f234c
+Sfx_Psybeam_branch_f234c: ; f234c
+	noise $2, $d1, $4a
+	noise $2, $d2, $2a
+	loopchannel 21, Sfx_Psybeam_branch_f234c
+	endchannel
+; f2357
+
+Sfx_Charge_Ch5: ; f2357
+Sfx_Charge_branch_f2357: ; f2357
+	dutycycle $0
+	sound $2, $f1, $0200
+	sound $3, $f1, $0700
+	sound $4, $f1, $0500
+	sound $5, $f1, $07f0
+	loopchannel 8, Sfx_Charge_branch_f2357
+	endchannel
+; f236e
+
+Sfx_Charge_Ch6: ; f236e
+Sfx_Charge_branch_f236e: ; f236e
+	unknownmusic0xde $b3
+	sound $2, $e1, $0302
+	sound $3, $e1, $07f2
+	sound $4, $e1, $0602
+	sound $5, $e1, $0702
+	loopchannel 8, Sfx_Charge_branch_f236e
+	endchannel
+; f2385
+
+Sfx_Charge_Ch8: ; f2385
+Sfx_Charge_branch_f2385: ; f2385
+	noise $2, $d3, $10
+	noise $3, $d3, $11
+	noise $2, $d2, $10
+	noise $5, $d2, $12
+	loopchannel 9, Sfx_Charge_branch_f2385
+	endchannel
+; f2396
+
+Sfx_Thundershock_Ch5: ; f2396
+Sfx_Thundershock_branch_f2396: ; f2396
+	unknownmusic0xde $2b
+	sound $3, $f1, $07f0
+	sound $4, $f2, $0200
+	loopchannel 8, Sfx_Thundershock_branch_f2396
+	endchannel
+; f23a5
+
+Sfx_Thundershock_Ch6: ; f23a5
+Sfx_Thundershock_branch_f23a5: ; f23a5
+	unknownmusic0xde $b3
+	sound $4, $e2, $0202
+	sound $4, $e1, $07e2
+	loopchannel 9, Sfx_Thundershock_branch_f23a5
+	endchannel
+; f23b4
+
+Sfx_Thundershock_Ch8: ; f23b4
+Sfx_Thundershock_branch_f23b4: ; f23b4
+	noise $4, $ff, $43
+	noise $4, $f2, $44
+	loopchannel 9, Sfx_Thundershock_branch_f23b4
+	endchannel
+; f23bf
+
+Sfx_Psychic_Ch5: ; f23bf
+	dutycycle $2
+	soundinput $f7
+	sound $8, $c4, $07bd
+	sound $8, $c4, $07be
+	sound $8, $c4, $07bf
+	sound $8, $c4, $07c0
+	sound $f, $c4, $07c1
+	sound $f, $f2, $07c0
+	soundinput $8
+	endchannel
+; f23de
+
+Sfx_Psychic_Ch6: ; f23de
+	dutycycle $2
+	sound $8, $c4, $0770
+	sound $8, $c4, $0761
+	sound $8, $c4, $0762
+	sound $8, $c4, $0763
+	sound $f, $c4, $0764
+	sound $f, $f2, $0764
+	endchannel
+; f23f9
+
+Sfx_Psychic_Ch8: ; f23f9
+	noise $f, $3f, $14
+	noise $f, $cf, $13
+	noise $f, $cf, $12
+	noise $f, $cf, $11
+	noise $f, $cf, $10
+	noise $f, $c2, $10
+	endchannel
+; f240c
+
+Sfx_Screech_Ch5: ; f240c
+	dutycycle $2
+	sound $f, $ff, $07e0
+	sound $f, $ff, $07e0
+	sound $f, $ff, $07e0
+	sound $f, $ff, $07e0
+	sound $f, $f2, $07e0
+	endchannel
+; f2423
+
+Sfx_Screech_Ch6: ; f2423
+	dutycycle $3
+	sound $f, $ff, $07e2
+	sound $f, $ff, $07e1
+	sound $f, $ff, $07e2
+	sound $f, $ff, $07e1
+	sound $f, $f2, $07e2
+	endchannel
+; f243a
+
+Sfx_BoneClub_Ch5: ; f243a
+	dutycycle $2
+	soundinput $af
+	sound $8, $f1, $0700
+	soundinput $8
+	endchannel
+; f2445
+
+Sfx_BoneClub_Ch6: ; f2445
+	dutycycle $3
+	sound $8, $f1, $0701
+	endchannel
+; f244c
+
+Sfx_Sharpen_Ch5: ; f244c
+	dutycycle $2
+	sound $6, $f1, $0500
+	sound $6, $f1, $0580
+	sound $6, $f1, $0600
+	sound $6, $f1, $0680
+	sound $8, $f1, $0700
+	endchannel
+; f2463
+
+Sfx_Sharpen_Ch6: ; f2463
+	dutycycle $3
+	sound $6, $e1, $0510
+	sound $6, $e1, $0590
+	sound $6, $e1, $0610
+	sound $6, $e1, $0690
+	sound $8, $e1, $0710
+	endchannel
+; f247a
+
+Sfx_EggBomb_Ch5: ; f247a
+	unknownmusic0xde $ed
+	sound $8, $ff, $03f8
+	sound $f, $ff, $0400
+	sound $f, $f3, $0400
+	endchannel
+; f2489
+
+Sfx_EggBomb_Ch6: ; f2489
+	unknownmusic0xde $b4
+	sound $8, $ef, $03c0
+	sound $f, $ef, $03c0
+	sound $f, $e3, $03c0
+	endchannel
+; f2498
+
+Sfx_EggBomb_Ch8: ; f2498
+	noise $4, $ff, $51
+	noise $8, $ff, $54
+	noise $f, $ff, $55
+	noise $f, $f3, $56
+	endchannel
+; f24a5
+
+Sfx_Sing_Ch5: ; f24a5
+	togglesfx
+	vibrato $a, $24
+	dutycycle $2
+	notetype $a, $87
+	octave 5
+	note G_, 8
+	octave 6
+	note F_, 4
+	note D#, 4
+	octave 5
+	note G_, 8
+	endchannel
+; f24b6
+
+Sfx_Sing_Ch6: ; f24b6
+	togglesfx
+	vibrato $a, $23
+	dutycycle $2
+	notetype $b, $67
+	octave 5
+	note G_, 8
+	notetype $a, $67
+	octave 6
+	note F_, 4
+	note D#, 4
+	octave 5
+	note G_, 8
+	endchannel
+; f24ca
+
+Sfx_HyperBeam_Ch5: ; f24ca
+	dutycycle $0
+	sound $2, $f1, $0780
+	sound $2, $f1, $0700
+	sound $2, $f1, $0790
+	sound $2, $f1, $0700
+	sound $2, $f1, $07a0
+	sound $2, $f1, $0700
+	sound $2, $f1, $07b0
+	sound $2, $f1, $0700
+	sound $2, $f1, $07c0
+	sound $2, $f1, $0700
+	sound $2, $f1, $07d0
+Sfx_HyperBeam_branch_f24f8: ; f24f8
+	sound $2, $f1, $0700
+	sound $2, $f1, $07e0
+	loopchannel 12, Sfx_HyperBeam_branch_f24f8
+	sound $f, $f1, $0700
+	endchannel
+; f2509
+
+Sfx_HyperBeam_Ch6: ; f2509
+	unknownmusic0xde $b3
+	sound $2, $f1, $0781
+	sound $2, $f1, $0701
+	sound $2, $f1, $0791
+	sound $2, $f1, $0701
+	sound $2, $f1, $07a1
+	sound $2, $f1, $0701
+	sound $2, $f1, $07b1
+	sound $2, $f1, $0701
+	sound $2, $f1, $07c1
+	sound $2, $f1, $0701
+	sound $2, $f1, $07d1
+Sfx_HyperBeam_branch_f2537: ; f2537
+	sound $2, $f1, $0701
+	sound $2, $f1, $07e1
+	loopchannel 12, Sfx_HyperBeam_branch_f2537
+	sound $f, $f1, $0701
+	endchannel
+; f2548
+
+Sfx_HyperBeam_Ch8: ; f2548
+Sfx_HyperBeam_branch_f2548: ; f2548
+	noise $1, $d1, $49
+	noise $1, $d1, $29
+	loopchannel 26, Sfx_HyperBeam_branch_f2548
+	endchannel
+; f2553
+
+Sfx_Unknown60_Ch8: ; f2553
+	noise $6, $20, $10
+	noise $6, $2f, $40
+	noise $6, $4f, $41
+	noise $6, $8f, $41
+	noise $6, $cf, $42
+	noise $8, $d7, $42
+	noise $f, $e7, $43
+	noise $f, $f2, $43
+	endchannel
+; f256c
+
+Sfx_UnknownCB_Ch8: ; f256c
+	noise $1, $10, $10
+	noise $2, $20, $10
+	noise $2, $30, $20
+	noise $2, $40, $20
+	noise $2, $50, $21
+	noise $2, $60, $22
+	noise $4, $70, $22
+	noise $8, $80, $22
+	noise $f, $94, $22
+	endchannel
+; f2588
+
+Sfx_Unknown61_Ch8: ; f2588
+	noise $4, $d1, $41
+	endchannel
+; f258c
+
+Sfx_Unknown62_Ch8: ; f258c
+	noise $4, $c1, $42
+	endchannel
+; f2590
+
+Sfx_Unknown63_Ch8: ; f2590
+	noise $2, $6f, $21
+	noise $2, $af, $31
+	noise $f, $f2, $41
+	endchannel
+; f259a
+
+Sfx_Burn_Ch8: ; f259a
+	noise $2, $d2, $32
+	noise $f, $f2, $43
+	endchannel
+; f25a1
+
+Sfx_TitleScreenEntrance_Ch8: ; f25a1
+	noise $2, $70, $22
+	noise $2, $80, $23
+	noise $2, $90, $24
+	noise $2, $a0, $25
+	noise $2, $b0, $26
+	noise $f, $c2, $26
+	endchannel
+; f25b4
+
+Sfx_Unknown66_Ch5: ; f25b4
+	dutycycle $2
+	sound $1, $f2, $06a0
+	sound $1, $f2, $06e0
+	sound $8, $f1, $0700
+	endchannel
+; f25c3
+
+Sfx_GetCoinFromSlots_Ch5: ; f25c3
+	dutycycle $2
+	sound $2, $f1, $0700
+	sound $8, $81, $07e0
+	endchannel
+; f25ce
+
+Sfx_PayDay_Ch5: ; f25ce
+	dutycycle $3
+	sound $5, $e1, $0700
+	sound $2, $e1, $0780
+	sound $f, $f1, $07c0
+	endchannel
+; f25dd
+
+Sfx_PayDay_Ch6: ; f25dd
+	dutycycle $2
+	sound $4, $c1, $06c1
+	sound $2, $c1, $0741
+	sound $f, $d1, $0781
+	endchannel
+; f25ec
+
+Sfx_Metronome_Ch5: ; f25ec
+	dutycycle $2
+	soundinput $5f
+	sound $4, $40, $07e0
+	sound $4, $60, $07e0
+	sound $4, $80, $07e0
+	sound $8, $a0, $07e0
+	sound $8, $a0, $07e0
+	sound $8, $80, $07e0
+	sound $8, $60, $07e0
+	sound $8, $30, $07e0
+	sound $f, $12, $07e0
+	soundinput $8
+	endchannel
+; f2617
+
+Sfx_Unknown5F_Ch5: ; f2617
+Sfx_Unknown5F_branch_f2617: ; f2617
+	sound $2, $f7, $0601
+	sound $2, $f7, $0701
+	loopchannel 8, Sfx_Unknown5F_branch_f2617
+	endchannel
+; f2624
+
+Sfx_Unknown5F_Ch6: ; f2624
+	sound $1, $f7, $ffff
+	sound $2, $f7, $0602
+	sound $2, $f7, $0702
+	loopchannel 8, Sfx_Unknown5F_branch_f2617
+	endchannel
+; f2635
+
+Sfx_Fanfare2_Ch5: ; f2635
+	togglesfx
+	sfxpriorityon
+	tempo 256
+	volume $77
+	tone $0001
+	dutycycle $3
+	notetype $6, $b5
+	octave 3
+	note G#, 4
+	notetype $4, $b2
+	note F_, 2
+	note G#, 2
+	note A_, 2
+	note A#, 2
+	note F#, 2
+	note A#, 2
+	octave 4
+	note C_, 4
+	note C_, 2
+	notetype $4, $b6
+	note C#, 12
+	sfxpriorityoff
+	endchannel
+; f2658
+
+Sfx_Fanfare2_Ch6: ; f2658
+	togglesfx
+	dutycycle $2
+	notetype $6, $c5
+	octave 4
+	note C#, 6
+	notetype $4, $c1
+	note C#, 1
+	note C#, 1
+	note C#, 1
+	notetype $4, $c2
+	note D#, 2
+	note C#, 2
+	note D#, 2
+	note E_, 4
+	note E_, 2
+	notetype $4, $c6
+	note F_, 12
+	endchannel
+; f2673
+
+Sfx_Fanfare2_Ch8: ; f2673
+	togglesfx
+	notetype $6
+	note C_, 1
+	octave 5
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note __, 2
+	notetype $4
+	note C_, 1
+	note C#, 2
+	note __, 2
+	note C#, 2
+	note D#, 2
+	note __, 2
+	note F_, 2
+	note G#, 6
+	endchannel
+; f2687
+
+Sfx_Fanfare_Ch5: ; f2687
+	togglesfx
+	sfxpriorityon
+	tempo 256
+	volume $77
+	dutycycle $3
+	tone $0001
+	notetype $6, $b3
+	octave 3
+	note F_, 4
+	note C#, 4
+	note F#, 4
+	note D#, 4
+	note G#, 4
+	note F_, 4
+	note A#, 4
+	note F#, 4
+	notetype $4, $b3
+	note A#, 4
+	note B_, 4
+	octave 4
+	note C_, 4
+	note C#, 4
+	note D#, 4
+	note C_, 4
+	notetype $4, $b6
+	note C#, 12
+	sfxpriorityoff
+	endchannel
+; f26af
+
+Sfx_Fanfare_Ch6: ; f26af
+	togglesfx
+	dutycycle $2
+	notetype $6, $c4
+	octave 4
+	note C#, 4
+	notetype $4, $c4
+	note C#, 2
+	octave 3
+	note A#, 2
+	octave 4
+	note C#, 2
+	note D#, 6
+	note D#, 2
+	octave 3
+	note B_, 2
+	octave 4
+	note D#, 2
+	note F_, 6
+	note F_, 2
+	note C#, 2
+	note F_, 2
+	note F#, 6
+	note F#, 2
+	note D#, 2
+	note F#, 2
+	note C#, 4
+	note D#, 4
+	note E_, 4
+	note F_, 4
+	note F#, 4
+	note G#, 4
+	notetype $4, $c6
+	note F#, 12
+	endchannel
+; f26d8
+
+Sfx_Fanfare_Ch8: ; f26d8
+	togglesfx
+	notetype $6
+	note C_, 1
+	octave 4
+	note A#, 4
+	note __, 4
+	note B_, 4
+	note __, 4
+	octave 5
+	note C#, 4
+	note __, 4
+	note D#, 4
+	note __, 4
+	notetype $4
+	note C_, 1
+	note F_, 4
+	note D#, 4
+	note C#, 4
+	note A#, 4
+	note G#, 4
+	note F_, 4
+	note F#, 6
+	endchannel
+; f26f1
+
+Sfx_HangUp_Ch5: ; f26f1
+	dutycycle $2
+	sound $4, $b8, $077b
+	sound $2, $21, $077b
+	sound $10, $0, $0000
+Sfx_HangUp_branch_f26ff: ; f26ff
+Sfx_NoSignal_Ch5: ; f26ff
+Sfx_NoSignal_branch_f26ff: ; f26ff
+	dutycycle $2
+	sound $14, $e8, $070b
+	sound $1c, $0, $0000
+	loopchannel 3, Sfx_HangUp_branch_f26ff
+	endchannel
+; f270e
+
+Sfx_Sandstorm_Ch8: ; f270e
+Sfx_Sandstorm_branch_f270e: ; f270e
+Sfx_Unknown5F_Ch8: ; f270e
+Sfx_Unknown5F_branch_f270e: ; f270e
+	noise $1, $f8, $41
+	noise $2, $9c, $24
+	noise $0, $0, $0
+	noise $3, $59, $16
+	noise $2, $0, $0
+	loopchannel 3, Sfx_Sandstorm_branch_f270e
+	endchannel
+; f2722
+
+Sfx_Elevator_Ch5: ; f2722
+	dutycycle $2
+	soundinput $5a
+Sfx_Elevator_branch_f2726: ; f2726
+	sound $2, $f1, $0300
+	loopchannel 48, Sfx_Elevator_branch_f2726
+	soundinput $8
+	dutycycle $2
+	sound $f, $f3, $0730
+	sound $8, $65, $0730
+	sound $f, $f4, $0700
+	sound $f, $74, $0700
+	sound $f, $44, $0700
+	sound $f, $24, $0700
+	endchannel
+; f274b
+
+Sfx_Elevator_Ch6: ; f274b
+Sfx_Elevator_Ch7: ; f274b
+	sound $60, $0, $0000
+	sound $53, $0, $0000
+	endchannel
+; f2754
+
+Sfx_Elevator_Ch8: ; f2754
+	noise $60, $0, $0
+	noise $53, $0, $0
+	endchannel
+; f275b
+
+Sfx_StopSlot: ; f275b
+	dbw $04, Sfx_StopSlot_Ch5
+; f275e
+
+Sfx_StopSlot_Ch5: ; f275e
+	dutycycle $2
+	sound $1, $f8, $0760
+	sound $4, $82, $0760
+	endchannel
+; f2769
+
+Sfx_GlassTing: ; f2769
+	dbw $04, Sfx_GlassTing_Ch5
+; f276c
+
+Sfx_GlassTing_Ch5: ; f276c
+	dutycycle $2
+	sound $20, $d1, $07dc
+	endchannel
+; f2773
+
+Sfx_GlassTing2: ; f2773
+	dbw $44, Sfx_GlassTing2_Ch5
+	dbw $05, Sfx_GlassTing2_Ch6
+; f2779
+
+Sfx_GlassTing2_Ch5: ; f2779
+	dutycycle $2
+	sound $10, $f1, $07dc
+	endchannel
+; f2780
+
+Sfx_GlassTing2_Ch6: ; f2780
+	dutycycle $2
+	sound $10, $d1, $07dd
+	endchannel
+; f2787
diff --git a/audio/sfx_crystal.asm b/audio/sfx_crystal.asm
new file mode 100644
index 000000000..08806a7cf
--- /dev/null
+++ b/audio/sfx_crystal.asm
@@ -0,0 +1,303 @@
+Sfx_IntroUnown1: ; 17982d
+	dbw $04, Sfx_IntroUnown1_Ch5
+; 179830
+
+Sfx_IntroUnown1_Ch5: ; 179830
+	vibrato $1, $a3
+	dutycycle $2
+	sound $8, $39, $0705
+	sound $20, $e2, $0705
+	endchannel
+; 17983e
+
+Sfx_IntroUnown2: ; 17983e
+	dbw $05, Sfx_IntroUnown2_Ch6
+; 179841
+
+Sfx_IntroUnown2_Ch6: ; 179841
+	vibrato $1, $73
+	dutycycle $2
+	sound $8, $39, $0758
+	sound $20, $e2, $0758
+	endchannel
+; 17984f
+
+Sfx_IntroUnown3: ; 17984f
+	dbw $06, Sfx_IntroUnown3_Ch7
+; 179852
+
+Sfx_IntroUnown3_Ch7: ; 179852
+	vibrato $1, $53
+	sound $3, $32, $07c2
+	sound $3, $22, $07c2
+	sound $3, $12, $07c2
+	sound $10, $12, $07c2
+	sound $6, $22, $07c2
+	sound $6, $32, $07c2
+	endchannel
+; 17986e
+
+Sfx_DittoPopUp: ; 17986e
+	dbw $04, Sfx_DittoPopUp_Ch5
+; 179871
+
+Sfx_DittoPopUp_Ch5: ; 179871
+	dutycycle $2
+	soundinput $1e
+	sound $3, $82, $0700
+	sound $1, $31, $0701
+	soundinput $16
+	sound $4, $b1, $0640
+	sound $10, $31, $0641
+	endchannel
+; 179888
+
+Sfx_DittoTransform: ; 179888
+	dbw $04, Sfx_DittoTransform_Ch5
+; 17988b
+
+Sfx_DittoTransform_Ch5: ; 17988b
+	dutycycle $1
+	soundinput $26
+	sound $14, $3b, $0440
+	sound $4, $97, $04c0
+	sound $4, $67, $04c1
+	sound $4, $42, $04c2
+	endchannel
+; 1798a0
+
+Sfx_IntroSuicune1: ; 1798a0
+	dbw $07, Sfx_IntroSuicune1_Ch8
+; 1798a3
+
+Sfx_IntroSuicune1_Ch8: ; 1798a3
+	noise $1, $58, $59
+	noise $2, $91, $23
+	endchannel
+; 1798aa
+
+Sfx_IntroPichu: ; 1798aa
+	dbw $04, Sfx_IntroPichu_Ch5
+; 1798ad
+
+Sfx_IntroPichu_Ch5: ; 1798ad
+	dutycycle $3
+	soundinput $4d
+	sound $1, $88, $0770
+	sound $3, $0, $0000
+	soundinput $17
+	sound $2, $88, $0776
+	endchannel
+; 1798c0
+
+Sfx_IntroSuicune2: ; 1798c0
+	dbw $07, Sfx_IntroSuicune2_Ch8
+; 1798c3
+
+Sfx_IntroSuicune2_Ch8: ; 1798c3
+	noise $1, $a7, $31
+	noise $1, $91, $0
+	noise $1, $92, $21
+	noise $1, $91, $0
+	noise $1, $92, $22
+	noise $1, $82, $11
+	noise $1, $82, $22
+	noise $1, $72, $11
+	noise $1, $72, $12
+	noise $1, $62, $10
+	noise $1, $63, $0
+	noise $1, $53, $10
+	noise $1, $43, $0
+	noise $1, $33, $10
+	noise $1, $23, $0
+	noise $1, $13, $10
+	endchannel
+; 1798f4
+
+Sfx_IntroSuicune3: ; 1798f4
+	dbw $07, Sfx_IntroSuicune3_Ch8
+; 1798f7
+
+Sfx_IntroSuicune3_Ch8: ; 1798f7
+	noise $1, $88, $31
+	noise $8, $39, $11
+	noise $4, $a4, $10
+	noise $4, $44, $10
+	noise $4, $24, $10
+	endchannel
+; 179907
+
+Sfx_DittoBounce: ; 179907
+	dbw $04, Sfx_DittoBounce_Ch5
+; 17990a
+
+Sfx_DittoBounce_Ch5: ; 17990a
+	dutycycle $2
+	soundinput $2c
+	sound $2, $82, $04b0
+	sound $0, $31, $04b0
+	soundinput $34
+	sound $10, $b1, $0420
+	endchannel
+; 17991d
+
+Sfx_IntroSuicune4: ; 17991d
+	dbw $07, Sfx_IntroSuicune4_Ch8
+; 179920
+
+Sfx_IntroSuicune4_Ch8: ; 179920
+	noise $1, $a1, $5c
+	noise $0, $0, $0
+	noise $1, $c1, $4d
+	noise $0, $0, $0
+	noise $4, $b2, $31
+	noise $0, $0, $0
+	noise $4, $a2, $2
+	noise $0, $0, $0
+	noise $4, $92, $1
+	noise $0, $0, $0
+	noise $20, $72, $0
+	endchannel
+; 179942
+
+Sfx_GameFreakPresents: ; 179942
+	dbw $04, Sfx_GameFreakPresents_Ch5
+; 179945
+
+Sfx_GameFreakPresents_Ch5: ; 179945
+	togglesfx
+	dutycycle $2
+	notetype $2, $b1
+	soundinput $ff
+	forceoctave $1a
+	octave 5
+	note C_, 2
+	note E_, 2
+	note G_, 2
+	octave 6
+	note C_, 2
+	note E_, 2
+	note G_, 3
+	intensity $81
+	note G_, 3
+	intensity $51
+	note G_, 3
+	intensity $31
+	note G_, 3
+	endchannel
+; 179961
+
+Sfx_Tingle: ; 179961
+	dbw $04, Sfx_Tingle_Ch5
+; 179964
+
+Sfx_Tingle_Ch5: ; 179964
+	togglesfx
+	dutycycle $1
+	forceoctave $b
+	notetype $1, $b1
+Sfx_Tingle_branch_17996c: ; 17996c
+	octave 5
+	note C_, 3
+	octave 6
+	note G_, 2
+	octave 5
+	note C_, 3
+	note __, 2
+	loopchannel 2, Sfx_Tingle_branch_17996c
+	note C_, 2
+	intensity $a1
+	note G_, 13
+	endchannel
+; 17997c
+
+Sfx_TwoPcBeeps: ; 17997c
+	dbw $04, Sfx_TwoPcBeeps_Ch5
+; 17997f
+
+Sfx_TwoPcBeeps_Ch5: ; 17997f
+	dutycycle $2
+	sound $2, $e8, $07c2
+	sound $2, $28, $07c2
+	sound $2, $e8, $07c2
+	sound $2, $28, $07c2
+	endchannel
+; 179992
+
+Sfx_4NoteDitty: ; 179992
+	dbw $84, Sfx_4NoteDitty_Ch5
+	dbw $05, Sfx_4NoteDitty_Ch6
+	dbw $06, Sfx_4NoteDitty_Ch7
+; 17999b
+
+Sfx_4NoteDitty_Ch5: ; 17999b
+	togglesfx
+	dutycycle $2
+	notetype $2, $e8
+	forceoctave $2
+	octave 4
+	note C_, 2
+	intensity $48
+	note C_, 2
+	intensity $e8
+	note G_, 2
+	intensity $48
+	note G_, 2
+	octave 5
+	intensity $e8
+	note E_, 2
+	intensity $48
+	note E_, 2
+	octave 6
+	intensity $e8
+	note C_, 2
+	intensity $43
+	note C_, 16
+	endchannel
+; 1799bd
+
+Sfx_4NoteDitty_Ch6: ; 1799bd
+	togglesfx
+	notetype $2, $b8
+	note __, 9
+	note __, 16
+	endchannel
+; 1799c4
+
+Sfx_4NoteDitty_Ch7: ; 1799c4
+	togglesfx
+	notetype $2, $b8
+	note __, 9
+	note __, 16
+	endchannel
+; 1799cb
+
+Sfx_Twinkle: ; 1799cb
+	dbw $04, Sfx_Twinkle_Ch5
+; 1799ce
+
+Sfx_Twinkle_Ch5: ; 1799ce
+	togglesfx
+	dutycycle $0
+	forceoctave $2
+	notetype $2, $e1
+	octave 3
+	note G_, 2
+	intensity $b1
+	octave 4
+	note D_, 2
+	intensity $e1
+	note B_, 2
+	intensity $b1
+	note G_, 2
+	intensity $e1
+	octave 5
+	note D_, 2
+	intensity $b1
+	octave 4
+	note B_, 2
+	intensity $e1
+	octave 5
+	note G_, 6
+	endchannel
+; 1799ef
diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm
index 726e712c2..01dbca09c 100644
--- a/audio/sfx_pointers.asm
+++ b/audio/sfx_pointers.asm
@@ -1,213 +1,213 @@
 ; e927c
-	dbw $3c, $4b3f ; Dex Fanfare 50-79
-	dbw $3c, $4c2f ; Item
-	dbw $3c, $4c89 ; Caught Mon
-	dbw $3c, $4941 ; Pokeballs Placed On Table
-	dbw $3c, $4947 ; Potion
-	dbw $3c, $494a ; Full Heal
-	dbw $3c, $494d ; Menu
-	dbw $3c, $4950 ; Read Text
-	dbw $3c, $4950 ; Read Text 2
-	dbw $3c, $4bd5 ; Dex Fanfare 20-49
-	dbw $3c, $4cea ; Dex Fanfare 80-109
-	dbw $3c, $4953 ; Poison
-	dbw $3c, $4956 ; Got Safari Balls
-	dbw $3c, $4959 ; Boot Pc
-	dbw $3c, $495c ; Shut Down Pc
-	dbw $3c, $495f ; Choose Pc Option
-	dbw $3c, $4962 ; Escape Rope
-	dbw $3c, $4965 ; Push Button
-	dbw $3c, $4968 ; Second Part Of Itemfinder
-	dbw $3c, $496b ; Warp To
-	dbw $3c, $496e ; Warp From
-	dbw $3c, $4971 ; Change Dex Mode
-	dbw $3c, $4974 ; Jump Over Ledge
-	dbw $3c, $4977 ; Grass Rustle
-	dbw $3c, $497a ; Fly
-	dbw $3c, $497d ; Wrong
-	dbw $3c, $4983 ; Squeak
-	dbw $3c, $4986 ; Strength
-	dbw $3c, $4989 ; Boat
-	dbw $3c, $498f ; Wall Open
-	dbw $3c, $4992 ; Place Puzzle Piece Down
-	dbw $3c, $4995 ; Enter Door
-	dbw $3c, $4998 ; Switch Pokemon
-	dbw $3c, $499e ; Tally
-	dbw $3c, $49a4 ; Transaction
-	dbw $3c, $49ad ; Exit Building
-	dbw $3c, $49aa ; Bump
-	dbw $3c, $49b0 ; Save
-	dbw $3c, $49f8 ; Pokeflute
-	dbw $3c, $49fb ; Elevator End
-	dbw $3c, $49fe ; Throw Ball
-	dbw $3c, $4a04 ; Ball Poof
-	dbw $3c, $4a0a ; Unknown 3A
-	dbw $3c, $4a10 ; Run
-	dbw $3c, $4a13 ; Slot Machine Start
-	dbw $3c, $4dbe ; Fanfare
-	dbw $3c, $4a3d ; Peck
-	dbw $3c, $4a40 ; Kinesis
-	dbw $3c, $4a43 ; Lick
-	dbw $3c, $4a46 ; Pound
-	dbw $3c, $4a49 ; Move Puzzle Piece
-	dbw $3c, $4a4c ; Comet Punch
-	dbw $3c, $4a4f ; Mega Punch
-	dbw $3c, $4a52 ; Scratch
-	dbw $3c, $4a55 ; Vicegrip
-	dbw $3c, $4a58 ; Razor Wind
-	dbw $3c, $4a5b ; Cut
-	dbw $3c, $4a5e ; Wing Attack
-	dbw $3c, $4a61 ; Whirlwind
-	dbw $3c, $4a64 ; Bind
-	dbw $3c, $4a67 ; Vine Whip
-	dbw $3c, $4a6a ; Double Kick
-	dbw $3c, $4a6d ; Mega Kick
-	dbw $3c, $4a70 ; Headbutt
-	dbw $3c, $4a73 ; Horn Attack
-	dbw $3c, $4a76 ; Tackle
-	dbw $3c, $4a79 ; Poison Sting
-	dbw $3c, $4a7c ; Powder
-	dbw $3c, $4a7f ; Doubleslap
-	dbw $3c, $4a82 ; Bite
-	dbw $3c, $4a88 ; Jump Kick
-	dbw $3c, $4a8b ; Stomp
-	dbw $3c, $4a8e ; Tail Whip
-	dbw $3c, $4a91 ; Karate Chop
-	dbw $3c, $4a94 ; Submission
-	dbw $3c, $4a97 ; Water Gun
-	dbw $3c, $4a9d ; Swords Dance
-	dbw $3c, $4aa0 ; Thunder
-	dbw $3c, $4aa3 ; Supersonic
-	dbw $3c, $4aac ; Leer
-	dbw $3c, $4ab5 ; Ember
-	dbw $3c, $4abb ; Bubblebeam
-	dbw $3c, $4ac4 ; Hydro Pump
-	dbw $3c, $4aca ; Surf
-	dbw $3c, $4ad3 ; Psybeam
-	dbw $3c, $4adc ; Charge
-	dbw $3c, $4ae5 ; Thundershock
-	dbw $3c, $4aee ; Psychic
-	dbw $3c, $4af7 ; Screech
-	dbw $3c, $4afd ; Bone Club
-	dbw $3c, $4b03 ; Sharpen
-	dbw $3c, $4b09 ; Egg Bomb
-	dbw $3c, $4b12 ; Sing
-	dbw $3c, $4b18 ; Hyper Beam
-	dbw $3c, $4b21 ; Shine
-	dbw $3c, $4b24 ; Unknown 5F
-	dbw $3c, $4a1c ; Unknown 60
-	dbw $3c, $4a1f ; Unknown 61
-	dbw $3c, $4a22 ; Unknown 62
-	dbw $3c, $4a25 ; Unknown 63
-	dbw $3c, $4a28 ; Burn
-	dbw $3c, $4a2b ; Title Screen Entrance
-	dbw $3c, $4a2e ; Unknown 66
-	dbw $3c, $4a31 ; Get Coin From Slots
-	dbw $3c, $4a34 ; Pay Day
-	dbw $3c, $4a3a ; Metronome
-	dbw $3c, $4a19 ; Call
-	dbw $3c, $4b2d ; Hang Up
-	dbw $3c, $4b30 ; No Signal
-	dbw $3c, $4b2a ; Sandstorm
-	dbw $3c, $4b33 ; Elevator
-	dbw $3c, $52b4 ; Protect
-	dbw $3c, $52f6 ; Sketch
-	dbw $3c, $5314 ; Rain Dance
-	dbw $3c, $5334 ; Aeroblast
-	dbw $3c, $5352 ; Spark
-	dbw $3c, $5360 ; Curse
-	dbw $3c, $537d ; Rage
-	dbw $3c, $539c ; Thief
-	dbw $3c, $53b0 ; Thief 2
-	dbw $3c, $53ca ; Spider Web
-	dbw $3c, $53f7 ; Mind Reader
-	dbw $3c, $541d ; Nightmare
-	dbw $3c, $5453 ; Snore
-	dbw $3c, $5469 ; Sweet Kiss
-	dbw $3c, $547f ; Sweet Kiss 2
-	dbw $3c, $54a5 ; Belly Drum
-	dbw $3c, $54ba ; Unknown 7F
-	dbw $3c, $54d0 ; Sludge Bomb
-	dbw $3c, $54f5 ; Foresight
-	dbw $3c, $5515 ; Spite
-	dbw $3c, $553a ; Outrage
-	dbw $3c, $554d ; Perish Song
-	dbw $3c, $5570 ; Giga Drain
-	dbw $3c, $55b4 ; Attract
-	dbw $3c, $55cc ; Kinesis 2
-	dbw $3c, $55de ; Zap Cannon
-	dbw $3c, $55ef ; Mean Look
-	dbw $3c, $5621 ; Heal Bell
-	dbw $3c, $5637 ; Return
-	dbw $3c, $5653 ; Exp Bar
-	dbw $3c, $567f ; Milk Drink
-	dbw $3c, $569f ; Present
-	dbw $3c, $56b9 ; Morning Sun
-	dbw $3c, $4b3f ; Level Up
-	dbw $3c, $4b86 ; Key Item
-	dbw $3c, $4d56 ; Fanfare 2
-	dbw $3c, $4dc7 ; Register Phone #
-	dbw $3c, $4e26 ; 3Rd Place
-	dbw $3c, $4e66 ; Get Egg From Daycare Man
-	dbw $3c, $4e66 ; Get Egg From Daycare Lady
-	dbw $3c, $4edc ; Move Deleted
-	dbw $3c, $4f5e ; 2Nd Place
-	dbw $3c, $4fe2 ; 1St Place
-	dbw $3c, $5069 ; Choose A Card
-	dbw $3c, $5104 ; Get Tm
-	dbw $3c, $517d ; Get Badge
-	dbw $3c, $5236 ; Quit Slots
-	dbw $3c, $5775 ; Egg Crack
-	dbw $3c, $5878 ; Dex Fanfare < 20
-	dbw $3c, $58d2 ; Dex Fanfare 140-169
-	dbw $3c, $5951 ; Dex Fanfare 170-199
-	dbw $3c, $59d6 ; Dex Fanfare 200-229
-	dbw $3c, $5a66 ; Dex Fanfare 230 +
-	dbw $3c, $5784 ; Evolved
-	dbw $3c, $579b ; Master Ball
-	dbw $3c, $57c0 ; Egg Hatch
-	dbw $3c, $57d9 ; Gs Intro Charizard Fireball
-	dbw $3c, $57ff ; Gs Intro Pokemon Appears
-	dbw $3c, $5818 ; Flash
-	dbw $3c, $5846 ; Game Freak Logo Gs
-	dbw $3c, $5b33 ; Not Very Effective
-	dbw $3c, $5b40 ; Damage
-	dbw $3c, $5b50 ; Super Effective
-	dbw $3c, $5b63 ; Ball Bounce
-	dbw $3c, $56df ; Moonlight
-	dbw $3c, $56fd ; Encore
-	dbw $3c, $5721 ; Beat Up
-	dbw $3c, $574c ; Baton Pass
-	dbw $3c, $4944 ; Ball Wiggle
-	dbw $3c, $5734 ; Sweet Scent
-	dbw $3c, $5bb3 ; Sweet Scent 2
-	dbw $3c, $5bec ; Hit End Of Exp Bar
-	dbw $3c, $5c10 ; Give Trademon
-	dbw $3c, $5c3e ; Get Trademon
-	dbw $3c, $5c6c ; Train Arrived
-	dbw $3c, $675b ; Stop Slot
-	dbw $3c, $5cb4 ; 2 Boops
-	dbw $3c, $6769 ; Glass Ting
-	dbw $3c, $6773 ; Glass Ting 2
-	
+	dbw BANK(Sfx_DexFanfare5079), Sfx_DexFanfare5079
+	dbw BANK(Sfx_Item), Sfx_Item
+	dbw BANK(Sfx_CaughtMon), Sfx_CaughtMon
+	dbw BANK(Sfx_PokeballsPlacedOnTable), Sfx_PokeballsPlacedOnTable
+	dbw BANK(Sfx_Potion), Sfx_Potion
+	dbw BANK(Sfx_FullHeal), Sfx_FullHeal
+	dbw BANK(Sfx_Menu), Sfx_Menu
+	dbw BANK(Sfx_ReadText), Sfx_ReadText
+	dbw BANK(Sfx_ReadText2), Sfx_ReadText2
+	dbw BANK(Sfx_DexFanfare2049), Sfx_DexFanfare2049
+	dbw BANK(Sfx_DexFanfare80109), Sfx_DexFanfare80109
+	dbw BANK(Sfx_Poison), Sfx_Poison
+	dbw BANK(Sfx_GotSafariBalls), Sfx_GotSafariBalls
+	dbw BANK(Sfx_BootPc), Sfx_BootPc
+	dbw BANK(Sfx_ShutDownPc), Sfx_ShutDownPc
+	dbw BANK(Sfx_ChoosePcOption), Sfx_ChoosePcOption
+	dbw BANK(Sfx_EscapeRope), Sfx_EscapeRope
+	dbw BANK(Sfx_PushButton), Sfx_PushButton
+	dbw BANK(Sfx_SecondPartOfItemfinder), Sfx_SecondPartOfItemfinder
+	dbw BANK(Sfx_WarpTo), Sfx_WarpTo
+	dbw BANK(Sfx_WarpFrom), Sfx_WarpFrom
+	dbw BANK(Sfx_ChangeDexMode), Sfx_ChangeDexMode
+	dbw BANK(Sfx_JumpOverLedge), Sfx_JumpOverLedge
+	dbw BANK(Sfx_GrassRustle), Sfx_GrassRustle
+	dbw BANK(Sfx_Fly), Sfx_Fly
+	dbw BANK(Sfx_Wrong), Sfx_Wrong
+	dbw BANK(Sfx_Squeak), Sfx_Squeak
+	dbw BANK(Sfx_Strength), Sfx_Strength
+	dbw BANK(Sfx_Boat), Sfx_Boat
+	dbw BANK(Sfx_WallOpen), Sfx_WallOpen
+	dbw BANK(Sfx_PlacePuzzlePieceDown), Sfx_PlacePuzzlePieceDown
+	dbw BANK(Sfx_EnterDoor), Sfx_EnterDoor
+	dbw BANK(Sfx_SwitchPokemon), Sfx_SwitchPokemon
+	dbw BANK(Sfx_Tally), Sfx_Tally
+	dbw BANK(Sfx_Transaction), Sfx_Transaction
+	dbw BANK(Sfx_ExitBuilding), Sfx_ExitBuilding
+	dbw BANK(Sfx_Bump), Sfx_Bump
+	dbw BANK(Sfx_Save), Sfx_Save
+	dbw BANK(Sfx_Pokeflute), Sfx_Pokeflute
+	dbw BANK(Sfx_ElevatorEnd), Sfx_ElevatorEnd
+	dbw BANK(Sfx_ThrowBall), Sfx_ThrowBall
+	dbw BANK(Sfx_BallPoof), Sfx_BallPoof
+	dbw BANK(Sfx_Unknown3A), Sfx_Unknown3A
+	dbw BANK(Sfx_Run), Sfx_Run
+	dbw BANK(Sfx_SlotMachineStart), Sfx_SlotMachineStart
+	dbw BANK(Sfx_Fanfare), Sfx_Fanfare
+	dbw BANK(Sfx_Peck), Sfx_Peck
+	dbw BANK(Sfx_Kinesis), Sfx_Kinesis
+	dbw BANK(Sfx_Lick), Sfx_Lick
+	dbw BANK(Sfx_Pound), Sfx_Pound
+	dbw BANK(Sfx_MovePuzzlePiece), Sfx_MovePuzzlePiece
+	dbw BANK(Sfx_CometPunch), Sfx_CometPunch
+	dbw BANK(Sfx_MegaPunch), Sfx_MegaPunch
+	dbw BANK(Sfx_Scratch), Sfx_Scratch
+	dbw BANK(Sfx_Vicegrip), Sfx_Vicegrip
+	dbw BANK(Sfx_RazorWind), Sfx_RazorWind
+	dbw BANK(Sfx_Cut), Sfx_Cut
+	dbw BANK(Sfx_WingAttack), Sfx_WingAttack
+	dbw BANK(Sfx_Whirlwind), Sfx_Whirlwind
+	dbw BANK(Sfx_Bind), Sfx_Bind
+	dbw BANK(Sfx_VineWhip), Sfx_VineWhip
+	dbw BANK(Sfx_DoubleKick), Sfx_DoubleKick
+	dbw BANK(Sfx_MegaKick), Sfx_MegaKick
+	dbw BANK(Sfx_Headbutt), Sfx_Headbutt
+	dbw BANK(Sfx_HornAttack), Sfx_HornAttack
+	dbw BANK(Sfx_Tackle), Sfx_Tackle
+	dbw BANK(Sfx_PoisonSting), Sfx_PoisonSting
+	dbw BANK(Sfx_Powder), Sfx_Powder
+	dbw BANK(Sfx_Doubleslap), Sfx_Doubleslap
+	dbw BANK(Sfx_Bite), Sfx_Bite
+	dbw BANK(Sfx_JumpKick), Sfx_JumpKick
+	dbw BANK(Sfx_Stomp), Sfx_Stomp
+	dbw BANK(Sfx_TailWhip), Sfx_TailWhip
+	dbw BANK(Sfx_KarateChop), Sfx_KarateChop
+	dbw BANK(Sfx_Submission), Sfx_Submission
+	dbw BANK(Sfx_WaterGun), Sfx_WaterGun
+	dbw BANK(Sfx_SwordsDance), Sfx_SwordsDance
+	dbw BANK(Sfx_Thunder), Sfx_Thunder
+	dbw BANK(Sfx_Supersonic), Sfx_Supersonic
+	dbw BANK(Sfx_Leer), Sfx_Leer
+	dbw BANK(Sfx_Ember), Sfx_Ember
+	dbw BANK(Sfx_Bubblebeam), Sfx_Bubblebeam
+	dbw BANK(Sfx_HydroPump), Sfx_HydroPump
+	dbw BANK(Sfx_Surf), Sfx_Surf
+	dbw BANK(Sfx_Psybeam), Sfx_Psybeam
+	dbw BANK(Sfx_Charge), Sfx_Charge
+	dbw BANK(Sfx_Thundershock), Sfx_Thundershock
+	dbw BANK(Sfx_Psychic), Sfx_Psychic
+	dbw BANK(Sfx_Screech), Sfx_Screech
+	dbw BANK(Sfx_BoneClub), Sfx_BoneClub
+	dbw BANK(Sfx_Sharpen), Sfx_Sharpen
+	dbw BANK(Sfx_EggBomb), Sfx_EggBomb
+	dbw BANK(Sfx_Sing), Sfx_Sing
+	dbw BANK(Sfx_HyperBeam), Sfx_HyperBeam
+	dbw BANK(Sfx_Shine), Sfx_Shine
+	dbw BANK(Sfx_Unknown5F), Sfx_Unknown5F
+	dbw BANK(Sfx_Unknown60), Sfx_Unknown60
+	dbw BANK(Sfx_Unknown61), Sfx_Unknown61
+	dbw BANK(Sfx_Unknown62), Sfx_Unknown62
+	dbw BANK(Sfx_Unknown63), Sfx_Unknown63
+	dbw BANK(Sfx_Burn), Sfx_Burn
+	dbw BANK(Sfx_TitleScreenEntrance), Sfx_TitleScreenEntrance
+	dbw BANK(Sfx_Unknown66), Sfx_Unknown66
+	dbw BANK(Sfx_GetCoinFromSlots), Sfx_GetCoinFromSlots
+	dbw BANK(Sfx_PayDay), Sfx_PayDay
+	dbw BANK(Sfx_Metronome), Sfx_Metronome
+	dbw BANK(Sfx_Call), Sfx_Call
+	dbw BANK(Sfx_HangUp), Sfx_HangUp
+	dbw BANK(Sfx_NoSignal), Sfx_NoSignal
+	dbw BANK(Sfx_Sandstorm), Sfx_Sandstorm
+	dbw BANK(Sfx_Elevator), Sfx_Elevator
+	dbw BANK(Sfx_Protect), Sfx_Protect
+	dbw BANK(Sfx_Sketch), Sfx_Sketch
+	dbw BANK(Sfx_RainDance), Sfx_RainDance
+	dbw BANK(Sfx_Aeroblast), Sfx_Aeroblast
+	dbw BANK(Sfx_Spark), Sfx_Spark
+	dbw BANK(Sfx_Curse), Sfx_Curse
+	dbw BANK(Sfx_Rage), Sfx_Rage
+	dbw BANK(Sfx_Thief), Sfx_Thief
+	dbw BANK(Sfx_Thief2), Sfx_Thief2
+	dbw BANK(Sfx_SpiderWeb), Sfx_SpiderWeb
+	dbw BANK(Sfx_MindReader), Sfx_MindReader
+	dbw BANK(Sfx_Nightmare), Sfx_Nightmare
+	dbw BANK(Sfx_Snore), Sfx_Snore
+	dbw BANK(Sfx_SweetKiss), Sfx_SweetKiss
+	dbw BANK(Sfx_SweetKiss2), Sfx_SweetKiss2
+	dbw BANK(Sfx_BellyDrum), Sfx_BellyDrum
+	dbw BANK(Sfx_Unknown7F), Sfx_Unknown7F
+	dbw BANK(Sfx_SludgeBomb), Sfx_SludgeBomb
+	dbw BANK(Sfx_Foresight), Sfx_Foresight
+	dbw BANK(Sfx_Spite), Sfx_Spite
+	dbw BANK(Sfx_Outrage), Sfx_Outrage
+	dbw BANK(Sfx_PerishSong), Sfx_PerishSong
+	dbw BANK(Sfx_GigaDrain), Sfx_GigaDrain
+	dbw BANK(Sfx_Attract), Sfx_Attract
+	dbw BANK(Sfx_Kinesis2), Sfx_Kinesis2
+	dbw BANK(Sfx_ZapCannon), Sfx_ZapCannon
+	dbw BANK(Sfx_MeanLook), Sfx_MeanLook
+	dbw BANK(Sfx_HealBell), Sfx_HealBell
+	dbw BANK(Sfx_Return), Sfx_Return
+	dbw BANK(Sfx_ExpBar), Sfx_ExpBar
+	dbw BANK(Sfx_MilkDrink), Sfx_MilkDrink
+	dbw BANK(Sfx_Present), Sfx_Present
+	dbw BANK(Sfx_MorningSun), Sfx_MorningSun
+	dbw BANK(Sfx_LevelUp), Sfx_LevelUp
+	dbw BANK(Sfx_KeyItem), Sfx_KeyItem
+	dbw BANK(Sfx_Fanfare2), Sfx_Fanfare2
+	dbw BANK(Sfx_RegisterPhoneNumber), Sfx_RegisterPhoneNumber
+	dbw BANK(Sfx_3RdPlace), Sfx_3RdPlace
+	dbw BANK(Sfx_GetEggFromDaycareMan), Sfx_GetEggFromDaycareMan
+	dbw BANK(Sfx_GetEggFromDaycareLady), Sfx_GetEggFromDaycareLady
+	dbw BANK(Sfx_MoveDeleted), Sfx_MoveDeleted
+	dbw BANK(Sfx_2ndPlace), Sfx_2ndPlace
+	dbw BANK(Sfx_1stPlace), Sfx_1stPlace
+	dbw BANK(Sfx_ChooseACard), Sfx_ChooseACard
+	dbw BANK(Sfx_GetTm), Sfx_GetTm
+	dbw BANK(Sfx_GetBadge), Sfx_GetBadge
+	dbw BANK(Sfx_QuitSlots), Sfx_QuitSlots
+	dbw BANK(Sfx_EggCrack), Sfx_EggCrack
+	dbw BANK(Sfx_DexFanfareLessThan20), Sfx_DexFanfareLessThan20
+	dbw BANK(Sfx_DexFanfare140169), Sfx_DexFanfare140169
+	dbw BANK(Sfx_DexFanfare170199), Sfx_DexFanfare170199
+	dbw BANK(Sfx_DexFanfare200229), Sfx_DexFanfare200229
+	dbw BANK(Sfx_DexFanfare230Plus), Sfx_DexFanfare230Plus
+	dbw BANK(Sfx_Evolved), Sfx_Evolved
+	dbw BANK(Sfx_MasterBall), Sfx_MasterBall
+	dbw BANK(Sfx_EggHatch), Sfx_EggHatch
+	dbw BANK(Sfx_GsIntroCharizardFireball), Sfx_GsIntroCharizardFireball
+	dbw BANK(Sfx_GsIntroPokemonAppears), Sfx_GsIntroPokemonAppears
+	dbw BANK(Sfx_Flash), Sfx_Flash
+	dbw BANK(Sfx_GameFreakLogoGs), Sfx_GameFreakLogoGs
+	dbw BANK(Sfx_NotVeryEffective), Sfx_NotVeryEffective
+	dbw BANK(Sfx_Damage), Sfx_Damage
+	dbw BANK(Sfx_SuperEffective), Sfx_SuperEffective
+	dbw BANK(Sfx_BallBounce), Sfx_BallBounce
+	dbw BANK(Sfx_Moonlight), Sfx_Moonlight
+	dbw BANK(Sfx_Encore), Sfx_Encore
+	dbw BANK(Sfx_BeatUp), Sfx_BeatUp
+	dbw BANK(Sfx_BatonPass), Sfx_BatonPass
+	dbw BANK(Sfx_BallWiggle), Sfx_BallWiggle
+	dbw BANK(Sfx_SweetScent), Sfx_SweetScent
+	dbw BANK(Sfx_SweetScent2), Sfx_SweetScent2
+	dbw BANK(Sfx_HitEndOfExpBar), Sfx_HitEndOfExpBar
+	dbw BANK(Sfx_GiveTrademon), Sfx_GiveTrademon
+	dbw BANK(Sfx_GetTrademon), Sfx_GetTrademon
+	dbw BANK(Sfx_TrainArrived), Sfx_TrainArrived
+	dbw BANK(Sfx_StopSlot), Sfx_StopSlot
+	dbw BANK(Sfx_2Boops), Sfx_2Boops
+	dbw BANK(Sfx_GlassTing), Sfx_GlassTing
+	dbw BANK(Sfx_GlassTing2), Sfx_GlassTing2
+
 ; Crystal adds the following SFX:
-	
-	dbw $5e, $582d ; Intro Unown 1
-	dbw $5e, $583e ; Intro Unown 2
-	dbw $5e, $584f ; Intro Unown 3
-	dbw $5e, $586e ; Ditto Pop Up
-	dbw $5e, $5888 ; Ditto Transform
-	dbw $5e, $58a0 ; Intro Suicune 1
-	dbw $5e, $58aa ; Intro Pichu
-	dbw $5e, $58c0 ; Intro Suicune 2
-	dbw $5e, $58f4 ; Intro Suicune 3
-	dbw $5e, $5907 ; Ditto Bounce
-	dbw $5e, $591d ; Intro Suicune 4
-	dbw $5e, $5942 ; Game Freak Presents
-	dbw $5e, $5961 ; Tingle
-	dbw $3c, $5cd0 ; Unknown Cb
-	dbw $5e, $597c ; Two Pc Beeps
-	dbw $5e, $5992 ; 4 Note Ditty
-	dbw $5e, $59cb ; Twinkle
+
+	dbw BANK(Sfx_IntroUnown1), Sfx_IntroUnown1
+	dbw BANK(Sfx_IntroUnown2), Sfx_IntroUnown2
+	dbw BANK(Sfx_IntroUnown3), Sfx_IntroUnown3
+	dbw BANK(Sfx_DittoPopUp), Sfx_DittoPopUp
+	dbw BANK(Sfx_DittoTransform), Sfx_DittoTransform
+	dbw BANK(Sfx_IntroSuicune1), Sfx_IntroSuicune1
+	dbw BANK(Sfx_IntroPichu), Sfx_IntroPichu
+	dbw BANK(Sfx_IntroSuicune2), Sfx_IntroSuicune2
+	dbw BANK(Sfx_IntroSuicune3), Sfx_IntroSuicune3
+	dbw BANK(Sfx_DittoBounce), Sfx_DittoBounce
+	dbw BANK(Sfx_IntroSuicune4), Sfx_IntroSuicune4
+	dbw BANK(Sfx_GameFreakPresents), Sfx_GameFreakPresents
+	dbw BANK(Sfx_Tingle), Sfx_Tingle
+	dbw BANK(Sfx_UnknownCB), Sfx_UnknownCB
+	dbw BANK(Sfx_TwoPcBeeps), Sfx_TwoPcBeeps
+	dbw BANK(Sfx_4NoteDitty), Sfx_4NoteDitty
+	dbw BANK(Sfx_Twinkle), Sfx_Twinkle
 ; e94e9
 
diff --git a/extras b/extras
-Subproject 70cd4f7c00b33a398ed7af071773c06ca335c10
+Subproject c9f9d7f280e177855e8120f50f770630b881ca7
diff --git a/preprocessor.py b/preprocessor.py
index ed79259d2..436ab2b1b 100644
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -23,6 +23,8 @@ from extras.pokemontools.crystal import (
 
 from extras.pokemontools.audio import (
     Note,
+    Noise,
+    SoundCommand,
 )
 
 from extras.pokemontools.battle_animations import (
@@ -45,6 +47,8 @@ def load_pokecrystal_macros():
         ChannelCommand,
         OctaveCommand,
         Note,
+        Noise,
+        SoundCommand,
     ]
 
     ourmacros += command_classes
author	Bryan Bishop <kanzure@gmail.com>	2014-02-06 20:25:54 -0600
committer	Bryan Bishop <kanzure@gmail.com>	2014-02-06 20:25:54 -0600
commit	2d160dcece31b0cc0b6103a3d658a1dd0f7f0177 (patch)
tree	362442c995c4bb4065fa3569a6aee6da3e010df8
parent	709f495cdffbb7f70367d11804fc0053b79f74aa (diff)
parent	cb40ed08ddfc0930a96c56b205acb649c673b7bc (diff)