ref: 159d3efc8f369fcb284ef63a69ec502fb199597a
parent: 02d05255fe96e9c06d176c0960395fb5aeb36211
author: PikalaxALT <PikalaxALT@gmail.com>
date: Mon Dec 7 06:28:58 EST 2015
new and updated music macros
--- a/audio/cries.asm
+++ b/audio/cries.asm
@@ -1,184 +1,184 @@
Cry_26: ; f2d81
- dbw $84, Cry_26_Ch5
- dbw $05, Cry_26_Ch6
- dbw $07, Cry_26_Ch8
+ musicheader 3, 5, Cry_26_Ch5
+ musicheader 1, 6, Cry_26_Ch6
+ musicheader 1, 8, Cry_26_Ch8
; f2d8a
Cry_28: ; f2d8a
- dbw $44, Cry_28_Ch5
- dbw $05, Cry_28_Ch6
+ musicheader 2, 5, Cry_28_Ch5
+ musicheader 1, 6, Cry_28_Ch6
; f2d90
Cry_2C: ; f2d90
- dbw $44, Cry_2C_Ch5
- dbw $05, Cry_2C_Ch6
+ musicheader 2, 5, Cry_2C_Ch5
+ musicheader 1, 6, Cry_2C_Ch6
; f2d96
Cry_27: ; f2d96
- dbw $84, Cry_27_Ch5
- dbw $05, Cry_27_Ch6
- dbw $07, Cry_27_Ch8
+ musicheader 3, 5, Cry_27_Ch5
+ musicheader 1, 6, Cry_27_Ch6
+ musicheader 1, 8, Cry_27_Ch8
; f2d9f
Cry_2A: ; f2d9f
- dbw $84, Cry_2A_Ch5
- dbw $05, Cry_2A_Ch6
- dbw $07, Cry_2A_Ch8
+ musicheader 3, 5, Cry_2A_Ch5
+ musicheader 1, 6, Cry_2A_Ch6
+ musicheader 1, 8, Cry_2A_Ch8
; f2da8
Cry_2D: ; f2da8
- dbw $84, Cry_2D_Ch5
- dbw $05, Cry_2D_Ch6
- dbw $07, Cry_2D_Ch8
+ musicheader 3, 5, Cry_2D_Ch5
+ musicheader 1, 6, Cry_2D_Ch6
+ musicheader 1, 8, Cry_2D_Ch8
; f2db1
Cry_2E: ; f2db1
- dbw $44, Cry_2E_Ch5
- dbw $05, Cry_2E_Ch6
+ musicheader 2, 5, Cry_2E_Ch5
+ musicheader 1, 6, Cry_2E_Ch6
; f2db7
Cry_2F: ; f2db7
- dbw $84, Cry_2F_Ch5
- dbw $05, Cry_2F_Ch6
- dbw $07, Cry_2F_Ch8
+ musicheader 3, 5, Cry_2F_Ch5
+ musicheader 1, 6, Cry_2F_Ch6
+ musicheader 1, 8, Cry_2F_Ch8
; f2dc0
Cry_2B: ; f2dc0
- dbw $44, Cry_2B_Ch5
- dbw $05, Cry_2B_Ch6
+ musicheader 2, 5, Cry_2B_Ch5
+ musicheader 1, 6, Cry_2B_Ch6
; f2dc6
Cry_30: ; f2dc6
- dbw $84, Cry_30_Ch5
- dbw $05, Cry_30_Ch6
- dbw $07, Cry_30_Ch8
+ musicheader 3, 5, Cry_30_Ch5
+ musicheader 1, 6, Cry_30_Ch6
+ musicheader 1, 8, Cry_30_Ch8
; f2dcf
Cry_31: ; f2dcf
- dbw $84, Cry_31_Ch5
- dbw $05, Cry_31_Ch6
- dbw $07, Cry_31_Ch8
+ musicheader 3, 5, Cry_31_Ch5
+ musicheader 1, 6, Cry_31_Ch6
+ musicheader 1, 8, Cry_31_Ch8
; f2dd8
Cry_33: ; f2dd8
- dbw $44, Cry_33_Ch5
- dbw $07, Cry_33_Ch8
+ musicheader 2, 5, Cry_33_Ch5
+ musicheader 1, 8, Cry_33_Ch8
; f2dde
Cry_29: ; f2dde
- dbw $84, Cry_29_Ch5
- dbw $05, Cry_29_Ch6
- dbw $07, Cry_29_Ch8
+ musicheader 3, 5, Cry_29_Ch5
+ musicheader 1, 6, Cry_29_Ch6
+ musicheader 1, 8, Cry_29_Ch8
; f2de7
Cry_35: ; f2de7
- dbw $44, Cry_35_Ch5
- dbw $07, Cry_35_Ch8
+ musicheader 2, 5, Cry_35_Ch5
+ musicheader 1, 8, Cry_35_Ch8
; f2ded
Cry_36: ; f2ded
- dbw $84, Cry_36_Ch5
- dbw $05, Cry_36_Ch6
- dbw $07, Cry_36_Ch8
+ musicheader 3, 5, Cry_36_Ch5
+ musicheader 1, 6, Cry_36_Ch6
+ musicheader 1, 8, Cry_36_Ch8
; f2df6
Cry_38: ; f2df6
- dbw $84, Cry_38_Ch5
- dbw $05, Cry_38_Ch6
- dbw $07, Cry_38_Ch8
+ musicheader 3, 5, Cry_38_Ch5
+ musicheader 1, 6, Cry_38_Ch6
+ musicheader 1, 8, Cry_38_Ch8
; f2dff
Cry_43: ; f2dff
- dbw $84, Cry_43_Ch5
- dbw $05, Cry_43_Ch6
- dbw $07, Cry_43_Ch8
+ musicheader 3, 5, Cry_43_Ch5
+ musicheader 1, 6, Cry_43_Ch6
+ musicheader 1, 8, Cry_43_Ch8
; f2e08
Cry_3A: ; f2e08
- dbw $84, Cry_3A_Ch5
- dbw $05, Cry_3A_Ch6
- dbw $07, Cry_3A_Ch8
+ musicheader 3, 5, Cry_3A_Ch5
+ musicheader 1, 6, Cry_3A_Ch6
+ musicheader 1, 8, Cry_3A_Ch8
; f2e11
Cry_3B: ; f2e11
- dbw $84, Cry_3B_Ch5
- dbw $05, Cry_3B_Ch6
- dbw $07, Cry_3B_Ch8
+ musicheader 3, 5, Cry_3B_Ch5
+ musicheader 1, 6, Cry_3B_Ch6
+ musicheader 1, 8, Cry_3B_Ch8
; f2e1a
Cry_3C: ; f2e1a
- dbw $84, Cry_3C_Ch5
- dbw $05, Cry_3C_Ch6
- dbw $07, Cry_3C_Ch8
+ musicheader 3, 5, Cry_3C_Ch5
+ musicheader 1, 6, Cry_3C_Ch6
+ musicheader 1, 8, Cry_3C_Ch8
; f2e23
Cry_3D: ; f2e23
- dbw $84, Cry_3D_Ch5
- dbw $05, Cry_3D_Ch6
- dbw $07, Cry_3D_Ch8
+ musicheader 3, 5, Cry_3D_Ch5
+ musicheader 1, 6, Cry_3D_Ch6
+ musicheader 1, 8, Cry_3D_Ch8
; f2e2c
Cry_3E: ; f2e2c
- dbw $84, Cry_3E_Ch5
- dbw $05, Cry_3E_Ch6
- dbw $07, Cry_3E_Ch8
+ musicheader 3, 5, Cry_3E_Ch5
+ musicheader 1, 6, Cry_3E_Ch6
+ musicheader 1, 8, Cry_3E_Ch8
; f2e35
Cry_32: ; f2e35
- dbw $84, Cry_32_Ch5
- dbw $05, Cry_32_Ch6
- dbw $07, Cry_32_Ch8
+ musicheader 3, 5, Cry_32_Ch5
+ musicheader 1, 6, Cry_32_Ch6
+ musicheader 1, 8, Cry_32_Ch8
; f2e3e
Cry_34: ; f2e3e
- dbw $84, Cry_34_Ch5
- dbw $05, Cry_34_Ch6
- dbw $07, Cry_34_Ch8
+ musicheader 3, 5, Cry_34_Ch5
+ musicheader 1, 6, Cry_34_Ch6
+ musicheader 1, 8, Cry_34_Ch8
; f2e47
Cry_40: ; f2e47
- dbw $84, Cry_40_Ch5
- dbw $05, Cry_40_Ch6
- dbw $07, Cry_40_Ch8
+ musicheader 3, 5, Cry_40_Ch5
+ musicheader 1, 6, Cry_40_Ch6
+ musicheader 1, 8, Cry_40_Ch8
; f2e50
Cry_41: ; f2e50
- dbw $84, Cry_41_Ch5
- dbw $05, Cry_41_Ch6
- dbw $07, Cry_41_Ch8
+ musicheader 3, 5, Cry_41_Ch5
+ musicheader 1, 6, Cry_41_Ch6
+ musicheader 1, 8, Cry_41_Ch8
; f2e59
Cry_42: ; f2e59
- dbw $84, Cry_42_Ch5
- dbw $05, Cry_42_Ch6
- dbw $07, Cry_42_Ch8
+ musicheader 3, 5, Cry_42_Ch5
+ musicheader 1, 6, Cry_42_Ch6
+ musicheader 1, 8, Cry_42_Ch8
; f2e62
Cry_3F: ; f2e62
- dbw $84, Cry_3F_Ch5
- dbw $05, Cry_3F_Ch6
- dbw $07, Cry_3F_Ch8
+ musicheader 3, 5, Cry_3F_Ch5
+ musicheader 1, 6, Cry_3F_Ch6
+ musicheader 1, 8, Cry_3F_Ch8
; f2e6b
Cry_37: ; f2e6b
- dbw $84, Cry_37_Ch5
- dbw $05, Cry_37_Ch6
- dbw $07, Cry_37_Ch8
+ musicheader 3, 5, Cry_37_Ch5
+ musicheader 1, 6, Cry_37_Ch6
+ musicheader 1, 8, Cry_37_Ch8
; f2e74
Cry_39: ; f2e74
- dbw $84, Cry_39_Ch5
- dbw $05, Cry_39_Ch6
- dbw $07, Cry_39_Ch8
+ musicheader 3, 5, Cry_39_Ch5
+ musicheader 1, 6, Cry_39_Ch6
+ musicheader 1, 8, 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
+ sound __, 2, $f8, $05f8
+ sound __, 9, $9f, $04d8
+ sound __, 7, $f8, $05c4
+ sound C_, 5, $f2, $0574
soundinput $88
endchannel
; f2e94
@@ -185,65 +185,65 @@
Cry_37_Ch6: ; f2e94
unknownmusic0xde $33
- sound $1, $c8, $0640
- sound $6, $ff, $0668
- sound $7, $a8, $0534
- sound $14, $a2, $04a4
+ sound __, 2, $c8, $0640
+ sound __, 7, $ff, $0668
+ sound __, 8, $a8, $0534
+ sound C_, 5, $a2, $04a4
endchannel
; f2ea7
Cry_37_Ch8: ; f2ea7
- noise $a, $d6, $6a
- noise $6, $bc, $6c
- noise $6, $e2, $5c
- noise $20, $b4, $6c
+ noise __, 11, $d6, $6a
+ noise __, 7, $bc, $6c
+ noise __, 7, $e2, $5c
+ noise C#, 1, $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
+ sound __, 5, $af, $0720
+ sound __, 3, $f8, $071c
+ sound __, 3, $f8, $0718
+ sound __, 3, $f8, $0708
+ sound __, 3, $f8, $070e
+ sound __, 13, $c8, $0712
+ sound __, 5, $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
+ sound __, 2, $b8, $0710
+ sound __, 4, $d8, $072c
+ sound __, 5, $d8, $0665
+ sound __, 2, $b8, $0656
+ sound __, 2, $d8, $065c
+ sound __, 13, $f8, $0760
+ sound __, 5, $c1, $0750
endchannel
; f2ef2
Cry_3F_Ch8: ; f2ef2
- noise $2, $e8, $3b
+ noise __, 3, $e8, $3b
Cry_3F_branch_f2ef5: ; f2ef5
- noise $1, $f1, $4e
+ noise __, 2, $f1, $4e
loopchannel 5, Cry_3F_branch_f2ef5
- noise $2, $d8, $3f
- noise $14, $c2, $5f
+ noise __, 3, $d8, $3f
+ noise C_, 5, $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
+ sound __, 2, $f8, $05b0
+ sound __, 2, $f8, $04b4
+ sound __, 2, $f8, $05b8
+ sound __, 4, $f8, $05c0
+ sound __, 9, $c8, $0490
+ sound __, 9, $c8, $0480
soundinput $fe
- sound $10, $c3, $0490
+ sound C_, 1, $c3, $0490
soundinput $88
endchannel
; f2f26
@@ -250,49 +250,49 @@
Cry_42_Ch6: ; f2f26
unknownmusic0xde $22
- sound $8, $b8, $04c8
- sound $20, $b5, $0410
+ sound __, 9, $b8, $04c8
+ sound C#, 1, $b5, $0410
endchannel
; f2f31
Cry_42_Ch8: ; f2f31
- noise $3, $ff, $4b
- noise $3, $ef, $4c
- noise $20, $b5, $5f
+ noise __, 4, $ff, $4b
+ noise __, 4, $ef, $4c
+ noise C#, 1, $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
+ sound __, 3, $f1, $0550
+ sound __, 3, $f1, $0530
+ sound __, 3, $f1, $0510
+ sound __, 3, $f2, $0650
+ sound __, 3, $f2, $0640
+ sound __, 3, $f2, $0630
+ sound C_, 1, $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
+ sound __, 5, $e1, $0620
+ sound __, 6, $e2, $0500
+ sound __, 7, $e1, $0620
+ sound __, 3, $e1, $0520
+ sound C_, 1, $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
+ noise __, 3, $8a, $5d
+ noise __, 3, $9a, $4c
+ noise __, 6, $9a, $5d
+ noise __, 3, $9a, $4d
+ noise __, 3, $9a, $4b
+ noise __, 3, $9a, $4d
+ noise __, 3, $9a, $5f
+ noise C_, 1, $b2, $6f
endchannel
; f2f8a
@@ -299,14 +299,14 @@
Cry_40_Ch5: ; f2f8a
dutycycle $0
soundinput $f7
- sound $2, $f8, $078d
- sound $2, $f8, $0791
+ sound __, 3, $f8, $078d
+ sound __, 3, $f8, $0791
soundinput $ff
- sound $2, $f8, $07ad
+ sound __, 3, $f8, $07ad
soundinput $88
- sound $2, $f8, $07b4
+ sound __, 3, $f8, $07b4
soundinput $f7
- sound $2, $f8, $07b8
+ sound __, 3, $f8, $07b8
soundinput $88
endchannel
; f2fab
@@ -313,53 +313,53 @@
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
+ sound __, 3, $c8, $076d
+ sound __, 3, $c8, $0771
+ sound __, 3, $c8, $078d
+ sound __, 3, $c8, $0794
+ sound __, 3, $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
+ noise __, 3, $b8, $1
+ noise __, 3, $b8, $19
+ noise __, 3, $c8, $18
+ noise __, 3, $b8, $10
+ noise __, 9, $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
+ sound __, 3, $88, $06d8
+ sound __, 9, $e2, $06e0
+ sound __, 3, $61, $06e5
+ sound __, 3, $e8, $06c0
+ sound __, 3, $e8, $06b8
+ sound __, 3, $d8, $06b0
+ sound __, 9, $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
+ sound __, 3, $68, $06b1
+ sound __, 6, $c1, $06b9
+ sound __, 6, $99, $0760
+ sound __, 3, $b8, $068c
+ sound __, 3, $a8, $0684
+ sound __, 11, $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
+ noise __, 2, $99, $6c
+ noise __, 2, $92, $5c
+ noise __, 11, $62, $4c
+ noise __, 3, $68, $6a
+ noise __, 3, $68, $6b
+ noise __, 11, $62, $6c
endchannel
; f301f
@@ -368,10 +368,10 @@
Cry_28_Ch6: ; f3022
Cry_2C_branch_f3022: ; f3022
unknownmusic0xde $52
- sound $4, $f1, $0796
- sound $4, $f1, $072d
- sound $7, $0, 0
- sound $10, $f1, $07a7
+ sound __, 5, $f1, $0796
+ sound __, 5, $f1, $072d
+ sound __, 8, $0, 0
+ sound C_, 1, $f1, $07a7
endchannel
; f3035
@@ -381,84 +381,84 @@
Cry_2C_branch_f3038: ; f3038
callchannel Cry_2C_branch_f3022
loopchannel 2, Cry_2C_branch_f3038
- sound $e, $0, 0
- sound $8, $f2, $07c2
+ sound __, 15, $0, 0
+ sound __, 9, $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
+ sound __, 4, $2c, $07c4
+ sound __, 2, $0, $0001
+ sound __, 6, $59, $07b9
+ sound __, 7, $b4, $07bb
endchannel
; f305b
Cry_27_Ch6: ; f305b
unknownmusic0xde $2a
- sound $3, $2c, $07c7
- sound $1, $0, 0
- sound $5, $59, $07be
- sound $6, $b4, $07bd
+ sound __, 4, $2c, $07c7
+ sound __, 2, $0, 0
+ sound __, 6, $59, $07be
+ sound __, 7, $b4, $07bd
endchannel
; f306e
Cry_27_Ch8: ; f306e
- noise $3, $92, $10
- noise $1, $39, $0
- noise $5, $69, $10
- noise $6, $93, $0
+ noise __, 4, $92, $10
+ noise __, 2, $39, $0
+ noise __, 6, $69, $10
+ noise __, 7, $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
+ sound __, 3, $f1, $04b0
+ sound __, 3, $f7, $0590
+ sound __, 9, $f8, $0510
+ sound __, 4, $f2, $06c0
+ sound __, 4, $f8, $06ba
+ sound __, 4, $f2, $06b0
+ sound C_, 1, $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
+ sound __, 3, $f1, $0720
+ sound __, 3, $e1, $0650
+ sound __, 5, $f1, $0750
+ sound __, 5, $d1, $03a0
+ sound __, 4, $f1, $0670
+ sound __, 4, $e1, $0680
+ sound __, 4, $f2, $0690
+ sound C_, 1, $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
+ noise __, 3, $89, $2e
+ noise __, 3, $99, $1f
+ noise __, 5, $89, $4e
+ noise __, 5, $89, $7b
+ noise __, 4, $d8, $4b
+ noise __, 4, $e7, $4c
+ noise __, 4, $ec, $4d
+ noise C_, 1, $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
+ sound __, 5, $78, $0650
+ sound __, 5, $f8, $0660
+ sound __, 5, $f8, $065c
+ sound __, 2, $f8, $067c
+ sound __, 5, $f8, $0680
+ sound __, 5, $f8, $067c
+ sound __, 5, $f8, $0678
+ sound __, 5, $f1, $0674
endchannel
; f30f9
@@ -465,21 +465,21 @@
Cry_2D_Ch6: ; f30f9
unknownmusic0xde $22
Cry_2D_branch_f30fb: ; f30fb
- sound $2, $a1, $0600
+ sound __, 3, $a1, $0600
loopchannel 3, Cry_2D_branch_f30fb
Cry_2D_branch_f3103: ; f3103
- sound $2, $a1, $0630
+ sound __, 3, $a1, $0630
loopchannel 4, Cry_2D_branch_f3103
- sound $4, $a2, $0634
- sound $4, $91, $0638
+ sound __, 5, $a2, $0634
+ sound __, 5, $91, $0638
endchannel
; f3114
Cry_2D_Ch8: ; f3114
- noise $1, $68, $36
- noise $10, $88, $6a
- noise $1, $98, $5e
- noise $10, $a7, $6e
+ noise __, 2, $68, $36
+ noise C_, 1, $88, $6a
+ noise __, 2, $98, $5e
+ noise C_, 1, $a7, $6e
endchannel
; f3121
@@ -492,14 +492,14 @@
Cry_2E_Ch6: ; f3129
unknownmusic0xde $1b
Cry_2E_branch_f312b: ; f312b
- sound $8, $39, $072d
- sound $8, $f1, $0720
+ sound __, 9, $39, $072d
+ sound __, 9, $f1, $0720
endchannel
; f3134
Cry_2E_Ch8: ; f3134
- noise $8, $3b, $0
- noise $8, $92, $0
+ noise __, 9, $3b, $0
+ noise __, 9, $92, $0
endchannel
; f313b
@@ -513,10 +513,10 @@
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
+ sound __, 5, $3a, $073d
+ sound __, 7, $f8, $0762
+ sound __, 7, $f8, $0760
+ sound __, 7, $f1, $075e
endchannel
; f3156
@@ -524,14 +524,14 @@
tone $0020
Cry_30_Ch6: ; f3159
dutycycle $2
- sound $8, $2f, $0107
+ sound __, 9, $2f, $0107
Cry_30_branch_f315f: ; f315f
- sound $0, $e1, $0483
- sound $0, $51, $044e
+ sound __, 1, $e1, $0483
+ sound __, 1, $51, $044e
loopchannel 4, Cry_30_branch_f315f
Cry_30_branch_f316b: ; f316b
- sound $0, $e1, $03da
- sound $1, $51, $0312
+ sound __, 1, $e1, $03da
+ sound __, 2, $51, $0312
loopchannel 4, Cry_30_branch_f316b
endchannel
; f3178
@@ -538,8 +538,8 @@
Cry_30_Ch8: ; f3178
Cry_33_Ch8: ; f3178
- noise $8, $3f, $52
- noise $20, $93, $4f
+ noise __, 9, $3f, $52
+ noise C#, 1, $93, $4f
endchannel
; f317f
@@ -547,17 +547,17 @@
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
+ sound __, 3, $c8, $0641
+ sound __, 3, $48, $0641
+ sound __, 7, $f8, $0790
+ sound __, 5, $f8, $078e
+ sound __, 5, $f1, $078b
endchannel
; f3199
Cry_31_Ch8: ; f3199
- noise $4, $91, $10
- noise $8, $94, $3
+ noise __, 5, $91, $10
+ noise __, 9, $94, $3
endchannel
; f31a0
@@ -575,38 +575,38 @@
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
+ sound __, 5, $68, $0758
+ sound __, 3, $e8, $0760
+ sound __, 3, $e8, $0767
+ sound __, 3, $e8, $076c
+ sound __, 8, $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
+ noise __, 5, $29, $0
+ noise __, 3, $39, $1
+ noise __, 3, $49, $2
+ noise __, 3, $59, $1
+ noise __, 8, $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
+ sound __, 13, $f2, $07a6
+ sound __, 5, $f8, $07b0
+ sound __, 5, $e8, $03b0
+ sound __, 7, $f8, $03a0
+ sound __, 9, $e1, $0290
endchannel
; f31eb
Cry_35_Ch8: ; f31eb
- noise $c, $b2, $50
- noise $8, $a8, $60
- noise $6, $a8, $5b
- noise $8, $a1, $5c
+ noise __, 13, $b2, $50
+ noise __, 9, $a8, $60
+ noise __, 7, $a8, $5b
+ noise __, 9, $a1, $5c
endchannel
; f31f8
@@ -619,22 +619,22 @@
Cry_36_Ch6: ; f3200
unknownmusic0xde $1
Cry_36_branch_f3202: ; f3202
- sound $3, $f8, $0791
- sound $3, $d8, $078d
- sound $2, $0, 0
- sound $1, $78, $06c1
- sound $1, $f8, $0741
- sound $4, $e1, $0751
+ sound __, 4, $f8, $0791
+ sound __, 4, $d8, $078d
+ sound __, 3, $0, 0
+ sound __, 2, $78, $06c1
+ sound __, 2, $f8, $0741
+ sound __, 5, $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
+ noise __, 4, $59, $21
+ noise __, 4, $81, $0
+ noise __, 3, $20, $0
+ noise __, 2, $80, $21
+ noise __, 2, $80, $10
+ noise __, 5, $87, $0
endchannel
; f322e
@@ -641,12 +641,12 @@
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, 0
+ sound __, 3, $99, $0718
+ sound __, 5, $ab, $0722
+ sound __, 9, $ab, $0734
+ sound __, 5, $d6, $0716
+ sound __, 9, $d1, $0712
+ sound __, 9, $0, 0
endchannel
; f3249
@@ -653,30 +653,30 @@
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, 0
+ sound __, 3, $b9, $0738
+ sound __, 5, $cb, $0742
+ sound __, 9, $cb, $0754
+ sound __, 5, $f6, $0736
+ sound __, 9, $f1, $0732
+ sound __, 9, $0, 0
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
+ noise __, 3, $5b, $4
+ noise __, 5, $68, $13
+ noise __, 9, $68, $20
+ noise __, 5, $68, $13
+ noise C_, 1, $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
+ noise __, 3, $8b, $59
+ noise __, 5, $a8, $6a
+ noise __, 9, $a8, $70
+ noise __, 5, $a8, $69
+ noise C_, 1, $92, $6c
endchannel
; f3284
@@ -685,26 +685,26 @@
unknownmusic0xde $12
Cry_3A_branch_f3286: ; f3286
Cry_3C_branch_f3286: ; f3286
- sound $3, $c1, $0791
+ sound __, 4, $c1, $0791
loopchannel 3, Cry_3A_branch_f3286
Cry_3A_branch_f328e: ; f328e
Cry_3C_branch_f328e: ; f328e
- sound $3, $d1, $04b1
+ sound __, 4, $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
+ sound __, 2, $d1, $0491
+ sound __, 2, $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
+ sound __, 2, $a3, $0471
+ sound __, 2, $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
+ sound __, 2, $41, $0421
+ sound __, 2, $21, $0401
loopchannel 4, Cry_3A_branch_f32ae
endchannel
; f32bb
@@ -712,21 +712,21 @@
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
+ sound __, 9, $99, $0740
+ sound __, 9, $79, $0746
+ sound C_, 1, $f6, $078d
+ sound __, 9, $f8, $0791
+ sound __, 9, $f8, $078d
+ sound __, 9, $f8, $0787
+ sound C_, 9, $e2, $0783
endchannel
; f32da
Cry_3A_Ch8: ; f32da
- noise $10, $a6, $16
- noise $18, $98, $3d
- noise $20, $98, $5c
- noise $20, $75, $5f
+ noise C_, 1, $a6, $16
+ noise C_, 9, $98, $3d
+ noise C#, 1, $98, $5c
+ noise C#, 1, $75, $5f
endchannel
; f32e7
@@ -734,13 +734,13 @@
unknownmusic0xde $de
Cry_39_branch_f32e9: ; f32e9
Cry_3D_branch_f32e9: ; f32e9
- sound $4, $f8, $07b1
- sound $4, $f8, $07b0
- sound $4, $48, $07af
+ sound __, 5, $f8, $07b1
+ sound __, 5, $f8, $07b0
+ sound __, 5, $48, $07af
Cry_39_branch_f32f5: ; f32f5
- sound $4, $f8, $07b2
- sound $4, $f8, $07b3
- sound $4, $48, $07b4
+ sound __, 5, $f8, $07b2
+ sound __, 5, $f8, $07b3
+ sound __, 5, $48, $07b4
endchannel
; f3302
@@ -748,13 +748,13 @@
Cry_3B_Ch6: ; f3302
Cry_3D_Ch6: ; f3302
unknownmusic0xde $f2
- sound $4, $f8, $07b2
- sound $4, $f8, $07b1
- sound $4, $28, $07b0
+ sound __, 5, $f8, $07b2
+ sound __, 5, $f8, $07b1
+ sound __, 5, $28, $07b0
Cry_39_branch_f3310: ; f3310
- sound $4, $f8, $07b4
- sound $4, $f8, $07b6
- sound $4, $48, $07b8
+ sound __, 5, $f8, $07b4
+ sound __, 5, $f8, $07b6
+ sound __, 5, $48, $07b8
endchannel
; f331d
@@ -761,19 +761,19 @@
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
+ noise __, 5, $88, $5
+ noise __, 5, $88, $4
+ noise __, 5, $38, $3
Cry_39_branch_f3326: ; f3326
- noise $4, $88, $5
- noise $4, $88, $4
- noise $4, $87, $4
+ noise __, 5, $88, $5
+ noise __, 5, $88, $4
+ noise __, 5, $87, $4
endchannel
; f3330
Cry_3C_Ch8: ; f3330
- noise $8, $a6, $3a
- noise $8, $a1, $5a
+ noise __, 9, $a6, $3a
+ noise __, 9, $a1, $5a
endchannel
; f3337
@@ -804,61 +804,61 @@
Cry_3E_Ch5: ; f3353
unknownmusic0xde $de
Cry_3E_branch_f3355: ; f3355
- sound $1, $c1, $0520
- sound $1, $a1, $0420
+ sound __, 2, $c1, $0520
+ sound __, 2, $a1, $0420
loopchannel 4, Cry_3E_branch_f3355
dutycycle $0
- sound $4, $78, $0760
- sound $4, $78, $0730
- sound $18, $c2, $0420
+ sound __, 5, $78, $0760
+ sound __, 5, $78, $0730
+ sound C_, 9, $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
+ sound __, 9, $f8, $0700
+ sound __, 8, $f8, $0720
+ sound __, 5, $f8, $0790
+ sound __, 5, $f8, $0760
+ sound C_, 9, $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
+ noise __, 5, $88, $6d
+ noise __, 5, $d8, $68
+ noise __, 8, $c8, $69
+ noise __, 5, $98, $3a
+ noise __, 5, $98, $3c
+ noise C_, 9, $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
+ sound __, 9, $f8, $0330
+ sound __, 9, $f8, $0340
+ sound __, 9, $c8, $07b2
+ sound __, 9, $b8, $07b3
+ sound C#, 1, $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
+ sound __, 9, $e8, $0320
+ sound __, 9, $e8, $0328
+ sound __, 9, $98, $0780
+ sound __, 9, $88, $0782
+ sound C#, 1, $72, $0784
endchannel
; f33c8
Cry_32_Ch8: ; f33c8
- noise $2, $be, $49
- noise $5, $be, $3a
- noise $2, $be, $29
- noise $28, $d3, $6e
+ noise __, 3, $be, $49
+ noise __, 6, $be, $3a
+ noise __, 3, $be, $29
+ noise C#, 9, $d3, $6e
endchannel
; f33d5
@@ -865,15 +865,15 @@
Cry_34_Ch5: ; f33d5
unknownmusic0xde $39
soundinput $ff
- sound $2, $f8, $0720
- sound $2, $f8, $0727
- sound $2, $f8, $0780
+ sound __, 3, $f8, $0720
+ sound __, 3, $f8, $0727
+ sound __, 3, $f8, $0780
soundinput $88
- sound $2, $f8, $0779
- sound $4, $f8, $0740
- sound $4, $f8, $073c
+ sound __, 3, $f8, $0779
+ sound __, 5, $f8, $0740
+ sound __, 5, $f8, $073c
soundinput $ff
- sound $8, $f1, $0737
+ sound __, 9, $f1, $0737
soundinput $88
endchannel
; f33fc
@@ -880,32 +880,32 @@
Cry_34_Ch6: ; f33fc
unknownmusic0xde $22
- sound $6, $b2, $071e
- sound $5, $92, $0779
- sound $4, $82, $073e
- sound $8, $a1, $0735
+ sound __, 7, $b2, $071e
+ sound __, 6, $92, $0779
+ sound __, 5, $82, $073e
+ sound __, 9, $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
+ noise __, 3, $64, $7f
+ noise __, 3, $84, $7d
+ noise __, 3, $a4, $6f
+ noise __, 3, $64, $6c
+ noise __, 3, $94, $6f
+ noise __, 3, $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
+ sound __, 4, $f8, $06b0
+ sound __, 2, $f8, $06a5
+ sound __, 2, $f8, $069d
+ sound __, 8, $f1, $068a
+ sound __, 4, $f8, $0736
+ sound __, 4, $f8, $0720
+ sound C_, 5, $f2, $070e
endchannel
; f3441
@@ -912,660 +912,660 @@
Cry_41_Ch6: ; f3441
unknownmusic0xde $27
Cry_41_branch_f3443: ; f3443
- sound $1, $f1, $07b4
+ sound __, 2, $f1, $07b4
loopchannel 8, Cry_41_branch_f3443
Cry_41_branch_f344b: ; f344b
- sound $1, $c1, $0790
+ sound __, 2, $c1, $0790
loopchannel 3, Cry_41_branch_f344b
Cry_41_branch_f3453: ; f3453
- sound $1, $b1, $078d
+ sound __, 2, $b1, $078d
loopchannel 2, Cry_41_branch_f3453
- sound $10, $92, $0795
+ sound C_, 1, $92, $0795
endchannel
; f3460
Cry_41_Ch8: ; f3460
Cry_41_branch_f3460: ; f3460
- noise $0, $f1, $28
+ noise __, 1, $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
+ noise __, 1, $91, $49
+ noise __, 2, $a8, $4a
+ noise __, 1, $e1, $4b
+ noise __, 6, $d2, $4f
+ noise __, 4, $c2, $4e
+ noise __, 4, $b2, $4d
+ noise C_, 5, $a3, $4c
endchannel
; f347d
Cry_00: ; f347d
- dbw $84, Cry_00_Ch5
- dbw $05, Cry_00_Ch6
- dbw $07, Cry_00_Ch8
+ musicheader 3, 5, Cry_00_Ch5
+ musicheader 1, 6, Cry_00_Ch6
+ musicheader 1, 8, Cry_00_Ch8
; f3486
Cry_01: ; f3486
- dbw $84, Cry_01_Ch5
- dbw $05, Cry_01_Ch6
- dbw $07, Cry_01_Ch8
+ musicheader 3, 5, Cry_01_Ch5
+ musicheader 1, 6, Cry_01_Ch6
+ musicheader 1, 8, Cry_01_Ch8
; f348f
Cry_02: ; f348f
- dbw $84, Cry_02_Ch5
- dbw $05, Cry_02_Ch6
- dbw $07, Cry_02_Ch8
+ musicheader 3, 5, Cry_02_Ch5
+ musicheader 1, 6, Cry_02_Ch6
+ musicheader 1, 8, Cry_02_Ch8
; f3498
Cry_03: ; f3498
- dbw $84, Cry_03_Ch5
- dbw $05, Cry_03_Ch6
- dbw $07, Cry_03_Ch8
+ musicheader 3, 5, Cry_03_Ch5
+ musicheader 1, 6, Cry_03_Ch6
+ musicheader 1, 8, Cry_03_Ch8
; f34a1
Cry_04: ; f34a1
- dbw $84, Cry_04_Ch5
- dbw $05, Cry_04_Ch6
- dbw $07, Cry_04_Ch8
+ musicheader 3, 5, Cry_04_Ch5
+ musicheader 1, 6, Cry_04_Ch6
+ musicheader 1, 8, Cry_04_Ch8
; f34aa
Cry_05: ; f34aa
- dbw $84, Cry_05_Ch5
- dbw $05, Cry_05_Ch6
- dbw $07, Cry_05_Ch8
+ musicheader 3, 5, Cry_05_Ch5
+ musicheader 1, 6, Cry_05_Ch6
+ musicheader 1, 8, Cry_05_Ch8
; f34b3
Cry_06: ; f34b3
- dbw $84, Cry_06_Ch5
- dbw $05, Cry_06_Ch6
- dbw $07, Cry_06_Ch8
+ musicheader 3, 5, Cry_06_Ch5
+ musicheader 1, 6, Cry_06_Ch6
+ musicheader 1, 8, Cry_06_Ch8
; f34bc
Cry_07: ; f34bc
- dbw $84, Cry_07_Ch5
- dbw $05, Cry_07_Ch6
- dbw $07, Cry_07_Ch8
+ musicheader 3, 5, Cry_07_Ch5
+ musicheader 1, 6, Cry_07_Ch6
+ musicheader 1, 8, Cry_07_Ch8
; f34c5
Cry_08: ; f34c5
- dbw $84, Cry_08_Ch5
- dbw $05, Cry_08_Ch6
- dbw $07, Cry_08_Ch8
+ musicheader 3, 5, Cry_08_Ch5
+ musicheader 1, 6, Cry_08_Ch6
+ musicheader 1, 8, Cry_08_Ch8
; f34ce
Cry_09: ; f34ce
- dbw $84, Cry_09_Ch5
- dbw $05, Cry_09_Ch6
- dbw $07, Cry_09_Ch8
+ musicheader 3, 5, Cry_09_Ch5
+ musicheader 1, 6, Cry_09_Ch6
+ musicheader 1, 8, Cry_09_Ch8
; f34d7
Cry_0A: ; f34d7
- dbw $84, Cry_0A_Ch5
- dbw $05, Cry_0A_Ch6
- dbw $07, Cry_0A_Ch8
+ musicheader 3, 5, Cry_0A_Ch5
+ musicheader 1, 6, Cry_0A_Ch6
+ musicheader 1, 8, Cry_0A_Ch8
; f34e0
Cry_0B: ; f34e0
- dbw $84, Cry_0B_Ch5
- dbw $05, Cry_0B_Ch6
- dbw $07, Cry_0B_Ch8
+ musicheader 3, 5, Cry_0B_Ch5
+ musicheader 1, 6, Cry_0B_Ch6
+ musicheader 1, 8, Cry_0B_Ch8
; f34e9
Cry_0C: ; f34e9
- dbw $84, Cry_0C_Ch5
- dbw $05, Cry_0C_Ch6
- dbw $07, Cry_0C_Ch8
+ musicheader 3, 5, Cry_0C_Ch5
+ musicheader 1, 6, Cry_0C_Ch6
+ musicheader 1, 8, Cry_0C_Ch8
; f34f2
Cry_0D: ; f34f2
- dbw $84, Cry_0D_Ch5
- dbw $05, Cry_0D_Ch6
- dbw $07, Cry_0D_Ch8
+ musicheader 3, 5, Cry_0D_Ch5
+ musicheader 1, 6, Cry_0D_Ch6
+ musicheader 1, 8, Cry_0D_Ch8
; f34fb
Cry_0E: ; f34fb
- dbw $84, Cry_0E_Ch5
- dbw $05, Cry_0E_Ch6
- dbw $07, Cry_0E_Ch8
+ musicheader 3, 5, Cry_0E_Ch5
+ musicheader 1, 6, Cry_0E_Ch6
+ musicheader 1, 8, Cry_0E_Ch8
; f3504
Cry_0F: ; f3504
- dbw $84, Cry_0F_Ch5
- dbw $05, Cry_0F_Ch6
- dbw $07, Cry_0F_Ch8
+ musicheader 3, 5, Cry_0F_Ch5
+ musicheader 1, 6, Cry_0F_Ch6
+ musicheader 1, 8, Cry_0F_Ch8
; f350d
Cry_10: ; f350d
- dbw $84, Cry_10_Ch5
- dbw $05, Cry_10_Ch6
- dbw $07, Cry_10_Ch8
+ musicheader 3, 5, Cry_10_Ch5
+ musicheader 1, 6, Cry_10_Ch6
+ musicheader 1, 8, Cry_10_Ch8
; f3516
Cry_11: ; f3516
- dbw $84, Cry_11_Ch5
- dbw $05, Cry_11_Ch6
- dbw $07, Cry_11_Ch8
+ musicheader 3, 5, Cry_11_Ch5
+ musicheader 1, 6, Cry_11_Ch6
+ musicheader 1, 8, Cry_11_Ch8
; f351f
Cry_12: ; f351f
- dbw $84, Cry_12_Ch5
- dbw $05, Cry_12_Ch6
- dbw $07, Cry_12_Ch8
+ musicheader 3, 5, Cry_12_Ch5
+ musicheader 1, 6, Cry_12_Ch6
+ musicheader 1, 8, Cry_12_Ch8
; f3528
Cry_13: ; f3528
- dbw $84, Cry_13_Ch5
- dbw $05, Cry_13_Ch6
- dbw $07, Cry_13_Ch8
+ musicheader 3, 5, Cry_13_Ch5
+ musicheader 1, 6, Cry_13_Ch6
+ musicheader 1, 8, Cry_13_Ch8
; f3531
Cry_14: ; f3531
- dbw $84, Cry_14_Ch5
- dbw $05, Cry_14_Ch6
- dbw $07, Cry_14_Ch8
+ musicheader 3, 5, Cry_14_Ch5
+ musicheader 1, 6, Cry_14_Ch6
+ musicheader 1, 8, Cry_14_Ch8
; f353a
Cry_15: ; f353a
- dbw $84, Cry_15_Ch5
- dbw $05, Cry_15_Ch6
- dbw $07, Cry_15_Ch8
+ musicheader 3, 5, Cry_15_Ch5
+ musicheader 1, 6, Cry_15_Ch6
+ musicheader 1, 8, Cry_15_Ch8
; f3543
Cry_16: ; f3543
- dbw $84, Cry_16_Ch5
- dbw $05, Cry_16_Ch6
- dbw $07, Cry_16_Ch8
+ musicheader 3, 5, Cry_16_Ch5
+ musicheader 1, 6, Cry_16_Ch6
+ musicheader 1, 8, Cry_16_Ch8
; f354c
Cry_17: ; f354c
- dbw $84, Cry_17_Ch5
- dbw $05, Cry_17_Ch6
- dbw $07, Cry_17_Ch8
+ musicheader 3, 5, Cry_17_Ch5
+ musicheader 1, 6, Cry_17_Ch6
+ musicheader 1, 8, Cry_17_Ch8
; f3555
Cry_18: ; f3555
- dbw $84, Cry_18_Ch5
- dbw $05, Cry_18_Ch6
- dbw $07, Cry_18_Ch8
+ musicheader 3, 5, Cry_18_Ch5
+ musicheader 1, 6, Cry_18_Ch6
+ musicheader 1, 8, Cry_18_Ch8
; f355e
Cry_19: ; f355e
- dbw $84, Cry_19_Ch5
- dbw $05, Cry_19_Ch6
- dbw $07, Cry_19_Ch8
+ musicheader 3, 5, Cry_19_Ch5
+ musicheader 1, 6, Cry_19_Ch6
+ musicheader 1, 8, Cry_19_Ch8
; f3567
Cry_1A: ; f3567
- dbw $84, Cry_1A_Ch5
- dbw $05, Cry_1A_Ch6
- dbw $07, Cry_1A_Ch8
+ musicheader 3, 5, Cry_1A_Ch5
+ musicheader 1, 6, Cry_1A_Ch6
+ musicheader 1, 8, Cry_1A_Ch8
; f3570
Cry_1B: ; f3570
- dbw $84, Cry_1B_Ch5
- dbw $05, Cry_1B_Ch6
- dbw $07, Cry_1B_Ch8
+ musicheader 3, 5, Cry_1B_Ch5
+ musicheader 1, 6, Cry_1B_Ch6
+ musicheader 1, 8, Cry_1B_Ch8
; f3579
Cry_1C: ; f3579
- dbw $84, Cry_1C_Ch5
- dbw $05, Cry_1C_Ch6
- dbw $07, Cry_1C_Ch8
+ musicheader 3, 5, Cry_1C_Ch5
+ musicheader 1, 6, Cry_1C_Ch6
+ musicheader 1, 8, Cry_1C_Ch8
; f3582
Cry_1D: ; f3582
- dbw $84, Cry_1D_Ch5
- dbw $05, Cry_1D_Ch6
- dbw $07, Cry_1D_Ch8
+ musicheader 3, 5, Cry_1D_Ch5
+ musicheader 1, 6, Cry_1D_Ch6
+ musicheader 1, 8, Cry_1D_Ch8
; f358b
Cry_1E: ; f358b
- dbw $84, Cry_1E_Ch5
- dbw $05, Cry_1E_Ch6
- dbw $07, Cry_1E_Ch8
+ musicheader 3, 5, Cry_1E_Ch5
+ musicheader 1, 6, Cry_1E_Ch6
+ musicheader 1, 8, Cry_1E_Ch8
; f3594
Cry_1F: ; f3594
- dbw $84, Cry_1F_Ch5
- dbw $05, Cry_1F_Ch6
- dbw $07, Cry_1F_Ch8
+ musicheader 3, 5, Cry_1F_Ch5
+ musicheader 1, 6, Cry_1F_Ch6
+ musicheader 1, 8, Cry_1F_Ch8
; f359d
Cry_20: ; f359d
- dbw $84, Cry_20_Ch5
- dbw $05, Cry_20_Ch6
- dbw $07, Cry_20_Ch8
+ musicheader 3, 5, Cry_20_Ch5
+ musicheader 1, 6, Cry_20_Ch6
+ musicheader 1, 8, Cry_20_Ch8
; f35a6
Cry_21: ; f35a6
- dbw $84, Cry_21_Ch5
- dbw $05, Cry_21_Ch6
- dbw $07, Cry_21_Ch8
+ musicheader 3, 5, Cry_21_Ch5
+ musicheader 1, 6, Cry_21_Ch6
+ musicheader 1, 8, Cry_21_Ch8
; f35af
Cry_22: ; f35af
- dbw $84, Cry_22_Ch5
- dbw $05, Cry_22_Ch6
- dbw $07, Cry_22_Ch8
+ musicheader 3, 5, Cry_22_Ch5
+ musicheader 1, 6, Cry_22_Ch6
+ musicheader 1, 8, Cry_22_Ch8
; f35b8
Cry_23: ; f35b8
- dbw $84, Cry_23_Ch5
- dbw $05, Cry_23_Ch6
- dbw $07, Cry_23_Ch8
+ musicheader 3, 5, Cry_23_Ch5
+ musicheader 1, 6, Cry_23_Ch6
+ musicheader 1, 8, Cry_23_Ch8
; f35c1
Cry_24: ; f35c1
- dbw $84, Cry_24_Ch5
- dbw $05, Cry_24_Ch6
- dbw $07, Cry_24_Ch8
+ musicheader 3, 5, Cry_24_Ch5
+ musicheader 1, 6, Cry_24_Ch6
+ musicheader 1, 8, Cry_24_Ch8
; f35ca
Cry_25: ; f35ca
- dbw $84, Cry_25_Ch5
- dbw $05, Cry_25_Ch6
- dbw $07, Cry_25_Ch8
+ musicheader 3, 5, Cry_25_Ch5
+ musicheader 1, 6, Cry_25_Ch6
+ musicheader 1, 8, 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
+ sound __, 16, $e0, $0780
+ sound __, 16, $f0, $0784
+ sound __, 16, $c3, $05e0
+ sound __, 16, $c4, $0600
+ sound __, 11, $6c, $0780
+ sound __, 9, $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
+ sound __, 16, $a0, $0741
+ sound __, 16, $b0, $0743
+ sound __, 16, $93, $05b1
+ sound __, 16, $94, $05c1
+ sound __, 11, $4c, $0741
+ sound __, 9, $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
+ noise __, 3, $f2, $4c
+ noise __, 7, $e0, $3a
+ noise __, 16, $d0, $3a
+ noise __, 9, $d0, $2c
+ noise __, 7, $e6, $4c
+ noise __, 13, $7d, $4c
+ noise __, 16, $d3, $4c
endchannel
; f361f
Cry_09_Ch5: ; f361f
unknownmusic0xde $f0
- sound $f, $f7, $07a0
- sound $6, $e6, $07a3
- sound $a, $f4, $07a0
+ sound __, 16, $f7, $07a0
+ sound __, 7, $e6, $07a3
+ sound __, 11, $f4, $07a0
unknownmusic0xde $a5
- sound $a, $f6, $07d8
- sound $4, $e3, $07d7
- sound $f, $f2, $07d8
+ sound __, 11, $f6, $07d8
+ sound __, 5, $e3, $07d7
+ sound __, 16, $f2, $07d8
endchannel
; f363c
Cry_09_Ch6: ; f363c
unknownmusic0xde $5
- sound $2, $8, 0
- sound $f, $a7, $06a1
- sound $6, $86, $06a2
- sound $a, $74, $06a1
+ sound __, 3, $8, 0
+ sound __, 16, $a7, $06a1
+ sound __, 7, $86, $06a2
+ sound __, 11, $74, $06a1
unknownmusic0xde $5f
- sound $a, $76, $06d6
- sound $4, $83, $06d9
- sound $f, $a2, $06d7
+ sound __, 11, $76, $06d6
+ sound __, 5, $83, $06d9
+ sound __, 16, $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
+ noise __, 3, $f2, $3c
+ noise __, 9, $e4, $3e
+ noise __, 16, $d7, $3c
+ noise __, 7, $c5, $3b
+ noise __, 7, $e4, $3d
+ noise __, 9, $b6, $3c
+ noise __, 7, $d4, $3d
+ noise __, 9, $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
+ sound __, 16, $f7, $07c0
+ sound __, 7, $e4, $07c1
+ sound __, 11, $f6, $07c0
+ sound __, 5, $d3, $07c2
+ sound __, 9, $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
+ sound __, 16, $97, $0781
+ sound __, 7, $84, $0780
+ sound __, 11, $96, $0781
+ sound __, 16, $83, $0781
endchannel
; f36a0
Cry_23_Ch8: ; f36a0
- noise $3, $f2, $3c
- noise $d, $e6, $2c
- noise $f, $d7, $3c
- noise $8, $c1, $2c
+ noise __, 4, $f2, $3c
+ noise __, 14, $e6, $2c
+ noise __, 16, $d7, $3c
+ noise __, 9, $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
+ sound __, 16, $f7, $0680
+ sound __, 11, $e6, $0684
+ sound __, 16, $d7, $0690
+ sound __, 9, $d5, $0690
+ sound __, 7, $c4, $0688
+ sound __, 6, $d3, $0670
+ sound __, 5, $d3, $0660
+ sound __, 9, $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
+ sound __, 16, $b7, $0641
+ sound __, 11, $96, $0642
+ sound __, 16, $a7, $0651
+ sound __, 9, $a5, $0651
+ sound __, 7, $94, $0647
+ sound __, 6, $a3, $0631
+ sound __, 5, $93, $0622
+ sound __, 9, $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
+ noise __, 16, $e4, $3c
+ noise __, 11, $c7, $4c
+ noise __, 11, $c7, $3c
+ noise __, 13, $b7, $4c
+ noise __, 16, $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
+ sound __, 7, $f7, $07a0
+ sound __, 9, $e6, $07a4
+ sound __, 5, $d6, $07a0
+ sound __, 16, $d3, $0720
+ sound __, 9, $c3, $0723
+ sound __, 3, $c2, $0728
+ sound __, 9, $b1, $0730
endchannel
; f3722
Cry_11_Ch6: ; f3722
unknownmusic0xde $a
- sound $4, $8, 0
- 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
+ sound __, 5, $8, 0
+ sound __, 7, $a7, $0741
+ sound __, 9, $86, $0743
+ sound __, 5, $76, $0741
+ sound __, 14, $83, $06c2
+ sound __, 8, $73, $06c1
+ sound __, 4, $82, $06cc
+ sound __, 9, $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
+ noise __, 3, $f2, $4c
+ noise __, 7, $e6, $3a
+ noise __, 5, $d7, $3a
+ noise __, 7, $d6, $2c
+ noise __, 9, $e5, $3c
+ noise __, 13, $d2, $3d
+ noise __, 9, $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
+ sound __, 7, $f4, $0740
+ sound __, 16, $e3, $0730
+ sound __, 5, $f4, $0740
+ sound __, 6, $b3, $0748
+ sound __, 9, $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
+ sound __, 7, $c3, $0712
+ sound __, 16, $b3, $0704
+ sound __, 4, $c3, $0712
+ sound __, 5, $c3, $0721
+ sound __, 9, $b1, $0732
endchannel
; f3789
Cry_25_Ch8: ; f3789
- noise $8, $d6, $2c
- noise $c, $c6, $3c
- noise $a, $b6, $2c
- noise $8, $91, $1c
+ noise __, 9, $d6, $2c
+ noise __, 13, $c6, $3c
+ noise __, 11, $b6, $2c
+ noise __, 9, $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
+ sound __, 5, $f7, $0608
+ sound __, 7, $e6, $0600
+ sound __, 7, $d7, $05f0
+ sound __, 7, $c4, $05e0
+ sound __, 6, $d3, $05c0
+ sound __, 5, $d3, $05a0
+ sound __, 9, $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
+ sound __, 5, $c7, $0504
+ sound __, 7, $a6, $0502
+ sound __, 7, $97, $04f1
+ sound __, 5, $b4, $04e1
+ sound __, 6, $a3, $04c2
+ sound __, 5, $b3, $04a3
+ sound __, 9, $c1, $0482
endchannel
; f37d4
Cry_03_Ch8: ; f37d4
- noise $c, $e4, $4c
- noise $a, $c7, $5c
- noise $c, $b6, $4c
- noise $f, $a2, $5c
+ noise __, 13, $e4, $4c
+ noise __, 11, $c7, $5c
+ noise __, 13, $b6, $4c
+ noise __, 16, $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
+ sound __, 5, $f7, $07c0
+ sound __, 13, $e6, $07c2
+ sound __, 7, $b5, $0680
+ sound __, 5, $c4, $0670
+ sound __, 5, $b5, $0660
+ sound __, 9, $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
+ sound __, 4, $c7, $0781
+ sound __, 13, $b6, $0780
+ sound __, 7, $a5, $0641
+ sound __, 5, $c4, $0632
+ sound __, 7, $b5, $0621
+ sound __, 9, $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
+ noise __, 4, $e4, $3c
+ noise __, 13, $d6, $2c
+ noise __, 5, $e4, $3c
+ noise __, 9, $b7, $5c
+ noise __, 16, $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
+ sound __, 9, $f7, $0680
+ sound __, 3, $f7, $0660
+ sound __, 2, $e7, $0640
+ sound __, 2, $e7, $0620
+ sound __, 16, $d1, $0600
+ sound __, 5, $c7, $0740
+ sound __, 5, $a7, $0730
+ sound __, 16, $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
+ sound __, 11, $e7, $0682
+ sound __, 3, $e7, $0662
+ sound __, 2, $d7, $0642
+ sound __, 2, $d7, $0622
+ sound __, 16, $c1, $0602
+ sound __, 5, $b7, $0742
+ sound __, 3, $97, $0732
+ sound __, 16, $81, $0722
endchannel
; f386d
Cry_10_Ch8: ; f386d
- noise $4, $74, $21
- noise $4, $74, $10
- noise $4, $71, $20
+ noise __, 5, $74, $21
+ noise __, 5, $74, $10
+ noise __, 5, $71, $20
endchannel
; f3877
Cry_00_Ch5: ; f3877
unknownmusic0xde $f5
- sound $4, $f3, $0718
- sound $f, $e5, $0798
- sound $8, $91, $0758
+ sound __, 5, $f3, $0718
+ sound __, 16, $e5, $0798
+ sound __, 9, $91, $0758
endchannel
; f3886
Cry_00_Ch6: ; f3886
unknownmusic0xde $a0
- sound $5, $b3, $0708
- sound $f, $c5, $0788
- sound $8, $71, $0748
+ sound __, 6, $b3, $0708
+ sound __, 16, $c5, $0788
+ sound __, 9, $71, $0748
endchannel
; f3895
Cry_00_Ch8: ; f3895
- noise $3, $a1, $1c
- noise $e, $94, $2c
- noise $8, $81, $1c
+ noise __, 4, $a1, $1c
+ noise __, 15, $94, $2c
+ noise __, 9, $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
+ sound __, 5, $e1, $0700
+ sound __, 5, $f2, $0780
+ sound __, 3, $92, $0740
+ sound __, 9, $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
+ sound __, 5, $b1, $06e1
+ sound __, 4, $c2, $06e1
+ sound __, 4, $62, $0681
+ sound __, 9, $b1, $05e1
endchannel
; f38c5
Cry_0E_Ch8: ; f38c5
- noise $2, $61, $32
- noise $2, $61, $21
- noise $8, $61, $11
+ noise __, 3, $61, $32
+ noise __, 3, $61, $21
+ noise __, 9, $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
+ sound __, 7, $83, $0247
+ sound __, 16, $62, $0226
+ sound __, 5, $52, $0245
+ sound __, 10, $63, $0206
+ sound __, 16, $82, $0225
+ sound __, 16, $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
+ noise __, 9, $d4, $8c
+ noise __, 5, $e2, $9c
+ noise __, 16, $c6, $8c
+ noise __, 9, $e4, $ac
+ noise __, 16, $d7, $9c
+ noise __, 16, $f2, $ac
endchannel
; f38fd
Cry_07_Ch5: ; f38fd
unknownmusic0xde $f0
- sound $4, $f3, $06e0
- sound $f, $e4, $0640
- sound $8, $c1, $0620
+ sound __, 5, $f3, $06e0
+ sound __, 16, $e4, $0640
+ sound __, 9, $c1, $0620
endchannel
; f390c
Cry_07_Ch6: ; f390c
unknownmusic0xde $a
- sound $3, $c3, $0683
- sound $e, $b4, $0602
- sound $8, $a1, $0601
+ sound __, 4, $c3, $0683
+ sound __, 15, $b4, $0602
+ sound __, 9, $a1, $0601
endchannel
; f391b
Cry_07_Ch8: ; f391b
- noise $4, $d3, $5c
- noise $f, $e6, $4c
- noise $8, $b1, $5c
+ noise __, 5, $d3, $5c
+ noise __, 16, $e6, $4c
+ noise __, 9, $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
+ sound __, 7, $e2, $0500
+ sound __, 7, $e3, $0580
+ sound __, 7, $d3, $0570
+ sound __, 9, $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
+ sound __, 7, $e2, $0482
+ sound __, 7, $d3, $0501
+ sound __, 7, $b2, $04e2
+ sound __, 9, $81, $04c1
Cry_05_Ch8: ; f394a
endchannel
; f394b
@@ -1572,68 +1572,68 @@
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
+ sound __, 5, $f1, $0700
+ sound __, 5, $e1, $0780
+ sound __, 5, $d1, $0740
+ sound __, 5, $e1, $0740
+ sound __, 5, $f1, $0780
+ sound __, 5, $d1, $0700
+ sound __, 5, $f1, $0701
+ sound __, 5, $d1, $0782
+ sound __, 5, $c1, $0742
+ sound __, 9, $b1, $0741
endchannel
; f3976
Cry_0B_Ch6: ; f3976
unknownmusic0xde $44
- sound $c, $8, 0
- sound $4, $f1, $0701
- sound $4, $e1, $0782
- sound $4, $d1, $0741
- sound $4, $e1, $0741
- sound $4, $f1, $0782
- sound $8, $d1, $0701
+ sound __, 13, $8, 0
+ sound __, 5, $f1, $0701
+ sound __, 5, $e1, $0782
+ sound __, 5, $d1, $0741
+ sound __, 5, $e1, $0741
+ sound __, 5, $f1, $0782
+ sound __, 9, $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
+ noise __, 16, $8, $0
+ noise __, 5, $8, $0
+ noise __, 5, $d1, $4c
+ noise __, 5, $b1, $2c
+ noise __, 5, $d1, $3c
+ noise __, 5, $b1, $3c
+ noise __, 5, $c1, $2c
+ noise __, 9, $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
+ sound __, 9, $f5, $0600
+ sound __, 3, $d2, $0638
+ sound __, 3, $c2, $0630
+ sound __, 3, $c2, $0628
+ sound __, 3, $b2, $0620
+ sound __, 3, $b2, $0610
+ sound __, 3, $a2, $0618
+ sound __, 3, $b2, $0610
+ sound __, 9, $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
+ sound __, 13, $c3, $05c0
+ sound __, 4, $b1, $05f9
+ sound __, 3, $a1, $05f1
+ sound __, 3, $a1, $05e9
+ sound __, 3, $91, $05e1
+ sound __, 3, $91, $05d9
+ sound __, 3, $81, $05d1
+ sound __, 3, $91, $05d9
+ sound __, 9, $91, $05e1
Cry_0C_Ch8: ; f39fb
endchannel
; f39fc
@@ -1640,17 +1640,17 @@
Cry_02_Ch5: ; f39fc
unknownmusic0xde $0
- sound $8, $f5, $0480
- sound $2, $e1, $05e0
- sound $8, $d1, $05dc
+ sound __, 9, $f5, $0480
+ sound __, 3, $e1, $05e0
+ sound __, 9, $d1, $05dc
endchannel
; f3a0b
Cry_02_Ch6: ; f3a0b
unknownmusic0xde $a5
- sound $7, $95, $0441
- sound $2, $81, $0521
- sound $8, $61, $051a
+ sound __, 8, $95, $0441
+ sound __, 3, $81, $0521
+ sound __, 9, $61, $051a
Cry_02_Ch8: ; f3a19
endchannel
; f3a1a
@@ -1658,12 +1658,12 @@
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
+ sound __, 6, $f2, $0650
+ sound __, 10, $d1, $0660
+ sound __, 6, $e2, $0612
+ sound __, 10, $c1, $0622
+ sound __, 6, $f2, $0610
+ sound __, 7, $d1, $0620
loopchannel 2, Cry_0D_branch_f3a1a
endchannel
; f3a39
@@ -1670,170 +1670,170 @@
Cry_0D_Ch6: ; f3a39
unknownmusic0xde $40
- sound $4, $8, 0
- 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
+ sound __, 5, $8, 0
+ sound __, 6, $f2, $0651
+ sound __, 10, $d1, $0661
+ sound __, 6, $e2, $0614
+ sound __, 9, $c1, $0624
+ sound __, 6, $f2, $0611
+ sound __, 13, $d1, $0621
+ sound __, 6, $e2, $0614
+ sound __, 9, $c1, $0624
+ sound __, 6, $f2, $0611
+ sound __, 5, $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
+ noise __, 7, $d2, $1c
+ noise __, 10, $b1, $2c
+ noise __, 9, $c2, $2c
+ noise __, 10, $b1, $3c
+ noise __, 7, $c2, $2c
+ noise __, 10, $a2, $3c
+ noise __, 8, $c2, $2c
+ noise __, 6, $a1, $3c
+ noise __, 10, $c2, $2c
+ noise __, 5, $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
+ sound __, 5, $f3, $0600
+ sound __, 9, $d5, $0760
+ sound __, 4, $e2, $0720
+ sound __, 9, $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
+ sound __, 6, $b3, $06f1
+ sound __, 8, $c5, $0752
+ sound __, 4, $a2, $0711
+ sound __, 9, $b1, $0601
endchannel
; f3aad
Cry_01_Ch8: ; f3aad
- noise $3, $a2, $3c
- noise $c, $94, $2c
- noise $3, $82, $1c
- noise $8, $71, $2c
+ noise __, 4, $a2, $3c
+ noise __, 13, $94, $2c
+ noise __, 4, $82, $1c
+ noise __, 9, $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
+ sound __, 9, $f7, $06e0
+ sound __, 7, $e6, $06e5
+ sound __, 4, $f4, $06e0
+ sound __, 4, $f6, $06d0
+ sound __, 4, $e3, $06c0
+ sound __, 5, $f2, $06b0
+ sound __, 16, $a2, $06c8
endchannel
; f3ad9
Cry_0A_Ch6: ; f3ad9
unknownmusic0xde $5
- sound $3, $8, 0
- 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
+ sound __, 4, $8, 0
+ sound __, 9, $a7, $06a1
+ sound __, 7, $86, $06a3
+ sound __, 4, $74, $06a1
+ sound __, 4, $76, $0691
+ sound __, 4, $83, $0682
+ sound __, 5, $a2, $0671
+ sound __, 16, $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
+ noise __, 3, $f2, $3c
+ noise __, 9, $e4, $3e
+ noise __, 9, $d7, $3c
+ noise __, 6, $c5, $3b
+ noise __, 4, $d4, $2c
+ noise __, 3, $b6, $3c
+ noise __, 4, $a4, $2c
+ noise __, 9, $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
+ sound __, 16, $f6, $0565
+ sound __, 11, $e4, $057c
+ sound __, 4, $c2, $055c
+ sound __, 16, $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
+ sound __, 15, $d6, $0503
+ sound __, 10, $b4, $051b
+ sound __, 5, $92, $04fa
+ sound __, 16, $a2, $04db
endchannel
; f3b3b
Cry_08_Ch8: ; f3b3b
- noise $c, $e6, $4c
- noise $b, $d7, $5c
- noise $f, $c2, $4c
+ noise __, 13, $e6, $4c
+ noise __, 12, $d7, $5c
+ noise __, 16, $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
+ sound __, 5, $f7, $06a0
+ sound __, 9, $e6, $06a4
+ sound __, 5, $d6, $06a0
+ sound __, 13, $d3, $0620
+ sound __, 9, $c3, $0624
+ sound __, 5, $c2, $0620
+ sound __, 9, $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
+ sound __, 5, $e7, $0601
+ sound __, 9, $d6, $0603
+ sound __, 5, $c6, $0601
+ sound __, 13, $c3, $0581
+ sound __, 9, $b3, $0583
+ sound __, 5, $b2, $0582
+ sound __, 9, $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
+ noise __, 8, $d6, $5c
+ noise __, 9, $e6, $4c
+ noise __, 5, $d4, $5c
+ noise __, 5, $d4, $4c
+ noise __, 8, $c3, $4c
+ noise __, 9, $a1, $5c
endchannel
; f3b96
Cry_19_Ch5: ; f3b96
unknownmusic0xde $1b
- sound $7, $d2, $0740
- sound $f, $e5, $0760
- sound $18, $c1, $0730
+ sound __, 8, $d2, $0740
+ sound __, 16, $e5, $0760
+ sound C_, 9, $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
+ sound __, 3, $c2, $0701
+ sound __, 5, $c2, $0708
+ sound __, 16, $d7, $0741
+ sound C_, 9, $a2, $0701
Cry_19_Ch8: ; f3bb7
endchannel
; f3bb8
@@ -1840,441 +1840,441 @@
Cry_16_Ch5: ; f3bb8
unknownmusic0xde $f0
- sound $f, $d7, $0780
- sound $4, $e6, $07a0
- sound $f, $d2, $0740
+ sound __, 16, $d7, $0780
+ sound __, 5, $e6, $07a0
+ sound __, 16, $d2, $0740
endchannel
; f3bc7
Cry_16_Ch6: ; f3bc7
unknownmusic0xde $5a
- sound $f, $c7, $0753
- sound $5, $b6, $0772
- sound $f, $c2, $0711
+ sound __, 16, $c7, $0753
+ sound __, 6, $b6, $0772
+ sound __, 16, $c2, $0711
endchannel
; f3bd6
Cry_16_Ch8: ; f3bd6
- noise $d, $f6, $4c
- noise $4, $e6, $3c
- noise $f, $f2, $4c
+ noise __, 14, $f6, $4c
+ noise __, 5, $e6, $3c
+ noise __, 16, $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
+ sound __, 7, $f7, $06c0
+ sound __, 16, $e7, $0700
+ sound __, 5, $f4, $06f0
+ sound __, 5, $e4, $06e0
+ sound __, 9, $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
+ sound __, 8, $e6, $0681
+ sound __, 15, $d5, $06c1
+ sound __, 5, $c4, $06b1
+ sound __, 5, $d4, $06a1
+ sound __, 9, $c1, $0691
endchannel
; f3c0e
Cry_1B_Ch8: ; f3c0e
- noise $a, $a6, $3c
- noise $e, $94, $2c
- noise $5, $a3, $3c
- noise $8, $91, $2c
+ noise __, 11, $a6, $3c
+ noise __, 15, $94, $2c
+ noise __, 6, $a3, $3c
+ noise __, 9, $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
+ sound __, 13, $f2, $0440
+ sound __, 16, $e3, $04a0
+ sound __, 5, $d2, $0490
+ sound __, 9, $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
+ sound __, 12, $d2, $0438
+ sound __, 15, $c6, $0498
+ sound __, 4, $b2, $0488
+ sound __, 9, $b1, $0478
endchannel
; f3c41
Cry_12_Ch8: ; f3c41
- noise $a, $e6, $6c
- noise $f, $d2, $5c
- noise $3, $c2, $6c
- noise $8, $d1, $5c
+ noise __, 11, $e6, $6c
+ noise __, 16, $d2, $5c
+ noise __, 4, $c2, $6c
+ noise __, 9, $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
+ sound __, 16, $f6, $05c0
+ sound __, 9, $e3, $05bc
+ sound __, 7, $d2, $05d0
+ sound __, 7, $b2, $05e0
+ sound __, 7, $c2, $05f0
+ sound __, 9, $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
+ sound __, 15, $c6, $04b1
+ sound __, 8, $c3, $04ad
+ sound __, 6, $b2, $04c1
+ sound __, 9, $92, $04d1
+ sound __, 7, $a2, $04e1
+ sound __, 9, $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
+ noise __, 11, $e6, $5c
+ noise __, 11, $d6, $6c
+ noise __, 5, $c2, $4c
+ noise __, 7, $d3, $5c
+ noise __, 9, $b3, $4c
+ noise __, 9, $a1, $5c
endchannel
; f3c97
Cry_14_Ch5: ; f3c97
unknownmusic0xde $f0
- sound $8, $e4, $0790
- sound $f, $f5, $07c0
- sound $8, $d1, $07d8
+ sound __, 9, $e4, $0790
+ sound __, 16, $f5, $07c0
+ sound __, 9, $d1, $07d8
endchannel
; f3ca6
Cry_14_Ch6: ; f3ca6
unknownmusic0xde $a5
- sound $a, $c4, $0771
- sound $f, $b6, $07a2
- sound $8, $a1, $07b7
+ sound __, 11, $c4, $0771
+ sound __, 16, $b6, $07a2
+ sound __, 9, $a1, $07b7
endchannel
; f3cb5
Cry_14_Ch8: ; f3cb5
- noise $8, $e4, $4c
- noise $e, $c4, $3c
- noise $8, $d1, $2c
+ noise __, 9, $e4, $4c
+ noise __, 15, $c4, $3c
+ noise __, 9, $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
+ sound __, 7, $f2, $0600
+ sound __, 7, $e2, $0640
+ sound __, 7, $d2, $0680
+ sound __, 7, $e2, $06c0
+ sound __, 7, $d2, $0700
+ sound __, 7, $c2, $0740
+ sound __, 7, $b2, $0780
+ sound __, 9, $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
+ sound __, 4, $8, $0001
+ sound __, 7, $c2, $05c1
+ sound __, 7, $b2, $0602
+ sound __, 7, $a2, $0641
+ sound __, 7, $b2, $0682
+ sound __, 7, $a2, $06c2
+ sound __, 7, $92, $0701
+ sound __, 7, $a2, $0742
+ sound __, 9, $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
+ noise __, 7, $8, $1
+ noise __, 6, $e2, $5c
+ noise __, 6, $c2, $4c
+ noise __, 6, $d2, $3c
+ noise __, 6, $b2, $2c
+ noise __, 6, $c2, $1c
+ noise __, 6, $a2, $1b
+ noise __, 6, $92, $1a
+ noise __, 9, $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
+ sound __, 5, $f3, $0780
+ sound __, 16, $e7, $0700
+ sound __, 9, $d3, $0710
+ sound __, 5, $c2, $0700
+ sound __, 5, $d2, $06f0
+ sound __, 9, $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
+ sound __, 7, $c3, $0701
+ sound __, 15, $b7, $0681
+ sound __, 8, $b3, $0692
+ sound __, 4, $a2, $0681
+ sound __, 5, $b2, $0672
+ sound __, 9, $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
+ noise __, 7, $e3, $5c
+ noise __, 15, $d6, $4c
+ noise __, 7, $c6, $3c
+ noise __, 4, $b3, $4c
+ noise __, 4, $a2, $5c
+ noise __, 9, $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
+ sound __, 16, $f7, $0500
+ sound __, 16, $e7, $0508
+ sound __, 9, $b4, $0480
+ sound __, 16, $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
+ sound __, 15, $d7, $0481
+ sound __, 15, $c7, $0489
+ sound __, 11, $b4, $0401
+ sound __, 16, $c2, $03e1
endchannel
; f3d94
Cry_17_Ch8: ; f3d94
- noise $e, $f7, $7c
- noise $c, $f6, $6c
- noise $9, $e4, $7c
- noise $f, $e2, $6c
+ noise __, 15, $f7, $7c
+ noise __, 13, $f6, $6c
+ noise __, 10, $e4, $7c
+ noise __, 16, $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
+ sound __, 8, $d6, $07e1
+ sound __, 7, $c6, $07e2
+ sound __, 10, $d6, $07e1
+ sound __, 8, $c6, $07e0
+ sound __, 6, $b6, $07e2
+ sound __, 8, $c6, $07e1
+ sound __, 7, $b6, $07e0
+ sound __, 9, $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
+ sound __, 7, $c3, $07c9
+ sound __, 7, $b3, $07c7
+ sound __, 11, $c4, $07c3
+ sound __, 9, $b4, $07c7
+ sound __, 7, $c3, $07c9
+ sound __, 16, $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
+ noise __, 14, $19, $7c
+ noise __, 14, $f7, $8c
+ noise __, 13, $d6, $7c
+ noise __, 9, $c4, $6c
+ noise __, 16, $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
+ sound __, 7, $f7, $0740
+ sound __, 13, $e6, $0744
+ sound __, 7, $d5, $0750
+ sound __, 5, $c3, $0760
+ sound __, 4, $c3, $0780
+ sound __, 9, $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
+ sound __, 7, $c7, $0701
+ sound __, 12, $b6, $0702
+ sound __, 7, $a5, $0711
+ sound __, 5, $93, $0721
+ sound __, 4, $a3, $0741
+ sound __, 9, $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
+ noise __, 4, $e2, $3c
+ noise __, 9, $d6, $4c
+ noise __, 6, $d4, $3c
+ noise __, 13, $c7, $4c
+ noise __, 3, $e2, $3c
+ noise __, 9, $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
+ sound __, 16, $f0, $0705
+ sound __, 11, $e0, $0700
+ sound __, 7, $b4, $0710
+ sound __, 5, $d3, $0700
+ sound __, 7, $b2, $0620
+ sound __, 9, $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
+ sound __, 16, $b0, $06c3
+ sound __, 11, $a0, $06c1
+ sound __, 7, $84, $06d2
+ sound __, 5, $93, $06c1
+ sound __, 7, $82, $05e1
+ sound __, 9, $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
+ noise __, 7, $e6, $4c
+ noise __, 16, $d6, $3c
+ noise __, 11, $c5, $4a
+ noise __, 2, $b2, $5b
+ noise __, 16, $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
+ sound __, 11, $f5, $0680
+ sound __, 4, $e2, $06a0
+ sound __, 4, $f2, $06c0
+ sound __, 4, $e2, $06e0
+ sound __, 4, $d2, $0700
+ sound __, 4, $c2, $06e0
+ sound __, 4, $d2, $06c0
+ sound __, 9, $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
+ sound __, 10, $d5, $0631
+ sound __, 4, $d2, $0652
+ sound __, 4, $e2, $0671
+ sound __, 4, $b2, $0691
+ sound __, 4, $c2, $06b2
+ sound __, 4, $b2, $0691
+ sound __, 4, $c2, $0671
+ sound __, 9, $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
+ noise __, 7, $e3, $4c
+ noise __, 5, $c3, $3c
+ noise __, 6, $d4, $3c
+ noise __, 5, $c4, $2c
+ noise __, 7, $b4, $3c
+ noise __, 9, $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
+ sound __, 4, $f4, $0641
+ sound __, 14, $d6, $0721
+ sound __, 9, $f4, $0719
+ sound __, 9, $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
+ sound __, 5, $f4, $0580
+ sound __, 15, $e6, $06e0
+ sound __, 9, $d5, $06d8
+ sound __, 9, $d1, $06dc
endchannel
; f3efd
Cry_1F_Ch8: ; f3efd
- noise $5, $c4, $46
- noise $d, $a5, $44
- noise $8, $c4, $45
- noise $8, $b1, $44
+ noise __, 6, $c4, $46
+ noise __, 14, $a5, $44
+ noise __, 9, $c4, $45
+ noise __, 9, $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
+ sound __, 14, $f1, $0511
+ sound __, 14, $e1, $0515
+ sound __, 14, $e1, $0511
+ sound __, 9, $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
+ sound __, 13, $e1, $050c
+ sound __, 13, $d1, $0510
+ sound __, 15, $c1, $050c
+ sound __, 9, $c1, $050a
endchannel
; f3f30
Cry_20_Ch8: ; f3f30
- noise $e, $f2, $65
- noise $d, $e2, $55
- noise $e, $d2, $56
- noise $8, $d1, $66
+ noise __, 15, $f2, $65
+ noise __, 14, $e2, $55
+ noise __, 15, $d2, $56
+ noise __, 9, $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
+ sound __, 4, $f3, $0564
+ sound __, 3, $e2, $0544
+ sound __, 6, $d1, $0522
+ sound __, 3, $b2, $0484
+ sound __, 9, $d1, $04a2
+ sound __, 4, $f3, $0524
+ sound __, 5, $e4, $04e4
+ sound __, 9, $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
+ sound __, 4, $d3, $0560
+ sound __, 3, $c2, $0540
+ sound __, 6, $c1, $0520
+ sound __, 3, $92, $0480
+ sound __, 9, $c1, $04a0
+ sound __, 4, $d3, $0520
+ sound __, 4, $c4, $04e0
+ sound __, 9, $c1, $0500
Cry_21_Ch8: ; f3f82
endchannel
; f3f83
@@ -2281,26 +2281,26 @@
Cry_22_Ch5: ; f3f83
unknownmusic0xde $11
- sound $2, $3d, $0381
- sound $7, $f5, $0601
- sound $1, $c2, $0481
- sound $8, $91, $0381
+ sound __, 3, $3d, $0381
+ sound __, 8, $f5, $0601
+ sound __, 2, $c2, $0481
+ sound __, 9, $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
+ sound __, 3, $3e, $05b0
+ sound __, 8, $d5, $075d
+ sound __, 2, $b2, $06b0
+ sound __, 9, $61, $05b0
endchannel
; f3fa9
Cry_22_Ch8: ; f3fa9
- noise $2, $92, $49
- noise $7, $b5, $29
- noise $1, $a2, $39
- noise $8, $91, $49
+ noise __, 3, $92, $49
+ noise __, 8, $b5, $29
+ noise __, 2, $a2, $39
+ noise __, 9, $91, $49
endchannel
; f3fb6
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -55,6 +55,7 @@
pop de
pop hl
ret
+
; e803d
MusicFadeRestart: ; e803d
@@ -69,6 +70,7 @@
pop af
ld [MusicFadeIDHi], a
ret
+
; e8051
MusicOn: ; e8051
@@ -75,6 +77,7 @@
ld a, 1
ld [MusicPlaying], a
ret
+
; e8057
MusicOff: ; e8057
@@ -81,6 +84,7 @@
xor a
ld [MusicPlaying], a
ret
+
; e805c
_UpdateSound:: ; e805c
@@ -129,15 +133,15 @@
ld hl, Channel1DutyCycle - Channel1
add hl, bc
ld a, [hli]
- ld [wc292], a
+ ld [wCurTrackDuty], a
; intensity
ld a, [hli]
- ld [wc293], a
+ ld [wCurTrackIntensity], a
; frequency
ld a, [hli]
- ld [wc294], a
+ ld [wCurTrackFrequency], a
ld a, [hl]
- ld [wc295], a
+ ld [wCurTrackFrequency + 1], a
;
call Functione8466 ; handle vibrato and other things
call HandleNoise
@@ -211,6 +215,7 @@
ld a, [SoundOutput]
ld [rNR51], a
ret
+
; e8125
UpdateChannels: ; e8125
@@ -261,14 +266,14 @@
jr nz, .asm_e8184
jr .asm_e8175
.asm_e816b
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR13], a
- ld a, [wc295]
+ ld a, [wCurTrackFrequency + 1]
ld [rNR14], a
.asm_e8175
bit 0, [hl]
ret z
- ld a, [wc292]
+ ld a, [wCurTrackDuty]
ld d, a
ld a, [rNR11]
and $3f ; sound length
@@ -275,16 +280,18 @@
or d
ld [rNR11], a
ret
+
.asm_e8184
- ld a, [wc292]
+ ld a, [wCurTrackDuty]
ld d, a
ld a, [rNR11]
and $3f ; sound length
or d
ld [rNR11], a
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR13], a
ret
+
.ch1rest
ld a, [rNR52]
and %10001110 ; ch1 off
@@ -292,16 +299,17 @@
ld hl, rNR10
call ClearChannel
ret
+
.asm_e81a2
- ld hl, wc292
+ ld hl, wCurTrackDuty
ld a, $3f ; sound length
or [hl]
ld [rNR11], a
- ld a, [wc293]
+ ld a, [wCurTrackIntensity]
ld [rNR12], a
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR13], a
- ld a, [wc295]
+ ld a, [wCurTrackFrequency + 1]
or $80
ld [rNR14], a
ret
@@ -318,7 +326,7 @@
jr nz, .asm_e81e6
bit 0, [hl]
ret z
- ld a, [wc292]
+ ld a, [wCurTrackDuty]
ld d, a
ld a, [rNR21]
and $3f ; sound length
@@ -325,22 +333,25 @@
or d
ld [rNR21], a
ret
+
.asm_e81db ; unused
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR23], a
- ld a, [wc295]
+ ld a, [wCurTrackFrequency + 1]
ld [rNR24], a
ret
+
.asm_e81e6
- ld a, [wc292]
+ ld a, [wCurTrackDuty]
ld d, a
ld a, [rNR21]
and $3f ; sound length
or d
ld [rNR21], a
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR23], a
ret
+
.ch2rest
ld a, [rNR52]
and %10001101 ; ch2 off
@@ -348,16 +359,17 @@
ld hl, rNR20
call ClearChannel
ret
+
.asm_e8204
- ld hl, wc292
+ ld hl, wCurTrackDuty
ld a, $3f ; sound length
or [hl]
ld [rNR21], a
- ld a, [wc293]
+ ld a, [wCurTrackIntensity]
ld [rNR22], a
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR23], a
- ld a, [wc295]
+ ld a, [wCurTrackFrequency + 1]
or $80 ; initial (restart)
ld [rNR24], a
ret
@@ -373,16 +385,19 @@
bit 6, [hl]
jr nz, .asm_e823a
ret
+
.asm_e822f ; unused
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR33], a
- ld a, [wc295]
+ ld a, [wCurTrackFrequency + 1]
ld [rNR34], a
ret
+
.asm_e823a
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR33], a
ret
+
.ch3rest
ld a, [rNR52]
and %10001011 ; ch3 off
@@ -390,6 +405,7 @@
ld hl, rNR30
call ClearChannel
ret
+
.asm_e824d
ld a, $3f
ld [rNR31], a
@@ -398,15 +414,16 @@
call .asm_e8268
ld a, $80
ld [rNR30], a
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR33], a
- ld a, [wc295]
+ ld a, [wCurTrackFrequency + 1]
or $80
ld [rNR34], a
ret
+
.asm_e8268
push hl
- ld a, [wc293]
+ ld a, [wCurTrackIntensity]
and $f ; only 0-9 are valid
ld l, a
ld h, 0
@@ -452,7 +469,7 @@
ld a, [hli]
ld [rWave_f], a
pop hl
- ld a, [wc293]
+ ld a, [wCurTrackIntensity]
and $f0
sla a
ld [rNR32], a
@@ -467,10 +484,12 @@
bit 4, [hl]
jr nz, .asm_e82d4
ret
+
.asm_e82c1 ; unused
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR43], a
ret
+
.ch4rest
ld a, [rNR52]
and %10000111 ; ch4 off
@@ -478,16 +497,18 @@
ld hl, rNR40
call ClearChannel
ret
+
.asm_e82d4
ld a, $3f ; sound length
ld [rNR41], a
- ld a, [wc293]
+ ld a, [wCurTrackIntensity]
ld [rNR42], a
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld [rNR43], a
ld a, $80
ld [rNR44], a
ret
+
; e82e7
_CheckSFX: ; e82e7
@@ -506,9 +527,11 @@
jr nz, .sfxon
and a
ret
+
.sfxon
scf
ret
+
; e8307
PlayDanger: ; e8307
@@ -558,6 +581,7 @@
or $11
ld [SoundOutput], a
ret
+
; e8350
Tablee8350: ; e8350
@@ -596,6 +620,7 @@
dec a
ld [MusicFadeCount], a
ret
+
.update
ld a, [MusicFade]
ld d, a
@@ -641,6 +666,7 @@
xor a
ld [MusicFade], a
ret
+
.bicycle
push bc
; restart sound
@@ -674,6 +700,7 @@
xor a
ld [MusicFade], a
ret
+
.updatevolume
; hi = lo
ld d, a
@@ -681,6 +708,7 @@
or d
ld [Volume], a
ret
+
; e83d1
LoadNote: ; e83d1
@@ -803,14 +831,15 @@
xor a
ld [hl], a
ret
+
; e8466
Functione8466: ; e8466
; handle vibrato and other things
-; unknowns: wc292, wc294
+; unknowns: wCurTrackDuty, wCurTrackFrequency
ld hl, Channel1Flags2 - Channel1
add hl, bc
- bit 2, [hl]
+ bit 2, [hl] ; duty
jr z, .next
ld hl, Channel1Field0x1c - Channel1
add hl, bc
@@ -819,7 +848,7 @@
rlca
ld [hl], a
and $c0
- ld [wc292], a
+ ld [wCurTrackDuty], a
ld hl, Channel1NoteFlags - Channel1
add hl, bc
set 0, [hl]
@@ -833,7 +862,7 @@
ld e, [hl]
inc hl
ld d, [hl]
- ld hl, wc294
+ ld hl, wCurTrackFrequency
ld a, [hli]
ld h, [hl]
ld l, a
@@ -840,7 +869,7 @@
add hl, de
ld e, l
ld d, h
- ld hl, wc294
+ ld hl, wCurTrackFrequency
ld [hl], e
inc hl
ld [hl], d
@@ -881,7 +910,7 @@
or [hl]
ld [hl], a
; ????
- ld a, [wc294]
+ ld a, [wCurTrackFrequency]
ld e, a
; toggle vibrato up/down
ld hl, Channel1Flags3 - Channel1
@@ -913,7 +942,7 @@
jr nc, .asm_e84ef
ld a, $ff
.asm_e84ef
- ld [wc294], a
+ ld [wCurTrackFrequency], a
;
ld hl, Channel1NoteFlags - Channel1
add hl, bc
@@ -920,6 +949,7 @@
set 6, [hl]
.quit
ret
+
; e84f9
Functione84f9: ; e84f9
@@ -1015,6 +1045,7 @@
add hl, bc
res 1, [hl]
ret
+
.quit2
ld hl, Channel1Frequency - Channel1
add hl, bc
@@ -1026,6 +1057,7 @@
set 1, [hl]
set 0, [hl]
ret
+
; e858c
HandleNoise: ; e858c
@@ -1047,12 +1079,13 @@
ret nz ; quit if so
;
.next
- ld a, [wc2a2]
+ ld a, [wNoiseSampleDelay]
and a
jr z, ReadNoiseSample
dec a
- ld [wc2a2], a
+ ld [wNoiseSampleDelay], a
ret
+
; e85af
ReadNoiseSample: ; e85af
@@ -1082,15 +1115,15 @@
and $f
inc a
- ld [wc2a2], a
+ ld [wNoiseSampleDelay], a
ld a, [de]
inc de
- ld [wc293], a
+ ld [wCurTrackIntensity], a
ld a, [de]
inc de
- ld [wc294], a
+ ld [wCurTrackFrequency], a
xor a
- ld [wc295], a
+ ld [wCurTrackFrequency + 1], a
ld hl, NoiseSampleAddress
ld [hl], e
@@ -1101,8 +1134,10 @@
add hl, bc
set 4, [hl]
ret
+
.quit
ret
+
; e85e1
ParseMusic: ; e85e1
@@ -1124,7 +1159,7 @@
add hl, bc
bit 3, [hl]
jp nz, Functione8698
- bit 5, [hl]
+ bit 5, [hl] ; rest
jp nz, Functione8698
bit 4, [hl] ; noise sample
jp nz, GetNoiseSample
@@ -1167,6 +1202,7 @@
add hl, bc
set 5, [hl] ; Rest
ret
+
;
.readff
; $ff is reached in music data
@@ -1212,6 +1248,7 @@
ld [hli], a ; id lo
ld [hli], a ; bank
ret
+
; e8679
RestoreVolume: ; e8679
@@ -1232,6 +1269,7 @@
ld [LastVolume], a
ld [SFXPriority], a
ret
+
; e8698
Functione8698: ; e8698
@@ -1263,6 +1301,7 @@
add hl, bc
ld [hl], a
ret
+
; e86c5
GetNoiseSample: ; e86c5
@@ -1319,8 +1358,9 @@
ld [NoiseSampleAddressHi], a
; clear ????
xor a
- ld [wc2a2], a
+ ld [wNoiseSampleDelay], a
ret
+
; e870f
ParseMusicCommand: ; e870f
@@ -1404,6 +1444,7 @@
MusicF7: ; e8780
MusicF8: ; e8780
ret
+
; e8781
Music_EndChannel: ; e8781
@@ -1426,6 +1467,7 @@
inc hl
ld [hl], d
ret
+
; e8796
Music_CallChannel: ; e8796
@@ -1460,6 +1502,7 @@
add hl, bc
set 1, [hl]
ret
+
; e87bc
Music_JumpChannel: ; e87bc
@@ -1476,6 +1519,7 @@
inc hl
ld [hl], d
ret
+
; e87cc
Music_LoopChannel: ; e87cc
@@ -1538,6 +1582,7 @@
dec hl
ld [hl], e
ret
+
; e880e
Music_SetCondition: ; e880e
@@ -1552,6 +1597,7 @@
add hl, bc
ld [hl], a
ret
+
; e8817
Music_JumpIf: ; e8817
@@ -1585,6 +1631,7 @@
dec hl
ld [hl], e
ret
+
.jump
; jump to the new address
; get pointer
@@ -1599,6 +1646,7 @@
inc hl
ld [hl], d
ret
+
; e883e
MusicEE; e883e
@@ -1637,6 +1685,7 @@
dec hl
ld [hl], e
ret
+
.jump
; reset jump flag
ld [hl], 0
@@ -1652,6 +1701,7 @@
inc hl
ld [hl], d
ret
+
; e886d
MusicF9: ; e886d
@@ -1661,6 +1711,7 @@
ld a, 1
ld [wc2b5], a
ret
+
; e8873
MusicE2: ; e8873
@@ -1674,6 +1725,7 @@
add hl, bc
set 3, [hl]
ret
+
; e8882
Music_Vibrato: ; e8882
@@ -1730,6 +1782,7 @@
or d
ld [hl], a
ret
+
; e88bd
MusicE0: ; e88bd
@@ -1758,6 +1811,7 @@
add hl, bc
set 1, [hl]
ret
+
; e88e4
Music_Tone: ; e88e4
@@ -1773,6 +1827,7 @@
call GetMusicByte
ld [hl], a
ret
+
; e88f7
MusicE7: ; e88f7
@@ -1786,6 +1841,7 @@
add hl, bc
ld [hl], a
ret
+
; e8906
MusicDE: ; e8906
@@ -1808,6 +1864,7 @@
add hl, bc
ld [hl], a
ret
+
; e891e
MusicE8: ; e891e
@@ -1821,6 +1878,7 @@
add hl, bc
ld [hl], a
ret
+
; e892d
Music_ToggleSFX: ; e892d
@@ -1832,9 +1890,11 @@
jr z, .on
res 3, [hl]
ret
+
.on
set 3, [hl]
ret
+
; e893b
Music_ToggleNoise: ; e893b
@@ -1851,6 +1911,7 @@
; turn noise sampling off
res 4, [hl]
ret
+
.on
; turn noise sampling on
set 4, [hl]
@@ -1857,6 +1918,7 @@
call GetMusicByte
ld [MusicNoiseSampleSet], a
ret
+
; e894f
Music_SFXToggleNoise: ; e894f
@@ -1872,6 +1934,7 @@
; turn noise sampling off
res 4, [hl]
ret
+
.on
; turn noise sampling on
set 4, [hl]
@@ -1878,6 +1941,7 @@
call GetMusicByte
ld [SFXNoiseSampleSet], a
ret
+
; e8963
Music_NoteType: ; e8963
@@ -1892,11 +1956,12 @@
ld [hl], a
ld a, [CurChannel]
and $3
- cp $3
+ cp CHAN4 ; CHAN8 & $3
ret z
; intensity
call Music_Intensity
ret
+
; e8977
Music_SoundStatus: ; e8977
@@ -1908,6 +1973,7 @@
add hl, bc
set 3, [hl]
ret
+
; e8984
Music_DutyCycle: ; e8984
@@ -1921,6 +1987,7 @@
add hl, bc
ld [hl], a
ret
+
; e8991
Music_Intensity: ; e8991
@@ -1933,6 +2000,7 @@
add hl, bc
ld [hl], a
ret
+
; e899a
Music_Tempo: ; e899a
@@ -1945,6 +2013,7 @@
ld e, a
call SetGlobalTempo
ret
+
; e89a6
Music_Octave8: ; e89a6
@@ -1962,6 +2031,7 @@
and 7
ld [hl], a
ret
+
; e89b1
Music_ForceOctave: ; e89b1
@@ -1973,6 +2043,7 @@
add hl, bc
ld [hl], a
ret
+
; e89ba
Music_StereoPanning: ; e89ba
@@ -1985,6 +2056,7 @@
; skip param
call GetMusicByte
ret
+
; e89c5
Music_Panning: ; e89c5
@@ -1997,6 +2069,7 @@
and [hl]
ld [hl], a
ret
+
; e89d2
Music_Volume: ; e89d2
@@ -2014,6 +2087,7 @@
; set volume
ld [Volume], a
ret
+
; e89e1
Music_GlobalTempo: ; e89e1
@@ -2040,6 +2114,7 @@
ld d, h
call SetGlobalTempo
ret
+
; e89fd
Music_SFXPriorityOn: ; e89fd
@@ -2048,6 +2123,7 @@
ld a, 1
ld [SFXPriority], a
ret
+
; e8a03
Music_SFXPriorityOff: ; e8a03
@@ -2056,6 +2132,7 @@
xor a
ld [SFXPriority], a
ret
+
; e8a08
Music_RestartChannel: ; e8a08
@@ -2091,6 +2168,7 @@
call StartChannel
pop bc ; restore current channel
ret
+
; e8a30
Music_NewSong: ; e8a30
@@ -2105,6 +2183,7 @@
call _PlayMusic
pop bc
ret
+
; e8a3e
GetMusicByte: ; e8a3e
@@ -2138,6 +2217,7 @@
; store channeldata in a
ld a, [CurMusicByte]
ret
+
; e8a5d
GetFrequency: ; e8a5d
@@ -2191,6 +2271,7 @@
and $7 ; top 3 bits for frequency (11 total)
ld d, a
ret
+
; e8a8d
SetNoteDuration: ; e8a8d
@@ -2231,6 +2312,7 @@
add hl, bc
ld [hl], d
ret
+
; e8ab8
MultiplySimple: ; e8ab8
@@ -2253,6 +2335,7 @@
and a
jr nz, .loop
ret
+
; e8ac7
SetGlobalTempo: ; e8ac7
@@ -2259,7 +2342,7 @@
push bc ; save current channel
; are we dealing with music or sfx?
ld a, [CurChannel]
- cp $4
+ cp CHAN5
jr nc, .sfxchannels
ld bc, Channel1
call SetTempo
@@ -2282,6 +2365,7 @@
.end
pop bc ; restore current channel
ret
+
; e8b03
SetTempo: ; e8b03
@@ -2299,6 +2383,7 @@
add hl, bc
ld [hl], a
ret
+
; e8b11
StartChannel: ; e8b11
@@ -2307,6 +2392,7 @@
add hl, bc
set 0, [hl] ; turn channel on
ret
+
; e8b1b
SetLRTracks: ; e8b1b
@@ -2328,6 +2414,7 @@
ld [hl], a
pop de
ret
+
; e8b30
_PlayMusic:: ; e8b30
@@ -2367,10 +2454,11 @@
ld [wc2bb], a
ld [NoiseSampleAddressLo], a
ld [NoiseSampleAddressHi], a
- ld [wc2a2], a
+ ld [wNoiseSampleDelay], a
ld [MusicNoiseSampleSet], a
call MusicOn
ret
+
; e8b79
_PlayCryHeader:: ; e8b79
@@ -2484,6 +2572,7 @@
ld [SFXPriority], a
call MusicOn
ret
+
; e8c04
_PlaySFX:: ; e8c04
@@ -2584,6 +2673,7 @@
xor a
ld [SFXPriority], a
ret
+
; e8ca6
@@ -2687,6 +2777,7 @@
; we're done
call MusicOn
ret
+
; e8d1b
@@ -2734,6 +2825,7 @@
ld a, [MusicBank]
ld [hl], a
ret
+
; e8d5b
ChannelInit: ; e8d5b
@@ -2765,6 +2857,7 @@
ld [hl], a
pop de
ret
+
; e8d76
LoadMusicByte:: ; e8d76
@@ -2776,6 +2869,7 @@
call _LoadMusicByte
ld a, [CurMusicByte]
ret
+
; e8d80
FrequencyTable: ; e8d80
@@ -2918,208 +3012,208 @@
Drum00: ; e8efa
; unused
- noise $20, $11, $00
+ noise C#, 1, $11, $00
endchannel
; e8efe
Snare1: ; e8efe
- noise $20, $c1, $33
+ noise C#, 1, $c1, $33
endchannel
; e8f02
Snare2: ; e8f02
- noise $20, $b1, $33
+ noise C#, 1, $b1, $33
endchannel
; e8f06
Snare3: ; e8f06
- noise $20, $a1, $33
+ noise C#, 1, $a1, $33
endchannel
; e8f0a
Snare4: ; e8f0a
- noise $20, $81, $33
+ noise C#, 1, $81, $33
endchannel
; e8f0e
Drum05: ; e8f0e
- noise $27, $84, $37
- noise $26, $84, $36
- noise $25, $83, $35
- noise $24, $83, $34
- noise $23, $82, $33
- noise $22, $81, $32
+ noise C#, 8, $84, $37
+ noise C#, 7, $84, $36
+ noise C#, 6, $83, $35
+ noise C#, 5, $83, $34
+ noise C#, 4, $82, $33
+ noise C#, 3, $81, $32
endchannel
; e8f21
Triangle1: ; e8f21
- noise $20, $51, $2a
+ noise C#, 1, $51, $2a
endchannel
; e8f25
Triangle2: ; e8f25
- noise $21, $41, $2b
- noise $20, $61, $2a
+ noise C#, 2, $41, $2b
+ noise C#, 1, $61, $2a
endchannel
; e8f2c
HiHat1: ; e8f2c
- noise $20, $81, $10
+ noise C#, 1, $81, $10
endchannel
; e8f30
Snare5: ; e8f30
- noise $20, $82, $23
+ noise C#, 1, $82, $23
endchannel
; e8f34
Snare6: ; e8f34
- noise $20, $82, $25
+ noise C#, 1, $82, $25
endchannel
; e8f38
Snare7: ; e8f38
- noise $20, $82, $26
+ noise C#, 1, $82, $26
endchannel
; e8f3c
HiHat2: ; e8f3c
- noise $20, $a1, $10
+ noise C#, 1, $a1, $10
endchannel
; e8f40
HiHat3: ; e8f40
- noise $20, $a2, $11
+ noise C#, 1, $a2, $11
endchannel
; e8f44
Snare8: ; e8f44
- noise $20, $a2, $50
+ noise C#, 1, $a2, $50
endchannel
; e8f48
Triangle3: ; e8f48
- noise $20, $a1, $18
- noise $20, $31, $33
+ noise C#, 1, $a1, $18
+ noise C#, 1, $31, $33
endchannel
; e8f4f
Triangle4: ; e8f4f
- noise $22, $91, $28
- noise $20, $71, $18
+ noise C#, 3, $91, $28
+ noise C#, 1, $71, $18
endchannel
; e8f56
Snare9: ; e8f56
- noise $20, $91, $22
+ noise C#, 1, $91, $22
endchannel
; e8f5a
Snare10: ; e8f5a
- noise $20, $71, $22
+ noise C#, 1, $71, $22
endchannel
; e8f5e
Snare11: ; e8f5e
- noise $20, $61, $22
+ noise C#, 1, $61, $22
endchannel
; e8f62
Drum20: ; e8f62
- noise $20, $11, $11
+ noise C#, 1, $11, $11
endchannel
; e8f66
Drum21: ; e8f66
- db $ff
+ endchannel
; e8f67
Snare12: ; e8f67
- noise $20, $91, $33
+ noise C#, 1, $91, $33
endchannel
; e8f6b
Snare13: ; e8f6b
- noise $20, $51, $32
+ noise C#, 1, $51, $32
endchannel
; e8f6f
Snare14: ; e8f6f
- noise $20, $81, $31
+ noise C#, 1, $81, $31
endchannel
; e8f73
Kick1: ; e8f73
- noise $20, $88, $6b
- noise $20, $71, $00
+ noise C#, 1, $88, $6b
+ noise C#, 1, $71, $00
endchannel
; e8f7a
Triangle5: ; e8f7a
- noise $30, $91, $18
+ noise D_, 1, $91, $18
endchannel
; e8f7e
Drum27: ; e8f7e
- noise $27, $92, $10
+ noise C#, 8, $92, $10
endchannel
; e8f82
Drum28: ; e8f82
- noise $33, $91, $00
- noise $33, $11, $00
+ noise D_, 4, $91, $00
+ noise D_, 4, $11, $00
endchannel
; e8f89
Drum29: ; e8f89
- noise $33, $91, $11
- noise $33, $11, $00
+ noise D_, 4, $91, $11
+ noise D_, 4, $11, $00
endchannel
; e8f90
Crash1: ; e8f90
- noise $33, $88, $15
- noise $20, $65, $12
+ noise D_, 4, $88, $15
+ noise C#, 1, $65, $12
endchannel
; e8f97
Drum31: ; e8f97
- noise $33, $51, $21
- noise $33, $11, $11
+ noise D_, 4, $51, $21
+ noise D_, 4, $11, $11
endchannel
; e8f9e
Drum32: ; e8f9e
- noise $33, $51, $50
- noise $33, $11, $11
+ noise D_, 4, $51, $50
+ noise D_, 4, $11, $11
endchannel
; e8fa5
Drum33: ; e8fa5
- noise $20, $a1, $31
+ noise C#, 1, $a1, $31
endchannel
; e8fa9
Crash2: ; e8fa9
- noise $20, $84, $12
+ noise C#, 1, $84, $12
endchannel
; e8fad
Drum35: ; e8fad
- noise $33, $81, $00
- noise $33, $11, $00
+ noise D_, 4, $81, $00
+ noise D_, 4, $11, $00
endchannel
; e8fb4
Drum36: ; e8fb4
- noise $33, $81, $21
- noise $33, $11, $11
+ noise D_, 4, $81, $21
+ noise D_, 4, $11, $11
endchannel
; e8fbb
Kick2: ; e8fbb
- noise $20, $a8, $6b
- noise $20, $71, $00
+ noise C#, 1, $a8, $6b
+ noise C#, 1, $71, $00
endchannel
; e8fc2
@@ -3132,9 +3226,11 @@
jr nz, .stereo
ld hl, MonoTracks
ret
+
.stereo
ld hl, StereoTracks
ret
+
; e8fd1
MonoTracks: ; e8fd1
@@ -3180,6 +3276,7 @@
dec e
jr nz, .loop
ret
+
; e8ffe
ClearChannel: ; e8ffe
@@ -3198,4 +3295,5 @@
ld a, $80
ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0)
ret
+
; e900a
--- a/audio/music/aftertherivalfight.asm
+++ b/audio/music/aftertherivalfight.asm
@@ -1,8 +1,8 @@
Music_AfterTheRivalFight: ; f5127
- dbw $c0, Music_AfterTheRivalFight_Ch1
- dbw $01, Music_AfterTheRivalFight_Ch2
- dbw $02, Music_AfterTheRivalFight_Ch3
- dbw $03, Music_AfterTheRivalFight_Ch4
+ musicheader 4, 1, Music_AfterTheRivalFight_Ch1
+ musicheader 1, 2, Music_AfterTheRivalFight_Ch2
+ musicheader 1, 3, Music_AfterTheRivalFight_Ch3
+ musicheader 1, 4, Music_AfterTheRivalFight_Ch4
; f5133
Music_AfterTheRivalFight_Ch1: ; f5133
--- a/audio/music/azaleatown.asm
+++ b/audio/music/azaleatown.asm
@@ -1,8 +1,8 @@
Music_AzaleaTown: ; f57e8
- dbw $c0, Music_AzaleaTown_Ch1
- dbw $01, Music_AzaleaTown_Ch2
- dbw $02, Music_AzaleaTown_Ch3
- dbw $03, Music_AzaleaTown_Ch4
+ musicheader 4, 1, Music_AzaleaTown_Ch1
+ musicheader 1, 2, Music_AzaleaTown_Ch2
+ musicheader 1, 3, Music_AzaleaTown_Ch3
+ musicheader 1, 4, Music_AzaleaTown_Ch4
; f57f4
Music_AzaleaTown_Ch1: ; f57f4
--- a/audio/music/battletowerlobby.asm
+++ b/audio/music/battletowerlobby.asm
@@ -1,8 +1,8 @@
Music_BattleTowerLobby: ; 17948b
- dbw $c0, Music_BattleTowerLobby_Ch1
- dbw $01, Music_BattleTowerLobby_Ch2
- dbw $02, Music_BattleTowerLobby_Ch3
- dbw $03, Music_BattleTowerLobby_Ch4
+ musicheader 4, 1, Music_BattleTowerLobby_Ch1
+ musicheader 1, 2, Music_BattleTowerLobby_Ch2
+ musicheader 1, 3, Music_BattleTowerLobby_Ch3
+ musicheader 1, 4, Music_BattleTowerLobby_Ch4
; 179497
Music_BattleTowerLobby_Ch1: ; 179497
--- a/audio/music/battletowertheme.asm
+++ b/audio/music/battletowertheme.asm
@@ -1,8 +1,8 @@
Music_BattleTowerTheme: ; 178889
- dbw $c0, Music_BattleTowerTheme_Ch1
- dbw $01, Music_BattleTowerTheme_Ch2
- dbw $02, Music_BattleTowerTheme_Ch3
- dbw $03, Music_BattleTowerTheme_Ch4
+ musicheader 4, 1, Music_BattleTowerTheme_Ch1
+ musicheader 1, 2, Music_BattleTowerTheme_Ch2
+ musicheader 1, 3, Music_BattleTowerTheme_Ch3
+ musicheader 1, 4, Music_BattleTowerTheme_Ch4
; 178895
Music_BattleTowerTheme_Ch1: ; 178895
--- a/audio/music/bicycle.asm
+++ b/audio/music/bicycle.asm
@@ -1,8 +1,8 @@
Music_Bicycle: ; ee119
- dbw $c0, Music_Bicycle_Ch1
- dbw $01, Music_Bicycle_Ch2
- dbw $02, Music_Bicycle_Ch3
- dbw $03, Music_Bicycle_Ch4
+ musicheader 4, 1, Music_Bicycle_Ch1
+ musicheader 1, 2, Music_Bicycle_Ch2
+ musicheader 1, 3, Music_Bicycle_Ch3
+ musicheader 1, 4, Music_Bicycle_Ch4
; ee125
Music_Bicycle_Ch1: ; ee125
--- a/audio/music/buenaspassword.asm
+++ b/audio/music/buenaspassword.asm
@@ -1,8 +1,8 @@
Music_BuenasPassword: ; 178153
- dbw $c0, Music_BuenasPassword_Ch1
- dbw $01, Music_BuenasPassword_Ch2
- dbw $02, Music_BuenasPassword_Ch3
- dbw $03, Music_BuenasPassword_Ch4
+ musicheader 4, 1, Music_BuenasPassword_Ch1
+ musicheader 1, 2, Music_BuenasPassword_Ch2
+ musicheader 1, 3, Music_BuenasPassword_Ch3
+ musicheader 1, 4, Music_BuenasPassword_Ch4
; 17815f
Music_BuenasPassword_Ch1: ; 17815f
--- a/audio/music/bugcatchingcontest.asm
+++ b/audio/music/bugcatchingcontest.asm
@@ -1,8 +1,8 @@
Music_BugCatchingContest: ; f7c16
- dbw $c0, Music_BugCatchingContest_Ch1
- dbw $01, Music_BugCatchingContest_Ch2
- dbw $02, Music_BugCatchingContest_Ch3
- dbw $03, Music_BugCatchingContest_Ch4
+ musicheader 4, 1, Music_BugCatchingContest_Ch1
+ musicheader 1, 2, Music_BugCatchingContest_Ch2
+ musicheader 1, 3, Music_BugCatchingContest_Ch3
+ musicheader 1, 4, Music_BugCatchingContest_Ch4
; f7c22
Music_BugCatchingContest_Ch1: ; f7c22
--- a/audio/music/burnedtower.asm
+++ b/audio/music/burnedtower.asm
@@ -1,8 +1,8 @@
Music_BurnedTower: ; f6a99
- dbw $c0, Music_BurnedTower_Ch1
- dbw $01, Music_BurnedTower_Ch2
- dbw $02, Music_BurnedTower_Ch3
- dbw $03, Music_BurnedTower_Ch4
+ musicheader 4, 1, Music_BurnedTower_Ch1
+ musicheader 1, 2, Music_BurnedTower_Ch2
+ musicheader 1, 3, Music_BurnedTower_Ch3
+ musicheader 1, 4, Music_BurnedTower_Ch4
; f6aa5
Music_BurnedTower_Ch1: ; f6aa5
--- a/audio/music/celadoncity.asm
+++ b/audio/music/celadoncity.asm
@@ -1,7 +1,7 @@
Music_CeladonCity: ; f435b
- dbw $80, Music_CeladonCity_Ch1
- dbw $01, Music_CeladonCity_Ch2
- dbw $02, Music_CeladonCity_Ch3
+ musicheader 3, 1, Music_CeladonCity_Ch1
+ musicheader 1, 2, Music_CeladonCity_Ch2
+ musicheader 1, 3, Music_CeladonCity_Ch3
; f4364
Music_CeladonCity_Ch1: ; f4364
--- a/audio/music/championbattle.asm
+++ b/audio/music/championbattle.asm
@@ -1,7 +1,7 @@
Music_ChampionBattle: ; ea9c1
- dbw $80, Music_ChampionBattle_Ch1
- dbw $01, Music_ChampionBattle_Ch2
- dbw $02, Music_ChampionBattle_Ch3
+ musicheader 3, 1, Music_ChampionBattle_Ch1
+ musicheader 1, 2, Music_ChampionBattle_Ch2
+ musicheader 1, 3, Music_ChampionBattle_Ch3
; ea9ca
Music_ChampionBattle_Ch1: ; ea9ca
--- a/audio/music/cherrygrovecity.asm
+++ b/audio/music/cherrygrovecity.asm
@@ -1,8 +1,8 @@
Music_CherrygroveCity: ; f5b03
- dbw $c0, Music_CherrygroveCity_Ch1
- dbw $01, Music_CherrygroveCity_Ch2
- dbw $02, Music_CherrygroveCity_Ch3
- dbw $03, Music_CherrygroveCity_Ch4
+ musicheader 4, 1, Music_CherrygroveCity_Ch1
+ musicheader 1, 2, Music_CherrygroveCity_Ch2
+ musicheader 1, 3, Music_CherrygroveCity_Ch3
+ musicheader 1, 4, Music_CherrygroveCity_Ch4
; f5b0f
Music_CherrygroveCity_Ch1: ; f5b0f
--- a/audio/music/clair.asm
+++ b/audio/music/clair.asm
@@ -1,8 +1,8 @@
Music_Clair: ; 1fa8d
- dbw $c0, Music_Clair_Ch1
- dbw $01, Music_Clair_Ch2
- dbw $02, Music_Clair_Ch3
- dbw $03, Music_Clair_Ch4
+ musicheader 4, 1, Music_Clair_Ch1
+ musicheader 1, 2, Music_Clair_Ch2
+ musicheader 1, 3, Music_Clair_Ch3
+ musicheader 1, 4, Music_Clair_Ch4
; 1fa99
Music_Clair_Ch1: ; 1fa99
--- a/audio/music/contestresults.asm
+++ b/audio/music/contestresults.asm
@@ -1,8 +1,8 @@
Music_ContestResults: ; efb3e
- dbw $c0, Music_ContestResults_Ch1
- dbw $01, Music_ContestResults_Ch2
- dbw $02, Music_ContestResults_Ch3
- dbw $03, Music_ContestResults_Ch4
+ musicheader 4, 1, Music_ContestResults_Ch1
+ musicheader 1, 2, Music_ContestResults_Ch2
+ musicheader 1, 3, Music_ContestResults_Ch3
+ musicheader 1, 4, Music_ContestResults_Ch4
; efb4a
Music_ContestResults_Ch1: ; efb4a
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -1,8 +1,8 @@
Music_Credits: ; 1f31c
- dbw $c0, Music_Credits_Ch1
- dbw $01, Music_Credits_Ch2
- dbw $02, Music_Credits_Ch3
- dbw $03, Music_Credits_Ch4
+ musicheader 4, 1, Music_Credits_Ch1
+ musicheader 1, 2, Music_Credits_Ch2
+ musicheader 1, 3, Music_Credits_Ch3
+ musicheader 1, 4, Music_Credits_Ch4
; 1f328
Music_Credits_Ch1: ; 1f328
--- a/audio/music/crystalopening.asm
+++ b/audio/music/crystalopening.asm
@@ -1,8 +1,8 @@
Music_CrystalOpening: ; 1786e8
- dbw $c0, Music_CrystalOpening_Ch1
- dbw $01, Music_CrystalOpening_Ch2
- dbw $02, Music_CrystalOpening_Ch3
- dbw $03, Music_CrystalOpening_Ch4
+ musicheader 4, 1, Music_CrystalOpening_Ch1
+ musicheader 1, 2, Music_CrystalOpening_Ch2
+ musicheader 1, 3, Music_CrystalOpening_Ch3
+ musicheader 1, 4, Music_CrystalOpening_Ch4
; 1786f4
Music_CrystalOpening_Ch1: ; 1786f4
--- a/audio/music/dancinghall.asm
+++ b/audio/music/dancinghall.asm
@@ -1,7 +1,7 @@
Music_DancingHall: ; ef9bc
- dbw $80, Music_DancingHall_Ch1
- dbw $01, Music_DancingHall_Ch2
- dbw $02, Music_DancingHall_Ch3
+ musicheader 3, 1, Music_DancingHall_Ch1
+ musicheader 1, 2, Music_DancingHall_Ch2
+ musicheader 1, 3, Music_DancingHall_Ch3
; ef9c5
db $3
--- a/audio/music/darkcave.asm
+++ b/audio/music/darkcave.asm
@@ -1,8 +1,8 @@
Music_DarkCave: ; ea2be
- dbw $c0, Music_DarkCave_Ch1
- dbw $01, Music_DarkCave_Ch2
- dbw $02, Music_DarkCave_Ch3
- dbw $03, Music_DarkCave_Ch4
+ musicheader 4, 1, Music_DarkCave_Ch1
+ musicheader 1, 2, Music_DarkCave_Ch2
+ musicheader 1, 3, Music_DarkCave_Ch3
+ musicheader 1, 4, Music_DarkCave_Ch4
; ea2ca
Music_DarkCave_Ch1: ; ea2ca
--- a/audio/music/dragonsden.asm
+++ b/audio/music/dragonsden.asm
@@ -1,8 +1,8 @@
Music_DragonsDen: ; eece8
- dbw $c0, Music_DragonsDen_Ch1
- dbw $01, Music_DragonsDen_Ch2
- dbw $02, Music_DragonsDen_Ch3
- dbw $03, Music_DragonsDen_Ch4
+ musicheader 4, 1, Music_DragonsDen_Ch1
+ musicheader 1, 2, Music_DragonsDen_Ch2
+ musicheader 1, 3, Music_DragonsDen_Ch3
+ musicheader 1, 4, Music_DragonsDen_Ch4
; eecf4
Music_DragonsDen_Ch1: ; eecf4
--- a/audio/music/ecruteakcity.asm
+++ b/audio/music/ecruteakcity.asm
@@ -1,7 +1,7 @@
Music_EcruteakCity: ; ef2d0
- dbw $80, Music_EcruteakCity_Ch1
- dbw $01, Music_EcruteakCity_Ch2
- dbw $02, Music_EcruteakCity_Ch3
+ musicheader 3, 1, Music_EcruteakCity_Ch1
+ musicheader 1, 2, Music_EcruteakCity_Ch2
+ musicheader 1, 3, Music_EcruteakCity_Ch3
; ef2d9
Music_EcruteakCity_Ch1: ; ef2d9
--- a/audio/music/elmslab.asm
+++ b/audio/music/elmslab.asm
@@ -1,8 +1,8 @@
Music_ElmsLab: ; ea040
- dbw $c0, Music_ElmsLab_Ch1
- dbw $01, Music_ElmsLab_Ch2
- dbw $02, Music_ElmsLab_Ch3
- dbw $03, Music_ElmsLab_Ch4
+ musicheader 4, 1, Music_ElmsLab_Ch1
+ musicheader 1, 2, Music_ElmsLab_Ch2
+ musicheader 1, 3, Music_ElmsLab_Ch3
+ musicheader 1, 4, Music_ElmsLab_Ch4
; ea04c
Music_ElmsLab_Ch1: ; ea04c
--- a/audio/music/evolution.asm
+++ b/audio/music/evolution.asm
@@ -1,8 +1,8 @@
Music_Evolution: ; f06e1
- dbw $c0, Music_Evolution_Ch1
- dbw $01, Music_Evolution_Ch2
- dbw $02, Music_Evolution_Ch3
- dbw $03, Music_Evolution_Ch4
+ musicheader 4, 1, Music_Evolution_Ch1
+ musicheader 1, 2, Music_Evolution_Ch2
+ musicheader 1, 3, Music_Evolution_Ch3
+ musicheader 1, 4, Music_Evolution_Ch4
; f06ed
Music_Evolution_Ch1: ; f06ed
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -1,8 +1,8 @@
Music_GameCorner: ; edd6d
- dbw $c0, Music_GameCorner_Ch1
- dbw $01, Music_GameCorner_Ch2
- dbw $02, Music_GameCorner_Ch3
- dbw $03, Music_GameCorner_Ch4
+ musicheader 4, 1, Music_GameCorner_Ch1
+ musicheader 1, 2, Music_GameCorner_Ch2
+ musicheader 1, 3, Music_GameCorner_Ch3
+ musicheader 1, 4, Music_GameCorner_Ch4
; edd79
Music_GameCorner_Ch1: ; edd79
--- a/audio/music/goldenrodcity.asm
+++ b/audio/music/goldenrodcity.asm
@@ -1,8 +1,8 @@
Music_GoldenrodCity: ; eb453
- dbw $c0, Music_GoldenrodCity_Ch1
- dbw $01, Music_GoldenrodCity_Ch2
- dbw $02, Music_GoldenrodCity_Ch3
- dbw $03, Music_GoldenrodCity_Ch4
+ musicheader 4, 1, Music_GoldenrodCity_Ch1
+ musicheader 1, 2, Music_GoldenrodCity_Ch2
+ musicheader 1, 3, Music_GoldenrodCity_Ch3
+ musicheader 1, 4, Music_GoldenrodCity_Ch4
; eb45f
Music_GoldenrodCity_Ch1: ; eb45f
--- a/audio/music/goldsilveropening.asm
+++ b/audio/music/goldsilveropening.asm
@@ -1,7 +1,7 @@
Music_GoldSilverOpening: ; f7055
- dbw $80, Music_GoldSilverOpening_Ch1
- dbw $01, Music_GoldSilverOpening_Ch2
- dbw $02, Music_GoldSilverOpening_Ch3
+ musicheader 3, 1, Music_GoldSilverOpening_Ch1
+ musicheader 1, 2, Music_GoldSilverOpening_Ch2
+ musicheader 1, 3, Music_GoldSilverOpening_Ch3
; f705e
Music_GoldSilverOpening_Ch1: ; f705e
--- a/audio/music/goldsilveropening2.asm
+++ b/audio/music/goldsilveropening2.asm
@@ -1,8 +1,8 @@
Music_GoldSilverOpening2: ; f7308
- dbw $c0, Music_GoldSilverOpening2_Ch1
- dbw $01, Music_GoldSilverOpening2_Ch2
- dbw $02, Music_GoldSilverOpening2_Ch3
- dbw $03, Music_GoldSilverOpening2_Ch4
+ musicheader 4, 1, Music_GoldSilverOpening2_Ch1
+ musicheader 1, 2, Music_GoldSilverOpening2_Ch2
+ musicheader 1, 3, Music_GoldSilverOpening2_Ch3
+ musicheader 1, 4, Music_GoldSilverOpening2_Ch4
; f7314
Music_GoldSilverOpening2_Ch1: ; f7314
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -1,8 +1,8 @@
Music_Gym: ; f48ae
- dbw $c0, Music_Gym_Ch1
- dbw $01, Music_Gym_Ch2
- dbw $02, Music_Gym_Ch3
- dbw $03, Music_Gym_Ch4
+ musicheader 4, 1, Music_Gym_Ch1
+ musicheader 1, 2, Music_Gym_Ch2
+ musicheader 1, 3, Music_Gym_Ch3
+ musicheader 1, 4, Music_Gym_Ch4
; f48ba
Music_Gym_Ch1: ; f48ba
--- a/audio/music/gymleadervictory.asm
+++ b/audio/music/gymleadervictory.asm
@@ -1,8 +1,8 @@
Music_GymLeaderVictory: ; f462c
- dbw $c0, Music_GymLeaderVictory_Ch1
- dbw $01, Music_GymLeaderVictory_Ch2
- dbw $02, Music_GymLeaderVictory_Ch3
- dbw $03, Music_GymLeaderVictory_Ch4
+ musicheader 4, 1, Music_GymLeaderVictory_Ch1
+ musicheader 1, 2, Music_GymLeaderVictory_Ch2
+ musicheader 1, 3, Music_GymLeaderVictory_Ch3
+ musicheader 1, 4, Music_GymLeaderVictory_Ch4
; f4638
Music_GymLeaderVictory_Ch1: ; f4638
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -1,8 +1,8 @@
Music_HallOfFame: ; f05bf
- dbw $c0, Music_HallOfFame_Ch1
- dbw $01, Music_HallOfFame_Ch2
- dbw $02, Music_HallOfFame_Ch3
- dbw $03, Music_HallOfFame_Ch4
+ musicheader 4, 1, Music_HallOfFame_Ch1
+ musicheader 1, 2, Music_HallOfFame_Ch2
+ musicheader 1, 3, Music_HallOfFame_Ch3
+ musicheader 1, 4, Music_HallOfFame_Ch4
; f05cb
Music_HallOfFame_Ch1: ; f05cb
--- a/audio/music/healpokemon.asm
+++ b/audio/music/healpokemon.asm
@@ -1,7 +1,7 @@
Music_HealPokemon: ; f0697
- dbw $80, Music_HealPokemon_Ch1
- dbw $01, Music_HealPokemon_Ch2
- dbw $02, Music_HealPokemon_Ch3
+ musicheader 3, 1, Music_HealPokemon_Ch1
+ musicheader 1, 2, Music_HealPokemon_Ch2
+ musicheader 1, 3, Music_HealPokemon_Ch3
; f06a0
Music_HealPokemon_Ch1: ; f06a0
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -1,8 +1,8 @@
Music_IndigoPlateau: ; ee852
- dbw $c0, Music_IndigoPlateau_Ch1
- dbw $01, Music_IndigoPlateau_Ch2
- dbw $02, Music_IndigoPlateau_Ch3
- dbw $03, Music_IndigoPlateau_Ch4
+ musicheader 4, 1, Music_IndigoPlateau_Ch1
+ musicheader 1, 2, Music_IndigoPlateau_Ch2
+ musicheader 1, 3, Music_IndigoPlateau_Ch3
+ musicheader 1, 4, Music_IndigoPlateau_Ch4
; ee85e
Music_IndigoPlateau_Ch1: ; ee85e
--- a/audio/music/johtogymbattle.asm
+++ b/audio/music/johtogymbattle.asm
@@ -1,7 +1,7 @@
Music_JohtoGymBattle: ; ea50d
- dbw $80, Music_JohtoGymBattle_Ch1
- dbw $01, Music_JohtoGymBattle_Ch2
- dbw $02, Music_JohtoGymBattle_Ch3
+ musicheader 3, 1, Music_JohtoGymBattle_Ch1
+ musicheader 1, 2, Music_JohtoGymBattle_Ch2
+ musicheader 1, 3, Music_JohtoGymBattle_Ch3
; ea516
Music_JohtoGymBattle_Ch1: ; ea516
--- a/audio/music/johtotrainerbattle.asm
+++ b/audio/music/johtotrainerbattle.asm
@@ -1,7 +1,7 @@
Music_JohtoTrainerBattle: ; f6096
- dbw $80, Music_JohtoTrainerBattle_Ch1
- dbw $01, Music_JohtoTrainerBattle_Ch2
- dbw $02, Music_JohtoTrainerBattle_Ch3
+ musicheader 3, 1, Music_JohtoTrainerBattle_Ch1
+ musicheader 1, 2, Music_JohtoTrainerBattle_Ch2
+ musicheader 1, 3, Music_JohtoTrainerBattle_Ch3
; f609f
Music_JohtoTrainerBattle_Ch1: ; f609f
--- a/audio/music/johtowildbattle.asm
+++ b/audio/music/johtowildbattle.asm
@@ -1,7 +1,7 @@
Music_JohtoWildBattle: ; f5dc5
- dbw $80, Music_JohtoWildBattle_Ch1
- dbw $01, Music_JohtoWildBattle_Ch2
- dbw $02, Music_JohtoWildBattle_Ch3
+ musicheader 3, 1, Music_JohtoWildBattle_Ch1
+ musicheader 1, 2, Music_JohtoWildBattle_Ch2
+ musicheader 1, 3, Music_JohtoWildBattle_Ch3
; f5dce
Music_JohtoWildBattle_Ch1: ; f5dce
--- a/audio/music/johtowildbattlenight.asm
+++ b/audio/music/johtowildbattlenight.asm
@@ -1,7 +1,7 @@
Music_JohtoWildBattleNight: ; f605c
- dbw $80, Music_JohtoWildBattleNight_Ch1
- dbw $01, Music_JohtoWildBattleNight_Ch2
- dbw $02, Music_JohtoWildBattleNight_Ch3
+ musicheader 3, 1, Music_JohtoWildBattleNight_Ch1
+ musicheader 1, 2, Music_JohtoWildBattleNight_Ch2
+ musicheader 1, 3, Music_JohtoWildBattleNight_Ch3
; f6065
Music_JohtoWildBattleNight_Ch1: ; f6065
--- a/audio/music/kantogymbattle.asm
+++ b/audio/music/kantogymbattle.asm
@@ -1,7 +1,7 @@
Music_KantoGymBattle: ; ec720
- dbw $80, Music_KantoGymBattle_Ch1
- dbw $01, Music_KantoGymBattle_Ch2
- dbw $02, Music_KantoGymBattle_Ch3
+ musicheader 3, 1, Music_KantoGymBattle_Ch1
+ musicheader 1, 2, Music_KantoGymBattle_Ch2
+ musicheader 1, 3, Music_KantoGymBattle_Ch3
; ec729
Music_KantoGymBattle_Ch1: ; ec729
--- a/audio/music/kantotrainerbattle.asm
+++ b/audio/music/kantotrainerbattle.asm
@@ -1,7 +1,7 @@
Music_KantoTrainerBattle: ; ec9fa
- dbw $80, Music_KantoTrainerBattle_Ch1
- dbw $01, Music_KantoTrainerBattle_Ch2
- dbw $02, Music_KantoTrainerBattle_Ch3
+ musicheader 3, 1, Music_KantoTrainerBattle_Ch1
+ musicheader 1, 2, Music_KantoTrainerBattle_Ch2
+ musicheader 1, 3, Music_KantoTrainerBattle_Ch3
; eca03
db $3
--- a/audio/music/kantowildbattle.asm
+++ b/audio/music/kantowildbattle.asm
@@ -1,7 +1,7 @@
Music_KantoWildBattle: ; ed06d
- dbw $80, Music_KantoWildBattle_Ch1
- dbw $01, Music_KantoWildBattle_Ch2
- dbw $02, Music_KantoWildBattle_Ch3
+ musicheader 3, 1, Music_KantoWildBattle_Ch1
+ musicheader 1, 2, Music_KantoWildBattle_Ch2
+ musicheader 1, 3, Music_KantoWildBattle_Ch3
; ed076
db $3
--- a/audio/music/lakeofrage.asm
+++ b/audio/music/lakeofrage.asm
@@ -1,8 +1,8 @@
Music_LakeOfRage: ; ee6c5
- dbw $c0, Music_LakeOfRage_Ch1
- dbw $01, Music_LakeOfRage_Ch2
- dbw $02, Music_LakeOfRage_Ch3
- dbw $03, Music_LakeOfRage_Ch4
+ musicheader 4, 1, Music_LakeOfRage_Ch1
+ musicheader 1, 2, Music_LakeOfRage_Ch2
+ musicheader 1, 3, Music_LakeOfRage_Ch3
+ musicheader 1, 4, Music_LakeOfRage_Ch4
; ee6d1
Music_LakeOfRage_Ch1: ; ee6d1
--- a/audio/music/lakeofragerocketradio.asm
+++ b/audio/music/lakeofragerocketradio.asm
@@ -1,7 +1,7 @@
Music_LakeOfRageRocketRadio: ; ef5b1
- dbw $80, Music_LakeOfRageRocketRadio_Ch1
- dbw $01, Music_LakeOfRageRocketRadio_Ch2
- dbw $02, Music_LakeOfRageRocketRadio_Ch3
+ musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1
+ musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2
+ musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3
; ef5ba
Music_LakeOfRageRocketRadio_Ch1: ; ef5ba
--- a/audio/music/lavendertown.asm
+++ b/audio/music/lavendertown.asm
@@ -1,7 +1,7 @@
Music_LavenderTown: ; ef72f
- dbw $80, Music_LavenderTown_Ch1
- dbw $01, Music_LavenderTown_Ch2
- dbw $02, Music_LavenderTown_Ch3
+ musicheader 3, 1, Music_LavenderTown_Ch1
+ musicheader 1, 2, Music_LavenderTown_Ch2
+ musicheader 1, 3, Music_LavenderTown_Ch3
; ef738
db $3
--- a/audio/music/lighthouse.asm
+++ b/audio/music/lighthouse.asm
@@ -1,8 +1,8 @@
Music_Lighthouse: ; ee569
- dbw $c0, Music_Lighthouse_Ch1
- dbw $01, Music_Lighthouse_Ch2
- dbw $02, Music_Lighthouse_Ch3
- dbw $03, Music_Lighthouse_Ch4
+ musicheader 4, 1, Music_Lighthouse_Ch1
+ musicheader 1, 2, Music_Lighthouse_Ch2
+ musicheader 1, 3, Music_Lighthouse_Ch3
+ musicheader 1, 4, Music_Lighthouse_Ch4
; ee575
Music_Lighthouse_Ch1: ; ee575
--- a/audio/music/lookbeauty.asm
+++ b/audio/music/lookbeauty.asm
@@ -1,8 +1,8 @@
Music_LookBeauty: ; eee3e
- dbw $c0, Music_LookBeauty_Ch1
- dbw $01, Music_LookBeauty_Ch2
- dbw $02, Music_LookBeauty_Ch3
- dbw $03, Music_LookBeauty_Ch4
+ musicheader 4, 1, Music_LookBeauty_Ch1
+ musicheader 1, 2, Music_LookBeauty_Ch2
+ musicheader 1, 3, Music_LookBeauty_Ch3
+ musicheader 1, 4, Music_LookBeauty_Ch4
; eee4a
Music_LookBeauty_Ch1: ; eee4a
--- a/audio/music/lookhiker.asm
+++ b/audio/music/lookhiker.asm
@@ -1,8 +1,8 @@
Music_LookHiker: ; f7411
- dbw $c0, Music_LookHiker_Ch1
- dbw $01, Music_LookHiker_Ch2
- dbw $02, Music_LookHiker_Ch3
- dbw $03, Music_LookHiker_Ch4
+ musicheader 4, 1, Music_LookHiker_Ch1
+ musicheader 1, 2, Music_LookHiker_Ch2
+ musicheader 1, 3, Music_LookHiker_Ch3
+ musicheader 1, 4, Music_LookHiker_Ch4
; f741d
Music_LookHiker_Ch1: ; f741d
--- a/audio/music/lookkimonogirl.asm
+++ b/audio/music/lookkimonogirl.asm
@@ -1,7 +1,7 @@
Music_LookKimonoGirl: ; f79b8
- dbw $80, Music_LookKimonoGirl_Ch1
- dbw $01, Music_LookKimonoGirl_Ch2
- dbw $02, Music_LookKimonoGirl_Ch3
+ musicheader 3, 1, Music_LookKimonoGirl_Ch1
+ musicheader 1, 2, Music_LookKimonoGirl_Ch2
+ musicheader 1, 3, Music_LookKimonoGirl_Ch3
; f79c1
db $3
--- a/audio/music/looklass.asm
+++ b/audio/music/looklass.asm
@@ -1,8 +1,8 @@
Music_LookLass: ; ed79b
- dbw $c0, Music_LookLass_Ch1
- dbw $01, Music_LookLass_Ch2
- dbw $02, Music_LookLass_Ch3
- dbw $03, Music_LookLass_Ch4
+ musicheader 4, 1, Music_LookLass_Ch1
+ musicheader 1, 2, Music_LookLass_Ch2
+ musicheader 1, 3, Music_LookLass_Ch3
+ musicheader 1, 4, Music_LookLass_Ch4
; ed7a7
Music_LookLass_Ch1: ; ed7a7
--- a/audio/music/lookmysticalman.asm
+++ b/audio/music/lookmysticalman.asm
@@ -1,8 +1,8 @@
Music_LookMysticalMan: ; 17843b
- dbw $c0, Music_LookMysticalMan_Ch1
- dbw $01, Music_LookMysticalMan_Ch2
- dbw $02, Music_LookMysticalMan_Ch3
- dbw $03, Music_LookMysticalMan_Ch4
+ musicheader 4, 1, Music_LookMysticalMan_Ch1
+ musicheader 1, 2, Music_LookMysticalMan_Ch2
+ musicheader 1, 3, Music_LookMysticalMan_Ch3
+ musicheader 1, 4, Music_LookMysticalMan_Ch4
; 178447
Music_LookMysticalMan_Ch1: ; 178447
--- a/audio/music/lookofficer.asm
+++ b/audio/music/lookofficer.asm
@@ -1,7 +1,7 @@
Music_LookOfficer: ; ed82d
- dbw $80, Music_LookOfficer_Ch1
- dbw $01, Music_LookOfficer_Ch2
- dbw $02, Music_LookOfficer_Ch3
+ musicheader 3, 1, Music_LookOfficer_Ch1
+ musicheader 1, 2, Music_LookOfficer_Ch2
+ musicheader 1, 3, Music_LookOfficer_Ch3
; ed836
Music_LookOfficer_Ch1: ; ed836
--- a/audio/music/lookpokemaniac.asm
+++ b/audio/music/lookpokemaniac.asm
@@ -1,7 +1,7 @@
Music_LookPokemaniac: ; ebde1
- dbw $80, Music_LookPokemaniac_Ch1
- dbw $01, Music_LookPokemaniac_Ch2
- dbw $02, Music_LookPokemaniac_Ch3
+ musicheader 3, 1, Music_LookPokemaniac_Ch1
+ musicheader 1, 2, Music_LookPokemaniac_Ch2
+ musicheader 1, 3, Music_LookPokemaniac_Ch3
; ebdea
Music_LookPokemaniac_Ch1: ; ebdea
--- a/audio/music/lookrival.asm
+++ b/audio/music/lookrival.asm
@@ -1,8 +1,8 @@
Music_LookRival: ; f4f79
- dbw $c0, Music_LookRival_Ch1
- dbw $01, Music_LookRival_Ch2
- dbw $02, Music_LookRival_Ch3
- dbw $03, Music_LookRival_Ch4
+ musicheader 4, 1, Music_LookRival_Ch1
+ musicheader 1, 2, Music_LookRival_Ch2
+ musicheader 1, 3, Music_LookRival_Ch3
+ musicheader 1, 4, Music_LookRival_Ch4
; f4f85
Music_LookRival_Ch1: ; f4f85
--- a/audio/music/lookrocket.asm
+++ b/audio/music/lookrocket.asm
@@ -1,8 +1,8 @@
Music_LookRocket: ; f74a2
- dbw $c0, Music_LookRocket_Ch1
- dbw $01, Music_LookRocket_Ch2
- dbw $02, Music_LookRocket_Ch3
- dbw $03, Music_LookRocket_Ch4
+ musicheader 4, 1, Music_LookRocket_Ch1
+ musicheader 1, 2, Music_LookRocket_Ch2
+ musicheader 1, 3, Music_LookRocket_Ch3
+ musicheader 1, 4, Music_LookRocket_Ch4
; f74ae
Music_LookRocket_Ch1: ; f74ae
--- a/audio/music/looksage.asm
+++ b/audio/music/looksage.asm
@@ -1,6 +1,6 @@
Music_LookSage: ; ee35e
- dbw $40, Music_LookSage_Ch1
- dbw $02, Music_LookSage_Ch3
+ musicheader 2, 1, Music_LookSage_Ch1
+ musicheader 1, 3, Music_LookSage_Ch3
; ee364
Music_LookSage_Ch1: ; ee364
--- a/audio/music/lookyoungster.asm
+++ b/audio/music/lookyoungster.asm
@@ -1,7 +1,7 @@
Music_LookYoungster: ; f66c3
- dbw $80, Music_LookYoungster_Ch1
- dbw $01, Music_LookYoungster_Ch2
- dbw $02, Music_LookYoungster_Ch3
+ musicheader 3, 1, Music_LookYoungster_Ch1
+ musicheader 1, 2, Music_LookYoungster_Ch2
+ musicheader 1, 3, Music_LookYoungster_Ch3
; f66cc
Music_LookYoungster_Ch1: ; f66cc
--- a/audio/music/magnettrain.asm
+++ b/audio/music/magnettrain.asm
@@ -1,8 +1,8 @@
Music_MagnetTrain: ; ef5f0
- dbw $c0, Music_MagnetTrain_Ch1
- dbw $01, Music_MagnetTrain_Ch2
- dbw $02, Music_MagnetTrain_Ch3
- dbw $03, Music_MagnetTrain_Ch4
+ musicheader 4, 1, Music_MagnetTrain_Ch1
+ musicheader 1, 2, Music_MagnetTrain_Ch2
+ musicheader 1, 3, Music_MagnetTrain_Ch3
+ musicheader 1, 4, Music_MagnetTrain_Ch4
; ef5fc
Music_MagnetTrain_Ch1: ; ef5fc
--- a/audio/music/mainmenu.asm
+++ b/audio/music/mainmenu.asm
@@ -1,8 +1,8 @@
Music_MainMenu: ; f78fd
- dbw $c0, Music_MainMenu_Ch1
- dbw $01, Music_MainMenu_Ch2
- dbw $02, Music_MainMenu_Ch3
- dbw $03, Music_MainMenu_Ch4
+ musicheader 4, 1, Music_MainMenu_Ch1
+ musicheader 1, 2, Music_MainMenu_Ch2
+ musicheader 1, 3, Music_MainMenu_Ch3
+ musicheader 1, 4, Music_MainMenu_Ch4
; f7909
Music_MainMenu_Ch1: ; f7909
--- a/audio/music/mobileadapter.asm
+++ b/audio/music/mobileadapter.asm
@@ -1,8 +1,8 @@
Music_MobileAdapter: ; 1fc87
- dbw $c0, Music_MobileAdapter_Ch1
- dbw $01, Music_MobileAdapter_Ch2
- dbw $02, Music_MobileAdapter_Ch3
- dbw $03, Music_MobileAdapter_Ch4
+ musicheader 4, 1, Music_MobileAdapter_Ch1
+ musicheader 1, 2, Music_MobileAdapter_Ch2
+ musicheader 1, 3, Music_MobileAdapter_Ch3
+ musicheader 1, 4, Music_MobileAdapter_Ch4
; 1fc93
Music_MobileAdapter_Ch1: ; 1fc93
--- a/audio/music/mobileadaptermenu.asm
+++ b/audio/music/mobileadaptermenu.asm
@@ -1,7 +1,7 @@
Music_MobileAdapterMenu: ; 17801f
- dbw $80, Music_MobileAdapterMenu_Ch1
- dbw $01, Music_MobileAdapterMenu_Ch2
- dbw $02, Music_MobileAdapterMenu_Ch3
+ musicheader 3, 1, Music_MobileAdapterMenu_Ch1
+ musicheader 1, 2, Music_MobileAdapterMenu_Ch2
+ musicheader 1, 3, Music_MobileAdapterMenu_Ch3
; 178028
Music_MobileAdapterMenu_Ch1: ; 178028
--- a/audio/music/mobilecenter.asm
+++ b/audio/music/mobilecenter.asm
@@ -1,8 +1,8 @@
Music_MobileCenter: ; 17961d
- dbw $c0, Music_MobileCenter_Ch1
- dbw $01, Music_MobileCenter_Ch2
- dbw $02, Music_MobileCenter_Ch3
- dbw $03, Music_MobileCenter_Ch4
+ musicheader 4, 1, Music_MobileCenter_Ch1
+ musicheader 1, 2, Music_MobileCenter_Ch2
+ musicheader 1, 3, Music_MobileCenter_Ch3
+ musicheader 1, 4, Music_MobileCenter_Ch4
; 179629
Music_MobileCenter_Ch1: ; 179629
--- a/audio/music/mom.asm
+++ b/audio/music/mom.asm
@@ -1,7 +1,7 @@
Music_Mom: ; f6bf2
- dbw $81, Music_Mom_Ch2
- dbw $02, Music_Mom_Ch3
- dbw $03, Music_Mom_Ch4
+ musicheader 3, 2, Music_Mom_Ch2
+ musicheader 1, 3, Music_Mom_Ch3
+ musicheader 1, 4, Music_Mom_Ch4
; f6bfb
Music_Mom_Ch2: ; f6bfb
--- a/audio/music/mtmoon.asm
+++ b/audio/music/mtmoon.asm
@@ -1,8 +1,8 @@
Music_MtMoon: ; edb29
- dbw $c0, Music_MtMoon_Ch1
- dbw $01, Music_MtMoon_Ch2
- dbw $02, Music_MtMoon_Ch3
- dbw $03, Music_MtMoon_Ch4
+ musicheader 4, 1, Music_MtMoon_Ch1
+ musicheader 1, 2, Music_MtMoon_Ch2
+ musicheader 1, 3, Music_MtMoon_Ch3
+ musicheader 1, 4, Music_MtMoon_Ch4
; edb35
Music_MtMoon_Ch1: ; edb35
--- a/audio/music/mtmoonsquare.asm
+++ b/audio/music/mtmoonsquare.asm
@@ -1,6 +1,6 @@
Music_MtMoonSquare: ; f4815
- dbw $40, Music_MtMoonSquare_Ch1
- dbw $01, Music_MtMoonSquare_Ch2
+ musicheader 2, 1, Music_MtMoonSquare_Ch1
+ musicheader 1, 2, Music_MtMoonSquare_Ch2
; f481b
Music_MtMoonSquare_Ch1: ; f481b
--- a/audio/music/nationalpark.asm
+++ b/audio/music/nationalpark.asm
@@ -1,8 +1,8 @@
Music_NationalPark: ; f54e8
- dbw $c0, Music_NationalPark_Ch1
- dbw $01, Music_NationalPark_Ch2
- dbw $02, Music_NationalPark_Ch3
- dbw $03, Music_NationalPark_Ch4
+ musicheader 4, 1, Music_NationalPark_Ch1
+ musicheader 1, 2, Music_NationalPark_Ch2
+ musicheader 1, 3, Music_NationalPark_Ch3
+ musicheader 1, 4, Music_NationalPark_Ch4
; f54f4
Music_NationalPark_Ch1: ; f54f4
--- a/audio/music/newbarktown.asm
+++ b/audio/music/newbarktown.asm
@@ -1,7 +1,7 @@
Music_NewBarkTown: ; eb2d3
- dbw $80, Music_NewBarkTown_Ch1
- dbw $01, Music_NewBarkTown_Ch2
- dbw $02, Music_NewBarkTown_Ch3
+ musicheader 3, 1, Music_NewBarkTown_Ch1
+ musicheader 1, 2, Music_NewBarkTown_Ch2
+ musicheader 1, 3, Music_NewBarkTown_Ch3
; eb2dc
db $3
--- a/audio/music/nothing.asm
+++ b/audio/music/nothing.asm
@@ -1,8 +1,8 @@
Music_Nothing: ; e91a3
- dbw $c0, Music_Nothing_Ch1
- dbw $01, Music_Nothing_Ch2
- dbw $02, Music_Nothing_Ch3
- dbw $03, Music_Nothing_Ch4
+ musicheader 4, 1, Music_Nothing_Ch1
+ musicheader 1, 2, Music_Nothing_Ch2
+ musicheader 1, 3, Music_Nothing_Ch3
+ musicheader 1, 4, Music_Nothing_Ch4
; e91af
Music_Nothing_Ch1: ; e91af
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -1,7 +1,7 @@
Music_PalletTown: ; f4b0c
- dbw $80, Music_PalletTown_Ch1
- dbw $01, Music_PalletTown_Ch2
- dbw $02, Music_PalletTown_Ch3
+ musicheader 3, 1, Music_PalletTown_Ch1
+ musicheader 1, 2, Music_PalletTown_Ch2
+ musicheader 1, 3, Music_PalletTown_Ch3
; f4b15
Music_PalletTown_Ch1: ; f4b15
--- a/audio/music/pokeflutechannel.asm
+++ b/audio/music/pokeflutechannel.asm
@@ -1,7 +1,7 @@
Music_PokeFluteChannel: ; f7b13
- dbw $80, Music_PokeFluteChannel_Ch1
- dbw $01, Music_PokeFluteChannel_Ch2
- dbw $02, Music_PokeFluteChannel_Ch3
+ musicheader 3, 1, Music_PokeFluteChannel_Ch1
+ musicheader 1, 2, Music_PokeFluteChannel_Ch2
+ musicheader 1, 3, Music_PokeFluteChannel_Ch3
; f7b1c
Music_PokeFluteChannel_Ch1: ; f7b1c
--- a/audio/music/pokemoncenter.asm
+++ b/audio/music/pokemoncenter.asm
@@ -1,8 +1,8 @@
Music_PokemonCenter: ; ed5c6
- dbw $c0, Music_PokemonCenter_Ch1
- dbw $01, Music_PokemonCenter_Ch2
- dbw $02, Music_PokemonCenter_Ch3
- dbw $03, Music_PokemonCenter_Ch4
+ musicheader 4, 1, Music_PokemonCenter_Ch1
+ musicheader 1, 2, Music_PokemonCenter_Ch2
+ musicheader 1, 3, Music_PokemonCenter_Ch3
+ musicheader 1, 4, Music_PokemonCenter_Ch4
; ed5d2
Music_PokemonCenter_Ch1: ; ed5d2
--- a/audio/music/pokemonchannel.asm
+++ b/audio/music/pokemonchannel.asm
@@ -1,8 +1,8 @@
Music_PokemonChannel: ; ee45f
- dbw $c0, Music_PokemonChannel_Ch1
- dbw $01, Music_PokemonChannel_Ch2
- dbw $02, Music_PokemonChannel_Ch3
- dbw $03, Music_PokemonChannel_Ch4
+ musicheader 4, 1, Music_PokemonChannel_Ch1
+ musicheader 1, 2, Music_PokemonChannel_Ch2
+ musicheader 1, 3, Music_PokemonChannel_Ch3
+ musicheader 1, 4, Music_PokemonChannel_Ch4
; ee46b
Music_PokemonChannel_Ch1: ; ee46b
--- a/audio/music/pokemonlullaby.asm
+++ b/audio/music/pokemonlullaby.asm
@@ -1,7 +1,7 @@
Music_PokemonLullaby: ; f6d79
- dbw $80, Music_PokemonLullaby_Ch1
- dbw $01, Music_PokemonLullaby_Ch2
- dbw $02, Music_PokemonLullaby_Ch3
+ musicheader 3, 1, Music_PokemonLullaby_Ch1
+ musicheader 1, 2, Music_PokemonLullaby_Ch2
+ musicheader 1, 3, Music_PokemonLullaby_Ch3
; f6d82
Music_PokemonLullaby_Ch1: ; f6d82
--- a/audio/music/pokemonmarch.asm
+++ b/audio/music/pokemonmarch.asm
@@ -1,8 +1,8 @@
Music_PokemonMarch: ; f6e23
- dbw $c0, Music_PokemonMarch_Ch1
- dbw $01, Music_PokemonMarch_Ch2
- dbw $02, Music_PokemonMarch_Ch3
- dbw $03, Music_PokemonMarch_Ch4
+ musicheader 4, 1, Music_PokemonMarch_Ch1
+ musicheader 1, 2, Music_PokemonMarch_Ch2
+ musicheader 1, 3, Music_PokemonMarch_Ch3
+ musicheader 1, 4, Music_PokemonMarch_Ch4
; f6e2f
Music_PokemonMarch_Ch1: ; f6e2f
--- a/audio/music/postcredits.asm
+++ b/audio/music/postcredits.asm
@@ -1,6 +1,6 @@
Music_PostCredits: ; cfd9e
- dbw $40, Music_PostCredits_Ch1
- dbw $01, Music_PostCredits_Ch2
+ musicheader 2, 1, Music_PostCredits_Ch1
+ musicheader 1, 2, Music_PostCredits_Ch2
; cfda4
db $2
--- a/audio/music/printer.asm
+++ b/audio/music/printer.asm
@@ -1,5 +1,5 @@
Music_Printer: ; f07fd
- dbw $02, Music_Printer_Ch3
+ musicheader 1, 3, Music_Printer_Ch3
; f0800
Music_Printer_Ch3: ; f0800
--- a/audio/music/profoak.asm
+++ b/audio/music/profoak.asm
@@ -1,7 +1,7 @@
Music_ProfOak: ; f4dea
- dbw $80, Music_ProfOak_Ch1
- dbw $01, Music_ProfOak_Ch2
- dbw $02, Music_ProfOak_Ch3
+ musicheader 3, 1, Music_ProfOak_Ch1
+ musicheader 1, 2, Music_ProfOak_Ch2
+ musicheader 1, 3, Music_ProfOak_Ch3
; f4df3
Music_ProfOak_Ch1: ; f4df3
--- a/audio/music/profoakspokemontalk.asm
+++ b/audio/music/profoakspokemontalk.asm
@@ -1,7 +1,7 @@
Music_ProfOaksPokemonTalk: ; f4c9f
- dbw $80, Music_ProfOaksPokemonTalk_Ch1
- dbw $01, Music_ProfOaksPokemonTalk_Ch2
- dbw $02, Music_ProfOaksPokemonTalk_Ch3
+ musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1
+ musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2
+ musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3
; f4ca8
db $3
--- a/audio/music/rivalbattle.asm
+++ b/audio/music/rivalbattle.asm
@@ -1,7 +1,7 @@
Music_RivalBattle: ; e974f
- dbw $80, Music_RivalBattle_Ch1
- dbw $01, Music_RivalBattle_Ch2
- dbw $02, Music_RivalBattle_Ch3
+ musicheader 3, 1, Music_RivalBattle_Ch1
+ musicheader 1, 2, Music_RivalBattle_Ch2
+ musicheader 1, 3, Music_RivalBattle_Ch3
; e9758
Music_RivalBattle_Ch1: ; e9758
--- a/audio/music/rocketbattle.asm
+++ b/audio/music/rocketbattle.asm
@@ -1,7 +1,7 @@
Music_RocketBattle: ; e9b6f
- dbw $80, Music_RocketBattle_Ch1
- dbw $01, Music_RocketBattle_Ch2
- dbw $02, Music_RocketBattle_Ch3
+ musicheader 3, 1, Music_RocketBattle_Ch1
+ musicheader 1, 2, Music_RocketBattle_Ch2
+ musicheader 1, 3, Music_RocketBattle_Ch3
; e9b78
Music_RocketBattle_Ch1: ; e9b78
--- a/audio/music/rockethideout.asm
+++ b/audio/music/rockethideout.asm
@@ -1,8 +1,8 @@
Music_RocketHideout: ; eeb75
- dbw $c0, Music_RocketHideout_Ch1
- dbw $01, Music_RocketHideout_Ch2
- dbw $02, Music_RocketHideout_Ch3
- dbw $03, Music_RocketHideout_Ch4
+ musicheader 4, 1, Music_RocketHideout_Ch1
+ musicheader 1, 2, Music_RocketHideout_Ch2
+ musicheader 1, 3, Music_RocketHideout_Ch3
+ musicheader 1, 4, Music_RocketHideout_Ch4
; eeb81
Music_RocketHideout_Ch1: ; eeb81
--- a/audio/music/rockettheme.asm
+++ b/audio/music/rockettheme.asm
@@ -1,8 +1,8 @@
Music_RocketTheme: ; f766d
- dbw $c0, Music_RocketTheme_Ch1
- dbw $01, Music_RocketTheme_Ch2
- dbw $02, Music_RocketTheme_Ch3
- dbw $03, Music_RocketTheme_Ch4
+ musicheader 4, 1, Music_RocketTheme_Ch1
+ musicheader 1, 2, Music_RocketTheme_Ch2
+ musicheader 1, 3, Music_RocketTheme_Ch3
+ musicheader 1, 4, Music_RocketTheme_Ch4
; f7679
Music_RocketTheme_Ch1: ; f7679
--- a/audio/music/route1.asm
+++ b/audio/music/route1.asm
@@ -1,7 +1,7 @@
Music_Route1: ; ec000
- dbw $80, Music_Route1_Ch1
- dbw $01, Music_Route1_Ch2
- dbw $02, Music_Route1_Ch3
+ musicheader 3, 1, Music_Route1_Ch1
+ musicheader 1, 2, Music_Route1_Ch2
+ musicheader 1, 3, Music_Route1_Ch3
; ec009
db $3
--- a/audio/music/route12.asm
+++ b/audio/music/route12.asm
@@ -1,8 +1,8 @@
Music_Route12: ; ec506
- dbw $c0, Music_Route12_Ch1
- dbw $01, Music_Route12_Ch2
- dbw $02, Music_Route12_Ch3
- dbw $03, Music_Route12_Ch4
+ musicheader 4, 1, Music_Route12_Ch1
+ musicheader 1, 2, Music_Route12_Ch2
+ musicheader 1, 3, Music_Route12_Ch3
+ musicheader 1, 4, Music_Route12_Ch4
; ec512
Music_Route12_Ch1: ; ec512
--- a/audio/music/route2.asm
+++ b/audio/music/route2.asm
@@ -1,8 +1,8 @@
Music_Route2: ; ed8dd
- dbw $c0, Music_Route2_Ch1
- dbw $01, Music_Route2_Ch2
- dbw $02, Music_Route2_Ch3
- dbw $03, Music_Route2_Ch4
+ musicheader 4, 1, Music_Route2_Ch1
+ musicheader 1, 2, Music_Route2_Ch2
+ musicheader 1, 3, Music_Route2_Ch3
+ musicheader 1, 4, Music_Route2_Ch4
; ed8e9
Music_Route2_Ch1: ; ed8e9
--- a/audio/music/route26.asm
+++ b/audio/music/route26.asm
@@ -1,8 +1,8 @@
Music_Route26: ; eefb2
- dbw $c0, Music_Route26_Ch1
- dbw $01, Music_Route26_Ch2
- dbw $02, Music_Route26_Ch3
- dbw $03, Music_Route26_Ch4
+ musicheader 4, 1, Music_Route26_Ch1
+ musicheader 1, 2, Music_Route26_Ch2
+ musicheader 1, 3, Music_Route26_Ch3
+ musicheader 1, 4, Music_Route26_Ch4
; eefbe
Music_Route26_Ch1: ; eefbe
--- a/audio/music/route29.asm
+++ b/audio/music/route29.asm
@@ -1,8 +1,8 @@
Music_Route29: ; f0386
- dbw $c0, Music_Route29_Ch1
- dbw $01, Music_Route29_Ch2
- dbw $02, Music_Route29_Ch3
- dbw $03, Music_Route29_Ch4
+ musicheader 4, 1, Music_Route29_Ch1
+ musicheader 1, 2, Music_Route29_Ch2
+ musicheader 1, 3, Music_Route29_Ch3
+ musicheader 1, 4, Music_Route29_Ch4
; f0392
Music_Route29_Ch1: ; f0392
--- a/audio/music/route3.asm
+++ b/audio/music/route3.asm
@@ -1,8 +1,8 @@
Music_Route3: ; ec2ca
- dbw $c0, Music_Route3_Ch1
- dbw $01, Music_Route3_Ch2
- dbw $02, Music_Route3_Ch3
- dbw $03, Music_Route3_Ch4
+ musicheader 4, 1, Music_Route3_Ch1
+ musicheader 1, 2, Music_Route3_Ch2
+ musicheader 1, 3, Music_Route3_Ch3
+ musicheader 1, 4, Music_Route3_Ch4
; ec2d6
Music_Route3_Ch1: ; ec2d6
--- a/audio/music/route30.asm
+++ b/audio/music/route30.asm
@@ -1,8 +1,8 @@
Music_Route30: ; efc01
- dbw $c0, Music_Route30_Ch1
- dbw $01, Music_Route30_Ch2
- dbw $02, Music_Route30_Ch3
- dbw $03, Music_Route30_Ch4
+ musicheader 4, 1, Music_Route30_Ch1
+ musicheader 1, 2, Music_Route30_Ch2
+ musicheader 1, 3, Music_Route30_Ch3
+ musicheader 1, 4, Music_Route30_Ch4
; efc0d
Music_Route30_Ch1: ; efc0d
--- a/audio/music/route36.asm
+++ b/audio/music/route36.asm
@@ -1,8 +1,8 @@
Music_Route36: ; e94e9
- dbw $c0, Music_Route36_Ch1
- dbw $01, Music_Route36_Ch2
- dbw $02, Music_Route36_Ch3
- dbw $03, Music_Route36_Ch4
+ musicheader 4, 1, Music_Route36_Ch1
+ musicheader 1, 2, Music_Route36_Ch2
+ musicheader 1, 3, Music_Route36_Ch3
+ musicheader 1, 4, Music_Route36_Ch4
; e94f5
Music_Route36_Ch1: ; e94f5
--- a/audio/music/route37.asm
+++ b/audio/music/route37.asm
@@ -1,8 +1,8 @@
Music_Route37: ; ee94b
- dbw $c0, Music_Route37_Ch1
- dbw $01, Music_Route37_Ch2
- dbw $02, Music_Route37_Ch3
- dbw $03, Music_Route37_Ch4
+ musicheader 4, 1, Music_Route37_Ch1
+ musicheader 1, 2, Music_Route37_Ch2
+ musicheader 1, 3, Music_Route37_Ch3
+ musicheader 1, 4, Music_Route37_Ch4
; ee957
Music_Route37_Ch1: ; ee957
--- a/audio/music/ruinsofalphinterior.asm
+++ b/audio/music/ruinsofalphinterior.asm
@@ -1,7 +1,7 @@
Music_RuinsOfAlphInterior: ; ebd9e
- dbw $80, Music_RuinsOfAlphInterior_Ch1
- dbw $01, Music_RuinsOfAlphInterior_Ch2
- dbw $02, Music_RuinsOfAlphInterior_Ch3
+ musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1
+ musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2
+ musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3
; ebda7
Music_RuinsOfAlphInterior_Ch1: ; ebda7
--- a/audio/music/ruinsofalphradio.asm
+++ b/audio/music/ruinsofalphradio.asm
@@ -1,7 +1,7 @@
Music_RuinsOfAlphRadio: ; eedcb
- dbw $80, Music_RuinsOfAlphRadio_Ch1
- dbw $01, Music_RuinsOfAlphRadio_Ch2
- dbw $02, Music_RuinsOfAlphRadio_Ch3
+ musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1
+ musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2
+ musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3
; eedd4
Music_RuinsOfAlphRadio_Ch1: ; eedd4
--- a/audio/music/showmearound.asm
+++ b/audio/music/showmearound.asm
@@ -1,8 +1,8 @@
Music_ShowMeAround: ; edbd8
- dbw $c0, Music_ShowMeAround_Ch1
- dbw $01, Music_ShowMeAround_Ch2
- dbw $02, Music_ShowMeAround_Ch3
- dbw $03, Music_ShowMeAround_Ch4
+ musicheader 4, 1, Music_ShowMeAround_Ch1
+ musicheader 1, 2, Music_ShowMeAround_Ch2
+ musicheader 1, 3, Music_ShowMeAround_Ch3
+ musicheader 1, 4, Music_ShowMeAround_Ch4
; edbe4
Music_ShowMeAround_Ch1: ; edbe4
--- a/audio/music/sprouttower.asm
+++ b/audio/music/sprouttower.asm
@@ -1,8 +1,8 @@
Music_SproutTower: ; f6974
- dbw $c0, Music_SproutTower_Ch1
- dbw $01, Music_SproutTower_Ch2
- dbw $02, Music_SproutTower_Ch3
- dbw $03, Music_SproutTower_Ch4
+ musicheader 4, 1, Music_SproutTower_Ch1
+ musicheader 1, 2, Music_SproutTower_Ch2
+ musicheader 1, 3, Music_SproutTower_Ch3
+ musicheader 1, 4, Music_SproutTower_Ch4
; f6980
Music_SproutTower_Ch1: ; f6980
--- a/audio/music/ssaqua.asm
+++ b/audio/music/ssaqua.asm
@@ -1,8 +1,8 @@
Music_SSAqua: ; ead99
- dbw $c0, Music_SSAqua_Ch1
- dbw $01, Music_SSAqua_Ch2
- dbw $02, Music_SSAqua_Ch3
- dbw $03, Music_SSAqua_Ch4
+ musicheader 4, 1, Music_SSAqua_Ch1
+ musicheader 1, 2, Music_SSAqua_Ch2
+ musicheader 1, 3, Music_SSAqua_Ch3
+ musicheader 1, 4, Music_SSAqua_Ch4
; eada5
Music_SSAqua_Ch1: ; eada5
--- a/audio/music/successfulcapture.asm
+++ b/audio/music/successfulcapture.asm
@@ -1,7 +1,7 @@
Music_SuccessfulCapture: ; f4602
- dbw $80, Music_SuccessfulCapture_Ch1
- dbw $01, Music_SuccessfulCapture_Ch2
- dbw $02, Music_SuccessfulCapture_Ch3
+ musicheader 3, 1, Music_SuccessfulCapture_Ch1
+ musicheader 1, 2, Music_SuccessfulCapture_Ch2
+ musicheader 1, 3, Music_SuccessfulCapture_Ch3
; f460b
Music_SuccessfulCapture_Ch1: ; f460b
--- a/audio/music/suicunebattle.asm
+++ b/audio/music/suicunebattle.asm
@@ -1,7 +1,7 @@
Music_SuicuneBattle: ; 178b81
- dbw $80, Music_SuicuneBattle_Ch1
- dbw $01, Music_SuicuneBattle_Ch2
- dbw $02, Music_SuicuneBattle_Ch3
+ musicheader 3, 1, Music_SuicuneBattle_Ch1
+ musicheader 1, 2, Music_SuicuneBattle_Ch2
+ musicheader 1, 3, Music_SuicuneBattle_Ch3
; 178b8a
Music_SuicuneBattle_Ch1: ; 178b8a
--- a/audio/music/surf.asm
+++ b/audio/music/surf.asm
@@ -1,7 +1,7 @@
Music_Surf: ; f518a
- dbw $80, Music_Surf_Ch1
- dbw $01, Music_Surf_Ch2
- dbw $02, Music_Surf_Ch3
+ musicheader 3, 1, Music_Surf_Ch1
+ musicheader 1, 2, Music_Surf_Ch2
+ musicheader 1, 3, Music_Surf_Ch3
; f5193
db $3
--- a/audio/music/tintower.asm
+++ b/audio/music/tintower.asm
@@ -1,8 +1,8 @@
Music_TinTower: ; f6811
- dbw $c0, Music_TinTower_Ch1
- dbw $01, Music_TinTower_Ch2
- dbw $02, Music_TinTower_Ch3
- dbw $03, Music_TinTower_Ch4
+ musicheader 4, 1, Music_TinTower_Ch1
+ musicheader 1, 2, Music_TinTower_Ch2
+ musicheader 1, 3, Music_TinTower_Ch3
+ musicheader 1, 4, Music_TinTower_Ch4
; f681d
Music_TinTower_Ch1: ; f681d
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -1,8 +1,8 @@
Music_TitleScreen: ; eb808
- dbw $c0, Music_TitleScreen_Ch1
- dbw $01, Music_TitleScreen_Ch2
- dbw $02, Music_TitleScreen_Ch3
- dbw $03, Music_TitleScreen_Ch4
+ musicheader 4, 1, Music_TitleScreen_Ch1
+ musicheader 1, 2, Music_TitleScreen_Ch2
+ musicheader 1, 3, Music_TitleScreen_Ch3
+ musicheader 1, 4, Music_TitleScreen_Ch4
; eb814
Music_TitleScreen_Ch1: ; eb814
--- a/audio/music/trainervictory.asm
+++ b/audio/music/trainervictory.asm
@@ -1,7 +1,7 @@
Music_TrainerVictory: ; ebeab
- dbw $80, Music_TrainerVictory_Ch1
- dbw $01, Music_TrainerVictory_Ch2
- dbw $02, Music_TrainerVictory_Ch3
+ musicheader 3, 1, Music_TrainerVictory_Ch1
+ musicheader 1, 2, Music_TrainerVictory_Ch2
+ musicheader 1, 3, Music_TrainerVictory_Ch3
; ebeb4
Music_TrainerVictory_Ch1: ; ebeb4
--- a/audio/music/unioncave.asm
+++ b/audio/music/unioncave.asm
@@ -1,8 +1,8 @@
Music_UnionCave: ; f5c60
- dbw $c0, Music_UnionCave_Ch1
- dbw $01, Music_UnionCave_Ch2
- dbw $02, Music_UnionCave_Ch3
- dbw $03, Music_UnionCave_Ch4
+ musicheader 4, 1, Music_UnionCave_Ch1
+ musicheader 1, 2, Music_UnionCave_Ch2
+ musicheader 1, 3, Music_UnionCave_Ch3
+ musicheader 1, 4, Music_UnionCave_Ch4
; f5c6c
Music_UnionCave_Ch1: ; f5c6c
--- a/audio/music/vermilioncity.asm
+++ b/audio/music/vermilioncity.asm
@@ -1,7 +1,7 @@
Music_VermilionCity: ; eb676
- dbw $80, Music_VermilionCity_Ch1
- dbw $01, Music_VermilionCity_Ch2
- dbw $02, Music_VermilionCity_Ch3
+ musicheader 3, 1, Music_VermilionCity_Ch1
+ musicheader 1, 2, Music_VermilionCity_Ch2
+ musicheader 1, 3, Music_VermilionCity_Ch3
; eb67f
db $3
--- a/audio/music/victoryroad.asm
+++ b/audio/music/victoryroad.asm
@@ -1,8 +1,8 @@
Music_VictoryRoad: ; f6c72
- dbw $c0, Music_VictoryRoad_Ch1
- dbw $01, Music_VictoryRoad_Ch2
- dbw $02, Music_VictoryRoad_Ch3
- dbw $03, Music_VictoryRoad_Ch4
+ musicheader 4, 1, Music_VictoryRoad_Ch1
+ musicheader 1, 2, Music_VictoryRoad_Ch2
+ musicheader 1, 3, Music_VictoryRoad_Ch3
+ musicheader 1, 4, Music_VictoryRoad_Ch4
; f6c7e
Music_VictoryRoad_Ch1: ; f6c7e
--- a/audio/music/violetcity.asm
+++ b/audio/music/violetcity.asm
@@ -1,8 +1,8 @@
Music_VioletCity: ; f0000
- dbw $c0, Music_VioletCity_Ch1
- dbw $01, Music_VioletCity_Ch2
- dbw $02, Music_VioletCity_Ch3
- dbw $03, Music_VioletCity_Ch4
+ musicheader 4, 1, Music_VioletCity_Ch1
+ musicheader 1, 2, Music_VioletCity_Ch2
+ musicheader 1, 3, Music_VioletCity_Ch3
+ musicheader 1, 4, Music_VioletCity_Ch4
; f000c
Music_VioletCity_Ch1: ; f000c
--- a/audio/music/viridiancity.asm
+++ b/audio/music/viridiancity.asm
@@ -1,8 +1,8 @@
Music_ViridianCity: ; f4000
- dbw $c0, Music_ViridianCity_Ch1
- dbw $01, Music_ViridianCity_Ch2
- dbw $02, Music_ViridianCity_Ch3
- dbw $03, Music_ViridianCity_Ch4
+ musicheader 4, 1, Music_ViridianCity_Ch1
+ musicheader 1, 2, Music_ViridianCity_Ch2
+ musicheader 1, 3, Music_ViridianCity_Ch3
+ musicheader 1, 4, Music_ViridianCity_Ch4
; f400c
Music_ViridianCity_Ch1: ; f400c
--- a/audio/music/wildpokemonvictory.asm
+++ b/audio/music/wildpokemonvictory.asm
@@ -1,7 +1,7 @@
Music_WildPokemonVictory: ; f4518
- dbw $80, Music_WildPokemonVictory_Ch1
- dbw $01, Music_WildPokemonVictory_Ch2
- dbw $02, Music_WildPokemonVictory_Ch3
+ musicheader 3, 1, Music_WildPokemonVictory_Ch1
+ musicheader 1, 2, Music_WildPokemonVictory_Ch2
+ musicheader 1, 3, Music_WildPokemonVictory_Ch3
; f4521
Music_WildPokemonVictory_Ch1: ; f4521
--- a/audio/sfx.asm
+++ b/audio/sfx.asm
@@ -1,496 +1,496 @@
Sfx_PokeballsPlacedOnTable: ; f0941
- dbw $04, Sfx_PokeballsPlacedOnTable_Ch5
+ musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5
; f0944
Sfx_BallWiggle: ; f0944
- dbw $04, Sfx_BallWiggle_Ch5
+ musicheader 1, 5, Sfx_BallWiggle_Ch5
; f0947
Sfx_Potion: ; f0947
- dbw $04, Sfx_Potion_Ch5
+ musicheader 1, 5, Sfx_Potion_Ch5
; f094a
Sfx_FullHeal: ; f094a
- dbw $04, Sfx_FullHeal_Ch5
+ musicheader 1, 5, Sfx_FullHeal_Ch5
; f094d
Sfx_Menu: ; f094d
- dbw $07, Sfx_Menu_Ch8
+ musicheader 1, 8, Sfx_Menu_Ch8
; f0950
Sfx_ReadText2: ; f0950
Sfx_ReadText: ; f0950
- dbw $04, Sfx_ReadText2_Ch5
+ musicheader 1, 5, Sfx_ReadText2_Ch5
; f0953
Sfx_Poison: ; f0953
- dbw $04, Sfx_Poison_Ch5
+ musicheader 1, 5, Sfx_Poison_Ch5
; f0956
Sfx_GotSafariBalls: ; f0956
- dbw $04, Sfx_GotSafariBalls_Ch5
+ musicheader 1, 5, Sfx_GotSafariBalls_Ch5
; f0959
Sfx_BootPc: ; f0959
- dbw $04, Sfx_BootPc_Ch5
+ musicheader 1, 5, Sfx_BootPc_Ch5
; f095c
Sfx_ShutDownPc: ; f095c
- dbw $04, Sfx_ShutDownPc_Ch5
+ musicheader 1, 5, Sfx_ShutDownPc_Ch5
; f095f
Sfx_ChoosePcOption: ; f095f
- dbw $04, Sfx_ChoosePcOption_Ch5
+ musicheader 1, 5, Sfx_ChoosePcOption_Ch5
; f0962
Sfx_EscapeRope: ; f0962
- dbw $04, Sfx_EscapeRope_Ch5
+ musicheader 1, 5, Sfx_EscapeRope_Ch5
; f0965
Sfx_PushButton: ; f0965
- dbw $04, Sfx_PushButton_Ch5
+ musicheader 1, 5, Sfx_PushButton_Ch5
; f0968
Sfx_SecondPartOfItemfinder: ; f0968
- dbw $04, Sfx_SecondPartOfItemfinder_Ch5
+ musicheader 1, 5, Sfx_SecondPartOfItemfinder_Ch5
; f096b
Sfx_WarpTo: ; f096b
- dbw $04, Sfx_WarpTo_Ch5
+ musicheader 1, 5, Sfx_WarpTo_Ch5
; f096e
Sfx_WarpFrom: ; f096e
- dbw $04, Sfx_WarpFrom_Ch5
+ musicheader 1, 5, Sfx_WarpFrom_Ch5
; f0971
Sfx_ChangeDexMode: ; f0971
- dbw $04, Sfx_ChangeDexMode_Ch5
+ musicheader 1, 5, Sfx_ChangeDexMode_Ch5
; f0974
Sfx_JumpOverLedge: ; f0974
- dbw $04, Sfx_JumpOverLedge_Ch5
+ musicheader 1, 5, Sfx_JumpOverLedge_Ch5
; f0977
Sfx_GrassRustle: ; f0977
- dbw $07, Sfx_GrassRustle_Ch8
+ musicheader 1, 8, Sfx_GrassRustle_Ch8
; f097a
Sfx_Fly: ; f097a
- dbw $07, Sfx_Fly_Ch8
+ musicheader 1, 8, Sfx_Fly_Ch8
; f097d
Sfx_Wrong: ; f097d
- dbw $44, Sfx_Wrong_Ch5
- dbw $05, Sfx_Wrong_Ch6
+ musicheader 2, 5, Sfx_Wrong_Ch5
+ musicheader 1, 6, Sfx_Wrong_Ch6
; f0983
Sfx_Squeak: ; f0983
- dbw $04, Sfx_Squeak_Ch5
+ musicheader 1, 5, Sfx_Squeak_Ch5
; f0986
Sfx_Strength: ; f0986
- dbw $07, Sfx_Strength_Ch8
+ musicheader 1, 8, Sfx_Strength_Ch8
; f0989
Sfx_Boat: ; f0989
- dbw $44, Sfx_Boat_Ch5
- dbw $05, Sfx_Boat_Ch6
+ musicheader 2, 5, Sfx_Boat_Ch5
+ musicheader 1, 6, Sfx_Boat_Ch6
; f098f
Sfx_WallOpen: ; f098f
- dbw $04, Sfx_WallOpen_Ch5
+ musicheader 1, 5, Sfx_WallOpen_Ch5
; f0992
Sfx_PlacePuzzlePieceDown: ; f0992
- dbw $07, Sfx_PlacePuzzlePieceDown_Ch8
+ musicheader 1, 8, Sfx_PlacePuzzlePieceDown_Ch8
; f0995
Sfx_EnterDoor: ; f0995
- dbw $07, Sfx_EnterDoor_Ch8
+ musicheader 1, 8, Sfx_EnterDoor_Ch8
; f0998
Sfx_SwitchPokemon: ; f0998
- dbw $44, Sfx_SwitchPokemon_Ch5
- dbw $05, Sfx_SwitchPokemon_Ch6
+ musicheader 2, 5, Sfx_SwitchPokemon_Ch5
+ musicheader 1, 6, Sfx_SwitchPokemon_Ch6
; f099e
Sfx_Tally: ; f099e
- dbw $44, Sfx_Tally_Ch5
- dbw $05, Sfx_Tally_Ch6
+ musicheader 2, 5, Sfx_Tally_Ch5
+ musicheader 1, 6, Sfx_Tally_Ch6
; f09a4
Sfx_Transaction: ; f09a4
- dbw $44, Sfx_Transaction_Ch5
- dbw $05, Sfx_Transaction_Ch6
+ musicheader 2, 5, Sfx_Transaction_Ch5
+ musicheader 1, 6, Sfx_Transaction_Ch6
; f09aa
Sfx_Bump: ; f09aa
- dbw $04, Sfx_Bump_Ch5
+ musicheader 1, 5, Sfx_Bump_Ch5
; f09ad
Sfx_ExitBuilding: ; f09ad
- dbw $07, Sfx_ExitBuilding_Ch8
+ musicheader 1, 8, Sfx_ExitBuilding_Ch8
; f09b0
Sfx_Save: ; f09b0
- dbw $44, Sfx_Save_Ch5
- dbw $05, Sfx_Save_Ch6
+ musicheader 2, 5, Sfx_Save_Ch5
+ musicheader 1, 6, 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
+ sound __, 3, $f1, $0700
+ sound __, 2, $e1, $0600
+ sound __, 2, $e1, $0680
+ sound __, 2, $e1, $06c0
+ sound __, 3, $e1, $0700
+ sound __, 3, $e1, $07c0
+ sound __, 16, $f2, $07e0
endchannel
; f09d5
Sfx_Save_Ch6: ; f09d5
dutycycle $2
- sound $2, $8, 0
- 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
+ sound __, 3, $8, 0
+ sound __, 3, $a1, $0701
+ sound __, 2, $91, $0601
+ sound __, 2, $91, $0681
+ sound __, 2, $91, $06c1
+ sound __, 3, $91, $0701
+ sound __, 3, $91, $07c1
+ sound __, 16, $d2, $07e1
endchannel
; f09f8
Sfx_Pokeflute: ; f09f8
- dbw $06, Sfx_Pokeflute_Ch7
+ musicheader 1, 7, Sfx_Pokeflute_Ch7
; f09fb
Sfx_ElevatorEnd: ; f09fb
- dbw $04, Sfx_ElevatorEnd_Ch5
+ musicheader 1, 5, Sfx_ElevatorEnd_Ch5
; f09fe
Sfx_ThrowBall: ; f09fe
- dbw $44, Sfx_ThrowBall_Ch5
- dbw $05, Sfx_ThrowBall_Ch6
+ musicheader 2, 5, Sfx_ThrowBall_Ch5
+ musicheader 1, 6, Sfx_ThrowBall_Ch6
; f0a04
Sfx_BallPoof: ; f0a04
- dbw $44, Sfx_BallPoof_Ch5
- dbw $07, Sfx_BallPoof_Ch8
+ musicheader 2, 5, Sfx_BallPoof_Ch5
+ musicheader 1, 8, Sfx_BallPoof_Ch8
; f0a0a
Sfx_Unknown3A: ; f0a0a
- dbw $44, Sfx_Unknown3A_Ch5
- dbw $07, Sfx_Unknown3A_Ch8
+ musicheader 2, 5, Sfx_Unknown3A_Ch5
+ musicheader 1, 8, Sfx_Unknown3A_Ch8
; f0a10
Sfx_Run: ; f0a10
- dbw $07, Sfx_Run_Ch8
+ musicheader 1, 8, Sfx_Run_Ch8
; f0a13
Sfx_SlotMachineStart: ; f0a13
- dbw $44, Sfx_SlotMachineStart_Ch5
- dbw $05, Sfx_SlotMachineStart_Ch6
+ musicheader 2, 5, Sfx_SlotMachineStart_Ch5
+ musicheader 1, 6, Sfx_SlotMachineStart_Ch6
; f0a19
Sfx_Call: ; f0a19
- dbw $04, Sfx_Call_Ch5
+ musicheader 1, 5, Sfx_Call_Ch5
; f0a1c
Sfx_Unknown60: ; f0a1c
- dbw $07, Sfx_Unknown60_Ch8
+ musicheader 1, 8, Sfx_Unknown60_Ch8
; f0a1f
Sfx_Unknown61: ; f0a1f
- dbw $07, Sfx_Unknown61_Ch8
+ musicheader 1, 8, Sfx_Unknown61_Ch8
; f0a22
Sfx_Unknown62: ; f0a22
- dbw $07, Sfx_Unknown62_Ch8
+ musicheader 1, 8, Sfx_Unknown62_Ch8
; f0a25
Sfx_Unknown63: ; f0a25
- dbw $07, Sfx_Unknown63_Ch8
+ musicheader 1, 8, Sfx_Unknown63_Ch8
; f0a28
Sfx_Burn: ; f0a28
- dbw $07, Sfx_Burn_Ch8
+ musicheader 1, 8, Sfx_Burn_Ch8
; f0a2b
Sfx_TitleScreenEntrance: ; f0a2b
- dbw $07, Sfx_TitleScreenEntrance_Ch8
+ musicheader 1, 8, Sfx_TitleScreenEntrance_Ch8
; f0a2e
Sfx_Unknown66: ; f0a2e
- dbw $04, Sfx_Unknown66_Ch5
+ musicheader 1, 5, Sfx_Unknown66_Ch5
; f0a31
Sfx_GetCoinFromSlots: ; f0a31
- dbw $04, Sfx_GetCoinFromSlots_Ch5
+ musicheader 1, 5, Sfx_GetCoinFromSlots_Ch5
; f0a34
Sfx_PayDay: ; f0a34
- dbw $44, Sfx_PayDay_Ch5
- dbw $05, Sfx_PayDay_Ch6
+ musicheader 2, 5, Sfx_PayDay_Ch5
+ musicheader 1, 6, Sfx_PayDay_Ch6
; f0a3a
Sfx_Metronome: ; f0a3a
- dbw $04, Sfx_Metronome_Ch5
+ musicheader 1, 5, Sfx_Metronome_Ch5
; f0a3d
Sfx_Peck: ; f0a3d
- dbw $07, Sfx_Peck_Ch8
+ musicheader 1, 8, Sfx_Peck_Ch8
; f0a40
Sfx_Kinesis: ; f0a40
- dbw $04, Sfx_Kinesis_Ch5
+ musicheader 1, 5, Sfx_Kinesis_Ch5
; f0a43
Sfx_Lick: ; f0a43
- dbw $04, Sfx_Lick_Ch5
+ musicheader 1, 5, Sfx_Lick_Ch5
; f0a46
Sfx_Pound: ; f0a46
- dbw $07, Sfx_Pound_Ch8
+ musicheader 1, 8, Sfx_Pound_Ch8
; f0a49
Sfx_MovePuzzlePiece: ; f0a49
- dbw $07, Sfx_MovePuzzlePiece_Ch8
+ musicheader 1, 8, Sfx_MovePuzzlePiece_Ch8
; f0a4c
Sfx_CometPunch: ; f0a4c
- dbw $07, Sfx_CometPunch_Ch8
+ musicheader 1, 8, Sfx_CometPunch_Ch8
; f0a4f
Sfx_MegaPunch: ; f0a4f
- dbw $07, Sfx_MegaPunch_Ch8
+ musicheader 1, 8, Sfx_MegaPunch_Ch8
; f0a52
Sfx_Scratch: ; f0a52
- dbw $07, Sfx_Scratch_Ch8
+ musicheader 1, 8, Sfx_Scratch_Ch8
; f0a55
Sfx_Vicegrip: ; f0a55
- dbw $07, Sfx_Vicegrip_Ch8
+ musicheader 1, 8, Sfx_Vicegrip_Ch8
; f0a58
Sfx_RazorWind: ; f0a58
- dbw $07, Sfx_RazorWind_Ch8
+ musicheader 1, 8, Sfx_RazorWind_Ch8
; f0a5b
Sfx_Cut: ; f0a5b
- dbw $07, Sfx_Cut_Ch8
+ musicheader 1, 8, Sfx_Cut_Ch8
; f0a5e
Sfx_WingAttack: ; f0a5e
- dbw $07, Sfx_WingAttack_Ch8
+ musicheader 1, 8, Sfx_WingAttack_Ch8
; f0a61
Sfx_Whirlwind: ; f0a61
- dbw $07, Sfx_Whirlwind_Ch8
+ musicheader 1, 8, Sfx_Whirlwind_Ch8
; f0a64
Sfx_Bind: ; f0a64
- dbw $07, Sfx_Bind_Ch8
+ musicheader 1, 8, Sfx_Bind_Ch8
; f0a67
Sfx_VineWhip: ; f0a67
- dbw $07, Sfx_VineWhip_Ch8
+ musicheader 1, 8, Sfx_VineWhip_Ch8
; f0a6a
Sfx_DoubleKick: ; f0a6a
- dbw $07, Sfx_DoubleKick_Ch8
+ musicheader 1, 8, Sfx_DoubleKick_Ch8
; f0a6d
Sfx_MegaKick: ; f0a6d
- dbw $07, Sfx_MegaKick_Ch8
+ musicheader 1, 8, Sfx_MegaKick_Ch8
; f0a70
Sfx_Headbutt: ; f0a70
- dbw $07, Sfx_Headbutt_Ch8
+ musicheader 1, 8, Sfx_Headbutt_Ch8
; f0a73
Sfx_HornAttack: ; f0a73
- dbw $07, Sfx_HornAttack_Ch8
+ musicheader 1, 8, Sfx_HornAttack_Ch8
; f0a76
Sfx_Tackle: ; f0a76
- dbw $07, Sfx_Tackle_Ch8
+ musicheader 1, 8, Sfx_Tackle_Ch8
; f0a79
Sfx_PoisonSting: ; f0a79
- dbw $07, Sfx_PoisonSting_Ch8
+ musicheader 1, 8, Sfx_PoisonSting_Ch8
; f0a7c
Sfx_Powder: ; f0a7c
- dbw $07, Sfx_Powder_Ch8
+ musicheader 1, 8, Sfx_Powder_Ch8
; f0a7f
Sfx_Doubleslap: ; f0a7f
- dbw $07, Sfx_Doubleslap_Ch8
+ musicheader 1, 8, Sfx_Doubleslap_Ch8
; f0a82
Sfx_Bite: ; f0a82
- dbw $44, Sfx_Bite_Ch5
- dbw $07, Sfx_Bite_Ch8
+ musicheader 2, 5, Sfx_Bite_Ch5
+ musicheader 1, 8, Sfx_Bite_Ch8
; f0a88
Sfx_JumpKick: ; f0a88
- dbw $07, Sfx_JumpKick_Ch8
+ musicheader 1, 8, Sfx_JumpKick_Ch8
; f0a8b
Sfx_Stomp: ; f0a8b
- dbw $07, Sfx_Stomp_Ch8
+ musicheader 1, 8, Sfx_Stomp_Ch8
; f0a8e
Sfx_TailWhip: ; f0a8e
- dbw $07, Sfx_TailWhip_Ch8
+ musicheader 1, 8, Sfx_TailWhip_Ch8
; f0a91
Sfx_KarateChop: ; f0a91
- dbw $07, Sfx_KarateChop_Ch8
+ musicheader 1, 8, Sfx_KarateChop_Ch8
; f0a94
Sfx_Submission: ; f0a94
- dbw $07, Sfx_Submission_Ch8
+ musicheader 1, 8, Sfx_Submission_Ch8
; f0a97
Sfx_WaterGun: ; f0a97
- dbw $44, Sfx_WaterGun_Ch5
- dbw $07, Sfx_WaterGun_Ch8
+ musicheader 2, 5, Sfx_WaterGun_Ch5
+ musicheader 1, 8, Sfx_WaterGun_Ch8
; f0a9d
Sfx_SwordsDance: ; f0a9d
- dbw $07, Sfx_SwordsDance_Ch8
+ musicheader 1, 8, Sfx_SwordsDance_Ch8
; f0aa0
Sfx_Thunder: ; f0aa0
- dbw $07, Sfx_Thunder_Ch8
+ musicheader 1, 8, Sfx_Thunder_Ch8
; f0aa3
Sfx_Supersonic: ; f0aa3
- dbw $84, Sfx_Supersonic_Ch5
- dbw $05, Sfx_Supersonic_Ch6
- dbw $07, Sfx_Supersonic_Ch8
+ musicheader 3, 5, Sfx_Supersonic_Ch5
+ musicheader 1, 6, Sfx_Supersonic_Ch6
+ musicheader 1, 8, Sfx_Supersonic_Ch8
; f0aac
Sfx_Leer: ; f0aac
- dbw $84, Sfx_Leer_Ch5
- dbw $05, Sfx_Leer_Ch6
- dbw $07, Sfx_Leer_Ch8
+ musicheader 3, 5, Sfx_Leer_Ch5
+ musicheader 1, 6, Sfx_Leer_Ch6
+ musicheader 1, 8, Sfx_Leer_Ch8
; f0ab5
Sfx_Ember: ; f0ab5
- dbw $44, Sfx_Ember_Ch5
- dbw $07, Sfx_Ember_Ch8
+ musicheader 2, 5, Sfx_Ember_Ch5
+ musicheader 1, 8, Sfx_Ember_Ch8
; f0abb
Sfx_Bubblebeam: ; f0abb
- dbw $84, Sfx_Bubblebeam_Ch5
- dbw $05, Sfx_Bubblebeam_Ch6
- dbw $07, Sfx_Bubblebeam_Ch8
+ musicheader 3, 5, Sfx_Bubblebeam_Ch5
+ musicheader 1, 6, Sfx_Bubblebeam_Ch6
+ musicheader 1, 8, Sfx_Bubblebeam_Ch8
; f0ac4
Sfx_HydroPump: ; f0ac4
- dbw $44, Sfx_HydroPump_Ch5
- dbw $07, Sfx_HydroPump_Ch8
+ musicheader 2, 5, Sfx_HydroPump_Ch5
+ musicheader 1, 8, Sfx_HydroPump_Ch8
; f0aca
Sfx_Surf: ; f0aca
- dbw $84, Sfx_Surf_Ch5
- dbw $05, Sfx_Surf_Ch6
- dbw $07, Sfx_Surf_Ch8
+ musicheader 3, 5, Sfx_Surf_Ch5
+ musicheader 1, 6, Sfx_Surf_Ch6
+ musicheader 1, 8, Sfx_Surf_Ch8
; f0ad3
Sfx_Psybeam: ; f0ad3
- dbw $84, Sfx_Psybeam_Ch5
- dbw $05, Sfx_Psybeam_Ch6
- dbw $07, Sfx_Psybeam_Ch8
+ musicheader 3, 5, Sfx_Psybeam_Ch5
+ musicheader 1, 6, Sfx_Psybeam_Ch6
+ musicheader 1, 8, Sfx_Psybeam_Ch8
; f0adc
Sfx_Charge: ; f0adc
- dbw $84, Sfx_Charge_Ch5
- dbw $05, Sfx_Charge_Ch6
- dbw $07, Sfx_Charge_Ch8
+ musicheader 3, 5, Sfx_Charge_Ch5
+ musicheader 1, 6, Sfx_Charge_Ch6
+ musicheader 1, 8, Sfx_Charge_Ch8
; f0ae5
Sfx_Thundershock: ; f0ae5
- dbw $84, Sfx_Thundershock_Ch5
- dbw $05, Sfx_Thundershock_Ch6
- dbw $07, Sfx_Thundershock_Ch8
+ musicheader 3, 5, Sfx_Thundershock_Ch5
+ musicheader 1, 6, Sfx_Thundershock_Ch6
+ musicheader 1, 8, Sfx_Thundershock_Ch8
; f0aee
Sfx_Psychic: ; f0aee
- dbw $84, Sfx_Psychic_Ch5
- dbw $05, Sfx_Psychic_Ch6
- dbw $07, Sfx_Psychic_Ch8
+ musicheader 3, 5, Sfx_Psychic_Ch5
+ musicheader 1, 6, Sfx_Psychic_Ch6
+ musicheader 1, 8, Sfx_Psychic_Ch8
; f0af7
Sfx_Screech: ; f0af7
- dbw $44, Sfx_Screech_Ch5
- dbw $05, Sfx_Screech_Ch6
+ musicheader 2, 5, Sfx_Screech_Ch5
+ musicheader 1, 6, Sfx_Screech_Ch6
; f0afd
Sfx_BoneClub: ; f0afd
- dbw $44, Sfx_BoneClub_Ch5
- dbw $05, Sfx_BoneClub_Ch6
+ musicheader 2, 5, Sfx_BoneClub_Ch5
+ musicheader 1, 6, Sfx_BoneClub_Ch6
; f0b03
Sfx_Sharpen: ; f0b03
- dbw $44, Sfx_Sharpen_Ch5
- dbw $05, Sfx_Sharpen_Ch6
+ musicheader 2, 5, Sfx_Sharpen_Ch5
+ musicheader 1, 6, Sfx_Sharpen_Ch6
; f0b09
Sfx_EggBomb: ; f0b09
- dbw $84, Sfx_EggBomb_Ch5
- dbw $05, Sfx_EggBomb_Ch6
- dbw $07, Sfx_EggBomb_Ch8
+ musicheader 3, 5, Sfx_EggBomb_Ch5
+ musicheader 1, 6, Sfx_EggBomb_Ch6
+ musicheader 1, 8, Sfx_EggBomb_Ch8
; f0b12
Sfx_Sing: ; f0b12
- dbw $44, Sfx_Sing_Ch5
- dbw $05, Sfx_Sing_Ch6
+ musicheader 2, 5, Sfx_Sing_Ch5
+ musicheader 1, 6, Sfx_Sing_Ch6
; f0b18
Sfx_HyperBeam: ; f0b18
- dbw $84, Sfx_HyperBeam_Ch5
- dbw $05, Sfx_HyperBeam_Ch6
- dbw $07, Sfx_HyperBeam_Ch8
+ musicheader 3, 5, Sfx_HyperBeam_Ch5
+ musicheader 1, 6, Sfx_HyperBeam_Ch6
+ musicheader 1, 8, Sfx_HyperBeam_Ch8
; f0b21
Sfx_Shine: ; f0b21
- dbw $04, Sfx_Shine_Ch5
+ musicheader 1, 5, Sfx_Shine_Ch5
; f0b24
Sfx_Unknown5F: ; f0b24
- dbw $84, Sfx_Unknown5F_Ch5
- dbw $05, Sfx_Unknown5F_Ch6
+ musicheader 3, 5, Sfx_Unknown5F_Ch5
+ musicheader 1, 6, Sfx_Unknown5F_Ch6
Sfx_Sandstorm: ; f0b2a
- dbw $07, Sfx_Sandstorm_Ch8
+ musicheader 1, 8, Sfx_Sandstorm_Ch8
; f0b2d
Sfx_HangUp: ; f0b2d
- dbw $04, Sfx_HangUp_Ch5
+ musicheader 1, 5, Sfx_HangUp_Ch5
; f0b30
Sfx_NoSignal: ; f0b30
- dbw $04, Sfx_NoSignal_Ch5
+ musicheader 1, 5, 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
+ musicheader 4, 5, Sfx_Elevator_Ch5
+ musicheader 1, 6, Sfx_Elevator_Ch6
+ musicheader 1, 7, Sfx_Elevator_Ch7
+ musicheader 1, 8, 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
+ musicheader 4, 5, Sfx_DexFanfare5079_Ch5
+ musicheader 1, 6, Sfx_DexFanfare5079_Ch6
+ musicheader 1, 7, Sfx_DexFanfare5079_Ch7
+ musicheader 1, 8, Sfx_DexFanfare5079_Ch8
; f0b4b
Sfx_DexFanfare5079_Ch5: ; f0b4b
@@ -553,10 +553,10 @@
; f0b86
Sfx_KeyItem: ; f0b86
- dbw $c4, Sfx_KeyItem_Ch5
- dbw $05, Sfx_KeyItem_Ch6
- dbw $06, Sfx_KeyItem_Ch7
- dbw $07, Sfx_KeyItem_Ch8
+ musicheader 4, 5, Sfx_KeyItem_Ch5
+ musicheader 1, 6, Sfx_KeyItem_Ch6
+ musicheader 1, 7, Sfx_KeyItem_Ch7
+ musicheader 1, 8, Sfx_KeyItem_Ch8
; f0b92
Sfx_KeyItem_Ch5: ; f0b92
@@ -623,10 +623,10 @@
; f0bd5
Sfx_DexFanfare2049: ; f0bd5
- dbw $c4, Sfx_DexFanfare2049_Ch5
- dbw $05, Sfx_DexFanfare2049_Ch6
- dbw $06, Sfx_DexFanfare2049_Ch7
- dbw $07, Sfx_DexFanfare2049_Ch8
+ musicheader 4, 5, Sfx_DexFanfare2049_Ch5
+ musicheader 1, 6, Sfx_DexFanfare2049_Ch6
+ musicheader 1, 7, Sfx_DexFanfare2049_Ch7
+ musicheader 1, 8, Sfx_DexFanfare2049_Ch8
; f0be1
Sfx_DexFanfare2049_Ch5: ; f0be1
@@ -707,10 +707,10 @@
; f0c2f
Sfx_Item: ; f0c2f
- dbw $c4, Sfx_Item_Ch5
- dbw $05, Sfx_Item_Ch6
- dbw $06, Sfx_Item_Ch7
- dbw $07, Sfx_Item_Ch8
+ musicheader 4, 5, Sfx_Item_Ch5
+ musicheader 1, 6, Sfx_Item_Ch6
+ musicheader 1, 7, Sfx_Item_Ch7
+ musicheader 1, 8, Sfx_Item_Ch8
; f0c3b
Sfx_Item_Ch5: ; f0c3b
@@ -786,10 +786,10 @@
; f0c89
Sfx_CaughtMon: ; f0c89
- dbw $c4, Sfx_CaughtMon_Ch5
- dbw $05, Sfx_CaughtMon_Ch6
- dbw $06, Sfx_CaughtMon_Ch7
- dbw $07, Sfx_CaughtMon_Ch8
+ musicheader 4, 5, Sfx_CaughtMon_Ch5
+ musicheader 1, 6, Sfx_CaughtMon_Ch6
+ musicheader 1, 7, Sfx_CaughtMon_Ch7
+ musicheader 1, 8, Sfx_CaughtMon_Ch8
; f0c95
Sfx_CaughtMon_Ch5: ; f0c95
@@ -868,10 +868,10 @@
; f0cea
Sfx_DexFanfare80109: ; f0cea
- dbw $c4, Sfx_DexFanfare80109_Ch5
- dbw $05, Sfx_DexFanfare80109_Ch6
- dbw $06, Sfx_DexFanfare80109_Ch7
- dbw $07, Sfx_DexFanfare80109_Ch8
+ musicheader 4, 5, Sfx_DexFanfare80109_Ch5
+ musicheader 1, 6, Sfx_DexFanfare80109_Ch6
+ musicheader 1, 7, Sfx_DexFanfare80109_Ch7
+ musicheader 1, 8, Sfx_DexFanfare80109_Ch8
; f0cf6
Sfx_DexFanfare80109_Ch5: ; f0cf6
@@ -963,16 +963,16 @@
; f0d56
Sfx_Fanfare2: ; f0d56
- dbw $84, Sfx_Fanfare2_Ch5
- dbw $05, Sfx_Fanfare2_Ch6
- dbw $07, Sfx_Fanfare2_Ch8
+ musicheader 3, 5, Sfx_Fanfare2_Ch5
+ musicheader 1, 6, Sfx_Fanfare2_Ch6
+ musicheader 1, 8, Sfx_Fanfare2_Ch8
; f0d5f
UnknownSfx: ; f0d5f
- dbw $c4, UnknownSfx_Ch5
- dbw $05, UnknownSfx_Ch6
- dbw $06, UnknownSfx_Ch7
- dbw $07, UnknownSfx_Ch8
+ musicheader 4, 5, UnknownSfx_Ch5
+ musicheader 1, 6, UnknownSfx_Ch6
+ musicheader 1, 7, UnknownSfx_Ch7
+ musicheader 1, 8, UnknownSfx_Ch8
; f0d6b
UnknownSfx_Ch5: ; f0d6b
@@ -1051,16 +1051,16 @@
; f0dbe
Sfx_Fanfare: ; f0dbe
- dbw $84, Sfx_Fanfare_Ch5
- dbw $05, Sfx_Fanfare_Ch6
- dbw $07, Sfx_Fanfare_Ch8
+ musicheader 3, 5, Sfx_Fanfare_Ch5
+ musicheader 1, 6, Sfx_Fanfare_Ch6
+ musicheader 1, 8, 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
+ musicheader 4, 5, Sfx_RegisterPhoneNumber_Ch5
+ musicheader 1, 6, Sfx_RegisterPhoneNumber_Ch6
+ musicheader 1, 7, Sfx_RegisterPhoneNumber_Ch7
+ musicheader 1, 8, Sfx_RegisterPhoneNumber_Ch8
; f0dd3
Sfx_RegisterPhoneNumber_Ch5: ; f0dd3
@@ -1088,7 +1088,7 @@
endchannel
; f0def
- db $df
+ togglesfx
Sfx_RegisterPhoneNumber_Ch6: ; f0df0
togglesfx
@@ -1113,7 +1113,7 @@
endchannel
; f0e07
- db $df
+ togglesfx
Sfx_RegisterPhoneNumber_Ch7: ; f0e08
togglesfx
@@ -1135,7 +1135,7 @@
endchannel
; f0e1b
- db $df
+ togglesfx
Sfx_RegisterPhoneNumber_Ch8: ; f0e1c
togglesfx
@@ -1147,12 +1147,12 @@
endchannel
; f0e25
- db $df
+ togglesfx
Sfx_3RdPlace: ; f0e26
- dbw $84, Sfx_3RdPlace_Ch5
- dbw $05, Sfx_3RdPlace_Ch6
- dbw $06, Sfx_3RdPlace_Ch7
+ musicheader 3, 5, Sfx_3RdPlace_Ch5
+ musicheader 1, 6, Sfx_3RdPlace_Ch6
+ musicheader 1, 7, Sfx_3RdPlace_Ch7
; f0e2f
Sfx_3RdPlace_Ch5: ; f0e2f
@@ -1173,7 +1173,7 @@
endchannel
; f0e44
- db $df
+ togglesfx
Sfx_3RdPlace_Ch6: ; f0e45
togglesfx
@@ -1191,7 +1191,7 @@
endchannel
; f0e55
- db $df
+ togglesfx
Sfx_3RdPlace_Ch7: ; f0e56
togglesfx
@@ -1209,14 +1209,14 @@
endchannel
; f0e65
- db $df
+ togglesfx
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
+ musicheader 4, 5, Sfx_GetEggFromDaycareLady_Ch5
+ musicheader 1, 6, Sfx_GetEggFromDaycareLady_Ch6
+ musicheader 1, 7, Sfx_GetEggFromDaycareLady_Ch7
+ musicheader 1, 8, Sfx_GetEggFromDaycareLady_Ch8
; f0e72
Sfx_GetEggFromDaycareLady_Ch5: ; f0e72
@@ -1251,7 +1251,7 @@
endchannel
; f0e9a
- db $df
+ togglesfx
Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b
Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b
@@ -1282,7 +1282,7 @@
endchannel
; f0ebd
- db $df
+ togglesfx
Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe
Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe
@@ -1303,7 +1303,7 @@
endchannel
; f0ecf
- db $df
+ togglesfx
Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0
Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0
@@ -1317,13 +1317,13 @@
endchannel
; f0edb
- db $df
+ togglesfx
Sfx_MoveDeleted: ; f0edc
- dbw $c4, Sfx_MoveDeleted_Ch5
- dbw $05, Sfx_MoveDeleted_Ch6
- dbw $06, Sfx_MoveDeleted_Ch7
- dbw $07, Sfx_MoveDeleted_Ch8
+ musicheader 4, 5, Sfx_MoveDeleted_Ch5
+ musicheader 1, 6, Sfx_MoveDeleted_Ch6
+ musicheader 1, 7, Sfx_MoveDeleted_Ch7
+ musicheader 1, 8, Sfx_MoveDeleted_Ch8
; f0ee8
Sfx_MoveDeleted_Ch5: ; f0ee8
@@ -1355,7 +1355,7 @@
endchannel
; f0f0c
- db $df
+ togglesfx
Sfx_MoveDeleted_Ch6: ; f0f0d
togglesfx
@@ -1392,7 +1392,7 @@
endchannel
; f0f36
- db $df
+ togglesfx
Sfx_MoveDeleted_Ch7: ; f0f37
togglesfx
@@ -1420,7 +1420,7 @@
endchannel
; f0f52
- db $df
+ togglesfx
Sfx_MoveDeleted_Ch8: ; f0f53
togglesfx
@@ -1433,13 +1433,13 @@
endchannel
; f0f5d
- db $df
+ togglesfx
Sfx_2ndPlace: ; f0f5e
- dbw $c4, Sfx_2ndPlace_Ch5
- dbw $05, Sfx_2ndPlace_Ch6
- dbw $06, Sfx_2ndPlace_Ch7
- dbw $07, Sfx_2ndPlace_Ch8
+ musicheader 4, 5, Sfx_2ndPlace_Ch5
+ musicheader 1, 6, Sfx_2ndPlace_Ch6
+ musicheader 1, 7, Sfx_2ndPlace_Ch7
+ musicheader 1, 8, Sfx_2ndPlace_Ch8
; f0f6a
Sfx_2ndPlace_Ch5: ; f0f6a
@@ -1475,7 +1475,7 @@
endchannel
; f0f91
- db $df
+ togglesfx
Sfx_2ndPlace_Ch6: ; f0f92
togglesfx
@@ -1500,7 +1500,7 @@
endchannel
; f0fac
- db $df
+ togglesfx
Sfx_2ndPlace_Ch7: ; f0fad
togglesfx
@@ -1539,7 +1539,7 @@
endchannel
; f0fd1
- db $df
+ togglesfx
Sfx_2ndPlace_Ch8: ; f0fd2
togglesfx
@@ -1555,13 +1555,13 @@
endchannel
; f0fe1
- db $df
+ togglesfx
Sfx_1stPlace: ; f0fe2
- dbw $c4, Sfx_1stPlace_Ch5
- dbw $05, Sfx_1stPlace_Ch6
- dbw $06, Sfx_1stPlace_Ch7
- dbw $07, Sfx_1stPlace_Ch8
+ musicheader 4, 5, Sfx_1stPlace_Ch5
+ musicheader 1, 6, Sfx_1stPlace_Ch6
+ musicheader 1, 7, Sfx_1stPlace_Ch7
+ musicheader 1, 8, Sfx_1stPlace_Ch8
; f0fee
Sfx_1stPlace_Ch5: ; f0fee
@@ -1604,7 +1604,7 @@
endchannel
; f101f
- db $df
+ togglesfx
Sfx_1stPlace_Ch6: ; f1020
togglesfx
@@ -1629,7 +1629,7 @@
endchannel
; f103c
- db $df
+ togglesfx
Sfx_1stPlace_Ch7: ; f103d
togglesfx
@@ -1654,7 +1654,7 @@
endchannel
; f1053
- db $df
+ togglesfx
Sfx_1stPlace_Ch8: ; f1054
togglesfx
@@ -1676,13 +1676,13 @@
endchannel
; f1068
- db $df
+ togglesfx
Sfx_ChooseACard: ; f1069
- dbw $c4, Sfx_ChooseACard_Ch5
- dbw $05, Sfx_ChooseACard_Ch6
- dbw $06, Sfx_ChooseACard_Ch7
- dbw $07, Sfx_ChooseACard_Ch8
+ musicheader 4, 5, Sfx_ChooseACard_Ch5
+ musicheader 1, 6, Sfx_ChooseACard_Ch6
+ musicheader 1, 7, Sfx_ChooseACard_Ch7
+ musicheader 1, 8, Sfx_ChooseACard_Ch8
; f1075
Sfx_ChooseACard_Ch5: ; f1075
@@ -1730,7 +1730,7 @@
endchannel
; f10a8
- db $df
+ togglesfx
Sfx_ChooseACard_Ch6: ; f10a9
togglesfx
@@ -1763,7 +1763,7 @@
endchannel
; f10c8
- db $df
+ togglesfx
Sfx_ChooseACard_Ch7: ; f10c9
togglesfx
@@ -1800,7 +1800,7 @@
endchannel
; f10eb
- db $df
+ togglesfx
Sfx_ChooseACard_Ch8: ; f10ec
togglesfx
@@ -1826,13 +1826,13 @@
endchannel
; f1103
- db $df
+ togglesfx
Sfx_GetTm: ; f1104
- dbw $c4, Sfx_GetTm_Ch5
- dbw $05, Sfx_GetTm_Ch6
- dbw $06, Sfx_GetTm_Ch7
- dbw $07, Sfx_GetTm_Ch8
+ musicheader 4, 5, Sfx_GetTm_Ch5
+ musicheader 1, 6, Sfx_GetTm_Ch6
+ musicheader 1, 7, Sfx_GetTm_Ch7
+ musicheader 1, 8, Sfx_GetTm_Ch8
; f1110
Sfx_GetTm_Ch5: ; f1110
@@ -1860,7 +1860,7 @@
endchannel
; f1130
- db $df
+ togglesfx
Sfx_GetTm_Ch6: ; f1131
togglesfx
@@ -1884,7 +1884,7 @@
endchannel
; f114b
- db $df
+ togglesfx
Sfx_GetTm_Ch7: ; f114c
togglesfx
@@ -1916,7 +1916,7 @@
endchannel
; f1169
- db $df
+ togglesfx
Sfx_GetTm_Ch8: ; f116a
togglesfx
@@ -1937,13 +1937,13 @@
endchannel
; f117c
- db $df
+ togglesfx
Sfx_GetBadge: ; f117d
- dbw $c4, Sfx_GetBadge_Ch5
- dbw $05, Sfx_GetBadge_Ch6
- dbw $06, Sfx_GetBadge_Ch7
- dbw $07, Sfx_GetBadge_Ch8
+ musicheader 4, 5, Sfx_GetBadge_Ch5
+ musicheader 1, 6, Sfx_GetBadge_Ch6
+ musicheader 1, 7, Sfx_GetBadge_Ch7
+ musicheader 1, 8, Sfx_GetBadge_Ch8
; f1189
Sfx_GetBadge_Ch5: ; f1189
@@ -1966,7 +1966,7 @@
endchannel
; f11a9
- db $df
+ togglesfx
Sfx_GetBadge_branch_f11aa: ; f11aa
note __, 5
@@ -2039,7 +2039,7 @@
endchannel
; f11f4
- db $df
+ togglesfx
Sfx_GetBadge_Ch7: ; f11f5
togglesfx
@@ -2079,7 +2079,7 @@
endchannel
; f121a
- db $df
+ togglesfx
Sfx_GetBadge_Ch8: ; f121b
togglesfx
@@ -2106,13 +2106,13 @@
endchannel
; f1235
- db $df
+ togglesfx
Sfx_QuitSlots: ; f1236
- dbw $c4, Sfx_QuitSlots_Ch5
- dbw $05, Sfx_QuitSlots_Ch6
- dbw $06, Sfx_QuitSlots_Ch7
- dbw $07, Sfx_QuitSlots_Ch8
+ musicheader 4, 5, Sfx_QuitSlots_Ch5
+ musicheader 1, 6, Sfx_QuitSlots_Ch6
+ musicheader 1, 7, Sfx_QuitSlots_Ch7
+ musicheader 1, 8, Sfx_QuitSlots_Ch8
; f1242
Sfx_QuitSlots_Ch5: ; f1242
@@ -2146,7 +2146,7 @@
endchannel
; f1265
- db $df
+ togglesfx
Sfx_QuitSlots_Ch6: ; f1266
togglesfx
@@ -2174,7 +2174,7 @@
endchannel
; f1282
- db $df
+ togglesfx
Sfx_QuitSlots_Ch7: ; f1283
togglesfx
@@ -2206,7 +2206,7 @@
endchannel
; f12a0
- db $df
+ togglesfx
Sfx_QuitSlots_Ch8: ; f12a1
togglesfx
@@ -2227,11 +2227,11 @@
endchannel
; f12b3
- db $df
+ togglesfx
Sfx_Protect: ; f12b4
- dbw $44, Sfx_Protect_Ch5
- dbw $07, Sfx_Protect_Ch8
+ musicheader 2, 5, Sfx_Protect_Ch5
+ musicheader 1, 8, Sfx_Protect_Ch8
; f12ba
Sfx_Protect_Ch5: ; f12ba
@@ -2273,16 +2273,16 @@
Sfx_Protect_Ch8: ; f12e5
Sfx_Protect_branch_f12e5: ; f12e5
- noise $9, $9e, $0
- noise $9, $be, $11
+ noise __, 10, $9e, $0
+ noise __, 10, $be, $11
loopchannel 6, Sfx_Protect_branch_f12e5
- noise $9, $a7, $0
- noise $10, $75, $11
+ noise __, 10, $a7, $0
+ noise C_, 1, $75, $11
endchannel
; f12f6
Sfx_Sketch: ; f12f6
- dbw $04, Sfx_Sketch_Ch5
+ musicheader 1, 5, Sfx_Sketch_Ch5
; f12f9
Sfx_Sketch_Ch5: ; f12f9
@@ -2289,10 +2289,10 @@
dutycycle $1
soundinput $a5
Sfx_Sketch_branch_f12fd: ; f12fd
- sound $2, $f1, $06e0
- sound $d, $af, $05b0
- sound $4, $0, 0
- sound $9, $f4, $0718
+ sound __, 3, $f1, $06e0
+ sound __, 14, $af, $05b0
+ sound __, 5, $0, 0
+ sound __, 10, $f4, $0718
loopchannel 3, Sfx_Sketch_branch_f12fd
soundinput $8
endchannel
@@ -2299,111 +2299,111 @@
; f1314
Sfx_RainDance: ; f1314
- dbw $07, Sfx_RainDance_Ch8
+ musicheader 1, 8, 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
+ noise __, 12, $7d, $50
+ noise __, 7, $7d, $4f
+ noise __, 12, $7f, $47
+ noise __, 16, $6e, $22
loopchannel 3, Sfx_RainDance_branch_f1317
- noise $6, $6d, $50
- noise $5, $5d, $4f
- noise $5, $4f, $47
- noise $a, $32, $46
+ noise __, 7, $6d, $50
+ noise __, 6, $5d, $4f
+ noise __, 6, $4f, $47
+ noise __, 11, $32, $46
endchannel
; f1334
Sfx_Aeroblast: ; f1334
- dbw $44, Sfx_Aeroblast_Ch5
- dbw $07, Sfx_Aeroblast_Ch8
+ musicheader 2, 5, Sfx_Aeroblast_Ch5
+ musicheader 1, 8, Sfx_Aeroblast_Ch8
; f133a
Sfx_Aeroblast_Ch5: ; f133a
unknownmusic0xde $f2
soundinput $f5
- sound $1c, $f8, $0580
+ sound C_, 13, $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
+ noise __, 5, $f8, $6c
+ noise __, 5, $c8, $5c
+ noise __, 5, $78, $5b
+ noise C_, 1, $31, $5a
endchannel
; f1352
Sfx_Spark: ; f1352
- dbw $07, Sfx_Spark_Ch8
+ musicheader 1, 8, Sfx_Spark_Ch8
; f1355
Sfx_Spark_Ch8: ; f1355
Sfx_Spark_branch_f1355: ; f1355
- noise $4, $f8, $5d
- noise $4, $d8, $6f
+ noise __, 5, $f8, $5d
+ noise __, 5, $d8, $6f
loopchannel 2, Sfx_Spark_branch_f1355
endchannel
; f1360
Sfx_Curse: ; f1360
- dbw $44, Sfx_Curse_Ch5
- dbw $07, Sfx_Curse_Ch8
+ musicheader 2, 5, Sfx_Curse_Ch5
+ musicheader 1, 8, 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
+ sound __, 5, $f2, $0483
+ sound __, 5, $f2, $0511
+ sound __, 5, $f2, $0589
+ sound __, 5, $f2, $05ed
endchannel
; f1379
Sfx_Curse_Ch8: ; f1379
- noise $14, $9a, $9
+ noise C_, 5, $9a, $9
endchannel
; f137d
Sfx_Rage: ; f137d
- dbw $44, Sfx_Rage_Ch5
- dbw $07, Sfx_Rage_Ch8
+ musicheader 2, 5, Sfx_Rage_Ch5
+ musicheader 1, 8, Sfx_Rage_Ch8
; f1383
Sfx_Rage_Ch5: ; f1383
dutycycle $0
- sound $3, $d1, $07b0
- sound $3, $d1, $07c2
- sound $18, $d2, $07d5
+ sound __, 4, $d1, $07b0
+ sound __, 4, $d1, $07c2
+ sound C_, 9, $d2, $07d5
endchannel
; f1392
Sfx_Rage_Ch8: ; f1392
- noise $3, $f4, $1a
- noise $3, $f4, $19
- noise $18, $f2, $18
+ noise __, 4, $f4, $1a
+ noise __, 4, $f4, $19
+ noise C_, 9, $f2, $18
endchannel
; f139c
Sfx_Thief: ; f139c
- dbw $07, Sfx_Thief_Ch8
+ musicheader 1, 8, 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
+ noise __, 1, $0, $0
+ noise __, 5, $e1, $12
+ noise __, 1, $0, $0
+ noise __, 3, $b1, $22
loopchannel 2, Sfx_Thief_branch_f139f
endchannel
; f13b0
Sfx_Thief2: ; f13b0
- dbw $04, Sfx_Thief2_Ch5
+ musicheader 1, 5, Sfx_Thief2_Ch5
; f13b3
Sfx_Thief2_Ch5: ; f13b3
@@ -2427,32 +2427,32 @@
; f13ca
Sfx_SpiderWeb: ; f13ca
- dbw $44, Sfx_SpiderWeb_Ch5
- dbw $07, Sfx_SpiderWeb_Ch8
+ musicheader 2, 5, Sfx_SpiderWeb_Ch5
+ musicheader 1, 8, Sfx_SpiderWeb_Ch8
; f13d0
Sfx_SpiderWeb_Ch5: ; f13d0
dutycycle $0
- sound $20, $7f, $0720
+ sound C#, 1, $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
+ sound __, 5, $f8, $0620
+ sound __, 5, $e8, $0630
+ sound __, 5, $d8, $0640
+ sound __, 5, $95, $0620
+ sound __, 5, $73, $0630
+ sound __, 5, $51, $0640
soundinput $8
endchannel
; f13f3
Sfx_SpiderWeb_Ch8: ; f13f3
- noise $20, $ef, $0
+ noise C#, 1, $ef, $0
endchannel
; f13f7
Sfx_MindReader: ; f13f7
- dbw $44, Sfx_MindReader_Ch5
- dbw $07, Sfx_MindReader_Ch8
+ musicheader 2, 5, Sfx_MindReader_Ch5
+ musicheader 1, 8, Sfx_MindReader_Ch8
; f13fd
Sfx_MindReader_Ch5: ; f13fd
@@ -2476,13 +2476,13 @@
; f1416
Sfx_MindReader_Ch8: ; f1416
- noise $11, $af, $19
- noise $12, $af, $18
+ noise C_, 2, $af, $19
+ noise C_, 3, $af, $18
endchannel
; f141d
Sfx_Nightmare: ; f141d
- dbw $04, Sfx_Nightmare_Ch5
+ musicheader 1, 5, Sfx_Nightmare_Ch5
; f1420
Sfx_Nightmare_Ch5: ; f1420
@@ -2489,16 +2489,16 @@
dutycycle $0
soundinput $34
Sfx_Nightmare_branch_f1424: ; f1424
- sound $3, $ba, $0631
- sound $2, $0, 0
- sound $3, $f8, $0621
- sound $2, $0, 0
- sound $3, $f8, $0611
- sound $2, $0, 0
- sound $3, $e8, $0601
- sound $2, $0, 0
- sound $3, $e8, $05f1
- sound $2, $0, 0
+ sound __, 4, $ba, $0631
+ sound __, 3, $0, 0
+ sound __, 4, $f8, $0621
+ sound __, 3, $0, 0
+ sound __, 4, $f8, $0611
+ sound __, 3, $0, 0
+ sound __, 4, $e8, $0601
+ sound __, 3, $0, 0
+ sound __, 4, $e8, $05f1
+ sound __, 3, $0, 0
loopchannel 2, Sfx_Nightmare_branch_f1424
soundinput $8
endchannel
@@ -2505,123 +2505,123 @@
; f1453
Sfx_Snore: ; f1453
- dbw $07, Sfx_Snore_Ch8
+ musicheader 1, 8, 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
+ noise __, 3, $ea, $4b
+ noise __, 3, $ea, $5b
+ noise __, 3, $0, $0
+ noise __, 5, $ee, $47
+ noise __, 5, $ee, $46
+ noise __, 5, $ee, $45
endchannel
; f1469
Sfx_SweetKiss: ; f1469
- dbw $04, Sfx_SweetKiss_Ch5
+ musicheader 1, 5, Sfx_SweetKiss_Ch5
; f146c
Sfx_SweetKiss_Ch5: ; f146c
dutycycle $2
Sfx_SweetKiss_branch_f146e: ; f146e
- sound $2, $c1, $07c8
- sound $2, $d1, $07da
+ sound __, 3, $c1, $07c8
+ sound __, 3, $d1, $07da
loopchannel 2, Sfx_SweetKiss_branch_f146e
- sound $1a, $f1, $07e2
+ sound C_, 11, $f1, $07e2
endchannel
; f147f
Sfx_SweetKiss2: ; f147f
- dbw $04, Sfx_SweetKiss2_Ch5
+ musicheader 1, 5, Sfx_SweetKiss2_Ch5
; f1482
Sfx_SweetKiss2_Ch5: ; f1482
dutycycle $0
soundinput $97
- sound $2, $f4, $0772
- sound $4, $0, 0
- sound $2, $c4, $0772
- sound $4, $0, 0
- sound $2, $b4, $0772
- sound $4, $0, 0
- sound $2, $a1, $0772
+ sound __, 3, $f4, $0772
+ sound __, 5, $0, 0
+ sound __, 3, $c4, $0772
+ sound __, 5, $0, 0
+ sound __, 3, $b4, $0772
+ sound __, 5, $0, 0
+ sound __, 3, $a1, $0772
soundinput $8
endchannel
; f14a5
Sfx_BellyDrum: ; f14a5
- dbw $44, Sfx_BellyDrum_Ch5
- dbw $07, Sfx_BellyDrum_Ch8
+ musicheader 2, 5, Sfx_BellyDrum_Ch5
+ musicheader 1, 8, Sfx_BellyDrum_Ch8
; f14ab
Sfx_BellyDrum_Ch5: ; f14ab
dutycycle $2
soundinput $ac
- sound $c, $f1, $05a3
+ sound __, 13, $f1, $05a3
soundinput $8
endchannel
; f14b6
Sfx_BellyDrum_Ch8: ; f14b6
- noise $c, $b1, $6c
+ noise __, 13, $b1, $6c
endchannel
; f14ba
Sfx_Unknown7F: ; f14ba
- dbw $04, Sfx_Unknown7F_Ch5
+ musicheader 1, 5, Sfx_Unknown7F_Ch5
; f14bd
Sfx_Unknown7F_Ch5: ; f14bd
dutycycle $2
soundinput $95
- sound $2, $c9, $03b3
- sound $5, $f8, $0463
- sound $4, $d1, $0543
+ sound __, 3, $c9, $03b3
+ sound __, 6, $f8, $0463
+ sound __, 5, $d1, $0543
soundinput $8
endchannel
; f14d0
Sfx_SludgeBomb: ; f14d0
- dbw $44, Sfx_SludgeBomb_Ch5
- dbw $07, Sfx_SludgeBomb_Ch8
+ musicheader 2, 5, Sfx_SludgeBomb_Ch5
+ musicheader 1, 8, Sfx_SludgeBomb_Ch8
; f14d6
Sfx_SludgeBomb_Ch5: ; f14d6
dutycycle $2
soundinput $c5
- sound $3, $f8, $0581
- sound $1, $0, 0
+ sound __, 4, $f8, $0581
+ sound __, 2, $0, 0
soundinput $cb
- sound $10, $f2, $05d1
+ sound C_, 1, $f2, $05d1
soundinput $8
endchannel
; f14eb
Sfx_SludgeBomb_Ch8: ; f14eb
- noise $3, $e2, $6e
- noise $1, $0, $0
- noise $10, $e2, $6d
+ noise __, 4, $e2, $6e
+ noise __, 2, $0, $0
+ noise C_, 1, $e2, $6d
endchannel
; f14f5
Sfx_Foresight: ; f14f5
- dbw $04, Sfx_Foresight_Ch5
+ musicheader 1, 5, Sfx_Foresight_Ch5
; f14f8
Sfx_Foresight_Ch5: ; f14f8
- sound $3, $f4, $07b5
- sound $3, $f5, $07c8
- sound $8, $f4, $07da
- sound $2, $0, 0
- sound $8, $c1, $07da
- sound $2, $0, 0
- sound $8, $91, $07da
+ sound __, 4, $f4, $07b5
+ sound __, 4, $f5, $07c8
+ sound __, 9, $f4, $07da
+ sound __, 3, $0, 0
+ sound __, 9, $c1, $07da
+ sound __, 3, $0, 0
+ sound __, 9, $91, $07da
endchannel
; f1515
Sfx_Spite: ; f1515
- dbw $04, Sfx_Spite_Ch5
+ musicheader 1, 5, Sfx_Spite_Ch5
; f1518
Sfx_Spite_Ch5: ; f1518
@@ -2652,21 +2652,21 @@
; f153a
Sfx_Outrage: ; f153a
- dbw $07, Sfx_Outrage_Ch8
+ musicheader 1, 8, 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
+ noise __, 12, $ea, $6c
+ noise __, 12, $ea, $6b
+ noise __, 12, $ea, $6a
+ noise __, 12, $ea, $69
+ noise __, 12, $e1, $59
endchannel
; f154d
Sfx_PerishSong: ; f154d
- dbw $44, Sfx_PerishSong_Ch5
- dbw $05, Sfx_PerishSong_Ch6
+ musicheader 2, 5, Sfx_PerishSong_Ch5
+ musicheader 1, 6, Sfx_PerishSong_Ch6
; f1553
Sfx_PerishSong_Ch5: ; f1553
@@ -2695,113 +2695,113 @@
; f1570
Sfx_GigaDrain: ; f1570
- dbw $44, Sfx_GigaDrain_Ch5
- dbw $07, Sfx_GigaDrain_Ch8
+ musicheader 2, 5, Sfx_GigaDrain_Ch5
+ musicheader 1, 8, 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
+ sound __, 5, $f8, $0680
+ sound C_, 5, $f8, $0680
+ sound C_, 5, $c8, $0660
+ sound C_, 5, $a8, $0670
+ sound C_, 5, $88, $0680
+ sound C_, 5, $f8, $0561
+ sound C_, 5, $c8, $0541
+ sound C_, 5, $a8, $0521
+ sound C_, 5, $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
+ noise __, 5, $c8, $44
+ noise C_, 5, $c8, $50
+ noise C_, 5, $c8, $52
+ noise C_, 5, $c8, $54
+ noise C_, 5, $c8, $56
+ noise D#, 1, $c7, $57
endchannel
; f15b4
Sfx_Attract: ; f15b4
- dbw $04, Sfx_Attract_Ch5
+ musicheader 1, 5, Sfx_Attract_Ch5
; f15b7
Sfx_Attract_Ch5: ; f15b7
dutycycle $0
soundinput $77
- sound $4, $a9, $06f0
- sound $c, $f8, $0720
+ sound __, 5, $a9, $06f0
+ sound __, 13, $f8, $0720
soundinput $7f
- sound $8, $f1, $0740
+ sound __, 9, $f1, $0740
soundinput $8
endchannel
; f15cc
Sfx_Kinesis2: ; f15cc
- dbw $04, Sfx_Kinesis2_Ch5
+ musicheader 1, 5, Sfx_Kinesis2_Ch5
; f15cf
Sfx_Kinesis2_Ch5: ; f15cf
dutycycle $0
- sound $2, $f3, $0796
- sound $2, $23, $0796
- sound $14, $f1, $07c4
+ sound __, 3, $f3, $0796
+ sound __, 3, $23, $0796
+ sound C_, 5, $f1, $07c4
endchannel
; f15de
Sfx_ZapCannon: ; f15de
- dbw $07, Sfx_ZapCannon_Ch8
+ musicheader 1, 8, Sfx_ZapCannon_Ch8
; f15e1
Sfx_ZapCannon_Ch8: ; f15e1
Sfx_ZapCannon_branch_f15e1: ; f15e1
- noise $2, $e1, $49
- noise $0, $0, $0
+ noise __, 3, $e1, $49
+ noise __, 1, $0, $0
loopchannel 8, Sfx_ZapCannon_branch_f15e1
- noise $8, $e1, $49
+ noise __, 9, $e1, $49
endchannel
; f15ef
Sfx_MeanLook: ; f15ef
- dbw $04, Sfx_MeanLook_Ch5
+ musicheader 1, 5, Sfx_MeanLook_Ch5
; f15f2
Sfx_MeanLook_Ch5: ; f15f2
soundinput $77
dutycycle $3
- sound $2, $f8, $0720
+ sound __, 3, $f8, $0720
Sfx_MeanLook_branch_f15fa: ; f15fa
- sound $1, $88, $0660
- sound $2, $f8, $0790
+ sound __, 2, $88, $0660
+ sound __, 3, $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
+ sound __, 13, $f8, $0700
+ sound __, 13, $c8, $0720
+ sound __, 13, $a8, $0700
+ sound __, 13, $78, $0720
+ sound __, 13, $48, $0700
+ sound __, 13, $28, $0720
soundinput $8
endchannel
; f1621
Sfx_HealBell: ; f1621
- dbw $04, Sfx_HealBell_Ch5
+ musicheader 1, 5, 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
+ sound __, 2, $f1, $07da
+ sound __, 2, $d1, $07d9
+ sound __, 2, $f1, $07da
+ sound __, 9, $d1, $07db
endchannel
; f1637
Sfx_Return: ; f1637
- dbw $04, Sfx_Return_Ch5
+ musicheader 1, 5, Sfx_Return_Ch5
; f163a
Sfx_Return_Ch5: ; f163a
@@ -2808,10 +2808,10 @@
dutycycle $0
Sfx_Return_branch_f163c: ; f163c
soundinput $bf
- sound $8, $f1, $0759
+ sound __, 9, $f1, $0759
soundinput $57
- sound $8, $f1, $0759
- sound $10, $0, 0
+ sound __, 9, $f1, $0759
+ sound C_, 1, $0, 0
loopchannel 2, Sfx_Return_branch_f163c
soundinput $8
endchannel
@@ -2818,27 +2818,27 @@
; f1653
Sfx_ExpBar: ; f1653
- dbw $04, Sfx_ExpBar_Ch5
+ musicheader 1, 5, Sfx_ExpBar_Ch5
; f1656
Sfx_ExpBar_Ch5: ; f1656
dutycycle $2
soundinput $d7
- sound $8, $e1, $0750
+ sound __, 9, $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
+ sound __, 9, $48, $06e0
+ sound __, 9, $58, $06f8
+ sound __, 9, $68, $0710
+ sound __, 9, $78, $0728
+ sound __, 9, $88, $0740
+ sound __, 9, $98, $0758
+ sound C_, 1, $a8, $0770
soundinput $8
endchannel
; f167f
Sfx_MilkDrink: ; f167f
- dbw $04, Sfx_MilkDrink_Ch5
+ musicheader 1, 5, Sfx_MilkDrink_Ch5
; f1682
Sfx_MilkDrink_Ch5: ; f1682
@@ -2845,11 +2845,11 @@
dutycycle $2
Sfx_MilkDrink_branch_f1684: ; f1684
soundinput $a4
- sound $2, $ea, $04e0
- sound $d, $f7, $0290
+ sound __, 3, $ea, $04e0
+ sound __, 14, $f7, $0290
soundinput $9e
- sound $4, $c9, $05e1
- sound $2, $0, 0
+ sound __, 5, $c9, $05e1
+ sound __, 3, $0, 0
loopchannel 6, Sfx_MilkDrink_branch_f1684
soundinput $8
endchannel
@@ -2856,7 +2856,7 @@
; f169f
Sfx_Present: ; f169f
- dbw $04, Sfx_Present_Ch5
+ musicheader 1, 5, Sfx_Present_Ch5
; f16a2
Sfx_Present_Ch5: ; f16a2
@@ -2863,60 +2863,60 @@
dutycycle $2
soundinput $d6
Sfx_Present_branch_f16a6: ; f16a6
- sound $2, $f1, $0740
- sound $1, $0, 0
+ sound __, 3, $f1, $0740
+ sound __, 2, $0, 0
loopchannel 3, Sfx_Present_branch_f16a6
- sound $10, $f1, $0780
+ sound C_, 1, $f1, $0780
soundinput $8
endchannel
; f16b9
Sfx_MorningSun: ; f16b9
- dbw $04, Sfx_MorningSun_Ch5
+ musicheader 1, 5, 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
+ sound __, 3, $f1, $07e4
+ sound __, 3, $f1, $07e0
+ sound __, 6, $f2, $07e7
loopchannel 3, Sfx_MorningSun_branch_f16be
- sound $1, $0, 0
- sound $8, $c2, $07e7
- sound $1, $0, 0
- sound $8, $82, $07e7
+ sound __, 2, $0, 0
+ sound __, 9, $c2, $07e7
+ sound __, 2, $0, 0
+ sound __, 9, $82, $07e7
endchannel
; f16df
Sfx_Moonlight: ; f16df
- dbw $04, Sfx_Moonlight_Ch5
+ musicheader 1, 5, Sfx_Moonlight_Ch5
; f16e2
Sfx_Moonlight_Ch5: ; f16e2
dutycycle $2
Sfx_Moonlight_branch_f16e4: ; f16e4
- sound $1, $f8, $07d0
- sound $4, $f1, $07e0
+ sound __, 2, $f8, $07d0
+ sound __, 5, $f1, $07e0
loopchannel 2, Sfx_Moonlight_branch_f16e4
- sound $10, $f1, $07e0
- sound $10, $d1, $07e0
- sound $10, $81, $07e0
+ sound C_, 1, $f1, $07e0
+ sound C_, 1, $d1, $07e0
+ sound C_, 1, $81, $07e0
endchannel
; f16fd
Sfx_Encore: ; f16fd
- dbw $44, Sfx_Encore_Ch5
- dbw $07, Sfx_Encore_Ch8
+ musicheader 2, 5, Sfx_Encore_Ch5
+ musicheader 1, 8, Sfx_Encore_Ch8
; f1703
Sfx_Encore_Ch5: ; f1703
dutycycle $2
soundinput $ce
- sound $10, $0, 0
+ sound C_, 1, $0, 0
Sfx_Encore_branch_f170b: ; f170b
- sound $2, $f8, $0774
- sound $24, $0, 0
+ sound __, 3, $f8, $0774
+ sound C#, 5, $0, 0
loopchannel 2, Sfx_Encore_branch_f170b
soundinput $8
endchannel
@@ -2923,64 +2923,64 @@
; f171a
Sfx_Encore_Ch8: ; f171a
- noise $30, $1f, $36
- noise $30, $76, $36
+ noise D_, 1, $1f, $36
+ noise D_, 1, $76, $36
endchannel
; f1721
Sfx_BeatUp: ; f1721
- dbw $07, Sfx_BeatUp_Ch8
+ musicheader 1, 8, 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
+ noise __, 3, $e8, $69
+ noise __, 7, $d8, $24
+ noise __, 3, $e8, $6c
+ noise __, 5, $c8, $46
+ noise __, 7, $d1, $24
endchannel
; f1734
Sfx_SweetScent: ; f1734
- dbw $04, Sfx_SweetScent_Ch5
+ musicheader 1, 5, Sfx_SweetScent_Ch5
; f1737
Sfx_SweetScent_Ch5: ; f1737
dutycycle $2
soundinput $96
- sound $6, $f8, $0760
- sound $6, $e8, $0720
+ sound __, 7, $f8, $0760
+ sound __, 7, $e8, $0720
soundinput $df
- sound $16, $f1, $0730
+ sound C_, 7, $f1, $0730
soundinput $8
endchannel
; f174c
Sfx_BatonPass: ; f174c
- dbw $44, Sfx_BatonPass_Ch5
- dbw $07, Sfx_BatonPass_Ch8
+ musicheader 2, 5, Sfx_BatonPass_Ch5
+ musicheader 1, 8, Sfx_BatonPass_Ch8
; f1752
Sfx_BatonPass_Ch5: ; f1752
dutycycle $2
soundinput $f7
- sound $20, $f2, $0680
- sound $1, $f1, $0760
- sound $20, $0, 0
- sound $1, $f1, $0760
- sound $1a, $0, 0
- sound $1, $f1, $0760
+ sound C#, 1, $f2, $0680
+ sound __, 2, $f1, $0760
+ sound C#, 1, $0, 0
+ sound __, 2, $f1, $0760
+ sound C_, 11, $0, 0
+ sound __, 2, $f1, $0760
soundinput $8
endchannel
; f1771
Sfx_BatonPass_Ch8: ; f1771
- noise $20, $f2, $20
+ noise C#, 1, $f2, $20
endchannel
; f1775
Sfx_EggCrack: ; f1775
- dbw $04, Sfx_EggCrack_Ch5
+ musicheader 1, 5, Sfx_EggCrack_Ch5
; f1778
Sfx_EggCrack_Ch5: ; f1778
@@ -2996,7 +2996,7 @@
; f1784
Sfx_Evolved: ; f1784
- dbw $04, Sfx_Evolved_Ch5
+ musicheader 1, 5, Sfx_Evolved_Ch5
; f1787
Sfx_Evolved_Ch5: ; f1787
@@ -3021,7 +3021,7 @@
; f179b
Sfx_MasterBall: ; f179b
- dbw $04, Sfx_MasterBall_Ch5
+ musicheader 1, 5, Sfx_MasterBall_Ch5
; f179e
Sfx_MasterBall_Ch5: ; f179e
@@ -3056,7 +3056,7 @@
; f17c0
Sfx_EggHatch: ; f17c0
- dbw $04, Sfx_EggHatch_Ch5
+ musicheader 1, 5, Sfx_EggHatch_Ch5
; f17c3
Sfx_EggHatch_Ch5: ; f17c3
@@ -3079,86 +3079,86 @@
; f17d9
Sfx_GsIntroCharizardFireball: ; f17d9
- dbw $07, Sfx_GsIntroCharizardFireball_Ch8
+ musicheader 1, 8, Sfx_GsIntroCharizardFireball_Ch8
; f17dc
Sfx_GsIntroCharizardFireball_Ch8: ; f17dc
- noise $8, $cf, $4d
- noise $8, $f1, $37
+ noise __, 9, $cf, $4d
+ noise __, 9, $f1, $37
Sfx_GsIntroCharizardFireball_branch_f17e2: ; f17e2
- noise $1, $f8, $4f
- noise $0, $c8, $26
- noise $1, $d8, $5f
- noise $0, $a8, $37
+ noise __, 2, $f8, $4f
+ noise __, 1, $c8, $26
+ noise __, 2, $d8, $5f
+ noise __, 1, $a8, $37
loopchannel 12, Sfx_GsIntroCharizardFireball_branch_f17e2
- noise $3, $f8, $6f
- noise $4, $d8, $5f
- noise $c, $d8, $5c
- noise $28, $d3, $4f
+ noise __, 4, $f8, $6f
+ noise __, 5, $d8, $5f
+ noise __, 13, $d8, $5c
+ noise C#, 9, $d3, $4f
endchannel
; f17ff
Sfx_GsIntroPokemonAppears: ; f17ff
- dbw $07, Sfx_GsIntroPokemonAppears_Ch8
+ musicheader 1, 8, 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
+ noise __, 2, $88, $4f
+ noise __, 3, $8f, $2
+ noise __, 3, $5f, $12
+ noise __, 3, $3f, $22
+ noise __, 1, $f8, $27
+ noise __, 2, $f8, $4f
+ noise __, 9, $f1, $0
endchannel
; f1818
Sfx_Flash: ; f1818
- dbw $04, Sfx_Flash_Ch5
+ musicheader 1, 5, 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
+ sound __, 2, $40, $07e8
+ sound __, 2, $60, $07e8
+ sound __, 3, $80, $07e8
+ sound __, 6, $a0, $07e8
+ sound __, 7, $a0, $07e8
+ sound __, 8, $80, $07e8
+ sound __, 9, $60, $07e8
+ sound __, 10, $30, $07e8
+ sound __, 16, $12, $07e8
soundinput $8
endchannel
; f1846
Sfx_GameFreakLogoGs: ; f1846
- dbw $04, Sfx_GameFreakLogoGs_Ch5
+ musicheader 1, 5, 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
+ sound __, 5, $55, $07e2
+ sound __, 6, $75, $07e2
+ sound __, 7, $94, $07e2
+ sound __, 8, $b4, $07e2
+ sound __, 9, $b3, $07e2
+ sound __, 10, $93, $07e2
+ sound __, 11, $72, $07e2
+ sound __, 11, $53, $07e2
+ sound __, 11, $34, $07e2
+ sound __, 11, $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
+ musicheader 4, 5, Sfx_DexFanfareLessThan20_Ch5
+ musicheader 1, 6, Sfx_DexFanfareLessThan20_Ch6
+ musicheader 1, 7, Sfx_DexFanfareLessThan20_Ch7
+ musicheader 1, 8, Sfx_DexFanfareLessThan20_Ch8
; f1884
Sfx_DexFanfareLessThan20_Ch5: ; f1884
@@ -3181,7 +3181,7 @@
endchannel
; f189a
- db $df
+ togglesfx
Sfx_DexFanfareLessThan20_Ch6: ; f189b
togglesfx
@@ -3201,7 +3201,7 @@
endchannel
; f18ac
- db $df
+ togglesfx
Sfx_DexFanfareLessThan20_Ch7: ; f18ad
togglesfx
@@ -3230,7 +3230,7 @@
endchannel
; f18c7
- db $df
+ togglesfx
Sfx_DexFanfareLessThan20_Ch8: ; f18c8
togglesfx
@@ -3242,13 +3242,13 @@
endchannel
; f18d1
- db $df
+ togglesfx
Sfx_DexFanfare140169: ; f18d2
- dbw $c4, Sfx_DexFanfare140169_Ch5
- dbw $05, Sfx_DexFanfare140169_Ch6
- dbw $06, Sfx_DexFanfare140169_Ch7
- dbw $07, Sfx_DexFanfare140169_Ch8
+ musicheader 4, 5, Sfx_DexFanfare140169_Ch5
+ musicheader 1, 6, Sfx_DexFanfare140169_Ch6
+ musicheader 1, 7, Sfx_DexFanfare140169_Ch7
+ musicheader 1, 8, Sfx_DexFanfare140169_Ch8
; f18de
Sfx_DexFanfare140169_Ch5: ; f18de
@@ -3279,7 +3279,7 @@
endchannel
; f1900
- db $df
+ togglesfx
Sfx_DexFanfare140169_Ch6: ; f1901
togglesfx
@@ -3306,7 +3306,7 @@
endchannel
; f191d
- db $df
+ togglesfx
Sfx_DexFanfare140169_Ch7: ; f191e
togglesfx
@@ -3341,7 +3341,7 @@
endchannel
; f193e
- db $df
+ togglesfx
Sfx_DexFanfare140169_Ch8: ; f193f
togglesfx
@@ -3359,13 +3359,13 @@
endchannel
; f1950
- db $df
+ togglesfx
Sfx_DexFanfare170199: ; f1951
- dbw $c4, Sfx_DexFanfare170199_Ch5
- dbw $05, Sfx_DexFanfare170199_Ch6
- dbw $06, Sfx_DexFanfare170199_Ch7
- dbw $07, Sfx_DexFanfare170199_Ch8
+ musicheader 4, 5, Sfx_DexFanfare170199_Ch5
+ musicheader 1, 6, Sfx_DexFanfare170199_Ch6
+ musicheader 1, 7, Sfx_DexFanfare170199_Ch7
+ musicheader 1, 8, Sfx_DexFanfare170199_Ch8
; f195d
Sfx_DexFanfare170199_Ch5: ; f195d
@@ -3396,7 +3396,7 @@
endchannel
; f1981
- db $df
+ togglesfx
Sfx_DexFanfare170199_Ch6: ; f1982
togglesfx
@@ -3425,7 +3425,7 @@
endchannel
; f19a2
- db $df
+ togglesfx
Sfx_DexFanfare170199_Ch7: ; f19a3
togglesfx
@@ -3454,7 +3454,7 @@
endchannel
; f19bf
- db $df
+ togglesfx
Sfx_DexFanfare170199_Ch8: ; f19c0
togglesfx
@@ -3480,10 +3480,10 @@
db $fd
Sfx_DexFanfare200229: ; f19d6
- dbw $c4, Sfx_DexFanfare200229_Ch5
- dbw $05, Sfx_DexFanfare200229_Ch6
- dbw $06, Sfx_DexFanfare200229_Ch7
- dbw $07, Sfx_DexFanfare200229_Ch8
+ musicheader 4, 5, Sfx_DexFanfare200229_Ch5
+ musicheader 1, 6, Sfx_DexFanfare200229_Ch6
+ musicheader 1, 7, Sfx_DexFanfare200229_Ch7
+ musicheader 1, 8, Sfx_DexFanfare200229_Ch8
; f19e2
Sfx_DexFanfare200229_Ch5: ; f19e2
@@ -3512,7 +3512,7 @@
endchannel
; f1a03
- db $df
+ togglesfx
Sfx_DexFanfare200229_Ch6: ; f1a04
togglesfx
@@ -3536,7 +3536,7 @@
endchannel
; f1a1e
- db $df
+ togglesfx
Sfx_DexFanfare200229_Ch7: ; f1a1f
togglesfx
@@ -3581,7 +3581,7 @@
endchannel
; f1a49
- db $df
+ togglesfx
Sfx_DexFanfare200229_Ch8: ; f1a4a
togglesfx
@@ -3611,13 +3611,13 @@
endchannel
; f1a65
- db $df
+ togglesfx
Sfx_DexFanfare230Plus: ; f1a66
- dbw $c4, Sfx_DexFanfare230Plus_Ch5
- dbw $05, Sfx_DexFanfare230Plus_Ch6
- dbw $06, Sfx_DexFanfare230Plus_Ch7
- dbw $07, Sfx_DexFanfare230Plus_Ch8
+ musicheader 4, 5, Sfx_DexFanfare230Plus_Ch5
+ musicheader 1, 6, Sfx_DexFanfare230Plus_Ch6
+ musicheader 1, 7, Sfx_DexFanfare230Plus_Ch7
+ musicheader 1, 8, Sfx_DexFanfare230Plus_Ch8
; f1a72
Sfx_DexFanfare230Plus_Ch5: ; f1a72
@@ -3667,7 +3667,7 @@
endchannel
; f1ab1
- db $df
+ togglesfx
Sfx_DexFanfare230Plus_Ch6: ; f1ab2
togglesfx
@@ -3703,7 +3703,7 @@
endchannel
; f1ad9
- db $df
+ togglesfx
Sfx_DexFanfare230Plus_Ch7: ; f1ada
togglesfx
@@ -3753,7 +3753,7 @@
endchannel
; f1b0b
- db $df
+ togglesfx
Sfx_DexFanfare230Plus_Ch8: ; f1b0c
togglesfx
@@ -3790,202 +3790,202 @@
endchannel
; f1b32
- db $df
+ togglesfx
Sfx_NotVeryEffective: ; f1b33
- dbw $07, Sfx_NotVeryEffective_Ch8
+ musicheader 1, 8, Sfx_NotVeryEffective_Ch8
; f1b36
Sfx_NotVeryEffective_Ch8: ; f1b36
- noise $4, $f1, $5f
- noise $1, $a0, $42
- noise $10, $f1, $53
+ noise __, 5, $f1, $5f
+ noise __, 2, $a0, $42
+ noise C_, 1, $f1, $53
endchannel
; f1b40
Sfx_Damage: ; f1b40
- dbw $07, Sfx_Damage_Ch8
+ musicheader 1, 8, Sfx_Damage_Ch8
; f1b43
Sfx_Damage_Ch8: ; f1b43
- noise $4, $f1, $5e
- noise $1, $a0, $12
- noise $4, $f0, $32
- noise $10, $f1, $44
+ noise __, 5, $f1, $5e
+ noise __, 2, $a0, $12
+ noise __, 5, $f0, $32
+ noise C_, 1, $f1, $44
endchannel
; f1b50
Sfx_SuperEffective: ; f1b50
- dbw $07, Sfx_SuperEffective_Ch8
+ musicheader 1, 8, 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
+ noise __, 4, $f1, $4f
+ noise __, 2, $c8, $22
+ noise __, 3, $f8, $3f
+ noise __, 4, $d0, $15
+ noise C#, 1, $f2, $35
endchannel
; f1b63
Sfx_BallBounce: ; f1b63
- dbw $44, Sfx_BallBounce_Ch5
- dbw $05, Sfx_BallBounce_Ch6
+ musicheader 2, 5, Sfx_BallBounce_Ch5
+ musicheader 1, 6, Sfx_BallBounce_Ch6
; f1b69
Sfx_BallBounce_Ch5: ; f1b69
dutycycle $2
- sound $8, $e1, $0740
- sound $17, $0, 0
- sound $8, $b1, $0740
- sound $17, $0, 0
- sound $8, $81, $0740
- sound $17, $0, 0
- sound $8, $51, $0740
- sound $17, $0, 0
+ sound __, 9, $e1, $0740
+ sound C_, 8, $0, 0
+ sound __, 9, $b1, $0740
+ sound C_, 8, $0, 0
+ sound __, 9, $81, $0740
+ sound C_, 8, $0, 0
+ sound __, 9, $51, $0740
+ sound C_, 8, $0, 0
endchannel
; f1b8c
Sfx_BallBounce_Ch6: ; f1b8c
dutycycle $2
- sound $2, $8, 0
- sound $8, $b1, $0741
- sound $17, $0, 0
- sound $8, $81, $0741
- sound $17, $0, 0
- sound $8, $51, $0741
- sound $17, $0, 0
- sound $8, $21, $0741
- sound $17, $0, 0
+ sound __, 3, $8, 0
+ sound __, 9, $b1, $0741
+ sound C_, 8, $0, 0
+ sound __, 9, $81, $0741
+ sound C_, 8, $0, 0
+ sound __, 9, $51, $0741
+ sound C_, 8, $0, 0
+ sound __, 9, $21, $0741
+ sound C_, 8, $0, 0
endchannel
; f1bb3
Sfx_SweetScent2: ; f1bb3
- dbw $44, Sfx_SweetScent2_Ch5
- dbw $07, Sfx_SweetScent2_Ch8
+ musicheader 2, 5, Sfx_SweetScent2_Ch5
+ musicheader 1, 8, Sfx_SweetScent2_Ch8
; f1bb9
Sfx_SweetScent2_Ch5: ; f1bb9
soundinput $af
dutycycle $1
- sound $6, $f8, $05f0
- sound $2, $f1, $0620
- sound $10, $f1, $0650
+ sound __, 7, $f8, $05f0
+ sound __, 3, $f1, $0620
+ sound C_, 1, $f1, $0650
soundinput $8
endchannel
; f1bcc
Sfx_SweetScent2_Ch8: ; f1bcc
- noise $2, $e8, $22
- noise $11, $aa, $0
+ noise __, 3, $e8, $22
+ noise C_, 2, $aa, $0
Sfx_SweetScent2_branch_f1bd2: ; f1bd2
- noise $4, $d9, $10
- noise $8, $91, $0
- noise $2, $61, $7
+ noise __, 5, $d9, $10
+ noise __, 9, $91, $0
+ noise __, 3, $61, $7
loopchannel 5, Sfx_SweetScent2_branch_f1bd2
- noise $4, $99, $0
- noise $a, $61, $0
- noise $6, $59, $0
- noise $2, $21, $7
+ noise __, 5, $99, $0
+ noise __, 11, $61, $0
+ noise __, 7, $59, $0
+ noise __, 3, $21, $7
endchannel
; f1bec
Sfx_HitEndOfExpBar: ; f1bec
- dbw $44, Sfx_HitEndOfExpBar_Ch5
- dbw $05, Sfx_HitEndOfExpBar_Ch6
+ musicheader 2, 5, Sfx_HitEndOfExpBar_Ch5
+ musicheader 1, 6, Sfx_HitEndOfExpBar_Ch6
; f1bf2
Sfx_HitEndOfExpBar_Ch5: ; f1bf2
dutycycle $2
- sound $1, $e1, $0789
- sound $1, $e1, $07a2
- sound $10, $e1, $07b1
+ sound __, 2, $e1, $0789
+ sound __, 2, $e1, $07a2
+ sound C_, 1, $e1, $07b1
endchannel
; f1c01
Sfx_HitEndOfExpBar_Ch6: ; f1c01
dutycycle $2
- sound $1, $e1, $07a2
- sound $1, $e1, $07b1
- sound $10, $e1, $07c4
+ sound __, 2, $e1, $07a2
+ sound __, 2, $e1, $07b1
+ sound C_, 1, $e1, $07c4
endchannel
; f1c10
Sfx_GiveTrademon: ; f1c10
- dbw $04, Sfx_GiveTrademon_Ch5
+ musicheader 1, 5, Sfx_GiveTrademon_Ch5
; f1c13
Sfx_GiveTrademon_Ch5: ; f1c13
- sound $20, $0, 0
+ sound C#, 1, $0, 0
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
+ sound C_, 12, $f4, $0750
+ sound C_, 12, $d4, $0750
+ sound C_, 12, $b4, $0750
+ sound C_, 12, $94, $0750
+ sound C_, 12, $74, $0750
+ sound C_, 12, $54, $0750
+ sound C_, 12, $34, $0750
+ sound C_, 12, $14, $0750
soundinput $8
endchannel
; f1c3e
Sfx_GetTrademon: ; f1c3e
- dbw $04, Sfx_GetTrademon_Ch5
+ musicheader 1, 5, Sfx_GetTrademon_Ch5
; f1c41
Sfx_GetTrademon_Ch5: ; f1c41
- sound $20, $0, 0
+ sound C#, 1, $0, 0
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
+ sound C_, 12, $14, $07bc
+ sound C_, 12, $34, $07bc
+ sound C_, 12, $54, $07bc
+ sound C_, 12, $74, $07bc
+ sound C_, 12, $94, $07bc
+ sound C_, 12, $b4, $07bc
+ sound C_, 12, $d4, $07bc
+ sound C_, 12, $f4, $07bc
soundinput $8
endchannel
; f1c6c
Sfx_TrainArrived: ; f1c6c
- dbw $84, Sfx_TrainArrived_Ch5
- dbw $05, Sfx_TrainArrived_Ch6
- dbw $07, Sfx_TrainArrived_Ch8
+ musicheader 3, 5, Sfx_TrainArrived_Ch5
+ musicheader 1, 6, Sfx_TrainArrived_Ch6
+ musicheader 1, 8, Sfx_TrainArrived_Ch8
; f1c75
Sfx_TrainArrived_Ch6: ; f1c75
tone $0008
- sound $8, $0, 0
+ sound __, 9, $0, 0
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
+ sound __, 5, $5f, $0691
+ sound __, 5, $6f, $0694
+ sound __, 5, $78, $0697
+ sound __, 5, $7f, $069a
+ sound __, 5, $68, $06ae
+ sound C_, 1, $6f, $06ab
+ sound F_, 9, $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
+ noise __, 6, $af, $10
+ noise __, 5, $9f, $20
+ noise __, 5, $8f, $21
+ noise __, 5, $7f, $22
+ noise __, 5, $8f, $21
+ noise __, 5, $9f, $20
+ noise __, 5, $9f, $10
+ noise F_, 9, $a3, $0
endchannel
; f1cb4
Sfx_2Boops: ; f1cb4
- dbw $04, Sfx_2Boops_Ch5
+ musicheader 1, 5, Sfx_2Boops_Ch5
; f1cb7
Sfx_2Boops_Ch5: ; f1cb7
@@ -3992,10 +3992,10 @@
dutycycle $2
Sfx_2Boops_branch_f1cb9: ; f1cb9
soundinput $79
- sound $1, $99, $0563
- sound $4, $f2, $04b5
+ sound __, 2, $99, $0563
+ sound __, 5, $f2, $04b5
soundinput $43
- sound $10, $f8, $05cd
+ sound C_, 1, $f8, $05cd
loopchannel 2, Sfx_2Boops_branch_f1cb9
soundinput $8
endchannel
@@ -4002,12 +4002,12 @@
; f1cd0
Sfx_UnknownCB: ; f1cd0
- dbw $07, Sfx_UnknownCB_Ch8
+ musicheader 1, 8, Sfx_UnknownCB_Ch8
; f1cd3
Sfx_Menu_Ch8: ; f1cd3
- noise $1, $e2, $33
- noise $8, $e1, $22
+ noise __, 2, $e2, $33
+ noise __, 9, $e1, $22
endchannel
; f1cda
@@ -4038,30 +4038,30 @@
; 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
+ noise __, 3, $f7, $24
+ noise __, 3, $f7, $34
+ noise __, 5, $f7, $44
+ noise __, 9, $f4, $55
+ noise __, 9, $f1, $44
endchannel
; f1d08
Sfx_EnterDoor_Ch8: ; f1d08
- noise $9, $f1, $44
- noise $8, $d1, $43
+ noise __, 10, $f1, $44
+ noise __, 9, $d1, $43
endchannel
; f1d0f
Sfx_SwitchPokemon_Ch5: ; f1d0f
dutycycle $2
- sound $8, $e1, $0740
+ sound __, 9, $e1, $0740
endchannel
; f1d16
Sfx_SwitchPokemon_Ch6: ; f1d16
dutycycle $2
- sound $2, $8, 0
- sound $8, $b1, $0741
+ sound __, 3, $8, 0
+ sound __, 9, $b1, $0741
endchannel
; f1d21
@@ -4068,9 +4068,9 @@
Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21
dutycycle $2
soundinput $3a
- sound $4, $f2, $0200
+ sound __, 5, $f2, $0200
soundinput $22
- sound $8, $e2, $0200
+ sound __, 9, $e2, $0200
soundinput $8
endchannel
; f1d32
@@ -4078,9 +4078,9 @@
Sfx_BallWiggle_Ch5: ; f1d32
dutycycle $2
soundinput $3a
- sound $4, $f2, $0400
+ sound __, 5, $f2, $0400
soundinput $22
- sound $8, $e2, $0400
+ sound __, 9, $e2, $0400
soundinput $8
endchannel
; f1d43
@@ -4087,29 +4087,29 @@
Sfx_Tally_Ch5: ; f1d43
dutycycle $2
- sound $4, $f1, $0780
+ sound __, 5, $f1, $0780
endchannel
; f1d4a
Sfx_Tally_Ch6: ; f1d4a
dutycycle $2
- sound $1, $8, 0
- sound $4, $a1, $0761
+ sound __, 2, $8, 0
+ sound __, 5, $a1, $0761
endchannel
; f1d55
Sfx_Transaction_Ch5: ; f1d55
dutycycle $2
- sound $4, $e1, $0700
- sound $18, $f2, $07e0
+ sound __, 5, $e1, $0700
+ sound C_, 9, $f2, $07e0
endchannel
; f1d60
Sfx_Transaction_Ch6: ; f1d60
dutycycle $2
- sound $1, $8, 0
- sound $4, $91, $06c1
- sound $18, $a2, $07a1
+ sound __, 2, $8, 0
+ sound __, 5, $91, $06c1
+ sound C_, 9, $a2, $07a1
endchannel
; f1d6f
@@ -4116,17 +4116,17 @@
Sfx_Bump_Ch5: ; f1d6f
dutycycle $2
soundinput $5a
- sound $f, $f1, $0300
+ sound __, 16, $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
+ noise __, 3, $f1, $54
+ noise __, 13, $71, $23
+ noise __, 3, $b1, $54
+ noise __, 13, $61, $23
+ noise __, 7, $41, $54
endchannel
; f1d8a
@@ -4133,10 +4133,10 @@
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
+ sound __, 1, $91, $07c0
+ sound __, 1, $81, $07d0
+ sound __, 1, $91, $07c0
+ sound __, 13, $a1, $07d0
endchannel
; f1d9d
@@ -4143,8 +4143,8 @@
Sfx_Potion_Ch5: ; f1d9d
dutycycle $2
soundinput $17
- sound $f, $f0, $04f0
- sound $f, $f2, $0650
+ sound __, 16, $f0, $04f0
+ sound __, 16, $f2, $0650
soundinput $8
endchannel
; f1dac
@@ -4153,9 +4153,9 @@
Sfx_Poison_branch_f1dac: ; f1dac
dutycycle $0
soundinput $14
- sound $4, $f2, $0600
+ sound __, 5, $f2, $0600
loopchannel 4, Sfx_Poison_branch_f1dac
- sound $f, $f3, $0600
+ sound __, 16, $f3, $0600
soundinput $8
endchannel
; f1dbf
@@ -4163,10 +4163,10 @@
Sfx_FullHeal_Ch5: ; f1dbf
dutycycle $2
soundinput $14
- sound $4, $f2, $0600
- sound $4, $f2, $0600
+ sound __, 5, $f2, $0600
+ sound __, 5, $f2, $0600
soundinput $17
- sound $f, $f2, $0600
+ sound __, 16, $f2, $0600
soundinput $8
endchannel
; f1dd4
@@ -4174,8 +4174,8 @@
Sfx_GotSafariBalls_Ch5: ; f1dd4
dutycycle $2
soundinput $15
- sound $f, $f0, $04f0
- sound $f, $f2, $0650
+ sound __, 16, $f0, $04f0
+ sound __, 16, $f2, $0650
soundinput $8
endchannel
; f1de3
@@ -4182,34 +4182,34 @@
Sfx_BootPc_Ch5: ; f1de3
dutycycle $2
- sound $f, $f2, $07c0
- sound $f, $0, 0
- 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
+ sound __, 16, $f2, $07c0
+ sound __, 16, $0, 0
+ sound __, 4, $a1, $0780
+ sound __, 4, $a1, $0700
+ sound __, 4, $a1, $0740
+ sound __, 4, $a1, $0700
+ sound __, 4, $a1, $0780
+ sound __, 4, $a1, $0700
+ sound __, 4, $a1, $07c0
+ sound __, 9, $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, 0
+ sound __, 5, $f0, $0600
+ sound __, 5, $f0, $0400
+ sound __, 5, $f0, $0200
+ sound __, 2, $0, 0
endchannel
; f1e21
Sfx_ChoosePcOption_Ch5: ; f1e21
dutycycle $2
- sound $6, $f0, $0700
- sound $4, $0, 0
- sound $6, $f0, $0700
- sound $1, $0, 0
+ sound __, 7, $f0, $0700
+ sound __, 5, $0, 0
+ sound __, 7, $f0, $0700
+ sound __, 2, $0, 0
endchannel
; f1e34
@@ -4216,11 +4216,11 @@
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
+ sound __, 16, $d7, $0600
+ sound __, 16, $b7, $0580
+ sound __, 16, $87, $0500
+ sound __, 16, $47, $0480
+ sound __, 16, $17, $0400
soundinput $8
endchannel
; f1e4f
@@ -4227,11 +4227,11 @@
Sfx_PushButton_Ch5: ; f1e4f
dutycycle $2
- sound $4, $0, 0
- sound $2, $f1, $0680
- sound $1, $0, 0
- sound $4, $f1, $0780
- sound $4, $0, 0
+ sound __, 5, $0, 0
+ sound __, 3, $f1, $0680
+ sound __, 2, $0, 0
+ sound __, 5, $f1, $0780
+ sound __, 5, $0, 0
endchannel
; f1e66
@@ -4238,11 +4238,11 @@
Sfx_SecondPartOfItemfinder_Ch5: ; f1e66
dutycycle $2
soundinput $2c
- sound $4, $f2, $0500
+ sound __, 5, $f2, $0500
soundinput $22
- sound $2, $f1, $0500
+ sound __, 3, $f1, $0500
soundinput $8
- sound $1, $0, 0
+ sound __, 2, $0, 0
endchannel
; f1e7b
@@ -4249,11 +4249,11 @@
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
+ sound __, 16, $d7, $0500
+ sound __, 16, $b7, $0580
+ sound __, 16, $87, $0600
+ sound __, 16, $47, $0680
+ sound __, 16, $17, $0700
soundinput $8
endchannel
; f1e96
@@ -4261,11 +4261,11 @@
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
+ sound __, 16, $d7, $0700
+ sound __, 16, $b7, $0680
+ sound __, 16, $87, $0600
+ sound __, 16, $47, $0580
+ sound __, 16, $17, $0500
soundinput $8
endchannel
; f1eb1
@@ -4273,7 +4273,7 @@
Sfx_ChangeDexMode_Ch5: ; f1eb1
dutycycle $1
soundinput $16
- sound $f, $d2, $0500
+ sound __, 16, $d2, $0500
soundinput $8
endchannel
; f1ebc
@@ -4281,36 +4281,36 @@
Sfx_JumpOverLedge_Ch5: ; f1ebc
dutycycle $2
soundinput $95
- sound $f, $f2, $0400
+ sound __, 16, $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
+ noise __, 3, $f1, $32
+ noise __, 3, $0, $0
+ noise __, 3, $f1, $22
+ noise __, 2, $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
+ noise __, 3, $f1, $12
+ noise __, 3, $0, $0
+ noise __, 3, $a1, $12
+ noise __, 3, $0, $0
+ noise __, 3, $d1, $12
+ noise __, 3, $0, $0
+ noise __, 3, $81, $12
+ noise __, 3, $0, $0
+ noise __, 3, $b1, $12
+ noise __, 3, $0, $0
+ noise __, 3, $61, $12
+ noise __, 3, $0, $0
+ noise __, 3, $91, $12
+ noise __, 3, $0, $0
+ noise __, 3, $41, $12
+ noise __, 3, $0, $0
endchannel
; f1f05
@@ -4317,20 +4317,20 @@
Sfx_Wrong_Ch5: ; f1f05
dutycycle $3
soundinput $5a
- sound $4, $f0, $0500
+ sound __, 5, $f0, $0500
soundinput $8
- sound $4, $0, 0
- sound $f, $f0, $0500
- sound $1, $0, 0
+ sound __, 5, $0, 0
+ sound __, 16, $f0, $0500
+ sound __, 2, $0, 0
endchannel
; f1f1c
Sfx_Wrong_Ch6: ; f1f1c
dutycycle $3
- sound $4, $f0, $0401
- sound $4, $0, 0
- sound $f, $f0, $0401
- sound $1, $0, 0
+ sound __, 5, $f0, $0401
+ sound __, 5, $0, 0
+ sound __, 16, $f0, $0401
+ sound __, 2, $0, 0
endchannel
; f1f2f
@@ -4337,44 +4337,44 @@
Sfx_Squeak_Ch5: ; f1f2f
dutycycle $0
soundinput $17
- sound $f, $d2, $0700
+ sound __, 16, $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
+ noise __, 5, $a2, $23
+ noise __, 9, $f1, $34
+ noise __, 16, $0, $0
+ noise __, 3, $f7, $24
+ noise __, 3, $f7, $34
+ noise __, 5, $f7, $44
+ noise __, 9, $f4, $55
+ noise __, 9, $f1, $44
endchannel
; f1f53
Sfx_Boat_Ch5: ; f1f53
dutycycle $2
- sound $f, $f0, $0500
- sound $4, $0, 0
- sound $f, $f0, $0500
- sound $f, $f0, $0500
- sound $f, $f0, $0500
- sound $f, $f0, $0500
- sound $f, $f2, $0500
+ sound __, 16, $f0, $0500
+ sound __, 5, $0, 0
+ sound __, 16, $f0, $0500
+ sound __, 16, $f0, $0500
+ sound __, 16, $f0, $0500
+ sound __, 16, $f0, $0500
+ sound __, 16, $f2, $0500
endchannel
; f1f72
Sfx_Boat_Ch6: ; f1f72
dutycycle $3
- sound $f, $f0, $0482
- sound $4, $0, 0
- sound $f, $f0, $0482
- sound $f, $f0, $0482
- sound $f, $f0, $0482
- sound $f, $f0, $0482
- sound $f, $f2, $0482
+ sound __, 16, $f0, $0482
+ sound __, 5, $0, 0
+ sound __, 16, $f0, $0482
+ sound __, 16, $f0, $0482
+ sound __, 16, $f0, $0482
+ sound __, 16, $f0, $0482
+ sound __, 16, $f2, $0482
endchannel
; f1f91
@@ -4381,13 +4381,13 @@
Sfx_WallOpen_Ch5: ; f1f91
dutycycle $1
soundinput $3a
- sound $4, $f2, $0500
+ sound __, 5, $f2, $0500
soundinput $22
- sound $4, $e2, $0500
+ sound __, 5, $e2, $0500
soundinput $3a
- sound $4, $f2, $0700
+ sound __, 5, $f2, $0700
soundinput $22
- sound $f, $e2, $0700
+ sound __, 16, $e2, $0700
soundinput $8
endchannel
; f1fae
@@ -4394,12 +4394,12 @@
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
+ sound __, 16, $f3, $0730
+ sound __, 9, $65, $0730
+ sound __, 16, $f4, $0700
+ sound __, 16, $74, $0700
+ sound __, 16, $44, $0700
+ sound __, 16, $24, $0700
endchannel
; f1fc9
@@ -4406,24 +4406,24 @@
Sfx_ThrowBall_Ch5: ; f1fc9
dutycycle $2
soundinput $2f
- sound $f, $f2, $0780
+ sound __, 16, $f2, $0780
endchannel
; f1fd2
Sfx_ThrowBall_Ch6: ; f1fd2
dutycycle $2
- sound $f, $c2, $0782
+ sound __, 16, $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, 0
+ sound __, 1, $d2, $0700
+ sound __, 1, $d2, $0740
+ sound __, 1, $d2, $0780
+ sound __, 1, $d2, $07c0
+ sound __, 11, $e1, $07e0
+ sound __, 2, $0, 0
endchannel
; f1ff4
@@ -4430,41 +4430,41 @@
Sfx_BallPoof_Ch5: ; f1ff4
dutycycle $2
soundinput $16
- sound $f, $f2, $0400
+ sound __, 16, $f2, $0400
soundinput $8
endchannel
; f1fff
Sfx_BallPoof_Ch8: ; f1fff
- noise $f, $a2, $22
+ noise __, 16, $a2, $22
endchannel
; f2003
Sfx_Unknown3A_Ch5: ; f2003
- sound $f, $d1, $0200
+ sound __, 16, $d1, $0200
soundinput $8
endchannel
; f200a
Sfx_Unknown3A_Ch8: ; f200a
- noise $4, $f5, $33
- noise $8, $f4, $22
- noise $f, $f2, $21
+ noise __, 5, $f5, $33
+ noise __, 9, $f4, $22
+ noise __, 16, $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
+ noise __, 3, $61, $23
+ noise __, 3, $a1, $33
+ noise __, 3, $c1, $33
+ noise __, 3, $51, $11
+ noise __, 3, $f1, $33
+ noise __, 3, $41, $11
+ noise __, 3, $c1, $33
+ noise __, 3, $31, $11
+ noise __, 3, $81, $33
+ noise __, 3, $31, $11
+ noise __, 9, $41, $33
endchannel
; f2036
@@ -4471,9 +4471,9 @@
Sfx_SlotMachineStart_Ch5: ; f2036
dutycycle $2
soundinput $44
- sound $f, $f0, $04f0
+ sound __, 16, $f0, $04f0
soundinput $17
- sound $f, $f2, $0650
+ sound __, 16, $f2, $0650
soundinput $8
endchannel
; f2047
@@ -4480,25 +4480,25 @@
Sfx_SlotMachineStart_Ch6: ; f2047
dutycycle $2
- sound $f, $92, $0600
- sound $f, $92, $0782
+ sound __, 16, $92, $0600
+ sound __, 16, $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
+ sound __, 5, $f7, $07a0
+ sound __, 5, $f7, $07a0
+ sound __, 5, $f7, $07a0
+ sound __, 5, $f7, $07a0
+ sound __, 5, $f7, $07a0
soundinput $8
- sound $4, $0, 0
+ sound __, 5, $0, 0
endchannel
; f206f
Sfx_Peck_Ch8: ; f206f
- noise $2, $a1, $12
+ noise __, 3, $a1, $12
endchannel
; f2073
@@ -4505,7 +4505,7 @@
Sfx_Kinesis_Ch5: ; f2073
dutycycle $1
soundinput $af
- sound $f, $f2, $0780
+ sound __, 16, $f2, $0780
soundinput $8
endchannel
; f207e
@@ -4513,151 +4513,151 @@
Sfx_Lick_Ch5: ; f207e
dutycycle $1
soundinput $97
- sound $f, $f2, $0500
+ sound __, 16, $f2, $0500
soundinput $8
endchannel
; f2089
Sfx_Pound_Ch8: ; f2089
- noise $2, $a1, $22
+ noise __, 3, $a1, $22
endchannel
; f208d
Sfx_MovePuzzlePiece_Ch8: ; f208d
- noise $8, $f1, $54
+ noise __, 9, $f1, $54
endchannel
; f2091
Sfx_CometPunch_Ch8: ; f2091
- noise $f, $8f, $11
- noise $4, $ff, $12
- noise $a, $f1, $55
+ noise __, 16, $8f, $11
+ noise __, 5, $ff, $12
+ noise __, 11, $f1, $55
endchannel
; f209b
Sfx_MegaPunch_Ch8: ; f209b
- noise $f, $8f, $34
- noise $8, $f2, $35
- noise $a, $f1, $55
+ noise __, 16, $8f, $34
+ noise __, 9, $f2, $35
+ noise __, 11, $f1, $55
endchannel
; f20a5
Sfx_Scratch_Ch8: ; f20a5
- noise $f, $9f, $23
- noise $8, $f1, $21
+ noise __, 16, $9f, $23
+ noise __, 9, $f1, $21
endchannel
; f20ac
Sfx_Vicegrip_Ch8: ; f20ac
- noise $2, $e1, $4b
- noise $a, $f1, $44
- noise $2, $e1, $3a
- noise $6, $f1, $34
+ noise __, 3, $e1, $4b
+ noise __, 11, $f1, $44
+ noise __, 3, $e1, $3a
+ noise __, 7, $f1, $34
endchannel
; f20b9
Sfx_RazorWind_Ch8: ; f20b9
- noise $2, $f4, $44
- noise $2, $f4, $14
- noise $f, $f1, $32
+ noise __, 3, $f4, $44
+ noise __, 3, $f4, $14
+ noise __, 16, $f1, $32
endchannel
; f20c3
Sfx_Cut_Ch8: ; f20c3
- noise $4, $8f, $55
- noise $2, $f4, $44
- noise $8, $f4, $22
- noise $f, $f2, $21
+ noise __, 5, $8f, $55
+ noise __, 3, $f4, $44
+ noise __, 9, $f4, $22
+ noise __, 16, $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
+ noise __, 9, $4f, $23
+ noise __, 5, $c4, $22
+ noise __, 7, $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
+ noise __, 9, $4f, $33
+ noise __, 5, $c4, $22
+ noise __, 7, $f2, $23
+ noise __, 16, $f2, $22
endchannel
; f20eb
Sfx_Bind_Ch8: ; f20eb
- noise $8, $ff, $32
- noise $8, $f4, $43
- noise $8, $f2, $54
- noise $8, $f1, $65
+ noise __, 9, $ff, $32
+ noise __, 9, $f4, $43
+ noise __, 9, $f2, $54
+ noise __, 9, $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
+ noise __, 2, $c2, $33
+ noise __, 3, $f2, $21
+ noise __, 2, $e2, $33
+ noise __, 2, $c2, $32
+ noise __, 2, $92, $12
+ noise __, 2, $b2, $31
+ noise __, 13, $91, $10
+ noise __, 9, $f2, $41
endchannel
; f2111
Sfx_DoubleKick_Ch8: ; f2111
- noise $1, $94, $23
- noise $1, $b4, $22
- noise $8, $f1, $44
+ noise __, 2, $94, $23
+ noise __, 2, $b4, $22
+ noise __, 9, $f1, $44
endchannel
; f211b
Sfx_MegaKick_Ch8: ; f211b
- noise $2, $94, $33
- noise $4, $b4, $22
- noise $4, $f1, $44
- noise $8, $f1, $55
+ noise __, 3, $94, $33
+ noise __, 5, $b4, $22
+ noise __, 5, $f1, $44
+ noise __, 9, $f1, $55
endchannel
; f2128
Sfx_Headbutt_Ch8: ; f2128
- noise $4, $ff, $55
- noise $8, $f1, $65
+ noise __, 5, $ff, $55
+ noise __, 9, $f1, $65
endchannel
; f212f
Sfx_HornAttack_Ch8: ; f212f
- noise $2, $84, $43
- noise $2, $c4, $22
- noise $8, $f2, $34
+ noise __, 3, $84, $43
+ noise __, 3, $c4, $22
+ noise __, 9, $f2, $34
endchannel
; f2139
Sfx_Tackle_Ch8: ; f2139
- noise $4, $f1, $34
- noise $f, $f2, $64
+ noise __, 5, $f1, $34
+ noise __, 16, $f2, $64
endchannel
; f2140
Sfx_PoisonSting_Ch8: ; f2140
- noise $2, $f1, $22
- noise $f, $f2, $12
+ noise __, 3, $f1, $22
+ noise __, 16, $f2, $12
endchannel
; f2147
Sfx_Powder_Ch8: ; f2147
- noise $2, $c2, $1
- noise $f, $f4, $1
- noise $f, $f2, $1
+ noise __, 3, $c2, $1
+ noise __, 16, $f4, $1
+ noise __, 16, $f2, $1
endchannel
; f2151
Sfx_Doubleslap_Ch8: ; f2151
- noise $8, $f1, $32
- noise $8, $f1, $33
+ noise __, 9, $f1, $32
+ noise __, 9, $f1, $33
endchannel
; f2158
@@ -4664,56 +4664,56 @@
Sfx_Bite_Ch5: ; f2158
dutycycle $0
soundinput $3a
- sound $4, $f2, $0200
+ sound __, 5, $f2, $0200
soundinput $22
- sound $8, $e2, $0200
+ sound __, 9, $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
+ noise __, 1, $d1, $42
+ noise __, 5, $a1, $32
+ noise __, 1, $d1, $22
+ noise __, 7, $a1, $32
endchannel
; f2176
Sfx_JumpKick_Ch8: ; f2176
- noise $3, $92, $31
- noise $3, $b2, $32
- noise $3, $c2, $33
- noise $8, $f1, $54
+ noise __, 4, $92, $31
+ noise __, 4, $b2, $32
+ noise __, 4, $c2, $33
+ noise __, 9, $f1, $54
endchannel
; f2183
Sfx_Stomp_Ch8: ; f2183
- noise $c, $f1, $54
- noise $8, $f1, $64
+ noise __, 13, $f1, $54
+ noise __, 9, $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
+ noise __, 3, $f1, $33
+ noise __, 3, $c1, $32
+ noise __, 3, $a1, $31
+ noise __, 16, $82, $32
+ noise __, 9, $f1, $34
endchannel
; f219a
Sfx_KarateChop_Ch8: ; f219a
- noise $2, $d2, $32
- noise $f, $f2, $43
+ noise __, 3, $d2, $32
+ noise __, 16, $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
+ noise __, 3, $f2, $43
+ noise __, 5, $b5, $32
+ noise __, 10, $86, $31
+ noise __, 8, $64, $0
+ noise __, 16, $f2, $55
endchannel
; f21b1
@@ -4720,61 +4720,61 @@
Sfx_WaterGun_Ch5: ; f21b1
dutycycle $1
soundinput $97
- sound $f, $f2, $0700
+ sound __, 16, $f2, $0700
soundinput $8
endchannel
; f21bc
Sfx_WaterGun_Ch8: ; f21bc
- noise $f, $3f, $22
- noise $f, $f2, $21
+ noise __, 16, $3f, $22
+ noise __, 16, $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
+ noise __, 16, $4f, $41
+ noise __, 9, $8f, $41
+ noise __, 9, $cf, $41
+ noise __, 9, $f2, $42
+ noise __, 16, $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
+ noise __, 11, $ff, $50
+ noise __, 16, $ff, $51
+ noise __, 9, $f2, $51
+ noise __, 7, $ff, $52
+ noise __, 7, $ff, $53
+ noise __, 9, $ff, $54
+ noise __, 16, $f2, $54
endchannel
; f21e9
Sfx_Supersonic_Ch5: ; f21e9
dutycycle $2
- sound $f, $3f, $07c0
+ sound __, 16, $3f, $07c0
Sfx_Supersonic_branch_f21ef: ; f21ef
- sound $f, $df, $07c0
+ sound __, 16, $df, $07c0
loopchannel 4, Sfx_Supersonic_branch_f21ef
- sound $f, $d1, $07c0
+ sound __, 16, $d1, $07c0
endchannel
; f21fc
Sfx_Supersonic_Ch6: ; f21fc
unknownmusic0xde $b3
- sound $f, $2f, $07c8
+ sound __, 16, $2f, $07c8
Sfx_Supersonic_branch_f2202: ; f2202
- sound $f, $cf, $07c7
+ sound __, 16, $cf, $07c7
loopchannel 4, Sfx_Supersonic_branch_f2202
- sound $f, $c1, $07c8
+ sound __, 16, $c1, $07c8
endchannel
; f220f
Sfx_Supersonic_Ch8: ; f220f
Sfx_Supersonic_branch_f220f: ; f220f
- noise $3, $97, $12
- noise $3, $a1, $11
+ noise __, 4, $97, $12
+ noise __, 4, $a1, $11
loopchannel 10, Sfx_Supersonic_branch_f220f
endchannel
; f221a
@@ -4782,8 +4782,8 @@
Sfx_Leer_Ch5: ; f221a
Sfx_Leer_branch_f221a: ; f221a
dutycycle $0
- sound $0, $f1, $07c0
- sound $0, $f1, $0700
+ sound __, 1, $f1, $07c0
+ sound __, 1, $f1, $0700
loopchannel 12, Sfx_Leer_branch_f221a
endchannel
; f2229
@@ -4791,8 +4791,8 @@
Sfx_Leer_Ch6: ; f2229
Sfx_Leer_branch_f2229: ; f2229
unknownmusic0xde $b3
- sound $0, $e1, $07c1
- sound $0, $e1, $0701
+ sound __, 1, $e1, $07c1
+ sound __, 1, $e1, $0701
loopchannel 12, Sfx_Leer_branch_f2229
endchannel
; f2238
@@ -4799,8 +4799,8 @@
Sfx_Leer_Ch8: ; f2238
Sfx_Leer_branch_f2238: ; f2238
- noise $1, $d1, $49
- noise $1, $d1, $29
+ noise __, 2, $d1, $49
+ noise __, 2, $d1, $29
loopchannel 6, Sfx_Leer_branch_f2238
endchannel
; f2243
@@ -4808,22 +4808,22 @@
Sfx_Ember_Ch5: ; f2243
Sfx_Ember_branch_f2243: ; f2243
unknownmusic0xde $c9
- sound $b, $f3, $0120
- sound $9, $d3, $0150
+ sound __, 12, $f3, $0120
+ sound __, 10, $d3, $0150
loopchannel 5, Sfx_Ember_branch_f2243
- sound $8, $e3, $0130
- sound $f, $c2, $0110
+ sound __, 9, $e3, $0130
+ sound __, 16, $c2, $0110
endchannel
; f225a
Sfx_Ember_Ch8: ; f225a
Sfx_Ember_branch_f225a: ; f225a
- noise $a, $f3, $35
- noise $e, $f6, $45
+ noise __, 11, $f3, $35
+ noise __, 15, $f6, $45
loopchannel 4, Sfx_Ember_branch_f225a
- noise $c, $f4, $bc
- noise $c, $f5, $9c
- noise $f, $f4, $ac
+ noise __, 13, $f4, $bc
+ noise __, 13, $f5, $9c
+ noise __, 16, $f4, $ac
endchannel
; f226e
@@ -4830,12 +4830,12 @@
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
+ sound __, 5, $f4, $0600
+ sound __, 4, $c4, $0500
+ sound __, 6, $b5, $0600
+ sound __, 14, $e2, $06c0
loopchannel 3, Sfx_Bubblebeam_branch_f226e
- sound $8, $d1, $0600
+ sound __, 9, $d1, $0600
endchannel
; f2289
@@ -4842,10 +4842,10 @@
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
+ sound __, 6, $e4, $05e0
+ sound __, 5, $b4, $04e0
+ sound __, 7, $a5, $05e8
+ sound __, 15, $d1, $06a0
loopchannel 3, Sfx_Bubblebeam_branch_f2289
endchannel
; f22a0
@@ -4852,10 +4852,10 @@
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
+ noise __, 6, $c3, $33
+ noise __, 4, $92, $43
+ noise __, 11, $b5, $33
+ noise __, 16, $c3, $32
loopchannel 2, Sfx_Bubblebeam_branch_f22a0
endchannel
; f22b1
@@ -4863,25 +4863,25 @@
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
+ sound __, 4, $81, $0300
+ sound __, 4, $c1, $0400
+ sound __, 4, $f1, $0500
+ sound __, 4, $b1, $0400
+ sound __, 4, $71, $0300
loopchannel 5, Sfx_HydroPump_branch_f22b1
- sound $8, $81, $0400
+ sound __, 9, $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
+ noise __, 4, $62, $22
+ noise __, 4, $a2, $32
+ noise __, 4, $d2, $33
+ noise __, 4, $92, $23
+ noise __, 4, $52, $12
loopchannel 5, Sfx_HydroPump_branch_f22d0
- noise $8, $81, $12
+ noise __, 9, $81, $12
endchannel
; f22e7
@@ -4888,9 +4888,9 @@
Sfx_Surf_Ch5: ; f22e7
Sfx_Surf_branch_f22e7: ; f22e7
unknownmusic0xde $39
- sound $f, $f4, $0500
- sound $f, $c4, $0400
- sound $f, $e2, $05c0
+ sound __, 16, $f4, $0500
+ sound __, 16, $c4, $0400
+ sound __, 16, $e2, $05c0
loopchannel 3, Sfx_Surf_branch_f22e7
endchannel
; f22fa
@@ -4898,9 +4898,9 @@
Sfx_Surf_Ch6: ; f22fa
Sfx_Surf_branch_f22fa: ; f22fa
unknownmusic0xde $8d
- sound $7, $e4, $0430
- sound $f, $b4, $0330
- sound $f, $a2, $0438
+ sound __, 8, $e4, $0430
+ sound __, 16, $b4, $0330
+ sound __, 16, $a2, $0438
loopchannel 4, Sfx_Surf_branch_f22fa
endchannel
; f230d
@@ -4907,10 +4907,10 @@
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
+ noise __, 10, $f4, $44
+ noise __, 10, $f2, $43
+ noise __, 16, $f4, $42
+ noise __, 16, $f4, $41
loopchannel 3, Sfx_Surf_branch_f230d
endchannel
; f231e
@@ -4918,11 +4918,11 @@
Sfx_Psybeam_Ch5: ; f231e
Sfx_Psybeam_branch_f231e: ; f231e
unknownmusic0xde $a1
- sound $a, $f1, $0640
- sound $a, $f3, $0680
- sound $a, $f2, $0620
+ sound __, 11, $f1, $0640
+ sound __, 11, $f3, $0680
+ sound __, 11, $f2, $0620
loopchannel 4, Sfx_Psybeam_branch_f231e
- sound $a, $f1, $0640
+ sound __, 11, $f1, $0640
endchannel
; f2335
@@ -4929,18 +4929,18 @@
Sfx_Psybeam_Ch6: ; f2335
Sfx_Psybeam_branch_f2335: ; f2335
unknownmusic0xde $b3
- sound $a, $f3, $0571
- sound $7, $e3, $0531
- sound $a, $f1, $0551
+ sound __, 11, $f3, $0571
+ sound __, 8, $e3, $0531
+ sound __, 11, $f1, $0551
loopchannel 4, Sfx_Psybeam_branch_f2335
- sound $a, $f1, $0571
+ sound __, 11, $f1, $0571
endchannel
; f234c
Sfx_Psybeam_Ch8: ; f234c
Sfx_Psybeam_branch_f234c: ; f234c
- noise $2, $d1, $4a
- noise $2, $d2, $2a
+ noise __, 3, $d1, $4a
+ noise __, 3, $d2, $2a
loopchannel 21, Sfx_Psybeam_branch_f234c
endchannel
; f2357
@@ -4948,10 +4948,10 @@
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
+ sound __, 3, $f1, $0200
+ sound __, 4, $f1, $0700
+ sound __, 5, $f1, $0500
+ sound __, 6, $f1, $07f0
loopchannel 8, Sfx_Charge_branch_f2357
endchannel
; f236e
@@ -4959,10 +4959,10 @@
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
+ sound __, 3, $e1, $0302
+ sound __, 4, $e1, $07f2
+ sound __, 5, $e1, $0602
+ sound __, 6, $e1, $0702
loopchannel 8, Sfx_Charge_branch_f236e
endchannel
; f2385
@@ -4969,10 +4969,10 @@
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
+ noise __, 3, $d3, $10
+ noise __, 4, $d3, $11
+ noise __, 3, $d2, $10
+ noise __, 6, $d2, $12
loopchannel 9, Sfx_Charge_branch_f2385
endchannel
; f2396
@@ -4980,8 +4980,8 @@
Sfx_Thundershock_Ch5: ; f2396
Sfx_Thundershock_branch_f2396: ; f2396
unknownmusic0xde $2b
- sound $3, $f1, $07f0
- sound $4, $f2, $0200
+ sound __, 4, $f1, $07f0
+ sound __, 5, $f2, $0200
loopchannel 8, Sfx_Thundershock_branch_f2396
endchannel
; f23a5
@@ -4989,8 +4989,8 @@
Sfx_Thundershock_Ch6: ; f23a5
Sfx_Thundershock_branch_f23a5: ; f23a5
unknownmusic0xde $b3
- sound $4, $e2, $0202
- sound $4, $e1, $07e2
+ sound __, 5, $e2, $0202
+ sound __, 5, $e1, $07e2
loopchannel 9, Sfx_Thundershock_branch_f23a5
endchannel
; f23b4
@@ -4997,8 +4997,8 @@
Sfx_Thundershock_Ch8: ; f23b4
Sfx_Thundershock_branch_f23b4: ; f23b4
- noise $4, $ff, $43
- noise $4, $f2, $44
+ noise __, 5, $ff, $43
+ noise __, 5, $f2, $44
loopchannel 9, Sfx_Thundershock_branch_f23b4
endchannel
; f23bf
@@ -5006,12 +5006,12 @@
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
+ sound __, 9, $c4, $07bd
+ sound __, 9, $c4, $07be
+ sound __, 9, $c4, $07bf
+ sound __, 9, $c4, $07c0
+ sound __, 16, $c4, $07c1
+ sound __, 16, $f2, $07c0
soundinput $8
endchannel
; f23de
@@ -5018,42 +5018,42 @@
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
+ sound __, 9, $c4, $0770
+ sound __, 9, $c4, $0761
+ sound __, 9, $c4, $0762
+ sound __, 9, $c4, $0763
+ sound __, 16, $c4, $0764
+ sound __, 16, $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
+ noise __, 16, $3f, $14
+ noise __, 16, $cf, $13
+ noise __, 16, $cf, $12
+ noise __, 16, $cf, $11
+ noise __, 16, $cf, $10
+ noise __, 16, $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
+ sound __, 16, $ff, $07e0
+ sound __, 16, $ff, $07e0
+ sound __, 16, $ff, $07e0
+ sound __, 16, $ff, $07e0
+ sound __, 16, $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
+ sound __, 16, $ff, $07e2
+ sound __, 16, $ff, $07e1
+ sound __, 16, $ff, $07e2
+ sound __, 16, $ff, $07e1
+ sound __, 16, $f2, $07e2
endchannel
; f243a
@@ -5060,7 +5060,7 @@
Sfx_BoneClub_Ch5: ; f243a
dutycycle $2
soundinput $af
- sound $8, $f1, $0700
+ sound __, 9, $f1, $0700
soundinput $8
endchannel
; f2445
@@ -5067,51 +5067,51 @@
Sfx_BoneClub_Ch6: ; f2445
dutycycle $3
- sound $8, $f1, $0701
+ sound __, 9, $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
+ sound __, 7, $f1, $0500
+ sound __, 7, $f1, $0580
+ sound __, 7, $f1, $0600
+ sound __, 7, $f1, $0680
+ sound __, 9, $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
+ sound __, 7, $e1, $0510
+ sound __, 7, $e1, $0590
+ sound __, 7, $e1, $0610
+ sound __, 7, $e1, $0690
+ sound __, 9, $e1, $0710
endchannel
; f247a
Sfx_EggBomb_Ch5: ; f247a
unknownmusic0xde $ed
- sound $8, $ff, $03f8
- sound $f, $ff, $0400
- sound $f, $f3, $0400
+ sound __, 9, $ff, $03f8
+ sound __, 16, $ff, $0400
+ sound __, 16, $f3, $0400
endchannel
; f2489
Sfx_EggBomb_Ch6: ; f2489
unknownmusic0xde $b4
- sound $8, $ef, $03c0
- sound $f, $ef, $03c0
- sound $f, $e3, $03c0
+ sound __, 9, $ef, $03c0
+ sound __, 16, $ef, $03c0
+ sound __, 16, $e3, $03c0
endchannel
; f2498
Sfx_EggBomb_Ch8: ; f2498
- noise $4, $ff, $51
- noise $8, $ff, $54
- noise $f, $ff, $55
- noise $f, $f3, $56
+ noise __, 5, $ff, $51
+ noise __, 9, $ff, $54
+ noise __, 16, $ff, $55
+ noise __, 16, $f3, $56
endchannel
; f24a5
@@ -5148,140 +5148,140 @@
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
+ sound __, 3, $f1, $0780
+ sound __, 3, $f1, $0700
+ sound __, 3, $f1, $0790
+ sound __, 3, $f1, $0700
+ sound __, 3, $f1, $07a0
+ sound __, 3, $f1, $0700
+ sound __, 3, $f1, $07b0
+ sound __, 3, $f1, $0700
+ sound __, 3, $f1, $07c0
+ sound __, 3, $f1, $0700
+ sound __, 3, $f1, $07d0
Sfx_HyperBeam_branch_f24f8: ; f24f8
- sound $2, $f1, $0700
- sound $2, $f1, $07e0
+ sound __, 3, $f1, $0700
+ sound __, 3, $f1, $07e0
loopchannel 12, Sfx_HyperBeam_branch_f24f8
- sound $f, $f1, $0700
+ sound __, 16, $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
+ sound __, 3, $f1, $0781
+ sound __, 3, $f1, $0701
+ sound __, 3, $f1, $0791
+ sound __, 3, $f1, $0701
+ sound __, 3, $f1, $07a1
+ sound __, 3, $f1, $0701
+ sound __, 3, $f1, $07b1
+ sound __, 3, $f1, $0701
+ sound __, 3, $f1, $07c1
+ sound __, 3, $f1, $0701
+ sound __, 3, $f1, $07d1
Sfx_HyperBeam_branch_f2537: ; f2537
- sound $2, $f1, $0701
- sound $2, $f1, $07e1
+ sound __, 3, $f1, $0701
+ sound __, 3, $f1, $07e1
loopchannel 12, Sfx_HyperBeam_branch_f2537
- sound $f, $f1, $0701
+ sound __, 16, $f1, $0701
endchannel
; f2548
Sfx_HyperBeam_Ch8: ; f2548
Sfx_HyperBeam_branch_f2548: ; f2548
- noise $1, $d1, $49
- noise $1, $d1, $29
+ noise __, 2, $d1, $49
+ noise __, 2, $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
+ noise __, 7, $20, $10
+ noise __, 7, $2f, $40
+ noise __, 7, $4f, $41
+ noise __, 7, $8f, $41
+ noise __, 7, $cf, $42
+ noise __, 9, $d7, $42
+ noise __, 16, $e7, $43
+ noise __, 16, $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
+ noise __, 2, $10, $10
+ noise __, 3, $20, $10
+ noise __, 3, $30, $20
+ noise __, 3, $40, $20
+ noise __, 3, $50, $21
+ noise __, 3, $60, $22
+ noise __, 5, $70, $22
+ noise __, 9, $80, $22
+ noise __, 16, $94, $22
endchannel
; f2588
Sfx_Unknown61_Ch8: ; f2588
- noise $4, $d1, $41
+ noise __, 5, $d1, $41
endchannel
; f258c
Sfx_Unknown62_Ch8: ; f258c
- noise $4, $c1, $42
+ noise __, 5, $c1, $42
endchannel
; f2590
Sfx_Unknown63_Ch8: ; f2590
- noise $2, $6f, $21
- noise $2, $af, $31
- noise $f, $f2, $41
+ noise __, 3, $6f, $21
+ noise __, 3, $af, $31
+ noise __, 16, $f2, $41
endchannel
; f259a
Sfx_Burn_Ch8: ; f259a
- noise $2, $d2, $32
- noise $f, $f2, $43
+ noise __, 3, $d2, $32
+ noise __, 16, $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
+ noise __, 3, $70, $22
+ noise __, 3, $80, $23
+ noise __, 3, $90, $24
+ noise __, 3, $a0, $25
+ noise __, 3, $b0, $26
+ noise __, 16, $c2, $26
endchannel
; f25b4
Sfx_Unknown66_Ch5: ; f25b4
dutycycle $2
- sound $1, $f2, $06a0
- sound $1, $f2, $06e0
- sound $8, $f1, $0700
+ sound __, 2, $f2, $06a0
+ sound __, 2, $f2, $06e0
+ sound __, 9, $f1, $0700
endchannel
; f25c3
Sfx_GetCoinFromSlots_Ch5: ; f25c3
dutycycle $2
- sound $2, $f1, $0700
- sound $8, $81, $07e0
+ sound __, 3, $f1, $0700
+ sound __, 9, $81, $07e0
endchannel
; f25ce
Sfx_PayDay_Ch5: ; f25ce
dutycycle $3
- sound $5, $e1, $0700
- sound $2, $e1, $0780
- sound $f, $f1, $07c0
+ sound __, 6, $e1, $0700
+ sound __, 3, $e1, $0780
+ sound __, 16, $f1, $07c0
endchannel
; f25dd
Sfx_PayDay_Ch6: ; f25dd
dutycycle $2
- sound $4, $c1, $06c1
- sound $2, $c1, $0741
- sound $f, $d1, $0781
+ sound __, 5, $c1, $06c1
+ sound __, 3, $c1, $0741
+ sound __, 16, $d1, $0781
endchannel
; f25ec
@@ -5288,15 +5288,15 @@
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
+ sound __, 5, $40, $07e0
+ sound __, 5, $60, $07e0
+ sound __, 5, $80, $07e0
+ sound __, 9, $a0, $07e0
+ sound __, 9, $a0, $07e0
+ sound __, 9, $80, $07e0
+ sound __, 9, $60, $07e0
+ sound __, 9, $30, $07e0
+ sound __, 16, $12, $07e0
soundinput $8
endchannel
; f2617
@@ -5303,16 +5303,16 @@
Sfx_Unknown5F_Ch5: ; f2617
Sfx_Unknown5F_branch_f2617: ; f2617
- sound $2, $f7, $0601
- sound $2, $f7, $0701
+ sound __, 3, $f7, $0601
+ sound __, 3, $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
+ sound __, 2, $f7, $ffff
+ sound __, 3, $f7, $0602
+ sound __, 3, $f7, $0702
loopchannel 8, Sfx_Unknown5F_branch_f2617
endchannel
; f2635
@@ -5481,15 +5481,15 @@
Sfx_HangUp_Ch5: ; f26f1
dutycycle $2
- sound $4, $b8, $077b
- sound $2, $21, $077b
- sound $10, $0, 0
+ sound __, 5, $b8, $077b
+ sound __, 3, $21, $077b
+ sound C_, 1, $0, 0
Sfx_HangUp_branch_f26ff: ; f26ff
Sfx_NoSignal_Ch5: ; f26ff
Sfx_NoSignal_branch_f26ff: ; f26ff
dutycycle $2
- sound $14, $e8, $070b
- sound $1c, $0, 0
+ sound C_, 5, $e8, $070b
+ sound C_, 13, $0, 0
loopchannel 3, Sfx_HangUp_branch_f26ff
endchannel
; f270e
@@ -5498,11 +5498,11 @@
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
+ noise __, 2, $f8, $41
+ noise __, 3, $9c, $24
+ noise __, 1, $0, $0
+ noise __, 4, $59, $16
+ noise __, 3, $0, $0
loopchannel 3, Sfx_Sandstorm_branch_f270e
endchannel
; f2722
@@ -5511,66 +5511,66 @@
dutycycle $2
soundinput $5a
Sfx_Elevator_branch_f2726: ; f2726
- sound $2, $f1, $0300
+ sound __, 3, $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
+ sound __, 16, $f3, $0730
+ sound __, 9, $65, $0730
+ sound __, 16, $f4, $0700
+ sound __, 16, $74, $0700
+ sound __, 16, $44, $0700
+ sound __, 16, $24, $0700
endchannel
; f274b
Sfx_Elevator_Ch6: ; f274b
Sfx_Elevator_Ch7: ; f274b
- sound $60, $0, 0
- sound $53, $0, 0
+ sound F_, 1, $0, 0
+ sound E_, 4, $0, 0
endchannel
; f2754
Sfx_Elevator_Ch8: ; f2754
- noise $60, $0, $0
- noise $53, $0, $0
+ noise F_, 1, $0, $0
+ noise E_, 4, $0, $0
endchannel
; f275b
Sfx_StopSlot: ; f275b
- dbw $04, Sfx_StopSlot_Ch5
+ musicheader 1, 5, Sfx_StopSlot_Ch5
; f275e
Sfx_StopSlot_Ch5: ; f275e
dutycycle $2
- sound $1, $f8, $0760
- sound $4, $82, $0760
+ sound __, 2, $f8, $0760
+ sound __, 5, $82, $0760
endchannel
; f2769
Sfx_GlassTing: ; f2769
- dbw $04, Sfx_GlassTing_Ch5
+ musicheader 1, 5, Sfx_GlassTing_Ch5
; f276c
Sfx_GlassTing_Ch5: ; f276c
dutycycle $2
- sound $20, $d1, $07dc
+ sound C#, 1, $d1, $07dc
endchannel
; f2773
Sfx_GlassTing2: ; f2773
- dbw $44, Sfx_GlassTing2_Ch5
- dbw $05, Sfx_GlassTing2_Ch6
+ musicheader 2, 5, Sfx_GlassTing2_Ch5
+ musicheader 1, 6, Sfx_GlassTing2_Ch6
; f2779
Sfx_GlassTing2_Ch5: ; f2779
dutycycle $2
- sound $10, $f1, $07dc
+ sound C_, 1, $f1, $07dc
endchannel
; f2780
Sfx_GlassTing2_Ch6: ; f2780
dutycycle $2
- sound $10, $d1, $07dd
+ sound C_, 1, $d1, $07dd
endchannel
; f2787
--- a/audio/sfx_crystal.asm
+++ b/audio/sfx_crystal.asm
@@ -1,167 +1,167 @@
Sfx_IntroUnown1: ; 17982d
- dbw $04, Sfx_IntroUnown1_Ch5
+ musicheader 1, 5, Sfx_IntroUnown1_Ch5
; 179830
Sfx_IntroUnown1_Ch5: ; 179830
vibrato $1, $a3
dutycycle $2
- sound $8, $39, $0705
- sound $20, $e2, $0705
+ sound __, 9, $39, $0705
+ sound C#, 1, $e2, $0705
endchannel
; 17983e
Sfx_IntroUnown2: ; 17983e
- dbw $05, Sfx_IntroUnown2_Ch6
+ musicheader 1, 6, Sfx_IntroUnown2_Ch6
; 179841
Sfx_IntroUnown2_Ch6: ; 179841
vibrato $1, $73
dutycycle $2
- sound $8, $39, $0758
- sound $20, $e2, $0758
+ sound __, 9, $39, $0758
+ sound C#, 1, $e2, $0758
endchannel
; 17984f
Sfx_IntroUnown3: ; 17984f
- dbw $06, Sfx_IntroUnown3_Ch7
+ musicheader 1, 7, 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
+ sound __, 4, $32, $07c2
+ sound __, 4, $22, $07c2
+ sound __, 4, $12, $07c2
+ sound C_, 1, $12, $07c2
+ sound __, 7, $22, $07c2
+ sound __, 7, $32, $07c2
endchannel
; 17986e
Sfx_DittoPopUp: ; 17986e
- dbw $04, Sfx_DittoPopUp_Ch5
+ musicheader 1, 5, Sfx_DittoPopUp_Ch5
; 179871
Sfx_DittoPopUp_Ch5: ; 179871
dutycycle $2
soundinput $1e
- sound $3, $82, $0700
- sound $1, $31, $0701
+ sound __, 4, $82, $0700
+ sound __, 2, $31, $0701
soundinput $16
- sound $4, $b1, $0640
- sound $10, $31, $0641
+ sound __, 5, $b1, $0640
+ sound C_, 1, $31, $0641
endchannel
; 179888
Sfx_DittoTransform: ; 179888
- dbw $04, Sfx_DittoTransform_Ch5
+ musicheader 1, 5, 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
+ sound C_, 5, $3b, $0440
+ sound __, 5, $97, $04c0
+ sound __, 5, $67, $04c1
+ sound __, 5, $42, $04c2
endchannel
; 1798a0
Sfx_IntroSuicune1: ; 1798a0
- dbw $07, Sfx_IntroSuicune1_Ch8
+ musicheader 1, 8, Sfx_IntroSuicune1_Ch8
; 1798a3
Sfx_IntroSuicune1_Ch8: ; 1798a3
- noise $1, $58, $59
- noise $2, $91, $23
+ noise __, 2, $58, $59
+ noise __, 3, $91, $23
endchannel
; 1798aa
Sfx_IntroPichu: ; 1798aa
- dbw $04, Sfx_IntroPichu_Ch5
+ musicheader 1, 5, Sfx_IntroPichu_Ch5
; 1798ad
Sfx_IntroPichu_Ch5: ; 1798ad
dutycycle $3
soundinput $4d
- sound $1, $88, $0770
- sound $3, $0, 0
+ sound __, 2, $88, $0770
+ sound __, 4, $0, 0
soundinput $17
- sound $2, $88, $0776
+ sound __, 3, $88, $0776
endchannel
; 1798c0
Sfx_IntroSuicune2: ; 1798c0
- dbw $07, Sfx_IntroSuicune2_Ch8
+ musicheader 1, 8, 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
+ noise __, 2, $a7, $31
+ noise __, 2, $91, $0
+ noise __, 2, $92, $21
+ noise __, 2, $91, $0
+ noise __, 2, $92, $22
+ noise __, 2, $82, $11
+ noise __, 2, $82, $22
+ noise __, 2, $72, $11
+ noise __, 2, $72, $12
+ noise __, 2, $62, $10
+ noise __, 2, $63, $0
+ noise __, 2, $53, $10
+ noise __, 2, $43, $0
+ noise __, 2, $33, $10
+ noise __, 2, $23, $0
+ noise __, 2, $13, $10
endchannel
; 1798f4
Sfx_IntroSuicune3: ; 1798f4
- dbw $07, Sfx_IntroSuicune3_Ch8
+ musicheader 1, 8, 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
+ noise __, 2, $88, $31
+ noise __, 9, $39, $11
+ noise __, 5, $a4, $10
+ noise __, 5, $44, $10
+ noise __, 5, $24, $10
endchannel
; 179907
Sfx_DittoBounce: ; 179907
- dbw $04, Sfx_DittoBounce_Ch5
+ musicheader 1, 5, Sfx_DittoBounce_Ch5
; 17990a
Sfx_DittoBounce_Ch5: ; 17990a
dutycycle $2
soundinput $2c
- sound $2, $82, $04b0
- sound $0, $31, $04b0
+ sound __, 3, $82, $04b0
+ sound __, 1, $31, $04b0
soundinput $34
- sound $10, $b1, $0420
+ sound C_, 1, $b1, $0420
endchannel
; 17991d
Sfx_IntroSuicune4: ; 17991d
- dbw $07, Sfx_IntroSuicune4_Ch8
+ musicheader 1, 8, 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
+ noise __, 2, $a1, $5c
+ noise __, 1, $0, $0
+ noise __, 2, $c1, $4d
+ noise __, 1, $0, $0
+ noise __, 5, $b2, $31
+ noise __, 1, $0, $0
+ noise __, 5, $a2, $2
+ noise __, 1, $0, $0
+ noise __, 5, $92, $1
+ noise __, 1, $0, $0
+ noise C#, 1, $72, $0
endchannel
; 179942
Sfx_GameFreakPresents: ; 179942
- dbw $04, Sfx_GameFreakPresents_Ch5
+ musicheader 1, 5, Sfx_GameFreakPresents_Ch5
; 179945
Sfx_GameFreakPresents_Ch5: ; 179945
@@ -188,7 +188,7 @@
; 179961
Sfx_Tingle: ; 179961
- dbw $04, Sfx_Tingle_Ch5
+ musicheader 1, 5, Sfx_Tingle_Ch5
; 179964
Sfx_Tingle_Ch5: ; 179964
@@ -212,22 +212,22 @@
; 17997c
Sfx_TwoPcBeeps: ; 17997c
- dbw $04, Sfx_TwoPcBeeps_Ch5
+ musicheader 1, 5, 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
+ sound __, 3, $e8, $07c2
+ sound __, 3, $28, $07c2
+ sound __, 3, $e8, $07c2
+ sound __, 3, $28, $07c2
endchannel
; 179992
Sfx_4NoteDitty: ; 179992
- dbw $84, Sfx_4NoteDitty_Ch5
- dbw $05, Sfx_4NoteDitty_Ch6
- dbw $06, Sfx_4NoteDitty_Ch7
+ musicheader 3, 5, Sfx_4NoteDitty_Ch5
+ musicheader 1, 6, Sfx_4NoteDitty_Ch6
+ musicheader 1, 7, Sfx_4NoteDitty_Ch7
; 17999b
Sfx_4NoteDitty_Ch5: ; 17999b
@@ -273,7 +273,7 @@
; 1799cb
Sfx_Twinkle: ; 1799cb
- dbw $04, Sfx_Twinkle_Ch5
+ musicheader 1, 5, Sfx_Twinkle_Ch5
; 1799ce
Sfx_Twinkle_Ch5: ; 1799ce
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -5281,7 +5281,7 @@
; 3e234
.UseItem: ; 3e234
- ld a, [wc64e]
+ ld a, [wWildMon]
and a
jr nz, .run
callab CheckItemPocket
@@ -5315,7 +5315,7 @@
.run
xor a
- ld [wc64e], a
+ ld [wWildMon], a
ld a, [wBattleResult]
and $c0
ld [wBattleResult], a
--- a/macros/sound.asm
+++ b/macros/sound.asm
@@ -3,17 +3,22 @@
ENDM
sound: macro
- db \1 ; duration
- db \2 ; intensity
- dw \3 ; frequency
+ note \1, \2
+ db \3 ; intensity
+ dw \4 ; frequency
endm
noise: macro
- db \1 ; duration
- db \2 ; intensity
- db \3 ; frequency
+ note \1, \2 ; duration
+ db \3 ; intensity
+ db \4 ; frequency
endm
+musicheader: macro
+ ; number of tracks, ??, address
+ dbw ((\1 - 1) << 6) + (\2 - 1), \3
+ endm
+
; pitch
__ EQU 0
C_ EQU 1
@@ -28,6 +33,20 @@
A_ EQU 10
A# EQU 11
B_ EQU 12
+
+; channel
+ const_def
+ const CHAN1
+ const CHAN2
+ const CHAN3
+ const CHAN4
+NUM_MUSIC_CHANS EQU const_value
+NUM_NOISE_CHANS EQU const_value
+ const CHAN5
+ const CHAN6
+ const CHAN7
+ const CHAN8
+NUM_CHANNELS EQU const_value
enum_start $d8
enum notetype_cmd
--- a/main.asm
+++ b/main.asm
@@ -8455,7 +8455,7 @@
cp 3 + 1
jr z, .finished
- ld a, [wc64e]
+ ld a, [wWildMon]
and a
ld c, 0 ; next
jr nz, .done
@@ -8480,7 +8480,7 @@
jr .done
.finished
- ld a, [wc64e]
+ ld a, [wWildMon]
and a
ld c, 1 ; caught
jr nz, .done
--- a/misc/mobile_40.asm
+++ b/misc/mobile_40.asm
@@ -2,6 +2,9 @@
SECTION "bank40", ROMX, BANK[$40]
Function100000: ; 100000
+; d: 1 or 2
+; e: bank
+; bc: addr
ld a, [rSVBK]
push af
ld a, $1
@@ -32,15 +35,15 @@
ld a, d
ld [wcd21], a
ld a, e
- ld [CreditsTimer], a
+ ld [wcd22], a
ld a, c
ld [wcd23], a
ld a, b
ld [wcd24], a
callba Function10127e
- callba Function106462
- callba Function106464
- callba Function11615a
+ callba MobileFunc_106462
+ callba Function106464 ; load broken gfx
+ callba Function11615a ; init RAM
ld hl, VramState
set 1, [hl]
ret
@@ -57,7 +60,7 @@
Function100063: ; 100063
xor a
ld hl, BGMapBuffer
- ld bc, $0065
+ ld bc, $65
call ByteFill
xor a
ld hl, wc300
@@ -109,7 +112,8 @@
; 1000ba
Function1000ba: ; 1000ba
-.asm_1000ba
+.loop
+ ; call [wcd22]:([wcd23][wcd24] + [wcd25])
ld hl, wcd23
ld a, [hli]
ld h, [hl]
@@ -116,14 +120,15 @@
ld l, a
ld a, [wcd25]
ld e, a
- ld d, $0
+ ld d, 0
rept 2
add hl, de
endr
- ld a, [CreditsTimer]
+ ld a, [wcd22]
call GetFarHalfword
- ld a, [CreditsTimer]
+ ld a, [wcd22]
rst FarCall
+
call Function1000e8
call Function1000fa
call Function100144
@@ -130,7 +135,7 @@
call Function100163
ld a, [wcd2b]
and a
- jr z, .asm_1000ba
+ jr z, .loop
call DelayFrame
ret
; 1000e8
@@ -265,12 +270,12 @@
.asm_1001c4
ld a, $d2
- ld de, $0002
+ ld de, 2
jr .asm_1001d7
.asm_1001cb
ld a, $d1
- ld de, $0001
+ ld de, 1
jr .asm_1001d7
.asm_1001d2
@@ -379,7 +384,7 @@
.asm_10029f
call Function1002dc
- ld c, $0
+ ld c, 0
ret
.asm_1002a5
@@ -504,7 +509,7 @@
ret
.asm_10036a
- ld a, $0
+ ld a, 0
call Function3e32
ld [wcd2c], a
ld a, h
@@ -545,7 +550,7 @@
Function10039c: ; 10039c
ld hl, wcc60
ld de, w3_d000
- ld bc, $0054
+ ld bc, $54
ld a, $3
call FarCopyWRAM
ret
@@ -554,7 +559,7 @@
Function1003ab: ; 1003ab
ld hl, w3_d000
ld de, wcc60
- ld bc, $0054
+ ld bc, $54
ld a, $3
call FarCopyWRAM
ret
@@ -563,7 +568,7 @@
Function1003ba: ; 1003ba
ld hl, wccb4
ld de, w3_d080
- ld bc, $0054
+ ld bc, $54
ld a, $3
call FarCopyWRAM
ret
@@ -572,7 +577,7 @@
Function1003c9: ; 1003c9
ld hl, w3_d080
ld de, wccb4
- ld bc, $0054
+ ld bc, $54
ld a, $3
call FarCopyWRAM
ret
@@ -582,7 +587,7 @@
ld hl, wccb4
ld a, [hli]
ld c, a
- ld b, $0
+ ld b, 0
push hl
add hl, bc
ld a, [BGMapPalBuffer]
@@ -614,7 +619,7 @@
ld a, [wcc60]
sub $2
ld c, a
- ld b, $0
+ ld b, 0
ld hl, wcc61
call Function10043a
add hl, bc
@@ -658,7 +663,7 @@
add e
ld e, a
ld a, d
- adc $0
+ adc 0
ld d, a
dec bc
ld a, b
@@ -895,7 +900,7 @@
Function100585: ; 100585
ld hl, MenuDataHeader_1005b2
call LoadMenuDataHeader
- ld a, $0
+ ld a, 0
ld [wcd28], a
ld a, [wcd26]
inc a
@@ -947,7 +952,7 @@
Function1005cf: ; 1005cf
ld hl, MenuDataHeader_1005fc
call LoadMenuDataHeader
- ld a, $0
+ ld a, 0
ld [wcd28], a
ld a, [wcd26]
inc a
@@ -1374,7 +1379,7 @@
jr nz, .asm_10087c
ld a, [wcd6e]
ld c, a
- ld a, $0
+ ld a, 0
sub c
jr nc, .asm_100858
add $3c
@@ -1429,7 +1434,7 @@
call CloseSRAM
ld a, [StringBuffer2 + 2]
ld b, a
- ld a, $0
+ ld a, 0
sub b
jr nc, .asm_1008c8
add $3c
@@ -1449,7 +1454,7 @@
.asm_1008da
call Function10070d
- ld c, $0
+ ld c, 0
ret
; 1008e0
@@ -1702,7 +1707,7 @@
Function100a87: ; 100a87
call Function100acf
call Function100641
- ld a, $0
+ ld a, 0
ld [wcd27], a
.asm_100a92
call DelayFrame
@@ -1999,7 +2004,7 @@
; 100cad
Unknown_100cad: ; 100cad
- db $0a, $01, $ff, $01, $a0, $00, $20, $c3
+ db $a, $1, $ff, $1, $a0, $, $20, $c3
Function100cb5: ; 100cb5
call Function100dd8
@@ -2035,7 +2040,7 @@
dec a
ld [CurPartyMon], a
ld c, a
- ld b, $0
+ ld b, 0
ld hl, PartySpecies
add hl, bc
ld a, [hl]
@@ -2320,7 +2325,7 @@
ld a, [hl]
cp $2
ret c
- ld [hl], $0
+ ld [hl], 0
jr Function100ec5
Function100ec4: ; 100ec4
@@ -2406,7 +2411,7 @@
call Function100f3d
; next line
pop hl
- ld de, $0007
+ ld de, 7
add hl, de
jr .loop
@@ -2527,7 +2532,7 @@
db -1
Unknown_100feb: ; 100feb
- dbwww $00, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
+ dbwww $, sPartyMail, MAIL_STRUCT_LENGTH * PARTY_LENGTH, NULL
db -1
Unknown_100ff3: ; 100ff3
@@ -2537,8 +2542,8 @@
dbwww $80, PlayerID, 2, NULL
dbwww $80, wSecretID, 2, NULL
dbwww $80, PlayerGender, 1, NULL
- dbwww $04, $a603, 8, NULL
- dbwww $04, $a007, PARTYMON_STRUCT_LENGTH, NULL
+ dbwww $4, $a603, 8, NULL
+ dbwww $4, $a007, PARTYMON_STRUCT_LENGTH, NULL
db -1
Unknown_10102c: ; 10102c
@@ -2640,7 +2645,7 @@
Function1010f2: ; 1010f2
xor a
ld hl, StringBuffer2
- ld bc, $0009
+ ld bc, 9
call ByteFill
ld hl, wdc5c
ld de, PartyCount
@@ -2687,7 +2692,7 @@
ld [de], a
inc de
ld hl, StringBuffer2 + 6
- ld bc, $0003
+ ld bc, 3
call CopyBytes
ld a, $ff
ld [de], a
@@ -2699,7 +2704,7 @@
add l
ld l, a
ld a, h
- adc $0
+ adc 0
ld h, a
ld a, [hl]
pop hl
@@ -2708,7 +2713,7 @@
add e
ld e, a
ld a, d
- adc $0
+ adc 0
ld d, a
ld a, [de]
pop de
@@ -2716,11 +2721,11 @@
; 10117c
Function10117c: ; 10117c
- ld bc, $0030
+ ld bc, $30
jr asm_101184
Function101181: ; 101181
- ld bc, $000b
+ ld bc, 11
asm_101184:
ld a, wc608 % $100
@@ -2894,7 +2899,7 @@
jr z, .asm_101292
.asm_101290
- ld c, $0
+ ld c, 0
.asm_101292
ld a, c
@@ -3029,7 +3034,7 @@
Function10138b: ; 10138b
callba Function8adcc
- ld c, $0
+ ld c, 0
jr c, .asm_101396
inc c
@@ -3063,7 +3068,7 @@
Function1013c0: ; 1013c0
callba Function8000
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
call Function2b5c
ret
@@ -3083,7 +3088,7 @@
push de
inc de
ld b, a
- ld c, $0
+ ld c, 0
.asm_1013e6
inc c
ld a, [hli]
@@ -3125,7 +3130,7 @@
Function101406: ; 101406
ld c, a
- ld b, $0
+ ld b, 0
.asm_101409
ld a, [de]
inc de
@@ -3176,7 +3181,7 @@
ld a, [wcd26]
bit 7, a
ret z
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -3215,7 +3220,7 @@
ld a, [wcd26]
bit 7, a
ret z
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -3274,7 +3279,7 @@
Function1014e2: ; 1014e2
ld hl, wcd29
set 6, [hl]
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -3294,8 +3299,8 @@
Function101507: ; 101507
ld de, wcd30
- ld hl, $0040
- ld bc, $0040
+ ld hl, $40
+ ld bc, $40
ld a, $2
call Function3e32
ld a, [wcd25]
@@ -3390,7 +3395,7 @@
ld a, $5
ld hl, w5_d800
call Function10174c
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -3405,7 +3410,7 @@
ld a, $5
ld hl, w5_d800
call Function10174c
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -3420,7 +3425,7 @@
ld a, $5
ld hl, w5_d800
call Function10174c
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -3431,7 +3436,7 @@
Function101600: ; 101600
ld hl, w5_d800
ld de, wc608
- ld bc, $01e0
+ ld bc, $1e0
ld a, $5
call FarCopyWRAM
ld de, wc608
@@ -3460,7 +3465,7 @@
Function101635: ; 101635
ld de, wc608
- ld bc, $01e0
+ ld bc, $1e0
call FarCopyWRAM
ret
; 10163f
@@ -3467,7 +3472,7 @@
Function10163f: ; 10163f
ld hl, wc608
- ld bc, $01e0
+ ld bc, $1e0
call FarCopyWRAM
ret
; 101649
@@ -3507,7 +3512,7 @@
; 10167d
Function10167d: ; 10167d
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -3520,7 +3525,7 @@
ret c
Function10168e: ; 10168e
- ld b, $0
+ ld b, 0
ld c, $1
callba Function10079c
ret c
@@ -3536,7 +3541,7 @@
ld a, [wcd26]
bit 7, a
ret z
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -3581,7 +3586,7 @@
; 1016f8
Function1016f8: ; 1016f8
- ld a, $0
+ ld a, 0
ld [wcd27], a
ld a, [wcd26]
inc a
@@ -3612,7 +3617,7 @@
ld a, [wcd39]
cp $ff
jr z, .asm_101731
- ld a, $0
+ ld a, 0
ld [wcd26], a
ret
@@ -3634,7 +3639,7 @@
ld l, a
ld a, [Unknown_10173a]
ld c, a
- ld b, $0
+ ld b, 0
pop af
call AddNTimes
pop bc
@@ -3663,7 +3668,7 @@
Function10176f: ; 10176f
ld hl, wccb4
- ld bc, $0054
+ ld bc, $54
ld a, $11
call ByteFill
ret
@@ -3672,7 +3677,7 @@
Function10177b: ; 10177b
ld a, [Unknown_10173a]
ld c, a
- ld b, $0
+ ld b, 0
ld a, [wcd3a]
ld hl, 0
call AddNTimes
@@ -3725,7 +3730,7 @@
Function1017c7: ; 1017c7
ld a, [wcc60]
ld c, a
- ld b, $0
+ ld b, 0
ld a, [wcd3a]
dec a
ld hl, wcd3e
@@ -3740,7 +3745,7 @@
; 1017e4
Function1017e4: ; 1017e4
- ld a, $0
+ ld a, 0
ld [wcd27], a
ld a, [wcd25]
inc a
@@ -3753,7 +3758,7 @@
ret c
Function1017f5: ; 1017f5
- ld b, $0
+ ld b, 0
ld c, $1
callba Function10079c
ret c
@@ -3825,17 +3830,17 @@
Unknown_10186f:
db .end - @
- db $19, $73, $09, $13, "trade_crystal"
+ db $19, $73, $9, $13, "trade_crystal"
.end db 0
Unknown_101882:
db .end - @
- db $19, $67, $10, $01, "free__crystal"
+ db $19, $67, $10, $1, "free__crystal"
.end db 0
Unknown_101895:
db .end - @
- db $19, $67, $10, $01, "limit_crystal"
+ db $19, $67, $10, $1, "limit_crystal"
.end db 0
; 1018a8
@@ -3910,7 +3915,7 @@
.asm_101909
ld de, LinkBattleRNs
- ld bc, $000a
+ ld bc, 10
call CopyBytes
ret
; 101913
@@ -3977,7 +3982,7 @@
ld [wccb4], a
ld hl, wdc5c
ld de, wccb5
- ld bc, $0003
+ ld bc, 3
call CopyBytes
ld hl, wcd6c
ld a, [hli]
@@ -4034,8 +4039,8 @@
ld a, c
ld [OtherTrainerClass], a
- ld hl, wd26b
- ld de, wc656
+ ld hl, OTPlayerName
+ ld de, OTName
ld bc, NAME_LENGTH
call CopyBytes
ld a, [wcd2f]
@@ -4088,7 +4093,7 @@
Function101a75: ; 101a75
ld hl, wcc61
ld de, wcd75
- ld bc, $0003
+ ld bc, 3
call CopyBytes
ld de, wcc64
callba Function100772
@@ -4157,7 +4162,7 @@
; 101b0f
Function101b0f: ; 101b0f
- ld c, $0
+ ld c, 0
call Function10142c
ld e, $3
call Function101ee4
@@ -4166,7 +4171,7 @@
ld a, [wcd25]
inc a
ld [wcd25], a
- ld a, $0
+ ld a, 0
ld [wcd26], a
ret
; 101b2b
@@ -4179,7 +4184,7 @@
bit 7, a
ret z
call Function1013dd
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [MenuSelection2]
cp $1
@@ -4219,7 +4224,7 @@
ld a, [wcd25]
inc a
ld [wcd25], a
- ld a, $0
+ ld a, 0
ld [wcd26], a
ret
; 101b8f
@@ -4232,7 +4237,7 @@
bit 7, a
ret z
call Function1013dd
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [MenuSelection2]
cp $1
@@ -4260,7 +4265,7 @@
call Function101ee4
call Function102048
call Function1013dd
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -4276,7 +4281,7 @@
bit 7, a
ret z
call Function1013dd
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [MenuSelection2]
cp $1
@@ -4355,7 +4360,7 @@
ld a, [wcd25]
inc a
ld [wcd25], a
- ld a, $0
+ ld a, 0
ld [wcd26], a
ret
; 101c92
@@ -4378,7 +4383,7 @@
ld a, [wcd25]
inc a
ld [wcd25], a
- ld a, $0
+ ld a, 0
ld [wcd26], a
ret
; 101cbc
@@ -4465,7 +4470,7 @@
ld a, [wcd26]
bit 7, a
ret z
- ld a, $0
+ ld a, 0
ld [wcd26], a
ld a, [wcd25]
inc a
@@ -4518,7 +4523,7 @@
; 101d8d
Unknown_101d8d: ; 101d8d
- db $15, $15, $1f, $1f, $0c, $12, $3a, $3a
+ db $15, $15, $1f, $1f, $c, $12, $3a, $3a
; 101d95
Function101d95: ; 101d95
@@ -4531,7 +4536,7 @@
ld a, [wcd25]
inc a
ld [wcd25], a
- ld a, $0
+ ld a, 0
ld [wcd26], a
ret
; 101db2
@@ -4646,7 +4651,7 @@
ld a, [wcd25]
inc a
ld [wcd25], a
- ld a, $0
+ ld a, 0
ld [wcd26], a
ret
; 101e64
@@ -4890,7 +4895,7 @@
ret
.asm_10208a
- ld [hl], $0
+ ld [hl], 0
scf
ret
; 10208e
@@ -4900,7 +4905,7 @@
ld h, d
ld l, e
ld de, wdc42
- ld bc, $0008
+ ld bc, 8
call CopyBytes
pop de
ret
@@ -4909,7 +4914,7 @@
Function10209c: ; 10209c
ld a, $ff
ld hl, wdc42
- ld bc, $0008
+ ld bc, 8
call ByteFill
ret
; 1020a8
@@ -4934,7 +4939,7 @@
jr z, .asm_1020e8
dec a
ld hl, $a04c
- ld bc, $0025
+ ld bc, $25
call AddNTimes
ld d, h
ld e, l
@@ -4998,7 +5003,7 @@
.asm_10212f
pop hl
- ld de, $0025
+ ld de, $25
add hl, de
dec c
jr nz, .asm_10211c
@@ -5043,7 +5048,7 @@
Function102180: ; 102180
ld hl, wc608 + 1
ld de, StringBuffer2
- ld bc, $000b
+ ld bc, 11
call CopyBytes
ret
; 10218d
@@ -5051,7 +5056,7 @@
Function10218d: ; 10218d
ld hl, wdc00
ld de, wc608
- ld bc, $0026
+ ld bc, $26
ld a, $5
call FarCopyWRAM
ld de, wc608 + 1
@@ -5117,7 +5122,7 @@
Function1021f9: ; 1021f9
call Function102233
- ld a, $0
+ ld a, 0
ld [wcd49], a
ld hl, wcd29
bit 3, [hl]
@@ -5151,7 +5156,7 @@
Function102233: ; 102233
ld hl, wcd49
- ld bc, $000a
+ ld bc, 10
xor a
call ByteFill
call Function10304f
@@ -5197,7 +5202,7 @@
bit 3, [hl]
ret z
res 3, [hl]
- ld de, $0008
+ ld de, 8
call PlaySFX
ret
; 102283
@@ -5406,7 +5411,7 @@
inc [hl]
ld a, [hli]
ld c, a
- ld b, $0
+ ld b, 0
add hl, bc
ld [hl], $ff
ld a, [PartyCount]
@@ -5419,9 +5424,9 @@
set 1, [hl]
ld a, $14
ld [wcd4e], a
- ld a, $0
+ ld a, 0
ld [wcd4f], a
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, [wcd49]
inc a
@@ -5446,7 +5451,7 @@
callba BackupMobileEventIndex
ld hl, wcd4b
set 1, [hl]
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, [wcd49]
inc a
@@ -5460,9 +5465,9 @@
set 1, [hl]
ld a, $19
ld [wcd4e], a
- ld a, $0
+ ld a, 0
ld [wcd4f], a
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, [wcd49]
inc a
@@ -5502,7 +5507,7 @@
ld hl, wcd4e
dec [hl]
ret nz
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, [wcd49]
inc a
@@ -5555,7 +5560,7 @@
ret z
.asm_1024e9
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, [wcd49]
inc a
@@ -5608,7 +5613,7 @@
call Function103021
ld hl, wcd4b
set 1, [hl]
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, $1e
ld [wcd4e], a
@@ -5633,7 +5638,7 @@
.asm_102577
ld hl, wcd4b
set 1, [hl]
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, $1e
ld [wcd4e], a
@@ -5648,7 +5653,7 @@
call Function102ee7
ld hl, wcd4b
set 1, [hl]
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, $1e
ld [wcd4e], a
@@ -5823,7 +5828,7 @@
ld a, [wcd49]
inc a
ld [wcd49], a
- ld a, $0
+ ld a, 0
ld [wcd4a], a
Function1026c8: ; 1026c8
@@ -5903,7 +5908,7 @@
ld a, [wcd49]
inc a
ld [wcd49], a
- ld a, $0
+ ld a, 0
ld [wcd4a], a
Function102754: ; 102754
@@ -6030,7 +6035,7 @@
ld a, [wcd49]
inc a
ld [wcd49], a
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld hl, wcd4b
set 1, [hl]
@@ -6086,7 +6091,7 @@
ld [wcd4e], a
ld a, $3c
ld [wcd4f], a
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ld a, [wcd49]
inc a
@@ -6144,7 +6149,7 @@
res 6, [hl]
ld [wcd50], a
callba Function100641
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ret
; 1028fc
@@ -6161,7 +6166,7 @@
ld hl, Jumptable_102917
rst JumpTable
ret nc
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ret
; 102917
@@ -6179,7 +6184,7 @@
ld hl, Jumptable_10292f
rst JumpTable
ret nc
- ld a, $0
+ ld a, 0
ld [wcd4a], a
ret
; 10292f
@@ -6217,7 +6222,7 @@
Function10295d: ; 10295d
call Function10299e
- ld a, $0
+ ld a, 0
ld [wcd27], a
ld a, [wcd4a]
inc a
@@ -6349,7 +6354,7 @@
; 102a33
Unknown_102a33:
- db $08, $0b, $02, $01, $80, $00, $20, $01
+ db $8, $b, $2, $1, $80, $, $20, $1
Function102a3b: ; 102a3b
ld a, [wcd30]
@@ -6356,12 +6361,12 @@
ld [wc74e], a
ld hl, PlayerName
ld de, wc6e7
- ld bc, $000b
+ ld bc, 11
call CopyBytes
ld a, [wcd4c]
dec a
ld c, a
- ld b, $0
+ ld b, 0
ld hl, PartySpecies
add hl, bc
ld a, [hl]
@@ -6371,7 +6376,7 @@
ld hl, PartyMonOT
call SkipNames
ld de, wc6f2
- ld bc, $000b
+ ld bc, 11
call CopyBytes
ld a, [wcd4c]
dec a
@@ -6400,12 +6405,12 @@
ld [wc701], a
ld hl, wd26b
ld de, wc719
- ld bc, $000b
+ ld bc, 11
call CopyBytes
ld a, [wcd4d]
dec a
ld c, a
- ld b, $0
+ ld b, 0
ld hl, OTPartySpecies
add hl, bc
ld a, [hl]
@@ -6415,7 +6420,7 @@
ld hl, OTPartyMonOT
call SkipNames
ld de, wc724
- ld bc, $000b
+ ld bc, 11
call CopyBytes
ld a, [wcd4d]
dec a
@@ -6493,13 +6498,13 @@
Function102b68: ; 102b68 ; unreferenced
xor a
ld hl, wcf71
- ld bc, $0010
+ ld bc, $10
call ByteFill
ret
; 102b73
Unknown_102b73:
- db $09, $06, $ff, $01, $a0, $00, $10, $c1
+ db $9, $6, $ff, $1, $a0, $, $10, $c1
Function102b7b: ; 102b7b
xor a
@@ -6516,13 +6521,13 @@
; 102b94
Unknown_102b94:
- db $01, $06, $ff, $01, $a0, $00, $10, $c1
+ db $1, $6, $ff, $1, $a0, $, $10, $c1
Function102b9c: ; 102b9c
ld a, [wcd4d]
dec a
hlcoord 6, 9
- ld bc, $0014
+ ld bc, $14
call AddNTimes
ld [hl], $ec
ret
@@ -6556,7 +6561,7 @@
push hl
ld a, [wcd4d]
ld c, a
- ld b, $0
+ ld b, 0
ld hl, OTPartyCount
add hl, bc
ld a, [hl]
@@ -6591,7 +6596,7 @@
Function102c14: ; 102c14
ld hl, PartySpecies
ld de, OTPartySpecies
- ld bc, $0001
+ ld bc, 1
call Function102c71
ret
; 102c21
@@ -6599,7 +6604,7 @@
Function102c21: ; 102c21
ld hl, PartyMonNicknames
ld de, OTPartyMonNicknames
- ld bc, $000b
+ ld bc, 11
call Function102c71
ret
; 102c2e
@@ -6607,7 +6612,7 @@
Function102c2e: ; 102c2e
ld hl, PartyMonOT
ld de, OTPartyMonOT
- ld bc, $000b
+ ld bc, 11
call Function102c71
ret
; 102c3b
@@ -6615,7 +6620,7 @@
Function102c3b: ; 102c3b
ld hl, PartyMon1
ld de, OTPartyMon1
- ld bc, $0030
+ ld bc, $30
call Function102c71
ret
; 102c48
@@ -6622,16 +6627,16 @@
Function102c48: ; 102c48
callba Function10165a
- ld a, $0
+ ld a, 0
call GetSRAMBank
ld hl, $a600
ld de, wc608
- ld bc, $002f
+ ld bc, $2f
call Function102c71
call CloseSRAM
ld hl, wc608
ld de, wda00
- ld bc, $01e0
+ ld bc, $1e0
ld a, $5
call FarCopyWRAM
ret
@@ -6661,16 +6666,16 @@
ld [wJumptableIndex], a
ld a, [PartyCount]
ld [wcf64], a
- ld a, $0
+ ld a, 0
ld hl, $a600
ld de, wc608
- ld bc, $011a
+ ld bc, $11a
call Function102d3e
call Function102cee
- ld a, $0
+ ld a, 0
ld hl, wc608
ld de, $a600
- ld bc, $011a
+ ld bc, $11a
call Function102d3e
ld a, [wcd4d]
ld [wJumptableIndex], a
@@ -6679,13 +6684,13 @@
ld a, $5
ld hl, wda00
ld de, wc608
- ld bc, $011a
+ ld bc, $11a
call FarCopyWRAM
call Function102cee
ld a, $5
ld hl, wc608
ld de, wda00
- ld bc, $011a
+ ld bc, $11a
call FarCopyWRAM
pop af
ld [wcf64], a
@@ -6699,7 +6704,7 @@
dec a
call Function102d34
ld de, wd002
- ld bc, $002f
+ ld bc, $2f
call CopyBytes
ld a, [wJumptableIndex]
ld c, a
@@ -6706,7 +6711,7 @@
ld a, $6
sub c
ret z
- ld bc, $002f
+ ld bc, $2f
ld hl, 0
call AddNTimes
push hl
@@ -6715,7 +6720,7 @@
call Function102d34
ld d, h
ld e, l
- ld hl, $002f
+ ld hl, $2f
add hl, de
pop bc
call CopyBytes
@@ -6725,7 +6730,7 @@
ld d, h
ld e, l
ld hl, wd002
- ld bc, $002f
+ ld bc, $2f
call CopyBytes
ret
; 102d34
@@ -6732,7 +6737,7 @@
Function102d34: ; 102d34
ld hl, wc608
- ld bc, $002f
+ ld bc, $2f
call AddNTimes
ret
; 102d3e
@@ -6830,7 +6835,7 @@
Function102dec: ; 102dec
ld hl, Unknown_1032e2
ld de, UnknOBPals
- ld bc, $0020
+ ld bc, $20
ld a, $5
call FarCopyWRAM
callba Function49742
@@ -6902,7 +6907,7 @@
; 102e86
Function102e86: ; 102e86
- ld c, $0
+ ld c, 0
.asm_102e88
ld a, [de]
cp $ff
@@ -6920,7 +6925,7 @@
pop de
inc de
pop hl
- ld bc, $0014
+ ld bc, $14
add hl, bc
pop bc
inc c
@@ -6932,7 +6937,7 @@
ld a, [wcd4c]
dec a
ld c, a
- ld b, $0
+ ld b, 0
ld hl, PartySpecies
add hl, bc
ld a, [hl]
@@ -6940,12 +6945,12 @@
call GetPokemonName
ld hl, StringBuffer1
ld de, StringBuffer2
- ld bc, $000b
+ ld bc, 11
call CopyBytes
ld a, [wcd4d]
dec a
ld c, a
- ld b, $0
+ ld b, 0
ld hl, OTPartySpecies
add hl, bc
ld a, [hl]
@@ -7025,7 +7030,7 @@
Function102f85: ; 102f85
ld a, [wd003]
ld c, a
- ld b, $0
+ ld b, 0
ld hl, OTPartySpecies
add hl, bc
ld a, [hl]
@@ -7200,7 +7205,7 @@
ld hl, wcd4b
bit 7, [hl]
pop hl
- ld a, $0
+ ld a, 0
jr z, .asm_1030eb
ld a, $5
.asm_1030eb
@@ -7245,77 +7250,77 @@
; 103112
Unknown_103112: ; 103112
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $01, $00, $00, $00, $00, $00, $00, $00
- db $02, $01, $00, $00, $00, $00, $00, $00
- db $03, $02, $01, $00, $00, $00, $00, $00
- db $04, $03, $02, $01, $00, $00, $00, $00
- db $04, $04, $03, $02, $01, $00, $00, $00
- db $04, $04, $04, $03, $02, $01, $00, $00
- db $04, $04, $04, $04, $03, $02, $01, $00
- db $04, $04, $04, $04, $04, $03, $02, $01
- db $04, $04, $04, $04, $04, $04, $03, $02
- db $04, $04, $04, $04, $04, $04, $04, $03
- db $04, $04, $04, $04, $04, $04, $04, $04
- db $04, $04, $04, $04, $04, $04, $04, $04
- db $04, $04, $04, $04, $04, $04, $04, $04
- db $04, $04, $04, $04, $04, $04, $04, $04
- db $04, $04, $04, $04, $04, $04, $04, $04
- db $04, $04, $04, $04, $04, $04, $04, $04
- db $04, $04, $04, $04, $04, $04, $04, $04
- db $04, $04, $04, $04, $04, $04, $04, $04
- db $03, $04, $04, $04, $04, $04, $04, $04
- db $02, $03, $04, $04, $04, $04, $04, $04
- db $01, $02, $03, $04, $04, $04, $04, $04
- db $00, $01, $02, $03, $04, $04, $04, $04
- db $00, $00, $01, $02, $03, $04, $04, $04
- db $00, $00, $00, $01, $02, $03, $04, $04
- db $00, $00, $00, $00, $01, $02, $03, $04
- db $00, $00, $00, $00, $00, $01, $02, $03
- db $00, $00, $00, $00, $00, $00, $01, $02
- db $00, $00, $00, $00, $00, $00, $00, $01
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
- db $00, $00, $00, $00, $00, $00, $00, $00
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $1, $, $, $, $, $, $, $
+ db $2, $1, $, $, $, $, $, $
+ db $3, $2, $1, $, $, $, $, $
+ db $4, $3, $2, $1, $, $, $, $
+ db $4, $4, $3, $2, $1, $, $, $
+ db $4, $4, $4, $3, $2, $1, $, $
+ db $4, $4, $4, $4, $3, $2, $1, $
+ db $4, $4, $4, $4, $4, $3, $2, $1
+ db $4, $4, $4, $4, $4, $4, $3, $2
+ db $4, $4, $4, $4, $4, $4, $4, $3
+ db $4, $4, $4, $4, $4, $4, $4, $4
+ db $4, $4, $4, $4, $4, $4, $4, $4
+ db $4, $4, $4, $4, $4, $4, $4, $4
+ db $4, $4, $4, $4, $4, $4, $4, $4
+ db $4, $4, $4, $4, $4, $4, $4, $4
+ db $4, $4, $4, $4, $4, $4, $4, $4
+ db $4, $4, $4, $4, $4, $4, $4, $4
+ db $4, $4, $4, $4, $4, $4, $4, $4
+ db $3, $4, $4, $4, $4, $4, $4, $4
+ db $2, $3, $4, $4, $4, $4, $4, $4
+ db $1, $2, $3, $4, $4, $4, $4, $4
+ db $, $1, $2, $3, $4, $4, $4, $4
+ db $, $, $1, $2, $3, $4, $4, $4
+ db $, $, $, $1, $2, $3, $4, $4
+ db $, $, $, $, $1, $2, $3, $4
+ db $, $, $, $, $, $1, $2, $3
+ db $, $, $, $, $, $, $1, $2
+ db $, $, $, $, $, $, $, $1
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
+ db $, $, $, $, $, $, $, $
; 10327a
Unknown_10327a: ; 10327a
- db $00, $00, $00, $00
- db $00, $00, $01, $00
- db $00, $00, $02, $00
- db $00, $00, $03, $00
- db $00, $00, $01, $01
- db $00, $00, $00, $00
- db $00, $00, $01, $02
- db $00, $00, $02, $02
- db $00, $00, $03, $02
- db $00, $00, $01, $03
+ db $, $, $, $
+ db $, $, $1, $
+ db $, $, $2, $
+ db $, $, $3, $
+ db $, $, $1, $1
+ db $, $, $, $
+ db $, $, $1, $2
+ db $, $, $2, $2
+ db $, $, $3, $2
+ db $, $, $1, $3
GFX_1032a2:
INCBIN "gfx/unknown/1032a2.2bpp"
Unknown_1032e2:
- db $00, $00, $ff, $1f
+ db $, $, $ff, $1f
db $f4, $1b, $8d, $42
- db $00, $00, $67, $45
- db $00, $00, $00, $00
- db $00, $00, $1f, $13
- db $99, $01, $ff, $10
- db $00, $00, $19, $00
- db $00, $00, $00, $00
+ db $, $, $67, $45
+ db $, $, $, $
+ db $, $, $1f, $13
+ db $99, $1, $ff, $10
+ db $, $, $19, $
+ db $, $, $, $
; 103302
Function103302: ; 103302
@@ -7328,7 +7333,7 @@
xor a
ld [hBGMapMode], a
ld hl, Buffer1
- ld bc, $000a
+ ld bc, 10
xor a
call ByteFill
ld a, $4
@@ -7402,7 +7407,7 @@
ld a, [wd1f0]
ld [wd1f2], a
ld c, a
- ld b, $0
+ ld b, 0
ld hl, wd1ec
ld a, [hli]
ld h, [hl]
@@ -7478,7 +7483,7 @@
ret z
ld de, SFX_PUSH_BUTTON
call PlaySFX
- ld bc, $0008
+ ld bc, 8
call Function10350f
ld a, [Buffer1]
xor e
@@ -7499,7 +7504,7 @@
ld a, [wd1f3]
cp $2
jr nz, .asm_103452
- ld bc, $0001
+ ld bc, 1
call Function1034f7
ld c, $12
ld b, $1
@@ -7516,19 +7521,19 @@
.asm_10345f
ld bc, 0
call Function10350f
- ld bc, $0001
+ ld bc, 1
call Function103487
- ld bc, $0008
+ ld bc, 8
call Function10350f
ld a, [Buffer1]
and e
- ld bc, $0002
+ ld bc, 2
jr z, .asm_10347d
- ld bc, $0004
+ ld bc, 4
.asm_10347d
call Function10350f
- ld bc, $000b
+ ld bc, 11
call Function103487
ret
; 103487
@@ -7546,7 +7551,7 @@
ld c, $14
ld b, $3
call Function1034e0
- ld bc, $0006
+ ld bc, 6
call Function10350f
hlcoord 1, 16
call PlaceString
@@ -7556,10 +7561,10 @@
Function1034a7: ; 1034a7
ld a, [wd1f1]
ld [wd1f2], a
- ld bc, $000a
+ ld bc, 10
call Function1034f7
ld [hl], $7f
- ld bc, $000a
+ ld bc, 10
call Function1034f1
ld [hl], $ed
ret
@@ -7623,7 +7628,7 @@
ld a, [wd1f3]
push bc
ld hl, Unknown_103522
- ld bc, $0009
+ ld bc, 9
call AddNTimes
pop bc
add hl, bc
@@ -7696,7 +7701,7 @@
Unknown_1035e7: ; 1035e7
dwcoord 0, 6
- db $12, $07, $07
+ db $12, $7, $7
dw .this
.this
db 4, 2, 1, 0, 3
@@ -7703,7 +7708,7 @@
Unknown_1035f3: ; 1035f3
dwcoord 0, 7
- db $12, $06, $09
+ db $12, $6, $9
dw .this
.this
db 3, 2, 1, 3
@@ -7710,7 +7715,7 @@
Unknown_1035fe: ; 1035fe
dwcoord 0, 9
- db $12, $04, $0b
+ db $12, $4, $b
dw .this
.this
db 2, 0, 3
@@ -7717,7 +7722,7 @@
Unknown_103608: ; 103608
dwcoord 0, 9
- db $12, $04, $0b
+ db $12, $4, $b
dw .this
.this
db 2, 2, 3
@@ -7959,7 +7964,7 @@
; 10378c
Function10378c: ; 10378c
- ld c, $0
+ ld c, 0
ld hl, SwarmFlags
bit 4, [hl]
jr nz, .already_set
@@ -8089,7 +8094,7 @@
jr c, .asm_103870
ld hl, wd002
ld de, wdc5c
- ld bc, $0003
+ ld bc, 3
call CopyBytes
xor a
ld [ScriptVar], a
--- a/misc/mobile_41.asm
+++ b/misc/mobile_41.asm
@@ -975,11 +975,7 @@
ret
; 106462
-Function106462: ; 106462
- ret
-; 106463
-
-Function106463: ; 106463
+MobileFunc_106462: mobile
ret
; 106464
--- a/misc/mobile_42.asm
+++ b/misc/mobile_42.asm
@@ -328,7 +328,7 @@
ld [hWY], a
call LoadStandardFont
call LoadFontsBattleExtra
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
scf
ret
--- a/misc/mobile_45.asm
+++ b/misc/mobile_45.asm
@@ -5755,9 +5755,9 @@
ld [MusicFade], a
ld de, MUSIC_MOBILE_ADAPTER
ld a, e
- ld [wc2a9], a
+ ld [MusicFadeIDLo], a
ld a, d
- ld [wc2aa], a
+ ld [MusicFadeIDHi], a
ld a, [wc314 + 5]
inc a
ld [wc314 + 5], a
@@ -5934,10 +5934,10 @@
callba ReloadMapPart
ld a, $8
ld [MusicFade], a
- ld a, [wc2c0]
- ld [wc2a9], a
+ ld a, [wMapMusic]
+ ld [MusicFadeIDLo], a
xor a
- ld [wc2aa], a
+ ld [MusicFadeIDHi], a
xor a
ld [wc314 + 5], a
ld [wc30d], a
@@ -5981,10 +5981,10 @@
jr z, .asm_11642a
ld a, $8
ld [MusicFade], a
- ld a, [wc2c0]
- ld [wc2a9], a
+ ld a, [wMapMusic]
+ ld [MusicFadeIDLo], a
xor a
- ld [wc2aa], a
+ ld [MusicFadeIDHi], a
jr .asm_116439
.asm_11642a
@@ -5991,9 +5991,9 @@
ld a, $8
ld [MusicFade], a
ld a, $0
- ld [wc2a9], a
+ ld [MusicFadeIDLo], a
ld a, $0
- ld [wc2aa], a
+ ld [MusicFadeIDHi], a
.asm_116439
xor a
@@ -6009,10 +6009,10 @@
callba ReloadMapPart
ld a, $8
ld [MusicFade], a
- ld a, [wc2c0]
- ld [wc2a9], a
+ ld a, [wMapMusic]
+ ld [MusicFadeIDLo], a
xor a
- ld [wc2aa], a
+ ld [MusicFadeIDHi], a
xor a
ld [wc314 + 5], a
ld [wc30d], a
--- a/misc/mobile_46.asm
+++ b/misc/mobile_46.asm
@@ -489,7 +489,7 @@
ld [hFFC9], a
ld [hMobile], a
ei
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
callba Function115d99
callba Function11615a
@@ -4565,7 +4565,7 @@
call BackUpTiles
callba Function11765d
callba Function117ab4
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
call ExitMenu
callba ReloadMapPart
@@ -4588,7 +4588,7 @@
call BackUpTiles
callba Function11765d
callba Function17d3f6
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
call ExitMenu
callba ReloadMapPart
@@ -5691,7 +5691,7 @@
call ClearBGPalettes
call Function2bae
call Call_ExitMenu
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
call Functiond90
callba Function2b5c
--- a/misc/mobile_5c.asm
+++ b/misc/mobile_5c.asm
@@ -715,7 +715,7 @@
dec [hl]
ret nz
call ClearBGPalettes
- callba Function106462
+ callba MobileFunc_106462
callba Function106464
ld a, $2
ld [wc303], a
--- a/misc/mobile_5f.asm
+++ b/misc/mobile_5f.asm
@@ -802,7 +802,7 @@
jr z, .asm_17d4e0
ld a, e
ld [wcd6c], a
- ld [wc2c0], a
+ ld [wMapMusic], a
ld d, $0
call PlayMusic2
--- a/wram.asm
+++ b/wram.asm
@@ -87,7 +87,7 @@
; Addreses are Channel1 (c101).
\1MusicID:: dw
\1MusicBank:: db
-\1Flags:: db ; 0:on/off 1:subroutine 4:noise
+\1Flags:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest
\1Flags2:: db ; 0:vibrato on/off 2:duty
\1Flags3:: db ; 0:vibrato up/down
\1MusicAddress:: dw
@@ -209,11 +209,10 @@
Channel8:: channel_struct Channel8 ; c25f
ds 1 ; c291
-wc292:: ds 1
-wc293:: ds 1
-wc294:: ds 1
-wc295:: ds 1
-wc296:: ds 1
+wCurTrackDuty:: ds 1
+wCurTrackIntensity:: ds 1
+wCurTrackFrequency:: dw
+wc296:: ds 1 ; used only in an unused function
wc297:: ds 1
CurMusicByte:: ; c298
@@ -254,7 +253,7 @@
ds 1
NoiseSampleAddressHi:: ; c2a1
ds 1
-wc2a2:: ; noise delay? ; c2a2
+wNoiseSampleDelay:: ; noise delay? ; c2a2
ds 1
; c2a3
ds 1
@@ -565,12 +564,9 @@
BattleMon:: battle_struct BattleMon ; c62c
-wc64c::
- ds 1
+ ds 2
-wc64d:: ds 1
-wWildMon::
-wc64e:: ds 1
+wWildMon:: ds 1
ds 1
wEnemyTrainerItem1:: ds 1
wEnemyTrainerItem2:: ds 1