diff options
Diffstat (limited to 'audio')
113 files changed, 2833 insertions, 4684 deletions
diff --git a/audio/cries.asm b/audio/cries.asm index 7848d185e..b8d9d2145 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -1,178 +1,148 @@ -Cry_Marill: ; f2d81 +Cry_Marill: musicheader 3, 5, Cry_Marill_Ch5 musicheader 1, 6, Cry_Marill_Ch6 musicheader 1, 8, Cry_Marill_Ch8 -; f2d8a -Cry_Togepi: ; f2d8a +Cry_Togepi: musicheader 2, 5, Cry_Togepi_Ch5 musicheader 1, 6, Cry_Togepi_Ch6 -; f2d90 -Cry_Togetic: ; f2d90 +Cry_Togetic: musicheader 2, 5, Cry_Togetic_Ch5 musicheader 1, 6, Cry_Togetic_Ch6 -; f2d96 -Cry_Spinarak: ; f2d96 +Cry_Spinarak: musicheader 3, 5, Cry_Spinarak_Ch5 musicheader 1, 6, Cry_Spinarak_Ch6 musicheader 1, 8, Cry_Spinarak_Ch8 -; f2d9f -Cry_Raikou: ; f2d9f +Cry_Raikou: musicheader 3, 5, Cry_Raikou_Ch5 musicheader 1, 6, Cry_Raikou_Ch6 musicheader 1, 8, Cry_Raikou_Ch8 -; f2da8 -Cry_Hoothoot: ; f2da8 +Cry_Hoothoot: musicheader 3, 5, Cry_Hoothoot_Ch5 musicheader 1, 6, Cry_Hoothoot_Ch6 musicheader 1, 8, Cry_Hoothoot_Ch8 -; f2db1 -Cry_Sentret: ; f2db1 +Cry_Sentret: musicheader 2, 5, Cry_Sentret_Ch5 musicheader 1, 6, Cry_Sentret_Ch6 -; f2db7 -Cry_Slowking: ; f2db7 +Cry_Slowking: musicheader 3, 5, Cry_Slowking_Ch5 musicheader 1, 6, Cry_Slowking_Ch6 musicheader 1, 8, Cry_Slowking_Ch8 -; f2dc0 -Cry_Mareep: ; f2dc0 +Cry_Mareep: musicheader 2, 5, Cry_Mareep_Ch5 musicheader 1, 6, Cry_Mareep_Ch6 -; f2dc6 -Cry_Cyndaquil: ; f2dc6 +Cry_Cyndaquil: musicheader 3, 5, Cry_Cyndaquil_Ch5 musicheader 1, 6, Cry_Cyndaquil_Ch6 musicheader 1, 8, Cry_Cyndaquil_Ch8 -; f2dcf -Cry_Chikorita: ; f2dcf +Cry_Chikorita: musicheader 3, 5, Cry_Chikorita_Ch5 musicheader 1, 6, Cry_Chikorita_Ch6 musicheader 1, 8, Cry_Chikorita_Ch8 -; f2dd8 -Cry_Gligar: ; f2dd8 +Cry_Gligar: musicheader 2, 5, Cry_Gligar_Ch5 musicheader 1, 8, Cry_Gligar_Ch8 -; f2dde -Cry_Girafarig: ; f2dde +Cry_Girafarig: musicheader 3, 5, Cry_Girafarig_Ch5 musicheader 1, 6, Cry_Girafarig_Ch6 musicheader 1, 8, Cry_Girafarig_Ch8 -; f2de7 -Cry_Slugma: ; f2de7 +Cry_Slugma: musicheader 2, 5, Cry_Slugma_Ch5 musicheader 1, 8, Cry_Slugma_Ch8 -; f2ded -Cry_Ledyba: ; f2ded +Cry_Ledyba: musicheader 3, 5, Cry_Ledyba_Ch5 musicheader 1, 6, Cry_Ledyba_Ch6 musicheader 1, 8, Cry_Ledyba_Ch8 -; f2df6 -Cry_Wooper: ; f2df6 +Cry_Wooper: musicheader 3, 5, Cry_Wooper_Ch5 musicheader 1, 6, Cry_Wooper_Ch6 musicheader 1, 8, Cry_Wooper_Ch8 -; f2dff -Cry_Donphan: ; f2dff +Cry_Donphan: musicheader 3, 5, Cry_Donphan_Ch5 musicheader 1, 6, Cry_Donphan_Ch6 musicheader 1, 8, Cry_Donphan_Ch8 -; f2e08 -Cry_Typhlosion: ; f2e08 +Cry_Typhlosion: musicheader 3, 5, Cry_Typhlosion_Ch5 musicheader 1, 6, Cry_Typhlosion_Ch6 musicheader 1, 8, Cry_Typhlosion_Ch8 -; f2e11 -Cry_Natu: ; f2e11 +Cry_Natu: musicheader 3, 5, Cry_Natu_Ch5 musicheader 1, 6, Cry_Natu_Ch6 musicheader 1, 8, Cry_Natu_Ch8 -; f2e1a -Cry_Teddiursa: ; f2e1a +Cry_Teddiursa: musicheader 3, 5, Cry_Teddiursa_Ch5 musicheader 1, 6, Cry_Teddiursa_Ch6 musicheader 1, 8, Cry_Teddiursa_Ch8 -; f2e23 -Cry_Sunflora: ; f2e23 +Cry_Sunflora: musicheader 3, 5, Cry_Sunflora_Ch5 musicheader 1, 6, Cry_Sunflora_Ch6 musicheader 1, 8, Cry_Sunflora_Ch8 -; f2e2c -Cry_Ampharos: ; f2e2c +Cry_Ampharos: musicheader 3, 5, Cry_Ampharos_Ch5 musicheader 1, 6, Cry_Ampharos_Ch6 musicheader 1, 8, Cry_Ampharos_Ch8 -; f2e35 -Cry_Totodile: ; f2e35 +Cry_Totodile: musicheader 3, 5, Cry_Totodile_Ch5 musicheader 1, 6, Cry_Totodile_Ch6 musicheader 1, 8, Cry_Totodile_Ch8 -; f2e3e -Cry_Cleffa: ; f2e3e +Cry_Cleffa: musicheader 3, 5, Cry_Cleffa_Ch5 musicheader 1, 6, Cry_Cleffa_Ch6 musicheader 1, 8, Cry_Cleffa_Ch8 -; f2e47 -Cry_Pichu: ; f2e47 +Cry_Pichu: musicheader 3, 5, Cry_Pichu_Ch5 musicheader 1, 6, Cry_Pichu_Ch6 musicheader 1, 8, Cry_Pichu_Ch8 -; f2e50 -Cry_Aipom: ; f2e50 +Cry_Aipom: musicheader 3, 5, Cry_Aipom_Ch5 musicheader 1, 6, Cry_Aipom_Ch6 musicheader 1, 8, Cry_Aipom_Ch8 -; f2e59 -Cry_Dunsparce: ; f2e59 +Cry_Dunsparce: musicheader 3, 5, Cry_Dunsparce_Ch5 musicheader 1, 6, Cry_Dunsparce_Ch6 musicheader 1, 8, Cry_Dunsparce_Ch8 -; f2e62 -Cry_Magcargo: ; f2e62 +Cry_Magcargo: musicheader 3, 5, Cry_Magcargo_Ch5 musicheader 1, 6, Cry_Magcargo_Ch6 musicheader 1, 8, Cry_Magcargo_Ch8 -; f2e6b -Cry_Entei: ; f2e6b +Cry_Entei: musicheader 3, 5, Cry_Entei_Ch5 musicheader 1, 6, Cry_Entei_Ch6 musicheader 1, 8, Cry_Entei_Ch8 -; f2e74 -Cry_Mantine: ; f2e74 +Cry_Mantine: musicheader 3, 5, Cry_Mantine_Ch5 musicheader 1, 6, Cry_Mantine_Ch6 musicheader 1, 8, Cry_Mantine_Ch8 -; f2e7d -Cry_Entei_Ch5: ; f2e7d +Cry_Entei_Ch5: soundinput $ff sound_duty 3, 0, 2, 1 sound __, 2, $f8, $05f8 @@ -181,26 +151,23 @@ Cry_Entei_Ch5: ; f2e7d sound C_, 5, $f2, $0574 soundinput $88 endchannel -; f2e94 -Cry_Entei_Ch6: ; f2e94 +Cry_Entei_Ch6: sound_duty 3, 0, 3, 0 sound __, 2, $c8, $0640 sound __, 7, $ff, $0668 sound __, 8, $a8, $0534 sound C_, 5, $a2, $04a4 endchannel -; f2ea7 -Cry_Entei_Ch8: ; f2ea7 +Cry_Entei_Ch8: noise __, 11, $d6, $6a noise __, 7, $bc, $6c noise __, 7, $e2, $5c noise C#, 1, $b4, $6c endchannel -; f2eb4 -Cry_Magcargo_Ch5: ; f2eb4 +Cry_Magcargo_Ch5: sound_duty 0, 1, 0, 3 sound __, 5, $af, $0720 sound __, 3, $f8, $071c @@ -210,9 +177,8 @@ Cry_Magcargo_Ch5: ; f2eb4 sound __, 13, $c8, $0712 sound __, 5, $91, $070e endchannel -; f2ed3 -Cry_Magcargo_Ch6: ; f2ed3 +Cry_Magcargo_Ch6: sound_duty 2, 2, 0, 0 sound __, 2, $b8, $0710 sound __, 4, $d8, $072c @@ -222,19 +188,17 @@ Cry_Magcargo_Ch6: ; f2ed3 sound __, 13, $f8, $0760 sound __, 5, $c1, $0750 endchannel -; f2ef2 -Cry_Magcargo_Ch8: ; f2ef2 +Cry_Magcargo_Ch8: noise __, 3, $e8, $3b -Cry_Magcargo_branch_f2ef5: ; f2ef5 +.loop noise __, 2, $f1, $4e - loopchannel 5, Cry_Magcargo_branch_f2ef5 + loopchannel 5, .loop noise __, 3, $d8, $3f noise C_, 5, $c2, $5f endchannel -; f2f03 -Cry_Dunsparce_Ch5: ; f2f03 +Cry_Dunsparce_Ch5: sound_duty 2, 0, 2, 0 sound __, 2, $f8, $05b0 sound __, 2, $f8, $04b4 @@ -246,23 +210,20 @@ Cry_Dunsparce_Ch5: ; f2f03 sound C_, 1, $c3, $0490 soundinput $88 endchannel -; f2f26 -Cry_Dunsparce_Ch6: ; f2f26 +Cry_Dunsparce_Ch6: sound_duty 2, 0, 2, 0 sound __, 9, $b8, $04c8 sound C#, 1, $b5, $0410 endchannel -; f2f31 -Cry_Dunsparce_Ch8: ; f2f31 +Cry_Dunsparce_Ch8: noise __, 4, $ff, $4b noise __, 4, $ef, $4c noise C#, 1, $b5, $5f endchannel -; f2f3b -Cry_Slowking_Ch5: ; f2f3b +Cry_Slowking_Ch5: sound_duty 3, 0, 3, 0 sound __, 3, $f1, $0550 sound __, 3, $f1, $0530 @@ -272,9 +233,8 @@ Cry_Slowking_Ch5: ; f2f3b sound __, 3, $f2, $0630 sound C_, 1, $f2, $0550 endchannel -; f2f5a -Cry_Slowking_Ch6: ; f2f5a +Cry_Slowking_Ch6: sound_duty 2, 0, 3, 3 sound __, 5, $e1, $0620 sound __, 6, $e2, $0500 @@ -282,9 +242,8 @@ Cry_Slowking_Ch6: ; f2f5a sound __, 3, $e1, $0520 sound C_, 1, $e2, $0500 endchannel -; f2f71 -Cry_Slowking_Ch8: ; f2f71 +Cry_Slowking_Ch8: noise __, 3, $8a, $5d noise __, 3, $9a, $4c noise __, 6, $9a, $5d @@ -294,9 +253,8 @@ Cry_Slowking_Ch8: ; f2f71 noise __, 3, $9a, $5f noise C_, 1, $b2, $6f endchannel -; f2f8a -Cry_Pichu_Ch5: ; f2f8a +Cry_Pichu_Ch5: dutycycle $0 soundinput $f7 sound __, 3, $f8, $078d @@ -309,9 +267,8 @@ Cry_Pichu_Ch5: ; f2f8a sound __, 3, $f8, $07b8 soundinput $88 endchannel -; f2fab -Cry_Pichu_Ch6: ; f2fab +Cry_Pichu_Ch6: sound_duty 0, 0, 1, 0 sound __, 3, $c8, $076d sound __, 3, $c8, $0771 @@ -319,18 +276,16 @@ Cry_Pichu_Ch6: ; f2fab sound __, 3, $c8, $0794 sound __, 3, $c8, $0798 endchannel -; f2fc2 -Cry_Pichu_Ch8: ; f2fc2 +Cry_Pichu_Ch8: noise __, 3, $b8, $1 noise __, 3, $b8, $19 noise __, 3, $c8, $18 noise __, 3, $b8, $10 noise __, 9, $c2, $18 endchannel -; f2fd2 -Cry_Marill_Ch5: ; f2fd2 +Cry_Marill_Ch5: sound_duty 2, 0, 2, 0 sound __, 3, $88, $06d8 sound __, 9, $e2, $06e0 @@ -340,9 +295,8 @@ Cry_Marill_Ch5: ; f2fd2 sound __, 3, $d8, $06b0 sound __, 9, $c1, $06aa endchannel -; f2ff1 -Cry_Marill_Ch6: ; f2ff1 +Cry_Marill_Ch6: sound_duty 3, 0, 2, 1 sound __, 3, $68, $06b1 sound __, 6, $c1, $06b9 @@ -351,9 +305,8 @@ Cry_Marill_Ch6: ; f2ff1 sound __, 3, $a8, $0684 sound __, 11, $92, $067b endchannel -; f300c -Cry_Marill_Ch8: ; f300c +Cry_Marill_Ch8: noise __, 2, $99, $6c noise __, 2, $92, $5c noise __, 11, $62, $4c @@ -361,58 +314,51 @@ Cry_Marill_Ch8: ; f300c noise __, 3, $68, $6b noise __, 11, $62, $6c endchannel -; f301f -Cry_Togepi_Ch5: ; f301f +Cry_Togepi_Ch5: tone $0002 -Cry_Togepi_Ch6: ; f3022 -Cry_Togetic_branch_f3022: ; f3022 +Cry_Togepi_Ch6: +Cry_Togetic_branch_f3022: sound_duty 2, 0, 1, 1 sound __, 5, $f1, $0796 sound __, 5, $f1, $072d sound __, 8, $0, 0 sound C_, 1, $f1, $07a7 endchannel -; f3035 -Cry_Togetic_Ch5: ; f3035 +Cry_Togetic_Ch5: tone $0002 -Cry_Togetic_Ch6: ; f3038 -Cry_Togetic_branch_f3038: ; f3038 +Cry_Togetic_Ch6: callchannel Cry_Togetic_branch_f3022 - loopchannel 2, Cry_Togetic_branch_f3038 + loopchannel 2, Cry_Togetic_Ch6 sound __, 15, $0, 0 sound __, 9, $f2, $07c2 endchannel -; f3048 -Cry_Spinarak_Ch5: ; f3048 +Cry_Spinarak_Ch5: dutycycle $1 sound __, 4, $2c, $07c4 sound __, 2, $0, $0001 sound __, 6, $59, $07b9 sound __, 7, $b4, $07bb endchannel -; f305b -Cry_Spinarak_Ch6: ; f305b +Cry_Spinarak_Ch6: sound_duty 2, 2, 2, 0 sound __, 4, $2c, $07c7 sound __, 2, $0, 0 sound __, 6, $59, $07be sound __, 7, $b4, $07bd endchannel -; f306e -Cry_Spinarak_Ch8: ; f306e +Cry_Spinarak_Ch8: noise __, 4, $92, $10 noise __, 2, $39, $0 noise __, 6, $69, $10 noise __, 7, $93, $0 endchannel -; f307b -Cry_Raikou_Ch5: ; f307b +Cry_Raikou_Ch5: sound_duty 0, 2, 3, 3 sound __, 3, $f1, $04b0 sound __, 3, $f7, $0590 @@ -422,9 +368,8 @@ Cry_Raikou_Ch5: ; f307b sound __, 4, $f2, $06b0 sound C_, 1, $f2, $0690 endchannel -; f309a -Cry_Raikou_Ch6: ; f309a +Cry_Raikou_Ch6: sound_duty 2, 0, 3, 3 sound __, 3, $f1, $0720 sound __, 3, $e1, $0650 @@ -435,9 +380,8 @@ Cry_Raikou_Ch6: ; f309a sound __, 4, $f2, $0690 sound C_, 1, $e2, $06a0 endchannel -; f30bd -Cry_Raikou_Ch8: ; f30bd +Cry_Raikou_Ch8: noise __, 3, $89, $2e noise __, 3, $99, $1f noise __, 5, $89, $4e @@ -447,9 +391,8 @@ Cry_Raikou_Ch8: ; f30bd noise __, 4, $ec, $4d noise C_, 1, $d2, $4f endchannel -; f30d6 -Cry_Hoothoot_Ch5: ; f30d6 +Cry_Hoothoot_Ch5: sound_duty 2, 1, 2, 1 sound __, 5, $78, $0650 sound __, 5, $f8, $0660 @@ -460,92 +403,82 @@ Cry_Hoothoot_Ch5: ; f30d6 sound __, 5, $f8, $0678 sound __, 5, $f1, $0674 endchannel -; f30f9 -Cry_Hoothoot_Ch6: ; f30f9 +Cry_Hoothoot_Ch6: sound_duty 2, 0, 2, 0 -Cry_Hoothoot_branch_f30fb: ; f30fb +.loop1 sound __, 3, $a1, $0600 - loopchannel 3, Cry_Hoothoot_branch_f30fb -Cry_Hoothoot_branch_f3103: ; f3103 + loopchannel 3, .loop1 +.loop2 sound __, 3, $a1, $0630 - loopchannel 4, Cry_Hoothoot_branch_f3103 + loopchannel 4, .loop2 sound __, 5, $a2, $0634 sound __, 5, $91, $0638 endchannel -; f3114 -Cry_Hoothoot_Ch8: ; f3114 +Cry_Hoothoot_Ch8: noise __, 2, $68, $36 noise C_, 1, $88, $6a noise __, 2, $98, $5e noise C_, 1, $a7, $6e endchannel -; f3121 -Cry_Sentret_Ch5: ; f3121 +Cry_Sentret_Ch5: tone $0020 dutycycle $0 jumpchannel Cry_Sentret_branch_f312b -; f3129 -Cry_Sentret_Ch6: ; f3129 +Cry_Sentret_Ch6: sound_duty 3, 2, 1, 0 -Cry_Sentret_branch_f312b: ; f312b +Cry_Sentret_branch_f312b: sound __, 9, $39, $072d sound __, 9, $f1, $0720 endchannel -; f3134 -Cry_Sentret_Ch8: ; f3134 +Cry_Sentret_Ch8: noise __, 9, $3b, $0 noise __, 9, $92, $0 endchannel -; f313b -Cry_Mareep_Ch5: ; f313b +Cry_Mareep_Ch5: tone $0020 dutycycle $0 jumpchannel Cry_Mareep_branch_f3145 -; f3143 -Cry_Mareep_Ch6: ; f3143 +Cry_Mareep_Ch6: sound_duty 1, 0, 0, 0 -Cry_Mareep_branch_f3145: ; f3145 -Cry_Gligar_branch_f3145: ; f3145 +Cry_Mareep_branch_f3145: +Cry_Gligar_branch_f3145: sound __, 5, $3a, $073d sound __, 7, $f8, $0762 sound __, 7, $f8, $0760 sound __, 7, $f1, $075e endchannel -; f3156 -Cry_Cyndaquil_Ch5: ; f3156 +Cry_Cyndaquil_Ch5: tone $0020 -Cry_Cyndaquil_Ch6: ; f3159 +Cry_Cyndaquil_Ch6: dutycycle $2 sound __, 9, $2f, $0107 -Cry_Cyndaquil_branch_f315f: ; f315f +.loop1 sound __, 1, $e1, $0483 sound __, 1, $51, $044e - loopchannel 4, Cry_Cyndaquil_branch_f315f -Cry_Cyndaquil_branch_f316b: ; f316b + loopchannel 4, .loop1 +.loop2 sound __, 1, $e1, $03da sound __, 2, $51, $0312 - loopchannel 4, Cry_Cyndaquil_branch_f316b + loopchannel 4, .loop2 endchannel -; f3178 -Cry_Cyndaquil_Ch8: ; f3178 -Cry_Gligar_Ch8: ; f3178 +Cry_Cyndaquil_Ch8: +Cry_Gligar_Ch8: noise __, 9, $3f, $52 noise C#, 1, $93, $4f endchannel -; f317f -Cry_Chikorita_Ch5: ; f317f +Cry_Chikorita_Ch5: tone $0020 -Cry_Chikorita_Ch6: ; f3182 +Cry_Chikorita_Ch6: sound_duty 1, 0, 2, 0 sound __, 3, $c8, $0641 sound __, 3, $48, $0641 @@ -553,46 +486,40 @@ Cry_Chikorita_Ch6: ; f3182 sound __, 5, $f8, $078e sound __, 5, $f1, $078b endchannel -; f3199 -Cry_Chikorita_Ch8: ; f3199 +Cry_Chikorita_Ch8: noise __, 5, $91, $10 noise __, 9, $94, $3 endchannel -; f31a0 -Cry_Gligar_Ch5: ; f31a0 +Cry_Gligar_Ch5: sound_duty 2, 0, 2, 2 jumpchannel Cry_Gligar_branch_f3145 -; f31a5 -Cry_Girafarig_Ch5: ; f31a5 +Cry_Girafarig_Ch5: dutycycle $1 tone $0004 jumpchannel Cry_Girafarig_branch_f31af -; f31ad -Cry_Girafarig_Ch6: ; f31ad +Cry_Girafarig_Ch6: sound_duty 1, 0, 0, 1 -Cry_Girafarig_branch_f31af: ; f31af +Cry_Girafarig_branch_f31af: sound __, 5, $68, $0758 sound __, 3, $e8, $0760 sound __, 3, $e8, $0767 sound __, 3, $e8, $076c sound __, 8, $f1, $0767 endchannel -; f31c4 -Cry_Girafarig_Ch8: ; f31c4 +Cry_Girafarig_Ch8: noise __, 5, $29, $0 noise __, 3, $39, $1 noise __, 3, $49, $2 noise __, 3, $59, $1 noise __, 8, $41, $0 endchannel -; f31d4 -Cry_Slugma_Ch5: ; f31d4 +Cry_Slugma_Ch5: sound_duty 1, 0, 1, 2 sound __, 13, $f2, $07a6 sound __, 5, $f8, $07b0 @@ -600,25 +527,22 @@ Cry_Slugma_Ch5: ; f31d4 sound __, 7, $f8, $03a0 sound __, 9, $e1, $0290 endchannel -; f31eb -Cry_Slugma_Ch8: ; f31eb +Cry_Slugma_Ch8: noise __, 13, $b2, $50 noise __, 9, $a8, $60 noise __, 7, $a8, $5b noise __, 9, $a1, $5c endchannel -; f31f8 -Cry_Ledyba_Ch5: ; f31f8 +Cry_Ledyba_Ch5: tone $0002 dutycycle $2 jumpchannel Cry_Ledyba_branch_f3202 -; f3200 -Cry_Ledyba_Ch6: ; f3200 +Cry_Ledyba_Ch6: sound_duty 1, 0, 0, 0 -Cry_Ledyba_branch_f3202: ; f3202 +Cry_Ledyba_branch_f3202: sound __, 4, $f8, $0791 sound __, 4, $d8, $078d sound __, 3, $0, 0 @@ -626,9 +550,8 @@ Cry_Ledyba_branch_f3202: ; f3202 sound __, 2, $f8, $0741 sound __, 5, $e1, $0751 endchannel -; f321b -Cry_Ledyba_Ch8: ; f321b +Cry_Ledyba_Ch8: noise __, 4, $59, $21 noise __, 4, $81, $0 noise __, 3, $20, $0 @@ -636,10 +559,9 @@ Cry_Ledyba_Ch8: ; f321b noise __, 2, $80, $10 noise __, 5, $87, $0 endchannel -; f322e -Cry_Wooper_Ch5: ; f322e -Cry_Donphan_Ch5: ; f322e +Cry_Wooper_Ch5: +Cry_Donphan_Ch5: dutycycle $2 sound __, 3, $99, $0718 sound __, 5, $ab, $0722 @@ -648,10 +570,9 @@ Cry_Donphan_Ch5: ; f322e sound __, 9, $d1, $0712 sound __, 9, $0, 0 endchannel -; f3249 -Cry_Wooper_Ch6: ; f3249 -Cry_Donphan_Ch6: ; f3249 +Cry_Wooper_Ch6: +Cry_Donphan_Ch6: sound_duty 3, 1, 0, 0 sound __, 3, $b9, $0738 sound __, 5, $cb, $0742 @@ -660,57 +581,48 @@ Cry_Donphan_Ch6: ; f3249 sound __, 9, $f1, $0732 sound __, 9, $0, 0 endchannel -; f3264 -Cry_Wooper_Ch8: ; f3264 +Cry_Wooper_Ch8: noise __, 3, $5b, $4 noise __, 5, $68, $13 noise __, 9, $68, $20 noise __, 5, $68, $13 noise C_, 1, $51, $4 endchannel -; f3274 -Cry_Donphan_Ch8: ; f3274 +Cry_Donphan_Ch8: noise __, 3, $8b, $59 noise __, 5, $a8, $6a noise __, 9, $a8, $70 noise __, 5, $a8, $69 noise C_, 1, $92, $6c endchannel -; f3284 -Cry_Typhlosion_Ch5: ; f3284 -Cry_Teddiursa_Ch5: ; f3284 +Cry_Typhlosion_Ch5: +Cry_Teddiursa_Ch5: sound_duty 2, 0, 1, 0 -Cry_Typhlosion_branch_f3286: ; f3286 -Cry_Teddiursa_branch_f3286: ; f3286 +.loop1 sound __, 4, $c1, $0791 - loopchannel 3, Cry_Typhlosion_branch_f3286 -Cry_Typhlosion_branch_f328e: ; f328e -Cry_Teddiursa_branch_f328e: ; f328e + loopchannel 3, .loop1 +.loop2 sound __, 4, $d1, $04b1 - loopchannel 6, Cry_Typhlosion_branch_f328e -Cry_Typhlosion_branch_f3296: ; f3296 -Cry_Teddiursa_branch_f3296: ; f3296 + loopchannel 6, .loop2 +.loop3 sound __, 2, $d1, $0491 sound __, 2, $b1, $0451 - loopchannel 6, Cry_Typhlosion_branch_f3296 -Cry_Typhlosion_branch_f32a2: ; f32a2 -Cry_Teddiursa_branch_f32a2: ; f32a2 + loopchannel 6, .loop3 +.loop4 sound __, 2, $a3, $0471 sound __, 2, $81, $0441 - loopchannel 6, Cry_Typhlosion_branch_f32a2 -Cry_Typhlosion_branch_f32ae: ; f32ae -Cry_Teddiursa_branch_f32ae: ; f32ae + loopchannel 6, .loop4 +.loop5 sound __, 2, $41, $0421 sound __, 2, $21, $0401 - loopchannel 4, Cry_Typhlosion_branch_f32ae + loopchannel 4, .loop5 endchannel -; f32bb -Cry_Typhlosion_Ch6: ; f32bb -Cry_Teddiursa_Ch6: ; f32bb +Cry_Typhlosion_Ch6: +Cry_Teddiursa_Ch6: sound_duty 0, 2, 3, 1 sound __, 9, $99, $0740 sound __, 9, $79, $0746 @@ -720,101 +632,90 @@ Cry_Teddiursa_Ch6: ; f32bb sound __, 9, $f8, $0787 sound C_, 9, $e2, $0783 endchannel -; f32da -Cry_Typhlosion_Ch8: ; f32da +Cry_Typhlosion_Ch8: noise C_, 1, $a6, $16 noise C_, 9, $98, $3d noise C#, 1, $98, $5c noise C#, 1, $75, $5f endchannel -; f32e7 -Cry_Natu_Ch5: ; f32e7 +Cry_Natu_Ch5: sound_duty 2, 3, 1, 3 -Cry_Mantine_branch_f32e9: ; f32e9 -Cry_Sunflora_branch_f32e9: ; f32e9 +Cry_Mantine_branch_f32e9: +Cry_Sunflora_branch_f32e9: sound __, 5, $f8, $07b1 sound __, 5, $f8, $07b0 sound __, 5, $48, $07af -Cry_Mantine_branch_f32f5: ; f32f5 +Cry_Mantine_branch_f32f5: sound __, 5, $f8, $07b2 sound __, 5, $f8, $07b3 sound __, 5, $48, $07b4 endchannel -; f3302 -Cry_Mantine_branch_f3302: ; f3302 -Cry_Natu_Ch6: ; f3302 -Cry_Sunflora_Ch6: ; f3302 +Cry_Mantine_branch_f3302: +Cry_Natu_Ch6: +Cry_Sunflora_Ch6: sound_duty 2, 0, 3, 3 sound __, 5, $f8, $07b2 sound __, 5, $f8, $07b1 sound __, 5, $28, $07b0 -Cry_Mantine_branch_f3310: ; f3310 +Cry_Mantine_branch_f3310: sound __, 5, $f8, $07b4 sound __, 5, $f8, $07b6 sound __, 5, $48, $07b8 endchannel -; f331d -Cry_Mantine_branch_f331d: ; f331d -Cry_Natu_Ch8: ; f331d -Cry_Sunflora_Ch8: ; f331d +Cry_Mantine_branch_f331d: +Cry_Natu_Ch8: +Cry_Sunflora_Ch8: noise __, 5, $88, $5 noise __, 5, $88, $4 noise __, 5, $38, $3 -Cry_Mantine_branch_f3326: ; f3326 +Cry_Mantine_branch_f3326: noise __, 5, $88, $5 noise __, 5, $88, $4 noise __, 5, $87, $4 endchannel -; f3330 -Cry_Teddiursa_Ch8: ; f3330 +Cry_Teddiursa_Ch8: noise __, 9, $a6, $3a noise __, 9, $a1, $5a endchannel -; f3337 -Cry_Sunflora_Ch5: ; f3337 +Cry_Sunflora_Ch5: dutycycle $0 jumpchannel Cry_Sunflora_branch_f32e9 -; f333c -Cry_Mantine_Ch5: ; f333c +Cry_Mantine_Ch5: dutycycle $0 callchannel Cry_Mantine_branch_f32e9 callchannel Cry_Mantine_branch_f32f5 endchannel -; f3345 -Cry_Mantine_Ch6: ; f3345 +Cry_Mantine_Ch6: callchannel Cry_Mantine_branch_f3302 callchannel Cry_Mantine_branch_f3310 endchannel -; f334c -Cry_Mantine_Ch8: ; f334c +Cry_Mantine_Ch8: callchannel Cry_Mantine_branch_f331d callchannel Cry_Mantine_branch_f3326 endchannel -; f3353 -Cry_Ampharos_Ch5: ; f3353 +Cry_Ampharos_Ch5: sound_duty 2, 3, 1, 3 -Cry_Ampharos_branch_f3355: ; f3355 +.loop sound __, 2, $c1, $0520 sound __, 2, $a1, $0420 - loopchannel 4, Cry_Ampharos_branch_f3355 + loopchannel 4, .loop dutycycle $0 sound __, 5, $78, $0760 sound __, 5, $78, $0730 sound C_, 9, $c2, $0420 endchannel -; f3370 -Cry_Ampharos_Ch6: ; f3370 +Cry_Ampharos_Ch6: sound_duty 2, 0, 3, 0 sound __, 9, $f8, $0700 sound __, 8, $f8, $0720 @@ -822,9 +723,8 @@ Cry_Ampharos_Ch6: ; f3370 sound __, 5, $f8, $0760 sound C_, 9, $f2, $0730 endchannel -; f3387 -Cry_Ampharos_Ch8: ; f3387 +Cry_Ampharos_Ch8: noise __, 5, $88, $6d noise __, 5, $d8, $68 noise __, 8, $c8, $69 @@ -832,9 +732,8 @@ Cry_Ampharos_Ch8: ; f3387 noise __, 5, $98, $3c noise C_, 9, $d2, $5b endchannel -; f339a -Cry_Totodile_Ch5: ; f339a +Cry_Totodile_Ch5: sound_duty 2, 0, 3, 0 sound __, 9, $f8, $0330 sound __, 9, $f8, $0340 @@ -842,9 +741,8 @@ Cry_Totodile_Ch5: ; f339a sound __, 9, $b8, $07b3 sound C#, 1, $b2, $07b4 endchannel -; f33b1 -Cry_Totodile_Ch6: ; f33b1 +Cry_Totodile_Ch6: sound_duty 2, 0, 1, 0 sound __, 9, $e8, $0320 sound __, 9, $e8, $0328 @@ -852,17 +750,15 @@ Cry_Totodile_Ch6: ; f33b1 sound __, 9, $88, $0782 sound C#, 1, $72, $0784 endchannel -; f33c8 -Cry_Totodile_Ch8: ; f33c8 +Cry_Totodile_Ch8: noise __, 3, $be, $49 noise __, 6, $be, $3a noise __, 3, $be, $29 noise C#, 9, $d3, $6e endchannel -; f33d5 -Cry_Cleffa_Ch5: ; f33d5 +Cry_Cleffa_Ch5: sound_duty 1, 2, 3, 0 soundinput $ff sound __, 3, $f8, $0720 @@ -876,18 +772,16 @@ Cry_Cleffa_Ch5: ; f33d5 sound __, 9, $f1, $0737 soundinput $88 endchannel -; f33fc -Cry_Cleffa_Ch6: ; f33fc +Cry_Cleffa_Ch6: sound_duty 2, 0, 2, 0 sound __, 7, $b2, $071e sound __, 6, $92, $0779 sound __, 5, $82, $073e sound __, 9, $a1, $0735 endchannel -; f340f -Cry_Cleffa_Ch8: ; f340f +Cry_Cleffa_Ch8: noise __, 3, $64, $7f noise __, 3, $84, $7d noise __, 3, $a4, $6f @@ -895,9 +789,8 @@ Cry_Cleffa_Ch8: ; f340f noise __, 3, $94, $6f noise __, 3, $61, $6b endchannel -; f3422 -Cry_Aipom_Ch5: ; f3422 +Cry_Aipom_Ch5: sound_duty 2, 0, 1, 3 sound __, 4, $f8, $06b0 sound __, 2, $f8, $06a5 @@ -907,27 +800,24 @@ Cry_Aipom_Ch5: ; f3422 sound __, 4, $f8, $0720 sound C_, 5, $f2, $070e endchannel -; f3441 -Cry_Aipom_Ch6: ; f3441 +Cry_Aipom_Ch6: sound_duty 3, 1, 2, 0 -Cry_Aipom_branch_f3443: ; f3443 +.loop1 sound __, 2, $f1, $07b4 - loopchannel 8, Cry_Aipom_branch_f3443 -Cry_Aipom_branch_f344b: ; f344b + loopchannel 8, .loop1 +.loop2 sound __, 2, $c1, $0790 - loopchannel 3, Cry_Aipom_branch_f344b -Cry_Aipom_branch_f3453: ; f3453 + loopchannel 3, .loop2 +.loop3 sound __, 2, $b1, $078d - loopchannel 2, Cry_Aipom_branch_f3453 + loopchannel 2, .loop3 sound C_, 1, $92, $0795 endchannel -; f3460 -Cry_Aipom_Ch8: ; f3460 -Cry_Aipom_branch_f3460: ; f3460 +Cry_Aipom_Ch8: noise __, 1, $f1, $28 - loopchannel 4, Cry_Aipom_branch_f3460 + loopchannel 4, Cry_Aipom_Ch8 noise __, 1, $91, $49 noise __, 2, $a8, $4a noise __, 1, $e1, $4b @@ -936,237 +826,198 @@ Cry_Aipom_branch_f3460: ; f3460 noise __, 4, $b2, $4d noise C_, 5, $a3, $4c endchannel -; f347d -Cry_Nidoran_M: ; f347d +Cry_Nidoran_M: musicheader 3, 5, Cry_Nidoran_M_Ch5 musicheader 1, 6, Cry_Nidoran_M_Ch6 musicheader 1, 8, Cry_Nidoran_M_Ch8 -; f3486 -Cry_Nidoran_F: ; f3486 +Cry_Nidoran_F: musicheader 3, 5, Cry_Nidoran_F_Ch5 musicheader 1, 6, Cry_Nidoran_F_Ch6 musicheader 1, 8, Cry_Nidoran_F_Ch8 -; f348f -Cry_Slowpoke: ; f348f +Cry_Slowpoke: musicheader 3, 5, Cry_Slowpoke_Ch5 musicheader 1, 6, Cry_Slowpoke_Ch6 musicheader 1, 8, Cry_Slowpoke_Ch8 -; f3498 -Cry_Kangaskhan: ; f3498 +Cry_Kangaskhan: musicheader 3, 5, Cry_Kangaskhan_Ch5 musicheader 1, 6, Cry_Kangaskhan_Ch6 musicheader 1, 8, Cry_Kangaskhan_Ch8 -; f34a1 -Cry_Charmander: ; f34a1 +Cry_Charmander: musicheader 3, 5, Cry_Charmander_Ch5 musicheader 1, 6, Cry_Charmander_Ch6 musicheader 1, 8, Cry_Charmander_Ch8 -; f34aa -Cry_Grimer: ; f34aa +Cry_Grimer: musicheader 3, 5, Cry_Grimer_Ch5 musicheader 1, 6, Cry_Grimer_Ch6 musicheader 1, 8, Cry_Grimer_Ch8 -; f34b3 -Cry_Voltorb: ; f34b3 +Cry_Voltorb: musicheader 3, 5, Cry_Voltorb_Ch5 musicheader 1, 6, Cry_Voltorb_Ch6 musicheader 1, 8, Cry_Voltorb_Ch8 -; f34bc -Cry_Muk: ; f34bc +Cry_Muk: musicheader 3, 5, Cry_Muk_Ch5 musicheader 1, 6, Cry_Muk_Ch6 musicheader 1, 8, Cry_Muk_Ch8 -; f34c5 -Cry_Oddish: ; f34c5 +Cry_Oddish: musicheader 3, 5, Cry_Oddish_Ch5 musicheader 1, 6, Cry_Oddish_Ch6 musicheader 1, 8, Cry_Oddish_Ch8 -; f34ce -Cry_Raichu: ; f34ce +Cry_Raichu: musicheader 3, 5, Cry_Raichu_Ch5 musicheader 1, 6, Cry_Raichu_Ch6 musicheader 1, 8, Cry_Raichu_Ch8 -; f34d7 -Cry_Nidoqueen: ; f34d7 +Cry_Nidoqueen: musicheader 3, 5, Cry_Nidoqueen_Ch5 musicheader 1, 6, Cry_Nidoqueen_Ch6 musicheader 1, 8, Cry_Nidoqueen_Ch8 -; f34e0 -Cry_Diglett: ; f34e0 +Cry_Diglett: musicheader 3, 5, Cry_Diglett_Ch5 musicheader 1, 6, Cry_Diglett_Ch6 musicheader 1, 8, Cry_Diglett_Ch8 -; f34e9 -Cry_Seel: ; f34e9 +Cry_Seel: musicheader 3, 5, Cry_Seel_Ch5 musicheader 1, 6, Cry_Seel_Ch6 musicheader 1, 8, Cry_Seel_Ch8 -; f34f2 -Cry_Drowzee: ; f34f2 +Cry_Drowzee: musicheader 3, 5, Cry_Drowzee_Ch5 musicheader 1, 6, Cry_Drowzee_Ch6 musicheader 1, 8, Cry_Drowzee_Ch8 -; f34fb -Cry_Pidgey: ; f34fb +Cry_Pidgey: musicheader 3, 5, Cry_Pidgey_Ch5 musicheader 1, 6, Cry_Pidgey_Ch6 musicheader 1, 8, Cry_Pidgey_Ch8 -; f3504 -Cry_Bulbasaur: ; f3504 +Cry_Bulbasaur: musicheader 3, 5, Cry_Bulbasaur_Ch5 musicheader 1, 6, Cry_Bulbasaur_Ch6 musicheader 1, 8, Cry_Bulbasaur_Ch8 -; f350d -Cry_Spearow: ; f350d +Cry_Spearow: musicheader 3, 5, Cry_Spearow_Ch5 musicheader 1, 6, Cry_Spearow_Ch6 musicheader 1, 8, Cry_Spearow_Ch8 -; f3516 -Cry_Rhydon: ; f3516 +Cry_Rhydon: musicheader 3, 5, Cry_Rhydon_Ch5 musicheader 1, 6, Cry_Rhydon_Ch6 musicheader 1, 8, Cry_Rhydon_Ch8 -; f351f -Cry_Golem: ; f351f +Cry_Golem: musicheader 3, 5, Cry_Golem_Ch5 musicheader 1, 6, Cry_Golem_Ch6 musicheader 1, 8, Cry_Golem_Ch8 -; f3528 -Cry_Blastoise: ; f3528 +Cry_Blastoise: musicheader 3, 5, Cry_Blastoise_Ch5 musicheader 1, 6, Cry_Blastoise_Ch6 musicheader 1, 8, Cry_Blastoise_Ch8 -; f3531 -Cry_Pidgeotto: ; f3531 +Cry_Pidgeotto: musicheader 3, 5, Cry_Pidgeotto_Ch5 musicheader 1, 6, Cry_Pidgeotto_Ch6 musicheader 1, 8, Cry_Pidgeotto_Ch8 -; f353a -Cry_Weedle: ; f353a +Cry_Weedle: musicheader 3, 5, Cry_Weedle_Ch5 musicheader 1, 6, Cry_Weedle_Ch6 musicheader 1, 8, Cry_Weedle_Ch8 -; f3543 -Cry_Caterpie: ; f3543 +Cry_Caterpie: musicheader 3, 5, Cry_Caterpie_Ch5 musicheader 1, 6, Cry_Caterpie_Ch6 musicheader 1, 8, Cry_Caterpie_Ch8 -; f354c -Cry_Ekans: ; f354c +Cry_Ekans: musicheader 3, 5, Cry_Ekans_Ch5 musicheader 1, 6, Cry_Ekans_Ch6 musicheader 1, 8, Cry_Ekans_Ch8 -; f3555 -Cry_Fearow: ; f3555 +Cry_Fearow: musicheader 3, 5, Cry_Fearow_Ch5 musicheader 1, 6, Cry_Fearow_Ch6 musicheader 1, 8, Cry_Fearow_Ch8 -; f355e -Cry_Clefairy: ; f355e +Cry_Clefairy: musicheader 3, 5, Cry_Clefairy_Ch5 musicheader 1, 6, Cry_Clefairy_Ch6 musicheader 1, 8, Cry_Clefairy_Ch8 -; f3567 -Cry_Venonat: ; f3567 +Cry_Venonat: musicheader 3, 5, Cry_Venonat_Ch5 musicheader 1, 6, Cry_Venonat_Ch6 musicheader 1, 8, Cry_Venonat_Ch8 -; f3570 -Cry_Lapras: ; f3570 +Cry_Lapras: musicheader 3, 5, Cry_Lapras_Ch5 musicheader 1, 6, Cry_Lapras_Ch6 musicheader 1, 8, Cry_Lapras_Ch8 -; f3579 -Cry_Metapod: ; f3579 +Cry_Metapod: musicheader 3, 5, Cry_Metapod_Ch5 musicheader 1, 6, Cry_Metapod_Ch6 musicheader 1, 8, Cry_Metapod_Ch8 -; f3582 -Cry_Squirtle: ; f3582 +Cry_Squirtle: musicheader 3, 5, Cry_Squirtle_Ch5 musicheader 1, 6, Cry_Squirtle_Ch6 musicheader 1, 8, Cry_Squirtle_Ch8 -; f358b -Cry_Paras: ; f358b +Cry_Paras: musicheader 3, 5, Cry_Paras_Ch5 musicheader 1, 6, Cry_Paras_Ch6 musicheader 1, 8, Cry_Paras_Ch8 -; f3594 -Cry_Growlithe: ; f3594 +Cry_Growlithe: musicheader 3, 5, Cry_Growlithe_Ch5 musicheader 1, 6, Cry_Growlithe_Ch6 musicheader 1, 8, Cry_Growlithe_Ch8 -; f359d -Cry_Krabby: ; f359d +Cry_Krabby: musicheader 3, 5, Cry_Krabby_Ch5 musicheader 1, 6, Cry_Krabby_Ch6 musicheader 1, 8, Cry_Krabby_Ch8 -; f35a6 -Cry_Psyduck: ; f35a6 +Cry_Psyduck: musicheader 3, 5, Cry_Psyduck_Ch5 musicheader 1, 6, Cry_Psyduck_Ch6 musicheader 1, 8, Cry_Psyduck_Ch8 -; f35af -Cry_Rattata: ; f35af +Cry_Rattata: musicheader 3, 5, Cry_Rattata_Ch5 musicheader 1, 6, Cry_Rattata_Ch6 musicheader 1, 8, Cry_Rattata_Ch8 -; f35b8 -Cry_Vileplume: ; f35b8 +Cry_Vileplume: musicheader 3, 5, Cry_Vileplume_Ch5 musicheader 1, 6, Cry_Vileplume_Ch6 musicheader 1, 8, Cry_Vileplume_Ch8 -; f35c1 -Cry_Vulpix: ; f35c1 +Cry_Vulpix: musicheader 3, 5, Cry_Vulpix_Ch5 musicheader 1, 6, Cry_Vulpix_Ch6 musicheader 1, 8, Cry_Vulpix_Ch8 -; f35ca -Cry_Weepinbell: ; f35ca +Cry_Weepinbell: musicheader 3, 5, Cry_Weepinbell_Ch5 musicheader 1, 6, Cry_Weepinbell_Ch6 musicheader 1, 8, Cry_Weepinbell_Ch8 -; f35d3 -Unused_Cry_Ch5: ; f35d3 +Unused_Cry_Ch5: sound_duty 0, 0, 3, 3 sound __, 16, $e0, $0780 sound __, 16, $f0, $0784 @@ -1175,9 +1026,8 @@ Unused_Cry_Ch5: ; f35d3 sound __, 11, $6c, $0780 sound __, 9, $71, $0784 endchannel -; f35ee -Unused_Cry_Ch6: ; f35ee +Unused_Cry_Ch6: sound_duty 1, 1, 0, 0 sound __, 16, $a0, $0741 sound __, 16, $b0, $0743 @@ -1186,9 +1036,8 @@ Unused_Cry_Ch6: ; f35ee sound __, 11, $4c, $0741 sound __, 9, $31, $0746 endchannel -; f3609 -Unused_Cry_Ch8: ; f3609 +Unused_Cry_Ch8: noise __, 3, $f2, $4c noise __, 7, $e0, $3a noise __, 16, $d0, $3a @@ -1197,9 +1046,8 @@ Unused_Cry_Ch8: ; f3609 noise __, 13, $7d, $4c noise __, 16, $d3, $4c endchannel -; f361f -Cry_Raichu_Ch5: ; f361f +Cry_Raichu_Ch5: sound_duty 0, 0, 3, 3 sound __, 16, $f7, $07a0 sound __, 7, $e6, $07a3 @@ -1209,9 +1057,8 @@ Cry_Raichu_Ch5: ; f361f sound __, 5, $e3, $07d7 sound __, 16, $f2, $07d8 endchannel -; f363c -Cry_Raichu_Ch6: ; f363c +Cry_Raichu_Ch6: sound_duty 1, 1, 0, 0 sound __, 3, $8, 0 sound __, 16, $a7, $06a1 @@ -1222,9 +1069,8 @@ Cry_Raichu_Ch6: ; f363c sound __, 5, $83, $06d9 sound __, 16, $a2, $06d7 endchannel -; f365d -Cry_Raichu_Ch8: ; f365d +Cry_Raichu_Ch8: noise __, 3, $f2, $3c noise __, 9, $e4, $3e noise __, 16, $d7, $3c @@ -1234,9 +1080,8 @@ Cry_Raichu_Ch8: ; f365d noise __, 7, $d4, $3d noise __, 9, $c1, $3b endchannel -; f3676 -Cry_Vileplume_Ch5: ; f3676 +Cry_Vileplume_Ch5: sound_duty 0, 0, 3, 3 sound __, 16, $f7, $07c0 sound __, 7, $e4, $07c1 @@ -1244,26 +1089,23 @@ Cry_Vileplume_Ch5: ; f3676 sound __, 5, $d3, $07c2 sound __, 9, $c1, $07c0 endchannel -; f368d -Cry_Vileplume_Ch6: ; f368d +Cry_Vileplume_Ch6: sound_duty 3, 3, 1, 1 sound __, 16, $97, $0781 sound __, 7, $84, $0780 sound __, 11, $96, $0781 sound __, 16, $83, $0781 endchannel -; f36a0 -Cry_Vileplume_Ch8: ; f36a0 +Cry_Vileplume_Ch8: noise __, 4, $f2, $3c noise __, 14, $e6, $2c noise __, 16, $d7, $3c noise __, 9, $c1, $2c endchannel -; f36ad -Cry_Vulpix_Ch5: ; f36ad +Cry_Vulpix_Ch5: sound_duty 0, 0, 3, 3 sound __, 16, $f7, $0680 sound __, 11, $e6, $0684 @@ -1274,9 +1116,8 @@ Cry_Vulpix_Ch5: ; f36ad sound __, 5, $d3, $0660 sound __, 9, $c1, $0640 endchannel -; f36d0 -Cry_Vulpix_Ch6: ; f36d0 +Cry_Vulpix_Ch6: sound_duty 1, 1, 0, 0 sound __, 16, $b7, $0641 sound __, 11, $96, $0642 @@ -1287,18 +1128,16 @@ Cry_Vulpix_Ch6: ; f36d0 sound __, 5, $93, $0622 sound __, 9, $71, $0601 endchannel -; f36f3 -Cry_Vulpix_Ch8: ; f36f3 +Cry_Vulpix_Ch8: noise __, 16, $e4, $3c noise __, 11, $c7, $4c noise __, 11, $c7, $3c noise __, 13, $b7, $4c noise __, 16, $a2, $5c endchannel -; f3703 -Cry_Rhydon_Ch5: ; f3703 +Cry_Rhydon_Ch5: sound_duty 0, 0, 3, 3 sound __, 7, $f7, $07a0 sound __, 9, $e6, $07a4 @@ -1308,9 +1147,8 @@ Cry_Rhydon_Ch5: ; f3703 sound __, 3, $c2, $0728 sound __, 9, $b1, $0730 endchannel -; f3722 -Cry_Rhydon_Ch6: ; f3722 +Cry_Rhydon_Ch6: sound_duty 2, 2, 0, 0 sound __, 5, $8, 0 sound __, 7, $a7, $0741 @@ -1321,9 +1159,8 @@ Cry_Rhydon_Ch6: ; f3722 sound __, 4, $82, $06cc sound __, 9, $71, $06d8 endchannel -; f3745 -Cry_Rhydon_Ch8: ; f3745 +Cry_Rhydon_Ch8: noise __, 3, $f2, $4c noise __, 7, $e6, $3a noise __, 5, $d7, $3a @@ -1332,9 +1169,8 @@ Cry_Rhydon_Ch8: ; f3745 noise __, 13, $d2, $3d noise __, 9, $d1, $2c endchannel -; f375b -Cry_Weepinbell_Ch5: ; f375b +Cry_Weepinbell_Ch5: sound_duty 1, 1, 2, 2 sound __, 7, $f4, $0740 sound __, 16, $e3, $0730 @@ -1342,9 +1178,8 @@ Cry_Weepinbell_Ch5: ; f375b sound __, 6, $b3, $0748 sound __, 9, $d1, $0750 endchannel -; f3772 -Cry_Weepinbell_Ch6: ; f3772 +Cry_Weepinbell_Ch6: sound_duty 3, 1, 3, 1 sound __, 7, $c3, $0712 sound __, 16, $b3, $0704 @@ -1352,17 +1187,15 @@ Cry_Weepinbell_Ch6: ; f3772 sound __, 5, $c3, $0721 sound __, 9, $b1, $0732 endchannel -; f3789 -Cry_Weepinbell_Ch8: ; f3789 +Cry_Weepinbell_Ch8: noise __, 9, $d6, $2c noise __, 13, $c6, $3c noise __, 11, $b6, $2c noise __, 9, $91, $1c endchannel -; f3796 -Cry_Kangaskhan_Ch5: ; f3796 +Cry_Kangaskhan_Ch5: sound_duty 0, 0, 3, 3 sound __, 5, $f7, $0608 sound __, 7, $e6, $0600 @@ -1372,9 +1205,8 @@ Cry_Kangaskhan_Ch5: ; f3796 sound __, 5, $d3, $05a0 sound __, 9, $e1, $0580 endchannel -; f37b5 -Cry_Kangaskhan_Ch6: ; f37b5 +Cry_Kangaskhan_Ch6: sound_duty 2, 2, 0, 0 sound __, 5, $c7, $0504 sound __, 7, $a6, $0502 @@ -1384,17 +1216,15 @@ Cry_Kangaskhan_Ch6: ; f37b5 sound __, 5, $b3, $04a3 sound __, 9, $c1, $0482 endchannel -; f37d4 -Cry_Kangaskhan_Ch8: ; f37d4 +Cry_Kangaskhan_Ch8: noise __, 13, $e4, $4c noise __, 11, $c7, $5c noise __, 13, $b6, $4c noise __, 16, $a2, $5c endchannel -; f37e1 -Cry_Bulbasaur_Ch5: ; f37e1 +Cry_Bulbasaur_Ch5: sound_duty 1, 0, 3, 3 sound __, 5, $f7, $07c0 sound __, 13, $e6, $07c2 @@ -1403,9 +1233,8 @@ Cry_Bulbasaur_Ch5: ; f37e1 sound __, 5, $b5, $0660 sound __, 9, $c1, $0640 endchannel -; f37fc -Cry_Bulbasaur_Ch6: ; f37fc +Cry_Bulbasaur_Ch6: sound_duty 0, 3, 0, 3 sound __, 4, $c7, $0781 sound __, 13, $b6, $0780 @@ -1414,18 +1243,16 @@ Cry_Bulbasaur_Ch6: ; f37fc sound __, 7, $b5, $0621 sound __, 9, $a1, $0602 endchannel -; f3817 -Cry_Bulbasaur_Ch8: ; f3817 +Cry_Bulbasaur_Ch8: noise __, 4, $e4, $3c noise __, 13, $d6, $2c noise __, 5, $e4, $3c noise __, 9, $b7, $5c noise __, 16, $c2, $5d endchannel -; f3827 -Cry_Spearow_Ch5: ; f3827 +Cry_Spearow_Ch5: sound_duty 1, 2, 0, 3 sound __, 9, $f7, $0680 sound __, 3, $f7, $0660 @@ -1436,9 +1263,8 @@ Cry_Spearow_Ch5: ; f3827 sound __, 5, $a7, $0730 sound __, 16, $91, $0720 endchannel -; f384a -Cry_Spearow_Ch6: ; f384a +Cry_Spearow_Ch6: sound_duty 1, 2, 3, 1 sound __, 11, $e7, $0682 sound __, 3, $e7, $0662 @@ -1449,64 +1275,56 @@ Cry_Spearow_Ch6: ; f384a sound __, 3, $97, $0732 sound __, 16, $81, $0722 endchannel -; f386d -Cry_Spearow_Ch8: ; f386d +Cry_Spearow_Ch8: noise __, 5, $74, $21 noise __, 5, $74, $10 noise __, 5, $71, $20 endchannel -; f3877 -Cry_Nidoran_M_Ch5: ; f3877 +Cry_Nidoran_M_Ch5: sound_duty 1, 1, 3, 3 sound __, 5, $f3, $0718 sound __, 16, $e5, $0798 sound __, 9, $91, $0758 endchannel -; f3886 -Cry_Nidoran_M_Ch6: ; f3886 +Cry_Nidoran_M_Ch6: sound_duty 0, 0, 2, 2 sound __, 6, $b3, $0708 sound __, 16, $c5, $0788 sound __, 9, $71, $0748 endchannel -; f3895 -Cry_Nidoran_M_Ch8: ; f3895 +Cry_Nidoran_M_Ch8: noise __, 4, $a1, $1c noise __, 15, $94, $2c noise __, 9, $81, $1c endchannel -; f389f -Cry_Pidgey_Ch5: ; f389f +Cry_Pidgey_Ch5: sound_duty 1, 1, 2, 2 sound __, 5, $e1, $0700 sound __, 5, $f2, $0780 sound __, 3, $92, $0740 sound __, 9, $e1, $0600 endchannel -; f38b2 -Cry_Pidgey_Ch6: ; f38b2 +Cry_Pidgey_Ch6: sound_duty 2, 2, 0, 0 sound __, 5, $b1, $06e1 sound __, 4, $c2, $06e1 sound __, 4, $62, $0681 sound __, 9, $b1, $05e1 endchannel -; f38c5 -Cry_Pidgey_Ch8: ; f38c5 +Cry_Pidgey_Ch8: noise __, 3, $61, $32 noise __, 3, $61, $21 noise __, 9, $61, $11 endchannel -; f38cf -Cry_Voltorb_Ch5: ; f38cf +Cry_Voltorb_Ch5: sound_duty 2, 2, 3, 3 sound __, 7, $83, $0247 sound __, 16, $62, $0226 @@ -1514,11 +1332,10 @@ Cry_Voltorb_Ch5: ; f38cf sound __, 10, $63, $0206 sound __, 16, $82, $0225 sound __, 16, $42, $0207 -Cry_Voltorb_Ch6: ; f38e9 +Cry_Voltorb_Ch6: endchannel -; f38ea -Cry_Voltorb_Ch8: ; f38ea +Cry_Voltorb_Ch8: noise __, 9, $d4, $8c noise __, 5, $e2, $9c noise __, 16, $c6, $8c @@ -1526,51 +1343,45 @@ Cry_Voltorb_Ch8: ; f38ea noise __, 16, $d7, $9c noise __, 16, $f2, $ac endchannel -; f38fd -Cry_Muk_Ch5: ; f38fd +Cry_Muk_Ch5: sound_duty 0, 0, 3, 3 sound __, 5, $f3, $06e0 sound __, 16, $e4, $0640 sound __, 9, $c1, $0620 endchannel -; f390c -Cry_Muk_Ch6: ; f390c +Cry_Muk_Ch6: sound_duty 2, 2, 0, 0 sound __, 4, $c3, $0683 sound __, 15, $b4, $0602 sound __, 9, $a1, $0601 endchannel -; f391b -Cry_Muk_Ch8: ; f391b +Cry_Muk_Ch8: noise __, 5, $d3, $5c noise __, 16, $e6, $4c noise __, 9, $b1, $5c endchannel -; f3925 -Cry_Grimer_Ch5: ; f3925 +Cry_Grimer_Ch5: sound_duty 2, 2, 0, 0 sound __, 7, $e2, $0500 sound __, 7, $e3, $0580 sound __, 7, $d3, $0570 sound __, 9, $a1, $0560 endchannel -; f3938 -Cry_Grimer_Ch6: ; f3938 +Cry_Grimer_Ch6: sound_duty 1, 1, 3, 3 sound __, 7, $e2, $0482 sound __, 7, $d3, $0501 sound __, 7, $b2, $04e2 sound __, 9, $81, $04c1 -Cry_Grimer_Ch8: ; f394a +Cry_Grimer_Ch8: endchannel -; f394b -Cry_Diglett_Ch5: ; f394b +Cry_Diglett_Ch5: sound_duty 0, 3, 0, 3 sound __, 5, $f1, $0700 sound __, 5, $e1, $0780 @@ -1583,9 +1394,8 @@ Cry_Diglett_Ch5: ; f394b sound __, 5, $c1, $0742 sound __, 9, $b1, $0741 endchannel -; f3976 -Cry_Diglett_Ch6: ; f3976 +Cry_Diglett_Ch6: sound_duty 0, 1, 0, 1 sound __, 13, $8, 0 sound __, 5, $f1, $0701 @@ -1595,9 +1405,8 @@ Cry_Diglett_Ch6: ; f3976 sound __, 5, $f1, $0782 sound __, 9, $d1, $0701 endchannel -; f3995 -Cry_Diglett_Ch8: ; f3995 +Cry_Diglett_Ch8: noise __, 16, $8, $0 noise __, 5, $8, $0 noise __, 5, $d1, $4c @@ -1607,9 +1416,8 @@ Cry_Diglett_Ch8: ; f3995 noise __, 5, $c1, $2c noise __, 9, $a1, $4c endchannel -; f39ae -Cry_Seel_Ch5: ; f39ae +Cry_Seel_Ch5: sound_duty 0, 3, 0, 3 sound __, 9, $f5, $0600 sound __, 3, $d2, $0638 @@ -1621,9 +1429,8 @@ Cry_Seel_Ch5: ; f39ae sound __, 3, $b2, $0610 sound __, 9, $c1, $0620 endchannel -; f39d5 -Cry_Seel_Ch6: ; f39d5 +Cry_Seel_Ch6: sound_duty 0, 1, 0, 1 sound __, 13, $c3, $05c0 sound __, 4, $b1, $05f9 @@ -1634,29 +1441,25 @@ Cry_Seel_Ch6: ; f39d5 sound __, 3, $81, $05d1 sound __, 3, $91, $05d9 sound __, 9, $91, $05e1 -Cry_Seel_Ch8: ; f39fb +Cry_Seel_Ch8: endchannel -; f39fc -Cry_Slowpoke_Ch5: ; f39fc +Cry_Slowpoke_Ch5: sound_duty 0, 0, 0, 0 sound __, 9, $f5, $0480 sound __, 3, $e1, $05e0 sound __, 9, $d1, $05dc endchannel -; f3a0b -Cry_Slowpoke_Ch6: ; f3a0b +Cry_Slowpoke_Ch6: sound_duty 1, 1, 2, 2 sound __, 8, $95, $0441 sound __, 3, $81, $0521 sound __, 9, $61, $051a -Cry_Slowpoke_Ch8: ; f3a19 +Cry_Slowpoke_Ch8: endchannel -; f3a1a -Cry_Drowzee_Ch5: ; f3a1a -Cry_Drowzee_branch_f3a1a: ; f3a1a +Cry_Drowzee_Ch5: sound_duty 0, 2, 0, 2 sound __, 6, $f2, $0650 sound __, 10, $d1, $0660 @@ -1664,11 +1467,10 @@ Cry_Drowzee_branch_f3a1a: ; f3a1a sound __, 10, $c1, $0622 sound __, 6, $f2, $0610 sound __, 7, $d1, $0620 - loopchannel 2, Cry_Drowzee_branch_f3a1a + loopchannel 2, Cry_Drowzee_Ch5 endchannel -; f3a39 -Cry_Drowzee_Ch6: ; f3a39 +Cry_Drowzee_Ch6: sound_duty 0, 0, 0, 1 sound __, 5, $8, 0 sound __, 6, $f2, $0651 @@ -1682,9 +1484,8 @@ Cry_Drowzee_Ch6: ; f3a39 sound __, 6, $f2, $0611 sound __, 5, $d1, $0621 endchannel -; f3a68 -Cry_Drowzee_Ch8: ; f3a68 +Cry_Drowzee_Ch8: noise __, 7, $d2, $1c noise __, 10, $b1, $2c noise __, 9, $c2, $2c @@ -1696,35 +1497,31 @@ Cry_Drowzee_Ch8: ; f3a68 noise __, 10, $c2, $2c noise __, 5, $a1, $3c endchannel -; f3a87 -Cry_Nidoran_F_Ch5: ; f3a87 +Cry_Nidoran_F_Ch5: sound_duty 0, 0, 2, 2 sound __, 5, $f3, $0600 sound __, 9, $d5, $0760 sound __, 4, $e2, $0720 sound __, 9, $d1, $0710 endchannel -; f3a9a -Cry_Nidoran_F_Ch6: ; f3a9a +Cry_Nidoran_F_Ch6: sound_duty 2, 2, 1, 1 sound __, 6, $b3, $06f1 sound __, 8, $c5, $0752 sound __, 4, $a2, $0711 sound __, 9, $b1, $0601 endchannel -; f3aad -Cry_Nidoran_F_Ch8: ; f3aad +Cry_Nidoran_F_Ch8: noise __, 4, $a2, $3c noise __, 13, $94, $2c noise __, 4, $82, $1c noise __, 9, $71, $2c endchannel -; f3aba -Cry_Nidoqueen_Ch5: ; f3aba +Cry_Nidoqueen_Ch5: sound_duty 0, 0, 3, 3 sound __, 9, $f7, $06e0 sound __, 7, $e6, $06e5 @@ -1734,9 +1531,8 @@ Cry_Nidoqueen_Ch5: ; f3aba sound __, 5, $f2, $06b0 sound __, 16, $a2, $06c8 endchannel -; f3ad9 -Cry_Nidoqueen_Ch6: ; f3ad9 +Cry_Nidoqueen_Ch6: sound_duty 1, 1, 0, 0 sound __, 4, $8, 0 sound __, 9, $a7, $06a1 @@ -1747,9 +1543,8 @@ Cry_Nidoqueen_Ch6: ; f3ad9 sound __, 5, $a2, $0671 sound __, 16, $72, $0689 endchannel -; f3afc -Cry_Nidoqueen_Ch8: ; f3afc +Cry_Nidoqueen_Ch8: noise __, 3, $f2, $3c noise __, 9, $e4, $3e noise __, 9, $d7, $3c @@ -1759,34 +1554,30 @@ Cry_Nidoqueen_Ch8: ; f3afc noise __, 4, $a4, $2c noise __, 9, $91, $3c endchannel -; f3b15 -Cry_Oddish_Ch5: ; f3b15 +Cry_Oddish_Ch5: sound_duty 0, 0, 3, 3 sound __, 16, $f6, $0565 sound __, 11, $e4, $057c sound __, 4, $c2, $055c sound __, 16, $b2, $053c endchannel -; f3b28 -Cry_Oddish_Ch6: ; f3b28 +Cry_Oddish_Ch6: sound_duty 2, 2, 1, 1 sound __, 15, $d6, $0503 sound __, 10, $b4, $051b sound __, 5, $92, $04fa sound __, 16, $a2, $04db endchannel -; f3b3b -Cry_Oddish_Ch8: ; f3b3b +Cry_Oddish_Ch8: noise __, 13, $e6, $4c noise __, 12, $d7, $5c noise __, 16, $c2, $4c endchannel -; f3b45 -Cry_Charmander_Ch5: ; f3b45 +Cry_Charmander_Ch5: sound_duty 0, 0, 3, 3 sound __, 5, $f7, $06a0 sound __, 9, $e6, $06a4 @@ -1796,9 +1587,8 @@ Cry_Charmander_Ch5: ; f3b45 sound __, 5, $c2, $0620 sound __, 9, $b1, $0610 endchannel -; f3b64 -Cry_Charmander_Ch6: ; f3b64 +Cry_Charmander_Ch6: sound_duty 2, 2, 1, 1 sound __, 5, $e7, $0601 sound __, 9, $d6, $0603 @@ -1808,9 +1598,8 @@ Cry_Charmander_Ch6: ; f3b64 sound __, 5, $b2, $0582 sound __, 9, $a1, $0571 endchannel -; f3b83 -Cry_Charmander_Ch8: ; f3b83 +Cry_Charmander_Ch8: noise __, 8, $d6, $5c noise __, 9, $e6, $4c noise __, 5, $d4, $5c @@ -1818,50 +1607,44 @@ Cry_Charmander_Ch8: ; f3b83 noise __, 8, $c3, $4c noise __, 9, $a1, $5c endchannel -; f3b96 -Cry_Clefairy_Ch5: ; f3b96 +Cry_Clefairy_Ch5: sound_duty 3, 2, 1, 0 sound __, 8, $d2, $0740 sound __, 16, $e5, $0760 sound C_, 9, $c1, $0730 endchannel -; f3ba5 -Cry_Clefairy_Ch6: ; f3ba5 +Cry_Clefairy_Ch6: sound_duty 1, 0, 0, 2 sound __, 3, $c2, $0701 sound __, 5, $c2, $0708 sound __, 16, $d7, $0741 sound C_, 9, $a2, $0701 -Cry_Clefairy_Ch8: ; f3bb7 +Cry_Clefairy_Ch8: endchannel -; f3bb8 -Cry_Caterpie_Ch5: ; f3bb8 +Cry_Caterpie_Ch5: sound_duty 0, 0, 3, 3 sound __, 16, $d7, $0780 sound __, 5, $e6, $07a0 sound __, 16, $d2, $0740 endchannel -; f3bc7 -Cry_Caterpie_Ch6: ; f3bc7 +Cry_Caterpie_Ch6: sound_duty 2, 2, 1, 1 sound __, 16, $c7, $0753 sound __, 6, $b6, $0772 sound __, 16, $c2, $0711 endchannel -; f3bd6 -Cry_Caterpie_Ch8: ; f3bd6 +Cry_Caterpie_Ch8: noise __, 14, $f6, $4c noise __, 5, $e6, $3c noise __, 16, $f2, $4c endchannel -; f3be0 -Cry_Lapras_Ch5: ; f3be0 +Cry_Lapras_Ch5: sound_duty 0, 0, 3, 3 sound __, 7, $f7, $06c0 sound __, 16, $e7, $0700 @@ -1869,9 +1652,8 @@ Cry_Lapras_Ch5: ; f3be0 sound __, 5, $e4, $06e0 sound __, 9, $d1, $06d0 endchannel -; f3bf7 -Cry_Lapras_Ch6: ; f3bf7 +Cry_Lapras_Ch6: sound_duty 2, 2, 0, 0 sound __, 8, $e6, $0681 sound __, 15, $d5, $06c1 @@ -1879,43 +1661,38 @@ Cry_Lapras_Ch6: ; f3bf7 sound __, 5, $d4, $06a1 sound __, 9, $c1, $0691 endchannel -; f3c0e -Cry_Lapras_Ch8: ; f3c0e +Cry_Lapras_Ch8: noise __, 11, $a6, $3c noise __, 15, $94, $2c noise __, 6, $a3, $3c noise __, 9, $91, $2c endchannel -; f3c1b -Cry_Golem_Ch5: ; f3c1b +Cry_Golem_Ch5: sound_duty 1, 1, 2, 2 sound __, 13, $f2, $0440 sound __, 16, $e3, $04a0 sound __, 5, $d2, $0490 sound __, 9, $d1, $0480 endchannel -; f3c2e -Cry_Golem_Ch6: ; f3c2e +Cry_Golem_Ch6: sound_duty 2, 3, 2, 3 sound __, 12, $d2, $0438 sound __, 15, $c6, $0498 sound __, 4, $b2, $0488 sound __, 9, $b1, $0478 endchannel -; f3c41 -Cry_Golem_Ch8: ; f3c41 +Cry_Golem_Ch8: noise __, 11, $e6, $6c noise __, 16, $d2, $5c noise __, 4, $c2, $6c noise __, 9, $d1, $5c endchannel -; f3c4e -Cry_Blastoise_Ch5: ; f3c4e +Cry_Blastoise_Ch5: sound_duty 3, 0, 3, 0 sound __, 16, $f6, $05c0 sound __, 9, $e3, $05bc @@ -1924,9 +1701,8 @@ Cry_Blastoise_Ch5: ; f3c4e sound __, 7, $c2, $05f0 sound __, 9, $b1, $0600 endchannel -; f3c69 -Cry_Blastoise_Ch6: ; f3c69 +Cry_Blastoise_Ch6: sound_duty 1, 2, 1, 2 sound __, 15, $c6, $04b1 sound __, 8, $c3, $04ad @@ -1935,9 +1711,8 @@ Cry_Blastoise_Ch6: ; f3c69 sound __, 7, $a2, $04e1 sound __, 9, $91, $04f1 endchannel -; f3c84 -Cry_Blastoise_Ch8: ; f3c84 +Cry_Blastoise_Ch8: noise __, 11, $e6, $5c noise __, 11, $d6, $6c noise __, 5, $c2, $4c @@ -1945,32 +1720,28 @@ Cry_Blastoise_Ch8: ; f3c84 noise __, 9, $b3, $4c noise __, 9, $a1, $5c endchannel -; f3c97 -Cry_Pidgeotto_Ch5: ; f3c97 +Cry_Pidgeotto_Ch5: sound_duty 0, 0, 3, 3 sound __, 9, $e4, $0790 sound __, 16, $f5, $07c0 sound __, 9, $d1, $07d8 endchannel -; f3ca6 -Cry_Pidgeotto_Ch6: ; f3ca6 +Cry_Pidgeotto_Ch6: sound_duty 1, 1, 2, 2 sound __, 11, $c4, $0771 sound __, 16, $b6, $07a2 sound __, 9, $a1, $07b7 endchannel -; f3cb5 -Cry_Pidgeotto_Ch8: ; f3cb5 +Cry_Pidgeotto_Ch8: noise __, 9, $e4, $4c noise __, 15, $c4, $3c noise __, 9, $d1, $2c endchannel -; f3cbf -Cry_Paras_Ch5: ; f3cbf +Cry_Paras_Ch5: sound_duty 0, 0, 3, 3 sound __, 7, $f2, $0600 sound __, 7, $e2, $0640 @@ -1981,9 +1752,8 @@ Cry_Paras_Ch5: ; f3cbf sound __, 7, $b2, $0780 sound __, 9, $a1, $07c0 endchannel -; f3ce2 -Cry_Paras_Ch6: ; f3ce2 +Cry_Paras_Ch6: sound_duty 1, 0, 1, 0 sound __, 4, $8, $0001 sound __, 7, $c2, $05c1 @@ -1995,9 +1765,8 @@ Cry_Paras_Ch6: ; f3ce2 sound __, 7, $a2, $0742 sound __, 9, $81, $0781 endchannel -; f3d09 -Cry_Paras_Ch8: ; f3d09 +Cry_Paras_Ch8: noise __, 7, $8, $1 noise __, 6, $e2, $5c noise __, 6, $c2, $4c @@ -2008,9 +1777,8 @@ Cry_Paras_Ch8: ; f3d09 noise __, 6, $92, $1a noise __, 9, $81, $18 endchannel -; f3d25 -Cry_Weedle_Ch5: ; f3d25 +Cry_Weedle_Ch5: sound_duty 0, 0, 3, 3 sound __, 5, $f3, $0780 sound __, 16, $e7, $0700 @@ -2019,9 +1787,8 @@ Cry_Weedle_Ch5: ; f3d25 sound __, 5, $d2, $06f0 sound __, 9, $c1, $06e0 endchannel -; f3d40 -Cry_Weedle_Ch6: ; f3d40 +Cry_Weedle_Ch6: sound_duty 2, 2, 1, 1 sound __, 7, $c3, $0701 sound __, 15, $b7, $0681 @@ -2030,9 +1797,8 @@ Cry_Weedle_Ch6: ; f3d40 sound __, 5, $b2, $0672 sound __, 9, $a1, $0661 endchannel -; f3d5b -Cry_Weedle_Ch8: ; f3d5b +Cry_Weedle_Ch8: noise __, 7, $e3, $5c noise __, 15, $d6, $4c noise __, 7, $c6, $3c @@ -2040,35 +1806,31 @@ Cry_Weedle_Ch8: ; f3d5b noise __, 4, $a2, $5c noise __, 9, $b1, $6c endchannel -; f3d6e -Cry_Ekans_Ch5: ; f3d6e +Cry_Ekans_Ch5: sound_duty 3, 3, 0, 0 sound __, 16, $f7, $0500 sound __, 16, $e7, $0508 sound __, 9, $b4, $0480 sound __, 16, $a2, $0460 endchannel -; f3d81 -Cry_Ekans_Ch6: ; f3d81 +Cry_Ekans_Ch6: sound_duty 0, 1, 0, 1 sound __, 15, $d7, $0481 sound __, 15, $c7, $0489 sound __, 11, $b4, $0401 sound __, 16, $c2, $03e1 endchannel -; f3d94 -Cry_Ekans_Ch8: ; f3d94 +Cry_Ekans_Ch8: noise __, 15, $f7, $7c noise __, 13, $f6, $6c noise __, 10, $e4, $7c noise __, 16, $e2, $6c endchannel -; f3da1 -Cry_Metapod_Ch5: ; f3da1 +Cry_Metapod_Ch5: sound_duty 1, 1, 3, 3 sound __, 8, $d6, $07e1 sound __, 7, $c6, $07e2 @@ -2079,9 +1841,8 @@ Cry_Metapod_Ch5: ; f3da1 sound __, 7, $b6, $07e0 sound __, 9, $a1, $07df endchannel -; f3dc4 -Cry_Metapod_Ch6: ; f3dc4 +Cry_Metapod_Ch6: sound_duty 0, 1, 0, 1 sound __, 7, $c3, $07c9 sound __, 7, $b3, $07c7 @@ -2090,18 +1851,16 @@ Cry_Metapod_Ch6: ; f3dc4 sound __, 7, $c3, $07c9 sound __, 16, $a2, $07c5 endchannel -; f3ddf -Cry_Metapod_Ch8: ; f3ddf +Cry_Metapod_Ch8: noise __, 14, $19, $7c noise __, 14, $f7, $8c noise __, 13, $d6, $7c noise __, 9, $c4, $6c noise __, 16, $b3, $5c endchannel -; f3def -Cry_Venonat_Ch5: ; f3def +Cry_Venonat_Ch5: sound_duty 0, 0, 3, 3 sound __, 7, $f7, $0740 sound __, 13, $e6, $0744 @@ -2110,9 +1869,8 @@ Cry_Venonat_Ch5: ; f3def sound __, 4, $c3, $0780 sound __, 9, $d1, $07a0 endchannel -; f3e0a -Cry_Venonat_Ch6: ; f3e0a +Cry_Venonat_Ch6: sound_duty 2, 2, 0, 0 sound __, 7, $c7, $0701 sound __, 12, $b6, $0702 @@ -2121,9 +1879,8 @@ Cry_Venonat_Ch6: ; f3e0a sound __, 4, $a3, $0741 sound __, 9, $91, $0762 endchannel -; f3e25 -Cry_Venonat_Ch8: ; f3e25 +Cry_Venonat_Ch8: noise __, 4, $e2, $3c noise __, 9, $d6, $4c noise __, 6, $d4, $3c @@ -2131,9 +1888,8 @@ Cry_Venonat_Ch8: ; f3e25 noise __, 3, $e2, $3c noise __, 9, $d1, $2c endchannel -; f3e38 -Cry_Squirtle_Ch5: ; f3e38 +Cry_Squirtle_Ch5: sound_duty 0, 1, 3, 3 sound __, 16, $f0, $0705 sound __, 11, $e0, $0700 @@ -2142,9 +1898,8 @@ Cry_Squirtle_Ch5: ; f3e38 sound __, 7, $b2, $0620 sound __, 9, $a1, $0624 endchannel -; f3e53 -Cry_Squirtle_Ch6: ; f3e53 +Cry_Squirtle_Ch6: sound_duty 2, 0, 2, 0 sound __, 16, $b0, $06c3 sound __, 11, $a0, $06c1 @@ -2153,18 +1908,16 @@ Cry_Squirtle_Ch6: ; f3e53 sound __, 7, $82, $05e1 sound __, 9, $61, $05e8 endchannel -; f3e6e -Cry_Squirtle_Ch8: ; f3e6e +Cry_Squirtle_Ch8: noise __, 7, $e6, $4c noise __, 16, $d6, $3c noise __, 11, $c5, $4a noise __, 2, $b2, $5b noise __, 16, $c2, $4c endchannel -; f3e7e -Cry_Fearow_Ch5: ; f3e7e +Cry_Fearow_Ch5: sound_duty 0, 0, 1, 1 sound __, 11, $f5, $0680 sound __, 4, $e2, $06a0 @@ -2175,9 +1928,8 @@ Cry_Fearow_Ch5: ; f3e7e sound __, 4, $d2, $06c0 sound __, 9, $c1, $06a0 endchannel -; f3ea1 -Cry_Fearow_Ch6: ; f3ea1 +Cry_Fearow_Ch6: sound_duty 3, 3, 0, 0 sound __, 10, $d5, $0631 sound __, 4, $d2, $0652 @@ -2188,9 +1940,8 @@ Cry_Fearow_Ch6: ; f3ea1 sound __, 4, $c2, $0671 sound __, 9, $b1, $0651 endchannel -; f3ec4 -Cry_Fearow_Ch8: ; f3ec4 +Cry_Fearow_Ch8: noise __, 7, $e3, $4c noise __, 5, $c3, $3c noise __, 6, $d4, $3c @@ -2198,61 +1949,54 @@ Cry_Fearow_Ch8: ; f3ec4 noise __, 7, $b4, $3c noise __, 9, $c1, $2c endchannel -; f3ed7 -Cry_Growlithe_Ch5: ; f3ed7 +Cry_Growlithe_Ch5: sound_duty 1, 1, 2, 2 sound __, 4, $f4, $0641 sound __, 14, $d6, $0721 sound __, 9, $f4, $0719 sound __, 9, $c1, $071a endchannel -; f3eea -Cry_Growlithe_Ch6: ; f3eea +Cry_Growlithe_Ch6: sound_duty 0, 3, 0, 3 sound __, 5, $f4, $0580 sound __, 15, $e6, $06e0 sound __, 9, $d5, $06d8 sound __, 9, $d1, $06dc endchannel -; f3efd -Cry_Growlithe_Ch8: ; f3efd +Cry_Growlithe_Ch8: noise __, 6, $c4, $46 noise __, 14, $a5, $44 noise __, 9, $c4, $45 noise __, 9, $b1, $44 endchannel -; f3f0a -Cry_Krabby_Ch5: ; f3f0a +Cry_Krabby_Ch5: sound_duty 0, 0, 3, 3 sound __, 14, $f1, $0511 sound __, 14, $e1, $0515 sound __, 14, $e1, $0511 sound __, 9, $d1, $0511 endchannel -; f3f1d -Cry_Krabby_Ch6: ; f3f1d +Cry_Krabby_Ch6: sound_duty 1, 1, 1, 0 sound __, 13, $e1, $050c sound __, 13, $d1, $0510 sound __, 15, $c1, $050c sound __, 9, $c1, $050a endchannel -; f3f30 -Cry_Krabby_Ch8: ; f3f30 +Cry_Krabby_Ch8: noise __, 15, $f2, $65 noise __, 14, $e2, $55 noise __, 15, $d2, $56 noise __, 9, $d1, $66 endchannel -; f3f3d -Cry_Psyduck_Ch5: ; f3f3d +Cry_Psyduck_Ch5: sound_duty 3, 2, 1, 0 sound __, 4, $f3, $0564 sound __, 3, $e2, $0544 @@ -2263,9 +2007,8 @@ Cry_Psyduck_Ch5: ; f3f3d sound __, 5, $e4, $04e4 sound __, 9, $d1, $0502 endchannel -; f3f60 -Cry_Psyduck_Ch6: ; f3f60 +Cry_Psyduck_Ch6: sound_duty 0, 3, 0, 3 sound __, 4, $d3, $0560 sound __, 3, $c2, $0540 @@ -2275,32 +2018,28 @@ Cry_Psyduck_Ch6: ; f3f60 sound __, 4, $d3, $0520 sound __, 4, $c4, $04e0 sound __, 9, $c1, $0500 -Cry_Psyduck_Ch8: ; f3f82 +Cry_Psyduck_Ch8: endchannel -; f3f83 -Cry_Rattata_Ch5: ; f3f83 +Cry_Rattata_Ch5: sound_duty 1, 0, 1, 0 sound __, 3, $3d, $0381 sound __, 8, $f5, $0601 sound __, 2, $c2, $0481 sound __, 9, $91, $0381 endchannel -; f3f96 -Cry_Rattata_Ch6: ; f3f96 +Cry_Rattata_Ch6: sound_duty 2, 3, 2, 3 sound __, 3, $3e, $05b0 sound __, 8, $d5, $075d sound __, 2, $b2, $06b0 sound __, 9, $61, $05b0 endchannel -; f3fa9 -Cry_Rattata_Ch8: ; f3fa9 +Cry_Rattata_Ch8: noise __, 3, $92, $49 noise __, 8, $b5, $29 noise __, 2, $a2, $39 noise __, 9, $91, $49 endchannel -; f3fb6 diff --git a/audio/cry_pointers.asm b/audio/cry_pointers.asm index 9ea69efdd..ec6b17e01 100644 --- a/audio/cry_pointers.asm +++ b/audio/cry_pointers.asm @@ -1,4 +1,4 @@ -Cries: ; e91b0 +Cries: dba Cry_Nidoran_M dba Cry_Nidoran_F dba Cry_Slowpoke @@ -67,4 +67,3 @@ Cries: ; e91b0 dba Cry_Aipom dba Cry_Dunsparce dba Cry_Donphan -; e927c diff --git a/audio/drumkits.asm b/audio/drumkits.asm index 4e311a2e5..a4fa4109b 100644 --- a/audio/drumkits.asm +++ b/audio/drumkits.asm @@ -1,13 +1,12 @@ -Drumkits: ; e8e52 +Drumkits: dw Drumkit0 dw Drumkit1 dw Drumkit2 dw Drumkit3 dw Drumkit4 dw Drumkit5 -; e8e5e -Drumkit0: ; e8e5e +Drumkit0: dw Drum00 ; rest dw Snare1 ; c dw Snare2 ; c# @@ -21,7 +20,7 @@ Drumkit0: ; e8e5e dw Snare6 ; a dw Snare7 ; a# dw HiHat2 ; b -Drumkit1: ; e8e78 +Drumkit1: dw Drum00 dw HiHat1 dw Snare5 @@ -35,7 +34,7 @@ Drumkit1: ; e8e78 dw Snare9 dw Snare10 dw Snare11 -Drumkit2: ; e8e92 +Drumkit2: dw Drum00 dw Snare1 dw Snare9 @@ -49,7 +48,7 @@ Drumkit2: ; e8e92 dw Snare6 dw Snare7 dw HiHat2 -Drumkit3: ; e8eac +Drumkit3: dw Drum21 dw Snare12 dw Snare13 @@ -63,7 +62,7 @@ Drumkit3: ; e8eac dw Drum21 dw Kick2 dw Crash2 -Drumkit4: ; e8ec6 +Drumkit4: dw Drum21 dw Drum20 dw Snare13 @@ -77,7 +76,7 @@ Drumkit4: ; e8ec6 dw Drum36 dw Kick2 dw Crash1 -Drumkit5: ; e8ee0 +Drumkit5: dw Drum00 dw Snare9 dw Snare10 @@ -91,35 +90,29 @@ Drumkit5: ; e8ee0 dw Snare14 dw Snare13 dw Kick2 -; e8efa -Drum00: ; e8efa +Drum00: ; unused noise C#, 1, $11, $00 endchannel -; e8efe -Snare1: ; e8efe +Snare1: noise C#, 1, $c1, $33 endchannel -; e8f02 -Snare2: ; e8f02 +Snare2: noise C#, 1, $b1, $33 endchannel -; e8f06 -Snare3: ; e8f06 +Snare3: noise C#, 1, $a1, $33 endchannel -; e8f0a -Snare4: ; e8f0a +Snare4: noise C#, 1, $81, $33 endchannel -; e8f0e -Drum05: ; e8f0e +Drum05: noise C#, 8, $84, $37 noise C#, 7, $84, $36 noise C#, 6, $83, $35 @@ -127,175 +120,142 @@ Drum05: ; e8f0e noise C#, 4, $82, $33 noise C#, 3, $81, $32 endchannel -; e8f21 -Triangle1: ; e8f21 +Triangle1: noise C#, 1, $51, $2a endchannel -; e8f25 -Triangle2: ; e8f25 +Triangle2: noise C#, 2, $41, $2b noise C#, 1, $61, $2a endchannel -; e8f2c -HiHat1: ; e8f2c +HiHat1: noise C#, 1, $81, $10 endchannel -; e8f30 -Snare5: ; e8f30 +Snare5: noise C#, 1, $82, $23 endchannel -; e8f34 -Snare6: ; e8f34 +Snare6: noise C#, 1, $82, $25 endchannel -; e8f38 -Snare7: ; e8f38 +Snare7: noise C#, 1, $82, $26 endchannel -; e8f3c -HiHat2: ; e8f3c +HiHat2: noise C#, 1, $a1, $10 endchannel -; e8f40 -HiHat3: ; e8f40 +HiHat3: noise C#, 1, $a2, $11 endchannel -; e8f44 -Snare8: ; e8f44 +Snare8: noise C#, 1, $a2, $50 endchannel -; e8f48 -Triangle3: ; e8f48 +Triangle3: noise C#, 1, $a1, $18 noise C#, 1, $31, $33 endchannel -; e8f4f -Triangle4: ; e8f4f +Triangle4: noise C#, 3, $91, $28 noise C#, 1, $71, $18 endchannel -; e8f56 -Snare9: ; e8f56 +Snare9: noise C#, 1, $91, $22 endchannel -; e8f5a -Snare10: ; e8f5a +Snare10: noise C#, 1, $71, $22 endchannel -; e8f5e -Snare11: ; e8f5e +Snare11: noise C#, 1, $61, $22 endchannel -; e8f62 -Drum20: ; e8f62 +Drum20: noise C#, 1, $11, $11 endchannel -; e8f66 -Drum21: ; e8f66 +Drum21: endchannel -; e8f67 -Snare12: ; e8f67 +Snare12: noise C#, 1, $91, $33 endchannel -; e8f6b -Snare13: ; e8f6b +Snare13: noise C#, 1, $51, $32 endchannel -; e8f6f -Snare14: ; e8f6f +Snare14: noise C#, 1, $81, $31 endchannel -; e8f73 -Kick1: ; e8f73 +Kick1: noise C#, 1, $88, $6b noise C#, 1, $71, $00 endchannel -; e8f7a -Triangle5: ; e8f7a +Triangle5: noise D_, 1, $91, $18 endchannel -; e8f7e -Drum27: ; e8f7e +Drum27: noise C#, 8, $92, $10 endchannel -; e8f82 -Drum28: ; e8f82 +Drum28: noise D_, 4, $91, $00 noise D_, 4, $11, $00 endchannel -; e8f89 -Drum29: ; e8f89 +Drum29: noise D_, 4, $91, $11 noise D_, 4, $11, $00 endchannel -; e8f90 -Crash1: ; e8f90 +Crash1: noise D_, 4, $88, $15 noise C#, 1, $65, $12 endchannel -; e8f97 -Drum31: ; e8f97 +Drum31: noise D_, 4, $51, $21 noise D_, 4, $11, $11 endchannel -; e8f9e -Drum32: ; e8f9e +Drum32: noise D_, 4, $51, $50 noise D_, 4, $11, $11 endchannel -; e8fa5 -Drum33: ; e8fa5 +Drum33: noise C#, 1, $a1, $31 endchannel -; e8fa9 -Crash2: ; e8fa9 +Crash2: noise C#, 1, $84, $12 endchannel -; e8fad -Drum35: ; e8fad +Drum35: noise D_, 4, $81, $00 noise D_, 4, $11, $00 endchannel -; e8fb4 -Drum36: ; e8fb4 +Drum36: noise D_, 4, $81, $21 noise D_, 4, $11, $11 endchannel -; e8fbb -Kick2: ; e8fbb +Kick2: noise C#, 1, $a8, $6b noise C#, 1, $71, $00 endchannel -; e8fc2 diff --git a/audio/engine.asm b/audio/engine.asm index 50f2f5843..482b1d1db 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -6,7 +6,7 @@ ; FadeMusic ; PlayStereoSFX -_MapSetup_Sound_Off:: ; e8000 +_MapSetup_Sound_Off:: ; restart sound operation ; clear all relevant hardware registers & wram push hl @@ -56,9 +56,7 @@ _MapSetup_Sound_Off:: ; e8000 pop hl ret -; e803d - -MusicFadeRestart: ; e803d +MusicFadeRestart: ; restart but keep the music id to fade in to ld a, [wMusicFadeID + 1] push af @@ -71,23 +69,17 @@ MusicFadeRestart: ; e803d ld [wMusicFadeID + 1], a ret -; e8051 - -MusicOn: ; e8051 +MusicOn: ld a, 1 ld [wMusicPlaying], a ret -; e8057 - -MusicOff: ; e8057 +MusicOff: xor a ld [wMusicPlaying], a ret -; e805c - -_UpdateSound:: ; e805c +_UpdateSound:: ; called once per frame ; no use updating audio if it's not playing ld a, [wMusicPlaying] @@ -100,12 +92,12 @@ _UpdateSound:: ; e805c ld bc, wChannel1 .loop ; is the channel active? - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_CHANNEL_ON, [hl] jp z, .nextchannel ; check time left in the current note - ld hl, wChannel1NoteDuration - wChannel1 + ld hl, CHANNEL_NOTE_DURATION add hl, bc ld a, [hl] cp $2 ; 1 or 0? @@ -115,14 +107,14 @@ _UpdateSound:: ; e805c .noteover ; reset vibrato delay - ld hl, wChannel1VibratoDelay - wChannel1 + ld hl, CHANNEL_VIBRATO_DELAY add hl, bc ld a, [hl] - ld hl, wChannel1VibratoDelayCount - wChannel1 + ld hl, CHANNEL_VIBRATO_DELAY_COUNT add hl, bc ld [hl], a ; turn vibrato off for now - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc res SOUND_PITCH_WHEEL, [hl] ; get next note @@ -130,7 +122,7 @@ _UpdateSound:: ; e805c .continue_sound_update call ApplyPitchWheel ; duty cycle - ld hl, wChannel1DutyCycle - wChannel1 + ld hl, CHANNEL_DUTY_CYCLE add hl, bc ld a, [hli] ld [wCurTrackDuty], a @@ -151,58 +143,58 @@ _UpdateSound:: ; e805c jr z, .next ; are we in a sfx channel right now? ld a, [wCurChannel] - cp CHAN5 + cp NUM_MUSIC_CHANS jr nc, .next ; are any sfx channels active? ; if so, mute - ld hl, wChannel5Flags + ld hl, wChannel5Flags1 bit SOUND_CHANNEL_ON, [hl] jr nz, .restnote - ld hl, wChannel6Flags + ld hl, wChannel6Flags1 bit SOUND_CHANNEL_ON, [hl] jr nz, .restnote - ld hl, wChannel7Flags + ld hl, wChannel7Flags1 bit SOUND_CHANNEL_ON, [hl] jr nz, .restnote - ld hl, wChannel8Flags + ld hl, wChannel8Flags1 bit SOUND_CHANNEL_ON, [hl] jr z, .next .restnote - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_REST, [hl] ; Rest .next ; are we in a sfx channel right now? ld a, [wCurChannel] - cp CHAN5 + cp NUM_MUSIC_CHANS jr nc, .sfx_channel - ld hl, wChannel5Flags - wChannel1 + ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1 add hl, bc bit SOUND_CHANNEL_ON, [hl] jr nz, .sound_channel_on .sfx_channel call UpdateChannels - ld hl, wChannel1Tracks - wChannel1 + ld hl, CHANNEL_TRACKS add hl, bc ld a, [wSoundOutput] or [hl] ld [wSoundOutput], a .sound_channel_on ; clear note flags - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc xor a ld [hl], a .nextchannel ; next channel - ld hl, wChannel2 - wChannel1 + ld hl, CHANNEL_STRUCT_LENGTH add hl, bc ld c, l ld b, h ld a, [wCurChannel] inc a ld [wCurChannel], a - cp $8 ; are we done? + cp NUM_CHANNELS ; are we done? jp nz, .loop ; do it all again call PlayDanger @@ -216,9 +208,7 @@ _UpdateSound:: ; e805c ld [rNR51], a ret -; e8125 - -UpdateChannels: ; e8125 +UpdateChannels: ld hl, .ChannelFnPtrs ld a, [wCurChannel] and $7 @@ -248,7 +238,7 @@ UpdateChannels: ; e8125 bit DANGER_ON_F, a ret nz .Channel5: - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc bit NOTE_UNKN_3, [hl] jr z, .asm_e8159 @@ -317,7 +307,7 @@ UpdateChannels: ; e8125 .Channel2: .Channel6: - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc bit NOTE_REST, [hl] ; rest jr nz, .ch2rest @@ -377,7 +367,7 @@ UpdateChannels: ; e8125 .Channel3: .Channel7: - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc bit NOTE_REST, [hl] ; rest jr nz, .ch3rest @@ -478,7 +468,7 @@ endr .Channel4: .Channel8: - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc bit NOTE_REST, [hl] ; rest jr nz, .ch4rest @@ -510,20 +500,18 @@ endr ld [rNR44], a ret -; e82e7 - -_CheckSFX: ; e82e7 +_CheckSFX: ; return carry if any sfx channels are active - ld hl, wChannel5Flags + ld hl, wChannel5Flags1 bit SOUND_CHANNEL_ON, [hl] jr nz, .sfxon - ld hl, wChannel6Flags + ld hl, wChannel6Flags1 bit SOUND_CHANNEL_ON, [hl] jr nz, .sfxon - ld hl, wChannel7Flags + ld hl, wChannel7Flags1 bit SOUND_CHANNEL_ON, [hl] jr nz, .sfxon - ld hl, wChannel8Flags + ld hl, wChannel8Flags1 bit SOUND_CHANNEL_ON, [hl] jr nz, .sfxon and a @@ -533,75 +521,79 @@ _CheckSFX: ; e82e7 scf ret -; e8307 - -PlayDanger: ; e8307 +PlayDanger: ld a, [wLowHealthAlarm] bit DANGER_ON_F, a ret z + + ; Don't do anything if SFX is being played and $ff ^ (1 << DANGER_ON_F) ld d, a call _CheckSFX - jr c, .asm_e8335 + jr c, .increment + + ; Play the high tone and a - jr z, .asm_e8323 - cp 16 ; halfway - jr z, .asm_e831e - jr .asm_e8335 - -.asm_e831e - ld hl, Tablee8354 - jr .updatehw - -.asm_e8323 - ld hl, Tablee8350 -.updatehw + jr z, .begin + + ; Play the low tone + cp 16 + jr z, .halfway + + jr .increment + +.halfway + ld hl, DangerSoundLow + jr .applychannel + +.begin + ld hl, DangerSoundHigh + +.applychannel xor a - ld [rNR10], a ; sweep off + ld [rNR10], a ld a, [hli] - ld [rNR11], a ; sound length / duty cycle + ld [rNR11], a ld a, [hli] - ld [rNR12], a ; ch1 volume envelope + ld [rNR12], a ld a, [hli] - ld [rNR13], a ; ch1 frequency lo + ld [rNR13], a ld a, [hli] - ld [rNR14], a ; ch1 frequency hi -.asm_e8335 + ld [rNR14], a + +.increment ld a, d inc a - cp 30 - jr c, .asm_e833c + cp 30 ; Ending frame + jr c, .noreset xor a -.asm_e833c +.noreset + ; Make sure the danger sound is kept on or 1 << DANGER_ON_F ld [wLowHealthAlarm], a - ; is hw ch1 on? + + ; Enable channel 1 if it's off ld a, [wSoundOutput] and $11 ret nz - ; if not, turn it on ld a, [wSoundOutput] or $11 ld [wSoundOutput], a ret -; e8350 - -Tablee8350: ; e8350 +DangerSoundHigh: db $80 ; duty 50% db $e2 ; volume 14, envelope decrease sweep 2 db $50 ; frequency: $750 db $87 ; restart sound -; e8354 -Tablee8354: ; e8354 +DangerSoundLow: db $80 ; duty 50% db $e2 ; volume 14, envelope decrease sweep 2 db $ee ; frequency: $6ee db $86 ; restart sound -; e8358 -FadeMusic: ; e8358 +FadeMusic: ; fade music if applicable ; usage: ; write to wMusicFade @@ -693,7 +685,7 @@ FadeMusic: ; e8358 .fadein ; are we done? - cp $7 + cp MAX_VOLUME & $f jr nc, .maxvolume ; inc volume inc a @@ -713,16 +705,14 @@ FadeMusic: ; e8358 ld [wVolume], a ret -; e83d1 - -LoadNote: ; e83d1 +LoadNote: ; wait for pitch wheel to finish - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc bit SOUND_PITCH_WHEEL, [hl] ret z ; get note duration - ld hl, wChannel1NoteDuration - wChannel1 + ld hl, CHANNEL_NOTE_DURATION add hl, bc ld a, [hl] ld hl, wCurNoteDuration @@ -732,13 +722,13 @@ LoadNote: ; e83d1 .ok ld [hl], a ; get frequency - ld hl, wChannel1Frequency - wChannel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] ; get direction of pitch wheel - ld hl, wChannel1PitchWheelTarget - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, e sub [hl] @@ -746,21 +736,21 @@ LoadNote: ; e83d1 ld a, d sbc 0 ld d, a - ld hl, wChannel1PitchWheelTarget + 1 - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc sub [hl] jr nc, .greater_than - ld hl, wChannel1Flags3 - wChannel1 + ld hl, CHANNEL_FLAGS3 add hl, bc set SOUND_PITCH_WHEEL_DIR, [hl] ; get frequency - ld hl, wChannel1Frequency - wChannel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] ; ???? - ld hl, wChannel1PitchWheelTarget - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, [hl] sub e @@ -769,7 +759,7 @@ LoadNote: ; e83d1 sbc 0 ld d, a ; ???? - ld hl, wChannel1PitchWheelTarget + 1 - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc ld a, [hl] sub d @@ -777,17 +767,17 @@ LoadNote: ; e83d1 jr .resume .greater_than - ld hl, wChannel1Flags3 - wChannel1 + ld hl, CHANNEL_FLAGS3 add hl, bc res SOUND_PITCH_WHEEL_DIR, [hl] ; get frequency - ld hl, wChannel1Frequency - wChannel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] ; get distance from pitch wheel target - ld hl, wChannel1PitchWheelTarget - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, e sub [hl] @@ -795,7 +785,7 @@ LoadNote: ; e83d1 ld a, d sbc 0 ld d, a - ld hl, wChannel1PitchWheelTarget + 1 - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc sub [hl] ld d, a @@ -823,27 +813,25 @@ LoadNote: ; e83d1 add [hl] ld d, b ; quotient pop bc - ld hl, wChannel1PitchWheelAmount - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT add hl, bc ld [hl], d ; quotient - ld hl, wChannel1PitchWheelAmountFraction - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION add hl, bc ld [hl], a ; remainder - ld hl, wChannel1Field25 - wChannel1 + ld hl, CHANNEL_FIELD25 add hl, bc xor a ld [hl], a ret -; e8466 - -HandleTrackVibrato: ; e8466 +HandleTrackVibrato: ; handle duty, cry pitch, and vibrato - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc bit SOUND_DUTY, [hl] ; duty jr z, .next - ld hl, wChannel1SFXDutyLoop - wChannel1 + ld hl, CHANNEL_SFX_DUTY_LOOP add hl, bc ld a, [hl] rlca @@ -851,15 +839,15 @@ HandleTrackVibrato: ; e8466 ld [hl], a and $c0 ld [wCurTrackDuty], a - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_DUTY_OVERRIDE, [hl] .next - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc bit SOUND_CRY_PITCH, [hl] jr z, .vibrato - ld hl, wChannel1CryPitch - wChannel1 + ld hl, CHANNEL_CRY_PITCH add hl, bc ld e, [hl] inc hl @@ -877,19 +865,19 @@ HandleTrackVibrato: ; e8466 ld [hl], d .vibrato ; is vibrato on? - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc bit SOUND_VIBRATO, [hl] ; vibrato jr z, .quit ; is vibrato active for this note yet? ; is the delay over? - ld hl, wChannel1VibratoDelayCount - wChannel1 + ld hl, CHANNEL_VIBRATO_DELAY_COUNT add hl, bc ld a, [hl] and a jr nz, .subexit ; is the extent nonzero? - ld hl, wChannel1VibratoExtent - wChannel1 + ld hl, CHANNEL_VIBRATO_EXTENT add hl, bc ld a, [hl] and a @@ -897,7 +885,7 @@ HandleTrackVibrato: ; e8466 ; save it for later ld d, a ; is it time to toggle vibrato up/down? - ld hl, wChannel1VibratoRate - wChannel1 + ld hl, CHANNEL_VIBRATO_RATE add hl, bc ld a, [hl] and $f ; count @@ -916,7 +904,7 @@ HandleTrackVibrato: ; e8466 ld a, [wCurTrackFrequency] ld e, a ; toggle vibrato up/down - ld hl, wChannel1Flags3 - wChannel1 + ld hl, CHANNEL_FLAGS3 add hl, bc bit SOUND_VIBRATO_DIR, [hl] ; vibrato up/down jr z, .down @@ -948,33 +936,31 @@ HandleTrackVibrato: ; e8466 .no_carry ld [wCurTrackFrequency], a ; - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_VIBRATO_OVERRIDE, [hl] .quit ret -; e84f9 - -ApplyPitchWheel: ; e84f9 +ApplyPitchWheel: ; quit if pitch wheel inactive - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc bit SOUND_PITCH_WHEEL, [hl] ret z ; de = Frequency - ld hl, wChannel1Frequency - wChannel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] ; check whether pitch wheel is going up or down - ld hl, wChannel1Flags3 - wChannel1 + ld hl, CHANNEL_FLAGS3 add hl, bc bit SOUND_PITCH_WHEEL_DIR, [hl] jr z, .decreasing ; frequency += [Channel*PitchWheelAmount] - ld hl, wChannel1PitchWheelAmount - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT add hl, bc ld l, [hl] ld h, 0 @@ -983,10 +969,10 @@ ApplyPitchWheel: ; e84f9 ld e, l ; [Channel*Field25] += [Channel*PitchWheelAmountFraction] ; if rollover: Frequency += 1 - ld hl, wChannel1PitchWheelAmountFraction - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION add hl, bc ld a, [hl] - ld hl, wChannel1Field25 - wChannel1 + ld hl, CHANNEL_FIELD25 add hl, bc add [hl] ld [hl], a @@ -999,13 +985,13 @@ ApplyPitchWheel: ; e84f9 ; Compare the dw at [Channel*PitchWheelTarget] to de. ; If frequency is greater, we're finished. ; Otherwise, load the frequency and set two flags. - ld hl, wChannel1PitchWheelTarget + 1 - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc ld a, [hl] cp d jp c, .finished_pitch_wheel jr nz, .continue_pitch_wheel - ld hl, wChannel1PitchWheelTarget - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, [hl] cp e @@ -1015,7 +1001,7 @@ ApplyPitchWheel: ; e84f9 .decreasing ; frequency -= [Channel*PitchWheelAmount] ld a, e - ld hl, wChannel1PitchWheelAmount - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT add hl, bc ld e, [hl] sub e @@ -1025,7 +1011,7 @@ ApplyPitchWheel: ; e84f9 ld d, a ; [Channel*Field25] *= 2 ; if rollover: Frequency -= 1 - ld hl, wChannel1PitchWheelAmountFraction - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION add hl, bc ld a, [hl] add a @@ -1039,43 +1025,41 @@ ApplyPitchWheel: ; e84f9 ; Compare the dw at [Channel*PitchWheelTarget] to de. ; If frequency is lower, we're finished. ; Otherwise, load the frequency and set two flags. - ld hl, wChannel1PitchWheelTarget + 1 - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc ld a, d cp [hl] jr c, .finished_pitch_wheel jr nz, .continue_pitch_wheel - ld hl, wChannel1PitchWheelTarget - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, e cp [hl] jr nc, .continue_pitch_wheel .finished_pitch_wheel - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc res SOUND_PITCH_WHEEL, [hl] - ld hl, wChannel1Flags3 - wChannel1 + ld hl, CHANNEL_FLAGS3 add hl, bc res SOUND_PITCH_WHEEL_DIR, [hl] ret .continue_pitch_wheel - ld hl, wChannel1Frequency - wChannel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld [hl], e inc hl ld [hl], d - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_FREQ_OVERRIDE, [hl] set NOTE_DUTY_OVERRIDE, [hl] ret -; e858c - -HandleNoise: ; e858c +HandleNoise: ; is noise sampling on? - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_NOISE, [hl] ; noise sampling ret z @@ -1084,7 +1068,7 @@ HandleNoise: ; e858c bit NOISE_CHAN_F, a jr nz, .next ; is ch8 on? (noise) - ld hl, wChannel8Flags + ld hl, wChannel8Flags1 bit SOUND_CHANNEL_ON, [hl] ; on? jr z, .next ; is ch8 playing noise? @@ -1099,9 +1083,7 @@ HandleNoise: ; e858c ld [wNoiseSampleDelay], a ret -; e85af - -ReadNoiseSample: ; e85af +ReadNoiseSample: ; sample struct: ; [wx] [yy] [zz] ; w: ? either 2 or 3 @@ -1143,7 +1125,7 @@ ReadNoiseSample: ; e85af inc hl ld [hl], d - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_NOISE_SAMPLING, [hl] ret @@ -1151,9 +1133,7 @@ ReadNoiseSample: ; e85af .quit ret -; e85e1 - -ParseMusic: ; e85e1 +ParseMusic: ; parses until a note is read or the song is ended call GetMusicByte ; store next byte in a cp $ff ; is the song over? @@ -1168,7 +1148,7 @@ ParseMusic: ; e85e1 .readnote ; wCurMusicByte contains current note ; special notes - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_SFX, [hl] jp nz, ParseSFXOrRest @@ -1187,38 +1167,38 @@ ParseMusic: ; e85e1 and $f jr z, .rest ; pitch 0-> rest ; update pitch - ld hl, wChannel1Pitch - wChannel1 + ld hl, CHANNEL_PITCH add hl, bc ld [hl], a ; store pitch in e ld e, a ; store octave in d - ld hl, wChannel1Octave - wChannel1 + ld hl, CHANNEL_OCTAVE add hl, bc ld d, [hl] ; update frequency call GetFrequency - ld hl, wChannel1Frequency - wChannel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld [hl], e inc hl ld [hl], d ; ???? - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_NOISE_SAMPLING, [hl] jp LoadNote .rest ; note = rest - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_REST, [hl] ; Rest ret .endchannel ; $ff is reached in music data - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_SUBROUTINE, [hl] ; in a subroutine? jr nz, .readcommand ; execute @@ -1226,12 +1206,12 @@ ParseMusic: ; e85e1 cp CHAN5 jr nc, .chan_5to8 ; ???? - ld hl, wChannel5Flags - wChannel1 + ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1 add hl, bc bit SOUND_CHANNEL_ON, [hl] jr nz, .ok .chan_5to8 - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_REST, [hl] call nz, RestoreVolume @@ -1245,15 +1225,15 @@ ParseMusic: ; e85e1 .ok ; stop playing ; turn channel off - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc res SOUND_CHANNEL_ON, [hl] ; note = rest - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_REST, [hl] ; clear music id & bank - ld hl, wChannel1MusicID - wChannel1 + ld hl, CHANNEL_MUSIC_ID add hl, bc xor a ld [hli], a ; id hi @@ -1261,9 +1241,7 @@ ParseMusic: ; e85e1 ld [hli], a ; bank ret -; e8679 - -RestoreVolume: ; e8679 +RestoreVolume: ; ch5 only ld a, [wCurChannel] cp CHAN5 @@ -1282,11 +1260,9 @@ RestoreVolume: ; e8679 ld [wSFXPriority], a ret -; e8698 - -ParseSFXOrRest: ; e8698 +ParseSFXOrRest: ; turn noise sampling on - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_NOISE_SAMPLING, [hl] ; noise sample ; update note duration @@ -1294,12 +1270,12 @@ ParseSFXOrRest: ; e8698 call SetNoteDuration ; top nybble doesnt matter? ; update intensity from next param call GetMusicByte - ld hl, wChannel1Intensity - wChannel1 + ld hl, CHANNEL_INTENSITY add hl, bc ld [hl], a ; update lo frequency from next param call GetMusicByte - ld hl, wChannel1FrequencyLo - wChannel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld [hl], a ; are we on the last channel? (noise sampling) @@ -1309,14 +1285,12 @@ ParseSFXOrRest: ; e8698 ret z ; update hi frequency from next param call GetMusicByte - ld hl, wChannel1FrequencyHi - wChannel1 + ld hl, CHANNEL_FREQUENCY + 1 add hl, bc ld [hl], a ret -; e86c5 - -GetNoiseSample: ; e86c5 +GetNoiseSample: ; load ptr to sample header in wNoiseSampleAddress ; are we on the last channel? ld a, [wCurChannel] @@ -1332,7 +1306,7 @@ GetNoiseSample: ; e86c5 ld a, [wCurChannel] bit NOISE_CHAN_F, a jr nz, .sfx - ld hl, wChannel8Flags + ld hl, wChannel8Flags1 bit SOUND_CHANNEL_ON, [hl] ; is ch8 on? (noise) ret nz ld a, [wMusicNoiseSampleSet] @@ -1372,9 +1346,7 @@ GetNoiseSample: ; e86c5 ld [wNoiseSampleDelay], a ret -; e870f - -ParseMusicCommand: ; e870f +ParseMusicCommand: ; reload command ld a, [wCurMusicByte] ; get command # @@ -1391,9 +1363,7 @@ ParseMusicCommand: ; e870f ld l, a jp hl -; e8720 - -MusicCommands: ; e8720 +MusicCommands: ; entries correspond to macros/sound.asm enumeration dw Music_Octave8 ; octave 8 dw Music_Octave7 ; octave 7 @@ -1443,44 +1413,39 @@ MusicCommands: ; e8720 dw Music_LoopChannel ; loop dw Music_CallChannel ; call dw Music_EndChannel ; return -; e8780 -MusicF1: ; e8780 -MusicF2: ; e8780 -MusicF3: ; e8780 -MusicF4: ; e8780 -MusicF5: ; e8780 -MusicF6: ; e8780 -MusicF7: ; e8780 -MusicF8: ; e8780 +MusicF1: +MusicF2: +MusicF3: +MusicF4: +MusicF5: +MusicF6: +MusicF7: +MusicF8: ret -; e8781 - -Music_EndChannel: ; e8781 +Music_EndChannel: ; called when $ff is encountered w/ subroutine flag set ; end music stream ; return to caller of the subroutine ; reset subroutine flag - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc res SOUND_SUBROUTINE, [hl] ; copy LastMusicAddress to MusicAddress - ld hl, wChannel1LastMusicAddress - wChannel1 + ld hl, CHANNEL_LAST_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl ld d, [hl] - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ret -; e8796 - -Music_CallChannel: ; e8796 +Music_CallChannel: ; call music stream (subroutine) ; parameters: ll hh ; pointer to subroutine ; get pointer from next 2 bytes @@ -1490,32 +1455,30 @@ Music_CallChannel: ; e8796 ld d, a push de ; copy MusicAddress to LastMusicAddress - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl ld d, [hl] - ld hl, wChannel1LastMusicAddress - wChannel1 + ld hl, CHANNEL_LAST_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ; load pointer into MusicAddress pop de - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ; set subroutine flag - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc set SOUND_SUBROUTINE, [hl] ret -; e87bc - -Music_JumpChannel: ; e87bc +Music_JumpChannel: ; jump ; parameters: ll hh ; pointer ; get pointer from next 2 bytes @@ -1523,16 +1486,14 @@ Music_JumpChannel: ; e87bc ld e, a call GetMusicByte ld d, a - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ret -; e87cc - -Music_LoopChannel: ; e87cc +Music_LoopChannel: ; loops xx - 1 times ; 00: infinite ; params: 3 @@ -1542,7 +1503,7 @@ Music_LoopChannel: ; e87cc ; get loop count call GetMusicByte - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_LOOPING, [hl] ; has the loop been initiated? jr nz, .checkloop @@ -1551,11 +1512,11 @@ Music_LoopChannel: ; e87cc ; initiate loop dec a set SOUND_LOOPING, [hl] ; set loop flag - ld hl, wChannel1LoopCount - wChannel1 + ld hl, CHANNEL_LOOP_COUNT add hl, bc ld [hl], a ; store loop counter .checkloop - ld hl, wChannel1LoopCount - wChannel1 + ld hl, CHANNEL_LOOP_COUNT add hl, bc ld a, [hl] and a ; are we done? @@ -1568,7 +1529,7 @@ Music_LoopChannel: ; e87cc call GetMusicByte ld d, a ; load new pointer into MusicAddress - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl @@ -1577,11 +1538,11 @@ Music_LoopChannel: ; e87cc .endloop ; reset loop flag - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc res SOUND_LOOPING, [hl] ; skip to next command - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl @@ -1593,9 +1554,7 @@ Music_LoopChannel: ; e87cc ld [hl], e ret -; e880e - -Music_SetCondition: ; e880e +Music_SetCondition: ; set condition for a jump ; used with FB ; params: 1 @@ -1603,14 +1562,12 @@ Music_SetCondition: ; e880e ; set condition call GetMusicByte - ld hl, wChannel1Condition - wChannel1 + ld hl, CHANNEL_CONDITION add hl, bc ld [hl], a ret -; e8817 - -Music_JumpIf: ; e8817 +Music_JumpIf: ; conditional jump ; used with FA ; params: 3 @@ -1621,13 +1578,13 @@ Music_JumpIf: ; e8817 ; a = condition call GetMusicByte ; if existing condition matches, jump to new address - ld hl, wChannel1Condition - wChannel1 + ld hl, CHANNEL_CONDITION add hl, bc cp [hl] jr z, .jump ; skip to next command ; get address - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl @@ -1649,16 +1606,14 @@ Music_JumpIf: ; e8817 call GetMusicByte ld d, a ; update pointer in MusicAddress - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ret -; e883e - -MusicEE; e883e +MusicEE ; conditional jump ; checks a byte in ram corresponding to the current channel ; doesn't seem to be set by any commands @@ -1680,7 +1635,7 @@ MusicEE; e883e jr nz, .jump ; skip to next command ; get address - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl @@ -1703,16 +1658,14 @@ MusicEE; e883e call GetMusicByte ld d, a ; update address - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ret -; e886d - -MusicF9: ; e886d +MusicF9: ; sets some flag ; seems to be unused ; params: 0 @@ -1720,23 +1673,19 @@ MusicF9: ; e886d ld [wc2b5], a ret -; e8873 - -MusicE2: ; e8873 +MusicE2: ; seems to have been dummied out ; params: 1 call GetMusicByte - ld hl, wChannel1Field2c - wChannel1 + ld hl, CHANNEL_FIELD2C add hl, bc ld [hl], a - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_UNKN_0B, [hl] ret -; e8882 - -Music_Vibrato: ; e8882 +Music_Vibrato: ; vibrato ; params: 2 ; 1: [xx] @@ -1746,28 +1695,28 @@ Music_Vibrato: ; e8882 ; z: rate (# frames per cycle) ; set vibrato flag? - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_VIBRATO, [hl] ; start at lower frequency (extent is positive) - ld hl, wChannel1Flags3 - wChannel1 + ld hl, CHANNEL_FLAGS3 add hl, bc res SOUND_VIBRATO_DIR, [hl] ; get delay call GetMusicByte ; update delay - ld hl, wChannel1VibratoDelay - wChannel1 + ld hl, CHANNEL_VIBRATO_DELAY add hl, bc ld [hl], a ; update delay count - ld hl, wChannel1VibratoDelayCount - wChannel1 + ld hl, CHANNEL_VIBRATO_DELAY_COUNT add hl, bc ld [hl], a ; update extent ; this is split into halves only to get added back together at the last second ; get extent/rate call GetMusicByte - ld hl, wChannel1VibratoExtent - wChannel1 + ld hl, CHANNEL_VIBRATO_EXTENT add hl, bc ld d, a ; get top nybble @@ -1775,12 +1724,12 @@ Music_Vibrato: ; e8882 swap a srl a ; halve ld e, a - adc a, 0; round up + adc 0 ; round up swap a or e ld [hl], a ; update rate - ld hl, wChannel1VibratoRate - wChannel1 + ld hl, CHANNEL_VIBRATO_RATE add hl, bc ; get bottom nybble ld a, d @@ -1791,9 +1740,7 @@ Music_Vibrato: ; e8882 ld [hl], a ret -; e88bd - -Music_SlidePitchTo: ; e88bd +Music_SlidePitchTo: ; set the target for pitch wheel ; params: 2 ; note duration @@ -1813,26 +1760,24 @@ Music_SlidePitchTo: ; e88bd and $f ld d, a call GetFrequency - ld hl, wChannel1PitchWheelTarget - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld [hl], e - ld hl, wChannel1PitchWheelTarget + 1 - wChannel1 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc ld [hl], d - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_PITCH_WHEEL, [hl] ret -; e88e4 - -Music_Tone: ; e88e4 +Music_Tone: ; tone ; params: 1 (dw) - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_CRY_PITCH, [hl] - ld hl, wChannel1CryPitch + 1 - wChannel1 + ld hl, CHANNEL_CRY_PITCH + 1 add hl, bc call GetMusicByte ld [hld], a @@ -1840,62 +1785,54 @@ Music_Tone: ; e88e4 ld [hl], a ret -; e88f7 - -MusicE7: ; e88f7 +MusicE7: ; unused ; params: 1 - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_UNKN_0E, [hl] call GetMusicByte - ld hl, wChannel1Field29 - wChannel1 + ld hl, CHANNEL_FIELD29 add hl, bc ld [hl], a ret -; e8906 - -Music_SoundDuty: ; e8906 +Music_SoundDuty: ; sequence of 4 duty cycles to be looped ; params: 1 (4 2-bit duty cycle arguments) - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_DUTY, [hl] ; duty cycle ; sound duty sequence call GetMusicByte rrca rrca - ld hl, wChannel1SFXDutyLoop - wChannel1 + ld hl, CHANNEL_SFX_DUTY_LOOP add hl, bc ld [hl], a ; update duty cycle and $c0 ; only uses top 2 bits - ld hl, wChannel1DutyCycle - wChannel1 + ld hl, CHANNEL_DUTY_CYCLE add hl, bc ld [hl], a ret -; e891e - -MusicE8: ; e891e +MusicE8: ; unused ; params: 1 - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_UNKN_0D, [hl] call GetMusicByte - ld hl, wChannel1Field2a - wChannel1 + ld hl, CHANNEL_FIELD2A add hl, bc ld [hl], a ret -; e892d - -Music_ToggleSFX: ; e892d +Music_ToggleSFX: ; toggle something ; params: none - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_SFX, [hl] jr z, .on @@ -1906,16 +1843,14 @@ Music_ToggleSFX: ; e892d set SOUND_SFX, [hl] ret -; e893b - -Music_ToggleNoise: ; e893b +Music_ToggleNoise: ; toggle music noise sampling ; can't be used as a straight toggle since the param is not read from on->off ; params: ; noise on: 1 ; noise off: 0 ; check if noise sampling is on - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_NOISE, [hl] jr z, .on @@ -1930,15 +1865,13 @@ Music_ToggleNoise: ; e893b ld [wMusicNoiseSampleSet], a ret -; e894f - -Music_SFXToggleNoise: ; e894f +Music_SFXToggleNoise: ; toggle sfx noise sampling ; params: ; on: 1 ; off: 0 ; check if noise sampling is on - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc bit SOUND_NOISE, [hl] jr z, .on @@ -1953,16 +1886,14 @@ Music_SFXToggleNoise: ; e894f ld [wSFXNoiseSampleSet], a ret -; e8963 - -Music_NoteType: ; e8963 +Music_NoteType: ; note length ; # frames per 16th note ; intensity: see Music_Intensity ; params: 2 ; note length call GetMusicByte - ld hl, wChannel1NoteLength - wChannel1 + ld hl, CHANNEL_NOTE_LENGTH add hl, bc ld [hl], a ld a, [wCurChannel] @@ -1973,48 +1904,40 @@ Music_NoteType: ; e8963 call Music_Intensity ret -; e8977 - -Music_SoundStatus: ; e8977 +Music_SoundStatus: ; update sound status ; params: 1 call GetMusicByte ld [wSoundInput], a - ld hl, wChannel1NoteFlags - wChannel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc set NOTE_UNKN_3, [hl] ret -; e8984 - -Music_DutyCycle: ; e8984 +Music_DutyCycle: ; duty cycle ; params: 1 call GetMusicByte rrca rrca and $c0 - ld hl, wChannel1DutyCycle - wChannel1 + ld hl, CHANNEL_DUTY_CYCLE add hl, bc ld [hl], a ret -; e8991 - -Music_Intensity: ; e8991 +Music_Intensity: ; intensity ; params: 1 ; hi: pressure ; lo: velocity call GetMusicByte - ld hl, wChannel1Intensity - wChannel1 + ld hl, CHANNEL_INTENSITY add hl, bc ld [hl], a ret -; e899a - -Music_Tempo: ; e899a +Music_Tempo: ; global tempo ; params: 2 ; de: tempo @@ -2025,39 +1948,33 @@ Music_Tempo: ; e899a call SetGlobalTempo ret -; e89a6 - -Music_Octave8: ; e89a6 -Music_Octave7: ; e89a6 -Music_Octave6: ; e89a6 -Music_Octave5: ; e89a6 -Music_Octave4: ; e89a6 -Music_Octave3: ; e89a6 -Music_Octave2: ; e89a6 -Music_Octave1: ; e89a6 +Music_Octave8: +Music_Octave7: +Music_Octave6: +Music_Octave5: +Music_Octave4: +Music_Octave3: +Music_Octave2: +Music_Octave1: ; set octave based on lo nybble of the command - ld hl, wChannel1Octave - wChannel1 + ld hl, CHANNEL_OCTAVE add hl, bc ld a, [wCurMusicByte] and 7 ld [hl], a ret -; e89b1 - -Music_ForceOctave: ; e89b1 +Music_ForceOctave: ; set starting octave ; this forces all notes up by the starting octave ; params: 1 call GetMusicByte - ld hl, wChannel1PitchOffset - wChannel1 + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld [hl], a ret -; e89ba - -Music_StereoPanning: ; e89ba +Music_StereoPanning: ; stereo panning ; params: 1 ; stereo on? @@ -2068,22 +1985,18 @@ Music_StereoPanning: ; e89ba call GetMusicByte ret -; e89c5 - -Music_Panning: ; e89c5 +Music_Panning: ; force panning ; params: 1 call SetLRTracks call GetMusicByte - ld hl, wChannel1Tracks - wChannel1 + ld hl, CHANNEL_TRACKS add hl, bc and [hl] ld [hl], a ret -; e89d2 - -Music_Volume: ; e89d2 +Music_Volume: ; set volume ; params: 1 ; see Volume @@ -2099,9 +2012,7 @@ Music_Volume: ; e89d2 ld [wVolume], a ret -; e89e1 - -Music_TempoRelative: ; e89e1 +Music_TempoRelative: ; set global tempo to current channel tempo +/- param ; params: 1 signed call GetMusicByte @@ -2116,7 +2027,7 @@ Music_TempoRelative: ; e89e1 .negative ld d, -1 .ok - ld hl, wChannel1Tempo - wChannel1 + ld hl, CHANNEL_TEMPO add hl, bc ld a, [hli] ld h, [hl] @@ -2127,27 +2038,21 @@ Music_TempoRelative: ; e89e1 call SetGlobalTempo ret -; e89fd - -Music_SFXPriorityOn: ; e89fd +Music_SFXPriorityOn: ; turn sfx priority on ; params: none ld a, 1 ld [wSFXPriority], a ret -; e8a03 - -Music_SFXPriorityOff: ; e8a03 +Music_SFXPriorityOff: ; turn sfx priority off ; params: none xor a ld [wSFXPriority], a ret -; e8a08 - -Music_RestartChannel: ; e8a08 +Music_RestartChannel: ; restart current channel from channel header (same bank) ; params: 2 (5) ; ll hh: pointer to new channel header @@ -2156,14 +2061,14 @@ Music_RestartChannel: ; e8a08 ; zzyy: pointer to new music data ; update music id - ld hl, wChannel1MusicID - wChannel1 + ld hl, CHANNEL_MUSIC_ID add hl, bc ld a, [hli] ld [wMusicID], a ld a, [hl] ld [wMusicID + 1], a ; update music bank - ld hl, wChannel1MusicBank - wChannel1 + ld hl, CHANNEL_MUSIC_BANK add hl, bc ld a, [hl] ld [wMusicBank], a @@ -2181,9 +2086,7 @@ Music_RestartChannel: ; e8a08 pop bc ; restore current channel ret -; e8a30 - -Music_NewSong: ; e8a30 +Music_NewSong: ; new song ; params: 2 ; de: song id @@ -2196,29 +2099,27 @@ Music_NewSong: ; e8a30 pop bc ret -; e8a3e - -GetMusicByte: ; e8a3e +GetMusicByte: ; returns byte from current address in a ; advances to next byte in music data ; input: bc = start of current channel push hl push de ; load address into de - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld a, [hli] ld e, a ld d, [hl] ; load bank into a - ld hl, wChannel1MusicBank - wChannel1 + ld hl, CHANNEL_MUSIC_BANK add hl, bc ld a, [hl] ; get byte call _LoadMusicByte ; load data into wCurMusicByte inc de ; advance to next byte for next time this is called ; update channeldata address - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld a, e ld [hli], a @@ -2230,9 +2131,7 @@ GetMusicByte: ; e8a3e ld a, [wCurMusicByte] ret -; e8a5d - -GetFrequency: ; e8a5d +GetFrequency: ; generate frequency ; input: ; d: octave @@ -2242,7 +2141,7 @@ GetFrequency: ; e8a5d ; get octave ; get starting octave - ld hl, wChannel1PitchOffset - wChannel1 + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld a, [hl] swap a ; hi nybble @@ -2251,7 +2150,7 @@ GetFrequency: ; e8a5d add d push af ; we'll use this later ; get starting octave - ld hl, wChannel1PitchOffset - wChannel1 + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld a, [hl] and $f ; lo nybble @@ -2284,16 +2183,14 @@ GetFrequency: ; e8a5d ld d, a ret -; e8a8d - -SetNoteDuration: ; e8a8d +SetNoteDuration: ; input: a = note duration in 16ths ; store delay units in de inc a ld e, a ld d, 0 ; store NoteLength in a - ld hl, wChannel1NoteLength - wChannel1 + ld hl, CHANNEL_NOTE_LENGTH add hl, bc ld a, [hl] ; multiply NoteLength by delay units @@ -2301,13 +2198,13 @@ SetNoteDuration: ; e8a8d call .Multiply ld a, l ; low ; store Tempo in de - ld hl, wChannel1Tempo - wChannel1 + ld hl, CHANNEL_TEMPO add hl, bc ld e, [hl] inc hl ld d, [hl] ; add ???? to the next result - ld hl, wChannel1Field16 - wChannel1 + ld hl, CHANNEL_FIELD16 add hl, bc ld l, [hl] ; multiply Tempo by last result (NoteLength * LOW(delay)) @@ -2316,18 +2213,16 @@ SetNoteDuration: ; e8a8d ld e, l ld d, h ; store result in ???? - ld hl, wChannel1Field16 - wChannel1 + ld hl, CHANNEL_FIELD16 add hl, bc ld [hl], e ; store result in NoteDuration - ld hl, wChannel1NoteDuration - wChannel1 + ld hl, CHANNEL_NOTE_DURATION add hl, bc ld [hl], d ret -; e8ab8 - -.Multiply: ; e8ab8 +.Multiply: ; multiplies a and de ; adds the result to l ; stores the result in hl @@ -2348,9 +2243,7 @@ SetNoteDuration: ; e8a8d jr nz, .loop ret -; e8ac7 - -SetGlobalTempo: ; e8ac7 +SetGlobalTempo: push bc ; save current channel ; are we dealing with music or sfx? ld a, [wCurChannel] @@ -2379,36 +2272,30 @@ SetGlobalTempo: ; e8ac7 pop bc ; restore current channel ret -; e8b03 - -Tempo: ; e8b03 +Tempo: ; input: ; de: note length ; update Tempo - ld hl, wChannel1Tempo - wChannel1 + ld hl, CHANNEL_TEMPO add hl, bc ld [hl], e inc hl ld [hl], d ; clear ???? xor a - ld hl, wChannel1Field16 - wChannel1 + ld hl, CHANNEL_FIELD16 add hl, bc ld [hl], a ret -; e8b11 - -StartChannel: ; e8b11 +StartChannel: call SetLRTracks - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc set SOUND_CHANNEL_ON, [hl] ; turn channel on ret -; e8b1b - -SetLRTracks: ; e8b1b +SetLRTracks: ; set tracks for a the current channel to default ; seems to be redundant since this is overwritten by stereo data later push de @@ -2422,15 +2309,13 @@ SetLRTracks: ; e8b1b add hl, de ; de = channel 0-3 ld a, [hl] ; load lr tracks into Tracks - ld hl, wChannel1Tracks - wChannel1 + ld hl, CHANNEL_TRACKS add hl, bc ld [hl], a pop de ret -; e8b30 - -_PlayMusic:: ; e8b30 +_PlayMusic:: ; load music call MusicOff ld hl, wMusicID @@ -2472,9 +2357,7 @@ _PlayMusic:: ; e8b30 call MusicOn ret -; e8b79 - -_PlayCry:: ; e8b79 +_PlayCry:: ; Play cry de using parameters: ; wCryPitch ; wCryLength @@ -2513,15 +2396,15 @@ _PlayCry:: ; e8b79 push af call LoadChannel - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc set SOUND_REST, [hl] - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_CRY_PITCH, [hl] - ld hl, wChannel1CryPitch - wChannel1 + ld hl, CHANNEL_CRY_PITCH add hl, bc ld a, [wCryPitch] ld [hli], a @@ -2535,7 +2418,7 @@ _PlayCry:: ; e8b79 jr nc, .start ; Tempo is effectively length - ld hl, wChannel1Tempo - wChannel1 + ld hl, CHANNEL_TEMPO add hl, bc ld a, [wCryLength] ld [hli], a @@ -2555,12 +2438,12 @@ _PlayCry:: ; e8b79 jr z, .next ; [Tracks] &= [wCryTracks] - ld hl, wChannel1Tracks - wChannel1 + ld hl, CHANNEL_TRACKS add hl, bc ld a, [hl] ld hl, wCryTracks and [hl] - ld hl, wChannel1Tracks - wChannel1 + ld hl, CHANNEL_TRACKS add hl, bc ld [hl], a @@ -2585,12 +2468,10 @@ _PlayCry:: ; e8b79 call MusicOn ret -; e8c04 - -_PlaySFX:: ; e8c04 +_PlaySFX:: ; clear channels if they aren't already call MusicOff - ld hl, wChannel5Flags + ld hl, wChannel5Flags1 bit SOUND_CHANNEL_ON, [hl] ; ch5 on? jr z, .ch6 res SOUND_CHANNEL_ON, [hl] ; turn it off @@ -2606,7 +2487,7 @@ _PlaySFX:: ; e8c04 ld [wSoundInput], a ; global sound off ld [rNR10], a ; sweep = 0 .ch6 - ld hl, wChannel6Flags + ld hl, wChannel6Flags1 bit SOUND_CHANNEL_ON, [hl] jr z, .ch7 res SOUND_CHANNEL_ON, [hl] ; turn it off @@ -2619,7 +2500,7 @@ _PlaySFX:: ; e8c04 ld a, $80 ld [rNR24], a ; restart sound (freq hi = 0) .ch7 - ld hl, wChannel7Flags + ld hl, wChannel7Flags1 bit SOUND_CHANNEL_ON, [hl] jr z, .ch8 res SOUND_CHANNEL_ON, [hl] ; turn it off @@ -2633,7 +2514,7 @@ _PlaySFX:: ; e8c04 ld a, $80 ld [rNR34], a ; restart sound (freq hi = 0) .ch8 - ld hl, wChannel8Flags + ld hl, wChannel8Flags1 bit SOUND_CHANNEL_ON, [hl] jr z, .chscleared res SOUND_CHANNEL_ON, [hl] ; turn it off @@ -2674,7 +2555,7 @@ _PlaySFX:: ; e8c04 .startchannels push af call LoadChannel ; bc = current channel - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc set SOUND_SFX, [hl] call StartChannel @@ -2686,9 +2567,7 @@ _PlaySFX:: ; e8c04 ld [wSFXPriority], a ret -; e8ca6 - -PlayStereoSFX:: ; e8ca6 +PlayStereoSFX:: ; play sfx de call MusicOff @@ -2729,7 +2608,7 @@ PlayStereoSFX:: ; e8ca6 push af call LoadChannel - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc set SOUND_SFX, [hl] @@ -2745,11 +2624,11 @@ PlayStereoSFX:: ; e8ca6 ld hl, wStereoPanningMask and [hl] - ld hl, wChannel1Tracks - wChannel1 + ld hl, CHANNEL_TRACKS add hl, bc ld [hl], a - ld hl, wChannel1Field30 - wChannel1 + ld hl, CHANNEL_FIELD30 add hl, bc ld [hl], a @@ -2760,15 +2639,15 @@ PlayStereoSFX:: ; e8ca6 ; ch3-4 ld a, [wSFXDuration] - ld hl, wChannel1Field2e - wChannel1 + ld hl, CHANNEL_FIELD2E add hl, bc ld [hl], a - ld hl, wChannel1Field2f - wChannel1 + ld hl, CHANNEL_FIELD2F add hl, bc ld [hl], a - ld hl, wChannel1Flags2 - wChannel1 + ld hl, CHANNEL_FLAGS2 add hl, bc set SOUND_UNKN_0F, [hl] @@ -2776,7 +2655,7 @@ PlayStereoSFX:: ; e8ca6 pop de ; turn channel on - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc set SOUND_CHANNEL_ON, [hl] ; on @@ -2789,9 +2668,7 @@ PlayStereoSFX:: ; e8ca6 call MusicOn ret -; e8d1b - -LoadChannel: ; e8d1b +LoadChannel: ; prep channel for use ; input: ; de: @@ -2808,12 +2685,12 @@ LoadChannel: ; e8d1b ld c, [hl] inc hl ld b, [hl] ; bc = channel pointer - ld hl, wChannel1Flags - wChannel1 + ld hl, CHANNEL_FLAGS1 add hl, bc res SOUND_CHANNEL_ON, [hl] ; channel off call ChannelInit ; load music pointer - ld hl, wChannel1MusicAddress - wChannel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc call LoadMusicByte ld [hli], a @@ -2822,22 +2699,20 @@ LoadChannel: ; e8d1b ld [hl], a inc de ; load music id - ld hl, wChannel1MusicID - wChannel1 + ld hl, CHANNEL_MUSIC_ID add hl, bc ld a, [wMusicID] ld [hli], a ld a, [wMusicID + 1] ld [hl], a ; load music bank - ld hl, wChannel1MusicBank - wChannel1 + ld hl, CHANNEL_MUSIC_BANK add hl, bc ld a, [wMusicBank] ld [hl], a ret -; e8d5b - -ChannelInit: ; e8d5b +ChannelInit: ; make sure channel is cleared ; set default tempo and note length in case nothing is loaded ; input: @@ -2845,31 +2720,29 @@ ChannelInit: ; e8d5b push de xor a ; get channel struct location and length - ld hl, wChannel1MusicID - wChannel1 ; start + ld hl, CHANNEL_MUSIC_ID ; start add hl, bc - ld e, wChannel2 - wChannel1 ; channel struct length + ld e, CHANNEL_STRUCT_LENGTH ; channel struct length ; clear channel .loop ld [hli], a dec e jr nz, .loop ; set tempo to default ($100) - ld hl, wChannel1Tempo - wChannel1 + ld hl, CHANNEL_TEMPO add hl, bc xor a ld [hli], a inc a ld [hl], a ; set note length to default ($1) (fast) - ld hl, wChannel1NoteLength - wChannel1 + ld hl, CHANNEL_NOTE_LENGTH add hl, bc ld [hl], a pop de ret -; e8d76 - -LoadMusicByte:: ; e8d76 +LoadMusicByte:: ; input: ; de = current music address ; output: @@ -2879,17 +2752,13 @@ LoadMusicByte:: ; e8d76 ld a, [wCurMusicByte] ret -; e8d80 - - INCLUDE "audio/notes.asm" INCLUDE "audio/wave_samples.asm" INCLUDE "audio/drumkits.asm" - -GetLRTracks: ; e8fc2 +GetLRTracks: ; gets the default sound l/r channels ; stores mono/stereo table in hl ld a, [wOptions] @@ -2903,22 +2772,18 @@ GetLRTracks: ; e8fc2 ld hl, StereoTracks ret -; e8fd1 - -MonoTracks: ; e8fd1 +MonoTracks: ; bit corresponds to track # ; hi: left channel ; lo: right channel db $11, $22, $44, $88 -; e8fd5 -StereoTracks: ; e8fd5 +StereoTracks: ; made redundant ; seems to be modified on a per-song basis db $11, $22, $44, $88 -; e8fd9 -ChannelPointers: ; e8fd9 +ChannelPointers: ; music channels dw wChannel1 dw wChannel2 @@ -2929,9 +2794,8 @@ ChannelPointers: ; e8fd9 dw wChannel6 dw wChannel7 dw wChannel8 -; e8fe9 -ClearChannels:: ; e8fe9 +ClearChannels:: ; runs ClearChannel for all 4 channels ; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off ld hl, rNR50 @@ -2948,9 +2812,7 @@ ClearChannels:: ; e8fe9 jr nz, .loop ret -; e8ffe - -ClearChannel: ; e8ffe +ClearChannel: ; input: hl = beginning hw sound register (rNR10, rNR20, rNR30, rNR40) ; output: 00 00 80 00 80 @@ -2967,9 +2829,7 @@ ClearChannel: ; e8ffe ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0) ret -; e900a - -PlayTrainerEncounterMusic:: ; e900a +PlayTrainerEncounterMusic:: ; input: e = trainer type ; turn fade off xor a @@ -2988,4 +2848,3 @@ PlayTrainerEncounterMusic:: ; e900a ld e, [hl] call PlayMusic ret -; e9027 diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm index 27ca1dc41..114a6fd55 100644 --- a/audio/music/aftertherivalfight.asm +++ b/audio/music/aftertherivalfight.asm @@ -1,11 +1,10 @@ -Music_AfterTheRivalFight: ; f5127 +Music_AfterTheRivalFight: 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 +Music_AfterTheRivalFight_Ch1: tempo 112 volume $77 dutycycle $0 @@ -23,9 +22,8 @@ Music_AfterTheRivalFight_Ch1: ; f5133 note G#, 2 note G#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1 -; f5153 -Music_AfterTheRivalFight_Ch2: ; f5153 +Music_AfterTheRivalFight_Ch2: dutycycle $1 vibrato $6, $35 stereopanning $f @@ -39,9 +37,8 @@ Music_AfterTheRivalFight_Ch2: ; f5153 note G#, 2 note G#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f502e -; f516a -Music_AfterTheRivalFight_Ch3: ; f516a +Music_AfterTheRivalFight_Ch3: notetype $c, $28 octave 3 note D#, 2 @@ -53,9 +50,8 @@ Music_AfterTheRivalFight_Ch3: ; f516a note F_, 2 note D#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f509d -; f517a -Music_AfterTheRivalFight_Ch4: ; f517a +Music_AfterTheRivalFight_Ch4: togglenoise $3 stereopanning $f notetype $c @@ -66,4 +62,3 @@ Music_AfterTheRivalFight_Ch4: ; f517a note D_, 2 note D_, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f5118 -; f518a diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm index 0bce049bf..0b2304476 100644 --- a/audio/music/azaleatown.asm +++ b/audio/music/azaleatown.asm @@ -1,18 +1,17 @@ -Music_AzaleaTown: ; f57e8 +Music_AzaleaTown: 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 +Music_AzaleaTown_Ch1: tempo 160 volume $77 dutycycle $2 stereopanning $f notetype $c, $a1 note __, 2 -Music_AzaleaTown_branch_f5801: ; f5801 +Music_AzaleaTown_branch_f5801: intensity $a1 octave 3 note F_, 2 @@ -27,7 +26,7 @@ Music_AzaleaTown_branch_f5801: ; f5801 note F_, 2 note F_, 2 loopchannel 2, Music_AzaleaTown_branch_f5801 -Music_AzaleaTown_branch_f5816: ; f5816 +Music_AzaleaTown_branch_f5816: callchannel Music_AzaleaTown_branch_f588c stereopanning $f0 intensity $a4 @@ -119,9 +118,8 @@ Music_AzaleaTown_branch_f5816: ; f5816 note G#, 14 note __, 2 loopchannel 0, Music_AzaleaTown_branch_f5816 -; f588c -Music_AzaleaTown_branch_f588c: ; f588c +Music_AzaleaTown_branch_f588c: notetype $c, $a1 octave 4 note F_, 2 @@ -219,9 +217,8 @@ Music_AzaleaTown_branch_f588c: ; f588c intensity $61 note C#, 2 endchannel -; f5912 -Music_AzaleaTown_branch_f5912: ; f5912 +Music_AzaleaTown_branch_f5912: intensity $61 note G#, 8 note G#, 8 @@ -230,9 +227,8 @@ Music_AzaleaTown_branch_f5912: ; f5912 intensity $a1 note A_, 8 endchannel -; f591d -Music_AzaleaTown_Ch2: ; f591d +Music_AzaleaTown_Ch2: vibrato $12, $23 dutycycle $2 stereopanning $f0 @@ -268,7 +264,7 @@ Music_AzaleaTown_Ch2: ; f591d dutycycle $1 octave 5 note C_, 1 -Music_AzaleaTown_branch_f5952: ; f5952 +Music_AzaleaTown_branch_f5952: callchannel Music_AzaleaTown_branch_f59c7 note C#, 4 note C_, 2 @@ -366,9 +362,8 @@ Music_AzaleaTown_branch_f5952: ; f5952 octave 5 note C_, 2 loopchannel 0, Music_AzaleaTown_branch_f5952 -; f59c7 -Music_AzaleaTown_branch_f59c7: ; f59c7 +Music_AzaleaTown_branch_f59c7: note C#, 4 octave 4 note G#, 2 @@ -420,9 +415,8 @@ Music_AzaleaTown_branch_f59c7: ; f59c7 note D#, 12 intensity $b4 endchannel -; f5a08 -Music_AzaleaTown_Ch3: ; f5a08 +Music_AzaleaTown_Ch3: stereopanning $ff vibrato $6, $26 notetype $c, $25 @@ -446,7 +440,7 @@ Music_AzaleaTown_Ch3: ; f5a08 note C#, 1 note __, 1 note G#, 4 -Music_AzaleaTown_branch_f5a24: ; f5a24 +Music_AzaleaTown_branch_f5a24: callchannel Music_AzaleaTown_branch_f5a86 note G#, 4 note D#, 2 @@ -534,9 +528,8 @@ Music_AzaleaTown_branch_f5a24: ; f5a24 octave 3 note C_, 1 loopchannel 0, Music_AzaleaTown_branch_f5a24 -; f5a86 -Music_AzaleaTown_branch_f5a86: ; f5a86 +Music_AzaleaTown_branch_f5a86: note C#, 1 note __, 5 note C#, 1 @@ -608,9 +601,8 @@ Music_AzaleaTown_branch_f5a86: ; f5a86 note C_, 1 note __, 1 endchannel -; f5acf -Music_AzaleaTown_branch_f5acf: ; f5acf +Music_AzaleaTown_branch_f5acf: intensity $35 octave 3 note F_, 1 @@ -631,13 +623,12 @@ Music_AzaleaTown_branch_f5acf: ; f5acf note F_, 1 note __, 1 endchannel -; f5ae5 -Music_AzaleaTown_Ch4: ; f5ae5 +Music_AzaleaTown_Ch4: togglenoise $3 notetype $c note F_, 2 -Music_AzaleaTown_branch_f5aea: ; f5aea +Music_AzaleaTown_branch_f5aea: note D#, 2 note F#, 2 note D_, 2 @@ -660,4 +651,3 @@ Music_AzaleaTown_branch_f5aea: ; f5aea note D_, 2 note F#, 2 loopchannel 0, Music_AzaleaTown_branch_f5aea -; f5b03 diff --git a/audio/music/battletowerlobby.asm b/audio/music/battletowerlobby.asm index fe7cba7a0..2bf38a836 100644 --- a/audio/music/battletowerlobby.asm +++ b/audio/music/battletowerlobby.asm @@ -1,11 +1,10 @@ -Music_BattleTowerLobby: ; 17948b +Music_BattleTowerLobby: 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 +Music_BattleTowerLobby_Ch1: tempo 152 volume $77 dutycycle $3 @@ -13,7 +12,7 @@ Music_BattleTowerLobby_Ch1: ; 179497 vibrato $8, $22 stereopanning $f0 notetype $c, $72 -Music_BattleTowerLobby_branch_1794a9: ; 1794a9 +Music_BattleTowerLobby_branch_1794a9: notetype $c, $72 octave 3 note G#, 2 @@ -116,14 +115,13 @@ Music_BattleTowerLobby_branch_1794a9: ; 1794a9 octave 2 note B_, 4 loopchannel 0, Music_BattleTowerLobby_branch_1794a9 -; 17953a -Music_BattleTowerLobby_Ch2: ; 17953a +Music_BattleTowerLobby_Ch2: dutycycle $2 vibrato $10, $34 stereopanning $f notetype $c, $82 -Music_BattleTowerLobby_branch_179544: ; 179544 +Music_BattleTowerLobby_branch_179544: notetype $c, $82 octave 4 note E_, 2 @@ -201,11 +199,10 @@ Music_BattleTowerLobby_branch_179544: ; 179544 octave 4 note D#, 1 loopchannel 0, Music_BattleTowerLobby_branch_179544 -; 1795ae -Music_BattleTowerLobby_Ch3: ; 1795ae +Music_BattleTowerLobby_Ch3: notetype $c, $11 -Music_BattleTowerLobby_branch_1795b1: ; 1795b1 +Music_BattleTowerLobby_branch_1795b1: octave 2 note B_, 2 octave 3 @@ -298,11 +295,10 @@ Music_BattleTowerLobby_branch_1795b1: ; 1795b1 note D#, 2 note F#, 2 loopchannel 0, Music_BattleTowerLobby_branch_1795b1 -; 179610 -Music_BattleTowerLobby_Ch4: ; 179610 +Music_BattleTowerLobby_Ch4: togglenoise $0 -Music_BattleTowerLobby_branch_179612: ; 179612 +Music_BattleTowerLobby_branch_179612: notetype $c note __, 2 note F_, 4 @@ -310,4 +306,3 @@ Music_BattleTowerLobby_branch_179612: ; 179612 note F_, 2 note F_, 4 loopchannel 0, Music_BattleTowerLobby_branch_179612 -; 17961d diff --git a/audio/music/battletowertheme.asm b/audio/music/battletowertheme.asm index b9e477de1..18af95866 100644 --- a/audio/music/battletowertheme.asm +++ b/audio/music/battletowertheme.asm @@ -1,18 +1,17 @@ -Music_BattleTowerTheme: ; 178889 +Music_BattleTowerTheme: 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 +Music_BattleTowerTheme_Ch1: tempo 141 volume $77 tone $0001 vibrato $12, $34 stereopanning $f notetype $6, $94 -Music_BattleTowerTheme_branch_1788a5: ; 1788a5 +Music_BattleTowerTheme_branch_1788a5: note __, 16 note __, 16 note __, 12 @@ -185,9 +184,8 @@ Music_BattleTowerTheme_branch_1788a5: ; 1788a5 note E_, 4 note __, 12 loopchannel 0, Music_BattleTowerTheme_branch_1788a5 -; 17895e -Music_BattleTowerTheme_branch_17895e: ; 17895e +Music_BattleTowerTheme_branch_17895e: intensity $94 note A_, 2 note __, 2 @@ -202,11 +200,10 @@ Music_BattleTowerTheme_branch_17895e: ; 17895e note __, 4 note A_, 4 endchannel -; 17896d -Music_BattleTowerTheme_Ch2: ; 17896d +Music_BattleTowerTheme_Ch2: vibrato $12, $34 -Music_BattleTowerTheme_branch_178970: ; 178970 +Music_BattleTowerTheme_branch_178970: dutycycle $3 notetype $6, $b8 octave 3 @@ -345,9 +342,8 @@ Music_BattleTowerTheme_branch_178970: ; 178970 note D_, 2 note E_, 4 loopchannel 0, Music_BattleTowerTheme_branch_178970 -; 178a15 -Music_BattleTowerTheme_branch_178a15: ; 178a15 +Music_BattleTowerTheme_branch_178a15: note F_, 2 note __, 2 note F_, 8 @@ -359,12 +355,11 @@ Music_BattleTowerTheme_branch_178a15: ; 178a15 note A#, 4 note A_, 4 endchannel -; 178a20 -Music_BattleTowerTheme_Ch3: ; 178a20 +Music_BattleTowerTheme_Ch3: vibrato $12, $34 notetype $6, $16 -Music_BattleTowerTheme_branch_178a26: ; 178a26 +Music_BattleTowerTheme_branch_178a26: stereopanning $ff callchannel Music_BattleTowerTheme_branch_178afe note C_, 2 @@ -569,9 +564,8 @@ Music_BattleTowerTheme_branch_178a26: ; 178a26 note G_, 4 note __, 12 loopchannel 0, Music_BattleTowerTheme_branch_178a26 -; 178afe -Music_BattleTowerTheme_branch_178afe: ; 178afe +Music_BattleTowerTheme_branch_178afe: octave 3 note C_, 2 note __, 2 @@ -587,12 +581,11 @@ Music_BattleTowerTheme_branch_178afe: ; 178afe note C_, 2 note __, 2 endchannel -; 178b0d -Music_BattleTowerTheme_Ch4: ; 178b0d +Music_BattleTowerTheme_Ch4: togglenoise $3 notetype $c -Music_BattleTowerTheme_branch_178b11: ; 178b11 +Music_BattleTowerTheme_branch_178b11: callchannel Music_BattleTowerTheme_branch_178b58 note D_, 2 note D_, 4 @@ -603,7 +596,7 @@ Music_BattleTowerTheme_branch_178b11: ; 178b11 note C#, 1 note D_, 1 note C#, 1 -Music_BattleTowerTheme_branch_178b1d: ; 178b1d +Music_BattleTowerTheme_branch_178b1d: callchannel Music_BattleTowerTheme_branch_178b58 callchannel Music_BattleTowerTheme_branch_178b61 loopchannel 2, Music_BattleTowerTheme_branch_178b1d @@ -615,7 +608,7 @@ Music_BattleTowerTheme_branch_178b1d: ; 178b1d note D_, 1 note D_, 1 note D_, 8 -Music_BattleTowerTheme_branch_178b35: ; 178b35 +Music_BattleTowerTheme_branch_178b35: callchannel Music_BattleTowerTheme_branch_178b76 note D_, 2 note D_, 2 @@ -641,9 +634,8 @@ Music_BattleTowerTheme_branch_178b35: ; 178b35 note D_, 1 note C#, 1 loopchannel 0, Music_BattleTowerTheme_branch_178b11 -; 178b58 -Music_BattleTowerTheme_branch_178b58: ; 178b58 +Music_BattleTowerTheme_branch_178b58: note D_, 2 note D_, 4 note D_, 1 @@ -653,9 +645,8 @@ Music_BattleTowerTheme_branch_178b58: ; 178b58 note D_, 1 note D_, 1 endchannel -; 178b61 -Music_BattleTowerTheme_branch_178b61: ; 178b61 +Music_BattleTowerTheme_branch_178b61: note D_, 2 note D_, 4 note D_, 1 @@ -667,9 +658,8 @@ Music_BattleTowerTheme_branch_178b61: ; 178b61 note D_, 1 note C#, 1 endchannel -; 178b6c -Music_BattleTowerTheme_branch_178b6c: ; 178b6c +Music_BattleTowerTheme_branch_178b6c: note D_, 2 note D_, 4 note D_, 1 @@ -680,9 +670,8 @@ Music_BattleTowerTheme_branch_178b6c: ; 178b6c note D_, 1 note D_, 1 endchannel -; 178b76 -Music_BattleTowerTheme_branch_178b76: ; 178b76 +Music_BattleTowerTheme_branch_178b76: note D_, 2 note C#, 2 note D_, 2 @@ -694,4 +683,3 @@ Music_BattleTowerTheme_branch_178b76: ; 178b76 note D_, 1 note C#, 1 endchannel -; 178b81 diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm index 3805627e6..92a19e813 100644 --- a/audio/music/bicycle.asm +++ b/audio/music/bicycle.asm @@ -1,11 +1,10 @@ -Music_Bicycle: ; ee119 +Music_Bicycle: 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 +Music_Bicycle_Ch1: tempo 140 volume $77 dutycycle $3 @@ -23,7 +22,7 @@ Music_Bicycle_Ch1: ; ee125 note A_, 8 intensity $b2 note F#, 2 -Music_Bicycle_branch_ee144: ; ee144 +Music_Bicycle_branch_ee144: stereopanning $f intensity $b2 note G_, 2 @@ -169,9 +168,8 @@ Music_Bicycle_branch_ee144: ; ee144 note G#, 2 note A_, 2 loopchannel 0, Music_Bicycle_branch_ee144 -; ee1de -Music_Bicycle_Ch2: ; ee1de +Music_Bicycle_Ch2: dutycycle $2 vibrato $10, $24 stereopanning $f0 @@ -195,7 +193,7 @@ Music_Bicycle_Ch2: ; ee1de octave 3 note B_, 2 note A_, 2 -Music_Bicycle_branch_ee1fd: ; ee1fd +Music_Bicycle_branch_ee1fd: stereopanning $ff dutycycle $2 intensity $c3 @@ -273,9 +271,8 @@ Music_Bicycle_branch_ee1fd: ; ee1fd note G_, 2 note F#, 4 loopchannel 0, Music_Bicycle_branch_ee1fd -; ee263 -Music_Bicycle_branch_ee263: ; ee263 +Music_Bicycle_branch_ee263: note G_, 6 note B_, 6 note G_, 4 @@ -286,9 +283,8 @@ Music_Bicycle_branch_ee263: ; ee263 note G_, 6 note E_, 4 endchannel -; ee26d -Music_Bicycle_Ch3: ; ee26d +Music_Bicycle_Ch3: notetype $c, $14 note __, 16 octave 3 @@ -305,7 +301,7 @@ Music_Bicycle_Ch3: ; ee26d octave 3 note A_, 1 note __, 1 -Music_Bicycle_branch_ee27f: ; ee27f +Music_Bicycle_branch_ee27f: callchannel Music_Bicycle_branch_ee333 note E_, 1 note __, 1 @@ -408,7 +404,7 @@ Music_Bicycle_branch_ee27f: ; ee27f note __, 1 note A_, 1 note __, 1 -Music_Bicycle_branch_ee2e9: ; ee2e9 +Music_Bicycle_branch_ee2e9: note G_, 1 note __, 1 note B_, 1 @@ -477,9 +473,8 @@ Music_Bicycle_branch_ee2e9: ; ee2e9 note __, 1 loopchannel 2, Music_Bicycle_branch_ee2e9 loopchannel 0, Music_Bicycle_branch_ee27f -; ee333 -Music_Bicycle_branch_ee333: ; ee333 +Music_Bicycle_branch_ee333: octave 3 note G_, 1 note __, 1 @@ -498,16 +493,15 @@ Music_Bicycle_branch_ee333: ; ee333 note B_, 1 note __, 1 endchannel -; ee345 -Music_Bicycle_Ch4: ; ee345 +Music_Bicycle_Ch4: togglenoise $0 notetype $c note __, 16 note __, 16 -Music_Bicycle_branch_ee34b: ; ee34b +Music_Bicycle_branch_ee34b: note __, 2 -Music_Bicycle_branch_ee34c: ; ee34c +Music_Bicycle_branch_ee34c: stereopanning $f0 note F_, 4 loopchannel 12, Music_Bicycle_branch_ee34c @@ -518,4 +512,3 @@ Music_Bicycle_branch_ee34c: ; ee34c note F_, 2 note F_, 2 loopchannel 0, Music_Bicycle_branch_ee34b -; ee35e diff --git a/audio/music/buenaspassword.asm b/audio/music/buenaspassword.asm index a91999f30..316ec9a0e 100644 --- a/audio/music/buenaspassword.asm +++ b/audio/music/buenaspassword.asm @@ -1,17 +1,16 @@ -Music_BuenasPassword: ; 178153 +Music_BuenasPassword: 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 +Music_BuenasPassword_Ch1: tempo 136 volume $77 tone $0001 notetype $c, $b3 note __, 8 -Music_BuenasPassword_branch_17816b: ; 17816b +Music_BuenasPassword_branch_17816b: stereopanning $ff note __, 16 note __, 16 @@ -138,9 +137,8 @@ Music_BuenasPassword_branch_17816b: ; 17816b note G_, 1 note __, 1 loopchannel 0, Music_BuenasPassword_branch_17816b -; 178204 -Music_BuenasPassword_branch_178204: ; 178204 +Music_BuenasPassword_branch_178204: stereopanning $f notetype $6, $84 octave 4 @@ -162,9 +160,8 @@ Music_BuenasPassword_branch_178204: ; 178204 note __, 1 notetype $c, $84 endchannel -; 178222 -Music_BuenasPassword_branch_178222: ; 178222 +Music_BuenasPassword_branch_178222: octave 3 note D#, 1 note __, 1 @@ -180,16 +177,15 @@ Music_BuenasPassword_branch_178222: ; 178222 note D#, 1 note __, 2 endchannel -; 178231 -Music_BuenasPassword_Ch2: ; 178231 +Music_BuenasPassword_Ch2: vibrato $12, $34 dutycycle $2 notetype $c, $a5 note __, 7 octave 3 note F#, 1 -Music_BuenasPassword_branch_17823c: ; 17823c +Music_BuenasPassword_branch_17823c: stereopanning $ff callchannel Music_BuenasPassword_branch_1782df callchannel Music_BuenasPassword_branch_1782a4 @@ -274,9 +270,8 @@ Music_BuenasPassword_branch_17823c: ; 17823c note __, 1 intensity $a5 loopchannel 0, Music_BuenasPassword_branch_17823c -; 1782a4 -Music_BuenasPassword_branch_1782a4: ; 1782a4 +Music_BuenasPassword_branch_1782a4: octave 3 note G#, 1 note __, 1 @@ -308,9 +303,8 @@ Music_BuenasPassword_branch_1782a4: ; 1782a4 note __, 1 notetype $c, $a5 endchannel -; 1782cc -Music_BuenasPassword_branch_1782cc: ; 1782cc +Music_BuenasPassword_branch_1782cc: octave 4 note G#, 2 note __, 2 @@ -330,9 +324,8 @@ Music_BuenasPassword_branch_1782cc: ; 1782cc note D#, 2 note __, 2 endchannel -; 1782df -Music_BuenasPassword_branch_1782df: ; 1782df +Music_BuenasPassword_branch_1782df: octave 3 note G#, 1 note __, 1 @@ -383,12 +376,11 @@ Music_BuenasPassword_branch_1782df: ; 1782df note B_, 1 note G#, 3 endchannel -; 178311 -Music_BuenasPassword_Ch3: ; 178311 +Music_BuenasPassword_Ch3: notetype $c, $14 note __, 8 -Music_BuenasPassword_branch_178315: ; 178315 +Music_BuenasPassword_branch_178315: callchannel Music_BuenasPassword_branch_1783a7 callchannel Music_BuenasPassword_branch_1783a7 callchannel Music_BuenasPassword_branch_1783a7 @@ -519,9 +511,8 @@ Music_BuenasPassword_branch_178315: ; 178315 note G_, 1 note __, 1 loopchannel 0, Music_BuenasPassword_branch_178315 -; 1783a7 -Music_BuenasPassword_branch_1783a7: ; 1783a7 +Music_BuenasPassword_branch_1783a7: octave 2 note G#, 1 note __, 1 @@ -543,9 +534,8 @@ Music_BuenasPassword_branch_1783a7: ; 1783a7 note F_, 2 note C#, 1 endchannel -; 1783bc -Music_BuenasPassword_branch_1783bc: ; 1783bc +Music_BuenasPassword_branch_1783bc: octave 2 note G#, 1 note __, 1 @@ -566,9 +556,8 @@ Music_BuenasPassword_branch_1783bc: ; 1783bc octave 2 note G#, 2 endchannel -; 1783d0 -Music_BuenasPassword_Ch4: ; 1783d0 +Music_BuenasPassword_Ch4: togglenoise $3 notetype $c note D#, 2 @@ -576,7 +565,7 @@ Music_BuenasPassword_Ch4: ; 1783d0 note D_, 2 note D_, 1 note D_, 1 -Music_BuenasPassword_branch_1783d9: ; 1783d9 +Music_BuenasPassword_branch_1783d9: callchannel Music_BuenasPassword_branch_17840c callchannel Music_BuenasPassword_branch_17840c callchannel Music_BuenasPassword_branch_17840c @@ -602,9 +591,8 @@ Music_BuenasPassword_branch_1783d9: ; 1783d9 note D_, 1 note D_, 1 loopchannel 0, Music_BuenasPassword_branch_1783d9 -; 17840c -Music_BuenasPassword_branch_17840c: ; 17840c +Music_BuenasPassword_branch_17840c: stereopanning $ff note D#, 2 stereopanning $f0 @@ -622,9 +610,8 @@ Music_BuenasPassword_branch_17840c: ; 17840c stereopanning $f note G_, 2 endchannel -; 178424 -Music_BuenasPassword_branch_178424: ; 178424 +Music_BuenasPassword_branch_178424: stereopanning $ff note D#, 2 stereopanning $f0 @@ -642,4 +629,3 @@ Music_BuenasPassword_branch_178424: ; 178424 note D_, 1 note D_, 1 endchannel -; 17843b diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm index 6195d664e..e77bf550f 100644 --- a/audio/music/bugcatchingcontest.asm +++ b/audio/music/bugcatchingcontest.asm @@ -1,11 +1,10 @@ -Music_BugCatchingContest: ; f7c16 +Music_BugCatchingContest: 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 +Music_BugCatchingContest_Ch1: tempo 144 volume $77 stereopanning $f @@ -38,14 +37,14 @@ Music_BugCatchingContest_Ch1: ; f7c22 note __, 1 note E_, 1 note E_, 1 -Music_BugCatchingContest_branch_f7c4b: ; f7c4b +Music_BugCatchingContest_branch_f7c4b: notetype $c, $b1 -Music_BugCatchingContest_branch_f7c4e: ; f7c4e +Music_BugCatchingContest_branch_f7c4e: note __, 2 octave 2 note A_, 2 loopchannel 4, Music_BugCatchingContest_branch_f7c4e -Music_BugCatchingContest_branch_f7c55: ; f7c55 +Music_BugCatchingContest_branch_f7c55: note __, 2 note B_, 2 loopchannel 8, Music_BugCatchingContest_branch_f7c55 @@ -61,7 +60,7 @@ Music_BugCatchingContest_branch_f7c55: ; f7c55 note E_, 1 intensity $b1 dutycycle $2 -Music_BugCatchingContest_branch_f7c6b: ; f7c6b +Music_BugCatchingContest_branch_f7c6b: note __, 2 octave 2 note A_, 2 @@ -91,7 +90,7 @@ Music_BugCatchingContest_branch_f7c6b: ; f7c6b note E_, 4 note __, 4 note E_, 4 -Music_BugCatchingContest_branch_f7c8e: ; f7c8e +Music_BugCatchingContest_branch_f7c8e: note __, 4 octave 2 note A_, 4 @@ -187,15 +186,14 @@ Music_BugCatchingContest_branch_f7c8e: ; f7c8e note E_, 2 note E_, 2 loopchannel 0, Music_BugCatchingContest_branch_f7c4b -; f7cf4 -Music_BugCatchingContest_Ch2: ; f7cf4 +Music_BugCatchingContest_Ch2: stereopanning $f0 vibrato $8, $23 dutycycle $1 notetype $c, $c7 note __, 8 -Music_BugCatchingContest_branch_f7cff: ; f7cff +Music_BugCatchingContest_branch_f7cff: octave 4 note A_, 1 note __, 1 @@ -204,7 +202,7 @@ Music_BugCatchingContest_branch_f7cff: ; f7cff note A_, 1 note A_, 1 loopchannel 4, Music_BugCatchingContest_branch_f7cff -Music_BugCatchingContest_branch_f7d0a: ; f7d0a +Music_BugCatchingContest_branch_f7d0a: dutycycle $0 callchannel Music_BugCatchingContest_branch_f7d8e octave 2 @@ -328,9 +326,8 @@ Music_BugCatchingContest_branch_f7d0a: ; f7d0a note __, 3 note A_, 10 loopchannel 0, Music_BugCatchingContest_branch_f7d0a -; f7d8e -Music_BugCatchingContest_branch_f7d8e: ; f7d8e +Music_BugCatchingContest_branch_f7d8e: octave 2 note D_, 2 octave 3 @@ -372,9 +369,8 @@ Music_BugCatchingContest_branch_f7d8e: ; f7d8e note G_, 1 note __, 1 endchannel -; f7db7 -Music_BugCatchingContest_Ch3: ; f7db7 +Music_BugCatchingContest_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $14 @@ -405,7 +401,7 @@ Music_BugCatchingContest_Ch3: ; f7db7 note __, 1 note C#, 1 note C#, 1 -Music_BugCatchingContest_branch_f7dda: ; f7dda +Music_BugCatchingContest_branch_f7dda: notetype $c, $14 note F#, 5 note __, 1 @@ -587,9 +583,8 @@ Music_BugCatchingContest_branch_f7dda: ; f7dda note C#, 2 note C#, 2 loopchannel 0, Music_BugCatchingContest_branch_f7dda -; f7e9a -Music_BugCatchingContest_Ch4: ; f7e9a +Music_BugCatchingContest_Ch4: togglenoise $4 notetype $6 note C#, 1 @@ -607,7 +602,7 @@ Music_BugCatchingContest_Ch4: ; f7e9a note E_, 2 note E_, 2 callchannel Music_BugCatchingContest_branch_f7ee2 -Music_BugCatchingContest_branch_f7eaf: ; f7eaf +Music_BugCatchingContest_branch_f7eaf: note D_, 4 note D_, 4 note D_, 2 @@ -651,9 +646,8 @@ Music_BugCatchingContest_branch_f7eaf: ; f7eaf note D_, 2 callchannel Music_BugCatchingContest_branch_f7ee2 loopchannel 0, Music_BugCatchingContest_branch_f7eaf -; f7ee2 -Music_BugCatchingContest_branch_f7ee2: ; f7ee2 +Music_BugCatchingContest_branch_f7ee2: note D_, 4 note B_, 8 note D_, 2 @@ -671,4 +665,3 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2 note D_, 2 note D_, 2 endchannel -; f7ef3 diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm index e06a6a7b9..723e78140 100644 --- a/audio/music/burnedtower.asm +++ b/audio/music/burnedtower.asm @@ -1,11 +1,10 @@ -Music_BurnedTower: ; f6a99 +Music_BurnedTower: 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 +Music_BurnedTower_Ch1: tempo 168 volume $77 dutycycle $1 @@ -27,7 +26,7 @@ Music_BurnedTower_Ch1: ; f6aa5 note D_, 2 intensity $80 note C#, 6 -Music_BurnedTower_branch_f6ac8: ; f6ac8 +Music_BurnedTower_branch_f6ac8: intensity $91 octave 2 note A_, 4 @@ -37,7 +36,7 @@ Music_BurnedTower_branch_f6ac8: ; f6ac8 note A#, 6 loopchannel 2, Music_BurnedTower_branch_f6ac8 tempo 150 -Music_BurnedTower_branch_f6ad8: ; f6ad8 +Music_BurnedTower_branch_f6ad8: intensity $b1 octave 2 note A_, 4 @@ -87,7 +86,7 @@ Music_BurnedTower_branch_f6ad8: ; f6ad8 note E_, 2 intensity $a0 note D#, 6 -Music_BurnedTower_branch_f6b17: ; f6b17 +Music_BurnedTower_branch_f6b17: intensity $b1 octave 2 note B_, 4 @@ -98,16 +97,15 @@ Music_BurnedTower_branch_f6b17: ; f6b17 note C_, 6 loopchannel 2, Music_BurnedTower_branch_f6b17 loopchannel 0, Music_BurnedTower_branch_f6ad8 -; f6b29 -Music_BurnedTower_Ch2: ; f6b29 +Music_BurnedTower_Ch2: dutycycle $2 vibrato $20, $82 tone $0002 notetype $c, $70 callchannel Music_BurnedTower_branch_f6b8e intensity $c5 -Music_BurnedTower_branch_f6b39: ; f6b39 +Music_BurnedTower_branch_f6b39: callchannel Music_BurnedTower_branch_f6b8e intensity $c1 dutycycle $3 @@ -170,9 +168,8 @@ Music_BurnedTower_branch_f6b39: ; f6b39 intensity $b7 note F#, 16 loopchannel 0, Music_BurnedTower_branch_f6b39 -; f6b8e -Music_BurnedTower_branch_f6b8e: ; f6b8e +Music_BurnedTower_branch_f6b8e: octave 3 note E_, 4 note D_, 2 @@ -193,9 +190,8 @@ Music_BurnedTower_branch_f6b8e: ; f6b8e note D_, 4 note E_, 16 endchannel -; f6ba2 -Music_BurnedTower_Ch3: ; f6ba2 +Music_BurnedTower_Ch3: stereopanning $f notetype $c, $14 note __, 16 @@ -204,7 +200,7 @@ Music_BurnedTower_Ch3: ; f6ba2 note __, 12 octave 3 note D#, 4 -Music_BurnedTower_branch_f6bad: ; f6bad +Music_BurnedTower_branch_f6bad: octave 2 note A_, 2 octave 3 @@ -224,7 +220,7 @@ Music_BurnedTower_branch_f6bad: ; f6bad note E_, 2 note D#, 4 loopchannel 4, Music_BurnedTower_branch_f6bad -Music_BurnedTower_branch_f6bc3: ; f6bc3 +Music_BurnedTower_branch_f6bc3: octave 2 note B_, 2 octave 3 @@ -245,16 +241,15 @@ Music_BurnedTower_branch_f6bc3: ; f6bc3 note F_, 4 loopchannel 2, Music_BurnedTower_branch_f6bc3 loopchannel 0, Music_BurnedTower_branch_f6bad -; f6bdd -Music_BurnedTower_Ch4: ; f6bdd +Music_BurnedTower_Ch4: togglenoise $0 notetype $c -Music_BurnedTower_branch_f6be1: ; f6be1 +Music_BurnedTower_branch_f6be1: note __, 16 loopchannel 4, Music_BurnedTower_branch_f6be1 note __, 2 -Music_BurnedTower_branch_f6be7: ; f6be7 +Music_BurnedTower_branch_f6be7: stereopanning $f0 note G_, 2 note G#, 2 @@ -262,4 +257,3 @@ Music_BurnedTower_branch_f6be7: ; f6be7 note G#, 2 note G_, 4 loopchannel 0, Music_BurnedTower_branch_f6be7 -; f6bf2 diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm index f118d0243..de815cc91 100644 --- a/audio/music/celadoncity.asm +++ b/audio/music/celadoncity.asm @@ -1,14 +1,13 @@ -Music_CeladonCity: ; f435b +Music_CeladonCity: musicheader 3, 1, Music_CeladonCity_Ch1 musicheader 1, 2, Music_CeladonCity_Ch2 musicheader 1, 3, Music_CeladonCity_Ch3 -; f4364 -Music_CeladonCity_Ch1: ; f4364 +Music_CeladonCity_Ch1: tempo 146 volume $77 tone $0001 -Music_CeladonCity_branch_f436c: ; f436c +Music_CeladonCity_branch_f436c: stereopanning $f notetype $c, $a6 octave 3 @@ -20,7 +19,7 @@ Music_CeladonCity_branch_f436c: ; f436c note E_, 2 note F#, 2 callchannel Music_CeladonCity_branch_f43cc -Music_CeladonCity_branch_f437d: ; f437d +Music_CeladonCity_branch_f437d: note D_, 2 note F#, 1 note A_, 1 @@ -84,9 +83,8 @@ Music_CeladonCity_branch_f437d: ; f437d note G_, 1 note A_, 8 loopchannel 0, Music_CeladonCity_branch_f436c -; f43cc -Music_CeladonCity_branch_f43cc: ; f43cc +Music_CeladonCity_branch_f43cc: note D_, 2 note G_, 1 note B_, 1 @@ -105,9 +103,8 @@ Music_CeladonCity_branch_f43cc: ; f43cc octave 3 note A_, 1 endchannel -; f43e1 -Music_CeladonCity_branch_f43e1: ; f43e1 +Music_CeladonCity_branch_f43e1: octave 2 note G_, 2 note B_, 1 @@ -134,17 +131,15 @@ Music_CeladonCity_branch_f43e1: ; f43e1 octave 3 note B_, 1 endchannel -; f43fe -Music_CeladonCity_branch_f43fe: ; f43fe +Music_CeladonCity_branch_f43fe: note D_, 2 note F#, 1 note A_, 1 loopchannel 4, Music_CeladonCity_branch_f43fe endchannel -; f4406 -Music_CeladonCity_Ch2: ; f4406 +Music_CeladonCity_Ch2: vibrato $12, $34 dutycycle $2 stereopanning $f0 @@ -159,7 +154,7 @@ Music_CeladonCity_Ch2: ; f4406 note F#, 1 note G_, 1 note A_, 8 -Music_CeladonCity_branch_f441a: ; f441a +Music_CeladonCity_branch_f441a: callchannel Music_CeladonCity_branch_f4463 note A_, 4 note F#, 4 @@ -218,9 +213,8 @@ Music_CeladonCity_branch_f441a: ; f441a octave 5 note D_, 16 loopchannel 0, Music_CeladonCity_branch_f441a -; f4463 -Music_CeladonCity_branch_f4463: ; f4463 +Music_CeladonCity_branch_f4463: intensity $b2 octave 4 note B_, 4 @@ -237,9 +231,8 @@ Music_CeladonCity_branch_f4463: ; f4463 note B_, 2 note A_, 8 endchannel -; f4474 -Music_CeladonCity_branch_f4474: ; f4474 +Music_CeladonCity_branch_f4474: note G_, 3 note B_, 1 octave 2 @@ -270,11 +263,10 @@ Music_CeladonCity_branch_f4474: ; f4474 note D_, 2 note F#, 4 endchannel -; f4492 -Music_CeladonCity_Ch3: ; f4492 +Music_CeladonCity_Ch3: vibrato $12, $24 -Music_CeladonCity_branch_f4495: ; f4495 +Music_CeladonCity_branch_f4495: notetype $c, $25 octave 3 note A_, 2 @@ -283,7 +275,7 @@ Music_CeladonCity_branch_f4495: ; f4495 note __, 2 note D_, 8 callchannel Music_CeladonCity_branch_f44fd -Music_CeladonCity_branch_f44a1: ; f44a1 +Music_CeladonCity_branch_f44a1: octave 2 note A_, 2 note __, 2 @@ -363,9 +355,8 @@ Music_CeladonCity_branch_f44a1: ; f44a1 note D_, 2 note __, 6 loopchannel 0, Music_CeladonCity_branch_f4495 -; f44fd -Music_CeladonCity_branch_f44fd: ; f44fd +Music_CeladonCity_branch_f44fd: octave 2 note G_, 2 note __, 2 @@ -382,9 +373,8 @@ Music_CeladonCity_branch_f44fd: ; f44fd octave 2 note G#, 1 endchannel -; f4510 -Music_CeladonCity_branch_f4510: ; f4510 +Music_CeladonCity_branch_f4510: octave 5 note D_, 8 note C_, 2 @@ -393,4 +383,3 @@ Music_CeladonCity_branch_f4510: ; f4510 note A_, 2 note B_, 2 endchannel -; f4518 diff --git a/audio/music/championbattle.asm b/audio/music/championbattle.asm index 297325803..e732d39c7 100644 --- a/audio/music/championbattle.asm +++ b/audio/music/championbattle.asm @@ -1,10 +1,9 @@ -Music_ChampionBattle: ; ea9c1 +Music_ChampionBattle: musicheader 3, 1, Music_ChampionBattle_Ch1 musicheader 1, 2, Music_ChampionBattle_Ch2 musicheader 1, 3, Music_ChampionBattle_Ch3 -; ea9ca -Music_ChampionBattle_Ch1: ; ea9ca +Music_ChampionBattle_Ch1: tempo 98 volume $77 dutycycle $3 @@ -18,7 +17,7 @@ Music_ChampionBattle_Ch1: ; ea9ca note A#, 4 intensity $b7 note B_, 4 -Music_ChampionBattle_branch_ea9e2: ; ea9e2 +Music_ChampionBattle_branch_ea9e2: callchannel Music_ChampionBattle_branch_eaaee octave 3 note D#, 4 @@ -26,11 +25,11 @@ Music_ChampionBattle_branch_ea9e2: ; ea9e2 callchannel Music_ChampionBattle_branch_eaaee octave 3 note E_, 4 -Music_ChampionBattle_branch_ea9f0: ; ea9f0 +Music_ChampionBattle_branch_ea9f0: callchannel Music_ChampionBattle_branch_eaafc loopchannel 3, Music_ChampionBattle_branch_ea9f0 callchannel Music_ChampionBattle_branch_eab06 -Music_ChampionBattle_branch_ea9fa: ; ea9fa +Music_ChampionBattle_branch_ea9fa: callchannel Music_ChampionBattle_branch_eaafc loopchannel 7, Music_ChampionBattle_branch_ea9fa callchannel Music_ChampionBattle_branch_eab06 @@ -73,13 +72,13 @@ Music_ChampionBattle_branch_ea9fa: ; ea9fa octave 4 note C_, 1 note C#, 1 -Music_ChampionBattle_branch_eaa35: ; eaa35 +Music_ChampionBattle_branch_eaa35: callchannel Music_ChampionBattle_branch_eab0f note E_, 2 note E_, 2 intensity $b7 note F#, 4 -Music_ChampionBattle_branch_eaa3d: ; eaa3d +Music_ChampionBattle_branch_eaa3d: intensity $b2 note E_, 2 note E_, 2 @@ -167,7 +166,7 @@ Music_ChampionBattle_branch_eaa3d: ; eaa3d intensity $90 note D#, 16 note C#, 16 -Music_ChampionBattle_branch_eaab1: ; eaab1 +Music_ChampionBattle_branch_eaab1: intensity $b2 octave 2 note A#, 2 @@ -176,7 +175,7 @@ Music_ChampionBattle_branch_eaab1: ; eaab1 octave 3 note D#, 4 loopchannel 4, Music_ChampionBattle_branch_eaab1 -Music_ChampionBattle_branch_eaabe: ; eaabe +Music_ChampionBattle_branch_eaabe: intensity $b2 note C_, 2 note C_, 2 @@ -207,9 +206,8 @@ Music_ChampionBattle_branch_eaabe: ; eaabe octave 4 note D_, 4 loopchannel 0, Music_ChampionBattle_branch_eaa35 -; eaaee -Music_ChampionBattle_branch_eaaee: ; eaaee +Music_ChampionBattle_branch_eaaee: intensity $b2 octave 2 note A#, 2 @@ -222,9 +220,8 @@ Music_ChampionBattle_branch_eaaee: ; eaaee note A#, 2 intensity $b7 endchannel -; eaafc -Music_ChampionBattle_branch_eaafc: ; eaafc +Music_ChampionBattle_branch_eaafc: intensity $b2 octave 2 note A#, 2 @@ -233,9 +230,8 @@ Music_ChampionBattle_branch_eaafc: ; eaafc octave 3 note D#, 4 endchannel -; eab06 -Music_ChampionBattle_branch_eab06: ; eab06 +Music_ChampionBattle_branch_eab06: intensity $b2 octave 2 note A#, 2 @@ -243,9 +239,8 @@ Music_ChampionBattle_branch_eab06: ; eab06 intensity $b7 note B_, 4 endchannel -; eab0f -Music_ChampionBattle_branch_eab0f: ; eab0f +Music_ChampionBattle_branch_eab0f: intensity $b5 octave 3 note D#, 2 @@ -265,9 +260,8 @@ Music_ChampionBattle_branch_eab0f: ; eab0f note G_, 2 intensity $b2 endchannel -; eab24 -Music_ChampionBattle_branch_eab24: ; eab24 +Music_ChampionBattle_branch_eab24: intensity $b2 octave 3 note A#, 2 @@ -279,9 +273,8 @@ Music_ChampionBattle_branch_eab24: ; eab24 note A#, 2 intensity $b7 endchannel -; eab31 -Music_ChampionBattle_branch_eab31: ; eab31 +Music_ChampionBattle_branch_eab31: intensity $b2 note D#, 2 note D#, 2 @@ -300,9 +293,8 @@ Music_ChampionBattle_branch_eab31: ; eab31 note C#, 4 intensity $b2 endchannel -; eab4a -Music_ChampionBattle_Ch2: ; eab4a +Music_ChampionBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -357,7 +349,7 @@ Music_ChampionBattle_Ch2: ; eab4a note E_, 8 intensity $3c note E_, 8 -Music_ChampionBattle_branch_eab9d: ; eab9d +Music_ChampionBattle_branch_eab9d: intensity $c5 note D#, 6 octave 3 @@ -425,7 +417,7 @@ Music_ChampionBattle_branch_eab9d: ; eab9d note F_, 16 note F#, 16 intensity $c4 -Music_ChampionBattle_branch_eabef: ; eabef +Music_ChampionBattle_branch_eabef: octave 5 note D#, 4 note D_, 4 @@ -498,9 +490,8 @@ Music_ChampionBattle_branch_eabef: ; eabef note F#, 8 note G#, 8 loopchannel 0, Music_ChampionBattle_branch_eab9d -; eac4f -Music_ChampionBattle_branch_eac4f: ; eac4f +Music_ChampionBattle_branch_eac4f: intensity $c2 note D#, 2 note D#, 6 @@ -512,9 +503,8 @@ Music_ChampionBattle_branch_eac4f: ; eac4f note D#, 2 intensity $c7 endchannel -; eac5c -Music_ChampionBattle_branch_eac5c: ; eac5c +Music_ChampionBattle_branch_eac5c: intensity $c2 octave 3 note D#, 2 @@ -536,9 +526,8 @@ Music_ChampionBattle_branch_eac5c: ; eac5c note D#, 2 intensity $c7 endchannel -; eac79 -Music_ChampionBattle_branch_eac79: ; eac79 +Music_ChampionBattle_branch_eac79: intensity $c1 note D#, 2 note D#, 4 @@ -549,11 +538,10 @@ Music_ChampionBattle_branch_eac79: ; eac79 note D#, 2 intensity $c5 endchannel -; eac85 -Music_ChampionBattle_Ch3: ; eac85 +Music_ChampionBattle_Ch3: notetype $c, $14 -Music_ChampionBattle_branch_eac88: ; eac88 +Music_ChampionBattle_branch_eac88: octave 3 note D#, 1 note __, 7 @@ -601,11 +589,11 @@ Music_ChampionBattle_branch_eac88: ; eac88 note A#, 2 note F_, 2 note A_, 2 -Music_ChampionBattle_branch_eacc6: ; eacc6 +Music_ChampionBattle_branch_eacc6: note D#, 2 note A#, 2 loopchannel 8, Music_ChampionBattle_branch_eacc6 -Music_ChampionBattle_branch_eaccc: ; eaccc +Music_ChampionBattle_branch_eaccc: note E_, 2 note B_, 2 loopchannel 5, Music_ChampionBattle_branch_eaccc @@ -617,11 +605,11 @@ Music_ChampionBattle_branch_eaccc: ; eaccc note B_, 2 note G_, 2 note A_, 2 -Music_ChampionBattle_branch_eacda: ; eacda +Music_ChampionBattle_branch_eacda: note D#, 2 note A#, 2 loopchannel 8, Music_ChampionBattle_branch_eacda -Music_ChampionBattle_branch_eace0: ; eace0 +Music_ChampionBattle_branch_eace0: note E_, 2 note B_, 2 loopchannel 8, Music_ChampionBattle_branch_eace0 @@ -652,7 +640,7 @@ Music_ChampionBattle_branch_eace0: ; eace0 note D#, 8 note B_, 8 note D#, 8 -Music_ChampionBattle_branch_ead05: ; ead05 +Music_ChampionBattle_branch_ead05: note D#, 2 note F#, 2 loopchannel 16, Music_ChampionBattle_branch_ead05 @@ -670,12 +658,12 @@ Music_ChampionBattle_branch_ead05: ; ead05 note D#, 2 note E_, 2 callchannel Music_ChampionBattle_branch_ead8e -Music_ChampionBattle_branch_ead1d: ; ead1d +Music_ChampionBattle_branch_ead1d: octave 3 note E_, 2 note B_, 2 loopchannel 4, Music_ChampionBattle_branch_ead1d -Music_ChampionBattle_branch_ead24: ; ead24 +Music_ChampionBattle_branch_ead24: note D#, 2 note A#, 2 loopchannel 5, Music_ChampionBattle_branch_ead24 @@ -687,7 +675,7 @@ Music_ChampionBattle_branch_ead24: ; ead24 note __, 2 note D#, 2 note __, 2 -Music_ChampionBattle_branch_ead32: ; ead32 +Music_ChampionBattle_branch_ead32: note E_, 2 note B_, 2 loopchannel 5, Music_ChampionBattle_branch_ead32 @@ -699,17 +687,17 @@ Music_ChampionBattle_branch_ead32: ; ead32 note __, 2 note E_, 2 note __, 2 -Music_ChampionBattle_branch_ead40: ; ead40 +Music_ChampionBattle_branch_ead40: note D#, 2 note G#, 2 loopchannel 8, Music_ChampionBattle_branch_ead40 -Music_ChampionBattle_branch_ead46: ; ead46 +Music_ChampionBattle_branch_ead46: note D#, 2 note A#, 2 loopchannel 7, Music_ChampionBattle_branch_ead46 note B_, 2 note A#, 2 -Music_ChampionBattle_branch_ead4e: ; ead4e +Music_ChampionBattle_branch_ead4e: octave 3 note D#, 2 note A#, 2 @@ -723,9 +711,8 @@ Music_ChampionBattle_branch_ead4e: ; ead4e note A#, 2 note G#, 2 loopchannel 0, Music_ChampionBattle_branch_eacc6 -; ead61 -Music_ChampionBattle_branch_ead61: ; ead61 +Music_ChampionBattle_branch_ead61: note D#, 1 note __, 1 note D#, 1 @@ -737,9 +724,8 @@ Music_ChampionBattle_branch_ead61: ; ead61 note __, 1 note B_, 4 endchannel -; ead6f -Music_ChampionBattle_branch_ead6f: ; ead6f +Music_ChampionBattle_branch_ead6f: note D#, 1 note __, 1 note D#, 1 @@ -760,9 +746,8 @@ Music_ChampionBattle_branch_ead6f: ; ead6f note D#, 1 note __, 1 endchannel -; ead83 -Music_ChampionBattle_branch_ead83: ; ead83 +Music_ChampionBattle_branch_ead83: octave 3 note D#, 2 note F#, 2 @@ -774,9 +759,8 @@ Music_ChampionBattle_branch_ead83: ; ead83 note C#, 2 note C_, 2 endchannel -; ead8e -Music_ChampionBattle_branch_ead8e: ; ead8e +Music_ChampionBattle_branch_ead8e: octave 3 note E_, 2 note B_, 2 @@ -788,4 +772,3 @@ Music_ChampionBattle_branch_ead8e: ; ead8e note D#, 2 note E_, 2 endchannel -; ead99 diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm index e327eba1f..9a7e09808 100644 --- a/audio/music/cherrygrovecity.asm +++ b/audio/music/cherrygrovecity.asm @@ -1,11 +1,10 @@ -Music_CherrygroveCity: ; f5b03 +Music_CherrygroveCity: 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 +Music_CherrygroveCity_Ch1: tempo 152 volume $77 dutycycle $3 @@ -18,7 +17,7 @@ Music_CherrygroveCity_Ch1: ; f5b0f note C_, 2 note D_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5b26: ; f5b26 +Music_CherrygroveCity_branch_f5b26: note A_, 4 note G#, 2 note A_, 2 @@ -92,9 +91,8 @@ Music_CherrygroveCity_branch_f5b26: ; f5b26 octave 3 note C_, 4 loopchannel 0, Music_CherrygroveCity_branch_f5b26 -; f5b74 -Music_CherrygroveCity_Ch2: ; f5b74 +Music_CherrygroveCity_Ch2: dutycycle $3 vibrato $10, $36 stereopanning $f @@ -108,7 +106,7 @@ Music_CherrygroveCity_Ch2: ; f5b74 note G_, 2 note A_, 2 note A#, 2 -Music_CherrygroveCity_branch_f5b87: ; f5b87 +Music_CherrygroveCity_branch_f5b87: intensity $c6 octave 4 note C_, 6 @@ -173,9 +171,8 @@ Music_CherrygroveCity_branch_f5b87: ; f5b87 intensity $a7 note F_, 8 loopchannel 0, Music_CherrygroveCity_branch_f5b87 -; f5bd8 -Music_CherrygroveCity_Ch3: ; f5bd8 +Music_CherrygroveCity_Ch3: notetype $c, $16 note __, 4 octave 4 @@ -186,7 +183,7 @@ Music_CherrygroveCity_Ch3: ; f5bd8 note G_, 2 note F_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5be4: ; f5be4 +Music_CherrygroveCity_branch_f5be4: note A_, 2 note F_, 2 note A_, 2 @@ -284,13 +281,12 @@ Music_CherrygroveCity_branch_f5be4: ; f5be4 note F_, 2 note A_, 2 loopchannel 0, Music_CherrygroveCity_branch_f5be4 -; f5c48 -Music_CherrygroveCity_Ch4: ; f5c48 +Music_CherrygroveCity_Ch4: togglenoise $3 notetype $c note __, 16 -Music_CherrygroveCity_branch_f5c4d: ; f5c4d +Music_CherrygroveCity_branch_f5c4d: note C#, 2 note __, 2 note G_, 2 @@ -307,4 +303,3 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d note C#, 2 note G_, 2 loopchannel 0, Music_CherrygroveCity_branch_f5c4d -; f5c60 diff --git a/audio/music/clair.asm b/audio/music/clair.asm index bedfc4dee..90d676cf0 100644 --- a/audio/music/clair.asm +++ b/audio/music/clair.asm @@ -1,11 +1,10 @@ -Music_Clair: ; 1fa8d +Music_Clair: 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 +Music_Clair_Ch1: tempo 136 volume $77 tone $0001 @@ -13,7 +12,7 @@ Music_Clair_Ch1: ; 1fa99 stereopanning $f notetype $c, $93 dutycycle $3 -Music_Clair_branch_1faab: ; 1faab +Music_Clair_branch_1faab: octave 4 note F_, 1 note F#, 1 @@ -37,7 +36,7 @@ Music_Clair_branch_1faab: ; 1faab note D#, 4 note F_, 4 note G_, 4 -Music_Clair_branch_1fac9: ; 1fac9 +Music_Clair_branch_1fac9: intensity $93 callchannel Music_Clair_branch_1fb12 octave 2 @@ -95,9 +94,8 @@ Music_Clair_branch_1fac9: ; 1fac9 octave 4 note D#, 1 loopchannel 0, Music_Clair_branch_1fac9 -; 1fb12 -Music_Clair_branch_1fb12: ; 1fb12 +Music_Clair_branch_1fb12: dutycycle $3 stereopanning $ff octave 3 @@ -122,9 +120,8 @@ Music_Clair_branch_1fb12: ; 1fb12 note C#, 1 note __, 1 endchannel -; 1fb2e -Music_Clair_branch_1fb2e: ; 1fb2e +Music_Clair_branch_1fb2e: octave 4 note F#, 1 note D#, 1 @@ -144,13 +141,12 @@ Music_Clair_branch_1fb2e: ; 1fb2e note D#, 1 note F#, 1 endchannel -; 1fb41 -Music_Clair_Ch2: ; 1fb41 +Music_Clair_Ch2: dutycycle $3 vibrato $12, $34 notetype $6, $b7 -Music_Clair_branch_1fb49: ; 1fb49 +Music_Clair_branch_1fb49: octave 3 note A#, 2 note B_, 2 @@ -189,7 +185,7 @@ Music_Clair_branch_1fb49: ; 1fb49 note G_, 2 note A#, 2 intensity $b7 -Music_Clair_branch_1fb77: ; 1fb77 +Music_Clair_branch_1fb77: callchannel Music_Clair_branch_1fba6 note F#, 2 note __, 4 @@ -228,9 +224,8 @@ Music_Clair_branch_1fb77: ; 1fb77 note G#, 16 note __, 4 loopchannel 0, Music_Clair_branch_1fb77 -; 1fba6 -Music_Clair_branch_1fba6: ; 1fba6 +Music_Clair_branch_1fba6: octave 4 note F#, 2 note __, 4 @@ -250,9 +245,8 @@ Music_Clair_branch_1fba6: ; 1fba6 note D#, 16 note __, 4 endchannel -; 1fbb9 -Music_Clair_Ch3: ; 1fbb9 +Music_Clair_Ch3: notetype $c, $14 pitchoffset 0, CC octave 3 @@ -274,7 +268,7 @@ Music_Clair_Ch3: ; 1fbb9 note A#, 4 note G#, 4 note G_, 4 -Music_Clair_branch_1fbd1: ; 1fbd1 +Music_Clair_branch_1fbd1: callchannel Music_Clair_branch_1fc3c octave 2 note C#, 2 @@ -375,9 +369,8 @@ Music_Clair_branch_1fbd1: ; 1fbd1 octave 1 note G#, 1 loopchannel 0, Music_Clair_branch_1fbd1 -; 1fc3c -Music_Clair_branch_1fc3c: ; 1fc3c +Music_Clair_branch_1fc3c: octave 1 note G#, 2 note __, 1 @@ -393,9 +386,8 @@ Music_Clair_branch_1fc3c: ; 1fc3c octave 1 note G#, 2 endchannel -; 1fc4b -Music_Clair_Ch4: ; 1fc4b +Music_Clair_Ch4: togglenoise $3 notetype $c stereopanning $f0 @@ -411,7 +403,7 @@ Music_Clair_Ch4: ; 1fc4b note D_, 2 note D_, 1 note D_, 1 -Music_Clair_branch_1fc5e: ; 1fc5e +Music_Clair_branch_1fc5e: stereopanning $ff callchannel Music_Clair_branch_1fc6e note G_, 1 @@ -419,9 +411,8 @@ Music_Clair_branch_1fc5e: ; 1fc5e callchannel Music_Clair_branch_1fc6e note F#, 1 loopchannel 0, Music_Clair_branch_1fc5e -; 1fc6e -Music_Clair_branch_1fc6e: ; 1fc6e +Music_Clair_branch_1fc6e: note D#, 2 stereopanning $f0 note G_, 2 @@ -440,4 +431,3 @@ Music_Clair_branch_1fc6e: ; 1fc6e stereopanning $f0 note G_, 1 endchannel -; 1fc87 diff --git a/audio/music/contestresults.asm b/audio/music/contestresults.asm index e6d730daf..85d8291e7 100644 --- a/audio/music/contestresults.asm +++ b/audio/music/contestresults.asm @@ -1,15 +1,14 @@ -Music_ContestResults: ; efb3e +Music_ContestResults: 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 +Music_ContestResults_Ch1: tempo 144 volume $77 notetype $c, $51 -Music_ContestResults_branch_efb52: ; efb52 +Music_ContestResults_branch_efb52: note __, 2 octave 2 note G_, 1 @@ -48,11 +47,10 @@ Music_ContestResults_branch_efb52: ; efb52 note G_, 1 note __, 1 loopchannel 0, Music_ContestResults_branch_efb52 -; efb7b -Music_ContestResults_Ch2: ; efb7b +Music_ContestResults_Ch2: notetype $c, $61 -Music_ContestResults_branch_efb7e: ; efb7e +Music_ContestResults_branch_efb7e: octave 2 note C_, 2 octave 3 @@ -93,7 +91,7 @@ Music_ContestResults_branch_efb7e: ; efb7e octave 3 note F_, 1 note __, 1 -Music_ContestResults_branch_efba6: ; efba6 +Music_ContestResults_branch_efba6: octave 2 note D_, 2 octave 3 @@ -126,12 +124,11 @@ Music_ContestResults_branch_efba6: ; efba6 note D_, 1 note __, 1 loopchannel 0, Music_ContestResults_branch_efb7e -; efbcc -Music_ContestResults_Ch3: ; efbcc +Music_ContestResults_Ch3: vibrato $8, $24 notetype $c, $23 -Music_ContestResults_branch_efbd2: ; efbd2 +Music_ContestResults_branch_efbd2: octave 4 note E_, 5 note __, 1 @@ -152,12 +149,11 @@ Music_ContestResults_branch_efbd2: ; efbd2 note A_, 8 note G_, 8 loopchannel 0, Music_ContestResults_branch_efbd2 -; efbe9 -Music_ContestResults_Ch4: ; efbe9 +Music_ContestResults_Ch4: togglenoise $4 notetype $6 -Music_ContestResults_branch_efbed: ; efbed +Music_ContestResults_branch_efbed: note C#, 4 note C#, 4 note C#, 2 @@ -175,4 +171,3 @@ Music_ContestResults_branch_efbed: ; efbed note G_, 1 note G_, 1 loopchannel 0, Music_ContestResults_branch_efbed -; efc01 diff --git a/audio/music/credits.asm b/audio/music/credits.asm index 708b70ee4..8d862240b 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,11 +1,10 @@ -Music_Credits: ; 1f31c +Music_Credits: 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 +Music_Credits_Ch1: tempo 139 volume $77 stereopanning $f @@ -181,7 +180,7 @@ Music_Credits_Ch1: ; 1f328 octave 5 note C#, 6 notetype $c, $a7 -Music_Credits_branch_1f407: ; 1f407 +Music_Credits_branch_1f407: octave 3 note A_, 1 octave 4 @@ -280,9 +279,8 @@ Music_Credits_branch_1f407: ; 1f407 note __, 16 note __, 16 endchannel -; 1f483 -Music_Credits_branch_1f483: ; 1f483 +Music_Credits_branch_1f483: note C_, 16 note F#, 1 note G_, 3 @@ -389,9 +387,8 @@ Music_Credits_branch_1f483: ; 1f483 note C_, 1 note __, 1 endchannel -; 1f4ed -Music_Credits_branch_1f4ed: ; 1f4ed +Music_Credits_branch_1f4ed: octave 4 note C_, 4 octave 3 @@ -403,9 +400,8 @@ Music_Credits_branch_1f4ed: ; 1f4ed note C_, 4 note D#, 4 endchannel -; 1f4f8 -Music_Credits_branch_1f4f8: ; 1f4f8 +Music_Credits_branch_1f4f8: octave 3 note A_, 2 octave 4 @@ -503,9 +499,8 @@ Music_Credits_branch_1f4f8: ; 1f4f8 note C_, 2 note F_, 2 endchannel -; 1f559 -Music_Credits_branch_1f559: ; 1f559 +Music_Credits_branch_1f559: octave 3 note A_, 2 octave 4 @@ -547,9 +542,8 @@ Music_Credits_branch_1f559: ; 1f559 note A#, 2 note A_, 2 endchannel -; 1f582 -Music_Credits_branch_1f582: ; 1f582 +Music_Credits_branch_1f582: note __, 6 octave 3 note D_, 6 @@ -561,9 +555,8 @@ Music_Credits_branch_1f582: ; 1f582 note F#, 6 note C#, 6 endchannel -; 1f58d -Music_Credits_Ch2: ; 1f58d +Music_Credits_Ch2: dutycycle $1 vibrato $14, $23 notetype $c, $2f @@ -723,7 +716,7 @@ Music_Credits_Ch2: ; 1f58d octave 2 note F#, 1 note __, 1 -Music_Credits_branch_1f657: ; 1f657 +Music_Credits_branch_1f657: octave 1 note G_, 2 octave 2 @@ -818,9 +811,8 @@ Music_Credits_branch_1f657: ; 1f657 note __, 16 note __, 16 endchannel -; 1f6cb -Music_Credits_branch_1f6cb: ; 1f6cb +Music_Credits_branch_1f6cb: octave 2 note C_, 4 intensity $b1 @@ -931,9 +923,8 @@ Music_Credits_branch_1f6cb: ; 1f6cb octave 3 note C_, 2 endchannel -; 1f73f -Music_Credits_branch_1f73f: ; 1f73f +Music_Credits_branch_1f73f: octave 1 note G_, 4 note __, 4 @@ -943,9 +934,8 @@ Music_Credits_branch_1f73f: ; 1f73f note G_, 12 note F#, 8 endchannel -; 1f748 -Music_Credits_branch_1f748: ; 1f748 +Music_Credits_branch_1f748: octave 4 note A_, 8 note B_, 8 @@ -980,9 +970,8 @@ Music_Credits_branch_1f748: ; 1f748 octave 5 note C_, 4 endchannel -; 1f772 -Music_Credits_Ch3: ; 1f772 +Music_Credits_Ch3: vibrato $16, $23 notetype $c, $34 stereopanning $ff @@ -1238,9 +1227,8 @@ Music_Credits_Ch3: ; 1f772 note __, 16 note __, 16 endchannel -; 1f8aa -Music_Credits_branch_1f8aa: ; 1f8aa +Music_Credits_branch_1f8aa: note G_, 16 octave 6 note C#, 1 @@ -1280,9 +1268,8 @@ Music_Credits_branch_1f8aa: ; 1f8aa notetype $c, $14 note D_, 16 endchannel -; 1f8db -Music_Credits_branch_1f8db: ; 1f8db +Music_Credits_branch_1f8db: notetype $6, $14 note F#, 1 note G_, 3 @@ -1293,9 +1280,8 @@ Music_Credits_branch_1f8db: ; 1f8db note G_, 12 note G#, 8 endchannel -; 1f8e7 -Music_Credits_branch_1f8e7: ; 1f8e7 +Music_Credits_branch_1f8e7: octave 3 note F_, 4 note __, 2 @@ -1373,9 +1359,8 @@ Music_Credits_branch_1f8e7: ; 1f8e7 octave 3 note G#, 2 endchannel -; 1f934 -Music_Credits_branch_1f934: ; 1f934 +Music_Credits_branch_1f934: octave 2 note F_, 4 note __, 2 @@ -1399,9 +1384,8 @@ Music_Credits_branch_1f934: ; 1f934 note E_, 2 note F_, 2 endchannel -; 1f94b -Music_Credits_branch_1f94b: ; 1f94b +Music_Credits_branch_1f94b: octave 2 note F#, 4 note __, 2 @@ -1442,9 +1426,8 @@ Music_Credits_branch_1f94b: ; 1f94b note G_, 2 note D_, 2 endchannel -; 1f973 -Music_Credits_Ch4: ; 1f973 +Music_Credits_Ch4: togglenoise $3 notetype $c note G#, 1 @@ -1480,7 +1463,7 @@ Music_Credits_Ch4: ; 1f973 callchannel Music_Credits_branch_1fa4d callchannel Music_Credits_branch_1fa4d callchannel Music_Credits_branch_1fa6d -Music_Credits_branch_1f9a8: ; 1f9a8 +Music_Credits_branch_1f9a8: note A#, 2 note G_, 1 note G_, 1 @@ -1508,7 +1491,7 @@ Music_Credits_branch_1f9a8: ; 1f9a8 note C#, 1 note D_, 1 note D_, 1 -Music_Credits_branch_1f9c6: ; 1f9c6 +Music_Credits_branch_1f9c6: note A#, 2 note G_, 1 note G_, 1 @@ -1542,7 +1525,7 @@ Music_Credits_branch_1f9c6: ; 1f9c6 callchannel Music_Credits_branch_1fa4d callchannel Music_Credits_branch_1fa4d callchannel Music_Credits_branch_1fa6d -Music_Credits_branch_1f9f2: ; 1f9f2 +Music_Credits_branch_1f9f2: note A#, 2 note G_, 1 note G_, 1 @@ -1621,9 +1604,8 @@ Music_Credits_branch_1f9f2: ; 1f9f2 note __, 16 note __, 16 endchannel -; 1fa4d -Music_Credits_branch_1fa4d: ; 1fa4d +Music_Credits_branch_1fa4d: note G#, 1 note G_, 1 note G_, 1 @@ -1656,9 +1638,8 @@ Music_Credits_branch_1fa4d: ; 1fa4d note G_, 1 note F#, 2 endchannel -; 1fa6d -Music_Credits_branch_1fa6d: ; 1fa6d +Music_Credits_branch_1fa6d: note G#, 1 note G_, 1 note G_, 1 @@ -1691,4 +1672,3 @@ Music_Credits_branch_1fa6d: ; 1fa6d note A#, 1 note D_, 1 endchannel -; 1fa8d diff --git a/audio/music/crystalopening.asm b/audio/music/crystalopening.asm index e01d57d42..ca2e525de 100644 --- a/audio/music/crystalopening.asm +++ b/audio/music/crystalopening.asm @@ -1,11 +1,10 @@ -Music_CrystalOpening: ; 1786e8 +Music_CrystalOpening: 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 +Music_CrystalOpening_Ch1: tempo 136 volume $77 tone $0002 @@ -121,9 +120,8 @@ Music_CrystalOpening_Ch1: ; 1786f4 octave 2 note D_, 16 endchannel -; 17877a -Music_CrystalOpening_Ch2: ; 17877a +Music_CrystalOpening_Ch2: notetype $c, $a2 dutycycle $3 vibrato $8, $44 @@ -177,9 +175,8 @@ Music_CrystalOpening_Ch2: ; 17877a octave 3 note D_, 16 endchannel -; 1787c8 -Music_CrystalOpening_Ch3: ; 1787c8 +Music_CrystalOpening_Ch3: notetype $c, $16 octave 1 note B_, 4 @@ -242,9 +239,8 @@ Music_CrystalOpening_Ch3: ; 1787c8 note D_, 1 note __, 15 endchannel -; 178810 -Music_CrystalOpening_Ch4: ; 178810 +Music_CrystalOpening_Ch4: stereopanning $f togglenoise $3 notetype $c @@ -361,4 +357,3 @@ Music_CrystalOpening_Ch4: ; 178810 note __, 16 note __, 16 endchannel -; 178889 diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm index 1241d6076..6884000b9 100644 --- a/audio/music/dancinghall.asm +++ b/audio/music/dancinghall.asm @@ -1,19 +1,18 @@ -Music_DancingHall: ; ef9bc +Music_DancingHall: musicheader 3, 1, Music_DancingHall_Ch1 musicheader 1, 2, Music_DancingHall_Ch2 musicheader 1, 3, Music_DancingHall_Ch3 -; ef9c5 db $3 -Music_DancingHall_Ch1: ; ef9c6 +Music_DancingHall_Ch1: tempo 208 volume $77 stereopanning $f notetype $6, $b7 note __, 3 dutycycle $0 -Music_DancingHall_branch_ef9d3: ; ef9d3 +Music_DancingHall_branch_ef9d3: notetype $c, $b7 callchannel Music_DancingHall_branch_efa17 note __, 16 @@ -64,9 +63,8 @@ Music_DancingHall_branch_ef9d3: ; ef9d3 note __, 1 note F_, 2 loopchannel 0, Music_DancingHall_branch_ef9d3 -; efa17 -Music_DancingHall_branch_efa17: ; efa17 +Music_DancingHall_branch_efa17: octave 3 note B_, 1 note __, 1 @@ -88,15 +86,14 @@ Music_DancingHall_branch_efa17: ; efa17 note D_, 1 note __, 1 endchannel -; efa2c -Music_DancingHall_Ch2: ; efa2c +Music_DancingHall_Ch2: stereopanning $f0 notetype $6, $a1 dutycycle $0 vibrato $10, $24 note __, 3 -Music_DancingHall_branch_efa37: ; efa37 +Music_DancingHall_branch_efa37: notetype $6, $a2 callchannel Music_DancingHall_branch_efa7a callchannel Music_DancingHall_branch_efa7a @@ -144,9 +141,8 @@ Music_DancingHall_branch_efa37: ; efa37 note __, 1 note D_, 2 loopchannel 0, Music_DancingHall_branch_efa37 -; efa7a -Music_DancingHall_branch_efa7a: ; efa7a +Music_DancingHall_branch_efa7a: intensity $a1 octave 4 note E_, 4 @@ -222,9 +218,8 @@ Music_DancingHall_branch_efa7a: ; efa7a octave 4 note D_, 1 endchannel -; efad6 -Music_DancingHall_Ch3: ; efad6 +Music_DancingHall_Ch3: stereopanning $ff vibrato $16, $24 notetype $6, $10 @@ -233,7 +228,7 @@ Music_DancingHall_Ch3: ; efad6 note B_, 1 octave 6 note D_, 1 -Music_DancingHall_branch_efae3: ; efae3 +Music_DancingHall_branch_efae3: note E_, 13 note D_, 1 note E_, 1 @@ -308,4 +303,3 @@ Music_DancingHall_branch_efae3: ; efae3 octave 6 note D_, 1 loopchannel 0, Music_DancingHall_branch_efae3 -; efb3e diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm index 89f9bc56b..8d2877d06 100644 --- a/audio/music/darkcave.asm +++ b/audio/music/darkcave.asm @@ -1,11 +1,10 @@ -Music_DarkCave: ; ea2be +Music_DarkCave: 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 +Music_DarkCave_Ch1: tempo 128 volume $77 dutycycle $3 @@ -13,7 +12,7 @@ Music_DarkCave_Ch1: ; ea2ca vibrato $11, $15 stereopanning $f0 notetype $c, $a7 -Music_DarkCave_branch_ea2dc: ; ea2dc +Music_DarkCave_branch_ea2dc: note __, 16 loopchannel 4, Music_DarkCave_branch_ea2dc octave 3 @@ -22,7 +21,7 @@ Music_DarkCave_branch_ea2dc: ; ea2dc note C#, 16 note C_, 16 intensity $a3 -Music_DarkCave_branch_ea2e8: ; ea2e8 +Music_DarkCave_branch_ea2e8: callchannel Music_DarkCave_branch_ea333 loopchannel 3, Music_DarkCave_branch_ea2e8 intensity $b7 @@ -43,7 +42,7 @@ Music_DarkCave_branch_ea2e8: ; ea2e8 note D#, 8 note C_, 8 intensity $a3 -Music_DarkCave_branch_ea303: ; ea303 +Music_DarkCave_branch_ea303: callchannel Music_DarkCave_branch_ea333 loopchannel 2, Music_DarkCave_branch_ea303 note __, 16 @@ -74,13 +73,12 @@ Music_DarkCave_branch_ea303: ; ea303 note G_, 2 note G#, 4 intensity $a3 -Music_DarkCave_branch_ea328: ; ea328 +Music_DarkCave_branch_ea328: callchannel Music_DarkCave_branch_ea333 loopchannel 2, Music_DarkCave_branch_ea328 loopchannel 0, Music_DarkCave_branch_ea2e8 -; ea333 -Music_DarkCave_branch_ea333: ; ea333 +Music_DarkCave_branch_ea333: octave 4 note D#, 2 octave 3 @@ -136,14 +134,13 @@ Music_DarkCave_branch_ea333: ; ea333 octave 3 note A#, 2 endchannel -; ea36a -Music_DarkCave_Ch2: ; ea36a +Music_DarkCave_Ch2: dutycycle $1 vibrato $12, $36 stereopanning $f notetype $c, $a7 -Music_DarkCave_branch_ea374: ; ea374 +Music_DarkCave_branch_ea374: note __, 16 loopchannel 4, Music_DarkCave_branch_ea374 octave 3 @@ -151,7 +148,7 @@ Music_DarkCave_branch_ea374: ; ea374 note A#, 16 note F_, 16 note G_, 16 -Music_DarkCave_branch_ea37e: ; ea37e +Music_DarkCave_branch_ea37e: note __, 16 loopchannel 4, Music_DarkCave_branch_ea37e note __, 8 @@ -347,14 +344,13 @@ Music_DarkCave_branch_ea37e: ; ea37e note F_, 16 note D#, 16 loopchannel 0, Music_DarkCave_branch_ea37e -; ea46e -Music_DarkCave_Ch3: ; ea46e +Music_DarkCave_Ch3: notetype $c, $27 -Music_DarkCave_branch_ea471: ; ea471 +Music_DarkCave_branch_ea471: callchannel Music_DarkCave_branch_ea4ce loopchannel 2, Music_DarkCave_branch_ea471 -Music_DarkCave_branch_ea478: ; ea478 +Music_DarkCave_branch_ea478: callchannel Music_DarkCave_branch_ea4ce loopchannel 7, Music_DarkCave_branch_ea478 callchannel Music_DarkCave_branch_ea4c3 @@ -386,9 +382,8 @@ Music_DarkCave_branch_ea478: ; ea478 callchannel Music_DarkCave_branch_ea4a7 callchannel Music_DarkCave_branch_ea4a7 loopchannel 0, Music_DarkCave_branch_ea478 -; ea4a7 -Music_DarkCave_branch_ea4a7: ; ea4a7 +Music_DarkCave_branch_ea4a7: octave 3 note C_, 4 note G_, 2 @@ -417,9 +412,8 @@ Music_DarkCave_branch_ea4a7: ; ea4a7 note C_, 2 note C#, 4 endchannel -; ea4c3 -Music_DarkCave_branch_ea4c3: ; ea4c3 +Music_DarkCave_branch_ea4c3: octave 3 note C_, 4 note G_, 2 @@ -431,9 +425,8 @@ Music_DarkCave_branch_ea4c3: ; ea4c3 octave 2 note A#, 12 endchannel -; ea4ce -Music_DarkCave_branch_ea4ce: ; ea4ce +Music_DarkCave_branch_ea4ce: octave 2 note C_, 4 note G_, 2 @@ -462,12 +455,11 @@ Music_DarkCave_branch_ea4ce: ; ea4ce note C_, 2 note C#, 4 endchannel -; ea4ea -Music_DarkCave_Ch4: ; ea4ea +Music_DarkCave_Ch4: togglenoise $3 notetype $c -Music_DarkCave_branch_ea4ee: ; ea4ee +Music_DarkCave_branch_ea4ee: stereopanning $ff note D#, 8 note D#, 8 @@ -489,4 +481,3 @@ Music_DarkCave_branch_ea4ee: ; ea4ee note C#, 2 note C#, 2 loopchannel 0, Music_DarkCave_branch_ea4ee -; ea50d diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm index 6778a09b2..2dc0ae09a 100644 --- a/audio/music/dragonsden.asm +++ b/audio/music/dragonsden.asm @@ -1,18 +1,17 @@ -Music_DragonsDen: ; eece8 +Music_DragonsDen: 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 +Music_DragonsDen_Ch1: tempo 144 volume $77 dutycycle $0 tone $0004 stereopanning $f0 notetype $c, $80 -Music_DragonsDen_branch_eed03: ; eed03 +Music_DragonsDen_branch_eed03: callchannel Music_DragonsDen_branch_eed1e note __, 16 callchannel Music_DragonsDen_branch_eed2d @@ -25,9 +24,8 @@ Music_DragonsDen_branch_eed03: ; eed03 note __, 10 notetype $c, $b7 loopchannel 0, Music_DragonsDen_branch_eed03 -; eed1e -Music_DragonsDen_branch_eed1e: ; eed1e +Music_DragonsDen_branch_eed1e: octave 3 note A#, 12 note A_, 4 @@ -43,9 +41,8 @@ Music_DragonsDen_branch_eed1e: ; eed1e octave 3 note G#, 16 endchannel -; eed2d -Music_DragonsDen_branch_eed2d: ; eed2d +Music_DragonsDen_branch_eed2d: intensity $b1 note __, 2 octave 4 @@ -60,14 +57,13 @@ Music_DragonsDen_branch_eed2d: ; eed2d note C#, 2 note C#, 2 endchannel -; eed3c -Music_DragonsDen_Ch2: ; eed3c +Music_DragonsDen_Ch2: dutycycle $0 tone $0004 stereopanning $f notetype $c, $90 -Music_DragonsDen_branch_eed46: ; eed46 +Music_DragonsDen_branch_eed46: callchannel Music_DragonsDen_branch_eed5e note __, 16 callchannel Music_DragonsDen_branch_eed6b @@ -77,9 +73,8 @@ Music_DragonsDen_branch_eed46: ; eed46 note __, 16 notetype $c, $c7 loopchannel 0, Music_DragonsDen_branch_eed46 -; eed5e -Music_DragonsDen_branch_eed5e: ; eed5e +Music_DragonsDen_branch_eed5e: octave 4 note D#, 12 note D_, 4 @@ -93,11 +88,10 @@ Music_DragonsDen_branch_eed5e: ; eed5e note G_, 4 note C#, 16 endchannel -; eed6b -Music_DragonsDen_branch_eed6b: ; eed6b +Music_DragonsDen_branch_eed6b: intensity $c1 -Music_DragonsDen_branch_eed6d: ; eed6d +Music_DragonsDen_branch_eed6d: octave 5 note C#, 4 octave 4 @@ -106,10 +100,9 @@ Music_DragonsDen_branch_eed6d: ; eed6d note G#, 4 loopchannel 2, Music_DragonsDen_branch_eed6d endchannel -; eed78 -Music_DragonsDen_Ch3: ; eed78 -Music_DragonsDen_branch_eed78: ; eed78 +Music_DragonsDen_Ch3: +Music_DragonsDen_branch_eed78: notetype $c, $14 octave 4 note C#, 2 @@ -136,7 +129,7 @@ Music_DragonsDen_branch_eed78: ; eed78 loopchannel 15, Music_DragonsDen_branch_eed78 note __, 16 notetype $6, $27 -Music_DragonsDen_branch_eed99: ; eed99 +Music_DragonsDen_branch_eed99: octave 3 note C#, 4 octave 2 @@ -161,14 +154,13 @@ Music_DragonsDen_branch_eed99: ; eed99 note C#, 2 loopchannel 16, Music_DragonsDen_branch_eed99 loopchannel 0, Music_DragonsDen_branch_eed78 -; eedb7 -Music_DragonsDen_Ch4: ; eedb7 +Music_DragonsDen_Ch4: togglenoise $0 notetype $c note __, 16 note __, 16 -Music_DragonsDen_branch_eedbd: ; eedbd +Music_DragonsDen_branch_eedbd: stereopanning $f0 note F_, 4 stereopanning $f @@ -177,4 +169,3 @@ Music_DragonsDen_branch_eedbd: ; eedbd stereopanning $f0 note F#, 4 loopchannel 0, Music_DragonsDen_branch_eedbd -; eedcb diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm index 77b349295..df60e9eb0 100644 --- a/audio/music/ecruteakcity.asm +++ b/audio/music/ecruteakcity.asm @@ -1,16 +1,15 @@ -Music_EcruteakCity: ; ef2d0 +Music_EcruteakCity: musicheader 3, 1, Music_EcruteakCity_Ch1 musicheader 1, 2, Music_EcruteakCity_Ch2 musicheader 1, 3, Music_EcruteakCity_Ch3 -; ef2d9 -Music_EcruteakCity_Ch1: ; ef2d9 +Music_EcruteakCity_Ch1: tempo 197 volume $77 stereopanning $f vibrato $12, $25 dutycycle $2 -Music_EcruteakCity_branch_ef2e5: ; ef2e5 +Music_EcruteakCity_branch_ef2e5: notetype $c, $57 note __, 10 octave 4 @@ -145,9 +144,8 @@ Music_EcruteakCity_branch_ef2e5: ; ef2e5 note C_, 2 callchannel Music_EcruteakCity_branch_ef391 loopchannel 0, Music_EcruteakCity_branch_ef2e5 -; ef37f -Music_EcruteakCity_branch_ef37f: ; ef37f +Music_EcruteakCity_branch_ef37f: octave 5 note E_, 2 note C_, 2 @@ -163,9 +161,8 @@ Music_EcruteakCity_branch_ef37f: ; ef37f note C_, 2 loopchannel 2, Music_EcruteakCity_branch_ef37f endchannel -; ef391 -Music_EcruteakCity_branch_ef391: ; ef391 +Music_EcruteakCity_branch_ef391: octave 5 note D_, 2 octave 4 @@ -211,7 +208,7 @@ Music_EcruteakCity_branch_ef391: ; ef391 note C_, 2 octave 3 note A_, 2 -Music_EcruteakCity_branch_ef3be: ; ef3be +Music_EcruteakCity_branch_ef3be: octave 4 note F_, 2 note A_, 2 @@ -227,7 +224,7 @@ Music_EcruteakCity_branch_ef3be: ; ef3be note C_, 2 note F_, 2 loopchannel 2, Music_EcruteakCity_branch_ef3be -Music_EcruteakCity_branch_ef3d0: ; ef3d0 +Music_EcruteakCity_branch_ef3d0: octave 4 note G_, 2 note B_, 2 @@ -249,13 +246,12 @@ Music_EcruteakCity_branch_ef3d0: ; ef3d0 note G_, 16 dutycycle $2 endchannel -; ef3eb -Music_EcruteakCity_Ch2: ; ef3eb +Music_EcruteakCity_Ch2: vibrato $12, $25 dutycycle $3 stereopanning $f0 -Music_EcruteakCity_branch_ef3f2: ; ef3f2 +Music_EcruteakCity_branch_ef3f2: notetype $6, $67 note __, 16 note __, 5 @@ -472,11 +468,10 @@ Music_EcruteakCity_branch_ef3f2: ; ef3f2 note D_, 2 note E_, 16 loopchannel 0, Music_EcruteakCity_branch_ef3f2 -; ef4e1 -Music_EcruteakCity_Ch3: ; ef4e1 +Music_EcruteakCity_Ch3: stereopanning $ff -Music_EcruteakCity_branch_ef4e3: ; ef4e3 +Music_EcruteakCity_branch_ef4e3: vibrato $12, $25 notetype $c, $25 octave 3 @@ -598,9 +593,8 @@ Music_EcruteakCity_branch_ef4e3: ; ef4e3 note E_, 8 note D_, 8 loopchannel 0, Music_EcruteakCity_branch_ef4e3 -; ef569 -Music_EcruteakCity_branch_ef569: ; ef569 +Music_EcruteakCity_branch_ef569: octave 3 note F_, 4 note __, 2 @@ -671,4 +665,3 @@ Music_EcruteakCity_branch_ef569: ; ef569 note __, 1 note B_, 1 endchannel -; ef5b1 diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm index 39bf03a9b..38b04b590 100644 --- a/audio/music/elmslab.asm +++ b/audio/music/elmslab.asm @@ -1,11 +1,10 @@ -Music_ElmsLab: ; ea040 +Music_ElmsLab: 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 +Music_ElmsLab_Ch1: tempo 144 volume $77 dutycycle $3 @@ -34,7 +33,7 @@ Music_ElmsLab_Ch1: ; ea04c note A_, 4 note A_, 4 note A_, 2 -Music_ElmsLab_branch_ea075: ; ea075 +Music_ElmsLab_branch_ea075: note __, 2 note A_, 2 note G#, 2 @@ -182,9 +181,8 @@ Music_ElmsLab_branch_ea075: ; ea075 note F_, 2 note F_, 4 loopchannel 0, Music_ElmsLab_branch_ea075 -; ea128 -Music_ElmsLab_Ch2: ; ea128 +Music_ElmsLab_Ch2: dutycycle $3 vibrato $10, $26 stereopanning $f @@ -214,7 +212,7 @@ Music_ElmsLab_Ch2: ; ea128 note C_, 4 note C_, 2 stereopanning $ff -Music_ElmsLab_branch_ea14f: ; ea14f +Music_ElmsLab_branch_ea14f: intensity $c6 octave 4 note F_, 6 @@ -350,9 +348,8 @@ Music_ElmsLab_branch_ea14f: ; ea14f octave 3 note E_, 2 loopchannel 0, Music_ElmsLab_branch_ea14f -; ea1fd -Music_ElmsLab_Ch3: ; ea1fd +Music_ElmsLab_Ch3: stereopanning $f notetype $c, $25 note __, 8 @@ -375,7 +372,7 @@ Music_ElmsLab_Ch3: ; ea1fd note C_, 2 note D_, 2 note E_, 2 -Music_ElmsLab_branch_ea216: ; ea216 +Music_ElmsLab_branch_ea216: note F_, 2 note A_, 2 note C_, 2 @@ -528,15 +525,13 @@ Music_ElmsLab_branch_ea216: ; ea216 note F_, 2 note A_, 2 loopchannel 0, Music_ElmsLab_branch_ea216 -; ea2b1 -Music_ElmsLab_Ch4: ; ea2b1 +Music_ElmsLab_Ch4: stereopanning $f0 togglenoise $0 notetype $c note __, 16 note __, 2 -Music_ElmsLab_branch_ea2b9: ; ea2b9 +Music_ElmsLab_branch_ea2b9: note G_, 4 loopchannel 0, Music_ElmsLab_branch_ea2b9 -; ea2be diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm index 61f7af716..47e115431 100644 --- a/audio/music/evolution.asm +++ b/audio/music/evolution.asm @@ -1,11 +1,10 @@ -Music_Evolution: ; f06e1 +Music_Evolution: 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 +Music_Evolution_Ch1: tempo 132 volume $77 vibrato $6, $34 @@ -24,7 +23,7 @@ Music_Evolution_Ch1: ; f06ed note __, 4 dutycycle $3 stereopanning $f -Music_Evolution_branch_f0713: ; f0713 +Music_Evolution_branch_f0713: callchannel Music_Evolution_branch_f0737 notetype $c, $a4 note F#, 4 @@ -39,9 +38,8 @@ Music_Evolution_branch_f0713: ; f0713 notetype $c, $a4 note G#, 4 loopchannel 0, Music_Evolution_branch_f0713 -; f0737 -Music_Evolution_branch_f0737: ; f0737 +Music_Evolution_branch_f0737: notetype $c, $a2 octave 3 note C_, 4 @@ -52,9 +50,8 @@ Music_Evolution_branch_f0737: ; f0737 note G_, 4 note C_, 4 endchannel -; f0743 -Music_Evolution_branch_f0743: ; f0743 +Music_Evolution_branch_f0743: notetype $c, $a2 octave 3 note D_, 4 @@ -65,9 +62,8 @@ Music_Evolution_branch_f0743: ; f0743 note A_, 4 note D_, 4 endchannel -; f074f -Music_Evolution_Ch2: ; f074f +Music_Evolution_Ch2: dutycycle $2 vibrato $8, $25 notetype $c, $a2 @@ -79,7 +75,7 @@ Music_Evolution_Ch2: ; f074f note __, 4 dutycycle $3 stereopanning $f0 -Music_Evolution_branch_f0761: ; f0761 +Music_Evolution_branch_f0761: callchannel Music_Evolution_branch_f0787 notetype $c, $b5 note A_, 4 @@ -96,9 +92,8 @@ Music_Evolution_branch_f0761: ; f0761 note C#, 4 octave 3 loopchannel 0, Music_Evolution_branch_f0761 -; f0787 -Music_Evolution_branch_f0787: ; f0787 +Music_Evolution_branch_f0787: notetype $c, $b2 octave 3 note G_, 4 @@ -109,9 +104,8 @@ Music_Evolution_branch_f0787: ; f0787 note D_, 4 note G_, 4 endchannel -; f0793 -Music_Evolution_branch_f0793: ; f0793 +Music_Evolution_branch_f0793: notetype $c, $b2 octave 3 note A_, 4 @@ -122,12 +116,11 @@ Music_Evolution_branch_f0793: ; f0793 note E_, 4 note A_, 4 endchannel -; f079f -Music_Evolution_Ch3: ; f079f +Music_Evolution_Ch3: notetype $c, $16 note __, 8 -Music_Evolution_branch_f07a3: ; f07a3 +Music_Evolution_branch_f07a3: callchannel Music_Evolution_branch_f07bf octave 3 note A_, 4 @@ -142,9 +135,8 @@ Music_Evolution_branch_f07a3: ; f07a3 octave 4 note C#, 4 loopchannel 0, Music_Evolution_branch_f07a3 -; f07bf -Music_Evolution_branch_f07bf: ; f07bf +Music_Evolution_branch_f07bf: octave 2 note A_, 2 note __, 2 @@ -167,9 +159,8 @@ Music_Evolution_branch_f07bf: ; f07bf note A_, 2 note __, 2 endchannel -; f07d5 -Music_Evolution_branch_f07d5: ; f07d5 +Music_Evolution_branch_f07d5: octave 2 note B_, 2 note __, 2 @@ -192,13 +183,12 @@ Music_Evolution_branch_f07d5: ; f07d5 note A_, 2 note __, 2 endchannel -; f07eb -Music_Evolution_Ch4: ; f07eb +Music_Evolution_Ch4: togglenoise $5 notetype $c note __, 8 -Music_Evolution_branch_f07f0: ; f07f0 +Music_Evolution_branch_f07f0: stereopanning $f0 note A#, 6 note A#, 4 @@ -207,4 +197,3 @@ Music_Evolution_branch_f07f0: ; f07f0 note E_, 2 note E_, 2 loopchannel 0, Music_Evolution_branch_f07f0 -; f07fd diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index 844ceee2f..d275bc9a3 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,17 +1,16 @@ -Music_GameCorner: ; edd6d +Music_GameCorner: 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 +Music_GameCorner_Ch1: tempo 147 volume $77 stereopanning $f notetype $c, $91 note __, 8 -Music_GameCorner_branch_edd84: ; edd84 +Music_GameCorner_branch_edd84: intensity $91 note __, 16 note __, 16 @@ -39,7 +38,7 @@ Music_GameCorner_branch_edd84: ; edd84 note G#, 2 note G_, 2 intensity $71 -Music_GameCorner_branch_eddb1: ; eddb1 +Music_GameCorner_branch_eddb1: octave 4 note G#, 1 octave 5 @@ -47,7 +46,7 @@ Music_GameCorner_branch_eddb1: ; eddb1 note F_, 1 note C_, 1 loopchannel 4, Music_GameCorner_branch_eddb1 -Music_GameCorner_branch_eddbb: ; eddbb +Music_GameCorner_branch_eddbb: octave 4 note A#, 1 octave 5 @@ -55,7 +54,7 @@ Music_GameCorner_branch_eddbb: ; eddbb note G_, 1 note D_, 1 loopchannel 4, Music_GameCorner_branch_eddbb -Music_GameCorner_branch_eddc5: ; eddc5 +Music_GameCorner_branch_eddc5: octave 4 note D#, 1 note G_, 1 @@ -64,7 +63,7 @@ Music_GameCorner_branch_eddc5: ; eddc5 octave 4 note G_, 1 loopchannel 4, Music_GameCorner_branch_eddc5 -Music_GameCorner_branch_eddd0: ; eddd0 +Music_GameCorner_branch_eddd0: octave 4 note F_, 1 note A_, 1 @@ -73,7 +72,7 @@ Music_GameCorner_branch_eddd0: ; eddd0 octave 4 note A_, 1 loopchannel 4, Music_GameCorner_branch_eddd0 -Music_GameCorner_branch_edddb: ; edddb +Music_GameCorner_branch_edddb: octave 4 note G#, 1 octave 5 @@ -81,7 +80,7 @@ Music_GameCorner_branch_edddb: ; edddb note F_, 1 note C_, 1 loopchannel 4, Music_GameCorner_branch_edddb -Music_GameCorner_branch_edde5: ; edde5 +Music_GameCorner_branch_edde5: octave 4 note A#, 1 octave 5 @@ -89,7 +88,7 @@ Music_GameCorner_branch_edde5: ; edde5 note G_, 1 note D_, 1 loopchannel 4, Music_GameCorner_branch_edde5 -Music_GameCorner_branch_eddef: ; eddef +Music_GameCorner_branch_eddef: octave 4 note B_, 1 octave 5 @@ -104,9 +103,8 @@ Music_GameCorner_branch_eddef: ; eddef note F_, 2 note F_, 9 loopchannel 0, Music_GameCorner_branch_edd84 -; ede03 -Music_GameCorner_branch_ede03: ; ede03 +Music_GameCorner_branch_ede03: note __, 2 octave 4 note A#, 3 @@ -123,9 +121,8 @@ Music_GameCorner_branch_ede03: ; ede03 note G#, 1 note A#, 3 endchannel -; ede13 -Music_GameCorner_branch_ede13: ; ede13 +Music_GameCorner_branch_ede13: note __, 2 octave 4 note A#, 3 @@ -135,14 +132,13 @@ Music_GameCorner_branch_ede13: ; ede13 note F_, 3 note F_, 2 endchannel -; ede1c -Music_GameCorner_Ch2: ; ede1c +Music_GameCorner_Ch2: stereopanning $ff vibrato $8, $24 notetype $c, $a1 note __, 8 -Music_GameCorner_branch_ede25: ; ede25 +Music_GameCorner_branch_ede25: intensity $92 dutycycle $1 callchannel Music_GameCorner_branch_ede75 @@ -207,9 +203,8 @@ Music_GameCorner_branch_ede25: ; ede25 note A#, 9 intensity $a4 loopchannel 0, Music_GameCorner_branch_ede25 -; ede75 -Music_GameCorner_branch_ede75: ; ede75 +Music_GameCorner_branch_ede75: octave 1 note C_, 2 octave 3 @@ -319,13 +314,12 @@ Music_GameCorner_branch_ede75: ; ede75 note D_, 2 note D#, 2 endchannel -; edee8 -Music_GameCorner_Ch3: ; edee8 +Music_GameCorner_Ch3: vibrato $8, $22 notetype $c, $14 note __, 8 -Music_GameCorner_branch_edeef: ; edeef +Music_GameCorner_branch_edeef: stereopanning $ff notetype $c, $14 callchannel Music_GameCorner_branch_edfdd @@ -504,9 +498,8 @@ Music_GameCorner_branch_edeef: ; edeef note E_, 1 note D_, 1 loopchannel 0, Music_GameCorner_branch_edeef -; edfdd -Music_GameCorner_branch_edfdd: ; edfdd +Music_GameCorner_branch_edfdd: octave 2 note C_, 1 octave 3 @@ -534,9 +527,8 @@ Music_GameCorner_branch_edfdd: ; edfdd octave 4 note A_, 2 endchannel -; edff8 -Music_GameCorner_branch_edff8: ; edff8 +Music_GameCorner_branch_edff8: octave 2 note C_, 1 octave 3 @@ -557,9 +549,8 @@ Music_GameCorner_branch_edff8: ; edff8 note A_, 1 note __, 1 endchannel -; ee00c -Music_GameCorner_branch_ee00c: ; ee00c +Music_GameCorner_branch_ee00c: octave 2 note F_, 1 octave 3 @@ -584,9 +575,8 @@ Music_GameCorner_branch_ee00c: ; ee00c note C_, 1 note D_, 3 endchannel -; ee024 -Music_GameCorner_branch_ee024: ; ee024 +Music_GameCorner_branch_ee024: octave 2 note F_, 1 octave 3 @@ -614,9 +604,8 @@ Music_GameCorner_branch_ee024: ; ee024 note F_, 1 note __, 1 endchannel -; ee03f -Music_GameCorner_branch_ee03f: ; ee03f +Music_GameCorner_branch_ee03f: octave 2 note F_, 2 note __, 1 @@ -665,9 +654,8 @@ Music_GameCorner_branch_ee03f: ; ee03f octave 3 note D_, 1 endchannel -; ee06f -Music_GameCorner_Ch4: ; ee06f +Music_GameCorner_Ch4: togglenoise $3 notetype $c notetype $8 @@ -680,9 +668,9 @@ Music_GameCorner_Ch4: ; ee06f note D_, 2 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee07f: ; ee07f +Music_GameCorner_branch_ee07f: callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee082: ; ee082 +Music_GameCorner_branch_ee082: note A#, 2 note F#, 2 note D_, 2 @@ -693,7 +681,7 @@ Music_GameCorner_branch_ee082: ; ee082 note F#, 2 loopchannel 6, Music_GameCorner_branch_ee082 callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee091: ; ee091 +Music_GameCorner_branch_ee091: note A#, 2 note F#, 2 note D_, 2 @@ -708,7 +696,7 @@ Music_GameCorner_branch_ee091: ; ee091 note D_, 1 note F#, 2 callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee0a4: ; ee0a4 +Music_GameCorner_branch_ee0a4: note A#, 2 note F#, 2 note D_, 2 @@ -719,7 +707,7 @@ Music_GameCorner_branch_ee0a4: ; ee0a4 note F#, 2 loopchannel 6, Music_GameCorner_branch_ee0a4 callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee0b3: ; ee0b3 +Music_GameCorner_branch_ee0b3: note A#, 2 note F#, 2 note D_, 2 @@ -739,7 +727,7 @@ Music_GameCorner_branch_ee0b3: ; ee0b3 note D_, 1 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee0c9: ; ee0c9 +Music_GameCorner_branch_ee0c9: note A#, 2 note F#, 1 note D#, 1 @@ -768,7 +756,7 @@ Music_GameCorner_branch_ee0c9: ; ee0c9 note D_, 2 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee0e8: ; ee0e8 +Music_GameCorner_branch_ee0e8: note A#, 2 note F#, 1 note D#, 1 @@ -793,9 +781,8 @@ Music_GameCorner_branch_ee0e8: ; ee0e8 note D_, 1 note D#, 2 loopchannel 0, Music_GameCorner_branch_ee07f -; ee106 -Music_GameCorner_branch_ee106: ; ee106 +Music_GameCorner_branch_ee106: note C_, 2 note F#, 2 note D_, 2 @@ -805,9 +792,8 @@ Music_GameCorner_branch_ee106: ; ee106 note D_, 2 note F#, 2 endchannel -; ee10f -Music_GameCorner_branch_ee10f: ; ee10f +Music_GameCorner_branch_ee10f: note A#, 2 note F#, 2 note D_, 2 @@ -818,4 +804,3 @@ Music_GameCorner_branch_ee10f: ; ee10f note D_, 1 note F#, 2 endchannel -; ee119 diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm index d7318310e..42f861e3f 100644 --- a/audio/music/goldenrodcity.asm +++ b/audio/music/goldenrodcity.asm @@ -1,11 +1,10 @@ -Music_GoldenrodCity: ; eb453 +Music_GoldenrodCity: 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 +Music_GoldenrodCity_Ch1: stereopanning $f tempo 176 volume $77 @@ -14,7 +13,7 @@ Music_GoldenrodCity_Ch1: ; eb45f note __, 16 note __, 16 note __, 16 -Music_GoldenrodCity_branch_eb46d: ; eb46d +Music_GoldenrodCity_branch_eb46d: dutycycle $0 callchannel Music_GoldenrodCity_branch_eb4a9 octave 3 @@ -56,9 +55,8 @@ Music_GoldenrodCity_branch_eb46d: ; eb46d octave 4 note C_, 2 loopchannel 0, Music_GoldenrodCity_branch_eb46d -; eb4a9 -Music_GoldenrodCity_branch_eb4a9: ; eb4a9 +Music_GoldenrodCity_branch_eb4a9: octave 4 note C#, 2 octave 3 @@ -99,9 +97,8 @@ Music_GoldenrodCity_branch_eb4a9: ; eb4a9 octave 4 note C#, 2 endchannel -; eb4d1 -Music_GoldenrodCity_branch_eb4d1: ; eb4d1 +Music_GoldenrodCity_branch_eb4d1: octave 4 note F_, 1 note C#, 1 @@ -174,14 +171,13 @@ Music_GoldenrodCity_branch_eb4d1: ; eb4d1 note D#, 1 note F#, 1 endchannel -; eb519 -Music_GoldenrodCity_Ch2: ; eb519 +Music_GoldenrodCity_Ch2: stereopanning $f0 vibrato $12, $23 dutycycle $2 notetype $c, $97 -Music_GoldenrodCity_branch_eb523: ; eb523 +Music_GoldenrodCity_branch_eb523: intensity $97 callchannel Music_GoldenrodCity_branch_eb555 octave 4 @@ -216,9 +212,8 @@ Music_GoldenrodCity_branch_eb523: ; eb523 octave 4 note G#, 2 loopchannel 0, Music_GoldenrodCity_branch_eb523 -; eb555 -Music_GoldenrodCity_branch_eb555: ; eb555 +Music_GoldenrodCity_branch_eb555: octave 4 note F_, 4 note C#, 4 @@ -247,9 +242,8 @@ Music_GoldenrodCity_branch_eb555: ; eb555 note F#, 2 dutycycle $1 endchannel -; eb572 -Music_GoldenrodCity_branch_eb572: ; eb572 +Music_GoldenrodCity_branch_eb572: note C#, 6 note F_, 6 note C#, 4 @@ -268,13 +262,12 @@ Music_GoldenrodCity_branch_eb572: ; eb572 note C_, 4 note D#, 2 endchannel -; eb584 -Music_GoldenrodCity_Ch3: ; eb584 +Music_GoldenrodCity_Ch3: stereopanning $ff vibrato $8, $23 notetype $c, $25 -Music_GoldenrodCity_branch_eb58c: ; eb58c +Music_GoldenrodCity_branch_eb58c: callchannel Music_GoldenrodCity_branch_eb5aa callchannel Music_GoldenrodCity_branch_eb5aa callchannel Music_GoldenrodCity_branch_eb5d2 @@ -294,9 +287,8 @@ Music_GoldenrodCity_branch_eb58c: ; eb58c octave 2 note G#, 2 loopchannel 0, Music_GoldenrodCity_branch_eb58c -; eb5aa -Music_GoldenrodCity_branch_eb5aa: ; eb5aa +Music_GoldenrodCity_branch_eb5aa: octave 3 note C#, 4 note __, 2 @@ -337,9 +329,8 @@ Music_GoldenrodCity_branch_eb5aa: ; eb5aa note G#, 1 note __, 1 endchannel -; eb5d2 -Music_GoldenrodCity_branch_eb5d2: ; eb5d2 +Music_GoldenrodCity_branch_eb5d2: note C#, 1 note __, 1 octave 4 @@ -392,9 +383,8 @@ Music_GoldenrodCity_branch_eb5d2: ; eb5d2 note __, 2 note G#, 1 endchannel -; eb606 -Music_GoldenrodCity_Ch4: ; eb606 +Music_GoldenrodCity_Ch4: togglenoise $3 notetype $c note __, 16 @@ -406,7 +396,7 @@ Music_GoldenrodCity_Ch4: ; eb606 note D_, 1 note D_, 1 note F#, 2 -Music_GoldenrodCity_branch_eb613: ; eb613 +Music_GoldenrodCity_branch_eb613: note D#, 2 note F#, 2 note D_, 2 @@ -447,7 +437,7 @@ Music_GoldenrodCity_branch_eb613: ; eb613 note D_, 2 note D_, 1 note D_, 1 -Music_GoldenrodCity_branch_eb650: ; eb650 +Music_GoldenrodCity_branch_eb650: note D#, 2 note F#, 2 note D_, 2 @@ -459,9 +449,8 @@ Music_GoldenrodCity_branch_eb650: ; eb650 loopchannel 3, Music_GoldenrodCity_branch_eb650 callchannel Music_GoldenrodCity_branch_eb663 loopchannel 0, Music_GoldenrodCity_branch_eb613 -; eb663 -Music_GoldenrodCity_branch_eb663: ; eb663 +Music_GoldenrodCity_branch_eb663: note D#, 2 note F#, 2 note D_, 2 @@ -472,9 +461,8 @@ Music_GoldenrodCity_branch_eb663: ; eb663 note D_, 1 note F#, 2 endchannel -; eb66d -Music_GoldenrodCity_branch_eb66d: ; eb66d +Music_GoldenrodCity_branch_eb66d: note D#, 2 note D_, 1 note D#, 3 @@ -484,4 +472,3 @@ Music_GoldenrodCity_branch_eb66d: ; eb66d note G_, 1 note G_, 1 endchannel -; eb676 diff --git a/audio/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm index 9c677f47b..a9359f009 100644 --- a/audio/music/goldsilveropening.asm +++ b/audio/music/goldsilveropening.asm @@ -1,10 +1,9 @@ -Music_GoldSilverOpening: ; f7055 +Music_GoldSilverOpening: musicheader 3, 1, Music_GoldSilverOpening_Ch1 musicheader 1, 2, Music_GoldSilverOpening_Ch2 musicheader 1, 3, Music_GoldSilverOpening_Ch3 -; f705e -Music_GoldSilverOpening_Ch1: ; f705e +Music_GoldSilverOpening_Ch1: tempo 256 volume $77 tone $0001 @@ -128,9 +127,8 @@ Music_GoldSilverOpening_Ch1: ; f705e note G_, 2 note A_, 16 endchannel -; f70f8 -Music_GoldSilverOpening_Ch2: ; f70f8 +Music_GoldSilverOpening_Ch2: tone $0001 stereopanning $f notetype $c, $b7 @@ -309,9 +307,8 @@ Music_GoldSilverOpening_Ch2: ; f70f8 note C_, 4 note D#, 16 endchannel -; f71c8 -Music_GoldSilverOpening_Ch3: ; f71c8 +Music_GoldSilverOpening_Ch3: notetype $6, $10 octave 2 note D_, 4 @@ -616,4 +613,3 @@ Music_GoldSilverOpening_Ch3: ; f71c8 note C_, 1 note __, 13 endchannel -; f7308 diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm index 90b9b511c..2dc43e3b7 100644 --- a/audio/music/goldsilveropening2.asm +++ b/audio/music/goldsilveropening2.asm @@ -1,11 +1,10 @@ -Music_GoldSilverOpening2: ; f7308 +Music_GoldSilverOpening2: 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 +Music_GoldSilverOpening2_Ch1: tempo 92 volume $77 dutycycle $3 @@ -14,7 +13,7 @@ Music_GoldSilverOpening2_Ch1: ; f7314 notetype $c, $3d octave 3 note D#, 8 -Music_GoldSilverOpening2_branch_f7325: ; f7325 +Music_GoldSilverOpening2_branch_f7325: notetype $c, $c1 octave 3 note D_, 2 @@ -52,9 +51,8 @@ Music_GoldSilverOpening2_branch_f7325: ; f7325 octave 4 note D_, 16 endchannel -; f7358 -Music_GoldSilverOpening2_Ch2: ; f7358 +Music_GoldSilverOpening2_Ch2: dutycycle $3 vibrato $14, $14 stereopanning $f0 @@ -105,9 +103,8 @@ Music_GoldSilverOpening2_Ch2: ; f7358 intensity $c2 note D_, 16 endchannel -; f739c -Music_GoldSilverOpening2_Ch3: ; f739c +Music_GoldSilverOpening2_Ch3: notetype $c, $17 note __, 8 octave 2 @@ -184,9 +181,8 @@ Music_GoldSilverOpening2_Ch3: ; f739c note D_, 2 note __, 14 endchannel -; f73ea -Music_GoldSilverOpening2_Ch4: ; f73ea +Music_GoldSilverOpening2_Ch4: togglenoise $0 notetype $6 note D#, 2 @@ -198,7 +194,7 @@ Music_GoldSilverOpening2_Ch4: ; f73ea note D_, 2 note D_, 2 notetype $c -Music_GoldSilverOpening2_branch_f73f8: ; f73f8 +Music_GoldSilverOpening2_branch_f73f8: note D_, 2 note D_, 2 note D_, 2 @@ -219,4 +215,3 @@ Music_GoldSilverOpening2_branch_f73f8: ; f73f8 loopchannel 4, Music_GoldSilverOpening2_branch_f73f8 note C_, 16 endchannel -; f7411 diff --git a/audio/music/gym.asm b/audio/music/gym.asm index 89c145724..acb944adf 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,18 +1,17 @@ -Music_Gym: ; f48ae +Music_Gym: 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 +Music_Gym_Ch1: tempo 156 volume $77 stereopanning $f vibrato $12, $24 dutycycle $1 notetype $c, $b7 -Music_Gym_branch_f48c9: ; f48c9 +Music_Gym_branch_f48c9: octave 4 note F#, 2 octave 2 @@ -189,12 +188,11 @@ Music_Gym_branch_f48c9: ; f48c9 note F#, 1 note E_, 1 loopchannel 0, Music_Gym_branch_f48c9 -; f497c -Music_Gym_Ch2: ; f497c +Music_Gym_Ch2: dutycycle $1 stereopanning $f0 -Music_Gym_branch_f4980: ; f4980 +Music_Gym_branch_f4980: notetype $c, $c3 octave 2 note D_, 2 @@ -286,9 +284,8 @@ Music_Gym_branch_f4980: ; f4980 note F#, 2 note D_, 2 loopchannel 0, Music_Gym_branch_f4980 -; f49e9 -Music_Gym_branch_f49e9: ; f49e9 +Music_Gym_branch_f49e9: octave 3 note D_, 3 octave 2 @@ -333,9 +330,8 @@ Music_Gym_branch_f49e9: ; f49e9 note C_, 1 note C_, 2 endchannel -; f4a15 -Music_Gym_branch_f4a15: ; f4a15 +Music_Gym_branch_f4a15: octave 2 note D_, 4 note D_, 2 @@ -370,12 +366,11 @@ Music_Gym_branch_f4a15: ; f4a15 note F#, 1 note F#, 1 endchannel -; f4a37 -Music_Gym_Ch3: ; f4a37 +Music_Gym_Ch3: vibrato $14, $23 stereopanning $ff -Music_Gym_branch_f4a3c: ; f4a3c +Music_Gym_branch_f4a3c: notetype $c, $14 octave 6 note D_, 2 @@ -485,9 +480,8 @@ Music_Gym_branch_f4a3c: ; f4a3c note F#, 8 note E_, 4 loopchannel 0, Music_Gym_branch_f4a3c -; f4ab3 -Music_Gym_branch_f4ab3: ; f4ab3 +Music_Gym_branch_f4ab3: octave 5 note A_, 6 octave 6 @@ -506,11 +500,10 @@ Music_Gym_branch_f4ab3: ; f4ab3 note G_, 1 note A_, 4 endchannel -; f4ac5 -Music_Gym_Ch4: ; f4ac5 +Music_Gym_Ch4: togglenoise $4 -Music_Gym_branch_f4ac7: ; f4ac7 +Music_Gym_branch_f4ac7: notetype $c note D_, 2 note C#, 1 @@ -535,7 +528,7 @@ Music_Gym_branch_f4ac7: ; f4ac7 note D_, 1 note D_, 1 notetype $6 -Music_Gym_branch_f4ae1: ; f4ae1 +Music_Gym_branch_f4ae1: note D_, 6 note D_, 6 note D_, 4 @@ -558,7 +551,7 @@ Music_Gym_branch_f4ae1: ; f4ae1 note D_, 4 note B_, 8 loopchannel 4, Music_Gym_branch_f4ae1 -Music_Gym_branch_f4afa: ; f4afa +Music_Gym_branch_f4afa: note D#, 4 note F#, 4 note D_, 4 @@ -571,4 +564,3 @@ Music_Gym_branch_f4afa: ; f4afa note F#, 4 loopchannel 8, Music_Gym_branch_f4afa loopchannel 0, Music_Gym_branch_f4ac7 -; f4b0c diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm index 28ef43192..d6a1a36ee 100644 --- a/audio/music/gymleadervictory.asm +++ b/audio/music/gymleadervictory.asm @@ -1,11 +1,10 @@ -Music_GymLeaderVictory: ; f462c +Music_GymLeaderVictory: 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 +Music_GymLeaderVictory_Ch1: tempo 116 volume $77 vibrato $12, $34 @@ -27,7 +26,7 @@ Music_GymLeaderVictory_Ch1: ; f4638 octave 5 note D_, 8 stereopanning $f -Music_GymLeaderVictory_branch_f4658: ; f4658 +Music_GymLeaderVictory_branch_f4658: dutycycle $1 callchannel Music_GymLeaderVictory_branch_f4689 octave 4 @@ -59,9 +58,8 @@ Music_GymLeaderVictory_branch_f4658: ; f4658 intensity $87 note F#, 16 loopchannel 0, Music_GymLeaderVictory_branch_f4658 -; f4689 -Music_GymLeaderVictory_branch_f4689: ; f4689 +Music_GymLeaderVictory_branch_f4689: intensity $91 octave 3 note F#, 2 @@ -84,9 +82,8 @@ Music_GymLeaderVictory_branch_f4689: ; f4689 note G_, 1 note D_, 1 endchannel -; f46a0 -Music_GymLeaderVictory_branch_f46a0: ; f46a0 +Music_GymLeaderVictory_branch_f46a0: intensity $87 octave 3 note F#, 14 @@ -115,9 +112,8 @@ Music_GymLeaderVictory_branch_f46a0: ; f46a0 note C#, 1 note E_, 8 endchannel -; f46bd -Music_GymLeaderVictory_Ch2: ; f46bd +Music_GymLeaderVictory_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $d7 @@ -132,7 +128,7 @@ Music_GymLeaderVictory_Ch2: ; f46bd octave 5 note D_, 1 note F#, 16 -Music_GymLeaderVictory_branch_f46d0: ; f46d0 +Music_GymLeaderVictory_branch_f46d0: dutycycle $3 intensity $a1 callchannel Music_GymLeaderVictory_branch_f4711 @@ -175,9 +171,8 @@ Music_GymLeaderVictory_branch_f46d0: ; f46d0 octave 5 note C#, 1 loopchannel 0, Music_GymLeaderVictory_branch_f46d0 -; f4711 -Music_GymLeaderVictory_branch_f4711: ; f4711 +Music_GymLeaderVictory_branch_f4711: octave 5 note D_, 2 note C#, 2 @@ -193,9 +188,8 @@ Music_GymLeaderVictory_branch_f4711: ; f4711 note G_, 2 note F#, 2 endchannel -; f4720 -Music_GymLeaderVictory_branch_f4720: ; f4720 +Music_GymLeaderVictory_branch_f4720: intensity $98 note A_, 6 note F#, 1 @@ -218,9 +212,8 @@ Music_GymLeaderVictory_branch_f4720: ; f4720 note C#, 8 note C#, 8 endchannel -; f4737 -Music_GymLeaderVictory_Ch3: ; f4737 +Music_GymLeaderVictory_Ch3: notetype $c, $25 octave 3 note F#, 16 @@ -231,7 +224,7 @@ Music_GymLeaderVictory_Ch3: ; f4737 octave 3 note C#, 2 stereopanning $f0 -Music_GymLeaderVictory_branch_f4744: ; f4744 +Music_GymLeaderVictory_branch_f4744: note D_, 2 note __, 4 octave 2 @@ -312,9 +305,8 @@ Music_GymLeaderVictory_branch_f4744: ; f4744 octave 3 note C#, 2 loopchannel 0, Music_GymLeaderVictory_branch_f4744 -; f479e -Music_GymLeaderVictory_branch_f479e: ; f479e +Music_GymLeaderVictory_branch_f479e: octave 3 note D_, 2 note __, 2 @@ -386,14 +378,13 @@ Music_GymLeaderVictory_branch_f479e: ; f479e octave 2 note A_, 2 endchannel -; f47e5 -Music_GymLeaderVictory_Ch4: ; f47e5 +Music_GymLeaderVictory_Ch4: togglenoise $4 notetype $c note B_, 16 note B_, 16 -Music_GymLeaderVictory_branch_f47eb: ; f47eb +Music_GymLeaderVictory_branch_f47eb: callchannel Music_GymLeaderVictory_branch_f480b note D#, 6 note D#, 2 @@ -406,7 +397,7 @@ Music_GymLeaderVictory_branch_f47eb: ; f47eb note C#, 1 note C#, 1 note C#, 1 -Music_GymLeaderVictory_branch_f47fb: ; f47fb +Music_GymLeaderVictory_branch_f47fb: note D#, 2 note G_, 2 note D_, 2 @@ -417,9 +408,8 @@ Music_GymLeaderVictory_branch_f47fb: ; f47fb note G_, 2 loopchannel 16, Music_GymLeaderVictory_branch_f47fb loopchannel 0, Music_GymLeaderVictory_branch_f47eb -; f480b -Music_GymLeaderVictory_branch_f480b: ; f480b +Music_GymLeaderVictory_branch_f480b: note D#, 6 note D#, 2 note D#, 4 @@ -427,4 +417,3 @@ Music_GymLeaderVictory_branch_f480b: ; f480b note D#, 2 loopchannel 3, Music_GymLeaderVictory_branch_f480b endchannel -; f4815 diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 8abc46f7b..2f4c444d7 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,11 +1,10 @@ -Music_HallOfFame: ; f05bf +Music_HallOfFame: 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 +Music_HallOfFame_Ch1: tempo 112 volume $77 dutycycle $2 @@ -22,7 +21,7 @@ Music_HallOfFame_Ch1: ; f05cb note E_, 1 note F_, 1 note F#, 1 -Music_HallOfFame_branch_f05e6: ; f05e6 +Music_HallOfFame_branch_f05e6: intensity $97 octave 4 note C_, 8 @@ -46,12 +45,11 @@ Music_HallOfFame_branch_f05e6: ; f05e6 note __, 16 note __, 16 loopchannel 0, Music_HallOfFame_branch_f05e6 -; f060b -Music_HallOfFame_Ch2: ; f060b +Music_HallOfFame_Ch2: vibrato $8, $25 dutycycle $3 -Music_HallOfFame_branch_f0610: ; f0610 +Music_HallOfFame_branch_f0610: notetype $c, $c4 octave 3 note G_, 2 @@ -77,12 +75,11 @@ Music_HallOfFame_branch_f0610: ; f0610 note A_, 4 note F_, 2 loopchannel 0, Music_HallOfFame_branch_f0610 -; f062e -Music_HallOfFame_Ch3: ; f062e -Music_HallOfFame_branch_f062e: ; f062e +Music_HallOfFame_Ch3: +Music_HallOfFame_branch_f062e: notetype $c, $28 -Music_HallOfFame_branch_f0631: ; f0631 +Music_HallOfFame_branch_f0631: octave 3 note D_, 2 note G_, 2 @@ -137,9 +134,8 @@ Music_HallOfFame_branch_f0631: ; f0631 note E_, 4 note G_, 4 loopchannel 0, Music_HallOfFame_branch_f062e -; f066d -Music_HallOfFame_Ch4: ; f066d +Music_HallOfFame_Ch4: togglenoise $5 notetype $c note __, 16 @@ -147,7 +143,7 @@ Music_HallOfFame_Ch4: ; f066d note __, 16 note __, 16 notetype $6 -Music_HallOfFame_branch_f0677: ; f0677 +Music_HallOfFame_branch_f0677: stereopanning $f note A#, 4 note A#, 8 @@ -174,4 +170,3 @@ Music_HallOfFame_branch_f0677: ; f0677 note A#, 1 note A#, 1 loopchannel 0, Music_HallOfFame_branch_f0677 -; f0697 diff --git a/audio/music/healpokemon.asm b/audio/music/healpokemon.asm index 264d3db78..6de58bc5c 100644 --- a/audio/music/healpokemon.asm +++ b/audio/music/healpokemon.asm @@ -1,10 +1,9 @@ -Music_HealPokemon: ; f0697 +Music_HealPokemon: musicheader 3, 1, Music_HealPokemon_Ch1 musicheader 1, 2, Music_HealPokemon_Ch2 musicheader 1, 3, Music_HealPokemon_Ch3 -; f06a0 -Music_HealPokemon_Ch1: ; f06a0 +Music_HealPokemon_Ch1: tempo 144 volume $77 dutycycle $2 @@ -23,9 +22,8 @@ Music_HealPokemon_Ch1: ; f06a0 slidepitchto 1, 4, __ note B_, 4 endchannel -; f06c4 -Music_HealPokemon_Ch2: ; f06c4 +Music_HealPokemon_Ch2: dutycycle $2 notetype $c, $c3 octave 4 @@ -37,9 +35,8 @@ Music_HealPokemon_Ch2: ; f06c4 octave 5 note E_, 8 endchannel -; f06d4 -Music_HealPokemon_Ch3: ; f06d4 +Music_HealPokemon_Ch3: notetype $c, $10 octave 4 note E_, 2 @@ -51,4 +48,3 @@ Music_HealPokemon_Ch3: ; f06d4 note E_, 6 note __, 2 endchannel -; f06e1 diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index 64d19da99..b56f1b388 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,17 +1,16 @@ -Music_IndigoPlateau: ; ee852 +Music_IndigoPlateau: 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 +Music_IndigoPlateau_Ch1: tempo 128 volume $77 dutycycle $3 tone $0002 stereopanning $f -Music_IndigoPlateau_branch_ee86a: ; ee86a +Music_IndigoPlateau_branch_ee86a: callchannel Music_IndigoPlateau_branch_ee881 octave 3 note D_, 4 @@ -24,9 +23,8 @@ Music_IndigoPlateau_branch_ee86a: ; ee86a callchannel Music_IndigoPlateau_branch_ee881 note A#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee86a -; ee881 -Music_IndigoPlateau_branch_ee881: ; ee881 +Music_IndigoPlateau_branch_ee881: notetype $c, $b6 octave 2 note A_, 4 @@ -40,13 +38,12 @@ Music_IndigoPlateau_branch_ee881: ; ee881 note A_, 2 intensity $a0 endchannel -; ee892 -Music_IndigoPlateau_Ch2: ; ee892 +Music_IndigoPlateau_Ch2: dutycycle $3 vibrato $10, $22 stereopanning $f0 -Music_IndigoPlateau_branch_ee899: ; ee899 +Music_IndigoPlateau_branch_ee899: callchannel Music_IndigoPlateau_branch_ee8e9 note A_, 4 callchannel Music_IndigoPlateau_branch_ee8e9 @@ -100,9 +97,8 @@ Music_IndigoPlateau_branch_ee899: ; ee899 callchannel Music_IndigoPlateau_branch_ee8e9 note C#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee899 -; ee8e9 -Music_IndigoPlateau_branch_ee8e9: ; ee8e9 +Music_IndigoPlateau_branch_ee8e9: notetype $c, $c6 octave 3 note D_, 4 @@ -116,11 +112,10 @@ Music_IndigoPlateau_branch_ee8e9: ; ee8e9 note D_, 2 intensity $b0 endchannel -; ee8fa -Music_IndigoPlateau_Ch3: ; ee8fa +Music_IndigoPlateau_Ch3: notetype $c, $19 -Music_IndigoPlateau_branch_ee8fd: ; ee8fd +Music_IndigoPlateau_branch_ee8fd: callchannel Music_IndigoPlateau_branch_ee915 octave 3 note A_, 4 @@ -134,9 +129,8 @@ Music_IndigoPlateau_branch_ee8fd: ; ee8fd octave 3 note F#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee8fd -; ee915 -Music_IndigoPlateau_branch_ee915: ; ee915 +Music_IndigoPlateau_branch_ee915: octave 3 note D_, 1 note __, 3 @@ -152,13 +146,12 @@ Music_IndigoPlateau_branch_ee915: ; ee915 note A_, 1 note __, 3 endchannel -; ee924 -Music_IndigoPlateau_Ch4: ; ee924 +Music_IndigoPlateau_Ch4: stereopanning $f0 togglenoise $0 notetype $c -Music_IndigoPlateau_branch_ee92a: ; ee92a +Music_IndigoPlateau_branch_ee92a: note D#, 4 note D_, 2 note D#, 2 @@ -187,4 +180,3 @@ Music_IndigoPlateau_branch_ee92a: ; ee92a note D_, 2 note C#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee92a -; ee94b diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm index 191b62ad9..2b6e82f00 100644 --- a/audio/music/johtogymbattle.asm +++ b/audio/music/johtogymbattle.asm @@ -1,24 +1,23 @@ -Music_JohtoGymBattle: ; ea50d +Music_JohtoGymBattle: musicheader 3, 1, Music_JohtoGymBattle_Ch1 musicheader 1, 2, Music_JohtoGymBattle_Ch2 musicheader 1, 3, Music_JohtoGymBattle_Ch3 -; ea516 -Music_JohtoGymBattle_Ch1: ; ea516 +Music_JohtoGymBattle_Ch1: tempo 101 volume $77 dutycycle $3 tone $0002 vibrato $12, $15 notetype $c, $b2 -Music_JohtoGymBattle_branch_ea526: ; ea526 +Music_JohtoGymBattle_branch_ea526: octave 3 note A#, 1 note A_, 1 note G#, 1 note A_, 1 loopchannel 4, Music_JohtoGymBattle_branch_ea526 -Music_JohtoGymBattle_branch_ea52f: ; ea52f +Music_JohtoGymBattle_branch_ea52f: note C#, 1 note C_, 1 octave 2 @@ -58,7 +57,7 @@ Music_JohtoGymBattle_branch_ea52f: ; ea52f octave 3 note G#, 2 note F_, 2 -Music_JohtoGymBattle_branch_ea55d: ; ea55d +Music_JohtoGymBattle_branch_ea55d: intensity $b5 note D_, 6 note G_, 6 @@ -286,21 +285,20 @@ Music_JohtoGymBattle_branch_ea55d: ; ea55d note D#, 2 note F#, 2 loopchannel 0, Music_JohtoGymBattle_branch_ea55d -; ea65f -Music_JohtoGymBattle_Ch2: ; ea65f +Music_JohtoGymBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 notetype $c, $c2 -Music_JohtoGymBattle_branch_ea66a: ; ea66a +Music_JohtoGymBattle_branch_ea66a: octave 4 note F#, 1 note F_, 1 note E_, 1 note A#, 1 loopchannel 4, Music_JohtoGymBattle_branch_ea66a -Music_JohtoGymBattle_branch_ea673: ; ea673 +Music_JohtoGymBattle_branch_ea673: note F#, 1 note F_, 1 note F#, 1 @@ -397,7 +395,7 @@ Music_JohtoGymBattle_branch_ea673: ; ea673 octave 3 note G#, 1 note A_, 1 -Music_JohtoGymBattle_branch_ea6ee: ; ea6ee +Music_JohtoGymBattle_branch_ea6ee: intensity $c7 note A#, 8 intensity $c4 @@ -613,9 +611,8 @@ Music_JohtoGymBattle_branch_ea6ee: ; ea6ee note B_, 16 note G_, 16 loopchannel 0, Music_JohtoGymBattle_branch_ea6ee -; ea7f4 -Music_JohtoGymBattle_Ch3: ; ea7f4 +Music_JohtoGymBattle_Ch3: notetype $c, $19 octave 4 note F_, 1 @@ -685,7 +682,7 @@ Music_JohtoGymBattle_Ch3: ; ea7f4 octave 3 note A#, 2 note G#, 2 -Music_JohtoGymBattle_branch_ea83f: ; ea83f +Music_JohtoGymBattle_branch_ea83f: callchannel Music_JohtoGymBattle_branch_ea963 callchannel Music_JohtoGymBattle_branch_ea963 callchannel Music_JohtoGymBattle_branch_ea96a @@ -900,9 +897,8 @@ Music_JohtoGymBattle_branch_ea83f: ; ea83f note F_, 2 note D#, 2 loopchannel 0, Music_JohtoGymBattle_branch_ea83f -; ea952 -Music_JohtoGymBattle_branch_ea952: ; ea952 +Music_JohtoGymBattle_branch_ea952: note G_, 2 note D_, 2 note F_, 2 @@ -920,30 +916,26 @@ Music_JohtoGymBattle_branch_ea952: ; ea952 note D#, 2 note F_, 2 endchannel -; ea963 -Music_JohtoGymBattle_branch_ea963: ; ea963 +Music_JohtoGymBattle_branch_ea963: note D_, 2 note G_, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea963 endchannel -; ea96a -Music_JohtoGymBattle_branch_ea96a: ; ea96a +Music_JohtoGymBattle_branch_ea96a: note C#, 2 note G#, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea96a endchannel -; ea971 -Music_JohtoGymBattle_branch_ea971: ; ea971 +Music_JohtoGymBattle_branch_ea971: note C_, 2 note G_, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea971 endchannel -; ea978 -Music_JohtoGymBattle_branch_ea978: ; ea978 +Music_JohtoGymBattle_branch_ea978: octave 2 note A#, 2 octave 3 @@ -955,9 +947,8 @@ Music_JohtoGymBattle_branch_ea978: ; ea978 octave 2 note A#, 2 endchannel -; ea983 -Music_JohtoGymBattle_branch_ea983: ; ea983 +Music_JohtoGymBattle_branch_ea983: octave 3 note C_, 2 note G_, 2 @@ -971,9 +962,8 @@ Music_JohtoGymBattle_branch_ea983: ; ea983 octave 3 note C_, 2 endchannel -; ea990 -Music_JohtoGymBattle_branch_ea990: ; ea990 +Music_JohtoGymBattle_branch_ea990: note C#, 2 note G#, 2 octave 4 @@ -986,9 +976,8 @@ Music_JohtoGymBattle_branch_ea990: ; ea990 octave 3 note C#, 2 endchannel -; ea99c -Music_JohtoGymBattle_branch_ea99c: ; ea99c +Music_JohtoGymBattle_branch_ea99c: octave 3 note D_, 2 note A_, 2 @@ -1002,24 +991,21 @@ Music_JohtoGymBattle_branch_ea99c: ; ea99c octave 3 note D_, 2 endchannel -; ea9a9 -Music_JohtoGymBattle_branch_ea9a9: ; ea9a9 +Music_JohtoGymBattle_branch_ea9a9: octave 3 note D#, 2 note G#, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea9a9 endchannel -; ea9b1 -Music_JohtoGymBattle_branch_ea9b1: ; ea9b1 +Music_JohtoGymBattle_branch_ea9b1: note C#, 2 note F#, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea9b1 endchannel -; ea9b8 -Music_JohtoGymBattle_branch_ea9b8: ; ea9b8 +Music_JohtoGymBattle_branch_ea9b8: note F_, 2 note C_, 2 note D#, 2 @@ -1029,4 +1015,3 @@ Music_JohtoGymBattle_branch_ea9b8: ; ea9b8 note F_, 2 note D#, 2 endchannel -; ea9c1 diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm index 52f60502d..c235410a5 100644 --- a/audio/music/johtotrainerbattle.asm +++ b/audio/music/johtotrainerbattle.asm @@ -1,10 +1,9 @@ -Music_JohtoTrainerBattle: ; f6096 +Music_JohtoTrainerBattle: musicheader 3, 1, Music_JohtoTrainerBattle_Ch1 musicheader 1, 2, Music_JohtoTrainerBattle_Ch2 musicheader 1, 3, Music_JohtoTrainerBattle_Ch3 -; f609f -Music_JohtoTrainerBattle_Ch1: ; f609f +Music_JohtoTrainerBattle_Ch1: tempo 102 volume $77 dutycycle $3 @@ -86,7 +85,7 @@ Music_JohtoTrainerBattle_Ch1: ; f609f note F_, 6 intensity $b7 note G_, 4 -Music_JohtoTrainerBattle_branch_f6102: ; f6102 +Music_JohtoTrainerBattle_branch_f6102: intensity $b4 callchannel Music_JohtoTrainerBattle_branch_f629f intensity $b7 @@ -243,7 +242,7 @@ Music_JohtoTrainerBattle_branch_f6102: ; f6102 intensity $a7 note D#, 12 note __, 16 -Music_JohtoTrainerBattle_branch_f61bd: ; f61bd +Music_JohtoTrainerBattle_branch_f61bd: intensity $b7 note F_, 8 intensity $b4 @@ -428,9 +427,8 @@ Music_JohtoTrainerBattle_branch_f61bd: ; f61bd intensity $a7 note F_, 6 loopchannel 0, Music_JohtoTrainerBattle_branch_f6102 -; f629f -Music_JohtoTrainerBattle_branch_f629f: ; f629f +Music_JohtoTrainerBattle_branch_f629f: octave 3 note E_, 2 note D_, 2 @@ -451,9 +449,8 @@ Music_JohtoTrainerBattle_branch_f629f: ; f629f note F_, 2 note D_, 2 endchannel -; f62b3 -Music_JohtoTrainerBattle_Ch2: ; f62b3 +Music_JohtoTrainerBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -547,7 +544,7 @@ Music_JohtoTrainerBattle_Ch2: ; f62b3 note E_, 2 intensity $c7 note B_, 4 -Music_JohtoTrainerBattle_branch_f632a: ; f632a +Music_JohtoTrainerBattle_branch_f632a: callchannel Music_JohtoTrainerBattle_branch_f64a3 intensity $3e note A#, 8 @@ -584,7 +581,7 @@ Music_JohtoTrainerBattle_branch_f632a: ; f632a note A_, 16 intensity $b7 note A_, 16 -Music_JohtoTrainerBattle_branch_f635a: ; f635a +Music_JohtoTrainerBattle_branch_f635a: intensity $c3 octave 3 note A_, 2 @@ -607,7 +604,7 @@ Music_JohtoTrainerBattle_branch_f635a: ; f635a note G_, 2 note A_, 2 note A#, 2 -Music_JohtoTrainerBattle_branch_f6376: ; f6376 +Music_JohtoTrainerBattle_branch_f6376: note G_, 2 note F_, 2 note G_, 2 @@ -685,7 +682,7 @@ Music_JohtoTrainerBattle_branch_f6376: ; f6376 callchannel Music_JohtoTrainerBattle_branch_f64b6 intensity $a2 callchannel Music_JohtoTrainerBattle_branch_f64b6 -Music_JohtoTrainerBattle_branch_f63dd: ; f63dd +Music_JohtoTrainerBattle_branch_f63dd: octave 4 note D#, 2 octave 3 @@ -829,9 +826,8 @@ Music_JohtoTrainerBattle_branch_f63dd: ; f63dd note D_, 2 note F_, 2 loopchannel 0, Music_JohtoTrainerBattle_branch_f632a -; f649a -Music_JohtoTrainerBattle_branch_f649a: ; f649a +Music_JohtoTrainerBattle_branch_f649a: octave 3 note A_, 6 note A_, 4 @@ -840,9 +836,8 @@ Music_JohtoTrainerBattle_branch_f649a: ; f649a intensity $c7 note A#, 4 endchannel -; f64a3 -Music_JohtoTrainerBattle_branch_f64a3: ; f64a3 +Music_JohtoTrainerBattle_branch_f64a3: intensity $c7 octave 3 note A_, 6 @@ -859,9 +854,8 @@ Music_JohtoTrainerBattle_branch_f64a3: ; f64a3 intensity $b7 note F_, 8 endchannel -; f64b6 -Music_JohtoTrainerBattle_branch_f64b6: ; f64b6 +Music_JohtoTrainerBattle_branch_f64b6: octave 3 note A#, 2 note D#, 2 @@ -870,9 +864,8 @@ Music_JohtoTrainerBattle_branch_f64b6: ; f64b6 octave 3 note D#, 2 endchannel -; f64be -Music_JohtoTrainerBattle_branch_f64be: ; f64be +Music_JohtoTrainerBattle_branch_f64be: intensity $c7 octave 4 note F_, 4 @@ -891,9 +884,8 @@ Music_JohtoTrainerBattle_branch_f64be: ; f64be note D#, 1 note F_, 2 endchannel -; f64d2 -Music_JohtoTrainerBattle_branch_f64d2: ; f64d2 +Music_JohtoTrainerBattle_branch_f64d2: intensity $c7 octave 4 note D#, 6 @@ -905,9 +897,8 @@ Music_JohtoTrainerBattle_branch_f64d2: ; f64d2 note F_, 4 note D#, 4 endchannel -; f64de -Music_JohtoTrainerBattle_Ch3: ; f64de +Music_JohtoTrainerBattle_Ch3: notetype $c, $19 octave 4 note E_, 1 @@ -941,7 +932,7 @@ Music_JohtoTrainerBattle_Ch3: ; f64de note A#, 2 note A_, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6501: ; f6501 +Music_JohtoTrainerBattle_branch_f6501: note A_, 2 note E_, 2 note F#, 2 @@ -983,7 +974,7 @@ Music_JohtoTrainerBattle_branch_f6501: ; f6501 note A_, 2 note A#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f6531: ; f6531 +Music_JohtoTrainerBattle_branch_f6531: callchannel Music_JohtoTrainerBattle_branch_f6681 note E_, 2 callchannel Music_JohtoTrainerBattle_branch_f6692 @@ -1056,7 +1047,7 @@ Music_JohtoTrainerBattle_branch_f6531: ; f6531 note F_, 8 note E_, 8 note D#, 8 -Music_JohtoTrainerBattle_branch_f6591: ; f6591 +Music_JohtoTrainerBattle_branch_f6591: octave 3 note D#, 2 note A#, 2 @@ -1079,13 +1070,13 @@ Music_JohtoTrainerBattle_branch_f6591: ; f6591 note F_, 2 note D#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f65ac: ; f65ac +Music_JohtoTrainerBattle_branch_f65ac: note C#, 2 note G#, 2 loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac note B_, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65b4: ; f65b4 +Music_JohtoTrainerBattle_branch_f65b4: note D_, 2 note A_, 2 loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4 @@ -1095,17 +1086,17 @@ Music_JohtoTrainerBattle_branch_f65b4: ; f65b4 note F#, 2 note G#, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65c0: ; f65c0 +Music_JohtoTrainerBattle_branch_f65c0: note A#, 4 note D#, 4 loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0 -Music_JohtoTrainerBattle_branch_f65c6: ; f65c6 +Music_JohtoTrainerBattle_branch_f65c6: octave 4 note G_, 4 octave 3 note A#, 4 loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6 -Music_JohtoTrainerBattle_branch_f65ce: ; f65ce +Music_JohtoTrainerBattle_branch_f65ce: callchannel Music_JohtoTrainerBattle_branch_f66b4 note D#, 2 note F_, 8 @@ -1179,11 +1170,11 @@ Music_JohtoTrainerBattle_branch_f65ce: ; f65ce note C_, 2 octave 3 note A#, 2 -Music_JohtoTrainerBattle_branch_f661e: ; f661e +Music_JohtoTrainerBattle_branch_f661e: note D#, 2 note A#, 2 loopchannel 8, Music_JohtoTrainerBattle_branch_f661e -Music_JohtoTrainerBattle_branch_f6624: ; f6624 +Music_JohtoTrainerBattle_branch_f6624: note C#, 2 note G#, 2 loopchannel 6, Music_JohtoTrainerBattle_branch_f6624 @@ -1193,11 +1184,11 @@ Music_JohtoTrainerBattle_branch_f6624: ; f6624 octave 3 note A#, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6630: ; f6630 +Music_JohtoTrainerBattle_branch_f6630: note D#, 2 note A#, 2 loopchannel 8, Music_JohtoTrainerBattle_branch_f6630 -Music_JohtoTrainerBattle_branch_f6636: ; f6636 +Music_JohtoTrainerBattle_branch_f6636: note C#, 2 note G#, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f6636 @@ -1256,9 +1247,8 @@ Music_JohtoTrainerBattle_branch_f6636: ; f6636 octave 4 note D_, 2 loopchannel 0, Music_JohtoTrainerBattle_branch_f6531 -; f6676 -Music_JohtoTrainerBattle_branch_f6676: ; f6676 +Music_JohtoTrainerBattle_branch_f6676: octave 4 note C_, 2 octave 3 @@ -1270,9 +1260,8 @@ Music_JohtoTrainerBattle_branch_f6676: ; f6676 note A#, 2 note G_, 2 endchannel -; f6681 -Music_JohtoTrainerBattle_branch_f6681: ; f6681 +Music_JohtoTrainerBattle_branch_f6681: octave 3 note E_, 2 note A_, 2 @@ -1290,9 +1279,8 @@ Music_JohtoTrainerBattle_branch_f6681: ; f6681 note F#, 2 note G_, 2 endchannel -; f6692 -Music_JohtoTrainerBattle_branch_f6692: ; f6692 +Music_JohtoTrainerBattle_branch_f6692: octave 3 note F_, 2 note A#, 2 @@ -1304,32 +1292,28 @@ Music_JohtoTrainerBattle_branch_f6692: ; f6692 octave 4 note D_, 2 endchannel -; f669d -Music_JohtoTrainerBattle_branch_f669d: ; f669d +Music_JohtoTrainerBattle_branch_f669d: octave 3 note E_, 2 note A_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f669d endchannel -; f66a5 -Music_JohtoTrainerBattle_branch_f66a5: ; f66a5 +Music_JohtoTrainerBattle_branch_f66a5: note D_, 2 note A_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5 endchannel -; f66ac -Music_JohtoTrainerBattle_branch_f66ac: ; f66ac +Music_JohtoTrainerBattle_branch_f66ac: octave 3 note C_, 2 note G_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac endchannel -; f66b4 -Music_JohtoTrainerBattle_branch_f66b4: ; f66b4 +Music_JohtoTrainerBattle_branch_f66b4: note A#, 4 note D#, 2 note A#, 2 @@ -1345,4 +1329,3 @@ Music_JohtoTrainerBattle_branch_f66b4: ; f66b4 note G#, 1 note A#, 2 endchannel -; f66c3 diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm index bcfde1824..3c104e111 100644 --- a/audio/music/johtowildbattle.asm +++ b/audio/music/johtowildbattle.asm @@ -1,16 +1,15 @@ -Music_JohtoWildBattle: ; f5dc5 +Music_JohtoWildBattle: musicheader 3, 1, Music_JohtoWildBattle_Ch1 musicheader 1, 2, Music_JohtoWildBattle_Ch2 musicheader 1, 3, Music_JohtoWildBattle_Ch3 -; f5dce -Music_JohtoWildBattle_Ch1: ; f5dce +Music_JohtoWildBattle_Ch1: tempo 104 volume $77 dutycycle $3 tone $0002 vibrato $12, $15 -Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb +Music_JohtoWildBattleNight_branch_f5ddb: notetype $c, $b2 octave 4 note C_, 1 @@ -87,7 +86,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb note D_, 4 intensity $6f note D#, 8 -Music_JohtoWildBattle_branch_f5e2d: ; f5e2d +Music_JohtoWildBattle_branch_f5e2d: intensity $b6 octave 3 note D_, 6 @@ -200,9 +199,8 @@ Music_JohtoWildBattle_branch_f5e2d: ; f5e2d note F#, 4 note G_, 16 loopchannel 0, Music_JohtoWildBattle_branch_f5e2d -; f5ea2 -Music_JohtoWildBattle_Ch2: ; f5ea2 +Music_JohtoWildBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -210,7 +208,7 @@ Music_JohtoWildBattle_Ch2: ; f5ea2 notetype $c, $c2 octave 4 note G_, 6 -Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2 +Music_JohtoWildBattleNight_branch_f5eb2: octave 3 note D_, 6 note G_, 4 @@ -239,7 +237,7 @@ Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2 note G_, 4 intensity $6f note G#, 8 -Music_JohtoWildBattle_branch_f5ed1: ; f5ed1 +Music_JohtoWildBattle_branch_f5ed1: intensity $c4 octave 3 note G_, 6 @@ -363,10 +361,9 @@ Music_JohtoWildBattle_branch_f5ed1: ; f5ed1 note A#, 4 note B_, 16 loopchannel 0, Music_JohtoWildBattle_branch_f5ed1 -; f5f5d -Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d -Music_JohtoWildBattle_branch_f5f5d: ; f5f5d +Music_JohtoWildBattleNight_branch_f5f5d: +Music_JohtoWildBattle_branch_f5f5d: notetype $c, $c2 octave 4 note F_, 1 @@ -417,11 +414,10 @@ Music_JohtoWildBattle_branch_f5f5d: ; f5f5d octave 5 note G_, 1 endchannel -; f5f91 -Music_JohtoWildBattle_Ch3: ; f5f91 +Music_JohtoWildBattle_Ch3: notetype $c, $14 -Music_JohtoWildBattleNight_branch_f5f94: ; f5f94 +Music_JohtoWildBattleNight_branch_f5f94: octave 4 note G_, 2 octave 5 @@ -470,7 +466,7 @@ Music_JohtoWildBattleNight_branch_f5f94: ; f5f94 note D#, 2 note G_, 2 note F_, 2 -Music_JohtoWildBattle_branch_f5fc6: ; f5fc6 +Music_JohtoWildBattle_branch_f5fc6: note D_, 2 note G_, 2 loopchannel 6, Music_JohtoWildBattle_branch_f5fc6 @@ -487,20 +483,20 @@ Music_JohtoWildBattle_branch_f5fc6: ; f5fc6 note G_, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f5fdb: ; f5fdb +Music_JohtoWildBattle_branch_f5fdb: note D_, 2 note G_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f5fdb note F#, 4 callchannel Music_JohtoWildBattle_branch_f6055 callchannel Music_JohtoWildBattle_branch_f6055 -Music_JohtoWildBattle_branch_f5fe8: ; f5fe8 +Music_JohtoWildBattle_branch_f5fe8: note D_, 2 note G_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f5fe8 note D_, 2 note A_, 2 -Music_JohtoWildBattle_branch_f5ff0: ; f5ff0 +Music_JohtoWildBattle_branch_f5ff0: note C_, 2 note F_, 2 loopchannel 5, Music_JohtoWildBattle_branch_f5ff0 @@ -518,7 +514,7 @@ Music_JohtoWildBattle_branch_f5ff0: ; f5ff0 note D#, 2 note G#, 2 note G_, 4 -Music_JohtoWildBattle_branch_f6006: ; f6006 +Music_JohtoWildBattle_branch_f6006: note E_, 2 note A_, 2 loopchannel 8, Music_JohtoWildBattle_branch_f6006 @@ -547,11 +543,11 @@ Music_JohtoWildBattle_branch_f6006: ; f6006 note F#, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f6027: ; f6027 +Music_JohtoWildBattle_branch_f6027: note D_, 2 note G_, 2 loopchannel 8, Music_JohtoWildBattle_branch_f6027 -Music_JohtoWildBattle_branch_f602d: ; f602d +Music_JohtoWildBattle_branch_f602d: note C_, 2 note F_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f602d @@ -561,17 +557,17 @@ Music_JohtoWildBattle_branch_f602d: ; f602d note G_, 4 note D_, 4 note G_, 4 -Music_JohtoWildBattle_branch_f6039: ; f6039 +Music_JohtoWildBattle_branch_f6039: note D_, 2 note G_, 2 loopchannel 12, Music_JohtoWildBattle_branch_f6039 -Music_JohtoWildBattle_branch_f603f: ; f603f +Music_JohtoWildBattle_branch_f603f: note C_, 2 note E_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f603f note F_, 2 note F#, 2 -Music_JohtoWildBattle_branch_f6047: ; f6047 +Music_JohtoWildBattle_branch_f6047: note D_, 2 note G_, 2 loopchannel 6, Music_JohtoWildBattle_branch_f6047 @@ -580,11 +576,9 @@ Music_JohtoWildBattle_branch_f6047: ; f6047 note F#, 2 note E_, 2 loopchannel 0, Music_JohtoWildBattle_branch_f5fdb -; f6055 -Music_JohtoWildBattle_branch_f6055: ; f6055 +Music_JohtoWildBattle_branch_f6055: note D#, 2 note G#, 2 loopchannel 4, Music_JohtoWildBattle_branch_f6055 endchannel -; f605c diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm index d176a43f3..b4b1651bd 100644 --- a/audio/music/johtowildbattlenight.asm +++ b/audio/music/johtowildbattlenight.asm @@ -1,19 +1,17 @@ -Music_JohtoWildBattleNight: ; f605c +Music_JohtoWildBattleNight: musicheader 3, 1, Music_JohtoWildBattleNight_Ch1 musicheader 1, 2, Music_JohtoWildBattleNight_Ch2 musicheader 1, 3, Music_JohtoWildBattleNight_Ch3 -; f6065 -Music_JohtoWildBattleNight_Ch1: ; f6065 +Music_JohtoWildBattleNight_Ch1: tempo 107 volume $77 dutycycle $3 tone $0002 vibrato $10, $25 loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb -; f6076 -Music_JohtoWildBattleNight_Ch2: ; f6076 +Music_JohtoWildBattleNight_Ch2: dutycycle $3 vibrato $20, $36 tone $0001 @@ -24,9 +22,7 @@ Music_JohtoWildBattleNight_Ch2: ; f6076 tone $0001 dutycycle $2 loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2 -; f608f -Music_JohtoWildBattleNight_Ch3: ; f608f +Music_JohtoWildBattleNight_Ch3: notetype $c, $11 loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94 -; f6096 diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm index 99fdab1a6..7ba65a422 100644 --- a/audio/music/kantogymbattle.asm +++ b/audio/music/kantogymbattle.asm @@ -1,10 +1,9 @@ -Music_KantoGymBattle: ; ec720 +Music_KantoGymBattle: musicheader 3, 1, Music_KantoGymBattle_Ch1 musicheader 1, 2, Music_KantoGymBattle_Ch2 musicheader 1, 3, Music_KantoGymBattle_Ch3 -; ec729 -Music_KantoGymBattle_Ch1: ; ec729 +Music_KantoGymBattle_Ch1: tempo 101 volume $77 dutycycle $3 @@ -86,7 +85,7 @@ Music_KantoGymBattle_Ch1: ; ec729 note E_, 4 note E_, 4 note E_, 2 -Music_KantoGymBattle_branch_ec78b: ; ec78b +Music_KantoGymBattle_branch_ec78b: callchannel Music_KantoGymBattle_branch_ec832 octave 2 note A#, 2 @@ -229,9 +228,8 @@ Music_KantoGymBattle_branch_ec78b: ; ec78b octave 3 note D_, 4 loopchannel 0, Music_KantoGymBattle_branch_ec78b -; ec832 -Music_KantoGymBattle_branch_ec832: ; ec832 +Music_KantoGymBattle_branch_ec832: intensity $b5 note D#, 2 octave 2 @@ -252,14 +250,13 @@ Music_KantoGymBattle_branch_ec832: ; ec832 note D#, 2 note C#, 2 endchannel -; ec847 -Music_KantoGymBattle_Ch2: ; ec847 +Music_KantoGymBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 notetype $c, $c2 -Music_KantoGymBattle_branch_ec852: ; ec852 +Music_KantoGymBattle_branch_ec852: octave 4 note A#, 1 note G#, 1 @@ -268,7 +265,7 @@ Music_KantoGymBattle_branch_ec852: ; ec852 note D#, 1 loopchannel 8, Music_KantoGymBattle_branch_ec852 octave 3 -Music_KantoGymBattle_branch_ec85d: ; ec85d +Music_KantoGymBattle_branch_ec85d: intensity $c2 note D#, 2 note D#, 2 @@ -316,7 +313,7 @@ Music_KantoGymBattle_branch_ec85d: ; ec85d intensity $c2 octave 4 loopchannel 2, Music_KantoGymBattle_branch_ec85d -Music_KantoGymBattle_branch_ec894: ; ec894 +Music_KantoGymBattle_branch_ec894: callchannel Music_KantoGymBattle_branch_ec907 note E_, 8 note G#, 8 @@ -405,9 +402,8 @@ Music_KantoGymBattle_branch_ec894: ; ec894 octave 3 note A_, 4 loopchannel 0, Music_KantoGymBattle_branch_ec894 -; ec907 -Music_KantoGymBattle_branch_ec907: ; ec907 +Music_KantoGymBattle_branch_ec907: dutycycle $2 intensity $d1 octave 3 @@ -437,21 +433,20 @@ Music_KantoGymBattle_branch_ec907: ; ec907 dutycycle $3 intensity $b0 endchannel -; ec92e -Music_KantoGymBattle_Ch3: ; ec92e +Music_KantoGymBattle_Ch3: notetype $c, $19 octave 2 note E_, 1 note __, 1 -Music_KantoGymBattle_branch_ec934: ; ec934 +Music_KantoGymBattle_branch_ec934: note B_, 3 note __, 1 loopchannel 6, Music_KantoGymBattle_branch_ec934 note B_, 2 note G#, 2 note B_, 2 -Music_KantoGymBattle_branch_ec93d: ; ec93d +Music_KantoGymBattle_branch_ec93d: note D#, 1 note __, 1 note D#, 1 @@ -489,12 +484,12 @@ Music_KantoGymBattle_branch_ec93d: ; ec93d note __, 1 note E_, 2 loopchannel 2, Music_KantoGymBattle_branch_ec93d -Music_KantoGymBattle_branch_ec965: ; ec965 +Music_KantoGymBattle_branch_ec965: octave 2 note D#, 2 note A#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec965 -Music_KantoGymBattle_branch_ec96c: ; ec96c +Music_KantoGymBattle_branch_ec96c: note E_, 2 note B_, 2 loopchannel 4, Music_KantoGymBattle_branch_ec96c @@ -511,13 +506,13 @@ Music_KantoGymBattle_branch_ec96c: ; ec96c note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec97f: ; ec97f +Music_KantoGymBattle_branch_ec97f: octave 2 note F#, 2 octave 3 note C#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec97f -Music_KantoGymBattle_branch_ec987: ; ec987 +Music_KantoGymBattle_branch_ec987: octave 2 note E_, 2 note B_, 2 @@ -526,7 +521,7 @@ Music_KantoGymBattle_branch_ec987: ; ec987 note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec992: ; ec992 +Music_KantoGymBattle_branch_ec992: note D#, 1 note __, 1 note D#, 1 @@ -546,7 +541,7 @@ Music_KantoGymBattle_branch_ec992: ; ec992 note __, 1 note E_, 2 loopchannel 2, Music_KantoGymBattle_branch_ec992 -Music_KantoGymBattle_branch_ec9a8: ; ec9a8 +Music_KantoGymBattle_branch_ec9a8: note D#, 2 note A#, 2 loopchannel 7, Music_KantoGymBattle_branch_ec9a8 @@ -563,12 +558,12 @@ Music_KantoGymBattle_branch_ec9a8: ; ec9a8 note B_, 2 octave 3 note E_, 2 -Music_KantoGymBattle_branch_ec9bb: ; ec9bb +Music_KantoGymBattle_branch_ec9bb: octave 2 note E_, 2 note B_, 2 loopchannel 5, Music_KantoGymBattle_branch_ec9bb -Music_KantoGymBattle_branch_ec9c2: ; ec9c2 +Music_KantoGymBattle_branch_ec9c2: octave 2 note F#, 2 octave 3 @@ -588,16 +583,16 @@ Music_KantoGymBattle_branch_ec9c2: ; ec9c2 note F#, 2 note E_, 2 note C#, 2 -Music_KantoGymBattle_branch_ec9d8: ; ec9d8 +Music_KantoGymBattle_branch_ec9d8: octave 2 note D#, 2 note A#, 2 loopchannel 4, Music_KantoGymBattle_branch_ec9d8 -Music_KantoGymBattle_branch_ec9df: ; ec9df +Music_KantoGymBattle_branch_ec9df: note C#, 2 note G#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec9df -Music_KantoGymBattle_branch_ec9e5: ; ec9e5 +Music_KantoGymBattle_branch_ec9e5: note D#, 2 note A#, 2 loopchannel 4, Music_KantoGymBattle_branch_ec9e5 @@ -613,4 +608,3 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5 note D#, 2 note F_, 2 loopchannel 0, Music_KantoGymBattle_branch_ec965 -; ec9fa diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm index 10c1e7c0e..511763c92 100644 --- a/audio/music/kantotrainerbattle.asm +++ b/audio/music/kantotrainerbattle.asm @@ -1,12 +1,11 @@ -Music_KantoTrainerBattle: ; ec9fa +Music_KantoTrainerBattle: musicheader 3, 1, Music_KantoTrainerBattle_Ch1 musicheader 1, 2, Music_KantoTrainerBattle_Ch2 musicheader 1, 3, Music_KantoTrainerBattle_Ch3 -; eca03 db $3 -Music_KantoTrainerBattle_Ch1: ; eca04 +Music_KantoTrainerBattle_Ch1: tempo 114 volume $77 pitchoffset 1, B_ @@ -127,7 +126,7 @@ Music_KantoTrainerBattle_Ch1: ; eca04 note D#, 2 note F_, 2 note F#, 2 -Music_KantoTrainerBattle_branch_eca88: ; eca88 +Music_KantoTrainerBattle_branch_eca88: notetype $c, $b7 note D#, 4 note __, 2 @@ -464,9 +463,8 @@ Music_KantoTrainerBattle_branch_eca88: ; eca88 octave 4 note D_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_eca88 -; ecbea -Music_KantoTrainerBattle_Ch2: ; ecbea +Music_KantoTrainerBattle_Ch2: pitchoffset 1, B_ vibrato $6, $36 dutycycle $1 @@ -485,7 +483,7 @@ Music_KantoTrainerBattle_Ch2: ; ecbea note F#, 1 dutycycle $3 intensity $62 -Music_KantoTrainerBattle_branch_ecc04: ; ecc04 +Music_KantoTrainerBattle_branch_ecc04: octave 3 note G_, 1 note G#, 1 @@ -542,7 +540,7 @@ Music_KantoTrainerBattle_branch_ecc04: ; ecc04 octave 3 note D_, 1 note F_, 1 -Music_KantoTrainerBattle_branch_ecc41: ; ecc41 +Music_KantoTrainerBattle_branch_ecc41: notetype $c, $d7 octave 2 note C_, 1 @@ -917,9 +915,8 @@ Music_KantoTrainerBattle_branch_ecc41: ; ecc41 octave 3 note B_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_ecc41 -; ecdd2 -Music_KantoTrainerBattle_Ch3: ; ecdd2 +Music_KantoTrainerBattle_Ch3: pitchoffset 1, B_ vibrato $12, $23 notetype $c, $15 @@ -1050,7 +1047,7 @@ Music_KantoTrainerBattle_Ch3: ; ecdd2 note G_, 2 note A#, 2 note B_, 2 -Music_KantoTrainerBattle_branch_ece5a: ; ece5a +Music_KantoTrainerBattle_branch_ece5a: notetype $c, $14 octave 6 note C_, 4 @@ -1537,4 +1534,3 @@ Music_KantoTrainerBattle_branch_ece5a: ; ece5a octave 5 note G_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_ece5a -; ed06d diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm index 7f4f6e174..c19da00df 100644 --- a/audio/music/kantowildbattle.asm +++ b/audio/music/kantowildbattle.asm @@ -1,12 +1,11 @@ -Music_KantoWildBattle: ; ed06d +Music_KantoWildBattle: musicheader 3, 1, Music_KantoWildBattle_Ch1 musicheader 1, 2, Music_KantoWildBattle_Ch2 musicheader 1, 3, Music_KantoWildBattle_Ch3 -; ed076 db $3 -Music_KantoWildBattle_Ch1: ; ed077 +Music_KantoWildBattle_Ch1: tempo 112 volume $77 vibrato $12, $23 @@ -25,7 +24,7 @@ Music_KantoWildBattle_Ch1: ; ed077 note G_, 1 note F#, 1 note F_, 1 -Music_KantoWildBattle_branch_ed091: ; ed091 +Music_KantoWildBattle_branch_ed091: notetype $c, $b7 callchannel Music_KantoWildBattle_branch_ed18a octave 4 @@ -208,7 +207,7 @@ Music_KantoWildBattle_branch_ed091: ; ed091 note D#, 1 note __, 5 note C#, 8 -Music_KantoWildBattle_branch_ed15b: ; ed15b +Music_KantoWildBattle_branch_ed15b: intensity $b1 octave 3 note C_, 1 @@ -216,34 +215,33 @@ Music_KantoWildBattle_branch_ed15b: ; ed15b note D_, 1 note C#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed15b -Music_KantoWildBattle_branch_ed166: ; ed166 +Music_KantoWildBattle_branch_ed166: note C#, 1 note F_, 1 note E_, 1 note D#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed166 -Music_KantoWildBattle_branch_ed16e: ; ed16e +Music_KantoWildBattle_branch_ed16e: note C_, 1 note D#, 1 note D_, 1 note C#, 1 loopchannel 16, Music_KantoWildBattle_branch_ed16e -Music_KantoWildBattle_branch_ed176: ; ed176 +Music_KantoWildBattle_branch_ed176: note C#, 1 note E_, 1 note D#, 1 note D_, 1 loopchannel 8, Music_KantoWildBattle_branch_ed176 -Music_KantoWildBattle_branch_ed17e: ; ed17e +Music_KantoWildBattle_branch_ed17e: note C_, 1 note D#, 1 note D_, 1 note C#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed17e loopchannel 0, Music_KantoWildBattle_branch_ed091 -; ed18a -Music_KantoWildBattle_branch_ed18a: ; ed18a +Music_KantoWildBattle_branch_ed18a: octave 4 note C_, 1 note __, 5 @@ -265,9 +263,8 @@ Music_KantoWildBattle_branch_ed18a: ; ed18a note B_, 1 note __, 3 endchannel -; ed19f -Music_KantoWildBattle_Ch2: ; ed19f +Music_KantoWildBattle_Ch2: dutycycle $1 vibrato $12, $23 notetype $c, $b1 @@ -304,7 +301,7 @@ Music_KantoWildBattle_Ch2: ; ed19f note D#, 1 note D_, 1 note C#, 1 -Music_KantoWildBattle_branch_ed1c8: ; ed1c8 +Music_KantoWildBattle_branch_ed1c8: notetype $c, $b7 callchannel Music_KantoWildBattle_branch_ed2c6 octave 2 @@ -493,9 +490,8 @@ endr note C_, 2 note __, 2 loopchannel 0, Music_KantoWildBattle_branch_ed1c8 -; ed2c6 -Music_KantoWildBattle_branch_ed2c6: ; ed2c6 +Music_KantoWildBattle_branch_ed2c6: octave 2 note C_, 1 note __, 2 @@ -561,9 +557,8 @@ Music_KantoWildBattle_branch_ed2c6: ; ed2c6 octave 1 note G_, 2 endchannel -; ed307 -Music_KantoWildBattle_branch_ed307: ; ed307 +Music_KantoWildBattle_branch_ed307: octave 2 note C_, 2 note __, 4 @@ -584,9 +579,8 @@ Music_KantoWildBattle_branch_ed307: ; ed307 octave 2 note C_, 4 endchannel -; ed31b -Music_KantoWildBattle_branch_ed31b: ; ed31b +Music_KantoWildBattle_branch_ed31b: octave 2 note C_, 2 note __, 4 @@ -624,9 +618,8 @@ Music_KantoWildBattle_branch_ed31b: ; ed31b octave 3 note C_, 2 endchannel -; ed340 -Music_KantoWildBattle_branch_ed340: ; ed340 +Music_KantoWildBattle_branch_ed340: octave 3 note G_, 4 octave 2 @@ -647,9 +640,8 @@ Music_KantoWildBattle_branch_ed340: ; ed340 note C_, 2 note __, 2 endchannel -; ed354 -Music_KantoWildBattle_branch_ed354: ; ed354 +Music_KantoWildBattle_branch_ed354: note C_, 2 note __, 2 octave 3 @@ -670,9 +662,8 @@ Music_KantoWildBattle_branch_ed354: ; ed354 note C_, 2 note __, 2 endchannel -; ed368 -Music_KantoWildBattle_Ch3: ; ed368 +Music_KantoWildBattle_Ch3: vibrato $14, $23 notetype $c, $14 octave 3 @@ -723,7 +714,7 @@ Music_KantoWildBattle_Ch3: ; ed368 note G_, 1 octave 4 note G_, 1 -Music_KantoWildBattle_branch_ed39e: ; ed39e +Music_KantoWildBattle_branch_ed39e: notetype $c, $14 octave 5 note G_, 1 @@ -1222,4 +1213,3 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e note G_, 16 note G_, 16 loopchannel 0, Music_KantoWildBattle_branch_ed39e -; ed5c6 diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm index 4bfd8111b..4f7154fd6 100644 --- a/audio/music/lakeofrage.asm +++ b/audio/music/lakeofrage.asm @@ -1,11 +1,10 @@ -Music_LakeOfRage: ; ee6c5 +Music_LakeOfRage: 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 +Music_LakeOfRage_Ch1: tempo 144 volume $77 dutycycle $3 @@ -19,7 +18,7 @@ Music_LakeOfRage_Ch1: ; ee6d1 note D_, 6 note D_, 6 note E_, 4 -Music_LakeOfRage_branch_ee6e9: ; ee6e9 +Music_LakeOfRage_branch_ee6e9: intensity $b5 note F#, 6 note E_, 6 @@ -93,9 +92,8 @@ Music_LakeOfRage_branch_ee6e9: ; ee6e9 intensity $a7 note D_, 6 loopchannel 0, Music_LakeOfRage_branch_ee6e9 -; ee749 -Music_LakeOfRage_Ch2: ; ee749 +Music_LakeOfRage_Ch2: dutycycle $3 vibrato $20, $44 stereopanning $ff @@ -108,7 +106,7 @@ Music_LakeOfRage_Ch2: ; ee749 note A_, 8 intensity $a7 note A_, 8 -Music_LakeOfRage_branch_ee75e: ; ee75e +Music_LakeOfRage_branch_ee75e: notetype $8, $c7 octave 4 note D_, 16 @@ -183,9 +181,8 @@ Music_LakeOfRage_branch_ee75e: ; ee75e notetype $c, $c7 note A_, 16 loopchannel 0, Music_LakeOfRage_branch_ee75e -; ee7c1 -Music_LakeOfRage_Ch3: ; ee7c1 +Music_LakeOfRage_Ch3: stereopanning $f notetype $c, $16 octave 3 @@ -198,7 +195,7 @@ Music_LakeOfRage_Ch3: ; ee7c1 note F#, 4 note __, 2 note E_, 4 -Music_LakeOfRage_branch_ee7d0: ; ee7d0 +Music_LakeOfRage_branch_ee7d0: octave 3 note D_, 4 octave 2 @@ -297,13 +294,12 @@ Music_LakeOfRage_branch_ee7d0: ; ee7d0 octave 2 note A_, 2 loopchannel 0, Music_LakeOfRage_branch_ee7d0 -; ee835 -Music_LakeOfRage_Ch4: ; ee835 +Music_LakeOfRage_Ch4: stereopanning $f0 togglenoise $3 notetype $c -Music_LakeOfRage_branch_ee83b: ; ee83b +Music_LakeOfRage_branch_ee83b: note D_, 2 note D_, 1 note D_, 1 @@ -324,4 +320,3 @@ Music_LakeOfRage_branch_ee83b: ; ee83b note D_, 1 note D_, 1 loopchannel 0, Music_LakeOfRage_branch_ee83b -; ee852 diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm index ff7176fca..512db764f 100644 --- a/audio/music/lakeofragerocketradio.asm +++ b/audio/music/lakeofragerocketradio.asm @@ -1,17 +1,16 @@ -Music_LakeOfRageRocketRadio: ; ef5b1 +Music_LakeOfRageRocketRadio: musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1 musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2 musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3 -; ef5ba -Music_LakeOfRageRocketRadio_Ch1: ; ef5ba +Music_LakeOfRageRocketRadio_Ch1: tempo 160 volume $77 dutycycle $1 tone $1118 vibrato $0, $f0 stereopanning $f0 -Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9 +Music_LakeOfRageRocketRadio_branch_ef5c9: notetype $c, $a7 octave 7 note G_, 4 @@ -20,20 +19,17 @@ Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9 note F#, 4 note __, 16 loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5d6 -Music_LakeOfRageRocketRadio_Ch2: ; ef5d6 +Music_LakeOfRageRocketRadio_Ch2: dutycycle $1 vibrato $13, $e8 notetype $c, $a7 note __, 2 stereopanning $f loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5e5 -Music_LakeOfRageRocketRadio_Ch3: ; ef5e5 +Music_LakeOfRageRocketRadio_Ch3: notetype $c, $26 vibrato $10, $44 note __, 4 loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5f0 diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm index 11608cf9b..6384b7018 100644 --- a/audio/music/lavendertown.asm +++ b/audio/music/lavendertown.asm @@ -1,12 +1,11 @@ -Music_LavenderTown: ; ef72f +Music_LavenderTown: musicheader 3, 1, Music_LavenderTown_Ch1 musicheader 1, 2, Music_LavenderTown_Ch2 musicheader 1, 3, Music_LavenderTown_Ch3 -; ef738 db $3 -Music_LavenderTown_Ch1: ; ef739 +Music_LavenderTown_Ch1: tempo 160 volume $77 stereopanning $f @@ -17,7 +16,7 @@ Music_LavenderTown_Ch1: ; ef739 note __, 16 note __, 16 note __, 16 -Music_LavenderTown_branch_ef74c: ; ef74c +Music_LavenderTown_branch_ef74c: callchannel Music_LavenderTown_branch_ef7fd intensity $93 octave 5 @@ -103,7 +102,7 @@ Music_LavenderTown_branch_ef74c: ; ef74c octave 3 note A_, 2 note F_, 2 -Music_LavenderTown_branch_ef7ca: ; ef7ca +Music_LavenderTown_branch_ef7ca: octave 3 note C_, 2 note E_, 2 @@ -149,9 +148,8 @@ Music_LavenderTown_branch_ef7ca: ; ef7ca note B_, 8 note B_, 8 loopchannel 0, Music_LavenderTown_branch_ef74c -; ef7fd -Music_LavenderTown_branch_ef7fd: ; ef7fd +Music_LavenderTown_branch_ef7fd: intensity $83 octave 5 note C_, 2 @@ -242,9 +240,8 @@ Music_LavenderTown_branch_ef7fd: ; ef7fd intensity $43 note F_, 2 endchannel -; ef87f -Music_LavenderTown_branch_ef87f: ; ef87f +Music_LavenderTown_branch_ef87f: intensity $93 octave 5 note G_, 2 @@ -263,13 +260,12 @@ Music_LavenderTown_branch_ef87f: ; ef87f intensity $43 note G_, 2 endchannel -; ef899 -Music_LavenderTown_Ch2: ; ef899 +Music_LavenderTown_Ch2: dutycycle $1 vibrato $8, $24 stereopanning $ff -Music_LavenderTown_branch_ef8a0: ; ef8a0 +Music_LavenderTown_branch_ef8a0: notetype $c, $a3 octave 5 note C_, 2 @@ -305,7 +301,7 @@ Music_LavenderTown_branch_ef8a0: ; ef8a0 note D_, 2 intensity $63 note D_, 2 -Music_LavenderTown_branch_ef8d7: ; ef8d7 +Music_LavenderTown_branch_ef8d7: intensity $b5 callchannel Music_LavenderTown_branch_ef915 octave 2 @@ -358,9 +354,8 @@ Music_LavenderTown_branch_ef8d7: ; ef8d7 note F_, 1 note G_, 6 loopchannel 0, Music_LavenderTown_branch_ef8d7 -; ef915 -Music_LavenderTown_branch_ef915: ; ef915 +Music_LavenderTown_branch_ef915: octave 2 note C_, 4 note G_, 4 @@ -390,9 +385,8 @@ Music_LavenderTown_branch_ef915: ; ef915 note A_, 4 note C_, 4 endchannel -; ef932 -Music_LavenderTown_Ch3: ; ef932 +Music_LavenderTown_Ch3: vibrato $12, $24 notetype $c, $13 stereopanning $f0 @@ -403,7 +397,7 @@ Music_LavenderTown_Ch3: ; ef932 octave 5 note E_, 4 note F_, 4 -Music_LavenderTown_branch_ef941: ; ef941 +Music_LavenderTown_branch_ef941: intensity $12 octave 5 note G_, 4 @@ -518,4 +512,3 @@ Music_LavenderTown_branch_ef941: ; ef941 note E_, 2 note F_, 2 loopchannel 0, Music_LavenderTown_branch_ef941 -; ef9bc diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm index 0a0dc0637..9846e7ec6 100644 --- a/audio/music/lighthouse.asm +++ b/audio/music/lighthouse.asm @@ -1,18 +1,17 @@ -Music_Lighthouse: ; ee569 +Music_Lighthouse: 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 +Music_Lighthouse_Ch1: tempo 144 volume $77 dutycycle $3 tone $0004 vibrato $8, $45 stereopanning $f -Music_Lighthouse_branch_ee584: ; ee584 +Music_Lighthouse_branch_ee584: notetype $c, $b3 octave 3 note C#, 8 @@ -128,13 +127,12 @@ Music_Lighthouse_branch_ee584: ; ee584 note A_, 2 note G#, 8 loopchannel 0, Music_Lighthouse_branch_ee584 -; ee5fc -Music_Lighthouse_Ch2: ; ee5fc +Music_Lighthouse_Ch2: dutycycle $3 tone $0002 vibrato $10, $45 -Music_Lighthouse_branch_ee604: ; ee604 +Music_Lighthouse_branch_ee604: notetype $c, $c5 octave 3 note G#, 12 @@ -211,12 +209,11 @@ Music_Lighthouse_branch_ee604: ; ee604 note C#, 2 note C_, 8 loopchannel 0, Music_Lighthouse_branch_ee604 -; ee656 -Music_Lighthouse_Ch3: ; ee656 +Music_Lighthouse_Ch3: notetype $c, $19 stereopanning $f0 -Music_Lighthouse_branch_ee65b: ; ee65b +Music_Lighthouse_branch_ee65b: octave 2 note G#, 2 note __, 2 @@ -226,7 +223,7 @@ Music_Lighthouse_branch_ee65b: ; ee65b note __, 2 note G_, 2 note __, 2 -Music_Lighthouse_branch_ee664: ; ee664 +Music_Lighthouse_branch_ee664: note G#, 2 note __, 2 note D#, 2 @@ -255,7 +252,7 @@ Music_Lighthouse_branch_ee664: ; ee664 octave 3 note C_, 2 note __, 2 -Music_Lighthouse_branch_ee683: ; ee683 +Music_Lighthouse_branch_ee683: note C#, 2 note __, 2 octave 2 @@ -277,7 +274,7 @@ Music_Lighthouse_branch_ee683: ; ee683 octave 3 note D#, 2 note F#, 2 -Music_Lighthouse_branch_ee69b: ; ee69b +Music_Lighthouse_branch_ee69b: note E_, 2 note __, 2 octave 2 @@ -290,12 +287,11 @@ Music_Lighthouse_branch_ee69b: ; ee69b note __, 2 loopchannel 8, Music_Lighthouse_branch_ee69b loopchannel 0, Music_Lighthouse_branch_ee65b -; ee6ad -Music_Lighthouse_Ch4: ; ee6ad +Music_Lighthouse_Ch4: togglenoise $0 notetype $c -Music_Lighthouse_branch_ee6b1: ; ee6b1 +Music_Lighthouse_branch_ee6b1: stereopanning $f note G#, 4 note F_, 2 @@ -311,4 +307,3 @@ Music_Lighthouse_branch_ee6b1: ; ee6b1 note G#, 2 note A_, 2 loopchannel 0, Music_Lighthouse_branch_ee6b1 -; ee6c5 diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm index a7ee254bb..313f23663 100644 --- a/audio/music/lookbeauty.asm +++ b/audio/music/lookbeauty.asm @@ -1,11 +1,10 @@ -Music_LookBeauty: ; eee3e +Music_LookBeauty: 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 +Music_LookBeauty_Ch1: stereopanning $f vibrato $12, $25 dutycycle $2 @@ -17,7 +16,7 @@ Music_LookBeauty_Ch1: ; eee4a octave 4 note C_, 8 dutycycle $3 -Music_LookBeauty_branch_eee5f: ; eee5f +Music_LookBeauty_branch_eee5f: note __, 4 octave 3 note D_, 1 @@ -76,9 +75,8 @@ Music_LookBeauty_branch_eee5f: ; eee5f octave 4 note C_, 1 loopchannel 0, Music_LookBeauty_branch_eee5f -; eee9c -Music_LookBeauty_Ch2: ; eee9c +Music_LookBeauty_Ch2: stereopanning $f0 vibrato $10, $23 dutycycle $2 @@ -113,7 +111,7 @@ Music_LookBeauty_Ch2: ; eee9c note F#, 1 note __, 1 dutycycle $3 -Music_LookBeauty_branch_eeec5: ; eeec5 +Music_LookBeauty_branch_eeec5: notetype $c, $c7 note G_, 16 note A_, 8 @@ -154,9 +152,8 @@ Music_LookBeauty_branch_eeec5: ; eeec5 note F#, 8 note A_, 8 loopchannel 0, Music_LookBeauty_branch_eeec5 -; eeefa -Music_LookBeauty_Ch3: ; eeefa +Music_LookBeauty_Ch3: stereopanning $ff vibrato $8, $12 notetype $c, $15 @@ -173,7 +170,7 @@ Music_LookBeauty_Ch3: ; eeefa octave 3 note D_, 7 note F#, 1 -Music_LookBeauty_branch_eef0f: ; eef0f +Music_LookBeauty_branch_eef0f: note G_, 4 octave 4 note B_, 1 @@ -295,22 +292,20 @@ Music_LookBeauty_branch_eef0f: ; eef0f octave 3 note D_, 8 loopchannel 0, Music_LookBeauty_branch_eef0f -; eef8b -Music_LookBeauty_Ch4: ; eef8b +Music_LookBeauty_Ch4: togglenoise $3 notetype $c note __, 16 note __, 16 -Music_LookBeauty_branch_eef91: ; eef91 +Music_LookBeauty_branch_eef91: callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 loopchannel 0, Music_LookBeauty_branch_eef91 -; eefa1 -Music_LookBeauty_branch_eefa1: ; eefa1 +Music_LookBeauty_branch_eefa1: note F#, 2 note G_, 2 note D_, 2 @@ -328,4 +323,3 @@ Music_LookBeauty_branch_eefa1: ; eefa1 note D_, 2 note G_, 2 endchannel -; eefb2 diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm index 0a86a3026..9a394eb7b 100644 --- a/audio/music/lookhiker.asm +++ b/audio/music/lookhiker.asm @@ -1,11 +1,10 @@ -Music_LookHiker: ; f7411 +Music_LookHiker: 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 +Music_LookHiker_Ch1: tempo 132 volume $77 tone $0001 @@ -17,7 +16,7 @@ Music_LookHiker_Ch1: ; f741d note F#, 2 note F_, 2 note F#, 8 -Music_LookHiker_branch_f7433: ; f7433 +Music_LookHiker_branch_f7433: note D_, 2 note D#, 2 note E_, 2 @@ -31,9 +30,8 @@ Music_LookHiker_branch_f7433: ; f7433 note F#, 2 note __, 6 loopchannel 0, Music_LookHiker_branch_f7433 -; f7443 -Music_LookHiker_Ch2: ; f7443 +Music_LookHiker_Ch2: dutycycle $0 notetype $c, $a1 note __, 4 @@ -50,7 +48,7 @@ Music_LookHiker_Ch2: ; f7443 note F#, 1 note D_, 1 intensity $a1 -Music_LookHiker_branch_f7457: ; f7457 +Music_LookHiker_branch_f7457: octave 1 note B_, 1 note B_, 2 @@ -68,9 +66,8 @@ Music_LookHiker_branch_f7457: ; f7457 note F#, 1 note D_, 1 loopchannel 0, Music_LookHiker_branch_f7457 -; f746b -Music_LookHiker_Ch3: ; f746b +Music_LookHiker_Ch3: vibrato $12, $24 stereopanning $f0 notetype $c, $14 @@ -78,7 +75,7 @@ Music_LookHiker_Ch3: ; f746b note B_, 2 note A#, 2 note B_, 8 -Music_LookHiker_branch_f7477: ; f7477 +Music_LookHiker_branch_f7477: octave 5 note D#, 2 note D_, 2 @@ -91,9 +88,8 @@ Music_LookHiker_branch_f7477: ; f7477 note A#, 2 callchannel Music_LookHiker_branch_f748a loopchannel 0, Music_LookHiker_branch_f7477 -; f748a -Music_LookHiker_branch_f748a: ; f748a +Music_LookHiker_branch_f748a: octave 4 note B_, 2 note __, 4 @@ -104,17 +100,15 @@ Music_LookHiker_branch_f748a: ; f748a note B_, 2 note __, 6 endchannel -; f7494 -Music_LookHiker_Ch4: ; f7494 +Music_LookHiker_Ch4: togglenoise $3 notetype $c note F_, 4 note __, 16 -Music_LookHiker_branch_f749a: ; f749a +Music_LookHiker_branch_f749a: note D#, 2 note G_, 2 note D_, 2 note G_, 2 loopchannel 0, Music_LookHiker_branch_f749a -; f74a2 diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index 6acbb5ab1..dc1dbee87 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -1,12 +1,11 @@ -Music_LookKimonoGirl: ; f79b8 +Music_LookKimonoGirl: musicheader 3, 1, Music_LookKimonoGirl_Ch1 musicheader 1, 2, Music_LookKimonoGirl_Ch2 musicheader 1, 3, Music_LookKimonoGirl_Ch3 -; f79c1 db $3 -Music_LookKimonoGirl_Ch1: ; f79c2 +Music_LookKimonoGirl_Ch1: tempo 160 volume $77 stereopanning $f @@ -15,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2 tone $0001 callchannel Music_LookKimonoGirl_branch_f7aa8 tone 0 -Music_LookKimonoGirl_branch_f79d7: ; f79d7 +Music_LookKimonoGirl_branch_f79d7: notetype $c, $b2 callchannel Music_LookKimonoGirl_branch_f7a13 callchannel Music_LookKimonoGirl_branch_f7a13 @@ -49,9 +48,8 @@ Music_LookKimonoGirl_branch_f79d7: ; f79d7 octave 3 note A_, 1 loopchannel 0, Music_LookKimonoGirl_branch_f79d7 -; f7a13 -Music_LookKimonoGirl_branch_f7a13: ; f7a13 +Music_LookKimonoGirl_branch_f7a13: intensity $b4 octave 2 note F_, 1 @@ -77,9 +75,8 @@ Music_LookKimonoGirl_branch_f7a13: ; f7a13 octave 4 note D_, 1 endchannel -; f7a34 -Music_LookKimonoGirl_branch_f7a34: ; f7a34 +Music_LookKimonoGirl_branch_f7a34: intensity $b4 octave 2 note E_, 1 @@ -105,14 +102,13 @@ Music_LookKimonoGirl_branch_f7a34: ; f7a34 octave 4 note D_, 1 endchannel -; f7a55 -Music_LookKimonoGirl_Ch2: ; f7a55 +Music_LookKimonoGirl_Ch2: dutycycle $0 notetype $6, $a7 stereopanning $f0 callchannel Music_LookKimonoGirl_branch_f7aa8 -Music_LookKimonoGirl_branch_f7a5f: ; f7a5f +Music_LookKimonoGirl_branch_f7a5f: dutycycle $3 notetype $c, $91 octave 5 @@ -156,9 +152,8 @@ Music_LookKimonoGirl_branch_f7a5f: ; f7a5f note D_, 1 callchannel Music_LookKimonoGirl_branch_f7a94 loopchannel 0, Music_LookKimonoGirl_branch_f7a5f -; f7a94 -Music_LookKimonoGirl_branch_f7a94: ; f7a94 +Music_LookKimonoGirl_branch_f7a94: octave 5 note B_, 1 note A_, 1 @@ -179,9 +174,8 @@ Music_LookKimonoGirl_branch_f7a94: ; f7a94 note B_, 1 note E_, 1 endchannel -; f7aa8 -Music_LookKimonoGirl_branch_f7aa8: ; f7aa8 +Music_LookKimonoGirl_branch_f7aa8: octave 4 note E_, 1 octave 5 @@ -215,9 +209,8 @@ Music_LookKimonoGirl_branch_f7aa8: ; f7aa8 note E_, 1 note E_, 1 endchannel -; f7ad4 -Music_LookKimonoGirl_Ch3: ; f7ad4 +Music_LookKimonoGirl_Ch3: stereopanning $ff vibrato $12, $24 notetype $6, $13 @@ -233,7 +226,7 @@ Music_LookKimonoGirl_Ch3: ; f7ad4 octave 5 note D_, 2 note E_, 2 -Music_LookKimonoGirl_branch_f7aec: ; f7aec +Music_LookKimonoGirl_branch_f7aec: octave 5 note D_, 4 note E_, 4 @@ -270,4 +263,3 @@ Music_LookKimonoGirl_branch_f7aec: ; f7aec note D_, 8 note E_, 8 loopchannel 0, Music_LookKimonoGirl_branch_f7aec -; f7b13 diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm index 1aecb3e34..802716c14 100644 --- a/audio/music/looklass.asm +++ b/audio/music/looklass.asm @@ -1,11 +1,10 @@ -Music_LookLass: ; ed79b +Music_LookLass: 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 +Music_LookLass_Ch1: tempo 132 volume $77 tone $0001 @@ -18,7 +17,7 @@ Music_LookLass_Ch1: ; ed7a7 note B_, 14 stereopanning $f dutycycle $0 -Music_LookLass_branch_ed7bd: ; ed7bd +Music_LookLass_branch_ed7bd: intensity $a2 octave 3 note E_, 4 @@ -29,14 +28,13 @@ Music_LookLass_branch_ed7bd: ; ed7bd intensity $a3 note B_, 2 loopchannel 0, Music_LookLass_branch_ed7bd -; ed7cd -Music_LookLass_Ch2: ; ed7cd +Music_LookLass_Ch2: stereopanning $f0 dutycycle $0 notetype $c, $83 note __, 16 -Music_LookLass_branch_ed7d5: ; ed7d5 +Music_LookLass_branch_ed7d5: intensity $92 octave 2 note B_, 4 @@ -48,9 +46,8 @@ Music_LookLass_branch_ed7d5: ; ed7d5 octave 3 note G#, 2 loopchannel 0, Music_LookLass_branch_ed7d5 -; ed7e6 -Music_LookLass_Ch3: ; ed7e6 +Music_LookLass_Ch3: notetype $c, $10 note __, 8 octave 6 @@ -58,7 +55,7 @@ Music_LookLass_Ch3: ; ed7e6 note D#, 2 note C#, 2 note C_, 2 -Music_LookLass_branch_ed7ef: ; ed7ef +Music_LookLass_branch_ed7ef: octave 5 note B_, 2 note __, 2 @@ -99,13 +96,12 @@ Music_LookLass_branch_ed7ef: ; ed7ef note G#, 2 note A_, 2 loopchannel 0, Music_LookLass_branch_ed7ef -; ed81a -Music_LookLass_Ch4: ; ed81a +Music_LookLass_Ch4: togglenoise $4 notetype $c note C_, 16 -Music_LookLass_branch_ed81f: ; ed81f +Music_LookLass_branch_ed81f: notetype $6 note D_, 8 note C#, 8 @@ -116,4 +112,3 @@ Music_LookLass_branch_ed81f: ; ed81f note C#, 1 note C#, 1 loopchannel 0, Music_LookLass_branch_ed81f -; ed82d diff --git a/audio/music/lookmysticalman.asm b/audio/music/lookmysticalman.asm index 1c0ab67b4..675c937ee 100644 --- a/audio/music/lookmysticalman.asm +++ b/audio/music/lookmysticalman.asm @@ -1,11 +1,10 @@ -Music_LookMysticalMan: ; 17843b +Music_LookMysticalMan: 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 +Music_LookMysticalMan_Ch1: tempo 136 volume $77 vibrato $a, $34 @@ -13,7 +12,7 @@ Music_LookMysticalMan_Ch1: ; 178447 stereopanning $f notetype $c, $b3 note __, 8 -Music_LookMysticalMan_branch_178458: ; 178458 +Music_LookMysticalMan_branch_178458: dutycycle $3 notetype $6, $96 octave 3 @@ -94,7 +93,7 @@ Music_LookMysticalMan_branch_178458: ; 178458 note A#, 6 dutycycle $2 intensity $72 -Music_LookMysticalMan_branch_1784b4: ; 1784b4 +Music_LookMysticalMan_branch_1784b4: octave 5 note D_, 2 octave 4 @@ -124,7 +123,7 @@ Music_LookMysticalMan_branch_1784b4: ; 1784b4 note D_, 2 note F#, 2 note B_, 2 -Music_LookMysticalMan_branch_1784d4: ; 1784d4 +Music_LookMysticalMan_branch_1784d4: octave 5 note D_, 2 octave 4 @@ -156,9 +155,8 @@ Music_LookMysticalMan_branch_1784d4: ; 1784d4 note F#, 2 note A#, 2 loopchannel 0, Music_LookMysticalMan_branch_178458 -; 1784f9 -Music_LookMysticalMan_branch_1784f9: ; 1784f9 +Music_LookMysticalMan_branch_1784f9: note D_, 16 octave 4 note D_, 2 @@ -192,14 +190,13 @@ Music_LookMysticalMan_branch_1784f9: ; 1784f9 note B_, 2 note A_, 6 endchannel -; 17851a -Music_LookMysticalMan_Ch2: ; 17851a +Music_LookMysticalMan_Ch2: dutycycle $3 vibrato $a, $34 notetype $c, $b3 note __, 8 -Music_LookMysticalMan_branch_178523: ; 178523 +Music_LookMysticalMan_branch_178523: stereopanning $f0 notetype $6, $b8 octave 3 @@ -297,9 +294,8 @@ Music_LookMysticalMan_branch_178523: ; 178523 note A#, 16 note __, 2 loopchannel 0, Music_LookMysticalMan_branch_178523 -; 17859a -Music_LookMysticalMan_branch_17859a: ; 17859a +Music_LookMysticalMan_branch_17859a: note B_, 2 note __, 2 octave 4 @@ -343,9 +339,8 @@ Music_LookMysticalMan_branch_17859a: ; 17859a note F#, 2 note E_, 6 endchannel -; 1785c8 -Music_LookMysticalMan_branch_1785c8: ; 1785c8 +Music_LookMysticalMan_branch_1785c8: note C#, 8 intensity $88 note C_, 1 @@ -361,12 +356,11 @@ Music_LookMysticalMan_branch_1785c8: ; 1785c8 note __, 1 intensity $b8 endchannel -; 1785db -Music_LookMysticalMan_Ch3: ; 1785db +Music_LookMysticalMan_Ch3: notetype $6, $16 note __, 16 -Music_LookMysticalMan_branch_1785df: ; 1785df +Music_LookMysticalMan_branch_1785df: octave 2 note B_, 4 octave 3 @@ -421,7 +415,7 @@ Music_LookMysticalMan_branch_1785df: ; 1785df note A_, 2 octave 3 note E_, 2 -Music_LookMysticalMan_branch_178615: ; 178615 +Music_LookMysticalMan_branch_178615: octave 2 note F#, 4 note A#, 2 @@ -537,9 +531,8 @@ Music_LookMysticalMan_branch_178615: ; 178615 note B_, 8 note A#, 4 loopchannel 0, Music_LookMysticalMan_branch_1785df -; 17868e -Music_LookMysticalMan_Ch4: ; 17868e +Music_LookMysticalMan_Ch4: togglenoise $3 notetype $c note D#, 2 @@ -547,7 +540,7 @@ Music_LookMysticalMan_Ch4: ; 17868e note D_, 2 note D_, 1 note D_, 1 -Music_LookMysticalMan_branch_178697: ; 178697 +Music_LookMysticalMan_branch_178697: callchannel Music_LookMysticalMan_branch_1786d3 callchannel Music_LookMysticalMan_branch_1786d9 callchannel Music_LookMysticalMan_branch_1786d3 @@ -566,7 +559,7 @@ Music_LookMysticalMan_branch_178697: ; 178697 note D_, 2 note D_, 1 note D_, 1 -Music_LookMysticalMan_branch_1786ba: ; 1786ba +Music_LookMysticalMan_branch_1786ba: note D_, 2 note D#, 2 note D_, 3 @@ -586,27 +579,24 @@ Music_LookMysticalMan_branch_1786ba: ; 1786ba note D_, 1 loopchannel 2, Music_LookMysticalMan_branch_1786ba loopchannel 0, Music_LookMysticalMan_branch_178697 -; 1786d3 -Music_LookMysticalMan_branch_1786d3: ; 1786d3 +Music_LookMysticalMan_branch_1786d3: note D#, 4 note D_, 3 note D#, 3 note D#, 2 note D_, 4 endchannel -; 1786d9 -Music_LookMysticalMan_branch_1786d9: ; 1786d9 +Music_LookMysticalMan_branch_1786d9: note D#, 4 note D_, 3 note D_, 3 note D#, 2 note D_, 4 endchannel -; 1786df -Music_LookMysticalMan_branch_1786df: ; 1786df +Music_LookMysticalMan_branch_1786df: note D#, 4 note D_, 2 note D#, 1 @@ -616,4 +606,3 @@ Music_LookMysticalMan_branch_1786df: ; 1786df note D_, 1 note D_, 1 endchannel -; 1786e8 diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm index a8667afdb..75e527b75 100644 --- a/audio/music/lookofficer.asm +++ b/audio/music/lookofficer.asm @@ -1,10 +1,9 @@ -Music_LookOfficer: ; ed82d +Music_LookOfficer: musicheader 3, 1, Music_LookOfficer_Ch1 musicheader 1, 2, Music_LookOfficer_Ch2 musicheader 1, 3, Music_LookOfficer_Ch3 -; ed836 -Music_LookOfficer_Ch1: ; ed836 +Music_LookOfficer_Ch1: tempo 116 volume $77 tone $0001 @@ -21,7 +20,7 @@ Music_LookOfficer_Ch1: ; ed836 intensity $2f octave 3 note B_, 16 -Music_LookOfficer_branch_ed852: ; ed852 +Music_LookOfficer_branch_ed852: intensity $82 note __, 4 note B_, 6 @@ -34,9 +33,8 @@ Music_LookOfficer_branch_ed852: ; ed852 note A#, 16 note A_, 16 loopchannel 0, Music_LookOfficer_branch_ed852 -; ed863 -Music_LookOfficer_Ch2: ; ed863 +Music_LookOfficer_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $b7 @@ -61,7 +59,7 @@ Music_LookOfficer_Ch2: ; ed863 note B_, 2 octave 2 note D#, 2 -Music_LookOfficer_branch_ed882: ; ed882 +Music_LookOfficer_branch_ed882: note E_, 2 note G#, 2 octave 3 @@ -78,9 +76,8 @@ Music_LookOfficer_branch_ed882: ; ed882 pitchoffset 0, C_ callchannel Music_LookOfficer_branch_ed89e loopchannel 0, Music_LookOfficer_branch_ed882 -; ed89e -Music_LookOfficer_branch_ed89e: ; ed89e +Music_LookOfficer_branch_ed89e: octave 1 note A_, 2 octave 2 @@ -96,9 +93,8 @@ Music_LookOfficer_branch_ed89e: ; ed89e octave 2 note C#, 2 endchannel -; ed8ad -Music_LookOfficer_Ch3: ; ed8ad +Music_LookOfficer_Ch3: vibrato $14, $14 stereopanning $f0 notetype $c, $14 @@ -120,7 +116,7 @@ Music_LookOfficer_Ch3: ; ed8ad note C#, 2 note __, 1 note D#, 2 -Music_LookOfficer_branch_ed8c8: ; ed8c8 +Music_LookOfficer_branch_ed8c8: note E_, 6 note D#, 6 note C#, 4 @@ -139,4 +135,3 @@ Music_LookOfficer_branch_ed8c8: ; ed8c8 note E_, 8 note C#, 8 loopchannel 0, Music_LookOfficer_branch_ed8c8 -; ed8dd diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm index f60d9ca64..4c4f8506e 100644 --- a/audio/music/lookpokemaniac.asm +++ b/audio/music/lookpokemaniac.asm @@ -1,10 +1,9 @@ -Music_LookPokemaniac: ; ebde1 +Music_LookPokemaniac: musicheader 3, 1, Music_LookPokemaniac_Ch1 musicheader 1, 2, Music_LookPokemaniac_Ch2 musicheader 1, 3, Music_LookPokemaniac_Ch3 -; ebdea -Music_LookPokemaniac_Ch1: ; ebdea +Music_LookPokemaniac_Ch1: stereopanning $f tempo 144 volume $77 @@ -12,7 +11,7 @@ Music_LookPokemaniac_Ch1: ; ebdea tone $0002 notetype $c, $b3 note __, 8 -Music_LookPokemaniac_branch_ebdfb: ; ebdfb +Music_LookPokemaniac_branch_ebdfb: note __, 4 octave 3 note A#, 1 @@ -27,9 +26,8 @@ Music_LookPokemaniac_branch_ebdfb: ; ebdfb note __, 3 loopchannel 4, Music_LookPokemaniac_branch_ebdfb loopchannel 0, Music_LookPokemaniac_branch_ebdfb -; ebe12 -Music_LookPokemaniac_Ch2: ; ebe12 +Music_LookPokemaniac_Ch2: stereopanning $ff vibrato $2, $33 tone $0001 @@ -41,7 +39,7 @@ Music_LookPokemaniac_Ch2: ; ebe12 note C_, 1 octave 1 note A_, 4 -Music_LookPokemaniac_branch_ebe24: ; ebe24 +Music_LookPokemaniac_branch_ebe24: octave 2 note C_, 2 note __, 2 @@ -59,7 +57,7 @@ Music_LookPokemaniac_branch_ebe24: ; ebe24 note D#, 1 note __, 3 loopchannel 2, Music_LookPokemaniac_branch_ebe24 -Music_LookPokemaniac_branch_ebe38: ; ebe38 +Music_LookPokemaniac_branch_ebe38: octave 1 note A_, 2 note __, 2 @@ -79,9 +77,8 @@ Music_LookPokemaniac_branch_ebe38: ; ebe38 note __, 3 loopchannel 2, Music_LookPokemaniac_branch_ebe38 loopchannel 0, Music_LookPokemaniac_branch_ebe24 -; ebe51 -Music_LookPokemaniac_Ch3: ; ebe51 +Music_LookPokemaniac_Ch3: stereopanning $f0 vibrato $6, $33 notetype $c, $15 @@ -93,15 +90,14 @@ Music_LookPokemaniac_Ch3: ; ebe51 octave 5 note C_, 4 intensity $10 -Music_LookPokemaniac_branch_ebe62: ; ebe62 +Music_LookPokemaniac_branch_ebe62: callchannel Music_LookPokemaniac_branch_ebe70 intensity $14 callchannel Music_LookPokemaniac_branch_ebe70 intensity $10 loopchannel 0, Music_LookPokemaniac_branch_ebe62 -; ebe70 -Music_LookPokemaniac_branch_ebe70: ; ebe70 +Music_LookPokemaniac_branch_ebe70: note A#, 6 note A_, 2 note G#, 2 @@ -161,4 +157,3 @@ Music_LookPokemaniac_branch_ebe70: ; ebe70 note C_, 1 note __, 1 endchannel -; ebeab diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm index e06852944..5eff9991a 100644 --- a/audio/music/lookrival.asm +++ b/audio/music/lookrival.asm @@ -1,11 +1,10 @@ -Music_LookRival: ; f4f79 +Music_LookRival: 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 +Music_LookRival_Ch1: tempo 112 volume $77 dutycycle $1 @@ -34,8 +33,8 @@ Music_LookRival_Ch1: ; f4f85 note G#, 8 intensity $a6 note F#, 8 -Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1 -Music_LookRival_branch_f4fb1: ; f4fb1 +Music_AfterTheRivalFight_branch_f4fb1: +Music_LookRival_branch_f4fb1: intensity $b5 note F_, 4 note D#, 2 @@ -99,7 +98,7 @@ Music_LookRival_branch_f4fb1: ; f4fb1 note G#, 8 note F_, 6 note C_, 2 -Music_LookRival_branch_f4ff7: ; f4ff7 +Music_LookRival_branch_f4ff7: intensity $b2 note F_, 6 intensity $b7 @@ -115,9 +114,8 @@ Music_LookRival_branch_f4ff7: ; f4ff7 note G#, 6 note F#, 4 loopchannel 0, Music_LookRival_branch_f4fb1 -; f5010 -Music_LookRival_Ch2: ; f5010 +Music_LookRival_Ch2: dutycycle $3 vibrato $8, $36 stereopanning $f0 @@ -138,8 +136,8 @@ Music_LookRival_Ch2: ; f5010 note D#, 10 intensity $b7 note D#, 16 -Music_AfterTheRivalFight_branch_f502e: ; f502e -Music_LookRival_branch_f502e: ; f502e +Music_AfterTheRivalFight_branch_f502e: +Music_LookRival_branch_f502e: intensity $c7 note C_, 12 intensity $c4 @@ -192,7 +190,7 @@ Music_LookRival_branch_f502e: ; f502e note D#, 1 note D_, 1 note D#, 2 -Music_LookRival_branch_f5070: ; f5070 +Music_LookRival_branch_f5070: intensity $c2 note C_, 6 intensity $c7 @@ -205,9 +203,8 @@ Music_LookRival_branch_f5070: ; f5070 intensity $c7 note D#, 10 loopchannel 0, Music_LookRival_branch_f502e -; f5086 -Music_LookRival_Ch3: ; f5086 +Music_LookRival_Ch3: notetype $c, $28 note __, 2 octave 4 @@ -229,8 +226,8 @@ Music_LookRival_Ch3: ; f5086 note C_, 2 note D#, 2 note F#, 2 -Music_AfterTheRivalFight_branch_f509d: ; f509d -Music_LookRival_branch_f509d: ; f509d +Music_AfterTheRivalFight_branch_f509d: +Music_LookRival_branch_f509d: callchannel Music_LookRival_branch_f50ef loopchannel 3, Music_LookRival_branch_f509d note F_, 4 @@ -293,9 +290,8 @@ Music_LookRival_branch_f509d: ; f509d note F#, 2 note E_, 2 loopchannel 0, Music_LookRival_branch_f509d -; f50ef -Music_LookRival_branch_f50ef: ; f50ef +Music_LookRival_branch_f50ef: note F_, 2 note C_, 2 note D_, 2 @@ -304,9 +300,8 @@ Music_LookRival_branch_f50ef: ; f50ef note D_, 2 note D#, 2 endchannel -; f50f7 -Music_LookRival_branch_f50f7: ; f50f7 +Music_LookRival_branch_f50f7: note A#, 2 note F_, 2 note G_, 2 @@ -315,9 +310,8 @@ Music_LookRival_branch_f50f7: ; f50f7 note G_, 2 note G#, 2 endchannel -; f50ff -Music_LookRival_branch_f50ff: ; f50ff +Music_LookRival_branch_f50ff: note A#, 4 note F_, 2 note G#, 4 @@ -325,9 +319,8 @@ Music_LookRival_branch_f50ff: ; f50ff note G_, 2 note G#, 2 endchannel -; f5106 -Music_LookRival_Ch4: ; f5106 +Music_LookRival_Ch4: stereopanning $f0 togglenoise $3 notetype $c @@ -343,8 +336,8 @@ Music_LookRival_Ch4: ; f5106 note D_, 2 note D_, 2 note D_, 2 -Music_AfterTheRivalFight_branch_f5118: ; f5118 -Music_LookRival_branch_f5118: ; f5118 +Music_AfterTheRivalFight_branch_f5118: +Music_LookRival_branch_f5118: note D#, 4 note D_, 2 note D#, 4 @@ -357,4 +350,3 @@ Music_LookRival_branch_f5118: ; f5118 note D_, 2 note D_, 2 loopchannel 0, Music_LookRival_branch_f5118 -; f5127 diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm index 518a9b7e0..bd0c0e434 100644 --- a/audio/music/lookrocket.asm +++ b/audio/music/lookrocket.asm @@ -1,11 +1,10 @@ -Music_LookRocket: ; f74a2 +Music_LookRocket: 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 +Music_LookRocket_Ch1: tempo 123 volume $77 pitchoffset 0, D_ @@ -18,7 +17,7 @@ Music_LookRocket_Ch1: ; f74ae note D_, 1 callchannel Music_LookRocket_branch_f74e6 dutycycle $1 -Music_LookRocket_branch_f74c7: ; f74c7 +Music_LookRocket_branch_f74c7: intensity $a8 callchannel Music_LookRocket_branch_f74f7 callchannel Music_LookRocket_branch_f758a @@ -33,10 +32,9 @@ Music_LookRocket_branch_f74c7: ; f74c7 callchannel Music_LookRocket_branch_f750c note __, 16 loopchannel 0, Music_LookRocket_branch_f74c7 -; f74e6 -Music_LookRocket_branch_f74e6: ; f74e6 -Music_RocketTheme_branch_f74e6: ; f74e6 +Music_LookRocket_branch_f74e6: +Music_RocketTheme_branch_f74e6: note D#, 1 note __, 1 note D_, 1 @@ -54,10 +52,9 @@ Music_RocketTheme_branch_f74e6: ; f74e6 note F_, 1 note G#, 1 endchannel -; f74f7 -Music_LookRocket_branch_f74f7: ; f74f7 -Music_RocketTheme_branch_f74f7: ; f74f7 +Music_LookRocket_branch_f74f7: +Music_RocketTheme_branch_f74f7: note __, 2 octave 3 note D#, 1 @@ -79,10 +76,9 @@ Music_RocketTheme_branch_f74f7: ; f74f7 note F#, 1 note __, 1 endchannel -; f750c -Music_LookRocket_branch_f750c: ; f750c -Music_RocketTheme_branch_f750c: ; f750c +Music_LookRocket_branch_f750c: +Music_RocketTheme_branch_f750c: note __, 2 octave 2 note B_, 1 @@ -91,9 +87,8 @@ Music_RocketTheme_branch_f750c: ; f750c note C_, 1 note __, 5 endchannel -; f7514 -Music_LookRocket_Ch2: ; f7514 +Music_LookRocket_Ch2: pitchoffset 0, D_ vibrato $4, $64 dutycycle $3 @@ -103,7 +98,7 @@ Music_LookRocket_Ch2: ; f7514 note C_, 1 note D_, 1 callchannel Music_LookRocket_branch_f7547 -Music_LookRocket_branch_f7526: ; f7526 +Music_LookRocket_branch_f7526: intensity $b7 callchannel Music_LookRocket_branch_f758a octave 5 @@ -118,10 +113,9 @@ Music_LookRocket_branch_f7526: ; f7526 callchannel Music_LookRocket_branch_f7568 callchannel Music_LookRocket_branch_f756f loopchannel 0, Music_LookRocket_branch_f7526 -; f7547 -Music_LookRocket_branch_f7547: ; f7547 -Music_RocketTheme_branch_f7547: ; f7547 +Music_LookRocket_branch_f7547: +Music_RocketTheme_branch_f7547: note D#, 1 note __, 1 note D_, 1 @@ -134,10 +128,9 @@ Music_RocketTheme_branch_f7547: ; f7547 note B_, 6 dutycycle $0 endchannel -; f7554 -Music_LookRocket_branch_f7554: ; f7554 -Music_RocketTheme_branch_f7554: ; f7554 +Music_LookRocket_branch_f7554: +Music_RocketTheme_branch_f7554: note __, 2 octave 4 note D#, 1 @@ -158,10 +151,9 @@ Music_RocketTheme_branch_f7554: ; f7554 note D#, 1 note __, 1 endchannel -; f7568 -Music_LookRocket_branch_f7568: ; f7568 -Music_RocketTheme_branch_f7568: ; f7568 +Music_LookRocket_branch_f7568: +Music_RocketTheme_branch_f7568: note __, 2 octave 3 note F_, 1 @@ -169,10 +161,9 @@ Music_RocketTheme_branch_f7568: ; f7568 note F#, 1 note __, 5 endchannel -; f756f -Music_LookRocket_branch_f756f: ; f756f -Music_RocketTheme_branch_f756f: ; f756f +Music_LookRocket_branch_f756f: +Music_RocketTheme_branch_f756f: intensity $63 note G#, 1 note F_, 1 @@ -196,10 +187,9 @@ Music_RocketTheme_branch_f756f: ; f756f note F_, 1 note D_, 1 endchannel -; f758a -Music_LookRocket_branch_f758a: ; f758a -Music_RocketTheme_branch_f758a: ; f758a +Music_LookRocket_branch_f758a: +Music_RocketTheme_branch_f758a: octave 3 note __, 2 note G_, 1 @@ -213,16 +203,15 @@ Music_RocketTheme_branch_f758a: ; f758a note A_, 1 note __, 1 endchannel -; f7597 -Music_LookRocket_Ch3: ; f7597 +Music_LookRocket_Ch3: pitchoffset 0, D_ vibrato $4, $22 notetype $c, $14 stereopanning $f0 note __, 2 callchannel Music_LookRocket_branch_f75bf -Music_LookRocket_branch_f75a5: ; f75a5 +Music_LookRocket_branch_f75a5: callchannel Music_LookRocket_branch_f75fe callchannel Music_LookRocket_branch_f75fe intensity $24 @@ -232,10 +221,9 @@ Music_LookRocket_branch_f75a5: ; f75a5 callchannel Music_LookRocket_branch_f7623 callchannel Music_LookRocket_branch_f75e1 loopchannel 0, Music_LookRocket_branch_f75a5 -; f75bf -Music_LookRocket_branch_f75bf: ; f75bf -Music_RocketTheme_branch_f75bf: ; f75bf +Music_LookRocket_branch_f75bf: +Music_RocketTheme_branch_f75bf: octave 3 note F_, 1 note __, 1 @@ -249,10 +237,9 @@ Music_RocketTheme_branch_f75bf: ; f75bf octave 3 note D_, 6 endchannel -; f75cc -Music_LookRocket_branch_f75cc: ; f75cc -Music_RocketTheme_branch_f75cc: ; f75cc +Music_LookRocket_branch_f75cc: +Music_RocketTheme_branch_f75cc: octave 2 note G#, 1 note __, 1 @@ -274,10 +261,9 @@ Music_RocketTheme_branch_f75cc: ; f75cc note F#, 1 note __, 1 endchannel -; f75e1 -Music_LookRocket_branch_f75e1: ; f75e1 -Music_RocketTheme_branch_f75e1: ; f75e1 +Music_LookRocket_branch_f75e1: +Music_RocketTheme_branch_f75e1: intensity $24 octave 2 note G#, 1 @@ -305,10 +291,9 @@ Music_RocketTheme_branch_f75e1: ; f75e1 note G#, 1 note __, 1 endchannel -; f75fe -Music_LookRocket_branch_f75fe: ; f75fe -Music_RocketTheme_branch_f75fe: ; f75fe +Music_LookRocket_branch_f75fe: +Music_RocketTheme_branch_f75fe: note C_, 1 note __, 1 octave 4 @@ -346,10 +331,9 @@ Music_RocketTheme_branch_f75fe: ; f75fe note A_, 1 note __, 1 endchannel -; f7623 -Music_LookRocket_branch_f7623: ; f7623 -Music_RocketTheme_branch_f7623: ; f7623 +Music_LookRocket_branch_f7623: +Music_RocketTheme_branch_f7623: octave 2 note G#, 1 note __, 1 @@ -371,14 +355,13 @@ Music_RocketTheme_branch_f7623: ; f7623 note D#, 1 note C_, 1 endchannel -; f7638 -Music_LookRocket_Ch4: ; f7638 +Music_LookRocket_Ch4: togglenoise $3 notetype $c note __, 2 callchannel Music_LookRocket_branch_f765c -Music_LookRocket_branch_f7640: ; f7640 +Music_LookRocket_branch_f7640: callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f7664 @@ -388,10 +371,9 @@ Music_LookRocket_branch_f7640: ; f7640 callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f765c loopchannel 0, Music_LookRocket_branch_f7640 -; f765c -Music_LookRocket_branch_f765c: ; f765c -Music_RocketTheme_branch_f765c: ; f765c +Music_LookRocket_branch_f765c: +Music_RocketTheme_branch_f765c: note C_, 8 note D_, 2 note D#, 2 @@ -400,10 +382,9 @@ Music_RocketTheme_branch_f765c: ; f765c note D_, 1 note D_, 1 endchannel -; f7664 -Music_LookRocket_branch_f7664: ; f7664 -Music_RocketTheme_branch_f7664: ; f7664 +Music_LookRocket_branch_f7664: +Music_RocketTheme_branch_f7664: note D#, 2 note F#, 2 note D_, 2 @@ -413,4 +394,3 @@ Music_RocketTheme_branch_f7664: ; f7664 note D_, 2 note F#, 2 endchannel -; f766d diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm index 28fa59455..e1b51c397 100644 --- a/audio/music/looksage.asm +++ b/audio/music/looksage.asm @@ -1,9 +1,8 @@ -Music_LookSage: ; ee35e +Music_LookSage: musicheader 2, 1, Music_LookSage_Ch1 musicheader 1, 3, Music_LookSage_Ch3 -; ee364 -Music_LookSage_Ch1: ; ee364 +Music_LookSage_Ch1: tempo 144 stereopanning $f volume $77 @@ -29,7 +28,7 @@ Music_LookSage_Ch1: ; ee364 note F_, 2 intensity $93 note F_, 2 -Music_LookSage_branch_ee38e: ; ee38e +Music_LookSage_branch_ee38e: intensity $b3 note D_, 2 intensity $93 @@ -101,9 +100,8 @@ Music_LookSage_branch_ee38e: ; ee38e note B_, 2 callchannel Music_LookSage_branch_ee3fa loopchannel 0, Music_LookSage_branch_ee38e -; ee3fa -Music_LookSage_branch_ee3fa: ; ee3fa +Music_LookSage_branch_ee3fa: intensity $b3 octave 2 note E_, 2 @@ -122,9 +120,8 @@ Music_LookSage_branch_ee3fa: ; ee3fa intensity $93 note A_, 2 endchannel -; ee414 -Music_LookSage_Ch3: ; ee414 +Music_LookSage_Ch3: stereopanning $f0 vibrato $16, $23 notetype $c, $10 @@ -144,7 +141,7 @@ Music_LookSage_Ch3: ; ee414 note E_, 14 note G_, 1 note G#, 1 -Music_LookSage_branch_ee430: ; ee430 +Music_LookSage_branch_ee430: note A_, 12 note B_, 4 note D_, 9 @@ -179,4 +176,3 @@ Music_LookSage_branch_ee430: ; ee430 note G_, 1 note G#, 1 loopchannel 0, Music_LookSage_branch_ee430 -; ee45f diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm index bcc5d1503..e835d5fe9 100644 --- a/audio/music/lookyoungster.asm +++ b/audio/music/lookyoungster.asm @@ -1,10 +1,9 @@ -Music_LookYoungster: ; f66c3 +Music_LookYoungster: musicheader 3, 1, Music_LookYoungster_Ch1 musicheader 1, 2, Music_LookYoungster_Ch2 musicheader 1, 3, Music_LookYoungster_Ch3 -; f66cc -Music_LookYoungster_Ch1: ; f66cc +Music_LookYoungster_Ch1: tempo 118 volume $77 stereopanning $f @@ -25,7 +24,7 @@ Music_LookYoungster_Ch1: ; f66cc note __, 2 note C_, 6 intensity $b3 -Music_LookYoungster_branch_f66ea: ; f66ea +Music_LookYoungster_branch_f66ea: note __, 2 octave 3 note G_, 1 @@ -59,11 +58,10 @@ Music_LookYoungster_branch_f66ea: ; f66ea note __, 1 note __, 16 loopchannel 0, Music_LookYoungster_branch_f66ea -; f670e db $ff -Music_LookYoungster_Ch2: ; f670f +Music_LookYoungster_Ch2: stereopanning $f0 vibrato $12, $26 dutycycle $1 @@ -84,7 +82,7 @@ Music_LookYoungster_Ch2: ; f670f note F_, 4 note __, 2 note F#, 6 -Music_LookYoungster_branch_f672f: ; f672f +Music_LookYoungster_branch_f672f: dutycycle $3 intensity $b3 note __, 2 @@ -158,11 +156,10 @@ Music_LookYoungster_branch_f672f: ; f672f note C_, 1 note __, 1 loopchannel 0, Music_LookYoungster_branch_f672f -; f6783 db $ff -Music_LookYoungster_Ch3: ; f6784 +Music_LookYoungster_Ch3: stereopanning $ff vibrato $2, $24 notetype $c, $25 @@ -198,7 +195,7 @@ Music_LookYoungster_Ch3: ; f6784 note __, 2 note G#, 6 intensity $25 -Music_LookYoungster_branch_f67ae: ; f67ae +Music_LookYoungster_branch_f67ae: octave 2 note G_, 1 note __, 1 @@ -294,6 +291,5 @@ Music_LookYoungster_branch_f67ae: ; f67ae note G#, 1 note __, 1 loopchannel 0, Music_LookYoungster_branch_f67ae -; f6810 db $ff diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm index 0b73cf894..fd4229cb4 100644 --- a/audio/music/magnettrain.asm +++ b/audio/music/magnettrain.asm @@ -1,11 +1,10 @@ -Music_MagnetTrain: ; ef5f0 +Music_MagnetTrain: 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 +Music_MagnetTrain_Ch1: tempo 110 volume $77 stereopanning $f @@ -68,9 +67,8 @@ Music_MagnetTrain_Ch1: ; ef5fc notetype $c, $b7 note D_, 16 endchannel -; ef648 -Music_MagnetTrain_Ch2: ; ef648 +Music_MagnetTrain_Ch2: vibrato $14, $23 dutycycle $1 notetype $c, $d2 @@ -107,9 +105,8 @@ Music_MagnetTrain_Ch2: ; ef648 notetype $c, $d7 note A_, 16 endchannel -; ef67d -Music_MagnetTrain_Ch3: ; ef67d +Music_MagnetTrain_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $15 @@ -224,9 +221,8 @@ Music_MagnetTrain_Ch3: ; ef67d octave 2 note D_, 16 endchannel -; ef6f4 -Music_MagnetTrain_Ch4: ; ef6f4 +Music_MagnetTrain_Ch4: togglenoise $3 notetype $c note B_, 12 @@ -248,11 +244,9 @@ Music_MagnetTrain_Ch4: ; ef6f4 notetype $c note B_, 16 endchannel -; ef711 - ; unused -Music_MagnetTrain_branch_ef711: ; ef711 +Music_MagnetTrain_branch_ef711: note G#, 1 note G_, 1 note G_, 1 @@ -266,10 +260,8 @@ Music_MagnetTrain_branch_ef711: ; ef711 note G_, 1 note G_, 1 endchannel -; ef71e - -Music_MagnetTrain_branch_ef71e: ; ef71e +Music_MagnetTrain_branch_ef71e: note G#, 2 note G_, 2 note G_, 2 @@ -287,4 +279,3 @@ Music_MagnetTrain_branch_ef71e: ; ef71e note G_, 2 note G_, 2 endchannel -; ef72f diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm index 30c389ed3..b787a5ea0 100644 --- a/audio/music/mainmenu.asm +++ b/audio/music/mainmenu.asm @@ -1,11 +1,10 @@ -Music_MainMenu: ; f78fd +Music_MainMenu: 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 +Music_MainMenu_Ch1: tempo 160 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_MainMenu_Ch1: ; f7909 notetype $c, $f octave 3 note D_, 8 -Music_MainMenu_branch_f791d: ; f791d +Music_MainMenu_branch_f791d: notetype $c, $92 octave 3 note C#, 6 @@ -41,15 +40,14 @@ Music_MainMenu_branch_f791d: ; f791d octave 3 note C_, 4 loopchannel 0, Music_MainMenu_branch_f791d -; f7940 -Music_MainMenu_Ch2: ; f7940 +Music_MainMenu_Ch2: dutycycle $3 stereopanning $f notetype $c, $f octave 3 note G_, 8 -Music_MainMenu_branch_f7949: ; f7949 +Music_MainMenu_branch_f7949: notetype $c, $a2 note F#, 6 note F#, 1 @@ -72,13 +70,12 @@ Music_MainMenu_branch_f7949: ; f7949 notetype $c, $a4 note F_, 4 loopchannel 0, Music_MainMenu_branch_f7949 -; f7969 -Music_MainMenu_Ch3: ; f7969 +Music_MainMenu_Ch3: stereopanning $f0 notetype $c, $25 note __, 8 -Music_MainMenu_branch_f796f: ; f796f +Music_MainMenu_branch_f796f: octave 2 note F#, 1 note __, 5 @@ -112,9 +109,8 @@ Music_MainMenu_branch_f796f: ; f796f note F_, 1 note __, 3 loopchannel 0, Music_MainMenu_branch_f796f -; f7996 -Music_MainMenu_Ch4: ; f7996 +Music_MainMenu_Ch4: stereopanning $f togglenoise $3 notetype $c @@ -127,7 +123,7 @@ Music_MainMenu_Ch4: ; f7996 note D_, 1 note D_, 1 note D_, 1 -Music_MainMenu_branch_f79a5: ; f79a5 +Music_MainMenu_branch_f79a5: note D_, 6 note D_, 1 note D_, 1 @@ -144,4 +140,3 @@ Music_MainMenu_branch_f79a5: ; f79a5 note D_, 1 note D_, 1 loopchannel 0, Music_MainMenu_branch_f79a5 -; f79b8 diff --git a/audio/music/mobileadapter.asm b/audio/music/mobileadapter.asm index c94c66ad2..26c64cff8 100644 --- a/audio/music/mobileadapter.asm +++ b/audio/music/mobileadapter.asm @@ -1,11 +1,10 @@ -Music_MobileAdapter: ; 1fc87 +Music_MobileAdapter: 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 +Music_MobileAdapter_Ch1: tempo 132 volume $77 tone $0001 @@ -23,7 +22,7 @@ Music_MobileAdapter_Ch1: ; 1fc93 note D_, 1 note __, 1 note C#, 4 -Music_MobileAdapter_branch_1fcad: ; 1fcad +Music_MobileAdapter_branch_1fcad: callchannel Music_MobileAdapter_branch_1fd39 note D_, 1 note C#, 1 @@ -147,9 +146,8 @@ Music_MobileAdapter_branch_1fcad: ; 1fcad intensity $77 callchannel Music_MobileAdapter_branch_1ff09 loopchannel 0, Music_MobileAdapter_branch_1fcad -; 1fd39 -Music_MobileAdapter_branch_1fd39: ; 1fd39 +Music_MobileAdapter_branch_1fd39: intensity $94 octave 4 note F#, 1 @@ -190,9 +188,8 @@ Music_MobileAdapter_branch_1fd39: ; 1fd39 octave 4 note C#, 1 endchannel -; 1fd63 -Music_MobileAdapter_Ch2: ; 1fd63 +Music_MobileAdapter_Ch2: notetype $c, $c1 vibrato $10, $23 dutycycle $2 @@ -216,7 +213,7 @@ Music_MobileAdapter_Ch2: ; 1fd63 octave 4 note D_, 1 note F#, 1 -Music_MobileAdapter_branch_1fd80: ; 1fd80 +Music_MobileAdapter_branch_1fd80: callchannel Music_MobileAdapter_branch_1fdfe note A_, 4 note G_, 4 @@ -324,9 +321,8 @@ Music_MobileAdapter_branch_1fd80: ; 1fd80 note D_, 1 note F#, 1 loopchannel 0, Music_MobileAdapter_branch_1fd80 -; 1fdfe -Music_MobileAdapter_branch_1fdfe: ; 1fdfe +Music_MobileAdapter_branch_1fdfe: note A_, 1 note __, 1 note A_, 1 @@ -351,9 +347,8 @@ Music_MobileAdapter_branch_1fdfe: ; 1fdfe octave 4 note B_, 2 endchannel -; 1fe16 -Music_MobileAdapter_branch_1fe16: ; 1fe16 +Music_MobileAdapter_branch_1fe16: octave 5 note F#, 1 note D_, 1 @@ -393,9 +388,8 @@ Music_MobileAdapter_branch_1fe16: ; 1fe16 octave 5 note C#, 4 endchannel -; 1fe3d -Music_MobileAdapter_Ch3: ; 1fe3d +Music_MobileAdapter_Ch3: notetype $c, $14 note __, 2 octave 3 @@ -412,7 +406,7 @@ Music_MobileAdapter_Ch3: ; 1fe3d note E_, 1 note __, 1 note A_, 4 -Music_MobileAdapter_branch_1fe4f: ; 1fe4f +Music_MobileAdapter_branch_1fe4f: callchannel Music_MobileAdapter_branch_1fecf callchannel Music_MobileAdapter_branch_1fee3 callchannel Music_MobileAdapter_branch_1feee @@ -516,16 +510,15 @@ Music_MobileAdapter_branch_1fe4f: ; 1fe4f note D_, 4 callchannel Music_MobileAdapter_branch_1ff09 loopchannel 0, Music_MobileAdapter_branch_1fe4f -; 1fecf -Music_MobileAdapter_branch_1fecf: ; 1fecf +Music_MobileAdapter_branch_1fecf: octave 3 note D_, 1 note __, 1 note A_, 1 note __, 1 loopchannel 4, Music_MobileAdapter_branch_1fecf -Music_MobileAdapter_branch_1fed8: ; 1fed8 +Music_MobileAdapter_branch_1fed8: octave 2 note G_, 1 note __, 1 @@ -534,9 +527,8 @@ Music_MobileAdapter_branch_1fed8: ; 1fed8 note __, 1 loopchannel 4, Music_MobileAdapter_branch_1fed8 endchannel -; 1fee3 -Music_MobileAdapter_branch_1fee3: ; 1fee3 +Music_MobileAdapter_branch_1fee3: octave 2 note A_, 1 note __, 1 @@ -545,9 +537,8 @@ Music_MobileAdapter_branch_1fee3: ; 1fee3 note __, 1 loopchannel 4, Music_MobileAdapter_branch_1fee3 endchannel -; 1feee -Music_MobileAdapter_branch_1feee: ; 1feee +Music_MobileAdapter_branch_1feee: note D_, 1 note __, 1 note A_, 1 @@ -557,9 +548,8 @@ Music_MobileAdapter_branch_1feee: ; 1feee note A_, 1 note __, 1 endchannel -; 1fef7 -Music_MobileAdapter_branch_1fef7: ; 1fef7 +Music_MobileAdapter_branch_1fef7: octave 2 note A_, 1 note __, 1 @@ -578,9 +568,8 @@ Music_MobileAdapter_branch_1fef7: ; 1fef7 octave 2 note A_, 4 endchannel -; 1ff09 -Music_MobileAdapter_branch_1ff09: ; 1ff09 +Music_MobileAdapter_branch_1ff09: octave 2 note A_, 1 note __, 1 @@ -613,9 +602,8 @@ Music_MobileAdapter_branch_1ff09: ; 1ff09 note __, 6 loopchannel 2, Music_MobileAdapter_branch_1ff09 endchannel -; 1ff2c -Music_MobileAdapter_Ch4: ; 1ff2c +Music_MobileAdapter_Ch4: togglenoise $3 stereopanning $f0 notetype $c @@ -625,10 +613,10 @@ Music_MobileAdapter_Ch4: ; 1ff2c note D_, 2 note D_, 1 note D_, 1 -Music_MobileAdapter_branch_1ff38: ; 1ff38 +Music_MobileAdapter_branch_1ff38: callchannel Music_MobileAdapter_branch_1ff60 callchannel Music_MobileAdapter_branch_1ff60 -Music_MobileAdapter_branch_1ff3e: ; 1ff3e +Music_MobileAdapter_branch_1ff3e: note __, 4 note D_, 8 note D_, 8 @@ -637,7 +625,7 @@ Music_MobileAdapter_branch_1ff3e: ; 1ff3e note D_, 3 note D_, 4 loopchannel 2, Music_MobileAdapter_branch_1ff3e -Music_MobileAdapter_branch_1ff49: ; 1ff49 +Music_MobileAdapter_branch_1ff49: note __, 4 note D_, 4 loopchannel 11, Music_MobileAdapter_branch_1ff49 @@ -655,9 +643,8 @@ Music_MobileAdapter_branch_1ff49: ; 1ff49 note D_, 1 note D_, 1 loopchannel 0, Music_MobileAdapter_branch_1ff38 -; 1ff60 -Music_MobileAdapter_branch_1ff60: ; 1ff60 +Music_MobileAdapter_branch_1ff60: note __, 4 note D_, 4 loopchannel 7, Music_MobileAdapter_branch_1ff60 @@ -667,4 +654,3 @@ Music_MobileAdapter_branch_1ff60: ; 1ff60 note D_, 1 note D_, 1 endchannel -; 1ff6c diff --git a/audio/music/mobileadaptermenu.asm b/audio/music/mobileadaptermenu.asm index 8e9e8aee5..1573076fb 100644 --- a/audio/music/mobileadaptermenu.asm +++ b/audio/music/mobileadaptermenu.asm @@ -1,10 +1,9 @@ -Music_MobileAdapterMenu: ; 17801f +Music_MobileAdapterMenu: musicheader 3, 1, Music_MobileAdapterMenu_Ch1 musicheader 1, 2, Music_MobileAdapterMenu_Ch2 musicheader 1, 3, Music_MobileAdapterMenu_Ch3 -; 178028 -Music_MobileAdapterMenu_Ch1: ; 178028 +Music_MobileAdapterMenu_Ch1: tempo 168 volume $77 tone $0001 @@ -12,7 +11,7 @@ Music_MobileAdapterMenu_Ch1: ; 178028 dutycycle $2 notetype $c, $66 note __, 2 -Music_MobileAdapterMenu_branch_178038: ; 178038 +Music_MobileAdapterMenu_branch_178038: callchannel Music_MobileAdapterMenu_branch_178057 callchannel Music_MobileAdapterMenu_branch_178076 octave 3 @@ -33,9 +32,8 @@ Music_MobileAdapterMenu_branch_178038: ; 178038 note D#, 8 callchannel Music_MobileAdapterMenu_branch_178057 loopchannel 0, Music_MobileAdapterMenu_branch_178038 -; 178057 -Music_MobileAdapterMenu_branch_178057: ; 178057 +Music_MobileAdapterMenu_branch_178057: octave 3 note G#, 7 octave 4 @@ -67,9 +65,8 @@ Music_MobileAdapterMenu_branch_178057: ; 178057 note A_, 1 note G#, 8 endchannel -; 178076 -Music_MobileAdapterMenu_branch_178076: ; 178076 +Music_MobileAdapterMenu_branch_178076: note E_, 1 note __, 1 note A_, 1 @@ -84,16 +81,15 @@ Music_MobileAdapterMenu_branch_178076: ; 178076 note __, 1 note C#, 4 endchannel -; 178084 -Music_MobileAdapterMenu_Ch2: ; 178084 +Music_MobileAdapterMenu_Ch2: stereopanning $f0 notetype $c, $84 dutycycle $2 octave 4 note E_, 1 note G#, 1 -Music_MobileAdapterMenu_branch_17808e: ; 17808e +Music_MobileAdapterMenu_branch_17808e: callchannel Music_MobileAdapterMenu_branch_1780ae note E_, 8 callchannel Music_MobileAdapterMenu_branch_1780d7 @@ -115,9 +111,8 @@ Music_MobileAdapterMenu_branch_17808e: ; 17808e note E_, 1 note G#, 1 loopchannel 0, Music_MobileAdapterMenu_branch_17808e -; 1780ae -Music_MobileAdapterMenu_branch_1780ae: ; 1780ae +Music_MobileAdapterMenu_branch_1780ae: octave 4 note B_, 1 note __, 1 @@ -159,9 +154,8 @@ Music_MobileAdapterMenu_branch_1780ae: ; 1780ae note C#, 3 note D#, 1 endchannel -; 1780d7 -Music_MobileAdapterMenu_branch_1780d7: ; 1780d7 +Music_MobileAdapterMenu_branch_1780d7: note A_, 1 note __, 1 note A_, 1 @@ -173,13 +167,12 @@ Music_MobileAdapterMenu_branch_1780d7: ; 1780d7 note __, 1 note E_, 4 endchannel -; 1780e2 -Music_MobileAdapterMenu_Ch3: ; 1780e2 +Music_MobileAdapterMenu_Ch3: vibrato $8, $34 notetype $c, $25 note __, 2 -Music_MobileAdapterMenu_branch_1780e9: ; 1780e9 +Music_MobileAdapterMenu_branch_1780e9: callchannel Music_MobileAdapterMenu_branch_178119 octave 2 note B_, 1 @@ -217,9 +210,8 @@ Music_MobileAdapterMenu_branch_1780e9: ; 1780e9 callchannel Music_MobileAdapterMenu_branch_178119 note __, 2 loopchannel 0, Music_MobileAdapterMenu_branch_1780e9 -; 178119 -Music_MobileAdapterMenu_branch_178119: ; 178119 +Music_MobileAdapterMenu_branch_178119: octave 3 note E_, 2 note __, 2 @@ -263,9 +255,8 @@ Music_MobileAdapterMenu_branch_178119: ; 178119 note E_, 3 intensity $25 endchannel -; 178146 -Music_MobileAdapterMenu_branch_178146: ; 178146 +Music_MobileAdapterMenu_branch_178146: note A_, 2 note __, 2 octave 3 @@ -279,4 +270,3 @@ Music_MobileAdapterMenu_branch_178146: ; 178146 octave 3 note A_, 4 endchannel -; 178153 diff --git a/audio/music/mobilecenter.asm b/audio/music/mobilecenter.asm index 8a78ea5fa..0f9d3b9ab 100644 --- a/audio/music/mobilecenter.asm +++ b/audio/music/mobilecenter.asm @@ -1,11 +1,10 @@ -Music_MobileCenter: ; 17961d +Music_MobileCenter: 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 +Music_MobileCenter_Ch1: tempo 160 volume $77 dutycycle $1 @@ -20,7 +19,7 @@ Music_MobileCenter_Ch1: ; 179629 note G_, 2 note A_, 2 note B_, 4 -Music_MobileCenter_branch_179642: ; 179642 +Music_MobileCenter_branch_179642: octave 3 note E_, 2 note C_, 2 @@ -156,9 +155,8 @@ Music_MobileCenter_branch_179642: ; 179642 note E_, 2 note F_, 2 loopchannel 0, Music_MobileCenter_branch_179642 -; 1796cc -Music_MobileCenter_Ch2: ; 1796cc +Music_MobileCenter_Ch2: notetype $c, $c2 dutycycle $3 note __, 10 @@ -166,7 +164,7 @@ Music_MobileCenter_Ch2: ; 1796cc note G_, 2 note A_, 2 note B_, 2 -Music_MobileCenter_branch_1796d6: ; 1796d6 +Music_MobileCenter_branch_1796d6: octave 2 note C_, 2 note E_, 2 @@ -325,9 +323,8 @@ Music_MobileCenter_branch_1796d6: ; 1796d6 note E_, 2 note D_, 2 loopchannel 0, Music_MobileCenter_branch_1796d6 -; 179777 -Music_MobileCenter_Ch3: ; 179777 +Music_MobileCenter_Ch3: notetype $c, $24 vibrato $10, $34 octave 4 @@ -339,7 +336,7 @@ Music_MobileCenter_Ch3: ; 179777 note C_, 2 note D_, 4 notetype $c, $25 -Music_MobileCenter_branch_179788: ; 179788 +Music_MobileCenter_branch_179788: note C_, 2 octave 4 note G_, 2 @@ -452,9 +449,8 @@ Music_MobileCenter_branch_179788: ; 179788 note C_, 8 vibrato $10, $34 loopchannel 0, Music_MobileCenter_branch_179788 -; 179807 -Music_MobileCenter_Ch4: ; 179807 +Music_MobileCenter_Ch4: togglenoise $3 stereopanning $f notetype $c @@ -464,7 +460,7 @@ Music_MobileCenter_Ch4: ; 179807 note C#, 1 note C#, 1 note C#, 1 -Music_MobileCenter_branch_179813: ; 179813 +Music_MobileCenter_branch_179813: note A_, 2 note C#, 2 note C#, 2 @@ -485,4 +481,3 @@ Music_MobileCenter_branch_179813: ; 179813 note C#, 1 note C#, 1 loopchannel 0, Music_MobileCenter_branch_179813 -; 17982d diff --git a/audio/music/mom.asm b/audio/music/mom.asm index 7b65709f8..a9bdef9ca 100644 --- a/audio/music/mom.asm +++ b/audio/music/mom.asm @@ -1,10 +1,9 @@ -Music_Mom: ; f6bf2 +Music_Mom: musicheader 3, 2, Music_Mom_Ch2 musicheader 1, 3, Music_Mom_Ch3 musicheader 1, 4, Music_Mom_Ch4 -; f6bfb -Music_Mom_Ch2: ; f6bfb +Music_Mom_Ch2: tempo 144 volume $77 stereopanning $f @@ -17,7 +16,7 @@ Music_Mom_Ch2: ; f6bfb note G#, 1 note A_, 1 note B_, 8 -Music_Mom_branch_f6c0e: ; f6c0e +Music_Mom_branch_f6c0e: notetype $c, $b1 note __, 4 octave 3 @@ -31,9 +30,8 @@ Music_Mom_branch_f6c0e: ; f6c0e note A#, 2 note B_, 2 loopchannel 0, Music_Mom_branch_f6c0e -; f6c20 -Music_Mom_Ch3: ; f6c20 +Music_Mom_Ch3: stereopanning $f0 notetype $6, $25 octave 3 @@ -44,7 +42,7 @@ Music_Mom_Ch3: ; f6c20 note G#, 1 note E_, 8 intensity $23 -Music_Mom_branch_f6c2e: ; f6c2e +Music_Mom_branch_f6c2e: octave 2 note A_, 2 note __, 6 @@ -77,13 +75,12 @@ Music_Mom_branch_f6c2e: ; f6c2e note D_, 2 note __, 2 loopchannel 0, Music_Mom_branch_f6c2e -; f6c51 -Music_Mom_Ch4: ; f6c51 +Music_Mom_Ch4: togglenoise $3 notetype $c note __, 6 -Music_Mom_branch_f6c56: ; f6c56 +Music_Mom_branch_f6c56: note D#, 1 note __, 1 note F#, 2 @@ -109,4 +106,3 @@ Music_Mom_branch_f6c56: ; f6c56 note D#, 1 note __, 1 loopchannel 0, Music_Mom_branch_f6c56 -; f6c72 diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm index 5b2db6ede..474335f43 100644 --- a/audio/music/mtmoon.asm +++ b/audio/music/mtmoon.asm @@ -1,11 +1,10 @@ -Music_MtMoon: ; edb29 +Music_MtMoon: 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 +Music_MtMoon_Ch1: tempo 208 volume $77 dutycycle $2 @@ -15,14 +14,13 @@ Music_MtMoon_Ch1: ; edb35 notetype $c, $45 note __, 2 loopchannel 0, Music_MtMoon_branch_edb56 -; edb4c -Music_MtMoon_Ch2: ; edb4c +Music_MtMoon_Ch2: vibrato $b, $15 dutycycle $2 notetype $c, $84 stereopanning $f -Music_MtMoon_branch_edb56: ; edb56 +Music_MtMoon_branch_edb56: octave 4 note D#, 6 note C#, 6 @@ -72,12 +70,11 @@ Music_MtMoon_branch_edb56: ; edb56 note F#, 6 note E_, 4 loopchannel 0, Music_MtMoon_branch_edb56 -; edb8a -Music_MtMoon_Ch3: ; edb8a -Music_MtMoon_branch_edb8a: ; edb8a +Music_MtMoon_Ch3: +Music_MtMoon_branch_edb8a: notetype $c, $28 -Music_MtMoon_branch_edb8d: ; edb8d +Music_MtMoon_branch_edb8d: octave 2 note B_, 2 octave 3 @@ -105,7 +102,7 @@ Music_MtMoon_branch_edb8d: ; edb8d note G_, 2 note D#, 2 note E_, 2 -Music_MtMoon_branch_edbab: ; edbab +Music_MtMoon_branch_edbab: note E_, 2 note G#, 2 octave 4 @@ -120,12 +117,11 @@ Music_MtMoon_branch_edbab: ; edbab note G#, 2 loopchannel 4, Music_MtMoon_branch_edbab loopchannel 0, Music_MtMoon_branch_edb8a -; edbbf -Music_MtMoon_Ch4: ; edbbf +Music_MtMoon_Ch4: togglenoise $5 notetype $c -Music_MtMoon_branch_edbc3: ; edbc3 +Music_MtMoon_branch_edbc3: stereopanning $f note A#, 4 note A#, 8 @@ -140,4 +136,3 @@ Music_MtMoon_branch_edbc3: ; edbc3 stereopanning $f0 note A#, 8 loopchannel 0, Music_MtMoon_branch_edbc3 -; edbd8 diff --git a/audio/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm index 43984784e..57d1b0ddf 100644 --- a/audio/music/mtmoonsquare.asm +++ b/audio/music/mtmoonsquare.asm @@ -1,17 +1,16 @@ -Music_MtMoonSquare: ; f4815 +Music_MtMoonSquare: musicheader 2, 1, Music_MtMoonSquare_Ch1 musicheader 1, 2, Music_MtMoonSquare_Ch2 -; f481b -Music_MtMoonSquare_Ch1: ; f481b +Music_MtMoonSquare_Ch1: tempo 112 volume $77 dutycycle $2 tone $0001 note __, 1 -Music_MtMoonSquare_branch_f4826: ; f4826 +Music_MtMoonSquare_branch_f4826: notetype $c, $44 -Music_MtMoonSquare_branch_f4829: ; f4829 +Music_MtMoonSquare_branch_f4829: octave 4 note D_, 2 note E_, 2 @@ -21,7 +20,7 @@ Music_MtMoonSquare_branch_f4829: ; f4829 octave 5 note D_, 4 loopchannel 2, Music_MtMoonSquare_branch_f4829 -Music_MtMoonSquare_branch_f4835: ; f4835 +Music_MtMoonSquare_branch_f4835: octave 4 note E_, 2 note F#, 2 @@ -31,7 +30,7 @@ Music_MtMoonSquare_branch_f4835: ; f4835 octave 5 note E_, 4 loopchannel 2, Music_MtMoonSquare_branch_f4835 -Music_MtMoonSquare_branch_f4841: ; f4841 +Music_MtMoonSquare_branch_f4841: octave 4 note C#, 2 note D_, 2 @@ -41,7 +40,7 @@ Music_MtMoonSquare_branch_f4841: ; f4841 octave 5 note C#, 4 loopchannel 2, Music_MtMoonSquare_branch_f4841 -Music_MtMoonSquare_branch_f484d: ; f484d +Music_MtMoonSquare_branch_f484d: octave 4 note D_, 2 note E_, 2 @@ -52,14 +51,13 @@ Music_MtMoonSquare_branch_f484d: ; f484d note D_, 4 loopchannel 2, Music_MtMoonSquare_branch_f484d loopchannel 0, Music_MtMoonSquare_branch_f4826 -; f485d -Music_MtMoonSquare_Ch2: ; f485d +Music_MtMoonSquare_Ch2: dutycycle $2 vibrato $18, $24 -Music_MtMoonSquare_branch_f4862: ; f4862 +Music_MtMoonSquare_branch_f4862: notetype $c, $82 -Music_MtMoonSquare_branch_f4865: ; f4865 +Music_MtMoonSquare_branch_f4865: octave 4 note D_, 2 note E_, 2 @@ -71,7 +69,7 @@ Music_MtMoonSquare_branch_f4865: ; f4865 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4865 notetype $c, $82 -Music_MtMoonSquare_branch_f4877: ; f4877 +Music_MtMoonSquare_branch_f4877: octave 4 note E_, 2 note F#, 2 @@ -83,7 +81,7 @@ Music_MtMoonSquare_branch_f4877: ; f4877 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4877 notetype $c, $82 -Music_MtMoonSquare_branch_f4889: ; f4889 +Music_MtMoonSquare_branch_f4889: octave 4 note C#, 2 note D_, 2 @@ -95,7 +93,7 @@ Music_MtMoonSquare_branch_f4889: ; f4889 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4889 notetype $c, $82 -Music_MtMoonSquare_branch_f489b: ; f489b +Music_MtMoonSquare_branch_f489b: octave 4 note D_, 2 note E_, 2 @@ -107,4 +105,3 @@ Music_MtMoonSquare_branch_f489b: ; f489b notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f489b loopchannel 0, Music_MtMoonSquare_branch_f4862 -; f48ae diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm index 3f845c569..109086386 100644 --- a/audio/music/nationalpark.asm +++ b/audio/music/nationalpark.asm @@ -1,11 +1,10 @@ -Music_NationalPark: ; f54e8 +Music_NationalPark: 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 +Music_NationalPark_Ch1: tempo 192 volume $77 stereopanning $f @@ -13,7 +12,7 @@ Music_NationalPark_Ch1: ; f54f4 dutycycle $1 notetype $c, $77 note __, 2 -Music_NationalPark_branch_f5504: ; f5504 +Music_NationalPark_branch_f5504: callchannel Music_NationalPark_branch_f554a callchannel Music_NationalPark_branch_f554a notetype $6, $67 @@ -62,9 +61,8 @@ Music_NationalPark_branch_f5504: ; f5504 notetype $c, $77 note __, 4 loopchannel 0, Music_NationalPark_branch_f5504 -; f554a -Music_NationalPark_branch_f554a: ; f554a +Music_NationalPark_branch_f554a: octave 2 note G#, 6 octave 3 @@ -270,9 +268,8 @@ Music_NationalPark_branch_f554a: ; f554a octave 3 note A#, 2 endchannel -; f563a -Music_NationalPark_branch_f563a: ; f563a +Music_NationalPark_branch_f563a: note __, 16 note __, 3 octave 4 @@ -297,15 +294,14 @@ Music_NationalPark_branch_f563a: ; f563a note A_, 2 note __, 4 endchannel -; f5652 -Music_NationalPark_Ch2: ; f5652 +Music_NationalPark_Ch2: vibrato $14, $24 dutycycle $1 notetype $c, $a7 note __, 2 stereopanning $f0 -Music_NationalPark_branch_f565d: ; f565d +Music_NationalPark_branch_f565d: notetype $c, $a7 callchannel Music_NationalPark_branch_f56b8 octave 3 @@ -373,9 +369,8 @@ Music_NationalPark_branch_f565d: ; f565d note D#, 2 note D_, 2 loopchannel 0, Music_NationalPark_branch_f565d -; f56b8 -Music_NationalPark_branch_f56b8: ; f56b8 +Music_NationalPark_branch_f56b8: octave 2 note C#, 6 note G#, 2 @@ -437,9 +432,8 @@ Music_NationalPark_branch_f56b8: ; f56b8 octave 2 note F_, 2 endchannel -; f56f5 -Music_NationalPark_branch_f56f5: ; f56f5 +Music_NationalPark_branch_f56f5: octave 4 note E_, 1 note F_, 5 @@ -482,16 +476,15 @@ Music_NationalPark_branch_f56f5: ; f56f5 note D_, 2 note C#, 2 endchannel -; f5723 -Music_NationalPark_Ch3: ; f5723 +Music_NationalPark_Ch3: vibrato $16, $24 notetype $c, $11 octave 4 note G#, 1 note A#, 1 stereopanning $ff -Music_NationalPark_branch_f572e: ; f572e +Music_NationalPark_branch_f572e: callchannel Music_NationalPark_branch_f5756 octave 5 note A#, 14 @@ -519,9 +512,8 @@ Music_NationalPark_branch_f572e: ; f572e note G#, 1 note A#, 1 loopchannel 0, Music_NationalPark_branch_f572e -; f5756 -Music_NationalPark_branch_f5756: ; f5756 +Music_NationalPark_branch_f5756: octave 5 note C_, 16 note C#, 14 @@ -579,9 +571,8 @@ Music_NationalPark_branch_f5756: ; f5756 octave 6 note C_, 2 endchannel -; f578f -Music_NationalPark_branch_f578f: ; f578f +Music_NationalPark_branch_f578f: octave 2 note F#, 3 octave 3 @@ -623,13 +614,12 @@ Music_NationalPark_branch_f578f: ; f578f note F_, 1 note __, 1 endchannel -; f57b8 -Music_NationalPark_Ch4: ; f57b8 +Music_NationalPark_Ch4: togglenoise $3 notetype $c note __, 2 -Music_NationalPark_branch_f57bd: ; f57bd +Music_NationalPark_branch_f57bd: note __, 16 loopchannel 23, Music_NationalPark_branch_f57bd note __, 8 @@ -638,7 +628,7 @@ Music_NationalPark_branch_f57bd: ; f57bd note A#, 1 note D_, 1 note B_, 2 -Music_NationalPark_branch_f57c8: ; f57c8 +Music_NationalPark_branch_f57c8: note A#, 2 note G_, 1 note G_, 1 @@ -665,4 +655,3 @@ Music_NationalPark_branch_f57c8: ; f57c8 note A#, 1 note D#, 1 loopchannel 0, Music_NationalPark_branch_f57bd -; f57e8 diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm index bf481f7c3..0e3b92d39 100644 --- a/audio/music/newbarktown.asm +++ b/audio/music/newbarktown.asm @@ -1,19 +1,18 @@ -Music_NewBarkTown: ; eb2d3 +Music_NewBarkTown: musicheader 3, 1, Music_NewBarkTown_Ch1 musicheader 1, 2, Music_NewBarkTown_Ch2 musicheader 1, 3, Music_NewBarkTown_Ch3 -; eb2dc db $3 -Music_NewBarkTown_Ch1: ; eb2dd +Music_NewBarkTown_Ch1: tempo 187 volume $77 stereopanning $f vibrato $12, $23 notetype $c, $87 note __, 4 -Music_NewBarkTown_branch_eb2eb: ; eb2eb +Music_NewBarkTown_branch_eb2eb: dutycycle $0 callchannel Music_NewBarkTown_branch_eb349 octave 3 @@ -85,9 +84,8 @@ Music_NewBarkTown_branch_eb2eb: ; eb2eb note B_, 2 intensity $87 loopchannel 0, Music_NewBarkTown_branch_eb2eb -; eb349 -Music_NewBarkTown_branch_eb349: ; eb349 +Music_NewBarkTown_branch_eb349: octave 3 note F#, 1 note __, 1 @@ -139,9 +137,8 @@ Music_NewBarkTown_branch_eb349: ; eb349 note B_, 1 note __, 1 endchannel -; eb37c -Music_NewBarkTown_branch_eb37c: ; eb37c +Music_NewBarkTown_branch_eb37c: octave 2 note G_, 2 note B_, 2 @@ -159,14 +156,13 @@ Music_NewBarkTown_branch_eb37c: ; eb37c note A_, 4 note E_, 2 endchannel -; eb38d -Music_NewBarkTown_Ch2: ; eb38d +Music_NewBarkTown_Ch2: stereopanning $ff vibrato $12, $23 notetype $6, $a7 note __, 8 -Music_NewBarkTown_branch_eb396: ; eb396 +Music_NewBarkTown_branch_eb396: dutycycle $2 notetype $6, $a7 callchannel Music_NewBarkTown_branch_eb3bf @@ -190,9 +186,8 @@ Music_NewBarkTown_branch_eb396: ; eb396 note D_, 4 note E_, 16 loopchannel 0, Music_NewBarkTown_branch_eb396 -; eb3bf -Music_NewBarkTown_branch_eb3bf: ; eb3bf +Music_NewBarkTown_branch_eb3bf: octave 2 note D_, 4 note __, 8 @@ -244,9 +239,8 @@ Music_NewBarkTown_branch_eb3bf: ; eb3bf octave 2 note C#, 4 endchannel -; eb3f2 -Music_NewBarkTown_branch_eb3f2: ; eb3f2 +Music_NewBarkTown_branch_eb3f2: notetype $6, $97 dutycycle $2 octave 4 @@ -256,15 +250,14 @@ Music_NewBarkTown_branch_eb3f2: ; eb3f2 notetype $c, $97 note E_, 16 endchannel -; eb400 -Music_NewBarkTown_Ch3: ; eb400 +Music_NewBarkTown_Ch3: stereopanning $f0 notetype $c, $10 octave 5 note D_, 2 note E_, 2 -Music_NewBarkTown_branch_eb408: ; eb408 +Music_NewBarkTown_branch_eb408: vibrato $16, $23 note F#, 4 note A_, 4 @@ -329,4 +322,3 @@ Music_NewBarkTown_branch_eb408: ; eb408 note D_, 1 note E_, 1 loopchannel 0, Music_NewBarkTown_branch_eb408 -; eb453 diff --git a/audio/music/nothing.asm b/audio/music/nothing.asm index 7240c5361..596413876 100644 --- a/audio/music/nothing.asm +++ b/audio/music/nothing.asm @@ -1,13 +1,11 @@ -Music_Nothing: ; e91a3 +Music_Nothing: 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 -Music_Nothing_Ch2: ; e91af -Music_Nothing_Ch3: ; e91af -Music_Nothing_Ch4: ; e91af +Music_Nothing_Ch1: +Music_Nothing_Ch2: +Music_Nothing_Ch3: +Music_Nothing_Ch4: endchannel -; e91b0 diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index a64fd6b09..68585e473 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,16 +1,15 @@ -Music_PalletTown: ; f4b0c +Music_PalletTown: musicheader 3, 1, Music_PalletTown_Ch1 musicheader 1, 2, Music_PalletTown_Ch2 musicheader 1, 3, Music_PalletTown_Ch3 -; f4b15 -Music_PalletTown_Ch1: ; f4b15 +Music_PalletTown_Ch1: tempo 188 volume $77 vibrato $12, $24 tone $0001 stereopanning $f -Music_PalletTown_branch_f4b22: ; f4b22 +Music_PalletTown_branch_f4b22: dutycycle $2 notetype $c, $78 octave 3 @@ -60,7 +59,7 @@ Music_PalletTown_branch_f4b22: ; f4b22 note B_, 8 intensity $77 note B_, 8 -Music_PalletTown_branch_f4b59: ; f4b59 +Music_PalletTown_branch_f4b59: dutycycle $3 intensity $92 note G_, 2 @@ -118,13 +117,12 @@ Music_PalletTown_branch_f4b59: ; f4b59 intensity $1f note F#, 8 loopchannel 0, Music_PalletTown_branch_f4b22 -; f4ba1 -Music_PalletTown_Ch2: ; f4ba1 +Music_PalletTown_Ch2: vibrato $12, $44 dutycycle $2 stereopanning $f0 -Music_PalletTown_branch_f4ba8: ; f4ba8 +Music_PalletTown_branch_f4ba8: notetype $c, $88 octave 1 note G_, 2 @@ -184,7 +182,7 @@ Music_PalletTown_branch_f4ba8: ; f4ba8 octave 3 note C_, 2 note D_, 2 -Music_PalletTown_branch_f4be5: ; f4be5 +Music_PalletTown_branch_f4be5: intensity $a2 octave 3 note E_, 2 @@ -244,11 +242,10 @@ Music_PalletTown_branch_f4be5: ; f4be5 note B_, 2 note A_, 2 loopchannel 0, Music_PalletTown_branch_f4ba8 -; f4c2a -Music_PalletTown_Ch3: ; f4c2a +Music_PalletTown_Ch3: vibrato $14, $24 -Music_PalletTown_branch_f4c2d: ; f4c2d +Music_PalletTown_branch_f4c2d: notetype $c, $10 octave 6 note D_, 2 @@ -358,4 +355,3 @@ Music_PalletTown_branch_f4c2d: ; f4c2d note B_, 8 note A_, 8 loopchannel 0, Music_PalletTown_branch_f4c2d -; f4c9f diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm index 3239d782a..e324c5595 100644 --- a/audio/music/pokeflutechannel.asm +++ b/audio/music/pokeflutechannel.asm @@ -1,10 +1,9 @@ -Music_PokeFluteChannel: ; f7b13 +Music_PokeFluteChannel: musicheader 3, 1, Music_PokeFluteChannel_Ch1 musicheader 1, 2, Music_PokeFluteChannel_Ch2 musicheader 1, 3, Music_PokeFluteChannel_Ch3 -; f7b1c -Music_PokeFluteChannel_Ch1: ; f7b1c +Music_PokeFluteChannel_Ch1: tempo 240 volume $77 stereopanning $f0 @@ -30,7 +29,7 @@ Music_PokeFluteChannel_Ch1: ; f7b1c octave 2 note G_, 4 note A_, 8 -Music_PokeFluteChannel_branch_f7b40: ; f7b40 +Music_PokeFluteChannel_branch_f7b40: octave 3 note E_, 2 note G_, 2 @@ -68,9 +67,8 @@ Music_PokeFluteChannel_branch_f7b40: ; f7b40 note G_, 4 note A_, 8 loopchannel 0, Music_PokeFluteChannel_branch_f7b40 -; f7b68 -Music_PokeFluteChannel_Ch2: ; f7b68 +Music_PokeFluteChannel_Ch2: stereopanning $f dutycycle $3 tone $0001 @@ -107,7 +105,7 @@ Music_PokeFluteChannel_Ch2: ; f7b68 octave 2 note E_, 2 note G_, 2 -Music_PokeFluteChannel_branch_f7b94: ; f7b94 +Music_PokeFluteChannel_branch_f7b94: octave 3 note C_, 2 note E_, 2 @@ -170,14 +168,13 @@ Music_PokeFluteChannel_branch_f7b94: ; f7b94 note E_, 2 note G_, 2 loopchannel 0, Music_PokeFluteChannel_branch_f7b94 -; f7bd5 -Music_PokeFluteChannel_Ch3: ; f7bd5 +Music_PokeFluteChannel_Ch3: vibrato $10, $14 notetype $c, $10 callchannel Music_PokeFluteChannel_branch_f7c05 callchannel Music_PokeFluteChannel_branch_f7c05 -Music_PokeFluteChannel_branch_f7be1: ; f7be1 +Music_PokeFluteChannel_branch_f7be1: note __, 4 octave 4 note C_, 2 @@ -209,9 +206,8 @@ Music_PokeFluteChannel_branch_f7be1: ; f7be1 note __, 4 callchannel Music_PokeFluteChannel_branch_f7c05 loopchannel 0, Music_PokeFluteChannel_branch_f7be1 -; f7c05 -Music_PokeFluteChannel_branch_f7c05: ; f7c05 +Music_PokeFluteChannel_branch_f7c05: octave 5 note E_, 2 note F_, 2 @@ -229,4 +225,3 @@ Music_PokeFluteChannel_branch_f7c05: ; f7c05 note F_, 2 note G_, 4 endchannel -; f7c16 diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm index 32e1a59f4..01865045b 100644 --- a/audio/music/pokemoncenter.asm +++ b/audio/music/pokemoncenter.asm @@ -1,17 +1,16 @@ -Music_PokemonCenter: ; ed5c6 +Music_PokemonCenter: 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 +Music_PokemonCenter_Ch1: tempo 152 volume $77 dutycycle $2 vibrato $a, $14 tone $0001 -Music_PokemonCenter_branch_ed5df: ; ed5df +Music_PokemonCenter_branch_ed5df: stereopanning $f notetype $c, $83 octave 3 @@ -149,11 +148,10 @@ Music_PokemonCenter_branch_ed5df: ; ed5df note F#, 2 note G_, 2 loopchannel 0, Music_PokemonCenter_branch_ed5df -; ed671 -Music_PokemonCenter_Ch2: ; ed671 +Music_PokemonCenter_Ch2: vibrato $10, $25 -Music_PokemonCenter_branch_ed674: ; ed674 +Music_PokemonCenter_branch_ed674: stereopanning $ff callchannel Music_PokemonCenter_branch_ed6d1 stereopanning $f @@ -218,9 +216,8 @@ Music_PokemonCenter_branch_ed674: ; ed674 note E_, 2 note D_, 8 loopchannel 0, Music_PokemonCenter_branch_ed674 -; ed6d1 -Music_PokemonCenter_branch_ed6d1: ; ed6d1 +Music_PokemonCenter_branch_ed6d1: dutycycle $2 notetype $c, $c2 octave 4 @@ -236,9 +233,8 @@ Music_PokemonCenter_branch_ed6d1: ; ed6d1 note E_, 2 note C#, 6 endchannel -; ed6e4 -Music_PokemonCenter_branch_ed6e4: ; ed6e4 +Music_PokemonCenter_branch_ed6e4: notetype $c, $c2 octave 4 note C#, 2 @@ -251,11 +247,10 @@ Music_PokemonCenter_branch_ed6e4: ; ed6e4 note E_, 4 note C#, 2 endchannel -; ed6f3 -Music_PokemonCenter_Ch3: ; ed6f3 +Music_PokemonCenter_Ch3: notetype $c, $28 -Music_PokemonCenter_branch_ed6f6: ; ed6f6 +Music_PokemonCenter_branch_ed6f6: stereopanning $f0 octave 3 note D_, 1 @@ -360,9 +355,8 @@ Music_PokemonCenter_branch_ed6f6: ; ed6f6 note E_, 1 note __, 1 loopchannel 0, Music_PokemonCenter_branch_ed6f6 -; ed76f -Music_PokemonCenter_branch_ed76f: ; ed76f +Music_PokemonCenter_branch_ed76f: note E_, 1 note __, 5 note A_, 1 @@ -372,9 +366,8 @@ Music_PokemonCenter_branch_ed76f: ; ed76f note A_, 1 note __, 1 endchannel -; ed778 -Music_PokemonCenter_branch_ed778: ; ed778 +Music_PokemonCenter_branch_ed778: note E_, 1 note __, 5 note A_, 1 @@ -386,9 +379,8 @@ Music_PokemonCenter_branch_ed778: ; ed778 note A_, 1 note __, 1 endchannel -; ed783 -Music_PokemonCenter_branch_ed783: ; ed783 +Music_PokemonCenter_branch_ed783: note F#, 1 note __, 5 note A_, 1 @@ -398,17 +390,15 @@ Music_PokemonCenter_branch_ed783: ; ed783 note A_, 1 note __, 1 endchannel -; ed78c -Music_PokemonCenter_Ch4: ; ed78c +Music_PokemonCenter_Ch4: togglenoise $3 notetype $c stereopanning $ff -Music_PokemonCenter_branch_ed792: ; ed792 +Music_PokemonCenter_branch_ed792: note G_, 6 note G_, 4 note G_, 2 note G_, 2 note G_, 2 loopchannel 0, Music_PokemonCenter_branch_ed792 -; ed79b diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm index b06cc0694..34d642629 100644 --- a/audio/music/pokemonchannel.asm +++ b/audio/music/pokemonchannel.asm @@ -1,11 +1,10 @@ -Music_PokemonChannel: ; ee45f +Music_PokemonChannel: 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 +Music_PokemonChannel_Ch1: tempo 128 volume $77 vibrato $8, $38 @@ -74,9 +73,8 @@ Music_PokemonChannel_Ch1: ; ee46b note D_, 2 note __, 6 endchannel -; ee4be -Music_PokemonChannel_Ch2: ; ee4be +Music_PokemonChannel_Ch2: dutycycle $1 vibrato $8, $38 stereopanning $ff @@ -145,9 +143,8 @@ Music_PokemonChannel_Ch2: ; ee4be note G_, 2 note __, 6 endchannel -; ee50e -Music_PokemonChannel_Ch3: ; ee50e +Music_PokemonChannel_Ch3: vibrato $8, $38 notetype $c, $25 stereopanning $f0 @@ -202,12 +199,11 @@ Music_PokemonChannel_Ch3: ; ee50e note G_, 1 note __, 3 endchannel -; ee549 -Music_PokemonChannel_Ch4: ; ee549 +Music_PokemonChannel_Ch4: togglenoise $3 notetype $c -Music_PokemonChannel_branch_ee54d: ; ee54d +Music_PokemonChannel_branch_ee54d: note A#, 3 note A#, 1 note D_, 2 @@ -233,4 +229,3 @@ Music_PokemonChannel_branch_ee54d: ; ee54d note A#, 4 note A#, 4 endchannel -; ee569 diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm index 5db53d732..86116a9a9 100644 --- a/audio/music/pokemonlullaby.asm +++ b/audio/music/pokemonlullaby.asm @@ -1,15 +1,14 @@ -Music_PokemonLullaby: ; f6d79 +Music_PokemonLullaby: musicheader 3, 1, Music_PokemonLullaby_Ch1 musicheader 1, 2, Music_PokemonLullaby_Ch2 musicheader 1, 3, Music_PokemonLullaby_Ch3 -; f6d82 -Music_PokemonLullaby_Ch1: ; f6d82 +Music_PokemonLullaby_Ch1: tempo 224 volume $77 dutycycle $3 tone $0001 -Music_PokemonLullaby_branch_f6d8c: ; f6d8c +Music_PokemonLullaby_branch_f6d8c: notetype $c, $a7 octave 3 note G_, 16 @@ -53,13 +52,12 @@ Music_PokemonLullaby_branch_f6d8c: ; f6d8c octave 3 note B_, 8 loopchannel 0, Music_PokemonLullaby_branch_f6d8c -; f6dc4 -Music_PokemonLullaby_Ch2: ; f6dc4 +Music_PokemonLullaby_Ch2: vibrato $10, $14 dutycycle $0 notetype $c, $b4 -Music_PokemonLullaby_branch_f6dcc: ; f6dcc +Music_PokemonLullaby_branch_f6dcc: note __, 16 note __, 10 octave 4 @@ -104,11 +102,10 @@ Music_PokemonLullaby_branch_f6dcc: ; f6dcc note E_, 16 note __, 14 loopchannel 0, Music_PokemonLullaby_branch_f6dcc -; f6e03 -Music_PokemonLullaby_Ch3: ; f6e03 +Music_PokemonLullaby_Ch3: notetype $c, $11 -Music_PokemonLullaby_branch_f6e06: ; f6e06 +Music_PokemonLullaby_branch_f6e06: stereopanning $f0 octave 4 note C_, 2 @@ -133,4 +130,3 @@ Music_PokemonLullaby_branch_f6e06: ; f6e06 note B_, 2 note A_, 2 loopchannel 0, Music_PokemonLullaby_branch_f6e06 -; f6e23 diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm index 0c776a499..346e042b1 100644 --- a/audio/music/pokemonmarch.asm +++ b/audio/music/pokemonmarch.asm @@ -1,11 +1,10 @@ -Music_PokemonMarch: ; f6e23 +Music_PokemonMarch: 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 +Music_PokemonMarch_Ch1: tempo 144 volume $77 stereopanning $f0 @@ -21,7 +20,7 @@ Music_PokemonMarch_Ch1: ; f6e2f intensity $a2 note D_, 4 notetype $8, $a2 -Music_PokemonMarch_branch_f6e4c: ; f6e4c +Music_PokemonMarch_branch_f6e4c: callchannel Music_PokemonMarch_branch_f6eae note D#, 2 note C_, 2 @@ -97,9 +96,8 @@ Music_PokemonMarch_branch_f6e4c: ; f6e4c note G_, 4 note A#, 2 loopchannel 0, Music_PokemonMarch_branch_f6e4c -; f6eae -Music_PokemonMarch_branch_f6eae: ; f6eae +Music_PokemonMarch_branch_f6eae: note __, 4 octave 3 note D#, 1 @@ -110,9 +108,8 @@ Music_PokemonMarch_branch_f6eae: ; f6eae note D#, 2 note __, 2 endchannel -; f6eb8 -Music_PokemonMarch_branch_f6eb8: ; f6eb8 +Music_PokemonMarch_branch_f6eb8: note __, 4 note F_, 1 note E_, 1 @@ -122,9 +119,8 @@ Music_PokemonMarch_branch_f6eb8: ; f6eb8 note F_, 2 note __, 2 endchannel -; f6ec1 -Music_PokemonMarch_Ch2: ; f6ec1 +Music_PokemonMarch_Ch2: dutycycle $2 vibrato $10, $22 notetype $c, $b2 @@ -133,7 +129,7 @@ Music_PokemonMarch_Ch2: ; f6ec1 note G_, 4 note G_, 4 note G_, 4 -Music_PokemonMarch_branch_f6ece: ; f6ece +Music_PokemonMarch_branch_f6ece: notetype $c, $b7 octave 3 note G#, 12 @@ -234,14 +230,13 @@ Music_PokemonMarch_branch_f6ece: ; f6ece note G_, 1 note __, 5 loopchannel 0, Music_PokemonMarch_branch_f6ece -; f6f4d -Music_PokemonMarch_Ch3: ; f6f4d +Music_PokemonMarch_Ch3: stereopanning $f notetype $c, $16 note __, 16 notetype $8, $16 -Music_PokemonMarch_branch_f6f56: ; f6f56 +Music_PokemonMarch_branch_f6f56: callchannel Music_PokemonMarch_branch_f6fe8 note __, 2 octave 4 @@ -273,7 +268,7 @@ Music_PokemonMarch_branch_f6f56: ; f6f56 note D#, 2 note G_, 2 note G#, 2 -Music_PokemonMarch_branch_f6f7b: ; f6f7b +Music_PokemonMarch_branch_f6f7b: octave 3 note A#, 2 note __, 2 @@ -377,9 +372,8 @@ Music_PokemonMarch_branch_f6f7b: ; f6f7b note __, 2 note G#, 2 loopchannel 0, Music_PokemonMarch_branch_f6f56 -; f6fe8 -Music_PokemonMarch_branch_f6fe8: ; f6fe8 +Music_PokemonMarch_branch_f6fe8: octave 3 note G#, 2 note __, 2 @@ -398,14 +392,13 @@ Music_PokemonMarch_branch_f6fe8: ; f6fe8 octave 3 note G_, 2 endchannel -; f6ffa -Music_PokemonMarch_Ch4: ; f6ffa +Music_PokemonMarch_Ch4: stereopanning $f0 togglenoise $5 notetype $8 callchannel Music_PokemonMarch_branch_f704c -Music_PokemonMarch_branch_f7003: ; f7003 +Music_PokemonMarch_branch_f7003: callchannel Music_PokemonMarch_branch_f7042 note C_, 4 note C_, 2 @@ -441,9 +434,8 @@ Music_PokemonMarch_branch_f7003: ; f7003 notetype $8 callchannel Music_PokemonMarch_branch_f704c loopchannel 0, Music_PokemonMarch_branch_f7003 -; f7042 -Music_PokemonMarch_branch_f7042: ; f7042 +Music_PokemonMarch_branch_f7042: note C_, 4 note C_, 2 note C_, 4 @@ -454,9 +446,8 @@ Music_PokemonMarch_branch_f7042: ; f7042 note C#, 2 note C#, 2 endchannel -; f704c -Music_PokemonMarch_branch_f704c: ; f704c +Music_PokemonMarch_branch_f704c: note C_, 4 note C_, 2 note C_, 4 @@ -466,4 +457,3 @@ Music_PokemonMarch_branch_f704c: ; f704c note D_, 2 note C#, 2 endchannel -; f7055 diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm index d998d6212..0997828f8 100644 --- a/audio/music/postcredits.asm +++ b/audio/music/postcredits.asm @@ -1,18 +1,17 @@ -Music_PostCredits: ; cfd9e +Music_PostCredits: musicheader 2, 1, Music_PostCredits_Ch1 musicheader 1, 2, Music_PostCredits_Ch2 -; cfda4 db $2 -Music_PostCredits_Ch1: ; cfda5 +Music_PostCredits_Ch1: tempo 271 volume $77 pitchoffset 0, D# dutycycle $2 notetype $c, $93 note __, 8 -Music_PostCredits_branch_cfdb2: ; cfdb2 +Music_PostCredits_branch_cfdb2: octave 3 note C_, 2 note E_, 2 @@ -130,9 +129,8 @@ Music_PostCredits_branch_cfdb2: ; cfdb2 octave 2 note G_, 2 loopchannel 0, Music_PostCredits_branch_cfdb2 -; cfe48 -Music_PostCredits_Ch2: ; cfe48 +Music_PostCredits_Ch2: pitchoffset 0, D# dutycycle $2 notetype $c, $a3 @@ -144,7 +142,7 @@ Music_PostCredits_Ch2: ; cfe48 note F_, 2 intensity $73 note F_, 2 -Music_PostCredits_branch_cfe5a: ; cfe5a +Music_PostCredits_branch_cfe5a: intensity $a3 note G_, 2 intensity $73 @@ -264,4 +262,3 @@ Music_PostCredits_branch_cfe5a: ; cfe5a note E_, 2 note F_, 2 loopchannel 0, Music_PostCredits_branch_cfe5a -; cff04 diff --git a/audio/music/printer.asm b/audio/music/printer.asm index ffda482a0..886f6b766 100644 --- a/audio/music/printer.asm +++ b/audio/music/printer.asm @@ -1,8 +1,7 @@ -Music_Printer: ; f07fd +Music_Printer: musicheader 1, 3, Music_Printer_Ch3 -; f0800 -Music_Printer_Ch3: ; f0800 +Music_Printer_Ch3: tempo 256 notetype $c, $20 octave 4 @@ -34,7 +33,7 @@ Music_Printer_Ch3: ; f0800 note __, 1 note F#, 1 note __, 1 -Music_Printer_branch_f0823: ; f0823 +Music_Printer_branch_f0823: note E_, 1 note __, 1 note B_, 1 @@ -318,4 +317,3 @@ Music_Printer_branch_f0823: ; f0823 note D#, 1 note __, 1 loopchannel 0, Music_Printer_branch_f0823 -; f0941 diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm index c24592350..5e34e2c65 100644 --- a/audio/music/profoak.asm +++ b/audio/music/profoak.asm @@ -1,10 +1,9 @@ -Music_ProfOak: ; f4dea +Music_ProfOak: musicheader 3, 1, Music_ProfOak_Ch1 musicheader 1, 2, Music_ProfOak_Ch2 musicheader 1, 3, Music_ProfOak_Ch3 -; f4df3 -Music_ProfOak_Ch1: ; f4df3 +Music_ProfOak_Ch1: tempo 118 volume $77 vibrato $12, $34 @@ -22,14 +21,14 @@ Music_ProfOak_Ch1: ; f4df3 note G#, 8 intensity $97 note G#, 8 -Music_ProfOak_branch_f4e10: ; f4e10 +Music_ProfOak_branch_f4e10: intensity $91 callchannel Music_ProfOak_branch_f4e42 callchannel Music_ProfOak_branch_f4e42 callchannel Music_ProfOak_branch_f4e4d callchannel Music_ProfOak_branch_f4e4d loopchannel 2, Music_ProfOak_branch_f4e10 -Music_ProfOak_branch_f4e22: ; f4e22 +Music_ProfOak_branch_f4e22: callchannel Music_ProfOak_branch_f4e58 callchannel Music_ProfOak_branch_f4e58 callchannel Music_ProfOak_branch_f4e6c @@ -41,9 +40,8 @@ Music_ProfOak_branch_f4e22: ; f4e22 callchannel Music_ProfOak_branch_f4e6c callchannel Music_ProfOak_branch_f4e6c loopchannel 0, Music_ProfOak_branch_f4e22 -; f4e42 -Music_ProfOak_branch_f4e42: ; f4e42 +Music_ProfOak_branch_f4e42: octave 2 note B_, 2 octave 3 @@ -55,9 +53,8 @@ Music_ProfOak_branch_f4e42: ; f4e42 note G#, 2 note E_, 2 endchannel -; f4e4d -Music_ProfOak_branch_f4e4d: ; f4e4d +Music_ProfOak_branch_f4e4d: octave 2 note B_, 2 octave 3 @@ -69,9 +66,8 @@ Music_ProfOak_branch_f4e4d: ; f4e4d note F#, 2 note D#, 2 endchannel -; f4e58 -Music_ProfOak_branch_f4e58: ; f4e58 +Music_ProfOak_branch_f4e58: octave 2 note A_, 2 octave 3 @@ -88,9 +84,8 @@ Music_ProfOak_branch_f4e58: ; f4e58 note E_, 2 intensity $91 endchannel -; f4e6c -Music_ProfOak_branch_f4e6c: ; f4e6c +Music_ProfOak_branch_f4e6c: octave 2 note B_, 1 octave 3 @@ -105,9 +100,8 @@ Music_ProfOak_branch_f4e6c: ; f4e6c note B_, 4 intensity $91 endchannel -; f4e7e -Music_ProfOak_Ch2: ; f4e7e +Music_ProfOak_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $a8 @@ -121,7 +115,7 @@ Music_ProfOak_Ch2: ; f4e7e intensity $a7 note B_, 10 dutycycle $2 -Music_ProfOak_branch_f4e92: ; f4e92 +Music_ProfOak_branch_f4e92: intensity $b2 octave 3 note B_, 2 @@ -159,7 +153,7 @@ Music_ProfOak_branch_f4e92: ; f4e92 loopchannel 2, Music_ProfOak_branch_f4e92 note __, 6 intensity $b4 -Music_ProfOak_branch_f4ebf: ; f4ebf +Music_ProfOak_branch_f4ebf: note C#, 6 octave 3 note A_, 1 @@ -208,9 +202,8 @@ Music_ProfOak_branch_f4ebf: ; f4ebf note E_, 1 note G#, 16 loopchannel 0, Music_ProfOak_branch_f4ebf -; f4ef5 -Music_ProfOak_Ch3: ; f4ef5 +Music_ProfOak_Ch3: stereopanning $f notetype $c, $14 note __, 4 @@ -230,13 +223,13 @@ Music_ProfOak_Ch3: ; f4ef5 note __, 1 note E_, 2 callchannel Music_ProfOak_branch_f4f3d -Music_ProfOak_branch_f4f0d: ; f4f0d +Music_ProfOak_branch_f4f0d: callchannel Music_ProfOak_branch_f4f3d callchannel Music_ProfOak_branch_f4f3d callchannel Music_ProfOak_branch_f4f4c callchannel Music_ProfOak_branch_f4f4c loopchannel 2, Music_ProfOak_branch_f4f0d -Music_ProfOak_branch_f4f1d: ; f4f1d +Music_ProfOak_branch_f4f1d: callchannel Music_ProfOak_branch_f4f5a callchannel Music_ProfOak_branch_f4f5a callchannel Music_ProfOak_branch_f4f69 @@ -248,9 +241,8 @@ Music_ProfOak_branch_f4f1d: ; f4f1d callchannel Music_ProfOak_branch_f4f69 callchannel Music_ProfOak_branch_f4f69 loopchannel 0, Music_ProfOak_branch_f4f1d -; f4f3d -Music_ProfOak_branch_f4f3d: ; f4f3d +Music_ProfOak_branch_f4f3d: note E_, 2 note __, 2 octave 4 @@ -266,9 +258,8 @@ Music_ProfOak_branch_f4f3d: ; f4f3d note __, 1 note E_, 2 endchannel -; f4f4c -Music_ProfOak_branch_f4f4c: ; f4f4c +Music_ProfOak_branch_f4f4c: octave 2 note B_, 2 note __, 2 @@ -283,9 +274,8 @@ Music_ProfOak_branch_f4f4c: ; f4f4c note __, 1 note D#, 2 endchannel -; f4f5a -Music_ProfOak_branch_f4f5a: ; f4f5a +Music_ProfOak_branch_f4f5a: octave 2 note A_, 2 note __, 2 @@ -301,9 +291,8 @@ Music_ProfOak_branch_f4f5a: ; f4f5a note __, 1 note C#, 2 endchannel -; f4f69 -Music_ProfOak_branch_f4f69: ; f4f69 +Music_ProfOak_branch_f4f69: octave 2 note G#, 2 note __, 2 @@ -320,4 +309,3 @@ Music_ProfOak_branch_f4f69: ; f4f69 octave 2 note B_, 2 endchannel -; f4f79 diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm index 8907e7614..bd2994660 100644 --- a/audio/music/profoakspokemontalk.asm +++ b/audio/music/profoakspokemontalk.asm @@ -1,12 +1,11 @@ -Music_ProfOaksPokemonTalk: ; f4c9f +Music_ProfOaksPokemonTalk: musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1 musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2 musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3 -; f4ca8 db $3 -Music_ProfOaksPokemonTalk_Ch1: ; f4ca9 +Music_ProfOaksPokemonTalk_Ch1: tempo 164 volume $77 stereopanning $f @@ -24,7 +23,7 @@ Music_ProfOaksPokemonTalk_Ch1: ; f4ca9 note D#, 1 note E_, 1 note F#, 1 -Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3 +Music_ProfOaksPokemonTalk_branch_f4cc3: note D#, 6 note C#, 1 octave 3 @@ -132,9 +131,8 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3 note F#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3 -; f4d31 -Music_ProfOaksPokemonTalk_Ch2: ; f4d31 +Music_ProfOaksPokemonTalk_Ch2: vibrato $8, $24 dutycycle $3 notetype $c, $a7 @@ -157,7 +155,7 @@ Music_ProfOaksPokemonTalk_Ch2: ; f4d31 note F#, 1 note G#, 1 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d +Music_ProfOaksPokemonTalk_branch_f4d4d: note B_, 6 note A#, 1 note G#, 1 @@ -208,9 +206,8 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d note A#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d -; f4d82 -Music_ProfOaksPokemonTalk_Ch3: ; f4d82 +Music_ProfOaksPokemonTalk_Ch3: vibrato $6, $38 notetype $c, $25 stereopanning $f0 @@ -225,7 +222,7 @@ Music_ProfOaksPokemonTalk_Ch3: ; f4d82 note C#, 1 octave 2 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95 +Music_ProfOaksPokemonTalk_branch_f4d95: note B_, 6 octave 3 note D#, 1 @@ -308,4 +305,3 @@ Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95 note A#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95 -; f4dea diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm index 8dc4616a6..4ba8840ba 100644 --- a/audio/music/rivalbattle.asm +++ b/audio/music/rivalbattle.asm @@ -1,10 +1,9 @@ -Music_RivalBattle: ; e974f +Music_RivalBattle: musicheader 3, 1, Music_RivalBattle_Ch1 musicheader 1, 2, Music_RivalBattle_Ch2 musicheader 1, 3, Music_RivalBattle_Ch3 -; e9758 -Music_RivalBattle_Ch1: ; e9758 +Music_RivalBattle_Ch1: tempo 102 volume $77 dutycycle $3 @@ -23,7 +22,7 @@ Music_RivalBattle_Ch1: ; e9758 intensity $b7 note C#, 6 note E_, 4 -Music_RivalBattle_branch_e9777: ; e9777 +Music_RivalBattle_branch_e9777: intensity $b2 octave 2 note A#, 6 @@ -40,7 +39,7 @@ Music_RivalBattle_branch_e9777: ; e9777 note C#, 4 intensity $b7 note C#, 10 -Music_RivalBattle_branch_e978f: ; e978f +Music_RivalBattle_branch_e978f: intensity $b2 octave 3 note G#, 6 @@ -56,7 +55,7 @@ Music_RivalBattle_branch_e978f: ; e978f note B_, 4 intensity $4d note B_, 10 -Music_RivalBattle_branch_e97a6: ; e97a6 +Music_RivalBattle_branch_e97a6: intensity $b7 note A#, 6 note F#, 6 @@ -179,7 +178,7 @@ Music_RivalBattle_branch_e97a6: ; e97a6 note E_, 2 note D#, 2 note C#, 2 -Music_RivalBattle_branch_e9837: ; e9837 +Music_RivalBattle_branch_e9837: octave 3 note A#, 2 note E_, 2 @@ -285,9 +284,8 @@ Music_RivalBattle_branch_e9837: ; e9837 octave 3 note C#, 10 loopchannel 0, Music_RivalBattle_branch_e97a6 -; e98af -Music_RivalBattle_Ch2: ; e98af +Music_RivalBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -337,7 +335,7 @@ Music_RivalBattle_Ch2: ; e98af note F#, 6 intensity $c2 note G#, 4 -Music_RivalBattle_branch_e98ea: ; e98ea +Music_RivalBattle_branch_e98ea: intensity $c2 note D#, 6 intensity $c7 @@ -354,7 +352,7 @@ Music_RivalBattle_branch_e98ea: ; e98ea note B_, 1 octave 4 note C_, 1 -Music_RivalBattle_branch_e9903: ; e9903 +Music_RivalBattle_branch_e9903: intensity $c2 note C#, 6 intensity $c7 @@ -369,7 +367,7 @@ Music_RivalBattle_branch_e9903: ; e9903 note E_, 4 intensity $b7 note E_, 6 -Music_RivalBattle_branch_e991a: ; e991a +Music_RivalBattle_branch_e991a: callchannel Music_RivalBattle_branch_e99e0 intensity $b0 note G#, 8 @@ -474,7 +472,7 @@ Music_RivalBattle_branch_e991a: ; e991a note G#, 8 intensity $c7 note F_, 8 -Music_RivalBattle_branch_e99a6: ; e99a6 +Music_RivalBattle_branch_e99a6: intensity $c2 octave 3 note A#, 6 @@ -493,7 +491,7 @@ Music_RivalBattle_branch_e99a6: ; e99a6 note C#, 6 intensity $9a note C#, 4 -Music_RivalBattle_branch_e99c1: ; e99c1 +Music_RivalBattle_branch_e99c1: intensity $c2 octave 3 note G#, 6 @@ -513,9 +511,8 @@ Music_RivalBattle_branch_e99c1: ; e99c1 octave 4 note D_, 4 loopchannel 0, Music_RivalBattle_branch_e991a -; e99e0 -Music_RivalBattle_branch_e99e0: ; e99e0 +Music_RivalBattle_branch_e99e0: intensity $c7 note D#, 10 intensity $c4 @@ -536,9 +533,8 @@ Music_RivalBattle_branch_e99e0: ; e99e0 intensity $b7 note F_, 8 endchannel -; e99fb -Music_RivalBattle_Ch3: ; e99fb +Music_RivalBattle_Ch3: notetype $c, $19 octave 3 note F#, 2 @@ -554,7 +550,7 @@ Music_RivalBattle_Ch3: ; e99fb octave 3 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a0c: ; e9a0c +Music_RivalBattle_branch_e9a0c: note D#, 2 note C#, 2 note D#, 2 @@ -563,7 +559,7 @@ Music_RivalBattle_branch_e9a0c: ; e9a0c note D#, 2 note C#, 2 loopchannel 4, Music_RivalBattle_branch_e9a0c -Music_RivalBattle_branch_e9a17: ; e9a17 +Music_RivalBattle_branch_e9a17: octave 3 note C#, 2 octave 2 @@ -586,7 +582,7 @@ Music_RivalBattle_branch_e9a17: ; e9a17 note C_, 2 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a30: ; e9a30 +Music_RivalBattle_branch_e9a30: callchannel Music_RivalBattle_branch_e9b47 octave 2 note A#, 2 @@ -633,14 +629,14 @@ Music_RivalBattle_branch_e9a30: ; e9a30 octave 3 note F_, 2 callchannel Music_RivalBattle_branch_e9b50 -Music_RivalBattle_branch_e9a66: ; e9a66 +Music_RivalBattle_branch_e9a66: note C#, 2 note G#, 2 loopchannel 4, Music_RivalBattle_branch_e9a66 callchannel Music_RivalBattle_branch_e9b5c note G#, 2 note F#, 2 -Music_RivalBattle_branch_e9a71: ; e9a71 +Music_RivalBattle_branch_e9a71: octave 2 note A#, 2 octave 3 @@ -698,29 +694,29 @@ Music_RivalBattle_branch_e9a71: ; e9a71 note F#, 2 note G_, 2 note G#, 2 -Music_RivalBattle_branch_e9ab3: ; e9ab3 +Music_RivalBattle_branch_e9ab3: note D#, 2 note A#, 2 loopchannel 4, Music_RivalBattle_branch_e9ab3 -Music_RivalBattle_branch_e9ab9: ; e9ab9 +Music_RivalBattle_branch_e9ab9: note D#, 2 note A_, 2 loopchannel 4, Music_RivalBattle_branch_e9ab9 -Music_RivalBattle_branch_e9abf: ; e9abf +Music_RivalBattle_branch_e9abf: note D#, 2 note G#, 2 loopchannel 4, Music_RivalBattle_branch_e9abf -Music_RivalBattle_branch_e9ac5: ; e9ac5 +Music_RivalBattle_branch_e9ac5: note D#, 2 note G_, 2 loopchannel 12, Music_RivalBattle_branch_e9ac5 -Music_RivalBattle_branch_e9acb: ; e9acb +Music_RivalBattle_branch_e9acb: octave 2 note B_, 2 octave 3 note D#, 2 loopchannel 4, Music_RivalBattle_branch_e9acb -Music_RivalBattle_branch_e9ad3: ; e9ad3 +Music_RivalBattle_branch_e9ad3: octave 2 note B_, 2 octave 3 @@ -779,7 +775,7 @@ Music_RivalBattle_branch_e9ad3: ; e9ad3 note C#, 8 note D#, 8 note F_, 8 -Music_RivalBattle_branch_e9b10: ; e9b10 +Music_RivalBattle_branch_e9b10: octave 2 note A#, 2 octave 3 @@ -787,7 +783,7 @@ Music_RivalBattle_branch_e9b10: ; e9b10 loopchannel 7, Music_RivalBattle_branch_e9b10 note E_, 2 note D#, 2 -Music_RivalBattle_branch_e9b1a: ; e9b1a +Music_RivalBattle_branch_e9b1a: octave 2 note A#, 2 octave 3 @@ -799,7 +795,7 @@ Music_RivalBattle_branch_e9b1a: ; e9b1a note F#, 2 note F_, 2 note E_, 2 -Music_RivalBattle_branch_e9b28: ; e9b28 +Music_RivalBattle_branch_e9b28: octave 2 note G#, 2 octave 3 @@ -807,7 +803,7 @@ Music_RivalBattle_branch_e9b28: ; e9b28 loopchannel 7, Music_RivalBattle_branch_e9b28 note D_, 2 note C#, 2 -Music_RivalBattle_branch_e9b32: ; e9b32 +Music_RivalBattle_branch_e9b32: octave 2 note G#, 2 octave 3 @@ -823,18 +819,16 @@ Music_RivalBattle_branch_e9b32: ; e9b32 note D#, 2 note D_, 2 loopchannel 0, Music_RivalBattle_branch_e9a30 -; e9b47 -Music_RivalBattle_branch_e9b47: ; e9b47 +Music_RivalBattle_branch_e9b47: octave 2 note A#, 2 octave 3 note D#, 2 loopchannel 4, Music_RivalBattle_branch_e9b47 endchannel -; e9b50 -Music_RivalBattle_branch_e9b50: ; e9b50 +Music_RivalBattle_branch_e9b50: note C#, 2 note G#, 2 octave 4 @@ -847,18 +841,16 @@ Music_RivalBattle_branch_e9b50: ; e9b50 note C#, 2 note G#, 2 endchannel -; e9b5c -Music_RivalBattle_branch_e9b5c: ; e9b5c +Music_RivalBattle_branch_e9b5c: octave 2 note B_, 2 octave 3 note F#, 2 loopchannel 7, Music_RivalBattle_branch_e9b5c endchannel -; e9b65 -Music_RivalBattle_branch_e9b65: ; e9b65 +Music_RivalBattle_branch_e9b65: octave 3 note D#, 2 note A#, 2 @@ -866,4 +858,3 @@ Music_RivalBattle_branch_e9b65: ; e9b65 note D#, 2 loopchannel 2, Music_RivalBattle_branch_e9b65 endchannel -; e9b6f diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm index b7f27fa4e..30c90b08c 100644 --- a/audio/music/rocketbattle.asm +++ b/audio/music/rocketbattle.asm @@ -1,10 +1,9 @@ -Music_RocketBattle: ; e9b6f +Music_RocketBattle: musicheader 3, 1, Music_RocketBattle_Ch1 musicheader 1, 2, Music_RocketBattle_Ch2 musicheader 1, 3, Music_RocketBattle_Ch3 -; e9b78 -Music_RocketBattle_Ch1: ; e9b78 +Music_RocketBattle_Ch1: tempo 101 volume $77 dutycycle $3 @@ -48,7 +47,7 @@ Music_RocketBattle_Ch1: ; e9b78 note C_, 1 octave 2 note B_, 1 -Music_RocketBattle_branch_e9bad: ; e9bad +Music_RocketBattle_branch_e9bad: intensity $b2 octave 3 note C_, 6 @@ -62,7 +61,7 @@ Music_RocketBattle_branch_e9bad: ; e9bad note C_, 6 intensity $b7 note D_, 4 -Music_RocketBattle_branch_e9bc1: ; e9bc1 +Music_RocketBattle_branch_e9bc1: intensity $b2 octave 4 note E_, 6 @@ -116,7 +115,7 @@ Music_RocketBattle_branch_e9bc1: ; e9bc1 note D#, 2 note D_, 2 note F_, 2 -Music_RocketBattle_branch_e9c02: ; e9c02 +Music_RocketBattle_branch_e9c02: octave 4 note E_, 2 octave 3 @@ -291,7 +290,7 @@ Music_RocketBattle_branch_e9c02: ; e9c02 intensity $b7 note A#, 2 note G_, 4 -Music_RocketBattle_branch_e9cc5: ; e9cc5 +Music_RocketBattle_branch_e9cc5: intensity $b2 note F_, 6 note F_, 4 @@ -389,9 +388,8 @@ Music_RocketBattle_branch_e9cc5: ; e9cc5 note D_, 2 note F_, 2 loopchannel 0, Music_RocketBattle_branch_e9c02 -; e9d3e -Music_RocketBattle_Ch2: ; e9d3e +Music_RocketBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -438,7 +436,7 @@ Music_RocketBattle_Ch2: ; e9d3e note G#, 1 note A_, 1 note G#, 1 -Music_RocketBattle_branch_e9d7b: ; e9d7b +Music_RocketBattle_branch_e9d7b: intensity $c2 octave 3 note A_, 6 @@ -454,7 +452,7 @@ Music_RocketBattle_branch_e9d7b: ; e9d7b note A_, 6 intensity $4a note G#, 4 -Music_RocketBattle_branch_e9d91: ; e9d91 +Music_RocketBattle_branch_e9d91: intensity $c2 octave 4 note A_, 6 @@ -476,7 +474,7 @@ Music_RocketBattle_branch_e9d91: ; e9d91 note F_, 16 intensity $b7 note F_, 16 -Music_RocketBattle_branch_e9db1: ; e9db1 +Music_RocketBattle_branch_e9db1: callchannel Music_RocketBattle_branch_e9ea0 intensity $b0 note F_, 8 @@ -605,7 +603,7 @@ Music_RocketBattle_branch_e9db1: ; e9db1 note G_, 1 note G#, 1 note A_, 8 -Music_RocketBattle_branch_e9e5a: ; e9e5a +Music_RocketBattle_branch_e9e5a: intensity $c2 octave 3 note A#, 6 @@ -657,9 +655,8 @@ Music_RocketBattle_branch_e9e5a: ; e9e5a intensity $c7 note A#, 8 loopchannel 0, Music_RocketBattle_branch_e9db1 -; e9ea0 -Music_RocketBattle_branch_e9ea0: ; e9ea0 +Music_RocketBattle_branch_e9ea0: intensity $c6 octave 4 note A_, 6 @@ -669,9 +666,8 @@ Music_RocketBattle_branch_e9ea0: ; e9ea0 note G#, 6 note E_, 4 endchannel -; e9eaa -Music_RocketBattle_Ch3: ; e9eaa +Music_RocketBattle_Ch3: notetype $c, $19 octave 3 note A_, 2 @@ -704,7 +700,7 @@ Music_RocketBattle_Ch3: ; e9eaa octave 2 note B_, 2 note A#, 2 -Music_RocketBattle_branch_e9ecc: ; e9ecc +Music_RocketBattle_branch_e9ecc: callchannel Music_RocketBattle_branch_e9fe6 loopchannel 3, Music_RocketBattle_branch_e9ecc octave 2 @@ -719,7 +715,7 @@ Music_RocketBattle_branch_e9ecc: ; e9ecc note F_, 2 note E_, 2 note D_, 2 -Music_RocketBattle_branch_e9edf: ; e9edf +Music_RocketBattle_branch_e9edf: callchannel Music_RocketBattle_branch_e9fe6 loopchannel 3, Music_RocketBattle_branch_e9edf octave 2 @@ -740,7 +736,7 @@ Music_RocketBattle_branch_e9edf: ; e9edf octave 3 note F_, 2 callchannel Music_RocketBattle_branch_ea01d -Music_RocketBattle_branch_e9efe: ; e9efe +Music_RocketBattle_branch_e9efe: callchannel Music_RocketBattle_branch_e9ff3 callchannel Music_RocketBattle_branch_ea010 octave 3 @@ -774,7 +770,7 @@ Music_RocketBattle_branch_e9efe: ; e9efe note A_, 2 octave 3 note E_, 2 -Music_RocketBattle_branch_e9f25: ; e9f25 +Music_RocketBattle_branch_e9f25: octave 2 note A#, 2 octave 3 @@ -807,7 +803,7 @@ Music_RocketBattle_branch_e9f25: ; e9f25 note D_, 2 callchannel Music_RocketBattle_branch_ea02a callchannel Music_RocketBattle_branch_ea02a -Music_RocketBattle_branch_e9f4e: ; e9f4e +Music_RocketBattle_branch_e9f4e: octave 2 note A_, 2 octave 3 @@ -833,7 +829,7 @@ Music_RocketBattle_branch_e9f4e: ; e9f4e note A_, 2 note G_, 2 note F_, 2 -Music_RocketBattle_branch_e9f6a: ; e9f6a +Music_RocketBattle_branch_e9f6a: octave 2 note A#, 2 octave 3 @@ -849,7 +845,7 @@ Music_RocketBattle_branch_e9f6a: ; e9f6a note D_, 2 note C#, 2 note D_, 2 -Music_RocketBattle_branch_e9f7c: ; e9f7c +Music_RocketBattle_branch_e9f7c: octave 2 note A_, 2 octave 3 @@ -863,7 +859,7 @@ Music_RocketBattle_branch_e9f7c: ; e9f7c note C_, 2 octave 2 note A#, 2 -Music_RocketBattle_branch_e9f8c: ; e9f8c +Music_RocketBattle_branch_e9f8c: octave 2 note A_, 2 octave 3 @@ -879,7 +875,7 @@ Music_RocketBattle_branch_e9f8c: ; e9f8c note A_, 2 note G_, 2 note A#, 2 -Music_RocketBattle_branch_e9f9e: ; e9f9e +Music_RocketBattle_branch_e9f9e: octave 2 note A#, 2 octave 3 @@ -887,7 +883,7 @@ Music_RocketBattle_branch_e9f9e: ; e9f9e loopchannel 7, Music_RocketBattle_branch_e9f9e note E_, 2 note F_, 2 -Music_RocketBattle_branch_e9fa8: ; e9fa8 +Music_RocketBattle_branch_e9fa8: octave 2 note A#, 2 octave 3 @@ -932,9 +928,8 @@ Music_RocketBattle_branch_e9fa8: ; e9fa8 note F_, 2 callchannel Music_RocketBattle_branch_ea01d loopchannel 0, Music_RocketBattle_branch_e9efe -; e9fe6 -Music_RocketBattle_branch_e9fe6: ; e9fe6 +Music_RocketBattle_branch_e9fe6: octave 2 note A_, 2 octave 3 @@ -948,9 +943,8 @@ Music_RocketBattle_branch_e9fe6: ; e9fe6 note G_, 2 note F_, 2 endchannel -; e9ff3 -Music_RocketBattle_branch_e9ff3: ; e9ff3 +Music_RocketBattle_branch_e9ff3: octave 2 note A_, 2 octave 3 @@ -980,9 +974,8 @@ Music_RocketBattle_branch_e9ff3: ; e9ff3 note D#, 2 note D_, 2 endchannel -; ea010 -Music_RocketBattle_branch_ea010: ; ea010 +Music_RocketBattle_branch_ea010: octave 2 note A#, 2 octave 3 @@ -996,9 +989,8 @@ Music_RocketBattle_branch_ea010: ; ea010 octave 2 note A#, 2 endchannel -; ea01d -Music_RocketBattle_branch_ea01d: ; ea01d +Music_RocketBattle_branch_ea01d: octave 2 note A#, 2 octave 3 @@ -1012,18 +1004,16 @@ Music_RocketBattle_branch_ea01d: ; ea01d octave 3 note F_, 2 endchannel -; ea02a -Music_RocketBattle_branch_ea02a: ; ea02a +Music_RocketBattle_branch_ea02a: octave 2 note A_, 2 octave 3 note E_, 2 loopchannel 4, Music_RocketBattle_branch_ea02a endchannel -; ea033 -Music_RocketBattle_branch_ea033: ; ea033 +Music_RocketBattle_branch_ea033: octave 2 note A_, 2 octave 3 @@ -1037,4 +1027,3 @@ Music_RocketBattle_branch_ea033: ; ea033 octave 2 note A_, 2 endchannel -; ea040 diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm index f38ce422b..6c3a116ac 100644 --- a/audio/music/rockethideout.asm +++ b/audio/music/rockethideout.asm @@ -1,11 +1,10 @@ -Music_RocketHideout: ; eeb75 +Music_RocketHideout: 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 +Music_RocketHideout_Ch1: tempo 144 volume $77 dutycycle $3 @@ -13,10 +12,10 @@ Music_RocketHideout_Ch1: ; eeb81 vibrato $10, $44 notetype $c, $b3 stereopanning $f0 -Music_RocketHideout_branch_eeb93: ; eeb93 +Music_RocketHideout_branch_eeb93: note __, 16 loopchannel 4, Music_RocketHideout_branch_eeb93 -Music_RocketHideout_branch_eeb98: ; eeb98 +Music_RocketHideout_branch_eeb98: octave 2 note D#, 2 note __, 2 @@ -114,19 +113,18 @@ Music_RocketHideout_branch_eeb98: ; eeb98 note __, 16 note A_, 16 intensity $b3 -Music_RocketHideout_branch_eebfe: ; eebfe +Music_RocketHideout_branch_eebfe: note __, 16 loopchannel 4, Music_RocketHideout_branch_eebfe loopchannel 0, Music_RocketHideout_branch_eeb93 -; eec07 -Music_RocketHideout_Ch2: ; eec07 +Music_RocketHideout_Ch2: dutycycle $3 tone $0002 vibrato $0, $f0 notetype $c, $c4 stereopanning $f -Music_RocketHideout_branch_eec14: ; eec14 +Music_RocketHideout_branch_eec14: octave 2 note D#, 2 note __, 2 @@ -221,11 +219,10 @@ Music_RocketHideout_branch_eec14: ; eec14 note G_, 2 note __, 8 loopchannel 0, Music_RocketHideout_branch_eec14 -; eec79 -Music_RocketHideout_Ch3: ; eec79 +Music_RocketHideout_Ch3: notetype $c, $19 -Music_RocketHideout_branch_eec7c: ; eec7c +Music_RocketHideout_branch_eec7c: octave 2 note D#, 2 note __, 2 @@ -237,7 +234,7 @@ Music_RocketHideout_branch_eec7c: ; eec7c note A_, 2 note __, 8 loopchannel 6, Music_RocketHideout_branch_eec7c -Music_RocketHideout_branch_eec8a: ; eec8a +Music_RocketHideout_branch_eec8a: note F_, 2 note __, 2 octave 3 @@ -252,7 +249,7 @@ Music_RocketHideout_branch_eec8a: ; eec8a note B_, 2 note __, 8 loopchannel 2, Music_RocketHideout_branch_eec8a -Music_RocketHideout_branch_eec9b: ; eec9b +Music_RocketHideout_branch_eec9b: note C#, 2 note __, 2 note G#, 4 @@ -261,7 +258,7 @@ Music_RocketHideout_branch_eec9b: ; eec9b octave 3 note C#, 16 loopchannel 2, Music_RocketHideout_branch_eec9b -Music_RocketHideout_branch_eeca6: ; eeca6 +Music_RocketHideout_branch_eeca6: octave 2 note C#, 2 note __, 2 @@ -274,9 +271,8 @@ Music_RocketHideout_branch_eeca6: ; eeca6 note __, 8 loopchannel 2, Music_RocketHideout_branch_eeca6 loopchannel 0, Music_RocketHideout_branch_eec7c -; eecb8 -Music_RocketHideout_Ch4: ; eecb8 +Music_RocketHideout_Ch4: togglenoise $0 notetype $c stereopanning $f @@ -287,7 +283,7 @@ Music_RocketHideout_Ch4: ; eecb8 note D#, 1 note D#, 1 callchannel Music_RocketHideout_branch_eecdb -Music_RocketHideout_branch_eecc7: ; eecc7 +Music_RocketHideout_branch_eecc7: callchannel Music_RocketHideout_branch_eecdb note E_, 4 callchannel Music_RocketHideout_branch_eecdb @@ -297,9 +293,8 @@ Music_RocketHideout_branch_eecc7: ; eecc7 callchannel Music_RocketHideout_branch_eecdb note F#, 4 loopchannel 0, Music_RocketHideout_branch_eecc7 -; eecdb -Music_RocketHideout_branch_eecdb: ; eecdb +Music_RocketHideout_branch_eecdb: stereopanning $f0 note D#, 1 note D#, 1 @@ -310,4 +305,3 @@ Music_RocketHideout_branch_eecdb: ; eecdb stereopanning $f0 note A_, 4 endchannel -; eece8 diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm index 90b4869d7..6f13d8b68 100644 --- a/audio/music/rockettheme.asm +++ b/audio/music/rockettheme.asm @@ -1,11 +1,10 @@ -Music_RocketTheme: ; f766d +Music_RocketTheme: 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 +Music_RocketTheme_Ch1: tempo 128 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_RocketTheme_Ch1: ; f7679 octave 4 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f768b: ; f768b +Music_RocketTheme_branch_f768b: dutycycle $3 notetype $c, $a8 callchannel Music_RocketTheme_branch_f74e6 @@ -87,7 +86,7 @@ Music_RocketTheme_branch_f768b: ; f768b note E_, 2 note D#, 2 note D_, 2 -Music_RocketTheme_branch_f76ef: ; f76ef +Music_RocketTheme_branch_f76ef: note __, 4 note F_, 2 note __, 14 @@ -103,19 +102,19 @@ Music_RocketTheme_branch_f76ef: ; f76ef note __, 2 note D#, 2 note C_, 2 -Music_RocketTheme_branch_f7701: ; f7701 +Music_RocketTheme_branch_f7701: note F#, 2 note A_, 2 loopchannel 4, Music_RocketTheme_branch_f7701 -Music_RocketTheme_branch_f7707: ; f7707 +Music_RocketTheme_branch_f7707: note G_, 2 note A#, 2 loopchannel 4, Music_RocketTheme_branch_f7707 -Music_RocketTheme_branch_f770d: ; f770d +Music_RocketTheme_branch_f770d: note G#, 2 note B_, 2 loopchannel 4, Music_RocketTheme_branch_f770d -Music_RocketTheme_branch_f7713: ; f7713 +Music_RocketTheme_branch_f7713: octave 3 note A_, 2 octave 4 @@ -128,9 +127,8 @@ Music_RocketTheme_branch_f7713: ; f7713 note C_, 1 note D_, 1 loopchannel 0, Music_RocketTheme_branch_f768b -; f7727 -Music_RocketTheme_branch_f7727: ; f7727 +Music_RocketTheme_branch_f7727: note __, 7 note B_, 1 octave 4 @@ -154,9 +152,8 @@ Music_RocketTheme_branch_f7727: ; f7727 note A#, 2 note __, 10 endchannel -; f773e -Music_RocketTheme_Ch2: ; f773e +Music_RocketTheme_Ch2: stereopanning $ff vibrato $4, $64 dutycycle $3 @@ -164,7 +161,7 @@ Music_RocketTheme_Ch2: ; f773e octave 5 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f774b: ; f774b +Music_RocketTheme_branch_f774b: notetype $c, $b7 callchannel Music_RocketTheme_branch_f7547 intensity $b7 @@ -291,9 +288,8 @@ Music_RocketTheme_branch_f774b: ; f774b note C_, 2 note D_, 2 loopchannel 0, Music_RocketTheme_branch_f774b -; f7800 -Music_RocketTheme_branch_f7800: ; f7800 +Music_RocketTheme_branch_f7800: notetype $6, $b7 note __, 7 octave 4 @@ -320,9 +316,8 @@ Music_RocketTheme_branch_f7800: ; f7800 note D#, 2 note __, 2 endchannel -; f781c -Music_RocketTheme_branch_f781c: ; f781c +Music_RocketTheme_branch_f781c: octave 3 note B_, 1 octave 4 @@ -333,14 +328,13 @@ Music_RocketTheme_branch_f781c: ; f781c note F_, 8 note C_, 4 endchannel -; f7826 -Music_RocketTheme_Ch3: ; f7826 +Music_RocketTheme_Ch3: stereopanning $f0 vibrato $4, $22 notetype $c, $14 note __, 2 -Music_RocketTheme_branch_f782f: ; f782f +Music_RocketTheme_branch_f782f: notetype $c, $14 callchannel Music_RocketTheme_branch_f75bf callchannel Music_RocketTheme_branch_f75fe @@ -447,13 +441,12 @@ Music_RocketTheme_branch_f782f: ; f782f note G#, 1 note __, 1 loopchannel 0, Music_RocketTheme_branch_f782f -; f78be -Music_RocketTheme_Ch4: ; f78be +Music_RocketTheme_Ch4: togglenoise $3 notetype $c note __, 2 -Music_RocketTheme_branch_f78c3: ; f78c3 +Music_RocketTheme_branch_f78c3: callchannel Music_RocketTheme_branch_f765c callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f7664 @@ -463,7 +456,7 @@ Music_RocketTheme_branch_f78c3: ; f78c3 callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f765c -Music_RocketTheme_branch_f78de: ; f78de +Music_RocketTheme_branch_f78de: note A#, 2 note F#, 2 note D_, 2 @@ -479,4 +472,3 @@ Music_RocketTheme_branch_f78de: ; f78de callchannel Music_RocketTheme_branch_f765c callchannel Music_RocketTheme_branch_f765c loopchannel 0, Music_RocketTheme_branch_f78c3 -; f78fd diff --git a/audio/music/route1.asm b/audio/music/route1.asm index 1bcbd35a6..8a537b9fd 100644 --- a/audio/music/route1.asm +++ b/audio/music/route1.asm @@ -1,12 +1,11 @@ -Music_Route1: ; ec000 +Music_Route1: musicheader 3, 1, Music_Route1_Ch1 musicheader 1, 2, Music_Route1_Ch2 musicheader 1, 3, Music_Route1_Ch3 -; ec009 db $3 -Music_Route1_Ch1: ; ec00a +Music_Route1_Ch1: stereopanning $f tempo 184 volume $77 @@ -60,7 +59,7 @@ Music_Route1_Ch1: ; ec00a note D_, 2 intensity $83 note __, 2 -Music_Route1_branch_ec04a: ; ec04a +Music_Route1_branch_ec04a: intensity $83 note __, 2 octave 4 @@ -203,9 +202,8 @@ Music_Route1_branch_ec04a: ; ec04a note D_, 2 note __, 2 loopchannel 0, Music_Route1_branch_ec04a -; ec0eb -Music_Route1_Ch2: ; ec0eb +Music_Route1_Ch2: stereopanning $f0 vibrato $12, $22 dutycycle $2 @@ -232,7 +230,7 @@ Music_Route1_Ch2: ; ec0eb note D_, 1 note E_, 1 dutycycle $2 -Music_Route1_branch_ec112: ; ec112 +Music_Route1_branch_ec112: intensity $82 callchannel Music_Route1_branch_ec188 intensity $81 @@ -323,9 +321,8 @@ Music_Route1_branch_ec112: ; ec112 note D_, 1 note E_, 1 loopchannel 0, Music_Route1_branch_ec112 -; ec188 -Music_Route1_branch_ec188: ; ec188 +Music_Route1_branch_ec188: note F#, 2 note F#, 2 note F#, 2 @@ -342,9 +339,8 @@ Music_Route1_branch_ec188: ; ec188 note F#, 1 note E_, 2 endchannel -; ec198 -Music_Route1_branch_ec198: ; ec198 +Music_Route1_branch_ec198: note A_, 2 note A_, 2 note F#, 2 @@ -363,9 +359,8 @@ Music_Route1_branch_ec198: ; ec198 note F#, 1 note E_, 2 endchannel -; ec1aa -Music_Route1_branch_ec1aa: ; ec1aa +Music_Route1_branch_ec1aa: note A_, 2 note A_, 2 note F#, 2 @@ -380,9 +375,8 @@ Music_Route1_branch_ec1aa: ; ec1aa octave 5 note D_, 2 endchannel -; ec1b8 -Music_Route1_Ch3: ; ec1b8 +Music_Route1_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $25 @@ -462,7 +456,7 @@ Music_Route1_Ch3: ; ec1b8 note __, 1 note A_, 1 note __, 3 -Music_Route1_branch_ec20c: ; ec20c +Music_Route1_branch_ec20c: octave 3 note D_, 1 note __, 1 @@ -650,4 +644,3 @@ Music_Route1_branch_ec20c: ; ec20c note A_, 1 note __, 3 loopchannel 0, Music_Route1_branch_ec20c -; ec2ca diff --git a/audio/music/route12.asm b/audio/music/route12.asm index c7584096e..d94d88c2f 100644 --- a/audio/music/route12.asm +++ b/audio/music/route12.asm @@ -1,11 +1,10 @@ -Music_Route12: ; ec506 +Music_Route12: 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 +Music_Route12_Ch1: tempo 148 volume $77 vibrato $12, $34 @@ -29,7 +28,7 @@ Music_Route12_Ch1: ; ec512 note E_, 1 intensity $97 note D#, 12 -Music_Route12_branch_ec535: ; ec535 +Music_Route12_branch_ec535: dutycycle $2 intensity $96 callchannel Music_Route12_branch_ec5b1 @@ -115,7 +114,7 @@ Music_Route12_branch_ec535: ; ec535 note F#, 8 note D#, 4 note F#, 4 -Music_Route12_branch_ec59b: ; ec59b +Music_Route12_branch_ec59b: intensity $97 note G#, 1 note A_, 1 @@ -131,9 +130,8 @@ Music_Route12_branch_ec59b: ; ec59b note G#, 4 loopchannel 2, Music_Route12_branch_ec59b loopchannel 0, Music_Route12_branch_ec535 -; ec5b1 -Music_Route12_branch_ec5b1: ; ec5b1 +Music_Route12_branch_ec5b1: octave 3 note G#, 1 note __, 1 @@ -148,9 +146,8 @@ Music_Route12_branch_ec5b1: ; ec5b1 note E_, 4 note G#, 4 endchannel -; ec5bf -Music_Route12_branch_ec5bf: ; ec5bf +Music_Route12_branch_ec5bf: note A_, 1 note __, 1 note F#, 1 @@ -162,9 +159,8 @@ Music_Route12_branch_ec5bf: ; ec5bf note A_, 4 note F#, 4 endchannel -; ec5ca -Music_Route12_Ch2: ; ec5ca +Music_Route12_Ch2: dutycycle $3 vibrato $12, $34 notetype $c, $b8 @@ -186,7 +182,7 @@ Music_Route12_Ch2: ; ec5ca note B_, 1 octave 4 note D#, 1 -Music_Route12_branch_ec5e5: ; ec5e5 +Music_Route12_branch_ec5e5: dutycycle $3 intensity $b7 callchannel Music_Route12_branch_ec647 @@ -264,9 +260,8 @@ Music_Route12_branch_ec5e5: ; ec5e5 intensity $a4 note E_, 6 loopchannel 0, Music_Route12_branch_ec5e5 -; ec647 -Music_Route12_branch_ec647: ; ec647 +Music_Route12_branch_ec647: octave 4 note E_, 6 intensity $b1 @@ -281,9 +276,8 @@ Music_Route12_branch_ec647: ; ec647 note G#, 4 note F#, 4 endchannel -; ec657 -Music_Route12_Ch3: ; ec657 +Music_Route12_Ch3: vibrato $12, $54 notetype $c, $16 octave 3 @@ -301,7 +295,7 @@ Music_Route12_Ch3: ; ec657 note F#, 2 note __, 2 note D#, 4 -Music_Route12_branch_ec66c: ; ec66c +Music_Route12_branch_ec66c: callchannel Music_Route12_branch_ec6b4 note F#, 1 note __, 1 @@ -353,7 +347,7 @@ Music_Route12_branch_ec66c: ; ec66c note E_, 8 note F#, 4 note D#, 4 -Music_Route12_branch_ec6a3: ; ec6a3 +Music_Route12_branch_ec6a3: note E_, 1 note __, 1 note E_, 1 @@ -365,9 +359,8 @@ Music_Route12_branch_ec6a3: ; ec6a3 note __, 1 loopchannel 2, Music_Route12_branch_ec6a3 loopchannel 0, Music_Route12_branch_ec66c -; ec6b4 -Music_Route12_branch_ec6b4: ; ec6b4 +Music_Route12_branch_ec6b4: octave 3 note E_, 1 note __, 1 @@ -394,9 +387,8 @@ Music_Route12_branch_ec6b4: ; ec6b4 note G#, 4 note E_, 4 endchannel -; ec6ce -Music_Route12_Ch4: ; ec6ce +Music_Route12_Ch4: togglenoise $4 stereopanning $f0 notetype $c @@ -410,7 +402,7 @@ Music_Route12_Ch4: ; ec6ce note D_, 4 notetype $6 callchannel Music_Route12_branch_ec717 -Music_Route12_branch_ec6e1: ; ec6e1 +Music_Route12_branch_ec6e1: note D_, 4 note D_, 8 note C#, 2 @@ -418,7 +410,7 @@ Music_Route12_branch_ec6e1: ; ec6e1 note D_, 8 callchannel Music_Route12_branch_ec717 loopchannel 8, Music_Route12_branch_ec6e1 -Music_Route12_branch_ec6ed: ; ec6ed +Music_Route12_branch_ec6ed: notetype $c note B_, 10 note D_, 1 @@ -436,7 +428,7 @@ Music_Route12_branch_ec6ed: ; ec6ed callchannel Music_Route12_branch_ec717 callchannel Music_Route12_branch_ec717 note B_, 16 -Music_Route12_branch_ec707: ; ec707 +Music_Route12_branch_ec707: note D_, 4 note D_, 8 note C#, 2 @@ -445,9 +437,8 @@ Music_Route12_branch_ec707: ; ec707 callchannel Music_Route12_branch_ec717 loopchannel 2, Music_Route12_branch_ec707 loopchannel 0, Music_Route12_branch_ec6e1 -; ec717 -Music_Route12_branch_ec717: ; ec717 +Music_Route12_branch_ec717: note C#, 1 note C#, 1 note C#, 1 @@ -457,4 +448,3 @@ Music_Route12_branch_ec717: ; ec717 note C#, 1 note C#, 1 endchannel -; ec720 diff --git a/audio/music/route2.asm b/audio/music/route2.asm index eca547e9b..b5ff1feba 100644 --- a/audio/music/route2.asm +++ b/audio/music/route2.asm @@ -1,11 +1,10 @@ -Music_Route2: ; ed8dd +Music_Route2: 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 +Music_Route2_Ch1: tempo 151 volume $77 stereopanning $f @@ -14,7 +13,7 @@ Music_Route2_Ch1: ; ed8e9 note __, 16 note __, 16 callchannel Music_Route2_branch_ed931 -Music_Route2_branch_ed8fb: ; ed8fb +Music_Route2_branch_ed8fb: intensity $b1 octave 3 note B_, 4 @@ -55,9 +54,8 @@ Music_Route2_branch_ed8fb: ; ed8fb note B_, 2 note G_, 2 loopchannel 0, Music_Route2_branch_ed8fb -; ed931 -Music_Route2_branch_ed931: ; ed931 +Music_Route2_branch_ed931: octave 4 note C_, 4 note C_, 4 @@ -71,9 +69,8 @@ Music_Route2_branch_ed931: ; ed931 note B_, 4 intensity $b1 endchannel -; ed940 -Music_Route2_branch_ed940: ; ed940 +Music_Route2_branch_ed940: octave 2 note B_, 2 octave 3 @@ -121,9 +118,8 @@ Music_Route2_branch_ed940: ; ed940 note G_, 2 intensity $b1 endchannel -; ed971 -Music_Route2_branch_ed971: ; ed971 +Music_Route2_branch_ed971: note B_, 2 note G_, 2 note B_, 2 @@ -161,14 +157,13 @@ Music_Route2_branch_ed971: ; ed971 octave 3 note A_, 2 endchannel -; ed996 -Music_Route2_Ch2: ; ed996 +Music_Route2_Ch2: stereopanning $ff vibrato $8, $24 notetype $c, $b2 callchannel Music_Route2_branch_ed9ba -Music_Route2_branch_ed9a1: ; ed9a1 +Music_Route2_branch_ed9a1: intensity $b2 callchannel Music_Route2_branch_ed9ba dutycycle $2 @@ -178,9 +173,8 @@ Music_Route2_branch_ed9a1: ; ed9a1 callchannel Music_Route2_branch_eda02 callchannel Music_Route2_branch_eda02 loopchannel 0, Music_Route2_branch_ed9a1 -; ed9ba -Music_Route2_branch_ed9ba: ; ed9ba +Music_Route2_branch_ed9ba: octave 4 note E_, 4 note E_, 4 @@ -213,9 +207,8 @@ Music_Route2_branch_ed9ba: ; ed9ba note G_, 4 intensity $b2 endchannel -; ed9dc -Music_Route2_branch_ed9dc: ; ed9dc +Music_Route2_branch_ed9dc: octave 2 note C_, 4 note __, 2 @@ -254,9 +247,8 @@ Music_Route2_branch_ed9dc: ; ed9dc note F_, 4 note D_, 4 endchannel -; eda02 -Music_Route2_branch_eda02: ; eda02 +Music_Route2_branch_eda02: octave 2 note E_, 4 note __, 2 @@ -299,9 +291,8 @@ Music_Route2_branch_eda02: ; eda02 note G_, 1 note __, 1 endchannel -; eda2c -Music_Route2_Ch3: ; eda2c +Music_Route2_Ch3: stereopanning $f0 vibrato $16, $15 notetype $c, $14 @@ -326,7 +317,7 @@ Music_Route2_Ch3: ; eda2c callchannel Music_Route2_branch_eda9e octave 3 note D_, 4 -Music_Route2_branch_eda4b: ; eda4b +Music_Route2_branch_eda4b: notetype $c, $15 octave 3 note C_, 4 @@ -391,9 +382,8 @@ Music_Route2_branch_eda4b: ; eda4b note G_, 16 note G_, 15 loopchannel 0, Music_Route2_branch_eda4b -; eda9e -Music_Route2_branch_eda9e: ; eda9e +Music_Route2_branch_eda9e: octave 3 note F_, 4 note __, 2 @@ -411,9 +401,8 @@ Music_Route2_branch_eda9e: ; eda9e note __, 1 note F_, 4 endchannel -; edaaf -Music_Route2_branch_edaaf: ; edaaf +Music_Route2_branch_edaaf: octave 6 note E_, 10 note D_, 2 @@ -440,9 +429,8 @@ Music_Route2_branch_edaaf: ; edaaf note C_, 4 note D_, 4 endchannel -; edacb -Music_Route2_branch_edacb: ; edacb +Music_Route2_branch_edacb: octave 5 note B_, 16 note __, 4 @@ -460,12 +448,11 @@ Music_Route2_branch_edacb: ; edacb note E_, 4 note F_, 16 endchannel -; edadc -Music_Route2_Ch4: ; edadc +Music_Route2_Ch4: togglenoise $5 notetype $c -Music_Route2_branch_edae0: ; edae0 +Music_Route2_branch_edae0: note A_, 4 note A_, 4 note A_, 2 @@ -478,7 +465,7 @@ Music_Route2_branch_edae0: ; edae0 note A_, 2 note A_, 2 note D#, 4 -Music_Route2_branch_edaef: ; edaef +Music_Route2_branch_edaef: note A_, 4 note A_, 4 note A_, 2 @@ -486,7 +473,7 @@ Music_Route2_branch_edaef: ; edaef note B_, 2 note A_, 2 loopchannel 4, Music_Route2_branch_edaef -Music_Route2_branch_edaf9: ; edaf9 +Music_Route2_branch_edaf9: note B_, 4 note A_, 2 note B_, 2 @@ -500,7 +487,7 @@ Music_Route2_branch_edaf9: ; edaf9 note A_, 2 note A_, 2 note D#, 4 -Music_Route2_branch_edb09: ; edb09 +Music_Route2_branch_edb09: note B_, 4 note C_, 4 note B_, 2 @@ -512,7 +499,7 @@ Music_Route2_branch_edb09: ; edb09 note C#, 2 note C_, 2 note C#, 4 -Music_Route2_branch_edb17: ; edb17 +Music_Route2_branch_edb17: note B_, 4 note C_, 4 note B_, 2 @@ -525,4 +512,3 @@ Music_Route2_branch_edb17: ; edb17 note D_, 2 note D#, 4 loopchannel 0, Music_Route2_branch_edaef -; edb29 diff --git a/audio/music/route26.asm b/audio/music/route26.asm index 85f2e0f02..fb1a7a8e0 100644 --- a/audio/music/route26.asm +++ b/audio/music/route26.asm @@ -1,11 +1,10 @@ -Music_Route26: ; eefb2 +Music_Route26: 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 +Music_Route26_Ch1: stereopanning $f vibrato $12, $23 tempo 151 @@ -27,7 +26,7 @@ Music_Route26_Ch1: ; eefbe octave 3 note G#, 2 note F#, 2 -Music_Route26_branch_eefe0: ; eefe0 +Music_Route26_branch_eefe0: dutycycle $0 notetype $c, $a7 octave 3 @@ -194,9 +193,8 @@ Music_Route26_branch_eefe0: ; eefe0 note B_, 4 note __, 4 loopchannel 0, Music_Route26_branch_eefe0 -; ef09d -Music_Route26_Ch2: ; ef09d +Music_Route26_Ch2: stereopanning $f0 vibrato $14, $23 dutycycle $2 @@ -234,7 +232,7 @@ Music_Route26_Ch2: ; ef09d octave 2 note C_, 2 note D#, 2 -Music_Route26_branch_ef0ce: ; ef0ce +Music_Route26_branch_ef0ce: dutycycle $2 notetype $c, $c2 octave 2 @@ -283,7 +281,7 @@ Music_Route26_branch_ef0ce: ; ef0ce note D#, 4 note D#, 4 notetype $8, $c2 -Music_Route26_branch_ef10e: ; ef10e +Music_Route26_branch_ef10e: octave 2 note G#, 2 note G#, 2 @@ -339,9 +337,8 @@ Music_Route26_branch_ef10e: ; ef10e note C_, 1 note D#, 1 loopchannel 0, Music_Route26_branch_ef0ce -; ef14e -Music_Route26_branch_ef14e: ; ef14e +Music_Route26_branch_ef14e: note A#, 6 note A#, 1 octave 2 @@ -354,9 +351,8 @@ Music_Route26_branch_ef14e: ; ef14e octave 1 note A#, 2 endchannel -; ef15a -Music_Route26_Ch3: ; ef15a +Music_Route26_Ch3: stereopanning $ff vibrato $12, $23 notetype $c, $14 @@ -392,7 +388,7 @@ Music_Route26_Ch3: ; ef15a note F#, 2 note F_, 2 note D#, 2 -Music_Route26_branch_ef18a: ; ef18a +Music_Route26_branch_ef18a: vibrato $18, $23 notetype $c, $14 octave 5 @@ -538,9 +534,8 @@ Music_Route26_branch_ef18a: ; ef18a octave 3 note C_, 1 loopchannel 0, Music_Route26_branch_ef18a -; ef22f -Music_Route26_branch_ef22f: ; ef22f +Music_Route26_branch_ef22f: octave 5 note F_, 8 note C#, 2 @@ -550,18 +545,17 @@ Music_Route26_branch_ef22f: ; ef22f note C#, 4 note D#, 4 endchannel -; ef238 -Music_Route26_Ch4: ; ef238 +Music_Route26_Ch4: togglenoise $4 notetype $c -Music_Route26_branch_ef23c: ; ef23c +Music_Route26_branch_ef23c: note B_, 6 note D_, 1 note D_, 1 loopchannel 3, Music_Route26_branch_ef23c callchannel Music_Route26_branch_ef2b0 -Music_Route26_branch_ef246: ; ef246 +Music_Route26_branch_ef246: notetype $6 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef29a @@ -580,7 +574,7 @@ Music_Route26_branch_ef246: ; ef246 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef29a notetype $8 -Music_Route26_branch_ef266: ; ef266 +Music_Route26_branch_ef266: note D_, 2 note D_, 2 note D_, 2 @@ -591,7 +585,7 @@ Music_Route26_branch_ef266: ; ef266 callchannel Music_Route26_branch_ef2a8 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef2a8 -Music_Route26_branch_ef27c: ; ef27c +Music_Route26_branch_ef27c: notetype $6 note D_, 1 note D_, 1 @@ -611,9 +605,8 @@ Music_Route26_branch_ef27c: ; ef27c note B_, 16 callchannel Music_Route26_branch_ef2b0 loopchannel 0, Music_Route26_branch_ef246 -; ef29a -Music_Route26_branch_ef29a: ; ef29a +Music_Route26_branch_ef29a: note E_, 12 note D_, 2 note D_, 2 @@ -628,9 +621,8 @@ Music_Route26_branch_ef29a: ; ef29a note C#, 1 note C#, 1 endchannel -; ef2a8 -Music_Route26_branch_ef2a8: ; ef2a8 +Music_Route26_branch_ef2a8: note E_, 12 note D_, 2 note D_, 2 @@ -639,9 +631,8 @@ Music_Route26_branch_ef2a8: ; ef2a8 note E_, 4 note D_, 4 endchannel -; ef2b0 -Music_Route26_branch_ef2b0: ; ef2b0 +Music_Route26_branch_ef2b0: notetype $6 note C#, 1 note C#, 1 @@ -672,4 +663,3 @@ Music_Route26_branch_ef2b0: ; ef2b0 note D_, 2 note E_, 2 endchannel -; ef2d0 diff --git a/audio/music/route29.asm b/audio/music/route29.asm index de780ebee..d7cecf4f6 100644 --- a/audio/music/route29.asm +++ b/audio/music/route29.asm @@ -1,11 +1,10 @@ -Music_Route29: ; f0386 +Music_Route29: 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 +Music_Route29_Ch1: tempo 146 volume $77 dutycycle $3 @@ -14,7 +13,7 @@ Music_Route29_Ch1: ; f0392 stereopanning $f notetype $c, $b2 note __, 2 -Music_Route29_branch_f03a5: ; f03a5 +Music_Route29_branch_f03a5: note __, 2 octave 4 note C_, 2 @@ -168,16 +167,15 @@ Music_Route29_branch_f03a5: ; f03a5 note G_, 2 note G_, 4 loopchannel 0, Music_Route29_branch_f03a5 -; f044d -Music_Route29_Ch2: ; f044d +Music_Route29_Ch2: dutycycle $3 vibrato $12, $36 notetype $c, $c2 octave 4 note C_, 1 note D_, 1 -Music_Route29_branch_f0458: ; f0458 +Music_Route29_branch_f0458: callchannel Music_Route29_branch_f04de note F_, 1 note E_, 1 @@ -301,9 +299,8 @@ Music_Route29_branch_f0458: ; f0458 note C_, 1 note D_, 1 loopchannel 0, Music_Route29_branch_f0458 -; f04de -Music_Route29_branch_f04de: ; f04de +Music_Route29_branch_f04de: note E_, 2 note E_, 2 note G_, 2 @@ -333,14 +330,13 @@ Music_Route29_branch_f04de: ; f04de note E_, 2 note C_, 2 endchannel -; f04fb -Music_Route29_Ch3: ; f04fb +Music_Route29_Ch3: stereopanning $f0 notetype $c, $25 vibrato $9, $27 note __, 2 -Music_Route29_branch_f0504: ; f0504 +Music_Route29_branch_f0504: note __, 2 octave 3 note G_, 1 @@ -503,14 +499,13 @@ Music_Route29_branch_f0504: ; f0504 note C_, 1 note __, 3 loopchannel 0, Music_Route29_branch_f0504 -; f05a9 -Music_Route29_Ch4: ; f05a9 +Music_Route29_Ch4: stereopanning $f togglenoise $0 notetype $c note __, 2 -Music_Route29_branch_f05b0: ; f05b0 +Music_Route29_branch_f05b0: note __, 2 note F_, 2 note F_, 6 @@ -523,4 +518,3 @@ Music_Route29_branch_f05b0: ; f05b0 note F_, 2 note F_, 4 loopchannel 0, Music_Route29_branch_f05b0 -; f05bf diff --git a/audio/music/route3.asm b/audio/music/route3.asm index 5e696f4bd..f36dbd53d 100644 --- a/audio/music/route3.asm +++ b/audio/music/route3.asm @@ -1,11 +1,10 @@ -Music_Route3: ; ec2ca +Music_Route3: 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 +Music_Route3_Ch1: stereopanning $f tempo 160 volume $77 @@ -46,7 +45,7 @@ Music_Route3_Ch1: ; ec2d6 note E_, 1 note F#, 1 note G#, 1 -Music_Route3_branch_ec307: ; ec307 +Music_Route3_branch_ec307: callchannel Music_Route3_branch_ec3a4 note G_, 1 note D_, 1 @@ -195,9 +194,8 @@ Music_Route3_branch_ec307: ; ec307 octave 4 note D_, 1 loopchannel 0, Music_Route3_branch_ec307 -; ec3a4 -Music_Route3_branch_ec3a4: ; ec3a4 +Music_Route3_branch_ec3a4: octave 3 note A_, 1 note E_, 1 @@ -208,7 +206,7 @@ Music_Route3_branch_ec3a4: ; ec3a4 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3b1: ; ec3b1 +Music_Route3_branch_ec3b1: note A_, 1 note E_, 1 note C#, 1 @@ -218,7 +216,7 @@ Music_Route3_branch_ec3b1: ; ec3b1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3bd: ; ec3bd +Music_Route3_branch_ec3bd: note G_, 1 note D_, 1 octave 2 @@ -235,9 +233,8 @@ Music_Route3_branch_ec3bd: ; ec3bd octave 3 note D_, 1 endchannel -; ec3d0 -Music_Route3_Ch2: ; ec3d0 +Music_Route3_Ch2: stereopanning $f0 notetype $c, $5e dutycycle $2 @@ -266,7 +263,7 @@ Music_Route3_Ch2: ; ec3d0 note C#, 1 note E_, 1 note G#, 1 -Music_Route3_branch_ec3f5: ; ec3f5 +Music_Route3_branch_ec3f5: intensity $7d callchannel Music_Route3_branch_ec443 note G_, 1 @@ -328,9 +325,8 @@ Music_Route3_branch_ec3f5: ; ec3f5 note F#, 1 note G#, 1 loopchannel 0, Music_Route3_branch_ec3f5 -; ec443 -Music_Route3_branch_ec443: ; ec443 +Music_Route3_branch_ec443: note A_, 6 note E_, 1 note A_, 1 @@ -353,9 +349,8 @@ Music_Route3_branch_ec443: ; ec443 note G_, 6 note D_, 1 endchannel -; ec45b -Music_Route3_Ch3: ; ec45b +Music_Route3_Ch3: stereopanning $ff vibrato $6, $3 notetype $c, $13 @@ -384,7 +379,7 @@ Music_Route3_Ch3: ; ec45b note __, 1 note G#, 2 callchannel Music_Route3_branch_ec4bd -Music_Route3_branch_ec47f: ; ec47f +Music_Route3_branch_ec47f: intensity $14 callchannel Music_Route3_branch_ec4bd callchannel Music_Route3_branch_ec4bd @@ -431,9 +426,8 @@ Music_Route3_branch_ec47f: ; ec47f note F#, 1 note G#, 1 loopchannel 0, Music_Route3_branch_ec47f -; ec4bd -Music_Route3_branch_ec4bd: ; ec4bd +Music_Route3_branch_ec4bd: octave 3 note A_, 1 note __, 1 @@ -451,9 +445,8 @@ Music_Route3_branch_ec4bd: ; ec4bd octave 2 note G#, 2 endchannel -; ec4ce -Music_Route3_branch_ec4ce: ; ec4ce +Music_Route3_branch_ec4ce: octave 3 note G_, 1 note __, 1 @@ -483,13 +476,12 @@ Music_Route3_branch_ec4ce: ; ec4ce note G#, 2 note B_, 2 endchannel -; ec4eb -Music_Route3_Ch4: ; ec4eb +Music_Route3_Ch4: togglenoise $4 notetype $c note __, 10 -Music_Route3_branch_ec4f0: ; ec4f0 +Music_Route3_branch_ec4f0: notetype $c note D_, 2 note D_, 4 @@ -507,4 +499,3 @@ Music_Route3_branch_ec4f0: ; ec4f0 note C#, 1 note C#, 1 loopchannel 0, Music_Route3_branch_ec4f0 -; ec506 diff --git a/audio/music/route30.asm b/audio/music/route30.asm index 7cae730c1..22623579f 100644 --- a/audio/music/route30.asm +++ b/audio/music/route30.asm @@ -1,11 +1,10 @@ -Music_Route30: ; efc01 +Music_Route30: 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 +Music_Route30_Ch1: tempo 144 volume $77 dutycycle $3 @@ -27,7 +26,7 @@ Music_Route30_Ch1: ; efc0d note D_, 2 intensity $4e note C_, 4 -Music_Route30_branch_efc2e: ; efc2e +Music_Route30_branch_efc2e: intensity $b6 note D_, 6 intensity $b4 @@ -183,9 +182,8 @@ Music_Route30_branch_efc2e: ; efc2e octave 4 note D_, 2 loopchannel 0, Music_Route30_branch_efc2e -; efcda -Music_Route30_Ch2: ; efcda +Music_Route30_Ch2: dutycycle $3 vibrato $12, $36 stereopanning $f @@ -207,7 +205,7 @@ Music_Route30_Ch2: ; efcda note E_, 1 note F_, 1 note F#, 1 -Music_Route30_branch_efcf6: ; efcf6 +Music_Route30_branch_efcf6: intensity $c7 note G_, 10 octave 4 @@ -295,9 +293,8 @@ Music_Route30_branch_efcf6: ; efcf6 octave 3 note F#, 2 loopchannel 0, Music_Route30_branch_efcf6 -; efd5f -Music_Route30_Ch3: ; efd5f +Music_Route30_Ch3: notetype $c, $27 octave 2 note G_, 1 @@ -322,7 +319,7 @@ Music_Route30_Ch3: ; efd5f note __, 1 note G_, 1 note __, 1 -Music_Route30_branch_efd79: ; efd79 +Music_Route30_branch_efd79: note G_, 1 note __, 1 note B_, 2 @@ -577,14 +574,13 @@ Music_Route30_branch_efd79: ; efd79 note G_, 1 note __, 1 loopchannel 0, Music_Route30_branch_efd79 -; efe7a -Music_Route30_Ch4: ; efe7a +Music_Route30_Ch4: togglenoise $3 notetype $c callchannel Music_Route30_branch_efeb8 callchannel Music_Route30_branch_efec1 -Music_Route30_branch_efe84: ; efe84 +Music_Route30_branch_efe84: callchannel Music_Route30_branch_efecd callchannel Music_Route30_branch_efed7 callchannel Music_Route30_branch_efed7 @@ -602,9 +598,8 @@ Music_Route30_branch_efe84: ; efe84 callchannel Music_Route30_branch_efecd callchannel Music_Route30_branch_efee1 loopchannel 0, Music_Route30_branch_efe84 -; efeb8 -Music_Route30_branch_efeb8: ; efeb8 +Music_Route30_branch_efeb8: note D_, 2 note F#, 2 note F#, 2 @@ -614,9 +609,8 @@ Music_Route30_branch_efeb8: ; efeb8 note D_, 2 note D_, 4 endchannel -; efec1 -Music_Route30_branch_efec1: ; efec1 +Music_Route30_branch_efec1: note D_, 2 note F#, 2 note F#, 2 @@ -629,9 +623,8 @@ Music_Route30_branch_efec1: ; efec1 note D_, 1 note D_, 1 endchannel -; efecd -Music_Route30_branch_efecd: ; efecd +Music_Route30_branch_efecd: note D_, 2 note F#, 2 note F#, 2 @@ -642,9 +635,8 @@ Music_Route30_branch_efecd: ; efecd note D_, 2 note D_, 2 endchannel -; efed7 -Music_Route30_branch_efed7: ; efed7 +Music_Route30_branch_efed7: note D_, 2 note F#, 2 note F#, 2 @@ -655,9 +647,8 @@ Music_Route30_branch_efed7: ; efed7 note D_, 2 note D_, 2 endchannel -; efee1 -Music_Route30_branch_efee1: ; efee1 +Music_Route30_branch_efee1: note D_, 2 note F#, 2 note F#, 2 @@ -676,4 +667,3 @@ Music_Route30_branch_efee1: ; efee1 note D_, 1 notetype $c endchannel -; efef5 diff --git a/audio/music/route36.asm b/audio/music/route36.asm index 8c7db70ff..1899116b9 100644 --- a/audio/music/route36.asm +++ b/audio/music/route36.asm @@ -1,11 +1,10 @@ -Music_Route36: ; e94e9 +Music_Route36: 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 +Music_Route36_Ch1: tempo 144 volume $77 dutycycle $3 @@ -26,7 +25,7 @@ Music_Route36_Ch1: ; e94f5 note A_, 1 intensity $5d note A#, 4 -Music_Route36_branch_e9517: ; e9517 +Music_Route36_branch_e9517: intensity $b5 note F_, 4 note A_, 2 @@ -163,9 +162,8 @@ Music_Route36_branch_e9517: ; e9517 note D#, 2 note E_, 2 loopchannel 0, Music_Route36_branch_e9517 -; e95af -Music_Route36_Ch2: ; e95af +Music_Route36_Ch2: dutycycle $3 vibrato $10, $36 stereopanning $f0 @@ -188,7 +186,7 @@ Music_Route36_Ch2: ; e95af note F_, 8 octave 3 note G_, 4 -Music_Route36_branch_e95ce: ; e95ce +Music_Route36_branch_e95ce: intensity $c7 octave 4 note C_, 10 @@ -311,9 +309,8 @@ Music_Route36_branch_e95ce: ; e95ce note A_, 1 note B_, 1 loopchannel 0, Music_Route36_branch_e95ce -; e966b -Music_Route36_Ch3: ; e966b +Music_Route36_Ch3: notetype $c, $25 octave 3 note F_, 1 @@ -337,7 +334,7 @@ Music_Route36_Ch3: ; e966b octave 3 note D#, 2 note E_, 2 -Music_Route36_branch_e9684: ; e9684 +Music_Route36_branch_e9684: note F_, 4 note C_, 2 note F_, 4 @@ -468,20 +465,19 @@ Music_Route36_branch_e9684: ; e9684 note D#, 2 note E_, 2 loopchannel 0, Music_Route36_branch_e9684 -; e9709 -Music_Route36_Ch4: ; e9709 +Music_Route36_Ch4: togglenoise $1 notetype $c callchannel Music_Route36_branch_e9734 callchannel Music_Route36_branch_e9741 -Music_Route36_branch_e9713: ; e9713 +Music_Route36_branch_e9713: callchannel Music_Route36_branch_e9734 callchannel Music_Route36_branch_e973b callchannel Music_Route36_branch_e9734 callchannel Music_Route36_branch_e9741 loopchannel 2, Music_Route36_branch_e9713 -Music_Route36_branch_e9723: ; e9723 +Music_Route36_branch_e9723: note A#, 4 note A_, 2 note F_, 4 @@ -491,9 +487,8 @@ Music_Route36_branch_e9723: ; e9723 loopchannel 11, Music_Route36_branch_e9723 callchannel Music_Route36_branch_e9741 loopchannel 0, Music_Route36_branch_e9713 -; e9734 -Music_Route36_branch_e9734: ; e9734 +Music_Route36_branch_e9734: note A_, 4 note A_, 6 note A#, 1 @@ -501,18 +496,16 @@ Music_Route36_branch_e9734: ; e9734 note A_, 2 note A#, 2 endchannel -; e973b -Music_Route36_branch_e973b: ; e973b +Music_Route36_branch_e973b: note A_, 4 note A_, 6 note B_, 1 note A#, 1 note A_, 4 endchannel -; e9741 -Music_Route36_branch_e9741: ; e9741 +Music_Route36_branch_e9741: note A_, 4 note A_, 6 note A#, 1 @@ -525,4 +518,3 @@ Music_Route36_branch_e9741: ; e9741 note A_, 1 notetype $c endchannel -; e974f diff --git a/audio/music/route37.asm b/audio/music/route37.asm index 90a832b3e..000db4e3b 100644 --- a/audio/music/route37.asm +++ b/audio/music/route37.asm @@ -1,11 +1,10 @@ -Music_Route37: ; ee94b +Music_Route37: 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 +Music_Route37_Ch1: tempo 144 volume $77 dutycycle $3 @@ -14,7 +13,7 @@ Music_Route37_Ch1: ; ee957 notetype $c, $b3 note __, 16 note __, 16 -Music_Route37_branch_ee969: ; ee969 +Music_Route37_branch_ee969: intensity $b3 note __, 2 octave 2 @@ -68,7 +67,7 @@ Music_Route37_branch_ee969: ; ee969 note E_, 2 note D#, 4 stereopanning $f -Music_Route37_branch_ee9a5: ; ee9a5 +Music_Route37_branch_ee9a5: callchannel Music_Route37_branch_ee9da octave 3 note C#, 4 @@ -97,9 +96,8 @@ Music_Route37_branch_ee9a5: ; ee9a5 callchannel Music_Route37_branch_ee9e9 note __, 4 loopchannel 0, Music_Route37_branch_ee969 -; ee9da -Music_Route37_branch_ee9da: ; ee9da +Music_Route37_branch_ee9da: intensity $c2 octave 2 note A_, 2 @@ -113,9 +111,8 @@ Music_Route37_branch_ee9da: ; ee9da note A_, 2 intensity $b7 endchannel -; ee9e9 -Music_Route37_branch_ee9e9: ; ee9e9 +Music_Route37_branch_ee9e9: intensity $c2 octave 2 note B_, 2 @@ -129,9 +126,8 @@ Music_Route37_branch_ee9e9: ; ee9e9 note B_, 2 intensity $b7 endchannel -; ee9f8 -Music_Route37_Ch2: ; ee9f8 +Music_Route37_Ch2: dutycycle $3 vibrato $1c, $12 notetype $c, $c2 @@ -162,7 +158,7 @@ Music_Route37_Ch2: ; ee9f8 note B_, 1 intensity $c2 note B_, 2 -Music_Route37_branch_eea24: ; eea24 +Music_Route37_branch_eea24: callchannel Music_Route37_branch_eeab7 intensity $c6 octave 4 @@ -274,9 +270,8 @@ Music_Route37_branch_eea24: ; eea24 intensity $c2 note F#, 2 loopchannel 0, Music_Route37_branch_eea24 -; eeab7 -Music_Route37_branch_eeab7: ; eeab7 +Music_Route37_branch_eeab7: intensity $c7 octave 3 note F#, 4 @@ -289,17 +284,16 @@ Music_Route37_branch_eeab7: ; eeab7 note F#, 2 note B_, 2 endchannel -; eeac7 -Music_Route37_Ch3: ; eeac7 +Music_Route37_Ch3: stereopanning $f0 notetype $c, $14 -Music_Route37_branch_eeacc: ; eeacc +Music_Route37_branch_eeacc: octave 2 note F#, 2 note __, 6 loopchannel 4, Music_Route37_branch_eeacc -Music_Route37_branch_eead3: ; eead3 +Music_Route37_branch_eead3: callchannel Music_Route37_branch_eeb32 note A_, 2 octave 3 @@ -311,7 +305,7 @@ Music_Route37_branch_eead3: ; eead3 note A_, 2 note F#, 2 note E_, 2 -Music_Route37_branch_eeae0: ; eeae0 +Music_Route37_branch_eeae0: note D#, 2 note F#, 2 loopchannel 4, Music_Route37_branch_eeae0 @@ -330,13 +324,13 @@ Music_Route37_branch_eeae0: ; eeae0 octave 2 note A_, 2 callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeafb: ; eeafb +Music_Route37_branch_eeafb: octave 2 note B_, 2 octave 3 note D#, 2 loopchannel 4, Music_Route37_branch_eeafb -Music_Route37_branch_eeb03: ; eeb03 +Music_Route37_branch_eeb03: octave 2 note A_, 2 octave 3 @@ -345,13 +339,13 @@ Music_Route37_branch_eeb03: ; eeb03 note E_, 2 note C#, 2 callchannel Music_Route37_branch_eeb3c -Music_Route37_branch_eeb10: ; eeb10 +Music_Route37_branch_eeb10: octave 2 note B_, 2 octave 3 note F#, 2 loopchannel 4, Music_Route37_branch_eeb10 -Music_Route37_branch_eeb18: ; eeb18 +Music_Route37_branch_eeb18: octave 2 note A_, 2 octave 3 @@ -361,14 +355,13 @@ Music_Route37_branch_eeb18: ; eeb18 note C#, 2 callchannel Music_Route37_branch_eeb3c callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeb28: ; eeb28 +Music_Route37_branch_eeb28: note F#, 2 note __, 6 loopchannel 4, Music_Route37_branch_eeb28 loopchannel 0, Music_Route37_branch_eead3 -; eeb32 -Music_Route37_branch_eeb32: ; eeb32 +Music_Route37_branch_eeb32: octave 2 note F#, 2 note B_, 2 @@ -379,9 +372,8 @@ Music_Route37_branch_eeb32: ; eeb32 note F#, 2 note B_, 2 endchannel -; eeb3c -Music_Route37_branch_eeb3c: ; eeb3c +Music_Route37_branch_eeb3c: octave 2 note B_, 2 octave 3 @@ -399,12 +391,11 @@ Music_Route37_branch_eeb3c: ; eeb3c octave 3 note D#, 2 endchannel -; eeb4d -Music_Route37_Ch4: ; eeb4d +Music_Route37_Ch4: stereopanning $f togglenoise $0 -Music_Route37_branch_eeb51: ; eeb51 +Music_Route37_branch_eeb51: notetype $c callchannel Music_Route37_branch_eeb6b note D_, 1 @@ -422,9 +413,8 @@ Music_Route37_branch_eeb51: ; eeb51 note D_, 1 note D_, 1 loopchannel 0, Music_Route37_branch_eeb51 -; eeb6b -Music_Route37_branch_eeb6b: ; eeb6b +Music_Route37_branch_eeb6b: note D_, 2 note D#, 1 note D#, 1 @@ -435,4 +425,3 @@ Music_Route37_branch_eeb6b: ; eeb6b note D#, 1 note D#, 1 endchannel -; eeb75 diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm index 7d7ff5bc9..f353b63a2 100644 --- a/audio/music/ruinsofalphinterior.asm +++ b/audio/music/ruinsofalphinterior.asm @@ -1,10 +1,9 @@ -Music_RuinsOfAlphInterior: ; ebd9e +Music_RuinsOfAlphInterior: musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1 musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2 musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3 -; ebda7 -Music_RuinsOfAlphInterior_Ch1: ; ebda7 +Music_RuinsOfAlphInterior_Ch1: tempo 224 volume $77 dutycycle $0 @@ -12,14 +11,13 @@ Music_RuinsOfAlphInterior_Ch1: ; ebda7 notetype $c, $44 note __, 1 loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 -; ebdb8 -Music_RuinsOfAlphInterior_Ch2: ; ebdb8 +Music_RuinsOfAlphInterior_Ch2: tone $0002 dutycycle $0 stereopanning $f notetype $c, $a4 -Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2 +Music_RuinsOfAlphInterior_branch_ebdc2: octave 4 note C_, 4 octave 3 @@ -35,11 +33,10 @@ Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2 octave 3 note A#, 4 loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 -; ebdd4 -Music_RuinsOfAlphInterior_Ch3: ; ebdd4 +Music_RuinsOfAlphInterior_Ch3: notetype $c, $10 -Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7 +Music_RuinsOfAlphInterior_branch_ebdd7: octave 2 note G#, 2 octave 3 @@ -47,4 +44,3 @@ Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7 note E_, 2 note __, 10 loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7 -; ebde1 diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm index 73ce53c75..5584b279a 100644 --- a/audio/music/ruinsofalphradio.asm +++ b/audio/music/ruinsofalphradio.asm @@ -1,17 +1,16 @@ -Music_RuinsOfAlphRadio: ; eedcb +Music_RuinsOfAlphRadio: musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1 musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2 musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3 -; eedd4 -Music_RuinsOfAlphRadio_Ch1: ; eedd4 +Music_RuinsOfAlphRadio_Ch1: tempo 160 volume $77 dutycycle $0 tone $0118 vibrato $0, $f0 stereopanning $f0 -Music_RuinsOfAlphRadio_branch_eede3: ; eede3 +Music_RuinsOfAlphRadio_branch_eede3: notetype $6, $71 callchannel Music_RuinsOfAlphRadio_branch_eee01 notetype $c, $a1 @@ -25,9 +24,8 @@ Music_RuinsOfAlphRadio_branch_eede3: ; eede3 notetype $c, $a1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3 -; eee01 -Music_RuinsOfAlphRadio_branch_eee01: ; eee01 +Music_RuinsOfAlphRadio_branch_eee01: octave 4 note G_, 1 note F#, 1 @@ -35,9 +33,8 @@ Music_RuinsOfAlphRadio_branch_eee01: ; eee01 note F#, 1 note C_, 8 endchannel -; eee08 -Music_RuinsOfAlphRadio_branch_eee08: ; eee08 +Music_RuinsOfAlphRadio_branch_eee08: octave 4 note G_, 1 note F#, 1 @@ -48,12 +45,11 @@ Music_RuinsOfAlphRadio_branch_eee08: ; eee08 octave 5 note C_, 8 endchannel -; eee12 -Music_RuinsOfAlphRadio_Ch2: ; eee12 +Music_RuinsOfAlphRadio_Ch2: dutycycle $1 vibrato $1, $e0 -Music_RuinsOfAlphRadio_branch_eee17: ; eee17 +Music_RuinsOfAlphRadio_branch_eee17: stereopanning $f notetype $6, $81 callchannel Music_RuinsOfAlphRadio_branch_eee01 @@ -65,15 +61,13 @@ Music_RuinsOfAlphRadio_branch_eee17: ; eee17 notetype $c, $a1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17 -; eee32 -Music_RuinsOfAlphRadio_Ch3: ; eee32 +Music_RuinsOfAlphRadio_Ch3: notetype $6, $26 -Music_RuinsOfAlphRadio_branch_eee35: ; eee35 +Music_RuinsOfAlphRadio_branch_eee35: octave 2 note C_, 1 note C#, 1 note C_, 1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35 -; eee3e diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm index f0bed8ef1..344b8fe3a 100644 --- a/audio/music/showmearound.asm +++ b/audio/music/showmearound.asm @@ -1,11 +1,10 @@ -Music_ShowMeAround: ; edbd8 +Music_ShowMeAround: 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 +Music_ShowMeAround_Ch1: tempo 144 volume $77 stereopanning $f @@ -28,7 +27,7 @@ Music_ShowMeAround_Ch1: ; edbe4 note D_, 1 note E_, 1 note G#, 8 -Music_ShowMeAround_branch_edc01: ; edc01 +Music_ShowMeAround_branch_edc01: note __, 16 note __, 16 note __, 16 @@ -38,9 +37,8 @@ Music_ShowMeAround_branch_edc01: ; edc01 callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc15 loopchannel 0, Music_ShowMeAround_branch_edc01 -; edc15 -Music_ShowMeAround_branch_edc15: ; edc15 +Music_ShowMeAround_branch_edc15: note __, 4 octave 3 note C#, 1 @@ -62,9 +60,8 @@ Music_ShowMeAround_branch_edc15: ; edc15 note E_, 1 note __, 3 endchannel -; edc2a -Music_ShowMeAround_Ch2: ; edc2a +Music_ShowMeAround_Ch2: stereopanning $ff dutycycle $2 notetype $c, $b1 @@ -86,7 +83,7 @@ Music_ShowMeAround_Ch2: ; edc2a note D_, 1 note E_, 8 dutycycle $1 -Music_ShowMeAround_branch_edc44: ; edc44 +Music_ShowMeAround_branch_edc44: callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc86 @@ -138,9 +135,8 @@ Music_ShowMeAround_branch_edc44: ; edc44 note A_, 2 note A_, 4 loopchannel 0, Music_ShowMeAround_branch_edc44 -; edc86 -Music_ShowMeAround_branch_edc86: ; edc86 +Music_ShowMeAround_branch_edc86: octave 3 note A_, 2 octave 4 @@ -149,9 +145,8 @@ Music_ShowMeAround_branch_edc86: ; edc86 note D_, 2 note F#, 2 endchannel -; edc8e -Music_ShowMeAround_branch_edc8e: ; edc8e +Music_ShowMeAround_branch_edc8e: octave 5 note C#, 2 octave 4 @@ -162,9 +157,8 @@ Music_ShowMeAround_branch_edc8e: ; edc8e octave 4 note A_, 2 endchannel -; edc98 -Music_ShowMeAround_branch_edc98: ; edc98 +Music_ShowMeAround_branch_edc98: note __, 4 octave 3 note C#, 1 @@ -182,9 +176,8 @@ Music_ShowMeAround_branch_edc98: ; edc98 note B_, 1 note __, 1 endchannel -; edca9 -Music_ShowMeAround_Ch3: ; edca9 +Music_ShowMeAround_Ch3: stereopanning $f0 vibrato $10, $22 notetype $6, $25 @@ -226,7 +219,7 @@ Music_ShowMeAround_Ch3: ; edca9 note F_, 1 note E_, 2 intensity $14 -Music_ShowMeAround_branch_edcd9: ; edcd9 +Music_ShowMeAround_branch_edcd9: callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edcef @@ -234,9 +227,8 @@ Music_ShowMeAround_branch_edcd9: ; edcd9 callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edd0f loopchannel 0, Music_ShowMeAround_branch_edcd9 -; edcef -Music_ShowMeAround_branch_edcef: ; edcef +Music_ShowMeAround_branch_edcef: octave 2 note A_, 2 note __, 6 @@ -269,9 +261,8 @@ Music_ShowMeAround_branch_edcef: ; edcef note D_, 2 note __, 2 endchannel -; edd0f -Music_ShowMeAround_branch_edd0f: ; edd0f +Music_ShowMeAround_branch_edd0f: octave 2 note A_, 2 note __, 6 @@ -305,9 +296,8 @@ Music_ShowMeAround_branch_edd0f: ; edd0f note A_, 2 note __, 6 endchannel -; edd30 -Music_ShowMeAround_Ch4: ; edd30 +Music_ShowMeAround_Ch4: togglenoise $3 notetype $c note __, 16 @@ -315,7 +305,7 @@ Music_ShowMeAround_Ch4: ; edd30 note D_, 2 note D#, 2 note F#, 4 -Music_ShowMeAround_branch_edd39: ; edd39 +Music_ShowMeAround_branch_edd39: callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd4f @@ -323,9 +313,8 @@ Music_ShowMeAround_branch_edd39: ; edd39 callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd5e loopchannel 0, Music_ShowMeAround_branch_edd39 -; edd4f -Music_ShowMeAround_branch_edd4f: ; edd4f +Music_ShowMeAround_branch_edd4f: note D#, 2 note F#, 2 note D_, 2 @@ -341,9 +330,8 @@ Music_ShowMeAround_branch_edd4f: ; edd4f note D_, 2 note D#, 2 endchannel -; edd5e -Music_ShowMeAround_branch_edd5e: ; edd5e +Music_ShowMeAround_branch_edd5e: note D#, 2 note F#, 2 note D_, 2 @@ -359,4 +347,3 @@ Music_ShowMeAround_branch_edd5e: ; edd5e note D_, 2 note F#, 2 endchannel -; edd6d diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm index 60ceb350a..d44de6310 100644 --- a/audio/music/sprouttower.asm +++ b/audio/music/sprouttower.asm @@ -1,11 +1,10 @@ -Music_SproutTower: ; f6974 +Music_SproutTower: 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 +Music_SproutTower_Ch1: tempo 176 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_SproutTower_Ch1: ; f6980 notetype $c, $a3 note __, 16 note __, 16 -Music_SproutTower_branch_f6994: ; f6994 +Music_SproutTower_branch_f6994: note __, 6 octave 3 note F_, 2 @@ -61,9 +60,8 @@ Music_SproutTower_branch_f6994: ; f6994 note D#, 4 note D#, 4 loopchannel 0, Music_SproutTower_branch_f6994 -; f69c8 -Music_SproutTower_Ch2: ; f69c8 +Music_SproutTower_Ch2: dutycycle $3 tone $0001 vibrato $8, $48 @@ -77,7 +75,7 @@ Music_SproutTower_Ch2: ; f69c8 note F_, 4 note D#, 4 note D#, 4 -Music_SproutTower_branch_f69dc: ; f69dc +Music_SproutTower_branch_f69dc: intensity $b5 octave 4 note C_, 4 @@ -139,9 +137,8 @@ Music_SproutTower_branch_f69dc: ; f69dc note C_, 16 note __, 16 loopchannel 0, Music_SproutTower_branch_f69dc -; f6a25 -Music_SproutTower_Ch3: ; f6a25 +Music_SproutTower_Ch3: vibrato $14, $e8 notetype $c, $14 octave 3 @@ -162,7 +159,7 @@ Music_SproutTower_Ch3: ; f6a25 note __, 2 note F#, 2 stereopanning $f0 -Music_SproutTower_branch_f6a3e: ; f6a3e +Music_SproutTower_branch_f6a3e: note __, 4 note C_, 2 note F_, 2 @@ -220,13 +217,12 @@ Music_SproutTower_branch_f6a3e: ; f6a3e note __, 2 note F_, 2 loopchannel 0, Music_SproutTower_branch_f6a3e -; f6a7a -Music_SproutTower_Ch4: ; f6a7a +Music_SproutTower_Ch4: togglenoise $0 notetype $c note __, 4 -Music_SproutTower_branch_f6a7f: ; f6a7f +Music_SproutTower_branch_f6a7f: note F#, 4 stereopanning $f0 note D#, 4 @@ -244,4 +240,3 @@ Music_SproutTower_branch_f6a7f: ; f6a7f stereopanning $ff note F#, 4 loopchannel 0, Music_SproutTower_branch_f6a7f -; f6a99 diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm index 94570eccf..5b06b27b8 100644 --- a/audio/music/ssaqua.asm +++ b/audio/music/ssaqua.asm @@ -1,11 +1,10 @@ -Music_SSAqua: ; ead99 +Music_SSAqua: 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 +Music_SSAqua_Ch1: tempo 117 volume $77 stereopanning $f @@ -18,7 +17,7 @@ Music_SSAqua_Ch1: ; eada5 note __, 1 note G_, 1 note __, 1 -Music_SSAqua_branch_eadbc: ; eadbc +Music_SSAqua_branch_eadbc: octave 2 note G_, 16 note __, 8 @@ -248,15 +247,14 @@ Music_SSAqua_branch_eadbc: ; eadbc note F#, 2 note A_, 2 loopchannel 0, Music_SSAqua_branch_eadbc -; eaeca -Music_SSAqua_Ch2: ; eaeca +Music_SSAqua_Ch2: stereopanning $f0 dutycycle $2 vibrato $8, $33 notetype $c, $b7 note __, 2 -Music_SSAqua_branch_eaed5: ; eaed5 +Music_SSAqua_branch_eaed5: notetype $c, $b7 dutycycle $1 intensity $61 @@ -392,9 +390,8 @@ Music_SSAqua_branch_eaed5: ; eaed5 note A_, 8 note __, 8 loopchannel 0, Music_SSAqua_branch_eaed5 -; eaf88 -Music_SSAqua_branch_eaf88: ; eaf88 +Music_SSAqua_branch_eaf88: note D_, 6 octave 3 note B_, 1 @@ -468,9 +465,8 @@ Music_SSAqua_branch_eaf88: ; eaf88 note E_, 2 note F#, 2 endchannel -; eafd5 -Music_SSAqua_branch_eafd5: ; eafd5 +Music_SSAqua_branch_eafd5: notetype $c, $b7 note B_, 10 note F#, 1 @@ -480,9 +476,8 @@ Music_SSAqua_branch_eafd5: ; eafd5 note F#, 1 note __, 1 endchannel -; eafe0 -Music_SSAqua_branch_eafe0: ; eafe0 +Music_SSAqua_branch_eafe0: octave 3 note D_, 10 note E_, 1 @@ -504,9 +499,8 @@ Music_SSAqua_branch_eafe0: ; eafe0 note A_, 1 note __, 1 endchannel -; eaff5 -Music_SSAqua_branch_eaff5: ; eaff5 +Music_SSAqua_branch_eaff5: octave 5 note G_, 1 note D_, 1 @@ -580,9 +574,8 @@ Music_SSAqua_branch_eaff5: ; eaff5 note A_, 1 note G_, 1 endchannel -; eb03e -Music_SSAqua_branch_eb03e: ; eb03e +Music_SSAqua_branch_eb03e: octave 5 note G_, 1 octave 4 @@ -607,9 +600,8 @@ Music_SSAqua_branch_eb03e: ; eb03e octave 3 note G_, 1 endchannel -; eb056 -Music_SSAqua_Ch3: ; eb056 +Music_SSAqua_Ch3: stereopanning $ff vibrato $8, $34 notetype $6, $15 @@ -618,7 +610,7 @@ Music_SSAqua_Ch3: ; eb056 note __, 1 note G_, 1 note __, 1 -Music_SSAqua_branch_eb063: ; eb063 +Music_SSAqua_branch_eb063: note G_, 16 note __, 8 note G_, 2 @@ -651,7 +643,7 @@ Music_SSAqua_branch_eb063: ; eb063 note E_, 1 callchannel Music_SSAqua_branch_eb14d callchannel Music_SSAqua_branch_eb14d -Music_SSAqua_branch_eb08d: ; eb08d +Music_SSAqua_branch_eb08d: note G_, 2 note __, 2 octave 3 @@ -830,9 +822,8 @@ Music_SSAqua_branch_eb08d: ; eb08d note G_, 1 note __, 1 loopchannel 0, Music_SSAqua_branch_eb063 -; eb14d -Music_SSAqua_branch_eb14d: ; eb14d +Music_SSAqua_branch_eb14d: notetype $6, $15 octave 2 note G_, 2 @@ -868,9 +859,8 @@ Music_SSAqua_branch_eb14d: ; eb14d note G_, 1 note __, 1 endchannel -; eb172 -Music_SSAqua_branch_eb172: ; eb172 +Music_SSAqua_branch_eb172: octave 2 note G_, 2 note __, 2 @@ -1061,9 +1051,8 @@ Music_SSAqua_branch_eb172: ; eb172 note F#, 1 note __, 3 endchannel -; eb230 -Music_SSAqua_branch_eb230: ; eb230 +Music_SSAqua_branch_eb230: octave 2 note B_, 2 note __, 2 @@ -1089,13 +1078,12 @@ Music_SSAqua_branch_eb230: ; eb230 note D#, 1 note __, 3 endchannel -; eb249 -Music_SSAqua_Ch4: ; eb249 +Music_SSAqua_Ch4: togglenoise $3 notetype $c note __, 2 -Music_SSAqua_branch_eb24e: ; eb24e +Music_SSAqua_branch_eb24e: note G#, 1 note G_, 1 note G_, 1 @@ -1138,9 +1126,8 @@ Music_SSAqua_branch_eb24e: ; eb24e callchannel Music_SSAqua_branch_eb2ae callchannel Music_SSAqua_branch_eb2c7 loopchannel 0, Music_SSAqua_branch_eb24e -; eb2ae -Music_SSAqua_branch_eb2ae: ; eb2ae +Music_SSAqua_branch_eb2ae: note A#, 2 note G_, 1 note G_, 1 @@ -1154,9 +1141,8 @@ Music_SSAqua_branch_eb2ae: ; eb2ae note G_, 1 note G_, 1 endchannel -; eb2bb -Music_SSAqua_branch_eb2bb: ; eb2bb +Music_SSAqua_branch_eb2bb: note A#, 2 note G_, 1 note G_, 1 @@ -1169,9 +1155,8 @@ Music_SSAqua_branch_eb2bb: ; eb2bb note D_, 2 note F#, 2 endchannel -; eb2c7 -Music_SSAqua_branch_eb2c7: ; eb2c7 +Music_SSAqua_branch_eb2c7: note A#, 2 note G_, 1 note G_, 1 @@ -1184,4 +1169,3 @@ Music_SSAqua_branch_eb2c7: ; eb2c7 note D_, 2 note C_, 2 endchannel -; eb2d3 diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm index 3bdb8c9ae..1b53f4a1a 100644 --- a/audio/music/successfulcapture.asm +++ b/audio/music/successfulcapture.asm @@ -1,26 +1,22 @@ -Music_SuccessfulCapture: ; f4602 +Music_SuccessfulCapture: musicheader 3, 1, Music_SuccessfulCapture_Ch1 musicheader 1, 2, Music_SuccessfulCapture_Ch2 musicheader 1, 3, Music_SuccessfulCapture_Ch3 -; f460b -Music_SuccessfulCapture_Ch1: ; f460b +Music_SuccessfulCapture_Ch1: tempo 126 volume $77 dutycycle $3 tone $0001 notetype $c, $a1 jumpchannel Music_SuccessfulCapture_branch_f4536 -; f461b -Music_SuccessfulCapture_Ch2: ; f461b +Music_SuccessfulCapture_Ch2: vibrato $12, $24 notetype $c, $c1 dutycycle $2 jumpchannel Music_SuccessfulCapture_branch_f4585 -; f4626 -Music_SuccessfulCapture_Ch3: ; f4626 +Music_SuccessfulCapture_Ch3: notetype $c, $25 jumpchannel Music_SuccessfulCapture_branch_f45cf -; f462c diff --git a/audio/music/suicunebattle.asm b/audio/music/suicunebattle.asm index a5819181f..189e6b186 100644 --- a/audio/music/suicunebattle.asm +++ b/audio/music/suicunebattle.asm @@ -1,10 +1,9 @@ -Music_SuicuneBattle: ; 178b81 +Music_SuicuneBattle: musicheader 3, 1, Music_SuicuneBattle_Ch1 musicheader 1, 2, Music_SuicuneBattle_Ch2 musicheader 1, 3, Music_SuicuneBattle_Ch3 -; 178b8a -Music_SuicuneBattle_Ch1: ; 178b8a +Music_SuicuneBattle_Ch1: tempo 101 volume $77 dutycycle $3 @@ -95,7 +94,7 @@ Music_SuicuneBattle_Ch1: ; 178b8a octave 3 note E_, 1 note G#, 1 -Music_SuicuneBattle_branch_178bfc: ; 178bfc +Music_SuicuneBattle_branch_178bfc: notetype $c, $b4 octave 2 note A_, 2 @@ -511,9 +510,8 @@ Music_SuicuneBattle_branch_178bfc: ; 178bfc vibrato $12, $15 dutycycle $3 loopchannel 0, Music_SuicuneBattle_branch_178bfc -; 178dec -Music_SuicuneBattle_Ch2: ; 178dec +Music_SuicuneBattle_Ch2: dutycycle $3 vibrato $14, $34 tone $0001 @@ -591,7 +589,7 @@ Music_SuicuneBattle_Ch2: ; 178dec note E_, 8 note E_, 8 note E_, 4 -Music_SuicuneBattle_branch_178e4e: ; 178e4e +Music_SuicuneBattle_branch_178e4e: notetype $c, $c7 octave 3 note A_, 8 @@ -1187,9 +1185,8 @@ Music_SuicuneBattle_branch_178e4e: ; 178e4e note A_, 2 note B_, 2 loopchannel 0, Music_SuicuneBattle_branch_178e4e -; 179122 -Music_SuicuneBattle_Ch3: ; 179122 +Music_SuicuneBattle_Ch3: notetype $c, $18 note __, 16 note __, 4 @@ -1282,7 +1279,7 @@ Music_SuicuneBattle_Ch3: ; 179122 note D_, 2 note E_, 2 notetype $c, $16 -Music_SuicuneBattle_branch_179182: ; 179182 +Music_SuicuneBattle_branch_179182: octave 1 note A_, 2 octave 2 @@ -2057,4 +2054,3 @@ Music_SuicuneBattle_branch_179182: ; 179182 note D_, 2 note E_, 2 loopchannel 0, Music_SuicuneBattle_branch_179182 -; 17948b diff --git a/audio/music/surf.asm b/audio/music/surf.asm index 8a04945d9..c3948f5f7 100644 --- a/audio/music/surf.asm +++ b/audio/music/surf.asm @@ -1,17 +1,16 @@ -Music_Surf: ; f518a +Music_Surf: musicheader 3, 1, Music_Surf_Ch1 musicheader 1, 2, Music_Surf_Ch2 musicheader 1, 3, Music_Surf_Ch3 -; f5193 db $3 -Music_Surf_Ch1: ; f5194 +Music_Surf_Ch1: tempo 108 volume $77 notetype $c, $a7 stereopanning $f -Music_Surf_branch_f519e: ; f519e +Music_Surf_branch_f519e: dutycycle $2 vibrato $10, $24 intensity $73 @@ -119,9 +118,8 @@ Music_Surf_branch_f519e: ; f519e octave 3 note D#, 2 loopchannel 0, Music_Surf_branch_f519e -; f5233 -Music_Surf_branch_f5233: ; f5233 +Music_Surf_branch_f5233: notetype $c, $a7 octave 3 note D#, 4 @@ -214,9 +212,8 @@ Music_Surf_branch_f5233: ; f5233 note C#, 4 note D_, 4 endchannel -; f5293 -Music_Surf_branch_f5293: ; f5293 +Music_Surf_branch_f5293: octave 4 note G#, 16 note D#, 4 @@ -281,9 +278,8 @@ Music_Surf_branch_f5293: ; f5293 octave 3 note G_, 2 endchannel -; f52d9 -Music_Surf_branch_f52d9: ; f52d9 +Music_Surf_branch_f52d9: octave 3 note A#, 3 note G_, 3 @@ -341,15 +337,14 @@ Music_Surf_branch_f52d9: ; f52d9 octave 2 note B_, 8 endchannel -; f5317 -Music_Surf_Ch2: ; f5317 -Music_Surf_branch_f5317: ; f5317 +Music_Surf_Ch2: +Music_Surf_branch_f5317: notetype $c, $c2 stereopanning $f0 dutycycle $2 vibrato $14, $23 -Music_Surf_branch_f5321: ; f5321 +Music_Surf_branch_f5321: octave 1 note A#, 4 octave 2 @@ -365,7 +360,7 @@ Music_Surf_branch_f5321: ; f5321 note __, 3 note A#, 1 note __, 3 -Music_Surf_branch_f5333: ; f5333 +Music_Surf_branch_f5333: note D#, 4 note G_, 2 note G#, 2 @@ -448,9 +443,8 @@ Music_Surf_branch_f5333: ; f5333 note A#, 4 note B_, 4 loopchannel 0, Music_Surf_branch_f5317 -; f53b2 -Music_Surf_branch_f53b2: ; f53b2 +Music_Surf_branch_f53b2: octave 1 note G#, 4 octave 3 @@ -487,9 +481,8 @@ Music_Surf_branch_f53b2: ; f53b2 note F_, 4 note G_, 4 endchannel -; f53d6 -Music_Surf_branch_f53d6: ; f53d6 +Music_Surf_branch_f53d6: octave 4 note F_, 4 note D#, 4 @@ -507,9 +500,8 @@ Music_Surf_branch_f53d6: ; f53d6 note B_, 1 note A_, 1 endchannel -; f53e8 -Music_Surf_branch_f53e8: ; f53e8 +Music_Surf_branch_f53e8: note A#, 7 octave 4 note C_, 8 @@ -521,9 +513,8 @@ Music_Surf_branch_f53e8: ; f53e8 note C_, 16 note G_, 8 endchannel -; f53f3 -Music_Surf_branch_f53f3: ; f53f3 +Music_Surf_branch_f53f3: note F#, 1 note G_, 3 note F_, 4 @@ -540,9 +531,8 @@ Music_Surf_branch_f53f3: ; f53f3 octave 3 note B_, 1 endchannel -; f5404 -Music_Surf_branch_f5404: ; f5404 +Music_Surf_branch_f5404: octave 4 note C_, 8 note G_, 4 @@ -551,10 +541,9 @@ Music_Surf_branch_f5404: ; f5404 note G#, 8 note D#, 8 endchannel -; f540c -Music_Surf_Ch3: ; f540c -Music_Surf_branch_f540c: ; f540c +Music_Surf_Ch3: +Music_Surf_branch_f540c: stereopanning $ff notetype $c, $15 vibrato $16, $23 @@ -697,9 +686,8 @@ Music_Surf_branch_f540c: ; f540c octave 2 note B_, 4 loopchannel 0, Music_Surf_branch_f540c -; f54c8 -Music_Surf_branch_f54c8: ; f54c8 +Music_Surf_branch_f54c8: octave 3 note D#, 4 note G_, 1 @@ -732,4 +720,3 @@ Music_Surf_branch_f54c8: ; f54c8 note G#, 1 note __, 3 endchannel -; f54e8 diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm index 2c9dd12e0..3871f4eea 100644 --- a/audio/music/tintower.asm +++ b/audio/music/tintower.asm @@ -1,17 +1,16 @@ -Music_TinTower: ; f6811 +Music_TinTower: 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 +Music_TinTower_Ch1: tempo 208 volume $77 dutycycle $3 tone $0004 vibrato $8, $45 -Music_TinTower_branch_f682a: ; f682a +Music_TinTower_branch_f682a: stereopanning $f0 notetype $c, $a5 octave 3 @@ -95,15 +94,14 @@ Music_TinTower_branch_f682a: ; f682a octave 3 note A#, 4 loopchannel 0, Music_TinTower_branch_f682a -; f688b -Music_TinTower_Ch2: ; f688b +Music_TinTower_Ch2: dutycycle $3 tone $0002 vibrato $18, $44 -Music_TinTower_branch_f6893: ; f6893 +Music_TinTower_branch_f6893: stereopanning $ff -Music_TinTower_branch_f6895: ; f6895 +Music_TinTower_branch_f6895: notetype $c, $b5 octave 4 note C_, 4 @@ -185,11 +183,10 @@ Music_TinTower_branch_f6895: ; f6895 intensity $95 note C#, 2 loopchannel 0, Music_TinTower_branch_f6893 -; f68f8 -Music_TinTower_Ch3: ; f68f8 +Music_TinTower_Ch3: notetype $c, $14 -Music_TinTower_branch_f68fb: ; f68fb +Music_TinTower_branch_f68fb: note __, 16 note __, 16 note __, 16 @@ -260,12 +257,11 @@ Music_TinTower_branch_f68fb: ; f68fb note __, 11 stereopanning $ff loopchannel 0, Music_TinTower_branch_f68fb -; f6948 -Music_TinTower_Ch4: ; f6948 +Music_TinTower_Ch4: togglenoise $0 notetype $c -Music_TinTower_branch_f694c: ; f694c +Music_TinTower_branch_f694c: stereopanning $f note G_, 2 stereopanning $f0 @@ -293,4 +289,3 @@ Music_TinTower_branch_f694c: ; f694c note G_, 2 note F_, 2 loopchannel 0, Music_TinTower_branch_f694c -; f6974 diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 6e9c488a9..a59608a4b 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,11 +1,10 @@ -Music_TitleScreen: ; eb808 +Music_TitleScreen: 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 +Music_TitleScreen_Ch1: tempo 134 volume $77 dutycycle $3 @@ -272,12 +271,11 @@ Music_TitleScreen_Ch1: ; eb814 note G_, 1 note __, 11 endchannel -; eb96d -Music_TitleScreen_branch_eb96d: ; eb96d +Music_TitleScreen_branch_eb96d: notetype $c, $c3 note D_, 1 -Music_TitleScreen_branch_eb971: ; eb971 +Music_TitleScreen_branch_eb971: note __, 1 octave 2 note D_, 1 @@ -292,9 +290,8 @@ Music_TitleScreen_branch_eb971: ; eb971 note A_, 1 notetype $8, $b7 endchannel -; eb984 -Music_TitleScreen_Ch2: ; eb984 +Music_TitleScreen_Ch2: dutycycle $3 vibrato $14, $12 notetype $c, $c7 @@ -556,12 +553,11 @@ Music_TitleScreen_Ch2: ; eb984 note G_, 1 note __, 11 endchannel -; ebae7 -Music_TitleScreen_branch_ebae7: ; ebae7 +Music_TitleScreen_branch_ebae7: notetype $c, $b2 note D_, 1 -Music_TitleScreen_branch_ebaeb: ; ebaeb +Music_TitleScreen_branch_ebaeb: octave 3 note A_, 1 octave 4 @@ -579,9 +575,8 @@ Music_TitleScreen_branch_ebaeb: ; ebaeb note C_, 4 note C_, 4 endchannel -; ebb01 -Music_TitleScreen_Ch3: ; ebb01 +Music_TitleScreen_Ch3: stereopanning $f vibrato $10, $14 tone $0001 @@ -896,9 +891,8 @@ Music_TitleScreen_Ch3: ; ebb01 note G_, 1 note __, 11 endchannel -; ebc5c -Music_TitleScreen_Ch4: ; ebc5c +Music_TitleScreen_Ch4: togglenoise $5 stereopanning $f0 notetype $c @@ -1081,7 +1075,7 @@ Music_TitleScreen_Ch4: ; ebc5c note C#, 1 notetype $c note G#, 16 -Music_TitleScreen_branch_ebd40: ; ebd40 +Music_TitleScreen_branch_ebd40: note __, 16 loopchannel 6, Music_TitleScreen_branch_ebd40 note __, 12 @@ -1129,9 +1123,8 @@ Music_TitleScreen_branch_ebd40: ; ebd40 note C_, 4 note B_, 4 endchannel -; ebd77 -Music_TitleScreen_branch_ebd77: ; ebd77 +Music_TitleScreen_branch_ebd77: note C_, 2 note D#, 2 note C_, 2 @@ -1142,9 +1135,8 @@ Music_TitleScreen_branch_ebd77: ; ebd77 note C_, 2 note D#, 2 endchannel -; ebd81 -Music_TitleScreen_branch_ebd81: ; ebd81 +Music_TitleScreen_branch_ebd81: note C_, 2 note D#, 2 note C_, 2 @@ -1155,17 +1147,15 @@ Music_TitleScreen_branch_ebd81: ; ebd81 note C_, 2 note D#, 2 endchannel -; ebd8b -Music_TitleScreen_branch_ebd8b: ; ebd8b +Music_TitleScreen_branch_ebd8b: note C_, 2 note C_, 1 note C_, 1 loopchannel 4, Music_TitleScreen_branch_ebd8b endchannel -; ebd93 -Music_TitleScreen_branch_ebd93: ; ebd93 +Music_TitleScreen_branch_ebd93: note C_, 2 note C_, 1 note C_, 1 @@ -1176,4 +1166,3 @@ Music_TitleScreen_branch_ebd93: ; ebd93 note C_, 4 note C_, 4 endchannel -; ebd9e diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm index fe7ffdd89..56b2d847b 100644 --- a/audio/music/trainervictory.asm +++ b/audio/music/trainervictory.asm @@ -1,10 +1,9 @@ -Music_TrainerVictory: ; ebeab +Music_TrainerVictory: musicheader 3, 1, Music_TrainerVictory_Ch1 musicheader 1, 2, Music_TrainerVictory_Ch2 musicheader 1, 3, Music_TrainerVictory_Ch3 -; ebeb4 -Music_TrainerVictory_Ch1: ; ebeb4 +Music_TrainerVictory_Ch1: tempo 120 volume $77 dutycycle $2 @@ -20,7 +19,7 @@ Music_TrainerVictory_Ch1: ; ebeb4 intensity $b6 note A_, 12 stereopanning $f -Music_TrainerVictory_branch_ebecd: ; ebecd +Music_TrainerVictory_branch_ebecd: intensity $72 callchannel Music_TrainerVictory_branch_ebf11 intensity $51 @@ -48,7 +47,7 @@ Music_TrainerVictory_branch_ebecd: ; ebecd note __, 2 note G_, 2 note A#, 6 -Music_TrainerVictory_branch_ebef2: ; ebef2 +Music_TrainerVictory_branch_ebef2: intensity $72 octave 4 note D_, 2 @@ -60,7 +59,7 @@ Music_TrainerVictory_branch_ebef2: ; ebef2 note A_, 2 octave 4 note D_, 2 -Music_TrainerVictory_branch_ebf01: ; ebf01 +Music_TrainerVictory_branch_ebf01: octave 4 note C#, 2 octave 3 @@ -71,9 +70,8 @@ Music_TrainerVictory_branch_ebf01: ; ebf01 note F#, 2 note G_, 2 loopchannel 0, Music_TrainerVictory_branch_ebecd -; ebf11 -Music_TrainerVictory_branch_ebf11: ; ebf11 +Music_TrainerVictory_branch_ebf11: octave 3 note F#, 2 note __, 2 @@ -84,9 +82,8 @@ Music_TrainerVictory_branch_ebf11: ; ebf11 note E_, 2 note G_, 6 endchannel -; ebf1b -Music_TrainerVictory_Ch2: ; ebf1b +Music_TrainerVictory_Ch2: vibrato $12, $34 dutycycle $3 notetype $8, $d1 @@ -101,7 +98,7 @@ Music_TrainerVictory_Ch2: ; ebf1b intensity $d6 note D_, 12 stereopanning $f0 -Music_TrainerVictory_branch_ebf30: ; ebf30 +Music_TrainerVictory_branch_ebf30: notetype $8, $82 callchannel Music_TrainerVictory_branch_ebf56 note F#, 2 @@ -126,9 +123,8 @@ Music_TrainerVictory_branch_ebf30: ; ebf30 note F#, 16 note E_, 16 loopchannel 0, Music_TrainerVictory_branch_ebf30 -; ebf56 -Music_TrainerVictory_branch_ebf56: ; ebf56 +Music_TrainerVictory_branch_ebf56: octave 4 note D_, 2 note __, 2 @@ -143,9 +139,8 @@ Music_TrainerVictory_branch_ebf56: ; ebf56 octave 4 note E_, 6 endchannel -; ebf64 -Music_TrainerVictory_Ch3: ; ebf64 +Music_TrainerVictory_Ch3: notetype $8, $25 octave 3 note G_, 6 @@ -160,7 +155,7 @@ Music_TrainerVictory_Ch3: ; ebf64 note C#, 2 octave 2 note B_, 2 -Music_TrainerVictory_branch_ebf74: ; ebf74 +Music_TrainerVictory_branch_ebf74: callchannel Music_TrainerVictory_branch_ebfb1 octave 3 note C#, 2 @@ -212,9 +207,8 @@ Music_TrainerVictory_branch_ebf74: ; ebf74 note E_, 2 note C#, 2 loopchannel 0, Music_TrainerVictory_branch_ebf74 -; ebfb1 -Music_TrainerVictory_branch_ebfb1: ; ebfb1 +Music_TrainerVictory_branch_ebfb1: octave 2 note A_, 2 note __, 2 @@ -233,4 +227,3 @@ Music_TrainerVictory_branch_ebfb1: ; ebfb1 octave 2 note B_, 2 endchannel -; ebfc3 diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm index 4f6430260..94c7aec6e 100644 --- a/audio/music/unioncave.asm +++ b/audio/music/unioncave.asm @@ -1,23 +1,22 @@ -Music_UnionCave: ; f5c60 +Music_UnionCave: 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 +Music_UnionCave_Ch1: tempo 160 volume $77 dutycycle $1 tone $0002 vibrato $18, $34 stereopanning $f -Music_UnionCave_branch_f5c7b: ; f5c7b +Music_UnionCave_branch_f5c7b: notetype $c, $b3 -Music_UnionCave_branch_f5c7e: ; f5c7e +Music_UnionCave_branch_f5c7e: callchannel Music_UnionCave_branch_f5ccf loopchannel 4, Music_UnionCave_branch_f5c7e -Music_UnionCave_branch_f5c85: ; f5c85 +Music_UnionCave_branch_f5c85: octave 2 note G#, 2 octave 3 @@ -27,7 +26,7 @@ Music_UnionCave_branch_f5c85: ; f5c85 note E_, 2 note F_, 4 loopchannel 8, Music_UnionCave_branch_f5c85 -Music_UnionCave_branch_f5c91: ; f5c91 +Music_UnionCave_branch_f5c91: octave 2 note A_, 2 octave 3 @@ -64,21 +63,19 @@ Music_UnionCave_branch_f5c91: ; f5c91 callchannel Music_UnionCave_branch_f5ccf tone $0002 loopchannel 0, Music_UnionCave_branch_f5c7b -; f5ccf -Music_UnionCave_branch_f5ccf: ; f5ccf +Music_UnionCave_branch_f5ccf: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 endchannel -; f5cd5 -Music_UnionCave_Ch2: ; f5cd5 +Music_UnionCave_Ch2: dutycycle $3 vibrato $8, $24 -Music_UnionCave_branch_f5cda: ; f5cda +Music_UnionCave_branch_f5cda: notetype $c, $c4 callchannel Music_UnionCave_branch_f5d34 intensity $c5 @@ -135,9 +132,8 @@ Music_UnionCave_branch_f5cda: ; f5cda callchannel Music_UnionCave_branch_f5d52 vibrato $8, $24 loopchannel 0, Music_UnionCave_branch_f5cda -; f5d34 -Music_UnionCave_branch_f5d34: ; f5d34 +Music_UnionCave_branch_f5d34: octave 4 note C_, 4 octave 3 @@ -168,27 +164,25 @@ Music_UnionCave_branch_f5d34: ; f5d34 note C#, 4 note C_, 4 endchannel -; f5d52 -Music_UnionCave_branch_f5d52: ; f5d52 +Music_UnionCave_branch_f5d52: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 endchannel -; f5d58 -Music_UnionCave_Ch3: ; f5d58 +Music_UnionCave_Ch3: notetype $c, $16 stereopanning $f0 -Music_UnionCave_branch_f5d5d: ; f5d5d +Music_UnionCave_branch_f5d5d: note __, 16 loopchannel 7, Music_UnionCave_branch_f5d5d note __, 14 octave 4 note C_, 2 -Music_UnionCave_branch_f5d65: ; f5d65 +Music_UnionCave_branch_f5d65: note __, 2 octave 3 note E_, 2 @@ -200,7 +194,7 @@ Music_UnionCave_branch_f5d65: ; f5d65 octave 4 note C_, 2 loopchannel 4, Music_UnionCave_branch_f5d65 -Music_UnionCave_branch_f5d73: ; f5d73 +Music_UnionCave_branch_f5d73: note __, 2 octave 3 note F_, 2 @@ -224,7 +218,7 @@ Music_UnionCave_branch_f5d73: ; f5d73 octave 3 note B_, 8 note A#, 8 -Music_UnionCave_branch_f5d8d: ; f5d8d +Music_UnionCave_branch_f5d8d: note A_, 4 note G_, 4 note A#, 2 @@ -237,16 +231,15 @@ Music_UnionCave_branch_f5d8d: ; f5d8d note A_, 4 note G_, 4 note A#, 8 -Music_UnionCave_branch_f5d9c: ; f5d9c +Music_UnionCave_branch_f5d9c: note __, 16 loopchannel 4, Music_UnionCave_branch_f5d9c loopchannel 0, Music_UnionCave_branch_f5d5d -; f5da5 -Music_UnionCave_Ch4: ; f5da5 +Music_UnionCave_Ch4: togglenoise $1 notetype $c -Music_UnionCave_branch_f5da9: ; f5da9 +Music_UnionCave_branch_f5da9: stereopanning $f0 note E_, 4 stereopanning $ff @@ -263,4 +256,3 @@ Music_UnionCave_branch_f5da9: ; f5da9 note __, 8 loopchannel 0, Music_UnionCave_branch_f5da9 loopchannel 0, Music_UnionCave_branch_f5da9 ; unused -; f5dc5 diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm index ac4fc3b6d..ec88085e6 100644 --- a/audio/music/vermilioncity.asm +++ b/audio/music/vermilioncity.asm @@ -1,12 +1,11 @@ -Music_VermilionCity: ; eb676 +Music_VermilionCity: musicheader 3, 1, Music_VermilionCity_Ch1 musicheader 1, 2, Music_VermilionCity_Ch2 musicheader 1, 3, Music_VermilionCity_Ch3 -; eb67f db $3 -Music_VermilionCity_Ch1: ; eb680 +Music_VermilionCity_Ch1: stereopanning $f tempo 176 volume $77 @@ -30,7 +29,7 @@ Music_VermilionCity_Ch1: ; eb680 octave 5 note D_, 1 vibrato $10, $23 -Music_VermilionCity_branch_eb6a0: ; eb6a0 +Music_VermilionCity_branch_eb6a0: dutycycle $1 notetype $c, $85 callchannel Music_VermilionCity_branch_eb6f9 @@ -91,9 +90,8 @@ Music_VermilionCity_branch_eb6a0: ; eb6a0 octave 3 note D_, 4 loopchannel 0, Music_VermilionCity_branch_eb6a0 -; eb6f9 -Music_VermilionCity_branch_eb6f9: ; eb6f9 +Music_VermilionCity_branch_eb6f9: octave 3 note C#, 4 note E_, 4 @@ -102,9 +100,8 @@ Music_VermilionCity_branch_eb6f9: ; eb6f9 note E_, 2 note G#, 2 endchannel -; eb701 -Music_VermilionCity_branch_eb701: ; eb701 +Music_VermilionCity_branch_eb701: note D_, 2 note F_, 2 note A_, 2 @@ -116,9 +113,8 @@ Music_VermilionCity_branch_eb701: ; eb701 note A_, 2 note E_, 2 endchannel -; eb70c -Music_VermilionCity_branch_eb70c: ; eb70c +Music_VermilionCity_branch_eb70c: note __, 2 note F#, 2 note A_, 2 @@ -140,9 +136,8 @@ Music_VermilionCity_branch_eb70c: ; eb70c note B_, 2 note G#, 2 endchannel -; eb721 -Music_VermilionCity_Ch2: ; eb721 +Music_VermilionCity_Ch2: stereopanning $ff dutycycle $3 notetype $c, $77 @@ -157,7 +152,7 @@ Music_VermilionCity_Ch2: ; eb721 note E_, 4 note F#, 4 note G#, 4 -Music_VermilionCity_branch_eb735: ; eb735 +Music_VermilionCity_branch_eb735: notetype $c, $97 callchannel Music_VermilionCity_branch_eb768 note G#, 2 @@ -191,9 +186,8 @@ Music_VermilionCity_branch_eb735: ; eb735 octave 5 note E_, 16 loopchannel 0, Music_VermilionCity_branch_eb735 -; eb768 -Music_VermilionCity_branch_eb768: ; eb768 +Music_VermilionCity_branch_eb768: octave 1 note A_, 8 octave 2 @@ -216,9 +210,8 @@ Music_VermilionCity_branch_eb768: ; eb768 octave 1 note A_, 2 endchannel -; eb77e -Music_VermilionCity_branch_eb77e: ; eb77e +Music_VermilionCity_branch_eb77e: note F#, 8 note B_, 8 note A_, 4 @@ -226,9 +219,8 @@ Music_VermilionCity_branch_eb77e: ; eb77e note F#, 4 note E_, 4 endchannel -; eb785 -Music_VermilionCity_Ch3: ; eb785 +Music_VermilionCity_Ch3: stereopanning $f0 vibrato $22, $23 notetype $c, $25 @@ -249,7 +241,7 @@ Music_VermilionCity_Ch3: ; eb785 note D_, 1 octave 2 note B_, 1 -Music_VermilionCity_branch_eb79e: ; eb79e +Music_VermilionCity_branch_eb79e: notetype $c, $22 callchannel Music_VermilionCity_branch_eb7de octave 5 @@ -297,9 +289,8 @@ Music_VermilionCity_branch_eb79e: ; eb79e note E_, 1 note G#, 1 loopchannel 0, Music_VermilionCity_branch_eb79e -; eb7de -Music_VermilionCity_branch_eb7de: ; eb7de +Music_VermilionCity_branch_eb7de: octave 5 note A_, 8 octave 6 @@ -323,9 +314,8 @@ Music_VermilionCity_branch_eb7de: ; eb7de octave 5 note B_, 1 endchannel -; eb7f5 -Music_VermilionCity_branch_eb7f5: ; eb7f5 +Music_VermilionCity_branch_eb7f5: note A_, 1 note __, 1 note A_, 2 @@ -345,4 +335,3 @@ Music_VermilionCity_branch_eb7f5: ; eb7f5 octave 4 note C#, 1 endchannel -; eb808 diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm index dbefa5127..ea914865f 100644 --- a/audio/music/victoryroad.asm +++ b/audio/music/victoryroad.asm @@ -1,21 +1,20 @@ -Music_VictoryRoad: ; f6c72 +Music_VictoryRoad: 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 +Music_VictoryRoad_Ch1: tempo 144 volume $77 stereopanning $f dutycycle $3 tone $0002 notetype $c, $b3 -Music_VictoryRoad_branch_f6c8d: ; f6c8d +Music_VictoryRoad_branch_f6c8d: callchannel Music_VictoryRoad_branch_f6cb9 loopchannel 6, Music_VictoryRoad_branch_f6c8d -Music_VictoryRoad_branch_f6c94: ; f6c94 +Music_VictoryRoad_branch_f6c94: intensity $b2 octave 2 note A_, 1 @@ -37,13 +36,12 @@ Music_VictoryRoad_branch_f6c94: ; f6c94 octave 3 note G#, 3 loopchannel 2, Music_VictoryRoad_branch_f6c94 -Music_VictoryRoad_branch_f6cae: ; f6cae +Music_VictoryRoad_branch_f6cae: callchannel Music_VictoryRoad_branch_f6cb9 loopchannel 2, Music_VictoryRoad_branch_f6cae loopchannel 0, Music_VictoryRoad_branch_f6c8d -; f6cb9 -Music_VictoryRoad_branch_f6cb9: ; f6cb9 +Music_VictoryRoad_branch_f6cb9: intensity $b2 octave 2 note G_, 1 @@ -63,12 +61,11 @@ Music_VictoryRoad_branch_f6cb9: ; f6cb9 octave 3 note F#, 3 endchannel -; f6cce -Music_VictoryRoad_Ch2: ; f6cce +Music_VictoryRoad_Ch2: dutycycle $3 vibrato $10, $24 -Music_VictoryRoad_branch_f6cd3: ; f6cd3 +Music_VictoryRoad_branch_f6cd3: notetype $c, $c2 callchannel Music_VictoryRoad_branch_f6d1e note __, 2 @@ -119,9 +116,8 @@ Music_VictoryRoad_branch_f6cd3: ; f6cd3 note C#, 1 note D_, 16 loopchannel 0, Music_VictoryRoad_branch_f6cd3 -; f6d1e -Music_VictoryRoad_branch_f6d1e: ; f6d1e +Music_VictoryRoad_branch_f6d1e: octave 3 note E_, 1 note __, 1 @@ -136,15 +132,14 @@ Music_VictoryRoad_branch_f6d1e: ; f6d1e note A_, 1 note A_, 1 endchannel -; f6d2c -Music_VictoryRoad_Ch3: ; f6d2c +Music_VictoryRoad_Ch3: stereopanning $f0 notetype $c, $28 -Music_VictoryRoad_branch_f6d31: ; f6d31 +Music_VictoryRoad_branch_f6d31: callchannel Music_VictoryRoad_branch_f6d52 loopchannel 6, Music_VictoryRoad_branch_f6d31 -Music_VictoryRoad_branch_f6d38: ; f6d38 +Music_VictoryRoad_branch_f6d38: note D_, 1 note __, 1 note B_, 1 @@ -157,13 +152,12 @@ Music_VictoryRoad_branch_f6d38: ; f6d38 note D_, 1 note B_, 3 loopchannel 2, Music_VictoryRoad_branch_f6d38 -Music_VictoryRoad_branch_f6d47: ; f6d47 +Music_VictoryRoad_branch_f6d47: callchannel Music_VictoryRoad_branch_f6d52 loopchannel 2, Music_VictoryRoad_branch_f6d47 loopchannel 0, Music_VictoryRoad_branch_f6d31 -; f6d52 -Music_VictoryRoad_branch_f6d52: ; f6d52 +Music_VictoryRoad_branch_f6d52: octave 3 note C_, 1 note __, 1 @@ -177,12 +171,11 @@ Music_VictoryRoad_branch_f6d52: ; f6d52 note C_, 1 note A_, 3 endchannel -; f6d5f -Music_VictoryRoad_Ch4: ; f6d5f +Music_VictoryRoad_Ch4: togglenoise $0 notetype $c -Music_VictoryRoad_branch_f6d63: ; f6d63 +Music_VictoryRoad_branch_f6d63: note D_, 2 note D_, 2 note D#, 1 @@ -202,4 +195,3 @@ Music_VictoryRoad_branch_f6d63: ; f6d63 note D_, 2 note D#, 1 loopchannel 0, Music_VictoryRoad_branch_f6d63 -; f6d79 diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm index 6ccb874f1..a8a89c3c2 100644 --- a/audio/music/violetcity.asm +++ b/audio/music/violetcity.asm @@ -1,11 +1,10 @@ -Music_VioletCity: ; f0000 +Music_VioletCity: 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 +Music_VioletCity_Ch1: tempo 164 volume $77 vibrato $12, $25 @@ -65,7 +64,7 @@ Music_VioletCity_Ch1: ; f000c octave 3 note C#, 12 note __, 8 -Music_VioletCity_branch_f0056: ; f0056 +Music_VioletCity_branch_f0056: notetype $6, $95 note __, 4 octave 2 @@ -296,9 +295,8 @@ Music_VioletCity_branch_f0056: ; f0056 note C#, 4 note __, 4 loopchannel 0, Music_VioletCity_branch_f0056 -; f0162 -Music_VioletCity_Ch2: ; f0162 +Music_VioletCity_Ch2: vibrato $12, $24 dutycycle $2 notetype $c, $c7 @@ -349,7 +347,7 @@ Music_VioletCity_Ch2: ; f0162 note __, 2 note D#, 1 note E_, 1 -Music_VioletCity_branch_f0199: ; f0199 +Music_VioletCity_branch_f0199: intensity $b7 note F#, 4 note __, 2 @@ -503,9 +501,8 @@ Music_VioletCity_branch_f0199: ; f0199 note D#, 1 note E_, 1 loopchannel 0, Music_VioletCity_branch_f0199 -; f0247 -Music_VioletCity_Ch3: ; f0247 +Music_VioletCity_Ch3: notetype $c, $25 note __, 16 note __, 6 @@ -530,7 +527,7 @@ Music_VioletCity_Ch3: ; f0247 note F#, 2 octave 2 note A#, 2 -Music_VioletCity_branch_f0261: ; f0261 +Music_VioletCity_branch_f0261: notetype $c, $25 note B_, 1 note __, 5 @@ -692,9 +689,8 @@ Music_VioletCity_branch_f0261: ; f0261 octave 2 note A#, 4 loopchannel 0, Music_VioletCity_branch_f0261 -; f0311 -Music_VioletCity_branch_f0311: ; f0311 +Music_VioletCity_branch_f0311: note G_, 2 note __, 10 note G_, 2 @@ -708,9 +704,8 @@ Music_VioletCity_branch_f0311: ; f0311 octave 2 note A_, 4 endchannel -; f031e -Music_VioletCity_Ch4: ; f031e +Music_VioletCity_Ch4: togglenoise $3 notetype $c note D#, 2 @@ -729,7 +724,7 @@ Music_VioletCity_Ch4: ; f031e note D_, 2 note C_, 8 note D#, 2 -Music_VioletCity_branch_f0338: ; f0338 +Music_VioletCity_branch_f0338: callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a @@ -747,9 +742,8 @@ Music_VioletCity_branch_f0338: ; f0338 callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a loopchannel 0, Music_VioletCity_branch_f0338 -; f036c -Music_VioletCity_branch_f036c: ; f036c +Music_VioletCity_branch_f036c: note D_, 1 note D_, 1 note D#, 1 @@ -764,9 +758,8 @@ Music_VioletCity_branch_f036c: ; f036c note G_, 1 note G_, 1 endchannel -; f037a -Music_VioletCity_branch_f037a: ; f037a +Music_VioletCity_branch_f037a: note D#, 2 note G_, 1 note G_, 1 @@ -779,4 +772,3 @@ Music_VioletCity_branch_f037a: ; f037a note D_, 2 note D#, 2 endchannel -; f0386 diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm index 7196882cf..ea38a0e6d 100644 --- a/audio/music/viridiancity.asm +++ b/audio/music/viridiancity.asm @@ -1,11 +1,10 @@ -Music_ViridianCity: ; f4000 +Music_ViridianCity: 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 +Music_ViridianCity_Ch1: tempo 157 volume $77 stereopanning $f @@ -42,7 +41,7 @@ Music_ViridianCity_Ch1: ; f400c note __, 4 note G_, 8 note __, 4 -Music_ViridianCity_branch_f4039: ; f4039 +Music_ViridianCity_branch_f4039: callchannel Music_ViridianCity_branch_f40c5 note __, 4 callchannel Music_ViridianCity_branch_f40c5 @@ -170,9 +169,8 @@ Music_ViridianCity_branch_f4039: ; f4039 note G_, 8 note A#, 4 loopchannel 0, Music_ViridianCity_branch_f4039 -; f40c5 -Music_ViridianCity_branch_f40c5: ; f40c5 +Music_ViridianCity_branch_f40c5: octave 3 note A_, 1 note __, 3 @@ -247,9 +245,8 @@ Music_ViridianCity_branch_f40c5: ; f40c5 note __, 4 note G_, 8 endchannel -; f410f -Music_ViridianCity_branch_f410f: ; f410f +Music_ViridianCity_branch_f410f: octave 3 note B_, 2 note D_, 2 @@ -272,9 +269,8 @@ Music_ViridianCity_branch_f410f: ; f410f note G_, 1 note __, 1 endchannel -; f4125 -Music_ViridianCity_Ch2: ; f4125 +Music_ViridianCity_Ch2: vibrato $10, $46 dutycycle $1 notetype $c, $b7 @@ -308,7 +304,7 @@ Music_ViridianCity_Ch2: ; f4125 note __, 4 note E_, 8 note __, 4 -Music_ViridianCity_branch_f414c: ; f414c +Music_ViridianCity_branch_f414c: callchannel Music_ViridianCity_branch_f41c0 note __, 4 callchannel Music_ViridianCity_branch_f41c0 @@ -406,9 +402,8 @@ Music_ViridianCity_branch_f414c: ; f414c octave 1 note A_, 4 loopchannel 0, Music_ViridianCity_branch_f414c -; f41c0 -Music_ViridianCity_branch_f41c0: ; f41c0 +Music_ViridianCity_branch_f41c0: octave 2 note D_, 4 note __, 2 @@ -474,9 +469,8 @@ Music_ViridianCity_branch_f41c0: ; f41c0 note __, 4 note E_, 8 endchannel -; f4201 -Music_ViridianCity_branch_f4201: ; f4201 +Music_ViridianCity_branch_f4201: note G_, 4 note __, 2 octave 3 @@ -487,9 +481,8 @@ Music_ViridianCity_branch_f4201: ; f4201 note F_, 2 note F#, 2 endchannel -; f420b -Music_ViridianCity_branch_f420b: ; f420b +Music_ViridianCity_branch_f420b: note F#, 4 note __, 2 octave 3 @@ -500,9 +493,8 @@ Music_ViridianCity_branch_f420b: ; f420b note E_, 2 note F_, 2 endchannel -; f4215 -Music_ViridianCity_branch_f4215: ; f4215 +Music_ViridianCity_branch_f4215: octave 2 note E_, 4 note __, 2 @@ -512,9 +504,8 @@ Music_ViridianCity_branch_f4215: ; f4215 note D_, 2 note D#, 2 endchannel -; f421e -Music_ViridianCity_Ch3: ; f421e +Music_ViridianCity_Ch3: vibrato $12, $24 notetype $c, $13 stereopanning $ff @@ -550,7 +541,7 @@ Music_ViridianCity_Ch3: ; f421e note D_, 8 note F#, 2 note G_, 2 -Music_ViridianCity_branch_f4246: ; f4246 +Music_ViridianCity_branch_f4246: intensity $13 callchannel Music_ViridianCity_branch_f42a2 octave 5 @@ -632,9 +623,8 @@ Music_ViridianCity_branch_f4246: ; f4246 note D_, 8 note E_, 4 loopchannel 0, Music_ViridianCity_branch_f4246 -; f42a2 -Music_ViridianCity_branch_f42a2: ; f42a2 +Music_ViridianCity_branch_f42a2: octave 5 note A_, 2 note __, 2 @@ -696,14 +686,13 @@ Music_ViridianCity_branch_f42a2: ; f42a2 note __, 4 note D_, 8 endchannel -; f42df -Music_ViridianCity_Ch4: ; f42df +Music_ViridianCity_Ch4: togglenoise $3 notetype $c callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f432c -Music_ViridianCity_branch_f42e9: ; f42e9 +Music_ViridianCity_branch_f42e9: callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f431d @@ -721,9 +710,8 @@ Music_ViridianCity_branch_f42e9: ; f42e9 callchannel Music_ViridianCity_branch_f433b callchannel Music_ViridianCity_branch_f433b loopchannel 0, Music_ViridianCity_branch_f42e9 -; f431d -Music_ViridianCity_branch_f431d: ; f431d +Music_ViridianCity_branch_f431d: note E_, 2 note E_, 2 note D_, 2 @@ -739,9 +727,8 @@ Music_ViridianCity_branch_f431d: ; f431d note E_, 2 note F#, 2 endchannel -; f432c -Music_ViridianCity_branch_f432c: ; f432c +Music_ViridianCity_branch_f432c: note E_, 2 note E_, 2 note D_, 2 @@ -757,9 +744,8 @@ Music_ViridianCity_branch_f432c: ; f432c note A#, 2 note A#, 2 endchannel -; f433b -Music_ViridianCity_branch_f433b: ; f433b +Music_ViridianCity_branch_f433b: note D#, 2 note F#, 2 note D_, 2 @@ -776,9 +762,8 @@ Music_ViridianCity_branch_f433b: ; f433b note D_, 2 note D#, 2 endchannel -; f434b -Music_ViridianCity_branch_f434b: ; f434b +Music_ViridianCity_branch_f434b: note D#, 2 note F#, 2 note D_, 2 @@ -795,4 +780,3 @@ Music_ViridianCity_branch_f434b: ; f434b note D_, 2 note F#, 2 endchannel -; f435b diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm index fc95e111e..f1438dc69 100644 --- a/audio/music/wildpokemonvictory.asm +++ b/audio/music/wildpokemonvictory.asm @@ -1,10 +1,9 @@ -Music_WildPokemonVictory: ; f4518 +Music_WildPokemonVictory: musicheader 3, 1, Music_WildPokemonVictory_Ch1 musicheader 1, 2, Music_WildPokemonVictory_Ch2 musicheader 1, 3, Music_WildPokemonVictory_Ch3 -; f4521 -Music_WildPokemonVictory_Ch1: ; f4521 +Music_WildPokemonVictory_Ch1: tempo 126 volume $77 dutycycle $3 @@ -17,9 +16,9 @@ Music_WildPokemonVictory_Ch1: ; f4521 note F#, 1 intensity $b6 note E_, 12 -Music_SuccessfulCapture_branch_f4536: ; f4536 +Music_SuccessfulCapture_branch_f4536: stereopanning $f -Music_WildPokemonVictory_branch_f4538: ; f4538 +Music_WildPokemonVictory_branch_f4538: callchannel Music_WildPokemonVictory_branch_f455c note F#, 2 note F#, 2 @@ -41,9 +40,8 @@ Music_WildPokemonVictory_branch_f4538: ; f4538 octave 3 note F#, 4 loopchannel 0, Music_WildPokemonVictory_branch_f4538 -; f455c -Music_WildPokemonVictory_branch_f455c: ; f455c +Music_WildPokemonVictory_branch_f455c: intensity $71 octave 3 note G#, 1 @@ -68,9 +66,8 @@ Music_WildPokemonVictory_branch_f455c: ; f455c note E_, 2 note A_, 2 endchannel -; f4575 -Music_WildPokemonVictory_Ch2: ; f4575 +Music_WildPokemonVictory_Ch2: vibrato $12, $24 dutycycle $2 notetype $c, $d1 @@ -81,9 +78,9 @@ Music_WildPokemonVictory_Ch2: ; f4575 note A_, 1 intensity $d6 note B_, 12 -Music_SuccessfulCapture_branch_f4585: ; f4585 +Music_SuccessfulCapture_branch_f4585: stereopanning $f0 -Music_WildPokemonVictory_branch_f4587: ; f4587 +Music_WildPokemonVictory_branch_f4587: callchannel Music_WildPokemonVictory_branch_f45b5 octave 4 note B_, 2 @@ -115,9 +112,8 @@ Music_WildPokemonVictory_branch_f4587: ; f4587 note F#, 1 note A_, 1 loopchannel 0, Music_WildPokemonVictory_branch_f4587 -; f45b5 -Music_WildPokemonVictory_branch_f45b5: ; f45b5 +Music_WildPokemonVictory_branch_f45b5: intensity $81 octave 4 note B_, 2 @@ -132,9 +128,8 @@ Music_WildPokemonVictory_branch_f45b5: ; f45b5 note C#, 2 note C#, 4 endchannel -; f45c4 -Music_WildPokemonVictory_Ch3: ; f45c4 +Music_WildPokemonVictory_Ch3: notetype $c, $20 note __, 6 octave 6 @@ -144,8 +139,8 @@ Music_WildPokemonVictory_Ch3: ; f45c4 note __, 3 note E_, 1 note __, 3 -Music_SuccessfulCapture_branch_f45cf: ; f45cf -Music_WildPokemonVictory_branch_f45cf: ; f45cf +Music_SuccessfulCapture_branch_f45cf: +Music_WildPokemonVictory_branch_f45cf: callchannel Music_WildPokemonVictory_branch_f45f4 note D#, 2 note C#, 2 @@ -170,9 +165,8 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf octave 2 note B_, 4 loopchannel 0, Music_WildPokemonVictory_branch_f45cf -; f45f4 -Music_WildPokemonVictory_branch_f45f4: ; f45f4 +Music_WildPokemonVictory_branch_f45f4: intensity $25 octave 3 note E_, 2 @@ -186,4 +180,3 @@ Music_WildPokemonVictory_branch_f45f4: ; f45f4 note __, 4 note C#, 2 endchannel -; f4602 diff --git a/audio/music_pointers.asm b/audio/music_pointers.asm index eb6869896..192962735 100644 --- a/audio/music_pointers.asm +++ b/audio/music_pointers.asm @@ -1,112 +1,108 @@ ; See song sections in audio.asm. -Music: ; e906e +Music: ; entries correspond to MUSIC_* constants - - dba Music_Nothing ; 0xe91a3 - dba Music_TitleScreen ; 0xeb808 - dba Music_Route1 ; 0xec000 - dba Music_Route3 ; 0xec2ca - dba Music_Route12 ; 0xec506 - dba Music_MagnetTrain ; 0xef5f0 - dba Music_KantoGymBattle ; 0xec720 - dba Music_KantoTrainerBattle ; 0xec9fa - dba Music_KantoWildBattle ; 0xed06d - dba Music_PokemonCenter ; 0xed5c6 - dba Music_LookHiker ; 0xf7411 - dba Music_LookLass ; 0xed79b - dba Music_LookOfficer ; 0xed82d - dba Music_HealPokemon ; 0xf0697 - dba Music_LavenderTown ; 0xef72f - dba Music_Route2 ; 0xed8dd - dba Music_MtMoon ; 0xedb29 - dba Music_ShowMeAround ; 0xedbd8 - dba Music_GameCorner ; 0xedd6d - dba Music_Bicycle ; 0xee119 - dba Music_HallOfFame ; 0xf05bf - dba Music_ViridianCity ; 0xf4000 - dba Music_CeladonCity ; 0xf435b - dba Music_TrainerVictory ; 0xebeab - dba Music_WildPokemonVictory ; 0xf4518 - dba Music_GymLeaderVictory ; 0xf462c - dba Music_MtMoonSquare ; 0xf4815 - dba Music_Gym ; 0xf48ae - dba Music_PalletTown ; 0xf4b0c - dba Music_ProfOaksPokemonTalk ; 0xf4c9f - dba Music_ProfOak ; 0xf4dea - dba Music_LookRival ; 0xf4f79 - dba Music_AfterTheRivalFight ; 0xf5127 - dba Music_Surf ; 0xf518a - dba Music_Evolution ; 0xf06e1 - dba Music_NationalPark ; 0xf54e8 - dba Music_Credits ; 0x1f31c - dba Music_AzaleaTown ; 0xf57e8 - dba Music_CherrygroveCity ; 0xf5b03 - dba Music_LookKimonoGirl ; 0xf79b8 - dba Music_UnionCave ; 0xf5c60 - dba Music_JohtoWildBattle ; 0xf5dc5 - dba Music_JohtoTrainerBattle ; 0xf6096 - dba Music_Route30 ; 0xefc01 - dba Music_EcruteakCity ; 0xef2d0 - dba Music_VioletCity ; 0xf0000 - dba Music_JohtoGymBattle ; 0xea50d - dba Music_ChampionBattle ; 0xea9c1 - dba Music_RivalBattle ; 0xe974f - dba Music_RocketBattle ; 0xe9b6f - dba Music_ElmsLab ; 0xea040 - dba Music_DarkCave ; 0xea2be - dba Music_Route29 ; 0xf0386 - dba Music_Route36 ; 0xe94e9 - dba Music_SSAqua ; 0xead99 - dba Music_LookYoungster ; 0xf66c3 - dba Music_LookBeauty ; 0xeee3e - dba Music_LookRocket ; 0xf74a2 - dba Music_LookPokemaniac ; 0xebde1 - dba Music_LookSage ; 0xee35e - dba Music_NewBarkTown ; 0xeb2d3 - dba Music_GoldenrodCity ; 0xeb453 - dba Music_VermilionCity ; 0xeb676 - dba Music_PokemonChannel ; 0xee45f - dba Music_PokeFluteChannel ; 0xf7b13 - dba Music_TinTower ; 0xf6811 - dba Music_SproutTower ; 0xf6974 - dba Music_BurnedTower ; 0xf6a99 - dba Music_Lighthouse ; 0xee569 - dba Music_LakeOfRage ; 0xee6c5 - dba Music_IndigoPlateau ; 0xee852 - dba Music_Route37 ; 0xee94b - dba Music_RocketHideout ; 0xeeb75 - dba Music_DragonsDen ; 0xeece8 - dba Music_JohtoWildBattleNight ; 0xf605c - dba Music_RuinsOfAlphRadio ; 0xeedcb - dba Music_SuccessfulCapture ; 0xf4602 - dba Music_Route26 ; 0xeefb2 - dba Music_Mom ; 0xf6bf2 - dba Music_VictoryRoad ; 0xf6c72 - dba Music_PokemonLullaby ; 0xf6d79 - dba Music_PokemonMarch ; 0xf6e23 - dba Music_GoldSilverOpening ; 0xf7055 - dba Music_GoldSilverOpening2 ; 0xf7308 - dba Music_MainMenu ; 0xf78fd - dba Music_RuinsOfAlphInterior ; 0xebd9e - dba Music_RocketTheme ; 0xf766d - dba Music_DancingHall ; 0xef9bc - dba Music_ContestResults ; 0xefb3e - dba Music_BugCatchingContest ; 0xf7c16 - dba Music_LakeOfRageRocketRadio ; 0xef5b1 - dba Music_Printer ; 0xf07fd - dba Music_PostCredits ; 0xcfd9e - -; Crystal adds the following songs: - - dba Music_Clair ; 0x1fa8d - dba Music_MobileAdapterMenu ; 0x17801f - dba Music_MobileAdapter ; 0x1fc87 - dba Music_BuenasPassword ; 0x178153 - dba Music_LookMysticalMan ; 0x17843b - dba Music_CrystalOpening ; 0x1786e8 - dba Music_BattleTowerTheme ; 0x178889 - dba Music_SuicuneBattle ; 0x178b81 - dba Music_BattleTowerLobby ; 0x17948b - dba Music_MobileCenter ; 0x17961d -; e91a3 + dba Music_Nothing + dba Music_TitleScreen + dba Music_Route1 + dba Music_Route3 + dba Music_Route12 + dba Music_MagnetTrain + dba Music_KantoGymBattle + dba Music_KantoTrainerBattle + dba Music_KantoWildBattle + dba Music_PokemonCenter + dba Music_LookHiker + dba Music_LookLass + dba Music_LookOfficer + dba Music_HealPokemon + dba Music_LavenderTown + dba Music_Route2 + dba Music_MtMoon + dba Music_ShowMeAround + dba Music_GameCorner + dba Music_Bicycle + dba Music_HallOfFame + dba Music_ViridianCity + dba Music_CeladonCity + dba Music_TrainerVictory + dba Music_WildPokemonVictory + dba Music_GymLeaderVictory + dba Music_MtMoonSquare + dba Music_Gym + dba Music_PalletTown + dba Music_ProfOaksPokemonTalk + dba Music_ProfOak + dba Music_LookRival + dba Music_AfterTheRivalFight + dba Music_Surf + dba Music_Evolution + dba Music_NationalPark + dba Music_Credits + dba Music_AzaleaTown + dba Music_CherrygroveCity + dba Music_LookKimonoGirl + dba Music_UnionCave + dba Music_JohtoWildBattle + dba Music_JohtoTrainerBattle + dba Music_Route30 + dba Music_EcruteakCity + dba Music_VioletCity + dba Music_JohtoGymBattle + dba Music_ChampionBattle + dba Music_RivalBattle + dba Music_RocketBattle + dba Music_ElmsLab + dba Music_DarkCave + dba Music_Route29 + dba Music_Route36 + dba Music_SSAqua + dba Music_LookYoungster + dba Music_LookBeauty + dba Music_LookRocket + dba Music_LookPokemaniac + dba Music_LookSage + dba Music_NewBarkTown + dba Music_GoldenrodCity + dba Music_VermilionCity + dba Music_PokemonChannel + dba Music_PokeFluteChannel + dba Music_TinTower + dba Music_SproutTower + dba Music_BurnedTower + dba Music_Lighthouse + dba Music_LakeOfRage + dba Music_IndigoPlateau + dba Music_Route37 + dba Music_RocketHideout + dba Music_DragonsDen + dba Music_JohtoWildBattleNight + dba Music_RuinsOfAlphRadio + dba Music_SuccessfulCapture + dba Music_Route26 + dba Music_Mom + dba Music_VictoryRoad + dba Music_PokemonLullaby + dba Music_PokemonMarch + dba Music_GoldSilverOpening + dba Music_GoldSilverOpening2 + dba Music_MainMenu + dba Music_RuinsOfAlphInterior + dba Music_RocketTheme + dba Music_DancingHall + dba Music_ContestResults + dba Music_BugCatchingContest + dba Music_LakeOfRageRocketRadio + dba Music_Printer + dba Music_PostCredits +; new to Crystal + dba Music_Clair + dba Music_MobileAdapterMenu + dba Music_MobileAdapter + dba Music_BuenasPassword + dba Music_LookMysticalMan + dba Music_CrystalOpening + dba Music_BattleTowerTheme + dba Music_SuicuneBattle + dba Music_BattleTowerLobby + dba Music_MobileCenter diff --git a/audio/notes.asm b/audio/notes.asm index 543672a4a..eeb84959b 100644 --- a/audio/notes.asm +++ b/audio/notes.asm @@ -1,4 +1,4 @@ -FrequencyTable: ; e8d80 +FrequencyTable: dw 0 ; __ dw $f82c ; C_ dw $f89d ; C# @@ -24,4 +24,3 @@ FrequencyTable: ; e8d80 dw $fdac ; A_ dw $fdcd ; A# dw $fded ; B_ -; e8db2 diff --git a/audio/sfx.asm b/audio/sfx.asm index 864e56558..9da38234f 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -1,143 +1,110 @@ -Sfx_PokeballsPlacedOnTable: ; f0941 +Sfx_PokeballsPlacedOnTable: musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5 -; f0944 -Sfx_BallWobble: ; f0944 +Sfx_BallWobble: musicheader 1, 5, Sfx_BallWobble_Ch5 -; f0947 -Sfx_Potion: ; f0947 +Sfx_Potion: musicheader 1, 5, Sfx_Potion_Ch5 -; f094a -Sfx_FullHeal: ; f094a +Sfx_FullHeal: musicheader 1, 5, Sfx_FullHeal_Ch5 -; f094d -Sfx_Menu: ; f094d +Sfx_Menu: musicheader 1, 8, Sfx_Menu_Ch8 -; f0950 -Sfx_ReadText2: ; f0950 -Sfx_ReadText: ; f0950 +Sfx_ReadText2: +Sfx_ReadText: musicheader 1, 5, Sfx_ReadText2_Ch5 -; f0953 -Sfx_Poison: ; f0953 +Sfx_Poison: musicheader 1, 5, Sfx_Poison_Ch5 -; f0956 -Sfx_GotSafariBalls: ; f0956 +Sfx_GotSafariBalls: musicheader 1, 5, Sfx_GotSafariBalls_Ch5 -; f0959 -Sfx_BootPc: ; f0959 +Sfx_BootPc: musicheader 1, 5, Sfx_BootPc_Ch5 -; f095c -Sfx_ShutDownPc: ; f095c +Sfx_ShutDownPc: musicheader 1, 5, Sfx_ShutDownPc_Ch5 -; f095f -Sfx_ChoosePcOption: ; f095f +Sfx_ChoosePcOption: musicheader 1, 5, Sfx_ChoosePcOption_Ch5 -; f0962 -Sfx_EscapeRope: ; f0962 +Sfx_EscapeRope: musicheader 1, 5, Sfx_EscapeRope_Ch5 -; f0965 -Sfx_PushButton: ; f0965 +Sfx_PushButton: musicheader 1, 5, Sfx_PushButton_Ch5 -; f0968 -Sfx_SecondPartOfItemfinder: ; f0968 +Sfx_SecondPartOfItemfinder: musicheader 1, 5, Sfx_SecondPartOfItemfinder_Ch5 -; f096b -Sfx_WarpTo: ; f096b +Sfx_WarpTo: musicheader 1, 5, Sfx_WarpTo_Ch5 -; f096e -Sfx_WarpFrom: ; f096e +Sfx_WarpFrom: musicheader 1, 5, Sfx_WarpFrom_Ch5 -; f0971 -Sfx_ChangeDexMode: ; f0971 +Sfx_ChangeDexMode: musicheader 1, 5, Sfx_ChangeDexMode_Ch5 -; f0974 -Sfx_JumpOverLedge: ; f0974 +Sfx_JumpOverLedge: musicheader 1, 5, Sfx_JumpOverLedge_Ch5 -; f0977 -Sfx_GrassRustle: ; f0977 +Sfx_GrassRustle: musicheader 1, 8, Sfx_GrassRustle_Ch8 -; f097a -Sfx_Fly: ; f097a +Sfx_Fly: musicheader 1, 8, Sfx_Fly_Ch8 -; f097d -Sfx_Wrong: ; f097d +Sfx_Wrong: musicheader 2, 5, Sfx_Wrong_Ch5 musicheader 1, 6, Sfx_Wrong_Ch6 -; f0983 -Sfx_Squeak: ; f0983 +Sfx_Squeak: musicheader 1, 5, Sfx_Squeak_Ch5 -; f0986 -Sfx_Strength: ; f0986 +Sfx_Strength: musicheader 1, 8, Sfx_Strength_Ch8 -; f0989 -Sfx_Boat: ; f0989 +Sfx_Boat: musicheader 2, 5, Sfx_Boat_Ch5 musicheader 1, 6, Sfx_Boat_Ch6 -; f098f -Sfx_WallOpen: ; f098f +Sfx_WallOpen: musicheader 1, 5, Sfx_WallOpen_Ch5 -; f0992 -Sfx_PlacePuzzlePieceDown: ; f0992 +Sfx_PlacePuzzlePieceDown: musicheader 1, 8, Sfx_PlacePuzzlePieceDown_Ch8 -; f0995 -Sfx_EnterDoor: ; f0995 +Sfx_EnterDoor: musicheader 1, 8, Sfx_EnterDoor_Ch8 -; f0998 -Sfx_SwitchPokemon: ; f0998 +Sfx_SwitchPokemon: musicheader 2, 5, Sfx_SwitchPokemon_Ch5 musicheader 1, 6, Sfx_SwitchPokemon_Ch6 -; f099e -Sfx_Tally: ; f099e +Sfx_Tally: musicheader 2, 5, Sfx_Tally_Ch5 musicheader 1, 6, Sfx_Tally_Ch6 -; f09a4 -Sfx_Transaction: ; f09a4 +Sfx_Transaction: musicheader 2, 5, Sfx_Transaction_Ch5 musicheader 1, 6, Sfx_Transaction_Ch6 -; f09aa -Sfx_Bump: ; f09aa +Sfx_Bump: musicheader 1, 5, Sfx_Bump_Ch5 -; f09ad -Sfx_ExitBuilding: ; f09ad +Sfx_ExitBuilding: musicheader 1, 8, Sfx_ExitBuilding_Ch8 -; f09b0 -Sfx_Save: ; f09b0 +Sfx_Save: musicheader 2, 5, Sfx_Save_Ch5 musicheader 1, 6, Sfx_Save_Ch6 -; f09b6 -Sfx_Save_Ch5: ; f09b6 +Sfx_Save_Ch5: dutycycle $2 sound __, 3, $f1, $0700 sound __, 2, $e1, $0600 @@ -147,9 +114,8 @@ Sfx_Save_Ch5: ; f09b6 sound __, 3, $e1, $07c0 sound __, 16, $f2, $07e0 endchannel -; f09d5 -Sfx_Save_Ch6: ; f09d5 +Sfx_Save_Ch6: dutycycle $2 sound __, 3, $8, 0 sound __, 3, $a1, $0701 @@ -160,341 +126,269 @@ Sfx_Save_Ch6: ; f09d5 sound __, 3, $91, $07c1 sound __, 16, $d2, $07e1 endchannel -; f09f8 -Sfx_Pokeflute: ; f09f8 +Sfx_Pokeflute: musicheader 1, 7, Sfx_Pokeflute_Ch7 -; f09fb -Sfx_ElevatorEnd: ; f09fb +Sfx_ElevatorEnd: musicheader 1, 5, Sfx_ElevatorEnd_Ch5 -; f09fe -Sfx_ThrowBall: ; f09fe +Sfx_ThrowBall: musicheader 2, 5, Sfx_ThrowBall_Ch5 musicheader 1, 6, Sfx_ThrowBall_Ch6 -; f0a04 -Sfx_BallPoof: ; f0a04 +Sfx_BallPoof: musicheader 2, 5, Sfx_BallPoof_Ch5 musicheader 1, 8, Sfx_BallPoof_Ch8 -; f0a0a -Sfx_Unknown3A: ; f0a0a +Sfx_Unknown3A: musicheader 2, 5, Sfx_Unknown3A_Ch5 musicheader 1, 8, Sfx_Unknown3A_Ch8 -; f0a10 -Sfx_Run: ; f0a10 +Sfx_Run: musicheader 1, 8, Sfx_Run_Ch8 -; f0a13 -Sfx_SlotMachineStart: ; f0a13 +Sfx_SlotMachineStart: musicheader 2, 5, Sfx_SlotMachineStart_Ch5 musicheader 1, 6, Sfx_SlotMachineStart_Ch6 -; f0a19 -Sfx_Call: ; f0a19 +Sfx_Call: musicheader 1, 5, Sfx_Call_Ch5 -; f0a1c -Sfx_Unknown60: ; f0a1c +Sfx_Unknown60: musicheader 1, 8, Sfx_Unknown60_Ch8 -; f0a1f -Sfx_Unknown61: ; f0a1f +Sfx_Unknown61: musicheader 1, 8, Sfx_Unknown61_Ch8 -; f0a22 -Sfx_SwitchPockets: ; f0a22 +Sfx_SwitchPockets: musicheader 1, 8, Sfx_SwitchPockets_Ch8 -; f0a25 -Sfx_Unknown63: ; f0a25 +Sfx_Unknown63: musicheader 1, 8, Sfx_Unknown63_Ch8 -; f0a28 -Sfx_Burn: ; f0a28 +Sfx_Burn: musicheader 1, 8, Sfx_Burn_Ch8 -; f0a2b -Sfx_TitleScreenEntrance: ; f0a2b +Sfx_TitleScreenEntrance: musicheader 1, 8, Sfx_TitleScreenEntrance_Ch8 -; f0a2e -Sfx_Unknown66: ; f0a2e +Sfx_Unknown66: musicheader 1, 5, Sfx_Unknown66_Ch5 -; f0a31 -Sfx_GetCoinFromSlots: ; f0a31 +Sfx_GetCoinFromSlots: musicheader 1, 5, Sfx_GetCoinFromSlots_Ch5 -; f0a34 -Sfx_PayDay: ; f0a34 +Sfx_PayDay: musicheader 2, 5, Sfx_PayDay_Ch5 musicheader 1, 6, Sfx_PayDay_Ch6 -; f0a3a -Sfx_Metronome: ; f0a3a +Sfx_Metronome: musicheader 1, 5, Sfx_Metronome_Ch5 -; f0a3d -Sfx_Peck: ; f0a3d +Sfx_Peck: musicheader 1, 8, Sfx_Peck_Ch8 -; f0a40 -Sfx_Kinesis: ; f0a40 +Sfx_Kinesis: musicheader 1, 5, Sfx_Kinesis_Ch5 -; f0a43 -Sfx_Lick: ; f0a43 +Sfx_Lick: musicheader 1, 5, Sfx_Lick_Ch5 -; f0a46 -Sfx_Pound: ; f0a46 +Sfx_Pound: musicheader 1, 8, Sfx_Pound_Ch8 -; f0a49 -Sfx_MovePuzzlePiece: ; f0a49 +Sfx_MovePuzzlePiece: musicheader 1, 8, Sfx_MovePuzzlePiece_Ch8 -; f0a4c -Sfx_CometPunch: ; f0a4c +Sfx_CometPunch: musicheader 1, 8, Sfx_CometPunch_Ch8 -; f0a4f -Sfx_MegaPunch: ; f0a4f +Sfx_MegaPunch: musicheader 1, 8, Sfx_MegaPunch_Ch8 -; f0a52 -Sfx_Scratch: ; f0a52 +Sfx_Scratch: musicheader 1, 8, Sfx_Scratch_Ch8 -; f0a55 -Sfx_Vicegrip: ; f0a55 +Sfx_Vicegrip: musicheader 1, 8, Sfx_Vicegrip_Ch8 -; f0a58 -Sfx_RazorWind: ; f0a58 +Sfx_RazorWind: musicheader 1, 8, Sfx_RazorWind_Ch8 -; f0a5b -Sfx_Cut: ; f0a5b +Sfx_Cut: musicheader 1, 8, Sfx_Cut_Ch8 -; f0a5e -Sfx_WingAttack: ; f0a5e +Sfx_WingAttack: musicheader 1, 8, Sfx_WingAttack_Ch8 -; f0a61 -Sfx_Whirlwind: ; f0a61 +Sfx_Whirlwind: musicheader 1, 8, Sfx_Whirlwind_Ch8 -; f0a64 -Sfx_Bind: ; f0a64 +Sfx_Bind: musicheader 1, 8, Sfx_Bind_Ch8 -; f0a67 -Sfx_VineWhip: ; f0a67 +Sfx_VineWhip: musicheader 1, 8, Sfx_VineWhip_Ch8 -; f0a6a -Sfx_DoubleKick: ; f0a6a +Sfx_DoubleKick: musicheader 1, 8, Sfx_DoubleKick_Ch8 -; f0a6d -Sfx_MegaKick: ; f0a6d +Sfx_MegaKick: musicheader 1, 8, Sfx_MegaKick_Ch8 -; f0a70 -Sfx_Headbutt: ; f0a70 +Sfx_Headbutt: musicheader 1, 8, Sfx_Headbutt_Ch8 -; f0a73 -Sfx_HornAttack: ; f0a73 +Sfx_HornAttack: musicheader 1, 8, Sfx_HornAttack_Ch8 -; f0a76 -Sfx_Tackle: ; f0a76 +Sfx_Tackle: musicheader 1, 8, Sfx_Tackle_Ch8 -; f0a79 -Sfx_PoisonSting: ; f0a79 +Sfx_PoisonSting: musicheader 1, 8, Sfx_PoisonSting_Ch8 -; f0a7c -Sfx_Powder: ; f0a7c +Sfx_Powder: musicheader 1, 8, Sfx_Powder_Ch8 -; f0a7f -Sfx_Doubleslap: ; f0a7f +Sfx_Doubleslap: musicheader 1, 8, Sfx_Doubleslap_Ch8 -; f0a82 -Sfx_Bite: ; f0a82 +Sfx_Bite: musicheader 2, 5, Sfx_Bite_Ch5 musicheader 1, 8, Sfx_Bite_Ch8 -; f0a88 -Sfx_JumpKick: ; f0a88 +Sfx_JumpKick: musicheader 1, 8, Sfx_JumpKick_Ch8 -; f0a8b -Sfx_Stomp: ; f0a8b +Sfx_Stomp: musicheader 1, 8, Sfx_Stomp_Ch8 -; f0a8e -Sfx_TailWhip: ; f0a8e +Sfx_TailWhip: musicheader 1, 8, Sfx_TailWhip_Ch8 -; f0a91 -Sfx_KarateChop: ; f0a91 +Sfx_KarateChop: musicheader 1, 8, Sfx_KarateChop_Ch8 -; f0a94 -Sfx_Submission: ; f0a94 +Sfx_Submission: musicheader 1, 8, Sfx_Submission_Ch8 -; f0a97 -Sfx_WaterGun: ; f0a97 +Sfx_WaterGun: musicheader 2, 5, Sfx_WaterGun_Ch5 musicheader 1, 8, Sfx_WaterGun_Ch8 -; f0a9d -Sfx_SwordsDance: ; f0a9d +Sfx_SwordsDance: musicheader 1, 8, Sfx_SwordsDance_Ch8 -; f0aa0 -Sfx_Thunder: ; f0aa0 +Sfx_Thunder: musicheader 1, 8, Sfx_Thunder_Ch8 -; f0aa3 -Sfx_Supersonic: ; f0aa3 +Sfx_Supersonic: musicheader 3, 5, Sfx_Supersonic_Ch5 musicheader 1, 6, Sfx_Supersonic_Ch6 musicheader 1, 8, Sfx_Supersonic_Ch8 -; f0aac -Sfx_Leer: ; f0aac +Sfx_Leer: musicheader 3, 5, Sfx_Leer_Ch5 musicheader 1, 6, Sfx_Leer_Ch6 musicheader 1, 8, Sfx_Leer_Ch8 -; f0ab5 -Sfx_Ember: ; f0ab5 +Sfx_Ember: musicheader 2, 5, Sfx_Ember_Ch5 musicheader 1, 8, Sfx_Ember_Ch8 -; f0abb -Sfx_Bubblebeam: ; f0abb +Sfx_Bubblebeam: musicheader 3, 5, Sfx_Bubblebeam_Ch5 musicheader 1, 6, Sfx_Bubblebeam_Ch6 musicheader 1, 8, Sfx_Bubblebeam_Ch8 -; f0ac4 -Sfx_HydroPump: ; f0ac4 +Sfx_HydroPump: musicheader 2, 5, Sfx_HydroPump_Ch5 musicheader 1, 8, Sfx_HydroPump_Ch8 -; f0aca -Sfx_Surf: ; f0aca +Sfx_Surf: musicheader 3, 5, Sfx_Surf_Ch5 musicheader 1, 6, Sfx_Surf_Ch6 musicheader 1, 8, Sfx_Surf_Ch8 -; f0ad3 -Sfx_Psybeam: ; f0ad3 +Sfx_Psybeam: musicheader 3, 5, Sfx_Psybeam_Ch5 musicheader 1, 6, Sfx_Psybeam_Ch6 musicheader 1, 8, Sfx_Psybeam_Ch8 -; f0adc -Sfx_Charge: ; f0adc +Sfx_Charge: musicheader 3, 5, Sfx_Charge_Ch5 musicheader 1, 6, Sfx_Charge_Ch6 musicheader 1, 8, Sfx_Charge_Ch8 -; f0ae5 -Sfx_Thundershock: ; f0ae5 +Sfx_Thundershock: musicheader 3, 5, Sfx_Thundershock_Ch5 musicheader 1, 6, Sfx_Thundershock_Ch6 musicheader 1, 8, Sfx_Thundershock_Ch8 -; f0aee -Sfx_Psychic: ; f0aee +Sfx_Psychic: musicheader 3, 5, Sfx_Psychic_Ch5 musicheader 1, 6, Sfx_Psychic_Ch6 musicheader 1, 8, Sfx_Psychic_Ch8 -; f0af7 -Sfx_Screech: ; f0af7 +Sfx_Screech: musicheader 2, 5, Sfx_Screech_Ch5 musicheader 1, 6, Sfx_Screech_Ch6 -; f0afd -Sfx_BoneClub: ; f0afd +Sfx_BoneClub: musicheader 2, 5, Sfx_BoneClub_Ch5 musicheader 1, 6, Sfx_BoneClub_Ch6 -; f0b03 -Sfx_Sharpen: ; f0b03 +Sfx_Sharpen: musicheader 2, 5, Sfx_Sharpen_Ch5 musicheader 1, 6, Sfx_Sharpen_Ch6 -; f0b09 -Sfx_EggBomb: ; f0b09 +Sfx_EggBomb: musicheader 3, 5, Sfx_EggBomb_Ch5 musicheader 1, 6, Sfx_EggBomb_Ch6 musicheader 1, 8, Sfx_EggBomb_Ch8 -; f0b12 -Sfx_Sing: ; f0b12 +Sfx_Sing: musicheader 2, 5, Sfx_Sing_Ch5 musicheader 1, 6, Sfx_Sing_Ch6 -; f0b18 -Sfx_HyperBeam: ; f0b18 +Sfx_HyperBeam: musicheader 3, 5, Sfx_HyperBeam_Ch5 musicheader 1, 6, Sfx_HyperBeam_Ch6 musicheader 1, 8, Sfx_HyperBeam_Ch8 -; f0b21 -Sfx_Shine: ; f0b21 +Sfx_Shine: musicheader 1, 5, Sfx_Shine_Ch5 -; f0b24 -Sfx_Unknown5F: ; f0b24 +Sfx_Unknown5F: musicheader 3, 5, Sfx_Unknown5F_Ch5 musicheader 1, 6, Sfx_Unknown5F_Ch6 -Sfx_Sandstorm: ; f0b2a + +Sfx_Sandstorm: musicheader 1, 8, Sfx_Sandstorm_Ch8 -; f0b2d -Sfx_HangUp: ; f0b2d +Sfx_HangUp: musicheader 1, 5, Sfx_HangUp_Ch5 -; f0b30 -Sfx_NoSignal: ; f0b30 +Sfx_NoSignal: musicheader 1, 5, Sfx_NoSignal_Ch5 -; f0b33 -Sfx_Elevator: ; f0b33 +Sfx_Elevator: 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 +Sfx_DexFanfare5079: +Sfx_LevelUp: 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 -Sfx_LevelUp_Ch5: ; f0b4b +Sfx_DexFanfare5079_Ch5: +Sfx_LevelUp_Ch5: togglesfx tempo 120 volume $77 @@ -508,10 +402,9 @@ Sfx_LevelUp_Ch5: ; f0b4b octave 4 note G#, 12 endchannel -; f0b5f -Sfx_DexFanfare5079_Ch6: ; f0b5f -Sfx_LevelUp_Ch6: ; f0b5f +Sfx_DexFanfare5079_Ch6: +Sfx_LevelUp_Ch6: togglesfx dutycycle $2 notetype $8, $c1 @@ -522,10 +415,9 @@ Sfx_LevelUp_Ch6: ; f0b5f intensity $c3 note B_, 12 endchannel -; f0b6d -Sfx_DexFanfare5079_Ch7: ; f0b6d -Sfx_LevelUp_Ch7: ; f0b6d +Sfx_DexFanfare5079_Ch7: +Sfx_LevelUp_Ch7: togglesfx notetype $8, $25 octave 4 @@ -541,25 +433,22 @@ Sfx_LevelUp_Ch7: ; f0b6d note E_, 3 note __, 4 endchannel -; f0b7f -Sfx_DexFanfare5079_Ch8: ; f0b7f -Sfx_LevelUp_Ch8: ; f0b7f +Sfx_DexFanfare5079_Ch8: +Sfx_LevelUp_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 12 endchannel -; f0b86 -Sfx_KeyItem: ; f0b86 +Sfx_KeyItem: 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 +Sfx_KeyItem_Ch5: togglesfx tempo 120 volume $77 @@ -575,9 +464,8 @@ Sfx_KeyItem_Ch5: ; f0b92 intensity $b3 note G#, 16 endchannel -; f0ba8 -Sfx_KeyItem_Ch6: ; f0ba8 +Sfx_KeyItem_Ch6: togglesfx dutycycle $2 notetype $6, $c1 @@ -590,9 +478,8 @@ Sfx_KeyItem_Ch6: ; f0ba8 intensity $c3 note B_, 16 endchannel -; f0bb8 -Sfx_KeyItem_Ch7: ; f0bb8 +Sfx_KeyItem_Ch7: togglesfx notetype $6, $25 octave 4 @@ -612,24 +499,21 @@ Sfx_KeyItem_Ch7: ; f0bb8 note E_, 4 note __, 4 endchannel -; f0bce -Sfx_KeyItem_Ch8: ; f0bce +Sfx_KeyItem_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 endchannel -; f0bd5 -Sfx_DexFanfare2049: ; f0bd5 +Sfx_DexFanfare2049: 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 +Sfx_DexFanfare2049_Ch5: togglesfx tempo 104 volume $77 @@ -653,9 +537,8 @@ Sfx_DexFanfare2049_Ch5: ; f0be1 note A_, 2 note __, 6 endchannel -; f0bfe -Sfx_DexFanfare2049_Ch6: ; f0bfe +Sfx_DexFanfare2049_Ch6: togglesfx dutycycle $2 notetype $c, $c1 @@ -674,9 +557,8 @@ Sfx_DexFanfare2049_Ch6: ; f0bfe note G_, 4 note F_, 8 endchannel -; f0c13 -Sfx_DexFanfare2049_Ch7: ; f0c13 +Sfx_DexFanfare2049_Ch7: togglesfx notetype $c, $25 octave 4 @@ -695,25 +577,22 @@ Sfx_DexFanfare2049_Ch7: ; f0c13 note F_, 2 note __, 6 endchannel -; f0c27 -Sfx_DexFanfare2049_Ch8: ; f0c27 +Sfx_DexFanfare2049_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0c2f -Sfx_Item: ; f0c2f +Sfx_Item: 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 +Sfx_Item_Ch5: togglesfx tempo 108 volume $77 @@ -731,9 +610,8 @@ Sfx_Item_Ch5: ; f0c3b note F_, 12 note __, 12 endchannel -; f0c54 -Sfx_Item_Ch6: ; f0c54 +Sfx_Item_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -749,9 +627,8 @@ Sfx_Item_Ch6: ; f0c54 note A_, 12 note __, 12 endchannel -; f0c68 -Sfx_Item_Ch7: ; f0c68 +Sfx_Item_Ch7: togglesfx notetype $8, $25 octave 4 @@ -774,25 +651,22 @@ Sfx_Item_Ch7: ; f0c68 note F_, 4 note __, 14 endchannel -; f0c81 -Sfx_Item_Ch8: ; f0c81 +Sfx_Item_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0c89 -Sfx_CaughtMon: ; f0c89 +Sfx_CaughtMon: 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 +Sfx_CaughtMon_Ch5: togglesfx tempo 112 volume $77 @@ -815,9 +689,8 @@ Sfx_CaughtMon_Ch5: ; f0c95 intensity $b3 note F_, 12 endchannel -; f0cb5 -Sfx_CaughtMon_Ch6: ; f0cb5 +Sfx_CaughtMon_Ch6: togglesfx dutycycle $2 vibrato $8, $27 @@ -836,9 +709,8 @@ Sfx_CaughtMon_Ch6: ; f0cb5 intensity $c3 note A_, 12 endchannel -; f0cce -Sfx_CaughtMon_Ch7: ; f0cce +Sfx_CaughtMon_Ch7: togglesfx notetype $8, $25 octave 3 @@ -856,25 +728,22 @@ Sfx_CaughtMon_Ch7: ; f0cce note A_, 3 note __, 3 endchannel -; f0ce2 -Sfx_CaughtMon_Ch8: ; f0ce2 +Sfx_CaughtMon_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0cea -Sfx_DexFanfare80109: ; f0cea +Sfx_DexFanfare80109: 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 +Sfx_DexFanfare80109_Ch5: togglesfx tempo 112 volume $77 @@ -899,9 +768,8 @@ Sfx_DexFanfare80109_Ch5: ; f0cf6 intensity $a5 note A#, 16 endchannel -; f0d17 -Sfx_DexFanfare80109_Ch6: ; f0d17 +Sfx_DexFanfare80109_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -923,9 +791,8 @@ Sfx_DexFanfare80109_Ch6: ; f0d17 octave 5 note D#, 16 endchannel -; f0d32 -Sfx_DexFanfare80109_Ch7: ; f0d32 +Sfx_DexFanfare80109_Ch7: togglesfx notetype $c, $25 octave 4 @@ -951,31 +818,27 @@ Sfx_DexFanfare80109_Ch7: ; f0d32 note D#, 3 note __, 9 endchannel -; f0d4e -Sfx_DexFanfare80109_Ch8: ; f0d4e +Sfx_DexFanfare80109_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0d56 -Sfx_Fanfare2: ; f0d56 +Sfx_Fanfare2: musicheader 3, 5, Sfx_Fanfare2_Ch5 musicheader 1, 6, Sfx_Fanfare2_Ch6 musicheader 1, 8, Sfx_Fanfare2_Ch8 -; f0d5f -UnusedSfx: ; f0d5f +UnusedSfx: musicheader 4, 5, UnusedSfx_Ch5 musicheader 1, 6, UnusedSfx_Ch6 musicheader 1, 7, UnusedSfx_Ch7 musicheader 1, 8, UnusedSfx_Ch8 -; f0d6b -UnusedSfx_Ch5: ; f0d6b +UnusedSfx_Ch5: togglesfx tempo 124 volume $77 @@ -998,9 +861,8 @@ UnusedSfx_Ch5: ; f0d6b intensity $a5 note F_, 16 endchannel -; f0d8a -UnusedSfx_Ch6: ; f0d8a +UnusedSfx_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -1023,9 +885,8 @@ UnusedSfx_Ch6: ; f0d8a intensity $b5 note A_, 16 endchannel -; f0da6 -UnusedSfx_Ch7: ; f0da6 +UnusedSfx_Ch7: togglesfx notetype $c, $25 octave 4 @@ -1039,31 +900,27 @@ UnusedSfx_Ch7: ; f0da6 note A_, 3 note __, 9 endchannel -; f0db6 -UnusedSfx_Ch8: ; f0db6 +UnusedSfx_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0dbe -Sfx_Fanfare: ; f0dbe +Sfx_Fanfare: musicheader 3, 5, Sfx_Fanfare_Ch5 musicheader 1, 6, Sfx_Fanfare_Ch6 musicheader 1, 8, Sfx_Fanfare_Ch8 -; f0dc7 -Sfx_RegisterPhoneNumber: ; f0dc7 +Sfx_RegisterPhoneNumber: 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 +Sfx_RegisterPhoneNumber_Ch5: togglesfx tempo 124 volume $77 @@ -1086,11 +943,10 @@ Sfx_RegisterPhoneNumber_Ch5: ; f0dd3 note C_, 2 note __, 8 endchannel -; f0def togglesfx -Sfx_RegisterPhoneNumber_Ch6: ; f0df0 +Sfx_RegisterPhoneNumber_Ch6: togglesfx dutycycle $3 notetype $c, $c2 @@ -1111,11 +967,10 @@ Sfx_RegisterPhoneNumber_Ch6: ; f0df0 note G#, 2 note __, 8 endchannel -; f0e07 togglesfx -Sfx_RegisterPhoneNumber_Ch7: ; f0e08 +Sfx_RegisterPhoneNumber_Ch7: togglesfx notetype $c, $25 note __, 2 @@ -1133,11 +988,10 @@ Sfx_RegisterPhoneNumber_Ch7: ; f0e08 note G#, 2 note __, 8 endchannel -; f0e1b togglesfx -Sfx_RegisterPhoneNumber_Ch8: ; f0e1c +Sfx_RegisterPhoneNumber_Ch8: togglesfx sfxtogglenoise $4 notetype $c @@ -1145,17 +999,15 @@ Sfx_RegisterPhoneNumber_Ch8: ; f0e1c note __, 16 note __, 16 endchannel -; f0e25 togglesfx -Sfx_3RdPlace: ; f0e26 +Sfx_3RdPlace: musicheader 3, 5, Sfx_3RdPlace_Ch5 musicheader 1, 6, Sfx_3RdPlace_Ch6 musicheader 1, 7, Sfx_3RdPlace_Ch7 -; f0e2f -Sfx_3RdPlace_Ch5: ; f0e2f +Sfx_3RdPlace_Ch5: togglesfx tempo 120 volume $77 @@ -1171,11 +1023,10 @@ Sfx_3RdPlace_Ch5: ; f0e2f note C_, 1 note D_, 6 endchannel -; f0e44 togglesfx -Sfx_3RdPlace_Ch6: ; f0e45 +Sfx_3RdPlace_Ch6: togglesfx dutycycle $2 notetype $c, $b4 @@ -1189,11 +1040,10 @@ Sfx_3RdPlace_Ch6: ; f0e45 note F_, 1 note G_, 6 endchannel -; f0e55 togglesfx -Sfx_3RdPlace_Ch7: ; f0e56 +Sfx_3RdPlace_Ch7: togglesfx notetype $c, $25 octave 3 @@ -1207,20 +1057,18 @@ Sfx_3RdPlace_Ch7: ; f0e56 note A_, 1 note B_, 6 endchannel -; f0e65 togglesfx -Sfx_GetEggFromDayCareLady: ; f0e66 -Sfx_GetEggFromDayCareMan: ; f0e66 +Sfx_GetEggFromDayCareLady: +Sfx_GetEggFromDayCareMan: 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 -Sfx_GetEggFromDayCareMan_Ch5: ; f0e72 +Sfx_GetEggFromDayCareLady_Ch5: +Sfx_GetEggFromDayCareMan_Ch5: togglesfx tempo 120 volume $77 @@ -1249,12 +1097,11 @@ Sfx_GetEggFromDayCareMan_Ch5: ; f0e72 note F_, 9 note __, 9 endchannel -; f0e9a togglesfx -Sfx_GetEggFromDayCareLady_Ch6: ; f0e9b -Sfx_GetEggFromDayCareMan_Ch6: ; f0e9b +Sfx_GetEggFromDayCareLady_Ch6: +Sfx_GetEggFromDayCareMan_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -1280,12 +1127,11 @@ Sfx_GetEggFromDayCareMan_Ch6: ; f0e9b note A_, 9 note __, 9 endchannel -; f0ebd togglesfx -Sfx_GetEggFromDayCareLady_Ch7: ; f0ebe -Sfx_GetEggFromDayCareMan_Ch7: ; f0ebe +Sfx_GetEggFromDayCareLady_Ch7: +Sfx_GetEggFromDayCareMan_Ch7: togglesfx notetype $8, $25 note __, 2 @@ -1301,12 +1147,11 @@ Sfx_GetEggFromDayCareMan_Ch7: ; f0ebe note A_, 9 note __, 9 endchannel -; f0ecf togglesfx -Sfx_GetEggFromDayCareLady_Ch8: ; f0ed0 -Sfx_GetEggFromDayCareMan_Ch8: ; f0ed0 +Sfx_GetEggFromDayCareLady_Ch8: +Sfx_GetEggFromDayCareMan_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -1315,18 +1160,16 @@ Sfx_GetEggFromDayCareMan_Ch8: ; f0ed0 note __, 16 note __, 12 endchannel -; f0edb togglesfx -Sfx_MoveDeleted: ; f0edc +Sfx_MoveDeleted: 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 +Sfx_MoveDeleted_Ch5: togglesfx tempo 116 volume $77 @@ -1353,11 +1196,10 @@ Sfx_MoveDeleted_Ch5: ; f0ee8 note D_, 10 note __, 6 endchannel -; f0f0c togglesfx -Sfx_MoveDeleted_Ch6: ; f0f0d +Sfx_MoveDeleted_Ch6: togglesfx dutycycle $3 vibrato $c, $44 @@ -1390,11 +1232,10 @@ Sfx_MoveDeleted_Ch6: ; f0f0d note F_, 16 note __, 6 endchannel -; f0f36 togglesfx -Sfx_MoveDeleted_Ch7: ; f0f37 +Sfx_MoveDeleted_Ch7: togglesfx notetype $6, $25 octave 2 @@ -1418,11 +1259,10 @@ Sfx_MoveDeleted_Ch7: ; f0f37 note B_, 16 note __, 6 endchannel -; f0f52 togglesfx -Sfx_MoveDeleted_Ch8: ; f0f53 +Sfx_MoveDeleted_Ch8: togglesfx sfxtogglenoise $3 notetype $c @@ -1431,18 +1271,16 @@ Sfx_MoveDeleted_Ch8: ; f0f53 note __, 16 note __, 6 endchannel -; f0f5d togglesfx -Sfx_2ndPlace: ; f0f5e +Sfx_2ndPlace: 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 +Sfx_2ndPlace_Ch5: togglesfx tempo 116 volume $77 @@ -1473,11 +1311,10 @@ Sfx_2ndPlace_Ch5: ; f0f6a note B_, 12 note __, 6 endchannel -; f0f91 togglesfx -Sfx_2ndPlace_Ch6: ; f0f92 +Sfx_2ndPlace_Ch6: togglesfx dutycycle $2 notetype $8, $b1 @@ -1498,11 +1335,10 @@ Sfx_2ndPlace_Ch6: ; f0f92 note D_, 12 note __, 6 endchannel -; f0fac togglesfx -Sfx_2ndPlace_Ch7: ; f0fad +Sfx_2ndPlace_Ch7: togglesfx notetype $8, $25 octave 3 @@ -1537,34 +1373,31 @@ Sfx_2ndPlace_Ch7: ; f0fad note G_, 12 note __, 6 endchannel -; f0fd1 togglesfx -Sfx_2ndPlace_Ch8: ; f0fd2 +Sfx_2ndPlace_Ch8: togglesfx sfxtogglenoise $3 notetype $8 -Sfx_2ndPlace_branch_f0fd7: ; f0fd7 +.loop note C#, 1 - loopchannel 6, Sfx_2ndPlace_branch_f0fd7 + loopchannel 6, .loop note B_, 12 note B_, 12 note B_, 12 note __, 6 endchannel -; f0fe1 togglesfx -Sfx_1stPlace: ; f0fe2 +Sfx_1stPlace: 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 +Sfx_1stPlace_Ch5: togglesfx tempo 124 volume $77 @@ -1602,11 +1435,10 @@ Sfx_1stPlace_Ch5: ; f0fee note A_, 10 note __, 6 endchannel -; f101f togglesfx -Sfx_1stPlace_Ch6: ; f1020 +Sfx_1stPlace_Ch6: togglesfx dutycycle $3 vibrato $c, $34 @@ -1627,11 +1459,10 @@ Sfx_1stPlace_Ch6: ; f1020 note D_, 10 note __, 6 endchannel -; f103c togglesfx -Sfx_1stPlace_Ch7: ; f103d +Sfx_1stPlace_Ch7: togglesfx notetype $c, $25 octave 2 @@ -1652,11 +1483,10 @@ Sfx_1stPlace_Ch7: ; f103d note D_, 10 note __, 6 endchannel -; f1053 togglesfx -Sfx_1stPlace_Ch8: ; f1054 +Sfx_1stPlace_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1674,18 +1504,16 @@ Sfx_1stPlace_Ch8: ; f1054 note B_, 10 note __, 6 endchannel -; f1068 togglesfx -Sfx_ChooseACard: ; f1069 +Sfx_ChooseACard: 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 +Sfx_ChooseACard_Ch5: togglesfx tempo 152 volume $77 @@ -1728,11 +1556,10 @@ Sfx_ChooseACard_Ch5: ; f1075 note E_, 4 note __, 12 endchannel -; f10a8 togglesfx -Sfx_ChooseACard_Ch6: ; f10a9 +Sfx_ChooseACard_Ch6: togglesfx dutycycle $3 notetype $6, $b4 @@ -1761,11 +1588,10 @@ Sfx_ChooseACard_Ch6: ; f10a9 note A_, 4 note __, 12 endchannel -; f10c8 togglesfx -Sfx_ChooseACard_Ch7: ; f10c9 +Sfx_ChooseACard_Ch7: togglesfx notetype $6, $25 octave 3 @@ -1798,11 +1624,10 @@ Sfx_ChooseACard_Ch7: ; f10c9 note A_, 4 note __, 12 endchannel -; f10eb togglesfx -Sfx_ChooseACard_Ch8: ; f10ec +Sfx_ChooseACard_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1824,18 +1649,16 @@ Sfx_ChooseACard_Ch8: ; f10ec note D_, 2 note B_, 16 endchannel -; f1103 togglesfx -Sfx_GetTm: ; f1104 +Sfx_GetTm: 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 +Sfx_GetTm_Ch5: togglesfx tempo 144 volume $77 @@ -1858,11 +1681,10 @@ Sfx_GetTm_Ch5: ; f1110 note F#, 8 note __, 6 endchannel -; f1130 togglesfx -Sfx_GetTm_Ch6: ; f1131 +Sfx_GetTm_Ch6: togglesfx dutycycle $3 vibrato $8, $24 @@ -1882,11 +1704,10 @@ Sfx_GetTm_Ch6: ; f1131 note D_, 8 note __, 6 endchannel -; f114b togglesfx -Sfx_GetTm_Ch7: ; f114c +Sfx_GetTm_Ch7: togglesfx notetype $6, $25 octave 2 @@ -1914,11 +1735,10 @@ Sfx_GetTm_Ch7: ; f114c note A_, 16 note __, 6 endchannel -; f1169 togglesfx -Sfx_GetTm_Ch8: ; f116a +Sfx_GetTm_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1935,18 +1755,16 @@ Sfx_GetTm_Ch8: ; f116a note B_, 16 note __, 6 endchannel -; f117c togglesfx -Sfx_GetBadge: ; f117d +Sfx_GetBadge: 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 +Sfx_GetBadge_Ch5: togglesfx tempo 120 volume $77 @@ -1964,11 +1782,10 @@ Sfx_GetBadge_Ch5: ; f1189 note A_, 16 note __, 6 endchannel -; f11a9 togglesfx -Sfx_GetBadge_branch_f11aa: ; f11aa +Sfx_GetBadge_branch_f11aa: note __, 5 octave 3 note F_, 2 @@ -1989,9 +1806,8 @@ Sfx_GetBadge_branch_f11aa: ; f11aa note C#, 2 note F_, 2 endchannel -; f11be -Sfx_GetBadge_Ch6: ; f11be +Sfx_GetBadge_Ch6: togglesfx dutycycle $3 vibrato $8, $24 @@ -2037,11 +1853,10 @@ Sfx_GetBadge_Ch6: ; f11be note F_, 16 note __, 6 endchannel -; f11f4 togglesfx -Sfx_GetBadge_Ch7: ; f11f5 +Sfx_GetBadge_Ch7: togglesfx notetype $6, $25 octave 2 @@ -2077,15 +1892,14 @@ Sfx_GetBadge_Ch7: ; f11f5 note F_, 16 note __, 6 endchannel -; f121a togglesfx -Sfx_GetBadge_Ch8: ; f121b +Sfx_GetBadge_Ch8: togglesfx sfxtogglenoise $4 notetype $6 -Sfx_GetBadge_branch_f1220: ; f1220 +.loop note B_, 12 note D_, 1 note D_, 1 @@ -2100,22 +1914,20 @@ Sfx_GetBadge_branch_f1220: ; f1220 note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, Sfx_GetBadge_branch_f1220 + loopchannel 2, .loop note B_, 16 note __, 6 endchannel -; f1235 togglesfx -Sfx_QuitSlots: ; f1236 +Sfx_QuitSlots: 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 +Sfx_QuitSlots_Ch5: togglesfx tempo 144 volume $77 @@ -2144,11 +1956,10 @@ Sfx_QuitSlots_Ch5: ; f1242 note G#, 14 note __, 6 endchannel -; f1265 togglesfx -Sfx_QuitSlots_Ch6: ; f1266 +Sfx_QuitSlots_Ch6: togglesfx dutycycle $2 notetype $8, $b3 @@ -2172,11 +1983,10 @@ Sfx_QuitSlots_Ch6: ; f1266 note F_, 14 note __, 6 endchannel -; f1282 togglesfx -Sfx_QuitSlots_Ch7: ; f1283 +Sfx_QuitSlots_Ch7: togglesfx notetype $8, $25 octave 3 @@ -2204,11 +2014,10 @@ Sfx_QuitSlots_Ch7: ; f1283 note C#, 14 note __, 6 endchannel -; f12a0 togglesfx -Sfx_QuitSlots_Ch8: ; f12a1 +Sfx_QuitSlots_Ch8: togglesfx sfxtogglenoise $3 notetype $8 @@ -2225,20 +2034,18 @@ Sfx_QuitSlots_Ch8: ; f12a1 note B_, 14 note __, 6 endchannel -; f12b3 togglesfx -Sfx_Protect: ; f12b4 +Sfx_Protect: musicheader 2, 5, Sfx_Protect_Ch5 musicheader 1, 8, Sfx_Protect_Ch8 -; f12ba -Sfx_Protect_Ch5: ; f12ba +Sfx_Protect_Ch5: togglesfx notetype $1, $f1 dutycycle $0 -Sfx_Protect_branch_f12c0: ; f12c0 +.loop octave 5 note F_, 5 note A_, 5 @@ -2251,7 +2058,7 @@ Sfx_Protect_branch_f12c0: ; f12c0 octave 6 note C#, 5 note E_, 5 - loopchannel 3, Sfx_Protect_branch_f12c0 + loopchannel 3, .loop intensity $c1 octave 5 note F_, 5 @@ -2269,144 +2076,120 @@ Sfx_Protect_branch_f12c0: ; f12c0 note C#, 5 note E_, 5 endchannel -; f12e5 -Sfx_Protect_Ch8: ; f12e5 -Sfx_Protect_branch_f12e5: ; f12e5 +Sfx_Protect_Ch8: noise __, 10, $9e, $0 noise __, 10, $be, $11 - loopchannel 6, Sfx_Protect_branch_f12e5 + loopchannel 6, Sfx_Protect_Ch8 noise __, 10, $a7, $0 noise C_, 1, $75, $11 endchannel -; f12f6 -Sfx_Sketch: ; f12f6 +Sfx_Sketch: musicheader 1, 5, Sfx_Sketch_Ch5 -; f12f9 -Sfx_Sketch_Ch5: ; f12f9 +Sfx_Sketch_Ch5: dutycycle $1 soundinput $a5 -Sfx_Sketch_branch_f12fd: ; f12fd +.loop sound __, 3, $f1, $06e0 sound __, 14, $af, $05b0 sound __, 5, $0, 0 sound __, 10, $f4, $0718 - loopchannel 3, Sfx_Sketch_branch_f12fd + loopchannel 3, .loop soundinput $8 endchannel -; f1314 -Sfx_RainDance: ; f1314 +Sfx_RainDance: musicheader 1, 8, Sfx_RainDance_Ch8 -; f1317 -Sfx_RainDance_Ch8: ; f1317 -Sfx_RainDance_branch_f1317: ; f1317 +Sfx_RainDance_Ch8: noise __, 12, $7d, $50 noise __, 7, $7d, $4f noise __, 12, $7f, $47 noise __, 16, $6e, $22 - loopchannel 3, Sfx_RainDance_branch_f1317 + loopchannel 3, Sfx_RainDance_Ch8 noise __, 7, $6d, $50 noise __, 6, $5d, $4f noise __, 6, $4f, $47 noise __, 11, $32, $46 endchannel -; f1334 -Sfx_Aeroblast: ; f1334 +Sfx_Aeroblast: musicheader 2, 5, Sfx_Aeroblast_Ch5 musicheader 1, 8, Sfx_Aeroblast_Ch8 -; f133a -Sfx_Aeroblast_Ch5: ; f133a +Sfx_Aeroblast_Ch5: sound_duty 2, 0, 3, 3 soundinput $f5 sound C_, 13, $f8, $0580 soundinput $8 endchannel -; f1345 -Sfx_Aeroblast_Ch8: ; f1345 +Sfx_Aeroblast_Ch8: noise __, 5, $f8, $6c noise __, 5, $c8, $5c noise __, 5, $78, $5b noise C_, 1, $31, $5a endchannel -; f1352 -Sfx_Spark: ; f1352 +Sfx_Spark: musicheader 1, 8, Sfx_Spark_Ch8 -; f1355 -Sfx_Spark_Ch8: ; f1355 -Sfx_Spark_branch_f1355: ; f1355 +Sfx_Spark_Ch8: noise __, 5, $f8, $5d noise __, 5, $d8, $6f - loopchannel 2, Sfx_Spark_branch_f1355 + loopchannel 2, Sfx_Spark_Ch8 endchannel -; f1360 -Sfx_Curse: ; f1360 +Sfx_Curse: musicheader 2, 5, Sfx_Curse_Ch5 musicheader 1, 8, Sfx_Curse_Ch8 -; f1366 -Sfx_Curse_Ch5: ; f1366 +Sfx_Curse_Ch5: dutycycle $3 sound __, 5, $f2, $0483 sound __, 5, $f2, $0511 sound __, 5, $f2, $0589 sound __, 5, $f2, $05ed endchannel -; f1379 -Sfx_Curse_Ch8: ; f1379 +Sfx_Curse_Ch8: noise C_, 5, $9a, $9 endchannel -; f137d -Sfx_Rage: ; f137d +Sfx_Rage: musicheader 2, 5, Sfx_Rage_Ch5 musicheader 1, 8, Sfx_Rage_Ch8 -; f1383 -Sfx_Rage_Ch5: ; f1383 +Sfx_Rage_Ch5: dutycycle $0 sound __, 4, $d1, $07b0 sound __, 4, $d1, $07c2 sound C_, 9, $d2, $07d5 endchannel -; f1392 -Sfx_Rage_Ch8: ; f1392 +Sfx_Rage_Ch8: noise __, 4, $f4, $1a noise __, 4, $f4, $19 noise C_, 9, $f2, $18 endchannel -; f139c -Sfx_Thief: ; f139c +Sfx_Thief: musicheader 1, 8, Sfx_Thief_Ch8 -; f139f -Sfx_Thief_Ch8: ; f139f -Sfx_Thief_branch_f139f: ; f139f +Sfx_Thief_Ch8: noise __, 1, $0, $0 noise __, 5, $e1, $12 noise __, 1, $0, $0 noise __, 3, $b1, $22 - loopchannel 2, Sfx_Thief_branch_f139f + loopchannel 2, Sfx_Thief_Ch8 endchannel -; f13b0 -Sfx_Thief2: ; f13b0 +Sfx_Thief2: musicheader 1, 5, Sfx_Thief2_Ch5 -; f13b3 -Sfx_Thief2_Ch5: ; f13b3 +Sfx_Thief2_Ch5: togglesfx notetype $2, $f4 dutycycle $0 @@ -2424,14 +2207,12 @@ Sfx_Thief2_Ch5: ; f13b3 note A_, 3 togglesfx endchannel -; f13ca -Sfx_SpiderWeb: ; f13ca +Sfx_SpiderWeb: musicheader 2, 5, Sfx_SpiderWeb_Ch5 musicheader 1, 8, Sfx_SpiderWeb_Ch8 -; f13d0 -Sfx_SpiderWeb_Ch5: ; f13d0 +Sfx_SpiderWeb_Ch5: dutycycle $0 sound C#, 1, $7f, $0720 soundinput $95 @@ -2443,19 +2224,16 @@ Sfx_SpiderWeb_Ch5: ; f13d0 sound __, 5, $51, $0640 soundinput $8 endchannel -; f13f3 -Sfx_SpiderWeb_Ch8: ; f13f3 +Sfx_SpiderWeb_Ch8: noise C#, 1, $ef, $0 endchannel -; f13f7 -Sfx_MindReader: ; f13f7 +Sfx_MindReader: musicheader 2, 5, Sfx_MindReader_Ch5 musicheader 1, 8, Sfx_MindReader_Ch8 -; f13fd -Sfx_MindReader_Ch5: ; f13fd +Sfx_MindReader_Ch5: togglesfx dutycycle $2 notetype $2, $f1 @@ -2473,22 +2251,19 @@ Sfx_MindReader_Ch5: ; f13fd note D_, 3 togglesfx endchannel -; f1416 -Sfx_MindReader_Ch8: ; f1416 +Sfx_MindReader_Ch8: noise C_, 2, $af, $19 noise C_, 3, $af, $18 endchannel -; f141d -Sfx_Nightmare: ; f141d +Sfx_Nightmare: musicheader 1, 5, Sfx_Nightmare_Ch5 -; f1420 -Sfx_Nightmare_Ch5: ; f1420 +Sfx_Nightmare_Ch5: dutycycle $0 soundinput $34 -Sfx_Nightmare_branch_f1424: ; f1424 +.loop sound __, 4, $ba, $0631 sound __, 3, $0, 0 sound __, 4, $f8, $0621 @@ -2499,16 +2274,14 @@ Sfx_Nightmare_branch_f1424: ; f1424 sound __, 3, $0, 0 sound __, 4, $e8, $05f1 sound __, 3, $0, 0 - loopchannel 2, Sfx_Nightmare_branch_f1424 + loopchannel 2, .loop soundinput $8 endchannel -; f1453 -Sfx_Snore: ; f1453 +Sfx_Snore: musicheader 1, 8, Sfx_Snore_Ch8 -; f1456 -Sfx_Snore_Ch8: ; f1456 +Sfx_Snore_Ch8: noise __, 3, $ea, $4b noise __, 3, $ea, $5b noise __, 3, $0, $0 @@ -2516,27 +2289,23 @@ Sfx_Snore_Ch8: ; f1456 noise __, 5, $ee, $46 noise __, 5, $ee, $45 endchannel -; f1469 -Sfx_SweetKiss: ; f1469 +Sfx_SweetKiss: musicheader 1, 5, Sfx_SweetKiss_Ch5 -; f146c -Sfx_SweetKiss_Ch5: ; f146c +Sfx_SweetKiss_Ch5: dutycycle $2 -Sfx_SweetKiss_branch_f146e: ; f146e +.loop sound __, 3, $c1, $07c8 sound __, 3, $d1, $07da - loopchannel 2, Sfx_SweetKiss_branch_f146e + loopchannel 2, .loop sound C_, 11, $f1, $07e2 endchannel -; f147f -Sfx_SweetKiss2: ; f147f +Sfx_SweetKiss2: musicheader 1, 5, Sfx_SweetKiss2_Ch5 -; f1482 -Sfx_SweetKiss2_Ch5: ; f1482 +Sfx_SweetKiss2_Ch5: dutycycle $0 soundinput $97 sound __, 3, $f4, $0772 @@ -2548,31 +2317,26 @@ Sfx_SweetKiss2_Ch5: ; f1482 sound __, 3, $a1, $0772 soundinput $8 endchannel -; f14a5 -Sfx_BellyDrum: ; f14a5 +Sfx_BellyDrum: musicheader 2, 5, Sfx_BellyDrum_Ch5 musicheader 1, 8, Sfx_BellyDrum_Ch8 -; f14ab -Sfx_BellyDrum_Ch5: ; f14ab +Sfx_BellyDrum_Ch5: dutycycle $2 soundinput $ac sound __, 13, $f1, $05a3 soundinput $8 endchannel -; f14b6 -Sfx_BellyDrum_Ch8: ; f14b6 +Sfx_BellyDrum_Ch8: noise __, 13, $b1, $6c endchannel -; f14ba -Sfx_Unknown7F: ; f14ba +Sfx_Unknown7F: musicheader 1, 5, Sfx_Unknown7F_Ch5 -; f14bd -Sfx_Unknown7F_Ch5: ; f14bd +Sfx_Unknown7F_Ch5: dutycycle $2 soundinput $95 sound __, 3, $c9, $03b3 @@ -2580,14 +2344,12 @@ Sfx_Unknown7F_Ch5: ; f14bd sound __, 5, $d1, $0543 soundinput $8 endchannel -; f14d0 -Sfx_SludgeBomb: ; f14d0 +Sfx_SludgeBomb: musicheader 2, 5, Sfx_SludgeBomb_Ch5 musicheader 1, 8, Sfx_SludgeBomb_Ch8 -; f14d6 -Sfx_SludgeBomb_Ch5: ; f14d6 +Sfx_SludgeBomb_Ch5: dutycycle $2 soundinput $c5 sound __, 4, $f8, $0581 @@ -2596,20 +2358,17 @@ Sfx_SludgeBomb_Ch5: ; f14d6 sound C_, 1, $f2, $05d1 soundinput $8 endchannel -; f14eb -Sfx_SludgeBomb_Ch8: ; f14eb +Sfx_SludgeBomb_Ch8: noise __, 4, $e2, $6e noise __, 2, $0, $0 noise C_, 1, $e2, $6d endchannel -; f14f5 -Sfx_Foresight: ; f14f5 +Sfx_Foresight: musicheader 1, 5, Sfx_Foresight_Ch5 -; f14f8 -Sfx_Foresight_Ch5: ; f14f8 +Sfx_Foresight_Ch5: sound __, 4, $f4, $07b5 sound __, 4, $f5, $07c8 sound __, 9, $f4, $07da @@ -2618,13 +2377,11 @@ Sfx_Foresight_Ch5: ; f14f8 sound __, 3, $0, 0 sound __, 9, $91, $07da endchannel -; f1515 -Sfx_Spite: ; f1515 +Sfx_Spite: musicheader 1, 5, Sfx_Spite_Ch5 -; f1518 -Sfx_Spite_Ch5: ; f1518 +Sfx_Spite_Ch5: togglesfx vibrato $0, $12 dutycycle $3 @@ -2649,27 +2406,23 @@ Sfx_Spite_Ch5: ; f1518 soundinput $8 togglesfx endchannel -; f153a -Sfx_Outrage: ; f153a +Sfx_Outrage: musicheader 1, 8, Sfx_Outrage_Ch8 -; f153d -Sfx_Outrage_Ch8: ; f153d +Sfx_Outrage_Ch8: 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 +Sfx_PerishSong: musicheader 2, 5, Sfx_PerishSong_Ch5 musicheader 1, 6, Sfx_PerishSong_Ch6 -; f1553 -Sfx_PerishSong_Ch5: ; f1553 +Sfx_PerishSong_Ch5: togglesfx dutycycle $0 vibrato $12, $53 @@ -2679,9 +2432,8 @@ Sfx_PerishSong_Ch5: ; f1553 note G#, 9 togglesfx endchannel -; f1561 -Sfx_PerishSong_Ch6: ; f1561 +Sfx_PerishSong_Ch6: togglesfx dutycycle $0 vibrato $12, $53 @@ -2692,14 +2444,12 @@ Sfx_PerishSong_Ch6: ; f1561 note B_, 9 togglesfx endchannel -; f1570 -Sfx_GigaDrain: ; f1570 +Sfx_GigaDrain: musicheader 2, 5, Sfx_GigaDrain_Ch5 musicheader 1, 8, Sfx_GigaDrain_Ch8 -; f1576 -Sfx_GigaDrain_Ch5: ; f1576 +Sfx_GigaDrain_Ch5: dutycycle $2 soundinput $97 sound __, 5, $f8, $0680 @@ -2713,9 +2463,8 @@ Sfx_GigaDrain_Ch5: ; f1576 sound C_, 5, $88, $0511 soundinput $8 endchannel -; f15a1 -Sfx_GigaDrain_Ch8: ; f15a1 +Sfx_GigaDrain_Ch8: noise __, 5, $c8, $44 noise C_, 5, $c8, $50 noise C_, 5, $c8, $52 @@ -2723,13 +2472,11 @@ Sfx_GigaDrain_Ch8: ; f15a1 noise C_, 5, $c8, $56 noise D#, 1, $c7, $57 endchannel -; f15b4 -Sfx_Attract: ; f15b4 +Sfx_Attract: musicheader 1, 5, Sfx_Attract_Ch5 -; f15b7 -Sfx_Attract_Ch5: ; f15b7 +Sfx_Attract_Ch5: dutycycle $0 soundinput $77 sound __, 5, $a9, $06f0 @@ -2738,45 +2485,38 @@ Sfx_Attract_Ch5: ; f15b7 sound __, 9, $f1, $0740 soundinput $8 endchannel -; f15cc -Sfx_Kinesis2: ; f15cc +Sfx_Kinesis2: musicheader 1, 5, Sfx_Kinesis2_Ch5 -; f15cf -Sfx_Kinesis2_Ch5: ; f15cf +Sfx_Kinesis2_Ch5: dutycycle $0 sound __, 3, $f3, $0796 sound __, 3, $23, $0796 sound C_, 5, $f1, $07c4 endchannel -; f15de -Sfx_ZapCannon: ; f15de +Sfx_ZapCannon: musicheader 1, 8, Sfx_ZapCannon_Ch8 -; f15e1 -Sfx_ZapCannon_Ch8: ; f15e1 -Sfx_ZapCannon_branch_f15e1: ; f15e1 +Sfx_ZapCannon_Ch8: noise __, 3, $e1, $49 noise __, 1, $0, $0 - loopchannel 8, Sfx_ZapCannon_branch_f15e1 + loopchannel 8, Sfx_ZapCannon_Ch8 noise __, 9, $e1, $49 endchannel -; f15ef -Sfx_MeanLook: ; f15ef +Sfx_MeanLook: musicheader 1, 5, Sfx_MeanLook_Ch5 -; f15f2 -Sfx_MeanLook_Ch5: ; f15f2 +Sfx_MeanLook_Ch5: soundinput $77 dutycycle $3 sound __, 3, $f8, $0720 -Sfx_MeanLook_branch_f15fa: ; f15fa +.loop sound __, 2, $88, $0660 sound __, 3, $f8, $0790 - loopchannel 5, Sfx_MeanLook_branch_f15fa + loopchannel 5, .loop sound __, 13, $f8, $0700 sound __, 13, $c8, $0720 sound __, 13, $a8, $0700 @@ -2785,43 +2525,37 @@ Sfx_MeanLook_branch_f15fa: ; f15fa sound __, 13, $28, $0720 soundinput $8 endchannel -; f1621 -Sfx_HealBell: ; f1621 +Sfx_HealBell: musicheader 1, 5, Sfx_HealBell_Ch5 -; f1624 -Sfx_HealBell_Ch5: ; f1624 +Sfx_HealBell_Ch5: dutycycle $1 sound __, 2, $f1, $07da sound __, 2, $d1, $07d9 sound __, 2, $f1, $07da sound __, 9, $d1, $07db endchannel -; f1637 -Sfx_Return: ; f1637 +Sfx_Return: musicheader 1, 5, Sfx_Return_Ch5 -; f163a -Sfx_Return_Ch5: ; f163a +Sfx_Return_Ch5: dutycycle $0 -Sfx_Return_branch_f163c: ; f163c +.loop soundinput $bf sound __, 9, $f1, $0759 soundinput $57 sound __, 9, $f1, $0759 sound C_, 1, $0, 0 - loopchannel 2, Sfx_Return_branch_f163c + loopchannel 2, .loop soundinput $8 endchannel -; f1653 -Sfx_ExpBar: ; f1653 +Sfx_ExpBar: musicheader 1, 5, Sfx_ExpBar_Ch5 -; f1656 -Sfx_ExpBar_Ch5: ; f1656 +Sfx_ExpBar_Ch5: dutycycle $2 soundinput $d7 sound __, 9, $e1, $0750 @@ -2835,117 +2569,102 @@ Sfx_ExpBar_Ch5: ; f1656 sound C_, 1, $a8, $0770 soundinput $8 endchannel -; f167f -Sfx_MilkDrink: ; f167f +Sfx_MilkDrink: musicheader 1, 5, Sfx_MilkDrink_Ch5 -; f1682 -Sfx_MilkDrink_Ch5: ; f1682 +Sfx_MilkDrink_Ch5: dutycycle $2 -Sfx_MilkDrink_branch_f1684: ; f1684 +.loop soundinput $a4 sound __, 3, $ea, $04e0 sound __, 14, $f7, $0290 soundinput $9e sound __, 5, $c9, $05e1 sound __, 3, $0, 0 - loopchannel 6, Sfx_MilkDrink_branch_f1684 + loopchannel 6, .loop soundinput $8 endchannel -; f169f -Sfx_Present: ; f169f +Sfx_Present: musicheader 1, 5, Sfx_Present_Ch5 -; f16a2 -Sfx_Present_Ch5: ; f16a2 +Sfx_Present_Ch5: dutycycle $2 soundinput $d6 -Sfx_Present_branch_f16a6: ; f16a6 +.loop sound __, 3, $f1, $0740 sound __, 2, $0, 0 - loopchannel 3, Sfx_Present_branch_f16a6 + loopchannel 3, .loop sound C_, 1, $f1, $0780 soundinput $8 endchannel -; f16b9 -Sfx_MorningSun: ; f16b9 +Sfx_MorningSun: musicheader 1, 5, Sfx_MorningSun_Ch5 -; f16bc -Sfx_MorningSun_Ch5: ; f16bc +Sfx_MorningSun_Ch5: dutycycle $3 -Sfx_MorningSun_branch_f16be: ; f16be +.loop sound __, 3, $f1, $07e4 sound __, 3, $f1, $07e0 sound __, 6, $f2, $07e7 - loopchannel 3, Sfx_MorningSun_branch_f16be + loopchannel 3, .loop sound __, 2, $0, 0 sound __, 9, $c2, $07e7 sound __, 2, $0, 0 sound __, 9, $82, $07e7 endchannel -; f16df -Sfx_Moonlight: ; f16df +Sfx_Moonlight: musicheader 1, 5, Sfx_Moonlight_Ch5 -; f16e2 -Sfx_Moonlight_Ch5: ; f16e2 +Sfx_Moonlight_Ch5: dutycycle $2 -Sfx_Moonlight_branch_f16e4: ; f16e4 +.loop sound __, 2, $f8, $07d0 sound __, 5, $f1, $07e0 - loopchannel 2, Sfx_Moonlight_branch_f16e4 + loopchannel 2, .loop sound C_, 1, $f1, $07e0 sound C_, 1, $d1, $07e0 sound C_, 1, $81, $07e0 endchannel -; f16fd -Sfx_Encore: ; f16fd +Sfx_Encore: musicheader 2, 5, Sfx_Encore_Ch5 musicheader 1, 8, Sfx_Encore_Ch8 -; f1703 -Sfx_Encore_Ch5: ; f1703 +Sfx_Encore_Ch5: dutycycle $2 soundinput $ce sound C_, 1, $0, 0 -Sfx_Encore_branch_f170b: ; f170b +.loop sound __, 3, $f8, $0774 sound C#, 5, $0, 0 - loopchannel 2, Sfx_Encore_branch_f170b + loopchannel 2, .loop soundinput $8 endchannel -; f171a -Sfx_Encore_Ch8: ; f171a +Sfx_Encore_Ch8: noise D_, 1, $1f, $36 noise D_, 1, $76, $36 endchannel -; f1721 -Sfx_BeatUp: ; f1721 +Sfx_BeatUp: musicheader 1, 8, Sfx_BeatUp_Ch8 -; f1724 -Sfx_BeatUp_Ch8: ; f1724 +Sfx_BeatUp_Ch8: 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 +Sfx_SweetScent: musicheader 1, 5, Sfx_SweetScent_Ch5 -; f1737 -Sfx_SweetScent_Ch5: ; f1737 +Sfx_SweetScent_Ch5: dutycycle $2 soundinput $96 sound __, 7, $f8, $0760 @@ -2954,14 +2673,12 @@ Sfx_SweetScent_Ch5: ; f1737 sound C_, 7, $f1, $0730 soundinput $8 endchannel -; f174c -Sfx_BatonPass: ; f174c +Sfx_BatonPass: musicheader 2, 5, Sfx_BatonPass_Ch5 musicheader 1, 8, Sfx_BatonPass_Ch8 -; f1752 -Sfx_BatonPass_Ch5: ; f1752 +Sfx_BatonPass_Ch5: dutycycle $2 soundinput $f7 sound C#, 1, $f2, $0680 @@ -2972,18 +2689,15 @@ Sfx_BatonPass_Ch5: ; f1752 sound __, 2, $f1, $0760 soundinput $8 endchannel -; f1771 -Sfx_BatonPass_Ch8: ; f1771 +Sfx_BatonPass_Ch8: noise C#, 1, $f2, $20 endchannel -; f1775 -Sfx_EggCrack: ; f1775 +Sfx_EggCrack: musicheader 1, 5, Sfx_EggCrack_Ch5 -; f1778 -Sfx_EggCrack_Ch5: ; f1778 +Sfx_EggCrack_Ch5: togglesfx notetype $1, $f1 dutycycle $0 @@ -2993,13 +2707,11 @@ Sfx_EggCrack_Ch5: ; f1778 note __, 1 note F#, 1 endchannel -; f1784 -Sfx_Evolved: ; f1784 +Sfx_Evolved: musicheader 1, 5, Sfx_Evolved_Ch5 -; f1787 -Sfx_Evolved_Ch5: ; f1787 +Sfx_Evolved_Ch5: togglesfx notetype $1, $c1 octave 4 @@ -3018,13 +2730,11 @@ Sfx_Evolved_Ch5: ; f1787 octave 7 note C_, 16 endchannel -; f179b -Sfx_MasterBall: ; f179b +Sfx_MasterBall: musicheader 1, 5, Sfx_MasterBall_Ch5 -; f179e -Sfx_MasterBall_Ch5: ; f179e +Sfx_MasterBall_Ch5: togglesfx dutycycle $1 notetype $2, $e1 @@ -3053,13 +2763,11 @@ Sfx_MasterBall_Ch5: ; f179e note C#, 2 note C_, 2 endchannel -; f17c0 -Sfx_EggHatch: ; f17c0 +Sfx_EggHatch: musicheader 1, 5, Sfx_EggHatch_Ch5 -; f17c3 -Sfx_EggHatch_Ch5: ; f17c3 +Sfx_EggHatch_Ch5: togglesfx notetype $2, $f1 dutycycle $2 @@ -3076,33 +2784,29 @@ Sfx_EggHatch_Ch5: ; f17c3 intensity $42 note B_, 7 endchannel -; f17d9 -Sfx_GsIntroCharizardFireball: ; f17d9 +Sfx_GsIntroCharizardFireball: musicheader 1, 8, Sfx_GsIntroCharizardFireball_Ch8 -; f17dc -Sfx_GsIntroCharizardFireball_Ch8: ; f17dc +Sfx_GsIntroCharizardFireball_Ch8: noise __, 9, $cf, $4d noise __, 9, $f1, $37 -Sfx_GsIntroCharizardFireball_branch_f17e2: ; f17e2 +.loop noise __, 2, $f8, $4f noise __, 1, $c8, $26 noise __, 2, $d8, $5f noise __, 1, $a8, $37 - loopchannel 12, Sfx_GsIntroCharizardFireball_branch_f17e2 + loopchannel 12, .loop noise __, 4, $f8, $6f noise __, 5, $d8, $5f noise __, 13, $d8, $5c noise C#, 9, $d3, $4f endchannel -; f17ff -Sfx_GsIntroPokemonAppears: ; f17ff +Sfx_GsIntroPokemonAppears: musicheader 1, 8, Sfx_GsIntroPokemonAppears_Ch8 -; f1802 -Sfx_GsIntroPokemonAppears_Ch8: ; f1802 +Sfx_GsIntroPokemonAppears_Ch8: noise __, 2, $88, $4f noise __, 3, $8f, $2 noise __, 3, $5f, $12 @@ -3111,13 +2815,11 @@ Sfx_GsIntroPokemonAppears_Ch8: ; f1802 noise __, 2, $f8, $4f noise __, 9, $f1, $0 endchannel -; f1818 -Sfx_Flash: ; f1818 +Sfx_Flash: musicheader 1, 5, Sfx_Flash_Ch5 -; f181b -Sfx_Flash_Ch5: ; f181b +Sfx_Flash_Ch5: dutycycle $1 soundinput $ef sound __, 2, $40, $07e8 @@ -3131,13 +2833,11 @@ Sfx_Flash_Ch5: ; f181b sound __, 16, $12, $07e8 soundinput $8 endchannel -; f1846 -Sfx_GameFreakLogoGs: ; f1846 +Sfx_GameFreakLogoGs: musicheader 1, 5, Sfx_GameFreakLogoGs_Ch5 -; f1849 -Sfx_GameFreakLogoGs_Ch5: ; f1849 +Sfx_GameFreakLogoGs_Ch5: dutycycle $3 soundinput $7f sound __, 5, $55, $07e2 @@ -3152,16 +2852,14 @@ Sfx_GameFreakLogoGs_Ch5: ; f1849 sound __, 11, $15, $07e2 soundinput $8 endchannel -; f1878 -Sfx_DexFanfareLessThan20: ; f1878 +Sfx_DexFanfareLessThan20: 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 +Sfx_DexFanfareLessThan20_Ch5: togglesfx tempo 124 volume $77 @@ -3179,11 +2877,10 @@ Sfx_DexFanfareLessThan20_Ch5: ; f1884 note E_, 2 note D_, 6 endchannel -; f189a togglesfx -Sfx_DexFanfareLessThan20_Ch6: ; f189b +Sfx_DexFanfareLessThan20_Ch6: togglesfx notetype $8, $c1 octave 3 @@ -3199,11 +2896,10 @@ Sfx_DexFanfareLessThan20_Ch6: ; f189b note G_, 2 note F#, 6 endchannel -; f18ac togglesfx -Sfx_DexFanfareLessThan20_Ch7: ; f18ad +Sfx_DexFanfareLessThan20_Ch7: togglesfx notetype $8, $25 octave 4 @@ -3228,11 +2924,10 @@ Sfx_DexFanfareLessThan20_Ch7: ; f18ad note A_, 2 note __, 6 endchannel -; f18c7 togglesfx -Sfx_DexFanfareLessThan20_Ch8: ; f18c8 +Sfx_DexFanfareLessThan20_Ch8: togglesfx sfxtogglenoise $4 notetype $c @@ -3240,18 +2935,16 @@ Sfx_DexFanfareLessThan20_Ch8: ; f18c8 note __, 16 note __, 12 endchannel -; f18d1 togglesfx -Sfx_DexFanfare140169: ; f18d2 +Sfx_DexFanfare140169: 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 +Sfx_DexFanfare140169_Ch5: togglesfx tempo 120 volume $77 @@ -3277,11 +2970,10 @@ Sfx_DexFanfare140169_Ch5: ; f18de note B_, 8 note __, 8 endchannel -; f1900 togglesfx -Sfx_DexFanfare140169_Ch6: ; f1901 +Sfx_DexFanfare140169_Ch6: togglesfx dutycycle $2 vibrato $12, $34 @@ -3304,11 +2996,10 @@ Sfx_DexFanfare140169_Ch6: ; f1901 note G_, 8 note __, 8 endchannel -; f191d togglesfx -Sfx_DexFanfare140169_Ch7: ; f191e +Sfx_DexFanfare140169_Ch7: togglesfx notetype $c, $25 note __, 4 @@ -3339,36 +3030,33 @@ Sfx_DexFanfare140169_Ch7: ; f191e note G_, 4 note __, 4 endchannel -; f193e togglesfx -Sfx_DexFanfare140169_Ch8: ; f193f +Sfx_DexFanfare140169_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 4 -Sfx_DexFanfare140169_branch_f1945: ; f1945 +.loop note D_, 4 note C#, 1 note C#, 1 note C#, 1 note C#, 1 - loopchannel 3, Sfx_DexFanfare140169_branch_f1945 + loopchannel 3, .loop note D_, 8 endchannel -; f1950 togglesfx -Sfx_DexFanfare170199: ; f1951 +Sfx_DexFanfare170199: 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 +Sfx_DexFanfare170199_Ch5: togglesfx tempo 112 volume $77 @@ -3394,11 +3082,10 @@ Sfx_DexFanfare170199_Ch5: ; f195d note A#, 12 note __, 4 endchannel -; f1981 togglesfx -Sfx_DexFanfare170199_Ch6: ; f1982 +Sfx_DexFanfare170199_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3423,11 +3110,10 @@ Sfx_DexFanfare170199_Ch6: ; f1982 note D_, 12 note __, 4 endchannel -; f19a2 togglesfx -Sfx_DexFanfare170199_Ch7: ; f19a3 +Sfx_DexFanfare170199_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3452,11 +3138,10 @@ Sfx_DexFanfare170199_Ch7: ; f19a3 note A#, 12 note __, 4 endchannel -; f19bf togglesfx -Sfx_DexFanfare170199_Ch8: ; f19c0 +Sfx_DexFanfare170199_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -3475,18 +3160,16 @@ Sfx_DexFanfare170199_Ch8: ; f19c0 notetype $c note B_, 16 endchannel -; f19d5 db $fd -Sfx_DexFanfare200229: ; f19d6 +Sfx_DexFanfare200229: 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 +Sfx_DexFanfare200229_Ch5: togglesfx tempo 124 volume $77 @@ -3510,11 +3193,10 @@ Sfx_DexFanfare200229_Ch5: ; f19e2 note F#, 12 note __, 4 endchannel -; f1a03 togglesfx -Sfx_DexFanfare200229_Ch6: ; f1a04 +Sfx_DexFanfare200229_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3534,11 +3216,10 @@ Sfx_DexFanfare200229_Ch6: ; f1a04 note A_, 12 note __, 4 endchannel -; f1a1e togglesfx -Sfx_DexFanfare200229_Ch7: ; f1a1f +Sfx_DexFanfare200229_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3579,11 +3260,10 @@ Sfx_DexFanfare200229_Ch7: ; f1a1f note D_, 6 note __, 6 endchannel -; f1a49 togglesfx -Sfx_DexFanfare200229_Ch8: ; f1a4a +Sfx_DexFanfare200229_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -3609,18 +3289,16 @@ Sfx_DexFanfare200229_Ch8: ; f1a4a note D_, 2 note B_, 12 endchannel -; f1a65 togglesfx -Sfx_DexFanfare230Plus: ; f1a66 +Sfx_DexFanfare230Plus: 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 +Sfx_DexFanfare230Plus_Ch5: togglesfx tempo 112 volume $77 @@ -3665,11 +3343,10 @@ Sfx_DexFanfare230Plus_Ch5: ; f1a72 note A_, 14 note __, 2 endchannel -; f1ab1 togglesfx -Sfx_DexFanfare230Plus_Ch6: ; f1ab2 +Sfx_DexFanfare230Plus_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3701,11 +3378,10 @@ Sfx_DexFanfare230Plus_Ch6: ; f1ab2 note F#, 14 note __, 2 endchannel -; f1ad9 togglesfx -Sfx_DexFanfare230Plus_Ch7: ; f1ada +Sfx_DexFanfare230Plus_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3751,18 +3427,17 @@ Sfx_DexFanfare230Plus_Ch7: ; f1ada note D_, 14 note __, 2 endchannel -; f1b0b togglesfx -Sfx_DexFanfare230Plus_Ch8: ; f1b0c +Sfx_DexFanfare230Plus_Ch8: togglesfx sfxtogglenoise $4 notetype $8 note D_, 2 note D_, 2 note D_, 2 -Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 +.loop1 note D_, 6 note D_, 2 note D_, 2 @@ -3774,7 +3449,7 @@ Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, Sfx_DexFanfare230Plus_branch_f1b14 + loopchannel 2, .loop1 note D_, 6 note D_, 2 note D_, 2 @@ -3783,57 +3458,49 @@ Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 note D_, 4 note D_, 4 note D_, 4 -Sfx_DexFanfare230Plus_branch_f1b2b: ; f1b2b +.loop2 note C#, 1 - loopchannel 18, Sfx_DexFanfare230Plus_branch_f1b2b + loopchannel 18, .loop2 note D_, 6 endchannel -; f1b32 togglesfx -Sfx_NotVeryEffective: ; f1b33 +Sfx_NotVeryEffective: musicheader 1, 8, Sfx_NotVeryEffective_Ch8 -; f1b36 -Sfx_NotVeryEffective_Ch8: ; f1b36 +Sfx_NotVeryEffective_Ch8: noise __, 5, $f1, $5f noise __, 2, $a0, $42 noise C_, 1, $f1, $53 endchannel -; f1b40 -Sfx_Damage: ; f1b40 +Sfx_Damage: musicheader 1, 8, Sfx_Damage_Ch8 -; f1b43 -Sfx_Damage_Ch8: ; f1b43 +Sfx_Damage_Ch8: noise __, 5, $f1, $5e noise __, 2, $a0, $12 noise __, 5, $f0, $32 noise C_, 1, $f1, $44 endchannel -; f1b50 -Sfx_SuperEffective: ; f1b50 +Sfx_SuperEffective: musicheader 1, 8, Sfx_SuperEffective_Ch8 -; f1b53 -Sfx_SuperEffective_Ch8: ; f1b53 +Sfx_SuperEffective_Ch8: 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 +Sfx_BallBounce: musicheader 2, 5, Sfx_BallBounce_Ch5 musicheader 1, 6, Sfx_BallBounce_Ch6 -; f1b69 -Sfx_BallBounce_Ch5: ; f1b69 +Sfx_BallBounce_Ch5: dutycycle $2 sound __, 9, $e1, $0740 sound C_, 8, $0, 0 @@ -3844,9 +3511,8 @@ Sfx_BallBounce_Ch5: ; f1b69 sound __, 9, $51, $0740 sound C_, 8, $0, 0 endchannel -; f1b8c -Sfx_BallBounce_Ch6: ; f1b8c +Sfx_BallBounce_Ch6: dutycycle $2 sound __, 3, $8, 0 sound __, 9, $b1, $0741 @@ -3858,14 +3524,12 @@ Sfx_BallBounce_Ch6: ; f1b8c sound __, 9, $21, $0741 sound C_, 8, $0, 0 endchannel -; f1bb3 -Sfx_SweetScent2: ; f1bb3 +Sfx_SweetScent2: musicheader 2, 5, Sfx_SweetScent2_Ch5 musicheader 1, 8, Sfx_SweetScent2_Ch8 -; f1bb9 -Sfx_SweetScent2_Ch5: ; f1bb9 +Sfx_SweetScent2_Ch5: soundinput $af dutycycle $1 sound __, 7, $f8, $05f0 @@ -3873,49 +3537,43 @@ Sfx_SweetScent2_Ch5: ; f1bb9 sound C_, 1, $f1, $0650 soundinput $8 endchannel -; f1bcc -Sfx_SweetScent2_Ch8: ; f1bcc +Sfx_SweetScent2_Ch8: noise __, 3, $e8, $22 noise C_, 2, $aa, $0 -Sfx_SweetScent2_branch_f1bd2: ; f1bd2 +.loop noise __, 5, $d9, $10 noise __, 9, $91, $0 noise __, 3, $61, $7 - loopchannel 5, Sfx_SweetScent2_branch_f1bd2 + loopchannel 5, .loop noise __, 5, $99, $0 noise __, 11, $61, $0 noise __, 7, $59, $0 noise __, 3, $21, $7 endchannel -; f1bec -Sfx_HitEndOfExpBar: ; f1bec +Sfx_HitEndOfExpBar: musicheader 2, 5, Sfx_HitEndOfExpBar_Ch5 musicheader 1, 6, Sfx_HitEndOfExpBar_Ch6 -; f1bf2 -Sfx_HitEndOfExpBar_Ch5: ; f1bf2 +Sfx_HitEndOfExpBar_Ch5: dutycycle $2 sound __, 2, $e1, $0789 sound __, 2, $e1, $07a2 sound C_, 1, $e1, $07b1 endchannel -; f1c01 -Sfx_HitEndOfExpBar_Ch6: ; f1c01 +Sfx_HitEndOfExpBar_Ch6: dutycycle $2 sound __, 2, $e1, $07a2 sound __, 2, $e1, $07b1 sound C_, 1, $e1, $07c4 endchannel -; f1c10 -Sfx_GiveTrademon: ; f1c10 +Sfx_GiveTrademon: musicheader 1, 5, Sfx_GiveTrademon_Ch5 -; f1c13 -Sfx_GiveTrademon_Ch5: ; f1c13 +Sfx_GiveTrademon_Ch5: sound C#, 1, $0, 0 dutycycle $1 soundinput $a7 @@ -3929,13 +3587,11 @@ Sfx_GiveTrademon_Ch5: ; f1c13 sound C_, 12, $14, $0750 soundinput $8 endchannel -; f1c3e -Sfx_GetTrademon: ; f1c3e +Sfx_GetTrademon: musicheader 1, 5, Sfx_GetTrademon_Ch5 -; f1c41 -Sfx_GetTrademon_Ch5: ; f1c41 +Sfx_GetTrademon_Ch5: sound C#, 1, $0, 0 dutycycle $2 soundinput $bf @@ -3949,18 +3605,16 @@ Sfx_GetTrademon_Ch5: ; f1c41 sound C_, 12, $f4, $07bc soundinput $8 endchannel -; f1c6c -Sfx_TrainArrived: ; f1c6c +Sfx_TrainArrived: musicheader 3, 5, Sfx_TrainArrived_Ch5 musicheader 1, 6, Sfx_TrainArrived_Ch6 musicheader 1, 8, Sfx_TrainArrived_Ch8 -; f1c75 -Sfx_TrainArrived_Ch6: ; f1c75 +Sfx_TrainArrived_Ch6: tone $0008 sound __, 9, $0, 0 -Sfx_TrainArrived_Ch5: ; f1c7c +Sfx_TrainArrived_Ch5: dutycycle $2 sound __, 5, $5f, $0691 sound __, 5, $6f, $0694 @@ -3970,9 +3624,8 @@ Sfx_TrainArrived_Ch5: ; f1c7c sound C_, 1, $6f, $06ab sound F_, 9, $65, $06a8 endchannel -; f1c9b -Sfx_TrainArrived_Ch8: ; f1c9b +Sfx_TrainArrived_Ch8: noise __, 6, $af, $10 noise __, 5, $9f, $20 noise __, 5, $8f, $21 @@ -3982,36 +3635,31 @@ Sfx_TrainArrived_Ch8: ; f1c9b noise __, 5, $9f, $10 noise F_, 9, $a3, $0 endchannel -; f1cb4 -Sfx_2Boops: ; f1cb4 +Sfx_2Boops: musicheader 1, 5, Sfx_2Boops_Ch5 -; f1cb7 -Sfx_2Boops_Ch5: ; f1cb7 +Sfx_2Boops_Ch5: dutycycle $2 -Sfx_2Boops_branch_f1cb9: ; f1cb9 +.loop soundinput $79 sound __, 2, $99, $0563 sound __, 5, $f2, $04b5 soundinput $43 sound C_, 1, $f8, $05cd - loopchannel 2, Sfx_2Boops_branch_f1cb9 + loopchannel 2, .loop soundinput $8 endchannel -; f1cd0 -Sfx_UnknownCB: ; f1cd0 - musicheader 1, 8, Sfx_UnknownCB_Ch8 -; f1cd3 +Sfx_IntroWhoosh: + musicheader 1, 8, Sfx_IntroWhoosh_Ch8 -Sfx_Menu_Ch8: ; f1cd3 +Sfx_Menu_Ch8: noise __, 2, $e2, $33 noise __, 9, $e1, $22 endchannel -; f1cda -Sfx_Pokeflute_Ch7: ; f1cda +Sfx_Pokeflute_Ch7: tempo 256 volume $77 togglesfx @@ -4035,37 +3683,32 @@ Sfx_Pokeflute_Ch7: ; f1cda note G_, 8 note __, 12 endchannel -; f1cf8 -Sfx_PlacePuzzlePieceDown_Ch8: ; f1cf8 +Sfx_PlacePuzzlePieceDown_Ch8: 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 +Sfx_EnterDoor_Ch8: noise __, 10, $f1, $44 noise __, 9, $d1, $43 endchannel -; f1d0f -Sfx_SwitchPokemon_Ch5: ; f1d0f +Sfx_SwitchPokemon_Ch5: dutycycle $2 sound __, 9, $e1, $0740 endchannel -; f1d16 -Sfx_SwitchPokemon_Ch6: ; f1d16 +Sfx_SwitchPokemon_Ch6: dutycycle $2 sound __, 3, $8, 0 sound __, 9, $b1, $0741 endchannel -; f1d21 -Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21 +Sfx_PokeballsPlacedOnTable_Ch5: dutycycle $2 soundinput $3a sound __, 5, $f2, $0200 @@ -4073,9 +3716,8 @@ Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21 sound __, 9, $e2, $0200 soundinput $8 endchannel -; f1d32 -Sfx_BallWobble_Ch5: ; f1d32 +Sfx_BallWobble_Ch5: dutycycle $2 soundinput $3a sound __, 5, $f2, $0400 @@ -4083,84 +3725,73 @@ Sfx_BallWobble_Ch5: ; f1d32 sound __, 9, $e2, $0400 soundinput $8 endchannel -; f1d43 -Sfx_Tally_Ch5: ; f1d43 +Sfx_Tally_Ch5: dutycycle $2 sound __, 5, $f1, $0780 endchannel -; f1d4a -Sfx_Tally_Ch6: ; f1d4a +Sfx_Tally_Ch6: dutycycle $2 sound __, 2, $8, 0 sound __, 5, $a1, $0761 endchannel -; f1d55 -Sfx_Transaction_Ch5: ; f1d55 +Sfx_Transaction_Ch5: dutycycle $2 sound __, 5, $e1, $0700 sound C_, 9, $f2, $07e0 endchannel -; f1d60 -Sfx_Transaction_Ch6: ; f1d60 +Sfx_Transaction_Ch6: dutycycle $2 sound __, 2, $8, 0 sound __, 5, $91, $06c1 sound C_, 9, $a2, $07a1 endchannel -; f1d6f -Sfx_Bump_Ch5: ; f1d6f +Sfx_Bump_Ch5: dutycycle $2 soundinput $5a sound __, 16, $f1, $0300 soundinput $8 endchannel -; f1d7a -Sfx_ExitBuilding_Ch8: ; f1d7a +Sfx_ExitBuilding_Ch8: noise __, 3, $f1, $54 noise __, 13, $71, $23 noise __, 3, $b1, $54 noise __, 13, $61, $23 noise __, 7, $41, $54 endchannel -; f1d8a -Sfx_ReadText2_Ch5: ; f1d8a -Sfx_ReadText_Ch5: ; f1d8a +Sfx_ReadText2_Ch5: +Sfx_ReadText_Ch5: dutycycle $2 sound __, 1, $91, $07c0 sound __, 1, $81, $07d0 sound __, 1, $91, $07c0 sound __, 13, $a1, $07d0 endchannel -; f1d9d -Sfx_Potion_Ch5: ; f1d9d +Sfx_Potion_Ch5: dutycycle $2 soundinput $17 sound __, 16, $f0, $04f0 sound __, 16, $f2, $0650 soundinput $8 endchannel -; f1dac -Sfx_Poison_Ch5: ; f1dac -Sfx_Poison_branch_f1dac: ; f1dac +Sfx_Poison_Ch5: dutycycle $0 soundinput $14 sound __, 5, $f2, $0600 - loopchannel 4, Sfx_Poison_branch_f1dac + loopchannel 4, Sfx_Poison_Ch5 sound __, 16, $f3, $0600 soundinput $8 endchannel -; f1dbf -Sfx_FullHeal_Ch5: ; f1dbf +Sfx_FullHeal_Ch5: dutycycle $2 soundinput $14 sound __, 5, $f2, $0600 @@ -4169,18 +3800,16 @@ Sfx_FullHeal_Ch5: ; f1dbf sound __, 16, $f2, $0600 soundinput $8 endchannel -; f1dd4 -Sfx_GotSafariBalls_Ch5: ; f1dd4 +Sfx_GotSafariBalls_Ch5: dutycycle $2 soundinput $15 sound __, 16, $f0, $04f0 sound __, 16, $f2, $0650 soundinput $8 endchannel -; f1de3 -Sfx_BootPc_Ch5: ; f1de3 +Sfx_BootPc_Ch5: dutycycle $2 sound __, 16, $f2, $07c0 sound __, 16, $0, 0 @@ -4193,27 +3822,24 @@ Sfx_BootPc_Ch5: ; f1de3 sound __, 4, $a1, $07c0 sound __, 9, $a1, $0700 endchannel -; f1e0e -Sfx_ShutDownPc_Ch5: ; f1e0e +Sfx_ShutDownPc_Ch5: dutycycle $2 sound __, 5, $f0, $0600 sound __, 5, $f0, $0400 sound __, 5, $f0, $0200 sound __, 2, $0, 0 endchannel -; f1e21 -Sfx_ChoosePcOption_Ch5: ; f1e21 +Sfx_ChoosePcOption_Ch5: dutycycle $2 sound __, 7, $f0, $0700 sound __, 5, $0, 0 sound __, 7, $f0, $0700 sound __, 2, $0, 0 endchannel -; f1e34 -Sfx_EscapeRope_Ch5: ; f1e34 +Sfx_EscapeRope_Ch5: dutycycle $1 soundinput $17 sound __, 16, $d7, $0600 @@ -4223,9 +3849,8 @@ Sfx_EscapeRope_Ch5: ; f1e34 sound __, 16, $17, $0400 soundinput $8 endchannel -; f1e4f -Sfx_PushButton_Ch5: ; f1e4f +Sfx_PushButton_Ch5: dutycycle $2 sound __, 5, $0, 0 sound __, 3, $f1, $0680 @@ -4233,9 +3858,8 @@ Sfx_PushButton_Ch5: ; f1e4f sound __, 5, $f1, $0780 sound __, 5, $0, 0 endchannel -; f1e66 -Sfx_SecondPartOfItemfinder_Ch5: ; f1e66 +Sfx_SecondPartOfItemfinder_Ch5: dutycycle $2 soundinput $2c sound __, 5, $f2, $0500 @@ -4244,9 +3868,8 @@ Sfx_SecondPartOfItemfinder_Ch5: ; f1e66 soundinput $8 sound __, 2, $0, 0 endchannel -; f1e7b -Sfx_WarpTo_Ch5: ; f1e7b +Sfx_WarpTo_Ch5: dutycycle $1 soundinput $17 sound __, 16, $d7, $0500 @@ -4256,9 +3879,8 @@ Sfx_WarpTo_Ch5: ; f1e7b sound __, 16, $17, $0700 soundinput $8 endchannel -; f1e96 -Sfx_WarpFrom_Ch5: ; f1e96 +Sfx_WarpFrom_Ch5: dutycycle $1 soundinput $17 sound __, 16, $d7, $0700 @@ -4268,33 +3890,29 @@ Sfx_WarpFrom_Ch5: ; f1e96 sound __, 16, $17, $0500 soundinput $8 endchannel -; f1eb1 -Sfx_ChangeDexMode_Ch5: ; f1eb1 +Sfx_ChangeDexMode_Ch5: dutycycle $1 soundinput $16 sound __, 16, $d2, $0500 soundinput $8 endchannel -; f1ebc -Sfx_JumpOverLedge_Ch5: ; f1ebc +Sfx_JumpOverLedge_Ch5: dutycycle $2 soundinput $95 sound __, 16, $f2, $0400 soundinput $8 endchannel -; f1ec7 -Sfx_GrassRustle_Ch8: ; f1ec7 +Sfx_GrassRustle_Ch8: noise __, 3, $f1, $32 noise __, 3, $0, $0 noise __, 3, $f1, $22 noise __, 2, $0, $0 endchannel -; f1ed4 -Sfx_Fly_Ch8: ; f1ed4 +Sfx_Fly_Ch8: noise __, 3, $f1, $12 noise __, 3, $0, $0 noise __, 3, $a1, $12 @@ -4312,9 +3930,8 @@ Sfx_Fly_Ch8: ; f1ed4 noise __, 3, $41, $12 noise __, 3, $0, $0 endchannel -; f1f05 -Sfx_Wrong_Ch5: ; f1f05 +Sfx_Wrong_Ch5: dutycycle $3 soundinput $5a sound __, 5, $f0, $0500 @@ -4323,26 +3940,23 @@ Sfx_Wrong_Ch5: ; f1f05 sound __, 16, $f0, $0500 sound __, 2, $0, 0 endchannel -; f1f1c -Sfx_Wrong_Ch6: ; f1f1c +Sfx_Wrong_Ch6: dutycycle $3 sound __, 5, $f0, $0401 sound __, 5, $0, 0 sound __, 16, $f0, $0401 sound __, 2, $0, 0 endchannel -; f1f2f -Sfx_Squeak_Ch5: ; f1f2f +Sfx_Squeak_Ch5: dutycycle $0 soundinput $17 sound __, 16, $d2, $0700 soundinput $8 endchannel -; f1f3a -Sfx_Strength_Ch8: ; f1f3a +Sfx_Strength_Ch8: noise __, 5, $a2, $23 noise __, 9, $f1, $34 noise __, 16, $0, $0 @@ -4352,9 +3966,8 @@ Sfx_Strength_Ch8: ; f1f3a noise __, 9, $f4, $55 noise __, 9, $f1, $44 endchannel -; f1f53 -Sfx_Boat_Ch5: ; f1f53 +Sfx_Boat_Ch5: dutycycle $2 sound __, 16, $f0, $0500 sound __, 5, $0, 0 @@ -4364,9 +3977,8 @@ Sfx_Boat_Ch5: ; f1f53 sound __, 16, $f0, $0500 sound __, 16, $f2, $0500 endchannel -; f1f72 -Sfx_Boat_Ch6: ; f1f72 +Sfx_Boat_Ch6: dutycycle $3 sound __, 16, $f0, $0482 sound __, 5, $0, 0 @@ -4376,9 +3988,8 @@ Sfx_Boat_Ch6: ; f1f72 sound __, 16, $f0, $0482 sound __, 16, $f2, $0482 endchannel -; f1f91 -Sfx_WallOpen_Ch5: ; f1f91 +Sfx_WallOpen_Ch5: dutycycle $1 soundinput $3a sound __, 5, $f2, $0500 @@ -4390,9 +4001,8 @@ Sfx_WallOpen_Ch5: ; f1f91 sound __, 16, $e2, $0700 soundinput $8 endchannel -; f1fae -Sfx_ElevatorEnd_Ch5: ; f1fae +Sfx_ElevatorEnd_Ch5: dutycycle $2 sound __, 16, $f3, $0730 sound __, 9, $65, $0730 @@ -4401,22 +4011,19 @@ Sfx_ElevatorEnd_Ch5: ; f1fae sound __, 16, $44, $0700 sound __, 16, $24, $0700 endchannel -; f1fc9 -Sfx_ThrowBall_Ch5: ; f1fc9 +Sfx_ThrowBall_Ch5: dutycycle $2 soundinput $2f sound __, 16, $f2, $0780 endchannel -; f1fd2 -Sfx_ThrowBall_Ch6: ; f1fd2 +Sfx_ThrowBall_Ch6: dutycycle $2 sound __, 16, $c2, $0782 endchannel -; f1fd9 -Sfx_Shine_Ch5: ; f1fd9 +Sfx_Shine_Ch5: dutycycle $0 sound __, 1, $d2, $0700 sound __, 1, $d2, $0740 @@ -4425,35 +4032,30 @@ Sfx_Shine_Ch5: ; f1fd9 sound __, 11, $e1, $07e0 sound __, 2, $0, 0 endchannel -; f1ff4 -Sfx_BallPoof_Ch5: ; f1ff4 +Sfx_BallPoof_Ch5: dutycycle $2 soundinput $16 sound __, 16, $f2, $0400 soundinput $8 endchannel -; f1fff -Sfx_BallPoof_Ch8: ; f1fff +Sfx_BallPoof_Ch8: noise __, 16, $a2, $22 endchannel -; f2003 -Sfx_Unknown3A_Ch5: ; f2003 +Sfx_Unknown3A_Ch5: sound __, 16, $d1, $0200 soundinput $8 endchannel -; f200a -Sfx_Unknown3A_Ch8: ; f200a +Sfx_Unknown3A_Ch8: noise __, 5, $f5, $33 noise __, 9, $f4, $22 noise __, 16, $f2, $21 endchannel -; f2014 -Sfx_Run_Ch8: ; f2014 +Sfx_Run_Ch8: noise __, 3, $61, $23 noise __, 3, $a1, $33 noise __, 3, $c1, $33 @@ -4466,9 +4068,8 @@ Sfx_Run_Ch8: ; f2014 noise __, 3, $31, $11 noise __, 9, $41, $33 endchannel -; f2036 -Sfx_SlotMachineStart_Ch5: ; f2036 +Sfx_SlotMachineStart_Ch5: dutycycle $2 soundinput $44 sound __, 16, $f0, $04f0 @@ -4476,16 +4077,14 @@ Sfx_SlotMachineStart_Ch5: ; f2036 sound __, 16, $f2, $0650 soundinput $8 endchannel -; f2047 -Sfx_SlotMachineStart_Ch6: ; f2047 +Sfx_SlotMachineStart_Ch6: dutycycle $2 sound __, 16, $92, $0600 sound __, 16, $92, $0782 endchannel -; f2052 -Sfx_Call_Ch5: ; f2052 +Sfx_Call_Ch5: soundinput $67 sound __, 5, $f7, $07a0 sound __, 5, $f7, $07a0 @@ -4495,108 +4094,92 @@ Sfx_Call_Ch5: ; f2052 soundinput $8 sound __, 5, $0, 0 endchannel -; f206f -Sfx_Peck_Ch8: ; f206f +Sfx_Peck_Ch8: noise __, 3, $a1, $12 endchannel -; f2073 -Sfx_Kinesis_Ch5: ; f2073 +Sfx_Kinesis_Ch5: dutycycle $1 soundinput $af sound __, 16, $f2, $0780 soundinput $8 endchannel -; f207e -Sfx_Lick_Ch5: ; f207e +Sfx_Lick_Ch5: dutycycle $1 soundinput $97 sound __, 16, $f2, $0500 soundinput $8 endchannel -; f2089 -Sfx_Pound_Ch8: ; f2089 +Sfx_Pound_Ch8: noise __, 3, $a1, $22 endchannel -; f208d -Sfx_MovePuzzlePiece_Ch8: ; f208d +Sfx_MovePuzzlePiece_Ch8: noise __, 9, $f1, $54 endchannel -; f2091 -Sfx_CometPunch_Ch8: ; f2091 +Sfx_CometPunch_Ch8: noise __, 16, $8f, $11 noise __, 5, $ff, $12 noise __, 11, $f1, $55 endchannel -; f209b -Sfx_MegaPunch_Ch8: ; f209b +Sfx_MegaPunch_Ch8: noise __, 16, $8f, $34 noise __, 9, $f2, $35 noise __, 11, $f1, $55 endchannel -; f20a5 -Sfx_Scratch_Ch8: ; f20a5 +Sfx_Scratch_Ch8: noise __, 16, $9f, $23 noise __, 9, $f1, $21 endchannel -; f20ac -Sfx_Vicegrip_Ch8: ; f20ac +Sfx_Vicegrip_Ch8: noise __, 3, $e1, $4b noise __, 11, $f1, $44 noise __, 3, $e1, $3a noise __, 7, $f1, $34 endchannel -; f20b9 -Sfx_RazorWind_Ch8: ; f20b9 +Sfx_RazorWind_Ch8: noise __, 3, $f4, $44 noise __, 3, $f4, $14 noise __, 16, $f1, $32 endchannel -; f20c3 -Sfx_Cut_Ch8: ; f20c3 +Sfx_Cut_Ch8: 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 +Sfx_WingAttack_Ch8: noise __, 9, $4f, $23 noise __, 5, $c4, $22 noise __, 7, $f2, $23 - loopchannel 4, Sfx_WingAttack_branch_f20d0 + loopchannel 4, Sfx_WingAttack_Ch8 endchannel -; f20de -Sfx_Whirlwind_Ch8: ; f20de +Sfx_Whirlwind_Ch8: noise __, 9, $4f, $33 noise __, 5, $c4, $22 noise __, 7, $f2, $23 noise __, 16, $f2, $22 endchannel -; f20eb -Sfx_Bind_Ch8: ; f20eb +Sfx_Bind_Ch8: noise __, 9, $ff, $32 noise __, 9, $f4, $43 noise __, 9, $f2, $54 noise __, 9, $f1, $65 endchannel -; f20f8 -Sfx_VineWhip_Ch8: ; f20f8 +Sfx_VineWhip_Ch8: noise __, 2, $c2, $33 noise __, 3, $f2, $21 noise __, 2, $e2, $33 @@ -4606,62 +4189,53 @@ Sfx_VineWhip_Ch8: ; f20f8 noise __, 13, $91, $10 noise __, 9, $f2, $41 endchannel -; f2111 -Sfx_DoubleKick_Ch8: ; f2111 +Sfx_DoubleKick_Ch8: noise __, 2, $94, $23 noise __, 2, $b4, $22 noise __, 9, $f1, $44 endchannel -; f211b -Sfx_MegaKick_Ch8: ; f211b +Sfx_MegaKick_Ch8: noise __, 3, $94, $33 noise __, 5, $b4, $22 noise __, 5, $f1, $44 noise __, 9, $f1, $55 endchannel -; f2128 -Sfx_Headbutt_Ch8: ; f2128 +Sfx_Headbutt_Ch8: noise __, 5, $ff, $55 noise __, 9, $f1, $65 endchannel -; f212f -Sfx_HornAttack_Ch8: ; f212f +Sfx_HornAttack_Ch8: noise __, 3, $84, $43 noise __, 3, $c4, $22 noise __, 9, $f2, $34 endchannel -; f2139 -Sfx_Tackle_Ch8: ; f2139 +Sfx_Tackle_Ch8: noise __, 5, $f1, $34 noise __, 16, $f2, $64 endchannel -; f2140 -Sfx_PoisonSting_Ch8: ; f2140 +Sfx_PoisonSting_Ch8: noise __, 3, $f1, $22 noise __, 16, $f2, $12 endchannel -; f2147 -Sfx_Powder_Ch8: ; f2147 +Sfx_Powder_Ch8: noise __, 3, $c2, $1 noise __, 16, $f4, $1 noise __, 16, $f2, $1 endchannel -; f2151 -Sfx_Doubleslap_Ch8: ; f2151 +Sfx_Doubleslap_Ch8: noise __, 9, $f1, $32 noise __, 9, $f1, $33 endchannel -; f2158 -Sfx_Bite_Ch5: ; f2158 +Sfx_Bite_Ch5: dutycycle $0 soundinput $3a sound __, 5, $f2, $0200 @@ -4669,78 +4243,68 @@ Sfx_Bite_Ch5: ; f2158 sound __, 9, $e2, $0200 soundinput $8 endchannel -; f2169 -Sfx_Bite_Ch8: ; f2169 +Sfx_Bite_Ch8: noise __, 1, $d1, $42 noise __, 5, $a1, $32 noise __, 1, $d1, $22 noise __, 7, $a1, $32 endchannel -; f2176 -Sfx_JumpKick_Ch8: ; f2176 +Sfx_JumpKick_Ch8: noise __, 4, $92, $31 noise __, 4, $b2, $32 noise __, 4, $c2, $33 noise __, 9, $f1, $54 endchannel -; f2183 -Sfx_Stomp_Ch8: ; f2183 +Sfx_Stomp_Ch8: noise __, 13, $f1, $54 noise __, 9, $f1, $64 endchannel -; f218a -Sfx_TailWhip_Ch8: ; f218a +Sfx_TailWhip_Ch8: 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 +Sfx_KarateChop_Ch8: noise __, 3, $d2, $32 noise __, 16, $f2, $43 endchannel -; f21a1 -Sfx_Submission_Ch8: ; f21a1 +Sfx_Submission_Ch8: noise __, 3, $f2, $43 noise __, 5, $b5, $32 noise __, 10, $86, $31 noise __, 8, $64, $0 noise __, 16, $f2, $55 endchannel -; f21b1 -Sfx_WaterGun_Ch5: ; f21b1 +Sfx_WaterGun_Ch5: dutycycle $1 soundinput $97 sound __, 16, $f2, $0700 soundinput $8 endchannel -; f21bc -Sfx_WaterGun_Ch8: ; f21bc +Sfx_WaterGun_Ch8: noise __, 16, $3f, $22 noise __, 16, $f2, $21 endchannel -; f21c3 -Sfx_SwordsDance_Ch8: ; f21c3 +Sfx_SwordsDance_Ch8: 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 +Sfx_Thunder_Ch8: noise __, 11, $ff, $50 noise __, 16, $ff, $51 noise __, 9, $f2, $51 @@ -4749,261 +4313,212 @@ Sfx_Thunder_Ch8: ; f21d3 noise __, 9, $ff, $54 noise __, 16, $f2, $54 endchannel -; f21e9 -Sfx_Supersonic_Ch5: ; f21e9 +Sfx_Supersonic_Ch5: dutycycle $2 sound __, 16, $3f, $07c0 -Sfx_Supersonic_branch_f21ef: ; f21ef +.loop sound __, 16, $df, $07c0 - loopchannel 4, Sfx_Supersonic_branch_f21ef + loopchannel 4, .loop sound __, 16, $d1, $07c0 endchannel -; f21fc -Sfx_Supersonic_Ch6: ; f21fc +Sfx_Supersonic_Ch6: sound_duty 3, 0, 3, 2 sound __, 16, $2f, $07c8 -Sfx_Supersonic_branch_f2202: ; f2202 +.loop sound __, 16, $cf, $07c7 - loopchannel 4, Sfx_Supersonic_branch_f2202 + loopchannel 4, .loop sound __, 16, $c1, $07c8 endchannel -; f220f -Sfx_Supersonic_Ch8: ; f220f -Sfx_Supersonic_branch_f220f: ; f220f +Sfx_Supersonic_Ch8: noise __, 4, $97, $12 noise __, 4, $a1, $11 - loopchannel 10, Sfx_Supersonic_branch_f220f + loopchannel 10, Sfx_Supersonic_Ch8 endchannel -; f221a -Sfx_Leer_Ch5: ; f221a -Sfx_Leer_branch_f221a: ; f221a +Sfx_Leer_Ch5: dutycycle $0 sound __, 1, $f1, $07c0 sound __, 1, $f1, $0700 - loopchannel 12, Sfx_Leer_branch_f221a + loopchannel 12, Sfx_Leer_Ch5 endchannel -; f2229 -Sfx_Leer_Ch6: ; f2229 -Sfx_Leer_branch_f2229: ; f2229 +Sfx_Leer_Ch6: sound_duty 3, 0, 3, 2 sound __, 1, $e1, $07c1 sound __, 1, $e1, $0701 - loopchannel 12, Sfx_Leer_branch_f2229 + loopchannel 12, Sfx_Leer_Ch6 endchannel -; f2238 -Sfx_Leer_Ch8: ; f2238 -Sfx_Leer_branch_f2238: ; f2238 +Sfx_Leer_Ch8: noise __, 2, $d1, $49 noise __, 2, $d1, $29 - loopchannel 6, Sfx_Leer_branch_f2238 + loopchannel 6, Sfx_Leer_Ch8 endchannel -; f2243 -Sfx_Ember_Ch5: ; f2243 -Sfx_Ember_branch_f2243: ; f2243 +Sfx_Ember_Ch5: sound_duty 1, 2, 0, 3 sound __, 12, $f3, $0120 sound __, 10, $d3, $0150 - loopchannel 5, Sfx_Ember_branch_f2243 + loopchannel 5, Sfx_Ember_Ch5 sound __, 9, $e3, $0130 sound __, 16, $c2, $0110 endchannel -; f225a -Sfx_Ember_Ch8: ; f225a -Sfx_Ember_branch_f225a: ; f225a +Sfx_Ember_Ch8: noise __, 11, $f3, $35 noise __, 15, $f6, $45 - loopchannel 4, Sfx_Ember_branch_f225a + loopchannel 4, Sfx_Ember_Ch8 noise __, 13, $f4, $bc noise __, 13, $f5, $9c noise __, 16, $f4, $ac endchannel -; f226e -Sfx_Bubblebeam_Ch5: ; f226e -Sfx_Bubblebeam_branch_f226e: ; f226e +Sfx_Bubblebeam_Ch5: sound_duty 1, 2, 3, 0 sound __, 5, $f4, $0600 sound __, 4, $c4, $0500 sound __, 6, $b5, $0600 sound __, 14, $e2, $06c0 - loopchannel 3, Sfx_Bubblebeam_branch_f226e + loopchannel 3, Sfx_Bubblebeam_Ch5 sound __, 9, $d1, $0600 endchannel -; f2289 -Sfx_Bubblebeam_Ch6: ; f2289 -Sfx_Bubblebeam_branch_f2289: ; f2289 +Sfx_Bubblebeam_Ch6: sound_duty 1, 3, 0, 2 sound __, 6, $e4, $05e0 sound __, 5, $b4, $04e0 sound __, 7, $a5, $05e8 sound __, 15, $d1, $06a0 - loopchannel 3, Sfx_Bubblebeam_branch_f2289 + loopchannel 3, Sfx_Bubblebeam_Ch6 endchannel -; f22a0 -Sfx_Bubblebeam_Ch8: ; f22a0 -Sfx_Bubblebeam_branch_f22a0: ; f22a0 +Sfx_Bubblebeam_Ch8: noise __, 6, $c3, $33 noise __, 4, $92, $43 noise __, 11, $b5, $33 noise __, 16, $c3, $32 - loopchannel 2, Sfx_Bubblebeam_branch_f22a0 + loopchannel 2, Sfx_Bubblebeam_Ch8 endchannel -; f22b1 -Sfx_HydroPump_Ch5: ; f22b1 -Sfx_HydroPump_branch_f22b1: ; f22b1 +Sfx_HydroPump_Ch5: sound_duty 2, 0, 1, 3 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 + loopchannel 5, Sfx_HydroPump_Ch5 sound __, 9, $81, $0400 endchannel -; f22d0 -Sfx_HydroPump_Ch8: ; f22d0 -Sfx_HydroPump_branch_f22d0: ; f22d0 +Sfx_HydroPump_Ch8: 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 + loopchannel 5, Sfx_HydroPump_Ch8 noise __, 9, $81, $12 endchannel -; f22e7 -Sfx_Surf_Ch5: ; f22e7 -Sfx_Surf_branch_f22e7: ; f22e7 +Sfx_Surf_Ch5: sound_duty 1, 2, 3, 0 sound __, 16, $f4, $0500 sound __, 16, $c4, $0400 sound __, 16, $e2, $05c0 - loopchannel 3, Sfx_Surf_branch_f22e7 + loopchannel 3, Sfx_Surf_Ch5 endchannel -; f22fa -Sfx_Surf_Ch6: ; f22fa -Sfx_Surf_branch_f22fa: ; f22fa +Sfx_Surf_Ch6: sound_duty 1, 3, 0, 2 sound __, 8, $e4, $0430 sound __, 16, $b4, $0330 sound __, 16, $a2, $0438 - loopchannel 4, Sfx_Surf_branch_f22fa + loopchannel 4, Sfx_Surf_Ch6 endchannel -; f230d -Sfx_Surf_Ch8: ; f230d -Sfx_Surf_branch_f230d: ; f230d +Sfx_Surf_Ch8: noise __, 10, $f4, $44 noise __, 10, $f2, $43 noise __, 16, $f4, $42 noise __, 16, $f4, $41 - loopchannel 3, Sfx_Surf_branch_f230d + loopchannel 3, Sfx_Surf_Ch8 endchannel -; f231e -Sfx_Psybeam_Ch5: ; f231e -Sfx_Psybeam_branch_f231e: ; f231e +Sfx_Psybeam_Ch5: sound_duty 1, 0, 2, 2 sound __, 11, $f1, $0640 sound __, 11, $f3, $0680 sound __, 11, $f2, $0620 - loopchannel 4, Sfx_Psybeam_branch_f231e + loopchannel 4, Sfx_Psybeam_Ch5 sound __, 11, $f1, $0640 endchannel -; f2335 -Sfx_Psybeam_Ch6: ; f2335 -Sfx_Psybeam_branch_f2335: ; f2335 +Sfx_Psybeam_Ch6: sound_duty 3, 0, 3, 2 sound __, 11, $f3, $0571 sound __, 8, $e3, $0531 sound __, 11, $f1, $0551 - loopchannel 4, Sfx_Psybeam_branch_f2335 + loopchannel 4, Sfx_Psybeam_Ch6 sound __, 11, $f1, $0571 endchannel -; f234c -Sfx_Psybeam_Ch8: ; f234c -Sfx_Psybeam_branch_f234c: ; f234c +Sfx_Psybeam_Ch8: noise __, 3, $d1, $4a noise __, 3, $d2, $2a - loopchannel 21, Sfx_Psybeam_branch_f234c + loopchannel 21, Sfx_Psybeam_Ch8 endchannel -; f2357 -Sfx_Charge_Ch5: ; f2357 -Sfx_Charge_branch_f2357: ; f2357 +Sfx_Charge_Ch5: dutycycle $0 sound __, 3, $f1, $0200 sound __, 4, $f1, $0700 sound __, 5, $f1, $0500 sound __, 6, $f1, $07f0 - loopchannel 8, Sfx_Charge_branch_f2357 + loopchannel 8, Sfx_Charge_Ch5 endchannel -; f236e -Sfx_Charge_Ch6: ; f236e -Sfx_Charge_branch_f236e: ; f236e +Sfx_Charge_Ch6: sound_duty 3, 0, 3, 2 sound __, 3, $e1, $0302 sound __, 4, $e1, $07f2 sound __, 5, $e1, $0602 sound __, 6, $e1, $0702 - loopchannel 8, Sfx_Charge_branch_f236e + loopchannel 8, Sfx_Charge_Ch6 endchannel -; f2385 -Sfx_Charge_Ch8: ; f2385 -Sfx_Charge_branch_f2385: ; f2385 +Sfx_Charge_Ch8: noise __, 3, $d3, $10 noise __, 4, $d3, $11 noise __, 3, $d2, $10 noise __, 6, $d2, $12 - loopchannel 9, Sfx_Charge_branch_f2385 + loopchannel 9, Sfx_Charge_Ch8 endchannel -; f2396 -Sfx_Thundershock_Ch5: ; f2396 -Sfx_Thundershock_branch_f2396: ; f2396 +Sfx_Thundershock_Ch5: sound_duty 3, 2, 2, 0 sound __, 4, $f1, $07f0 sound __, 5, $f2, $0200 - loopchannel 8, Sfx_Thundershock_branch_f2396 + loopchannel 8, Sfx_Thundershock_Ch5 endchannel -; f23a5 -Sfx_Thundershock_Ch6: ; f23a5 -Sfx_Thundershock_branch_f23a5: ; f23a5 +Sfx_Thundershock_Ch6: sound_duty 3, 0, 3, 2 sound __, 5, $e2, $0202 sound __, 5, $e1, $07e2 - loopchannel 9, Sfx_Thundershock_branch_f23a5 + loopchannel 9, Sfx_Thundershock_Ch6 endchannel -; f23b4 -Sfx_Thundershock_Ch8: ; f23b4 -Sfx_Thundershock_branch_f23b4: ; f23b4 +Sfx_Thundershock_Ch8: noise __, 5, $ff, $43 noise __, 5, $f2, $44 - loopchannel 9, Sfx_Thundershock_branch_f23b4 + loopchannel 9, Sfx_Thundershock_Ch8 endchannel -; f23bf -Sfx_Psychic_Ch5: ; f23bf +Sfx_Psychic_Ch5: dutycycle $2 soundinput $f7 sound __, 9, $c4, $07bd @@ -5014,9 +4529,8 @@ Sfx_Psychic_Ch5: ; f23bf sound __, 16, $f2, $07c0 soundinput $8 endchannel -; f23de -Sfx_Psychic_Ch6: ; f23de +Sfx_Psychic_Ch6: dutycycle $2 sound __, 9, $c4, $0770 sound __, 9, $c4, $0761 @@ -5025,9 +4539,8 @@ Sfx_Psychic_Ch6: ; f23de sound __, 16, $c4, $0764 sound __, 16, $f2, $0764 endchannel -; f23f9 -Sfx_Psychic_Ch8: ; f23f9 +Sfx_Psychic_Ch8: noise __, 16, $3f, $14 noise __, 16, $cf, $13 noise __, 16, $cf, $12 @@ -5035,9 +4548,8 @@ Sfx_Psychic_Ch8: ; f23f9 noise __, 16, $cf, $10 noise __, 16, $c2, $10 endchannel -; f240c -Sfx_Screech_Ch5: ; f240c +Sfx_Screech_Ch5: dutycycle $2 sound __, 16, $ff, $07e0 sound __, 16, $ff, $07e0 @@ -5045,9 +4557,8 @@ Sfx_Screech_Ch5: ; f240c sound __, 16, $ff, $07e0 sound __, 16, $f2, $07e0 endchannel -; f2423 -Sfx_Screech_Ch6: ; f2423 +Sfx_Screech_Ch6: dutycycle $3 sound __, 16, $ff, $07e2 sound __, 16, $ff, $07e1 @@ -5055,23 +4566,20 @@ Sfx_Screech_Ch6: ; f2423 sound __, 16, $ff, $07e1 sound __, 16, $f2, $07e2 endchannel -; f243a -Sfx_BoneClub_Ch5: ; f243a +Sfx_BoneClub_Ch5: dutycycle $2 soundinput $af sound __, 9, $f1, $0700 soundinput $8 endchannel -; f2445 -Sfx_BoneClub_Ch6: ; f2445 +Sfx_BoneClub_Ch6: dutycycle $3 sound __, 9, $f1, $0701 endchannel -; f244c -Sfx_Sharpen_Ch5: ; f244c +Sfx_Sharpen_Ch5: dutycycle $2 sound __, 7, $f1, $0500 sound __, 7, $f1, $0580 @@ -5079,9 +4587,8 @@ Sfx_Sharpen_Ch5: ; f244c sound __, 7, $f1, $0680 sound __, 9, $f1, $0700 endchannel -; f2463 -Sfx_Sharpen_Ch6: ; f2463 +Sfx_Sharpen_Ch6: dutycycle $3 sound __, 7, $e1, $0510 sound __, 7, $e1, $0590 @@ -5089,33 +4596,29 @@ Sfx_Sharpen_Ch6: ; f2463 sound __, 7, $e1, $0690 sound __, 9, $e1, $0710 endchannel -; f247a -Sfx_EggBomb_Ch5: ; f247a +Sfx_EggBomb_Ch5: sound_duty 1, 3, 2, 3 sound __, 9, $ff, $03f8 sound __, 16, $ff, $0400 sound __, 16, $f3, $0400 endchannel -; f2489 -Sfx_EggBomb_Ch6: ; f2489 +Sfx_EggBomb_Ch6: sound_duty 0, 1, 3, 2 sound __, 9, $ef, $03c0 sound __, 16, $ef, $03c0 sound __, 16, $e3, $03c0 endchannel -; f2498 -Sfx_EggBomb_Ch8: ; f2498 +Sfx_EggBomb_Ch8: noise __, 5, $ff, $51 noise __, 9, $ff, $54 noise __, 16, $ff, $55 noise __, 16, $f3, $56 endchannel -; f24a5 -Sfx_Sing_Ch5: ; f24a5 +Sfx_Sing_Ch5: togglesfx vibrato $a, $24 dutycycle $2 @@ -5128,9 +4631,8 @@ Sfx_Sing_Ch5: ; f24a5 octave 5 note G_, 8 endchannel -; f24b6 -Sfx_Sing_Ch6: ; f24b6 +Sfx_Sing_Ch6: togglesfx vibrato $a, $23 dutycycle $2 @@ -5144,9 +4646,8 @@ Sfx_Sing_Ch6: ; f24b6 octave 5 note G_, 8 endchannel -; f24ca -Sfx_HyperBeam_Ch5: ; f24ca +Sfx_HyperBeam_Ch5: dutycycle $0 sound __, 3, $f1, $0780 sound __, 3, $f1, $0700 @@ -5159,15 +4660,14 @@ Sfx_HyperBeam_Ch5: ; f24ca sound __, 3, $f1, $07c0 sound __, 3, $f1, $0700 sound __, 3, $f1, $07d0 -Sfx_HyperBeam_branch_f24f8: ; f24f8 +.loop sound __, 3, $f1, $0700 sound __, 3, $f1, $07e0 - loopchannel 12, Sfx_HyperBeam_branch_f24f8 + loopchannel 12, .loop sound __, 16, $f1, $0700 endchannel -; f2509 -Sfx_HyperBeam_Ch6: ; f2509 +Sfx_HyperBeam_Ch6: sound_duty 3, 0, 3, 2 sound __, 3, $f1, $0781 sound __, 3, $f1, $0701 @@ -5180,23 +4680,20 @@ Sfx_HyperBeam_Ch6: ; f2509 sound __, 3, $f1, $07c1 sound __, 3, $f1, $0701 sound __, 3, $f1, $07d1 -Sfx_HyperBeam_branch_f2537: ; f2537 +.loop sound __, 3, $f1, $0701 sound __, 3, $f1, $07e1 - loopchannel 12, Sfx_HyperBeam_branch_f2537 + loopchannel 12, .loop sound __, 16, $f1, $0701 endchannel -; f2548 -Sfx_HyperBeam_Ch8: ; f2548 -Sfx_HyperBeam_branch_f2548: ; f2548 +Sfx_HyperBeam_Ch8: noise __, 2, $d1, $49 noise __, 2, $d1, $29 - loopchannel 26, Sfx_HyperBeam_branch_f2548 + loopchannel 26, Sfx_HyperBeam_Ch8 endchannel -; f2553 -Sfx_Unknown60_Ch8: ; f2553 +Sfx_Unknown60_Ch8: noise __, 7, $20, $10 noise __, 7, $2f, $40 noise __, 7, $4f, $41 @@ -5206,9 +4703,8 @@ Sfx_Unknown60_Ch8: ; f2553 noise __, 16, $e7, $43 noise __, 16, $f2, $43 endchannel -; f256c -Sfx_UnknownCB_Ch8: ; f256c +Sfx_IntroWhoosh_Ch8: noise __, 2, $10, $10 noise __, 3, $20, $10 noise __, 3, $30, $20 @@ -5219,32 +4715,27 @@ Sfx_UnknownCB_Ch8: ; f256c noise __, 9, $80, $22 noise __, 16, $94, $22 endchannel -; f2588 -Sfx_Unknown61_Ch8: ; f2588 +Sfx_Unknown61_Ch8: noise __, 5, $d1, $41 endchannel -; f258c -Sfx_SwitchPockets_Ch8: ; f258c +Sfx_SwitchPockets_Ch8: noise __, 5, $c1, $42 endchannel -; f2590 -Sfx_Unknown63_Ch8: ; f2590 +Sfx_Unknown63_Ch8: noise __, 3, $6f, $21 noise __, 3, $af, $31 noise __, 16, $f2, $41 endchannel -; f259a -Sfx_Burn_Ch8: ; f259a +Sfx_Burn_Ch8: noise __, 3, $d2, $32 noise __, 16, $f2, $43 endchannel -; f25a1 -Sfx_TitleScreenEntrance_Ch8: ; f25a1 +Sfx_TitleScreenEntrance_Ch8: noise __, 3, $70, $22 noise __, 3, $80, $23 noise __, 3, $90, $24 @@ -5252,40 +4743,35 @@ Sfx_TitleScreenEntrance_Ch8: ; f25a1 noise __, 3, $b0, $26 noise __, 16, $c2, $26 endchannel -; f25b4 -Sfx_Unknown66_Ch5: ; f25b4 +Sfx_Unknown66_Ch5: dutycycle $2 sound __, 2, $f2, $06a0 sound __, 2, $f2, $06e0 sound __, 9, $f1, $0700 endchannel -; f25c3 -Sfx_GetCoinFromSlots_Ch5: ; f25c3 +Sfx_GetCoinFromSlots_Ch5: dutycycle $2 sound __, 3, $f1, $0700 sound __, 9, $81, $07e0 endchannel -; f25ce -Sfx_PayDay_Ch5: ; f25ce +Sfx_PayDay_Ch5: dutycycle $3 sound __, 6, $e1, $0700 sound __, 3, $e1, $0780 sound __, 16, $f1, $07c0 endchannel -; f25dd -Sfx_PayDay_Ch6: ; f25dd +Sfx_PayDay_Ch6: dutycycle $2 sound __, 5, $c1, $06c1 sound __, 3, $c1, $0741 sound __, 16, $d1, $0781 endchannel -; f25ec -Sfx_Metronome_Ch5: ; f25ec +Sfx_Metronome_Ch5: dutycycle $2 soundinput $5f sound __, 5, $40, $07e0 @@ -5299,25 +4785,21 @@ Sfx_Metronome_Ch5: ; f25ec sound __, 16, $12, $07e0 soundinput $8 endchannel -; f2617 -Sfx_Unknown5F_Ch5: ; f2617 -Sfx_Unknown5F_branch_f2617: ; f2617 +Sfx_Unknown5F_Ch5: sound __, 3, $f7, $0601 sound __, 3, $f7, $0701 - loopchannel 8, Sfx_Unknown5F_branch_f2617 + loopchannel 8, Sfx_Unknown5F_Ch5 endchannel -; f2624 -Sfx_Unknown5F_Ch6: ; f2624 +Sfx_Unknown5F_Ch6: sound __, 2, $f7, $ffff sound __, 3, $f7, $0602 sound __, 3, $f7, $0702 - loopchannel 8, Sfx_Unknown5F_branch_f2617 + loopchannel 8, Sfx_Unknown5F_Ch5 endchannel -; f2635 -Sfx_Fanfare2_Ch5: ; f2635 +Sfx_Fanfare2_Ch5: togglesfx sfxpriorityon tempo 256 @@ -5341,9 +4823,8 @@ Sfx_Fanfare2_Ch5: ; f2635 note C#, 12 sfxpriorityoff endchannel -; f2658 -Sfx_Fanfare2_Ch6: ; f2658 +Sfx_Fanfare2_Ch6: togglesfx dutycycle $2 notetype $6, $c5 @@ -5362,9 +4843,8 @@ Sfx_Fanfare2_Ch6: ; f2658 notetype $4, $c6 note F_, 12 endchannel -; f2673 -Sfx_Fanfare2_Ch8: ; f2673 +Sfx_Fanfare2_Ch8: togglesfx notetype $6 note C_, 1 @@ -5383,9 +4863,8 @@ Sfx_Fanfare2_Ch8: ; f2673 note F_, 2 note G#, 6 endchannel -; f2687 -Sfx_Fanfare_Ch5: ; f2687 +Sfx_Fanfare_Ch5: togglesfx sfxpriorityon tempo 256 @@ -5414,9 +4893,8 @@ Sfx_Fanfare_Ch5: ; f2687 note C#, 12 sfxpriorityoff endchannel -; f26af -Sfx_Fanfare_Ch6: ; f26af +Sfx_Fanfare_Ch6: togglesfx dutycycle $2 notetype $6, $c4 @@ -5451,9 +4929,8 @@ Sfx_Fanfare_Ch6: ; f26af notetype $4, $c6 note F#, 12 endchannel -; f26d8 -Sfx_Fanfare_Ch8: ; f26d8 +Sfx_Fanfare_Ch8: togglesfx notetype $6 note C_, 1 @@ -5477,42 +4954,35 @@ Sfx_Fanfare_Ch8: ; f26d8 note F_, 4 note F#, 6 endchannel -; f26f1 -Sfx_HangUp_Ch5: ; f26f1 +Sfx_HangUp_Ch5: dutycycle $2 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 +Sfx_NoSignal_Ch5: dutycycle $2 sound C_, 5, $e8, $070b sound C_, 13, $0, 0 - loopchannel 3, Sfx_HangUp_branch_f26ff + loopchannel 3, Sfx_NoSignal_Ch5 endchannel -; f270e -Sfx_Sandstorm_Ch8: ; f270e -Sfx_Sandstorm_branch_f270e: ; f270e -Sfx_Unknown5F_Ch8: ; f270e -Sfx_Unknown5F_branch_f270e: ; f270e +Sfx_Sandstorm_Ch8: +Sfx_Unknown5F_Ch8: 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 + loopchannel 3, Sfx_Sandstorm_Ch8 endchannel -; f2722 -Sfx_Elevator_Ch5: ; f2722 +Sfx_Elevator_Ch5: dutycycle $2 soundinput $5a -Sfx_Elevator_branch_f2726: ; f2726 +.loop sound __, 3, $f1, $0300 - loopchannel 48, Sfx_Elevator_branch_f2726 + loopchannel 48, .loop soundinput $8 dutycycle $2 sound __, 16, $f3, $0730 @@ -5522,55 +4992,45 @@ Sfx_Elevator_branch_f2726: ; f2726 sound __, 16, $44, $0700 sound __, 16, $24, $0700 endchannel -; f274b -Sfx_Elevator_Ch6: ; f274b -Sfx_Elevator_Ch7: ; f274b +Sfx_Elevator_Ch6: +Sfx_Elevator_Ch7: sound F_, 1, $0, 0 sound E_, 4, $0, 0 endchannel -; f2754 -Sfx_Elevator_Ch8: ; f2754 +Sfx_Elevator_Ch8: noise F_, 1, $0, $0 noise E_, 4, $0, $0 endchannel -; f275b -Sfx_StopSlot: ; f275b +Sfx_StopSlot: musicheader 1, 5, Sfx_StopSlot_Ch5 -; f275e -Sfx_StopSlot_Ch5: ; f275e +Sfx_StopSlot_Ch5: dutycycle $2 sound __, 2, $f8, $0760 sound __, 5, $82, $0760 endchannel -; f2769 -Sfx_GlassTing: ; f2769 +Sfx_GlassTing: musicheader 1, 5, Sfx_GlassTing_Ch5 -; f276c -Sfx_GlassTing_Ch5: ; f276c +Sfx_GlassTing_Ch5: dutycycle $2 sound C#, 1, $d1, $07dc endchannel -; f2773 -Sfx_GlassTing2: ; f2773 +Sfx_GlassTing2: musicheader 2, 5, Sfx_GlassTing2_Ch5 musicheader 1, 6, Sfx_GlassTing2_Ch6 -; f2779 -Sfx_GlassTing2_Ch5: ; f2779 +Sfx_GlassTing2_Ch5: dutycycle $2 sound C_, 1, $f1, $07dc endchannel -; f2780 -Sfx_GlassTing2_Ch6: ; f2780 +Sfx_GlassTing2_Ch6: dutycycle $2 sound C_, 1, $d1, $07dd endchannel -; f2787 diff --git a/audio/sfx_crystal.asm b/audio/sfx_crystal.asm index 178d4b560..0c283123d 100644 --- a/audio/sfx_crystal.asm +++ b/audio/sfx_crystal.asm @@ -1,32 +1,27 @@ -Sfx_IntroUnown1: ; 17982d +Sfx_IntroUnown1: musicheader 1, 5, Sfx_IntroUnown1_Ch5 -; 179830 -Sfx_IntroUnown1_Ch5: ; 179830 +Sfx_IntroUnown1_Ch5: vibrato $1, $a3 dutycycle $2 sound __, 9, $39, $0705 sound C#, 1, $e2, $0705 endchannel -; 17983e -Sfx_IntroUnown2: ; 17983e +Sfx_IntroUnown2: musicheader 1, 6, Sfx_IntroUnown2_Ch6 -; 179841 -Sfx_IntroUnown2_Ch6: ; 179841 +Sfx_IntroUnown2_Ch6: vibrato $1, $73 dutycycle $2 sound __, 9, $39, $0758 sound C#, 1, $e2, $0758 endchannel -; 17984f -Sfx_IntroUnown3: ; 17984f +Sfx_IntroUnown3: musicheader 1, 7, Sfx_IntroUnown3_Ch7 -; 179852 -Sfx_IntroUnown3_Ch7: ; 179852 +Sfx_IntroUnown3_Ch7: vibrato $1, $53 sound __, 4, $32, $07c2 sound __, 4, $22, $07c2 @@ -35,13 +30,11 @@ Sfx_IntroUnown3_Ch7: ; 179852 sound __, 7, $22, $07c2 sound __, 7, $32, $07c2 endchannel -; 17986e -Sfx_DittoPopUp: ; 17986e +Sfx_DittoPopUp: musicheader 1, 5, Sfx_DittoPopUp_Ch5 -; 179871 -Sfx_DittoPopUp_Ch5: ; 179871 +Sfx_DittoPopUp_Ch5: dutycycle $2 soundinput $1e sound __, 4, $82, $0700 @@ -50,13 +43,11 @@ Sfx_DittoPopUp_Ch5: ; 179871 sound __, 5, $b1, $0640 sound C_, 1, $31, $0641 endchannel -; 179888 -Sfx_DittoTransform: ; 179888 +Sfx_DittoTransform: musicheader 1, 5, Sfx_DittoTransform_Ch5 -; 17988b -Sfx_DittoTransform_Ch5: ; 17988b +Sfx_DittoTransform_Ch5: dutycycle $1 soundinput $26 sound C_, 5, $3b, $0440 @@ -64,23 +55,19 @@ Sfx_DittoTransform_Ch5: ; 17988b sound __, 5, $67, $04c1 sound __, 5, $42, $04c2 endchannel -; 1798a0 -Sfx_IntroSuicune1: ; 1798a0 +Sfx_IntroSuicune1: musicheader 1, 8, Sfx_IntroSuicune1_Ch8 -; 1798a3 -Sfx_IntroSuicune1_Ch8: ; 1798a3 +Sfx_IntroSuicune1_Ch8: noise __, 2, $58, $59 noise __, 3, $91, $23 endchannel -; 1798aa -Sfx_IntroPichu: ; 1798aa +Sfx_IntroPichu: musicheader 1, 5, Sfx_IntroPichu_Ch5 -; 1798ad -Sfx_IntroPichu_Ch5: ; 1798ad +Sfx_IntroPichu_Ch5: dutycycle $3 soundinput $4d sound __, 2, $88, $0770 @@ -88,13 +75,11 @@ Sfx_IntroPichu_Ch5: ; 1798ad soundinput $17 sound __, 3, $88, $0776 endchannel -; 1798c0 -Sfx_IntroSuicune2: ; 1798c0 +Sfx_IntroSuicune2: musicheader 1, 8, Sfx_IntroSuicune2_Ch8 -; 1798c3 -Sfx_IntroSuicune2_Ch8: ; 1798c3 +Sfx_IntroSuicune2_Ch8: noise __, 2, $a7, $31 noise __, 2, $91, $0 noise __, 2, $92, $21 @@ -112,26 +97,22 @@ Sfx_IntroSuicune2_Ch8: ; 1798c3 noise __, 2, $23, $0 noise __, 2, $13, $10 endchannel -; 1798f4 -Sfx_IntroSuicune3: ; 1798f4 +Sfx_IntroSuicune3: musicheader 1, 8, Sfx_IntroSuicune3_Ch8 -; 1798f7 -Sfx_IntroSuicune3_Ch8: ; 1798f7 +Sfx_IntroSuicune3_Ch8: 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 +Sfx_DittoBounce: musicheader 1, 5, Sfx_DittoBounce_Ch5 -; 17990a -Sfx_DittoBounce_Ch5: ; 17990a +Sfx_DittoBounce_Ch5: dutycycle $2 soundinput $2c sound __, 3, $82, $04b0 @@ -139,13 +120,11 @@ Sfx_DittoBounce_Ch5: ; 17990a soundinput $34 sound C_, 1, $b1, $0420 endchannel -; 17991d -Sfx_IntroSuicune4: ; 17991d +Sfx_IntroSuicune4: musicheader 1, 8, Sfx_IntroSuicune4_Ch8 -; 179920 -Sfx_IntroSuicune4_Ch8: ; 179920 +Sfx_IntroSuicune4_Ch8: noise __, 2, $a1, $5c noise __, 1, $0, $0 noise __, 2, $c1, $4d @@ -158,13 +137,11 @@ Sfx_IntroSuicune4_Ch8: ; 179920 noise __, 1, $0, $0 noise C#, 1, $72, $0 endchannel -; 179942 -Sfx_GameFreakPresents: ; 179942 +Sfx_GameFreakPresents: musicheader 1, 5, Sfx_GameFreakPresents_Ch5 -; 179945 -Sfx_GameFreakPresents_Ch5: ; 179945 +Sfx_GameFreakPresents_Ch5: togglesfx dutycycle $2 notetype $2, $b1 @@ -185,18 +162,16 @@ Sfx_GameFreakPresents_Ch5: ; 179945 intensity $31 note G_, 3 endchannel -; 179961 -Sfx_Tingle: ; 179961 +Sfx_Tingle: musicheader 1, 5, Sfx_Tingle_Ch5 -; 179964 -Sfx_Tingle_Ch5: ; 179964 +Sfx_Tingle_Ch5: togglesfx dutycycle $1 pitchoffset 0, B_ notetype $1, $b1 -Sfx_Tingle_branch_17996c: ; 17996c +.loop octave 5 note C_, 3 octave 6 @@ -204,33 +179,29 @@ Sfx_Tingle_branch_17996c: ; 17996c octave 5 note C_, 3 note __, 2 - loopchannel 2, Sfx_Tingle_branch_17996c + loopchannel 2, .loop note C_, 2 intensity $a1 note G_, 13 endchannel -; 17997c -Sfx_TwoPcBeeps: ; 17997c +Sfx_TwoPcBeeps: musicheader 1, 5, Sfx_TwoPcBeeps_Ch5 -; 17997f -Sfx_TwoPcBeeps_Ch5: ; 17997f +Sfx_TwoPcBeeps_Ch5: dutycycle $2 sound __, 3, $e8, $07c2 sound __, 3, $28, $07c2 sound __, 3, $e8, $07c2 sound __, 3, $28, $07c2 endchannel -; 179992 -Sfx_4NoteDitty: ; 179992 +Sfx_4NoteDitty: musicheader 3, 5, Sfx_4NoteDitty_Ch5 musicheader 1, 6, Sfx_4NoteDitty_Ch6 musicheader 1, 7, Sfx_4NoteDitty_Ch7 -; 17999b -Sfx_4NoteDitty_Ch5: ; 17999b +Sfx_4NoteDitty_Ch5: togglesfx dutycycle $2 notetype $2, $e8 @@ -254,29 +225,25 @@ Sfx_4NoteDitty_Ch5: ; 17999b intensity $43 note C_, 16 endchannel -; 1799bd -Sfx_4NoteDitty_Ch6: ; 1799bd +Sfx_4NoteDitty_Ch6: togglesfx notetype $2, $b8 note __, 9 note __, 16 endchannel -; 1799c4 -Sfx_4NoteDitty_Ch7: ; 1799c4 +Sfx_4NoteDitty_Ch7: togglesfx notetype $2, $b8 note __, 9 note __, 16 endchannel -; 1799cb -Sfx_Twinkle: ; 1799cb +Sfx_Twinkle: musicheader 1, 5, Sfx_Twinkle_Ch5 -; 1799ce -Sfx_Twinkle_Ch5: ; 1799ce +Sfx_Twinkle_Ch5: togglesfx dutycycle $0 pitchoffset 0, D_ @@ -300,4 +267,3 @@ Sfx_Twinkle_Ch5: ; 1799ce octave 5 note G_, 6 endchannel -; 1799ef diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index 9cbe1d0eb..0e066c60a 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -1,6 +1,5 @@ -SFX: ; e927c +SFX: ; entries correspond to SFX_* constants - dba Sfx_DexFanfare5079 dba Sfx_Item dba Sfx_CaughtMon @@ -191,9 +190,7 @@ SFX: ; e927c dba Sfx_2Boops dba Sfx_GlassTing dba Sfx_GlassTing2 - -; Crystal adds the following SFX: - +; new to Crystal dba Sfx_IntroUnown1 dba Sfx_IntroUnown2 dba Sfx_IntroUnown3 @@ -207,8 +204,7 @@ SFX: ; e927c dba Sfx_IntroSuicune4 dba Sfx_GameFreakPresents dba Sfx_Tingle - dba Sfx_UnknownCB + dba Sfx_IntroWhoosh dba Sfx_TwoPcBeeps dba Sfx_4NoteDitty dba Sfx_Twinkle -; e94e9 diff --git a/audio/wave_samples.asm b/audio/wave_samples.asm index 493cce679..81fee2119 100644 --- a/audio/wave_samples.asm +++ b/audio/wave_samples.asm @@ -1,4 +1,4 @@ -WaveSamples: ; e8db2 +WaveSamples: ; These are streams of 32 nybbles (4-bit values) used as wave patterns. ; Plot them as a line chart to see the wave's shape. dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 @@ -11,4 +11,3 @@ WaveSamples: ; e8db2 dn 12, 0, 10, 9, 8, 7, 15, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 15, 1, 0, 2, 4, 6, 8, 10, 12, 14 dn 4, 4, 3, 3, 2, 2, 1, 15, 0, 0, 4, 6, 8, 10, 12, 14, 15, 8, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5 dn 1, 1, 0, 0, 0, 0, 0, 8, 0, 0, 1, 3, 5, 7, 9, 10, 11, 4, 11, 10, 10, 9, 9, 8, 8, 7, 6, 5, 4, 3, 2, 1 -; e8e52 |