diff options
101 files changed, 17274 insertions, 16900 deletions
diff --git a/audio/cries.asm b/audio/cries.asm index b8d9d214..639b4a50 100644 --- a/audio/cries.asm +++ b/audio/cries.asm @@ -1,2045 +1,2113 @@ Cry_Marill: - musicheader 3, 5, Cry_Marill_Ch5 - musicheader 1, 6, Cry_Marill_Ch6 - musicheader 1, 8, Cry_Marill_Ch8 + channel_count 3 + channel 5, Cry_Marill_Ch5 + channel 6, Cry_Marill_Ch6 + channel 8, Cry_Marill_Ch8 Cry_Togepi: - musicheader 2, 5, Cry_Togepi_Ch5 - musicheader 1, 6, Cry_Togepi_Ch6 + channel_count 2 + channel 5, Cry_Togepi_Ch5 + channel 6, Cry_Togepi_Ch6 Cry_Togetic: - musicheader 2, 5, Cry_Togetic_Ch5 - musicheader 1, 6, Cry_Togetic_Ch6 + channel_count 2 + channel 5, Cry_Togetic_Ch5 + channel 6, Cry_Togetic_Ch6 Cry_Spinarak: - musicheader 3, 5, Cry_Spinarak_Ch5 - musicheader 1, 6, Cry_Spinarak_Ch6 - musicheader 1, 8, Cry_Spinarak_Ch8 + channel_count 3 + channel 5, Cry_Spinarak_Ch5 + channel 6, Cry_Spinarak_Ch6 + channel 8, Cry_Spinarak_Ch8 Cry_Raikou: - musicheader 3, 5, Cry_Raikou_Ch5 - musicheader 1, 6, Cry_Raikou_Ch6 - musicheader 1, 8, Cry_Raikou_Ch8 + channel_count 3 + channel 5, Cry_Raikou_Ch5 + channel 6, Cry_Raikou_Ch6 + channel 8, Cry_Raikou_Ch8 Cry_Hoothoot: - musicheader 3, 5, Cry_Hoothoot_Ch5 - musicheader 1, 6, Cry_Hoothoot_Ch6 - musicheader 1, 8, Cry_Hoothoot_Ch8 + channel_count 3 + channel 5, Cry_Hoothoot_Ch5 + channel 6, Cry_Hoothoot_Ch6 + channel 8, Cry_Hoothoot_Ch8 Cry_Sentret: - musicheader 2, 5, Cry_Sentret_Ch5 - musicheader 1, 6, Cry_Sentret_Ch6 + channel_count 2 + channel 5, Cry_Sentret_Ch5 + channel 6, Cry_Sentret_Ch6 Cry_Slowking: - musicheader 3, 5, Cry_Slowking_Ch5 - musicheader 1, 6, Cry_Slowking_Ch6 - musicheader 1, 8, Cry_Slowking_Ch8 + channel_count 3 + channel 5, Cry_Slowking_Ch5 + channel 6, Cry_Slowking_Ch6 + channel 8, Cry_Slowking_Ch8 Cry_Mareep: - musicheader 2, 5, Cry_Mareep_Ch5 - musicheader 1, 6, Cry_Mareep_Ch6 + channel_count 2 + channel 5, Cry_Mareep_Ch5 + channel 6, Cry_Mareep_Ch6 Cry_Cyndaquil: - musicheader 3, 5, Cry_Cyndaquil_Ch5 - musicheader 1, 6, Cry_Cyndaquil_Ch6 - musicheader 1, 8, Cry_Cyndaquil_Ch8 + channel_count 3 + channel 5, Cry_Cyndaquil_Ch5 + channel 6, Cry_Cyndaquil_Ch6 + channel 8, Cry_Cyndaquil_Ch8 Cry_Chikorita: - musicheader 3, 5, Cry_Chikorita_Ch5 - musicheader 1, 6, Cry_Chikorita_Ch6 - musicheader 1, 8, Cry_Chikorita_Ch8 + channel_count 3 + channel 5, Cry_Chikorita_Ch5 + channel 6, Cry_Chikorita_Ch6 + channel 8, Cry_Chikorita_Ch8 Cry_Gligar: - musicheader 2, 5, Cry_Gligar_Ch5 - musicheader 1, 8, Cry_Gligar_Ch8 + channel_count 2 + channel 5, Cry_Gligar_Ch5 + channel 8, Cry_Gligar_Ch8 Cry_Girafarig: - musicheader 3, 5, Cry_Girafarig_Ch5 - musicheader 1, 6, Cry_Girafarig_Ch6 - musicheader 1, 8, Cry_Girafarig_Ch8 + channel_count 3 + channel 5, Cry_Girafarig_Ch5 + channel 6, Cry_Girafarig_Ch6 + channel 8, Cry_Girafarig_Ch8 Cry_Slugma: - musicheader 2, 5, Cry_Slugma_Ch5 - musicheader 1, 8, Cry_Slugma_Ch8 + channel_count 2 + channel 5, Cry_Slugma_Ch5 + channel 8, Cry_Slugma_Ch8 Cry_Ledyba: - musicheader 3, 5, Cry_Ledyba_Ch5 - musicheader 1, 6, Cry_Ledyba_Ch6 - musicheader 1, 8, Cry_Ledyba_Ch8 + channel_count 3 + channel 5, Cry_Ledyba_Ch5 + channel 6, Cry_Ledyba_Ch6 + channel 8, Cry_Ledyba_Ch8 Cry_Wooper: - musicheader 3, 5, Cry_Wooper_Ch5 - musicheader 1, 6, Cry_Wooper_Ch6 - musicheader 1, 8, Cry_Wooper_Ch8 + channel_count 3 + channel 5, Cry_Wooper_Ch5 + channel 6, Cry_Wooper_Ch6 + channel 8, Cry_Wooper_Ch8 Cry_Donphan: - musicheader 3, 5, Cry_Donphan_Ch5 - musicheader 1, 6, Cry_Donphan_Ch6 - musicheader 1, 8, Cry_Donphan_Ch8 + channel_count 3 + channel 5, Cry_Donphan_Ch5 + channel 6, Cry_Donphan_Ch6 + channel 8, Cry_Donphan_Ch8 Cry_Typhlosion: - musicheader 3, 5, Cry_Typhlosion_Ch5 - musicheader 1, 6, Cry_Typhlosion_Ch6 - musicheader 1, 8, Cry_Typhlosion_Ch8 + channel_count 3 + channel 5, Cry_Typhlosion_Ch5 + channel 6, Cry_Typhlosion_Ch6 + channel 8, Cry_Typhlosion_Ch8 Cry_Natu: - musicheader 3, 5, Cry_Natu_Ch5 - musicheader 1, 6, Cry_Natu_Ch6 - musicheader 1, 8, Cry_Natu_Ch8 + channel_count 3 + channel 5, Cry_Natu_Ch5 + channel 6, Cry_Natu_Ch6 + channel 8, Cry_Natu_Ch8 Cry_Teddiursa: - musicheader 3, 5, Cry_Teddiursa_Ch5 - musicheader 1, 6, Cry_Teddiursa_Ch6 - musicheader 1, 8, Cry_Teddiursa_Ch8 + channel_count 3 + channel 5, Cry_Teddiursa_Ch5 + channel 6, Cry_Teddiursa_Ch6 + channel 8, Cry_Teddiursa_Ch8 Cry_Sunflora: - musicheader 3, 5, Cry_Sunflora_Ch5 - musicheader 1, 6, Cry_Sunflora_Ch6 - musicheader 1, 8, Cry_Sunflora_Ch8 + channel_count 3 + channel 5, Cry_Sunflora_Ch5 + channel 6, Cry_Sunflora_Ch6 + channel 8, Cry_Sunflora_Ch8 Cry_Ampharos: - musicheader 3, 5, Cry_Ampharos_Ch5 - musicheader 1, 6, Cry_Ampharos_Ch6 - musicheader 1, 8, Cry_Ampharos_Ch8 + channel_count 3 + channel 5, Cry_Ampharos_Ch5 + channel 6, Cry_Ampharos_Ch6 + channel 8, Cry_Ampharos_Ch8 Cry_Totodile: - musicheader 3, 5, Cry_Totodile_Ch5 - musicheader 1, 6, Cry_Totodile_Ch6 - musicheader 1, 8, Cry_Totodile_Ch8 + channel_count 3 + channel 5, Cry_Totodile_Ch5 + channel 6, Cry_Totodile_Ch6 + channel 8, Cry_Totodile_Ch8 Cry_Cleffa: - musicheader 3, 5, Cry_Cleffa_Ch5 - musicheader 1, 6, Cry_Cleffa_Ch6 - musicheader 1, 8, Cry_Cleffa_Ch8 + channel_count 3 + channel 5, Cry_Cleffa_Ch5 + channel 6, Cry_Cleffa_Ch6 + channel 8, Cry_Cleffa_Ch8 Cry_Pichu: - musicheader 3, 5, Cry_Pichu_Ch5 - musicheader 1, 6, Cry_Pichu_Ch6 - musicheader 1, 8, Cry_Pichu_Ch8 + channel_count 3 + channel 5, Cry_Pichu_Ch5 + channel 6, Cry_Pichu_Ch6 + channel 8, Cry_Pichu_Ch8 Cry_Aipom: - musicheader 3, 5, Cry_Aipom_Ch5 - musicheader 1, 6, Cry_Aipom_Ch6 - musicheader 1, 8, Cry_Aipom_Ch8 + channel_count 3 + channel 5, Cry_Aipom_Ch5 + channel 6, Cry_Aipom_Ch6 + channel 8, Cry_Aipom_Ch8 Cry_Dunsparce: - musicheader 3, 5, Cry_Dunsparce_Ch5 - musicheader 1, 6, Cry_Dunsparce_Ch6 - musicheader 1, 8, Cry_Dunsparce_Ch8 + channel_count 3 + channel 5, Cry_Dunsparce_Ch5 + channel 6, Cry_Dunsparce_Ch6 + channel 8, Cry_Dunsparce_Ch8 Cry_Magcargo: - musicheader 3, 5, Cry_Magcargo_Ch5 - musicheader 1, 6, Cry_Magcargo_Ch6 - musicheader 1, 8, Cry_Magcargo_Ch8 + channel_count 3 + channel 5, Cry_Magcargo_Ch5 + channel 6, Cry_Magcargo_Ch6 + channel 8, Cry_Magcargo_Ch8 Cry_Entei: - musicheader 3, 5, Cry_Entei_Ch5 - musicheader 1, 6, Cry_Entei_Ch6 - musicheader 1, 8, Cry_Entei_Ch8 + channel_count 3 + channel 5, Cry_Entei_Ch5 + channel 6, Cry_Entei_Ch6 + channel 8, Cry_Entei_Ch8 Cry_Mantine: - musicheader 3, 5, Cry_Mantine_Ch5 - musicheader 1, 6, Cry_Mantine_Ch6 - musicheader 1, 8, Cry_Mantine_Ch8 + channel_count 3 + channel 5, Cry_Mantine_Ch5 + channel 6, Cry_Mantine_Ch6 + channel 8, Cry_Mantine_Ch8 Cry_Entei_Ch5: - soundinput $ff - sound_duty 3, 0, 2, 1 - sound __, 2, $f8, $05f8 - sound __, 9, $9f, $04d8 - sound __, 7, $f8, $05c4 - sound C_, 5, $f2, $0574 - soundinput $88 - endchannel + pitch_sweep 15, -7 + duty_cycle_pattern 1, 2, 0, 3 + square_note 1, 15, 8, 1528 + square_note 8, 9, -7, 1240 + square_note 6, 15, 8, 1476 + square_note 20, 15, 2, 1396 + pitch_sweep 8, 8 + sound_ret 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 + duty_cycle_pattern 0, 3, 0, 3 + square_note 1, 12, 8, 1600 + square_note 6, 15, -7, 1640 + square_note 7, 10, 8, 1332 + square_note 20, 10, 2, 1188 + sound_ret Cry_Entei_Ch8: - noise __, 11, $d6, $6a - noise __, 7, $bc, $6c - noise __, 7, $e2, $5c - noise C#, 1, $b4, $6c - endchannel + noise_note 10, 13, 6, 106 + noise_note 6, 11, -4, 108 + noise_note 6, 14, 2, 92 + noise_note 32, 11, 4, 108 + sound_ret Cry_Magcargo_Ch5: - sound_duty 0, 1, 0, 3 - sound __, 5, $af, $0720 - sound __, 3, $f8, $071c - sound __, 3, $f8, $0718 - sound __, 3, $f8, $0708 - sound __, 3, $f8, $070e - sound __, 13, $c8, $0712 - sound __, 5, $91, $070e - endchannel + duty_cycle_pattern 3, 0, 1, 0 + square_note 4, 10, -7, 1824 + square_note 2, 15, 8, 1820 + square_note 2, 15, 8, 1816 + square_note 2, 15, 8, 1800 + square_note 2, 15, 8, 1806 + square_note 12, 12, 8, 1810 + square_note 4, 9, 1, 1806 + sound_ret Cry_Magcargo_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 2, $b8, $0710 - sound __, 4, $d8, $072c - sound __, 5, $d8, $0665 - sound __, 2, $b8, $0656 - sound __, 2, $d8, $065c - sound __, 13, $f8, $0760 - sound __, 5, $c1, $0750 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 1, 11, 8, 1808 + square_note 3, 13, 8, 1836 + square_note 4, 13, 8, 1637 + square_note 1, 11, 8, 1622 + square_note 1, 13, 8, 1628 + square_note 12, 15, 8, 1888 + square_note 4, 12, 1, 1872 + sound_ret Cry_Magcargo_Ch8: - noise __, 3, $e8, $3b -.loop - noise __, 2, $f1, $4e - loopchannel 5, .loop - noise __, 3, $d8, $3f - noise C_, 5, $c2, $5f - endchannel + noise_note 2, 14, 8, 59 +Cry_Magcargo_branch_f2ef5: + noise_note 1, 15, 1, 78 + sound_loop 5, Cry_Magcargo_branch_f2ef5 + noise_note 2, 13, 8, 63 + noise_note 20, 12, 2, 95 + sound_ret Cry_Dunsparce_Ch5: - sound_duty 2, 0, 2, 0 - sound __, 2, $f8, $05b0 - sound __, 2, $f8, $04b4 - sound __, 2, $f8, $05b8 - sound __, 4, $f8, $05c0 - sound __, 9, $c8, $0490 - sound __, 9, $c8, $0480 - soundinput $fe - sound C_, 1, $c3, $0490 - soundinput $88 - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 1, 15, 8, 1456 + square_note 1, 15, 8, 1204 + square_note 1, 15, 8, 1464 + square_note 3, 15, 8, 1472 + square_note 8, 12, 8, 1168 + square_note 8, 12, 8, 1152 + pitch_sweep 15, -6 + square_note 16, 12, 3, 1168 + pitch_sweep 8, 8 + sound_ret Cry_Dunsparce_Ch6: - sound_duty 2, 0, 2, 0 - sound __, 9, $b8, $04c8 - sound C#, 1, $b5, $0410 - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 8, 11, 8, 1224 + square_note 32, 11, 5, 1040 + sound_ret Cry_Dunsparce_Ch8: - noise __, 4, $ff, $4b - noise __, 4, $ef, $4c - noise C#, 1, $b5, $5f - endchannel + noise_note 3, 15, -7, 75 + noise_note 3, 14, -7, 76 + noise_note 32, 11, 5, 95 + sound_ret Cry_Slowking_Ch5: - sound_duty 3, 0, 3, 0 - sound __, 3, $f1, $0550 - sound __, 3, $f1, $0530 - sound __, 3, $f1, $0510 - sound __, 3, $f2, $0650 - sound __, 3, $f2, $0640 - sound __, 3, $f2, $0630 - sound C_, 1, $f2, $0550 - endchannel + duty_cycle_pattern 0, 3, 0, 3 + square_note 2, 15, 1, 1360 + square_note 2, 15, 1, 1328 + square_note 2, 15, 1, 1296 + square_note 2, 15, 2, 1616 + square_note 2, 15, 2, 1600 + square_note 2, 15, 2, 1584 + square_note 16, 15, 2, 1360 + sound_ret Cry_Slowking_Ch6: - sound_duty 2, 0, 3, 3 - sound __, 5, $e1, $0620 - sound __, 6, $e2, $0500 - sound __, 7, $e1, $0620 - sound __, 3, $e1, $0520 - sound C_, 1, $e2, $0500 - endchannel + duty_cycle_pattern 3, 3, 0, 2 + square_note 4, 14, 1, 1568 + square_note 5, 14, 2, 1280 + square_note 6, 14, 1, 1568 + square_note 2, 14, 1, 1312 + square_note 16, 14, 2, 1280 + sound_ret Cry_Slowking_Ch8: - noise __, 3, $8a, $5d - noise __, 3, $9a, $4c - noise __, 6, $9a, $5d - noise __, 3, $9a, $4d - noise __, 3, $9a, $4b - noise __, 3, $9a, $4d - noise __, 3, $9a, $5f - noise C_, 1, $b2, $6f - endchannel + noise_note 2, 8, -2, 93 + noise_note 2, 9, -2, 76 + noise_note 5, 9, -2, 93 + noise_note 2, 9, -2, 77 + noise_note 2, 9, -2, 75 + noise_note 2, 9, -2, 77 + noise_note 2, 9, -2, 95 + noise_note 16, 11, 2, 111 + sound_ret Cry_Pichu_Ch5: - dutycycle $0 - soundinput $f7 - sound __, 3, $f8, $078d - sound __, 3, $f8, $0791 - soundinput $ff - sound __, 3, $f8, $07ad - soundinput $88 - sound __, 3, $f8, $07b4 - soundinput $f7 - sound __, 3, $f8, $07b8 - soundinput $88 - endchannel + duty_cycle 0 + pitch_sweep 15, 7 + square_note 2, 15, 8, 1933 + square_note 2, 15, 8, 1937 + pitch_sweep 15, -7 + square_note 2, 15, 8, 1965 + pitch_sweep 8, 8 + square_note 2, 15, 8, 1972 + pitch_sweep 15, 7 + square_note 2, 15, 8, 1976 + pitch_sweep 8, 8 + sound_ret Cry_Pichu_Ch6: - sound_duty 0, 0, 1, 0 - sound __, 3, $c8, $076d - sound __, 3, $c8, $0771 - sound __, 3, $c8, $078d - sound __, 3, $c8, $0794 - sound __, 3, $c8, $0798 - endchannel + duty_cycle_pattern 0, 1, 0, 0 + square_note 2, 12, 8, 1901 + square_note 2, 12, 8, 1905 + square_note 2, 12, 8, 1933 + square_note 2, 12, 8, 1940 + square_note 2, 12, 8, 1944 + sound_ret Cry_Pichu_Ch8: - noise __, 3, $b8, $1 - noise __, 3, $b8, $19 - noise __, 3, $c8, $18 - noise __, 3, $b8, $10 - noise __, 9, $c2, $18 - endchannel + noise_note 2, 11, 8, 1 + noise_note 2, 11, 8, 25 + noise_note 2, 12, 8, 24 + noise_note 2, 11, 8, 16 + noise_note 8, 12, 2, 24 + sound_ret Cry_Marill_Ch5: - sound_duty 2, 0, 2, 0 - sound __, 3, $88, $06d8 - sound __, 9, $e2, $06e0 - sound __, 3, $61, $06e5 - sound __, 3, $e8, $06c0 - sound __, 3, $e8, $06b8 - sound __, 3, $d8, $06b0 - sound __, 9, $c1, $06aa - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 2, 8, 8, 1752 + square_note 8, 14, 2, 1760 + square_note 2, 6, 1, 1765 + square_note 2, 14, 8, 1728 + square_note 2, 14, 8, 1720 + square_note 2, 13, 8, 1712 + square_note 8, 12, 1, 1706 + sound_ret Cry_Marill_Ch6: - sound_duty 3, 0, 2, 1 - sound __, 3, $68, $06b1 - sound __, 6, $c1, $06b9 - sound __, 6, $99, $0760 - sound __, 3, $b8, $068c - sound __, 3, $a8, $0684 - sound __, 11, $92, $067b - endchannel + duty_cycle_pattern 1, 2, 0, 3 + square_note 2, 6, 8, 1713 + square_note 5, 12, 1, 1721 + square_note 5, 9, -1, 1888 + square_note 2, 11, 8, 1676 + square_note 2, 10, 8, 1668 + square_note 10, 9, 2, 1659 + sound_ret Cry_Marill_Ch8: - noise __, 2, $99, $6c - noise __, 2, $92, $5c - noise __, 11, $62, $4c - noise __, 3, $68, $6a - noise __, 3, $68, $6b - noise __, 11, $62, $6c - endchannel + noise_note 1, 9, -1, 108 + noise_note 1, 9, 2, 92 + noise_note 10, 6, 2, 76 + noise_note 2, 6, 8, 106 + noise_note 2, 6, 8, 107 + noise_note 10, 6, 2, 108 + sound_ret Cry_Togepi_Ch5: - tone $0002 + pitch_offset 2 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 + duty_cycle_pattern 1, 1, 0, 2 + square_note 4, 15, 1, 1942 + square_note 4, 15, 1, 1837 + square_note 7, 0, 0, 0 + square_note 16, 15, 1, 1959 + sound_ret Cry_Togetic_Ch5: - tone $0002 + pitch_offset 2 Cry_Togetic_Ch6: - callchannel Cry_Togetic_branch_f3022 - loopchannel 2, Cry_Togetic_Ch6 - sound __, 15, $0, 0 - sound __, 9, $f2, $07c2 - endchannel + sound_call Cry_Togetic_branch_f3022 + sound_loop 2, Cry_Togetic_Ch6 + square_note 14, 0, 0, 0 + square_note 8, 15, 2, 1986 + sound_ret Cry_Spinarak_Ch5: - dutycycle $1 - sound __, 4, $2c, $07c4 - sound __, 2, $0, $0001 - sound __, 6, $59, $07b9 - sound __, 7, $b4, $07bb - endchannel + duty_cycle 1 + square_note 3, 2, -4, 1988 + square_note 1, 0, 0, 1 + square_note 5, 5, -1, 1977 + square_note 6, 11, 4, 1979 + sound_ret 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 + duty_cycle_pattern 0, 2, 2, 2 + square_note 3, 2, -4, 1991 + square_note 1, 0, 0, 0 + square_note 5, 5, -1, 1982 + square_note 6, 11, 4, 1981 + sound_ret Cry_Spinarak_Ch8: - noise __, 4, $92, $10 - noise __, 2, $39, $0 - noise __, 6, $69, $10 - noise __, 7, $93, $0 - endchannel + noise_note 3, 9, 2, 16 + noise_note 1, 3, -1, 0 + noise_note 5, 6, -1, 16 + noise_note 6, 9, 3, 0 + sound_ret Cry_Raikou_Ch5: - sound_duty 0, 2, 3, 3 - sound __, 3, $f1, $04b0 - sound __, 3, $f7, $0590 - sound __, 9, $f8, $0510 - sound __, 4, $f2, $06c0 - sound __, 4, $f8, $06ba - sound __, 4, $f2, $06b0 - sound C_, 1, $f2, $0690 - endchannel + duty_cycle_pattern 3, 3, 2, 0 + square_note 2, 15, 1, 1200 + square_note 2, 15, 7, 1424 + square_note 8, 15, 8, 1296 + square_note 3, 15, 2, 1728 + square_note 3, 15, 8, 1722 + square_note 3, 15, 2, 1712 + square_note 16, 15, 2, 1680 + sound_ret Cry_Raikou_Ch6: - sound_duty 2, 0, 3, 3 - sound __, 3, $f1, $0720 - sound __, 3, $e1, $0650 - sound __, 5, $f1, $0750 - sound __, 5, $d1, $03a0 - sound __, 4, $f1, $0670 - sound __, 4, $e1, $0680 - sound __, 4, $f2, $0690 - sound C_, 1, $e2, $06a0 - endchannel + duty_cycle_pattern 3, 3, 0, 2 + square_note 2, 15, 1, 1824 + square_note 2, 14, 1, 1616 + square_note 4, 15, 1, 1872 + square_note 4, 13, 1, 928 + square_note 3, 15, 1, 1648 + square_note 3, 14, 1, 1664 + square_note 3, 15, 2, 1680 + square_note 16, 14, 2, 1696 + sound_ret Cry_Raikou_Ch8: - noise __, 3, $89, $2e - noise __, 3, $99, $1f - noise __, 5, $89, $4e - noise __, 5, $89, $7b - noise __, 4, $d8, $4b - noise __, 4, $e7, $4c - noise __, 4, $ec, $4d - noise C_, 1, $d2, $4f - endchannel + noise_note 2, 8, -1, 46 + noise_note 2, 9, -1, 31 + noise_note 4, 8, -1, 78 + noise_note 4, 8, -1, 123 + noise_note 3, 13, 8, 75 + noise_note 3, 14, 7, 76 + noise_note 3, 14, -4, 77 + noise_note 16, 13, 2, 79 + sound_ret Cry_Hoothoot_Ch5: - sound_duty 2, 1, 2, 1 - sound __, 5, $78, $0650 - sound __, 5, $f8, $0660 - sound __, 5, $f8, $065c - sound __, 2, $f8, $067c - sound __, 5, $f8, $0680 - sound __, 5, $f8, $067c - sound __, 5, $f8, $0678 - sound __, 5, $f1, $0674 - endchannel + duty_cycle_pattern 1, 2, 1, 2 + square_note 4, 7, 8, 1616 + square_note 4, 15, 8, 1632 + square_note 4, 15, 8, 1628 + square_note 1, 15, 8, 1660 + square_note 4, 15, 8, 1664 + square_note 4, 15, 8, 1660 + square_note 4, 15, 8, 1656 + square_note 4, 15, 1, 1652 + sound_ret Cry_Hoothoot_Ch6: - sound_duty 2, 0, 2, 0 -.loop1 - sound __, 3, $a1, $0600 - loopchannel 3, .loop1 -.loop2 - sound __, 3, $a1, $0630 - loopchannel 4, .loop2 - sound __, 5, $a2, $0634 - sound __, 5, $91, $0638 - endchannel + duty_cycle_pattern 0, 2, 0, 2 +Cry_Hoothoot_branch_f30fb: + square_note 2, 10, 1, 1536 + sound_loop 3, Cry_Hoothoot_branch_f30fb +Cry_Hoothoot_branch_f3103: + square_note 2, 10, 1, 1584 + sound_loop 4, Cry_Hoothoot_branch_f3103 + square_note 4, 10, 2, 1588 + square_note 4, 9, 1, 1592 + sound_ret Cry_Hoothoot_Ch8: - noise __, 2, $68, $36 - noise C_, 1, $88, $6a - noise __, 2, $98, $5e - noise C_, 1, $a7, $6e - endchannel + noise_note 1, 6, 8, 54 + noise_note 16, 8, 8, 106 + noise_note 1, 9, 8, 94 + noise_note 16, 10, 7, 110 + sound_ret Cry_Sentret_Ch5: - tone $0020 - dutycycle $0 - jumpchannel Cry_Sentret_branch_f312b + pitch_offset 32 + duty_cycle 0 + sound_jump Cry_Sentret_branch_f312b Cry_Sentret_Ch6: - sound_duty 3, 2, 1, 0 + duty_cycle_pattern 0, 1, 2, 3 Cry_Sentret_branch_f312b: - sound __, 9, $39, $072d - sound __, 9, $f1, $0720 - endchannel + square_note 8, 3, -1, 1837 + square_note 8, 15, 1, 1824 + sound_ret Cry_Sentret_Ch8: - noise __, 9, $3b, $0 - noise __, 9, $92, $0 - endchannel + noise_note 8, 3, -3, 0 + noise_note 8, 9, 2, 0 + sound_ret Cry_Mareep_Ch5: - tone $0020 - dutycycle $0 - jumpchannel Cry_Mareep_branch_f3145 + pitch_offset 32 + duty_cycle 0 + sound_jump Cry_Mareep_branch_f3145 Cry_Mareep_Ch6: - sound_duty 1, 0, 0, 0 + duty_cycle_pattern 0, 0, 0, 1 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 + square_note 4, 3, -2, 1853 + square_note 6, 15, 8, 1890 + square_note 6, 15, 8, 1888 + square_note 6, 15, 1, 1886 + sound_ret Cry_Cyndaquil_Ch5: - tone $0020 + pitch_offset 32 Cry_Cyndaquil_Ch6: - dutycycle $2 - sound __, 9, $2f, $0107 -.loop1 - sound __, 1, $e1, $0483 - sound __, 1, $51, $044e - loopchannel 4, .loop1 -.loop2 - sound __, 1, $e1, $03da - sound __, 2, $51, $0312 - loopchannel 4, .loop2 - endchannel + duty_cycle 2 + square_note 8, 2, -7, 263 +Cry_Cyndaquil_branch_f315f: + square_note 0, 14, 1, 1155 + square_note 0, 5, 1, 1102 + sound_loop 4, Cry_Cyndaquil_branch_f315f +Cry_Cyndaquil_branch_f316b: + square_note 0, 14, 1, 986 + square_note 1, 5, 1, 786 + sound_loop 4, Cry_Cyndaquil_branch_f316b + sound_ret -Cry_Cyndaquil_Ch8: Cry_Gligar_Ch8: - noise __, 9, $3f, $52 - noise C#, 1, $93, $4f - endchannel +Cry_Cyndaquil_Ch8: + noise_note 8, 3, -7, 82 + noise_note 32, 9, 3, 79 + sound_ret Cry_Chikorita_Ch5: - tone $0020 + pitch_offset 32 Cry_Chikorita_Ch6: - sound_duty 1, 0, 2, 0 - sound __, 3, $c8, $0641 - sound __, 3, $48, $0641 - sound __, 7, $f8, $0790 - sound __, 5, $f8, $078e - sound __, 5, $f1, $078b - endchannel + duty_cycle_pattern 0, 2, 0, 1 + square_note 2, 12, 8, 1601 + square_note 2, 4, 8, 1601 + square_note 6, 15, 8, 1936 + square_note 4, 15, 8, 1934 + square_note 4, 15, 1, 1931 + sound_ret Cry_Chikorita_Ch8: - noise __, 5, $91, $10 - noise __, 9, $94, $3 - endchannel + noise_note 4, 9, 1, 16 + noise_note 8, 9, 4, 3 + sound_ret Cry_Gligar_Ch5: - sound_duty 2, 0, 2, 2 - jumpchannel Cry_Gligar_branch_f3145 + duty_cycle_pattern 2, 2, 0, 2 + sound_jump Cry_Gligar_branch_f3145 Cry_Girafarig_Ch5: - dutycycle $1 - tone $0004 - jumpchannel Cry_Girafarig_branch_f31af + duty_cycle 1 + pitch_offset 4 + sound_jump Cry_Girafarig_branch_f31af Cry_Girafarig_Ch6: - sound_duty 1, 0, 0, 1 + duty_cycle_pattern 1, 0, 0, 1 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 + square_note 4, 6, 8, 1880 + square_note 2, 14, 8, 1888 + square_note 2, 14, 8, 1895 + square_note 2, 14, 8, 1900 + square_note 7, 15, 1, 1895 + sound_ret Cry_Girafarig_Ch8: - noise __, 5, $29, $0 - noise __, 3, $39, $1 - noise __, 3, $49, $2 - noise __, 3, $59, $1 - noise __, 8, $41, $0 - endchannel + noise_note 4, 2, -1, 0 + noise_note 2, 3, -1, 1 + noise_note 2, 4, -1, 2 + noise_note 2, 5, -1, 1 + noise_note 7, 4, 1, 0 + sound_ret Cry_Slugma_Ch5: - sound_duty 1, 0, 1, 2 - sound __, 13, $f2, $07a6 - sound __, 5, $f8, $07b0 - sound __, 5, $e8, $03b0 - sound __, 7, $f8, $03a0 - sound __, 9, $e1, $0290 - endchannel + duty_cycle_pattern 2, 1, 0, 1 + square_note 12, 15, 2, 1958 + square_note 4, 15, 8, 1968 + square_note 4, 14, 8, 944 + square_note 6, 15, 8, 928 + square_note 8, 14, 1, 656 + sound_ret Cry_Slugma_Ch8: - noise __, 13, $b2, $50 - noise __, 9, $a8, $60 - noise __, 7, $a8, $5b - noise __, 9, $a1, $5c - endchannel + noise_note 12, 11, 2, 80 + noise_note 8, 10, 8, 96 + noise_note 6, 10, 8, 91 + noise_note 8, 10, 1, 92 + sound_ret Cry_Ledyba_Ch5: - tone $0002 - dutycycle $2 - jumpchannel Cry_Ledyba_branch_f3202 + pitch_offset 2 + duty_cycle 2 + sound_jump Cry_Ledyba_branch_f3202 Cry_Ledyba_Ch6: - sound_duty 1, 0, 0, 0 + duty_cycle_pattern 0, 0, 0, 1 Cry_Ledyba_branch_f3202: - sound __, 4, $f8, $0791 - sound __, 4, $d8, $078d - sound __, 3, $0, 0 - sound __, 2, $78, $06c1 - sound __, 2, $f8, $0741 - sound __, 5, $e1, $0751 - endchannel + square_note 3, 15, 8, 1937 + square_note 3, 13, 8, 1933 + square_note 2, 0, 0, 0 + square_note 1, 7, 8, 1729 + square_note 1, 15, 8, 1857 + square_note 4, 14, 1, 1873 + sound_ret Cry_Ledyba_Ch8: - noise __, 4, $59, $21 - noise __, 4, $81, $0 - noise __, 3, $20, $0 - noise __, 2, $80, $21 - noise __, 2, $80, $10 - noise __, 5, $87, $0 - endchannel + noise_note 3, 5, -1, 33 + noise_note 3, 8, 1, 0 + noise_note 2, 2, 0, 0 + noise_note 1, 8, 0, 33 + noise_note 1, 8, 0, 16 + noise_note 4, 8, 7, 0 + sound_ret Cry_Wooper_Ch5: Cry_Donphan_Ch5: - dutycycle $2 - sound __, 3, $99, $0718 - sound __, 5, $ab, $0722 - sound __, 9, $ab, $0734 - sound __, 5, $d6, $0716 - sound __, 9, $d1, $0712 - sound __, 9, $0, 0 - endchannel + duty_cycle 2 + square_note 2, 9, -1, 1816 + square_note 4, 10, -3, 1826 + square_note 8, 10, -3, 1844 + square_note 4, 13, 6, 1814 + square_note 8, 13, 1, 1810 + square_note 8, 0, 0, 0 + sound_ret Cry_Wooper_Ch6: Cry_Donphan_Ch6: - sound_duty 3, 1, 0, 0 - sound __, 3, $b9, $0738 - sound __, 5, $cb, $0742 - sound __, 9, $cb, $0754 - sound __, 5, $f6, $0736 - sound __, 9, $f1, $0732 - sound __, 9, $0, 0 - endchannel + duty_cycle_pattern 0, 0, 1, 3 + square_note 2, 11, -1, 1848 + square_note 4, 12, -3, 1858 + square_note 8, 12, -3, 1876 + square_note 4, 15, 6, 1846 + square_note 8, 15, 1, 1842 + square_note 8, 0, 0, 0 + sound_ret 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 + noise_note 2, 5, -3, 4 + noise_note 4, 6, 8, 19 + noise_note 8, 6, 8, 32 + noise_note 4, 6, 8, 19 + noise_note 16, 5, 1, 4 + sound_ret 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 + noise_note 2, 8, -3, 89 + noise_note 4, 10, 8, 106 + noise_note 8, 10, 8, 112 + noise_note 4, 10, 8, 105 + noise_note 16, 9, 2, 108 + sound_ret -Cry_Typhlosion_Ch5: Cry_Teddiursa_Ch5: - sound_duty 2, 0, 1, 0 -.loop1 - sound __, 4, $c1, $0791 - loopchannel 3, .loop1 -.loop2 - sound __, 4, $d1, $04b1 - loopchannel 6, .loop2 -.loop3 - sound __, 2, $d1, $0491 - sound __, 2, $b1, $0451 - loopchannel 6, .loop3 -.loop4 - sound __, 2, $a3, $0471 - sound __, 2, $81, $0441 - loopchannel 6, .loop4 -.loop5 - sound __, 2, $41, $0421 - sound __, 2, $21, $0401 - loopchannel 4, .loop5 - endchannel +Cry_Typhlosion_Ch5: + duty_cycle_pattern 0, 1, 0, 2 +Cry_Teddiursa_branch_f3286: + square_note 3, 12, 1, 1937 + sound_loop 3, Cry_Teddiursa_branch_f3286 +Cry_Teddiursa_branch_f328e: + square_note 3, 13, 1, 1201 + sound_loop 6, Cry_Teddiursa_branch_f328e +Cry_Teddiursa_branch_f3296: + square_note 1, 13, 1, 1169 + square_note 1, 11, 1, 1105 + sound_loop 6, Cry_Teddiursa_branch_f3296 +Cry_Teddiursa_branch_f32a2: + square_note 1, 10, 3, 1137 + square_note 1, 8, 1, 1089 + sound_loop 6, Cry_Teddiursa_branch_f32a2 +Cry_Teddiursa_branch_f32ae: + square_note 1, 4, 1, 1057 + square_note 1, 2, 1, 1025 + sound_loop 4, Cry_Teddiursa_branch_f32ae + sound_ret -Cry_Typhlosion_Ch6: Cry_Teddiursa_Ch6: - sound_duty 0, 2, 3, 1 - sound __, 9, $99, $0740 - sound __, 9, $79, $0746 - sound C_, 1, $f6, $078d - sound __, 9, $f8, $0791 - sound __, 9, $f8, $078d - sound __, 9, $f8, $0787 - sound C_, 9, $e2, $0783 - endchannel +Cry_Typhlosion_Ch6: + duty_cycle_pattern 1, 3, 2, 0 + square_note 8, 9, -1, 1856 + square_note 8, 7, -1, 1862 + square_note 16, 15, 6, 1933 + square_note 8, 15, 8, 1937 + square_note 8, 15, 8, 1933 + square_note 8, 15, 8, 1927 + square_note 24, 14, 2, 1923 + sound_ret Cry_Typhlosion_Ch8: - noise C_, 1, $a6, $16 - noise C_, 9, $98, $3d - noise C#, 1, $98, $5c - noise C#, 1, $75, $5f - endchannel + noise_note 16, 10, 6, 22 + noise_note 24, 9, 8, 61 + noise_note 32, 9, 8, 92 + noise_note 32, 7, 5, 95 + sound_ret Cry_Natu_Ch5: - sound_duty 2, 3, 1, 3 + duty_cycle_pattern 3, 1, 3, 2 Cry_Mantine_branch_f32e9: Cry_Sunflora_branch_f32e9: - sound __, 5, $f8, $07b1 - sound __, 5, $f8, $07b0 - sound __, 5, $48, $07af + square_note 4, 15, 8, 1969 + square_note 4, 15, 8, 1968 + square_note 4, 4, 8, 1967 Cry_Mantine_branch_f32f5: - sound __, 5, $f8, $07b2 - sound __, 5, $f8, $07b3 - sound __, 5, $48, $07b4 - endchannel + square_note 4, 15, 8, 1970 + square_note 4, 15, 8, 1971 + square_note 4, 4, 8, 1972 + sound_ret -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_f3302: + duty_cycle_pattern 3, 3, 0, 2 + square_note 4, 15, 8, 1970 + square_note 4, 15, 8, 1969 + square_note 4, 2, 8, 1968 Cry_Mantine_branch_f3310: - sound __, 5, $f8, $07b4 - sound __, 5, $f8, $07b6 - sound __, 5, $48, $07b8 - endchannel + square_note 4, 15, 8, 1972 + square_note 4, 15, 8, 1974 + square_note 4, 4, 8, 1976 + sound_ret -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_f331d: + noise_note 4, 8, 8, 5 + noise_note 4, 8, 8, 4 + noise_note 4, 3, 8, 3 Cry_Mantine_branch_f3326: - noise __, 5, $88, $5 - noise __, 5, $88, $4 - noise __, 5, $87, $4 - endchannel + noise_note 4, 8, 8, 5 + noise_note 4, 8, 8, 4 + noise_note 4, 8, 7, 4 + sound_ret Cry_Teddiursa_Ch8: - noise __, 9, $a6, $3a - noise __, 9, $a1, $5a - endchannel + noise_note 8, 10, 6, 58 + noise_note 8, 10, 1, 90 + sound_ret Cry_Sunflora_Ch5: - dutycycle $0 - jumpchannel Cry_Sunflora_branch_f32e9 + duty_cycle 0 + sound_jump Cry_Sunflora_branch_f32e9 Cry_Mantine_Ch5: - dutycycle $0 - callchannel Cry_Mantine_branch_f32e9 - callchannel Cry_Mantine_branch_f32f5 - endchannel + duty_cycle 0 + sound_call Cry_Mantine_branch_f32e9 + sound_call Cry_Mantine_branch_f32f5 + sound_ret Cry_Mantine_Ch6: - callchannel Cry_Mantine_branch_f3302 - callchannel Cry_Mantine_branch_f3310 - endchannel + sound_call Cry_Mantine_branch_f3302 + sound_call Cry_Mantine_branch_f3310 + sound_ret Cry_Mantine_Ch8: - callchannel Cry_Mantine_branch_f331d - callchannel Cry_Mantine_branch_f3326 - endchannel + sound_call Cry_Mantine_branch_f331d + sound_call Cry_Mantine_branch_f3326 + sound_ret Cry_Ampharos_Ch5: - sound_duty 2, 3, 1, 3 -.loop - sound __, 2, $c1, $0520 - sound __, 2, $a1, $0420 - loopchannel 4, .loop - dutycycle $0 - sound __, 5, $78, $0760 - sound __, 5, $78, $0730 - sound C_, 9, $c2, $0420 - endchannel + duty_cycle_pattern 3, 1, 3, 2 +Cry_Ampharos_branch_f3355: + square_note 1, 12, 1, 1312 + square_note 1, 10, 1, 1056 + sound_loop 4, Cry_Ampharos_branch_f3355 + duty_cycle 0 + square_note 4, 7, 8, 1888 + square_note 4, 7, 8, 1840 + square_note 24, 12, 2, 1056 + sound_ret Cry_Ampharos_Ch6: - sound_duty 2, 0, 3, 0 - sound __, 9, $f8, $0700 - sound __, 8, $f8, $0720 - sound __, 5, $f8, $0790 - sound __, 5, $f8, $0760 - sound C_, 9, $f2, $0730 - endchannel + duty_cycle_pattern 0, 3, 0, 2 + square_note 8, 15, 8, 1792 + square_note 7, 15, 8, 1824 + square_note 4, 15, 8, 1936 + square_note 4, 15, 8, 1888 + square_note 24, 15, 2, 1840 + sound_ret Cry_Ampharos_Ch8: - noise __, 5, $88, $6d - noise __, 5, $d8, $68 - noise __, 8, $c8, $69 - noise __, 5, $98, $3a - noise __, 5, $98, $3c - noise C_, 9, $d2, $5b - endchannel + noise_note 4, 8, 8, 109 + noise_note 4, 13, 8, 104 + noise_note 7, 12, 8, 105 + noise_note 4, 9, 8, 58 + noise_note 4, 9, 8, 60 + noise_note 24, 13, 2, 91 + sound_ret Cry_Totodile_Ch5: - sound_duty 2, 0, 3, 0 - sound __, 9, $f8, $0330 - sound __, 9, $f8, $0340 - sound __, 9, $c8, $07b2 - sound __, 9, $b8, $07b3 - sound C#, 1, $b2, $07b4 - endchannel + duty_cycle_pattern 0, 3, 0, 2 + square_note 8, 15, 8, 816 + square_note 8, 15, 8, 832 + square_note 8, 12, 8, 1970 + square_note 8, 11, 8, 1971 + square_note 32, 11, 2, 1972 + sound_ret Cry_Totodile_Ch6: - sound_duty 2, 0, 1, 0 - sound __, 9, $e8, $0320 - sound __, 9, $e8, $0328 - sound __, 9, $98, $0780 - sound __, 9, $88, $0782 - sound C#, 1, $72, $0784 - endchannel + duty_cycle_pattern 0, 1, 0, 2 + square_note 8, 14, 8, 800 + square_note 8, 14, 8, 808 + square_note 8, 9, 8, 1920 + square_note 8, 8, 8, 1922 + square_note 32, 7, 2, 1924 + sound_ret Cry_Totodile_Ch8: - noise __, 3, $be, $49 - noise __, 6, $be, $3a - noise __, 3, $be, $29 - noise C#, 9, $d3, $6e - endchannel + noise_note 2, 11, -6, 73 + noise_note 5, 11, -6, 58 + noise_note 2, 11, -6, 41 + noise_note 40, 13, 3, 110 + sound_ret Cry_Cleffa_Ch5: - sound_duty 1, 2, 3, 0 - soundinput $ff - sound __, 3, $f8, $0720 - sound __, 3, $f8, $0727 - sound __, 3, $f8, $0780 - soundinput $88 - sound __, 3, $f8, $0779 - sound __, 5, $f8, $0740 - sound __, 5, $f8, $073c - soundinput $ff - sound __, 9, $f1, $0737 - soundinput $88 - endchannel + duty_cycle_pattern 0, 3, 2, 1 + pitch_sweep 15, -7 + square_note 2, 15, 8, 1824 + square_note 2, 15, 8, 1831 + square_note 2, 15, 8, 1920 + pitch_sweep 8, 8 + square_note 2, 15, 8, 1913 + square_note 4, 15, 8, 1856 + square_note 4, 15, 8, 1852 + pitch_sweep 15, -7 + square_note 8, 15, 1, 1847 + pitch_sweep 8, 8 + sound_ret 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 + duty_cycle_pattern 0, 2, 0, 2 + square_note 6, 11, 2, 1822 + square_note 5, 9, 2, 1913 + square_note 4, 8, 2, 1854 + square_note 8, 10, 1, 1845 + sound_ret Cry_Cleffa_Ch8: - noise __, 3, $64, $7f - noise __, 3, $84, $7d - noise __, 3, $a4, $6f - noise __, 3, $64, $6c - noise __, 3, $94, $6f - noise __, 3, $61, $6b - endchannel + noise_note 2, 6, 4, 127 + noise_note 2, 8, 4, 125 + noise_note 2, 10, 4, 111 + noise_note 2, 6, 4, 108 + noise_note 2, 9, 4, 111 + noise_note 2, 6, 1, 107 + sound_ret Cry_Aipom_Ch5: - sound_duty 2, 0, 1, 3 - sound __, 4, $f8, $06b0 - sound __, 2, $f8, $06a5 - sound __, 2, $f8, $069d - sound __, 8, $f1, $068a - sound __, 4, $f8, $0736 - sound __, 4, $f8, $0720 - sound C_, 5, $f2, $070e - endchannel + duty_cycle_pattern 3, 1, 0, 2 + square_note 3, 15, 8, 1712 + square_note 1, 15, 8, 1701 + square_note 1, 15, 8, 1693 + square_note 7, 15, 1, 1674 + square_note 3, 15, 8, 1846 + square_note 3, 15, 8, 1824 + square_note 20, 15, 2, 1806 + sound_ret Cry_Aipom_Ch6: - sound_duty 3, 1, 2, 0 -.loop1 - sound __, 2, $f1, $07b4 - loopchannel 8, .loop1 -.loop2 - sound __, 2, $c1, $0790 - loopchannel 3, .loop2 -.loop3 - sound __, 2, $b1, $078d - loopchannel 2, .loop3 - sound C_, 1, $92, $0795 - endchannel + duty_cycle_pattern 0, 2, 1, 3 +Cry_Aipom_branch_f3443: + square_note 1, 15, 1, 1972 + sound_loop 8, Cry_Aipom_branch_f3443 +Cry_Aipom_branch_f344b: + square_note 1, 12, 1, 1936 + sound_loop 3, Cry_Aipom_branch_f344b +Cry_Aipom_branch_f3453: + square_note 1, 11, 1, 1933 + sound_loop 2, Cry_Aipom_branch_f3453 + square_note 16, 9, 2, 1941 + sound_ret Cry_Aipom_Ch8: - noise __, 1, $f1, $28 - loopchannel 4, Cry_Aipom_Ch8 - noise __, 1, $91, $49 - noise __, 2, $a8, $4a - noise __, 1, $e1, $4b - noise __, 6, $d2, $4f - noise __, 4, $c2, $4e - noise __, 4, $b2, $4d - noise C_, 5, $a3, $4c - endchannel + noise_note 0, 15, 1, 40 + sound_loop 4, Cry_Aipom_Ch8 + noise_note 0, 9, 1, 73 + noise_note 1, 10, 8, 74 + noise_note 0, 14, 1, 75 + noise_note 5, 13, 2, 79 + noise_note 3, 12, 2, 78 + noise_note 3, 11, 2, 77 + noise_note 20, 10, 3, 76 + sound_ret Cry_Nidoran_M: - musicheader 3, 5, Cry_Nidoran_M_Ch5 - musicheader 1, 6, Cry_Nidoran_M_Ch6 - musicheader 1, 8, Cry_Nidoran_M_Ch8 + channel_count 3 + channel 5, Cry_Nidoran_M_Ch5 + channel 6, Cry_Nidoran_M_Ch6 + channel 8, Cry_Nidoran_M_Ch8 Cry_Nidoran_F: - musicheader 3, 5, Cry_Nidoran_F_Ch5 - musicheader 1, 6, Cry_Nidoran_F_Ch6 - musicheader 1, 8, Cry_Nidoran_F_Ch8 + channel_count 3 + channel 5, Cry_Nidoran_F_Ch5 + channel 6, Cry_Nidoran_F_Ch6 + channel 8, Cry_Nidoran_F_Ch8 Cry_Slowpoke: - musicheader 3, 5, Cry_Slowpoke_Ch5 - musicheader 1, 6, Cry_Slowpoke_Ch6 - musicheader 1, 8, Cry_Slowpoke_Ch8 + channel_count 3 + channel 5, Cry_Slowpoke_Ch5 + channel 6, Cry_Slowpoke_Ch6 + channel 8, Cry_Slowpoke_Ch8 Cry_Kangaskhan: - musicheader 3, 5, Cry_Kangaskhan_Ch5 - musicheader 1, 6, Cry_Kangaskhan_Ch6 - musicheader 1, 8, Cry_Kangaskhan_Ch8 + channel_count 3 + channel 5, Cry_Kangaskhan_Ch5 + channel 6, Cry_Kangaskhan_Ch6 + channel 8, Cry_Kangaskhan_Ch8 Cry_Charmander: - musicheader 3, 5, Cry_Charmander_Ch5 - musicheader 1, 6, Cry_Charmander_Ch6 - musicheader 1, 8, Cry_Charmander_Ch8 + channel_count 3 + channel 5, Cry_Charmander_Ch5 + channel 6, Cry_Charmander_Ch6 + channel 8, Cry_Charmander_Ch8 Cry_Grimer: - musicheader 3, 5, Cry_Grimer_Ch5 - musicheader 1, 6, Cry_Grimer_Ch6 - musicheader 1, 8, Cry_Grimer_Ch8 + channel_count 3 + channel 5, Cry_Grimer_Ch5 + channel 6, Cry_Grimer_Ch6 + channel 8, Cry_Grimer_Ch8 Cry_Voltorb: - musicheader 3, 5, Cry_Voltorb_Ch5 - musicheader 1, 6, Cry_Voltorb_Ch6 - musicheader 1, 8, Cry_Voltorb_Ch8 + channel_count 3 + channel 5, Cry_Voltorb_Ch5 + channel 6, Cry_Voltorb_Ch6 + channel 8, Cry_Voltorb_Ch8 Cry_Muk: - musicheader 3, 5, Cry_Muk_Ch5 - musicheader 1, 6, Cry_Muk_Ch6 - musicheader 1, 8, Cry_Muk_Ch8 + channel_count 3 + channel 5, Cry_Muk_Ch5 + channel 6, Cry_Muk_Ch6 + channel 8, Cry_Muk_Ch8 Cry_Oddish: - musicheader 3, 5, Cry_Oddish_Ch5 - musicheader 1, 6, Cry_Oddish_Ch6 - musicheader 1, 8, Cry_Oddish_Ch8 + channel_count 3 + channel 5, Cry_Oddish_Ch5 + channel 6, Cry_Oddish_Ch6 + channel 8, Cry_Oddish_Ch8 Cry_Raichu: - musicheader 3, 5, Cry_Raichu_Ch5 - musicheader 1, 6, Cry_Raichu_Ch6 - musicheader 1, 8, Cry_Raichu_Ch8 + channel_count 3 + channel 5, Cry_Raichu_Ch5 + channel 6, Cry_Raichu_Ch6 + channel 8, Cry_Raichu_Ch8 Cry_Nidoqueen: - musicheader 3, 5, Cry_Nidoqueen_Ch5 - musicheader 1, 6, Cry_Nidoqueen_Ch6 - musicheader 1, 8, Cry_Nidoqueen_Ch8 + channel_count 3 + channel 5, Cry_Nidoqueen_Ch5 + channel 6, Cry_Nidoqueen_Ch6 + channel 8, Cry_Nidoqueen_Ch8 Cry_Diglett: - musicheader 3, 5, Cry_Diglett_Ch5 - musicheader 1, 6, Cry_Diglett_Ch6 - musicheader 1, 8, Cry_Diglett_Ch8 + channel_count 3 + channel 5, Cry_Diglett_Ch5 + channel 6, Cry_Diglett_Ch6 + channel 8, Cry_Diglett_Ch8 Cry_Seel: - musicheader 3, 5, Cry_Seel_Ch5 - musicheader 1, 6, Cry_Seel_Ch6 - musicheader 1, 8, Cry_Seel_Ch8 + channel_count 3 + channel 5, Cry_Seel_Ch5 + channel 6, Cry_Seel_Ch6 + channel 8, Cry_Seel_Ch8 Cry_Drowzee: - musicheader 3, 5, Cry_Drowzee_Ch5 - musicheader 1, 6, Cry_Drowzee_Ch6 - musicheader 1, 8, Cry_Drowzee_Ch8 + channel_count 3 + channel 5, Cry_Drowzee_Ch5 + channel 6, Cry_Drowzee_Ch6 + channel 8, Cry_Drowzee_Ch8 Cry_Pidgey: - musicheader 3, 5, Cry_Pidgey_Ch5 - musicheader 1, 6, Cry_Pidgey_Ch6 - musicheader 1, 8, Cry_Pidgey_Ch8 + channel_count 3 + channel 5, Cry_Pidgey_Ch5 + channel 6, Cry_Pidgey_Ch6 + channel 8, Cry_Pidgey_Ch8 Cry_Bulbasaur: - musicheader 3, 5, Cry_Bulbasaur_Ch5 - musicheader 1, 6, Cry_Bulbasaur_Ch6 - musicheader 1, 8, Cry_Bulbasaur_Ch8 + channel_count 3 + channel 5, Cry_Bulbasaur_Ch5 + channel 6, Cry_Bulbasaur_Ch6 + channel 8, Cry_Bulbasaur_Ch8 Cry_Spearow: - musicheader 3, 5, Cry_Spearow_Ch5 - musicheader 1, 6, Cry_Spearow_Ch6 - musicheader 1, 8, Cry_Spearow_Ch8 + channel_count 3 + channel 5, Cry_Spearow_Ch5 + channel 6, Cry_Spearow_Ch6 + channel 8, Cry_Spearow_Ch8 Cry_Rhydon: - musicheader 3, 5, Cry_Rhydon_Ch5 - musicheader 1, 6, Cry_Rhydon_Ch6 - musicheader 1, 8, Cry_Rhydon_Ch8 + channel_count 3 + channel 5, Cry_Rhydon_Ch5 + channel 6, Cry_Rhydon_Ch6 + channel 8, Cry_Rhydon_Ch8 Cry_Golem: - musicheader 3, 5, Cry_Golem_Ch5 - musicheader 1, 6, Cry_Golem_Ch6 - musicheader 1, 8, Cry_Golem_Ch8 + channel_count 3 + channel 5, Cry_Golem_Ch5 + channel 6, Cry_Golem_Ch6 + channel 8, Cry_Golem_Ch8 Cry_Blastoise: - musicheader 3, 5, Cry_Blastoise_Ch5 - musicheader 1, 6, Cry_Blastoise_Ch6 - musicheader 1, 8, Cry_Blastoise_Ch8 + channel_count 3 + channel 5, Cry_Blastoise_Ch5 + channel 6, Cry_Blastoise_Ch6 + channel 8, Cry_Blastoise_Ch8 Cry_Pidgeotto: - musicheader 3, 5, Cry_Pidgeotto_Ch5 - musicheader 1, 6, Cry_Pidgeotto_Ch6 - musicheader 1, 8, Cry_Pidgeotto_Ch8 + channel_count 3 + channel 5, Cry_Pidgeotto_Ch5 + channel 6, Cry_Pidgeotto_Ch6 + channel 8, Cry_Pidgeotto_Ch8 Cry_Weedle: - musicheader 3, 5, Cry_Weedle_Ch5 - musicheader 1, 6, Cry_Weedle_Ch6 - musicheader 1, 8, Cry_Weedle_Ch8 + channel_count 3 + channel 5, Cry_Weedle_Ch5 + channel 6, Cry_Weedle_Ch6 + channel 8, Cry_Weedle_Ch8 Cry_Caterpie: - musicheader 3, 5, Cry_Caterpie_Ch5 - musicheader 1, 6, Cry_Caterpie_Ch6 - musicheader 1, 8, Cry_Caterpie_Ch8 + channel_count 3 + channel 5, Cry_Caterpie_Ch5 + channel 6, Cry_Caterpie_Ch6 + channel 8, Cry_Caterpie_Ch8 Cry_Ekans: - musicheader 3, 5, Cry_Ekans_Ch5 - musicheader 1, 6, Cry_Ekans_Ch6 - musicheader 1, 8, Cry_Ekans_Ch8 + channel_count 3 + channel 5, Cry_Ekans_Ch5 + channel 6, Cry_Ekans_Ch6 + channel 8, Cry_Ekans_Ch8 Cry_Fearow: - musicheader 3, 5, Cry_Fearow_Ch5 - musicheader 1, 6, Cry_Fearow_Ch6 - musicheader 1, 8, Cry_Fearow_Ch8 + channel_count 3 + channel 5, Cry_Fearow_Ch5 + channel 6, Cry_Fearow_Ch6 + channel 8, Cry_Fearow_Ch8 Cry_Clefairy: - musicheader 3, 5, Cry_Clefairy_Ch5 - musicheader 1, 6, Cry_Clefairy_Ch6 - musicheader 1, 8, Cry_Clefairy_Ch8 + channel_count 3 + channel 5, Cry_Clefairy_Ch5 + channel 6, Cry_Clefairy_Ch6 + channel 8, Cry_Clefairy_Ch8 Cry_Venonat: - musicheader 3, 5, Cry_Venonat_Ch5 - musicheader 1, 6, Cry_Venonat_Ch6 - musicheader 1, 8, Cry_Venonat_Ch8 + channel_count 3 + channel 5, Cry_Venonat_Ch5 + channel 6, Cry_Venonat_Ch6 + channel 8, Cry_Venonat_Ch8 Cry_Lapras: - musicheader 3, 5, Cry_Lapras_Ch5 - musicheader 1, 6, Cry_Lapras_Ch6 - musicheader 1, 8, Cry_Lapras_Ch8 + channel_count 3 + channel 5, Cry_Lapras_Ch5 + channel 6, Cry_Lapras_Ch6 + channel 8, Cry_Lapras_Ch8 Cry_Metapod: - musicheader 3, 5, Cry_Metapod_Ch5 - musicheader 1, 6, Cry_Metapod_Ch6 - musicheader 1, 8, Cry_Metapod_Ch8 + channel_count 3 + channel 5, Cry_Metapod_Ch5 + channel 6, Cry_Metapod_Ch6 + channel 8, Cry_Metapod_Ch8 Cry_Squirtle: - musicheader 3, 5, Cry_Squirtle_Ch5 - musicheader 1, 6, Cry_Squirtle_Ch6 - musicheader 1, 8, Cry_Squirtle_Ch8 + channel_count 3 + channel 5, Cry_Squirtle_Ch5 + channel 6, Cry_Squirtle_Ch6 + channel 8, Cry_Squirtle_Ch8 Cry_Paras: - musicheader 3, 5, Cry_Paras_Ch5 - musicheader 1, 6, Cry_Paras_Ch6 - musicheader 1, 8, Cry_Paras_Ch8 + channel_count 3 + channel 5, Cry_Paras_Ch5 + channel 6, Cry_Paras_Ch6 + channel 8, Cry_Paras_Ch8 Cry_Growlithe: - musicheader 3, 5, Cry_Growlithe_Ch5 - musicheader 1, 6, Cry_Growlithe_Ch6 - musicheader 1, 8, Cry_Growlithe_Ch8 + channel_count 3 + channel 5, Cry_Growlithe_Ch5 + channel 6, Cry_Growlithe_Ch6 + channel 8, Cry_Growlithe_Ch8 Cry_Krabby: - musicheader 3, 5, Cry_Krabby_Ch5 - musicheader 1, 6, Cry_Krabby_Ch6 - musicheader 1, 8, Cry_Krabby_Ch8 + channel_count 3 + channel 5, Cry_Krabby_Ch5 + channel 6, Cry_Krabby_Ch6 + channel 8, Cry_Krabby_Ch8 Cry_Psyduck: - musicheader 3, 5, Cry_Psyduck_Ch5 - musicheader 1, 6, Cry_Psyduck_Ch6 - musicheader 1, 8, Cry_Psyduck_Ch8 + channel_count 3 + channel 5, Cry_Psyduck_Ch5 + channel 6, Cry_Psyduck_Ch6 + channel 8, Cry_Psyduck_Ch8 Cry_Rattata: - musicheader 3, 5, Cry_Rattata_Ch5 - musicheader 1, 6, Cry_Rattata_Ch6 - musicheader 1, 8, Cry_Rattata_Ch8 + channel_count 3 + channel 5, Cry_Rattata_Ch5 + channel 6, Cry_Rattata_Ch6 + channel 8, Cry_Rattata_Ch8 Cry_Vileplume: - musicheader 3, 5, Cry_Vileplume_Ch5 - musicheader 1, 6, Cry_Vileplume_Ch6 - musicheader 1, 8, Cry_Vileplume_Ch8 + channel_count 3 + channel 5, Cry_Vileplume_Ch5 + channel 6, Cry_Vileplume_Ch6 + channel 8, Cry_Vileplume_Ch8 Cry_Vulpix: - musicheader 3, 5, Cry_Vulpix_Ch5 - musicheader 1, 6, Cry_Vulpix_Ch6 - musicheader 1, 8, Cry_Vulpix_Ch8 + channel_count 3 + channel 5, Cry_Vulpix_Ch5 + channel 6, Cry_Vulpix_Ch6 + channel 8, Cry_Vulpix_Ch8 Cry_Weepinbell: - musicheader 3, 5, Cry_Weepinbell_Ch5 - musicheader 1, 6, Cry_Weepinbell_Ch6 - musicheader 1, 8, Cry_Weepinbell_Ch8 - -Unused_Cry_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $e0, $0780 - sound __, 16, $f0, $0784 - sound __, 16, $c3, $05e0 - sound __, 16, $c4, $0600 - sound __, 11, $6c, $0780 - sound __, 9, $71, $0784 - endchannel - -Unused_Cry_Ch6: - sound_duty 1, 1, 0, 0 - sound __, 16, $a0, $0741 - sound __, 16, $b0, $0743 - sound __, 16, $93, $05b1 - sound __, 16, $94, $05c1 - sound __, 11, $4c, $0741 - sound __, 9, $31, $0746 - endchannel - -Unused_Cry_Ch8: - noise __, 3, $f2, $4c - noise __, 7, $e0, $3a - noise __, 16, $d0, $3a - noise __, 9, $d0, $2c - noise __, 7, $e6, $4c - noise __, 13, $7d, $4c - noise __, 16, $d3, $4c - endchannel + channel_count 3 + channel 5, Cry_Weepinbell_Ch5 + channel 6, Cry_Weepinbell_Ch6 + channel 8, Cry_Weepinbell_Ch8 + +Cry_Unused_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret + +Cry_Unused_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret + +Cry_Unused_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret Cry_Raichu_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $f7, $07a0 - sound __, 7, $e6, $07a3 - sound __, 11, $f4, $07a0 - sound_duty 1, 1, 2, 2 - sound __, 11, $f6, $07d8 - sound __, 5, $e3, $07d7 - sound __, 16, $f2, $07d8 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret Cry_Raichu_Ch6: - sound_duty 1, 1, 0, 0 - sound __, 3, $8, 0 - sound __, 16, $a7, $06a1 - sound __, 7, $86, $06a2 - sound __, 11, $74, $06a1 - sound_duty 3, 3, 1, 1 - sound __, 11, $76, $06d6 - sound __, 5, $83, $06d9 - sound __, 16, $a2, $06d7 - endchannel + duty_cycle_pattern 0, 0, 1, 1 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 1, 1, 3, 3 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret Cry_Raichu_Ch8: - noise __, 3, $f2, $3c - noise __, 9, $e4, $3e - noise __, 16, $d7, $3c - noise __, 7, $c5, $3b - noise __, 7, $e4, $3d - noise __, 9, $b6, $3c - noise __, 7, $d4, $3d - noise __, 9, $c1, $3b - endchannel + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret Cry_Vileplume_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $f7, $07c0 - sound __, 7, $e4, $07c1 - sound __, 11, $f6, $07c0 - sound __, 5, $d3, $07c2 - sound __, 9, $c1, $07c0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret 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 + duty_cycle_pattern 1, 1, 3, 3 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret Cry_Vileplume_Ch8: - noise __, 4, $f2, $3c - noise __, 14, $e6, $2c - noise __, 16, $d7, $3c - noise __, 9, $c1, $2c - endchannel + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret Cry_Vulpix_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $f7, $0680 - sound __, 11, $e6, $0684 - sound __, 16, $d7, $0690 - sound __, 9, $d5, $0690 - sound __, 7, $c4, $0688 - sound __, 6, $d3, $0670 - sound __, 5, $d3, $0660 - sound __, 9, $c1, $0640 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret Cry_Vulpix_Ch6: - sound_duty 1, 1, 0, 0 - sound __, 16, $b7, $0641 - sound __, 11, $96, $0642 - sound __, 16, $a7, $0651 - sound __, 9, $a5, $0651 - sound __, 7, $94, $0647 - sound __, 6, $a3, $0631 - sound __, 5, $93, $0622 - sound __, 9, $71, $0601 - endchannel + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret Cry_Vulpix_Ch8: - noise __, 16, $e4, $3c - noise __, 11, $c7, $4c - noise __, 11, $c7, $3c - noise __, 13, $b7, $4c - noise __, 16, $a2, $5c - endchannel + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret Cry_Rhydon_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 7, $f7, $07a0 - sound __, 9, $e6, $07a4 - sound __, 5, $d6, $07a0 - sound __, 16, $d3, $0720 - sound __, 9, $c3, $0723 - sound __, 3, $c2, $0728 - sound __, 9, $b1, $0730 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret Cry_Rhydon_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 5, $8, 0 - sound __, 7, $a7, $0741 - sound __, 9, $86, $0743 - sound __, 5, $76, $0741 - sound __, 14, $83, $06c2 - sound __, 8, $73, $06c1 - sound __, 4, $82, $06cc - sound __, 9, $71, $06d8 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret Cry_Rhydon_Ch8: - noise __, 3, $f2, $4c - noise __, 7, $e6, $3a - noise __, 5, $d7, $3a - noise __, 7, $d6, $2c - noise __, 9, $e5, $3c - noise __, 13, $d2, $3d - noise __, 9, $d1, $2c - endchannel + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret Cry_Weepinbell_Ch5: - sound_duty 1, 1, 2, 2 - sound __, 7, $f4, $0740 - sound __, 16, $e3, $0730 - sound __, 5, $f4, $0740 - sound __, 6, $b3, $0748 - sound __, 9, $d1, $0750 - endchannel + duty_cycle_pattern 2, 2, 1, 1 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret Cry_Weepinbell_Ch6: - sound_duty 3, 1, 3, 1 - sound __, 7, $c3, $0712 - sound __, 16, $b3, $0704 - sound __, 4, $c3, $0712 - sound __, 5, $c3, $0721 - sound __, 9, $b1, $0732 - endchannel + duty_cycle_pattern 1, 3, 1, 3 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret Cry_Weepinbell_Ch8: - noise __, 9, $d6, $2c - noise __, 13, $c6, $3c - noise __, 11, $b6, $2c - noise __, 9, $91, $1c - endchannel + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret Cry_Kangaskhan_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 5, $f7, $0608 - sound __, 7, $e6, $0600 - sound __, 7, $d7, $05f0 - sound __, 7, $c4, $05e0 - sound __, 6, $d3, $05c0 - sound __, 5, $d3, $05a0 - sound __, 9, $e1, $0580 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret Cry_Kangaskhan_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 5, $c7, $0504 - sound __, 7, $a6, $0502 - sound __, 7, $97, $04f1 - sound __, 5, $b4, $04e1 - sound __, 6, $a3, $04c2 - sound __, 5, $b3, $04a3 - sound __, 9, $c1, $0482 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret Cry_Kangaskhan_Ch8: - noise __, 13, $e4, $4c - noise __, 11, $c7, $5c - noise __, 13, $b6, $4c - noise __, 16, $a2, $5c - endchannel + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret Cry_Bulbasaur_Ch5: - sound_duty 1, 0, 3, 3 - sound __, 5, $f7, $07c0 - sound __, 13, $e6, $07c2 - sound __, 7, $b5, $0680 - sound __, 5, $c4, $0670 - sound __, 5, $b5, $0660 - sound __, 9, $c1, $0640 - endchannel + duty_cycle_pattern 3, 3, 0, 1 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret Cry_Bulbasaur_Ch6: - sound_duty 0, 3, 0, 3 - sound __, 4, $c7, $0781 - sound __, 13, $b6, $0780 - sound __, 7, $a5, $0641 - sound __, 5, $c4, $0632 - sound __, 7, $b5, $0621 - sound __, 9, $a1, $0602 - endchannel + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret Cry_Bulbasaur_Ch8: - noise __, 4, $e4, $3c - noise __, 13, $d6, $2c - noise __, 5, $e4, $3c - noise __, 9, $b7, $5c - noise __, 16, $c2, $5d - endchannel + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret Cry_Spearow_Ch5: - sound_duty 1, 2, 0, 3 - sound __, 9, $f7, $0680 - sound __, 3, $f7, $0660 - sound __, 2, $e7, $0640 - sound __, 2, $e7, $0620 - sound __, 16, $d1, $0600 - sound __, 5, $c7, $0740 - sound __, 5, $a7, $0730 - sound __, 16, $91, $0720 - endchannel + duty_cycle_pattern 3, 0, 2, 1 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret Cry_Spearow_Ch6: - sound_duty 1, 2, 3, 1 - sound __, 11, $e7, $0682 - sound __, 3, $e7, $0662 - sound __, 2, $d7, $0642 - sound __, 2, $d7, $0622 - sound __, 16, $c1, $0602 - sound __, 5, $b7, $0742 - sound __, 3, $97, $0732 - sound __, 16, $81, $0722 - endchannel + duty_cycle_pattern 1, 3, 2, 1 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret Cry_Spearow_Ch8: - noise __, 5, $74, $21 - noise __, 5, $74, $10 - noise __, 5, $71, $20 - endchannel + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret Cry_Nidoran_M_Ch5: - sound_duty 1, 1, 3, 3 - sound __, 5, $f3, $0718 - sound __, 16, $e5, $0798 - sound __, 9, $91, $0758 - endchannel + duty_cycle_pattern 3, 3, 1, 1 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret Cry_Nidoran_M_Ch6: - sound_duty 0, 0, 2, 2 - sound __, 6, $b3, $0708 - sound __, 16, $c5, $0788 - sound __, 9, $71, $0748 - endchannel + duty_cycle_pattern 2, 2, 0, 0 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret Cry_Nidoran_M_Ch8: - noise __, 4, $a1, $1c - noise __, 15, $94, $2c - noise __, 9, $81, $1c - endchannel + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret 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 + duty_cycle_pattern 2, 2, 1, 1 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret 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 + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret Cry_Pidgey_Ch8: - noise __, 3, $61, $32 - noise __, 3, $61, $21 - noise __, 9, $61, $11 - endchannel + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret Cry_Voltorb_Ch5: - sound_duty 2, 2, 3, 3 - sound __, 7, $83, $0247 - sound __, 16, $62, $0226 - sound __, 5, $52, $0245 - sound __, 10, $63, $0206 - sound __, 16, $82, $0225 - sound __, 16, $42, $0207 + duty_cycle_pattern 3, 3, 2, 2 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 Cry_Voltorb_Ch6: - endchannel + sound_ret Cry_Voltorb_Ch8: - noise __, 9, $d4, $8c - noise __, 5, $e2, $9c - noise __, 16, $c6, $8c - noise __, 9, $e4, $ac - noise __, 16, $d7, $9c - noise __, 16, $f2, $ac - endchannel + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret Cry_Muk_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 5, $f3, $06e0 - sound __, 16, $e4, $0640 - sound __, 9, $c1, $0620 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret Cry_Muk_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 4, $c3, $0683 - sound __, 15, $b4, $0602 - sound __, 9, $a1, $0601 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret Cry_Muk_Ch8: - noise __, 5, $d3, $5c - noise __, 16, $e6, $4c - noise __, 9, $b1, $5c - endchannel + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret 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 + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret 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 + duty_cycle_pattern 3, 3, 1, 1 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 Cry_Grimer_Ch8: - endchannel + sound_ret Cry_Diglett_Ch5: - sound_duty 0, 3, 0, 3 - sound __, 5, $f1, $0700 - sound __, 5, $e1, $0780 - sound __, 5, $d1, $0740 - sound __, 5, $e1, $0740 - sound __, 5, $f1, $0780 - sound __, 5, $d1, $0700 - sound __, 5, $f1, $0701 - sound __, 5, $d1, $0782 - sound __, 5, $c1, $0742 - sound __, 9, $b1, $0741 - endchannel + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret Cry_Diglett_Ch6: - sound_duty 0, 1, 0, 1 - sound __, 13, $8, 0 - sound __, 5, $f1, $0701 - sound __, 5, $e1, $0782 - sound __, 5, $d1, $0741 - sound __, 5, $e1, $0741 - sound __, 5, $f1, $0782 - sound __, 9, $d1, $0701 - endchannel + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret Cry_Diglett_Ch8: - noise __, 16, $8, $0 - noise __, 5, $8, $0 - noise __, 5, $d1, $4c - noise __, 5, $b1, $2c - noise __, 5, $d1, $3c - noise __, 5, $b1, $3c - noise __, 5, $c1, $2c - noise __, 9, $a1, $4c - endchannel + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret Cry_Seel_Ch5: - sound_duty 0, 3, 0, 3 - sound __, 9, $f5, $0600 - sound __, 3, $d2, $0638 - sound __, 3, $c2, $0630 - sound __, 3, $c2, $0628 - sound __, 3, $b2, $0620 - sound __, 3, $b2, $0610 - sound __, 3, $a2, $0618 - sound __, 3, $b2, $0610 - sound __, 9, $c1, $0620 - endchannel + duty_cycle_pattern 3, 0, 3, 0 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret Cry_Seel_Ch6: - sound_duty 0, 1, 0, 1 - sound __, 13, $c3, $05c0 - sound __, 4, $b1, $05f9 - sound __, 3, $a1, $05f1 - sound __, 3, $a1, $05e9 - sound __, 3, $91, $05e1 - sound __, 3, $91, $05d9 - sound __, 3, $81, $05d1 - sound __, 3, $91, $05d9 - sound __, 9, $91, $05e1 + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 Cry_Seel_Ch8: - endchannel + sound_ret Cry_Slowpoke_Ch5: - sound_duty 0, 0, 0, 0 - sound __, 9, $f5, $0480 - sound __, 3, $e1, $05e0 - sound __, 9, $d1, $05dc - endchannel + duty_cycle_pattern 0, 0, 0, 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret Cry_Slowpoke_Ch6: - sound_duty 1, 1, 2, 2 - sound __, 8, $95, $0441 - sound __, 3, $81, $0521 - sound __, 9, $61, $051a + duty_cycle_pattern 2, 2, 1, 1 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 Cry_Slowpoke_Ch8: - endchannel + sound_ret Cry_Drowzee_Ch5: - sound_duty 0, 2, 0, 2 - sound __, 6, $f2, $0650 - sound __, 10, $d1, $0660 - sound __, 6, $e2, $0612 - sound __, 10, $c1, $0622 - sound __, 6, $f2, $0610 - sound __, 7, $d1, $0620 - loopchannel 2, Cry_Drowzee_Ch5 - endchannel + duty_cycle_pattern 2, 0, 2, 0 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, Cry_Drowzee_Ch5 + sound_ret Cry_Drowzee_Ch6: - sound_duty 0, 0, 0, 1 - sound __, 5, $8, 0 - sound __, 6, $f2, $0651 - sound __, 10, $d1, $0661 - sound __, 6, $e2, $0614 - sound __, 9, $c1, $0624 - sound __, 6, $f2, $0611 - sound __, 13, $d1, $0621 - sound __, 6, $e2, $0614 - sound __, 9, $c1, $0624 - sound __, 6, $f2, $0611 - sound __, 5, $d1, $0621 - endchannel + duty_cycle_pattern 1, 0, 0, 0 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret Cry_Drowzee_Ch8: - noise __, 7, $d2, $1c - noise __, 10, $b1, $2c - noise __, 9, $c2, $2c - noise __, 10, $b1, $3c - noise __, 7, $c2, $2c - noise __, 10, $a2, $3c - noise __, 8, $c2, $2c - noise __, 6, $a1, $3c - noise __, 10, $c2, $2c - noise __, 5, $a1, $3c - endchannel + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret 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 + duty_cycle_pattern 2, 2, 0, 0 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret 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 + duty_cycle_pattern 1, 1, 2, 2 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret Cry_Nidoran_F_Ch8: - noise __, 4, $a2, $3c - noise __, 13, $94, $2c - noise __, 4, $82, $1c - noise __, 9, $71, $2c - endchannel + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret Cry_Nidoqueen_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 9, $f7, $06e0 - sound __, 7, $e6, $06e5 - sound __, 4, $f4, $06e0 - sound __, 4, $f6, $06d0 - sound __, 4, $e3, $06c0 - sound __, 5, $f2, $06b0 - sound __, 16, $a2, $06c8 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret Cry_Nidoqueen_Ch6: - sound_duty 1, 1, 0, 0 - sound __, 4, $8, 0 - sound __, 9, $a7, $06a1 - sound __, 7, $86, $06a3 - sound __, 4, $74, $06a1 - sound __, 4, $76, $0691 - sound __, 4, $83, $0682 - sound __, 5, $a2, $0671 - sound __, 16, $72, $0689 - endchannel + duty_cycle_pattern 0, 0, 1, 1 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret Cry_Nidoqueen_Ch8: - noise __, 3, $f2, $3c - noise __, 9, $e4, $3e - noise __, 9, $d7, $3c - noise __, 6, $c5, $3b - noise __, 4, $d4, $2c - noise __, 3, $b6, $3c - noise __, 4, $a4, $2c - noise __, 9, $91, $3c - endchannel + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret 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 + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret 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 + duty_cycle_pattern 1, 1, 2, 2 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret Cry_Oddish_Ch8: - noise __, 13, $e6, $4c - noise __, 12, $d7, $5c - noise __, 16, $c2, $4c - endchannel + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret Cry_Charmander_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 5, $f7, $06a0 - sound __, 9, $e6, $06a4 - sound __, 5, $d6, $06a0 - sound __, 13, $d3, $0620 - sound __, 9, $c3, $0624 - sound __, 5, $c2, $0620 - sound __, 9, $b1, $0610 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret Cry_Charmander_Ch6: - sound_duty 2, 2, 1, 1 - sound __, 5, $e7, $0601 - sound __, 9, $d6, $0603 - sound __, 5, $c6, $0601 - sound __, 13, $c3, $0581 - sound __, 9, $b3, $0583 - sound __, 5, $b2, $0582 - sound __, 9, $a1, $0571 - endchannel + duty_cycle_pattern 1, 1, 2, 2 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret Cry_Charmander_Ch8: - noise __, 8, $d6, $5c - noise __, 9, $e6, $4c - noise __, 5, $d4, $5c - noise __, 5, $d4, $4c - noise __, 8, $c3, $4c - noise __, 9, $a1, $5c - endchannel + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret Cry_Clefairy_Ch5: - sound_duty 3, 2, 1, 0 - sound __, 8, $d2, $0740 - sound __, 16, $e5, $0760 - sound C_, 9, $c1, $0730 - endchannel + duty_cycle_pattern 0, 1, 2, 3 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 24, 12, 1, 1840 + sound_ret 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 + duty_cycle_pattern 2, 0, 0, 1 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 24, 10, 2, 1793 Cry_Clefairy_Ch8: - endchannel + sound_ret Cry_Caterpie_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 16, $d7, $0780 - sound __, 5, $e6, $07a0 - sound __, 16, $d2, $0740 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret Cry_Caterpie_Ch6: - sound_duty 2, 2, 1, 1 - sound __, 16, $c7, $0753 - sound __, 6, $b6, $0772 - sound __, 16, $c2, $0711 - endchannel + duty_cycle_pattern 1, 1, 2, 2 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret Cry_Caterpie_Ch8: - noise __, 14, $f6, $4c - noise __, 5, $e6, $3c - noise __, 16, $f2, $4c - endchannel + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret Cry_Lapras_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 7, $f7, $06c0 - sound __, 16, $e7, $0700 - sound __, 5, $f4, $06f0 - sound __, 5, $e4, $06e0 - sound __, 9, $d1, $06d0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret Cry_Lapras_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 8, $e6, $0681 - sound __, 15, $d5, $06c1 - sound __, 5, $c4, $06b1 - sound __, 5, $d4, $06a1 - sound __, 9, $c1, $0691 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret Cry_Lapras_Ch8: - noise __, 11, $a6, $3c - noise __, 15, $94, $2c - noise __, 6, $a3, $3c - noise __, 9, $91, $2c - endchannel + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret 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 + duty_cycle_pattern 2, 2, 1, 1 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret 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 + duty_cycle_pattern 3, 2, 3, 2 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret Cry_Golem_Ch8: - noise __, 11, $e6, $6c - noise __, 16, $d2, $5c - noise __, 4, $c2, $6c - noise __, 9, $d1, $5c - endchannel + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret Cry_Blastoise_Ch5: - sound_duty 3, 0, 3, 0 - sound __, 16, $f6, $05c0 - sound __, 9, $e3, $05bc - sound __, 7, $d2, $05d0 - sound __, 7, $b2, $05e0 - sound __, 7, $c2, $05f0 - sound __, 9, $b1, $0600 - endchannel + duty_cycle_pattern 0, 3, 0, 3 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret Cry_Blastoise_Ch6: - sound_duty 1, 2, 1, 2 - sound __, 15, $c6, $04b1 - sound __, 8, $c3, $04ad - sound __, 6, $b2, $04c1 - sound __, 9, $92, $04d1 - sound __, 7, $a2, $04e1 - sound __, 9, $91, $04f1 - endchannel + duty_cycle_pattern 2, 1, 2, 1 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret Cry_Blastoise_Ch8: - noise __, 11, $e6, $5c - noise __, 11, $d6, $6c - noise __, 5, $c2, $4c - noise __, 7, $d3, $5c - noise __, 9, $b3, $4c - noise __, 9, $a1, $5c - endchannel + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret Cry_Pidgeotto_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 9, $e4, $0790 - sound __, 16, $f5, $07c0 - sound __, 9, $d1, $07d8 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret Cry_Pidgeotto_Ch6: - sound_duty 1, 1, 2, 2 - sound __, 11, $c4, $0771 - sound __, 16, $b6, $07a2 - sound __, 9, $a1, $07b7 - endchannel + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret Cry_Pidgeotto_Ch8: - noise __, 9, $e4, $4c - noise __, 15, $c4, $3c - noise __, 9, $d1, $2c - endchannel + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret Cry_Paras_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 7, $f2, $0600 - sound __, 7, $e2, $0640 - sound __, 7, $d2, $0680 - sound __, 7, $e2, $06c0 - sound __, 7, $d2, $0700 - sound __, 7, $c2, $0740 - sound __, 7, $b2, $0780 - sound __, 9, $a1, $07c0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret Cry_Paras_Ch6: - sound_duty 1, 0, 1, 0 - sound __, 4, $8, $0001 - sound __, 7, $c2, $05c1 - sound __, 7, $b2, $0602 - sound __, 7, $a2, $0641 - sound __, 7, $b2, $0682 - sound __, 7, $a2, $06c2 - sound __, 7, $92, $0701 - sound __, 7, $a2, $0742 - sound __, 9, $81, $0781 - endchannel + duty_cycle_pattern 0, 1, 0, 1 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret Cry_Paras_Ch8: - noise __, 7, $8, $1 - noise __, 6, $e2, $5c - noise __, 6, $c2, $4c - noise __, 6, $d2, $3c - noise __, 6, $b2, $2c - noise __, 6, $c2, $1c - noise __, 6, $a2, $1b - noise __, 6, $92, $1a - noise __, 9, $81, $18 - endchannel + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret Cry_Weedle_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 5, $f3, $0780 - sound __, 16, $e7, $0700 - sound __, 9, $d3, $0710 - sound __, 5, $c2, $0700 - sound __, 5, $d2, $06f0 - sound __, 9, $c1, $06e0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret Cry_Weedle_Ch6: - sound_duty 2, 2, 1, 1 - sound __, 7, $c3, $0701 - sound __, 15, $b7, $0681 - sound __, 8, $b3, $0692 - sound __, 4, $a2, $0681 - sound __, 5, $b2, $0672 - sound __, 9, $a1, $0661 - endchannel + duty_cycle_pattern 1, 1, 2, 2 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret Cry_Weedle_Ch8: - noise __, 7, $e3, $5c - noise __, 15, $d6, $4c - noise __, 7, $c6, $3c - noise __, 4, $b3, $4c - noise __, 4, $a2, $5c - noise __, 9, $b1, $6c - endchannel + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret 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 + duty_cycle_pattern 0, 0, 3, 3 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret 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 + duty_cycle_pattern 1, 0, 1, 0 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret Cry_Ekans_Ch8: - noise __, 15, $f7, $7c - noise __, 13, $f6, $6c - noise __, 10, $e4, $7c - noise __, 16, $e2, $6c - endchannel + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret Cry_Metapod_Ch5: - sound_duty 1, 1, 3, 3 - sound __, 8, $d6, $07e1 - sound __, 7, $c6, $07e2 - sound __, 10, $d6, $07e1 - sound __, 8, $c6, $07e0 - sound __, 6, $b6, $07e2 - sound __, 8, $c6, $07e1 - sound __, 7, $b6, $07e0 - sound __, 9, $a1, $07df - endchannel + duty_cycle_pattern 3, 3, 1, 1 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret Cry_Metapod_Ch6: - sound_duty 0, 1, 0, 1 - sound __, 7, $c3, $07c9 - sound __, 7, $b3, $07c7 - sound __, 11, $c4, $07c3 - sound __, 9, $b4, $07c7 - sound __, 7, $c3, $07c9 - sound __, 16, $a2, $07c5 - endchannel + duty_cycle_pattern 1, 0, 1, 0 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret Cry_Metapod_Ch8: - noise __, 14, $19, $7c - noise __, 14, $f7, $8c - noise __, 13, $d6, $7c - noise __, 9, $c4, $6c - noise __, 16, $b3, $5c - endchannel + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret Cry_Venonat_Ch5: - sound_duty 0, 0, 3, 3 - sound __, 7, $f7, $0740 - sound __, 13, $e6, $0744 - sound __, 7, $d5, $0750 - sound __, 5, $c3, $0760 - sound __, 4, $c3, $0780 - sound __, 9, $d1, $07a0 - endchannel + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret Cry_Venonat_Ch6: - sound_duty 2, 2, 0, 0 - sound __, 7, $c7, $0701 - sound __, 12, $b6, $0702 - sound __, 7, $a5, $0711 - sound __, 5, $93, $0721 - sound __, 4, $a3, $0741 - sound __, 9, $91, $0762 - endchannel + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret Cry_Venonat_Ch8: - noise __, 4, $e2, $3c - noise __, 9, $d6, $4c - noise __, 6, $d4, $3c - noise __, 13, $c7, $4c - noise __, 3, $e2, $3c - noise __, 9, $d1, $2c - endchannel + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret Cry_Squirtle_Ch5: - sound_duty 0, 1, 3, 3 - sound __, 16, $f0, $0705 - sound __, 11, $e0, $0700 - sound __, 7, $b4, $0710 - sound __, 5, $d3, $0700 - sound __, 7, $b2, $0620 - sound __, 9, $a1, $0624 - endchannel + duty_cycle_pattern 3, 3, 1, 0 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret Cry_Squirtle_Ch6: - sound_duty 2, 0, 2, 0 - sound __, 16, $b0, $06c3 - sound __, 11, $a0, $06c1 - sound __, 7, $84, $06d2 - sound __, 5, $93, $06c1 - sound __, 7, $82, $05e1 - sound __, 9, $61, $05e8 - endchannel + duty_cycle_pattern 0, 2, 0, 2 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret Cry_Squirtle_Ch8: - noise __, 7, $e6, $4c - noise __, 16, $d6, $3c - noise __, 11, $c5, $4a - noise __, 2, $b2, $5b - noise __, 16, $c2, $4c - endchannel + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret Cry_Fearow_Ch5: - sound_duty 0, 0, 1, 1 - sound __, 11, $f5, $0680 - sound __, 4, $e2, $06a0 - sound __, 4, $f2, $06c0 - sound __, 4, $e2, $06e0 - sound __, 4, $d2, $0700 - sound __, 4, $c2, $06e0 - sound __, 4, $d2, $06c0 - sound __, 9, $c1, $06a0 - endchannel + duty_cycle_pattern 1, 1, 0, 0 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret Cry_Fearow_Ch6: - sound_duty 3, 3, 0, 0 - sound __, 10, $d5, $0631 - sound __, 4, $d2, $0652 - sound __, 4, $e2, $0671 - sound __, 4, $b2, $0691 - sound __, 4, $c2, $06b2 - sound __, 4, $b2, $0691 - sound __, 4, $c2, $0671 - sound __, 9, $b1, $0651 - endchannel + duty_cycle_pattern 0, 0, 3, 3 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret Cry_Fearow_Ch8: - noise __, 7, $e3, $4c - noise __, 5, $c3, $3c - noise __, 6, $d4, $3c - noise __, 5, $c4, $2c - noise __, 7, $b4, $3c - noise __, 9, $c1, $2c - endchannel + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret 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 + duty_cycle_pattern 2, 2, 1, 1 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret 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 + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret Cry_Growlithe_Ch8: - noise __, 6, $c4, $46 - noise __, 14, $a5, $44 - noise __, 9, $c4, $45 - noise __, 9, $b1, $44 - endchannel + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret 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 + duty_cycle_pattern 3, 3, 0, 0 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret 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 + duty_cycle_pattern 0, 1, 1, 1 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret Cry_Krabby_Ch8: - noise __, 15, $f2, $65 - noise __, 14, $e2, $55 - noise __, 15, $d2, $56 - noise __, 9, $d1, $66 - endchannel + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret Cry_Psyduck_Ch5: - sound_duty 3, 2, 1, 0 - sound __, 4, $f3, $0564 - sound __, 3, $e2, $0544 - sound __, 6, $d1, $0522 - sound __, 3, $b2, $0484 - sound __, 9, $d1, $04a2 - sound __, 4, $f3, $0524 - sound __, 5, $e4, $04e4 - sound __, 9, $d1, $0502 - endchannel + duty_cycle_pattern 0, 1, 2, 3 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret Cry_Psyduck_Ch6: - sound_duty 0, 3, 0, 3 - sound __, 4, $d3, $0560 - sound __, 3, $c2, $0540 - sound __, 6, $c1, $0520 - sound __, 3, $92, $0480 - sound __, 9, $c1, $04a0 - sound __, 4, $d3, $0520 - sound __, 4, $c4, $04e0 - sound __, 9, $c1, $0500 + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 Cry_Psyduck_Ch8: - endchannel + sound_ret 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 + duty_cycle_pattern 0, 1, 0, 1 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret 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 + duty_cycle_pattern 3, 2, 3, 2 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret Cry_Rattata_Ch8: - noise __, 3, $92, $49 - noise __, 8, $b5, $29 - noise __, 2, $a2, $39 - noise __, 9, $91, $49 - endchannel + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/drumkits.asm b/audio/drumkits.asm index a4fa4109..bd743071 100644 --- a/audio/drumkits.asm +++ b/audio/drumkits.asm @@ -7,19 +7,19 @@ Drumkits: dw Drumkit5 Drumkit0: - dw Drum00 ; rest - dw Snare1 ; c - dw Snare2 ; c# - dw Snare3 ; d - dw Snare4 ; d# - dw Drum05 ; e - dw Triangle1 ; f - dw Triangle2 ; f# - dw HiHat1 ; g - dw Snare5 ; g# - dw Snare6 ; a - dw Snare7 ; a# - dw HiHat2 ; b + dw Drum00 + dw Snare1 + dw Snare2 + dw Snare3 + dw Snare4 + dw Drum05 + dw Triangle1 + dw Triangle2 + dw HiHat1 + dw Snare5 + dw Snare6 + dw Snare7 + dw HiHat2 Drumkit1: dw Drum00 dw HiHat1 @@ -92,170 +92,169 @@ Drumkit5: dw Kick2 Drum00: -; unused - noise C#, 1, $11, $00 - endchannel + noise_note 32, 1, 1, 0 + sound_ret Snare1: - noise C#, 1, $c1, $33 - endchannel + noise_note 32, 12, 1, 51 + sound_ret Snare2: - noise C#, 1, $b1, $33 - endchannel + noise_note 32, 11, 1, 51 + sound_ret Snare3: - noise C#, 1, $a1, $33 - endchannel + noise_note 32, 10, 1, 51 + sound_ret Snare4: - noise C#, 1, $81, $33 - endchannel + noise_note 32, 8, 1, 51 + sound_ret Drum05: - noise C#, 8, $84, $37 - noise C#, 7, $84, $36 - noise C#, 6, $83, $35 - noise C#, 5, $83, $34 - noise C#, 4, $82, $33 - noise C#, 3, $81, $32 - endchannel + noise_note 39, 8, 4, 55 + noise_note 38, 8, 4, 54 + noise_note 37, 8, 3, 53 + noise_note 36, 8, 3, 52 + noise_note 35, 8, 2, 51 + noise_note 34, 8, 1, 50 + sound_ret Triangle1: - noise C#, 1, $51, $2a - endchannel + noise_note 32, 5, 1, 42 + sound_ret Triangle2: - noise C#, 2, $41, $2b - noise C#, 1, $61, $2a - endchannel + noise_note 33, 4, 1, 43 + noise_note 32, 6, 1, 42 + sound_ret HiHat1: - noise C#, 1, $81, $10 - endchannel + noise_note 32, 8, 1, 16 + sound_ret Snare5: - noise C#, 1, $82, $23 - endchannel + noise_note 32, 8, 2, 35 + sound_ret Snare6: - noise C#, 1, $82, $25 - endchannel + noise_note 32, 8, 2, 37 + sound_ret Snare7: - noise C#, 1, $82, $26 - endchannel + noise_note 32, 8, 2, 38 + sound_ret HiHat2: - noise C#, 1, $a1, $10 - endchannel + noise_note 32, 10, 1, 16 + sound_ret HiHat3: - noise C#, 1, $a2, $11 - endchannel + noise_note 32, 10, 2, 17 + sound_ret Snare8: - noise C#, 1, $a2, $50 - endchannel + noise_note 32, 10, 2, 80 + sound_ret Triangle3: - noise C#, 1, $a1, $18 - noise C#, 1, $31, $33 - endchannel + noise_note 32, 10, 1, 24 + noise_note 32, 3, 1, 51 + sound_ret Triangle4: - noise C#, 3, $91, $28 - noise C#, 1, $71, $18 - endchannel + noise_note 34, 9, 1, 40 + noise_note 32, 7, 1, 24 + sound_ret Snare9: - noise C#, 1, $91, $22 - endchannel + noise_note 32, 9, 1, 34 + sound_ret Snare10: - noise C#, 1, $71, $22 - endchannel + noise_note 32, 7, 1, 34 + sound_ret Snare11: - noise C#, 1, $61, $22 - endchannel + noise_note 32, 6, 1, 34 + sound_ret Drum20: - noise C#, 1, $11, $11 - endchannel + noise_note 32, 1, 1, 17 + sound_ret Drum21: - endchannel + sound_ret Snare12: - noise C#, 1, $91, $33 - endchannel + noise_note 32, 9, 1, 51 + sound_ret Snare13: - noise C#, 1, $51, $32 - endchannel + noise_note 32, 5, 1, 50 + sound_ret Snare14: - noise C#, 1, $81, $31 - endchannel + noise_note 32, 8, 1, 49 + sound_ret Kick1: - noise C#, 1, $88, $6b - noise C#, 1, $71, $00 - endchannel + noise_note 32, 8, 8, 107 + noise_note 32, 7, 1, 0 + sound_ret Triangle5: - noise D_, 1, $91, $18 - endchannel + noise_note 48, 9, 1, 24 + sound_ret Drum27: - noise C#, 8, $92, $10 - endchannel + noise_note 39, 9, 2, 16 + sound_ret Drum28: - noise D_, 4, $91, $00 - noise D_, 4, $11, $00 - endchannel + noise_note 51, 9, 1, 0 + noise_note 51, 1, 1, 0 + sound_ret Drum29: - noise D_, 4, $91, $11 - noise D_, 4, $11, $00 - endchannel + noise_note 51, 9, 1, 17 + noise_note 51, 1, 1, 0 + sound_ret Crash1: - noise D_, 4, $88, $15 - noise C#, 1, $65, $12 - endchannel + noise_note 51, 8, 8, 21 + noise_note 32, 6, 5, 18 + sound_ret Drum31: - noise D_, 4, $51, $21 - noise D_, 4, $11, $11 - endchannel + noise_note 51, 5, 1, 33 + noise_note 51, 1, 1, 17 + sound_ret Drum32: - noise D_, 4, $51, $50 - noise D_, 4, $11, $11 - endchannel + noise_note 51, 5, 1, 80 + noise_note 51, 1, 1, 17 + sound_ret Drum33: - noise C#, 1, $a1, $31 - endchannel + noise_note 32, 10, 1, 49 + sound_ret Crash2: - noise C#, 1, $84, $12 - endchannel + noise_note 32, 8, 4, 18 + sound_ret Drum35: - noise D_, 4, $81, $00 - noise D_, 4, $11, $00 - endchannel + noise_note 51, 8, 1, 0 + noise_note 51, 1, 1, 0 + sound_ret Drum36: - noise D_, 4, $81, $21 - noise D_, 4, $11, $11 - endchannel + noise_note 51, 8, 1, 33 + noise_note 51, 1, 1, 17 + sound_ret Kick2: - noise C#, 1, $a8, $6b - noise C#, 1, $71, $00 - endchannel + noise_note 32, 10, 8, 107 + noise_note 32, 7, 1, 0 + sound_ret diff --git a/audio/music/aftertherivalfight.asm b/audio/music/aftertherivalfight.asm index 114a6fd5..6ca23b0d 100644 --- a/audio/music/aftertherivalfight.asm +++ b/audio/music/aftertherivalfight.asm @@ -1,64 +1,65 @@ 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 + channel_count 4 + channel 1, Music_AfterTheRivalFight_Ch1 + channel 2, Music_AfterTheRivalFight_Ch2 + channel 3, Music_AfterTheRivalFight_Ch3 + channel 4, Music_AfterTheRivalFight_Ch4 Music_AfterTheRivalFight_Ch1: tempo 112 - volume $77 - dutycycle $0 - tone $0001 - vibrato $8, $14 - stereopanning $f0 - notetype $c, $b2 + volume 7, 7 + duty_cycle 0 + pitch_offset 1 + vibrato 8, 1, 4 + stereo_panning TRUE, FALSE + note_type 12, 11, 2 octave 2 note G#, 4 note G#, 4 - intensity $82 + volume_envelope 8, 2 octave 3 note G#, 2 note G#, 2 note G#, 2 note G#, 2 - loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1 + sound_loop 0, Music_LookRival_Ch1.mainloop Music_AfterTheRivalFight_Ch2: - dutycycle $1 - vibrato $6, $35 - stereopanning $f - notetype $c, $c2 + duty_cycle 1 + vibrato 6, 3, 5 + stereo_panning FALSE, TRUE + note_type 12, 12, 2 octave 4 note G#, 4 note G#, 4 - intensity $a2 + volume_envelope 10, 2 note G#, 2 note G#, 2 note G#, 2 note G#, 2 - loopchannel 0, Music_AfterTheRivalFight_branch_f502e + sound_loop 0, Music_LookRival_Ch2.mainloop Music_AfterTheRivalFight_Ch3: - notetype $c, $28 + note_type 12, 2, 8 octave 3 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note G#, 2 note F#, 2 note F_, 2 note D#, 2 - loopchannel 0, Music_AfterTheRivalFight_branch_f509d + sound_loop 0, Music_LookRival_Ch3.mainloop Music_AfterTheRivalFight_Ch4: - togglenoise $3 - stereopanning $f - notetype $c - note D_, 4 - note D_, 4 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - loopchannel 0, Music_AfterTheRivalFight_branch_f5118 + toggle_noise 3 + stereo_panning FALSE, TRUE + drum_speed 12 + drum_note 3, 4 + drum_note 3, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_loop 0, Music_LookRival_Ch4.mainloop diff --git a/audio/music/azaleatown.asm b/audio/music/azaleatown.asm index 0b230447..d895469d 100644 --- a/audio/music/azaleatown.asm +++ b/audio/music/azaleatown.asm @@ -1,88 +1,89 @@ 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 + channel_count 4 + channel 1, Music_AzaleaTown_Ch1 + channel 2, Music_AzaleaTown_Ch2 + channel 3, Music_AzaleaTown_Ch3 + channel 4, Music_AzaleaTown_Ch4 Music_AzaleaTown_Ch1: tempo 160 - volume $77 - dutycycle $2 - stereopanning $f - notetype $c, $a1 - note __, 2 -Music_AzaleaTown_branch_f5801: - intensity $a1 + volume 7, 7 + duty_cycle 2 + stereo_panning FALSE, TRUE + note_type 12, 10, 1 + rest 2 +.introloop: + volume_envelope 10, 1 octave 3 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 note F_, 2 note F_, 2 - loopchannel 2, Music_AzaleaTown_branch_f5801 -Music_AzaleaTown_branch_f5816: - callchannel Music_AzaleaTown_branch_f588c - stereopanning $f0 - intensity $a4 + sound_loop 2, .introloop +.mainloop: + sound_call .sub1 + stereo_panning TRUE, FALSE + volume_envelope 10, 4 note G#, 2 note A#, 1 - note __, 3 + rest 3 octave 4 note C_, 4 - notetype $6, $a4 + note_type 6, 10, 4 note G_, 1 note G#, 3 note F#, 4 note D#, 2 - note __, 2 - stereopanning $f - callchannel Music_AzaleaTown_branch_f588c - stereopanning $f0 - notetype $6, $a4 + rest 2 + stereo_panning FALSE, TRUE + sound_call .sub1 + stereo_panning TRUE, FALSE + note_type 6, 10, 4 note D#, 4 note C_, 4 - note __, 3 + rest 3 note B_, 1 octave 4 note C_, 12 octave 3 note A#, 4 note F#, 4 - stereopanning $f - callchannel Music_AzaleaTown_branch_f5912 - intensity $a3 + stereo_panning FALSE, TRUE + sound_call .sub2 + volume_envelope 10, 3 note A#, 4 octave 4 note C#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 - intensity $a1 + rest 2 + volume_envelope 10, 1 octave 3 note C#, 4 note A_, 2 - note __, 14 - callchannel Music_AzaleaTown_branch_f5912 - intensity $a3 + rest 14 + sound_call .sub2 + volume_envelope 10, 3 octave 4 note C_, 1 note C#, 3 note F_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 - intensity $a1 + rest 2 + volume_envelope 10, 1 octave 3 note G_, 4 note A#, 4 note G_, 8 - intensity $a2 + volume_envelope 10, 2 note A#, 4 octave 4 note C#, 4 @@ -91,7 +92,7 @@ Music_AzaleaTown_branch_f5816: note F#, 4 note C#, 8 note F#, 4 - note __, 4 + rest 4 note A#, 4 octave 4 note C#, 4 @@ -99,9 +100,9 @@ Music_AzaleaTown_branch_f5816: note A#, 4 note G_, 4 note C#, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 octave 4 note C#, 4 note D#, 4 @@ -112,210 +113,210 @@ Music_AzaleaTown_branch_f5816: note C#, 4 octave 2 note G#, 4 - note __, 8 - notetype $c, $2f + rest 8 + note_type 12, 2, -7 octave 3 note G#, 14 - note __, 2 - loopchannel 0, Music_AzaleaTown_branch_f5816 + rest 2 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f588c: - notetype $c, $a1 +.sub1: + note_type 12, 10, 1 octave 4 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note D#, 2 - intensity $61 + volume_envelope 6, 1 note D#, 2 note D#, 2 - intensity $a1 + volume_envelope 10, 1 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note A#, 2 - intensity $61 + volume_envelope 6, 1 note A#, 2 note A#, 2 - intensity $a1 + volume_envelope 10, 1 note G#, 2 - intensity $61 + volume_envelope 6, 1 note G#, 2 note G#, 2 - intensity $a1 + volume_envelope 10, 1 note A_, 2 - intensity $61 + volume_envelope 6, 1 note A_, 2 - intensity $a1 + volume_envelope 10, 1 note C_, 2 - intensity $61 + volume_envelope 6, 1 note C_, 2 note C_, 2 - intensity $a1 + volume_envelope 10, 1 note C#, 2 - intensity $61 + volume_envelope 6, 1 note C#, 2 note C#, 2 note C#, 2 note C#, 2 - intensity $a1 + volume_envelope 10, 1 note D#, 2 - intensity $61 + volume_envelope 6, 1 note D#, 2 note D#, 2 - intensity $a1 + volume_envelope 10, 1 note C#, 2 - intensity $61 + volume_envelope 6, 1 note C#, 2 note C#, 2 note C#, 2 - note __, 2 - intensity $a1 + rest 2 + volume_envelope 10, 1 octave 3 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note F#, 2 - intensity $61 + volume_envelope 6, 1 note F#, 2 note F#, 2 note F#, 2 note F#, 2 - intensity $a1 + volume_envelope 10, 1 note F_, 2 - intensity $61 + volume_envelope 6, 1 note F_, 2 note F_, 2 - intensity $a1 + volume_envelope 10, 1 note D#, 2 - intensity $61 + volume_envelope 6, 1 note D#, 2 note D#, 2 - intensity $a1 + volume_envelope 10, 1 note C#, 2 - intensity $61 + volume_envelope 6, 1 note C#, 2 - intensity $a1 + volume_envelope 10, 1 note C_, 2 - intensity $61 + volume_envelope 6, 1 note C_, 2 note C_, 2 - intensity $a1 + volume_envelope 10, 1 octave 2 note A#, 2 - intensity $61 + volume_envelope 6, 1 note A#, 2 note A#, 2 - intensity $a1 + volume_envelope 10, 1 octave 3 note C#, 2 - intensity $61 + volume_envelope 6, 1 note C#, 2 - endchannel + sound_ret -Music_AzaleaTown_branch_f5912: - intensity $61 +.sub2: + volume_envelope 6, 1 note G#, 8 note G#, 8 - intensity $81 + volume_envelope 8, 1 note A_, 8 - intensity $a1 + volume_envelope 10, 1 note A_, 8 - endchannel + sound_ret Music_AzaleaTown_Ch2: - vibrato $12, $23 - dutycycle $2 - stereopanning $f0 - notetype $c, $62 - note __, 1 + vibrato 18, 2, 3 + duty_cycle 2 + stereo_panning TRUE, FALSE + note_type 12, 6, 2 + rest 1 octave 4 note D_, 1 - intensity $b1 + volume_envelope 11, 1 note D#, 2 - intensity $71 + volume_envelope 7, 1 note D#, 2 note D#, 2 - intensity $b1 + volume_envelope 11, 1 note C#, 2 - intensity $71 + volume_envelope 7, 1 note C#, 2 note C#, 2 - intensity $51 + volume_envelope 5, 1 note C#, 2 note C#, 2 - intensity $b1 + volume_envelope 11, 1 note C_, 2 - intensity $71 + volume_envelope 7, 1 note C_, 2 note C_, 2 - intensity $b1 + volume_envelope 11, 1 note C#, 2 - intensity $71 + volume_envelope 7, 1 note C#, 2 note C#, 2 - notetype $6, $b4 + note_type 6, 11, 4 note F_, 7 - dutycycle $1 + duty_cycle 1 octave 5 note C_, 1 -Music_AzaleaTown_branch_f5952: - callchannel Music_AzaleaTown_branch_f59c7 +.mainloop: + sound_call .sub1 note C#, 4 note C_, 2 note C#, 1 - note __, 3 - notetype $6, $b4 + rest 3 + note_type 6, 11, 4 note D#, 11 - note __, 8 - dutycycle $1 + rest 8 + duty_cycle 1 octave 5 note C_, 1 - callchannel Music_AzaleaTown_branch_f59c7 - note __, 2 + sound_call .sub1 + rest 2 note C#, 2 note C_, 2 octave 3 note G#, 2 - notetype $6, $b4 - note __, 3 + note_type 6, 11, 4 + rest 3 octave 4 note G_, 1 note G#, 12 note F#, 4 note F_, 4 - dutycycle $0 + duty_cycle 0 note D_, 1 note D#, 3 note C#, 4 note C_, 2 - note __, 2 + rest 2 note G#, 4 - note __, 4 + rest 4 note F#, 4 - note __, 4 + rest 4 note F_, 4 note D#, 4 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C#, 8 - note __, 12 + rest 12 note D_, 1 note D#, 3 note C#, 4 note C_, 2 - note __, 2 + rest 2 note G#, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 + rest 4 octave 5 note C_, 4 octave 4 @@ -323,331 +324,331 @@ Music_AzaleaTown_branch_f5952: octave 5 note C_, 3 note C#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note F_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note C#, 4 - dutycycle $2 + duty_cycle 2 note F_, 4 note D#, 4 note C#, 4 note F_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note C#, 4 note F_, 4 note D#, 4 note C#, 4 note F_, 4 - note __, 4 + rest 4 note A#, 4 - note __, 4 + rest 4 octave 5 note C_, 4 - notetype $c, $b7 + note_type 12, 11, 7 octave 4 note G#, 12 note D#, 4 - intensity $1f + volume_envelope 1, -7 note C_, 14 - notetype $6, $b4 - dutycycle $1 + note_type 6, 11, 4 + duty_cycle 1 note G#, 2 octave 5 note C_, 2 - loopchannel 0, Music_AzaleaTown_branch_f5952 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f59c7: +.sub1: note C#, 4 octave 4 note G#, 2 - note __, 2 + rest 2 octave 5 note C_, 2 - note __, 2 + rest 2 note C#, 8 note D#, 8 note F_, 2 - note __, 1 + rest 1 note G_, 1 note G#, 12 note F_, 2 - note __, 6 + rest 6 note D#, 8 note F_, 2 - note __, 1 + rest 1 note C_, 1 - notetype $c, $a8 - vibrato $0, $0 + note_type 12, 10, 8 + vibrato 0, 0, 0 note C#, 8 - intensity $a7 - vibrato $12, $23 + volume_envelope 10, 7 + vibrato 18, 2, 3 note C#, 16 - note __, 4 - intensity $b4 - dutycycle $2 + rest 4 + volume_envelope 11, 4 + duty_cycle 2 octave 3 note A#, 2 octave 4 note C#, 1 - note __, 1 + rest 1 note F#, 8 - note __, 2 + rest 2 note F#, 2 note F_, 2 note D#, 1 - note __, 1 + rest 1 note C#, 6 note C_, 2 - note __, 2 + rest 2 note C_, 4 note C#, 1 - notetype $6, $b4 - note __, 1 + note_type 6, 11, 4 + rest 1 note D_, 1 - notetype $c, $b7 + note_type 12, 11, 7 note D#, 12 - intensity $b4 - endchannel + volume_envelope 11, 4 + sound_ret Music_AzaleaTown_Ch3: - stereopanning $ff - vibrato $6, $26 - notetype $c, $25 + stereo_panning TRUE, TRUE + vibrato 6, 2, 6 + note_type 12, 2, 5 octave 2 note G#, 1 octave 3 note C_, 1 note C#, 1 - note __, 5 + rest 5 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 octave 2 note G#, 4 octave 3 note C#, 1 - note __, 5 + rest 5 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 note G#, 4 -Music_AzaleaTown_branch_f5a24: - callchannel Music_AzaleaTown_branch_f5a86 +.mainloop: + sound_call .sub1 note G#, 4 note D#, 2 - callchannel Music_AzaleaTown_branch_f5a86 + sound_call .sub1 note G#, 2 - note __, 2 + rest 2 note F#, 2 - callchannel Music_AzaleaTown_branch_f5acf + sound_call .sub2 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note F_, 2 octave 3 note A_, 4 octave 4 note C#, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 - callchannel Music_AzaleaTown_branch_f5acf + rest 1 + sound_call .sub2 octave 2 note A#, 2 octave 3 note F_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note D#, 2 octave 2 note A#, 2 octave 3 note D#, 1 - note __, 3 + rest 3 note G_, 2 octave 2 note F#, 1 - note __, 5 + rest 5 note F#, 1 note F#, 1 note F#, 1 - note __, 1 + rest 1 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note F_, 1 note F#, 1 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note F#, 1 note G_, 1 note G#, 1 - note __, 5 + rest 5 note G#, 1 note G#, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note F#, 1 note G_, 1 note G#, 1 - note __, 5 + rest 5 note G#, 1 note G#, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note B_, 1 octave 3 note C_, 1 - loopchannel 0, Music_AzaleaTown_branch_f5a24 + sound_loop 0, .mainloop -Music_AzaleaTown_branch_f5a86: +.sub1: note C#, 1 - note __, 5 + rest 5 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 octave 2 note G#, 4 octave 3 note F_, 1 - note __, 5 + rest 5 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 4 note A_, 2 - intensity $15 + volume_envelope 1, 5 note A#, 1 - note __, 1 - intensity $25 + rest 1 + volume_envelope 2, 5 octave 4 note C#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 4 octave 4 note C#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note G#, 4 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 6 - note __, 4 + rest 4 note F#, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note C#, 4 note G_, 1 - note __, 5 + rest 5 note G_, 1 - note __, 3 + rest 3 note C#, 4 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 5 + rest 5 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 5 + rest 5 note G#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_AzaleaTown_branch_f5acf: - intensity $35 +.sub2: + volume_envelope 3, 5 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 - intensity $25 + rest 1 + volume_envelope 2, 5 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_AzaleaTown_Ch4: - togglenoise $3 - notetype $c - note F_, 2 -Music_AzaleaTown_branch_f5aea: - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D#, 2 - note D_, 2 - note G_, 1 - note G_, 1 - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D#, 2 - note D_, 2 - note F#, 2 - loopchannel 0, Music_AzaleaTown_branch_f5aea + toggle_noise 3 + drum_speed 12 + drum_note 6, 2 +.mainloop: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 4, 2 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 4, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 0, .mainloop diff --git a/audio/music/bicycle.asm b/audio/music/bicycle.asm index 92a19e81..0cf69d06 100644 --- a/audio/music/bicycle.asm +++ b/audio/music/bicycle.asm @@ -1,30 +1,31 @@ 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 + channel_count 4 + channel 1, Music_Bicycle_Ch1 + channel 2, Music_Bicycle_Ch2 + channel 3, Music_Bicycle_Ch3 + channel 4, Music_Bicycle_Ch4 Music_Bicycle_Ch1: tempo 140 - volume $77 - dutycycle $3 - tone $0001 - stereopanning $f - vibrato $8, $15 - notetype $c, $b4 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + stereo_panning FALSE, TRUE + vibrato 8, 1, 5 + note_type 12, 11, 4 octave 3 note B_, 6 note A_, 6 note G_, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 6 - intensity $b6 + volume_envelope 11, 6 note A_, 8 - intensity $b2 + volume_envelope 11, 2 note F#, 2 -Music_Bicycle_branch_ee144: - stereopanning $f - intensity $b2 +.mainloop: + stereo_panning FALSE, TRUE + volume_envelope 11, 2 note G_, 2 note G_, 2 note E_, 2 @@ -90,17 +91,17 @@ Music_Bicycle_branch_ee144: note F#, 2 note G_, 2 note F#, 2 - intensity $82 + volume_envelope 8, 2 note F#, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 2 note G_, 2 note F#, 2 note G_, 2 note G#, 2 note A_, 2 - stereopanning $f0 - intensity $b6 + stereo_panning TRUE, FALSE + volume_envelope 11, 6 note B_, 4 note G_, 4 octave 4 @@ -167,19 +168,19 @@ Music_Bicycle_branch_ee144: note G_, 2 note G#, 2 note A_, 2 - loopchannel 0, Music_Bicycle_branch_ee144 + sound_loop 0, .mainloop Music_Bicycle_Ch2: - dutycycle $2 - vibrato $10, $24 - stereopanning $f0 - notetype $c, $c6 + duty_cycle 2 + vibrato 16, 2, 4 + stereo_panning TRUE, FALSE + note_type 12, 12, 6 octave 4 note D_, 6 note C_, 6 octave 3 note B_, 4 - intensity $c2 + volume_envelope 12, 2 octave 4 note D_, 2 note D_, 1 @@ -188,31 +189,31 @@ Music_Bicycle_Ch2: note D_, 1 note E_, 1 note D_, 2 - intensity $c3 + volume_envelope 12, 3 note C_, 2 octave 3 note B_, 2 note A_, 2 -Music_Bicycle_branch_ee1fd: - stereopanning $ff - dutycycle $2 - intensity $c3 +.mainloop: + stereo_panning TRUE, TRUE + duty_cycle 2 + volume_envelope 12, 3 octave 3 note B_, 4 note G_, 4 note A_, 4 note F#, 4 - intensity $c2 + volume_envelope 12, 2 note G_, 2 note F#, 2 note E_, 2 note F#, 2 - intensity $c5 + volume_envelope 12, 5 note D_, 8 - intensity $c4 + volume_envelope 12, 4 note E_, 4 note G_, 4 - intensity $c2 + volume_envelope 12, 2 note E_, 2 note B_, 2 note A_, 2 @@ -221,24 +222,24 @@ Music_Bicycle_branch_ee1fd: note G_, 2 note A_, 2 note G_, 2 - intensity $c5 + volume_envelope 12, 5 note F#, 8 - intensity $c3 + volume_envelope 12, 3 note B_, 4 note G_, 4 note A_, 4 note F#, 4 - intensity $c2 + volume_envelope 12, 2 note G_, 2 note F#, 2 note E_, 2 note F#, 2 - intensity $c5 + volume_envelope 12, 5 note D_, 8 - intensity $c4 + volume_envelope 12, 4 note E_, 4 note G_, 4 - intensity $c2 + volume_envelope 12, 2 note E_, 2 octave 4 note E_, 2 @@ -250,29 +251,29 @@ Music_Bicycle_branch_ee1fd: note C_, 2 note D_, 2 note E_, 2 - intensity $c7 + volume_envelope 12, 7 note F#, 8 - stereopanning $f - callchannel Music_Bicycle_branch_ee263 + stereo_panning FALSE, TRUE + sound_call .sub1 note F#, 4 - intensity $c3 + volume_envelope 12, 3 note A_, 2 note D_, 2 note E_, 2 note F_, 2 note F#, 4 - intensity $c7 - callchannel Music_Bicycle_branch_ee263 + volume_envelope 12, 7 + sound_call .sub1 note F#, 4 - intensity $c3 + volume_envelope 12, 3 note A_, 2 note B_, 2 note A_, 2 note G_, 2 note F#, 4 - loopchannel 0, Music_Bicycle_branch_ee1fd + sound_loop 0, .mainloop -Music_Bicycle_branch_ee263: +.sub1: note G_, 6 note B_, 6 note G_, 4 @@ -282,11 +283,11 @@ Music_Bicycle_branch_ee263: note E_, 6 note G_, 6 note E_, 4 - endchannel + sound_ret Music_Bicycle_Ch3: - notetype $c, $14 - note __, 16 + note_type 12, 1, 4 + rest 16 octave 3 note A_, 2 octave 4 @@ -300,215 +301,215 @@ Music_Bicycle_Ch3: note D_, 2 octave 3 note A_, 1 - note __, 1 -Music_Bicycle_branch_ee27f: - callchannel Music_Bicycle_branch_ee333 + rest 1 +.mainloop: + sound_call .sub1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - callchannel Music_Bicycle_branch_ee333 + rest 1 + sound_call .sub1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 -Music_Bicycle_branch_ee2e9: + rest 1 +.loop1: note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - loopchannel 2, Music_Bicycle_branch_ee2e9 - loopchannel 0, Music_Bicycle_branch_ee27f + rest 1 + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Bicycle_branch_ee333: +.sub1: octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_Bicycle_Ch4: - togglenoise $0 - notetype $c - note __, 16 - note __, 16 -Music_Bicycle_branch_ee34b: - note __, 2 -Music_Bicycle_branch_ee34c: - stereopanning $f0 - note F_, 4 - loopchannel 12, Music_Bicycle_branch_ee34c - note F_, 4 - note F_, 4 - stereopanning $ff - note F_, 2 - note F_, 2 - note F_, 2 - loopchannel 0, Music_Bicycle_branch_ee34b + toggle_noise 0 + drum_speed 12 + rest 16 + rest 16 +.mainloop: + rest 2 +.loop1: + stereo_panning TRUE, FALSE + drum_note 6, 4 + sound_loop 12, .loop1 + drum_note 6, 4 + drum_note 6, 4 + stereo_panning TRUE, TRUE + drum_note 6, 2 + drum_note 6, 2 + drum_note 6, 2 + sound_loop 0, .mainloop diff --git a/audio/music/bugcatchingcontest.asm b/audio/music/bugcatchingcontest.asm index e77bf550..cdc1dbd2 100644 --- a/audio/music/bugcatchingcontest.asm +++ b/audio/music/bugcatchingcontest.asm @@ -1,55 +1,56 @@ 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 + channel_count 4 + channel 1, Music_BugCatchingContest_Ch1 + channel 2, Music_BugCatchingContest_Ch2 + channel 3, Music_BugCatchingContest_Ch3 + channel 4, Music_BugCatchingContest_Ch4 Music_BugCatchingContest_Ch1: tempo 144 - volume $77 - stereopanning $f - vibrato $8, $24 - dutycycle $2 - notetype $c, $b7 - note __, 8 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 8, 2, 4 + duty_cycle 2 + note_type 12, 11, 7 + rest 8 octave 4 note C#, 1 - note __, 1 + rest 1 note C#, 3 - note __, 1 + rest 1 note C#, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 note D_, 3 - note __, 1 + rest 1 note D_, 1 note D_, 1 note D#, 1 - note __, 1 + rest 1 note D#, 3 - note __, 1 + rest 1 note D#, 1 note D#, 1 note E_, 1 - note __, 1 + rest 1 note E_, 3 - note __, 1 + rest 1 note E_, 1 note E_, 1 -Music_BugCatchingContest_branch_f7c4b: - notetype $c, $b1 -Music_BugCatchingContest_branch_f7c4e: - note __, 2 +.mainloop: + note_type 12, 11, 1 +.loop1: + rest 2 octave 2 note A_, 2 - loopchannel 4, Music_BugCatchingContest_branch_f7c4e -Music_BugCatchingContest_branch_f7c55: - note __, 2 + sound_loop 4, .loop1 +.loop2: + rest 2 note B_, 2 - loopchannel 8, Music_BugCatchingContest_branch_f7c55 - intensity $b4 - dutycycle $1 + sound_loop 8, .loop2 + volume_envelope 11, 4 + duty_cycle 1 octave 3 note B_, 6 note A_, 1 @@ -58,21 +59,21 @@ Music_BugCatchingContest_branch_f7c55: octave 4 note D_, 1 note E_, 1 - intensity $b1 - dutycycle $2 -Music_BugCatchingContest_branch_f7c6b: - note __, 2 + volume_envelope 11, 1 + duty_cycle 2 +.loop3: + rest 2 octave 2 note A_, 2 - loopchannel 4, Music_BugCatchingContest_branch_f7c6b - note __, 2 + sound_loop 4, .loop3 + rest 2 note B_, 2 - note __, 2 + rest 2 note B_, 2 - notetype $6, $b7 + note_type 6, 11, 7 octave 4 note E_, 4 - note __, 1 + rest 1 octave 3 note B_, 1 octave 4 @@ -81,31 +82,31 @@ Music_BugCatchingContest_branch_f7c6b: note B_, 8 octave 5 note E_, 8 - intensity $b1 - note __, 4 + volume_envelope 11, 1 + rest 4 octave 2 note B_, 4 - note __, 4 + rest 4 octave 3 note E_, 4 - note __, 4 + rest 4 note E_, 4 -Music_BugCatchingContest_branch_f7c8e: - note __, 4 +.loop4: + rest 4 octave 2 note A_, 4 - loopchannel 3, Music_BugCatchingContest_branch_f7c8e - intensity $a7 + sound_loop 3, .loop4 + volume_envelope 10, 7 octave 4 note F#, 4 note A_, 4 - note __, 4 + rest 4 octave 3 note G_, 2 note B_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 note G_, 2 @@ -119,13 +120,13 @@ Music_BugCatchingContest_branch_f7c8e: note G_, 1 note A_, 1 note G_, 8 - note __, 4 + rest 4 octave 3 note F#, 2 note A_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 note F#, 2 @@ -140,19 +141,19 @@ Music_BugCatchingContest_branch_f7c8e: note G_, 1 note F#, 8 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 note G_, 2 octave 4 note G_, 2 - note __, 2 + rest 2 note D_, 2 octave 3 note B_, 2 octave 4 note B_, 2 - note __, 2 + rest 2 note G#, 2 note D_, 2 octave 3 @@ -162,263 +163,263 @@ Music_BugCatchingContest_branch_f7c8e: note G#, 2 note B_, 2 note C#, 2 - note __, 2 + rest 2 note C#, 6 - note __, 2 + rest 2 note C#, 2 note C#, 2 note D_, 2 - note __, 2 + rest 2 note D_, 6 - note __, 2 + rest 2 note D_, 2 note D_, 2 note D#, 2 - note __, 2 + rest 2 note D#, 6 - note __, 2 + rest 2 note D#, 2 note D#, 2 note E_, 2 - note __, 2 + rest 2 note E_, 6 - note __, 2 + rest 2 note E_, 2 note E_, 2 - loopchannel 0, Music_BugCatchingContest_branch_f7c4b + sound_loop 0, .mainloop Music_BugCatchingContest_Ch2: - stereopanning $f0 - vibrato $8, $23 - dutycycle $1 - notetype $c, $c7 - note __, 8 -Music_BugCatchingContest_branch_f7cff: + stereo_panning TRUE, FALSE + vibrato 8, 2, 3 + duty_cycle 1 + note_type 12, 12, 7 + rest 8 +.loop5: octave 4 note A_, 1 - note __, 1 + rest 1 note A_, 3 - note __, 1 + rest 1 note A_, 1 note A_, 1 - loopchannel 4, Music_BugCatchingContest_branch_f7cff -Music_BugCatchingContest_branch_f7d0a: - dutycycle $0 - callchannel Music_BugCatchingContest_branch_f7d8e + sound_loop 4, .loop5 +.mainloop: + duty_cycle 0 + sound_call .sub1 octave 2 note E_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 octave 3 note A_, 1 - note __, 1 + rest 1 octave 2 note G#, 2 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 3 note E_, 1 - note __, 1 - callchannel Music_BugCatchingContest_branch_f7d8e + rest 1 + sound_call .sub1 octave 2 note E_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 octave 4 note C#, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 4 note C#, 1 - note __, 1 + rest 1 octave 2 note D_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note D#, 2 octave 3 note A_, 1 - note __, 1 - dutycycle $0 - note __, 2 + rest 1 + duty_cycle 0 + rest 2 octave 5 note D_, 1 - note __, 1 + rest 1 note C#, 2 note D_, 1 - note __, 1 + rest 1 octave 4 note B_, 8 - note __, 2 + rest 2 octave 5 note D_, 1 - note __, 1 + rest 1 note C#, 2 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 8 - note __, 2 + rest 2 octave 5 note D_, 4 note F#, 2 note E_, 2 note D_, 1 - note __, 1 + rest 1 note C#, 2 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 10 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 10 - loopchannel 0, Music_BugCatchingContest_branch_f7d0a + sound_loop 0, .mainloop -Music_BugCatchingContest_branch_f7d8e: +.sub1: octave 2 note D_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note E_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note D#, 2 octave 3 note G_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_BugCatchingContest_Ch3: - stereopanning $ff - vibrato $10, $23 - notetype $c, $14 - note __, 8 + stereo_panning TRUE, TRUE + vibrato 16, 2, 3 + note_type 12, 1, 4 + rest 8 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 3 - note __, 1 + rest 1 note A_, 1 note A_, 1 note B_, 1 - note __, 1 + rest 1 note B_, 3 - note __, 1 + rest 1 note B_, 1 note B_, 1 octave 4 note C_, 1 - note __, 1 + rest 1 note C_, 3 - note __, 1 + rest 1 note C_, 1 note C_, 1 note C#, 1 - note __, 1 + rest 1 note C#, 3 - note __, 1 + rest 1 note C#, 1 note C#, 1 -Music_BugCatchingContest_branch_f7dda: - notetype $c, $14 +.mainloop: + note_type 12, 1, 4 note F#, 5 - note __, 1 + rest 1 note F#, 1 note G_, 1 note A_, 4 octave 5 note D_, 4 note C#, 2 - intensity $10 + volume_envelope 1, 0 note E_, 1 note G_, 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 note E_, 1 - notetype $6, $20 + note_type 6, 2, 0 octave 6 note E_, 1 note F#, 1 @@ -429,21 +430,21 @@ Music_BugCatchingContest_branch_f7dda: note E_, 1 note F#, 1 note E_, 8 - intensity $14 + volume_envelope 1, 4 octave 4 note E_, 10 - note __, 2 + rest 2 note E_, 2 note F#, 2 note G_, 8 octave 5 note C#, 8 - note __, 4 - intensity $10 + rest 4 + volume_envelope 1, 0 note E_, 2 note G_, 2 note A_, 2 - note __, 2 + rest 2 note E_, 2 note C_, 2 octave 6 @@ -456,17 +457,17 @@ Music_BugCatchingContest_branch_f7dda: note C#, 1 note D_, 1 note C#, 8 - intensity $15 + volume_envelope 1, 5 octave 5 note F#, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 note A_, 4 - note __, 4 + rest 4 octave 6 note D_, 4 - note __, 4 + rest 4 note C#, 12 octave 5 note B_, 2 @@ -474,11 +475,11 @@ Music_BugCatchingContest_branch_f7dda: note C#, 2 octave 5 note B_, 4 - note __, 4 + rest 4 octave 6 note G_, 4 note F#, 4 - note __, 4 + rest 4 octave 5 note G_, 4 note A_, 4 @@ -492,11 +493,11 @@ Music_BugCatchingContest_branch_f7dda: octave 6 note C#, 2 note D_, 4 - note __, 8 + rest 8 octave 5 note B_, 4 note A_, 4 - note __, 1 + rest 1 note D#, 1 note F#, 1 note A_, 1 @@ -504,164 +505,165 @@ Music_BugCatchingContest_branch_f7dda: note C_, 8 octave 3 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note F#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note A_, 6 - note __, 2 + rest 2 note A_, 2 note A_, 2 note B_, 2 - note __, 2 + rest 2 note B_, 6 - note __, 2 + rest 2 note B_, 2 note B_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note C_, 6 - note __, 2 + rest 2 note C_, 2 note C_, 2 note C#, 2 - note __, 2 + rest 2 note C#, 6 - note __, 2 + rest 2 note C#, 2 note C#, 2 - loopchannel 0, Music_BugCatchingContest_branch_f7dda + sound_loop 0, .mainloop Music_BugCatchingContest_Ch4: - togglenoise $4 - notetype $6 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note E_, 2 - note E_, 2 - callchannel Music_BugCatchingContest_branch_f7ee2 -Music_BugCatchingContest_branch_f7eaf: - note D_, 4 - note D_, 4 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 4 - note D_, 4 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 4 - note D_, 4 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - note D_, 4 - note D_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 5, Music_BugCatchingContest_branch_f7eaf - note D_, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - callchannel Music_BugCatchingContest_branch_f7ee2 - loopchannel 0, Music_BugCatchingContest_branch_f7eaf + toggle_noise 4 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 5, 2 + drum_note 5, 2 + sound_call Music_BugCatchingContest_Ch4.sub1 +.mainloop: +.loop1: + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 5, .loop1 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_call .sub1 + sound_loop 0, .mainloop -Music_BugCatchingContest_branch_f7ee2: - note D_, 4 - note B_, 8 - note D_, 2 - note D_, 2 - note D_, 4 - note B_, 8 - note D_, 2 - note D_, 2 - note D_, 4 - note B_, 8 - note D_, 2 - note D_, 2 - note D_, 4 - note B_, 8 - note D_, 2 - note D_, 2 - endchannel +.sub1: + drum_note 3, 4 + drum_note 12, 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 12, 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 12, 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 12, 8 + drum_note 3, 2 + drum_note 3, 2 + sound_ret diff --git a/audio/music/burnedtower.asm b/audio/music/burnedtower.asm index 723e7814..742a769b 100644 --- a/audio/music/burnedtower.asm +++ b/audio/music/burnedtower.asm @@ -1,152 +1,153 @@ 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 + channel_count 4 + channel 1, Music_BurnedTower_Ch1 + channel 2, Music_BurnedTower_Ch2 + channel 3, Music_BurnedTower_Ch3 + channel 4, Music_BurnedTower_Ch4 Music_BurnedTower_Ch1: tempo 168 - volume $77 - dutycycle $1 - tone $0004 - vibrato $8, $45 - stereopanning $f0 - notetype $c, $91 - note __, 2 + volume 7, 7 + duty_cycle 1 + pitch_offset 4 + vibrato 8, 4, 5 + stereo_panning TRUE, FALSE + note_type 12, 9, 1 + rest 2 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $80 + volume_envelope 8, 0 octave 3 note D#, 6 - intensity $91 + volume_envelope 9, 1 note D_, 4 note D_, 4 note D_, 2 - intensity $80 + volume_envelope 8, 0 note C#, 6 -Music_BurnedTower_branch_f6ac8: - intensity $91 +.loop1: + volume_envelope 9, 1 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $80 + volume_envelope 8, 0 note A#, 6 - loopchannel 2, Music_BurnedTower_branch_f6ac8 + sound_loop 2, .loop1 tempo 150 -Music_BurnedTower_branch_f6ad8: - intensity $b1 +.mainloop: + volume_envelope 11, 1 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note D#, 6 - intensity $b1 + volume_envelope 11, 1 note D_, 4 note D_, 4 note D_, 2 - intensity $a0 + volume_envelope 10, 0 note C#, 6 - intensity $b1 + volume_envelope 11, 1 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $a0 + volume_envelope 10, 0 note A#, 6 - intensity $b1 + volume_envelope 11, 1 note A_, 4 note A_, 4 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note A#, 16 note A#, 16 note A#, 16 note G#, 6 - intensity $b1 + volume_envelope 11, 1 note A_, 4 note A_, 4 note A_, 2 - intensity $a0 + volume_envelope 10, 0 note A#, 6 - intensity $b1 + volume_envelope 11, 1 note B_, 4 note B_, 4 note B_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note F_, 6 - intensity $b1 + volume_envelope 11, 1 note E_, 4 note E_, 4 note E_, 2 - intensity $a0 + volume_envelope 10, 0 note D#, 6 -Music_BurnedTower_branch_f6b17: - intensity $b1 +.loop2: + volume_envelope 11, 1 octave 2 note B_, 4 note B_, 4 note B_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note C_, 6 - loopchannel 2, Music_BurnedTower_branch_f6b17 - loopchannel 0, Music_BurnedTower_branch_f6ad8 + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_BurnedTower_Ch2: - dutycycle $2 - vibrato $20, $82 - tone $0002 - notetype $c, $70 - callchannel Music_BurnedTower_branch_f6b8e - intensity $c5 -Music_BurnedTower_branch_f6b39: - callchannel Music_BurnedTower_branch_f6b8e - intensity $c1 - dutycycle $3 - note __, 2 + duty_cycle 2 + vibrato 32, 8, 2 + pitch_offset 2 + note_type 12, 7, 0 + sound_call .sub1 + volume_envelope 12, 5 +.mainloop: + sound_call .sub1 + volume_envelope 12, 1 + duty_cycle 3 + rest 2 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $b0 + volume_envelope 11, 0 octave 3 note D#, 6 - intensity $c1 + volume_envelope 12, 1 note D_, 4 note D_, 4 note D_, 2 - intensity $b0 + volume_envelope 11, 0 note C#, 6 - intensity $c1 + volume_envelope 12, 1 octave 2 note A_, 4 note A_, 4 note A_, 2 - intensity $b0 + volume_envelope 11, 0 note A#, 4 - intensity $c1 - intensity $c2 + volume_envelope 12, 1 + volume_envelope 12, 2 octave 3 note A_, 1 note G_, 1 note A_, 1 octave 4 note C_, 1 - vibrato $0, $0 - intensity $3d + vibrato 0, 0, 0 + volume_envelope 3, -5 note E_, 8 - vibrato $20, $83 - intensity $b0 + vibrato 32, 8, 3 + volume_envelope 11, 0 octave 2 note G_, 4 - dutycycle $2 - intensity $b0 + duty_cycle 2 + volume_envelope 11, 0 octave 3 note F#, 4 note E_, 2 @@ -165,11 +166,11 @@ Music_BurnedTower_branch_f6b39: note F#, 2 note G_, 4 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note F#, 16 - loopchannel 0, Music_BurnedTower_branch_f6b39 + sound_loop 0, .mainloop -Music_BurnedTower_branch_f6b8e: +.sub1: octave 3 note E_, 4 note D_, 2 @@ -189,71 +190,72 @@ Music_BurnedTower_branch_f6b8e: note F_, 4 note D_, 4 note E_, 16 - endchannel + sound_ret Music_BurnedTower_Ch3: - stereopanning $f - notetype $c, $14 - note __, 16 - note __, 16 - note __, 16 - note __, 12 + stereo_panning FALSE, TRUE + note_type 12, 1, 4 + rest 16 + rest 16 + rest 16 + rest 12 octave 3 note D#, 4 -Music_BurnedTower_branch_f6bad: +.mainloop: +.loop1: octave 2 note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note F_, 4 octave 2 note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note D#, 4 - loopchannel 4, Music_BurnedTower_branch_f6bad -Music_BurnedTower_branch_f6bc3: + sound_loop 4, .loop1 +.loop2: octave 2 note B_, 2 octave 3 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 note G_, 4 octave 2 note B_, 2 octave 3 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 4 - loopchannel 2, Music_BurnedTower_branch_f6bc3 - loopchannel 0, Music_BurnedTower_branch_f6bad + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_BurnedTower_Ch4: - togglenoise $0 - notetype $c -Music_BurnedTower_branch_f6be1: - note __, 16 - loopchannel 4, Music_BurnedTower_branch_f6be1 - note __, 2 -Music_BurnedTower_branch_f6be7: - stereopanning $f0 - note G_, 2 - note G#, 2 - note G_, 4 - note G#, 2 - note G_, 4 - loopchannel 0, Music_BurnedTower_branch_f6be7 + toggle_noise 0 + drum_speed 12 +.loop1: + rest 16 + sound_loop 4, .loop1 + rest 2 +.mainloop: + stereo_panning TRUE, FALSE + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 4 + drum_note 9, 2 + drum_note 8, 4 + sound_loop 0, .mainloop diff --git a/audio/music/celadoncity.asm b/audio/music/celadoncity.asm index de815cc9..21d565b9 100644 --- a/audio/music/celadoncity.asm +++ b/audio/music/celadoncity.asm @@ -1,25 +1,26 @@ Music_CeladonCity: - musicheader 3, 1, Music_CeladonCity_Ch1 - musicheader 1, 2, Music_CeladonCity_Ch2 - musicheader 1, 3, Music_CeladonCity_Ch3 + channel_count 3 + channel 1, Music_CeladonCity_Ch1 + channel 2, Music_CeladonCity_Ch2 + channel 3, Music_CeladonCity_Ch3 Music_CeladonCity_Ch1: tempo 146 - volume $77 - tone $0001 -Music_CeladonCity_branch_f436c: - stereopanning $f - notetype $c, $a6 + volume 7, 7 + pitch_offset 1 +.mainloop: + stereo_panning FALSE, TRUE + note_type 12, 10, 6 octave 3 note A_, 7 - intensity $a1 + volume_envelope 10, 1 note G#, 1 note A_, 1 note D_, 3 note E_, 2 note F#, 2 - callchannel Music_CeladonCity_branch_f43cc -Music_CeladonCity_branch_f437d: + sound_call .sub1 +.loop1: note D_, 2 note F#, 1 note A_, 1 @@ -27,7 +28,7 @@ Music_CeladonCity_branch_f437d: note F#, 1 note A_, 1 note F#, 1 - loopchannel 3, Music_CeladonCity_branch_f437d + sound_loop 3, .loop1 note D_, 2 note G_, 1 note B_, 1 @@ -37,7 +38,7 @@ Music_CeladonCity_branch_f437d: octave 3 note B_, 1 note G_, 1 - callchannel Music_CeladonCity_branch_f43cc + sound_call .sub1 note D_, 1 note C#, 1 note D_, 1 @@ -51,8 +52,8 @@ Music_CeladonCity_branch_f437d: note F#, 2 note E_, 2 note F#, 16 - callchannel Music_CeladonCity_branch_f43e1 - callchannel Music_CeladonCity_branch_f43fe + sound_call .sub2 + sound_call .sub3 octave 2 note B_, 2 note A#, 1 @@ -72,8 +73,8 @@ Music_CeladonCity_branch_f437d: octave 3 note B_, 1 note A_, 1 - callchannel Music_CeladonCity_branch_f43e1 - callchannel Music_CeladonCity_branch_f43fe + sound_call .sub2 + sound_call .sub3 note D_, 2 note C#, 1 note D_, 1 @@ -82,9 +83,10 @@ Music_CeladonCity_branch_f437d: note A_, 1 note G_, 1 note A_, 8 - loopchannel 0, Music_CeladonCity_branch_f436c + sound_loop 0, .mainloop -Music_CeladonCity_branch_f43cc: +.sub1: +.sub1loop1: note D_, 2 note G_, 1 note B_, 1 @@ -92,7 +94,7 @@ Music_CeladonCity_branch_f43cc: note G_, 1 note B_, 1 note G_, 1 - loopchannel 3, Music_CeladonCity_branch_f43cc + sound_loop 3, .sub1loop1 note D_, 2 note F#, 1 note A_, 1 @@ -102,15 +104,16 @@ Music_CeladonCity_branch_f43cc: note D_, 1 octave 3 note A_, 1 - endchannel + sound_ret -Music_CeladonCity_branch_f43e1: +.sub2: +.sub2loop1 octave 2 note G_, 2 note B_, 1 octave 3 note D_, 1 - loopchannel 4, Music_CeladonCity_branch_f43e1 + sound_loop 4, .sub2loop1 note C_, 2 octave 2 note B_, 1 @@ -130,20 +133,21 @@ Music_CeladonCity_branch_f43e1: note D_, 1 octave 3 note B_, 1 - endchannel + sound_ret -Music_CeladonCity_branch_f43fe: +.sub3: +.sub3loop1: note D_, 2 note F#, 1 note A_, 1 - loopchannel 4, Music_CeladonCity_branch_f43fe - endchannel + sound_loop 4, .sub3loop1 + sound_ret Music_CeladonCity_Ch2: - vibrato $12, $34 - dutycycle $2 - stereopanning $f0 - notetype $c, $b7 + vibrato 18, 3, 4 + duty_cycle 2 + stereo_panning TRUE, FALSE + note_type 12, 11, 7 octave 4 note D_, 1 note C#, 1 @@ -154,8 +158,8 @@ Music_CeladonCity_Ch2: note F#, 1 note G_, 1 note A_, 8 -Music_CeladonCity_branch_f441a: - callchannel Music_CeladonCity_branch_f4463 +.mainloop: + sound_call .sub1 note A_, 4 note F#, 4 note A_, 2 @@ -168,8 +172,8 @@ Music_CeladonCity_branch_f441a: note B_, 2 note G_, 4 note B_, 4 - callchannel Music_CeladonCity_branch_f4463 - intensity $c1 + sound_call .sub1 + volume_envelope 12, 1 note A_, 2 note G_, 2 note F#, 2 @@ -183,13 +187,13 @@ Music_CeladonCity_branch_f441a: note E_, 1 note F#, 1 note A_, 1 - intensity $b3 + volume_envelope 11, 3 octave 5 note D_, 6 - intensity $a2 + volume_envelope 10, 2 octave 1 note F#, 2 - callchannel Music_CeladonCity_branch_f4474 + sound_call .sub2 octave 1 note G_, 3 note B_, 1 @@ -199,23 +203,23 @@ Music_CeladonCity_branch_f441a: octave 1 note A_, 6 note F#, 2 - callchannel Music_CeladonCity_branch_f4474 + sound_call .sub2 octave 1 note A_, 3 octave 2 note D_, 1 note A_, 4 note D_, 6 - intensity $97 + volume_envelope 9, 7 octave 4 note F#, 1 note A_, 1 octave 5 note D_, 16 - loopchannel 0, Music_CeladonCity_branch_f441a + sound_loop 0, .mainloop -Music_CeladonCity_branch_f4463: - intensity $b2 +.sub1: + volume_envelope 11, 2 octave 4 note B_, 4 note G_, 4 @@ -230,9 +234,9 @@ Music_CeladonCity_branch_f4463: octave 4 note B_, 2 note A_, 8 - endchannel + sound_ret -Music_CeladonCity_branch_f4474: +.sub2: note G_, 3 note B_, 1 octave 2 @@ -262,66 +266,66 @@ Music_CeladonCity_branch_f4474: octave 2 note D_, 2 note F#, 4 - endchannel + sound_ret Music_CeladonCity_Ch3: - vibrato $12, $24 -Music_CeladonCity_branch_f4495: - notetype $c, $25 + vibrato 18, 2, 4 +.mainloop: + note_type 12, 2, 5 octave 3 note A_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D_, 8 - callchannel Music_CeladonCity_branch_f44fd -Music_CeladonCity_branch_f44a1: + sound_call .sub1 +.loop1: octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 4 - loopchannel 3, Music_CeladonCity_branch_f44a1 + sound_loop 3, .loop1 octave 2 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 3 octave 2 note F#, 1 - callchannel Music_CeladonCity_branch_f44fd + sound_call .sub1 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 3 note F#, 3 octave 2 note G#, 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 note E_, 2 note C#, 2 note D_, 2 - note __, 6 + rest 6 octave 2 note A_, 2 - note __, 6 - intensity $10 - callchannel Music_CeladonCity_branch_f4510 + rest 6 + volume_envelope 1, 0 + sound_call .sub2 octave 5 note E_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D_, 4 - note __, 4 + rest 4 note C_, 8 octave 4 note A_, 2 @@ -330,19 +334,19 @@ Music_CeladonCity_branch_f44a1: note C_, 2 note D_, 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 note E_, 2 note D_, 4 - note __, 4 - callchannel Music_CeladonCity_branch_f4510 + rest 4 + sound_call .sub2 octave 5 note E_, 2 - note __, 2 + rest 2 note D_, 2 note E_, 2 note D_, 4 - note __, 4 + rest 4 note C_, 8 note A_, 2 note G_, 2 @@ -353,28 +357,29 @@ Music_CeladonCity_branch_f44a1: note D_, 2 note E_, 2 note D_, 2 - note __, 6 - loopchannel 0, Music_CeladonCity_branch_f4495 + rest 6 + sound_loop 0, .mainloop -Music_CeladonCity_branch_f44fd: +.sub1: +.sub1loop1: octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note D_, 4 - loopchannel 3, Music_CeladonCity_branch_f44fd + sound_loop 3, .sub1loop1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note F#, 3 octave 2 note G#, 1 - endchannel + sound_ret -Music_CeladonCity_branch_f4510: +.sub2: octave 5 note D_, 8 note C_, 2 @@ -382,4 +387,4 @@ Music_CeladonCity_branch_f4510: note B_, 2 note A_, 2 note B_, 2 - endchannel + sound_ret diff --git a/audio/music/championbattle.asm b/audio/music/championbattle.asm index e732d39c..218a71e2 100644 --- a/audio/music/championbattle.asm +++ b/audio/music/championbattle.asm @@ -1,124 +1,125 @@ Music_ChampionBattle: - musicheader 3, 1, Music_ChampionBattle_Ch1 - musicheader 1, 2, Music_ChampionBattle_Ch2 - musicheader 1, 3, Music_ChampionBattle_Ch3 + channel_count 3 + channel 1, Music_ChampionBattle_Ch1 + channel 2, Music_ChampionBattle_Ch2 + channel 3, Music_ChampionBattle_Ch3 Music_ChampionBattle_Ch1: tempo 98 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 11, 2 octave 2 note A#, 8 note A#, 8 note A#, 8 note A#, 4 - intensity $b7 + volume_envelope 11, 7 note B_, 4 -Music_ChampionBattle_branch_ea9e2: - callchannel Music_ChampionBattle_branch_eaaee +.loop1: + sound_call .sub1 octave 3 note D#, 4 - loopchannel 2, Music_ChampionBattle_branch_ea9e2 - callchannel Music_ChampionBattle_branch_eaaee + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note E_, 4 -Music_ChampionBattle_branch_ea9f0: - callchannel Music_ChampionBattle_branch_eaafc - loopchannel 3, Music_ChampionBattle_branch_ea9f0 - callchannel Music_ChampionBattle_branch_eab06 -Music_ChampionBattle_branch_ea9fa: - callchannel Music_ChampionBattle_branch_eaafc - loopchannel 7, Music_ChampionBattle_branch_ea9fa - callchannel Music_ChampionBattle_branch_eab06 - intensity $b2 +.loop2: + sound_call .sub2 + sound_loop 3, .loop2 + sound_call .sub3 +.loop3: + sound_call .sub2 + sound_loop 7, .loop3 + sound_call .sub3 + volume_envelope 11, 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note D#, 4 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note E_, 4 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note F#, 4 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note G#, 4 - intensity $a0 + volume_envelope 10, 0 note A#, 8 octave 2 note A#, 8 octave 3 note B_, 12 - intensity $b2 + volume_envelope 11, 2 note A#, 1 note B_, 1 octave 4 note C_, 1 note C#, 1 -Music_ChampionBattle_branch_eaa35: - callchannel Music_ChampionBattle_branch_eab0f +.mainloop: + sound_call .sub4 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 4 -Music_ChampionBattle_branch_eaa3d: - intensity $b2 +.loop4: + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - loopchannel 2, Music_ChampionBattle_branch_eaa3d - intensity $b2 + sound_loop 2, .loop4 + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - callchannel Music_ChampionBattle_branch_eab0f + sound_call .sub4 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note E_, 4 - callchannel Music_ChampionBattle_branch_eab24 + sound_call .sub5 note B_, 4 note G#, 4 - callchannel Music_ChampionBattle_branch_eab24 + sound_call .sub5 octave 4 note D_, 4 note D_, 4 - intensity $a0 + volume_envelope 10, 0 octave 3 note A#, 8 octave 2 @@ -127,16 +128,16 @@ Music_ChampionBattle_branch_eaa3d: note F#, 8 octave 2 note F#, 8 - intensity $60 + volume_envelope 6, 0 note B_, 16 - intensity $70 + volume_envelope 7, 0 note B_, 16 - intensity $80 + volume_envelope 8, 0 octave 3 note C#, 16 - intensity $a0 + volume_envelope 10, 0 note D#, 16 - intensity $b4 + volume_envelope 11, 4 octave 4 note F#, 4 note F_, 4 @@ -156,59 +157,59 @@ Music_ChampionBattle_branch_eaa3d: note E_, 2 note F#, 4 note F#, 4 - note __, 16 - intensity $90 + rest 16 + volume_envelope 9, 0 octave 3 note F#, 8 - intensity $b4 + volume_envelope 11, 4 note E_, 4 note E_, 4 - intensity $90 + volume_envelope 9, 0 note D#, 16 note C#, 16 -Music_ChampionBattle_branch_eaab1: - intensity $b2 +.loop5: + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note D#, 4 - loopchannel 4, Music_ChampionBattle_branch_eaab1 -Music_ChampionBattle_branch_eaabe: - intensity $b2 + sound_loop 4, .loop5 +.loop6: + volume_envelope 11, 2 note C_, 2 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 4 - loopchannel 2, Music_ChampionBattle_branch_eaabe - intensity $b2 + sound_loop 2, .loop6 + volume_envelope 11, 2 note C_, 2 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 4 - intensity $b2 + volume_envelope 11, 2 note C_, 2 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - callchannel Music_ChampionBattle_branch_eab31 + sound_call .sub6 octave 3 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - callchannel Music_ChampionBattle_branch_eab31 + sound_call .sub6 octave 3 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - loopchannel 0, Music_ChampionBattle_branch_eaa35 + sound_loop 0, .mainloop -Music_ChampionBattle_branch_eaaee: - intensity $b2 +.sub1: + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 6 @@ -218,30 +219,30 @@ Music_ChampionBattle_branch_eaaee: note A#, 6 note A#, 2 note A#, 2 - intensity $b7 - endchannel + volume_envelope 11, 7 + sound_ret -Music_ChampionBattle_branch_eaafc: - intensity $b2 +.sub2: + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note D#, 4 - endchannel + sound_ret -Music_ChampionBattle_branch_eab06: - intensity $b2 +.sub3: + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - endchannel + sound_ret -Music_ChampionBattle_branch_eab0f: - intensity $b5 +.sub4: + volume_envelope 11, 5 octave 3 note D#, 2 note A#, 2 @@ -258,11 +259,11 @@ Music_ChampionBattle_branch_eab0f: note G#, 2 note D#, 2 note G_, 2 - intensity $b2 - endchannel + volume_envelope 11, 2 + sound_ret -Music_ChampionBattle_branch_eab24: - intensity $b2 +.sub5: + volume_envelope 11, 2 octave 3 note A#, 2 note A#, 4 @@ -271,75 +272,75 @@ Music_ChampionBattle_branch_eab24: note A#, 4 note A#, 4 note A#, 2 - intensity $b7 - endchannel + volume_envelope 11, 7 + sound_ret -Music_ChampionBattle_branch_eab31: - intensity $b2 +.sub6: + volume_envelope 11, 2 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note A#, 4 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note C#, 4 - intensity $b2 - endchannel + volume_envelope 11, 2 + sound_ret Music_ChampionBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 octave 3 note D#, 8 note D#, 8 note D#, 8 note D#, 4 - intensity $c7 + volume_envelope 12, 7 note D_, 4 - callchannel Music_ChampionBattle_branch_eac4f + sound_call .sub1 note A#, 4 - callchannel Music_ChampionBattle_branch_eac4f + sound_call .sub1 note B_, 4 - callchannel Music_ChampionBattle_branch_eac4f + sound_call .sub1 octave 4 note C#, 4 - callchannel Music_ChampionBattle_branch_eac5c + sound_call .sub2 note D_, 4 - callchannel Music_ChampionBattle_branch_eac5c + sound_call .sub2 note F_, 4 - callchannel Music_ChampionBattle_branch_eac5c + sound_call .sub2 note D_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 4 - intensity $c2 + volume_envelope 12, 2 octave 3 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 4 note D#, 8 @@ -347,10 +348,10 @@ Music_ChampionBattle_Ch2: note D#, 8 octave 4 note E_, 8 - intensity $3c + volume_envelope 3, -4 note E_, 8 -Music_ChampionBattle_branch_eab9d: - intensity $c5 +.mainloop: + volume_envelope 12, 5 note D#, 6 octave 3 note A#, 6 @@ -362,23 +363,23 @@ Music_ChampionBattle_branch_eab9d: octave 3 note B_, 4 note A#, 4 - intensity $c7 + volume_envelope 12, 7 note B_, 8 octave 4 note E_, 8 - intensity $c2 + volume_envelope 12, 2 octave 3 note G#, 2 note G#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note G#, 2 note G#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 4 - intensity $c5 + volume_envelope 12, 5 note D#, 6 octave 3 note A#, 6 @@ -391,19 +392,19 @@ Music_ChampionBattle_branch_eab9d: note B_, 4 note A#, 2 note B_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note E_, 8 note G#, 8 note E_, 8 note B_, 8 - callchannel Music_ChampionBattle_branch_eac79 + sound_call .sub3 note E_, 4 note E_, 4 - callchannel Music_ChampionBattle_branch_eac79 + sound_call .sub3 note F#, 4 note F#, 4 - intensity $c7 + volume_envelope 12, 7 note D#, 8 octave 3 note D#, 8 @@ -411,13 +412,13 @@ Music_ChampionBattle_branch_eab9d: note C#, 8 octave 3 note C#, 8 - intensity $b0 + volume_envelope 11, 0 note D#, 16 note D#, 16 note F_, 16 note F#, 16 - intensity $c4 -Music_ChampionBattle_branch_eabef: + volume_envelope 12, 4 +.loop1: octave 5 note D#, 4 note D_, 4 @@ -430,57 +431,57 @@ Music_ChampionBattle_branch_eabef: octave 4 note B_, 4 note B_, 4 - loopchannel 2, Music_ChampionBattle_branch_eabef - intensity $b0 + sound_loop 2, .loop1 + volume_envelope 11, 0 octave 3 note D#, 16 note B_, 16 note A#, 16 note G#, 16 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 4 - intensity $c2 + volume_envelope 12, 2 octave 3 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 8 note E_, 8 note F#, 8 @@ -489,10 +490,10 @@ Music_ChampionBattle_branch_eabef: note E_, 8 note F#, 8 note G#, 8 - loopchannel 0, Music_ChampionBattle_branch_eab9d + sound_loop 0, .mainloop -Music_ChampionBattle_branch_eac4f: - intensity $c2 +.sub1: + volume_envelope 12, 2 note D#, 2 note D#, 6 note D#, 2 @@ -501,34 +502,34 @@ Music_ChampionBattle_branch_eac4f: note D#, 6 note D#, 2 note D#, 2 - intensity $c7 - endchannel + volume_envelope 12, 7 + sound_ret -Music_ChampionBattle_branch_eac5c: - intensity $c2 +.sub2: + volume_envelope 12, 2 octave 3 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 - intensity $c7 - endchannel + volume_envelope 12, 7 + sound_ret -Music_ChampionBattle_branch_eac79: - intensity $c1 +.sub3: + volume_envelope 12, 1 note D#, 2 note D#, 4 note D#, 4 @@ -536,47 +537,47 @@ Music_ChampionBattle_branch_eac79: note D#, 4 note D#, 4 note D#, 2 - intensity $c5 - endchannel + volume_envelope 12, 5 + sound_ret Music_ChampionBattle_Ch3: - notetype $c, $14 -Music_ChampionBattle_branch_eac88: + note_type 12, 1, 4 +.loop1: octave 3 note D#, 1 - note __, 7 - loopchannel 3, Music_ChampionBattle_branch_eac88 + rest 7 + sound_loop 3, .loop1 note D#, 1 - note __, 3 + rest 3 note E_, 4 - callchannel Music_ChampionBattle_branch_ead61 - callchannel Music_ChampionBattle_branch_ead61 - callchannel Music_ChampionBattle_branch_ead61 - callchannel Music_ChampionBattle_branch_ead6f + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 note D_, 4 - callchannel Music_ChampionBattle_branch_ead6f + sound_call .sub2 note A_, 4 - callchannel Music_ChampionBattle_branch_ead6f + sound_call .sub2 note D_, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 4 note C#, 4 note D#, 8 @@ -589,14 +590,15 @@ Music_ChampionBattle_branch_eac88: note A#, 2 note F_, 2 note A_, 2 -Music_ChampionBattle_branch_eacc6: +.mainloop: +.loop2: note D#, 2 note A#, 2 - loopchannel 8, Music_ChampionBattle_branch_eacc6 -Music_ChampionBattle_branch_eaccc: + sound_loop 8, .loop2 +.loop3: note E_, 2 note B_, 2 - loopchannel 5, Music_ChampionBattle_branch_eaccc + sound_loop 5, .loop3 note E_, 2 octave 4 note C_, 2 @@ -605,15 +607,15 @@ Music_ChampionBattle_branch_eaccc: note B_, 2 note G_, 2 note A_, 2 -Music_ChampionBattle_branch_eacda: +.loop4: note D#, 2 note A#, 2 - loopchannel 8, Music_ChampionBattle_branch_eacda -Music_ChampionBattle_branch_eace0: + sound_loop 8, .loop4 +.loop5: note E_, 2 note B_, 2 - loopchannel 8, Music_ChampionBattle_branch_eace0 - callchannel Music_ChampionBattle_branch_ead83 + sound_loop 8, .loop5 + sound_call .sub3 octave 3 note D#, 2 note E_, 2 @@ -624,7 +626,7 @@ Music_ChampionBattle_branch_eace0: note D_, 2 note C#, 2 note C_, 2 - callchannel Music_ChampionBattle_branch_ead83 + sound_call .sub3 octave 3 note D#, 2 note A#, 2 @@ -640,11 +642,11 @@ Music_ChampionBattle_branch_eace0: note D#, 8 note B_, 8 note D#, 8 -Music_ChampionBattle_branch_ead05: +.loop6: note D#, 2 note F#, 2 - loopchannel 16, Music_ChampionBattle_branch_ead05 - callchannel Music_ChampionBattle_branch_ead8e + sound_loop 16, .loop6 + sound_call .sub4 octave 3 note E_, 2 note B_, 2 @@ -657,97 +659,98 @@ Music_ChampionBattle_branch_ead05: octave 4 note D#, 2 note E_, 2 - callchannel Music_ChampionBattle_branch_ead8e -Music_ChampionBattle_branch_ead1d: + sound_call .sub4 +.loop7: octave 3 note E_, 2 note B_, 2 - loopchannel 4, Music_ChampionBattle_branch_ead1d -Music_ChampionBattle_branch_ead24: + sound_loop 4, .loop7 +.loop8: note D#, 2 note A#, 2 - loopchannel 5, Music_ChampionBattle_branch_ead24 + sound_loop 5, .loop8 note B_, 2 octave 4 note D#, 2 octave 3 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 -Music_ChampionBattle_branch_ead32: + rest 2 +.loop9: note E_, 2 note B_, 2 - loopchannel 5, Music_ChampionBattle_branch_ead32 + sound_loop 5, .loop9 octave 4 note C#, 2 note E_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 -Music_ChampionBattle_branch_ead40: + rest 2 +.loop10: note D#, 2 note G#, 2 - loopchannel 8, Music_ChampionBattle_branch_ead40 -Music_ChampionBattle_branch_ead46: + sound_loop 8, .loop10 +.loop11: note D#, 2 note A#, 2 - loopchannel 7, Music_ChampionBattle_branch_ead46 + sound_loop 7, .loop11 note B_, 2 note A#, 2 -Music_ChampionBattle_branch_ead4e: +.loop12: octave 3 note D#, 2 note A#, 2 octave 4 note D_, 2 note D#, 2 - loopchannel 7, Music_ChampionBattle_branch_ead4e + sound_loop 7, .loop12 note C#, 2 octave 3 note B_, 2 note A#, 2 note G#, 2 - loopchannel 0, Music_ChampionBattle_branch_eacc6 + sound_loop 0, .mainloop -Music_ChampionBattle_branch_ead61: +.sub1: +.sub1loop1: note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 5 - loopchannel 3, Music_ChampionBattle_branch_ead61 + rest 5 + sound_loop 3, .sub1loop1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 - endchannel + sound_ret -Music_ChampionBattle_branch_ead6f: +.sub2: note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_ChampionBattle_branch_ead83: +.sub3: octave 3 note D#, 2 note F#, 2 @@ -758,9 +761,9 @@ Music_ChampionBattle_branch_ead83: note D_, 2 note C#, 2 note C_, 2 - endchannel + sound_ret -Music_ChampionBattle_branch_ead8e: +.sub4: octave 3 note E_, 2 note B_, 2 @@ -771,4 +774,4 @@ Music_ChampionBattle_branch_ead8e: octave 4 note D#, 2 note E_, 2 - endchannel + sound_ret diff --git a/audio/music/cherrygrovecity.asm b/audio/music/cherrygrovecity.asm index 9a7e0980..f0d4bda8 100644 --- a/audio/music/cherrygrovecity.asm +++ b/audio/music/cherrygrovecity.asm @@ -1,23 +1,24 @@ 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 + channel_count 4 + channel 1, Music_CherrygroveCity_Ch1 + channel 2, Music_CherrygroveCity_Ch2 + channel 3, Music_CherrygroveCity_Ch3 + channel 4, Music_CherrygroveCity_Ch4 Music_CherrygroveCity_Ch1: tempo 152 - volume $77 - dutycycle $3 - tone $0001 - vibrato $8, $15 - stereopanning $f0 - notetype $c, $b5 - note __, 10 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 8, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 11, 5 + rest 10 octave 3 note C_, 2 note D_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5b26: +.mainloop: note A_, 4 note G#, 2 note A_, 2 @@ -48,7 +49,7 @@ Music_CherrygroveCity_branch_f5b26: note A_, 2 octave 3 note C_, 2 - intensity $b7 + volume_envelope 11, 7 octave 2 note A#, 6 octave 3 @@ -61,7 +62,7 @@ Music_CherrygroveCity_branch_f5b26: note A#, 6 octave 3 note D_, 6 - intensity $b5 + volume_envelope 11, 5 note A_, 4 note G_, 4 note E_, 4 @@ -90,13 +91,13 @@ Music_CherrygroveCity_branch_f5b26: note A_, 4 octave 3 note C_, 4 - loopchannel 0, Music_CherrygroveCity_branch_f5b26 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch2: - dutycycle $3 - vibrato $10, $36 - stereopanning $f - notetype $c, $c3 + duty_cycle 3 + vibrato 16, 3, 6 + stereo_panning FALSE, TRUE + note_type 12, 12, 3 octave 3 note C_, 2 note D_, 2 @@ -106,54 +107,54 @@ Music_CherrygroveCity_Ch2: note G_, 2 note A_, 2 note A#, 2 -Music_CherrygroveCity_branch_f5b87: - intensity $c6 +.mainloop: + volume_envelope 12, 6 octave 4 note C_, 6 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note D_, 2 note C_, 2 octave 3 note A#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 6 octave 3 note A_, 2 note F_, 8 - intensity $c6 + volume_envelope 12, 6 note A#, 6 octave 4 note C_, 4 - intensity $b3 + volume_envelope 11, 3 note C_, 2 octave 3 note A#, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 6 note G_, 2 note E_, 8 - intensity $a0 + volume_envelope 10, 0 note D_, 6 note F_, 6 octave 4 note D_, 4 note C_, 6 - intensity $a5 + volume_envelope 10, 5 octave 3 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 8 - intensity $a0 + volume_envelope 10, 0 note D_, 6 note F_, 6 octave 4 note D_, 4 - intensity $c7 + volume_envelope 12, 7 note C_, 16 - intensity $b5 + volume_envelope 11, 5 octave 3 note D_, 6 note F_, 6 @@ -166,15 +167,15 @@ Music_CherrygroveCity_branch_f5b87: note C#, 6 note F_, 6 note G_, 4 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 8 - loopchannel 0, Music_CherrygroveCity_branch_f5b87 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch3: - notetype $c, $16 - note __, 4 + note_type 12, 1, 6 + rest 4 octave 4 note C_, 2 octave 3 @@ -183,7 +184,7 @@ Music_CherrygroveCity_Ch3: note G_, 2 note F_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5be4: +.mainloop: note A_, 2 note F_, 2 note A_, 2 @@ -280,26 +281,26 @@ Music_CherrygroveCity_branch_f5be4: note A_, 2 note F_, 2 note A_, 2 - loopchannel 0, Music_CherrygroveCity_branch_f5be4 + sound_loop 0, .mainloop Music_CherrygroveCity_Ch4: - togglenoise $3 - notetype $c - note __, 16 -Music_CherrygroveCity_branch_f5c4d: - note C#, 2 - note __, 2 - note G_, 2 - note C#, 2 - note C#, 2 - note F#, 2 - note C#, 4 - note C#, 2 - note __, 2 - note G_, 2 - note C#, 1 - note C#, 1 - note F#, 4 - note C#, 2 - note G_, 2 - loopchannel 0, Music_CherrygroveCity_branch_f5c4d + toggle_noise 3 + drum_speed 12 + rest 16 +.mainloop: + drum_note 2, 2 + rest 2 + drum_note 8, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 7, 2 + drum_note 2, 4 + drum_note 2, 2 + rest 2 + drum_note 8, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 7, 4 + drum_note 2, 2 + drum_note 8, 2 + sound_loop 0, .mainloop diff --git a/audio/music/contestresults.asm b/audio/music/contestresults.asm index 85d8291e..28575eeb 100644 --- a/audio/music/contestresults.asm +++ b/audio/music/contestresults.asm @@ -1,137 +1,138 @@ 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 + channel_count 4 + channel 1, Music_ContestResults_Ch1 + channel 2, Music_ContestResults_Ch2 + channel 3, Music_ContestResults_Ch3 + channel 4, Music_ContestResults_Ch4 Music_ContestResults_Ch1: tempo 144 - volume $77 - notetype $c, $51 -Music_ContestResults_branch_efb52: - note __, 2 + volume 7, 7 + note_type 12, 5, 1 +.mainloop: + rest 2 octave 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note B_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 - loopchannel 0, Music_ContestResults_branch_efb52 + rest 1 + sound_loop 0, .mainloop Music_ContestResults_Ch2: - notetype $c, $61 -Music_ContestResults_branch_efb7e: + note_type 12, 6, 1 +.mainloop: octave 2 note C_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 octave 1 note G_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 1 note B_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 3 note F_, 1 - note __, 1 -Music_ContestResults_branch_efba6: + rest 1 +.loop1: octave 2 note D_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 1 note A_, 2 octave 3 note F_, 1 - note __, 1 - loopchannel 2, Music_ContestResults_branch_efba6 + rest 1 + sound_loop 2, .loop1 octave 2 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 octave 3 note F#, 1 - note __, 1 + rest 1 octave 2 note G_, 2 octave 3 note F_, 1 - note __, 1 + rest 1 octave 2 note D_, 2 octave 3 note D_, 1 - note __, 1 - loopchannel 0, Music_ContestResults_branch_efb7e + rest 1 + sound_loop 0, .mainloop Music_ContestResults_Ch3: - vibrato $8, $24 - notetype $c, $23 -Music_ContestResults_branch_efbd2: + vibrato 8, 2, 4 + note_type 12, 2, 3 +.mainloop: octave 4 note E_, 5 - note __, 1 + rest 1 note E_, 1 note F_, 1 note G_, 4 @@ -141,33 +142,33 @@ Music_ContestResults_branch_efbd2: note B_, 8 note A_, 8 note D_, 5 - note __, 1 + rest 1 note D_, 1 note E_, 1 note F_, 4 note B_, 4 note A_, 8 note G_, 8 - loopchannel 0, Music_ContestResults_branch_efbd2 + sound_loop 0, .mainloop Music_ContestResults_Ch4: - togglenoise $4 - notetype $6 -Music_ContestResults_branch_efbed: - note C#, 4 - note C#, 4 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note C#, 4 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - loopchannel 0, Music_ContestResults_branch_efbed + toggle_noise 4 + drum_speed 6 +.mainloop: + drum_note 2, 4 + drum_note 2, 4 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 4 + drum_note 2, 4 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_loop 0, .mainloop diff --git a/audio/music/credits.asm b/audio/music/credits.asm index 8d862240..ee2cff02 100644 --- a/audio/music/credits.asm +++ b/audio/music/credits.asm @@ -1,18 +1,19 @@ 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 + channel_count 4 + channel 1, Music_Credits_Ch1 + channel 2, Music_Credits_Ch2 + channel 3, Music_Credits_Ch3 + channel 4, Music_Credits_Ch4 Music_Credits_Ch1: tempo 139 - volume $77 - stereopanning $f - dutycycle $3 - notetype $c, $2f + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 3 + note_type 12, 2, -7 octave 2 note G_, 16 - notetype $6, $a7 + note_type 6, 10, 7 octave 3 note B_, 12 note A#, 2 @@ -21,17 +22,17 @@ Music_Credits_Ch1: octave 4 note C_, 7 note D_, 8 - callchannel Music_Credits_branch_1f483 - note __, 4 + sound_call .sub1 + rest 4 octave 3 note B_, 2 - note __, 2 + rest 2 note A_, 2 note B_, 2 - note __, 2 + rest 2 note A_, 2 note B_, 2 - intensity $96 + volume_envelope 9, 6 note A_, 1 note G_, 1 octave 3 @@ -40,7 +41,7 @@ Music_Credits_Ch1: octave 2 note B_, 1 note A_, 1 - intensity $94 + volume_envelope 9, 4 note G_, 1 note F_, 1 note E_, 1 @@ -50,12 +51,12 @@ Music_Credits_Ch1: note B_, 1 note A_, 1 octave 3 - note __, 1 - intensity $a7 - callchannel Music_Credits_branch_1f483 - callchannel Music_Credits_branch_1f4ed - intensity $97 - callchannel Music_Credits_branch_1f4f8 + rest 1 + volume_envelope 10, 7 + sound_call .sub1 + sound_call .sub2 + volume_envelope 9, 7 + sound_call .sub3 octave 3 note B_, 2 octave 4 @@ -117,13 +118,13 @@ Music_Credits_Ch1: note C_, 2 octave 3 note B_, 2 - callchannel Music_Credits_branch_1f4f8 - callchannel Music_Credits_branch_1f559 + sound_call .sub3 + sound_call .sub4 note B_, 1 octave 4 note C_, 7 note D_, 8 - intensity $a7 + volume_envelope 10, 7 octave 5 note E_, 2 note C#, 2 @@ -140,20 +141,20 @@ Music_Credits_Ch1: note D_, 7 note E_, 7 octave 3 - note __, 1 - pitchoffset 0, D_ - callchannel Music_Credits_branch_1f483 - callchannel Music_Credits_branch_1f4ed - callchannel Music_Credits_branch_1f4f8 - callchannel Music_Credits_branch_1f559 - pitchoffset 0, C_ + rest 1 + transpose 0, 2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 + transpose 0, 0 octave 3 note A_, 12 - notetype $8, $a7 + note_type 8, 10, 7 note D_, 1 note D_, 1 note D_, 1 - callchannel Music_Credits_branch_1f582 + sound_call .sub5 octave 3 note B_, 6 note A_, 6 @@ -164,7 +165,7 @@ Music_Credits_Ch1: note A_, 6 octave 4 note C#, 6 - callchannel Music_Credits_branch_1f582 + sound_call .sub5 tempo 143 octave 4 note D_, 6 @@ -179,22 +180,22 @@ Music_Credits_Ch1: note A_, 6 octave 5 note C#, 6 - notetype $c, $a7 -Music_Credits_branch_1f407: + note_type 12, 10, 7 +.loop1: octave 3 note A_, 1 octave 4 note D_, 1 - loopchannel 6, Music_Credits_branch_1f407 - notetype $8, $a7 + sound_loop 6, .loop1 + note_type 8, 10, 7 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 tempo 153 - notetype $c, $a7 + note_type 12, 10, 7 octave 3 note C_, 1 note E_, 1 @@ -213,14 +214,14 @@ Music_Credits_branch_1f407: note C_, 1 note E_, 1 note G_, 1 - notetype $8, $a7 + note_type 8, 10, 7 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - notetype $c, $a7 + rest 1 + note_type 12, 10, 7 octave 3 note D_, 1 note F#, 1 @@ -234,53 +235,53 @@ Music_Credits_branch_1f407: note D_, 1 note E_, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - notetype $8, $a7 + rest 1 + note_type 8, 10, 7 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 tempo 160 - notetype $c, $a7 + note_type 12, 10, 7 octave 2 note G_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - notetype $8, $a7 + rest 3 + note_type 8, 10, 7 octave 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - notetype $c, $a7 + rest 1 + note_type 12, 10, 7 octave 2 note D_, 1 - note __, 7 - intensity $c7 + rest 7 + volume_envelope 12, 7 octave 2 note D_, 16 - intensity $b8 - intensity $b7 - note __, 16 - note __, 16 - note __, 16 - endchannel + volume_envelope 11, 8 + volume_envelope 11, 7 + rest 16 + rest 16 + rest 16 + sound_ret -Music_Credits_branch_1f483: +.sub1: note C_, 16 note F#, 1 note G_, 3 @@ -290,17 +291,17 @@ Music_Credits_branch_1f483: note D_, 4 octave 3 note B_, 2 - note __, 2 + rest 2 note A#, 2 note B_, 2 - note __, 2 + rest 2 note A#, 2 note B_, 4 note G_, 4 - note __, 4 + rest 4 octave 4 note D_, 4 - note __, 4 + rest 4 note E_, 4 octave 3 note A#, 4 @@ -312,19 +313,19 @@ Music_Credits_branch_1f483: note C_, 4 note D_, 4 note C_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 note C_, 4 octave 3 note A_, 4 - note __, 4 + rest 4 octave 4 note C_, 4 octave 3 @@ -335,7 +336,7 @@ Music_Credits_branch_1f483: note A_, 1 note A#, 7 note G#, 4 - note __, 4 + rest 4 octave 4 note C_, 4 octave 3 @@ -348,47 +349,47 @@ Music_Credits_branch_1f483: note C_, 4 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 6 note C_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_Credits_branch_1f4ed: +.sub2: octave 4 note C_, 4 octave 3 @@ -399,9 +400,9 @@ Music_Credits_branch_1f4ed: note D_, 4 note C_, 4 note D#, 4 - endchannel + sound_ret -Music_Credits_branch_1f4f8: +.sub3: octave 3 note A_, 2 octave 4 @@ -498,9 +499,9 @@ Music_Credits_branch_1f4f8: note F_, 2 note C_, 2 note F_, 2 - endchannel + sound_ret -Music_Credits_branch_1f559: +.sub4: octave 3 note A_, 2 octave 4 @@ -541,10 +542,10 @@ Music_Credits_branch_1f559: note B_, 12 note A#, 2 note A_, 2 - endchannel + sound_ret -Music_Credits_branch_1f582: - note __, 6 +.sub5: + rest 6 octave 3 note D_, 6 note E_, 6 @@ -554,51 +555,51 @@ Music_Credits_branch_1f582: octave 4 note F#, 6 note C#, 6 - endchannel + sound_ret Music_Credits_Ch2: - dutycycle $1 - vibrato $14, $23 - notetype $c, $2f - stereopanning $f0 + duty_cycle 1 + vibrato 20, 2, 3 + note_type 12, 2, -7 + stereo_panning TRUE, FALSE octave 4 note G_, 16 - intensity $c7 + volume_envelope 12, 7 octave 5 note G_, 8 octave 3 note G_, 4 note F_, 4 - notetype $6, $c7 - callchannel Music_Credits_branch_1f6cb + note_type 6, 12, 7 + sound_call .sub1 octave 1 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 octave 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 - intensity $97 + volume_envelope 9, 7 note F#, 1 note F_, 1 note E_, 1 note D#, 1 note D_, 1 note C#, 1 - intensity $c7 - callchannel Music_Credits_branch_1f6cb - callchannel Music_Credits_branch_1f73f - callchannel Music_Credits_branch_1f748 + volume_envelope 12, 7 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 octave 4 note B_, 1 octave 5 @@ -609,10 +610,10 @@ Music_Credits_Ch2: note B_, 4 note F#, 1 note G_, 15 - notetype $c, $c7 + note_type 12, 12, 7 octave 5 note E_, 15 - notetype $6, $c7 + note_type 6, 12, 7 note G_, 1 note G#, 1 note A_, 2 @@ -626,7 +627,7 @@ Music_Credits_Ch2: octave 4 note A_, 2 note E_, 2 - callchannel Music_Credits_branch_1f748 + sound_call .sub3 octave 4 note B_, 1 octave 5 @@ -635,7 +636,7 @@ Music_Credits_Ch2: note B_, 8 octave 5 note C_, 12 - notetype $c, $c7 + note_type 12, 12, 7 note D_, 16 note G_, 8 octave 3 @@ -656,21 +657,21 @@ Music_Credits_Ch2: octave 3 note A_, 4 note G_, 4 - notetype $6, $c7 - pitchoffset 0, D_ - callchannel Music_Credits_branch_1f6cb - callchannel Music_Credits_branch_1f73f - callchannel Music_Credits_branch_1f748 - pitchoffset 0, C_ + note_type 6, 12, 7 + transpose 0, 2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + transpose 0, 0 octave 5 note C#, 1 note D_, 11 note C#, 8 note D_, 12 - notetype $c, $c7 + note_type 12, 12, 7 note E_, 16 note A_, 14 - notetype $8, $c7 + note_type 8, 12, 7 octave 2 note D_, 1 note D_, 1 @@ -695,34 +696,34 @@ Music_Credits_Ch2: note E_, 6 octave 1 note D_, 3 - note __, 3 + rest 3 note D_, 3 - note __, 3 + rest 3 note D_, 3 - note __, 3 + rest 3 note D_, 3 - note __, 3 + rest 3 note F#, 3 - note __, 3 + rest 3 note F#, 3 - note __, 3 + rest 3 note F#, 3 - notetype $c, $c7 + note_type 12, 12, 7 octave 2 note F#, 1 - note __, 1 + rest 1 octave 1 note F#, 2 octave 2 note F#, 1 - note __, 1 -Music_Credits_branch_1f657: + rest 1 +.loop1: octave 1 note G_, 2 octave 2 note G_, 1 - note __, 1 - loopchannel 4, Music_Credits_branch_1f657 + rest 1 + sound_loop 4, .loop1 octave 1 note A_, 1 octave 2 @@ -748,164 +749,164 @@ Music_Credits_branch_1f657: note C#, 1 octave 5 note D_, 12 - notetype $8, $c7 + note_type 8, 12, 7 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - notetype $c, $c7 + rest 1 + note_type 12, 12, 7 note D_, 12 - notetype $8, $c7 + note_type 8, 12, 7 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D_, 9 - notetype $c, $c7 + note_type 12, 12, 7 octave 4 note F#, 1 note A_, 1 octave 5 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 - notetype $8, $c7 + rest 1 + note_type 8, 12, 7 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 - notetype $c, $c7 + rest 1 + note_type 12, 12, 7 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 3 - notetype $8, $c7 + rest 3 + note_type 8, 12, 7 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 - notetype $c, $c7 + rest 1 + note_type 12, 12, 7 note D_, 1 - note __, 7 - intensity $c8 - intensity $c7 + rest 7 + volume_envelope 12, 8 + volume_envelope 12, 7 octave 1 note D_, 16 - intensity $c7 - note __, 16 - note __, 16 - note __, 16 - endchannel + volume_envelope 12, 7 + rest 16 + rest 16 + rest 16 + sound_ret -Music_Credits_branch_1f6cb: +.sub1: octave 2 note C_, 4 - intensity $b1 + volume_envelope 11, 1 octave 5 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 - intensity $c7 + rest 2 + volume_envelope 12, 7 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 4 - note __, 12 + rest 12 octave 1 note B_, 4 - note __, 10 + rest 10 note B_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 octave 1 note B_, 6 note A#, 4 - intensity $b1 + volume_envelope 11, 1 octave 5 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 - intensity $c7 + rest 2 + volume_envelope 12, 7 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 4 - note __, 12 + rest 12 note A_, 4 - note __, 10 + rest 10 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 2 note F_, 2 octave 1 note A_, 6 note G#, 4 - intensity $b1 + volume_envelope 11, 1 octave 5 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 5 note C_, 2 - note __, 2 - intensity $c7 + rest 2 + volume_envelope 12, 7 octave 1 note G#, 1 - note __, 1 + rest 1 note G#, 4 - note __, 12 + rest 12 note G_, 4 - note __, 10 + rest 10 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 octave 2 note E_, 2 octave 1 note G_, 6 note F#, 4 - note __, 2 + rest 2 note F#, 2 note F#, 2 octave 2 @@ -922,27 +923,27 @@ Music_Credits_branch_1f6cb: note A_, 2 octave 3 note C_, 2 - endchannel + sound_ret -Music_Credits_branch_1f73f: +.sub2: octave 1 note G_, 4 - note __, 4 + rest 4 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 12 note F#, 8 - endchannel + sound_ret -Music_Credits_branch_1f748: +.sub3: octave 4 note A_, 8 note B_, 8 octave 5 note C_, 8 note E_, 8 - notetype $c, $c7 + note_type 12, 12, 7 note D_, 16 octave 4 note G_, 4 @@ -951,7 +952,7 @@ Music_Credits_branch_1f748: octave 5 note D_, 4 note C_, 10 - notetype $6, $c7 + note_type 6, 12, 7 octave 4 note B_, 1 octave 5 @@ -960,21 +961,21 @@ Music_Credits_branch_1f748: note B_, 4 octave 5 note C_, 4 - notetype $c, $c7 + note_type 12, 12, 7 octave 4 note A_, 10 - notetype $6, $c7 + note_type 6, 12, 7 note G#, 1 note A_, 3 note B_, 4 octave 5 note C_, 4 - endchannel + sound_ret Music_Credits_Ch3: - vibrato $16, $23 - notetype $c, $34 - stereopanning $ff + vibrato 22, 2, 3 + note_type 12, 3, 4 + stereo_panning TRUE, TRUE octave 6 note G_, 1 note D_, 1 @@ -987,14 +988,14 @@ Music_Credits_Ch3: note C_, 1 octave 5 note G_, 1 - intensity $24 + volume_envelope 2, 4 octave 6 note G_, 1 note D_, 1 note C_, 1 octave 5 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 6 note G_, 1 note D_, 1 @@ -1013,46 +1014,46 @@ Music_Credits_Ch3: note B_, 1 note G_, 1 note D_, 1 - notetype $6, $14 + note_type 6, 1, 4 note D#, 1 note E_, 7 note F_, 8 - callchannel Music_Credits_branch_1f8aa + sound_call .sub1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 1 - note __, 1 + rest 1 note F#, 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 note G_, 1 - notetype $6, $14 - intensity $24 + note_type 6, 1, 4 + volume_envelope 2, 4 note F_, 1 note E_, 1 - intensity $14 + volume_envelope 1, 4 note E_, 4 - note __, 4 + rest 4 note F_, 4 - callchannel Music_Credits_branch_1f8aa - callchannel Music_Credits_branch_1f8db - callchannel Music_Credits_branch_1f8e7 - callchannel Music_Credits_branch_1f934 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 octave 2 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 2 octave 3 note G_, 2 @@ -1065,16 +1066,16 @@ Music_Credits_Ch3: note G_, 2 octave 2 note E_, 4 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 octave 3 note E_, 2 @@ -1089,54 +1090,54 @@ Music_Credits_Ch3: note A_, 4 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note G#, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note G#, 2 note G_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 note F#, 4 octave 3 note E_, 4 - callchannel Music_Credits_branch_1f8e7 - callchannel Music_Credits_branch_1f934 - callchannel Music_Credits_branch_1f94b + sound_call .sub3 + sound_call .sub4 + sound_call .sub5 octave 5 note D#, 1 note E_, 7 note F_, 8 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 2 - note __, 2 + rest 2 octave 5 note F_, 1 note F#, 7 note G_, 8 - pitchoffset 0, D_ - callchannel Music_Credits_branch_1f8aa - callchannel Music_Credits_branch_1f8db - pitchoffset 1, D_ - callchannel Music_Credits_branch_1f8e7 - pitchoffset 0, D_ - callchannel Music_Credits_branch_1f934 - callchannel Music_Credits_branch_1f94b - pitchoffset 0, C_ + transpose 0, 2 + sound_call .sub1 + sound_call .sub2 + transpose 1, 2 + sound_call .sub3 + transpose 0, 2 + sound_call .sub4 + sound_call .sub5 + transpose 0, 0 octave 6 note C#, 2 octave 5 @@ -1145,18 +1146,18 @@ Music_Credits_Ch3: note C#, 2 note A_, 2 note E_, 2 - notetype $8, $14 + note_type 8, 1, 4 octave 2 note D_, 1 note D_, 1 note D_, 1 - notetype $c, $14 + note_type 12, 1, 4 note D_, 16 note F#, 16 note G_, 16 note G_, 8 note A_, 8 - note __, 4 + rest 4 octave 4 note F#, 4 note G_, 4 @@ -1175,7 +1176,7 @@ Music_Credits_Ch3: octave 6 note C#, 4 note E_, 4 - intensity $15 + volume_envelope 1, 5 octave 4 note D_, 6 note F#, 2 @@ -1188,47 +1189,47 @@ Music_Credits_Ch3: note B_, 1 note A#, 1 note A_, 8 - intensity $14 + volume_envelope 1, 4 octave 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype $8, $14 + rest 1 + note_type 8, 1, 4 octave 3 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - notetype $c, $14 + rest 1 + note_type 12, 1, 4 octave 5 note G_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - notetype $8, $14 + rest 3 + note_type 8, 1, 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - notetype $c, $14 + rest 1 + note_type 12, 1, 4 note A_, 1 - note __, 16 - note __, 16 - note __, 16 - endchannel + rest 16 + rest 16 + rest 16 + sound_ret -Music_Credits_branch_1f8aa: +.sub1: note G_, 16 octave 6 note C#, 1 @@ -1238,25 +1239,25 @@ Music_Credits_branch_1f8aa: note B_, 4 octave 6 note C_, 4 - notetype $c, $14 + note_type 12, 1, 4 octave 5 note G_, 10 note E_, 2 - note __, 2 + rest 2 note F_, 2 note G_, 10 - notetype $6, $14 + note_type 6, 1, 4 note G#, 1 note A_, 7 note E_, 4 note G_, 12 note F_, 8 note D_, 4 - note __, 4 + rest 4 note E_, 4 - notetype $c, $14 + note_type 12, 1, 4 note F_, 10 - notetype $6, $14 + note_type 6, 1, 4 note F#, 1 note G_, 7 note F_, 4 @@ -1265,12 +1266,12 @@ Music_Credits_branch_1f8aa: note E_, 4 note B_, 12 note A_, 8 - notetype $c, $14 + note_type 12, 1, 4 note D_, 16 - endchannel + sound_ret -Music_Credits_branch_1f8db: - notetype $6, $14 +.sub2: + note_type 6, 1, 4 note F#, 1 note G_, 3 octave 4 @@ -1279,14 +1280,14 @@ Music_Credits_branch_1f8db: note D_, 4 note G_, 12 note G#, 8 - endchannel + sound_ret -Music_Credits_branch_1f8e7: +.sub3: octave 3 note F_, 4 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 octave 3 @@ -1294,9 +1295,9 @@ Music_Credits_branch_1f8e7: note F_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 octave 4 @@ -1304,9 +1305,9 @@ Music_Credits_branch_1f8e7: octave 3 note F_, 4 note G_, 4 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 octave 3 @@ -1314,9 +1315,9 @@ Music_Credits_branch_1f8e7: note G_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 @@ -1324,23 +1325,23 @@ Music_Credits_branch_1f8e7: octave 3 note G_, 4 note E_, 4 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note B_, 2 note G_, 2 note E_, 2 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 note B_, 2 note E_, 4 note A_, 4 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 2 note C_, 2 @@ -1350,7 +1351,7 @@ Music_Credits_branch_1f8e7: note C_, 2 octave 3 note G#, 2 - note __, 2 + rest 2 note G#, 2 octave 4 note C_, 2 @@ -1358,21 +1359,21 @@ Music_Credits_branch_1f8e7: note C_, 2 octave 3 note G#, 2 - endchannel + sound_ret -Music_Credits_branch_1f934: +.sub4: octave 2 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 2 octave 3 note F_, 2 @@ -1383,21 +1384,21 @@ Music_Credits_branch_1f934: note C_, 2 note E_, 2 note F_, 2 - endchannel + sound_ret -Music_Credits_branch_1f94b: +.sub5: octave 2 note F#, 4 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note F#, 2 octave 3 note F#, 2 - note __, 2 + rest 2 octave 2 note F#, 1 - note __, 1 + rest 1 note F#, 2 octave 3 note F#, 2 @@ -1425,250 +1426,250 @@ Music_Credits_branch_1f94b: note B_, 2 note G_, 2 note D_, 2 - endchannel + sound_ret Music_Credits_Ch4: - togglenoise $3 - notetype $c - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note B_, 2 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note A#, 4 - note A#, 4 - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa6d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa6d -Music_Credits_branch_1f9a8: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note F#, 2 - loopchannel 7, Music_Credits_branch_1f9a8 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note F#, 2 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 -Music_Credits_branch_1f9c6: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note F#, 2 - loopchannel 7, Music_Credits_branch_1f9c6 - note G#, 1 - note G_, 1 - note F#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note A#, 4 - note C#, 4 - note G#, 1 - note G_, 1 - note B_, 2 - note G#, 1 - note G_, 1 - note B_, 2 - note A#, 4 - note A#, 4 - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa4d - callchannel Music_Credits_branch_1fa6d -Music_Credits_branch_1f9f2: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note F#, 2 - loopchannel 7, Music_Credits_branch_1f9f2 - note G#, 1 - note G_, 1 - note F#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 7 - notetype $8 - note A#, 1 - note A#, 1 - note A#, 1 - notetype $c - note B_, 16 - note __, 16 - note B_, 15 - note __, 1 - note B_, 8 - note B_, 8 - note B_, 16 - note __, 16 - note B_, 16 - note B_, 8 - note B_, 6 - note D_, 1 - note D_, 1 - note B_, 12 - notetype $8 - note D_, 2 - note D_, 2 - note D_, 2 - notetype $c - note B_, 12 - notetype $8 - note D_, 2 - note D_, 2 - note D_, 2 - note B_, 12 - notetype $c - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - notetype $8 - note C#, 2 - note C#, 2 - note D_, 2 - notetype $c - note D_, 1 - note __, 3 - note D_, 1 - note __, 3 - notetype $8 - note C#, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - notetype $c - note D_, 1 - note __, 7 - note A#, 8 - note __, 16 - note __, 16 - note __, 16 - endchannel + toggle_noise 3 + drum_speed 12 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 12, 2 + drum_note 9, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 11, 4 + drum_note 11, 4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 +.loop1: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 7, .loop1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 7, 2 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 +.loop2: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 7, .loop2 + drum_note 9, 1 + drum_note 8, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 4 + drum_note 2, 4 + drum_note 9, 1 + drum_note 8, 1 + drum_note 12, 2 + drum_note 9, 1 + drum_note 8, 1 + drum_note 12, 2 + drum_note 11, 4 + drum_note 11, 4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 +.loop3: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 7, .loop3 + drum_note 9, 1 + drum_note 8, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 7 + drum_speed 8 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_speed 12 + drum_note 12, 16 + rest 16 + drum_note 12, 15 + rest 1 + drum_note 12, 8 + drum_note 12, 8 + drum_note 12, 16 + rest 16 + drum_note 12, 16 + drum_note 12, 8 + drum_note 12, 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 12, 12 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 12, 12 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 12, 12 + drum_speed 12 + drum_note 3, 1 + rest 1 + drum_note 3, 1 + rest 1 + drum_speed 8 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 1 + rest 3 + drum_note 3, 1 + rest 3 + drum_speed 8 + drum_note 2, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 + drum_note 3, 1 + rest 7 + drum_note 11, 8 + rest 16 + rest 16 + rest 16 + sound_ret -Music_Credits_branch_1fa4d: - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note F#, 2 - endchannel +.sub1: + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 7, 2 + sound_ret -Music_Credits_branch_1fa6d: - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note G#, 1 - note D_, 1 - note F#, 2 - note D_, 1 - note G_, 1 - note D_, 1 - note G_, 1 - note D_, 1 - note D_, 1 - note A#, 1 - note D_, 1 - endchannel +.sub2: + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 3, 1 + drum_note 7, 2 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 11, 1 + drum_note 3, 1 + sound_ret diff --git a/audio/music/dancinghall.asm b/audio/music/dancinghall.asm index 6884000b..3b477cc6 100644 --- a/audio/music/dancinghall.asm +++ b/audio/music/dancinghall.asm @@ -1,26 +1,27 @@ Music_DancingHall: - musicheader 3, 1, Music_DancingHall_Ch1 - musicheader 1, 2, Music_DancingHall_Ch2 - musicheader 1, 3, Music_DancingHall_Ch3 + channel_count 3 + channel 1, Music_DancingHall_Ch1 + channel 2, Music_DancingHall_Ch2 + channel 3, Music_DancingHall_Ch3 - db $3 + db $3 ; unused Music_DancingHall_Ch1: tempo 208 - volume $77 - stereopanning $f - notetype $6, $b7 - note __, 3 - dutycycle $0 -Music_DancingHall_branch_ef9d3: - notetype $c, $b7 - callchannel Music_DancingHall_branch_efa17 - note __, 16 - callchannel Music_DancingHall_branch_efa17 - note __, 16 - note __, 16 - note __, 16 - intensity $b1 + volume 7, 7 + stereo_panning FALSE, TRUE + note_type 6, 11, 7 + rest 3 + duty_cycle 0 +.mainloop: + note_type 12, 11, 7 + sound_call .sub1 + rest 16 + sound_call .sub1 + rest 16 + rest 16 + rest 16 + volume_envelope 11, 1 octave 2 note B_, 1 octave 3 @@ -33,75 +34,75 @@ Music_DancingHall_branch_ef9d3: octave 4 note D_, 1 note F_, 2 - notetype $8, $b1 + note_type 8, 11, 1 note D_, 1 note E_, 1 note D_, 1 octave 3 note B_, 3 note A_, 3 - notetype $c, $b1 + note_type 12, 11, 1 note B_, 1 note A_, 1 note D_, 1 note E_, 1 octave 4 note F_, 2 - notetype $8, $b1 + note_type 8, 11, 1 octave 3 note B_, 1 octave 4 note D_, 1 octave 3 note B_, 1 - notetype $c, $b5 + note_type 12, 11, 5 note A_, 1 - note __, 1 + rest 1 note B_, 1 note B_, 1 note A_, 1 - note __, 1 + rest 1 note F_, 2 - loopchannel 0, Music_DancingHall_branch_ef9d3 + sound_loop 0, .mainloop -Music_DancingHall_branch_efa17: +.sub1: octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_DancingHall_Ch2: - stereopanning $f0 - notetype $6, $a1 - dutycycle $0 - vibrato $10, $24 - note __, 3 -Music_DancingHall_branch_efa37: - notetype $6, $a2 - callchannel Music_DancingHall_branch_efa7a - callchannel Music_DancingHall_branch_efa7a - intensity $a7 + stereo_panning TRUE, FALSE + note_type 6, 10, 1 + duty_cycle 0 + vibrato 16, 2, 4 + rest 3 +.mainloop: + note_type 6, 10, 2 + sound_call .sub1 + sound_call .sub1 + volume_envelope 10, 7 octave 2 note D_, 16 note F_, 16 - notetype $c, $a7 + note_type 12, 10, 7 note E_, 16 octave 3 note F_, 1 @@ -114,13 +115,13 @@ Music_DancingHall_branch_efa37: note E_, 1 note A_, 1 note B_, 2 - notetype $8, $a7 + note_type 8, 10, 7 note A_, 1 note B_, 1 note A_, 1 note F_, 3 note D_, 3 - notetype $c, $a7 + note_type 12, 10, 7 note E_, 1 note D_, 1 octave 3 @@ -128,22 +129,22 @@ Music_DancingHall_branch_efa37: note B_, 1 octave 4 note A_, 2 - notetype $8, $a7 + note_type 8, 10, 7 note F_, 1 note A_, 1 note F_, 1 - notetype $c, $a7 + note_type 12, 10, 7 note E_, 1 - note __, 1 + rest 1 note F_, 1 note F_, 1 note E_, 1 - note __, 1 + rest 1 note D_, 2 - loopchannel 0, Music_DancingHall_branch_efa37 + sound_loop 0, .mainloop -Music_DancingHall_branch_efa7a: - intensity $a1 +.sub1: + volume_envelope 10, 1 octave 4 note E_, 4 octave 2 @@ -157,88 +158,88 @@ Music_DancingHall_branch_efa7a: note A_, 4 note F_, 4 note A_, 4 - intensity $33 + volume_envelope 3, 3 note D_, 1 note F_, 1 - intensity $63 + volume_envelope 6, 3 note D_, 1 note F_, 1 - intensity $93 + volume_envelope 9, 3 note D_, 1 note F_, 1 - intensity $c3 + volume_envelope 12, 3 note D_, 1 note F_, 1 - intensity $e3 + volume_envelope 14, 3 note D_, 1 note F_, 1 - intensity $a3 + volume_envelope 10, 3 note D_, 1 note F_, 1 - intensity $83 + volume_envelope 8, 3 note D_, 1 note F_, 1 - intensity $53 + volume_envelope 5, 3 note D_, 1 note F_, 1 - intensity $73 + volume_envelope 7, 3 octave 3 note B_, 1 octave 4 note E_, 1 - intensity $a3 + volume_envelope 10, 3 octave 3 note B_, 1 octave 4 note E_, 1 - intensity $b3 + volume_envelope 11, 3 octave 3 note A_, 1 octave 4 note D_, 1 - intensity $c3 + volume_envelope 12, 3 octave 3 note A_, 1 octave 4 note D_, 1 - intensity $d3 + volume_envelope 13, 3 octave 3 note E_, 1 note B_, 1 - intensity $e3 + volume_envelope 14, 3 note E_, 1 note B_, 1 - intensity $f3 + volume_envelope 15, 3 note A_, 1 octave 4 note D_, 1 - intensity $f3 + volume_envelope 15, 3 octave 3 note A_, 1 octave 4 note D_, 1 - endchannel + sound_ret Music_DancingHall_Ch3: - stereopanning $ff - vibrato $16, $24 - notetype $6, $10 + stereo_panning TRUE, TRUE + vibrato 22, 2, 4 + note_type 6, 1, 0 octave 5 note A_, 1 note B_, 1 octave 6 note D_, 1 -Music_DancingHall_branch_efae3: +.mainloop: note E_, 13 note D_, 1 note E_, 1 note A_, 1 note B_, 16 - intensity $14 + volume_envelope 1, 4 octave 3 note F_, 16 note E_, 14 - intensity $10 + volume_envelope 1, 0 octave 6 note E_, 1 note F_, 1 @@ -247,11 +248,11 @@ Music_DancingHall_branch_efae3: note E_, 1 note A_, 1 note B_, 16 - intensity $14 + volume_envelope 1, 4 octave 3 note F_, 16 note E_, 16 - intensity $13 + volume_envelope 1, 3 octave 4 note F_, 2 note A_, 2 @@ -264,13 +265,13 @@ Music_DancingHall_branch_efae3: note A_, 2 note A#, 1 note B_, 3 - notetype $8, $13 + note_type 8, 1, 3 note A_, 1 note B_, 1 note A_, 1 note F_, 3 note D_, 3 - notetype $c, $13 + note_type 12, 1, 3 note E_, 1 note D_, 1 octave 4 @@ -278,11 +279,11 @@ Music_DancingHall_branch_efae3: note B_, 1 octave 5 note A_, 2 - notetype $8, $13 + note_type 8, 1, 3 note F_, 1 note A_, 1 note F_, 1 - notetype $6, $13 + note_type 6, 1, 3 note D#, 1 note E_, 3 note D_, 4 @@ -290,16 +291,16 @@ Music_DancingHall_branch_efae3: note B_, 4 octave 5 note D_, 4 - intensity $14 + volume_envelope 1, 4 octave 3 note D_, 16 note F_, 16 note E_, 16 note E_, 13 - intensity $10 + volume_envelope 1, 0 octave 5 note A_, 1 note B_, 1 octave 6 note D_, 1 - loopchannel 0, Music_DancingHall_branch_efae3 + sound_loop 0, .mainloop diff --git a/audio/music/darkcave.asm b/audio/music/darkcave.asm index 8d2877d0..08206b24 100644 --- a/audio/music/darkcave.asm +++ b/audio/music/darkcave.asm @@ -1,30 +1,32 @@ 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 + channel_count 4 + channel 1, Music_DarkCave_Ch1 + channel 2, Music_DarkCave_Ch2 + channel 3, Music_DarkCave_Ch3 + channel 4, Music_DarkCave_Ch4 Music_DarkCave_Ch1: tempo 128 - volume $77 - dutycycle $3 - tone $0001 - vibrato $11, $15 - stereopanning $f0 - notetype $c, $a7 -Music_DarkCave_branch_ea2dc: - note __, 16 - loopchannel 4, Music_DarkCave_branch_ea2dc + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 17, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 10, 7 +.loop1: + rest 16 + sound_loop 4, .loop1 octave 3 note D#, 16 note D_, 16 note C#, 16 note C_, 16 - intensity $a3 -Music_DarkCave_branch_ea2e8: - callchannel Music_DarkCave_branch_ea333 - loopchannel 3, Music_DarkCave_branch_ea2e8 - intensity $b7 + volume_envelope 10, 3 +.mainloop: +.loop2: + sound_call .sub1 + sound_loop 3, .loop2 + volume_envelope 11, 7 note G#, 8 note D#, 8 note G_, 8 @@ -41,20 +43,20 @@ Music_DarkCave_branch_ea2e8: note C#, 8 note D#, 8 note C_, 8 - intensity $a3 -Music_DarkCave_branch_ea303: - callchannel Music_DarkCave_branch_ea333 - loopchannel 2, Music_DarkCave_branch_ea303 - note __, 16 - note __, 8 - intensity $b7 + volume_envelope 10, 3 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 + rest 16 + rest 8 + volume_envelope 11, 7 octave 2 note F_, 2 note G_, 2 note G#, 4 octave 3 note D#, 16 - note __, 8 + rest 8 octave 2 note G#, 2 note G_, 2 @@ -62,23 +64,23 @@ Music_DarkCave_branch_ea303: octave 3 note D#, 16 note G_, 2 - note __, 6 + rest 6 note F_, 2 note G_, 2 note G#, 4 note G_, 16 note F_, 2 - note __, 6 + rest 6 note G#, 2 note G_, 2 note G#, 4 - intensity $a3 -Music_DarkCave_branch_ea328: - callchannel Music_DarkCave_branch_ea333 - loopchannel 2, Music_DarkCave_branch_ea328 - loopchannel 0, Music_DarkCave_branch_ea2e8 + volume_envelope 10, 3 +.loop4: + sound_call .sub1 + sound_loop 2, .loop4 + sound_loop 0, .mainloop -Music_DarkCave_branch_ea333: +.sub1: octave 4 note D#, 2 octave 3 @@ -133,30 +135,31 @@ Music_DarkCave_branch_ea333: note C_, 2 octave 3 note A#, 2 - endchannel + sound_ret Music_DarkCave_Ch2: - dutycycle $1 - vibrato $12, $36 - stereopanning $f - notetype $c, $a7 -Music_DarkCave_branch_ea374: - note __, 16 - loopchannel 4, Music_DarkCave_branch_ea374 + duty_cycle 1 + vibrato 18, 3, 6 + stereo_panning FALSE, TRUE + note_type 12, 10, 7 +.loop1: + rest 16 + sound_loop 4, .loop1 octave 3 note G_, 16 note A#, 16 note F_, 16 note G_, 16 -Music_DarkCave_branch_ea37e: - note __, 16 - loopchannel 4, Music_DarkCave_branch_ea37e - note __, 8 - stereopanning $ff - intensity $c7 +.mainloop: +.loop2: + rest 16 + sound_loop 4, .loop2 + rest 8 + stereo_panning TRUE, TRUE + volume_envelope 12, 7 octave 5 note C_, 8 - intensity $c4 + volume_envelope 12, 4 note D_, 2 note C_, 2 octave 4 @@ -165,18 +168,18 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 5 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 12 - intensity $59 + volume_envelope 5, -1 note C_, 8 - intensity $c7 + volume_envelope 12, 7 note C_, 8 - note __, 8 - intensity $c7 + rest 8 + volume_envelope 12, 7 note C_, 8 - intensity $c4 + volume_envelope 12, 4 note D_, 2 note C_, 2 octave 4 @@ -186,17 +189,17 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 5 note D_, 4 - intensity $c7 + volume_envelope 12, 7 note C#, 12 - intensity $c3 + volume_envelope 12, 3 note C_, 2 note C#, 2 - intensity $b0 + volume_envelope 11, 0 note D#, 10 - intensity $b7 + volume_envelope 11, 7 note D#, 6 - stereopanning $f - intensity $c4 + stereo_panning FALSE, TRUE + volume_envelope 12, 4 octave 4 note F_, 4 note D#, 2 @@ -218,7 +221,7 @@ Music_DarkCave_branch_ea37e: note C#, 8 octave 3 note A#, 8 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 2 note D_, 2 @@ -253,16 +256,16 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 4 note C#, 2 - intensity $b0 + volume_envelope 11, 0 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - intensity $c7 - stereopanning $ff - note __, 8 + volume_envelope 12, 7 + stereo_panning TRUE, TRUE + rest 8 octave 5 note C_, 8 - intensity $c4 + volume_envelope 12, 4 note D_, 2 note C_, 2 octave 4 @@ -271,18 +274,18 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 5 note D_, 4 - intensity $49 + volume_envelope 4, -1 note C#, 8 - intensity $c7 + volume_envelope 12, 7 note C#, 8 - intensity $b0 + volume_envelope 11, 0 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - note __, 8 - intensity $c7 + rest 8 + volume_envelope 12, 7 note C_, 8 - intensity $c4 + volume_envelope 12, 4 note D_, 2 note C_, 2 octave 4 @@ -292,68 +295,69 @@ Music_DarkCave_branch_ea37e: note A#, 2 octave 5 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C#, 8 - intensity $b0 + volume_envelope 11, 0 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - intensity $c7 - note __, 16 - stereopanning $f - note __, 8 + volume_envelope 12, 7 + rest 16 + stereo_panning FALSE, TRUE + rest 8 octave 3 note A#, 2 octave 4 note C_, 2 note C#, 4 note C_, 16 - note __, 8 + rest 8 note C#, 2 note C_, 2 note C#, 4 note C_, 16 - intensity $c2 + volume_envelope 12, 2 note D#, 8 - intensity $c7 + volume_envelope 12, 7 octave 3 note A#, 2 octave 4 note C_, 2 note C#, 4 note C_, 16 - intensity $c2 + volume_envelope 12, 2 octave 3 note A#, 8 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 2 note C_, 2 - intensity $c4 + volume_envelope 12, 4 note C#, 16 - note __, 4 - note __, 16 - note __, 16 - note __, 16 - intensity $b7 + rest 4 + rest 16 + rest 16 + rest 16 + volume_envelope 11, 7 octave 5 note D#, 16 note D_, 16 note F_, 16 note D#, 16 - loopchannel 0, Music_DarkCave_branch_ea37e + sound_loop 0, .mainloop Music_DarkCave_Ch3: - notetype $c, $27 -Music_DarkCave_branch_ea471: - callchannel Music_DarkCave_branch_ea4ce - loopchannel 2, Music_DarkCave_branch_ea471 -Music_DarkCave_branch_ea478: - callchannel Music_DarkCave_branch_ea4ce - loopchannel 7, Music_DarkCave_branch_ea478 - callchannel Music_DarkCave_branch_ea4c3 + note_type 12, 2, 7 +.loop1: + sound_call .sub3 + sound_loop 2, .loop1 +.mainloop: +.loop2: + sound_call .sub3 + sound_loop 7, .loop2 + sound_call .sub2 octave 3 note C_, 4 note G_, 2 @@ -361,10 +365,10 @@ Music_DarkCave_branch_ea478: note G_, 2 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 2 note A#, 12 - callchannel Music_DarkCave_branch_ea4c3 + sound_call .sub2 octave 3 note C_, 4 note G_, 2 @@ -372,18 +376,18 @@ Music_DarkCave_branch_ea478: note G_, 2 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 2 note A#, 4 octave 3 note C#, 2 note C_, 2 note C#, 4 - callchannel Music_DarkCave_branch_ea4a7 - callchannel Music_DarkCave_branch_ea4a7 - loopchannel 0, Music_DarkCave_branch_ea478 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_DarkCave_branch_ea4a7: +.sub1: octave 3 note C_, 4 note G_, 2 @@ -391,7 +395,7 @@ Music_DarkCave_branch_ea4a7: note G_, 2 note F_, 4 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 4 note A#, 2 @@ -404,16 +408,16 @@ Music_DarkCave_branch_ea4a7: note G_, 2 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 2 note A#, 4 octave 3 note C#, 2 note C_, 2 note C#, 4 - endchannel + sound_ret -Music_DarkCave_branch_ea4c3: +.sub2: octave 3 note C_, 4 note G_, 2 @@ -421,12 +425,12 @@ Music_DarkCave_branch_ea4c3: note G_, 2 note F_, 4 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 12 - endchannel + sound_ret -Music_DarkCave_branch_ea4ce: +.sub3: octave 2 note C_, 4 note G_, 2 @@ -434,7 +438,7 @@ Music_DarkCave_branch_ea4ce: note G_, 2 note F_, 4 note D#, 2 - note __, 2 + rest 2 octave 1 note A#, 4 note A#, 2 @@ -447,37 +451,37 @@ Music_DarkCave_branch_ea4ce: note G_, 2 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 1 note A#, 4 octave 2 note C#, 2 note C_, 2 note C#, 4 - endchannel + sound_ret Music_DarkCave_Ch4: - togglenoise $3 - notetype $c -Music_DarkCave_branch_ea4ee: - stereopanning $ff - note D#, 8 - note D#, 8 - note D#, 4 - stereopanning $f0 - note C#, 4 - stereopanning $f - note C#, 2 - note C#, 2 - stereopanning $f0 - note C#, 4 - stereopanning $ff - note D#, 8 - note D#, 8 - note D#, 4 - stereopanning $f - note C#, 8 - stereopanning $f0 - note C#, 2 - note C#, 2 - loopchannel 0, Music_DarkCave_branch_ea4ee + toggle_noise 3 + drum_speed 12 +.mainloop: + stereo_panning TRUE, TRUE + drum_note 4, 8 + drum_note 4, 8 + drum_note 4, 4 + stereo_panning TRUE, FALSE + drum_note 2, 4 + stereo_panning FALSE, TRUE + drum_note 2, 2 + drum_note 2, 2 + stereo_panning TRUE, FALSE + drum_note 2, 4 + stereo_panning TRUE, TRUE + drum_note 4, 8 + drum_note 4, 8 + drum_note 4, 4 + stereo_panning FALSE, TRUE + drum_note 2, 8 + stereo_panning TRUE, FALSE + drum_note 2, 2 + drum_note 2, 2 + sound_loop 0, .mainloop diff --git a/audio/music/dragonsden.asm b/audio/music/dragonsden.asm index 2dc0ae09..ccde8f98 100644 --- a/audio/music/dragonsden.asm +++ b/audio/music/dragonsden.asm @@ -1,31 +1,32 @@ 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 + channel_count 4 + channel 1, Music_DragonsDen_Ch1 + channel 2, Music_DragonsDen_Ch2 + channel 3, Music_DragonsDen_Ch3 + channel 4, Music_DragonsDen_Ch4 Music_DragonsDen_Ch1: tempo 144 - volume $77 - dutycycle $0 - tone $0004 - stereopanning $f0 - notetype $c, $80 -Music_DragonsDen_branch_eed03: - callchannel Music_DragonsDen_branch_eed1e - note __, 16 - callchannel Music_DragonsDen_branch_eed2d - note __, 2 - callchannel Music_DragonsDen_branch_eed2d - note __, 2 - callchannel Music_DragonsDen_branch_eed2d - note __, 2 - callchannel Music_DragonsDen_branch_eed2d - note __, 10 - notetype $c, $b7 - loopchannel 0, Music_DragonsDen_branch_eed03 + volume 7, 7 + duty_cycle 0 + pitch_offset 4 + stereo_panning TRUE, FALSE + note_type 12, 8, 0 +.mainloop: + sound_call .sub1 + rest 16 + sound_call .sub2 + rest 2 + sound_call .sub2 + rest 2 + sound_call .sub2 + rest 2 + sound_call .sub2 + rest 10 + note_type 12, 11, 7 + sound_loop 0, .mainloop -Music_DragonsDen_branch_eed1e: +.sub1: octave 3 note A#, 12 note A_, 4 @@ -40,11 +41,11 @@ Music_DragonsDen_branch_eed1e: note D_, 4 octave 3 note G#, 16 - endchannel + sound_ret -Music_DragonsDen_branch_eed2d: - intensity $b1 - note __, 2 +.sub2: + volume_envelope 11, 1 + rest 2 octave 4 note C#, 3 note C#, 3 @@ -56,25 +57,25 @@ Music_DragonsDen_branch_eed2d: note C#, 4 note C#, 2 note C#, 2 - endchannel + sound_ret Music_DragonsDen_Ch2: - dutycycle $0 - tone $0004 - stereopanning $f - notetype $c, $90 -Music_DragonsDen_branch_eed46: - callchannel Music_DragonsDen_branch_eed5e - note __, 16 - callchannel Music_DragonsDen_branch_eed6b - callchannel Music_DragonsDen_branch_eed6b - callchannel Music_DragonsDen_branch_eed6b - callchannel Music_DragonsDen_branch_eed6b - note __, 16 - notetype $c, $c7 - loopchannel 0, Music_DragonsDen_branch_eed46 + duty_cycle 0 + pitch_offset 4 + stereo_panning FALSE, TRUE + note_type 12, 9, 0 +.mainloop: + sound_call .sub1 + rest 16 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + rest 16 + note_type 12, 12, 7 + sound_loop 0, .mainloop -Music_DragonsDen_branch_eed5e: +.sub1: octave 4 note D#, 12 note D_, 4 @@ -87,23 +88,24 @@ Music_DragonsDen_branch_eed5e: note G#, 12 note G_, 4 note C#, 16 - endchannel + sound_ret -Music_DragonsDen_branch_eed6b: - intensity $c1 -Music_DragonsDen_branch_eed6d: +.sub2: + volume_envelope 12, 1 +.sub2loop1: octave 5 note C#, 4 octave 4 note G#, 4 note G#, 4 note G#, 4 - loopchannel 2, Music_DragonsDen_branch_eed6d - endchannel + sound_loop 2, .sub2loop1 + sound_ret Music_DragonsDen_Ch3: -Music_DragonsDen_branch_eed78: - notetype $c, $14 +.mainloop: +.loop1: + note_type 12, 1, 4 octave 4 note C#, 2 octave 3 @@ -126,10 +128,10 @@ Music_DragonsDen_branch_eed78: note G#, 1 octave 4 note C#, 1 - loopchannel 15, Music_DragonsDen_branch_eed78 - note __, 16 - notetype $6, $27 -Music_DragonsDen_branch_eed99: + sound_loop 15, .loop1 + rest 16 + note_type 6, 2, 7 +.loop2: octave 3 note C#, 4 octave 2 @@ -152,20 +154,20 @@ Music_DragonsDen_branch_eed99: note G#, 2 octave 3 note C#, 2 - loopchannel 16, Music_DragonsDen_branch_eed99 - loopchannel 0, Music_DragonsDen_branch_eed78 + sound_loop 16, .loop2 + sound_loop 0, .mainloop Music_DragonsDen_Ch4: - togglenoise $0 - notetype $c - note __, 16 - note __, 16 -Music_DragonsDen_branch_eedbd: - stereopanning $f0 - note F_, 4 - stereopanning $f - note F#, 4 - note F#, 4 - stereopanning $f0 - note F#, 4 - loopchannel 0, Music_DragonsDen_branch_eedbd + toggle_noise 0 + drum_speed 12 + rest 16 + rest 16 +.mainloop: + stereo_panning TRUE, FALSE + drum_note 6, 4 + stereo_panning FALSE, TRUE + drum_note 7, 4 + drum_note 7, 4 + stereo_panning TRUE, FALSE + drum_note 7, 4 + sound_loop 0, .mainloop diff --git a/audio/music/ecruteakcity.asm b/audio/music/ecruteakcity.asm index df60e9eb..96d8ee93 100644 --- a/audio/music/ecruteakcity.asm +++ b/audio/music/ecruteakcity.asm @@ -1,48 +1,49 @@ Music_EcruteakCity: - musicheader 3, 1, Music_EcruteakCity_Ch1 - musicheader 1, 2, Music_EcruteakCity_Ch2 - musicheader 1, 3, Music_EcruteakCity_Ch3 + channel_count 3 + channel 1, Music_EcruteakCity_Ch1 + channel 2, Music_EcruteakCity_Ch2 + channel 3, Music_EcruteakCity_Ch3 Music_EcruteakCity_Ch1: tempo 197 - volume $77 - stereopanning $f - vibrato $12, $25 - dutycycle $2 -Music_EcruteakCity_branch_ef2e5: - notetype $c, $57 - note __, 10 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 18, 2, 5 + duty_cycle 2 +.mainloop: + note_type 12, 5, 7 + rest 10 octave 4 note C_, 6 - note __, 10 + rest 10 note C_, 6 - note __, 16 + rest 16 octave 3 note B_, 4 octave 4 note C_, 4 note D_, 4 - intensity $60 - note __, 4 - note __, 16 - note __, 10 + volume_envelope 6, 0 + rest 4 + rest 16 + rest 10 note G_, 2 note A_, 2 note A#, 2 - note __, 8 + rest 8 note G#, 2 note G_, 2 note F_, 2 octave 5 note C_, 6 - notetype $6, $67 + note_type 6, 6, 7 note C#, 4 note D_, 10 - note __, 2 - stereopanning $ff + rest 2 + stereo_panning TRUE, TRUE octave 4 note B_, 8 - stereopanning $f + stereo_panning FALSE, TRUE octave 3 note A#, 1 note B_, 11 @@ -52,27 +53,27 @@ Music_EcruteakCity_branch_ef2e5: note G_, 12 note A#, 12 note G_, 4 - note __, 4 + rest 4 note A#, 4 octave 5 note C#, 4 note E_, 2 - note __, 2 + rest 2 octave 3 note A_, 8 octave 4 note C_, 8 note F_, 4 - note __, 12 + rest 12 note E_, 1 note F_, 11 note G_, 2 - note __, 2 + rest 2 note A_, 4 note G_, 4 - note __, 8 - intensity $52 - callchannel Music_EcruteakCity_branch_ef37f + rest 8 + volume_envelope 5, 2 + sound_call .sub1 note D_, 2 octave 4 note B_, 2 @@ -94,8 +95,8 @@ Music_EcruteakCity_branch_ef2e5: note B_, 2 note A_, 2 note B_, 2 - callchannel Music_EcruteakCity_branch_ef391 - intensity $52 + sound_call .sub2 + volume_envelope 5, 2 note A#, 2 note G_, 2 note E_, 2 @@ -115,7 +116,7 @@ Music_EcruteakCity_branch_ef2e5: note G_, 2 note E_, 2 note C#, 2 - callchannel Music_EcruteakCity_branch_ef37f + sound_call .sub1 note D_, 2 note C_, 2 octave 4 @@ -142,10 +143,10 @@ Music_EcruteakCity_branch_ef2e5: note G#, 2 octave 5 note C_, 2 - callchannel Music_EcruteakCity_branch_ef391 - loopchannel 0, Music_EcruteakCity_branch_ef2e5 + sound_call .sub2 + sound_loop 0, .mainloop -Music_EcruteakCity_branch_ef37f: +.sub1: octave 5 note E_, 2 note C_, 2 @@ -159,10 +160,10 @@ Music_EcruteakCity_branch_ef37f: note C_, 2 note E_, 2 note C_, 2 - loopchannel 2, Music_EcruteakCity_branch_ef37f - endchannel + sound_loop 2, .sub1 + sound_ret -Music_EcruteakCity_branch_ef391: +.sub2: octave 5 note D_, 2 octave 4 @@ -208,7 +209,7 @@ Music_EcruteakCity_branch_ef391: note C_, 2 octave 3 note A_, 2 -Music_EcruteakCity_branch_ef3be: +.sub2loop1: octave 4 note F_, 2 note A_, 2 @@ -223,8 +224,8 @@ Music_EcruteakCity_branch_ef3be: octave 5 note C_, 2 note F_, 2 - loopchannel 2, Music_EcruteakCity_branch_ef3be -Music_EcruteakCity_branch_ef3d0: + sound_loop 2, .sub2loop1 +.sub2loop2: octave 4 note G_, 2 note B_, 2 @@ -239,36 +240,36 @@ Music_EcruteakCity_branch_ef3d0: octave 5 note D_, 2 note G_, 2 - loopchannel 2, Music_EcruteakCity_branch_ef3d0 - intensity $50 - dutycycle $0 + sound_loop 2, .sub2loop2 + volume_envelope 5, 0 + duty_cycle 0 note E_, 16 note G_, 16 - dutycycle $2 - endchannel + duty_cycle 2 + sound_ret Music_EcruteakCity_Ch2: - vibrato $12, $25 - dutycycle $3 - stereopanning $f0 -Music_EcruteakCity_branch_ef3f2: - notetype $6, $67 - note __, 16 - note __, 5 + vibrato 18, 2, 5 + duty_cycle 3 + stereo_panning TRUE, FALSE +.mainloop: + note_type 6, 6, 7 + rest 16 + rest 5 octave 4 note G_, 1 octave 5 note D_, 1 note E_, 9 - note __, 16 - note __, 5 + rest 16 + rest 5 octave 4 note A_, 1 octave 5 note E_, 1 note F_, 9 - notetype $c, $77 - note __, 10 + note_type 12, 7, 7 + rest 10 note D_, 2 note C_, 2 octave 4 @@ -276,28 +277,28 @@ Music_EcruteakCity_branch_ef3f2: note G_, 4 note A_, 4 note B_, 4 - notetype $6, $93 - intensity $97 - dutycycle $2 + note_type 6, 9, 3 + volume_envelope 9, 7 + duty_cycle 2 octave 3 note G_, 7 octave 4 note C#, 1 note D_, 11 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 16 note F_, 8 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 4 note G_, 4 note E_, 4 note C_, 2 - note __, 2 + rest 2 note C_, 4 octave 3 note A_, 2 @@ -307,23 +308,23 @@ Music_EcruteakCity_branch_ef3f2: note C_, 16 note E_, 4 note G_, 2 - note __, 2 + rest 2 note E_, 4 note D_, 10 - note __, 1 - stereopanning $ff + rest 1 + stereo_panning TRUE, TRUE note D#, 9 - stereopanning $f0 - dutycycle $0 + stereo_panning TRUE, FALSE + duty_cycle 0 octave 5 note C#, 1 note D_, 11 note C_, 2 - note __, 2 + rest 2 note C_, 16 note F_, 12 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 4 note G_, 2 @@ -334,14 +335,14 @@ Music_EcruteakCity_branch_ef3f2: note E_, 1 note A_, 3 note E_, 2 - note __, 2 + rest 2 note E_, 4 note C_, 2 - note __, 2 + rest 2 note C_, 4 octave 4 note A_, 2 - note __, 2 + rest 2 note B_, 4 octave 5 note C_, 2 @@ -352,9 +353,9 @@ Music_EcruteakCity_branch_ef3f2: note D#, 1 note E_, 11 note D_, 2 - note __, 2 + rest 2 note D_, 8 - dutycycle $1 + duty_cycle 1 octave 4 note E_, 4 note G_, 3 @@ -364,36 +365,36 @@ Music_EcruteakCity_branch_ef3f2: note A_, 4 octave 4 note C_, 2 - note __, 2 + rest 2 note E_, 4 note D_, 12 note C_, 4 - note __, 4 + rest 4 octave 3 note B_, 4 - note __, 4 + rest 4 octave 4 note F_, 8 note G_, 12 note F_, 8 - note __, 4 + rest 4 note E_, 8 note D_, 4 note C_, 2 - note __, 2 + rest 2 octave 3 note B_, 4 octave 4 note C_, 2 - note __, 6 + rest 6 octave 3 note B_, 4 - note __, 4 + rest 4 octave 4 note C_, 4 octave 3 note A_, 16 - note __, 4 + rest 4 octave 4 note F_, 4 note E_, 4 @@ -401,34 +402,34 @@ Music_EcruteakCity_branch_ef3f2: note C_, 12 octave 3 note B_, 4 - note __, 4 + rest 4 octave 4 note C_, 4 note D_, 4 note D#, 4 - notetype $c, $83 + note_type 12, 8, 3 note E_, 16 - intensity $80 + volume_envelope 8, 0 note D_, 4 note C#, 4 note F_, 4 - notetype $6, $80 + note_type 6, 8, 0 note G_, 7 note G#, 1 - intensity $87 + volume_envelope 8, 7 note A_, 12 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 3 note G#, 1 note A_, 4 note E_, 2 - note __, 2 + rest 2 note E_, 4 note D_, 2 - note __, 2 + rest 2 note C#, 4 note D_, 12 octave 3 @@ -437,13 +438,13 @@ Music_EcruteakCity_branch_ef3f2: note F_, 4 note G_, 12 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 4 note G_, 4 note D_, 2 - note __, 1 + rest 1 note A#, 1 note B_, 12 octave 5 @@ -454,26 +455,26 @@ Music_EcruteakCity_branch_ef3f2: note A_, 4 octave 4 note C_, 4 - notetype $c, $87 + note_type 12, 8, 7 note F_, 10 note G_, 2 note F_, 2 note E_, 2 note D_, 8 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 note C_, 2 note D_, 2 note E_, 16 - loopchannel 0, Music_EcruteakCity_branch_ef3f2 + sound_loop 0, .mainloop Music_EcruteakCity_Ch3: - stereopanning $ff -Music_EcruteakCity_branch_ef4e3: - vibrato $12, $25 - notetype $c, $25 + stereo_panning TRUE, TRUE +.mainloop: + vibrato 18, 2, 5 + note_type 12, 2, 5 octave 3 note C_, 2 note G_, 2 @@ -509,18 +510,18 @@ Music_EcruteakCity_branch_ef4e3: note A#, 2 octave 4 note D_, 2 - note __, 2 + rest 2 note C#, 2 note D_, 2 note E_, 2 octave 3 note D_, 2 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 2 note F_, 1 - note __, 1 + rest 1 note G#, 8 octave 3 note G_, 2 @@ -552,17 +553,17 @@ Music_EcruteakCity_branch_ef4e3: note D_, 2 note F_, 2 note G_, 1 - note __, 1 + rest 1 octave 3 note F_, 8 octave 4 note A_, 2 octave 5 note C_, 1 - note __, 1 + rest 1 note D_, 2 note E_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 octave 3 @@ -574,7 +575,7 @@ Music_EcruteakCity_branch_ef4e3: note B_, 2 octave 4 note D_, 2 - callchannel Music_EcruteakCity_branch_ef569 + sound_call .sub1 octave 4 note C_, 8 note E_, 8 @@ -584,84 +585,84 @@ Music_EcruteakCity_branch_ef4e3: note G_, 8 note E_, 8 note C#, 8 - notetype $c, $25 - callchannel Music_EcruteakCity_branch_ef569 + note_type 12, 2, 5 + sound_call .sub1 octave 4 note C_, 8 octave 3 note G_, 8 note E_, 8 note D_, 8 - loopchannel 0, Music_EcruteakCity_branch_ef4e3 + sound_loop 0, .mainloop -Music_EcruteakCity_branch_ef569: +.sub1: octave 3 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A#, 1 - notetype $6, $25 - note __, 1 + note_type 6, 2, 5 + rest 1 note B_, 1 - endchannel + sound_ret diff --git a/audio/music/elmslab.asm b/audio/music/elmslab.asm index 38b04b59..5980237d 100644 --- a/audio/music/elmslab.asm +++ b/audio/music/elmslab.asm @@ -1,26 +1,27 @@ 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 + channel_count 4 + channel 1, Music_ElmsLab_Ch1 + channel 2, Music_ElmsLab_Ch2 + channel 3, Music_ElmsLab_Ch3 + channel 4, Music_ElmsLab_Ch4 Music_ElmsLab_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f0 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 11, 2 octave 2 note F_, 2 note G_, 2 note A_, 2 note B_, 2 - intensity $b6 + volume_envelope 11, 6 octave 3 note C_, 8 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A_, 2 @@ -33,75 +34,75 @@ Music_ElmsLab_Ch1: note A_, 4 note A_, 4 note A_, 2 -Music_ElmsLab_branch_ea075: - note __, 2 +.mainloop: + rest 2 note A_, 2 note G#, 2 note A_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note C_, 4 - intensity $b5 + volume_envelope 11, 5 octave 3 note B_, 2 octave 4 note C_, 2 - intensity $b4 + volume_envelope 11, 4 note F_, 8 - intensity $b5 + volume_envelope 11, 5 octave 3 note A_, 2 note G#, 2 note A_, 2 note F_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b5 + volume_envelope 11, 5 note A_, 2 note G_, 2 note F_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 4 - intensity $b5 + volume_envelope 11, 5 note A_, 2 note G#, 2 note A_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - intensity $b5 + volume_envelope 11, 5 note C_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $b4 + volume_envelope 11, 4 note F_, 2 note E_, 2 note D_, 2 note F_, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note F_, 2 note E_, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note A_, 2 note A#, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 4 - intensity $b4 + volume_envelope 11, 4 note F_, 2 note A_, 2 note G_, 2 note F_, 2 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 6 - intensity $b7 + volume_envelope 11, 7 note F_, 4 octave 4 note C_, 2 @@ -110,17 +111,17 @@ Music_ElmsLab_branch_ea075: note D_, 2 note A#, 4 note A_, 4 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note F_, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 6 - intensity $b7 + volume_envelope 11, 7 note E_, 4 note A#, 2 note E_, 6 - intensity $b3 + volume_envelope 11, 3 note F_, 2 note E_, 2 note F_, 2 @@ -128,9 +129,9 @@ Music_ElmsLab_branch_ea075: note A_, 2 note A_, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 6 - intensity $b4 + volume_envelope 11, 4 note F_, 4 octave 4 note C_, 4 @@ -143,7 +144,7 @@ Music_ElmsLab_branch_ea075: octave 3 note A#, 2 note A_, 2 - intensity $b7 + volume_envelope 11, 7 note A#, 8 octave 4 note E_, 4 @@ -156,7 +157,7 @@ Music_ElmsLab_branch_ea075: note D_, 4 note D#, 4 note E_, 4 - intensity $b4 + volume_envelope 11, 4 octave 3 note A_, 2 note F_, 2 @@ -177,32 +178,32 @@ Music_ElmsLab_branch_ea075: octave 3 note F_, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 note F_, 2 note F_, 4 - loopchannel 0, Music_ElmsLab_branch_ea075 + sound_loop 0, .mainloop Music_ElmsLab_Ch2: - dutycycle $3 - vibrato $10, $26 - stereopanning $f - notetype $c, $c3 + duty_cycle 3 + vibrato 16, 2, 6 + stereo_panning FALSE, TRUE + note_type 12, 12, 3 octave 4 note F_, 2 note E_, 2 note D_, 2 octave 3 note B_, 2 - intensity $c5 + volume_envelope 12, 5 octave 4 note C_, 8 - intensity $c3 + volume_envelope 12, 3 octave 3 note A#, 2 note A_, 2 note G_, 2 note E_, 2 - intensity $c2 + volume_envelope 12, 2 note F_, 6 octave 4 note C_, 4 @@ -211,56 +212,56 @@ Music_ElmsLab_Ch2: note C_, 4 note C_, 4 note C_, 2 - stereopanning $ff -Music_ElmsLab_branch_ea14f: - intensity $c6 + stereo_panning TRUE, TRUE +.mainloop: + volume_envelope 12, 6 octave 4 note F_, 6 - intensity $c2 + volume_envelope 12, 2 note E_, 2 note F_, 2 note E_, 2 note F_, 2 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note A_, 6 - intensity $c2 + volume_envelope 12, 2 note F_, 2 - intensity $c7 + volume_envelope 12, 7 note C_, 8 - intensity $c7 + volume_envelope 12, 7 note D_, 6 - intensity $c3 + volume_envelope 12, 3 note C#, 2 note D_, 2 note C#, 2 note D_, 2 note E_, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 6 - intensity $c3 + volume_envelope 12, 3 note C_, 2 - intensity $c7 + volume_envelope 12, 7 octave 3 note A_, 10 - intensity $c3 + volume_envelope 12, 3 note A#, 2 note A#, 2 octave 4 note D_, 2 - intensity $c5 + volume_envelope 12, 5 note C_, 4 octave 3 note A#, 6 - intensity $c3 + volume_envelope 12, 3 octave 4 note C_, 2 note C_, 2 note E_, 2 - intensity $c4 + volume_envelope 12, 4 note D_, 4 note C_, 6 - intensity $c2 + volume_envelope 12, 2 note D_, 2 note D_, 2 note F_, 2 @@ -268,50 +269,50 @@ Music_ElmsLab_branch_ea14f: note F_, 2 note E_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 note G_, 4 - intensity $c6 + volume_envelope 12, 6 note C_, 4 note D_, 4 - intensity $c4 + volume_envelope 12, 4 note E_, 6 - intensity $c3 + volume_envelope 12, 3 note F_, 2 note F_, 2 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note A_, 4 - intensity $c3 + volume_envelope 12, 3 note G_, 2 note F#, 2 note G_, 2 note F#, 2 note G_, 1 note F_, 2 - intensity $c7 + volume_envelope 12, 7 note D_, 11 - intensity $c3 + volume_envelope 12, 3 note E_, 2 note E_, 2 note F_, 2 - intensity $c7 + volume_envelope 12, 7 note G_, 4 - intensity $c3 + volume_envelope 12, 3 note F_, 2 note E_, 2 note F_, 2 note G_, 2 note F_, 1 note D_, 2 - intensity $c7 + volume_envelope 12, 7 note C_, 11 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note F_, 2 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note A_, 4 - intensity $c4 + volume_envelope 12, 4 note G_, 2 note F_, 2 note A#, 2 @@ -320,10 +321,10 @@ Music_ElmsLab_branch_ea14f: octave 5 note C_, 2 note D_, 5 - intensity $c3 + volume_envelope 12, 3 note E_, 2 note D_, 2 - intensity $c7 + volume_envelope 12, 7 note C_, 4 octave 4 note A#, 4 @@ -335,25 +336,25 @@ Music_ElmsLab_branch_ea14f: note A#, 4 note A_, 4 note G_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 10 - intensity $c2 + volume_envelope 12, 2 note C_, 2 note F_, 2 - intensity $c4 + volume_envelope 12, 4 octave 3 note E_, 2 - loopchannel 0, Music_ElmsLab_branch_ea14f + sound_loop 0, .mainloop Music_ElmsLab_Ch3: - stereopanning $f - notetype $c, $25 - note __, 8 - note __, 14 + stereo_panning FALSE, TRUE + note_type 12, 2, 5 + rest 8 + rest 14 octave 3 note C_, 2 note F_, 2 @@ -372,7 +373,7 @@ Music_ElmsLab_Ch3: note C_, 2 note D_, 2 note E_, 2 -Music_ElmsLab_branch_ea216: +.mainloop: note F_, 2 note A_, 2 note C_, 2 @@ -447,7 +448,7 @@ Music_ElmsLab_branch_ea216: note B_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note C_, 4 octave 3 note A#, 4 @@ -524,14 +525,14 @@ Music_ElmsLab_branch_ea216: note C_, 2 note F_, 2 note A_, 2 - loopchannel 0, Music_ElmsLab_branch_ea216 + sound_loop 0, .mainloop Music_ElmsLab_Ch4: - stereopanning $f0 - togglenoise $0 - notetype $c - note __, 16 - note __, 2 -Music_ElmsLab_branch_ea2b9: - note G_, 4 - loopchannel 0, Music_ElmsLab_branch_ea2b9 + stereo_panning TRUE, FALSE + toggle_noise 0 + drum_speed 12 + rest 16 + rest 2 +.mainloop: + drum_note 8, 4 + sound_loop 0, .mainloop diff --git a/audio/music/evolution.asm b/audio/music/evolution.asm index 47e11543..4fc58501 100644 --- a/audio/music/evolution.asm +++ b/audio/music/evolution.asm @@ -1,46 +1,48 @@ 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 + channel_count 4 + channel 1, Music_Evolution_Ch1 + channel 2, Music_Evolution_Ch2 + channel 3, Music_Evolution_Ch3 + channel 4, Music_Evolution_Ch4 Music_Evolution_Ch1: tempo 132 - volume $77 - vibrato $6, $34 - tone $0001 - dutycycle $2 - notetype $c, $92 + volume 7, 7 + vibrato 6, 3, 4 + pitch_offset 1 + duty_cycle 2 + note_type 12, 9, 2 octave 3 - slidepitchto 1, 4, A_ + pitch_slide 1, 4, A_ note C_, 1 - slidepitchto 1, 4, A_ + pitch_slide 1, 4, A_ note G_, 1 - slidepitchto 1, 4, A_ + pitch_slide 1, 4, A_ note C_, 1 - slidepitchto 1, 4, A_ + pitch_slide 1, 4, A_ note G_, 1 - note __, 4 - dutycycle $3 - stereopanning $f -Music_Evolution_branch_f0713: - callchannel Music_Evolution_branch_f0737 - notetype $c, $a4 + rest 4 + duty_cycle 3 + stereo_panning FALSE, TRUE +.mainloop: +.loop1: + sound_call .sub1 + note_type 12, 10, 4 note F#, 4 - callchannel Music_Evolution_branch_f0737 - notetype $c, $a4 + sound_call .sub1 + note_type 12, 10, 4 note F#, 4 - loopchannel 2, Music_Evolution_branch_f0713 - callchannel Music_Evolution_branch_f0743 - notetype $c, $a4 + sound_loop 2, .loop1 + sound_call .sub2 + note_type 12, 10, 4 note G#, 4 - callchannel Music_Evolution_branch_f0743 - notetype $c, $a4 + sound_call .sub2 + note_type 12, 10, 4 note G#, 4 - loopchannel 0, Music_Evolution_branch_f0713 + sound_loop 0, .mainloop -Music_Evolution_branch_f0737: - notetype $c, $a2 +.sub1: + note_type 12, 10, 2 octave 3 note C_, 4 note G_, 4 @@ -49,10 +51,10 @@ Music_Evolution_branch_f0737: note C_, 4 note G_, 4 note C_, 4 - endchannel + sound_ret -Music_Evolution_branch_f0743: - notetype $c, $a2 +.sub2: + note_type 12, 10, 2 octave 3 note D_, 4 note A_, 4 @@ -61,40 +63,41 @@ Music_Evolution_branch_f0743: note D_, 4 note A_, 4 note D_, 4 - endchannel + sound_ret Music_Evolution_Ch2: - dutycycle $2 - vibrato $8, $25 - notetype $c, $a2 + duty_cycle 2 + vibrato 8, 2, 5 + note_type 12, 10, 2 octave 4 note G_, 1 note D_, 1 note G_, 1 note D_, 1 - note __, 4 - dutycycle $3 - stereopanning $f0 -Music_Evolution_branch_f0761: - callchannel Music_Evolution_branch_f0787 - notetype $c, $b5 + rest 4 + duty_cycle 3 + stereo_panning TRUE, FALSE +.mainloop: +.loop1: + sound_call .sub1 + note_type 12, 11, 5 note A_, 4 - callchannel Music_Evolution_branch_f0787 - notetype $c, $b5 + sound_call .sub1 + note_type 12, 11, 5 note B_, 4 - loopchannel 2, Music_Evolution_branch_f0761 - callchannel Music_Evolution_branch_f0793 - notetype $c, $b5 + sound_loop 2, .loop1 + sound_call .sub2 + note_type 12, 11, 5 note B_, 4 - callchannel Music_Evolution_branch_f0793 - notetype $c, $b5 + sound_call .sub2 + note_type 12, 11, 5 octave 4 note C#, 4 octave 3 - loopchannel 0, Music_Evolution_branch_f0761 + sound_loop 0, .mainloop -Music_Evolution_branch_f0787: - notetype $c, $b2 +.sub1: + note_type 12, 11, 2 octave 3 note G_, 4 note D_, 4 @@ -103,10 +106,10 @@ Music_Evolution_branch_f0787: note G_, 4 note D_, 4 note G_, 4 - endchannel + sound_ret -Music_Evolution_branch_f0793: - notetype $c, $b2 +.sub2: + note_type 12, 11, 2 octave 3 note A_, 4 note E_, 4 @@ -115,85 +118,86 @@ Music_Evolution_branch_f0793: note A_, 4 note E_, 4 note A_, 4 - endchannel + sound_ret Music_Evolution_Ch3: - notetype $c, $16 - note __, 8 -Music_Evolution_branch_f07a3: - callchannel Music_Evolution_branch_f07bf + note_type 12, 1, 6 + rest 8 +.mainloop: +.loop1: + sound_call .sub1 octave 3 note A_, 4 - callchannel Music_Evolution_branch_f07bf + sound_call .sub1 octave 3 note B_, 4 - loopchannel 2, Music_Evolution_branch_f07a3 - callchannel Music_Evolution_branch_f07d5 + sound_loop 2, .loop1 + sound_call .sub2 octave 3 note B_, 4 - callchannel Music_Evolution_branch_f07d5 + sound_call .sub2 octave 4 note C#, 4 - loopchannel 0, Music_Evolution_branch_f07a3 + sound_loop 0, .mainloop -Music_Evolution_branch_f07bf: +.sub1: octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_Evolution_branch_f07d5: +.sub2: octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 - endchannel + rest 2 + sound_ret Music_Evolution_Ch4: - togglenoise $5 - notetype $c - note __, 8 -Music_Evolution_branch_f07f0: - stereopanning $f0 - note A#, 6 - note A#, 4 - stereopanning $f - note E_, 2 - note E_, 2 - note E_, 2 - loopchannel 0, Music_Evolution_branch_f07f0 + toggle_noise 5 + drum_speed 12 + rest 8 +.mainloop: + stereo_panning TRUE, FALSE + drum_note 11, 6 + drum_note 11, 4 + stereo_panning FALSE, TRUE + drum_note 5, 2 + drum_note 5, 2 + drum_note 5, 2 + sound_loop 0, .mainloop diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm index d275bc9a..3f580e3f 100644 --- a/audio/music/gamecorner.asm +++ b/audio/music/gamecorner.asm @@ -1,60 +1,61 @@ 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 + channel_count 4 + channel 1, Music_GameCorner_Ch1 + channel 2, Music_GameCorner_Ch2 + channel 3, Music_GameCorner_Ch3 + channel 4, Music_GameCorner_Ch4 Music_GameCorner_Ch1: tempo 147 - volume $77 - stereopanning $f - notetype $c, $91 - note __, 8 -Music_GameCorner_branch_edd84: - intensity $91 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede13 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede03 - callchannel Music_GameCorner_branch_ede13 - octave 3 - note __, 2 + volume 7, 7 + stereo_panning FALSE, TRUE + note_type 12, 9, 1 + rest 8 +.mainloop: + volume_envelope 9, 1 + rest 16 + rest 16 + rest 16 + rest 16 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + rest 16 + rest 16 + rest 16 + rest 16 + rest 16 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + octave 3 + rest 2 note G#, 3 note G#, 3 note A#, 2 note A#, 2 note G#, 2 note G_, 2 - intensity $71 -Music_GameCorner_branch_eddb1: + volume_envelope 7, 1 +.loop1: octave 4 note G#, 1 octave 5 note C_, 1 note F_, 1 note C_, 1 - loopchannel 4, Music_GameCorner_branch_eddb1 -Music_GameCorner_branch_eddbb: + sound_loop 4, .loop1 +.loop2: octave 4 note A#, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - loopchannel 4, Music_GameCorner_branch_eddbb -Music_GameCorner_branch_eddc5: + sound_loop 4, .loop2 +.loop3: octave 4 note D#, 1 note G_, 1 @@ -62,8 +63,8 @@ Music_GameCorner_branch_eddc5: note C_, 1 octave 4 note G_, 1 - loopchannel 4, Music_GameCorner_branch_eddc5 -Music_GameCorner_branch_eddd0: + sound_loop 4, .loop3 +.loop4: octave 4 note F_, 1 note A_, 1 @@ -71,41 +72,41 @@ Music_GameCorner_branch_eddd0: note C_, 1 octave 4 note A_, 1 - loopchannel 4, Music_GameCorner_branch_eddd0 -Music_GameCorner_branch_edddb: + sound_loop 4, .loop4 +.loop5: octave 4 note G#, 1 octave 5 note C_, 1 note F_, 1 note C_, 1 - loopchannel 4, Music_GameCorner_branch_edddb -Music_GameCorner_branch_edde5: + sound_loop 4, .loop5 +.loop6: octave 4 note A#, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - loopchannel 4, Music_GameCorner_branch_edde5 -Music_GameCorner_branch_eddef: + sound_loop 4, .loop6 +.loop7: octave 4 note B_, 1 octave 5 note D_, 1 note G_, 1 note D_, 1 - loopchannel 4, Music_GameCorner_branch_eddef + sound_loop 4, .loop7 octave 3 note D_, 1 note D_, 1 note D_, 3 note F_, 2 note F_, 9 - loopchannel 0, Music_GameCorner_branch_edd84 + sound_loop 0, .mainloop -Music_GameCorner_branch_ede03: - note __, 2 +.sub1: + rest 2 octave 4 note A#, 3 note G_, 3 @@ -113,17 +114,17 @@ Music_GameCorner_branch_ede03: octave 3 note F_, 3 note F_, 2 - note __, 2 + rest 2 note G#, 3 note G#, 3 note A#, 2 note A#, 2 note G#, 1 note A#, 3 - endchannel + sound_ret -Music_GameCorner_branch_ede13: - note __, 2 +.sub2: + rest 2 octave 4 note A#, 3 note G_, 3 @@ -131,17 +132,17 @@ Music_GameCorner_branch_ede13: octave 3 note F_, 3 note F_, 2 - endchannel + sound_ret Music_GameCorner_Ch2: - stereopanning $ff - vibrato $8, $24 - notetype $c, $a1 - note __, 8 -Music_GameCorner_branch_ede25: - intensity $92 - dutycycle $1 - callchannel Music_GameCorner_branch_ede75 + stereo_panning TRUE, TRUE + vibrato 8, 2, 4 + note_type 12, 10, 1 + rest 8 +.mainloop: + volume_envelope 9, 2 + duty_cycle 1 + sound_call .sub1 octave 1 note F_, 2 octave 3 @@ -150,24 +151,24 @@ Music_GameCorner_branch_ede25: note F_, 1 octave 3 note G#, 2 - intensity $a4 + volume_envelope 10, 4 note G#, 3 - intensity $92 + volume_envelope 9, 2 note G_, 2 note A#, 1 octave 4 note C_, 3 - callchannel Music_GameCorner_branch_ede75 + sound_call .sub1 octave 4 note F_, 2 note D#, 2 note F_, 1 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note G_, 3 note F_, 4 - dutycycle $2 - intensity $c7 + duty_cycle 2 + volume_envelope 12, 7 octave 3 note D#, 1 note F_, 1 @@ -182,7 +183,7 @@ Music_GameCorner_branch_ede25: octave 2 note A#, 4 note A_, 4 - note __, 10 + rest 10 octave 3 note D#, 1 note F_, 1 @@ -195,16 +196,16 @@ Music_GameCorner_branch_ede25: note D#, 1 note F_, 1 note G_, 16 - intensity $92 + volume_envelope 9, 2 note G_, 1 note G_, 1 note G_, 3 note A#, 2 note A#, 9 - intensity $a4 - loopchannel 0, Music_GameCorner_branch_ede25 + volume_envelope 10, 4 + sound_loop 0, .mainloop -Music_GameCorner_branch_ede75: +.sub1: octave 1 note C_, 2 octave 3 @@ -253,10 +254,10 @@ Music_GameCorner_branch_ede75: note D#, 2 note F_, 1 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note F_, 3 note G_, 4 - intensity $92 + volume_envelope 9, 2 note F#, 1 note F_, 1 octave 1 @@ -276,10 +277,10 @@ Music_GameCorner_branch_ede75: note D#, 2 note G_, 1 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note A#, 3 note A_, 2 - intensity $92 + volume_envelope 9, 2 note A#, 1 octave 5 note C_, 3 @@ -297,10 +298,10 @@ Music_GameCorner_branch_ede75: note D#, 2 note F_, 1 note D#, 2 - intensity $a4 + volume_envelope 10, 4 note F_, 3 note G_, 4 - intensity $92 + volume_envelope 9, 2 note F#, 1 note F_, 1 octave 1 @@ -313,35 +314,35 @@ Music_GameCorner_branch_ede75: note C_, 2 note D_, 2 note D#, 2 - endchannel + sound_ret Music_GameCorner_Ch3: - vibrato $8, $22 - notetype $c, $14 - note __, 8 -Music_GameCorner_branch_edeef: - stereopanning $ff - notetype $c, $14 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_edff8 + vibrato 8, 2, 2 + note_type 12, 1, 4 + rest 8 +.mainloop: + stereo_panning TRUE, TRUE + note_type 12, 1, 4 + sound_call .sub1 + sound_call .sub2 octave 4 note G_, 1 note A_, 3 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_edff8 + sound_call .sub1 + sound_call .sub2 octave 4 note A#, 1 octave 5 note C_, 3 - stereopanning $f0 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee00c - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee024 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee00c - callchannel Music_GameCorner_branch_edfdd - stereopanning $ff + stereo_panning TRUE, FALSE + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub4 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + stereo_panning TRUE, TRUE octave 2 note F_, 1 octave 3 @@ -359,29 +360,29 @@ Music_GameCorner_branch_edeef: octave 5 note D#, 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 note F_, 1 - note __, 2 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_edff8 + rest 2 + sound_call .sub1 + sound_call .sub2 octave 4 note G_, 1 note A_, 3 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_edff8 + sound_call .sub1 + sound_call .sub2 octave 4 note A#, 1 octave 5 note C_, 3 - stereopanning $f0 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee00c - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee024 - callchannel Music_GameCorner_branch_edfdd - callchannel Music_GameCorner_branch_ee00c - callchannel Music_GameCorner_branch_edfdd + stereo_panning TRUE, FALSE + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub4 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 octave 2 note F_, 1 octave 3 @@ -400,25 +401,25 @@ Music_GameCorner_branch_edeef: note F_, 1 octave 5 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 - intensity $15 - callchannel Music_GameCorner_branch_ee03f + rest 1 + volume_envelope 1, 5 + sound_call .sub5 octave 2 note C_, 2 - note __, 1 + rest 1 note C_, 1 octave 3 note C_, 1 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 note C_, 1 octave 3 @@ -429,18 +430,18 @@ Music_GameCorner_branch_edeef: note C_, 1 octave 2 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 octave 2 note F_, 2 - note __, 1 + rest 1 note F_, 1 octave 3 note F_, 1 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 note F_, 1 octave 3 @@ -451,19 +452,19 @@ Music_GameCorner_branch_edeef: note F_, 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - callchannel Music_GameCorner_branch_ee03f + sound_call .sub5 octave 2 note G_, 2 - note __, 1 + rest 1 note G_, 1 octave 3 note G_, 1 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 note G_, 1 octave 3 @@ -474,19 +475,19 @@ Music_GameCorner_branch_edeef: note G_, 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 octave 2 note B_, 1 note B_, 1 note B_, 1 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 4 - notetype $6, $15 + rest 4 + note_type 6, 1, 5 octave 3 note D_, 1 note C_, 1 @@ -497,9 +498,9 @@ Music_GameCorner_branch_edeef: note F_, 1 note E_, 1 note D_, 1 - loopchannel 0, Music_GameCorner_branch_edeef + sound_loop 0, .mainloop -Music_GameCorner_branch_edfdd: +.sub1: octave 2 note C_, 1 octave 3 @@ -526,9 +527,9 @@ Music_GameCorner_branch_edfdd: note C_, 1 octave 4 note A_, 2 - endchannel + sound_ret -Music_GameCorner_branch_edff8: +.sub2: octave 2 note C_, 1 octave 3 @@ -545,12 +546,12 @@ Music_GameCorner_branch_edff8: note C_, 1 octave 4 note A#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_GameCorner_branch_ee00c: +.sub3: octave 2 note F_, 1 octave 3 @@ -569,14 +570,14 @@ Music_GameCorner_branch_ee00c: note F_, 1 octave 5 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C_, 1 note D_, 3 - endchannel + sound_ret -Music_GameCorner_branch_ee024: +.sub4: octave 2 note F_, 1 octave 3 @@ -595,26 +596,26 @@ Music_GameCorner_branch_ee024: note F_, 1 octave 5 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C_, 1 note D_, 1 octave 3 note F_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_GameCorner_branch_ee03f: +.sub5: octave 2 note F_, 2 - note __, 1 + rest 1 note F_, 1 octave 3 note F_, 1 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 note F_, 1 octave 3 @@ -625,18 +626,18 @@ Music_GameCorner_branch_ee03f: note F_, 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 octave 2 note G_, 2 - note __, 1 + rest 1 note G_, 1 octave 3 note G_, 1 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 note G_, 1 octave 3 @@ -653,154 +654,154 @@ Music_GameCorner_branch_ee03f: note D_, 1 octave 3 note D_, 1 - endchannel + sound_ret Music_GameCorner_Ch4: - togglenoise $3 - notetype $c - notetype $8 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $c - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 1 - note D_, 1 -Music_GameCorner_branch_ee07f: - callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee082: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 6, Music_GameCorner_branch_ee082 - callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee091: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GameCorner_branch_ee091 - note __, 12 - note D_, 1 - note D_, 1 - note F#, 2 - callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee0a4: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 6, Music_GameCorner_branch_ee0a4 - callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee0b3: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GameCorner_branch_ee0b3 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 -Music_GameCorner_branch_ee0c9: - note A#, 2 - note F#, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note F#, 1 - note D#, 1 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GameCorner_branch_ee0c9 - note A#, 2 - note F#, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note F#, 1 - note D#, 1 - note D_, 2 - note D_, 1 - note D_, 1 -Music_GameCorner_branch_ee0e8: - note A#, 2 - note F#, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note F#, 1 - note D#, 1 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GameCorner_branch_ee0e8 - note D_, 1 - note D_, 1 - note D_, 2 - note A#, 1 - note F#, 2 - note F#, 5 - note D_, 1 - note D_, 1 - note D#, 2 - loopchannel 0, Music_GameCorner_branch_ee07f + toggle_noise 3 + drum_speed 12 + drum_speed 8 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.mainloop: + sound_call .sub1 +.loop1: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 6, .loop1 + sound_call .sub2 +.loop2: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop2 + rest 12 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_call .sub1 +.loop3: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 6, .loop3 + sound_call .sub2 +.loop4: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop4 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 +.loop5: + drum_note 11, 2 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop5 + drum_note 11, 2 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.loop6: + drum_note 11, 2 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 7, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 11, 1 + drum_note 7, 2 + drum_note 7, 5 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 2 + sound_loop 0, .mainloop -Music_GameCorner_branch_ee106: - note C_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - endchannel +.sub1: + drum_note 1, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_ret -Music_GameCorner_branch_ee10f: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note F#, 2 - endchannel +.sub2: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_ret diff --git a/audio/music/goldenrodcity.asm b/audio/music/goldenrodcity.asm index 42f861e3..bb2bf631 100644 --- a/audio/music/goldenrodcity.asm +++ b/audio/music/goldenrodcity.asm @@ -1,21 +1,22 @@ 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 + channel_count 4 + channel 1, Music_GoldenrodCity_Ch1 + channel 2, Music_GoldenrodCity_Ch2 + channel 3, Music_GoldenrodCity_Ch3 + channel 4, Music_GoldenrodCity_Ch4 Music_GoldenrodCity_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 176 - volume $77 - notetype $c, $97 - note __, 16 - note __, 16 - note __, 16 - note __, 16 -Music_GoldenrodCity_branch_eb46d: - dutycycle $0 - callchannel Music_GoldenrodCity_branch_eb4a9 + volume 7, 7 + note_type 12, 9, 7 + rest 16 + rest 16 + rest 16 + rest 16 +.mainloop: + duty_cycle 0 + sound_call .sub1 octave 3 note G#, 1 octave 4 @@ -27,68 +28,68 @@ Music_GoldenrodCity_branch_eb46d: note G#, 1 octave 5 note C_, 1 - intensity $71 - dutycycle $0 - callchannel Music_GoldenrodCity_branch_eb4d1 - intensity $77 + volume_envelope 7, 1 + duty_cycle 0 + sound_call .sub2 + volume_envelope 7, 7 note D#, 2 note F_, 2 note F#, 2 note G#, 4 - intensity $71 - callchannel Music_GoldenrodCity_branch_eb4d1 + volume_envelope 7, 1 + sound_call .sub2 note D#, 1 note F#, 1 - intensity $77 + volume_envelope 7, 7 octave 5 note C_, 2 octave 4 note G#, 2 note F#, 2 note D#, 2 - dutycycle $2 - intensity $97 - callchannel Music_GoldenrodCity_branch_eb4a9 + duty_cycle 2 + volume_envelope 9, 7 + sound_call .sub1 note C_, 4 octave 3 note G#, 2 octave 4 note C_, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb46d + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb4a9: +.sub1: octave 4 note C#, 2 octave 3 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 3 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 + rest 1 note A#, 2 note F_, 1 - note __, 1 + rest 1 note C#, 2 note F_, 1 - note __, 1 + rest 1 note D#, 2 note C_, 2 note C#, 2 note D#, 2 note F#, 2 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 1 + rest 1 note F#, 2 note C#, 1 - note __, 1 + rest 1 note F#, 2 note A#, 2 note C#, 2 @@ -96,9 +97,9 @@ Music_GoldenrodCity_branch_eb4a9: note G#, 2 octave 4 note C#, 2 - endchannel + sound_ret -Music_GoldenrodCity_branch_eb4d1: +.sub2: octave 4 note F_, 1 note C#, 1 @@ -170,50 +171,50 @@ Music_GoldenrodCity_branch_eb4d1: note C_, 1 note D#, 1 note F#, 1 - endchannel + sound_ret Music_GoldenrodCity_Ch2: - stereopanning $f0 - vibrato $12, $23 - dutycycle $2 - notetype $c, $97 -Music_GoldenrodCity_branch_eb523: - intensity $97 - callchannel Music_GoldenrodCity_branch_eb555 + stereo_panning TRUE, FALSE + vibrato 18, 2, 3 + duty_cycle 2 + note_type 12, 9, 7 +.mainloop: + volume_envelope 9, 7 + sound_call .sub1 octave 4 note F_, 2 note F#, 2 note G#, 2 note F_, 2 note D#, 8 - callchannel Music_GoldenrodCity_branch_eb555 + sound_call .sub1 note G#, 2 note A#, 2 octave 5 note C_, 2 note C#, 2 note D#, 8 - dutycycle $2 - intensity $77 - callchannel Music_GoldenrodCity_branch_eb572 + duty_cycle 2 + volume_envelope 7, 7 + sound_call .sub2 octave 4 note G#, 2 note A#, 2 note B_, 2 octave 5 note C_, 4 - dutycycle $3 - intensity $77 - callchannel Music_GoldenrodCity_branch_eb572 + duty_cycle 3 + volume_envelope 7, 7 + sound_call .sub2 note F_, 2 note D#, 2 note C#, 2 note C_, 2 octave 4 note G#, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb523 + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb555: +.sub1: octave 4 note F_, 4 note C#, 4 @@ -240,10 +241,10 @@ Music_GoldenrodCity_branch_eb555: note A#, 2 note G#, 2 note F#, 2 - dutycycle $1 - endchannel + duty_cycle 1 + sound_ret -Music_GoldenrodCity_branch_eb572: +.sub2: note C#, 6 note F_, 6 note C#, 4 @@ -261,99 +262,99 @@ Music_GoldenrodCity_branch_eb572: octave 5 note C_, 4 note D#, 2 - endchannel + sound_ret Music_GoldenrodCity_Ch3: - stereopanning $ff - vibrato $8, $23 - notetype $c, $25 -Music_GoldenrodCity_branch_eb58c: - callchannel Music_GoldenrodCity_branch_eb5aa - callchannel Music_GoldenrodCity_branch_eb5aa - callchannel Music_GoldenrodCity_branch_eb5d2 - note __, 3 + stereo_panning TRUE, TRUE + vibrato 8, 2, 3 + note_type 12, 2, 5 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + rest 3 octave 3 note C_, 1 note D#, 1 note G_, 1 note G#, 1 note D#, 2 - callchannel Music_GoldenrodCity_branch_eb5d2 - note __, 1 + sound_call .sub2 + rest 1 octave 3 note G#, 2 note F#, 2 note D#, 2 octave 2 note G#, 2 - loopchannel 0, Music_GoldenrodCity_branch_eb58c + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb5aa: +.sub1: octave 3 note C#, 4 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note C_, 4 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 octave 2 note A#, 4 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note G#, 4 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note F#, 4 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 octave 3 note D#, 4 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note G#, 4 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 3 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_GoldenrodCity_branch_eb5d2: +.sub2: note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 octave 3 note C#, 1 - note __, 2 + rest 2 note C#, 1 - note __, 5 + rest 5 octave 4 note C_, 1 note C#, 1 octave 3 note G#, 2 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 octave 3 note C_, 1 - note __, 2 + rest 2 note C_, 1 - note __, 5 + rest 5 note B_, 1 octave 4 note C_, 1 @@ -361,114 +362,115 @@ Music_GoldenrodCity_branch_eb5d2: note G#, 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 octave 2 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 5 + rest 5 octave 3 note A_, 1 note A#, 1 note F#, 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note G#, 1 octave 2 note G#, 1 - note __, 2 + rest 2 note G#, 1 - endchannel + sound_ret Music_GoldenrodCity_Ch4: - togglenoise $3 - notetype $c - note __, 16 - note __, 16 - note __, 16 - note __, 8 - note D_, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note F#, 2 -Music_GoldenrodCity_branch_eb613: - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GoldenrodCity_branch_eb613 - callchannel Music_GoldenrodCity_branch_eb663 - callchannel Music_GoldenrodCity_branch_eb66d - note G_, 1 - note G_, 1 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 2 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 1 - note D_, 1 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 2 - note D_, 1 - note D_, 1 - callchannel Music_GoldenrodCity_branch_eb66d - note G_, 1 - note G_, 1 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 2 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 1 - note D_, 1 - note F#, 2 - callchannel Music_GoldenrodCity_branch_eb66d - note D_, 2 - note D_, 1 - note D_, 1 -Music_GoldenrodCity_branch_eb650: - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 3, Music_GoldenrodCity_branch_eb650 - callchannel Music_GoldenrodCity_branch_eb663 - loopchannel 0, Music_GoldenrodCity_branch_eb613 + toggle_noise 3 + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 8 + drum_note 3, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 +.mainloop: +.loop1: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop1 + sound_call .sub1 + sound_call .sub2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 2 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + sound_call .sub2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 2 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_call .sub2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 +.loop2: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 3, .loop2 + sound_call .sub1 + sound_loop 0, .mainloop -Music_GoldenrodCity_branch_eb663: - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note F#, 2 - endchannel +.sub1: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 2 + sound_ret -Music_GoldenrodCity_branch_eb66d: - note D#, 2 - note D_, 1 - note D#, 3 - note D#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - endchannel +.sub2: + drum_note 4, 2 + drum_note 3, 1 + drum_note 4, 3 + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_ret diff --git a/audio/music/goldsilveropening.asm b/audio/music/goldsilveropening.asm index a9359f00..8eac605e 100644 --- a/audio/music/goldsilveropening.asm +++ b/audio/music/goldsilveropening.asm @@ -1,21 +1,22 @@ Music_GoldSilverOpening: - musicheader 3, 1, Music_GoldSilverOpening_Ch1 - musicheader 1, 2, Music_GoldSilverOpening_Ch2 - musicheader 1, 3, Music_GoldSilverOpening_Ch3 + channel_count 3 + channel 1, Music_GoldSilverOpening_Ch1 + channel 2, Music_GoldSilverOpening_Ch2 + channel 3, Music_GoldSilverOpening_Ch3 Music_GoldSilverOpening_Ch1: tempo 256 - volume $77 - tone $0001 - dutycycle $2 - stereopanning $f0 - notetype $c, $b7 + volume 7, 7 + pitch_offset 1 + duty_cycle 2 + stereo_panning TRUE, FALSE + note_type 12, 11, 7 octave 1 note G#, 16 note G#, 16 tempo 168 - dutycycle $3 - notetype $6, $c7 + duty_cycle 3 + note_type 6, 12, 7 octave 3 note F_, 12 note A_, 4 @@ -30,7 +31,7 @@ Music_GoldSilverOpening_Ch1: note D#, 12 note D_, 2 note C#, 2 - notetype $6, $b5 + note_type 6, 11, 5 note C_, 8 octave 3 note F_, 8 @@ -38,7 +39,7 @@ Music_GoldSilverOpening_Ch1: note B_, 4 octave 4 note C_, 4 - notetype $6, $b3 + note_type 6, 11, 3 octave 3 note A#, 8 note C#, 8 @@ -46,8 +47,8 @@ Music_GoldSilverOpening_Ch1: note F#, 8 octave 1 note B_, 8 - notetype $6, $b2 - note __, 4 + note_type 6, 11, 2 + rest 4 octave 3 note A#, 4 note A#, 8 @@ -73,7 +74,7 @@ Music_GoldSilverOpening_Ch1: note F#, 4 note G_, 4 note F_, 4 - notetype $8, $b3 + note_type 8, 11, 3 octave 4 note F_, 1 note G_, 1 @@ -82,8 +83,8 @@ Music_GoldSilverOpening_Ch1: note B_, 1 octave 5 note C_, 1 - dutycycle $2 - notetype $c, $b3 + duty_cycle 2 + note_type 12, 11, 3 note D_, 1 note C#, 1 note D_, 4 @@ -101,8 +102,8 @@ Music_GoldSilverOpening_Ch1: note C_, 2 note D#, 4 note F#, 2 - dutycycle $3 - notetype $8, $92 + duty_cycle 3 + note_type 8, 9, 2 note A_, 1 note F_, 1 note D#, 1 @@ -115,31 +116,31 @@ Music_GoldSilverOpening_Ch1: note C_, 1 octave 3 note A_, 3 - notetype $c, $b2 + note_type 12, 11, 2 note A#, 2 note B_, 2 octave 4 note C_, 2 note D_, 2 note D#, 2 - intensity $c2 + volume_envelope 12, 2 note F_, 2 note G_, 2 note A_, 16 - endchannel + sound_ret Music_GoldSilverOpening_Ch2: - tone $0001 - stereopanning $f - notetype $c, $b7 - dutycycle $2 + pitch_offset 1 + stereo_panning FALSE, TRUE + note_type 12, 11, 7 + duty_cycle 2 octave 2 note C_, 16 note C_, 16 - dutycycle $3 - notetype $c, $b2 - note __, 2 - notetype $6, $62 + duty_cycle 3 + note_type 12, 11, 2 + rest 2 + note_type 6, 6, 2 octave 1 note F_, 2 note A_, 2 @@ -179,33 +180,33 @@ Music_GoldSilverOpening_Ch2: note D_, 2 note D#, 2 note G_, 2 - notetype $c, $b7 + note_type 12, 11, 7 octave 1 note F_, 16 - intensity $83 + volume_envelope 8, 3 octave 4 note F_, 2 - intensity $81 + volume_envelope 8, 1 note D_, 2 - intensity $93 + volume_envelope 9, 3 note G#, 2 - intensity $91 + volume_envelope 9, 1 note F_, 2 - intensity $a3 + volume_envelope 10, 3 octave 5 note C#, 2 - intensity $a1 + volume_envelope 10, 1 octave 4 note A#, 2 - intensity $b3 + volume_envelope 11, 3 octave 5 note F#, 2 - intensity $c1 + volume_envelope 12, 1 note D#, 2 - intensity $b3 + volume_envelope 11, 3 octave 1 note A#, 2 - notetype $6, $b2 + note_type 6, 11, 2 octave 4 note D_, 4 note D_, 4 @@ -291,146 +292,146 @@ Music_GoldSilverOpening_Ch2: octave 3 note D#, 4 note D#, 16 - notetype $6, $a2 + note_type 6, 10, 2 note F_, 4 note G_, 4 note G#, 4 - notetype $6, $c2 + note_type 6, 12, 2 note A_, 4 note A#, 4 octave 4 note C_, 4 - notetype $6, $d2 + note_type 6, 13, 2 octave 3 note A_, 4 octave 4 note C_, 4 note D#, 16 - endchannel + sound_ret Music_GoldSilverOpening_Ch3: - notetype $6, $10 + note_type 6, 1, 0 octave 2 note D_, 4 - notetype $6, $20 + note_type 6, 2, 0 note D_, 4 - notetype $6, $30 + note_type 6, 3, 0 note D_, 4 - note __, 12 - note __, 8 - notetype $6, $10 + rest 12 + rest 8 + note_type 6, 1, 0 octave 2 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 6 note D_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 6 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 2 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 6 note D_, 1 - note __, 1 - notetype $8, $10 + rest 1 + note_type 8, 1, 0 note F_, 1 octave 5 note B_, 1 @@ -464,29 +465,29 @@ Music_GoldSilverOpening_Ch3: note F_, 1 octave 5 note A_, 3 - notetype $c, $10 + note_type 12, 1, 0 note G_, 1 - note __, 1 + rest 1 octave 6 note C_, 2 octave 5 note A#, 1 - note __, 1 + rest 1 octave 6 note F_, 2 note D#, 1 - note __, 1 + rest 1 note A#, 2 note G#, 1 - note __, 1 - note __, 16 - note __, 4 - notetype $6, $10 + rest 1 + rest 16 + rest 4 + note_type 6, 1, 0 octave 2 note G_, 1 - note __, 3 + rest 3 note A_, 2 - note __, 2 + rest 2 octave 5 note F_, 12 note D_, 4 @@ -494,122 +495,122 @@ Music_GoldSilverOpening_Ch3: note F_, 2 note D#, 12 note G#, 2 - note __, 2 + rest 2 note F#, 6 note D#, 2 note F_, 12 note D_, 2 - note __, 2 + rest 2 note D#, 6 note F_, 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note A_, 4 note D#, 4 note F_, 2 - note __, 2 + rest 2 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 9 - notetype $c, $10 - note __, 14 + rest 9 + note_type 12, 1, 0 + rest 14 octave 3 note F_, 2 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 13 - endchannel + rest 13 + sound_ret diff --git a/audio/music/goldsilveropening2.asm b/audio/music/goldsilveropening2.asm index 2dc43e3b..13714b39 100644 --- a/audio/music/goldsilveropening2.asm +++ b/audio/music/goldsilveropening2.asm @@ -1,127 +1,128 @@ 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 + channel_count 4 + channel 1, Music_GoldSilverOpening2_Ch1 + channel 2, Music_GoldSilverOpening2_Ch2 + channel 3, Music_GoldSilverOpening2_Ch3 + channel 4, Music_GoldSilverOpening2_Ch4 Music_GoldSilverOpening2_Ch1: tempo 92 - volume $77 - dutycycle $3 - tone $0002 - stereopanning $f - notetype $c, $3d + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + stereo_panning FALSE, TRUE + note_type 12, 3, -5 octave 3 note D#, 8 -Music_GoldSilverOpening2_branch_f7325: - notetype $c, $c1 +.loop1: + note_type 12, 12, 1 octave 3 note D_, 2 note D_, 2 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 10 - intensity $c1 + volume_envelope 12, 1 note D_, 2 note D_, 2 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 note D#, 4 note C_, 2 - loopchannel 2, Music_GoldSilverOpening2_branch_f7325 - intensity $c1 + sound_loop 2, .loop1 + volume_envelope 12, 1 note D_, 2 note D_, 2 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 10 - intensity $c1 + volume_envelope 12, 1 note D_, 2 note D_, 2 note D_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 note G_, 4 note A#, 2 - intensity $b0 + volume_envelope 11, 0 note A_, 16 note A_, 16 - intensity $b2 + volume_envelope 11, 2 octave 4 note D_, 16 - endchannel + sound_ret Music_GoldSilverOpening2_Ch2: - dutycycle $3 - vibrato $14, $14 - stereopanning $f0 - notetype $c, $3f + duty_cycle 3 + vibrato 20, 1, 4 + stereo_panning TRUE, FALSE + note_type 12, 3, -7 octave 3 note A#, 8 - notetype $c, $d1 + note_type 12, 13, 1 octave 3 note A_, 2 note A_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 10 - intensity $d1 + volume_envelope 13, 1 note A_, 2 note A_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 4 octave 3 note A#, 4 note G_, 2 - intensity $d1 + volume_envelope 13, 1 note A_, 2 note A_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 10 - intensity $d1 + volume_envelope 13, 1 note A_, 2 note A_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 4 note C#, 4 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note D_, 8 note D#, 8 note F_, 8 note A#, 8 - intensity $b0 + volume_envelope 11, 0 octave 5 note D_, 16 note D_, 16 - intensity $c2 + volume_envelope 12, 2 note D_, 16 - endchannel + sound_ret Music_GoldSilverOpening2_Ch3: - notetype $c, $17 - note __, 8 + note_type 12, 1, 7 + rest 8 octave 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A#, 8 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 4 note F_, 4 note A_, 2 @@ -179,39 +180,39 @@ Music_GoldSilverOpening2_Ch3: octave 3 note C#, 2 note D_, 2 - note __, 14 - endchannel + rest 14 + sound_ret Music_GoldSilverOpening2_Ch4: - togglenoise $0 - notetype $6 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - notetype $c -Music_GoldSilverOpening2_branch_f73f8: - note D_, 2 - note D_, 2 - note D_, 2 - note C#, 4 - note D#, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note C#, 6 - notetype $6 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - notetype $c - loopchannel 4, Music_GoldSilverOpening2_branch_f73f8 - note C_, 16 - endchannel + toggle_noise 0 + drum_speed 6 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 12 +.loop1: + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 4 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 6 + drum_speed 6 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_speed 12 + sound_loop 4, .loop1 + drum_note 1, 16 + sound_ret diff --git a/audio/music/gym.asm b/audio/music/gym.asm index acb944ad..774e471a 100644 --- a/audio/music/gym.asm +++ b/audio/music/gym.asm @@ -1,38 +1,39 @@ 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 + channel_count 4 + channel 1, Music_Gym_Ch1 + channel 2, Music_Gym_Ch2 + channel 3, Music_Gym_Ch3 + channel 4, Music_Gym_Ch4 Music_Gym_Ch1: tempo 156 - volume $77 - stereopanning $f - vibrato $12, $24 - dutycycle $1 - notetype $c, $b7 -Music_Gym_branch_f48c9: + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 18, 2, 4 + duty_cycle 1 + note_type 12, 11, 7 +.mainloop: octave 4 note F#, 2 octave 2 note A_, 1 note A_, 1 note A_, 1 - note __, 3 + rest 3 octave 4 note E_, 2 octave 2 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 octave 4 note D_, 2 octave 2 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 note D_, 1 @@ -52,7 +53,7 @@ Music_Gym_branch_f48c9: note F#, 2 note A_, 2 note G_, 1 - note __, 2 + rest 2 note E_, 1 note E_, 2 note C_, 2 @@ -67,7 +68,7 @@ Music_Gym_branch_f48c9: note F#, 2 note A_, 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 note G_, 4 @@ -86,12 +87,12 @@ Music_Gym_branch_f48c9: note G_, 2 note A_, 2 note B_, 1 - note __, 2 + rest 2 note G_, 1 note G_, 4 octave 4 note E_, 1 - note __, 2 + rest 2 note C_, 1 note C_, 2 octave 3 @@ -115,9 +116,9 @@ Music_Gym_branch_f48c9: note D_, 6 octave 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 octave 4 note F#, 3 @@ -126,10 +127,10 @@ Music_Gym_branch_f48c9: note E_, 4 note C_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 note E_, 1 - note __, 2 + rest 2 octave 3 note B_, 4 note F#, 2 @@ -151,9 +152,9 @@ Music_Gym_branch_f48c9: note F#, 6 octave 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 octave 4 note F#, 3 @@ -187,13 +188,13 @@ Music_Gym_branch_f48c9: note G_, 1 note F#, 1 note E_, 1 - loopchannel 0, Music_Gym_branch_f48c9 + sound_loop 0, .mainloop Music_Gym_Ch2: - dutycycle $1 - stereopanning $f0 -Music_Gym_branch_f4980: - notetype $c, $c3 + duty_cycle 1 + stereo_panning TRUE, FALSE +.mainloop: + note_type 12, 12, 3 octave 2 note D_, 2 octave 1 @@ -226,20 +227,20 @@ Music_Gym_branch_f4980: octave 3 note C_, 1 note C#, 1 - callchannel Music_Gym_branch_f49e9 + sound_call .sub1 octave 3 note E_, 2 note C_, 1 note C#, 1 - callchannel Music_Gym_branch_f49e9 + sound_call .sub1 octave 3 note C_, 1 note E_, 1 note G_, 1 octave 4 note C_, 1 - intensity $d2 - callchannel Music_Gym_branch_f4a15 + volume_envelope 13, 2 + sound_call .sub2 octave 1 note F#, 1 note B_, 1 @@ -260,7 +261,7 @@ Music_Gym_branch_f4980: octave 2 note G_, 2 note E_, 2 - callchannel Music_Gym_branch_f4a15 + sound_call .sub2 octave 1 note G_, 1 octave 2 @@ -283,9 +284,9 @@ Music_Gym_branch_f4980: octave 2 note F#, 2 note D_, 2 - loopchannel 0, Music_Gym_branch_f4980 + sound_loop 0, .mainloop -Music_Gym_branch_f49e9: +.sub1: octave 3 note D_, 3 octave 2 @@ -329,9 +330,9 @@ Music_Gym_branch_f49e9: note C_, 1 note C_, 1 note C_, 2 - endchannel + sound_ret -Music_Gym_branch_f4a15: +.sub2: octave 2 note D_, 4 note D_, 2 @@ -361,24 +362,24 @@ Music_Gym_branch_f4a15: note C_, 2 octave 1 note B_, 2 - note __, 2 + rest 2 note B_, 2 note F#, 1 note F#, 1 - endchannel + sound_ret Music_Gym_Ch3: - vibrato $14, $23 - stereopanning $ff -Music_Gym_branch_f4a3c: - notetype $c, $14 + vibrato 20, 2, 3 + stereo_panning TRUE, TRUE +.mainloop: + note_type 12, 1, 4 octave 6 note D_, 2 octave 4 note D_, 1 note D_, 1 note D_, 1 - note __, 1 + rest 1 octave 5 note A_, 1 octave 6 @@ -388,7 +389,7 @@ Music_Gym_branch_f4a3c: note C_, 1 note C_, 1 note C_, 1 - note __, 1 + rest 1 octave 5 note A_, 1 octave 6 @@ -399,7 +400,7 @@ Music_Gym_branch_f4a3c: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 5 note B_, 1 note B_, 1 @@ -413,7 +414,7 @@ Music_Gym_branch_f4a3c: octave 5 note D_, 2 note E_, 1 - note __, 2 + rest 2 note C_, 1 note C_, 4 note G_, 4 @@ -424,21 +425,21 @@ Music_Gym_branch_f4a3c: octave 5 note D_, 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 note D_, 1 note E_, 8 - note __, 4 + rest 4 note F#, 12 note E_, 2 note F#, 2 note G_, 1 - note __, 2 + rest 2 note E_, 1 note E_, 4 octave 6 note C_, 1 - note __, 2 + rest 2 octave 5 note G_, 1 note G_, 4 @@ -452,9 +453,9 @@ Music_Gym_branch_f4a3c: note C_, 8 octave 5 note B_, 4 - intensity $13 - callchannel Music_Gym_branch_f4ab3 - note __, 2 + volume_envelope 1, 3 + sound_call .sub1 + rest 2 note A_, 2 octave 6 note D_, 2 @@ -466,22 +467,22 @@ Music_Gym_branch_f4a3c: note A#, 4 note A_, 4 note G_, 4 - callchannel Music_Gym_branch_f4ab3 + sound_call .sub1 note A_, 1 - note __, 1 + rest 1 note A_, 1 note B_, 1 octave 6 note C_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 note E_, 1 note F#, 8 note E_, 4 - loopchannel 0, Music_Gym_branch_f4a3c + sound_loop 0, .mainloop -Music_Gym_branch_f4ab3: +.sub1: octave 5 note A_, 6 octave 6 @@ -495,72 +496,72 @@ Music_Gym_branch_f4ab3: note A_, 4 note G_, 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 note G_, 1 note A_, 4 - endchannel + sound_ret Music_Gym_Ch4: - togglenoise $4 -Music_Gym_branch_f4ac7: - notetype $c - note D_, 2 - note C#, 1 - note C#, 1 - note B_, 4 - note D_, 2 - note C#, 1 - note C#, 1 - note B_, 4 - note D_, 2 - note C#, 1 - note C#, 1 - note D_, 2 - note C#, 1 - note C#, 1 - note A#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - notetype $6 -Music_Gym_branch_f4ae1: - note D_, 6 - note D_, 6 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note D_, 6 - note D_, 6 - note D_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note B_, 8 - loopchannel 4, Music_Gym_branch_f4ae1 -Music_Gym_branch_f4afa: - note D#, 4 - note F#, 4 - note D_, 4 - note D#, 2 - note D_, 2 - note D#, 2 - note D_, 2 - note D#, 4 - note D_, 4 - note F#, 4 - loopchannel 8, Music_Gym_branch_f4afa - loopchannel 0, Music_Gym_branch_f4ac7 + toggle_noise 4 +.mainloop: + drum_speed 12 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 12, 4 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 12, 4 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 11, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 6 +.loop1: + drum_note 3, 6 + drum_note 3, 6 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 6 + drum_note 3, 6 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 12, 8 + sound_loop 4, .loop1 +.loop2: + drum_note 4, 4 + drum_note 7, 4 + drum_note 3, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 4 + drum_note 3, 4 + drum_note 7, 4 + sound_loop 8, .loop2 + sound_loop 0, .mainloop diff --git a/audio/music/gymleadervictory.asm b/audio/music/gymleadervictory.asm index d6a1a36e..4f53ea85 100644 --- a/audio/music/gymleadervictory.asm +++ b/audio/music/gymleadervictory.asm @@ -1,16 +1,17 @@ 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 + channel_count 4 + channel 1, Music_GymLeaderVictory_Ch1 + channel 2, Music_GymLeaderVictory_Ch2 + channel 3, Music_GymLeaderVictory_Ch3 + channel 4, Music_GymLeaderVictory_Ch4 Music_GymLeaderVictory_Ch1: tempo 116 - volume $77 - vibrato $12, $34 - dutycycle $3 - tone $0001 - notetype $c, $b7 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 3 + pitch_offset 1 + note_type 12, 11, 7 octave 4 note D_, 6 octave 3 @@ -25,18 +26,19 @@ Music_GymLeaderVictory_Ch1: note A_, 1 octave 5 note D_, 8 - stereopanning $f -Music_GymLeaderVictory_branch_f4658: - dutycycle $1 - callchannel Music_GymLeaderVictory_branch_f4689 + stereo_panning FALSE, TRUE +.mainloop: +.loop1: + duty_cycle 1 + sound_call .sub1 octave 4 note C#, 4 note E_, 4 - callchannel Music_GymLeaderVictory_branch_f4689 + sound_call .sub1 note F#, 8 - loopchannel 2, Music_GymLeaderVictory_branch_f4658 - dutycycle $2 - callchannel Music_GymLeaderVictory_branch_f46a0 + sound_loop 2, .loop1 + duty_cycle 2 + sound_call .sub2 note A_, 4 note G_, 4 note F#, 6 @@ -46,8 +48,8 @@ Music_GymLeaderVictory_branch_f4658: note E_, 2 note D_, 8 note C#, 8 - dutycycle $3 - callchannel Music_GymLeaderVictory_branch_f46a0 + duty_cycle 3 + sound_call .sub2 note C#, 4 note E_, 4 note G_, 6 @@ -55,12 +57,12 @@ Music_GymLeaderVictory_branch_f4658: note G_, 1 note A_, 6 note G_, 2 - intensity $87 + volume_envelope 8, 7 note F#, 16 - loopchannel 0, Music_GymLeaderVictory_branch_f4658 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f4689: - intensity $91 +.sub1: + volume_envelope 9, 1 octave 3 note F#, 2 note A_, 2 @@ -81,10 +83,10 @@ Music_GymLeaderVictory_branch_f4689: note B_, 2 note G_, 1 note D_, 1 - endchannel + sound_ret -Music_GymLeaderVictory_branch_f46a0: - intensity $87 +.sub2: + volume_envelope 8, 7 octave 3 note F#, 14 note D_, 1 @@ -111,12 +113,12 @@ Music_GymLeaderVictory_branch_f46a0: octave 4 note C#, 1 note E_, 8 - endchannel + sound_ret Music_GymLeaderVictory_Ch2: - vibrato $12, $34 - dutycycle $3 - notetype $c, $d7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 12, 13, 7 octave 4 note A_, 6 note F#, 1 @@ -128,51 +130,51 @@ Music_GymLeaderVictory_Ch2: octave 5 note D_, 1 note F#, 16 -Music_GymLeaderVictory_branch_f46d0: - dutycycle $3 - intensity $a1 - callchannel Music_GymLeaderVictory_branch_f4711 +.mainloop: + duty_cycle 3 + volume_envelope 10, 1 + sound_call .sub1 note A_, 4 note A_, 4 - callchannel Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note D_, 6 - dutycycle $2 + duty_cycle 2 note B_, 1 octave 5 note C#, 1 - callchannel Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note A_, 4 note A_, 4 - callchannel Music_GymLeaderVictory_branch_f4711 + sound_call .sub1 note D_, 8 - dutycycle $3 - callchannel Music_GymLeaderVictory_branch_f4720 + duty_cycle 3 + sound_call .sub2 note F#, 4 note E_, 4 note D_, 14 octave 4 note B_, 2 - intensity $a7 + volume_envelope 10, 7 note A_, 16 - dutycycle $2 - callchannel Music_GymLeaderVictory_branch_f4720 + duty_cycle 2 + sound_call .sub2 octave 4 note A_, 4 octave 5 note C#, 4 note D_, 14 note E_, 2 - intensity $a6 + volume_envelope 10, 6 note D_, 12 - note __, 2 - dutycycle $3 + rest 2 + duty_cycle 3 octave 4 note B_, 1 octave 5 note C#, 1 - loopchannel 0, Music_GymLeaderVictory_branch_f46d0 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f4711: +.sub1: octave 5 note D_, 2 note C#, 2 @@ -187,10 +189,10 @@ Music_GymLeaderVictory_branch_f4711: note A_, 2 note G_, 2 note F#, 2 - endchannel + sound_ret -Music_GymLeaderVictory_branch_f4720: - intensity $98 +.sub2: + volume_envelope 9, 8 note A_, 6 note F#, 1 note A_, 1 @@ -211,10 +213,10 @@ Music_GymLeaderVictory_branch_f4720: octave 5 note C#, 8 note C#, 8 - endchannel + sound_ret Music_GymLeaderVictory_Ch3: - notetype $c, $25 + note_type 12, 2, 5 octave 3 note F#, 16 note D_, 10 @@ -223,106 +225,107 @@ Music_GymLeaderVictory_Ch3: note B_, 2 octave 3 note C#, 2 - stereopanning $f0 -Music_GymLeaderVictory_branch_f4744: + stereo_panning TRUE, FALSE +.mainloop: +.loop1: note D_, 2 - note __, 4 + rest 4 octave 2 note A_, 2 octave 3 note C#, 2 - note __, 4 + rest 4 octave 2 note A_, 2 note B_, 2 - note __, 4 + rest 4 note G_, 2 note A_, 2 - note __, 2 + rest 2 octave 3 note C#, 4 note D_, 2 - note __, 4 + rest 4 octave 2 note A_, 2 octave 3 note C#, 2 - note __, 4 + rest 4 octave 2 note A_, 2 note B_, 2 - note __, 4 + rest 4 note G_, 2 octave 3 note D_, 2 - note __, 6 - loopchannel 2, Music_GymLeaderVictory_branch_f4744 - callchannel Music_GymLeaderVictory_branch_f479e + rest 6 + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note D_, 2 - note __, 2 + rest 2 note D_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note F#, 2 note D_, 2 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note C#, 2 octave 2 note A_, 2 - callchannel Music_GymLeaderVictory_branch_f479e + sound_call .sub1 octave 3 note D_, 2 - note __, 2 + rest 2 note G_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note G_, 2 note E_, 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 note B_, 2 octave 3 note C#, 2 - loopchannel 0, Music_GymLeaderVictory_branch_f4744 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f479e: +.sub1: octave 3 note D_, 2 - note __, 2 + rest 2 note D_, 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 note F#, 2 note D_, 2 note A_, 2 - note __, 2 + rest 2 note D_, 2 note F#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 @@ -331,20 +334,20 @@ Music_GymLeaderVictory_branch_f479e: note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 octave 4 note E_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 note G#, 2 note E_, 2 note B_, 2 - note __, 2 + rest 2 note E_, 2 note G#, 2 - note __, 2 + rest 2 octave 2 note B_, 2 octave 3 @@ -352,11 +355,11 @@ Music_GymLeaderVictory_branch_f479e: octave 2 note B_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 @@ -365,55 +368,56 @@ Music_GymLeaderVictory_branch_f479e: note A_, 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 octave 3 note C#, 2 octave 2 note A_, 2 - endchannel + sound_ret Music_GymLeaderVictory_Ch4: - togglenoise $4 - notetype $c - note B_, 16 - note B_, 16 -Music_GymLeaderVictory_branch_f47eb: - callchannel Music_GymLeaderVictory_branch_f480b - note D#, 6 - note D#, 2 - note D#, 8 - callchannel Music_GymLeaderVictory_branch_f480b - note D#, 6 - note D#, 2 - note D#, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 -Music_GymLeaderVictory_branch_f47fb: - note D#, 2 - note G_, 2 - note D_, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note D_, 2 - note G_, 2 - loopchannel 16, Music_GymLeaderVictory_branch_f47fb - loopchannel 0, Music_GymLeaderVictory_branch_f47eb + toggle_noise 4 + drum_speed 12 + drum_note 12, 16 + drum_note 12, 16 +.mainloop: + sound_call .sub1 + drum_note 4, 6 + drum_note 4, 2 + drum_note 4, 8 + sound_call .sub1 + drum_note 4, 6 + drum_note 4, 2 + drum_note 4, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 +.loop1: + drum_note 4, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 8, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 8, 2 + sound_loop 16, .loop1 + sound_loop 0, .mainloop -Music_GymLeaderVictory_branch_f480b: - note D#, 6 - note D#, 2 - note D#, 4 - note D_, 2 - note D#, 2 - loopchannel 3, Music_GymLeaderVictory_branch_f480b - endchannel +.sub1: +.sub1loop1: + drum_note 4, 6 + drum_note 4, 2 + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 2 + sound_loop 3, .sub1loop1 + sound_ret diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm index 2f4c444d..1786773d 100644 --- a/audio/music/halloffame.asm +++ b/audio/music/halloffame.asm @@ -1,56 +1,58 @@ 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 + channel_count 4 + channel 1, Music_HallOfFame_Ch1 + channel 2, Music_HallOfFame_Ch2 + channel 3, Music_HallOfFame_Ch3 + channel 4, Music_HallOfFame_Ch4 Music_HallOfFame_Ch1: tempo 112 - volume $77 - dutycycle $2 - vibrato $c, $22 - tone $0001 - stereopanning $f0 - notetype $c, $93 - note __, 16 - note __, 16 - note __, 16 - note __, 12 + volume 7, 7 + duty_cycle 2 + vibrato 12, 2, 2 + pitch_offset 1 + stereo_panning TRUE, FALSE + note_type 12, 9, 3 + rest 16 + rest 16 + rest 16 + rest 12 octave 3 note D_, 1 note E_, 1 note F_, 1 note F#, 1 -Music_HallOfFame_branch_f05e6: - intensity $97 +.mainloop: +.loop1: + volume_envelope 9, 7 octave 4 note C_, 8 - intensity $77 + volume_envelope 7, 7 note C_, 8 - intensity $97 + volume_envelope 9, 7 note E_, 8 - intensity $77 + volume_envelope 7, 7 note E_, 8 - intensity $97 + volume_envelope 9, 7 note F#, 8 - intensity $77 + volume_envelope 7, 7 note F#, 8 - intensity $77 + volume_envelope 7, 7 note F_, 8 - intensity $57 + volume_envelope 5, 7 note F_, 8 - loopchannel 3, Music_HallOfFame_branch_f05e6 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - loopchannel 0, Music_HallOfFame_branch_f05e6 + sound_loop 3, .loop1 + rest 16 + rest 16 + rest 16 + rest 16 + sound_loop 0, .mainloop Music_HallOfFame_Ch2: - vibrato $8, $25 - dutycycle $3 -Music_HallOfFame_branch_f0610: - notetype $c, $c4 + vibrato 8, 2, 5 + duty_cycle 3 +.mainloop: + note_type 12, 12, 4 octave 3 note G_, 2 note D_, 2 @@ -74,12 +76,12 @@ Music_HallOfFame_branch_f0610: note A#, 4 note A_, 4 note F_, 2 - loopchannel 0, Music_HallOfFame_branch_f0610 + sound_loop 0, .mainloop Music_HallOfFame_Ch3: -Music_HallOfFame_branch_f062e: - notetype $c, $28 -Music_HallOfFame_branch_f0631: +.mainloop: + note_type 12, 2, 8 +.loop1: octave 3 note D_, 2 note G_, 2 @@ -116,7 +118,7 @@ Music_HallOfFame_branch_f0631: note F_, 2 note C_, 2 note F_, 2 - loopchannel 3, Music_HallOfFame_branch_f0631 + sound_loop 3, .loop1 note D_, 4 note G_, 4 note D_, 4 @@ -133,40 +135,40 @@ Music_HallOfFame_branch_f0631: note G_, 4 note E_, 4 note G_, 4 - loopchannel 0, Music_HallOfFame_branch_f062e + sound_loop 0, .mainloop Music_HallOfFame_Ch4: - togglenoise $5 - notetype $c - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype $6 -Music_HallOfFame_branch_f0677: - stereopanning $f - note A#, 4 - note A#, 8 - note A#, 4 - note A#, 4 - note A#, 4 - stereopanning $f0 - note A_, 2 - note A_, 2 - note A#, 2 - note A#, 2 - note A#, 4 - note A#, 4 - note A#, 8 - note A#, 4 - note A#, 4 - stereopanning $f - note A#, 1 - note A#, 1 - note A_, 1 - note A_, 1 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - loopchannel 0, Music_HallOfFame_branch_f0677 + toggle_noise 5 + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 16 + drum_speed 6 +.mainloop: + stereo_panning FALSE, TRUE + drum_note 11, 4 + drum_note 11, 8 + drum_note 11, 4 + drum_note 11, 4 + drum_note 11, 4 + stereo_panning TRUE, FALSE + drum_note 10, 2 + drum_note 10, 2 + drum_note 11, 2 + drum_note 11, 2 + drum_note 11, 4 + drum_note 11, 4 + drum_note 11, 8 + drum_note 11, 4 + drum_note 11, 4 + stereo_panning FALSE, TRUE + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + drum_note 11, 1 + sound_loop 0, .mainloop diff --git a/audio/music/healpokemon.asm b/audio/music/healpokemon.asm index 6de58bc5..0a5130bd 100644 --- a/audio/music/healpokemon.asm +++ b/audio/music/healpokemon.asm @@ -1,50 +1,51 @@ Music_HealPokemon: - musicheader 3, 1, Music_HealPokemon_Ch1 - musicheader 1, 2, Music_HealPokemon_Ch2 - musicheader 1, 3, Music_HealPokemon_Ch3 + channel_count 3 + channel 1, Music_HealPokemon_Ch1 + channel 2, Music_HealPokemon_Ch2 + channel 3, Music_HealPokemon_Ch3 Music_HealPokemon_Ch1: tempo 144 - volume $77 - dutycycle $2 - tone $0001 - notetype $c, $81 - note __, 2 - slidepitchto 1, 4, __ + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + note_type 12, 8, 1 + rest 2 + pitch_slide 1, 4, B_ note B_, 2 - slidepitchto 1, 5, E_ + pitch_slide 1, 3, E_ note B_, 2 - slidepitchto 1, 4, E_ + pitch_slide 1, 4, E_ note E_, 2 - note __, 4 - slidepitchto 1, 3, __ + rest 4 + pitch_slide 1, 5, B_ note E_, 4 - slidepitchto 1, 4, __ + pitch_slide 1, 4, B_ note B_, 4 - endchannel + sound_ret Music_HealPokemon_Ch2: - dutycycle $2 - notetype $c, $c3 + duty_cycle 2 + note_type 12, 12, 3 octave 4 note B_, 4 note B_, 4 note B_, 2 note G#, 2 - notetype $c, $c4 + note_type 12, 12, 4 octave 5 note E_, 8 - endchannel + sound_ret Music_HealPokemon_Ch3: - notetype $c, $10 + note_type 12, 1, 0 octave 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note G#, 2 note E_, 6 - note __, 2 - endchannel + rest 2 + sound_ret diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm index b56f1b38..371b970d 100644 --- a/audio/music/indigoplateau.asm +++ b/audio/music/indigoplateau.asm @@ -1,34 +1,35 @@ 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 + channel_count 4 + channel 1, Music_IndigoPlateau_Ch1 + channel 2, Music_IndigoPlateau_Ch2 + channel 3, Music_IndigoPlateau_Ch3 + channel 4, Music_IndigoPlateau_Ch4 Music_IndigoPlateau_Ch1: tempo 128 - volume $77 - dutycycle $3 - tone $0002 - stereopanning $f -Music_IndigoPlateau_branch_ee86a: - callchannel Music_IndigoPlateau_branch_ee881 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + stereo_panning FALSE, TRUE +.mainloop: + sound_call .sub1 octave 3 note D_, 4 - callchannel Music_IndigoPlateau_branch_ee881 + sound_call .sub1 octave 3 note D#, 4 - callchannel Music_IndigoPlateau_branch_ee881 + sound_call .sub1 octave 3 note D#, 4 - callchannel Music_IndigoPlateau_branch_ee881 + sound_call .sub1 note A#, 4 - loopchannel 0, Music_IndigoPlateau_branch_ee86a + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee881: - notetype $c, $b6 +.sub1: + note_type 12, 11, 6 octave 2 note A_, 4 - intensity $b2 + volume_envelope 11, 2 note A_, 2 note A_, 2 note A_, 2 @@ -36,44 +37,44 @@ Music_IndigoPlateau_branch_ee881: note A_, 4 note A_, 2 note A_, 2 - intensity $a0 - endchannel + volume_envelope 10, 0 + sound_ret Music_IndigoPlateau_Ch2: - dutycycle $3 - vibrato $10, $22 - stereopanning $f0 -Music_IndigoPlateau_branch_ee899: - callchannel Music_IndigoPlateau_branch_ee8e9 + duty_cycle 3 + vibrato 16, 2, 2 + stereo_panning TRUE, FALSE +.mainloop: + sound_call .sub1 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 - intensity $c7 + volume_envelope 12, 7 note A_, 6 note D_, 2 note G_, 2 note A#, 2 note A_, 8 - intensity $b0 + volume_envelope 11, 0 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 6 note D#, 2 note C_, 4 note D_, 8 - intensity $b0 + volume_envelope 11, 0 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 6 octave 3 @@ -81,28 +82,28 @@ Music_IndigoPlateau_branch_ee899: note A_, 2 note G_, 2 note F#, 8 - intensity $b0 + volume_envelope 11, 0 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note A#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 6 note D#, 2 note F_, 4 note F#, 8 - intensity $b0 + volume_envelope 11, 0 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee8e9 + sound_call .sub1 note C#, 4 - loopchannel 0, Music_IndigoPlateau_branch_ee899 + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee8e9: - notetype $c, $c6 +.sub1: + note_type 12, 12, 6 octave 3 note D_, 4 - intensity $c2 + volume_envelope 12, 2 note D_, 2 note D_, 2 note D_, 2 @@ -110,73 +111,73 @@ Music_IndigoPlateau_branch_ee8e9: note D_, 4 note D_, 2 note D_, 2 - intensity $b0 - endchannel + volume_envelope 11, 0 + sound_ret Music_IndigoPlateau_Ch3: - notetype $c, $19 -Music_IndigoPlateau_branch_ee8fd: - callchannel Music_IndigoPlateau_branch_ee915 + note_type 12, 1, -1 +.mainloop: + sound_call .sub1 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note A_, 4 - callchannel Music_IndigoPlateau_branch_ee915 + sound_call .sub1 octave 3 note F#, 4 - loopchannel 0, Music_IndigoPlateau_branch_ee8fd + sound_loop 0, .mainloop -Music_IndigoPlateau_branch_ee915: +.sub1: octave 3 note D_, 1 - note __, 3 + rest 3 octave 2 note A_, 1 - note __, 3 + rest 3 octave 3 note C_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 octave 2 note A_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_IndigoPlateau_Ch4: - stereopanning $f0 - togglenoise $0 - notetype $c -Music_IndigoPlateau_branch_ee92a: - note D#, 4 - note D_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D_, 4 - note D_, 2 - note D_, 2 - notetype $6 - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - notetype $c - note D#, 4 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note C#, 4 - note D_, 2 - note D_, 2 - note C#, 4 - loopchannel 0, Music_IndigoPlateau_branch_ee92a + stereo_panning TRUE, FALSE + toggle_noise 0 + drum_speed 12 +.mainloop: + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 2, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 4 + sound_loop 0, .mainloop diff --git a/audio/music/johtogymbattle.asm b/audio/music/johtogymbattle.asm index 2b6e82f0..fadf4d83 100644 --- a/audio/music/johtogymbattle.asm +++ b/audio/music/johtogymbattle.asm @@ -1,33 +1,34 @@ Music_JohtoGymBattle: - musicheader 3, 1, Music_JohtoGymBattle_Ch1 - musicheader 1, 2, Music_JohtoGymBattle_Ch2 - musicheader 1, 3, Music_JohtoGymBattle_Ch3 + channel_count 3 + channel 1, Music_JohtoGymBattle_Ch1 + channel 2, Music_JohtoGymBattle_Ch2 + channel 3, Music_JohtoGymBattle_Ch3 Music_JohtoGymBattle_Ch1: tempo 101 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b2 -Music_JohtoGymBattle_branch_ea526: + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 11, 2 +.loop1: octave 3 note A#, 1 note A_, 1 note G#, 1 note A_, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea526 -Music_JohtoGymBattle_branch_ea52f: + sound_loop 4, .loop1 +.loop2: note C#, 1 note C_, 1 octave 2 note A#, 1 octave 3 note C_, 1 - loopchannel 3, Music_JohtoGymBattle_branch_ea52f - intensity $4b + sound_loop 3, .loop2 + volume_envelope 4, -3 note C#, 4 - intensity $b2 + volume_envelope 11, 2 note D_, 6 note D#, 6 note C_, 4 @@ -39,9 +40,9 @@ Music_JohtoGymBattle_branch_ea52f: note C_, 4 note F_, 6 note G_, 6 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $b2 + volume_envelope 11, 2 note G_, 6 note G#, 6 note F_, 4 @@ -57,8 +58,8 @@ Music_JohtoGymBattle_branch_ea52f: octave 3 note G#, 2 note F_, 2 -Music_JohtoGymBattle_branch_ea55d: - intensity $b5 +.mainloop: + volume_envelope 11, 5 note D_, 6 note G_, 6 note F_, 2 @@ -67,16 +68,16 @@ Music_JohtoGymBattle_branch_ea55d: note G_, 4 note F_, 4 note G_, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 12 - intensity $b2 + volume_envelope 11, 2 note G_, 4 - intensity $b7 + volume_envelope 11, 7 octave 4 note C#, 12 - intensity $b2 + volume_envelope 11, 2 note C_, 4 - intensity $b5 + volume_envelope 11, 5 octave 3 note D_, 6 note G_, 6 @@ -86,42 +87,42 @@ Music_JohtoGymBattle_branch_ea55d: note G_, 4 note F_, 4 note G_, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 8 note G_, 8 note F_, 8 note D#, 8 - intensity $70 + volume_envelope 7, 0 note C_, 8 - intensity $77 + volume_envelope 7, 7 note C_, 8 - intensity $b4 + volume_envelope 11, 4 note D#, 2 note E_, 2 note F_, 6 note G_, 2 note D#, 4 - intensity $77 + volume_envelope 7, 7 octave 2 note A#, 8 note A#, 8 - intensity $c5 + volume_envelope 12, 5 octave 3 note G_, 2 note G#, 2 note A#, 6 note A#, 2 note G#, 4 - intensity $c7 + volume_envelope 12, 7 note G_, 8 note F_, 4 note E_, 2 note C#, 2 - intensity $a0 + volume_envelope 10, 0 note C_, 8 - intensity $a7 + volume_envelope 10, 7 note C_, 8 - intensity $b2 + volume_envelope 11, 2 note F_, 6 note F_, 4 note E_, 2 @@ -174,24 +175,24 @@ Music_JohtoGymBattle_branch_ea55d: note D#, 6 note D#, 6 note D#, 4 - intensity $80 + volume_envelope 8, 0 note G_, 16 - intensity $90 + volume_envelope 9, 0 note G#, 16 - intensity $a0 + volume_envelope 10, 0 note A_, 8 note A#, 2 note A_, 2 note G#, 2 note A_, 2 - intensity $b0 + volume_envelope 11, 0 note A#, 8 note B_, 2 note A#, 2 note A_, 2 octave 4 note C#, 2 - intensity $b7 + volume_envelope 11, 7 note C_, 8 note C#, 4 note C_, 4 @@ -251,7 +252,7 @@ Music_JohtoGymBattle_branch_ea55d: note A_, 8 note G#, 8 note F#, 8 - intensity $b4 + volume_envelope 11, 4 note A_, 4 octave 4 note C#, 4 @@ -259,51 +260,51 @@ Music_JohtoGymBattle_branch_ea55d: note B_, 4 octave 4 note E_, 4 - intensity $92 + volume_envelope 9, 2 note D#, 2 note D#, 2 note D#, 2 note D#, 2 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 note D#, 2 note D#, 2 - intensity $c2 + volume_envelope 12, 2 note D#, 16 - intensity $50 + volume_envelope 5, 0 octave 3 note C_, 16 note F_, 16 note E_, 16 - intensity $97 + volume_envelope 9, 7 note D#, 10 - intensity $b4 + volume_envelope 11, 4 octave 2 note A#, 2 octave 3 note D#, 2 note F#, 2 - loopchannel 0, Music_JohtoGymBattle_branch_ea55d + sound_loop 0, .mainloop Music_JohtoGymBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 -Music_JohtoGymBattle_branch_ea66a: + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 +.loop1: octave 4 note F#, 1 note F_, 1 note E_, 1 note A#, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea66a -Music_JohtoGymBattle_branch_ea673: + sound_loop 4, .loop1 +.loop2: note F#, 1 note F_, 1 note F#, 1 note A#, 1 - loopchannel 4, Music_JohtoGymBattle_branch_ea673 + sound_loop 4, .loop2 note A_, 6 octave 3 note A#, 6 @@ -319,86 +320,86 @@ Music_JohtoGymBattle_branch_ea673: octave 4 note D_, 6 note D#, 6 - intensity $b0 + volume_envelope 11, 0 octave 3 note D#, 4 - intensity $c2 + volume_envelope 12, 2 octave 4 note D_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 4 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note C_, 4 note G_, 2 - notetype $c, $92 + note_type 12, 9, 2 octave 3 note D_, 2 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D_, 4 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note D#, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 4 - intensity $92 + volume_envelope 9, 2 octave 3 note D_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note C_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note D#, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note G_, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note F_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note G#, 2 - intensity $92 + volume_envelope 9, 2 octave 3 note F_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note F#, 2 - intensity $b2 + volume_envelope 11, 2 octave 3 note G#, 1 note A_, 1 -Music_JohtoGymBattle_branch_ea6ee: - intensity $c7 +.mainloop: + volume_envelope 12, 7 note A#, 8 - intensity $c4 + volume_envelope 12, 4 octave 4 note D_, 2 note C_, 2 @@ -406,29 +407,29 @@ Music_JohtoGymBattle_branch_ea6ee: note A#, 2 octave 4 note C_, 2 - intensity $c7 + volume_envelope 12, 7 note C#, 8 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note D#, 2 note C#, 2 note D#, 2 - intensity $b0 + volume_envelope 11, 0 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note F_, 6 - intensity $c2 + volume_envelope 12, 2 note D#, 4 - intensity $b0 + volume_envelope 11, 0 note G#, 6 - intensity $b7 + volume_envelope 11, 7 note G#, 6 - intensity $c2 + volume_envelope 12, 2 note F_, 4 - intensity $c7 + volume_envelope 12, 7 octave 3 note A#, 8 - intensity $c4 + volume_envelope 12, 4 octave 4 note D_, 2 note C_, 2 @@ -436,48 +437,48 @@ Music_JohtoGymBattle_branch_ea6ee: note A#, 2 octave 4 note C_, 2 - intensity $c7 + volume_envelope 12, 7 note C#, 8 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note D#, 2 note C#, 2 note D#, 2 - intensity $b0 + volume_envelope 11, 0 note C#, 16 - intensity $b7 + volume_envelope 11, 7 note C#, 16 - intensity $a4 + volume_envelope 10, 4 octave 3 note F_, 6 note D#, 6 note F_, 4 - intensity $c6 + volume_envelope 12, 6 octave 4 note C_, 6 octave 3 note A#, 6 octave 4 note C_, 4 - intensity $a4 + volume_envelope 10, 4 octave 3 note C#, 6 note C_, 6 note C#, 4 - intensity $c6 + volume_envelope 12, 6 octave 4 note C#, 6 note C_, 6 note C#, 4 - intensity $3c + volume_envelope 3, -4 note C_, 10 - intensity $b7 + volume_envelope 11, 7 note C_, 6 - intensity $b0 + volume_envelope 11, 0 note E_, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 8 - intensity $b0 + volume_envelope 11, 0 octave 3 note C#, 16 octave 2 @@ -487,27 +488,27 @@ Music_JohtoGymBattle_branch_ea6ee: note D#, 2 note C_, 16 note E_, 16 - intensity $a0 + volume_envelope 10, 0 octave 5 note C#, 4 - intensity $a7 + volume_envelope 10, 7 octave 5 note C#, 12 - intensity $b7 + volume_envelope 11, 7 octave 4 note A#, 8 octave 5 note C#, 6 note D#, 2 - intensity $a0 + volume_envelope 10, 0 note C_, 8 - intensity $a7 + volume_envelope 10, 7 note C_, 8 - intensity $3e + volume_envelope 3, -6 note E_, 6 - intensity $a6 + volume_envelope 10, 6 note E_, 10 - intensity $c2 + volume_envelope 12, 2 octave 3 note F_, 6 note F_, 6 @@ -521,21 +522,21 @@ Music_JohtoGymBattle_branch_ea6ee: note G#, 6 note G#, 6 note G#, 4 - intensity $90 + volume_envelope 9, 0 octave 4 note C_, 16 - intensity $a0 + volume_envelope 10, 0 note C#, 16 - intensity $b0 + volume_envelope 11, 0 note D_, 16 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $4c + volume_envelope 4, -4 note D#, 6 - intensity $c2 + volume_envelope 12, 2 note F#, 1 note G_, 1 - intensity $c7 + volume_envelope 12, 7 note G#, 8 note A_, 2 note G#, 2 @@ -596,13 +597,13 @@ Music_JohtoGymBattle_branch_ea6ee: note G#, 4 note E_, 4 note A_, 4 - intensity $c0 + volume_envelope 12, 0 note G#, 8 - intensity $c7 + volume_envelope 12, 7 note G#, 8 - intensity $c2 + volume_envelope 12, 2 note G#, 16 - intensity $80 + volume_envelope 8, 0 octave 3 note F_, 16 octave 4 @@ -610,44 +611,44 @@ Music_JohtoGymBattle_branch_ea6ee: octave 3 note B_, 16 note G_, 16 - loopchannel 0, Music_JohtoGymBattle_branch_ea6ee + sound_loop 0, .mainloop Music_JohtoGymBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note G#, 2 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note G_, 2 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note F#, 2 octave 4 note G#, 1 - note __, 1 + rest 1 octave 3 note F_, 2 octave 4 note G#, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note F_, 2 note G_, 2 note G#, 4 - callchannel Music_JohtoGymBattle_branch_ea952 + sound_call .sub1 note G_, 2 note D_, 2 note F_, 2 @@ -663,7 +664,7 @@ Music_JohtoGymBattle_Ch3: note G#, 2 note D#, 2 note F#, 4 - callchannel Music_JohtoGymBattle_branch_ea952 + sound_call .sub1 note G_, 2 note D_, 2 note F_, 2 @@ -682,10 +683,10 @@ Music_JohtoGymBattle_Ch3: octave 3 note A#, 2 note G#, 2 -Music_JohtoGymBattle_branch_ea83f: - callchannel Music_JohtoGymBattle_branch_ea963 - callchannel Music_JohtoGymBattle_branch_ea963 - callchannel Music_JohtoGymBattle_branch_ea96a +.mainloop: + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 note C#, 2 note G#, 2 note C#, 2 @@ -694,7 +695,7 @@ Music_JohtoGymBattle_branch_ea83f: note A#, 2 note A_, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea963 + sound_call .sub2 note D_, 2 note G_, 2 note D_, 2 @@ -703,8 +704,8 @@ Music_JohtoGymBattle_branch_ea83f: note G_, 2 note G#, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea96a - callchannel Music_JohtoGymBattle_branch_ea96a + sound_call .sub3 + sound_call .sub3 note C_, 2 note G_, 2 note A#, 2 @@ -713,14 +714,14 @@ Music_JohtoGymBattle_branch_ea83f: note F_, 2 note G_, 2 note A#, 2 - callchannel Music_JohtoGymBattle_branch_ea971 - callchannel Music_JohtoGymBattle_branch_ea96a - callchannel Music_JohtoGymBattle_branch_ea978 + sound_call .sub4 + sound_call .sub3 + sound_call .sub5 octave 3 note G_, 2 note G#, 2 note F_, 2 - callchannel Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -729,13 +730,13 @@ Music_JohtoGymBattle_branch_ea83f: note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea96a - callchannel Music_JohtoGymBattle_branch_ea978 + sound_call .sub3 + sound_call .sub5 octave 3 note C_, 2 note C#, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -744,15 +745,15 @@ Music_JohtoGymBattle_branch_ea83f: note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea96a - callchannel Music_JohtoGymBattle_branch_ea978 + sound_call .sub3 + sound_call .sub5 octave 3 note F_, 2 octave 2 note A#, 2 octave 3 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea971 + sound_call .sub4 note C_, 2 note G_, 2 note C_, 2 @@ -763,13 +764,13 @@ Music_JohtoGymBattle_branch_ea83f: note G_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea983 - note __, 2 - callchannel Music_JohtoGymBattle_branch_ea990 + sound_call .sub6 + rest 2 + sound_call .sub7 octave 4 note C#, 2 - callchannel Music_JohtoGymBattle_branch_ea99c - note __, 2 + sound_call .sub8 + rest 2 note D#, 2 note A#, 2 octave 4 @@ -783,11 +784,11 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 octave 4 note D#, 2 - callchannel Music_JohtoGymBattle_branch_ea983 + sound_call .sub6 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea990 + sound_call .sub7 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea99c + sound_call .sub8 note A_, 2 octave 4 note D#, 2 @@ -801,7 +802,7 @@ Music_JohtoGymBattle_branch_ea83f: octave 4 note D#, 2 note D_, 4 - callchannel Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -812,7 +813,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note D#, 2 note G#, 2 - callchannel Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -821,7 +822,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note G#, 2 note F#, 2 - callchannel Music_JohtoGymBattle_branch_ea9b1 + sound_call .sub10 note C#, 2 note F#, 2 note C#, 2 @@ -832,7 +833,7 @@ Music_JohtoGymBattle_branch_ea83f: note A_, 2 note C#, 2 note G_, 2 - callchannel Music_JohtoGymBattle_branch_ea9b1 + sound_call .sub10 note C#, 2 note F#, 2 note C#, 2 @@ -841,7 +842,7 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 note E_, 2 note A_, 2 - callchannel Music_JohtoGymBattle_branch_ea9a9 + sound_call .sub9 note D#, 2 note G#, 2 note D#, 2 @@ -878,7 +879,7 @@ Music_JohtoGymBattle_branch_ea83f: note F#, 2 note E_, 2 note F#, 2 - callchannel Music_JohtoGymBattle_branch_ea9b8 + sound_call .sub11 note F_, 2 note C_, 2 note D#, 2 @@ -887,7 +888,7 @@ Music_JohtoGymBattle_branch_ea83f: note D#, 2 note C#, 2 note D#, 2 - callchannel Music_JohtoGymBattle_branch_ea9b8 + sound_call .sub11 note F_, 2 note C_, 2 note D#, 2 @@ -896,9 +897,9 @@ Music_JohtoGymBattle_branch_ea83f: note F#, 2 note F_, 2 note D#, 2 - loopchannel 0, Music_JohtoGymBattle_branch_ea83f + sound_loop 0, .mainloop -Music_JohtoGymBattle_branch_ea952: +.sub1: note G_, 2 note D_, 2 note F_, 2 @@ -915,27 +916,30 @@ Music_JohtoGymBattle_branch_ea952: note F_, 2 note D#, 2 note F_, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea963: +.sub2: +.sub2loop1: note D_, 2 note G_, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea963 - endchannel + sound_loop 4, .sub2loop1 + sound_ret -Music_JohtoGymBattle_branch_ea96a: +.sub3: +.sub3loop1: note C#, 2 note G#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea96a - endchannel + sound_loop 4, .sub3loop1 + sound_ret -Music_JohtoGymBattle_branch_ea971: +.sub4: +.sub4loop1: note C_, 2 note G_, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea971 - endchannel + sound_loop 4, .sub4loop1 + sound_ret -Music_JohtoGymBattle_branch_ea978: +.sub5: octave 2 note A#, 2 octave 3 @@ -946,9 +950,9 @@ Music_JohtoGymBattle_branch_ea978: note F_, 2 octave 2 note A#, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea983: +.sub6: octave 3 note C_, 2 note G_, 2 @@ -961,9 +965,9 @@ Music_JohtoGymBattle_branch_ea983: note C_, 2 octave 3 note C_, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea990: +.sub7: note C#, 2 note G#, 2 octave 4 @@ -975,9 +979,9 @@ Music_JohtoGymBattle_branch_ea990: note C#, 2 octave 3 note C#, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea99c: +.sub8: octave 3 note D_, 2 note A_, 2 @@ -990,22 +994,24 @@ Music_JohtoGymBattle_branch_ea99c: note D_, 2 octave 3 note D_, 2 - endchannel + sound_ret -Music_JohtoGymBattle_branch_ea9a9: +.sub9: +.sub9loop1: octave 3 note D#, 2 note G#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea9a9 - endchannel + sound_loop 4, .sub9loop1 + sound_ret -Music_JohtoGymBattle_branch_ea9b1: +.sub10: +.sub10loop1: note C#, 2 note F#, 2 - loopchannel 4, Music_JohtoGymBattle_branch_ea9b1 - endchannel + sound_loop 4, .sub10loop1 + sound_ret -Music_JohtoGymBattle_branch_ea9b8: +.sub11: note F_, 2 note C_, 2 note D#, 2 @@ -1014,4 +1020,4 @@ Music_JohtoGymBattle_branch_ea9b8: note F#, 2 note F_, 2 note D#, 2 - endchannel + sound_ret diff --git a/audio/music/johtotrainerbattle.asm b/audio/music/johtotrainerbattle.asm index c235410a..cb512bcb 100644 --- a/audio/music/johtotrainerbattle.asm +++ b/audio/music/johtotrainerbattle.asm @@ -1,22 +1,23 @@ Music_JohtoTrainerBattle: - musicheader 3, 1, Music_JohtoTrainerBattle_Ch1 - musicheader 1, 2, Music_JohtoTrainerBattle_Ch2 - musicheader 1, 3, Music_JohtoTrainerBattle_Ch3 + channel_count 3 + channel 1, Music_JohtoTrainerBattle_Ch1 + channel 2, Music_JohtoTrainerBattle_Ch2 + channel 3, Music_JohtoTrainerBattle_Ch3 Music_JohtoTrainerBattle_Ch1: tempo 102 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $92 - note __, 8 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 9, 2 + rest 8 octave 3 note A_, 1 note G#, 1 note G_, 1 note G#, 1 - intensity $b2 + volume_envelope 11, 2 note C_, 1 octave 2 note B_, 1 @@ -48,9 +49,9 @@ Music_JohtoTrainerBattle_Ch1: note D_, 2 note E_, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note D_, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 6 note D_, 6 note E_, 4 @@ -58,9 +59,9 @@ Music_JohtoTrainerBattle_Ch1: note D_, 2 note E_, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - intensity $b2 + volume_envelope 11, 2 octave 4 note E_, 6 note E_, 6 @@ -72,9 +73,9 @@ Music_JohtoTrainerBattle_Ch1: octave 3 note A_, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 note B_, 4 - intensity $b2 + volume_envelope 11, 2 octave 4 note E_, 6 note E_, 6 @@ -83,44 +84,44 @@ Music_JohtoTrainerBattle_Ch1: note D_, 2 note E_, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note G_, 4 -Music_JohtoTrainerBattle_branch_f6102: - intensity $b4 - callchannel Music_JohtoTrainerBattle_branch_f629f - intensity $b7 +.mainloop: + volume_envelope 11, 4 + sound_call .sub1 + volume_envelope 11, 7 note A#, 4 - intensity $b3 + volume_envelope 11, 3 note G_, 1 note F_, 1 note E_, 1 note G_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note C_, 4 - intensity $b3 + volume_envelope 11, 3 octave 3 note A_, 1 note G_, 1 note F_, 1 note A_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note C_, 1 octave 3 note A#, 1 note A_, 1 octave 4 note C_, 1 - intensity $b5 + volume_envelope 11, 5 note F_, 2 note E_, 2 note D_, 2 note C_, 2 - callchannel Music_JohtoTrainerBattle_branch_f629f - intensity $b7 + sound_call .sub1 + volume_envelope 11, 7 note F_, 4 note E_, 2 note F_, 2 @@ -130,12 +131,12 @@ Music_JohtoTrainerBattle_branch_f6102: note A#, 2 octave 4 note C_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note A_, 6 note E_, 6 note A#, 4 @@ -154,11 +155,11 @@ Music_JohtoTrainerBattle_branch_f6102: note A#, 2 note A_, 2 note A#, 2 - intensity $a0 + volume_envelope 10, 0 note A_, 8 - intensity $a7 + volume_envelope 10, 7 note A_, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 8 note D_, 8 note E_, 8 @@ -179,7 +180,7 @@ Music_JohtoTrainerBattle_branch_f6102: note D#, 8 note E_, 8 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 2 octave 4 note C_, 2 @@ -200,34 +201,34 @@ Music_JohtoTrainerBattle_branch_f6102: note C_, 2 octave 3 note A#, 2 - intensity $b5 + volume_envelope 11, 5 note D#, 2 note D_, 2 - intensity $b2 + volume_envelope 11, 2 note D#, 4 - intensity $b7 + volume_envelope 11, 7 note C_, 8 note D#, 4 note C#, 4 note C_, 4 note D#, 4 - intensity $b5 + volume_envelope 11, 5 note E_, 2 note D#, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 8 note F_, 4 note D#, 4 note C#, 4 note F_, 4 - intensity $b5 + volume_envelope 11, 5 note F#, 2 note F_, 2 - intensity $b2 + volume_envelope 11, 2 note F#, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 8 note F#, 4 note E_, 4 @@ -237,15 +238,15 @@ Music_JohtoTrainerBattle_branch_f6102: note D#, 8 note A#, 8 note G_, 8 - intensity $a0 + volume_envelope 10, 0 note D#, 4 - intensity $a7 + volume_envelope 10, 7 note D#, 12 - note __, 16 -Music_JohtoTrainerBattle_branch_f61bd: - intensity $b7 + rest 16 +.loop1: + volume_envelope 11, 7 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 4 note D#, 4 note F_, 4 @@ -254,10 +255,10 @@ Music_JohtoTrainerBattle_branch_f61bd: note F_, 4 octave 2 note A#, 4 - intensity $b7 + volume_envelope 11, 7 octave 3 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 4 note D#, 4 note F_, 4 @@ -265,60 +266,60 @@ Music_JohtoTrainerBattle_branch_f61bd: note D#, 2 note F_, 4 note F_, 4 - loopchannel 2, Music_JohtoTrainerBattle_branch_f61bd - intensity $b7 + sound_loop 2, .loop1 + volume_envelope 11, 7 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note G_, 4 note D#, 4 note F_, 4 note G#, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 note F_, 8 - intensity $b5 + volume_envelope 11, 5 note G_, 4 note D#, 4 note F_, 4 note G_, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 note F_, 8 - intensity $b5 + volume_envelope 11, 5 note G_, 4 note D#, 4 note F_, 4 note G_, 2 note D#, 2 - intensity $3f + volume_envelope 3, -7 note G#, 8 - intensity $b7 + volume_envelope 11, 7 note G#, 8 - intensity $a0 + volume_envelope 10, 0 octave 4 note C_, 8 - intensity $a7 + volume_envelope 10, 7 note C_, 8 - intensity $b2 + volume_envelope 11, 2 octave 3 note D#, 6 note D#, 6 note D#, 4 note D#, 6 note D#, 6 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - intensity $b2 + volume_envelope 11, 2 note D#, 6 note D#, 6 note D#, 4 note D#, 6 note D#, 6 - intensity $4c + volume_envelope 4, -4 note F_, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 6 note G_, 6 note F_, 4 @@ -365,7 +366,7 @@ Music_JohtoTrainerBattle_branch_f61bd: note G#, 4 note G_, 4 note F_, 4 - intensity $90 + volume_envelope 9, 0 octave 2 note A#, 8 octave 3 @@ -374,44 +375,44 @@ Music_JohtoTrainerBattle_branch_f61bd: note A#, 8 octave 3 note G_, 8 - intensity $a0 + volume_envelope 10, 0 note D#, 8 note A#, 8 note G_, 8 octave 4 note D#, 8 - intensity $a0 + volume_envelope 10, 0 octave 3 note A#, 8 - intensity $a7 + volume_envelope 10, 7 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note G_, 6 note A#, 6 note G#, 2 note G_, 2 - intensity $a0 + volume_envelope 10, 0 note D#, 8 - intensity $a7 + volume_envelope 10, 7 note D#, 8 - intensity $b4 + volume_envelope 11, 4 note A#, 6 note G_, 4 note G_, 2 note A#, 12 - note __, 16 - note __, 8 - intensity $a0 + rest 16 + rest 8 + volume_envelope 10, 0 octave 4 note D_, 4 - intensity $a7 + volume_envelope 10, 7 note D_, 12 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 8 - intensity $b3 - callchannel Music_JohtoTrainerBattle_branch_f629f + volume_envelope 11, 3 + sound_call .sub1 note F_, 4 note E_, 2 note F_, 2 @@ -421,14 +422,14 @@ Music_JohtoTrainerBattle_branch_f61bd: note A#, 2 octave 4 note C_, 2 - intensity $a0 + volume_envelope 10, 0 octave 3 note F_, 10 - intensity $a7 + volume_envelope 10, 7 note F_, 6 - loopchannel 0, Music_JohtoTrainerBattle_branch_f6102 + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f629f: +.sub1: octave 3 note E_, 2 note D_, 2 @@ -448,13 +449,13 @@ Music_JohtoTrainerBattle_branch_f629f: note E_, 2 note F_, 2 note D_, 2 - endchannel + sound_ret Music_JohtoTrainerBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 octave 4 note G#, 1 note G_, 1 @@ -493,65 +494,65 @@ Music_JohtoTrainerBattle_Ch2: note A#, 1 note A_, 1 note A#, 1 - intensity $c2 + volume_envelope 12, 2 octave 4 note A_, 6 - callchannel Music_JohtoTrainerBattle_branch_f649a - intensity $c2 + sound_call .sub1 + volume_envelope 12, 2 note A_, 6 - callchannel Music_JohtoTrainerBattle_branch_f649a - intensity $c2 + sound_call .sub1 + volume_envelope 12, 2 octave 5 note C_, 6 note C_, 6 note C_, 4 note C_, 6 note C_, 6 - intensity $c7 + volume_envelope 12, 7 note C#, 4 - intensity $c2 + volume_envelope 12, 2 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note E_, 2 note A_, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note E_, 2 note A_, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note E_, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note E_, 2 note B_, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 2 - intensity $a4 + volume_envelope 10, 4 octave 4 note C_, 2 note E_, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 4 -Music_JohtoTrainerBattle_branch_f632a: - callchannel Music_JohtoTrainerBattle_branch_f64a3 - intensity $3e +.mainloop: + sound_call .sub2 + volume_envelope 3, -6 note A#, 8 - intensity $c7 + volume_envelope 12, 7 note A#, 8 - callchannel Music_JohtoTrainerBattle_branch_f64a3 - intensity $c4 + sound_call .sub2 + volume_envelope 12, 4 note D_, 4 octave 3 note A#, 2 @@ -570,30 +571,30 @@ Music_JohtoTrainerBattle_branch_f632a: note A#, 2 octave 5 note D_, 2 - intensity $b0 + volume_envelope 11, 0 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note A#, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 16 - intensity $b7 + volume_envelope 11, 7 note A_, 16 -Music_JohtoTrainerBattle_branch_f635a: - intensity $c3 +.loop1: + volume_envelope 12, 3 octave 3 note A_, 2 note G_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - intensity $c3 + volume_envelope 12, 3 note A_, 2 note G_, 2 note A#, 2 - loopchannel 3, Music_JohtoTrainerBattle_branch_f635a + sound_loop 3, .loop1 note A_, 2 octave 4 note D_, 2 @@ -604,17 +605,17 @@ Music_JohtoTrainerBattle_branch_f635a: note G_, 2 note A_, 2 note A#, 2 -Music_JohtoTrainerBattle_branch_f6376: +.loop2: note G_, 2 note F_, 2 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note G#, 4 - intensity $c3 + volume_envelope 12, 3 note G_, 2 note F_, 2 note G#, 2 - loopchannel 3, Music_JohtoTrainerBattle_branch_f6376 + sound_loop 3, .loop2 note F_, 2 octave 4 note C_, 2 @@ -625,7 +626,7 @@ Music_JohtoTrainerBattle_branch_f6376: note F_, 2 note G_, 2 note G#, 2 - intensity $c7 + volume_envelope 12, 7 note G_, 6 octave 4 note D_, 6 @@ -635,15 +636,15 @@ Music_JohtoTrainerBattle_branch_f6376: note E_, 4 note D_, 4 note C_, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 10 - intensity $b7 + volume_envelope 11, 7 note D#, 6 - intensity $90 + volume_envelope 9, 0 note G_, 8 - intensity $97 + volume_envelope 9, 7 note G_, 8 - intensity $c7 + volume_envelope 12, 7 octave 3 note F_, 8 note D#, 4 @@ -666,23 +667,23 @@ Music_JohtoTrainerBattle_branch_f6376: note G#, 4 note F#, 4 note A_, 4 - intensity $b0 + volume_envelope 11, 0 note A#, 8 note A#, 8 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $62 - callchannel Music_JohtoTrainerBattle_branch_f64b6 - intensity $82 - callchannel Music_JohtoTrainerBattle_branch_f64b6 - intensity $92 - callchannel Music_JohtoTrainerBattle_branch_f64b6 - intensity $a2 - callchannel Music_JohtoTrainerBattle_branch_f64b6 -Music_JohtoTrainerBattle_branch_f63dd: + volume_envelope 6, 2 + sound_call .sub3 + volume_envelope 8, 2 + sound_call .sub3 + volume_envelope 9, 2 + sound_call .sub3 + volume_envelope 10, 2 + sound_call .sub3 +.loop3: octave 4 note D#, 2 octave 3 @@ -699,30 +700,30 @@ Music_JohtoTrainerBattle_branch_f63dd: note G_, 2 octave 3 note A#, 2 - loopchannel 8, Music_JohtoTrainerBattle_branch_f63dd - callchannel Music_JohtoTrainerBattle_branch_f64be + sound_loop 8, .loop3 + sound_call .sub4 octave 3 note A#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 8 - callchannel Music_JohtoTrainerBattle_branch_f64be + sound_call .sub4 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 8 - callchannel Music_JohtoTrainerBattle_branch_f64be + sound_call .sub4 octave 3 note A#, 2 - intensity $b0 + volume_envelope 11, 0 octave 4 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - intensity $1f + volume_envelope 1, -7 note D#, 12 - intensity $c7 + volume_envelope 12, 7 note D#, 4 - intensity $c2 + volume_envelope 12, 2 octave 3 note G_, 4 note D#, 2 @@ -732,32 +733,32 @@ Music_JohtoTrainerBattle_branch_f63dd: note F_, 2 note D#, 2 note G_, 6 - intensity $c7 + volume_envelope 12, 7 note G#, 4 - intensity $c2 + volume_envelope 12, 2 note G_, 4 note D#, 2 note G_, 6 note G_, 4 note G_, 6 note G_, 6 - intensity $4c + volume_envelope 4, -4 note G#, 4 - callchannel Music_JohtoTrainerBattle_branch_f64d2 - intensity $b0 + sound_call .sub5 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b0 + volume_envelope 11, 0 note G#, 8 - intensity $b7 + volume_envelope 11, 7 note G#, 8 - callchannel Music_JohtoTrainerBattle_branch_f64d2 - intensity $b0 + sound_call .sub5 + volume_envelope 11, 0 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C#, 8 - intensity $c7 + volume_envelope 12, 7 note C#, 4 note C_, 4 octave 3 @@ -782,20 +783,20 @@ Music_JohtoTrainerBattle_branch_f63dd: note A#, 6 note G#, 2 note G_, 2 - intensity $b0 + volume_envelope 11, 0 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $c7 + volume_envelope 12, 7 note D#, 6 note A#, 6 note G#, 2 note G_, 2 - intensity $b0 + volume_envelope 11, 0 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $c7 + volume_envelope 12, 7 octave 3 note A_, 6 octave 4 @@ -806,16 +807,16 @@ Music_JohtoTrainerBattle_branch_f63dd: note F#, 4 note E_, 4 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b0 + volume_envelope 11, 0 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note A#, 8 - callchannel Music_JohtoTrainerBattle_branch_f64a3 - intensity $c7 + sound_call .sub2 + volume_envelope 12, 7 note D_, 4 octave 3 note A#, 2 @@ -825,20 +826,20 @@ Music_JohtoTrainerBattle_branch_f63dd: note E_, 2 note D_, 2 note F_, 2 - loopchannel 0, Music_JohtoTrainerBattle_branch_f632a + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f649a: +.sub1: octave 3 note A_, 6 note A_, 4 note A_, 6 note A_, 6 - intensity $c7 + volume_envelope 12, 7 note A#, 4 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f64a3: - intensity $c7 +.sub2: + volume_envelope 12, 7 octave 3 note A_, 6 octave 4 @@ -849,13 +850,13 @@ Music_JohtoTrainerBattle_branch_f64a3: note F#, 4 note E_, 4 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f64b6: +.sub3: octave 3 note A#, 2 note D#, 2 @@ -863,13 +864,13 @@ Music_JohtoTrainerBattle_branch_f64b6: note D#, 2 octave 3 note D#, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f64be: - intensity $c7 +.sub4: + volume_envelope 12, 7 octave 4 note F_, 4 - intensity $c4 + volume_envelope 12, 4 octave 3 note A#, 2 octave 4 @@ -883,10 +884,10 @@ Music_JohtoTrainerBattle_branch_f64be: note D_, 1 note D#, 1 note F_, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f64d2: - intensity $c7 +.sub5: + volume_envelope 12, 7 octave 4 note D#, 6 note A#, 6 @@ -896,10 +897,10 @@ Music_JohtoTrainerBattle_branch_f64d2: note G_, 4 note F_, 4 note D#, 4 - endchannel + sound_ret Music_JohtoTrainerBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 4 note E_, 1 note D#, 1 @@ -932,7 +933,7 @@ Music_JohtoTrainerBattle_Ch3: note A#, 2 note A_, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6501: +.loop1: note A_, 2 note E_, 2 note F#, 2 @@ -941,7 +942,7 @@ Music_JohtoTrainerBattle_branch_f6501: note F#, 2 note G_, 2 note E_, 2 - loopchannel 3, Music_JohtoTrainerBattle_branch_f6501 + sound_loop 3, .loop1 note A_, 2 note E_, 2 note F#, 2 @@ -950,7 +951,7 @@ Music_JohtoTrainerBattle_branch_f6501: note F#, 2 note G_, 2 note G#, 2 - callchannel Music_JohtoTrainerBattle_branch_f6676 + sound_call .sub1 octave 4 note C_, 2 octave 3 @@ -963,7 +964,7 @@ Music_JohtoTrainerBattle_branch_f6501: note C_, 2 octave 3 note A#, 2 - callchannel Music_JohtoTrainerBattle_branch_f6676 + sound_call .sub1 octave 4 note C_, 2 octave 3 @@ -974,16 +975,16 @@ Music_JohtoTrainerBattle_branch_f6501: note A_, 2 note A#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f6531: - callchannel Music_JohtoTrainerBattle_branch_f6681 +.mainloop: + sound_call .sub2 note E_, 2 - callchannel Music_JohtoTrainerBattle_branch_f6692 - callchannel Music_JohtoTrainerBattle_branch_f6692 - callchannel Music_JohtoTrainerBattle_branch_f6681 + sound_call .sub3 + sound_call .sub3 + sound_call .sub2 note A_, 2 - callchannel Music_JohtoTrainerBattle_branch_f6692 - callchannel Music_JohtoTrainerBattle_branch_f6692 - callchannel Music_JohtoTrainerBattle_branch_f669d + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 note E_, 2 note A_, 2 note E_, 2 @@ -992,7 +993,7 @@ Music_JohtoTrainerBattle_branch_f6531: note D_, 2 note E_, 2 note F_, 2 - callchannel Music_JohtoTrainerBattle_branch_f669d + sound_call .sub4 note E_, 2 octave 4 note F_, 2 @@ -1003,7 +1004,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G#, 2 note A_, 2 note A#, 2 - callchannel Music_JohtoTrainerBattle_branch_f66a5 + sound_call .sub5 note D_, 2 note A_, 2 note D_, 2 @@ -1012,7 +1013,7 @@ Music_JohtoTrainerBattle_branch_f6531: note A_, 2 note G_, 2 note A_, 2 - callchannel Music_JohtoTrainerBattle_branch_f66a5 + sound_call .sub5 note D_, 2 octave 4 note D_, 2 @@ -1023,7 +1024,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G_, 2 note A_, 2 note A#, 2 - callchannel Music_JohtoTrainerBattle_branch_f66ac + sound_call .sub6 note C_, 2 note G_, 2 note C_, 2 @@ -1032,7 +1033,7 @@ Music_JohtoTrainerBattle_branch_f6531: note G_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoTrainerBattle_branch_f66ac + sound_call .sub6 note C_, 2 octave 4 note C_, 2 @@ -1047,7 +1048,7 @@ Music_JohtoTrainerBattle_branch_f6531: note F_, 8 note E_, 8 note D#, 8 -Music_JohtoTrainerBattle_branch_f6591: +.loop2: octave 3 note D#, 2 note A#, 2 @@ -1058,8 +1059,8 @@ Music_JohtoTrainerBattle_branch_f6591: note A_, 2 octave 4 note C_, 2 - loopchannel 2, Music_JohtoTrainerBattle_branch_f6591 - callchannel Music_JohtoTrainerBattle_branch_f66ac + sound_loop 2, .loop2 + sound_call .sub6 note C_, 2 octave 4 note C_, 2 @@ -1070,42 +1071,42 @@ Music_JohtoTrainerBattle_branch_f6591: note F_, 2 note D#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f65ac: +.loop3: note C#, 2 note G#, 2 - loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac + sound_loop 7, .loop3 note B_, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65b4: +.loop4: note D_, 2 note A_, 2 - loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4 + sound_loop 5, .loop4 note B_, 2 note A_, 2 note G#, 2 note F#, 2 note G#, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65c0: +.loop5: note A#, 4 note D#, 4 - loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0 -Music_JohtoTrainerBattle_branch_f65c6: + sound_loop 4, .loop5 +.loop6: octave 4 note G_, 4 octave 3 note A#, 4 - loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6 -Music_JohtoTrainerBattle_branch_f65ce: - callchannel Music_JohtoTrainerBattle_branch_f66b4 + sound_loop 4, .loop6 +.loop7: + sound_call .sub7 note D#, 2 note F_, 8 - callchannel Music_JohtoTrainerBattle_branch_f66b4 + sound_call .sub7 octave 4 note C_, 2 octave 3 note A#, 8 - loopchannel 2, Music_JohtoTrainerBattle_branch_f65ce + sound_loop 2, .loop7 octave 4 note C#, 8 note C_, 8 @@ -1170,28 +1171,28 @@ Music_JohtoTrainerBattle_branch_f65ce: note C_, 2 octave 3 note A#, 2 -Music_JohtoTrainerBattle_branch_f661e: +.loop8: note D#, 2 note A#, 2 - loopchannel 8, Music_JohtoTrainerBattle_branch_f661e -Music_JohtoTrainerBattle_branch_f6624: + sound_loop 8, .loop8 +.loop9: note C#, 2 note G#, 2 - loopchannel 6, Music_JohtoTrainerBattle_branch_f6624 + sound_loop 6, .loop9 note C#, 2 octave 4 note C_, 2 octave 3 note A#, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6630: +.loop10: note D#, 2 note A#, 2 - loopchannel 8, Music_JohtoTrainerBattle_branch_f6630 -Music_JohtoTrainerBattle_branch_f6636: + sound_loop 8, .loop10 +.loop11: note C#, 2 note G#, 2 - loopchannel 4, Music_JohtoTrainerBattle_branch_f6636 + sound_loop 4, .loop11 note C#, 2 octave 4 note C#, 2 @@ -1240,15 +1241,15 @@ Music_JohtoTrainerBattle_branch_f6636: note A#, 16 octave 4 note D_, 8 - note __, 2 + rest 2 octave 3 note A_, 2 note A#, 2 octave 4 note D_, 2 - loopchannel 0, Music_JohtoTrainerBattle_branch_f6531 + sound_loop 0, .mainloop -Music_JohtoTrainerBattle_branch_f6676: +.sub1: octave 4 note C_, 2 octave 3 @@ -1259,9 +1260,9 @@ Music_JohtoTrainerBattle_branch_f6676: note A_, 2 note A#, 2 note G_, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f6681: +.sub2: octave 3 note E_, 2 note A_, 2 @@ -1278,9 +1279,9 @@ Music_JohtoTrainerBattle_branch_f6681: note E_, 2 note F#, 2 note G_, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f6692: +.sub3: octave 3 note F_, 2 note A#, 2 @@ -1291,29 +1292,32 @@ Music_JohtoTrainerBattle_branch_f6692: note A#, 2 octave 4 note D_, 2 - endchannel + sound_ret -Music_JohtoTrainerBattle_branch_f669d: +.sub4: +.sub4loop1: octave 3 note E_, 2 note A_, 2 - loopchannel 4, Music_JohtoTrainerBattle_branch_f669d - endchannel + sound_loop 4, .sub4loop1 + sound_ret -Music_JohtoTrainerBattle_branch_f66a5: +.sub5: +.sub5loop1: note D_, 2 note A_, 2 - loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5 - endchannel + sound_loop 4, .sub5loop1 + sound_ret -Music_JohtoTrainerBattle_branch_f66ac: +.sub6: +.sub6loop1: octave 3 note C_, 2 note G_, 2 - loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac - endchannel + sound_loop 4, .sub6loop1 + sound_ret -Music_JohtoTrainerBattle_branch_f66b4: +.sub7: note A#, 4 note D#, 2 note A#, 2 @@ -1328,4 +1332,4 @@ Music_JohtoTrainerBattle_branch_f66b4: note G_, 1 note G#, 1 note A#, 2 - endchannel + sound_ret diff --git a/audio/music/johtowildbattle.asm b/audio/music/johtowildbattle.asm index 3c104e11..7377810e 100644 --- a/audio/music/johtowildbattle.asm +++ b/audio/music/johtowildbattle.asm @@ -1,16 +1,17 @@ Music_JohtoWildBattle: - musicheader 3, 1, Music_JohtoWildBattle_Ch1 - musicheader 1, 2, Music_JohtoWildBattle_Ch2 - musicheader 1, 3, Music_JohtoWildBattle_Ch3 + channel_count 3 + channel 1, Music_JohtoWildBattle_Ch1 + channel 2, Music_JohtoWildBattle_Ch2 + channel 3, Music_JohtoWildBattle_Ch3 Music_JohtoWildBattle_Ch1: tempo 104 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 -Music_JohtoWildBattleNight_branch_f5ddb: - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 +.body: + note_type 12, 11, 2 octave 4 note C_, 1 octave 3 @@ -49,7 +50,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: octave 3 note C_, 1 note C#, 1 - intensity $b2 + volume_envelope 11, 2 note G_, 6 octave 2 note A#, 6 @@ -65,9 +66,9 @@ Music_JohtoWildBattleNight_branch_f5ddb: note D#, 4 note C_, 4 note D_, 4 - intensity $b5 + volume_envelope 11, 5 note D#, 8 - intensity $b2 + volume_envelope 11, 2 octave 4 note D_, 6 octave 3 @@ -84,10 +85,10 @@ Music_JohtoWildBattleNight_branch_f5ddb: note D#, 4 note C_, 4 note D_, 4 - intensity $6f + volume_envelope 6, -7 note D#, 8 -Music_JohtoWildBattle_branch_f5e2d: - intensity $b6 +.mainloop: + volume_envelope 11, 6 octave 3 note D_, 6 octave 2 @@ -167,7 +168,7 @@ Music_JohtoWildBattle_branch_f5e2d: note D#, 8 note C#, 8 note F#, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 6 note D_, 6 note E_, 4 @@ -198,17 +199,17 @@ Music_JohtoWildBattle_branch_f5e2d: note D_, 4 note F#, 4 note G_, 16 - loopchannel 0, Music_JohtoWildBattle_branch_f5e2d + sound_loop 0, .mainloop Music_JohtoWildBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - callchannel Music_JohtoWildBattle_branch_f5f5d - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + sound_call .sub1 + note_type 12, 12, 2 octave 4 note G_, 6 -Music_JohtoWildBattleNight_branch_f5eb2: +.body: octave 3 note D_, 6 note G_, 4 @@ -220,9 +221,9 @@ Music_JohtoWildBattleNight_branch_f5eb2: note G#, 4 note F_, 4 note G_, 4 - intensity $c7 + volume_envelope 12, 7 note G#, 8 - intensity $c2 + volume_envelope 12, 2 octave 4 note G_, 6 note D_, 6 @@ -235,10 +236,10 @@ Music_JohtoWildBattleNight_branch_f5eb2: note G#, 4 note F_, 4 note G_, 4 - intensity $6f + volume_envelope 6, -7 note G#, 8 -Music_JohtoWildBattle_branch_f5ed1: - intensity $c4 +.mainloop: + volume_envelope 12, 4 octave 3 note G_, 6 note D_, 6 @@ -255,11 +256,11 @@ Music_JohtoWildBattle_branch_f5ed1: note A_, 2 octave 4 note C#, 2 - intensity $b0 + volume_envelope 11, 0 note D#, 16 - intensity $b7 + volume_envelope 11, 7 note D#, 16 - intensity $c4 + volume_envelope 12, 4 octave 3 note G_, 6 note D_, 6 @@ -271,11 +272,11 @@ Music_JohtoWildBattle_branch_f5ed1: note B_, 4 note A_, 4 note B_, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 16 - intensity $b6 + volume_envelope 11, 6 note A_, 16 - intensity $c4 + volume_envelope 12, 4 note G#, 6 note D#, 6 note D#, 2 @@ -291,11 +292,11 @@ Music_JohtoWildBattle_branch_f5ed1: note A#, 2 octave 4 note D_, 2 - intensity $b0 + volume_envelope 11, 0 note E_, 16 - intensity $b7 + volume_envelope 11, 7 note E_, 16 - intensity $c4 + volume_envelope 12, 4 octave 3 note G#, 6 note D#, 6 @@ -307,11 +308,11 @@ Music_JohtoWildBattle_branch_f5ed1: octave 3 note A#, 4 note G#, 4 - intensity $b0 + volume_envelope 11, 0 note A#, 16 - intensity $b5 + volume_envelope 11, 5 note A#, 16 - intensity $c6 + volume_envelope 12, 6 octave 4 note B_, 12 note G_, 2 @@ -341,7 +342,7 @@ Music_JohtoWildBattle_branch_f5ed1: note A_, 2 octave 4 note C_, 2 - intensity $c7 + volume_envelope 12, 7 note D_, 16 note G_, 8 octave 5 @@ -360,11 +361,10 @@ Music_JohtoWildBattle_branch_f5ed1: note G_, 4 note A#, 4 note B_, 16 - loopchannel 0, Music_JohtoWildBattle_branch_f5ed1 + sound_loop 0, .mainloop -Music_JohtoWildBattleNight_branch_f5f5d: -Music_JohtoWildBattle_branch_f5f5d: - notetype $c, $c2 +.sub1: + note_type 12, 12, 2 octave 4 note F_, 1 note F#, 1 @@ -413,11 +413,11 @@ Music_JohtoWildBattle_branch_f5f5d: note G_, 1 octave 5 note G_, 1 - endchannel + sound_ret Music_JohtoWildBattle_Ch3: - notetype $c, $14 -Music_JohtoWildBattleNight_branch_f5f94: + note_type 12, 1, 4 +.body: octave 4 note G_, 2 octave 5 @@ -457,7 +457,7 @@ Music_JohtoWildBattleNight_branch_f5f94: note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -466,15 +466,15 @@ Music_JohtoWildBattleNight_branch_f5f94: note D#, 2 note G_, 2 note F_, 2 -Music_JohtoWildBattle_branch_f5fc6: +.loop1: note D_, 2 note G_, 2 - loopchannel 6, Music_JohtoWildBattle_branch_f5fc6 + sound_loop 6, .loop1 note D_, 2 note E_, 2 note F_, 2 note G_, 2 - callchannel Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note F_, 2 note F_, 2 note G_, 2 @@ -483,30 +483,31 @@ Music_JohtoWildBattle_branch_f5fc6: note G_, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f5fdb: +.mainloop: +.loop2: note D_, 2 note G_, 2 - loopchannel 7, Music_JohtoWildBattle_branch_f5fdb + sound_loop 7, .loop2 note F#, 4 - callchannel Music_JohtoWildBattle_branch_f6055 - callchannel Music_JohtoWildBattle_branch_f6055 -Music_JohtoWildBattle_branch_f5fe8: + sound_call .sub1 + sound_call .sub1 +.loop3: note D_, 2 note G_, 2 - loopchannel 7, Music_JohtoWildBattle_branch_f5fe8 + sound_loop 7, .loop3 note D_, 2 note A_, 2 -Music_JohtoWildBattle_branch_f5ff0: +.loop4: note C_, 2 note F_, 2 - loopchannel 5, Music_JohtoWildBattle_branch_f5ff0 + sound_loop 5, .loop4 note E_, 2 note D_, 2 note C_, 2 note D_, 2 note E_, 2 note F_, 2 - callchannel Music_JohtoWildBattle_branch_f6055 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -514,11 +515,11 @@ Music_JohtoWildBattle_branch_f5ff0: note D#, 2 note G#, 2 note G_, 4 -Music_JohtoWildBattle_branch_f6006: +.loop5: note E_, 2 note A_, 2 - loopchannel 8, Music_JohtoWildBattle_branch_f6006 - callchannel Music_JohtoWildBattle_branch_f6055 + sound_loop 8, .loop5 + sound_call .sub1 note D#, 2 note G#, 2 note D#, 2 @@ -543,42 +544,43 @@ Music_JohtoWildBattle_branch_f6006: note F#, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f6027: +.loop6: note D_, 2 note G_, 2 - loopchannel 8, Music_JohtoWildBattle_branch_f6027 -Music_JohtoWildBattle_branch_f602d: + sound_loop 8, .loop6 +.loop7: note C_, 2 note F_, 2 - loopchannel 7, Music_JohtoWildBattle_branch_f602d + sound_loop 7, .loop7 note E_, 2 note C_, 2 note D_, 4 note G_, 4 note D_, 4 note G_, 4 -Music_JohtoWildBattle_branch_f6039: +.loop8: note D_, 2 note G_, 2 - loopchannel 12, Music_JohtoWildBattle_branch_f6039 -Music_JohtoWildBattle_branch_f603f: + sound_loop 12, .loop8 +.loop9: note C_, 2 note E_, 2 - loopchannel 7, Music_JohtoWildBattle_branch_f603f + sound_loop 7, .loop9 note F_, 2 note F#, 2 -Music_JohtoWildBattle_branch_f6047: +.loop10: note D_, 2 note G_, 2 - loopchannel 6, Music_JohtoWildBattle_branch_f6047 + sound_loop 6, .loop10 note A_, 2 note G_, 2 note F#, 2 note E_, 2 - loopchannel 0, Music_JohtoWildBattle_branch_f5fdb + sound_loop 0, .mainloop -Music_JohtoWildBattle_branch_f6055: +.sub1: +.sub1loop1: note D#, 2 note G#, 2 - loopchannel 4, Music_JohtoWildBattle_branch_f6055 - endchannel + sound_loop 4, .sub1loop1 + sound_ret diff --git a/audio/music/johtowildbattlenight.asm b/audio/music/johtowildbattlenight.asm index b4b1651b..efba350d 100644 --- a/audio/music/johtowildbattlenight.asm +++ b/audio/music/johtowildbattlenight.asm @@ -1,28 +1,29 @@ Music_JohtoWildBattleNight: - musicheader 3, 1, Music_JohtoWildBattleNight_Ch1 - musicheader 1, 2, Music_JohtoWildBattleNight_Ch2 - musicheader 1, 3, Music_JohtoWildBattleNight_Ch3 + channel_count 3 + channel 1, Music_JohtoWildBattleNight_Ch1 + channel 2, Music_JohtoWildBattleNight_Ch2 + channel 3, Music_JohtoWildBattleNight_Ch3 Music_JohtoWildBattleNight_Ch1: tempo 107 - volume $77 - dutycycle $3 - tone $0002 - vibrato $10, $25 - loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 2, 5 + sound_loop 0, Music_JohtoWildBattle_Ch1.body Music_JohtoWildBattleNight_Ch2: - dutycycle $3 - vibrato $20, $36 - tone $0001 - callchannel Music_JohtoWildBattleNight_branch_f5f5d - notetype $c, $c2 + duty_cycle 3 + vibrato 32, 3, 6 + pitch_offset 1 + sound_call Music_JohtoWildBattle_Ch2.sub1 + note_type 12, 12, 2 octave 4 note G_, 6 - tone $0001 - dutycycle $2 - loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2 + pitch_offset 1 + duty_cycle 2 + sound_loop 0, Music_JohtoWildBattle_Ch2.body Music_JohtoWildBattleNight_Ch3: - notetype $c, $11 - loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94 + note_type 12, 1, 1 + sound_loop 0, Music_JohtoWildBattle_Ch3.body diff --git a/audio/music/kantogymbattle.asm b/audio/music/kantogymbattle.asm index 7ba65a42..b70f4344 100644 --- a/audio/music/kantogymbattle.asm +++ b/audio/music/kantogymbattle.asm @@ -1,15 +1,16 @@ Music_KantoGymBattle: - musicheader 3, 1, Music_KantoGymBattle_Ch1 - musicheader 1, 2, Music_KantoGymBattle_Ch2 - musicheader 1, 3, Music_KantoGymBattle_Ch3 + channel_count 3 + channel 1, Music_KantoGymBattle_Ch1 + channel 2, Music_KantoGymBattle_Ch2 + channel 3, Music_KantoGymBattle_Ch3 Music_KantoGymBattle_Ch1: tempo 101 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 18, 1, 5 + note_type 12, 11, 2 octave 3 note A#, 1 note A_, 1 @@ -52,19 +53,19 @@ Music_KantoGymBattle_Ch1: note A#, 6 note A#, 2 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note B_, 2 - intensity $b2 + volume_envelope 11, 2 note A#, 2 note A#, 6 note A#, 2 note A#, 6 note A#, 2 note A#, 8 - intensity $b7 + volume_envelope 11, 7 octave 3 note E_, 2 - intensity $b2 + volume_envelope 11, 2 octave 2 note A#, 2 note A#, 6 @@ -72,39 +73,39 @@ Music_KantoGymBattle_Ch1: note A#, 6 note A#, 2 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note B_, 2 - intensity $b2 + volume_envelope 11, 2 note A#, 2 note A#, 6 note A#, 2 note A#, 6 note A#, 2 - intensity $b4 + volume_envelope 11, 4 octave 3 note E_, 4 note E_, 4 note E_, 2 -Music_KantoGymBattle_branch_ec78b: - callchannel Music_KantoGymBattle_branch_ec832 +.mainloop: + sound_call .sub1 octave 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 note G#, 8 note B_, 8 octave 3 note D#, 10 note E_, 6 - callchannel Music_KantoGymBattle_branch_ec832 + sound_call .sub1 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note C#, 8 octave 2 note B_, 8 note G#, 10 octave 3 note E_, 6 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 note G_, 1 @@ -124,9 +125,9 @@ Music_KantoGymBattle_branch_ec78b: note G#, 1 note B_, 1 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note D#, 2 note D#, 2 note G_, 1 @@ -146,7 +147,7 @@ Music_KantoGymBattle_branch_ec78b: note G#, 1 note B_, 1 note G#, 2 - intensity $b5 + volume_envelope 11, 5 note B_, 2 note D#, 2 note C#, 2 @@ -166,13 +167,13 @@ Music_KantoGymBattle_branch_ec78b: note A#, 2 octave 3 note C#, 2 - intensity $b7 + volume_envelope 11, 7 octave 2 note B_, 8 note A#, 8 note G#, 10 note B_, 6 - intensity $b5 + volume_envelope 11, 5 octave 3 note D#, 2 note C#, 2 @@ -192,45 +193,45 @@ Music_KantoGymBattle_branch_ec78b: note A#, 2 octave 3 note C#, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 8 note F#, 8 note G_, 16 - intensity $b2 + volume_envelope 11, 2 octave 2 note G#, 2 note G#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note C#, 12 - intensity $b2 + volume_envelope 11, 2 note G#, 2 note F_, 4 - intensity $b5 + volume_envelope 11, 5 octave 2 note F_, 4 note G_, 2 note G#, 2 note A#, 2 - intensity $b2 + volume_envelope 11, 2 note A#, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note D#, 12 - intensity $b2 + volume_envelope 11, 2 note A#, 2 note G_, 4 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 6 - intensity $4c + volume_envelope 4, -4 octave 3 note D_, 4 - loopchannel 0, Music_KantoGymBattle_branch_ec78b + sound_loop 0, .mainloop -Music_KantoGymBattle_branch_ec832: - intensity $b5 +.sub1: + volume_envelope 11, 5 note D#, 2 octave 2 note A#, 2 @@ -249,24 +250,24 @@ Music_KantoGymBattle_branch_ec832: note E_, 2 note D#, 2 note C#, 2 - endchannel + sound_ret Music_KantoGymBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 -Music_KantoGymBattle_branch_ec852: + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 +.loop1: octave 4 note A#, 1 note G#, 1 note A#, 1 octave 5 note D#, 1 - loopchannel 8, Music_KantoGymBattle_branch_ec852 + sound_loop 8, .loop1 octave 3 -Music_KantoGymBattle_branch_ec85d: - intensity $c2 +.loop2: + volume_envelope 12, 2 note D#, 2 note D#, 2 note F#, 1 @@ -286,9 +287,9 @@ Music_KantoGymBattle_branch_ec85d: note G#, 1 note B_, 1 note D_, 2 - intensity $c7 + volume_envelope 12, 7 note E_, 2 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 2 note F#, 1 @@ -308,38 +309,38 @@ Music_KantoGymBattle_branch_ec85d: note G#, 1 note B_, 1 note G#, 2 - intensity $c7 + volume_envelope 12, 7 note B_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 - loopchannel 2, Music_KantoGymBattle_branch_ec85d -Music_KantoGymBattle_branch_ec894: - callchannel Music_KantoGymBattle_branch_ec907 + sound_loop 2, .loop2 +.mainloop: + sound_call .sub1 note E_, 8 note G#, 8 note B_, 10 note G#, 6 - callchannel Music_KantoGymBattle_branch_ec907 + sound_call .sub1 note E_, 8 note G#, 8 note B_, 10 octave 4 note E_, 6 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $a2 - note __, 6 + volume_envelope 10, 2 + rest 6 octave 5 note E_, 4 note E_, 4 note E_, 2 - intensity $a0 + volume_envelope 10, 0 note D#, 8 - intensity $a7 + volume_envelope 10, 7 note D#, 8 - note __, 12 - intensity $c5 + rest 12 + volume_envelope 12, 5 octave 3 note A#, 4 note B_, 4 @@ -348,12 +349,12 @@ Music_KantoGymBattle_branch_ec894: note B_, 4 note G#, 4 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 8 note D#, 16 - intensity $b7 + volume_envelope 11, 7 note D#, 12 - intensity $c5 + volume_envelope 12, 5 note A#, 4 note B_, 4 note G#, 4 @@ -361,64 +362,64 @@ Music_KantoGymBattle_branch_ec894: note B_, 4 note G#, 4 note B_, 4 - intensity $b0 + volume_envelope 11, 0 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note A#, 8 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $c2 + volume_envelope 12, 2 octave 3 note C#, 2 note C#, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 8 - intensity $c2 + volume_envelope 12, 2 octave 4 note C#, 4 note F_, 2 note C#, 4 - intensity $c7 + volume_envelope 12, 7 note G#, 4 note G_, 2 note F_, 2 note D#, 2 - intensity $c2 + volume_envelope 12, 2 octave 3 note D#, 2 note D#, 2 - intensity $c7 + volume_envelope 12, 7 note G_, 8 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 4 note G_, 2 note D#, 4 - intensity $c7 + volume_envelope 12, 7 note A#, 6 octave 3 note A_, 4 - loopchannel 0, Music_KantoGymBattle_branch_ec894 + sound_loop 0, .mainloop -Music_KantoGymBattle_branch_ec907: - dutycycle $2 - intensity $d1 +.sub1: + duty_cycle 2 + volume_envelope 13, 1 octave 3 note A#, 2 - intensity $a2 + volume_envelope 10, 2 note A#, 2 - intensity $d1 + volume_envelope 13, 1 note G#, 2 - intensity $a2 + volume_envelope 10, 2 note G#, 2 - intensity $d1 + volume_envelope 13, 1 note A#, 2 - intensity $a2 + volume_envelope 10, 2 note A#, 2 - intensity $c5 + volume_envelope 12, 5 note B_, 2 octave 4 note C#, 2 @@ -430,69 +431,70 @@ Music_KantoGymBattle_branch_ec907: note F#, 2 note G#, 2 note A#, 2 - dutycycle $3 - intensity $b0 - endchannel + duty_cycle 3 + volume_envelope 11, 0 + sound_ret Music_KantoGymBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 2 note E_, 1 - note __, 1 -Music_KantoGymBattle_branch_ec934: + rest 1 +.loop1: note B_, 3 - note __, 1 - loopchannel 6, Music_KantoGymBattle_branch_ec934 + rest 1 + sound_loop 6, .loop1 note B_, 2 note G#, 2 note B_, 2 -Music_KantoGymBattle_branch_ec93d: +.loop2: note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D_, 1 - note __, 1 + rest 1 note F_, 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D#, 1 - note __, 1 + rest 1 note E_, 2 - loopchannel 2, Music_KantoGymBattle_branch_ec93d -Music_KantoGymBattle_branch_ec965: + sound_loop 2, .loop2 +.mainloop: +.loop3: octave 2 note D#, 2 note A#, 2 - loopchannel 8, Music_KantoGymBattle_branch_ec965 -Music_KantoGymBattle_branch_ec96c: + sound_loop 8, .loop3 +.loop4: note E_, 2 note B_, 2 - loopchannel 4, Music_KantoGymBattle_branch_ec96c + sound_loop 4, .loop4 octave 1 note B_, 2 octave 2 @@ -506,45 +508,45 @@ Music_KantoGymBattle_branch_ec96c: note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec97f: +.loop5: octave 2 note F#, 2 octave 3 note C#, 2 - loopchannel 8, Music_KantoGymBattle_branch_ec97f -Music_KantoGymBattle_branch_ec987: + sound_loop 8, .loop5 +.loop6: octave 2 note E_, 2 note B_, 2 - loopchannel 7, Music_KantoGymBattle_branch_ec987 + sound_loop 7, .loop6 octave 3 note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec992: +.loop7: note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 4 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note D#, 1 - note __, 1 + rest 1 note E_, 2 - loopchannel 2, Music_KantoGymBattle_branch_ec992 -Music_KantoGymBattle_branch_ec9a8: + sound_loop 2, .loop7 +.loop8: note D#, 2 note A#, 2 - loopchannel 7, Music_KantoGymBattle_branch_ec9a8 + sound_loop 7, .loop8 octave 3 note C#, 2 octave 2 @@ -558,17 +560,17 @@ Music_KantoGymBattle_branch_ec9a8: note B_, 2 octave 3 note E_, 2 -Music_KantoGymBattle_branch_ec9bb: +.loop9: octave 2 note E_, 2 note B_, 2 - loopchannel 5, Music_KantoGymBattle_branch_ec9bb -Music_KantoGymBattle_branch_ec9c2: + sound_loop 5, .loop9 +.loop10: octave 2 note F#, 2 octave 3 note C#, 2 - loopchannel 7, Music_KantoGymBattle_branch_ec9c2 + sound_loop 7, .loop10 octave 2 note A#, 2 octave 3 @@ -583,19 +585,19 @@ Music_KantoGymBattle_branch_ec9c2: note F#, 2 note E_, 2 note C#, 2 -Music_KantoGymBattle_branch_ec9d8: +.loop11: octave 2 note D#, 2 note A#, 2 - loopchannel 4, Music_KantoGymBattle_branch_ec9d8 -Music_KantoGymBattle_branch_ec9df: + sound_loop 4, .loop11 +.loop12: note C#, 2 note G#, 2 - loopchannel 8, Music_KantoGymBattle_branch_ec9df -Music_KantoGymBattle_branch_ec9e5: + sound_loop 8, .loop12 +.loop13: note D#, 2 note A#, 2 - loopchannel 4, Music_KantoGymBattle_branch_ec9e5 + sound_loop 4, .loop13 octave 3 note D#, 2 octave 2 @@ -607,4 +609,4 @@ Music_KantoGymBattle_branch_ec9e5: octave 3 note D#, 2 note F_, 2 - loopchannel 0, Music_KantoGymBattle_branch_ec965 + sound_loop 0, .mainloop diff --git a/audio/music/kantotrainerbattle.asm b/audio/music/kantotrainerbattle.asm index 511763c9..d40ab0f3 100644 --- a/audio/music/kantotrainerbattle.asm +++ b/audio/music/kantotrainerbattle.asm @@ -1,18 +1,19 @@ Music_KantoTrainerBattle: - musicheader 3, 1, Music_KantoTrainerBattle_Ch1 - musicheader 1, 2, Music_KantoTrainerBattle_Ch2 - musicheader 1, 3, Music_KantoTrainerBattle_Ch3 + channel_count 3 + channel 1, Music_KantoTrainerBattle_Ch1 + channel 2, Music_KantoTrainerBattle_Ch2 + channel 3, Music_KantoTrainerBattle_Ch3 - db $3 + db $3 ; unused Music_KantoTrainerBattle_Ch1: tempo 114 - volume $77 - pitchoffset 1, B_ - notetype $c, $b3 - vibrato $12, $24 - dutycycle $1 - note __, 1 + volume 7, 7 + transpose 1, 11 + note_type 12, 11, 3 + vibrato 18, 2, 4 + duty_cycle 1 + rest 1 octave 4 note A_, 1 note G#, 1 @@ -48,90 +49,90 @@ Music_KantoTrainerBattle_Ch1: note G_, 1 note F#, 1 note G_, 1 - dutycycle $2 - intensity $b1 + duty_cycle 2 + volume_envelope 11, 1 octave 4 note D#, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note D#, 2 - note __, 2 + rest 2 octave 3 note A#, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 3 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note D#, 2 - note __, 2 + rest 2 octave 3 note A#, 2 octave 4 note C_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $b3 + rest 1 + volume_envelope 11, 3 note D#, 2 - note __, 4 + rest 4 note F_, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note D#, 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D#, 2 note F_, 2 note F#, 2 -Music_KantoTrainerBattle_branch_eca88: - notetype $c, $b7 +.mainloop: + note_type 12, 11, 7 note D#, 4 - note __, 2 + rest 2 note C_, 10 - note __, 4 + rest 4 note D#, 2 note C_, 2 octave 3 @@ -139,11 +140,11 @@ Music_KantoTrainerBattle_branch_eca88: octave 4 note C_, 1 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 8 note F_, 8 note G#, 8 @@ -155,9 +156,9 @@ Music_KantoTrainerBattle_branch_eca88: note F_, 1 note C#, 1 note D#, 4 - note __, 2 + rest 2 note C_, 10 - note __, 4 + rest 4 note D#, 2 note C_, 2 octave 3 @@ -165,20 +166,20 @@ Music_KantoTrainerBattle_branch_eca88: octave 4 note C_, 1 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D#, 6 note D_, 6 note C_, 2 - note __, 2 - note __, 2 + rest 2 + rest 2 note D_, 2 - note __, 4 + rest 4 note F_, 2 - note __, 2 + rest 2 note G#, 2 note G_, 1 note F#, 1 @@ -189,14 +190,14 @@ Music_KantoTrainerBattle_branch_eca88: note G#, 1 octave 4 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 octave 3 note G#, 1 note F_, 1 - note __, 5 + rest 5 octave 4 note D#, 8 note D_, 4 @@ -213,9 +214,9 @@ Music_KantoTrainerBattle_branch_eca88: note F_, 4 octave 3 note D_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note D_, 4 note G#, 1 note F_, 1 @@ -223,14 +224,14 @@ Music_KantoTrainerBattle_branch_eca88: note G#, 1 octave 4 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 octave 3 note G#, 1 note F_, 1 - note __, 5 + rest 5 octave 4 note D#, 8 note D_, 4 @@ -243,13 +244,13 @@ Music_KantoTrainerBattle_branch_eca88: note D_, 4 octave 3 note D_, 4 - note __, 4 + rest 4 note D_, 4 note A#, 1 octave 4 note D_, 1 note F_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 4 @@ -260,7 +261,7 @@ Music_KantoTrainerBattle_branch_eca88: note D_, 2 octave 4 note D_, 2 - intensity $67 + volume_envelope 6, 7 note C_, 1 note C#, 1 note D_, 1 @@ -270,27 +271,27 @@ Music_KantoTrainerBattle_branch_eca88: note D_, 1 note C#, 1 note C_, 1 - note __, 3 + rest 3 note D#, 4 - notetype $6, $67 + note_type 6, 6, 7 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 7 + rest 7 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 octave 4 note C_, 8 - intensity $77 + volume_envelope 7, 7 note C#, 2 note D_, 2 note D#, 2 @@ -300,26 +301,26 @@ Music_KantoTrainerBattle_branch_eca88: note D#, 2 note D_, 2 note C#, 2 - note __, 6 + rest 6 note E_, 8 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 7 + rest 7 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 octave 4 note C#, 8 - intensity $87 + volume_envelope 8, 7 note D_, 2 note D#, 2 note E_, 2 @@ -329,26 +330,26 @@ Music_KantoTrainerBattle_branch_eca88: note E_, 2 note D#, 2 note D_, 2 - note __, 6 + rest 6 note F_, 8 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 7 + rest 7 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 octave 4 note D_, 8 - intensity $97 + volume_envelope 9, 7 note D#, 2 note E_, 2 note F_, 2 @@ -358,16 +359,16 @@ Music_KantoTrainerBattle_branch_eca88: note F_, 2 note E_, 2 note D#, 2 - note __, 6 + rest 6 note F#, 8 - intensity $a7 + volume_envelope 10, 7 note G#, 8 note A#, 8 - intensity $b7 + volume_envelope 11, 7 octave 5 note D_, 8 note D_, 2 - note __, 6 + rest 6 octave 4 note A#, 2 note F#, 2 @@ -382,9 +383,9 @@ Music_KantoTrainerBattle_branch_eca88: note F#, 2 octave 4 note G#, 2 - note __, 2 + rest 2 note D#, 12 - intensity $b1 + volume_envelope 11, 1 octave 6 note C_, 2 note C_, 2 @@ -395,7 +396,7 @@ Music_KantoTrainerBattle_branch_eca88: note C_, 4 note C_, 4 note C_, 4 - intensity $b7 + volume_envelope 11, 7 octave 4 note A#, 2 note F#, 2 @@ -410,7 +411,7 @@ Music_KantoTrainerBattle_branch_eca88: note F#, 2 octave 4 note F#, 2 - note __, 2 + rest 2 note B_, 4 note A#, 4 note G#, 4 @@ -426,21 +427,21 @@ Music_KantoTrainerBattle_branch_eca88: octave 4 note C#, 16 note C#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 note F#, 2 note F_, 2 note D#, 2 note F_, 2 - intensity $67 + volume_envelope 6, 7 note E_, 1 note D_, 1 note C_, 1 @@ -448,7 +449,7 @@ Music_KantoTrainerBattle_branch_eca88: note B_, 1 note A_, 1 note G_, 1 - intensity $a1 + volume_envelope 10, 1 octave 4 note C#, 2 octave 2 @@ -459,16 +460,16 @@ Music_KantoTrainerBattle_branch_eca88: octave 2 note G_, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - loopchannel 0, Music_KantoTrainerBattle_branch_eca88 + sound_loop 0, .mainloop Music_KantoTrainerBattle_Ch2: - pitchoffset 1, B_ - vibrato $6, $36 - dutycycle $1 - notetype $c, $d1 + transpose 1, 11 + vibrato 6, 3, 6 + duty_cycle 1 + note_type 12, 13, 1 octave 4 note A#, 4 note A#, 4 @@ -481,15 +482,15 @@ Music_KantoTrainerBattle_Ch2: note G#, 1 note G_, 1 note F#, 1 - dutycycle $3 - intensity $62 -Music_KantoTrainerBattle_branch_ecc04: + duty_cycle 3 + volume_envelope 6, 2 +.loop1: octave 3 note G_, 1 note G#, 1 note G_, 1 note F#, 1 - loopchannel 14, Music_KantoTrainerBattle_branch_ecc04 + sound_loop 14, .loop1 note G_, 1 note G#, 1 note G_, 1 @@ -499,37 +500,37 @@ Music_KantoTrainerBattle_branch_ecc04: note C_, 1 octave 2 note B_, 1 - intensity $d7 - dutycycle $2 + volume_envelope 13, 7 + duty_cycle 2 note C_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C_, 1 - note __, 1 + rest 1 octave 1 note A#, 2 octave 2 note A#, 1 - note __, 1 + rest 1 octave 1 note A#, 1 - note __, 1 + rest 1 note A_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 1 note A_, 1 - note __, 1 + rest 1 note G#, 2 octave 2 note G#, 1 - note __, 1 + rest 1 octave 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 note B_, 1 octave 2 @@ -540,277 +541,277 @@ Music_KantoTrainerBattle_branch_ecc04: octave 3 note D_, 1 note F_, 1 -Music_KantoTrainerBattle_branch_ecc41: - notetype $c, $d7 +.mainloop: + note_type 12, 13, 7 octave 2 note C_, 1 note C_, 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C_, 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note C_, 2 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note C_, 2 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C#, 1 note C#, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note C#, 2 octave 2 note C#, 2 note G#, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 note C#, 2 note G#, 1 - note __, 1 + rest 1 note A#, 2 note C#, 1 note C#, 1 note F_, 1 - note __, 1 + rest 1 note G#, 2 octave 3 note C#, 1 - note __, 1 + rest 1 note F_, 2 note G#, 1 - note __, 1 + rest 1 note A#, 2 octave 2 note C_, 1 note C_, 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note C_, 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note C_, 2 note A#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note C_, 2 note A_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 1 note A#, 1 note A#, 1 octave 2 note F_, 1 - note __, 1 + rest 1 note A#, 2 octave 1 note A#, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note A_, 2 octave 1 note A#, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note G#, 2 octave 1 note A#, 1 note A#, 1 octave 2 note F_, 1 - note __, 1 + rest 1 note G_, 2 note A#, 1 - note __, 1 + rest 1 octave 3 note D_, 2 note F_, 1 - note __, 1 + rest 1 note A#, 2 octave 1 note F_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note D_, 1 - note __, 1 + rest 1 note D#, 1 note C_, 1 octave 1 note A#, 1 note A_, 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F_, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note G_, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note G#, 4 octave 1 note F_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note E_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 1 note F_, 2 octave 2 note D_, 1 - note __, 1 + rest 1 note D#, 1 note C_, 1 octave 1 note A#, 1 note A_, 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F_, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note F#, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note G_, 4 octave 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 3 note G#, 4 - vibrato $12, $24 - notetype $c, $78 + vibrato 18, 2, 4 + note_type 12, 7, 8 octave 4 note G_, 16 - intensity $77 + volume_envelope 7, 7 note G_, 16 - notetype $6, $88 + note_type 6, 8, 8 note G#, 16 - intensity $87 + volume_envelope 8, 7 note G#, 15 note G_, 1 note G#, 7 @@ -820,49 +821,49 @@ Music_KantoTrainerBattle_branch_ecc41: note G#, 8 note G_, 4 note F_, 6 - note __, 2 - notetype $c, $98 + rest 2 + note_type 12, 9, 8 note A_, 16 - intensity $97 + volume_envelope 9, 7 note A_, 16 - intensity $a7 + volume_envelope 10, 7 note A#, 16 - intensity $d7 + volume_envelope 13, 7 octave 5 note D_, 8 note F_, 8 - vibrato $4, $36 + vibrato 4, 3, 6 octave 2 note A#, 4 note D#, 4 note C_, 1 - note __, 1 - intensity $d8 + rest 1 + volume_envelope 13, 8 note G#, 6 - intensity $d7 + volume_envelope 13, 7 note G#, 16 note A#, 4 note D#, 4 note D#, 1 - note __, 1 + rest 1 octave 3 note D#, 14 octave 2 note C_, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 - notetype $6, $d7 + rest 2 + note_type 6, 13, 7 octave 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G#, 8 octave 4 @@ -871,24 +872,24 @@ Music_KantoTrainerBattle_branch_ecc41: note F_, 2 note D#, 2 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 3 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note G#, 2 note A#, 2 note G#, 2 note F#, 2 note G#, 2 - intensity $72 + volume_envelope 7, 2 note G_, 1 note F_, 1 note E_, 1 @@ -896,30 +897,30 @@ Music_KantoTrainerBattle_branch_ecc41: note C_, 1 octave 2 note B_, 1 - intensity $c1 + volume_envelope 12, 1 octave 3 note B_, 2 octave 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - intensity $d7 + rest 1 + volume_envelope 13, 7 octave 3 note B_, 4 - loopchannel 0, Music_KantoTrainerBattle_branch_ecc41 + sound_loop 0, .mainloop Music_KantoTrainerBattle_Ch3: - pitchoffset 1, B_ - vibrato $12, $23 - notetype $c, $15 + transpose 1, 11 + vibrato 18, 2, 3 + note_type 12, 1, 5 octave 2 note A#, 1 octave 4 @@ -967,21 +968,21 @@ Music_KantoTrainerBattle_Ch3: note B_, 1 octave 4 note D_, 1 - intensity $18 + volume_envelope 1, 8 octave 6 note C_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 5 note F_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 5 note F#, 2 octave 4 @@ -990,30 +991,30 @@ Music_KantoTrainerBattle_Ch3: octave 5 note D#, 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 5 note D#, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 5 note F_, 2 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 5 note F#, 2 octave 4 @@ -1022,45 +1023,45 @@ Music_KantoTrainerBattle_Ch3: octave 5 note D#, 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 6 note C_, 2 - note __, 4 + rest 4 note D_, 2 - note __, 4 + rest 4 note D#, 2 - note __, 2 + rest 2 note C_, 2 note D_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 5 note G_, 2 note A#, 2 note B_, 2 -Music_KantoTrainerBattle_branch_ece5a: - notetype $c, $14 +.mainloop: + note_type 12, 1, 4 octave 6 note C_, 4 - notetype $6, $14 + note_type 6, 1, 4 octave 5 note B_, 1 note A#, 1 note A_, 1 note G#, 1 - notetype $c, $14 + note_type 12, 1, 4 note G_, 10 - note __, 2 - notetype $6, $14 + rest 2 + note_type 6, 1, 4 note G_, 1 note G#, 1 note A_, 1 @@ -1075,7 +1076,7 @@ Music_KantoTrainerBattle_branch_ece5a: note C_, 7 octave 5 note B_, 1 - notetype $c, $14 + note_type 12, 1, 4 octave 6 note C#, 16 note C#, 8 @@ -1087,16 +1088,16 @@ Music_KantoTrainerBattle_branch_ece5a: note G#, 1 octave 6 note C_, 4 - notetype $6, $14 + note_type 6, 1, 4 octave 5 note B_, 1 note A#, 1 note A_, 1 note G#, 1 - notetype $c, $14 + note_type 12, 1, 4 note G_, 10 - note __, 2 - notetype $6, $14 + rest 2 + note_type 6, 1, 4 note G_, 1 note G#, 1 note A_, 1 @@ -1124,27 +1125,27 @@ Music_KantoTrainerBattle_branch_ece5a: octave 5 note A#, 2 note A_, 2 - notetype $c, $10 + note_type 12, 1, 0 note G#, 11 - intensity $14 + volume_envelope 1, 4 note C_, 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - intensity $10 + rest 1 + volume_envelope 1, 0 octave 6 note C_, 6 - notetype $6, $10 + note_type 6, 1, 0 octave 5 note B_, 1 note A#, 1 note A_, 1 note G#, 1 note G#, 16 - notetype $c, $10 + note_type 12, 1, 0 note A#, 16 - intensity $25 + volume_envelope 2, 5 note D_, 1 octave 4 note A#, 1 @@ -1165,42 +1166,42 @@ Music_KantoTrainerBattle_branch_ece5a: note D_, 2 note C#, 1 note C_, 1 - intensity $10 + volume_envelope 1, 0 octave 5 note G#, 11 - intensity $14 + volume_envelope 1, 4 note C_, 1 note F_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - intensity $10 + rest 1 + volume_envelope 1, 0 octave 6 note C_, 7 - notetype $6, $10 + note_type 6, 1, 0 note C#, 1 note D_, 1 - notetype $c, $10 + note_type 12, 1, 0 note D#, 8 note D_, 12 note G#, 1 note F_, 1 - intensity $25 + volume_envelope 2, 5 octave 5 note A#, 1 note F_, 1 note G#, 1 note G#, 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note G#, 2 note G_, 2 note F_, 2 note D#, 2 note F_, 2 - intensity $24 + volume_envelope 2, 4 octave 3 note G_, 1 octave 4 @@ -1329,7 +1330,7 @@ Music_KantoTrainerBattle_branch_ece5a: note E_, 1 octave 4 note C#, 1 - intensity $14 + volume_envelope 1, 4 octave 3 note A_, 1 octave 4 @@ -1362,7 +1363,7 @@ Music_KantoTrainerBattle_branch_ece5a: note F_, 1 octave 4 note D_, 1 - intensity $15 + volume_envelope 1, 5 octave 3 note A_, 1 octave 4 @@ -1395,7 +1396,7 @@ Music_KantoTrainerBattle_branch_ece5a: note F_, 1 octave 4 note D_, 1 - intensity $15 + volume_envelope 1, 5 octave 3 note A#, 1 octave 4 @@ -1428,7 +1429,7 @@ Music_KantoTrainerBattle_branch_ece5a: note F#, 1 octave 4 note D#, 1 - intensity $14 + volume_envelope 1, 4 octave 3 note F_, 1 note G#, 1 @@ -1458,7 +1459,7 @@ Music_KantoTrainerBattle_branch_ece5a: note A#, 4 octave 6 note C#, 1 - note __, 1 + rest 1 note C_, 6 octave 4 note C_, 1 @@ -1486,7 +1487,7 @@ Music_KantoTrainerBattle_branch_ece5a: octave 5 note A#, 4 note B_, 1 - note __, 1 + rest 1 octave 6 note F#, 12 note F_, 1 @@ -1494,21 +1495,21 @@ Music_KantoTrainerBattle_branch_ece5a: note G#, 16 note F_, 8 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 5 note G#, 1 - note __, 1 + rest 1 octave 6 note F_, 1 note F#, 1 note F_, 1 note D#, 1 note F_, 1 - notetype $6, $24 + note_type 6, 2, 4 note E_, 1 note D_, 1 note C_, 1 @@ -1516,21 +1517,21 @@ Music_KantoTrainerBattle_branch_ece5a: note B_, 1 note A_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 2 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $14 + rest 1 + volume_envelope 1, 4 octave 5 note G_, 4 - loopchannel 0, Music_KantoTrainerBattle_branch_ece5a + sound_loop 0, .mainloop diff --git a/audio/music/kantowildbattle.asm b/audio/music/kantowildbattle.asm index c19da00d..481fcc38 100644 --- a/audio/music/kantowildbattle.asm +++ b/audio/music/kantowildbattle.asm @@ -1,17 +1,18 @@ Music_KantoWildBattle: - musicheader 3, 1, Music_KantoWildBattle_Ch1 - musicheader 1, 2, Music_KantoWildBattle_Ch2 - musicheader 1, 3, Music_KantoWildBattle_Ch3 + channel_count 3 + channel 1, Music_KantoWildBattle_Ch1 + channel 2, Music_KantoWildBattle_Ch2 + channel 3, Music_KantoWildBattle_Ch3 - db $3 + db $3 ; unused Music_KantoWildBattle_Ch1: tempo 112 - volume $77 - vibrato $12, $23 - dutycycle $2 - notetype $c, $b7 - note __, 16 + volume 7, 7 + vibrato 18, 2, 3 + duty_cycle 2 + note_type 12, 11, 7 + rest 16 octave 4 note A#, 6 note A_, 1 @@ -24,16 +25,16 @@ Music_KantoWildBattle_Ch1: note G_, 1 note F#, 1 note F_, 1 -Music_KantoWildBattle_branch_ed091: - notetype $c, $b7 - callchannel Music_KantoWildBattle_branch_ed18a +.mainloop: + note_type 12, 11, 7 + sound_call .sub1 octave 4 note F_, 4 note C#, 4 octave 3 note B_, 8 - callchannel Music_KantoWildBattle_branch_ed18a - note __, 8 + sound_call .sub1 + rest 8 note G_, 1 note B_, 1 octave 4 @@ -45,7 +46,7 @@ Music_KantoWildBattle_branch_ed091: octave 4 note D_, 1 note D#, 1 - intensity $b1 + volume_envelope 11, 1 note E_, 6 note C_, 6 octave 3 @@ -54,7 +55,7 @@ Music_KantoWildBattle_branch_ed091: note E_, 6 note C_, 6 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note F_, 1 note C#, 1 octave 3 @@ -82,7 +83,7 @@ Music_KantoWildBattle_branch_ed091: note F_, 3 note G_, 1 note G#, 4 - intensity $b1 + volume_envelope 11, 1 octave 3 note G_, 6 note F_, 6 @@ -95,7 +96,7 @@ Music_KantoWildBattle_branch_ed091: octave 3 note A#, 6 note G_, 4 - notetype $8, $b7 + note_type 8, 11, 7 octave 2 note G_, 2 octave 3 @@ -129,31 +130,31 @@ Music_KantoWildBattle_branch_ed091: note C#, 2 octave 2 note G#, 2 - notetype $c, $b7 + note_type 12, 11, 7 octave 3 note G#, 4 octave 4 note C#, 4 - intensity $71 + volume_envelope 7, 1 note F_, 1 note F_, 1 - intensity $91 + volume_envelope 9, 1 note F_, 1 note F_, 1 - intensity $b1 + volume_envelope 11, 1 note G#, 1 note G#, 1 - intensity $d1 + volume_envelope 13, 1 note G#, 1 note G#, 1 - intensity $c7 + volume_envelope 12, 7 note E_, 1 note D_, 1 note C#, 1 note D_, 1 note E_, 12 note E_, 8 - intensity $b1 + volume_envelope 11, 1 note E_, 1 note D_, 1 note C_, 1 @@ -163,7 +164,7 @@ Music_KantoWildBattle_branch_ed091: note G_, 1 note F_, 1 note E_, 1 - intensity $b7 + volume_envelope 11, 7 note D_, 8 note F_, 8 note A#, 8 @@ -175,7 +176,7 @@ Music_KantoWildBattle_branch_ed091: note C_, 8 note E_, 8 note G_, 8 - note __, 8 + rest 8 octave 3 note D#, 8 note G#, 8 @@ -183,7 +184,7 @@ Music_KantoWildBattle_branch_ed091: note C_, 8 octave 3 note A#, 8 - note __, 8 + rest 8 octave 4 note D_, 8 octave 3 @@ -193,81 +194,81 @@ Music_KantoWildBattle_branch_ed091: note F_, 2 octave 4 note C_, 4 - note __, 6 + rest 6 note C_, 1 - note __, 5 + rest 5 note C#, 2 note C_, 1 - note __, 13 + rest 13 note C#, 4 - note __, 6 + rest 6 note C#, 1 - note __, 5 + rest 5 note F_, 2 note D#, 1 - note __, 5 + rest 5 note C#, 8 -Music_KantoWildBattle_branch_ed15b: - intensity $b1 +.loop1: + volume_envelope 11, 1 octave 3 note C_, 1 note D#, 1 note D_, 1 note C#, 1 - loopchannel 8, Music_KantoWildBattle_branch_ed15b -Music_KantoWildBattle_branch_ed166: + sound_loop 8, .loop1 +.loop2: note C#, 1 note F_, 1 note E_, 1 note D#, 1 - loopchannel 8, Music_KantoWildBattle_branch_ed166 -Music_KantoWildBattle_branch_ed16e: + sound_loop 8, .loop2 +.loop3: note C_, 1 note D#, 1 note D_, 1 note C#, 1 - loopchannel 16, Music_KantoWildBattle_branch_ed16e -Music_KantoWildBattle_branch_ed176: + sound_loop 16, .loop3 +.loop4: note C#, 1 note E_, 1 note D#, 1 note D_, 1 - loopchannel 8, Music_KantoWildBattle_branch_ed176 -Music_KantoWildBattle_branch_ed17e: + sound_loop 8, .loop4 +.loop5: note C_, 1 note D#, 1 note D_, 1 note C#, 1 - loopchannel 8, Music_KantoWildBattle_branch_ed17e - loopchannel 0, Music_KantoWildBattle_branch_ed091 + sound_loop 8, .loop5 + sound_loop 0, .mainloop -Music_KantoWildBattle_branch_ed18a: +.sub1: octave 4 note C_, 1 - note __, 5 + rest 5 octave 3 note B_, 1 - note __, 5 + rest 5 note A#, 1 - note __, 3 - note __, 10 + rest 3 + rest 10 octave 4 note C_, 2 - note __, 2 + rest 2 note D#, 2 note C#, 1 - note __, 5 + rest 5 note C_, 1 - note __, 5 + rest 5 octave 3 note B_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_KantoWildBattle_Ch2: - dutycycle $1 - vibrato $12, $23 - notetype $c, $b1 + duty_cycle 1 + vibrato 18, 2, 3 + note_type 12, 11, 1 octave 4 note G_, 1 note F#, 1 @@ -301,54 +302,55 @@ Music_KantoWildBattle_Ch2: note D#, 1 note D_, 1 note C#, 1 -Music_KantoWildBattle_branch_ed1c8: - notetype $c, $b7 - callchannel Music_KantoWildBattle_branch_ed2c6 +.mainloop: + note_type 12, 11, 7 + sound_call .sub1 octave 2 note F_, 2 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 - callchannel Music_KantoWildBattle_branch_ed2c6 + sound_call .sub1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 1 note B_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 note F#, 1 - notetype $6, $b7 - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - pitchoffset 0, C# - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - pitchoffset 0, C_ -rept 4 - callchannel Music_KantoWildBattle_branch_ed307 -endr - pitchoffset 0, C# - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - pitchoffset 0, C_ - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - note __, 16 + note_type 6, 11, 7 + sound_call .sub2 + sound_call .sub2 + transpose 0, 1 + sound_call .sub2 + sound_call .sub2 + transpose 0, 0 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + transpose 0, 1 + sound_call .sub2 + sound_call .sub2 + transpose 0, 0 + sound_call .sub2 + sound_call .sub2 + rest 16 octave 3 note A#, 16 octave 4 note D_, 16 note F_, 16 - notetype $c, $b7 + note_type 12, 11, 7 note E_, 16 note G_, 8 octave 5 note C_, 8 - note __, 8 + rest 8 octave 3 note G#, 8 octave 4 @@ -379,137 +381,137 @@ endr octave 3 note B_, 1 note G#, 1 - notetype $6, $b7 - callchannel Music_KantoWildBattle_branch_ed31b - pitchoffset 0, C# - callchannel Music_KantoWildBattle_branch_ed31b - pitchoffset 0, C_ - callchannel Music_KantoWildBattle_branch_ed340 + note_type 6, 11, 7 + sound_call .sub3 + transpose 0, 1 + sound_call .sub3 + transpose 0, 0 + sound_call .sub4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note C_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 4 note D#, 4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 octave 4 note F_, 4 octave 2 note C#, 2 - note __, 2 - callchannel Music_KantoWildBattle_branch_ed340 - callchannel Music_KantoWildBattle_branch_ed354 - callchannel Music_KantoWildBattle_branch_ed340 - callchannel Music_KantoWildBattle_branch_ed354 - pitchoffset 0, C# - callchannel Music_KantoWildBattle_branch_ed340 - pitchoffset 0, C_ + rest 2 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub5 + transpose 0, 1 + sound_call .sub4 + transpose 0, 0 note C#, 2 - note __, 2 + rest 2 octave 3 note G#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 2 note C#, 2 - note __, 2 + rest 2 octave 3 note A#, 4 octave 2 note C#, 2 - note __, 2 - callchannel Music_KantoWildBattle_branch_ed340 + rest 2 + sound_call .sub4 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note C_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 3 note A#, 4 octave 2 note C_, 2 - note __, 2 - loopchannel 0, Music_KantoWildBattle_branch_ed1c8 + rest 2 + sound_loop 0, .mainloop -Music_KantoWildBattle_branch_ed2c6: +.sub1: octave 2 note C_, 1 - note __, 2 + rest 2 note C_, 1 octave 1 note G_, 1 - note __, 1 + rest 1 octave 2 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 note C_, 1 - note __, 1 + rest 1 octave 1 note G_, 1 - note __, 2 + rest 2 note G_, 1 octave 2 note C_, 3 @@ -527,79 +529,79 @@ Music_KantoWildBattle_branch_ed2c6: octave 2 note G_, 2 note C#, 1 - note __, 2 + rest 2 note C#, 1 octave 1 note G#, 1 - note __, 1 + rest 1 octave 2 note C#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note C#, 2 octave 1 note G#, 1 - note __, 2 + rest 2 note G#, 1 octave 2 note C#, 1 - note __, 2 + rest 2 note C#, 1 octave 1 note G#, 1 - note __, 1 + rest 1 octave 2 note C#, 1 - note __, 1 + rest 1 octave 1 note G_, 2 - endchannel + sound_ret -Music_KantoWildBattle_branch_ed307: +.sub2: octave 2 note C_, 2 - note __, 4 + rest 4 note C_, 1 - note __, 1 + rest 1 note C_, 2 octave 3 note C_, 2 octave 2 note C_, 4 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note C_, 4 - endchannel + sound_ret -Music_KantoWildBattle_branch_ed31b: +.sub3: octave 2 note C_, 2 - note __, 4 + rest 4 note C_, 2 - note __, 4 + rest 4 octave 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note E_, 2 note C_, 6 note C_, 2 - note __, 4 + rest 4 note C_, 2 octave 1 note G_, 2 @@ -610,127 +612,127 @@ Music_KantoWildBattle_branch_ed31b: note G_, 2 octave 2 note C_, 2 - note __, 4 + rest 4 note C_, 2 note E_, 2 note G_, 2 note B_, 2 octave 3 note C_, 2 - endchannel + sound_ret -Music_KantoWildBattle_branch_ed340: +.sub4: octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_KantoWildBattle_branch_ed354: +.sub5: note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 4 octave 2 note C_, 2 - note __, 2 - endchannel + rest 2 + sound_ret Music_KantoWildBattle_Ch3: - vibrato $14, $23 - notetype $c, $14 + vibrato 20, 2, 3 + note_type 12, 1, 4 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 octave 4 note C_, 1 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 octave 4 note C#, 1 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 octave 4 note D_, 1 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 1 octave 4 note D#, 1 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 octave 4 note E_, 1 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 octave 4 note F_, 1 octave 3 note F#, 1 - note __, 1 + rest 1 note F#, 1 octave 4 note F#, 1 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 octave 4 note G_, 1 -Music_KantoWildBattle_branch_ed39e: - notetype $c, $14 +.mainloop: + note_type 12, 1, 4 octave 5 note G_, 1 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 2 + rest 2 octave 5 note G_, 1 - note __, 3 + rest 3 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 1 - note __, 2 + rest 2 octave 4 note G_, 1 octave 3 @@ -742,22 +744,22 @@ Music_KantoWildBattle_branch_ed39e: note D#, 6 octave 5 note D#, 2 - note __, 2 + rest 2 note G_, 2 note G#, 1 - note __, 2 + rest 2 octave 4 note G#, 1 - note __, 2 + rest 2 octave 5 note G#, 1 - note __, 3 + rest 3 octave 4 note G#, 1 - note __, 1 + rest 1 octave 5 note G#, 1 - note __, 2 + rest 2 octave 4 note G#, 1 octave 6 @@ -776,19 +778,19 @@ Music_KantoWildBattle_branch_ed39e: note B_, 1 octave 5 note G_, 1 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 2 + rest 2 octave 5 note G_, 1 - note __, 3 + rest 3 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G_, 1 - note __, 2 + rest 2 octave 4 note G_, 1 note C_, 1 @@ -798,22 +800,22 @@ Music_KantoWildBattle_branch_ed39e: note G_, 6 octave 5 note D#, 2 - note __, 2 + rest 2 note G_, 2 note G#, 1 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 2 + rest 2 octave 5 note G#, 1 - note __, 3 + rest 3 octave 4 note G_, 1 - note __, 1 + rest 1 octave 5 note G#, 1 - note __, 2 + rest 2 octave 4 note G_, 1 note C#, 4 @@ -822,7 +824,7 @@ Music_KantoWildBattle_branch_ed39e: note F_, 7 note F#, 1 note G_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 @@ -830,10 +832,10 @@ Music_KantoWildBattle_branch_ed39e: note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note F#, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 @@ -841,17 +843,17 @@ Music_KantoWildBattle_branch_ed39e: note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note E_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note G_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 @@ -859,10 +861,10 @@ Music_KantoWildBattle_branch_ed39e: note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note A_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G_, 1 @@ -870,14 +872,14 @@ Music_KantoWildBattle_branch_ed39e: note C_, 1 octave 4 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note G_, 2 - intensity $24 + volume_envelope 2, 4 note C_, 1 octave 4 note G#, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note G#, 12 note G_, 2 @@ -892,51 +894,51 @@ Music_KantoWildBattle_branch_ed39e: note C#, 8 octave 5 note C_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note E_, 1 note G_, 1 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 note A#, 2 - intensity $24 + volume_envelope 2, 4 note E_, 1 note G_, 1 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 note G#, 2 - intensity $24 + volume_envelope 2, 4 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note C#, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note E_, 1 note G_, 1 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note C_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note E_, 1 note G_, 1 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 note A#, 2 - intensity $24 + volume_envelope 2, 4 note E_, 1 note G_, 1 - intensity $14 + volume_envelope 1, 4 octave 5 note F_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note G_, 1 octave 5 @@ -945,9 +947,9 @@ Music_KantoWildBattle_branch_ed39e: note G_, 1 octave 5 note C_, 1 - intensity $14 + volume_envelope 1, 4 note E_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note G_, 1 octave 5 @@ -956,14 +958,14 @@ Music_KantoWildBattle_branch_ed39e: note G_, 1 octave 5 note C_, 1 - intensity $14 + volume_envelope 1, 4 note D_, 2 - intensity $24 + volume_envelope 2, 4 octave 4 note G_, 1 octave 5 note C_, 1 - intensity $14 + volume_envelope 1, 4 octave 4 note A#, 4 octave 5 @@ -971,157 +973,157 @@ Music_KantoWildBattle_branch_ed39e: note D_, 4 note F_, 4 note G#, 16 - notetype $6, $14 + note_type 6, 1, 4 note G#, 1 - note __, 1 - intensity $24 + rest 1 + volume_envelope 2, 4 note G#, 1 - note __, 1 - intensity $34 + rest 1 + volume_envelope 3, 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - intensity $24 + rest 1 + volume_envelope 2, 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - intensity $14 + rest 1 + volume_envelope 1, 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 6 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 5 note G_, 2 note F_, 2 note E_, 2 note F_, 2 - notetype $c, $15 + note_type 12, 1, 5 note G_, 12 note G_, 8 - notetype $6, $15 + note_type 6, 1, 5 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $24 + rest 1 + volume_envelope 2, 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $14 + rest 1 + volume_envelope 1, 4 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - notetype $c, $14 + rest 1 + note_type 12, 1, 4 octave 2 note A#, 16 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 2 - notetype $6, $15 + rest 2 + note_type 6, 1, 5 note C_, 1 - note __, 1 + rest 1 note C_, 2 octave 4 note C_, 2 octave 3 note C_, 4 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note C_, 4 note C_, 2 - note __, 4 + rest 4 note C_, 1 - note __, 1 + rest 1 note C_, 2 octave 4 note C_, 2 octave 3 note C_, 4 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 octave 2 note A#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 - notetype $c, $14 + rest 2 + note_type 12, 1, 4 note G#, 16 note G#, 16 note A#, 2 - note __, 2 + rest 2 note A#, 1 - note __, 3 + rest 3 note A#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 5 note E_, 4 octave 4 @@ -1131,12 +1133,12 @@ Music_KantoWildBattle_branch_ed39e: note B_, 1 octave 5 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 5 + rest 5 note F_, 2 note E_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 octave 3 @@ -1161,28 +1163,28 @@ Music_KantoWildBattle_branch_ed39e: octave 5 note C_, 1 note C#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 5 + rest 5 note G#, 2 note G_, 1 - note __, 5 + rest 5 note F_, 8 - intensity $13 + volume_envelope 1, 3 note G_, 6 note F#, 6 note E_, 2 - note __, 2 + rest 2 note G_, 6 note A_, 6 note G_, 2 - note __, 2 + rest 2 note G#, 12 note G_, 2 note F_, 2 note G#, 2 note G_, 2 - note __, 4 + rest 4 octave 6 note C#, 8 octave 5 @@ -1190,18 +1192,18 @@ Music_KantoWildBattle_branch_ed39e: octave 4 note A#, 6 note G#, 2 - note __, 2 + rest 2 octave 5 note C#, 6 note C_, 6 octave 4 note A#, 2 - note __, 2 + rest 2 octave 5 note F_, 6 note E_, 6 note D_, 2 - note __, 2 + rest 2 octave 4 note A#, 4 octave 5 @@ -1212,4 +1214,4 @@ Music_KantoWildBattle_branch_ed39e: note G#, 16 note G_, 16 note G_, 16 - loopchannel 0, Music_KantoWildBattle_branch_ed39e + sound_loop 0, .mainloop diff --git a/audio/music/lakeofrage.asm b/audio/music/lakeofrage.asm index 4f7154fd..dbc121c3 100644 --- a/audio/music/lakeofrage.asm +++ b/audio/music/lakeofrage.asm @@ -1,25 +1,26 @@ 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 + channel_count 4 + channel 1, Music_LakeOfRage_Ch1 + channel 2, Music_LakeOfRage_Ch2 + channel 3, Music_LakeOfRage_Ch3 + channel 4, Music_LakeOfRage_Ch4 Music_LakeOfRage_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0002 - vibrato $8, $22 - stereopanning $f0 - notetype $c, $b4 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 8, 2, 2 + stereo_panning TRUE, FALSE + note_type 12, 11, 4 octave 3 note D_, 6 note D_, 10 note D_, 6 note D_, 6 note E_, 4 -Music_LakeOfRage_branch_ee6e9: - intensity $b5 +.mainloop: + volume_envelope 11, 5 note F#, 6 note E_, 6 note D_, 4 @@ -31,43 +32,43 @@ Music_LakeOfRage_branch_ee6e9: octave 3 note B_, 6 note G_, 2 - notetype $8, $b5 + note_type 8, 11, 5 note D_, 4 note G_, 4 note B_, 4 - notetype $c, $b4 + note_type 12, 11, 4 note D_, 3 note F#, 1 - intensity $b7 + volume_envelope 11, 7 note A_, 8 note F#, 4 note A_, 3 octave 4 note C#, 1 note D_, 12 - notetype $8, $b4 + note_type 8, 11, 4 octave 3 note C_, 4 octave 2 note B_, 4 note A_, 4 - notetype $8, $b7 + note_type 8, 11, 7 note A_, 12 - notetype $c, $b7 + note_type 12, 11, 7 octave 3 note C_, 12 - intensity $b4 + volume_envelope 11, 4 note E_, 4 note D_, 2 - intensity $b7 + volume_envelope 11, 7 octave 2 note A_, 10 - intensity $b4 + volume_envelope 11, 4 octave 3 note E_, 4 note D_, 3 note E_, 1 - intensity $b7 + volume_envelope 11, 7 note F#, 8 note D_, 6 note C_, 1 @@ -80,34 +81,34 @@ Music_LakeOfRage_branch_ee6e9: note G_, 6 note F#, 1 note G_, 1 - intensity $a0 + volume_envelope 10, 0 note A_, 7 - intensity $a7 + volume_envelope 10, 7 note A_, 7 note A_, 1 octave 4 note C_, 1 - intensity $a0 + volume_envelope 10, 0 note D_, 6 - intensity $a7 + volume_envelope 10, 7 note D_, 6 - loopchannel 0, Music_LakeOfRage_branch_ee6e9 + sound_loop 0, .mainloop Music_LakeOfRage_Ch2: - dutycycle $3 - vibrato $20, $44 - stereopanning $ff - notetype $c, $90 + duty_cycle 3 + vibrato 32, 4, 4 + stereo_panning TRUE, TRUE + note_type 12, 9, 0 octave 3 note G_, 8 - intensity $97 + volume_envelope 9, 7 note G_, 8 - intensity $a0 + volume_envelope 10, 0 note A_, 8 - intensity $a7 + volume_envelope 10, 7 note A_, 8 -Music_LakeOfRage_branch_ee75e: - notetype $8, $c7 +.mainloop: + note_type 8, 12, 7 octave 4 note D_, 16 octave 3 @@ -119,45 +120,45 @@ Music_LakeOfRage_branch_ee75e: note C_, 4 octave 4 note B_, 4 - notetype $c, $c7 + note_type 12, 12, 7 note G_, 12 note B_, 4 note A_, 3 note G_, 1 - intensity $b0 + volume_envelope 11, 0 note F#, 12 - intensity $b7 + volume_envelope 11, 7 note F#, 16 - notetype $8, $c3 + note_type 8, 12, 3 octave 3 note G_, 4 note F#, 4 note E_, 4 note C_, 15 - notetype $c, $c3 + note_type 12, 12, 3 octave 4 note C_, 1 note E_, 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 note G_, 1 - intensity $c5 + volume_envelope 12, 5 octave 5 note C_, 10 - intensity $c3 + volume_envelope 12, 3 octave 4 note A_, 4 note G_, 4 note F#, 4 note E_, 2 - notetype $8, $c3 + note_type 8, 12, 3 note D_, 4 note E_, 4 note F#, 4 - notetype $8, $c7 + note_type 8, 12, 7 note A_, 12 - notetype $8, $c3 + note_type 8, 12, 3 octave 3 note G_, 4 note F#, 4 @@ -174,28 +175,28 @@ Music_LakeOfRage_branch_ee75e: note G_, 4 note F#, 4 note E_, 4 - notetype $8, $c7 + note_type 8, 12, 7 note F#, 16 note D_, 4 note F#, 4 - notetype $c, $c7 + note_type 12, 12, 7 note A_, 16 - loopchannel 0, Music_LakeOfRage_branch_ee75e + sound_loop 0, .mainloop Music_LakeOfRage_Ch3: - stereopanning $f - notetype $c, $16 + stereo_panning FALSE, TRUE + note_type 12, 1, 6 octave 3 note G_, 4 - note __, 2 + rest 2 note G_, 4 - note __, 6 + rest 6 note F#, 4 - note __, 2 + rest 2 note F#, 4 - note __, 2 + rest 2 note E_, 4 -Music_LakeOfRage_branch_ee7d0: +.mainloop: octave 3 note D_, 4 octave 2 @@ -293,30 +294,30 @@ Music_LakeOfRage_branch_ee7d0: note D_, 2 octave 2 note A_, 2 - loopchannel 0, Music_LakeOfRage_branch_ee7d0 + sound_loop 0, .mainloop Music_LakeOfRage_Ch4: - stereopanning $f0 - togglenoise $3 - notetype $c -Music_LakeOfRage_branch_ee83b: - note D_, 2 - note D_, 1 - note D_, 1 - note G_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note F#, 6 - note D_, 2 - note D_, 1 - note D_, 1 - note G_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note F#, 3 - note D_, 1 - note D_, 1 - note D_, 1 - loopchannel 0, Music_LakeOfRage_branch_ee83b + stereo_panning TRUE, FALSE + toggle_noise 3 + drum_speed 12 +.mainloop: + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 8, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 6 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 8, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 7, 3 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, .mainloop diff --git a/audio/music/lakeofragerocketradio.asm b/audio/music/lakeofragerocketradio.asm index 512db764..7e34e367 100644 --- a/audio/music/lakeofragerocketradio.asm +++ b/audio/music/lakeofragerocketradio.asm @@ -1,35 +1,36 @@ Music_LakeOfRageRocketRadio: - musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1 - musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2 - musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3 + channel_count 3 + channel 1, Music_LakeOfRageRocketRadio_Ch1 + channel 2, Music_LakeOfRageRocketRadio_Ch2 + channel 3, Music_LakeOfRageRocketRadio_Ch3 Music_LakeOfRageRocketRadio_Ch1: tempo 160 - volume $77 - dutycycle $1 - tone $1118 - vibrato $0, $f0 - stereopanning $f0 -Music_LakeOfRageRocketRadio_branch_ef5c9: - notetype $c, $a7 + volume 7, 7 + duty_cycle 1 + pitch_offset 4376 + vibrato 0, 15, 0 + stereo_panning TRUE, FALSE +.mainloop: + note_type 12, 10, 7 octave 7 note G_, 4 note F#, 4 note G_, 4 note F#, 4 - note __, 16 - loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + rest 16 + sound_loop 0, .mainloop Music_LakeOfRageRocketRadio_Ch2: - dutycycle $1 - vibrato $13, $e8 - notetype $c, $a7 - note __, 2 - stereopanning $f - loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + duty_cycle 1 + vibrato 19, 14, 8 + note_type 12, 10, 7 + rest 2 + stereo_panning FALSE, TRUE + sound_loop 0, Music_LakeOfRageRocketRadio_Ch1.mainloop Music_LakeOfRageRocketRadio_Ch3: - notetype $c, $26 - vibrato $10, $44 - note __, 4 - loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 + note_type 12, 2, 6 + vibrato 16, 4, 4 + rest 4 + sound_loop 0, Music_LakeOfRageRocketRadio_Ch1.mainloop diff --git a/audio/music/lavendertown.asm b/audio/music/lavendertown.asm index 6384b701..bd904e61 100644 --- a/audio/music/lavendertown.asm +++ b/audio/music/lavendertown.asm @@ -1,95 +1,96 @@ Music_LavenderTown: - musicheader 3, 1, Music_LavenderTown_Ch1 - musicheader 1, 2, Music_LavenderTown_Ch2 - musicheader 1, 3, Music_LavenderTown_Ch3 + channel_count 3 + channel 1, Music_LavenderTown_Ch1 + channel 2, Music_LavenderTown_Ch2 + channel 3, Music_LavenderTown_Ch3 - db $3 + db $3 ; unused Music_LavenderTown_Ch1: tempo 160 - volume $77 - stereopanning $f - vibrato $6, $24 - dutycycle $0 - notetype $c, $b3 - note __, 16 - note __, 16 - note __, 16 - note __, 16 -Music_LavenderTown_branch_ef74c: - callchannel Music_LavenderTown_branch_ef7fd - intensity $93 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 6, 2, 4 + duty_cycle 0 + note_type 12, 11, 3 + rest 16 + rest 16 + rest 16 + rest 16 +.mainloop: + sound_call .sub1 + volume_envelope 9, 3 octave 5 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note F#, 2 - intensity $43 + volume_envelope 4, 3 note F#, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $43 + volume_envelope 4, 3 note A_, 2 - callchannel Music_LavenderTown_branch_ef87f - intensity $93 - intensity $93 + sound_call .sub2 + volume_envelope 9, 3 + volume_envelope 9, 3 note F_, 2 - intensity $83 + volume_envelope 8, 3 note F_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 octave 4 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - callchannel Music_LavenderTown_branch_ef7fd - intensity $93 + sound_call .sub1 + volume_envelope 9, 3 octave 5 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - callchannel Music_LavenderTown_branch_ef87f - intensity $93 + sound_call .sub2 + volume_envelope 9, 3 octave 6 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $93 + volume_envelope 9, 3 octave 5 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $43 + volume_envelope 4, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 octave 3 note F_, 2 @@ -102,7 +103,7 @@ Music_LavenderTown_branch_ef74c: octave 3 note A_, 2 note F_, 2 -Music_LavenderTown_branch_ef7ca: +.loop1: octave 3 note C_, 2 note E_, 2 @@ -124,7 +125,7 @@ Music_LavenderTown_branch_ef7ca: octave 3 note A_, 2 note F_, 2 - loopchannel 2, Music_LavenderTown_branch_ef7ca + sound_loop 2, .loop1 note F#, 2 note A_, 2 octave 4 @@ -147,163 +148,163 @@ Music_LavenderTown_branch_ef7ca: octave 3 note B_, 8 note B_, 8 - loopchannel 0, Music_LavenderTown_branch_ef74c + sound_loop 0, .mainloop -Music_LavenderTown_branch_ef7fd: - intensity $83 +.sub1: + volume_envelope 8, 3 octave 5 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 octave 6 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $83 + volume_envelope 8, 3 octave 5 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $83 + volume_envelope 8, 3 note A_, 2 - intensity $43 + volume_envelope 4, 3 note A_, 2 - intensity $83 + volume_envelope 8, 3 octave 6 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $83 + volume_envelope 8, 3 octave 5 note A_, 2 - intensity $43 + volume_envelope 4, 3 note A_, 2 - intensity $83 + volume_envelope 8, 3 note E_, 2 - intensity $43 + volume_envelope 4, 3 note E_, 2 - intensity $83 + volume_envelope 8, 3 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $83 + volume_envelope 8, 3 octave 6 note E_, 2 - intensity $43 + volume_envelope 4, 3 note E_, 2 - intensity $83 + volume_envelope 8, 3 octave 5 note B_, 2 - intensity $43 + volume_envelope 4, 3 note B_, 2 - intensity $83 + volume_envelope 8, 3 note C#, 2 - intensity $43 + volume_envelope 4, 3 note C#, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 note A#, 2 - intensity $43 + volume_envelope 4, 3 note A#, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $83 + volume_envelope 8, 3 note F_, 2 - intensity $43 + volume_envelope 4, 3 note F_, 2 - intensity $83 + volume_envelope 8, 3 octave 6 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $83 + volume_envelope 8, 3 octave 5 note F_, 2 - intensity $43 + volume_envelope 4, 3 note F_, 2 - endchannel + sound_ret -Music_LavenderTown_branch_ef87f: - intensity $93 +.sub2: + volume_envelope 9, 3 octave 5 note G_, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $83 + volume_envelope 8, 3 note F_, 2 - intensity $43 + volume_envelope 4, 3 note F_, 2 - intensity $83 + volume_envelope 8, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $83 + volume_envelope 8, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - endchannel + sound_ret Music_LavenderTown_Ch2: - dutycycle $1 - vibrato $8, $24 - stereopanning $ff -Music_LavenderTown_branch_ef8a0: - notetype $c, $a3 + duty_cycle 1 + vibrato 8, 2, 4 + stereo_panning TRUE, TRUE +.loop1: + note_type 12, 10, 3 octave 5 note C_, 2 - intensity $63 + volume_envelope 6, 3 note C_, 2 - intensity $a3 + volume_envelope 10, 3 note G_, 2 - intensity $63 + volume_envelope 6, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note B_, 2 - intensity $63 + volume_envelope 6, 3 note B_, 2 - intensity $a3 + volume_envelope 10, 3 note F#, 2 - intensity $63 + volume_envelope 6, 3 note F#, 2 - loopchannel 3, Music_LavenderTown_branch_ef8a0 - intensity $a3 + sound_loop 3, .loop1 + volume_envelope 10, 3 note C_, 2 - intensity $63 + volume_envelope 6, 3 note C_, 2 - intensity $a3 + volume_envelope 10, 3 note G_, 2 - intensity $63 + volume_envelope 6, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note B_, 2 - intensity $63 + volume_envelope 6, 3 note B_, 2 - intensity $a3 + volume_envelope 10, 3 octave 6 note D_, 2 - intensity $63 + volume_envelope 6, 3 note D_, 2 -Music_LavenderTown_branch_ef8d7: - intensity $b5 - callchannel Music_LavenderTown_branch_ef915 +.mainloop: + volume_envelope 11, 5 + sound_call .sub1 octave 2 note F#, 4 octave 3 @@ -321,7 +322,7 @@ Music_LavenderTown_branch_ef8d7: octave 2 note B_, 4 note G_, 4 - callchannel Music_LavenderTown_branch_ef915 + sound_call .sub1 octave 2 note G_, 4 octave 3 @@ -337,7 +338,7 @@ Music_LavenderTown_branch_ef8d7: note G_, 4 octave 4 note C_, 4 - intensity $b7 + volume_envelope 11, 7 octave 2 note F_, 16 note C_, 16 @@ -348,14 +349,14 @@ Music_LavenderTown_branch_ef8d7: note G_, 16 octave 1 note G_, 8 - intensity $57 + volume_envelope 5, 7 octave 5 note D_, 1 note F_, 1 note G_, 6 - loopchannel 0, Music_LavenderTown_branch_ef8d7 + sound_loop 0, .mainloop -Music_LavenderTown_branch_ef915: +.sub1: octave 2 note C_, 4 note G_, 4 @@ -384,28 +385,28 @@ Music_LavenderTown_branch_ef915: note C_, 4 note A_, 4 note C_, 4 - endchannel + sound_ret Music_LavenderTown_Ch3: - vibrato $12, $24 - notetype $c, $13 - stereopanning $f0 - note __, 16 - note __, 16 - note __, 16 - note __, 8 + vibrato 18, 2, 4 + note_type 12, 1, 3 + stereo_panning TRUE, FALSE + rest 16 + rest 16 + rest 16 + rest 8 octave 5 note E_, 4 note F_, 4 -Music_LavenderTown_branch_ef941: - intensity $12 +.mainloop: + volume_envelope 1, 2 octave 5 note G_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 4 note G_, 4 @@ -413,7 +414,7 @@ Music_LavenderTown_branch_ef941: note E_, 4 note B_, 4 note C#, 8 - note __, 2 + rest 2 note C#, 2 note D_, 2 note E_, 2 @@ -433,11 +434,11 @@ Music_LavenderTown_branch_ef941: note E_, 2 note F_, 2 note G_, 4 - note __, 4 + rest 4 note G_, 4 - note __, 4 + rest 4 note E_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 4 note G_, 4 @@ -445,7 +446,7 @@ Music_LavenderTown_branch_ef941: note E_, 4 note B_, 4 note C#, 8 - note __, 2 + rest 2 note C#, 2 note D_, 2 note E_, 2 @@ -458,8 +459,8 @@ Music_LavenderTown_branch_ef941: note D_, 2 note C_, 16 note C_, 12 - note __, 4 - intensity $24 + rest 4 + volume_envelope 2, 4 note A_, 2 note G_, 2 note A_, 2 @@ -482,11 +483,11 @@ Music_LavenderTown_branch_ef941: note G_, 4 octave 6 note F_, 4 - notetype $8, $24 + note_type 8, 2, 4 note E_, 2 note F_, 2 note E_, 2 - notetype $c, $24 + note_type 12, 2, 4 note D_, 4 note C_, 4 octave 5 @@ -511,4 +512,4 @@ Music_LavenderTown_branch_ef941: note B_, 12 note E_, 2 note F_, 2 - loopchannel 0, Music_LavenderTown_branch_ef941 + sound_loop 0, .mainloop diff --git a/audio/music/lighthouse.asm b/audio/music/lighthouse.asm index 9846e7ec..2cc3b451 100644 --- a/audio/music/lighthouse.asm +++ b/audio/music/lighthouse.asm @@ -1,18 +1,19 @@ 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 + channel_count 4 + channel 1, Music_Lighthouse_Ch1 + channel 2, Music_Lighthouse_Ch2 + channel 3, Music_Lighthouse_Ch3 + channel 4, Music_Lighthouse_Ch4 Music_Lighthouse_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0004 - vibrato $8, $45 - stereopanning $f -Music_Lighthouse_branch_ee584: - notetype $c, $b3 + volume 7, 7 + duty_cycle 3 + pitch_offset 4 + vibrato 8, 4, 5 + stereo_panning FALSE, TRUE +.mainloop: + note_type 12, 11, 3 octave 3 note C#, 8 octave 2 @@ -27,29 +28,29 @@ Music_Lighthouse_branch_ee584: note A_, 4 note B_, 4 note G#, 1 - note __, 7 + rest 7 octave 3 note C_, 4 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note C_, 2 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C#, 8 octave 2 @@ -68,19 +69,19 @@ Music_Lighthouse_branch_ee584: note F#, 2 note A_, 2 note G#, 1 - note __, 7 + rest 7 octave 3 note C_, 12 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 octave 3 note C_, 1 - note __, 3 + rest 3 octave 2 note A_, 4 octave 3 @@ -126,14 +127,14 @@ Music_Lighthouse_branch_ee584: note B_, 2 note A_, 2 note G#, 8 - loopchannel 0, Music_Lighthouse_branch_ee584 + sound_loop 0, .mainloop Music_Lighthouse_Ch2: - dutycycle $3 - tone $0002 - vibrato $10, $45 -Music_Lighthouse_branch_ee604: - notetype $c, $c5 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 4, 5 +.mainloop: + note_type 12, 12, 5 octave 3 note G#, 12 note F#, 2 @@ -142,18 +143,18 @@ Music_Lighthouse_branch_ee604: octave 4 note C#, 8 note C_, 1 - note __, 7 + rest 7 octave 3 note G#, 16 - intensity $c5 + volume_envelope 12, 5 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note G#, 12 note F#, 2 note G#, 2 @@ -161,17 +162,17 @@ Music_Lighthouse_branch_ee604: octave 4 note C#, 8 note C_, 1 - note __, 7 + rest 7 note D#, 12 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 3 + rest 3 note D#, 1 - note __, 3 + rest 3 octave 4 note E_, 12 note D#, 2 @@ -208,102 +209,102 @@ Music_Lighthouse_branch_ee604: note D#, 2 note C#, 2 note C_, 8 - loopchannel 0, Music_Lighthouse_branch_ee604 + sound_loop 0, .mainloop Music_Lighthouse_Ch3: - notetype $c, $19 - stereopanning $f0 -Music_Lighthouse_branch_ee65b: + note_type 12, 1, -1 + stereo_panning TRUE, FALSE +.mainloop: octave 2 note G#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 -Music_Lighthouse_branch_ee664: + rest 2 +.loop1: note G#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 - loopchannel 2, Music_Lighthouse_branch_ee664 + rest 2 + sound_loop 2, .loop1 note G#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note C_, 2 note C#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 -Music_Lighthouse_branch_ee683: + rest 2 +.loop2: note C#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 - loopchannel 2, Music_Lighthouse_branch_ee683 + rest 2 + sound_loop 2, .loop2 note C#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D#, 2 note F#, 2 -Music_Lighthouse_branch_ee69b: +.loop3: note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 - loopchannel 8, Music_Lighthouse_branch_ee69b - loopchannel 0, Music_Lighthouse_branch_ee65b + rest 2 + sound_loop 8, .loop3 + sound_loop 0, .mainloop Music_Lighthouse_Ch4: - togglenoise $0 - notetype $c -Music_Lighthouse_branch_ee6b1: - stereopanning $f - note G#, 4 - note F_, 2 - note G#, 4 - note F_, 2 - note A_, 2 - note A#, 2 - stereopanning $ff - note G#, 2 - note F_, 4 - note G#, 2 - note F_, 4 - note G#, 2 - note A_, 2 - loopchannel 0, Music_Lighthouse_branch_ee6b1 + toggle_noise 0 + drum_speed 12 +.mainloop: + stereo_panning FALSE, TRUE + drum_note 9, 4 + drum_note 6, 2 + drum_note 9, 4 + drum_note 6, 2 + drum_note 10, 2 + drum_note 11, 2 + stereo_panning TRUE, TRUE + drum_note 9, 2 + drum_note 6, 4 + drum_note 9, 2 + drum_note 6, 4 + drum_note 9, 2 + drum_note 10, 2 + sound_loop 0, .mainloop diff --git a/audio/music/lookbeauty.asm b/audio/music/lookbeauty.asm index 313f2366..c710d7c8 100644 --- a/audio/music/lookbeauty.asm +++ b/audio/music/lookbeauty.asm @@ -1,68 +1,69 @@ 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 + channel_count 4 + channel 1, Music_LookBeauty_Ch1 + channel 2, Music_LookBeauty_Ch2 + channel 3, Music_LookBeauty_Ch3 + channel 4, Music_LookBeauty_Ch4 Music_LookBeauty_Ch1: - stereopanning $f - vibrato $12, $25 - dutycycle $2 + stereo_panning FALSE, TRUE + vibrato 18, 2, 5 + duty_cycle 2 tempo 128 - volume $77 - notetype $c, $a3 - note __, 16 - note __, 8 + volume 7, 7 + note_type 12, 10, 3 + rest 16 + rest 8 octave 4 note C_, 8 - dutycycle $3 -Music_LookBeauty_branch_eee5f: - note __, 4 + duty_cycle 3 +.mainloop: + rest 4 octave 3 note D_, 1 - note __, 5 + rest 5 note D_, 1 - note __, 5 - note __, 2 + rest 5 + rest 2 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 5 + rest 5 note D_, 4 - note __, 4 + rest 4 note D_, 1 - note __, 5 + rest 5 note D_, 1 - note __, 5 - note __, 2 + rest 5 + rest 2 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 4 + rest 4 note E_, 1 - note __, 5 + rest 5 note E_, 1 - note __, 5 - note __, 2 + rest 5 + rest 2 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 4 - note __, 4 + rest 4 note F#, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note D_, 2 note D_, 1 - note __, 7 + rest 7 octave 2 note A_, 1 octave 3 @@ -74,252 +75,252 @@ Music_LookBeauty_branch_eee5f: note A_, 1 octave 4 note C_, 1 - loopchannel 0, Music_LookBeauty_branch_eee5f + sound_loop 0, .mainloop Music_LookBeauty_Ch2: - stereopanning $f0 - vibrato $10, $23 - dutycycle $2 - notetype $c, $c7 + stereo_panning TRUE, FALSE + vibrato 16, 2, 3 + duty_cycle 2 + note_type 12, 12, 7 octave 3 note D_, 1 - note __, 1 + rest 1 octave 5 note D_, 6 note C_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 2 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - dutycycle $3 -Music_LookBeauty_branch_eeec5: - notetype $c, $c7 + rest 1 + duty_cycle 3 +.mainloop: + note_type 12, 12, 7 note G_, 16 note A_, 8 note B_, 8 note A_, 10 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 2 note G#, 8 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note E_, 2 - intensity $b7 - vibrato $10, $24 + volume_envelope 11, 7 + vibrato 16, 2, 4 octave 5 note C_, 15 - notetype $6, $c7 - intensity $c5 - vibrato $10, $23 - note __, 1 + note_type 6, 12, 7 + volume_envelope 12, 5 + vibrato 16, 2, 3 + rest 1 note C#, 1 note D_, 16 note C_, 16 octave 4 note B_, 16 - note __, 4 + rest 4 octave 5 note D_, 2 - note __, 2 + rest 2 octave 4 note B_, 2 - note __, 2 + rest 2 note A_, 6 - note __, 14 + rest 14 note F#, 8 note A_, 8 - loopchannel 0, Music_LookBeauty_branch_eeec5 + sound_loop 0, .mainloop Music_LookBeauty_Ch3: - stereopanning $ff - vibrato $8, $12 - notetype $c, $15 - note __, 16 + stereo_panning TRUE, TRUE + vibrato 8, 1, 2 + note_type 12, 1, 5 + rest 16 octave 5 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 3 note D_, 7 note F#, 1 -Music_LookBeauty_branch_eef0f: +.mainloop: note G_, 4 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note G_, 2 note G_, 1 octave 4 note A#, 1 note B_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 3 + rest 3 octave 4 note B_, 4 octave 3 note E_, 4 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note E_, 1 octave 4 note G_, 1 note G#, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 3 + rest 3 note G#, 2 - note __, 2 + rest 2 note B_, 2 octave 3 note A_, 4 octave 5 note C_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 3 note E_, 1 - note __, 1 + rest 1 note A_, 2 note A_, 1 octave 4 note B_, 1 octave 5 note C_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note C_, 4 octave 3 note D_, 4 octave 4 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 4 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 4 note A_, 2 note A_, 1 - note __, 7 + rest 7 octave 3 note D_, 8 - loopchannel 0, Music_LookBeauty_branch_eef0f + sound_loop 0, .mainloop Music_LookBeauty_Ch4: - togglenoise $3 - notetype $c - note __, 16 - note __, 16 -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 + toggle_noise 3 + drum_speed 12 + rest 16 + rest 16 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookBeauty_branch_eefa1: - note F#, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note F#, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - endchannel +.sub1: + drum_note 7, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + sound_ret diff --git a/audio/music/lookhiker.asm b/audio/music/lookhiker.asm index 9a394eb7..913aecea 100644 --- a/audio/music/lookhiker.asm +++ b/audio/music/lookhiker.asm @@ -1,40 +1,41 @@ 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 + channel_count 4 + channel 1, Music_LookHiker_Ch1 + channel 2, Music_LookHiker_Ch2 + channel 3, Music_LookHiker_Ch3 + channel 4, Music_LookHiker_Ch4 Music_LookHiker_Ch1: tempo 132 - volume $77 - tone $0001 - vibrato $12, $24 - dutycycle $2 - stereopanning $f - notetype $c, $68 + volume 7, 7 + pitch_offset 1 + vibrato 18, 2, 4 + duty_cycle 2 + stereo_panning FALSE, TRUE + note_type 12, 6, 8 octave 3 note F#, 2 note F_, 2 note F#, 8 -Music_LookHiker_branch_f7433: +.mainloop: note D_, 2 note D#, 2 note E_, 2 note F_, 2 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 6 - loopchannel 0, Music_LookHiker_branch_f7433 + rest 6 + sound_loop 0, .mainloop Music_LookHiker_Ch2: - dutycycle $0 - notetype $c, $a1 - note __, 4 + duty_cycle 0 + note_type 12, 10, 1 + rest 4 octave 1 note B_, 1 note B_, 5 @@ -47,8 +48,8 @@ Music_LookHiker_Ch2: note D_, 1 note F#, 1 note D_, 1 - intensity $a1 -Music_LookHiker_branch_f7457: + volume_envelope 10, 1 +.mainloop: octave 1 note B_, 1 note B_, 2 @@ -65,50 +66,50 @@ Music_LookHiker_branch_f7457: note D_, 1 note F#, 1 note D_, 1 - loopchannel 0, Music_LookHiker_branch_f7457 + sound_loop 0, .mainloop Music_LookHiker_Ch3: - vibrato $12, $24 - stereopanning $f0 - notetype $c, $14 + vibrato 18, 2, 4 + stereo_panning TRUE, FALSE + note_type 12, 1, 4 octave 4 note B_, 2 note A#, 2 note B_, 8 -Music_LookHiker_branch_f7477: +.mainloop: octave 5 note D#, 2 note D_, 2 note C#, 2 note C_, 2 - callchannel Music_LookHiker_branch_f748a + sound_call .sub1 note G_, 2 note G#, 2 note A_, 2 note A#, 2 - callchannel Music_LookHiker_branch_f748a - loopchannel 0, Music_LookHiker_branch_f7477 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookHiker_branch_f748a: +.sub1: octave 4 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Music_LookHiker_Ch4: - togglenoise $3 - notetype $c - note F_, 4 - note __, 16 -Music_LookHiker_branch_f749a: - note D#, 2 - note G_, 2 - note D_, 2 - note G_, 2 - loopchannel 0, Music_LookHiker_branch_f749a + toggle_noise 3 + drum_speed 12 + drum_note 6, 4 + rest 16 +.mainloop: + drum_note 4, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 8, 2 + sound_loop 0, .mainloop diff --git a/audio/music/lookkimonogirl.asm b/audio/music/lookkimonogirl.asm index dc1dbee8..fd125b9f 100644 --- a/audio/music/lookkimonogirl.asm +++ b/audio/music/lookkimonogirl.asm @@ -1,116 +1,117 @@ Music_LookKimonoGirl: - musicheader 3, 1, Music_LookKimonoGirl_Ch1 - musicheader 1, 2, Music_LookKimonoGirl_Ch2 - musicheader 1, 3, Music_LookKimonoGirl_Ch3 + channel_count 3 + channel 1, Music_LookKimonoGirl_Ch1 + channel 2, Music_LookKimonoGirl_Ch2 + channel 3, Music_LookKimonoGirl_Ch3 - db $3 + db $3 ; unused Music_LookKimonoGirl_Ch1: tempo 160 - volume $77 - stereopanning $f - dutycycle $1 - notetype $6, $87 - tone $0001 - callchannel Music_LookKimonoGirl_branch_f7aa8 - tone 0 -Music_LookKimonoGirl_branch_f79d7: - notetype $c, $b2 - callchannel Music_LookKimonoGirl_branch_f7a13 - callchannel Music_LookKimonoGirl_branch_f7a13 - callchannel Music_LookKimonoGirl_branch_f7a34 - callchannel Music_LookKimonoGirl_branch_f7a34 - callchannel Music_LookKimonoGirl_branch_f7a13 - callchannel Music_LookKimonoGirl_branch_f7a13 - callchannel Music_LookKimonoGirl_branch_f7a34 - intensity $b4 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 1 + note_type 6, 8, 7 + pitch_offset 1 + sound_call Music_LookKimonoGirl_Ch2.sub2 + pitch_offset 0 +.mainloop: + note_type 12, 11, 2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + volume_envelope 11, 4 octave 3 note E_, 1 - intensity $54 + volume_envelope 5, 4 octave 4 note E_, 1 - intensity $b4 + volume_envelope 11, 4 octave 3 note D_, 1 - intensity $54 + volume_envelope 5, 4 octave 4 note D_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 1 - intensity $54 + volume_envelope 5, 4 octave 3 note B_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note A_, 1 - intensity $54 + volume_envelope 5, 4 octave 3 note A_, 1 - loopchannel 0, Music_LookKimonoGirl_branch_f79d7 + sound_loop 0, .mainloop -Music_LookKimonoGirl_branch_f7a13: - intensity $b4 +.sub1: + volume_envelope 11, 4 octave 2 note F_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note F_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note A_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note A_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note B_, 1 - intensity $b4 + volume_envelope 11, 4 octave 3 note D_, 1 - intensity $74 + volume_envelope 7, 4 octave 4 note D_, 1 - endchannel + sound_ret -Music_LookKimonoGirl_branch_f7a34: - intensity $b4 +.sub2: + volume_envelope 11, 4 octave 2 note E_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note E_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note A_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note A_, 1 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 1 - intensity $74 + volume_envelope 7, 4 octave 3 note B_, 1 - intensity $b4 + volume_envelope 11, 4 octave 3 note D_, 1 - intensity $74 + volume_envelope 7, 4 octave 4 note D_, 1 - endchannel + sound_ret Music_LookKimonoGirl_Ch2: - dutycycle $0 - notetype $6, $a7 - stereopanning $f0 - callchannel Music_LookKimonoGirl_branch_f7aa8 -Music_LookKimonoGirl_branch_f7a5f: - dutycycle $3 - notetype $c, $91 + duty_cycle 0 + note_type 6, 10, 7 + stereo_panning TRUE, FALSE + sound_call .sub2 +.mainloop: + duty_cycle 3 + note_type 12, 9, 1 octave 5 note E_, 1 note D_, 1 @@ -130,7 +131,7 @@ Music_LookKimonoGirl_branch_f7a5f: note A_, 1 note E_, 1 note D_, 1 - callchannel Music_LookKimonoGirl_branch_f7a94 + sound_call .sub1 octave 5 note F_, 1 note D_, 1 @@ -150,10 +151,10 @@ Music_LookKimonoGirl_branch_f7a5f: note A_, 1 note E_, 1 note D_, 1 - callchannel Music_LookKimonoGirl_branch_f7a94 - loopchannel 0, Music_LookKimonoGirl_branch_f7a5f + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookKimonoGirl_branch_f7a94: +.sub1: octave 5 note B_, 1 note A_, 1 @@ -173,60 +174,60 @@ Music_LookKimonoGirl_branch_f7a94: octave 3 note B_, 1 note E_, 1 - endchannel + sound_ret -Music_LookKimonoGirl_branch_f7aa8: +.sub2: octave 4 note E_, 1 octave 5 note E_, 16 - note __, 1 + rest 1 note E_, 2 - note __, 3 - intensity $b7 + rest 3 + volume_envelope 11, 7 note E_, 2 - note __, 2 - intensity $b7 + rest 2 + volume_envelope 11, 7 note E_, 2 - note __, 1 - intensity $a7 + rest 1 + volume_envelope 10, 7 note E_, 2 - note __, 1 - notetype $6, $65 + rest 1 + note_type 6, 6, 5 note E_, 2 - note __, 1 - intensity $54 + rest 1 + volume_envelope 5, 4 note E_, 2 - note __, 1 - intensity $63 + rest 1 + volume_envelope 6, 3 note E_, 2 note E_, 2 - intensity $91 + volume_envelope 9, 1 note E_, 2 - intensity $a1 + volume_envelope 10, 1 note E_, 1 - notetype $8, $b1 + note_type 8, 11, 1 note E_, 1 note E_, 1 - endchannel + sound_ret Music_LookKimonoGirl_Ch3: - stereopanning $ff - vibrato $12, $24 - notetype $6, $13 - note __, 1 - note __, 16 + stereo_panning TRUE, TRUE + vibrato 18, 2, 4 + note_type 6, 1, 3 + rest 1 + rest 16 octave 5 note E_, 1 note F_, 1 note E_, 2 - notetype $c, $13 + note_type 12, 1, 3 note E_, 12 - notetype $6, $13 + note_type 6, 1, 3 octave 5 note D_, 2 note E_, 2 -Music_LookKimonoGirl_branch_f7aec: +.mainloop: octave 5 note D_, 4 note E_, 4 @@ -262,4 +263,4 @@ Music_LookKimonoGirl_branch_f7aec: note E_, 2 note D_, 8 note E_, 8 - loopchannel 0, Music_LookKimonoGirl_branch_f7aec + sound_loop 0, .mainloop diff --git a/audio/music/looklass.asm b/audio/music/looklass.asm index 802716c1..05c487a7 100644 --- a/audio/music/looklass.asm +++ b/audio/music/looklass.asm @@ -1,71 +1,72 @@ 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 + channel_count 4 + channel 1, Music_LookLass_Ch1 + channel 2, Music_LookLass_Ch2 + channel 3, Music_LookLass_Ch3 + channel 4, Music_LookLass_Ch4 Music_LookLass_Ch1: tempo 132 - volume $77 - tone $0001 - dutycycle $2 - notetype $c, $c7 + volume 7, 7 + pitch_offset 1 + duty_cycle 2 + note_type 12, 12, 7 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note B_, 14 - stereopanning $f - dutycycle $0 -Music_LookLass_branch_ed7bd: - intensity $a2 + stereo_panning FALSE, TRUE + duty_cycle 0 +.mainloop: + volume_envelope 10, 2 octave 3 note E_, 4 - intensity $a1 + volume_envelope 10, 1 note E_, 4 note E_, 4 note E_, 2 - intensity $a3 + volume_envelope 10, 3 note B_, 2 - loopchannel 0, Music_LookLass_branch_ed7bd + sound_loop 0, .mainloop Music_LookLass_Ch2: - stereopanning $f0 - dutycycle $0 - notetype $c, $83 - note __, 16 -Music_LookLass_branch_ed7d5: - intensity $92 + stereo_panning TRUE, FALSE + duty_cycle 0 + note_type 12, 8, 3 + rest 16 +.mainloop: + volume_envelope 9, 2 octave 2 note B_, 4 - intensity $91 + volume_envelope 9, 1 note B_, 4 note B_, 4 note B_, 2 - intensity $93 + volume_envelope 9, 3 octave 3 note G#, 2 - loopchannel 0, Music_LookLass_branch_ed7d5 + sound_loop 0, .mainloop Music_LookLass_Ch3: - notetype $c, $10 - note __, 8 + note_type 12, 1, 0 + rest 8 octave 6 note E_, 2 note D#, 2 note C#, 2 note C_, 2 -Music_LookLass_branch_ed7ef: +.mainloop: octave 5 note B_, 2 - note __, 2 + rest 2 octave 6 note D#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C#, 2 note C_, 2 octave 5 @@ -78,15 +79,15 @@ Music_LookLass_branch_ed7ef: note C#, 2 octave 5 note B_, 2 - note __, 2 + rest 2 octave 6 note C#, 2 - note __, 2 + rest 2 octave 5 note B_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note G#, 2 note F#, 2 note E_, 2 @@ -95,20 +96,20 @@ Music_LookLass_branch_ed7ef: note F#, 2 note G#, 2 note A_, 2 - loopchannel 0, Music_LookLass_branch_ed7ef + sound_loop 0, .mainloop Music_LookLass_Ch4: - togglenoise $4 - notetype $c - note C_, 16 -Music_LookLass_branch_ed81f: - notetype $6 - note D_, 8 - note C#, 8 - note C#, 8 - note C#, 4 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 0, Music_LookLass_branch_ed81f + toggle_noise 4 + drum_speed 12 + drum_note 1, 16 +.mainloop: + drum_speed 6 + drum_note 3, 8 + drum_note 2, 8 + drum_note 2, 8 + drum_note 2, 4 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 0, .mainloop diff --git a/audio/music/lookofficer.asm b/audio/music/lookofficer.asm index 75e527b7..e069badc 100644 --- a/audio/music/lookofficer.asm +++ b/audio/music/lookofficer.asm @@ -1,43 +1,44 @@ Music_LookOfficer: - musicheader 3, 1, Music_LookOfficer_Ch1 - musicheader 1, 2, Music_LookOfficer_Ch2 - musicheader 1, 3, Music_LookOfficer_Ch3 + channel_count 3 + channel 1, Music_LookOfficer_Ch1 + channel 2, Music_LookOfficer_Ch2 + channel 3, Music_LookOfficer_Ch3 Music_LookOfficer_Ch1: tempo 116 - volume $77 - tone $0001 - vibrato $12, $34 - stereopanning $f - dutycycle $3 - notetype $c, $a7 + volume 7, 7 + pitch_offset 1 + vibrato 18, 3, 4 + stereo_panning FALSE, TRUE + duty_cycle 3 + note_type 12, 10, 7 octave 4 note C#, 1 note D_, 1 note D#, 1 note E_, 1 note F_, 12 - intensity $2f + volume_envelope 2, -7 octave 3 note B_, 16 -Music_LookOfficer_branch_ed852: - intensity $82 - note __, 4 +.mainloop: + volume_envelope 8, 2 + rest 4 note B_, 6 note G#, 4 note B_, 6 note B_, 6 note G#, 4 note B_, 2 - intensity $2f + volume_envelope 2, -7 note A#, 16 note A_, 16 - loopchannel 0, Music_LookOfficer_branch_ed852 + sound_loop 0, .mainloop Music_LookOfficer_Ch2: - vibrato $12, $34 - dutycycle $3 - notetype $c, $b7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 12, 11, 7 octave 5 note D#, 1 note D_, 1 @@ -45,8 +46,8 @@ Music_LookOfficer_Ch2: note C_, 1 octave 4 note B_, 12 - dutycycle $3 - intensity $a2 + duty_cycle 3 + volume_envelope 10, 2 octave 1 note B_, 4 octave 2 @@ -59,7 +60,8 @@ Music_LookOfficer_Ch2: note B_, 2 octave 2 note D#, 2 -Music_LookOfficer_branch_ed882: +.mainloop: +.loop1: note E_, 2 note G#, 2 octave 3 @@ -70,14 +72,14 @@ Music_LookOfficer_branch_ed882: note B_, 2 note E_, 2 note G#, 2 - loopchannel 2, Music_LookOfficer_branch_ed882 - pitchoffset 0, C# - callchannel Music_LookOfficer_branch_ed89e - pitchoffset 0, C_ - callchannel Music_LookOfficer_branch_ed89e - loopchannel 0, Music_LookOfficer_branch_ed882 + sound_loop 2, .loop1 + transpose 0, 1 + sound_call .sub1 + transpose 0, 0 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookOfficer_branch_ed89e: +.sub1: octave 1 note A_, 2 octave 2 @@ -92,31 +94,31 @@ Music_LookOfficer_branch_ed89e: note A_, 2 octave 2 note C#, 2 - endchannel + sound_ret Music_LookOfficer_Ch3: - vibrato $14, $14 - stereopanning $f0 - notetype $c, $14 - note __, 10 + vibrato 20, 1, 4 + stereo_panning TRUE, FALSE + note_type 12, 1, 4 + rest 10 octave 3 note B_, 2 - note __, 2 + rest 2 note B_, 2 - intensity $12 + volume_envelope 1, 2 octave 5 note D#, 2 - note __, 1 + rest 1 note F_, 2 - note __, 1 + rest 1 note A_, 2 note B_, 2 - note __, 1 + rest 1 octave 6 note C#, 2 - note __, 1 + rest 1 note D#, 2 -Music_LookOfficer_branch_ed8c8: +.mainloop: note E_, 6 note D#, 6 note C#, 4 @@ -134,4 +136,4 @@ Music_LookOfficer_branch_ed8c8: note D_, 8 note E_, 8 note C#, 8 - loopchannel 0, Music_LookOfficer_branch_ed8c8 + sound_loop 0, .mainloop diff --git a/audio/music/lookpokemaniac.asm b/audio/music/lookpokemaniac.asm index 4c4f8506..4fb44fd7 100644 --- a/audio/music/lookpokemaniac.asm +++ b/audio/music/lookpokemaniac.asm @@ -1,37 +1,39 @@ Music_LookPokemaniac: - musicheader 3, 1, Music_LookPokemaniac_Ch1 - musicheader 1, 2, Music_LookPokemaniac_Ch2 - musicheader 1, 3, Music_LookPokemaniac_Ch3 + channel_count 3 + channel 1, Music_LookPokemaniac_Ch1 + channel 2, Music_LookPokemaniac_Ch2 + channel 3, Music_LookPokemaniac_Ch3 Music_LookPokemaniac_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 144 - volume $77 - vibrato $2, $33 - tone $0002 - notetype $c, $b3 - note __, 8 -Music_LookPokemaniac_branch_ebdfb: - note __, 4 + volume 7, 7 + vibrato 2, 3, 3 + pitch_offset 2 + note_type 12, 11, 3 + rest 8 +.mainloop: +.loop1: + rest 4 octave 3 note A#, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 - loopchannel 4, Music_LookPokemaniac_branch_ebdfb - note __, 4 + rest 3 + sound_loop 4, .loop1 + rest 4 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - loopchannel 4, Music_LookPokemaniac_branch_ebdfb - loopchannel 0, Music_LookPokemaniac_branch_ebdfb + rest 3 + sound_loop 4, .loop1 + sound_loop 0, .mainloop Music_LookPokemaniac_Ch2: - stereopanning $ff - vibrato $2, $33 - tone $0001 - notetype $c, $b3 + stereo_panning TRUE, TRUE + vibrato 2, 3, 3 + pitch_offset 1 + note_type 12, 11, 3 octave 2 note A_, 1 note F#, 1 @@ -39,49 +41,50 @@ Music_LookPokemaniac_Ch2: note C_, 1 octave 1 note A_, 4 -Music_LookPokemaniac_branch_ebe24: +.mainloop: +.loop1: octave 2 note C_, 2 - note __, 2 + rest 2 octave 3 note F#, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 octave 1 note G_, 2 - note __, 2 + rest 2 octave 3 note C_, 1 - note __, 3 + rest 3 note D#, 1 - note __, 3 - loopchannel 2, Music_LookPokemaniac_branch_ebe24 -Music_LookPokemaniac_branch_ebe38: + rest 3 + sound_loop 2, .loop1 +.loop2: octave 1 note A_, 2 - note __, 2 + rest 2 octave 3 note D#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 3 + rest 3 octave 1 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 1 - note __, 3 + rest 3 octave 3 note C_, 1 - note __, 3 - loopchannel 2, Music_LookPokemaniac_branch_ebe38 - loopchannel 0, Music_LookPokemaniac_branch_ebe24 + rest 3 + sound_loop 2, .loop2 + sound_loop 0, .mainloop Music_LookPokemaniac_Ch3: - stereopanning $f0 - vibrato $6, $33 - notetype $c, $15 + stereo_panning TRUE, FALSE + vibrato 6, 3, 3 + note_type 12, 1, 5 octave 4 note C_, 1 note D#, 1 @@ -89,15 +92,15 @@ Music_LookPokemaniac_Ch3: note A_, 1 octave 5 note C_, 4 - intensity $10 -Music_LookPokemaniac_branch_ebe62: - callchannel Music_LookPokemaniac_branch_ebe70 - intensity $14 - callchannel Music_LookPokemaniac_branch_ebe70 - intensity $10 - loopchannel 0, Music_LookPokemaniac_branch_ebe62 + volume_envelope 1, 0 +.mainloop: + sound_call .sub1 + volume_envelope 1, 4 + sound_call .sub1 + volume_envelope 1, 0 + sound_loop 0, .mainloop -Music_LookPokemaniac_branch_ebe70: +.sub1: note A#, 6 note A_, 2 note G#, 2 @@ -109,23 +112,23 @@ Music_LookPokemaniac_branch_ebe70: octave 4 note D#, 4 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 5 note F#, 4 note C_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 6 note F#, 2 note F_, 2 @@ -137,23 +140,23 @@ Music_LookPokemaniac_branch_ebe70: note C_, 4 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note D#, 4 octave 4 note A_, 1 - note __, 1 + rest 1 octave 5 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 - endchannel + rest 1 + sound_ret diff --git a/audio/music/lookrival.asm b/audio/music/lookrival.asm index 5eff9991..d4b98ebe 100644 --- a/audio/music/lookrival.asm +++ b/audio/music/lookrival.asm @@ -1,17 +1,18 @@ 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 + channel_count 4 + channel 1, Music_LookRival_Ch1 + channel 2, Music_LookRival_Ch2 + channel 3, Music_LookRival_Ch3 + channel 4, Music_LookRival_Ch4 Music_LookRival_Ch1: tempo 112 - volume $77 - dutycycle $1 - tone $0001 - vibrato $12, $15 - stereopanning $f - notetype $c, $b2 + volume 7, 7 + duty_cycle 1 + pitch_offset 1 + vibrato 18, 1, 5 + stereo_panning FALSE, TRUE + note_type 12, 11, 2 octave 4 note C_, 1 octave 3 @@ -21,21 +22,20 @@ Music_LookRival_Ch1: note G#, 1 note F#, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note G#, 6 - intensity $b2 + volume_envelope 11, 2 note A#, 4 note F_, 2 note G#, 4 - intensity $a0 + volume_envelope 10, 0 note G#, 10 - intensity $a5 + volume_envelope 10, 5 note G#, 8 - intensity $a6 + volume_envelope 10, 6 note F#, 8 -Music_AfterTheRivalFight_branch_f4fb1: -Music_LookRival_branch_f4fb1: - intensity $b5 +.mainloop: + volume_envelope 11, 5 note F_, 4 note D#, 2 note F_, 6 @@ -45,15 +45,15 @@ Music_LookRival_branch_f4fb1: note A#, 4 note G#, 2 note G_, 4 - intensity $a0 + volume_envelope 10, 0 note F_, 2 - intensity $a7 + volume_envelope 10, 7 note F_, 16 - intensity $66 - note __, 2 + volume_envelope 6, 6 + rest 2 note F_, 2 note G_, 4 - intensity $b6 + volume_envelope 11, 6 note G#, 4 octave 4 note C_, 4 @@ -61,7 +61,7 @@ Music_LookRival_branch_f4fb1: note A#, 4 note G#, 2 note A#, 6 - intensity $b4 + volume_envelope 11, 4 note A#, 2 octave 4 note C_, 2 @@ -71,7 +71,7 @@ Music_LookRival_branch_f4fb1: note D#, 2 note C#, 2 note C_, 6 - intensity $b7 + volume_envelope 11, 7 octave 3 note A#, 12 note G#, 2 @@ -98,71 +98,70 @@ Music_LookRival_branch_f4fb1: note G#, 8 note F_, 6 note C_, 2 -Music_LookRival_branch_f4ff7: - intensity $b2 +.loop1: + volume_envelope 11, 2 note F_, 6 - intensity $b7 + volume_envelope 11, 7 note G#, 4 note F#, 2 note F_, 2 note D#, 2 - loopchannel 3, Music_LookRival_branch_f4ff7 - intensity $b2 + sound_loop 3, .loop1 + volume_envelope 11, 2 note F_, 2 note G#, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 6 note F#, 4 - loopchannel 0, Music_LookRival_branch_f4fb1 + sound_loop 0, .mainloop Music_LookRival_Ch2: - dutycycle $3 - vibrato $8, $36 - stereopanning $f0 - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + stereo_panning TRUE, FALSE + note_type 12, 12, 2 octave 4 note F#, 2 note F_, 2 note D#, 2 note C#, 2 note C_, 6 - intensity $c7 + volume_envelope 12, 7 note D#, 6 - intensity $c2 + volume_envelope 12, 2 note F_, 4 note C_, 2 note D#, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 10 - intensity $b7 + volume_envelope 11, 7 note D#, 16 -Music_AfterTheRivalFight_branch_f502e: -Music_LookRival_branch_f502e: - intensity $c7 +.mainloop: + volume_envelope 12, 7 note C_, 12 - intensity $c4 + volume_envelope 12, 4 note C_, 2 note D_, 2 note D#, 4 note D_, 4 note C_, 2 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note C_, 6 - intensity $b7 + volume_envelope 11, 7 note C_, 8 - intensity $b4 + volume_envelope 11, 4 octave 3 note A_, 2 note G_, 2 note A_, 2 - intensity $c6 + volume_envelope 12, 6 octave 4 note C_, 6 - intensity $c7 + volume_envelope 12, 7 note D#, 8 note F_, 12 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note G_, 2 note G#, 2 @@ -170,43 +169,43 @@ Music_LookRival_branch_f502e: note G_, 2 note G_, 2 note F_, 2 - intensity $c4 + volume_envelope 12, 4 note G_, 6 - intensity $b0 + volume_envelope 11, 0 note F_, 16 - intensity $b7 + volume_envelope 11, 7 note F_, 16 - intensity $b0 + volume_envelope 11, 0 note G_, 12 note F_, 4 note E_, 16 note F_, 12 note D#, 4 - intensity $c7 + volume_envelope 12, 7 note D_, 8 - intensity $c4 + volume_envelope 12, 4 note C_, 2 note D_, 2 note D#, 1 note D_, 1 note D#, 2 -Music_LookRival_branch_f5070: - intensity $c2 +.loop1: + volume_envelope 12, 2 note C_, 6 - intensity $c7 + volume_envelope 12, 7 note D#, 6 - intensity $c2 + volume_envelope 12, 2 note F_, 4 - loopchannel 3, Music_LookRival_branch_f5070 + sound_loop 3, .loop1 note C_, 2 note D#, 4 - intensity $c7 + volume_envelope 12, 7 note D#, 10 - loopchannel 0, Music_LookRival_branch_f502e + sound_loop 0, .mainloop Music_LookRival_Ch3: - notetype $c, $28 - note __, 2 + note_type 12, 2, 8 + rest 2 octave 4 note C_, 2 octave 3 @@ -226,17 +225,17 @@ Music_LookRival_Ch3: note C_, 2 note D#, 2 note F#, 2 -Music_AfterTheRivalFight_branch_f509d: -Music_LookRival_branch_f509d: - callchannel Music_LookRival_branch_f50ef - loopchannel 3, Music_LookRival_branch_f509d +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 note F_, 4 note C_, 2 note D#, 4 note G#, 2 note G_, 2 note F#, 2 - callchannel Music_LookRival_branch_f50f7 + sound_call .sub2 note A#, 2 note F_, 2 note G_, 2 @@ -245,7 +244,7 @@ Music_LookRival_branch_f509d: note G_, 2 note G#, 1 note A_, 1 - callchannel Music_LookRival_branch_f50ff + sound_call .sub3 note A#, 2 note F_, 2 note G_, 2 @@ -270,10 +269,10 @@ Music_LookRival_branch_f509d: note A_, 2 note A#, 1 note A_, 1 - callchannel Music_LookRival_branch_f50f7 - callchannel Music_LookRival_branch_f50ff - callchannel Music_LookRival_branch_f50ef - callchannel Music_LookRival_branch_f50ef + sound_call .sub2 + sound_call .sub3 + sound_call .sub1 + sound_call .sub1 note F_, 2 note C_, 2 note D_, 2 @@ -289,9 +288,9 @@ Music_LookRival_branch_f509d: note C_, 2 note F#, 2 note E_, 2 - loopchannel 0, Music_LookRival_branch_f509d + sound_loop 0, .mainloop -Music_LookRival_branch_f50ef: +.sub1: note F_, 2 note C_, 2 note D_, 2 @@ -299,9 +298,9 @@ Music_LookRival_branch_f50ef: note C_, 2 note D_, 2 note D#, 2 - endchannel + sound_ret -Music_LookRival_branch_f50f7: +.sub2: note A#, 2 note F_, 2 note G_, 2 @@ -309,44 +308,43 @@ Music_LookRival_branch_f50f7: note F_, 2 note G_, 2 note G#, 2 - endchannel + sound_ret -Music_LookRival_branch_f50ff: +.sub3: note A#, 4 note F_, 2 note G#, 4 note F_, 2 note G_, 2 note G#, 2 - endchannel + sound_ret Music_LookRival_Ch4: - stereopanning $f0 - togglenoise $3 - notetype $c - note __, 8 - note __, 16 - note D#, 2 - note D_, 4 - note D_, 6 - note D_, 4 - note D#, 4 - note D#, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 -Music_AfterTheRivalFight_branch_f5118: -Music_LookRival_branch_f5118: - note D#, 4 - note D_, 2 - note D#, 4 - note D#, 2 - note D_, 4 - note D#, 4 - note D_, 2 - note D#, 4 - note D#, 2 - note D_, 2 - note D_, 2 - loopchannel 0, Music_LookRival_branch_f5118 + stereo_panning TRUE, FALSE + toggle_noise 3 + drum_speed 12 + rest 8 + rest 16 + drum_note 4, 2 + drum_note 3, 4 + drum_note 3, 6 + drum_note 3, 4 + drum_note 4, 4 + drum_note 4, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 +.mainloop: + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 4 + drum_note 4, 4 + drum_note 3, 2 + drum_note 4, 4 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_loop 0, .mainloop diff --git a/audio/music/lookrocket.asm b/audio/music/lookrocket.asm index bd0c0e43..db1c6011 100644 --- a/audio/music/lookrocket.asm +++ b/audio/music/lookrocket.asm @@ -1,48 +1,48 @@ 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 + channel_count 4 + channel 1, Music_LookRocket_Ch1 + channel 2, Music_LookRocket_Ch2 + channel 3, Music_LookRocket_Ch3 + channel 4, Music_LookRocket_Ch4 Music_LookRocket_Ch1: tempo 123 - volume $77 - pitchoffset 0, D_ - stereopanning $f - dutycycle $3 - vibrato $5, $64 - notetype $c, $a8 + volume 7, 7 + transpose 0, 2 + stereo_panning FALSE, TRUE + duty_cycle 3 + vibrato 5, 6, 4 + note_type 12, 10, 8 octave 4 note C_, 1 note D_, 1 - callchannel Music_LookRocket_branch_f74e6 - dutycycle $1 -Music_LookRocket_branch_f74c7: - intensity $a8 - callchannel Music_LookRocket_branch_f74f7 - callchannel Music_LookRocket_branch_f758a + sound_call .sub1 + duty_cycle 1 +.mainloop: + volume_envelope 10, 8 + sound_call .sub2 + sound_call Music_LookRocket_Ch2.sub5 octave 4 note F#, 1 - note __, 1 - intensity $53 - callchannel Music_LookRocket_branch_f750c - intensity $c3 - callchannel Music_LookRocket_branch_f750c - intensity $e3 - callchannel Music_LookRocket_branch_f750c - note __, 16 - loopchannel 0, Music_LookRocket_branch_f74c7 + rest 1 + volume_envelope 5, 3 + sound_call .sub3 + volume_envelope 12, 3 + sound_call .sub3 + volume_envelope 14, 3 + sound_call .sub3 + rest 16 + sound_loop 0, .mainloop -Music_LookRocket_branch_f74e6: -Music_RocketTheme_branch_f74e6: +.sub1: note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 octave 2 note F_, 1 note G#, 1 @@ -51,14 +51,13 @@ Music_RocketTheme_branch_f74e6: note D_, 1 note F_, 1 note G#, 1 - endchannel + sound_ret -Music_LookRocket_branch_f74f7: -Music_RocketTheme_branch_f74f7: - note __, 2 +.sub2: + rest 2 octave 3 note D#, 1 - note __, 5 + rest 5 note D#, 4 octave 2 note A_, 2 @@ -67,74 +66,71 @@ Music_RocketTheme_branch_f74f7: note F_, 1 note F#, 6 note D#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f750c: -Music_RocketTheme_branch_f750c: - note __, 2 +.sub3: + rest 2 octave 2 note B_, 1 - note __, 7 + rest 7 octave 3 note C_, 1 - note __, 5 - endchannel + rest 5 + sound_ret Music_LookRocket_Ch2: - pitchoffset 0, D_ - vibrato $4, $64 - dutycycle $3 - notetype $c, $b7 - stereopanning $ff + transpose 0, 2 + vibrato 4, 6, 4 + duty_cycle 3 + note_type 12, 11, 7 + stereo_panning TRUE, TRUE octave 5 note C_, 1 note D_, 1 - callchannel Music_LookRocket_branch_f7547 -Music_LookRocket_branch_f7526: - intensity $b7 - callchannel Music_LookRocket_branch_f758a + sound_call .sub1 +.mainloop: + volume_envelope 11, 7 + sound_call .sub5 octave 5 note C_, 1 - note __, 1 - callchannel Music_LookRocket_branch_f7554 - intensity $53 - callchannel Music_LookRocket_branch_f7568 - intensity $c3 - callchannel Music_LookRocket_branch_f7568 - intensity $e3 - callchannel Music_LookRocket_branch_f7568 - callchannel Music_LookRocket_branch_f756f - loopchannel 0, Music_LookRocket_branch_f7526 + rest 1 + sound_call .sub2 + volume_envelope 5, 3 + sound_call .sub3 + volume_envelope 12, 3 + sound_call .sub3 + volume_envelope 14, 3 + sound_call .sub3 + sound_call .sub4 + sound_loop 0, .mainloop -Music_LookRocket_branch_f7547: -Music_RocketTheme_branch_f7547: +.sub1: note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 octave 3 note B_, 6 - dutycycle $0 - endchannel + duty_cycle 0 + sound_ret -Music_LookRocket_branch_f7554: -Music_RocketTheme_branch_f7554: - note __, 2 +.sub2: + rest 2 octave 4 note D#, 1 - note __, 5 + rest 5 note F_, 4 note C_, 1 note D_, 1 @@ -142,255 +138,245 @@ Music_RocketTheme_branch_f7554: note F_, 1 note F#, 6 note D#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 5 note D#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f7568: -Music_RocketTheme_branch_f7568: - note __, 2 +.sub3: + rest 2 octave 3 note F_, 1 - note __, 7 + rest 7 note F#, 1 - note __, 5 - endchannel + rest 5 + sound_ret -Music_LookRocket_branch_f756f: -Music_RocketTheme_branch_f756f: - intensity $63 +.sub4: + volume_envelope 6, 3 note G#, 1 note F_, 1 note D_, 1 octave 2 note B_, 1 - intensity $a3 + volume_envelope 10, 3 octave 3 note A_, 1 note F#, 1 note D#, 1 note C_, 1 - intensity $c3 + volume_envelope 12, 3 note A#, 1 note G_, 1 note E_, 1 note C#, 1 - intensity $f3 + volume_envelope 15, 3 note B_, 1 note G#, 1 note F_, 1 note D_, 1 - endchannel + sound_ret -Music_LookRocket_branch_f758a: -Music_RocketTheme_branch_f758a: +.sub5: octave 3 - note __, 2 + rest 2 note G_, 1 - note __, 5 + rest 5 note A_, 8 note A#, 6 note A_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret 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: - callchannel Music_LookRocket_branch_f75fe - callchannel Music_LookRocket_branch_f75fe - intensity $24 - callchannel Music_LookRocket_branch_f7623 - intensity $14 - callchannel Music_LookRocket_branch_f75cc - callchannel Music_LookRocket_branch_f7623 - callchannel Music_LookRocket_branch_f75e1 - loopchannel 0, Music_LookRocket_branch_f75a5 + transpose 0, 2 + vibrato 4, 2, 2 + note_type 12, 1, 4 + stereo_panning TRUE, FALSE + rest 2 + sound_call .sub1 +.mainloop: + sound_call .sub4 + sound_call .sub4 + volume_envelope 2, 4 + sound_call .sub5 + volume_envelope 1, 4 + sound_call .sub2 + sound_call .sub5 + sound_call .sub3 + sound_loop 0, .mainloop -Music_LookRocket_branch_f75bf: -Music_RocketTheme_branch_f75bf: +.sub1: octave 3 note F_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 octave 3 note D_, 6 - endchannel + sound_ret -Music_LookRocket_branch_f75cc: -Music_RocketTheme_branch_f75cc: +.sub2: octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f75e1: -Music_RocketTheme_branch_f75e1: - intensity $24 +.sub3: + volume_envelope 2, 4 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note F#, 1 - note __, 1 - intensity $14 + rest 1 + volume_envelope 1, 4 octave 2 note A#, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f75fe: -Music_RocketTheme_branch_f75fe: +.sub4: note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_LookRocket_branch_f7623: -Music_RocketTheme_branch_f7623: +.sub5: octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 note G#, 1 note F#, 1 note D#, 1 note C_, 1 - endchannel + sound_ret Music_LookRocket_Ch4: - togglenoise $3 - notetype $c - note __, 2 - callchannel Music_LookRocket_branch_f765c -Music_LookRocket_branch_f7640: - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f7664 - callchannel Music_LookRocket_branch_f765c - loopchannel 0, Music_LookRocket_branch_f7640 + toggle_noise 3 + drum_speed 12 + rest 2 + sound_call .sub1 +.mainloop: + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookRocket_branch_f765c: -Music_RocketTheme_branch_f765c: - note C_, 8 - note D_, 2 - note D#, 2 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - endchannel +.sub1: + drum_note 1, 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_ret -Music_LookRocket_branch_f7664: -Music_RocketTheme_branch_f7664: - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - endchannel +.sub2: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_ret diff --git a/audio/music/looksage.asm b/audio/music/looksage.asm index e1b51c39..1fa147ef 100644 --- a/audio/music/looksage.asm +++ b/audio/music/looksage.asm @@ -1,139 +1,140 @@ Music_LookSage: - musicheader 2, 1, Music_LookSage_Ch1 - musicheader 1, 3, Music_LookSage_Ch3 + channel_count 2 + channel 1, Music_LookSage_Ch1 + channel 3, Music_LookSage_Ch3 Music_LookSage_Ch1: tempo 144 - stereopanning $f - volume $77 - dutycycle $3 - notetype $c, $b3 - note __, 2 - note __, 16 - callchannel Music_LookSage_branch_ee3fa - intensity $b3 + stereo_panning FALSE, TRUE + volume 7, 7 + duty_cycle 3 + note_type 12, 11, 3 + rest 2 + rest 16 + sound_call .sub1 + volume_envelope 11, 3 octave 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note F_, 2 - intensity $93 + volume_envelope 9, 3 note F_, 2 -Music_LookSage_branch_ee38e: - intensity $b3 +.mainloop: + volume_envelope 11, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 octave 2 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 octave 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 octave 2 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 octave 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $b3 + volume_envelope 11, 3 note F_, 2 - intensity $93 + volume_envelope 9, 3 note F_, 2 - intensity $b3 + volume_envelope 11, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 - intensity $b3 + volume_envelope 11, 3 octave 2 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - callchannel Music_LookSage_branch_ee3fa - loopchannel 0, Music_LookSage_branch_ee38e + sound_call .sub1 + sound_loop 0, .mainloop -Music_LookSage_branch_ee3fa: - intensity $b3 +.sub1: + volume_envelope 11, 3 octave 2 note E_, 2 - intensity $93 + volume_envelope 9, 3 note E_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - intensity $b3 + volume_envelope 11, 3 note B_, 2 - intensity $93 + volume_envelope 9, 3 note B_, 2 - intensity $b3 + volume_envelope 11, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 note A_, 2 - endchannel + sound_ret Music_LookSage_Ch3: - stereopanning $f0 - vibrato $16, $23 - notetype $c, $10 + stereo_panning TRUE, FALSE + vibrato 22, 2, 3 + note_type 12, 1, 0 octave 5 note B_, 1 octave 6 note C_, 1 octave 5 note B_, 16 - vibrato $7, $23 + vibrato 7, 2, 3 note B_, 8 - vibrato $14, $23 + vibrato 20, 2, 3 octave 6 note D_, 6 note E_, 1 @@ -141,23 +142,23 @@ Music_LookSage_Ch3: note E_, 14 note G_, 1 note G#, 1 -Music_LookSage_branch_ee430: +.mainloop: note A_, 12 note B_, 4 note D_, 9 note E_, 1 note F_, 1 note D_, 1 - vibrato $0, $0 + vibrato 0, 0, 0 note E_, 4 - vibrato $7, $23 + vibrato 7, 2, 3 note E_, 8 - vibrato $14, $23 + vibrato 20, 2, 3 octave 5 note B_, 8 octave 6 note F_, 8 - notetype $6, $10 + note_type 6, 1, 0 note E_, 1 note D#, 1 note D_, 1 @@ -167,12 +168,12 @@ Music_LookSage_branch_ee430: note B_, 1 note A#, 1 note A_, 1 - note __, 4 + rest 4 octave 6 note E_, 2 note F_, 2 - notetype $c, $10 + note_type 12, 1, 0 note E_, 14 note G_, 1 note G#, 1 - loopchannel 0, Music_LookSage_branch_ee430 + sound_loop 0, .mainloop diff --git a/audio/music/lookyoungster.asm b/audio/music/lookyoungster.asm index e835d5fe..3dcf302c 100644 --- a/audio/music/lookyoungster.asm +++ b/audio/music/lookyoungster.asm @@ -1,295 +1,293 @@ Music_LookYoungster: - musicheader 3, 1, Music_LookYoungster_Ch1 - musicheader 1, 2, Music_LookYoungster_Ch2 - musicheader 1, 3, Music_LookYoungster_Ch3 + channel_count 3 + channel 1, Music_LookYoungster_Ch1 + channel 2, Music_LookYoungster_Ch2 + channel 3, Music_LookYoungster_Ch3 Music_LookYoungster_Ch1: tempo 118 - volume $77 - stereopanning $f - dutycycle $3 - notetype $c, $a3 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 3 + note_type 12, 10, 3 octave 3 note G_, 1 note G#, 1 note A_, 1 note A#, 1 - intensity $3e + volume_envelope 3, -6 note B_, 16 - intensity $c3 + volume_envelope 12, 3 octave 4 note C_, 1 - note __, 3 + rest 3 note C_, 4 - note __, 2 + rest 2 note C_, 6 - intensity $b3 -Music_LookYoungster_branch_f66ea: - note __, 2 + volume_envelope 11, 3 +.mainloop: + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 1 - note __, 16 - note __, 2 + rest 1 + rest 16 + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 1 - note __, 16 - loopchannel 0, Music_LookYoungster_branch_f66ea - - db $ff + rest 1 + rest 16 + sound_loop 0, .mainloop + sound_ret Music_LookYoungster_Ch2: - stereopanning $f0 - vibrato $12, $26 - dutycycle $1 - notetype $c, $a3 + stereo_panning TRUE, FALSE + vibrato 18, 2, 6 + duty_cycle 1 + note_type 12, 10, 3 octave 3 note B_, 1 octave 4 note C_, 1 note C#, 1 note D_, 1 - intensity $3e - notetype $c, $2e + volume_envelope 3, -6 + note_type 12, 2, -6 note G_, 16 - notetype $c, $b3 - intensity $c3 + note_type 12, 11, 3 + volume_envelope 12, 3 note F_, 1 - note __, 3 + rest 3 note F_, 4 - note __, 2 + rest 2 note F#, 6 -Music_LookYoungster_branch_f672f: - dutycycle $3 - intensity $b3 - note __, 2 +.mainloop: + duty_cycle 3 + volume_envelope 11, 3 + rest 2 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 - intensity $97 - dutycycle $2 + rest 1 + volume_envelope 9, 7 + duty_cycle 2 note D#, 1 note F_, 1 note D#, 1 note D_, 1 note C_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - dutycycle $3 - intensity $b3 - note __, 2 + rest 1 + duty_cycle 3 + volume_envelope 11, 3 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 - dutycycle $2 - intensity $97 + rest 1 + duty_cycle 2 + volume_envelope 9, 7 note G#, 1 note A#, 1 note G#, 1 note G_, 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 + rest 3 octave 3 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 - loopchannel 0, Music_LookYoungster_branch_f672f - - db $ff + rest 1 + sound_loop 0, .mainloop + sound_ret Music_LookYoungster_Ch3: - stereopanning $ff - vibrato $2, $24 - notetype $c, $25 - note __, 4 + stereo_panning TRUE, TRUE + vibrato 2, 2, 4 + note_type 12, 2, 5 + rest 4 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 - intensity $15 + rest 1 + volume_envelope 1, 5 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 4 - note __, 2 + rest 2 note G#, 6 - intensity $25 -Music_LookYoungster_branch_f67ae: + volume_envelope 2, 5 +.mainloop: octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note F_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 - loopchannel 0, Music_LookYoungster_branch_f67ae - - db $ff + rest 1 + sound_loop 0, .mainloop + sound_ret diff --git a/audio/music/magnettrain.asm b/audio/music/magnettrain.asm index fd4229cb..f0c49d59 100644 --- a/audio/music/magnettrain.asm +++ b/audio/music/magnettrain.asm @@ -1,19 +1,20 @@ 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 + channel_count 4 + channel 1, Music_MagnetTrain_Ch1 + channel 2, Music_MagnetTrain_Ch2 + channel 3, Music_MagnetTrain_Ch3 + channel 4, Music_MagnetTrain_Ch4 Music_MagnetTrain_Ch1: tempo 110 - volume $77 - stereopanning $f - vibrato $14, $23 - dutycycle $2 - notetype $c, $b2 - note __, 16 - note __, 16 - intensity $b7 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 20, 2, 3 + duty_cycle 2 + note_type 12, 11, 2 + rest 16 + rest 16 + volume_envelope 11, 7 octave 4 note D_, 1 note C_, 1 @@ -59,57 +60,57 @@ Music_MagnetTrain_Ch1: note C_, 1 note E_, 1 note C_, 1 - notetype $6, $b7 + note_type 6, 11, 7 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - notetype $c, $b7 + rest 1 + note_type 12, 11, 7 note D_, 16 - endchannel + sound_ret Music_MagnetTrain_Ch2: - vibrato $14, $23 - dutycycle $1 - notetype $c, $d2 - stereopanning $f0 - notetype $c, $d8 + vibrato 20, 2, 3 + duty_cycle 1 + note_type 12, 13, 2 + stereo_panning TRUE, FALSE + note_type 12, 13, 8 octave 1 note F_, 12 - note __, 2 - notetype $6, $d7 + rest 2 + note_type 6, 13, 7 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 2 note F_, 4 - note __, 4 + rest 4 note F_, 4 - note __, 4 + rest 4 note F_, 4 - note __, 4 + rest 4 note F_, 4 - note __, 4 - dutycycle $3 - notetype $c, $d7 + rest 4 + duty_cycle 3 + note_type 12, 13, 7 octave 4 note G_, 16 note A_, 13 - note __, 1 - notetype $6, $d7 + rest 1 + note_type 6, 13, 7 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - notetype $c, $d7 + rest 1 + note_type 12, 13, 7 note A_, 16 - endchannel + sound_ret Music_MagnetTrain_Ch3: - stereopanning $ff - vibrato $10, $23 - notetype $c, $15 + stereo_panning TRUE, TRUE + vibrato 16, 2, 3 + note_type 12, 1, 5 octave 6 note C_, 1 octave 5 @@ -220,62 +221,61 @@ Music_MagnetTrain_Ch3: note D_, 1 octave 2 note D_, 16 - endchannel + sound_ret Music_MagnetTrain_Ch4: - togglenoise $3 - notetype $c - note B_, 12 - note D_, 2 - note A#, 1 - note A#, 1 - notetype $6 - note D#, 4 - note F#, 4 - note D#, 4 - note F#, 4 - note A#, 4 - note F#, 4 - note A#, 4 - note D_, 2 - note D_, 2 - callchannel Music_MagnetTrain_branch_ef71e - callchannel Music_MagnetTrain_branch_ef71e - notetype $c - note B_, 16 - endchannel + toggle_noise 3 + drum_speed 12 + drum_note 12, 12 + drum_note 3, 2 + drum_note 11, 1 + drum_note 11, 1 + drum_speed 6 + drum_note 4, 4 + drum_note 7, 4 + drum_note 4, 4 + drum_note 7, 4 + drum_note 11, 4 + drum_note 7, 4 + drum_note 11, 4 + drum_note 3, 2 + drum_note 3, 2 + sound_call .sub2 + sound_call .sub2 + drum_speed 12 + drum_note 12, 16 + sound_ret -; unused -Music_MagnetTrain_branch_ef711: - note G#, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G_, 1 - endchannel +.sub1: ; unused + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_ret -Music_MagnetTrain_branch_ef71e: - note G#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - note G#, 2 - note G_, 2 - note G_, 2 - note G_, 2 - endchannel +.sub2: + drum_note 9, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 9, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + sound_ret diff --git a/audio/music/mainmenu.asm b/audio/music/mainmenu.asm index b787a5ea..71f9c7ae 100644 --- a/audio/music/mainmenu.asm +++ b/audio/music/mainmenu.asm @@ -1,21 +1,23 @@ 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 + channel_count 4 + channel 1, Music_MainMenu_Ch1 + channel 2, Music_MainMenu_Ch2 + channel 3, Music_MainMenu_Ch3 + channel 4, Music_MainMenu_Ch4 Music_MainMenu_Ch1: tempo 160 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f0 - notetype $c, $f + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 0, -7 octave 3 note D_, 8 -Music_MainMenu_branch_f791d: - notetype $c, $92 +.mainloop: +.loop1: + note_type 12, 9, 2 octave 3 note C#, 6 note C#, 1 @@ -23,7 +25,7 @@ Music_MainMenu_branch_f791d: note C#, 2 note C#, 2 note C#, 4 - loopchannel 2, Music_MainMenu_branch_f791d + sound_loop 2, .loop1 note D#, 6 note D#, 1 note D#, 1 @@ -36,26 +38,27 @@ Music_MainMenu_branch_f791d: note B_, 1 note B_, 2 note B_, 2 - notetype $c, $94 + note_type 12, 9, 4 octave 3 note C_, 4 - loopchannel 0, Music_MainMenu_branch_f791d + sound_loop 0, .mainloop Music_MainMenu_Ch2: - dutycycle $3 - stereopanning $f - notetype $c, $f + duty_cycle 3 + stereo_panning FALSE, TRUE + note_type 12, 0, -7 octave 3 note G_, 8 -Music_MainMenu_branch_f7949: - notetype $c, $a2 +.mainloop: +.loop1: + note_type 12, 10, 2 note F#, 6 note F#, 1 note F#, 1 note F#, 2 note F#, 2 note F#, 4 - loopchannel 2, Music_MainMenu_branch_f7949 + sound_loop 2, .loop1 note G#, 6 note G#, 1 note G#, 1 @@ -67,76 +70,77 @@ Music_MainMenu_branch_f7949: note E_, 1 note E_, 2 note E_, 2 - notetype $c, $a4 + note_type 12, 10, 4 note F_, 4 - loopchannel 0, Music_MainMenu_branch_f7949 + sound_loop 0, .mainloop Music_MainMenu_Ch3: - stereopanning $f0 - notetype $c, $25 - note __, 8 -Music_MainMenu_branch_f796f: + stereo_panning TRUE, FALSE + note_type 12, 2, 5 + rest 8 +.mainloop: +.loop1: octave 2 note F#, 1 - note __, 5 + rest 5 note F#, 1 note F#, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 - loopchannel 2, Music_MainMenu_branch_f796f + rest 3 + sound_loop 2, .loop1 note G#, 1 - note __, 5 + rest 5 note G#, 1 note G#, 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note E_, 1 - note __, 5 + rest 5 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 3 - loopchannel 0, Music_MainMenu_branch_f796f + rest 3 + sound_loop 0, .mainloop Music_MainMenu_Ch4: - stereopanning $f - togglenoise $3 - notetype $c - note __, 8 - note __, 16 - note __, 16 - note __, 16 - note __, 12 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 -Music_MainMenu_branch_f79a5: - note D_, 6 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 6 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - loopchannel 0, Music_MainMenu_branch_f79a5 + stereo_panning FALSE, TRUE + toggle_noise 3 + drum_speed 12 + rest 8 + rest 16 + rest 16 + rest 16 + rest 12 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 +.mainloop: + drum_note 3, 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, .mainloop diff --git a/audio/music/mom.asm b/audio/music/mom.asm index a9bdef9c..9828c5d8 100644 --- a/audio/music/mom.asm +++ b/audio/music/mom.asm @@ -1,14 +1,15 @@ Music_Mom: - musicheader 3, 2, Music_Mom_Ch2 - musicheader 1, 3, Music_Mom_Ch3 - musicheader 1, 4, Music_Mom_Ch4 + channel_count 3 + channel 2, Music_Mom_Ch2 + channel 3, Music_Mom_Ch3 + channel 4, Music_Mom_Ch4 Music_Mom_Ch2: tempo 144 - volume $77 - stereopanning $f - dutycycle $2 - notetype $6, $b3 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 2 + note_type 6, 11, 3 octave 3 note B_, 1 octave 4 @@ -16,24 +17,24 @@ Music_Mom_Ch2: note G#, 1 note A_, 1 note B_, 8 -Music_Mom_branch_f6c0e: - notetype $c, $b1 - note __, 4 +.mainloop: + note_type 12, 11, 1 + rest 4 octave 3 note C#, 6 note D_, 4 note C_, 2 - note __, 2 + rest 2 note C#, 6 octave 2 note E_, 4 note A#, 2 note B_, 2 - loopchannel 0, Music_Mom_branch_f6c0e + sound_loop 0, .mainloop Music_Mom_Ch3: - stereopanning $f0 - notetype $6, $25 + stereo_panning TRUE, FALSE + note_type 6, 2, 5 octave 3 note E_, 1 note D_, 1 @@ -41,68 +42,68 @@ Music_Mom_Ch3: note B_, 1 note G#, 1 note E_, 8 - intensity $23 -Music_Mom_branch_f6c2e: + volume_envelope 2, 3 +.mainloop: octave 2 note A_, 2 - note __, 6 + rest 6 octave 4 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 8 note D#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 2 - note __, 6 + rest 6 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 6 + rest 6 note C#, 4 note D_, 2 - note __, 2 - loopchannel 0, Music_Mom_branch_f6c2e + rest 2 + sound_loop 0, .mainloop Music_Mom_Ch4: - togglenoise $3 - notetype $c - note __, 6 -Music_Mom_branch_f6c56: - note D#, 1 - note __, 1 - note F#, 2 - note D_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note F#, 4 - note D_, 1 - note __, 1 - note D#, 1 - note __, 1 - note F#, 4 - note D_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note D_, 2 - note D#, 1 - note __, 1 - loopchannel 0, Music_Mom_branch_f6c56 + toggle_noise 3 + drum_speed 12 + rest 6 +.mainloop: + drum_note 4, 1 + rest 1 + drum_note 7, 2 + drum_note 3, 1 + rest 1 + drum_note 8, 1 + rest 1 + drum_note 8, 1 + rest 1 + drum_note 7, 4 + drum_note 3, 1 + rest 1 + drum_note 4, 1 + rest 1 + drum_note 7, 4 + drum_note 3, 1 + rest 1 + drum_note 8, 1 + rest 1 + drum_note 8, 1 + rest 1 + drum_note 3, 2 + drum_note 4, 1 + rest 1 + sound_loop 0, .mainloop diff --git a/audio/music/mtmoon.asm b/audio/music/mtmoon.asm index 474335f4..4fedde56 100644 --- a/audio/music/mtmoon.asm +++ b/audio/music/mtmoon.asm @@ -1,26 +1,27 @@ 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 + channel_count 4 + channel 1, Music_MtMoon_Ch1 + channel 2, Music_MtMoon_Ch2 + channel 3, Music_MtMoon_Ch3 + channel 4, Music_MtMoon_Ch4 Music_MtMoon_Ch1: tempo 208 - volume $77 - dutycycle $2 - tone $0001 - vibrato $8, $14 - stereopanning $f0 - notetype $c, $45 - note __, 2 - loopchannel 0, Music_MtMoon_branch_edb56 + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + vibrato 8, 1, 4 + stereo_panning TRUE, FALSE + note_type 12, 4, 5 + rest 2 + sound_loop 0, Music_MtMoon_Ch2.mainloop Music_MtMoon_Ch2: - vibrato $b, $15 - dutycycle $2 - notetype $c, $84 - stereopanning $f -Music_MtMoon_branch_edb56: + vibrato 11, 1, 5 + duty_cycle 2 + note_type 12, 8, 4 + stereo_panning FALSE, TRUE +.mainloop: octave 4 note D#, 6 note C#, 6 @@ -69,12 +70,12 @@ Music_MtMoon_branch_edb56: note E_, 6 note F#, 6 note E_, 4 - loopchannel 0, Music_MtMoon_branch_edb56 + sound_loop 0, .mainloop Music_MtMoon_Ch3: -Music_MtMoon_branch_edb8a: - notetype $c, $28 -Music_MtMoon_branch_edb8d: +.mainloop: + note_type 12, 2, 8 +.loop1: octave 2 note B_, 2 octave 3 @@ -89,7 +90,7 @@ Music_MtMoon_branch_edb8d: note B_, 2 octave 3 note D#, 2 - loopchannel 3, Music_MtMoon_branch_edb8d + sound_loop 3, .loop1 octave 2 note B_, 2 octave 3 @@ -102,7 +103,7 @@ Music_MtMoon_branch_edb8d: note G_, 2 note D#, 2 note E_, 2 -Music_MtMoon_branch_edbab: +.loop2: note E_, 2 note G#, 2 octave 4 @@ -115,24 +116,24 @@ Music_MtMoon_branch_edbab: octave 3 note E_, 2 note G#, 2 - loopchannel 4, Music_MtMoon_branch_edbab - loopchannel 0, Music_MtMoon_branch_edb8a + sound_loop 4, .loop2 + sound_loop 0, .mainloop Music_MtMoon_Ch4: - togglenoise $5 - notetype $c -Music_MtMoon_branch_edbc3: - stereopanning $f - note A#, 4 - note A#, 8 - note A#, 4 - stereopanning $f0 - note A#, 4 - note A#, 4 - note A#, 4 - stereopanning $f - note A#, 4 - note A#, 4 - stereopanning $f0 - note A#, 8 - loopchannel 0, Music_MtMoon_branch_edbc3 + toggle_noise 5 + drum_speed 12 +.mainloop: + stereo_panning FALSE, TRUE + drum_note 11, 4 + drum_note 11, 8 + drum_note 11, 4 + stereo_panning TRUE, FALSE + drum_note 11, 4 + drum_note 11, 4 + drum_note 11, 4 + stereo_panning FALSE, TRUE + drum_note 11, 4 + drum_note 11, 4 + stereo_panning TRUE, FALSE + drum_note 11, 8 + sound_loop 0, .mainloop diff --git a/audio/music/mtmoonsquare.asm b/audio/music/mtmoonsquare.asm index 57d1b0dd..0b0dc03c 100644 --- a/audio/music/mtmoonsquare.asm +++ b/audio/music/mtmoonsquare.asm @@ -1,16 +1,17 @@ Music_MtMoonSquare: - musicheader 2, 1, Music_MtMoonSquare_Ch1 - musicheader 1, 2, Music_MtMoonSquare_Ch2 + channel_count 2 + channel 1, Music_MtMoonSquare_Ch1 + channel 2, Music_MtMoonSquare_Ch2 Music_MtMoonSquare_Ch1: tempo 112 - volume $77 - dutycycle $2 - tone $0001 - note __, 1 -Music_MtMoonSquare_branch_f4826: - notetype $c, $44 -Music_MtMoonSquare_branch_f4829: + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + rest 1 +.mainloop: + note_type 12, 4, 4 +.loop1: octave 4 note D_, 2 note E_, 2 @@ -19,8 +20,8 @@ Music_MtMoonSquare_branch_f4829: note A_, 2 octave 5 note D_, 4 - loopchannel 2, Music_MtMoonSquare_branch_f4829 -Music_MtMoonSquare_branch_f4835: + sound_loop 2, .loop1 +.loop2: octave 4 note E_, 2 note F#, 2 @@ -29,8 +30,8 @@ Music_MtMoonSquare_branch_f4835: note B_, 2 octave 5 note E_, 4 - loopchannel 2, Music_MtMoonSquare_branch_f4835 -Music_MtMoonSquare_branch_f4841: + sound_loop 2, .loop2 +.loop3: octave 4 note C#, 2 note D_, 2 @@ -39,8 +40,8 @@ Music_MtMoonSquare_branch_f4841: note G_, 2 octave 5 note C#, 4 - loopchannel 2, Music_MtMoonSquare_branch_f4841 -Music_MtMoonSquare_branch_f484d: + sound_loop 2, .loop3 +.loop4: octave 4 note D_, 2 note E_, 2 @@ -49,15 +50,15 @@ Music_MtMoonSquare_branch_f484d: note A_, 2 octave 5 note D_, 4 - loopchannel 2, Music_MtMoonSquare_branch_f484d - loopchannel 0, Music_MtMoonSquare_branch_f4826 + sound_loop 2, .loop4 + sound_loop 0, .mainloop Music_MtMoonSquare_Ch2: - dutycycle $2 - vibrato $18, $24 -Music_MtMoonSquare_branch_f4862: - notetype $c, $82 -Music_MtMoonSquare_branch_f4865: + duty_cycle 2 + vibrato 24, 2, 4 +.mainloop: + note_type 12, 8, 2 +.loop1: octave 4 note D_, 2 note E_, 2 @@ -66,10 +67,10 @@ Music_MtMoonSquare_branch_f4865: note A_, 2 octave 5 note D_, 4 - notetype $c, $62 - loopchannel 2, Music_MtMoonSquare_branch_f4865 - notetype $c, $82 -Music_MtMoonSquare_branch_f4877: + note_type 12, 6, 2 + sound_loop 2, .loop1 + note_type 12, 8, 2 +.loop2: octave 4 note E_, 2 note F#, 2 @@ -78,10 +79,10 @@ Music_MtMoonSquare_branch_f4877: note B_, 2 octave 5 note E_, 4 - notetype $c, $62 - loopchannel 2, Music_MtMoonSquare_branch_f4877 - notetype $c, $82 -Music_MtMoonSquare_branch_f4889: + note_type 12, 6, 2 + sound_loop 2, .loop2 + note_type 12, 8, 2 +.loop3: octave 4 note C#, 2 note D_, 2 @@ -90,10 +91,10 @@ Music_MtMoonSquare_branch_f4889: note G_, 2 octave 5 note C#, 4 - notetype $c, $62 - loopchannel 2, Music_MtMoonSquare_branch_f4889 - notetype $c, $82 -Music_MtMoonSquare_branch_f489b: + note_type 12, 6, 2 + sound_loop 2, .loop3 + note_type 12, 8, 2 +.loop4: octave 4 note D_, 2 note E_, 2 @@ -102,6 +103,6 @@ Music_MtMoonSquare_branch_f489b: note A_, 2 octave 5 note D_, 4 - notetype $c, $62 - loopchannel 2, Music_MtMoonSquare_branch_f489b - loopchannel 0, Music_MtMoonSquare_branch_f4862 + note_type 12, 6, 2 + sound_loop 2, .loop4 + sound_loop 0, .mainloop diff --git a/audio/music/nationalpark.asm b/audio/music/nationalpark.asm index 10908638..254efa83 100644 --- a/audio/music/nationalpark.asm +++ b/audio/music/nationalpark.asm @@ -1,24 +1,25 @@ 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 + channel_count 4 + channel 1, Music_NationalPark_Ch1 + channel 2, Music_NationalPark_Ch2 + channel 3, Music_NationalPark_Ch3 + channel 4, Music_NationalPark_Ch4 Music_NationalPark_Ch1: tempo 192 - volume $77 - stereopanning $f - vibrato $18, $24 - dutycycle $1 - notetype $c, $77 - note __, 2 -Music_NationalPark_branch_f5504: - callchannel Music_NationalPark_branch_f554a - callchannel Music_NationalPark_branch_f554a - notetype $6, $67 - callchannel Music_NationalPark_branch_f563a - notetype $c, $77 - note __, 16 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 24, 2, 4 + duty_cycle 1 + note_type 12, 7, 7 + rest 2 +.mainloop: + sound_call .sub1 + sound_call .sub1 + note_type 6, 6, 7 + sound_call .sub2 + note_type 12, 7, 7 + rest 16 octave 2 note A#, 1 octave 3 @@ -28,111 +29,111 @@ Music_NationalPark_branch_f5504: note D_, 1 note F_, 1 note A#, 1 - notetype $6, $67 + note_type 6, 6, 7 octave 4 note D_, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 - callchannel Music_NationalPark_branch_f563a - intensity $77 + rest 1 + sound_call .sub2 + volume_envelope 7, 7 octave 3 note E_, 1 note F_, 5 note D#, 4 - note __, 2 + rest 2 note C_, 12 note F_, 8 note C#, 1 - intensity $98 + volume_envelope 9, 8 note D_, 16 - intensity $77 + volume_envelope 7, 7 note D_, 7 - notetype $c, $77 - note __, 4 - loopchannel 0, Music_NationalPark_branch_f5504 + note_type 12, 7, 7 + rest 4 + sound_loop 0, .mainloop -Music_NationalPark_branch_f554a: +.sub1: octave 2 note G#, 6 octave 3 note F_, 2 - intensity $47 + volume_envelope 4, 7 note F_, 1 note G#, 1 - intensity $57 + volume_envelope 5, 7 note F_, 1 note G#, 1 - intensity $77 + volume_envelope 7, 7 note F_, 1 note G#, 1 - intensity $97 + volume_envelope 9, 7 note F_, 1 note G#, 1 - intensity $77 + volume_envelope 7, 7 octave 2 note A_, 6 octave 3 note F#, 2 - intensity $47 + volume_envelope 4, 7 note F#, 1 note A_, 1 - intensity $57 + volume_envelope 5, 7 note F#, 1 note A_, 1 - intensity $77 + volume_envelope 7, 7 note F#, 1 note A_, 1 - intensity $97 + volume_envelope 9, 7 note F#, 1 note A_, 1 - intensity $77 + volume_envelope 7, 7 octave 2 note G#, 6 octave 3 note F_, 2 - intensity $47 + volume_envelope 4, 7 octave 4 note C_, 1 note C#, 1 - intensity $57 + volume_envelope 5, 7 note C_, 1 note C#, 1 - intensity $77 + volume_envelope 7, 7 note C_, 1 note C#, 1 - intensity $97 + volume_envelope 9, 7 note C_, 1 note C#, 1 - intensity $77 + volume_envelope 7, 7 octave 2 note A_, 6 octave 3 note C#, 2 - intensity $47 + volume_envelope 4, 7 octave 4 note C#, 1 note D#, 1 - intensity $57 + volume_envelope 5, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 1 note D#, 1 - intensity $97 + volume_envelope 9, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 2 octave 3 note A#, 2 @@ -156,20 +157,20 @@ Music_NationalPark_branch_f554a: note C#, 2 octave 3 note A_, 2 - intensity $47 + volume_envelope 4, 7 octave 4 note C#, 1 note D#, 1 - intensity $57 + volume_envelope 5, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 1 note D#, 1 - intensity $97 + volume_envelope 9, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C_, 2 octave 3 note G#, 2 @@ -189,20 +190,20 @@ Music_NationalPark_branch_f554a: note D_, 2 octave 3 note A#, 2 - intensity $57 + volume_envelope 5, 7 octave 4 note F_, 1 note D#, 1 - intensity $67 + volume_envelope 6, 7 note D_, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note F_, 1 note F#, 1 - intensity $97 + volume_envelope 9, 7 note G#, 1 note A#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 2 octave 3 note A#, 2 @@ -226,20 +227,20 @@ Music_NationalPark_branch_f554a: note C#, 2 octave 3 note A_, 2 - intensity $47 + volume_envelope 4, 7 octave 4 note C#, 1 note D#, 1 - intensity $57 + volume_envelope 5, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C#, 1 note D#, 1 - intensity $97 + volume_envelope 9, 7 note C#, 1 note D#, 1 - intensity $77 + volume_envelope 7, 7 note C_, 2 octave 3 note G#, 2 @@ -267,110 +268,110 @@ Music_NationalPark_branch_f554a: note D_, 2 octave 3 note A#, 2 - endchannel + sound_ret -Music_NationalPark_branch_f563a: - note __, 16 - note __, 3 +.sub2: + rest 16 + rest 3 octave 4 note A#, 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 2 - note __, 4 - note __, 16 - note __, 3 + rest 4 + rest 16 + rest 3 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 4 - endchannel + rest 4 + sound_ret Music_NationalPark_Ch2: - vibrato $14, $24 - dutycycle $1 - notetype $c, $a7 - note __, 2 - stereopanning $f0 -Music_NationalPark_branch_f565d: - notetype $c, $a7 - callchannel Music_NationalPark_branch_f56b8 + vibrato 20, 2, 4 + duty_cycle 1 + note_type 12, 10, 7 + rest 2 + stereo_panning TRUE, FALSE +.mainloop: + note_type 12, 10, 7 + sound_call .sub1 octave 3 note D_, 8 - callchannel Music_NationalPark_branch_f56b8 - note __, 2 - intensity $a7 + sound_call .sub1 + rest 2 + volume_envelope 10, 7 octave 4 note G#, 2 note F#, 2 note F_, 2 - notetype $6, $a7 - callchannel Music_NationalPark_branch_f56f5 + note_type 6, 10, 7 + sound_call .sub2 octave 3 note B_, 1 octave 4 note C_, 5 octave 3 note G#, 4 - note __, 2 + rest 2 octave 4 note A#, 8 note G#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G#, 4 note E_, 1 note F_, 14 - intensity $87 + volume_envelope 8, 7 note G_, 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note G#, 1 - note __, 1 - intensity $a7 - callchannel Music_NationalPark_branch_f56f5 + rest 1 + volume_envelope 10, 7 + sound_call .sub2 octave 3 note B_, 1 octave 4 note C_, 5 octave 3 note G#, 4 - note __, 2 + rest 2 note A#, 12 octave 4 note C_, 8 octave 3 note A_, 1 - vibrato $0, $0 - intensity $b8 + vibrato 0, 0, 0 + volume_envelope 11, 8 note A#, 16 - vibrato $14, $24 - intensity $b7 + vibrato 20, 2, 4 + volume_envelope 11, 7 note A#, 11 octave 2 note D#, 2 note D_, 2 - loopchannel 0, Music_NationalPark_branch_f565d + sound_loop 0, .mainloop -Music_NationalPark_branch_f56b8: +.sub1: octave 2 note C#, 6 note G#, 2 @@ -431,26 +432,26 @@ Music_NationalPark_branch_f56b8: note A#, 6 octave 2 note F_, 2 - endchannel + sound_ret -Music_NationalPark_branch_f56f5: +.sub2: octave 4 note E_, 1 note F_, 5 note F#, 4 - note __, 2 + rest 2 note C#, 7 - intensity $87 + volume_envelope 8, 7 octave 5 note E_, 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 2 - intensity $a7 + volume_envelope 10, 7 octave 3 note A#, 2 octave 4 @@ -459,61 +460,61 @@ Music_NationalPark_branch_f56f5: note E_, 1 note F_, 5 note F#, 4 - note __, 2 + rest 2 note D#, 7 - intensity $87 + volume_envelope 8, 7 octave 5 note D_, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 2 - intensity $a7 + volume_envelope 10, 7 octave 4 note D_, 2 note C#, 2 - endchannel + sound_ret Music_NationalPark_Ch3: - vibrato $16, $24 - notetype $c, $11 + vibrato 22, 2, 4 + note_type 12, 1, 1 octave 4 note G#, 1 note A#, 1 - stereopanning $ff -Music_NationalPark_branch_f572e: - callchannel Music_NationalPark_branch_f5756 + stereo_panning TRUE, TRUE +.mainloop: + sound_call .sub1 octave 5 note A#, 14 octave 4 note G#, 1 note A#, 1 - callchannel Music_NationalPark_branch_f5756 + sound_call .sub1 octave 5 note A#, 8 octave 4 note D_, 8 - intensity $15 - callchannel Music_NationalPark_branch_f578f + volume_envelope 1, 5 + sound_call .sub2 octave 4 note D_, 1 octave 3 note F_, 3 - callchannel Music_NationalPark_branch_f578f + sound_call .sub2 octave 4 note D_, 1 octave 3 note F_, 1 - intensity $11 + volume_envelope 1, 1 octave 4 note G#, 1 note A#, 1 - loopchannel 0, Music_NationalPark_branch_f572e + sound_loop 0, .mainloop -Music_NationalPark_branch_f5756: +.sub1: octave 5 note C_, 16 note C#, 14 @@ -570,88 +571,89 @@ Music_NationalPark_branch_f5756: note A#, 4 octave 6 note C_, 2 - endchannel + sound_ret -Music_NationalPark_branch_f578f: +.sub2: octave 2 note F#, 3 octave 3 note C#, 2 - note __, 1 + rest 1 note A#, 4 note C#, 1 - note __, 1 + rest 1 note A#, 1 note C#, 3 octave 2 note F#, 3 octave 3 note C#, 2 - note __, 1 + rest 1 note A_, 4 note C#, 1 - note __, 1 + rest 1 note A_, 1 note C#, 3 octave 2 note F_, 3 octave 3 note C_, 2 - note __, 1 + rest 1 note G#, 4 note C_, 1 - note __, 1 + rest 1 note G#, 1 note C_, 3 octave 2 note A#, 3 octave 3 note F_, 2 - note __, 1 + rest 1 octave 4 note D_, 4 octave 3 note F_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_NationalPark_Ch4: - togglenoise $3 - notetype $c - note __, 2 -Music_NationalPark_branch_f57bd: - note __, 16 - loopchannel 23, Music_NationalPark_branch_f57bd - note __, 8 - note A#, 2 - note D_, 2 - note A#, 1 - note D_, 1 - note B_, 2 -Music_NationalPark_branch_f57c8: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note B_, 2 - loopchannel 7, Music_NationalPark_branch_f57c8 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note A#, 1 - note D#, 1 - loopchannel 0, Music_NationalPark_branch_f57bd + toggle_noise 3 + drum_speed 12 + rest 2 +.mainloop: +.loop1: + rest 16 + sound_loop 23, .loop1 + rest 8 + drum_note 11, 2 + drum_note 3, 2 + drum_note 11, 1 + drum_note 3, 1 + drum_note 12, 2 +.loop2: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 12, 2 + sound_loop 7, .loop2 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 11, 1 + drum_note 4, 1 + sound_loop 0, .mainloop diff --git a/audio/music/newbarktown.asm b/audio/music/newbarktown.asm index 0e3b92d3..261f141f 100644 --- a/audio/music/newbarktown.asm +++ b/audio/music/newbarktown.asm @@ -1,31 +1,32 @@ Music_NewBarkTown: - musicheader 3, 1, Music_NewBarkTown_Ch1 - musicheader 1, 2, Music_NewBarkTown_Ch2 - musicheader 1, 3, Music_NewBarkTown_Ch3 + channel_count 3 + channel 1, Music_NewBarkTown_Ch1 + channel 2, Music_NewBarkTown_Ch2 + channel 3, Music_NewBarkTown_Ch3 - db $3 + db $3 ; unused Music_NewBarkTown_Ch1: tempo 187 - volume $77 - stereopanning $f - vibrato $12, $23 - notetype $c, $87 - note __, 4 -Music_NewBarkTown_branch_eb2eb: - dutycycle $0 - callchannel Music_NewBarkTown_branch_eb349 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 18, 2, 3 + note_type 12, 8, 7 + rest 4 +.mainloop: + duty_cycle 0 + sound_call .sub1 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note G_, 2 note F#, 2 - dutycycle $2 - intensity $82 + duty_cycle 2 + volume_envelope 8, 2 note E_, 1 note F#, 1 note E_, 1 @@ -35,21 +36,21 @@ Music_NewBarkTown_branch_eb2eb: note B_, 1 note A_, 1 note G_, 1 - dutycycle $0 - intensity $87 - callchannel Music_NewBarkTown_branch_eb349 + duty_cycle 0 + volume_envelope 8, 7 + sound_call .sub1 octave 3 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 - dutycycle $2 - intensity $82 + duty_cycle 2 + volume_envelope 8, 2 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 1 octave 3 @@ -61,11 +62,11 @@ Music_NewBarkTown_branch_eb2eb: note C#, 1 note E_, 1 note A_, 1 - dutycycle $1 - intensity $5e - callchannel Music_NewBarkTown_branch_eb37c - callchannel Music_NewBarkTown_branch_eb37c - callchannel Music_NewBarkTown_branch_eb37c + duty_cycle 1 + volume_envelope 5, -6 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 octave 2 note G_, 2 note B_, 2 @@ -82,63 +83,63 @@ Music_NewBarkTown_branch_eb2eb: note G_, 4 note A_, 4 note B_, 2 - intensity $87 - loopchannel 0, Music_NewBarkTown_branch_eb2eb + volume_envelope 8, 7 + sound_loop 0, .mainloop -Music_NewBarkTown_branch_eb349: +.sub1: octave 3 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 2 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A#, 2 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note B_, 2 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 2 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note E_, 2 octave 2 note B_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_NewBarkTown_branch_eb37c: +.sub2: octave 2 note G_, 2 note B_, 2 @@ -155,110 +156,110 @@ Music_NewBarkTown_branch_eb37c: note G_, 4 note A_, 4 note E_, 2 - endchannel + sound_ret Music_NewBarkTown_Ch2: - stereopanning $ff - vibrato $12, $23 - notetype $6, $a7 - note __, 8 -Music_NewBarkTown_branch_eb396: - dutycycle $2 - notetype $6, $a7 - callchannel Music_NewBarkTown_branch_eb3bf - callchannel Music_NewBarkTown_branch_eb3bf - callchannel Music_NewBarkTown_branch_eb3f2 - intensity $87 + stereo_panning TRUE, TRUE + vibrato 18, 2, 3 + note_type 6, 10, 7 + rest 8 +.mainloop: + duty_cycle 2 + note_type 6, 10, 7 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + volume_envelope 8, 7 octave 5 note B_, 6 note A_, 6 - intensity $77 + volume_envelope 7, 7 octave 6 note D_, 4 note C#, 16 - callchannel Music_NewBarkTown_branch_eb3f2 - intensity $87 + sound_call .sub2 + volume_envelope 8, 7 octave 5 note B_, 6 note A_, 6 - intensity $77 + volume_envelope 7, 7 octave 6 note D_, 4 note E_, 16 - loopchannel 0, Music_NewBarkTown_branch_eb396 + sound_loop 0, .mainloop -Music_NewBarkTown_branch_eb3bf: +.sub1: octave 2 note D_, 4 - note __, 8 + rest 8 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 8 note A#, 2 - note __, 2 + rest 2 note D_, 4 - note __, 8 + rest 8 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 8 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note G_, 4 - note __, 8 + rest 8 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 1 note G#, 2 - note __, 2 + rest 2 note G#, 8 octave 2 note D_, 2 - note __, 2 + rest 2 note A_, 4 - note __, 8 + rest 8 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 1 note A_, 2 - note __, 2 + rest 2 note A_, 8 octave 2 note C#, 4 - endchannel + sound_ret -Music_NewBarkTown_branch_eb3f2: - notetype $6, $97 - dutycycle $2 +.sub2: + note_type 6, 9, 7 + duty_cycle 2 octave 4 note B_, 12 note A_, 12 note G_, 8 - notetype $c, $97 + note_type 12, 9, 7 note E_, 16 - endchannel + sound_ret Music_NewBarkTown_Ch3: - stereopanning $f0 - notetype $c, $10 + stereo_panning TRUE, FALSE + note_type 12, 1, 0 octave 5 note D_, 2 note E_, 2 -Music_NewBarkTown_branch_eb408: - vibrato $16, $23 +.mainloop: + vibrato 22, 2, 3 note F#, 4 note A_, 4 note G_, 2 @@ -281,7 +282,7 @@ Music_NewBarkTown_branch_eb408: note E_, 6 note F#, 2 note E_, 4 - note __, 2 + rest 2 note D_, 1 note E_, 1 note F#, 4 @@ -304,9 +305,9 @@ Music_NewBarkTown_branch_eb408: note G_, 1 note F#, 1 note E_, 4 - note __, 4 - intensity $25 - vibrato $12, $53 + rest 4 + volume_envelope 2, 5 + vibrato 18, 5, 3 octave 2 note G_, 16 note A_, 16 @@ -316,9 +317,9 @@ Music_NewBarkTown_branch_eb408: note A_, 16 note G_, 16 note A_, 14 - intensity $10 - vibrato $16, $23 + volume_envelope 1, 0 + vibrato 22, 2, 3 octave 5 note D_, 1 note E_, 1 - loopchannel 0, Music_NewBarkTown_branch_eb408 + sound_loop 0, .mainloop diff --git a/audio/music/nothing.asm b/audio/music/nothing.asm index 59641387..957a4355 100644 --- a/audio/music/nothing.asm +++ b/audio/music/nothing.asm @@ -1,11 +1,12 @@ 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 + channel_count 4 + channel 1, Music_Nothing_Ch1 + channel 2, Music_Nothing_Ch2 + channel 3, Music_Nothing_Ch3 + channel 4, Music_Nothing_Ch4 Music_Nothing_Ch1: Music_Nothing_Ch2: Music_Nothing_Ch3: Music_Nothing_Ch4: - endchannel + sound_ret diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm index 68585e47..3196bc27 100644 --- a/audio/music/pallettown.asm +++ b/audio/music/pallettown.asm @@ -1,17 +1,18 @@ Music_PalletTown: - musicheader 3, 1, Music_PalletTown_Ch1 - musicheader 1, 2, Music_PalletTown_Ch2 - musicheader 1, 3, Music_PalletTown_Ch3 + channel_count 3 + channel 1, Music_PalletTown_Ch1 + channel 2, Music_PalletTown_Ch2 + channel 3, Music_PalletTown_Ch3 Music_PalletTown_Ch1: tempo 188 - volume $77 - vibrato $12, $24 - tone $0001 - stereopanning $f -Music_PalletTown_branch_f4b22: - dutycycle $2 - notetype $c, $78 + volume 7, 7 + vibrato 18, 2, 4 + pitch_offset 1 + stereo_panning FALSE, TRUE +.mainloop: + duty_cycle 2 + note_type 12, 7, 8 octave 3 note B_, 12 note A_, 1 @@ -29,9 +30,9 @@ Music_PalletTown_branch_f4b22: note C_, 4 octave 3 note A_, 4 - intensity $77 + volume_envelope 7, 7 note G_, 8 - intensity $78 + volume_envelope 7, 8 note F#, 4 note A_, 4 note B_, 12 @@ -57,11 +58,11 @@ Music_PalletTown_branch_f4b22: note C_, 2 octave 3 note B_, 8 - intensity $77 + volume_envelope 7, 7 note B_, 8 -Music_PalletTown_branch_f4b59: - dutycycle $3 - intensity $92 +.loop1: + duty_cycle 3 + volume_envelope 9, 2 note G_, 2 note E_, 2 note G_, 2 @@ -70,7 +71,7 @@ Music_PalletTown_branch_f4b59: note D#, 2 note G_, 2 note D#, 2 - intensity $5f + volume_envelope 5, -7 note G_, 1 note A_, 1 note B_, 1 @@ -82,8 +83,8 @@ Music_PalletTown_branch_f4b59: note C_, 2 octave 3 note B_, 2 - loopchannel 2, Music_PalletTown_branch_f4b59 - intensity $3f + sound_loop 2, .loop1 + volume_envelope 3, -7 octave 4 note C_, 4 octave 3 @@ -93,7 +94,7 @@ Music_PalletTown_branch_f4b59: note F#, 4 note D_, 4 note E_, 4 - intensity $72 + volume_envelope 7, 2 note C_, 1 note E_, 1 note G_, 1 @@ -103,27 +104,27 @@ Music_PalletTown_branch_f4b59: note A_, 1 octave 5 note D_, 2 - intensity $62 + volume_envelope 6, 2 note D_, 2 - intensity $22 + volume_envelope 2, 2 note D_, 2 - intensity $2f + volume_envelope 2, -7 octave 3 note D_, 4 note E_, 4 note G_, 6 note A_, 1 note G_, 1 - intensity $1f + volume_envelope 1, -7 note F#, 8 - loopchannel 0, Music_PalletTown_branch_f4b22 + sound_loop 0, .mainloop Music_PalletTown_Ch2: - vibrato $12, $44 - dutycycle $2 - stereopanning $f0 -Music_PalletTown_branch_f4ba8: - notetype $c, $88 + vibrato 18, 4, 4 + duty_cycle 2 + stereo_panning TRUE, FALSE +.mainloop: + note_type 12, 8, 8 octave 1 note G_, 2 note B_, 2 @@ -151,7 +152,7 @@ Music_PalletTown_branch_f4ba8: note F#, 2 note G_, 2 note D_, 2 - note __, 4 + rest 4 note D_, 4 note F#, 4 octave 1 @@ -182,8 +183,8 @@ Music_PalletTown_branch_f4ba8: octave 3 note C_, 2 note D_, 2 -Music_PalletTown_branch_f4be5: - intensity $a2 +.loop1: + volume_envelope 10, 2 octave 3 note E_, 2 octave 2 @@ -200,13 +201,13 @@ Music_PalletTown_branch_f4be5: note D#, 2 octave 2 note C_, 2 - intensity $93 + volume_envelope 9, 3 note G_, 6 note G_, 1 note G_, 3 note D_, 2 note G_, 4 - loopchannel 2, Music_PalletTown_branch_f4be5 + sound_loop 2, .loop1 note C_, 2 octave 3 note E_, 4 @@ -227,9 +228,9 @@ Music_PalletTown_branch_f4be5: note E_, 2 note G_, 2 note E_, 2 - intensity $1f + volume_envelope 1, -7 note F#, 4 - intensity $88 + volume_envelope 8, 8 note F#, 4 note B_, 4 note G_, 4 @@ -241,12 +242,12 @@ Music_PalletTown_branch_f4be5: octave 1 note B_, 2 note A_, 2 - loopchannel 0, Music_PalletTown_branch_f4ba8 + sound_loop 0, .mainloop Music_PalletTown_Ch3: - vibrato $14, $24 -Music_PalletTown_branch_f4c2d: - notetype $c, $10 + vibrato 20, 2, 4 +.mainloop: + note_type 12, 1, 0 octave 6 note D_, 2 note C_, 2 @@ -262,16 +263,16 @@ Music_PalletTown_branch_f4c2d: octave 5 note B_, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 6 note C_, 8 - note __, 2 + rest 2 octave 5 note F#, 2 note G_, 2 @@ -290,16 +291,16 @@ Music_PalletTown_branch_f4c2d: octave 6 note D_, 2 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 6 note D_, 1 - note __, 1 + rest 1 note D_, 8 note C_, 2 octave 5 @@ -313,7 +314,7 @@ Music_PalletTown_branch_f4c2d: note B_, 2 note A_, 2 note G_, 8 - note __, 2 + rest 2 note G_, 2 note A_, 2 note B_, 2 @@ -323,20 +324,20 @@ Music_PalletTown_branch_f4c2d: note C_, 2 octave 5 note B_, 8 - note __, 2 + rest 2 note G_, 2 note A_, 2 note B_, 2 octave 6 note C_, 2 - note __, 2 + rest 2 note C_, 4 note D_, 6 note C_, 1 note D_, 1 octave 5 note B_, 8 - note __, 2 + rest 2 note B_, 2 note A_, 2 note G_, 2 @@ -347,11 +348,11 @@ Music_PalletTown_branch_f4c2d: note G_, 4 note E_, 4 note F#, 7 - note __, 1 + rest 1 note G_, 3 - note __, 1 + rest 1 note B_, 3 - note __, 1 + rest 1 note B_, 8 note A_, 8 - loopchannel 0, Music_PalletTown_branch_f4c2d + sound_loop 0, .mainloop diff --git a/audio/music/pokeflutechannel.asm b/audio/music/pokeflutechannel.asm index e324c559..46d164c2 100644 --- a/audio/music/pokeflutechannel.asm +++ b/audio/music/pokeflutechannel.asm @@ -1,20 +1,21 @@ Music_PokeFluteChannel: - musicheader 3, 1, Music_PokeFluteChannel_Ch1 - musicheader 1, 2, Music_PokeFluteChannel_Ch2 - musicheader 1, 3, Music_PokeFluteChannel_Ch3 + channel_count 3 + channel 1, Music_PokeFluteChannel_Ch1 + channel 2, Music_PokeFluteChannel_Ch2 + channel 3, Music_PokeFluteChannel_Ch3 Music_PokeFluteChannel_Ch1: tempo 240 - volume $77 - stereopanning $f0 - dutycycle $3 - tone $0002 - notetype $c, $b4 - note __, 4 + volume 7, 7 + stereo_panning TRUE, FALSE + duty_cycle 3 + pitch_offset 2 + note_type 12, 11, 4 + rest 4 octave 3 note E_, 8 note E_, 8 - notetype $c, $b3 + note_type 12, 11, 3 note F_, 2 note E_, 2 note D_, 2 @@ -25,11 +26,11 @@ Music_PokeFluteChannel_Ch1: note B_, 2 note A_, 2 note B_, 16 - note __, 2 + rest 2 octave 2 note G_, 4 note A_, 8 -Music_PokeFluteChannel_branch_f7b40: +.mainloop: octave 3 note E_, 2 note G_, 2 @@ -66,14 +67,14 @@ Music_PokeFluteChannel_branch_f7b40: octave 2 note G_, 4 note A_, 8 - loopchannel 0, Music_PokeFluteChannel_branch_f7b40 + sound_loop 0, .mainloop Music_PokeFluteChannel_Ch2: - stereopanning $f - dutycycle $3 - tone $0001 - notetype $c, $c4 - note __, 4 + stereo_panning FALSE, TRUE + duty_cycle 3 + pitch_offset 1 + note_type 12, 12, 4 + rest 4 octave 3 note C_, 8 octave 2 @@ -81,7 +82,7 @@ Music_PokeFluteChannel_Ch2: note A_, 8 octave 3 note E_, 8 - notetype $c, $c3 + note_type 12, 12, 3 octave 2 note E_, 2 note G_, 2 @@ -105,7 +106,7 @@ Music_PokeFluteChannel_Ch2: octave 2 note E_, 2 note G_, 2 -Music_PokeFluteChannel_branch_f7b94: +.mainloop: octave 3 note C_, 2 note E_, 2 @@ -167,15 +168,15 @@ Music_PokeFluteChannel_branch_f7b94: octave 2 note E_, 2 note G_, 2 - loopchannel 0, Music_PokeFluteChannel_branch_f7b94 + sound_loop 0, .mainloop Music_PokeFluteChannel_Ch3: - vibrato $10, $14 - notetype $c, $10 - callchannel Music_PokeFluteChannel_branch_f7c05 - callchannel Music_PokeFluteChannel_branch_f7c05 -Music_PokeFluteChannel_branch_f7be1: - note __, 4 + vibrato 16, 1, 4 + note_type 12, 1, 0 + sound_call .sub1 + sound_call .sub1 +.mainloop: + rest 4 octave 4 note C_, 2 octave 5 @@ -184,7 +185,7 @@ Music_PokeFluteChannel_branch_f7be1: note F_, 2 octave 6 note C_, 4 - note __, 4 + rest 4 octave 4 note C_, 2 octave 5 @@ -203,11 +204,11 @@ Music_PokeFluteChannel_branch_f7be1: note G_, 2 note F#, 2 note G_, 8 - note __, 4 - callchannel Music_PokeFluteChannel_branch_f7c05 - loopchannel 0, Music_PokeFluteChannel_branch_f7be1 + rest 4 + sound_call .sub1 + sound_loop 0, .mainloop -Music_PokeFluteChannel_branch_f7c05: +.sub1: octave 5 note E_, 2 note F_, 2 @@ -224,4 +225,4 @@ Music_PokeFluteChannel_branch_f7c05: note A_, 2 note F_, 2 note G_, 4 - endchannel + sound_ret diff --git a/audio/music/pokemoncenter.asm b/audio/music/pokemoncenter.asm index 01865045..a5687ca8 100644 --- a/audio/music/pokemoncenter.asm +++ b/audio/music/pokemoncenter.asm @@ -1,18 +1,19 @@ 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 + channel_count 4 + channel 1, Music_PokemonCenter_Ch1 + channel 2, Music_PokemonCenter_Ch2 + channel 3, Music_PokemonCenter_Ch3 + channel 4, Music_PokemonCenter_Ch4 Music_PokemonCenter_Ch1: tempo 152 - volume $77 - dutycycle $2 - vibrato $a, $14 - tone $0001 -Music_PokemonCenter_branch_ed5df: - stereopanning $f - notetype $c, $83 + volume 7, 7 + duty_cycle 2 + vibrato 10, 1, 4 + pitch_offset 1 +.mainloop: + stereo_panning FALSE, TRUE + note_type 12, 8, 3 octave 3 note F#, 2 note F_, 2 @@ -76,7 +77,7 @@ Music_PokemonCenter_branch_ed5df: note B_, 2 note A_, 2 note G_, 2 - notetype $c, $b4 + note_type 12, 11, 4 note F#, 2 note E_, 2 note D_, 2 @@ -85,7 +86,7 @@ Music_PokemonCenter_branch_ed5df: note G_, 2 note A_, 2 note B_, 2 - stereopanning $f0 + stereo_panning TRUE, FALSE note F#, 2 note E_, 2 note D_, 4 @@ -147,43 +148,43 @@ Music_PokemonCenter_branch_ed5df: note E_, 2 note F#, 2 note G_, 2 - loopchannel 0, Music_PokemonCenter_branch_ed5df + sound_loop 0, .mainloop Music_PokemonCenter_Ch2: - vibrato $10, $25 -Music_PokemonCenter_branch_ed674: - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed6d1 - stereopanning $f - notetype $c, $a5 + vibrato 16, 2, 5 +.mainloop: + stereo_panning TRUE, TRUE + sound_call .sub1 + stereo_panning FALSE, TRUE + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed6e4 + stereo_panning TRUE, TRUE + sound_call .sub2 note D_, 2 note F#, 6 - stereopanning $f - notetype $c, $a5 + stereo_panning FALSE, TRUE + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed6d1 - stereopanning $f - notetype $c, $a5 + stereo_panning TRUE, TRUE + sound_call .sub1 + stereo_panning FALSE, TRUE + note_type 12, 10, 5 octave 3 note A_, 4 note E_, 4 - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed6e4 + stereo_panning TRUE, TRUE + sound_call .sub2 note D_, 8 - stereopanning $f - notetype $c, $a5 + stereo_panning FALSE, TRUE + note_type 12, 10, 5 octave 3 note D_, 4 note E_, 4 - notetype $c, $c6 + note_type 12, 12, 6 octave 4 note F#, 8 note A_, 8 @@ -215,190 +216,190 @@ Music_PokemonCenter_branch_ed674: note F#, 2 note E_, 2 note D_, 8 - loopchannel 0, Music_PokemonCenter_branch_ed674 + sound_loop 0, .mainloop -Music_PokemonCenter_branch_ed6d1: - dutycycle $2 - notetype $c, $c2 +.sub1: + duty_cycle 2 + note_type 12, 12, 2 octave 4 note D_, 2 octave 3 note A_, 2 octave 4 note D_, 2 - intensity $c3 + volume_envelope 12, 3 note A_, 4 note G_, 4 note F#, 2 note E_, 2 note C#, 6 - endchannel + sound_ret -Music_PokemonCenter_branch_ed6e4: - notetype $c, $c2 +.sub2: + note_type 12, 12, 2 octave 4 note C#, 2 octave 3 note A_, 2 octave 4 note C#, 2 - intensity $c3 + volume_envelope 12, 3 note F#, 4 note E_, 4 note C#, 2 - endchannel + sound_ret Music_PokemonCenter_Ch3: - notetype $c, $28 -Music_PokemonCenter_branch_ed6f6: - stereopanning $f0 + note_type 12, 2, 8 +.mainloop: + stereo_panning TRUE, FALSE octave 3 note D_, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - callchannel Music_PokemonCenter_branch_ed76f - callchannel Music_PokemonCenter_branch_ed778 + rest 1 + sound_call .sub1 + sound_call .sub2 note F#, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - callchannel Music_PokemonCenter_branch_ed76f - callchannel Music_PokemonCenter_branch_ed778 + rest 1 + sound_call .sub1 + sound_call .sub2 note D_, 1 - note __, 5 + rest 5 note F#, 1 - note __, 3 + rest 3 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - stereopanning $ff - callchannel Music_PokemonCenter_branch_ed783 + rest 1 + stereo_panning TRUE, TRUE + sound_call .sub3 note G_, 1 - note __, 5 + rest 5 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 5 + rest 5 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - callchannel Music_PokemonCenter_branch_ed783 + rest 1 + sound_call .sub3 note G_, 1 - note __, 5 + rest 5 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 5 + rest 5 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 - loopchannel 0, Music_PokemonCenter_branch_ed6f6 + rest 1 + sound_loop 0, .mainloop -Music_PokemonCenter_branch_ed76f: +.sub1: note E_, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_PokemonCenter_branch_ed778: +.sub2: note E_, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_PokemonCenter_branch_ed783: +.sub3: note F#, 1 - note __, 5 + rest 5 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_PokemonCenter_Ch4: - togglenoise $3 - notetype $c - stereopanning $ff -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 + toggle_noise 3 + drum_speed 12 + stereo_panning TRUE, TRUE +.mainloop: + drum_note 8, 6 + drum_note 8, 4 + drum_note 8, 2 + drum_note 8, 2 + drum_note 8, 2 + sound_loop 0, .mainloop diff --git a/audio/music/pokemonchannel.asm b/audio/music/pokemonchannel.asm index 34d64262..23483234 100644 --- a/audio/music/pokemonchannel.asm +++ b/audio/music/pokemonchannel.asm @@ -1,55 +1,56 @@ 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 + channel_count 4 + channel 1, Music_PokemonChannel_Ch1 + channel 2, Music_PokemonChannel_Ch2 + channel 3, Music_PokemonChannel_Ch3 + channel 4, Music_PokemonChannel_Ch4 Music_PokemonChannel_Ch1: tempo 128 - volume $77 - vibrato $8, $38 - dutycycle $1 - stereopanning $f - notetype $c, $b3 + volume 7, 7 + vibrato 8, 3, 8 + duty_cycle 1 + stereo_panning FALSE, TRUE + note_type 12, 11, 3 octave 2 note B_, 1 - note __, 2 + rest 2 note F#, 1 note B_, 1 - note __, 1 + rest 1 octave 3 note F#, 4 - dutycycle $0 + duty_cycle 0 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - notetype $6, $b3 + rest 1 + note_type 6, 11, 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 - dutycycle $1 + rest 1 + duty_cycle 1 octave 3 note C_, 2 - note __, 4 + rest 4 note G_, 2 note C_, 2 - note __, 2 + rest 2 note B_, 8 - dutycycle $0 + duty_cycle 0 note C_, 4 note C_, 4 octave 2 note G_, 2 - note __, 2 - dutycycle $3 + rest 2 + duty_cycle 3 octave 4 note D_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 note B_, 2 @@ -57,131 +58,131 @@ Music_PokemonChannel_Ch1: note D_, 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 - note __, 8 + rest 2 + rest 8 octave 3 note G_, 2 - note __, 6 + rest 6 note B_, 2 - note __, 6 + rest 6 note D_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Music_PokemonChannel_Ch2: - dutycycle $1 - vibrato $8, $38 - stereopanning $ff - notetype $c, $b3 + duty_cycle 1 + vibrato 8, 3, 8 + stereo_panning TRUE, TRUE + note_type 12, 11, 3 octave 3 note G_, 3 note A_, 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 4 - dutycycle $0 + duty_cycle 0 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - notetype $6, $b3 + rest 1 + note_type 6, 11, 3 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - dutycycle $1 + rest 1 + duty_cycle 1 octave 4 note C_, 6 note D_, 2 note E_, 2 - note __, 2 + rest 2 note G_, 8 - dutycycle $0 + duty_cycle 0 octave 3 note G_, 4 note F#, 4 note E_, 2 - note __, 2 - dutycycle $3 + rest 2 + duty_cycle 3 octave 4 note B_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note B_, 8 octave 5 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 4 note A#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 - note __, 8 + rest 2 + rest 8 note D_, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 4 note G_, 2 - note __, 6 + rest 6 octave 3 note G_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Music_PokemonChannel_Ch3: - vibrato $8, $38 - notetype $c, $25 - stereopanning $f0 + vibrato 8, 3, 8 + note_type 12, 2, 5 + stereo_panning TRUE, FALSE octave 2 note G_, 1 - note __, 2 + rest 2 note B_, 1 octave 3 note D_, 1 - note __, 1 + rest 1 note G_, 6 - note __, 4 + rest 4 note C_, 1 - note __, 2 + rest 2 octave 2 note G_, 1 octave 3 note C_, 1 - note __, 1 + rest 1 note E_, 6 - note __, 4 + rest 4 octave 4 note G_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 3 note G_, 4 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note D_, 1 octave 3 note B_, 1 @@ -195,37 +196,37 @@ Music_PokemonChannel_Ch3: note D_, 1 octave 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_PokemonChannel_Ch4: - togglenoise $3 - notetype $c -Music_PokemonChannel_branch_ee54d: - note A#, 3 - note A#, 1 - note D_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note A#, 1 - note D_, 1 - loopchannel 2, Music_PokemonChannel_branch_ee54d - note G#, 2 - note A#, 2 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note C_, 4 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note B_, 4 - note D_, 4 - note A#, 4 - note A#, 4 - endchannel + toggle_noise 3 + drum_speed 12 +.loop1: + drum_note 11, 3 + drum_note 11, 1 + drum_note 3, 2 + drum_note 1, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 11, 1 + drum_note 3, 1 + sound_loop 2, .loop1 + drum_note 9, 2 + drum_note 11, 2 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 1, 4 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 9, 1 + drum_note 12, 4 + drum_note 3, 4 + drum_note 11, 4 + drum_note 11, 4 + sound_ret diff --git a/audio/music/pokemonlullaby.asm b/audio/music/pokemonlullaby.asm index 86116a9a..277a5d6f 100644 --- a/audio/music/pokemonlullaby.asm +++ b/audio/music/pokemonlullaby.asm @@ -1,40 +1,41 @@ Music_PokemonLullaby: - musicheader 3, 1, Music_PokemonLullaby_Ch1 - musicheader 1, 2, Music_PokemonLullaby_Ch2 - musicheader 1, 3, Music_PokemonLullaby_Ch3 + channel_count 3 + channel 1, Music_PokemonLullaby_Ch1 + channel 2, Music_PokemonLullaby_Ch2 + channel 3, Music_PokemonLullaby_Ch3 Music_PokemonLullaby_Ch1: tempo 224 - volume $77 - dutycycle $3 - tone $0001 -Music_PokemonLullaby_branch_f6d8c: - notetype $c, $a7 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 +.mainloop: + note_type 12, 10, 7 octave 3 note G_, 16 octave 4 note C_, 16 - stereopanning $f0 + stereo_panning TRUE, FALSE octave 3 note G_, 16 - stereopanning $f + stereo_panning FALSE, TRUE octave 4 note C_, 8 - stereopanning $f0 + stereo_panning TRUE, FALSE octave 3 note B_, 8 - stereopanning $f + stereo_panning FALSE, TRUE note G_, 16 - stereopanning $f0 + stereo_panning TRUE, FALSE octave 4 note C_, 8 - stereopanning $f + stereo_panning FALSE, TRUE octave 3 note B_, 8 - stereopanning $f0 + stereo_panning TRUE, FALSE note G_, 8 - stereopanning $ff - note __, 2 + stereo_panning TRUE, TRUE + rest 2 note G_, 2 note G_, 2 note B_, 2 @@ -51,20 +52,20 @@ Music_PokemonLullaby_branch_f6d8c: note C_, 8 octave 3 note B_, 8 - loopchannel 0, Music_PokemonLullaby_branch_f6d8c + sound_loop 0, .mainloop Music_PokemonLullaby_Ch2: - vibrato $10, $14 - dutycycle $0 - notetype $c, $b4 -Music_PokemonLullaby_branch_f6dcc: - note __, 16 - note __, 10 + vibrato 16, 1, 4 + duty_cycle 0 + note_type 12, 11, 4 +.mainloop: + rest 16 + rest 10 octave 4 note G_, 2 note F#, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 12 note D_, 2 note E_, 2 @@ -75,38 +76,38 @@ Music_PokemonLullaby_branch_f6dcc: note D_, 2 note F_, 2 note E_, 10 - intensity $b5 + volume_envelope 11, 5 note D_, 2 note D_, 2 - intensity $c7 + volume_envelope 12, 7 note E_, 2 note F_, 4 note E_, 4 note F_, 4 - intensity $b5 + volume_envelope 11, 5 note G_, 2 note G_, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note E_, 14 - intensity $87 + volume_envelope 8, 7 octave 3 note F_, 8 note G_, 4 - intensity $b5 + volume_envelope 11, 5 octave 4 note G_, 2 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 2 note E_, 16 - note __, 14 - loopchannel 0, Music_PokemonLullaby_branch_f6dcc + rest 14 + sound_loop 0, .mainloop Music_PokemonLullaby_Ch3: - notetype $c, $11 -Music_PokemonLullaby_branch_f6e06: - stereopanning $f0 + note_type 12, 1, 1 +.mainloop: + stereo_panning TRUE, FALSE octave 4 note C_, 2 note E_, 2 @@ -118,7 +119,7 @@ Music_PokemonLullaby_branch_f6e06: note B_, 2 note A_, 2 note G_, 2 - stereopanning $f + stereo_panning FALSE, TRUE note D_, 2 note F_, 2 note A_, 2 @@ -129,4 +130,4 @@ Music_PokemonLullaby_branch_f6e06: octave 4 note B_, 2 note A_, 2 - loopchannel 0, Music_PokemonLullaby_branch_f6e06 + sound_loop 0, .mainloop diff --git a/audio/music/pokemonmarch.asm b/audio/music/pokemonmarch.asm index 346e042b..80acde98 100644 --- a/audio/music/pokemonmarch.asm +++ b/audio/music/pokemonmarch.asm @@ -1,72 +1,73 @@ 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 + channel_count 4 + channel 1, Music_PokemonMarch_Ch1 + channel 2, Music_PokemonMarch_Ch2 + channel 3, Music_PokemonMarch_Ch3 + channel 4, Music_PokemonMarch_Ch4 Music_PokemonMarch_Ch1: tempo 144 - volume $77 - stereopanning $f0 - dutycycle $3 - tone $0001 - notetype $c, $42 + volume 7, 7 + stereo_panning TRUE, FALSE + duty_cycle 3 + pitch_offset 1 + note_type 12, 4, 2 octave 3 note D_, 4 - intensity $62 + volume_envelope 6, 2 note D_, 4 - intensity $82 + volume_envelope 8, 2 note D_, 4 - intensity $a2 + volume_envelope 10, 2 note D_, 4 - notetype $8, $a2 -Music_PokemonMarch_branch_f6e4c: - callchannel Music_PokemonMarch_branch_f6eae + note_type 8, 10, 2 +.mainloop: + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 note C_, 2 - callchannel Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 note G_, 2 - callchannel Music_PokemonMarch_branch_f6eae + sound_call .sub1 note C_, 2 note C_, 2 note D#, 2 note C_, 2 - callchannel Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note C#, 2 note D#, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note D_, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note A_, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note D_, 2 note D_, 2 note F_, 2 note D_, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note G_, 2 - callchannel Music_PokemonMarch_branch_f6eb8 + sound_call .sub2 note F_, 2 note D_, 2 note F_, 2 note D_, 2 - callchannel Music_PokemonMarch_branch_f6eae + sound_call .sub1 note D#, 2 note C_, 2 note D#, 2 @@ -81,9 +82,9 @@ Music_PokemonMarch_branch_f6e4c: note C_, 2 octave 2 note A#, 2 - note __, 4 + rest 4 note D#, 2 - note __, 4 + rest 4 octave 3 note D#, 2 note D#, 2 @@ -95,56 +96,56 @@ Music_PokemonMarch_branch_f6e4c: note F_, 2 note G_, 4 note A#, 2 - loopchannel 0, Music_PokemonMarch_branch_f6e4c + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f6eae: - note __, 4 +.sub1: + rest 4 octave 3 note D#, 1 note D_, 1 note D#, 2 - note __, 2 + rest 2 note D#, 2 note D#, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_PokemonMarch_branch_f6eb8: - note __, 4 +.sub2: + rest 4 note F_, 1 note E_, 1 note F_, 2 - note __, 2 + rest 2 note F_, 2 note F_, 2 - note __, 2 - endchannel + rest 2 + sound_ret Music_PokemonMarch_Ch2: - dutycycle $2 - vibrato $10, $22 - notetype $c, $b2 + duty_cycle 2 + vibrato 16, 2, 2 + note_type 12, 11, 2 octave 3 note G_, 4 note G_, 4 note G_, 4 note G_, 4 -Music_PokemonMarch_branch_f6ece: - notetype $c, $b7 +.mainloop: + note_type 12, 11, 7 octave 3 note G#, 12 - notetype $8, $b3 + note_type 8, 11, 3 note D#, 2 note G#, 2 note A#, 2 octave 4 note C_, 2 - note __, 16 - note __, 6 - notetype $8, $b7 + rest 16 + rest 6 + note_type 8, 11, 7 octave 3 note G#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note D#, 2 note G#, 4 note A#, 2 @@ -159,21 +160,21 @@ Music_PokemonMarch_branch_f6ece: octave 3 note A#, 2 note G#, 2 - notetype $8, $b7 + note_type 8, 11, 7 note A#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note A#, 2 note F_, 2 note A#, 2 octave 4 note C_, 2 note D_, 2 - note __, 16 - note __, 6 - notetype $8, $b7 + rest 16 + rest 6 + note_type 8, 11, 7 octave 3 note A#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note F_, 2 note A#, 4 octave 4 @@ -188,17 +189,17 @@ Music_PokemonMarch_branch_f6ece: note C_, 2 octave 3 note B_, 2 - notetype $8, $b7 + note_type 8, 11, 7 note A#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note A_, 2 note A#, 4 octave 4 note C_, 2 - notetype $8, $b7 + note_type 8, 11, 7 octave 3 note G#, 16 - notetype $8, $b3 + note_type 8, 11, 3 note A#, 2 note G#, 4 note F_, 2 @@ -209,12 +210,12 @@ Music_PokemonMarch_branch_f6ece: note F#, 2 note F_, 2 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 note D_, 1 note D#, 1 - note __, 5 + rest 5 octave 3 note G_, 2 note G_, 2 @@ -223,87 +224,87 @@ Music_PokemonMarch_branch_f6ece: note A_, 2 note G#, 2 note G_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 note F#, 1 note G_, 1 - note __, 5 - loopchannel 0, Music_PokemonMarch_branch_f6ece + rest 5 + sound_loop 0, .mainloop Music_PokemonMarch_Ch3: - stereopanning $f - notetype $c, $16 - note __, 16 - notetype $8, $16 -Music_PokemonMarch_branch_f6f56: - callchannel Music_PokemonMarch_branch_f6fe8 - note __, 2 + stereo_panning FALSE, TRUE + note_type 12, 1, 6 + rest 16 + note_type 8, 1, 6 +.mainloop: + sound_call .sub1 + rest 2 octave 4 note D#, 2 - callchannel Music_PokemonMarch_branch_f6fe8 + sound_call .sub1 octave 4 note G#, 2 note D#, 2 - callchannel Music_PokemonMarch_branch_f6fe8 - note __, 2 + sound_call .sub1 + rest 2 octave 4 note D#, 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note D#, 2 note G_, 2 note G#, 2 -Music_PokemonMarch_branch_f6f7b: +.loop1: octave 3 note A#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note A_, 2 - note __, 1 + rest 1 octave 4 note F_, 2 - note __, 1 - loopchannel 3, Music_PokemonMarch_branch_f6f7b + rest 1 + sound_loop 3, .loop1 octave 3 note A#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note A#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 note D_, 2 @@ -311,17 +312,17 @@ Music_PokemonMarch_branch_f6f7b: octave 3 note B_, 2 note A#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 4 note F_, 2 octave 3 @@ -329,22 +330,22 @@ Music_PokemonMarch_branch_f6f7b: note G_, 2 note A#, 2 note G#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note C_, 2 note D#, 2 @@ -354,10 +355,10 @@ Music_PokemonMarch_branch_f6f7b: note F#, 2 note F_, 2 note D#, 2 - note __, 4 + rest 4 octave 3 note D#, 2 - note __, 4 + rest 4 octave 4 note G_, 2 note G_, 2 @@ -366,94 +367,94 @@ Music_PokemonMarch_branch_f6f7b: note A_, 2 note G#, 2 note G_, 2 - note __, 2 + rest 2 note D#, 2 note F_, 2 - note __, 2 + rest 2 note G#, 2 - loopchannel 0, Music_PokemonMarch_branch_f6f56 + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f6fe8: +.sub1: octave 3 note G#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note F_, 2 - note __, 2 + rest 2 octave 4 note D#, 2 octave 3 note G_, 2 - endchannel + sound_ret Music_PokemonMarch_Ch4: - stereopanning $f0 - togglenoise $5 - notetype $8 - callchannel Music_PokemonMarch_branch_f704c -Music_PokemonMarch_branch_f7003: - callchannel Music_PokemonMarch_branch_f7042 - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 5 - notetype $6 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - notetype $8 - callchannel Music_PokemonMarch_branch_f7042 - callchannel Music_PokemonMarch_branch_f704c - callchannel Music_PokemonMarch_branch_f7042 - callchannel Music_PokemonMarch_branch_f704c - callchannel Music_PokemonMarch_branch_f7042 - callchannel Music_PokemonMarch_branch_f704c - callchannel Music_PokemonMarch_branch_f7042 - callchannel Music_PokemonMarch_branch_f704c - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 6 - note C_, 2 - notetype $4 - note __, 5 - notetype $6 - note D_, 1 - note D_, 1 - notetype $8 - callchannel Music_PokemonMarch_branch_f704c - loopchannel 0, Music_PokemonMarch_branch_f7003 + stereo_panning TRUE, FALSE + toggle_noise 5 + drum_speed 8 + sound_call .sub2 +.mainloop: + sound_call .sub1 + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 1, 5 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 8 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + drum_note 2, 4 + drum_note 2, 2 + drum_note 2, 4 + drum_note 2, 2 + drum_note 2, 6 + drum_note 1, 2 + drum_speed 4 + rest 5 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 8 + sound_call .sub2 + sound_loop 0, .mainloop -Music_PokemonMarch_branch_f7042: - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note C#, 2 - note C#, 2 - endchannel +.sub1: + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 2, 2 + drum_note 2, 2 + sound_ret -Music_PokemonMarch_branch_f704c: - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 4 - note C_, 4 - note C#, 2 - note D_, 2 - note C#, 2 - endchannel +.sub2: + drum_note 1, 4 + drum_note 1, 2 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 4 + drum_note 2, 2 + drum_note 3, 2 + drum_note 2, 2 + sound_ret diff --git a/audio/music/postcredits.asm b/audio/music/postcredits.asm index 0997828f..d352a5fc 100644 --- a/audio/music/postcredits.asm +++ b/audio/music/postcredits.asm @@ -1,17 +1,18 @@ Music_PostCredits: - musicheader 2, 1, Music_PostCredits_Ch1 - musicheader 1, 2, Music_PostCredits_Ch2 + channel_count 2 + channel 1, Music_PostCredits_Ch1 + channel 2, Music_PostCredits_Ch2 - db $2 + db $2 ; unused Music_PostCredits_Ch1: tempo 271 - volume $77 - pitchoffset 0, D# - dutycycle $2 - notetype $c, $93 - note __, 8 -Music_PostCredits_branch_cfdb2: + volume 7, 7 + transpose 0, 3 + duty_cycle 2 + note_type 12, 9, 3 + rest 8 +.mainloop: octave 3 note C_, 2 note E_, 2 @@ -19,13 +20,13 @@ Music_PostCredits_branch_cfdb2: octave 4 note C_, 2 note E_, 2 - intensity $73 + volume_envelope 7, 3 note E_, 2 - intensity $53 + volume_envelope 5, 3 note E_, 2 - intensity $43 + volume_envelope 4, 3 note E_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note B_, 2 octave 3 @@ -34,13 +35,13 @@ Music_PostCredits_branch_cfdb2: note B_, 2 octave 4 note D_, 2 - intensity $73 + volume_envelope 7, 3 note D_, 2 - intensity $53 + volume_envelope 5, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note A#, 2 octave 3 @@ -49,13 +50,13 @@ Music_PostCredits_branch_cfdb2: note A#, 2 octave 4 note D_, 2 - intensity $73 + volume_envelope 7, 3 note D_, 2 - intensity $53 + volume_envelope 5, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note A_, 2 octave 3 @@ -64,13 +65,13 @@ Music_PostCredits_branch_cfdb2: note A_, 2 octave 4 note C_, 2 - intensity $73 + volume_envelope 7, 3 note C_, 2 - intensity $53 + volume_envelope 5, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note G#, 2 octave 3 @@ -79,13 +80,13 @@ Music_PostCredits_branch_cfdb2: note G#, 2 octave 4 note C_, 2 - intensity $73 + volume_envelope 7, 3 note C_, 2 - intensity $53 + volume_envelope 5, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note G_, 2 octave 3 @@ -94,13 +95,13 @@ Music_PostCredits_branch_cfdb2: note G_, 2 octave 4 note C_, 2 - intensity $73 + volume_envelope 7, 3 note C_, 2 - intensity $63 + volume_envelope 6, 3 note C_, 2 - intensity $43 + volume_envelope 4, 3 note C_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note F#, 2 note A_, 2 @@ -108,13 +109,13 @@ Music_PostCredits_branch_cfdb2: note D_, 2 note F#, 2 note A_, 2 - intensity $73 + volume_envelope 7, 3 note A_, 2 - intensity $63 + volume_envelope 6, 3 note A_, 2 - intensity $43 + volume_envelope 4, 3 note A_, 2 - intensity $93 + volume_envelope 9, 3 octave 2 note G_, 2 octave 3 @@ -122,36 +123,36 @@ Music_PostCredits_branch_cfdb2: note D_, 2 note G_, 2 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $93 + volume_envelope 9, 3 note D_, 2 octave 2 note G_, 2 - loopchannel 0, Music_PostCredits_branch_cfdb2 + sound_loop 0, .mainloop Music_PostCredits_Ch2: - pitchoffset 0, D# - dutycycle $2 - notetype $c, $a3 + transpose 0, 3 + duty_cycle 2 + note_type 12, 10, 3 octave 5 note E_, 2 - intensity $73 + volume_envelope 7, 3 note E_, 2 - intensity $a3 + volume_envelope 10, 3 note F_, 2 - intensity $73 + volume_envelope 7, 3 note F_, 2 -Music_PostCredits_branch_cfe5a: - intensity $a3 +.mainloop: + volume_envelope 10, 3 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $93 + volume_envelope 9, 3 octave 6 note D_, 2 note C_, 2 @@ -161,104 +162,104 @@ Music_PostCredits_branch_cfe5a: note C_, 2 octave 5 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $33 + volume_envelope 3, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note E_, 2 - intensity $73 + volume_envelope 7, 3 note E_, 2 - intensity $a3 + volume_envelope 10, 3 note F_, 2 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $43 + volume_envelope 4, 3 note G_, 2 - intensity $33 + volume_envelope 3, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note A_, 2 - intensity $73 + volume_envelope 7, 3 note A_, 2 - intensity $a3 + volume_envelope 10, 3 note E_, 2 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note F_, 2 - intensity $73 + volume_envelope 7, 3 note F_, 2 - intensity $53 + volume_envelope 5, 3 note F_, 2 - intensity $a3 + volume_envelope 10, 3 note D_, 2 note E_, 2 note F_, 2 - intensity $73 + volume_envelope 7, 3 note F_, 2 - intensity $53 + volume_envelope 5, 3 note F_, 2 - intensity $43 + volume_envelope 4, 3 note F_, 2 - intensity $33 + volume_envelope 3, 3 note F_, 2 - intensity $a3 + volume_envelope 10, 3 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note F_, 2 note E_, 2 note D#, 2 note E_, 2 note B_, 2 - intensity $73 + volume_envelope 7, 3 note B_, 2 - intensity $53 + volume_envelope 5, 3 note B_, 2 - intensity $a3 + volume_envelope 10, 3 note A_, 2 - intensity $73 + volume_envelope 7, 3 note A_, 2 - intensity $a3 + volume_envelope 10, 3 note D_, 2 - intensity $73 + volume_envelope 7, 3 note D_, 2 - intensity $53 + volume_envelope 5, 3 note D_, 2 - intensity $43 + volume_envelope 4, 3 note D_, 2 - intensity $33 + volume_envelope 3, 3 note D_, 2 note D_, 2 - intensity $23 + volume_envelope 2, 3 note D_, 2 note D_, 2 - intensity $a3 + volume_envelope 10, 3 note G_, 2 - intensity $73 + volume_envelope 7, 3 octave 4 note G_, 2 - intensity $a3 + volume_envelope 10, 3 octave 5 note D_, 2 note G_, 2 - intensity $73 + volume_envelope 7, 3 note G_, 2 - intensity $53 + volume_envelope 5, 3 note G_, 2 - intensity $a3 + volume_envelope 10, 3 note E_, 2 note F_, 2 - loopchannel 0, Music_PostCredits_branch_cfe5a + sound_loop 0, .mainloop diff --git a/audio/music/printer.asm b/audio/music/printer.asm index 886f6b76..18ceb4e0 100644 --- a/audio/music/printer.asm +++ b/audio/music/printer.asm @@ -1,319 +1,320 @@ Music_Printer: - musicheader 1, 3, Music_Printer_Ch3 + channel_count 1 + channel 3, Music_Printer_Ch3 Music_Printer_Ch3: tempo 256 - notetype $c, $20 + note_type 12, 2, 0 octave 4 note B_, 6 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 6 octave 5 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 4 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 -Music_Printer_branch_f0823: + rest 1 +.mainloop: note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 note C_, 1 note C#, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 5 note E_, 1 note D#, 1 note E_, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note B_, 1 note A#, 1 note B_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - loopchannel 0, Music_Printer_branch_f0823 + rest 1 + sound_loop 0, .mainloop diff --git a/audio/music/profoak.asm b/audio/music/profoak.asm index 5e34e2c6..d9fdca7a 100644 --- a/audio/music/profoak.asm +++ b/audio/music/profoak.asm @@ -1,16 +1,17 @@ Music_ProfOak: - musicheader 3, 1, Music_ProfOak_Ch1 - musicheader 1, 2, Music_ProfOak_Ch2 - musicheader 1, 3, Music_ProfOak_Ch3 + channel_count 3 + channel 1, Music_ProfOak_Ch1 + channel 2, Music_ProfOak_Ch2 + channel 3, Music_ProfOak_Ch3 Music_ProfOak_Ch1: tempo 118 - volume $77 - vibrato $12, $34 - tone $0001 - stereopanning $f0 - dutycycle $3 - notetype $c, $98 + volume 7, 7 + vibrato 18, 3, 4 + pitch_offset 1 + stereo_panning TRUE, FALSE + duty_cycle 3 + note_type 12, 9, 8 octave 2 note F#, 1 note B_, 1 @@ -19,29 +20,29 @@ Music_ProfOak_Ch1: note F#, 1 note A_, 16 note G#, 8 - intensity $97 + volume_envelope 9, 7 note G#, 8 -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: - callchannel Music_ProfOak_branch_f4e58 - callchannel Music_ProfOak_branch_f4e58 - callchannel Music_ProfOak_branch_f4e6c - callchannel Music_ProfOak_branch_f4e6c - pitchoffset 0, D_ - callchannel Music_ProfOak_branch_f4e58 - callchannel Music_ProfOak_branch_f4e58 - pitchoffset 0, C_ - callchannel Music_ProfOak_branch_f4e6c - callchannel Music_ProfOak_branch_f4e6c - loopchannel 0, Music_ProfOak_branch_f4e22 +.loop1: + volume_envelope 9, 1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_loop 2, .loop1 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + transpose 0, 2 + sound_call .sub3 + sound_call .sub3 + transpose 0, 0 + sound_call .sub4 + sound_call .sub4 + sound_loop 0, .mainloop -Music_ProfOak_branch_f4e42: +.sub1: octave 2 note B_, 2 octave 3 @@ -52,9 +53,9 @@ Music_ProfOak_branch_f4e42: note E_, 2 note G#, 2 note E_, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4e4d: +.sub2: octave 2 note B_, 2 octave 3 @@ -65,9 +66,9 @@ Music_ProfOak_branch_f4e4d: note D#, 2 note F#, 2 note D#, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4e58: +.sub3: octave 2 note A_, 2 octave 3 @@ -76,35 +77,35 @@ Music_ProfOak_branch_f4e58: note C#, 1 note E_, 1 note C#, 2 - intensity $92 + volume_envelope 9, 2 note A_, 2 - intensity $91 + volume_envelope 9, 1 note C#, 2 - intensity $92 + volume_envelope 9, 2 note E_, 2 - intensity $91 - endchannel + volume_envelope 9, 1 + sound_ret -Music_ProfOak_branch_f4e6c: +.sub4: octave 2 note B_, 1 octave 3 note E_, 1 - intensity $92 + volume_envelope 9, 2 note G#, 4 note E_, 4 - intensity $91 + volume_envelope 9, 1 note E_, 1 note G#, 1 - intensity $92 + volume_envelope 9, 2 note B_, 4 - intensity $91 - endchannel + volume_envelope 9, 1 + sound_ret Music_ProfOak_Ch2: - vibrato $12, $34 - dutycycle $3 - notetype $c, $a8 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 12, 10, 8 octave 3 note B_, 1 octave 4 @@ -112,11 +113,11 @@ Music_ProfOak_Ch2: note F#, 1 note A#, 1 note B_, 16 - intensity $a7 + volume_envelope 10, 7 note B_, 10 - dutycycle $2 -Music_ProfOak_branch_f4e92: - intensity $b2 + duty_cycle 2 +.loop1: + volume_envelope 11, 2 octave 3 note B_, 2 octave 4 @@ -125,7 +126,7 @@ Music_ProfOak_branch_f4e92: note E_, 4 note D#, 2 note C#, 4 - intensity $91 + volume_envelope 9, 1 note B_, 2 octave 5 note C#, 2 @@ -133,16 +134,16 @@ Music_ProfOak_branch_f4e92: note E_, 4 note D#, 2 note C#, 4 - intensity $b2 + volume_envelope 11, 2 octave 3 note B_, 2 note A_, 2 note G#, 2 note A_, 4 note B_, 1 - note __, 1 + rest 1 note B_, 4 - intensity $91 + volume_envelope 9, 1 octave 4 note B_, 2 note A_, 2 @@ -150,10 +151,10 @@ Music_ProfOak_branch_f4e92: note A_, 4 note B_, 2 note B_, 4 - loopchannel 2, Music_ProfOak_branch_f4e92 - note __, 6 - intensity $b4 -Music_ProfOak_branch_f4ebf: + sound_loop 2, .loop1 + rest 6 + volume_envelope 11, 4 +.mainloop: note C#, 6 octave 3 note A_, 1 @@ -172,14 +173,14 @@ Music_ProfOak_branch_f4ebf: note B_, 1 octave 4 note E_, 8 - intensity $82 + volume_envelope 8, 2 note B_, 6 note G#, 1 note B_, 1 - intensity $83 + volume_envelope 8, 3 octave 5 note E_, 8 - intensity $b4 + volume_envelope 11, 4 octave 3 note A_, 6 note F#, 1 @@ -201,111 +202,111 @@ Music_ProfOak_branch_f4ebf: octave 4 note E_, 1 note G#, 16 - loopchannel 0, Music_ProfOak_branch_f4ebf + sound_loop 0, .mainloop Music_ProfOak_Ch3: - stereopanning $f - notetype $c, $14 - note __, 4 + stereo_panning FALSE, TRUE + note_type 12, 1, 4 + rest 4 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note E_, 2 - callchannel Music_ProfOak_branch_f4f3d -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: - callchannel Music_ProfOak_branch_f4f5a - callchannel Music_ProfOak_branch_f4f5a - callchannel Music_ProfOak_branch_f4f69 - callchannel Music_ProfOak_branch_f4f69 - pitchoffset 0, D_ - callchannel Music_ProfOak_branch_f4f5a - callchannel Music_ProfOak_branch_f4f5a - pitchoffset 0, C_ - callchannel Music_ProfOak_branch_f4f69 - callchannel Music_ProfOak_branch_f4f69 - loopchannel 0, Music_ProfOak_branch_f4f1d + sound_call .sub1 +.loop1: + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_loop 2, .loop1 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + transpose 0, 2 + sound_call .sub3 + sound_call .sub3 + transpose 0, 0 + sound_call .sub4 + sound_call .sub4 + sound_loop 0, .mainloop -Music_ProfOak_branch_f4f3d: +.sub1: note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note G#, 2 - note __, 2 + rest 2 octave 2 note B_, 2 octave 3 note B_, 1 - note __, 1 + rest 1 note E_, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4f4c: +.sub2: octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note D#, 2 - note __, 2 + rest 2 note F#, 2 note B_, 1 - note __, 1 + rest 1 note D#, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4f5a: +.sub3: octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 note A_, 1 - note __, 1 + rest 1 note C#, 2 - endchannel + sound_ret -Music_ProfOak_branch_f4f69: +.sub4: octave 2 note G#, 2 - note __, 2 + rest 2 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 2 - note __, 2 + rest 2 octave 3 note E_, 2 note G#, 1 - note __, 1 + rest 1 octave 2 note B_, 2 - endchannel + sound_ret diff --git a/audio/music/profoakspokemontalk.asm b/audio/music/profoakspokemontalk.asm index bd299466..7ee5f379 100644 --- a/audio/music/profoakspokemontalk.asm +++ b/audio/music/profoakspokemontalk.asm @@ -1,18 +1,19 @@ Music_ProfOaksPokemonTalk: - musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1 - musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2 - musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3 + channel_count 3 + channel 1, Music_ProfOaksPokemonTalk_Ch1 + channel 2, Music_ProfOaksPokemonTalk_Ch2 + channel 3, Music_ProfOaksPokemonTalk_Ch3 - db $3 + db $3 ; unused Music_ProfOaksPokemonTalk_Ch1: tempo 164 - volume $77 - stereopanning $f - vibrato $6, $25 - dutycycle $1 - notetype $c, $94 - note __, 8 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 6, 2, 5 + duty_cycle 1 + note_type 12, 9, 4 + rest 8 octave 3 note B_, 1 octave 4 @@ -23,7 +24,7 @@ Music_ProfOaksPokemonTalk_Ch1: note D#, 1 note E_, 1 note F#, 1 -Music_ProfOaksPokemonTalk_branch_f4cc3: +.mainloop: note D#, 6 note C#, 1 octave 3 @@ -31,22 +32,22 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: note F#, 1 note G#, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 note A#, 1 note B_, 2 note F#, 1 note G#, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 note G#, 1 note F#, 1 - note __, 1 + rest 1 note A#, 4 octave 4 note D#, 6 @@ -56,23 +57,23 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: note G#, 1 note B_, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 1 note B_, 1 note F#, 1 note A#, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 note A#, 1 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note A#, 4 note E_, 2 octave 2 @@ -116,27 +117,27 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: note C#, 2 octave 3 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3 + rest 1 + sound_loop 0, .mainloop Music_ProfOaksPokemonTalk_Ch2: - vibrato $8, $24 - dutycycle $3 - notetype $c, $a7 - stereopanning $ff + vibrato 8, 2, 4 + duty_cycle 3 + note_type 12, 10, 7 + stereo_panning TRUE, TRUE octave 3 note B_, 1 octave 4 @@ -155,7 +156,7 @@ Music_ProfOaksPokemonTalk_Ch2: note F#, 1 note G#, 1 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d4d: +.mainloop: note B_, 6 note A#, 1 note G#, 1 @@ -192,26 +193,26 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: note G#, 2 note F#, 2 note C#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 - loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d + rest 1 + sound_loop 0, .mainloop Music_ProfOaksPokemonTalk_Ch3: - vibrato $6, $38 - notetype $c, $25 - stereopanning $f0 - note __, 8 + vibrato 6, 3, 8 + note_type 12, 2, 5 + stereo_panning TRUE, FALSE + rest 8 octave 3 note F#, 1 note E_, 1 @@ -222,7 +223,7 @@ Music_ProfOaksPokemonTalk_Ch3: note C#, 1 octave 2 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d95: +.mainloop: note B_, 6 octave 3 note D#, 1 @@ -252,23 +253,23 @@ Music_ProfOaksPokemonTalk_branch_f4d95: note F#, 2 note D#, 2 note E_, 2 - note __, 4 + rest 4 note E_, 1 note E_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note B_, 4 note F#, 2 - note __, 4 + rest 4 note F#, 1 note F#, 1 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 4 note F#, 2 @@ -290,18 +291,18 @@ Music_ProfOaksPokemonTalk_branch_f4d95: note F#, 2 octave 3 note A#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 - loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95 + rest 1 + sound_loop 0, .mainloop diff --git a/audio/music/rivalbattle.asm b/audio/music/rivalbattle.asm index 4ba8840b..655164c4 100644 --- a/audio/music/rivalbattle.asm +++ b/audio/music/rivalbattle.asm @@ -1,62 +1,63 @@ Music_RivalBattle: - musicheader 3, 1, Music_RivalBattle_Ch1 - musicheader 1, 2, Music_RivalBattle_Ch2 - musicheader 1, 3, Music_RivalBattle_Ch3 + channel_count 3 + channel 1, Music_RivalBattle_Ch1 + channel 2, Music_RivalBattle_Ch2 + channel 3, Music_RivalBattle_Ch3 Music_RivalBattle_Ch1: tempo 102 - volume $77 - dutycycle $3 - tone $0002 - vibrato $8, $15 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 8, 1, 5 + note_type 12, 11, 2 octave 3 note F#, 2 note A#, 4 - intensity $b7 + volume_envelope 11, 7 note A#, 10 - intensity $b2 + volume_envelope 11, 2 note F#, 2 octave 4 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 6 note E_, 4 -Music_RivalBattle_branch_e9777: - intensity $b2 +.loop1: + volume_envelope 11, 2 octave 2 note A#, 6 - intensity $b7 + volume_envelope 11, 7 octave 3 note C#, 6 - intensity $b2 + volume_envelope 11, 2 note D#, 4 - loopchannel 3, Music_RivalBattle_branch_e9777 - intensity $b2 + sound_loop 3, .loop1 + volume_envelope 11, 2 octave 2 note A#, 2 octave 3 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 10 -Music_RivalBattle_branch_e978f: - intensity $b2 +.loop2: + volume_envelope 11, 2 octave 3 note G#, 6 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $b2 + volume_envelope 11, 2 octave 4 note C#, 4 - loopchannel 3, Music_RivalBattle_branch_e978f - intensity $b2 + sound_loop 3, .loop2 + volume_envelope 11, 2 octave 3 note G#, 2 note B_, 4 - intensity $4d + volume_envelope 4, -5 note B_, 10 -Music_RivalBattle_branch_e97a6: - intensity $b7 +.mainloop: + volume_envelope 11, 7 note A#, 6 note F#, 6 note D#, 4 @@ -64,21 +65,21 @@ Music_RivalBattle_branch_e97a6: note F#, 4 note G#, 2 note A#, 6 - intensity $b2 + volume_envelope 11, 2 note F_, 1 note D#, 1 note C#, 1 note D#, 1 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - intensity $b2 + volume_envelope 11, 2 note G#, 1 note F#, 1 note F_, 1 note F#, 1 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - intensity $b6 + volume_envelope 11, 6 note G#, 2 note A#, 2 note B_, 2 @@ -90,7 +91,7 @@ Music_RivalBattle_branch_e97a6: note B_, 2 octave 4 note E_, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note A#, 6 note F#, 6 @@ -106,7 +107,7 @@ Music_RivalBattle_branch_e97a6: note C#, 6 octave 3 note G#, 4 - intensity $b5 + volume_envelope 11, 5 note C#, 2 note F_, 2 note G#, 2 @@ -117,32 +118,32 @@ Music_RivalBattle_branch_e97a6: note G#, 2 note F_, 2 note G#, 2 - intensity $b7 + volume_envelope 11, 7 note F#, 10 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 2 octave 3 note D#, 2 note F#, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 note D#, 4 note C#, 2 note D#, 6 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $a7 + volume_envelope 10, 7 note F_, 8 - intensity $a0 + volume_envelope 10, 0 octave 2 note A#, 8 - intensity $a7 + volume_envelope 10, 7 note A#, 8 - intensity $b7 + volume_envelope 11, 7 octave 3 note F#, 10 - intensity $b5 + volume_envelope 11, 5 octave 2 note B_, 2 octave 3 @@ -156,17 +157,17 @@ Music_RivalBattle_branch_e97a6: note F#, 2 note F_, 2 note G#, 2 - intensity $a0 + volume_envelope 10, 0 note A#, 16 - intensity $a7 + volume_envelope 10, 7 note A#, 16 - intensity $a0 + volume_envelope 10, 0 note B_, 8 - intensity $a7 + volume_envelope 10, 7 note B_, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - intensity $b5 + volume_envelope 11, 5 octave 4 note E_, 2 note D#, 2 @@ -178,7 +179,7 @@ Music_RivalBattle_branch_e97a6: note E_, 2 note D#, 2 note C#, 2 -Music_RivalBattle_branch_e9837: +.loop3: octave 3 note A#, 2 note E_, 2 @@ -203,8 +204,8 @@ Music_RivalBattle_branch_e9837: note A#, 2 octave 4 note D#, 2 - loopchannel 2, Music_RivalBattle_branch_e9837 - intensity $94 + sound_loop 2, .loop3 + volume_envelope 9, 4 octave 3 note D#, 8 octave 2 @@ -212,14 +213,14 @@ Music_RivalBattle_branch_e9837: octave 3 note G_, 8 note F_, 8 - intensity $96 + volume_envelope 9, 6 octave 2 note G#, 8 note A#, 8 note B_, 8 octave 3 note C#, 8 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 8 octave 3 @@ -233,16 +234,16 @@ Music_RivalBattle_branch_e9837: note B_, 8 octave 4 note C#, 8 - intensity $a0 + volume_envelope 10, 0 note D#, 8 - intensity $a7 + volume_envelope 10, 7 note D#, 8 - intensity $a0 + volume_envelope 10, 0 octave 3 note G_, 8 - intensity $a7 + volume_envelope 10, 7 note G_, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 note C#, 8 note D#, 4 @@ -251,7 +252,7 @@ Music_RivalBattle_branch_e9837: note B_, 4 octave 3 note C#, 4 - intensity $c7 + volume_envelope 12, 7 octave 2 note A#, 6 octave 3 @@ -283,13 +284,13 @@ Music_RivalBattle_branch_e9837: note B_, 6 octave 3 note C#, 10 - loopchannel 0, Music_RivalBattle_branch_e97a6 + sound_loop 0, .mainloop Music_RivalBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 12, 2 octave 4 note E_, 1 note D#, 1 @@ -327,94 +328,94 @@ Music_RivalBattle_Ch2: note C_, 1 octave 2 note B_, 1 - intensity $c2 + volume_envelope 12, 2 octave 4 note D#, 6 - intensity $c7 + volume_envelope 12, 7 octave 3 note F#, 6 - intensity $c2 + volume_envelope 12, 2 note G#, 4 -Music_RivalBattle_branch_e98ea: - intensity $c2 +.loop1: + volume_envelope 12, 2 note D#, 6 - intensity $c7 + volume_envelope 12, 7 note F#, 6 - intensity $c2 + volume_envelope 12, 2 note G#, 4 - loopchannel 2, Music_RivalBattle_branch_e98ea - intensity $c2 + sound_loop 2, .loop1 + volume_envelope 12, 2 note D#, 2 note F#, 4 - intensity $c7 + volume_envelope 12, 7 note F#, 8 - intensity $a2 + volume_envelope 10, 2 note B_, 1 octave 4 note C_, 1 -Music_RivalBattle_branch_e9903: - intensity $c2 +.loop2: + volume_envelope 12, 2 note C#, 6 - intensity $c7 + volume_envelope 12, 7 note E_, 6 - intensity $c2 + volume_envelope 12, 2 note F#, 4 - loopchannel 3, Music_RivalBattle_branch_e9903 - intensity $c2 + sound_loop 3, .loop2 + volume_envelope 12, 2 note C#, 2 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note E_, 6 -Music_RivalBattle_branch_e991a: - callchannel Music_RivalBattle_branch_e99e0 - intensity $b0 +.mainloop: + sound_call .sub1 + volume_envelope 11, 0 note G#, 8 - intensity $b7 + volume_envelope 11, 7 note G#, 8 - callchannel Music_RivalBattle_branch_e99e0 - intensity $4e + sound_call .sub1 + volume_envelope 4, -6 note G#, 8 - intensity $b7 + volume_envelope 11, 7 note G#, 8 - intensity $b0 + volume_envelope 11, 0 octave 3 note B_, 10 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $b0 + volume_envelope 11, 0 octave 4 note C#, 8 octave 3 note B_, 8 - intensity $b0 + volume_envelope 11, 0 note A#, 10 - intensity $b7 + volume_envelope 11, 7 note A#, 6 - intensity $2f + volume_envelope 2, -7 note D#, 10 - intensity $b7 + volume_envelope 11, 7 note D#, 6 - intensity $b0 + volume_envelope 11, 0 note B_, 10 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 8 octave 3 note B_, 8 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 16 - intensity $b7 + volume_envelope 11, 7 note D#, 16 - intensity $b0 + volume_envelope 11, 0 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note E_, 6 - intensity $c7 + volume_envelope 12, 7 note E_, 2 note G#, 2 note B_, 2 @@ -422,36 +423,36 @@ Music_RivalBattle_branch_e991a: note C#, 8 octave 4 note B_, 8 - intensity $b0 + volume_envelope 11, 0 note A#, 10 - intensity $b7 + volume_envelope 11, 7 note A#, 6 - intensity $b0 + volume_envelope 11, 0 note A_, 10 - intensity $b7 + volume_envelope 11, 7 note A_, 6 - intensity $b0 + volume_envelope 11, 0 note G#, 10 - intensity $b7 + volume_envelope 11, 7 note G#, 6 - intensity $b0 + volume_envelope 11, 0 note G_, 10 - intensity $b7 + volume_envelope 11, 7 note G_, 6 - intensity $a4 + volume_envelope 10, 4 octave 3 note G_, 8 note D#, 8 note A#, 8 note G#, 8 - intensity $a6 + volume_envelope 10, 6 octave 2 note B_, 8 octave 3 note C#, 8 note D#, 8 note F_, 8 - intensity $c7 + volume_envelope 12, 7 octave 4 note G_, 8 note D#, 8 @@ -463,94 +464,94 @@ Music_RivalBattle_branch_e991a: note C#, 8 note D#, 8 note F_, 8 - intensity $b0 + volume_envelope 11, 0 note G_, 16 note D#, 16 octave 3 note B_, 8 note A#, 8 note G#, 8 - intensity $c7 + volume_envelope 12, 7 note F_, 8 -Music_RivalBattle_branch_e99a6: - intensity $c2 +.loop3: + volume_envelope 12, 2 octave 3 note A#, 6 - intensity $c7 + volume_envelope 12, 7 octave 4 note C#, 6 - intensity $c2 + volume_envelope 12, 2 note D#, 4 - loopchannel 3, Music_RivalBattle_branch_e99a6 - intensity $c2 + sound_loop 3, .loop3 + volume_envelope 12, 2 octave 3 note A#, 2 octave 4 note C#, 4 - intensity $b7 + volume_envelope 11, 7 note C#, 6 - intensity $9a + volume_envelope 9, -2 note C#, 4 -Music_RivalBattle_branch_e99c1: - intensity $c2 +.loop4: + volume_envelope 12, 2 octave 3 note G#, 6 - intensity $c7 + volume_envelope 12, 7 note B_, 6 - intensity $c2 + volume_envelope 12, 2 octave 4 note C#, 4 - loopchannel 3, Music_RivalBattle_branch_e99c1 - intensity $c2 + sound_loop 3, .loop4 + volume_envelope 12, 2 octave 3 note G#, 2 note B_, 4 - intensity $c7 + volume_envelope 12, 7 note B_, 6 - intensity $6a + volume_envelope 6, -2 octave 4 note D_, 4 - loopchannel 0, Music_RivalBattle_branch_e991a + sound_loop 0, .mainloop -Music_RivalBattle_branch_e99e0: - intensity $c7 +.sub1: + volume_envelope 12, 7 note D#, 10 - intensity $c4 + volume_envelope 12, 4 octave 3 note A#, 2 octave 4 note D#, 2 note F#, 2 - intensity $c5 + volume_envelope 12, 5 note F_, 4 note D#, 4 - intensity $c2 + volume_envelope 12, 2 note C#, 2 - intensity $c7 + volume_envelope 12, 7 note D#, 6 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - endchannel + sound_ret Music_RivalBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 3 note F#, 2 note A#, 2 - note __, 2 + rest 2 note A#, 10 octave 3 note F#, 2 octave 4 note C#, 2 - note __, 2 + rest 2 note C#, 6 octave 3 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a0c: +.loop1: note D#, 2 note C#, 2 note D#, 2 @@ -558,8 +559,8 @@ Music_RivalBattle_branch_e9a0c: note E_, 2 note D#, 2 note C#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a0c -Music_RivalBattle_branch_e9a17: + sound_loop 4, .loop1 +.loop2: octave 3 note C#, 2 octave 2 @@ -571,7 +572,7 @@ Music_RivalBattle_branch_e9a17: note C#, 2 octave 2 note B_, 2 - loopchannel 3, Music_RivalBattle_branch_e9a17 + sound_loop 3, .loop2 octave 3 note C#, 2 note E_, 2 @@ -582,8 +583,8 @@ Music_RivalBattle_branch_e9a17: note C_, 2 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a30: - callchannel Music_RivalBattle_branch_e9b47 +.mainloop: + sound_call .sub1 octave 2 note A#, 2 octave 4 @@ -600,7 +601,7 @@ Music_RivalBattle_branch_e9a30: note A#, 2 octave 3 note G#, 2 - callchannel Music_RivalBattle_branch_e9b50 + sound_call .sub2 note C#, 2 note G#, 2 octave 4 @@ -611,7 +612,7 @@ Music_RivalBattle_branch_e9a30: note C_, 2 octave 2 note B_, 2 - callchannel Music_RivalBattle_branch_e9b47 + sound_call .sub1 octave 2 note A#, 2 octave 3 @@ -628,20 +629,20 @@ Music_RivalBattle_branch_e9a30: note A#, 2 octave 3 note F_, 2 - callchannel Music_RivalBattle_branch_e9b50 -Music_RivalBattle_branch_e9a66: + sound_call .sub2 +.loop3: note C#, 2 note G#, 2 - loopchannel 4, Music_RivalBattle_branch_e9a66 - callchannel Music_RivalBattle_branch_e9b5c + sound_loop 4, .loop3 + sound_call .sub3 note G#, 2 note F#, 2 -Music_RivalBattle_branch_e9a71: +.loop4: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 4, Music_RivalBattle_branch_e9a71 + sound_loop 4, .loop4 octave 2 note A#, 2 octave 3 @@ -656,17 +657,17 @@ Music_RivalBattle_branch_e9a71: note F#, 2 note F_, 2 note D#, 2 - callchannel Music_RivalBattle_branch_e9b5c + sound_call .sub3 octave 2 note B_, 2 octave 3 note D_, 2 - callchannel Music_RivalBattle_branch_e9b65 + sound_call .sub4 octave 3 note D#, 2 octave 4 note D#, 2 - callchannel Music_RivalBattle_branch_e9b65 + sound_call .sub4 octave 3 note D#, 2 note A#, 2 @@ -694,34 +695,34 @@ Music_RivalBattle_branch_e9a71: note F#, 2 note G_, 2 note G#, 2 -Music_RivalBattle_branch_e9ab3: +.loop5: note D#, 2 note A#, 2 - loopchannel 4, Music_RivalBattle_branch_e9ab3 -Music_RivalBattle_branch_e9ab9: + sound_loop 4, .loop5 +.loop6: note D#, 2 note A_, 2 - loopchannel 4, Music_RivalBattle_branch_e9ab9 -Music_RivalBattle_branch_e9abf: + sound_loop 4, .loop6 +.loop7: note D#, 2 note G#, 2 - loopchannel 4, Music_RivalBattle_branch_e9abf -Music_RivalBattle_branch_e9ac5: + sound_loop 4, .loop7 +.loop8: note D#, 2 note G_, 2 - loopchannel 12, Music_RivalBattle_branch_e9ac5 -Music_RivalBattle_branch_e9acb: + sound_loop 12, .loop8 +.loop9: octave 2 note B_, 2 octave 3 note D#, 2 - loopchannel 4, Music_RivalBattle_branch_e9acb -Music_RivalBattle_branch_e9ad3: + sound_loop 4, .loop9 +.loop10: octave 2 note B_, 2 octave 3 note F#, 2 - loopchannel 4, Music_RivalBattle_branch_e9ad3 + sound_loop 4, .loop10 note D#, 2 note G_, 2 note A#, 2 @@ -775,40 +776,40 @@ Music_RivalBattle_branch_e9ad3: note C#, 8 note D#, 8 note F_, 8 -Music_RivalBattle_branch_e9b10: +.loop11: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 7, Music_RivalBattle_branch_e9b10 + sound_loop 7, .loop11 note E_, 2 note D#, 2 -Music_RivalBattle_branch_e9b1a: +.loop12: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 6, Music_RivalBattle_branch_e9b1a + sound_loop 6, .loop12 octave 2 note A#, 2 octave 3 note F#, 2 note F_, 2 note E_, 2 -Music_RivalBattle_branch_e9b28: +.loop13: octave 2 note G#, 2 octave 3 note C#, 2 - loopchannel 7, Music_RivalBattle_branch_e9b28 + sound_loop 7, .loop13 note D_, 2 note C#, 2 -Music_RivalBattle_branch_e9b32: +.loop14: octave 2 note G#, 2 octave 3 note C#, 2 - loopchannel 4, Music_RivalBattle_branch_e9b32 + sound_loop 4, .loop14 octave 2 note B_, 2 note G#, 2 @@ -818,17 +819,18 @@ Music_RivalBattle_branch_e9b32: note E_, 2 note D#, 2 note D_, 2 - loopchannel 0, Music_RivalBattle_branch_e9a30 + sound_loop 0, .mainloop -Music_RivalBattle_branch_e9b47: +.sub1: +.sub1loop1: octave 2 note A#, 2 octave 3 note D#, 2 - loopchannel 4, Music_RivalBattle_branch_e9b47 - endchannel + sound_loop 4, .sub1loop1 + sound_ret -Music_RivalBattle_branch_e9b50: +.sub2: note C#, 2 note G#, 2 octave 4 @@ -840,21 +842,23 @@ Music_RivalBattle_branch_e9b50: octave 3 note C#, 2 note G#, 2 - endchannel + sound_ret -Music_RivalBattle_branch_e9b5c: +.sub3: +.sub3loop1: octave 2 note B_, 2 octave 3 note F#, 2 - loopchannel 7, Music_RivalBattle_branch_e9b5c - endchannel + sound_loop 7, .sub3loop1 + sound_ret -Music_RivalBattle_branch_e9b65: +.sub4: +.sub4loop1: octave 3 note D#, 2 note A#, 2 octave 4 note D#, 2 - loopchannel 2, Music_RivalBattle_branch_e9b65 - endchannel + sound_loop 2, .sub4loop1 + sound_ret diff --git a/audio/music/rocketbattle.asm b/audio/music/rocketbattle.asm index 30c90b08..b95f2a89 100644 --- a/audio/music/rocketbattle.asm +++ b/audio/music/rocketbattle.asm @@ -1,15 +1,16 @@ Music_RocketBattle: - musicheader 3, 1, Music_RocketBattle_Ch1 - musicheader 1, 2, Music_RocketBattle_Ch2 - musicheader 1, 3, Music_RocketBattle_Ch3 + channel_count 3 + channel 1, Music_RocketBattle_Ch1 + channel 2, Music_RocketBattle_Ch2 + channel 3, Music_RocketBattle_Ch3 Music_RocketBattle_Ch1: tempo 101 - volume $77 - dutycycle $3 - tone $0002 - vibrato $10, $15 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 1, 5 + note_type 12, 11, 2 octave 4 note E_, 1 note D#, 1 @@ -47,36 +48,36 @@ Music_RocketBattle_Ch1: note C_, 1 octave 2 note B_, 1 -Music_RocketBattle_branch_e9bad: - intensity $b2 +.loop1: + volume_envelope 11, 2 octave 3 note C_, 6 note C_, 4 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note D_, 4 - loopchannel 3, Music_RocketBattle_branch_e9bad - intensity $b2 + sound_loop 3, .loop1 + volume_envelope 11, 2 note C_, 6 note C_, 6 - intensity $b7 + volume_envelope 11, 7 note D_, 4 -Music_RocketBattle_branch_e9bc1: - intensity $b2 +.loop2: + volume_envelope 11, 2 octave 4 note E_, 6 note E_, 4 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 4 - loopchannel 3, Music_RocketBattle_branch_e9bc1 - intensity $b2 + sound_loop 3, .loop2 + volume_envelope 11, 2 note E_, 6 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 2 note D#, 4 - intensity $b3 + volume_envelope 11, 3 octave 4 note C_, 2 octave 3 @@ -100,22 +101,22 @@ Music_RocketBattle_branch_e9bc1: note F_, 2 note E_, 2 note F_, 2 - intensity $b5 + volume_envelope 11, 5 note G_, 4 - intensity $b3 + volume_envelope 11, 3 note G_, 2 note F_, 2 note D#, 2 note D_, 2 note C#, 2 note D_, 2 - intensity $b5 + volume_envelope 11, 5 note D#, 4 - intensity $b3 + volume_envelope 11, 3 note D#, 2 note D_, 2 note F_, 2 -Music_RocketBattle_branch_e9c02: +.mainloop: octave 4 note E_, 2 octave 3 @@ -145,9 +146,9 @@ Music_RocketBattle_branch_e9c02: note F_, 2 note E_, 2 note F_, 2 - intensity $b5 + volume_envelope 11, 5 note G_, 4 - intensity $b3 + volume_envelope 11, 3 note G_, 2 note F_, 2 octave 4 @@ -155,24 +156,24 @@ Music_RocketBattle_branch_e9c02: note D_, 2 note C_, 2 note D_, 2 - intensity $b5 + volume_envelope 11, 5 note F_, 4 - intensity $b2 + volume_envelope 11, 2 octave 3 note F_, 2 note G_, 2 note G#, 4 - intensity $b5 + volume_envelope 11, 5 note D_, 4 note C_, 4 note D_, 4 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note F_, 2 note A_, 4 - intensity $b7 + volume_envelope 11, 7 note A_, 4 - intensity $b5 + volume_envelope 11, 5 note A_, 2 note G_, 2 note F_, 4 @@ -188,7 +189,7 @@ Music_RocketBattle_branch_e9c02: note G_, 2 note A_, 2 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note E_, 6 note D_, 4 @@ -202,11 +203,11 @@ Music_RocketBattle_branch_e9c02: note E_, 6 note D_, 6 note D#, 4 - intensity $a0 + volume_envelope 10, 0 note E_, 8 - intensity $a7 + volume_envelope 10, 7 note E_, 8 - intensity $b7 + volume_envelope 11, 7 octave 2 note A_, 8 note G_, 8 @@ -232,7 +233,7 @@ Music_RocketBattle_branch_e9c02: octave 3 note D_, 6 note C_, 4 - intensity $b5 + volume_envelope 11, 5 octave 2 note A#, 2 octave 3 @@ -261,71 +262,71 @@ Music_RocketBattle_branch_e9c02: octave 3 note A#, 2 note G_, 2 - intensity $b2 + volume_envelope 11, 2 note E_, 6 note E_, 6 note E_, 4 note E_, 6 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note G_, 2 note F_, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 6 note E_, 4 - intensity $b7 + volume_envelope 11, 7 note G_, 2 note F_, 4 - intensity $b2 + volume_envelope 11, 2 note E_, 6 octave 4 note D_, 1 note D#, 1 - intensity $a0 + volume_envelope 10, 0 note E_, 8 - intensity $b2 + volume_envelope 11, 2 octave 3 note F_, 6 note F_, 4 - intensity $b7 + volume_envelope 11, 7 note A#, 2 note G_, 4 -Music_RocketBattle_branch_e9cc5: - intensity $b2 +.loop3: + volume_envelope 11, 2 note F_, 6 note F_, 4 - intensity $b7 + volume_envelope 11, 7 note A_, 2 note G_, 4 - loopchannel 2, Music_RocketBattle_branch_e9cc5 - intensity $b2 + sound_loop 2, .loop3 + volume_envelope 11, 2 note F_, 6 octave 4 note D_, 1 note E_, 1 - intensity $a0 + volume_envelope 10, 0 note F_, 8 - intensity $b3 + volume_envelope 11, 3 note D_, 2 octave 3 note A_, 2 note E_, 2 note A_, 4 note A_, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note D#, 2 octave 3 note A#, 2 note G_, 2 note A#, 4 note A#, 2 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note E_, 2 note C_, 2 octave 3 @@ -333,16 +334,16 @@ Music_RocketBattle_branch_e9cc5: octave 4 note C_, 4 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 4 - intensity $a0 + volume_envelope 10, 0 note E_, 4 - intensity $a7 + volume_envelope 10, 7 note E_, 6 - intensity $a0 + volume_envelope 10, 0 octave 3 note G#, 6 - intensity $b3 + volume_envelope 11, 3 note C_, 2 note E_, 2 note E_, 2 @@ -370,9 +371,9 @@ Music_RocketBattle_branch_e9cc5: note A#, 2 octave 3 note C_, 2 - intensity $b5 + volume_envelope 11, 5 note D_, 4 - intensity $b3 + volume_envelope 11, 3 note D_, 2 note C_, 2 octave 2 @@ -381,152 +382,152 @@ Music_RocketBattle_branch_e9cc5: note D_, 2 note C#, 2 note D_, 2 - intensity $b5 + volume_envelope 11, 5 note D#, 4 - intensity $b3 + volume_envelope 11, 3 note D#, 2 note D_, 2 note F_, 2 - loopchannel 0, Music_RocketBattle_branch_e9c02 + sound_loop 0, .mainloop Music_RocketBattle_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $b2 + duty_cycle 3 + vibrato 8, 3, 6 + pitch_offset 1 + note_type 12, 11, 2 octave 4 note A_, 4 note A#, 4 note B_, 4 octave 5 note C_, 1 - intensity $82 + volume_envelope 8, 2 octave 4 note G#, 1 note A_, 1 note G#, 1 - intensity $c2 + volume_envelope 12, 2 octave 5 note C#, 1 - intensity $92 + volume_envelope 9, 2 octave 4 note G#, 1 note A_, 1 note G#, 1 - intensity $c2 + volume_envelope 12, 2 octave 5 note D_, 1 - intensity $a2 + volume_envelope 10, 2 octave 4 note G#, 1 note A_, 1 note G#, 1 - intensity $c2 + volume_envelope 12, 2 octave 5 note D#, 1 - intensity $b2 + volume_envelope 11, 2 octave 4 note G#, 1 note A_, 1 note G#, 1 - intensity $c2 + volume_envelope 12, 2 octave 5 note E_, 1 octave 4 note G#, 1 note A_, 1 note G#, 1 -Music_RocketBattle_branch_e9d7b: - intensity $c2 +.loop1: + volume_envelope 12, 2 octave 3 note A_, 6 note A_, 4 octave 4 note C_, 2 - intensity $c7 + volume_envelope 12, 7 octave 3 note A#, 4 - loopchannel 3, Music_RocketBattle_branch_e9d7b - intensity $c2 + sound_loop 3, .loop1 + volume_envelope 12, 2 note A_, 6 note A_, 6 - intensity $4a + volume_envelope 4, -2 note G#, 4 -Music_RocketBattle_branch_e9d91: - intensity $c2 +.loop2: + volume_envelope 12, 2 octave 4 note A_, 6 note A_, 4 octave 5 note C_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note A#, 4 - loopchannel 3, Music_RocketBattle_branch_e9d91 - intensity $c2 + sound_loop 3, .loop2 + volume_envelope 12, 2 note A_, 6 note A_, 4 - intensity $c7 + volume_envelope 12, 7 note G_, 2 note G#, 4 - callchannel Music_RocketBattle_branch_e9ea0 - intensity $b0 + sound_call .sub1 + volume_envelope 11, 0 note F_, 16 - intensity $b7 + volume_envelope 11, 7 note F_, 16 -Music_RocketBattle_branch_e9db1: - callchannel Music_RocketBattle_branch_e9ea0 - intensity $b0 +.mainloop: + sound_call .sub1 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b0 + volume_envelope 11, 0 note A#, 8 - intensity $b7 + volume_envelope 11, 7 note A#, 8 - intensity $c4 + volume_envelope 12, 4 octave 3 note A_, 2 note G_, 2 note A_, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 4 octave 3 note A#, 2 note A_, 2 note G_, 2 - intensity $c2 + volume_envelope 12, 2 note A_, 2 octave 4 note C_, 4 - intensity $b0 + volume_envelope 11, 0 note C_, 6 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $c4 + volume_envelope 12, 4 octave 3 note A#, 2 note A_, 2 note A#, 2 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 4 note C_, 2 octave 3 note A#, 2 note A_, 2 - intensity $c2 + volume_envelope 12, 2 note A#, 2 octave 4 note D_, 4 - intensity $b0 + volume_envelope 11, 0 note D_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 6 - intensity $4f + volume_envelope 4, -7 note A_, 6 - intensity $a0 + volume_envelope 10, 0 note G_, 6 note F_, 4 note E_, 6 @@ -536,92 +537,92 @@ Music_RocketBattle_branch_e9db1: note A#, 6 note G#, 4 note A_, 6 - intensity $a7 + volume_envelope 10, 7 note A_, 10 - intensity $3f + volume_envelope 3, -7 octave 3 note D_, 8 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $3f + volume_envelope 3, -7 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C#, 8 - intensity $3f + volume_envelope 3, -7 note D_, 8 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $3f + volume_envelope 3, -7 note E_, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 8 - intensity $4e + volume_envelope 4, -6 note F_, 8 - intensity $a0 + volume_envelope 10, 0 note F_, 8 note E_, 16 note F_, 16 note A_, 16 - intensity $3f + volume_envelope 3, -7 note F_, 16 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 8 note C#, 8 - intensity $b0 + volume_envelope 11, 0 note E_, 8 - intensity $b7 + volume_envelope 11, 7 note E_, 8 - intensity $3c + volume_envelope 3, -4 note A_, 6 - intensity $c7 + volume_envelope 12, 7 note A_, 10 - intensity $c2 + volume_envelope 12, 2 octave 3 note A_, 6 note A_, 6 note A_, 4 note A_, 6 note A_, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 2 octave 3 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note A_, 6 note A_, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 2 octave 3 note A#, 4 - intensity $c2 + volume_envelope 12, 2 note A_, 6 - intensity $c7 + volume_envelope 12, 7 octave 4 note G_, 1 note G#, 1 note A_, 8 -Music_RocketBattle_branch_e9e5a: - intensity $c2 +.loop3: + volume_envelope 12, 2 octave 3 note A#, 6 note A#, 4 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 2 note C_, 4 - loopchannel 3, Music_RocketBattle_branch_e9e5a - intensity $c2 + sound_loop 3, .loop3 + volume_envelope 12, 2 octave 3 note A#, 6 - intensity $c7 + volume_envelope 12, 7 octave 4 note G_, 1 note A_, 1 note A#, 8 - intensity $c7 + volume_envelope 12, 7 note A_, 6 note G_, 6 note A_, 4 @@ -632,13 +633,13 @@ Music_RocketBattle_branch_e9e5a: note A#, 4 note A_, 6 note G_, 6 - intensity $c5 + volume_envelope 12, 5 note A_, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 8 - intensity $b7 + volume_envelope 11, 7 note A_, 8 - intensity $c6 + volume_envelope 12, 6 octave 3 note A_, 6 note G#, 6 @@ -646,18 +647,18 @@ Music_RocketBattle_branch_e9e5a: note A_, 6 note G#, 6 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $3d + volume_envelope 3, -5 note A#, 8 - intensity $c7 + volume_envelope 12, 7 note A#, 8 - loopchannel 0, Music_RocketBattle_branch_e9db1 + sound_loop 0, .mainloop -Music_RocketBattle_branch_e9ea0: - intensity $c6 +.sub1: + volume_envelope 12, 6 octave 4 note A_, 6 note G#, 6 @@ -665,10 +666,10 @@ Music_RocketBattle_branch_e9ea0: note A_, 6 note G#, 6 note E_, 4 - endchannel + sound_ret Music_RocketBattle_Ch3: - notetype $c, $19 + note_type 12, 1, -1 octave 3 note A_, 2 octave 4 @@ -700,9 +701,9 @@ Music_RocketBattle_Ch3: octave 2 note B_, 2 note A#, 2 -Music_RocketBattle_branch_e9ecc: - callchannel Music_RocketBattle_branch_e9fe6 - loopchannel 3, Music_RocketBattle_branch_e9ecc +.loop1: + sound_call .sub1 + sound_loop 3, .loop1 octave 2 note A_, 2 octave 3 @@ -715,9 +716,9 @@ Music_RocketBattle_branch_e9ecc: note F_, 2 note E_, 2 note D_, 2 -Music_RocketBattle_branch_e9edf: - callchannel Music_RocketBattle_branch_e9fe6 - loopchannel 3, Music_RocketBattle_branch_e9edf +.loop2: + sound_call .sub1 + sound_loop 3, .loop2 octave 2 note A_, 2 octave 3 @@ -731,14 +732,14 @@ Music_RocketBattle_branch_e9edf: note G_, 2 note A_, 2 note A#, 2 - callchannel Music_RocketBattle_branch_e9ff3 - callchannel Music_RocketBattle_branch_ea010 + sound_call .sub2 + sound_call .sub3 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_ea01d -Music_RocketBattle_branch_e9efe: - callchannel Music_RocketBattle_branch_e9ff3 - callchannel Music_RocketBattle_branch_ea010 + sound_call .sub4 +.mainloop: + sound_call .sub2 + sound_call .sub3 octave 3 note A#, 2 octave 2 @@ -755,7 +756,7 @@ Music_RocketBattle_branch_e9efe: note F_, 2 note E_, 2 note D_, 2 - callchannel Music_RocketBattle_branch_ea02a + sound_call .sub5 octave 2 note A_, 2 octave 3 @@ -770,12 +771,12 @@ Music_RocketBattle_branch_e9efe: note A_, 2 octave 3 note E_, 2 -Music_RocketBattle_branch_e9f25: +.loop3: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 5, Music_RocketBattle_branch_e9f25 + sound_loop 5, .loop3 note A#, 2 octave 2 note A#, 2 @@ -786,7 +787,7 @@ Music_RocketBattle_branch_e9f25: note A#, 2 octave 3 note A#, 2 - callchannel Music_RocketBattle_branch_ea02a + sound_call .sub5 octave 2 note A_, 2 octave 3 @@ -801,9 +802,9 @@ Music_RocketBattle_branch_e9f25: note F_, 2 note E_, 2 note D_, 2 - callchannel Music_RocketBattle_branch_ea02a - callchannel Music_RocketBattle_branch_ea02a -Music_RocketBattle_branch_e9f4e: + sound_call .sub5 + sound_call .sub5 +.loop4: octave 2 note A_, 2 octave 3 @@ -816,7 +817,7 @@ Music_RocketBattle_branch_e9f4e: note D_, 2 note G_, 2 note F_, 2 - loopchannel 7, Music_RocketBattle_branch_e9f4e + sound_loop 7, .loop4 octave 2 note A_, 2 octave 3 @@ -829,12 +830,12 @@ Music_RocketBattle_branch_e9f4e: note A_, 2 note G_, 2 note F_, 2 -Music_RocketBattle_branch_e9f6a: +.loop5: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 4, Music_RocketBattle_branch_e9f6a + sound_loop 4, .loop5 octave 2 note A#, 2 octave 3 @@ -845,12 +846,12 @@ Music_RocketBattle_branch_e9f6a: note D_, 2 note C#, 2 note D_, 2 -Music_RocketBattle_branch_e9f7c: +.loop6: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 13, Music_RocketBattle_branch_e9f7c + sound_loop 13, .loop6 octave 2 note A_, 2 octave 3 @@ -859,12 +860,12 @@ Music_RocketBattle_branch_e9f7c: note C_, 2 octave 2 note A#, 2 -Music_RocketBattle_branch_e9f8c: +.loop7: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 4, Music_RocketBattle_branch_e9f8c + sound_loop 4, .loop7 octave 2 note A_, 2 octave 4 @@ -875,20 +876,20 @@ Music_RocketBattle_branch_e9f8c: note A_, 2 note G_, 2 note A#, 2 -Music_RocketBattle_branch_e9f9e: +.loop8: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 7, Music_RocketBattle_branch_e9f9e + sound_loop 7, .loop8 note E_, 2 note F_, 2 -Music_RocketBattle_branch_e9fa8: +.loop9: octave 2 note A#, 2 octave 3 note F_, 2 - loopchannel 5, Music_RocketBattle_branch_e9fa8 + sound_loop 5, .loop9 octave 3 note A#, 2 octave 4 @@ -897,13 +898,13 @@ Music_RocketBattle_branch_e9fa8: octave 3 note A#, 2 note G_, 2 - callchannel Music_RocketBattle_branch_ea033 + sound_call .sub6 octave 3 note E_, 2 - callchannel Music_RocketBattle_branch_ea010 + sound_call .sub3 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_ea033 + sound_call .sub6 octave 3 note A_, 2 octave 2 @@ -922,14 +923,14 @@ Music_RocketBattle_branch_e9fa8: note A_, 2 octave 3 note E_, 2 - callchannel Music_RocketBattle_branch_e9ff3 - callchannel Music_RocketBattle_branch_ea010 + sound_call .sub2 + sound_call .sub3 octave 3 note F_, 2 - callchannel Music_RocketBattle_branch_ea01d - loopchannel 0, Music_RocketBattle_branch_e9efe + sound_call .sub4 + sound_loop 0, .mainloop -Music_RocketBattle_branch_e9fe6: +.sub1: octave 2 note A_, 2 octave 3 @@ -942,9 +943,9 @@ Music_RocketBattle_branch_e9fe6: note E_, 2 note G_, 2 note F_, 2 - endchannel + sound_ret -Music_RocketBattle_branch_e9ff3: +.sub2: octave 2 note A_, 2 octave 3 @@ -973,9 +974,9 @@ Music_RocketBattle_branch_e9ff3: note E_, 2 note D#, 2 note D_, 2 - endchannel + sound_ret -Music_RocketBattle_branch_ea010: +.sub3: octave 2 note A#, 2 octave 3 @@ -988,9 +989,9 @@ Music_RocketBattle_branch_ea010: note A#, 2 octave 2 note A#, 2 - endchannel + sound_ret -Music_RocketBattle_branch_ea01d: +.sub4: octave 2 note A#, 2 octave 3 @@ -1003,17 +1004,18 @@ Music_RocketBattle_branch_ea01d: note A#, 2 octave 3 note F_, 2 - endchannel + sound_ret -Music_RocketBattle_branch_ea02a: +.sub5: +.sub5loop1: octave 2 note A_, 2 octave 3 note E_, 2 - loopchannel 4, Music_RocketBattle_branch_ea02a - endchannel + sound_loop 4, .sub5loop1 + sound_ret -Music_RocketBattle_branch_ea033: +.sub6: octave 2 note A_, 2 octave 3 @@ -1026,4 +1028,4 @@ Music_RocketBattle_branch_ea033: note A_, 2 octave 2 note A_, 2 - endchannel + sound_ret diff --git a/audio/music/rockethideout.asm b/audio/music/rockethideout.asm index 6c3a116a..850eb29d 100644 --- a/audio/music/rockethideout.asm +++ b/audio/music/rockethideout.asm @@ -1,32 +1,34 @@ 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 + channel_count 4 + channel 1, Music_RocketHideout_Ch1 + channel 2, Music_RocketHideout_Ch2 + channel 3, Music_RocketHideout_Ch3 + channel 4, Music_RocketHideout_Ch4 Music_RocketHideout_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0004 - vibrato $10, $44 - notetype $c, $b3 - stereopanning $f0 -Music_RocketHideout_branch_eeb93: - note __, 16 - loopchannel 4, Music_RocketHideout_branch_eeb93 -Music_RocketHideout_branch_eeb98: + volume 7, 7 + duty_cycle 3 + pitch_offset 4 + vibrato 16, 4, 4 + note_type 12, 11, 3 + stereo_panning TRUE, FALSE +.mainloop: +.loop1 + rest 16 + sound_loop 4, .loop1 +.loop2: octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 4 note A_, 2 - note __, 6 + rest 6 note D#, 2 note A#, 4 note A_, 2 - note __, 8 - loopchannel 2, Music_RocketHideout_branch_eeb98 + rest 8 + sound_loop 2, .loop2 octave 3 note A#, 2 note A_, 2 @@ -106,44 +108,44 @@ Music_RocketHideout_branch_eeb98: note C#, 2 note F_, 2 note G_, 2 - note __, 16 - intensity $b7 + rest 16 + volume_envelope 11, 7 octave 2 note G#, 16 - note __, 16 + rest 16 note A_, 16 - intensity $b3 -Music_RocketHideout_branch_eebfe: - note __, 16 - loopchannel 4, Music_RocketHideout_branch_eebfe - loopchannel 0, Music_RocketHideout_branch_eeb93 + volume_envelope 11, 3 +.loop3: + rest 16 + sound_loop 4, .loop3 + sound_loop 0, .mainloop Music_RocketHideout_Ch2: - dutycycle $3 - tone $0002 - vibrato $0, $f0 - notetype $c, $c4 - stereopanning $f -Music_RocketHideout_branch_eec14: + duty_cycle 3 + pitch_offset 2 + vibrato 0, 15, 0 + note_type 12, 12, 4 + stereo_panning FALSE, TRUE +.mainloop: octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 4 note A_, 2 - note __, 6 + rest 6 note D#, 2 note A#, 4 note A_, 2 - note __, 8 + rest 8 note D#, 2 - note __, 2 + rest 2 note A#, 4 note A_, 2 - note __, 6 + rest 6 note D#, 2 note A#, 4 note A_, 2 - note __, 8 + rest 8 octave 3 note D#, 12 note A#, 2 @@ -181,127 +183,128 @@ Music_RocketHideout_branch_eec14: note C_, 8 octave 2 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 - intensity $c7 + rest 6 + volume_envelope 12, 7 octave 3 note C#, 16 - intensity $c4 + volume_envelope 12, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 - intensity $c7 + rest 6 + volume_envelope 12, 7 octave 3 note C#, 16 - intensity $c4 + volume_envelope 12, 4 octave 2 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 + rest 6 note C#, 2 note G#, 4 note G_, 2 - note __, 8 + rest 8 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 + rest 6 note C#, 2 note G#, 4 note G_, 2 - note __, 8 - loopchannel 0, Music_RocketHideout_branch_eec14 + rest 8 + sound_loop 0, .mainloop Music_RocketHideout_Ch3: - notetype $c, $19 -Music_RocketHideout_branch_eec7c: + note_type 12, 1, -1 +.mainloop: +.loop1: octave 2 note D#, 2 - note __, 2 + rest 2 note A#, 4 note A_, 2 - note __, 6 + rest 6 note D#, 2 note A#, 4 note A_, 2 - note __, 8 - loopchannel 6, Music_RocketHideout_branch_eec7c -Music_RocketHideout_branch_eec8a: + rest 8 + sound_loop 6, .loop1 +.loop2: note F_, 2 - note __, 2 + rest 2 octave 3 note C_, 4 octave 2 note B_, 2 - note __, 6 + rest 6 note F_, 2 octave 3 note C_, 4 octave 2 note B_, 2 - note __, 8 - loopchannel 2, Music_RocketHideout_branch_eec8a -Music_RocketHideout_branch_eec9b: + rest 8 + sound_loop 2, .loop2 +.loop3: note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 + rest 6 octave 3 note C#, 16 - loopchannel 2, Music_RocketHideout_branch_eec9b -Music_RocketHideout_branch_eeca6: + sound_loop 2, .loop3 +.loop4: octave 2 note C#, 2 - note __, 2 + rest 2 note G#, 4 note G_, 2 - note __, 6 + rest 6 note C#, 2 note G#, 4 note G_, 2 - note __, 8 - loopchannel 2, Music_RocketHideout_branch_eeca6 - loopchannel 0, Music_RocketHideout_branch_eec7c + rest 8 + sound_loop 2, .loop4 + sound_loop 0, .mainloop Music_RocketHideout_Ch4: - togglenoise $0 - notetype $c - stereopanning $f - note __, 16 - note __, 16 - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - callchannel Music_RocketHideout_branch_eecdb -Music_RocketHideout_branch_eecc7: - callchannel Music_RocketHideout_branch_eecdb - note E_, 4 - callchannel Music_RocketHideout_branch_eecdb - note F_, 4 - callchannel Music_RocketHideout_branch_eecdb - note A#, 4 - callchannel Music_RocketHideout_branch_eecdb - note F#, 4 - loopchannel 0, Music_RocketHideout_branch_eecc7 + toggle_noise 0 + drum_speed 12 + stereo_panning FALSE, TRUE + rest 16 + rest 16 + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + sound_call .sub1 +.mainloop: + sound_call .sub1 + drum_note 5, 4 + sound_call .sub1 + drum_note 6, 4 + sound_call .sub1 + drum_note 11, 4 + sound_call .sub1 + drum_note 7, 4 + sound_loop 0, .mainloop -Music_RocketHideout_branch_eecdb: - stereopanning $f0 - note D#, 1 - note D#, 1 - stereopanning $f - note A_, 4 - note D#, 1 - note D#, 1 - stereopanning $f0 - note A_, 4 - endchannel +.sub1: + stereo_panning TRUE, FALSE + drum_note 4, 1 + drum_note 4, 1 + stereo_panning FALSE, TRUE + drum_note 10, 4 + drum_note 4, 1 + drum_note 4, 1 + stereo_panning TRUE, FALSE + drum_note 10, 4 + sound_ret diff --git a/audio/music/rockettheme.asm b/audio/music/rockettheme.asm index 6f13d8b6..6b37371c 100644 --- a/audio/music/rockettheme.asm +++ b/audio/music/rockettheme.asm @@ -1,48 +1,49 @@ 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 + channel_count 4 + channel 1, Music_RocketTheme_Ch1 + channel 2, Music_RocketTheme_Ch2 + channel 3, Music_RocketTheme_Ch3 + channel 4, Music_RocketTheme_Ch4 Music_RocketTheme_Ch1: tempo 128 - volume $77 - dutycycle $3 - stereopanning $f - vibrato $5, $64 - notetype $c, $a8 + volume 7, 7 + duty_cycle 3 + stereo_panning FALSE, TRUE + vibrato 5, 6, 4 + note_type 12, 10, 8 octave 4 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f768b: - dutycycle $3 - notetype $c, $a8 - callchannel Music_RocketTheme_branch_f74e6 - dutycycle $1 - intensity $a8 - callchannel Music_RocketTheme_branch_f74f7 - callchannel Music_RocketTheme_branch_f758a +.mainloop: + duty_cycle 3 + note_type 12, 10, 8 + sound_call Music_LookRocket_Ch1.sub1 + duty_cycle 1 + volume_envelope 10, 8 + sound_call Music_LookRocket_Ch1.sub2 + sound_call Music_LookRocket_Ch2.sub5 octave 4 note F#, 1 - note __, 1 - intensity $53 - callchannel Music_RocketTheme_branch_f750c - intensity $c3 - callchannel Music_RocketTheme_branch_f750c - intensity $e3 - callchannel Music_RocketTheme_branch_f750c - note __, 16 - dutycycle $0 - notetype $6, $b3 - vibrato $6, $64 - callchannel Music_RocketTheme_branch_f7727 + rest 1 + volume_envelope 5, 3 + sound_call Music_LookRocket_Ch1.sub3 + volume_envelope 12, 3 + sound_call Music_LookRocket_Ch1.sub3 + volume_envelope 14, 3 + sound_call Music_LookRocket_Ch1.sub3 + rest 16 + duty_cycle 0 + note_type 6, 11, 3 + vibrato 6, 6, 4 + sound_call .sub1 octave 4 note F_, 1 note F#, 3 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C_, 2 note D_, 2 note D#, 2 @@ -53,21 +54,21 @@ Music_RocketTheme_branch_f768b: note A#, 2 octave 4 note C_, 2 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note D#, 2 note F#, 2 - callchannel Music_RocketTheme_branch_f7727 + sound_call .sub1 octave 3 note F#, 1 note G_, 3 note F_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note C_, 2 note D_, 2 note D#, 2 @@ -78,141 +79,141 @@ Music_RocketTheme_branch_f768b: note A#, 2 octave 3 note C_, 2 - note __, 4 + rest 4 note D_, 4 - note __, 4 + rest 4 note D#, 4 note F_, 2 note E_, 2 note D#, 2 note D_, 2 -Music_RocketTheme_branch_f76ef: - note __, 4 +.loop1: + rest 4 note F_, 2 - note __, 14 + rest 14 note F#, 2 - note __, 10 - loopchannel 3, Music_RocketTheme_branch_f76ef - note __, 4 + rest 10 + sound_loop 3, .loop1 + rest 4 note F_, 2 - note __, 14 + rest 14 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note D#, 2 note C_, 2 -Music_RocketTheme_branch_f7701: +.loop2: note F#, 2 note A_, 2 - loopchannel 4, Music_RocketTheme_branch_f7701 -Music_RocketTheme_branch_f7707: + sound_loop 4, .loop2 +.loop3: note G_, 2 note A#, 2 - loopchannel 4, Music_RocketTheme_branch_f7707 -Music_RocketTheme_branch_f770d: + sound_loop 4, .loop3 +.loop4: note G#, 2 note B_, 2 - loopchannel 4, Music_RocketTheme_branch_f770d -Music_RocketTheme_branch_f7713: + sound_loop 4, .loop4 +.loop5: octave 3 note A_, 2 octave 4 note C_, 2 - loopchannel 4, Music_RocketTheme_branch_f7713 - notetype $c, $b3 - note __, 16 - note __, 12 + sound_loop 4, .loop5 + note_type 12, 11, 3 + rest 16 + rest 12 note F_, 2 note C_, 1 note D_, 1 - loopchannel 0, Music_RocketTheme_branch_f768b + sound_loop 0, .mainloop -Music_RocketTheme_branch_f7727: - note __, 7 +.sub1: + rest 7 note B_, 1 octave 4 note C_, 2 - note __, 6 + rest 6 note C_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 6 + rest 6 octave 4 note D#, 12 note D_, 8 octave 3 note A#, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 10 - endchannel + rest 10 + sound_ret Music_RocketTheme_Ch2: - stereopanning $ff - vibrato $4, $64 - dutycycle $3 - notetype $c, $b7 + stereo_panning TRUE, TRUE + vibrato 4, 6, 4 + duty_cycle 3 + note_type 12, 11, 7 octave 5 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f774b: - notetype $c, $b7 - callchannel Music_RocketTheme_branch_f7547 - intensity $b7 - callchannel Music_RocketTheme_branch_f758a +.mainloop: + note_type 12, 11, 7 + sound_call Music_LookRocket_Ch2.sub1 + volume_envelope 11, 7 + sound_call Music_LookRocket_Ch2.sub5 octave 5 note C_, 1 - note __, 1 - callchannel Music_RocketTheme_branch_f7554 - intensity $53 - callchannel Music_RocketTheme_branch_f7568 - intensity $c3 - callchannel Music_RocketTheme_branch_f7568 - intensity $e3 - callchannel Music_RocketTheme_branch_f7568 - callchannel Music_RocketTheme_branch_f756f - vibrato $6, $64 - callchannel Music_RocketTheme_branch_f7800 + rest 1 + sound_call Music_LookRocket_Ch2.sub2 + volume_envelope 5, 3 + sound_call Music_LookRocket_Ch2.sub3 + volume_envelope 12, 3 + sound_call Music_LookRocket_Ch2.sub3 + volume_envelope 14, 3 + sound_call Music_LookRocket_Ch2.sub3 + sound_call Music_LookRocket_Ch2.sub4 + vibrato 6, 6, 4 + sound_call .sub1 octave 4 note A_, 1 - vibrato $0, $0 - intensity $b8 + vibrato 0, 0, 0 + volume_envelope 11, 8 note A#, 14 - vibrato $5, $22 - intensity $b7 + vibrato 5, 2, 2 + volume_envelope 11, 7 note A#, 5 - vibrato $6, $64 - notetype $c, $b7 + vibrato 6, 6, 4 + note_type 12, 11, 7 note A#, 12 - note __, 2 + rest 2 octave 5 note C_, 1 note D_, 1 - callchannel Music_RocketTheme_branch_f7800 + sound_call .sub1 note B_, 1 - vibrato $0, $0 - intensity $b8 + vibrato 0, 0, 0 + volume_envelope 11, 8 octave 4 note C_, 14 - vibrato $5, $22 - intensity $b7 + vibrato 5, 2, 2 + volume_envelope 11, 7 note C_, 5 - vibrato $6, $64 - notetype $c, $b7 + vibrato 6, 6, 4 + note_type 12, 11, 7 note C_, 12 octave 3 note A#, 1 note A_, 1 note G#, 1 note G_, 1 - notetype $6, $b7 - callchannel Music_RocketTheme_branch_f781c + note_type 6, 11, 7 + sound_call .sub2 octave 4 note D_, 1 note D#, 9 @@ -220,22 +221,22 @@ Music_RocketTheme_branch_f774b: note C#, 1 note C_, 12 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 - callchannel Music_RocketTheme_branch_f781c + rest 2 + sound_call .sub2 octave 3 note B_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D#, 8 - note __, 4 + rest 4 note D_, 2 - note __, 2 + rest 2 note C_, 2 octave 3 note G_, 2 @@ -287,37 +288,37 @@ Music_RocketTheme_branch_f774b: octave 5 note C_, 2 note D_, 2 - loopchannel 0, Music_RocketTheme_branch_f774b + sound_loop 0, .mainloop -Music_RocketTheme_branch_f7800: - notetype $6, $b7 - note __, 7 +.sub1: + note_type 6, 11, 7 + rest 7 octave 4 note D_, 1 note D#, 2 - note __, 6 + rest 6 note D#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 6 + rest 6 note F#, 12 note F_, 8 note D#, 2 - note __, 6 + rest 6 note C_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 octave 3 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_RocketTheme_branch_f781c: +.sub2: octave 3 note B_, 1 octave 4 @@ -327,148 +328,148 @@ Music_RocketTheme_branch_f781c: note F#, 8 note F_, 8 note C_, 4 - endchannel + sound_ret Music_RocketTheme_Ch3: - stereopanning $f0 - vibrato $4, $22 - notetype $c, $14 - note __, 2 -Music_RocketTheme_branch_f782f: - notetype $c, $14 - callchannel Music_RocketTheme_branch_f75bf - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f75fe - intensity $24 - callchannel Music_RocketTheme_branch_f7623 - intensity $14 - callchannel Music_RocketTheme_branch_f75cc - callchannel Music_RocketTheme_branch_f7623 - callchannel Music_RocketTheme_branch_f75e1 - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f75fe - callchannel Music_RocketTheme_branch_f7623 - callchannel Music_RocketTheme_branch_f75cc - callchannel Music_RocketTheme_branch_f7623 - callchannel Music_RocketTheme_branch_f75cc + stereo_panning TRUE, FALSE + vibrato 4, 2, 2 + note_type 12, 1, 4 + rest 2 +.mainloop: + note_type 12, 1, 4 + sound_call Music_LookRocket_Ch3.sub1 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + volume_envelope 2, 4 + sound_call Music_LookRocket_Ch3.sub5 + volume_envelope 1, 4 + sound_call Music_LookRocket_Ch3.sub2 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub3 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub4 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub2 + sound_call Music_LookRocket_Ch3.sub5 + sound_call Music_LookRocket_Ch3.sub2 octave 3 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 note G_, 1 note E_, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 note C_, 1 octave 3 note A_, 1 note F#, 1 note D#, 1 note E_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note F#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 4 note F_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 4 note G#, 1 - note __, 1 - loopchannel 0, Music_RocketTheme_branch_f782f + rest 1 + sound_loop 0, .mainloop Music_RocketTheme_Ch4: - togglenoise $3 - notetype $c - note __, 2 -Music_RocketTheme_branch_f78c3: - callchannel Music_RocketTheme_branch_f765c - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f765c -Music_RocketTheme_branch_f78de: - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note A#, 2 - note F#, 2 - note D_, 2 - note F#, 2 - loopchannel 11, Music_RocketTheme_branch_f78de - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f7664 - callchannel Music_RocketTheme_branch_f765c - callchannel Music_RocketTheme_branch_f765c - loopchannel 0, Music_RocketTheme_branch_f78c3 + toggle_noise 3 + drum_speed 12 + rest 2 +.mainloop: + sound_call Music_LookRocket_Ch4.sub1 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub1 +.loop1: + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + drum_note 11, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_loop 11, .loop1 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub2 + sound_call Music_LookRocket_Ch4.sub1 + sound_call Music_LookRocket_Ch4.sub1 + sound_loop 0, .mainloop diff --git a/audio/music/route1.asm b/audio/music/route1.asm index 8a537b9f..0ae4c8a5 100644 --- a/audio/music/route1.asm +++ b/audio/music/route1.asm @@ -1,17 +1,18 @@ Music_Route1: - musicheader 3, 1, Music_Route1_Ch1 - musicheader 1, 2, Music_Route1_Ch2 - musicheader 1, 3, Music_Route1_Ch3 + channel_count 3 + channel 1, Music_Route1_Ch1 + channel 2, Music_Route1_Ch2 + channel 3, Music_Route1_Ch3 - db $3 + db $3 ; unused Music_Route1_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 184 - volume $77 - vibrato $16, $11 - dutycycle $3 - notetype $c, $83 + volume 7, 7 + vibrato 22, 1, 1 + duty_cycle 3 + note_type 12, 8, 3 octave 4 note D_, 1 note E_, 1 @@ -53,26 +54,26 @@ Music_Route1_Ch1: note A_, 2 note G_, 2 note F#, 2 - intensity $81 + volume_envelope 8, 1 octave 5 note D_, 2 note D_, 2 - intensity $83 - note __, 2 -Music_Route1_branch_ec04a: - intensity $83 - note __, 2 + volume_envelope 8, 3 + rest 2 +.mainloop: + volume_envelope 8, 3 + rest 2 octave 4 note D_, 2 octave 3 note A_, 2 - note __, 4 + rest 4 octave 4 note D_, 2 octave 3 note A_, 2 - note __, 2 - note __, 2 + rest 2 + rest 2 octave 4 note D_, 2 octave 3 @@ -81,23 +82,23 @@ Music_Route1_branch_ec04a: note D_, 1 octave 3 note E_, 2 - intensity $81 + volume_envelope 8, 1 note G_, 2 note G_, 2 - intensity $83 - note __, 2 - note __, 2 + volume_envelope 8, 3 + rest 2 + rest 2 octave 4 note C#, 2 octave 3 note A_, 2 - note __, 4 + rest 4 octave 4 note C#, 2 octave 3 note A_, 2 - note __, 2 - note __, 2 + rest 2 + rest 2 octave 4 note C#, 2 note C#, 1 @@ -109,13 +110,13 @@ Music_Route1_branch_ec04a: note A_, 2 octave 4 note D_, 2 - note __, 2 - note __, 2 + rest 2 + rest 2 octave 3 note F#, 1 note G_, 1 note A_, 4 - note __, 2 + rest 2 note D_, 1 note E_, 1 note F#, 2 @@ -128,15 +129,15 @@ Music_Route1_branch_ec04a: note A_, 1 note B_, 1 note A_, 2 - intensity $81 + volume_envelope 8, 1 octave 4 note G_, 2 note G_, 2 - intensity $83 + volume_envelope 8, 3 octave 3 note F#, 1 note E_, 1 - note __, 2 + rest 2 note E_, 1 note F#, 1 note G_, 6 @@ -148,24 +149,24 @@ Music_Route1_branch_ec04a: note E_, 1 note F#, 1 note G_, 4 - notetype $8, $83 + note_type 8, 8, 3 note A_, 1 note B_, 1 note A_, 1 - notetype $c, $83 + note_type 12, 8, 3 note G_, 1 note E_, 1 note F#, 2 - intensity $81 + volume_envelope 8, 1 octave 4 note A_, 2 note A_, 2 - intensity $83 + volume_envelope 8, 3 octave 3 note A_, 1 note G_, 1 - intensity $77 - intensity $1d + volume_envelope 7, 7 + volume_envelope 1, -5 note F#, 4 note A_, 4 note G_, 2 @@ -182,8 +183,8 @@ Music_Route1_branch_ec04a: octave 3 note A_, 1 note G_, 1 - dutycycle $2 - intensity $87 + duty_cycle 2 + volume_envelope 8, 7 octave 6 note F#, 4 note A_, 4 @@ -196,48 +197,48 @@ Music_Route1_branch_ec04a: note E_, 2 note C#, 2 note D_, 2 - intensity $81 + volume_envelope 8, 1 octave 5 note D_, 2 note D_, 2 - note __, 2 - loopchannel 0, Music_Route1_branch_ec04a + rest 2 + sound_loop 0, .mainloop Music_Route1_Ch2: - stereopanning $f0 - vibrato $12, $22 - dutycycle $2 - notetype $c, $92 + stereo_panning TRUE, FALSE + vibrato 18, 2, 2 + duty_cycle 2 + note_type 12, 9, 2 octave 4 note F#, 1 note G_, 1 - callchannel Music_Route1_branch_ec198 + sound_call .sub2 octave 3 note A_, 2 note A_, 2 octave 4 note F#, 1 note G_, 1 - callchannel Music_Route1_branch_ec1aa + sound_call .sub3 note C#, 2 note E_, 2 note D_, 2 - intensity $81 + volume_envelope 8, 1 note F#, 2 note F#, 2 - intensity $82 + volume_envelope 8, 2 octave 4 note D_, 1 note E_, 1 - dutycycle $2 -Music_Route1_branch_ec112: - intensity $82 - callchannel Music_Route1_branch_ec188 - intensity $81 + duty_cycle 2 +.mainloop: + volume_envelope 8, 2 + sound_call .sub1 + volume_envelope 8, 1 octave 3 note A_, 2 note A_, 2 - intensity $82 + volume_envelope 8, 2 octave 4 note C#, 1 note D_, 1 @@ -258,15 +259,15 @@ Music_Route1_branch_ec112: note E_, 1 note F#, 1 note D_, 2 - note __, 2 + rest 2 note F#, 2 note D_, 1 note E_, 1 - callchannel Music_Route1_branch_ec188 - intensity $81 + sound_call .sub1 + volume_envelope 8, 1 note A_, 2 note A_, 2 - intensity $82 + volume_envelope 8, 2 note C#, 1 note D_, 1 note E_, 2 @@ -280,49 +281,49 @@ Music_Route1_branch_ec112: note A_, 2 octave 4 note B_, 4 - notetype $8, $92 + note_type 8, 9, 2 note C#, 1 note D_, 1 note C#, 1 - notetype $c, $92 + note_type 12, 9, 2 octave 3 note B_, 1 octave 4 note C#, 1 note D_, 2 - intensity $81 + volume_envelope 8, 1 octave 5 note D_, 2 note D_, 2 - intensity $82 + volume_envelope 8, 2 octave 4 note F#, 1 note G_, 1 - callchannel Music_Route1_branch_ec198 - note __, 4 + sound_call .sub2 + rest 4 note F#, 1 note G_, 1 - callchannel Music_Route1_branch_ec1aa - notetype $8, $92 + sound_call .sub3 + note_type 8, 9, 2 note C#, 1 note D_, 1 note C#, 1 - notetype $c, $92 + note_type 12, 9, 2 octave 4 note B_, 1 octave 5 note C#, 1 note D_, 2 - intensity $81 + volume_envelope 8, 1 note F#, 2 note F#, 2 - intensity $82 + volume_envelope 8, 2 octave 4 note D_, 1 note E_, 1 - loopchannel 0, Music_Route1_branch_ec112 + sound_loop 0, .mainloop -Music_Route1_branch_ec188: +.sub1: note F#, 2 note F#, 2 note F#, 2 @@ -338,9 +339,9 @@ Music_Route1_branch_ec188: note G_, 3 note F#, 1 note E_, 2 - endchannel + sound_ret -Music_Route1_branch_ec198: +.sub2: note A_, 2 note A_, 2 note F#, 2 @@ -358,9 +359,9 @@ Music_Route1_branch_ec198: note D_, 3 note F#, 1 note E_, 2 - endchannel + sound_ret -Music_Route1_branch_ec1aa: +.sub3: note A_, 2 note A_, 2 note F#, 2 @@ -374,47 +375,47 @@ Music_Route1_branch_ec1aa: note A_, 2 octave 5 note D_, 2 - endchannel + sound_ret Music_Route1_Ch3: - stereopanning $ff - vibrato $10, $23 - notetype $c, $25 - note __, 2 + stereo_panning TRUE, TRUE + vibrato 16, 2, 3 + note_type 12, 2, 5 + rest 2 octave 3 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note G_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 3 + rest 3 octave 3 note C#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note C#, 1 octave 3 note A_, 1 @@ -453,75 +454,75 @@ Music_Route1_Ch3: note G_, 1 note F#, 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 -Music_Route1_branch_ec20c: + rest 3 +.mainloop: octave 3 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 2 octave 3 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 note D_, 1 - note __, 1 + rest 1 octave 4 note D_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 note C_, 1 - note __, 1 + rest 1 octave 4 note C_, 2 octave 3 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 4 @@ -534,22 +535,22 @@ Music_Route1_branch_ec20c: note E_, 1 octave 2 note D_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note E_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 octave 2 note F#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 4 @@ -562,29 +563,29 @@ Music_Route1_branch_ec20c: note E_, 2 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 2 octave 3 note C#, 1 - note __, 1 + rest 1 octave 4 note C#, 2 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 note B_, 1 @@ -600,9 +601,9 @@ Music_Route1_branch_ec20c: note D_, 2 octave 4 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 4 note F#, 4 @@ -640,7 +641,7 @@ Music_Route1_branch_ec20c: note D_, 2 octave 5 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 - loopchannel 0, Music_Route1_branch_ec20c + rest 3 + sound_loop 0, .mainloop diff --git a/audio/music/route12.asm b/audio/music/route12.asm index d94d88c2..2e7fc75f 100644 --- a/audio/music/route12.asm +++ b/audio/music/route12.asm @@ -1,20 +1,21 @@ 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 + channel_count 4 + channel 1, Music_Route12_Ch1 + channel 2, Music_Route12_Ch2 + channel 3, Music_Route12_Ch3 + channel 4, Music_Route12_Ch4 Music_Route12_Ch1: tempo 148 - volume $77 - vibrato $12, $34 - tone $0001 - stereopanning $f - dutycycle $3 - notetype $c, $98 + volume 7, 7 + vibrato 18, 3, 4 + pitch_offset 1 + stereo_panning FALSE, TRUE + duty_cycle 3 + note_type 12, 9, 8 octave 3 note G#, 1 - note __, 2 + rest 2 note A_, 1 note G#, 8 octave 2 @@ -24,27 +25,27 @@ Music_Route12_Ch1: note F#, 1 note G#, 1 note F#, 1 - note __, 2 + rest 2 note E_, 1 - intensity $97 + volume_envelope 9, 7 note D#, 12 -Music_Route12_branch_ec535: - dutycycle $2 - intensity $96 - callchannel Music_Route12_branch_ec5b1 - callchannel Music_Route12_branch_ec5bf - callchannel Music_Route12_branch_ec5b1 +.mainloop: + duty_cycle 2 + volume_envelope 9, 6 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 note E_, 1 - note __, 2 + rest 2 note F#, 1 note E_, 4 note B_, 4 octave 4 note D#, 4 - callchannel Music_Route12_branch_ec5b1 - callchannel Music_Route12_branch_ec5bf - callchannel Music_Route12_branch_ec5b1 - intensity $92 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + volume_envelope 9, 2 octave 4 note E_, 1 octave 3 @@ -67,14 +68,14 @@ Music_Route12_branch_ec535: note F_, 1 note G#, 1 note B_, 1 - dutycycle $3 - intensity $7f + duty_cycle 3 + volume_envelope 7, -7 octave 4 note C#, 3 octave 3 note B_, 3 note A_, 1 - note __, 1 + rest 1 note A_, 4 octave 4 note C#, 2 @@ -95,7 +96,7 @@ Music_Route12_branch_ec535: note B_, 3 note A_, 3 note G#, 1 - note __, 1 + rest 1 note G#, 4 note B_, 2 note A_, 2 @@ -114,8 +115,8 @@ Music_Route12_branch_ec535: note F#, 8 note D#, 4 note F#, 4 -Music_Route12_branch_ec59b: - intensity $97 +.loop1: + volume_envelope 9, 7 note G#, 1 note A_, 1 note B_, 4 @@ -124,57 +125,57 @@ Music_Route12_branch_ec59b: octave 3 note D#, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 note F#, 1 note G#, 4 - loopchannel 2, Music_Route12_branch_ec59b - loopchannel 0, Music_Route12_branch_ec535 + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Route12_branch_ec5b1: +.sub1: octave 3 note G#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 octave 3 note D#, 1 note E_, 4 note G#, 4 - endchannel + sound_ret -Music_Route12_branch_ec5bf: +.sub2: note A_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 note G#, 1 note A_, 4 note F#, 4 - endchannel + sound_ret Music_Route12_Ch2: - dutycycle $3 - vibrato $12, $34 - notetype $c, $b8 + duty_cycle 3 + vibrato 18, 3, 4 + note_type 12, 11, 8 octave 4 note E_, 1 - note __, 2 + rest 2 note F#, 1 note E_, 12 octave 3 note B_, 1 - note __, 2 + rest 2 octave 4 note C_, 1 - intensity $b7 + volume_envelope 11, 7 octave 3 note B_, 8 note D#, 1 @@ -182,23 +183,23 @@ Music_Route12_Ch2: note B_, 1 octave 4 note D#, 1 -Music_Route12_branch_ec5e5: - dutycycle $3 - intensity $b7 - callchannel Music_Route12_branch_ec647 +.mainloop: + duty_cycle 3 + volume_envelope 11, 7 + sound_call .sub1 note F#, 1 note A_, 1 note G#, 1 note F#, 1 note G#, 2 - note __, 1 + rest 1 note E_, 1 octave 3 note B_, 12 - dutycycle $2 + duty_cycle 2 octave 2 note B_, 1 - note __, 2 + rest 2 octave 3 note C_, 1 octave 2 @@ -206,8 +207,8 @@ Music_Route12_branch_ec5e5: octave 3 note D#, 4 note F#, 4 - dutycycle $3 - callchannel Music_Route12_branch_ec647 + duty_cycle 3 + sound_call .sub1 note A_, 1 octave 5 note C#, 1 @@ -215,40 +216,40 @@ Music_Route12_branch_ec5e5: note B_, 1 note A_, 1 note B_, 2 - note __, 1 + rest 1 note A_, 1 - intensity $b8 + volume_envelope 11, 8 note G#, 6 - intensity $b7 + volume_envelope 11, 7 note G#, 6 - intensity $6f + volume_envelope 6, -7 note G#, 16 - dutycycle $2 - intensity $a8 + duty_cycle 2 + volume_envelope 10, 8 note A_, 3 note G#, 3 note F#, 1 - note __, 1 + rest 1 note F#, 8 - intensity $a7 + volume_envelope 10, 7 note F#, 10 - note __, 2 + rest 2 note F#, 4 - intensity $a8 + volume_envelope 10, 8 note G#, 3 note F#, 3 note E_, 1 - note __, 1 + rest 1 note E_, 8 - intensity $a7 + volume_envelope 10, 7 note E_, 10 - note __, 2 + rest 2 note E_, 4 note F#, 3 note D#, 3 octave 3 note B_, 2 - intensity $a8 + volume_envelope 10, 8 octave 4 note B_, 8 note B_, 8 @@ -257,60 +258,60 @@ Music_Route12_branch_ec5e5: note F#, 1 note E_, 14 note E_, 10 - intensity $a4 + volume_envelope 10, 4 note E_, 6 - loopchannel 0, Music_Route12_branch_ec5e5 + sound_loop 0, .mainloop -Music_Route12_branch_ec647: +.sub1: octave 4 note E_, 6 - intensity $b1 + volume_envelope 11, 1 octave 3 note B_, 1 note B_, 1 - intensity $b7 + volume_envelope 11, 7 note B_, 4 octave 4 note B_, 4 note A_, 4 note G#, 4 note F#, 4 - endchannel + sound_ret Music_Route12_Ch3: - vibrato $12, $54 - notetype $c, $16 + vibrato 18, 5, 4 + note_type 12, 1, 6 octave 3 note G#, 2 - note __, 4 + rest 4 note G#, 1 note A_, 1 note B_, 2 - note __, 2 + rest 2 note E_, 4 note D#, 2 - note __, 4 + rest 4 note D#, 1 note E_, 1 note F#, 2 - note __, 2 + rest 2 note D#, 4 -Music_Route12_branch_ec66c: - callchannel Music_Route12_branch_ec6b4 +.mainloop: + sound_call .sub1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note D#, 1 note E_, 1 note F#, 4 octave 2 note B_, 4 - callchannel Music_Route12_branch_ec6b4 + sound_call .sub1 note E_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 octave 2 note B_, 1 octave 3 @@ -318,11 +319,11 @@ Music_Route12_branch_ec66c: note D_, 4 note F_, 4 note F#, 13 - note __, 1 + rest 1 note F#, 1 note G#, 1 note A_, 5 - note __, 1 + rest 1 note A_, 1 note B_, 1 octave 4 @@ -339,7 +340,7 @@ Music_Route12_branch_ec66c: note E_, 4 octave 2 note B_, 5 - note __, 1 + rest 1 note B_, 1 octave 3 note D#, 1 @@ -347,104 +348,105 @@ Music_Route12_branch_ec66c: note E_, 8 note F#, 4 note D#, 4 -Music_Route12_branch_ec6a3: +.loop1: note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 note F#, 1 note G#, 4 note E_, 3 - note __, 1 - loopchannel 2, Music_Route12_branch_ec6a3 - loopchannel 0, Music_Route12_branch_ec66c + rest 1 + sound_loop 2, .loop1 + sound_loop 0, .mainloop -Music_Route12_branch_ec6b4: +.sub1: octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 note F#, 1 note G#, 4 note E_, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 3 + rest 3 note D_, 1 note E_, 1 note F#, 4 note D_, 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 note F#, 1 note G#, 4 note E_, 4 - endchannel + sound_ret Music_Route12_Ch4: - togglenoise $4 - stereopanning $f0 - notetype $c - note B_, 10 - note C#, 1 - note C#, 1 - note D_, 4 - note B_, 6 - note C#, 1 - note C#, 1 - note D_, 4 - notetype $6 - callchannel Music_Route12_branch_ec717 -Music_Route12_branch_ec6e1: - note D_, 4 - note D_, 8 - note C#, 2 - note C#, 2 - note D_, 8 - callchannel Music_Route12_branch_ec717 - loopchannel 8, Music_Route12_branch_ec6e1 -Music_Route12_branch_ec6ed: - notetype $c - note B_, 10 - note D_, 1 - note D_, 1 - note D_, 6 - note C#, 1 - note C#, 1 - note D_, 6 - note C#, 1 - note C#, 1 - note D_, 4 - loopchannel 2, Music_Route12_branch_ec6ed - note B_, 16 - notetype $6 - callchannel Music_Route12_branch_ec717 - callchannel Music_Route12_branch_ec717 - note B_, 16 -Music_Route12_branch_ec707: - note D_, 4 - note D_, 8 - note C#, 2 - note C#, 2 - note D_, 8 - callchannel Music_Route12_branch_ec717 - loopchannel 2, Music_Route12_branch_ec707 - loopchannel 0, Music_Route12_branch_ec6e1 + toggle_noise 4 + stereo_panning TRUE, FALSE + drum_speed 12 + drum_note 12, 10 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + drum_note 12, 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + drum_speed 6 + sound_call .sub1 +.mainloop: +.loop1: + drum_note 3, 4 + drum_note 3, 8 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 8 + sound_call .sub1 + sound_loop 8, .loop1 +.loop2: + drum_speed 12 + drum_note 12, 10 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 4 + sound_loop 2, .loop2 + drum_note 12, 16 + drum_speed 6 + sound_call .sub1 + sound_call .sub1 + drum_note 12, 16 +.loop3: + drum_note 3, 4 + drum_note 3, 8 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 8 + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_Route12_branch_ec717: - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - endchannel +.sub1: + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_ret diff --git a/audio/music/route2.asm b/audio/music/route2.asm index b5ff1feb..a4594e06 100644 --- a/audio/music/route2.asm +++ b/audio/music/route2.asm @@ -1,20 +1,21 @@ 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 + channel_count 4 + channel 1, Music_Route2_Ch1 + channel 2, Music_Route2_Ch2 + channel 3, Music_Route2_Ch3 + channel 4, Music_Route2_Ch4 Music_Route2_Ch1: tempo 151 - volume $77 - stereopanning $f - vibrato $6, $23 - notetype $c, $b1 - note __, 16 - note __, 16 - callchannel Music_Route2_branch_ed931 -Music_Route2_branch_ed8fb: - intensity $b1 + volume 7, 7 + stereo_panning FALSE, TRUE + vibrato 6, 2, 3 + note_type 12, 11, 1 + rest 16 + rest 16 + sound_call .sub1 +.mainloop: + volume_envelope 11, 1 octave 3 note B_, 4 note B_, 4 @@ -25,10 +26,10 @@ Music_Route2_branch_ed8fb: note E_, 4 note E_, 4 note E_, 4 - callchannel Music_Route2_branch_ed931 - callchannel Music_Route2_branch_ed940 - callchannel Music_Route2_branch_ed940 - callchannel Music_Route2_branch_ed971 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 octave 3 note G_, 2 octave 4 @@ -42,7 +43,7 @@ Music_Route2_branch_ed8fb: octave 3 note B_, 2 note G_, 2 - callchannel Music_Route2_branch_ed971 + sound_call .sub3 note G_, 2 octave 4 note C_, 2 @@ -53,9 +54,9 @@ Music_Route2_branch_ed8fb: octave 3 note B_, 2 note G_, 2 - loopchannel 0, Music_Route2_branch_ed8fb + sound_loop 0, .mainloop -Music_Route2_branch_ed931: +.sub1: octave 4 note C_, 4 note C_, 4 @@ -63,14 +64,14 @@ Music_Route2_branch_ed931: note C_, 4 note C_, 4 note C_, 4 - intensity $b7 + volume_envelope 11, 7 note C_, 4 octave 3 note B_, 4 - intensity $b1 - endchannel + volume_envelope 11, 1 + sound_ret -Music_Route2_branch_ed940: +.sub2: octave 2 note B_, 2 octave 3 @@ -107,7 +108,7 @@ Music_Route2_branch_ed940: note G#, 2 note C_, 2 note G#, 2 - intensity $b7 + volume_envelope 11, 7 octave 2 note B_, 2 octave 3 @@ -116,10 +117,10 @@ Music_Route2_branch_ed940: note B_, 2 octave 3 note G_, 2 - intensity $b1 - endchannel + volume_envelope 11, 1 + sound_ret -Music_Route2_branch_ed971: +.sub3: note B_, 2 note G_, 2 note B_, 2 @@ -156,25 +157,25 @@ Music_Route2_branch_ed971: note C_, 2 octave 3 note A_, 2 - endchannel + sound_ret Music_Route2_Ch2: - stereopanning $ff - vibrato $8, $24 - notetype $c, $b2 - callchannel Music_Route2_branch_ed9ba -Music_Route2_branch_ed9a1: - intensity $b2 - callchannel Music_Route2_branch_ed9ba - dutycycle $2 - intensity $b5 - callchannel Music_Route2_branch_ed9dc - callchannel Music_Route2_branch_ed9dc - callchannel Music_Route2_branch_eda02 - callchannel Music_Route2_branch_eda02 - loopchannel 0, Music_Route2_branch_ed9a1 + stereo_panning TRUE, TRUE + vibrato 8, 2, 4 + note_type 12, 11, 2 + sound_call .sub1 +.mainloop: + volume_envelope 11, 2 + sound_call .sub1 + duty_cycle 2 + volume_envelope 11, 5 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route2_branch_ed9ba: +.sub1: octave 4 note E_, 4 note E_, 4 @@ -202,162 +203,162 @@ Music_Route2_branch_ed9ba: note A_, 4 note G#, 4 note G#, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 4 note G_, 4 - intensity $b2 - endchannel + volume_envelope 11, 2 + sound_ret -Music_Route2_branch_ed9dc: +.sub2: octave 2 note C_, 4 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 note D_, 4 - endchannel + sound_ret -Music_Route2_branch_eda02: +.sub3: octave 2 note E_, 4 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note E_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_Route2_Ch3: - stereopanning $f0 - vibrato $16, $15 - notetype $c, $14 + stereo_panning TRUE, FALSE + vibrato 22, 1, 5 + note_type 12, 1, 4 octave 4 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 octave 5 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 - callchannel Music_Route2_branch_eda9e + rest 3 + sound_call .sub1 octave 3 note D_, 4 -Music_Route2_branch_eda4b: - notetype $c, $15 +.mainloop: + note_type 12, 1, 5 octave 3 note C_, 4 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 - callchannel Music_Route2_branch_eda9e + rest 1 + sound_call .sub1 octave 3 note D_, 2 - intensity $10 + volume_envelope 1, 0 octave 6 note C_, 1 note D_, 1 - callchannel Music_Route2_branch_edaaf - note __, 4 + sound_call .sub2 + rest 4 note G_, 8 note F_, 2 note G_, 2 - notetype $c, $10 - callchannel Music_Route2_branch_edaaf - note __, 16 - intensity $25 - callchannel Music_Route2_branch_edacb - note __, 4 + note_type 12, 1, 0 + sound_call .sub2 + rest 16 + volume_envelope 2, 5 + sound_call .sub3 + rest 4 note D#, 1 note E_, 7 note D_, 4 @@ -373,48 +374,48 @@ Music_Route2_branch_eda4b: octave 6 note A_, 4 note G_, 4 - callchannel Music_Route2_branch_edacb - note __, 4 + sound_call .sub3 + rest 4 note G#, 1 note A_, 7 note B_, 4 note F#, 1 note G_, 16 note G_, 15 - loopchannel 0, Music_Route2_branch_eda4b + sound_loop 0, .mainloop -Music_Route2_branch_eda9e: +.sub1: octave 3 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 2 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - endchannel + sound_ret -Music_Route2_branch_edaaf: +.sub2: octave 6 note E_, 10 note D_, 2 - note __, 2 + rest 2 note C_, 2 - notetype $6, $10 + note_type 6, 1, 0 octave 5 note F#, 1 note G_, 15 note A_, 4 note A#, 4 - note __, 4 + rest 4 octave 6 note C_, 2 note D_, 2 @@ -428,12 +429,12 @@ Music_Route2_branch_edaaf: note D_, 4 note C_, 4 note D_, 4 - endchannel + sound_ret -Music_Route2_branch_edacb: +.sub3: octave 5 note B_, 16 - note __, 4 + rest 4 octave 6 note C#, 1 note D_, 7 @@ -444,71 +445,72 @@ Music_Route2_branch_edacb: note C_, 16 note C_, 3 note D_, 4 - note __, 4 + rest 4 note E_, 4 note F_, 16 - endchannel + sound_ret Music_Route2_Ch4: - togglenoise $5 - notetype $c -Music_Route2_branch_edae0: - note A_, 4 - note A_, 4 - note A_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - loopchannel 3, Music_Route2_branch_edae0 - note A_, 4 - note A_, 4 - note A_, 2 - note A_, 2 - note D#, 4 -Music_Route2_branch_edaef: - note A_, 4 - note A_, 4 - note A_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - loopchannel 4, Music_Route2_branch_edaef -Music_Route2_branch_edaf9: - note B_, 4 - note A_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - loopchannel 7, Music_Route2_branch_edaf9 - note B_, 4 - note A_, 4 - note A_, 2 - note A_, 2 - note D#, 4 -Music_Route2_branch_edb09: - note B_, 4 - note C_, 4 - note B_, 2 - note B_, 2 - note C_, 4 - loopchannel 3, Music_Route2_branch_edb09 - note B_, 4 - note C_, 4 - note C#, 2 - note C_, 2 - note C#, 4 -Music_Route2_branch_edb17: - note B_, 4 - note C_, 4 - note B_, 2 - note B_, 2 - note C_, 4 - loopchannel 3, Music_Route2_branch_edb17 - note B_, 4 - note C_, 4 - note D_, 2 - note D_, 2 - note D#, 4 - loopchannel 0, Music_Route2_branch_edaef + toggle_noise 5 + drum_speed 12 +.loop1: + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 2 + drum_note 12, 2 + sound_loop 3, .loop1 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 2 + drum_note 4, 4 +.mainloop: +.loop2: + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 2 + sound_loop 4, .loop2 +.loop3: + drum_note 12, 4 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 2 + drum_note 12, 2 + drum_note 10, 2 + drum_note 12, 2 + sound_loop 7, .loop3 + drum_note 12, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 10, 2 + drum_note 4, 4 +.loop4: + drum_note 12, 4 + drum_note 1, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 1, 4 + sound_loop 3, .loop4 + drum_note 12, 4 + drum_note 1, 4 + drum_note 2, 2 + drum_note 1, 2 + drum_note 2, 4 +.loop5: + drum_note 12, 4 + drum_note 1, 4 + drum_note 12, 2 + drum_note 12, 2 + drum_note 1, 4 + sound_loop 3, .loop5 + drum_note 12, 4 + drum_note 1, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 4 + sound_loop 0, .mainloop diff --git a/audio/music/route26.asm b/audio/music/route26.asm index fb1a7a8e..49cad4d3 100644 --- a/audio/music/route26.asm +++ b/audio/music/route26.asm @@ -1,42 +1,43 @@ 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 + channel_count 4 + channel 1, Music_Route26_Ch1 + channel 2, Music_Route26_Ch2 + channel 3, Music_Route26_Ch3 + channel 4, Music_Route26_Ch4 Music_Route26_Ch1: - stereopanning $f - vibrato $12, $23 + stereo_panning FALSE, TRUE + vibrato 18, 2, 3 tempo 151 - volume $77 - vibrato $14, $23 - dutycycle $0 - notetype $c, $a7 + volume 7, 7 + vibrato 20, 2, 3 + duty_cycle 0 + note_type 12, 10, 7 octave 3 note D_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 + rest 4 note F#, 4 - note __, 4 + rest 4 note G#, 12 - notetype $8, $a7 + note_type 8, 10, 7 octave 4 note C_, 2 octave 3 note G#, 2 note F#, 2 -Music_Route26_branch_eefe0: - dutycycle $0 - notetype $c, $a7 +.mainloop: + duty_cycle 0 + note_type 12, 10, 7 octave 3 note F_, 1 - note __, 2 + rest 2 note C#, 1 note F_, 3 note G_, 1 note G#, 1 - note __, 2 + rest 2 note F_, 1 octave 4 note C#, 4 @@ -46,13 +47,13 @@ Music_Route26_branch_eefe0: note A_, 4 note F#, 4 note F_, 1 - note __, 1 + rest 1 note C#, 1 note F_, 1 note G#, 3 note G_, 1 note G#, 1 - note __, 1 + rest 1 note F_, 1 note G#, 1 octave 4 @@ -63,38 +64,38 @@ Music_Route26_branch_eefe0: note A_, 4 note B_, 4 note A#, 1 - note __, 1 + rest 1 note F_, 1 note A#, 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 octave 4 note C#, 1 note F_, 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 note A#, 4 - note __, 2 - notetype $6, $a7 + rest 2 + note_type 6, 10, 7 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 - notetype $8, $a5 + rest 2 + note_type 8, 10, 5 note G#, 2 octave 4 note C#, 2 @@ -109,8 +110,8 @@ Music_Route26_branch_eefe0: note C_, 6 octave 3 note G#, 6 - dutycycle $2 - notetype $c, $a5 + duty_cycle 2 + note_type 12, 10, 5 note A_, 3 note G#, 3 note F#, 4 @@ -135,36 +136,36 @@ Music_Route26_branch_eefe0: note G#, 2 note F_, 4 note F#, 2 - notetype $6, $a5 + note_type 6, 10, 5 note G#, 7 octave 4 note C_, 1 note C#, 8 - notetype $8, $a5 + note_type 8, 10, 5 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 6 - notetype $6, $a5 - note __, 7 + note_type 6, 10, 5 + rest 7 octave 4 note D#, 1 note E_, 8 - notetype $8, $a5 + note_type 8, 10, 5 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 6 - note __, 6 - notetype $c, $a5 + rest 6 + note_type 12, 10, 5 octave 2 note B_, 1 note F#, 1 @@ -191,50 +192,50 @@ Music_Route26_branch_eefe0: note D#, 4 octave 2 note B_, 4 - note __, 4 - loopchannel 0, Music_Route26_branch_eefe0 + rest 4 + sound_loop 0, .mainloop Music_Route26_Ch2: - stereopanning $f0 - vibrato $14, $23 - dutycycle $2 - notetype $c, $c7 + stereo_panning TRUE, FALSE + vibrato 20, 2, 3 + duty_cycle 2 + note_type 12, 12, 7 octave 1 note A#, 4 - note __, 2 - notetype $6, $c7 + rest 2 + note_type 6, 12, 7 note A#, 1 - note __, 1 + rest 1 octave 2 note A#, 1 - note __, 1 + rest 1 octave 1 note G#, 8 - note __, 4 + rest 4 note G#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 - note __, 1 + rest 1 octave 1 note F#, 8 - note __, 4 + rest 4 note F#, 1 - note __, 1 + rest 1 octave 2 note F#, 1 - note __, 1 - notetype $c, $c7 + rest 1 + note_type 12, 12, 7 octave 1 note G#, 12 - notetype $8, $c7 + note_type 8, 12, 7 note G#, 2 octave 2 note C_, 2 note D#, 2 -Music_Route26_branch_ef0ce: - dutycycle $2 - notetype $c, $c2 +.mainloop: + duty_cycle 2 + note_type 12, 12, 2 octave 2 note C#, 6 note C#, 1 @@ -253,12 +254,12 @@ Music_Route26_branch_ef0ce: note B_, 2 note B_, 2 note B_, 2 - callchannel Music_Route26_branch_ef14e + sound_call .sub1 note A_, 6 note A_, 1 octave 2 note B_, 1 - notetype $8, $c2 + note_type 8, 12, 2 octave 1 note B_, 2 note B_, 2 @@ -267,39 +268,39 @@ Music_Route26_branch_ef0ce: note B_, 2 note B_, 2 note B_, 2 - notetype $c, $c2 - callchannel Music_Route26_branch_ef14e - intensity $c7 + note_type 12, 12, 2 + sound_call .sub1 + volume_envelope 12, 7 octave 2 note F#, 4 - note __, 2 - notetype $6, $c2 + rest 2 + note_type 6, 12, 2 note F#, 2 note F#, 2 note F#, 4 note F#, 4 note D#, 4 note D#, 4 - notetype $8, $c2 -Music_Route26_branch_ef10e: + note_type 8, 12, 2 +.loop1: octave 2 note G#, 2 note G#, 2 note G#, 2 octave 1 note G#, 6 - loopchannel 3, Music_Route26_branch_ef10e + sound_loop 3, .loop1 octave 2 note G#, 2 note G#, 2 note G#, 2 - notetype $c, $c7 + note_type 12, 12, 7 note F#, 1 note D#, 1 note C_, 1 octave 1 note G#, 1 - dutycycle $3 + duty_cycle 3 octave 4 note C#, 6 note D#, 6 @@ -311,34 +312,34 @@ Music_Route26_branch_ef10e: note A_, 2 note G#, 6 note D#, 2 - note __, 2 + rest 2 note D#, 2 note G#, 2 note D#, 2 note F_, 2 - note __, 2 + rest 2 note F_, 2 note F#, 6 note G#, 4 note A_, 8 - note __, 2 + rest 2 note A_, 2 note G#, 2 note F#, 2 note A_, 8 - note __, 4 + rest 4 note G#, 2 note A_, 2 note B_, 12 - note __, 4 + rest 4 note D#, 12 note D#, 1 note C#, 1 note C_, 1 note D#, 1 - loopchannel 0, Music_Route26_branch_ef0ce + sound_loop 0, .mainloop -Music_Route26_branch_ef14e: +.sub1: note A#, 6 note A#, 1 octave 2 @@ -350,71 +351,71 @@ Music_Route26_branch_ef14e: note A#, 2 octave 1 note A#, 2 - endchannel + sound_ret Music_Route26_Ch3: - stereopanning $ff - vibrato $12, $23 - notetype $c, $14 - vibrato $18, $23 + stereo_panning TRUE, TRUE + vibrato 18, 2, 3 + note_type 12, 1, 4 + vibrato 24, 2, 3 octave 4 note A#, 4 - note __, 2 - notetype $6, $14 + rest 2 + note_type 6, 1, 4 note F_, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 5 note C_, 8 - note __, 4 + rest 4 octave 4 note G#, 1 - note __, 1 + rest 1 octave 5 note C_, 1 - note __, 1 + rest 1 note C#, 8 - note __, 4 + rest 4 octave 4 note A#, 1 - note __, 1 + rest 1 octave 5 note C#, 1 - note __, 1 - notetype $c, $14 + rest 1 + note_type 12, 1, 4 note D#, 12 - notetype $8, $14 + note_type 8, 1, 4 note F#, 2 note F_, 2 note D#, 2 -Music_Route26_branch_ef18a: - vibrato $18, $23 - notetype $c, $14 +.mainloop: + vibrato 24, 2, 3 + note_type 12, 1, 4 octave 5 note C#, 1 - note __, 2 + rest 2 octave 4 note G#, 1 - callchannel Music_Route26_branch_ef22f - vibrato $25, $13 + sound_call .sub1 + vibrato 37, 1, 3 note C#, 1 - note __, 1 + rest 1 octave 4 note G#, 1 octave 5 note C#, 1 - callchannel Music_Route26_branch_ef22f + sound_call .sub1 note F_, 1 - note __, 1 + rest 1 note C#, 1 note F_, 1 note A#, 8 note A#, 1 - note __, 1 + rest 1 octave 6 note C_, 1 - note __, 1 + rest 1 note C#, 12 note D#, 4 note C#, 8 @@ -428,114 +429,114 @@ Music_Route26_branch_ef18a: note C_, 1 octave 5 note G#, 1 - intensity $15 + volume_envelope 1, 5 octave 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 - notetype $6, $15 + rest 3 + note_type 6, 1, 5 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 2 note A_, 4 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 6 + rest 6 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 - note __, 2 + rest 2 note A_, 4 note G#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 6 + rest 6 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 octave 3 note G#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 2 + rest 2 octave 3 note C#, 2 - note __, 10 + rest 10 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note F_, 2 - note __, 2 + rest 2 note C#, 4 octave 3 note F#, 8 - notetype $8, $15 + note_type 8, 1, 5 octave 2 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note F#, 6 - note __, 6 + rest 6 octave 4 note C_, 6 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 6 - note __, 6 - notetype $c, $15 + rest 6 + note_type 12, 1, 5 octave 2 note B_, 16 note B_, 8 octave 3 note F#, 4 note D#, 1 - note __, 1 + rest 1 octave 2 note G#, 1 octave 3 note C_, 1 - loopchannel 0, Music_Route26_branch_ef18a + sound_loop 0, .mainloop -Music_Route26_branch_ef22f: +.sub1: octave 5 note F_, 8 note C#, 2 @@ -544,122 +545,122 @@ Music_Route26_branch_ef22f: note F#, 4 note C#, 4 note D#, 4 - endchannel + sound_ret Music_Route26_Ch4: - togglenoise $4 - notetype $c -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: - notetype $6 - callchannel Music_Route26_branch_ef29a - callchannel Music_Route26_branch_ef29a - callchannel Music_Route26_branch_ef2a8 - note D_, 12 - note D_, 2 - note D_, 2 - notetype $8 - note D_, 2 - note C#, 2 - note C#, 2 - note D_, 2 - note D_, 2 - note E_, 2 - notetype $6 - callchannel Music_Route26_branch_ef29a - callchannel Music_Route26_branch_ef29a - notetype $8 -Music_Route26_branch_ef266: - note D_, 2 - note D_, 2 - note D_, 2 - note B_, 6 - loopchannel 4, Music_Route26_branch_ef266 - notetype $6 - callchannel Music_Route26_branch_ef2a8 - callchannel Music_Route26_branch_ef2a8 - callchannel Music_Route26_branch_ef29a - callchannel Music_Route26_branch_ef2a8 -Music_Route26_branch_ef27c: - notetype $6 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $8 - note D_, 2 - note D_, 2 - note D_, 2 - note B_, 12 - loopchannel 2, Music_Route26_branch_ef27c - notetype $c - note B_, 16 - callchannel Music_Route26_branch_ef2b0 - loopchannel 0, Music_Route26_branch_ef246 + toggle_noise 4 + drum_speed 12 +.loop1: + drum_note 12, 6 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 3, .loop1 + sound_call .sub3 +.mainloop: + drum_speed 6 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + drum_note 3, 12 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 8 + drum_note 3, 2 + drum_note 2, 2 + drum_note 2, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 5, 2 + drum_speed 6 + sound_call .sub1 + sound_call .sub1 + drum_speed 8 +.loop2: + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 12, 6 + sound_loop 4, .loop2 + drum_speed 6 + sound_call .sub2 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 +.loop3: + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 12, 12 + sound_loop 2, .loop3 + drum_speed 12 + drum_note 12, 16 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route26_branch_ef29a: - note E_, 12 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - endchannel +.sub1: + drum_note 5, 12 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_ret -Music_Route26_branch_ef2a8: - note E_, 12 - note D_, 2 - note D_, 2 - note D_, 4 - note D_, 4 - note E_, 4 - note D_, 4 - endchannel +.sub2: + drum_note 5, 12 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 4 + drum_note 5, 4 + drum_note 3, 4 + sound_ret -Music_Route26_branch_ef2b0: - notetype $6 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - notetype $8 - note D_, 2 - note D_, 2 - note E_, 2 - endchannel +.sub3: + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 8 + drum_note 3, 2 + drum_note 3, 2 + drum_note 5, 2 + sound_ret diff --git a/audio/music/route29.asm b/audio/music/route29.asm index d7cecf4f..aaf32372 100644 --- a/audio/music/route29.asm +++ b/audio/music/route29.asm @@ -1,20 +1,21 @@ 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 + channel_count 4 + channel 1, Music_Route29_Ch1 + channel 2, Music_Route29_Ch2 + channel 3, Music_Route29_Ch3 + channel 4, Music_Route29_Ch4 Music_Route29_Ch1: tempo 146 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f - notetype $c, $b2 - note __, 2 -Music_Route29_branch_f03a5: - note __, 2 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning FALSE, TRUE + note_type 12, 11, 2 + rest 2 +.mainloop: + rest 2 octave 4 note C_, 2 note E_, 2 @@ -95,7 +96,7 @@ Music_Route29_branch_f03a5: note G_, 2 note G_, 2 note F_, 8 - intensity $b4 + volume_envelope 11, 4 note A_, 4 octave 4 note C_, 2 @@ -104,31 +105,31 @@ Music_Route29_branch_f03a5: note E_, 4 note G_, 2 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 6 - intensity $b4 + volume_envelope 11, 4 note F_, 4 note A_, 2 note G_, 2 note F_, 2 - intensity $b2 + volume_envelope 11, 2 note A_, 4 - intensity $b4 + volume_envelope 11, 4 note C#, 4 note E_, 2 note G_, 4 - intensity $b3 + volume_envelope 11, 3 note E_, 8 - intensity $b4 + volume_envelope 11, 4 note A_, 2 note G_, 2 note A_, 2 octave 4 note C_, 4 - intensity $b2 + volume_envelope 11, 2 octave 3 note A_, 6 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note E_, 2 note G_, 2 @@ -142,10 +143,10 @@ Music_Route29_branch_f03a5: octave 3 note B_, 2 note A_, 2 - intensity $b2 + volume_envelope 11, 2 note G_, 4 note B_, 4 - intensity $b4 + volume_envelope 11, 4 note G_, 2 note E_, 2 octave 4 @@ -162,21 +163,21 @@ Music_Route29_branch_f03a5: note C_, 2 octave 3 note E_, 2 - intensity $b2 + volume_envelope 11, 2 note C_, 2 note G_, 2 note G_, 4 - loopchannel 0, Music_Route29_branch_f03a5 + sound_loop 0, .mainloop Music_Route29_Ch2: - dutycycle $3 - vibrato $12, $36 - notetype $c, $c2 + duty_cycle 3 + vibrato 18, 3, 6 + note_type 12, 12, 2 octave 4 note C_, 1 note D_, 1 -Music_Route29_branch_f0458: - callchannel Music_Route29_branch_f04de +.mainloop: + sound_call .sub1 note F_, 1 note E_, 1 note D_, 2 @@ -191,14 +192,14 @@ Music_Route29_branch_f0458: octave 4 note C_, 1 note D_, 1 - callchannel Music_Route29_branch_f04de + sound_call .sub1 note F_, 1 note E_, 1 note D_, 2 note D_, 2 octave 3 note B_, 2 - intensity $c4 + volume_envelope 12, 4 octave 4 note C_, 8 octave 3 @@ -263,10 +264,10 @@ Music_Route29_branch_f0458: note E_, 2 note D_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 note E_, 4 note D_, 4 - intensity $c4 + volume_envelope 12, 4 note C_, 2 octave 3 note G_, 2 @@ -290,7 +291,7 @@ Music_Route29_branch_f0458: note E_, 2 octave 3 note G_, 2 - intensity $c2 + volume_envelope 12, 2 octave 4 note C_, 2 note C_, 2 @@ -298,9 +299,9 @@ Music_Route29_branch_f0458: octave 4 note C_, 1 note D_, 1 - loopchannel 0, Music_Route29_branch_f0458 + sound_loop 0, .mainloop -Music_Route29_branch_f04de: +.sub1: note E_, 2 note E_, 2 note G_, 2 @@ -329,86 +330,86 @@ Music_Route29_branch_f04de: note D_, 2 note E_, 2 note C_, 2 - endchannel + sound_ret Music_Route29_Ch3: - stereopanning $f0 - notetype $c, $25 - vibrato $9, $27 - note __, 2 -Music_Route29_branch_f0504: - note __, 2 + stereo_panning TRUE, FALSE + note_type 12, 2, 5 + vibrato 9, 2, 7 + rest 2 +.mainloop: + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 3 + rest 3 octave 3 note A_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 3 note F_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note E_, 4 note G_, 4 octave 4 @@ -478,7 +479,7 @@ Music_Route29_branch_f0504: note F_, 6 note F_, 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 octave 3 note B_, 2 @@ -492,29 +493,29 @@ Music_Route29_branch_f0504: note C_, 4 octave 3 note G_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 3 - loopchannel 0, Music_Route29_branch_f0504 + rest 3 + sound_loop 0, .mainloop Music_Route29_Ch4: - stereopanning $f - togglenoise $0 - notetype $c - note __, 2 -Music_Route29_branch_f05b0: - note __, 2 - note F_, 2 - note F_, 6 - note F_, 2 - note F_, 2 - note F_, 2 - note __, 2 - note F_, 4 - note F_, 4 - note F_, 2 - note F_, 4 - loopchannel 0, Music_Route29_branch_f05b0 + stereo_panning FALSE, TRUE + toggle_noise 0 + drum_speed 12 + rest 2 +.mainloop: + rest 2 + drum_note 6, 2 + drum_note 6, 6 + drum_note 6, 2 + drum_note 6, 2 + drum_note 6, 2 + rest 2 + drum_note 6, 4 + drum_note 6, 4 + drum_note 6, 2 + drum_note 6, 4 + sound_loop 0, .mainloop diff --git a/audio/music/route3.asm b/audio/music/route3.asm index f36dbd53..cb93d6e6 100644 --- a/audio/music/route3.asm +++ b/audio/music/route3.asm @@ -1,17 +1,18 @@ 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 + channel_count 4 + channel 1, Music_Route3_Ch1 + channel 2, Music_Route3_Ch2 + channel 3, Music_Route3_Ch3 + channel 4, Music_Route3_Ch4 Music_Route3_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 160 - volume $77 - notetype $c, $91 - note __, 10 - dutycycle $0 - vibrato $14, $6 + volume 7, 7 + note_type 12, 9, 1 + rest 10 + duty_cycle 0 + vibrato 20, 0, 6 octave 3 note C#, 1 note E_, 1 @@ -45,8 +46,8 @@ Music_Route3_Ch1: note E_, 1 note F#, 1 note G#, 1 -Music_Route3_branch_ec307: - callchannel Music_Route3_branch_ec3a4 +.mainloop: + sound_call .sub1 note G_, 1 note D_, 1 octave 2 @@ -131,10 +132,10 @@ Music_Route3_branch_ec307: note B_, 1 octave 3 note D_, 1 - intensity $6f + volume_envelope 6, -7 note G_, 1 note D_, 1 - intensity $77 + volume_envelope 7, 7 octave 2 note B_, 1 octave 3 @@ -144,7 +145,7 @@ Music_Route3_branch_ec307: note E_, 1 note G#, 1 note B_, 4 - intensity $6f + volume_envelope 6, -7 octave 3 note G#, 2 note E_, 2 @@ -173,7 +174,7 @@ Music_Route3_branch_ec307: note D_, 2 note E_, 2 note F_, 2 - intensity $91 + volume_envelope 9, 1 note F#, 1 note D_, 1 octave 2 @@ -193,37 +194,38 @@ Music_Route3_branch_ec307: note B_, 1 octave 4 note D_, 1 - loopchannel 0, Music_Route3_branch_ec307 + sound_loop 0, .mainloop -Music_Route3_branch_ec3a4: +.sub1: +.sub1loop1: octave 3 note A_, 1 note E_, 1 note C#, 1 note E_, 1 - loopchannel 3, Music_Route3_branch_ec3a4 + sound_loop 3, .sub1loop1 note C#, 1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3b1: +.sub1loop2: note A_, 1 note E_, 1 note C#, 1 note E_, 1 - loopchannel 3, Music_Route3_branch_ec3b1 + sound_loop 3, .sub1loop2 note C#, 1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3bd: +.sub1loop3: note G_, 1 note D_, 1 octave 2 note B_, 1 octave 3 note D_, 1 - loopchannel 3, Music_Route3_branch_ec3bd + sound_loop 3, .sub1loop3 octave 2 note B_, 1 octave 3 @@ -232,22 +234,22 @@ Music_Route3_branch_ec3bd: note B_, 1 octave 3 note D_, 1 - endchannel + sound_ret Music_Route3_Ch2: - stereopanning $f0 - notetype $c, $5e - dutycycle $2 - vibrato $6, $3 + stereo_panning TRUE, FALSE + note_type 12, 5, -6 + duty_cycle 2 + vibrato 6, 0, 3 octave 4 note E_, 1 note G_, 1 note G#, 6 - intensity $87 + volume_envelope 8, 7 note F#, 1 note G#, 1 note A_, 1 - note __, 7 + rest 7 note C#, 4 note E_, 4 note D_, 4 @@ -255,45 +257,45 @@ Music_Route3_Ch2: note B_, 4 octave 4 note C#, 4 - intensity $a7 - dutycycle $2 + volume_envelope 10, 7 + duty_cycle 2 octave 3 note A_, 1 octave 4 note C#, 1 note E_, 1 note G#, 1 -Music_Route3_branch_ec3f5: - intensity $7d - callchannel Music_Route3_branch_ec443 +.mainloop: + volume_envelope 7, -5 + sound_call .sub1 note G_, 1 note B_, 10 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $7d - note __, 4 - dutycycle $3 + volume_envelope 7, -5 + rest 4 + duty_cycle 3 note G#, 4 - callchannel Music_Route3_branch_ec443 + sound_call .sub1 note B_, 1 - intensity $7d + volume_envelope 7, -5 octave 5 note D_, 5 - intensity $b7 + volume_envelope 11, 7 octave 5 note D_, 5 - dutycycle $0 + duty_cycle 0 octave 3 note D_, 1 note G_, 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 note B_, 1 octave 4 note D_, 4 - intensity $8f - dutycycle $2 + volume_envelope 8, -7 + duty_cycle 2 octave 4 note E_, 2 note D_, 2 @@ -316,7 +318,7 @@ Music_Route3_branch_ec3f5: note C#, 3 octave 3 note A_, 10 - dutycycle $2 + duty_cycle 2 octave 4 note F#, 6 note E_, 1 @@ -324,18 +326,18 @@ Music_Route3_branch_ec3f5: note G#, 6 note F#, 1 note G#, 1 - loopchannel 0, Music_Route3_branch_ec3f5 + sound_loop 0, .mainloop -Music_Route3_branch_ec443: +.sub1: note A_, 6 note E_, 1 note A_, 1 octave 5 note C#, 7 - intensity $b7 + volume_envelope 11, 7 octave 5 note C#, 3 - intensity $7d + volume_envelope 7, -5 octave 4 note E_, 2 note A_, 2 @@ -348,12 +350,12 @@ Music_Route3_branch_ec443: note A_, 2 note G_, 6 note D_, 1 - endchannel + sound_ret Music_Route3_Ch3: - stereopanning $ff - vibrato $6, $3 - notetype $c, $13 + stereo_panning TRUE, TRUE + vibrato 6, 0, 3 + note_type 12, 1, 3 octave 3 note B_, 1 octave 4 @@ -362,31 +364,31 @@ Music_Route3_Ch3: note D_, 1 octave 3 note B_, 1 - intensity $14 + volume_envelope 1, 4 octave 3 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note G#, 2 - callchannel Music_Route3_branch_ec4bd -Music_Route3_branch_ec47f: - intensity $14 - callchannel Music_Route3_branch_ec4bd - callchannel Music_Route3_branch_ec4bd - callchannel Music_Route3_branch_ec4ce - callchannel Music_Route3_branch_ec4bd - callchannel Music_Route3_branch_ec4bd - callchannel Music_Route3_branch_ec4ce + sound_call .sub1 +.mainloop: + volume_envelope 1, 4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 note A_, 2 octave 3 note C#, 2 @@ -400,7 +402,7 @@ Music_Route3_branch_ec47f: note B_, 2 note G#, 2 note E_, 1 - note __, 1 + rest 1 note E_, 2 note B_, 2 octave 3 @@ -414,88 +416,88 @@ Music_Route3_branch_ec47f: note C_, 2 note C#, 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 note D_, 1 note D_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 note F#, 1 note G#, 1 - loopchannel 0, Music_Route3_branch_ec47f + sound_loop 0, .mainloop -Music_Route3_branch_ec4bd: +.sub1: octave 3 note A_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note A_, 2 octave 2 note G#, 2 - endchannel + sound_ret -Music_Route3_branch_ec4ce: +.sub2: octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 - note __, 2 + rest 2 note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 note G_, 2 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 2 - note __, 2 + rest 2 note G_, 1 note G_, 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G#, 2 note B_, 2 - endchannel + sound_ret Music_Route3_Ch4: - togglenoise $4 - notetype $c - note __, 10 -Music_Route3_branch_ec4f0: - notetype $c - note D_, 2 - note D_, 4 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - notetype $6 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - loopchannel 0, Music_Route3_branch_ec4f0 + toggle_noise 4 + drum_speed 12 + rest 10 +.mainloop: + drum_speed 12 + drum_note 3, 2 + drum_note 3, 4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + sound_loop 0, .mainloop diff --git a/audio/music/route30.asm b/audio/music/route30.asm index 22623579..a8f947db 100644 --- a/audio/music/route30.asm +++ b/audio/music/route30.asm @@ -1,17 +1,18 @@ 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 + channel_count 4 + channel 1, Music_Route30_Ch1 + channel 2, Music_Route30_Ch2 + channel 3, Music_Route30_Ch3 + channel 4, Music_Route30_Ch4 Music_Route30_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f0 - notetype $c, $b2 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning TRUE, FALSE + note_type 12, 11, 2 octave 3 note D_, 6 note D_, 1 @@ -24,12 +25,12 @@ Music_Route30_Ch1: note D_, 1 note D_, 2 note D_, 2 - intensity $4e + volume_envelope 4, -6 note C_, 4 -Music_Route30_branch_efc2e: - intensity $b6 +.mainloop: + volume_envelope 11, 6 note D_, 6 - intensity $b4 + volume_envelope 11, 4 octave 2 note B_, 2 octave 3 @@ -37,9 +38,9 @@ Music_Route30_branch_efc2e: note E_, 2 note D_, 2 note E_, 2 - intensity $b6 + volume_envelope 11, 6 note F_, 6 - intensity $b4 + volume_envelope 11, 4 note C_, 2 note A_, 2 note G_, 2 @@ -60,10 +61,10 @@ Music_Route30_branch_efc2e: note B_, 1 octave 4 note C_, 1 - intensity $b7 + volume_envelope 11, 7 octave 3 note B_, 12 - intensity $b5 + volume_envelope 11, 5 note F_, 6 note C_, 2 note A_, 2 @@ -86,11 +87,11 @@ Music_Route30_branch_efc2e: note E_, 1 note D_, 1 note E_, 1 - intensity $b6 + volume_envelope 11, 6 note D_, 4 note G_, 4 note D_, 4 - intensity $b3 + volume_envelope 11, 3 octave 2 note B_, 1 octave 3 @@ -99,14 +100,14 @@ Music_Route30_branch_efc2e: note B_, 1 octave 3 note C_, 1 - intensity $b6 + volume_envelope 11, 6 octave 2 note B_, 4 octave 3 note D_, 4 octave 2 note B_, 4 - intensity $b4 + volume_envelope 11, 4 octave 3 note F_, 2 note E_, 2 @@ -116,7 +117,7 @@ Music_Route30_branch_efc2e: note G_, 2 note F_, 2 note E_, 2 - intensity $b6 + volume_envelope 11, 6 note A_, 4 note B_, 4 octave 4 @@ -131,9 +132,9 @@ Music_Route30_branch_efc2e: note C_, 2 octave 3 note G_, 2 - intensity $b7 + volume_envelope 11, 7 note D_, 14 - intensity $b6 + volume_envelope 11, 6 note F_, 2 note E_, 2 note D_, 2 @@ -167,7 +168,7 @@ Music_Route30_branch_efc2e: note G_, 2 octave 4 note D_, 2 - intensity $b5 + volume_envelope 11, 5 octave 3 note B_, 2 octave 4 @@ -181,13 +182,13 @@ Music_Route30_branch_efc2e: note B_, 2 octave 4 note D_, 2 - loopchannel 0, Music_Route30_branch_efc2e + sound_loop 0, .mainloop Music_Route30_Ch2: - dutycycle $3 - vibrato $12, $36 - stereopanning $f - notetype $c, $c2 + duty_cycle 3 + vibrato 18, 3, 6 + stereo_panning FALSE, TRUE + note_type 12, 12, 2 octave 3 note G_, 6 note G_, 1 @@ -200,13 +201,13 @@ Music_Route30_Ch2: note G_, 1 note G_, 2 note G_, 2 - intensity $c4 + volume_envelope 12, 4 note D_, 1 note E_, 1 note F_, 1 note F#, 1 -Music_Route30_branch_efcf6: - intensity $c7 +.mainloop: + volume_envelope 12, 7 note G_, 10 octave 4 note D_, 2 @@ -222,15 +223,15 @@ Music_Route30_branch_efcf6: note E_, 1 note D_, 1 note E_, 1 - intensity $b0 + volume_envelope 11, 0 note D_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $3f + volume_envelope 3, -7 note D_, 8 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - intensity $c7 + volume_envelope 12, 7 note C_, 10 note C_, 2 octave 3 @@ -259,11 +260,11 @@ Music_Route30_branch_efcf6: note F_, 8 note A_, 8 note G_, 2 - intensity $b0 + volume_envelope 11, 0 note D_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 10 - intensity $c7 + volume_envelope 12, 7 note C_, 4 octave 3 note B_, 4 @@ -279,63 +280,63 @@ Music_Route30_branch_efcf6: note C_, 8 octave 4 note B_, 2 - intensity $b0 + volume_envelope 11, 0 note G_, 6 - intensity $b7 + volume_envelope 11, 7 note G_, 8 - intensity $c7 + volume_envelope 12, 7 note B_, 2 - intensity $b0 + volume_envelope 11, 0 note G_, 4 - intensity $b7 + volume_envelope 11, 7 note G_, 8 - intensity $a7 + volume_envelope 10, 7 octave 3 note F#, 2 - loopchannel 0, Music_Route30_branch_efcf6 + sound_loop 0, .mainloop Music_Route30_Ch3: - notetype $c, $27 + note_type 12, 2, 7 octave 2 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 -Music_Route30_branch_efd79: + rest 1 +.mainloop: note G_, 1 - note __, 1 + rest 1 note B_, 2 - note __, 2 + rest 2 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 note A_, 2 @@ -343,16 +344,16 @@ Music_Route30_branch_efd79: note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 2 octave 3 note D_, 2 @@ -360,16 +361,16 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note D_, 2 @@ -377,15 +378,15 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 @@ -393,16 +394,16 @@ Music_Route30_branch_efd79: note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 note F_, 2 @@ -410,14 +411,14 @@ Music_Route30_branch_efd79: note F_, 1 note F_, 1 note F_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 octave 2 note F_, 2 note F#, 2 note G_, 1 - note __, 1 + rest 1 note B_, 2 octave 3 note G_, 2 @@ -425,14 +426,14 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note B_, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 4 note D_, 2 octave 3 @@ -441,14 +442,14 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 3 note G_, 2 octave 2 note G_, 2 note G#, 2 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 @@ -456,31 +457,31 @@ Music_Route30_branch_efd79: note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note F_, 2 note E_, 2 note C_, 1 note C_, 1 note C_, 1 - note __, 1 + rest 1 note A_, 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note D_, 2 @@ -488,28 +489,28 @@ Music_Route30_branch_efd79: note B_, 1 note B_, 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 2 note A_, 2 note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note B_, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 octave 2 @@ -517,31 +518,31 @@ Music_Route30_branch_efd79: note A_, 1 note A_, 1 note A_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note F_, 2 note E_, 2 note C_, 1 note C_, 1 note C_, 1 - note __, 1 + rest 1 note A_, 2 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note C_, 2 note D_, 2 @@ -549,15 +550,15 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 octave 3 note E_, 2 note D_, 2 @@ -565,105 +566,105 @@ Music_Route30_branch_efd79: note G_, 1 note G_, 1 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 2 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - loopchannel 0, Music_Route30_branch_efd79 + rest 1 + sound_loop 0, .mainloop Music_Route30_Ch4: - togglenoise $3 - notetype $c - callchannel Music_Route30_branch_efeb8 - callchannel Music_Route30_branch_efec1 -Music_Route30_branch_efe84: - callchannel Music_Route30_branch_efecd - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efee1 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efecd - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efee1 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efecd - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efed7 - callchannel Music_Route30_branch_efecd - callchannel Music_Route30_branch_efee1 - loopchannel 0, Music_Route30_branch_efe84 + toggle_noise 3 + drum_speed 12 + sound_call .sub1 + sound_call .sub2 +.mainloop: + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub3 + sound_call .sub4 + sound_call .sub5 + sound_call .sub4 + sound_call .sub4 + sound_call .sub3 + sound_call .sub4 + sound_call .sub4 + sound_call .sub4 + sound_call .sub3 + sound_call .sub5 + sound_loop 0, .mainloop -Music_Route30_branch_efeb8: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 4 - endchannel +.sub1: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 4 + sound_ret -Music_Route30_branch_efec1: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - endchannel +.sub2: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_ret -Music_Route30_branch_efecd: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - endchannel +.sub3: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_ret -Music_Route30_branch_efed7: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note F#, 2 - note D_, 2 - note D_, 2 - endchannel +.sub4: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 3, 2 + sound_ret -Music_Route30_branch_efee1: - note D_, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - notetype $6 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - notetype $c - endchannel +.sub5: + drum_note 3, 2 + drum_note 7, 2 + drum_note 7, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_speed 12 + sound_ret diff --git a/audio/music/route36.asm b/audio/music/route36.asm index 1899116b..ca954ad5 100644 --- a/audio/music/route36.asm +++ b/audio/music/route36.asm @@ -1,32 +1,33 @@ 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 + channel_count 4 + channel 1, Music_Route36_Ch1 + channel 2, Music_Route36_Ch2 + channel 3, Music_Route36_Ch3 + channel 4, Music_Route36_Ch4 Music_Route36_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0001 - vibrato $10, $15 - stereopanning $f - notetype $c, $b3 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + vibrato 16, 1, 5 + stereo_panning FALSE, TRUE + note_type 12, 11, 3 octave 3 note C_, 4 note C_, 6 note F_, 1 note E_, 1 - intensity $b5 + volume_envelope 11, 5 note F_, 8 - intensity $b3 + volume_envelope 11, 3 note F_, 6 note A#, 1 note A_, 1 - intensity $5d + volume_envelope 5, -5 note A#, 4 -Music_Route36_branch_e9517: - intensity $b5 +.mainloop: + volume_envelope 11, 5 note F_, 4 note A_, 2 note G_, 2 @@ -53,10 +54,10 @@ Music_Route36_branch_e9517: note D#, 4 octave 3 note A#, 2 - intensity $b6 + volume_envelope 11, 6 octave 4 note F_, 10 - intensity $b5 + volume_envelope 11, 5 note C_, 2 note F_, 2 note C_, 2 @@ -68,7 +69,7 @@ Music_Route36_branch_e9517: note C_, 2 octave 3 note A#, 4 - intensity $b4 + volume_envelope 11, 4 note A_, 2 octave 4 note D_, 2 @@ -82,7 +83,7 @@ Music_Route36_branch_e9517: note A_, 2 octave 4 note D_, 2 - intensity $a4 + volume_envelope 10, 4 octave 3 note A_, 2 octave 4 @@ -97,8 +98,8 @@ Music_Route36_branch_e9517: note A_, 2 octave 4 note D_, 2 - stereopanning $f0 - intensity $95 + stereo_panning TRUE, FALSE + volume_envelope 9, 5 octave 3 note D_, 6 octave 2 @@ -110,11 +111,11 @@ Music_Route36_branch_e9517: octave 3 note D_, 6 note E_, 4 - intensity $b5 + volume_envelope 11, 5 note D_, 6 note A_, 6 note G_, 4 - intensity $a5 + volume_envelope 10, 5 octave 2 note A_, 6 octave 3 @@ -125,7 +126,7 @@ Music_Route36_branch_e9517: note A_, 6 octave 3 note D_, 4 - intensity $b5 + volume_envelope 11, 5 note F#, 6 note E_, 6 note C#, 4 @@ -141,7 +142,7 @@ Music_Route36_branch_e9517: note G_, 6 note C_, 2 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note C_, 6 note G_, 4 note D_, 2 @@ -157,65 +158,65 @@ Music_Route36_branch_e9517: note B_, 2 note A_, 6 note D_, 6 - stereopanning $f - intensity $b5 + stereo_panning FALSE, TRUE + volume_envelope 11, 5 note D#, 2 note E_, 2 - loopchannel 0, Music_Route36_branch_e9517 + sound_loop 0, .mainloop Music_Route36_Ch2: - dutycycle $3 - vibrato $10, $36 - stereopanning $f0 - notetype $c, $c2 + duty_cycle 3 + vibrato 16, 3, 6 + stereo_panning TRUE, FALSE + note_type 12, 12, 2 octave 3 note F_, 2 note C_, 1 note F_, 1 - intensity $c7 + volume_envelope 12, 7 note A_, 8 note C_, 4 - intensity $c3 + volume_envelope 12, 3 octave 4 note C_, 2 octave 3 note A_, 1 octave 4 note C_, 1 - intensity $c7 + volume_envelope 12, 7 note F_, 8 octave 3 note G_, 4 -Music_Route36_branch_e95ce: - intensity $c7 +.mainloop: + volume_envelope 12, 7 octave 4 note C_, 10 - intensity $c4 + volume_envelope 12, 4 octave 3 note A_, 2 octave 4 note C_, 2 note A_, 2 note G_, 3 - intensity $c2 + volume_envelope 12, 2 note D#, 1 - intensity $c7 + volume_envelope 12, 7 note D#, 12 note C_, 10 - intensity $c4 + volume_envelope 12, 4 octave 3 note A_, 2 octave 4 note C_, 2 note F_, 2 - intensity $c2 + volume_envelope 12, 2 note D#, 2 note D#, 1 note F_, 1 - intensity $c7 + volume_envelope 12, 7 note G_, 12 note A_, 10 - intensity $c4 + volume_envelope 12, 4 note F_, 2 note A_, 2 octave 5 @@ -223,15 +224,15 @@ Music_Route36_branch_e95ce: octave 4 note A#, 3 note A_, 1 - intensity $c7 + volume_envelope 12, 7 note G_, 8 note A#, 4 - intensity $b0 + volume_envelope 11, 0 note A_, 16 - intensity $b7 + volume_envelope 11, 7 note A_, 16 - stereopanning $f - intensity $a4 + stereo_panning FALSE, TRUE + volume_envelope 10, 4 octave 3 note A_, 6 note G_, 6 @@ -239,84 +240,84 @@ Music_Route36_branch_e95ce: note E_, 6 note F#, 6 note G_, 4 - intensity $b3 + volume_envelope 11, 3 note A_, 2 note F#, 1 note A_, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note D_, 12 - intensity $a4 + volume_envelope 10, 4 octave 3 note F#, 2 note D_, 1 note F#, 1 - intensity $a7 + volume_envelope 10, 7 note A_, 12 - intensity $c7 + volume_envelope 12, 7 note A_, 6 note G_, 6 note F#, 4 note B_, 6 note A_, 6 note G_, 4 - intensity $c3 + volume_envelope 12, 3 note A_, 2 note F#, 1 note A_, 1 - intensity $c7 + volume_envelope 12, 7 octave 4 note D_, 12 - intensity $c3 + volume_envelope 12, 3 octave 3 note F#, 2 note D_, 1 note F#, 1 - intensity $c7 + volume_envelope 12, 7 note A_, 12 - intensity $c2 + volume_envelope 12, 2 note G_, 2 note E_, 1 note G_, 1 - intensity $b0 + volume_envelope 11, 0 octave 4 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note C_, 10 - intensity $c5 + volume_envelope 12, 5 octave 3 note G_, 2 note E_, 1 note G_, 1 - intensity $c7 + volume_envelope 12, 7 octave 4 note C_, 8 note C#, 4 - stereopanning $ff + stereo_panning TRUE, TRUE note D_, 6 note A_, 6 note G_, 2 note F#, 2 - intensity $b0 + volume_envelope 11, 0 note D_, 4 - intensity $b7 + volume_envelope 11, 7 note D_, 8 - stereopanning $f0 - intensity $c4 + stereo_panning TRUE, FALSE + volume_envelope 12, 4 octave 3 note F#, 1 note G_, 1 note A_, 1 note B_, 1 - loopchannel 0, Music_Route36_branch_e95ce + sound_loop 0, .mainloop Music_Route36_Ch3: - notetype $c, $25 + note_type 12, 2, 5 octave 3 note F_, 1 - note __, 3 + rest 3 note F_, 1 - note __, 1 + rest 1 octave 4 note C_, 4 octave 3 @@ -324,9 +325,9 @@ Music_Route36_Ch3: note F_, 2 note C_, 2 note D#, 1 - note __, 3 + rest 3 note D#, 1 - note __, 1 + rest 1 octave 4 note F_, 4 octave 2 @@ -334,7 +335,7 @@ Music_Route36_Ch3: octave 3 note D#, 2 note E_, 2 -Music_Route36_branch_e9684: +.mainloop: note F_, 4 note C_, 2 note F_, 4 @@ -464,57 +465,58 @@ Music_Route36_branch_e9684: note D_, 2 note D#, 2 note E_, 2 - loopchannel 0, Music_Route36_branch_e9684 + sound_loop 0, .mainloop Music_Route36_Ch4: - togglenoise $1 - notetype $c - callchannel Music_Route36_branch_e9734 - callchannel Music_Route36_branch_e9741 -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: - note A#, 4 - note A_, 2 - note F_, 4 - note B_, 1 - note B_, 1 - note A_, 4 - loopchannel 11, Music_Route36_branch_e9723 - callchannel Music_Route36_branch_e9741 - loopchannel 0, Music_Route36_branch_e9713 + toggle_noise 1 + drum_speed 12 + sound_call .sub1 + sound_call .sub3 +.mainloop: +.loop1: + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub3 + sound_loop 2, .loop1 +.loop2: + drum_note 11, 4 + drum_note 10, 2 + drum_note 6, 4 + drum_note 12, 1 + drum_note 12, 1 + drum_note 10, 4 + sound_loop 11, .loop2 + sound_call .sub3 + sound_loop 0, .mainloop -Music_Route36_branch_e9734: - note A_, 4 - note A_, 6 - note A#, 1 - note A#, 1 - note A_, 2 - note A#, 2 - endchannel +.sub1: + drum_note 10, 4 + drum_note 10, 6 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_note 11, 2 + sound_ret -Music_Route36_branch_e973b: - note A_, 4 - note A_, 6 - note B_, 1 - note A#, 1 - note A_, 4 - endchannel +.sub2: + drum_note 10, 4 + drum_note 10, 6 + drum_note 12, 1 + drum_note 11, 1 + drum_note 10, 4 + sound_ret -Music_Route36_branch_e9741: - note A_, 4 - note A_, 6 - note A#, 1 - note A#, 1 - note A_, 2 - notetype $6 - note A#, 1 - note A#, 1 - note A_, 1 - note A_, 1 - notetype $c - endchannel +.sub3: + drum_note 10, 4 + drum_note 10, 6 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 2 + drum_speed 6 + drum_note 11, 1 + drum_note 11, 1 + drum_note 10, 1 + drum_note 10, 1 + drum_speed 12 + sound_ret diff --git a/audio/music/route37.asm b/audio/music/route37.asm index 000db4e3..ec7f9006 100644 --- a/audio/music/route37.asm +++ b/audio/music/route37.asm @@ -1,29 +1,30 @@ 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 + channel_count 4 + channel 1, Music_Route37_Ch1 + channel 2, Music_Route37_Ch2 + channel 3, Music_Route37_Ch3 + channel 4, Music_Route37_Ch4 Music_Route37_Ch1: tempo 144 - volume $77 - dutycycle $3 - tone $0002 - vibrato $10, $22 - notetype $c, $b3 - note __, 16 - note __, 16 -Music_Route37_branch_ee969: - intensity $b3 - note __, 2 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 16, 2, 2 + note_type 12, 11, 3 + rest 16 + rest 16 +.mainloop: + volume_envelope 11, 3 + rest 2 octave 2 note F#, 2 note B_, 2 octave 3 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 10 - intensity $b3 + volume_envelope 11, 3 note E_, 4 note D#, 4 note C#, 4 @@ -33,19 +34,19 @@ Music_Route37_branch_ee969: note D#, 3 octave 2 note B_, 1 - intensity $b7 + volume_envelope 11, 7 note F#, 8 note B_, 8 octave 3 note B_, 12 - intensity $b3 - note __, 2 + volume_envelope 11, 3 + rest 2 octave 2 note F#, 2 note B_, 2 octave 3 note E_, 2 - intensity $b7 + volume_envelope 11, 7 note D#, 10 octave 2 note A_, 4 @@ -66,39 +67,39 @@ Music_Route37_branch_ee969: note F#, 4 note E_, 2 note D#, 4 - stereopanning $f -Music_Route37_branch_ee9a5: - callchannel Music_Route37_branch_ee9da + stereo_panning FALSE, TRUE +.loop1: + sound_call .sub1 octave 3 note C#, 4 - loopchannel 2, Music_Route37_branch_ee9a5 - callchannel Music_Route37_branch_ee9e9 + sound_loop 2, .loop1 + sound_call .sub2 octave 3 note F#, 4 - callchannel Music_Route37_branch_ee9e9 + sound_call .sub2 octave 3 note F#, 4 - callchannel Music_Route37_branch_ee9da + sound_call .sub1 octave 3 note E_, 4 - callchannel Music_Route37_branch_ee9da + sound_call .sub1 octave 3 note G#, 4 - callchannel Music_Route37_branch_ee9e9 + sound_call .sub2 octave 4 note D#, 4 - callchannel Music_Route37_branch_ee9e9 + sound_call .sub2 octave 3 note F_, 4 - stereopanning $ff - callchannel Music_Route37_branch_ee9e9 - note __, 4 - callchannel Music_Route37_branch_ee9e9 - note __, 4 - loopchannel 0, Music_Route37_branch_ee969 + stereo_panning TRUE, TRUE + sound_call .sub2 + rest 4 + sound_call .sub2 + rest 4 + sound_loop 0, .mainloop -Music_Route37_branch_ee9da: - intensity $c2 +.sub1: + volume_envelope 12, 2 octave 2 note A_, 2 note A_, 1 @@ -109,11 +110,11 @@ Music_Route37_branch_ee9da: note A_, 1 note A_, 1 note A_, 2 - intensity $b7 - endchannel + volume_envelope 11, 7 + sound_ret -Music_Route37_branch_ee9e9: - intensity $c2 +.sub2: + volume_envelope 12, 2 octave 2 note B_, 2 note B_, 1 @@ -124,57 +125,57 @@ Music_Route37_branch_ee9e9: note B_, 1 note B_, 1 note B_, 2 - intensity $b7 - endchannel + volume_envelope 11, 7 + sound_ret Music_Route37_Ch2: - dutycycle $3 - vibrato $1c, $12 - notetype $c, $c2 + duty_cycle 3 + vibrato 28, 1, 2 + note_type 12, 12, 2 octave 2 note B_, 2 - notetype $c, $c1 + note_type 12, 12, 1 note B_, 1 note B_, 1 - intensity $c2 + volume_envelope 12, 2 note B_, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 1 note B_, 1 note B_, 1 note B_, 1 - intensity $c2 + volume_envelope 12, 2 note B_, 6 note B_, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 1 note B_, 1 - intensity $c2 + volume_envelope 12, 2 note B_, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 1 note B_, 1 note B_, 1 note B_, 1 - intensity $c2 + volume_envelope 12, 2 note B_, 2 -Music_Route37_branch_eea24: - callchannel Music_Route37_branch_eeab7 - intensity $c6 +.mainloop: + sound_call .sub1 + volume_envelope 12, 6 octave 4 note C#, 4 octave 3 note B_, 4 note A_, 4 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note F#, 8 - intensity $b7 + volume_envelope 11, 7 note F#, 8 - intensity $c7 + volume_envelope 12, 7 note D#, 12 - callchannel Music_Route37_branch_eeab7 - intensity $c7 + sound_call .sub1 + volume_envelope 12, 7 octave 4 note C#, 4 octave 3 @@ -182,119 +183,119 @@ Music_Route37_branch_eea24: octave 4 note C#, 4 note E_, 4 - intensity $b0 + volume_envelope 11, 0 note D#, 16 - intensity $b0 + volume_envelope 11, 0 note D#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 8 - intensity $c4 - note __, 4 + volume_envelope 12, 4 + rest 4 octave 3 note A_, 3 octave 4 note E_, 1 note A_, 4 note G#, 4 - intensity $a0 + volume_envelope 10, 0 note C#, 6 note D#, 6 note E_, 4 - intensity $c3 + volume_envelope 12, 3 note F#, 3 note E_, 1 - intensity $b0 + volume_envelope 11, 0 note D#, 6 - intensity $b7 + volume_envelope 11, 7 note D#, 6 - intensity $c3 + volume_envelope 12, 3 octave 3 note B_, 3 note F#, 1 - intensity $b0 + volume_envelope 11, 0 octave 4 note D#, 6 - intensity $b7 + volume_envelope 11, 7 octave 4 note D#, 6 - intensity $c4 - note __, 4 + volume_envelope 12, 4 + rest 4 octave 3 note A_, 3 octave 4 note E_, 1 note A_, 4 note G#, 4 - intensity $b0 + volume_envelope 11, 0 note C#, 6 note D#, 6 note E_, 4 - intensity $c3 + volume_envelope 12, 3 note F#, 3 note D#, 1 - intensity $b0 + volume_envelope 11, 0 note B_, 6 - intensity $b7 + volume_envelope 11, 7 note B_, 6 - intensity $c3 + volume_envelope 12, 3 note B_, 3 note F#, 1 - intensity $b0 + volume_envelope 11, 0 octave 5 note D#, 6 - intensity $b7 + volume_envelope 11, 7 octave 5 note D#, 6 - intensity $c2 + volume_envelope 12, 2 octave 3 note F#, 2 note F#, 1 note F#, 1 note F#, 2 - intensity $c1 + volume_envelope 12, 1 note F#, 1 note F#, 1 note F#, 1 note F#, 1 - intensity $c2 + volume_envelope 12, 2 note F#, 6 note F#, 2 note F#, 1 note F#, 1 note F#, 2 - intensity $c1 + volume_envelope 12, 1 note F#, 1 note F#, 1 note F#, 1 note F#, 1 - intensity $c2 + volume_envelope 12, 2 note F#, 2 - loopchannel 0, Music_Route37_branch_eea24 + sound_loop 0, .mainloop -Music_Route37_branch_eeab7: - intensity $c7 +.sub1: + volume_envelope 12, 7 octave 3 note F#, 4 - intensity $b0 + volume_envelope 11, 0 note B_, 5 - intensity $b7 + volume_envelope 11, 7 note B_, 5 - intensity $c3 + volume_envelope 12, 3 note F#, 2 note F#, 2 note B_, 2 - endchannel + sound_ret Music_Route37_Ch3: - stereopanning $f0 - notetype $c, $14 -Music_Route37_branch_eeacc: + stereo_panning TRUE, FALSE + note_type 12, 1, 4 +.loop1: octave 2 note F#, 2 - note __, 6 - loopchannel 4, Music_Route37_branch_eeacc -Music_Route37_branch_eead3: - callchannel Music_Route37_branch_eeb32 + rest 6 + sound_loop 4, .loop1 +.mainloop: + sound_call .sub1 note A_, 2 octave 3 note C#, 2 @@ -305,12 +306,12 @@ Music_Route37_branch_eead3: note A_, 2 note F#, 2 note E_, 2 -Music_Route37_branch_eeae0: +.loop2: note D#, 2 note F#, 2 - loopchannel 4, Music_Route37_branch_eeae0 - callchannel Music_Route37_branch_eeb32 - callchannel Music_Route37_branch_eeb32 + sound_loop 4, .loop2 + sound_call .sub1 + sound_call .sub1 note A_, 2 octave 3 note C#, 2 @@ -323,45 +324,45 @@ Music_Route37_branch_eeae0: note C#, 2 octave 2 note A_, 2 - callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeafb: + sound_call .sub1 +.loop3: octave 2 note B_, 2 octave 3 note D#, 2 - loopchannel 4, Music_Route37_branch_eeafb -Music_Route37_branch_eeb03: + sound_loop 4, .loop3 +.loop4: octave 2 note A_, 2 octave 3 note C#, 2 - loopchannel 7, Music_Route37_branch_eeb03 + sound_loop 7, .loop4 note E_, 2 note C#, 2 - callchannel Music_Route37_branch_eeb3c -Music_Route37_branch_eeb10: + sound_call .sub2 +.loop5: octave 2 note B_, 2 octave 3 note F#, 2 - loopchannel 4, Music_Route37_branch_eeb10 -Music_Route37_branch_eeb18: + sound_loop 4, .loop5 +.loop6: octave 2 note A_, 2 octave 3 note C#, 2 - loopchannel 7, Music_Route37_branch_eeb18 + sound_loop 7, .loop6 note E_, 2 note C#, 2 - callchannel Music_Route37_branch_eeb3c - callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeb28: + sound_call .sub2 + sound_call .sub1 +.loop7: note F#, 2 - note __, 6 - loopchannel 4, Music_Route37_branch_eeb28 - loopchannel 0, Music_Route37_branch_eead3 + rest 6 + sound_loop 4, .loop7 + sound_loop 0, .mainloop -Music_Route37_branch_eeb32: +.sub1: octave 2 note F#, 2 note B_, 2 @@ -371,9 +372,9 @@ Music_Route37_branch_eeb32: note B_, 2 note F#, 2 note B_, 2 - endchannel + sound_ret -Music_Route37_branch_eeb3c: +.sub2: octave 2 note B_, 2 octave 3 @@ -390,38 +391,38 @@ Music_Route37_branch_eeb3c: note B_, 2 octave 3 note D#, 2 - endchannel + sound_ret Music_Route37_Ch4: - stereopanning $f - togglenoise $0 -Music_Route37_branch_eeb51: - notetype $c - callchannel Music_Route37_branch_eeb6b - note D_, 1 - note D#, 1 - note D#, 1 - note D_, 1 - callchannel Music_Route37_branch_eeb6b - notetype $6 - note D#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note D_, 1 - loopchannel 0, Music_Route37_branch_eeb51 + stereo_panning FALSE, TRUE + toggle_noise 0 +.mainloop: + drum_speed 12 + sound_call .sub1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + sound_call .sub1 + drum_speed 6 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 1 + sound_loop 0, .mainloop -Music_Route37_branch_eeb6b: - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 1 - note D#, 1 - endchannel +.sub1: + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + sound_ret diff --git a/audio/music/ruinsofalphinterior.asm b/audio/music/ruinsofalphinterior.asm index f353b63a..7799b2c8 100644 --- a/audio/music/ruinsofalphinterior.asm +++ b/audio/music/ruinsofalphinterior.asm @@ -1,23 +1,24 @@ Music_RuinsOfAlphInterior: - musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1 - musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2 - musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3 + channel_count 3 + channel 1, Music_RuinsOfAlphInterior_Ch1 + channel 2, Music_RuinsOfAlphInterior_Ch2 + channel 3, Music_RuinsOfAlphInterior_Ch3 Music_RuinsOfAlphInterior_Ch1: tempo 224 - volume $77 - dutycycle $0 - stereopanning $f0 - notetype $c, $44 - note __, 1 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 + volume 7, 7 + duty_cycle 0 + stereo_panning TRUE, FALSE + note_type 12, 4, 4 + rest 1 + sound_loop 0, Music_RuinsOfAlphInterior_Ch2.mainloop Music_RuinsOfAlphInterior_Ch2: - tone $0002 - dutycycle $0 - stereopanning $f - notetype $c, $a4 -Music_RuinsOfAlphInterior_branch_ebdc2: + pitch_offset 2 + duty_cycle 0 + stereo_panning FALSE, TRUE + note_type 12, 10, 4 +.mainloop: octave 4 note C_, 4 octave 3 @@ -32,15 +33,15 @@ Music_RuinsOfAlphInterior_branch_ebdc2: note C_, 4 octave 3 note A#, 4 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 + sound_loop 0, .mainloop Music_RuinsOfAlphInterior_Ch3: - notetype $c, $10 -Music_RuinsOfAlphInterior_branch_ebdd7: + note_type 12, 1, 0 +.mainloop: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 2 - note __, 10 - loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7 + rest 10 + sound_loop 0, .mainloop diff --git a/audio/music/ruinsofalphradio.asm b/audio/music/ruinsofalphradio.asm index 5584b279..3cf7c774 100644 --- a/audio/music/ruinsofalphradio.asm +++ b/audio/music/ruinsofalphradio.asm @@ -1,40 +1,41 @@ Music_RuinsOfAlphRadio: - musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1 - musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2 - musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3 + channel_count 3 + channel 1, Music_RuinsOfAlphRadio_Ch1 + channel 2, Music_RuinsOfAlphRadio_Ch2 + channel 3, Music_RuinsOfAlphRadio_Ch3 Music_RuinsOfAlphRadio_Ch1: tempo 160 - volume $77 - dutycycle $0 - tone $0118 - vibrato $0, $f0 - stereopanning $f0 -Music_RuinsOfAlphRadio_branch_eede3: - notetype $6, $71 - callchannel Music_RuinsOfAlphRadio_branch_eee01 - notetype $c, $a1 - note __, 16 - note __, 16 - callchannel Music_RuinsOfAlphRadio_branch_eee08 - notetype $c, $a1 - note __, 16 - note __, 16 - callchannel Music_RuinsOfAlphRadio_branch_eee01 - notetype $c, $a1 - note __, 16 - loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3 + volume 7, 7 + duty_cycle 0 + pitch_offset 280 + vibrato 0, 15, 0 + stereo_panning TRUE, FALSE +.mainloop: + note_type 6, 7, 1 + sound_call .sub1 + note_type 12, 10, 1 + rest 16 + rest 16 + sound_call .sub2 + note_type 12, 10, 1 + rest 16 + rest 16 + sound_call .sub1 + note_type 12, 10, 1 + rest 16 + sound_loop 0, .mainloop -Music_RuinsOfAlphRadio_branch_eee01: +.sub1: octave 4 note G_, 1 note F#, 1 note G_, 1 note F#, 1 note C_, 8 - endchannel + sound_ret -Music_RuinsOfAlphRadio_branch_eee08: +.sub2: octave 4 note G_, 1 note F#, 1 @@ -44,30 +45,30 @@ Music_RuinsOfAlphRadio_branch_eee08: note G_, 1 octave 5 note C_, 8 - endchannel + sound_ret Music_RuinsOfAlphRadio_Ch2: - dutycycle $1 - vibrato $1, $e0 -Music_RuinsOfAlphRadio_branch_eee17: - stereopanning $f - notetype $6, $81 - callchannel Music_RuinsOfAlphRadio_branch_eee01 - notetype $c, $a1 - note __, 16 - note __, 16 - notetype $6, $81 - callchannel Music_RuinsOfAlphRadio_branch_eee08 - notetype $c, $a1 - note __, 16 - loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17 + duty_cycle 1 + vibrato 1, 14, 0 +.mainloop: + stereo_panning FALSE, TRUE + note_type 6, 8, 1 + sound_call Music_RuinsOfAlphRadio_Ch1.sub1 + note_type 12, 10, 1 + rest 16 + rest 16 + note_type 6, 8, 1 + sound_call Music_RuinsOfAlphRadio_Ch1.sub2 + note_type 12, 10, 1 + rest 16 + sound_loop 0, .mainloop Music_RuinsOfAlphRadio_Ch3: - notetype $6, $26 -Music_RuinsOfAlphRadio_branch_eee35: + note_type 6, 2, 6 +.mainloop: octave 2 note C_, 1 note C#, 1 note C_, 1 - note __, 16 - loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35 + rest 16 + sound_loop 0, .mainloop diff --git a/audio/music/showmearound.asm b/audio/music/showmearound.asm index 344b8fe3..8bf35208 100644 --- a/audio/music/showmearound.asm +++ b/audio/music/showmearound.asm @@ -1,15 +1,16 @@ 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 + channel_count 4 + channel 1, Music_ShowMeAround_Ch1 + channel 2, Music_ShowMeAround_Ch2 + channel 3, Music_ShowMeAround_Ch3 + channel 4, Music_ShowMeAround_Ch4 Music_ShowMeAround_Ch1: tempo 144 - volume $77 - stereopanning $f - dutycycle $2 - notetype $c, $b1 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 2 + note_type 12, 11, 1 octave 4 note B_, 2 note A_, 2 @@ -27,44 +28,44 @@ Music_ShowMeAround_Ch1: note D_, 1 note E_, 1 note G#, 8 -Music_ShowMeAround_branch_edc01: - note __, 16 - note __, 16 - note __, 16 - note __, 16 - callchannel Music_ShowMeAround_branch_edc98 - callchannel Music_ShowMeAround_branch_edc15 - callchannel Music_ShowMeAround_branch_edc98 - callchannel Music_ShowMeAround_branch_edc15 - loopchannel 0, Music_ShowMeAround_branch_edc01 +.mainloop: + rest 16 + rest 16 + rest 16 + rest 16 + sound_call Music_ShowMeAround_Ch2.sub3 + sound_call .sub1 + sound_call Music_ShowMeAround_Ch2.sub3 + sound_call .sub1 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edc15: - note __, 4 +.sub1: + rest 4 octave 3 note C#, 1 - note __, 5 + rest 5 note D_, 4 note C_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 octave 2 note E_, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 4 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_ShowMeAround_Ch2: - stereopanning $ff - dutycycle $2 - notetype $c, $b1 + stereo_panning TRUE, TRUE + duty_cycle 2 + note_type 12, 11, 1 octave 5 note E_, 2 note D_, 2 @@ -82,11 +83,11 @@ Music_ShowMeAround_Ch2: octave 5 note D_, 1 note E_, 8 - dutycycle $1 -Music_ShowMeAround_branch_edc44: - callchannel Music_ShowMeAround_branch_edc98 - callchannel Music_ShowMeAround_branch_edc98 - callchannel Music_ShowMeAround_branch_edc86 + duty_cycle 1 +.mainloop: + sound_call .sub3 + sound_call .sub3 + sound_call .sub1 note A_, 4 octave 3 note A_, 2 @@ -97,7 +98,7 @@ Music_ShowMeAround_branch_edc44: note C#, 2 octave 3 note B_, 4 - callchannel Music_ShowMeAround_branch_edc86 + sound_call .sub1 note A_, 2 note A_, 2 note G#, 2 @@ -107,7 +108,7 @@ Music_ShowMeAround_branch_edc44: note A_, 2 note A_, 2 note A_, 4 - callchannel Music_ShowMeAround_branch_edc8e + sound_call .sub2 note A_, 4 octave 5 note C#, 2 @@ -119,10 +120,10 @@ Music_ShowMeAround_branch_edc44: note F#, 1 note F_, 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 note E_, 1 - callchannel Music_ShowMeAround_branch_edc8e + sound_call .sub2 note A_, 2 octave 5 note E_, 2 @@ -134,9 +135,9 @@ Music_ShowMeAround_branch_edc44: note A_, 2 note A_, 2 note A_, 4 - loopchannel 0, Music_ShowMeAround_branch_edc44 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edc86: +.sub1: octave 3 note A_, 2 octave 4 @@ -144,9 +145,9 @@ Music_ShowMeAround_branch_edc86: note E_, 4 note D_, 2 note F#, 2 - endchannel + sound_ret -Music_ShowMeAround_branch_edc8e: +.sub2: octave 5 note C#, 2 octave 4 @@ -156,60 +157,60 @@ Music_ShowMeAround_branch_edc8e: note F#, 2 octave 4 note A_, 2 - endchannel + sound_ret -Music_ShowMeAround_branch_edc98: - note __, 4 +.sub3: + rest 4 octave 3 note C#, 1 - note __, 5 + rest 5 note D_, 4 note C_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note C#, 1 - note __, 5 + rest 5 octave 2 note E_, 1 - note __, 3 + rest 3 note A#, 2 note B_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_ShowMeAround_Ch3: - stereopanning $f0 - vibrato $10, $22 - notetype $6, $25 + stereo_panning TRUE, FALSE + vibrato 16, 2, 2 + note_type 6, 2, 5 octave 2 note B_, 1 - note __, 3 + rest 3 octave 3 note D_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note B_, 1 - note __, 3 + rest 3 octave 4 note D_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note D_, 2 - note __, 6 + rest 6 note D_, 2 octave 3 note B_, 2 note G#, 2 note B_, 2 note E_, 2 - note __, 6 - intensity $14 + rest 6 + volume_envelope 1, 4 octave 2 note B_, 1 note A#, 1 @@ -218,132 +219,132 @@ Music_ShowMeAround_Ch3: note G_, 1 note F_, 1 note E_, 2 - intensity $14 -Music_ShowMeAround_branch_edcd9: - callchannel Music_ShowMeAround_branch_edcef - callchannel Music_ShowMeAround_branch_edcef - callchannel Music_ShowMeAround_branch_edcef - callchannel Music_ShowMeAround_branch_edd0f - callchannel Music_ShowMeAround_branch_edcef - callchannel Music_ShowMeAround_branch_edd0f - loopchannel 0, Music_ShowMeAround_branch_edcd9 + volume_envelope 1, 4 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edcef: +.sub1: octave 2 note A_, 2 - note __, 6 + rest 6 octave 4 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 8 note D#, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 2 - note __, 6 + rest 6 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 6 + rest 6 note C#, 4 note D_, 2 - note __, 2 - endchannel + rest 2 + sound_ret -Music_ShowMeAround_branch_edd0f: +.sub2: octave 2 note A_, 2 - note __, 6 + rest 6 octave 4 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 8 note D#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 6 + rest 6 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 octave 2 note A_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Music_ShowMeAround_Ch4: - togglenoise $3 - notetype $c - note __, 16 - note __, 8 - note D_, 2 - note D#, 2 - note F#, 4 -Music_ShowMeAround_branch_edd39: - callchannel Music_ShowMeAround_branch_edd4f - callchannel Music_ShowMeAround_branch_edd4f - callchannel Music_ShowMeAround_branch_edd4f - callchannel Music_ShowMeAround_branch_edd5e - callchannel Music_ShowMeAround_branch_edd4f - callchannel Music_ShowMeAround_branch_edd5e - loopchannel 0, Music_ShowMeAround_branch_edd39 + toggle_noise 3 + drum_speed 12 + rest 16 + rest 8 + drum_note 3, 2 + drum_note 4, 2 + drum_note 7, 4 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub2 + sound_loop 0, .mainloop -Music_ShowMeAround_branch_edd4f: - note D#, 2 - note F#, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note F#, 4 - note D_, 2 - note D#, 2 - note F#, 4 - note D_, 2 - note G_, 2 - note G_, 2 - note D_, 2 - note D#, 2 - endchannel +.sub1: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 3, 2 + drum_note 4, 2 + sound_ret -Music_ShowMeAround_branch_edd5e: - note D#, 2 - note F#, 2 - note D_, 2 - note G_, 2 - note G_, 2 - note F#, 4 - note D_, 2 - note D#, 2 - note F#, 4 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note F#, 2 - endchannel +.sub2: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 4, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_ret diff --git a/audio/music/sprouttower.asm b/audio/music/sprouttower.asm index d44de631..c77e4426 100644 --- a/audio/music/sprouttower.asm +++ b/audio/music/sprouttower.asm @@ -1,21 +1,22 @@ 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 + channel_count 4 + channel 1, Music_SproutTower_Ch1 + channel 2, Music_SproutTower_Ch2 + channel 3, Music_SproutTower_Ch3 + channel 4, Music_SproutTower_Ch4 Music_SproutTower_Ch1: tempo 176 - volume $77 - dutycycle $3 - tone $0002 - vibrato $8, $45 - stereopanning $f - notetype $c, $a3 - note __, 16 - note __, 16 -Music_SproutTower_branch_f6994: - note __, 6 + volume 7, 7 + duty_cycle 3 + pitch_offset 2 + vibrato 8, 4, 5 + stereo_panning FALSE, TRUE + note_type 12, 10, 3 + rest 16 + rest 16 +.mainloop: + rest 6 octave 3 note F_, 2 note F#, 4 @@ -39,18 +40,18 @@ Music_SproutTower_branch_f6994: note F_, 2 note D#, 2 note C#, 2 - intensity $a5 + volume_envelope 10, 5 note C_, 8 - intensity $a3 + volume_envelope 10, 3 note C#, 2 note C_, 2 octave 2 note A#, 2 octave 3 note C#, 2 - intensity $a7 + volume_envelope 10, 7 note C_, 16 - intensity $a3 + volume_envelope 10, 3 note F_, 4 note F_, 4 note F#, 4 @@ -59,13 +60,13 @@ Music_SproutTower_branch_f6994: note F_, 4 note D#, 4 note D#, 4 - loopchannel 0, Music_SproutTower_branch_f6994 + sound_loop 0, .mainloop Music_SproutTower_Ch2: - dutycycle $3 - tone $0001 - vibrato $8, $48 - notetype $c, $b2 + duty_cycle 3 + pitch_offset 1 + vibrato 8, 4, 8 + note_type 12, 11, 2 octave 3 note F_, 4 note F_, 4 @@ -75,8 +76,8 @@ Music_SproutTower_Ch2: note F_, 4 note D#, 4 note D#, 4 -Music_SproutTower_branch_f69dc: - intensity $b5 +.mainloop: + volume_envelope 11, 5 octave 4 note C_, 4 octave 3 @@ -91,9 +92,9 @@ Music_SproutTower_branch_f69dc: octave 3 note A#, 2 note F#, 4 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b5 + volume_envelope 11, 5 note F#, 4 note A#, 4 octave 4 @@ -108,90 +109,90 @@ Music_SproutTower_branch_f69dc: note D#, 2 note C#, 2 note C_, 8 - intensity $b5 + volume_envelope 11, 5 note C#, 2 note C_, 2 octave 3 note A#, 2 note F#, 2 - intensity $b7 + volume_envelope 11, 7 note A#, 8 - intensity $b5 + volume_envelope 11, 5 octave 4 note C_, 2 octave 3 note A#, 2 note F#, 2 note D#, 2 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $b3 + volume_envelope 11, 3 note F_, 4 note F_, 4 note F#, 4 note A#, 2 note F_, 1 note A#, 1 - intensity $b7 + volume_envelope 11, 7 octave 4 note C_, 16 - note __, 16 - loopchannel 0, Music_SproutTower_branch_f69dc + rest 16 + sound_loop 0, .mainloop Music_SproutTower_Ch3: - vibrato $14, $e8 - notetype $c, $14 + vibrato 20, 14, 8 + note_type 12, 1, 4 octave 3 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - stereopanning $f0 -Music_SproutTower_branch_f6a3e: - note __, 4 + stereo_panning TRUE, FALSE +.mainloop: + rest 4 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 2 octave 3 note D#, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 note F_, 8 note F#, 4 @@ -201,42 +202,42 @@ Music_SproutTower_branch_f6a3e: note F#, 4 note F_, 16 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 2 note F#, 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 - loopchannel 0, Music_SproutTower_branch_f6a3e + sound_loop 0, .mainloop Music_SproutTower_Ch4: - togglenoise $0 - notetype $c - note __, 4 -Music_SproutTower_branch_f6a7f: - note F#, 4 - stereopanning $f0 - note D#, 4 - note F#, 2 - stereopanning $f - note D#, 2 - stereopanning $ff - note F#, 4 - note F#, 4 - stereopanning $f - note D#, 4 - note F#, 2 - stereopanning $f0 - note D#, 2 - stereopanning $ff - note F#, 4 - loopchannel 0, Music_SproutTower_branch_f6a7f + toggle_noise 0 + drum_speed 12 + rest 4 +.mainloop: + drum_note 7, 4 + stereo_panning TRUE, FALSE + drum_note 4, 4 + drum_note 7, 2 + stereo_panning FALSE, TRUE + drum_note 4, 2 + stereo_panning TRUE, TRUE + drum_note 7, 4 + drum_note 7, 4 + stereo_panning FALSE, TRUE + drum_note 4, 4 + drum_note 7, 2 + stereo_panning TRUE, FALSE + drum_note 4, 2 + stereo_panning TRUE, TRUE + drum_note 7, 4 + sound_loop 0, .mainloop diff --git a/audio/music/ssaqua.asm b/audio/music/ssaqua.asm index 5b06b27b..8d00d46d 100644 --- a/audio/music/ssaqua.asm +++ b/audio/music/ssaqua.asm @@ -1,48 +1,49 @@ 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 + channel_count 4 + channel 1, Music_SSAqua_Ch1 + channel 2, Music_SSAqua_Ch2 + channel 3, Music_SSAqua_Ch3 + channel 4, Music_SSAqua_Ch4 Music_SSAqua_Ch1: tempo 117 - volume $77 - stereopanning $f - tone $0001 - vibrato $12, $33 - dutycycle $2 - notetype $6, $97 + volume 7, 7 + stereo_panning FALSE, TRUE + pitch_offset 1 + vibrato 18, 3, 3 + duty_cycle 2 + note_type 6, 9, 7 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 -Music_SSAqua_branch_eadbc: + rest 1 +.mainloop: octave 2 note G_, 16 - note __, 8 + rest 8 note G_, 2 - note __, 2 - notetype $c, $97 + rest 2 + note_type 12, 9, 7 note G_, 2 note G_, 10 - note __, 4 - notetype $6, $97 + rest 4 + note_type 6, 9, 7 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 16 - note __, 8 + rest 8 note G_, 2 - note __, 2 - notetype $c, $97 + rest 2 + note_type 12, 9, 7 note G_, 2 note G_, 8 - note __, 8 - dutycycle $1 - intensity $61 - callchannel Music_SSAqua_branch_eaff5 + rest 8 + duty_cycle 1 + volume_envelope 6, 1 + sound_call Music_SSAqua_Ch2.sub4 octave 5 note G_, 1 octave 4 @@ -67,29 +68,29 @@ Music_SSAqua_branch_eadbc: note B_, 1 note A_, 1 note G_, 1 - callchannel Music_SSAqua_branch_eaff5 - callchannel Music_SSAqua_branch_eb03e - note __, 16 - note __, 16 - note __, 16 - intensity $97 - note __, 14 - notetype $6, $97 + sound_call Music_SSAqua_Ch2.sub4 + sound_call Music_SSAqua_Ch2.sub5 + rest 16 + rest 16 + rest 16 + volume_envelope 9, 7 + rest 14 + note_type 6, 9, 7 note D_, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 - notetype $c, $97 - note __, 16 - note __, 16 - intensity $95 - note __, 2 + rest 1 + note_type 12, 9, 7 + rest 16 + rest 16 + volume_envelope 9, 5 + rest 2 octave 4 note C_, 1 note E_, 1 note G_, 1 - note __, 1 + rest 1 note E_, 1 note C_, 1 octave 3 @@ -116,8 +117,8 @@ Music_SSAqua_branch_eadbc: octave 4 note G_, 1 note F#, 1 - dutycycle $2 - intensity $97 + duty_cycle 2 + volume_envelope 9, 7 note G_, 8 note F#, 8 note E_, 8 @@ -125,48 +126,48 @@ Music_SSAqua_branch_eadbc: octave 3 note B_, 8 note A#, 2 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 4 note F#, 2 - intensity $75 + volume_envelope 7, 5 octave 5 note A_, 4 note F#, 4 note D_, 4 octave 4 note A#, 2 - notetype $6, $97 + note_type 6, 9, 7 note D_, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 - intensity $97 + rest 1 + volume_envelope 9, 7 note G_, 16 note A_, 16 note B_, 4 - note __, 4 + rest 4 note B_, 4 - note __, 4 + rest 4 octave 4 note E_, 8 note G_, 8 note F#, 1 - vibrato $0, $0 - intensity $88 + vibrato 0, 0, 0 + volume_envelope 8, 8 note G_, 10 - vibrato $2, $23 - intensity $87 + vibrato 2, 2, 3 + volume_envelope 8, 7 note G_, 9 - vibrato $8, $33 + vibrato 8, 3, 3 note C_, 4 note E_, 4 note C_, 4 note D_, 12 note F#, 12 - note __, 8 + rest 8 octave 2 note B_, 2 octave 3 @@ -179,10 +180,10 @@ Music_SSAqua_branch_eadbc: octave 4 note D_, 2 note F#, 2 - notetype $c, $97 - note __, 7 - note __, 16 - note __, 16 + note_type 12, 9, 7 + rest 7 + rest 16 + rest 16 note G_, 8 note F#, 1 note D_, 1 @@ -207,24 +208,24 @@ Music_SSAqua_branch_eadbc: octave 4 note D_, 1 note F#, 1 - note __, 7 - note __, 16 - note __, 2 + rest 7 + rest 16 + rest 2 note E_, 2 note G_, 1 - note __, 1 + rest 1 note E_, 1 - notetype $6, $97 - note __, 1 + note_type 6, 9, 7 + rest 1 note C_, 1 note C#, 4 octave 3 note B_, 2 - note __, 2 + rest 2 note A_, 3 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 note F#, 2 note D_, 2 octave 2 @@ -246,27 +247,27 @@ Music_SSAqua_branch_eadbc: note D_, 2 note F#, 2 note A_, 2 - loopchannel 0, Music_SSAqua_branch_eadbc + sound_loop 0, .mainloop Music_SSAqua_Ch2: - stereopanning $f0 - dutycycle $2 - vibrato $8, $33 - notetype $c, $b7 - note __, 2 -Music_SSAqua_branch_eaed5: - notetype $c, $b7 - dutycycle $1 - intensity $61 - callchannel Music_SSAqua_branch_eaff5 - callchannel Music_SSAqua_branch_eb03e - dutycycle $2 - intensity $d7 - callchannel Music_SSAqua_branch_eafe0 + stereo_panning TRUE, FALSE + duty_cycle 2 + vibrato 8, 3, 3 + note_type 12, 11, 7 + rest 2 +.mainloop: + note_type 12, 11, 7 + duty_cycle 1 + volume_envelope 6, 1 + sound_call .sub4 + sound_call .sub5 + duty_cycle 2 + volume_envelope 13, 7 + sound_call .sub3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 octave 3 note G_, 6 note G_, 1 @@ -274,30 +275,30 @@ Music_SSAqua_branch_eaed5: octave 4 note C#, 1 note E_, 1 - pitchoffset 0, CC - callchannel Music_SSAqua_branch_eafe0 - pitchoffset 0, C_ + transpose 0, 12 + sound_call .sub3 + transpose 0, 0 octave 3 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 3 + rest 3 octave 4 note G_, 6 - note __, 2 - dutycycle $3 - intensity $b7 + rest 2 + duty_cycle 3 + volume_envelope 11, 7 octave 3 note B_, 1 octave 4 note C_, 1 - callchannel Music_SSAqua_branch_eaf88 + sound_call .sub1 note G_, 4 - note __, 4 + rest 4 note G_, 8 note A_, 8 note B_, 8 - notetype $c, $b7 + note_type 12, 11, 7 octave 5 note C_, 10 note D_, 2 @@ -306,92 +307,92 @@ Music_SSAqua_branch_eaed5: note G_, 2 note B_, 6 note A_, 6 - note __, 2 + rest 2 octave 3 note B_, 1 octave 4 note C_, 1 - callchannel Music_SSAqua_branch_eaf88 + sound_call .sub1 note G_, 4 - note __, 4 + rest 4 note G_, 8 note A_, 8 note B_, 8 octave 5 note D#, 1 - vibrato $0, $0 - intensity $98 + vibrato 0, 0, 0 + volume_envelope 9, 8 note E_, 10 - vibrato $4, $23 - intensity $97 + vibrato 4, 2, 3 + volume_envelope 9, 7 note E_, 9 - vibrato $8, $23 + vibrato 8, 2, 3 note D_, 4 note C_, 4 octave 4 note G_, 4 note B_, 12 note A_, 12 - note __, 4 - dutycycle $0 + rest 4 + duty_cycle 0 note B_, 2 note A_, 2 - callchannel Music_SSAqua_branch_eafd5 - notetype $6, $b7 + sound_call .sub2 + note_type 6, 11, 7 note G#, 1 note A_, 11 note G_, 2 note F#, 2 note G_, 12 - note __, 4 - note __, 4 + rest 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note A_, 16 note A#, 12 note B_, 2 note A_, 2 - callchannel Music_SSAqua_branch_eafd5 - notetype $6, $b7 + sound_call .sub2 + note_type 6, 11, 7 note G#, 1 note A_, 11 note B_, 4 note G_, 12 - note __, 4 - note __, 4 + rest 4 + rest 4 octave 5 note C_, 4 note D_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 1 + rest 1 octave 4 note A#, 1 note B_, 4 note A_, 2 - note __, 2 + rest 2 note G_, 4 note E_, 2 - note __, 2 + rest 2 note F#, 8 note G_, 8 note A_, 8 - note __, 8 - loopchannel 0, Music_SSAqua_branch_eaed5 + rest 8 + sound_loop 0, .mainloop -Music_SSAqua_branch_eaf88: +.sub1: note D_, 6 octave 3 note B_, 1 @@ -408,51 +409,51 @@ Music_SSAqua_branch_eaf88: octave 4 note C_, 1 note D_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note B_, 6 note F#, 6 - note __, 4 - dutycycle $1 - notetype $6, $b7 + rest 4 + duty_cycle 1 + note_type 6, 11, 7 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 5 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 4 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - dutycycle $3 + rest 1 + duty_cycle 3 note E_, 2 note F#, 2 note G_, 12 @@ -464,43 +465,43 @@ Music_SSAqua_branch_eaf88: note G_, 4 note E_, 2 note F#, 2 - endchannel + sound_ret -Music_SSAqua_branch_eafd5: - notetype $c, $b7 +.sub2: + note_type 12, 11, 7 note B_, 10 note F#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_SSAqua_branch_eafe0: +.sub3: octave 3 note D_, 10 note E_, 1 - note __, 3 + rest 3 note D_, 1 - note __, 1 + rest 1 note C#, 12 octave 2 note A_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note C_, 8 - note __, 2 + rest 2 octave 2 note B_, 1 - note __, 3 + rest 3 note A_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_SSAqua_branch_eaff5: +.sub4: octave 5 note G_, 1 note D_, 1 @@ -573,9 +574,9 @@ Music_SSAqua_branch_eaff5: octave 4 note A_, 1 note G_, 1 - endchannel + sound_ret -Music_SSAqua_branch_eb03e: +.sub5: octave 5 note G_, 1 octave 4 @@ -599,36 +600,36 @@ Music_SSAqua_branch_eb03e: note C#, 1 octave 3 note G_, 1 - endchannel + sound_ret Music_SSAqua_Ch3: - stereopanning $ff - vibrato $8, $34 - notetype $6, $15 + stereo_panning TRUE, TRUE + vibrato 8, 3, 4 + note_type 6, 1, 5 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 -Music_SSAqua_branch_eb063: + rest 1 +.mainloop: note G_, 16 - note __, 8 + rest 8 note G_, 2 - note __, 2 - notetype $c, $15 + rest 2 + note_type 12, 1, 5 note G_, 2 note G_, 10 - note __, 4 - notetype $6, $15 + rest 4 + note_type 6, 1, 5 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 16 - note __, 8 + rest 8 note G_, 2 - note __, 2 - notetype $c, $15 + rest 2 + note_type 12, 1, 5 note G_, 2 note G_, 8 note B_, 1 @@ -641,531 +642,532 @@ Music_SSAqua_branch_eb063: note B_, 1 octave 4 note E_, 1 - callchannel Music_SSAqua_branch_eb14d - callchannel Music_SSAqua_branch_eb14d -Music_SSAqua_branch_eb08d: + sound_call .sub1 + sound_call .sub1 +.loop1: note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 - loopchannel 4, Music_SSAqua_branch_eb08d - callchannel Music_SSAqua_branch_eb172 - callchannel Music_SSAqua_branch_eb172 - callchannel Music_SSAqua_branch_eb230 + rest 1 + sound_loop 4, .loop1 + sound_call .sub2 + sound_call .sub2 + sound_call .sub3 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 - callchannel Music_SSAqua_branch_eb230 + rest 3 + sound_call .sub3 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 3 + rest 3 octave 3 note C_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note C_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note C#, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note C#, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - loopchannel 0, Music_SSAqua_branch_eb063 + rest 1 + sound_loop 0, .mainloop -Music_SSAqua_branch_eb14d: - notetype $6, $15 +.sub1: + note_type 6, 1, 5 octave 2 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 - note __, 2 + rest 2 octave 2 note G_, 2 - note __, 4 + rest 4 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 6 + rest 6 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 3 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 4 + rest 4 note G_, 1 - note __, 1 - endchannel + rest 1 + sound_ret -Music_SSAqua_branch_eb172: +.sub2: octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note G_, 2 - note __, 2 + rest 2 octave 4 note G_, 4 note F#, 4 note E_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note A#, 1 - note __, 3 + rest 3 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note A#, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 1 - note __, 3 + rest 3 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note A#, 1 - note __, 3 + rest 3 octave 2 note A#, 2 - note __, 2 + rest 2 octave 3 note A#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note E_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 3 note D#, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note D_, 1 - note __, 3 + rest 3 octave 3 note C#, 2 - note __, 2 + rest 2 octave 4 note B_, 4 note G_, 4 note E_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note C_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 2 note A_, 2 - note __, 2 + rest 2 octave 4 note E_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note G_, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 3 note D_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 - endchannel + rest 3 + sound_ret -Music_SSAqua_branch_eb230: +.sub3: octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note F#, 1 - note __, 3 + rest 3 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 + rest 3 octave 2 note B_, 2 - note __, 2 + rest 2 octave 4 note D#, 1 - note __, 3 - endchannel + rest 3 + sound_ret Music_SSAqua_Ch4: - togglenoise $3 - notetype $c - note __, 2 -Music_SSAqua_branch_eb24e: - note G#, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - note G#, 1 - note G_, 1 - loopchannel 12, Music_SSAqua_branch_eb24e - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2bb - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2bb - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2bb - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2c7 - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2bb - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2ae - callchannel Music_SSAqua_branch_eb2c7 - loopchannel 0, Music_SSAqua_branch_eb24e + toggle_noise 3 + drum_speed 12 + rest 2 +.mainloop: +.loop1: + drum_note 9, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 9, 1 + drum_note 8, 1 + sound_loop 12, .loop1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub3 + sound_loop 0, .mainloop -Music_SSAqua_branch_eb2ae: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - endchannel +.sub1: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + sound_ret -Music_SSAqua_branch_eb2bb: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note F#, 2 - endchannel +.sub2: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 7, 2 + sound_ret -Music_SSAqua_branch_eb2c7: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 1 - note D_, 1 - note D_, 2 - note D_, 2 - note C_, 2 - endchannel +.sub3: + drum_note 11, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 3, 2 + drum_note 3, 2 + drum_note 1, 2 + sound_ret diff --git a/audio/music/successfulcapture.asm b/audio/music/successfulcapture.asm index 1b53f4a1..2c4e355c 100644 --- a/audio/music/successfulcapture.asm +++ b/audio/music/successfulcapture.asm @@ -1,22 +1,23 @@ Music_SuccessfulCapture: - musicheader 3, 1, Music_SuccessfulCapture_Ch1 - musicheader 1, 2, Music_SuccessfulCapture_Ch2 - musicheader 1, 3, Music_SuccessfulCapture_Ch3 + channel_count 3 + channel 1, Music_SuccessfulCapture_Ch1 + channel 2, Music_SuccessfulCapture_Ch2 + channel 3, Music_SuccessfulCapture_Ch3 Music_SuccessfulCapture_Ch1: tempo 126 - volume $77 - dutycycle $3 - tone $0001 - notetype $c, $a1 - jumpchannel Music_SuccessfulCapture_branch_f4536 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + note_type 12, 10, 1 + sound_jump Music_WildPokemonVictory_Ch1.body Music_SuccessfulCapture_Ch2: - vibrato $12, $24 - notetype $c, $c1 - dutycycle $2 - jumpchannel Music_SuccessfulCapture_branch_f4585 + vibrato 18, 2, 4 + note_type 12, 12, 1 + duty_cycle 2 + sound_jump Music_WildPokemonVictory_Ch2.body Music_SuccessfulCapture_Ch3: - notetype $c, $25 - jumpchannel Music_SuccessfulCapture_branch_f45cf + note_type 12, 2, 5 + sound_jump Music_WildPokemonVictory_Ch3.body diff --git a/audio/music/surf.asm b/audio/music/surf.asm index c3948f5f..ac1faed5 100644 --- a/audio/music/surf.asm +++ b/audio/music/surf.asm @@ -1,78 +1,79 @@ Music_Surf: - musicheader 3, 1, Music_Surf_Ch1 - musicheader 1, 2, Music_Surf_Ch2 - musicheader 1, 3, Music_Surf_Ch3 + channel_count 3 + channel 1, Music_Surf_Ch1 + channel 2, Music_Surf_Ch2 + channel 3, Music_Surf_Ch3 - db $3 + db $3 ; unused Music_Surf_Ch1: tempo 108 - volume $77 - notetype $c, $a7 - stereopanning $f -Music_Surf_branch_f519e: - dutycycle $2 - vibrato $10, $24 - intensity $73 + volume 7, 7 + note_type 12, 10, 7 + stereo_panning FALSE, TRUE +.mainloop: + duty_cycle 2 + vibrato 16, 2, 4 + volume_envelope 7, 3 octave 3 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - intensity $73 + rest 1 + volume_envelope 7, 3 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - intensity $73 + rest 1 + volume_envelope 7, 3 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D#, 1 - intensity $93 - note __, 1 + volume_envelope 9, 3 + rest 1 note G#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 - intensity $a7 + rest 1 + volume_envelope 10, 7 note F_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D#, 1 - intensity $b7 - note __, 1 + volume_envelope 11, 7 + rest 1 note A#, 2 note G#, 2 note F_, 2 note D_, 2 - notetype $8, $c7 + note_type 8, 12, 7 octave 2 note A#, 2 octave 3 note D_, 2 note F_, 2 - intensity $f7 + volume_envelope 15, 7 note G#, 2 note A#, 2 octave 4 note D_, 2 - dutycycle $0 - callchannel Music_Surf_branch_f5233 - dutycycle $1 - notetype $8, $a7 - callchannel Music_Surf_branch_f5233 - callchannel Music_Surf_branch_f5293 + duty_cycle 0 + sound_call .sub1 + duty_cycle 1 + note_type 8, 10, 7 + sound_call .sub1 + sound_call .sub2 octave 4 note C_, 2 octave 3 @@ -85,26 +86,26 @@ Music_Surf_branch_f519e: note C_, 2 note D#, 2 note G_, 2 - dutycycle $1 - notetype $6, $97 - callchannel Music_Surf_branch_f5293 - intensity $a8 + duty_cycle 1 + note_type 6, 9, 7 + sound_call .sub2 + volume_envelope 10, 8 note G#, 6 note A_, 6 note A#, 3 octave 4 note D_, 3 - intensity $a8 - dutycycle $1 - callchannel Music_Surf_branch_f52d9 + volume_envelope 10, 8 + duty_cycle 1 + sound_call .sub3 octave 3 note D#, 8 note G#, 8 note D#, 8 - dutycycle $3 - notetype $8, $98 - callchannel Music_Surf_branch_f52d9 - notetype $c, $a7 + duty_cycle 3 + note_type 8, 9, 8 + sound_call .sub3 + note_type 12, 10, 7 octave 3 note D#, 12 octave 2 @@ -117,89 +118,89 @@ Music_Surf_branch_f519e: note B_, 2 octave 3 note D#, 2 - loopchannel 0, Music_Surf_branch_f519e + sound_loop 0, .mainloop -Music_Surf_branch_f5233: - notetype $c, $a7 +.sub1: + note_type 12, 10, 7 octave 3 note D#, 4 note A#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note D#, 4 note A#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note C#, 4 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note C#, 4 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 octave 3 note C_, 4 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note C_, 4 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 - notetype $6, $a7 + rest 1 + note_type 6, 10, 7 octave 3 note A#, 1 note B_, 15 @@ -211,9 +212,9 @@ Music_Surf_branch_f5233: note F_, 8 note C#, 4 note D_, 4 - endchannel + sound_ret -Music_Surf_branch_f5293: +.sub2: octave 4 note G#, 16 note D#, 4 @@ -226,7 +227,7 @@ Music_Surf_branch_f5293: note D#, 4 note G_, 4 note G#, 4 - notetype $8, $92 + note_type 8, 9, 2 note A#, 2 note F_, 2 note D_, 2 @@ -251,7 +252,7 @@ Music_Surf_branch_f5293: note A#, 2 octave 4 note D_, 2 - notetype $6, $97 + note_type 6, 9, 7 note C#, 1 note D_, 15 note G_, 4 @@ -264,7 +265,7 @@ Music_Surf_branch_f5293: note G_, 4 note A_, 4 note A#, 4 - notetype $8, $92 + note_type 8, 9, 2 octave 5 note C_, 2 octave 4 @@ -277,16 +278,16 @@ Music_Surf_branch_f5293: note C_, 2 octave 3 note G_, 2 - endchannel + sound_ret -Music_Surf_branch_f52d9: +.sub3: octave 3 note A#, 3 note G_, 3 note A#, 3 octave 4 note D#, 9 - notetype $6, $58 + note_type 6, 5, 8 note D_, 1 note C#, 1 note C_, 1 @@ -296,7 +297,7 @@ Music_Surf_branch_f52d9: note A_, 1 note G#, 1 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note D#, 4 note D_, 4 note D#, 4 @@ -316,7 +317,7 @@ Music_Surf_branch_f52d9: octave 4 note C_, 4 note F_, 12 - intensity $58 + volume_envelope 5, 8 note D#, 1 note D_, 1 note C#, 1 @@ -326,7 +327,7 @@ Music_Surf_branch_f52d9: note A#, 1 note A_, 1 note G_, 1 - intensity $a8 + volume_envelope 10, 8 note G#, 8 octave 4 note D#, 4 @@ -336,31 +337,31 @@ Music_Surf_branch_f52d9: note D#, 8 octave 2 note B_, 8 - endchannel + sound_ret Music_Surf_Ch2: -Music_Surf_branch_f5317: - notetype $c, $c2 - stereopanning $f0 - dutycycle $2 - vibrato $14, $23 -Music_Surf_branch_f5321: +.mainloop: + note_type 12, 12, 2 + stereo_panning TRUE, FALSE + duty_cycle 2 + vibrato 20, 2, 3 +.loop1: octave 1 note A#, 4 octave 2 note A#, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 - loopchannel 3, Music_Surf_branch_f5321 + rest 3 + sound_loop 3, .loop1 octave 1 note A#, 4 octave 2 note F_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 -Music_Surf_branch_f5333: + rest 3 +.loop2: note D#, 4 note G_, 2 note G#, 2 @@ -395,56 +396,56 @@ Music_Surf_branch_f5333: note B_, 4 note A#, 4 note G#, 4 - loopchannel 2, Music_Surf_branch_f5333 - intensity $c7 - callchannel Music_Surf_branch_f53b2 + sound_loop 2, .loop2 + volume_envelope 12, 7 + sound_call .sub1 note D#, 4 note D_, 4 note C#, 4 - callchannel Music_Surf_branch_f53b2 + sound_call .sub1 note D_, 4 note D#, 4 octave 1 note A#, 4 - notetype $6, $b8 - callchannel Music_Surf_branch_f53d6 - dutycycle $1 - intensity $b8 - callchannel Music_Surf_branch_f53e8 - dutycycle $2 - callchannel Music_Surf_branch_f53f3 - dutycycle $1 - intensity $b8 - callchannel Music_Surf_branch_f5404 + note_type 6, 11, 8 + sound_call .sub2 + duty_cycle 1 + volume_envelope 11, 8 + sound_call .sub3 + duty_cycle 2 + sound_call .sub4 + duty_cycle 1 + volume_envelope 11, 8 + sound_call .sub5 octave 3 note B_, 16 octave 4 note C#, 8 - pitchoffset 0, CC - dutycycle $3 - callchannel Music_Surf_branch_f53d6 - intensity $b8 - dutycycle $1 - callchannel Music_Surf_branch_f53e8 - dutycycle $3 - callchannel Music_Surf_branch_f53f3 - intensity $b8 - dutycycle $1 - callchannel Music_Surf_branch_f5404 - pitchoffset 0, C_ - notetype $c, $b8 + transpose 0, 12 + duty_cycle 3 + sound_call .sub2 + volume_envelope 11, 8 + duty_cycle 1 + sound_call .sub3 + duty_cycle 3 + sound_call .sub4 + volume_envelope 11, 8 + duty_cycle 1 + sound_call .sub5 + transpose 0, 0 + note_type 12, 11, 8 octave 4 note B_, 12 - dutycycle $2 + duty_cycle 2 note A#, 4 note G#, 4 note D#, 4 note G#, 4 note A#, 4 note B_, 4 - loopchannel 0, Music_Surf_branch_f5317 + sound_loop 0, .mainloop -Music_Surf_branch_f53b2: +.sub1: octave 1 note G#, 4 octave 3 @@ -480,15 +481,15 @@ Music_Surf_branch_f53b2: octave 3 note F_, 4 note G_, 4 - endchannel + sound_ret -Music_Surf_branch_f53d6: +.sub2: octave 4 note F_, 4 note D#, 4 note F_, 4 note G_, 12 - intensity $58 + volume_envelope 5, 8 note F#, 1 note F_, 1 note E_, 1 @@ -499,9 +500,9 @@ Music_Surf_branch_f53d6: octave 3 note B_, 1 note A_, 1 - endchannel + sound_ret -Music_Surf_branch_f53e8: +.sub3: note A#, 7 octave 4 note C_, 8 @@ -512,15 +513,15 @@ Music_Surf_branch_f53e8: octave 4 note C_, 16 note G_, 8 - endchannel + sound_ret -Music_Surf_branch_f53f3: +.sub4: note F#, 1 note G_, 3 note F_, 4 note G_, 4 note G#, 12 - intensity $58 + volume_envelope 5, 8 note G_, 1 note F#, 1 note F_, 1 @@ -530,9 +531,9 @@ Music_Surf_branch_f53f3: note C#, 1 octave 3 note B_, 1 - endchannel + sound_ret -Music_Surf_branch_f5404: +.sub5: octave 4 note C_, 8 note G_, 4 @@ -540,13 +541,13 @@ Music_Surf_branch_f5404: note A#, 8 note G#, 8 note D#, 8 - endchannel + sound_ret Music_Surf_Ch3: -Music_Surf_branch_f540c: - stereopanning $ff - notetype $c, $15 - vibrato $16, $23 +.mainloop: + stereo_panning TRUE, TRUE + note_type 12, 1, 5 + vibrato 22, 2, 3 octave 4 note A#, 12 octave 5 @@ -556,12 +557,12 @@ Music_Surf_branch_f540c: note F_, 4 note G_, 4 note G#, 4 - intensity $12 + volume_envelope 1, 2 note A#, 12 - note __, 4 + rest 4 note G#, 4 note G_, 4 - notetype $6, $12 + note_type 6, 1, 2 note F#, 1 note G_, 15 note G#, 4 @@ -569,24 +570,24 @@ Music_Surf_branch_f540c: note F_, 16 octave 4 note A#, 8 - notetype $c, $12 + note_type 12, 1, 2 octave 5 note G#, 16 note G_, 4 note F_, 4 - notetype $6, $12 + note_type 6, 1, 2 note E_, 1 note F_, 15 note G_, 4 note F_, 4 note D#, 16 note F_, 8 - notetype $c, $14 + note_type 12, 1, 4 note A#, 12 - note __, 4 + rest 4 note G#, 4 note G_, 4 - notetype $6, $14 + note_type 6, 1, 4 note F#, 1 note G_, 15 note G#, 4 @@ -594,12 +595,12 @@ Music_Surf_branch_f540c: note F_, 16 octave 4 note A#, 8 - notetype $c, $14 + note_type 12, 1, 4 octave 5 note G#, 16 note G_, 4 note F_, 4 - notetype $6, $14 + note_type 6, 1, 4 note E_, 1 note F_, 15 note G_, 4 @@ -607,11 +608,11 @@ Music_Surf_branch_f540c: note D#, 16 octave 6 note D#, 8 - notetype $c, $13 + note_type 12, 1, 3 note C_, 16 note D_, 4 note D#, 4 - notetype $6, $13 + note_type 6, 1, 3 note D_, 1 note D#, 15 note D_, 4 @@ -620,10 +621,10 @@ Music_Surf_branch_f540c: note D_, 16 octave 6 note D_, 8 - notetype $c, $13 + note_type 12, 1, 3 octave 5 note A#, 12 - notetype $6, $13 + note_type 6, 1, 3 note A_, 1 note A#, 7 octave 6 @@ -634,12 +635,12 @@ Music_Surf_branch_f540c: note D_, 4 note D#, 16 note D_, 8 - notetype $c, $14 + note_type 12, 1, 4 note C_, 12 note C_, 4 note D_, 4 note D#, 4 - notetype $6, $14 + note_type 6, 1, 4 note D_, 1 note D#, 15 note D_, 4 @@ -648,22 +649,22 @@ Music_Surf_branch_f540c: note D_, 16 octave 6 note D_, 8 - notetype $c, $14 + note_type 12, 1, 4 octave 5 note A#, 12 - notetype $6, $14 + note_type 6, 1, 4 note A_, 1 note A#, 7 octave 6 note C_, 8 note D_, 8 - notetype $c, $14 + note_type 12, 1, 4 note F_, 12 note G_, 8 octave 5 note A#, 4 - intensity $15 - callchannel Music_Surf_branch_f54c8 + volume_envelope 1, 5 + sound_call .sub1 octave 2 note B_, 4 octave 3 @@ -672,7 +673,7 @@ Music_Surf_branch_f540c: note G#, 4 note A#, 4 note B_, 4 - callchannel Music_Surf_branch_f54c8 + sound_call .sub1 octave 2 note B_, 4 octave 3 @@ -685,38 +686,38 @@ Music_Surf_branch_f540c: note D#, 8 octave 2 note B_, 4 - loopchannel 0, Music_Surf_branch_f540c + sound_loop 0, .mainloop -Music_Surf_branch_f54c8: +.sub1: octave 3 note D#, 4 note G_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note D#, 4 note G_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note C#, 4 note G_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note C#, 4 note G_, 1 - note __, 3 + rest 3 note A#, 1 - note __, 3 + rest 3 note C_, 4 note F_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 + rest 3 note C_, 4 note F_, 1 - note __, 3 + rest 3 note G#, 1 - note __, 3 - endchannel + rest 3 + sound_ret diff --git a/audio/music/tintower.asm b/audio/music/tintower.asm index 3871f4ee..75030677 100644 --- a/audio/music/tintower.asm +++ b/audio/music/tintower.asm @@ -1,18 +1,19 @@ 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 + channel_count 4 + channel 1, Music_TinTower_Ch1 + channel 2, Music_TinTower_Ch2 + channel 3, Music_TinTower_Ch3 + channel 4, Music_TinTower_Ch4 Music_TinTower_Ch1: tempo 208 - volume $77 - dutycycle $3 - tone $0004 - vibrato $8, $45 -Music_TinTower_branch_f682a: - stereopanning $f0 - notetype $c, $a5 + volume 7, 7 + duty_cycle 3 + pitch_offset 4 + vibrato 8, 4, 5 +.mainloop: + stereo_panning TRUE, FALSE + note_type 12, 10, 5 octave 3 note G_, 4 note C_, 4 @@ -63,25 +64,25 @@ Music_TinTower_branch_f682a: note G_, 4 octave 3 note G_, 8 - intensity $a2 + volume_envelope 10, 2 octave 2 note G_, 4 note G_, 12 note G_, 4 note G_, 8 - intensity $a7 + volume_envelope 10, 7 note G_, 4 - intensity $a2 + volume_envelope 10, 2 note G#, 4 note G#, 8 - intensity $a7 + volume_envelope 10, 7 note G_, 4 - intensity $a2 + volume_envelope 10, 2 note G#, 4 note G#, 8 - intensity $a7 + volume_envelope 10, 7 note A#, 4 - intensity $a2 + volume_envelope 10, 2 note G_, 4 note G_, 12 note G_, 4 @@ -90,19 +91,19 @@ Music_TinTower_branch_f682a: note G_, 12 note G_, 4 note G_, 8 - intensity $a5 + volume_envelope 10, 5 octave 3 note A#, 4 - loopchannel 0, Music_TinTower_branch_f682a + sound_loop 0, .mainloop Music_TinTower_Ch2: - dutycycle $3 - tone $0002 - vibrato $18, $44 -Music_TinTower_branch_f6893: - stereopanning $ff -Music_TinTower_branch_f6895: - notetype $c, $b5 + duty_cycle 3 + pitch_offset 2 + vibrato 24, 4, 4 +.mainloop: + stereo_panning TRUE, TRUE +.loop1: + note_type 12, 11, 5 octave 4 note C_, 4 note C_, 4 @@ -131,28 +132,28 @@ Music_TinTower_branch_f6895: note C_, 4 octave 4 note C_, 8 - stereopanning $f - loopchannel 2, Music_TinTower_branch_f6895 - intensity $b2 + stereo_panning FALSE, TRUE + sound_loop 2, .loop1 + volume_envelope 11, 2 octave 3 note C_, 4 note C_, 12 note C_, 4 note C_, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $b2 + volume_envelope 11, 2 note C#, 4 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $b2 + volume_envelope 11, 2 note C#, 4 note C#, 8 - intensity $b7 + volume_envelope 11, 7 note D#, 4 - intensity $90 - stereopanning $ff + volume_envelope 9, 0 + stereo_panning TRUE, TRUE note G_, 4 octave 4 note C_, 4 @@ -180,17 +181,17 @@ Music_TinTower_branch_f6895: note C_, 4 octave 4 note C_, 6 - intensity $95 + volume_envelope 9, 5 note C#, 2 - loopchannel 0, Music_TinTower_branch_f6893 + sound_loop 0, .mainloop Music_TinTower_Ch3: - notetype $c, $14 -Music_TinTower_branch_f68fb: - note __, 16 - note __, 16 - note __, 16 - note __, 10 + note_type 12, 1, 4 +.mainloop: + rest 16 + rest 16 + rest 16 + rest 10 octave 2 note G_, 2 note G#, 2 @@ -212,80 +213,80 @@ Music_TinTower_branch_f68fb: note C_, 8 octave 3 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 11 + rest 11 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 7 + rest 7 note C_, 4 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 7 + rest 7 note C_, 4 note C#, 1 - note __, 3 + rest 3 note C#, 1 - note __, 7 + rest 7 note D#, 4 - stereopanning $f + stereo_panning FALSE, TRUE note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 11 + rest 11 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 3 - stereopanning $ff + rest 3 + stereo_panning TRUE, TRUE octave 2 note A#, 2 octave 3 note C_, 2 note C#, 2 note D#, 2 - stereopanning $f + stereo_panning FALSE, TRUE note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 11 + rest 11 note C_, 1 - note __, 3 + rest 3 note C_, 1 - note __, 11 - stereopanning $ff - loopchannel 0, Music_TinTower_branch_f68fb + rest 11 + stereo_panning TRUE, TRUE + sound_loop 0, .mainloop Music_TinTower_Ch4: - togglenoise $0 - notetype $c -Music_TinTower_branch_f694c: - stereopanning $f - note G_, 2 - stereopanning $f0 - note G_, 1 - note G_, 1 - stereopanning $f - note G_, 2 - stereopanning $f0 - note F_, 4 - stereopanning $f - note G_, 2 - note G_, 2 - note F_, 2 - stereopanning $f0 - note G_, 2 - stereopanning $f - note G_, 1 - note G_, 1 - stereopanning $f0 - note G_, 2 - stereopanning $f - note F_, 4 - stereopanning $f0 - note G_, 2 - note G_, 2 - note F_, 2 - loopchannel 0, Music_TinTower_branch_f694c + toggle_noise 0 + drum_speed 12 +.mainloop: + stereo_panning FALSE, TRUE + drum_note 8, 2 + stereo_panning TRUE, FALSE + drum_note 8, 1 + drum_note 8, 1 + stereo_panning FALSE, TRUE + drum_note 8, 2 + stereo_panning TRUE, FALSE + drum_note 6, 4 + stereo_panning FALSE, TRUE + drum_note 8, 2 + drum_note 8, 2 + drum_note 6, 2 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning FALSE, TRUE + drum_note 8, 1 + drum_note 8, 1 + stereo_panning TRUE, FALSE + drum_note 8, 2 + stereo_panning FALSE, TRUE + drum_note 6, 4 + stereo_panning TRUE, FALSE + drum_note 8, 2 + drum_note 8, 2 + drum_note 6, 2 + sound_loop 0, .mainloop diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm index 4eb7c49a..581fd13c 100644 --- a/audio/music/titlescreen.asm +++ b/audio/music/titlescreen.asm @@ -1,17 +1,18 @@ 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 + channel_count 4 + channel 1, Music_TitleScreen_Ch1 + channel 2, Music_TitleScreen_Ch2 + channel 3, Music_TitleScreen_Ch3 + channel 4, Music_TitleScreen_Ch4 Music_TitleScreen_Ch1: tempo 256 - volume $77 - dutycycle $3 - tone $0002 - vibrato $10, $12 - stereopanning $f0 - notetype $c, $a7 + volume 7, 7 + dutycycle 3 + pitch_offset 2 + vibrato 16, 1, 2 + stereo_panning TRUE, FALSE + note_type 12, 10, 7 octave 3 note D_, 6 octave 2 @@ -19,9 +20,9 @@ Music_TitleScreen_Ch1: note B_, 4 octave 3 note D_, 4 - intensity $a0 + volume_envelope 10, 0 note C_, 6 - intensity $a7 + volume_envelope 10, 7 note C_, 6 note D#, 4 note D_, 6 @@ -36,35 +37,35 @@ Music_TitleScreen_Ch1: tempo 134 octave 2 note G_, 1 - note __, 2 + rest 2 note A_, 1 note B_, 8 note G_, 4 octave 3 note C_, 1 - note __, 2 + rest 2 note D_, 1 note E_, 8 note C_, 4 octave 2 note B_, 1 - note __, 2 + rest 2 octave 3 note C_, 1 octave 2 note B_, 8 note A_, 4 note A_, 1 - note __, 2 + rest 2 note B_, 1 octave 3 note C_, 6 note E_, 4 note F#, 2 - stereopanning $ff + stereo_panning TRUE, TRUE octave 4 note G_, 1 - stereopanning $f0 + stereo_panning TRUE, FALSE octave 3 note D_, 5 octave 2 @@ -78,14 +79,14 @@ Music_TitleScreen_Ch1: note F_, 6 note C_, 4 note D_, 6 - intensity $b7 + volume_envelope 11, 7 note D#, 1 note E_, 1 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype $8, $a7 + note_type 8, 10, 7 note C_, 4 octave 2 note B_, 4 @@ -105,22 +106,22 @@ Music_TitleScreen_Ch1: note E_, 4 note E_, 4 note C_, 4 - notetype $8, $a0 + note_type 8, 10, 0 octave 2 note B_, 6 - notetype $8, $a7 + note_type 8, 10, 7 note B_, 6 - notetype $8, $a7 + note_type 8, 10, 7 octave 3 note F_, 4 note E_, 4 note C_, 4 - notetype $8, $a0 + note_type 8, 10, 0 note D_, 6 - notetype $8, $a7 + note_type 8, 10, 7 note D_, 6 - notetype $8, $a7 - note __, 3 + note_type 8, 10, 7 + rest 3 octave 2 note B_, 3 octave 3 @@ -138,14 +139,14 @@ Music_TitleScreen_Ch1: note F_, 9 note C_, 6 note D_, 9 - notetype $c, $b7 + note_type 12, 11, 7 note D#, 1 note E_, 1 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype $8, $a7 + note_type 8, 10, 7 note C_, 4 octave 2 note B_, 4 @@ -156,7 +157,7 @@ Music_TitleScreen_Ch1: note B_, 3 octave 3 note D_, 9 - notetype $8, $b7 + note_type 8, 11, 7 note G_, 3 note A_, 4 note G_, 4 @@ -168,29 +169,29 @@ Music_TitleScreen_Ch1: note G_, 3 note D_, 6 note G_, 3 - notetype $8, $54 + note_type 8, 5, 4 octave 2 note G_, 3 note B_, 3 - notetype $8, $94 + note_type 8, 9, 4 octave 3 note D_, 3 note G_, 3 tempo 136 - notetype $8, $b4 + note_type 8, 11, 4 note F_, 3 note A_, 3 - notetype $8, $d4 + note_type 8, 13, 4 octave 4 note C_, 3 note F_, 3 tempo 138 - notetype $8, $b4 + note_type 8, 11, 4 note D_, 9 note C_, 9 octave 3 note A#, 6 - notetype $c, $b7 + note_type 12, 11, 7 note F_, 1 note E_, 1 note D_, 1 @@ -202,7 +203,7 @@ Music_TitleScreen_Ch1: note E_, 6 octave 3 note G_, 2 - notetype $8, $b7 + note_type 8, 11, 7 note A_, 4 note G_, 4 note F_, 4 @@ -212,33 +213,33 @@ Music_TitleScreen_Ch1: tempo 136 note C#, 6 tempo 134 - callchannel Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 4 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 4 note C_, 4 note C_, 4 note C#, 4 - callchannel Music_TitleScreen_branch_eb96d + sound_call .sub1 octave 3 note E_, 4 note E_, 4 note C_, 4 - notetype $c, $a0 + note_type 12, 10, 0 note D_, 6 - notetype $c, $a7 + note_type 12, 10, 7 note D_, 10 - intensity $a0 + volume_envelope 10, 0 note C_, 8 - intensity $a7 + volume_envelope 10, 7 note C_, 8 - intensity $a0 + volume_envelope 10, 0 octave 2 note B_, 8 - intensity $a7 + volume_envelope 10, 7 note B_, 8 octave 3 note C_, 8 @@ -257,100 +258,100 @@ Music_TitleScreen_Ch1: note F#, 1 note F_, 8 note E_, 8 - intensity $a0 + volume_envelope 10, 0 note D_, 16 - intensity $a7 + volume_envelope 10, 7 note D_, 16 - intensity $a3 + volume_envelope 10, 3 octave 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - notetype $8, $b2 + rest 3 + note_type 8, 11, 2 note A_, 2 note A_, 2 note A_, 2 note A_, 2 note A_, 2 note F#, 2 - notetype $c, $b7 + note_type 12, 11, 7 note G_, 1 - note __, 3 + rest 3 octave 1 note G_, 1 - note __, 11 - endchannel + rest 11 + sound_ret -Music_TitleScreen_branch_eb96d: - notetype $c, $c3 +.sub1: + note_type 12, 12, 3 note D_, 1 -Music_TitleScreen_branch_eb971: - note __, 1 +.sub1loop1: + rest 1 octave 2 note D_, 1 octave 1 note A_, 1 octave 2 note D_, 1 - loopchannel 5, Music_TitleScreen_branch_eb971 - note __, 1 + sound_loop 5, .sub1loop1 + rest 1 note D_, 1 octave 1 note A_, 1 - notetype $8, $b7 - endchannel + note_type 8, 11, 7 + sound_ret Music_TitleScreen_Ch2: - dutycycle $3 - vibrato $14, $12 - notetype $c, $c7 + duty_cycle 3 + vibrato 20, 1, 2 + note_type 12, 12, 7 octave 3 note G_, 6 note D_, 2 note D_, 4 note G_, 4 - intensity $b0 + volume_envelope 11, 0 note F_, 8 - intensity $b7 + volume_envelope 11, 7 note F_, 8 - intensity $c7 + volume_envelope 12, 7 note G_, 6 note D_, 2 note D_, 4 note G_, 4 - intensity $b0 + volume_envelope 11, 0 note G#, 4 - intensity $b7 + volume_envelope 11, 7 note G#, 4 - intensity $b0 + volume_envelope 11, 0 octave 4 note C_, 4 - intensity $b7 + volume_envelope 11, 7 note C_, 4 - intensity $c2 + volume_envelope 12, 2 octave 3 note B_, 1 - note __, 2 + rest 2 note A_, 1 - intensity $b0 + volume_envelope 11, 0 note G_, 6 - intensity $b7 + volume_envelope 11, 7 note G_, 6 - note __, 16 - note __, 16 - intensity $c7 + rest 16 + rest 16 + volume_envelope 12, 7 octave 4 note C_, 1 - note __, 2 + rest 2 note D_, 1 note E_, 8 note F#, 2 @@ -361,26 +362,26 @@ Music_TitleScreen_Ch2: note B_, 2 octave 4 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 2 note A_, 4 note F_, 4 - stereopanning $ff - intensity $c7 + stereo_panning TRUE, TRUE + volume_envelope 12, 7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 2 note A_, 6 octave 3 note C_, 2 - stereopanning $f - intensity $a3 + stereo_panning FALSE, TRUE + volume_envelope 10, 3 octave 4 note D_, 4 note D_, 2 @@ -388,21 +389,21 @@ Music_TitleScreen_Ch2: note C_, 2 octave 3 note B_, 4 - stereopanning $ff - intensity $c7 + stereo_panning TRUE, TRUE + volume_envelope 12, 7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 2 note A_, 2 note F_, 4 note A_, 2 - stereopanning $ff - notetype $8, $c7 + stereo_panning TRUE, TRUE + note_type 8, 12, 7 octave 4 note C_, 4 octave 3 @@ -410,123 +411,123 @@ Music_TitleScreen_Ch2: octave 4 note C_, 4 note D_, 12 - stereopanning $f0 - notetype $8, $b7 + stereo_panning TRUE, FALSE + note_type 8, 11, 7 octave 2 note A_, 9 - stereopanning $f - notetype $c, $c7 + stereo_panning FALSE, TRUE + note_type 12, 12, 7 note G_, 1 note A_, 1 note B_, 6 note E_, 1 note F#, 1 note G_, 4 - notetype $c, $4b + note_type 12, 4, -3 note A_, 4 - stereopanning $ff - notetype $c, $c7 + stereo_panning TRUE, TRUE + note_type 12, 12, 7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 2 note A_, 2 note F_, 6 - stereopanning $ff - intensity $c7 + stereo_panning TRUE, TRUE + volume_envelope 12, 7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - stereopanning $f0 - intensity $97 + stereo_panning TRUE, FALSE + volume_envelope 9, 7 octave 3 note C_, 2 octave 2 note A_, 6 note B_, 6 note G_, 2 - notetype $8, $c7 + note_type 8, 12, 7 note F_, 4 note G_, 4 note F_, 4 - stereopanning $ff + stereo_panning TRUE, TRUE octave 3 note G_, 9 note B_, 3 octave 4 note D_, 12 - stereopanning $f0 - notetype $8, $a7 + stereo_panning TRUE, FALSE + note_type 8, 10, 7 octave 3 note D_, 4 note C_, 4 note D_, 4 - stereopanning $ff - notetype $8, $c7 + stereo_panning TRUE, TRUE + note_type 8, 12, 7 octave 4 note F_, 4 note E_, 4 note F_, 4 note G_, 9 note A#, 3 - notetype $c, $b0 + note_type 12, 11, 0 note G_, 8 - notetype $c, $b7 + note_type 12, 11, 7 note G_, 8 - intensity $c6 + volume_envelope 12, 6 note A_, 4 - intensity $5d + volume_envelope 5, -5 note A_, 4 - intensity $c7 + volume_envelope 12, 7 note A#, 6 - intensity $c3 + volume_envelope 12, 3 note F_, 2 - intensity $c7 + volume_envelope 12, 7 note F_, 8 - intensity $a7 + volume_envelope 10, 7 octave 3 note A#, 8 - intensity $c7 + volume_envelope 12, 7 octave 4 note A#, 4 note B_, 4 octave 5 note C_, 6 - intensity $c3 + volume_envelope 12, 3 octave 4 note G_, 2 - intensity $c7 + volume_envelope 12, 7 note G_, 8 - intensity $a7 + volume_envelope 10, 7 octave 3 note E_, 8 - intensity $c7 + volume_envelope 12, 7 octave 5 note C_, 4 note C#, 4 - tone $0001 - stereopanning $f - callchannel Music_TitleScreen_branch_ebae7 + pitch_offset 1 + stereo_panning FALSE, TRUE + sound_call .sub1 note C#, 4 - callchannel Music_TitleScreen_branch_ebae7 + sound_call .sub1 note C#, 4 - callchannel Music_TitleScreen_branch_ebae7 + sound_call .sub1 octave 4 note A_, 4 - stereopanning $ff - tone 0 - notetype $c, $b0 + stereo_panning TRUE, TRUE + pitch_offset 0 + note_type 12, 11, 0 octave 3 note B_, 6 - notetype $c, $b7 + note_type 12, 11, 7 note B_, 10 - intensity $c7 + volume_envelope 12, 7 note A_, 8 note F_, 6 note E_, 1 @@ -535,11 +536,11 @@ Music_TitleScreen_Ch2: note G_, 8 note F_, 8 note A_, 8 - intensity $b0 + volume_envelope 11, 0 note G_, 8 - intensity $b7 + volume_envelope 11, 7 note G_, 8 - intensity $c7 + volume_envelope 12, 7 note F_, 8 octave 4 note F_, 6 @@ -553,25 +554,25 @@ Music_TitleScreen_Ch2: note A_, 6 note F_, 1 note A_, 1 - intensity $b0 + volume_envelope 11, 0 note G_, 16 - intensity $b7 + volume_envelope 11, 7 note G_, 16 - intensity $c2 + volume_envelope 12, 2 octave 4 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - intensity $90 + rest 3 + volume_envelope 9, 0 note G_, 4 - notetype $8, $c2 + note_type 8, 12, 2 octave 3 note F_, 2 note F_, 2 @@ -579,41 +580,41 @@ Music_TitleScreen_Ch2: note F_, 2 note F_, 2 note F#, 2 - notetype $c, $c7 + note_type 12, 12, 7 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 1 - note __, 11 - endchannel + rest 11 + sound_ret -Music_TitleScreen_branch_ebae7: - notetype $c, $b2 +.sub1: + note_type 12, 11, 2 note D_, 1 -Music_TitleScreen_branch_ebaeb: +.sub1loop1: octave 3 note A_, 1 octave 4 note D_, 1 note A_, 1 note D_, 1 - loopchannel 5, Music_TitleScreen_branch_ebaeb + sound_loop 5, .sub1loop1 octave 3 note A_, 1 octave 4 note D_, 1 note A_, 1 - notetype $8, $b7 + note_type 8, 11, 7 octave 5 note C_, 4 note C_, 4 - endchannel + sound_ret Music_TitleScreen_Ch3: - stereopanning $f - vibrato $10, $14 - tone $0001 - notetype $c, $16 + stereo_panning FALSE, TRUE + vibrato 16, 1, 4 + pitch_offset 1 + note_type 12, 1, 6 octave 3 note B_, 6 note D_, 2 @@ -645,10 +646,10 @@ Music_TitleScreen_Ch3: note D_, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 note G_, 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 note G_, 2 note D_, 2 @@ -658,10 +659,10 @@ Music_TitleScreen_Ch3: note B_, 1 octave 2 note C_, 1 - note __, 1 + rest 1 note F_, 2 note C_, 1 - note __, 1 + rest 1 note C_, 2 note F_, 2 note C_, 2 @@ -669,10 +670,10 @@ Music_TitleScreen_Ch3: note D_, 1 note C#, 1 note D_, 1 - note __, 1 + rest 1 note G_, 2 note D_, 1 - note __, 1 + rest 1 note D_, 2 note G_, 2 note D_, 2 @@ -680,7 +681,7 @@ Music_TitleScreen_Ch3: note F_, 1 note E_, 1 note F_, 1 - note __, 1 + rest 1 note A_, 2 note F_, 2 note A_, 4 @@ -823,10 +824,10 @@ Music_TitleScreen_Ch3: note G_, 6 note E_, 4 note D_, 1 - note __, 1 - stereopanning $ff - notetype $c, $16 - tone 0 + rest 1 + stereo_panning TRUE, TRUE + note_type 12, 1, 6 + pitch_offset 0 octave 4 note A_, 2 octave 5 @@ -835,17 +836,17 @@ Music_TitleScreen_Ch3: note G_, 2 note F#, 2 note D_, 1 - note __, 2 + rest 2 note E_, 1 note F#, 4 - notetype $8, $16 + note_type 8, 1, 6 octave 3 note C_, 4 note C_, 4 note C#, 4 - notetype $c, $16 + note_type 12, 1, 6 note D_, 1 - note __, 1 + rest 1 octave 4 note A_, 2 octave 5 @@ -854,18 +855,18 @@ Music_TitleScreen_Ch3: note G_, 2 note F#, 2 note B_, 1 - note __, 2 + rest 2 note A_, 1 note A_, 4 - notetype $8, $16 + note_type 8, 1, 6 octave 3 note C_, 4 note C_, 4 note C#, 4 - notetype $c, $16 + note_type 12, 1, 6 note D_, 1 - note __, 1 - notetype $c, $16 + rest 1 + note_type 12, 1, 6 octave 4 note A_, 2 octave 5 @@ -876,15 +877,15 @@ Music_TitleScreen_Ch3: note F#, 1 note E_, 1 note D_, 6 - tone $0001 - notetype $8, $16 + pitch_offset 1 + note_type 8, 1, 6 octave 3 note C_, 4 note C_, 4 note E_, 2 note F#, 2 - stereopanning $f - notetype $c, $16 + stereo_panning FALSE, TRUE + note_type 12, 1, 6 note G_, 16 note F_, 16 note G_, 8 @@ -905,329 +906,330 @@ Music_TitleScreen_Ch3: note E_, 1 note F_, 16 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 octave 2 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 5 + rest 5 note G_, 1 note G_, 1 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 + rest 3 note G_, 1 - note __, 3 - notetype $8, $16 + rest 3 + note_type 8, 1, 6 note F_, 2 note F_, 2 note F_, 2 note F_, 2 note F_, 2 note A_, 2 - notetype $c, $16 + note_type 12, 1, 6 note G_, 1 - note __, 3 + rest 3 octave 1 note G_, 1 - note __, 11 - endchannel + rest 11 + sound_ret Music_TitleScreen_Ch4: - togglenoise $5 - stereopanning $f0 - notetype $c - note __, 16 - note __, 16 - note __, 16 - note __, 8 - note C_, 2 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 6 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 3 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 4 - note D#, 2 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 1 - note C_, 2 - notetype $6 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd77 - callchannel Music_TitleScreen_branch_ebd81 - callchannel Music_TitleScreen_branch_ebd81 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - notetype $6 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd77 - note C_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 2 - callchannel Music_TitleScreen_branch_ebd81 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - callchannel Music_TitleScreen_branch_ebd77 - callchannel Music_TitleScreen_branch_ebd81 - callchannel Music_TitleScreen_branch_ebd81 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - notetype $6 - note C#, 1 - note D_, 1 - note D_, 1 - note C#, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd77 - callchannel Music_TitleScreen_branch_ebd81 - note C_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - notetype $6 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - notetype $c - note A_, 2 - note D#, 4 - note A_, 4 - note D#, 2 - note A_, 4 - note A_, 2 - note D#, 4 - note A_, 4 - note D#, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note D#, 4 - note A_, 4 - note D#, 2 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 2 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - callchannel Music_TitleScreen_branch_ebd8b - callchannel Music_TitleScreen_branch_ebd93 - note C#, 1 - note D_, 1 - note D_, 1 - note C#, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd8b - callchannel Music_TitleScreen_branch_ebd93 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - notetype $c - callchannel Music_TitleScreen_branch_ebd8b - callchannel Music_TitleScreen_branch_ebd93 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - notetype $c - note G#, 16 -Music_TitleScreen_branch_ebd40: - note __, 16 - loopchannel 6, Music_TitleScreen_branch_ebd40 - note __, 12 - notetype $6 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C_, 1 - notetype $c - note C_, 4 - note C_, 6 - note C_, 1 - note C_, 1 - note C_, 4 - note C_, 4 - note C_, 6 - note C_, 1 - note C_, 1 - note C_, 4 - note C_, 4 - note C_, 6 - note C_, 1 - note C_, 1 - note C_, 4 - note C_, 4 - note C_, 4 - notetype $8 - note C_, 2 - note C_, 2 - note C_, 2 - notetype $6 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note C_, 1 - note C_, 1 - notetype $c - note C_, 4 - note B_, 4 - endchannel + toggle_noise 5 + stereo_panning TRUE, FALSE + drum_speed 12 + rest 16 + rest 16 + rest 16 + rest 8 + drum_note 1, 2 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 6 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 3 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 4 + drum_note 4, 2 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 12 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 12 + sound_call .sub1 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 6, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 2 + sound_call .sub2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_speed 6 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 12 + sound_call .sub1 + sound_call .sub2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 6, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_speed 6 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + drum_note 10, 2 + drum_note 4, 4 + drum_note 10, 4 + drum_note 4, 2 + drum_note 10, 4 + drum_note 10, 2 + drum_note 4, 4 + drum_note 10, 4 + drum_note 4, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 10, 2 + drum_note 4, 4 + drum_note 10, 4 + drum_note 4, 2 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 4 + drum_note 10, 2 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + sound_call .sub3 + sound_call .sub4 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_speed 12 + sound_call .sub3 + sound_call .sub4 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + sound_call .sub3 + sound_call .sub4 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_speed 12 + drum_note 9, 16 +.loop1: + rest 16 + sound_loop 6, .loop1 + rest 12 + drum_speed 6 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 12 + drum_note 1, 4 + drum_note 1, 6 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 6 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 6 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 4 + drum_note 1, 4 + drum_note 1, 4 + drum_speed 8 + drum_note 1, 2 + drum_note 1, 2 + drum_note 1, 2 + drum_speed 6 + drum_note 2, 1 + drum_note 2, 1 + drum_note 3, 1 + drum_note 3, 1 + drum_note 2, 1 + drum_note 2, 1 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 12 + drum_note 1, 4 + drum_note 12, 4 + sound_ret -Music_TitleScreen_branch_ebd77: - note C_, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note F_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note D#, 2 - endchannel +.sub1: + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 4, 2 + drum_note 6, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 4, 2 + sound_ret -Music_TitleScreen_branch_ebd81: - note C_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note D#, 2 - endchannel +.sub2: + drum_note 1, 2 + drum_note 4, 2 + drum_note 1, 2 + drum_note 6, 2 + drum_note 4, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 4, 2 + sound_ret -Music_TitleScreen_branch_ebd8b: - note C_, 2 - note C_, 1 - note C_, 1 - loopchannel 4, Music_TitleScreen_branch_ebd8b - endchannel +.sub3: +.sub3loop1: + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + sound_loop 4, .sub3loop1 + sound_ret -Music_TitleScreen_branch_ebd93: - note C_, 2 - note C_, 1 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 1 - notetype $8 - note C_, 4 - note C_, 4 - endchannel +.sub4: + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_note 1, 2 + drum_note 1, 1 + drum_note 1, 1 + drum_speed 8 + drum_note 1, 4 + drum_note 1, 4 + sound_ret diff --git a/audio/music/trainervictory.asm b/audio/music/trainervictory.asm index 56b2d847..e4b5f4e1 100644 --- a/audio/music/trainervictory.asm +++ b/audio/music/trainervictory.asm @@ -1,14 +1,15 @@ Music_TrainerVictory: - musicheader 3, 1, Music_TrainerVictory_Ch1 - musicheader 1, 2, Music_TrainerVictory_Ch2 - musicheader 1, 3, Music_TrainerVictory_Ch3 + channel_count 3 + channel 1, Music_TrainerVictory_Ch1 + channel 2, Music_TrainerVictory_Ch2 + channel 3, Music_TrainerVictory_Ch3 Music_TrainerVictory_Ch1: tempo 120 - volume $77 - dutycycle $2 - tone $0001 - notetype $8, $b1 + volume 7, 7 + duty_cycle 2 + pitch_offset 1 + note_type 8, 11, 1 octave 4 note E_, 2 note E_, 2 @@ -16,13 +17,14 @@ Music_TrainerVictory_Ch1: note E_, 2 note F#, 2 note G_, 2 - intensity $b6 + volume_envelope 11, 6 note A_, 12 - stereopanning $f -Music_TrainerVictory_branch_ebecd: - intensity $72 - callchannel Music_TrainerVictory_branch_ebf11 - intensity $51 + stereo_panning FALSE, TRUE +.mainloop: +.loop1: + volume_envelope 7, 2 + sound_call .sub1 + volume_envelope 5, 1 note C#, 2 note E_, 2 note F#, 2 @@ -30,63 +32,63 @@ Music_TrainerVictory_branch_ebecd: note B_, 2 octave 4 note C#, 2 - intensity $72 + volume_envelope 7, 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note C#, 2 note E_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebecd - callchannel Music_TrainerVictory_branch_ebf11 + sound_loop 2, .loop1 + sound_call .sub1 note A_, 2 - note __, 2 + rest 2 note F_, 2 note A_, 6 note A#, 2 - note __, 2 + rest 2 note G_, 2 note A#, 6 -Music_TrainerVictory_branch_ebef2: - intensity $72 +.loop2: + volume_envelope 7, 2 octave 4 note D_, 2 note C#, 2 octave 3 note A_, 2 - loopchannel 3, Music_TrainerVictory_branch_ebef2 + sound_loop 3, .loop2 note F#, 2 note A_, 2 octave 4 note D_, 2 -Music_TrainerVictory_branch_ebf01: +.loop3: octave 4 note C#, 2 octave 3 note B_, 2 note A_, 2 - loopchannel 3, Music_TrainerVictory_branch_ebf01 + sound_loop 3, .loop3 note E_, 2 note F#, 2 note G_, 2 - loopchannel 0, Music_TrainerVictory_branch_ebecd + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebf11: +.sub1: octave 3 note F#, 2 - note __, 2 + rest 2 note D_, 2 note F#, 6 note G_, 2 - note __, 2 + rest 2 note E_, 2 note G_, 6 - endchannel + sound_ret Music_TrainerVictory_Ch2: - vibrato $12, $34 - dutycycle $3 - notetype $8, $d1 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 13, 1 octave 4 note A_, 2 note A_, 2 @@ -95,93 +97,95 @@ Music_TrainerVictory_Ch2: note B_, 2 octave 5 note C#, 2 - intensity $d6 + volume_envelope 13, 6 note D_, 12 - stereopanning $f0 -Music_TrainerVictory_branch_ebf30: - notetype $8, $82 - callchannel Music_TrainerVictory_branch_ebf56 + stereo_panning TRUE, FALSE +.mainloop: +.loop1: + note_type 8, 8, 2 + sound_call .sub1 note F#, 2 - note __, 2 + rest 2 note G_, 2 note A_, 6 note E_, 2 - note __, 2 + rest 2 note F#, 2 note G_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebf30 - callchannel Music_TrainerVictory_branch_ebf56 + sound_loop 2, .loop1 + sound_call .sub1 note F_, 2 - note __, 2 + rest 2 note C_, 2 note F_, 6 note G_, 2 - note __, 2 + rest 2 note D_, 2 note G_, 6 - notetype $c, $88 + note_type 12, 8, 8 note F#, 16 note E_, 16 - loopchannel 0, Music_TrainerVictory_branch_ebf30 + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebf56: +.sub1: octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 octave 4 note D_, 6 note E_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 octave 4 note E_, 6 - endchannel + sound_ret Music_TrainerVictory_Ch3: - notetype $8, $25 + note_type 8, 2, 5 octave 3 note G_, 6 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 6 note D_, 2 note C#, 2 octave 2 note B_, 2 -Music_TrainerVictory_branch_ebf74: - callchannel Music_TrainerVictory_branch_ebfb1 +.mainloop: +.loop1: + sound_call .sub1 octave 3 note C#, 2 - note __, 2 + rest 2 note C#, 2 note A_, 2 note F#, 2 note C#, 2 octave 2 note A_, 2 - note __, 2 + rest 2 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 6 - loopchannel 2, Music_TrainerVictory_branch_ebf74 - callchannel Music_TrainerVictory_branch_ebfb1 + sound_loop 2, .loop1 + sound_call .sub1 octave 3 note C_, 2 - note __, 2 + rest 2 note C_, 2 note A_, 2 note F_, 2 note C_, 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 octave 4 note D_, 2 @@ -206,12 +210,12 @@ Music_TrainerVictory_branch_ebf74: note G_, 2 note E_, 2 note C#, 2 - loopchannel 0, Music_TrainerVictory_branch_ebf74 + sound_loop 0, .mainloop -Music_TrainerVictory_branch_ebfb1: +.sub1: octave 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 octave 3 note F#, 2 @@ -219,11 +223,11 @@ Music_TrainerVictory_branch_ebfb1: octave 2 note A_, 2 note B_, 2 - note __, 2 + rest 2 note B_, 2 octave 3 note G_, 2 note E_, 2 octave 2 note B_, 2 - endchannel + sound_ret diff --git a/audio/music/unioncave.asm b/audio/music/unioncave.asm index 94c7aec6..d492b7db 100644 --- a/audio/music/unioncave.asm +++ b/audio/music/unioncave.asm @@ -1,22 +1,23 @@ 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 + channel_count 4 + channel 1, Music_UnionCave_Ch1 + channel 2, Music_UnionCave_Ch2 + channel 3, Music_UnionCave_Ch3 + channel 4, Music_UnionCave_Ch4 Music_UnionCave_Ch1: tempo 160 - volume $77 - dutycycle $1 - tone $0002 - vibrato $18, $34 - stereopanning $f -Music_UnionCave_branch_f5c7b: - notetype $c, $b3 -Music_UnionCave_branch_f5c7e: - callchannel Music_UnionCave_branch_f5ccf - loopchannel 4, Music_UnionCave_branch_f5c7e -Music_UnionCave_branch_f5c85: + volume 7, 7 + duty_cycle 1 + pitch_offset 2 + vibrato 24, 3, 4 + stereo_panning FALSE, TRUE +.mainloop: + note_type 12, 11, 3 +.loop1: + sound_call .sub1 + sound_loop 4, .loop1 +.loop2: octave 2 note G#, 2 octave 3 @@ -25,8 +26,8 @@ Music_UnionCave_branch_f5c85: note C#, 2 note E_, 2 note F_, 4 - loopchannel 8, Music_UnionCave_branch_f5c85 -Music_UnionCave_branch_f5c91: + sound_loop 8, .loop2 +.loop3: octave 2 note A_, 2 octave 3 @@ -35,9 +36,9 @@ Music_UnionCave_branch_f5c91: note D_, 2 note F_, 2 note F#, 4 - loopchannel 4, Music_UnionCave_branch_f5c91 - note __, 4 - intensity $80 + sound_loop 4, .loop3 + rest 4 + volume_envelope 8, 0 note F_, 16 note F#, 16 note G_, 16 @@ -52,37 +53,37 @@ Music_UnionCave_branch_f5c91: note C_, 8 octave 3 note A_, 8 - intensity $95 - tone $0004 - callchannel Music_UnionCave_branch_f5ccf - tone $0008 - callchannel Music_UnionCave_branch_f5ccf - tone $000c - callchannel Music_UnionCave_branch_f5ccf - tone $0010 - callchannel Music_UnionCave_branch_f5ccf - tone $0002 - loopchannel 0, Music_UnionCave_branch_f5c7b + volume_envelope 9, 5 + pitch_offset 4 + sound_call .sub1 + pitch_offset 8 + sound_call .sub1 + pitch_offset 12 + sound_call .sub1 + pitch_offset 16 + sound_call .sub1 + pitch_offset 2 + sound_loop 0, .mainloop -Music_UnionCave_branch_f5ccf: +.sub1: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 - endchannel + sound_ret Music_UnionCave_Ch2: - dutycycle $3 - vibrato $8, $24 -Music_UnionCave_branch_f5cda: - notetype $c, $c4 - callchannel Music_UnionCave_branch_f5d34 - intensity $c5 - callchannel Music_UnionCave_branch_f5d34 - intensity $c7 - callchannel Music_UnionCave_branch_f5d34 - intensity $c4 + duty_cycle 3 + vibrato 8, 2, 4 +.mainloop: + note_type 12, 12, 4 + sound_call .sub1 + volume_envelope 12, 5 + sound_call .sub1 + volume_envelope 12, 7 + sound_call .sub1 + volume_envelope 12, 4 note C#, 4 octave 3 note B_, 4 @@ -111,8 +112,8 @@ Music_UnionCave_branch_f5cda: note C#, 8 note D_, 4 note C#, 4 - note __, 4 - intensity $a0 + rest 4 + volume_envelope 10, 0 note C_, 16 note C#, 16 note D_, 16 @@ -121,19 +122,19 @@ Music_UnionCave_branch_f5cda: note D#, 16 note A#, 16 note A_, 16 - intensity $a5 - vibrato $6, $44 - callchannel Music_UnionCave_branch_f5d52 - vibrato $4, $33 - callchannel Music_UnionCave_branch_f5d52 - vibrato $2, $22 - callchannel Music_UnionCave_branch_f5d52 - vibrato $1, $41 - callchannel Music_UnionCave_branch_f5d52 - vibrato $8, $24 - loopchannel 0, Music_UnionCave_branch_f5cda + volume_envelope 10, 5 + vibrato 6, 4, 4 + sound_call .sub2 + vibrato 4, 3, 3 + sound_call .sub2 + vibrato 2, 2, 2 + sound_call .sub2 + vibrato 1, 4, 1 + sound_call .sub2 + vibrato 8, 2, 4 + sound_loop 0, .mainloop -Music_UnionCave_branch_f5d34: +.sub1: octave 4 note C_, 4 octave 3 @@ -163,50 +164,51 @@ Music_UnionCave_branch_f5d34: note C_, 8 note C#, 4 note C_, 4 - endchannel + sound_ret -Music_UnionCave_branch_f5d52: +.sub2: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 - endchannel + sound_ret Music_UnionCave_Ch3: - notetype $c, $16 - stereopanning $f0 -Music_UnionCave_branch_f5d5d: - note __, 16 - loopchannel 7, Music_UnionCave_branch_f5d5d - note __, 14 + note_type 12, 1, 6 + stereo_panning TRUE, FALSE +.mainloop: +.loop1: + rest 16 + sound_loop 7, .loop1 + rest 14 octave 4 note C_, 2 -Music_UnionCave_branch_f5d65: - note __, 2 +.loop2: + rest 2 octave 3 note E_, 2 - note __, 2 + rest 2 note E_, 2 note G#, 2 note E_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 - loopchannel 4, Music_UnionCave_branch_f5d65 -Music_UnionCave_branch_f5d73: - note __, 2 + sound_loop 4, .loop2 +.loop3: + rest 2 octave 3 note F_, 2 - note __, 2 + rest 2 note F_, 2 note A_, 2 note F_, 2 - note __, 2 + rest 2 octave 4 note C#, 2 - loopchannel 4, Music_UnionCave_branch_f5d73 - note __, 4 + sound_loop 4, .loop3 + rest 4 note C_, 8 octave 3 note B_, 8 @@ -218,7 +220,7 @@ Music_UnionCave_branch_f5d73: octave 3 note B_, 8 note A#, 8 -Music_UnionCave_branch_f5d8d: +.loop4: note A_, 4 note G_, 4 note A#, 2 @@ -227,32 +229,33 @@ Music_UnionCave_branch_f5d8d: octave 3 note A_, 2 note G_, 2 - loopchannel 3, Music_UnionCave_branch_f5d8d + sound_loop 3, .loop4 note A_, 4 note G_, 4 note A#, 8 -Music_UnionCave_branch_f5d9c: - note __, 16 - loopchannel 4, Music_UnionCave_branch_f5d9c - loopchannel 0, Music_UnionCave_branch_f5d5d +.loop5: + rest 16 + sound_loop 4, .loop5 + sound_loop 0, .mainloop Music_UnionCave_Ch4: - togglenoise $1 - notetype $c -Music_UnionCave_branch_f5da9: - stereopanning $f0 - note E_, 4 - stereopanning $ff - note F_, 4 - stereopanning $f - note G#, 4 - note __, 8 - stereopanning $f - note E_, 4 - stereopanning $ff - note F_, 4 - stereopanning $f0 - note G#, 4 - note __, 8 - loopchannel 0, Music_UnionCave_branch_f5da9 - loopchannel 0, Music_UnionCave_branch_f5da9 ; unused + toggle_noise 1 + drum_speed 12 +.mainloop: + stereo_panning TRUE, FALSE + drum_note 5, 4 + stereo_panning TRUE, TRUE + drum_note 6, 4 + stereo_panning FALSE, TRUE + drum_note 9, 4 + rest 8 + stereo_panning FALSE, TRUE + drum_note 5, 4 + stereo_panning TRUE, TRUE + drum_note 6, 4 + stereo_panning TRUE, FALSE + drum_note 9, 4 + rest 8 + sound_loop 0, .mainloop + + sound_loop 0, .mainloop ; unused diff --git a/audio/music/vermilioncity.asm b/audio/music/vermilioncity.asm index ec88085e..26431ff3 100644 --- a/audio/music/vermilioncity.asm +++ b/audio/music/vermilioncity.asm @@ -1,16 +1,17 @@ Music_VermilionCity: - musicheader 3, 1, Music_VermilionCity_Ch1 - musicheader 1, 2, Music_VermilionCity_Ch2 - musicheader 1, 3, Music_VermilionCity_Ch3 + channel_count 3 + channel 1, Music_VermilionCity_Ch1 + channel 2, Music_VermilionCity_Ch2 + channel 3, Music_VermilionCity_Ch3 - db $3 + db $3 ; unused Music_VermilionCity_Ch1: - stereopanning $f + stereo_panning FALSE, TRUE tempo 176 - volume $77 - dutycycle $2 - notetype $c, $65 + volume 7, 7 + duty_cycle 2 + note_type 12, 6, 5 octave 4 note B_, 4 note G#, 4 @@ -28,21 +29,21 @@ Music_VermilionCity_Ch1: note B_, 1 octave 5 note D_, 1 - vibrato $10, $23 -Music_VermilionCity_branch_eb6a0: - dutycycle $1 - notetype $c, $85 - callchannel Music_VermilionCity_branch_eb6f9 + vibrato 16, 2, 3 +.mainloop: + duty_cycle 1 + note_type 12, 8, 5 + sound_call .sub1 note F_, 4 octave 4 note D_, 4 note C#, 4 note E_, 4 - callchannel Music_VermilionCity_branch_eb6f9 - callchannel Music_VermilionCity_branch_eb701 - dutycycle $2 - notetype $c, $85 - callchannel Music_VermilionCity_branch_eb6f9 + sound_call .sub1 + sound_call .sub2 + duty_cycle 2 + note_type 12, 8, 5 + sound_call .sub1 note F_, 4 octave 4 note D_, 4 @@ -57,22 +58,22 @@ Music_VermilionCity_branch_eb6a0: note A_, 1 note E_, 1 note C_, 1 - callchannel Music_VermilionCity_branch_eb6f9 - callchannel Music_VermilionCity_branch_eb701 - intensity $93 - dutycycle $0 - note __, 2 + sound_call .sub1 + sound_call .sub2 + volume_envelope 9, 3 + duty_cycle 0 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - callchannel Music_VermilionCity_branch_eb70c - callchannel Music_VermilionCity_branch_eb70c - intensity $87 - dutycycle $2 + sound_call .sub3 + sound_call .sub3 + volume_envelope 8, 7 + duty_cycle 2 octave 4 note D_, 8 octave 3 @@ -89,9 +90,9 @@ Music_VermilionCity_branch_eb6a0: note B_, 4 octave 3 note D_, 4 - loopchannel 0, Music_VermilionCity_branch_eb6a0 + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb6f9: +.sub1: octave 3 note C#, 4 note E_, 4 @@ -99,9 +100,9 @@ Music_VermilionCity_branch_eb6f9: note A_, 2 note E_, 2 note G#, 2 - endchannel + sound_ret -Music_VermilionCity_branch_eb701: +.sub2: note D_, 2 note F_, 2 note A_, 2 @@ -112,10 +113,10 @@ Music_VermilionCity_branch_eb701: octave 3 note A_, 2 note E_, 2 - endchannel + sound_ret -Music_VermilionCity_branch_eb70c: - note __, 2 +.sub3: + rest 2 note F#, 2 note A_, 2 note F#, 2 @@ -125,7 +126,7 @@ Music_VermilionCity_branch_eb70c: note F#, 2 note A_, 2 note F#, 2 - note __, 2 + rest 2 note G#, 2 note B_, 2 note G#, 2 @@ -135,13 +136,13 @@ Music_VermilionCity_branch_eb70c: note G#, 2 note B_, 2 note G#, 2 - endchannel + sound_ret Music_VermilionCity_Ch2: - stereopanning $ff - dutycycle $3 - notetype $c, $77 - vibrato $10, $23 + stereo_panning TRUE, TRUE + duty_cycle 3 + note_type 12, 7, 7 + vibrato 16, 2, 3 octave 5 note E_, 4 note D_, 4 @@ -152,21 +153,21 @@ Music_VermilionCity_Ch2: note E_, 4 note F#, 4 note G#, 4 -Music_VermilionCity_branch_eb735: - notetype $c, $97 - callchannel Music_VermilionCity_branch_eb768 +.mainloop: + note_type 12, 9, 7 + sound_call .sub1 note G#, 2 - callchannel Music_VermilionCity_branch_eb768 + sound_call .sub1 note E_, 2 - intensity $b7 + volume_envelope 11, 7 octave 3 note B_, 4 octave 4 note C#, 4 note D_, 4 note E_, 4 - callchannel Music_VermilionCity_branch_eb77e - callchannel Music_VermilionCity_branch_eb77e + sound_call .sub2 + sound_call .sub2 note F#, 6 note E_, 1 note F#, 1 @@ -176,18 +177,18 @@ Music_VermilionCity_branch_eb735: note A_, 1 note G#, 8 note G#, 14 - notetype $6, $57 - note __, 1 + note_type 6, 5, 7 + rest 1 octave 4 note E_, 1 note G#, 1 note B_, 1 - notetype $c, $87 + note_type 12, 8, 7 octave 5 note E_, 16 - loopchannel 0, Music_VermilionCity_branch_eb735 + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb768: +.sub1: octave 1 note A_, 8 octave 2 @@ -209,21 +210,21 @@ Music_VermilionCity_branch_eb768: note E_, 2 octave 1 note A_, 2 - endchannel + sound_ret -Music_VermilionCity_branch_eb77e: +.sub2: note F#, 8 note B_, 8 note A_, 4 note G#, 4 note F#, 4 note E_, 4 - endchannel + sound_ret Music_VermilionCity_Ch3: - stereopanning $f0 - vibrato $22, $23 - notetype $c, $25 + stereo_panning TRUE, FALSE + vibrato 34, 2, 3 + note_type 12, 2, 5 octave 2 note E_, 4 note B_, 4 @@ -241,17 +242,17 @@ Music_VermilionCity_Ch3: note D_, 1 octave 2 note B_, 1 -Music_VermilionCity_branch_eb79e: - notetype $c, $22 - callchannel Music_VermilionCity_branch_eb7de +.mainloop: + note_type 12, 2, 2 + sound_call .sub1 octave 5 note A_, 6 - intensity $24 + volume_envelope 2, 4 note E_, 1 note G#, 1 - callchannel Music_VermilionCity_branch_eb7de + sound_call .sub1 note A_, 8 - intensity $14 + volume_envelope 1, 4 octave 3 note D_, 4 note C#, 4 @@ -260,18 +261,18 @@ Music_VermilionCity_branch_eb79e: note A_, 4 octave 3 note D_, 2 - note __, 4 + rest 4 note D_, 1 note D_, 1 - callchannel Music_VermilionCity_branch_eb7f5 + sound_call .sub2 octave 4 note D_, 2 octave 3 note D_, 2 - note __, 2 + rest 2 note D_, 2 - callchannel Music_VermilionCity_branch_eb7f5 - intensity $25 + sound_call .sub2 + volume_envelope 2, 5 octave 3 note E_, 8 octave 4 @@ -284,13 +285,13 @@ Music_VermilionCity_branch_eb79e: note E_, 16 octave 3 note E_, 14 - intensity $22 + volume_envelope 2, 2 octave 5 note E_, 1 note G#, 1 - loopchannel 0, Music_VermilionCity_branch_eb79e + sound_loop 0, .mainloop -Music_VermilionCity_branch_eb7de: +.sub1: octave 5 note A_, 8 octave 6 @@ -313,25 +314,25 @@ Music_VermilionCity_branch_eb7de: note C#, 1 octave 5 note B_, 1 - endchannel + sound_ret -Music_VermilionCity_branch_eb7f5: +.sub2: note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note F#, 2 note E_, 2 - note __, 4 + rest 4 note E_, 1 note E_, 1 octave 4 note E_, 1 - note __, 1 + rest 1 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 1 octave 4 note C#, 1 - endchannel + sound_ret diff --git a/audio/music/victoryroad.asm b/audio/music/victoryroad.asm index ea914865..ff602cee 100644 --- a/audio/music/victoryroad.asm +++ b/audio/music/victoryroad.asm @@ -1,30 +1,32 @@ 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 + channel_count 4 + channel 1, Music_VictoryRoad_Ch1 + channel 2, Music_VictoryRoad_Ch2 + channel 3, Music_VictoryRoad_Ch3 + channel 4, Music_VictoryRoad_Ch4 Music_VictoryRoad_Ch1: tempo 144 - volume $77 - stereopanning $f - dutycycle $3 - tone $0002 - notetype $c, $b3 -Music_VictoryRoad_branch_f6c8d: - callchannel Music_VictoryRoad_branch_f6cb9 - loopchannel 6, Music_VictoryRoad_branch_f6c8d -Music_VictoryRoad_branch_f6c94: - intensity $b2 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 3 + pitch_offset 2 + note_type 12, 11, 3 +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 6, .loop1 +.loop2: + volume_envelope 11, 2 octave 2 note A_, 1 octave 3 note C#, 1 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 1 - intensity $b7 + volume_envelope 11, 7 octave 3 note C#, 3 octave 2 @@ -35,23 +37,23 @@ Music_VictoryRoad_branch_f6c94: note A_, 1 octave 3 note G#, 3 - loopchannel 2, Music_VictoryRoad_branch_f6c94 -Music_VictoryRoad_branch_f6cae: - callchannel Music_VictoryRoad_branch_f6cb9 - loopchannel 2, Music_VictoryRoad_branch_f6cae - loopchannel 0, Music_VictoryRoad_branch_f6c8d + sound_loop 2, .loop2 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6cb9: - intensity $b2 +.sub1: + volume_envelope 11, 2 octave 2 note G_, 1 note B_, 1 octave 3 note C_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - intensity $b7 + volume_envelope 11, 7 note B_, 3 note G_, 1 octave 3 @@ -60,20 +62,20 @@ Music_VictoryRoad_branch_f6cb9: note G_, 1 octave 3 note F#, 3 - endchannel + sound_ret Music_VictoryRoad_Ch2: - dutycycle $3 - vibrato $10, $24 -Music_VictoryRoad_branch_f6cd3: - notetype $c, $c2 - callchannel Music_VictoryRoad_branch_f6d1e - note __, 2 - callchannel Music_VictoryRoad_branch_f6d1e - note __, 1 + duty_cycle 3 + vibrato 16, 2, 4 +.mainloop: + note_type 12, 12, 2 + sound_call .sub1 + rest 2 + sound_call .sub1 + rest 1 octave 4 note C_, 1 - notetype $c, $b0 + note_type 12, 11, 0 note E_, 8 octave 5 note C_, 4 @@ -81,33 +83,33 @@ Music_VictoryRoad_branch_f6cd3: note B_, 4 note E_, 15 note D#, 1 - notetype $c, $b0 + note_type 12, 11, 0 note E_, 8 octave 5 note C_, 4 octave 4 note B_, 4 - notetype $c, $b0 + note_type 12, 11, 0 octave 5 note E_, 8 - notetype $c, $b7 + note_type 12, 11, 7 note E_, 8 - notetype $c, $c7 + note_type 12, 12, 7 note D_, 8 - stereopanning $f0 + stereo_panning TRUE, FALSE note C#, 4 - stereopanning $f + stereo_panning FALSE, TRUE octave 4 note A_, 4 - stereopanning $ff + stereo_panning TRUE, TRUE octave 5 note C_, 8 - stereopanning $f + stereo_panning FALSE, TRUE octave 4 note A#, 4 - stereopanning $f0 + stereo_panning TRUE, FALSE note F_, 4 - stereopanning $ff + stereo_panning TRUE, TRUE note A_, 12 note D_, 1 note F#, 1 @@ -115,83 +117,84 @@ Music_VictoryRoad_branch_f6cd3: octave 5 note C#, 1 note D_, 16 - loopchannel 0, Music_VictoryRoad_branch_f6cd3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6d1e: +.sub1: octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note F#, 1 note F#, 1 - note __, 2 + rest 2 note G#, 1 note G#, 1 - note __, 2 + rest 2 note A_, 1 note A_, 1 - endchannel + sound_ret Music_VictoryRoad_Ch3: - stereopanning $f0 - notetype $c, $28 -Music_VictoryRoad_branch_f6d31: - callchannel Music_VictoryRoad_branch_f6d52 - loopchannel 6, Music_VictoryRoad_branch_f6d31 -Music_VictoryRoad_branch_f6d38: + stereo_panning TRUE, FALSE + note_type 12, 2, 8 +.mainloop: +.loop1: + sound_call .sub1 + sound_loop 6, .loop1 +.loop2: note D_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note F_, 1 note A_, 3 note D_, 1 note B_, 1 - note __, 2 + rest 2 note D_, 1 note B_, 3 - loopchannel 2, Music_VictoryRoad_branch_f6d38 -Music_VictoryRoad_branch_f6d47: - callchannel Music_VictoryRoad_branch_f6d52 - loopchannel 2, Music_VictoryRoad_branch_f6d47 - loopchannel 0, Music_VictoryRoad_branch_f6d31 + sound_loop 2, .loop2 +.loop3: + sound_call .sub1 + sound_loop 2, .loop3 + sound_loop 0, .mainloop -Music_VictoryRoad_branch_f6d52: +.sub1: octave 3 note C_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note D#, 1 note G_, 3 note C_, 1 note A_, 1 - note __, 2 + rest 2 note C_, 1 note A_, 3 - endchannel + sound_ret Music_VictoryRoad_Ch4: - togglenoise $0 - notetype $c -Music_VictoryRoad_branch_f6d63: - note D_, 2 - note D_, 2 - note D#, 1 - note D_, 3 - note D#, 1 - note D_, 3 - note D#, 1 - note D_, 3 - note D_, 2 - note D_, 2 - note D#, 1 - note D_, 3 - note D#, 1 - note D#, 1 - note D_, 2 - note D#, 1 - note D_, 2 - note D#, 1 - loopchannel 0, Music_VictoryRoad_branch_f6d63 + toggle_noise 0 + drum_speed 12 +.mainloop: + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 3 + drum_note 4, 1 + drum_note 3, 3 + drum_note 4, 1 + drum_note 3, 3 + drum_note 3, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 3 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 3, 2 + drum_note 4, 1 + sound_loop 0, .mainloop diff --git a/audio/music/violetcity.asm b/audio/music/violetcity.asm index a8a89c3c..44c1b7e3 100644 --- a/audio/music/violetcity.asm +++ b/audio/music/violetcity.asm @@ -1,40 +1,41 @@ 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 + channel_count 4 + channel 1, Music_VioletCity_Ch1 + channel 2, Music_VioletCity_Ch2 + channel 3, Music_VioletCity_Ch3 + channel 4, Music_VioletCity_Ch4 Music_VioletCity_Ch1: tempo 164 - volume $77 - vibrato $12, $25 - dutycycle $2 - notetype $c, $95 - note __, 16 - stereopanning $f0 + volume 7, 7 + vibrato 18, 2, 5 + duty_cycle 2 + note_type 12, 9, 5 + rest 16 + stereo_panning TRUE, FALSE octave 2 note E_, 1 note G#, 1 note B_, 1 - stereopanning $ff + stereo_panning TRUE, TRUE octave 3 note D#, 1 note G#, 1 - note __, 1 + rest 1 note A#, 4 note G#, 2 note F#, 2 note C#, 2 - stereopanning $f + stereo_panning FALSE, TRUE octave 2 note D#, 1 note F#, 1 note A#, 1 - stereopanning $ff + stereo_panning TRUE, TRUE octave 3 note C#, 1 note F#, 1 - note __, 1 + rest 1 note D#, 4 note G#, 2 note D#, 2 @@ -46,10 +47,10 @@ Music_VioletCity_Ch1: note B_, 1 octave 3 note G#, 1 - note __, 1 + rest 1 octave 2 note B_, 4 - notetype $6, $91 + note_type 6, 9, 1 octave 3 note C#, 2 note F_, 2 @@ -57,16 +58,16 @@ Music_VioletCity_Ch1: note F_, 2 note G#, 2 note B_, 2 - intensity $a4 + volume_envelope 10, 4 octave 2 note B_, 8 - note __, 4 + rest 4 octave 3 note C#, 12 - note __, 8 -Music_VioletCity_branch_f0056: - notetype $6, $95 - note __, 4 + rest 8 +.mainloop: + note_type 6, 9, 5 + rest 4 octave 2 note B_, 2 octave 3 @@ -75,14 +76,14 @@ Music_VioletCity_branch_f0056: note D#, 2 note E_, 2 note D#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 - stereopanning $f0 + rest 2 + stereo_panning TRUE, FALSE octave 4 note C#, 2 octave 3 @@ -90,22 +91,22 @@ Music_VioletCity_branch_f0056: note E_, 2 octave 4 note C#, 2 - stereopanning $ff + stereo_panning TRUE, TRUE note C_, 2 octave 3 note G#, 2 note E_, 2 octave 4 note C_, 2 - stereopanning $f + stereo_panning FALSE, TRUE octave 3 note B_, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 note A#, 8 - stereopanning $ff - note __, 4 + stereo_panning TRUE, TRUE + rest 4 note C#, 2 note E_, 2 note A#, 4 @@ -114,60 +115,60 @@ Music_VioletCity_branch_f0056: note C#, 2 octave 3 note A#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 - stereopanning $f + rest 2 + stereo_panning FALSE, TRUE note D#, 8 - stereopanning $ff + stereo_panning TRUE, TRUE note E_, 8 - stereopanning $f0 + stereo_panning TRUE, FALSE note F_, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 4 - stereopanning $ff + stereo_panning TRUE, TRUE note G#, 2 note D#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 1 + rest 1 octave 3 note D#, 1 - note __, 1 + rest 1 note B_, 4 note G#, 2 note G#, 2 note A#, 2 - note __, 2 + rest 2 note A#, 2 - note __, 2 + rest 2 note D#, 4 note F#, 2 - note __, 2 - notetype $c, $95 - note __, 8 + rest 2 + note_type 12, 9, 5 + rest 8 octave 4 note F_, 3 - dutycycle $1 - notetype $6, $75 + duty_cycle 1 + note_type 6, 7, 5 note G#, 1 note B_, 1 octave 5 note D#, 8 - notetype $c, $93 - dutycycle $2 - note __, 16 - notetype $6, $91 - stereopanning $f0 + note_type 12, 9, 3 + duty_cycle 2 + rest 16 + note_type 6, 9, 1 + stereo_panning TRUE, FALSE octave 3 note E_, 2 octave 2 @@ -175,27 +176,27 @@ Music_VioletCity_branch_f0056: note G#, 2 octave 3 note E_, 2 - stereopanning $f + stereo_panning FALSE, TRUE octave 2 note B_, 2 note G#, 2 note B_, 2 octave 3 note E_, 2 - intensity $a4 - stereopanning $ff + volume_envelope 10, 4 + stereo_panning TRUE, TRUE note D#, 8 - note __, 8 - dutycycle $3 - intensity $84 - note __, 4 + rest 8 + duty_cycle 3 + volume_envelope 8, 4 + rest 4 note G_, 2 note A_, 2 note B_, 4 octave 4 note D_, 4 note C#, 4 - notetype $8, $84 + note_type 8, 8, 4 octave 3 note B_, 1 octave 4 @@ -203,36 +204,36 @@ Music_VioletCity_branch_f0056: octave 3 note B_, 1 note A_, 3 - notetype $c, $84 + note_type 12, 8, 4 note F#, 1 - note __, 1 + rest 1 note F#, 2 note C#, 1 - note __, 1 + rest 1 note F#, 2 note D_, 4 note E_, 4 note F#, 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 octave 4 note C#, 1 note D_, 2 note F#, 2 note E_, 2 - notetype $8, $84 + note_type 8, 8, 4 note D_, 1 note E_, 1 note D_, 1 note C#, 3 - notetype $c, $84 + note_type 12, 8, 4 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 2 octave 4 note E_, 4 @@ -245,11 +246,11 @@ Music_VioletCity_branch_f0056: octave 4 note E_, 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 note A#, 1 note B_, 4 - note __, 4 + rest 4 note G#, 1 note F_, 1 octave 3 @@ -257,11 +258,11 @@ Music_VioletCity_branch_f0056: octave 4 note F_, 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 note A#, 1 note B_, 4 - note __, 4 + rest 4 note C#, 1 octave 3 note B_, 1 @@ -285,7 +286,7 @@ Music_VioletCity_branch_f0056: note A#, 1 octave 5 note C#, 1 - dutycycle $2 + duty_cycle 2 octave 4 note C#, 6 note C_, 1 @@ -293,21 +294,21 @@ Music_VioletCity_branch_f0056: note B_, 1 octave 4 note C#, 4 - note __, 4 - loopchannel 0, Music_VioletCity_branch_f0056 + rest 4 + sound_loop 0, .mainloop Music_VioletCity_Ch2: - vibrato $12, $24 - dutycycle $2 - notetype $c, $c7 - note __, 16 + vibrato 18, 2, 4 + duty_cycle 2 + note_type 12, 12, 7 + rest 16 octave 3 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 4 note D#, 4 note C#, 2 @@ -315,11 +316,11 @@ Music_VioletCity_Ch2: note A#, 2 note G#, 2 note F#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 octave 4 note C#, 4 octave 3 @@ -327,11 +328,11 @@ Music_VioletCity_Ch2: note A#, 2 note B_, 2 note G#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 note G#, 4 note A#, 2 note B_, 2 @@ -342,63 +343,63 @@ Music_VioletCity_Ch2: note F#, 2 octave 4 note D#, 1 - note __, 1 + rest 1 note C#, 6 - note __, 2 + rest 2 note D#, 1 note E_, 1 -Music_VioletCity_branch_f0199: - intensity $b7 +.mainloop: + volume_envelope 11, 7 note F#, 4 - note __, 2 + rest 2 note F#, 1 note G#, 1 note F#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note E_, 14 note C#, 1 note D#, 1 note E_, 4 - note __, 2 + rest 2 note E_, 1 note F#, 1 note E_, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D#, 12 - note __, 2 + rest 2 octave 3 note B_, 1 octave 4 note C#, 1 note D#, 4 - note __, 2 + rest 2 note D#, 1 note E_, 1 note D#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 3 note B_, 2 octave 4 note C#, 1 - note __, 1 + rest 1 note D#, 4 note G#, 4 note B_, 3 - note __, 3 + rest 3 note C#, 1 note D#, 1 note E_, 2 @@ -421,41 +422,41 @@ Music_VioletCity_branch_f0199: note C#, 1 octave 3 note B_, 12 - note __, 4 - intensity $a7 - dutycycle $3 - note __, 2 + rest 4 + volume_envelope 10, 7 + duty_cycle 3 + rest 2 note B_, 1 octave 4 note C#, 1 note D_, 2 note F#, 2 note E_, 2 - notetype $8, $a7 + note_type 8, 10, 7 note D_, 1 note E_, 1 note D_, 1 note C#, 3 - notetype $c, $a7 + note_type 12, 10, 7 octave 3 note B_, 1 - note __, 1 + rest 1 note A_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 2 octave 4 note E_, 4 note D_, 4 note C#, 2 - note __, 2 + rest 2 note G_, 1 note A_, 1 note B_, 2 octave 5 note D_, 2 note C#, 2 - notetype $8, $a7 + note_type 8, 10, 7 octave 4 note B_, 1 octave 5 @@ -463,130 +464,130 @@ Music_VioletCity_branch_f0199: octave 4 note B_, 1 note A_, 3 - notetype $c, $a7 + note_type 12, 10, 7 note G_, 1 - note __, 1 + rest 1 note F#, 2 note C#, 1 - note __, 1 + rest 1 note F#, 2 - vibrato $0, $0 - intensity $87 + vibrato 0, 0, 0 + volume_envelope 8, 7 octave 5 note E_, 4 note F#, 4 note D_, 1 note E_, 1 note F#, 12 - note __, 2 + rest 2 note D_, 1 note E_, 1 note F#, 12 - note __, 2 + rest 2 octave 4 note A#, 1 note B_, 1 octave 5 note C#, 11 - note __, 5 - vibrato $12, $24 - intensity $a7 - dutycycle $2 + rest 5 + vibrato 18, 2, 4 + volume_envelope 10, 7 + duty_cycle 2 octave 4 note A#, 6 note A_, 1 note G#, 1 note F#, 4 - note __, 2 + rest 2 note D#, 1 note E_, 1 - loopchannel 0, Music_VioletCity_branch_f0199 + sound_loop 0, .mainloop Music_VioletCity_Ch3: - notetype $c, $25 - note __, 16 - note __, 6 + note_type 12, 2, 5 + rest 16 + rest 6 octave 4 note E_, 4 - note __, 6 - note __, 6 + rest 6 + rest 6 octave 3 note G#, 4 - note __, 6 - note __, 6 + rest 6 + rest 6 note F_, 4 - note __, 6 + rest 6 octave 2 note F#, 4 octave 3 note C#, 1 - note __, 1 + rest 1 note A#, 4 note A_, 1 note G#, 1 note F#, 2 octave 2 note A#, 2 -Music_VioletCity_branch_f0261: - notetype $c, $25 +.mainloop: + note_type 12, 2, 5 note B_, 1 - note __, 5 + rest 5 note B_, 1 note B_, 1 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 3 note F#, 2 octave 2 note F#, 1 - note __, 1 + rest 1 octave 3 note C#, 1 - note __, 5 + rest 5 note C#, 1 note C#, 1 - note __, 2 + rest 2 note C#, 1 - note __, 1 + rest 1 note G#, 2 octave 2 note G#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 5 + rest 5 note F#, 1 note F#, 1 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 octave 3 note F#, 2 note C#, 1 - note __, 1 + rest 1 octave 2 note B_, 1 - note __, 5 + rest 5 note B_, 1 note B_, 1 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 3 note B_, 4 note G#, 1 - note __, 5 + rest 5 note G#, 1 note G#, 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note F#, 2 note F#, 1 - note __, 1 - notetype $6, $25 + rest 1 + note_type 6, 2, 5 octave 3 note C#, 2 note F_, 2 @@ -599,82 +600,82 @@ Music_VioletCity_branch_f0261: note B_, 2 octave 4 note C#, 6 - notetype $c, $25 - note __, 5 - notetype $6, $25 + note_type 12, 2, 5 + rest 5 + note_type 6, 2, 5 octave 2 note E_, 2 - note __, 10 + rest 10 note E_, 2 note E_, 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 3 note C#, 4 note C_, 4 octave 2 note B_, 2 - note __, 10 + rest 10 note B_, 2 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 2 + rest 2 note A_, 8 - callchannel Music_VioletCity_branch_f0311 + sound_call .sub1 note F#, 2 - note __, 10 + rest 10 note B_, 2 note B_, 2 note B_, 2 - note __, 2 + rest 2 note A#, 8 note A_, 2 - note __, 2 - callchannel Music_VioletCity_branch_f0311 + rest 2 + sound_call .sub1 note F#, 2 - note __, 10 + rest 10 note B_, 2 note B_, 2 note B_, 2 - note __, 2 + rest 2 note A#, 8 note A_, 2 - note __, 2 + rest 2 octave 3 note E_, 2 - note __, 10 + rest 10 note E_, 2 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note B_, 4 note G#, 2 note F#, 2 note F_, 2 - note __, 10 + rest 10 note F_, 2 note F_, 2 - note __, 4 + rest 4 note F_, 2 - note __, 2 + rest 2 octave 4 note C#, 4 octave 3 note A#, 2 note G#, 2 note F#, 2 - note __, 10 + rest 10 note F#, 2 note F#, 2 octave 2 note F#, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 3 note F#, 4 octave 2 @@ -685,90 +686,90 @@ Music_VioletCity_branch_f0261: note G#, 2 note A_, 2 note A#, 8 - note __, 4 + rest 4 octave 2 note A#, 4 - loopchannel 0, Music_VioletCity_branch_f0261 + sound_loop 0, .mainloop -Music_VioletCity_branch_f0311: +.sub1: note G_, 2 - note __, 10 + rest 10 note G_, 2 note G_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note E_, 4 octave 2 note A_, 4 - endchannel + sound_ret Music_VioletCity_Ch4: - togglenoise $3 - notetype $c - note D#, 2 - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note D_, 4 - note F#, 4 - callchannel Music_VioletCity_branch_f036c - callchannel Music_VioletCity_branch_f036c - callchannel Music_VioletCity_branch_f036c - note D_, 2 - note D#, 1 - note D#, 1 - note D_, 2 - note C_, 8 - note D#, 2 -Music_VioletCity_branch_f0338: - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - callchannel Music_VioletCity_branch_f037a - loopchannel 0, Music_VioletCity_branch_f0338 + toggle_noise 3 + drum_speed 12 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 3, 4 + drum_note 7, 4 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + drum_note 3, 2 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 1, 8 + drum_note 4, 2 +.mainloop: + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_call .sub2 + sound_loop 0, .mainloop -Music_VioletCity_branch_f036c: - note D_, 1 - note D_, 1 - note D#, 1 - note D#, 1 - note D_, 2 - note G_, 2 - note G_, 1 - note G_, 1 - note F#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note G_, 1 - endchannel +.sub1: + drum_note 3, 1 + drum_note 3, 1 + drum_note 4, 1 + drum_note 4, 1 + drum_note 3, 2 + drum_note 8, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 7, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + sound_ret -Music_VioletCity_branch_f037a: - note D#, 2 - note G_, 1 - note G_, 1 - note G_, 1 - note __, 1 - note D#, 1 - note D#, 1 - note __, 2 - note D#, 2 - note D_, 2 - note D#, 2 - endchannel +.sub2: + drum_note 4, 2 + drum_note 8, 1 + drum_note 8, 1 + drum_note 8, 1 + rest 1 + drum_note 4, 1 + drum_note 4, 1 + rest 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 4, 2 + sound_ret diff --git a/audio/music/viridiancity.asm b/audio/music/viridiancity.asm index ea38a0e6..6bc72006 100644 --- a/audio/music/viridiancity.asm +++ b/audio/music/viridiancity.asm @@ -1,53 +1,54 @@ 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 + channel_count 4 + channel 1, Music_ViridianCity_Ch1 + channel 2, Music_ViridianCity_Ch2 + channel 3, Music_ViridianCity_Ch3 + channel 4, Music_ViridianCity_Ch4 Music_ViridianCity_Ch1: tempo 157 - volume $77 - stereopanning $f - dutycycle $2 - vibrato $12, $34 - notetype $c, $a7 + volume 7, 7 + stereo_panning FALSE, TRUE + duty_cycle 2 + vibrato 18, 3, 4 + note_type 12, 10, 7 octave 3 note F#, 1 - note __, 3 + rest 3 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note F#, 4 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 note F#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note G_, 8 - note __, 4 -Music_ViridianCity_branch_f4039: - callchannel Music_ViridianCity_branch_f40c5 - note __, 4 - callchannel Music_ViridianCity_branch_f40c5 + rest 4 +.mainloop: + sound_call .sub1 + rest 4 + sound_call .sub1 octave 4 note C_, 4 - callchannel Music_ViridianCity_branch_f410f + sound_call .sub2 octave 4 note B_, 2 note G_, 2 @@ -57,35 +58,35 @@ Music_ViridianCity_branch_f4039: note F#, 2 note E_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note F#, 2 note A_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note C#, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 - intensity $87 + rest 1 + volume_envelope 8, 7 octave 5 note F#, 4 note F_, 4 - intensity $a7 + volume_envelope 10, 7 octave 3 note G_, 6 note B_, 8 octave 4 note E_, 2 - note __, 2 + rest 2 note E_, 2 octave 3 note B_, 4 @@ -97,27 +98,27 @@ Music_ViridianCity_branch_f4039: note A_, 2 octave 3 note D_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 3 + rest 3 note D_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note F#, 2 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 note D#, 2 note C_, 2 octave 3 note B_, 2 note A_, 2 - callchannel Music_ViridianCity_branch_f410f + sound_call .sub2 octave 4 note A_, 2 note G_, 2 @@ -127,430 +128,430 @@ Music_ViridianCity_branch_f4039: note F#, 2 note E_, 2 note F#, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note F#, 2 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 note E_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 note F#, 2 note G_, 6 note B_, 1 - note __, 1 + rest 1 octave 4 note E_, 4 note F#, 2 note G_, 6 note E_, 2 - note __, 2 + rest 2 octave 3 note G_, 2 octave 4 note E_, 2 - note __, 2 + rest 2 note F#, 6 note D_, 4 octave 3 note A_, 4 note F#, 4 note G_, 1 - note __, 3 + rest 3 note G_, 8 note A#, 4 - loopchannel 0, Music_ViridianCity_branch_f4039 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f40c5: +.sub1: octave 3 note A_, 1 - note __, 3 + rest 3 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 4 - note __, 2 + rest 2 octave 3 note A_, 2 - note __, 2 + rest 2 octave 4 note C_, 2 octave 3 note A_, 1 - note __, 1 + rest 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 - note __, 3 + rest 3 note G_, 2 - note __, 4 + rest 4 note G_, 2 - note __, 2 + rest 2 octave 4 note D_, 2 - note __, 2 + rest 2 octave 3 note B_, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 3 + rest 3 note D_, 2 - note __, 4 + rest 4 note D_, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 octave 3 note G_, 4 - note __, 2 + rest 2 octave 4 note C#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D_, 4 note C#, 1 - note __, 1 + rest 1 octave 3 note A_, 1 - note __, 3 + rest 3 note F#, 2 - note __, 4 + rest 4 note F#, 2 - note __, 2 + rest 2 note G_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note G_, 8 - endchannel + sound_ret -Music_ViridianCity_branch_f410f: +.sub2: octave 3 note B_, 2 note D_, 2 note G_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 3 + rest 3 note G_, 2 note B_, 1 - note __, 1 + rest 1 octave 4 note D_, 1 - note __, 1 - note __, 2 + rest 1 + rest 2 octave 3 note B_, 2 octave 4 note D_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - endchannel + rest 1 + sound_ret Music_ViridianCity_Ch2: - vibrato $10, $46 - dutycycle $1 - notetype $c, $b7 - stereopanning $f0 + vibrato 16, 4, 6 + duty_cycle 1 + note_type 12, 11, 7 + stereo_panning TRUE, FALSE octave 2 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 4 + rest 4 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C#, 4 octave 2 note A_, 1 - note __, 1 + rest 1 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note E_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note E_, 8 - note __, 4 -Music_ViridianCity_branch_f414c: - callchannel Music_ViridianCity_branch_f41c0 - note __, 4 - callchannel Music_ViridianCity_branch_f41c0 + rest 4 +.mainloop: + sound_call .sub1 + rest 4 + sound_call .sub1 octave 2 note F#, 4 - callchannel Music_ViridianCity_branch_f4201 + sound_call .sub2 note G_, 4 - note __, 2 + rest 2 octave 3 note D_, 1 - note __, 1 + rest 1 octave 2 note G_, 1 - note __, 1 + rest 1 octave 3 note D_, 4 octave 2 note B_, 2 - callchannel Music_ViridianCity_branch_f420b - note __, 2 + sound_call .sub3 + rest 2 note F#, 2 - note __, 2 + rest 2 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 4 note C_, 4 - callchannel Music_ViridianCity_branch_f4215 + sound_call .sub4 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note E_, 2 note B_, 2 note G_, 4 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 note C_, 2 note C#, 2 - note __, 2 + rest 2 note D#, 2 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 1 - note __, 1 + rest 1 note D#, 2 note C_, 2 octave 2 note A_, 2 note F#, 2 - callchannel Music_ViridianCity_branch_f4201 + sound_call .sub2 note G_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note B_, 4 note G_, 2 - callchannel Music_ViridianCity_branch_f420b - note __, 2 + sound_call .sub3 + rest 2 note F#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note D#, 2 - callchannel Music_ViridianCity_branch_f4215 + sound_call .sub4 note E_, 4 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note A#, 4 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 8 octave 1 note A_, 4 - loopchannel 0, Music_ViridianCity_branch_f414c + sound_loop 0, .mainloop -Music_ViridianCity_branch_f41c0: +.sub1: octave 2 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 4 + rest 4 note D#, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 3 note C_, 4 octave 2 note A_, 1 - note __, 1 + rest 1 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 4 - note __, 4 + rest 4 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 1 - note __, 1 + rest 1 octave 3 note D_, 4 octave 2 note B_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 2 + rest 2 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 4 - note __, 4 + rest 4 octave 2 note A_, 4 - note __, 2 + rest 2 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note G_, 4 note E_, 1 - note __, 1 + rest 1 octave 2 note D_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 note E_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note E_, 8 - endchannel + sound_ret -Music_ViridianCity_branch_f4201: +.sub2: note G_, 4 - note __, 2 + rest 2 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 4 octave 2 note F_, 2 note F#, 2 - endchannel + sound_ret -Music_ViridianCity_branch_f420b: +.sub3: note F#, 4 - note __, 2 + rest 2 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 4 octave 2 note E_, 2 note F_, 2 - endchannel + sound_ret -Music_ViridianCity_branch_f4215: +.sub4: octave 2 note E_, 4 - note __, 2 + rest 2 note B_, 1 - note __, 1 + rest 1 note B_, 4 note D_, 2 note D#, 2 - endchannel + sound_ret Music_ViridianCity_Ch3: - vibrato $12, $24 - notetype $c, $13 - stereopanning $ff + vibrato 18, 2, 4 + note_type 12, 1, 3 + stereo_panning TRUE, TRUE octave 4 note A_, 1 - note __, 3 + rest 3 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A_, 4 - note __, 2 + rest 2 octave 5 note F#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 4 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 3 + rest 3 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 octave 5 note D_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note D_, 8 note F#, 2 note G_, 2 -Music_ViridianCity_branch_f4246: - intensity $13 - callchannel Music_ViridianCity_branch_f42a2 +.mainloop: + volume_envelope 1, 3 + sound_call .sub1 octave 5 note F#, 2 note G_, 2 - callchannel Music_ViridianCity_branch_f42a2 + sound_call .sub1 note E_, 4 - vibrato $18, $25 - intensity $25 + vibrato 24, 2, 5 + volume_envelope 2, 5 note B_, 12 note G_, 4 octave 6 @@ -569,7 +570,7 @@ Music_ViridianCity_branch_f4246: note E_, 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 note F#, 4 note E_, 4 @@ -577,7 +578,7 @@ Music_ViridianCity_branch_f4246: note F#, 12 note D_, 4 note A_, 4 - note __, 4 + rest 4 octave 6 note C_, 8 octave 5 @@ -586,57 +587,57 @@ Music_ViridianCity_branch_f4246: note C#, 2 note D_, 2 note E_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 + rest 2 octave 5 note B_, 2 - note __, 2 + rest 2 note A_, 10 note A_, 2 note B_, 2 octave 6 note C_, 2 - note __, 2 + rest 2 octave 5 note B_, 2 - note __, 2 + rest 2 note A_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note G_, 12 note G_, 2 note A_, 2 note A#, 6 note A_, 2 - note __, 2 + rest 2 note G_, 2 note A#, 2 - note __, 2 + rest 2 note A_, 14 - note __, 4 + rest 4 note D_, 1 - note __, 3 + rest 3 note D_, 8 note E_, 4 - loopchannel 0, Music_ViridianCity_branch_f4246 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f42a2: +.sub1: octave 5 note A_, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 6 - note __, 2 + rest 6 + rest 2 note F#, 2 note G_, 2 note A_, 2 - note __, 2 + rest 2 note A_, 2 note G_, 2 note F#, 2 @@ -644,32 +645,32 @@ Music_ViridianCity_branch_f42a2: note E_, 2 octave 4 note B_, 2 - note __, 4 + rest 4 note B_, 2 - note __, 2 + rest 2 octave 5 note G_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 octave 4 note B_, 1 - note __, 1 + rest 1 note B_, 4 octave 5 note E_, 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 note F#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 6 - note __, 2 + rest 6 + rest 2 note E_, 2 note F#, 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 note F#, 2 note E_, 2 @@ -677,106 +678,106 @@ Music_ViridianCity_branch_f42a2: note D_, 2 octave 4 note A_, 2 - note __, 4 + rest 4 note A_, 2 - note __, 2 + rest 2 octave 5 note D_, 1 - note __, 1 - note __, 4 + rest 1 + rest 4 note D_, 8 - endchannel + sound_ret Music_ViridianCity_Ch4: - togglenoise $3 - notetype $c - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f432c -Music_ViridianCity_branch_f42e9: - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f432c - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f431d - callchannel Music_ViridianCity_branch_f432c - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f434b - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f434b - callchannel Music_ViridianCity_branch_f433b - callchannel Music_ViridianCity_branch_f433b - loopchannel 0, Music_ViridianCity_branch_f42e9 + toggle_noise 3 + drum_speed 12 + sound_call .sub1 + sound_call .sub2 +.mainloop: + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub1 + sound_call .sub1 + sound_call .sub1 + sound_call .sub2 + sound_call .sub3 + sound_call .sub4 + sound_call .sub3 + sound_call .sub3 + sound_call .sub3 + sound_call .sub4 + sound_call .sub3 + sound_call .sub3 + sound_loop 0, .mainloop -Music_ViridianCity_branch_f431d: - note E_, 2 - note E_, 2 - note D_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note E_, 2 - note D_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - endchannel +.sub1: + drum_note 5, 2 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 4 + drum_note 3, 2 + drum_note 5, 2 + drum_note 7, 2 + drum_note 5, 2 + drum_note 5, 2 + drum_note 3, 4 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 2 + drum_note 7, 2 + sound_ret -Music_ViridianCity_branch_f432c: - note E_, 2 - note E_, 2 - note D_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note E_, 2 - note F#, 4 - note D_, 2 - note D_, 2 - note A#, 2 - note A#, 2 - endchannel +.sub2: + drum_note 5, 2 + drum_note 5, 2 + drum_note 3, 2 + drum_note 5, 4 + drum_note 3, 2 + drum_note 5, 2 + drum_note 7, 2 + drum_note 5, 2 + drum_note 5, 2 + drum_note 7, 4 + drum_note 3, 2 + drum_note 3, 2 + drum_note 11, 2 + drum_note 11, 2 + sound_ret -Music_ViridianCity_branch_f433b: - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note F#, 2 - note D_, 4 - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - endchannel +.sub3: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 4 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + sound_ret -Music_ViridianCity_branch_f434b: - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note F#, 2 - note D_, 4 - note D#, 2 - note F#, 2 - note D_, 2 - note D#, 2 - note D#, 2 - note D_, 2 - note D_, 2 - note F#, 2 - endchannel +.sub4: + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 4 + drum_note 4, 2 + drum_note 7, 2 + drum_note 3, 2 + drum_note 4, 2 + drum_note 4, 2 + drum_note 3, 2 + drum_note 3, 2 + drum_note 7, 2 + sound_ret diff --git a/audio/music/wildpokemonvictory.asm b/audio/music/wildpokemonvictory.asm index f1438dc6..95159517 100644 --- a/audio/music/wildpokemonvictory.asm +++ b/audio/music/wildpokemonvictory.asm @@ -1,48 +1,49 @@ Music_WildPokemonVictory: - musicheader 3, 1, Music_WildPokemonVictory_Ch1 - musicheader 1, 2, Music_WildPokemonVictory_Ch2 - musicheader 1, 3, Music_WildPokemonVictory_Ch3 + channel_count 3 + channel 1, Music_WildPokemonVictory_Ch1 + channel 2, Music_WildPokemonVictory_Ch2 + channel 3, Music_WildPokemonVictory_Ch3 Music_WildPokemonVictory_Ch1: tempo 126 - volume $77 - dutycycle $3 - tone $0001 - notetype $c, $b1 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + note_type 12, 11, 1 octave 3 note B_, 1 note A_, 1 note G#, 1 note F#, 1 - intensity $b6 + volume_envelope 11, 6 note E_, 12 -Music_SuccessfulCapture_branch_f4536: - stereopanning $f -Music_WildPokemonVictory_branch_f4538: - callchannel Music_WildPokemonVictory_branch_f455c +.body: + stereo_panning FALSE, TRUE +.mainloop: + sound_call .sub1 note F#, 2 note F#, 2 note F#, 4 - callchannel Music_WildPokemonVictory_branch_f455c + sound_call .sub1 note G#, 4 - intensity $78 + volume_envelope 7, 8 octave 3 note G_, 4 - pitchoffset 0, C# - callchannel Music_WildPokemonVictory_branch_f455c + transpose 0, 1 + sound_call .sub1 note F#, 2 note F#, 2 note F#, 4 - callchannel Music_WildPokemonVictory_branch_f455c + sound_call .sub1 note G#, 4 - pitchoffset 0, C_ - intensity $78 + transpose 0, 0 + volume_envelope 7, 8 octave 3 note F#, 4 - loopchannel 0, Music_WildPokemonVictory_branch_f4538 + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f455c: - intensity $71 +.sub1: + volume_envelope 7, 1 octave 3 note G#, 1 note B_, 1 @@ -65,56 +66,56 @@ Music_WildPokemonVictory_branch_f455c: note E_, 2 note E_, 2 note A_, 2 - endchannel + sound_ret Music_WildPokemonVictory_Ch2: - vibrato $12, $24 - dutycycle $2 - notetype $c, $d1 + vibrato 18, 2, 4 + duty_cycle 2 + note_type 12, 13, 1 octave 4 note E_, 1 note F#, 1 note G#, 1 note A_, 1 - intensity $d6 + volume_envelope 13, 6 note B_, 12 -Music_SuccessfulCapture_branch_f4585: - stereopanning $f0 -Music_WildPokemonVictory_branch_f4587: - callchannel Music_WildPokemonVictory_branch_f45b5 +.body: + stereo_panning TRUE, FALSE +.mainloop: + sound_call .sub1 octave 4 note B_, 2 note B_, 2 note B_, 4 - callchannel Music_WildPokemonVictory_branch_f45b5 + sound_call .sub1 octave 4 note B_, 4 - intensity $81 + volume_envelope 8, 1 note C_, 1 note E_, 1 note G_, 1 note A#, 1 - pitchoffset 0, C# - callchannel Music_WildPokemonVictory_branch_f45b5 + transpose 0, 1 + sound_call .sub1 octave 4 note B_, 2 note B_, 2 note B_, 4 - callchannel Music_WildPokemonVictory_branch_f45b5 + sound_call .sub1 octave 4 note B_, 4 - pitchoffset 0, C_ - intensity $81 + transpose 0, 0 + volume_envelope 8, 1 octave 3 note B_, 1 octave 4 note D#, 1 note F#, 1 note A_, 1 - loopchannel 0, Music_WildPokemonVictory_branch_f4587 + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f45b5: - intensity $81 +.sub1: + volume_envelope 8, 1 octave 4 note B_, 2 note A_, 2 @@ -127,56 +128,56 @@ Music_WildPokemonVictory_branch_f45b5: note C#, 2 note C#, 2 note C#, 4 - endchannel + sound_ret Music_WildPokemonVictory_Ch3: - notetype $c, $20 - note __, 6 + note_type 12, 2, 0 + rest 6 octave 6 note D#, 1 - note __, 1 + rest 1 note E_, 1 - note __, 3 + rest 3 note E_, 1 - note __, 3 -Music_SuccessfulCapture_branch_f45cf: -Music_WildPokemonVictory_branch_f45cf: - callchannel Music_WildPokemonVictory_branch_f45f4 + rest 3 +.body: +.mainloop: + sound_call .sub1 note D#, 2 note C#, 2 octave 2 note B_, 2 - note __, 2 - callchannel Music_WildPokemonVictory_branch_f45f4 + rest 2 + sound_call .sub1 note E_, 2 - note __, 2 + rest 2 note C_, 4 - pitchoffset 0, C# - callchannel Music_WildPokemonVictory_branch_f45f4 + transpose 0, 1 + sound_call .sub1 note D#, 2 note C#, 2 octave 2 note B_, 2 - note __, 2 - callchannel Music_WildPokemonVictory_branch_f45f4 + rest 2 + sound_call .sub1 note E_, 2 - note __, 2 - pitchoffset 0, C_ + rest 2 + transpose 0, 0 octave 2 note B_, 4 - loopchannel 0, Music_WildPokemonVictory_branch_f45cf + sound_loop 0, .mainloop -Music_WildPokemonVictory_branch_f45f4: - intensity $25 +.sub1: + volume_envelope 2, 5 octave 3 note E_, 2 - note __, 4 + rest 4 note E_, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 note C#, 2 - note __, 4 + rest 4 note C#, 2 - endchannel + sound_ret diff --git a/audio/sfx.asm b/audio/sfx.asm index dec2b7ae..414aad9c 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -1,459 +1,564 @@ Sfx_PokeballsPlacedOnTable: - musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5 + channel_count 1 + channel 5, Sfx_PokeballsPlacedOnTable_Ch5 Sfx_BallWobble: - musicheader 1, 5, Sfx_BallWobble_Ch5 + channel_count 1 + channel 5, Sfx_BallWobble_Ch5 Sfx_Potion: - musicheader 1, 5, Sfx_Potion_Ch5 + channel_count 1 + channel 5, Sfx_Potion_Ch5 Sfx_FullHeal: - musicheader 1, 5, Sfx_FullHeal_Ch5 + channel_count 1 + channel 5, Sfx_FullHeal_Ch5 Sfx_Menu: - musicheader 1, 8, Sfx_Menu_Ch8 + channel_count 1 + channel 8, Sfx_Menu_Ch8 -Sfx_ReadText2: Sfx_ReadText: - musicheader 1, 5, Sfx_ReadText2_Ch5 +Sfx_ReadText2: + channel_count 1 + channel 5, Sfx_ReadText2_Ch5 Sfx_Poison: - musicheader 1, 5, Sfx_Poison_Ch5 + channel_count 1 + channel 5, Sfx_Poison_Ch5 Sfx_GotSafariBalls: - musicheader 1, 5, Sfx_GotSafariBalls_Ch5 + channel_count 1 + channel 5, Sfx_GotSafariBalls_Ch5 Sfx_BootPc: - musicheader 1, 5, Sfx_BootPc_Ch5 + channel_count 1 + channel 5, Sfx_BootPc_Ch5 Sfx_ShutDownPc: - musicheader 1, 5, Sfx_ShutDownPc_Ch5 + channel_count 1 + channel 5, Sfx_ShutDownPc_Ch5 Sfx_ChoosePcOption: - musicheader 1, 5, Sfx_ChoosePcOption_Ch5 + channel_count 1 + channel 5, Sfx_ChoosePcOption_Ch5 Sfx_EscapeRope: - musicheader 1, 5, Sfx_EscapeRope_Ch5 + channel_count 1 + channel 5, Sfx_EscapeRope_Ch5 Sfx_PushButton: - musicheader 1, 5, Sfx_PushButton_Ch5 + channel_count 1 + channel 5, Sfx_PushButton_Ch5 Sfx_SecondPartOfItemfinder: - musicheader 1, 5, Sfx_SecondPartOfItemfinder_Ch5 + channel_count 1 + channel 5, Sfx_SecondPartOfItemfinder_Ch5 Sfx_WarpTo: - musicheader 1, 5, Sfx_WarpTo_Ch5 + channel_count 1 + channel 5, Sfx_WarpTo_Ch5 Sfx_WarpFrom: - musicheader 1, 5, Sfx_WarpFrom_Ch5 + channel_count 1 + channel 5, Sfx_WarpFrom_Ch5 Sfx_ChangeDexMode: - musicheader 1, 5, Sfx_ChangeDexMode_Ch5 + channel_count 1 + channel 5, Sfx_ChangeDexMode_Ch5 Sfx_JumpOverLedge: - musicheader 1, 5, Sfx_JumpOverLedge_Ch5 + channel_count 1 + channel 5, Sfx_JumpOverLedge_Ch5 Sfx_GrassRustle: - musicheader 1, 8, Sfx_GrassRustle_Ch8 + channel_count 1 + channel 8, Sfx_GrassRustle_Ch8 Sfx_Fly: - musicheader 1, 8, Sfx_Fly_Ch8 + channel_count 1 + channel 8, Sfx_Fly_Ch8 Sfx_Wrong: - musicheader 2, 5, Sfx_Wrong_Ch5 - musicheader 1, 6, Sfx_Wrong_Ch6 + channel_count 2 + channel 5, Sfx_Wrong_Ch5 + channel 6, Sfx_Wrong_Ch6 Sfx_Squeak: - musicheader 1, 5, Sfx_Squeak_Ch5 + channel_count 1 + channel 5, Sfx_Squeak_Ch5 Sfx_Strength: - musicheader 1, 8, Sfx_Strength_Ch8 + channel_count 1 + channel 8, Sfx_Strength_Ch8 Sfx_Boat: - musicheader 2, 5, Sfx_Boat_Ch5 - musicheader 1, 6, Sfx_Boat_Ch6 + channel_count 2 + channel 5, Sfx_Boat_Ch5 + channel 6, Sfx_Boat_Ch6 Sfx_WallOpen: - musicheader 1, 5, Sfx_WallOpen_Ch5 + channel_count 1 + channel 5, Sfx_WallOpen_Ch5 Sfx_PlacePuzzlePieceDown: - musicheader 1, 8, Sfx_PlacePuzzlePieceDown_Ch8 + channel_count 1 + channel 8, Sfx_PlacePuzzlePieceDown_Ch8 Sfx_EnterDoor: - musicheader 1, 8, Sfx_EnterDoor_Ch8 + channel_count 1 + channel 8, Sfx_EnterDoor_Ch8 Sfx_SwitchPokemon: - musicheader 2, 5, Sfx_SwitchPokemon_Ch5 - musicheader 1, 6, Sfx_SwitchPokemon_Ch6 + channel_count 2 + channel 5, Sfx_SwitchPokemon_Ch5 + channel 6, Sfx_SwitchPokemon_Ch6 Sfx_Tally: - musicheader 2, 5, Sfx_Tally_Ch5 - musicheader 1, 6, Sfx_Tally_Ch6 + channel_count 2 + channel 5, Sfx_Tally_Ch5 + channel 6, Sfx_Tally_Ch6 Sfx_Transaction: - musicheader 2, 5, Sfx_Transaction_Ch5 - musicheader 1, 6, Sfx_Transaction_Ch6 + channel_count 2 + channel 5, Sfx_Transaction_Ch5 + channel 6, Sfx_Transaction_Ch6 Sfx_Bump: - musicheader 1, 5, Sfx_Bump_Ch5 + channel_count 1 + channel 5, Sfx_Bump_Ch5 Sfx_ExitBuilding: - musicheader 1, 8, Sfx_ExitBuilding_Ch8 + channel_count 1 + channel 8, Sfx_ExitBuilding_Ch8 Sfx_Save: - musicheader 2, 5, Sfx_Save_Ch5 - musicheader 1, 6, Sfx_Save_Ch6 + channel_count 2 + channel 5, Sfx_Save_Ch5 + channel 6, Sfx_Save_Ch6 Sfx_Save_Ch5: - dutycycle $2 - sound __, 3, $f1, $0700 - sound __, 2, $e1, $0600 - sound __, 2, $e1, $0680 - sound __, 2, $e1, $06c0 - sound __, 3, $e1, $0700 - sound __, 3, $e1, $07c0 - sound __, 16, $f2, $07e0 - endchannel + duty_cycle 2 + square_note 2, 15, 1, 1792 + square_note 1, 14, 1, 1536 + square_note 1, 14, 1, 1664 + square_note 1, 14, 1, 1728 + square_note 2, 14, 1, 1792 + square_note 2, 14, 1, 1984 + square_note 15, 15, 2, 2016 + sound_ret Sfx_Save_Ch6: - dutycycle $2 - sound __, 3, $8, 0 - sound __, 3, $a1, $0701 - sound __, 2, $91, $0601 - sound __, 2, $91, $0681 - sound __, 2, $91, $06c1 - sound __, 3, $91, $0701 - sound __, 3, $91, $07c1 - sound __, 16, $d2, $07e1 - endchannel + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 2, 10, 1, 1793 + square_note 1, 9, 1, 1537 + square_note 1, 9, 1, 1665 + square_note 1, 9, 1, 1729 + square_note 2, 9, 1, 1793 + square_note 2, 9, 1, 1985 + square_note 15, 13, 2, 2017 + sound_ret Sfx_Pokeflute: - musicheader 1, 7, Sfx_Pokeflute_Ch7 + channel_count 1 + channel 7, Sfx_Pokeflute_Ch7 Sfx_ElevatorEnd: - musicheader 1, 5, Sfx_ElevatorEnd_Ch5 + channel_count 1 + channel 5, Sfx_ElevatorEnd_Ch5 Sfx_ThrowBall: - musicheader 2, 5, Sfx_ThrowBall_Ch5 - musicheader 1, 6, Sfx_ThrowBall_Ch6 + channel_count 2 + channel 5, Sfx_ThrowBall_Ch5 + channel 6, Sfx_ThrowBall_Ch6 Sfx_BallPoof: - musicheader 2, 5, Sfx_BallPoof_Ch5 - musicheader 1, 8, Sfx_BallPoof_Ch8 + channel_count 2 + channel 5, Sfx_BallPoof_Ch5 + channel 8, Sfx_BallPoof_Ch8 Sfx_Unknown3A: - musicheader 2, 5, Sfx_Unknown3A_Ch5 - musicheader 1, 8, Sfx_Unknown3A_Ch8 + channel_count 2 + channel 5, Sfx_Unknown3A_Ch5 + channel 8, Sfx_Unknown3A_Ch8 Sfx_Run: - musicheader 1, 8, Sfx_Run_Ch8 + channel_count 1 + channel 8, Sfx_Run_Ch8 Sfx_SlotMachineStart: - musicheader 2, 5, Sfx_SlotMachineStart_Ch5 - musicheader 1, 6, Sfx_SlotMachineStart_Ch6 + channel_count 2 + channel 5, Sfx_SlotMachineStart_Ch5 + channel 6, Sfx_SlotMachineStart_Ch6 Sfx_Call: - musicheader 1, 5, Sfx_Call_Ch5 + channel_count 1 + channel 5, Sfx_Call_Ch5 Sfx_Unknown60: - musicheader 1, 8, Sfx_Unknown60_Ch8 + channel_count 1 + channel 8, Sfx_Unknown60_Ch8 Sfx_Unknown61: - musicheader 1, 8, Sfx_Unknown61_Ch8 + channel_count 1 + channel 8, Sfx_Unknown61_Ch8 Sfx_SwitchPockets: - musicheader 1, 8, Sfx_SwitchPockets_Ch8 + channel_count 1 + channel 8, Sfx_SwitchPockets_Ch8 Sfx_Unknown63: - musicheader 1, 8, Sfx_Unknown63_Ch8 + channel_count 1 + channel 8, Sfx_Unknown63_Ch8 Sfx_Burn: - musicheader 1, 8, Sfx_Burn_Ch8 + channel_count 1 + channel 8, Sfx_Burn_Ch8 Sfx_TitleScreenEntrance: - musicheader 1, 8, Sfx_TitleScreenEntrance_Ch8 + channel_count 1 + channel 8, Sfx_TitleScreenEntrance_Ch8 Sfx_Unknown66: - musicheader 1, 5, Sfx_Unknown66_Ch5 + channel_count 1 + channel 5, Sfx_Unknown66_Ch5 Sfx_GetCoinFromSlots: - musicheader 1, 5, Sfx_GetCoinFromSlots_Ch5 + channel_count 1 + channel 5, Sfx_GetCoinFromSlots_Ch5 Sfx_PayDay: - musicheader 2, 5, Sfx_PayDay_Ch5 - musicheader 1, 6, Sfx_PayDay_Ch6 + channel_count 2 + channel 5, Sfx_PayDay_Ch5 + channel 6, Sfx_PayDay_Ch6 Sfx_Metronome: - musicheader 1, 5, Sfx_Metronome_Ch5 + channel_count 1 + channel 5, Sfx_Metronome_Ch5 Sfx_Peck: - musicheader 1, 8, Sfx_Peck_Ch8 + channel_count 1 + channel 8, Sfx_Peck_Ch8 Sfx_Kinesis: - musicheader 1, 5, Sfx_Kinesis_Ch5 + channel_count 1 + channel 5, Sfx_Kinesis_Ch5 Sfx_Lick: - musicheader 1, 5, Sfx_Lick_Ch5 + channel_count 1 + channel 5, Sfx_Lick_Ch5 Sfx_Pound: - musicheader 1, 8, Sfx_Pound_Ch8 + channel_count 1 + channel 8, Sfx_Pound_Ch8 Sfx_MovePuzzlePiece: - musicheader 1, 8, Sfx_MovePuzzlePiece_Ch8 + channel_count 1 + channel 8, Sfx_MovePuzzlePiece_Ch8 Sfx_CometPunch: - musicheader 1, 8, Sfx_CometPunch_Ch8 + channel_count 1 + channel 8, Sfx_CometPunch_Ch8 Sfx_MegaPunch: - musicheader 1, 8, Sfx_MegaPunch_Ch8 + channel_count 1 + channel 8, Sfx_MegaPunch_Ch8 Sfx_Scratch: - musicheader 1, 8, Sfx_Scratch_Ch8 + channel_count 1 + channel 8, Sfx_Scratch_Ch8 Sfx_Vicegrip: - musicheader 1, 8, Sfx_Vicegrip_Ch8 + channel_count 1 + channel 8, Sfx_Vicegrip_Ch8 Sfx_RazorWind: - musicheader 1, 8, Sfx_RazorWind_Ch8 + channel_count 1 + channel 8, Sfx_RazorWind_Ch8 Sfx_Cut: - musicheader 1, 8, Sfx_Cut_Ch8 + channel_count 1 + channel 8, Sfx_Cut_Ch8 Sfx_WingAttack: - musicheader 1, 8, Sfx_WingAttack_Ch8 + channel_count 1 + channel 8, Sfx_WingAttack_Ch8 Sfx_Whirlwind: - musicheader 1, 8, Sfx_Whirlwind_Ch8 + channel_count 1 + channel 8, Sfx_Whirlwind_Ch8 Sfx_Bind: - musicheader 1, 8, Sfx_Bind_Ch8 + channel_count 1 + channel 8, Sfx_Bind_Ch8 Sfx_VineWhip: - musicheader 1, 8, Sfx_VineWhip_Ch8 + channel_count 1 + channel 8, Sfx_VineWhip_Ch8 Sfx_DoubleKick: - musicheader 1, 8, Sfx_DoubleKick_Ch8 + channel_count 1 + channel 8, Sfx_DoubleKick_Ch8 Sfx_MegaKick: - musicheader 1, 8, Sfx_MegaKick_Ch8 + channel_count 1 + channel 8, Sfx_MegaKick_Ch8 Sfx_Headbutt: - musicheader 1, 8, Sfx_Headbutt_Ch8 + channel_count 1 + channel 8, Sfx_Headbutt_Ch8 Sfx_HornAttack: - musicheader 1, 8, Sfx_HornAttack_Ch8 + channel_count 1 + channel 8, Sfx_HornAttack_Ch8 Sfx_Tackle: - musicheader 1, 8, Sfx_Tackle_Ch8 + channel_count 1 + channel 8, Sfx_Tackle_Ch8 Sfx_PoisonSting: - musicheader 1, 8, Sfx_PoisonSting_Ch8 + channel_count 1 + channel 8, Sfx_PoisonSting_Ch8 Sfx_Powder: - musicheader 1, 8, Sfx_Powder_Ch8 + channel_count 1 + channel 8, Sfx_Powder_Ch8 Sfx_Doubleslap: - musicheader 1, 8, Sfx_Doubleslap_Ch8 + channel_count 1 + channel 8, Sfx_Doubleslap_Ch8 Sfx_Bite: - musicheader 2, 5, Sfx_Bite_Ch5 - musicheader 1, 8, Sfx_Bite_Ch8 + channel_count 2 + channel 5, Sfx_Bite_Ch5 + channel 8, Sfx_Bite_Ch8 Sfx_JumpKick: - musicheader 1, 8, Sfx_JumpKick_Ch8 + channel_count 1 + channel 8, Sfx_JumpKick_Ch8 Sfx_Stomp: - musicheader 1, 8, Sfx_Stomp_Ch8 + channel_count 1 + channel 8, Sfx_Stomp_Ch8 Sfx_TailWhip: - musicheader 1, 8, Sfx_TailWhip_Ch8 + channel_count 1 + channel 8, Sfx_TailWhip_Ch8 Sfx_KarateChop: - musicheader 1, 8, Sfx_KarateChop_Ch8 + channel_count 1 + channel 8, Sfx_KarateChop_Ch8 Sfx_Submission: - musicheader 1, 8, Sfx_Submission_Ch8 + channel_count 1 + channel 8, Sfx_Submission_Ch8 Sfx_WaterGun: - musicheader 2, 5, Sfx_WaterGun_Ch5 - musicheader 1, 8, Sfx_WaterGun_Ch8 + channel_count 2 + channel 5, Sfx_WaterGun_Ch5 + channel 8, Sfx_WaterGun_Ch8 Sfx_SwordsDance: - musicheader 1, 8, Sfx_SwordsDance_Ch8 + channel_count 1 + channel 8, Sfx_SwordsDance_Ch8 Sfx_Thunder: - musicheader 1, 8, Sfx_Thunder_Ch8 + channel_count 1 + channel 8, Sfx_Thunder_Ch8 Sfx_Supersonic: - musicheader 3, 5, Sfx_Supersonic_Ch5 - musicheader 1, 6, Sfx_Supersonic_Ch6 - musicheader 1, 8, Sfx_Supersonic_Ch8 + channel_count 3 + channel 5, Sfx_Supersonic_Ch5 + channel 6, Sfx_Supersonic_Ch6 + channel 8, Sfx_Supersonic_Ch8 Sfx_Leer: - musicheader 3, 5, Sfx_Leer_Ch5 - musicheader 1, 6, Sfx_Leer_Ch6 - musicheader 1, 8, Sfx_Leer_Ch8 + channel_count 3 + channel 5, Sfx_Leer_Ch5 + channel 6, Sfx_Leer_Ch6 + channel 8, Sfx_Leer_Ch8 Sfx_Ember: - musicheader 2, 5, Sfx_Ember_Ch5 - musicheader 1, 8, Sfx_Ember_Ch8 + channel_count 2 + channel 5, Sfx_Ember_Ch5 + channel 8, Sfx_Ember_Ch8 Sfx_Bubblebeam: - musicheader 3, 5, Sfx_Bubblebeam_Ch5 - musicheader 1, 6, Sfx_Bubblebeam_Ch6 - musicheader 1, 8, Sfx_Bubblebeam_Ch8 + channel_count 3 + channel 5, Sfx_Bubblebeam_Ch5 + channel 6, Sfx_Bubblebeam_Ch6 + channel 8, Sfx_Bubblebeam_Ch8 Sfx_HydroPump: - musicheader 2, 5, Sfx_HydroPump_Ch5 - musicheader 1, 8, Sfx_HydroPump_Ch8 + channel_count 2 + channel 5, Sfx_HydroPump_Ch5 + channel 8, Sfx_HydroPump_Ch8 Sfx_Surf: - musicheader 3, 5, Sfx_Surf_Ch5 - musicheader 1, 6, Sfx_Surf_Ch6 - musicheader 1, 8, Sfx_Surf_Ch8 + channel_count 3 + channel 5, Sfx_Surf_Ch5 + channel 6, Sfx_Surf_Ch6 + channel 8, Sfx_Surf_Ch8 Sfx_Psybeam: - musicheader 3, 5, Sfx_Psybeam_Ch5 - musicheader 1, 6, Sfx_Psybeam_Ch6 - musicheader 1, 8, Sfx_Psybeam_Ch8 + channel_count 3 + channel 5, Sfx_Psybeam_Ch5 + channel 6, Sfx_Psybeam_Ch6 + channel 8, Sfx_Psybeam_Ch8 Sfx_Charge: - musicheader 3, 5, Sfx_Charge_Ch5 - musicheader 1, 6, Sfx_Charge_Ch6 - musicheader 1, 8, Sfx_Charge_Ch8 + channel_count 3 + channel 5, Sfx_Charge_Ch5 + channel 6, Sfx_Charge_Ch6 + channel 8, Sfx_Charge_Ch8 Sfx_Thundershock: - musicheader 3, 5, Sfx_Thundershock_Ch5 - musicheader 1, 6, Sfx_Thundershock_Ch6 - musicheader 1, 8, Sfx_Thundershock_Ch8 + channel_count 3 + channel 5, Sfx_Thundershock_Ch5 + channel 6, Sfx_Thundershock_Ch6 + channel 8, Sfx_Thundershock_Ch8 Sfx_Psychic: - musicheader 3, 5, Sfx_Psychic_Ch5 - musicheader 1, 6, Sfx_Psychic_Ch6 - musicheader 1, 8, Sfx_Psychic_Ch8 + channel_count 3 + channel 5, Sfx_Psychic_Ch5 + channel 6, Sfx_Psychic_Ch6 + channel 8, Sfx_Psychic_Ch8 Sfx_Screech: - musicheader 2, 5, Sfx_Screech_Ch5 - musicheader 1, 6, Sfx_Screech_Ch6 + channel_count 2 + channel 5, Sfx_Screech_Ch5 + channel 6, Sfx_Screech_Ch6 Sfx_BoneClub: - musicheader 2, 5, Sfx_BoneClub_Ch5 - musicheader 1, 6, Sfx_BoneClub_Ch6 + channel_count 2 + channel 5, Sfx_BoneClub_Ch5 + channel 6, Sfx_BoneClub_Ch6 Sfx_Sharpen: - musicheader 2, 5, Sfx_Sharpen_Ch5 - musicheader 1, 6, Sfx_Sharpen_Ch6 + channel_count 2 + channel 5, Sfx_Sharpen_Ch5 + channel 6, Sfx_Sharpen_Ch6 Sfx_EggBomb: - musicheader 3, 5, Sfx_EggBomb_Ch5 - musicheader 1, 6, Sfx_EggBomb_Ch6 - musicheader 1, 8, Sfx_EggBomb_Ch8 + channel_count 3 + channel 5, Sfx_EggBomb_Ch5 + channel 6, Sfx_EggBomb_Ch6 + channel 8, Sfx_EggBomb_Ch8 Sfx_Sing: - musicheader 2, 5, Sfx_Sing_Ch5 - musicheader 1, 6, Sfx_Sing_Ch6 + channel_count 2 + channel 5, Sfx_Sing_Ch5 + channel 6, Sfx_Sing_Ch6 Sfx_HyperBeam: - musicheader 3, 5, Sfx_HyperBeam_Ch5 - musicheader 1, 6, Sfx_HyperBeam_Ch6 - musicheader 1, 8, Sfx_HyperBeam_Ch8 + channel_count 3 + channel 5, Sfx_HyperBeam_Ch5 + channel 6, Sfx_HyperBeam_Ch6 + channel 8, Sfx_HyperBeam_Ch8 Sfx_Shine: - musicheader 1, 5, Sfx_Shine_Ch5 + channel_count 1 + channel 5, Sfx_Shine_Ch5 Sfx_Unknown5F: - musicheader 3, 5, Sfx_Unknown5F_Ch5 - musicheader 1, 6, Sfx_Unknown5F_Ch6 - + channel_count 3 + channel 5, Sfx_Unknown5F_Ch5 + channel 6, Sfx_Unknown5F_Ch6 Sfx_Sandstorm: - musicheader 1, 8, Sfx_Sandstorm_Ch8 + channel 8, Sfx_Sandstorm_Ch8 Sfx_HangUp: - musicheader 1, 5, Sfx_HangUp_Ch5 + channel_count 1 + channel 5, Sfx_HangUp_Ch5 Sfx_NoSignal: - musicheader 1, 5, Sfx_NoSignal_Ch5 + channel_count 1 + channel 5, Sfx_NoSignal_Ch5 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 + channel_count 4 + channel 5, Sfx_Elevator_Ch5 + channel 6, Sfx_Elevator_Ch6 + channel 7, Sfx_Elevator_Ch7 + channel 8, Sfx_Elevator_Ch8 -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 +Sfx_DexFanfare5079: + channel_count 4 + channel 5, Sfx_LevelUp_Ch5 + channel 6, Sfx_LevelUp_Ch6 + channel 7, Sfx_LevelUp_Ch7 + channel 8, Sfx_LevelUp_Ch8 -Sfx_DexFanfare5079_Ch5: Sfx_LevelUp_Ch5: - togglesfx +Sfx_DexFanfare5079_Ch5: + toggle_sfx tempo 120 - volume $77 - dutycycle $2 - notetype $8, $b1 + volume 7, 7 + duty_cycle 2 + note_type 8, 11, 1 octave 3 note B_, 2 note B_, 2 note B_, 2 - intensity $b3 + volume_envelope 11, 3 octave 4 note G#, 12 - endchannel + sound_ret -Sfx_DexFanfare5079_Ch6: Sfx_LevelUp_Ch6: - togglesfx - dutycycle $2 - notetype $8, $c1 +Sfx_DexFanfare5079_Ch6: + toggle_sfx + duty_cycle 2 + note_type 8, 12, 1 octave 4 note E_, 2 note E_, 2 note E_, 2 - intensity $c3 + volume_envelope 12, 3 note B_, 12 - endchannel + sound_ret -Sfx_DexFanfare5079_Ch7: Sfx_LevelUp_Ch7: - togglesfx - notetype $8, $25 +Sfx_DexFanfare5079_Ch7: + toggle_sfx + note_type 8, 2, 5 octave 4 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 octave 5 note E_, 5 - intensity $35 + volume_envelope 3, 5 note E_, 3 - note __, 4 - endchannel + rest 4 + sound_ret -Sfx_DexFanfare5079_Ch8: Sfx_LevelUp_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c +Sfx_DexFanfare5079_Ch8: + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 12 - endchannel + sound_ret 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 + channel_count 4 + channel 5, Sfx_KeyItem_Ch5 + channel 6, Sfx_KeyItem_Ch6 + channel 7, Sfx_KeyItem_Ch7 + channel 8, Sfx_KeyItem_Ch8 Sfx_KeyItem_Ch5: - togglesfx + toggle_sfx tempo 120 - volume $77 - dutycycle $2 - notetype $6, $b1 + volume 7, 7 + duty_cycle 2 + note_type 6, 11, 1 octave 3 note B_, 4 note B_, 2 @@ -461,87 +566,88 @@ Sfx_KeyItem_Ch5: note B_, 4 octave 4 note E_, 4 - intensity $b3 + volume_envelope 11, 3 note G#, 16 - endchannel + sound_ret Sfx_KeyItem_Ch6: - togglesfx - dutycycle $2 - notetype $6, $c1 + toggle_sfx + duty_cycle 2 + note_type 6, 12, 1 octave 4 note E_, 4 note E_, 2 note E_, 2 note E_, 4 note G#, 4 - intensity $c3 + volume_envelope 12, 3 note B_, 16 - endchannel + sound_ret Sfx_KeyItem_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 4 note G#, 2 - note __, 2 + rest 2 note G#, 1 - note __, 1 + rest 1 note G#, 1 - note __, 1 + rest 1 note G#, 2 - note __, 2 + rest 2 note B_, 2 - note __, 2 + rest 2 octave 5 note E_, 8 - intensity $35 + volume_envelope 3, 5 note E_, 4 - note __, 4 - endchannel + rest 4 + sound_ret Sfx_KeyItem_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - endchannel + sound_ret 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 + channel_count 4 + channel 5, Sfx_DexFanfare2049_Ch5 + channel 6, Sfx_DexFanfare2049_Ch6 + channel 7, Sfx_DexFanfare2049_Ch7 + channel 8, Sfx_DexFanfare2049_Ch8 Sfx_DexFanfare2049_Ch5: - togglesfx + toggle_sfx tempo 104 - volume $77 - dutycycle $2 - notetype $c, $88 + volume 7, 7 + duty_cycle 2 + note_type 12, 8, 8 octave 3 note A_, 4 - note __, 2 + rest 2 note A_, 1 - note __, 1 + rest 1 note A#, 4 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 octave 4 note C_, 2 - note __, 2 + rest 2 octave 3 note A#, 2 - note __, 2 + rest 2 note A_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_DexFanfare2049_Ch6: - togglesfx - dutycycle $2 - notetype $c, $c1 + toggle_sfx + duty_cycle 2 + note_type 12, 12, 1 octave 5 note F_, 2 note E_, 2 @@ -556,49 +662,50 @@ Sfx_DexFanfare2049_Ch6: note F_, 4 note G_, 4 note F_, 8 - endchannel + sound_ret Sfx_DexFanfare2049_Ch7: - togglesfx - notetype $c, $25 + toggle_sfx + note_type 12, 2, 5 octave 4 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F_, 2 - note __, 6 - endchannel + rest 6 + sound_ret Sfx_DexFanfare2049_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret 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 + channel_count 4 + channel 5, Sfx_Item_Ch5 + channel 6, Sfx_Item_Ch6 + channel 7, Sfx_Item_Ch7 + channel 8, Sfx_Item_Ch8 Sfx_Item_Ch5: - togglesfx + toggle_sfx tempo 108 - volume $77 - vibrato $8, $27 - dutycycle $2 - notetype $8, $b2 + volume 7, 7 + vibrato 8, 2, 7 + duty_cycle 2 + note_type 8, 11, 2 octave 4 note C_, 6 note C_, 2 @@ -608,14 +715,14 @@ Sfx_Item_Ch5: note G_, 4 note G_, 4 note F_, 12 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_Item_Ch6: - togglesfx - vibrato $8, $27 - dutycycle $2 - notetype $8, $c3 + toggle_sfx + vibrato 8, 2, 7 + duty_cycle 2 + note_type 8, 12, 3 octave 4 note A_, 6 note A_, 2 @@ -625,60 +732,61 @@ Sfx_Item_Ch6: note A#, 4 note A#, 4 note A_, 12 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_Item_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 4 note F_, 4 - note __, 2 + rest 2 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 note D#, 2 - note __, 2 + rest 2 note D#, 2 - note __, 2 + rest 2 note E_, 2 - note __, 2 + rest 2 note F_, 6 - intensity $35 + volume_envelope 3, 5 note F_, 4 - note __, 14 - endchannel + rest 14 + sound_ret Sfx_Item_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret 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 + channel_count 4 + channel 5, Sfx_CaughtMon_Ch5 + channel 6, Sfx_CaughtMon_Ch6 + channel 7, Sfx_CaughtMon_Ch7 + channel 8, Sfx_CaughtMon_Ch8 Sfx_CaughtMon_Ch5: - togglesfx + toggle_sfx tempo 112 - volume $77 - vibrato $8, $27 - dutycycle $2 - notetype $8, $b3 + volume 7, 7 + vibrato 8, 2, 7 + duty_cycle 2 + note_type 8, 11, 3 octave 4 note C_, 6 octave 3 note A_, 6 note F_, 12 - intensity $b1 + volume_envelope 11, 1 octave 4 note D#, 2 note D#, 2 @@ -686,33 +794,33 @@ Sfx_CaughtMon_Ch5: note D#, 2 note D#, 2 note G_, 2 - intensity $b3 + volume_envelope 11, 3 note F_, 12 - endchannel + sound_ret Sfx_CaughtMon_Ch6: - togglesfx - dutycycle $2 - vibrato $8, $27 - notetype $8, $c3 + toggle_sfx + duty_cycle 2 + vibrato 8, 2, 7 + note_type 8, 12, 3 octave 4 note A_, 6 note F_, 6 note C_, 12 - intensity $c1 + volume_envelope 12, 1 note A#, 2 note A#, 2 note A#, 2 note G_, 2 note G_, 2 note A#, 2 - intensity $c3 + volume_envelope 12, 3 note A_, 12 - endchannel + sound_ret Sfx_CaughtMon_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note C_, 12 note C_, 6 @@ -724,32 +832,33 @@ Sfx_CaughtMon_Ch7: note G_, 6 note A#, 6 note A_, 6 - intensity $35 + volume_envelope 3, 5 note A_, 3 - note __, 3 - endchannel + rest 3 + sound_ret Sfx_CaughtMon_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret 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 + channel_count 4 + channel 5, Sfx_DexFanfare80109_Ch5 + channel 6, Sfx_DexFanfare80109_Ch6 + channel 7, Sfx_DexFanfare80109_Ch7 + channel 8, Sfx_DexFanfare80109_Ch8 Sfx_DexFanfare80109_Ch5: - togglesfx + toggle_sfx tempo 112 - volume $77 - vibrato $8, $27 - dutycycle $2 - notetype $c, $b1 + volume 7, 7 + vibrato 8, 2, 7 + duty_cycle 2 + note_type 12, 11, 1 octave 4 note D#, 2 note D#, 1 @@ -765,15 +874,15 @@ Sfx_DexFanfare80109_Ch5: note F_, 2 note F_, 1 note F_, 1 - intensity $a5 + volume_envelope 10, 5 note A#, 16 - endchannel + sound_ret Sfx_DexFanfare80109_Ch6: - togglesfx - vibrato $8, $27 - dutycycle $2 - notetype $c, $c1 + toggle_sfx + vibrato 8, 2, 7 + duty_cycle 2 + note_type 12, 12, 1 octave 4 note G_, 2 note G_, 1 @@ -787,64 +896,66 @@ Sfx_DexFanfare80109_Ch6: note A#, 2 note A#, 1 note A#, 1 - intensity $b5 + volume_envelope 11, 5 octave 5 note D#, 16 - endchannel + sound_ret Sfx_DexFanfare80109_Ch7: - togglesfx - notetype $c, $25 + toggle_sfx + note_type 12, 2, 5 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 2 octave 4 note D#, 1 - note __, 1 + rest 1 octave 3 note A#, 2 octave 4 note D#, 1 - note __, 1 + rest 1 note C_, 2 note D_, 1 - note __, 1 + rest 1 octave 3 note A#, 2 note D#, 4 - intensity $35 + volume_envelope 3, 5 note D#, 3 - note __, 9 - endchannel + rest 9 + sound_ret Sfx_DexFanfare80109_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret Sfx_Fanfare2: - musicheader 3, 5, Sfx_Fanfare2_Ch5 - musicheader 1, 6, Sfx_Fanfare2_Ch6 - musicheader 1, 8, Sfx_Fanfare2_Ch8 - -UnusedSfx: - musicheader 4, 5, UnusedSfx_Ch5 - musicheader 1, 6, UnusedSfx_Ch6 - musicheader 1, 7, UnusedSfx_Ch7 - musicheader 1, 8, UnusedSfx_Ch8 - -UnusedSfx_Ch5: - togglesfx + channel_count 3 + channel 5, Sfx_Fanfare2_Ch5 + channel 6, Sfx_Fanfare2_Ch6 + channel 8, Sfx_Fanfare2_Ch8 + +Sfx_Unused: + channel_count 4 + channel 5, Sfx_Unused_Ch5 + channel 6, Sfx_Unused_Ch6 + channel 7, Sfx_Unused_Ch7 + channel 8, Sfx_Unused_Ch8 + +Sfx_Unused_Ch5: + toggle_sfx tempo 124 - volume $77 - vibrato $8, $27 - dutycycle $2 - notetype $c, $b1 + volume 7, 7 + vibrato 8, 2, 7 + duty_cycle 2 + note_type 12, 11, 1 octave 4 note F_, 2 note F_, 1 @@ -858,15 +969,15 @@ UnusedSfx_Ch5: note C_, 2 note E_, 1 note E_, 1 - intensity $a5 + volume_envelope 10, 5 note F_, 16 - endchannel + sound_ret -UnusedSfx_Ch6: - togglesfx - vibrato $8, $27 - dutycycle $2 - notetype $c, $c1 +Sfx_Unused_Ch6: + toggle_sfx + vibrato 8, 2, 7 + duty_cycle 2 + note_type 12, 12, 1 octave 4 note A_, 2 note A_, 1 @@ -882,13 +993,13 @@ UnusedSfx_Ch6: note A#, 2 note A#, 1 note A#, 1 - intensity $b5 + volume_envelope 11, 5 note A_, 16 - endchannel + sound_ret -UnusedSfx_Ch7: - togglesfx - notetype $c, $25 +Sfx_Unused_Ch7: + toggle_sfx + note_type 12, 2, 5 octave 4 note F_, 8 note C_, 2 @@ -896,37 +1007,39 @@ UnusedSfx_Ch7: note G_, 2 note A#, 2 note A_, 4 - intensity $35 + volume_envelope 3, 5 note A_, 3 - note __, 9 - endchannel + rest 9 + sound_ret -UnusedSfx_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c +Sfx_Unused_Ch8: + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 16 - note __, 16 - endchannel + rest 16 + sound_ret Sfx_Fanfare: - musicheader 3, 5, Sfx_Fanfare_Ch5 - musicheader 1, 6, Sfx_Fanfare_Ch6 - musicheader 1, 8, Sfx_Fanfare_Ch8 + channel_count 3 + channel 5, Sfx_Fanfare_Ch5 + channel 6, Sfx_Fanfare_Ch6 + channel 8, Sfx_Fanfare_Ch8 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 + channel_count 4 + channel 5, Sfx_RegisterPhoneNumber_Ch5 + channel 6, Sfx_RegisterPhoneNumber_Ch6 + channel 7, Sfx_RegisterPhoneNumber_Ch7 + channel 8, Sfx_RegisterPhoneNumber_Ch8 Sfx_RegisterPhoneNumber_Ch5: - togglesfx + toggle_sfx tempo 124 - volume $77 - dutycycle $3 - notetype $c, $a2 - note __, 2 + volume 7, 7 + duty_cycle 3 + note_type 12, 10, 2 + rest 2 octave 3 note C_, 4 note G#, 4 @@ -941,23 +1054,23 @@ Sfx_RegisterPhoneNumber_Ch5: octave 4 note C#, 3 note C_, 2 - note __, 8 - endchannel + rest 8 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_RegisterPhoneNumber_Ch6: - togglesfx - dutycycle $3 - notetype $c, $c2 - note __, 2 + toggle_sfx + duty_cycle 3 + note_type 12, 12, 2 + rest 2 octave 4 note D#, 2 note C#, 2 note C_, 2 note D#, 2 note F_, 2 - note __, 1 + rest 1 note G#, 3 octave 5 note C_, 2 @@ -965,115 +1078,117 @@ Sfx_RegisterPhoneNumber_Ch6: octave 4 note G_, 3 note G#, 2 - note __, 8 - endchannel + rest 8 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_RegisterPhoneNumber_Ch7: - togglesfx - notetype $c, $25 - note __, 2 + toggle_sfx + note_type 12, 2, 5 + rest 2 octave 3 note D#, 7 - note __, 1 + rest 1 note G#, 2 - note __, 1 + rest 1 note C_, 2 - note __, 1 + rest 1 note G#, 2 note G_, 2 - note __, 1 + rest 1 note A#, 3 note G#, 2 - note __, 8 - endchannel + rest 8 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_RegisterPhoneNumber_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 2 - note __, 16 - note __, 16 - endchannel + rest 16 + rest 16 + sound_ret - togglesfx ; unused + toggle_sfx ; unused -Sfx_3RdPlace: - musicheader 3, 5, Sfx_3RdPlace_Ch5 - musicheader 1, 6, Sfx_3RdPlace_Ch6 - musicheader 1, 7, Sfx_3RdPlace_Ch7 +Sfx_3rdPlace: + channel_count 3 + channel 5, Sfx_3rdPlace_Ch5 + channel 6, Sfx_3rdPlace_Ch6 + channel 7, Sfx_3rdPlace_Ch7 -Sfx_3RdPlace_Ch5: - togglesfx +Sfx_3rdPlace_Ch5: + toggle_sfx tempo 120 - volume $77 - dutycycle $2 - notetype $c, $a4 + volume 7, 7 + duty_cycle 2 + note_type 12, 10, 4 octave 4 note F_, 1 note A_, 1 octave 5 note C_, 1 note F_, 1 - note __, 1 + rest 1 note C_, 1 note D_, 6 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused -Sfx_3RdPlace_Ch6: - togglesfx - dutycycle $2 - notetype $c, $b4 +Sfx_3rdPlace_Ch6: + toggle_sfx + duty_cycle 2 + note_type 12, 11, 4 octave 4 note A_, 1 octave 5 note C_, 1 note F_, 1 note A_, 1 - note __, 1 + rest 1 note F_, 1 note G_, 6 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused -Sfx_3RdPlace_Ch7: - togglesfx - notetype $c, $25 +Sfx_3rdPlace_Ch7: + toggle_sfx + note_type 12, 2, 5 octave 3 note A_, 1 note F_, 1 note A_, 1 octave 4 note C_, 1 - note __, 1 + rest 1 octave 3 note A_, 1 note B_, 6 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetEgg: - musicheader 4, 5, Sfx_GetEgg_Ch5 - musicheader 1, 6, Sfx_GetEgg_Ch6 - musicheader 1, 7, Sfx_GetEgg_Ch7 - musicheader 1, 8, Sfx_GetEgg_Ch8 + channel_count 4 + channel 5, Sfx_GetEgg_Ch5 + channel 6, Sfx_GetEgg_Ch6 + channel 7, Sfx_GetEgg_Ch7 + channel 8, Sfx_GetEgg_Ch8 Sfx_GetEgg_Ch5: - togglesfx + toggle_sfx tempo 120 - volume $77 - vibrato $12, $34 - dutycycle $2 - notetype $8, $a1 - note __, 2 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 2 + note_type 8, 10, 1 + rest 2 octave 3 note C_, 2 note F_, 2 @@ -1082,55 +1197,55 @@ Sfx_GetEgg_Ch5: note A#, 2 octave 4 note D_, 2 - intensity $a2 + volume_envelope 10, 2 note F_, 6 - intensity $a1 - dutycycle $3 + volume_envelope 10, 1 + duty_cycle 3 octave 3 note E_, 2 note G_, 2 octave 4 note C_, 2 - intensity $a4 + volume_envelope 10, 4 note F_, 9 - note __, 9 - endchannel + rest 9 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetEgg_Ch6: - togglesfx - vibrato $12, $34 - dutycycle $3 - notetype $8, $c2 - note __, 2 + toggle_sfx + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 12, 2 + rest 2 octave 4 note F_, 2 - note __, 2 + rest 2 note A_, 2 - intensity $c1 + volume_envelope 12, 1 note A#, 2 note A_, 2 note A#, 2 - intensity $c2 + volume_envelope 12, 2 octave 5 note C_, 6 - intensity $c1 + volume_envelope 12, 1 octave 4 note C_, 2 note E_, 2 note G_, 2 - intensity $c4 + volume_envelope 12, 4 note A_, 9 - note __, 9 - endchannel + rest 9 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetEgg_Ch7: - togglesfx - notetype $8, $25 - note __, 2 + toggle_sfx + note_type 8, 2, 5 + rest 2 octave 3 note C_, 6 octave 2 @@ -1141,147 +1256,149 @@ Sfx_GetEgg_Ch7: note G_, 2 note A#, 6 note A_, 9 - note __, 9 - endchannel + rest 9 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetEgg_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $8 - note __, 2 - notetype $c - note __, 16 - note __, 12 - endchannel + toggle_sfx + sfx_toggle_noise 4 + drum_speed 8 + rest 2 + drum_speed 12 + rest 16 + rest 12 + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_MoveDeleted_Ch5 + channel 6, Sfx_MoveDeleted_Ch6 + channel 7, Sfx_MoveDeleted_Ch7 + channel 8, Sfx_MoveDeleted_Ch8 Sfx_MoveDeleted_Ch5: - togglesfx + toggle_sfx tempo 116 - volume $77 - dutycycle $2 - vibrato $c, $44 - notetype $c, $a4 - note __, 8 + volume 7, 7 + duty_cycle 2 + vibrato 12, 4, 4 + note_type 12, 10, 4 + rest 8 octave 2 note G_, 1 - note __, 2 + rest 2 note C#, 1 note E_, 1 note D#, 1 note E_, 4 - intensity $a1 + volume_envelope 10, 1 note G_, 2 note F_, 2 note E_, 2 note D_, 2 note G#, 2 note B_, 2 - intensity $a6 + volume_envelope 10, 6 octave 3 note D_, 10 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_MoveDeleted_Ch6: - togglesfx - dutycycle $3 - vibrato $c, $44 - notetype $c, $74 + toggle_sfx + duty_cycle 3 + vibrato 12, 4, 4 + note_type 12, 7, 4 octave 1 note B_, 1 octave 2 note D_, 1 note F_, 1 note G#, 1 - intensity $94 + volume_envelope 9, 4 note D_, 1 note F_, 1 note G#, 1 note B_, 1 - intensity $b4 + volume_envelope 11, 4 octave 3 note C#, 1 - note __, 2 + rest 2 octave 2 note A#, 1 octave 3 note C#, 4 - note __, 2 - intensity $b1 + rest 2 + volume_envelope 11, 1 note C#, 2 note D#, 2 note E_, 2 - intensity $b6 + volume_envelope 11, 6 note F_, 16 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_MoveDeleted_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 2 note G#, 8 note A_, 8 note A#, 2 - note __, 4 + rest 4 note A#, 1 - note __, 1 + rest 1 note A#, 8 - note __, 4 + rest 4 octave 3 note C#, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 octave 2 note A#, 2 - note __, 2 - notetype $c, $20 + rest 2 + note_type 12, 2, 0 note B_, 16 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_MoveDeleted_Ch8: - togglesfx - sfxtogglenoise $3 - notetype $c + toggle_sfx + sfx_toggle_noise 3 + drum_speed 12 note F_, 8 - note __, 16 - note __, 16 - note __, 6 - endchannel + rest 16 + rest 16 + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_2ndPlace_Ch5 + channel 6, Sfx_2ndPlace_Ch6 + channel 7, Sfx_2ndPlace_Ch7 + channel 8, Sfx_2ndPlace_Ch8 Sfx_2ndPlace_Ch5: - togglesfx + toggle_sfx tempo 116 - volume $77 - dutycycle $2 - vibrato $c, $34 - notetype $8, $a1 + volume 7, 7 + duty_cycle 2 + vibrato 12, 3, 4 + note_type 8, 10, 1 octave 4 note E_, 2 note E_, 2 @@ -1302,103 +1419,104 @@ Sfx_2ndPlace_Ch5: note A_, 2 note A_, 2 note A_, 2 - intensity $a7 + volume_envelope 10, 7 note B_, 12 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_2ndPlace_Ch6: - togglesfx - dutycycle $2 - notetype $8, $b1 + toggle_sfx + duty_cycle 2 + note_type 8, 11, 1 octave 4 note G_, 2 note G_, 2 note G_, 2 note A_, 4 note B_, 2 - intensity $b4 + volume_envelope 11, 4 octave 5 note C_, 12 - intensity $b1 + volume_envelope 11, 1 note C_, 2 note C_, 2 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note D_, 12 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_2ndPlace_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note F_, 2 - note __, 2 + rest 2 octave 3 note F_, 2 octave 2 note F_, 2 - note __, 2 + rest 2 octave 3 note F_, 2 octave 2 note F_, 2 - note __, 2 + rest 2 octave 3 note F_, 2 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note G_, 12 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_2ndPlace_Ch8: - togglesfx - sfxtogglenoise $3 - notetype $8 -.loop + toggle_sfx + sfx_toggle_noise 3 + drum_speed 8 +Sfx_2ndPlace_branch_f0fd7: note C#, 1 - loopchannel 6, .loop + sound_loop 6, Sfx_2ndPlace_branch_f0fd7 note B_, 12 note B_, 12 note B_, 12 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_1stPlace_Ch5 + channel 6, Sfx_1stPlace_Ch6 + channel 7, Sfx_1stPlace_Ch7 + channel 8, Sfx_1stPlace_Ch8 Sfx_1stPlace_Ch5: - togglesfx + toggle_sfx tempo 124 - volume $77 - dutycycle $3 - vibrato $c, $34 - notetype $c, $a1 + volume 7, 7 + duty_cycle 3 + vibrato 12, 3, 4 + note_type 12, 10, 1 octave 5 note D_, 2 octave 4 @@ -1409,82 +1527,82 @@ Sfx_1stPlace_Ch5: note F_, 1 note D_, 1 note F_, 1 - intensity $91 + volume_envelope 9, 1 note D_, 1 octave 4 note A#, 1 note F_, 1 note A#, 1 - intensity $81 + volume_envelope 8, 1 octave 5 note D_, 1 octave 4 note A#, 1 note F_, 1 note D_, 1 - intensity $a1 + volume_envelope 10, 1 note C_, 2 note E_, 2 note G_, 2 - intensity $a7 + volume_envelope 10, 7 note A_, 10 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_1stPlace_Ch6: - togglesfx - dutycycle $3 - vibrato $c, $34 - notetype $c, $c1 + toggle_sfx + duty_cycle 3 + vibrato 12, 3, 4 + note_type 12, 12, 1 octave 3 note B_, 2 note G_, 2 note B_, 2 - intensity $b6 + volume_envelope 11, 6 octave 4 note D_, 12 - intensity $c1 + volume_envelope 12, 1 note E_, 2 note G_, 2 octave 5 note C_, 2 - intensity $b7 + volume_envelope 11, 7 note D_, 10 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_1stPlace_Ch7: - togglesfx - notetype $c, $25 + toggle_sfx + note_type 12, 2, 5 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 6 note F_, 6 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 note D_, 10 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_1stPlace_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $6 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 6 note D_, 4 note D_, 4 note D_, 4 @@ -1495,119 +1613,120 @@ Sfx_1stPlace_Ch8: note D_, 4 note D_, 4 note D_, 4 - notetype $c + drum_speed 12 note B_, 10 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_ChooseACard_Ch5 + channel 6, Sfx_ChooseACard_Ch6 + channel 7, Sfx_ChooseACard_Ch7 + channel 8, Sfx_ChooseACard_Ch8 Sfx_ChooseACard_Ch5: - togglesfx + toggle_sfx tempo 152 - volume $77 - dutycycle $3 - notetype $6, $a4 + volume 7, 7 + duty_cycle 3 + note_type 6, 10, 4 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 4 note C#, 4 octave 3 note F_, 1 - note __, 1 + rest 1 note F_, 1 - note __, 1 + rest 1 octave 4 note D_, 4 octave 3 note E_, 1 - note __, 1 + rest 1 note E_, 1 - note __, 1 + rest 1 octave 4 note E_, 4 - intensity $71 + volume_envelope 7, 1 octave 3 note E_, 1 note F#, 1 note G#, 1 note A_, 1 - intensity $91 + volume_envelope 9, 1 note B_, 1 octave 4 note C#, 1 note D_, 1 note D#, 1 - intensity $a4 + volume_envelope 10, 4 note E_, 4 - note __, 12 - endchannel + rest 12 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_ChooseACard_Ch6: - togglesfx - dutycycle $3 - notetype $6, $b4 + toggle_sfx + duty_cycle 3 + note_type 6, 11, 4 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note E_, 4 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note F_, 4 octave 3 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 octave 4 note G_, 4 note G#, 8 note A_, 4 - note __, 12 - endchannel + rest 12 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_ChooseACard_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 1 - note __, 1 + rest 1 octave 2 note A_, 4 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 4 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 octave 2 note A_, 4 octave 3 @@ -1617,15 +1736,15 @@ Sfx_ChooseACard_Ch7: note B_, 2 note G#, 2 note A_, 4 - note __, 12 - endchannel + rest 12 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_ChooseACard_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $6 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 6 note D_, 2 note C#, 2 note B_, 4 @@ -1643,100 +1762,101 @@ Sfx_ChooseACard_Ch8: note C#, 2 note D_, 2 note B_, 16 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_GetTm_Ch5 + channel 6, Sfx_GetTm_Ch6 + channel 7, Sfx_GetTm_Ch7 + channel 8, Sfx_GetTm_Ch8 Sfx_GetTm_Ch5: - togglesfx + toggle_sfx tempo 144 - volume $77 - dutycycle $3 - vibrato $8, $24 - notetype $c, $a3 + volume 7, 7 + duty_cycle 3 + vibrato 8, 2, 4 + note_type 12, 10, 3 octave 4 note D_, 1 - note __, 1 + rest 1 octave 3 note B_, 1 octave 4 note D_, 1 note G_, 6 - intensity $b1 + volume_envelope 11, 1 note E_, 2 note F#, 2 note G_, 2 - intensity $a5 + volume_envelope 10, 5 note F#, 8 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetTm_Ch6: - togglesfx - dutycycle $3 - vibrato $8, $24 - notetype $c, $b3 + toggle_sfx + duty_cycle 3 + vibrato 8, 2, 4 + note_type 12, 11, 3 octave 4 note G_, 1 - note __, 1 + rest 1 note D_, 1 note G_, 1 note B_, 6 - intensity $c1 + volume_envelope 12, 1 note A_, 2 note B_, 2 octave 5 note C_, 2 - intensity $b5 + volume_envelope 11, 5 note D_, 8 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetTm_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 2 note B_, 2 - note __, 2 + rest 2 note G_, 2 note B_, 2 octave 3 note D_, 4 octave 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 4 octave 3 note C_, 2 - note __, 2 + rest 2 octave 2 note B_, 2 - note __, 2 + rest 2 octave 3 note C_, 4 octave 2 note A_, 16 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetTm_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $6 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 6 note D_, 4 note C#, 2 note D_, 2 @@ -1748,40 +1868,41 @@ Sfx_GetTm_Ch8: note C#, 1 note D_, 2 note B_, 16 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_GetBadge_Ch5 + channel 6, Sfx_GetBadge_Ch6 + channel 7, Sfx_GetBadge_Ch7 + channel 8, Sfx_GetBadge_Ch8 Sfx_GetBadge_Ch5: - togglesfx + toggle_sfx tempo 120 - volume $77 - dutycycle $2 - vibrato $8, $24 - notetype $6, $92 + volume 7, 7 + duty_cycle 2 + vibrato 8, 2, 4 + note_type 6, 9, 2 octave 4 note F_, 3 - callchannel Sfx_GetBadge_branch_f11aa + sound_call Sfx_GetBadge_branch_f11aa note A#, 3 - pitchoffset 0, D_ - callchannel Sfx_GetBadge_branch_f11aa - pitchoffset 0, C_ - intensity $a7 + transpose 0, 2 + sound_call Sfx_GetBadge_branch_f11aa + transpose 0, 0 + volume_envelope 10, 7 note A_, 16 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetBadge_branch_f11aa: - note __, 5 + rest 5 octave 3 note F_, 2 note G#, 2 @@ -1800,101 +1921,101 @@ Sfx_GetBadge_branch_f11aa: octave 4 note C#, 2 note F_, 2 - endchannel + sound_ret Sfx_GetBadge_Ch6: - togglesfx - dutycycle $3 - vibrato $8, $24 - notetype $6, $b5 + toggle_sfx + duty_cycle 3 + vibrato 8, 2, 4 + note_type 6, 11, 5 octave 5 note C#, 3 - note __, 3 + rest 3 octave 4 note G#, 1 - note __, 1 + rest 1 note G#, 8 octave 3 note C#, 2 - note __, 2 + rest 2 octave 2 note G#, 2 - note __, 1 - intensity $95 + rest 1 + volume_envelope 9, 5 octave 5 note C_, 1 - intensity $b5 + volume_envelope 11, 5 note C#, 2 - note __, 2 + rest 2 note D_, 2 - note __, 2 + rest 2 note D#, 3 - note __, 3 + rest 3 octave 4 note A#, 1 - note __, 1 + rest 1 note A#, 8 octave 3 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 2 - note __, 1 - intensity $95 + rest 1 + volume_envelope 9, 5 octave 5 note D_, 1 - intensity $b5 + volume_envelope 11, 5 note D#, 8 note F_, 16 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetBadge_Ch7: - togglesfx - notetype $6, $25 + toggle_sfx + note_type 6, 2, 5 octave 2 note G#, 3 - note __, 3 + rest 3 octave 3 note C#, 1 - note __, 1 + rest 1 note C#, 8 note G#, 2 - note __, 2 + rest 2 note F_, 2 - note __, 2 + rest 2 note C#, 2 note C_, 2 octave 2 note A#, 2 note G#, 2 note G_, 3 - note __, 3 + rest 3 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 8 note A#, 2 - note __, 2 + rest 2 note G_, 2 - note __, 2 + rest 2 note G_, 2 note F_, 2 note G_, 2 note D#, 2 note F_, 16 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_GetBadge_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $6 -.loop + toggle_sfx + sfx_toggle_noise 4 + drum_speed 6 +Sfx_GetBadge_branch_f1220: note B_, 12 note D_, 1 note D_, 1 @@ -1909,28 +2030,29 @@ Sfx_GetBadge_Ch8: note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, .loop + sound_loop 2, Sfx_GetBadge_branch_f1220 note B_, 16 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_QuitSlots_Ch5 + channel 6, Sfx_QuitSlots_Ch6 + channel 7, Sfx_QuitSlots_Ch7 + channel 8, Sfx_QuitSlots_Ch8 Sfx_QuitSlots_Ch5: - togglesfx + toggle_sfx tempo 144 - volume $77 - dutycycle $2 - notetype $8, $82 + volume 7, 7 + duty_cycle 2 + note_type 8, 8, 2 octave 3 note G#, 2 - note __, 4 + rest 4 note C#, 2 note F_, 2 note G#, 2 @@ -1947,18 +2069,18 @@ Sfx_QuitSlots_Ch5: note A#, 2 note G#, 2 note F#, 2 - intensity $97 + volume_envelope 9, 7 note G#, 14 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_QuitSlots_Ch6: - togglesfx - dutycycle $2 - notetype $8, $b3 - note __, 3 + toggle_sfx + duty_cycle 2 + note_type 8, 11, 3 + rest 3 octave 4 note B_, 1 octave 5 @@ -1966,7 +2088,7 @@ Sfx_QuitSlots_Ch6: octave 4 note G#, 4 note A#, 2 - intensity $c1 + volume_envelope 12, 1 note B_, 4 note A#, 2 note G#, 4 @@ -1974,25 +2096,25 @@ Sfx_QuitSlots_Ch6: note F#, 4 note F_, 2 note D#, 4 - intensity $b7 + volume_envelope 11, 7 note F_, 14 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_QuitSlots_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note C#, 2 - note __, 2 + rest 2 note F_, 2 note D#, 2 note C#, 2 note G#, 2 note D_, 2 - note __, 2 + rest 2 note D_, 2 octave 2 note G#, 2 @@ -2000,22 +2122,22 @@ Sfx_QuitSlots_Ch7: octave 3 note D_, 2 note D#, 2 - note __, 2 + rest 2 octave 2 note A#, 2 octave 3 note C_, 2 - note __, 2 + rest 2 note C#, 14 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_QuitSlots_Ch8: - togglesfx - sfxtogglenoise $3 - notetype $8 + toggle_sfx + sfx_toggle_noise 3 + drum_speed 8 note D#, 6 note D_, 4 note D#, 2 @@ -2027,20 +2149,21 @@ Sfx_QuitSlots_Ch8: note D#, 2 note D_, 4 note B_, 14 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_Protect: - musicheader 2, 5, Sfx_Protect_Ch5 - musicheader 1, 8, Sfx_Protect_Ch8 + channel_count 2 + channel 5, Sfx_Protect_Ch5 + channel 8, Sfx_Protect_Ch8 Sfx_Protect_Ch5: - togglesfx - notetype $1, $f1 - dutycycle $0 -.loop + toggle_sfx + note_type 1, 15, 1 + duty_cycle 0 +Sfx_Protect_branch_f12c0: octave 5 note F_, 5 note A_, 5 @@ -2053,335 +2176,354 @@ Sfx_Protect_Ch5: octave 6 note C#, 5 note E_, 5 - loopchannel 3, .loop - intensity $c1 + sound_loop 3, Sfx_Protect_branch_f12c0 + volume_envelope 12, 1 octave 5 note F_, 5 note A_, 5 - intensity $91 + volume_envelope 9, 1 octave 6 note C_, 5 note E_, 5 - intensity $71 + volume_envelope 7, 1 octave 5 note F#, 5 note A#, 5 - intensity $51 + volume_envelope 5, 1 octave 6 note C#, 5 note E_, 5 - endchannel + sound_ret Sfx_Protect_Ch8: - noise __, 10, $9e, $0 - noise __, 10, $be, $11 - loopchannel 6, Sfx_Protect_Ch8 - noise __, 10, $a7, $0 - noise C_, 1, $75, $11 - endchannel + noise_note 9, 9, -6, 0 + noise_note 9, 11, -6, 17 + sound_loop 6, Sfx_Protect_Ch8 + noise_note 9, 10, 7, 0 + noise_note 16, 7, 5, 17 + sound_ret Sfx_Sketch: - musicheader 1, 5, Sfx_Sketch_Ch5 + channel_count 1 + channel 5, Sfx_Sketch_Ch5 Sfx_Sketch_Ch5: - dutycycle $1 - soundinput $a5 -.loop - sound __, 3, $f1, $06e0 - sound __, 14, $af, $05b0 - sound __, 5, $0, 0 - sound __, 10, $f4, $0718 - loopchannel 3, .loop - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 10, 5 +Sfx_Sketch_branch_f12fd: + square_note 2, 15, 1, 1760 + square_note 13, 10, -7, 1456 + square_note 4, 0, 0, 0 + square_note 9, 15, 4, 1816 + sound_loop 3, Sfx_Sketch_branch_f12fd + pitch_sweep 0, 8 + sound_ret Sfx_RainDance: - musicheader 1, 8, Sfx_RainDance_Ch8 + channel_count 1 + channel 8, Sfx_RainDance_Ch8 Sfx_RainDance_Ch8: - noise __, 12, $7d, $50 - noise __, 7, $7d, $4f - noise __, 12, $7f, $47 - noise __, 16, $6e, $22 - loopchannel 3, Sfx_RainDance_Ch8 - noise __, 7, $6d, $50 - noise __, 6, $5d, $4f - noise __, 6, $4f, $47 - noise __, 11, $32, $46 - endchannel + noise_note 11, 7, -5, 80 + noise_note 6, 7, -5, 79 + noise_note 11, 7, -7, 71 + noise_note 15, 6, -6, 34 + sound_loop 3, Sfx_RainDance_Ch8 + noise_note 6, 6, -5, 80 + noise_note 5, 5, -5, 79 + noise_note 5, 4, -7, 71 + noise_note 10, 3, 2, 70 + sound_ret Sfx_Aeroblast: - musicheader 2, 5, Sfx_Aeroblast_Ch5 - musicheader 1, 8, Sfx_Aeroblast_Ch8 + channel_count 2 + channel 5, Sfx_Aeroblast_Ch5 + channel 8, Sfx_Aeroblast_Ch8 Sfx_Aeroblast_Ch5: - sound_duty 2, 0, 3, 3 - soundinput $f5 - sound C_, 13, $f8, $0580 - soundinput $8 - endchannel + duty_cycle_pattern 3, 3, 0, 2 + pitch_sweep 15, 5 + square_note 28, 15, 8, 1408 + pitch_sweep 0, 8 + sound_ret Sfx_Aeroblast_Ch8: - noise __, 5, $f8, $6c - noise __, 5, $c8, $5c - noise __, 5, $78, $5b - noise C_, 1, $31, $5a - endchannel + noise_note 4, 15, 8, 108 + noise_note 4, 12, 8, 92 + noise_note 4, 7, 8, 91 + noise_note 16, 3, 1, 90 + sound_ret Sfx_Spark: - musicheader 1, 8, Sfx_Spark_Ch8 + channel_count 1 + channel 8, Sfx_Spark_Ch8 Sfx_Spark_Ch8: - noise __, 5, $f8, $5d - noise __, 5, $d8, $6f - loopchannel 2, Sfx_Spark_Ch8 - endchannel + noise_note 4, 15, 8, 93 + noise_note 4, 13, 8, 111 + sound_loop 2, Sfx_Spark_Ch8 + sound_ret Sfx_Curse: - musicheader 2, 5, Sfx_Curse_Ch5 - musicheader 1, 8, Sfx_Curse_Ch8 + channel_count 2 + channel 5, Sfx_Curse_Ch5 + channel 8, Sfx_Curse_Ch8 Sfx_Curse_Ch5: - dutycycle $3 - sound __, 5, $f2, $0483 - sound __, 5, $f2, $0511 - sound __, 5, $f2, $0589 - sound __, 5, $f2, $05ed - endchannel + duty_cycle 3 + square_note 4, 15, 2, 1155 + square_note 4, 15, 2, 1297 + square_note 4, 15, 2, 1417 + square_note 4, 15, 2, 1517 + sound_ret Sfx_Curse_Ch8: - noise C_, 5, $9a, $9 - endchannel + noise_note 20, 9, -2, 9 + sound_ret Sfx_Rage: - musicheader 2, 5, Sfx_Rage_Ch5 - musicheader 1, 8, Sfx_Rage_Ch8 + channel_count 2 + channel 5, Sfx_Rage_Ch5 + channel 8, Sfx_Rage_Ch8 Sfx_Rage_Ch5: - dutycycle $0 - sound __, 4, $d1, $07b0 - sound __, 4, $d1, $07c2 - sound C_, 9, $d2, $07d5 - endchannel + duty_cycle 0 + square_note 3, 13, 1, 1968 + square_note 3, 13, 1, 1986 + square_note 24, 13, 2, 2005 + sound_ret Sfx_Rage_Ch8: - noise __, 4, $f4, $1a - noise __, 4, $f4, $19 - noise C_, 9, $f2, $18 - endchannel + noise_note 3, 15, 4, 26 + noise_note 3, 15, 4, 25 + noise_note 24, 15, 2, 24 + sound_ret Sfx_Thief: - musicheader 1, 8, Sfx_Thief_Ch8 + channel_count 1 + channel 8, Sfx_Thief_Ch8 Sfx_Thief_Ch8: - noise __, 1, $0, $0 - noise __, 5, $e1, $12 - noise __, 1, $0, $0 - noise __, 3, $b1, $22 - loopchannel 2, Sfx_Thief_Ch8 - endchannel + noise_note 0, 0, 0, 0 + noise_note 4, 14, 1, 18 + noise_note 0, 0, 0, 0 + noise_note 2, 11, 1, 34 + sound_loop 2, Sfx_Thief_Ch8 + sound_ret Sfx_Thief2: - musicheader 1, 5, Sfx_Thief2_Ch5 + channel_count 1 + channel 5, Sfx_Thief2_Ch5 Sfx_Thief2_Ch5: - togglesfx - notetype $2, $f4 - dutycycle $0 + toggle_sfx + note_type 2, 15, 4 + duty_cycle 0 octave 4 note C#, 3 note A#, 3 - intensity $d2 + volume_envelope 13, 2 note C#, 3 note A#, 3 - intensity $b1 + volume_envelope 11, 1 note C_, 3 note A_, 3 - intensity $81 + volume_envelope 8, 1 note C_, 3 note A_, 3 - togglesfx - endchannel + toggle_sfx + sound_ret Sfx_SpiderWeb: - musicheader 2, 5, Sfx_SpiderWeb_Ch5 - musicheader 1, 8, Sfx_SpiderWeb_Ch8 + channel_count 2 + channel 5, Sfx_SpiderWeb_Ch5 + channel 8, Sfx_SpiderWeb_Ch8 Sfx_SpiderWeb_Ch5: - dutycycle $0 - sound C#, 1, $7f, $0720 - soundinput $95 - sound __, 5, $f8, $0620 - sound __, 5, $e8, $0630 - sound __, 5, $d8, $0640 - sound __, 5, $95, $0620 - sound __, 5, $73, $0630 - sound __, 5, $51, $0640 - soundinput $8 - endchannel + duty_cycle 0 + square_note 32, 7, -7, 1824 + pitch_sweep 9, 5 + square_note 4, 15, 8, 1568 + square_note 4, 14, 8, 1584 + square_note 4, 13, 8, 1600 + square_note 4, 9, 5, 1568 + square_note 4, 7, 3, 1584 + square_note 4, 5, 1, 1600 + pitch_sweep 0, 8 + sound_ret Sfx_SpiderWeb_Ch8: - noise C#, 1, $ef, $0 - endchannel + noise_note 32, 14, -7, 0 + sound_ret Sfx_MindReader: - musicheader 2, 5, Sfx_MindReader_Ch5 - musicheader 1, 8, Sfx_MindReader_Ch8 + channel_count 2 + channel 5, Sfx_MindReader_Ch5 + channel 8, Sfx_MindReader_Ch8 Sfx_MindReader_Ch5: - togglesfx - dutycycle $2 - notetype $2, $f1 + toggle_sfx + duty_cycle 2 + note_type 2, 15, 1 octave 5 note C_, 3 - intensity $41 + volume_envelope 4, 1 note C_, 3 - intensity $f1 + volume_envelope 15, 1 note C#, 3 - intensity $41 + volume_envelope 4, 1 note C#, 3 - intensity $f1 + volume_envelope 15, 1 note D_, 3 - intensity $41 + volume_envelope 4, 1 note D_, 3 - togglesfx - endchannel + toggle_sfx + sound_ret Sfx_MindReader_Ch8: - noise C_, 2, $af, $19 - noise C_, 3, $af, $18 - endchannel + noise_note 17, 10, -7, 25 + noise_note 18, 10, -7, 24 + sound_ret Sfx_Nightmare: - musicheader 1, 5, Sfx_Nightmare_Ch5 + channel_count 1 + channel 5, Sfx_Nightmare_Ch5 Sfx_Nightmare_Ch5: - dutycycle $0 - soundinput $34 -.loop - sound __, 4, $ba, $0631 - sound __, 3, $0, 0 - sound __, 4, $f8, $0621 - sound __, 3, $0, 0 - sound __, 4, $f8, $0611 - sound __, 3, $0, 0 - sound __, 4, $e8, $0601 - sound __, 3, $0, 0 - sound __, 4, $e8, $05f1 - sound __, 3, $0, 0 - loopchannel 2, .loop - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 3, 4 +Sfx_Nightmare_branch_f1424: + square_note 3, 11, -2, 1585 + square_note 2, 0, 0, 0 + square_note 3, 15, 8, 1569 + square_note 2, 0, 0, 0 + square_note 3, 15, 8, 1553 + square_note 2, 0, 0, 0 + square_note 3, 14, 8, 1537 + square_note 2, 0, 0, 0 + square_note 3, 14, 8, 1521 + square_note 2, 0, 0, 0 + sound_loop 2, Sfx_Nightmare_branch_f1424 + pitch_sweep 0, 8 + sound_ret Sfx_Snore: - musicheader 1, 8, Sfx_Snore_Ch8 + channel_count 1 + channel 8, Sfx_Snore_Ch8 Sfx_Snore_Ch8: - noise __, 3, $ea, $4b - noise __, 3, $ea, $5b - noise __, 3, $0, $0 - noise __, 5, $ee, $47 - noise __, 5, $ee, $46 - noise __, 5, $ee, $45 - endchannel + noise_note 2, 14, -2, 75 + noise_note 2, 14, -2, 91 + noise_note 2, 0, 0, 0 + noise_note 4, 14, -6, 71 + noise_note 4, 14, -6, 70 + noise_note 4, 14, -6, 69 + sound_ret Sfx_SweetKiss: - musicheader 1, 5, Sfx_SweetKiss_Ch5 + channel_count 1 + channel 5, Sfx_SweetKiss_Ch5 Sfx_SweetKiss_Ch5: - dutycycle $2 -.loop - sound __, 3, $c1, $07c8 - sound __, 3, $d1, $07da - loopchannel 2, .loop - sound C_, 11, $f1, $07e2 - endchannel + duty_cycle 2 +Sfx_SweetKiss_branch_f146e: + square_note 2, 12, 1, 1992 + square_note 2, 13, 1, 2010 + sound_loop 2, Sfx_SweetKiss_branch_f146e + square_note 26, 15, 1, 2018 + sound_ret Sfx_SweetKiss2: - musicheader 1, 5, Sfx_SweetKiss2_Ch5 + channel_count 1 + channel 5, Sfx_SweetKiss2_Ch5 Sfx_SweetKiss2_Ch5: - dutycycle $0 - soundinput $97 - sound __, 3, $f4, $0772 - sound __, 5, $0, 0 - sound __, 3, $c4, $0772 - sound __, 5, $0, 0 - sound __, 3, $b4, $0772 - sound __, 5, $0, 0 - sound __, 3, $a1, $0772 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 9, 7 + square_note 2, 15, 4, 1906 + square_note 4, 0, 0, 0 + square_note 2, 12, 4, 1906 + square_note 4, 0, 0, 0 + square_note 2, 11, 4, 1906 + square_note 4, 0, 0, 0 + square_note 2, 10, 1, 1906 + pitch_sweep 0, 8 + sound_ret Sfx_BellyDrum: - musicheader 2, 5, Sfx_BellyDrum_Ch5 - musicheader 1, 8, Sfx_BellyDrum_Ch8 + channel_count 2 + channel 5, Sfx_BellyDrum_Ch5 + channel 8, Sfx_BellyDrum_Ch8 Sfx_BellyDrum_Ch5: - dutycycle $2 - soundinput $ac - sound __, 13, $f1, $05a3 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 10, -4 + square_note 12, 15, 1, 1443 + pitch_sweep 0, 8 + sound_ret Sfx_BellyDrum_Ch8: - noise __, 13, $b1, $6c - endchannel + noise_note 12, 11, 1, 108 + sound_ret Sfx_Unknown7F: - musicheader 1, 5, Sfx_Unknown7F_Ch5 + channel_count 1 + channel 5, Sfx_Unknown7F_Ch5 Sfx_Unknown7F_Ch5: - dutycycle $2 - soundinput $95 - sound __, 3, $c9, $03b3 - sound __, 6, $f8, $0463 - sound __, 5, $d1, $0543 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 9, 5 + square_note 2, 12, -1, 947 + square_note 5, 15, 8, 1123 + square_note 4, 13, 1, 1347 + pitch_sweep 0, 8 + sound_ret Sfx_SludgeBomb: - musicheader 2, 5, Sfx_SludgeBomb_Ch5 - musicheader 1, 8, Sfx_SludgeBomb_Ch8 + channel_count 2 + channel 5, Sfx_SludgeBomb_Ch5 + channel 8, Sfx_SludgeBomb_Ch8 Sfx_SludgeBomb_Ch5: - dutycycle $2 - soundinput $c5 - sound __, 4, $f8, $0581 - sound __, 2, $0, 0 - soundinput $cb - sound C_, 1, $f2, $05d1 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 12, 5 + square_note 3, 15, 8, 1409 + square_note 1, 0, 0, 0 + pitch_sweep 12, -3 + square_note 16, 15, 2, 1489 + pitch_sweep 0, 8 + sound_ret Sfx_SludgeBomb_Ch8: - noise __, 4, $e2, $6e - noise __, 2, $0, $0 - noise C_, 1, $e2, $6d - endchannel + noise_note 3, 14, 2, 110 + noise_note 1, 0, 0, 0 + noise_note 16, 14, 2, 109 + sound_ret Sfx_Foresight: - musicheader 1, 5, Sfx_Foresight_Ch5 + channel_count 1 + channel 5, Sfx_Foresight_Ch5 Sfx_Foresight_Ch5: - sound __, 4, $f4, $07b5 - sound __, 4, $f5, $07c8 - sound __, 9, $f4, $07da - sound __, 3, $0, 0 - sound __, 9, $c1, $07da - sound __, 3, $0, 0 - sound __, 9, $91, $07da - endchannel + square_note 3, 15, 4, 1973 + square_note 3, 15, 5, 1992 + square_note 8, 15, 4, 2010 + square_note 2, 0, 0, 0 + square_note 8, 12, 1, 2010 + square_note 2, 0, 0, 0 + square_note 8, 9, 1, 2010 + sound_ret Sfx_Spite: - musicheader 1, 5, Sfx_Spite_Ch5 + channel_count 1 + channel 5, Sfx_Spite_Ch5 Sfx_Spite_Ch5: - togglesfx - vibrato $0, $12 - dutycycle $3 - soundinput $fd - notetype $3, $f8 + toggle_sfx + vibrato 0, 1, 2 + duty_cycle 3 + pitch_sweep 15, -5 + note_type 3, 15, 8 octave 3 note F_, 3 note G#, 3 @@ -2389,326 +2531,346 @@ Sfx_Spite_Ch5: note E_, 3 note G_, 3 note A#, 3 - intensity $bf + volume_envelope 11, -7 note D#, 3 note F#, 3 note A_, 3 - intensity $5f + volume_envelope 5, -7 note D_, 3 - intensity $2f + volume_envelope 2, -7 note F_, 3 note G#, 3 - soundinput $8 - togglesfx - endchannel + pitch_sweep 0, 8 + toggle_sfx + sound_ret Sfx_Outrage: - musicheader 1, 8, Sfx_Outrage_Ch8 + channel_count 1 + channel 8, Sfx_Outrage_Ch8 Sfx_Outrage_Ch8: - noise __, 12, $ea, $6c - noise __, 12, $ea, $6b - noise __, 12, $ea, $6a - noise __, 12, $ea, $69 - noise __, 12, $e1, $59 - endchannel + noise_note 11, 14, -2, 108 + noise_note 11, 14, -2, 107 + noise_note 11, 14, -2, 106 + noise_note 11, 14, -2, 105 + noise_note 11, 14, 1, 89 + sound_ret Sfx_PerishSong: - musicheader 2, 5, Sfx_PerishSong_Ch5 - musicheader 1, 6, Sfx_PerishSong_Ch6 + channel_count 2 + channel 5, Sfx_PerishSong_Ch5 + channel 6, Sfx_PerishSong_Ch6 Sfx_PerishSong_Ch5: - togglesfx - dutycycle $0 - vibrato $12, $53 - notetype $8, $af + toggle_sfx + duty_cycle 0 + vibrato 18, 5, 3 + note_type 8, 10, -7 octave 4 note A_, 9 note G#, 9 - togglesfx - endchannel + toggle_sfx + sound_ret Sfx_PerishSong_Ch6: - togglesfx - dutycycle $0 - vibrato $12, $53 - notetype $8, $af + toggle_sfx + duty_cycle 0 + vibrato 18, 5, 3 + note_type 8, 10, -7 octave 4 note C_, 9 octave 3 note B_, 9 - togglesfx - endchannel + toggle_sfx + sound_ret Sfx_GigaDrain: - musicheader 2, 5, Sfx_GigaDrain_Ch5 - musicheader 1, 8, Sfx_GigaDrain_Ch8 + channel_count 2 + channel 5, Sfx_GigaDrain_Ch5 + channel 8, Sfx_GigaDrain_Ch8 Sfx_GigaDrain_Ch5: - dutycycle $2 - soundinput $97 - sound __, 5, $f8, $0680 - sound C_, 5, $f8, $0680 - sound C_, 5, $c8, $0660 - sound C_, 5, $a8, $0670 - sound C_, 5, $88, $0680 - sound C_, 5, $f8, $0561 - sound C_, 5, $c8, $0541 - sound C_, 5, $a8, $0521 - sound C_, 5, $88, $0511 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 9, 7 + square_note 4, 15, 8, 1664 + square_note 20, 15, 8, 1664 + square_note 20, 12, 8, 1632 + square_note 20, 10, 8, 1648 + square_note 20, 8, 8, 1664 + square_note 20, 15, 8, 1377 + square_note 20, 12, 8, 1345 + square_note 20, 10, 8, 1313 + square_note 20, 8, 8, 1297 + pitch_sweep 0, 8 + sound_ret Sfx_GigaDrain_Ch8: - noise __, 5, $c8, $44 - noise C_, 5, $c8, $50 - noise C_, 5, $c8, $52 - noise C_, 5, $c8, $54 - noise C_, 5, $c8, $56 - noise D#, 1, $c7, $57 - endchannel + noise_note 4, 12, 8, 68 + noise_note 20, 12, 8, 80 + noise_note 20, 12, 8, 82 + noise_note 20, 12, 8, 84 + noise_note 20, 12, 8, 86 + noise_note 64, 12, 7, 87 + sound_ret Sfx_Attract: - musicheader 1, 5, Sfx_Attract_Ch5 + channel_count 1 + channel 5, Sfx_Attract_Ch5 Sfx_Attract_Ch5: - dutycycle $0 - soundinput $77 - sound __, 5, $a9, $06f0 - sound __, 13, $f8, $0720 - soundinput $7f - sound __, 9, $f1, $0740 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 7, 7 + square_note 4, 10, -1, 1776 + square_note 12, 15, 8, 1824 + pitch_sweep 7, -7 + square_note 8, 15, 1, 1856 + pitch_sweep 0, 8 + sound_ret Sfx_Kinesis2: - musicheader 1, 5, Sfx_Kinesis2_Ch5 + channel_count 1 + channel 5, Sfx_Kinesis2_Ch5 Sfx_Kinesis2_Ch5: - dutycycle $0 - sound __, 3, $f3, $0796 - sound __, 3, $23, $0796 - sound C_, 5, $f1, $07c4 - endchannel + duty_cycle 0 + square_note 2, 15, 3, 1942 + square_note 2, 2, 3, 1942 + square_note 20, 15, 1, 1988 + sound_ret Sfx_ZapCannon: - musicheader 1, 8, Sfx_ZapCannon_Ch8 + channel_count 1 + channel 8, Sfx_ZapCannon_Ch8 Sfx_ZapCannon_Ch8: - noise __, 3, $e1, $49 - noise __, 1, $0, $0 - loopchannel 8, Sfx_ZapCannon_Ch8 - noise __, 9, $e1, $49 - endchannel + noise_note 2, 14, 1, 73 + noise_note 0, 0, 0, 0 + sound_loop 8, Sfx_ZapCannon_Ch8 + noise_note 8, 14, 1, 73 + sound_ret Sfx_MeanLook: - musicheader 1, 5, Sfx_MeanLook_Ch5 + channel_count 1 + channel 5, Sfx_MeanLook_Ch5 Sfx_MeanLook_Ch5: - soundinput $77 - dutycycle $3 - sound __, 3, $f8, $0720 -.loop - sound __, 2, $88, $0660 - sound __, 3, $f8, $0790 - loopchannel 5, .loop - sound __, 13, $f8, $0700 - sound __, 13, $c8, $0720 - sound __, 13, $a8, $0700 - sound __, 13, $78, $0720 - sound __, 13, $48, $0700 - sound __, 13, $28, $0720 - soundinput $8 - endchannel + pitch_sweep 7, 7 + duty_cycle 3 + square_note 2, 15, 8, 1824 +Sfx_MeanLook_branch_f15fa: + square_note 1, 8, 8, 1632 + square_note 2, 15, 8, 1936 + sound_loop 5, Sfx_MeanLook_branch_f15fa + square_note 12, 15, 8, 1792 + square_note 12, 12, 8, 1824 + square_note 12, 10, 8, 1792 + square_note 12, 7, 8, 1824 + square_note 12, 4, 8, 1792 + square_note 12, 2, 8, 1824 + pitch_sweep 0, 8 + sound_ret Sfx_HealBell: - musicheader 1, 5, Sfx_HealBell_Ch5 + channel_count 1 + channel 5, Sfx_HealBell_Ch5 Sfx_HealBell_Ch5: - dutycycle $1 - sound __, 2, $f1, $07da - sound __, 2, $d1, $07d9 - sound __, 2, $f1, $07da - sound __, 9, $d1, $07db - endchannel + duty_cycle 1 + square_note 1, 15, 1, 2010 + square_note 1, 13, 1, 2009 + square_note 1, 15, 1, 2010 + square_note 8, 13, 1, 2011 + sound_ret Sfx_Return: - musicheader 1, 5, Sfx_Return_Ch5 + channel_count 1 + channel 5, Sfx_Return_Ch5 Sfx_Return_Ch5: - dutycycle $0 -.loop - soundinput $bf - sound __, 9, $f1, $0759 - soundinput $57 - sound __, 9, $f1, $0759 - sound C_, 1, $0, 0 - loopchannel 2, .loop - soundinput $8 - endchannel + duty_cycle 0 +Sfx_Return_branch_f163c: + pitch_sweep 11, -7 + square_note 8, 15, 1, 1881 + pitch_sweep 5, 7 + square_note 8, 15, 1, 1881 + square_note 16, 0, 0, 0 + sound_loop 2, Sfx_Return_branch_f163c + pitch_sweep 0, 8 + sound_ret Sfx_ExpBar: - musicheader 1, 5, Sfx_ExpBar_Ch5 + channel_count 1 + channel 5, Sfx_ExpBar_Ch5 Sfx_ExpBar_Ch5: - dutycycle $2 - soundinput $d7 - sound __, 9, $e1, $0750 - soundinput $e7 - sound __, 9, $48, $06e0 - sound __, 9, $58, $06f8 - sound __, 9, $68, $0710 - sound __, 9, $78, $0728 - sound __, 9, $88, $0740 - sound __, 9, $98, $0758 - sound C_, 1, $a8, $0770 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 13, 7 + square_note 8, 14, 1, 1872 + pitch_sweep 14, 7 + square_note 8, 4, 8, 1760 + square_note 8, 5, 8, 1784 + square_note 8, 6, 8, 1808 + square_note 8, 7, 8, 1832 + square_note 8, 8, 8, 1856 + square_note 8, 9, 8, 1880 + square_note 16, 10, 8, 1904 + pitch_sweep 0, 8 + sound_ret Sfx_MilkDrink: - musicheader 1, 5, Sfx_MilkDrink_Ch5 + channel_count 1 + channel 5, Sfx_MilkDrink_Ch5 Sfx_MilkDrink_Ch5: - dutycycle $2 -.loop - soundinput $a4 - sound __, 3, $ea, $04e0 - sound __, 14, $f7, $0290 - soundinput $9e - sound __, 5, $c9, $05e1 - sound __, 3, $0, 0 - loopchannel 6, .loop - soundinput $8 - endchannel + duty_cycle 2 +Sfx_MilkDrink_branch_f1684: + pitch_sweep 10, 4 + square_note 2, 14, -2, 1248 + square_note 13, 15, 7, 656 + pitch_sweep 9, -6 + square_note 4, 12, -1, 1505 + square_note 2, 0, 0, 0 + sound_loop 6, Sfx_MilkDrink_branch_f1684 + pitch_sweep 0, 8 + sound_ret Sfx_Present: - musicheader 1, 5, Sfx_Present_Ch5 + channel_count 1 + channel 5, Sfx_Present_Ch5 Sfx_Present_Ch5: - dutycycle $2 - soundinput $d6 -.loop - sound __, 3, $f1, $0740 - sound __, 2, $0, 0 - loopchannel 3, .loop - sound C_, 1, $f1, $0780 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 13, 6 +Sfx_Present_branch_f16a6: + square_note 2, 15, 1, 1856 + square_note 1, 0, 0, 0 + sound_loop 3, Sfx_Present_branch_f16a6 + square_note 16, 15, 1, 1920 + pitch_sweep 0, 8 + sound_ret Sfx_MorningSun: - musicheader 1, 5, Sfx_MorningSun_Ch5 + channel_count 1 + channel 5, Sfx_MorningSun_Ch5 Sfx_MorningSun_Ch5: - dutycycle $3 -.loop - sound __, 3, $f1, $07e4 - sound __, 3, $f1, $07e0 - sound __, 6, $f2, $07e7 - loopchannel 3, .loop - sound __, 2, $0, 0 - sound __, 9, $c2, $07e7 - sound __, 2, $0, 0 - sound __, 9, $82, $07e7 - endchannel + duty_cycle 3 +Sfx_MorningSun_branch_f16be: + square_note 2, 15, 1, 2020 + square_note 2, 15, 1, 2016 + square_note 5, 15, 2, 2023 + sound_loop 3, Sfx_MorningSun_branch_f16be + square_note 1, 0, 0, 0 + square_note 8, 12, 2, 2023 + square_note 1, 0, 0, 0 + square_note 8, 8, 2, 2023 + sound_ret Sfx_Moonlight: - musicheader 1, 5, Sfx_Moonlight_Ch5 + channel_count 1 + channel 5, Sfx_Moonlight_Ch5 Sfx_Moonlight_Ch5: - dutycycle $2 -.loop - sound __, 2, $f8, $07d0 - sound __, 5, $f1, $07e0 - loopchannel 2, .loop - sound C_, 1, $f1, $07e0 - sound C_, 1, $d1, $07e0 - sound C_, 1, $81, $07e0 - endchannel + duty_cycle 2 +Sfx_Moonlight_branch_f16e4: + square_note 1, 15, 8, 2000 + square_note 4, 15, 1, 2016 + sound_loop 2, Sfx_Moonlight_branch_f16e4 + square_note 16, 15, 1, 2016 + square_note 16, 13, 1, 2016 + square_note 16, 8, 1, 2016 + sound_ret Sfx_Encore: - musicheader 2, 5, Sfx_Encore_Ch5 - musicheader 1, 8, Sfx_Encore_Ch8 + channel_count 2 + channel 5, Sfx_Encore_Ch5 + channel 8, Sfx_Encore_Ch8 Sfx_Encore_Ch5: - dutycycle $2 - soundinput $ce - sound C_, 1, $0, 0 -.loop - sound __, 3, $f8, $0774 - sound C#, 5, $0, 0 - loopchannel 2, .loop - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 12, -6 + square_note 16, 0, 0, 0 +Sfx_Encore_branch_f170b: + square_note 2, 15, 8, 1908 + square_note 36, 0, 0, 0 + sound_loop 2, Sfx_Encore_branch_f170b + pitch_sweep 0, 8 + sound_ret Sfx_Encore_Ch8: - noise D_, 1, $1f, $36 - noise D_, 1, $76, $36 - endchannel + noise_note 48, 1, -7, 54 + noise_note 48, 7, 6, 54 + sound_ret Sfx_BeatUp: - musicheader 1, 8, Sfx_BeatUp_Ch8 + channel_count 1 + channel 8, Sfx_BeatUp_Ch8 Sfx_BeatUp_Ch8: - noise __, 3, $e8, $69 - noise __, 7, $d8, $24 - noise __, 3, $e8, $6c - noise __, 5, $c8, $46 - noise __, 7, $d1, $24 - endchannel + noise_note 2, 14, 8, 105 + noise_note 6, 13, 8, 36 + noise_note 2, 14, 8, 108 + noise_note 4, 12, 8, 70 + noise_note 6, 13, 1, 36 + sound_ret Sfx_SweetScent: - musicheader 1, 5, Sfx_SweetScent_Ch5 + channel_count 1 + channel 5, Sfx_SweetScent_Ch5 Sfx_SweetScent_Ch5: - dutycycle $2 - soundinput $96 - sound __, 7, $f8, $0760 - sound __, 7, $e8, $0720 - soundinput $df - sound C_, 7, $f1, $0730 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 9, 6 + square_note 6, 15, 8, 1888 + square_note 6, 14, 8, 1824 + pitch_sweep 13, -7 + square_note 22, 15, 1, 1840 + pitch_sweep 0, 8 + sound_ret Sfx_BatonPass: - musicheader 2, 5, Sfx_BatonPass_Ch5 - musicheader 1, 8, Sfx_BatonPass_Ch8 + channel_count 2 + channel 5, Sfx_BatonPass_Ch5 + channel 8, Sfx_BatonPass_Ch8 Sfx_BatonPass_Ch5: - dutycycle $2 - soundinput $f7 - sound C#, 1, $f2, $0680 - sound __, 2, $f1, $0760 - sound C#, 1, $0, 0 - sound __, 2, $f1, $0760 - sound C_, 11, $0, 0 - sound __, 2, $f1, $0760 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 15, 7 + square_note 32, 15, 2, 1664 + square_note 1, 15, 1, 1888 + square_note 32, 0, 0, 0 + square_note 1, 15, 1, 1888 + square_note 26, 0, 0, 0 + square_note 1, 15, 1, 1888 + pitch_sweep 0, 8 + sound_ret Sfx_BatonPass_Ch8: - noise C#, 1, $f2, $20 - endchannel + noise_note 32, 15, 2, 32 + sound_ret Sfx_EggCrack: - musicheader 1, 5, Sfx_EggCrack_Ch5 + channel_count 1 + channel 5, Sfx_EggCrack_Ch5 Sfx_EggCrack_Ch5: - togglesfx - notetype $1, $f1 - dutycycle $0 + toggle_sfx + note_type 1, 15, 1 + duty_cycle 0 octave 4 note D#, 1 note C_, 1 - note __, 1 + rest 1 note F#, 1 - endchannel + sound_ret Sfx_Evolved: - musicheader 1, 5, Sfx_Evolved_Ch5 + channel_count 1 + channel 5, Sfx_Evolved_Ch5 Sfx_Evolved_Ch5: - togglesfx - notetype $1, $c1 + toggle_sfx + note_type 1, 12, 1 octave 4 note C_, 2 note E_, 2 @@ -2724,15 +2886,16 @@ Sfx_Evolved_Ch5: note B_, 3 octave 7 note C_, 16 - endchannel + sound_ret Sfx_MasterBall: - musicheader 1, 5, Sfx_MasterBall_Ch5 + channel_count 1 + channel 5, Sfx_MasterBall_Ch5 Sfx_MasterBall_Ch5: - togglesfx - dutycycle $1 - notetype $2, $e1 + toggle_sfx + duty_cycle 1 + note_type 2, 14, 1 octave 6 note B_, 2 octave 7 @@ -2745,120 +2908,126 @@ Sfx_MasterBall_Ch5: note A_, 2 note A#, 2 note A_, 2 - intensity $c1 + volume_envelope 12, 1 note G#, 2 note G_, 2 note F#, 2 - intensity $91 + volume_envelope 9, 1 note F_, 2 note E_, 2 note D#, 2 - intensity $61 + volume_envelope 6, 1 note D_, 2 note C#, 2 note C_, 2 - endchannel + sound_ret Sfx_EggHatch: - musicheader 1, 5, Sfx_EggHatch_Ch5 + channel_count 1 + channel 5, Sfx_EggHatch_Ch5 Sfx_EggHatch_Ch5: - togglesfx - notetype $2, $f1 - dutycycle $2 + toggle_sfx + note_type 2, 15, 1 + duty_cycle 2 octave 5 note E_, 1 note C_, 1 - note __, 1 + rest 1 note G_, 1 note D_, 1 - intensity $e2 + volume_envelope 14, 2 note B_, 7 - intensity $82 + volume_envelope 8, 2 note B_, 7 - intensity $42 + volume_envelope 4, 2 note B_, 7 - endchannel + sound_ret Sfx_GsIntroCharizardFireball: - musicheader 1, 8, Sfx_GsIntroCharizardFireball_Ch8 + channel_count 1 + channel 8, Sfx_GsIntroCharizardFireball_Ch8 Sfx_GsIntroCharizardFireball_Ch8: - noise __, 9, $cf, $4d - noise __, 9, $f1, $37 -.loop - noise __, 2, $f8, $4f - noise __, 1, $c8, $26 - noise __, 2, $d8, $5f - noise __, 1, $a8, $37 - loopchannel 12, .loop - noise __, 4, $f8, $6f - noise __, 5, $d8, $5f - noise __, 13, $d8, $5c - noise C#, 9, $d3, $4f - endchannel + noise_note 8, 12, -7, 77 + noise_note 8, 15, 1, 55 +Sfx_GsIntroCharizardFireball_branch_f17e2: + noise_note 1, 15, 8, 79 + noise_note 0, 12, 8, 38 + noise_note 1, 13, 8, 95 + noise_note 0, 10, 8, 55 + sound_loop 12, Sfx_GsIntroCharizardFireball_branch_f17e2 + noise_note 3, 15, 8, 111 + noise_note 4, 13, 8, 95 + noise_note 12, 13, 8, 92 + noise_note 40, 13, 3, 79 + sound_ret Sfx_GsIntroPokemonAppears: - musicheader 1, 8, Sfx_GsIntroPokemonAppears_Ch8 + channel_count 1 + channel 8, Sfx_GsIntroPokemonAppears_Ch8 Sfx_GsIntroPokemonAppears_Ch8: - noise __, 2, $88, $4f - noise __, 3, $8f, $2 - noise __, 3, $5f, $12 - noise __, 3, $3f, $22 - noise __, 1, $f8, $27 - noise __, 2, $f8, $4f - noise __, 9, $f1, $0 - endchannel + noise_note 1, 8, 8, 79 + noise_note 2, 8, -7, 2 + noise_note 2, 5, -7, 18 + noise_note 2, 3, -7, 34 + noise_note 0, 15, 8, 39 + noise_note 1, 15, 8, 79 + noise_note 8, 15, 1, 0 + sound_ret Sfx_Flash: - musicheader 1, 5, Sfx_Flash_Ch5 + channel_count 1 + channel 5, Sfx_Flash_Ch5 Sfx_Flash_Ch5: - dutycycle $1 - soundinput $ef - sound __, 2, $40, $07e8 - sound __, 2, $60, $07e8 - sound __, 3, $80, $07e8 - sound __, 6, $a0, $07e8 - sound __, 7, $a0, $07e8 - sound __, 8, $80, $07e8 - sound __, 9, $60, $07e8 - sound __, 10, $30, $07e8 - sound __, 16, $12, $07e8 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 14, -7 + square_note 1, 4, 0, 2024 + square_note 1, 6, 0, 2024 + square_note 2, 8, 0, 2024 + square_note 5, 10, 0, 2024 + square_note 6, 10, 0, 2024 + square_note 7, 8, 0, 2024 + square_note 8, 6, 0, 2024 + square_note 9, 3, 0, 2024 + square_note 15, 1, 2, 2024 + pitch_sweep 0, 8 + sound_ret Sfx_GameFreakLogoGs: - musicheader 1, 5, Sfx_GameFreakLogoGs_Ch5 + channel_count 1 + channel 5, Sfx_GameFreakLogoGs_Ch5 Sfx_GameFreakLogoGs_Ch5: - dutycycle $3 - soundinput $7f - sound __, 5, $55, $07e2 - sound __, 6, $75, $07e2 - sound __, 7, $94, $07e2 - sound __, 8, $b4, $07e2 - sound __, 9, $b3, $07e2 - sound __, 10, $93, $07e2 - sound __, 11, $72, $07e2 - sound __, 11, $53, $07e2 - sound __, 11, $34, $07e2 - sound __, 11, $15, $07e2 - soundinput $8 - endchannel + duty_cycle 3 + pitch_sweep 7, -7 + square_note 4, 5, 5, 2018 + square_note 5, 7, 5, 2018 + square_note 6, 9, 4, 2018 + square_note 7, 11, 4, 2018 + square_note 8, 11, 3, 2018 + square_note 9, 9, 3, 2018 + square_note 10, 7, 2, 2018 + square_note 10, 5, 3, 2018 + square_note 10, 3, 4, 2018 + square_note 10, 1, 5, 2018 + pitch_sweep 0, 8 + sound_ret 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 + channel_count 4 + channel 5, Sfx_DexFanfareLessThan20_Ch5 + channel 6, Sfx_DexFanfareLessThan20_Ch6 + channel 7, Sfx_DexFanfareLessThan20_Ch7 + channel 8, Sfx_DexFanfareLessThan20_Ch8 Sfx_DexFanfareLessThan20_Ch5: - togglesfx + toggle_sfx tempo 124 - volume $77 - notetype $8, $b1 + volume 7, 7 + note_type 8, 11, 1 octave 3 note A_, 4 note F#, 2 @@ -2871,13 +3040,13 @@ Sfx_DexFanfareLessThan20_Ch5: note E_, 2 note E_, 2 note D_, 6 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfareLessThan20_Ch6: - togglesfx - notetype $8, $c1 + toggle_sfx + note_type 8, 12, 1 octave 3 note B_, 4 note A_, 2 @@ -2890,70 +3059,71 @@ Sfx_DexFanfareLessThan20_Ch6: note A_, 2 note G_, 2 note F#, 6 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfareLessThan20_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 4 note D_, 6 octave 3 note A_, 2 - note __, 2 + rest 2 note A_, 2 note A#, 4 note G_, 2 octave 4 note D#, 6 note D_, 2 - note __, 4 + rest 4 octave 3 note E_, 1 - note __, 1 + rest 1 note F#, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfareLessThan20_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C#, 6 - note __, 16 - note __, 12 - endchannel + rest 16 + rest 12 + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_DexFanfare140169_Ch5 + channel 6, Sfx_DexFanfare140169_Ch6 + channel 7, Sfx_DexFanfare140169_Ch7 + channel 8, Sfx_DexFanfare140169_Ch8 Sfx_DexFanfare140169_Ch5: - togglesfx + toggle_sfx tempo 120 - volume $77 - dutycycle $3 - vibrato $12, $34 - notetype $6, $b1 - note __, 8 + volume 7, 7 + duty_cycle 3 + vibrato 18, 3, 4 + note_type 6, 11, 1 + rest 8 octave 3 note E_, 4 note E_, 4 note A_, 4 octave 4 note C#, 4 - intensity $a4 + volume_envelope 10, 4 note D_, 4 note C_, 4 octave 3 @@ -2963,16 +3133,16 @@ Sfx_DexFanfare140169_Ch5: note G_, 16 octave 2 note B_, 8 - note __, 8 - endchannel + rest 8 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare140169_Ch6: - togglesfx - dutycycle $2 - vibrato $12, $34 - notetype $6, $c1 + toggle_sfx + duty_cycle 2 + vibrato 18, 3, 4 + note_type 6, 12, 1 octave 4 note E_, 4 note F#, 4 @@ -2980,7 +3150,7 @@ Sfx_DexFanfare140169_Ch6: note G_, 4 note G_, 4 note G_, 4 - intensity $b4 + volume_envelope 11, 4 note F#, 4 note G_, 4 note A_, 4 @@ -2989,15 +3159,15 @@ Sfx_DexFanfare140169_Ch6: octave 4 note B_, 16 note G_, 8 - note __, 8 - endchannel + rest 8 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare140169_Ch7: - togglesfx - notetype $c, $25 - note __, 4 + toggle_sfx + note_type 12, 2, 5 + rest 4 octave 2 note A_, 1 octave 3 @@ -3005,7 +3175,7 @@ Sfx_DexFanfare140169_Ch7: note E_, 1 note A_, 3 note C#, 1 - note __, 1 + rest 1 note D_, 1 note F#, 1 note A_, 1 @@ -3013,7 +3183,7 @@ Sfx_DexFanfare140169_Ch7: note D_, 3 octave 2 note A_, 1 - note __, 1 + rest 1 note G_, 1 note B_, 1 octave 3 @@ -3021,125 +3191,126 @@ Sfx_DexFanfare140169_Ch7: note G_, 3 octave 2 note B_, 1 - note __, 1 + rest 1 note G_, 4 - note __, 4 - endchannel + rest 4 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare140169_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $c + toggle_sfx + sfx_toggle_noise 4 + drum_speed 12 note C_, 4 -.loop +Sfx_DexFanfare140169_branch_f1945: note D_, 4 note C#, 1 note C#, 1 note C#, 1 note C#, 1 - loopchannel 3, .loop + sound_loop 3, Sfx_DexFanfare140169_branch_f1945 note D_, 8 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_DexFanfare170199_Ch5 + channel 6, Sfx_DexFanfare170199_Ch6 + channel 7, Sfx_DexFanfare170199_Ch7 + channel 8, Sfx_DexFanfare170199_Ch8 Sfx_DexFanfare170199_Ch5: - togglesfx + toggle_sfx tempo 112 - volume $77 - vibrato $12, $34 - dutycycle $3 - notetype $8, $b4 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 11, 4 octave 3 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 6 - note __, 2 + rest 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 - intensity $c1 + rest 1 + volume_envelope 12, 1 note F_, 4 note G_, 4 note A_, 4 - notetype $c, $a8 + note_type 12, 10, 8 note A#, 12 - note __, 4 - endchannel + rest 4 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare170199_Ch6: - togglesfx - vibrato $12, $34 - dutycycle $3 - notetype $8, $c4 + toggle_sfx + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 12, 4 octave 3 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 6 - note __, 2 + rest 2 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 - intensity $d1 + rest 1 + volume_envelope 13, 1 octave 4 note D#, 4 note D#, 4 note D#, 4 - notetype $c, $b8 + note_type 12, 11, 8 note D_, 12 - note __, 4 - endchannel + rest 4 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare170199_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note D#, 6 - note __, 2 + rest 2 note D#, 1 - note __, 1 + rest 1 note D#, 1 - note __, 1 + rest 1 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 + rest 2 note C_, 2 - note __, 2 - notetype $c, $25 + rest 2 + note_type 12, 2, 5 octave 2 note A#, 12 - note __, 4 - endchannel + rest 4 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare170199_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $8 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 8 note D_, 2 note D_, 2 note D_, 4 @@ -3152,25 +3323,26 @@ Sfx_DexFanfare170199_Ch8: note C#, 1 note C#, 1 note C#, 1 - notetype $c + drum_speed 12 note B_, 16 - endchannel + sound_ret - db $fd + db sound_loop_cmd ; unused 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 + channel_count 4 + channel 5, Sfx_DexFanfare200229_Ch5 + channel 6, Sfx_DexFanfare200229_Ch6 + channel 7, Sfx_DexFanfare200229_Ch7 + channel 8, Sfx_DexFanfare200229_Ch8 Sfx_DexFanfare200229_Ch5: - togglesfx + toggle_sfx tempo 124 - volume $77 - vibrato $12, $34 - dutycycle $3 - notetype $8, $b2 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 11, 2 octave 3 note C_, 2 note E_, 2 @@ -3184,18 +3356,18 @@ Sfx_DexFanfare200229_Ch5: octave 4 note D#, 4 note G_, 4 - notetype $c, $a8 + note_type 12, 10, 8 note F#, 12 - note __, 4 - endchannel + rest 4 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare200229_Ch6: - togglesfx - vibrato $12, $34 - dutycycle $3 - notetype $8, $b2 + toggle_sfx + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 11, 2 octave 3 note E_, 2 note G_, 2 @@ -3207,23 +3379,23 @@ Sfx_DexFanfare200229_Ch6: note D#, 4 note G_, 4 note A#, 4 - notetype $c, $b8 + note_type 12, 11, 8 note A_, 12 - note __, 4 - endchannel + rest 4 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare200229_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 1 - note __, 1 + rest 1 note C_, 2 note E_, 2 note G_, 2 @@ -3239,29 +3411,29 @@ Sfx_DexFanfare200229_Ch7: octave 3 note D#, 4 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 octave 3 note D_, 1 - note __, 1 + rest 1 note D_, 1 - note __, 1 + rest 1 octave 2 note A_, 2 octave 3 note D_, 6 - note __, 6 - endchannel + rest 6 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare200229_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $8 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 8 note C#, 1 note C#, 1 note C#, 1 @@ -3283,75 +3455,76 @@ Sfx_DexFanfare200229_Ch8: note D_, 2 note D_, 2 note B_, 12 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused 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 + channel_count 4 + channel 5, Sfx_DexFanfare230Plus_Ch5 + channel 6, Sfx_DexFanfare230Plus_Ch6 + channel 7, Sfx_DexFanfare230Plus_Ch7 + channel 8, Sfx_DexFanfare230Plus_Ch8 Sfx_DexFanfare230Plus_Ch5: - togglesfx + toggle_sfx tempo 112 - volume $77 - vibrato $12, $34 - dutycycle $3 - notetype $8, $a5 + volume 7, 7 + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 10, 5 octave 3 note B_, 2 note G_, 2 note B_, 2 octave 4 note D_, 14 - note __, 2 - dutycycle $2 - intensity $85 + rest 2 + duty_cycle 2 + volume_envelope 8, 5 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 6 - intensity $a5 - dutycycle $3 + volume_envelope 10, 5 + duty_cycle 3 octave 3 note A_, 2 note G_, 2 note F_, 10 - note __, 2 - dutycycle $2 - intensity $85 + rest 2 + duty_cycle 2 + volume_envelope 8, 5 octave 2 note F_, 1 - note __, 1 + rest 1 note F_, 6 - intensity $a5 - dutycycle $3 + volume_envelope 10, 5 + duty_cycle 3 octave 3 note A#, 12 - intensity $b2 + volume_envelope 11, 2 note G_, 4 note A_, 4 note A#, 4 - notetype $c, $a8 + note_type 12, 10, 8 note A_, 14 - note __, 2 - endchannel + rest 2 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare230Plus_Ch6: - togglesfx - vibrato $12, $34 - dutycycle $3 - notetype $8, $b5 + toggle_sfx + vibrato 18, 3, 4 + duty_cycle 3 + note_type 8, 11, 5 octave 4 note G_, 2 note D_, 2 note G_, 2 note F_, 14 - note __, 4 + rest 4 note F_, 2 note E_, 2 note D_, 2 @@ -3359,80 +3532,80 @@ Sfx_DexFanfare230Plus_Ch6: octave 3 note B_, 2 note A_, 10 - note __, 4 + rest 4 note A_, 2 octave 4 note C_, 2 note D_, 2 note D#, 12 - intensity $c2 + volume_envelope 12, 2 note G_, 4 note G_, 4 note G_, 4 - notetype $c, $b8 + note_type 12, 11, 8 note F#, 14 - note __, 2 - endchannel + rest 2 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare230Plus_Ch7: - togglesfx - notetype $8, $25 + toggle_sfx + note_type 8, 2, 5 octave 3 note G_, 6 note A#, 4 note F_, 2 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 1 - note __, 1 + rest 1 note A#, 2 - note __, 2 + rest 2 note D_, 1 - note __, 1 + rest 1 note D_, 6 note A_, 4 note F_, 2 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 1 - note __, 1 + rest 1 note A_, 2 - note __, 2 + rest 2 note C_, 1 - note __, 1 + rest 1 note C_, 6 note G_, 4 note D#, 2 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note G_, 1 - note __, 1 + rest 1 note A#, 4 note G_, 4 note D#, 4 - notetype $c, $25 + note_type 12, 2, 5 note D_, 14 - note __, 2 - endchannel + rest 2 + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_DexFanfare230Plus_Ch8: - togglesfx - sfxtogglenoise $4 - notetype $8 + toggle_sfx + sfx_toggle_noise 4 + drum_speed 8 note D_, 2 note D_, 2 note D_, 2 -.loop1 +Sfx_DexFanfare230Plus_branch_f1b14: note D_, 6 note D_, 2 note D_, 2 @@ -3444,7 +3617,7 @@ Sfx_DexFanfare230Plus_Ch8: note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, .loop1 + sound_loop 2, Sfx_DexFanfare230Plus_branch_f1b14 note D_, 6 note D_, 2 note D_, 2 @@ -3453,210 +3626,220 @@ Sfx_DexFanfare230Plus_Ch8: note D_, 4 note D_, 4 note D_, 4 -.loop2 +Sfx_DexFanfare230Plus_branch_f1b2b: note C#, 1 - loopchannel 18, .loop2 + sound_loop 18, Sfx_DexFanfare230Plus_branch_f1b2b note D_, 6 - endchannel + sound_ret - togglesfx ; unused + toggle_sfx ; unused Sfx_NotVeryEffective: - musicheader 1, 8, Sfx_NotVeryEffective_Ch8 + channel_count 1 + channel 8, Sfx_NotVeryEffective_Ch8 Sfx_NotVeryEffective_Ch8: - noise __, 5, $f1, $5f - noise __, 2, $a0, $42 - noise C_, 1, $f1, $53 - endchannel + noise_note 4, 15, 1, 95 + noise_note 1, 10, 0, 66 + noise_note 16, 15, 1, 83 + sound_ret Sfx_Damage: - musicheader 1, 8, Sfx_Damage_Ch8 + channel_count 1 + channel 8, Sfx_Damage_Ch8 Sfx_Damage_Ch8: - noise __, 5, $f1, $5e - noise __, 2, $a0, $12 - noise __, 5, $f0, $32 - noise C_, 1, $f1, $44 - endchannel + noise_note 4, 15, 1, 94 + noise_note 1, 10, 0, 18 + noise_note 4, 15, 0, 50 + noise_note 16, 15, 1, 68 + sound_ret Sfx_SuperEffective: - musicheader 1, 8, Sfx_SuperEffective_Ch8 + channel_count 1 + channel 8, Sfx_SuperEffective_Ch8 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 + noise_note 3, 15, 1, 79 + noise_note 1, 12, 8, 34 + noise_note 2, 15, 8, 63 + noise_note 3, 13, 0, 21 + noise_note 32, 15, 2, 53 + sound_ret Sfx_BallBounce: - musicheader 2, 5, Sfx_BallBounce_Ch5 - musicheader 1, 6, Sfx_BallBounce_Ch6 + channel_count 2 + channel 5, Sfx_BallBounce_Ch5 + channel 6, Sfx_BallBounce_Ch6 Sfx_BallBounce_Ch5: - dutycycle $2 - sound __, 9, $e1, $0740 - sound C_, 8, $0, 0 - sound __, 9, $b1, $0740 - sound C_, 8, $0, 0 - sound __, 9, $81, $0740 - sound C_, 8, $0, 0 - sound __, 9, $51, $0740 - sound C_, 8, $0, 0 - endchannel + duty_cycle 2 + square_note 8, 14, 1, 1856 + square_note 23, 0, 0, 0 + square_note 8, 11, 1, 1856 + square_note 23, 0, 0, 0 + square_note 8, 8, 1, 1856 + square_note 23, 0, 0, 0 + square_note 8, 5, 1, 1856 + square_note 23, 0, 0, 0 + sound_ret Sfx_BallBounce_Ch6: - dutycycle $2 - sound __, 3, $8, 0 - sound __, 9, $b1, $0741 - sound C_, 8, $0, 0 - sound __, 9, $81, $0741 - sound C_, 8, $0, 0 - sound __, 9, $51, $0741 - sound C_, 8, $0, 0 - sound __, 9, $21, $0741 - sound C_, 8, $0, 0 - endchannel + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + square_note 23, 0, 0, 0 + square_note 8, 8, 1, 1857 + square_note 23, 0, 0, 0 + square_note 8, 5, 1, 1857 + square_note 23, 0, 0, 0 + square_note 8, 2, 1, 1857 + square_note 23, 0, 0, 0 + sound_ret Sfx_SweetScent2: - musicheader 2, 5, Sfx_SweetScent2_Ch5 - musicheader 1, 8, Sfx_SweetScent2_Ch8 + channel_count 2 + channel 5, Sfx_SweetScent2_Ch5 + channel 8, Sfx_SweetScent2_Ch8 Sfx_SweetScent2_Ch5: - soundinput $af - dutycycle $1 - sound __, 7, $f8, $05f0 - sound __, 3, $f1, $0620 - sound C_, 1, $f1, $0650 - soundinput $8 - endchannel + pitch_sweep 10, -7 + duty_cycle 1 + square_note 6, 15, 8, 1520 + square_note 2, 15, 1, 1568 + square_note 16, 15, 1, 1616 + pitch_sweep 0, 8 + sound_ret Sfx_SweetScent2_Ch8: - noise __, 3, $e8, $22 - noise C_, 2, $aa, $0 -.loop - noise __, 5, $d9, $10 - noise __, 9, $91, $0 - noise __, 3, $61, $7 - loopchannel 5, .loop - noise __, 5, $99, $0 - noise __, 11, $61, $0 - noise __, 7, $59, $0 - noise __, 3, $21, $7 - endchannel + noise_note 2, 14, 8, 34 + noise_note 17, 10, -2, 0 +Sfx_SweetScent2_branch_f1bd2: + noise_note 4, 13, -1, 16 + noise_note 8, 9, 1, 0 + noise_note 2, 6, 1, 7 + sound_loop 5, Sfx_SweetScent2_branch_f1bd2 + noise_note 4, 9, -1, 0 + noise_note 10, 6, 1, 0 + noise_note 6, 5, -1, 0 + noise_note 2, 2, 1, 7 + sound_ret Sfx_HitEndOfExpBar: - musicheader 2, 5, Sfx_HitEndOfExpBar_Ch5 - musicheader 1, 6, Sfx_HitEndOfExpBar_Ch6 + channel_count 2 + channel 5, Sfx_HitEndOfExpBar_Ch5 + channel 6, Sfx_HitEndOfExpBar_Ch6 Sfx_HitEndOfExpBar_Ch5: - dutycycle $2 - sound __, 2, $e1, $0789 - sound __, 2, $e1, $07a2 - sound C_, 1, $e1, $07b1 - endchannel + duty_cycle 2 + square_note 1, 14, 1, 1929 + square_note 1, 14, 1, 1954 + square_note 16, 14, 1, 1969 + sound_ret Sfx_HitEndOfExpBar_Ch6: - dutycycle $2 - sound __, 2, $e1, $07a2 - sound __, 2, $e1, $07b1 - sound C_, 1, $e1, $07c4 - endchannel + duty_cycle 2 + square_note 1, 14, 1, 1954 + square_note 1, 14, 1, 1969 + square_note 16, 14, 1, 1988 + sound_ret Sfx_GiveTrademon: - musicheader 1, 5, Sfx_GiveTrademon_Ch5 + channel_count 1 + channel 5, Sfx_GiveTrademon_Ch5 Sfx_GiveTrademon_Ch5: - sound C#, 1, $0, 0 - dutycycle $1 - soundinput $a7 - sound C_, 12, $f4, $0750 - sound C_, 12, $d4, $0750 - sound C_, 12, $b4, $0750 - sound C_, 12, $94, $0750 - sound C_, 12, $74, $0750 - sound C_, 12, $54, $0750 - sound C_, 12, $34, $0750 - sound C_, 12, $14, $0750 - soundinput $8 - endchannel + square_note 32, 0, 0, 0 + duty_cycle 1 + pitch_sweep 10, 7 + square_note 27, 15, 4, 1872 + square_note 27, 13, 4, 1872 + square_note 27, 11, 4, 1872 + square_note 27, 9, 4, 1872 + square_note 27, 7, 4, 1872 + square_note 27, 5, 4, 1872 + square_note 27, 3, 4, 1872 + square_note 27, 1, 4, 1872 + pitch_sweep 0, 8 + sound_ret Sfx_GetTrademon: - musicheader 1, 5, Sfx_GetTrademon_Ch5 + channel_count 1 + channel 5, Sfx_GetTrademon_Ch5 Sfx_GetTrademon_Ch5: - sound C#, 1, $0, 0 - dutycycle $2 - soundinput $bf - sound C_, 12, $14, $07bc - sound C_, 12, $34, $07bc - sound C_, 12, $54, $07bc - sound C_, 12, $74, $07bc - sound C_, 12, $94, $07bc - sound C_, 12, $b4, $07bc - sound C_, 12, $d4, $07bc - sound C_, 12, $f4, $07bc - soundinput $8 - endchannel + square_note 32, 0, 0, 0 + duty_cycle 2 + pitch_sweep 11, -7 + square_note 27, 1, 4, 1980 + square_note 27, 3, 4, 1980 + square_note 27, 5, 4, 1980 + square_note 27, 7, 4, 1980 + square_note 27, 9, 4, 1980 + square_note 27, 11, 4, 1980 + square_note 27, 13, 4, 1980 + square_note 27, 15, 4, 1980 + pitch_sweep 0, 8 + sound_ret Sfx_TrainArrived: - musicheader 3, 5, Sfx_TrainArrived_Ch5 - musicheader 1, 6, Sfx_TrainArrived_Ch6 - musicheader 1, 8, Sfx_TrainArrived_Ch8 + channel_count 3 + channel 5, Sfx_TrainArrived_Ch5 + channel 6, Sfx_TrainArrived_Ch6 + channel 8, Sfx_TrainArrived_Ch8 Sfx_TrainArrived_Ch6: - tone $0008 - sound __, 9, $0, 0 + pitch_offset 8 + square_note 8, 0, 0, 0 Sfx_TrainArrived_Ch5: - dutycycle $2 - sound __, 5, $5f, $0691 - sound __, 5, $6f, $0694 - sound __, 5, $78, $0697 - sound __, 5, $7f, $069a - sound __, 5, $68, $06ae - sound C_, 1, $6f, $06ab - sound F_, 9, $65, $06a8 - endchannel + duty_cycle 2 + square_note 4, 5, -7, 1681 + square_note 4, 6, -7, 1684 + square_note 4, 7, 8, 1687 + square_note 4, 7, -7, 1690 + square_note 4, 6, 8, 1710 + square_note 16, 6, -7, 1707 + square_note 104, 6, 5, 1704 + sound_ret Sfx_TrainArrived_Ch8: - noise __, 6, $af, $10 - noise __, 5, $9f, $20 - noise __, 5, $8f, $21 - noise __, 5, $7f, $22 - noise __, 5, $8f, $21 - noise __, 5, $9f, $20 - noise __, 5, $9f, $10 - noise F_, 9, $a3, $0 - endchannel + noise_note 5, 10, -7, 16 + noise_note 4, 9, -7, 32 + noise_note 4, 8, -7, 33 + noise_note 4, 7, -7, 34 + noise_note 4, 8, -7, 33 + noise_note 4, 9, -7, 32 + noise_note 4, 9, -7, 16 + noise_note 104, 10, 3, 0 + sound_ret Sfx_2Boops: - musicheader 1, 5, Sfx_2Boops_Ch5 + channel_count 1 + channel 5, Sfx_2Boops_Ch5 Sfx_2Boops_Ch5: - dutycycle $2 -.loop - soundinput $79 - sound __, 2, $99, $0563 - sound __, 5, $f2, $04b5 - soundinput $43 - sound C_, 1, $f8, $05cd - loopchannel 2, .loop - soundinput $8 - endchannel + duty_cycle 2 +Sfx_2Boops_branch_f1cb9: + pitch_sweep 7, -1 + square_note 1, 9, -1, 1379 + square_note 4, 15, 2, 1205 + pitch_sweep 4, 3 + square_note 16, 15, 8, 1485 + sound_loop 2, Sfx_2Boops_branch_f1cb9 + pitch_sweep 0, 8 + sound_ret Sfx_Menu_Ch8: - noise __, 2, $e2, $33 - noise __, 9, $e1, $22 - endchannel + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret Sfx_Pokeflute_Ch7: tempo 256 - volume $77 - togglesfx - vibrato $10, $14 - notetype $c, $10 + volume 7, 7 + toggle_sfx + vibrato 16, 1, 4 + note_type 12, 1, 0 octave 5 note E_, 2 note F_, 2 @@ -3673,948 +3856,948 @@ Sfx_Pokeflute_Ch7: note A_, 2 note F_, 2 note G_, 8 - note __, 12 - endchannel + rest 12 + sound_ret Sfx_PlacePuzzlePieceDown_Ch8: - noise __, 3, $f7, $24 - noise __, 3, $f7, $34 - noise __, 5, $f7, $44 - noise __, 9, $f4, $55 - noise __, 9, $f1, $44 - endchannel + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret Sfx_EnterDoor_Ch8: - noise __, 10, $f1, $44 - noise __, 9, $d1, $43 - endchannel + noise_note 9, 15, 1, 68 + noise_note 8, 13, 1, 67 + sound_ret Sfx_SwitchPokemon_Ch5: - dutycycle $2 - sound __, 9, $e1, $0740 - endchannel + duty_cycle 2 + square_note 8, 14, 1, 1856 + sound_ret Sfx_SwitchPokemon_Ch6: - dutycycle $2 - sound __, 3, $8, 0 - sound __, 9, $b1, $0741 - endchannel + duty_cycle 2 + square_note 2, 0, 8, 0 + square_note 8, 11, 1, 1857 + sound_ret Sfx_PokeballsPlacedOnTable_Ch5: - dutycycle $2 - soundinput $3a - sound __, 5, $f2, $0200 - soundinput $22 - sound __, 9, $e2, $0200 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret Sfx_BallWobble_Ch5: - dutycycle $2 - soundinput $3a - sound __, 5, $f2, $0400 - soundinput $22 - sound __, 9, $e2, $0400 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1024 + pitch_sweep 2, 2 + square_note 8, 14, 2, 1024 + pitch_sweep 0, 8 + sound_ret Sfx_Tally_Ch5: - dutycycle $2 - sound __, 5, $f1, $0780 - endchannel + duty_cycle 2 + square_note 4, 15, 1, 1920 + sound_ret Sfx_Tally_Ch6: - dutycycle $2 - sound __, 2, $8, 0 - sound __, 5, $a1, $0761 - endchannel + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 10, 1, 1889 + sound_ret Sfx_Transaction_Ch5: - dutycycle $2 - sound __, 5, $e1, $0700 - sound C_, 9, $f2, $07e0 - endchannel + duty_cycle 2 + square_note 4, 14, 1, 1792 + square_note 24, 15, 2, 2016 + sound_ret Sfx_Transaction_Ch6: - dutycycle $2 - sound __, 2, $8, 0 - sound __, 5, $91, $06c1 - sound C_, 9, $a2, $07a1 - endchannel + duty_cycle 2 + square_note 1, 0, 8, 0 + square_note 4, 9, 1, 1729 + square_note 24, 10, 2, 1953 + sound_ret Sfx_Bump_Ch5: - dutycycle $2 - soundinput $5a - sound __, 16, $f1, $0300 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 5, -2 + square_note 15, 15, 1, 768 + pitch_sweep 0, 8 + sound_ret Sfx_ExitBuilding_Ch8: - noise __, 3, $f1, $54 - noise __, 13, $71, $23 - noise __, 3, $b1, $54 - noise __, 13, $61, $23 - noise __, 7, $41, $54 - endchannel + noise_note 2, 15, 1, 84 + noise_note 12, 7, 1, 35 + noise_note 2, 11, 1, 84 + noise_note 12, 6, 1, 35 + noise_note 6, 4, 1, 84 + sound_ret -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 +Sfx_ReadText2_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret Sfx_Potion_Ch5: - dutycycle $2 - soundinput $17 - sound __, 16, $f0, $04f0 - sound __, 16, $f2, $0650 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret Sfx_Poison_Ch5: - dutycycle $0 - soundinput $14 - sound __, 5, $f2, $0600 - loopchannel 4, Sfx_Poison_Ch5 - sound __, 16, $f3, $0600 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + sound_loop 4, Sfx_Poison_Ch5 + square_note 15, 15, 3, 1536 + pitch_sweep 0, 8 + sound_ret Sfx_FullHeal_Ch5: - dutycycle $2 - soundinput $14 - sound __, 5, $f2, $0600 - sound __, 5, $f2, $0600 - soundinput $17 - sound __, 16, $f2, $0600 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 8 + sound_ret Sfx_GotSafariBalls_Ch5: - dutycycle $2 - soundinput $15 - sound __, 16, $f0, $04f0 - sound __, 16, $f2, $0650 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 1, 5 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret Sfx_BootPc_Ch5: - dutycycle $2 - sound __, 16, $f2, $07c0 - sound __, 16, $0, 0 - sound __, 4, $a1, $0780 - sound __, 4, $a1, $0700 - sound __, 4, $a1, $0740 - sound __, 4, $a1, $0700 - sound __, 4, $a1, $0780 - sound __, 4, $a1, $0700 - sound __, 4, $a1, $07c0 - sound __, 9, $a1, $0700 - endchannel + duty_cycle 2 + square_note 15, 15, 2, 1984 + square_note 15, 0, 0, 0 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1856 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1920 + square_note 3, 10, 1, 1792 + square_note 3, 10, 1, 1984 + square_note 8, 10, 1, 1792 + sound_ret Sfx_ShutDownPc_Ch5: - dutycycle $2 - sound __, 5, $f0, $0600 - sound __, 5, $f0, $0400 - sound __, 5, $f0, $0200 - sound __, 2, $0, 0 - endchannel + duty_cycle 2 + square_note 4, 15, 0, 1536 + square_note 4, 15, 0, 1024 + square_note 4, 15, 0, 512 + square_note 1, 0, 0, 0 + sound_ret Sfx_ChoosePcOption_Ch5: - dutycycle $2 - sound __, 7, $f0, $0700 - sound __, 5, $0, 0 - sound __, 7, $f0, $0700 - sound __, 2, $0, 0 - endchannel + duty_cycle 2 + square_note 6, 15, 0, 1792 + square_note 4, 0, 0, 0 + square_note 6, 15, 0, 1792 + square_note 1, 0, 0, 0 + sound_ret Sfx_EscapeRope_Ch5: - dutycycle $1 - soundinput $17 - sound __, 16, $d7, $0600 - sound __, 16, $b7, $0580 - sound __, 16, $87, $0500 - sound __, 16, $47, $0480 - sound __, 16, $17, $0400 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1536 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1280 + square_note 15, 4, 7, 1152 + square_note 15, 1, 7, 1024 + pitch_sweep 0, 8 + sound_ret Sfx_PushButton_Ch5: - dutycycle $2 - sound __, 5, $0, 0 - sound __, 3, $f1, $0680 - sound __, 2, $0, 0 - sound __, 5, $f1, $0780 - sound __, 5, $0, 0 - endchannel + duty_cycle 2 + square_note 4, 0, 0, 0 + square_note 2, 15, 1, 1664 + square_note 1, 0, 0, 0 + square_note 4, 15, 1, 1920 + square_note 4, 0, 0, 0 + sound_ret Sfx_SecondPartOfItemfinder_Ch5: - dutycycle $2 - soundinput $2c - sound __, 5, $f2, $0500 - soundinput $22 - sound __, 3, $f1, $0500 - soundinput $8 - sound __, 2, $0, 0 - endchannel + duty_cycle 2 + pitch_sweep 2, -4 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 2, 15, 1, 1280 + pitch_sweep 0, 8 + square_note 1, 0, 0, 0 + sound_ret Sfx_WarpTo_Ch5: - dutycycle $1 - soundinput $17 - sound __, 16, $d7, $0500 - sound __, 16, $b7, $0580 - sound __, 16, $87, $0600 - sound __, 16, $47, $0680 - sound __, 16, $17, $0700 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1280 + square_note 15, 11, 7, 1408 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1664 + square_note 15, 1, 7, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_WarpFrom_Ch5: - dutycycle $1 - soundinput $17 - sound __, 16, $d7, $0700 - sound __, 16, $b7, $0680 - sound __, 16, $87, $0600 - sound __, 16, $47, $0580 - sound __, 16, $17, $0500 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 1, 7 + square_note 15, 13, 7, 1792 + square_note 15, 11, 7, 1664 + square_note 15, 8, 7, 1536 + square_note 15, 4, 7, 1408 + square_note 15, 1, 7, 1280 + pitch_sweep 0, 8 + sound_ret Sfx_ChangeDexMode_Ch5: - dutycycle $1 - soundinput $16 - sound __, 16, $d2, $0500 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 1, 6 + square_note 15, 13, 2, 1280 + pitch_sweep 0, 8 + sound_ret Sfx_JumpOverLedge_Ch5: - dutycycle $2 - soundinput $95 - sound __, 16, $f2, $0400 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 9, 5 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret Sfx_GrassRustle_Ch8: - noise __, 3, $f1, $32 - noise __, 3, $0, $0 - noise __, 3, $f1, $22 - noise __, 2, $0, $0 - endchannel + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 2, 15, 1, 34 + noise_note 1, 0, 0, 0 + sound_ret Sfx_Fly_Ch8: - noise __, 3, $f1, $12 - noise __, 3, $0, $0 - noise __, 3, $a1, $12 - noise __, 3, $0, $0 - noise __, 3, $d1, $12 - noise __, 3, $0, $0 - noise __, 3, $81, $12 - noise __, 3, $0, $0 - noise __, 3, $b1, $12 - noise __, 3, $0, $0 - noise __, 3, $61, $12 - noise __, 3, $0, $0 - noise __, 3, $91, $12 - noise __, 3, $0, $0 - noise __, 3, $41, $12 - noise __, 3, $0, $0 - endchannel + noise_note 2, 15, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 10, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 13, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 8, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 11, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 6, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 9, 1, 18 + noise_note 2, 0, 0, 0 + noise_note 2, 4, 1, 18 + noise_note 2, 0, 0, 0 + sound_ret Sfx_Wrong_Ch5: - dutycycle $3 - soundinput $5a - sound __, 5, $f0, $0500 - soundinput $8 - sound __, 5, $0, 0 - sound __, 16, $f0, $0500 - sound __, 2, $0, 0 - endchannel + duty_cycle 3 + pitch_sweep 5, -2 + square_note 4, 15, 0, 1280 + pitch_sweep 0, 8 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 1, 0, 0, 0 + sound_ret Sfx_Wrong_Ch6: - dutycycle $3 - sound __, 5, $f0, $0401 - sound __, 5, $0, 0 - sound __, 16, $f0, $0401 - sound __, 2, $0, 0 - endchannel + duty_cycle 3 + square_note 4, 15, 0, 1025 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1025 + square_note 1, 0, 0, 0 + sound_ret Sfx_Squeak_Ch5: - dutycycle $0 - soundinput $17 - sound __, 16, $d2, $0700 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 1, 7 + square_note 15, 13, 2, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_Strength_Ch8: - noise __, 5, $a2, $23 - noise __, 9, $f1, $34 - noise __, 16, $0, $0 - noise __, 3, $f7, $24 - noise __, 3, $f7, $34 - noise __, 5, $f7, $44 - noise __, 9, $f4, $55 - noise __, 9, $f1, $44 - endchannel + noise_note 4, 10, 2, 35 + noise_note 8, 15, 1, 52 + noise_note 15, 0, 0, 0 + noise_note 2, 15, 7, 36 + noise_note 2, 15, 7, 52 + noise_note 4, 15, 7, 68 + noise_note 8, 15, 4, 85 + noise_note 8, 15, 1, 68 + sound_ret Sfx_Boat_Ch5: - dutycycle $2 - sound __, 16, $f0, $0500 - sound __, 5, $0, 0 - sound __, 16, $f0, $0500 - sound __, 16, $f0, $0500 - sound __, 16, $f0, $0500 - sound __, 16, $f0, $0500 - sound __, 16, $f2, $0500 - endchannel + duty_cycle 2 + square_note 15, 15, 0, 1280 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 0, 1280 + square_note 15, 15, 2, 1280 + sound_ret Sfx_Boat_Ch6: - dutycycle $3 - sound __, 16, $f0, $0482 - sound __, 5, $0, 0 - sound __, 16, $f0, $0482 - sound __, 16, $f0, $0482 - sound __, 16, $f0, $0482 - sound __, 16, $f0, $0482 - sound __, 16, $f2, $0482 - endchannel + duty_cycle 3 + square_note 15, 15, 0, 1154 + square_note 4, 0, 0, 0 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 0, 1154 + square_note 15, 15, 2, 1154 + sound_ret Sfx_WallOpen_Ch5: - dutycycle $1 - soundinput $3a - sound __, 5, $f2, $0500 - soundinput $22 - sound __, 5, $e2, $0500 - soundinput $3a - sound __, 5, $f2, $0700 - soundinput $22 - sound __, 16, $e2, $0700 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1280 + pitch_sweep 2, 2 + square_note 4, 14, 2, 1280 + pitch_sweep 3, -2 + square_note 4, 15, 2, 1792 + pitch_sweep 2, 2 + square_note 15, 14, 2, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_ElevatorEnd_Ch5: - dutycycle $2 - sound __, 16, $f3, $0730 - sound __, 9, $65, $0730 - sound __, 16, $f4, $0700 - sound __, 16, $74, $0700 - sound __, 16, $44, $0700 - sound __, 16, $24, $0700 - endchannel + duty_cycle 2 + square_note 15, 15, 3, 1840 + square_note 8, 6, 5, 1840 + square_note 15, 15, 4, 1792 + square_note 15, 7, 4, 1792 + square_note 15, 4, 4, 1792 + square_note 15, 2, 4, 1792 + sound_ret Sfx_ThrowBall_Ch5: - dutycycle $2 - soundinput $2f - sound __, 16, $f2, $0780 - endchannel + duty_cycle 2 + pitch_sweep 2, -7 + square_note 15, 15, 2, 1920 + sound_ret Sfx_ThrowBall_Ch6: - dutycycle $2 - sound __, 16, $c2, $0782 - endchannel + duty_cycle 2 + square_note 15, 12, 2, 1922 + sound_ret Sfx_Shine_Ch5: - dutycycle $0 - sound __, 1, $d2, $0700 - sound __, 1, $d2, $0740 - sound __, 1, $d2, $0780 - sound __, 1, $d2, $07c0 - sound __, 11, $e1, $07e0 - sound __, 2, $0, 0 - endchannel + duty_cycle 0 + square_note 0, 13, 2, 1792 + square_note 0, 13, 2, 1856 + square_note 0, 13, 2, 1920 + square_note 0, 13, 2, 1984 + square_note 10, 14, 1, 2016 + square_note 1, 0, 0, 0 + sound_ret Sfx_BallPoof_Ch5: - dutycycle $2 - soundinput $16 - sound __, 16, $f2, $0400 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 1, 6 + square_note 15, 15, 2, 1024 + pitch_sweep 0, 8 + sound_ret Sfx_BallPoof_Ch8: - noise __, 16, $a2, $22 - endchannel + noise_note 15, 10, 2, 34 + sound_ret Sfx_Unknown3A_Ch5: - sound __, 16, $d1, $0200 - soundinput $8 - endchannel + square_note 15, 13, 1, 512 + pitch_sweep 0, 8 + sound_ret Sfx_Unknown3A_Ch8: - noise __, 5, $f5, $33 - noise __, 9, $f4, $22 - noise __, 16, $f2, $21 - endchannel + noise_note 4, 15, 5, 51 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret Sfx_Run_Ch8: - noise __, 3, $61, $23 - noise __, 3, $a1, $33 - noise __, 3, $c1, $33 - noise __, 3, $51, $11 - noise __, 3, $f1, $33 - noise __, 3, $41, $11 - noise __, 3, $c1, $33 - noise __, 3, $31, $11 - noise __, 3, $81, $33 - noise __, 3, $31, $11 - noise __, 9, $41, $33 - endchannel + noise_note 2, 6, 1, 35 + noise_note 2, 10, 1, 51 + noise_note 2, 12, 1, 51 + noise_note 2, 5, 1, 17 + noise_note 2, 15, 1, 51 + noise_note 2, 4, 1, 17 + noise_note 2, 12, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 2, 8, 1, 51 + noise_note 2, 3, 1, 17 + noise_note 8, 4, 1, 51 + sound_ret Sfx_SlotMachineStart_Ch5: - dutycycle $2 - soundinput $44 - sound __, 16, $f0, $04f0 - soundinput $17 - sound __, 16, $f2, $0650 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 4, 4 + square_note 15, 15, 0, 1264 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret Sfx_SlotMachineStart_Ch6: - dutycycle $2 - sound __, 16, $92, $0600 - sound __, 16, $92, $0782 - endchannel + duty_cycle 2 + square_note 15, 9, 2, 1536 + square_note 15, 9, 2, 1922 + sound_ret Sfx_Call_Ch5: - soundinput $67 - sound __, 5, $f7, $07a0 - sound __, 5, $f7, $07a0 - sound __, 5, $f7, $07a0 - sound __, 5, $f7, $07a0 - sound __, 5, $f7, $07a0 - soundinput $8 - sound __, 5, $0, 0 - endchannel + pitch_sweep 6, 7 + square_note 4, 15, 7, 1952 + square_note 4, 15, 7, 1952 + square_note 4, 15, 7, 1952 + square_note 4, 15, 7, 1952 + square_note 4, 15, 7, 1952 + pitch_sweep 0, 8 + square_note 4, 0, 0, 0 + sound_ret Sfx_Peck_Ch8: - noise __, 3, $a1, $12 - endchannel + noise_note 2, 10, 1, 18 + sound_ret Sfx_Kinesis_Ch5: - dutycycle $1 - soundinput $af - sound __, 16, $f2, $0780 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 10, -7 + square_note 15, 15, 2, 1920 + pitch_sweep 0, 8 + sound_ret Sfx_Lick_Ch5: - dutycycle $1 - soundinput $97 - sound __, 16, $f2, $0500 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1280 + pitch_sweep 0, 8 + sound_ret Sfx_Pound_Ch8: - noise __, 3, $a1, $22 - endchannel + noise_note 2, 10, 1, 34 + sound_ret Sfx_MovePuzzlePiece_Ch8: - noise __, 9, $f1, $54 - endchannel + noise_note 8, 15, 1, 84 + sound_ret Sfx_CometPunch_Ch8: - noise __, 16, $8f, $11 - noise __, 5, $ff, $12 - noise __, 11, $f1, $55 - endchannel + noise_note 15, 8, -7, 17 + noise_note 4, 15, -7, 18 + noise_note 10, 15, 1, 85 + sound_ret Sfx_MegaPunch_Ch8: - noise __, 16, $8f, $34 - noise __, 9, $f2, $35 - noise __, 11, $f1, $55 - endchannel + noise_note 15, 8, -7, 52 + noise_note 8, 15, 2, 53 + noise_note 10, 15, 1, 85 + sound_ret Sfx_Scratch_Ch8: - noise __, 16, $9f, $23 - noise __, 9, $f1, $21 - endchannel + noise_note 15, 9, -7, 35 + noise_note 8, 15, 1, 33 + sound_ret Sfx_Vicegrip_Ch8: - noise __, 3, $e1, $4b - noise __, 11, $f1, $44 - noise __, 3, $e1, $3a - noise __, 7, $f1, $34 - endchannel + noise_note 2, 14, 1, 75 + noise_note 10, 15, 1, 68 + noise_note 2, 14, 1, 58 + noise_note 6, 15, 1, 52 + sound_ret Sfx_RazorWind_Ch8: - noise __, 3, $f4, $44 - noise __, 3, $f4, $14 - noise __, 16, $f1, $32 - endchannel + noise_note 2, 15, 4, 68 + noise_note 2, 15, 4, 20 + noise_note 15, 15, 1, 50 + sound_ret Sfx_Cut_Ch8: - noise __, 5, $8f, $55 - noise __, 3, $f4, $44 - noise __, 9, $f4, $22 - noise __, 16, $f2, $21 - endchannel + noise_note 4, 8, -7, 85 + noise_note 2, 15, 4, 68 + noise_note 8, 15, 4, 34 + noise_note 15, 15, 2, 33 + sound_ret Sfx_WingAttack_Ch8: - noise __, 9, $4f, $23 - noise __, 5, $c4, $22 - noise __, 7, $f2, $23 - loopchannel 4, Sfx_WingAttack_Ch8 - endchannel + noise_note 8, 4, -7, 35 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + sound_loop 4, Sfx_WingAttack_Ch8 + sound_ret Sfx_Whirlwind_Ch8: - noise __, 9, $4f, $33 - noise __, 5, $c4, $22 - noise __, 7, $f2, $23 - noise __, 16, $f2, $22 - endchannel + noise_note 8, 4, -7, 51 + noise_note 4, 12, 4, 34 + noise_note 6, 15, 2, 35 + noise_note 15, 15, 2, 34 + sound_ret Sfx_Bind_Ch8: - noise __, 9, $ff, $32 - noise __, 9, $f4, $43 - noise __, 9, $f2, $54 - noise __, 9, $f1, $65 - endchannel + noise_note 8, 15, -7, 50 + noise_note 8, 15, 4, 67 + noise_note 8, 15, 2, 84 + noise_note 8, 15, 1, 101 + sound_ret Sfx_VineWhip_Ch8: - noise __, 2, $c2, $33 - noise __, 3, $f2, $21 - noise __, 2, $e2, $33 - noise __, 2, $c2, $32 - noise __, 2, $92, $12 - noise __, 2, $b2, $31 - noise __, 13, $91, $10 - noise __, 9, $f2, $41 - endchannel + noise_note 1, 12, 2, 51 + noise_note 2, 15, 2, 33 + noise_note 1, 14, 2, 51 + noise_note 1, 12, 2, 50 + noise_note 1, 9, 2, 18 + noise_note 1, 11, 2, 49 + noise_note 12, 9, 1, 16 + noise_note 8, 15, 2, 65 + sound_ret Sfx_DoubleKick_Ch8: - noise __, 2, $94, $23 - noise __, 2, $b4, $22 - noise __, 9, $f1, $44 - endchannel + noise_note 1, 9, 4, 35 + noise_note 1, 11, 4, 34 + noise_note 8, 15, 1, 68 + sound_ret Sfx_MegaKick_Ch8: - noise __, 3, $94, $33 - noise __, 5, $b4, $22 - noise __, 5, $f1, $44 - noise __, 9, $f1, $55 - endchannel + noise_note 2, 9, 4, 51 + noise_note 4, 11, 4, 34 + noise_note 4, 15, 1, 68 + noise_note 8, 15, 1, 85 + sound_ret Sfx_Headbutt_Ch8: - noise __, 5, $ff, $55 - noise __, 9, $f1, $65 - endchannel + noise_note 4, 15, -7, 85 + noise_note 8, 15, 1, 101 + sound_ret Sfx_HornAttack_Ch8: - noise __, 3, $84, $43 - noise __, 3, $c4, $22 - noise __, 9, $f2, $34 - endchannel + noise_note 2, 8, 4, 67 + noise_note 2, 12, 4, 34 + noise_note 8, 15, 2, 52 + sound_ret Sfx_Tackle_Ch8: - noise __, 5, $f1, $34 - noise __, 16, $f2, $64 - endchannel + noise_note 4, 15, 1, 52 + noise_note 15, 15, 2, 100 + sound_ret Sfx_PoisonSting_Ch8: - noise __, 3, $f1, $22 - noise __, 16, $f2, $12 - endchannel + noise_note 2, 15, 1, 34 + noise_note 15, 15, 2, 18 + sound_ret Sfx_Powder_Ch8: - noise __, 3, $c2, $1 - noise __, 16, $f4, $1 - noise __, 16, $f2, $1 - endchannel + noise_note 2, 12, 2, 1 + noise_note 15, 15, 4, 1 + noise_note 15, 15, 2, 1 + sound_ret Sfx_Doubleslap_Ch8: - noise __, 9, $f1, $32 - noise __, 9, $f1, $33 - endchannel + noise_note 8, 15, 1, 50 + noise_note 8, 15, 1, 51 + sound_ret Sfx_Bite_Ch5: - dutycycle $0 - soundinput $3a - sound __, 5, $f2, $0200 - soundinput $22 - sound __, 9, $e2, $0200 - soundinput $8 - endchannel + duty_cycle 0 + pitch_sweep 3, -2 + square_note 4, 15, 2, 512 + pitch_sweep 2, 2 + square_note 8, 14, 2, 512 + pitch_sweep 0, 8 + sound_ret Sfx_Bite_Ch8: - noise __, 1, $d1, $42 - noise __, 5, $a1, $32 - noise __, 1, $d1, $22 - noise __, 7, $a1, $32 - endchannel + noise_note 0, 13, 1, 66 + noise_note 4, 10, 1, 50 + noise_note 0, 13, 1, 34 + noise_note 6, 10, 1, 50 + sound_ret Sfx_JumpKick_Ch8: - noise __, 4, $92, $31 - noise __, 4, $b2, $32 - noise __, 4, $c2, $33 - noise __, 9, $f1, $54 - endchannel + noise_note 3, 9, 2, 49 + noise_note 3, 11, 2, 50 + noise_note 3, 12, 2, 51 + noise_note 8, 15, 1, 84 + sound_ret Sfx_Stomp_Ch8: - noise __, 13, $f1, $54 - noise __, 9, $f1, $64 - endchannel + noise_note 12, 15, 1, 84 + noise_note 8, 15, 1, 100 + sound_ret Sfx_TailWhip_Ch8: - noise __, 3, $f1, $33 - noise __, 3, $c1, $32 - noise __, 3, $a1, $31 - noise __, 16, $82, $32 - noise __, 9, $f1, $34 - endchannel + noise_note 2, 15, 1, 51 + noise_note 2, 12, 1, 50 + noise_note 2, 10, 1, 49 + noise_note 15, 8, 2, 50 + noise_note 8, 15, 1, 52 + sound_ret Sfx_KarateChop_Ch8: - noise __, 3, $d2, $32 - noise __, 16, $f2, $43 - endchannel + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret Sfx_Submission_Ch8: - noise __, 3, $f2, $43 - noise __, 5, $b5, $32 - noise __, 10, $86, $31 - noise __, 8, $64, $0 - noise __, 16, $f2, $55 - endchannel + noise_note 2, 15, 2, 67 + noise_note 4, 11, 5, 50 + noise_note 9, 8, 6, 49 + noise_note 7, 6, 4, 0 + noise_note 15, 15, 2, 85 + sound_ret Sfx_WaterGun_Ch5: - dutycycle $1 - soundinput $97 - sound __, 16, $f2, $0700 - soundinput $8 - endchannel + duty_cycle 1 + pitch_sweep 9, 7 + square_note 15, 15, 2, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_WaterGun_Ch8: - noise __, 16, $3f, $22 - noise __, 16, $f2, $21 - endchannel + noise_note 15, 3, -7, 34 + noise_note 15, 15, 2, 33 + sound_ret Sfx_SwordsDance_Ch8: - noise __, 16, $4f, $41 - noise __, 9, $8f, $41 - noise __, 9, $cf, $41 - noise __, 9, $f2, $42 - noise __, 16, $f2, $41 - endchannel + noise_note 15, 4, -7, 65 + noise_note 8, 8, -7, 65 + noise_note 8, 12, -7, 65 + noise_note 8, 15, 2, 66 + noise_note 15, 15, 2, 65 + sound_ret Sfx_Thunder_Ch8: - noise __, 11, $ff, $50 - noise __, 16, $ff, $51 - noise __, 9, $f2, $51 - noise __, 7, $ff, $52 - noise __, 7, $ff, $53 - noise __, 9, $ff, $54 - noise __, 16, $f2, $54 - endchannel + noise_note 10, 15, -7, 80 + noise_note 15, 15, -7, 81 + noise_note 8, 15, 2, 81 + noise_note 6, 15, -7, 82 + noise_note 6, 15, -7, 83 + noise_note 8, 15, -7, 84 + noise_note 15, 15, 2, 84 + sound_ret Sfx_Supersonic_Ch5: - dutycycle $2 - sound __, 16, $3f, $07c0 -.loop - sound __, 16, $df, $07c0 - loopchannel 4, .loop - sound __, 16, $d1, $07c0 - endchannel + duty_cycle 2 + square_note 15, 3, -7, 1984 +Sfx_Supersonic_branch_f21ef: + square_note 15, 13, -7, 1984 + sound_loop 4, Sfx_Supersonic_branch_f21ef + square_note 15, 13, 1, 1984 + sound_ret Sfx_Supersonic_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 16, $2f, $07c8 -.loop - sound __, 16, $cf, $07c7 - loopchannel 4, .loop - sound __, 16, $c1, $07c8 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 15, 2, -7, 1992 +Sfx_Supersonic_branch_f2202: + square_note 15, 12, -7, 1991 + sound_loop 4, Sfx_Supersonic_branch_f2202 + square_note 15, 12, 1, 1992 + sound_ret Sfx_Supersonic_Ch8: - noise __, 4, $97, $12 - noise __, 4, $a1, $11 - loopchannel 10, Sfx_Supersonic_Ch8 - endchannel + noise_note 3, 9, 7, 18 + noise_note 3, 10, 1, 17 + sound_loop 10, Sfx_Supersonic_Ch8 + sound_ret Sfx_Leer_Ch5: - dutycycle $0 - sound __, 1, $f1, $07c0 - sound __, 1, $f1, $0700 - loopchannel 12, Sfx_Leer_Ch5 - endchannel + duty_cycle 0 + square_note 0, 15, 1, 1984 + square_note 0, 15, 1, 1792 + sound_loop 12, Sfx_Leer_Ch5 + sound_ret Sfx_Leer_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 1, $e1, $07c1 - sound __, 1, $e1, $0701 - loopchannel 12, Sfx_Leer_Ch6 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 0, 14, 1, 1985 + square_note 0, 14, 1, 1793 + sound_loop 12, Sfx_Leer_Ch6 + sound_ret Sfx_Leer_Ch8: - noise __, 2, $d1, $49 - noise __, 2, $d1, $29 - loopchannel 6, Sfx_Leer_Ch8 - endchannel + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 6, Sfx_Leer_Ch8 + sound_ret Sfx_Ember_Ch5: - sound_duty 1, 2, 0, 3 - sound __, 12, $f3, $0120 - sound __, 10, $d3, $0150 - loopchannel 5, Sfx_Ember_Ch5 - sound __, 9, $e3, $0130 - sound __, 16, $c2, $0110 - endchannel + duty_cycle_pattern 3, 0, 2, 1 + square_note 11, 15, 3, 288 + square_note 9, 13, 3, 336 + sound_loop 5, Sfx_Ember_Ch5 + square_note 8, 14, 3, 304 + square_note 15, 12, 2, 272 + sound_ret Sfx_Ember_Ch8: - noise __, 11, $f3, $35 - noise __, 15, $f6, $45 - loopchannel 4, Sfx_Ember_Ch8 - noise __, 13, $f4, $bc - noise __, 13, $f5, $9c - noise __, 16, $f4, $ac - endchannel + noise_note 10, 15, 3, 53 + noise_note 14, 15, 6, 69 + sound_loop 4, Sfx_Ember_Ch8 + noise_note 12, 15, 4, 188 + noise_note 12, 15, 5, 156 + noise_note 15, 15, 4, 172 + sound_ret 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_Ch5 - sound __, 9, $d1, $0600 - endchannel + duty_cycle_pattern 0, 3, 2, 1 + square_note 4, 15, 4, 1536 + square_note 3, 12, 4, 1280 + square_note 5, 11, 5, 1536 + square_note 13, 14, 2, 1728 + sound_loop 3, Sfx_Bubblebeam_Ch5 + square_note 8, 13, 1, 1536 + sound_ret 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_Ch6 - endchannel + duty_cycle_pattern 2, 0, 3, 1 + square_note 5, 14, 4, 1504 + square_note 4, 11, 4, 1248 + square_note 6, 10, 5, 1512 + square_note 14, 13, 1, 1696 + sound_loop 3, Sfx_Bubblebeam_Ch6 + sound_ret Sfx_Bubblebeam_Ch8: - noise __, 6, $c3, $33 - noise __, 4, $92, $43 - noise __, 11, $b5, $33 - noise __, 16, $c3, $32 - loopchannel 2, Sfx_Bubblebeam_Ch8 - endchannel + noise_note 5, 12, 3, 51 + noise_note 3, 9, 2, 67 + noise_note 10, 11, 5, 51 + noise_note 15, 12, 3, 50 + sound_loop 2, Sfx_Bubblebeam_Ch8 + sound_ret 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_Ch5 - sound __, 9, $81, $0400 - endchannel + duty_cycle_pattern 3, 1, 0, 2 + square_note 3, 8, 1, 768 + square_note 3, 12, 1, 1024 + square_note 3, 15, 1, 1280 + square_note 3, 11, 1, 1024 + square_note 3, 7, 1, 768 + sound_loop 5, Sfx_HydroPump_Ch5 + square_note 8, 8, 1, 1024 + sound_ret 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_Ch8 - noise __, 9, $81, $12 - endchannel + noise_note 3, 6, 2, 34 + noise_note 3, 10, 2, 50 + noise_note 3, 13, 2, 51 + noise_note 3, 9, 2, 35 + noise_note 3, 5, 2, 18 + sound_loop 5, Sfx_HydroPump_Ch8 + noise_note 8, 8, 1, 18 + sound_ret 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_Ch5 - endchannel + duty_cycle_pattern 0, 3, 2, 1 + square_note 15, 15, 4, 1280 + square_note 15, 12, 4, 1024 + square_note 15, 14, 2, 1472 + sound_loop 3, Sfx_Surf_Ch5 + sound_ret 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_Ch6 - endchannel + duty_cycle_pattern 2, 0, 3, 1 + square_note 7, 14, 4, 1072 + square_note 15, 11, 4, 816 + square_note 15, 10, 2, 1080 + sound_loop 4, Sfx_Surf_Ch6 + sound_ret Sfx_Surf_Ch8: - noise __, 10, $f4, $44 - noise __, 10, $f2, $43 - noise __, 16, $f4, $42 - noise __, 16, $f4, $41 - loopchannel 3, Sfx_Surf_Ch8 - endchannel + noise_note 9, 15, 4, 68 + noise_note 9, 15, 2, 67 + noise_note 15, 15, 4, 66 + noise_note 15, 15, 4, 65 + sound_loop 3, Sfx_Surf_Ch8 + sound_ret 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_Ch5 - sound __, 11, $f1, $0640 - endchannel + duty_cycle_pattern 2, 2, 0, 1 + square_note 10, 15, 1, 1600 + square_note 10, 15, 3, 1664 + square_note 10, 15, 2, 1568 + sound_loop 4, Sfx_Psybeam_Ch5 + square_note 10, 15, 1, 1600 + sound_ret 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_Ch6 - sound __, 11, $f1, $0571 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 10, 15, 3, 1393 + square_note 7, 14, 3, 1329 + square_note 10, 15, 1, 1361 + sound_loop 4, Sfx_Psybeam_Ch6 + square_note 10, 15, 1, 1393 + sound_ret Sfx_Psybeam_Ch8: - noise __, 3, $d1, $4a - noise __, 3, $d2, $2a - loopchannel 21, Sfx_Psybeam_Ch8 - endchannel + noise_note 2, 13, 1, 74 + noise_note 2, 13, 2, 42 + sound_loop 21, Sfx_Psybeam_Ch8 + sound_ret 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_Ch5 - endchannel + duty_cycle 0 + square_note 2, 15, 1, 512 + square_note 3, 15, 1, 1792 + square_note 4, 15, 1, 1280 + square_note 5, 15, 1, 2032 + sound_loop 8, Sfx_Charge_Ch5 + sound_ret 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_Ch6 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 2, 14, 1, 770 + square_note 3, 14, 1, 2034 + square_note 4, 14, 1, 1538 + square_note 5, 14, 1, 1794 + sound_loop 8, Sfx_Charge_Ch6 + sound_ret Sfx_Charge_Ch8: - noise __, 3, $d3, $10 - noise __, 4, $d3, $11 - noise __, 3, $d2, $10 - noise __, 6, $d2, $12 - loopchannel 9, Sfx_Charge_Ch8 - endchannel + noise_note 2, 13, 3, 16 + noise_note 3, 13, 3, 17 + noise_note 2, 13, 2, 16 + noise_note 5, 13, 2, 18 + sound_loop 9, Sfx_Charge_Ch8 + sound_ret Sfx_Thundershock_Ch5: - sound_duty 3, 2, 2, 0 - sound __, 4, $f1, $07f0 - sound __, 5, $f2, $0200 - loopchannel 8, Sfx_Thundershock_Ch5 - endchannel + duty_cycle_pattern 0, 2, 2, 3 + square_note 3, 15, 1, 2032 + square_note 4, 15, 2, 512 + sound_loop 8, Sfx_Thundershock_Ch5 + sound_ret Sfx_Thundershock_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 5, $e2, $0202 - sound __, 5, $e1, $07e2 - loopchannel 9, Sfx_Thundershock_Ch6 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 4, 14, 2, 514 + square_note 4, 14, 1, 2018 + sound_loop 9, Sfx_Thundershock_Ch6 + sound_ret Sfx_Thundershock_Ch8: - noise __, 5, $ff, $43 - noise __, 5, $f2, $44 - loopchannel 9, Sfx_Thundershock_Ch8 - endchannel + noise_note 4, 15, -7, 67 + noise_note 4, 15, 2, 68 + sound_loop 9, Sfx_Thundershock_Ch8 + sound_ret Sfx_Psychic_Ch5: - dutycycle $2 - soundinput $f7 - sound __, 9, $c4, $07bd - sound __, 9, $c4, $07be - sound __, 9, $c4, $07bf - sound __, 9, $c4, $07c0 - sound __, 16, $c4, $07c1 - sound __, 16, $f2, $07c0 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 15, 7 + square_note 8, 12, 4, 1981 + square_note 8, 12, 4, 1982 + square_note 8, 12, 4, 1983 + square_note 8, 12, 4, 1984 + square_note 15, 12, 4, 1985 + square_note 15, 15, 2, 1984 + pitch_sweep 0, 8 + sound_ret Sfx_Psychic_Ch6: - dutycycle $2 - sound __, 9, $c4, $0770 - sound __, 9, $c4, $0761 - sound __, 9, $c4, $0762 - sound __, 9, $c4, $0763 - sound __, 16, $c4, $0764 - sound __, 16, $f2, $0764 - endchannel + duty_cycle 2 + square_note 8, 12, 4, 1904 + square_note 8, 12, 4, 1889 + square_note 8, 12, 4, 1890 + square_note 8, 12, 4, 1891 + square_note 15, 12, 4, 1892 + square_note 15, 15, 2, 1892 + sound_ret Sfx_Psychic_Ch8: - noise __, 16, $3f, $14 - noise __, 16, $cf, $13 - noise __, 16, $cf, $12 - noise __, 16, $cf, $11 - noise __, 16, $cf, $10 - noise __, 16, $c2, $10 - endchannel + noise_note 15, 3, -7, 20 + noise_note 15, 12, -7, 19 + noise_note 15, 12, -7, 18 + noise_note 15, 12, -7, 17 + noise_note 15, 12, -7, 16 + noise_note 15, 12, 2, 16 + sound_ret Sfx_Screech_Ch5: - dutycycle $2 - sound __, 16, $ff, $07e0 - sound __, 16, $ff, $07e0 - sound __, 16, $ff, $07e0 - sound __, 16, $ff, $07e0 - sound __, 16, $f2, $07e0 - endchannel + duty_cycle 2 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, -7, 2016 + square_note 15, 15, 2, 2016 + sound_ret Sfx_Screech_Ch6: - dutycycle $3 - sound __, 16, $ff, $07e2 - sound __, 16, $ff, $07e1 - sound __, 16, $ff, $07e2 - sound __, 16, $ff, $07e1 - sound __, 16, $f2, $07e2 - endchannel + duty_cycle 3 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, -7, 2018 + square_note 15, 15, -7, 2017 + square_note 15, 15, 2, 2018 + sound_ret Sfx_BoneClub_Ch5: - dutycycle $2 - soundinput $af - sound __, 9, $f1, $0700 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 10, -7 + square_note 8, 15, 1, 1792 + pitch_sweep 0, 8 + sound_ret Sfx_BoneClub_Ch6: - dutycycle $3 - sound __, 9, $f1, $0701 - endchannel + duty_cycle 3 + square_note 8, 15, 1, 1793 + sound_ret Sfx_Sharpen_Ch5: - dutycycle $2 - sound __, 7, $f1, $0500 - sound __, 7, $f1, $0580 - sound __, 7, $f1, $0600 - sound __, 7, $f1, $0680 - sound __, 9, $f1, $0700 - endchannel + duty_cycle 2 + square_note 6, 15, 1, 1280 + square_note 6, 15, 1, 1408 + square_note 6, 15, 1, 1536 + square_note 6, 15, 1, 1664 + square_note 8, 15, 1, 1792 + sound_ret Sfx_Sharpen_Ch6: - dutycycle $3 - sound __, 7, $e1, $0510 - sound __, 7, $e1, $0590 - sound __, 7, $e1, $0610 - sound __, 7, $e1, $0690 - sound __, 9, $e1, $0710 - endchannel + duty_cycle 3 + square_note 6, 14, 1, 1296 + square_note 6, 14, 1, 1424 + square_note 6, 14, 1, 1552 + square_note 6, 14, 1, 1680 + square_note 8, 14, 1, 1808 + sound_ret Sfx_EggBomb_Ch5: - sound_duty 1, 3, 2, 3 - sound __, 9, $ff, $03f8 - sound __, 16, $ff, $0400 - sound __, 16, $f3, $0400 - endchannel + duty_cycle_pattern 3, 2, 3, 1 + square_note 8, 15, -7, 1016 + square_note 15, 15, -7, 1024 + square_note 15, 15, 3, 1024 + sound_ret Sfx_EggBomb_Ch6: - sound_duty 0, 1, 3, 2 - sound __, 9, $ef, $03c0 - sound __, 16, $ef, $03c0 - sound __, 16, $e3, $03c0 - endchannel + duty_cycle_pattern 2, 3, 1, 0 + square_note 8, 14, -7, 960 + square_note 15, 14, -7, 960 + square_note 15, 14, 3, 960 + sound_ret Sfx_EggBomb_Ch8: - noise __, 5, $ff, $51 - noise __, 9, $ff, $54 - noise __, 16, $ff, $55 - noise __, 16, $f3, $56 - endchannel + noise_note 4, 15, -7, 81 + noise_note 8, 15, -7, 84 + noise_note 15, 15, -7, 85 + noise_note 15, 15, 3, 86 + sound_ret Sfx_Sing_Ch5: - togglesfx - vibrato $a, $24 - dutycycle $2 - notetype $a, $87 + toggle_sfx + vibrato 10, 2, 4 + duty_cycle 2 + note_type 10, 8, 7 octave 5 note G_, 8 octave 6 @@ -4622,173 +4805,174 @@ Sfx_Sing_Ch5: note D#, 4 octave 5 note G_, 8 - endchannel + sound_ret Sfx_Sing_Ch6: - togglesfx - vibrato $a, $23 - dutycycle $2 - notetype $b, $67 + toggle_sfx + vibrato 10, 2, 3 + duty_cycle 2 + note_type 11, 6, 7 octave 5 note G_, 8 - notetype $a, $67 + note_type 10, 6, 7 octave 6 note F_, 4 note D#, 4 octave 5 note G_, 8 - endchannel + sound_ret Sfx_HyperBeam_Ch5: - dutycycle $0 - sound __, 3, $f1, $0780 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $0790 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07a0 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07b0 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07c0 - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07d0 -.loop - sound __, 3, $f1, $0700 - sound __, 3, $f1, $07e0 - loopchannel 12, .loop - sound __, 16, $f1, $0700 - endchannel + duty_cycle 0 + square_note 2, 15, 1, 1920 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1936 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1952 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1968 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 1984 + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2000 +Sfx_HyperBeam_branch_f24f8: + square_note 2, 15, 1, 1792 + square_note 2, 15, 1, 2016 + sound_loop 12, Sfx_HyperBeam_branch_f24f8 + square_note 15, 15, 1, 1792 + sound_ret Sfx_HyperBeam_Ch6: - sound_duty 3, 0, 3, 2 - sound __, 3, $f1, $0781 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $0791 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07a1 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07b1 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07c1 - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07d1 -.loop - sound __, 3, $f1, $0701 - sound __, 3, $f1, $07e1 - loopchannel 12, .loop - sound __, 16, $f1, $0701 - endchannel + duty_cycle_pattern 2, 3, 0, 3 + square_note 2, 15, 1, 1921 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1937 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1953 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1969 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 1985 + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2001 +Sfx_HyperBeam_branch_f2537: + square_note 2, 15, 1, 1793 + square_note 2, 15, 1, 2017 + sound_loop 12, Sfx_HyperBeam_branch_f2537 + square_note 15, 15, 1, 1793 + sound_ret Sfx_HyperBeam_Ch8: - noise __, 2, $d1, $49 - noise __, 2, $d1, $29 - loopchannel 26, Sfx_HyperBeam_Ch8 - endchannel + noise_note 1, 13, 1, 73 + noise_note 1, 13, 1, 41 + sound_loop 26, Sfx_HyperBeam_Ch8 + sound_ret Sfx_Unknown60_Ch8: - noise __, 7, $20, $10 - noise __, 7, $2f, $40 - noise __, 7, $4f, $41 - noise __, 7, $8f, $41 - noise __, 7, $cf, $42 - noise __, 9, $d7, $42 - noise __, 16, $e7, $43 - noise __, 16, $f2, $43 - endchannel + noise_note 6, 2, 0, 16 + noise_note 6, 2, -7, 64 + noise_note 6, 4, -7, 65 + noise_note 6, 8, -7, 65 + noise_note 6, 12, -7, 66 + noise_note 8, 13, 7, 66 + noise_note 15, 14, 7, 67 + noise_note 15, 15, 2, 67 + sound_ret Sfx_Unknown61_Ch8: - noise __, 5, $d1, $41 - endchannel + noise_note 4, 13, 1, 65 + sound_ret Sfx_SwitchPockets_Ch8: - noise __, 5, $c1, $42 - endchannel + noise_note 4, 12, 1, 66 + sound_ret Sfx_Unknown63_Ch8: - noise __, 3, $6f, $21 - noise __, 3, $af, $31 - noise __, 16, $f2, $41 - endchannel + noise_note 2, 6, -7, 33 + noise_note 2, 10, -7, 49 + noise_note 15, 15, 2, 65 + sound_ret Sfx_Burn_Ch8: - noise __, 3, $d2, $32 - noise __, 16, $f2, $43 - endchannel + noise_note 2, 13, 2, 50 + noise_note 15, 15, 2, 67 + sound_ret Sfx_TitleScreenEntrance_Ch8: - noise __, 9, $3c, $20 - noise __, 7, $a0, $20 - noise __, 9, $b0, $21 - noise __, 11, $c0, $22 - noise __, 16, $d2, $23 - endchannel + noise_note 8, 3, 12, 32 + noise_note 6, 10, 0, 32 + noise_note 8, 11, 0, 33 + noise_note 10, 12, 0, 34 + noise_note 15, 13, 2, 35 + sound_ret Sfx_Unknown66_Ch5: - dutycycle $2 - sound __, 2, $f2, $06a0 - sound __, 2, $f2, $06e0 - sound __, 9, $f1, $0700 - endchannel + duty_cycle 2 + square_note 1, 15, 2, 1696 + square_note 1, 15, 2, 1760 + square_note 8, 15, 1, 1792 + sound_ret Sfx_GetCoinFromSlots_Ch5: - dutycycle $2 - sound __, 3, $f1, $0700 - sound __, 9, $81, $07e0 - endchannel + duty_cycle 2 + square_note 2, 15, 1, 1792 + square_note 8, 8, 1, 2016 + sound_ret Sfx_PayDay_Ch5: - dutycycle $3 - sound __, 6, $e1, $0700 - sound __, 3, $e1, $0780 - sound __, 16, $f1, $07c0 - endchannel + duty_cycle 3 + square_note 5, 14, 1, 1792 + square_note 2, 14, 1, 1920 + square_note 15, 15, 1, 1984 + sound_ret Sfx_PayDay_Ch6: - dutycycle $2 - sound __, 5, $c1, $06c1 - sound __, 3, $c1, $0741 - sound __, 16, $d1, $0781 - endchannel + duty_cycle 2 + square_note 4, 12, 1, 1729 + square_note 2, 12, 1, 1857 + square_note 15, 13, 1, 1921 + sound_ret Sfx_Metronome_Ch5: - dutycycle $2 - soundinput $5f - sound __, 5, $40, $07e0 - sound __, 5, $60, $07e0 - sound __, 5, $80, $07e0 - sound __, 9, $a0, $07e0 - sound __, 9, $a0, $07e0 - sound __, 9, $80, $07e0 - sound __, 9, $60, $07e0 - sound __, 9, $30, $07e0 - sound __, 16, $12, $07e0 - soundinput $8 - endchannel + duty_cycle 2 + pitch_sweep 5, -7 + square_note 4, 4, 0, 2016 + square_note 4, 6, 0, 2016 + square_note 4, 8, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 10, 0, 2016 + square_note 8, 8, 0, 2016 + square_note 8, 6, 0, 2016 + square_note 8, 3, 0, 2016 + square_note 15, 1, 2, 2016 + pitch_sweep 0, 8 + sound_ret Sfx_Unknown5F_Ch5: - sound __, 3, $f7, $0601 - sound __, 3, $f7, $0701 - loopchannel 8, Sfx_Unknown5F_Ch5 - endchannel +Sfx_Unknown5F_branch_f2617: + square_note 2, 15, 7, 1537 + square_note 2, 15, 7, 1793 + sound_loop 8, Sfx_Unknown5F_Ch5 + sound_ret Sfx_Unknown5F_Ch6: - sound __, 2, $f7, $ffff - sound __, 3, $f7, $0602 - sound __, 3, $f7, $0702 - loopchannel 8, Sfx_Unknown5F_Ch5 - endchannel + square_note 1, 15, 7, 65535 + square_note 2, 15, 7, 1538 + square_note 2, 15, 7, 1794 + sound_loop 8, Sfx_Unknown5F_branch_f2617 + sound_ret Sfx_Fanfare2_Ch5: - togglesfx - sfxpriorityon + toggle_sfx + sfx_priority_on tempo 256 - volume $77 - tone $0001 - dutycycle $3 - notetype $6, $b5 + volume 7, 7 + pitch_offset 1 + duty_cycle 3 + note_type 6, 11, 5 octave 3 note G#, 4 - notetype $4, $b2 + note_type 4, 11, 2 note F_, 2 note G#, 2 note A_, 2 @@ -4798,59 +4982,59 @@ Sfx_Fanfare2_Ch5: octave 4 note C_, 4 note C_, 2 - notetype $4, $b6 + note_type 4, 11, 6 note C#, 12 - sfxpriorityoff - endchannel + sfx_priority_off + sound_ret Sfx_Fanfare2_Ch6: - togglesfx - dutycycle $2 - notetype $6, $c5 + toggle_sfx + duty_cycle 2 + note_type 6, 12, 5 octave 4 note C#, 6 - notetype $4, $c1 + note_type 4, 12, 1 note C#, 1 note C#, 1 note C#, 1 - notetype $4, $c2 + note_type 4, 12, 2 note D#, 2 note C#, 2 note D#, 2 note E_, 4 note E_, 2 - notetype $4, $c6 + note_type 4, 12, 6 note F_, 12 - endchannel + sound_ret Sfx_Fanfare2_Ch8: - togglesfx - notetype $6 + toggle_sfx + drum_speed 6 note C_, 1 octave 5 note C#, 2 - note __, 2 + rest 2 note C#, 2 - note __, 2 - notetype $4 + rest 2 + drum_speed 4 note C_, 1 note C#, 2 - note __, 2 + rest 2 note C#, 2 note D#, 2 - note __, 2 + rest 2 note F_, 2 note G#, 6 - endchannel + sound_ret Sfx_Fanfare_Ch5: - togglesfx - sfxpriorityon + toggle_sfx + sfx_priority_on tempo 256 - volume $77 - dutycycle $3 - tone $0001 - notetype $6, $b3 + volume 7, 7 + duty_cycle 3 + pitch_offset 1 + note_type 6, 11, 3 octave 3 note F_, 4 note C#, 4 @@ -4860,7 +5044,7 @@ Sfx_Fanfare_Ch5: note F_, 4 note A#, 4 note F#, 4 - notetype $4, $b3 + note_type 4, 11, 3 note A#, 4 note B_, 4 octave 4 @@ -4868,18 +5052,18 @@ Sfx_Fanfare_Ch5: note C#, 4 note D#, 4 note C_, 4 - notetype $4, $b6 + note_type 4, 11, 6 note C#, 12 - sfxpriorityoff - endchannel + sfx_priority_off + sound_ret Sfx_Fanfare_Ch6: - togglesfx - dutycycle $2 - notetype $6, $c4 + toggle_sfx + duty_cycle 2 + note_type 6, 12, 4 octave 4 note C#, 4 - notetype $4, $c4 + note_type 4, 12, 4 note C#, 2 octave 3 note A#, 2 @@ -4905,25 +5089,25 @@ Sfx_Fanfare_Ch6: note F_, 4 note F#, 4 note G#, 4 - notetype $4, $c6 + note_type 4, 12, 6 note F#, 12 - endchannel + sound_ret Sfx_Fanfare_Ch8: - togglesfx - notetype $6 + toggle_sfx + drum_speed 6 note C_, 1 octave 4 note A#, 4 - note __, 4 + rest 4 note B_, 4 - note __, 4 + rest 4 octave 5 note C#, 4 - note __, 4 + rest 4 note D#, 4 - note __, 4 - notetype $4 + rest 4 + drum_speed 4 note C_, 1 note F_, 4 note D#, 4 @@ -4932,62 +5116,63 @@ Sfx_Fanfare_Ch8: note G#, 4 note F_, 4 note F#, 6 - endchannel + sound_ret Sfx_HangUp_Ch5: - dutycycle $2 - sound __, 5, $b8, $077b - sound __, 3, $21, $077b - sound C_, 1, $0, 0 + duty_cycle 2 + square_note 4, 11, 8, 1915 + square_note 2, 2, 1, 1915 + square_note 16, 0, 0, 0 Sfx_NoSignal_Ch5: - dutycycle $2 - sound C_, 5, $e8, $070b - sound C_, 13, $0, 0 - loopchannel 3, Sfx_NoSignal_Ch5 - endchannel + duty_cycle 2 + square_note 20, 14, 8, 1803 + square_note 28, 0, 0, 0 + sound_loop 3, Sfx_NoSignal_Ch5 + sound_ret -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_Ch8 - endchannel +Sfx_Sandstorm_Ch8: + noise_note 1, 15, 8, 65 + noise_note 2, 9, -4, 36 + noise_note 0, 0, 0, 0 + noise_note 3, 5, -1, 22 + noise_note 2, 0, 0, 0 + sound_loop 3, Sfx_Sandstorm_Ch8 + sound_ret Sfx_Elevator_Ch5: - dutycycle $2 - soundinput $5a -.loop - sound __, 3, $f1, $0300 - loopchannel 48, .loop - soundinput $8 - dutycycle $2 - sound __, 16, $f3, $0730 - sound __, 9, $65, $0730 - sound __, 16, $f4, $0700 - sound __, 16, $74, $0700 - sound __, 16, $44, $0700 - sound __, 16, $24, $0700 - endchannel + duty_cycle 2 + pitch_sweep 5, -2 +Sfx_Elevator_branch_f2726: + square_note 2, 15, 1, 768 + sound_loop 48, Sfx_Elevator_branch_f2726 + pitch_sweep 0, 8 + duty_cycle 2 + square_note 15, 15, 3, 1840 + square_note 8, 6, 5, 1840 + square_note 15, 15, 4, 1792 + square_note 15, 7, 4, 1792 + square_note 15, 4, 4, 1792 + square_note 15, 2, 4, 1792 + sound_ret Sfx_Elevator_Ch6: Sfx_Elevator_Ch7: - sound F_, 1, $0, 0 - sound E_, 4, $0, 0 - endchannel + square_note 96, 0, 0, 0 + square_note 83, 0, 0, 0 + sound_ret Sfx_Elevator_Ch8: - noise F_, 1, $0, $0 - noise E_, 4, $0, $0 - endchannel + noise_note 96, 0, 0, 0 + noise_note 83, 0, 0, 0 + sound_ret Sfx_StopSlot: - musicheader 1, 5, Sfx_StopSlot_Ch5 + channel_count 1 + channel 5, Sfx_StopSlot_Ch5 Sfx_StopSlot_Ch5: - dutycycle $2 - sound __, 2, $f8, $0760 - sound __, 5, $82, $0760 - endchannel + duty_cycle 2 + square_note 1, 15, 8, 1888 + square_note 4, 8, 2, 1888 + sound_ret diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index 2c8258e1..8c3420e5 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -148,7 +148,7 @@ SFX: dba Sfx_KeyItem dba Sfx_Fanfare2 dba Sfx_RegisterPhoneNumber - dba Sfx_3RdPlace + dba Sfx_3rdPlace dba Sfx_GetEgg dba Sfx_GetEgg dba Sfx_MoveDeleted diff --git a/constants.asm b/constants.asm index 2e62bd71..03c24b8d 100644 --- a/constants.asm +++ b/constants.asm @@ -1,7 +1,3 @@ -if __RGBDS_MAJOR__ <= 0 && __RGBDS_MINOR__ < 4 - fail "pokegold requires rgbds 0.4.0 or newer." -endc - INCLUDE "charmap.asm" INCLUDE "macros.asm" @@ -11,11 +11,11 @@ hRTCMinutes:: db ; ff92 hRTCSeconds:: db ; ff93 ds 2 -hHours:: db ; ff96 +hHours:: db ; ff96 ds 1 -hMinutes:: db ; ff98 +hMinutes:: db ; ff98 ds 1 -hSeconds:: db ; ff9a +hSeconds:: db ; ff9a ds 1 ds 1 @@ -24,8 +24,8 @@ hVBlankCounter:: db ; ff9d hFF9E:: db ; ff9e -hROMBank:: db ; ff9f -hVBlank:: db ; ffa0 +hROMBank:: db ; ff9f +hVBlank:: db ; ffa0 hMapEntryMethod:: db ; ffa1 hMenuReturn:: db ; ffa2 @@ -44,9 +44,9 @@ hInMenu:: db ; ffac ds 1 -hPrinter:: db ; ffae +hPrinter:: db ; ffae hGraphicStartTile:: db ; ffaf -hMoveMon:: db ; ffb0 +hMoveMon:: db ; ffb0 UNION ; ffb1 hMapObjectIndexBuffer:: db ; ffb1 @@ -112,9 +112,9 @@ hMGJoypadReleased:: db ; ffc6 hMGPrevTIMA:: db ; ffc7 ENDU ; ffc8 -hLCDCPointer:: db ; ffc8 -hLYOverrideStart:: db ; ffc9 -hLYOverrideEnd:: db ; ffca +hLCDCPointer:: db ; ffc8 +hLYOverrideStart:: db ; ffc9 +hLYOverrideEnd:: db ; ffca ds 1 diff --git a/macros/data.asm b/macros/data.asm index 938a6cb3..5b9614fe 100755 --- a/macros/data.asm +++ b/macros/data.asm @@ -125,11 +125,9 @@ ENDM sine_table: MACRO ; \1: amplitude - x = 0 - rept $20 - ; Round up. - dw (sin(x) + (sin(x) & $ff)) >> 8 +rept 32 + dw (sin(x) + (sin(x) & $ff)) >> 8 ; round up x = x + (\1) * $40000 - endr +endr ENDM diff --git a/macros/wram.asm b/macros/wram.asm index ea62f26f..590d1b9d 100755 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -231,13 +231,13 @@ link_battle_record: MACRO ENDM trademon: MACRO -\1Species:: db ; wc6d0 | wc702 -\1SpeciesName:: ds MON_NAME_LENGTH ; wc6d1 | wc703 -\1Nickname:: ds MON_NAME_LENGTH ; wc6dc | wc70e -\1SenderName:: ds NAME_LENGTH ; wc6e7 | wc719 -\1OTName:: ds NAME_LENGTH ; wc6f2 | wc724 -\1DVs:: dw ; wc6fd | wc72f -\1ID:: dw ; wc6ff | wc731 +\1Species:: db +\1SpeciesName:: ds MON_NAME_LENGTH +\1Nickname:: ds MON_NAME_LENGTH +\1SenderName:: ds NAME_LENGTH +\1OTName:: ds NAME_LENGTH +\1DVs:: dw +\1ID:: dw \1End:: ENDM @@ -335,55 +335,55 @@ sprite_oam_struct: MACRO ENDM sprite_anim_struct: MACRO -\1Index:: ds 1 ; 0 -\1FramesetID:: ds 1 ; 1 -\1AnimSeqID:: ds 1 ; 2 -\1TileID:: ds 1 ; 3 -\1XCoord:: ds 1 ; 4 -\1YCoord:: ds 1 ; 5 -\1XOffset:: ds 1 ; 6 -\1YOffset:: ds 1 ; 7 -\1Duration:: ds 1 ; 8 -\1DurationOffset:: ds 1 ; 9 -\1FrameIndex:: ds 1 ; a -\1Sprite0b:: ds 1 -\1Sprite0c:: ds 1 -\1Sprite0d:: ds 1 -\1Sprite0e:: ds 1 -\1Sprite0f:: ds 1 +\1Index:: db +\1FramesetID:: db +\1AnimSeqID:: db +\1TileID:: db +\1XCoord:: db +\1YCoord:: db +\1XOffset:: db +\1YOffset:: db +\1Duration:: db +\1DurationOffset:: db +\1FrameIndex:: db +\1JumptableIndex:: db +\1Field0c:: ds 1 +\1Field0d:: ds 1 +\1Field0e:: ds 1 +\1Field0f:: ds 1 ENDM battle_anim_struct: MACRO ; Placeholder until we can figure out what it all means -\1_Index:: ds 1 -\1_Anim01:: ds 1 -\1_Anim02:: ds 1 -\1_FramesetIndex:: ds 1 -\1_FunctionIndex:: ds 1 -\1_Anim05:: ds 1 -\1_TileID:: ds 1 -\1_XCoord:: ds 1 -\1_YCoord:: ds 1 -\1_XOffset:: ds 1 -\1_YOffset:: ds 1 -\1_Anim0b:: ds 1 -\1_Anim0c:: ds 1 -\1_Anim0d:: ds 1 -\1_AnonJumptableIndex:: ds 1 -\1_Anim0f:: ds 1 -\1_Anim10:: ds 1 -\1_Anim11:: ds 1 -\1_Anim12:: ds 1 -\1_Anim13:: ds 1 -\1_Anim14:: ds 1 -\1_Anim15:: ds 1 -\1_Anim16:: ds 1 -\1_Anim17:: ds 1 -endm +\1Index:: db +\1Field01:: ds 1 +\1Field02:: ds 1 +\1FramesetID:: db +\1Function:: db +\1Palette:: db +\1TileID:: db +\1XCoord:: db +\1YCoord:: db +\1XOffset:: db +\1YOffset:: db +\1Field0b:: ds 1 +\1Duration:: db +\1Frame:: db +\1AnonJumptableIndex:: db +\1Field0f:: ds 1 +\1Field10:: ds 1 +\1Field11:: ds 1 +\1Field12:: ds 1 +\1Field13:: ds 1 +\1Field14:: ds 1 +\1Field15:: ds 1 +\1Field16:: ds 1 +\1Field17:: ds 1 +ENDM battle_bg_effect: MACRO -\1_Function:: ds 1 -\1_01:: ds 1 -\1_02:: ds 1 -\1_03:: ds 1 -endm +\1Function:: db +\1Field01:: ds 1 +\1Field02:: ds 1 +\1Field03:: ds 1 +ENDM |