From 87eed687100ddfc3e4e045bbe8c21aa08eee2f6e Mon Sep 17 00:00:00 2001 From: dannye Date: Sun, 7 May 2017 15:30:08 -0500 Subject: [PATCH 01/33] Insert Crystal audio engine and music most credit goes to Sanqui --- audio.asm | 1008 +-- audio/headers/sfxheaders1.asm | 178 +- audio/headers/sfxheaders2.asm | 192 - audio/headers/sfxheaders3.asm | 282 - audio/sfx/59_1.asm | 4 +- audio/sfx/59_3.asm | 11 - audio/sfx/arrow_tiles_1.asm | 2 +- audio/sfx/arrow_tiles_3.asm | 6 - audio/sfx/ball_poof.asm | 2 +- audio/sfx/ball_toss.asm | 4 +- audio/sfx/battle_09.asm | 2 +- audio/sfx/battle_1e.asm | 2 +- audio/sfx/battle_24.asm | 2 +- audio/sfx/battle_27.asm | 2 +- audio/sfx/battle_28.asm | 2 +- audio/sfx/battle_2e.asm | 2 +- audio/sfx/battle_31.asm | 4 +- audio/sfx/battle_32.asm | 4 +- audio/sfx/battle_33.asm | 4 +- audio/sfx/battle_35.asm | 30 +- audio/sfx/battle_36.asm | 2 +- audio/sfx/caught_mon.asm | 82 +- audio/sfx/collision_1.asm | 2 +- audio/sfx/collision_3.asm | 6 - audio/sfx/cry00_1.asm | 21 - audio/sfx/cry00_2.asm | 21 - audio/sfx/cry00_3.asm | 21 - audio/sfx/cry01_1.asm | 24 - audio/sfx/cry01_2.asm | 24 - audio/sfx/cry01_3.asm | 24 - audio/sfx/cry02_1.asm | 17 - audio/sfx/cry02_2.asm | 17 - audio/sfx/cry02_3.asm | 17 - audio/sfx/cry03_1.asm | 30 - audio/sfx/cry03_2.asm | 30 - audio/sfx/cry03_3.asm | 30 - audio/sfx/cry04_1.asm | 32 - audio/sfx/cry04_2.asm | 32 - audio/sfx/cry04_3.asm | 32 - audio/sfx/cry05_1.asm | 19 - audio/sfx/cry05_2.asm | 19 - audio/sfx/cry05_3.asm | 19 - audio/sfx/cry06_1.asm | 22 - audio/sfx/cry06_2.asm | 22 - audio/sfx/cry06_3.asm | 22 - audio/sfx/cry07_1.asm | 21 - audio/sfx/cry07_2.asm | 21 - audio/sfx/cry07_3.asm | 21 - audio/sfx/cry08_1.asm | 23 - audio/sfx/cry08_2.asm | 23 - audio/sfx/cry08_3.asm | 23 - audio/sfx/cry09_1.asm | 35 - audio/sfx/cry09_2.asm | 35 - audio/sfx/cry09_3.asm | 35 - audio/sfx/cry0a_1.asm | 35 - audio/sfx/cry0a_2.asm | 35 - audio/sfx/cry0a_3.asm | 35 - audio/sfx/cry0b_1.asm | 37 - audio/sfx/cry0b_2.asm | 37 - audio/sfx/cry0b_3.asm | 37 - audio/sfx/cry0c_1.asm | 29 - audio/sfx/cry0c_2.asm | 29 - audio/sfx/cry0c_3.asm | 29 - audio/sfx/cry0d_1.asm | 40 - audio/sfx/cry0d_2.asm | 40 - audio/sfx/cry0d_3.asm | 40 - audio/sfx/cry0e_1.asm | 23 - audio/sfx/cry0e_2.asm | 23 - audio/sfx/cry0e_3.asm | 23 - audio/sfx/cry0f_1.asm | 29 - audio/sfx/cry0f_2.asm | 29 - audio/sfx/cry0f_3.asm | 29 - audio/sfx/cry10_1.asm | 31 - audio/sfx/cry10_2.asm | 31 - audio/sfx/cry10_3.asm | 31 - audio/sfx/cry11_1.asm | 34 - audio/sfx/cry11_2.asm | 34 - audio/sfx/cry11_3.asm | 34 - audio/sfx/cry12_1.asm | 24 - audio/sfx/cry12_2.asm | 24 - audio/sfx/cry12_3.asm | 24 - audio/sfx/cry13_1.asm | 30 - audio/sfx/cry13_2.asm | 30 - audio/sfx/cry13_3.asm | 30 - audio/sfx/cry14_1.asm | 21 - audio/sfx/cry14_2.asm | 21 - audio/sfx/cry14_3.asm | 21 - audio/sfx/cry15_1.asm | 30 - audio/sfx/cry15_2.asm | 30 - audio/sfx/cry15_3.asm | 30 - audio/sfx/cry16_1.asm | 21 - audio/sfx/cry16_2.asm | 21 - audio/sfx/cry16_3.asm | 21 - audio/sfx/cry17_1.asm | 24 - audio/sfx/cry17_2.asm | 24 - audio/sfx/cry17_3.asm | 24 - audio/sfx/cry18_1.asm | 34 - audio/sfx/cry18_2.asm | 34 - audio/sfx/cry18_3.asm | 34 - audio/sfx/cry19_1.asm | 18 - audio/sfx/cry19_2.asm | 18 - audio/sfx/cry19_3.asm | 18 - audio/sfx/cry1a_1.asm | 30 - audio/sfx/cry1a_2.asm | 30 - audio/sfx/cry1a_3.asm | 30 - audio/sfx/cry1b_1.asm | 26 - audio/sfx/cry1b_2.asm | 26 - audio/sfx/cry1b_3.asm | 26 - audio/sfx/cry1c_1.asm | 31 - audio/sfx/cry1c_2.asm | 31 - audio/sfx/cry1c_3.asm | 31 - audio/sfx/cry1d_1.asm | 29 - audio/sfx/cry1d_2.asm | 29 - audio/sfx/cry1d_3.asm | 29 - audio/sfx/cry1e_1.asm | 38 - audio/sfx/cry1e_2.asm | 38 - audio/sfx/cry1e_3.asm | 38 - audio/sfx/cry1f_1.asm | 24 - audio/sfx/cry1f_2.asm | 24 - audio/sfx/cry1f_3.asm | 24 - audio/sfx/cry20_1.asm | 24 - audio/sfx/cry20_2.asm | 24 - audio/sfx/cry20_3.asm | 24 - audio/sfx/cry21_1.asm | 27 - audio/sfx/cry21_2.asm | 27 - audio/sfx/cry21_3.asm | 27 - audio/sfx/cry22_1.asm | 24 - audio/sfx/cry22_2.asm | 24 - audio/sfx/cry22_3.asm | 24 - audio/sfx/cry23_1.asm | 25 - audio/sfx/cry23_2.asm | 25 - audio/sfx/cry23_3.asm | 25 - audio/sfx/cry24_1.asm | 33 - audio/sfx/cry24_2.asm | 33 - audio/sfx/cry24_3.asm | 33 - audio/sfx/cry25_1.asm | 26 - audio/sfx/cry25_2.asm | 26 - audio/sfx/cry25_3.asm | 26 - audio/sfx/cut_3.asm | 7 - audio/sfx/cymbal1_1.asm | 3 - audio/sfx/cymbal1_2.asm | 3 - audio/sfx/cymbal1_3.asm | 3 - audio/sfx/cymbal2_1.asm | 3 - audio/sfx/cymbal2_2.asm | 3 - audio/sfx/cymbal2_3.asm | 3 - audio/sfx/cymbal3_1.asm | 3 - audio/sfx/cymbal3_2.asm | 3 - audio/sfx/cymbal3_3.asm | 3 - audio/sfx/denied_1.asm | 4 +- audio/sfx/denied_3.asm | 18 - audio/sfx/dex_page_added.asm | 4 +- audio/sfx/enter_pc_1.asm | 2 +- audio/sfx/enter_pc_3.asm | 7 - audio/sfx/faint_fall.asm | 2 +- audio/sfx/fly_3.asm | 18 - audio/sfx/get_item1_1.asm | 54 +- audio/sfx/get_item1_3.asm | 47 - audio/sfx/get_item2_1.asm | 94 +- audio/sfx/get_item2_2.asm | 69 - audio/sfx/get_item2_3.asm | 69 - audio/sfx/get_key_item_1.asm | 78 +- audio/sfx/get_key_item_3.asm | 59 - audio/sfx/go_inside_3.asm | 4 - audio/sfx/go_outside_3.asm | 7 - audio/sfx/heal_ailment_1.asm | 2 +- audio/sfx/heal_ailment_2.asm | 9 - audio/sfx/heal_ailment_3.asm | 9 - audio/sfx/heal_hp_1.asm | 2 +- audio/sfx/heal_hp_2.asm | 7 - audio/sfx/heal_hp_3.asm | 7 - audio/sfx/healing_machine_1.asm | 2 +- audio/sfx/healing_machine_3.asm | 9 - audio/sfx/intro_hip.asm | 2 +- audio/sfx/intro_hop.asm | 2 +- audio/sfx/ledge_1.asm | 2 +- audio/sfx/ledge_3.asm | 6 - audio/sfx/level_up.asm | 90 +- audio/sfx/muted_snare1_1.asm | 4 - audio/sfx/muted_snare1_2.asm | 4 - audio/sfx/muted_snare1_3.asm | 4 - audio/sfx/muted_snare2_1.asm | 3 - audio/sfx/muted_snare2_2.asm | 3 - audio/sfx/muted_snare2_3.asm | 3 - audio/sfx/muted_snare3_1.asm | 3 - audio/sfx/muted_snare3_2.asm | 3 - audio/sfx/muted_snare3_3.asm | 3 - audio/sfx/muted_snare4_1.asm | 3 - audio/sfx/muted_snare4_2.asm | 3 - audio/sfx/muted_snare4_3.asm | 3 - audio/sfx/poisoned_1.asm | 2 +- audio/sfx/poisoned_3.asm | 8 - audio/sfx/pokedex_rating_1.asm | 102 +- audio/sfx/pokedex_rating_3.asm | 77 - audio/sfx/pokeflute.asm | 35 +- audio/sfx/pokeflute_ch4_ch5.asm | 14 +- audio/sfx/pokeflute_ch6.asm | 16 +- audio/sfx/press_ab_1.asm | 2 +- audio/sfx/press_ab_2.asm | 7 - audio/sfx/press_ab_3.asm | 7 - audio/sfx/psychic_m.asm | 4 +- audio/sfx/purchase_1.asm | 4 +- audio/sfx/purchase_3.asm | 13 - audio/sfx/push_boulder_3.asm | 10 - audio/sfx/safari_zone_pa.asm | 2 +- audio/sfx/save_1.asm | 4 +- audio/sfx/save_3.asm | 36 - audio/sfx/shrink_1.asm | 2 +- audio/sfx/shrink_3.asm | 10 - audio/sfx/silph_scope.asm | 2 +- audio/sfx/slots_new_spin.asm | 4 +- audio/sfx/slots_reward.asm | 2 +- audio/sfx/slots_stop_wheel.asm | 2 +- audio/sfx/snare1_1.asm | 3 - audio/sfx/snare1_2.asm | 3 - audio/sfx/snare1_3.asm | 3 - audio/sfx/snare2_1.asm | 3 - audio/sfx/snare2_2.asm | 3 - audio/sfx/snare2_3.asm | 3 - audio/sfx/snare3_1.asm | 3 - audio/sfx/snare3_2.asm | 3 - audio/sfx/snare3_3.asm | 3 - audio/sfx/snare4_1.asm | 3 - audio/sfx/snare4_2.asm | 3 - audio/sfx/snare4_3.asm | 3 - audio/sfx/snare5_1.asm | 8 - audio/sfx/snare5_2.asm | 8 - audio/sfx/snare5_3.asm | 8 - audio/sfx/snare6_1.asm | 3 - audio/sfx/snare6_2.asm | 3 - audio/sfx/snare6_3.asm | 3 - audio/sfx/snare7_1.asm | 3 - audio/sfx/snare7_2.asm | 3 - audio/sfx/snare7_3.asm | 3 - audio/sfx/snare8_1.asm | 3 - audio/sfx/snare8_2.asm | 3 - audio/sfx/snare8_3.asm | 3 - audio/sfx/snare9_1.asm | 3 - audio/sfx/snare9_2.asm | 3 - audio/sfx/snare9_3.asm | 3 - audio/sfx/ss_anne_horn_1.asm | 4 +- audio/sfx/ss_anne_horn_3.asm | 22 - audio/sfx/start_menu_2.asm | 4 - audio/sfx/start_menu_3.asm | 4 - audio/sfx/swap_1.asm | 4 +- audio/sfx/swap_3.asm | 11 - audio/sfx/switch_1.asm | 2 +- audio/sfx/switch_3.asm | 8 - audio/sfx/teleport_enter1_1.asm | 2 +- audio/sfx/teleport_enter1_3.asm | 10 - audio/sfx/teleport_enter2_3.asm | 6 - audio/sfx/teleport_exit1_1.asm | 2 +- audio/sfx/teleport_exit1_3.asm | 10 - audio/sfx/teleport_exit2_1.asm | 2 +- audio/sfx/teleport_exit2_3.asm | 6 - audio/sfx/tink_1.asm | 2 +- audio/sfx/tink_2.asm | 8 - audio/sfx/tink_3.asm | 8 - audio/sfx/trade_machine_1.asm | 2 +- audio/sfx/trade_machine_3.asm | 7 - audio/sfx/triangle1_1.asm | 3 - audio/sfx/triangle1_2.asm | 3 - audio/sfx/triangle1_3.asm | 3 - audio/sfx/triangle2_1.asm | 4 - audio/sfx/triangle2_2.asm | 4 - audio/sfx/triangle2_3.asm | 4 - audio/sfx/triangle3_1.asm | 4 - audio/sfx/triangle3_2.asm | 4 - audio/sfx/triangle3_3.asm | 4 - audio/sfx/turn_off_pc_1.asm | 2 +- audio/sfx/turn_off_pc_3.asm | 7 - audio/sfx/turn_on_pc_1.asm | 2 +- audio/sfx/turn_on_pc_3.asm | 14 - audio/sfx/unused2_2.asm | 70 +- audio/sfx/unused_2.asm | 31 - audio/sfx/unused_3.asm | 31 - audio/sfx/withdraw_deposit_1.asm | 2 +- audio/sfx/withdraw_deposit_3.asm | 12 - constants/music_constants.asm | 375 +- crysaudio/cries.asm | 2306 +++++++ crysaudio/cry_headers.asm | 1530 +++++ crysaudio/cry_pointers.asm | 70 + crysaudio/engine.asm | 3431 ++++++++++ crysaudio/music/DPPt/EternaForest.asm | 979 +++ crysaudio/music/DPPt/WinPokeSinnoh.asm | 289 + crysaudio/music/DPPt/WinTrainerSinnoh.asm | 461 ++ crysaudio/music/DPPt/frontierbrain.asm | 2285 +++++++ crysaudio/music/DPPt/jubilifecity.asm | 614 ++ crysaudio/music/DPPt/pokeradar.asm | 209 + crysaudio/music/DPPt/route201.asm | 381 ++ crysaudio/music/DPPt/route203.asm | 2014 ++++++ crysaudio/music/DPPt/route205.asm | 1080 ++++ crysaudio/music/DPPt/route206.asm | 984 +++ crysaudio/music/DPPt/sinnohtrainer.asm | 1623 +++++ crysaudio/music/DPPt/sinnohwild.asm | 1176 ++++ crysaudio/music/RBY/bikeriding.asm | 696 ++ crysaudio/music/RBY/celadon.asm | 408 ++ crysaudio/music/RBY/cinnabar.asm | 360 ++ crysaudio/music/RBY/cinnabarmansion.asm | 180 + crysaudio/music/RBY/cities1.asm | 666 ++ crysaudio/music/RBY/cities2.asm | 422 ++ crysaudio/music/RBY/credits.asm | 826 +++ crysaudio/music/RBY/defeatedgymleader.asm | 611 ++ crysaudio/music/RBY/defeatedtrainer.asm | 268 + crysaudio/music/RBY/defeatedwildmon.asm | 303 + crysaudio/music/RBY/dungeon1.asm | 682 ++ crysaudio/music/RBY/dungeon2.asm | 325 + crysaudio/music/RBY/dungeon3.asm | 715 +++ crysaudio/music/RBY/finalbattle.asm | 1337 ++++ crysaudio/music/RBY/gamecorner.asm | 633 ++ crysaudio/music/RBY/gym.asm | 363 ++ crysaudio/music/RBY/gymleaderbattle.asm | 1397 ++++ crysaudio/music/RBY/halloffame.asm | 102 + crysaudio/music/RBY/indigoplateau.asm | 329 + crysaudio/music/RBY/introbattle.asm | 337 + crysaudio/music/RBY/jigglypuffsong.asm | 45 + crysaudio/music/RBY/lavender.asm | 206 + crysaudio/music/RBY/meeteviltrainer.asm | 86 + crysaudio/music/RBY/meetfemaletrainer.asm | 124 + crysaudio/music/RBY/meetjessiejames.asm | 307 + crysaudio/music/RBY/meetmaletrainer.asm | 196 + crysaudio/music/RBY/meetprofoak.asm | 429 ++ crysaudio/music/RBY/meetrival.asm | 406 ++ crysaudio/music/RBY/museumguy.asm | 345 + crysaudio/music/RBY/oakslab.asm | 399 ++ crysaudio/music/RBY/pallettown.asm | 320 + crysaudio/music/RBY/pkmnhealed.asm | 53 + crysaudio/music/RBY/pokecenter.asm | 381 ++ crysaudio/music/RBY/pokemontower.asm | 465 ++ crysaudio/music/RBY/routes1.asm | 413 ++ crysaudio/music/RBY/routes2.asm | 434 ++ crysaudio/music/RBY/routes3.asm | 523 ++ crysaudio/music/RBY/routes4.asm | 689 ++ crysaudio/music/RBY/safarizone.asm | 117 + crysaudio/music/RBY/silphco.asm | 1005 +++ crysaudio/music/RBY/ssanne.asm | 344 + crysaudio/music/RBY/surfing.asm | 341 + crysaudio/music/RBY/surfingpikachu.asm | 688 ++ crysaudio/music/RBY/titlescreen.asm | 747 +++ crysaudio/music/RBY/trainerbattle.asm | 1854 ++++++ crysaudio/music/RBY/unusedsong.asm | 343 + crysaudio/music/RBY/vermilion.asm | 331 + crysaudio/music/RBY/wildbattle.asm | 734 +++ crysaudio/music/RBY/yellowintro.asm | 485 ++ crysaudio/music/RBY/yellowunusedsong.asm | 323 + crysaudio/music/RSE/frontierbrain.asm | 2418 +++++++ crysaudio/music/TCG/battletheme1.asm | 2019 ++++++ crysaudio/music/TCG/boosterpack.asm | 109 + crysaudio/music/TCG/cardpop.asm | 306 + crysaudio/music/TCG/challengehall.asm | 1075 ++++ crysaudio/music/TCG/club1.asm | 836 +++ crysaudio/music/TCG/club2.asm | 324 + crysaudio/music/TCG/club3.asm | 1060 ++++ crysaudio/music/TCG/credits.asm | 3386 ++++++++++ crysaudio/music/TCG/darkdiddly.asm | 110 + crysaudio/music/TCG/deckmachine.asm | 240 + crysaudio/music/TCG/dueltheme1.asm | 1917 ++++++ crysaudio/music/TCG/dueltheme2.asm | 1193 ++++ crysaudio/music/TCG/dueltheme3.asm | 1490 +++++ crysaudio/music/TCG/hallofhonor.asm | 329 + crysaudio/music/TCG/imakuni.asm | 532 ++ crysaudio/music/TCG/matchloss.asm | 119 + crysaudio/music/TCG/matchstart1.asm | 57 + crysaudio/music/TCG/matchstart2.asm | 179 + crysaudio/music/TCG/matchstart3.asm | 328 + crysaudio/music/TCG/matchvictory.asm | 149 + crysaudio/music/TCG/medal.asm | 151 + crysaudio/music/TCG/overworld.asm | 1324 ++++ crysaudio/music/TCG/pausemenu.asm | 588 ++ crysaudio/music/TCG/pcmainmenu.asm | 349 + crysaudio/music/TCG/pokemondome.asm | 792 +++ crysaudio/music/TCG/ronald.asm | 1222 ++++ crysaudio/music/TCG/titlescreen.asm | 544 ++ crysaudio/music/TCG2/credits.asm | 4353 +++++++++++++ crysaudio/music/TCG2/diddly1.asm | 240 + crysaudio/music/TCG2/diddly2.asm | 224 + crysaudio/music/TCG2/diddly3.asm | 65 + crysaudio/music/TCG2/diddly4.asm | 68 + crysaudio/music/TCG2/diddly5.asm | 65 + crysaudio/music/TCG2/diddly6.asm | 256 + crysaudio/music/TCG2/fort1.asm | 1350 ++++ crysaudio/music/TCG2/fort2.asm | 1837 ++++++ crysaudio/music/TCG2/fort3.asm | 1855 ++++++ crysaudio/music/TCG2/fort4.asm | 1847 ++++++ crysaudio/music/TCG2/gamecorner.asm | 1513 +++++ crysaudio/music/TCG2/grblimp.asm | 729 +++ crysaudio/music/TCG2/grcastle.asm | 2030 ++++++ crysaudio/music/TCG2/grchallengecup.asm | 1197 ++++ crysaudio/music/TCG2/grdueltheme1.asm | 2444 +++++++ crysaudio/music/TCG2/grdueltheme2.asm | 2657 ++++++++ crysaudio/music/TCG2/grdueltheme3.asm | 3654 +++++++++++ crysaudio/music/TCG2/groverworld.asm | 1518 +++++ crysaudio/music/TCG2/herecomesgr.asm | 1632 +++++ crysaudio/music/TCG2/imakuni2.asm | 2147 +++++++ crysaudio/music/TCG2/ishihara.asm | 2334 +++++++ crysaudio/music/TCG2/titlescreen.asm | 1420 +++++ crysaudio/music/aftertherivalfight.asm | 71 + crysaudio/music/azaleatown.asm | 665 ++ crysaudio/music/battletowerlobby.asm | 315 + crysaudio/music/battletowertheme.asm | 699 ++ crysaudio/music/bicycle.asm | 523 ++ crysaudio/music/buenaspassword.asm | 647 ++ crysaudio/music/bugcatchingcontest.asm | 675 ++ crysaudio/music/burnedtower.asm | 267 + crysaudio/music/celadoncity.asm | 398 ++ crysaudio/music/championbattle.asm | 793 +++ crysaudio/music/cherrygrovecity.asm | 312 + crysaudio/music/clair.asm | 445 ++ crysaudio/music/contestresults.asm | 180 + crysaudio/music/credits.asm | 1696 +++++ crysaudio/music/crystalopening.asm | 366 ++ crysaudio/music/custom/ceruleanGSC.asm | 948 +++ crysaudio/music/custom/cinnabarGSC.asm | 181 + crysaudio/music/custom/cinnabarremix.asm | 478 ++ crysaudio/music/custom/johtoGSC.asm | 2355 +++++++ .../music/custom/kantogymleaderremix.asm | 1059 ++++ crysaudio/music/custom/naljogymbattle.asm | 1073 ++++ crysaudio/music/custom/naljowildbattle.asm | 810 +++ crysaudio/music/custom/nuggetbridge.asm | 663 ++ crysaudio/music/custom/palletbattle.asm | 670 ++ crysaudio/music/custom/pokeathelonfinal.asm | 2574 ++++++++ crysaudio/music/custom/shop.asm | 1114 ++++ crysaudio/music/custom/sinnohtrainer.asm | 0 crysaudio/music/dancinghall.asm | 314 + crysaudio/music/darkcave.asm | 494 ++ crysaudio/music/dragonsden.asm | 182 + crysaudio/music/ecruteakcity.asm | 676 ++ crysaudio/music/elmslab.asm | 544 ++ crysaudio/music/evolution.asm | 212 + crysaudio/music/gamecorner.asm | 823 +++ crysaudio/music/goldenrodcity.asm | 489 ++ crysaudio/music/goldsilveropening.asm | 621 ++ crysaudio/music/goldsilveropening2.asm | 224 + crysaudio/music/gym.asm | 576 ++ crysaudio/music/gymleadervictory.asm | 432 ++ crysaudio/music/halloffame.asm | 179 + crysaudio/music/healpokemon.asm | 56 + crysaudio/music/indigoplateau.asm | 192 + crysaudio/music/johtogymbattle.asm | 1034 +++ crysaudio/music/johtotrainerbattle.asm | 1350 ++++ crysaudio/music/johtowildbattle.asm | 592 ++ crysaudio/music/johtowildbattlenight.asm | 34 + crysaudio/music/kantogymbattle.asm | 618 ++ crysaudio/music/kantotrainerbattle.asm | 2297 +++++++ crysaudio/music/kantowildbattle.asm | 1229 ++++ crysaudio/music/lakeofrage.asm | 329 + crysaudio/music/lakeofragerocketradio.asm | 41 + crysaudio/music/lavendertown.asm | 524 ++ crysaudio/music/lighthouse.asm | 316 + crysaudio/music/lookbeauty.asm | 333 + crysaudio/music/lookhiker.asm | 122 + crysaudio/music/lookkimonogirl.asm | 276 + crysaudio/music/looklass.asm | 121 + crysaudio/music/lookmysticalman.asm | 621 ++ crysaudio/music/lookofficer.asm | 144 + crysaudio/music/lookpokemaniac.asm | 166 + crysaudio/music/lookrival.asm | 362 ++ crysaudio/music/lookrocket.asm | 418 ++ crysaudio/music/looksage.asm | 184 + crysaudio/music/lookyoungster.asm | 304 + crysaudio/music/magnettrain.asm | 276 + crysaudio/music/mainmenu.asm | 149 + crysaudio/music/mobileadapter.asm | 671 ++ crysaudio/music/mobileadaptermenu.asm | 284 + crysaudio/music/mobilecenter.asm | 489 ++ crysaudio/music/mom.asm | 114 + crysaudio/music/mtmoon.asm | 145 + crysaudio/music/mtmoonsquare.asm | 112 + crysaudio/music/music_labels.txt | 103 + crysaudio/music/nationalpark.asm | 670 ++ crysaudio/music/newbarktown.asm | 335 + crysaudio/music/nothing.asm | 14 + crysaudio/music/pallettown.asm | 363 ++ crysaudio/music/pinball/bluefield.asm | 1466 +++++ crysaudio/music/pinball/catchem_blue.asm | 2149 +++++++ crysaudio/music/pinball/catchem_red.asm | 1516 +++++ .../music/pinball/diglettstage_digletts.asm | 807 +++ .../music/pinball/diglettstage_dugtrio.asm | 1148 ++++ crysaudio/music/pinball/endcredits.asm | 1724 +++++ crysaudio/music/pinball/fieldselect.asm | 447 ++ crysaudio/music/pinball/gameover.asm | 197 + .../music/pinball/gengarstage_gastly.asm | 386 ++ .../pinball/gengarstage_hauntergengar.asm | 809 +++ crysaudio/music/pinball/hiscorescreen.asm | 1170 ++++ crysaudio/music/pinball/hurryup_blue.asm | 268 + crysaudio/music/pinball/hurryup_red.asm | 269 + crysaudio/music/pinball/meowthstage.asm | 1070 ++++ crysaudio/music/pinball/mewtwostage.asm | 1369 ++++ crysaudio/music/pinball/nameentry.asm | 2049 ++++++ crysaudio/music/pinball/options.asm | 229 + crysaudio/music/pinball/pokedex.asm | 709 +++ crysaudio/music/pinball/redfield.asm | 1423 +++++ crysaudio/music/pinball/seelstage.asm | 1434 +++++ crysaudio/music/pinball/titlescreen.asm | 1103 ++++ crysaudio/music/pokeflutechannel.asm | 234 + crysaudio/music/pokemoncenter.asm | 416 ++ crysaudio/music/pokemonchannel.asm | 238 + crysaudio/music/pokemonlullaby.asm | 138 + crysaudio/music/pokemonmarch.asm | 471 ++ crysaudio/music/postcredits.asm | 269 + crysaudio/music/printer.asm | 322 + crysaudio/music/profoak.asm | 325 + crysaudio/music/profoakspokemontalk.asm | 314 + crysaudio/music/rivalbattle.asm | 871 +++ crysaudio/music/rocketbattle.asm | 1042 +++ crysaudio/music/rockethideout.asm | 315 + crysaudio/music/rockettheme.asm | 484 ++ crysaudio/music/route1.asm | 656 ++ crysaudio/music/route12.asm | 462 ++ crysaudio/music/route2.asm | 530 ++ crysaudio/music/route26.asm | 677 ++ crysaudio/music/route29.asm | 528 ++ crysaudio/music/route3.asm | 512 ++ crysaudio/music/route30.asm | 680 ++ crysaudio/music/route36.asm | 530 ++ crysaudio/music/route37.asm | 440 ++ crysaudio/music/ruinsofalphinterior.asm | 52 + crysaudio/music/ruinsofalphradio.asm | 81 + crysaudio/music/showmearound.asm | 364 ++ crysaudio/music/sprouttower.asm | 249 + crysaudio/music/ssaqua.asm | 1189 ++++ crysaudio/music/successfulcapture.asm | 28 + crysaudio/music/suicunebattle.asm | 2062 ++++++ crysaudio/music/surf.asm | 738 +++ crysaudio/music/tintower.asm | 298 + crysaudio/music/titlescreen.asm | 1181 ++++ crysaudio/music/trainervictory.asm | 237 + crysaudio/music/unioncave.asm | 270 + crysaudio/music/vermilioncity.asm | 351 + crysaudio/music/victoryroad.asm | 207 + crysaudio/music/violetcity.asm | 784 +++ crysaudio/music/viridiancity.asm | 800 +++ crysaudio/music/wildpokemonvictory.asm | 191 + crysaudio/music_pointers.asm | 131 + crysaudio/music_pointers2.asm | 130 + crysaudio/music_pointers_music_test.asm | 272 + crysaudio/rbsfx.asm | 126 + crysaudio/red_pointers.asm | 50 + crysaudio/sfx.asm | 5635 +++++++++++++++++ crysaudio/sfx_crystal.asm | 303 + crysaudio/sfx_pointers.asm | 214 + crysaudio/trainer_encounters.asm | 96 + crysmacros.asm | 47 + data/map_songs.asm | 497 +- engine/HoF_room_pc.asm | 2 +- engine/battle/animations.asm | 60 +- engine/battle/core.asm | 12 +- engine/battle/end_of_battle.asm | 2 +- engine/cable_club.asm | 4 +- engine/evolution.asm | 4 +- engine/hall_of_fame.asm | 2 +- engine/hidden_object_functions17.asm | 7 + engine/hidden_object_functions7.asm | 10 +- engine/intro.asm | 4 +- engine/items/items.asm | 15 +- engine/menu/bills_pc.asm | 13 +- engine/menu/pokedex.asm | 6 +- engine/oak_speech.asm | 4 +- engine/overworld/elevator.asm | 8 +- engine/overworld/healing_machine.asm | 38 +- engine/overworld/movement.asm | 3 + engine/overworld/npc_movement.asm | 8 +- engine/overworld/pokecenter.asm | 2 +- engine/predefs.asm | 2 +- engine/save.asm | 53 +- engine/titlescreen.asm | 7 +- home.asm | 81 +- home/audio.asm | 335 +- home/init.asm | 9 +- home/overworld.asm | 43 +- home/vblank.asm | 39 +- hram.asm | 1 + macros/asm_macros.asm | 15 + macros/audio_macros.asm | 138 +- main.asm | 19 + scripts/ceruleancity.asm | 2 +- scripts/oakslab.asm | 2 +- scripts/pallettown.asm | 2 +- scripts/pewterpokecenter.asm | 11 +- scripts/pokemontower2.asm | 2 +- scripts/redshouse1f.asm | 9 +- scripts/route22.asm | 2 +- scripts/silphco7.asm | 2 +- scripts/ssanne2.asm | 2 +- scripts/ssanne7.asm | 11 +- scripts/vermiliondock.asm | 2 +- wram.asm | 321 +- 586 files changed, 193763 insertions(+), 6447 deletions(-) delete mode 100644 audio/sfx/59_3.asm delete mode 100644 audio/sfx/arrow_tiles_3.asm delete mode 100644 audio/sfx/collision_3.asm delete mode 100644 audio/sfx/cry00_1.asm delete mode 100644 audio/sfx/cry00_2.asm delete mode 100644 audio/sfx/cry00_3.asm delete mode 100644 audio/sfx/cry01_1.asm delete mode 100644 audio/sfx/cry01_2.asm delete mode 100644 audio/sfx/cry01_3.asm delete mode 100644 audio/sfx/cry02_1.asm delete mode 100644 audio/sfx/cry02_2.asm delete mode 100644 audio/sfx/cry02_3.asm delete mode 100644 audio/sfx/cry03_1.asm delete mode 100644 audio/sfx/cry03_2.asm delete mode 100644 audio/sfx/cry03_3.asm delete mode 100644 audio/sfx/cry04_1.asm delete mode 100644 audio/sfx/cry04_2.asm delete mode 100644 audio/sfx/cry04_3.asm delete mode 100644 audio/sfx/cry05_1.asm delete mode 100644 audio/sfx/cry05_2.asm delete mode 100644 audio/sfx/cry05_3.asm delete mode 100644 audio/sfx/cry06_1.asm delete mode 100644 audio/sfx/cry06_2.asm delete mode 100644 audio/sfx/cry06_3.asm delete mode 100644 audio/sfx/cry07_1.asm delete mode 100644 audio/sfx/cry07_2.asm delete mode 100644 audio/sfx/cry07_3.asm delete mode 100644 audio/sfx/cry08_1.asm delete mode 100644 audio/sfx/cry08_2.asm delete mode 100644 audio/sfx/cry08_3.asm delete mode 100644 audio/sfx/cry09_1.asm delete mode 100644 audio/sfx/cry09_2.asm delete mode 100644 audio/sfx/cry09_3.asm delete mode 100644 audio/sfx/cry0a_1.asm delete mode 100644 audio/sfx/cry0a_2.asm delete mode 100644 audio/sfx/cry0a_3.asm delete mode 100644 audio/sfx/cry0b_1.asm delete mode 100644 audio/sfx/cry0b_2.asm delete mode 100644 audio/sfx/cry0b_3.asm delete mode 100644 audio/sfx/cry0c_1.asm delete mode 100644 audio/sfx/cry0c_2.asm delete mode 100644 audio/sfx/cry0c_3.asm delete mode 100644 audio/sfx/cry0d_1.asm delete mode 100644 audio/sfx/cry0d_2.asm delete mode 100644 audio/sfx/cry0d_3.asm delete mode 100644 audio/sfx/cry0e_1.asm delete mode 100644 audio/sfx/cry0e_2.asm delete mode 100644 audio/sfx/cry0e_3.asm delete mode 100644 audio/sfx/cry0f_1.asm delete mode 100644 audio/sfx/cry0f_2.asm delete mode 100644 audio/sfx/cry0f_3.asm delete mode 100644 audio/sfx/cry10_1.asm delete mode 100644 audio/sfx/cry10_2.asm delete mode 100644 audio/sfx/cry10_3.asm delete mode 100644 audio/sfx/cry11_1.asm delete mode 100644 audio/sfx/cry11_2.asm delete mode 100644 audio/sfx/cry11_3.asm delete mode 100644 audio/sfx/cry12_1.asm delete mode 100644 audio/sfx/cry12_2.asm delete mode 100644 audio/sfx/cry12_3.asm delete mode 100644 audio/sfx/cry13_1.asm delete mode 100644 audio/sfx/cry13_2.asm delete mode 100644 audio/sfx/cry13_3.asm delete mode 100644 audio/sfx/cry14_1.asm delete mode 100644 audio/sfx/cry14_2.asm delete mode 100644 audio/sfx/cry14_3.asm delete mode 100644 audio/sfx/cry15_1.asm delete mode 100644 audio/sfx/cry15_2.asm delete mode 100644 audio/sfx/cry15_3.asm delete mode 100644 audio/sfx/cry16_1.asm delete mode 100644 audio/sfx/cry16_2.asm delete mode 100644 audio/sfx/cry16_3.asm delete mode 100644 audio/sfx/cry17_1.asm delete mode 100644 audio/sfx/cry17_2.asm delete mode 100644 audio/sfx/cry17_3.asm delete mode 100644 audio/sfx/cry18_1.asm delete mode 100644 audio/sfx/cry18_2.asm delete mode 100644 audio/sfx/cry18_3.asm delete mode 100644 audio/sfx/cry19_1.asm delete mode 100644 audio/sfx/cry19_2.asm delete mode 100644 audio/sfx/cry19_3.asm delete mode 100644 audio/sfx/cry1a_1.asm delete mode 100644 audio/sfx/cry1a_2.asm delete mode 100644 audio/sfx/cry1a_3.asm delete mode 100644 audio/sfx/cry1b_1.asm delete mode 100644 audio/sfx/cry1b_2.asm delete mode 100644 audio/sfx/cry1b_3.asm delete mode 100644 audio/sfx/cry1c_1.asm delete mode 100644 audio/sfx/cry1c_2.asm delete mode 100644 audio/sfx/cry1c_3.asm delete mode 100644 audio/sfx/cry1d_1.asm delete mode 100644 audio/sfx/cry1d_2.asm delete mode 100644 audio/sfx/cry1d_3.asm delete mode 100644 audio/sfx/cry1e_1.asm delete mode 100644 audio/sfx/cry1e_2.asm delete mode 100644 audio/sfx/cry1e_3.asm delete mode 100644 audio/sfx/cry1f_1.asm delete mode 100644 audio/sfx/cry1f_2.asm delete mode 100644 audio/sfx/cry1f_3.asm delete mode 100644 audio/sfx/cry20_1.asm delete mode 100644 audio/sfx/cry20_2.asm delete mode 100644 audio/sfx/cry20_3.asm delete mode 100644 audio/sfx/cry21_1.asm delete mode 100644 audio/sfx/cry21_2.asm delete mode 100644 audio/sfx/cry21_3.asm delete mode 100644 audio/sfx/cry22_1.asm delete mode 100644 audio/sfx/cry22_2.asm delete mode 100644 audio/sfx/cry22_3.asm delete mode 100644 audio/sfx/cry23_1.asm delete mode 100644 audio/sfx/cry23_2.asm delete mode 100644 audio/sfx/cry23_3.asm delete mode 100644 audio/sfx/cry24_1.asm delete mode 100644 audio/sfx/cry24_2.asm delete mode 100644 audio/sfx/cry24_3.asm delete mode 100644 audio/sfx/cry25_1.asm delete mode 100644 audio/sfx/cry25_2.asm delete mode 100644 audio/sfx/cry25_3.asm delete mode 100644 audio/sfx/cut_3.asm delete mode 100644 audio/sfx/cymbal1_1.asm delete mode 100644 audio/sfx/cymbal1_2.asm delete mode 100644 audio/sfx/cymbal1_3.asm delete mode 100644 audio/sfx/cymbal2_1.asm delete mode 100644 audio/sfx/cymbal2_2.asm delete mode 100644 audio/sfx/cymbal2_3.asm delete mode 100644 audio/sfx/cymbal3_1.asm delete mode 100644 audio/sfx/cymbal3_2.asm delete mode 100644 audio/sfx/cymbal3_3.asm delete mode 100644 audio/sfx/denied_3.asm delete mode 100644 audio/sfx/enter_pc_3.asm delete mode 100644 audio/sfx/fly_3.asm delete mode 100644 audio/sfx/get_item1_3.asm delete mode 100644 audio/sfx/get_item2_2.asm delete mode 100644 audio/sfx/get_item2_3.asm delete mode 100644 audio/sfx/get_key_item_3.asm delete mode 100644 audio/sfx/go_inside_3.asm delete mode 100644 audio/sfx/go_outside_3.asm delete mode 100644 audio/sfx/heal_ailment_2.asm delete mode 100644 audio/sfx/heal_ailment_3.asm delete mode 100644 audio/sfx/heal_hp_2.asm delete mode 100644 audio/sfx/heal_hp_3.asm delete mode 100644 audio/sfx/healing_machine_3.asm delete mode 100644 audio/sfx/ledge_3.asm delete mode 100644 audio/sfx/muted_snare1_1.asm delete mode 100644 audio/sfx/muted_snare1_2.asm delete mode 100644 audio/sfx/muted_snare1_3.asm delete mode 100644 audio/sfx/muted_snare2_1.asm delete mode 100644 audio/sfx/muted_snare2_2.asm delete mode 100644 audio/sfx/muted_snare2_3.asm delete mode 100644 audio/sfx/muted_snare3_1.asm delete mode 100644 audio/sfx/muted_snare3_2.asm delete mode 100644 audio/sfx/muted_snare3_3.asm delete mode 100644 audio/sfx/muted_snare4_1.asm delete mode 100644 audio/sfx/muted_snare4_2.asm delete mode 100644 audio/sfx/muted_snare4_3.asm delete mode 100644 audio/sfx/poisoned_3.asm delete mode 100644 audio/sfx/pokedex_rating_3.asm delete mode 100644 audio/sfx/press_ab_2.asm delete mode 100644 audio/sfx/press_ab_3.asm delete mode 100644 audio/sfx/purchase_3.asm delete mode 100644 audio/sfx/push_boulder_3.asm delete mode 100644 audio/sfx/save_3.asm delete mode 100644 audio/sfx/shrink_3.asm delete mode 100644 audio/sfx/snare1_1.asm delete mode 100644 audio/sfx/snare1_2.asm delete mode 100644 audio/sfx/snare1_3.asm delete mode 100644 audio/sfx/snare2_1.asm delete mode 100644 audio/sfx/snare2_2.asm delete mode 100644 audio/sfx/snare2_3.asm delete mode 100644 audio/sfx/snare3_1.asm delete mode 100644 audio/sfx/snare3_2.asm delete mode 100644 audio/sfx/snare3_3.asm delete mode 100644 audio/sfx/snare4_1.asm delete mode 100644 audio/sfx/snare4_2.asm delete mode 100644 audio/sfx/snare4_3.asm delete mode 100644 audio/sfx/snare5_1.asm delete mode 100644 audio/sfx/snare5_2.asm delete mode 100644 audio/sfx/snare5_3.asm delete mode 100644 audio/sfx/snare6_1.asm delete mode 100644 audio/sfx/snare6_2.asm delete mode 100644 audio/sfx/snare6_3.asm delete mode 100644 audio/sfx/snare7_1.asm delete mode 100644 audio/sfx/snare7_2.asm delete mode 100644 audio/sfx/snare7_3.asm delete mode 100644 audio/sfx/snare8_1.asm delete mode 100644 audio/sfx/snare8_2.asm delete mode 100644 audio/sfx/snare8_3.asm delete mode 100644 audio/sfx/snare9_1.asm delete mode 100644 audio/sfx/snare9_2.asm delete mode 100644 audio/sfx/snare9_3.asm delete mode 100644 audio/sfx/ss_anne_horn_3.asm delete mode 100644 audio/sfx/start_menu_2.asm delete mode 100644 audio/sfx/start_menu_3.asm delete mode 100644 audio/sfx/swap_3.asm delete mode 100644 audio/sfx/switch_3.asm delete mode 100644 audio/sfx/teleport_enter1_3.asm delete mode 100644 audio/sfx/teleport_enter2_3.asm delete mode 100644 audio/sfx/teleport_exit1_3.asm delete mode 100644 audio/sfx/teleport_exit2_3.asm delete mode 100644 audio/sfx/tink_2.asm delete mode 100644 audio/sfx/tink_3.asm delete mode 100644 audio/sfx/trade_machine_3.asm delete mode 100644 audio/sfx/triangle1_1.asm delete mode 100644 audio/sfx/triangle1_2.asm delete mode 100644 audio/sfx/triangle1_3.asm delete mode 100644 audio/sfx/triangle2_1.asm delete mode 100644 audio/sfx/triangle2_2.asm delete mode 100644 audio/sfx/triangle2_3.asm delete mode 100644 audio/sfx/triangle3_1.asm delete mode 100644 audio/sfx/triangle3_2.asm delete mode 100644 audio/sfx/triangle3_3.asm delete mode 100644 audio/sfx/turn_off_pc_3.asm delete mode 100644 audio/sfx/turn_on_pc_3.asm delete mode 100755 audio/sfx/unused_2.asm delete mode 100755 audio/sfx/unused_3.asm delete mode 100644 audio/sfx/withdraw_deposit_3.asm create mode 100644 crysaudio/cries.asm create mode 100644 crysaudio/cry_headers.asm create mode 100644 crysaudio/cry_pointers.asm create mode 100644 crysaudio/engine.asm create mode 100644 crysaudio/music/DPPt/EternaForest.asm create mode 100644 crysaudio/music/DPPt/WinPokeSinnoh.asm create mode 100644 crysaudio/music/DPPt/WinTrainerSinnoh.asm create mode 100644 crysaudio/music/DPPt/frontierbrain.asm create mode 100644 crysaudio/music/DPPt/jubilifecity.asm create mode 100644 crysaudio/music/DPPt/pokeradar.asm create mode 100644 crysaudio/music/DPPt/route201.asm create mode 100644 crysaudio/music/DPPt/route203.asm create mode 100644 crysaudio/music/DPPt/route205.asm create mode 100644 crysaudio/music/DPPt/route206.asm create mode 100644 crysaudio/music/DPPt/sinnohtrainer.asm create mode 100644 crysaudio/music/DPPt/sinnohwild.asm create mode 100644 crysaudio/music/RBY/bikeriding.asm create mode 100644 crysaudio/music/RBY/celadon.asm create mode 100644 crysaudio/music/RBY/cinnabar.asm create mode 100644 crysaudio/music/RBY/cinnabarmansion.asm create mode 100644 crysaudio/music/RBY/cities1.asm create mode 100644 crysaudio/music/RBY/cities2.asm create mode 100644 crysaudio/music/RBY/credits.asm create mode 100644 crysaudio/music/RBY/defeatedgymleader.asm create mode 100644 crysaudio/music/RBY/defeatedtrainer.asm create mode 100644 crysaudio/music/RBY/defeatedwildmon.asm create mode 100644 crysaudio/music/RBY/dungeon1.asm create mode 100644 crysaudio/music/RBY/dungeon2.asm create mode 100644 crysaudio/music/RBY/dungeon3.asm create mode 100644 crysaudio/music/RBY/finalbattle.asm create mode 100644 crysaudio/music/RBY/gamecorner.asm create mode 100644 crysaudio/music/RBY/gym.asm create mode 100644 crysaudio/music/RBY/gymleaderbattle.asm create mode 100644 crysaudio/music/RBY/halloffame.asm create mode 100644 crysaudio/music/RBY/indigoplateau.asm create mode 100644 crysaudio/music/RBY/introbattle.asm create mode 100644 crysaudio/music/RBY/jigglypuffsong.asm create mode 100644 crysaudio/music/RBY/lavender.asm create mode 100644 crysaudio/music/RBY/meeteviltrainer.asm create mode 100644 crysaudio/music/RBY/meetfemaletrainer.asm create mode 100644 crysaudio/music/RBY/meetjessiejames.asm create mode 100644 crysaudio/music/RBY/meetmaletrainer.asm create mode 100644 crysaudio/music/RBY/meetprofoak.asm create mode 100644 crysaudio/music/RBY/meetrival.asm create mode 100644 crysaudio/music/RBY/museumguy.asm create mode 100644 crysaudio/music/RBY/oakslab.asm create mode 100644 crysaudio/music/RBY/pallettown.asm create mode 100644 crysaudio/music/RBY/pkmnhealed.asm create mode 100644 crysaudio/music/RBY/pokecenter.asm create mode 100644 crysaudio/music/RBY/pokemontower.asm create mode 100644 crysaudio/music/RBY/routes1.asm create mode 100644 crysaudio/music/RBY/routes2.asm create mode 100644 crysaudio/music/RBY/routes3.asm create mode 100644 crysaudio/music/RBY/routes4.asm create mode 100644 crysaudio/music/RBY/safarizone.asm create mode 100644 crysaudio/music/RBY/silphco.asm create mode 100644 crysaudio/music/RBY/ssanne.asm create mode 100644 crysaudio/music/RBY/surfing.asm create mode 100644 crysaudio/music/RBY/surfingpikachu.asm create mode 100644 crysaudio/music/RBY/titlescreen.asm create mode 100644 crysaudio/music/RBY/trainerbattle.asm create mode 100644 crysaudio/music/RBY/unusedsong.asm create mode 100644 crysaudio/music/RBY/vermilion.asm create mode 100644 crysaudio/music/RBY/wildbattle.asm create mode 100644 crysaudio/music/RBY/yellowintro.asm create mode 100644 crysaudio/music/RBY/yellowunusedsong.asm create mode 100644 crysaudio/music/RSE/frontierbrain.asm create mode 100644 crysaudio/music/TCG/battletheme1.asm create mode 100644 crysaudio/music/TCG/boosterpack.asm create mode 100644 crysaudio/music/TCG/cardpop.asm create mode 100644 crysaudio/music/TCG/challengehall.asm create mode 100644 crysaudio/music/TCG/club1.asm create mode 100644 crysaudio/music/TCG/club2.asm create mode 100644 crysaudio/music/TCG/club3.asm create mode 100644 crysaudio/music/TCG/credits.asm create mode 100644 crysaudio/music/TCG/darkdiddly.asm create mode 100644 crysaudio/music/TCG/deckmachine.asm create mode 100644 crysaudio/music/TCG/dueltheme1.asm create mode 100644 crysaudio/music/TCG/dueltheme2.asm create mode 100644 crysaudio/music/TCG/dueltheme3.asm create mode 100644 crysaudio/music/TCG/hallofhonor.asm create mode 100644 crysaudio/music/TCG/imakuni.asm create mode 100644 crysaudio/music/TCG/matchloss.asm create mode 100644 crysaudio/music/TCG/matchstart1.asm create mode 100644 crysaudio/music/TCG/matchstart2.asm create mode 100644 crysaudio/music/TCG/matchstart3.asm create mode 100644 crysaudio/music/TCG/matchvictory.asm create mode 100644 crysaudio/music/TCG/medal.asm create mode 100644 crysaudio/music/TCG/overworld.asm create mode 100644 crysaudio/music/TCG/pausemenu.asm create mode 100644 crysaudio/music/TCG/pcmainmenu.asm create mode 100644 crysaudio/music/TCG/pokemondome.asm create mode 100644 crysaudio/music/TCG/ronald.asm create mode 100644 crysaudio/music/TCG/titlescreen.asm create mode 100644 crysaudio/music/TCG2/credits.asm create mode 100644 crysaudio/music/TCG2/diddly1.asm create mode 100644 crysaudio/music/TCG2/diddly2.asm create mode 100644 crysaudio/music/TCG2/diddly3.asm create mode 100644 crysaudio/music/TCG2/diddly4.asm create mode 100644 crysaudio/music/TCG2/diddly5.asm create mode 100644 crysaudio/music/TCG2/diddly6.asm create mode 100644 crysaudio/music/TCG2/fort1.asm create mode 100644 crysaudio/music/TCG2/fort2.asm create mode 100644 crysaudio/music/TCG2/fort3.asm create mode 100644 crysaudio/music/TCG2/fort4.asm create mode 100644 crysaudio/music/TCG2/gamecorner.asm create mode 100644 crysaudio/music/TCG2/grblimp.asm create mode 100644 crysaudio/music/TCG2/grcastle.asm create mode 100644 crysaudio/music/TCG2/grchallengecup.asm create mode 100644 crysaudio/music/TCG2/grdueltheme1.asm create mode 100644 crysaudio/music/TCG2/grdueltheme2.asm create mode 100644 crysaudio/music/TCG2/grdueltheme3.asm create mode 100644 crysaudio/music/TCG2/groverworld.asm create mode 100644 crysaudio/music/TCG2/herecomesgr.asm create mode 100644 crysaudio/music/TCG2/imakuni2.asm create mode 100644 crysaudio/music/TCG2/ishihara.asm create mode 100644 crysaudio/music/TCG2/titlescreen.asm create mode 100644 crysaudio/music/aftertherivalfight.asm create mode 100644 crysaudio/music/azaleatown.asm create mode 100644 crysaudio/music/battletowerlobby.asm create mode 100644 crysaudio/music/battletowertheme.asm create mode 100644 crysaudio/music/bicycle.asm create mode 100644 crysaudio/music/buenaspassword.asm create mode 100644 crysaudio/music/bugcatchingcontest.asm create mode 100644 crysaudio/music/burnedtower.asm create mode 100644 crysaudio/music/celadoncity.asm create mode 100644 crysaudio/music/championbattle.asm create mode 100644 crysaudio/music/cherrygrovecity.asm create mode 100644 crysaudio/music/clair.asm create mode 100644 crysaudio/music/contestresults.asm create mode 100644 crysaudio/music/credits.asm create mode 100644 crysaudio/music/crystalopening.asm create mode 100644 crysaudio/music/custom/ceruleanGSC.asm create mode 100644 crysaudio/music/custom/cinnabarGSC.asm create mode 100644 crysaudio/music/custom/cinnabarremix.asm create mode 100644 crysaudio/music/custom/johtoGSC.asm create mode 100644 crysaudio/music/custom/kantogymleaderremix.asm create mode 100644 crysaudio/music/custom/naljogymbattle.asm create mode 100644 crysaudio/music/custom/naljowildbattle.asm create mode 100644 crysaudio/music/custom/nuggetbridge.asm create mode 100644 crysaudio/music/custom/palletbattle.asm create mode 100644 crysaudio/music/custom/pokeathelonfinal.asm create mode 100644 crysaudio/music/custom/shop.asm create mode 100644 crysaudio/music/custom/sinnohtrainer.asm create mode 100644 crysaudio/music/dancinghall.asm create mode 100644 crysaudio/music/darkcave.asm create mode 100644 crysaudio/music/dragonsden.asm create mode 100644 crysaudio/music/ecruteakcity.asm create mode 100644 crysaudio/music/elmslab.asm create mode 100644 crysaudio/music/evolution.asm create mode 100644 crysaudio/music/gamecorner.asm create mode 100644 crysaudio/music/goldenrodcity.asm create mode 100644 crysaudio/music/goldsilveropening.asm create mode 100644 crysaudio/music/goldsilveropening2.asm create mode 100644 crysaudio/music/gym.asm create mode 100644 crysaudio/music/gymleadervictory.asm create mode 100644 crysaudio/music/halloffame.asm create mode 100644 crysaudio/music/healpokemon.asm create mode 100644 crysaudio/music/indigoplateau.asm create mode 100644 crysaudio/music/johtogymbattle.asm create mode 100644 crysaudio/music/johtotrainerbattle.asm create mode 100644 crysaudio/music/johtowildbattle.asm create mode 100644 crysaudio/music/johtowildbattlenight.asm create mode 100644 crysaudio/music/kantogymbattle.asm create mode 100644 crysaudio/music/kantotrainerbattle.asm create mode 100644 crysaudio/music/kantowildbattle.asm create mode 100644 crysaudio/music/lakeofrage.asm create mode 100644 crysaudio/music/lakeofragerocketradio.asm create mode 100644 crysaudio/music/lavendertown.asm create mode 100644 crysaudio/music/lighthouse.asm create mode 100644 crysaudio/music/lookbeauty.asm create mode 100644 crysaudio/music/lookhiker.asm create mode 100644 crysaudio/music/lookkimonogirl.asm create mode 100644 crysaudio/music/looklass.asm create mode 100644 crysaudio/music/lookmysticalman.asm create mode 100644 crysaudio/music/lookofficer.asm create mode 100644 crysaudio/music/lookpokemaniac.asm create mode 100644 crysaudio/music/lookrival.asm create mode 100644 crysaudio/music/lookrocket.asm create mode 100644 crysaudio/music/looksage.asm create mode 100644 crysaudio/music/lookyoungster.asm create mode 100644 crysaudio/music/magnettrain.asm create mode 100644 crysaudio/music/mainmenu.asm create mode 100644 crysaudio/music/mobileadapter.asm create mode 100644 crysaudio/music/mobileadaptermenu.asm create mode 100644 crysaudio/music/mobilecenter.asm create mode 100644 crysaudio/music/mom.asm create mode 100644 crysaudio/music/mtmoon.asm create mode 100644 crysaudio/music/mtmoonsquare.asm create mode 100644 crysaudio/music/music_labels.txt create mode 100644 crysaudio/music/nationalpark.asm create mode 100644 crysaudio/music/newbarktown.asm create mode 100644 crysaudio/music/nothing.asm create mode 100644 crysaudio/music/pallettown.asm create mode 100644 crysaudio/music/pinball/bluefield.asm create mode 100644 crysaudio/music/pinball/catchem_blue.asm create mode 100644 crysaudio/music/pinball/catchem_red.asm create mode 100644 crysaudio/music/pinball/diglettstage_digletts.asm create mode 100644 crysaudio/music/pinball/diglettstage_dugtrio.asm create mode 100644 crysaudio/music/pinball/endcredits.asm create mode 100644 crysaudio/music/pinball/fieldselect.asm create mode 100644 crysaudio/music/pinball/gameover.asm create mode 100644 crysaudio/music/pinball/gengarstage_gastly.asm create mode 100644 crysaudio/music/pinball/gengarstage_hauntergengar.asm create mode 100644 crysaudio/music/pinball/hiscorescreen.asm create mode 100644 crysaudio/music/pinball/hurryup_blue.asm create mode 100644 crysaudio/music/pinball/hurryup_red.asm create mode 100644 crysaudio/music/pinball/meowthstage.asm create mode 100644 crysaudio/music/pinball/mewtwostage.asm create mode 100644 crysaudio/music/pinball/nameentry.asm create mode 100644 crysaudio/music/pinball/options.asm create mode 100644 crysaudio/music/pinball/pokedex.asm create mode 100644 crysaudio/music/pinball/redfield.asm create mode 100644 crysaudio/music/pinball/seelstage.asm create mode 100644 crysaudio/music/pinball/titlescreen.asm create mode 100644 crysaudio/music/pokeflutechannel.asm create mode 100644 crysaudio/music/pokemoncenter.asm create mode 100644 crysaudio/music/pokemonchannel.asm create mode 100644 crysaudio/music/pokemonlullaby.asm create mode 100644 crysaudio/music/pokemonmarch.asm create mode 100644 crysaudio/music/postcredits.asm create mode 100644 crysaudio/music/printer.asm create mode 100644 crysaudio/music/profoak.asm create mode 100644 crysaudio/music/profoakspokemontalk.asm create mode 100644 crysaudio/music/rivalbattle.asm create mode 100644 crysaudio/music/rocketbattle.asm create mode 100644 crysaudio/music/rockethideout.asm create mode 100644 crysaudio/music/rockettheme.asm create mode 100644 crysaudio/music/route1.asm create mode 100644 crysaudio/music/route12.asm create mode 100644 crysaudio/music/route2.asm create mode 100644 crysaudio/music/route26.asm create mode 100644 crysaudio/music/route29.asm create mode 100644 crysaudio/music/route3.asm create mode 100644 crysaudio/music/route30.asm create mode 100644 crysaudio/music/route36.asm create mode 100644 crysaudio/music/route37.asm create mode 100644 crysaudio/music/ruinsofalphinterior.asm create mode 100644 crysaudio/music/ruinsofalphradio.asm create mode 100644 crysaudio/music/showmearound.asm create mode 100644 crysaudio/music/sprouttower.asm create mode 100644 crysaudio/music/ssaqua.asm create mode 100644 crysaudio/music/successfulcapture.asm create mode 100644 crysaudio/music/suicunebattle.asm create mode 100644 crysaudio/music/surf.asm create mode 100644 crysaudio/music/tintower.asm create mode 100644 crysaudio/music/titlescreen.asm create mode 100644 crysaudio/music/trainervictory.asm create mode 100644 crysaudio/music/unioncave.asm create mode 100644 crysaudio/music/vermilioncity.asm create mode 100644 crysaudio/music/victoryroad.asm create mode 100644 crysaudio/music/violetcity.asm create mode 100644 crysaudio/music/viridiancity.asm create mode 100644 crysaudio/music/wildpokemonvictory.asm create mode 100644 crysaudio/music_pointers.asm create mode 100644 crysaudio/music_pointers2.asm create mode 100644 crysaudio/music_pointers_music_test.asm create mode 100644 crysaudio/rbsfx.asm create mode 100644 crysaudio/red_pointers.asm create mode 100644 crysaudio/sfx.asm create mode 100644 crysaudio/sfx_crystal.asm create mode 100644 crysaudio/sfx_pointers.asm create mode 100644 crysaudio/trainer_encounters.asm create mode 100644 crysmacros.asm diff --git a/audio.asm b/audio.asm index 0a344ae7..b9b499fd 100644 --- a/audio.asm +++ b/audio.asm @@ -4,6 +4,156 @@ AUDIO_2 EQU $8 AUDIO_3 EQU $1f INCLUDE "constants.asm" +INCLUDE "crysmacros.asm" + +; crystal.py macros: +octave: MACRO + db $d8 - (\1) + ENDM + +notetype: MACRO + db $d8, \1 +IF _NARG==2 + db \2 +ENDC + ENDM +forceoctave: MACRO + db $d9, \1 + ENDM +tempo: MACRO + db $da + bigdw \1 + ENDM +dutycycle: MACRO + db $db, \1 + ENDM +intensity: MACRO + db $dc, \1 + ENDM +soundinput: MACRO + db $dd, \1 + ENDM +unknownmusic0xde: MACRO + db $de, \1 + ENDM +togglesfx: MACRO + db $df + ENDM +unknownmusic0xe0: MACRO + db $e0, \1, \2 + ENDM +vibrato: MACRO + db $e1, \1, \2 + ENDM +unknownmusic0xe2: MACRO + db $e2, \1 + ENDM +togglenoise: MACRO + db $e3, \1 + ENDM +panning: MACRO + db $e4, \1 + ENDM +volume: MACRO + db $e5, \1 + ENDM +tone: MACRO + db $e6 + bigdw \1 + ENDM +unknownmusic0xe7: MACRO + db $e7, \1 + ENDM +unknownmusic0xe8: MACRO + db $e8, \1 + ENDM +globaltempo: MACRO + db $e9 + bigdw \1 + ENDM +restartchannel: MACRO + dbw $ea, \1 + ENDM +newsong: MACRO + db $eb + bigdw \1 + ENDM +sfxpriorityon: MACRO + db $ec + ENDM +sfxpriorityoff: MACRO + db $ed + ENDM +unknownmusic0xee: MACRO + dbw $ee, \1 + ENDM +stereopanning: MACRO + db $ef, \1 + ENDM +sfxtogglenoise: MACRO + db $f0, \1 + ENDM +ftempo: MACRO + db $f1 + bigdw \1 + ENDM +fdutycycle: MACRO + db $f2, \1 + ENDM +music0xf3: MACRO + db $f3 + ENDM +incoctave: MACRO + db $f4 + ENDM +decoctave: MACRO + db $f5 + ENDM +music0xf6: MACRO + db $f6 + ENDM +music0xf7: MACRO + db $f7 + ENDM +music0xf8: MACRO + db $f8 + ENDM +unknownmusic0xf9: MACRO + db $f9, \1 + ENDM +setcondition: MACRO + db $fa, \1 + ENDM +jumpif: MACRO + db $fb, \1 + dw \2 + ENDM +jumpchannel: MACRO + dbw $fc, \1 + ENDM +loopchannel: MACRO + db $fd, \1 + dw \2 + ENDM +callchannel: MACRO + dbw $fe, \1 + ENDM +endchannel: MACRO + db $ff + ENDM + + +sound: MACRO + db \1, \2 + dw \3 + ENDM + +noise: MACRO + db \1, \2, \3 + ENDM + +toggleperfectpitch: MACRO ; XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX + ENDM SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1] @@ -15,58 +165,19 @@ INCLUDE "audio/headers/sfxheaders2.asm" SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3] INCLUDE "audio/headers/sfxheaders3.asm" - - -SECTION "Music Headers 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/headers/musicheaders1.asm" - -SECTION "Music Headers 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/headers/musicheaders2.asm" - -SECTION "Music Headers 3", ROMX, BANK[AUDIO_3] -INCLUDE "audio/headers/musicheaders3.asm" - - - SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/sfx/snare1_1.asm" -INCLUDE "audio/sfx/snare2_1.asm" -INCLUDE "audio/sfx/snare3_1.asm" -INCLUDE "audio/sfx/snare4_1.asm" -INCLUDE "audio/sfx/snare5_1.asm" -INCLUDE "audio/sfx/triangle1_1.asm" -INCLUDE "audio/sfx/triangle2_1.asm" -INCLUDE "audio/sfx/snare6_1.asm" -INCLUDE "audio/sfx/snare7_1.asm" -INCLUDE "audio/sfx/snare8_1.asm" -INCLUDE "audio/sfx/snare9_1.asm" -INCLUDE "audio/sfx/cymbal1_1.asm" -INCLUDE "audio/sfx/cymbal2_1.asm" -INCLUDE "audio/sfx/cymbal3_1.asm" -INCLUDE "audio/sfx/muted_snare1_1.asm" -INCLUDE "audio/sfx/triangle3_1.asm" -INCLUDE "audio/sfx/muted_snare2_1.asm" -INCLUDE "audio/sfx/muted_snare3_1.asm" -INCLUDE "audio/sfx/muted_snare4_1.asm" - -Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm" - -INCLUDE "audio/sfx/start_menu_1.asm" -INCLUDE "audio/sfx/pokeflute.asm" -INCLUDE "audio/sfx/cut_1.asm" -INCLUDE "audio/sfx/go_inside_1.asm" -INCLUDE "audio/sfx/swap_1.asm" +SFX_02: +INCLUDE "audio/sfx/get_item1_1.asm" +INCLUDE "audio/sfx/get_item2_1.asm" INCLUDE "audio/sfx/tink_1.asm" -INCLUDE "audio/sfx/59_1.asm" -INCLUDE "audio/sfx/purchase_1.asm" -INCLUDE "audio/sfx/collision_1.asm" -INCLUDE "audio/sfx/go_outside_1.asm" -INCLUDE "audio/sfx/press_ab_1.asm" -INCLUDE "audio/sfx/save_1.asm" INCLUDE "audio/sfx/heal_hp_1.asm" -INCLUDE "audio/sfx/poisoned_1.asm" INCLUDE "audio/sfx/heal_ailment_1.asm" +INCLUDE "audio/sfx/start_menu_1.asm" +INCLUDE "audio/sfx/press_ab_1.asm" +INCLUDE "audio/sfx/pokedex_rating_1.asm" +INCLUDE "audio/sfx/get_key_item_1.asm" +INCLUDE "audio/sfx/poisoned_1.asm" INCLUDE "audio/sfx/trade_machine_1.asm" INCLUDE "audio/sfx/turn_on_pc_1.asm" INCLUDE "audio/sfx/turn_off_pc_1.asm" @@ -85,84 +196,27 @@ INCLUDE "audio/sfx/arrow_tiles_1.asm" INCLUDE "audio/sfx/push_boulder_1.asm" INCLUDE "audio/sfx/ss_anne_horn_1.asm" INCLUDE "audio/sfx/withdraw_deposit_1.asm" +INCLUDE "audio/sfx/cut_1.asm" +INCLUDE "audio/sfx/go_inside_1.asm" +INCLUDE "audio/sfx/swap_1.asm" +INCLUDE "audio/sfx/59_1.asm" +INCLUDE "audio/sfx/purchase_1.asm" +INCLUDE "audio/sfx/collision_1.asm" +INCLUDE "audio/sfx/go_outside_1.asm" +INCLUDE "audio/sfx/save_1.asm" +INCLUDE "audio/sfx/pokeflute.asm" INCLUDE "audio/sfx/safari_zone_pa.asm" -INCLUDE "audio/sfx/unused_1.asm" -INCLUDE "audio/sfx/cry09_1.asm" -INCLUDE "audio/sfx/cry23_1.asm" -INCLUDE "audio/sfx/cry24_1.asm" -INCLUDE "audio/sfx/cry11_1.asm" -INCLUDE "audio/sfx/cry25_1.asm" -INCLUDE "audio/sfx/cry03_1.asm" -INCLUDE "audio/sfx/cry0f_1.asm" -INCLUDE "audio/sfx/cry10_1.asm" -INCLUDE "audio/sfx/cry00_1.asm" -INCLUDE "audio/sfx/cry0e_1.asm" -INCLUDE "audio/sfx/cry06_1.asm" -INCLUDE "audio/sfx/cry07_1.asm" -INCLUDE "audio/sfx/cry05_1.asm" -INCLUDE "audio/sfx/cry0b_1.asm" -INCLUDE "audio/sfx/cry0c_1.asm" -INCLUDE "audio/sfx/cry02_1.asm" -INCLUDE "audio/sfx/cry0d_1.asm" -INCLUDE "audio/sfx/cry01_1.asm" -INCLUDE "audio/sfx/cry0a_1.asm" -INCLUDE "audio/sfx/cry08_1.asm" -INCLUDE "audio/sfx/cry04_1.asm" -INCLUDE "audio/sfx/cry19_1.asm" -INCLUDE "audio/sfx/cry16_1.asm" -INCLUDE "audio/sfx/cry1b_1.asm" -INCLUDE "audio/sfx/cry12_1.asm" -INCLUDE "audio/sfx/cry13_1.asm" -INCLUDE "audio/sfx/cry14_1.asm" -INCLUDE "audio/sfx/cry1e_1.asm" -INCLUDE "audio/sfx/cry15_1.asm" -INCLUDE "audio/sfx/cry17_1.asm" -INCLUDE "audio/sfx/cry1c_1.asm" -INCLUDE "audio/sfx/cry1a_1.asm" -INCLUDE "audio/sfx/cry1d_1.asm" -INCLUDE "audio/sfx/cry18_1.asm" -INCLUDE "audio/sfx/cry1f_1.asm" -INCLUDE "audio/sfx/cry20_1.asm" -INCLUDE "audio/sfx/cry21_1.asm" -INCLUDE "audio/sfx/cry22_1.asm" - SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2] -INCLUDE "audio/sfx/snare1_2.asm" -INCLUDE "audio/sfx/snare2_2.asm" -INCLUDE "audio/sfx/snare3_2.asm" -INCLUDE "audio/sfx/snare4_2.asm" -INCLUDE "audio/sfx/snare5_2.asm" -INCLUDE "audio/sfx/triangle1_2.asm" -INCLUDE "audio/sfx/triangle2_2.asm" -INCLUDE "audio/sfx/snare6_2.asm" -INCLUDE "audio/sfx/snare7_2.asm" -INCLUDE "audio/sfx/snare8_2.asm" -INCLUDE "audio/sfx/snare9_2.asm" -INCLUDE "audio/sfx/cymbal1_2.asm" -INCLUDE "audio/sfx/cymbal2_2.asm" -INCLUDE "audio/sfx/cymbal3_2.asm" -INCLUDE "audio/sfx/muted_snare1_2.asm" -INCLUDE "audio/sfx/triangle3_2.asm" -INCLUDE "audio/sfx/muted_snare2_2.asm" -INCLUDE "audio/sfx/muted_snare3_2.asm" -INCLUDE "audio/sfx/muted_snare4_2.asm" - -Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm" - -INCLUDE "audio/sfx/press_ab_2.asm" -INCLUDE "audio/sfx/start_menu_2.asm" -INCLUDE "audio/sfx/tink_2.asm" -INCLUDE "audio/sfx/heal_hp_2.asm" -INCLUDE "audio/sfx/heal_ailment_2.asm" -INCLUDE "audio/sfx/silph_scope.asm" +SFX_08: +INCLUDE "audio/sfx/level_up.asm" INCLUDE "audio/sfx/ball_toss.asm" INCLUDE "audio/sfx/ball_poof.asm" INCLUDE "audio/sfx/faint_thud.asm" INCLUDE "audio/sfx/run.asm" INCLUDE "audio/sfx/dex_page_added.asm" -INCLUDE "audio/sfx/pokeflute_ch6.asm" +INCLUDE "audio/sfx/caught_mon.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -211,103 +265,11 @@ INCLUDE "audio/sfx/battle_33.asm" INCLUDE "audio/sfx/battle_34.asm" INCLUDE "audio/sfx/battle_35.asm" INCLUDE "audio/sfx/battle_36.asm" -INCLUDE "audio/sfx/unused_2.asm" -INCLUDE "audio/sfx/cry09_2.asm" -INCLUDE "audio/sfx/cry23_2.asm" -INCLUDE "audio/sfx/cry24_2.asm" -INCLUDE "audio/sfx/cry11_2.asm" -INCLUDE "audio/sfx/cry25_2.asm" -INCLUDE "audio/sfx/cry03_2.asm" -INCLUDE "audio/sfx/cry0f_2.asm" -INCLUDE "audio/sfx/cry10_2.asm" -INCLUDE "audio/sfx/cry00_2.asm" -INCLUDE "audio/sfx/cry0e_2.asm" -INCLUDE "audio/sfx/cry06_2.asm" -INCLUDE "audio/sfx/cry07_2.asm" -INCLUDE "audio/sfx/cry05_2.asm" -INCLUDE "audio/sfx/cry0b_2.asm" -INCLUDE "audio/sfx/cry0c_2.asm" -INCLUDE "audio/sfx/cry02_2.asm" -INCLUDE "audio/sfx/cry0d_2.asm" -INCLUDE "audio/sfx/cry01_2.asm" -INCLUDE "audio/sfx/cry0a_2.asm" -INCLUDE "audio/sfx/cry08_2.asm" -INCLUDE "audio/sfx/cry04_2.asm" -INCLUDE "audio/sfx/cry19_2.asm" -INCLUDE "audio/sfx/cry16_2.asm" -INCLUDE "audio/sfx/cry1b_2.asm" -INCLUDE "audio/sfx/cry12_2.asm" -INCLUDE "audio/sfx/cry13_2.asm" -INCLUDE "audio/sfx/cry14_2.asm" -INCLUDE "audio/sfx/cry1e_2.asm" -INCLUDE "audio/sfx/cry15_2.asm" -INCLUDE "audio/sfx/cry17_2.asm" -INCLUDE "audio/sfx/cry1c_2.asm" -INCLUDE "audio/sfx/cry1a_2.asm" -INCLUDE "audio/sfx/cry1d_2.asm" -INCLUDE "audio/sfx/cry18_2.asm" -INCLUDE "audio/sfx/cry1f_2.asm" -INCLUDE "audio/sfx/cry20_2.asm" -INCLUDE "audio/sfx/cry21_2.asm" -INCLUDE "audio/sfx/cry22_2.asm" - +INCLUDE "audio/sfx/silph_scope.asm" SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3] -INCLUDE "audio/sfx/snare1_3.asm" -INCLUDE "audio/sfx/snare2_3.asm" -INCLUDE "audio/sfx/snare3_3.asm" -INCLUDE "audio/sfx/snare4_3.asm" -INCLUDE "audio/sfx/snare5_3.asm" -INCLUDE "audio/sfx/triangle1_3.asm" -INCLUDE "audio/sfx/triangle2_3.asm" -INCLUDE "audio/sfx/snare6_3.asm" -INCLUDE "audio/sfx/snare7_3.asm" -INCLUDE "audio/sfx/snare8_3.asm" -INCLUDE "audio/sfx/snare9_3.asm" -INCLUDE "audio/sfx/cymbal1_3.asm" -INCLUDE "audio/sfx/cymbal2_3.asm" -INCLUDE "audio/sfx/cymbal3_3.asm" -INCLUDE "audio/sfx/muted_snare1_3.asm" -INCLUDE "audio/sfx/triangle3_3.asm" -INCLUDE "audio/sfx/muted_snare2_3.asm" -INCLUDE "audio/sfx/muted_snare3_3.asm" -INCLUDE "audio/sfx/muted_snare4_3.asm" - -Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm" - -INCLUDE "audio/sfx/start_menu_3.asm" -INCLUDE "audio/sfx/cut_3.asm" -INCLUDE "audio/sfx/go_inside_3.asm" -INCLUDE "audio/sfx/swap_3.asm" -INCLUDE "audio/sfx/tink_3.asm" -INCLUDE "audio/sfx/59_3.asm" -INCLUDE "audio/sfx/purchase_3.asm" -INCLUDE "audio/sfx/collision_3.asm" -INCLUDE "audio/sfx/go_outside_3.asm" -INCLUDE "audio/sfx/press_ab_3.asm" -INCLUDE "audio/sfx/save_3.asm" -INCLUDE "audio/sfx/heal_hp_3.asm" -INCLUDE "audio/sfx/poisoned_3.asm" -INCLUDE "audio/sfx/heal_ailment_3.asm" -INCLUDE "audio/sfx/trade_machine_3.asm" -INCLUDE "audio/sfx/turn_on_pc_3.asm" -INCLUDE "audio/sfx/turn_off_pc_3.asm" -INCLUDE "audio/sfx/enter_pc_3.asm" -INCLUDE "audio/sfx/shrink_3.asm" -INCLUDE "audio/sfx/switch_3.asm" -INCLUDE "audio/sfx/healing_machine_3.asm" -INCLUDE "audio/sfx/teleport_exit1_3.asm" -INCLUDE "audio/sfx/teleport_enter1_3.asm" -INCLUDE "audio/sfx/teleport_exit2_3.asm" -INCLUDE "audio/sfx/ledge_3.asm" -INCLUDE "audio/sfx/teleport_enter2_3.asm" -INCLUDE "audio/sfx/fly_3.asm" -INCLUDE "audio/sfx/denied_3.asm" -INCLUDE "audio/sfx/arrow_tiles_3.asm" -INCLUDE "audio/sfx/push_boulder_3.asm" -INCLUDE "audio/sfx/ss_anne_horn_3.asm" -INCLUDE "audio/sfx/withdraw_deposit_3.asm" +SFX_1F: INCLUDE "audio/sfx/intro_lunge.asm" INCLUDE "audio/sfx/intro_hip.asm" INCLUDE "audio/sfx/intro_hop.asm" @@ -318,59 +280,22 @@ INCLUDE "audio/sfx/slots_stop_wheel.asm" INCLUDE "audio/sfx/slots_reward.asm" INCLUDE "audio/sfx/slots_new_spin.asm" INCLUDE "audio/sfx/shooting_star.asm" -INCLUDE "audio/sfx/unused_3.asm" -INCLUDE "audio/sfx/cry09_3.asm" -INCLUDE "audio/sfx/cry23_3.asm" -INCLUDE "audio/sfx/cry24_3.asm" -INCLUDE "audio/sfx/cry11_3.asm" -INCLUDE "audio/sfx/cry25_3.asm" -INCLUDE "audio/sfx/cry03_3.asm" -INCLUDE "audio/sfx/cry0f_3.asm" -INCLUDE "audio/sfx/cry10_3.asm" -INCLUDE "audio/sfx/cry00_3.asm" -INCLUDE "audio/sfx/cry0e_3.asm" -INCLUDE "audio/sfx/cry06_3.asm" -INCLUDE "audio/sfx/cry07_3.asm" -INCLUDE "audio/sfx/cry05_3.asm" -INCLUDE "audio/sfx/cry0b_3.asm" -INCLUDE "audio/sfx/cry0c_3.asm" -INCLUDE "audio/sfx/cry02_3.asm" -INCLUDE "audio/sfx/cry0d_3.asm" -INCLUDE "audio/sfx/cry01_3.asm" -INCLUDE "audio/sfx/cry0a_3.asm" -INCLUDE "audio/sfx/cry08_3.asm" -INCLUDE "audio/sfx/cry04_3.asm" -INCLUDE "audio/sfx/cry19_3.asm" -INCLUDE "audio/sfx/cry16_3.asm" -INCLUDE "audio/sfx/cry1b_3.asm" -INCLUDE "audio/sfx/cry12_3.asm" -INCLUDE "audio/sfx/cry13_3.asm" -INCLUDE "audio/sfx/cry14_3.asm" -INCLUDE "audio/sfx/cry1e_3.asm" -INCLUDE "audio/sfx/cry15_3.asm" -INCLUDE "audio/sfx/cry17_3.asm" -INCLUDE "audio/sfx/cry1c_3.asm" -INCLUDE "audio/sfx/cry1a_3.asm" -INCLUDE "audio/sfx/cry1d_3.asm" -INCLUDE "audio/sfx/cry18_3.asm" -INCLUDE "audio/sfx/cry1f_3.asm" -INCLUDE "audio/sfx/cry20_3.asm" -INCLUDE "audio/sfx/cry21_3.asm" -INCLUDE "audio/sfx/cry22_3.asm" +SECTION "Bill's PC", ROMX +INCLUDE "engine/menu/bills_pc.asm" -SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] - +SECTION "Music Routines", ROMX PlayBattleMusic:: xor a ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a + ld [MusicFade], a dec a ld [wNewSoundID], a - call PlaySound ; stop music + call PlayMusic ; stop music call DelayFrame - ld c, BANK(Music_GymLeaderBattle) + ;ld c, BANK(Music_GymLeaderBattle) ld a, [wGymLeaderNo] and a jr z, .notGymLeaderBattle @@ -397,44 +322,33 @@ PlayBattleMusic:: .playSong jp PlayMusic - -INCLUDE "audio/engine_1.asm" - - +SECTION "Alt Music Routines", ROMX ; an alternate start for MeetRival which has a different first measure Music_RivalAlternateStart:: - ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld hl, wChannelCommandPointers - ld de, Music_MeetRival_branch_b1a2 - call Audio1_OverwriteChannelPointer - ld de, Music_MeetRival_branch_b21d - call Audio1_OverwriteChannelPointer - ld de, Music_MeetRival_branch_b2b5 - -Audio1_OverwriteChannelPointer: - ld a, e - ld [hli], a - ld a, d - ld [hli], a - ret + jp PlayMusic + ;ld hl, wChannelCommandPointers + ;ld de, Music_MeetRival_branch_b1a2 + ;call Audio1_OverwriteChannelPointer + ;ld de, Music_MeetRival_branch_b21d + ;call Audio1_OverwriteChannelPointer + ;ld de, Music_MeetRival_branch_b2b5 ; an alternate tempo for MeetRival which is slightly slower Music_RivalAlternateTempo:: ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL - call PlayMusic - ld hl, wChannelCommandPointers - ld de, Music_MeetRival_branch_b119 - jp Audio1_OverwriteChannelPointer + jp PlayMusic + ;ld hl, wChannelCommandPointers + ;ld de, Music_MeetRival_branch_b119 + ;jp Audio1_OverwriteChannelPointer ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo:: - call Music_RivalAlternateStart - ld hl, wChannelCommandPointers - ld de, Music_MeetRival_branch_b19b - jp Audio1_OverwriteChannelPointer + jp Music_RivalAlternateStart + ;ld hl, wChannelCommandPointers + ;ld de, Music_MeetRival_branch_b19b + ;jp Audio1_OverwriteChannelPointer ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo:: @@ -447,118 +361,12 @@ Music_Cities1AlternateTempo:: call DelayFrames ; wait for the fade-out to finish ld c, BANK(Music_Cities1) ld a, MUSIC_CITIES1 - call PlayMusic - ld hl, wChannelCommandPointers - ld de, Music_Cities1_branch_aa6f - jp Audio1_OverwriteChannelPointer - - -SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2] - -Music_DoLowHealthAlarm:: - ld a, [wLowHealthAlarm] - cp $ff - jr z, .disableAlarm - - bit 7, a ;alarm enabled? - ret z ;nope - - and $7f ;low 7 bits are the timer. - jr nz, .asm_21383 ;if timer > 0, play low tone. - - call .playToneHi - ld a, 30 ;keep this tone for 30 frames. - jr .asm_21395 ;reset the timer. - -.asm_21383 - cp 20 - jr nz, .asm_2138a ;if timer == 20, - call .playToneLo ;actually set the sound registers. - -.asm_2138a - ld a, $86 - ld [wChannelSoundIDs + Ch4], a ;disable sound channel? - ld a, [wLowHealthAlarm] - and $7f ;decrement alarm timer. - dec a - -.asm_21395 - ; reset the timer and enable flag. - set 7, a - ld [wLowHealthAlarm], a - ret - -.disableAlarm - xor a - ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + Ch4], a ;re-enable sound channel? - ld de, .toneDataSilence - jr .playTone - -;update the sound registers to change the frequency. -;the tone set here stays until we change it. -.playToneHi - ld de, .toneDataHi - jr .playTone - -.playToneLo - ld de, .toneDataLo - -;update sound channel 1 to play the alarm, overriding all other sounds. -.playTone - ld hl, rNR10 ;channel 1 sound register - ld c, $5 - xor a - -.copyLoop - ld [hli], a - ld a, [de] - inc de - dec c - jr nz, .copyLoop - ret - -;bytes to write to sound channel 1 registers for health alarm. -;starting at FF11 (FF10 is always zeroed), so these bytes are: -;length, envelope, freq lo, freq hi -.toneDataHi - db $A0,$E2,$50,$87 - -.toneDataLo - db $B0,$E2,$EE,$86 - -;written to stop the alarm -.toneDataSilence - db $00,$00,$00,$80 - - -INCLUDE "engine/menu/bills_pc.asm" - -INCLUDE "audio/engine_2.asm" - - -Music_PokeFluteInBattle:: - ; begin playing the "caught mon" sound effect - ld a, SFX_CAUGHT_MON - call PlaySoundWaitForCurrent - ; then immediately overwrtie the channel pointers - ld hl, wChannelCommandPointers + Ch4 * 2 - ld de, SFX_08_PokeFlute_Ch4 - call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch5 - call Audio2_OverwriteChannelPointer - ld de, SFX_08_PokeFlute_Ch6 - -Audio2_OverwriteChannelPointer: - ld a, e - ld [hli], a - ld a, d - ld [hli], a - ret - - -SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3] + jp PlayMusic + ;ld hl, wChannelCommandPointers + ;ld de, Music_Cities1_branch_aa6f + ;jp Audio1_OverwriteChannelPointer +SECTION "Pokedex Rating SFX Routines", ROMX PlayPokedexRatingSfx:: ld a, [$ffdc] ld c, $0 @@ -581,11 +389,12 @@ PlayPokedexRatingSfx:: add hl, bc ld a, [hli] ld c, [hl] - call PlayMusic + call PlaySound + call WaitForSoundToFinish jp PlayDefaultMusic PokedexRatingSfxPointers: - db SFX_DENIED, BANK(SFX_Denied_3) + db SFX_DENIED, BANK(SFX_Denied_1) db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon) @@ -596,78 +405,355 @@ PokedexRatingSfxPointers: OwnedMonValues: db 10, 40, 60, 90, 120, 150, $ff +; crystal: + +SECTION "Audio Engine 1", ROMX, BANK[AUDIO_1] -INCLUDE "audio/engine_3.asm" + +INCLUDE "crysaudio/engine.asm" + +; What music plays when a trainer notices you +;INCLUDE "crysaudio/trainer_encounters.asm" + +MusicMT: +INCLUDE "crysaudio/music_pointers_music_test.asm" + +Music: +INCLUDE "crysaudio/red_pointers.asm" +;INCLUDE "crysaudio/music_pointers.asm" + +Music2: +INCLUDE "crysaudio/music_pointers2.asm" + + +INCLUDE "crysaudio/music/nothing.asm" + +Cries: +INCLUDE "crysaudio/cry_pointers.asm" + +;SFX: +INCLUDE "crysaudio/rbsfx.asm" + + +SECTION "Songs 1", ROMX + + inc_section "crysaudio/music/route36.asm" + inc_section "crysaudio/music/rivalbattle.asm" + inc_section "crysaudio/music/rocketbattle.asm" + inc_section "crysaudio/music/elmslab.asm" + inc_section "crysaudio/music/darkcave.asm" + inc_section "crysaudio/music/johtogymbattle.asm" + inc_section "crysaudio/music/championbattle.asm" + inc_section "crysaudio/music/ssaqua.asm" + inc_section "crysaudio/music/newbarktown.asm" + inc_section "crysaudio/music/goldenrodcity.asm" + inc_section "crysaudio/music/vermilioncity.asm" + inc_section "crysaudio/music/titlescreen.asm" + inc_section "crysaudio/music/ruinsofalphinterior.asm" + inc_section "crysaudio/music/lookpokemaniac.asm" + inc_section "crysaudio/music/trainervictory.asm" + + +SECTION "Songs 2", ROMX + + inc_section "crysaudio/music/route1.asm" + inc_section "crysaudio/music/route3.asm" + inc_section "crysaudio/music/route12.asm" + inc_section "crysaudio/music/kantogymbattle.asm" + inc_section "crysaudio/music/kantowildbattle.asm" + inc_section "crysaudio/music/pokemoncenter.asm" + inc_section "crysaudio/music/looklass.asm" + inc_section "crysaudio/music/lookofficer.asm" + inc_section "crysaudio/music/route2.asm" + inc_section "crysaudio/music/mtmoon.asm" + inc_section "crysaudio/music/showmearound.asm" + inc_section "crysaudio/music/gamecorner.asm" + inc_section "crysaudio/music/bicycle.asm" + inc_section "crysaudio/music/looksage.asm" + inc_section "crysaudio/music/pokemonchannel.asm" + inc_section "crysaudio/music/lighthouse.asm" + inc_section "crysaudio/music/lakeofrage.asm" + inc_section "crysaudio/music/indigoplateau.asm" + inc_section "crysaudio/music/route37.asm" + inc_section "crysaudio/music/rockethideout.asm" + inc_section "crysaudio/music/dragonsden.asm" + inc_section "crysaudio/music/ruinsofalphradio.asm" + inc_section "crysaudio/music/lookbeauty.asm" + inc_section "crysaudio/music/route26.asm" + inc_section "crysaudio/music/ecruteakcity.asm" + inc_section "crysaudio/music/lakeofragerocketradio.asm" + inc_section "crysaudio/music/magnettrain.asm" + inc_section "crysaudio/music/lavendertown.asm" + inc_section "crysaudio/music/dancinghall.asm" + inc_section "crysaudio/music/contestresults.asm" + inc_section "crysaudio/music/route30.asm" + + +SECTION "Songs 3", ROMX + + inc_section "crysaudio/music/violetcity.asm" + inc_section "crysaudio/music/route29.asm" + inc_section "crysaudio/music/halloffame.asm" + inc_section "crysaudio/music/healpokemon.asm" + inc_section "crysaudio/music/evolution.asm" + inc_section "crysaudio/music/printer.asm" + + +SECTION "Songs 4", ROMX + + inc_section "crysaudio/music/viridiancity.asm" + inc_section "crysaudio/music/celadoncity.asm" + inc_section "crysaudio/music/wildpokemonvictory.asm" + inc_section "crysaudio/music/successfulcapture.asm" + inc_section "crysaudio/music/gymleadervictory.asm" + inc_section "crysaudio/music/mtmoonsquare.asm" + inc_section "crysaudio/music/gym.asm" + inc_section "crysaudio/music/pallettown.asm" + inc_section "crysaudio/music/profoakspokemontalk.asm" + inc_section "crysaudio/music/profoak.asm" +SECTION "Johto Rival", ROMX + INCLUDE "crysaudio/music/lookrival.asm" + INCLUDE "crysaudio/music/aftertherivalfight.asm" + inc_section "crysaudio/music/surf.asm" + inc_section "crysaudio/music/nationalpark.asm" + inc_section "crysaudio/music/azaleatown.asm" + inc_section "crysaudio/music/cherrygrovecity.asm" + inc_section "crysaudio/music/unioncave.asm" +SECTION "Johto Wild Battle", ROMX + INCLUDE "crysaudio/music/johtowildbattle.asm" + INCLUDE "crysaudio/music/johtowildbattlenight.asm" + inc_section "crysaudio/music/johtotrainerbattle.asm" + inc_section "crysaudio/music/lookyoungster.asm" + inc_section "crysaudio/music/tintower.asm" + inc_section "crysaudio/music/sprouttower.asm" + inc_section "crysaudio/music/burnedtower.asm" + inc_section "crysaudio/music/mom.asm" + inc_section "crysaudio/music/victoryroad.asm" + inc_section "crysaudio/music/pokemonlullaby.asm" + inc_section "crysaudio/music/pokemonmarch.asm" + inc_section "crysaudio/music/goldsilveropening.asm" + inc_section "crysaudio/music/goldsilveropening2.asm" + inc_section "crysaudio/music/lookhiker.asm" +SECTION "Johto Rocket Themes", ROMX + INCLUDE "crysaudio/music/lookrocket.asm" + INCLUDE "crysaudio/music/rockettheme.asm" + inc_section "crysaudio/music/mainmenu.asm" + inc_section "crysaudio/music/lookkimonogirl.asm" + inc_section "crysaudio/music/pokeflutechannel.asm" + inc_section "crysaudio/music/bugcatchingcontest.asm" + + +SECTION "Songs 5", ROMX + + inc_section "crysaudio/music/mobileadaptermenu.asm" + inc_section "crysaudio/music/buenaspassword.asm" + inc_section "crysaudio/music/lookmysticalman.asm" + inc_section "crysaudio/music/crystalopening.asm" + inc_section "crysaudio/music/battletowertheme.asm" + inc_section "crysaudio/music/suicunebattle.asm" + inc_section "crysaudio/music/battletowerlobby.asm" + inc_section "crysaudio/music/mobilecenter.asm" + inc_section "crysaudio/music/kantotrainerbattle.asm" + + +SECTION "Extra Songs 1", ROMX + + inc_section "crysaudio/music/credits.asm" + inc_section "crysaudio/music/clair.asm" + inc_section "crysaudio/music/mobileadapter.asm" + +SECTION "Extra Songs 2", ROMX + + inc_section "crysaudio/music/postcredits.asm" + + +SECTION "RBY Songs 1", ROMX + + inc_section "crysaudio/music/RBY/bikeriding.asm" + inc_section "crysaudio/music/RBY/dungeon1.asm" + inc_section "crysaudio/music/RBY/gamecorner.asm" + inc_section "crysaudio/music/RBY/titlescreen.asm" + inc_section "crysaudio/music/RBY/dungeon2.asm" + inc_section "crysaudio/music/RBY/dungeon3.asm" + inc_section "crysaudio/music/RBY/cinnabarmansion.asm" + inc_section "crysaudio/music/RBY/oakslab.asm" + inc_section "crysaudio/music/RBY/pokemontower.asm" + inc_section "crysaudio/music/RBY/silphco.asm" + inc_section "crysaudio/music/RBY/meeteviltrainer.asm" + inc_section "crysaudio/music/RBY/meetfemaletrainer.asm" + inc_section "crysaudio/music/RBY/meetmaletrainer.asm" + inc_section "crysaudio/music/RBY/introbattle.asm" + inc_section "crysaudio/music/RBY/surfing.asm" + inc_section "crysaudio/music/RBY/jigglypuffsong.asm" + inc_section "crysaudio/music/RBY/halloffame.asm" + inc_section "crysaudio/music/RBY/credits.asm" + inc_section "crysaudio/music/RBY/gymleaderbattle.asm" + inc_section "crysaudio/music/RBY/trainerbattle.asm" + inc_section "crysaudio/music/RBY/wildbattle.asm" + inc_section "crysaudio/music/RBY/finalbattle.asm" + +SECTION "RBY Songs 2", ROMX + + inc_section "crysaudio/music/RBY/defeatedtrainer.asm" + inc_section "crysaudio/music/RBY/defeatedwildmon.asm" + inc_section "crysaudio/music/RBY/defeatedgymleader.asm" + inc_section "crysaudio/music/RBY/pkmnhealed.asm" + inc_section "crysaudio/music/RBY/routes1.asm" + inc_section "crysaudio/music/RBY/routes2.asm" + inc_section "crysaudio/music/RBY/routes3.asm" + inc_section "crysaudio/music/RBY/routes4.asm" + inc_section "crysaudio/music/RBY/indigoplateau.asm" + inc_section "crysaudio/music/RBY/pallettown.asm" + inc_section "crysaudio/music/RBY/unusedsong.asm" + inc_section "crysaudio/music/RBY/cities1.asm" + inc_section "crysaudio/music/RBY/museumguy.asm" + inc_section "crysaudio/music/RBY/meetprofoak.asm" + inc_section "crysaudio/music/RBY/meetrival.asm" + inc_section "crysaudio/music/RBY/ssanne.asm" + inc_section "crysaudio/music/RBY/cities2.asm" + inc_section "crysaudio/music/RBY/celadon.asm" + inc_section "crysaudio/music/RBY/cinnabar.asm" + inc_section "crysaudio/music/RBY/vermilion.asm" + inc_section "crysaudio/music/RBY/lavender.asm" + inc_section "crysaudio/music/RBY/safarizone.asm" + inc_section "crysaudio/music/RBY/gym.asm" + inc_section "crysaudio/music/RBY/pokecenter.asm" + inc_section "crysaudio/music/RBY/yellowintro.asm" + inc_section "crysaudio/music/RBY/surfingpikachu.asm" + inc_section "crysaudio/music/RBY/meetjessiejames.asm" + inc_section "crysaudio/music/RBY/yellowunusedsong.asm" + +SECTION "Custom Songs 1", ROMX + + inc_section "crysaudio/music/custom/johtoGSC.asm" + inc_section "crysaudio/music/custom/ceruleanGSC.asm" + inc_section "crysaudio/music/custom/cinnabarGSC.asm" + inc_section "crysaudio/music/custom/nuggetbridge.asm" + inc_section "crysaudio/music/custom/shop.asm" + inc_section "crysaudio/music/custom/pokeathelonfinal.asm" + +SECTION "Custom Songs 2", ROMX + + inc_section "crysaudio/music/custom/naljowildbattle.asm" + inc_section "crysaudio/music/custom/naljogymbattle.asm" + inc_section "crysaudio/music/custom/palletbattle.asm" + inc_section "crysaudio/music/custom/cinnabarremix.asm" + inc_section "crysaudio/music/custom/kantogymleaderremix.asm" + +SECTION "DPPt Songs 1", ROMX + + inc_section "crysaudio/music/DPPt/pokeradar.asm" + inc_section "crysaudio/music/DPPt/sinnohtrainer.asm" + inc_section "crysaudio/music/DPPt/sinnohwild.asm" + inc_section "crysaudio/music/DPPt/WinPokeSinnoh.asm" + inc_section "crysaudio/music/DPPt/WinTrainerSinnoh.asm" + inc_section "crysaudio/music/DPPt/route201.asm" + inc_section "crysaudio/music/DPPt/route203.asm" + inc_section "crysaudio/music/DPPt/route205.asm" + inc_section "crysaudio/music/DPPt/route206.asm" + inc_section "crysaudio/music/DPPt/jubilifecity.asm" + inc_section "crysaudio/music/DPPt/EternaForest.asm" + inc_section "crysaudio/music/DPPt/frontierbrain.asm" + +SECTION "TCG Songs 1", ROMX + inc_section "crysaudio/music/TCG/titlescreen.asm" + inc_section "crysaudio/music/TCG/dueltheme1.asm" + inc_section "crysaudio/music/TCG/dueltheme2.asm" + inc_section "crysaudio/music/TCG/dueltheme3.asm" + inc_section "crysaudio/music/TCG/pausemenu.asm" + inc_section "crysaudio/music/TCG/pcmainmenu.asm" + inc_section "crysaudio/music/TCG/deckmachine.asm" + inc_section "crysaudio/music/TCG/cardpop.asm" + inc_section "crysaudio/music/TCG/overworld.asm" + inc_section "crysaudio/music/TCG/pokemondome.asm" + inc_section "crysaudio/music/TCG/challengehall.asm" + inc_section "crysaudio/music/TCG/club1.asm" + inc_section "crysaudio/music/TCG/club2.asm" + inc_section "crysaudio/music/TCG/club3.asm" + +SECTION "TCG Songs 2", ROMX + inc_section "crysaudio/music/TCG/ronald.asm" + inc_section "crysaudio/music/TCG/imakuni.asm" + inc_section "crysaudio/music/TCG/hallofhonor.asm" + inc_section "crysaudio/music/TCG/credits.asm" + inc_section "crysaudio/music/TCG/matchstart1.asm" + inc_section "crysaudio/music/TCG/matchstart2.asm" + inc_section "crysaudio/music/TCG/matchstart3.asm" + inc_section "crysaudio/music/TCG/matchvictory.asm" + inc_section "crysaudio/music/TCG/matchloss.asm" + inc_section "crysaudio/music/TCG/darkdiddly.asm" + inc_section "crysaudio/music/TCG/boosterpack.asm" + inc_section "crysaudio/music/TCG/medal.asm" + +SECTION "TCG2 Songs 1", ROMX + inc_section "crysaudio/music/TCG2/titlescreen.asm" + inc_section "crysaudio/music/TCG2/herecomesgr.asm" + inc_section "crysaudio/music/TCG2/groverworld.asm" + inc_section "crysaudio/music/TCG2/fort1.asm" + inc_section "crysaudio/music/TCG2/fort2.asm" + inc_section "crysaudio/music/TCG2/fort3.asm" + inc_section "crysaudio/music/TCG2/fort4.asm" + inc_section "crysaudio/music/TCG2/grcastle.asm" + inc_section "crysaudio/music/TCG2/grchallengecup.asm" + +SECTION "TCG2 Songs 2", ROMX + inc_section "crysaudio/music/TCG2/gamecorner.asm" + inc_section "crysaudio/music/TCG2/grblimp.asm" + inc_section "crysaudio/music/TCG2/grdueltheme1.asm" + inc_section "crysaudio/music/TCG2/grdueltheme2.asm" + inc_section "crysaudio/music/TCG2/grdueltheme3.asm" + inc_section "crysaudio/music/TCG2/ishihara.asm" + +SECTION "TCG2 Songs 3", ROMX + inc_section "crysaudio/music/TCG2/imakuni2.asm" + inc_section "crysaudio/music/TCG2/credits.asm" + inc_section "crysaudio/music/TCG2/diddly1.asm" + inc_section "crysaudio/music/TCG2/diddly2.asm" + inc_section "crysaudio/music/TCG2/diddly3.asm" + inc_section "crysaudio/music/TCG2/diddly4.asm" + inc_section "crysaudio/music/TCG2/diddly5.asm" + inc_section "crysaudio/music/TCG2/diddly6.asm" + +SECTION "Pinball Songs", ROMX + inc_section "crysaudio/music/pinball/redfield.asm" + inc_section "crysaudio/music/pinball/catchem_red.asm" + inc_section "crysaudio/music/pinball/hurryup_red.asm" + inc_section "crysaudio/music/pinball/pokedex.asm" + inc_section "crysaudio/music/pinball/gengarstage_gastly.asm" + inc_section "crysaudio/music/pinball/gengarstage_hauntergengar.asm" ; the two songs are interleaved + inc_section "crysaudio/music/pinball/bluefield.asm" + inc_section "crysaudio/music/pinball/catchem_blue.asm" + inc_section "crysaudio/music/pinball/hurryup_blue.asm" + inc_section "crysaudio/music/pinball/hiscorescreen.asm" + inc_section "crysaudio/music/pinball/gameover.asm" + inc_section "crysaudio/music/pinball/diglettstage_digletts.asm" + inc_section "crysaudio/music/pinball/diglettstage_dugtrio.asm" + +SECTION "Pinball Songs 2", ROMX + inc_section "crysaudio/music/pinball/seelstage.asm" + inc_section "crysaudio/music/pinball/titlescreen.asm" + inc_section "crysaudio/music/pinball/mewtwostage.asm" + inc_section "crysaudio/music/pinball/options.asm" + inc_section "crysaudio/music/pinball/fieldselect.asm" + inc_section "crysaudio/music/pinball/meowthstage.asm" + inc_section "crysaudio/music/pinball/endcredits.asm" + inc_section "crysaudio/music/pinball/nameentry.asm" + +SECTION "Sound Effects", ROMX + +INCLUDE "crysaudio/sfx.asm" + + +SECTION "Crystal Sound Effects", ROMX + +INCLUDE "crysaudio/sfx_crystal.asm" -SECTION "Music 1", ROMX, BANK[AUDIO_1] +SECTION "Cries", ROMX -INCLUDE "audio/music/pkmnhealed.asm" -INCLUDE "audio/music/routes1.asm" -INCLUDE "audio/music/routes2.asm" -INCLUDE "audio/music/routes3.asm" -INCLUDE "audio/music/routes4.asm" -INCLUDE "audio/music/indigoplateau.asm" -INCLUDE "audio/music/pallettown.asm" -INCLUDE "audio/music/unusedsong.asm" -INCLUDE "audio/music/cities1.asm" -INCLUDE "audio/sfx/get_item1_1.asm" -INCLUDE "audio/music/museumguy.asm" -INCLUDE "audio/music/meetprofoak.asm" -INCLUDE "audio/music/meetrival.asm" -INCLUDE "audio/sfx/pokedex_rating_1.asm" -INCLUDE "audio/sfx/get_item2_1.asm" -INCLUDE "audio/sfx/get_key_item_1.asm" -INCLUDE "audio/music/ssanne.asm" -INCLUDE "audio/music/cities2.asm" -INCLUDE "audio/music/celadon.asm" -INCLUDE "audio/music/cinnabar.asm" -INCLUDE "audio/music/vermilion.asm" -INCLUDE "audio/music/lavender.asm" -INCLUDE "audio/music/safarizone.asm" -INCLUDE "audio/music/gym.asm" -INCLUDE "audio/music/pokecenter.asm" +CryHeaders:: INCLUDE "crysaudio/cry_headers.asm" + +INCLUDE "crysaudio/cries.asm" -SECTION "Music 2", ROMX, BANK[AUDIO_2] - -INCLUDE "audio/sfx/pokeflute_ch4_ch5.asm" -INCLUDE "audio/sfx/unused2_2.asm" -INCLUDE "audio/music/gymleaderbattle.asm" -INCLUDE "audio/music/trainerbattle.asm" -INCLUDE "audio/music/wildbattle.asm" -INCLUDE "audio/music/finalbattle.asm" -INCLUDE "audio/sfx/level_up.asm" -INCLUDE "audio/sfx/get_item2_2.asm" -INCLUDE "audio/sfx/caught_mon.asm" -INCLUDE "audio/music/defeatedtrainer.asm" -INCLUDE "audio/music/defeatedwildmon.asm" -INCLUDE "audio/music/defeatedgymleader.asm" - - -SECTION "Music 3", ROMX, BANK[AUDIO_3] - -INCLUDE "audio/music/bikeriding.asm" -INCLUDE "audio/music/dungeon1.asm" -INCLUDE "audio/music/gamecorner.asm" -INCLUDE "audio/music/titlescreen.asm" -INCLUDE "audio/sfx/get_item1_3.asm" -INCLUDE "audio/music/dungeon2.asm" -INCLUDE "audio/music/dungeon3.asm" -INCLUDE "audio/music/cinnabarmansion.asm" -INCLUDE "audio/sfx/pokedex_rating_3.asm" -INCLUDE "audio/sfx/get_item2_3.asm" -INCLUDE "audio/sfx/get_key_item_3.asm" -INCLUDE "audio/music/oakslab.asm" -INCLUDE "audio/music/pokemontower.asm" -INCLUDE "audio/music/silphco.asm" -INCLUDE "audio/music/meeteviltrainer.asm" -INCLUDE "audio/music/meetfemaletrainer.asm" -INCLUDE "audio/music/meetmaletrainer.asm" -INCLUDE "audio/music/introbattle.asm" -INCLUDE "audio/music/surfing.asm" -INCLUDE "audio/music/jigglypuffsong.asm" -INCLUDE "audio/music/halloffame.asm" -INCLUDE "audio/music/credits.asm" - diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index 72a69646..be30979c 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,177 +1,3 @@ -SFX_Headers_1:: - db $ff, $ff, $ff ; padding - -SFX_Snare1_1:: - audio SFX_Snare1_1, Ch7 - -SFX_Snare2_1:: - audio SFX_Snare2_1, Ch7 - -SFX_Snare3_1:: - audio SFX_Snare3_1, Ch7 - -SFX_Snare4_1:: - audio SFX_Snare4_1, Ch7 - -SFX_Snare5_1:: - audio SFX_Snare5_1, Ch7 - -SFX_Triangle1_1:: - audio SFX_Triangle1_1, Ch7 - -SFX_Triangle2_1:: - audio SFX_Triangle2_1, Ch7 - -SFX_Snare6_1:: - audio SFX_Snare6_1, Ch7 - -SFX_Snare7_1:: - audio SFX_Snare7_1, Ch7 - -SFX_Snare8_1:: - audio SFX_Snare8_1, Ch7 - -SFX_Snare9_1:: - audio SFX_Snare9_1, Ch7 - -SFX_Cymbal1_1:: - audio SFX_Cymbal1_1, Ch7 - -SFX_Cymbal2_1:: - audio SFX_Cymbal2_1, Ch7 - -SFX_Cymbal3_1:: - audio SFX_Cymbal3_1, Ch7 - -SFX_Muted_Snare1_1:: - audio SFX_Muted_Snare1_1, Ch7 - -SFX_Triangle3_1:: - audio SFX_Triangle3_1, Ch7 - -SFX_Muted_Snare2_1:: - audio SFX_Muted_Snare2_1, Ch7 - -SFX_Muted_Snare3_1:: - audio SFX_Muted_Snare3_1, Ch7 - -SFX_Muted_Snare4_1:: - audio SFX_Muted_Snare4_1, Ch7 - -SFX_Cry00_1:: - audio SFX_Cry00_1, Ch4, Ch5, Ch7 - -SFX_Cry01_1:: - audio SFX_Cry01_1, Ch4, Ch5, Ch7 - -SFX_Cry02_1:: - audio SFX_Cry02_1, Ch4, Ch5, Ch7 - -SFX_Cry03_1:: - audio SFX_Cry03_1, Ch4, Ch5, Ch7 - -SFX_Cry04_1:: - audio SFX_Cry04_1, Ch4, Ch5, Ch7 - -SFX_Cry05_1:: - audio SFX_Cry05_1, Ch4, Ch5, Ch7 - -SFX_Cry06_1:: - audio SFX_Cry06_1, Ch4, Ch5, Ch7 - -SFX_Cry07_1:: - audio SFX_Cry07_1, Ch4, Ch5, Ch7 - -SFX_Cry08_1:: - audio SFX_Cry08_1, Ch4, Ch5, Ch7 - -SFX_Cry09_1:: - audio SFX_Cry09_1, Ch4, Ch5, Ch7 - -SFX_Cry0A_1:: - audio SFX_Cry0A_1, Ch4, Ch5, Ch7 - -SFX_Cry0B_1:: - audio SFX_Cry0B_1, Ch4, Ch5, Ch7 - -SFX_Cry0C_1:: - audio SFX_Cry0C_1, Ch4, Ch5, Ch7 - -SFX_Cry0D_1:: - audio SFX_Cry0D_1, Ch4, Ch5, Ch7 - -SFX_Cry0E_1:: - audio SFX_Cry0E_1, Ch4, Ch5, Ch7 - -SFX_Cry0F_1:: - audio SFX_Cry0F_1, Ch4, Ch5, Ch7 - -SFX_Cry10_1:: - audio SFX_Cry10_1, Ch4, Ch5, Ch7 - -SFX_Cry11_1:: - audio SFX_Cry11_1, Ch4, Ch5, Ch7 - -SFX_Cry12_1:: - audio SFX_Cry12_1, Ch4, Ch5, Ch7 - -SFX_Cry13_1:: - audio SFX_Cry13_1, Ch4, Ch5, Ch7 - -SFX_Cry14_1:: - audio SFX_Cry14_1, Ch4, Ch5, Ch7 - -SFX_Cry15_1:: - audio SFX_Cry15_1, Ch4, Ch5, Ch7 - -SFX_Cry16_1:: - audio SFX_Cry16_1, Ch4, Ch5, Ch7 - -SFX_Cry17_1:: - audio SFX_Cry17_1, Ch4, Ch5, Ch7 - -SFX_Cry18_1:: - audio SFX_Cry18_1, Ch4, Ch5, Ch7 - -SFX_Cry19_1:: - audio SFX_Cry19_1, Ch4, Ch5, Ch7 - -SFX_Cry1A_1:: - audio SFX_Cry1A_1, Ch4, Ch5, Ch7 - -SFX_Cry1B_1:: - audio SFX_Cry1B_1, Ch4, Ch5, Ch7 - -SFX_Cry1C_1:: - audio SFX_Cry1C_1, Ch4, Ch5, Ch7 - -SFX_Cry1D_1:: - audio SFX_Cry1D_1, Ch4, Ch5, Ch7 - -SFX_Cry1E_1:: - audio SFX_Cry1E_1, Ch4, Ch5, Ch7 - -SFX_Cry1F_1:: - audio SFX_Cry1F_1, Ch4, Ch5, Ch7 - -SFX_Cry20_1:: - audio SFX_Cry20_1, Ch4, Ch5, Ch7 - -SFX_Cry21_1:: - audio SFX_Cry21_1, Ch4, Ch5, Ch7 - -SFX_Cry22_1:: - audio SFX_Cry22_1, Ch4, Ch5, Ch7 - -SFX_Cry23_1:: - audio SFX_Cry23_1, Ch4, Ch5, Ch7 - -SFX_Cry24_1:: - audio SFX_Cry24_1, Ch4, Ch5, Ch7 - -SFX_Cry25_1:: - audio SFX_Cry25_1, Ch4, Ch5, Ch7 - SFX_Get_Item1_1:: audio SFX_Get_Item1_1, Ch4, Ch5, Ch6 @@ -280,9 +106,9 @@ SFX_Go_Outside_1:: SFX_Save_1:: audio SFX_Save_1, Ch4, Ch5 -; the Pokeflute sound effect directly hijacks channel 2 +; the Pokeflute sound effect directly hijacks channel 2 (not anymore) SFX_Pokeflute:: - audio SFX_Pokeflute, Ch2 + audio SFX_Pokeflute, Ch6 SFX_Safari_Zone_PA:: audio SFX_Safari_Zone_PA, Ch4 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index b96a764f..65bad5d7 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,198 +1,6 @@ -SFX_Headers_2:: - db $ff, $ff, $ff ; padding - -SFX_Snare1_2:: - audio SFX_Snare1_2, Ch7 - -SFX_Snare2_2:: - audio SFX_Snare2_2, Ch7 - -SFX_Snare3_2:: - audio SFX_Snare3_2, Ch7 - -SFX_Snare4_2:: - audio SFX_Snare4_2, Ch7 - -SFX_Snare5_2:: - audio SFX_Snare5_2, Ch7 - -SFX_Triangle1_2:: - audio SFX_Triangle1_2, Ch7 - -SFX_Triangle2_2:: - audio SFX_Triangle2_2, Ch7 - -SFX_Snare6_2:: - audio SFX_Snare6_2, Ch7 - -SFX_Snare7_2:: - audio SFX_Snare7_2, Ch7 - -SFX_Snare8_2:: - audio SFX_Snare8_2, Ch7 - -SFX_Snare9_2:: - audio SFX_Snare9_2, Ch7 - -SFX_Cymbal1_2:: - audio SFX_Cymbal1_2, Ch7 - -SFX_Cymbal2_2:: - audio SFX_Cymbal2_2, Ch7 - -SFX_Cymbal3_2:: - audio SFX_Cymbal3_2, Ch7 - -SFX_Muted_Snare1_2:: - audio SFX_Muted_Snare1_2, Ch7 - -SFX_Triangle3_2:: - audio SFX_Triangle3_2, Ch7 - -SFX_Muted_Snare2_2:: - audio SFX_Muted_Snare2_2, Ch7 - -SFX_Muted_Snare3_2:: - audio SFX_Muted_Snare3_2, Ch7 - -SFX_Muted_Snare4_2:: - audio SFX_Muted_Snare4_2, Ch7 - -SFX_Cry00_2:: - audio SFX_Cry00_2, Ch4, Ch5, Ch7 - -SFX_Cry01_2:: - audio SFX_Cry01_2, Ch4, Ch5, Ch7 - -SFX_Cry02_2:: - audio SFX_Cry02_2, Ch4, Ch5, Ch7 - -SFX_Cry03_2:: - audio SFX_Cry03_2, Ch4, Ch5, Ch7 - -SFX_Cry04_2:: - audio SFX_Cry04_2, Ch4, Ch5, Ch7 - -SFX_Cry05_2:: - audio SFX_Cry05_2, Ch4, Ch5, Ch7 - -SFX_Cry06_2:: - audio SFX_Cry06_2, Ch4, Ch5, Ch7 - -SFX_Cry07_2:: - audio SFX_Cry07_2, Ch4, Ch5, Ch7 - -SFX_Cry08_2:: - audio SFX_Cry08_2, Ch4, Ch5, Ch7 - -SFX_Cry09_2:: - audio SFX_Cry09_2, Ch4, Ch5, Ch7 - -SFX_Cry0A_2:: - audio SFX_Cry0A_2, Ch4, Ch5, Ch7 - -SFX_Cry0B_2:: - audio SFX_Cry0B_2, Ch4, Ch5, Ch7 - -SFX_Cry0C_2:: - audio SFX_Cry0C_2, Ch4, Ch5, Ch7 - -SFX_Cry0D_2:: - audio SFX_Cry0D_2, Ch4, Ch5, Ch7 - -SFX_Cry0E_2:: - audio SFX_Cry0E_2, Ch4, Ch5, Ch7 - -SFX_Cry0F_2:: - audio SFX_Cry0F_2, Ch4, Ch5, Ch7 - -SFX_Cry10_2:: - audio SFX_Cry10_2, Ch4, Ch5, Ch7 - -SFX_Cry11_2:: - audio SFX_Cry11_2, Ch4, Ch5, Ch7 - -SFX_Cry12_2:: - audio SFX_Cry12_2, Ch4, Ch5, Ch7 - -SFX_Cry13_2:: - audio SFX_Cry13_2, Ch4, Ch5, Ch7 - -SFX_Cry14_2:: - audio SFX_Cry14_2, Ch4, Ch5, Ch7 - -SFX_Cry15_2:: - audio SFX_Cry15_2, Ch4, Ch5, Ch7 - -SFX_Cry16_2:: - audio SFX_Cry16_2, Ch4, Ch5, Ch7 - -SFX_Cry17_2:: - audio SFX_Cry17_2, Ch4, Ch5, Ch7 - -SFX_Cry18_2:: - audio SFX_Cry18_2, Ch4, Ch5, Ch7 - -SFX_Cry19_2:: - audio SFX_Cry19_2, Ch4, Ch5, Ch7 - -SFX_Cry1A_2:: - audio SFX_Cry1A_2, Ch4, Ch5, Ch7 - -SFX_Cry1B_2:: - audio SFX_Cry1B_2, Ch4, Ch5, Ch7 - -SFX_Cry1C_2:: - audio SFX_Cry1C_2, Ch4, Ch5, Ch7 - -SFX_Cry1D_2:: - audio SFX_Cry1D_2, Ch4, Ch5, Ch7 - -SFX_Cry1E_2:: - audio SFX_Cry1E_2, Ch4, Ch5, Ch7 - -SFX_Cry1F_2:: - audio SFX_Cry1F_2, Ch4, Ch5, Ch7 - -SFX_Cry20_2:: - audio SFX_Cry20_2, Ch4, Ch5, Ch7 - -SFX_Cry21_2:: - audio SFX_Cry21_2, Ch4, Ch5, Ch7 - -SFX_Cry22_2:: - audio SFX_Cry22_2, Ch4, Ch5, Ch7 - -SFX_Cry23_2:: - audio SFX_Cry23_2, Ch4, Ch5, Ch7 - -SFX_Cry24_2:: - audio SFX_Cry24_2, Ch4, Ch5, Ch7 - -SFX_Cry25_2:: - audio SFX_Cry25_2, Ch4, Ch5, Ch7 - SFX_Level_Up:: audio SFX_Level_Up, Ch4, Ch5, Ch6 -SFX_Get_Item2_2:: - audio SFX_Get_Item2_2, Ch4, Ch5, Ch6 - -SFX_Tink_2:: - audio SFX_Tink_2, Ch4 - -SFX_Heal_HP_2:: - audio SFX_Heal_HP_2, Ch4 - -SFX_Heal_Ailment_2:: - audio SFX_Heal_Ailment_2, Ch4 - -SFX_Start_Menu_2:: - audio SFX_Start_Menu_2, Ch7 - -SFX_Press_AB_2:: - audio SFX_Press_AB_2, Ch4 - SFX_Ball_Toss:: audio SFX_Ball_Toss, Ch4, Ch5 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index 19a19272..ff14264a 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,285 +1,3 @@ -SFX_Headers_3:: - db $ff, $ff, $ff ; padding - -SFX_Snare1_3:: - audio SFX_Snare1_3, Ch7 - -SFX_Snare2_3:: - audio SFX_Snare2_3, Ch7 - -SFX_Snare3_3:: - audio SFX_Snare3_3, Ch7 - -SFX_Snare4_3:: - audio SFX_Snare4_3, Ch7 - -SFX_Snare5_3:: - audio SFX_Snare5_3, Ch7 - -SFX_Triangle1_3:: - audio SFX_Triangle1_3, Ch7 - -SFX_Triangle2_3:: - audio SFX_Triangle2_3, Ch7 - -SFX_Snare6_3:: - audio SFX_Snare6_3, Ch7 - -SFX_Snare7_3:: - audio SFX_Snare7_3, Ch7 - -SFX_Snare8_3:: - audio SFX_Snare8_3, Ch7 - -SFX_Snare9_3:: - audio SFX_Snare9_3, Ch7 - -SFX_Cymbal1_3:: - audio SFX_Cymbal1_3, Ch7 - -SFX_Cymbal2_3:: - audio SFX_Cymbal2_3, Ch7 - -SFX_Cymbal3_3:: - audio SFX_Cymbal3_3, Ch7 - -SFX_Muted_Snare1_3:: - audio SFX_Muted_Snare1_3, Ch7 - -SFX_Triangle3_3:: - audio SFX_Triangle3_3, Ch7 - -SFX_Muted_Snare2_3:: - audio SFX_Muted_Snare2_3, Ch7 - -SFX_Muted_Snare3_3:: - audio SFX_Muted_Snare3_3, Ch7 - -SFX_Muted_Snare4_3:: - audio SFX_Muted_Snare4_3, Ch7 - -SFX_Cry00_3:: - audio SFX_Cry00_3, Ch4, Ch5, Ch7 - -SFX_Cry01_3:: - audio SFX_Cry01_3, Ch4, Ch5, Ch7 - -SFX_Cry02_3:: - audio SFX_Cry02_3, Ch4, Ch5, Ch7 - -SFX_Cry03_3:: - audio SFX_Cry03_3, Ch4, Ch5, Ch7 - -SFX_Cry04_3:: - audio SFX_Cry04_3, Ch4, Ch5, Ch7 - -SFX_Cry05_3:: - audio SFX_Cry05_3, Ch4, Ch5, Ch7 - -SFX_Cry06_3:: - audio SFX_Cry06_3, Ch4, Ch5, Ch7 - -SFX_Cry07_3:: - audio SFX_Cry07_3, Ch4, Ch5, Ch7 - -SFX_Cry08_3:: - audio SFX_Cry08_3, Ch4, Ch5, Ch7 - -SFX_Cry09_3:: - audio SFX_Cry09_3, Ch4, Ch5, Ch7 - -SFX_Cry0A_3:: - audio SFX_Cry0A_3, Ch4, Ch5, Ch7 - -SFX_Cry0B_3:: - audio SFX_Cry0B_3, Ch4, Ch5, Ch7 - -SFX_Cry0C_3:: - audio SFX_Cry0C_3, Ch4, Ch5, Ch7 - -SFX_Cry0D_3:: - audio SFX_Cry0D_3, Ch4, Ch5, Ch7 - -SFX_Cry0E_3:: - audio SFX_Cry0E_3, Ch4, Ch5, Ch7 - -SFX_Cry0F_3:: - audio SFX_Cry0F_3, Ch4, Ch5, Ch7 - -SFX_Cry10_3:: - audio SFX_Cry10_3, Ch4, Ch5, Ch7 - -SFX_Cry11_3:: - audio SFX_Cry11_3, Ch4, Ch5, Ch7 - -SFX_Cry12_3:: - audio SFX_Cry12_3, Ch4, Ch5, Ch7 - -SFX_Cry13_3:: - audio SFX_Cry13_3, Ch4, Ch5, Ch7 - -SFX_Cry14_3:: - audio SFX_Cry14_3, Ch4, Ch5, Ch7 - -SFX_Cry15_3:: - audio SFX_Cry15_3, Ch4, Ch5, Ch7 - -SFX_Cry16_3:: - audio SFX_Cry16_3, Ch4, Ch5, Ch7 - -SFX_Cry17_3:: - audio SFX_Cry17_3, Ch4, Ch5, Ch7 - -SFX_Cry18_3:: - audio SFX_Cry18_3, Ch4, Ch5, Ch7 - -SFX_Cry19_3:: - audio SFX_Cry19_3, Ch4, Ch5, Ch7 - -SFX_Cry1A_3:: - audio SFX_Cry1A_3, Ch4, Ch5, Ch7 - -SFX_Cry1B_3:: - audio SFX_Cry1B_3, Ch4, Ch5, Ch7 - -SFX_Cry1C_3:: - audio SFX_Cry1C_3, Ch4, Ch5, Ch7 - -SFX_Cry1D_3:: - audio SFX_Cry1D_3, Ch4, Ch5, Ch7 - -SFX_Cry1E_3:: - audio SFX_Cry1E_3, Ch4, Ch5, Ch7 - -SFX_Cry1F_3:: - audio SFX_Cry1F_3, Ch4, Ch5, Ch7 - -SFX_Cry20_3:: - audio SFX_Cry20_3, Ch4, Ch5, Ch7 - -SFX_Cry21_3:: - audio SFX_Cry21_3, Ch4, Ch5, Ch7 - -SFX_Cry22_3:: - audio SFX_Cry22_3, Ch4, Ch5, Ch7 - -SFX_Cry23_3:: - audio SFX_Cry23_3, Ch4, Ch5, Ch7 - -SFX_Cry24_3:: - audio SFX_Cry24_3, Ch4, Ch5, Ch7 - -SFX_Cry25_3:: - audio SFX_Cry25_3, Ch4, Ch5, Ch7 - -SFX_Get_Item1_3:: - audio SFX_Get_Item1_3, Ch4, Ch5, Ch6 - -SFX_Get_Item2_3:: - audio SFX_Get_Item2_3, Ch4, Ch5, Ch6 - -SFX_Tink_3:: - audio SFX_Tink_3, Ch4 - -SFX_Heal_HP_3:: - audio SFX_Heal_HP_3, Ch4 - -SFX_Heal_Ailment_3:: - audio SFX_Heal_Ailment_3, Ch4 - -SFX_Start_Menu_3:: - audio SFX_Start_Menu_3, Ch7 - -SFX_Press_AB_3:: - audio SFX_Press_AB_3, Ch4 - -SFX_Pokedex_Rating_3:: - audio SFX_Pokedex_Rating_3, Ch4, Ch5, Ch6 - -SFX_Get_Key_Item_3:: - audio SFX_Get_Key_Item_3, Ch4, Ch5, Ch6 - -SFX_Poisoned_3:: - audio SFX_Poisoned_3, Ch4 - -SFX_Trade_Machine_3:: - audio SFX_Trade_Machine_3, Ch4 - -SFX_Turn_On_PC_3:: - audio SFX_Turn_On_PC_3, Ch4 - -SFX_Turn_Off_PC_3:: - audio SFX_Turn_Off_PC_3, Ch4 - -SFX_Enter_PC_3:: - audio SFX_Enter_PC_3, Ch4 - -SFX_Shrink_3:: - audio SFX_Shrink_3, Ch4 - -SFX_Switch_3:: - audio SFX_Switch_3, Ch4 - -SFX_Healing_Machine_3:: - audio SFX_Healing_Machine_3, Ch4 - -SFX_Teleport_Exit1_3:: - audio SFX_Teleport_Exit1_3, Ch4 - -SFX_Teleport_Enter1_3:: - audio SFX_Teleport_Enter1_3, Ch4 - -SFX_Teleport_Exit2_3:: - audio SFX_Teleport_Exit2_3, Ch4 - -SFX_Ledge_3:: - audio SFX_Ledge_3, Ch4 - -SFX_Teleport_Enter2_3:: - audio SFX_Teleport_Enter2_3, Ch7 - -SFX_Fly_3:: - audio SFX_Fly_3, Ch7 - -SFX_Denied_3:: - audio SFX_Denied_3, Ch4, Ch5 - -SFX_Arrow_Tiles_3:: - audio SFX_Arrow_Tiles_3, Ch4 - -SFX_Push_Boulder_3:: - audio SFX_Push_Boulder_3, Ch7 - -SFX_SS_Anne_Horn_3:: - audio SFX_SS_Anne_Horn_3, Ch4, Ch5 - -SFX_Withdraw_Deposit_3:: - audio SFX_Withdraw_Deposit_3, Ch4 - -SFX_Cut_3:: - audio SFX_Cut_3, Ch7 - -SFX_Go_Inside_3:: - audio SFX_Go_Inside_3, Ch7 - -SFX_Swap_3:: - audio SFX_Swap_3, Ch4, Ch5 - -SFX_59_3:: - audio SFX_59_3, Ch4, Ch5 - -SFX_Purchase_3:: - audio SFX_Purchase_3, Ch4, Ch5 - -SFX_Collision_3:: - audio SFX_Collision_3, Ch4 - -SFX_Go_Outside_3:: - audio SFX_Go_Outside_3, Ch7 - -SFX_Save_3:: - audio SFX_Save_3, Ch4, Ch5 - SFX_Intro_Lunge:: audio SFX_Intro_Lunge, Ch7 diff --git a/audio/sfx/59_1.asm b/audio/sfx/59_1.asm index f36f9e1e..a13fff48 100644 --- a/audio/sfx/59_1.asm +++ b/audio/sfx/59_1.asm @@ -1,11 +1,11 @@ SFX_59_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 4, 241, 128, 7 endchannel SFX_59_1_Ch5: - duty 2 + dutycycle 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 endchannel diff --git a/audio/sfx/59_3.asm b/audio/sfx/59_3.asm deleted file mode 100644 index 559318ba..00000000 --- a/audio/sfx/59_3.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_59_3_Ch4: - duty 2 - unknownsfx0x20 4, 241, 128, 7 - endchannel - - -SFX_59_3_Ch5: - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 161, 97, 7 - endchannel diff --git a/audio/sfx/arrow_tiles_1.asm b/audio/sfx/arrow_tiles_1.asm index c9ef1564..e04d095b 100644 --- a/audio/sfx/arrow_tiles_1.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,5 +1,5 @@ SFX_Arrow_Tiles_1_Ch4: - duty 0 + dutycycle 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 unknownsfx0x10 8 diff --git a/audio/sfx/arrow_tiles_3.asm b/audio/sfx/arrow_tiles_3.asm deleted file mode 100644 index f88b9c83..00000000 --- a/audio/sfx/arrow_tiles_3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_Arrow_Tiles_3_Ch4: - duty 0 - unknownsfx0x10 23 - unknownsfx0x20 15, 210, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/ball_poof.asm b/audio/sfx/ball_poof.asm index 7068c66c..3db9ca6c 100644 --- a/audio/sfx/ball_poof.asm +++ b/audio/sfx/ball_poof.asm @@ -1,5 +1,5 @@ SFX_Ball_Poof_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 22 unknownsfx0x20 15, 242, 0, 4 unknownsfx0x10 8 diff --git a/audio/sfx/ball_toss.asm b/audio/sfx/ball_toss.asm index e9beac77..4bf46a7f 100644 --- a/audio/sfx/ball_toss.asm +++ b/audio/sfx/ball_toss.asm @@ -1,11 +1,11 @@ SFX_Ball_Toss_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 47 unknownsfx0x20 15, 242, 128, 7 endchannel SFX_Ball_Toss_Ch5: - duty 2 + dutycycle 2 unknownsfx0x20 15, 194, 130, 7 endchannel diff --git a/audio/sfx/battle_09.asm b/audio/sfx/battle_09.asm index 11f156cb..16a2e912 100644 --- a/audio/sfx/battle_09.asm +++ b/audio/sfx/battle_09.asm @@ -1,5 +1,5 @@ SFX_Battle_09_Ch4: - duty 1 + dutycycle 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 5 unknownsfx0x10 8 diff --git a/audio/sfx/battle_1e.asm b/audio/sfx/battle_1e.asm index 8d3f4745..a8e46ecb 100644 --- a/audio/sfx/battle_1e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,5 +1,5 @@ SFX_Battle_1E_Ch4: - duty 0 + dutycycle 0 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 unknownsfx0x10 34 diff --git a/audio/sfx/battle_24.asm b/audio/sfx/battle_24.asm index 46e9d29f..596ab68a 100644 --- a/audio/sfx/battle_24.asm +++ b/audio/sfx/battle_24.asm @@ -1,5 +1,5 @@ SFX_Battle_24_Ch4: - duty 1 + dutycycle 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 7 unknownsfx0x10 8 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index 1e662c29..31f4605c 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -1,5 +1,5 @@ SFX_Battle_27_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 15, 63, 192, 7 SFX_Battle_27_branch_2062a: diff --git a/audio/sfx/battle_28.asm b/audio/sfx/battle_28.asm index 298ddb7a..8bc54354 100644 --- a/audio/sfx/battle_28.asm +++ b/audio/sfx/battle_28.asm @@ -1,5 +1,5 @@ SFX_Battle_28_Ch4: - duty 0 + dutycycle 0 unknownsfx0x20 0, 241, 192, 7 unknownsfx0x20 0, 241, 0, 7 loopchannel 12, SFX_Battle_28_Ch4 diff --git a/audio/sfx/battle_2e.asm b/audio/sfx/battle_2e.asm index 20c86033..1883c5f6 100644 --- a/audio/sfx/battle_2e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,5 +1,5 @@ SFX_Battle_2E_Ch4: - duty 0 + dutycycle 0 unknownsfx0x20 2, 241, 0, 2 unknownsfx0x20 3, 241, 0, 7 unknownsfx0x20 4, 241, 0, 5 diff --git a/audio/sfx/battle_31.asm b/audio/sfx/battle_31.asm index cc1169eb..dce1d38f 100644 --- a/audio/sfx/battle_31.asm +++ b/audio/sfx/battle_31.asm @@ -1,5 +1,5 @@ SFX_Battle_31_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 @@ -9,7 +9,7 @@ SFX_Battle_31_Ch4: SFX_Battle_31_Ch5: - duty 3 + dutycycle 3 unknownsfx0x20 15, 255, 226, 7 unknownsfx0x20 15, 255, 225, 7 unknownsfx0x20 15, 255, 226, 7 diff --git a/audio/sfx/battle_32.asm b/audio/sfx/battle_32.asm index c7bff4b2..75a98229 100644 --- a/audio/sfx/battle_32.asm +++ b/audio/sfx/battle_32.asm @@ -1,5 +1,5 @@ SFX_Battle_32_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 175 unknownsfx0x20 8, 241, 0, 7 unknownsfx0x10 8 @@ -7,6 +7,6 @@ SFX_Battle_32_Ch4: SFX_Battle_32_Ch5: - duty 3 + dutycycle 3 unknownsfx0x20 8, 241, 1, 7 endchannel diff --git a/audio/sfx/battle_33.asm b/audio/sfx/battle_33.asm index c92b5482..5d76f5bd 100644 --- a/audio/sfx/battle_33.asm +++ b/audio/sfx/battle_33.asm @@ -1,5 +1,5 @@ SFX_Battle_33_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 6, 241, 0, 5 unknownsfx0x20 6, 241, 128, 5 unknownsfx0x20 6, 241, 0, 6 @@ -9,7 +9,7 @@ SFX_Battle_33_Ch4: SFX_Battle_33_Ch5: - duty 3 + dutycycle 3 unknownsfx0x20 6, 225, 16, 5 unknownsfx0x20 6, 225, 144, 5 unknownsfx0x20 6, 225, 16, 6 diff --git a/audio/sfx/battle_35.asm b/audio/sfx/battle_35.asm index 7ce3afb4..67832140 100644 --- a/audio/sfx/battle_35.asm +++ b/audio/sfx/battle_35.asm @@ -1,29 +1,29 @@ SFX_Battle_35_Ch4: executemusic - vibrato 10, 2, 4 - duty 2 - notetype 10, 8, 7 + vibrato 10, (2<<4) + 4 + dutycycle 2 + notetype 10, (8<<4) + 7 octave 5 - G# 8 + note G#, 8 octave 6 - F# 4 - E_ 4 + note F#, 4 + note E_, 4 octave 5 - G# 8 + note G#, 8 endchannel SFX_Battle_35_Ch5: executemusic - vibrato 10, 2, 3 - duty 2 - notetype 11, 6, 7 + vibrato 10, (2<<4) + 3 + dutycycle 2 + notetype 11, (6<<4) + 7 octave 5 - G# 8 - notetype 10, 6, 7 + note G#, 8 + notetype 10, (6<<4) + 7 octave 6 - F# 4 - E_ 4 + note F#, 4 + note E_, 4 octave 5 - G# 8 + note G#, 8 endchannel diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index df23fb37..8665e496 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -1,5 +1,5 @@ SFX_Battle_36_Ch4: - duty 0 + dutycycle 0 unknownsfx0x20 2, 241, 128, 7 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 2, 241, 144, 7 diff --git a/audio/sfx/caught_mon.asm b/audio/sfx/caught_mon.asm index b844a54a..67a4fc3b 100644 --- a/audio/sfx/caught_mon.asm +++ b/audio/sfx/caught_mon.asm @@ -1,61 +1,61 @@ SFX_Caught_Mon_Ch4: executemusic tempo 256 - volume 7, 7 - duty 3 + volume 119 + dutycycle 3 toggleperfectpitch - notetype 6, 11, 2 + notetype 6, (11<<4) + 2 octave 3 - E_ 2 - F# 2 - G# 2 - G# 1 - G# 1 - B_ 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 1 + note G#, 1 + note B_, 2 octave 4 - C# 2 - D# 2 - D# 1 - D# 1 - notetype 6, 11, 5 - E_ 8 + note C#, 2 + note D#, 2 + note D#, 1 + note D#, 1 + notetype 6, (11<<4) + 5 + note E_, 8 endchannel SFX_Caught_Mon_Ch5: executemusic - duty 2 - notetype 6, 12, 2 + dutycycle 2 + notetype 6, (12<<4) + 2 octave 4 - G# 2 - G# 1 - G# 1 - E_ 2 - E_ 1 - E_ 1 - B_ 2 - B_ 1 - B_ 1 - A_ 2 - A_ 1 - A_ 1 - notetype 6, 12, 5 - G# 8 + note G#, 2 + note G#, 1 + note G#, 1 + note E_, 2 + note E_, 1 + note E_, 1 + note B_, 2 + note B_, 1 + note B_, 1 + note A_, 2 + note A_, 1 + note A_, 1 + notetype 6, (12<<4) + 5 + note G#, 8 endchannel SFX_Caught_Mon_Ch6: executemusic - notetype 6, 1, 0 + notetype 6, (1<<4) + 0 octave 4 - B_ 2 - rest 2 + note B_, 2 + note __, 2 octave 5 - C# 2 - rest 2 - D# 2 - rest 2 - F# 2 - G_ 2 - G# 4 + note C#, 2 + note __, 2 + note D#, 2 + note __, 2 + note F#, 2 + note G_, 2 + note G#, 4 endchannel diff --git a/audio/sfx/collision_1.asm b/audio/sfx/collision_1.asm index 241a5e68..16a58050 100644 --- a/audio/sfx/collision_1.asm +++ b/audio/sfx/collision_1.asm @@ -1,5 +1,5 @@ SFX_Collision_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 unknownsfx0x10 8 diff --git a/audio/sfx/collision_3.asm b/audio/sfx/collision_3.asm deleted file mode 100644 index 649792eb..00000000 --- a/audio/sfx/collision_3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_Collision_3_Ch4: - duty 2 - unknownsfx0x10 90 - unknownsfx0x20 15, 241, 0, 3 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/cry00_1.asm b/audio/sfx/cry00_1.asm deleted file mode 100644 index 98920dfc..00000000 --- a/audio/sfx/cry00_1.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry00_1_Ch4: - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_Cry00_1_Ch5: - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_Cry00_1_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/cry00_2.asm b/audio/sfx/cry00_2.asm deleted file mode 100644 index 17a9207e..00000000 --- a/audio/sfx/cry00_2.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry00_2_Ch4: - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_Cry00_2_Ch5: - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_Cry00_2_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/cry00_3.asm b/audio/sfx/cry00_3.asm deleted file mode 100644 index 81ad7edf..00000000 --- a/audio/sfx/cry00_3.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry00_3_Ch4: - dutycycle 245 - unknownsfx0x20 4, 243, 24, 7 - unknownsfx0x20 15, 229, 152, 7 - unknownsfx0x20 8, 145, 88, 7 - endchannel - - -SFX_Cry00_3_Ch5: - dutycycle 160 - unknownsfx0x20 5, 179, 8, 7 - unknownsfx0x20 15, 197, 136, 7 - unknownsfx0x20 8, 113, 72, 7 - endchannel - - -SFX_Cry00_3_Ch7: - unknownnoise0x20 3, 161, 28 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 8, 129, 28 - endchannel diff --git a/audio/sfx/cry01_1.asm b/audio/sfx/cry01_1.asm deleted file mode 100644 index 392adbe3..00000000 --- a/audio/sfx/cry01_1.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry01_1_Ch4: - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_Cry01_1_Ch5: - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_Cry01_1_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/cry01_2.asm b/audio/sfx/cry01_2.asm deleted file mode 100644 index a7397fd8..00000000 --- a/audio/sfx/cry01_2.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry01_2_Ch4: - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_Cry01_2_Ch5: - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_Cry01_2_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/cry01_3.asm b/audio/sfx/cry01_3.asm deleted file mode 100644 index 19235f9e..00000000 --- a/audio/sfx/cry01_3.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry01_3_Ch4: - dutycycle 160 - unknownsfx0x20 4, 243, 0, 6 - unknownsfx0x20 8, 213, 96, 7 - unknownsfx0x20 3, 226, 32, 7 - unknownsfx0x20 8, 209, 16, 7 - endchannel - - -SFX_Cry01_3_Ch5: - dutycycle 90 - unknownsfx0x20 5, 179, 241, 6 - unknownsfx0x20 7, 197, 82, 7 - unknownsfx0x20 3, 162, 17, 7 - unknownsfx0x20 8, 177, 1, 6 - endchannel - - -SFX_Cry01_3_Ch7: - unknownnoise0x20 3, 162, 60 - unknownnoise0x20 12, 148, 44 - unknownnoise0x20 3, 130, 28 - unknownnoise0x20 8, 113, 44 - endchannel diff --git a/audio/sfx/cry02_1.asm b/audio/sfx/cry02_1.asm deleted file mode 100644 index 62834724..00000000 --- a/audio/sfx/cry02_1.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_Cry02_1_Ch4: - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_Cry02_1_Ch5: - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_Cry02_1_Ch7: - endchannel diff --git a/audio/sfx/cry02_2.asm b/audio/sfx/cry02_2.asm deleted file mode 100644 index ae40372a..00000000 --- a/audio/sfx/cry02_2.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_Cry02_2_Ch4: - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_Cry02_2_Ch5: - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_Cry02_2_Ch7: - endchannel diff --git a/audio/sfx/cry02_3.asm b/audio/sfx/cry02_3.asm deleted file mode 100644 index 32be5608..00000000 --- a/audio/sfx/cry02_3.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_Cry02_3_Ch4: - duty 0 - unknownsfx0x20 8, 245, 128, 4 - unknownsfx0x20 2, 225, 224, 5 - unknownsfx0x20 8, 209, 220, 5 - endchannel - - -SFX_Cry02_3_Ch5: - dutycycle 165 - unknownsfx0x20 7, 149, 65, 4 - unknownsfx0x20 2, 129, 33, 5 - unknownsfx0x20 8, 97, 26, 5 - - -SFX_Cry02_3_Ch7: - endchannel diff --git a/audio/sfx/cry03_1.asm b/audio/sfx/cry03_1.asm deleted file mode 100644 index 706d2325..00000000 --- a/audio/sfx/cry03_1.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry03_1_Ch4: - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_Cry03_1_Ch5: - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_Cry03_1_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/cry03_2.asm b/audio/sfx/cry03_2.asm deleted file mode 100644 index 89e98ae4..00000000 --- a/audio/sfx/cry03_2.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry03_2_Ch4: - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_Cry03_2_Ch5: - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_Cry03_2_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/cry03_3.asm b/audio/sfx/cry03_3.asm deleted file mode 100644 index d472d37b..00000000 --- a/audio/sfx/cry03_3.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry03_3_Ch4: - dutycycle 240 - unknownsfx0x20 4, 247, 8, 6 - unknownsfx0x20 6, 230, 0, 6 - unknownsfx0x20 6, 215, 240, 5 - unknownsfx0x20 6, 196, 224, 5 - unknownsfx0x20 5, 211, 192, 5 - unknownsfx0x20 4, 211, 160, 5 - unknownsfx0x20 8, 225, 128, 5 - endchannel - - -SFX_Cry03_3_Ch5: - dutycycle 10 - unknownsfx0x20 4, 199, 4, 5 - unknownsfx0x20 6, 166, 2, 5 - unknownsfx0x20 6, 151, 241, 4 - unknownsfx0x20 4, 180, 225, 4 - unknownsfx0x20 5, 163, 194, 4 - unknownsfx0x20 4, 179, 163, 4 - unknownsfx0x20 8, 193, 130, 4 - endchannel - - -SFX_Cry03_3_Ch7: - unknownnoise0x20 12, 228, 76 - unknownnoise0x20 10, 199, 92 - unknownnoise0x20 12, 182, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/cry04_1.asm b/audio/sfx/cry04_1.asm deleted file mode 100644 index d1bb26c6..00000000 --- a/audio/sfx/cry04_1.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_Cry04_1_Ch4: - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_Cry04_1_Ch5: - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_Cry04_1_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/cry04_2.asm b/audio/sfx/cry04_2.asm deleted file mode 100644 index aa5baf29..00000000 --- a/audio/sfx/cry04_2.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_Cry04_2_Ch4: - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_Cry04_2_Ch5: - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_Cry04_2_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/cry04_3.asm b/audio/sfx/cry04_3.asm deleted file mode 100644 index b4d9cf2e..00000000 --- a/audio/sfx/cry04_3.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_Cry04_3_Ch4: - dutycycle 240 - unknownsfx0x20 4, 247, 160, 6 - unknownsfx0x20 8, 230, 164, 6 - unknownsfx0x20 4, 214, 160, 6 - unknownsfx0x20 12, 211, 32, 6 - unknownsfx0x20 8, 195, 36, 6 - unknownsfx0x20 4, 194, 32, 6 - unknownsfx0x20 8, 177, 16, 6 - endchannel - - -SFX_Cry04_3_Ch5: - dutycycle 90 - unknownsfx0x20 4, 231, 1, 6 - unknownsfx0x20 8, 214, 3, 6 - unknownsfx0x20 4, 198, 1, 6 - unknownsfx0x20 12, 195, 129, 5 - unknownsfx0x20 8, 179, 131, 5 - unknownsfx0x20 4, 178, 130, 5 - unknownsfx0x20 8, 161, 113, 5 - endchannel - - -SFX_Cry04_3_Ch7: - unknownnoise0x20 7, 214, 92 - unknownnoise0x20 8, 230, 76 - unknownnoise0x20 4, 212, 92 - unknownnoise0x20 4, 212, 76 - unknownnoise0x20 7, 195, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/cry05_1.asm b/audio/sfx/cry05_1.asm deleted file mode 100644 index dc68e77d..00000000 --- a/audio/sfx/cry05_1.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_Cry05_1_Ch4: - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_Cry05_1_Ch5: - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_Cry05_1_Ch7: - endchannel diff --git a/audio/sfx/cry05_2.asm b/audio/sfx/cry05_2.asm deleted file mode 100644 index f7e09dcc..00000000 --- a/audio/sfx/cry05_2.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_Cry05_2_Ch4: - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_Cry05_2_Ch5: - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_Cry05_2_Ch7: - endchannel diff --git a/audio/sfx/cry05_3.asm b/audio/sfx/cry05_3.asm deleted file mode 100644 index 2e8839c9..00000000 --- a/audio/sfx/cry05_3.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_Cry05_3_Ch4: - dutycycle 10 - unknownsfx0x20 6, 226, 0, 5 - unknownsfx0x20 6, 227, 128, 5 - unknownsfx0x20 6, 211, 112, 5 - unknownsfx0x20 8, 161, 96, 5 - endchannel - - -SFX_Cry05_3_Ch5: - dutycycle 245 - unknownsfx0x20 6, 226, 130, 4 - unknownsfx0x20 6, 211, 1, 5 - unknownsfx0x20 6, 178, 226, 4 - unknownsfx0x20 8, 129, 193, 4 - - -SFX_Cry05_3_Ch7: - endchannel diff --git a/audio/sfx/cry06_1.asm b/audio/sfx/cry06_1.asm deleted file mode 100644 index d3b051c8..00000000 --- a/audio/sfx/cry06_1.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_Cry06_1_Ch4: - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_Cry06_1_Ch5: - endchannel - - -SFX_Cry06_1_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/cry06_2.asm b/audio/sfx/cry06_2.asm deleted file mode 100644 index 6a46246c..00000000 --- a/audio/sfx/cry06_2.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_Cry06_2_Ch4: - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_Cry06_2_Ch5: - endchannel - - -SFX_Cry06_2_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/cry06_3.asm b/audio/sfx/cry06_3.asm deleted file mode 100644 index 692cd1cf..00000000 --- a/audio/sfx/cry06_3.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_Cry06_3_Ch4: - dutycycle 250 - unknownsfx0x20 6, 131, 71, 2 - unknownsfx0x20 15, 98, 38, 2 - unknownsfx0x20 4, 82, 69, 2 - unknownsfx0x20 9, 99, 6, 2 - unknownsfx0x20 15, 130, 37, 2 - unknownsfx0x20 15, 66, 7, 2 - - -SFX_Cry06_3_Ch5: - endchannel - - -SFX_Cry06_3_Ch7: - unknownnoise0x20 8, 212, 140 - unknownnoise0x20 4, 226, 156 - unknownnoise0x20 15, 198, 140 - unknownnoise0x20 8, 228, 172 - unknownnoise0x20 15, 215, 156 - unknownnoise0x20 15, 242, 172 - endchannel diff --git a/audio/sfx/cry07_1.asm b/audio/sfx/cry07_1.asm deleted file mode 100644 index 2eebb7f9..00000000 --- a/audio/sfx/cry07_1.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry07_1_Ch4: - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_Cry07_1_Ch5: - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_Cry07_1_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/cry07_2.asm b/audio/sfx/cry07_2.asm deleted file mode 100644 index e0381424..00000000 --- a/audio/sfx/cry07_2.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry07_2_Ch4: - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_Cry07_2_Ch5: - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_Cry07_2_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/cry07_3.asm b/audio/sfx/cry07_3.asm deleted file mode 100644 index 92a401a9..00000000 --- a/audio/sfx/cry07_3.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry07_3_Ch4: - dutycycle 240 - unknownsfx0x20 4, 243, 224, 6 - unknownsfx0x20 15, 228, 64, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_Cry07_3_Ch5: - dutycycle 10 - unknownsfx0x20 3, 195, 131, 6 - unknownsfx0x20 14, 180, 2, 6 - unknownsfx0x20 8, 161, 1, 6 - endchannel - - -SFX_Cry07_3_Ch7: - unknownnoise0x20 4, 211, 92 - unknownnoise0x20 15, 230, 76 - unknownnoise0x20 8, 177, 92 - endchannel diff --git a/audio/sfx/cry08_1.asm b/audio/sfx/cry08_1.asm deleted file mode 100644 index 91901faa..00000000 --- a/audio/sfx/cry08_1.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_Cry08_1_Ch4: - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_Cry08_1_Ch5: - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_Cry08_1_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/cry08_2.asm b/audio/sfx/cry08_2.asm deleted file mode 100644 index 45d12f38..00000000 --- a/audio/sfx/cry08_2.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_Cry08_2_Ch4: - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_Cry08_2_Ch5: - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_Cry08_2_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/cry08_3.asm b/audio/sfx/cry08_3.asm deleted file mode 100644 index 8f1ec3fb..00000000 --- a/audio/sfx/cry08_3.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_Cry08_3_Ch4: - dutycycle 240 - unknownsfx0x20 15, 246, 101, 5 - unknownsfx0x20 10, 228, 124, 5 - unknownsfx0x20 3, 194, 92, 5 - unknownsfx0x20 15, 178, 60, 5 - endchannel - - -SFX_Cry08_3_Ch5: - dutycycle 90 - unknownsfx0x20 14, 214, 3, 5 - unknownsfx0x20 9, 180, 27, 5 - unknownsfx0x20 4, 146, 250, 4 - unknownsfx0x20 15, 162, 219, 4 - endchannel - - -SFX_Cry08_3_Ch7: - unknownnoise0x20 12, 230, 76 - unknownnoise0x20 11, 215, 92 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/cry09_1.asm b/audio/sfx/cry09_1.asm deleted file mode 100644 index 11b4ab55..00000000 --- a/audio/sfx/cry09_1.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_Cry09_1_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_Cry09_1_Ch5: - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_Cry09_1_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/cry09_2.asm b/audio/sfx/cry09_2.asm deleted file mode 100644 index ac4b1f74..00000000 --- a/audio/sfx/cry09_2.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_Cry09_2_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_Cry09_2_Ch5: - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_Cry09_2_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/cry09_3.asm b/audio/sfx/cry09_3.asm deleted file mode 100644 index 1d3856cc..00000000 --- a/audio/sfx/cry09_3.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_Cry09_3_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 160, 7 - unknownsfx0x20 6, 230, 163, 7 - unknownsfx0x20 10, 244, 160, 7 - dutycycle 165 - unknownsfx0x20 10, 246, 216, 7 - unknownsfx0x20 4, 227, 215, 7 - unknownsfx0x20 15, 242, 216, 7 - endchannel - - -SFX_Cry09_3_Ch5: - dutycycle 5 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 15, 167, 161, 6 - unknownsfx0x20 6, 134, 162, 6 - unknownsfx0x20 10, 116, 161, 6 - dutycycle 95 - unknownsfx0x20 10, 118, 214, 6 - unknownsfx0x20 4, 131, 217, 6 - unknownsfx0x20 15, 162, 215, 6 - endchannel - - -SFX_Cry09_3_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 6, 197, 59 - unknownnoise0x20 6, 228, 61 - unknownnoise0x20 8, 182, 60 - unknownnoise0x20 6, 212, 61 - unknownnoise0x20 8, 193, 59 - endchannel diff --git a/audio/sfx/cry0a_1.asm b/audio/sfx/cry0a_1.asm deleted file mode 100644 index 051a5d73..00000000 --- a/audio/sfx/cry0a_1.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_Cry0A_1_Ch4: - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_Cry0A_1_Ch5: - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_Cry0A_1_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/cry0a_2.asm b/audio/sfx/cry0a_2.asm deleted file mode 100644 index d7fdd264..00000000 --- a/audio/sfx/cry0a_2.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_Cry0A_2_Ch4: - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_Cry0A_2_Ch5: - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_Cry0A_2_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/cry0a_3.asm b/audio/sfx/cry0a_3.asm deleted file mode 100644 index e16287c4..00000000 --- a/audio/sfx/cry0a_3.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_Cry0A_3_Ch4: - dutycycle 240 - unknownsfx0x20 8, 247, 224, 6 - unknownsfx0x20 6, 230, 229, 6 - unknownsfx0x20 3, 244, 224, 6 - unknownsfx0x20 3, 246, 208, 6 - unknownsfx0x20 3, 227, 192, 6 - unknownsfx0x20 4, 242, 176, 6 - unknownsfx0x20 15, 162, 200, 6 - endchannel - - -SFX_Cry0A_3_Ch5: - dutycycle 5 - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 8, 167, 161, 6 - unknownsfx0x20 6, 134, 163, 6 - unknownsfx0x20 3, 116, 161, 6 - unknownsfx0x20 3, 118, 145, 6 - unknownsfx0x20 3, 131, 130, 6 - unknownsfx0x20 4, 162, 113, 6 - unknownsfx0x20 15, 114, 137, 6 - endchannel - - -SFX_Cry0A_3_Ch7: - unknownnoise0x20 2, 242, 60 - unknownnoise0x20 8, 228, 62 - unknownnoise0x20 8, 215, 60 - unknownnoise0x20 5, 197, 59 - unknownnoise0x20 3, 212, 44 - unknownnoise0x20 2, 182, 60 - unknownnoise0x20 3, 164, 44 - unknownnoise0x20 8, 145, 60 - endchannel diff --git a/audio/sfx/cry0b_1.asm b/audio/sfx/cry0b_1.asm deleted file mode 100644 index 5ee9b81c..00000000 --- a/audio/sfx/cry0b_1.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_Cry0B_1_Ch4: - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_Cry0B_1_Ch5: - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_Cry0B_1_Ch7: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/cry0b_2.asm b/audio/sfx/cry0b_2.asm deleted file mode 100644 index f762ea02..00000000 --- a/audio/sfx/cry0b_2.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_Cry0B_2_Ch4: - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_Cry0B_2_Ch5: - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_Cry0B_2_Ch7: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/cry0b_3.asm b/audio/sfx/cry0b_3.asm deleted file mode 100644 index 22420974..00000000 --- a/audio/sfx/cry0b_3.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_Cry0B_3_Ch4: - dutycycle 204 - unknownsfx0x20 4, 241, 0, 7 - unknownsfx0x20 4, 225, 128, 7 - unknownsfx0x20 4, 209, 64, 7 - unknownsfx0x20 4, 225, 64, 7 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 209, 0, 7 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 209, 130, 7 - unknownsfx0x20 4, 193, 66, 7 - unknownsfx0x20 8, 177, 65, 7 - endchannel - - -SFX_Cry0B_3_Ch5: - dutycycle 68 - unknownsfx0x20 12, 8, 0, 0 - unknownsfx0x20 4, 241, 1, 7 - unknownsfx0x20 4, 225, 130, 7 - unknownsfx0x20 4, 209, 65, 7 - unknownsfx0x20 4, 225, 65, 7 - unknownsfx0x20 4, 241, 130, 7 - unknownsfx0x20 8, 209, 1, 7 - endchannel - - -SFX_Cry0B_3_Ch7: - unknownnoise0x20 15, 8, 0 - unknownnoise0x20 4, 8, 0 - unknownnoise0x20 4, 209, 76 - unknownnoise0x20 4, 177, 44 - unknownnoise0x20 4, 209, 60 - unknownnoise0x20 4, 177, 60 - unknownnoise0x20 4, 193, 44 - unknownnoise0x20 8, 161, 76 - endchannel diff --git a/audio/sfx/cry0c_1.asm b/audio/sfx/cry0c_1.asm deleted file mode 100644 index dfbf0283..00000000 --- a/audio/sfx/cry0c_1.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry0C_1_Ch4: - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_Cry0C_1_Ch5: - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_Cry0C_1_Ch7: - endchannel diff --git a/audio/sfx/cry0c_2.asm b/audio/sfx/cry0c_2.asm deleted file mode 100644 index 11e0d06a..00000000 --- a/audio/sfx/cry0c_2.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry0C_2_Ch4: - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_Cry0C_2_Ch5: - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_Cry0C_2_Ch7: - endchannel diff --git a/audio/sfx/cry0c_3.asm b/audio/sfx/cry0c_3.asm deleted file mode 100644 index 6fc798f2..00000000 --- a/audio/sfx/cry0c_3.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry0C_3_Ch4: - dutycycle 204 - unknownsfx0x20 8, 245, 0, 6 - unknownsfx0x20 2, 210, 56, 6 - unknownsfx0x20 2, 194, 48, 6 - unknownsfx0x20 2, 194, 40, 6 - unknownsfx0x20 2, 178, 32, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 2, 162, 24, 6 - unknownsfx0x20 2, 178, 16, 6 - unknownsfx0x20 8, 193, 32, 6 - endchannel - - -SFX_Cry0C_3_Ch5: - dutycycle 68 - unknownsfx0x20 12, 195, 192, 5 - unknownsfx0x20 3, 177, 249, 5 - unknownsfx0x20 2, 161, 241, 5 - unknownsfx0x20 2, 161, 233, 5 - unknownsfx0x20 2, 145, 225, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 2, 129, 209, 5 - unknownsfx0x20 2, 145, 217, 5 - unknownsfx0x20 8, 145, 225, 5 - - -SFX_Cry0C_3_Ch7: - endchannel diff --git a/audio/sfx/cry0d_1.asm b/audio/sfx/cry0d_1.asm deleted file mode 100644 index 2864fa01..00000000 --- a/audio/sfx/cry0d_1.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_Cry0D_1_Ch4: - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_1_Ch4 - endchannel - - -SFX_Cry0D_1_Ch5: - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_Cry0D_1_Ch7: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/cry0d_2.asm b/audio/sfx/cry0d_2.asm deleted file mode 100644 index ef4a0eb6..00000000 --- a/audio/sfx/cry0d_2.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_Cry0D_2_Ch4: - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_2_Ch4 - endchannel - - -SFX_Cry0D_2_Ch5: - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_Cry0D_2_Ch7: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/cry0d_3.asm b/audio/sfx/cry0d_3.asm deleted file mode 100644 index 1fbc40b5..00000000 --- a/audio/sfx/cry0d_3.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_Cry0D_3_Ch4: - dutycycle 136 - unknownsfx0x20 5, 242, 80, 6 - unknownsfx0x20 9, 209, 96, 6 - unknownsfx0x20 5, 226, 18, 6 - unknownsfx0x20 9, 193, 34, 6 - unknownsfx0x20 5, 242, 16, 6 - unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_Cry0D_3_Ch4 - endchannel - - -SFX_Cry0D_3_Ch5: - dutycycle 64 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 5, 242, 81, 6 - unknownsfx0x20 9, 209, 97, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 12, 209, 33, 6 - unknownsfx0x20 5, 226, 20, 6 - unknownsfx0x20 8, 193, 36, 6 - unknownsfx0x20 5, 242, 17, 6 - unknownsfx0x20 4, 209, 33, 6 - endchannel - - -SFX_Cry0D_3_Ch7: - unknownnoise0x20 6, 210, 28 - unknownnoise0x20 9, 177, 44 - unknownnoise0x20 8, 194, 44 - unknownnoise0x20 9, 177, 60 - unknownnoise0x20 6, 194, 44 - unknownnoise0x20 9, 162, 60 - unknownnoise0x20 7, 194, 44 - unknownnoise0x20 5, 161, 60 - unknownnoise0x20 9, 194, 44 - unknownnoise0x20 4, 161, 60 - endchannel diff --git a/audio/sfx/cry0e_1.asm b/audio/sfx/cry0e_1.asm deleted file mode 100644 index 37cabb7c..00000000 --- a/audio/sfx/cry0e_1.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_Cry0E_1_Ch4: - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_Cry0E_1_Ch5: - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_Cry0E_1_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/cry0e_2.asm b/audio/sfx/cry0e_2.asm deleted file mode 100644 index 5f6f481f..00000000 --- a/audio/sfx/cry0e_2.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_Cry0E_2_Ch4: - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_Cry0E_2_Ch5: - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_Cry0E_2_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/cry0e_3.asm b/audio/sfx/cry0e_3.asm deleted file mode 100644 index 13cf9405..00000000 --- a/audio/sfx/cry0e_3.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_Cry0E_3_Ch4: - dutycycle 165 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 4, 242, 128, 7 - unknownsfx0x20 2, 146, 64, 7 - unknownsfx0x20 8, 225, 0, 6 - endchannel - - -SFX_Cry0E_3_Ch5: - dutycycle 10 - unknownsfx0x20 4, 177, 225, 6 - unknownsfx0x20 3, 194, 225, 6 - unknownsfx0x20 3, 98, 129, 6 - unknownsfx0x20 8, 177, 225, 5 - endchannel - - -SFX_Cry0E_3_Ch7: - unknownnoise0x20 2, 97, 50 - unknownnoise0x20 2, 97, 33 - unknownnoise0x20 8, 97, 17 - endchannel diff --git a/audio/sfx/cry0f_1.asm b/audio/sfx/cry0f_1.asm deleted file mode 100644 index 81abdc09..00000000 --- a/audio/sfx/cry0f_1.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry0F_1_Ch4: - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_Cry0F_1_Ch5: - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_Cry0F_1_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/cry0f_2.asm b/audio/sfx/cry0f_2.asm deleted file mode 100644 index 112b9e8b..00000000 --- a/audio/sfx/cry0f_2.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry0F_2_Ch4: - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_Cry0F_2_Ch5: - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_Cry0F_2_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/cry0f_3.asm b/audio/sfx/cry0f_3.asm deleted file mode 100644 index 08abd131..00000000 --- a/audio/sfx/cry0f_3.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry0F_3_Ch4: - dutycycle 241 - unknownsfx0x20 4, 247, 192, 7 - unknownsfx0x20 12, 230, 194, 7 - unknownsfx0x20 6, 181, 128, 6 - unknownsfx0x20 4, 196, 112, 6 - unknownsfx0x20 4, 181, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_Cry0F_3_Ch5: - dutycycle 204 - unknownsfx0x20 3, 199, 129, 7 - unknownsfx0x20 12, 182, 128, 7 - unknownsfx0x20 6, 165, 65, 6 - unknownsfx0x20 4, 196, 50, 6 - unknownsfx0x20 6, 181, 33, 6 - unknownsfx0x20 8, 161, 2, 6 - endchannel - - -SFX_Cry0F_3_Ch7: - unknownnoise0x20 3, 228, 60 - unknownnoise0x20 12, 214, 44 - unknownnoise0x20 4, 228, 60 - unknownnoise0x20 8, 183, 92 - unknownnoise0x20 15, 194, 93 - endchannel diff --git a/audio/sfx/cry10_1.asm b/audio/sfx/cry10_1.asm deleted file mode 100644 index eef13d3d..00000000 --- a/audio/sfx/cry10_1.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Cry10_1_Ch4: - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_Cry10_1_Ch5: - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_Cry10_1_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/cry10_2.asm b/audio/sfx/cry10_2.asm deleted file mode 100644 index dd468979..00000000 --- a/audio/sfx/cry10_2.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Cry10_2_Ch4: - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_Cry10_2_Ch5: - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_Cry10_2_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/cry10_3.asm b/audio/sfx/cry10_3.asm deleted file mode 100644 index e9a5200d..00000000 --- a/audio/sfx/cry10_3.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Cry10_3_Ch4: - dutycycle 201 - unknownsfx0x20 8, 247, 128, 6 - unknownsfx0x20 2, 247, 96, 6 - unknownsfx0x20 1, 231, 64, 6 - unknownsfx0x20 1, 231, 32, 6 - unknownsfx0x20 15, 209, 0, 6 - unknownsfx0x20 4, 199, 64, 7 - unknownsfx0x20 4, 167, 48, 7 - unknownsfx0x20 15, 145, 32, 7 - endchannel - - -SFX_Cry10_3_Ch5: - dutycycle 121 - unknownsfx0x20 10, 231, 130, 6 - unknownsfx0x20 2, 231, 98, 6 - unknownsfx0x20 1, 215, 66, 6 - unknownsfx0x20 1, 215, 34, 6 - unknownsfx0x20 15, 193, 2, 6 - unknownsfx0x20 4, 183, 66, 7 - unknownsfx0x20 2, 151, 50, 7 - unknownsfx0x20 15, 129, 34, 7 - endchannel - - -SFX_Cry10_3_Ch7: - unknownnoise0x20 4, 116, 33 - unknownnoise0x20 4, 116, 16 - unknownnoise0x20 4, 113, 32 - endchannel diff --git a/audio/sfx/cry11_1.asm b/audio/sfx/cry11_1.asm deleted file mode 100644 index f7c314ef..00000000 --- a/audio/sfx/cry11_1.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_Cry11_1_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_Cry11_1_Ch5: - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_Cry11_1_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry11_2.asm b/audio/sfx/cry11_2.asm deleted file mode 100644 index 0009a0ec..00000000 --- a/audio/sfx/cry11_2.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_Cry11_2_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_Cry11_2_Ch5: - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_Cry11_2_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry11_3.asm b/audio/sfx/cry11_3.asm deleted file mode 100644 index a8af19f6..00000000 --- a/audio/sfx/cry11_3.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_Cry11_3_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 160, 7 - unknownsfx0x20 8, 230, 164, 7 - unknownsfx0x20 4, 214, 160, 7 - unknownsfx0x20 15, 211, 32, 7 - unknownsfx0x20 8, 195, 35, 7 - unknownsfx0x20 2, 194, 40, 7 - unknownsfx0x20 8, 177, 48, 7 - endchannel - - -SFX_Cry11_3_Ch5: - dutycycle 10 - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 6, 167, 65, 7 - unknownsfx0x20 8, 134, 67, 7 - unknownsfx0x20 4, 118, 65, 7 - unknownsfx0x20 13, 131, 194, 6 - unknownsfx0x20 7, 115, 193, 6 - unknownsfx0x20 3, 130, 204, 6 - unknownsfx0x20 8, 113, 216, 6 - endchannel - - -SFX_Cry11_3_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 230, 58 - unknownnoise0x20 4, 215, 58 - unknownnoise0x20 6, 214, 44 - unknownnoise0x20 8, 229, 60 - unknownnoise0x20 12, 210, 61 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry12_1.asm b/audio/sfx/cry12_1.asm deleted file mode 100644 index 29d93eff..00000000 --- a/audio/sfx/cry12_1.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry12_1_Ch4: - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_Cry12_1_Ch5: - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_Cry12_1_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/cry12_2.asm b/audio/sfx/cry12_2.asm deleted file mode 100644 index 90f373c0..00000000 --- a/audio/sfx/cry12_2.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry12_2_Ch4: - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_Cry12_2_Ch5: - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_Cry12_2_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/cry12_3.asm b/audio/sfx/cry12_3.asm deleted file mode 100644 index f2c012ae..00000000 --- a/audio/sfx/cry12_3.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry12_3_Ch4: - dutycycle 165 - unknownsfx0x20 12, 242, 64, 4 - unknownsfx0x20 15, 227, 160, 4 - unknownsfx0x20 4, 210, 144, 4 - unknownsfx0x20 8, 209, 128, 4 - endchannel - - -SFX_Cry12_3_Ch5: - dutycycle 238 - unknownsfx0x20 11, 210, 56, 4 - unknownsfx0x20 14, 198, 152, 4 - unknownsfx0x20 3, 178, 136, 4 - unknownsfx0x20 8, 177, 120, 4 - endchannel - - -SFX_Cry12_3_Ch7: - unknownnoise0x20 10, 230, 108 - unknownnoise0x20 15, 210, 92 - unknownnoise0x20 3, 194, 108 - unknownnoise0x20 8, 209, 92 - endchannel diff --git a/audio/sfx/cry13_1.asm b/audio/sfx/cry13_1.asm deleted file mode 100644 index 703db728..00000000 --- a/audio/sfx/cry13_1.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry13_1_Ch4: - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_Cry13_1_Ch5: - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_Cry13_1_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/cry13_2.asm b/audio/sfx/cry13_2.asm deleted file mode 100644 index 7d75853c..00000000 --- a/audio/sfx/cry13_2.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry13_2_Ch4: - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_Cry13_2_Ch5: - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_Cry13_2_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/cry13_3.asm b/audio/sfx/cry13_3.asm deleted file mode 100644 index 53296f1a..00000000 --- a/audio/sfx/cry13_3.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry13_3_Ch4: - dutycycle 51 - unknownsfx0x20 15, 246, 192, 5 - unknownsfx0x20 8, 227, 188, 5 - unknownsfx0x20 6, 210, 208, 5 - unknownsfx0x20 6, 178, 224, 5 - unknownsfx0x20 6, 194, 240, 5 - unknownsfx0x20 8, 177, 0, 6 - endchannel - - -SFX_Cry13_3_Ch5: - dutycycle 153 - unknownsfx0x20 14, 198, 177, 4 - unknownsfx0x20 7, 195, 173, 4 - unknownsfx0x20 5, 178, 193, 4 - unknownsfx0x20 8, 146, 209, 4 - unknownsfx0x20 6, 162, 225, 4 - unknownsfx0x20 8, 145, 241, 4 - endchannel - - -SFX_Cry13_3_Ch7: - unknownnoise0x20 10, 230, 92 - unknownnoise0x20 10, 214, 108 - unknownnoise0x20 4, 194, 76 - unknownnoise0x20 6, 211, 92 - unknownnoise0x20 8, 179, 76 - unknownnoise0x20 8, 161, 92 - endchannel diff --git a/audio/sfx/cry14_1.asm b/audio/sfx/cry14_1.asm deleted file mode 100644 index fa8964de..00000000 --- a/audio/sfx/cry14_1.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry14_1_Ch4: - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_Cry14_1_Ch5: - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_Cry14_1_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry14_2.asm b/audio/sfx/cry14_2.asm deleted file mode 100644 index 1f70dca8..00000000 --- a/audio/sfx/cry14_2.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry14_2_Ch4: - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_Cry14_2_Ch5: - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_Cry14_2_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry14_3.asm b/audio/sfx/cry14_3.asm deleted file mode 100644 index 3bab2100..00000000 --- a/audio/sfx/cry14_3.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry14_3_Ch4: - dutycycle 240 - unknownsfx0x20 8, 228, 144, 7 - unknownsfx0x20 15, 245, 192, 7 - unknownsfx0x20 8, 209, 216, 7 - endchannel - - -SFX_Cry14_3_Ch5: - dutycycle 165 - unknownsfx0x20 10, 196, 113, 7 - unknownsfx0x20 15, 182, 162, 7 - unknownsfx0x20 8, 161, 183, 7 - endchannel - - -SFX_Cry14_3_Ch7: - unknownnoise0x20 8, 228, 76 - unknownnoise0x20 14, 196, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry15_1.asm b/audio/sfx/cry15_1.asm deleted file mode 100644 index 0220ad4f..00000000 --- a/audio/sfx/cry15_1.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry15_1_Ch4: - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_Cry15_1_Ch5: - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_Cry15_1_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/cry15_2.asm b/audio/sfx/cry15_2.asm deleted file mode 100644 index 2ebd7ab0..00000000 --- a/audio/sfx/cry15_2.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry15_2_Ch4: - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_Cry15_2_Ch5: - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_Cry15_2_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/cry15_3.asm b/audio/sfx/cry15_3.asm deleted file mode 100644 index 39ba7a74..00000000 --- a/audio/sfx/cry15_3.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry15_3_Ch4: - dutycycle 240 - unknownsfx0x20 4, 243, 128, 7 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 8, 211, 16, 7 - unknownsfx0x20 4, 194, 0, 7 - unknownsfx0x20 4, 210, 240, 6 - unknownsfx0x20 8, 193, 224, 6 - endchannel - - -SFX_Cry15_3_Ch5: - dutycycle 90 - unknownsfx0x20 6, 195, 1, 7 - unknownsfx0x20 14, 183, 129, 6 - unknownsfx0x20 7, 179, 146, 6 - unknownsfx0x20 3, 162, 129, 6 - unknownsfx0x20 4, 178, 114, 6 - unknownsfx0x20 8, 161, 97, 6 - endchannel - - -SFX_Cry15_3_Ch7: - unknownnoise0x20 6, 227, 92 - unknownnoise0x20 14, 214, 76 - unknownnoise0x20 6, 198, 60 - unknownnoise0x20 3, 179, 76 - unknownnoise0x20 3, 162, 92 - unknownnoise0x20 8, 177, 108 - endchannel diff --git a/audio/sfx/cry16_1.asm b/audio/sfx/cry16_1.asm deleted file mode 100644 index 34d6f6d9..00000000 --- a/audio/sfx/cry16_1.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry16_1_Ch4: - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_Cry16_1_Ch5: - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_Cry16_1_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/cry16_2.asm b/audio/sfx/cry16_2.asm deleted file mode 100644 index 8948cd29..00000000 --- a/audio/sfx/cry16_2.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry16_2_Ch4: - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_Cry16_2_Ch5: - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_Cry16_2_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/cry16_3.asm b/audio/sfx/cry16_3.asm deleted file mode 100644 index 026ee67b..00000000 --- a/audio/sfx/cry16_3.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Cry16_3_Ch4: - dutycycle 240 - unknownsfx0x20 15, 215, 128, 7 - unknownsfx0x20 4, 230, 160, 7 - unknownsfx0x20 15, 210, 64, 7 - endchannel - - -SFX_Cry16_3_Ch5: - dutycycle 90 - unknownsfx0x20 15, 199, 83, 7 - unknownsfx0x20 5, 182, 114, 7 - unknownsfx0x20 15, 194, 17, 7 - endchannel - - -SFX_Cry16_3_Ch7: - unknownnoise0x20 13, 246, 76 - unknownnoise0x20 4, 230, 60 - unknownnoise0x20 15, 242, 76 - endchannel diff --git a/audio/sfx/cry17_1.asm b/audio/sfx/cry17_1.asm deleted file mode 100644 index 97dec764..00000000 --- a/audio/sfx/cry17_1.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry17_1_Ch4: - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_Cry17_1_Ch5: - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_Cry17_1_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/cry17_2.asm b/audio/sfx/cry17_2.asm deleted file mode 100644 index a6ab03a2..00000000 --- a/audio/sfx/cry17_2.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry17_2_Ch4: - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_Cry17_2_Ch5: - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_Cry17_2_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/cry17_3.asm b/audio/sfx/cry17_3.asm deleted file mode 100644 index 53555206..00000000 --- a/audio/sfx/cry17_3.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry17_3_Ch4: - dutycycle 15 - unknownsfx0x20 15, 247, 0, 5 - unknownsfx0x20 15, 231, 8, 5 - unknownsfx0x20 8, 180, 128, 4 - unknownsfx0x20 15, 162, 96, 4 - endchannel - - -SFX_Cry17_3_Ch5: - dutycycle 68 - unknownsfx0x20 14, 215, 129, 4 - unknownsfx0x20 14, 199, 137, 4 - unknownsfx0x20 10, 180, 1, 4 - unknownsfx0x20 15, 194, 225, 3 - endchannel - - -SFX_Cry17_3_Ch7: - unknownnoise0x20 14, 247, 124 - unknownnoise0x20 12, 246, 108 - unknownnoise0x20 9, 228, 124 - unknownnoise0x20 15, 226, 108 - endchannel diff --git a/audio/sfx/cry18_1.asm b/audio/sfx/cry18_1.asm deleted file mode 100644 index 8cb3283f..00000000 --- a/audio/sfx/cry18_1.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_Cry18_1_Ch4: - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_Cry18_1_Ch5: - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_Cry18_1_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/cry18_2.asm b/audio/sfx/cry18_2.asm deleted file mode 100644 index 01dacd5f..00000000 --- a/audio/sfx/cry18_2.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_Cry18_2_Ch4: - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_Cry18_2_Ch5: - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_Cry18_2_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/cry18_3.asm b/audio/sfx/cry18_3.asm deleted file mode 100644 index 23d2d6a6..00000000 --- a/audio/sfx/cry18_3.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_Cry18_3_Ch4: - dutycycle 80 - unknownsfx0x20 10, 245, 128, 6 - unknownsfx0x20 3, 226, 160, 6 - unknownsfx0x20 3, 242, 192, 6 - unknownsfx0x20 3, 226, 224, 6 - unknownsfx0x20 3, 210, 0, 7 - unknownsfx0x20 3, 194, 224, 6 - unknownsfx0x20 3, 210, 192, 6 - unknownsfx0x20 8, 193, 160, 6 - endchannel - - -SFX_Cry18_3_Ch5: - dutycycle 15 - unknownsfx0x20 9, 213, 49, 6 - unknownsfx0x20 3, 210, 82, 6 - unknownsfx0x20 3, 226, 113, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 178, 6 - unknownsfx0x20 3, 178, 145, 6 - unknownsfx0x20 3, 194, 113, 6 - unknownsfx0x20 8, 177, 81, 6 - endchannel - - -SFX_Cry18_3_Ch7: - unknownnoise0x20 6, 227, 76 - unknownnoise0x20 4, 195, 60 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 4, 196, 44 - unknownnoise0x20 6, 180, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/cry19_1.asm b/audio/sfx/cry19_1.asm deleted file mode 100644 index 2e6790e5..00000000 --- a/audio/sfx/cry19_1.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_Cry19_1_Ch4: - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_Cry19_1_Ch5: - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_Cry19_1_Ch7: - endchannel diff --git a/audio/sfx/cry19_2.asm b/audio/sfx/cry19_2.asm deleted file mode 100644 index f412ec14..00000000 --- a/audio/sfx/cry19_2.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_Cry19_2_Ch4: - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_Cry19_2_Ch5: - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_Cry19_2_Ch7: - endchannel diff --git a/audio/sfx/cry19_3.asm b/audio/sfx/cry19_3.asm deleted file mode 100644 index 2baff05e..00000000 --- a/audio/sfx/cry19_3.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_Cry19_3_Ch4: - dutycycle 27 - unknownsfx0x20 7, 210, 64, 7 - unknownsfx0x20 15, 229, 96, 7 - unknownsfx0x20 15, 193, 48, 7 - endchannel - - -SFX_Cry19_3_Ch5: - dutycycle 129 - unknownsfx0x20 2, 194, 1, 7 - unknownsfx0x20 4, 194, 8, 7 - unknownsfx0x20 15, 215, 65, 7 - unknownsfx0x20 15, 162, 1, 7 - - -SFX_Cry19_3_Ch7: - endchannel diff --git a/audio/sfx/cry1a_1.asm b/audio/sfx/cry1a_1.asm deleted file mode 100644 index 5d03596e..00000000 --- a/audio/sfx/cry1a_1.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry1A_1_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_Cry1A_1_Ch5: - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_Cry1A_1_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry1a_2.asm b/audio/sfx/cry1a_2.asm deleted file mode 100644 index 4dcf2a42..00000000 --- a/audio/sfx/cry1a_2.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry1A_2_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_Cry1A_2_Ch5: - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_Cry1A_2_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry1a_3.asm b/audio/sfx/cry1a_3.asm deleted file mode 100644 index 274ce438..00000000 --- a/audio/sfx/cry1a_3.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Cry1A_3_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 64, 7 - unknownsfx0x20 12, 230, 68, 7 - unknownsfx0x20 6, 213, 80, 7 - unknownsfx0x20 4, 195, 96, 7 - unknownsfx0x20 3, 195, 128, 7 - unknownsfx0x20 8, 209, 160, 7 - endchannel - - -SFX_Cry1A_3_Ch5: - dutycycle 10 - unknownsfx0x20 6, 199, 1, 7 - unknownsfx0x20 11, 182, 2, 7 - unknownsfx0x20 6, 165, 17, 7 - unknownsfx0x20 4, 147, 33, 7 - unknownsfx0x20 3, 163, 65, 7 - unknownsfx0x20 8, 145, 98, 7 - endchannel - - -SFX_Cry1A_3_Ch7: - unknownnoise0x20 3, 226, 60 - unknownnoise0x20 8, 214, 76 - unknownnoise0x20 5, 212, 60 - unknownnoise0x20 12, 199, 76 - unknownnoise0x20 2, 226, 60 - unknownnoise0x20 8, 209, 44 - endchannel diff --git a/audio/sfx/cry1b_1.asm b/audio/sfx/cry1b_1.asm deleted file mode 100644 index 562239c7..00000000 --- a/audio/sfx/cry1b_1.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_Cry1B_1_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_Cry1B_1_Ch5: - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_Cry1B_1_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/cry1b_2.asm b/audio/sfx/cry1b_2.asm deleted file mode 100644 index 45bb41a2..00000000 --- a/audio/sfx/cry1b_2.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_Cry1B_2_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_Cry1B_2_Ch5: - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_Cry1B_2_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/cry1b_3.asm b/audio/sfx/cry1b_3.asm deleted file mode 100644 index e6e31b00..00000000 --- a/audio/sfx/cry1b_3.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_Cry1B_3_Ch4: - dutycycle 240 - unknownsfx0x20 6, 247, 192, 6 - unknownsfx0x20 15, 231, 0, 7 - unknownsfx0x20 4, 244, 240, 6 - unknownsfx0x20 4, 228, 224, 6 - unknownsfx0x20 8, 209, 208, 6 - endchannel - - -SFX_Cry1B_3_Ch5: - dutycycle 10 - unknownsfx0x20 7, 230, 129, 6 - unknownsfx0x20 14, 213, 193, 6 - unknownsfx0x20 4, 196, 177, 6 - unknownsfx0x20 4, 212, 161, 6 - unknownsfx0x20 8, 193, 145, 6 - endchannel - - -SFX_Cry1B_3_Ch7: - unknownnoise0x20 10, 166, 60 - unknownnoise0x20 14, 148, 44 - unknownnoise0x20 5, 163, 60 - unknownnoise0x20 8, 145, 44 - endchannel diff --git a/audio/sfx/cry1c_1.asm b/audio/sfx/cry1c_1.asm deleted file mode 100644 index 332b7da8..00000000 --- a/audio/sfx/cry1c_1.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Cry1C_1_Ch4: - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_Cry1C_1_Ch5: - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_Cry1C_1_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/cry1c_2.asm b/audio/sfx/cry1c_2.asm deleted file mode 100644 index aee95be5..00000000 --- a/audio/sfx/cry1c_2.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Cry1C_2_Ch4: - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_Cry1C_2_Ch5: - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_Cry1C_2_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/cry1c_3.asm b/audio/sfx/cry1c_3.asm deleted file mode 100644 index 13e687f6..00000000 --- a/audio/sfx/cry1c_3.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Cry1C_3_Ch4: - dutycycle 245 - unknownsfx0x20 7, 214, 225, 7 - unknownsfx0x20 6, 198, 226, 7 - unknownsfx0x20 9, 214, 225, 7 - unknownsfx0x20 7, 198, 224, 7 - unknownsfx0x20 5, 182, 226, 7 - unknownsfx0x20 7, 198, 225, 7 - unknownsfx0x20 6, 182, 224, 7 - unknownsfx0x20 8, 161, 223, 7 - endchannel - - -SFX_Cry1C_3_Ch5: - dutycycle 68 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 6, 179, 199, 7 - unknownsfx0x20 10, 196, 195, 7 - unknownsfx0x20 8, 180, 199, 7 - unknownsfx0x20 6, 195, 201, 7 - unknownsfx0x20 15, 162, 197, 7 - endchannel - - -SFX_Cry1C_3_Ch7: - unknownnoise0x20 13, 25, 124 - unknownnoise0x20 13, 247, 140 - unknownnoise0x20 12, 214, 124 - unknownnoise0x20 8, 196, 108 - unknownnoise0x20 15, 179, 92 - endchannel diff --git a/audio/sfx/cry1d_1.asm b/audio/sfx/cry1d_1.asm deleted file mode 100644 index 4e7b6308..00000000 --- a/audio/sfx/cry1d_1.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry1D_1_Ch4: - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_Cry1D_1_Ch5: - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_Cry1D_1_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/cry1d_2.asm b/audio/sfx/cry1d_2.asm deleted file mode 100644 index 9ee56bf8..00000000 --- a/audio/sfx/cry1d_2.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry1D_2_Ch4: - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_Cry1D_2_Ch5: - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_Cry1D_2_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/cry1d_3.asm b/audio/sfx/cry1d_3.asm deleted file mode 100644 index e2e5fae3..00000000 --- a/audio/sfx/cry1d_3.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Cry1D_3_Ch4: - dutycycle 244 - unknownsfx0x20 15, 240, 5, 7 - unknownsfx0x20 10, 224, 0, 7 - unknownsfx0x20 6, 180, 16, 7 - unknownsfx0x20 4, 211, 0, 7 - unknownsfx0x20 6, 178, 32, 6 - unknownsfx0x20 8, 161, 36, 6 - endchannel - - -SFX_Cry1D_3_Ch5: - dutycycle 34 - unknownsfx0x20 15, 176, 195, 6 - unknownsfx0x20 10, 160, 193, 6 - unknownsfx0x20 6, 132, 210, 6 - unknownsfx0x20 4, 147, 193, 6 - unknownsfx0x20 6, 130, 225, 5 - unknownsfx0x20 8, 97, 232, 5 - endchannel - - -SFX_Cry1D_3_Ch7: - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 15, 214, 60 - unknownnoise0x20 10, 197, 74 - unknownnoise0x20 1, 178, 91 - unknownnoise0x20 15, 194, 76 - endchannel diff --git a/audio/sfx/cry1e_1.asm b/audio/sfx/cry1e_1.asm deleted file mode 100644 index 56d97001..00000000 --- a/audio/sfx/cry1e_1.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_Cry1E_1_Ch4: - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_Cry1E_1_Ch5: - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_Cry1E_1_Ch7: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/cry1e_2.asm b/audio/sfx/cry1e_2.asm deleted file mode 100644 index 7ed25afe..00000000 --- a/audio/sfx/cry1e_2.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_Cry1E_2_Ch4: - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_Cry1E_2_Ch5: - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_Cry1E_2_Ch7: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/cry1e_3.asm b/audio/sfx/cry1e_3.asm deleted file mode 100644 index 82dbdfcc..00000000 --- a/audio/sfx/cry1e_3.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_Cry1E_3_Ch4: - dutycycle 240 - unknownsfx0x20 6, 242, 0, 6 - unknownsfx0x20 6, 226, 64, 6 - unknownsfx0x20 6, 210, 128, 6 - unknownsfx0x20 6, 226, 192, 6 - unknownsfx0x20 6, 210, 0, 7 - unknownsfx0x20 6, 194, 64, 7 - unknownsfx0x20 6, 178, 128, 7 - unknownsfx0x20 8, 161, 192, 7 - endchannel - - -SFX_Cry1E_3_Ch5: - dutycycle 17 - unknownsfx0x20 3, 8, 1, 0 - unknownsfx0x20 6, 194, 193, 5 - unknownsfx0x20 6, 178, 2, 6 - unknownsfx0x20 6, 162, 65, 6 - unknownsfx0x20 6, 178, 130, 6 - unknownsfx0x20 6, 162, 194, 6 - unknownsfx0x20 6, 146, 1, 7 - unknownsfx0x20 6, 162, 66, 7 - unknownsfx0x20 8, 129, 129, 7 - endchannel - - -SFX_Cry1E_3_Ch7: - unknownnoise0x20 6, 8, 1 - unknownnoise0x20 5, 226, 92 - unknownnoise0x20 5, 194, 76 - unknownnoise0x20 5, 210, 60 - unknownnoise0x20 5, 178, 44 - unknownnoise0x20 5, 194, 28 - unknownnoise0x20 5, 162, 27 - unknownnoise0x20 5, 146, 26 - unknownnoise0x20 8, 129, 24 - endchannel diff --git a/audio/sfx/cry1f_1.asm b/audio/sfx/cry1f_1.asm deleted file mode 100644 index a38bd975..00000000 --- a/audio/sfx/cry1f_1.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry1F_1_Ch4: - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_Cry1F_1_Ch5: - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_Cry1F_1_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/cry1f_2.asm b/audio/sfx/cry1f_2.asm deleted file mode 100644 index 3d261bb2..00000000 --- a/audio/sfx/cry1f_2.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry1F_2_Ch4: - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_Cry1F_2_Ch5: - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_Cry1F_2_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/cry1f_3.asm b/audio/sfx/cry1f_3.asm deleted file mode 100644 index 2bdfe24b..00000000 --- a/audio/sfx/cry1f_3.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry1F_3_Ch4: - dutycycle 165 - unknownsfx0x20 3, 244, 65, 6 - unknownsfx0x20 13, 214, 33, 7 - unknownsfx0x20 8, 244, 25, 7 - unknownsfx0x20 8, 193, 26, 7 - endchannel - - -SFX_Cry1F_3_Ch5: - dutycycle 204 - unknownsfx0x20 4, 244, 128, 5 - unknownsfx0x20 14, 230, 224, 6 - unknownsfx0x20 8, 213, 216, 6 - unknownsfx0x20 8, 209, 220, 6 - endchannel - - -SFX_Cry1F_3_Ch7: - unknownnoise0x20 5, 196, 70 - unknownnoise0x20 13, 165, 68 - unknownnoise0x20 8, 196, 69 - unknownnoise0x20 8, 177, 68 - endchannel diff --git a/audio/sfx/cry20_1.asm b/audio/sfx/cry20_1.asm deleted file mode 100644 index 14ec6942..00000000 --- a/audio/sfx/cry20_1.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry20_1_Ch4: - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_Cry20_1_Ch5: - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_Cry20_1_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/cry20_2.asm b/audio/sfx/cry20_2.asm deleted file mode 100644 index bcbf27a6..00000000 --- a/audio/sfx/cry20_2.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry20_2_Ch4: - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_Cry20_2_Ch5: - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_Cry20_2_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/cry20_3.asm b/audio/sfx/cry20_3.asm deleted file mode 100644 index 12e42d7f..00000000 --- a/audio/sfx/cry20_3.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry20_3_Ch4: - dutycycle 240 - unknownsfx0x20 13, 241, 17, 5 - unknownsfx0x20 13, 225, 21, 5 - unknownsfx0x20 13, 225, 17, 5 - unknownsfx0x20 8, 209, 17, 5 - endchannel - - -SFX_Cry20_3_Ch5: - dutycycle 21 - unknownsfx0x20 12, 225, 12, 5 - unknownsfx0x20 12, 209, 16, 5 - unknownsfx0x20 14, 193, 12, 5 - unknownsfx0x20 8, 193, 10, 5 - endchannel - - -SFX_Cry20_3_Ch7: - unknownnoise0x20 14, 242, 101 - unknownnoise0x20 13, 226, 85 - unknownnoise0x20 14, 210, 86 - unknownnoise0x20 8, 209, 102 - endchannel diff --git a/audio/sfx/cry21_1.asm b/audio/sfx/cry21_1.asm deleted file mode 100644 index c08704d7..00000000 --- a/audio/sfx/cry21_1.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_Cry21_1_Ch4: - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_Cry21_1_Ch5: - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_Cry21_1_Ch7: - endchannel diff --git a/audio/sfx/cry21_2.asm b/audio/sfx/cry21_2.asm deleted file mode 100644 index b8f68dbd..00000000 --- a/audio/sfx/cry21_2.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_Cry21_2_Ch4: - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_Cry21_2_Ch5: - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_Cry21_2_Ch7: - endchannel diff --git a/audio/sfx/cry21_3.asm b/audio/sfx/cry21_3.asm deleted file mode 100644 index 4a549af9..00000000 --- a/audio/sfx/cry21_3.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_Cry21_3_Ch4: - dutycycle 27 - unknownsfx0x20 3, 243, 100, 5 - unknownsfx0x20 2, 226, 68, 5 - unknownsfx0x20 5, 209, 34, 5 - unknownsfx0x20 2, 178, 132, 4 - unknownsfx0x20 8, 209, 162, 4 - unknownsfx0x20 3, 243, 36, 5 - unknownsfx0x20 4, 228, 228, 4 - unknownsfx0x20 8, 209, 2, 5 - endchannel - - -SFX_Cry21_3_Ch5: - dutycycle 204 - unknownsfx0x20 3, 211, 96, 5 - unknownsfx0x20 2, 194, 64, 5 - unknownsfx0x20 5, 193, 32, 5 - unknownsfx0x20 2, 146, 128, 4 - unknownsfx0x20 8, 193, 160, 4 - unknownsfx0x20 3, 211, 32, 5 - unknownsfx0x20 3, 196, 224, 4 - unknownsfx0x20 8, 193, 0, 5 - - -SFX_Cry21_3_Ch7: - endchannel diff --git a/audio/sfx/cry22_1.asm b/audio/sfx/cry22_1.asm deleted file mode 100644 index 0da8dbd2..00000000 --- a/audio/sfx/cry22_1.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry22_1_Ch4: - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_Cry22_1_Ch5: - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_Cry22_1_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/cry22_2.asm b/audio/sfx/cry22_2.asm deleted file mode 100644 index d7456dbc..00000000 --- a/audio/sfx/cry22_2.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry22_2_Ch4: - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_Cry22_2_Ch5: - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_Cry22_2_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/cry22_3.asm b/audio/sfx/cry22_3.asm deleted file mode 100644 index 927c174c..00000000 --- a/audio/sfx/cry22_3.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Cry22_3_Ch4: - dutycycle 17 - unknownsfx0x20 2, 61, 129, 3 - unknownsfx0x20 7, 245, 1, 6 - unknownsfx0x20 1, 194, 129, 4 - unknownsfx0x20 8, 145, 129, 3 - endchannel - - -SFX_Cry22_3_Ch5: - dutycycle 238 - unknownsfx0x20 2, 62, 176, 5 - unknownsfx0x20 7, 213, 93, 7 - unknownsfx0x20 1, 178, 176, 6 - unknownsfx0x20 8, 97, 176, 5 - endchannel - - -SFX_Cry22_3_Ch7: - unknownnoise0x20 2, 146, 73 - unknownnoise0x20 7, 181, 41 - unknownnoise0x20 1, 162, 57 - unknownnoise0x20 8, 145, 73 - endchannel diff --git a/audio/sfx/cry23_1.asm b/audio/sfx/cry23_1.asm deleted file mode 100644 index cc0587d7..00000000 --- a/audio/sfx/cry23_1.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_Cry23_1_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_Cry23_1_Ch5: - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_Cry23_1_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/cry23_2.asm b/audio/sfx/cry23_2.asm deleted file mode 100644 index 5d130aa5..00000000 --- a/audio/sfx/cry23_2.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_Cry23_2_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_Cry23_2_Ch5: - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_Cry23_2_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/cry23_3.asm b/audio/sfx/cry23_3.asm deleted file mode 100644 index 8ada0c63..00000000 --- a/audio/sfx/cry23_3.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_Cry23_3_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 192, 7 - unknownsfx0x20 6, 228, 193, 7 - unknownsfx0x20 10, 246, 192, 7 - unknownsfx0x20 4, 211, 194, 7 - unknownsfx0x20 8, 193, 192, 7 - endchannel - - -SFX_Cry23_3_Ch5: - dutycycle 95 - unknownsfx0x20 15, 151, 129, 7 - unknownsfx0x20 6, 132, 128, 7 - unknownsfx0x20 10, 150, 129, 7 - unknownsfx0x20 15, 131, 129, 7 - endchannel - - -SFX_Cry23_3_Ch7: - unknownnoise0x20 3, 242, 60 - unknownnoise0x20 13, 230, 44 - unknownnoise0x20 15, 215, 60 - unknownnoise0x20 8, 193, 44 - endchannel diff --git a/audio/sfx/cry24_1.asm b/audio/sfx/cry24_1.asm deleted file mode 100644 index f79dc72c..00000000 --- a/audio/sfx/cry24_1.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_Cry24_1_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_Cry24_1_Ch5: - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_Cry24_1_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/cry24_2.asm b/audio/sfx/cry24_2.asm deleted file mode 100644 index aede2b95..00000000 --- a/audio/sfx/cry24_2.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_Cry24_2_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_Cry24_2_Ch5: - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_Cry24_2_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/cry24_3.asm b/audio/sfx/cry24_3.asm deleted file mode 100644 index cad3ada1..00000000 --- a/audio/sfx/cry24_3.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_Cry24_3_Ch4: - dutycycle 240 - unknownsfx0x20 15, 247, 128, 6 - unknownsfx0x20 10, 230, 132, 6 - unknownsfx0x20 15, 215, 144, 6 - unknownsfx0x20 8, 213, 144, 6 - unknownsfx0x20 6, 196, 136, 6 - unknownsfx0x20 5, 211, 112, 6 - unknownsfx0x20 4, 211, 96, 6 - unknownsfx0x20 8, 193, 64, 6 - endchannel - - -SFX_Cry24_3_Ch5: - dutycycle 5 - unknownsfx0x20 15, 183, 65, 6 - unknownsfx0x20 10, 150, 66, 6 - unknownsfx0x20 15, 167, 81, 6 - unknownsfx0x20 8, 165, 81, 6 - unknownsfx0x20 6, 148, 71, 6 - unknownsfx0x20 5, 163, 49, 6 - unknownsfx0x20 4, 147, 34, 6 - unknownsfx0x20 8, 113, 1, 6 - endchannel - - -SFX_Cry24_3_Ch7: - unknownnoise0x20 15, 228, 60 - unknownnoise0x20 10, 199, 76 - unknownnoise0x20 10, 199, 60 - unknownnoise0x20 12, 183, 76 - unknownnoise0x20 15, 162, 92 - endchannel diff --git a/audio/sfx/cry25_1.asm b/audio/sfx/cry25_1.asm deleted file mode 100644 index f3ae46ae..00000000 --- a/audio/sfx/cry25_1.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_Cry25_1_Ch4: - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_Cry25_1_Ch5: - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_Cry25_1_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/cry25_2.asm b/audio/sfx/cry25_2.asm deleted file mode 100644 index 9b976b4e..00000000 --- a/audio/sfx/cry25_2.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_Cry25_2_Ch4: - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_Cry25_2_Ch5: - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_Cry25_2_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/cry25_3.asm b/audio/sfx/cry25_3.asm deleted file mode 100644 index e76feb9e..00000000 --- a/audio/sfx/cry25_3.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_Cry25_3_Ch4: - dutycycle 165 - unknownsfx0x20 6, 244, 64, 7 - unknownsfx0x20 15, 227, 48, 7 - unknownsfx0x20 4, 244, 64, 7 - unknownsfx0x20 5, 179, 72, 7 - unknownsfx0x20 8, 209, 80, 7 - endchannel - - -SFX_Cry25_3_Ch5: - dutycycle 119 - unknownsfx0x20 6, 195, 18, 7 - unknownsfx0x20 15, 179, 4, 7 - unknownsfx0x20 3, 195, 18, 7 - unknownsfx0x20 4, 195, 33, 7 - unknownsfx0x20 8, 177, 50, 7 - endchannel - - -SFX_Cry25_3_Ch7: - unknownnoise0x20 8, 214, 44 - unknownnoise0x20 12, 198, 60 - unknownnoise0x20 10, 182, 44 - unknownnoise0x20 8, 145, 28 - endchannel diff --git a/audio/sfx/cut_3.asm b/audio/sfx/cut_3.asm deleted file mode 100644 index 6e7d8951..00000000 --- a/audio/sfx/cut_3.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Cut_3_Ch7: - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/cymbal1_1.asm deleted file mode 100644 index 35cae4df..00000000 --- a/audio/sfx/cymbal1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_1_Ch7: - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/cymbal1_2.asm deleted file mode 100644 index bffe7690..00000000 --- a/audio/sfx/cymbal1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_2_Ch7: - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm deleted file mode 100644 index 0f03f455..00000000 --- a/audio/sfx/cymbal1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal1_3_Ch7: - unknownnoise0x20 0, 161, 16 - endchannel diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/cymbal2_1.asm deleted file mode 100644 index ce19bb6b..00000000 --- a/audio/sfx/cymbal2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_1_Ch7: - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/cymbal2_2.asm deleted file mode 100644 index f45dec5b..00000000 --- a/audio/sfx/cymbal2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_2_Ch7: - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm deleted file mode 100644 index 2d2ebf1c..00000000 --- a/audio/sfx/cymbal2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal2_3_Ch7: - unknownnoise0x20 0, 162, 17 - endchannel diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/cymbal3_1.asm deleted file mode 100644 index 98f3977d..00000000 --- a/audio/sfx/cymbal3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_1_Ch7: - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/cymbal3_2.asm deleted file mode 100644 index 2a2cb997..00000000 --- a/audio/sfx/cymbal3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_2_Ch7: - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm deleted file mode 100644 index 60b96278..00000000 --- a/audio/sfx/cymbal3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Cymbal3_3_Ch7: - unknownnoise0x20 0, 162, 80 - endchannel diff --git a/audio/sfx/denied_1.asm b/audio/sfx/denied_1.asm index e7d5a8ca..41aca525 100644 --- a/audio/sfx/denied_1.asm +++ b/audio/sfx/denied_1.asm @@ -1,5 +1,5 @@ SFX_Denied_1_Ch4: - duty 3 + dutycycle 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 unknownsfx0x10 8 @@ -10,7 +10,7 @@ SFX_Denied_1_Ch4: SFX_Denied_1_Ch5: - duty 3 + dutycycle 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 15, 240, 1, 4 diff --git a/audio/sfx/denied_3.asm b/audio/sfx/denied_3.asm deleted file mode 100644 index cf3b2a20..00000000 --- a/audio/sfx/denied_3.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_Denied_3_Ch4: - duty 3 - unknownsfx0x10 90 - unknownsfx0x20 4, 240, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 1, 0, 0, 0 - endchannel - - -SFX_Denied_3_Ch5: - duty 3 - unknownsfx0x20 4, 240, 1, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 1, 4 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/dex_page_added.asm b/audio/sfx/dex_page_added.asm index 08180071..5bfd0c75 100644 --- a/audio/sfx/dex_page_added.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,5 +1,5 @@ SFX_Dex_Page_Added_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 68 unknownsfx0x20 15, 240, 240, 4 unknownsfx0x10 23 @@ -9,7 +9,7 @@ SFX_Dex_Page_Added_Ch4: SFX_Dex_Page_Added_Ch5: - duty 2 + dutycycle 2 unknownsfx0x20 15, 146, 0, 6 unknownsfx0x20 15, 146, 130, 7 endchannel diff --git a/audio/sfx/enter_pc_1.asm b/audio/sfx/enter_pc_1.asm index 338c32ab..7c480608 100644 --- a/audio/sfx/enter_pc_1.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,5 +1,5 @@ SFX_Enter_PC_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 6, 240, 0, 7 diff --git a/audio/sfx/enter_pc_3.asm b/audio/sfx/enter_pc_3.asm deleted file mode 100644 index f34ed9d0..00000000 --- a/audio/sfx/enter_pc_3.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Enter_PC_3_Ch4: - duty 2 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 4, 240, 0, 7 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/faint_fall.asm b/audio/sfx/faint_fall.asm index cd403485..c0a156cf 100644 --- a/audio/sfx/faint_fall.asm +++ b/audio/sfx/faint_fall.asm @@ -1,5 +1,5 @@ SFX_Faint_Fall_Ch4: - duty 1 + dutycycle 1 unknownsfx0x10 175 unknownsfx0x20 15, 242, 128, 7 unknownsfx0x10 8 diff --git a/audio/sfx/fly_3.asm b/audio/sfx/fly_3.asm deleted file mode 100644 index 084c8b4c..00000000 --- a/audio/sfx/fly_3.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_Fly_3_Ch7: - unknownnoise0x20 2, 241, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 161, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 209, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 129, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 177, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 97, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 145, 18 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 65, 18 - unknownnoise0x20 2, 0, 0 - endchannel diff --git a/audio/sfx/get_item1_1.asm b/audio/sfx/get_item1_1.asm index 2cf5e8c9..17e2140e 100644 --- a/audio/sfx/get_item1_1.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,47 +1,47 @@ SFX_Get_Item1_1_Ch4: executemusic tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 + volume 119 + vibrato 6, (2<<4) + 6 + dutycycle 2 toggleperfectpitch - notetype 4, 11, 1 + notetype 4, (11<<4) + 1 octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 + note G#, 2 + note G#, 2 + note G#, 2 + notetype 12, (11<<4) + 3 octave 4 - E_ 4 + note E_, 4 endchannel SFX_Get_Item1_1_Ch5: executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 + vibrato 8, (2<<4) + 7 + dutycycle 2 + notetype 4, (12<<4) + 1 octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 + note E_, 2 + note E_, 2 + note E_, 2 + notetype 12, (12<<4) + 3 + note B_, 4 endchannel SFX_Get_Item1_1_Ch6: executemusic - notetype 4, 1, 0 + notetype 4, (1<<4) + 0 octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + notetype 12, (1<<4) + 0 octave 4 - B_ 2 - rest 2 + note B_, 2 + note __, 2 endchannel diff --git a/audio/sfx/get_item1_3.asm b/audio/sfx/get_item1_3.asm deleted file mode 100644 index 6c4c01b5..00000000 --- a/audio/sfx/get_item1_3.asm +++ /dev/null @@ -1,47 +0,0 @@ -SFX_Get_Item1_3_Ch4: - executemusic - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 - toggleperfectpitch - notetype 4, 11, 1 - octave 3 - G# 2 - G# 2 - G# 2 - notetype 12, 11, 3 - octave 4 - E_ 4 - endchannel - - -SFX_Get_Item1_3_Ch5: - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 4, 12, 1 - octave 4 - E_ 2 - E_ 2 - E_ 2 - notetype 12, 12, 3 - B_ 4 - endchannel - - -SFX_Get_Item1_3_Ch6: - executemusic - notetype 4, 1, 0 - octave 4 - B_ 1 - rest 1 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 12, 1, 0 - octave 4 - B_ 2 - rest 2 - endchannel diff --git a/audio/sfx/get_item2_1.asm b/audio/sfx/get_item2_1.asm index 01e66269..23209bd5 100644 --- a/audio/sfx/get_item2_1.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,69 +1,69 @@ SFX_Get_Item2_1_Ch4: executemusic tempo 256 - volume 7, 7 - duty 2 + volume 119 + dutycycle 2 toggleperfectpitch - notetype 5, 11, 4 + notetype 5, (11<<4) + 4 octave 4 - D_ 4 - C_ 4 + note D_, 4 + note C_, 4 octave 3 - A_ 8 - notetype 5, 11, 2 + note A_, 8 + notetype 5, (11<<4) + 2 octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 + note D#, 2 + note D#, 2 + note D_, 2 + note C_, 2 + note C_, 2 octave 3 - A# 2 - notetype 5, 11, 4 + note A#, 2 + notetype 5, (11<<4) + 4 octave 4 - C_ 8 + note C_, 8 endchannel SFX_Get_Item2_1_Ch5: executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 + vibrato 8, (2<<4) + 7 + dutycycle 2 + notetype 5, (12<<4) + 5 octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 + note A_, 4 + note F_, 4 + note C_, 8 + notetype 5, (12<<4) + 2 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + notetype 5, (12<<4) + 4 + note A_, 8 endchannel SFX_Get_Item2_1_Ch6: executemusic - notetype 5, 1, 0 + notetype 5, (1<<4) + 0 octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 + note F_, 4 + note D#, 4 + note C_, 8 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 8 endchannel diff --git a/audio/sfx/get_item2_2.asm b/audio/sfx/get_item2_2.asm deleted file mode 100644 index 27c5864d..00000000 --- a/audio/sfx/get_item2_2.asm +++ /dev/null @@ -1,69 +0,0 @@ -SFX_Get_Item2_2_Ch4: - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - - -SFX_Get_Item2_2_Ch5: - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - - -SFX_Get_Item2_2_Ch6: - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/get_item2_3.asm b/audio/sfx/get_item2_3.asm deleted file mode 100644 index 42d74e8e..00000000 --- a/audio/sfx/get_item2_3.asm +++ /dev/null @@ -1,69 +0,0 @@ -SFX_Get_Item2_3_Ch4: - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 11, 4 - octave 4 - D_ 4 - C_ 4 - octave 3 - A_ 8 - notetype 5, 11, 2 - octave 4 - D# 2 - D# 2 - D_ 2 - C_ 2 - C_ 2 - octave 3 - A# 2 - notetype 5, 11, 4 - octave 4 - C_ 8 - endchannel - - -SFX_Get_Item2_3_Ch5: - executemusic - vibrato 8, 2, 7 - duty 2 - notetype 5, 12, 5 - octave 4 - A_ 4 - F_ 4 - C_ 8 - notetype 5, 12, 2 - A# 2 - A# 2 - A# 2 - G_ 2 - G_ 2 - A# 2 - notetype 5, 12, 4 - A_ 8 - endchannel - - -SFX_Get_Item2_3_Ch6: - executemusic - notetype 5, 1, 0 - octave 5 - F_ 4 - D# 4 - C_ 8 - D# 1 - rest 1 - D# 1 - rest 1 - E_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - G_ 1 - rest 1 - A_ 8 - endchannel diff --git a/audio/sfx/get_key_item_1.asm b/audio/sfx/get_key_item_1.asm index b2ae3d57..99d7bd6a 100644 --- a/audio/sfx/get_key_item_1.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,59 +1,59 @@ SFX_Get_Key_Item_1_Ch4: executemusic tempo 256 - volume 7, 7 - duty 2 + volume 119 + dutycycle 2 toggleperfectpitch - notetype 5, 10, 4 + notetype 5, (10<<4) + 4 octave 3 - A# 4 - notetype 5, 11, 1 + note A#, 4 + notetype 5, (11<<4) + 1 octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 + note C_, 2 + note C_, 1 + note C_, 1 + notetype 5, (10<<4) + 4 + note D#, 4 + notetype 5, (11<<4) + 1 + note F_, 2 + note F_, 1 + note F_, 1 + notetype 5, (11<<4) + 4 + note A#, 8 endchannel SFX_Get_Key_Item_1_Ch5: executemusic - vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 + vibrato 4, (2<<4) + 3 + dutycycle 2 + notetype 5, (13<<4) + 1 octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 + note G_, 2 + note G_, 1 + note G_, 1 + notetype 5, (12<<4) + 4 + note D#, 4 + notetype 5, (13<<4) + 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + notetype 5, (12<<4) + 4 octave 5 - D# 8 + note D#, 8 endchannel SFX_Get_Key_Item_1_Ch6: executemusic - notetype 5, 1, 0 + notetype 5, (1<<4) + 0 octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 + note D#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 8 endchannel diff --git a/audio/sfx/get_key_item_3.asm b/audio/sfx/get_key_item_3.asm deleted file mode 100644 index aebae361..00000000 --- a/audio/sfx/get_key_item_3.asm +++ /dev/null @@ -1,59 +0,0 @@ -SFX_Get_Key_Item_3_Ch4: - executemusic - tempo 256 - volume 7, 7 - duty 2 - toggleperfectpitch - notetype 5, 10, 4 - octave 3 - A# 4 - notetype 5, 11, 1 - octave 4 - C_ 2 - C_ 1 - C_ 1 - notetype 5, 10, 4 - D# 4 - notetype 5, 11, 1 - F_ 2 - F_ 1 - F_ 1 - notetype 5, 11, 4 - A# 8 - endchannel - - -SFX_Get_Key_Item_3_Ch5: - executemusic - vibrato 4, 2, 3 - duty 2 - notetype 5, 13, 1 - octave 4 - G_ 2 - G_ 1 - G_ 1 - notetype 5, 12, 4 - D# 4 - notetype 5, 13, 1 - G# 2 - G# 1 - G# 1 - A# 2 - A# 1 - A# 1 - notetype 5, 12, 4 - octave 5 - D# 8 - endchannel - - -SFX_Get_Key_Item_3_Ch6: - executemusic - notetype 5, 1, 0 - octave 4 - D# 4 - G# 4 - G_ 4 - F_ 4 - D# 8 - endchannel diff --git a/audio/sfx/go_inside_3.asm b/audio/sfx/go_inside_3.asm deleted file mode 100644 index 9939ba6d..00000000 --- a/audio/sfx/go_inside_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Go_Inside_3_Ch7: - unknownnoise0x20 9, 241, 68 - unknownnoise0x20 8, 209, 67 - endchannel diff --git a/audio/sfx/go_outside_3.asm b/audio/sfx/go_outside_3.asm deleted file mode 100644 index 30b9884c..00000000 --- a/audio/sfx/go_outside_3.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Go_Outside_3_Ch7: - unknownnoise0x20 2, 241, 84 - unknownnoise0x20 12, 113, 35 - unknownnoise0x20 2, 177, 84 - unknownnoise0x20 12, 97, 35 - unknownnoise0x20 6, 65, 84 - endchannel diff --git a/audio/sfx/heal_ailment_1.asm b/audio/sfx/heal_ailment_1.asm index ca703c09..b0ebe9e7 100644 --- a/audio/sfx/heal_ailment_1.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,5 +1,5 @@ SFX_Heal_Ailment_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 unknownsfx0x20 4, 242, 0, 6 diff --git a/audio/sfx/heal_ailment_2.asm b/audio/sfx/heal_ailment_2.asm deleted file mode 100644 index b06abe62..00000000 --- a/audio/sfx/heal_ailment_2.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_Heal_Ailment_2_Ch4: - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/heal_ailment_3.asm b/audio/sfx/heal_ailment_3.asm deleted file mode 100644 index c13d74fd..00000000 --- a/audio/sfx/heal_ailment_3.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_Heal_Ailment_3_Ch4: - duty 2 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x20 4, 242, 0, 6 - unknownsfx0x10 23 - unknownsfx0x20 15, 242, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/heal_hp_1.asm b/audio/sfx/heal_hp_1.asm index 75400957..38a56162 100644 --- a/audio/sfx/heal_hp_1.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,5 +1,5 @@ SFX_Heal_HP_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 unknownsfx0x20 15, 242, 80, 6 diff --git a/audio/sfx/heal_hp_2.asm b/audio/sfx/heal_hp_2.asm deleted file mode 100644 index 182937cd..00000000 --- a/audio/sfx/heal_hp_2.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Heal_HP_2_Ch4: - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/heal_hp_3.asm b/audio/sfx/heal_hp_3.asm deleted file mode 100644 index c238013a..00000000 --- a/audio/sfx/heal_hp_3.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Heal_HP_3_Ch4: - duty 2 - unknownsfx0x10 23 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/healing_machine_1.asm b/audio/sfx/healing_machine_1.asm index ebaee990..6f09a414 100644 --- a/audio/sfx/healing_machine_1.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,5 +1,5 @@ SFX_Healing_Machine_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 unknownsfx0x10 34 diff --git a/audio/sfx/healing_machine_3.asm b/audio/sfx/healing_machine_3.asm deleted file mode 100644 index ac11fee4..00000000 --- a/audio/sfx/healing_machine_3.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_Healing_Machine_3_Ch4: - duty 2 - unknownsfx0x10 44 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 2, 241, 0, 5 - unknownsfx0x10 8 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/intro_hip.asm b/audio/sfx/intro_hip.asm index 0d450e21..8c824ea0 100644 --- a/audio/sfx/intro_hip.asm +++ b/audio/sfx/intro_hip.asm @@ -1,5 +1,5 @@ SFX_Intro_Hip_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 64, 7 unknownsfx0x10 8 diff --git a/audio/sfx/intro_hop.asm b/audio/sfx/intro_hop.asm index 1bd9faec..51cb8a30 100644 --- a/audio/sfx/intro_hop.asm +++ b/audio/sfx/intro_hop.asm @@ -1,5 +1,5 @@ SFX_Intro_Hop_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 128, 6 unknownsfx0x10 8 diff --git a/audio/sfx/ledge_1.asm b/audio/sfx/ledge_1.asm index 26acaf1b..f2d5b9ce 100644 --- a/audio/sfx/ledge_1.asm +++ b/audio/sfx/ledge_1.asm @@ -1,5 +1,5 @@ SFX_Ledge_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 unknownsfx0x10 8 diff --git a/audio/sfx/ledge_3.asm b/audio/sfx/ledge_3.asm deleted file mode 100644 index 623e56ce..00000000 --- a/audio/sfx/ledge_3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_Ledge_3_Ch4: - duty 2 - unknownsfx0x10 149 - unknownsfx0x20 15, 242, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/level_up.asm b/audio/sfx/level_up.asm index 5b3da83d..1e0c7672 100644 --- a/audio/sfx/level_up.asm +++ b/audio/sfx/level_up.asm @@ -1,63 +1,63 @@ SFX_Level_Up_Ch4: executemusic tempo 256 - volume 7, 7 - duty 2 + volume 119 + dutycycle 2 toggleperfectpitch - notetype 6, 11, 4 + notetype 6, (11<<4) + 4 octave 4 - F_ 4 - notetype 4, 11, 2 - C_ 2 - F_ 2 - C_ 2 - notetype 6, 11, 3 - D# 2 - D# 2 - E_ 2 - notetype 6, 11, 4 - F_ 8 + note F_, 4 + notetype 4, (11<<4) + 2 + note C_, 2 + note F_, 2 + note C_, 2 + notetype 6, (11<<4) + 3 + note D#, 2 + note D#, 2 + note E_, 2 + notetype 6, (11<<4) + 4 + note F_, 8 endchannel SFX_Level_Up_Ch5: executemusic - vibrato 4, 2, 2 - duty 2 - notetype 6, 12, 4 + vibrato 4, (2<<4) + 2 + dutycycle 2 + notetype 6, (12<<4) + 4 octave 4 - A_ 4 - notetype 4, 12, 2 - A_ 2 - A_ 2 - A_ 2 - notetype 6, 12, 4 - A# 2 - A# 2 - A# 2 - notetype 6, 12, 4 - A_ 8 + note A_, 4 + notetype 4, (12<<4) + 2 + note A_, 2 + note A_, 2 + note A_, 2 + notetype 6, (12<<4) + 4 + note A#, 2 + note A#, 2 + note A#, 2 + notetype 6, (12<<4) + 4 + note A_, 8 endchannel SFX_Level_Up_Ch6: executemusic - notetype 6, 1, 0 + notetype 6, (1<<4) + 0 octave 5 - A_ 4 - notetype 4, 1, 0 - F_ 1 - rest 1 - F_ 1 - rest 1 - F_ 1 - rest 1 - notetype 6, 1, 0 - G_ 1 - rest 1 - D# 1 - rest 1 - G_ 1 - rest 1 - A_ 8 + note A_, 4 + notetype 4, (1<<4) + 0 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + notetype 6, (1<<4) + 0 + note G_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 8 endchannel diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/muted_snare1_1.asm deleted file mode 100644 index 4b205470..00000000 --- a/audio/sfx/muted_snare1_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_1_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/muted_snare1_2.asm deleted file mode 100644 index d530bd89..00000000 --- a/audio/sfx/muted_snare1_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_2_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/muted_snare1_3.asm deleted file mode 100644 index 8b5c2c6d..00000000 --- a/audio/sfx/muted_snare1_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Muted_Snare1_3_Ch7: - unknownnoise0x20 0, 161, 24 - unknownnoise0x20 0, 49, 51 - endchannel diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/muted_snare2_1.asm deleted file mode 100644 index 4e15e386..00000000 --- a/audio/sfx/muted_snare2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_1_Ch7: - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/muted_snare2_2.asm deleted file mode 100644 index 5107fb77..00000000 --- a/audio/sfx/muted_snare2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_2_Ch7: - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm deleted file mode 100644 index 043c870d..00000000 --- a/audio/sfx/muted_snare2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare2_3_Ch7: - unknownnoise0x20 0, 145, 34 - endchannel diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/muted_snare3_1.asm deleted file mode 100644 index d0c689a4..00000000 --- a/audio/sfx/muted_snare3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_1_Ch7: - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/muted_snare3_2.asm deleted file mode 100644 index 3e470ae6..00000000 --- a/audio/sfx/muted_snare3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_2_Ch7: - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm deleted file mode 100644 index c8749577..00000000 --- a/audio/sfx/muted_snare3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare3_3_Ch7: - unknownnoise0x20 0, 113, 34 - endchannel diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/muted_snare4_1.asm deleted file mode 100644 index ebe2ee1d..00000000 --- a/audio/sfx/muted_snare4_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_1_Ch7: - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm deleted file mode 100644 index bdbe4d11..00000000 --- a/audio/sfx/muted_snare4_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_2_Ch7: - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm deleted file mode 100644 index 59d72218..00000000 --- a/audio/sfx/muted_snare4_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Muted_Snare4_3_Ch7: - unknownnoise0x20 0, 97, 34 - endchannel diff --git a/audio/sfx/poisoned_1.asm b/audio/sfx/poisoned_1.asm index 73068b86..2e7d1e65 100644 --- a/audio/sfx/poisoned_1.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,5 +1,5 @@ SFX_Poisoned_1_Ch4: - duty 0 + dutycycle 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 loopchannel 4, SFX_Poisoned_1_Ch4 diff --git a/audio/sfx/poisoned_3.asm b/audio/sfx/poisoned_3.asm deleted file mode 100644 index 7dc973bc..00000000 --- a/audio/sfx/poisoned_3.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Poisoned_3_Ch4: - duty 0 - unknownsfx0x10 20 - unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_Poisoned_3_Ch4 - unknownsfx0x20 15, 243, 0, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/pokedex_rating_1.asm b/audio/sfx/pokedex_rating_1.asm index 1e0f95f5..99e05154 100644 --- a/audio/sfx/pokedex_rating_1.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,77 +1,77 @@ SFX_Pokedex_Rating_1_Ch4: executemusic tempo 256 - volume 7, 7 - duty 2 - notetype 5, 11, 1 + volume 119 + dutycycle 2 + notetype 5, (11<<4) + 1 octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 + note A_, 2 + note A_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 octave 4 - C_ 4 - E_ 4 + note C_, 4 + note E_, 4 octave 3 - F_ 4 + note F_, 4 endchannel SFX_Pokedex_Rating_1_Ch5: executemusic - duty 2 - notetype 5, 12, 2 + dutycycle 2 + notetype 5, (12<<4) + 2 octave 5 - F_ 2 - E_ 1 - rest 1 - D_ 2 - C_ 1 - rest 1 + note F_, 2 + note E_, 1 + note __, 1 + note D_, 2 + note C_, 1 + note __, 1 octave 4 - A# 2 + note A#, 2 octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 4 endchannel SFX_Pokedex_Rating_1_Ch6: executemusic - notetype 5, 1, 0 + notetype 5, (1<<4) + 0 octave 5 - C_ 1 - rest 1 + note C_, 1 + note __, 1 octave 4 - F_ 2 + note F_, 2 octave 5 - C_ 1 - rest 1 + note C_, 1 + note __, 1 octave 4 - A# 1 - rest 1 - A_ 1 - rest 1 - G_ 1 - rest 1 - F_ 1 - rest 1 - E_ 1 - rest 1 + note A#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 octave 5 - F_ 1 - rest 3 - C_ 1 - rest 3 + note F_, 1 + note __, 3 + note C_, 1 + note __, 3 octave 4 - F_ 2 - rest 2 + note F_, 2 + note __, 2 endchannel diff --git a/audio/sfx/pokedex_rating_3.asm b/audio/sfx/pokedex_rating_3.asm deleted file mode 100644 index 01ac0e1c..00000000 --- a/audio/sfx/pokedex_rating_3.asm +++ /dev/null @@ -1,77 +0,0 @@ -SFX_Pokedex_Rating_3_Ch4: - executemusic - tempo 256 - volume 7, 7 - duty 2 - notetype 5, 11, 1 - octave 3 - A_ 2 - A_ 2 - G_ 2 - G_ 2 - F_ 2 - E_ 2 - F_ 2 - A_ 2 - octave 4 - C_ 4 - E_ 4 - octave 3 - F_ 4 - endchannel - - -SFX_Pokedex_Rating_3_Ch5: - executemusic - duty 2 - notetype 5, 12, 2 - octave 5 - F_ 2 - E_ 1 - rest 1 - D_ 2 - C_ 1 - rest 1 - octave 4 - A# 2 - octave 5 - C_ 2 - D_ 2 - E_ 2 - F_ 4 - G_ 4 - F_ 4 - endchannel - - -SFX_Pokedex_Rating_3_Ch6: - executemusic - notetype 5, 1, 0 - octave 5 - C_ 1 - rest 1 - octave 4 - F_ 2 - octave 5 - C_ 1 - rest 1 - octave 4 - A# 1 - rest 1 - A_ 1 - rest 1 - G_ 1 - rest 1 - F_ 1 - rest 1 - E_ 1 - rest 1 - octave 5 - F_ 1 - rest 3 - C_ 1 - rest 3 - octave 4 - F_ 2 - rest 2 - endchannel diff --git a/audio/sfx/pokeflute.asm b/audio/sfx/pokeflute.asm index 272c114f..00e4f1fc 100644 --- a/audio/sfx/pokeflute.asm +++ b/audio/sfx/pokeflute.asm @@ -1,21 +1,22 @@ -SFX_Pokeflute_Ch2: - vibrato 16, 1, 4 - notetype 12, 1, 0 +SFX_Pokeflute_Ch6: + togglesfx + vibrato 16, (1<<4) + 4 + notetype 12, (1<<4) + 0 octave 5 - E_ 2 - F_ 2 - G_ 4 - A_ 2 - G_ 2 + note E_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note G_, 2 octave 6 - C_ 4 - C_ 2 - D_ 2 - C_ 2 + note C_, 4 + note C_, 2 + note D_, 2 + note C_, 2 octave 5 - G_ 2 - A_ 2 - F_ 2 - G_ 8 - rest 12 + note G_, 2 + note A_, 2 + note F_, 2 + note G_, 8 + note __, 12 endchannel diff --git a/audio/sfx/pokeflute_ch4_ch5.asm b/audio/sfx/pokeflute_ch4_ch5.asm index 146488d8..22c23f68 100755 --- a/audio/sfx/pokeflute_ch4_ch5.asm +++ b/audio/sfx/pokeflute_ch4_ch5.asm @@ -4,11 +4,11 @@ SFX_08_PokeFlute_Ch4: SFX_08_PokeFlute_Ch5: executemusic - notetype 8, 0, 0 - rest 5 - rest 7 - rest 5 - rest 5 - rest 5 - rest 5 + notetype 8, (0<<4) + 0 + note __, 5 + note __, 7 + note __, 5 + note __, 5 + note __, 5 + note __, 5 endchannel diff --git a/audio/sfx/pokeflute_ch6.asm b/audio/sfx/pokeflute_ch6.asm index 4d4e5bae..4f69cf80 100755 --- a/audio/sfx/pokeflute_ch6.asm +++ b/audio/sfx/pokeflute_ch6.asm @@ -1,13 +1,13 @@ SFX_08_PokeFlute_Ch6: executemusic - vibrato 16, 1, 4 - notetype 8, 1, 0 + vibrato 16, (1<<4) + 4 + notetype 8, (1<<4) + 0 octave 5 - E_ 3 - F_ 3 - G_ 7 - A_ 3 - G_ 3 + note E_, 3 + note F_, 3 + note G_, 7 + note A_, 3 + note G_, 3 octave 6 - C_ 13 + note C_, 13 endchannel diff --git a/audio/sfx/press_ab_1.asm b/audio/sfx/press_ab_1.asm index 95edbf4a..0ac4efb0 100644 --- a/audio/sfx/press_ab_1.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,5 +1,5 @@ SFX_Press_AB_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 unknownsfx0x20 0, 145, 192, 7 diff --git a/audio/sfx/press_ab_2.asm b/audio/sfx/press_ab_2.asm deleted file mode 100644 index 0d8faa46..00000000 --- a/audio/sfx/press_ab_2.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Press_AB_2_Ch4: - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/press_ab_3.asm b/audio/sfx/press_ab_3.asm deleted file mode 100644 index 0f11fc34..00000000 --- a/audio/sfx/press_ab_3.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Press_AB_3_Ch4: - duty 2 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 0, 129, 208, 7 - unknownsfx0x20 0, 145, 192, 7 - unknownsfx0x20 12, 161, 208, 7 - endchannel diff --git a/audio/sfx/psychic_m.asm b/audio/sfx/psychic_m.asm index 2bbde2f1..18be83ad 100644 --- a/audio/sfx/psychic_m.asm +++ b/audio/sfx/psychic_m.asm @@ -1,5 +1,5 @@ SFX_Psychic_M_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 247 unknownsfx0x20 8, 196, 189, 7 unknownsfx0x20 8, 196, 190, 7 @@ -12,7 +12,7 @@ SFX_Psychic_M_Ch4: SFX_Psychic_M_Ch5: - duty 2 + dutycycle 2 unknownsfx0x20 8, 196, 112, 7 unknownsfx0x20 8, 196, 97, 7 unknownsfx0x20 8, 196, 98, 7 diff --git a/audio/sfx/purchase_1.asm b/audio/sfx/purchase_1.asm index 1c9490a2..9f8269b5 100644 --- a/audio/sfx/purchase_1.asm +++ b/audio/sfx/purchase_1.asm @@ -1,12 +1,12 @@ SFX_Purchase_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel SFX_Purchase_1_Ch5: - duty 2 + dutycycle 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 unknownsfx0x20 8, 162, 161, 7 diff --git a/audio/sfx/purchase_3.asm b/audio/sfx/purchase_3.asm deleted file mode 100644 index 78929c27..00000000 --- a/audio/sfx/purchase_3.asm +++ /dev/null @@ -1,13 +0,0 @@ -SFX_Purchase_3_Ch4: - duty 2 - unknownsfx0x20 4, 225, 0, 7 - unknownsfx0x20 8, 242, 224, 7 - endchannel - - -SFX_Purchase_3_Ch5: - duty 2 - unknownsfx0x20 1, 8, 0, 0 - unknownsfx0x20 4, 145, 193, 6 - unknownsfx0x20 8, 162, 161, 7 - endchannel diff --git a/audio/sfx/push_boulder_3.asm b/audio/sfx/push_boulder_3.asm deleted file mode 100644 index ecaeb768..00000000 --- a/audio/sfx/push_boulder_3.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_Push_Boulder_3_Ch7: - unknownnoise0x20 4, 162, 35 - unknownnoise0x20 8, 241, 52 - unknownnoise0x20 15, 0, 0 - unknownnoise0x20 2, 247, 36 - unknownnoise0x20 2, 247, 52 - unknownnoise0x20 4, 247, 68 - unknownnoise0x20 8, 244, 85 - unknownnoise0x20 8, 241, 68 - endchannel diff --git a/audio/sfx/safari_zone_pa.asm b/audio/sfx/safari_zone_pa.asm index f898def0..f20effb3 100644 --- a/audio/sfx/safari_zone_pa.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,5 +1,5 @@ SFX_Safari_Zone_PA_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 15, 243, 48, 7 unknownsfx0x20 8, 101, 48, 7 unknownsfx0x20 15, 244, 0, 7 diff --git a/audio/sfx/save_1.asm b/audio/sfx/save_1.asm index afb1f13a..9929fb93 100644 --- a/audio/sfx/save_1.asm +++ b/audio/sfx/save_1.asm @@ -1,5 +1,5 @@ SFX_Save_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 2, 228, 0, 6 unknownsfx0x20 2, 228, 128, 6 @@ -11,7 +11,7 @@ SFX_Save_1_Ch4: SFX_Save_1_Ch5: - duty 2 + dutycycle 2 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 2, 212, 1, 7 unknownsfx0x20 2, 196, 1, 6 diff --git a/audio/sfx/save_3.asm b/audio/sfx/save_3.asm deleted file mode 100644 index 083e77c8..00000000 --- a/audio/sfx/save_3.asm +++ /dev/null @@ -1,36 +0,0 @@ -SFX_Save_3_Ch4: - duty 2 -IF DEF(_RED) - unknownsfx0x20 4, 244, 0, 7 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 2, 228, 160, 7 -ELSE - unknownsfx0x20 3, 228, 0, 6 - unknownsfx0x20 3, 228, 128, 6 - unknownsfx0x20 3, 228, 192, 6 - unknownsfx0x20 3, 228, 0, 7 - unknownsfx0x20 15, 242, 224, 7 -ENDC - endchannel - - -SFX_Save_3_Ch5: - duty 2 -IF DEF(_RED) - unknownsfx0x20 4, 8, 0, 0 - unknownsfx0x20 3, 212, 1, 7 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 2, 196, 161, 7 -ELSE - unknownsfx0x20 3, 8, 0, 0 - unknownsfx0x20 3, 196, 1, 6 - unknownsfx0x20 3, 196, 129, 6 - unknownsfx0x20 3, 196, 193, 6 - unknownsfx0x20 3, 196, 1, 7 - unknownsfx0x20 15, 210, 225, 7 -ENDC - endchannel diff --git a/audio/sfx/shrink_1.asm b/audio/sfx/shrink_1.asm index 54731535..e7e5d87c 100644 --- a/audio/sfx/shrink_1.asm +++ b/audio/sfx/shrink_1.asm @@ -1,5 +1,5 @@ SFX_Shrink_1_Ch4: - duty 1 + dutycycle 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 unknownsfx0x20 15, 183, 128, 5 diff --git a/audio/sfx/shrink_3.asm b/audio/sfx/shrink_3.asm deleted file mode 100644 index b03cbe55..00000000 --- a/audio/sfx/shrink_3.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_Shrink_3_Ch4: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 6 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 5 - unknownsfx0x20 15, 71, 128, 4 - unknownsfx0x20 15, 23, 0, 4 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/silph_scope.asm b/audio/sfx/silph_scope.asm index ee238262..adbccec6 100644 --- a/audio/sfx/silph_scope.asm +++ b/audio/sfx/silph_scope.asm @@ -1,5 +1,5 @@ SFX_Silph_Scope_Ch4: - duty 0 + dutycycle 0 unknownsfx0x20 0, 210, 0, 7 unknownsfx0x20 0, 210, 64, 7 unknownsfx0x20 0, 210, 128, 7 diff --git a/audio/sfx/slots_new_spin.asm b/audio/sfx/slots_new_spin.asm index ae1a6d90..328ceb2a 100644 --- a/audio/sfx/slots_new_spin.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,5 +1,5 @@ SFX_Slots_New_Spin_Ch4: - duty 3 + dutycycle 3 unknownsfx0x20 5, 225, 0, 7 unknownsfx0x20 2, 225, 128, 7 unknownsfx0x20 15, 241, 192, 7 @@ -7,7 +7,7 @@ SFX_Slots_New_Spin_Ch4: SFX_Slots_New_Spin_Ch5: - duty 2 + dutycycle 2 unknownsfx0x20 4, 193, 193, 6 unknownsfx0x20 2, 193, 65, 7 unknownsfx0x20 15, 209, 129, 7 diff --git a/audio/sfx/slots_reward.asm b/audio/sfx/slots_reward.asm index 6923ac71..aa3c790f 100644 --- a/audio/sfx/slots_reward.asm +++ b/audio/sfx/slots_reward.asm @@ -1,5 +1,5 @@ SFX_Slots_Reward_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 8, 129, 224, 7 endchannel diff --git a/audio/sfx/slots_stop_wheel.asm b/audio/sfx/slots_stop_wheel.asm index 85d73daf..cbdeba86 100644 --- a/audio/sfx/slots_stop_wheel.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,5 +1,5 @@ SFX_Slots_Stop_Wheel_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 1, 242, 160, 6 unknownsfx0x20 1, 242, 224, 6 unknownsfx0x20 8, 241, 0, 7 diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/snare1_1.asm deleted file mode 100644 index aae0ef28..00000000 --- a/audio/sfx/snare1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_1_Ch7: - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/snare1_2.asm deleted file mode 100644 index e5013081..00000000 --- a/audio/sfx/snare1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_2_Ch7: - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm deleted file mode 100644 index 4ffffa7f..00000000 --- a/audio/sfx/snare1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare1_3_Ch7: - unknownnoise0x20 0, 193, 51 - endchannel diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/snare2_1.asm deleted file mode 100644 index 286e397a..00000000 --- a/audio/sfx/snare2_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_1_Ch7: - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/snare2_2.asm deleted file mode 100644 index a3718612..00000000 --- a/audio/sfx/snare2_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_2_Ch7: - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm deleted file mode 100644 index 67f8c7fb..00000000 --- a/audio/sfx/snare2_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare2_3_Ch7: - unknownnoise0x20 0, 177, 51 - endchannel diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/snare3_1.asm deleted file mode 100644 index 686b4561..00000000 --- a/audio/sfx/snare3_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_1_Ch7: - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/snare3_2.asm deleted file mode 100644 index f8236d40..00000000 --- a/audio/sfx/snare3_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_2_Ch7: - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm deleted file mode 100644 index 3b52bac9..00000000 --- a/audio/sfx/snare3_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare3_3_Ch7: - unknownnoise0x20 0, 161, 51 - endchannel diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/snare4_1.asm deleted file mode 100644 index 35d58dba..00000000 --- a/audio/sfx/snare4_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_1_Ch7: - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/snare4_2.asm deleted file mode 100644 index 713f8996..00000000 --- a/audio/sfx/snare4_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_2_Ch7: - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm deleted file mode 100644 index 231193e1..00000000 --- a/audio/sfx/snare4_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare4_3_Ch7: - unknownnoise0x20 0, 129, 51 - endchannel diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/snare5_1.asm deleted file mode 100644 index 54106d58..00000000 --- a/audio/sfx/snare5_1.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_1_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/snare5_2.asm deleted file mode 100644 index f7f55eb5..00000000 --- a/audio/sfx/snare5_2.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_2_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/snare5_3.asm deleted file mode 100644 index 76dc3966..00000000 --- a/audio/sfx/snare5_3.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Snare5_3_Ch7: - unknownnoise0x20 7, 132, 55 - unknownnoise0x20 6, 132, 54 - unknownnoise0x20 5, 131, 53 - unknownnoise0x20 4, 131, 52 - unknownnoise0x20 3, 130, 51 - unknownnoise0x20 2, 129, 50 - endchannel diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/snare6_1.asm deleted file mode 100644 index 97c0241d..00000000 --- a/audio/sfx/snare6_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_1_Ch7: - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/snare6_2.asm deleted file mode 100644 index 797d5518..00000000 --- a/audio/sfx/snare6_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_2_Ch7: - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm deleted file mode 100644 index 28fc695a..00000000 --- a/audio/sfx/snare6_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare6_3_Ch7: - unknownnoise0x20 0, 129, 16 - endchannel diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/snare7_1.asm deleted file mode 100644 index 1b54eefa..00000000 --- a/audio/sfx/snare7_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_1_Ch7: - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/snare7_2.asm deleted file mode 100644 index e480f87f..00000000 --- a/audio/sfx/snare7_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_2_Ch7: - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm deleted file mode 100644 index b57dfc13..00000000 --- a/audio/sfx/snare7_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare7_3_Ch7: - unknownnoise0x20 0, 130, 35 - endchannel diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/snare8_1.asm deleted file mode 100644 index 1a0f74a3..00000000 --- a/audio/sfx/snare8_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_1_Ch7: - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/snare8_2.asm deleted file mode 100644 index 87619598..00000000 --- a/audio/sfx/snare8_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_2_Ch7: - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm deleted file mode 100644 index 54076c8e..00000000 --- a/audio/sfx/snare8_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare8_3_Ch7: - unknownnoise0x20 0, 130, 37 - endchannel diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/snare9_1.asm deleted file mode 100644 index 6923bb09..00000000 --- a/audio/sfx/snare9_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_1_Ch7: - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/snare9_2.asm deleted file mode 100644 index 308ae7f6..00000000 --- a/audio/sfx/snare9_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_2_Ch7: - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm deleted file mode 100644 index ffbdc454..00000000 --- a/audio/sfx/snare9_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Snare9_3_Ch7: - unknownnoise0x20 0, 130, 38 - endchannel diff --git a/audio/sfx/ss_anne_horn_1.asm b/audio/sfx/ss_anne_horn_1.asm index 38407f24..ea8d181d 100644 --- a/audio/sfx/ss_anne_horn_1.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,5 +1,5 @@ SFX_SS_Anne_Horn_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 15, 240, 0, 5 @@ -11,7 +11,7 @@ SFX_SS_Anne_Horn_1_Ch4: SFX_SS_Anne_Horn_1_Ch5: - duty 3 + dutycycle 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 15, 240, 130, 4 diff --git a/audio/sfx/ss_anne_horn_3.asm b/audio/sfx/ss_anne_horn_3.asm deleted file mode 100644 index 3162f664..00000000 --- a/audio/sfx/ss_anne_horn_3.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_SS_Anne_Horn_3_Ch4: - duty 2 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 240, 0, 5 - unknownsfx0x20 15, 242, 0, 5 - endchannel - - -SFX_SS_Anne_Horn_3_Ch5: - duty 3 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 240, 130, 4 - unknownsfx0x20 15, 242, 130, 4 - endchannel diff --git a/audio/sfx/start_menu_2.asm b/audio/sfx/start_menu_2.asm deleted file mode 100644 index 2706f555..00000000 --- a/audio/sfx/start_menu_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Start_Menu_2_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel diff --git a/audio/sfx/start_menu_3.asm b/audio/sfx/start_menu_3.asm deleted file mode 100644 index 4b16cea4..00000000 --- a/audio/sfx/start_menu_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Start_Menu_3_Ch7: - unknownnoise0x20 1, 226, 51 - unknownnoise0x20 8, 225, 34 - endchannel diff --git a/audio/sfx/swap_1.asm b/audio/sfx/swap_1.asm index 95a31fcd..4c4712ee 100644 --- a/audio/sfx/swap_1.asm +++ b/audio/sfx/swap_1.asm @@ -1,11 +1,11 @@ SFX_Swap_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 8, 225, 64, 7 endchannel SFX_Swap_1_Ch5: - duty 2 + dutycycle 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 endchannel diff --git a/audio/sfx/swap_3.asm b/audio/sfx/swap_3.asm deleted file mode 100644 index 6ed97d7d..00000000 --- a/audio/sfx/swap_3.asm +++ /dev/null @@ -1,11 +0,0 @@ -SFX_Swap_3_Ch4: - duty 2 - unknownsfx0x20 8, 225, 64, 7 - endchannel - - -SFX_Swap_3_Ch5: - duty 2 - unknownsfx0x20 2, 8, 0, 0 - unknownsfx0x20 8, 177, 65, 7 - endchannel diff --git a/audio/sfx/switch_1.asm b/audio/sfx/switch_1.asm index ee15dc20..6ab4c947 100644 --- a/audio/sfx/switch_1.asm +++ b/audio/sfx/switch_1.asm @@ -1,5 +1,5 @@ SFX_Switch_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 unknownsfx0x20 1, 0, 0, 0 diff --git a/audio/sfx/switch_3.asm b/audio/sfx/switch_3.asm deleted file mode 100644 index d98a7f29..00000000 --- a/audio/sfx/switch_3.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Switch_3_Ch4: - duty 2 - unknownsfx0x20 4, 0, 0, 0 - unknownsfx0x20 2, 241, 128, 6 - unknownsfx0x20 1, 0, 0, 0 - unknownsfx0x20 4, 241, 128, 7 - unknownsfx0x20 4, 0, 0, 0 - endchannel diff --git a/audio/sfx/teleport_enter1_1.asm b/audio/sfx/teleport_enter1_1.asm index 60c87cab..ec278374 100644 --- a/audio/sfx/teleport_enter1_1.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,5 +1,5 @@ SFX_Teleport_Enter1_1_Ch4: - duty 1 + dutycycle 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 unknownsfx0x20 15, 183, 128, 6 diff --git a/audio/sfx/teleport_enter1_3.asm b/audio/sfx/teleport_enter1_3.asm deleted file mode 100644 index d3dab8b4..00000000 --- a/audio/sfx/teleport_enter1_3.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_Teleport_Enter1_3_Ch4: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 7 - unknownsfx0x20 15, 183, 128, 6 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 5 - unknownsfx0x20 15, 23, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/teleport_enter2_3.asm b/audio/sfx/teleport_enter2_3.asm deleted file mode 100644 index 8b7c7894..00000000 --- a/audio/sfx/teleport_enter2_3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_Teleport_Enter2_3_Ch7: - unknownnoise0x20 2, 241, 50 - unknownnoise0x20 2, 0, 0 - unknownnoise0x20 2, 241, 34 - unknownnoise0x20 1, 0, 0 - endchannel diff --git a/audio/sfx/teleport_exit1_1.asm b/audio/sfx/teleport_exit1_1.asm index 084c116f..1b5e7512 100644 --- a/audio/sfx/teleport_exit1_1.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,5 +1,5 @@ SFX_Teleport_Exit1_1_Ch4: - duty 1 + dutycycle 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 unknownsfx0x20 15, 183, 128, 5 diff --git a/audio/sfx/teleport_exit1_3.asm b/audio/sfx/teleport_exit1_3.asm deleted file mode 100644 index b3a26af8..00000000 --- a/audio/sfx/teleport_exit1_3.asm +++ /dev/null @@ -1,10 +0,0 @@ -SFX_Teleport_Exit1_3_Ch4: - duty 1 - unknownsfx0x10 23 - unknownsfx0x20 15, 215, 0, 5 - unknownsfx0x20 15, 183, 128, 5 - unknownsfx0x20 15, 135, 0, 6 - unknownsfx0x20 15, 71, 128, 6 - unknownsfx0x20 15, 23, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/teleport_exit2_1.asm b/audio/sfx/teleport_exit2_1.asm index 4b168bb9..2370096c 100644 --- a/audio/sfx/teleport_exit2_1.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,5 +1,5 @@ SFX_Teleport_Exit2_1_Ch4: - duty 1 + dutycycle 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 unknownsfx0x10 8 diff --git a/audio/sfx/teleport_exit2_3.asm b/audio/sfx/teleport_exit2_3.asm deleted file mode 100644 index 171e59d8..00000000 --- a/audio/sfx/teleport_exit2_3.asm +++ /dev/null @@ -1,6 +0,0 @@ -SFX_Teleport_Exit2_3_Ch4: - duty 1 - unknownsfx0x10 22 - unknownsfx0x20 15, 210, 0, 5 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/tink_1.asm b/audio/sfx/tink_1.asm index c1f5f00c..c5fe34fd 100644 --- a/audio/sfx/tink_1.asm +++ b/audio/sfx/tink_1.asm @@ -1,5 +1,5 @@ SFX_Tink_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 unknownsfx0x10 34 diff --git a/audio/sfx/tink_2.asm b/audio/sfx/tink_2.asm deleted file mode 100644 index bab45323..00000000 --- a/audio/sfx/tink_2.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Tink_2_Ch4: - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/tink_3.asm b/audio/sfx/tink_3.asm deleted file mode 100644 index a9cf73ec..00000000 --- a/audio/sfx/tink_3.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Tink_3_Ch4: - duty 2 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 2 - unknownsfx0x10 34 - unknownsfx0x20 8, 226, 0, 2 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/trade_machine_1.asm b/audio/sfx/trade_machine_1.asm index 2f67936b..b4e8773f 100644 --- a/audio/sfx/trade_machine_1.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,5 +1,5 @@ SFX_Trade_Machine_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 unknownsfx0x20 15, 242, 80, 6 diff --git a/audio/sfx/trade_machine_3.asm b/audio/sfx/trade_machine_3.asm deleted file mode 100644 index b590455e..00000000 --- a/audio/sfx/trade_machine_3.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Trade_Machine_3_Ch4: - duty 2 - unknownsfx0x10 21 - unknownsfx0x20 15, 240, 240, 4 - unknownsfx0x20 15, 242, 80, 6 - unknownsfx0x10 8 - endchannel diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/triangle1_1.asm deleted file mode 100644 index 957dc63f..00000000 --- a/audio/sfx/triangle1_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_1_Ch7: - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm deleted file mode 100644 index 535448cd..00000000 --- a/audio/sfx/triangle1_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_2_Ch7: - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm deleted file mode 100644 index a13d00ea..00000000 --- a/audio/sfx/triangle1_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Triangle1_3_Ch7: - unknownnoise0x20 0, 81, 42 - endchannel diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/triangle2_1.asm deleted file mode 100644 index 09ba8a67..00000000 --- a/audio/sfx/triangle2_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_1_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/triangle2_2.asm deleted file mode 100644 index 6512648a..00000000 --- a/audio/sfx/triangle2_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_2_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/triangle2_3.asm deleted file mode 100644 index b0612aba..00000000 --- a/audio/sfx/triangle2_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle2_3_Ch7: - unknownnoise0x20 1, 65, 43 - unknownnoise0x20 0, 97, 42 - endchannel diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/triangle3_1.asm deleted file mode 100644 index 9fd3952f..00000000 --- a/audio/sfx/triangle3_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_1_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/triangle3_2.asm deleted file mode 100644 index 38b3198b..00000000 --- a/audio/sfx/triangle3_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_2_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/triangle3_3.asm deleted file mode 100644 index 138c8fac..00000000 --- a/audio/sfx/triangle3_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Triangle3_3_Ch7: - unknownnoise0x20 2, 145, 40 - unknownnoise0x20 0, 113, 24 - endchannel diff --git a/audio/sfx/turn_off_pc_1.asm b/audio/sfx/turn_off_pc_1.asm index 6b2561fe..a704d861 100644 --- a/audio/sfx/turn_off_pc_1.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,5 +1,5 @@ SFX_Turn_Off_PC_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 unknownsfx0x20 4, 240, 0, 2 diff --git a/audio/sfx/turn_off_pc_3.asm b/audio/sfx/turn_off_pc_3.asm deleted file mode 100644 index cf6d95cd..00000000 --- a/audio/sfx/turn_off_pc_3.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Turn_Off_PC_3_Ch4: - duty 2 - unknownsfx0x20 4, 240, 0, 6 - unknownsfx0x20 4, 240, 0, 4 - unknownsfx0x20 4, 240, 0, 2 - unknownsfx0x20 1, 0, 0, 0 - endchannel diff --git a/audio/sfx/turn_on_pc_1.asm b/audio/sfx/turn_on_pc_1.asm index dede7c3e..b7ec7eed 100644 --- a/audio/sfx/turn_on_pc_1.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,5 +1,5 @@ SFX_Turn_On_PC_1_Ch4: - duty 2 + dutycycle 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 unknownsfx0x20 3, 161, 128, 7 diff --git a/audio/sfx/turn_on_pc_3.asm b/audio/sfx/turn_on_pc_3.asm deleted file mode 100644 index 1ed54d3c..00000000 --- a/audio/sfx/turn_on_pc_3.asm +++ /dev/null @@ -1,14 +0,0 @@ -SFX_Turn_On_PC_3_Ch4: - duty 2 - unknownsfx0x20 15, 242, 192, 7 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 15, 0, 0, 0 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 64, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 128, 7 - unknownsfx0x20 3, 129, 0, 7 - unknownsfx0x20 3, 129, 192, 7 - unknownsfx0x20 3, 129, 0, 7 - endchannel diff --git a/audio/sfx/unused2_2.asm b/audio/sfx/unused2_2.asm index 36c10ba3..5b801321 100755 --- a/audio/sfx/unused2_2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,56 +1,56 @@ SFX_08_unused2_Ch4: executemusic tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty 2 + volume 119 + vibrato 6, (2<<4) + 6 + dutycycle 2 toggleperfectpitch - notetype 6, 11, 1 + notetype 6, (11<<4) + 1 octave 3 - G# 2 - G# 2 - notetype 6, 11, 3 - G# 2 - B_ 2 + note G#, 2 + note G#, 2 + notetype 6, (11<<4) + 3 + note G#, 2 + note B_, 2 octave 4 - E_ 8 + note E_, 8 endchannel SFX_08_unused2_Ch5: executemusic - vibrato 8, 2, 7 - duty 2 - notetype 6, 12, 1 + vibrato 8, (2<<4) + 7 + dutycycle 2 + notetype 6, (12<<4) + 1 octave 4 - E_ 2 - E_ 1 - E_ 1 - notetype 6, 12, 3 - E_ 2 - G# 2 - B_ 8 + note E_, 2 + note E_, 1 + note E_, 1 + notetype 6, (12<<4) + 3 + note E_, 2 + note G#, 2 + note B_, 8 endchannel SFX_08_unused2_Ch6: executemusic - notetype 6, 1, 0 + notetype 6, (1<<4) + 0 octave 4 - B_ 1 - rest 1 - notetype 3, 1, 0 - B_ 1 - rest 1 - B_ 1 - rest 1 - notetype 6, 1, 0 - B_ 1 - rest 1 + note B_, 1 + note __, 1 + notetype 3, (1<<4) + 0 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + notetype 6, (1<<4) + 0 + note B_, 1 + note __, 1 octave 5 - E_ 1 - rest 1 + note E_, 1 + note __, 1 octave 4 - B_ 4 - rest 4 + note B_, 4 + note __, 4 endchannel diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_2.asm deleted file mode 100755 index 20de851f..00000000 --- a/audio/sfx/unused_2.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_08_unused_Ch4: - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel - - -SFX_08_unused_Ch5: - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel - - -SFX_08_unused_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_3.asm deleted file mode 100755 index d4a30539..00000000 --- a/audio/sfx/unused_3.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_1f_unused_Ch4: - dutycycle 240 - unknownsfx0x20 15, 224, 128, 7 - unknownsfx0x20 15, 240, 132, 7 - unknownsfx0x20 15, 195, 224, 5 - unknownsfx0x20 15, 196, 0, 6 - unknownsfx0x20 10, 108, 128, 7 - unknownsfx0x20 8, 113, 132, 7 - endchannel - - -SFX_1f_unused_Ch5: - dutycycle 5 - unknownsfx0x20 15, 160, 65, 7 - unknownsfx0x20 15, 176, 67, 7 - unknownsfx0x20 15, 147, 177, 5 - unknownsfx0x20 15, 148, 193, 5 - unknownsfx0x20 10, 76, 65, 7 - unknownsfx0x20 8, 49, 70, 7 - endchannel - - -SFX_1f_unused_Ch7: - unknownnoise0x20 2, 242, 76 - unknownnoise0x20 6, 224, 58 - unknownnoise0x20 15, 208, 58 - unknownnoise0x20 8, 208, 44 - unknownnoise0x20 6, 230, 76 - unknownnoise0x20 12, 125, 76 - unknownnoise0x20 15, 211, 76 - endchannel diff --git a/audio/sfx/withdraw_deposit_1.asm b/audio/sfx/withdraw_deposit_1.asm index d7a2f54d..0556ce6d 100644 --- a/audio/sfx/withdraw_deposit_1.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,5 +1,5 @@ SFX_Withdraw_Deposit_1_Ch4: - duty 1 + dutycycle 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 unknownsfx0x10 34 diff --git a/audio/sfx/withdraw_deposit_3.asm b/audio/sfx/withdraw_deposit_3.asm deleted file mode 100644 index 1fd1fe3e..00000000 --- a/audio/sfx/withdraw_deposit_3.asm +++ /dev/null @@ -1,12 +0,0 @@ -SFX_Withdraw_Deposit_3_Ch4: - duty 1 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 5 - unknownsfx0x10 34 - unknownsfx0x20 4, 226, 0, 5 - unknownsfx0x10 58 - unknownsfx0x20 4, 242, 0, 7 - unknownsfx0x10 34 - unknownsfx0x20 15, 226, 0, 7 - unknownsfx0x10 8 - endchannel diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 57ad230d..cfa04850 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -39,231 +39,178 @@ BIT_EXECUTE_MUSIC EQU 0 ; if in execute music ; Song ids are calculated by address to save space. -music_const: MACRO -\1 EQUS "((\2 - SFX_Headers_1) / 3)" -ENDM +;music_const: MACRO +;\1 EQUS "RB(\2)" +;ENDM +const_value = 1 - ; AUDIO_1 - music_const MUSIC_PALLET_TOWN, Music_PalletTown - music_const MUSIC_POKECENTER, Music_Pokecenter - music_const MUSIC_GYM, Music_Gym - music_const MUSIC_CITIES1, Music_Cities1 - music_const MUSIC_CITIES2, Music_Cities2 - music_const MUSIC_CELADON, Music_Celadon - music_const MUSIC_CINNABAR, Music_Cinnabar - music_const MUSIC_VERMILION, Music_Vermilion - music_const MUSIC_LAVENDER, Music_Lavender - music_const MUSIC_SS_ANNE, Music_SSAnne - music_const MUSIC_MEET_PROF_OAK, Music_MeetProfOak - music_const MUSIC_MEET_RIVAL, Music_MeetRival - music_const MUSIC_MUSEUM_GUY, Music_MuseumGuy - music_const MUSIC_SAFARI_ZONE, Music_SafariZone - music_const MUSIC_PKMN_HEALED, Music_PkmnHealed - music_const MUSIC_ROUTES1, Music_Routes1 - music_const MUSIC_ROUTES2, Music_Routes2 - music_const MUSIC_ROUTES3, Music_Routes3 - music_const MUSIC_ROUTES4, Music_Routes4 - music_const MUSIC_INDIGO_PLATEAU, Music_IndigoPlateau + const MUSIC_PALLET_TOWN + const MUSIC_POKECENTER + const MUSIC_GYM + const MUSIC_CITIES1 + const MUSIC_CITIES2 + const MUSIC_CELADON + const MUSIC_CINNABAR + const MUSIC_VERMILION + const MUSIC_LAVENDER + const MUSIC_SS_ANNE + const MUSIC_MEET_PROF_OAK + const MUSIC_MEET_RIVAL + const MUSIC_MUSEUM_GUY + const MUSIC_SAFARI_ZONE + const MUSIC_PKMN_HEALED + const MUSIC_ROUTES1 + const MUSIC_ROUTES2 + const MUSIC_ROUTES3 + const MUSIC_ROUTES4 + const MUSIC_INDIGO_PLATEAU + + const MUSIC_GYM_LEADER_BATTLE + const MUSIC_TRAINER_BATTLE + const MUSIC_WILD_BATTLE + const MUSIC_FINAL_BATTLE + const MUSIC_DEFEATED_TRAINER + const MUSIC_DEFEATED_WILD_MON + const MUSIC_DEFEATED_GYM_LEADER + + const MUSIC_TITLE_SCREEN + const MUSIC_CREDITS + const MUSIC_HALL_OF_FAME + const MUSIC_OAKS_LAB + const MUSIC_JIGGLYPUFF_SONG + const MUSIC_BIKE_RIDING + const MUSIC_SURFING + const MUSIC_GAME_CORNER + const MUSIC_INTRO_BATTLE + const MUSIC_DUNGEON1 + const MUSIC_DUNGEON2 + const MUSIC_DUNGEON3 + const MUSIC_CINNABAR_MANSION + const MUSIC_POKEMON_TOWER + const MUSIC_SILPH_CO + const MUSIC_MEET_EVIL_TRAINER + const MUSIC_MEET_FEMALE_TRAINER + const MUSIC_MEET_MALE_TRAINER - ; AUDIO_2 - music_const MUSIC_GYM_LEADER_BATTLE, Music_GymLeaderBattle - music_const MUSIC_TRAINER_BATTLE, Music_TrainerBattle - music_const MUSIC_WILD_BATTLE, Music_WildBattle - music_const MUSIC_FINAL_BATTLE, Music_FinalBattle - music_const MUSIC_DEFEATED_TRAINER, Music_DefeatedTrainer - music_const MUSIC_DEFEATED_WILD_MON, Music_DefeatedWildMon - music_const MUSIC_DEFEATED_GYM_LEADER, Music_DefeatedGymLeader - ; AUDIO_3 - music_const MUSIC_TITLE_SCREEN, Music_TitleScreen - music_const MUSIC_CREDITS, Music_Credits - music_const MUSIC_HALL_OF_FAME, Music_HallOfFame - music_const MUSIC_OAKS_LAB, Music_OaksLab - music_const MUSIC_JIGGLYPUFF_SONG, Music_JigglypuffSong - music_const MUSIC_BIKE_RIDING, Music_BikeRiding - music_const MUSIC_SURFING, Music_Surfing - music_const MUSIC_GAME_CORNER, Music_GameCorner - music_const MUSIC_INTRO_BATTLE, Music_IntroBattle - music_const MUSIC_DUNGEON1, Music_Dungeon1 - music_const MUSIC_DUNGEON2, Music_Dungeon2 - music_const MUSIC_DUNGEON3, Music_Dungeon3 - music_const MUSIC_CINNABAR_MANSION, Music_CinnabarMansion - music_const MUSIC_POKEMON_TOWER, Music_PokemonTower - music_const MUSIC_SILPH_CO, Music_SilphCo - music_const MUSIC_MEET_EVIL_TRAINER, Music_MeetEvilTrainer - music_const MUSIC_MEET_FEMALE_TRAINER, Music_MeetFemaleTrainer - music_const MUSIC_MEET_MALE_TRAINER, Music_MeetMaleTrainer +const_value = 1 + ; AUDIO_1 AUDIO_3 + const SFX_GET_ITEM_1 ; AUDIO_1 AUDIO_2 AUDIO_3 - music_const SFX_SNARE_1, SFX_Snare1_1 - music_const SFX_SNARE_2, SFX_Snare2_1 - music_const SFX_SNARE_3, SFX_Snare3_1 - music_const SFX_SNARE_4, SFX_Snare4_1 - music_const SFX_SNARE_5, SFX_Snare5_1 - music_const SFX_TRIANGLE_1, SFX_Triangle1_1 - music_const SFX_TRIANGLE_2, SFX_Triangle2_1 - music_const SFX_SNARE_6, SFX_Snare6_1 - music_const SFX_SNARE_7, SFX_Snare7_1 - music_const SFX_SNARE_8, SFX_Snare8_1 - music_const SFX_SNARE_9, SFX_Snare9_1 - music_const SFX_CYMBAL_1, SFX_Cymbal1_1 - music_const SFX_CYMBAL_2, SFX_Cymbal2_1 - music_const SFX_CYMBAL_3, SFX_Cymbal3_1 - music_const SFX_MUTED_SNARE_1, SFX_Muted_Snare1_1 - music_const SFX_TRIANGLE_3, SFX_Triangle3_1 - music_const SFX_MUTED_SNARE_2, SFX_Muted_Snare2_1 - music_const SFX_MUTED_SNARE_3, SFX_Muted_Snare3_1 - music_const SFX_MUTED_SNARE_4, SFX_Muted_Snare4_1 - music_const SFX_CRY_00, SFX_Cry00_1 - music_const SFX_CRY_01, SFX_Cry01_1 - music_const SFX_CRY_02, SFX_Cry02_1 - music_const SFX_CRY_03, SFX_Cry03_1 - music_const SFX_CRY_04, SFX_Cry04_1 - music_const SFX_CRY_05, SFX_Cry05_1 - music_const SFX_CRY_06, SFX_Cry06_1 - music_const SFX_CRY_07, SFX_Cry07_1 - music_const SFX_CRY_08, SFX_Cry08_1 - music_const SFX_CRY_09, SFX_Cry09_1 - music_const SFX_CRY_0A, SFX_Cry0A_1 - music_const SFX_CRY_0B, SFX_Cry0B_1 - music_const SFX_CRY_0C, SFX_Cry0C_1 - music_const SFX_CRY_0D, SFX_Cry0D_1 - music_const SFX_CRY_0E, SFX_Cry0E_1 - music_const SFX_CRY_0F, SFX_Cry0F_1 - music_const SFX_CRY_10, SFX_Cry10_1 - music_const SFX_CRY_11, SFX_Cry11_1 - music_const SFX_CRY_12, SFX_Cry12_1 - music_const SFX_CRY_13, SFX_Cry13_1 - music_const SFX_CRY_14, SFX_Cry14_1 - music_const SFX_CRY_15, SFX_Cry15_1 - music_const SFX_CRY_16, SFX_Cry16_1 - music_const SFX_CRY_17, SFX_Cry17_1 - music_const SFX_CRY_18, SFX_Cry18_1 - music_const SFX_CRY_19, SFX_Cry19_1 - music_const SFX_CRY_1A, SFX_Cry1A_1 - music_const SFX_CRY_1B, SFX_Cry1B_1 - music_const SFX_CRY_1C, SFX_Cry1C_1 - music_const SFX_CRY_1D, SFX_Cry1D_1 - music_const SFX_CRY_1E, SFX_Cry1E_1 - music_const SFX_CRY_1F, SFX_Cry1F_1 - music_const SFX_CRY_20, SFX_Cry20_1 - music_const SFX_CRY_21, SFX_Cry21_1 - music_const SFX_CRY_22, SFX_Cry22_1 - music_const SFX_CRY_23, SFX_Cry23_1 - music_const SFX_CRY_24, SFX_Cry24_1 - music_const SFX_CRY_25, SFX_Cry25_1 - - music_const SFX_GET_ITEM_2, SFX_Get_Item2_1 - music_const SFX_TINK, SFX_Tink_1 - music_const SFX_HEAL_HP, SFX_Heal_HP_1 - music_const SFX_HEAL_AILMENT, SFX_Heal_Ailment_1 - music_const SFX_START_MENU, SFX_Start_Menu_1 - music_const SFX_PRESS_AB, SFX_Press_AB_1 + const SFX_GET_ITEM_2 + const SFX_TINK + const SFX_HEAL_HP + const SFX_HEAL_AILMENT + const SFX_START_MENU + const SFX_PRESS_AB ; AUDIO_1 AUDIO_3 - music_const SFX_GET_ITEM_1, SFX_Get_Item1_1 - - music_const SFX_POKEDEX_RATING, SFX_Pokedex_Rating_1 - music_const SFX_GET_KEY_ITEM, SFX_Get_Key_Item_1 - music_const SFX_POISONED, SFX_Poisoned_1 - music_const SFX_TRADE_MACHINE, SFX_Trade_Machine_1 - music_const SFX_TURN_ON_PC, SFX_Turn_On_PC_1 - music_const SFX_TURN_OFF_PC, SFX_Turn_Off_PC_1 - music_const SFX_ENTER_PC, SFX_Enter_PC_1 - music_const SFX_SHRINK, SFX_Shrink_1 - music_const SFX_SWITCH, SFX_Switch_1 - music_const SFX_HEALING_MACHINE, SFX_Healing_Machine_1 - music_const SFX_TELEPORT_EXIT_1, SFX_Teleport_Exit1_1 - music_const SFX_TELEPORT_ENTER_1, SFX_Teleport_Enter1_1 - music_const SFX_TELEPORT_EXIT_2, SFX_Teleport_Exit2_1 - music_const SFX_LEDGE, SFX_Ledge_1 - music_const SFX_TELEPORT_ENTER_2, SFX_Teleport_Enter2_1 - music_const SFX_FLY, SFX_Fly_1 - music_const SFX_DENIED, SFX_Denied_1 - music_const SFX_ARROW_TILES, SFX_Arrow_Tiles_1 - music_const SFX_PUSH_BOULDER, SFX_Push_Boulder_1 - music_const SFX_SS_ANNE_HORN, SFX_SS_Anne_Horn_1 - music_const SFX_WITHDRAW_DEPOSIT, SFX_Withdraw_Deposit_1 - music_const SFX_CUT, SFX_Cut_1 - music_const SFX_GO_INSIDE, SFX_Go_Inside_1 - music_const SFX_SWAP, SFX_Swap_1 - music_const SFX_59, SFX_59_1 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL - music_const SFX_PURCHASE, SFX_Purchase_1 - music_const SFX_COLLISION, SFX_Collision_1 - music_const SFX_GO_OUTSIDE, SFX_Go_Outside_1 - music_const SFX_SAVE, SFX_Save_1 + const SFX_POKEDEX_RATING + const SFX_GET_KEY_ITEM + const SFX_POISONED + const SFX_TRADE_MACHINE + const SFX_TURN_ON_PC + const SFX_TURN_OFF_PC + const SFX_ENTER_PC + const SFX_SHRINK + const SFX_SWITCH + const SFX_HEALING_MACHINE + const SFX_TELEPORT_EXIT_1 + const SFX_TELEPORT_ENTER_1 + const SFX_TELEPORT_EXIT_2 + const SFX_LEDGE + const SFX_TELEPORT_ENTER_2 + const SFX_FLY + const SFX_DENIED + const SFX_ARROW_TILES + const SFX_PUSH_BOULDER + const SFX_SS_ANNE_HORN + const SFX_WITHDRAW_DEPOSIT + const SFX_CUT + const SFX_GO_INSIDE + const SFX_SWAP + const SFX_59 + const SFX_PURCHASE + const SFX_COLLISION + const SFX_GO_OUTSIDE + const SFX_SAVE ; AUDIO_1 - music_const SFX_POKEFLUE, SFX_Pokeflute - music_const SFX_SAFARI_ZONE_PA, SFX_Safari_Zone_PA + const SFX_POKEFLUE + const SFX_SAFARI_ZONE_PA ; AUDIO_2 - music_const SFX_LEVEL_UP, SFX_Level_Up + const SFX_LEVEL_UP - music_const SFX_BALL_TOSS, SFX_Ball_Toss - music_const SFX_BALL_POOF, SFX_Ball_Poof - music_const SFX_FAINT_THUD, SFX_Faint_Thud - music_const SFX_RUN, SFX_Run - music_const SFX_DEX_PAGE_ADDED, SFX_Dex_Page_Added - music_const SFX_CAUGHT_MON, SFX_Caught_Mon - music_const SFX_PECK, SFX_Peck - music_const SFX_FAINT_FALL, SFX_Faint_Fall - music_const SFX_BATTLE_09, SFX_Battle_09 - music_const SFX_POUND, SFX_Pound - music_const SFX_BATTLE_0B, SFX_Battle_0B - music_const SFX_BATTLE_0C, SFX_Battle_0C - music_const SFX_BATTLE_0D, SFX_Battle_0D - music_const SFX_BATTLE_0E, SFX_Battle_0E - music_const SFX_BATTLE_0F, SFX_Battle_0F - music_const SFX_DAMAGE, SFX_Damage - music_const SFX_NOT_VERY_EFFECTIVE, SFX_Not_Very_Effective - music_const SFX_BATTLE_12, SFX_Battle_12 - music_const SFX_BATTLE_13, SFX_Battle_13 - music_const SFX_BATTLE_14, SFX_Battle_14 - music_const SFX_VINE_WHIP, SFX_Vine_Whip - music_const SFX_BATTLE_16, SFX_Battle_16 ; unused? - music_const SFX_BATTLE_17, SFX_Battle_17 - music_const SFX_BATTLE_18, SFX_Battle_18 - music_const SFX_BATTLE_19, SFX_Battle_19 - music_const SFX_SUPER_EFFECTIVE, SFX_Super_Effective - music_const SFX_BATTLE_1B, SFX_Battle_1B - music_const SFX_BATTLE_1C, SFX_Battle_1C - music_const SFX_DOUBLESLAP, SFX_Doubleslap - music_const SFX_BATTLE_1E, SFX_Battle_1E - music_const SFX_HORN_DRILL, SFX_Horn_Drill - music_const SFX_BATTLE_20, SFX_Battle_20 - music_const SFX_BATTLE_21, SFX_Battle_21 - music_const SFX_BATTLE_22, SFX_Battle_22 - music_const SFX_BATTLE_23, SFX_Battle_23 - music_const SFX_BATTLE_24, SFX_Battle_24 - music_const SFX_BATTLE_25, SFX_Battle_25 - music_const SFX_BATTLE_26, SFX_Battle_26 - music_const SFX_BATTLE_27, SFX_Battle_27 - music_const SFX_BATTLE_28, SFX_Battle_28 - music_const SFX_BATTLE_29, SFX_Battle_29 - music_const SFX_BATTLE_2A, SFX_Battle_2A - music_const SFX_BATTLE_2B, SFX_Battle_2B - music_const SFX_BATTLE_2C, SFX_Battle_2C - music_const SFX_PSYBEAM, SFX_Psybeam - music_const SFX_BATTLE_2E, SFX_Battle_2E - music_const SFX_BATTLE_2F, SFX_Battle_2F - music_const SFX_PSYCHIC_M, SFX_Psychic_M - music_const SFX_BATTLE_31, SFX_Battle_31 - music_const SFX_BATTLE_32, SFX_Battle_32 - music_const SFX_BATTLE_33, SFX_Battle_33 - music_const SFX_BATTLE_34, SFX_Battle_34 - music_const SFX_BATTLE_35, SFX_Battle_35 - music_const SFX_BATTLE_36, SFX_Battle_36 - music_const SFX_SILPH_SCOPE, SFX_Silph_Scope + const SFX_BALL_TOSS + const SFX_BALL_POOF + const SFX_FAINT_THUD + const SFX_RUN + const SFX_DEX_PAGE_ADDED + const SFX_CAUGHT_MON + const SFX_PECK + const SFX_FAINT_FALL + const SFX_BATTLE_09 + const SFX_POUND + const SFX_BATTLE_0B + const SFX_BATTLE_0C + const SFX_BATTLE_0D + const SFX_BATTLE_0E + const SFX_BATTLE_0F + const SFX_DAMAGE + const SFX_NOT_VERY_EFFECTIVE + const SFX_BATTLE_12 + const SFX_BATTLE_13 + const SFX_BATTLE_14 + const SFX_VINE_WHIP + const SFX_BATTLE_16 + const SFX_BATTLE_17 + const SFX_BATTLE_18 + const SFX_BATTLE_19 + const SFX_SUPER_EFFECTIVE + const SFX_BATTLE_1B + const SFX_BATTLE_1C + const SFX_DOUBLESLAP + const SFX_BATTLE_1E + const SFX_HORN_DRILL + const SFX_BATTLE_20 + const SFX_BATTLE_21 + const SFX_BATTLE_22 + const SFX_BATTLE_23 + const SFX_BATTLE_24 + const SFX_BATTLE_25 + const SFX_BATTLE_26 + const SFX_BATTLE_27 + const SFX_BATTLE_28 + const SFX_BATTLE_29 + const SFX_BATTLE_2A + const SFX_BATTLE_2B + const SFX_BATTLE_2C + const SFX_PSYBEAM + const SFX_BATTLE_2E + const SFX_BATTLE_2F + const SFX_PSYCHIC_M + const SFX_BATTLE_31 + const SFX_BATTLE_32 + const SFX_BATTLE_33 + const SFX_BATTLE_34 + const SFX_BATTLE_35 + const SFX_BATTLE_36 + const SFX_SILPH_SCOPE ; AUDIO_3 - music_const SFX_INTRO_LUNGE, SFX_Intro_Lunge - music_const SFX_INTRO_HIP, SFX_Intro_Hip - music_const SFX_INTRO_HOP, SFX_Intro_Hop - music_const SFX_INTRO_RAISE, SFX_Intro_Raise - music_const SFX_INTRO_CRASH, SFX_Intro_Crash - music_const SFX_INTRO_WHOOSH, SFX_Intro_Whoosh - music_const SFX_SLOTS_STOP_WHEEL, SFX_Slots_Stop_Wheel - music_const SFX_SLOTS_REWARD, SFX_Slots_Reward - music_const SFX_SLOTS_NEW_SPIN, SFX_Slots_New_Spin - music_const SFX_SHOOTING_STAR, SFX_Shooting_Star + const SFX_INTRO_LUNGE + const SFX_INTRO_HIP + const SFX_INTRO_HOP + const SFX_INTRO_RAISE + const SFX_INTRO_CRASH + const SFX_INTRO_WHOOSH + const SFX_SLOTS_STOP_WHEEL + const SFX_SLOTS_REWARD + const SFX_SLOTS_NEW_SPIN + const SFX_SHOOTING_STAR + + const GSSFX_NOT_VERY_EFFECTIVE + const GSSFX_DAMAGE + const GSSFX_SUPER_EFFECTIVE diff --git a/crysaudio/cries.asm b/crysaudio/cries.asm new file mode 100644 index 00000000..85abcc69 --- /dev/null +++ b/crysaudio/cries.asm @@ -0,0 +1,2306 @@ +Cry_26: ; f2d81 + dbw $84, Cry_26_Ch5 + dbw $05, Cry_26_Ch6 + dbw $07, Cry_26_Ch8 +; f2d8a + +Cry_28: ; f2d8a + dbw $44, Cry_28_Ch5 + dbw $05, Cry_28_Ch6 +; f2d90 + +Cry_2C: ; f2d90 + dbw $44, Cry_2C_Ch5 + dbw $05, Cry_2C_Ch6 +; f2d96 + +Cry_27: ; f2d96 + dbw $84, Cry_27_Ch5 + dbw $05, Cry_27_Ch6 + dbw $07, Cry_27_Ch8 +; f2d9f + +Cry_2A: ; f2d9f + dbw $84, Cry_2A_Ch5 + dbw $05, Cry_2A_Ch6 + dbw $07, Cry_2A_Ch8 +; f2da8 + +Cry_2D: ; f2da8 + dbw $84, Cry_2D_Ch5 + dbw $05, Cry_2D_Ch6 + dbw $07, Cry_2D_Ch8 +; f2db1 + +Cry_2E: ; f2db1 + dbw $44, Cry_2E_Ch5 + dbw $05, Cry_2E_Ch6 +; f2db7 + +Cry_2F: ; f2db7 + dbw $84, Cry_2F_Ch5 + dbw $05, Cry_2F_Ch6 + dbw $07, Cry_2F_Ch8 +; f2dc0 + +Cry_2B: ; f2dc0 + dbw $44, Cry_2B_Ch5 + dbw $05, Cry_2B_Ch6 +; f2dc6 + +Cry_30: ; f2dc6 + dbw $84, Cry_30_Ch5 + dbw $05, Cry_30_Ch6 + dbw $07, Cry_30_Ch8 +; f2dcf + +Cry_31: ; f2dcf + dbw $84, Cry_31_Ch5 + dbw $05, Cry_31_Ch6 + dbw $07, Cry_31_Ch8 +; f2dd8 + +Cry_33: ; f2dd8 + dbw $44, Cry_33_Ch5 + dbw $07, Cry_33_Ch8 +; f2dde + +Cry_29: ; f2dde + dbw $84, Cry_29_Ch5 + dbw $05, Cry_29_Ch6 + dbw $07, Cry_29_Ch8 +; f2de7 + +Cry_35: ; f2de7 + dbw $44, Cry_35_Ch5 + dbw $07, Cry_35_Ch8 +; f2ded + +Cry_36: ; f2ded + dbw $84, Cry_36_Ch5 + dbw $05, Cry_36_Ch6 + dbw $07, Cry_36_Ch8 +; f2df6 + +Cry_38: ; f2df6 + dbw $84, Cry_38_Ch5 + dbw $05, Cry_38_Ch6 + dbw $07, Cry_38_Ch8 +; f2dff + +Cry_43: ; f2dff + dbw $84, Cry_43_Ch5 + dbw $05, Cry_43_Ch6 + dbw $07, Cry_43_Ch8 +; f2e08 + +Cry_3A: ; f2e08 + dbw $84, Cry_3A_Ch5 + dbw $05, Cry_3A_Ch6 + dbw $07, Cry_3A_Ch8 +; f2e11 + +Cry_3B: ; f2e11 + dbw $84, Cry_3B_Ch5 + dbw $05, Cry_3B_Ch6 + dbw $07, Cry_3B_Ch8 +; f2e1a + +Cry_3C: ; f2e1a + dbw $84, Cry_3C_Ch5 + dbw $05, Cry_3C_Ch6 + dbw $07, Cry_3C_Ch8 +; f2e23 + +Cry_3D: ; f2e23 + dbw $84, Cry_3D_Ch5 + dbw $05, Cry_3D_Ch6 + dbw $07, Cry_3D_Ch8 +; f2e2c + +Cry_3E: ; f2e2c + dbw $84, Cry_3E_Ch5 + dbw $05, Cry_3E_Ch6 + dbw $07, Cry_3E_Ch8 +; f2e35 + +Cry_32: ; f2e35 + dbw $84, Cry_32_Ch5 + dbw $05, Cry_32_Ch6 + dbw $07, Cry_32_Ch8 +; f2e3e + +Cry_34: ; f2e3e + dbw $84, Cry_34_Ch5 + dbw $05, Cry_34_Ch6 + dbw $07, Cry_34_Ch8 +; f2e47 + +Cry_40: ; f2e47 + dbw $84, Cry_40_Ch5 + dbw $05, Cry_40_Ch6 + dbw $07, Cry_40_Ch8 +; f2e50 + +Cry_41: ; f2e50 + dbw $84, Cry_41_Ch5 + dbw $05, Cry_41_Ch6 + dbw $07, Cry_41_Ch8 +; f2e59 + +Cry_42: ; f2e59 + dbw $84, Cry_42_Ch5 + dbw $05, Cry_42_Ch6 + dbw $07, Cry_42_Ch8 +; f2e62 + +Cry_3F: ; f2e62 + dbw $84, Cry_3F_Ch5 + dbw $05, Cry_3F_Ch6 + dbw $07, Cry_3F_Ch8 +; f2e6b + +Cry_37: ; f2e6b + dbw $84, Cry_37_Ch5 + dbw $05, Cry_37_Ch6 + dbw $07, Cry_37_Ch8 +; f2e74 + +Cry_39: ; f2e74 + dbw $84, Cry_39_Ch5 + dbw $05, Cry_39_Ch6 + dbw $07, Cry_39_Ch8 +; f2e7d + +Cry_37_Ch5: ; f2e7d + soundinput $ff + unknownmusic0xde $63 + sound $1, $f8, $05f8 + sound $8, $9f, $04d8 + sound $6, $f8, $05c4 + sound $14, $f2, $0574 + soundinput $88 + endchannel +; f2e94 + +Cry_37_Ch6: ; f2e94 + unknownmusic0xde $33 + sound $1, $c8, $0640 + sound $6, $ff, $0668 + sound $7, $a8, $0534 + sound $14, $a2, $04a4 + endchannel +; f2ea7 + +Cry_37_Ch8: ; f2ea7 + noise $a, $d6, $6a + noise $6, $bc, $6c + noise $6, $e2, $5c + noise $20, $b4, $6c + endchannel +; f2eb4 + +Cry_3F_Ch5: ; f2eb4 + unknownmusic0xde $c4 + sound $4, $af, $0720 + sound $2, $f8, $071c + sound $2, $f8, $0718 + sound $2, $f8, $0708 + sound $2, $f8, $070e + sound $c, $c8, $0712 + sound $4, $91, $070e + endchannel +; f2ed3 + +Cry_3F_Ch6: ; f2ed3 + unknownmusic0xde $a + sound $1, $b8, $0710 + sound $3, $d8, $072c + sound $4, $d8, $0665 + sound $1, $b8, $0656 + sound $1, $d8, $065c + sound $c, $f8, $0760 + sound $4, $c1, $0750 + endchannel +; f2ef2 + +Cry_3F_Ch8: ; f2ef2 + noise $2, $e8, $3b +Cry_3F_branch_f2ef5: ; f2ef5 + noise $1, $f1, $4e + loopchannel 5, Cry_3F_branch_f2ef5 + noise $2, $d8, $3f + noise $14, $c2, $5f + endchannel +; f2f03 + +Cry_42_Ch5: ; f2f03 + unknownmusic0xde $22 + sound $1, $f8, $05b0 + sound $1, $f8, $04b4 + sound $1, $f8, $05b8 + sound $3, $f8, $05c0 + sound $8, $c8, $0490 + sound $8, $c8, $0480 + soundinput $fe + sound $10, $c3, $0490 + soundinput $88 + endchannel +; f2f26 + +Cry_42_Ch6: ; f2f26 + unknownmusic0xde $22 + sound $8, $b8, $04c8 + sound $20, $b5, $0410 + endchannel +; f2f31 + +Cry_42_Ch8: ; f2f31 + noise $3, $ff, $4b + noise $3, $ef, $4c + noise $20, $b5, $5f + endchannel +; f2f3b + +Cry_2F_Ch5: ; f2f3b + unknownmusic0xde $33 + sound $2, $f1, $0550 + sound $2, $f1, $0530 + sound $2, $f1, $0510 + sound $2, $f2, $0650 + sound $2, $f2, $0640 + sound $2, $f2, $0630 + sound $10, $f2, $0550 + endchannel +; f2f5a + +Cry_2F_Ch6: ; f2f5a + unknownmusic0xde $f2 + sound $4, $e1, $0620 + sound $5, $e2, $0500 + sound $6, $e1, $0620 + sound $2, $e1, $0520 + sound $10, $e2, $0500 + endchannel +; f2f71 + +Cry_2F_Ch8: ; f2f71 + noise $2, $8a, $5d + noise $2, $9a, $4c + noise $5, $9a, $5d + noise $2, $9a, $4d + noise $2, $9a, $4b + noise $2, $9a, $4d + noise $2, $9a, $5f + noise $10, $b2, $6f + endchannel +; f2f8a + +Cry_40_Ch5: ; f2f8a + dutycycle $0 + soundinput $f7 + sound $2, $f8, $078d + sound $2, $f8, $0791 + soundinput $ff + sound $2, $f8, $07ad + soundinput $88 + sound $2, $f8, $07b4 + soundinput $f7 + sound $2, $f8, $07b8 + soundinput $88 + endchannel +; f2fab + +Cry_40_Ch6: ; f2fab + unknownmusic0xde $10 + sound $2, $c8, $076d + sound $2, $c8, $0771 + sound $2, $c8, $078d + sound $2, $c8, $0794 + sound $2, $c8, $0798 + endchannel +; f2fc2 + +Cry_40_Ch8: ; f2fc2 + noise $2, $b8, $1 + noise $2, $b8, $19 + noise $2, $c8, $18 + noise $2, $b8, $10 + noise $8, $c2, $18 + endchannel +; f2fd2 + +Cry_26_Ch5: ; f2fd2 + unknownmusic0xde $22 + sound $2, $88, $06d8 + sound $8, $e2, $06e0 + sound $2, $61, $06e5 + sound $2, $e8, $06c0 + sound $2, $e8, $06b8 + sound $2, $d8, $06b0 + sound $8, $c1, $06aa + endchannel +; f2ff1 + +Cry_26_Ch6: ; f2ff1 + unknownmusic0xde $63 + sound $2, $68, $06b1 + sound $5, $c1, $06b9 + sound $5, $99, $0760 + sound $2, $b8, $068c + sound $2, $a8, $0684 + sound $a, $92, $067b + endchannel +; f300c + +Cry_26_Ch8: ; f300c + noise $1, $99, $6c + noise $1, $92, $5c + noise $a, $62, $4c + noise $2, $68, $6a + noise $2, $68, $6b + noise $a, $62, $6c + endchannel +; f301f + +Cry_28_Ch5: ; f301f + tone $0002 +Cry_28_Ch6: ; f3022 +Cry_2C_branch_f3022: ; f3022 + unknownmusic0xde $52 + sound $4, $f1, $0796 + sound $4, $f1, $072d + sound $7, $0, $0000 + sound $10, $f1, $07a7 + endchannel +; f3035 + +Cry_2C_Ch5: ; f3035 + tone $0002 +Cry_2C_Ch6: ; f3038 +Cry_2C_branch_f3038: ; f3038 + callchannel Cry_2C_branch_f3022 + loopchannel 2, Cry_2C_branch_f3038 + sound $e, $0, $0000 + sound $8, $f2, $07c2 + endchannel +; f3048 + +Cry_27_Ch5: ; f3048 + dutycycle $1 + sound $3, $2c, $07c4 + sound $1, $0, $0001 + sound $5, $59, $07b9 + sound $6, $b4, $07bb + endchannel +; f305b + +Cry_27_Ch6: ; f305b + unknownmusic0xde $2a + sound $3, $2c, $07c7 + sound $1, $0, $0000 + sound $5, $59, $07be + sound $6, $b4, $07bd + endchannel +; f306e + +Cry_27_Ch8: ; f306e + noise $3, $92, $10 + noise $1, $39, $0 + noise $5, $69, $10 + noise $6, $93, $0 + endchannel +; f307b + +Cry_2A_Ch5: ; f307b + unknownmusic0xde $f8 + sound $2, $f1, $04b0 + sound $2, $f7, $0590 + sound $8, $f8, $0510 + sound $3, $f2, $06c0 + sound $3, $f8, $06ba + sound $3, $f2, $06b0 + sound $10, $f2, $0690 + endchannel +; f309a + +Cry_2A_Ch6: ; f309a + unknownmusic0xde $f2 + sound $2, $f1, $0720 + sound $2, $e1, $0650 + sound $4, $f1, $0750 + sound $4, $d1, $03a0 + sound $3, $f1, $0670 + sound $3, $e1, $0680 + sound $3, $f2, $0690 + sound $10, $e2, $06a0 + endchannel +; f30bd + +Cry_2A_Ch8: ; f30bd + noise $2, $89, $2e + noise $2, $99, $1f + noise $4, $89, $4e + noise $4, $89, $7b + noise $3, $d8, $4b + noise $3, $e7, $4c + noise $3, $ec, $4d + noise $10, $d2, $4f + endchannel +; f30d6 + +Cry_2D_Ch5: ; f30d6 + unknownmusic0xde $66 + sound $4, $78, $0650 + sound $4, $f8, $0660 + sound $4, $f8, $065c + sound $1, $f8, $067c + sound $4, $f8, $0680 + sound $4, $f8, $067c + sound $4, $f8, $0678 + sound $4, $f1, $0674 + endchannel +; f30f9 + +Cry_2D_Ch6: ; f30f9 + unknownmusic0xde $22 +Cry_2D_branch_f30fb: ; f30fb + sound $2, $a1, $0600 + loopchannel 3, Cry_2D_branch_f30fb +Cry_2D_branch_f3103: ; f3103 + sound $2, $a1, $0630 + loopchannel 4, Cry_2D_branch_f3103 + sound $4, $a2, $0634 + sound $4, $91, $0638 + endchannel +; f3114 + +Cry_2D_Ch8: ; f3114 + noise $1, $68, $36 + noise $10, $88, $6a + noise $1, $98, $5e + noise $10, $a7, $6e + endchannel +; f3121 + +Cry_2E_Ch5: ; f3121 + tone $0020 + dutycycle $0 + jumpchannel Cry_2E_branch_f312b +; f3129 + +Cry_2E_Ch6: ; f3129 + unknownmusic0xde $1b +Cry_2E_branch_f312b: ; f312b + sound $8, $39, $072d + sound $8, $f1, $0720 + endchannel +; f3134 + +Cry_2E_Ch8: ; f3134 + noise $8, $3b, $0 + noise $8, $92, $0 + endchannel +; f313b + +Cry_2B_Ch5: ; f313b + tone $0020 + dutycycle $0 + jumpchannel Cry_2B_branch_f3145 +; f3143 + +Cry_2B_Ch6: ; f3143 + unknownmusic0xde $1 +Cry_2B_branch_f3145: ; f3145 +Cry_33_branch_f3145: ; f3145 + sound $4, $3a, $073d + sound $6, $f8, $0762 + sound $6, $f8, $0760 + sound $6, $f1, $075e + endchannel +; f3156 + +Cry_30_Ch5: ; f3156 + tone $0020 +Cry_30_Ch6: ; f3159 + dutycycle $2 + sound $8, $2f, $0107 +Cry_30_branch_f315f: ; f315f + sound $0, $e1, $0483 + sound $0, $51, $044e + loopchannel 4, Cry_30_branch_f315f +Cry_30_branch_f316b: ; f316b + sound $0, $e1, $03da + sound $1, $51, $0312 + loopchannel 4, Cry_30_branch_f316b + endchannel +; f3178 + +Cry_30_Ch8: ; f3178 +Cry_33_Ch8: ; f3178 + noise $8, $3f, $52 + noise $20, $93, $4f + endchannel +; f317f + +Cry_31_Ch5: ; f317f + tone $0020 +Cry_31_Ch6: ; f3182 + unknownmusic0xde $21 + sound $2, $c8, $0641 + sound $2, $48, $0641 + sound $6, $f8, $0790 + sound $4, $f8, $078e + sound $4, $f1, $078b + endchannel +; f3199 + +Cry_31_Ch8: ; f3199 + noise $4, $91, $10 + noise $8, $94, $3 + endchannel +; f31a0 + +Cry_33_Ch5: ; f31a0 + unknownmusic0xde $a2 + jumpchannel Cry_33_branch_f3145 +; f31a5 + +Cry_29_Ch5: ; f31a5 + dutycycle $1 + tone $0004 + jumpchannel Cry_29_branch_f31af +; f31ad + +Cry_29_Ch6: ; f31ad + unknownmusic0xde $41 +Cry_29_branch_f31af: ; f31af + sound $4, $68, $0758 + sound $2, $e8, $0760 + sound $2, $e8, $0767 + sound $2, $e8, $076c + sound $7, $f1, $0767 + endchannel +; f31c4 + +Cry_29_Ch8: ; f31c4 + noise $4, $29, $0 + noise $2, $39, $1 + noise $2, $49, $2 + noise $2, $59, $1 + noise $7, $41, $0 + endchannel +; f31d4 + +Cry_35_Ch5: ; f31d4 + unknownmusic0xde $91 + sound $c, $f2, $07a6 + sound $4, $f8, $07b0 + sound $4, $e8, $03b0 + sound $6, $f8, $03a0 + sound $8, $e1, $0290 + endchannel +; f31eb + +Cry_35_Ch8: ; f31eb + noise $c, $b2, $50 + noise $8, $a8, $60 + noise $6, $a8, $5b + noise $8, $a1, $5c + endchannel +; f31f8 + +Cry_36_Ch5: ; f31f8 + tone $0002 + dutycycle $2 + jumpchannel Cry_36_branch_f3202 +; f3200 + +Cry_36_Ch6: ; f3200 + unknownmusic0xde $1 +Cry_36_branch_f3202: ; f3202 + sound $3, $f8, $0791 + sound $3, $d8, $078d + sound $2, $0, $0000 + sound $1, $78, $06c1 + sound $1, $f8, $0741 + sound $4, $e1, $0751 + endchannel +; f321b + +Cry_36_Ch8: ; f321b + noise $3, $59, $21 + noise $3, $81, $0 + noise $2, $20, $0 + noise $1, $80, $21 + noise $1, $80, $10 + noise $4, $87, $0 + endchannel +; f322e + +Cry_38_Ch5: ; f322e +Cry_43_Ch5: ; f322e + dutycycle $2 + sound $2, $99, $0718 + sound $4, $ab, $0722 + sound $8, $ab, $0734 + sound $4, $d6, $0716 + sound $8, $d1, $0712 + sound $8, $0, $0000 + endchannel +; f3249 + +Cry_38_Ch6: ; f3249 +Cry_43_Ch6: ; f3249 + unknownmusic0xde $7 + sound $2, $b9, $0738 + sound $4, $cb, $0742 + sound $8, $cb, $0754 + sound $4, $f6, $0736 + sound $8, $f1, $0732 + sound $8, $0, $0000 + endchannel +; f3264 + +Cry_38_Ch8: ; f3264 + noise $2, $5b, $4 + noise $4, $68, $13 + noise $8, $68, $20 + noise $4, $68, $13 + noise $10, $51, $4 + endchannel +; f3274 + +Cry_43_Ch8: ; f3274 + noise $2, $8b, $59 + noise $4, $a8, $6a + noise $8, $a8, $70 + noise $4, $a8, $69 + noise $10, $92, $6c + endchannel +; f3284 + +Cry_3A_Ch5: ; f3284 +Cry_3C_Ch5: ; f3284 + unknownmusic0xde $12 +Cry_3A_branch_f3286: ; f3286 +Cry_3C_branch_f3286: ; f3286 + sound $3, $c1, $0791 + loopchannel 3, Cry_3A_branch_f3286 +Cry_3A_branch_f328e: ; f328e +Cry_3C_branch_f328e: ; f328e + sound $3, $d1, $04b1 + loopchannel 6, Cry_3A_branch_f328e +Cry_3A_branch_f3296: ; f3296 +Cry_3C_branch_f3296: ; f3296 + sound $1, $d1, $0491 + sound $1, $b1, $0451 + loopchannel 6, Cry_3A_branch_f3296 +Cry_3A_branch_f32a2: ; f32a2 +Cry_3C_branch_f32a2: ; f32a2 + sound $1, $a3, $0471 + sound $1, $81, $0441 + loopchannel 6, Cry_3A_branch_f32a2 +Cry_3A_branch_f32ae: ; f32ae +Cry_3C_branch_f32ae: ; f32ae + sound $1, $41, $0421 + sound $1, $21, $0401 + loopchannel 4, Cry_3A_branch_f32ae + endchannel +; f32bb + +Cry_3A_Ch6: ; f32bb +Cry_3C_Ch6: ; f32bb + unknownmusic0xde $78 + sound $8, $99, $0740 + sound $8, $79, $0746 + sound $10, $f6, $078d + sound $8, $f8, $0791 + sound $8, $f8, $078d + sound $8, $f8, $0787 + sound $18, $e2, $0783 + endchannel +; f32da + +Cry_3A_Ch8: ; f32da + noise $10, $a6, $16 + noise $18, $98, $3d + noise $20, $98, $5c + noise $20, $75, $5f + endchannel +; f32e7 + +Cry_3B_Ch5: ; f32e7 + unknownmusic0xde $de +Cry_39_branch_f32e9: ; f32e9 +Cry_3D_branch_f32e9: ; f32e9 + sound $4, $f8, $07b1 + sound $4, $f8, $07b0 + sound $4, $48, $07af +Cry_39_branch_f32f5: ; f32f5 + sound $4, $f8, $07b2 + sound $4, $f8, $07b3 + sound $4, $48, $07b4 + endchannel +; f3302 + +Cry_39_branch_f3302: ; f3302 +Cry_3B_Ch6: ; f3302 +Cry_3D_Ch6: ; f3302 + unknownmusic0xde $f2 + sound $4, $f8, $07b2 + sound $4, $f8, $07b1 + sound $4, $28, $07b0 +Cry_39_branch_f3310: ; f3310 + sound $4, $f8, $07b4 + sound $4, $f8, $07b6 + sound $4, $48, $07b8 + endchannel +; f331d + +Cry_39_branch_f331d: ; f331d +Cry_3B_Ch8: ; f331d +Cry_3D_Ch8: ; f331d + noise $4, $88, $5 + noise $4, $88, $4 + noise $4, $38, $3 +Cry_39_branch_f3326: ; f3326 + noise $4, $88, $5 + noise $4, $88, $4 + noise $4, $87, $4 + endchannel +; f3330 + +Cry_3C_Ch8: ; f3330 + noise $8, $a6, $3a + noise $8, $a1, $5a + endchannel +; f3337 + +Cry_3D_Ch5: ; f3337 + dutycycle $0 + jumpchannel Cry_3D_branch_f32e9 +; f333c + +Cry_39_Ch5: ; f333c + dutycycle $0 + callchannel Cry_39_branch_f32e9 + callchannel Cry_39_branch_f32f5 + endchannel +; f3345 + +Cry_39_Ch6: ; f3345 + callchannel Cry_39_branch_f3302 + callchannel Cry_39_branch_f3310 + endchannel +; f334c + +Cry_39_Ch8: ; f334c + callchannel Cry_39_branch_f331d + callchannel Cry_39_branch_f3326 + endchannel +; f3353 + +Cry_3E_Ch5: ; f3353 + unknownmusic0xde $de +Cry_3E_branch_f3355: ; f3355 + sound $1, $c1, $0520 + sound $1, $a1, $0420 + loopchannel 4, Cry_3E_branch_f3355 + dutycycle $0 + sound $4, $78, $0760 + sound $4, $78, $0730 + sound $18, $c2, $0420 + endchannel +; f3370 + +Cry_3E_Ch6: ; f3370 + unknownmusic0xde $32 + sound $8, $f8, $0700 + sound $7, $f8, $0720 + sound $4, $f8, $0790 + sound $4, $f8, $0760 + sound $18, $f2, $0730 + endchannel +; f3387 + +Cry_3E_Ch8: ; f3387 + noise $4, $88, $6d + noise $4, $d8, $68 + noise $7, $c8, $69 + noise $4, $98, $3a + noise $4, $98, $3c + noise $18, $d2, $5b + endchannel +; f339a + +Cry_32_Ch5: ; f339a + unknownmusic0xde $32 + sound $8, $f8, $0330 + sound $8, $f8, $0340 + sound $8, $c8, $07b2 + sound $8, $b8, $07b3 + sound $20, $b2, $07b4 + endchannel +; f33b1 + +Cry_32_Ch6: ; f33b1 + unknownmusic0xde $12 + sound $8, $e8, $0320 + sound $8, $e8, $0328 + sound $8, $98, $0780 + sound $8, $88, $0782 + sound $20, $72, $0784 + endchannel +; f33c8 + +Cry_32_Ch8: ; f33c8 + noise $2, $be, $49 + noise $5, $be, $3a + noise $2, $be, $29 + noise $28, $d3, $6e + endchannel +; f33d5 + +Cry_34_Ch5: ; f33d5 + unknownmusic0xde $39 + soundinput $ff + sound $2, $f8, $0720 + sound $2, $f8, $0727 + sound $2, $f8, $0780 + soundinput $88 + sound $2, $f8, $0779 + sound $4, $f8, $0740 + sound $4, $f8, $073c + soundinput $ff + sound $8, $f1, $0737 + soundinput $88 + endchannel +; f33fc + +Cry_34_Ch6: ; f33fc + unknownmusic0xde $22 + sound $6, $b2, $071e + sound $5, $92, $0779 + sound $4, $82, $073e + sound $8, $a1, $0735 + endchannel +; f340f + +Cry_34_Ch8: ; f340f + noise $2, $64, $7f + noise $2, $84, $7d + noise $2, $a4, $6f + noise $2, $64, $6c + noise $2, $94, $6f + noise $2, $61, $6b + endchannel +; f3422 + +Cry_41_Ch5: ; f3422 + unknownmusic0xde $d2 + sound $3, $f8, $06b0 + sound $1, $f8, $06a5 + sound $1, $f8, $069d + sound $7, $f1, $068a + sound $3, $f8, $0736 + sound $3, $f8, $0720 + sound $14, $f2, $070e + endchannel +; f3441 + +Cry_41_Ch6: ; f3441 + unknownmusic0xde $27 +Cry_41_branch_f3443: ; f3443 + sound $1, $f1, $07b4 + loopchannel 8, Cry_41_branch_f3443 +Cry_41_branch_f344b: ; f344b + sound $1, $c1, $0790 + loopchannel 3, Cry_41_branch_f344b +Cry_41_branch_f3453: ; f3453 + sound $1, $b1, $078d + loopchannel 2, Cry_41_branch_f3453 + sound $10, $92, $0795 + endchannel +; f3460 + +Cry_41_Ch8: ; f3460 +Cry_41_branch_f3460: ; f3460 + noise $0, $f1, $28 + loopchannel 4, Cry_41_branch_f3460 + noise $0, $91, $49 + noise $1, $a8, $4a + noise $0, $e1, $4b + noise $5, $d2, $4f + noise $3, $c2, $4e + noise $3, $b2, $4d + noise $14, $a3, $4c + endchannel +; f347d + +Cry_00: ; f347d + dbw $84, Cry_00_Ch5 + dbw $05, Cry_00_Ch6 + dbw $07, Cry_00_Ch8 +; f3486 + +Cry_01: ; f3486 + dbw $84, Cry_01_Ch5 + dbw $05, Cry_01_Ch6 + dbw $07, Cry_01_Ch8 +; f348f + +Cry_02: ; f348f + dbw $84, Cry_02_Ch5 + dbw $05, Cry_02_Ch6 + dbw $07, Cry_02_Ch8 +; f3498 + +Cry_03: ; f3498 + dbw $84, Cry_03_Ch5 + dbw $05, Cry_03_Ch6 + dbw $07, Cry_03_Ch8 +; f34a1 + +Cry_04: ; f34a1 + dbw $84, Cry_04_Ch5 + dbw $05, Cry_04_Ch6 + dbw $07, Cry_04_Ch8 +; f34aa + +Cry_05: ; f34aa + dbw $84, Cry_05_Ch5 + dbw $05, Cry_05_Ch6 + dbw $07, Cry_05_Ch8 +; f34b3 + +Cry_06: ; f34b3 + dbw $84, Cry_06_Ch5 + dbw $05, Cry_06_Ch6 + dbw $07, Cry_06_Ch8 +; f34bc + +Cry_07: ; f34bc + dbw $84, Cry_07_Ch5 + dbw $05, Cry_07_Ch6 + dbw $07, Cry_07_Ch8 +; f34c5 + +Cry_08: ; f34c5 + dbw $84, Cry_08_Ch5 + dbw $05, Cry_08_Ch6 + dbw $07, Cry_08_Ch8 +; f34ce + +Cry_09: ; f34ce + dbw $84, Cry_09_Ch5 + dbw $05, Cry_09_Ch6 + dbw $07, Cry_09_Ch8 +; f34d7 + +Cry_0A: ; f34d7 + dbw $84, Cry_0A_Ch5 + dbw $05, Cry_0A_Ch6 + dbw $07, Cry_0A_Ch8 +; f34e0 + +Cry_0B: ; f34e0 + dbw $84, Cry_0B_Ch5 + dbw $05, Cry_0B_Ch6 + dbw $07, Cry_0B_Ch8 +; f34e9 + +Cry_0C: ; f34e9 + dbw $84, Cry_0C_Ch5 + dbw $05, Cry_0C_Ch6 + dbw $07, Cry_0C_Ch8 +; f34f2 + +Cry_0D: ; f34f2 + dbw $84, Cry_0D_Ch5 + dbw $05, Cry_0D_Ch6 + dbw $07, Cry_0D_Ch8 +; f34fb + +Cry_0E: ; f34fb + dbw $84, Cry_0E_Ch5 + dbw $05, Cry_0E_Ch6 + dbw $07, Cry_0E_Ch8 +; f3504 + +Cry_0F: ; f3504 + dbw $84, Cry_0F_Ch5 + dbw $05, Cry_0F_Ch6 + dbw $07, Cry_0F_Ch8 +; f350d + +Cry_10: ; f350d + dbw $84, Cry_10_Ch5 + dbw $05, Cry_10_Ch6 + dbw $07, Cry_10_Ch8 +; f3516 + +Cry_11: ; f3516 + dbw $84, Cry_11_Ch5 + dbw $05, Cry_11_Ch6 + dbw $07, Cry_11_Ch8 +; f351f + +Cry_12: ; f351f + dbw $84, Cry_12_Ch5 + dbw $05, Cry_12_Ch6 + dbw $07, Cry_12_Ch8 +; f3528 + +Cry_13: ; f3528 + dbw $84, Cry_13_Ch5 + dbw $05, Cry_13_Ch6 + dbw $07, Cry_13_Ch8 +; f3531 + +Cry_14: ; f3531 + dbw $84, Cry_14_Ch5 + dbw $05, Cry_14_Ch6 + dbw $07, Cry_14_Ch8 +; f353a + +Cry_15: ; f353a + dbw $84, Cry_15_Ch5 + dbw $05, Cry_15_Ch6 + dbw $07, Cry_15_Ch8 +; f3543 + +Cry_16: ; f3543 + dbw $84, Cry_16_Ch5 + dbw $05, Cry_16_Ch6 + dbw $07, Cry_16_Ch8 +; f354c + +Cry_17: ; f354c + dbw $84, Cry_17_Ch5 + dbw $05, Cry_17_Ch6 + dbw $07, Cry_17_Ch8 +; f3555 + +Cry_18: ; f3555 + dbw $84, Cry_18_Ch5 + dbw $05, Cry_18_Ch6 + dbw $07, Cry_18_Ch8 +; f355e + +Cry_19: ; f355e + dbw $84, Cry_19_Ch5 + dbw $05, Cry_19_Ch6 + dbw $07, Cry_19_Ch8 +; f3567 + +Cry_1A: ; f3567 + dbw $84, Cry_1A_Ch5 + dbw $05, Cry_1A_Ch6 + dbw $07, Cry_1A_Ch8 +; f3570 + +Cry_1B: ; f3570 + dbw $84, Cry_1B_Ch5 + dbw $05, Cry_1B_Ch6 + dbw $07, Cry_1B_Ch8 +; f3579 + +Cry_1C: ; f3579 + dbw $84, Cry_1C_Ch5 + dbw $05, Cry_1C_Ch6 + dbw $07, Cry_1C_Ch8 +; f3582 + +Cry_1D: ; f3582 + dbw $84, Cry_1D_Ch5 + dbw $05, Cry_1D_Ch6 + dbw $07, Cry_1D_Ch8 +; f358b + +Cry_1E: ; f358b + dbw $84, Cry_1E_Ch5 + dbw $05, Cry_1E_Ch6 + dbw $07, Cry_1E_Ch8 +; f3594 + +Cry_1F: ; f3594 + dbw $84, Cry_1F_Ch5 + dbw $05, Cry_1F_Ch6 + dbw $07, Cry_1F_Ch8 +; f359d + +Cry_20: ; f359d + dbw $84, Cry_20_Ch5 + dbw $05, Cry_20_Ch6 + dbw $07, Cry_20_Ch8 +; f35a6 + +Cry_21: ; f35a6 + dbw $84, Cry_21_Ch5 + dbw $05, Cry_21_Ch6 + dbw $07, Cry_21_Ch8 +; f35af + +Cry_22: ; f35af + dbw $84, Cry_22_Ch5 + dbw $05, Cry_22_Ch6 + dbw $07, Cry_22_Ch8 +; f35b8 + +Cry_23: ; f35b8 + dbw $84, Cry_23_Ch5 + dbw $05, Cry_23_Ch6 + dbw $07, Cry_23_Ch8 +; f35c1 + +Cry_24: ; f35c1 + dbw $84, Cry_24_Ch5 + dbw $05, Cry_24_Ch6 + dbw $07, Cry_24_Ch8 +; f35ca + +Cry_25: ; f35ca + dbw $84, Cry_25_Ch5 + dbw $05, Cry_25_Ch6 + dbw $07, Cry_25_Ch8 +; f35d3 + +Unknown_Cry_Ch5: ; f35d3 + unknownmusic0xde $f0 + sound $f, $e0, $0780 + sound $f, $f0, $0784 + sound $f, $c3, $05e0 + sound $f, $c4, $0600 + sound $a, $6c, $0780 + sound $8, $71, $0784 + endchannel +; f35ee + +Unknown_Cry_Ch6: ; f35ee + unknownmusic0xde $5 + sound $f, $a0, $0741 + sound $f, $b0, $0743 + sound $f, $93, $05b1 + sound $f, $94, $05c1 + sound $a, $4c, $0741 + sound $8, $31, $0746 + endchannel +; f3609 + +Unknown_Cry_Ch8: ; f3609 + noise $2, $f2, $4c + noise $6, $e0, $3a + noise $f, $d0, $3a + noise $8, $d0, $2c + noise $6, $e6, $4c + noise $c, $7d, $4c + noise $f, $d3, $4c + endchannel +; f361f + +Cry_09_Ch5: ; f361f + unknownmusic0xde $f0 + sound $f, $f7, $07a0 + sound $6, $e6, $07a3 + sound $a, $f4, $07a0 + unknownmusic0xde $a5 + sound $a, $f6, $07d8 + sound $4, $e3, $07d7 + sound $f, $f2, $07d8 + endchannel +; f363c + +Cry_09_Ch6: ; f363c + unknownmusic0xde $5 + sound $2, $8, $0000 + sound $f, $a7, $06a1 + sound $6, $86, $06a2 + sound $a, $74, $06a1 + unknownmusic0xde $5f + sound $a, $76, $06d6 + sound $4, $83, $06d9 + sound $f, $a2, $06d7 + endchannel +; f365d + +Cry_09_Ch8: ; f365d + noise $2, $f2, $3c + noise $8, $e4, $3e + noise $f, $d7, $3c + noise $6, $c5, $3b + noise $6, $e4, $3d + noise $8, $b6, $3c + noise $6, $d4, $3d + noise $8, $c1, $3b + endchannel +; f3676 + +Cry_23_Ch5: ; f3676 + unknownmusic0xde $f0 + sound $f, $f7, $07c0 + sound $6, $e4, $07c1 + sound $a, $f6, $07c0 + sound $4, $d3, $07c2 + sound $8, $c1, $07c0 + endchannel +; f368d + +Cry_23_Ch6: ; f368d + unknownmusic0xde $5f + sound $f, $97, $0781 + sound $6, $84, $0780 + sound $a, $96, $0781 + sound $f, $83, $0781 + endchannel +; f36a0 + +Cry_23_Ch8: ; f36a0 + noise $3, $f2, $3c + noise $d, $e6, $2c + noise $f, $d7, $3c + noise $8, $c1, $2c + endchannel +; f36ad + +Cry_24_Ch5: ; f36ad + unknownmusic0xde $f0 + sound $f, $f7, $0680 + sound $a, $e6, $0684 + sound $f, $d7, $0690 + sound $8, $d5, $0690 + sound $6, $c4, $0688 + sound $5, $d3, $0670 + sound $4, $d3, $0660 + sound $8, $c1, $0640 + endchannel +; f36d0 + +Cry_24_Ch6: ; f36d0 + unknownmusic0xde $5 + sound $f, $b7, $0641 + sound $a, $96, $0642 + sound $f, $a7, $0651 + sound $8, $a5, $0651 + sound $6, $94, $0647 + sound $5, $a3, $0631 + sound $4, $93, $0622 + sound $8, $71, $0601 + endchannel +; f36f3 + +Cry_24_Ch8: ; f36f3 + noise $f, $e4, $3c + noise $a, $c7, $4c + noise $a, $c7, $3c + noise $c, $b7, $4c + noise $f, $a2, $5c + endchannel +; f3703 + +Cry_11_Ch5: ; f3703 + unknownmusic0xde $f0 + sound $6, $f7, $07a0 + sound $8, $e6, $07a4 + sound $4, $d6, $07a0 + sound $f, $d3, $0720 + sound $8, $c3, $0723 + sound $2, $c2, $0728 + sound $8, $b1, $0730 + endchannel +; f3722 + +Cry_11_Ch6: ; f3722 + unknownmusic0xde $a + sound $4, $8, $0000 + sound $6, $a7, $0741 + sound $8, $86, $0743 + sound $4, $76, $0741 + sound $d, $83, $06c2 + sound $7, $73, $06c1 + sound $3, $82, $06cc + sound $8, $71, $06d8 + endchannel +; f3745 + +Cry_11_Ch8: ; f3745 + noise $2, $f2, $4c + noise $6, $e6, $3a + noise $4, $d7, $3a + noise $6, $d6, $2c + noise $8, $e5, $3c + noise $c, $d2, $3d + noise $8, $d1, $2c + endchannel +; f375b + +Cry_25_Ch5: ; f375b + unknownmusic0xde $a5 + sound $6, $f4, $0740 + sound $f, $e3, $0730 + sound $4, $f4, $0740 + sound $5, $b3, $0748 + sound $8, $d1, $0750 + endchannel +; f3772 + +Cry_25_Ch6: ; f3772 + unknownmusic0xde $77 + sound $6, $c3, $0712 + sound $f, $b3, $0704 + sound $3, $c3, $0712 + sound $4, $c3, $0721 + sound $8, $b1, $0732 + endchannel +; f3789 + +Cry_25_Ch8: ; f3789 + noise $8, $d6, $2c + noise $c, $c6, $3c + noise $a, $b6, $2c + noise $8, $91, $1c + endchannel +; f3796 + +Cry_03_Ch5: ; f3796 + unknownmusic0xde $f0 + sound $4, $f7, $0608 + sound $6, $e6, $0600 + sound $6, $d7, $05f0 + sound $6, $c4, $05e0 + sound $5, $d3, $05c0 + sound $4, $d3, $05a0 + sound $8, $e1, $0580 + endchannel +; f37b5 + +Cry_03_Ch6: ; f37b5 + unknownmusic0xde $a + sound $4, $c7, $0504 + sound $6, $a6, $0502 + sound $6, $97, $04f1 + sound $4, $b4, $04e1 + sound $5, $a3, $04c2 + sound $4, $b3, $04a3 + sound $8, $c1, $0482 + endchannel +; f37d4 + +Cry_03_Ch8: ; f37d4 + noise $c, $e4, $4c + noise $a, $c7, $5c + noise $c, $b6, $4c + noise $f, $a2, $5c + endchannel +; f37e1 + +Cry_0F_Ch5: ; f37e1 + unknownmusic0xde $f1 + sound $4, $f7, $07c0 + sound $c, $e6, $07c2 + sound $6, $b5, $0680 + sound $4, $c4, $0670 + sound $4, $b5, $0660 + sound $8, $c1, $0640 + endchannel +; f37fc + +Cry_0F_Ch6: ; f37fc + unknownmusic0xde $cc + sound $3, $c7, $0781 + sound $c, $b6, $0780 + sound $6, $a5, $0641 + sound $4, $c4, $0632 + sound $6, $b5, $0621 + sound $8, $a1, $0602 + endchannel +; f3817 + +Cry_0F_Ch8: ; f3817 + noise $3, $e4, $3c + noise $c, $d6, $2c + noise $4, $e4, $3c + noise $8, $b7, $5c + noise $f, $c2, $5d + endchannel +; f3827 + +Cry_10_Ch5: ; f3827 + unknownmusic0xde $c9 + sound $8, $f7, $0680 + sound $2, $f7, $0660 + sound $1, $e7, $0640 + sound $1, $e7, $0620 + sound $f, $d1, $0600 + sound $4, $c7, $0740 + sound $4, $a7, $0730 + sound $f, $91, $0720 + endchannel +; f384a + +Cry_10_Ch6: ; f384a + unknownmusic0xde $79 + sound $a, $e7, $0682 + sound $2, $e7, $0662 + sound $1, $d7, $0642 + sound $1, $d7, $0622 + sound $f, $c1, $0602 + sound $4, $b7, $0742 + sound $2, $97, $0732 + sound $f, $81, $0722 + endchannel +; f386d + +Cry_10_Ch8: ; f386d + noise $4, $74, $21 + noise $4, $74, $10 + noise $4, $71, $20 + endchannel +; f3877 + +Cry_00_Ch5: ; f3877 + unknownmusic0xde $f5 + sound $4, $f3, $0718 + sound $f, $e5, $0798 + sound $8, $91, $0758 + endchannel +; f3886 + +Cry_00_Ch6: ; f3886 + unknownmusic0xde $a0 + sound $5, $b3, $0708 + sound $f, $c5, $0788 + sound $8, $71, $0748 + endchannel +; f3895 + +Cry_00_Ch8: ; f3895 + noise $3, $a1, $1c + noise $e, $94, $2c + noise $8, $81, $1c + endchannel +; f389f + +Cry_0E_Ch5: ; f389f + unknownmusic0xde $a5 + sound $4, $e1, $0700 + sound $4, $f2, $0780 + sound $2, $92, $0740 + sound $8, $e1, $0600 + endchannel +; f38b2 + +Cry_0E_Ch6: ; f38b2 + unknownmusic0xde $a + sound $4, $b1, $06e1 + sound $3, $c2, $06e1 + sound $3, $62, $0681 + sound $8, $b1, $05e1 + endchannel +; f38c5 + +Cry_0E_Ch8: ; f38c5 + noise $2, $61, $32 + noise $2, $61, $21 + noise $8, $61, $11 + endchannel +; f38cf + +Cry_06_Ch5: ; f38cf + unknownmusic0xde $fa + sound $6, $83, $0247 + sound $f, $62, $0226 + sound $4, $52, $0245 + sound $9, $63, $0206 + sound $f, $82, $0225 + sound $f, $42, $0207 +Cry_06_Ch6: ; f38e9 + endchannel +; f38ea + +Cry_06_Ch8: ; f38ea + noise $8, $d4, $8c + noise $4, $e2, $9c + noise $f, $c6, $8c + noise $8, $e4, $ac + noise $f, $d7, $9c + noise $f, $f2, $ac + endchannel +; f38fd + +Cry_07_Ch5: ; f38fd + unknownmusic0xde $f0 + sound $4, $f3, $06e0 + sound $f, $e4, $0640 + sound $8, $c1, $0620 + endchannel +; f390c + +Cry_07_Ch6: ; f390c + unknownmusic0xde $a + sound $3, $c3, $0683 + sound $e, $b4, $0602 + sound $8, $a1, $0601 + endchannel +; f391b + +Cry_07_Ch8: ; f391b + noise $4, $d3, $5c + noise $f, $e6, $4c + noise $8, $b1, $5c + endchannel +; f3925 + +Cry_05_Ch5: ; f3925 + unknownmusic0xde $a + sound $6, $e2, $0500 + sound $6, $e3, $0580 + sound $6, $d3, $0570 + sound $8, $a1, $0560 + endchannel +; f3938 + +Cry_05_Ch6: ; f3938 + unknownmusic0xde $f5 + sound $6, $e2, $0482 + sound $6, $d3, $0501 + sound $6, $b2, $04e2 + sound $8, $81, $04c1 +Cry_05_Ch8: ; f394a + endchannel +; f394b + +Cry_0B_Ch5: ; f394b + unknownmusic0xde $cc + sound $4, $f1, $0700 + sound $4, $e1, $0780 + sound $4, $d1, $0740 + sound $4, $e1, $0740 + sound $4, $f1, $0780 + sound $4, $d1, $0700 + sound $4, $f1, $0701 + sound $4, $d1, $0782 + sound $4, $c1, $0742 + sound $8, $b1, $0741 + endchannel +; f3976 + +Cry_0B_Ch6: ; f3976 + unknownmusic0xde $44 + sound $c, $8, $0000 + sound $4, $f1, $0701 + sound $4, $e1, $0782 + sound $4, $d1, $0741 + sound $4, $e1, $0741 + sound $4, $f1, $0782 + sound $8, $d1, $0701 + endchannel +; f3995 + +Cry_0B_Ch8: ; f3995 + noise $f, $8, $0 + noise $4, $8, $0 + noise $4, $d1, $4c + noise $4, $b1, $2c + noise $4, $d1, $3c + noise $4, $b1, $3c + noise $4, $c1, $2c + noise $8, $a1, $4c + endchannel +; f39ae + +Cry_0C_Ch5: ; f39ae + unknownmusic0xde $cc + sound $8, $f5, $0600 + sound $2, $d2, $0638 + sound $2, $c2, $0630 + sound $2, $c2, $0628 + sound $2, $b2, $0620 + sound $2, $b2, $0610 + sound $2, $a2, $0618 + sound $2, $b2, $0610 + sound $8, $c1, $0620 + endchannel +; f39d5 + +Cry_0C_Ch6: ; f39d5 + unknownmusic0xde $44 + sound $c, $c3, $05c0 + sound $3, $b1, $05f9 + sound $2, $a1, $05f1 + sound $2, $a1, $05e9 + sound $2, $91, $05e1 + sound $2, $91, $05d9 + sound $2, $81, $05d1 + sound $2, $91, $05d9 + sound $8, $91, $05e1 +Cry_0C_Ch8: ; f39fb + endchannel +; f39fc + +Cry_02_Ch5: ; f39fc + unknownmusic0xde $0 + sound $8, $f5, $0480 + sound $2, $e1, $05e0 + sound $8, $d1, $05dc + endchannel +; f3a0b + +Cry_02_Ch6: ; f3a0b + unknownmusic0xde $a5 + sound $7, $95, $0441 + sound $2, $81, $0521 + sound $8, $61, $051a +Cry_02_Ch8: ; f3a19 + endchannel +; f3a1a + +Cry_0D_Ch5: ; f3a1a +Cry_0D_branch_f3a1a: ; f3a1a + unknownmusic0xde $88 + sound $5, $f2, $0650 + sound $9, $d1, $0660 + sound $5, $e2, $0612 + sound $9, $c1, $0622 + sound $5, $f2, $0610 + sound $6, $d1, $0620 + loopchannel 2, Cry_0D_branch_f3a1a + endchannel +; f3a39 + +Cry_0D_Ch6: ; f3a39 + unknownmusic0xde $40 + sound $4, $8, $0000 + sound $5, $f2, $0651 + sound $9, $d1, $0661 + sound $5, $e2, $0614 + sound $8, $c1, $0624 + sound $5, $f2, $0611 + sound $c, $d1, $0621 + sound $5, $e2, $0614 + sound $8, $c1, $0624 + sound $5, $f2, $0611 + sound $4, $d1, $0621 + endchannel +; f3a68 + +Cry_0D_Ch8: ; f3a68 + noise $6, $d2, $1c + noise $9, $b1, $2c + noise $8, $c2, $2c + noise $9, $b1, $3c + noise $6, $c2, $2c + noise $9, $a2, $3c + noise $7, $c2, $2c + noise $5, $a1, $3c + noise $9, $c2, $2c + noise $4, $a1, $3c + endchannel +; f3a87 + +Cry_01_Ch5: ; f3a87 + unknownmusic0xde $a0 + sound $4, $f3, $0600 + sound $8, $d5, $0760 + sound $3, $e2, $0720 + sound $8, $d1, $0710 + endchannel +; f3a9a + +Cry_01_Ch6: ; f3a9a + unknownmusic0xde $5a + sound $5, $b3, $06f1 + sound $7, $c5, $0752 + sound $3, $a2, $0711 + sound $8, $b1, $0601 + endchannel +; f3aad + +Cry_01_Ch8: ; f3aad + noise $3, $a2, $3c + noise $c, $94, $2c + noise $3, $82, $1c + noise $8, $71, $2c + endchannel +; f3aba + +Cry_0A_Ch5: ; f3aba + unknownmusic0xde $f0 + sound $8, $f7, $06e0 + sound $6, $e6, $06e5 + sound $3, $f4, $06e0 + sound $3, $f6, $06d0 + sound $3, $e3, $06c0 + sound $4, $f2, $06b0 + sound $f, $a2, $06c8 + endchannel +; f3ad9 + +Cry_0A_Ch6: ; f3ad9 + unknownmusic0xde $5 + sound $3, $8, $0000 + sound $8, $a7, $06a1 + sound $6, $86, $06a3 + sound $3, $74, $06a1 + sound $3, $76, $0691 + sound $3, $83, $0682 + sound $4, $a2, $0671 + sound $f, $72, $0689 + endchannel +; f3afc + +Cry_0A_Ch8: ; f3afc + noise $2, $f2, $3c + noise $8, $e4, $3e + noise $8, $d7, $3c + noise $5, $c5, $3b + noise $3, $d4, $2c + noise $2, $b6, $3c + noise $3, $a4, $2c + noise $8, $91, $3c + endchannel +; f3b15 + +Cry_08_Ch5: ; f3b15 + unknownmusic0xde $f0 + sound $f, $f6, $0565 + sound $a, $e4, $057c + sound $3, $c2, $055c + sound $f, $b2, $053c + endchannel +; f3b28 + +Cry_08_Ch6: ; f3b28 + unknownmusic0xde $5a + sound $e, $d6, $0503 + sound $9, $b4, $051b + sound $4, $92, $04fa + sound $f, $a2, $04db + endchannel +; f3b3b + +Cry_08_Ch8: ; f3b3b + noise $c, $e6, $4c + noise $b, $d7, $5c + noise $f, $c2, $4c + endchannel +; f3b45 + +Cry_04_Ch5: ; f3b45 + unknownmusic0xde $f0 + sound $4, $f7, $06a0 + sound $8, $e6, $06a4 + sound $4, $d6, $06a0 + sound $c, $d3, $0620 + sound $8, $c3, $0624 + sound $4, $c2, $0620 + sound $8, $b1, $0610 + endchannel +; f3b64 + +Cry_04_Ch6: ; f3b64 + unknownmusic0xde $5a + sound $4, $e7, $0601 + sound $8, $d6, $0603 + sound $4, $c6, $0601 + sound $c, $c3, $0581 + sound $8, $b3, $0583 + sound $4, $b2, $0582 + sound $8, $a1, $0571 + endchannel +; f3b83 + +Cry_04_Ch8: ; f3b83 + noise $7, $d6, $5c + noise $8, $e6, $4c + noise $4, $d4, $5c + noise $4, $d4, $4c + noise $7, $c3, $4c + noise $8, $a1, $5c + endchannel +; f3b96 + +Cry_19_Ch5: ; f3b96 + unknownmusic0xde $1b + sound $7, $d2, $0740 + sound $f, $e5, $0760 + sound $18, $c1, $0730 + endchannel +; f3ba5 + +Cry_19_Ch6: ; f3ba5 + unknownmusic0xde $81 + sound $2, $c2, $0701 + sound $4, $c2, $0708 + sound $f, $d7, $0741 + sound $18, $a2, $0701 +Cry_19_Ch8: ; f3bb7 + endchannel +; f3bb8 + +Cry_16_Ch5: ; f3bb8 + unknownmusic0xde $f0 + sound $f, $d7, $0780 + sound $4, $e6, $07a0 + sound $f, $d2, $0740 + endchannel +; f3bc7 + +Cry_16_Ch6: ; f3bc7 + unknownmusic0xde $5a + sound $f, $c7, $0753 + sound $5, $b6, $0772 + sound $f, $c2, $0711 + endchannel +; f3bd6 + +Cry_16_Ch8: ; f3bd6 + noise $d, $f6, $4c + noise $4, $e6, $3c + noise $f, $f2, $4c + endchannel +; f3be0 + +Cry_1B_Ch5: ; f3be0 + unknownmusic0xde $f0 + sound $6, $f7, $06c0 + sound $f, $e7, $0700 + sound $4, $f4, $06f0 + sound $4, $e4, $06e0 + sound $8, $d1, $06d0 + endchannel +; f3bf7 + +Cry_1B_Ch6: ; f3bf7 + unknownmusic0xde $a + sound $7, $e6, $0681 + sound $e, $d5, $06c1 + sound $4, $c4, $06b1 + sound $4, $d4, $06a1 + sound $8, $c1, $0691 + endchannel +; f3c0e + +Cry_1B_Ch8: ; f3c0e + noise $a, $a6, $3c + noise $e, $94, $2c + noise $5, $a3, $3c + noise $8, $91, $2c + endchannel +; f3c1b + +Cry_12_Ch5: ; f3c1b + unknownmusic0xde $a5 + sound $c, $f2, $0440 + sound $f, $e3, $04a0 + sound $4, $d2, $0490 + sound $8, $d1, $0480 + endchannel +; f3c2e + +Cry_12_Ch6: ; f3c2e + unknownmusic0xde $ee + sound $b, $d2, $0438 + sound $e, $c6, $0498 + sound $3, $b2, $0488 + sound $8, $b1, $0478 + endchannel +; f3c41 + +Cry_12_Ch8: ; f3c41 + noise $a, $e6, $6c + noise $f, $d2, $5c + noise $3, $c2, $6c + noise $8, $d1, $5c + endchannel +; f3c4e + +Cry_13_Ch5: ; f3c4e + unknownmusic0xde $33 + sound $f, $f6, $05c0 + sound $8, $e3, $05bc + sound $6, $d2, $05d0 + sound $6, $b2, $05e0 + sound $6, $c2, $05f0 + sound $8, $b1, $0600 + endchannel +; f3c69 + +Cry_13_Ch6: ; f3c69 + unknownmusic0xde $99 + sound $e, $c6, $04b1 + sound $7, $c3, $04ad + sound $5, $b2, $04c1 + sound $8, $92, $04d1 + sound $6, $a2, $04e1 + sound $8, $91, $04f1 + endchannel +; f3c84 + +Cry_13_Ch8: ; f3c84 + noise $a, $e6, $5c + noise $a, $d6, $6c + noise $4, $c2, $4c + noise $6, $d3, $5c + noise $8, $b3, $4c + noise $8, $a1, $5c + endchannel +; f3c97 + +Cry_14_Ch5: ; f3c97 + unknownmusic0xde $f0 + sound $8, $e4, $0790 + sound $f, $f5, $07c0 + sound $8, $d1, $07d8 + endchannel +; f3ca6 + +Cry_14_Ch6: ; f3ca6 + unknownmusic0xde $a5 + sound $a, $c4, $0771 + sound $f, $b6, $07a2 + sound $8, $a1, $07b7 + endchannel +; f3cb5 + +Cry_14_Ch8: ; f3cb5 + noise $8, $e4, $4c + noise $e, $c4, $3c + noise $8, $d1, $2c + endchannel +; f3cbf + +Cry_1E_Ch5: ; f3cbf + unknownmusic0xde $f0 + sound $6, $f2, $0600 + sound $6, $e2, $0640 + sound $6, $d2, $0680 + sound $6, $e2, $06c0 + sound $6, $d2, $0700 + sound $6, $c2, $0740 + sound $6, $b2, $0780 + sound $8, $a1, $07c0 + endchannel +; f3ce2 + +Cry_1E_Ch6: ; f3ce2 + unknownmusic0xde $11 + sound $3, $8, $0001 + sound $6, $c2, $05c1 + sound $6, $b2, $0602 + sound $6, $a2, $0641 + sound $6, $b2, $0682 + sound $6, $a2, $06c2 + sound $6, $92, $0701 + sound $6, $a2, $0742 + sound $8, $81, $0781 + endchannel +; f3d09 + +Cry_1E_Ch8: ; f3d09 + noise $6, $8, $1 + noise $5, $e2, $5c + noise $5, $c2, $4c + noise $5, $d2, $3c + noise $5, $b2, $2c + noise $5, $c2, $1c + noise $5, $a2, $1b + noise $5, $92, $1a + noise $8, $81, $18 + endchannel +; f3d25 + +Cry_15_Ch5: ; f3d25 + unknownmusic0xde $f0 + sound $4, $f3, $0780 + sound $f, $e7, $0700 + sound $8, $d3, $0710 + sound $4, $c2, $0700 + sound $4, $d2, $06f0 + sound $8, $c1, $06e0 + endchannel +; f3d40 + +Cry_15_Ch6: ; f3d40 + unknownmusic0xde $5a + sound $6, $c3, $0701 + sound $e, $b7, $0681 + sound $7, $b3, $0692 + sound $3, $a2, $0681 + sound $4, $b2, $0672 + sound $8, $a1, $0661 + endchannel +; f3d5b + +Cry_15_Ch8: ; f3d5b + noise $6, $e3, $5c + noise $e, $d6, $4c + noise $6, $c6, $3c + noise $3, $b3, $4c + noise $3, $a2, $5c + noise $8, $b1, $6c + endchannel +; f3d6e + +Cry_17_Ch5: ; f3d6e + unknownmusic0xde $f + sound $f, $f7, $0500 + sound $f, $e7, $0508 + sound $8, $b4, $0480 + sound $f, $a2, $0460 + endchannel +; f3d81 + +Cry_17_Ch6: ; f3d81 + unknownmusic0xde $44 + sound $e, $d7, $0481 + sound $e, $c7, $0489 + sound $a, $b4, $0401 + sound $f, $c2, $03e1 + endchannel +; f3d94 + +Cry_17_Ch8: ; f3d94 + noise $e, $f7, $7c + noise $c, $f6, $6c + noise $9, $e4, $7c + noise $f, $e2, $6c + endchannel +; f3da1 + +Cry_1C_Ch5: ; f3da1 + unknownmusic0xde $f5 + sound $7, $d6, $07e1 + sound $6, $c6, $07e2 + sound $9, $d6, $07e1 + sound $7, $c6, $07e0 + sound $5, $b6, $07e2 + sound $7, $c6, $07e1 + sound $6, $b6, $07e0 + sound $8, $a1, $07df + endchannel +; f3dc4 + +Cry_1C_Ch6: ; f3dc4 + unknownmusic0xde $44 + sound $6, $c3, $07c9 + sound $6, $b3, $07c7 + sound $a, $c4, $07c3 + sound $8, $b4, $07c7 + sound $6, $c3, $07c9 + sound $f, $a2, $07c5 + endchannel +; f3ddf + +Cry_1C_Ch8: ; f3ddf + noise $d, $19, $7c + noise $d, $f7, $8c + noise $c, $d6, $7c + noise $8, $c4, $6c + noise $f, $b3, $5c + endchannel +; f3def + +Cry_1A_Ch5: ; f3def + unknownmusic0xde $f0 + sound $6, $f7, $0740 + sound $c, $e6, $0744 + sound $6, $d5, $0750 + sound $4, $c3, $0760 + sound $3, $c3, $0780 + sound $8, $d1, $07a0 + endchannel +; f3e0a + +Cry_1A_Ch6: ; f3e0a + unknownmusic0xde $a + sound $6, $c7, $0701 + sound $b, $b6, $0702 + sound $6, $a5, $0711 + sound $4, $93, $0721 + sound $3, $a3, $0741 + sound $8, $91, $0762 + endchannel +; f3e25 + +Cry_1A_Ch8: ; f3e25 + noise $3, $e2, $3c + noise $8, $d6, $4c + noise $5, $d4, $3c + noise $c, $c7, $4c + noise $2, $e2, $3c + noise $8, $d1, $2c + endchannel +; f3e38 + +Cry_1D_Ch5: ; f3e38 + unknownmusic0xde $f4 + sound $f, $f0, $0705 + sound $a, $e0, $0700 + sound $6, $b4, $0710 + sound $4, $d3, $0700 + sound $6, $b2, $0620 + sound $8, $a1, $0624 + endchannel +; f3e53 + +Cry_1D_Ch6: ; f3e53 + unknownmusic0xde $22 + sound $f, $b0, $06c3 + sound $a, $a0, $06c1 + sound $6, $84, $06d2 + sound $4, $93, $06c1 + sound $6, $82, $05e1 + sound $8, $61, $05e8 + endchannel +; f3e6e + +Cry_1D_Ch8: ; f3e6e + noise $6, $e6, $4c + noise $f, $d6, $3c + noise $a, $c5, $4a + noise $1, $b2, $5b + noise $f, $c2, $4c + endchannel +; f3e7e + +Cry_18_Ch5: ; f3e7e + unknownmusic0xde $50 + sound $a, $f5, $0680 + sound $3, $e2, $06a0 + sound $3, $f2, $06c0 + sound $3, $e2, $06e0 + sound $3, $d2, $0700 + sound $3, $c2, $06e0 + sound $3, $d2, $06c0 + sound $8, $c1, $06a0 + endchannel +; f3ea1 + +Cry_18_Ch6: ; f3ea1 + unknownmusic0xde $f + sound $9, $d5, $0631 + sound $3, $d2, $0652 + sound $3, $e2, $0671 + sound $3, $b2, $0691 + sound $3, $c2, $06b2 + sound $3, $b2, $0691 + sound $3, $c2, $0671 + sound $8, $b1, $0651 + endchannel +; f3ec4 + +Cry_18_Ch8: ; f3ec4 + noise $6, $e3, $4c + noise $4, $c3, $3c + noise $5, $d4, $3c + noise $4, $c4, $2c + noise $6, $b4, $3c + noise $8, $c1, $2c + endchannel +; f3ed7 + +Cry_1F_Ch5: ; f3ed7 + unknownmusic0xde $a5 + sound $3, $f4, $0641 + sound $d, $d6, $0721 + sound $8, $f4, $0719 + sound $8, $c1, $071a + endchannel +; f3eea + +Cry_1F_Ch6: ; f3eea + unknownmusic0xde $cc + sound $4, $f4, $0580 + sound $e, $e6, $06e0 + sound $8, $d5, $06d8 + sound $8, $d1, $06dc + endchannel +; f3efd + +Cry_1F_Ch8: ; f3efd + noise $5, $c4, $46 + noise $d, $a5, $44 + noise $8, $c4, $45 + noise $8, $b1, $44 + endchannel +; f3f0a + +Cry_20_Ch5: ; f3f0a + unknownmusic0xde $f0 + sound $d, $f1, $0511 + sound $d, $e1, $0515 + sound $d, $e1, $0511 + sound $8, $d1, $0511 + endchannel +; f3f1d + +Cry_20_Ch6: ; f3f1d + unknownmusic0xde $15 + sound $c, $e1, $050c + sound $c, $d1, $0510 + sound $e, $c1, $050c + sound $8, $c1, $050a + endchannel +; f3f30 + +Cry_20_Ch8: ; f3f30 + noise $e, $f2, $65 + noise $d, $e2, $55 + noise $e, $d2, $56 + noise $8, $d1, $66 + endchannel +; f3f3d + +Cry_21_Ch5: ; f3f3d + unknownmusic0xde $1b + sound $3, $f3, $0564 + sound $2, $e2, $0544 + sound $5, $d1, $0522 + sound $2, $b2, $0484 + sound $8, $d1, $04a2 + sound $3, $f3, $0524 + sound $4, $e4, $04e4 + sound $8, $d1, $0502 + endchannel +; f3f60 + +Cry_21_Ch6: ; f3f60 + unknownmusic0xde $cc + sound $3, $d3, $0560 + sound $2, $c2, $0540 + sound $5, $c1, $0520 + sound $2, $92, $0480 + sound $8, $c1, $04a0 + sound $3, $d3, $0520 + sound $3, $c4, $04e0 + sound $8, $c1, $0500 +Cry_21_Ch8: ; f3f82 + endchannel +; f3f83 + +Cry_22_Ch5: ; f3f83 + unknownmusic0xde $11 + sound $2, $3d, $0381 + sound $7, $f5, $0601 + sound $1, $c2, $0481 + sound $8, $91, $0381 + endchannel +; f3f96 + +Cry_22_Ch6: ; f3f96 + unknownmusic0xde $ee + sound $2, $3e, $05b0 + sound $7, $d5, $075d + sound $1, $b2, $06b0 + sound $8, $61, $05b0 + endchannel +; f3fa9 + +Cry_22_Ch8: ; f3fa9 + noise $2, $92, $49 + noise $7, $b5, $29 + noise $1, $a2, $39 + noise $8, $91, $49 + endchannel +; f3fb6 diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm new file mode 100644 index 00000000..1a80e143 --- /dev/null +++ b/crysaudio/cry_headers.asm @@ -0,0 +1,1530 @@ +BulbasaurCryHeader: ; 0xf2787 + dw $0f ; cry id + db $80 ; pitch + db $00 ; echo + dw $081 ; length + +IvysaurCryHeader: ; 0xf278d + dw $0f ; cry id + db $20 ; pitch + db $00 ; echo + dw $100 ; length + +VenusaurCryHeader: ; 0xf2793 + dw $0f ; cry id + db $00 ; pitch + db $00 ; echo + dw $140 ; length + +CharmanderCryHeader: ; 0xf2799 + dw $04 ; cry id + db $60 ; pitch + db $00 ; echo + dw $0c0 ; length + +CharmeleonCryHeader: ; 0xf279f + dw $04 ; cry id + db $20 ; pitch + db $00 ; echo + dw $0c0 ; length + +CharizardCryHeader: ; 0xf27a5 + dw $04 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +SquirtleCryHeader: ; 0xf27ab + dw $1d ; cry id + db $60 ; pitch + db $00 ; echo + dw $0c0 ; length + +WartortleCryHeader: ; 0xf27b1 + dw $1d ; cry id + db $20 ; pitch + db $00 ; echo + dw $0c0 ; length + +BlastoiseCryHeader: ; 0xf27b7 + dw $13 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +CaterpieCryHeader: ; 0xf27bd + dw $16 ; cry id + db $80 ; pitch + db $00 ; echo + dw $0a0 ; length + +MetapodCryHeader: ; 0xf27c3 + dw $1c ; cry id + db $cc ; pitch + db $00 ; echo + dw $081 ; length + +ButterfreeCryHeader: ; 0xf27c9 + dw $16 ; cry id + db $77 ; pitch + db $00 ; echo + dw $0c0 ; length + +WeedleCryHeader: ; 0xf27cf + dw $15 ; cry id + db $ee ; pitch + db $00 ; echo + dw $081 ; length + +KakunaCryHeader: ; 0xf27d5 + dw $13 ; cry id + db $ff ; pitch + db $00 ; echo + dw $081 ; length + +BeedrillCryHeader: ; 0xf27db + dw $13 ; cry id + db $60 ; pitch + db $00 ; echo + dw $100 ; length + +PidgeyCryHeader: ; 0xf27e1 + dw $0e ; cry id + db $df ; pitch + db $00 ; echo + dw $084 ; length + +PidgeottoCryHeader: ; 0xf27e7 + dw $14 ; cry id + db $28 ; pitch + db $00 ; echo + dw $140 ; length + +PidgeotCryHeader: ; 0xf27ed + dw $14 ; cry id + db $11 ; pitch + db $00 ; echo + dw $17f ; length + +RattataCryHeader: ; 0xf27f3 + dw $22 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +RaticateCryHeader: ; 0xf27f9 + dw $22 ; cry id + db $20 ; pitch + db $00 ; echo + dw $17f ; length + +SpearowCryHeader: ; 0xf27ff + dw $10 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +FearowCryHeader: ; 0xf2805 + dw $18 ; cry id + db $40 ; pitch + db $00 ; echo + dw $120 ; length + +EkansCryHeader: ; 0xf280b + dw $17 ; cry id + db $12 ; pitch + db $00 ; echo + dw $0c0 ; length + +ArbokCryHeader: ; 0xf2811 + dw $17 ; cry id + db $e0 ; pitch + db $00 ; echo + dw $090 ; length + +PikachuCryHeader: ; 0xf2817 + dw $0f ; cry id + db $ee ; pitch + db $00 ; echo + dw $081 ; length + +RaichuCryHeader: ; 0xf281d + dw $09 ; cry id + db $ee ; pitch + db $00 ; echo + dw $088 ; length + +SandshrewCryHeader: ; 0xf2823 + dw $00 ; cry id + db $20 ; pitch + db $00 ; echo + dw $0c0 ; length + +SandslashCryHeader: ; 0xf2829 + dw $00 ; cry id + db $ff ; pitch + db $00 ; echo + dw $17f ; length + +NidoranFCryHeader: ; 0xf282f + dw $01 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +NidorinaCryHeader: ; 0xf2835 + dw $01 ; cry id + db $2c ; pitch + db $00 ; echo + dw $160 ; length + +NidoqueenCryHeader: ; 0xf283b + dw $0a ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +NidoranMCryHeader: ; 0xf2841 + dw $00 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +NidorinoCryHeader: ; 0xf2847 + dw $00 ; cry id + db $2c ; pitch + db $00 ; echo + dw $140 ; length + +NidokingCryHeader: ; 0xf284d + dw $09 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +ClefairyCryHeader: ; 0xf2853 + dw $19 ; cry id + db $cc ; pitch + db $00 ; echo + dw $081 ; length + +ClefableCryHeader: ; 0xf2859 + dw $19 ; cry id + db $aa ; pitch + db $00 ; echo + dw $0a0 ; length + +VulpixCryHeader: ; 0xf285f + dw $24 ; cry id + db $4f ; pitch + db $00 ; echo + dw $090 ; length + +NinetalesCryHeader: ; 0xf2865 + dw $24 ; cry id + db $88 ; pitch + db $00 ; echo + dw $0e0 ; length + +JigglypuffCryHeader: ; 0xf286b + dw $0e ; cry id + db $ff ; pitch + db $00 ; echo + dw $0b5 ; length + +WigglytuffCryHeader: ; 0xf2871 + dw $0e ; cry id + db $68 ; pitch + db $00 ; echo + dw $0e0 ; length + +ZubatCryHeader: ; 0xf2877 + dw $1d ; cry id + db $e0 ; pitch + db $00 ; echo + dw $100 ; length + +GolbatCryHeader: ; 0xf287d + dw $1d ; cry id + db $fa ; pitch + db $00 ; echo + dw $100 ; length + +OddishCryHeader: ; 0xf2883 + dw $08 ; cry id + db $dd ; pitch + db $00 ; echo + dw $081 ; length + +GloomCryHeader: ; 0xf2889 + dw $08 ; cry id + db $aa ; pitch + db $00 ; echo + dw $0c0 ; length + +VileplumeCryHeader: ; 0xf288f + dw $23 ; cry id + db $22 ; pitch + db $00 ; echo + dw $17f ; length + +ParasCryHeader: ; 0xf2895 + dw $1e ; cry id + db $20 ; pitch + db $00 ; echo + dw $160 ; length + +ParasectCryHeader: ; 0xf289b + dw $1e ; cry id + db $42 ; pitch + db $00 ; echo + dw $17f ; length + +VenonatCryHeader: ; 0xf28a1 + dw $1a ; cry id + db $44 ; pitch + db $00 ; echo + dw $0c0 ; length + +VenomothCryHeader: ; 0xf28a7 + dw $1a ; cry id + db $29 ; pitch + db $00 ; echo + dw $100 ; length + +DiglettCryHeader: ; 0xf28ad + dw $0b ; cry id + db $aa ; pitch + db $00 ; echo + dw $081 ; length + +DugtrioCryHeader: ; 0xf28b3 + dw $0b ; cry id + db $2a ; pitch + db $00 ; echo + dw $090 ; length + +MeowthCryHeader: ; 0xf28b9 + dw $19 ; cry id + db $77 ; pitch + db $00 ; echo + dw $090 ; length + +PersianCryHeader: ; 0xf28bf + dw $19 ; cry id + db $99 ; pitch + db $00 ; echo + dw $17f ; length + +PsyduckCryHeader: ; 0xf28c5 + dw $21 ; cry id + db $20 ; pitch + db $00 ; echo + dw $0e0 ; length + +GolduckCryHeader: ; 0xf28cb + dw $21 ; cry id + db $ff ; pitch + db $00 ; echo + dw $0c0 ; length + +MankeyCryHeader: ; 0xf28d1 + dw $0a ; cry id + db $dd ; pitch + db $00 ; echo + dw $0e0 ; length + +PrimeapeCryHeader: ; 0xf28d7 + dw $0a ; cry id + db $af ; pitch + db $00 ; echo + dw $0c0 ; length + +GrowlitheCryHeader: ; 0xf28dd + dw $1f ; cry id + db $20 ; pitch + db $00 ; echo + dw $0c0 ; length + +ArcanineCryHeader: ; 0xf28e3 + dw $15 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +PoliwagCryHeader: ; 0xf28e9 + dw $0e ; cry id + db $ff ; pitch + db $00 ; echo + dw $17f ; length + +PoliwhirlCryHeader: ; 0xf28ef + dw $0e ; cry id + db $77 ; pitch + db $00 ; echo + dw $0e0 ; length + +PoliwrathCryHeader: ; 0xf28f5 + dw $0e ; cry id + db $00 ; pitch + db $00 ; echo + dw $17f ; length + +AbraCryHeader: ; 0xf28fb + dw $1c ; cry id + db $c0 ; pitch + db $00 ; echo + dw $081 ; length + +KadabraCryHeader: ; 0xf2901 + dw $1c ; cry id + db $a8 ; pitch + db $00 ; echo + dw $140 ; length + +AlakazamCryHeader: ; 0xf2907 + dw $1c ; cry id + db $98 ; pitch + db $00 ; echo + dw $17f ; length + +MachopCryHeader: ; 0xf290d + dw $1f ; cry id + db $ee ; pitch + db $00 ; echo + dw $081 ; length + +MachokeCryHeader: ; 0xf2913 + dw $1f ; cry id + db $48 ; pitch + db $00 ; echo + dw $0e0 ; length + +MachampCryHeader: ; 0xf2919 + dw $1f ; cry id + db $08 ; pitch + db $00 ; echo + dw $140 ; length + +BellsproutCryHeader: ; 0xf291f + dw $21 ; cry id + db $55 ; pitch + db $00 ; echo + dw $081 ; length + +WeepinbellCryHeader: ; 0xf2925 + dw $25 ; cry id + db $44 ; pitch + db $00 ; echo + dw $0a0 ; length + +VictreebelCryHeader: ; 0xf292b + dw $25 ; cry id + db $66 ; pitch + db $00 ; echo + dw $14c ; length + +TentacoolCryHeader: ; 0xf2931 + dw $1a ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +TentacruelCryHeader: ; 0xf2937 + dw $1a ; cry id + db $ee ; pitch + db $00 ; echo + dw $17f ; length + +GeodudeCryHeader: ; 0xf293d + dw $24 ; cry id + db $f0 ; pitch + db $00 ; echo + dw $090 ; length + +GravelerCryHeader: ; 0xf2943 + dw $24 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +GolemCryHeader: ; 0xf2949 + dw $12 ; cry id + db $e0 ; pitch + db $00 ; echo + dw $0c0 ; length + +PonytaCryHeader: ; 0xf294f + dw $25 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +RapidashCryHeader: ; 0xf2955 + dw $25 ; cry id + db $20 ; pitch + db $00 ; echo + dw $140 ; length + +SlowpokeCryHeader: ; 0xf295b + dw $02 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +SlowbroCryHeader: ; 0xf2961 + dw $1f ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +MagnemiteCryHeader: ; 0xf2967 + dw $1c ; cry id + db $80 ; pitch + db $00 ; echo + dw $0e0 ; length + +MagnetonCryHeader: ; 0xf296d + dw $1c ; cry id + db $20 ; pitch + db $00 ; echo + dw $140 ; length + +FarfetchDCryHeader: ; 0xf2973 + dw $10 ; cry id + db $dd ; pitch + db $00 ; echo + dw $081 ; length + +DoduoCryHeader: ; 0xf2979 + dw $0b ; cry id + db $bb ; pitch + db $00 ; echo + dw $081 ; length + +DodrioCryHeader: ; 0xf297f + dw $0b ; cry id + db $99 ; pitch + db $00 ; echo + dw $0a0 ; length + +SeelCryHeader: ; 0xf2985 + dw $0c ; cry id + db $88 ; pitch + db $00 ; echo + dw $140 ; length + +DewgongCryHeader: ; 0xf298b + dw $0c ; cry id + db $23 ; pitch + db $00 ; echo + dw $17f ; length + +GrimerCryHeader: ; 0xf2991 + dw $05 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +MukCryHeader: ; 0xf2997 + dw $07 ; cry id + db $ef ; pitch + db $00 ; echo + dw $17f ; length + +ShellderCryHeader: ; 0xf299d + dw $18 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +CloysterCryHeader: ; 0xf29a3 + dw $18 ; cry id + db $6f ; pitch + db $00 ; echo + dw $160 ; length + +GastlyCryHeader: ; 0xf29a9 + dw $1c ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +HaunterCryHeader: ; 0xf29af + dw $1c ; cry id + db $30 ; pitch + db $00 ; echo + dw $0c0 ; length + +GengarCryHeader: ; 0xf29b5 + dw $07 ; cry id + db $00 ; pitch + db $00 ; echo + dw $17f ; length + +OnixCryHeader: ; 0xf29bb + dw $17 ; cry id + db $ff ; pitch + db $00 ; echo + dw $140 ; length + +DrowzeeCryHeader: ; 0xf29c1 + dw $0d ; cry id + db $88 ; pitch + db $00 ; echo + dw $0a0 ; length + +HypnoCryHeader: ; 0xf29c7 + dw $0d ; cry id + db $ee ; pitch + db $00 ; echo + dw $0c0 ; length + +KrabbyCryHeader: ; 0xf29cd + dw $20 ; cry id + db $20 ; pitch + db $00 ; echo + dw $160 ; length + +KinglerCryHeader: ; 0xf29d3 + dw $20 ; cry id + db $ee ; pitch + db $00 ; echo + dw $160 ; length + +VoltorbCryHeader: ; 0xf29d9 + dw $06 ; cry id + db $ed ; pitch + db $00 ; echo + dw $100 ; length + +ElectrodeCryHeader: ; 0xf29df + dw $06 ; cry id + db $a8 ; pitch + db $00 ; echo + dw $110 ; length + +ExeggcuteCryHeader: ; 0xf29e5 + dw $0b ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +ExeggutorCryHeader: ; 0xf29eb + dw $0d ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +CuboneCryHeader: ; 0xf29f1 + dw $19 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +MarowakCryHeader: ; 0xf29f7 + dw $08 ; cry id + db $4f ; pitch + db $00 ; echo + dw $0e0 ; length + +HitmonleeCryHeader: ; 0xf29fd + dw $12 ; cry id + db $80 ; pitch + db $00 ; echo + dw $140 ; length + +HitmonchanCryHeader: ; 0xf2a03 + dw $0c ; cry id + db $ee ; pitch + db $00 ; echo + dw $140 ; length + +LickitungCryHeader: ; 0xf2a09 + dw $0c ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +KoffingCryHeader: ; 0xf2a0f + dw $12 ; cry id + db $e6 ; pitch + db $00 ; echo + dw $15d ; length + +WeezingCryHeader: ; 0xf2a15 + dw $12 ; cry id + db $ff ; pitch + db $00 ; echo + dw $17f ; length + +RhyhornCryHeader: ; 0xf2a1b + dw $04 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +RhydonCryHeader: ; 0xf2a21 + dw $11 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +ChanseyCryHeader: ; 0xf2a27 + dw $14 ; cry id + db $0a ; pitch + db $00 ; echo + dw $140 ; length + +TangelaCryHeader: ; 0xf2a2d + dw $12 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +KangaskhanCryHeader: ; 0xf2a33 + dw $03 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +HorseaCryHeader: ; 0xf2a39 + dw $19 ; cry id + db $99 ; pitch + db $00 ; echo + dw $090 ; length + +SeadraCryHeader: ; 0xf2a3f + dw $19 ; cry id + db $3c ; pitch + db $00 ; echo + dw $081 ; length + +GoldeenCryHeader: ; 0xf2a45 + dw $16 ; cry id + db $80 ; pitch + db $00 ; echo + dw $0c0 ; length + +SeakingCryHeader: ; 0xf2a4b + dw $16 ; cry id + db $10 ; pitch + db $00 ; echo + dw $17f ; length + +StaryuCryHeader: ; 0xf2a51 + dw $1e ; cry id + db $02 ; pitch + db $00 ; echo + dw $0a0 ; length + +StarmieCryHeader: ; 0xf2a57 + dw $1e ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +MrMimeCryHeader: ; 0xf2a5d + dw $20 ; cry id + db $08 ; pitch + db $00 ; echo + dw $0c0 ; length + +ScytherCryHeader: ; 0xf2a63 + dw $16 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +JynxCryHeader: ; 0xf2a69 + dw $0d ; cry id + db $ff ; pitch + db $00 ; echo + dw $17f ; length + +ElectabuzzCryHeader: ; 0xf2a6f + dw $06 ; cry id + db $8f ; pitch + db $00 ; echo + dw $17f ; length + +MagmarCryHeader: ; 0xf2a75 + dw $04 ; cry id + db $ff ; pitch + db $00 ; echo + dw $0b0 ; length + +PinsirCryHeader: ; 0xf2a7b + dw $14 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +TaurosCryHeader: ; 0xf2a81 + dw $1d ; cry id + db $11 ; pitch + db $00 ; echo + dw $0c0 ; length + +MagikarpCryHeader: ; 0xf2a87 + dw $17 ; cry id + db $80 ; pitch + db $00 ; echo + dw $080 ; length + +GyaradosCryHeader: ; 0xf2a8d + dw $17 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +LaprasCryHeader: ; 0xf2a93 + dw $1b ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +DittoCryHeader: ; 0xf2a99 + dw $0e ; cry id + db $ff ; pitch + db $00 ; echo + dw $17f ; length + +EeveeCryHeader: ; 0xf2a9f + dw $1a ; cry id + db $88 ; pitch + db $00 ; echo + dw $0e0 ; length + +VaporeonCryHeader: ; 0xf2aa5 + dw $1a ; cry id + db $aa ; pitch + db $00 ; echo + dw $17f ; length + +JolteonCryHeader: ; 0xf2aab + dw $1a ; cry id + db $3d ; pitch + db $00 ; echo + dw $100 ; length + +FlareonCryHeader: ; 0xf2ab1 + dw $1a ; cry id + db $10 ; pitch + db $00 ; echo + dw $0a0 ; length + +PorygonCryHeader: ; 0xf2ab7 + dw $25 ; cry id + db $aa ; pitch + db $00 ; echo + dw $17f ; length + +OmanyteCryHeader: ; 0xf2abd + dw $1f ; cry id + db $f0 ; pitch + db $00 ; echo + dw $081 ; length + +OmastarCryHeader: ; 0xf2ac3 + dw $1f ; cry id + db $ff ; pitch + db $00 ; echo + dw $0c0 ; length + +KabutoCryHeader: ; 0xf2ac9 + dw $16 ; cry id + db $bb ; pitch + db $00 ; echo + dw $0c0 ; length + +KabutopsCryHeader: ; 0xf2acf + dw $18 ; cry id + db $ee ; pitch + db $00 ; echo + dw $081 ; length + +AerodactylCryHeader: ; 0xf2ad5 + dw $23 ; cry id + db $20 ; pitch + db $00 ; echo + dw $170 ; length + +SnorlaxCryHeader: ; 0xf2adb + dw $05 ; cry id + db $55 ; pitch + db $00 ; echo + dw $081 ; length + +ArticunoCryHeader: ; 0xf2ae1 + dw $09 ; cry id + db $80 ; pitch + db $00 ; echo + dw $0c0 ; length + +ZapdosCryHeader: ; 0xf2ae7 + dw $18 ; cry id + db $ff ; pitch + db $00 ; echo + dw $100 ; length + +MoltresCryHeader: ; 0xf2aed + dw $09 ; cry id + db $f8 ; pitch + db $00 ; echo + dw $0c0 ; length + +DratiniCryHeader: ; 0xf2af3 + dw $0f ; cry id + db $60 ; pitch + db $00 ; echo + dw $0c0 ; length + +DragonairCryHeader: ; 0xf2af9 + dw $0f ; cry id + db $40 ; pitch + db $00 ; echo + dw $100 ; length + +DragoniteCryHeader: ; 0xf2aff + dw $0f ; cry id + db $3c ; pitch + db $00 ; echo + dw $140 ; length + +MewtwoCryHeader: ; 0xf2b05 + dw $1e ; cry id + db $99 ; pitch + db $00 ; echo + dw $17f ; length + +MewCryHeader: ; 0xf2b0b + dw $1e ; cry id + db $ee ; pitch + db $00 ; echo + dw $17f ; length + +ChikoritaCryHeader: ; 0xf2b11 + dw $31 ; cry id + db $f0 ; pitch + db $ff ; echo + dw $0b0 ; length + +BayleefCryHeader: ; 0xf2b17 + dw $31 ; cry id + db $de ; pitch + db $ff ; echo + dw $120 ; length + +MeganiumCryHeader: ; 0xf2b1d + dw $31 ; cry id + db $49 ; pitch + db $ff ; echo + dw $200 ; length + +CyndaquilCryHeader: ; 0xf2b23 + dw $30 ; cry id + db $47 ; pitch + db $03 ; echo + dw $080 ; length + +QuilavaCryHeader: ; 0xf2b29 + dw $30 ; cry id + db $21 ; pitch + db $03 ; echo + dw $120 ; length + +TyphlosionCryHeader: ; 0xf2b2f + dw $3a ; cry id + db $00 ; pitch + db $0f ; echo + dw $0d4 ; length + +TotodileCryHeader: ; 0xf2b35 + dw $32 ; cry id + db $6c ; pitch + db $04 ; echo + dw $0e8 ; length + +CroconawCryHeader: ; 0xf2b3b + dw $32 ; cry id + db $40 ; pitch + db $04 ; echo + dw $110 ; length + +FeraligatrCryHeader: ; 0xf2b41 + dw $32 ; cry id + db $fc ; pitch + db $03 ; echo + dw $180 ; length + +SentretCryHeader: ; 0xf2b47 + dw $2e ; cry id + db $8a ; pitch + db $00 ; echo + dw $0b8 ; length + +FurretCryHeader: ; 0xf2b4d + dw $2e ; cry id + db $6b ; pitch + db $00 ; echo + dw $102 ; length + +HoothootCryHeader: ; 0xf2b53 + dw $2d ; cry id + db $91 ; pitch + db $00 ; echo + dw $0d8 ; length + +NoctowlCryHeader: ; 0xf2b59 + dw $2d ; cry id + db $00 ; pitch + db $00 ; echo + dw $1a0 ; length + +LedybaCryHeader: ; 0xf2b5f + dw $36 ; cry id + db $00 ; pitch + db $00 ; echo + dw $0de ; length + +LedianCryHeader: ; 0xf2b65 + dw $36 ; cry id + db $6a ; pitch + db $ff ; echo + dw $138 ; length + +SpinarakCryHeader: ; 0xf2b6b + dw $27 ; cry id + db $11 ; pitch + db $00 ; echo + dw $200 ; length + +AriadosCryHeader: ; 0xf2b71 + dw $27 ; cry id + db $52 ; pitch + db $ff ; echo + dw $1e2 ; length + +CrobatCryHeader: ; 0xf2b77 + dw $1d ; cry id + db $f0 ; pitch + db $ff ; echo + dw $140 ; length + +ChinchouCryHeader: ; 0xf2b7d + dw $30 ; cry id + db $c9 ; pitch + db $03 ; echo + dw $140 ; length + +LanturnCryHeader: ; 0xf2b83 + dw $30 ; cry id + db $d0 ; pitch + db $02 ; echo + dw $110 ; length + +PichuCryHeader: ; 0xf2b89 + dw $40 ; cry id + db $00 ; pitch + db $00 ; echo + dw $140 ; length + +CleffaCryHeader: ; 0xf2b8f + dw $34 ; cry id + db $61 ; pitch + db $00 ; echo + dw $091 ; length + +IgglybuffCryHeader: ; 0xf2b95 + dw $31 ; cry id + db $e8 ; pitch + db $00 ; echo + dw $0e8 ; length + +TogepiCryHeader: ; 0xf2b9b + dw $28 ; cry id + db $10 ; pitch + db $00 ; echo + dw $100 ; length + +TogeticCryHeader: ; 0xf2ba1 + dw $2c ; cry id + db $3b ; pitch + db $00 ; echo + dw $038 ; length + +NatuCryHeader: ; 0xf2ba7 + dw $3b ; cry id + db $99 ; pitch + db $ff ; echo + dw $100 ; length + +XatuCryHeader: ; 0xf2bad + dw $3b ; cry id + db $59 ; pitch + db $ff ; echo + dw $168 ; length + +MareepCryHeader: ; 0xf2bb3 + dw $2b ; cry id + db $22 ; pitch + db $00 ; echo + dw $0d8 ; length + +FlaaffyCryHeader: ; 0xf2bb9 + dw $2b ; cry id + db $f9 ; pitch + db $ff ; echo + dw $180 ; length + +AmpharosCryHeader: ; 0xf2bbf + dw $3e ; cry id + db $84 ; pitch + db $ff ; echo + dw $0e8 ; length + +BellossomCryHeader: ; 0xf2bc5 + dw $34 ; cry id + db $84 ; pitch + db $00 ; echo + dw $150 ; length + +MarillCryHeader: ; 0xf2bcb + dw $26 ; cry id + db $1b ; pitch + db $01 ; echo + dw $120 ; length + +AzumarillCryHeader: ; 0xf2bd1 + dw $26 ; cry id + db $b6 ; pitch + db $00 ; echo + dw $180 ; length + +SudowoodoCryHeader: ; 0xf2bd7 + dw $34 ; cry id + db $40 ; pitch + db $0f ; echo + dw $180 ; length + +PolitoedCryHeader: ; 0xf2bdd + dw $34 ; cry id + db $5d ; pitch + db $fd ; echo + dw $1c8 ; length + +HoppipCryHeader: ; 0xf2be3 + dw $34 ; cry id + db $3b ; pitch + db $00 ; echo + dw $0c8 ; length + +SkiploomCryHeader: ; 0xf2be9 + dw $34 ; cry id + db $27 ; pitch + db $00 ; echo + dw $138 ; length + +JumpluffCryHeader: ; 0xf2bef + dw $34 ; cry id + db $00 ; pitch + db $00 ; echo + dw $180 ; length + +AipomCryHeader: ; 0xf2bf5 + dw $41 ; cry id + db $af ; pitch + db $ff ; echo + dw $0e8 ; length + +SunkernCryHeader: ; 0xf2bfb + dw $26 ; cry id + db $2b ; pitch + db $01 ; echo + dw $0b8 ; length + +SunfloraCryHeader: ; 0xf2c01 + dw $3d ; cry id + db $e0 ; pitch + db $ff ; echo + dw $180 ; length + +YanmaCryHeader: ; 0xf2c07 + dw $32 ; cry id + db $31 ; pitch + db $00 ; echo + dw $0c8 ; length + +WooperCryHeader: ; 0xf2c0d + dw $38 ; cry id + db $93 ; pitch + db $00 ; echo + dw $0af ; length + +QuagsireCryHeader: ; 0xf2c13 + dw $38 ; cry id + db $3a ; pitch + db $ff ; echo + dw $140 ; length + +EspeonCryHeader: ; 0xf2c19 + dw $41 ; cry id + db $a2 ; pitch + db $00 ; echo + dw $140 ; length + +UmbreonCryHeader: ; 0xf2c1f + dw $1a ; cry id + db $17 ; pitch + db $ff ; echo + dw $0f0 ; length + +MurkrowCryHeader: ; 0xf2c25 + dw $26 ; cry id + db $e1 ; pitch + db $ff ; echo + dw $180 ; length + +SlowkingCryHeader: ; 0xf2c2b + dw $2f ; cry id + db $04 ; pitch + db $01 ; echo + dw $200 ; length + +MisdreavusCryHeader: ; 0xf2c31 + dw $2d ; cry id + db $30 ; pitch + db $01 ; echo + dw $0e8 ; length + +UnownCryHeader: ; 0xf2c37 + dw $2d ; cry id + db $62 ; pitch + db $01 ; echo + dw $100 ; length + +WobbuffetCryHeader: ; 0xf2c3d + dw $3e ; cry id + db $7b ; pitch + db $02 ; echo + dw $144 ; length + +GirafarigCryHeader: ; 0xf2c43 + dw $29 ; cry id + db $41 ; pitch + db $00 ; echo + dw $200 ; length + +PinecoCryHeader: ; 0xf2c49 + dw $2f ; cry id + db $80 ; pitch + db $00 ; echo + dw $100 ; length + +ForretressCryHeader: ; 0xf2c4f + dw $2f ; cry id + db $00 ; pitch + db $00 ; echo + dw $180 ; length + +DunsparceCryHeader: ; 0xf2c55 + dw $42 ; cry id + db $c4 ; pitch + db $01 ; echo + dw $100 ; length + +GligarCryHeader: ; 0xf2c5b + dw $33 ; cry id + db $fe ; pitch + db $fe ; echo + dw $100 ; length + +SteelixCryHeader: ; 0xf2c61 + dw $3a ; cry id + db $ef ; pitch + db $00 ; echo + dw $0f7 ; length + +SnubbullCryHeader: ; 0xf2c67 + dw $42 ; cry id + db $12 ; pitch + db $01 ; echo + dw $0e8 ; length + +GranbullCryHeader: ; 0xf2c6d + dw $42 ; cry id + db $00 ; pitch + db $00 ; echo + dw $180 ; length + +QwilfishCryHeader: ; 0xf2c73 + dw $2f ; cry id + db $60 ; pitch + db $01 ; echo + dw $0e0 ; length + +ScizorCryHeader: ; 0xf2c79 + dw $3e ; cry id + db $00 ; pitch + db $00 ; echo + dw $160 ; length + +ShuckleCryHeader: ; 0xf2c7f + dw $42 ; cry id + db $90 ; pitch + db $02 ; echo + dw $0a8 ; length + +HeracrossCryHeader: ; 0xf2c85 + dw $3e ; cry id + db $35 ; pitch + db $00 ; echo + dw $0e0 ; length + +SneaselCryHeader: ; 0xf2c8b + dw $38 ; cry id + db $53 ; pitch + db $00 ; echo + dw $0af ; length + +TeddiursaCryHeader: ; 0xf2c91 + dw $3c ; cry id + db $a2 ; pitch + db $07 ; echo + dw $06e ; length + +UrsaringCryHeader: ; 0xf2c97 + dw $3c ; cry id + db $40 ; pitch + db $06 ; echo + dw $0d8 ; length + +SlugmaCryHeader: ; 0xf2c9d + dw $35 ; cry id + db $28 ; pitch + db $fe ; echo + dw $140 ; length + +MagcargoCryHeader: ; 0xf2ca3 + dw $3f ; cry id + db $f3 ; pitch + db $fd ; echo + dw $1c0 ; length + +SwinubCryHeader: ; 0xf2ca9 + dw $30 ; cry id + db $fe ; pitch + db $01 ; echo + dw $140 ; length + +PiloswineCryHeader: ; 0xf2caf + dw $3f ; cry id + db $f7 ; pitch + db $fe ; echo + dw $100 ; length + +CorsolaCryHeader: ; 0xf2cb5 + dw $3f ; cry id + db $a1 ; pitch + db $00 ; echo + dw $0e8 ; length + +RemoraidCryHeader: ; 0xf2cbb + dw $3d ; cry id + db $0d ; pitch + db $00 ; echo + dw $100 ; length + +OctilleryCryHeader: ; 0xf2cc1 + dw $32 ; cry id + db $00 ; pitch + db $00 ; echo + dw $180 ; length + +DelibirdCryHeader: ; 0xf2cc7 + dw $3c ; cry id + db $02 ; pitch + db $00 ; echo + dw $06a ; length + +MantineCryHeader: ; 0xf2ccd + dw $39 ; cry id + db $42 ; pitch + db $ff ; echo + dw $0f0 ; length + +SkarmoryCryHeader: ; 0xf2cd3 + dw $3e ; cry id + db $a9 ; pitch + db $08 ; echo + dw $180 ; length + +HoundourCryHeader: ; 0xf2cd9 + dw $30 ; cry id + db $39 ; pitch + db $00 ; echo + dw $140 ; length + +HoundoomCryHeader: ; 0xf2cdf + dw $32 ; cry id + db $f6 ; pitch + db $fe ; echo + dw $100 ; length + +KingdraCryHeader: ; 0xf2ce5 + dw $35 ; cry id + db $fb ; pitch + db $02 ; echo + dw $100 ; length + +PhanpyCryHeader: ; 0xf2ceb + dw $2e ; cry id + db $48 ; pitch + db $00 ; echo + dw $230 ; length + +DonphanCryHeader: ; 0xf2cf1 + dw $43 ; cry id + db $00 ; pitch + db $00 ; echo + dw $1a0 ; length + +Porygon2CryHeader: ; 0xf2cf7 + dw $29 ; cry id + db $73 ; pitch + db $00 ; echo + dw $240 ; length + +StantlerCryHeader: ; 0xf2cfd + dw $41 ; cry id + db $a0 ; pitch + db $fe ; echo + dw $180 ; length + +SmeargleCryHeader: ; 0xf2d03 + dw $40 ; cry id + db $e6 ; pitch + db $fd ; echo + dw $1f0 ; length + +TyrogueCryHeader: ; 0xf2d09 + dw $41 ; cry id + db $2c ; pitch + db $00 ; echo + dw $108 ; length + +HitmontopCryHeader: ; 0xf2d0f + dw $35 ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +SmoochumCryHeader: ; 0xf2d15 + dw $26 ; cry id + db $68 ; pitch + db $00 ; echo + dw $100 ; length + +ElekidCryHeader: ; 0xf2d1b + dw $3d ; cry id + db $28 ; pitch + db $fd ; echo + dw $0b4 ; length + +MagbyCryHeader: ; 0xf2d21 + dw $3c ; cry id + db $76 ; pitch + db $01 ; echo + dw $03a ; length + +MiltankCryHeader: ; 0xf2d27 + dw $33 ; cry id + db $33 ; pitch + db $fe ; echo + dw $1a0 ; length + +BlisseyCryHeader: ; 0xf2d2d + dw $2f ; cry id + db $93 ; pitch + db $02 ; echo + dw $140 ; length + +RaikouCryHeader: ; 0xf2d33 + dw $2a ; cry id + db $2e ; pitch + db $02 ; echo + dw $120 ; length + +EnteiCryHeader: ; 0xf2d39 + dw $37 ; cry id + db $00 ; pitch + db $00 ; echo + dw $1a0 ; length + +SuicuneCryHeader: ; 0xf2d3f + dw $3f ; cry id + db $00 ; pitch + db $00 ; echo + dw $180 ; length + +LarvitarCryHeader: ; 0xf2d45 + dw $2a ; cry id + db $5f ; pitch + db $00 ; echo + dw $0d0 ; length + +PupitarCryHeader: ; 0xf2d4b + dw $27 ; cry id + db $25 ; pitch + db $fe ; echo + dw $150 ; length + +TyranitarCryHeader: ; 0xf2d51 + dw $2a ; cry id + db $00 ; pitch + db $ff ; echo + dw $180 ; length + +LugiaCryHeader: ; 0xf2d57 + dw $3a ; cry id + db $00 ; pitch + db $00 ; echo + dw $100 ; length + +HoOhCryHeader: ; 0xf2d5d + dw $41 ; cry id + db $00 ; pitch + db $00 ; echo + dw $180 ; length + +CelebiCryHeader: ; 0xf2d63 + dw $37 ; cry id + db $4a ; pitch + db $01 ; echo + dw $111 ; length + +CryHeader252: ; 0xf2d69 + dw 0 ; cry id + db 0 ; pitch + db 0 ; echo + dw 0 ; length + +CryHeader253: ; 0xf2d6f + dw 0 ; cry id + db 0 ; pitch + db 0 ; echo + dw 0 ; length + +CryHeader254: ; 0xf2d75 + dw 0 ; cry id + db 0 ; pitch + db 0 ; echo + dw 0 ; length + +CryHeader255: ; 0xf2d7b + dw 0 ; cry id + db 0 ; pitch + db 0 ; echo + dw 0 ; length + diff --git a/crysaudio/cry_pointers.asm b/crysaudio/cry_pointers.asm new file mode 100644 index 00000000..d58a6f09 --- /dev/null +++ b/crysaudio/cry_pointers.asm @@ -0,0 +1,70 @@ +; e91b0 + dbw BANK(Cry_00), Cry_00 + dbw BANK(Cry_01), Cry_01 + dbw BANK(Cry_02), Cry_02 + dbw BANK(Cry_03), Cry_03 + dbw BANK(Cry_04), Cry_04 + dbw BANK(Cry_05), Cry_05 + dbw BANK(Cry_06), Cry_06 + dbw BANK(Cry_07), Cry_07 + dbw BANK(Cry_08), Cry_08 + dbw BANK(Cry_09), Cry_09 + dbw BANK(Cry_0A), Cry_0A + dbw BANK(Cry_0B), Cry_0B + dbw BANK(Cry_0C), Cry_0C + dbw BANK(Cry_0D), Cry_0D + dbw BANK(Cry_0E), Cry_0E + dbw BANK(Cry_0F), Cry_0F + dbw BANK(Cry_10), Cry_10 + dbw BANK(Cry_11), Cry_11 + dbw BANK(Cry_12), Cry_12 + dbw BANK(Cry_13), Cry_13 + dbw BANK(Cry_14), Cry_14 + dbw BANK(Cry_15), Cry_15 + dbw BANK(Cry_16), Cry_16 + dbw BANK(Cry_17), Cry_17 + dbw BANK(Cry_18), Cry_18 + dbw BANK(Cry_19), Cry_19 + dbw BANK(Cry_1A), Cry_1A + dbw BANK(Cry_1B), Cry_1B + dbw BANK(Cry_1C), Cry_1C + dbw BANK(Cry_1D), Cry_1D + dbw BANK(Cry_1E), Cry_1E + dbw BANK(Cry_1F), Cry_1F + dbw BANK(Cry_20), Cry_20 + dbw BANK(Cry_21), Cry_21 + dbw BANK(Cry_22), Cry_22 + dbw BANK(Cry_23), Cry_23 + dbw BANK(Cry_24), Cry_24 + dbw BANK(Cry_25), Cry_25 + dbw BANK(Cry_26), Cry_26 + dbw BANK(Cry_27), Cry_27 + dbw BANK(Cry_28), Cry_28 + dbw BANK(Cry_29), Cry_29 + dbw BANK(Cry_2A), Cry_2A + dbw BANK(Cry_2B), Cry_2B + dbw BANK(Cry_2C), Cry_2C + dbw BANK(Cry_2D), Cry_2D + dbw BANK(Cry_2E), Cry_2E + dbw BANK(Cry_2F), Cry_2F + dbw BANK(Cry_30), Cry_30 + dbw BANK(Cry_31), Cry_31 + dbw BANK(Cry_32), Cry_32 + dbw BANK(Cry_33), Cry_33 + dbw BANK(Cry_34), Cry_34 + dbw BANK(Cry_35), Cry_35 + dbw BANK(Cry_36), Cry_36 + dbw BANK(Cry_37), Cry_37 + dbw BANK(Cry_38), Cry_38 + dbw BANK(Cry_39), Cry_39 + dbw BANK(Cry_3A), Cry_3A + dbw BANK(Cry_3B), Cry_3B + dbw BANK(Cry_3C), Cry_3C + dbw BANK(Cry_3D), Cry_3D + dbw BANK(Cry_3E), Cry_3E + dbw BANK(Cry_3F), Cry_3F + dbw BANK(Cry_40), Cry_40 + dbw BANK(Cry_41), Cry_41 + dbw BANK(Cry_42), Cry_42 + dbw BANK(Cry_43), Cry_43 +; e927c diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm new file mode 100644 index 00000000..4142a880 --- /dev/null +++ b/crysaudio/engine.asm @@ -0,0 +1,3431 @@ +; The entire sound engine. Uses section "audio" in WRAM. + +; Interfaces are in bank 0. + +; Notable functions: +; FadeMusic +; PlayStereoSFX +; PlayCry + +_SoundRestart:: ; e8000 +; restart sound operation +; clear all relevant hardware registers & wram + push hl + push de + push bc + push af + call MusicOff + ld hl, rNR50 ; channel control registers + xor a + ld [hli], a ; rNR50 ; volume/vin + ld [hli], a ; rNR51 ; sfx channels + ld a, $80 ; all channels on + ld [hli], a ; ff26 ; music channels + + ld hl, rNR10 ; sound channel registers + ld e, $04 ; number of channels +.clearsound +; sound channel 1 2 3 4 + xor a + ld [hli], a ; rNR10, $ff15, rNR30, $ff1f ; sweep = 0 + + ld [hli], a ; rNR11, rNR21, rNR31, rNR41 ; length/wavepattern = 0 + ld a, $08 + ld [hli], a ; rNR12, rNR22, rNR32, rNR42 ; envelope = 0 + xor a + ld [hli], a ; rNR13, rNR23, rNR33, rNR43 ; frequency lo = 0 + ld a, $80 + ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0) + dec e + jr nz, .clearsound + + ld hl, Channel1 ; start of channel data + ld de, $01bf ; length of area to clear (entire sound wram area) +.clearchannels ; clear Crysaudio+$01-Crysaudio+$1bf + xor a + ld [hli], a + dec de + ld a, e + or d + jr nz, .clearchannels + ld a, $77 ; max + ld [Volume], a + call MusicOn + pop af + pop bc + pop de + pop hl + ret +; e803d + +MusicFadeRestart: ; e803d +; restart but keep the music id to fade in to + ld a, [MusicFadeIDHi] + push af + ld a, [MusicFadeIDLo] + push af + call _SoundRestart + pop af + ld [MusicFadeIDLo], a + pop af + ld [MusicFadeIDHi], a + ret +; e8051 + +MusicOn: ; e8051 + ld a, $01 + ld [MusicPlaying], a + ret +; e8057 + +MusicOff: ; e8057 + xor a + ld [MusicPlaying], a + ret +; e805c + +_UpdateSound:: ; e805c + call OpenSRAMForSound +; called once per frame + ; no use updating audio if it's not playing + ld a, [MusicPlaying] + and a + ret z + ; start at ch1 + xor a + ld [CurChannel], a ; just + ld [SoundOutput], a ; off + ld bc, Channel1 +.loop + ; is the channel active? + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 0, [hl] + jp z, .nextchannel + ; check time left in the current note + ld hl, Channel1NoteDuration - Channel1 + add hl, bc + ld a, [hl] + cp a, $02 ; 1 or 0? + jr c, .noteover + dec [hl] + jr .asm_e8093 +.noteover + ; reset vibrato delay + ld hl, Channel1VibratoDelay - Channel1 + add hl, bc + ld a, [hl] + ld hl, Channel1VibratoDelayCount - Channel1 + add hl, bc + ld [hl], a + ; turn vibrato off for now + ld hl, Channel1Flags2 - Channel1 + add hl, bc + res 1, [hl] + ; get next note + call ParseMusic +.asm_e8093 + ; + call Functione84f9 + ; duty cycle + ld hl, Channel1DutyCycle - Channel1 + add hl, bc + ld a, [hli] + ld [Crysaudio+$192], a + ; intensity + ld a, [hli] + ld [Crysaudio+$193], a + ; frequency + ld a, [hli] + ld [Crysaudio+$194], a + ld a, [hl] + ld [Crysaudio+$195], a + ; + call Functione8466 ; handle vibrato and other things + call HandleNoise + ; turn off music when playing sfx? + ld a, [SFXPriority] + and a + jr z, .next + ; are we in a sfx channel right now? + ld a, [CurChannel] + cp a, $04 + jr nc, .next + ; are any sfx channels active? + ; if so, mute + ld hl, Crysaudio+$cc ; Channel5Flags + bit 0, [hl] + jr nz, .restnote + ld hl, Crysaudio+$fe ; Channel6Flags + bit 0, [hl] + jr nz, .restnote + ld hl, Crysaudio+$130 ; Channel7Flags + bit 0, [hl] + jr nz, .restnote + ld hl, Crysaudio+$162 ; Channel8Flags + bit 0, [hl] + jr z, .next +.restnote + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 5, [hl] ; Rest +.next + ; are we in a sfx channel right now? + ld a, [CurChannel] + cp a, $04 ; sfx + jr nc, .asm_e80ee + ld hl, $00cb + add hl, bc + bit 0, [hl] + jr nz, .asm_e80fc +.asm_e80ee + call UpdateChannels + ld hl, Channel1Tracks - Channel1 + add hl, bc + ld a, [SoundOutput] + or [hl] + ld [SoundOutput], a +.asm_e80fc + ; clear note flags + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + xor a + ld [hl], a +.nextchannel + ; next channel + ld hl, Channel2 - Channel1 + add hl, bc + ld c, l + ld b, h + ld a, [CurChannel] + inc a + ld [CurChannel], a + cp a, $08 ; are we done? + jp nz, .loop ; do it all again + ; writing to hardware registers? + call Functione8307 + ; fade music in/out + call FadeMusic + ; write volume to hardware register + ld a, [Volume] + ld [rNR50], a + ; write SO on/off to hardware register + ld a, [SoundOutput] + ld [rNR51], a + ret +; e8125 + +UpdateChannels: ; e8125 + ld hl, .ChannelFnPtrs + ld a, [CurChannel] + and a, $07 + add a + ld e, a + ld d, $00 + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + jp [hl] + +.ChannelFnPtrs + dw .Channel1 + dw .Channel2 + dw .Channel3 + dw .Channel4 +; sfx ch ptrs are identical to music chs +; ..except 5 + dw .Channel5 + dw .Channel6 + dw .Channel7 + dw .Channel8 + +.Channel1 + ld a, [Crysaudio+$1a6] + bit 7, a + ret nz +.Channel5 + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + bit 3, [hl] + jr z, .asm_e8159 + ; + ld a, [SoundInput] + ld [rNR10], a +.asm_e8159 + bit 5, [hl] ; rest + jr nz, .ch1rest + bit 4, [hl] + jr nz, .asm_e81a2 + bit 1, [hl] + jr nz, .asm_e816b + bit 6, [hl] + jr nz, .asm_e8184 + jr .asm_e8175 +.asm_e816b + ld a, [Crysaudio+$194] + ld [rNR13], a + ld a, [Crysaudio+$195] + ld [rNR14], a +.asm_e8175 + bit 0, [hl] + ret z + ld a, [Crysaudio+$192] + ld d, a + ld a, [rNR11] + and a, $3f ; sound length + or d + ld [rNR11], a + ret +.asm_e8184 + ld a, [Crysaudio+$192] + ld d, a + ld a, [rNR11] + and a, $3f ; sound length + or d + ld [rNR11], a + ld a, [Crysaudio+$194] + ld [rNR13], a + ret +.ch1rest + ld a, [rNR52] + and a, %10001110 ; ch1 off + ld [rNR52], a + ld hl, rNR10 + call ClearChannel + ret +.asm_e81a2 + ld hl, Crysaudio+$192 + ld a, $3f ; sound length + or [hl] + ld [rNR11], a + ld a, [Crysaudio+$193] + ld [rNR12], a + ld a, [Crysaudio+$194] + ld [rNR13], a + ld a, [Crysaudio+$195] + or a, $80 + ld [rNR14], a + ret + +.Channel2 +.Channel6 + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + bit 5, [hl] ; rest + jr nz, .ch2rest + bit 4, [hl] + jr nz, .asm_e8204 + bit 6, [hl] + jr nz, .asm_e81e6 + bit 0, [hl] + ret z + ld a, [Crysaudio+$192] + ld d, a + ld a, [rNR21] + and a, $3f ; sound length + or d + ld [rNR21], a + ret +.asm_e81db ; unused + ld a, [Crysaudio+$194] + ld [rNR23], a + ld a, [Crysaudio+$195] + ld [rNR24], a + ret +.asm_e81e6 + ld a, [Crysaudio+$192] + ld d, a + ld a, [rNR21] + and a, $3f ; sound length + or d + ld [rNR21], a + ld a, [Crysaudio+$194] + ld [rNR23], a + ret +.ch2rest + ld a, [rNR52] + and a, %10001101 ; ch2 off + ld [rNR52], a + ld hl, $ff15 + call ClearChannel + ret +.asm_e8204 + ld hl, Crysaudio+$192 + ld a, $3f ; sound length + or [hl] + ld [rNR21], a + ld a, [Crysaudio+$193] + ld [rNR22], a + ld a, [Crysaudio+$194] + ld [rNR23], a + ld a, [Crysaudio+$195] + or a, $80 ; initial (restart) + ld [rNR24], a + ret + +.Channel3 +.Channel7 + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + bit 5, [hl] ; rest + jr nz, .ch3rest + bit 4, [hl] + jr nz, .asm_e824d + bit 6, [hl] + jr nz, .asm_e823a + ret +.asm_e822f ; unused + ld a, [Crysaudio+$194] + ld [rNR33], a + ld a, [Crysaudio+$195] + ld [rNR34], a + ret +.asm_e823a + ld a, [Crysaudio+$194] + ld [rNR33], a + ret +.ch3rest + ld a, [rNR52] + and a, %10001011 ; ch3 off + ld [rNR52], a + ld hl, rNR30 + call ClearChannel + ret +.asm_e824d + ld a, $3f + ld [rNR31], a + xor a + ld [rNR30], a + call .asm_e8268 + ld a, $80 + ld [rNR30], a + ld a, [Crysaudio+$194] + ld [rNR33], a + ld a, [Crysaudio+$195] + or a, $80 + ld [rNR34], a + ret +.asm_e8268 + push hl + ld a, [Crysaudio+$193] + and a, $0f ; only 0-9 are valid + ld l, a + ld h, $00 + ; hl << 4 + ; each wavepattern is $0f bytes long + ; so seeking is done in $10s + add hl, hl + add hl, hl + add hl, hl + add hl, hl + ld de, WaveSamples + add hl, de + cp $f + jr z, .skip + ; load wavepattern into $ff30-$ff3f + ld a, [hli] + ld [$ff30], a + ld a, [hli] + ld [$ff31], a + ld a, [hli] + ld [$ff32], a + ld a, [hli] + ld [$ff33], a + ld a, [hli] + ld [$ff34], a + ld a, [hli] + ld [$ff35], a + ld a, [hli] + ld [$ff36], a + ld a, [hli] + ld [$ff37], a + ld a, [hli] + ld [$ff38], a + ld a, [hli] + ld [$ff39], a + ld a, [hli] + ld [$ff3a], a + ld a, [hli] + ld [$ff3b], a + ld a, [hli] + ld [$ff3c], a + ld a, [hli] + ld [$ff3d], a + ld a, [hli] + ld [$ff3e], a + ld a, [hli] + ld [$ff3f], a +.skip + pop hl + ld a, [Crysaudio+$193] + and a, $f0 + sla a + ld [rNR32], a + ret + +.Channel4 +.Channel8 + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + bit 5, [hl] ; rest + jr nz, .ch4rest + bit 4, [hl] + jr nz, .asm_e82d4 + ret +.asm_e82c1 ; unused + ld a, [Crysaudio+$194] + ld [rNR43], a + ret +.ch4rest + ld a, [rNR52] + and a, %10000111 ; ch4 off + ld [rNR52], a + ld hl, $ff1f + call ClearChannel + ret +.asm_e82d4 + ld a, $3f ; sound length + ld [rNR41], a + ld a, [Crysaudio+$193] + ld [rNR42], a + ld a, [Crysaudio+$194] + ld [rNR43], a + ld a, $80 + ld [rNR44], a + ret +; e82e7 + +_CheckSFX: ; e82e7 +; return carry if any sfx channels are active + ld hl, Crysaudio+$cc ; Channel5Flags + bit 0, [hl] + jr nz, .sfxon + ld hl, Crysaudio+$fe ; Channel6Flags + bit 0, [hl] + jr nz, .sfxon + ld hl, Crysaudio+$130 ; Channel7Flags + bit 0, [hl] + jr nz, .sfxon + ld hl, Crysaudio+$162 ; Channel8Flags + bit 0, [hl] + jr nz, .sfxon + and a + ret +.sfxon + scf + ret +; e8307 + +Functione8307: ; e8307 +; what is Crysaudio+$1a6? + ld a, [Crysaudio+$1a6] + bit 7, a + ret z + and a, $7f + ld d, a + call _CheckSFX + jr c, .asm_e8335 + and a + jr z, .asm_e8323 + cp a, $10 + jr z, .asm_e831e + jr .asm_e8335 +.asm_e831e + ld hl, Tablee8354 + jr .updatehw +.asm_e8323 + ld hl, Tablee8350 +.updatehw + xor a + ld [rNR10], a ; sweep off + ld a, [hli] + ld [rNR11], a ; sound length / duty cycle + ld a, [hli] + ld [rNR12], a ; ch1 volume envelope + ld a, [hli] + ld [rNR13], a ; ch1 frequency lo + ld a, [hli] + ld [rNR14], a ; ch1 frequency hi +.asm_e8335 + ld a, d + inc a + cp a, $1e + jr c, .asm_e833c + xor a +.asm_e833c + or a, $80 + ld [Crysaudio+$1a6], a + ; is hw ch1 on? + ld a, [SoundOutput] + and a, $11 + ret nz + ; if not, turn it on + ld a, [SoundOutput] + or a, $11 + ld [SoundOutput], a + ret +; e8350 + +Tablee8350: ; e8350 + db $80 ; duty 50% + db $e2 ; volume $e, envelope decrease sweep 2 + db $50 ; frequency: $750 + db $87 ; restart sound +; e8354 + +Tablee8354: ; e8354 + db $80 ; duty 50% + db $e2 ; volume $e, envelope decrease sweep 2 + db $ee ; frequency: $6ee + db $86 ; restart sound +; e8358 + +FadeMusic:: ; e8358 +; fade music if applicable +; usage: +; write to MusicFade +; song fades out at the given rate +; load song id in MusicFadeID +; fade new song in +; notes: +; max # frames per volume level is $3f + + ; fading? + ld a, [MusicFade] + and a + ret z + ; has the count ended? + ld a, [MusicFadeCount] + and a + jr z, .update + ; count down + dec a + ld [MusicFadeCount], a + ret +.update + ld a, [MusicFade] + ld d, a + ; get new count + and a, $3f + ld [MusicFadeCount], a + ; get SO1 volume + ld a, [Volume] + and a, $07 + ; which way are we fading? + bit 7, d + jr nz, .fadein + ; fading out + and a + jr z, .novolume + dec a + jr .updatevolume +.novolume + ; make sure volume is off + xor a + ld [Volume], a + ; did we just get on a bike? + ld a, [PlayerState] + cp a, $01 ; bicycle + jr z, .bicycle + push bc + ; restart sound + call MusicFadeRestart + ; get new song id + ld a, [MusicFadeIDLo] + and a + jr z, .quit ; this assumes there are fewer than 256 songs! + ld e, a + ld a, [MusicFadeIDHi] + ld d, a + ; load new song + call _PlayMusic +.quit + ; cleanup + pop bc + ; stop fading + xor a + ld [MusicFade], a + ret +.bicycle + push bc + ; restart sound + call MusicFadeRestart + ; this turns the volume up + ; turn it back down + xor a + ld [Volume], a + ; get new song id + ld a, [MusicFadeIDLo] + ld e, a + ld a, [MusicFadeIDHi] + ld d, a + ; load new song + call _PlayMusic + pop bc + ; fade in + ld hl, MusicFade + set 7, [hl] + ret +.fadein + ; are we done? + cp a, $07 + jr nc, .maxvolume + ; inc volume + inc a + jr .updatevolume +.maxvolume + ; we're done + xor a + ld [MusicFade], a + ret +.updatevolume + ; hi = lo + ld d, a + swap a + or d + ld [Volume], a + ret +; e83d1 + +LoadNote: ; e83d1 + ; check mute?? + ld hl, Channel1Flags2 - Channel1 + add hl, bc + bit 1, [hl] + ret z + ; get note duration + ld hl, Channel1NoteDuration - Channel1 + add hl, bc + ld a, [hl] + ld hl, Crysaudio+$197 ; ???? + sub [hl] + jr nc, .ok + ld a, $01 +.ok + ld [hl], a + ; get frequency + ld hl, Channel1Frequency - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ; ???? + ld hl, $0021 + add hl, bc + ld a, e + sub [hl] + ld e, a + ld a, d + sbc a, $00 + ld d, a + ; ???? + ld hl, $0022 + add hl, bc + sub [hl] + jr nc, .asm_e8420 + ; ???? + ld hl, Channel1Flags3 - Channel1 + add hl, bc + set 1, [hl] + ; get frequency + ld hl, Channel1Frequency - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ; ???? + ld hl, $0021 + add hl, bc + ld a, [hl] + sub e + ld e, a + ld a, d + sbc a, $00 + ld d, a + ; ???? + ld hl, $0022 + add hl, bc + ld a, [hl] + sub d + ld d, a + jr .asm_e843e +.asm_e8420 + ; ???? + ld hl, Channel1Flags3 - Channel1 + add hl, bc + res 1, [hl] + ; get frequency + ld hl, Channel1Frequency - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ; ???? + ld hl, $0021 + add hl, bc + ld a, e + sub [hl] + ld e, a + ld a, d + sbc a, $00 + ld d, a + ; ???? + ld hl, $0022 + add hl, bc + sub [hl] + ld d, a +.asm_e843e + push bc + ld hl, Crysaudio+$197 + ld b, $00 ; loop count +.loop + inc b + ld a, e + sub [hl] + ld e, a + jr nc, .loop + ld a, d + and a + jr z, .quit + dec d + jr .loop +.quit + ld a, e ; result + add [hl] + ld d, b ; loop count + ; ???? + pop bc + ld hl, $0023 + add hl, bc + ld [hl], d + ld hl, $0024 + add hl, bc + ld [hl], a + ; clear ???? + ld hl, $0025 + add hl, bc + xor a + ld [hl], a + ret +; e8466 + +Functione8466: ; e8466 +; handle vibrato and other things +; unknowns: Crysaudio+$192, Crysaudio+$194 + ld hl, Channel1Flags2 - Channel1 + add hl, bc + bit 2, [hl] + jr z, .next + ld hl, $001c + add hl, bc + ld a, [hl] + rlca + rlca + ld [hl], a + and a, $c0 + ld [Crysaudio+$192], a + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 0, [hl] +.next + ld hl, Channel1Flags2 - Channel1 + add hl, bc + bit 4, [hl] + jr z, .vibrato + ld hl, $0027 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ld hl, Crysaudio+$194 + ld a, [hli] + ld h, [hl] + ld l, a + add hl, de + ld e, l + ld d, h + ld hl, Crysaudio+$194 + ld [hl], e + inc hl + ld [hl], d +.vibrato + ; is vibrato on? + ld hl, Channel1Flags2 - Channel1 + add hl, bc + bit 0, [hl] ; vibrato + jr z, .quit + ; is vibrato active for this note yet? + ; is the delay over? + ld hl, Channel1VibratoDelayCount - Channel1 + add hl, bc + ld a, [hl] + and a + jr nz, .subexit + ; is the extent nonzero? + ld hl, Channel1VibratoExtent - Channel1 + add hl, bc + ld a, [hl] + and a + jr z, .quit + ; save it for later + ld d, a + ; is it time to toggle vibrato up/down? + ld hl, Channel1VibratoRate - Channel1 + add hl, bc + ld a, [hl] + and a, $0f ; count + jr z, .toggle +.subexit + dec [hl] + jr .quit +.toggle + ; refresh count + ld a, [hl] + swap [hl] + or [hl] + ld [hl], a + ; ???? + ld a, [Crysaudio+$194] + ld e, a + ; toggle vibrato up/down + ld hl, Channel1Flags3 - Channel1 + add hl, bc + bit 0, [hl] ; vibrato up/down + jr z, .down +; up + ; vibrato down + res 0, [hl] + ; get the delay + ld a, d + and a, $0f ; lo + ; + ld d, a + ld a, e + sub d + jr nc, .asm_e84ef + ld a, $00 + jr .asm_e84ef +.down + ; vibrato up + set 0, [hl] + ; get the delay + ld a, d + and a, $f0 ; hi + swap a ; move it to lo + ; + add e + jr nc, .asm_e84ef + ld a, $ff +.asm_e84ef + ld [Crysaudio+$194], a + ; + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 6, [hl] +.quit + ret +; e84f9 + +Functione84f9: ; e84f9 + ; quit if ???? + ld hl, Channel1Flags2 - Channel1 + add hl, bc + bit 1, [hl] + ret z + ; de = Frequency + ld hl, Channel1Frequency - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ; + ld hl, Channel1Flags3 - Channel1 + add hl, bc + bit 1, [hl] + jr z, .next + ; + ld hl, $0023 + add hl, bc + ld l, [hl] + ld h, $00 + add hl, de + ld d, h + ld e, l + ; get ???? + ld hl, $0024 + add hl, bc + ld a, [hl] + ; add it to ???? + ld hl, $0025 + add hl, bc + add [hl] + ld [hl], a + ld a, $00 + adc e + ld e, a + ld a, $00 + adc d + ld d, a + ; + ld hl, $0022 + add hl, bc + ld a, [hl] + cp d + jp c, .quit1 + jr nz, .quit2 + ld hl, $0021 + add hl, bc + ld a, [hl] + cp e + jp c, .quit1 + jr .quit2 +.next + ld a, e + ld hl, $0023 + add hl, bc + ld e, [hl] + sub e + ld e, a + ld a, d + sbc a, $00 + ld d, a + ld hl, $0024 + add hl, bc + ld a, [hl] + add a + ld [hl], a + ld a, e + sbc a, $00 + ld e, a + ld a, d + sbc a, $00 + ld d,a + ld hl, $0022 + add hl, bc + ld a, d + cp [hl] + jr c, .quit1 + jr nz, .quit2 + ld hl, $0021 + add hl, bc + ld a, e + cp [hl] + jr nc, .quit2 +.quit1 + ld hl, Channel1Flags2 - Channel1 + add hl, bc + res 1, [hl] + ld hl, Channel1Flags3 - Channel1 + add hl, bc + res 1, [hl] + ret +.quit2 + ld hl, Channel1Frequency - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 1, [hl] + set 0, [hl] + ret +; e858c + +HandleNoise: ; e858c + ; is noise sampling on? + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 4, [hl] ; noise sampling + ret z + ; are we in a sfx channel? + ld a, [CurChannel] + bit 2, a ; sfx + jr nz, .next + ; is ch8 on? (noise) + ld hl, Crysaudio+$162 ; Channel8Flags + bit 0, [hl] ; on? + jr z, .next + ; is ch8 playing noise? + bit 4, [hl] + ret nz ; quit if so + ; +.next + ld a, [Crysaudio+$1a2] + and a + jr z, ReadNoiseSample + dec a + ld [Crysaudio+$1a2], a + ret +; e85af + +ReadNoiseSample: ; e85af +; sample struct: +; [wx] [yy] [zz] +; w: ? either 2 or 3 +; x: duration +; zz: intensity +; yy: frequency + + ; de = [NoiseSampleAddress] + ld hl, NoiseSampleAddress + ld e, [hl] + inc hl + ld d, [hl] + + ; is it empty? + ld a, e + or d + jr z, .quit + + ld a, [de] + inc de + + cp $ff + jr z, .quit + + and $f + inc a + ld [Crysaudio+$1a2], a + ld a, [de] + inc de + ld [Crysaudio+$193], a + ld a, [de] + inc de + ld [Crysaudio+$194], a + xor a + ld [Crysaudio+$195], a + + ld hl, NoiseSampleAddress + ld [hl], e + inc hl + ld [hl], d + + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 4, [hl] + ret +.quit + ret +; e85e1 + +ParseMusic: ; e85e1 +; parses until a note is read or the song is ended + call GetMusicByte ; store next byte in a + cp a, $ff ; is the song over? + jr z, .readff + cp a, $d0 ; is it a note? + jr c, .readnote + ; then it's a command +.readcommand + call ParseMusicCommand + jr ParseMusic ; start over + +.readnote +; CurMusicByte contains current note +; special notes + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 3, [hl] + jp nz, Functione8698 + bit 5, [hl] + jp nz, Functione8698 + bit 4, [hl] ; noise sample + jp nz, GetNoiseSample +; normal note + ; set note duration (bottom nybble) + ld a, [CurMusicByte] + and a, $0f + call SetNoteDuration + ; get note pitch (top nybble) + ld a, [CurChannel] + ld e, a + ld d, 0 + ld hl, wChannelSelectorSwitches + add hl, de + ld a, [hl] + and a + jr z, .notMuted + xor a + jr .rest +.notMuted + ld a, [CurMusicByte] + swap a + and a, $0f + jr z, .rest ; pitch $0 -> rest + ; update pitch + ld hl, Channel1Pitch - Channel1 + add hl, bc + ld [hl], a + ; store pitch in e + ld e, a + ; store octave in d + ld hl, Channel1Octave - Channel1 + add hl, bc + ld d, [hl] + ; update frequency + call GetFrequency + ld hl, Channel1Frequency - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ; ???? + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 4, [hl] + jp LoadNote +.rest +; note = rest + ld hl, Channel1Pitch - Channel1 + add hl, bc + ld [hl], a + + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 5, [hl] ; Rest + ret +; +.readff +; $ff is reached in music data + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 1, [hl] ; in a subroutine? + jr nz, .readcommand ; execute + ld a, [CurChannel] + cp a, $04 ; channels 0-3? + jr nc, .asm_e8651 + ; ???? + ld hl, $00cb + add hl, bc + bit 0, [hl] + jr nz, .ok +.asm_e8651 + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 5, [hl] + call nz, RestoreVolume + ; end music + ld a, [CurChannel] + cp a, $04 ; channel 5? + jr nz, .ok + ; ???? + xor a + ld [rNR10], a ; sweep = 0 +.ok +; stop playing + ; turn channel off + ld hl, Channel1Flags - Channel1 + add hl, bc + res 0, [hl] + ; note = rest + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 5, [hl] + ; clear music id & bank + ld hl, Channel1MusicID - Channel1 + add hl, bc + xor a + ld [hli], a ; id hi + ld [hli], a ; id lo + ld [hli], a ; bank + ret +; e8679 + +RestoreVolume: ; e8679 + ; ch5 only + ld a, [CurChannel] + cp a, $04 + ret nz + xor a + ld hl, Crysaudio+$122 + ld [hli], a + ld [hl], a + ld hl, Crysaudio+$186 + ld [hli], a + ld [hl], a + ld a, [LastVolume] + ld [Volume], a + xor a + ld [LastVolume], a + ld [SFXPriority], a + ret +; e8698 + +Functione8698: ; e8698 + ; turn noise sampling on + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 4, [hl] ; noise sample + ; update note duration + ld a, [CurMusicByte] + call SetNoteDuration ; top nybble doesnt matter? + ; update intensity from next param + call GetMusicByte + ld hl, Channel1Intensity - Channel1 + add hl, bc + ld [hl], a + ; update lo frequency from next param + call GetMusicByte + ld hl, Channel1FrequencyLo - Channel1 + add hl, bc + ld [hl], a + ; are we on the last channel? (noise sampling) + ld a, [CurChannel] + and a, $03 + cp a, $03 + ret z + ; update hi frequency from next param + call GetMusicByte + ld hl, Channel1FrequencyHi - Channel1 + add hl, bc + ld [hl], a + ret +; e86c5 + +GetNoiseSample: ; e86c5 +; load ptr to sample header in NoiseSampleAddress + ; are we on the last channel? + ld a, [CurChannel] + and a, $03 + cp a, $03 + ; ret if not + ret nz + ; update note duration + ld a, [CurMusicByte] + and a, $0f + call SetNoteDuration + ld a, [wChannelSelectorSwitches+3] + and a + ret nz + ; check current channel + ld a, [CurChannel] + bit 2, a ; are we in a sfx channel? + jr nz, .sfx + ld hl, Crysaudio+$162 ; Channel8Flags + bit 0, [hl] ; is ch8 on? (noise) + ret nz + ld a, [MusicNoiseSampleSet] + jr .next +.sfx + ld a, [SFXNoiseSampleSet] +.next + ; load noise sample set id into de + ld e, a + ld d, $00 + ; load ptr to noise sample set in hl + ld hl, NoiseSampleSetsPointers + add hl, de + add hl, de + ld a, [hli] + ld h, [hl] + ld l, a + ; get pitch + ld a, [CurMusicByte] + swap a + ; non-rest note? + and a, $0f + ret z + ; use 'pitch' to seek noise sample set + ld e, a + ld d, $00 + add hl, de + add hl, de + ; load sample pointer into NoiseSampleAddress + ld a, [hli] + ld [NoiseSampleAddressLo], a + ld a, [hl] + ld [NoiseSampleAddressHi], a + ; clear ???? + xor a + ld [Crysaudio+$1a2], a + ret +; e870f + +ParseMusicCommand: ; e870f + ; reload command + ld a, [CurMusicByte] + ; get command # + sub a, $d0 ; first command + ld e, a + ld d, $00 + ; seek command pointer + ld hl, MusicCommands + add hl, de + add hl, de + ; jump to the new pointer + ld a, [hli] + ld h, [hl] + ld l, a + jp [hl] +; e8720 + +MusicCommands: ; e8720 +; pointer to each command in order + ; octaves + dw MusicD0 ; octave 8 + dw MusicD1 ; octave 7 + dw MusicD2 ; octave 6 + dw MusicD3 ; octave 5 + dw MusicD4 ; octave 4 + dw MusicD5 ; octave 3 + dw MusicD6 ; octave 2 + dw MusicD7 ; octave 1 + dw MusicD8 ; note length + intensity + dw MusicD9 ; set starting octave + dw MusicDA ; tempo + dw MusicDB ; duty cycle + dw MusicDC ; intensity + dw MusicDD ; update sound status + dw MusicDE ; ???? + duty cycle + dw MusicDF ; + dw MusicE0 ; + dw MusicE1 ; vibrato + dw MusicE2 ; + dw MusicE3 ; music noise sampling + dw MusicE4 ; force panning + dw MusicE5 ; volume + dw MusicE6 ; tune + dw MusicE7 ; + dw MusicE8 ; + dw MusicE9 ; global tempo + dw MusicEA ; restart current channel from header + dw MusicEB ; new song + dw MusicEC ; sfx priority on + dw MusicED ; sfx priority off + dw MusicEE ; + dw MusicEF ; stereo panning + dw MusicF0 ; sfx noise sampling + dw MusicF1 ; nothing + dw MusicF2 ; nothing + dw MusicF3 ; nothing + dw MusicF4 ; nothing + dw MusicF5 ; nothing + dw MusicF6 ; nothing + dw MusicF7 ; nothing + dw MusicF8 ; nothing + dw MusicF9 ; + dw MusicFA ; + dw MusicFB ; + dw MusicFC ; jump + dw MusicFD ; loop + dw MusicFE ; call + dw MusicFF ; return +; e8780 + +MusicF1: ; e8780 +; global tempo +; params: 2 +; de: tempo + call GetMusicByte + ld d, a + call GetMusicByte + ld e, a + call SetGlobalTempo + ret + +MusicF2: ; e8780 +; duty cycle +; params: 1 + call GetMusicByte + rrca + rrca + and a, $c0 + ld hl, Channel1DutyCycle - Channel1 + add hl, bc + ld [hl], a + ret + +MusicF3: ; e8780 +;custom waveform + ld e, 16 + ld hl, $ff30 +.read + call GetMusicByte + ldi [hl], a + dec e + jr nz, .read + ret + +MusicF4: ; e8780 +;inc_octave + ld hl, Channel1Octave - Channel1 + add hl, bc + ld a, [hl] + dec a + ld [hl], a + ret + +MusicF5: ; e8780 +;dec_octave + ld hl, Channel1Octave - Channel1 + add hl, bc + ld a, [hl] + inc a + ld [hl], a + ret + +MusicF6: ; e8780 +;notetype0 + call GetMusicByte + ld hl, $002d + add hl, bc + ld [hl], a + ret + +MusicF7: ; e8780 +;notetype1 + call GetMusicByte + ld hl, Channel1Intensity - Channel1 + add hl, bc + rla + rla + rla + rla + and $f0 + push bc + ld b, a + ld a, [hl] + and $f + add b + pop bc + ld [hl], a + ret + +MusicF8: ; e8780 +;notetype2 + call GetMusicByte + ld hl, Channel1Intensity - Channel1 + add hl, bc + push bc + ld b, a + ld a, [hl] + and $f0 + add b + pop bc + ld [hl], a + ret +; e8781 + +MusicFF: ; e8781 +; called when $ff is encountered w/ subroutine flag set +; end music stream +; return to caller of the subroutine + ; reset subroutine flag + ld hl, Channel1Flags - Channel1 + add hl, bc + res 1, [hl] + ; copy LastMusicAddress to MusicAddress + ld hl, Channel1LastMusicAddress - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ret +; e8796 + +MusicFE: ; e8796 +; call music stream (subroutine) +; parameters: ll hh ; pointer to subroutine + ; get pointer from next 2 bytes + call GetMusicByte + ld e, a + call GetMusicByte + ld d, a + push de + ; copy MusicAddress to LastMusicAddress + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ld hl, Channel1LastMusicAddress - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ; load pointer into MusicAddress + pop de + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ; set subroutine flag + ld hl, Channel1Flags - Channel1 + add hl, bc + set 1, [hl] + ret +; e87bc + +MusicFC: ; e87bc +; jump +; parameters: ll hh ; pointer + ; get pointer from next 2 bytes + call GetMusicByte + ld e, a + call GetMusicByte + ld d, a + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ret +; e87cc + +MusicFD: ; e87cc +; loops xx - 1 times +; 00: infinite +; params: 3 +; xx ll hh +; xx : loop count +; ll hh : pointer + + ; get loop count + call GetMusicByte + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 2, [hl] ; has the loop been initiated? + jr nz, .checkloop + and a ; loop counter 0 = infinite + jr z, .loop + ; initiate loop + dec a + set 2, [hl] ; set loop flag + ld hl, Channel1LoopCount - Channel1 + add hl, bc + ld [hl], a ; store loop counter +.checkloop + ld hl, Channel1LoopCount - Channel1 + add hl, bc + ld a, [hl] + and a ; are we done? + jr z, .endloop + dec [hl] +.loop + ; get pointer + call GetMusicByte + ld e, a + call GetMusicByte + ld d, a + ; load new pointer into MusicAddress + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ret + +.endloop + ; reset loop flag + ld hl, Channel1Flags - Channel1 + add hl, bc + res 2, [hl] + ; skip to next command + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + inc de ; skip + inc de ; pointer + ld [hl], d + dec hl + ld [hl], e + ret +; e880e + +MusicFA: ; e880e +; set condition for a jump +; used with FB +; params: 1 +; xx ; condition + + ; set condition + call GetMusicByte + ld hl, Channel1Condition - Channel1 + add hl, bc + ld [hl], a + ret +; e8817 + +MusicFB: ; e8817 +; conditional jump +; used with FA +; params: 3 +; xx: condition +; ll hh: pointer + +; check condition + ; a = condition + call GetMusicByte + ; if existing condition matches, jump to new address + ld hl, Channel1Condition - Channel1 + add hl, bc + cp [hl] + jr z, .jump +; skip to next command + ; get address + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ; skip pointer + inc de + inc de + ; update address + ld [hl], d + dec hl + ld [hl], e + ret +.jump +; jump to the new address + ; get pointer + call GetMusicByte + ld e, a + call GetMusicByte + ld d, a + ; update pointer in MusicAddress + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ret +; e883e + +MusicEE; e883e +; conditional jump +; checks a byte in ram corresponding to the current channel +; doesn't seem to be set by any commands +; params: 2 +; ll hh ; pointer + +; if ????, jump + ; get channel + ld a, [CurChannel] + and a, $03 ; ch0-3 + ld e, a + ld d, $00 + ; hl = Crysaudio+$1b8 + channel id + ld hl, Crysaudio+$1b8 + add hl, de + ; if set, jump + ld a, [hl] + and a + jr nz, .jump +; skip to next command + ; get address + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ; skip pointer + inc de + inc de + ; update address + ld [hl], d + dec hl + ld [hl], e + ret +.jump + ; reset jump flag + ld [hl], $00 + ; de = pointer + call GetMusicByte + ld e, a + call GetMusicByte + ld d, a + ; update address + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ret +; e886d + +MusicF9: ; e886d +; sets some flag +; seems to be unused +; params: 0 + ld a, $01 + ld [Crysaudio+$1b5], a + ret +; e8873 + +MusicE2: ; e8873 +; seems to have been dummied out +; params: 1 + call GetMusicByte + ld hl, $002c + add hl, bc + ld [hl], a + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 3, [hl] + ret +; e8882 + +MusicE1: ; e8882 +; vibrato +; params: 2 +; 1: [xx] + ; delay in frames +; 2: [yz] + ; y: extent + ; z: rate (# frames per cycle) + + ; set vibrato flag? + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 0, [hl] + ; start at lower frequency (extent is positive) + ld hl, Channel1Flags3 - Channel1 + add hl, bc + res 0, [hl] + ; get delay + call GetMusicByte +; update delay + ld hl, Channel1VibratoDelay - Channel1 + add hl, bc + ld [hl], a +; update delay count + ld hl, Channel1VibratoDelayCount - Channel1 + add hl, bc + ld [hl], a +; update extent +; this is split into halves only to get added back together at the last second + ; get extent/rate + call GetMusicByte + ld hl, Channel1VibratoExtent - Channel1 + add hl, bc + ld d, a + ; get top nybble + and a, $f0 + swap a + srl a ; halve + ld e, a + adc a, $00 ; round up + swap a + or e + ld [hl], a +; update rate + ld hl, Channel1VibratoRate - Channel1 + add hl, bc + ; get bottom nybble + ld a, d + and a, $0f + ld d, a + swap a + or d + ld [hl], a + ret +; e88bd + +MusicE0: ; e88bd +; ???? +; params: 2 + call GetMusicByte + ld [Crysaudio+$197], a + call GetMusicByte + ld d, a + and a, $0f + ld e, a + ld a, d + swap a + and a, $0f + ld d, a + call GetFrequency + ld hl, $0021 + add hl, bc + ld [hl], e + ld hl, $0022 + add hl, bc + ld [hl], d + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 1, [hl] + ret +; e88e4 + +MusicE6: ; e88e4 +; tone +; params: 2 + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 4, [hl] + ld hl, $0028 + add hl, bc + call GetMusicByte + ld [hld], a + call GetMusicByte + ld [hl], a + ret +; e88f7 + +MusicE7: ; e88f7 +; shrug +; params: 1 + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 6, [hl] + call GetMusicByte + ld hl, $0029 + add hl, bc + ld [hl], a + ret +; e8906 + +MusicDE: ; e8906 +; ???? + duty cycle +; params: 1 + ; + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 2, [hl] ; duty cycle + ; + call GetMusicByte + rrca + rrca + ld hl, $001c + add hl, bc + ld [hl], a + ; update duty cycle + and a, $c0 ; only uses top 2 bits + ld hl, Channel1DutyCycle - Channel1 + add hl, bc + ld [hl], a + ret +; e891e + +MusicE8: ; e891e +; shrug +; params: 1 + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 5, [hl] + call GetMusicByte + ld hl, $002a + add hl, bc + ld [hl], a + ret +; e892d + +MusicDF: ; e892d +; toggle something +; params: none + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 3, [hl] + jr z, .on + res 3, [hl] + ret +.on + set 3, [hl] + ret +; e893b + +MusicE3: ; e893b +; toggle music noise sampling +; can't be used as a straight toggle since the param is not read from on->off +; params: +; noise on: 1 +; noise off: 0 + ; check if noise sampling is on + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 4, [hl] + jr z, .on + ; turn noise sampling off + res 4, [hl] + ret +.on + ; turn noise sampling on + set 4, [hl] + call GetMusicByte + ld [MusicNoiseSampleSet], a + ret +; e894f + +MusicF0: ; e894f +; toggle sfx noise sampling +; params: +; on: 1 +; off: 0 + ; check if noise sampling is on + ld hl, Channel1Flags - Channel1 + add hl, bc + bit 4, [hl] + jr z, .on + ; turn noise sampling off + res 4, [hl] + ret +.on + ; turn noise sampling on + set 4, [hl] + call GetMusicByte + ld [SFXNoiseSampleSet], a + ret +; e8963 + +MusicD8: ; e8963 +; note length +; # frames per 16th note +; intensity: see MusicDC +; params: 2 + ; note length + call GetMusicByte + ld hl, $002d + add hl, bc + ld [hl], a + ld a, [CurChannel] + and a, $03 + cp a, $03 + ret z + ; intensity + call MusicDC + ret +; e8977 + +MusicDD: ; e8977 +; update sound status +; params: 1 + call GetMusicByte + ld [SoundInput], a + ld hl, Channel1NoteFlags - Channel1 + add hl, bc + set 3, [hl] + ret +; e8984 + +MusicDB: ; e8984 +; duty cycle, includes nite check +; params: 1 + ld a, [GBPrinter] + bit 2, a + jr nz, .ForceNite ;for the Music test + bit 3, a + jp nz, MusicF2 ;skip nite check +.ForceNite + ld a, [CurChannel] + cp a, $04 + jp nc, MusicF2 ;skip nite check + call GetMusicByte + rrca + rrca + and a, $c0 + ld hl, Channel1DutyCycle - Channel1 + add hl, bc + ld d, a + ld a, [GBPrinter] + bit 2, a + jr nz, .NiteDuty ;for the Music test + ;ld a, [TimeOfDay] + ;cp NITE + ;jr z, .NiteDuty + ld a, d + ld [hl], a + ret +.NiteDuty + ld a, d + xor a, $40 + ld [hl], a + ret +; e8991 + +MusicDC: ; e8991 +; intensity +; params: 1 +; hi: pressure +; lo: velocity + call GetMusicByte + ld hl, Channel1Intensity - Channel1 + add hl, bc + ld [hl], a + ret +; e899a + +MusicDA: ; e899a +; global tempo includes nite check +; params: 2 +; de: tempo + ld a, [GBPrinter] + bit 2, a + jr nz, .ForceNite ;for the Music test + bit 3, a + jp nz, MusicF1 ;skip nite check +.ForceNite + ld a, [CurChannel] + cp a, $04 + jp nc, MusicF1 ;skip nite check + call GetMusicByte + ld d, a + call GetMusicByte + ld e, a + ld a, [GBPrinter] + bit 2, a + jr nz, .NiteTempo ;for the Music test + ;ld a, [TimeOfDay] + ;cp NITE + ;jr z, .NiteTempo + call SetGlobalTempo + ret +.NiteTempo + push de + srl d + rr e + srl d + rr e + push de + pop hl + pop de + add hl, de + push hl + pop de + call SetGlobalTempo + ret +; e89a6 + +MusicD0: ; e89a6 +MusicD1: ; e89a6 +MusicD2: ; e89a6 +MusicD3: ; e89a6 +MusicD4: ; e89a6 +MusicD5: ; e89a6 +MusicD6: ; e89a6 +MusicD7: ; e89a6 +; set octave based on lo nybble of the command + ld hl, Channel1Octave - Channel1 + add hl, bc + ld a, [CurMusicByte] + and 7 + ld [hl], a + ret +; e89b1 + +MusicD9: ; e89b1 +; set starting octave +; this forces all notes up by the starting octave +; params: 1 + call GetMusicByte + ld hl, Channel1StartingOctave - Channel1 + add hl, bc + ld [hl], a + ret +; e89ba + +MusicEF: ; e89ba +; stereo panning +; params: 1 + ; stereo on? + ld a, [Options] + bit 5, a ; stereo + jr nz, MusicE4 + ; skip param + call GetMusicByte + ret +; e89c5 + +MusicE4: ; e89c5 +; force panning +; params: 1 + call SetLRTracks + call GetMusicByte + ld hl, Channel1Tracks - Channel1 + add hl, bc + and [hl] + ld [hl], a + ret +; e89d2 + +MusicE5: ; e89d2 +; set volume +; params: 1 +; see Volume + ; read param even if it's not used + call GetMusicByte + ; is the song fading? + ld a, [MusicFade] + and a + ret nz + ; reload param + ld a, [CurMusicByte] + ; set volume + ld [Volume], a + ret +; e89e1 + +MusicE9: ; e89e1 +; set global tempo to current channel tempo +- param +; params: 1 signed + call GetMusicByte + ld e, a + ; check sign + cp a, $80 + jr nc, .negative +;positive + ld d, $00 + jr .ok +.negative + ld d, $ff +.ok + ld hl, Channel1Tempo - Channel1 + add hl, bc + ld a, [hli] + ld h, [hl] + ld l, a + add hl, de + ld e, l + ld d, h + call SetGlobalTempo + ret +; e89fd + +MusicEC: ; e89fd +; turn sfx priority on +; params: none + ld a, $01 + ld [SFXPriority], a + ret +; e8a03 + +MusicED: ; e8a03 +; turn sfx priority off +; params: none + xor a + ld [SFXPriority], a + ret +; e8a08 + +MusicEA: ; e8a08 +; restart current channel from channel header (same bank) +; params: 2 (5) +; ll hh: pointer to new channel header +; header format: 0x yy zz +; x: channel # (0-3) +; zzyy: pointer to new music data + + ; update music id + ld hl, Channel1MusicID - Channel1 + add hl, bc + ld a, [hli] + ld [MusicIDLo], a + ld a, [hl] + ld [MusicIDHi], a + ; update music bank + ld hl, Channel1MusicBank - Channel1 + add hl, bc + ld a, [hl] + ld [MusicBank], a + ; get pointer to new channel header + call GetMusicByte + ld l, a + call GetMusicByte + ld h, a + ld e, [hl] + inc hl + ld d, [hl] + push bc ; save current channel + call LoadChannel + call StartChannel + pop bc ; restore current channel + ret +; e8a30 + +MusicEB: ; e8a30 +; new song +; params: 2 +; de: song id + call GetMusicByte + ld e, a + call GetMusicByte + ld d, a + push bc + call _PlayMusic + pop bc + ret +; e8a3e + +GetMusicByte: ; e8a3e +; returns byte from current address in a +; advances to next byte in music data +; input: bc = start of current channel + push hl + push de + ; load address into de + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld a, [hli] + ld e, a + ld d, [hl] + ; load bank into a + ld hl, Channel1MusicBank - Channel1 + add hl, bc + ld a, [hl] + ; get byte + call _LoadMusicByte ; load data into CurMusicByte + inc de ; advance to next byte for next time this is called + ; update channeldata address + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + ld a, e + ld [hli], a + ld [hl], d + ; cleanup + pop de + pop hl + ; store channeldata in a + ld a, [CurMusicByte] + ret +; e8a5d + +GetFrequency: ; e8a5d +; generate frequency +; input: +; d: octave +; e: pitch +; output: +; de: frequency + +; get octave + ld a, [CurChannel] + cp 3 + jr nc, .added + ld a, [wTranspositionInterval] + bit 7, a + jr nz, .negative +.positive + add e + ld e, a + cp 13 + jr c, .added + sub 12 + ld e, a + dec d + jr .added +.negative + dec e + add e + jr c, .c + inc a + add 12 + ld e, a + inc d + jr .added +.c + inc a + ld e, a +.added + + ; get starting octave + ld hl, Channel1StartingOctave - Channel1 + add hl, bc + ld a, [hl] + swap a ; hi nybble + and a, $0f + ; add current octave + add d + push af ; we'll use this later + ; get starting octave + ld hl, Channel1StartingOctave - Channel1 + add hl, bc + ld a, [hl] + and a, $0f ; lo nybble + ; + ld l, a ; ok + ld d, $00 + ld h, d + add hl, de ; add current pitch + add hl, hl ; skip 2 bytes for each + ld de, FrequencyTable + add hl, de + ld e, [hl] + inc hl + ld d, [hl] + ; get our octave + pop af +.loop + ; [7 - octave] loops + cp a, $07 + jr nc, .ok + ; sra de + sra d + rr e + inc a + jr .loop +.ok + ld a, d + and a, $07 ; top 3 bits for frequency (11 total) + ld d, a + ret +; e8a8d + +SetNoteDuration: ; e8a8d +; input: a = note duration in 16ths + ; store delay units in de + inc a + ld e, a + ld d, $00 + ; store NoteLength in a + ld hl, Channel1NoteLength - Channel1 + add hl, bc + ld a, [hl] + ; multiply NoteLength by delay units + ld l, $00 ; just multiply + call MultiplySimple + ld a, l ; % $100 + ; store Tempo in de + ld hl, Channel1Tempo - Channel1 + add hl, bc + ld e, [hl] + inc hl + ld d, [hl] + ; add ???? to the next result + ld hl, $0016 + add hl, bc + ld l, [hl] + ; multiply Tempo by last result (NoteLength * delay % $100) + call MultiplySimple + ; copy result to de + ld e, l + ld d, h + ; store result in ???? + ld hl, $0016 + add hl, bc + ld [hl], e + ; store result in NoteDuration + ld hl, Channel1NoteDuration - Channel1 + add hl, bc + ld [hl], d + ret +; e8ab8 + +MultiplySimple: ; e8ab8 +; multiplies a and de +; adds the result to l +; stores the result in hl + ld h, $00 +.loop + ; halve a + srl a + ; is there a remainder? + jr nc, .skip + ; add it to the result + add hl, de +.skip + ; add de, de + sla e + rl d + ; are we done? + and a + jr nz, .loop + ret +; e8ac7 + +SetGlobalTempo: ; e8ac7 + push bc ; save current channel + ; are we dealing with music or sfx? + ld a, [CurChannel] + cp a, $04 + jr nc, .sfxchannels + ld bc, Channel1 + call SetTempo + ld bc, Channel2 + call SetTempo + ld bc, Channel3 + call SetTempo + ld bc, Channel4 + call SetTempo + jr .end +.sfxchannels + ld bc, Channel5 + call SetTempo + ld bc, Channel6 + call SetTempo + ld bc, Channel7 + call SetTempo + ld bc, Channel8 + call SetTempo +.end + pop bc ; restore current channel + ret +; e8b03 + +SetTempo: ; e8b03 +; input: +; de: note length + ; update Tempo + ld hl, Channel1Tempo - Channel1 + add hl, bc + ld [hl], e + inc hl + ld [hl], d + ; clear ???? + xor a + ld hl, $0016 + add hl, bc + ld [hl], a + ret +; e8b11 + +StartChannel: ; e8b11 + call SetLRTracks + ld hl, Channel1Flags - Channel1 + add hl, bc + set 0, [hl] ; turn channel on + ret +; e8b1b + +SetLRTracks: ; e8b1b +; set tracks for a the current channel to default +; seems to be redundant since this is overwritten by stereo data later + push de + ; store current channel in de + ld a, [CurChannel] + and a, $03 + ld e, a + ld d, $00 + ; get this channel's lr tracks + call GetLRTracks + add hl, de ; de = channel 0-3 + ld a, [hl] + ; load lr tracks into Tracks + ld hl, Channel1Tracks - Channel1 + add hl, bc + ld [hl], a + pop de + ret +; e8b30 + +SongTranspositions: + ds 46 + +_PlayMusic:: ; e8b30 + call OpenSRAMForSound + ld a, e + and a + jp z, _SoundRestart +; load music + call MusicOff + ld hl, MusicID + ld [hl], e ; song number + inc hl + ld [hl], d ; MusicIDHi (always $00) + + ld hl, SongTranspositions + add hl, de + ld a, [hl] + ld [wTranspositionInterval], a + + ld a, [GBPrinter] + bit 1, a + jr nz, .MTMusic + bit 0, a + jr nz, .AltMusic + ld hl, Music +.ContinueMusic + add hl, de ; three + add hl, de ; byte + add hl, de ; pointer + ld a, [hli] + ld [MusicBank], a + ld e, [hl] + inc hl + ld d, [hl] ; music header address + + ; pre-emptively disable all channels. for some reason, this + ; does not happen. + xor a + ld [Channel1+3], a + ld [Channel2+3], a + ld [Channel3+3], a + ld [Channel4+3], a + + call LoadMusicByte ; store first byte of music header in a + rlca + rlca + and a, $03 ; get number of channels + inc a +.loop +; start playing channels + push af + call LoadChannel + call StartChannel + pop af + dec a + jr nz, .loop + xor a + ld [Crysaudio+$1b5], a + ld [Crysaudio+$1b8], a + ld [Crysaudio+$1b9], a + ld [Crysaudio+$1ba], a + ld [Crysaudio+$1bb], a + ld [NoiseSampleAddressLo], a + ld [NoiseSampleAddressHi], a + ld [Crysaudio+$1a2], a + ld [MusicNoiseSampleSet], a + call MusicOn + ret +; e8b79 + +.AltMusic + ld hl, Music2 + jr .ContinueMusic +.MTMusic + ld hl, MusicMT + jr .ContinueMusic +PlayCry_:: ; e8b79 +; Play cry de using parameters: +; CryPitch +; CryEcho +; CryLength + call MusicOff + +; Overload the music id with the cry id + ld hl, MusicID + ld [hl], e + inc hl + ld [hl], d + +; 3-byte pointers (bank, address) + ld hl, Cries + add hl, de + add hl, de + add hl, de + + ld a, [hli] + ld [MusicBank], a + + ld e, [hl] + inc hl + ld d, [hl] + +; Read the cry's sound header + call LoadMusicByte + ; Top 2 bits contain the number of channels + rlca + rlca + and a, 3 + +; For each channel: + inc a +.loop + push af + call LoadChannel + + ld hl, Channel1Flags - Channel1 + add hl, bc + set 5, [hl] + + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 4, [hl] + + ld hl, Channel1CryPitch - Channel1 + add hl, bc + ld a, [CryPitch] + ld [hli], a + ld a, [CryEcho] + ld [hl], a + +; No tempo for channel 4 + ld a, [CurChannel] + and a, 3 + cp 3 + jr nc, .start + +; Tempo is effectively length + ld hl, Channel1Tempo - Channel1 + add hl, bc + ld a, [CryLength] + ld [hli], a + ld a, [CryLength+1] + ld [hl], a +.start + call StartChannel + ld a, [Crysaudio+$1bc] + and a + jr z, .next + +; Stereo only: Play cry from the monster's side. +; This only applies in-battle. + + ld a, [Options] + bit 5, a ; stereo + jr z, .next + +; [Tracks] &= [CryTracks] + ld hl, Channel1Tracks - Channel1 + add hl, bc + ld a, [hl] + ld hl, CryTracks + and a, [hl] + ld hl, Channel1Tracks - Channel1 + add hl, bc + ld [hl], a + +.next + pop af + dec a + jr nz, .loop + + +; Cries play at max volume, so we save the current volume for later. + ld a, [LastVolume] + and a + jr nz, .end + + ld a, [Volume] + ld [LastVolume], a + ld a, $77 + ld [Volume], a + +.end + ld a, 1 ; stop playing music + ld [SFXPriority], a + call MusicOn + ret +; e8c04 + +_PlaySFX:: ; e8c04 +; clear channels if they aren't already + call MusicOff + ld hl, Crysaudio+$cc ; Channel5Flags + bit 0, [hl] ; ch5 on? + jr z, .ch6 + res 0, [hl] ; turn it off + xor a + ld [rNR11], a ; length/wavepattern = 0 + ld a, $08 + ld [rNR12], a ; envelope = 0 + xor a + ld [rNR13], a ; frequency lo = 0 + ld a, $80 + ld [rNR14], a ; restart sound (freq hi = 0) + xor a + ld [SoundInput], a ; global sound off + ld [rNR10], a ; sweep = 0 +.ch6 + ld hl, Crysaudio+$fe ; ch6 on? + bit 0, [hl] + jr z, .ch7 + res 0, [hl] ; turn it off + xor a + ld [rNR21], a ; length/wavepattern = 0 + ld a, $08 + ld [rNR22], a ; envelope = 0 + xor a + ld [rNR23], a ; frequency lo = 0 + ld a, $80 + ld [rNR24], a ; restart sound (freq hi = 0) +.ch7 + ld hl, Crysaudio+$130 ; ch7 on? + bit 0, [hl] + jr z, .ch8 + res 0, [hl] ; turn it off + xor a + ld [rNR30], a ; sound mode #3 off + ld [rNR31], a ; length/wavepattern = 0 + ld a, $08 + ld [rNR32], a ; envelope = 0 + xor a + ld [rNR33], a ; frequency lo = 0 + ld a, $80 + ld [rNR34], a ; restart sound (freq hi = 0) +.ch8 + ld hl, Crysaudio+$162 ; ch8 on? + bit 0, [hl] + jr z, .chscleared + res 0, [hl] ; turn it off + xor a + ld [rNR41], a ; length/wavepattern = 0 + ld a, $08 + ld [rNR42], a ; envelope = 0 + xor a + ld [rNR43], a ; frequency lo = 0 + ld a, $80 + ld [rNR44], a ; restart sound (freq hi = 0) + xor a + ld [NoiseSampleAddressLo], a + ld [NoiseSampleAddressHi], a +.chscleared +; start reading sfx header for # chs + ld hl, MusicID + ld [hl], e + inc hl + ld [hl], d + ld hl, SFX + add hl, de ; three + add hl, de ; byte + add hl, de ; pointers + ; get bank + ld a, [hli] + ld [MusicBank], a + ; get address + ld e, [hl] + inc hl + ld d, [hl] + ; get # channels + call LoadMusicByte + rlca ; top 2 + rlca ; bits + and a, $03 + inc a ; # channels -> # loops +.startchannels + push af + call LoadChannel ; bc = current channel + ld hl, Channel1Flags - Channel1 + add hl, bc + set 3, [hl] + call StartChannel + pop af + dec a + jr nz, .startchannels + call MusicOn + xor a + ld [SFXPriority], a + ret +; e8ca6 + + +PlayStereoSFX:: ; e8ca6 +; play sfx de + + call MusicOff + +; standard procedure if stereo's off + ld a, [Options] + bit 5, a + jp z, _PlaySFX + +; else, let's go ahead with this + ld hl, MusicID + ld [hl], e + inc hl + ld [hl], d + +; get sfx ptr + ld hl, SFX + add hl, de + add hl, de + add hl, de + +; bank + ld a, [hli] + ld [MusicBank], a +; address + ld e, [hl] + inc hl + ld d, [hl] + +; bit 2-3 + call LoadMusicByte + rlca + rlca + and 3 ; ch1-4 + inc a + +.loop + push af + call LoadChannel + + ld hl, Channel1Flags - Channel1 + add hl, bc + set 3, [hl] + + push de + ; get tracks for this channel + ld a, [CurChannel] + and 3 ; ch1-4 + ld e, a + ld d, $0 + call GetLRTracks + add hl, de + ld a, [hl] + ld hl, Crysaudio+$1bc + and [hl] + + ld hl, Channel1Tracks - Channel1 + add hl, bc + ld [hl], a + + ld hl, $0030 ; Crysaudio+$31 - Channel1 + add hl, bc + ld [hl], a + + ld a, [CryTracks] + cp 2 ; ch 1-2 + jr c, .asm_e8d0c + +; ch3-4 + ld a, [Crysaudio+$1be] + + ld hl, $002e ; Crysaudio+$2f - Channel1 + add hl, bc + ld [hl], a + + ld hl, $002f ; Crysaudio+$30 - Channel1 + add hl, bc + ld [hl], a + + ld hl, Channel1Flags2 - Channel1 + add hl, bc + set 7, [hl] + +.asm_e8d0c + pop de + +; turn channel on + ld hl, Channel1Flags - Channel1 + add hl, bc + set 0, [hl] ; on + +; done? + pop af + dec a + jr nz, .loop + +; we're done + call MusicOn + ret +; e8d1b + + +LoadChannel: ; e8d1b +; prep channel for use +; input: +; de: + ; get pointer to current channel + call LoadMusicByte + inc de + and a, $07 ; bit 0-2 (current channel) + ld [CurChannel], a + ld c, a + ld b, $00 + ld hl, ChannelPointers + add hl, bc + add hl, bc + ld c, [hl] + inc hl + ld b, [hl] ; bc = channel pointer + ld hl, Channel1Flags - Channel1 + add hl, bc + res 0, [hl] ; channel off + call ChannelInit + ; load music pointer + ld hl, Channel1MusicAddress - Channel1 + add hl, bc + call LoadMusicByte + ld [hli], a + inc de + call LoadMusicByte + ld [hl], a + inc de + ; load music id + ld hl, Channel1MusicID - Channel1 + add hl, bc + ld a, [MusicIDLo] + ld [hli], a + ld a, [MusicIDHi] + ld [hl], a + ; load music bank + ld hl, Channel1MusicBank - Channel1 + add hl, bc + ld a, [MusicBank] + ld [hl], a + ret +; e8d5b + +ChannelInit: ; e8d5b +; make sure channel is cleared +; set default tempo and note length in case nothing is loaded +; input: +; bc = channel struct pointer + push de + xor a + ; get channel struct location and length + ld hl, Channel1MusicID - Channel1 ; start + add hl, bc + ld e, Channel2 - Channel1 ; channel struct length + ; clear channel +.loop + ld [hli], a + dec e + jr nz, .loop + ; set tempo to default ($100) + ld hl, Channel1Tempo - Channel1 + add hl, bc + xor a + ld [hli], a + inc a + ld [hl], a + ; set note length to default ($01) (fast) + ld hl, Channel1NoteLength - Channel1 + add hl, bc + ld [hl], a + pop de + ret +; e8d76 + +LoadMusicByte:: ; e8d76 +; input: +; de = current music address +; output: +; a = CurMusicByte + ld a, [MusicBank] + call _LoadMusicByte + ld a, [CurMusicByte] + ret +; e8d80 + +FrequencyTable: ; e8d80 + dw $0000 ; filler + dw $f82c + dw $f89d + dw $f907 + dw $f96b + dw $f9ca + dw $fa23 + dw $fa77 + dw $fac7 + dw $fb12 + dw $fb58 + dw $fb9b + dw $fbda + dw $fc16 + dw $fc4e + dw $fc83 + dw $fcb5 + dw $fce5 + dw $fd11 + dw $fd3b + dw $fd63 + dw $fd89 + dw $fdac + dw $fdcd + dw $fded +; e8db2 + +WaveSamples: ; e8db2 + ; these are streams of 32 4-bit values used as wavepatterns + ; nothing interesting here! + db $02, $46, $8a, $ce, $ff, $fe, $ed, $dc, $cb, $a9, $87, $65, $44, $33, $22, $11 + db $02, $46, $8a, $ce, $ef, $ff, $fe, $ee, $dd, $cb, $a9, $87, $65, $43, $22, $11 + db $13, $69, $bd, $ee, $ee, $ff, $ff, $ed, $de, $ff, $ff, $ee, $ee, $db, $96, $31 + db $02, $46, $8a, $cd, $ef, $fe, $de, $ff, $ee, $dc, $ba, $98, $76, $54, $32, $10 + db $01, $23, $45, $67, $8a, $cd, $ee, $f7, $7f, $ee, $dc, $a8, $76, $54, $32, $10 + db $00, $11, $22, $33, $44, $33, $22, $11, $ff, $ee, $cc, $aa, $88, $aa, $cc, $ee + db $02, $46, $8a, $ce, $cb, $a9, $87, $65, $ff, $fe, $ed, $dc, $44, $33, $22, $11 + db $c0, $a9, $87, $f5, $ff, $fe, $ed, $dc, $44, $33, $22, $f1, $02, $46, $8a, $ce + db $44, $33, $22, $1f, $00, $46, $8a, $ce, $f8, $fe, $ed, $dc, $cb, $a9, $87, $65 + db $11, $00, $00, $08, $00, $13, $57, $9a, $b4, $ba, $a9, $98, $87, $65, $43, $21 + db $79, $bd, $ff, $ff, $ff, $ff, $fd, $b9, $75, $31, $00, $00, $00, $00, $01, $35 + db $01, $12, $23, $34, $45, $56, $67, $77, $88, $99, $aa, $bb, $cc, $dd, $ee, $ff + db $46, $8a, $cc, $cc, $cc, $cc, $ca, $86, $42, $11, $00, $00, $00, $00, $01, $12 + db $7a, $df, $ff, $da, $74, $10, $00, $14, $7a, $df, $ff, $da, $74, $10, $00, $14 + db $ee, $ee, $ee, $ee, $ee, $ee, $ee, $ee, $00, $00, $00, $00, $00, $00, $00, $00 + db $ee, $ee, $ee, $ee, $ee, $ee, $ed, $cb, $21, $00, $00, $00, $00, $00, $00, $00 +; e8e52 + +NoiseSampleSetsPointers: ; e8e52 + dw NoiseSampleSets0 + dw NoiseSampleSets1 + dw NoiseSampleSets2 + dw NoiseSampleSets3 + dw NoiseSampleSets4 + dw NoiseSampleSets5 + dw NoiseSampleSets6 +; e8e5e + +NoiseSampleSets: +NoiseSampleSets0: ; e8e5e + dw NoiseSampleSet00 ; rest + dw NoiseSampleSet01 ; c + dw NoiseSampleSet02 ; c# + dw NoiseSampleSet03 ; d + dw NoiseSampleSet04 ; d# + dw NoiseSampleSet05 ; e + dw NoiseSampleSet06 ; f + dw NoiseSampleSet07 ; f# + dw NoiseSampleSet08 ; g + dw NoiseSampleSet09 ; g# + dw NoiseSampleSet10 ; a + dw NoiseSampleSet11 ; a# + dw NoiseSampleSet12 ; b +NoiseSampleSets1: ; e8e78 + dw NoiseSampleSet00 + dw NoiseSampleSet08 + dw NoiseSampleSet09 + dw NoiseSampleSet10 + dw NoiseSampleSet11 + dw NoiseSampleSet12 + dw NoiseSampleSet13 + dw NoiseSampleSet14 + dw NoiseSampleSet15 + dw NoiseSampleSet16 + dw NoiseSampleSet17 + dw NoiseSampleSet18 + dw NoiseSampleSet19 +NoiseSampleSets2: ; e8e92 + dw NoiseSampleSet00 + dw NoiseSampleSet01 + dw NoiseSampleSet17 + dw NoiseSampleSet18 + dw NoiseSampleSet19 + dw NoiseSampleSet05 + dw NoiseSampleSet06 + dw NoiseSampleSet07 + dw NoiseSampleSet08 + dw NoiseSampleSet09 + dw NoiseSampleSet10 + dw NoiseSampleSet11 + dw NoiseSampleSet12 +NoiseSampleSets3: ; e8eac + dw NoiseSampleSet21 + dw NoiseSampleSet22 + dw NoiseSampleSet23 + dw NoiseSampleSet24 + dw NoiseSampleSet25 + dw NoiseSampleSet26 + dw NoiseSampleSet20 + dw NoiseSampleSet27 + dw NoiseSampleSet28 + dw NoiseSampleSet29 + dw NoiseSampleSet21 + dw NoiseSampleSet37 + dw NoiseSampleSet34 +NoiseSampleSets4: ; e8ec6 + dw NoiseSampleSet21 + dw NoiseSampleSet20 + dw NoiseSampleSet23 + dw NoiseSampleSet24 + dw NoiseSampleSet25 + dw NoiseSampleSet33 + dw NoiseSampleSet26 + dw NoiseSampleSet35 + dw NoiseSampleSet31 + dw NoiseSampleSet32 + dw NoiseSampleSet36 + dw NoiseSampleSet37 + dw NoiseSampleSet30 +NoiseSampleSets5: ; e8ee0 + dw NoiseSampleSet00 + dw NoiseSampleSet17 + dw NoiseSampleSet18 + dw NoiseSampleSet19 + dw NoiseSampleSet27 + dw NoiseSampleSet28 + dw NoiseSampleSet29 + dw NoiseSampleSet05 + dw NoiseSampleSet06 + dw NoiseSampleSet30 + dw NoiseSampleSet24 + dw NoiseSampleSet23 + dw NoiseSampleSet37 +NoiseSampleSets6: + dw NoiseSampleSet00 + dw NoiseSampleSet37 + dw NoiseSampleSet17 + dw NoiseSampleSet18 + dw NoiseSampleSet19 + dw NoiseSampleSet34 + dw NoiseSampleSet30 + dw NoiseSampleSet17 + dw NoiseSampleSet17 + dw NoiseSampleSet17 + dw NoiseSampleSet17 + dw NoiseSampleSet17 +; e8efa + +NoiseSampleSet00: ; e8efa +; unused + db $20, $11, $00 + db $ff ; end +; e8efe + +NoiseSampleSet01: ; e8efe + db $20, $c1, $33 + db $ff ; end +; e8f02 + +NoiseSampleSet02: ; e8f02 + db $20, $b1, $33 + db $ff ; end +; e8f06 + +NoiseSampleSet03: ; e8f06 + db $20, $a1, $33 + db $ff ; end +; e8f0a + +NoiseSampleSet04: ; e8f0a + db $20, $81, $33 + db $ff ; end +; e8f0e + +NoiseSampleSet05: ; e8f0e + db $27, $84, $37 + db $26, $84, $36 + db $25, $83, $35 + db $24, $83, $34 + db $23, $82, $33 + db $22, $81, $32 + db $ff ; end +; e8f21 + +NoiseSampleSet06: ; e8f21 + db $20, $51, $2a + db $ff ; end +; e8f25 + +NoiseSampleSet07: ; e8f25 + db $21, $41, $2b + db $20, $61, $2a + db $ff ; end +; e8f2c + +NoiseSampleSet08: ; e8f2c + db $20, $81, $10 + db $ff ; end +; e8f30 + +NoiseSampleSet09: ; e8f30 + db $20, $82, $23 + db $ff ; end +; e8f34 + +NoiseSampleSet10: ; e8f34 + db $20, $82, $25 + db $ff ; end +; e8f38 + +NoiseSampleSet11: ; e8f38 + db $20, $82, $26 + db $ff ; end +; e8f3c + +NoiseSampleSet12: ; e8f3c + db $20, $a1, $10 + db $ff ; end +; e8f40 + +NoiseSampleSet13: ; e8f40 + db $20, $a2, $11 + db $ff ; end +; e8f44 + +NoiseSampleSet14: ; e8f44 + db $20, $a2, $50 + db $ff ; end +; e8f48 + +NoiseSampleSet15: ; e8f48 + db $20, $a1, $18 + db $20, $31, $33 + db $ff ; end +; e8f4f + +NoiseSampleSet16: ; e8f4f + db $22, $91, $28 + db $20, $71, $18 + db $ff ; end +; e8f56 + +NoiseSampleSet17: ; e8f56 + db $20, $91, $22 + db $ff ; end +; e8f5a + +NoiseSampleSet18: ; e8f5a + db $20, $71, $22 + db $ff ; end +; e8f5e + +NoiseSampleSet19: ; e8f5e + db $20, $61, $22 + db $ff ; end +; e8f62 + +NoiseSampleSet20: ; e8f62 + db $20, $11, $11 + db $ff ; end +; e8f66 + +NoiseSampleSet21: ; e8f66 + db $ff +; e8f67 + +NoiseSampleSet22: ; e8f67 + db $20, $91, $33 + db $ff ; end +; e8f6b + +NoiseSampleSet23: ; e8f6b + db $20, $51, $32 + db $ff ; end +; e8f6f + +NoiseSampleSet24: ; e8f6f + db $20, $81, $31 + db $ff ; end +; e8f73 + +NoiseSampleSet25: ; e8f73 + db $20, $88, $6b + db $20, $71, $00 + db $ff ; end +; e8f7a + +NoiseSampleSet26: ; e8f7a + db $30, $91, $18 + db $ff ; end +; e8f7e + +NoiseSampleSet27: ; e8f7e + db $27, $92, $10 + db $ff ; end +; e8f82 + +NoiseSampleSet28: ; e8f82 + db $33, $91, $00 + db $33, $11, $00 + db $ff ; end +; e8f89 + +NoiseSampleSet29: ; e8f89 + db $33, $91, $11 + db $33, $11, $00 + db $ff ; end +; e8f90 + +NoiseSampleSet30: ; e8f90 + db $33, $88, $15 + db $20, $65, $12 + db $ff ; end +; e8f97 + +NoiseSampleSet31: ; e8f97 + db $33, $51, $21 + db $33, $11, $11 + db $ff ; end +; e8f9e + +NoiseSampleSet32: ; e8f9e + db $33, $51, $50 + db $33, $11, $11 + db $ff ; end +; e8fa5 + +NoiseSampleSet33: ; e8fa5 + db $20, $a1, $31 + db $ff ; end +; e8fa9 + +NoiseSampleSet34: ; e8fa9 + db $20, $84, $12 + db $ff ; end +; e8fad + +NoiseSampleSet35: ; e8fad + db $33, $81, $00 + db $33, $11, $00 + db $ff ; end +; e8fb4 + +NoiseSampleSet36: ; e8fb4 + db $33, $81, $21 + db $33, $11, $11 + db $ff ; end +; e8fbb + +NoiseSampleSet37: ; e8fbb + db $20, $a8, $6b + db $20, $71, $00 + db $ff ; end +; e8fc2 + +GetLRTracks: ; e8fc2 +; gets the default sound l/r channels +; stores mono/stereo table in hl + ld a, [Options] + bit 5, a ; stereo + ; made redundant, could have had a purpose in gold + jr nz, .stereo + ld hl, MonoTracks + ret +.stereo + ld hl, StereoTracks + ret +; e8fd1 + +MonoTracks: ; e8fd1 +; bit corresponds to track # +; hi: left channel +; lo: right channel + db $11, $22, $44, $88 +; e8fd5 + +StereoTracks: ; e8fd5 +; made redundant +; seems to be modified on a per-song basis + db $11, $22, $44, $88 +; e8fd9 + +ChannelPointers: ; e8fd9 +; music channels + dw Channel1 + dw Channel2 + dw Channel3 + dw Channel4 +; sfx channels + dw Channel5 + dw Channel6 + dw Channel7 + dw Channel8 +; e8fe9 + +ClearChannels:: ; e8fe9 +; runs ClearChannel for all 4 channels +; doesn't seem to be used, but functionally identical to SoundRestart + ld hl, rNR50 + xor a + ld [hli], a + ld [hli], a + ld a, $80 + ld [hli], a + ld hl, rNR10 + ld e, $04 +.loop + call ClearChannel + dec e + jr nz, .loop + ret +; e8ffe + +ClearChannel: ; e8ffe +; input: hl = beginning hw sound register (rNR10, $ff15, rNR30, $ff1f) +; output: 00 00 80 00 80 + +; sound channel 1 2 3 4 + xor a + ld [hli], a ; rNR10, $ff15, rNR30, $ff1f ; sweep = 0 + + ld [hli], a ; rNR11, rNR21, rNR31, rNR41 ; length/wavepattern = 0 + ld a, $08 + ld [hli], a ; rNR12, rNR22, rNR32, rNR42 ; envelope = 0 + xor a + ld [hli], a ; rNR13, rNR23, rNR33, rNR43 ; frequency lo = 0 + ld a, $80 + ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0) + ret +; e900a diff --git a/crysaudio/music/DPPt/EternaForest.asm b/crysaudio/music/DPPt/EternaForest.asm new file mode 100644 index 00000000..06956aec --- /dev/null +++ b/crysaudio/music/DPPt/EternaForest.asm @@ -0,0 +1,979 @@ +Music_EternaForest:: + dbw $C0, Music_EternaForest_Ch1 + dbw $01, Music_EternaForest_Ch2 + dbw $02, Music_EternaForest_Ch3 + dbw $03, Music_EternaForest_Ch4 + +Music_EternaForest_Ch1: + tempo $88 + volume $77 +Music_EternaForest_Ch1_loop: + notetype $C, $82 + dutycycle 0 + octave 5 + note __, 1 + note B_, 5 + intensity $72 + note B_, 6 + intensity $62 + note B_, 6 + intensity $52 + note B_, 6 + intensity $42 + note B_, 9 + intensity $82 + note B_, 5 + intensity $72 + note B_, 6 + intensity $62 + note B_, 6 + intensity $52 + note B_, 6 + intensity $42 + note B_, 7 + intensity $82 + octave 4 + note B_, 5 + intensity $72 + note B_, 6 + intensity $62 + note B_, 6 + intensity $52 + note B_, 6 + intensity $42 + note B_, 9 + intensity $82 + octave 5 + note F#, 5 + intensity $72 + note F#, 6 + intensity $62 + note F#, 6 + intensity $52 + note F#, 6 + intensity $42 + note F#, 9 + intensity $82 + octave 4 + note F#, 5 + intensity $72 + note F#, 6 + intensity $62 + note F#, 6 + intensity $82 + note D_, 6 + intensity $72 + note D_, 4 + intensity $82 + note C_, 16 + dutycycle 1 + note __, 16 + note __, 12 + octave 6 + note C_, 2 + octave 5 + note F#, 2 + octave 6 + note C_, 12 + octave 5 + note F#, 2 + note C_, 2 + note F#, 14 + octave 4 + note B_, 2 + octave 5 + note D_, 10 + octave 3 + note B_, 4 + note A_, 2 + note B_, 2 + octave 4 + note F#, 8 + octave 3 + note B_, 4 + note F#, 2 + octave 4 + note D_, 6 + octave 3 + note G_, 2 + octave 4 + note D_, 6 + octave 3 + note A_, 2 + octave 4 + note D_, 16 + note __, 16 + note __, 2 + octave 6 + note D_, 2 + octave 5 + note G_, 2 + notetype $F, $82 + note B_, 16 + notetype $C, $82 + octave 6 + note D_, 2 + octave 5 + note F#, 2 + notetype $F, $82 + note A_, 16 + notetype $C, $82 + octave 6 + note D_, 2 + octave 5 + note G_, 2 + note D_, 4 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + octave 3 + note A_, 2 + note B_, 2 + octave 4 + note F#, 8 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + octave 3 + note F#, 2 + octave 4 + note F#, 2 + octave 5 + note F#, 4 + octave 3 + note G_, 2 + octave 4 + note G_, 2 + octave 5 + note G_, 4 + octave 4 + note D_, 2 + octave 5 + note D_, 2 + octave 6 + note D_, 8 + octave 4 + note G_, 2 + octave 5 + note C_, 2 + note G_, 2 + octave 4 + note G_, 2 + octave 6 + note C_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note D_, 2 + octave 4 + note G_, 4 + octave 5 + note D_, 2 + note G_, 8 + octave 4 + note G_, 2 + note B_, 2 + octave 5 + note G_, 2 + octave 4 + note G_, 2 + octave 5 + note B_, 2 + octave 6 + note G_, 2 + note F#, 2 + note G_, 2 + note D_, 2 + octave 4 + note G_, 4 + octave 5 + note D_, 2 + note G_, 6 + note B_, 4 + note G_, 4 + note A_, 2 + note D_, 6 + octave 4 + note B_, 4 + note G_, 4 + note A_, 2 + octave 5 + note D_, 2 + note E_, 16 + note __, 6 + note F#, 4 + note G_, 2 + note F#, 4 + note D_, 16 + note __, 6 + note A_, 4 + note B_, 2 + note A_, 4 + note E_, 16 + note __, 16 + note __, 2 + octave 6 + note D_, 2 + note C_, 2 + octave 5 + note G_, 2 + note E_, 2 + note C_, 2 + octave 4 + note B_, 2 + note G_, 2 + note C_, 2 + octave 6 + note D#, 2 + note C_, 2 + octave 5 + note A_, 2 + note F#, 2 + note D#, 2 + note C_, 2 + octave 4 + note A_, 2 + note D#, 3 + dutycycle 0 + octave 5 + note B_, 5 + intensity $72 + note B_, 6 + intensity $62 + note B_, 6 + intensity $52 + note B_, 6 + intensity $42 + note B_, 9 + intensity $82 + note B_, 5 + intensity $72 + note B_, 6 + intensity $62 + note B_, 6 + intensity $52 + note B_, 6 + intensity $42 + note B_, 9 + intensity $82 + note B_, 5 + intensity $72 + note B_, 6 + intensity $62 + note B_, 6 + intensity $52 + note B_, 6 + intensity $42 + note B_, 9 + intensity $82 + note B_, 5 + intensity $72 + note B_, 6 + intensity $62 + note B_, 6 + intensity $52 + note B_, 6 + intensity $42 + note B_, 8 + loopchannel 0, Music_EternaForest_Ch1_loop + +Music_EternaForest_Ch2: +Music_EternaForest_Ch2_loop: + notetype $C, $92 + dutycycle 0 + octave 5 + note D_, 6 + intensity $82 + note D_, 6 + intensity $72 + note D_, 6 + intensity $62 + note D_, 6 + intensity $52 + note D_, 8 + intensity $92 + note E_, 6 + intensity $82 + note E_, 6 + intensity $72 + note E_, 6 + intensity $62 + note E_, 6 + intensity $52 + note E_, 6 + intensity $92 + octave 4 + note E_, 6 + intensity $82 + note E_, 6 + intensity $72 + note E_, 6 + intensity $62 + note E_, 6 + intensity $52 + note E_, 8 + intensity $92 + note B_, 6 + intensity $82 + note B_, 6 + intensity $72 + note B_, 6 + intensity $62 + note B_, 6 + intensity $52 + note B_, 8 + intensity $92 + octave 3 + note B_, 6 + intensity $82 + note B_, 6 + intensity $72 + note B_, 6 + intensity $62 + note G_, 6 + intensity $52 + note G_, 4 + intensity $92 + note F#, 6 + intensity $B6 + dutycycle 2 + octave 2 + note C_, 2 + note __, 4 + octave 1 + note C_, 2 + note __, 16 + note __, 8 + octave 2 + note C_, 2 + note __, 4 + octave 1 + note C_, 2 + note __, 16 + note __, 8 + note G_, 2 + note __, 4 + octave 1 + note G_, 2 + note __, 16 + note __, 16 + note __, 8 + octave 1 + note E_, 2 + note __, 6 + note D_, 2 + note __, 6 + octave 2 + note C_, 2 + note __, 4 + octave 1 + note C_, 2 + note __, 16 + note __, 8 + octave 2 + note C_, 2 + note __, 4 + octave 1 + note C_, 2 + note __, 16 + note __, 8 + note G_, 2 + note __, 4 + octave 1 + note G_, 2 + note __, 16 + note __, 16 + note __, 8 + octave 1 + note E_, 2 + note __, 6 + note D_, 2 + note __, 6 + octave 1 + note A_, 2 + note __, 4 + note A_, 2 + note __, 2 + note A_, 2 + note __, 1 + note A_, 2 + note __, 1 + note B_, 2 + note __, 4 + note B_, 2 + note __, 2 + note B_, 2 + note __, 1 + note B_, 2 + note __, 1 + octave 1 + note E_, 2 + note __, 4 + note E_, 2 + note __, 2 + note E_, 2 + note __, 1 + note E_, 2 + note __, 1 + note D_, 2 + note __, 4 + note D_, 2 + note __, 2 + note D_, 2 + note __, 1 + note D_, 2 + note __, 1 + octave 1 + note A_, 2 + note __, 6 + note B_, 2 + note __, 6 + note A_, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 1 + note C_, 2 + note D_, 2 + note __, 2 + note C_, 16 + note __, 16 + note __, 2 + octave 1 + note B_, 16 + note __, 16 + note __, 4 + octave 1 + note A_, 4 + octave 2 + note C_, 4 + octave 1 + note A_, 4 + note B_, 4 + octave 2 + note D_, 4 + note F#, 4 + note A_, 4 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 4 + octave 4 + note C_, 6 + octave 3 + note C_, 10 + intensity $92 + dutycycle 0 + octave 5 + note C_, 6 + intensity $82 + note C_, 6 + intensity $72 + note C_, 6 + intensity $62 + note C_, 6 + intensity $52 + note C_, 8 + intensity $92 + octave 4 + note G_, 6 + intensity $82 + note G_, 6 + intensity $72 + note G_, 6 + intensity $62 + note G_, 6 + intensity $52 + note G_, 8 + intensity $92 + octave 5 + note C_, 6 + intensity $82 + note C_, 6 + intensity $72 + note C_, 6 + intensity $62 + note C_, 6 + intensity $52 + note C_, 8 + intensity $92 + octave 4 + note G_, 6 + intensity $82 + note G_, 6 + intensity $72 + note G_, 6 + intensity $62 + note G_, 6 + intensity $52 + note G_, 8 + loopchannel 0, Music_EternaForest_Ch2_loop + +Music_EternaForest_Ch3: +Music_EternaForest_Ch3_loop: + notetype $C, $12 + vibrato $10, $14 + octave 7 + note __, 16 + note __, 16 + note __, 16 + octave 5 + note B_, 2 + octave 6 + note C_, 2 + note __, 2 + octave 5 + note B_, 2 + note A_, 2 + note B_, 2 + note __, 2 + octave 6 + note C_, 2 + octave 5 + note B_, 2 + note __, 2 + note F#, 2 + note G_, 2 + note __, 2 + note A_, 2 + note __, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note __, 2 + note A_, 2 + note G_, 2 + note __, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note __, 2 + note F#, 2 + note D_, 2 + note __, 2 + octave 4 + note B_, 2 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 2 + octave 5 + note B_, 2 + octave 6 + note C_, 2 + note __, 2 + octave 5 + note B_, 2 + note A_, 2 + note B_, 2 + note __, 2 + octave 6 + note C_, 2 + octave 5 + note B_, 2 + note __, 2 + note F#, 2 + note G_, 2 + note __, 2 + note A_, 2 + note __, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note __, 2 + note A_, 2 + note G_, 2 + note __, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note __, 2 + note F#, 2 + note D_, 2 + note __, 2 + octave 4 + note B_, 2 + note __, 16 + note __, 16 + note __, 16 + note __, 14 + octave 5 + note E_, 2 + note F#, 2 + note G_, 2 + note B_, 2 + note __, 2 + note A_, 2 + octave 6 + note D_, 2 + note C_, 2 + note __, 2 + octave 5 + note B_, 2 + note F#, 2 + note __, 2 + note G_, 2 + note A_, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 6 + note C_, 2 + octave 5 + note B_, 2 + octave 6 + note C_, 2 + note __, 2 + note D_, 2 + note __, 2 + note A_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note __, 2 + note D_, 2 + note __, 2 + octave 5 + note B_, 2 + note __, 16 + note __, 16 + note __, 16 + note __, 4 + octave 4 + note G_, 8 + octave 5 + note C_, 4 + octave 4 + note B_, 8 + octave 5 + note D_, 4 + note A_, 4 + note G_, 12 + octave 4 + note B_, 4 + octave 5 + note D_, 8 + note G_, 4 + note A_, 4 + note G_, 8 + note E_, 4 + note F#, 4 + note G_, 4 + note A_, 4 + note B_, 4 + octave 6 + note C_, 2 + note D_, 4 + note E_, 2 + notetype $8, $12 + note F#, 4 + note G_, 4 + note F#, 4 + note D_, 4 + octave 5 + note B_, 4 + octave 6 + note E_, 4 + notetype $C, $12 + octave 5 + note G_, 16 + notetype $8, $12 + note A_, 4 + note B_, 4 + note A_, 4 + note G_, 4 + note E_, 4 + note A_, 4 + notetype $C, $12 + note D_, 12 + note A_, 4 + note G_, 8 + note E_, 4 + note A_, 8 + note G_, 4 + note B_, 4 + note A_, 4 + octave 6 + note D_, 16 + note C_, 16 + note C_, 8 + octave 5 + note C_, 2 + octave 6 + note F#, 2 + note F#, 2 + octave 5 + note C_, 2 + octave 6 + note A_, 2 + note B_, 4 + note __, 16 + note __, 2 + octave 4 + note G_, 2 + octave 6 + note D_, 2 + note D_, 2 + octave 4 + note G_, 2 + octave 6 + note A_, 2 + note B_, 4 + note __, 16 + note __, 2 + octave 5 + note C_, 2 + octave 6 + note F#, 2 + note F#, 2 + octave 5 + note C_, 2 + octave 6 + note A_, 2 + note B_, 2 + octave 7 + note D_, 2 + note __, 16 + note __, 2 + octave 4 + note G_, 2 + octave 6 + note D_, 2 + note D_, 2 + octave 4 + note G_, 2 + octave 6 + note A_, 2 + note B_, 2 + octave 7 + note D_, 2 + note __, 10 + loopchannel 0, Music_EternaForest_Ch3_loop + +Music_EternaForest_Ch4: + togglenoise 4 +Music_EternaForest_Ch4_loop: + notetype $C + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note D#, 2 + note F#, 1 + note D#, 1 + note C_, 2 + note D#, 2 + note F#, 2 + note D#, 2 + note C_, 1 + note D#, 1 + note F#, 2 + note D#, 2 + note F#, 1 + note D#, 1 + note C_, 2 + note D#, 2 + note F#, 2 + note D#, 2 + note C_, 1 + note D#, 1 + note F#, 2 + note D#, 2 + note F#, 1 + note D#, 1 + note C_, 2 + note D#, 2 + note F#, 2 + note D#, 2 + note C_, 1 + note D#, 1 + note F#, 2 + note D#, 2 + note F#, 1 + note D#, 1 + note C_, 2 + note D#, 2 + note F#, 2 + note D#, 2 + note C_, 1 + note D#, 1 + note F#, 2 + note D#, 2 + note D#, 2 + note C_, 1 + note D#, 2 + note C_, 1 + note D#, 2 + note D#, 2 + note C_, 1 + note D#, 2 + note C_, 1 + note D#, 2 + note D#, 2 + note C_, 1 + note C_, 2 + note C_, 1 + note C_, 2 + note C_, 2 + note C_, 1 + note D#, 2 + note C_, 1 + note F#, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + loopchannel 0, Music_EternaForest_Ch4_loop diff --git a/crysaudio/music/DPPt/WinPokeSinnoh.asm b/crysaudio/music/DPPt/WinPokeSinnoh.asm new file mode 100644 index 00000000..2f9f8824 --- /dev/null +++ b/crysaudio/music/DPPt/WinPokeSinnoh.asm @@ -0,0 +1,289 @@ +Music_WinPokeSinnoh:: + dbw $80, Music_WinPokeSinnoh_Ch1 + dbw $01, Music_WinPokeSinnoh_Ch2 + dbw $02, Music_WinPokeSinnoh_Ch3 + +Music_WinPokeSinnoh_Ch1: + tempo $68 + volume $77 + notetype $C, $A2 + dutycycle 2 + octave 3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 2 + octave 4 + note D#, 2 + note E_, 2 + octave 3 + note G#, 2 + octave 4 + note E_, 4 +Music_WinPokeSinnoh_Ch1_loop: + octave 2 + note E_, 4 + octave 1 + note B_, 4 + octave 2 + note E_, 2 + note G#, 4 + note E_, 4 + note A_, 4 + note E_, 2 + note G#, 4 + note E_, 4 + note E_, 4 + octave 1 + note B_, 4 + octave 2 + note E_, 2 + note G#, 4 + note E_, 4 + note A_, 4 + note E_, 2 + note G#, 4 + note G_, 4 + note F_, 4 + note C_, 4 + note F_, 2 + note A_, 4 + note F_, 4 + note A#, 4 + note F_, 2 + note A_, 4 + note F_, 4 + note F_, 4 + note C_, 4 + note F_, 2 + note A_, 4 + note F_, 4 + note A#, 4 + note F_, 2 + note A_, 4 + note B_, 4 + loopchannel 0, Music_WinPokeSinnoh_Ch1_loop + +Music_WinPokeSinnoh_Ch2: + notetype $C, $B2 + dutycycle 2 + octave 4 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + intensity $B7 + note B_, 12 +Music_WinPokeSinnoh_Ch2_loop: + octave 4 + intensity $B2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 5 + note C#, 2 + note C#, 2 + note C#, 4 + octave 4 + note B_, 2 + note B_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 5 + note C#, 2 + note C#, 2 + note C#, 4 + octave 4 + note B_, 8 + octave 5 + note C_, 2 + octave 4 + note A#, 2 + note A_, 2 + note A#, 2 + octave 5 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 2 + note C_, 2 + note C_, 4 + note C_, 2 + octave 4 + note A#, 2 + note A_, 2 + note A#, 2 + octave 5 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 8 + loopchannel 0, Music_WinPokeSinnoh_Ch2_loop + +Music_WinPokeSinnoh_Ch3: + notetype $C, $12 + octave 5 + note __, 4 + notetype $9, $12 + note B_, 2 + notetype $6, $12 + note __, 1 + note G#, 3 + note __, 1 + note E_, 3 + note __, 1 + octave 4 + note B_, 3 + note __, 1 + octave 5 + note E_, 3 + note __, 1 + note G#, 3 + note __, 1 +Music_WinPokeSinnoh_Ch3_loop: + note G#, 3 + note __, 1 + note E_, 3 + note __, 1 + octave 4 + note B_, 3 + note __, 1 + octave 5 + note E_, 3 + note __, 1 + note G#, 3 + note __, 1 + octave 4 + note B_, 3 + note __, 1 + octave 5 + note E_, 3 + note __, 5 + note A_, 3 + note __, 1 + note C#, 3 + note __, 1 + note E_, 3 + note __, 5 + note G#, 3 + note __, 1 + octave 4 + note B_, 3 + note __, 1 + octave 5 + note E_, 3 + note __, 5 + note G#, 3 + note __, 1 + note E_, 3 + note __, 1 + octave 4 + note G#, 3 + note __, 1 + note B_, 3 + note __, 1 + octave 5 + note E_, 3 + note __, 1 + note G#, 3 + note __, 1 + octave 4 + note B_, 3 + note __, 5 + octave 5 + note E_, 3 + note __, 1 + note A_, 3 + note __, 1 + note C#, 3 + note __, 5 + note E_, 3 + note __, 1 + note D#, 3 + note __, 1 + note D_, 3 + note __, 1 + note C#, 3 + note __, 1 + note F_, 3 + note __, 1 + note C_, 3 + note __, 1 + octave 4 + note A_, 3 + note __, 1 + octave 5 + note C_, 3 + note __, 1 + note F_, 3 + note __, 1 + octave 4 + note A_, 3 + note __, 1 + octave 5 + note C_, 3 + note __, 5 + note F_, 3 + note __, 1 + octave 4 + note A#, 3 + note __, 1 + octave 5 + note D_, 3 + note __, 5 + note F_, 3 + note __, 1 + octave 4 + note A_, 3 + note __, 1 + octave 5 + note C_, 3 + note __, 5 + note F_, 3 + note __, 1 + note C_, 3 + note __, 1 + octave 4 + note A_, 3 + note __, 1 + octave 5 + note C_, 3 + note __, 1 + note F_, 3 + note __, 1 + note A_, 3 + note __, 1 + note C_, 3 + note __, 5 + note F_, 3 + note __, 1 + note A#, 3 + note __, 1 + note D_, 3 + note __, 5 + note F_, 3 + note __, 1 + note F_, 3 + note __, 1 + note F#, 3 + note __, 1 + note G_, 3 + note __, 1 + loopchannel 0, Music_WinPokeSinnoh_Ch3_loop diff --git a/crysaudio/music/DPPt/WinTrainerSinnoh.asm b/crysaudio/music/DPPt/WinTrainerSinnoh.asm new file mode 100644 index 00000000..f88eafa0 --- /dev/null +++ b/crysaudio/music/DPPt/WinTrainerSinnoh.asm @@ -0,0 +1,461 @@ +Music_WinTrainerSinnoh:: + dbw $80, Music_WinTrainerSinnoh_Ch1 + dbw $01, Music_WinTrainerSinnoh_Ch2 + dbw $02, Music_WinTrainerSinnoh_Ch3 + +Music_WinTrainerSinnoh_Ch1: + tempo $7C + volume $77 + notetype $C, $A2 + dutycycle 2 + octave 1 + note __, 12 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 +Music_WinTrainerSinnoh_Ch1_loop: + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 4 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + note D#, 1 + octave 1 + note D#, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 4 + note D#, 1 + octave 1 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 4 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 4 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 4 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 4 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 4 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 4 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 1 + octave 1 + note D#, 1 + loopchannel 0, Music_WinTrainerSinnoh_Ch1_loop + +Music_WinTrainerSinnoh_Ch2: + notetype $C, $B2 + dutycycle 1 + octave 4 + note __, 8 + octave 5 + note G_, 1 + octave 4 + note A#, 1 + note G_, 1 + note D#, 1 + note G_, 1 + note D#, 1 + octave 3 + note A#, 1 + note G_, 1 +Music_WinTrainerSinnoh_Ch2_loop: + intensity $97 + octave 3 + note A#, 7 + octave 4 + note G_, 1 + octave 3 + note A_, 7 + octave 4 + note A_, 1 + octave 3 + note A#, 7 + octave 4 + note A#, 1 + octave 3 + note G#, 7 + octave 4 + note G#, 1 + octave 3 + note G_, 1 + octave 4 + note G_, 1 + octave 3 + note G_, 5 + octave 4 + note G_, 1 + octave 3 + note A_, 1 + octave 4 + note A_, 1 + octave 3 + note A_, 5 + octave 4 + note A_, 1 + octave 3 + note A#, 1 + octave 4 + note A#, 1 + octave 3 + note A#, 5 + octave 4 + note A#, 1 + octave 3 + note F#, 1 + octave 4 + note F#, 1 + octave 3 + note F#, 5 + intensity $B1 + octave 5 + note F#, 1 + note G_, 1 + note G_, 1 + octave 4 + note A#, 1 + note A#, 1 + octave 5 + note D#, 1 + note D#, 1 + octave 4 + note A#, 1 + note A#, 1 + octave 5 + note G#, 1 + note G#, 1 + note C_, 1 + note C_, 1 + note F_, 1 + note F_, 1 + note C_, 1 + note C_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note C#, 1 + note F#, 1 + note F#, 1 + note C#, 1 + note C#, 1 + octave 6 + note C_, 1 + note C_, 1 + octave 5 + note D#, 1 + note D#, 1 + note G#, 1 + note G#, 1 + note D#, 1 + note D#, 1 + note A#, 1 + note A#, 1 + octave 4 + note A#, 1 + note A#, 1 + octave 5 + note D#, 1 + note D#, 1 + octave 4 + note D#, 1 + note D#, 1 + octave 5 + note G_, 1 + note G_, 1 + octave 4 + note A#, 1 + note A#, 1 + octave 5 + note D#, 1 + note D#, 1 + octave 4 + note D#, 1 + note D#, 1 + octave 5 + note G#, 1 + note G#, 1 + note C_, 1 + note C_, 1 + note F_, 1 + note F_, 1 + octave 4 + note G#, 1 + note G#, 1 + octave 5 + note D_, 1 + note D_, 1 + octave 4 + note D_, 1 + note D_, 1 + octave 5 + note G#, 1 + note G#, 1 + octave 4 + note G#, 1 + note G#, 1 + loopchannel 0, Music_WinTrainerSinnoh_Ch2_loop + +Music_WinTrainerSinnoh_Ch3: + notetype $C, $12 + vibrato $0E, $25 + octave 5 + note A#, 1 + notetype $4, $12 + note __, 1 + note A#, 3 + note __, 1 + note A#, 3 + note __, 1 + note A#, 3 + note __, 1 + octave 6 + note C_, 4 + note D_, 4 + notetype $C, $12 + note D#, 8 +Music_WinTrainerSinnoh_Ch3_loop: + octave 5 + note D#, 4 + octave 4 + note A#, 2 + octave 5 + note D#, 2 + note F_, 4 + note C_, 2 + note F_, 2 + note G_, 4 + note G#, 2 + note A#, 2 + note F_, 4 + note G_, 2 + note G#, 2 + note D#, 3 + octave 4 + note A#, 3 + octave 5 + note D#, 2 + note F_, 3 + note C_, 3 + note F_, 2 + note G_, 3 + note G#, 3 + note A#, 2 + note F#, 3 + note G#, 3 + note A#, 2 + note D#, 2 + octave 4 + note A#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F#, 2 + note C#, 2 + note F#, 2 + note C#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note G_, 16 + note F_, 16 + loopchannel 0, Music_WinTrainerSinnoh_Ch3_loop diff --git a/crysaudio/music/DPPt/frontierbrain.asm b/crysaudio/music/DPPt/frontierbrain.asm new file mode 100644 index 00000000..a993660d --- /dev/null +++ b/crysaudio/music/DPPt/frontierbrain.asm @@ -0,0 +1,2285 @@ +Music_FrontierBrain:: + dbw $80, Music_FrontierBrain_Ch1 + dbw $01, Music_FrontierBrain_Ch2 + dbw $02, Music_FrontierBrain_Ch3 + +Music_FrontierBrain_Ch1: + tempo $60 + volume $77 + notetype $C, $C2 + dutycycle 1 + tone $0002 + vibrato $06, $34 + note __, 4 + notetype $8, $C2 + octave 3 + note B_, 2 + octave 4 + note F_, 2 + note B_, 2 + octave 3 + note A#, 2 + octave 4 + note E_, 2 + note A#, 2 + octave 3 + note A_, 2 + octave 4 + note D#, 2 + note A_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + note G#, 2 + octave 3 + note G_, 2 + octave 4 + note C#, 2 + note G_, 2 + octave 3 + note F#, 2 + octave 4 + note C_, 2 + note F#, 2 + octave 3 + note F_, 2 + note B_, 2 + octave 4 + note F_, 2 +Music_FrontierBrain_Ch1_loop: + notetype $C, $C2 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note A_, 2 + octave 3 + note A_, 16 + note __, 16 + note __, 2 + notetype $8, $C1 + octave 4 + note A_, 2 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + notetype $C, $C1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + intensity $C2 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note A_, 2 + octave 3 + note A_, 16 + note __, 16 + note __, 2 + notetype $8, $C1 + octave 4 + note G#, 2 + note G#, 1 + note G#, 1 + note G#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + notetype $C, $C1 + note G#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + intensity $C2 + note B_, 2 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + octave 3 + note B_, 16 + note __, 16 + note __, 2 + notetype $8, $C2 + dutycycle 2 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A_, 1 + note B_, 1 + octave 5 + note C#, 1 + note D#, 1 + note F#, 1 + note A_, 1 + note B_, 1 + octave 6 + note C#, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note C#, 1 + octave 5 + note B_, 1 + note A_, 1 + note F#, 1 + note D#, 1 + note C#, 1 + octave 4 + note B_, 1 + note A_, 1 + note F#, 1 + note D#, 4 + intensity $C4 + dutycycle 1 + note E_, 9 + note E_, 9 + note E_, 6 + note E_, 9 + note E_, 6 + notetype $C, $C4 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 1 + octave 4 + note E_, 6 + note E_, 6 + note E_, 6 + note E_, 6 + note E_, 4 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note G#, 3 + octave 4 + note E_, 4 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + octave 3 + note B_, 2 + note G#, 2 + octave 4 + note E_, 4 + note G#, 2 + note E_, 2 + note B_, 2 + note G#, 2 + octave 5 + note E_, 2 + octave 4 + note B_, 2 + octave 5 + note G#, 2 + intensity $C2 + dutycycle 2 + octave 4 + note E_, 1 + note G_, 1 + note B_, 1 + octave 5 + note E_, 1 + note F#, 1 + note E_, 1 + octave 4 + note B_, 1 + note G_, 1 + note B_, 1 + note G_, 1 + note B_, 1 + octave 5 + note E_, 1 + note F#, 1 + note E_, 1 + octave 4 + note B_, 1 + note G_, 1 + note B_, 1 + note G_, 1 + note B_, 1 + octave 5 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + octave 4 + note B_, 1 + octave 5 + note E_, 1 + octave 4 + note B_, 1 + note G_, 1 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note G_, 1 + note E_, 1 + note G#, 1 + note B_, 1 + octave 5 + note E_, 1 + note F#, 1 + note E_, 1 + octave 4 + note B_, 1 + note G#, 1 + note E_, 1 + note G#, 1 + note B_, 1 + octave 5 + note E_, 1 + note F#, 1 + note E_, 1 + octave 4 + note B_, 1 + note G_, 1 + note E_, 1 + note G#, 1 + note B_, 1 + octave 5 + note E_, 1 + note G#, 1 + note B_, 1 + note G#, 1 + note E_, 1 + octave 4 + note B_, 1 + note G#, 1 + note E_, 1 + octave 5 + note E_, 1 + octave 4 + note B_, 1 + octave 5 + note E_, 1 + note F#, 1 + note G#, 1 + octave 6 + note C_, 1 + octave 5 + note A_, 1 + note G_, 1 + note E_, 1 + note C_, 1 + octave 4 + note A_, 1 + note G_, 1 + note E_, 1 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A_, 1 + note B_, 1 + octave 5 + note D#, 1 + octave 4 + note B_, 1 + note F#, 1 + note D#, 1 + note F#, 1 + note B_, 1 + octave 5 + note D#, 1 + note F#, 1 + note D#, 1 + octave 4 + note B_, 1 + note F#, 1 + note C#, 1 + note E_, 1 + note G_, 1 + note G#, 1 + octave 5 + note C#, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + octave 4 + note G#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 3 + note G#, 1 + note F#, 1 + note E_, 15 + intensity $C4 + dutycycle 1 + octave 2 + note A_, 1 + octave 3 + note C_, 1 + note C#, 6 + note C#, 6 + note C#, 6 + note C#, 6 + octave 2 + note B_, 4 + octave 3 + note D_, 4 + note C#, 6 + note C#, 6 + note C#, 6 + note C#, 6 + note D_, 4 + octave 2 + note B_, 4 + octave 3 + note C#, 6 + note C#, 6 + note C#, 6 + note C#, 6 + octave 2 + note B_, 4 + octave 3 + note D_, 4 + octave 2 + note B_, 6 + note B_, 6 + note B_, 6 + note F#, 6 + note B_, 4 + octave 3 + note D#, 4 + octave 2 + note B_, 6 + note B_, 6 + note B_, 4 + note B_, 6 + note B_, 6 + octave 3 + note C_, 4 + note C#, 6 + note C#, 6 + note C#, 6 + note C#, 6 + note D_, 4 + octave 2 + note B_, 4 + intensity $C2 + dutycycle 0 + octave 4 + note G#, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 2 + intensity $B7 + note A_, 4 + note G#, 4 + note G_, 2 + note C#, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note G_, 2 + note E_, 2 + octave 4 + note G_, 2 + note F#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note F_, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + notetype $8, $B7 + octave 4 + note G_, 2 + octave 3 + note B_, 2 + note G_, 2 + octave 4 + note F#, 2 + octave 3 + note A#, 2 + note F#, 2 + octave 4 + note F_, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note E_, 2 + octave 3 + note G#, 2 + note E_, 2 + notetype $C, $B7 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note D_, 3 + dutycycle 1 + octave 4 + note C_, 6 + note C_, 6 + note C_, 4 + note C_, 6 + note C_, 4 + octave 3 + note G_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + octave 4 + note C_, 6 + note C_, 6 + note C_, 6 + note C_, 6 + note C_, 4 + octave 3 + note G_, 1 + note A_, 1 + note G_, 1 + note E_, 3 + octave 4 + note C_, 4 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note E_, 2 + octave 4 + note C_, 4 + note E_, 2 + note C_, 2 + note G_, 2 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + octave 5 + note E_, 2 + intensity $C2 + dutycycle 2 + octave 4 + note C_, 1 + note D#, 1 + note G_, 1 + octave 5 + note C_, 1 + note D_, 1 + note C_, 1 + octave 4 + note G_, 1 + note D#, 1 + note G_, 1 + note D#, 1 + note G_, 1 + octave 5 + note C_, 1 + note D_, 1 + note C_, 1 + octave 4 + note G_, 1 + note D#, 1 + note G_, 1 + note D#, 1 + note G_, 1 + octave 5 + note C_, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + note D#, 1 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note D#, 1 + note C_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + note D_, 1 + note C_, 1 + octave 4 + note G_, 1 + note E_, 1 + note C_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + note D_, 1 + note C_, 1 + octave 4 + note G_, 1 + note D#, 1 + note C_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note C_, 1 + octave 4 + note G_, 1 + note E_, 1 + note C_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + note D_, 1 + note E_, 1 + note G#, 1 + note F_, 1 + note D#, 1 + note C_, 1 + octave 4 + note G#, 1 + note F_, 1 + note D#, 1 + note C_, 1 + octave 3 + note G#, 1 + note D#, 1 + note G#, 1 + octave 4 + note C_, 1 + note D#, 1 + note G#, 1 + note D#, 1 + note C_, 1 + octave 3 + note G_, 1 + note B_, 1 + octave 4 + note D_, 1 + note F_, 1 + note G_, 1 + note B_, 1 + note G_, 1 + note D_, 1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + note G_, 1 + note B_, 1 + octave 5 + note D_, 1 + octave 4 + note B_, 1 + note G_, 1 + note D_, 16 + note __, 9 + notetype $8, $C7 + dutycycle 1 + octave 3 + note A_, 2 + notetype $A, $00 + note __, 2 + notetype $8, $C7 + note F_, 1 + notetype $4, $00 + note __, 1 + notetype $C, $C7 + octave 4 + note C_, 12 + note D_, 4 + note F_, 1 + note G_, 1 + note F_, 1 + note D_, 1 + octave 3 + note B_, 8 + note G_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 10 + notetype $8, $C7 + note G_, 1 + notetype $4, $00 + note __, 1 + intensity $C7 + note G_, 2 + note __, 1 + notetype $C, $C7 + note G_, 16 + notetype $8, $C7 + note B_, 2 + notetype $A, $00 + note __, 2 + notetype $8, $C7 + note G_, 1 + notetype $4, $00 + note __, 1 + notetype $C, $C7 + octave 4 + note D_, 12 + note D#, 8 + note E_, 12 + dutycycle 2 + note C#, 1 + notetype $4, $00 + note __, 1 + intensity $C7 + note C#, 3 + note __, 1 + note C#, 3 + note __, 1 + note C#, 16 + octave 3 + note B_, 3 + note __, 1 + note B_, 3 + note __, 1 + notetype $C, $C7 + note B_, 8 + notetype $8, $C7 + dutycycle 1 + note F_, 2 + notetype $A, $00 + note __, 2 + notetype $8, $C7 + note C_, 1 + notetype $4, $00 + note __, 1 + intensity $C7 + note A_, 12 + octave 4 + note C_, 4 + note __, 5 + octave 3 + note A_, 2 + note __, 1 + octave 4 + note F_, 16 + note __, 16 + note __, 16 + note __, 6 + note C_, 6 + octave 3 + note F#, 4 + note __, 5 + note C_, 2 + note __, 1 + note A_, 12 + octave 4 + note C_, 4 + note __, 5 + octave 3 + note A_, 2 + note __, 1 + notetype $C, $C7 + octave 4 + note F#, 12 + octave 5 + note C_, 8 + notetype $8, $C2 + octave 3 + note B_, 2 + octave 4 + note F_, 2 + note B_, 2 + octave 3 + note A#, 2 + octave 4 + note E_, 2 + note A#, 2 + octave 3 + note A_, 2 + octave 4 + note D#, 2 + note A_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + note G#, 2 + octave 3 + note G_, 2 + octave 4 + note C#, 2 + note G_, 2 + octave 3 + note F#, 2 + octave 4 + note C_, 2 + note F#, 2 + octave 3 + note F_, 2 + note B_, 2 + octave 4 + note F_, 2 + loopchannel 0, Music_FrontierBrain_Ch1_loop + +Music_FrontierBrain_Ch2: + notetype $8, $D4 + dutycycle 3 + tone $0001 + vibrato $0A, $25 + octave 3 + note B_, 2 + octave 4 + note F_, 2 + note B_, 2 + octave 5 + note D_, 6 + note C#, 6 + note C_, 6 + octave 4 + note B_, 6 + note A#, 6 + note A_, 6 + note G#, 6 +Music_FrontierBrain_Ch2_loop: + notetype $C, $D4 + octave 2 + note __, 8 + note A_, 2 + note G#, 4 + note B_, 2 + octave 3 + note C_, 6 + note D_, 2 + note D#, 4 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note A_, 1 + octave 3 + note C_, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 6 + note D_, 4 + note C_, 4 + octave 2 + note B_, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 1 + note F_, 1 + note E_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + note G#, 4 + note B_, 2 + octave 3 + note C_, 6 + note D#, 2 + note F_, 4 + note D_, 2 + note D#, 2 + note C_, 1 + note D_, 1 + note C#, 2 + note G_, 6 + note F_, 4 + note D#, 4 + octave 2 + note B_, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note E_, 6 + intensity $D7 + octave 3 + note E_, 4 + note __, 4 + note F_, 4 + note __, 4 + note F#, 4 + note __, 4 + note G_, 4 + note __, 2 + note E_, 2 + note __, 2 + note F_, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 2 + note __, 2 + note G#, 2 + note __, 2 + note A_, 2 + note __, 2 + note A#, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 4 + note E_, 6 + note F#, 2 + note __, 2 + note G#, 2 + note __, 2 + note A_, 2 + note G#, 6 + note A_, 2 + note __, 2 + note B_, 4 + intensity $B0 + note G#, 16 + intensity $C7 + note E_, 16 + note __, 2 + note E_, 6 + note F#, 2 + note __, 2 + note G#, 4 + note A_, 2 + note G#, 4 + note A_, 2 + note __, 2 + note B_, 6 + intensity $D2 + note E_, 6 + note E_, 6 + note E_, 6 + intensity $D5 + octave 3 + note B_, 6 + intensity $D2 + octave 4 + note E_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 6 + note E_, 6 + note E_, 6 + intensity $D5 + octave 3 + note B_, 6 + intensity $D2 + octave 4 + note E_, 4 + note F#, 4 + note E_, 6 + note E_, 6 + note D#, 2 + note C#, 4 + intensity $D5 + note D#, 6 + note E_, 2 + note __, 2 + note F#, 4 + note G#, 16 + note __, 14 + intensity $D2 + octave 3 + note C#, 1 + note G_, 1 + note G#, 6 + note G#, 6 + note G#, 6 + note G#, 6 + note F#, 4 + note A_, 4 + note G#, 6 + note G#, 6 + note G#, 6 + note G#, 6 + note A_, 4 + note F#, 2 + intensity $D7 + dutycycle 0 + octave 4 + note E_, 1 + note F#, 1 + note G#, 2 + intensity $C1 + note C#, 4 + intensity $C7 + octave 5 + note C#, 6 + note E_, 6 + octave 4 + note E_, 1 + note F#, 1 + note G#, 4 + note F#, 4 + note E_, 4 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 16 + note __, 6 + note D#, 1 + note E_, 1 + note F#, 2 + intensity $C1 + octave 3 + note B_, 4 + intensity $C7 + octave 4 + note B_, 6 + octave 5 + note D#, 6 + octave 4 + note D#, 1 + note E_, 1 + note F#, 4 + note B_, 4 + note A_, 4 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 16 + note __, 6 + intensity $C2 + dutycycle 1 + note G#, 1 + note B_, 1 + octave 5 + note C#, 2 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 2 + intensity $C7 + note E_, 4 + note D#, 4 + note D_, 8 + note C#, 8 + note C_, 8 + octave 4 + note B_, 8 + octave 5 + note D_, 4 + note C#, 4 + note C_, 4 + octave 4 + note B_, 4 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + octave 3 + note B_, 1 + note G_, 1 + note __, 2 + intensity $D7 + dutycycle 3 + octave 4 + note C_, 6 + note D_, 2 + note __, 2 + note E_, 2 + note __, 2 + note F_, 2 + note E_, 6 + note F_, 2 + note __, 2 + note G_, 4 + note E_, 16 + note C_, 16 + note __, 2 + note C_, 6 + note D_, 2 + note __, 2 + note E_, 4 + note F_, 2 + note E_, 4 + note F_, 2 + note __, 2 + note G_, 6 + intensity $D2 + octave 5 + note C_, 6 + note C_, 6 + note C_, 6 + intensity $D5 + octave 4 + note G_, 6 + intensity $D2 + octave 5 + note C_, 4 + octave 4 + note G_, 4 + octave 5 + note C_, 6 + note C_, 6 + note C_, 6 + intensity $D5 + octave 4 + note G_, 6 + intensity $D2 + octave 5 + note C_, 4 + note D_, 4 + note C_, 6 + note C_, 6 + octave 4 + note B_, 2 + note A_, 4 + intensity $D5 + note B_, 6 + octave 5 + note C_, 4 + note D_, 16 + note __, 1 + intensity $D1 + octave 4 + note A_, 1 + note B_, 1 + octave 5 + note C_, 1 + note E_, 3 + octave 4 + note A_, 1 + intensity $D7 + note A_, 12 + octave 5 + note E_, 4 + note D_, 4 + note C_, 4 + note D_, 4 + octave 4 + note B_, 1 + octave 5 + note C_, 1 + octave 4 + note B_, 1 + note A_, 1 + note B_, 16 + note __, 9 + intensity $D1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note D_, 3 + octave 4 + note G_, 1 + intensity $D7 + note G_, 12 + note B_, 4 + note G_, 4 + octave 5 + note G_, 4 + note F_, 4 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note E_, 8 + notetype $8, $D7 + dutycycle 2 + octave 4 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 8 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 6 + intensity $D1 + dutycycle 3 + note A_, 2 + note B_, 2 + octave 5 + note C_, 2 + notetype $C, $D1 + note E_, 3 + octave 4 + note A_, 1 + intensity $D7 + note A_, 12 + octave 3 + note F_, 2 + note C_, 4 + note F_, 4 + note A_, 2 + notetype $8, $D1 + octave 4 + note A_, 2 + note B_, 2 + octave 5 + note C_, 2 + notetype $C, $D1 + note E_, 3 + octave 4 + note A_, 1 + intensity $D7 + note A_, 12 + octave 3 + note F#, 2 + note C_, 4 + note F#, 4 + note A_, 4 + octave 4 + note C_, 2 + octave 5 + note D_, 16 + note __, 12 + loopchannel 0, Music_FrontierBrain_Ch2_loop + +Music_FrontierBrain_Ch3: + notetype $C, $19 + vibrato $00, $20 + note __, 4 + notetype $8, $19 + octave 2 + note F#, 2 + octave 3 + note C_, 2 + note F#, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 3 + note F_, 2 + octave 2 + note E_, 2 + note A#, 2 + octave 3 + note E_, 2 + octave 2 + note D#, 2 + note A_, 2 + octave 3 + note D#, 2 + octave 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note C_, 2 + note F#, 2 + octave 3 + note C_, 2 +Music_FrontierBrain_Ch3_loop: + notetype $C, $19 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 2 + octave 3 + note D#, 1 + note D_, 1 + note C_, 2 + octave 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note D_, 2 + note D#, 1 + note D_, 1 + octave 2 + note A#, 3 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 2 + octave 3 + note D#, 1 + note D_, 1 + note C_, 2 + octave 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note D_, 2 + note D#, 1 + note D_, 1 + octave 2 + note A#, 2 + notetype $8, $19 + note E_, 2 + note __, 1 + note E_, 2 + note __, 1 + octave 3 + note E_, 6 + octave 2 + note E_, 2 + note __, 1 + note E_, 2 + note __, 1 + octave 3 + note F_, 6 + octave 2 + note E_, 2 + note __, 1 + note E_, 2 + note __, 1 + octave 3 + note F#, 6 + octave 2 + note E_, 2 + note __, 1 + note E_, 2 + note __, 1 + octave 3 + note G_, 6 + octave 2 + note E_, 3 + octave 3 + note E_, 3 + octave 2 + note E_, 3 + octave 3 + note F_, 3 + octave 2 + note E_, 3 + octave 3 + note F#, 3 + octave 2 + note E_, 3 + octave 3 + note G_, 3 + octave 2 + note E_, 3 + octave 3 + note G#, 3 + octave 2 + note E_, 3 + octave 3 + note A_, 3 + octave 2 + note E_, 3 + octave 3 + note A#, 3 + octave 2 + note E_, 3 + octave 3 + note B_, 3 + octave 2 + note E_, 3 + octave 3 + note E_, 3 + octave 2 + note E_, 3 + octave 3 + note E_, 3 + octave 2 + note E_, 3 + octave 3 + note E_, 3 + octave 2 + note E_, 3 + notetype $C, $19 + octave 3 + note E_, 1 + note D#, 1 + note E_, 2 + octave 2 + note E_, 1 + note __, 1 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 1 + octave 2 + note B_, 1 + note G#, 1 + note F#, 1 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 1 + note D#, 1 + note E_, 2 + octave 2 + note E_, 1 + note __, 1 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 1 + octave 2 + note B_, 1 + note G#, 1 + note F#, 1 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 1 + note D#, 1 + note E_, 2 + octave 2 + note E_, 1 + note __, 1 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 1 + octave 2 + note B_, 1 + note G#, 1 + note F#, 1 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + octave 3 + note D_, 1 + note C#, 1 + note D_, 2 + octave 2 + note D_, 2 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + octave 3 + note D_, 1 + octave 2 + note A_, 1 + note F#, 1 + note E_, 1 + note C#, 2 + octave 3 + note C#, 2 + octave 2 + note C#, 2 + octave 3 + note C#, 2 + octave 2 + note C#, 2 + octave 3 + note C#, 2 + octave 2 + note C#, 2 + octave 3 + note C#, 1 + note C_, 1 + note C#, 2 + octave 2 + note C#, 2 + note C#, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note C#, 2 + octave 3 + note C#, 1 + octave 2 + note G#, 1 + note F_, 1 + note D#, 1 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note B_, 2 + octave 1 + note B_, 2 + note B_, 2 + octave 2 + note B_, 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + note F#, 1 + note D#, 1 + note C#, 1 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + note E_, 2 + note F#, 2 + note E_, 1 + note D_, 1 + octave 1 + note B_, 2 + octave 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + note E_, 2 + note F#, 2 + note E_, 1 + note D_, 1 + octave 1 + note B_, 2 + octave 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + note E_, 2 + note F#, 2 + note E_, 1 + note D_, 1 + octave 1 + note B_, 2 + octave 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + octave 1 + note B_, 2 + octave 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + note B_, 2 + note F_, 2 + note D#, 2 + note E_, 2 + note D#, 1 + note C#, 1 + octave 1 + note A#, 2 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D_, 2 + note E_, 2 + note D#, 1 + note C#, 1 + octave 1 + note A#, 2 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + note F_, 2 + note C#, 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note C#, 2 + note D_, 2 + octave 1 + note B_, 2 + octave 2 + note D_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note D_, 2 + octave 1 + note B_, 2 + octave 2 + note D_, 2 + note C#, 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + note C#, 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note F#, 2 + note B_, 2 + note F_, 2 + note A#, 2 + note E_, 2 + note A_, 2 + note D#, 2 + note G#, 2 + note D_, 2 + note G_, 2 + note C#, 2 + note F#, 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note F#, 2 + note B_, 2 + note F_, 2 + note A#, 2 + note E_, 2 + note A_, 2 + note D#, 2 + note G#, 2 + note D_, 2 + note G_, 2 + note C#, 2 + note F#, 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + note E_, 1 + note D_, 1 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + note E_, 1 + note D_, 1 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + note E_, 1 + note D_, 1 + octave 1 + note A#, 2 + octave 2 + note A#, 2 + octave 1 + note A#, 2 + octave 2 + note A#, 2 + octave 1 + note A#, 2 + octave 2 + note A#, 2 + octave 1 + note A#, 2 + octave 2 + note A#, 1 + note A_, 1 + note A#, 2 + octave 1 + note A#, 2 + note A#, 2 + octave 2 + note A#, 2 + note F_, 2 + octave 1 + note A#, 2 + octave 2 + note A#, 1 + note F_, 1 + note D_, 1 + note C_, 1 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 1 + note G#, 1 + note A_, 2 + octave 1 + note A_, 2 + note A_, 2 + octave 2 + note A_, 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 1 + note E_, 1 + note C#, 1 + octave 1 + note B_, 1 + note G#, 2 + octave 2 + note G#, 2 + octave 1 + note G#, 2 + octave 2 + note G#, 2 + octave 1 + note G#, 2 + octave 2 + note G#, 2 + octave 1 + note G#, 2 + octave 2 + note G#, 1 + note G_, 1 + note G_, 2 + octave 1 + note G_, 2 + note G_, 2 + octave 2 + note G_, 2 + note D_, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 1 + note D_, 1 + octave 1 + note B_, 1 + note A_, 1 + octave 2 + note G_, 2 + note __, 2 + note D_, 2 + note __, 2 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note D_, 2 + note __, 2 + note F_, 2 + octave 3 + note C_, 2 + note F_, 2 + note C_, 2 + octave 2 + note F_, 2 + octave 3 + note C_, 2 + note F_, 1 + note G_, 1 + note F_, 1 + note C_, 1 + note F_, 2 + octave 2 + note F_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 + note F_, 2 + note __, 2 + note A_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 3 + note G_, 2 + note D_, 2 + octave 2 + note B_, 2 + note A_, 2 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note B_, 1 + note A_, 1 + note G_, 2 + note D_, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 3 + note D_, 2 + octave 2 + note E_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note E_, 2 + note B_, 2 + octave 3 + note E_, 1 + note F_, 1 + note E_, 1 + octave 2 + note B_, 1 + note E_, 2 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 2 + note G#, 2 + note __, 2 + note B_, 2 + note A_, 2 + octave 3 + note C#, 2 + note A_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 4 + note C#, 1 + note D_, 1 + note C#, 1 + octave 3 + note A_, 1 + octave 2 + note A_, 2 + note E_, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 3 + note C#, 2 + note __, 2 + note E_, 2 + octave 2 + note F_, 2 + octave 3 + note C_, 2 + note F_, 2 + note C_, 2 + octave 2 + note F_, 2 + octave 3 + note C_, 2 + note F_, 1 + note G_, 1 + note F_, 1 + note C_, 1 + note F_, 2 + octave 2 + note F_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 + note F_, 2 + note __, 2 + note A_, 2 + octave 2 + note F#, 2 + octave 3 + note E_, 2 + note F#, 2 + note C_, 2 + octave 2 + note F#, 2 + octave 3 + note C_, 2 + note F#, 1 + note G_, 1 + note F#, 1 + note C_, 1 + note F#, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 + note E_, 2 + note __, 2 + note A_, 2 + notetype $8, $19 + octave 2 + note F#, 2 + octave 3 + note C_, 2 + note F#, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 3 + note F_, 2 + octave 2 + note E_, 2 + note A#, 2 + octave 3 + note E_, 2 + octave 2 + note D#, 2 + note A_, 2 + octave 3 + note D#, 2 + octave 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + octave 2 + note C_, 2 + note F#, 2 + octave 3 + note C_, 2 + loopchannel 0, Music_FrontierBrain_Ch3_loop diff --git a/crysaudio/music/DPPt/jubilifecity.asm b/crysaudio/music/DPPt/jubilifecity.asm new file mode 100644 index 00000000..73cc3c36 --- /dev/null +++ b/crysaudio/music/DPPt/jubilifecity.asm @@ -0,0 +1,614 @@ +Music_JubilifeCity:: + dbw $C0, Music_JubilifeCity_Ch1 + dbw $01, Music_JubilifeCity_Ch2 + dbw $02, Music_JubilifeCity_Ch3 + dbw $03, Music_JubilifeCity_Ch4 + +Music_JubilifeCity_Ch1: + tempo 140 + stereopanning $f + volume $77 +Music_JubilifeCity_Loop1: + notetype $4, 179 + dutycycle 2 + note __, 16 + note __, 16 + note __, 4 + octave 3 + note A_, 12 + note D_, 12 + octave 2 + note A_, 12 + octave 3 + note D_, 4 + note D_, 8 + note A_, 16 + note __, 16 + note __, 16 + note A_, 12 + note C#, 12 + octave 2 + note A_, 12 + octave 3 + note C#, 4 + note C#, 8 + note F#, 16 + note __, 4 + note E_, 12 + note G_, 12 + note F#, 8 + note D_, 16 + note F#, 12 + note B_, 8 + note E_, 8 + note A#, 16 + note __, 16 + note __, 16 + note __, 8 + octave 4 + note B_, 4 + note A_, 12 + note G_, 12 + note F#, 12 + note E_, 12 + note D_, 12 + octave 3 + note A_, 16 + note __, 16 + octave 4 + note B_, 4 + note A_, 12 + note G_, 12 + note F#, 12 + octave 3 + note D_, 4 + note E_, 4 + note F#, 4 + note G_, 8 + note D_, 8 + octave 4 + note D_, 8 + octave 3 + note G_, 8 + note A_, 8 + octave 4 + note D_, 8 + octave 3 + note G_, 12 + note D_, 12 + octave 2 + note A_, 12 + octave 3 + note C#, 16 + note __, 8 + intensity 181 + note E_, 16 + note __, 8 + octave 2 + note B_, 16 + note __, 8 + octave 3 + note G_, 16 + note __, 8 + note G#, 12 + note D#, 16 + note __, 4 + note D#, 16 + note __, 16 + note __, 8 + note D#, 12 + note G#, 12 + note C_, 8 + note D#, 16 + note __, 8 + note D#, 16 + note __, 16 + note __, 8 + note D#, 12 + note C#, 12 + note F#, 8 + note C#, 16 + note D#, 12 + note C_, 16 + note __, 8 + note D#, 8 + note D#, 12 + note C_, 16 + note __, 16 + note __, 8 + octave 2 + note G_, 8 + note G_, 16 + octave 3 + note C_, 8 + note C_, 12 + note D#, 12 + note D#, 4 + note C_, 8 + note C_, 16 + note D#, 16 + note __, 16 + note __, 16 + note A#, 8 + note A#, 16 + note D#, 16 + note __, 8 + note D_, 16 + note __, 16 + note __, 16 + note __, 12 + note A_, 16 + note __, 8 + note G_, 12 + loopchannel 0, Music_JubilifeCity_Loop1 +Music_JubilifeCity_Ch2: + stereopanning $f0 + vibrato $12, $23 +Music_JubilifeCity_Loop2: + notetype $4, 194 + dutycycle 1 + note __, 12 + octave 4 + note A_, 12 + note D_, 16 + note __, 8 + note G_, 12 + note F#, 12 + note D_, 4 + octave 3 + note A_, 8 + octave 4 + note E_, 16 + note __, 8 + note A_, 12 + note D_, 16 + note __, 8 + note E_, 12 + note D_, 12 + octave 3 + note A_, 4 + note F#, 8 + note B_, 12 + note A_, 8 + octave 4 + note D_, 12 + note D_, 4 + note E_, 8 + note D_, 8 + octave 3 + note A_, 8 + note A#, 8 + note B_, 12 + octave 4 + note D_, 4 + note E_, 4 + octave 3 + note A#, 8 + octave 4 + note G_, 12 + note F#, 8 + note D_, 16 + octave 3 + note G_, 4 + note F#, 8 + octave 4 + note D_, 16 + note __, 16 + note __, 16 + note __, 4 + note D_, 4 + note E_, 4 + note F#, 12 + note D_, 12 + note G_, 4 + note F#, 8 + note D_, 8 + octave 3 + note A_, 4 + octave 4 + note D_, 12 + octave 3 + note A_, 12 + octave 4 + note D_, 12 + note E_, 4 + note F#, 4 + note G_, 4 + note A_, 8 + note D_, 8 + octave 3 + note A_, 8 + octave 4 + note A_, 8 + note D_, 8 + octave 3 + note A_, 8 + octave 4 + note D_, 16 + note __, 8 + note E_, 8 + note E_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + intensity 198 + note C#, 16 + note __, 8 + octave 3 + note B_, 16 + note __, 8 + octave 4 + note C#, 16 + note __, 8 + note D_, 16 + note __, 16 + note __, 4 + note F_, 12 + note D#, 12 + note F_, 4 + note D#, 4 + note G#, 4 + note A#, 8 + note A#, 8 + note G#, 16 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + note C#, 4 + note __, 12 + note F_, 12 + note D#, 12 + note F_, 4 + note D#, 4 + note G#, 4 + note A#, 8 + note A#, 8 + note G#, 16 + note D#, 4 + note C_, 4 + note C#, 4 + note D_, 4 + note D#, 8 + note D#, 12 + octave 3 + note G#, 4 + note G#, 16 + octave 4 + note C_, 4 + note C#, 4 + note F_, 8 + note D#, 12 + octave 3 + note G#, 4 + note G#, 8 + octave 4 + note C_, 8 + note C#, 8 + note D#, 16 + note C_, 4 + note D#, 4 + note G#, 16 + note __, 8 + note A#, 16 + note C_, 4 + note D#, 4 + note A#, 12 + note G#, 12 + note G_, 8 + note G#, 12 + note G#, 12 + note G_, 8 + note G#, 4 + note A#, 4 + octave 5 + note C_, 12 + octave 4 + note G_, 8 + note G#, 8 + note G_, 8 + note G#, 4 + note A#, 8 + note G_, 16 + note __, 4 + note C_, 4 + note C_, 16 + note __, 8 + note D_, 4 + note __, 4 + note E_, 4 + note __, 8 + note F#, 4 + note __, 8 + note G_, 4 + note __, 12 + loopchannel 0, Music_JubilifeCity_Loop2 +Music_JubilifeCity_Ch3: + stereopanning $ff + vibrato $8, $23 + notetype $4, $20 +Music_JubilifeCity_Loop3: + octave 3 + note G_, 16 + note G_, 4 + note G_, 16 + note G_, 16 + note G_, 8 + note G_, 16 + note G_, 8 + note G_, 12 + note F#, 16 + note F#, 4 + note F#, 16 + note F#, 16 + note F#, 8 + note F#, 16 + note F#, 8 + note F#, 12 + note E_, 8 + note E_, 16 + note F#, 8 + note F#, 16 + note B_, 8 + note B_, 16 + note A#, 8 + note A#, 16 + note G_, 12 + note G_, 4 + note D_, 8 + note G_, 8 + note G_, 16 + note G_, 12 + note G_, 4 + note D_, 8 + note G_, 8 + note G_, 16 + note F#, 12 + note F#, 4 + note C#, 8 + note F#, 8 + note F#, 16 + note B_, 8 + note B_, 16 + note A#, 8 + note A#, 16 + note G_, 8 + note G_, 8 + note D_, 8 + note G_, 8 + note G_, 8 + note B_, 8 + note G_, 8 + note G_, 12 + note G_, 4 + note A_, 8 + note A_, 12 + note A_, 4 + note D_, 12 + note D_, 12 + note D_, 12 + note D_, 12 + note A_, 12 + note A_, 12 + note A#, 12 + note A#, 12 + note C#, 16 + note C#, 4 + note C#, 16 + note C#, 16 + note C#, 16 + note C#, 16 + note C#, 12 + note C_, 16 + note C_, 4 + note C_, 16 + note C_, 12 + note F_, 8 + note F_, 16 + note D#, 8 + note D#, 16 + note C#, 12 + note C#, 12 + note F_, 12 + note G#, 12 + note C#, 12 + note F_, 12 + note G#, 12 + note F_, 12 + note C_, 8 + note C_, 16 + note D#, 8 + note D#, 16 + note F_, 8 + note F_, 16 + note D#, 8 + note D#, 16 + note C#, 16 + note C#, 16 + note C#, 16 + note C_, 16 + note C_, 8 + note F_, 16 + note F_, 8 + octave 4 + note C_, 16 + note C_, 16 + note C_, 16 + octave 3 + note B_, 12 + note B_, 12 + note A_, 12 + note A_, 12 + loopchannel 0, Music_JubilifeCity_Loop3 +Music_JubilifeCity_Ch4: + notetype $4 + togglenoise 3 +Music_JubilifeCity_Loop4: + note B_, 12 + note G_, 8 + note G#, 4 + note G_, 12 + note G_, 8 + note G#, 4 + note G_, 12 + note G_, 8 + note G#, 4 + note G_, 4 + note B_, 8 + note G#, 8 + note G_, 4 + note B_, 12 + note G_, 8 + note G#, 4 + note G_, 12 + note G_, 8 + note G#, 4 + note G_, 12 + note G_, 8 + note G#, 4 + note G_, 4 + note B_, 8 + note G#, 8 + note G_, 4 + note B_, 8 + note G_, 8 + note G_, 8 + note B_, 8 + note G_, 8 + note G_, 8 + note B_, 12 + note G#, 8 + note G_, 4 + note G#, 12 + note G#, 8 + note G_, 4 + note B_, 12 + note G_, 8 + note G#, 4 + note G_, 12 + note G_, 8 + note G#, 4 + note G_, 12 + note G_, 8 + note G#, 4 + note G_, 4 + note B_, 8 + note G#, 8 + note G_, 4 + note B_, 12 + note G_, 8 + note G#, 4 + note G_, 12 + note G_, 8 + note G#, 4 + note G_, 12 + note G_, 8 + note G#, 4 + note G_, 4 + note B_, 8 + note G#, 8 + note G_, 4 + note G#, 8 + note G_, 4 + note B_, 12 + note G#, 8 + note G_, 4 + note B_, 12 + note B_, 12 + note G#, 8 + note G_, 4 + note G#, 12 + note G#, 8 + note G_, 4 + note D#, 12 + note C#, 8 + note D#, 4 + note D#, 12 + note C#, 8 + note D#, 4 + note D#, 12 + note C#, 8 + note D#, 4 + note G_, 4 + note C#, 4 + note D#, 4 + note G_, 4 + note C#, 4 + note D#, 4 + note D#, 12 + note C#, 8 + note C#, 4 + note D#, 12 + note C#, 8 + note C#, 4 + note D#, 12 + note C#, 8 + note C#, 4 + note D#, 8 + note C#, 4 + note G_, 4 + note C#, 4 + note D#, 4 + note D#, 12 + note C#, 8 + note C#, 4 + note D#, 12 + note C#, 8 + note C#, 4 + note D#, 12 + note C#, 8 + note C#, 4 + note D#, 8 + note C#, 4 + note G_, 4 + note C#, 4 + note D#, 4 + note D#, 8 + note D#, 4 + note C#, 8 + note D#, 4 + note D#, 12 + note C#, 8 + note D#, 4 + note D#, 8 + note D#, 4 + note C#, 8 + note D#, 4 + note D#, 12 + note C#, 8 + note D#, 4 + note D#, 8 + note D#, 4 + note C#, 8 + note C#, 4 + note D#, 12 + note C#, 8 + note C#, 4 + note D#, 8 + note D#, 4 + note C#, 8 + note C#, 4 + note D#, 12 + note C#, 8 + note C#, 4 + note B_, 12 + note C#, 12 + note G#, 12 + note C#, 12 + note G#, 12 + note C#, 12 + note G#, 12 + note C#, 12 + note D#, 12 + note D#, 12 + note D#, 12 + note D#, 8 + note D#, 4 + note D#, 12 + note C#, 8 + note D#, 4 + note D#, 12 + note C#, 8 + note D#, 4 + loopchannel 0, Music_JubilifeCity_Loop4 diff --git a/crysaudio/music/DPPt/pokeradar.asm b/crysaudio/music/DPPt/pokeradar.asm new file mode 100644 index 00000000..205b1063 --- /dev/null +++ b/crysaudio/music/DPPt/pokeradar.asm @@ -0,0 +1,209 @@ +Music_PokeRadar:: + dbw $80, Music_PokeRadar_Ch1 + dbw $01, Music_PokeRadar_Ch2 + dbw $02, Music_PokeRadar_Ch3 + +Music_PokeRadar_Ch1: + tempo $68 + volume $77 + tone $0001 + notetype $6, $91 + dutycycle 2 + octave 5 + note F_, 1 + note G_, 1 + note F_, 1 + note G_, 1 + note F_, 9 +Music_PokeRadar_Loop1: + notetype $C, $82 + octave 3 + note A#, 6 + octave 4 + note G#, 10 + octave 3 + note A#, 2 + octave 4 + note G#, 4 + note F_, 2 + intensity $86 + note C#, 12 + note D_, 6 + note D#, 6 + octave 3 + note A#, 6 + intensity $82 + octave 4 + note G#, 10 + octave 3 + note A#, 2 + octave 4 + note G#, 4 + note F_, 2 + intensity $86 + note D_, 12 + note C#, 6 + note E_, 6 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 12 + note E_, 4 + note D#, 4 + note D_, 4 + note C#, 12 + note D#, 4 + note D_, 4 + note C#, 4 + note C_, 12 + intensity $82 + octave 3 + note B_, 4 + intensity $72 + note B_, 4 + intensity $62 + note B_, 4 + intensity $52 + note B_, 4 + intensity $42 + note B_, 4 + intensity $32 + note B_, 14 + note __, 14 + loopchannel 0, Music_PokeRadar_Loop1 +Music_PokeRadar_Ch2: + notetype $6, $C1 + dutycycle 2 + octave 6 + note F_, 1 + note G_, 1 + note F_, 1 + note G_, 1 + notetype $C, $C2 + note F_, 4 +Music_PokeRadar_Loop2: + intensity $C2 + dutycycle 1 + octave 3 + note A#, 6 + octave 4 + note G#, 10 + octave 3 + note A#, 2 + octave 4 + note G#, 4 + note F_, 2 + intensity $C7 + note C#, 12 + note D_, 6 + note D#, 6 + octave 3 + note A#, 6 + intensity $C2 + octave 4 + note G#, 10 + octave 3 + note A#, 2 + octave 4 + note G#, 4 + note F_, 2 + intensity $C7 + note D_, 12 + note C#, 6 + note E_, 6 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 12 + note E_, 4 + note D#, 4 + note D_, 4 + note C#, 12 + note D#, 4 + note D_, 4 + note C#, 4 + note C_, 12 + octave 3 + note B_, 16 + note __, 16 + note __, 16 + loopchannel 0, Music_PokeRadar_Loop2 +Music_PokeRadar_Ch3: + notetype $C, $10 + note __, 6 +Music_PokeRadar_Loop3: + octave 2 + note A#, 6 + octave 3 + note G#, 4 + octave 2 + note A_, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 2 + octave 3 + note G#, 2 + note __, 4 + octave 2 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + intensity $20 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + intensity $30 + note A#, 2 + intensity $10 + note F_, 6 + note A#, 6 + note F_, 2 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + note A#, 10 + note __, 2 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + intensity $20 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + intensity $30 + note A#, 2 + intensity $10 + note F_, 4 + octave 3 + note C_, 2 + octave 2 + note F_, 10 + octave 3 + note C#, 1 + note __, 1 + note D_, 12 + octave 2 + note E_, 10 + octave 3 + note C_, 1 + note __, 1 + note C#, 12 + octave 2 + note D#, 10 + note B_, 1 + note __, 1 + octave 3 + note C_, 12 + octave 2 + note D#, 2 + note __, 8 + note D#, 12 + note __, 12 + note __, 14 + loopchannel 0, Music_PokeRadar_Loop3 diff --git a/crysaudio/music/DPPt/route201.asm b/crysaudio/music/DPPt/route201.asm new file mode 100644 index 00000000..3f205ff7 --- /dev/null +++ b/crysaudio/music/DPPt/route201.asm @@ -0,0 +1,381 @@ +Music_Route201:: + dbw $80, Music_Route201_Ch1 + dbw $01, Music_Route201_Ch2 + dbw $02, Music_Route201_Ch3 + +Music_Route201_Ch1: + tempo $A4 + volume $77 + notetype $C, $A2 + dutycycle 1 + octave 2 + note __, 4 + octave 3 + note E_, 2 + octave 2 + note G_, 6 + octave 3 + note F_, 2 + octave 2 + note A_, 6 +Music_Route201_Ch1_loop: + octave 3 + note G_, 2 + octave 2 + note B_, 6 + octave 3 + note F_, 2 + octave 2 + note A_, 6 + octave 3 + note E_, 2 + octave 2 + note G_, 6 + octave 3 + note E_, 2 + octave 2 + note G_, 6 + octave 3 + note F_, 2 + octave 2 + note A_, 6 + octave 3 + note E_, 2 + octave 2 + note G_, 4 + note A_, 2 + octave 3 + note F_, 2 + octave 2 + note A_, 4 + note G_, 2 + octave 3 + note E_, 2 + octave 2 + note G_, 4 + note A_, 2 + octave 3 + note F_, 2 + note F#, 4 + octave 2 + note G_, 2 + octave 3 + note A_, 2 + note G_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note G_, 2 + octave 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note E_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + octave 2 + note B_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note E_, 2 + note C_, 2 + note C_, 6 + note E_, 6 + note D_, 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note E_, 4 + octave 3 + note C_, 2 + note C_, 6 + note E_, 6 + note D_, 4 + note C_, 2 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G_, 2 + note B_, 2 + octave 3 + note C_, 4 + note E_, 2 + octave 2 + note G_, 6 + octave 3 + note F_, 2 + octave 2 + note A_, 6 + loopchannel 0, Music_Route201_Ch1_loop + +Music_Route201_Ch2: + notetype $C, $B1 + octave 4 + note __, 16 +Music_Route201_Ch2_loop: + notetype $C, $B1 + dutycycle 2 + octave 4 + note __, 15 + notetype $6, $B1 + note E_, 1 + note F_, 1 + note G_, 4 + note F_, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note C_, 4 + octave 3 + note G_, 8 + note A_, 4 + note G_, 4 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + note G_, 10 + note F_, 1 + note G_, 1 + note A_, 4 + note G_, 4 + note A_, 4 + note B_, 4 + octave 5 + note C_, 4 + octave 4 + note G_, 12 + note F_, 4 + note E_, 4 + note D_, 4 + note C_, 4 + note A_, 8 + note G_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 8 + note C_, 8 + note C_, 8 + note C_, 8 + note G_, 4 + note F_, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note C_, 4 + octave 2 + note G_, 4 + octave 3 + note D_, 4 + note C_, 8 + note C_, 8 + note C_, 8 + note C_, 8 + octave 2 + note G_, 4 + octave 3 + note D_, 4 + note E_, 4 + note D_, 8 + note C_, 10 + intensity $98 + dutycycle 0 + vibrato $00, $15 + octave 4 + note E_, 1 + note F_, 1 + note G_, 12 + octave 5 + note C_, 12 + octave 4 + note B_, 8 + note A_, 4 + note G_, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note C_, 8 + note A_, 4 + note G_, 12 + octave 5 + note C_, 12 + octave 4 + note B_, 8 + note A_, 4 + note G_, 4 + note E_, 4 + note C_, 8 + octave 3 + note G_, 4 + octave 4 + note D_, 4 + note C_, 16 + intensity $A3 + note C_, 4 + note __, 16 + loopchannel 0, Music_Route201_Ch2_loop + +Music_Route201_Ch3: + notetype $C, $10 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 +Music_Route201_Ch3_loop: + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 + note E_, 1 + note __, 1 + note E_, 1 + note __, 5 + note F_, 1 + note __, 1 + note F_, 1 + note __, 5 + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 + note F_, 1 + note __, 1 + note F_, 1 + note __, 5 + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 + note F_, 1 + note __, 1 + note F_, 1 + note __, 5 + note G_, 1 + note __, 1 + note G_, 1 + note __, 5 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + note C_, 1 + note __, 3 + note C_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note __, 1 + note C_, 1 + note __, 5 + note C_, 1 + note __, 1 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + note C_, 1 + note __, 3 + note C_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note __, 1 + note C_, 1 + note __, 5 + note C_, 1 + note __, 1 + note F_, 5 + note __, 1 + note F_, 2 + note G_, 1 + note __, 1 + note G_, 3 + note __, 1 + note G_, 2 + note E_, 5 + note __, 1 + note E_, 2 + note C_, 1 + note __, 1 + note C_, 4 + note E_, 2 + note F_, 5 + note __, 1 + note F_, 2 + note C_, 1 + note __, 1 + note C_, 3 + note __, 1 + note C_, 2 + note F_, 5 + note __, 1 + note F_, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 + note C_, 1 + note __, 1 + note C_, 1 + note __, 5 + loopchannel 0, Music_Route201_Ch3_loop diff --git a/crysaudio/music/DPPt/route203.asm b/crysaudio/music/DPPt/route203.asm new file mode 100644 index 00000000..969429f7 --- /dev/null +++ b/crysaudio/music/DPPt/route203.asm @@ -0,0 +1,2014 @@ +Music_Route203:: + dbw $C0, Music_Route203_Ch1 + dbw $01, Music_Route203_Ch2 + dbw $02, Music_Route203_Ch3 + dbw $03, Music_Route203_Ch4 + +Music_Route203_Ch1: + tempo $90 + volume $77 + notetype $4, $B1 + dutycycle 1 + octave 3 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + octave 2 + note A#, 2 + note G_, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + note E_, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 2 + notetype $8, $B1 + octave 4 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype $4, $B1 + note __, 8 + note D#, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 2 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + octave 4 + note C_, 1 + note D_, 1 + note D#, 1 + octave 3 + note F#, 1 + note G#, 1 + note A#, 5 + note A#, 2 + note A#, 2 + note A#, 2 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A_, 4 + note A#, 3 + note F#, 1 + note G#, 1 + note A#, 5 + note A#, 2 + note A#, 2 + note A#, 2 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 3 + note C#, 1 + note D#, 1 + note F_, 5 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 4 + note F_, 4 + note F_, 4 + note F_, 4 + note F_, 4 + note F_, 4 + note F_, 4 + note G_, 4 + note F_, 4 +Music_Route203_Ch1_loop: + note E_, 4 + note D_, 8 + notetype $C, $B7 + note A_, 12 + notetype $8, $B7 + dutycycle 0 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 2 + octave 2 + note B_, 10 + octave 3 + note F#, 8 + note E_, 2 + note D_, 2 + note C#, 6 + octave 2 + note A#, 2 + notetype $A, $B7 + note B_, 2 + notetype $C, $B7 + octave 3 + note C#, 1 + note E_, 8 + notetype $8, $B7 + note C#, 4 + note E_, 4 + note C#, 4 + note C#, 2 + octave 2 + note B_, 2 + note __, 2 + note B_, 2 + note __, 6 + note A_, 2 + note __, 2 + note B_, 6 + octave 3 + note F#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 4 + note G_, 2 + note __, 2 + note G#, 2 + octave 3 + note F#, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note C#, 2 + note __, 8 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note C#, 2 + notetype $A, $B7 + octave 2 + note B_, 16 + notetype $C, $B2 + octave 3 + note B_, 4 + note A_, 4 + note D#, 4 + note F#, 8 + notetype $8, $B2 + dutycycle 1 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note G_, 2 + note F#, 4 + note G_, 1 + note F#, 1 + note E_, 4 + note F_, 2 + note F#, 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + note E_, 2 + note D#, 1 + note E_, 1 + intensity $B7 + note D#, 16 + intensity $B2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note G_, 2 + note A_, 4 + note B_, 1 + note A_, 1 + note G_, 6 + intensity $B4 + note F#, 8 + intensity $B2 + note D#, 2 + note F#, 2 + note A_, 4 + note D#, 2 + note F#, 6 + note D_, 2 + octave 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + octave 3 + note D_, 2 + intensity $B4 + octave 2 + note A_, 8 + intensity $B2 + note G_, 2 + note A_, 2 + intensity $B7 + note A#, 12 + octave 3 + note D_, 10 + intensity $B1 + note E_, 1 + note D_, 1 + note C#, 2 + note E_, 2 + intensity $B7 + note G_, 16 + note __, 16 + note __, 12 + dutycycle 2 + note F_, 4 + octave 2 + note F_, 2 + octave 3 + note F_, 4 + octave 2 + note F_, 2 + note E_, 4 + note E_, 2 + octave 3 + note E_, 4 + octave 2 + note E_, 2 + note D#, 4 + note D#, 2 + octave 3 + note C_, 4 + octave 2 + note D#, 2 + note D_, 2 + octave 3 + note D_, 4 + note C_, 4 + octave 2 + note A_, 2 + octave 1 + note A#, 2 + octave 3 + note D_, 2 + octave 1 + note A#, 2 + octave 3 + note D_, 4 + octave 1 + note A#, 2 + octave 3 + note C_, 4 + octave 2 + note C_, 2 + note G_, 4 + note C_, 2 + note C#, 2 + octave 3 + note F_, 2 + octave 2 + note C#, 2 + octave 3 + note F_, 4 + octave 2 + note C#, 2 + note D#, 2 + octave 3 + note G_, 2 + octave 2 + note D#, 2 + octave 3 + note G_, 4 + octave 2 + note D#, 2 + octave 3 + note G#, 4 + octave 2 + note G#, 2 + octave 3 + note G#, 4 + octave 2 + note G#, 2 + note G_, 4 + note G_, 2 + octave 3 + note G_, 4 + octave 2 + note G_, 2 + note F#, 4 + note F#, 2 + octave 3 + note D#, 4 + octave 2 + note F#, 2 + note F_, 2 + octave 3 + note F_, 4 + note D#, 4 + note C_, 2 + octave 2 + note C#, 2 + octave 3 + note F_, 2 + octave 2 + note C#, 2 + octave 3 + note F_, 4 + octave 2 + note C#, 2 + octave 3 + note D#, 4 + octave 2 + note D#, 2 + note A#, 4 + note D#, 2 + note C#, 2 + octave 3 + note F_, 2 + octave 2 + note C#, 2 + octave 3 + note F_, 4 + octave 2 + note C#, 2 + octave 3 + note D#, 4 + octave 2 + note D#, 2 + note A#, 4 + note D#, 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 4 + octave 2 + note E_, 2 + note F#, 2 + octave 3 + note F#, 2 + octave 2 + note F#, 2 + octave 3 + note F#, 4 + octave 2 + note F#, 2 + notetype $C, $B1 + octave 4 + note __, 16 + note __, 16 + note __, 16 + note __, 8 + notetype $4, $B1 + dutycycle 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 2 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + octave 4 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + intensity $B7 + note F_, 12 + note D#, 12 + octave 3 + note A#, 8 + octave 4 + note C_, 4 + octave 3 + note A#, 8 + octave 4 + note C_, 16 + note __, 16 + note __, 16 + note __, 16 + octave 3 + note D_, 4 + note D#, 4 + note F_, 4 + note A#, 8 + note G#, 4 + note F_, 8 + note D#, 4 + note D_, 4 + octave 2 + note A#, 8 + octave 3 + note C_, 8 + note D_, 4 + intensity $B1 + octave 4 + note D#, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 2 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + octave 4 + note C_, 1 + note D_, 1 + note F#, 1 + intensity $B7 + note G#, 13 + octave 2 + note A#, 8 + note F_, 4 + note A#, 4 + note G#, 4 + note F_, 4 + note A#, 4 + note G#, 4 + note F_, 4 + note A#, 8 + note F_, 4 + note A#, 8 + octave 3 + note C_, 16 + octave 2 + note A#, 8 + octave 3 + note D_, 8 + note A#, 8 + note G#, 8 + note F_, 8 + note G#, 8 + note F_, 8 + note D#, 4 + note D_, 4 + octave 2 + note A#, 8 + octave 3 + note C_, 8 + note D_, 4 + intensity $B1 + octave 4 + note D#, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 2 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + octave 4 + note C_, 1 + note D_, 1 + note F#, 1 + note G#, 1 + octave 3 + note G#, 1 + note A#, 5 + note A#, 2 + note A#, 2 + note A#, 2 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A_, 4 + note A#, 3 + note F#, 1 + note G#, 1 + note A#, 5 + note A#, 2 + note A#, 2 + note A#, 2 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 3 + note C#, 1 + note D#, 1 + note F_, 5 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 4 + note F_, 4 + note F_, 4 + note F_, 4 + note F_, 4 + note F_, 4 + note F_, 4 + note G_, 4 + note F_, 4 + loopchannel 0, Music_Route203_Ch1_loop + +Music_Route203_Ch2: + notetype $4, $C1 + dutycycle 1 + octave 4 + note D#, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 2 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + octave 4 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + notetype $8, $C0 + vibrato $00, $12 + note G_, 16 + intensity $C7 + note G_, 16 + note __, 8 + note G_, 1 + note __, 5 + intensity $C0 + note F_, 16 + intensity $C7 + note F_, 16 + note __, 16 + note __, 2 + intensity $C0 + note G_, 16 + intensity $C7 + note G_, 16 + note __, 8 + note G_, 1 + note __, 5 + intensity $C0 + note F_, 14 + note D_, 12 +Music_Route203_Ch2_loop: + intensity $C1 + vibrato $00, $00 + note E_, 2 + note D_, 2 + note __, 2 + intensity $C7 + note E_, 6 + octave 3 + note F#, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note A_, 4 + note G_, 4 + note F#, 4 + note E_, 2 + note D_, 10 + note A_, 8 + note G_, 2 + note F#, 2 + note E_, 6 + note C#, 2 + note D_, 2 + note E_, 2 + notetype $B, $C7 + note F#, 4 + notetype $D, $C7 + note __, 4 + notetype $8, $C7 + note E_, 4 + note F#, 4 + note E_, 4 + note E_, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 6 + note D_, 2 + note __, 2 + note E_, 6 + note A_, 4 + note G_, 4 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 4 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note C_, 2 + note A_, 4 + note G_, 2 + note F#, 2 + note G_, 2 + note E_, 2 + note __, 8 + note D#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 16 + note __, 16 + note __, 16 + note __, 2 + intensity $C2 + dutycycle 2 + note D_, 2 + note G_, 2 + note B_, 2 + note A_, 4 + note B_, 1 + note A_, 1 + note G_, 4 + note G#, 2 + note A_, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note G_, 2 + note F#, 1 + note G_, 1 + intensity $C7 + note F#, 16 + intensity $C2 + note D_, 2 + note G_, 2 + note B_, 2 + octave 4 + note C#, 4 + note D_, 1 + note C#, 1 + octave 3 + note B_, 6 + intensity $C4 + note A_, 8 + intensity $C2 + note G#, 2 + note A_, 2 + note B_, 4 + note F#, 2 + note A_, 2 + note __, 4 + note G_, 2 + octave 2 + note B_, 2 + note __, 2 + note B_, 2 + note __, 2 + notetype $4, $C2 + octave 3 + note F#, 1 + note G_, 3 + intensity $C4 + note C#, 16 + intensity $C2 + octave 2 + note B_, 4 + octave 3 + note C#, 4 + notetype $C, $C7 + note D_, 8 + notetype $A, $C7 + note F_, 8 + notetype $8, $C1 + note G_, 1 + note F_, 1 + note E_, 2 + note G_, 2 + notetype $A, $C7 + note A_, 16 + notetype $8, $C7 + dutycycle 1 + octave 2 + note C_, 2 + note G_, 2 + note E_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 6 + octave 3 + note A#, 6 + vibrato $00, $34 + note A_, 2 + note A#, 2 + octave 4 + note C_, 1 + note __, 1 + notetype $4, $C7 + octave 3 + note B_, 1 + intensity $C0 + octave 4 + note C_, 16 + note C_, 16 + note C_, 15 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + note C#, 4 + note C#, 1 + note D_, 7 + note C_, 4 + note __, 4 + octave 3 + note A_, 4 + note G_, 4 + note F_, 16 + note G_, 4 + note A_, 4 + note A#, 8 + note G_, 4 + note E_, 8 + note G_, 4 + note __, 4 + note G#, 4 + note __, 4 + note F_, 8 + note G#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + octave 4 + note D_, 1 + note D#, 7 + note C#, 4 + dutycycle 0 + note C_, 4 + note C#, 4 + note D#, 2 + note __, 2 + notetype $B, $C0 + note D#, 16 + notetype $8, $C0 + note D#, 2 + note C_, 2 + notetype $4, $C0 + note D_, 1 + note D#, 7 + note F_, 4 + note __, 4 + note D#, 4 + note __, 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 16 + note A#, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 8 + note G#, 4 + note G_, 8 + note A#, 4 + note G#, 16 + note A#, 4 + note B_, 4 + octave 4 + note C_, 4 + note __, 4 + note C#, 4 + note D#, 4 + note F_, 4 + note G_, 4 + notetype $C, $C0 + dutycycle 1 + vibrato $00, $12 + note G#, 8 + note A#, 8 + notetype $8, $C0 + octave 5 + note C_, 16 + intensity $C7 + note C_, 16 + note __, 8 + note C_, 1 + note __, 5 + intensity $C0 + note D_, 16 + intensity $C7 + note D_, 16 + note __, 16 + note __, 2 + intensity $C0 + note C_, 16 + intensity $C7 + note C_, 16 + note __, 8 + note C_, 1 + note __, 5 + intensity $C0 + note D_, 16 + intensity $C7 + note D_, 16 + note __, 16 + note __, 2 + intensity $C0 + note C_, 16 + intensity $C7 + note C_, 16 + note __, 8 + note C_, 1 + note __, 5 + intensity $C0 + note D_, 16 + intensity $C7 + note D_, 16 + note __, 16 + note __, 2 + intensity $C0 + note C_, 16 + intensity $C7 + note C_, 16 + note __, 8 + note C_, 1 + note __, 5 + intensity $C0 + octave 4 + note A#, 14 + note G_, 12 + loopchannel 0, Music_Route203_Ch2_loop + +Music_Route203_Ch3: + notetype $8, $13 + octave 1 + note __, 12 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 +Music_Route203_Ch3_loop: + note A_, 2 + octave 2 + note D_, 2 + note __, 2 + note E_, 6 + octave 1 + note A_, 9 + notetype $C, $13 + note __, 2 + octave 2 + note G_, 12 + note __, 4 + note G_, 8 + note A#, 4 + octave 3 + note C#, 4 + octave 2 + note F#, 8 + octave 3 + note C#, 8 + notetype $8, $13 + octave 2 + note B_, 2 + note F#, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 6 + note A_, 6 + octave 1 + note G_, 2 + note __, 6 + octave 2 + note D_, 2 + note __, 2 + note D_, 2 + note G_, 2 + note __, 2 + note G_, 4 + note G#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note __, 2 + note E_, 2 + note __, 2 + note C#, 4 + note __, 2 + note A_, 4 + note A#, 2 + note B_, 2 + octave 1 + note B_, 4 + notetype $C, $13 + note B_, 12 + notetype $8, $13 + octave 2 + note B_, 2 + note __, 2 + note B_, 4 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + note A_, 2 + note D#, 2 + note F#, 2 + note B_, 2 + octave 3 + note D_, 4 + octave 2 + note D_, 2 + note G_, 2 + note __, 2 + note D_, 2 + note G_, 4 + octave 3 + note C#, 2 + note __, 4 + octave 2 + note E_, 2 + note A_, 2 + note __, 8 + note E_, 2 + note F#, 2 + note __, 2 + note B_, 2 + note __, 4 + note F#, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 6 + note E_, 2 + note G_, 2 + note B_, 2 + note __, 2 + note A_, 2 + note E_, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 6 + note D#, 2 + note __, 2 + note B_, 2 + note __, 6 + note E_, 2 + note __, 4 + note E_, 2 + note __, 4 + note F#, 2 + note __, 4 + note F#, 2 + note __, 4 + note G_, 2 + note __, 4 + note G_, 2 + note __, 4 + note G_, 2 + note __, 4 + note G_, 2 + note __, 4 + note A_, 2 + note __, 4 + note A_, 2 + note __, 4 + note A_, 2 + note __, 4 + note A_, 2 + note __, 4 + octave 3 + note E_, 8 + note D#, 2 + note E_, 2 + note G_, 6 + note C_, 6 + octave 2 + note F_, 6 + note __, 2 + note A_, 2 + note F_, 2 + note E_, 2 + note __, 8 + note E_, 2 + note D#, 2 + note __, 8 + note D#, 2 + note D_, 2 + note __, 2 + note C_, 2 + note D_, 2 + note __, 2 + note A#, 2 + note F_, 4 + note A#, 2 + note __, 4 + note D_, 2 + note C_, 4 + note G_, 2 + note __, 4 + octave 3 + note C_, 2 + note __, 4 + octave 2 + note G#, 2 + note __, 2 + note F_, 2 + note G#, 2 + note D#, 4 + note A#, 2 + note __, 4 + note G_, 2 + note D#, 6 + note __, 2 + octave 3 + note C_, 2 + octave 2 + note G#, 2 + note G_, 2 + note D#, 2 + note __, 4 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note F#, 2 + note __, 2 + note F#, 2 + note __, 4 + note C_, 2 + note F_, 2 + note __, 2 + note F_, 2 + note F_, 2 + note __, 2 + note G#, 2 + note G#, 2 + note C#, 4 + note __, 4 + note C#, 2 + note D#, 2 + note __, 4 + note G_, 4 + note D#, 2 + note G#, 2 + note __, 2 + note F_, 2 + note C#, 4 + note __, 2 + note D#, 2 + note A#, 2 + note G_, 2 + note __, 4 + note D#, 2 + note E_, 2 + note __, 4 + note E_, 2 + note __, 4 + note F#, 2 + note __, 4 + note D#, 4 + note G_, 2 + note G#, 2 + note __, 2 + note G#, 1 + note __, 1 + octave 3 + note G#, 4 + octave 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note G#, 4 + octave 2 + note G#, 1 + note __, 1 + note G#, 2 + note __, 2 + note G#, 1 + note __, 1 + octave 3 + note G#, 4 + octave 2 + note G#, 1 + note __, 1 + note G#, 2 + note __, 2 + note G#, 1 + note __, 1 + octave 3 + note G#, 4 + octave 2 + note G#, 1 + note __, 1 + octave 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 1 + note A#, 1 + note __, 1 + loopchannel 0, Music_Route203_Ch3_loop + +Music_Route203_Ch4: + notetype $8 + togglenoise 3 + note __, 12 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 +Music_Route203_Ch4_loop: + note C#, 2 + note C#, 4 + note B_, 12 + note G_, 6 + note D#, 6 + note G_, 12 + note G_, 4 + note D#, 2 + note D#, 6 + note G_, 6 + note D#, 6 + note G_, 4 + note D#, 2 + note D#, 6 + note G_, 4 + note D#, 2 + note D#, 6 + note G_, 6 + note D#, 6 + note G_, 4 + note D#, 6 + note D#, 2 + note G_, 6 + note D#, 4 + note D#, 2 + note G_, 6 + note D#, 2 + note D#, 4 + note G_, 4 + note D#, 2 + note D#, 4 + note D#, 2 + note G_, 6 + note D#, 2 + note D#, 4 + note G_, 4 + note D#, 2 + note D#, 2 + note D#, 4 + note G_, 6 + note D#, 2 + note D#, 4 + note G_, 4 + note D#, 2 + note D#, 4 + note D#, 2 + note G_, 6 + note D#, 2 + note D#, 4 + note G_, 6 + note C#, 4 + note C#, 2 + note C#, 4 + note C#, 2 + note C#, 4 + note C#, 2 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 + note C#, 8 + note C#, 4 + note C#, 2 + note C#, 4 + note C#, 2 + note C#, 4 + note C#, 2 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 + note C#, 8 + note C#, 4 + note C#, 2 + note C#, 4 + note C#, 2 + note C#, 4 + note C#, 2 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 + note C#, 8 + note C#, 4 + note C#, 2 + note C#, 4 + note C#, 2 + note C#, 4 + note C#, 2 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 + note C#, 2 + note B_, 6 + note C#, 6 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note E_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note B_, 6 + note C#, 6 + note B_, 6 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 6 + note G_, 2 + note B_, 2 + note C#, 2 + note C#, 2 + note C#, 4 + note G_, 2 + note B_, 2 + note C#, 2 + loopchannel 0, Music_Route203_Ch4_loop diff --git a/crysaudio/music/DPPt/route205.asm b/crysaudio/music/DPPt/route205.asm new file mode 100644 index 00000000..f00e93fa --- /dev/null +++ b/crysaudio/music/DPPt/route205.asm @@ -0,0 +1,1080 @@ +Music_Route205:: + dbw $C0, Music_Route205_Ch1 + dbw $01, Music_Route205_Ch2 + dbw $02, Music_Route205_Ch3 + dbw $03, Music_Route205_Ch4 + +Music_Route205_Ch1: +Music_Route205_Ch1_loop: + tempo $C0 + volume $77 + notetype $C, $B2 + dutycycle 1 + octave 3 + note G_, 2 + note G_, 3 + note D_, 3 + note F_, 2 + note F_, 3 + note C_, 3 + octave 4 + note C_, 2 + note C_, 3 + octave 3 + note F_, 3 + note G_, 2 + note G_, 3 + octave 2 + note B_, 3 + notetype $8, $B2 + octave 3 + note G_, 1 + octave 4 + note D_, 1 + note D_, 1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + note G_, 1 + octave 5 + note G_, 3 + notetype $C, $B2 + note D_, 1 + note G_, 1 + notetype $8, $B2 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + note C_, 1 + octave 3 + note A_, 1 + octave 4 + note C_, 1 + note F_, 1 + octave 5 + note F_, 3 + notetype $C, $B2 + note C_, 1 + note F_, 1 + octave 3 + note D_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note D_, 1 + note G_, 1 + note A_, 1 + octave 4 + note C_, 1 + note G_, 1 + note A_, 1 + octave 5 + note C_, 1 + note D_, 1 + octave 6 + note D_, 3 + intensity $B1 + dutycycle 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + note B_, 1 + note G_, 1 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note E_, 2 + octave 4 + note C_, 1 + octave 3 + note E_, 1 + note A_, 2 + octave 2 + note G_, 2 + octave 3 + note E_, 2 + note A_, 1 + note E_, 1 + octave 4 + note C_, 2 + octave 2 + note G_, 2 + note A_, 2 + octave 3 + note F#, 1 + octave 2 + note A_, 1 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note E_, 2 + octave 4 + note C_, 1 + octave 3 + note C_, 1 + note E_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + note F#, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + note B_, 1 + note D_, 1 + note F_, 2 + intensity $B4 + dutycycle 1 + octave 4 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 1 + octave 5 + note C_, 1 + octave 4 + note B_, 1 + note G_, 3 + octave 5 + note D_, 2 + note E_, 2 + octave 4 + note G_, 2 + octave 5 + note C_, 1 + octave 4 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 3 + note G_, 3 + note D_, 2 + note E_, 3 + note B_, 2 + note G_, 2 + note A_, 1 + note G_, 3 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note F_, 1 + note E_, 4 + note G_, 4 + note D_, 1 + note G_, 1 + note A_, 2 + octave 5 + note D_, 4 + octave 3 + note A_, 3 + note A_, 3 + note A_, 2 + note A#, 6 + note A#, 1 + octave 4 + note C_, 1 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + note F_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 4 + note G_, 1 + note A_, 1 + note F#, 2 + note A_, 2 + note F#, 2 + note D_, 2 + note G_, 1 + note G_, 1 + note A#, 1 + note A#, 1 + octave 4 + note C_, 1 + note C_, 1 + note F_, 1 + note F_, 1 + octave 2 + note F_, 4 + octave 4 + note C_, 4 + note D_, 4 + octave 3 + note D_, 4 + octave 4 + note D_, 3 + octave 3 + note G_, 2 + note A_, 2 + note G_, 1 + octave 4 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + octave 3 + note B_, 3 + note D_, 3 + note F#, 1 + note G_, 1 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 4 + note G_, 2 + note E_, 2 + note G_, 4 + note B_, 1 + note B_, 1 + octave 4 + note D_, 1 + note D_, 1 + octave 3 + note G_, 1 + note G_, 1 + note B_, 1 + note B_, 1 + octave 4 + note E_, 1 + note E_, 1 + octave 3 + note B_, 1 + note B_, 1 + octave 4 + note D_, 1 + note D_, 3 + loopchannel 0, Music_Route205_Ch1_loop + +Music_Route205_Ch2: +Music_Route205_Ch2_loop: + notetype $C, $C2 + dutycycle 1 + octave 4 + note G_, 2 + note G_, 3 + octave 3 + note G_, 1 + octave 4 + note D_, 1 + note G_, 1 + note F_, 2 + note F_, 3 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note B_, 1 + note G_, 1 + note F_, 1 + note C_, 1 + note F_, 1 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note B_, 1 + note G_, 1 + note D_, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + note D_, 1 + note D_, 1 + note G_, 1 + octave 4 + note G_, 1 + octave 3 + note G_, 1 + octave 4 + note D_, 1 + octave 3 + note G_, 1 + octave 4 + note G_, 1 + octave 5 + note D_, 1 + octave 3 + note C_, 1 + note F_, 1 + octave 4 + note F_, 1 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + octave 3 + note F_, 1 + octave 4 + note F_, 1 + octave 5 + note C_, 1 + intensity $C7 + octave 4 + note D_, 6 + notetype $8, $C3 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 6 + intensity $C7 + note D_, 6 + intensity $C1 + note D_, 3 + note G_, 3 + notetype $C, $C1 + note F#, 1 + note G_, 1 + note F#, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 1 + note D_, 1 + octave 3 + note G_, 2 + note A_, 1 + note B_, 1 + octave 4 + note C_, 2 + octave 3 + note F#, 1 + note G_, 1 + note A_, 2 + octave 4 + note A_, 1 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + note G_, 1 + note A_, 2 + note E_, 2 + note A_, 2 + note G#, 1 + note A_, 1 + note G#, 2 + note E_, 2 + note C_, 2 + note G_, 1 + note F#, 1 + octave 3 + note A_, 2 + note B_, 1 + octave 4 + note C_, 1 + note D_, 2 + octave 3 + note F#, 1 + note G_, 1 + note A_, 2 + octave 4 + note B_, 1 + octave 5 + note C_, 1 + note D_, 2 + octave 4 + note F#, 1 + note G_, 1 + note A_, 4 + intensity $C5 + dutycycle 2 + octave 3 + note G_, 1 + note E_, 1 + note G_, 2 + octave 4 + note E_, 2 + note D_, 2 + note E_, 1 + octave 3 + note G_, 2 + note G_, 5 + note G_, 1 + note E_, 1 + note G_, 2 + octave 4 + note G_, 2 + note F#, 1 + note G_, 1 + note F#, 1 + note D_, 2 + octave 3 + note G_, 2 + note D_, 1 + note E_, 3 + note B_, 2 + note G_, 2 + note A_, 1 + note G_, 3 + note D_, 2 + note G_, 2 + note F_, 1 + note E_, 2 + note G_, 2 + note A_, 2 + octave 4 + note D_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note A_, 1 + octave 5 + note D_, 2 + dutycycle 0 + octave 4 + note D_, 1 + note D#, 1 + note F_, 3 + note F_, 3 + note G_, 2 + note F_, 6 + note D_, 1 + note D#, 1 + note F_, 2 + note A#, 2 + note A_, 2 + note F_, 2 + note G_, 2 + note F_, 4 + octave 3 + note A#, 1 + octave 4 + note C_, 1 + note D_, 2 + note D#, 2 + note D_, 2 + octave 3 + note A_, 2 + note A#, 1 + note A#, 1 + octave 4 + note D_, 1 + note D_, 1 + note G_, 1 + note G_, 1 + note A_, 1 + note A_, 1 + note F_, 6 + note E_, 1 + note F_, 1 + note F#, 6 + note F_, 1 + note F#, 1 + note G_, 3 + note D_, 2 + note E_, 2 + note D_, 1 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note D_, 3 + octave 3 + note G_, 3 + note A_, 1 + note B_, 1 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + octave 4 + note E_, 2 + note D_, 2 + note E_, 2 + note G_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + octave 5 + note C_, 1 + note C_, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D_, 1 + octave 4 + note G_, 1 + note G_, 3 + note A_, 1 + note A_, 3 + loopchannel 0, Music_Route205_Ch2_loop + +Music_Route205_Ch3: +Music_Route205_Ch3_loop: + notetype $C, $13 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 2 + note G_, 1 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 2 + note A_, 1 + octave 3 + note C_, 1 + note F_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 2 + octave 3 + note C_, 1 + note F_, 1 + note A_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 2 + octave 3 + note D_, 1 + note G_, 1 + note B_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note D_, 1 + octave 2 + note G_, 1 + octave 3 + note D_, 1 + note G_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note C_, 1 + octave 2 + note F_, 1 + octave 3 + note C_, 1 + note F_, 1 + octave 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 2 + note G_, 1 + note A_, 1 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 2 + note G_, 1 + note A_, 1 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note F_, 1 + note F_, 1 + note C_, 1 + note __, 2 + note C_, 1 + note __, 2 + note G_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 2 + note B_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 2 + note C_, 1 + note __, 2 + note C_, 1 + note __, 2 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 2 + octave 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 1 + note C_, 1 + note __, 2 + note G_, 1 + octave 1 + note B_, 1 + note __, 2 + octave 2 + note F#, 1 + note E_, 1 + note __, 2 + note E_, 1 + note D_, 1 + note __, 2 + note G_, 1 + octave 3 + note C_, 1 + note C_, 1 + octave 2 + note G_, 1 + octave 3 + note C_, 1 + note C#, 1 + note C#, 1 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note D_, 1 + note D_, 1 + octave 2 + note A_, 1 + note G_, 1 + note D_, 1 + note __, 3 + note F_, 1 + note __, 1 + note F_, 1 + note F_, 1 + note F_, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note __, 1 + note A#, 1 + note F_, 1 + note A#, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note F_, 1 + note F_, 1 + note F_, 1 + octave 3 + note C_, 1 + octave 2 + note A_, 1 + note A#, 1 + note __, 1 + note A#, 1 + note F_, 1 + octave 3 + note C_, 1 + octave 2 + note A#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note F_, 1 + note F_, 1 + note __, 1 + octave 3 + note C_, 1 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D_, 1 + note D_, 1 + note __, 1 + octave 2 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note D_, 1 + notetype $9, $13 + note G_, 2 + note __, 14 + note G_, 2 + notetype $D, $00 + note __, 6 + notetype $9, $13 + note G_, 2 + notetype $D, $00 + note __, 6 + notetype $9, $13 + note B_, 2 + notetype $F, $00 + note __, 2 + notetype $C, $13 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + octave 2 + note C_, 1 + note D_, 1 + note __, 3 + note E_, 1 + note __, 3 + note C_, 1 + note C_, 1 + note __, 2 + note D_, 1 + note D_, 1 + note __, 1 + notetype $D, $13 + note D_, 1 + loopchannel 0, Music_Route205_Ch3_loop + +Music_Route205_Ch4: + togglenoise 3 +Music_Route205_Ch4_loop: + notetype $C + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 2 + 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#, 2 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note F#, 2 + note F#, 2 + note C#, 2 + note F#, 2 + note C#, 4 + note C#, 4 + note C#, 2 + note C#, 2 + note C#, 2 + notetype $8 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note F#, 12 + note B_, 9 + notetype $C + note F#, 1 + note G_, 1 + note F#, 8 + note B_, 6 + note F#, 1 + note G_, 1 + note F#, 3 + note G_, 1 + note G_, 1 + note F#, 3 + note F#, 3 + note G_, 1 + note G_, 1 + note F#, 2 + note G_, 1 + note F#, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note G_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note B_, 2 + note C#, 1 + note C#, 1 + note F#, 2 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note F#, 2 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note F#, 2 + note C#, 1 + note C#, 1 + note F#, 2 + note C#, 2 + note F#, 2 + note C#, 2 + note F#, 2 + note C#, 1 + note C#, 1 + note F#, 2 + note C#, 2 + note F#, 1 + note C#, 2 + note C#, 1 + note C#, 2 + note C#, 2 + note F#, 1 + note C#, 2 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 1 + note C#, 2 + note C#, 1 + note C#, 2 + notetype $8 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + notetype $C + note C#, 1 + note C#, 1 + note C#, 2 + notetype $8 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 3 + note C#, 1 + note C#, 1 + notetype $A + note C#, 2 + notetype $C + note C#, 1 + note F#, 2 + note C#, 1 + note C#, 1 + note F#, 2 + notetype $8 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 3 + note C#, 3 + note F#, 3 + note C#, 3 + note F#, 3 + note F#, 3 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note F#, 3 + note F#, 3 + note C#, 3 + note C#, 1 + note C#, 1 + note C#, 1 + notetype $C + note F#, 1 + note F#, 1 + note C#, 2 + note F#, 1 + note F#, 1 + note C#, 2 + note C#, 1 + note C#, 3 + note C#, 1 + note C#, 3 + loopchannel 0, Music_Route205_Ch4_loop diff --git a/crysaudio/music/DPPt/route206.asm b/crysaudio/music/DPPt/route206.asm new file mode 100644 index 00000000..db6b58cb --- /dev/null +++ b/crysaudio/music/DPPt/route206.asm @@ -0,0 +1,984 @@ +Music_Route206:: + dbw $C0, Music_Route206_Ch1 + dbw $01, Music_Route206_Ch2 + dbw $02, Music_Route206_Ch3 + dbw $03, Music_Route206_Ch4 + +Music_Route206_Ch1: + tempo $A0 + volume $77 + notetype $4, $71 + dutycycle 2 + tone $0001 + vibrato $10, $15 + octave 2 + note __, 2 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 2 + note B_, 2 + intensity $A6 + dutycycle 3 + octave 3 + note C#, 16 + octave 2 + note A_, 4 + octave 3 + note C#, 4 + note D#, 16 + octave 2 + note B_, 4 + octave 3 + note D#, 4 + note E_, 16 + note C_, 4 + note E_, 4 + note F#, 16 + note D_, 4 + note F#, 4 + note G#, 4 + octave 2 + note B_, 4 + octave 3 + note E_, 4 + octave 2 + note B_, 12 + octave 3 + note G_, 12 + octave 2 + note B_, 4 + octave 3 + note E_, 4 + note G_, 4 + note E_, 14 + intensity $81 + dutycycle 2 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 2 + note B_, 2 +Music_Route206_Ch1_loop: + note __, 12 + intensity $A4 + dutycycle 3 + octave 4 + note D#, 12 + note F#, 12 + octave 5 + note C#, 12 + octave 4 + note B_, 12 + octave 5 + note E_, 12 + intensity $A6 + octave 4 + note B_, 16 + note __, 16 + note __, 4 + intensity $A4 + note E_, 12 + note A_, 12 + octave 5 + note C#, 12 + octave 4 + note B_, 12 + octave 5 + note E_, 12 + intensity $A6 + octave 4 + note B_, 16 + note __, 16 + note __, 4 + intensity $A4 + note D#, 4 + note F#, 4 + note A_, 4 + octave 5 + note C_, 8 + note C_, 8 + octave 4 + note G#, 16 + note __, 4 + note C#, 4 + note E_, 4 + note G_, 4 + note A#, 8 + octave 5 + note C#, 8 + octave 4 + note F#, 8 + octave 2 + note E_, 4 + note A_, 4 + octave 3 + note C#, 4 + octave 2 + note A_, 4 + octave 3 + note C#, 4 + note E_, 4 + octave 4 + note A_, 8 + note B_, 8 + octave 5 + note F#, 8 + intensity $A1 + octave 2 + note F#, 2 + note B_, 2 + octave 3 + note C#, 2 + note E_, 2 + note C#, 2 + octave 2 + note B_, 2 + note F#, 2 + note B_, 2 + octave 3 + note C#, 2 + note F#, 2 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note F#, 2 + note B_, 2 + octave 4 + note C#, 2 + note E_, 2 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 5 + note D#, 2 + dutycycle 2 + octave 3 + note B_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note E_, 2 + note C_, 2 + octave 2 + note G_, 2 + note E_, 2 + note G_, 2 + octave 3 + note C_, 2 + note D_, 2 + note F#, 2 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + note A_, 2 + octave 5 + note D_, 2 + note F#, 2 + note G#, 2 + note E_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 2 + note F#, 2 + note A_, 2 + note E_, 2 + note C#, 2 + octave 3 + note A_, 2 + note E_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + note B_, 2 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + note B_, 2 + octave 5 + note D#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 3 + note E_, 2 + note G#, 2 + intensity $A6 + dutycycle 3 + octave 2 + note A_, 12 + note B_, 12 + octave 3 + note E_, 12 + octave 2 + note B_, 12 + note G_, 12 + note A_, 12 + note B_, 12 + octave 3 + note C_, 12 + octave 2 + note B_, 16 + note __, 16 + note __, 16 + note __, 14 + intensity $81 + dutycycle 2 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 2 + note B_, 2 + loopchannel 0, Music_Route206_Ch1_loop + +Music_Route206_Ch2: + notetype $4, $91 + dutycycle 2 + vibrato $12, $36 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 2 + note B_, 4 + dutycycle 3 + octave 4 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + intensity $B4 + note E_, 4 + octave 3 + note E_, 4 + note B_, 4 + octave 4 + note E_, 4 + note F#, 8 + octave 3 + note B_, 8 + octave 4 + note F#, 8 + intensity $B1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + intensity $B4 + note G_, 4 + octave 3 + note G_, 4 + octave 4 + note C_, 4 + note G_, 4 + note A_, 8 + note D_, 8 + note A_, 8 + note B_, 4 + note B_, 4 + octave 5 + note E_, 1 + note F#, 1 + note E_, 6 + octave 4 + note E_, 8 + note G_, 4 + note G_, 4 + octave 5 + note E_, 1 + note F#, 1 + note E_, 6 + octave 3 + note B_, 4 + octave 4 + note G_, 4 + note G#, 12 + intensity $91 + dutycycle 2 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 2 + note B_, 4 +Music_Route206_Ch2_loop: + intensity $A5 + dutycycle 3 + octave 3 + note B_, 16 + note D#, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 8 + octave 4 + note C#, 8 + note D#, 8 + note F#, 16 + note E_, 4 + octave 3 + note B_, 4 + note G#, 16 + note __, 8 + octave 4 + note C#, 16 + octave 3 + note A_, 4 + octave 4 + note E_, 4 + note D#, 8 + note E_, 8 + note F#, 8 + note A_, 16 + note G#, 4 + note E_, 4 + octave 3 + note B_, 16 + note __, 8 + octave 4 + note D#, 8 + note F#, 8 + note A_, 8 + note G#, 4 + note D#, 4 + note C_, 4 + octave 3 + note G#, 12 + octave 4 + note C#, 8 + note E_, 8 + note G_, 8 + note F#, 4 + note C#, 4 + octave 3 + note A#, 4 + note F#, 8 + note G#, 4 + note A_, 16 + note C#, 4 + note E_, 4 + note A_, 8 + note B_, 8 + octave 4 + note F#, 8 + intensity $B7 + note B_, 16 + intensity $4D + note B_, 16 + intensity $B8 + note B_, 16 + dutycycle 2 + octave 3 + note E_, 16 + note E_, 8 + note F#, 16 + note F#, 8 + note G#, 8 + note E_, 4 + octave 2 + note B_, 16 + note B_, 16 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note E_, 4 + note F#, 4 + note F#, 12 + note E_, 4 + note F#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 3 + note B_, 16 + note B_, 8 + note B_, 12 + intensity $B4 + octave 4 + note E_, 8 + note E_, 16 + note __, 12 + note E_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 3 + note G_, 4 + octave 4 + note E_, 4 + note F#, 4 + octave 3 + note A_, 4 + octave 4 + note F#, 4 + note G_, 4 + octave 3 + note B_, 4 + octave 4 + note G_, 4 + note C_, 4 + note A_, 4 + octave 5 + note C_, 4 + notetype $1, $B1 + forceoctave 27 + note C_, 4 + note D_, 5 + note C_, 5 + note D_, 5 + note C_, 5 + note D_, 4 + note C_, 5 + note D_, 5 + note C_, 5 + note D_, 5 + note C_, 4 + note D_, 5 + note C_, 5 + note D_, 5 + note C_, 5 + note D_, 4 + note C_, 5 + note D_, 5 + note C_, 5 + note D_, 5 + note C_, 4 + note D_, 5 + note C_, 5 + note D_, 5 + note C_, 5 + note D_, 4 + note C_, 5 + note D_, 5 + note C_, 5 + note D_, 5 + note C_, 4 + note D_, 5 + note C_, 5 + note D_, 5 + note C_, 5 + note D_, 4 + note C_, 5 + note D_, 5 + note C_, 5 + note D_, 5 + notetype $4, $B7 + forceoctave 28 + octave 4 + note B_, 12 + intensity $91 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 4 + note E_, 4 + octave 2 + note B_, 4 + loopchannel 0, Music_Route206_Ch2_loop + +Music_Route206_Ch3: + notetype $4, $12 + octave 2 + note __, 16 + note __, 16 + note __, 4 + note A_, 8 + note E_, 4 + note A_, 4 + note C#, 4 + note E_, 4 + note B_, 8 + note F#, 4 + note B_, 4 + note D#, 4 + note F#, 4 + octave 3 + note C_, 8 + octave 2 + note G_, 4 + octave 3 + note C_, 4 + octave 2 + note E_, 4 + note G_, 4 + octave 3 + note D_, 8 + octave 2 + note A_, 4 + octave 3 + note D_, 4 + octave 2 + note F#, 4 + note A_, 4 + note E_, 4 + note B_, 4 + octave 3 + note F#, 4 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note E_, 4 + octave 2 + note E_, 4 + octave 3 + note F#, 4 + note E_, 4 + octave 2 + note B_, 4 + note G_, 4 + octave 3 + note E_, 4 + octave 2 + note E_, 4 + note B_, 4 + octave 3 + note E_, 4 + octave 2 + note B_, 8 + note B_, 4 + octave 3 + note E_, 12 + octave 2 + note G#, 12 +Music_Route206_Ch3_loop: + note B_, 12 + octave 1 + note B_, 4 + octave 2 + note F#, 4 + note A_, 4 + note B_, 12 + octave 1 + note B_, 12 + octave 2 + note E_, 12 + octave 1 + note B_, 4 + octave 2 + note E_, 4 + note G#, 4 + note B_, 12 + note E_, 12 + note A_, 12 + note C#, 4 + note E_, 4 + note A_, 4 + note B_, 12 + octave 1 + note B_, 12 + octave 2 + note E_, 12 + octave 1 + note B_, 4 + octave 2 + note E_, 4 + note A_, 4 + note G#, 12 + note E_, 12 + note D#, 12 + note C_, 4 + note D#, 4 + note F#, 4 + note G#, 12 + note F#, 4 + note D#, 4 + note C_, 4 + note C#, 12 + note E_, 4 + note G_, 4 + octave 3 + note C#, 4 + octave 2 + note A#, 12 + note F#, 4 + note C#, 4 + note F#, 4 + octave 3 + note C#, 12 + octave 2 + note E_, 12 + note A_, 12 + octave 3 + note C#, 12 + octave 2 + note B_, 16 + note B_, 8 + octave 3 + note E_, 12 + note F#, 12 + octave 2 + note C_, 16 + note C_, 4 + note C_, 4 + note D_, 16 + note D_, 4 + note D_, 4 + note E_, 16 + note E_, 16 + note E_, 4 + note E_, 12 + note A_, 12 + note A_, 12 + note B_, 12 + note B_, 12 + note E_, 12 + note E_, 12 + note G#, 12 + note G#, 12 + note A_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note A_, 4 + note E_, 4 + octave 3 + note C#, 4 + octave 2 + note A_, 4 + note E_, 4 + note C#, 4 + note E_, 4 + note A_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note A_, 4 + note C_, 4 + note A_, 4 + note B_, 4 + note D_, 4 + note B_, 4 + octave 3 + note C_, 4 + octave 2 + note G_, 4 + octave 3 + note C_, 4 + octave 1 + note B_, 4 + note B_, 4 + octave 2 + note F#, 4 + octave 1 + note B_, 4 + note B_, 4 + octave 2 + note F#, 4 + octave 1 + note B_, 4 + note B_, 4 + octave 2 + note F#, 4 + octave 1 + note B_, 4 + note B_, 4 + octave 2 + note F#, 4 + octave 1 + note B_, 4 + octave 2 + note F#, 4 + note A_, 4 + note B_, 4 + note F#, 4 + note B_, 4 + octave 3 + note E_, 12 + octave 2 + note G#, 12 + loopchannel 0, Music_Route206_Ch3_loop + +Music_Route206_Ch4: + togglenoise 0 + notetype $4 + note __, 16 + note __, 16 + note __, 16 + note C_, 4 + note D#, 2 + note D#, 2 + note D#, 16 + note G#, 16 + note __, 8 + note C_, 2 + note D#, 2 + note D#, 4 + note D#, 16 + note G#, 12 + note C_, 4 + note D#, 2 + note D#, 2 + note D#, 4 + note G#, 12 + note C_, 4 + note D#, 2 + note D#, 2 + note D#, 4 + note G#, 12 + note C_, 4 + note D#, 4 + note D#, 4 + note G#, 16 +Music_Route206_Ch4_loop: + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 4 + note G#, 8 + note D#, 4 + note C_, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note G#, 8 + note D#, 4 + note C_, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note G#, 8 + note D#, 4 + note C_, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note C_, 2 + note D#, 2 + note D#, 2 + 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 G#, 8 + note D#, 4 + note C_, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note G#, 8 + note D#, 4 + note C_, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note G#, 8 + note D#, 4 + note C_, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note C_, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note G#, 4 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note C_, 4 + note D#, 4 + note D#, 4 + note C_, 4 + note D#, 4 + note D#, 4 + note C_, 4 + note D#, 4 + note D#, 4 + note C_, 4 + note D#, 4 + note D#, 4 + note G#, 4 + note D#, 4 + note D#, 4 + note G#, 4 + note D#, 4 + note D#, 4 + note G#, 4 + note D#, 4 + note D#, 4 + note G#, 4 + note D#, 4 + note D#, 4 + note G#, 4 + note D#, 4 + note D#, 4 + note C_, 4 + note D#, 4 + note D#, 4 + note C_, 4 + note D#, 4 + note D#, 4 + note C_, 4 + note D#, 4 + note D#, 4 + note C_, 12 + note G#, 16 + loopchannel 0, Music_Route206_Ch4_loop diff --git a/crysaudio/music/DPPt/sinnohtrainer.asm b/crysaudio/music/DPPt/sinnohtrainer.asm new file mode 100644 index 00000000..50d27f28 --- /dev/null +++ b/crysaudio/music/DPPt/sinnohtrainer.asm @@ -0,0 +1,1623 @@ +Music_SinnohTrainerBattle:: + dbw $80, Music_SinnohTrainerBattle_Ch1 + dbw $01, Music_SinnohTrainerBattle_Ch2 + dbw $02, Music_SinnohTrainerBattle_Ch3 + +Music_SinnohTrainerBattle_Ch1: + tempo $68 + volume $77 + notetype $C, $B2 + dutycycle 3 + tone $0002 + vibrato $12, $15 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + octave 3 + note C_, 6 + note C_, 6 + note C_, 4 + note C_, 8 + note C_, 2 + intensity $B7 + note C#, 6 + intensity $B2 + note C_, 6 + note C_, 6 + note C_, 4 + note C_, 8 + note C_, 2 + intensity $B7 + note C#, 6 + intensity $B2 + note G_, 6 + note G_, 6 + note G_, 4 + note G_, 8 + note G_, 2 + intensity $B7 + note G#, 6 + intensity $B2 + note G_, 6 + note G_, 6 + note G_, 4 + note G_, 8 + note G_, 2 + intensity $B7 + note G#, 6 +Music_SinnohTrainerBattle_Ch1_loop: + intensity $B4 + octave 2 + note G_, 6 + octave 3 + note C_, 6 + note G_, 4 + note G_, 4 + note F_, 4 + note E_, 4 + note C_, 2 + note D_, 2 + intensity $B1 + note C_, 3 + note D_, 1 + intensity $B7 + note E_, 8 + intensity $B1 + note D_, 3 + note E_, 1 + intensity $B4 + note F_, 4 + note G#, 4 + note G_, 4 + note F_, 4 + octave 2 + note G_, 6 + octave 3 + note C_, 6 + note G_, 4 + note G_, 4 + note F_, 4 + note E_, 4 + note C_, 2 + note D_, 2 + intensity $B1 + note C_, 3 + note D_, 1 + intensity $B7 + note E_, 8 + intensity $B1 + note G_, 3 + note A_, 1 + intensity $B4 + note A#, 8 + note A_, 4 + note A#, 4 + intensity $B1 + octave 2 + note G_, 3 + note E_, 1 + intensity $B4 + note E_, 4 + intensity $B1 + octave 3 + note C_, 3 + octave 2 + note G_, 1 + intensity $B4 + note G_, 4 + intensity $B1 + octave 3 + note E_, 3 + note C_, 1 + intensity $B7 + note C_, 12 + intensity $B1 + octave 2 + note A#, 3 + note F_, 1 + intensity $B4 + note F_, 4 + intensity $B1 + octave 3 + note D_, 3 + octave 2 + note A#, 1 + intensity $B4 + note A#, 4 + intensity $B1 + octave 3 + note F_, 3 + note D_, 1 + intensity $B7 + note D_, 12 + note G_, 8 + intensity $B1 + note E_, 3 + note F_, 1 + intensity $B4 + note E_, 4 + octave 4 + note C_, 8 + octave 3 + note A_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + intensity $B1 + octave 2 + note A#, 2 + note A#, 2 + note A#, 8 + note A#, 3 + octave 3 + note C#, 1 + intensity $B4 + note D_, 4 + intensity $B2 + note F_, 1 + note A_, 1 + note A#, 1 + octave 4 + note C_, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + intensity $B1 + note C_, 2 + note C_, 2 + note C_, 8 + note C_, 3 + note D_, 1 + intensity $B4 + note E_, 4 + intensity $B2 + note G_, 1 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A_, 1 + note G_, 1 + intensity $B1 + note C#, 2 + note C#, 2 + note C#, 8 + note C#, 3 + note D#, 1 + intensity $B4 + note F_, 4 + intensity $B2 + note G#, 1 + octave 4 + note C_, 1 + note C#, 1 + note D#, 1 + note F_, 1 + note D#, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 3 + note A#, 1 + note G#, 1 + intensity $B1 + note D#, 2 + note D#, 2 + note D#, 8 + note D#, 3 + note F_, 1 + intensity $B4 + note G_, 4 + intensity $B2 + note A#, 1 + octave 4 + note D_, 1 + note D#, 1 + note F_, 1 + note G_, 1 + note F_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + intensity $B4 + octave 4 + note C_, 16 + note __, 8 + notetype $4, $B4 + octave 3 + note A#, 8 + octave 4 + note C_, 8 + octave 3 + note A#, 8 + notetype $C, $B4 + note A_, 16 + note F_, 16 + note C_, 16 + note __, 16 + note C#, 16 + note __, 16 + octave 2 + note A#, 16 + note __, 16 + octave 3 + note C#, 16 + note __, 16 + note C_, 16 + note __, 16 + note C#, 16 + note __, 16 + note D#, 16 + note __, 16 + note F#, 16 + note __, 16 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 6 + note F#, 4 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note F_, 2 + note F#, 2 + note D#, 2 + intensity $B1 + octave 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + intensity $B2 + octave 3 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + loopchannel 0, Music_SinnohTrainerBattle_Ch1_loop + +Music_SinnohTrainerBattle_Ch2: + notetype $C, $C2 + dutycycle 3 + tone $0001 + vibrato $08, $36 + octave 5 + note C_, 2 + octave 4 + note B_, 1 + octave 5 + note C_, 1 + note C#, 4 + note C#, 2 + note C_, 1 + note C#, 1 + note D_, 4 + note D#, 2 + note D_, 1 + note D#, 1 + note E_, 4 + note E_, 2 + note D#, 1 + note E_, 1 + note F_, 4 + octave 4 + note C_, 6 + note C_, 6 + note C_, 4 + note C_, 4 + octave 3 + note G_, 4 + octave 4 + note C_, 2 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C_, 6 + note C_, 4 + note C_, 4 + octave 3 + note G_, 4 + octave 4 + note C_, 2 + note C#, 2 + note D#, 2 + note E_, 2 + note G_, 6 + note G_, 6 + note G_, 4 + note G_, 4 + note C_, 4 + note G_, 2 + note G#, 2 + note F_, 2 + note G#, 2 + note G_, 6 + note G_, 6 + note G_, 4 + note G_, 4 + note C_, 4 + note G_, 2 + note G#, 2 + note A#, 2 + note B_, 2 +Music_SinnohTrainerBattle_Ch2_loop: + intensity $C7 + octave 3 + note C_, 6 + note G_, 6 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + intensity $C1 + note E_, 3 + note F_, 1 + intensity $C7 + note G_, 8 + octave 4 + note D_, 4 + octave 3 + note A#, 16 + note C_, 6 + note G_, 6 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + intensity $C1 + note E_, 3 + note F_, 1 + intensity $C7 + note G_, 8 + intensity $C1 + octave 4 + note C_, 3 + note D_, 1 + intensity $C7 + note E_, 8 + note D_, 8 + intensity $C1 + octave 3 + note E_, 3 + note C_, 1 + intensity $C4 + note C_, 4 + intensity $C1 + note G_, 3 + note E_, 1 + intensity $C4 + note E_, 4 + intensity $C1 + octave 4 + note C_, 3 + octave 3 + note G_, 1 + intensity $C4 + note G_, 12 + intensity $C1 + note F_, 3 + note D_, 1 + intensity $C4 + note D_, 4 + intensity $C1 + note A#, 3 + note F_, 1 + intensity $C4 + note F_, 4 + intensity $C1 + octave 4 + note D_, 3 + octave 3 + note A#, 1 + intensity $C7 + note A#, 8 + note B_, 4 + octave 4 + note C_, 12 + octave 3 + note G_, 4 + octave 4 + note E_, 12 + note C_, 4 + note G_, 12 + note F_, 3 + note D#, 1 + note E_, 16 + note G_, 8 + intensity $C2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + intensity $C7 + note D_, 16 + note E_, 8 + intensity $C2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + intensity $C7 + note E_, 16 + notetype $4, $C2 + note F_, 8 + note E_, 8 + note F_, 8 + notetype $C, $C2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note G#, 2 + note A#, 2 + note G_, 2 + note G#, 2 + note A#, 2 + octave 5 + note C_, 2 + octave 4 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 4 + note F_, 2 + note G_, 2 + note A#, 2 + note G#, 2 + note G_, 2 + note A#, 2 + intensity $C0 + note A_, 16 + note A#, 16 + octave 5 + note C_, 12 + octave 4 + note A#, 4 + note A_, 16 + intensity $C7 + octave 3 + note G_, 16 + note __, 16 + note G#, 16 + note __, 16 + note F_, 16 + note __, 16 + note G#, 16 + note __, 16 + note G_, 16 + note __, 16 + note G#, 16 + note __, 16 + note A#, 16 + note __, 16 + octave 4 + note C#, 16 + note __, 16 + intensity $C4 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 6 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 2 + note D#, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note C#, 2 + octave 3 + note A#, 2 + intensity $C2 + octave 4 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note F_, 2 + loopchannel 0, Music_SinnohTrainerBattle_Ch2_loop + +Music_SinnohTrainerBattle_Ch3: + notetype $C, $19 + note __, 16 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note D#, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note D#, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + note D#, 2 + note C#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note D#, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note A#, 2 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 +Music_SinnohTrainerBattle_Ch3_loop: + octave 3 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note G_, 2 + note C_, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note A#, 2 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note A_, 4 + note F_, 4 + note A_, 4 + note F_, 4 + note A_, 4 + note F_, 4 + note A_, 4 + note F_, 4 + note C_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + note E_, 2 + note F_, 2 + note F_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note F_, 2 + note A_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note F_, 2 + octave 4 + note C_, 2 + note C_, 2 + octave 3 + note F_, 2 + octave 4 + note C_, 2 + note C_, 2 + octave 3 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + octave 4 + note C_, 2 + note C_, 2 + octave 3 + note F_, 2 + octave 4 + note C_, 2 + note C_, 2 + octave 3 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F#, 2 + note F_, 2 + note D#, 2 + note F#, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note D#, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note A#, 2 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note D#, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note A#, 2 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note D#, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note A#, 2 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + loopchannel 0, Music_SinnohTrainerBattle_Ch3_loop diff --git a/crysaudio/music/DPPt/sinnohwild.asm b/crysaudio/music/DPPt/sinnohwild.asm new file mode 100644 index 00000000..0e5805ea --- /dev/null +++ b/crysaudio/music/DPPt/sinnohwild.asm @@ -0,0 +1,1176 @@ +Music_SinnohWildBattle:: + dbw $80, Music_SinnohWildBattle_Ch1 + dbw $01, Music_SinnohWildBattle_Ch2 + dbw $02, Music_SinnohWildBattle_Ch3 + +Music_SinnohWildBattle_Ch1: + tempo $68 + volume $77 + notetype $C, $B2 + dutycycle 3 + tone $0002 + vibrato $12, $15 + octave 3 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note C_, 6 + note G_, 6 + note F_, 12 + note C_, 8 + note C#, 6 + note G#, 6 + note G_, 12 + intensity $3F + note C#, 8 + intensity $B2 + octave 3 + note C_, 6 + note G_, 6 + note F_, 12 + note C_, 8 + note C#, 6 + note G#, 6 + note G_, 16 + octave 2 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 +Music_SinnohWildBattle_Ch1_loop: + intensity $B2 + octave 3 + note G_, 2 + note G_, 4 + note G_, 2 + note C_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note C_, 2 + note G_, 4 + note G_, 2 + note G#, 2 + note G#, 4 + note G#, 2 + note C#, 2 + note G#, 4 + note G#, 2 + octave 4 + note C#, 2 + note C#, 4 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 4 + note C#, 2 + octave 3 + note G_, 2 + note G_, 4 + note G_, 2 + note C_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note C_, 2 + note G_, 4 + note G_, 2 + note G#, 2 + note G#, 4 + note G#, 2 + note C#, 2 + note G#, 4 + note G#, 2 + note G#, 2 + note G#, 4 + note G#, 2 + note F_, 2 + note G#, 4 + note G#, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note D_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note D_, 2 + note A_, 4 + note A_, 2 + note A#, 2 + note A#, 4 + note A#, 2 + note D#, 2 + note A#, 4 + note A#, 2 + octave 4 + note D#, 2 + note D#, 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 4 + note D#, 2 + octave 3 + note A_, 2 + note A_, 4 + note A_, 2 + note D_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note D_, 2 + note A_, 4 + note A_, 2 + note A#, 2 + note A#, 4 + note A#, 2 + note D#, 2 + note A#, 4 + note A#, 2 + note G_, 2 + note A#, 4 + note A#, 2 + note G_, 2 + note A#, 4 + note A#, 2 + intensity $B1 + dutycycle 2 + octave 4 + note A#, 2 + note D#, 2 + note A#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + note D#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + note D#, 2 + note A#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + octave 5 + note D#, 2 + note G_, 2 + note D#, 2 + octave 4 + note A#, 6 + intensity $B5 + note G#, 8 + octave 5 + note C#, 4 + note F_, 4 + note D#, 4 + note C_, 4 + note F_, 4 + intensity $B1 + octave 4 + note A#, 2 + note D#, 2 + note A#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + note D#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + note D#, 2 + note A#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + octave 5 + note D#, 2 + note G_, 2 + note D#, 2 + octave 4 + note A#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + octave 5 + note D#, 2 + note G_, 2 + note D#, 2 + octave 4 + note A#, 2 + octave 5 + note G_, 2 + note D#, 2 + octave 4 + note A#, 2 + octave 5 + note D#, 2 + note G_, 2 + note D#, 2 + note G_, 2 + note A#, 2 + note G_, 2 + note D#, 2 + dutycycle 0 + note G#, 2 + note C#, 2 + note G#, 2 + octave 6 + note C#, 2 + octave 5 + note G#, 2 + note C#, 2 + octave 6 + note C#, 2 + octave 5 + note G#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + octave 6 + note D_, 2 + octave 5 + note A_, 2 + note D_, 2 + octave 6 + note D_, 2 + octave 5 + note A_, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 6 + note D#, 2 + octave 5 + note A#, 2 + note D#, 2 + octave 6 + note D#, 2 + octave 5 + note A#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 6 + note D#, 2 + octave 5 + note A#, 2 + note D#, 2 + octave 6 + note D#, 2 + octave 5 + note A#, 2 + dutycycle 3 + note C_, 2 + octave 4 + note F_, 2 + note G_, 2 + note C#, 2 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note A#, 2 + note G_, 2 + note G#, 2 + note F_, 2 + note G_, 2 + note D#, 2 + note F_, 2 + note C#, 2 + octave 5 + note C_, 2 + octave 4 + note F_, 2 + note G_, 2 + note C#, 2 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note A#, 2 + note G_, 2 + note G#, 2 + note F_, 2 + note G_, 2 + note D#, 2 + note F_, 2 + note C#, 2 + octave 6 + note E_, 2 + octave 5 + note A_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note F_, 2 + octave 6 + note E_, 2 + octave 5 + note A_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note F_, 2 + intensity $B7 + octave 3 + note E_, 10 + note E_, 2 + note D_, 2 + note C_, 2 + octave 2 + note G_, 6 + note C_, 10 + octave 3 + note F_, 10 + note F_, 2 + note D#, 2 + note C#, 2 + octave 2 + note G#, 6 + note C#, 10 + octave 3 + note F#, 10 + note F#, 2 + note E_, 2 + note D_, 2 + octave 2 + note A_, 6 + note D_, 16 + note __, 10 + note A_, 6 + note D_, 10 + loopchannel 0, Music_SinnohWildBattle_Ch1_loop + +Music_SinnohWildBattle_Ch2: + notetype $C, $C2 + dutycycle 3 + tone $0001 + vibrato $08, $36 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 2 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 2 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 2 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 2 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 2 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 2 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 2 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 2 + octave 3 + note C_, 6 + note G_, 6 + note F_, 12 + note C_, 8 + note C#, 6 + note G#, 6 + note G_, 12 + intensity $4F + note C#, 8 + intensity $C2 + octave 4 + note C_, 6 + note G_, 6 + note F_, 12 + note C_, 8 + note C#, 6 + note G#, 6 + note G_, 12 + intensity $4F + octave 5 + note C#, 8 +Music_SinnohWildBattle_Ch2_loop: + intensity $C7 + octave 4 + note C_, 10 + intensity $C1 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + intensity $4F + note G#, 16 + intensity $C7 + note G#, 16 + note C_, 10 + intensity $C1 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + intensity $4F + octave 3 + note A#, 16 + intensity $C7 + note A#, 12 + intensity $C1 + octave 4 + note C#, 4 + intensity $C7 + note D_, 10 + intensity $C1 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + intensity $4F + note A#, 16 + intensity $C7 + note A#, 16 + note D_, 6 + octave 3 + note A_, 4 + note A_, 2 + intensity $C1 + octave 4 + note D_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + intensity $4F + note C_, 16 + intensity $C7 + note C_, 12 + note D#, 4 + octave 3 + note A#, 10 + note A#, 2 + intensity $C1 + note G#, 2 + note G_, 2 + intensity $C7 + note D#, 6 + octave 2 + note A#, 8 + intensity $C1 + note G#, 1 + octave 3 + note C#, 1 + intensity $C7 + note F_, 6 + intensity $C1 + note C#, 1 + note F_, 1 + intensity $C7 + note G#, 6 + intensity $C1 + note F_, 1 + note G#, 1 + intensity $C7 + octave 4 + note C#, 8 + note C_, 8 + intensity $C1 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note G#, 2 + intensity $C7 + note A#, 16 + note __, 8 + intensity $C1 + note A#, 2 + note G#, 2 + note G_, 2 + note G#, 2 + intensity $C7 + note A#, 16 + note __, 8 + intensity $4F + octave 4 + note G#, 16 + intensity $6F + note A_, 16 + intensity $8F + note A#, 16 + intensity $C7 + note A#, 16 + octave 3 + note C_, 6 + note G_, 6 + note F_, 4 + note C#, 16 + note C_, 6 + note G_, 6 + note F_, 4 + note G#, 16 + note E_, 6 + note B_, 6 + note A_, 4 + note F_, 16 + note E_, 6 + note B_, 6 + note A_, 4 + octave 4 + note C_, 12 + note D#, 4 + octave 3 + note G_, 10 + note G_, 2 + note F_, 2 + note E_, 2 + note C_, 6 + octave 2 + note G_, 10 + octave 3 + note G#, 10 + note G#, 2 + note F#, 2 + note F_, 2 + note C#, 6 + octave 2 + note G#, 10 + octave 3 + note A_, 10 + note A_, 2 + note G_, 2 + note F#, 2 + note D_, 6 + octave 2 + note A_, 16 + note __, 10 + octave 3 + note D_, 6 + octave 2 + note A_, 10 + loopchannel 0, Music_SinnohWildBattle_Ch2_loop + +Music_SinnohWildBattle_Ch3: + notetype $C, $13 + octave 2 + note D_, 2 + note D#, 1 + note E_, 1 + note D#, 2 + note E_, 1 + note F_, 1 + note E_, 2 + note F_, 1 + note F#, 1 + note F_, 2 + note F#, 1 + note G_, 1 + note F#, 2 + note G_, 1 + note G#, 1 + note G_, 2 + note G#, 1 + note A_, 1 + note G#, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 4 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note G_, 2 + note F_, 2 + note G#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 4 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note G_, 2 + note F_, 2 + note G#, 2 +Music_SinnohWildBattle_Ch3_loop: + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + note G_, 4 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + note F_, 4 + note G_, 2 + note G_, 2 + note F_, 2 + note C#, 2 + note G#, 2 + octave 3 + note G#, 2 + note C#, 4 + octave 2 + note G#, 2 + note F_, 2 + note G#, 2 + note C#, 2 + note G#, 2 + octave 3 + note F_, 2 + note C#, 4 + octave 2 + note G#, 2 + note F_, 2 + note G#, 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + note G_, 4 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + note F_, 4 + note G_, 2 + note G_, 2 + note F_, 2 + note C#, 2 + note G#, 2 + octave 1 + note G#, 2 + octave 2 + note C#, 4 + note G#, 2 + note F_, 2 + note G#, 2 + note C#, 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note C#, 2 + note G#, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note A_, 4 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note G_, 4 + note A_, 2 + note A_, 2 + note G_, 2 + note D#, 2 + note A#, 2 + octave 3 + note A#, 2 + note D#, 4 + octave 2 + note A#, 2 + note G_, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note G_, 2 + note D#, 4 + octave 2 + note A#, 2 + note G_, 2 + note A#, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note A_, 4 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note G_, 4 + note A_, 2 + note A_, 2 + note G_, 2 + note D#, 2 + note A#, 2 + octave 3 + note G_, 2 + note D#, 4 + octave 2 + note A#, 2 + note G_, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note G_, 2 + octave 2 + note A#, 2 + note D#, 2 + note G_, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note G#, 2 + note C#, 2 + octave 3 + note C#, 4 + octave 2 + note G#, 2 + note C#, 2 + octave 3 + note F_, 4 + octave 2 + note G#, 2 + note C#, 2 + octave 3 + note F_, 2 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note A#, 2 + note G#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note B_, 2 + note A_, 1 + note A#, 1 + note B_, 2 + octave 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note G#, 2 + note C#, 2 + note C#, 2 + note G#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note G#, 2 + note C#, 2 + note C#, 2 + note G#, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note A#, 2 + note D#, 2 + note D#, 2 + note A#, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note A#, 2 + note D#, 2 + note D#, 2 + note A#, 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + note G_, 4 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + note F_, 4 + note G_, 2 + note G_, 2 + note F_, 2 + note C#, 2 + note G#, 2 + octave 3 + note F_, 2 + note C#, 4 + octave 2 + note G#, 2 + note F_, 2 + note G#, 2 + note C#, 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note C#, 2 + note F_, 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note D_, 2 + note A_, 2 + octave 3 + note F#, 2 + note D_, 4 + octave 2 + note A_, 2 + note F#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + note F#, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note A_, 2 + octave 3 + note F#, 2 + note D_, 4 + octave 2 + note A_, 2 + note F#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + note A_, 2 + note G_, 2 + loopchannel 0, Music_SinnohWildBattle_Ch3_loop diff --git a/crysaudio/music/RBY/bikeriding.asm b/crysaudio/music/RBY/bikeriding.asm new file mode 100644 index 00000000..76382362 --- /dev/null +++ b/crysaudio/music/RBY/bikeriding.asm @@ -0,0 +1,696 @@ +Music_BikeRiding: + dbw $C0, Music_BikeRiding_Ch1 + dbw $01, Music_BikeRiding_Ch2 + dbw $02, Music_BikeRiding_Ch3 + dbw $03, Music_BikeRiding_Ch4 + +Music_BikeRiding_Ch1: + tempo 144 + volume 119 + dutycycle 3 + vibrato $8, $14 + notetype $c, $b5 + octave 3 + note G_, 2 +Music_BikeRiding_branch_7dbc9: + octave 4 + note C_, 4 + note D_, 4 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 4 + note E_, 2 + note D_, 2 + note F_, 4 + note D_, 4 + octave 3 + note B_, 2 + octave 4 + note F_, 4 + note D_, 4 + note E_, 2 + note F_, 2 + note G_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + intensity $b6 + note F_, 10 + intensity $a6 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 10 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + intensity $b3 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 2 + note E_, 1 + note F_, 1 + intensity $b5 + note G_, 6 + note G_, 6 + note A_, 2 + note F_, 2 + note G_, 6 + intensity $b4 + note G_, 2 + note F_, 4 + intensity $a4 + note E_, 2 + note D_, 2 + intensity $93 + octave 3 + note A_, 2 + octave 4 + note C_, 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 1 + note B_, 1 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note C_, 4 + note C_, 2 + octave 3 + note A_, 2 + note B_, 2 + note B_, 2 + note A_, 2 + octave 4 + note C_, 4 + octave 3 + note A_, 2 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 2 + octave 4 + note D_, 4 + octave 3 + note B_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 4 + intensity $3d + note C_, 4 + intensity $b4 + note F_, 6 + note G_, 4 + note F_, 1 + note G_, 1 + note F_, 4 + note E_, 6 + note F_, 2 + note E_, 2 + note D_, 1 + note E_, 1 + note D_, 2 + note C_, 2 + intensity $b5 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note C_, 4 + note F_, 4 + note D_, 4 + note F#, 4 + vibrato $a, $26 + intensity $80 + note G_, 16 + note G_, 4 + intensity $87 + note G_, 12 + intensity $b5 + vibrato $8, $14 + loopchannel 0, Music_BikeRiding_branch_7dbc9 +Music_BikeRiding_Ch2: + dutycycle 2 + vibrato $6, $15 + notetype $c, $c3 + octave 4 + note C_, 2 +Music_BikeRiding_branch_7dc75: + note E_, 4 + note F_, 4 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 6 + note A_, 1 + note B_, 1 + note A_, 10 + note F_, 2 + note G_, 2 + note A_, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 1 + note B_, 1 + octave 5 + note C_, 6 + octave 4 + note A_, 2 + note G_, 4 + dutycycle 3 + notetype $c, $84 + note A#, 6 + dutycycle 2 + notetype $c, $c5 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 10 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 10 + notetype $c, $c3 + octave 5 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + notetype $c, $b0 + note D_, 4 + notetype $c, $c7 + note D_, 10 + note D_, 1 + note C_, 1 + notetype $c, $b0 + octave 4 + note B_, 4 + notetype $c, $c7 + note B_, 12 + notetype $c, $c4 + note F_, 6 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 6 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note F_, 2 + note E_, 2 + note G_, 4 + note F_, 2 + note E_, 6 + notetype $6, $c2 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + notetype $c, $c3 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note B_, 4 + note A_, 4 + note G_, 2 + note A#, 4 + note A_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + notetype $8, $c4 + note A_, 4 + note G_, 4 + note F_, 4 + note B_, 4 + note A_, 4 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + note A_, 4 + octave 5 + note D_, 4 + note E_, 4 + note C_, 4 + notetype $c, $c7 + note D_, 12 + note C_, 4 + notetype $c, $b0 + octave 4 + note B_, 4 + notetype $c, $c7 + note B_, 12 + notetype $c, $c3 + loopchannel 0, Music_BikeRiding_branch_7dc75 +Music_BikeRiding_Ch3: + notetype $c, $13 + note __, 2 +Music_BikeRiding_branch_7dd17: + octave 4 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + note C_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + note C_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + note C_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note E_, 1 + note __, 1 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + loopchannel 0, Music_BikeRiding_branch_7dd17 +Music_BikeRiding_Ch4: + togglenoise $1 + notetype $c + note __, 2 +Music_BikeRiding_branch_7de6a: + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dec2 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dec2 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7deb4 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + callchannel Music_BikeRiding_branch_7dea7 + loopchannel 0, Music_BikeRiding_branch_7de6a +Music_BikeRiding_branch_7dea7: + note __, 2 + note G#, 2 + note __, 2 + note G#, 2 + note __, 2 + note G#, 2 + note __, 2 + note G#, 2 + endchannel +Music_BikeRiding_branch_7deb4: + note __, 2 + note G#, 2 + note __, 2 + note G#, 2 + note __, 2 + note G#, 2 + note G#, 2 + note G#, 2 + endchannel +Music_BikeRiding_branch_7dec2: + note __, 2 + note G#, 2 + note __, 2 + note G#, 2 + note __, 2 + note G#, 2 + note __, 2 + note G#, 1 + note G#, 1 + endchannel diff --git a/crysaudio/music/RBY/celadon.asm b/crysaudio/music/RBY/celadon.asm new file mode 100644 index 00000000..30860ce0 --- /dev/null +++ b/crysaudio/music/RBY/celadon.asm @@ -0,0 +1,408 @@ +Music_Celadon: + dbw $80, Music_Celadon_Ch1 + dbw $01, Music_Celadon_Ch2 + dbw $02, Music_Celadon_Ch3 + +Music_Celadon_Ch1: + tempo 144 + volume 119 + dutycycle 3 + notetype $c, $2f + note __, 8 + octave 3 + note D_, 8 +Music_Celadon_branch_b6d4: + dutycycle 2 + intensity $b2 + note G_, 4 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note E_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 8 + note F#, 4 + note A_, 4 + note F#, 2 + note A_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A_, 2 + note B_, 2 + note G_, 4 + octave 4 + note G_, 4 + octave 3 + note G_, 4 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 8 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 4 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 8 + intensity $94 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note B_, 8 + note G_, 4 + note D_, 4 + note G_, 4 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 8 + note A_, 8 + note F#, 4 + note G_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + loopchannel 0, Music_Celadon_branch_b6d4 +Music_Celadon_Ch2: + dutycycle 3 + notetype $c, $c2 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + intensity $a0 + note A_, 8 +Music_Celadon_branch_b74a: + dutycycle 2 + intensity $c2 + octave 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 6 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + note A_, 4 + note F#, 4 + note A_, 2 + note F#, 6 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note A_, 2 + note B_, 2 + note G_, 4 + note B_, 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 4 + octave 3 + note B_, 2 + octave 4 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 8 + octave 5 + note D_, 8 + intensity $b4 + octave 4 + note D_, 8 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note F#, 4 + note D_, 8 + note C_, 8 + octave 3 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note D_, 8 + note D_, 8 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 8 + note C_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 8 + loopchannel 0, Music_Celadon_branch_b74a +Music_Celadon_Ch3: + notetype $c, $13 + note __, 8 + octave 5 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 +Music_Celadon_branch_b7c1: + octave 4 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note C#, 2 + note D_, 2 + note __, 6 + note F#, 2 + note __, 4 + note F#, 2 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note B_, 2 + note G_, 2 + octave 5 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + octave 4 + note B_, 2 + note G_, 2 + octave 5 + note C_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + octave 4 + note B_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note B_, 2 + note G_, 2 + octave 5 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + octave 4 + note B_, 2 + note G_, 2 + octave 5 + note C_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + loopchannel 0, Music_Celadon_branch_b7c1 diff --git a/crysaudio/music/RBY/cinnabar.asm b/crysaudio/music/RBY/cinnabar.asm new file mode 100644 index 00000000..d5f832f4 --- /dev/null +++ b/crysaudio/music/RBY/cinnabar.asm @@ -0,0 +1,360 @@ +Music_Cinnabar: + dbw $80, Music_Cinnabar_Ch1 + dbw $01, Music_Cinnabar_Ch2 + dbw $02, Music_Cinnabar_Ch3 + +Music_Cinnabar_Ch1: ; b86d (2:786d) + tempo 144 + volume 119 + dutycycle 3 + vibrato 12, 52 + + +Music_Cinnabar_branch_b878: + notetype 12, 181 + note __, 4 + octave 3 + note D_, 4 + note E_, 6 + note C#, 2 + notetype 12, 177 + note D_, 4 + notetype 12, 181 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + notetype 12, 177 + note B_, 4 + notetype 12, 181 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + notetype 12, 177 + note G_, 4 + notetype 12, 181 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 + notetype 12, 177 + note G_, 4 + notetype 12, 181 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note B_, 4 + note G_, 4 + note F#, 3 + note E_, 1 + note F#, 2 + note A_, 2 + notetype 12, 162 + note G_, 4 + octave 4 + note D_, 1 + note E_, 1 + note D_, 4 + notetype 12, 114 + note D_, 1 + note E_, 1 + note D_, 4 + notetype 12, 167 + octave 3 + note B_, 6 + note G_, 2 + note E_, 8 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note F#, 8 + octave 4 + note F#, 6 + note D_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 4 + note E_, 4 + loopchannel 0, Music_Cinnabar_branch_b878 + + +Music_Cinnabar_Ch2: ; b8d4 (2:78d4) + dutycycle 3 + vibrato 10, 35 + +Music_Cinnabar_branch_b8d9: + notetype 12, 199 + octave 3 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 + notetype 12, 193 + note D_, 4 + notetype 12, 199 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + notetype 12, 193 + note D_, 4 + notetype 12, 199 + octave 3 + note B_, 8 + note A_, 4 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 + notetype 12, 193 + note D_, 4 + notetype 12, 199 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + notetype 12, 193 + note D_, 4 + notetype 12, 199 + octave 3 + note A_, 4 + note G_, 4 + note F#, 4 + notetype 12, 176 + octave 4 + note D_, 6 + octave 3 + note B_, 2 + note G_, 8 + octave 4 + note E_, 6 + note C_, 2 + octave 3 + note A_, 8 + octave 4 + note A_, 6 + note F#, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 4 + octave 4 + note D_, 4 + octave 3 + note B_, 2 + note A_, 6 + loopchannel 0, Music_Cinnabar_branch_b8d9 + + +Music_Cinnabar_Ch3: ; b93d (2:793d) + notetype 12, 16 + +Music_Cinnabar_branch_b93f: + octave 4 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 2 + octave 4 + note A_, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 2 + octave 4 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 4 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 4 + octave 4 + note B_, 1 + note __, 3 + octave 5 + note D_, 2 + octave 4 + note B_, 1 + note B_, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 1 + note __, 1 + note G_, 1 + note __, 3 + octave 5 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 2 + note C_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 3 + octave 5 + note A_, 2 + note F#, 1 + note F#, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note C_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 3 + octave 5 + note D_, 2 + note C_, 1 + note C_, 1 + octave 4 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 2 + octave 5 + note C_, 1 + note __, 1 + loopchannel 0, Music_Cinnabar_branch_b93f +; 0xb9eb \ No newline at end of file diff --git a/crysaudio/music/RBY/cinnabarmansion.asm b/crysaudio/music/RBY/cinnabarmansion.asm new file mode 100644 index 00000000..d348f954 --- /dev/null +++ b/crysaudio/music/RBY/cinnabarmansion.asm @@ -0,0 +1,180 @@ +Music_CinnabarMansion: + dbw $C0, Music_CinnabarMansion_Ch1 + dbw $01, Music_CinnabarMansion_Ch2 + dbw $02, Music_CinnabarMansion_Ch3 + dbw $03, Music_CinnabarMansion_Ch4 + +Music_CinnabarMansion_Ch1: ; 7ed0f (1f:6d0f) + tempo 144 + volume 119 + vibrato 11, 37 + dutycycle 2 + +Music_CinnabarMansion_branch_7ed19: + notetype 12, 98 + octave 5 + note E_, 1 + note E_, 1 + octave 4 + note B_, 1 + note B_, 1 + note C_, 1 + note __, 2 + octave 5 + note B_, 2 + note E_, 2 + octave 4 + note C_, 2 + note B_, 2 + note E_, 2 + note C_, 1 + octave 5 + note B_, 1 + note __, 2 + loopchannel 14, Music_CinnabarMansion_branch_7ed19 + notetype 12, 165 + note __, 16 + note __, 16 + note __, 15 + octave 4 + note C_, 1 + octave 5 + note B_, 1 + note B_, 2 + loopchannel 0, Music_CinnabarMansion_branch_7ed19 + + +Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40) + dutycycle 2 + + vibrato 10, 36 + notetype 12, 194 + +Music_CinnabarMansion_branch_7ed48: + note __, 16 + note __, 16 + loopchannel 4, Music_CinnabarMansion_branch_7ed48 + +Music_CinnabarMansion_branch_7ed4e: + notetype 12, 194 + +Music_CinnabarMansion_branch_7ed50: + callchannel Music_CinnabarMansion_branch_7ed6c + loopchannel 3, Music_CinnabarMansion_branch_7ed50 + octave 3 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note __, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note G_, 4 + note D#, 4 + loopchannel 0, Music_CinnabarMansion_branch_7ed4e + +Music_CinnabarMansion_branch_7ed6c: + octave 3 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note G#, 4 + note __, 4 + note A#, 4 + endchannel + + +Music_CinnabarMansion_Ch3: ; 7ed7e (1f:6d7e) + notetype 12, 17 + +Music_CinnabarMansion_branch_7ed80: + octave 2 + note B_, 2 + note __, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 3 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + loopchannel 8, Music_CinnabarMansion_branch_7ed80 + note E_, 16 + note D#, 16 + note G_, 16 + note G#, 8 + note D#, 8 + loopchannel 0, Music_CinnabarMansion_branch_7ed80 + + +Music_CinnabarMansion_Ch4: ; 7edb0 (1f:6db0) + notetype 6 + togglenoise 1 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + +Music_CinnabarMansion_branch_7edb5: + note E_, 2 + note E_, 2 + note F_, 4 + note E_, 2 + note E_, 2 + note F_, 4 + note E_, 2 + note E_, 2 + note F_, 4 + note E_, 2 + note E_, 2 + note F#, 4 + note E_, 2 + note E_, 2 + note __, 2 + note __, 10 + note __, 8 + note F#, 8 + loopchannel 0, Music_CinnabarMansion_branch_7edb5 +; 0x7edda \ No newline at end of file diff --git a/crysaudio/music/RBY/cities1.asm b/crysaudio/music/RBY/cities1.asm new file mode 100644 index 00000000..ab65f0a2 --- /dev/null +++ b/crysaudio/music/RBY/cities1.asm @@ -0,0 +1,666 @@ +Music_Cities1: + dbw $C0, Music_Cities1_Ch1 + dbw $01, Music_Cities1_Ch2 + dbw $02, Music_Cities1_Ch3 + dbw $03, Music_Cities1_Ch4 + +Music_Cities1_branch_aa6f: + tempo 232 + loopchannel 0, Music_Cities1_branch_aa79 + +Music_Cities1_Ch1: ; aa76 (2:6a76) + tempo 144 + +Music_Cities1_branch_aa79: + volume 119 + vibrato 8, 36 + dutycycle 3 + +Music_Cities1_branch_aa80: + notetype 12, 197 + octave 3 + note G#, 4 + note F#, 4 + note E_, 2 + note E_, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 2 + note E_, 2 + note E_, 4 + notetype 12, 165 + note C#, 4 + octave 2 + note B_, 6 + octave 3 + note C#, 2 + note C#, 4 + octave 2 + note B_, 4 + notetype 12, 197 + callchannel Music_Cities1_branch_ab7d + octave 3 + note D#, 6 + note E_, 2 + octave 2 + note B_, 4 + notetype 12, 165 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + note A_, 4 + note B_, 4 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + notetype 12, 197 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note E_, 4 + note F#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note E_, 2 + note E_, 4 + notetype 12, 165 + note C#, 2 + octave 2 + note A_, 2 + note B_, 6 + octave 3 + note C#, 2 + note C#, 2 + octave 2 + note B_, 2 + note B_, 4 + notetype 12, 197 + callchannel Music_Cities1_branch_ab7d + octave 3 + note D#, 4 + note D#, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note G#, 2 + note E_, 4 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + notetype 12, 165 + note C#, 4 + octave 2 + note B_, 2 + octave 3 + note D#, 4 + note C#, 2 + note E_, 4 + notetype 12, 179 + callchannel Music_Cities1_branch_ab8a + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note F#, 4 + note G#, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 4 + note G#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + +Music_Cities1_branch_ab12: + note C#, 2 + note D#, 2 + note C#, 2 + octave 2 + note B_, 4 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + loopchannel 2, Music_Cities1_branch_ab12 + note E_, 2 + octave 2 + note B_, 4 + octave 3 + note E_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note G#, 2 + note G#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + callchannel Music_Cities1_branch_ab8a + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note D#, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 4 + note G#, 2 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 4 + note F#, 2 + note D#, 2 + note D#, 2 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D#, 2 + notetype 12, 182 + note F#, 8 + note F#, 4 + note D#, 4 + note E_, 8 + notetype 12, 132 + octave 2 + note B_, 4 + octave 3 + note E_, 2 + note F#, 2 + loopchannel 0, Music_Cities1_branch_aa80 + +Music_Cities1_branch_ab7d: + octave 3 + note F#, 2 + note D#, 4 + note E_, 2 + note D#, 4 + note C#, 4 + octave 2 + note B_, 4 + octave 3 + note C#, 2 + note D#, 2 + note C#, 2 + endchannel + +Music_Cities1_branch_ab8a: + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 4 + note A_, 2 + note C#, 2 + note E_, 2 + endchannel + + +Music_Cities1_Ch2: ; ab92 (2:6b92) + vibrato 5, 21 + callchannel Music_Cities1_branch_ac00 + octave 4 + note G#, 2 + notetype 12, 196 + note E_, 6 + notetype 12, 197 + dutycycle 3 + octave 3 + note C#, 4 + note D#, 4 + note E_, 6 + note F#, 6 + note G#, 4 + callchannel Music_Cities1_branch_ac00 + octave 4 + note G#, 2 + notetype 12, 196 + note E_, 14 + dutycycle 3 + octave 3 + note E_, 6 + note F#, 6 + note G#, 4 + notetype 12, 183 + dutycycle 2 + vibrato 8, 23 + octave 5 + note C#, 12 + octave 4 + note A_, 4 + octave 5 + note E_, 8 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 4 + note B_, 12 + note G#, 4 + note B_, 16 + note F#, 12 + note G#, 2 + note A_, 2 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note G#, 12 + note E_, 4 + note B_, 16 + octave 5 + note C#, 12 + note D#, 2 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 + octave 4 + note B_, 12 + octave 5 + note C#, 2 + note D#, 2 + note C#, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note A_, 12 + note B_, 2 + octave 5 + note C_, 2 + note C_, 4 + octave 4 + note B_, 4 + note A_, 4 + note F#, 4 + notetype 12, 183 + note A_, 8 + octave 5 + note C_, 8 + octave 4 + note B_, 14 + notetype 12, 132 + note G#, 1 + notetype 12, 164 + note A_, 1 + loopchannel 0, Music_Cities1_Ch2 + +Music_Cities1_branch_ac00: + dutycycle 2 + notetype 12, 195 + octave 4 + note B_, 4 + note A_, 4 + notetype 12, 196 + note G#, 10 + notetype 12, 195 + note G#, 2 + note A_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + notetype 12, 196 + note F#, 10 + notetype 12, 197 + dutycycle 3 + octave 3 + note E_, 4 + note D#, 8 + note E_, 4 + note F#, 4 + notetype 12, 195 + dutycycle 2 + octave 4 + note A_, 4 + note G#, 4 + notetype 12, 196 + note F#, 10 + notetype 12, 195 + note F#, 2 + note G#, 2 + note A_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + endchannel + + +Music_Cities1_Ch3: ; ac32 (2:6c32) + notetype 12, 17 + + +Music_Cities1_branch_ac35: + vibrato 0, 0 + octave 4 + callchannel Music_Cities1_branch_acc5 + callchannel Music_Cities1_branch_acc5 + callchannel Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note __, 2 + note E_, 2 + note F#, 2 + note G#, 2 + callchannel Music_Cities1_branch_acc5 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note __, 2 + note E_, 2 + note F#, 2 + note G#, 2 + callchannel Music_Cities1_branch_acc5 + callchannel Music_Cities1_branch_acce + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note __, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note __, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + vibrato 8, 37 + note A_, 8 + note E_, 8 + note A_, 8 + note F#, 8 + note G#, 8 + note E_, 8 + note G#, 12 + note E_, 4 + note F#, 2 + note F#, 2 + note D#, 2 + note E_, 4 + note F#, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note __, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note __, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 8 + note E_, 8 + note A_, 8 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 8 + note E_, 8 + note B_, 4 + note E_, 4 + note F#, 4 + note G#, 4 + note __, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note __, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note A_, 4 + note G#, 4 + note F#, 2 + note D#, 2 + note A_, 2 + note F#, 2 + note __, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note __, 2 + note E_, 2 + note F#, 1 + note G#, 1 + note E_, 1 + note F#, 1 + note G#, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + loopchannel 0, Music_Cities1_branch_ac35 + +Music_Cities1_branch_acc5: + note __, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note __, 2 + note E_, 2 + note F#, 2 + note G#, 2 + endchannel + +Music_Cities1_branch_acce: + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note __, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note __, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note __, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note __, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note __, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note __, 2 + note D#, 2 + note E_, 2 + note F#, 2 + endchannel + + +Music_Cities1_Ch4: ; acef (2:6cef) + notetype 12 + togglenoise 0 +Music_Cities1_Loop4: + callchannel Music_Cities1_branch_ad36 + +Music_Cities1_branch_acf3: + callchannel Music_Cities1_branch_ad36 + callchannel Music_Cities1_branch_ad45 + callchannel Music_Cities1_branch_ad45 + loopchannel 2, Music_Cities1_branch_acf3 + callchannel Music_Cities1_branch_ad36 + callchannel Music_Cities1_branch_ad5f + callchannel Music_Cities1_branch_ad52 + note F_, 6 + note F_, 6 + note F#, 4 + callchannel Music_Cities1_branch_ad6e + callchannel Music_Cities1_branch_ad5f + callchannel Music_Cities1_branch_ad52 + callchannel Music_Cities1_branch_ad6e + callchannel Music_Cities1_branch_ad52 + note F_, 6 + note F_, 6 + note F#, 2 + note F_, 2 + note F_, 6 + note F_, 6 + note F_, 4 + note F_, 6 + note G_, 6 + note G_, 4 + loopchannel 0, Music_Cities1_Loop4 + +Music_Cities1_branch_ad36: + note G_, 6 + note G_, 6 + note G_, 4 + note G_, 6 + note G_, 6 + note G_, 2 + note G_, 2 + endchannel + +Music_Cities1_branch_ad45: + note G_, 6 + note G_, 6 + note G_, 4 + note G_, 6 + note G_, 6 + note G_, 4 + endchannel + +Music_Cities1_branch_ad52: + note F_, 6 + note F_, 6 + note F#, 4 + note F_, 6 + note F_, 6 + note F#, 4 + endchannel + +Music_Cities1_branch_ad5f: + note F_, 6 + note F_, 6 + note F#, 4 + note F_, 6 + note F_, 6 + note F#, 2 + note F_, 2 + endchannel + +Music_Cities1_branch_ad6e: + note F_, 6 + note F_, 6 + note F#, 2 + note F#, 2 + endchannel +; 0xad77 \ No newline at end of file diff --git a/crysaudio/music/RBY/cities2.asm b/crysaudio/music/RBY/cities2.asm new file mode 100644 index 00000000..17aa49ed --- /dev/null +++ b/crysaudio/music/RBY/cities2.asm @@ -0,0 +1,422 @@ +Music_Cities2: + dbw $80, Music_Cities2_Ch1 + dbw $01, Music_Cities2_Ch2 + dbw $02, Music_Cities2_Ch3 + +Music_Cities2_Ch1: ; b504 (2:7504) + tempo 148 + volume 119 + dutycycle 3 + vibrato 8, 50 + + notetype 12, 182 + note __, 8 + octave 3 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + note __, 14 + +Music_Cities2_branch_b51a: + octave 3 + note B_, 4 + octave 4 + note C#, 2 + note D#, 1 + note D_, 1 + note C#, 4 + octave 3 + note B_, 4 + note G#, 8 + note E_, 8 + note A_, 4 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note __, 16 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 1 + note D#, 1 + note C#, 4 + octave 3 + note B_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 3 + note G#, 8 + note B_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note __, 2 + octave 4 + note E_, 4 + octave 3 + note B_, 4 + note F#, 2 + note G#, 2 + note A_, 2 + note __, 2 + octave 4 + note F#, 4 + note D#, 4 + octave 3 + note E_, 2 + note __, 4 + note F#, 2 + note __, 4 + note A_, 2 + note __, 2 + note B_, 2 + note __, 16 + note __, 16 + note __, 14 + note E_, 16 + note F#, 8 + note G#, 4 + note F#, 4 + note E_, 2 + note __, 14 + loopchannel 0, Music_Cities2_branch_b51a + + +Music_Cities2_Ch2: ; b569 (2:7569) + dutycycle 3 + vibrato 8, 35 + notetype 12, 194 + octave 4 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 6 + notetype 12, 194 + dutycycle 2 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + +Music_Cities2_branch_b58b: + notetype 12, 166 + note G#, 6 + notetype 12, 194 + note A_, 1 + note G#, 1 + notetype 12, 196 + note F#, 14 + notetype 12, 194 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 12, 196 + note G#, 6 + notetype 12, 194 + note E_, 1 + note G#, 1 + notetype 12, 197 + note B_, 14 + notetype 12, 194 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 12, 166 + note G#, 6 + notetype 12, 194 + note A_, 1 + note G#, 1 + notetype 12, 196 + note F#, 8 + notetype 12, 161 + dutycycle 1 + octave 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + notetype 12, 194 + dutycycle 2 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 12, 196 + note G#, 6 + note E_, 1 + note G#, 1 + notetype 12, 198 + note B_, 8 + notetype 12, 194 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 4 + notetype 12, 199 + note G#, 4 + note E_, 4 + notetype 12, 194 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 4 + notetype 12, 199 + note B_, 4 + note F#, 4 + notetype 12, 194 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note G#, 2 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note B_, 1 + note F#, 1 + note D#, 1 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note F#, 1 + notetype 12, 194 + note B_, 8 + notetype 12, 183 + octave 3 + note E_, 8 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note G#, 4 + note A_, 4 + note B_, 8 + note B_, 8 + note G#, 4 + octave 4 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + notetype 12, 194 + note E_, 6 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + loopchannel 0, Music_Cities2_branch_b58b + + +Music_Cities2_Ch3: ; b640 (2:7640) + notetype 12, 17 + note __, 16 + octave 4 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + +Music_Cities2_branch_b64c: + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note __, 2 + note E_, 4 + note G#, 4 + note F#, 2 + note A_, 2 + note F#, 2 + note __, 2 + note F#, 4 + note A_, 4 + note C#, 2 + note __, 4 + note E_, 2 + note __, 4 + note G#, 2 + note A_, 2 + note B_, 2 + note __, 8 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + loopchannel 0, Music_Cities2_branch_b64c +; 0xb6c7 \ No newline at end of file diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm new file mode 100644 index 00000000..18142f4f --- /dev/null +++ b/crysaudio/music/RBY/credits.asm @@ -0,0 +1,826 @@ +Music_RBYCredits: + dbw $80, Music_RBYCredits_Ch1 + dbw $01, Music_RBYCredits_Ch2 + dbw $02, Music_RBYCredits_Ch3 + +Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) + tempo 140 + volume 119 + dutycycle 3 + vibrato 8, 52 + + notetype 12, 181 + octave 4 + note E_, 6 + octave 3 + note A_, 1 + octave 4 + note E_, 1 + note D_, 6 + octave 3 + note G_, 1 + octave 4 + note D_, 1 + note C#, 6 + octave 3 + note F#, 1 + octave 4 + note C#, 1 + note D_, 4 + note E_, 2 + note C#, 1 + note E_, 1 + note C#, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + notetype 12, 182 + note A_, 4 + note E_, 2 + note A_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + note B_, 4 + note A_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 6 + note E_, 2 + note A_, 4 + note C#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note A_, 4 + note E_, 2 + note A_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + note B_, 4 + note A_, 4 + note G_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + note E_, 6 + note C#, 2 + note A_, 4 + note C#, 4 + note E_, 4 + note D_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + notetype 12, 183 + note E_, 6 + note A_, 2 + note G_, 4 + note F#, 4 + notetype 12, 199 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + note D_, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + notetype 12, 144 + note G_, 8 + note F#, 8 + note E_, 8 + note D_, 8 + note __, 16 + note __, 16 + note __, 8 + notetype 12, 182 + note E_, 6 + note D#, 1 + note D_, 1 + notetype 12, 160 + note C#, 8 + notetype 12, 167 + note C#, 8 + note __, 16 + note __, 16 + note __, 8 + note E_, 6 + note C#, 1 + note E_, 1 + notetype 12, 160 + note A_, 8 + notetype 12, 167 + note A_, 8 + notetype 12, 182 + note G_, 6 + note D_, 4 + note G_, 2 + note B_, 4 + notetype 12, 183 + note G_, 8 + note F#, 4 + note G#, 4 + notetype 12, 144 + note A_, 8 + note F#, 8 + note E_, 8 + note C#, 8 + notetype 12, 183 + note D_, 8 + note C#, 8 + octave 2 + note B_, 8 + octave 3 + note D_, 8 + notetype 12, 144 + note E_, 8 + note D_, 8 + note F#, 8 + note E_, 8 + notetype 12, 160 + note D_, 8 + note E_, 8 + note D_, 8 + note C_, 8 + note G_, 8 + note F_, 8 + note E_, 8 + note D_, 8 + notetype 12, 160 + note C#, 6 + notetype 12, 167 + note C#, 6 + notetype 12, 183 + note D_, 4 + note E_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + notetype 12, 160 + note E_, 6 + notetype 12, 167 + note E_, 6 + notetype 12, 183 + note D_, 4 + notetype 12, 160 + note C#, 8 + notetype 12, 167 + note C#, 8 + notetype 12, 183 + note E_, 6 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note C#, 4 + note C#, 4 + note E_, 4 + note F#, 4 + notetype 12, 160 + note E_, 6 + notetype 12, 183 + note D_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + notetype 12, 160 + octave 4 + note C#, 16 + note C#, 8 + notetype 12, 167 + note C#, 8 + notetype 12, 181 + octave 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note A_, 1 + notetype 12, 177 + note A_, 8 + endchannel + + +Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) + dutycycle 3 + vibrato 10, 37 + notetype 12, 197 + octave 4 + note A_, 6 + note E_, 1 + note A_, 1 + note G_, 6 + note D_, 1 + note G_, 1 + notetype 12, 199 + note F#, 12 + note G#, 2 + note E_, 1 + note G#, 1 + notetype 12, 194 + note A_, 2 + notetype 12, 193 + octave 3 + note A_, 4 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + notetype 12, 196 + note A_, 1 + note F#, 1 + note A_, 1 + note B_, 1 + notetype 12, 199 + octave 4 + note C#, 6 + note C#, 1 + note D_, 1 + note E_, 4 + note C#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 8 + octave 3 + note A_, 6 + note E_, 2 + octave 4 + note C#, 8 + note C#, 6 + note C#, 1 + note D_, 1 + note E_, 4 + note C#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 8 + octave 3 + note A_, 6 + note E_, 2 + notetype 12, 176 + octave 4 + note C#, 8 + notetype 12, 199 + note D_, 6 + octave 3 + note B_, 2 + octave 4 + note G_, 8 + octave 3 + note G_, 6 + note D_, 2 + note B_, 8 + notetype 12, 176 + octave 4 + note C#, 6 + notetype 12, 183 + note C#, 6 + note D_, 4 + notetype 12, 160 + note E_, 8 + notetype 12, 167 + note E_, 8 + notetype 12, 199 + note D_, 6 + octave 3 + note B_, 2 + octave 4 + note G_, 8 + octave 3 + note G_, 6 + note D_, 2 + note B_, 8 + notetype 12, 176 + octave 4 + note E_, 7 + notetype 12, 183 + note E_, 7 + notetype 12, 195 + note E_, 1 + note G#, 1 + notetype 12, 176 + note A_, 8 + notetype 12, 183 + note A_, 8 + notetype 12, 198 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + notetype 12, 160 + note C#, 8 + notetype 12, 167 + note C#, 8 + notetype 12, 144 + octave 3 + note A_, 8 + notetype 12, 151 + note A_, 8 + notetype 12, 176 + note E_, 8 + notetype 12, 183 + note E_, 8 + notetype 12, 199 + note D_, 8 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + notetype 12, 183 + note G_, 6 + note F#, 1 + note F_, 1 + notetype 12, 176 + note E_, 8 + notetype 12, 183 + note E_, 8 + notetype 12, 176 + note D_, 8 + notetype 12, 183 + note D_, 8 + notetype 12, 199 + octave 2 + note B_, 8 + octave 3 + note F#, 6 + note D_, 1 + note F#, 1 + note E_, 8 + note B_, 6 + note G_, 1 + note B_, 1 + notetype 12, 176 + octave 4 + note C#, 8 + notetype 12, 183 + note C#, 8 + notetype 12, 176 + note D_, 8 + notetype 12, 183 + note D_, 8 + notetype 12, 199 + octave 3 + note B_, 8 + octave 4 + note D_, 6 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + notetype 12, 176 + note C#, 6 + notetype 12, 183 + note C#, 6 + notetype 12, 199 + octave 3 + note B_, 4 + notetype 12, 176 + note A_, 8 + notetype 12, 183 + note A_, 8 + notetype 12, 176 + note F#, 6 + notetype 12, 183 + note F#, 6 + notetype 12, 199 + note G#, 4 + note A_, 8 + note F#, 8 + notetype 12, 176 + note G#, 6 + notetype 12, 183 + note G#, 6 + notetype 12, 199 + note A_, 4 + note B_, 8 + note G#, 8 + notetype 12, 176 + note A_, 6 + notetype 12, 183 + note A_, 6 + notetype 12, 199 + note B_, 4 + octave 4 + note C_, 8 + octave 3 + note A_, 8 + notetype 12, 176 + note B_, 6 + notetype 12, 183 + note B_, 6 + notetype 12, 199 + octave 4 + note C_, 4 + notetype 12, 176 + note D_, 8 + octave 3 + note B_, 8 + notetype 12, 176 + octave 4 + note C#, 16 + note C#, 8 + notetype 12, 183 + note C#, 8 + notetype 12, 176 + octave 3 + note A_, 16 + note A_, 8 + notetype 12, 183 + note A_, 8 + notetype 12, 199 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + octave 3 + note B_, 6 + octave 4 + note D_, 2 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + octave 3 + note G_, 6 + note F#, 1 + note F_, 1 + note E_, 8 + note C#, 4 + note D_, 4 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + octave 3 + note B_, 6 + octave 4 + note D_, 2 + note G_, 8 + notetype 12, 176 + note A_, 16 + notetype 12, 160 + note A_, 8 + notetype 12, 167 + note A_, 8 + notetype 12, 193 + note A_, 2 + note A_, 4 + note A_, 1 + note A_, 1 + notetype 12, 193 + note A_, 8 + endchannel + + +Music_RBYCredits_Ch3: ; 7fec2 (1f:7ec2) + notetype 12, 16 + octave 5 + note C#, 6 + octave 4 + note A_, 1 + octave 5 + note C#, 1 + note D_, 6 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 4 + note G#, 2 + note E_, 1 + note G#, 1 + note A_, 1 + note __, 15 + note __, 16 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffae + callchannel Music_RBYCredits_branch_7ffa4 + octave 4 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffae + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffb8 + callchannel Music_RBYCredits_branch_7ffb8 + callchannel Music_RBYCredits_branch_7ffc1 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + callchannel Music_RBYCredits_branch_7ffb8 + callchannel Music_RBYCredits_branch_7ffb8 + callchannel Music_RBYCredits_branch_7ffc1 + callchannel Music_RBYCredits_branch_7ffc1 + octave 4 + note G_, 4 + note A_, 4 + note B_, 4 + octave 5 + note D_, 4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffae + callchannel Music_RBYCredits_branch_7ffae + callchannel Music_RBYCredits_branch_7ffa4 + note E_, 4 + note A_, 2 + note E_, 4 + note A_, 2 + note E_, 2 + note A_, 2 + callchannel Music_RBYCredits_branch_7ffae + callchannel Music_RBYCredits_branch_7ffae + callchannel Music_RBYCredits_branch_7ffa4 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + callchannel Music_RBYCredits_branch_7ffd2 + callchannel Music_RBYCredits_branch_7ffd2 + callchannel Music_RBYCredits_branch_7ffdb + callchannel Music_RBYCredits_branch_7ffdb + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + callchannel Music_RBYCredits_branch_7ffb8 + callchannel Music_RBYCredits_branch_7ffb8 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffe4 + callchannel Music_RBYCredits_branch_7ffe4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffa4 + callchannel Music_RBYCredits_branch_7ffb8 + callchannel Music_RBYCredits_branch_7ffb8 + callchannel Music_RBYCredits_branch_7ffed + callchannel Music_RBYCredits_branch_7ffed + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note A_, 1 + note A_, 1 + note __, 7 + endchannel + +Music_RBYCredits_branch_7ffa4: + octave 4 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + endchannel + +Music_RBYCredits_branch_7ffae: + octave 4 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + endchannel + +Music_RBYCredits_branch_7ffb8: + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + endchannel + +Music_RBYCredits_branch_7ffc1: + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + endchannel + +Music_RBYCredits_branch_7ffd2: + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + endchannel + +Music_RBYCredits_branch_7ffdb: + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + endchannel + +Music_RBYCredits_branch_7ffe4: + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + endchannel + +Music_RBYCredits_branch_7ffed: + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note A_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + endchannel +; 0x7fffa \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedgymleader.asm b/crysaudio/music/RBY/defeatedgymleader.asm new file mode 100644 index 00000000..af981cf7 --- /dev/null +++ b/crysaudio/music/RBY/defeatedgymleader.asm @@ -0,0 +1,611 @@ +Music_DefeatedGymLeader: + dbw $80, Music_DefeatedGymLeader_Ch1 + dbw $01, Music_DefeatedGymLeader_Ch2 + dbw $02, Music_DefeatedGymLeader_Ch3 + +Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) + ftempo 112 + volume 119 + dutycycle 3 + vibrato 18, 49 + notetype 12, 166 + octave 4 + note D_, 6 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + notetype 12, 160 + note A_, 8 + notetype 12, 167 + note A_, 8 + +Music_DefeatedGymLeader_branch_23ccc: + notetype 12, 178 + octave 3 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note D_, 4 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + notetype 12, 177 + octave 2 + note B_, 8 + notetype 12, 178 + octave 3 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note D_, 4 + note A_, 2 + note A_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note E_, 4 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + notetype 12, 177 + octave 2 + note B_, 8 + notetype 12, 151 + octave 3 + note D_, 6 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + note F#, 8 + notetype 12, 176 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + notetype 12, 151 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + notetype 12, 176 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + notetype 12, 151 + note C#, 6 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note E_, 8 + notetype 12, 176 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + notetype 12, 144 + note F#, 8 + note E_, 8 + note D_, 8 + note C#, 8 + notetype 12, 151 + note D_, 6 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + note F#, 8 + notetype 12, 176 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + notetype 12, 151 + note E_, 6 + note C#, 1 + note E_, 1 + note G#, 8 + notetype 12, 176 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 + notetype 12, 151 + note C#, 6 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note E_, 8 + notetype 12, 176 + note E_, 6 + note C#, 1 + note E_, 1 + note E_, 4 + note G_, 4 + notetype 12, 151 + note F#, 6 + note E_, 1 + note F#, 1 + note A_, 8 + notetype 12, 167 + note G_, 8 + note E_, 8 + loopchannel 0, Music_DefeatedGymLeader_branch_23ccc + + +Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d) + dutycycle 2 + vibrato 24, 36 + notetype 12, 196 + octave 4 + note A_, 6 + note F#, 1 + note A_, 1 + octave 5 + note D_, 6 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + notetype 12, 176 + note F#, 8 + notetype 12, 183 + note F#, 8 + +Music_DefeatedGymLeader_branch_23d84: + notetype 12, 194 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + notetype 12, 196 + note A_, 4 + note A_, 4 + notetype 12, 194 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + notetype 12, 193 + note D_, 6 + notetype 6, 194 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + notetype 12, 194 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + notetype 12, 196 + note A_, 4 + note A_, 3 + notetype 6, 194 + note B_, 1 + octave 4 + note C#, 1 + notetype 12, 194 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + notetype 12, 193 + note D_, 8 + notetype 12, 199 + note A_, 6 + note F#, 1 + note A_, 1 + notetype 12, 176 + octave 4 + note D_, 8 + notetype 12, 160 + note D_, 8 + notetype 12, 151 + note D_, 8 + notetype 12, 199 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + notetype 12, 128 + octave 4 + note E_, 8 + notetype 12, 160 + note E_, 8 + notetype 12, 199 + note E_, 8 + octave 3 + note G_, 6 + note E_, 1 + note G_, 1 + notetype 12, 111 + octave 4 + note C#, 8 + notetype 12, 199 + note C#, 8 + note F#, 4 + note E_, 4 + notetype 12, 176 + note D_, 14 + octave 3 + note B_, 2 + notetype 12, 160 + note A_, 8 + notetype 12, 183 + note A_, 8 + notetype 12, 199 + note A_, 6 + note F#, 1 + note A_, 1 + notetype 12, 176 + octave 4 + note D_, 8 + notetype 12, 160 + note D_, 8 + notetype 12, 151 + note D_, 8 + notetype 12, 199 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + notetype 12, 79 + octave 4 + note E_, 8 + notetype 12, 176 + note E_, 8 + notetype 12, 199 + note E_, 8 + octave 3 + note G_, 6 + note E_, 1 + note G_, 1 + notetype 12, 176 + octave 4 + note C#, 8 + notetype 12, 183 + note C#, 8 + octave 3 + note A_, 4 + octave 4 + note C#, 4 + notetype 12, 176 + note D_, 14 + note E_, 2 + note D_, 12 + notetype 12, 194 + octave 3 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + loopchannel 0, Music_DefeatedGymLeader_branch_23d84 + + +Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52) + notetype 12, 16 + vibrato 16, 18 + octave 4 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 6 + note F#, 1 + note A_, 1 + octave 5 + note D_, 6 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + note F#, 8 + +Music_DefeatedGymLeader_branch_23e65: + octave 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 3 + note __, 1 + note F#, 3 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 1 + note __, 5 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 3 + note __, 1 + note D_, 3 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 7 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note E_, 2 + loopchannel 0, Music_DefeatedGymLeader_branch_23e65 +; 0x23f52 \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedtrainer.asm b/crysaudio/music/RBY/defeatedtrainer.asm new file mode 100644 index 00000000..9f206ca6 --- /dev/null +++ b/crysaudio/music/RBY/defeatedtrainer.asm @@ -0,0 +1,268 @@ +Music_DefeatedTrainer: + dbw $80, Music_DefeatedTrainer_Ch1 + dbw $01, Music_DefeatedTrainer_Ch2 + dbw $02, Music_DefeatedTrainer_Ch3 + +Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) + ftempo 224 + volume 119 + dutycycle 2 + notetype 4, 162 + octave 4 + note D_, 2 + notetype 4, 162 + note D_, 2 + note D_, 2 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + notetype 4, 179 + note F#, 12 + dutycycle 1 + +Music_DefeatedTrainer_branch_23a76: + notetype 4, 99 + octave 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + note G_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 + octave 4 + note C#, 3 + note D_, 3 + note E_, 3 + note F#, 3 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + octave 4 + note C#, 3 + octave 3 + note A_, 6 + note F#, 3 + note A_, 3 + note B_, 6 + note G#, 3 + note B_, 3 + octave 4 + note C_, 6 + octave 3 + note A_, 3 + octave 4 + note C_, 3 + note D_, 3 + octave 3 + note B_, 3 + octave 4 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note G_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 3 + note B_, 3 + loopchannel 0, Music_DefeatedTrainer_branch_23a76 + + +Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1) + dutycycle 2 + notetype 4, 195 + octave 4 + note A_, 2 + notetype 4, 195 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C#, 2 + notetype 4, 196 + note D_, 12 + +Music_DefeatedTrainer_branch_23ad2: + notetype 4, 133 + octave 4 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note E_, 3 + note F#, 3 + note G_, 6 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F#, 3 + note G_, 3 + note A_, 6 + note F#, 3 + note G_, 3 + note A_, 6 + note D_, 6 + octave 3 + note A_, 3 + octave 4 + note D_, 3 + note E_, 6 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note G_, 3 + note D_, 3 + note G_, 6 + notetype 4, 112 + note F#, 12 + notetype 4, 119 + note F#, 12 + notetype 4, 96 + note E_, 12 + notetype 4, 103 + note E_, 12 + loopchannel 0, Music_DefeatedTrainer_branch_23ad2 + + +Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15) + notetype 4, 16 + octave 5 + note D_, 2 + notetype 4, 16 + note D_, 2 + note D_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 12 + notetype 4, 33 + +Music_DefeatedTrainer_branch_23b24: + note F#, 3 + note __, 3 + note F#, 3 + note __, 3 + note G#, 3 + note __, 3 + note G#, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note B_, 3 + note __, 3 + note B_, 3 + note __, 3 + note F#, 3 + note __, 3 + note F#, 3 + note __, 3 + note G#, 3 + note __, 3 + note G#, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + octave 5 + note C#, 3 + note __, 3 + note C#, 3 + octave 4 + note A_, 3 + note F#, 3 + octave 5 + note D_, 3 + octave 4 + note F#, 3 + note __, 3 + note G#, 3 + octave 5 + note E_, 3 + octave 4 + note G#, 3 + note __, 3 + note A_, 3 + octave 5 + note F_, 3 + octave 4 + note A_, 3 + note __, 3 + note B_, 3 + octave 5 + note G_, 3 + octave 4 + note B_, 3 + note A#, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + octave 5 + note C_, 3 + note C#, 3 + note __, 3 + note C#, 3 + note __, 3 + note C#, 3 + note __, 3 + note C#, 3 + octave 4 + note A_, 3 + loopchannel 0, Music_DefeatedTrainer_branch_23b24 +; 0x23b74 \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedwildmon.asm b/crysaudio/music/RBY/defeatedwildmon.asm new file mode 100644 index 00000000..1556c9e7 --- /dev/null +++ b/crysaudio/music/RBY/defeatedwildmon.asm @@ -0,0 +1,303 @@ +Music_DefeatedWildMon: + dbw $80, Music_DefeatedWildMon_Ch1 + dbw $01, Music_DefeatedWildMon_Ch2 + dbw $02, Music_DefeatedWildMon_Ch3 + +Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) + ftempo 112 + volume 119 + dutycycle 3 + vibrato 6, 52 + notetype 12, 183 + octave 3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 12 + +Music_DefeatedWildMon_branch_23b8b: + notetype 12, 98 + note E_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note G#, 2 + note G#, 2 + note G#, 4 + note E_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note G#, 2 + note G#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note G#, 8 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A#, 2 + note A#, 2 + note A#, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A#, 2 + note A#, 2 + note A#, 4 + note A_, 8 + loopchannel 0, Music_DefeatedWildMon_branch_23b8b + + +Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) + dutycycle 2 + notetype 12, 195 + octave 4 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 12, 199 + note B_, 12 + +Music_DefeatedWildMon_branch_23bce: + notetype 12, 130 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 4 + note C#, 2 + note C#, 2 + note C#, 4 + octave 3 + note B_, 2 + note B_, 2 + note B_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 4 + note C#, 2 + note C#, 2 + note C#, 4 + octave 3 + note B_, 8 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 2 + note C_, 2 + note C_, 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 2 + note C_, 2 + note C_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note C_, 8 + loopchannel 0, Music_DefeatedWildMon_branch_23bce + + +Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) + notetype 12, 32 + octave 5 + note E_, 1 + note __, 1 + octave 6 + note C#, 1 + note __, 1 + octave 5 + note B_, 1 + note __, 1 + octave 6 + note D#, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + +Music_DefeatedWildMon_branch_23c21: + octave 4 + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 3 + octave 5 + note E_, 1 + note __, 3 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note F#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + octave 5 + note D#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 3 + octave 5 + note E_, 1 + note __, 3 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note F#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 3 + octave 5 + note E_, 1 + note __, 3 + octave 4 + note D#, 4 + octave 4 + note F_, 1 + note __, 1 + octave 5 + note F_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + octave 5 + note F_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 3 + octave 5 + note F_, 1 + note __, 3 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note G_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 3 + note F_, 1 + note __, 1 + octave 5 + note F_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 5 + note F_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + octave 5 + note F_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 3 + octave 5 + note F_, 1 + note __, 3 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note G_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 3 + octave 5 + note F_, 1 + note __, 3 + octave 4 + note D#, 4 + loopchannel 0, Music_DefeatedWildMon_branch_23c21 +; 0x23cad \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon1.asm b/crysaudio/music/RBY/dungeon1.asm new file mode 100644 index 00000000..fc7c0677 --- /dev/null +++ b/crysaudio/music/RBY/dungeon1.asm @@ -0,0 +1,682 @@ +Music_Dungeon1: + dbw $C0, Music_Dungeon1_Ch1 + dbw $01, Music_Dungeon1_Ch2 + dbw $02, Music_Dungeon1_Ch3 + dbw $03, Music_Dungeon1_Ch4 + +Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1) + tempo 144 + volume 119 + dutycycle 3 + vibrato 10, 20 + notetype 12, 77 + note __, 8 + unknownmusic0xee 237 + octave 4 + note F#, 8 + unknownmusic0xee 255 + +Music_Dungeon1_branch_7dee5: + notetype 12, 178 + octave 3 + +Music_Dungeon1_branch_7dee8: + callchannel Music_Dungeon1_branch_7dfaa + loopchannel 3, Music_Dungeon1_branch_7dee8 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + note __, 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + +Music_Dungeon1_branch_7deff: + callchannel Music_Dungeon1_branch_7dfaa + loopchannel 4, Music_Dungeon1_branch_7deff + callchannel Music_Dungeon1_branch_7dfd5 + octave 3 + note G_, 1 + note F#, 1 + note E_, 1 + note G_, 1 + callchannel Music_Dungeon1_branch_7dfd5 + octave 3 + note A_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + callchannel Music_Dungeon1_branch_7dfd5 + octave 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + notetype 12, 195 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + notetype 12, 194 + callchannel Music_Dungeon1_branch_7dfc5 + octave 3 + note B_, 3 + callchannel Music_Dungeon1_branch_7dfc5 + note C_, 3 + callchannel Music_Dungeon1_branch_7dfc5 + note C#, 3 + notetype 12, 195 + octave 3 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 2 + note B_, 4 + notetype 12, 194 + note B_, 1 + note A#, 1 + note G_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note A#, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note G#, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note G#, 1 + note B_, 1 + octave 3 + note C#, 1 + note C_, 1 + octave 2 + note A_, 1 + octave 3 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note A_, 1 + octave 3 + note C_, 1 + note D_, 1 + note C#, 1 + octave 2 + note A#, 1 + octave 3 + note C#, 1 + note D_, 1 + note C#, 1 + octave 2 + note A#, 1 + octave 3 + note C#, 1 + +Music_Dungeon1_branch_7df6e: + note __, 16 + loopchannel 8, Music_Dungeon1_branch_7df6e + notetype 12, 195 + callchannel Music_Dungeon1_branch_7dfbb + note B_, 2 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A_, 4 + note F#, 2 + callchannel Music_Dungeon1_branch_7dfbb + note A#, 2 + note G_, 2 + note B_, 4 + note G_, 2 + note F#, 2 + note G_, 2 + note D#, 2 + notetype 12, 194 + callchannel Music_Dungeon1_branch_7dfc5 + octave 3 + note B_, 3 + callchannel Music_Dungeon1_branch_7dfc5 + note C_, 3 + callchannel Music_Dungeon1_branch_7dfc5 + note C#, 3 + notetype 12, 199 + octave 3 + note F#, 8 + note D#, 8 + notetype 12, 194 + callchannel Music_Dungeon1_branch_7dfaa + callchannel Music_Dungeon1_branch_7dfaa + loopchannel 0, Music_Dungeon1_branch_7dee5 + +Music_Dungeon1_branch_7dfaa: + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + note __, 1 + note A#, 1 + note E_, 1 + note D#, 1 + note B_, 1 + note A#, 1 + note G_, 1 + note G#, 1 + note __, 1 + note A#, 1 + endchannel + +Music_Dungeon1_branch_7dfbb: + octave 2 + note G_, 2 + note A#, 4 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A#, 2 + endchannel + +Music_Dungeon1_branch_7dfc5: + octave 3 + note E_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note A#, 1 + note E_, 1 + note B_, 1 + note E_, 1 + octave 4 + note C_, 1 + endchannel + +Music_Dungeon1_branch_7dfd5: + note E_, 1 + note E_, 1 + note __, 4 + octave 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + endchannel + + +Music_Dungeon1_Ch2: ; 7dfde (1f:5fde) + vibrato 11, 21 + dutycycle 3 + notetype 12, 15 + octave 4 + note G#, 8 + notetype 12, 77 + octave 5 + note D_, 8 + +Music_Dungeon1_branch_7dfeb: + notetype 12, 194 + +Music_Dungeon1_branch_7dfed: + callchannel Music_Dungeon1_branch_7e097 + loopchannel 3, Music_Dungeon1_branch_7dfed + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + note __, 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note D#, 1 + +Music_Dungeon1_branch_7e006: + callchannel Music_Dungeon1_branch_7e097 + loopchannel 4, Music_Dungeon1_branch_7e006 + note __, 2 + callchannel Music_Dungeon1_branch_7e0ab + octave 3 + note C_, 4 + callchannel Music_Dungeon1_branch_7e0ab + octave 3 + note C#, 4 + callchannel Music_Dungeon1_branch_7e0ab + octave 3 + note D#, 4 + notetype 12, 211 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + notetype 12, 210 + callchannel Music_Dungeon1_branch_7e0b5 + octave 3 + note F#, 4 + callchannel Music_Dungeon1_branch_7e0b5 + octave 3 + note G_, 4 + callchannel Music_Dungeon1_branch_7e0b5 + octave 3 + note A#, 4 + notetype 12, 211 + octave 4 + note E_, 4 + note D#, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note G_, 4 + note F#, 2 + notetype 12, 214 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + notetype 12, 210 + callchannel Music_Dungeon1_branch_7e0ba + note __, 10 + note E_, 1 + note __, 1 + callchannel Music_Dungeon1_branch_7e0ba + note __, 12 + callchannel Music_Dungeon1_branch_7e0ba + note __, 12 + callchannel Music_Dungeon1_branch_7e0ba + note __, 14 + notetype 12, 211 + callchannel Music_Dungeon1_branch_7e0cd + note D#, 4 + callchannel Music_Dungeon1_branch_7e0cd + note D#, 2 + note __, 2 + notetype 12, 210 + callchannel Music_Dungeon1_branch_7e0c0 + note __, 2 + octave 3 + note F#, 4 + octave 2 + note E_, 1 + note E_, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note C#, 1 + note __, 1 + note D_, 1 + note C#, 1 + note __, 2 + octave 3 + note G_, 4 + callchannel Music_Dungeon1_branch_7e0c0 + octave 3 + note A#, 4 + notetype 12, 214 + note B_, 8 + octave 4 + note D#, 8 + notetype 12, 210 + callchannel Music_Dungeon1_branch_7e097 + callchannel Music_Dungeon1_branch_7e097 + loopchannel 0, Music_Dungeon1_branch_7dfeb + +Music_Dungeon1_branch_7e097: + octave 2 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + note __, 2 + note C_, 1 + octave 2 + note B_, 1 + note E_, 1 + note E_, 1 + note B_, 1 + octave 3 + note C_, 1 + note __, 2 + note C_, 1 + octave 2 + note B_, 1 + endchannel + +Music_Dungeon1_branch_7e0ab: + octave 2 + note E_, 1 + note E_, 1 + note __, 2 + octave 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + endchannel + +Music_Dungeon1_branch_7e0b5: + octave 2 + note E_, 1 + note E_, 1 + note __, 10 + endchannel + +Music_Dungeon1_branch_7e0ba: + octave 1 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + endchannel + +Music_Dungeon1_branch_7e0c0: + octave 2 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note C_, 1 + endchannel + +Music_Dungeon1_branch_7e0cd: + octave 3 + note E_, 6 + note G_, 6 + note E_, 4 + note A_, 6 + octave 4 + note C_, 6 + octave 3 + note B_, 4 + note G_, 6 + note A#, 6 + note F#, 4 + note E_, 6 + note F#, 6 + endchannel + + +Music_Dungeon1_Ch3: ; 7e0dc (1f:60dc) + notetype 12, 17 + vibrato 8, 38 + note __, 14 + octave 4 + note D_, 1 + note D#, 1 + +Music_Dungeon1_branch_7e0e5: + callchannel Music_Dungeon1_branch_7e140 + callchannel Music_Dungeon1_branch_7e140 + octave 5 + note E_, 2 + note __, 4 + octave 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + octave 4 + note F#, 4 + callchannel Music_Dungeon1_branch_7e154 + octave 4 + note G_, 4 + callchannel Music_Dungeon1_branch_7e154 + octave 4 + note A_, 4 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + note __, 6 + callchannel Music_Dungeon1_branch_7e177 + note B_, 4 + note A#, 4 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D#, 4 + callchannel Music_Dungeon1_branch_7e15e + note __, 12 + callchannel Music_Dungeon1_branch_7e15e + note __, 12 + callchannel Music_Dungeon1_branch_7e15e + note __, 10 + note E_, 1 + note __, 1 + callchannel Music_Dungeon1_branch_7e15e + note __, 12 + callchannel Music_Dungeon1_branch_7e15e + note __, 12 + callchannel Music_Dungeon1_branch_7e15e + note __, 10 + note D_, 1 + note D#, 1 + callchannel Music_Dungeon1_branch_7e164 + callchannel Music_Dungeon1_branch_7e164 + note E_, 2 + note __, 4 + callchannel Music_Dungeon1_branch_7e177 + note B_, 8 + note F#, 6 + note D_, 1 + note D#, 1 + note __, 16 + note __, 16 + loopchannel 0, Music_Dungeon1_branch_7e0e5 + +Music_Dungeon1_branch_7e140: + octave 5 + note E_, 4 + note B_, 4 + note A#, 4 + octave 6 + note D_, 4 + note C#, 4 + octave 5 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + endchannel + +Music_Dungeon1_branch_7e154: + octave 6 + note E_, 1 + note E_, 1 + note __, 4 + octave 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + endchannel + +Music_Dungeon1_branch_7e15e: + octave 3 + note E_, 1 + note G_, 1 + note E_, 1 + note D#, 1 + endchannel + +Music_Dungeon1_branch_7e164: + note E_, 4 + note B_, 4 + note A#, 4 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + endchannel + +Music_Dungeon1_branch_7e177: + octave 4 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note F#, 4 + note __, 6 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note G_, 4 + note __, 6 + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + note A#, 4 + endchannel + + +Music_Dungeon1_Ch4: ; 7e18a (1f:618a) + notetype 12 + togglenoise 1 + note __, 14 + note E_, 1 + note E_, 1 + +Music_Dungeon1_branch_7e190: + callchannel Music_Dungeon1_branch_7e1f1 + loopchannel 3, Music_Dungeon1_branch_7e190 + note F_, 4 + note E_, 4 + note F_, 4 + note E_, 2 + note E_, 2 + +Music_Dungeon1_branch_7e1a1: + callchannel Music_Dungeon1_branch_7e1f1 + loopchannel 3, Music_Dungeon1_branch_7e1a1 + note F_, 4 + note E_, 4 + note F_, 4 + note F_, 4 + +Music_Dungeon1_branch_7e1b0: + callchannel Music_Dungeon1_branch_7e1fa + loopchannel 3, Music_Dungeon1_branch_7e1b0 + callchannel Music_Dungeon1_branch_7e202 + +Music_Dungeon1_branch_7e1ba: + callchannel Music_Dungeon1_branch_7e1fa + loopchannel 3, Music_Dungeon1_branch_7e1ba + callchannel Music_Dungeon1_branch_7e202 + note C#, 4 + note D_, 4 + note D_, 4 + note __, 2 + note C#, 2 + note F_, 4 + +Music_Dungeon1_branch_7e1cf: + note __, 16 + loopchannel 13, Music_Dungeon1_branch_7e1cf + note __, 12 + +Music_Dungeon1_branch_7e1d5: + callchannel Music_Dungeon1_branch_7e1fa + loopchannel 3, Music_Dungeon1_branch_7e1d5 + note E_, 4 + note E_, 4 + note E_, 4 + note __, 2 + note E_, 1 + note E_, 1 + callchannel Music_Dungeon1_branch_7e1f1 + callchannel Music_Dungeon1_branch_7e1f1 + loopchannel 0, Music_Dungeon1_branch_7e190 + +Music_Dungeon1_branch_7e1f1: + note F_, 4 + note E_, 4 + note F_, 4 + note E_, 4 + endchannel + +Music_Dungeon1_branch_7e1fa: + note E_, 1 + note E_, 1 + note __, 10 + note F#, 4 + endchannel + +Music_Dungeon1_branch_7e202: + note C#, 4 + note D_, 4 + note D_, 4 + note D#, 4 + endchannel +; 0x7e20b \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon2.asm b/crysaudio/music/RBY/dungeon2.asm new file mode 100644 index 00000000..9d8043aa --- /dev/null +++ b/crysaudio/music/RBY/dungeon2.asm @@ -0,0 +1,325 @@ +Music_Dungeon2: + dbw $C0, Music_Dungeon2_Ch1 + dbw $01, Music_Dungeon2_Ch2 + dbw $02, Music_Dungeon2_Ch3 + dbw $03, Music_Dungeon2_Ch4 + +Music_Dungeon2_Ch1: ; 7e887 (1f:6887) + tempo 144 + volume 119 + dutycycle 3 + + vibrato 10, 20 + +Music_Dungeon2_branch_7e892: + notetype 12, 178 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + octave 5 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + octave 3 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + octave 2 + note G_, 2 + note A#, 4 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A_, 4 + note F#, 2 + loopchannel 2, Music_Dungeon2_branch_7e892 + notetype 12, 31 + octave 3 + note E_, 16 + note C_, 16 + note D_, 16 + octave 2 + note A#, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + loopchannel 0, Music_Dungeon2_branch_7e892 + + +Music_Dungeon2_Ch2: ; 7e8d8 (1f:68d8) + vibrato 11, 21 + +Music_Dungeon2_branch_7e8db: + dutycycle 3 + notetype 12, 194 + octave 3 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + octave 4 + note F#, 4 + note F#, 4 + note F#, 4 + note F#, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note F#, 4 + loopchannel 2, Music_Dungeon2_branch_7e8db + octave 3 + note E_, 2 + note G_, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note E_, 2 + octave 5 + note E_, 2 + note __, 2 + note D#, 2 + note __, 2 + note D_, 2 + note __, 2 + note C#, 2 + note C_, 2 + octave 4 + note E_, 2 + note G_, 2 + octave 3 + note A#, 2 + note C#, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note G_, 2 + octave 5 + note G_, 2 + note __, 2 + note F#, 2 + note __, 2 + note F_, 2 + note __, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype 12, 199 + dutycycle 1 + octave 4 + note E_, 16 + note D_, 16 + note C_, 16 + note D_, 16 + loopchannel 0, Music_Dungeon2_branch_7e8db + + +Music_Dungeon2_Ch3: ; 7e93b (1f:693b) + notetype 12, 19 + vibrato 8, 38 + +Music_Dungeon2_branch_7e940: + callchannel Music_Dungeon2_branch_7e9d1 + loopchannel 16, Music_Dungeon2_branch_7e940 + note E_, 4 + note __, 4 + note __, 4 + note E_, 4 + note C_, 4 + note __, 4 + note __, 4 + note C_, 4 + note D_, 4 + note __, 4 + note __, 4 + note D_, 4 + octave 3 + note A#, 4 + note __, 4 + note __, 4 + note A#, 4 + +Music_Dungeon2_branch_7e958: + octave 5 + note E_, 2 + note __, 2 + note B_, 2 + note __, 2 + note A#, 2 + note __, 2 + octave 6 + note D_, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 5 + note G#, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note A#, 2 + note __, 2 + note E_, 2 + note __, 2 + note D#, 2 + note __, 2 + note A_, 2 + note __, 2 + note G#, 2 + note __, 2 + note E_, 2 + note __, 2 + note F#, 2 + note __, 2 + note D#, 2 + note __, 2 + loopchannel 3, Music_Dungeon2_branch_7e958 + octave 4 + note E_, 4 + note B_, 4 + note A#, 4 + octave 5 + note D_, 4 + note C#, 4 + octave 4 + note G#, 4 + note G_, 4 + note B_, 4 + note A#, 4 + note E_, 4 + note D#, 4 + note A_, 4 + note G#, 4 + note E_, 4 + note F#, 4 + note D#, 4 + octave 3 + note E_, 16 + note C_, 16 + note D_, 16 + octave 2 + note A#, 16 + octave 3 + note E_, 16 + note F_, 16 + note G_, 16 + octave 3 + note B_, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + callchannel Music_Dungeon2_branch_7e9d1 + loopchannel 0, Music_Dungeon2_branch_7e940 + octave 2 + note G_, 2 + note A#, 4 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C#, 4 + octave 2 + note G_, 2 + note A#, 2 + note G_, 2 + note __, 2 + endchannel + +Music_Dungeon2_branch_7e9d1: + octave 4 + note E_, 2 + note __, 4 + octave 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + octave 4 + note F#, 4 + endchannel + + +Music_Dungeon2_Ch4: ; 7e9dc (1f:69dc) + notetype 12 + togglenoise 1 + +Music_Dungeon2_branch_7e9dd: + note E_, 4 + note F_, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F_, 4 + note D#, 4 + note C#, 4 + loopchannel 0, Music_Dungeon2_branch_7e9dd +; 0x7e9f1 \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon3.asm b/crysaudio/music/RBY/dungeon3.asm new file mode 100644 index 00000000..12322487 --- /dev/null +++ b/crysaudio/music/RBY/dungeon3.asm @@ -0,0 +1,715 @@ +Music_Dungeon3: + dbw $80, Music_Dungeon3_Ch1 + dbw $01, Music_Dungeon3_Ch2 + dbw $02, Music_Dungeon3_Ch3 + +Music_Dungeon3_Ch1: ; 7e9f1 (1f:69f1) + tempo 160 + volume 119 + dutycycle 3 + + vibrato 8, 20 + +Music_Dungeon3_branch_7e9fc: + notetype 12, 195 + +Music_Dungeon3_branch_7e9fe: + callchannel Music_Dungeon3_branch_7eab2 + loopchannel 3, Music_Dungeon3_branch_7e9fe + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + note D#, 2 + note E_, 2 + +Music_Dungeon3_branch_7ea11: + callchannel Music_Dungeon3_branch_7eac1 + loopchannel 4, Music_Dungeon3_branch_7ea11 + +Music_Dungeon3_branch_7ea18: + callchannel Music_Dungeon3_branch_7eab2 + loopchannel 4, Music_Dungeon3_branch_7ea18 + octave 4 + note F_, 2 + note F_, 2 + note __, 2 + note F_, 2 + note E_, 2 + note E_, 2 + note D#, 2 + note D#, 2 + note __, 2 + note D#, 2 + note D_, 2 + note D_, 2 + callchannel Music_Dungeon3_branch_7eafc + octave 4 + note D_, 2 + note D_, 2 + note __, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note E_, 2 + note __, 2 + note E_, 2 + note F_, 2 + note F_, 2 + +Music_Dungeon3_branch_7ea3c: + callchannel Music_Dungeon3_branch_7eace + loopchannel 4, Music_Dungeon3_branch_7ea3c + +Music_Dungeon3_branch_7ea43: + callchannel Music_Dungeon3_branch_7eadd + loopchannel 3, Music_Dungeon3_branch_7ea43 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + note F_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + note F_, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note F_, 2 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + callchannel Music_Dungeon3_branch_7eaea + callchannel Music_Dungeon3_branch_7eaea + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + note __, 16 + note __, 8 + callchannel Music_Dungeon3_branch_7eaf7 + callchannel Music_Dungeon3_branch_7eaf7 + callchannel Music_Dungeon3_branch_7eaf7 + callchannel Music_Dungeon3_branch_7eaf7 + note D#, 2 + note __, 16 + note __, 16 + loopchannel 0, Music_Dungeon3_branch_7e9fc + +Music_Dungeon3_branch_7eab2: + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + endchannel + +Music_Dungeon3_branch_7eac1: + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note G#, 2 + endchannel + +Music_Dungeon3_branch_7eace: + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note D#, 2 + octave 2 + note B_, 2 + endchannel + +Music_Dungeon3_branch_7eadd: + note A_, 2 + note F_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + note F_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + note F_, 2 + endchannel + +Music_Dungeon3_branch_7eaea: + octave 3 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + endchannel + +Music_Dungeon3_branch_7eaf7: + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + endchannel + +Music_Dungeon3_branch_7eafc: + tempo 168 + octave 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + tempo 176 + octave 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + tempo 184 + octave 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + tempo 192 + octave 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + tempo 200 + octave 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + tempo 208 + octave 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + tempo 216 + octave 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + tempo 224 + octave 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + tempo 160 + endchannel + + +Music_Dungeon3_Ch2: ; 7eb68 (1f:6b68) + vibrato 11, 21 + dutycycle 3 + +Music_Dungeon3_branch_7eb6d: + notetype 12, 211 + octave 4 + note D#, 6 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 6 + octave 4 + note C#, 8 + note __, 2 + note G#, 6 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 6 + note F#, 6 + note E_, 4 + note D#, 6 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 6 + octave 4 + note C#, 8 + note __, 2 + note G#, 2 + note G#, 2 + note __, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A#, 2 + note A#, 2 + note __, 2 + note A#, 2 + note B_, 2 + note B_, 2 + note __, 8 + note __, 8 + note __, 8 + note __, 8 + note __, 8 + note __, 8 + note __, 8 + note __, 8 + octave 4 + note B_, 2 + note B_, 2 + note __, 2 + note B_, 2 + note A#, 2 + note A#, 2 + note A_, 2 + note A_, 2 + note __, 2 + note A_, 2 + note G#, 2 + note G#, 2 + note C#, 8 + note __, 2 + octave 3 + note B_, 6 + note A#, 2 + note B_, 2 + octave 4 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 6 + note G_, 6 + octave 3 + note G_, 8 + note __, 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note G_, 6 + note F_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note G_, 6 + note A_, 6 + octave 4 + note C#, 6 + note G_, 8 + note __, 2 + note F_, 6 + note E_, 2 + note F_, 2 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note G_, 6 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note G_, 6 + note A_, 6 + octave 5 + note C#, 6 + octave 4 + note F#, 8 + note __, 2 + note E_, 6 + note D#, 2 + note E_, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note G#, 6 + octave 5 + note C_, 6 + octave 3 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 2 + note E_, 2 + note G#, 2 + octave 3 + note C_, 2 + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + loopchannel 0, Music_Dungeon3_branch_7eb6d + + +Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) + notetype 12, 18 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 12 + notetype 6, 16 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note __, 2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note __, 16 + note __, 16 + note __, 10 + octave 5 + note E_, 8 + octave 4 + note B_, 8 + octave 5 + note D#, 8 + octave 4 + note A#, 8 + octave 5 + note D_, 8 + octave 4 + note A_, 8 + octave 5 + note C#, 8 + octave 4 + note G#, 8 + octave 5 + note C_, 8 + octave 4 + note G_, 8 + note B_, 8 + note F#, 8 + note A#, 8 + note F_, 8 + note A_, 8 + note E_, 8 + note __, 16 + note __, 16 + note __, 8 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note __, 2 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note __, 10 + note __, 16 + notetype 12, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 10 + loopchannel 0, Music_Dungeon3_Ch3 diff --git a/crysaudio/music/RBY/finalbattle.asm b/crysaudio/music/RBY/finalbattle.asm new file mode 100644 index 00000000..0c9f6af4 --- /dev/null +++ b/crysaudio/music/RBY/finalbattle.asm @@ -0,0 +1,1337 @@ +Music_FinalBattle: + dbw $80, Music_FinalBattle_Ch1 + dbw $01, Music_FinalBattle_Ch2 + dbw $02, Music_FinalBattle_Ch3 + +Music_FinalBattle_Ch1: + ftempo 112 + volume 119 + dutycycle 3 + vibrato $6, $34 + notetype $c, $b2 + octave 3 + note F#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + intensity $a2 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + intensity $92 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + intensity $82 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + intensity $c1 + octave 3 + note E_, 1 + note E_, 7 + note F_, 1 + note F_, 7 + note G_, 1 + note G_, 7 + note F_, 1 + note F_, 7 + note E_, 1 + note E_, 7 + note F_, 1 + note F_, 7 + note G_, 1 + note G_, 7 + note G#, 1 + note G#, 3 + note D#, 4 + intensity $c1 + note E_, 1 + note E_, 3 + intensity $b3 + note E_, 4 + intensity $c1 + note F_, 1 + note F_, 3 + intensity $b3 + note F_, 4 + intensity $c1 + note G_, 1 + note G_, 3 + intensity $b3 + note G_, 4 + intensity $c1 + note F_, 1 + note F_, 3 + intensity $b3 + note F_, 4 + intensity $c1 + note E_, 1 + note E_, 3 + intensity $b3 + note E_, 4 + intensity $c1 + note F_, 1 + note F_, 3 + intensity $b3 + note F_, 4 + intensity $c1 + note G_, 1 + note G_, 3 + intensity $b3 + note G_, 4 + intensity $c1 + note G#, 1 + note G#, 3 + intensity $b7 + note D#, 4 +Music_FinalBattle_branch_23429: + intensity $b7 + octave 3 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note F_, 4 + note F#, 4 + intensity $b1 + note F#, 2 + note F_, 1 + note F#, 1 + note A_, 1 + note F#, 2 + note F#, 1 + intensity $b7 + octave 2 + note B_, 6 + intensity $a0 + octave 3 + note D_, 6 + intensity $b7 + note F#, 4 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note F_, 4 + note F#, 12 + note A#, 4 + intensity $5e + note B_, 12 + intensity $b2 + note E_, 3 + note E_, 3 + note E_, 2 + note E_, 1 + note F#, 1 + note E_, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + intensity $c2 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + intensity $d2 + note E_, 1 + note F#, 1 + note B_, 1 + intensity $c1 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 3 + intensity $b5 + note D_, 4 + intensity $c1 + note E_, 1 + note E_, 3 + intensity $b5 + note F_, 4 + intensity $c1 + note E_, 1 + note E_, 3 + intensity $b5 + note D_, 4 + intensity $c1 + note E_, 1 + intensity $b7 + note E_, 7 + intensity $c1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 1 + note E_, 2 + note B_, 1 + note A_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 3 + note E_, 1 + note D_, 1 + note F_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note F_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note F_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note F_, 2 + octave 4 + note C_, 1 + octave 3 + note B_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 3 + note F_, 1 + note E_, 1 + note F#, 2 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note F#, 2 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note F#, 2 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note F#, 2 + octave 4 + note C#, 1 + note C_, 3 + octave 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + note F#, 1 + note F_, 3 + intensity $b7 + octave 4 + note C_, 2 + intensity $b0 + note C#, 8 + intensity $b7 + note C#, 8 + intensity $a0 + octave 3 + note F#, 8 + note F#, 8 + intensity $b0 + octave 3 + note A_, 8 + intensity $b7 + note A_, 8 + note G_, 4 + note B_, 12 + intensity $b0 + note A_, 8 + intensity $b7 + note A_, 8 + intensity $b0 + note E_, 8 + intensity $b7 + note E_, 8 + intensity $b0 + note A#, 8 + intensity $b7 + note A#, 8 + octave 4 + note F_, 8 + octave 3 + note A#, 8 + octave 4 + note C#, 4 + note E_, 12 + octave 3 + note A_, 4 + octave 4 + note C#, 12 + intensity $40 + callchannel Music_FinalBattle_branch_23710 + callchannel Music_FinalBattle_branch_23710 + intensity $b7 + octave 3 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note F_, 4 + note F#, 12 + intensity $b0 + note A_, 8 + note G_, 8 + intensity $b7 + note E_, 4 + note B_, 4 + note D#, 4 + note A#, 4 + note D_, 4 + note A_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note F_, 4 + note F#, 12 + intensity $b0 + note A_, 8 + intensity $b7 + octave 4 + note C_, 8 + intensity $b0 + octave 3 + note B_, 8 + intensity $b7 + note B_, 8 + intensity $b0 + octave 4 + note E_, 8 + intensity $b7 + note E_, 8 + loopchannel 0, Music_FinalBattle_branch_23429 +Music_FinalBattle_Ch2: + dutycycle 3 + vibrato $8, $25 + notetype $c, $c2 + octave 5 + note C_, 1 + octave 4 + note G#, 1 + note B_, 1 + note F#, 1 + note A_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note D#, 1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + octave 5 + note C_, 1 + octave 4 + note C_, 1 + octave 3 + note G#, 1 + note B_, 1 + note F#, 1 + note A#, 1 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 + octave 3 + note G#, 1 + note D#, 1 + note G_, 1 + note D_, 1 + note F_, 1 + note C#, 1 + note E_, 1 + octave 5 + note C_, 1 + intensity $c1 + octave 4 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 7 + note E_, 1 + note E_, 3 + intensity $c2 + octave 5 + note E_, 4 + intensity $c1 + octave 4 + note E_, 1 + note E_, 3 + intensity $c2 + octave 5 + note E_, 4 + intensity $c1 + octave 4 + note E_, 1 + note E_, 3 + intensity $c2 + octave 5 + note E_, 4 + intensity $c1 + octave 4 + note E_, 1 + note E_, 3 + intensity $c2 + note D#, 4 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + callchannel Music_FinalBattle_branch_23704 + intensity $c1 + octave 4 + note E_, 1 + note E_, 3 + intensity $4a + octave 3 + note G#, 4 +Music_FinalBattle_branch_235e6: + intensity $d7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + intensity $d7 + note A#, 4 + note B_, 12 + intensity $b1 + note F_, 2 + note F#, 3 + note A_, 1 + note B_, 1 + note A_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 2 + note A_, 1 + note B_, 1 + note B_, 1 + note A_, 1 + note A#, 1 + intensity $d7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + intensity $d7 + note A#, 4 + note B_, 12 + octave 4 + note D#, 4 + note E_, 12 + intensity $a0 + octave 3 + note B_, 8 + octave 4 + note D_, 8 + note F_, 8 + note D_, 8 + intensity $d1 + note E_, 1 + note E_, 3 + intensity $c4 + octave 3 + note D_, 4 + intensity $d1 + octave 4 + note E_, 1 + note E_, 3 + intensity $c4 + octave 3 + note F_, 4 + intensity $d1 + octave 4 + note E_, 1 + note E_, 3 + intensity $c4 + octave 3 + note D_, 4 + intensity $d1 + octave 4 + note E_, 1 + note E_, 1 + intensity $c4 + octave 2 + note B_, 4 + octave 3 + note D_, 2 + intensity $c2 + octave 4 + note E_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note F_, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note E_, 1 + intensity $c4 + octave 2 + note B_, 4 + octave 3 + note D_, 2 + intensity $d7 + octave 4 + note E_, 4 + note F_, 2 + note F#, 12 + intensity $c2 + octave 3 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 4 + note B_, 2 + intensity $d7 + octave 4 + note F_, 4 + note F#, 2 + note G_, 12 + intensity $c2 + note C_, 2 + note C_, 4 + note C_, 2 + note C_, 4 + note C_, 2 + intensity $d7 + note F#, 4 + note G_, 2 + note G#, 12 + intensity $82 + note C#, 2 + note C#, 4 + intensity $a2 + note C#, 2 + note C#, 4 + note C#, 4 + intensity $d2 + note C#, 2 + note C#, 4 + intensity $f2 + note C#, 2 + note C#, 4 + intensity $c4 + note E_, 1 + note F_, 1 + intensity $c0 + note F#, 12 + intensity $c7 + note F#, 4 + intensity $1f + octave 3 + note F#, 8 + intensity $90 + note F#, 8 + intensity $c7 + octave 4 + note C#, 4 + intensity $c0 + note D_, 12 + note D_, 8 + intensity $c7 + note D_, 8 + intensity $c0 + note E_, 8 + intensity $c7 + note E_, 8 + intensity $c0 + octave 3 + note A_, 8 + intensity $c7 + note A_, 8 + intensity $c0 + octave 4 + note F_, 8 + intensity $c7 + note F_, 8 + octave 5 + note C_, 8 + octave 4 + note A#, 8 + intensity $c0 + note A_, 16 + note A_, 8 + intensity $c7 + note A_, 8 + intensity $c5 + callchannel Music_FinalBattle_branch_23710 + intensity $b1 + callchannel Music_FinalBattle_branch_23710 + intensity $d7 + octave 4 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + note A#, 4 + note B_, 12 + intensity $c7 + octave 4 + note D_, 8 + intensity $4c + note C_, 8 + intensity $d7 + note E_, 8 + note D#, 8 + note D_, 8 + octave 3 + note B_, 8 + note A#, 4 + note B_, 12 + intensity $5d + octave 4 + note D_, 8 + intensity $c0 + note F_, 8 + intensity $c0 + note E_, 8 + intensity $c7 + note E_, 8 + note A#, 4 + note B_, 12 + loopchannel 0, Music_FinalBattle_branch_235e6 +Music_FinalBattle_branch_23704: + octave 4 + note E_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + note E_, 1 + note C_, 1 + octave 4 + note G_, 1 + note F_, 1 + endchannel +Music_FinalBattle_branch_23710: + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + note F#, 2 + note D_, 2 + endchannel +Music_FinalBattle_Ch3: + notetype $c, $11 + octave 4 + note E_, 4 + octave 5 + note E_, 4 + octave 4 + note F_, 4 + octave 5 + note D#, 4 + octave 4 + note G_, 4 + octave 5 + note D_, 4 + octave 4 + note G#, 4 + note B_, 4 + note E_, 1 + note E_, 1 + note __, 6 + note E_, 1 + note E_, 1 + note __, 6 + note E_, 1 + note E_, 1 + note __, 6 + note E_, 1 + note E_, 1 + note __, 2 + note D#, 4 + note E_, 1 + note E_, 1 + note __, 2 + note B_, 4 + note E_, 1 + note E_, 1 + note __, 2 + octave 5 + note C_, 4 + octave 4 + note E_, 1 + note E_, 1 + note __, 2 + octave 5 + note D_, 4 + octave 4 + note E_, 1 + note E_, 1 + octave 5 + note C_, 4 + octave 4 + note A#, 2 + note E_, 1 + note E_, 1 + note __, 2 + note B_, 4 + note E_, 1 + note E_, 1 + note __, 2 + octave 5 + note C_, 4 + octave 4 + note E_, 1 + note E_, 1 + note __, 2 + octave 5 + note D_, 4 + octave 4 + note E_, 1 + note E_, 1 + octave 5 + note C_, 4 + note D_, 2 + octave 4 + note E_, 1 + note E_, 1 + note __, 2 + note B_, 4 + note E_, 1 + note E_, 1 + note __, 2 + octave 5 + note C_, 4 + octave 4 + note E_, 1 + note E_, 1 + note __, 2 + octave 5 + note D_, 4 + octave 4 + note E_, 1 + note E_, 1 + note __, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note G_, 1 +Music_FinalBattle_branch_2377d: + octave 4 + note E_, 1 + octave 3 + note E_, 1 + note __, 2 + octave 4 + note F#, 4 + note D#, 1 + octave 3 + note D#, 1 + note __, 2 + octave 4 + note F_, 4 + note D_, 1 + octave 3 + note D_, 1 + note __, 2 + octave 4 + note E_, 4 + note F#, 1 + octave 3 + note F#, 1 + note __, 2 + octave 4 + note F#, 4 + note F_, 4 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + note E_, 1 + octave 3 + note E_, 1 + note __, 2 + octave 4 + note F#, 4 + note D#, 1 + octave 3 + note D#, 1 + note __, 2 + octave 4 + note F_, 4 + note D_, 1 + octave 3 + note D_, 1 + note __, 2 + octave 4 + note E_, 4 + note F#, 1 + octave 3 + note F#, 1 + note __, 2 + octave 4 + note F#, 4 + note F_, 4 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 1 + note E_, 1 + note __, 2 + note D_, 4 + note E_, 1 + note E_, 1 + note __, 2 + note F_, 4 + note E_, 1 + note E_, 1 + note __, 2 + note D_, 4 + note E_, 1 + note E_, 1 + octave 3 + note B_, 6 + octave 4 + note E_, 1 + note E_, 1 + note __, 2 + note D_, 4 + note E_, 1 + note E_, 1 + note __, 2 + note F_, 4 + note E_, 1 + note E_, 1 + note __, 2 + note D_, 4 + note E_, 1 + note E_, 1 + octave 3 + note B_, 6 + octave 4 + note E_, 2 + octave 5 + note D_, 2 + octave 4 + note E_, 2 + octave 5 + note D_, 2 + octave 4 + note E_, 2 + octave 5 + note D_, 2 + octave 4 + note E_, 2 + octave 5 + note D_, 2 + octave 4 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + octave 5 + note C#, 2 + octave 4 + note B_, 2 + note F_, 2 + octave 5 + note D#, 2 + octave 4 + note F_, 2 + octave 5 + note D#, 2 + octave 4 + note F_, 2 + octave 5 + note D#, 2 + octave 4 + note F_, 2 + octave 5 + note D#, 2 + octave 4 + note F_, 2 + octave 5 + note C_, 2 + note C_, 2 + octave 4 + note F_, 2 + octave 5 + note C_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + octave 4 + note F#, 2 + octave 5 + note E_, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + note C#, 2 + note E_, 2 + note C#, 2 + callchannel Music_FinalBattle_branch_2395b + callchannel Music_FinalBattle_branch_2395b + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + callchannel Music_FinalBattle_branch_2396c + callchannel Music_FinalBattle_branch_2396c + octave 4 + note A#, 2 + octave 5 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 4 + note A#, 2 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note G#, 2 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note F#, 2 + note F_, 2 + note E_, 2 + note B_, 2 + octave 5 + note E_, 4 + octave 4 + note E_, 2 + note B_, 2 + octave 5 + note D#, 4 + octave 4 + note E_, 2 + note B_, 2 + octave 5 + note D_, 4 + octave 4 + note E_, 2 + note A_, 2 + note B_, 4 + loopchannel 0, Music_FinalBattle_branch_2377d +Music_FinalBattle_branch_2395b: + octave 4 + note F#, 2 + octave 5 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C#, 2 + endchannel +Music_FinalBattle_branch_2396c: + octave 4 + note A_, 2 + octave 5 + note E_, 2 + octave 4 + note A_, 2 + octave 5 + note E_, 2 + octave 4 + note A_, 2 + octave 5 + note E_, 2 + octave 4 + note A_, 2 + octave 5 + note E_, 2 + endchannel diff --git a/crysaudio/music/RBY/gamecorner.asm b/crysaudio/music/RBY/gamecorner.asm new file mode 100644 index 00000000..75a63183 --- /dev/null +++ b/crysaudio/music/RBY/gamecorner.asm @@ -0,0 +1,633 @@ +Music_RBYGameCorner: + dbw $80, Music_RBYGameCorner_Ch1 + dbw $01, Music_RBYGameCorner_Ch2 + dbw $02, Music_RBYGameCorner_Ch3 + +Music_RBYGameCorner_Ch1: ; 7e20b (1f:620b) + tempo 120 + volume 119 + dutycycle 3 + vibrato 12, 52 + + notetype 12, 181 + octave 3 + note A_, 6 + notetype 12, 177 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 16 + +Music_RBYGameCorner_branch_7e222: + notetype 12, 181 + octave 3 + note C#, 4 + octave 2 + note G#, 4 + octave 3 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note A_, 2 + note G#, 8 + notetype 12, 167 + note G#, 2 + note A_, 2 + note B_, 2 + notetype 12, 181 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + notetype 12, 167 + note F#, 8 + note D#, 8 + notetype 12, 181 + note D#, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + notetype 12, 183 + octave 4 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 6 + note C#, 2 + octave 3 + note D#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + notetype 12, 151 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 2 + notetype 12, 183 + note F#, 8 + notetype 12, 181 + note C#, 4 + octave 2 + note G#, 4 + octave 3 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note A_, 2 + note G#, 8 + notetype 12, 183 + note G#, 2 + note A_, 2 + note B_, 2 + note G#, 6 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 8 + notetype 12, 151 + note D#, 4 + note C#, 4 + notetype 12, 181 + note D#, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + note D#, 4 + note B_, 2 + note A_, 8 + notetype 12, 183 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + notetype 12, 194 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note E_, 2 + note E_, 4 + note E_, 4 + notetype 12, 183 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D_, 2 + note D#, 10 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 8 + notetype 12, 181 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note F#, 4 + note D#, 4 + notetype 12, 183 + note E_, 3 + note D#, 1 + notetype 12, 178 + note C#, 2 + note D#, 2 + note E_, 10 + notetype 12, 183 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D_, 2 + note D#, 10 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 8 + notetype 12, 181 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note F#, 4 + note A_, 4 + notetype 12, 183 + note G#, 2 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 8 + loopchannel 0, Music_RBYGameCorner_branch_7e222 + + +Music_RBYGameCorner_Ch2: ; 7e2df (1f:62df) + dutycycle 2 + vibrato 10, 35 + notetype 12, 198 + octave 4 + note C#, 6 + notetype 12, 193 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + dutycycle 3 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 8 + +Music_RBYGameCorner_branch_7e2fa: + dutycycle 2 + notetype 12, 199 + octave 3 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note G#, 4 + note E_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 14 + octave 4 + note E_, 6 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 16 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + octave 4 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A#, 2 + note B_, 16 + note E_, 4 + octave 2 + note B_, 4 + octave 3 + note G#, 4 + note E_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 14 + octave 4 + note E_, 6 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 16 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + octave 4 + note D#, 2 + note C#, 14 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + notetype 12, 193 + note E_, 2 + notetype 12, 161 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 2 + notetype 12, 199 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + notetype 12, 197 + note F#, 4 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note A_, 4 + note G#, 3 + note A_, 1 + notetype 12, 194 + note G#, 2 + note F#, 2 + note E_, 2 + notetype 12, 199 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D#, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 10 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note F#, 4 + note D#, 4 + note A_, 4 + note F#, 4 + note B_, 16 + loopchannel 0, Music_RBYGameCorner_branch_7e2fa + + +Music_RBYGameCorner_Ch3: ; 7e38b (1f:638b) + notetype 12, 19 + octave 5 + note C#, 1 + note __, 5 + octave 4 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note B_, 1 + note __, 9 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + +Music_RBYGameCorner_branch_7e3a5: + callchannel Music_RBYGameCorner_branch_7e418 + callchannel Music_RBYGameCorner_branch_7e42d + callchannel Music_RBYGameCorner_branch_7e442 + callchannel Music_RBYGameCorner_branch_7e457 + callchannel Music_RBYGameCorner_branch_7e46c + callchannel Music_RBYGameCorner_branch_7e481 + callchannel Music_RBYGameCorner_branch_7e496 + note D#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + note D#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + callchannel Music_RBYGameCorner_branch_7e418 + callchannel Music_RBYGameCorner_branch_7e42d + callchannel Music_RBYGameCorner_branch_7e442 + callchannel Music_RBYGameCorner_branch_7e457 + callchannel Music_RBYGameCorner_branch_7e46c + callchannel Music_RBYGameCorner_branch_7e481 + callchannel Music_RBYGameCorner_branch_7e496 + note E_, 1 + note __, 3 + octave 3 + note B_, 1 + note __, 3 + octave 4 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note B_, 1 + note __, 1 + callchannel Music_RBYGameCorner_branch_7e46c + callchannel Music_RBYGameCorner_branch_7e418 + callchannel Music_RBYGameCorner_branch_7e4ab + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + callchannel Music_RBYGameCorner_branch_7e46c + callchannel Music_RBYGameCorner_branch_7e418 + callchannel Music_RBYGameCorner_branch_7e4ab + callchannel Music_RBYGameCorner_branch_7e42d + loopchannel 0, Music_RBYGameCorner_branch_7e3a5 + +Music_RBYGameCorner_branch_7e418: + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + endchannel + +Music_RBYGameCorner_branch_7e42d: + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + endchannel + +Music_RBYGameCorner_branch_7e442: + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + endchannel + +Music_RBYGameCorner_branch_7e457: + note D#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + note D#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + endchannel + +Music_RBYGameCorner_branch_7e46c: + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + endchannel + +Music_RBYGameCorner_branch_7e481: + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + endchannel + +Music_RBYGameCorner_branch_7e496: + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + endchannel + +Music_RBYGameCorner_branch_7e4ab: + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + endchannel +; 0x7e4c0 \ No newline at end of file diff --git a/crysaudio/music/RBY/gym.asm b/crysaudio/music/RBY/gym.asm new file mode 100644 index 00000000..6281b143 --- /dev/null +++ b/crysaudio/music/RBY/gym.asm @@ -0,0 +1,363 @@ +Music_RBYGym: + dbw $80, Music_RBYGym_Ch1 + dbw $01, Music_RBYGym_Ch2 + dbw $02, Music_RBYGym_Ch3 + +Music_RBYGym_Ch1: ; bcbb (2:7cbb) + tempo 138 + volume 119 + dutycycle 3 + vibrato 8, 34 + + notetype 12, 181 + octave 3 + note G_, 6 + note C_, 1 + note G_, 1 + note F_, 6 + octave 2 + note A#, 1 + octave 3 + note F_, 1 + note E_, 6 + octave 2 + note A_, 1 + octave 3 + note E_, 1 + note F_, 4 + note G_, 4 + +Music_RBYGym_branch_bcd8: + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + notetype 12, 177 + note D_, 3 + notetype 12, 181 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + notetype 12, 177 + note A#, 3 + notetype 12, 181 + note F_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F_, 4 + note A#, 2 + note F_, 1 + note A#, 1 + octave 4 + note D_, 4 + octave 3 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note C_, 1 + note D_, 1 + note E_, 4 + note C_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note C_, 1 + note E_, 1 + note F_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note C_, 1 + note D_, 1 + note E_, 4 + note D_, 2 + note E_, 2 + note F_, 2 + note F_, 2 + note G_, 2 + note E_, 1 + note G_, 1 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + loopchannel 0, Music_RBYGym_branch_bcd8 + + +Music_RBYGym_Ch2: ; bd6b (2:7d6b) + dutycycle 3 + vibrato 10, 37 + notetype 12, 199 + octave 4 + note C_, 6 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note A#, 6 + note F_, 1 + note A#, 1 + notetype 12, 160 + note A_, 12 + notetype 12, 199 + note B_, 4 + +Music_RBYGym_branch_bd82: + octave 4 + note C_, 12 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + notetype 12, 194 + note D_, 3 + octave 3 + note A#, 1 + notetype 12, 199 + note A#, 12 + octave 4 + note C_, 12 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + notetype 12, 196 + octave 3 + note A#, 2 + notetype 12, 199 + note A#, 1 + octave 4 + note C_, 1 + note D_, 12 + note E_, 12 + note D_, 2 + note E_, 2 + notetype 12, 194 + note F_, 3 + note D_, 1 + notetype 12, 199 + note D_, 4 + notetype 12, 194 + note A#, 3 + note F_, 1 + notetype 12, 199 + note F_, 4 + note E_, 12 + note D_, 2 + note E_, 2 + note F_, 2 + note D_, 1 + note F_, 1 + note A#, 12 + octave 3 + note G_, 6 + octave 4 + note C_, 6 + octave 3 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + notetype 12, 195 + note E_, 2 + notetype 12, 199 + note E_, 1 + note F_, 1 + note G_, 6 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note A#, 4 + note A_, 4 + note G_, 4 + note C_, 2 + note D_, 2 + note G_, 6 + octave 4 + note C_, 6 + octave 3 + note G_, 4 + note A#, 4 + note A_, 4 + note G_, 4 + note F_, 4 + notetype 12, 195 + note E_, 2 + notetype 12, 199 + note E_, 1 + note F_, 1 + note G_, 4 + notetype 12, 195 + note G_, 2 + notetype 12, 199 + note G_, 1 + note A_, 1 + note A#, 4 + notetype 12, 196 + octave 4 + note C_, 2 + notetype 12, 199 + note C_, 1 + note D_, 1 + note E_, 12 + loopchannel 0, Music_RBYGym_branch_bd82 + + +Music_RBYGym_Ch3: ; bdfa (2:7dfa) + notetype 12, 17 + note __, 16 + note __, 10 + octave 4 + note G_, 2 + note F_, 2 + note D_, 2 + +Music_RBYGym_branch_be02: + callchannel Music_RBYGym_branch_be3b + callchannel Music_RBYGym_branch_be44 + callchannel Music_RBYGym_branch_be3b + callchannel Music_RBYGym_branch_be44 + callchannel Music_RBYGym_branch_be3b + callchannel Music_RBYGym_branch_be44 + callchannel Music_RBYGym_branch_be3b + callchannel Music_RBYGym_branch_be44 + callchannel Music_RBYGym_branch_be3b + callchannel Music_RBYGym_branch_be4d + callchannel Music_RBYGym_branch_be3b + callchannel Music_RBYGym_branch_be4d + callchannel Music_RBYGym_branch_be3b + callchannel Music_RBYGym_branch_be4d + callchannel Music_RBYGym_branch_be3b + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note F_, 2 + loopchannel 0, Music_RBYGym_branch_be02 + +Music_RBYGym_branch_be3b: + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + endchannel + +Music_RBYGym_branch_be44: + 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 + +Music_RBYGym_branch_be4d: + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + endchannel +; 0xbe56 \ No newline at end of file diff --git a/crysaudio/music/RBY/gymleaderbattle.asm b/crysaudio/music/RBY/gymleaderbattle.asm new file mode 100644 index 00000000..0af2e0d1 --- /dev/null +++ b/crysaudio/music/RBY/gymleaderbattle.asm @@ -0,0 +1,1397 @@ +Music_GymLeaderBattle: + dbw $80, Music_GymLeaderBattle_Ch1 + dbw $01, Music_GymLeaderBattle_Ch2 + dbw $02, Music_GymLeaderBattle_Ch3 + +Music_GymLeaderBattle_Ch1: + ftempo 104 + volume 119 + dutycycle 3 + vibrato $8, $34 + notetype $c, $b3 + note __, 6 + octave 3 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + octave 2 + note F#, 1 + note __, 15 + note F#, 1 + note __, 9 + note G_, 6 + note F#, 1 + note __, 15 + note F#, 1 + note __, 9 + note F_, 6 + note F#, 1 + note __, 15 + note F#, 1 + note __, 9 + note G_, 6 + note F#, 1 + note __, 15 + note F#, 1 + note __, 9 + note A_, 6 +Music_GymLeaderBattle_branch_223b0: + note F#, 1 + octave 3 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 2 + note E_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + note F#, 1 + octave 3 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 2 + note E_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + note __, 2 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 4 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note E_, 4 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 4 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note C#, 2 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 4 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note E_, 4 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 4 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note C#, 2 + octave 1 + note B_, 2 + note A_, 2 + octave 2 + note C#, 2 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + note __, 16 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note B_, 1 + octave 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + intensity $b5 + octave 3 + note C#, 12 + intensity $b3 + octave 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + intensity $b5 + octave 3 + note A_, 12 + intensity $b3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note D#, 2 + note F#, 2 + octave 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + intensity $b5 + octave 3 + note A_, 12 + intensity $b3 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + intensity $b5 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note E_, 2 + note D#, 4 + note C#, 6 + note __, 16 + note __, 10 + note E_, 6 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note E_, 4 + note D#, 2 + note C#, 4 + octave 2 + note B_, 6 + octave 3 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + note E_, 6 + loopchannel 0, Music_GymLeaderBattle_branch_223b0 +Music_GymLeaderBattle_Ch2: + dutycycle 3 + vibrato $8, $25 + notetype $c, $c3 + octave 4 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note __, 5 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note B_, 1 + note __, 15 + note B_, 1 + note __, 9 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + note __, 15 + note B_, 1 + note __, 9 + note A#, 6 + octave 3 + note B_, 1 + note __, 15 + note B_, 1 + note __, 9 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + note __, 15 + note B_, 1 + note __, 9 + octave 4 + note C#, 6 +Music_GymLeaderBattle_branch_225e0: + intensity $c5 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + intensity $b7 + dutycycle 2 + octave 3 + note A_, 8 + octave 4 + note C#, 8 + note E_, 8 + note C#, 8 + intensity $c5 + dutycycle 3 + note D#, 4 + note C#, 4 + note D#, 4 + note E_, 2 + note F#, 4 + note E_, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + intensity $b7 + dutycycle 2 + note C#, 8 + octave 3 + note B_, 8 + note A_, 8 + intensity $c3 + octave 4 + note E_, 4 + note E_, 2 + note C#, 2 + intensity $c5 + dutycycle 3 + octave 1 + note B_, 1 + note __, 3 + octave 3 + note D_, 1 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note __, 4 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note __, 4 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note __, 2 + note E_, 1 + note C#, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D_, 1 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note __, 4 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note __, 4 + note F#, 1 + note E_, 1 + note C#, 1 + note F#, 1 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + intensity $b0 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note G_, 4 + intensity $b0 + note F#, 8 + intensity $b7 + note F#, 8 + intensity $c3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + intensity $b0 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + intensity $b0 + octave 3 + note B_, 16 + intensity $3f + octave 4 + note F#, 16 + intensity $c3 + dutycycle 3 + octave 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + intensity $c7 + octave 3 + note A_, 12 + intensity $c3 + octave 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + intensity $c7 + octave 4 + note C#, 12 + intensity $b0 + note D#, 16 + intensity $b7 + note D#, 16 + intensity $c3 + octave 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + intensity $c7 + octave 4 + note C#, 12 + intensity $c0 + note A_, 8 + note E_, 8 + note B_, 16 + intensity $c7 + note B_, 16 + intensity $c4 + octave 3 + note D#, 4 + note E_, 4 + note C#, 2 + note D#, 6 + note F#, 4 + note A_, 2 + note G#, 4 + note __, 2 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + intensity $c0 + note B_, 16 + note F#, 16 + note A_, 16 + octave 5 + note C#, 8 + note __, 2 + intensity $c3 + octave 4 + note A_, 6 + loopchannel 0, Music_GymLeaderBattle_branch_225e0 +Music_GymLeaderBattle_Ch3: + vibrato $0, $20 + notetype $c, $13 + note __, 12 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F_, 6 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 6 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 6 + intensity $14 +Music_GymLeaderBattle_branch_227b1: + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note D_, 4 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note E_, 4 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note D_, 4 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 2 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note D_, 4 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note E_, 4 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note D_, 4 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 13 + note B_, 1 + note __, 1 + note B_, 1 + note __, 13 + note B_, 1 + note __, 1 + note B_, 1 + note __, 13 + note B_, 1 + note __, 1 + note B_, 1 + note __, 13 + note B_, 1 + note __, 1 + note B_, 1 + note __, 13 + note B_, 1 + note __, 1 + note B_, 1 + note __, 13 + note B_, 1 + note __, 1 + note B_, 1 + note __, 13 + note B_, 1 + note __, 1 + note B_, 1 + note __, 13 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note C#, 12 + octave 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note E_, 12 + note D#, 16 + octave 3 + note B_, 16 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note E_, 12 + note C#, 8 + note E_, 8 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 6 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note G_, 6 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 6 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note G_, 6 + loopchannel 0, Music_GymLeaderBattle_branch_227b1 diff --git a/crysaudio/music/RBY/halloffame.asm b/crysaudio/music/RBY/halloffame.asm new file mode 100644 index 00000000..95a879cd --- /dev/null +++ b/crysaudio/music/RBY/halloffame.asm @@ -0,0 +1,102 @@ +Music_RBYHallOfFame: + dbw $80, Music_RBYHallOfFame_Ch1 + dbw $01, Music_RBYHallOfFame_Ch2 + dbw $02, Music_RBYHallOfFame_Ch3 + +Music_RBYHallOfFame_Ch1: ; 7fbaf (1f:7baf) + tempo 112 + volume 119 + dutycycle 3 + vibrato 12, 34 + + notetype 12, 179 + note __, 16 + note __, 16 + note __, 16 + note __, 12 + octave 3 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 + +Music_RBYHallOfFame_branch_7fbc5: + notetype 12, 128 + octave 4 + note C_, 16 + note E_, 16 + note F#, 16 + notetype 12, 96 + note F_, 16 + loopchannel 3, Music_RBYHallOfFame_branch_7fbc5 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + loopchannel 0, Music_RBYHallOfFame_branch_7fbc5 + + +Music_RBYHallOfFame_Ch2: ; 7fbda (1f:7bda) + vibrato 8, 37 + dutycycle 3 + +Music_RBYHallOfFame_branch_7fbdf: + notetype 12, 196 + octave 3 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note G_, 2 + note D_, 2 + note G_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note A_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note F_, 2 + note C_, 2 + note F_, 2 + note A#, 4 + note A_, 4 + note F_, 2 + loopchannel 0, Music_RBYHallOfFame_branch_7fbdf + + +Music_RBYHallOfFame_Ch3: ; 7fbfc (1f:7bfc) + notetype 12, 18 + +Music_RBYHallOfFame_branch_7fbfe: + octave 4 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + loopchannel 12, Music_RBYHallOfFame_branch_7fbfe + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note F#, 4 + note A_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + loopchannel 0, Music_RBYHallOfFame_Ch3 +; 0x7fc1f \ No newline at end of file diff --git a/crysaudio/music/RBY/indigoplateau.asm b/crysaudio/music/RBY/indigoplateau.asm new file mode 100644 index 00000000..b535054b --- /dev/null +++ b/crysaudio/music/RBY/indigoplateau.asm @@ -0,0 +1,329 @@ +Music_RBYIndigoPlateau: + dbw $C0, Music_RBYIndigoPlateau_Ch1 + dbw $01, Music_RBYIndigoPlateau_Ch2 + dbw $02, Music_RBYIndigoPlateau_Ch3 + dbw $03, Music_RBYIndigoPlateau_Ch4 + +Music_RBYIndigoPlateau_Ch1: ; a5f0 (2:65f0) + tempo 132 + volume 119 + dutycycle 3 + vibrato 6, 52 + + notetype 12, 178 + octave 2 + note A_, 8 + note A_, 8 + note A_, 8 + note A_, 4 + notetype 12, 164 + note A#, 4 + +Music_RBYIndigoPlateau_branch_a605: + callchannel Music_RBYIndigoPlateau_branch_a659 + notetype 12, 180 + octave 3 + note D_, 4 + callchannel Music_RBYIndigoPlateau_branch_a659 + notetype 12, 180 + octave 3 + note D#, 4 + callchannel Music_RBYIndigoPlateau_branch_a659 + notetype 12, 180 + octave 3 + note D_, 4 + callchannel Music_RBYIndigoPlateau_branch_a659 + notetype 12, 160 + octave 2 + note A#, 4 + callchannel Music_RBYIndigoPlateau_branch_a659 + notetype 12, 180 + octave 3 + note D_, 4 + notetype 12, 212 + octave 3 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + notetype 12, 180 + octave 3 + note D#, 4 + notetype 12, 212 + octave 3 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + notetype 12, 180 + octave 3 + note F_, 2 + notetype 12, 180 + octave 3 + note G_, 2 + notetype 12, 176 + note A_, 8 + octave 2 + note A_, 8 + notetype 12, 183 + octave 3 + note F_, 8 + notetype 12, 78 + octave 2 + note A#, 8 + loopchannel 0, Music_RBYIndigoPlateau_branch_a605 + +Music_RBYIndigoPlateau_branch_a659: + notetype 12, 178 + octave 2 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + endchannel + + +Music_RBYIndigoPlateau_Ch2: ; a664 (2:6664) + dutycycle 3 + vibrato 8, 37 + notetype 12, 194 + octave 3 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 4 + notetype 12, 90 + note D#, 4 + +Music_RBYIndigoPlateau_branch_a673: + callchannel Music_RBYIndigoPlateau_branch_a6af + notetype 12, 197 + note A_, 4 + callchannel Music_RBYIndigoPlateau_branch_a6af + notetype 12, 197 + note A#, 4 + callchannel Music_RBYIndigoPlateau_branch_a6af + notetype 12, 197 + note A_, 4 + callchannel Music_RBYIndigoPlateau_branch_a6af + notetype 12, 199 + note C#, 4 + callchannel Music_RBYIndigoPlateau_branch_a6af + notetype 12, 197 + note A_, 4 + callchannel Music_RBYIndigoPlateau_branch_a6af + notetype 12, 197 + note A#, 4 + callchannel Music_RBYIndigoPlateau_branch_a6af + notetype 12, 197 + octave 4 + note C_, 2 + notetype 12, 199 + octave 4 + note C#, 2 + note D_, 8 + octave 3 + note D_, 8 + octave 4 + note C_, 8 + notetype 12, 77 + octave 4 + note D#, 8 + loopchannel 0, Music_RBYIndigoPlateau_branch_a673 + +Music_RBYIndigoPlateau_branch_a6af: + notetype 12, 194 + octave 3 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + endchannel + + +Music_RBYIndigoPlateau_Ch3: ; a6ba (2:66ba) + notetype 12, 16 + octave 4 + note D_, 2 + note __, 6 + note D_, 2 + note __, 6 + note D_, 2 + note __, 6 + note D_, 2 + note __, 2 + note D#, 4 + +Music_RBYIndigoPlateau_branch_a6c6: + callchannel Music_RBYIndigoPlateau_branch_a6fe + callchannel Music_RBYIndigoPlateau_branch_a6fe + callchannel Music_RBYIndigoPlateau_branch_a6fe + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note F#, 4 + callchannel Music_RBYIndigoPlateau_branch_a6fe + callchannel Music_RBYIndigoPlateau_branch_a6fe + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A_, 8 + note D_, 8 + note A#, 8 + note D#, 8 + loopchannel 0, Music_RBYIndigoPlateau_branch_a6c6 + +Music_RBYIndigoPlateau_branch_a6fe: + octave 4 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note A_, 4 + endchannel + + +Music_RBYIndigoPlateau_Ch4: ; a70f (2:670f) + notetype 6 + togglenoise 1 + note A_, 16 + note A_, 16 + note A_, 16 + note A_, 8 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + +Music_RBYIndigoPlateau_branch_a728: + callchannel Music_RBYIndigoPlateau_branch_a791 + callchannel Music_RBYIndigoPlateau_branch_a77e + callchannel Music_RBYIndigoPlateau_branch_a791 + callchannel Music_RBYIndigoPlateau_branch_a7a8 + callchannel Music_RBYIndigoPlateau_branch_a791 + callchannel Music_RBYIndigoPlateau_branch_a77e + callchannel Music_RBYIndigoPlateau_branch_a791 + callchannel Music_RBYIndigoPlateau_branch_a7a8 + callchannel Music_RBYIndigoPlateau_branch_a791 + callchannel Music_RBYIndigoPlateau_branch_a77e + callchannel Music_RBYIndigoPlateau_branch_a791 + callchannel Music_RBYIndigoPlateau_branch_a7a8 + callchannel Music_RBYIndigoPlateau_branch_a77e + callchannel Music_RBYIndigoPlateau_branch_a7a8 + note A_, 16 + note A_, 8 + note A#, 8 + note A_, 16 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + 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_RBYIndigoPlateau_branch_a728 + +Music_RBYIndigoPlateau_branch_a77e: + note A_, 4 + note A#, 4 + note B_, 4 + note A#, 4 + note A_, 4 + note A#, 4 + note B_, 4 + note B_, 2 + note A#, 2 + endchannel + +Music_RBYIndigoPlateau_branch_a791: + note A_, 4 + note A#, 4 + note B_, 4 + note A#, 4 + note A_, 4 + note A#, 4 + note B_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + endchannel + +Music_RBYIndigoPlateau_branch_a7a8: + note A_, 4 + note A#, 4 + note A_, 4 + note A#, 4 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + endchannel +; 0xa7c5 \ No newline at end of file diff --git a/crysaudio/music/RBY/introbattle.asm b/crysaudio/music/RBY/introbattle.asm new file mode 100644 index 00000000..b8509488 --- /dev/null +++ b/crysaudio/music/RBY/introbattle.asm @@ -0,0 +1,337 @@ +Music_IntroBattle: + dbw $C0, Music_IntroBattle_Ch1 + dbw $01, Music_IntroBattle_Ch2 + dbw $02, Music_IntroBattle_Ch3 + dbw $03, Music_IntroBattle_Ch4 + +Music_IntroBattle_Ch1: ; 7f844 (1f:7844) + ftempo 98 + volume 119 + dutycycle 3 + vibrato 6, 52 + + notetype 12, 177 + note __, 8 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 180 + octave 3 + note D_, 4 + notetype 12, 177 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 180 + octave 3 + note D#, 4 + notetype 12, 177 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 180 + octave 3 + note D_, 4 + notetype 12, 177 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 160 + note A#, 4 + notetype 12, 177 + note A_, 2 + note A_, 2 + notetype 12, 180 + octave 3 + note D_, 4 + notetype 12, 177 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 41 + octave 3 + note G_, 4 + notetype 12, 176 + note A_, 8 + octave 2 + note A_, 8 + notetype 12, 183 + octave 3 + note F_, 8 + notetype 12, 79 + octave 2 + note F_, 8 + notetype 12, 177 + note A_, 2 + note A_, 2 + notetype 12, 180 + octave 3 + note D_, 4 + notetype 12, 177 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 180 + octave 3 + note D#, 4 + notetype 12, 177 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 180 + octave 3 + note F_, 4 + notetype 12, 177 + octave 2 + note A_, 2 + note A_, 2 + notetype 12, 180 + octave 3 + note G_, 4 + notetype 12, 176 + note F#, 16 + notetype 12, 177 + octave 4 + note D_, 16 + endchannel + + +Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc) + dutycycle 3 + vibrato 8, 37 + notetype 12, 194 + note __, 8 + octave 3 + note D_, 2 + note D_, 2 + notetype 12, 197 + note A_, 4 + notetype 12, 194 + note D_, 2 + note D_, 2 + notetype 12, 197 + note A#, 4 + notetype 12, 194 + note D_, 2 + note D_, 2 + notetype 12, 197 + note A_, 4 + notetype 12, 194 + note D_, 2 + note D_, 2 + notetype 12, 183 + note C#, 4 + notetype 12, 194 + note D_, 2 + note D_, 2 + notetype 12, 197 + note A_, 4 + notetype 12, 194 + octave 3 + note D_, 2 + note D_, 2 + notetype 12, 199 + octave 4 + note C#, 4 + note D_, 8 + octave 3 + note D_, 8 + octave 4 + note C_, 8 + octave 3 + note C_, 8 + notetype 12, 194 + note D_, 2 + note D_, 2 + notetype 12, 197 + note A_, 4 + notetype 12, 194 + note D_, 2 + note D_, 2 + notetype 12, 197 + note A#, 4 + notetype 12, 194 + note D_, 2 + note D_, 2 + notetype 12, 197 + octave 4 + note C_, 4 + notetype 12, 194 + octave 3 + note D_, 2 + note D_, 2 + notetype 12, 197 + octave 4 + note C#, 4 + notetype 12, 47 + note D_, 16 + notetype 12, 193 + octave 5 + note D_, 16 + endchannel + + +Music_IntroBattle_Ch3: ; 7f91d (1f:791d) + notetype 12, 16 + note __, 8 + octave 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A#, 4 + note A_, 8 + note D_, 8 + note A#, 8 + note D_, 8 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A#, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A#, 4 + note A_, 16 + note D_, 1 + note __, 15 + endchannel + + +Music_IntroBattle_Ch4: ; 7f95b (1f:795b) + notetype 6 + togglenoise 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 1 + note A_, 1 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note A_, 4 + note A_, 8 + note A_, 4 + note A_, 4 + note A_, 8 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note A_, 4 + note A_, 8 + note A_, 4 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 16 + note A_, 16 + note A_, 16 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 1 + note A_, 1 + note A_, 1 + note A_, 1 + note A_, 4 + note A_, 4 + note A_, 8 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note A_, 4 + note A_, 8 + note A_, 4 + note A_, 8 + note A_, 4 + note A_, 16 + note A_, 16 + note A_, 2 + note __, 16 + note __, 14 + endchannel +; 0x7fa19 \ No newline at end of file diff --git a/crysaudio/music/RBY/jigglypuffsong.asm b/crysaudio/music/RBY/jigglypuffsong.asm new file mode 100644 index 00000000..5ab55c8b --- /dev/null +++ b/crysaudio/music/RBY/jigglypuffsong.asm @@ -0,0 +1,45 @@ +Music_JigglypuffSong: + dbw $40, Music_JigglypuffSong_Ch1 + dbw $01, Music_JigglypuffSong_Ch2 + +Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) + ftempo 144 + volume 119 + vibrato 8, 36 + dutycycle 2 + unknownmusic0xde 165 + + notetype 13, 103 + octave 4 + note E_, 8 + notetype 12, 103 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + endchannel + + +Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a) + vibrato 5, 21 + dutycycle 2 + unknownmusic0xde 10 + notetype 12, 167 + octave 4 + note E_, 8 + note B_, 2 + note G#, 6 + note F#, 8 + note G#, 2 + note A_, 6 + note G#, 8 + note F#, 4 + note G#, 4 + note E_, 10 + endchannel +; 0x7fbaf \ No newline at end of file diff --git a/crysaudio/music/RBY/lavender.asm b/crysaudio/music/RBY/lavender.asm new file mode 100644 index 00000000..4fd3e351 --- /dev/null +++ b/crysaudio/music/RBY/lavender.asm @@ -0,0 +1,206 @@ +Music_Lavender: + dbw $C0, Music_Lavender_Ch1 + dbw $01, Music_Lavender_Ch2 + dbw $02, Music_Lavender_Ch3 + dbw $03, Music_Lavender_Ch4 + +Music_Lavender_Ch1: ; bb58 (2:7b58) + tempo 152 + volume 119 + dutycycle 1 + + vibrato 0, 136 + notetype 12, 135 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype 12, 167 + +Music_Lavender_branch_bb6b: + octave 3 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note C_, 8 + note C_, 8 + octave 3 + note G_, 8 + note G_, 8 + note E_, 8 + note E_, 8 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note C#, 8 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note C_, 8 + note C_, 8 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + loopchannel 0, Music_Lavender_branch_bb6b + + +Music_Lavender_Ch2: ; bb9e (2:7b9e) + vibrato 0, 52 + dutycycle 3 + notetype 12, 145 + +Music_Lavender_branch_bba5: + octave 5 + note C_, 4 + note G_, 4 + note B_, 4 + note F#, 4 + loopchannel 0, Music_Lavender_branch_bba5 + + +Music_Lavender_Ch3: ; bbae (2:7bae) + vibrato 4, 17 + notetype 12, $3f + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype 12, $2f + db $f3, $21, $E2, $33, $28, $E1, $22, $FF, $EA, $10, $14, $DC, $10, $E3, $41, $51, $73 +Music_Lavender_branch_bbb9: + octave 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + notetype 12, $3f + octave 6 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + notetype 12, $2f + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 7 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + note E_, 16 + note D_, 16 + note C_, 16 + note E_, 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + notetype 12, $2f + octave 6 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 7 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 8 + note B_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + octave 4 + note E_, 4 + note G_, 4 + note F#, 4 + note B_, 4 + loopchannel 0, Music_Lavender_branch_bbb9 + +Music_Lavender_Ch4: ; bc21 (2:7c21) + notetype 12 + togglenoise 0 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + +Music_Lavender_branch_bc26: + note F#, 8 + note F#, 8 + loopchannel 0, Music_Lavender_branch_bc26 +; 0xbc2e \ No newline at end of file diff --git a/crysaudio/music/RBY/meeteviltrainer.asm b/crysaudio/music/RBY/meeteviltrainer.asm new file mode 100644 index 00000000..4e9071b3 --- /dev/null +++ b/crysaudio/music/RBY/meeteviltrainer.asm @@ -0,0 +1,86 @@ +Music_MeetEvilTrainer: + dbw $80, Music_MeetEvilTrainer_Ch1 + dbw $01, Music_MeetEvilTrainer_Ch2 + dbw $02, Music_MeetEvilTrainer_Ch3 + +Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d) + tempo 124 + volume 119 + dutycycle 2 + + notetype 12, 177 + note __, 4 + octave 3 + note D_, 2 + note C#, 2 + notetype 12, 79 + note D_, 4 + +Music_MeetEvilTrainer_branch_7f6ae: + notetype 12, 161 + note D_, 4 + note D_, 4 + note D_, 4 + notetype 12, 112 + note D_, 4 + loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae + + +Music_MeetEvilTrainer_Ch2: ; 7f6ba (1f:76ba) + dutycycle 1 + notetype 12, 182 + octave 3 + note B_, 2 + note A#, 2 + note B_, 8 + +Music_MeetEvilTrainer_branch_7f6c2: + notetype 12, 194 + octave 4 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + octave 3 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + notetype 12, 79 + note A#, 4 + notetype 12, 194 + note G_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + notetype 12, 63 + note A#, 4 + notetype 12, 194 + loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 + + +Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6) + notetype 12, 16 + note __, 8 + octave 4 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + +Music_MeetEvilTrainer_branch_7f6ee: + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note A#, 4 + loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee +; 0x7f6f9 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetfemaletrainer.asm b/crysaudio/music/RBY/meetfemaletrainer.asm new file mode 100644 index 00000000..8a959d31 --- /dev/null +++ b/crysaudio/music/RBY/meetfemaletrainer.asm @@ -0,0 +1,124 @@ +Music_MeetFemaleTrainer: + dbw $80, Music_MeetFemaleTrainer_Ch1 + dbw $01, Music_MeetFemaleTrainer_Ch2 + dbw $02, Music_MeetFemaleTrainer_Ch3 + +Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) + tempo 124 + volume 119 + dutycycle 1 + + notetype 12, 178 + octave 3 + note G#, 6 + octave 4 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + notetype 12, 129 + +Music_MeetFemaleTrainer_branch_7f70c: + octave 3 + note E_, 4 + loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c + note E_, 4 + octave 2 + note B_, 4 + note B_, 4 + octave 3 + note E_, 4 + loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c + + +Music_MeetFemaleTrainer_Ch2: ; 7f71c (1f:771c) + dutycycle 2 + notetype 12, 194 + octave 3 + note B_, 2 + notetype 12, 199 + octave 4 + note B_, 12 + +Music_MeetFemaleTrainer_branch_7f726: + notetype 12, 194 + octave 3 + note B_, 4 + octave 4 + note D#, 4 + note E_, 4 + note D#, 4 + note C#, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 + + +Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b) + notetype 12, 16 + note __, 8 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + +Music_MeetFemaleTrainer_branch_7f756: + callchannel Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 + note __, 3 + note E_, 1 + note __, 3 + note G#, 1 + note __, 3 + note E_, 1 + note __, 3 + callchannel Music_MeetFemaleTrainer_branch_7f770 + note G#, 1 + note __, 3 + note E_, 1 + note __, 3 + note G#, 1 + note __, 3 + note B_, 1 + note __, 3 + loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 + +Music_MeetFemaleTrainer_branch_7f770: + note G#, 1 + note __, 3 + note E_, 1 + note __, 3 + note G#, 1 + note __, 3 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + endchannel +; 0x7f77b \ No newline at end of file diff --git a/crysaudio/music/RBY/meetjessiejames.asm b/crysaudio/music/RBY/meetjessiejames.asm new file mode 100644 index 00000000..dd9d660e --- /dev/null +++ b/crysaudio/music/RBY/meetjessiejames.asm @@ -0,0 +1,307 @@ +Music_MeetJessieJames: + dbw $80, Music_MeetJessieJames_Ch1 + dbw $01, Music_MeetJessieJames_Ch2 + dbw $02, Music_MeetJessieJames_Ch3 + +Music_MeetJessieJames_Ch1: + tempo 144 + volume 119 + dutycycle 3 + vibrato $8, $14 + notetype $c, $b2 + octave 3 + note G#, 1 + note G_, 1 + note F#, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + notetype $c, $b6 + note D#, 12 + note C_, 4 +Music_MeetJessieJames_branch_83187: + notetype $c, $b2 + octave 4 + note D_, 16 + note __, 12 + notetype $c, $b4 + octave 3 + note A#, 4 + note __, 16 + note __, 8 + notetype $c, $b2 + octave 2 + note A_, 2 + octave 3 + note A#, 2 + note A_, 4 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + octave 2 + note A#, 4 + notetype $c, $b4 + octave 3 + note B_, 4 + notetype $c, $b2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D_, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note B_, 2 + notetype $c, $b4 + note A#, 4 + loopchannel 0, Music_MeetJessieJames_branch_83187 +Music_MeetJessieJames_Ch2: + dutycycle 3 + vibrato $6, $15 + notetype $c, $c2 + octave 4 + note D_, 1 + note C#, 1 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + notetype $c, $c7 + note A_, 12 + octave 4 + note C#, 4 +Music_MeetJessieJames_branch_831df: + notetype $c, $c2 + octave 3 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + octave 2 + note A_, 4 + notetype $c, $c5 + octave 4 + note C#, 4 + notetype $c, $c2 + note D_, 1 + octave 3 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note C#, 2 + notetype $c, $c6 + octave 4 + note D_, 8 + notetype $c, $c2 + note D#, 6 + note F_, 4 + note D#, 4 + octave 3 + note A#, 2 + octave 4 + note D#, 6 + note F_, 4 + note D#, 2 + notetype $c, $c5 + note D_, 4 + notetype $c, $c2 + note D#, 6 + note F_, 4 + note D#, 4 + octave 3 + note A#, 2 + octave 4 + note D#, 4 + note F_, 4 + notetype $c, $c5 + note D#, 8 + loopchannel 0, Music_MeetJessieJames_branch_831df +Music_MeetJessieJames_Ch3: + notetype $c, $10 + note __, 16 + note __, 8 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + note D#, 2 +Music_MeetJessieJames_branch_83235: + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A#, 2 + note A_, 2 + note D#, 2 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + note D_, 2 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + loopchannel 0, Music_MeetJessieJames_branch_83235 + endchannel diff --git a/crysaudio/music/RBY/meetmaletrainer.asm b/crysaudio/music/RBY/meetmaletrainer.asm new file mode 100644 index 00000000..18eb3fbf --- /dev/null +++ b/crysaudio/music/RBY/meetmaletrainer.asm @@ -0,0 +1,196 @@ +Music_MeetMaleTrainer: + dbw $80, Music_MeetMaleTrainer_Ch1 + dbw $01, Music_MeetMaleTrainer_Ch2 + dbw $02, Music_MeetMaleTrainer_Ch3 + +Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) + tempo 112 + volume 119 + dutycycle 3 + vibrato 20, 51 + + notetype 12, 180 + octave 3 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 12 + note __, 16 + +Music_MeetMaleTrainer_branch_7f78f: + octave 3 + note B_, 4 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 4 + note E_, 6 + note F_, 2 + note F#, 4 + note G_, 8 + octave 4 + note D_, 8 + note E_, 16 + loopchannel 0, Music_MeetMaleTrainer_branch_7f78f + + +Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2) + dutycycle 3 + vibrato 24, 34 + notetype 12, 196 + octave 4 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + octave 3 + note B_, 12 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 9 + +Music_MeetMaleTrainer_branch_7f7b5: + notetype 12, 196 + octave 4 + note E_, 6 + note D#, 6 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + notetype 12, 199 + note F_, 16 + notetype 12, 197 + octave 3 + note F#, 8 + octave 4 + note C#, 8 + loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 + + +Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2) + notetype 12, 16 + note __, 6 + octave 4 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + +Music_MeetMaleTrainer_branch_7f7ea: + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea +; 0x7f844 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetprofoak.asm b/crysaudio/music/RBY/meetprofoak.asm new file mode 100644 index 00000000..1d49409e --- /dev/null +++ b/crysaudio/music/RBY/meetprofoak.asm @@ -0,0 +1,429 @@ +Music_MeetProfOak: + dbw $80, Music_MeetProfOak_Ch1 + dbw $01, Music_MeetProfOak_Ch2 + dbw $02, Music_MeetProfOak_Ch3 + +Music_MeetProfOak_Ch1: ; af59 (2:6f59) + tempo 112 + volume 119 + dutycycle 3 + + notetype 12, 180 + octave 3 + note F#, 1 + note B_, 1 + octave 4 + note D#, 1 + note E_, 1 + note F#, 12 + notetype 12, 162 + octave 3 + note E_, 6 + note B_, 10 + note E_, 6 + note B_, 10 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note B_, 10 + note E_, 6 + note B_, 10 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + +Music_MeetProfOak_branch_af85: + note F#, 6 + note E_, 4 + note A_, 2 + note A_, 4 + note F#, 6 + note E_, 4 + note A_, 2 + note A_, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note E_, 6 + note D#, 4 + note F#, 2 + note F#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + note F#, 6 + note E_, 4 + note G#, 2 + note G#, 4 + loopchannel 0, Music_MeetProfOak_branch_af85 + + +Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) + vibrato 8, 17 + dutycycle 2 + notetype 12, 196 + octave 3 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + note B_, 12 + notetype 12, 178 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + notetype 12, 100 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + notetype 12, 178 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + notetype 12, 129 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + notetype 12, 178 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + notetype 12, 100 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + notetype 12, 178 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + notetype 12, 129 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + notetype 12, 181 + +Music_MeetProfOak_branch_b005: + octave 4 + note C#, 6 + octave 3 + note A_, 1 + octave 4 + note C#, 1 + note E_, 6 + note C#, 1 + note E_, 1 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note E_, 8 + notetype 12, 101 + octave 4 + note B_, 6 + note G#, 1 + note B_, 1 + octave 5 + note E_, 8 + notetype 12, 181 + octave 3 + note A_, 6 + note F#, 1 + note A_, 1 + octave 4 + note D#, 8 + note E_, 4 + note D#, 4 + note C#, 4 + note C_, 4 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + notetype 12, 183 + note G#, 16 + loopchannel 0, Music_MeetProfOak_branch_b005 + + +Music_MeetProfOak_Ch3: ; b03d (2:703d) + notetype 12, 18 + note __, 10 + octave 4 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 5 + octave 5 + note E_, 4 + note __, 6 + octave 4 + note B_, 1 + note __, 5 + octave 5 + note E_, 4 + octave 4 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + +Music_MeetProfOak_branch_b0bc: + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + loopchannel 2, Music_MeetProfOak_branch_b0bc + +Music_MeetProfOak_branch_b0d8: + octave 4 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + loopchannel 2, Music_MeetProfOak_branch_b0d8 + +Music_MeetProfOak_branch_b0ed: + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + loopchannel 2, Music_MeetProfOak_branch_b0ed + +Music_MeetProfOak_branch_b101: + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + loopchannel 2, Music_MeetProfOak_branch_b101 + loopchannel 0, Music_MeetProfOak_branch_b0bc +; 0xb119 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetrival.asm b/crysaudio/music/RBY/meetrival.asm new file mode 100644 index 00000000..01cac238 --- /dev/null +++ b/crysaudio/music/RBY/meetrival.asm @@ -0,0 +1,406 @@ +Music_MeetRival: + dbw $80, Music_MeetRival_Ch1 + dbw $01, Music_MeetRival_Ch2 + dbw $02, Music_MeetRival_Ch3 +Music_FarewellRival: + dbw $80, Music_FarewellRival_Ch1 + dbw $01, Music_FarewellRival_Ch2 + dbw $02, Music_FarewellRival_Ch3 + +Music_MeetRival_branch_b119: + tempo 100 + loopchannel 0, Music_MeetRival_branch_b123 + +Music_MeetRival_Ch1: ; b120 (2:7120) + tempo 112 + +Music_MeetRival_branch_b123: + volume 119 + dutycycle 3 + vibrato 6, 52 + + notetype 12, 179 + octave 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 2 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 6 + note D_, 1 + note __, 3 + note D_, 1 + note __, 5 + note A_, 2 + note G_, 2 + note A_, 2 + +Music_MeetRival_branch_b140: + note B_, 4 + note A#, 2 + note A_, 4 + note G_, 2 + octave 4 + note C_, 4 + note D_, 2 + note __, 4 + note D_, 4 + note C#, 2 + note C_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 4 + note E_, 2 + note D_, 4 + note C_, 2 + octave 3 + note B_, 4 + octave 4 + note C_, 2 + note __, 4 + note G_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note D_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 + octave 4 + note C_, 2 + note F_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note F_, 2 + note D#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G_, 2 + note __, 4 + note A#, 4 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + notetype 12, 183 + octave 3 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note D_, 2 + note __, 4 + note D_, 4 + notetype 12, 179 + note A_, 2 + note G_, 2 + note A_, 2 + loopchannel 0, Music_MeetRival_branch_b140 + +Music_MeetRival_branch_b19b: + tempo 100 + loopchannel 0, Music_MeetRival_branch_b1a5 + +Music_FarewellRival_Ch1: + tempo 112 + +Music_MeetRival_branch_b1a5: + volume 119 + dutycycle 3 + vibrato 6, 52 + + notetype 12, 179 + octave 3 + note D_, 1 + note __, 3 + note D_, 1 + note __, 5 + note A_, 2 + note G_, 2 + note A_, 2 + loopchannel 0, Music_MeetRival_branch_b140 + + +Music_MeetRival_Ch2: ; b1bb (2:71bb) + dutycycle 3 + vibrato 10, 38 + notetype 12, 199 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 2 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 6 + octave 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note D_, 1 + note __, 1 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + +Music_MeetRival_branch_b1d8: + notetype 12, 199 + note G_, 4 + note D_, 2 + note F_, 6 + note F#, 4 + note G_, 2 + note __, 4 + note G_, 4 + note G_, 2 + note A#, 2 + note B_, 2 + octave 5 + note C_, 4 + octave 4 + note G_, 2 + note A#, 6 + note B_, 4 + octave 5 + note C_, 2 + note __, 4 + note C_, 4 + note C_, 2 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + notetype 12, 176 + note D_, 16 + notetype 12, 181 + note D_, 6 + notetype 12, 199 + note F_, 4 + note D_, 2 + note C_, 2 + note D_, 2 + notetype 12, 176 + note C_, 8 + notetype 12, 199 + note C_, 8 + octave 4 + note C_, 2 + note __, 4 + note A#, 4 + note G_, 2 + note F_, 2 + notetype 12, 176 + note G_, 16 + notetype 12, 179 + note G_, 2 + octave 3 + note G_, 2 + note __, 4 + note G_, 4 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + loopchannel 0, Music_MeetRival_branch_b1d8 + +Music_FarewellRival_Ch2: + dutycycle 3 + vibrato 10, 38 + notetype 12, 199 + octave 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note D_, 1 + note __, 1 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + loopchannel 0, Music_MeetRival_branch_b1d8 + + +Music_MeetRival_Ch3: ; b233 (2:7233) + notetype 12, 20 + octave 5 + note D_, 2 + note __, 2 + note C#, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 4 + note B_, 2 + note __, 2 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + +Music_MeetRival_branch_b24b: + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note __, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note __, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note __, 4 + octave 5 + note D_, 4 + octave 4 + note G_, 2 + note A#, 2 + note B_, 2 + note G_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + note __, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + note __, 2 + note B_, 2 + octave 5 + note C_, 2 + note __, 4 + note C_, 4 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note __, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note __, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note __, 2 + note F#, 2 + note A_, 2 + note F#, 2 + octave 5 + note D_, 2 + octave 4 + note A_, 2 + note E_, 2 + octave 5 + note C_, 2 + note __, 2 + octave 4 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note E_, 2 + note F_, 2 + note G_, 2 + note E_, 2 + note __, 4 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 + note __, 2 + note G_, 2 + note A#, 2 + note G_, 2 + note __, 2 + note A#, 2 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note __, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + note __, 2 + octave 5 + note D_, 2 + loopchannel 0, Music_MeetRival_branch_b24b + +Music_FarewellRival_Ch3: + notetype 12, 20 + octave 4 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + loopchannel 0, Music_MeetRival_branch_b24b +; 0xb2c8 \ No newline at end of file diff --git a/crysaudio/music/RBY/museumguy.asm b/crysaudio/music/RBY/museumguy.asm new file mode 100644 index 00000000..dc634208 --- /dev/null +++ b/crysaudio/music/RBY/museumguy.asm @@ -0,0 +1,345 @@ +Music_MuseumGuy: + dbw $C0, Music_MuseumGuy_Ch1 + dbw $01, Music_MuseumGuy_Ch2 + dbw $02, Music_MuseumGuy_Ch3 + dbw $03, Music_MuseumGuy_Ch4 + +Music_MuseumGuy_Ch1: ; adae (2:6dae) + tempo 128 + volume 119 + dutycycle 2 + + notetype 12, 177 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + octave 2 + note B_, 4 + note B_, 1 + octave 3 + note D#, 1 + note E_, 1 + note G#, 1 + note B_, 10 + callchannel Music_MuseumGuy_branch_ade7 + callchannel Music_MuseumGuy_branch_adec + callchannel Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 + +Music_MuseumGuy_branch_add6: + callchannel Music_MuseumGuy_branch_ade7 + callchannel Music_MuseumGuy_branch_adec + callchannel Music_MuseumGuy_branch_ade7 + note E_, 4 + note E_, 4 + note E_, 2 + note E_, 6 + loopchannel 0, Music_MuseumGuy_branch_add6 + +Music_MuseumGuy_branch_ade7: + note E_, 2 + note E_, 6 + note F#, 2 + note F#, 6 + endchannel + +Music_MuseumGuy_branch_adec: + note E_, 2 + note E_, 6 + note D_, 2 + note D_, 6 + endchannel + + +Music_MuseumGuy_Ch2: ; adf1 (2:6df1) + dutycycle 2 + notetype 12, 193 + octave 4 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 4 + note E_, 1 + note G#, 1 + note B_, 1 + octave 4 + note D#, 1 + note E_, 8 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + note A_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A_, 4 + +Music_MuseumGuy_branch_ae26: + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 3 + notetype 12, 129 + note E_, 1 + notetype 12, 193 + note D_, 2 + note F#, 2 + note A_, 3 + notetype 12, 145 + note A_, 1 + notetype 12, 193 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note B_, 3 + notetype 12, 161 + note G#, 1 + notetype 12, 193 + note A_, 2 + octave 4 + note C#, 2 + note E_, 3 + notetype 12, 145 + note E_, 1 + notetype 12, 193 + note D_, 2 + note F#, 2 + note A_, 3 + notetype 12, 129 + note A_, 1 + notetype 12, 193 + note G#, 2 + note E_, 1 + notetype 12, 129 + note E_, 1 + notetype 12, 193 + note F#, 2 + notetype 12, 129 + note F#, 1 + notetype 12, 193 + note G#, 1 + note A_, 2 + note A_, 2 + note A_, 4 + loopchannel 0, Music_MuseumGuy_branch_ae26 + + +Music_MuseumGuy_Ch3: ; ae6e (2:6e6e) + notetype 12, 16 + note __, 16 + octave 4 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 9 + callchannel Music_MuseumGuy_branch_aeb8 + note A_, 1 + note __, 1 + note A_, 1 + note __, 5 + note G#, 1 + note __, 1 + note G#, 1 + note __, 5 + callchannel Music_MuseumGuy_branch_aeb8 + note B_, 1 + note __, 3 + note G#, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + +Music_MuseumGuy_branch_ae8e: + callchannel Music_MuseumGuy_branch_aec1 + note __, 3 + octave 6 + note E_, 1 + note __, 1 + octave 5 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + callchannel Music_MuseumGuy_branch_aec1 + note __, 1 + octave 6 + note E_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 5 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + loopchannel 0, Music_MuseumGuy_branch_ae8e + +Music_MuseumGuy_branch_aeb8: + note A_, 1 + note __, 1 + note A_, 1 + note __, 5 + note A_, 1 + note __, 1 + note A_, 1 + note __, 5 + endchannel + +Music_MuseumGuy_branch_aec1: + octave 6 + note C#, 1 + note __, 1 + octave 5 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + octave 6 + note F#, 1 + note __, 1 + octave 5 + note A_, 1 + note __, 1 + note A_, 1 + endchannel + + +Music_MuseumGuy_Ch4: ; aed1 (2:6ed1) + notetype 12 + togglenoise 1 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 14 + notetype 6 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + +Music_MuseumGuy_branch_aee1: + note A_, 4 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note B_, 1 + note B_, 1 + note A_, 6 + note B_, 1 + note B_, 1 + note A_, 4 + note A_, 6 + note A_, 2 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 6 + note A_, 2 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note A_, 2 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 4 + note A_, 4 + note A_, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 6 + note B_, 1 + note B_, 1 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + loopchannel 0, Music_MuseumGuy_branch_aee1 +; 0xaf59 \ No newline at end of file diff --git a/crysaudio/music/RBY/oakslab.asm b/crysaudio/music/RBY/oakslab.asm new file mode 100644 index 00000000..4c9d3446 --- /dev/null +++ b/crysaudio/music/RBY/oakslab.asm @@ -0,0 +1,399 @@ +Music_OaksLab: + dbw $80, Music_OaksLab_Ch1 + dbw $01, Music_OaksLab_Ch2 + dbw $02, Music_OaksLab_Ch3 + +Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) + tempo 140 + volume 119 + dutycycle 3 + vibrato 16, 18 + + notetype 12, 179 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + note B_, 1 + +Music_OaksLab_branch_7eed0: + octave 4 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 4 + note G#, 2 + note A_, 2 + note B_, 1 + note __, 3 + note A_, 6 + note G#, 1 + note B_, 1 + octave 4 + note C#, 4 + octave 3 + note A_, 4 + note G#, 2 + note A_, 2 + note F#, 4 + note E_, 2 + note F#, 2 + note G#, 1 + note __, 3 + note F#, 8 + note E_, 4 + note A_, 6 + note E_, 1 + note A_, 1 + octave 4 + note D_, 8 + note C#, 6 + octave 3 + note A_, 1 + octave 4 + note C#, 1 + note E_, 8 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note G#, 1 + note __, 3 + note E_, 4 + note F#, 4 + note G#, 4 + loopchannel 0, Music_OaksLab_branch_7eed0 + + +Music_OaksLab_Ch2: ; 7ef05 (1f:6f05) + dutycycle 3 + vibrato 10, 37 + notetype 12, 196 + octave 3 + note G#, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G#, 1 + +Music_OaksLab_branch_7ef16: + note A_, 6 + note G#, 1 + note F#, 1 + note E_, 6 + note D#, 1 + note E_, 1 + note F#, 1 + note __, 3 + note E_, 8 + note E_, 4 + note F#, 6 + note E_, 1 + note D_, 1 + note C#, 6 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D_, 1 + note __, 3 + note C#, 8 + note C#, 4 + note D_, 6 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + note F#, 8 + note E_, 6 + note C#, 1 + note E_, 1 + note A_, 8 + note G#, 4 + note A_, 2 + note G#, 2 + note F#, 4 + note G#, 2 + note F#, 2 + note E_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + loopchannel 0, Music_OaksLab_branch_7ef16 + + +Music_OaksLab_Ch3: ; 7ef52 (1f:6f52) + notetype 12, 17 + note __, 2 + octave 4 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + +Music_OaksLab_branch_7ef5c: + note C#, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note E_, 1 + note __, 5 + note G#, 1 + note __, 3 + note F#, 1 + note __, 3 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 3 + note G#, 1 + note __, 3 + note F#, 1 + note __, 3 + note E_, 1 + note __, 3 + loopchannel 0, Music_OaksLab_branch_7ef5c +; 0x7f04a \ No newline at end of file diff --git a/crysaudio/music/RBY/pallettown.asm b/crysaudio/music/RBY/pallettown.asm new file mode 100644 index 00000000..64dfe7d4 --- /dev/null +++ b/crysaudio/music/RBY/pallettown.asm @@ -0,0 +1,320 @@ +Music_RBYPalletTown: + dbw $80, Music_RBYPalletTown_Ch1 + dbw $01, Music_RBYPalletTown_Ch2 + dbw $02, Music_RBYPalletTown_Ch3 + +Music_RBYPalletTown_Ch1: ; a7c5 (2:67c5) + tempo 160 + volume 119 + dutycycle 2 + notetype 12, 195 + +Music_RBYPalletTown_branch_a7ce: + octave 3 + note B_, 4 + octave 4 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 4 + note G_, 2 + octave 4 + note D_, 4 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note __, 2 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 8 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note F#, 2 + note B_, 4 + octave 4 + note C_, 2 + note D_, 4 + note G_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 4 + note G_, 2 + octave 4 + note D_, 4 + note D_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note D_, 2 + note C_, 4 + octave 3 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 4 + note F#, 4 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note E_, 2 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note A_, 2 + notetype 12, 179 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note E_, 2 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note D_, 2 + note C_, 2 + note D_, 2 + loopchannel 0, Music_RBYPalletTown_branch_a7ce + endchannel + + +Music_RBYPalletTown_Ch2: ; a85f (2:685f) + dutycycle 2 + +Music_RBYPalletTown_branch_a861: + notetype 12, 211 + octave 5 + note D_, 2 + notetype 12, 163 + note C_, 2 + notetype 12, 211 + octave 4 + note B_, 2 + notetype 12, 179 + note A_, 2 + notetype 12, 211 + octave 5 + note G_, 2 + notetype 12, 179 + note E_, 2 + notetype 12, 211 + note F#, 2 + note E_, 2 + note D_, 6 + octave 4 + note B_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 10 + octave 4 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 6 + octave 5 + note C_, 1 + octave 4 + note B_, 1 + note A_, 8 + octave 5 + note D_, 2 + notetype 12, 163 + note C_, 2 + notetype 12, 211 + octave 4 + note B_, 2 + notetype 12, 179 + octave 5 + note D_, 2 + notetype 12, 211 + note G_, 2 + notetype 12, 163 + note F#, 2 + notetype 12, 179 + note F#, 2 + notetype 12, 211 + note G_, 2 + note E_, 6 + note D_, 2 + note D_, 8 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 10 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 8 + note D_, 6 + note C_, 2 + octave 4 + note B_, 8 + note __, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C_, 4 + note C_, 4 + note D_, 6 + note C_, 1 + note D_, 1 + octave 4 + note B_, 8 + note __, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 8 + note E_, 4 + note B_, 4 + note A_, 8 + note G_, 4 + note E_, 4 + note F#, 8 + note G_, 4 + note B_, 4 + note B_, 8 + note A_, 8 + loopchannel 0, Music_RBYPalletTown_branch_a861 + endchannel + + +Music_RBYPalletTown_Ch3: ; a8de (2:68de) + vibrato 24, 40 + notetype 12, 18 + +Music_RBYPalletTown_branch_a8e3: + octave 4 + note G_, 6 + note E_, 6 + note F#, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note E_, 6 + note D_, 4 + note G_, 6 + note E_, 6 + note F#, 4 + note G_, 6 + note A_, 6 + note G_, 4 + note E_, 6 + note F#, 6 + note A_, 4 + note G_, 6 + note E_, 6 + note D_, 4 + note C_, 8 + note D_, 8 + note G_, 8 + note E_, 4 + note D_, 4 + note C_, 8 + note D_, 8 + note G_, 8 + note A_, 4 + note G_, 4 + note E_, 8 + note A_, 8 + note E_, 8 + note G_, 8 + note F#, 8 + note E_, 8 + note E_, 8 + note F#, 8 + loopchannel 0, Music_RBYPalletTown_branch_a8e3 + endchannel +; 0xa913 \ No newline at end of file diff --git a/crysaudio/music/RBY/pkmnhealed.asm b/crysaudio/music/RBY/pkmnhealed.asm new file mode 100644 index 00000000..2e07bc6c --- /dev/null +++ b/crysaudio/music/RBY/pkmnhealed.asm @@ -0,0 +1,53 @@ +Music_PkmnHealed: + dbw $80, Music_PkmnHealed_Ch1 + dbw $01, Music_PkmnHealed_Ch2 + dbw $02, Music_PkmnHealed_Ch3 + +Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3) + ftempo 144 + volume 119 + fdutycycle 2 + + notetype 12, 129 + note __, 2 + unknownmusic0xe0 0, $4C + note B_, 2 + unknownmusic0xe0 0, $55 + note B_, 2 + unknownmusic0xe0 0, $45 + note E_, 2 + note __, 4 + unknownmusic0xe0 0, $3C + note E_, 4 + unknownmusic0xe0 0, $4C + note B_, 4 + endchannel + + +Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4) + fdutycycle 2 + notetype 12, 195 + octave 4 + note B_, 4 + note B_, 4 + note B_, 2 + note G#, 2 + notetype 12, 196 + octave 5 + note E_, 8 + endchannel + + +Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2) + notetype 12, 16 + octave 4 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note G#, 2 + note E_, 6 + note __, 2 + endchannel +; 0x9bde \ No newline at end of file diff --git a/crysaudio/music/RBY/pokecenter.asm b/crysaudio/music/RBY/pokecenter.asm new file mode 100644 index 00000000..95b6cfd2 --- /dev/null +++ b/crysaudio/music/RBY/pokecenter.asm @@ -0,0 +1,381 @@ +Music_Pokecenter: + dbw $80, Music_Pokecenter_Ch1 + dbw $01, Music_Pokecenter_Ch2 + dbw $02, Music_Pokecenter_Ch3 + +Music_Pokecenter_Ch1: ; be56 (2:7e56) + tempo 144 + volume 119 + dutycycle 3 + vibrato 10, 34 + + +Music_Pokecenter_branch_be61: + notetype 12, 163 + octave 3 + note F#, 2 + note F_, 2 + note F#, 2 + notetype 12, 181 + octave 4 + note D_, 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + notetype 12, 163 + note A_, 2 + note E_, 2 + note A_, 2 + notetype 12, 181 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + notetype 12, 163 + note F#, 2 + note F_, 2 + note F#, 2 + notetype 12, 181 + octave 4 + note D_, 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + notetype 12, 163 + note A_, 2 + note E_, 2 + note A_, 2 + notetype 12, 181 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note F#, 2 + note E_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 8 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note G_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + loopchannel 0, Music_Pokecenter_branch_be61 + + +Music_Pokecenter_Ch2: ; bef9 (2:7ef9) + vibrato 8, 37 + +Music_Pokecenter_branch_befc: + callchannel Music_Pokecenter_branch_bf4e + dutycycle 3 + notetype 12, 165 + octave 3 + note A_, 4 + note E_, 4 + callchannel Music_Pokecenter_branch_bf60 + note D_, 2 + note F#, 6 + dutycycle 3 + notetype 12, 165 + octave 3 + note A_, 4 + note E_, 4 + callchannel Music_Pokecenter_branch_bf4e + dutycycle 3 + notetype 12, 165 + octave 3 + note A_, 4 + note E_, 4 + callchannel Music_Pokecenter_branch_bf60 + note D_, 8 + dutycycle 3 + notetype 12, 165 + octave 3 + note D_, 4 + note E_, 4 + dutycycle 2 + notetype 12, 198 + octave 4 + note F#, 8 + note A_, 8 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 8 + note C#, 8 + note E_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + note F#, 8 + note A_, 8 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 8 + note A_, 4 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + loopchannel 0, Music_Pokecenter_branch_befc + +Music_Pokecenter_branch_bf4e: + dutycycle 2 + notetype 12, 194 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + notetype 12, 195 + note A_, 4 + note G_, 4 + note F#, 2 + note E_, 2 + note C#, 6 + endchannel + +Music_Pokecenter_branch_bf60: + dutycycle 2 + notetype 12, 194 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + notetype 12, 195 + note F#, 4 + note E_, 4 + note C#, 2 + endchannel + + +Music_Pokecenter_Ch3: ; bf70 (2:7f70) + notetype 12, 16 + +Music_Pokecenter_branch_bf72: + octave 4 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + callchannel Music_Pokecenter_branch_bfd9 + callchannel Music_Pokecenter_branch_bfe2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + callchannel Music_Pokecenter_branch_bfd9 + callchannel Music_Pokecenter_branch_bfe2 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note D_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + callchannel Music_Pokecenter_branch_bfeb + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + callchannel Music_Pokecenter_branch_bfeb + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + loopchannel 0, Music_Pokecenter_branch_bf72 + +Music_Pokecenter_branch_bfd9: + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + endchannel + +Music_Pokecenter_branch_bfe2: + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + endchannel + +Music_Pokecenter_branch_bfeb: + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + endchannel +; 0xbff4 \ No newline at end of file diff --git a/crysaudio/music/RBY/pokemontower.asm b/crysaudio/music/RBY/pokemontower.asm new file mode 100644 index 00000000..f152ddb6 --- /dev/null +++ b/crysaudio/music/RBY/pokemontower.asm @@ -0,0 +1,465 @@ +Music_PokemonTower: + dbw $80, Music_PokemonTower_Ch1 + dbw $01, Music_PokemonTower_Ch2 + dbw $02, Music_PokemonTower_Ch3 + +Music_PokemonTower_Ch1: ; 7f04a (1f:704a) + tempo 152 + volume 119 + dutycycle 3 + + vibrato 12, 35 + notetype 12, 128 + note __, 4 + octave 4 + note B_, 12 + +Music_PokemonTower_branch_7f05a: + notetype 12, 180 + octave 4 + note G_, 1 + note __, 7 + note G_, 1 + note __, 7 + octave 3 + note B_, 1 + note __, 7 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + note B_, 1 + note __, 7 + note B_, 1 + note __, 7 + note B_, 1 + note __, 7 + octave 4 + note F#, 1 + note __, 7 + note C_, 1 + octave 3 + note B_, 1 + note G_, 1 + note __, 5 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note F#, 1 + note __, 7 + note E_, 1 + note __, 7 + note G_, 1 + note __, 7 + note G_, 1 + note __, 7 + note F#, 1 + note __, 7 + note F#, 1 + note __, 7 + note G_, 1 + note __, 7 + note E_, 1 + note __, 7 + note D_, 1 + note __, 7 + note E_, 1 + note __, 7 + note G_, 1 + note __, 7 + note G_, 1 + note __, 7 + note F#, 1 + note __, 7 + note B_, 1 + note __, 7 + note B_, 1 + note __, 7 + octave 4 + note C_, 1 + note __, 7 + note C_, 1 + note __, 7 + note C#, 1 + note __, 7 + note C#, 1 + note __, 7 + note C_, 1 + note __, 7 + note C_, 1 + note __, 3 + notetype 12, 132 + note C_, 1 + note __, 3 + notetype 12, 180 + note D_, 1 + note __, 7 + note D_, 1 + note __, 7 + octave 3 + note A_, 1 + note __, 7 + note A_, 1 + note __, 7 + notetype 12, 167 + note B_, 8 + note B_, 8 + octave 4 + note C_, 8 + note C_, 8 + note C#, 8 + note C#, 8 + notetype 12, 166 + note D_, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype 12, 146 + note B_, 4 + octave 5 + note E_, 4 + note D_, 4 + note C_, 4 + octave 4 + note B_, 4 + octave 5 + note E_, 4 + note D_, 4 + note C_, 4 + octave 4 + note B_, 4 + octave 5 + note E_, 4 + note D_, 4 + note C_, 4 + octave 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + octave 5 + note C_, 16 + note C_, 16 + loopchannel 0, Music_PokemonTower_branch_7f05a + + +Music_PokemonTower_Ch2: ; 7f0e3 (1f:70e3) + vibrato 20, 52 + dutycycle 3 + notetype 12, 160 + octave 5 + note C_, 12 + octave 4 + note E_, 4 + +Music_PokemonTower_branch_7f0ee: + notetype 12, 193 + octave 5 + note C_, 8 + octave 4 + note B_, 4 + notetype 12, 196 + note G_, 1 + note F#, 1 + note E_, 1 + note D#, 1 + notetype 12, 176 + note G_, 8 + octave 5 + note C_, 8 + octave 4 + note B_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + octave 5 + note C_, 8 + notetype 12, 183 + note C_, 8 + notetype 12, 194 + octave 4 + note G_, 1 + note F#, 1 + note E_, 1 + note __, 1 + notetype 12, 150 + octave 3 + note G_, 4 + notetype 12, 199 + note G_, 4 + note B_, 4 + note G_, 4 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + notetype 12, 176 + octave 4 + note C_, 16 + note E_, 8 + notetype 12, 183 + note E_, 12 + notetype 12, 197 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + note G_, 4 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + notetype 12, 176 + note F#, 12 + note G_, 4 + notetype 12, 176 + note F#, 8 + notetype 12, 183 + note F#, 8 + notetype 12, 176 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note B_, 16 + notetype 12, 176 + octave 5 + note C_, 4 + octave 4 + note G_, 4 + note F#, 4 + note E_, 4 + notetype 12, 144 + octave 5 + note C_, 16 + notetype 12, 176 + note D_, 4 + octave 4 + note A_, 4 + note G#, 4 + note F#, 4 + notetype 12, 47 + octave 5 + note D_, 16 + notetype 12, 192 + note E_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G_, 4 + octave 5 + note F_, 4 + note C_, 4 + octave 4 + note A#, 4 + note G#, 4 + octave 5 + note F#, 4 + note D_, 4 + note C_, 4 + octave 4 + note A#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note D_, 4 + notetype 12, 176 + note C_, 8 + notetype 12, 144 + note C_, 8 + notetype 12, 128 + note C_, 8 + notetype 12, 112 + note C_, 8 + notetype 12, 96 + note C_, 8 + notetype 12, 103 + note C_, 8 + note __, 16 + notetype 12, 160 + octave 5 + note G_, 16 + octave 6 + note C_, 16 + octave 5 + note B_, 8 + note G_, 8 + note E_, 8 + note G_, 8 + octave 6 + note C_, 16 + vibrato 0, 52 + notetype 12, 167 + note C_, 16 + loopchannel 0, Music_PokemonTower_branch_7f0ee + + +Music_PokemonTower_Ch3: ; 7f19a (1f:719a) + vibrato 4, 17 + notetype 12, 19 + note __, 8 + octave 5 + note G_, 8 + +Music_PokemonTower_branch_7f1a2: + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 3 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note E_, 1 + note __, 7 + note G_, 1 + note __, 7 + note E_, 1 + note __, 7 + note B_, 1 + note __, 7 + note E_, 1 + note D#, 1 + octave 4 + note B_, 1 + note __, 5 + note B_, 1 + note __, 7 + note B_, 1 + note __, 7 + note B_, 1 + note __, 7 + octave 5 + note C_, 1 + note __, 7 + note C_, 1 + note __, 7 + note C_, 1 + note __, 7 + note C_, 1 + note __, 7 + octave 4 + note B_, 1 + note __, 7 + note B_, 1 + note __, 7 + note B_, 1 + note __, 7 + note B_, 1 + note __, 7 + octave 5 + note C_, 1 + note __, 7 + note C_, 1 + note __, 7 + note C_, 1 + note __, 7 + note C_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note E_, 1 + note __, 3 + note G_, 1 + note __, 3 + note F#, 1 + note __, 7 + note F#, 1 + note __, 7 + note D_, 1 + note __, 7 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note __, 7 + note E_, 1 + note __, 7 + note F_, 1 + note __, 7 + note F_, 1 + note __, 7 + note F#, 1 + note __, 7 + note F#, 1 + note __, 7 + note G_, 1 + note __, 15 + notetype 12, $1f + db $f3, $21, $E2, $33, $28, $E1, $22, $FF, $22, $F7, $24, $22, $F7, $34, $24, $F7, $44 + octave 4 + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note G_, 1 + note __, 3 + note F#, 1 + note __, 3 + note F#, 1 + note __, 15 + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note G_, 1 + note __, 3 + note F#, 1 + note __, 3 + note F#, 1 + note __, 7 + notetype 12, 19 + octave 6 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note __, 15 + note E_, 1 + note __, 15 + note E_, 1 + note __, 15 + note E_, 1 + note __, 15 + note E_, 1 + note __, 15 + note E_, 1 + note __, 7 + octave 5 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + loopchannel 0, Music_PokemonTower_branch_7f1a2 +; 0x7f243 \ No newline at end of file diff --git a/crysaudio/music/RBY/routes1.asm b/crysaudio/music/RBY/routes1.asm new file mode 100644 index 00000000..96c21130 --- /dev/null +++ b/crysaudio/music/RBY/routes1.asm @@ -0,0 +1,413 @@ +Music_Routes1: + dbw $C0, Music_Routes1_Ch1 + dbw $01, Music_Routes1_Ch2 + dbw $02, Music_Routes1_Ch3 + dbw $03, Music_Routes1_Ch4 + +Music_Routes1_Ch1: ; 9bde (2:5bde) + tempo 152 + volume 119 + vibrato 4, 35 + dutycycle 2 + + +Music_Routes1_branch_9be9: + notetype 12, 161 + note __, 4 + octave 4 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note A_, 2 + note A_, 2 + note A_, 6 + octave 4 + note C#, 2 + note C#, 6 + note C#, 2 + note C#, 4 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 4 + octave 3 + note A_, 2 + note A_, 6 + octave 4 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 6 + note D_, 2 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 1 + octave 3 + note B_, 2 + note A_, 2 + note A_, 6 + octave 4 + note C#, 2 + note C#, 6 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + notetype 12, 162 + octave 4 + note G_, 4 + note E_, 4 + note F#, 2 + notetype 12, 161 + octave 3 + note A_, 2 + note A_, 6 + note A_, 2 + note F#, 2 + note A_, 4 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 4 + note A_, 2 + note F#, 2 + note A_, 4 + note G_, 2 + note E_, 2 + note C#, 4 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 4 + note B_, 2 + note G_, 2 + note B_, 4 + octave 4 + note D_, 2 + note E_, 2 + note C#, 2 + note D_, 2 + octave 3 + note A_, 2 + note A_, 2 + loopchannel 0, Music_Routes1_branch_9be9 + endchannel + + +Music_Routes1_Ch2: ; 9c51 (2:5c51) + dutycycle 2 + +Music_Routes1_branch_9c53: + notetype 12, 209 + callchannel Music_Routes1_branch_9c65 + callchannel Music_Routes1_branch_9c78 + callchannel Music_Routes1_branch_9c65 + callchannel Music_Routes1_branch_9c8d + loopchannel 0, Music_Routes1_branch_9c53 + +Music_Routes1_branch_9c65: + octave 4 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note G_, 3 + note F#, 1 + note E_, 6 + endchannel + +Music_Routes1_branch_9c78: + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note F#, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note D_, 4 + note F#, 2 + endchannel + +Music_Routes1_branch_9c8d: + note C#, 1 + note D_, 1 + note E_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + notetype 12, 210 + note B_, 4 + notetype 6, 209 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + notetype 12, 209 + octave 3 + note B_, 1 + note A_, 1 + octave 4 + note C#, 1 + note D_, 6 + notetype 12, 210 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note F#, 2 + note D_, 3 + note F#, 1 + note E_, 6 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 3 + note G_, 1 + note A_, 2 + octave 5 + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + notetype 12, 209 + octave 4 + note D_, 2 + note D_, 2 + endchannel + endchannel + + +Music_Routes1_Ch3: ; 9cd8 (2:5cd8) + vibrato 8, 37 + notetype 12, 19 + +Music_Routes1_branch_9cdd: + note __, 2 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 4 + note B_, 4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + note C#, 4 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 4 + note B_, 4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 4 + octave 4 + note D_, 8 + octave 3 + note G_, 8 + note A_, 8 + octave 4 + note C#, 8 + note D_, 8 + octave 3 + note G_, 8 + note A_, 8 + octave 4 + note D_, 6 + loopchannel 0, Music_Routes1_branch_9cdd + endchannel + + +Music_Routes1_Ch4: ; 9d24 (2:5d24) + notetype 12 + togglenoise 1 +Music_Routes1_Loop4: + note __, 4 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + note __, 4 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note __, 4 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + note __, 4 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + note __, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + note __, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + note __, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 2 + note G_, 2 + loopchannel 0, Music_Routes1_Loop4 + endchannel +; 0x9db9 \ No newline at end of file diff --git a/crysaudio/music/RBY/routes2.asm b/crysaudio/music/RBY/routes2.asm new file mode 100644 index 00000000..7428d060 --- /dev/null +++ b/crysaudio/music/RBY/routes2.asm @@ -0,0 +1,434 @@ +Music_Routes2: + dbw $C0, Music_Routes2_Ch1 + dbw $01, Music_Routes2_Ch2 + dbw $02, Music_Routes2_Ch3 + dbw $03, Music_Routes2_Ch4 + +Music_Routes2_Ch1: ; 9db9 (2:5db9) + tempo 152 + volume 119 + vibrato 9, 37 + dutycycle 1 + +Music_Routes2_branch_9dc3: + notetype 12, 178 + octave 2 + note B_, 4 + octave 3 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note A_, 2 + note G#, 4 + note F#, 4 + octave 2 + note B_, 4 + octave 3 + note G#, 6 + note F#, 2 + note E_, 2 + note D#, 1 + note F#, 1 + note B_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note A_, 2 + note G#, 4 + note B_, 4 + notetype 8, 178 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + loopchannel 0, Music_Routes2_branch_9dc3 + endchannel + + +Music_Routes2_Ch2: ; 9e4f (2:5e4f) + vibrato 8, 38 + dutycycle 3 + +Music_Routes2_branch_9e54: + notetype 12, 212 + octave 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note F#, 8 + octave 3 + note D#, 4 + octave 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note F#, 6 + note A_, 2 + note G#, 3 + note E_, 1 + note B_, 8 + octave 3 + note G#, 4 + octave 5 + note C#, 6 + octave 4 + note B_, 1 + note A_, 1 + note B_, 6 + note A_, 1 + note G#, 1 + note A_, 6 + note G#, 1 + note F#, 1 + note G#, 4 + note F#, 2 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 8 + note A_, 4 + note G#, 3 + note F#, 1 + note E_, 8 + note F#, 2 + note E_, 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 4 + octave 5 + note C#, 4 + octave 4 + note B_, 3 + note A_, 1 + note G#, 8 + note __, 4 + loopchannel 0, Music_Routes2_branch_9e54 + endchannel + + +Music_Routes2_Ch3: ; 9e9b (2:5e9b) + vibrato 9, 40 + +Music_Routes2_branch_9e9e: + notetype 12, 17 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 + note __, 2 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note E_, 2 + note __, 2 + octave 2 + note B_, 6 + octave 3 + note D_, 1 + note C#, 1 + note D_, 2 + note D#, 2 + note E_, 2 + note __, 2 + octave 2 + note B_, 4 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + note F#, 2 + note E_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 2 + octave 3 + note C#, 2 + note __, 2 + octave 2 + note F#, 2 + note __, 2 + note B_, 2 + note __, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note __, 2 + note A_, 2 + note __, 2 + note F#, 2 + note __, 2 + note A_, 2 + note __, 2 + note G#, 2 + note __, 2 + note B_, 2 + note __, 2 + note G#, 2 + note __, 2 + note B_, 2 + note __, 2 + note F#, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 3 + note C#, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note E_, 2 + note __, 2 + note G#, 2 + note __, 2 + note E_, 2 + note __, 2 + loopchannel 0, Music_Routes2_branch_9e9e + endchannel + + +Music_Routes2_Ch4: ; 9f08 (2:5f08) + togglenoise 0 +Music_Routes2_Loop4: + notetype 12 + note D_, 2 + note __, 2 + note D_, 1 + note __, 5 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note D_, 2 + note __, 2 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 3 + note D_, 3 + notetype 12 + note D_, 1 + note __, 3 + note D_, 2 + note __, 2 + note D_, 2 + note __, 4 + note D_, 1 + note D_, 1 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 3 + note D_, 3 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 3 + note __, 3 + notetype 12 + note D_, 1 + note __, 5 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note D_, 2 + note __, 2 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 3 + note __, 3 + notetype 12 + note D_, 1 + note __, 3 + note D_, 2 + note __, 2 + note D_, 2 + note __, 4 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note D_, 2 + note __, 2 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 3 + note __, 3 + note D_, 3 + note D_, 3 + note D_, 3 + note __, 3 + notetype 12 + note D_, 1 + note __, 5 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note D_, 2 + note __, 2 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 3 + note __, 3 + note D_, 3 + note __, 3 + loopchannel 0, Music_Routes2_Loop4 + endchannel +; 0x9fad \ No newline at end of file diff --git a/crysaudio/music/RBY/routes3.asm b/crysaudio/music/RBY/routes3.asm new file mode 100644 index 00000000..144f4e52 --- /dev/null +++ b/crysaudio/music/RBY/routes3.asm @@ -0,0 +1,523 @@ +Music_Routes3: + dbw $C0, Music_Routes3_Ch1 + dbw $01, Music_Routes3_Ch2 + dbw $02, Music_Routes3_Ch3 + dbw $03, Music_Routes3_Ch4 + +Music_Routes3_Ch1: ; 9fad (2:5fad) + tempo 148 + volume 119 + dutycycle 3 + vibrato 6, 52 + + notetype 12, 181 + octave 3 + note E_, 1 + note F#, 1 + note G_, 6 + note F_, 1 + note G_, 1 + note E_, 1 + note __, 16 + note __, 15 + +Music_Routes3_branch_9fc3: + notetype 12, 181 + note E_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + note E_, 4 + note C_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + notetype 12, 167 + note A#, 8 + note F_, 8 + note D_, 8 + note F_, 8 + notetype 12, 181 + note E_, 6 + note D_, 1 + note E_, 1 + note C_, 4 + note E_, 4 + note C_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note G_, 2 + note G_, 2 + note A_, 2 + notetype 12, 167 + note A#, 8 + note A#, 8 + note D_, 8 + note F_, 8 + notetype 12, 181 + note E_, 4 + note E_, 2 + note F_, 2 + note G_, 4 + note F_, 2 + note E_, 2 + note B_, 2 + octave 2 + note G_, 4 + octave 3 + note B_, 8 + note A_, 2 + notetype 8, 195 + note A_, 4 + note F_, 4 + note A_, 4 + notetype 8, 79 + note A_, 12 + notetype 8, 144 + note F_, 12 + note G_, 12 + loopchannel 0, Music_Routes3_branch_9fc3 + + +Music_Routes3_Ch2: ; a009 (2:6009) + vibrato 8, 35 + dutycycle 2 + notetype 12, 199 + octave 3 + note G_, 1 + note A#, 1 + note B_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + note __, 15 + note __, 16 + +Music_Routes3_branch_a01a: + notetype 12, 199 + dutycycle 2 + octave 4 + note C_, 6 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 10 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + notetype 12, 197 + dutycycle 3 + octave 3 + note A#, 8 + note A_, 8 + notetype 12, 199 + dutycycle 2 + octave 4 + note C_, 6 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 10 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 8 + note F_, 8 + notetype 12, 197 + dutycycle 3 + octave 3 + note A#, 8 + octave 4 + note D_, 6 + notetype 12, 199 + dutycycle 2 + note C_, 1 + note D_, 1 + note E_, 2 + note D_, 2 + note E_, 2 + note C_, 8 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 2 + octave 3 + note G_, 4 + octave 4 + note G_, 8 + note F_, 1 + note E_, 1 + notetype 8, 211 + note F_, 4 + note E_, 4 + notetype 8, 196 + note C_, 4 + notetype 8, 197 + note C_, 12 + notetype 12, 160 + dutycycle 3 + octave 3 + note A_, 8 + note B_, 8 + loopchannel 0, Music_Routes3_branch_a01a + + +Music_Routes3_Ch3: ; a07f (2:607f) + vibrato 4, 16 + notetype 6, 18 + octave 4 + note G_, 2 + note A#, 2 + note B_, 8 + note A_, 8 + note G_, 2 + note __, 2 + note G_, 7 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 8 + note G_, 2 + note __, 2 + note G_, 7 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 8 + +Music_Routes3_branch_a0a3: + notetype 12, 18 + note E_, 1 + note __, 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 4 + note E_, 1 + note __, 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 2 + note A_, 2 + note F_, 1 + note __, 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A#, 4 + note F_, 1 + note __, 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A#, 2 + note F_, 2 + note E_, 1 + note __, 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 4 + note E_, 1 + note __, 1 + note G_, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 2 + note A_, 2 + note F_, 1 + note __, 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A#, 4 + note F_, 1 + note __, 1 + note A#, 4 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A#, 2 + note A_, 2 + note G_, 1 + note __, 1 + octave 5 + note C_, 4 + octave 4 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 5 + note C_, 4 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note D_, 4 + octave 4 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 5 + note D_, 4 + octave 4 + note F_, 1 + note __, 1 + octave 5 + note C_, 4 + octave 4 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 5 + note C_, 4 + octave 4 + note F_, 1 + note __, 1 + note A_, 4 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 4 + loopchannel 0, Music_Routes3_branch_a0a3 + + +Music_Routes3_Ch4: ; a131 (2:6131) + notetype 6 + togglenoise 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 8 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A#, 2 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A#, 2 + note A_, 4 + note A#, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + +Music_Routes3_branch_a17a: + note A_, 12 + note A_, 2 + note A#, 2 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 8 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A#, 2 + note A_, 4 + note A_, 10 + note B_, 1 + note B_, 1 + note A_, 12 + note A_, 2 + note B_, 2 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 8 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 10 + note B_, 1 + note B_, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 8 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 10 + note B_, 1 + note B_, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 8 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 8 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 12 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + loopchannel 0, Music_Routes3_branch_a17a +; 0xa26a \ No newline at end of file diff --git a/crysaudio/music/RBY/routes4.asm b/crysaudio/music/RBY/routes4.asm new file mode 100644 index 00000000..0be763ea --- /dev/null +++ b/crysaudio/music/RBY/routes4.asm @@ -0,0 +1,689 @@ +Music_Routes4: + dbw $C0, Music_Routes4_Ch1 + dbw $01, Music_Routes4_Ch2 + dbw $02, Music_Routes4_Ch3 + dbw $03, Music_Routes4_Ch4 + +Music_Routes4_Ch1: ; a26a (2:626a) + tempo 148 + volume 119 + dutycycle 3 + vibrato 10, 52 + + notetype 12, 162 + octave 2 + note G#, 4 + note G#, 4 + note G#, 4 + notetype 12, 127 + note G#, 4 + notetype 12, 162 + note G#, 4 + note G#, 4 + note G#, 4 + notetype 12, 183 + note B_, 1 + octave 3 + note E_, 1 + note F#, 1 + note B_, 1 + +Music_Routes4_branch_a28a: + notetype 12, 183 + note B_, 6 + note E_, 2 + note E_, 4 + octave 4 + note E_, 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + notetype 12, 177 + note G#, 3 + notetype 12, 183 + note E_, 1 + note F#, 12 + note E_, 8 + note D#, 4 + note F#, 4 + note B_, 6 + note E_, 2 + note E_, 4 + octave 4 + note E_, 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + notetype 12, 177 + note E_, 3 + notetype 12, 183 + note D#, 1 + note E_, 12 + octave 3 + note B_, 3 + note A_, 1 + note G#, 8 + octave 4 + note E_, 4 + octave 3 + note D_, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note D#, 2 + note E_, 2 + octave 3 + note B_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + notetype 8, 181 + note A_, 4 + note G#, 4 + note F#, 4 + octave 4 + note E_, 4 + note D#, 4 + note C#, 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + note D#, 4 + octave 3 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 4 + octave 4 + note C#, 4 + note D#, 4 + note E_, 3 + octave 3 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note A_, 3 + loopchannel 0, Music_Routes4_branch_a28a + + +Music_Routes4_Ch2: ; a304 (2:6304) + vibrato 12, 36 + dutycycle 1 + notetype 12, 146 + octave 3 + note E_, 3 + note F#, 1 + notetype 12, 144 + note E_, 12 + notetype 12, 146 + octave 2 + note B_, 3 + octave 3 + note C_, 1 + notetype 12, 144 + octave 2 + note B_, 8 + dutycycle 3 + notetype 12, 199 + octave 3 + note E_, 1 + note F#, 1 + note B_, 1 + octave 4 + note D#, 1 + +Music_Routes4_branch_a325: + notetype 12, 199 + note E_, 6 + octave 3 + note B_, 2 + note B_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + notetype 12, 194 + note G#, 3 + note E_, 1 + notetype 12, 160 + octave 3 + note B_, 12 + dutycycle 0 + notetype 12, 194 + octave 2 + note B_, 3 + notetype 12, 199 + octave 3 + note C_, 1 + octave 2 + note B_, 8 + octave 3 + note D#, 4 + dutycycle 3 + octave 4 + note E_, 6 + octave 3 + note B_, 2 + note B_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note A_, 1 + octave 5 + note C#, 1 + octave 4 + note B_, 1 + note A_, 1 + notetype 12, 194 + note B_, 3 + notetype 12, 199 + note A_, 1 + notetype 12, 176 + note G#, 6 + notetype 12, 144 + note G#, 6 + notetype 12, 112 + note G#, 6 + notetype 12, 111 + note G#, 6 + notetype 12, 199 + note G#, 4 + notetype 8, 195 + note A_, 4 + note G#, 4 + note F#, 4 + notetype 8, 144 + note F#, 6 + notetype 8, 127 + note F#, 6 + dutycycle 0 + notetype 8, 144 + octave 3 + note F#, 4 + note E_, 4 + note F#, 4 + note A_, 6 + dutycycle 3 + notetype 8, 199 + octave 4 + note F#, 6 + note G#, 4 + note F#, 4 + notetype 8, 196 + note E_, 4 + notetype 8, 160 + note E_, 12 + dutycycle 0 + notetype 8, 144 + octave 3 + note E_, 4 + note D#, 4 + note E_, 4 + note G#, 6 + dutycycle 3 + notetype 8, 199 + octave 4 + note E_, 6 + note F#, 4 + note D#, 4 + octave 3 + note B_, 4 + notetype 8, 160 + octave 4 + note B_, 16 + notetype 8, 167 + note B_, 8 + notetype 8, 176 + note A_, 6 + notetype 8, 183 + note A_, 6 + notetype 12, 167 + note G#, 1 + note F#, 1 + notetype 12, 176 + note E_, 12 + notetype 12, 160 + note E_, 8 + notetype 12, 167 + note E_, 10 + loopchannel 0, Music_Routes4_branch_a325 + + +Music_Routes4_Ch3: ; a3c4 (2:63c4) + notetype 12, 16 + octave 4 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note D#, 1 + note __, 3 + +Music_Routes4_branch_a3d7: + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note A_, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note A_, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note D#, 1 + note __, 1 + loopchannel 0, Music_Routes4_branch_a3d7 + + +Music_Routes4_Ch4: ; a49d (2:649d) + notetype 12 + togglenoise 1 + note __, 16 + note __, 12 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + +Music_Routes4_branch_a4a8: + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A#, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note A_, 2 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note A#, 1 + note A#, 1 + note B_, 1 + note B_, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note A_, 2 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note A_, 2 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 1 + note A#, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A#, 1 + note A_, 4 + note A_, 2 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 1 + note A#, 1 + note A_, 4 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + loopchannel 0, Music_Routes4_branch_a4a8 +; 0xa5f0 \ No newline at end of file diff --git a/crysaudio/music/RBY/safarizone.asm b/crysaudio/music/RBY/safarizone.asm new file mode 100644 index 00000000..d2fd5714 --- /dev/null +++ b/crysaudio/music/RBY/safarizone.asm @@ -0,0 +1,117 @@ +Music_SafariZone: + dbw $80, Music_SafariZone_Ch1 + dbw $01, Music_SafariZone_Ch2 + dbw $02, Music_SafariZone_Ch3 + +Music_SafariZone_Ch1: ; bc2e (2:7c2e) + ftempo 132 + volume 119 + vibrato 6, 52 + + dutycycle 2 + notetype 12, 146 + octave 3 + unknownmusic0xe0 0, $4A + note C_, 1 + unknownmusic0xe0 0, $4A + note G_, 1 + unknownmusic0xe0 0, $4A + note C_, 1 + unknownmusic0xe0 0, $4A + note G_, 1 + note __, 4 + dutycycle 3 + +Music_SafariZone_branch_bc4f: + callchannel Music_SafariZone_branch_bc5f + notetype 12, 164 + note F#, 4 + callchannel Music_SafariZone_branch_bc5f + notetype 12, 164 + note F#, 4 + loopchannel 0, Music_SafariZone_branch_bc4f + +Music_SafariZone_branch_bc5f: + notetype 12, 162 + octave 3 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + endchannel + + +Music_SafariZone_Ch2: ; bc6a (2:7c6a) + dutycycle 2 + vibrato 8, 37 + notetype 12, 162 + octave 4 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + note __, 4 + dutycycle 3 + +Music_SafariZone_branch_bc79: + callchannel Music_SafariZone_branch_bc89 + notetype 12, 181 + note A_, 4 + callchannel Music_SafariZone_branch_bc89 + notetype 12, 181 + note B_, 4 + loopchannel 0, Music_SafariZone_branch_bc79 + +Music_SafariZone_branch_bc89: + notetype 12, 178 + octave 3 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + endchannel + + +Music_SafariZone_Ch3: ; bc94 (2:7c94) + notetype 12, 16 + note __, 8 + +Music_SafariZone_branch_bc97: + callchannel Music_SafariZone_branch_bca5 + octave 4 + note A_, 4 + callchannel Music_SafariZone_branch_bca5 + octave 4 + note B_, 4 + loopchannel 0, Music_SafariZone_branch_bc97 + +Music_SafariZone_branch_bca5: + octave 3 + note A_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note A_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note A_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note A_, 2 + note __, 2 + endchannel +; 0xbcbb \ No newline at end of file diff --git a/crysaudio/music/RBY/silphco.asm b/crysaudio/music/RBY/silphco.asm new file mode 100644 index 00000000..19507778 --- /dev/null +++ b/crysaudio/music/RBY/silphco.asm @@ -0,0 +1,1005 @@ +Music_SilphCo: + dbw $80, Music_SilphCo_Ch1 + dbw $01, Music_SilphCo_Ch2 + dbw $02, Music_SilphCo_Ch3 + +Music_SilphCo_Ch1: ; 7f243 (1f:7243) + tempo 160 + volume 119 + dutycycle 3 + vibrato 8, 34 + notetype 6, 179 + octave 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 3 + note C_, 1 + notetype 6, 160 + note C_, 12 + notetype 6, 179 + note C_, 2 + octave 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 + note __, 2 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + +Music_SilphCo_branch_7f26d: + note G_, 2 + note __, 2 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note A#, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + octave 2 + note A#, 2 + note __, 6 + note B_, 2 + note __, 2 + note G_, 2 + note __, 10 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + notetype 6, 160 + note B_, 12 + notetype 6, 179 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 + note __, 11 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + notetype 6, 160 + octave 3 + note C_, 12 + notetype 6, 179 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note __, 11 + note F#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + notetype 6, 160 + note D_, 12 + notetype 6, 179 + note D_, 1 + note C_, 1 + octave 2 + note A#, 1 + note G_, 1 + note F_, 1 + note __, 11 + note F_, 1 + note G#, 1 + note A#, 1 + note B_, 1 + notetype 6, 160 + octave 3 + note C_, 12 + notetype 6, 179 + note C_, 1 + octave 2 + note B_, 1 + note G#, 1 + note F_, 1 + note E_, 1 + note __, 7 + notetype 6, 128 + note B_, 16 + notetype 6, 176 + octave 3 + note E_, 8 + tempo 124 + notetype 6, 179 + octave 2 + note B_, 2 + note __, 10 + note B_, 2 + note __, 10 + note B_, 2 + note __, 6 + note B_, 2 + note __, 16 + note __, 6 + note A_, 2 + note __, 6 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + callchannel Music_SilphCo_branch_7f3f0 + callchannel Music_SilphCo_branch_7f3f0 + callchannel Music_SilphCo_branch_7f3f0 + note __, 4 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + octave 2 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note A#, 2 + note __, 6 + note A_, 2 + note __, 6 + note A_, 2 + note __, 6 + note A_, 2 + note __, 6 + note A_, 2 + note __, 6 + note A_, 2 + note __, 6 + note A_, 2 + note __, 6 + note A#, 2 + note __, 6 + note A#, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + octave 3 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + octave 2 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + octave 3 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + octave 4 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + octave 2 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + octave 4 + note E_, 2 + note __, 6 + note E_, 2 + note __, 6 + note D#, 2 + note __, 6 + note D#, 2 + note __, 2 + octave 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + notetype 6, 96 + note E_, 16 + note E_, 11 + notetype 6, 179 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 3 + note C_, 1 + notetype 6, 63 + note C_, 16 + notetype 6, 160 + note C_, 11 + notetype 6, 147 + octave 2 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + notetype 6, 63 + note E_, 16 + notetype 6, 144 + note E_, 11 + notetype 6, 179 + note F_, 1 + note G_, 1 + note A#, 1 + octave 3 + note C_, 1 + note D_, 1 + notetype 6, 63 + note D_, 16 + notetype 6, 167 + note D_, 11 + note __, 4 + note __, 4 + tempo 128 + note __, 4 + note __, 4 + tempo 136 + note __, 4 + note __, 4 + tempo 144 + note __, 4 + note __, 4 + tempo 160 + note __, 4 + note __, 4 + tempo 192 + note __, 4 + note __, 4 + tempo 288 + note __, 4 + note __, 4 + tempo 416 + note __, 4 + tempo 1024 + note __, 4 + tempo 160 + note __, 4 + notetype 6, 67 + octave 2 + note B_, 2 + note __, 6 + notetype 6, 99 + note B_, 2 + note __, 6 + notetype 6, 131 + note B_, 2 + note __, 6 + notetype 6, 80 + note B_, 8 + notetype 6, 179 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + loopchannel 0, Music_SilphCo_branch_7f26d + +Music_SilphCo_branch_7f3f0: + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + endchannel + + +Music_SilphCo_Ch2: ; 7f409 (1f:7409) + vibrato 10, 50 + dutycycle 3 + notetype 6, 195 + octave 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + octave 4 + note C_, 1 + notetype 6, 176 + note C_, 12 + notetype 6, 195 + note C_, 2 + octave 3 + note B_, 1 + note A#, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note E_, 2 + note __, 2 + octave 2 + note G_, 2 + note __, 6 + note F#, 2 + note __, 6 + note G_, 2 + note __, 6 + note G#, 2 + note __, 2 + +Music_SilphCo_branch_7f42e: + note E_, 2 + note __, 2 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note F#, 2 + note __, 6 + note G_, 2 + note __, 6 + note G#, 2 + note __, 2 + note E_, 2 + note __, 2 + note G#, 2 + note __, 6 + note G#, 2 + note __, 6 + note G#, 2 + note __, 6 + note G#, 2 + note __, 6 + note G#, 2 + note __, 6 + note G#, 2 + note __, 2 + notetype 6, 183 + dutycycle 2 + octave 4 + note E_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + note E_, 8 + note D#, 8 + note D_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + note F#, 8 + note G_, 8 + note G#, 8 + note D#, 8 + note D_, 8 + note D#, 8 + dutycycle 3 + notetype 6, 111 + note E_, 16 + notetype 6, 192 + note B_, 16 + notetype 6, 196 + octave 3 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 194 + dutycycle 1 + octave 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + notetype 6, 196 + dutycycle 3 + octave 3 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note D#, 4 + note E_, 4 + notetype 6, 192 + note F_, 8 + notetype 6, 183 + note F_, 8 + notetype 6, 138 + note F_, 4 + notetype 6, 196 + dutycycle 3 + note F_, 4 + note E_, 4 + note F_, 4 + notetype 6, 160 + note F#, 8 + notetype 6, 176 + note F#, 8 + notetype 6, 153 + note F#, 4 + notetype 6, 196 + note F#, 4 + note F_, 4 + note F#, 4 + notetype 6, 144 + note G_, 12 + notetype 6, 89 + note G_, 8 + notetype 6, 196 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note F_, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note D#, 4 + note D_, 4 + notetype 6, 194 + dutycycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + notetype 6, 180 + dutycycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 194 + dutycycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + notetype 6, 180 + dutycycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 194 + dutycycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note B_, 4 + notetype 6, 180 + dutycycle 3 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 194 + dutycycle 1 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + octave 4 + note C_, 4 + notetype 6, 180 + dutycycle 3 + octave 3 + note D#, 4 + note D_, 4 + note D#, 4 + note __, 4 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 2 + dutycycle 0 + octave 4 + note E_, 2 + note __, 2 + note G#, 2 + note __, 6 + note G#, 2 + note __, 6 + note G#, 2 + note __, 6 + note G#, 2 + note __, 6 + dutycycle 3 + octave 3 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 2 + dutycycle 0 + octave 4 + note E_, 2 + note __, 2 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + dutycycle 3 + octave 3 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note __, 2 + note E_, 2 + note __, 2 + note G_, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 2 + note E_, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 2 + notetype 6, 135 + octave 5 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note __, 4 + notetype 6, 67 + octave 2 + note G_, 2 + note __, 6 + notetype 6, 99 + note F#, 2 + note __, 6 + notetype 6, 131 + note G_, 2 + note __, 6 + notetype 6, 79 + note G#, 8 + notetype 6, 180 + note G_, 2 + note __, 6 + note F#, 2 + note __, 6 + note G_, 2 + note __, 6 + note G#, 2 + note __, 2 + loopchannel 0, Music_SilphCo_branch_7f42e + + +Music_SilphCo_Ch3: ; 7f5be (1f:75be) + vibrato 8, 17 + notetype 12, 17 + note __, 12 + octave 5 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + +Music_SilphCo_branch_7f5c9: + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 1 + note __, 1 + note G_, 1 + note __, 3 + note F#, 1 + note __, 3 + note G_, 1 + note __, 3 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G#, 1 + note __, 3 + note G_, 1 + note __, 3 + note F#, 1 + note __, 3 + note G_, 1 + note __, 3 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 3 + note G_, 1 + note __, 3 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 5 + note F_, 1 + note __, 5 + note F_, 1 + note __, 3 + note E_, 1 + note __, 11 + note D#, 1 + note __, 3 + note E_, 1 + note __, 5 + note F_, 1 + note __, 5 + note F_, 1 + note __, 3 + note E_, 1 + note __, 11 + note D#, 1 + note __, 3 + note E_, 1 + note __, 1 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note F#, 1 + note __, 3 + note F_, 1 + note __, 3 + note E_, 1 + note __, 3 + note F_, 1 + note __, 3 + note E_, 1 + note __, 3 + note D#, 1 + note __, 3 + note D_, 1 + note __, 1 + note D_, 8 + note F_, 8 + note D_, 8 + note F#, 8 + note D_, 8 + note G_, 8 + note D_, 8 + note A_, 8 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + octave 5 + note E_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + octave 4 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + octave 5 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + octave 6 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note D#, 4 + note D_, 4 + note D#, 4 + notetype 6, 17 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + notetype 12, 17 + note __, 4 + note __, 4 + note __, 4 + note __, 4 + octave 5 + note E_, 4 + note D#, 4 + note E_, 4 + note F_, 4 + loopchannel 0, Music_SilphCo_branch_7f5c9 +; 0x7f69d \ No newline at end of file diff --git a/crysaudio/music/RBY/ssanne.asm b/crysaudio/music/RBY/ssanne.asm new file mode 100644 index 00000000..886f5a31 --- /dev/null +++ b/crysaudio/music/RBY/ssanne.asm @@ -0,0 +1,344 @@ +Music_SSAnne: + dbw $80, Music_SSAnne_Ch1 + dbw $01, Music_SSAnne_Ch2 + dbw $02, Music_SSAnne_Ch3 + +Music_SSAnne_Ch1: ; b3a7 (2:73a7) + tempo 128 + volume 119 + dutycycle 1 + vibrato 8, 52 + + +Music_SSAnne_branch_b3b2: + notetype 12, 164 + note __, 12 + octave 3 + note E_, 2 + note F#, 2 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note __, 2 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note __, 4 + note E_, 4 + note G#, 4 + note __, 4 + note C#, 2 + note E_, 2 + note F#, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note __, 2 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note __, 4 + note C#, 2 + note E_, 2 + note F#, 4 + note D_, 4 + note E_, 4 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note __, 2 + note E_, 4 + note F#, 2 + note D_, 2 + note E_, 4 + note F#, 4 + note G#, 4 + note F#, 8 + note G#, 4 + note E_, 4 + note __, 4 + note E_, 4 + note F#, 2 + note E_, 2 + note D_, 4 + note __, 4 + note D_, 4 + note E_, 4 + note C#, 4 + note __, 4 + note C#, 4 + note D_, 2 + note C#, 2 + octave 2 + note B_, 4 + note E_, 4 + note B_, 4 + octave 3 + note D_, 2 + octave 2 + note B_, 2 + note A_, 4 + note __, 4 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 4 + note __, 4 + note C#, 4 + note G#, 4 + note A_, 4 + note __, 4 + note A_, 4 + note B_, 4 + note B_, 4 + note __, 4 + octave 3 + note D_, 8 + loopchannel 0, Music_SSAnne_branch_b3b2 + + +Music_SSAnne_Ch2: ; b419 (2:7419) + dutycycle 0 + vibrato 12, 36 + +Music_SSAnne_branch_b41e: + notetype 12, 197 + octave 3 + note A_, 2 + note E_, 2 + note A_, 4 + note B_, 4 + octave 4 + note D_, 4 + notetype 8, 197 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 6 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 + octave 4 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 12 + note A_, 3 + note E_, 3 + note A_, 6 + note B_, 6 + octave 4 + note D_, 6 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 3 + note A_, 3 + note B_, 6 + note G#, 6 + note A_, 3 + note B_, 3 + octave 4 + note C#, 6 + note D_, 6 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 6 + note D_, 3 + note C#, 3 + octave 3 + note B_, 12 + note __, 3 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note C#, 3 + note C#, 3 + note D_, 3 + note C#, 3 + note D_, 3 + note E_, 3 + octave 3 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 + note __, 3 + note A_, 3 + note G#, 3 + note A_, 3 + note A_, 3 + note B_, 3 + note A_, 3 + note B_, 3 + octave 4 + note C#, 3 + octave 3 + note G#, 3 + note F#, 3 + note E_, 3 + note E_, 3 + note F#, 3 + note G#, 3 + note B_, 3 + note __, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note E_, 3 + note C#, 3 + octave 2 + note B_, 3 + note A_, 3 + note B_, 3 + octave 3 + note C#, 3 + note E_, 3 + note __, 3 + note F#, 3 + note E_, 3 + note F#, 3 + note F#, 3 + note G#, 3 + note A_, 3 + note B_, 3 + octave 4 + note C#, 3 + note D_, 3 + note C#, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note D_, 3 + note C#, 3 + octave 3 + note B_, 3 + loopchannel 0, Music_SSAnne_branch_b41e + + +Music_SSAnne_Ch3: ; b4cb (2:74cb) + notetype 12, 19 + note __, 16 + note __, 12 + octave 4 + note B_, 2 + note G#, 2 + note A_, 8 + note F#, 8 + note G#, 4 + note __, 4 + note B_, 8 + note A_, 8 + note B_, 8 + note A_, 8 + note G#, 8 + note A_, 8 + note F#, 8 + note G#, 8 + note B_, 8 + note A_, 4 + note E_, 4 + note B_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note G#, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + octave 5 + note D_, 8 + note C#, 8 + note C#, 8 + octave 4 + note B_, 8 + note B_, 8 + note A_, 8 + note A_, 8 + note G#, 8 + note G#, 8 + note F#, 8 + note F#, 8 + note E_, 8 + note E_, 8 + note F#, 8 + note F#, 8 + note G#, 8 + note B_, 8 + loopchannel 0, Music_SSAnne_Ch3 +; 0xb504 \ No newline at end of file diff --git a/crysaudio/music/RBY/surfing.asm b/crysaudio/music/RBY/surfing.asm new file mode 100644 index 00000000..7c384ba6 --- /dev/null +++ b/crysaudio/music/RBY/surfing.asm @@ -0,0 +1,341 @@ +Music_Surfing: + dbw $80, Music_Surfing_Ch1 + dbw $01, Music_Surfing_Ch2 + dbw $02, Music_Surfing_Ch3 + +Music_Surfing_Ch1: ; 7fa19 (1f:7a19) + tempo 160 + volume 119 + dutycycle 3 + vibrato 12, 52 + + notetype 12, 181 + note __, 6 + octave 2 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 + octave 3 + note G#, 2 + note F#, 2 + note G#, 4 + +Music_Surfing_branch_7fa30: + notetype 12, 178 + note E_, 2 + note E_, 4 + note E_, 2 + note E_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + notetype 12, 177 + note F#, 3 + notetype 12, 178 + note D_, 3 + note E_, 2 + note E_, 4 + note E_, 2 + note E_, 4 + note A_, 2 + note A_, 4 + note G#, 2 + note G#, 4 + note F#, 2 + note F#, 4 + note E_, 2 + note E_, 4 + note G#, 2 + note G#, 4 + notetype 12, 177 + note F#, 3 + notetype 12, 178 + note G#, 1 + notetype 12, 180 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + notetype 12, 183 + note C#, 6 + notetype 12, 179 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note B_, 2 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 4 + loopchannel 0, Music_Surfing_branch_7fa30 + + +Music_Surfing_Ch2: ; 7fa9c (1f:7a9c) + dutycycle 3 + vibrato 16, 37 + notetype 12, 198 + octave 3 + note A_, 2 + note G#, 3 + note F#, 1 + note E_, 6 + note G#, 6 + octave 4 + note E_, 2 + note D_, 2 + octave 3 + note B_, 2 + +Music_Surfing_branch_7faae: + notetype 12, 198 + octave 4 + note E_, 6 + note C#, 5 + note E_, 1 + note D_, 6 + octave 3 + note B_, 6 + octave 4 + note D_, 6 + octave 3 + note B_, 2 + notetype 12, 193 + octave 4 + note F#, 3 + notetype 12, 198 + note D_, 1 + note E_, 6 + note C#, 6 + note E_, 6 + note C#, 5 + note E_, 1 + note F#, 6 + note D_, 6 + note F#, 6 + note E_, 2 + notetype 12, 193 + note F#, 3 + notetype 12, 198 + note E_, 1 + note A_, 6 + note A_, 6 + note B_, 2 + note A_, 3 + note D_, 1 + note F#, 6 + note E_, 2 + note F#, 3 + note E_, 1 + note C#, 6 + note D_, 2 + note C#, 3 + octave 3 + note B_, 1 + octave 4 + note F#, 6 + note E_, 2 + note D#, 3 + note E_, 1 + note A_, 6 + note B_, 2 + note A_, 3 + note D_, 1 + note F#, 6 + note E_, 2 + note F#, 3 + note G#, 1 + note A_, 6 + note G#, 2 + note F#, 3 + note E_, 1 + note G#, 6 + note A_, 2 + note G#, 3 + note A_, 1 + octave 5 + note C#, 6 + loopchannel 0, Music_Surfing_branch_7faae + + +Music_Surfing_Ch3: ; 7fafa (1f:7afa) + notetype 12, 16 + note __, 12 + octave 5 + note E_, 6 + octave 4 + note E_, 2 + note F#, 2 + note G#, 2 + +Music_Surfing_branch_7fb03: + octave 3 + note A_, 2 + octave 4 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 + note __, 2 + note E_, 1 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note G#, 1 + note __, 2 + note E_, 1 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note F#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note A_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note F#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note A_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + loopchannel 0, Music_Surfing_branch_7fb03 +; 0x7fb7d \ No newline at end of file diff --git a/crysaudio/music/RBY/surfingpikachu.asm b/crysaudio/music/RBY/surfingpikachu.asm new file mode 100644 index 00000000..c26295a1 --- /dev/null +++ b/crysaudio/music/RBY/surfingpikachu.asm @@ -0,0 +1,688 @@ +Music_SurfingPikachu: + dbw $80, Music_SurfingPikachu_Ch1 + dbw $01, Music_SurfingPikachu_Ch2 + dbw $02, Music_SurfingPikachu_Ch3 + +Music_SurfingPikachu_Ch1: + tempo 117 + volume 119 + dutycycle 3 + vibrato $8, $14 + notetype $c, $b3 + octave 3 + note E_, 6 + notetype $c, $b2 + note F#, 2 + notetype $c, $b3 + note E_, 6 + notetype $c, $b2 + note F#, 16 + note __, 2 + notetype $c, $b3 + note E_, 6 + notetype $c, $b2 + note A_, 2 + notetype $c, $b3 + note E_, 6 + notetype $c, $b2 + note A_, 14 + notetype $c, $b2 + note D#, 2 + note C#, 1 + note D#, 1 + octave 2 + note B_, 6 + octave 3 + note E_, 4 + note E_, 4 + note E_, 8 + note G#, 4 + note G#, 4 + note G#, 2 +Music_SurfingPikachu_branch_82d1a: + notetype $c, $b3 + octave 3 + note G#, 4 + note E_, 4 + note F#, 4 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 6 + note F#, 2 + note A_, 8 + octave 2 + note B_, 6 + octave 3 + note E_, 2 + note G#, 8 + note G#, 4 + note E_, 4 + note F#, 4 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 1 + note __, 3 + note A_, 4 + dutycycle 0 + notetype $c, $b2 + note G#, 1 + note F#, 1 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 2 + note F#, 2 + note D#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note B_, 1 + note A#, 1 + note B_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 3 + octave 3 + note F#, 1 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note E_, 3 + note E_, 1 + note B_, 2 + note A_, 2 + note G#, 6 + note E_, 1 + note F_, 1 + note F#, 2 + note F#, 2 + note D#, 2 + note F#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note B_, 1 + note A#, 1 + note B_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 3 + octave 3 + note F#, 1 + note A_, 2 + note G#, 2 + note A_, 2 + octave 4 + note D#, 2 + note E_, 2 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 8 + dutycycle 3 + loopchannel 0, Music_SurfingPikachu_branch_82d1a +Music_SurfingPikachu_Ch2: + dutycycle 3 + vibrato $6, $15 + notetype $c, $c4 + octave 3 + note B_, 6 + notetype $c, $c2 + octave 4 + note E_, 2 + notetype $c, $c4 + octave 3 + note B_, 6 + notetype $c, $c2 + octave 4 + note E_, 2 + notetype $c, $b2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + notetype $c, $c4 + octave 4 + note C#, 6 + notetype $c, $c2 + note F#, 2 + notetype $c, $c4 + note C#, 6 + notetype $c, $c2 + note F#, 2 + notetype $c, $b2 + note C#, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + notetype $c, $c2 + note E_, 6 + note B_, 4 + note B_, 4 + note B_, 8 + note B_, 4 + note B_, 4 + note B_, 2 +Music_SurfingPikachu_branch_82de0: + notetype $c, $c6 + octave 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 6 + note A_, 2 + note G#, 8 + note F#, 6 + note A_, 2 + octave 4 + note C#, 8 + octave 3 + note E_, 6 + note G#, 2 + note B_, 8 + octave 4 + note E_, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 6 + octave 4 + note D#, 2 + note E_, 8 + note D#, 6 + note C#, 2 + note D#, 1 + note __, 3 + note F#, 4 + note E_, 10 + notetype $c, $c6 + dutycycle 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 6 + octave 4 + note C#, 2 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 6 + note F#, 2 + note G#, 8 + note A_, 6 + note G#, 2 + note A_, 4 + note F#, 4 + note G#, 10 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 6 + octave 4 + note C#, 2 + note D#, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 6 + note F#, 2 + note G#, 8 + note A_, 4 + note F#, 4 + note D#, 4 + octave 5 + note C#, 4 + octave 4 + note B_, 8 + notetype $c, $c2 + octave 5 + note E_, 4 + notetype $c, $c6 + dutycycle 3 + octave 3 + note B_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C#, 1 + loopchannel 0, Music_SurfingPikachu_branch_82de0 +Music_SurfingPikachu_Ch3: + notetype $c, $10 + octave 4 + note B_, 6 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note B_, 6 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 4 + note A_, 6 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 6 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 +Music_SurfingPikachu_branch_82ea0: + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note C_, 1 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + note D#, 1 + note E_, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + loopchannel 0, Music_SurfingPikachu_branch_82ea0 diff --git a/crysaudio/music/RBY/titlescreen.asm b/crysaudio/music/RBY/titlescreen.asm new file mode 100644 index 00000000..b09a53ac --- /dev/null +++ b/crysaudio/music/RBY/titlescreen.asm @@ -0,0 +1,747 @@ +Music_RBYTitleScreen: + dbw $C0, Music_RBYTitleScreen_Ch1 + dbw $01, Music_RBYTitleScreen_Ch2 + dbw $02, Music_RBYTitleScreen_Ch3 + dbw $03, Music_RBYTitleScreen_Ch4 + +Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0) + ftempo 144 + volume 119 + vibrato 9, 52 + dutycycle 3 + notetype 12, 193 + octave 2 + note E_, 1 + note G_, 1 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + notetype 8, 193 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note F#, 2 + +Music_RBYTitleScreen_branch_7e4e2: + callchannel Music_RBYTitleScreen_branch_7e541 + callchannel Music_RBYTitleScreen_branch_7e54a + callchannel Music_RBYTitleScreen_branch_7e541 + octave 3 + note C_, 8 + notetype 8, 198 + note E_, 4 + note E_, 4 + note C_, 4 + notetype 12, 198 + octave 2 + note B_, 8 + notetype 8, 231 + octave 3 + note F_, 4 + note E_, 4 + note C_, 4 + notetype 12, 231 + note D_, 10 + notetype 12, 198 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note D_, 2 + callchannel Music_RBYTitleScreen_branch_7e541 + callchannel Music_RBYTitleScreen_branch_7e54a + callchannel Music_RBYTitleScreen_branch_7e541 + note C_, 6 + note C_, 6 + note E_, 4 + note D_, 6 + note F_, 2 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 6 + note A_, 4 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note D_, 12 + note E_, 4 + note F_, 8 + note G_, 4 + note F_, 4 + note E_, 12 + note F_, 4 + note G_, 8 + notetype 12, 182 + octave 4 + note C_, 4 + note C#, 4 + callchannel Music_RBYTitleScreen_branch_7e55c + notetype 8, 180 + octave 4 + note C_, 4 + note C_, 4 + note C#, 4 + callchannel Music_RBYTitleScreen_branch_7e55c + notetype 8, 178 + octave 3 + note E_, 4 + note E_, 4 + note C#, 4 + loopchannel 0, Music_RBYTitleScreen_branch_7e4e2 + +Music_RBYTitleScreen_branch_7e541: + notetype 12, 198 + octave 3 + note D_, 6 + octave 2 + note B_, 2 + octave 3 + note D_, 8 + endchannel + +Music_RBYTitleScreen_branch_7e54a: + note C_, 6 + note F_, 6 + note C_, 4 + note D_, 8 + notetype 12, 231 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + notetype 8, 198 + note C_, 4 + octave 2 + note B_, 4 + octave 3 + note C_, 4 + endchannel + +Music_RBYTitleScreen_branch_7e55c: + notetype 12, 193 + note D_, 1 + note __, 1 + octave 2 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note D_, 1 + endchannel + + +Music_RBYTitleScreen_Ch2: ; 7e578 (1f:6578) + vibrato 16, 70 + dutycycle 1 + notetype 12, 225 + octave 2 + note G_, 1 + note B_, 1 + octave 3 + note D_, 1 + note F#, 1 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 4 + note G_, 4 + note G_, 4 + notetype 8, 225 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F#, 2 + +Music_RBYTitleScreen_branch_7e594: + vibrato 16, 70 + callchannel Music_RBYTitleScreen_branch_7e622 + octave 2 + note A_, 4 + note F_, 4 + callchannel Music_RBYTitleScreen_branch_7e62c + octave 2 + note A_, 8 + note B_, 16 + callchannel Music_RBYTitleScreen_branch_7e622 + octave 2 + note A_, 6 + note F_, 2 + notetype 8, 231 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + notetype 12, 231 + note D_, 8 + notetype 12, 149 + octave 2 + note D_, 6 + note D_, 1 + note F#, 1 + note G_, 16 + callchannel Music_RBYTitleScreen_branch_7e622 + octave 2 + note A_, 2 + note F_, 6 + callchannel Music_RBYTitleScreen_branch_7e62c + octave 3 + note C_, 2 + octave 2 + note A_, 6 + note B_, 6 + note G_, 2 + note F_, 8 + callchannel Music_RBYTitleScreen_branch_7e622 + notetype 8, 149 + octave 2 + note G_, 4 + note F_, 5 + note A_, 3 + notetype 8, 230 + octave 4 + note F_, 4 + note E_, 4 + note F_, 4 + notetype 12, 231 + note G_, 6 + note A#, 2 + note G_, 8 + vibrato 16, 38 + dutycycle 3 + notetype 12, 11 + note G_, 8 + notetype 12, 231 + note A_, 8 + dutycycle 1 + notetype 12, 231 + note A#, 6 + note F_, 2 + note F_, 8 + octave 3 + note D_, 8 + octave 4 + note A#, 4 + note B_, 4 + octave 5 + note C_, 6 + octave 4 + note G_, 2 + note G_, 8 + octave 3 + note E_, 8 + notetype 12, 215 + octave 5 + note C_, 4 + note C#, 4 + callchannel Music_RBYTitleScreen_branch_7e636 + note __, 3 + note D_, 1 + note __, 3 + note D_, 1 + notetype 8, 229 + octave 5 + note C_, 4 + note C_, 4 + note C#, 4 + callchannel Music_RBYTitleScreen_branch_7e636 + note D_, 1 + note __, 2 + note D_, 1 + note __, 3 + note D_, 1 + notetype 8, 227 + octave 5 + note C_, 4 + note C_, 4 + octave 4 + note B_, 4 + loopchannel 0, Music_RBYTitleScreen_branch_7e594 + +Music_RBYTitleScreen_branch_7e622: + notetype 12, 231 + octave 3 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + notetype 12, 149 + endchannel + +Music_RBYTitleScreen_branch_7e62c: + notetype 12, 231 + octave 4 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + notetype 12, 149 + endchannel + +Music_RBYTitleScreen_branch_7e636: + notetype 12, 225 + note D_, 1 + note __, 2 + octave 4 + note D_, 1 + note __, 3 + note D_, 1 + note __, 3 + note D_, 1 + note __, 3 + note D_, 1 + endchannel + + +Music_RBYTitleScreen_Ch3: ; 7e643 (1f:6643) + notetype 12, 16 + octave 3 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + notetype 8, 16 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note A_, 2 + +Music_RBYTitleScreen_branch_7e65e: + callchannel Music_RBYTitleScreen_branch_7e6c9 + callchannel Music_RBYTitleScreen_branch_7e6d0 + +Music_RBYTitleScreen_branch_7e664: + callchannel Music_RBYTitleScreen_branch_7e6c9 + callchannel Music_RBYTitleScreen_branch_7e6c9 + callchannel Music_RBYTitleScreen_branch_7e6c9 + callchannel Music_RBYTitleScreen_branch_7e6d0 + loopchannel 3, Music_RBYTitleScreen_branch_7e664 + callchannel Music_RBYTitleScreen_branch_7e6c9 + note G_, 6 + note D_, 3 + note A_, 6 + note F_, 3 + note A_, 3 + note F_, 3 + callchannel Music_RBYTitleScreen_branch_7e6d7 + note A#, 3 + note F_, 3 + callchannel Music_RBYTitleScreen_branch_7e6d7 + note B_, 3 + note G_, 3 + callchannel Music_RBYTitleScreen_branch_7e6dc + octave 4 + note C_, 3 + octave 3 + note G_, 3 + callchannel Music_RBYTitleScreen_branch_7e6dc + octave 4 + note C#, 3 + octave 3 + note A_, 3 + callchannel Music_RBYTitleScreen_branch_7e6e5 + notetype 3, 16 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 4 + note __, 16 + octave 6 + note D_, 1 + note C#, 1 + note C_, 1 + octave 5 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 4 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 4 + note __, 8 + notetype 8, 16 + octave 4 + note C_, 4 + note C_, 4 + note C#, 4 + callchannel Music_RBYTitleScreen_branch_7e6e5 + octave 6 + notetype 3, 16 + note D_, 1 + note C#, 1 + note C_, 1 + octave 5 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 4 + note __, 16 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 4 + notetype 8, 16 + octave 4 + note __, 9 + note C_, 4 + note C_, 4 + octave 3 + note B_, 4 + loopchannel 0, Music_RBYTitleScreen_branch_7e65e + +Music_RBYTitleScreen_branch_7e6c9: + note G_, 6 + note D_, 3 + note G_, 6 + note D_, 3 + note G_, 3 + note D_, 3 + endchannel + +Music_RBYTitleScreen_branch_7e6d0: + note F_, 6 + note C_, 3 + note F_, 6 + note C_, 3 + note F_, 3 + note C_, 3 + endchannel + +Music_RBYTitleScreen_branch_7e6d7: + note A#, 6 + note F_, 3 + note A#, 6 + note F_, 3 + endchannel + +Music_RBYTitleScreen_branch_7e6dc: + octave 4 + note C_, 6 + octave 3 + note G_, 3 + octave 4 + note C_, 6 + octave 3 + note G_, 3 + endchannel + +Music_RBYTitleScreen_branch_7e6e5: + notetype 12, 16 + octave 4 + note D_, 1 + note __, 5 + endchannel + + +Music_RBYTitleScreen_Ch4: ; 7e6eb (1f:66eb) + notetype 6 + togglenoise 0 + note __, 4 + note D_, 1 + note D_, 1 + note D#, 1 + note D#, 1 + notetype 12 + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note C#, 1 + note C#, 1 + note C#, 1 + note __, 3 + note C#, 1 + note __, 3 + note C#, 1 + note __, 3 + notetype 8 + note D_, 2 + note D#, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + +Music_RBYTitleScreen_branch_7e716: + notetype 12 + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note C#, 1 + note C#, 1 + note D_, 1 + note __, 3 + callchannel Music_RBYTitleScreen_branch_7e834 + callchannel Music_RBYTitleScreen_branch_7e834 + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note C#, 1 + note C#, 1 + note D_, 1 + note __, 1 + note D_, 1 + note C#, 1 + callchannel Music_RBYTitleScreen_branch_7e842 + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note C#, 1 + note D_, 1 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Music_RBYTitleScreen_branch_7e842 + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note C#, 1 + note D_, 1 + note C#, 1 + note __, 1 + notetype 6 + note D_, 1 + note D_, 1 + note D#, 1 + note D#, 1 + notetype 12 + callchannel Music_RBYTitleScreen_branch_7e834 + callchannel Music_RBYTitleScreen_branch_7e842 + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note C#, 1 + note D_, 1 + note C#, 1 + note __, 3 + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note D_, 1 + note C#, 1 + note C#, 1 + note __, 1 + note D_, 1 + note C#, 1 + callchannel Music_RBYTitleScreen_branch_7e834 + callchannel Music_RBYTitleScreen_branch_7e842 + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note D_, 1 + note C#, 1 + note C#, 1 + note __, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note __, 3 + note D_, 1 + note __, 5 + note C#, 1 + note D#, 1 + note C#, 1 + note __, 1 + notetype 6 + note D_, 1 + note D_, 1 + note D#, 1 + note D#, 1 + notetype 12 + note C_, 1 + note __, 3 + note C#, 1 + note __, 5 + note D_, 1 + note C#, 1 + note C_, 1 + note __, 3 + note C#, 1 + note __, 3 + note D_, 1 + note __, 5 + note D_, 1 + note C#, 1 + note D_, 1 + note __, 3 + note C#, 1 + note __, 3 + note D_, 1 + note __, 5 + note C#, 1 + note D_, 1 + note D#, 1 + note __, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note __, 3 + note D_, 1 + note __, 5 + note C#, 1 + note D_, 1 + note C#, 1 + note __, 3 + note E_, 1 + note __, 5 + note C#, 1 + note __, 3 + note D_, 1 + note C#, 1 + note C_, 1 + note __, 5 + note C#, 1 + note D_, 1 + note C#, 1 + note __, 1 + note C_, 1 + note __, 1 + notetype 8 + note C#, 4 + note D_, 4 + note C_, 4 + notetype 12 + note E_, 1 + note __, 5 + note C#, 1 + note __, 3 + note D_, 1 + note C#, 1 + note D_, 1 + note __, 5 + note C#, 1 + note D_, 1 + note C_, 1 + note __, 1 + note D_, 1 + note C#, 1 + notetype 8 + note C#, 4 + note D_, 4 + note C#, 4 + loopchannel 0, Music_RBYTitleScreen_branch_7e716 + +Music_RBYTitleScreen_branch_7e834: + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note C#, 1 + note D_, 1 + note C#, 1 + note __, 3 + endchannel + +Music_RBYTitleScreen_branch_7e842: + note C#, 1 + note __, 3 + note C#, 1 + note __, 5 + note D_, 1 + note C#, 1 + note C#, 1 + note __, 3 + endchannel +; 0x7e850 \ No newline at end of file diff --git a/crysaudio/music/RBY/trainerbattle.asm b/crysaudio/music/RBY/trainerbattle.asm new file mode 100644 index 00000000..fa307ca9 --- /dev/null +++ b/crysaudio/music/RBY/trainerbattle.asm @@ -0,0 +1,1854 @@ +Music_TrainerBattle: + dbw $80, Music_TrainerBattle_Ch1 + dbw $01, Music_TrainerBattle_Ch2 + dbw $02, Music_TrainerBattle_Ch3 + +Music_TrainerBattle_Ch1: + ftempo 112 + volume 119 + dutycycle 3 + vibrato $6, $34 + notetype $c, $b2 + note __, 8 + octave 3 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + octave 3 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 4 + note D_, 6 + note E_, 6 + note F_, 4 + note D_, 2 + note E_, 4 + note F_, 6 + note C_, 2 + note C#, 2 +Music_TrainerBattle_branch_22962: + intensity $b5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 + octave 2 + note B_, 4 + note F#, 4 + octave 3 + note E_, 2 + note D_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note F_, 8 + intensity $b2 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + intensity $b5 + note D_, 2 + note E_, 4 + note C#, 2 + note D_, 4 + octave 2 + note B_, 4 + note F#, 4 + octave 3 + note E_, 2 + note D_, 4 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + intensity $a7 + note D_, 8 + note C#, 8 + octave 2 + note B_, 8 + octave 3 + note C#, 8 + intensity $b5 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note G_, 2 + note __, 2 + octave 3 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note G_, 2 + note __, 2 + octave 3 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note E_, 4 + octave 2 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C#, 1 + note D_, 4 + octave 2 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C#, 4 + octave 2 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note C#, 1 + note D_, 4 + octave 2 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 3 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note G_, 2 + note __, 2 + octave 3 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + octave 3 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note __, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + octave 3 + note A_, 2 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A#, 1 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note B_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C_, 2 + note D_, 2 + note __, 2 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + note D_, 2 + octave 3 + note F_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note E_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + octave 3 + note B_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note C_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note D_, 2 + note F_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note C_, 2 + octave 2 + note A_, 2 + octave 3 + note C_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note D_, 2 + note F_, 2 + note D_, 16 + note C_, 16 + octave 2 + note A#, 16 + note G_, 12 + octave 3 + note D_, 1 + note E_, 1 + note G_, 1 + octave 4 + note C_, 1 + note D_, 8 + note F_, 8 + octave 3 + note A#, 8 + octave 4 + note C_, 8 + note D_, 8 + note E_, 8 + note F_, 8 + note G_, 8 + note E_, 2 + note __, 4 + note E_, 2 + note __, 4 + note E_, 2 + note __, 2 + note E_, 2 + note __, 4 + note E_, 2 + note __, 4 + note E_, 2 + note __, 2 + note E_, 2 + note __, 4 + note E_, 2 + note __, 4 + note E_, 2 + note __, 2 + note E_, 2 + note __, 4 + note E_, 2 + note __, 4 + note E_, 2 + note __, 2 + octave 3 + note C_, 2 + note D_, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 4 + note __, 2 + note C#, 1 + note D_, 1 + note E_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 9 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note __, 5 + note C#, 1 + note D_, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note __, 9 + note F#, 2 + note E_, 4 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note E_, 8 + note F#, 8 + note G_, 8 + octave 4 + note C_, 4 + octave 3 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + loopchannel 0, Music_TrainerBattle_branch_22962 +Music_TrainerBattle_Ch2: + dutycycle 3 + vibrato $a, $25 + notetype $c, $c2 + octave 4 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note A_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note A_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note A_, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note A_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note A_, 1 + note C_, 1 + note C#, 1 + note C_, 1 + note A_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + intensity $e1 + octave 4 + note B_, 16 + note __, 16 + intensity $d1 + note B_, 16 + note __, 12 + note A_, 4 + intensity $c2 + octave 3 + note B_, 6 + octave 4 + note C#, 6 + note D_, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 4 + note D_, 6 + note A_, 2 + note A#, 2 + note B_, 6 + octave 5 + note C#, 6 + note D_, 4 + octave 4 + note B_, 2 + octave 5 + note C#, 4 + note D_, 6 + octave 4 + note A_, 4 +Music_TrainerBattle_branch_22bfc: + intensity $c7 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + intensity $50 + octave 4 + note C_, 8 + intensity $30 + note C_, 8 + intensity $4d + note C_, 8 + intensity $c7 + note C_, 8 + octave 3 + note B_, 6 + note F#, 14 + note B_, 4 + note F#, 4 + note B_, 4 + intensity $90 + note A_, 8 + intensity $50 + note A_, 8 + intensity $40 + note A_, 8 + intensity $30 + note A_, 8 + intensity $c7 + note G_, 16 + octave 4 + note D_, 8 + octave 3 + note G_, 8 + intensity $80 + note A_, 8 + intensity $50 + note A_, 8 + intensity $40 + note A_, 8 + intensity $60 + note A_, 8 + intensity $c7 + note G_, 16 + octave 4 + note E_, 8 + note F#, 8 + note E_, 16 + intensity $c5 + note G_, 4 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + intensity $b7 + note F#, 8 + intensity $50 + note F#, 8 + intensity $60 + note F#, 8 + intensity $70 + note F#, 8 + intensity $a0 + note G_, 8 + intensity $a7 + note G_, 8 + intensity $b7 + note G_, 4 + intensity $c5 + note A_, 2 + note G_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + intensity $a0 + note G#, 8 + intensity $70 + note G#, 8 + intensity $80 + note G#, 8 + intensity $60 + note G#, 8 + intensity $a0 + note A_, 16 + intensity $b0 + octave 5 + note C#, 8 + note E_, 8 + intensity $c0 + note D_, 4 + octave 4 + note A_, 4 + octave 5 + note C_, 2 + intensity $c7 + octave 4 + note B_, 8 + intensity $60 + note B_, 8 + intensity $69 + note B_, 6 + intensity $96 + note B_, 6 + note __, 2 + intensity $c0 + octave 5 + note D_, 4 + octave 4 + note A_, 4 + note A#, 2 + intensity $b0 + octave 5 + note F_, 14 + intensity $60 + note G_, 16 + intensity $50 + note E_, 16 + intensity $40 + note E_, 16 + intensity $c7 + octave 4 + note C_, 6 + octave 3 + note A_, 14 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 6 + octave 4 + note F_, 14 + octave 3 + note A#, 4 + octave 4 + note F_, 4 + note D_, 4 + note C_, 6 + octave 3 + note A_, 14 + octave 4 + note C_, 4 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note D_, 2 + octave 3 + note A#, 4 + octave 4 + note F_, 10 + note G_, 6 + note F_, 6 + note D_, 4 + intensity $b0 + note F_, 16 + note E_, 16 + note D_, 16 + note E_, 16 + intensity $a0 + octave 5 + note F_, 16 + note E_, 16 + note G_, 16 + note F_, 16 + intensity $d1 + octave 3 + note A#, 6 + note A#, 6 + note A#, 4 + note A_, 6 + note A_, 6 + note A_, 4 + octave 4 + note C_, 6 + note C_, 6 + note C_, 4 + octave 3 + note A#, 6 + note A#, 6 + note A_, 4 + intensity $c7 + note A_, 4 + note B_, 4 + note G_, 2 + note A_, 10 + note B_, 2 + octave 4 + note C#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A#, 16 + note __, 2 + note A#, 2 + octave 4 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + note B_, 16 + note __, 2 + note B_, 2 + octave 4 + note C#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 16 + note E_, 8 + note G_, 8 + loopchannel 0, Music_TrainerBattle_branch_22bfc +Music_TrainerBattle_Ch3: + vibrato $0, $20 + notetype $c, $14 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 2 + note A#, 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 +Music_TrainerBattle_branch_22d9c: + octave 2 + note A#, 1 + note B_, 1 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + octave 2 + note A_, 2 + note G#, 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note F#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 4 + octave 2 + note A_, 4 + octave 3 + note C_, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note D_, 4 + octave 2 + note A_, 4 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 4 + octave 3 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 + loopchannel 0, Music_TrainerBattle_branch_22d9c diff --git a/crysaudio/music/RBY/unusedsong.asm b/crysaudio/music/RBY/unusedsong.asm new file mode 100644 index 00000000..d1641074 --- /dev/null +++ b/crysaudio/music/RBY/unusedsong.asm @@ -0,0 +1,343 @@ +Music_UnusedSong: + dbw $40, Music_UnusedSong_Ch1 + dbw $01, Music_UnusedSong_Ch2 + +Music_UnusedSong_Ch1: ; a913 (2:6913) + tempo 144 + volume 119 + vibrato 5, 22 + +Music_UnusedSong_branch_a91b: + notetype 12, 16 + octave 6 + note E_, 1 + note __, 1 + octave 5 + note B_, 1 + note __, 1 + octave 6 + note C#, 1 + note __, 1 + octave 5 + note B_, 1 + octave 6 + note E_, 1 + note __, 4 + note E_, 2 + note __, 2 + note D#, 1 + note __, 1 + octave 5 + note B_, 1 + note __, 1 + octave 6 + note C#, 1 + note __, 1 + octave 5 + note B_, 1 + octave 6 + note D#, 1 + note __, 8 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 1 + octave 5 + note B_, 1 + note __, 2 + octave 6 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 1 + octave 5 + note B_, 1 + note __, 2 + octave 6 + note D#, 4 + note C#, 4 + note D#, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 5 + note B_, 2 + note __, 1 + octave 6 + note E_, 1 + note __, 1 + octave 5 + note B_, 1 + note __, 1 + octave 6 + note C#, 1 + note __, 1 + octave 5 + note B_, 1 + octave 6 + note E_, 1 + note __, 8 + note D#, 1 + note __, 1 + octave 5 + note B_, 1 + note __, 1 + octave 6 + note C#, 1 + note __, 1 + octave 5 + note B_, 1 + octave 6 + note D#, 1 + note __, 4 + octave 5 + note B_, 2 + note __, 2 + octave 6 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 1 + octave 5 + note B_, 1 + note __, 2 + octave 6 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note F#, 1 + note __, 2 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note D#, 2 + note __, 3 + octave 5 + note A_, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 6 + note C#, 2 + note __, 2 + note E_, 2 + note F#, 8 + note __, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note __, 2 + octave 5 + note G#, 2 + note __, 2 + note A_, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 6 + note D#, 2 + note E_, 8 + note __, 2 + note D#, 2 + note C#, 2 + note D#, 2 + octave 5 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 1 + note B_, 1 + note __, 4 + note F#, 2 + note __, 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 6 + note C_, 1 + note C#, 1 + note __, 8 + octave 5 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + octave 6 + note E_, 2 + note D#, 2 + note C#, 2 + octave 5 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + loopchannel 0, Music_UnusedSong_branch_a91b + endchannel + + +Music_UnusedSong_Ch2: ; a9cf (2:69cf) + tempo 144 + volume 119 + + vibrato 6, 21 + +Music_UnusedSong_branch_a9d8: + notetype 12, 16 + octave 6 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note G#, 1 + note __, 8 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note F#, 1 + note __, 4 + octave 5 + note B_, 2 + note __, 2 + octave 6 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note F#, 1 + note __, 2 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note F#, 1 + note __, 2 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note D#, 2 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note G#, 1 + note __, 4 + note E_, 2 + note __, 2 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note F#, 1 + note __, 8 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note F#, 1 + note __, 2 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note F#, 1 + note __, 2 + note F#, 4 + note E_, 4 + note F#, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 2 + note __, 1 + note C#, 2 + note __, 2 + note D#, 2 + note __, 2 + note E_, 2 + note __, 2 + note G#, 2 + note __, 2 + note D#, 8 + note __, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 5 + note B_, 2 + note __, 2 + octave 6 + note C#, 2 + note __, 2 + note D#, 2 + note __, 2 + note F#, 2 + note __, 2 + note C#, 8 + note __, 2 + note D#, 2 + note C#, 2 + octave 5 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 1 + note F#, 1 + note __, 8 + note B_, 2 + note A#, 2 + note B_, 2 + note A_, 1 + note G#, 1 + note __, 4 + note G#, 2 + note __, 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note __, 6 + note D#, 2 + note __, 6 + loopchannel 0, Music_UnusedSong_branch_a9d8 + endchannel +; 0xaa6f \ No newline at end of file diff --git a/crysaudio/music/RBY/vermilion.asm b/crysaudio/music/RBY/vermilion.asm new file mode 100644 index 00000000..4cc38373 --- /dev/null +++ b/crysaudio/music/RBY/vermilion.asm @@ -0,0 +1,331 @@ +Music_Vermilion: + dbw $C0, Music_Vermilion_Ch1 + dbw $01, Music_Vermilion_Ch2 + dbw $02, Music_Vermilion_Ch3 + dbw $03, Music_Vermilion_Ch4 + +Music_Vermilion_Ch1: ; b9eb (2:79eb) + tempo 156 + volume 119 + dutycycle 3 + vibrato 12, 52 + + +Music_Vermilion_branch_b9f6: + notetype 12, 181 + octave 3 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 2 + note E_, 4 + note C#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 2 + note E_, 4 + note C#, 1 + note D_, 1 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 4 + note E_, 4 + note F#, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 2 + note B_, 2 + note A_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 1 + note A_, 1 + note B_, 2 + octave 4 + note C#, 2 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note F#, 2 + note B_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note B_, 2 + loopchannel 0, Music_Vermilion_branch_b9f6 + + +Music_Vermilion_Ch2: ; ba61 (2:7a61) + dutycycle 3 + vibrato 10, 35 + +Music_Vermilion_branch_ba66: + notetype 12, 199 + octave 3 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C#, 8 + octave 3 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 8 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C#, 8 + octave 3 + note A_, 8 + octave 4 + note D_, 4 + note C#, 4 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 8 + note B_, 4 + octave 4 + note C#, 4 + note D_, 4 + note E_, 4 + note F#, 8 + note B_, 8 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 8 + note E_, 8 + loopchannel 0, Music_Vermilion_branch_ba66 + + +Music_Vermilion_Ch3: ; baa6 (2:7aa6) + notetype 12, 16 + +Music_Vermilion_branch_baa8: + octave 4 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + loopchannel 0, Music_Vermilion_branch_baa8 + + +Music_Vermilion_Ch4: ; bb0d (2:7b0d) + notetype 12 + togglenoise 0 + +Music_Vermilion_branch_bb0e: + callchannel Music_Vermilion_branch_bb3f + note F_, 2 + note F_, 1 + note F_, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note F_, 1 + note F_, 1 + note F_, 1 + note F_, 1 + loopchannel 4, Music_Vermilion_branch_bb0e + callchannel Music_Vermilion_branch_bb3f + callchannel Music_Vermilion_branch_bb3f + callchannel Music_Vermilion_branch_bb3f + callchannel Music_Vermilion_branch_bb3f + loopchannel 0, Music_Vermilion_branch_bb0e + +Music_Vermilion_branch_bb3f: + note F_, 2 + note F_, 1 + note F_, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note F_, 2 + note F_, 1 + note F_, 1 + note F_, 2 + note F_, 1 + note F_, 1 + endchannel +; 0xbb58 \ No newline at end of file diff --git a/crysaudio/music/RBY/wildbattle.asm b/crysaudio/music/RBY/wildbattle.asm new file mode 100644 index 00000000..7c0f9f4e --- /dev/null +++ b/crysaudio/music/RBY/wildbattle.asm @@ -0,0 +1,734 @@ +Music_WildBattle: + dbw $80, Music_WildBattle_Ch1 + dbw $01, Music_WildBattle_Ch2 + dbw $02, Music_WildBattle_Ch3 + +Music_WildBattle_Ch1: + ftempo 104 + volume 119 + dutycycle 3 + vibrato $6, $34 + notetype $c, $b3 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + intensity $b1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + intensity $4f + note C#, 10 + intensity $b1 + note G_, 6 + note E_, 6 + note D#, 12 + note C#, 14 + note E_, 6 + note D#, 10 + note C#, 10 +Music_WildBattle_branch_230e0: + intensity $b3 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + intensity $b5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note E_, 6 + note D_, 6 + note F_, 4 + intensity $b7 + note A_, 16 + note G_, 16 + intensity $b5 + note D_, 4 + note C_, 4 + note D_, 4 + note F_, 4 + note G_, 6 + note A_, 6 + note B_, 4 + intensity $b7 + octave 4 + note C_, 16 + intensity $3f + note G_, 16 + intensity $b5 + octave 3 + note C_, 12 + note C_, 2 + note __, 2 + note D_, 2 + note C_, 2 + note __, 12 + note C#, 12 + note C#, 2 + note __, 2 + note F_, 2 + intensity $a3 + note D#, 6 + intensity $a7 + note C#, 8 + loopchannel 0, Music_WildBattle_branch_230e0 +Music_WildBattle_Ch2: + dutycycle 3 + vibrato $8, $25 + notetype $c, $c3 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + octave 5 + note G_, 1 + intensity $c2 + octave 4 + note G_, 6 + octave 3 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + intensity $90 + note F#, 10 + intensity $c2 + note G_, 6 + note G_, 6 + note G_, 12 + note G_, 14 + note G_, 6 + note G_, 10 + note G_, 10 +Music_WildBattle_branch_23225: + intensity $c5 + note G_, 6 + note F#, 6 + note E_, 4 + note G_, 6 + note A_, 6 + note G_, 4 + octave 4 + note G#, 12 + note G_, 2 + note __, 2 + note G#, 2 + note G_, 2 + note __, 4 + intensity $b7 + octave 5 + note C#, 8 + intensity $c5 + octave 4 + note C_, 6 + octave 3 + note A#, 6 + note G#, 4 + octave 4 + note C#, 6 + note C_, 6 + octave 3 + note A#, 4 + octave 4 + note F_, 6 + note E_, 6 + note D_, 4 + intensity $c7 + octave 3 + note A#, 4 + octave 4 + note C_, 4 + note D_, 4 + note F_, 4 + intensity $c0 + note G#, 16 + intensity $b0 + note G#, 16 + intensity $4e + note G_, 16 + intensity $c7 + note G_, 16 + octave 3 + note F_, 8 + note A#, 8 + octave 4 + note D_, 8 + note F_, 8 + intensity $c0 + note E_, 16 + intensity $c7 + note E_, 16 + octave 3 + note F_, 8 + note A#, 8 + octave 4 + note D_, 8 + note F_, 8 + intensity $c0 + note G_, 16 + intensity $3f + octave 5 + note C_, 16 + intensity $c5 + octave 4 + note E_, 12 + note E_, 2 + note __, 2 + note F_, 2 + intensity $c1 + note E_, 4 + intensity $c5 + note __, 10 + note F_, 12 + note F_, 2 + note __, 2 + note G#, 2 + intensity $a3 + note G_, 6 + intensity $c7 + note F_, 8 + loopchannel 0, Music_WildBattle_branch_23225 +Music_WildBattle_Ch3: + vibrato $0, $20 + notetype $c, $11 + octave 4 + note C#, 1 + note __, 1 + note C#, 1 + note C_, 1 + note D_, 1 + note __, 1 + note D_, 1 + note C_, 1 + note D#, 1 + note __, 1 + note D#, 1 + note C_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note C_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note C_, 1 + note F#, 1 + note __, 1 + note F#, 1 + note C_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note C_, 1 + octave 3 + note A#, 2 + note B_, 2 +Music_WildBattle_branch_232b5: + octave 4 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note A#, 2 + note G#, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 4 + note G#, 2 + note A#, 2 + note G#, 2 + note F_, 2 + loopchannel 2, Music_WildBattle_branch_232b5 +Music_WildBattle_branch_232d8: + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note G#, 12 + note G_, 2 + note __, 2 + note G#, 2 + note G_, 2 + note __, 4 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + loopchannel 0, Music_WildBattle_branch_232d8 diff --git a/crysaudio/music/RBY/yellowintro.asm b/crysaudio/music/RBY/yellowintro.asm new file mode 100644 index 00000000..e4dc8650 --- /dev/null +++ b/crysaudio/music/RBY/yellowintro.asm @@ -0,0 +1,485 @@ +Music_YellowIntro: + dbw $80, Music_YellowIntro_Ch1 + dbw $01, Music_YellowIntro_Ch2 + dbw $02, Music_YellowIntro_Ch3 + +Music_YellowIntro_Ch1: + ftempo 116 + volume 119 + dutycycle 3 + vibrato $8, $14 + notetype $c, $b2 + octave 3 + note G#, 2 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 3 + note A#, 1 + note B_, 2 + note B_, 10 + notetype $c, $b6 + octave 4 + note C#, 1 + note C_, 1 + note C#, 10 + octave 3 + note G#, 1 + note G_, 1 + note G#, 4 + note B_, 4 + octave 4 + note E_, 4 + note F#, 8 + note E_, 8 + octave 3 + note A_, 4 + note B_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note G#, 6 + notetype $c, $b2 + note B_, 2 + notetype $c, $b6 + note G#, 6 + notetype $c, $b2 + note B_, 2 + notetype $c, $b6 + octave 4 + note E_, 6 + notetype $c, $b2 + note G#, 2 + notetype $c, $b6 + note E_, 6 + notetype $c, $b2 + note G#, 2 + notetype $c, $b6 + octave 3 + note A_, 4 + note F#, 4 + note A_, 4 + note B_, 4 + note F#, 4 + note G#, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note D#, 2 + notetype $c, $b3 + note B_, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 2 + note C#, 2 + note F#, 4 + note F#, 3 + note D#, 1 + note F#, 2 + note F#, 8 + notetype $c, $b6 + note F#, 1 + note F_, 1 + note F#, 8 + octave 3 + note B_, 1 + note A#, 1 + note B_, 8 + octave 4 + note F#, 1 + note F_, 1 + note F#, 2 + notetype $c, $b3 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + notetype $c, $b2 + octave 3 + note B_, 16 + endchannel +Music_YellowIntro_Ch2: + dutycycle 2 + vibrato $6, $15 + notetype $c, $c2 + octave 3 + note B_, 2 + octave 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 4 + note E_, 3 + note D#, 1 + note E_, 2 + note E_, 4 + notetype $c, $c5 + note G#, 1 + note G_, 1 + note G#, 10 + octave 3 + note B_, 1 + note A#, 1 + note B_, 6 + notetype $c, $c7 + octave 4 + note E_, 4 + note G#, 4 + note B_, 4 + octave 5 + note C#, 16 + octave 4 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + octave 3 + note B_, 6 + notetype $c, $c2 + octave 4 + note E_, 2 + notetype $c, $c7 + octave 3 + note B_, 6 + notetype $c, $c2 + octave 4 + note E_, 2 + notetype $c, $c7 + note G#, 6 + notetype $c, $c2 + note B_, 2 + notetype $c, $c7 + note G#, 6 + notetype $c, $c2 + note B_, 2 + notetype $c, $c7 + note C#, 4 + octave 3 + note A_, 4 + octave 4 + note C#, 4 + note D#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + notetype $c, $c3 + octave 4 + note E_, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 2 + note F#, 2 + note A_, 4 + note A_, 3 + note F#, 1 + note A_, 2 + note A_, 4 + notetype $c, $c7 + note B_, 1 + note A#, 1 + note B_, 8 + note B_, 1 + note A#, 1 + note B_, 8 + note B_, 1 + note A#, 1 + note B_, 6 + notetype $c, $c3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + notetype $c, $c2 + note E_, 16 + endchannel +Music_YellowIntro_Ch3: + notetype $c, $10 + octave 4 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note F#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 3 + note F#, 1 + note __, 1 + octave 4 + note F#, 1 + note G#, 1 + note A_, 1 + octave 5 + note C#, 1 + note E_, 1 + note __, 15 + endchannel diff --git a/crysaudio/music/RBY/yellowunusedsong.asm b/crysaudio/music/RBY/yellowunusedsong.asm new file mode 100644 index 00000000..f6175716 --- /dev/null +++ b/crysaudio/music/RBY/yellowunusedsong.asm @@ -0,0 +1,323 @@ +Music_YellowUnusedSong: + dbw $C0, Music_YellowUnusedSong_Ch1 + dbw $01, Music_YellowUnusedSong_Ch2 + dbw $02, Music_YellowUnusedSong_Ch3 + dbw $03, Music_YellowUnusedSong_Ch4 + +Music_YellowUnusedSong_Ch1: + ftempo 140 + volume 119 + dutycycle 3 + vibrato $8, $14 + notetype $8, $b2 + octave 3 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note A_, 6 + note G_, 6 + note A_, 12 +Music_YellowUnusedSong_branch_82fde: + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + octave 4 + note D#, 6 + note D_, 12 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + octave 3 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note G_, 6 + note G_, 6 + note A_, 6 + note E_, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 6 + note A#, 6 + note A_, 6 + note G_, 6 + note A_, 12 + loopchannel 0, Music_YellowUnusedSong_branch_82fde +Music_YellowUnusedSong_Ch2: + dutycycle 2 + notetype $8, $c2 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 + octave 3 + note A_, 6 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note D_, 6 + note A#, 6 + note A_, 12 +Music_YellowUnusedSong_branch_8302a: + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 + octave 3 + note A_, 6 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note G#, 6 + note G_, 12 + notetype $8, $90 + octave 3 + note D#, 16 + note D#, 8 + note D#, 16 + note D#, 8 + octave 2 + note A#, 16 + note A#, 8 + octave 3 + note D#, 12 + note F_, 12 + notetype $8, $c2 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note C_, 6 + note C_, 6 + note D_, 6 + octave 3 + note A_, 6 + octave 4 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 6 + note D#, 6 + note D_, 6 + note A#, 6 + note A_, 12 + loopchannel 0, Music_YellowUnusedSong_branch_8302a +Music_YellowUnusedSong_Ch3: + notetype $c, $10 + vibrato $2, $15 + note __, 16 + note __, 12 + octave 4 + note C_, 4 + note D_, 8 + note D#, 8 + note G_, 8 + note A#, 8 +Music_YellowUnusedSong_branch_83075: + note A_, 8 + note A#, 8 + note G_, 8 + note A_, 4 + note D_, 4 + note A_, 8 + note A#, 8 + octave 5 + note C#, 8 + note D_, 8 + note D#, 16 + note D#, 16 + octave 4 + note A#, 16 + octave 5 + note D#, 8 + note F_, 8 + octave 4 + note D_, 16 + note D_, 16 + octave 4 + note D_, 8 + note D#, 8 + note G_, 8 + note A#, 8 + loopchannel 0, Music_YellowUnusedSong_branch_83075 +Music_YellowUnusedSong_Ch4: + notetype 12 + togglenoise 0 + note D_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + note D_, 4 + note D_, 4 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 4 +Music_YellowUnusedSong_branch_830c3: + note D_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + 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_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + note D_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + note D_, 4 + notetype 8 + note D_, 2 + 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 12 + note D_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + note D_, 4 + note D_, 4 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + notetype 8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype 12 + note D_, 4 + note D_, 4 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 4 + loopchannel 0, Music_YellowUnusedSong_branch_830c3 diff --git a/crysaudio/music/RSE/frontierbrain.asm b/crysaudio/music/RSE/frontierbrain.asm new file mode 100644 index 00000000..5fc23bf8 --- /dev/null +++ b/crysaudio/music/RSE/frontierbrain.asm @@ -0,0 +1,2418 @@ +Music_FrontierBrain: + dbw $80, Music_FrontierBrain_Ch1 + dbw $01, Music_FrontierBrain_Ch2 + dbw $02, Music_FrontierBrain_Ch3 + +Music_FrontierBrain_Ch1: + ftempo $62 + volume $77 + notetype $4, 194 + dutycycle 1 + tone $0002 + note __, 12 + octave 3 + note B_, 4 + octave 4 + note F_, 4 + note B_, 4 + octave 3 + note A#, 4 + octave 4 + note E_, 4 + note A#, 4 + octave 3 + note A_, 4 + octave 4 + note D#, 4 + note A_, 4 + octave 3 + note G#, 4 + octave 4 + note D_, 4 + note G#, 4 + octave 3 + note G_, 4 + octave 4 + note C#, 4 + note G_, 4 + octave 3 + note F#, 4 + octave 4 + note C_, 4 + note F#, 4 + octave 3 + note F_, 4 + note B_, 4 + octave 4 + note F_, 4 +Music_FrontierBrain_Loop1: + intensity 226 + note E_, 3 + note F_, 3 + note E_, 3 + note D_, 3 + note A_, 6 + octave 3 + note A_, 6 + intensity 178 + octave 4 + note A_, 6 + octave 3 + note A_, 6 + intensity 114 + octave 4 + note A_, 6 + octave 3 + note A_, 6 + intensity 82 + octave 4 + note A_, 6 + octave 3 + note A_, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 6 + intensity 209 + octave 4 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + intensity 225 + note E_, 3 + note F_, 3 + note E_, 3 + note D_, 3 + intensity 226 + note A_, 6 + octave 3 + note A_, 6 + intensity 178 + octave 4 + note A_, 6 + octave 3 + note A_, 6 + intensity 114 + octave 4 + note A_, 6 + octave 3 + note A_, 6 + intensity 82 + octave 4 + note A_, 6 + octave 3 + note A_, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 6 + intensity 209 + octave 4 + note G#, 4 + note G#, 2 + note G#, 2 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 4 + intensity 225 + note G#, 3 + note A_, 3 + note G#, 3 + note F#, 3 + intensity 226 + note B_, 6 + octave 3 + note B_, 6 + intensity 178 + octave 4 + note B_, 6 + octave 3 + note B_, 6 + intensity 114 + octave 4 + note B_, 6 + octave 3 + note B_, 6 + intensity 82 + octave 4 + note B_, 6 + octave 3 + note B_, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 6 + intensity 226 + dutycycle 2 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 5 + note C#, 2 + note D#, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 6 + note C#, 2 + note D#, 2 + note F#, 2 + note D#, 2 + note C#, 2 + octave 5 + note B_, 2 + note A_, 2 + note F#, 2 + note D#, 2 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + note F#, 2 + note D#, 8 + intensity 228 + dutycycle 1 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + note E_, 12 + note E_, 16 + note __, 2 + note E_, 12 + octave 3 + note B_, 3 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + note A_, 3 + octave 4 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + note E_, 12 + octave 3 + note B_, 3 + octave 4 + note C#, 3 + octave 3 + note B_, 3 + note G#, 9 + octave 4 + note E_, 12 + octave 3 + note B_, 6 + octave 4 + note E_, 6 + octave 3 + note B_, 6 + note G#, 6 + octave 4 + note E_, 12 + note G#, 6 + note E_, 6 + note B_, 6 + note G#, 6 + intensity 212 + octave 5 + note E_, 6 + intensity 228 + octave 4 + note B_, 6 + octave 5 + note G#, 6 + intensity 226 + dutycycle 2 + octave 4 + note E_, 3 + note G_, 3 + note B_, 3 + octave 5 + note E_, 3 + note F#, 3 + note E_, 3 + octave 4 + note B_, 3 + note G_, 3 + note B_, 3 + note G_, 3 + note B_, 3 + octave 5 + note E_, 3 + note F#, 3 + note E_, 3 + octave 4 + note B_, 3 + note G_, 3 + note B_, 3 + note G_, 3 + note B_, 3 + octave 5 + note E_, 3 + note F#, 3 + note G_, 3 + note F#, 3 + note E_, 3 + octave 4 + note B_, 3 + octave 5 + note E_, 3 + octave 4 + note B_, 3 + note G_, 3 + note E_, 3 + octave 3 + note B_, 3 + octave 4 + note E_, 3 + note G_, 3 + note E_, 3 + note G#, 3 + note B_, 3 + octave 5 + note E_, 3 + note F#, 3 + note E_, 3 + octave 4 + note B_, 3 + note G#, 3 + note E_, 3 + note G#, 3 + note B_, 3 + octave 5 + note E_, 3 + note F#, 3 + note E_, 3 + octave 4 + note B_, 3 + note G_, 3 + note E_, 3 + note G#, 3 + note B_, 3 + octave 5 + note E_, 3 + note G#, 3 + note B_, 3 + note G#, 3 + note E_, 3 + octave 4 + note B_, 3 + note G#, 3 + note E_, 3 + octave 5 + note E_, 3 + octave 4 + note B_, 3 + octave 5 + note E_, 3 + note F#, 3 + note G#, 3 + octave 6 + note C_, 3 + octave 5 + note A_, 3 + note G_, 3 + note E_, 3 + note C_, 3 + octave 4 + note A_, 3 + note G_, 3 + note E_, 3 + note C_, 3 + octave 3 + note G_, 3 + octave 4 + note C_, 3 + note E_, 3 + note G_, 3 + octave 5 + note C_, 3 + octave 4 + note G_, 3 + note E_, 3 + octave 3 + note B_, 3 + octave 4 + note D#, 3 + note F#, 3 + note A_, 3 + note B_, 3 + octave 5 + note D#, 3 + octave 4 + note B_, 3 + note F#, 3 + note D#, 3 + note F#, 3 + note B_, 3 + octave 5 + note D#, 3 + note F#, 3 + note D#, 3 + octave 4 + note B_, 3 + note F#, 3 + note C#, 3 + note E_, 3 + note G_, 3 + note G#, 3 + octave 5 + note C#, 3 + note D#, 3 + note E_, 3 + note D#, 3 + note C#, 3 + octave 4 + note G#, 3 + note F#, 3 + note E_, 3 + note C#, 3 + octave 3 + note G#, 3 + note F#, 3 + note E_, 16 + note __, 16 + note __, 13 + intensity 228 + dutycycle 1 + octave 2 + note A_, 3 + octave 3 + note C_, 3 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + octave 2 + note B_, 12 + octave 3 + note D_, 12 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note D_, 12 + octave 2 + note B_, 12 + octave 3 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + octave 2 + note B_, 12 + octave 3 + note D_, 12 + octave 2 + note B_, 16 + note __, 2 + note B_, 16 + note __, 2 + note B_, 16 + note __, 2 + note F#, 16 + note __, 2 + note B_, 12 + octave 3 + note D#, 12 + octave 2 + note B_, 16 + note __, 2 + note B_, 16 + note __, 2 + note B_, 12 + note B_, 16 + note __, 2 + note B_, 16 + note __, 2 + octave 3 + note C_, 12 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note C#, 16 + note __, 2 + note D_, 12 + octave 2 + note B_, 12 + dutycycle 0 + octave 4 + note G#, 6 + note G#, 12 + note G#, 12 + note G#, 12 + note G#, 12 + note G#, 12 + note G#, 6 + note A_, 12 + note G#, 12 + note G_, 6 + note C#, 6 + octave 3 + note G_, 6 + octave 4 + note D_, 6 + note C#, 6 + octave 3 + note G_, 6 + note E_, 6 + octave 4 + note G_, 6 + note F#, 6 + note C#, 6 + octave 3 + note F#, 6 + octave 4 + note C#, 6 + octave 3 + note B_, 6 + note F_, 6 + octave 2 + note B_, 6 + octave 3 + note F#, 6 + octave 4 + note G_, 4 + octave 3 + note B_, 4 + note G_, 4 + octave 4 + note F#, 4 + octave 3 + note A#, 4 + note F#, 4 + octave 4 + note F_, 4 + octave 3 + note A_, 4 + note F_, 4 + octave 4 + note E_, 4 + octave 3 + note G#, 4 + note E_, 4 + intensity 180 + octave 4 + note G_, 3 + note F#, 3 + note F_, 3 + note E_, 3 + note D#, 3 + note D_, 3 + note C#, 3 + note C_, 3 + octave 3 + note B_, 3 + note A#, 3 + note A_, 3 + note G#, 3 + note G_, 3 + note F#, 3 + note E_, 3 + note D_, 9 + intensity 228 + dutycycle 1 + octave 4 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + note C_, 12 + note C_, 16 + note __, 2 + note C_, 12 + octave 3 + note G_, 3 + note A_, 3 + note G_, 3 + note F_, 3 + octave 4 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + note C_, 12 + octave 3 + note G_, 3 + note A_, 3 + note G_, 3 + note E_, 9 + octave 4 + note C_, 12 + octave 3 + note G_, 6 + octave 4 + note C_, 6 + octave 3 + note G_, 6 + note E_, 6 + octave 4 + note C_, 12 + note E_, 6 + note C_, 6 + note G_, 6 + note E_, 6 + intensity 212 + octave 5 + note C_, 6 + intensity 228 + octave 4 + note G_, 6 + intensity 212 + octave 5 + note E_, 6 + intensity 226 + dutycycle 2 + octave 4 + note C_, 3 + note D#, 3 + note G_, 3 + octave 5 + note C_, 3 + note D_, 3 + note C_, 3 + octave 4 + note G_, 3 + note D#, 3 + note G_, 3 + note D#, 3 + note G_, 3 + octave 5 + note C_, 3 + note D_, 3 + note C_, 3 + octave 4 + note G_, 3 + note D#, 3 + note G_, 3 + note D#, 3 + note G_, 3 + octave 5 + note C_, 3 + note D_, 3 + note D#, 3 + note D_, 3 + note C_, 3 + octave 4 + note G_, 3 + octave 5 + note C_, 3 + octave 4 + note G_, 3 + note D#, 3 + note C_, 3 + octave 3 + note G_, 3 + octave 4 + note C_, 3 + note D#, 3 + note C_, 3 + note E_, 3 + note G_, 3 + octave 5 + note C_, 3 + note D_, 3 + note C_, 3 + octave 4 + note G_, 3 + note E_, 3 + note C_, 3 + note E_, 3 + note G_, 3 + octave 5 + note C_, 3 + note D_, 3 + note C_, 3 + octave 4 + note G_, 3 + note D#, 3 + note C_, 3 + note E_, 3 + note G_, 3 + octave 5 + note C_, 3 + note E_, 3 + note G_, 3 + note E_, 3 + note C_, 3 + octave 4 + note G_, 3 + note E_, 3 + note C_, 3 + octave 5 + note C_, 3 + octave 4 + note G_, 3 + octave 5 + note C_, 3 + note D_, 3 + note E_, 3 + note G#, 3 + note F_, 3 + note D#, 3 + note C_, 3 + octave 4 + note G#, 3 + note F_, 3 + note D#, 3 + note C_, 3 + octave 3 + note G#, 3 + note D#, 3 + note G#, 3 + octave 4 + note C_, 3 + note D#, 3 + note G#, 3 + note D#, 3 + note C_, 3 + octave 3 + note G_, 3 + note B_, 3 + octave 4 + note D_, 3 + note F_, 3 + note G_, 3 + note B_, 3 + note G_, 3 + note D_, 3 + octave 3 + note B_, 3 + octave 4 + note D_, 3 + note G_, 3 + note B_, 3 + octave 5 + note D_, 3 + octave 4 + note B_, 3 + note G_, 3 + note D_, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 11 + intensity 215 + dutycycle 1 + octave 3 + note A_, 4 + note __, 5 + note F_, 2 + note __, 1 + octave 4 + note C_, 16 + note __, 16 + note __, 4 + note D_, 12 + note F_, 3 + note G_, 3 + note F_, 3 + note D_, 3 + octave 3 + note B_, 16 + note __, 8 + note G_, 3 + note A_, 3 + note G_, 3 + note F#, 3 + note G_, 16 + note __, 14 + note G_, 2 + note __, 1 + note G_, 2 + note __, 1 + note G_, 16 + note __, 16 + note __, 16 + note B_, 4 + note __, 5 + note G_, 2 + note __, 1 + octave 4 + note D_, 16 + note __, 16 + note __, 4 + note D#, 16 + note __, 8 + note E_, 16 + note __, 16 + note __, 4 + intensity 231 + dutycycle 0 + note C#, 3 + note __, 1 + note C#, 3 + note __, 1 + note C#, 3 + note __, 1 + note C#, 16 + octave 3 + note B_, 3 + note __, 1 + note B_, 3 + note __, 1 + note B_, 16 + note __, 8 + intensity 215 + dutycycle 1 + note F_, 4 + note __, 5 + note C_, 2 + note __, 1 + note A_, 12 + octave 4 + note C_, 4 + note __, 5 + octave 3 + note A_, 2 + note __, 1 + octave 4 + note F_, 16 + note __, 16 + note __, 16 + note __, 6 + note C_, 6 + octave 3 + note F#, 4 + note __, 5 + note C_, 2 + note __, 1 + note A_, 12 + octave 4 + note C_, 4 + note __, 5 + octave 3 + note A_, 2 + note __, 1 + octave 4 + note F#, 16 + note __, 16 + note __, 4 + intensity 231 + octave 5 + note C_, 16 + note __, 8 + intensity 194 + octave 3 + note B_, 4 + octave 4 + note F_, 4 + note B_, 4 + octave 3 + note A#, 4 + octave 4 + note E_, 4 + note A#, 4 + octave 3 + note A_, 4 + octave 4 + note D#, 4 + note A_, 4 + octave 3 + note G#, 4 + octave 4 + note D_, 4 + note G#, 4 + octave 3 + note G_, 4 + octave 4 + note C#, 4 + note G_, 4 + octave 3 + note F#, 4 + octave 4 + note C_, 4 + note F#, 4 + octave 3 + note F_, 4 + note B_, 4 + octave 4 + note F_, 4 + loopchannel 0, Music_FrontierBrain_Loop1 +Music_FrontierBrain_Ch2: + notetype $4, 228 + dutycycle 3 + tone $0001 + octave 3 + note B_, 4 + octave 4 + note F_, 4 + note B_, 4 + octave 5 + note D_, 12 + note C#, 12 + note C_, 12 + octave 4 + note B_, 12 + note A#, 12 + note A_, 12 + note G#, 12 +Music_FrontierBrain_Loop2: + note __, 16 + note __, 8 + intensity 244 + octave 2 + note A_, 6 + note G#, 12 + note B_, 6 + octave 3 + note C_, 16 + note __, 2 + note D_, 6 + note D#, 12 + octave 2 + note B_, 6 + octave 3 + note C_, 6 + octave 2 + note A_, 3 + octave 3 + note C_, 3 + octave 2 + note A#, 6 + octave 3 + note D#, 16 + note __, 2 + note D_, 12 + note C_, 12 + octave 2 + note B_, 6 + note A_, 6 + note G#, 6 + note B_, 6 + note E_, 6 + note F_, 6 + note E_, 6 + note D#, 3 + note F_, 3 + note E_, 6 + note E_, 6 + note F_, 6 + note A_, 6 + note G#, 12 + note B_, 6 + octave 3 + note C_, 16 + note __, 2 + note D#, 6 + note F_, 12 + note D_, 6 + note D#, 6 + note C_, 3 + note D_, 3 + note C#, 6 + note G_, 16 + note __, 2 + note F_, 12 + note D#, 12 + octave 2 + note B_, 6 + note A_, 6 + note G#, 6 + note B_, 6 + note E_, 6 + note F_, 6 + note E_, 6 + note D#, 6 + note E_, 16 + note __, 2 + intensity 183 + octave 3 + note E_, 12 + note __, 12 + note F_, 12 + note __, 12 + note F#, 12 + note __, 12 + note G_, 12 + note __, 6 + note E_, 6 + note __, 6 + note F_, 6 + note __, 6 + note F#, 6 + note __, 6 + note G_, 6 + note __, 6 + note G#, 6 + note __, 6 + note A_, 6 + note __, 6 + note A#, 6 + note __, 6 + note B_, 6 + note __, 6 + intensity 247 + octave 4 + note E_, 16 + note __, 2 + note F#, 6 + note __, 6 + note G#, 6 + note __, 6 + note A_, 6 + note G#, 16 + note __, 2 + note A_, 6 + note __, 6 + note B_, 12 + notetype $8, 247 + note G#, 16 + note __, 8 + note E_, 16 + note __, 8 + notetype $4, 247 + note __, 6 + note E_, 16 + note __, 2 + note F#, 6 + note __, 6 + note G#, 12 + note A_, 6 + note G#, 12 + note A_, 6 + note __, 6 + note B_, 16 + note __, 2 + intensity 226 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + intensity 229 + octave 3 + note B_, 16 + note __, 2 + intensity 226 + octave 4 + note E_, 12 + octave 3 + note B_, 12 + octave 4 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + intensity 229 + octave 3 + note B_, 16 + note __, 2 + intensity 226 + octave 4 + note E_, 12 + note F#, 12 + note E_, 16 + note __, 2 + note E_, 16 + note __, 2 + note D#, 6 + note C#, 12 + intensity 229 + note D#, 16 + note __, 2 + note E_, 6 + note __, 6 + note F#, 12 + notetype $C, 229 + note G#, 16 + notetype $4, 229 + note __, 16 + note __, 16 + note __, 10 + intensity 226 + octave 3 + note C#, 3 + note G_, 3 + note G#, 16 + note __, 2 + note G#, 16 + note __, 2 + note G#, 16 + note __, 2 + note G#, 16 + note __, 2 + note F#, 12 + note A_, 12 + note G#, 16 + note __, 2 + note G#, 16 + note __, 2 + note G#, 16 + note __, 2 + note G#, 16 + note __, 2 + note A_, 12 + note F#, 6 + intensity 231 + octave 4 + note E_, 3 + note F#, 3 + note G#, 6 + note C#, 12 + octave 5 + note C#, 16 + note __, 2 + note E_, 16 + note __, 2 + octave 4 + note E_, 3 + note F#, 3 + note G#, 12 + note F#, 12 + note E_, 12 + note D#, 6 + note E_, 6 + note D#, 6 + note C#, 6 + notetype $C, 231 + note D#, 16 + notetype $4, 231 + note __, 16 + note __, 2 + note D#, 3 + note E_, 3 + note F#, 6 + octave 3 + note B_, 12 + octave 4 + note B_, 16 + note __, 2 + octave 5 + note D#, 16 + note __, 2 + octave 4 + note D#, 3 + note E_, 3 + note F#, 12 + note B_, 12 + note A_, 12 + note G#, 6 + note A_, 6 + note G#, 6 + note F#, 6 + notetype $C, 231 + note G#, 16 + notetype $4, 231 + note __, 16 + note __, 2 + intensity 229 + dutycycle 0 + note G#, 3 + note B_, 3 + octave 5 + note C#, 6 + note C#, 12 + note C#, 12 + note C#, 12 + note C#, 12 + note C#, 12 + note C#, 6 + note E_, 12 + note D#, 12 + note D_, 16 + note __, 8 + note C#, 16 + note __, 8 + note C_, 16 + note __, 8 + octave 4 + note B_, 16 + note __, 8 + octave 5 + note D_, 12 + note C#, 12 + note C_, 12 + octave 4 + note B_, 12 + octave 5 + note D_, 3 + note C#, 3 + note C_, 3 + octave 4 + note B_, 3 + note A#, 3 + note A_, 3 + note G#, 3 + note G_, 3 + note F#, 3 + note F_, 3 + note E_, 3 + note D#, 3 + note D_, 3 + note C#, 3 + octave 3 + note B_, 3 + note G_, 3 + note __, 6 + intensity 231 + dutycycle 3 + octave 4 + note C_, 16 + note __, 2 + note D_, 6 + note __, 6 + note E_, 6 + note __, 6 + note F_, 6 + note E_, 16 + note __, 2 + note F_, 6 + note __, 6 + note G_, 12 + notetype $8, 231 + note E_, 16 + note __, 8 + note C_, 16 + note __, 8 + notetype $4, 231 + note __, 6 + note C_, 16 + note __, 2 + note D_, 6 + note __, 6 + note E_, 12 + note F_, 6 + note E_, 12 + note F_, 6 + note __, 6 + note G_, 16 + note __, 2 + intensity 226 + octave 5 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + intensity 229 + octave 4 + note G_, 16 + note __, 2 + intensity 226 + octave 5 + note C_, 12 + octave 4 + note G_, 12 + octave 5 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + intensity 229 + octave 4 + note G_, 16 + note __, 2 + intensity 226 + octave 5 + note C_, 12 + note D_, 12 + note C_, 16 + note __, 2 + note C_, 16 + note __, 2 + octave 4 + note B_, 6 + note A_, 12 + intensity 229 + note B_, 16 + note __, 2 + octave 5 + note C_, 12 + notetype $8, 229 + note D_, 16 + notetype $4, 229 + note __, 16 + note __, 3 + intensity 241 + octave 4 + note A_, 3 + note B_, 3 + octave 5 + note C_, 3 + note E_, 9 + octave 4 + note A_, 3 + notetype $8, 247 + note A_, 16 + notetype $4, 247 + note __, 4 + octave 5 + note E_, 12 + note D_, 12 + note C_, 12 + note D_, 12 + octave 4 + note B_, 3 + octave 5 + note C_, 3 + octave 4 + note B_, 3 + note A_, 3 + notetype $C, 247 + note B_, 16 + notetype $4, 247 + note __, 16 + note __, 11 + intensity 241 + note G_, 3 + note A_, 3 + note B_, 3 + octave 5 + note D_, 9 + octave 4 + note G_, 3 + intensity 247 + note G_, 16 + note __, 16 + note __, 4 + note B_, 12 + note G_, 12 + octave 5 + note G_, 12 + note F_, 12 + note E_, 3 + note F_, 3 + note E_, 3 + note D_, 3 + note E_, 16 + note __, 8 + intensity 215 + dutycycle 2 + octave 4 + note A_, 2 + note __, 2 + note A_, 2 + note __, 2 + note A_, 2 + note __, 2 + note A_, 16 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 12 + intensity 241 + dutycycle 3 + note A_, 4 + note B_, 4 + octave 5 + note C_, 4 + note E_, 9 + octave 4 + note A_, 3 + intensity 247 + note A_, 16 + note __, 16 + note __, 4 + intensity 231 + octave 3 + note F_, 6 + note C_, 12 + note F_, 12 + note A_, 6 + intensity 241 + octave 4 + note A_, 4 + note B_, 4 + octave 5 + note C_, 4 + note E_, 9 + octave 4 + note A_, 3 + notetype $8, 247 + note A_, 16 + notetype $4, 247 + note __, 4 + intensity 231 + octave 3 + note F#, 6 + note C_, 12 + note F#, 12 + note A_, 12 + octave 4 + note C_, 6 + octave 5 + notetype $C, 231 + note D_, 16 + notetype $4, 231 + note __, 16 + note __, 16 + note __, 4 + loopchannel 0, Music_FrontierBrain_Loop2 +Music_FrontierBrain_Ch3: + notetype $4, 20 + note __, 12 + octave 2 + note F#, 4 + octave 3 + note C_, 4 + note F#, 4 + octave 2 + note F_, 4 + note B_, 4 + octave 3 + note F_, 4 + octave 2 + note E_, 4 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note D#, 4 + note A_, 4 + octave 3 + note D#, 4 + octave 2 + note D_, 4 + note G#, 4 + octave 3 + note D_, 4 + octave 2 + note C#, 4 + note G_, 4 + octave 3 + note C#, 4 + octave 2 + note C_, 4 + note F#, 4 + octave 3 + note C_, 4 +Music_FrontierBrain_Loop3: + octave 2 + note B_, 3 + octave 3 + note C_, 3 + octave 2 + note B_, 3 + note A#, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note B_, 6 + octave 3 + note D#, 3 + note D_, 3 + note C_, 6 + octave 2 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 9 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + octave 3 + note C_, 3 + note __, 3 + note D_, 6 + note D#, 3 + note D_, 3 + octave 2 + note A#, 9 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note B_, 6 + octave 3 + note D#, 3 + note D_, 3 + note C_, 6 + octave 2 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 9 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + note A_, 3 + note __, 3 + octave 3 + note C_, 3 + note __, 3 + note D_, 6 + note D#, 3 + note D_, 3 + octave 2 + note A#, 6 + note E_, 4 + note __, 2 + note E_, 4 + note __, 2 + octave 3 + note E_, 12 + octave 2 + note E_, 4 + note __, 2 + note E_, 4 + note __, 2 + octave 3 + note F_, 12 + octave 2 + note E_, 4 + note __, 2 + note E_, 4 + note __, 2 + octave 3 + note F#, 12 + octave 2 + note E_, 4 + note __, 2 + note E_, 4 + note __, 2 + octave 3 + note G_, 12 + octave 2 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note F_, 6 + octave 2 + note E_, 6 + octave 3 + note F#, 6 + octave 2 + note E_, 6 + octave 3 + note G_, 6 + octave 2 + note E_, 6 + octave 3 + note G#, 6 + octave 2 + note E_, 6 + octave 3 + note A_, 6 + octave 2 + note E_, 6 + octave 3 + note A#, 6 + octave 2 + note E_, 6 + octave 3 + note B_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 3 + note D#, 3 + note E_, 6 + octave 2 + note E_, 3 + note __, 3 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note B_, 6 + note E_, 6 + octave 3 + note E_, 3 + octave 2 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 3 + note D#, 3 + note E_, 6 + octave 2 + note E_, 3 + note __, 3 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note B_, 6 + note E_, 6 + octave 3 + note E_, 3 + octave 2 + note B_, 3 + note G#, 3 + note F#, 3 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note E_, 6 + octave 3 + note E_, 3 + note D#, 3 + note E_, 6 + octave 2 + note E_, 3 + note __, 3 + note E_, 6 + octave 3 + note E_, 6 + octave 2 + note B_, 6 + note E_, 6 + octave 3 + note E_, 3 + octave 2 + note B_, 3 + note G#, 3 + note F#, 3 + note D_, 6 + octave 3 + note D_, 6 + octave 2 + note D_, 6 + octave 3 + note D_, 6 + octave 2 + note D_, 6 + octave 3 + note D_, 6 + octave 2 + note D_, 6 + octave 3 + note D_, 3 + note C#, 3 + note D_, 6 + octave 2 + note D_, 6 + note D_, 6 + octave 3 + note D_, 6 + octave 2 + note A_, 6 + note D_, 6 + octave 3 + note D_, 3 + octave 2 + note A_, 3 + note F#, 3 + note E_, 3 + note C#, 6 + octave 3 + note C#, 6 + octave 2 + note C#, 6 + octave 3 + note C#, 6 + octave 2 + note C#, 6 + octave 3 + note C#, 6 + octave 2 + note C#, 6 + octave 3 + note C#, 3 + note C_, 3 + note C#, 6 + octave 2 + note C#, 6 + note C#, 6 + octave 3 + note C#, 6 + octave 2 + note G#, 6 + note C#, 6 + octave 3 + note C#, 3 + octave 2 + note G#, 3 + note F_, 3 + note D#, 3 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 3 + octave 2 + note B_, 3 + note B_, 6 + octave 1 + note B_, 6 + note B_, 6 + octave 2 + note B_, 6 + note F#, 6 + octave 1 + note B_, 6 + octave 2 + note B_, 3 + note F#, 3 + note D#, 3 + note C#, 3 + note C#, 6 + note G#, 6 + note C#, 6 + note G#, 6 + note C#, 6 + note G_, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + note C#, 6 + note G_, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + note E_, 6 + note F#, 6 + note E_, 3 + note D_, 3 + octave 1 + note B_, 6 + octave 2 + note C#, 6 + note G#, 6 + note C#, 6 + note G#, 6 + note C#, 6 + note G_, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + note C#, 6 + note G_, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + note E_, 6 + note F#, 6 + note E_, 3 + note D_, 3 + octave 1 + note B_, 6 + octave 2 + note C#, 6 + note G#, 6 + note C#, 6 + note G#, 6 + note C#, 6 + note G_, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + note C#, 6 + note G_, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + note E_, 6 + note F#, 6 + note E_, 3 + note D_, 3 + octave 1 + note B_, 6 + octave 2 + note C#, 6 + note G_, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + note E_, 6 + note F#, 6 + note D_, 6 + octave 1 + note B_, 6 + octave 2 + note C#, 6 + note G#, 6 + note C#, 6 + note G#, 6 + note C#, 6 + note G_, 6 + octave 3 + note D_, 6 + octave 2 + note G_, 6 + octave 1 + note B_, 6 + octave 2 + note F#, 6 + note B_, 6 + note F_, 6 + note D#, 6 + note E_, 6 + note D#, 3 + note C#, 3 + octave 1 + note A#, 6 + note B_, 6 + octave 2 + note F#, 6 + octave 1 + note B_, 6 + octave 2 + note F#, 6 + octave 1 + note B_, 6 + octave 2 + note F_, 6 + note B_, 6 + note F_, 6 + octave 1 + note B_, 6 + octave 2 + note F#, 6 + note B_, 6 + note F#, 6 + note D_, 6 + note E_, 6 + note D#, 3 + note C#, 3 + octave 1 + note A#, 6 + note B_, 6 + octave 2 + note F#, 6 + octave 1 + note B_, 6 + octave 2 + note F#, 6 + octave 1 + note B_, 6 + octave 2 + note F_, 6 + note B_, 6 + note F_, 6 + note C#, 6 + note G#, 6 + octave 3 + note C#, 6 + octave 2 + note G#, 6 + note C#, 6 + note D_, 6 + octave 1 + note B_, 6 + octave 2 + note D_, 6 + note C#, 6 + note G#, 6 + note C#, 6 + note G#, 6 + note C#, 6 + note D_, 6 + octave 1 + note B_, 6 + octave 2 + note D_, 6 + note C#, 6 + note C#, 6 + note __, 6 + note C#, 6 + note __, 6 + note C#, 6 + note __, 6 + note C#, 6 + note __, 6 + note C#, 6 + note __, 6 + note C#, 6 + note C#, 6 + note __, 6 + note C#, 6 + note __, 6 + note G#, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + octave 3 + note C_, 6 + octave 2 + note F#, 6 + note B_, 6 + note F_, 6 + note A#, 6 + note E_, 6 + note A_, 6 + note D#, 6 + note G#, 6 + note D_, 6 + note G_, 6 + note C#, 6 + note F#, 6 + note G#, 6 + octave 3 + note C#, 6 + octave 2 + note G_, 6 + octave 3 + note C_, 6 + octave 2 + note F#, 6 + note B_, 6 + note F_, 6 + note A#, 6 + note E_, 6 + note A_, 6 + note D#, 6 + note G#, 6 + note D_, 6 + note G_, 6 + note C#, 6 + note F#, 6 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 3 + octave 2 + note B_, 3 + octave 3 + note C_, 6 + octave 2 + note C_, 3 + note __, 3 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note G_, 6 + note C_, 6 + octave 3 + note C_, 3 + octave 2 + note G_, 3 + note E_, 3 + note D_, 3 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 3 + octave 2 + note B_, 3 + octave 3 + note C_, 6 + octave 2 + note C_, 3 + note __, 3 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note G_, 6 + note C_, 6 + octave 3 + note C_, 3 + octave 2 + note G_, 3 + note E_, 3 + note D_, 3 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note C_, 6 + octave 3 + note C_, 3 + octave 2 + note B_, 3 + octave 3 + note C_, 6 + octave 2 + note C_, 3 + note __, 3 + note C_, 6 + octave 3 + note C_, 6 + octave 2 + note G_, 6 + note C_, 6 + octave 3 + note C_, 3 + octave 2 + note G_, 3 + note E_, 3 + note D_, 3 + octave 1 + note A#, 6 + octave 2 + note A#, 6 + octave 1 + note A#, 6 + octave 2 + note A#, 6 + octave 1 + note A#, 6 + octave 2 + note A#, 6 + octave 1 + note A#, 6 + octave 2 + note A#, 3 + note A_, 3 + note A#, 6 + octave 1 + note A#, 6 + note A#, 6 + octave 2 + note A#, 6 + note F_, 6 + octave 1 + note A#, 6 + octave 2 + note A#, 3 + note F_, 3 + note D_, 3 + note C_, 3 + octave 1 + note A_, 6 + octave 2 + note A_, 6 + octave 1 + note A_, 6 + octave 2 + note A_, 6 + octave 1 + note A_, 6 + octave 2 + note A_, 6 + octave 1 + note A_, 6 + octave 2 + note A_, 3 + note G#, 3 + note A_, 6 + octave 1 + note A_, 6 + note A_, 6 + octave 2 + note A_, 6 + note E_, 6 + octave 1 + note A_, 6 + octave 2 + note A_, 3 + note E_, 3 + note C#, 3 + octave 1 + note B_, 3 + note G#, 6 + octave 2 + note G#, 6 + octave 1 + note G#, 6 + octave 2 + note G#, 6 + octave 1 + note G#, 6 + octave 2 + note G#, 6 + octave 1 + note G#, 6 + octave 2 + note G#, 3 + note G_, 3 + note G_, 6 + octave 1 + note G_, 6 + note G_, 6 + octave 2 + note G_, 6 + note D_, 6 + octave 1 + note G_, 6 + octave 2 + note G_, 3 + note D_, 3 + octave 1 + note B_, 3 + note A_, 3 + octave 2 + note G_, 6 + note __, 6 + note D_, 6 + note __, 6 + octave 1 + note B_, 6 + note __, 6 + octave 2 + note D_, 6 + note __, 6 + note F_, 6 + octave 3 + note C_, 6 + note F_, 6 + note C_, 6 + octave 2 + note F_, 6 + octave 3 + note C_, 6 + note F_, 3 + note G_, 3 + note F_, 3 + note C_, 3 + note F_, 6 + octave 2 + note F_, 6 + note __, 6 + octave 3 + note C_, 6 + note __, 6 + note F_, 6 + note __, 6 + note A_, 6 + octave 2 + note F_, 6 + note B_, 6 + octave 3 + note G_, 6 + note D_, 6 + octave 2 + note B_, 6 + note A_, 6 + note B_, 3 + octave 3 + note D_, 3 + octave 2 + note B_, 3 + note A_, 3 + note G_, 6 + note D_, 6 + note __, 6 + note G_, 6 + note __, 6 + note B_, 6 + note __, 6 + octave 3 + note D_, 6 + octave 2 + note E_, 6 + note B_, 6 + octave 3 + note E_, 6 + octave 2 + note B_, 6 + note E_, 6 + note B_, 6 + octave 3 + note E_, 3 + note F_, 3 + note E_, 3 + octave 2 + note B_, 3 + note E_, 6 + octave 1 + note B_, 6 + note __, 6 + octave 2 + note E_, 6 + note __, 6 + note G#, 6 + note __, 6 + note B_, 6 + note A_, 6 + octave 3 + note C#, 6 + note A_, 6 + note E_, 6 + octave 2 + note A_, 6 + octave 3 + note E_, 6 + octave 4 + note C#, 3 + note D_, 3 + note C#, 3 + octave 3 + note A_, 3 + octave 2 + note A_, 6 + note E_, 6 + note __, 6 + note A_, 6 + note __, 6 + octave 3 + note C#, 6 + note __, 6 + note E_, 6 + octave 2 + note F_, 6 + octave 3 + note C_, 6 + note F_, 6 + note C_, 6 + octave 2 + note F_, 6 + octave 3 + note C_, 6 + note F_, 3 + note G_, 3 + note F_, 3 + note C_, 3 + note F_, 6 + octave 2 + note F_, 6 + note __, 6 + octave 3 + note C_, 6 + note __, 6 + note F_, 6 + note __, 6 + note A_, 6 + octave 2 + note F#, 6 + octave 3 + note E_, 6 + note F#, 6 + note C_, 6 + octave 2 + note F#, 6 + octave 3 + note C_, 6 + note F#, 3 + note G_, 3 + note F#, 3 + note C_, 3 + note F#, 6 + octave 2 + note A_, 6 + note __, 6 + octave 3 + note C_, 6 + note __, 6 + note E_, 6 + note __, 6 + note A_, 6 + octave 2 + note F#, 4 + octave 3 + note C_, 4 + note F#, 4 + octave 2 + note F_, 4 + note B_, 4 + octave 3 + note F_, 4 + octave 2 + note E_, 4 + note A#, 4 + octave 3 + note E_, 4 + octave 2 + note D#, 4 + note A_, 4 + octave 3 + note D#, 4 + octave 2 + note D_, 4 + note G#, 4 + octave 3 + note D_, 4 + octave 2 + note C#, 4 + note G_, 4 + octave 3 + note C#, 4 + octave 2 + note C_, 4 + note F#, 4 + octave 3 + note C_, 4 + loopchannel 0, Music_FrontierBrain_Loop3 diff --git a/crysaudio/music/TCG/battletheme1.asm b/crysaudio/music/TCG/battletheme1.asm new file mode 100644 index 00000000..48ca7a83 --- /dev/null +++ b/crysaudio/music/TCG/battletheme1.asm @@ -0,0 +1,2019 @@ + +Music_TCG_BattleTheme1: + dbw $c0, Music_TCG_BattleTheme1_Ch1 + dbw $01, Music_TCG_BattleTheme1_Ch2 + dbw $02, Music_TCG_BattleTheme1_Ch3 + dbw $03, Music_TCG_BattleTheme1_Ch4 + + +Music_TCG_BattleTheme1_Ch1: ; f532a (3d:532a) + stereopanning $f + tone $0002 + notetype $c, $b2 + forceoctave 2 + + tempo 20* 7 + ;musicdc 17 + vibrato 20, 8 + ;musice8 8 + dutycycle 2 +.MainLoop + octave 2 +rept 7 + note __, 16 +endr + note __, 9 +rept 2 + note __, 3 + callchannel Branch_f54f9 + volume 160 + tempo 20* 1 + note F_, 4 + note F#, 3 + ;no_fade + tempo 20* 7 + note F#, 1 + volume 55 + note F#, 1 + decoctave + volume 160 + note A_, 1 + note __, 2 + incoctave + volume 160 + note D_, 10 + volume 55 + note D_, 12 + callchannel Branch_f54f9 + volume 160 + note F#, 2 + volume 55 + note F#, 1 + volume 160 + note A_, 13 + volume 55 + note A_, 10 + volume 160 + note F#, 1 + volume 55 + note F#, 1 + volume 160 + note F#, 1 + note G_, 1 + note A_, 1 + volume 55 + note A_, 1 + volume 160 + tempo 20* 1 + note A#, 4 + note B_, 3 + ;no_fade + tempo 20* 7 + note B_, 15 + volume 55 + note B_, 4 + volume 160 + tempo 20* 1 + note A#, 4 + note B_, 3 + ;no_fade + tempo 20* 7 + note B_, 3 + note A_, 3 + volume 55 + note A_, 1 + volume 160 + note G_, 2 + volume 55 + note G_, 2 + volume 160 + tempo 20* 1 + note G#, 4 + note A_, 3 + ;no_fade + tempo 20* 7 + note A_, 15 + volume 55 + note A_, 4 + volume 160 + tempo 20* 1 + note G#, 4 + note A_, 3 + ;no_fade + tempo 20* 7 + note A_, 3 + note G_, 4 + note F#, 2 + volume 55 + note F#, 2 + volume 160 + tempo 20* 1 + note F#, 4 + note G_, 3 + ;no_fade + tempo 20* 7 + note G_, 15 + volume 55 + note G_, 4 + volume 160 + tempo 20* 1 + note F#, 4 + note G_, 3 + ;no_fade + tempo 20* 7 + note G_, 3 + note F#, 4 + note E_, 3 + volume 55 + note E_, 1 + volume 160 + tempo 20* 1 + note D#, 4 + note E_, 3 + ;no_fade + tempo 20* 7 + note E_, 1 + volume 55 + note E_, 1 + volume 160 + note D_, 13 + volume 55 + note D_, 9 + decoctave +endr + incoctave + dutycycle 1 + volume 160 + tempo 20* 1 + note C#, 4 + note D_, 3 + ;no_fade + tempo 20* 7 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Branch_f5538 + tempo 20* 1 + note G#, 4 + note A_, 3 + ;no_fade + tempo 20* 7 + note A_, 1 + volume 55 + note A_, 1 + volume 160 + note F#, 5 + volume 55 + note F#, 1 + decoctave + volume 160 + note A_, 1 + incoctave + tempo 20* 1 + note D_, 4 + volume 55 + note D_, 3 + volume 160 + note F#, 4 + volume 55 + note F#, 3 + volume 160 + note A_, 4 + volume 55 + note A_, 3 + tempo 20* 7 + note __, 3 + decoctave + dutycycle 1 + volume 160 + ;musice8 8 +rept 3 + note A_, 1 + note __, 2 +endr + incoctave + tempo 20* 1 + note C#, 4 + note D_, 3 + ;no_fade + tempo 20* 7 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Branch_f5538 + tempo 20* 1 + note G#, 4 + note A_, 3 + ;no_fade + tempo 20* 7 + note A_, 5 + ;no_fade + note A_, 10 + ;no_fade + note A_, 6 + volume 55 + note A_, 2 + incoctave + volume 160 + tempo 20* 1 + note C#, 4 + note D_, 3 + ;no_fade + tempo 20* 7 + note D_, 2 + note C#, 1 + volume 55 + note C#, 2 + decoctave + volume 160 + note B_, 1 + volume 55 + note B_, 1 + volume 160 + tempo 20* 1 + note A#, 4 + note B_, 3 + ;no_fade + tempo 20* 7 + note B_, 1 + volume 55 + note B_, 1 + volume 160 + note A_, 13 + ;no_fade + note A_, 6 + volume 55 + note A_, 2 + decoctave + volume 121 + tempo 20* 1 + note A_, 5 + incoctave + note C#, 5 + note E_, 4 + note A_, 5 + incoctave + note C#, 5 + note E_, 4 + decoctave + note C#, 5 + note E_, 5 + note A_, 4 + incoctave + note C#, 5 + note E_, 5 + note A_, 4 + decoctave + callchannel Branch_f5580 + volume 160 + note A_, 2 + ;no_fade + note A_, 8 + ;no_fade + note A_, 8 + ;no_fade + note A_, 6 + dutycycle 1 + volume 160 + tempo 20* 1 + decoctave + note B_, 4 + incoctave + note C_, 3 + tempo 20* 7 + note C#, 1 + note __, 1 + note C#, 1 + note D_, 2 + note E_, 2 + note G_, 2 + dutycycle 2 + callchannel Branch_f5580 + volume 160 + tempo 20* 1 + note G#, 4 + note A_, 3 + ;no_fade + tempo 20* 7 + note A_, 5 + note G_, 2 + note F#, 2 + volume 55 + note F#, 2 + volume 160 + note E_, 2 + volume 55 + note E_, 2 + volume 160 + tempo 20* 1 + note F#, 4 + note G_, 3 + ;no_fade + tempo 20* 7 + note G_, 5 + note F#, 2 + note E_, 2 + volume 55 + note E_, 2 + volume 160 + note D_, 2 + volume 55 + note D_, 2 + volume 160 + note D_, 8 + ;no_fade + note D_, 8 + note D_, 8 + ;no_fade + note D_, 8 + volume 55 + note D_, 2 + volume 160 + note D_, 12 + volume 55 + note D_, 2 + volume 160 + note D_, 6 + ;no_fade + note D_, 8 + note __, 4 + loopchannel 0, .MainLoop + +Branch_f54f9: + octave 2 + volume 160 + note A_, 1 + note B_, 1 + incoctave + note D_, 1 + volume 55 + note D_, 1 + volume 160 + tempo 20* 1 + note F_, 4 + note F#, 3 + ;no_fade + tempo 20* 7 + note F#, 10 + volume 55 + note F#, 1 + volume 160 + note D_, 3 + volume 55 + note D_, 1 + volume 160 + tempo 20* 1 + note D#, 4 + note E_, 3 + ;no_fade + tempo 20* 7 + note E_, 5 + volume 55 + note E_, 2 + volume 160 + tempo 20* 1 + note F#, 4 + note G_, 3 + ;no_fade + tempo 20* 7 + note G_, 2 + note F#, 1 + volume 55 + note F#, 2 + volume 160 + note E_, 1 + volume 55 + note E_, 1 + endchannel + +Branch_f5538: + note C_, 1 + note __, 2 + decoctave + note G_, 1 + note __, 2 + note G_, 1 + note __, 2 + dutycycle 2 + volume 160 + note G_, 1 + incoctave + tempo 20* 1 + note C_, 4 + volume 55 + note C_, 3 + volume 160 + note E_, 4 + volume 55 + note E_, 3 + volume 160 + note G_, 4 + volume 55 + note G_, 3 + tempo 20* 7 + note __, 3 + dutycycle 1 + volume 160 + ;musice8 8 + decoctave +rept 3 + note G_, 1 + note __, 2 +endr + incoctave + dutycycle 2 + volume 160 + tempo 20* 1 + note A#, 4 + note B_, 3 + ;no_fade + tempo 20* 7 + note B_, 2 + note A_, 1 + volume 55 + note A_, 1 + volume 160 + note G_, 1 + volume 55 + note G_, 1 + volume 160 + endchannel + +Branch_f5580: + tempo 20* 1 + volume 160 + note F_, 4 + note F#, 3 + ;no_fade + tempo 20* 7 + note F#, 9 + volume 55 + note F#, 2 + volume 160 + note G_, 1 + volume 55 + note G_, 1 + volume 160 + note A_, 1 + volume 55 + note A_, 1 + volume 160 + note B_, 2 + volume 55 + note B_, 2 + incoctave + volume 160 + tempo 20* 1 + note F_, 4 + note F#, 3 + ;no_fade + tempo 20* 7 + note F#, 7 + note E_, 1 + volume 55 + note E_, 1 + volume 160 + note D_, 1 + volume 55 + note D_, 1 + volume 160 + note C#, 2 + volume 55 + note C#, 1 + decoctave + volume 160 + note A_, 9 + note F#, 1 + volume 55 + note F#, 1 + volume 160 + tempo 20* 1 + note A#, 4 + note B_, 3 + ;no_fade + tempo 20* 7 + note B_, 8 + volume 55 + note B_, 1 + volume 160 + note A_, 4 + note G_, 4 + note F#, 10 + note G_, 1 + volume 55 + note G_, 1 + volume 160 + note A_, 1 + volume 55 + note A_, 1 + volume 160 + note D_, 10 + note E_, 2 + note F#, 2 + volume 55 + note F#, 2 + endchannel + + +Music_TCG_BattleTheme1_Ch2: ; f55e7 (3d:55e7) + forceoctave 2 + stereopanning $f + tone $0001 + notetype $c, $c2 + tempo 20* 7 + ;musicdc 17 + vibrato $12, $15;vibrato 20, 8 + ;musice8 8 +.MainLoop + dutycycle 1 + volume 144 + octave 2 +rept 4 +rept 3 + note D_, 1 + note __, 2 +endr + note __, 1 + decoctave + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 + incoctave +endr +rept 4 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note A_, 2 + callchannel Branch_f59f9 +endr + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + incoctave + volume 162 + ;musice8 6 + note D_, 2 + callchannel Branch_f59f9 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + incoctave + volume 162 + ;musice8 6 + note C_, 2 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 3 + decoctave + note A_, 1 + note __, 1 + incoctave + dutycycle 2 + volume 162 + ;musice8 6 + note G_, 1 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note B_, 1 + note __, 2 + incoctave +rept 3 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + incoctave + volume 162 + ;musice8 6 + note D_, 2 + callchannel Branch_f59f9 +endr + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + incoctave + volume 162 + ;musice8 6 + note C_, 2 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 3 + decoctave + note A_, 1 + note __, 1 + incoctave + dutycycle 2 + volume 162 + ;musice8 6 + note G_, 1 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note B_, 1 + note __, 2 + incoctave + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + incoctave + volume 162 + ;musice8 6 + note D_, 2 + callchannel Branch_f59f9 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + incoctave + volume 162 + ;musice8 6 + note D_, 2 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note A_, 2 + dutycycle 1 + volume 144 + ;musice8 8 + note F#, 1 + note __, 1 +rept 2 + note G_, 1 + note __, 2 + note G_, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note G_, 2 + dutycycle 1 + volume 144 + ;musice8 8 + note G_, 1 + note __, 3 + note D_, 1 + note __, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note G_, 1 + dutycycle 1 + volume 144 + ;musice8 8 + note E_, 1 + note __, 2 +endr + note F#, 1 + note __, 2 + note F#, 1 + dutycycle 2 + volume 162 + ;musice8 6 + incoctave + note C#, 2 + callchannel Branch_f5a17 + octave 2 + note F#, 1 + note __, 2 + note F#, 1 + incoctave + dutycycle 2 + volume 162 + ;musice8 6 + note E_, 2 + callchannel Branch_f5a17 + note E_, 1 + note __, 2 + note E_, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note G_, 2 + dutycycle 1 + volume 144 + ;musice8 8 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note B_, 1 + dutycycle 1 + volume 144 + ;musice8 8 + note G_, 1 + note __, 2 + note A_, 1 + note __, 2 + note A_, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note G_, 2 + dutycycle 1 + volume 144 + ;musice8 8 + note A_, 1 + note __, 3 + note E_, 1 + note __, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note A_, 1 + dutycycle 1 + volume 144 + ;musice8 8 + note A_, 1 + note __, 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note A_, 2 + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 3 + decoctave + note A_, 1 + note __, 1 + incoctave + dutycycle 2 + volume 162 + ;musice8 6 + note A_, 1 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note B_, 1 + note __, 2 + incoctave + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note A_, 2 + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 3 + decoctave + note A_, 1 + note __, 1 + incoctave + dutycycle 2 + volume 112 + ;musice4 0 + note E_, 1 + note F#, 1 + note A_, 1 + note __, 1 + volume 112 + callchannel Branch_f594d + volume 112 + octave 3 + tempo 20* 1 + note C#, 4 + note D_, 3 + ;no_fade + tempo 20* 7 + note D_, 1 + note __, 1 + decoctave + note F#, 1 + volume 162 + ;musice8 6 + note F#, 2 + volume 112 + ;musice8 8 + note A_, 10 + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + volume 162 + ;musice8 6 + incoctave + note D_, 2 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 3 + decoctave + note A_, 1 + note __, 1 + incoctave + dutycycle 2 + volume 112 + note E_, 1 + note F#, 1 + note A_, 1 + note __, 1 + callchannel Branch_f594d + volume 112 + octave 3 + note D_, 2 + note __, 1 + note F#, 13 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + incoctave + volume 162 + ;musice8 6 + note D_, 2 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 3 + incoctave + dutycycle 2 + volume 112 + note D_, 1 + note __, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note __, 1 + tempo 20* 1 + note F#, 4 + note G_, 3 + ;no_fade + tempo 20* 7 + note G_, 15 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note G_, 1 + note __, 2 + note G_, 1 + incoctave + dutycycle 2 + volume 112 + tempo 20* 1 + note F#, 4 + note G_, 3 + ;no_fade + tempo 20* 7 + note G_, 2 + note __, 1 + note F#, 3 + note __, 1 + decoctave + volume 162 + ;musice8 6 + note G_, 1 + dutycycle 1 + volume 144 + ;musice8 8 + note E_, 1 + note __, 2 + incoctave + dutycycle 2 + volume 112 + tempo 20* 1 + note E_, 4 + note F#, 3 + ;no_fade + tempo 20* 7 + note F#, 15 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note F#, 1 + note __, 2 + note F#, 1 + incoctave + dutycycle 2 + volume 112 + tempo 20* 1 + note E_, 4 + note F#, 3 + ;no_fade + tempo 20* 7 + note F#, 2 + note __, 1 + note E_, 3 + note __, 1 + decoctave + volume 162 + ;musice8 6 + note A_, 1 + dutycycle 1 + volume 144 + ;musice8 8 + note E_, 1 + note __, 2 + incoctave + dutycycle 2 + volume 112 + tempo 20* 1 + note D#, 4 + note E_, 3 + ;no_fade + tempo 20* 7 + note E_, 15 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note A_, 1 + note __, 2 + note A_, 1 + dutycycle 2 + volume 112 + tempo 20* 1 + note A#, 4 + note B_, 3 + ;no_fade + tempo 20* 7 + note B_, 2 + note __, 1 + note A_, 3 + note __, 1 + note G_, 3 + note __, 1 + tempo 20* 1 + note F#, 4 + note G_, 3 + ;no_fade + tempo 20* 7 + note G_, 1 + note __, 1 + note F#, 13 + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 2 + note D_, 1 + incoctave + dutycycle 2 + volume 162 + ;musice8 6 + note D_, 2 + decoctave + ;musice4 0 + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 2 + callchannel Branch_f59b4 + octave 3 + tempo 20* 1 + volume 112 + note F_, 4 + note F#, 3 + ;no_fade + tempo 20* 7 + note F#, 1 + note __, 1 + note D_, 5 + note __, 1 + decoctave + note F#, 1 + tempo 20* 1 + note A_, 4 + note __, 3 + incoctave + note D_, 4 + note __, 3 + note F#, 4 + note __, 3 + tempo 20* 7 + note __, 3 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 +rept 3 + note D_, 1 + note __, 2 +endr + callchannel Branch_f59b4 + volume 128 + octave 3 + note D_, 16 + ;no_fade + note D_, 6 + note __, 2 + tempo 20* 1 + note G#, 4 + note A_, 3 + ;no_fade + tempo 20* 7 + note A_, 2 + note A_, 1 + note __, 2 + note A_, 1 + note __, 1 + note D_, 2 + note __, 1 + note D_, 13 + note C#, 6 + note __, 2 + decoctave + volume 121 + tempo 20* 1 + note E_, 5 + note A_, 5 + incoctave + note C#, 4 + note E_, 5 + note A_, 5 + incoctave + note C#, 4 + decoctave + decoctave + note A_, 5 + incoctave + note C#, 5 + note E_, 4 + note A_, 5 + incoctave + note C#, 5 + note E_, 4 + decoctave + tempo 20* 7 + callchannel Branch_f598c + note D_, 8 + ;no_fade + note D_, 8 + note C#, 6 + decoctave + dutycycle 1 + volume 112 + tempo 20* 1 + note G_, 4 + note G#, 3 + tempo 20* 7 + note A_, 1 + note __, 1 + note A_, 1 + note B_, 2 + incoctave + note C#, 2 + note E_, 2 + dutycycle 2 + callchannel Branch_f598c + note D_, 4 + note E_, 2 + note D_, 2 + note __, 2 + note C#, 2 + note __, 2 + note E_, 6 + note D_, 2 + note C#, 2 + note __, 2 + decoctave + note A_, 2 + note __, 2 + note G_, 8 + ;no_fade + note G_, 8 + note F#, 8 + ;no_fade + note F#, 8 + note __, 2 + note G_, 12 + note __, 2 + note G_, 14 + note __, 4 + loopchannel 0, .MainLoop + +Branch_f594d: + octave 3 + tempo 20* 1 + note C#, 4 + note D_, 3 + ;no_fade + tempo 20* 7 + note D_, 9 + decoctave + dutycycle 1 + volume 144 + decoctave + note A_, 1 + note __, 1 + incoctave + dutycycle 2 + volume 112 + note A_, 3 + note __, 1 + incoctave + note C_, 6 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 1 + incoctave + dutycycle 2 + volume 112 + tempo 20* 1 + note D#, 4 + note E_, 3 + ;no_fade + tempo 20* 7 + note E_, 2 + note D_, 1 + decoctave + volume 162 + ;musice8 6 + note G_, 2 + incoctave + volume 112 + ;musice8 8 + note C_, 1 + note __, 1 + endchannel + +Branch_f598c: + volume 128 + note D_, 10 + note __, 2 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 2 + note __, 2 + incoctave + note D_, 8 + note C#, 1 + note __, 1 + decoctave + note B_, 1 + note __, 1 + note A_, 2 + note __, 1 + note F#, 9 + note D_, 1 + note __, 1 + note G_, 9 + note __, 1 + note F#, 4 + note E_, 4 + note D_, 10 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + decoctave + note B_, 10 + incoctave + note C#, 2 + note D_, 2 + note __, 2 + note D_, 2 + ;no_fade + endchannel + +Branch_f59b4: + octave 2 + volume 128 + tempo 20* 1 + note G#, 4 + note A_, 3 + ;no_fade + tempo 20* 7 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G_, 1 + note __, 2 + note C_, 1 + note __, 2 + note C_, 1 + note __, 2 + dutycycle 2 + volume 112 + note E_, 1 + tempo 20* 1 + note G_, 4 + note __, 3 + incoctave + note C_, 4 + note __, 3 + note E_, 4 + note __, 3 + tempo 20* 7 + note __, 3 + ;musice8 8 + decoctave + dutycycle 1 + volume 128 +rept 3 + note C_, 1 + note __, 2 +endr + incoctave + dutycycle 2 + volume 112 + tempo 20* 1 + note F#, 4 + note G_, 3 + ;no_fade + tempo 20* 7 + note G_, 2 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + endchannel + +Branch_f59f9: + octave 2 + dutycycle 1 + volume 144 + ;musice8 8 + note D_, 1 + note __, 3 + decoctave + note A_, 1 + note __, 1 + incoctave + dutycycle 2 + volume 162 + ;musice8 6 + note A_, 1 + decoctave + dutycycle 1 + volume 144 + ;musice8 8 + note B_, 1 + note __, 2 + endchannel + +Branch_f5a17: + octave 2 + dutycycle 1 + volume 144 + ;musice8 8 + note F#, 1 + note __, 3 + note C#, 1 + note __, 1 + dutycycle 2 + volume 162 + ;musice8 6 + note A_, 1 + dutycycle 1 + volume 144 + ;musice8 8 + note E_, 1 + note __, 2 + endchannel + + +Music_TCG_BattleTheme1_Ch3: ; f5a32 (3d:5a32) + notetype $c, $14 + tempo 20* 7 + ;musicdc 17 + volume 32 + ;duty3 4 + ;musice9 96 + ;musice8 8 + octave 1 +.MainLoop +rept 4 +rept 3 + note D_, 1 + note __, 2 +endr + note __, 1 + callchannel Branch_f5c47 +endr +rept 4 + note D_, 1 + note __, 2 + note D_, 1 + incoctave + incoctave + ;musice8 3 + note D_, 2 + decoctave + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 +endr + callchannel Branch_f5b8d + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note F#, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + note D_, 1 + note __, 2 + note D_, 1 + incoctave + incoctave + ;musice8 3 + note D_, 2 + decoctave + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + callchannel Branch_f5b8d + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note A_, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note A_, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 2 + note D_, 2 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Branch_f5c7e + octave 2 + note C_, 3 + decoctave + note G_, 1 + note __, 1 + incoctave + note C_, 1 + note __, 1 + decoctave +rept 3 + note D_, 1 + note __, 2 +endr + incoctave + note D_, 1 + tempo 20* 1 + note F#, 4 + note __, 3 + note A_, 4 + note __, 3 + incoctave + note D_, 4 + note __, 3 + tempo 20* 7 + note __, 3 + decoctave + decoctave +rept 3 + note D_, 1 + note __, 2 +endr + note D_, 2 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Branch_f5c7e + octave 1 + note C_, 3 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + callchannel Branch_f5c60 + octave 1 + ;musice8 8 + note E_, 1 + note __, 1 + note E_, 2 + ;musice8 6 + note B_, 2 + callchannel Branch_f5c60 + octave 1 + ;musice8 8 + note F#, 2 + note G_, 2 + ;musice8 6 + note G#, 2 + callchannel Branch_f5c6f + octave 1 + ;musice8 8 + note A_, 1 + note __, 1 + note A_, 2 + ;musice8 6 + note E_, 2 + callchannel Branch_f5c6f + octave 1 + ;musice8 8 + note B_, 2 + incoctave + note C_, 2 + note C#, 2 + decoctave +rept 2 + callchannel Branch_f5c4d + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + ;musice8 7 + note E_, 1 + ;musice8 8 + note E_, 1 + note __, 1 + note E_, 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 2 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + ;musice8 7 + note F#, 1 + ;musice8 8 + note F#, 1 + note __, 1 + note F#, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + ;musice8 7 + note G_, 1 + ;musice8 8 + note F#, 1 + note __, 1 + note E_, 2 + callchannel Branch_f5c4d + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 2 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + ;musice8 7 + note B_, 1 + ;musice8 8 + note F#, 1 + note __, 1 + note F_, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note F#, 2 + note G_, 2 + note G#, 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 2 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note A_, 2 + note E_, 2 + note C#, 2 +endr +rept 2 + callchannel Branch_f5c4d +endr + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + ;musice8 7 + note D_, 1 + ;musice8 8 + note D_, 1 + note __, 1 + note A_, 14 + note __, 4 + loopchannel 0, .MainLoop + +Branch_f5b8d: + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note A_, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note G_, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 +rept 3 + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note A_, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 +endr + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note G_, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note A_, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + note D_, 1 + note __, 2 + note D_, 1 + incoctave + ;musice8 3 + note A_, 2 + decoctave + ;musice8 8 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note E_, 2 + note F#, 1 + note __, 1 +rept 2 + note G_, 1 + note __, 2 + note G_, 1 + incoctave + ;musice8 3 + note B_, 2 + decoctave + ;musice8 8 + note G_, 1 + note __, 3 + note D_, 1 + note __, 1 + note D_, 1 + note E_, 1 + note __, 2 +endr + note F#, 1 + note __, 2 + note F#, 1 + incoctave + ;musice8 3 + note A_, 2 + decoctave + ;musice8 8 + note F#, 1 + note __, 3 + note C#, 1 + note __, 1 + note C#, 1 + note E_, 1 + note __, 2 + note F#, 1 + note __, 2 + note F#, 1 + incoctave + incoctave + ;musice8 3 + note C#, 2 + decoctave + decoctave + ;musice8 8 + note F#, 1 + note __, 3 + note C#, 1 + note __, 1 + note C#, 1 + note E_, 1 + note __, 2 + note E_, 1 + note __, 2 + note E_, 1 + incoctave + ;musice8 3 + note B_, 2 + decoctave + ;musice8 8 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note F#, 1 + note G_, 1 + note __, 2 + note A_, 1 + note __, 2 + note A_, 1 + incoctave + ;musice8 3 + note B_, 2 + decoctave + ;musice8 8 + note A_, 1 + note __, 3 + note E_, 1 + note __, 1 + note F#, 1 + note A_, 1 + note __, 2 + endchannel + +Branch_f5c47: + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 + endchannel + +Branch_f5c4d: + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + ;musice8 7 + note D_, 1 + ;musice8 8 + note D_, 1 + note __, 1 + note D_, 2 + endchannel + +Branch_f5c60: + octave 1 + ;musice8 8 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 1 + note E_, 1 + note __, 1 + ;musice8 6 + note E_, 1 + endchannel + +Branch_f5c6f: + octave 1 + ;musice8 8 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 2 + note __, 1 + note A_, 1 + note __, 1 + ;musice8 6 + note A_, 1 + endchannel + +Branch_f5c7e: + octave 1 +rept 3 + note C_, 1 + note __, 2 +endr + incoctave + note C_, 1 + tempo 20* 1 + note E_, 4 + note __, 3 + note G_, 4 + note __, 3 + incoctave + note C_, 4 + note __, 3 + tempo 20* 7 + note __, 3 + decoctave + decoctave +rept 3 + note C_, 1 + note __, 2 +endr + endchannel + + +Music_TCG_BattleTheme1_Ch4: ; f5c9a (3d:5c9a) + togglenoise $0 + notetype $c + tempo 20* 7 + octave 1 +.MainLoop +rept 3 + note C_, 2 + note F_, 1 + note G_, 1 + note F_, 1 + note C_, 1 + note E_, 2 + note F_, 1 + note C_, 1 + note G_, 2 + note D_, 1 + note G_, 1 + note __, 1 + note F_, 1 +endr + note C_, 2 + note F_, 1 + note G_, 1 + note F_, 1 + note C_, 1 + note E_, 2 + note F_, 1 + note D_, 1 + note G_, 1 + tempo 20* 1 + note E_, 4 + note E_, 3 + tempo 20* 7 + note D_, 1 + note D_, 1 + note D_, 2 +rept 3 + callchannel Branch_f5d39 +endr + callchannel Branch_f5d46 +rept 15 + callchannel Branch_f5d39 +endr + callchannel Branch_f5d46 +rept 15 + callchannel Branch_f5d39 +endr + note C_, 2 + note F_, 1 + note G_, 1 + note D_, 2 + note G_, 2 + note F_, 1 + note D_, 1 + note G_, 1 + tempo 20* 1 + note E_, 4 + note E_, 3 + tempo 20* 7 +rept 4 + note D_, 1 +endr +rept 5 + note C_, 1 + note F_, 1 + note G_, 1 + note D_, 1 + note F_, 1 + note C_, 1 + note G_, 2 + note F_, 1 + note C_, 1 + note F_, 2 + note D_, 2 + note G_, 2 +endr + note C_, 2 + note F_, 1 + note D_, 1 + note F_, 1 + note C_, 1 + note G_, 2 + note F_, 1 + note C_, 1 + note G_, 1 + tempo 20* 1 + note E_, 4 + note E_, 3 + tempo 20* 7 +rept 4 + note D_, 1 +endr +rept 3 + callchannel Branch_f5d39 +endr + callchannel Branch_f5d58 +rept 7 + callchannel Branch_f5d39 +endr + callchannel Branch_f5d46 +rept 7 + callchannel Branch_f5d39 +endr + callchannel Branch_f5d58 +rept 2 + callchannel Branch_f5d39 +endr + note C_, 2 + note F_, 1 + note G_, 1 + note D_, 2 + note G_, 2 + note C_, 1 + note F_, 1 + note G_, 2 + note D_, 2 + note A_, 14 + note D_, 4 + loopchannel 0, .MainLoop + +Branch_f5d39: + note C_, 2 + note F_, 1 + note G_, 1 + note D_, 2 + note G_, 2 + note C_, 1 + note F_, 1 + note G_, 2 + note D_, 1 + note G_, 1 + note __, 1 + note F_, 1 + endchannel + +Branch_f5d46: + note C_, 2 + note F_, 1 + note G_, 1 + note D_, 2 + note G_, 2 + note F_, 1 + note D_, 1 + note G_, 1 + tempo 20* 1 + note E_, 4 + note E_, 3 + tempo 20* 7 + note D_, 1 + note D_, 1 + note D_, 2 + endchannel + +Branch_f5d58: + note C_, 2 + note F_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + tempo 20* 1 + note E_, 4 + note E_, 3 + tempo 20* 7 +rept 8 + note D_, 1 +endr + endchannel +; 0xf5d68 diff --git a/crysaudio/music/TCG/boosterpack.asm b/crysaudio/music/TCG/boosterpack.asm new file mode 100644 index 00000000..6eaeff94 --- /dev/null +++ b/crysaudio/music/TCG/boosterpack.asm @@ -0,0 +1,109 @@ +Music_TCGBoosterPack: + db $80 + dw Music_TCGBoosterPack_Ch1 + db $01 + dw Music_TCGBoosterPack_Ch2 + db $02 + dw Music_TCGBoosterPack_Ch3 + +Music_TCGBoosterPack_Ch1: + vibrato 20, $33 + notetype2 8 + octave 4 + dutycycle 1 + notetype0 1 + notetype1 10 + note D#, 5 + notetype1 3 + note D#, 1 + notetype1 10 + note G_, 5 + notetype1 3 + note G_, 1 + notetype1 10 + note A#, 5 + notetype1 3 + note A#, 2 + notetype1 10 + note F_, 5 + notetype1 3 + note F_, 1 + notetype1 10 + note A_, 5 + notetype1 3 + note A_, 1 + inc_octave + notetype1 10 + note C_, 5 + notetype1 3 + note C_, 2 + dec_octave + notetype1 10 + note B_, 16 + note B_, 16 + note B_, 6 + notetype1 3 + note B_, 9 + endchannel + + +Music_TCGBoosterPack_Ch2: + vibrato 20, $33 + notetype2 8 + octave 3 + dutycycle 1 + notetype0 1 + notetype1 9 + note A#, 5 + notetype1 2 + note A#, 1 + inc_octave + notetype1 9 + note D#, 5 + notetype1 2 + note D#, 1 + notetype1 9 + note G_, 5 + notetype1 2 + note G_, 2 + notetype1 9 + note C_, 5 + notetype1 2 + note C_, 1 + notetype1 9 + note F_, 5 + notetype1 2 + note F_, 1 + notetype1 9 + note A_, 5 + notetype1 2 + note A_, 2 + notetype1 9 + note G_, 16 + note G_, 16 + note G_, 6 + notetype1 2 + note G_, 9 + endchannel + + +Music_TCGBoosterPack_Ch3: + notetype2 11 + notetype1 1 + octave 2 + notetype0 1 + note D#, 6 + note A#, 6 + inc_octave + note D#, 7 + dec_octave + note F_, 6 + inc_octave + note C_, 6 + note F_, 7 + dec_octave + note G_, 16 + note G_, 16 + note G_, 6 + endchannel + diff --git a/crysaudio/music/TCG/cardpop.asm b/crysaudio/music/TCG/cardpop.asm new file mode 100644 index 00000000..5815bc54 --- /dev/null +++ b/crysaudio/music/TCG/cardpop.asm @@ -0,0 +1,306 @@ +Music_TCGCardPop: + db $C0 + dw Music_TCGCardPop_Ch1 + db $01 + dw Music_TCGCardPop_Ch2 + db $02 + dw Music_TCGCardPop_Ch3 + db $03 + dw Music_TCGCardPop_Ch4 + +Music_TCGCardPop_Ch1: + notetype0 4 + notetype2 8 + dutycycle 2 + notetype1 9 +.MainLoop +.Loop1 + note __, 16 + loopchannel 7, .Loop1 + note __, 14 +.Loop2 + octave 5 + notetype2 8 + note F#, 1 + note G_, 1 + notetype2 6 + note F#, 1 + notetype1 3 + note F#, 1 + notetype1 9 + note D_, 1 + notetype1 3 + note F#, 1 + dec_octave + notetype1 9 + note A_, 1 + inc_octave + notetype1 3 + note D_, 1 + dec_octave + notetype1 9 + note G_, 1 + notetype1 3 + note A_, 1 + notetype1 9 + note F#, 1 + notetype1 3 + note G_, 1 + notetype1 9 + note D_, 1 + notetype1 3 + note G_, 1 + dec_octave + notetype1 9 + note A_, 1 + notetype1 3 + inc_octave + note D_, 1 + dec_octave + notetype1 9 + note G_, 1 + notetype1 3 + note A_, 1 + notetype1 9 + note F#, 1 + notetype1 3 + note G_, 1 + note __, 1 + note F#, 1 + note __, 12 + note __, 16 + note __, 14 + octave 5 + notetype1 9 + notetype2 8 + note E_, 1 + note F_, 1 + notetype2 6 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 9 + note C_, 1 + notetype1 3 + note E_, 1 + dec_octave + notetype1 9 + note G_, 1 + inc_octave + notetype1 3 + note C_, 1 + dec_octave + notetype1 9 + note F_, 1 + notetype1 3 + note G_, 1 + notetype1 9 + note E_, 1 + notetype1 3 + note F_, 1 + notetype1 9 + note C_, 1 + notetype1 3 + note E_, 1 + dec_octave + notetype1 9 + note G_, 1 + notetype1 3 + inc_octave + note C_, 1 + dec_octave + notetype1 9 + note F_, 1 + notetype1 3 + note G_, 1 + notetype1 9 + note E_, 1 + notetype1 3 + note F_, 1 + note __, 1 + note E_, 1 + note __, 12 + note __, 16 + notetype1 9 + note __, 14 + loopchannel 2, .Loop2 + note __, 2 + loopchannel 0, .MainLoop + + +Music_TCGCardPop_Ch2: + notetype0 4 + notetype2 8 + dutycycle 2 + notetype1 6 + notetype2 3 +.Loop1 + octave 2 + note A_, 2 + inc_octave + note A_, 2 + inc_octave + note A_, 2 + dec_octave + note A_, 2 + inc_octave + inc_octave + note A_, 2 + dec_octave + note A_, 2 + dec_octave + note A_, 2 + inc_octave + inc_octave + note A_, 2 + dec_octave + dec_octave + note A_, 2 + dec_octave + note A_, 2 + inc_octave + note A_, 2 + inc_octave + note A_, 2 + inc_octave + note A_, 2 + dec_octave + note A_, 2 + dec_octave + note A_, 2 + inc_octave + inc_octave + note A_, 2 + loopchannel 2, .Loop1 +.Loop2 + octave 2 + note G_, 2 + inc_octave + note G_, 2 + inc_octave + note G_, 2 + dec_octave + note G_, 2 + inc_octave + inc_octave + note G_, 2 + dec_octave + note G_, 2 + dec_octave + note G_, 2 + inc_octave + inc_octave + note G_, 2 + dec_octave + dec_octave + note G_, 2 + dec_octave + note G_, 2 + inc_octave + note G_, 2 + inc_octave + note G_, 2 + inc_octave + note G_, 2 + dec_octave + note G_, 2 + dec_octave + note G_, 2 + inc_octave + inc_octave + note G_, 2 + loopchannel 2, .Loop2 + loopchannel 0, Music_TCGCardPop_Ch2 + + +Music_TCGCardPop_Ch3: + notetype0 4 + notetype2 11 + notetype1 1 + callchannel Branch_f715b + note C_, 2 + note C#, 2 + callchannel Branch_f715b + note D_, 2 + note C#, 2 + callchannel Branch_f716c + note D_, 2 + note C#, 2 + callchannel Branch_f716c + note C_, 2 + note C#, 2 + loopchannel 0, Music_TCGCardPop_Ch3 + +Branch_f715b: + octave 2 + note D_, 2 + note __, 2 + note D_, 4 + inc_octave + note D_, 2 + dec_octave + note D_, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 2 + note __, 2 + note G#, 2 + note __, 2 + note A_, 2 + endchannel + +Branch_f716c: + octave 2 + note C_, 2 + note __, 2 + note C_, 4 + inc_octave + note C_, 2 + dec_octave + note C_, 2 + note __, 2 + note E_, 2 + note __, 2 + note F_, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 2 + endchannel + + +Music_TCGCardPop_Ch4: + togglenoise $06 +.MainLoop + notetype 4 + octave 1 +.Loop1 + callchannel Branch_f7196 + note E_, 4 + note C#, 2 + note D#, 2 + note E_, 2 + note C#, 2 + loopchannel 11, .Loop1 + callchannel Branch_f7196 + note E_, 2 + note D_, 1 + note D_, 1 +.Loop2 + note C#, 2 + loopchannel 4, .Loop2 + loopchannel 0, .MainLoop + +Branch_f7196: + note C_, 2 + note D#, 2 + note E_, 4 + note C#, 2 + note D#, 2 + note E_, 2 + note C#, 2 + note C_, 2 + note C#, 2 + endchannel + diff --git a/crysaudio/music/TCG/challengehall.asm b/crysaudio/music/TCG/challengehall.asm new file mode 100644 index 00000000..86ecf68a --- /dev/null +++ b/crysaudio/music/TCG/challengehall.asm @@ -0,0 +1,1075 @@ +Music_TCGChallengeHall: + db $C0 + dw Music_TCGChallengeHall_Ch1 + db $01 + dw Music_TCGChallengeHall_Ch2 + db $02 + dw Music_TCGChallengeHall_Ch3 + db $03 + dw Music_TCGChallengeHall_Ch4 + +Music_TCGChallengeHall_Ch1: + vibrato 15, $33 + notetype2 7 + octave 3 + dutycycle 2 + notetype1 8 + notetype2 8 + notetype0 1 + note A_, 7 + note G#, 4 + notetype1 1 + note G#, 4 + notetype1 8 + note A_, 4 + notetype1 1 + note A_, 3 + notetype1 8 + note B_, 4 + notetype1 1 + note B_, 4 + inc_octave + notetype1 8 + note C#, 7 + note C_, 4 + notetype1 1 + note C_, 4 + notetype1 8 + note C#, 4 + notetype1 1 + note C#, 3 + notetype1 8 + note D_, 4 + notetype1 1 + note D_, 4 + notetype1 8 + note E_, 7 + note D#, 4 + notetype1 1 + note D#, 4 + notetype1 8 + note E_, 4 + notetype1 1 + note E_, 3 + notetype1 8 + note F#, 4 + notetype1 1 + note F#, 4 + notetype1 8 + note G#, 4 + notetype1 1 + note G#, 3 + notetype1 8 + note A_, 8 + note B_, 7 + inc_octave + note C#, 4 + note D_, 4 +.MainLoop + notetype1 7 + notetype0 1 + octave 5 +.Loop1 + note E_, 4 + note F#, 3 + note E_, 4 + note F#, 4 + loopchannel 8, .Loop1 + dutycycle 1 + notetype1 8 + dec_octave + dec_octave + dec_octave + note B_, 7 + notetype1 2 + note B_, 8 + dec_octave + notetype1 8 + note B_, 7 + note B_, 8 + note B_, 7 + notetype1 2 + note B_, 8 + notetype1 8 + note B_, 7 + notetype1 2 + note B_, 8 + notetype1 8 + note B_, 7 + notetype1 2 + note B_, 8 + notetype1 8 + note B_, 15 + inc_octave + note D_, 15 + note E_, 15 + inc_octave + dutycycle 0 + notetype1 10 + callchannel Branch_f9848 + notetype1 10 + note D_, 8 + notetype0 10 + note C#, 6 + note C#, 6 + notetype1 3 + notetype0 1 + note C#, 15 + dutycycle 1 + notetype1 8 + note C#, 7 + notetype1 2 + note C#, 8 + note __, 15 + notetype1 8 + note C#, 7 + notetype1 2 + note C#, 8 + note __, 15 + notetype1 8 + note D_, 7 + notetype1 2 + note D_, 8 + note __, 15 + notetype1 8 + note D_, 7 + notetype1 2 + note D_, 8 + dutycycle 0 + notetype1 10 + callchannel Branch_f9848 + notetype1 10 + note C#, 8 + dec_octave + notetype0 10 + note A_, 6 + note A_, 6 + notetype1 3 + notetype0 1 + note A_, 15 + dutycycle 1 + notetype1 8 + inc_octave + note C#, 7 + notetype1 2 + note C#, 8 + note __, 15 + notetype1 8 + note C#, 7 + notetype1 2 + note C#, 8 + note __, 15 + notetype1 8 + note C#, 15 + note D_, 15 + note E_, 15 + notetype1 2 + note E_, 15 + dutycycle 0 + notetype1 10 + note F#, 7 + note F_, 7 + notetype1 3 + note F_, 1 + notetype1 10 + note F#, 7 + note F_, 8 + note F#, 7 + note G#, 7 + notetype1 3 + note G#, 1 + notetype1 10 + notetype0 10 + note A_, 3 + notetype0 1 + note A_, 15 + dec_octave + dutycycle 1 + notetype1 8 + note A_, 7 + notetype1 2 + note A_, 8 + dutycycle 0 + notetype1 10 + note __, 15 + inc_octave + note E_, 7 + note D#, 7 + notetype1 3 + note D#, 1 + notetype1 10 + note E_, 7 + note D#, 8 + note E_, 7 + note G#, 7 + notetype1 3 + note G#, 1 + notetype1 10 + notetype0 9 + note A_, 5 + notetype0 1 + dec_octave + dutycycle 1 + notetype1 8 + note A_, 7 + notetype1 2 + note A_, 8 + dutycycle 0 + notetype1 10 + note __, 15 + inc_octave + note D_, 7 + note C#, 8 + note D_, 7 + notetype1 3 + note D_, 8 + notetype1 10 + note A_, 7 + notetype1 3 + note A_, 8 + notetype1 10 + note G#, 15 + note G#, 7 + notetype1 3 + note G#, 8 + notetype1 10 + note F#, 15 + notetype1 3 + note F#, 7 + notetype1 10 + note G#, 8 + notetype0 10 + note E_, 6 + notetype0 1 + notetype1 3 + note E_, 15 + notetype1 10 + note C#, 15 + note D_, 15 + note E_, 15 + notetype1 3 + note E_, 15 + notetype1 10 + note F#, 7 + note F_, 7 + notetype1 3 + note F_, 1 + notetype1 10 + note F#, 7 + note F_, 8 + note F#, 6 + notetype1 3 + note F#, 1 + notetype1 10 + note G#, 6 + notetype1 3 + note G#, 2 + notetype1 10 + notetype0 10 + note A_, 3 + notetype0 1 + note G#, 15 + dec_octave + dutycycle 1 + notetype1 8 + note B_, 7 + inc_octave + dutycycle 0 + notetype1 10 + note F#, 6 + notetype1 3 + note F#, 2 + notetype1 10 + note E_, 15 + notetype1 3 + note E_, 15 + notetype1 10 + note B_, 15 + dutycycle 1 + notetype1 8 + dec_octave + note B_, 7 + inc_octave + dutycycle 0 + notetype1 10 + note G#, 6 + notetype1 3 + note G#, 2 + notetype1 10 + notetype0 10 + note A_, 3 + notetype0 1 + notetype1 3 + note A_, 15 + notetype1 10 + note B_, 6 + notetype1 3 + note B_, 1 + inc_octave + notetype1 10 + note C#, 6 + notetype1 3 + note C#, 2 + notetype1 10 + notetype0 10 + note D_, 3 + notetype0 1 + notetype1 3 + note D_, 15 + dec_octave + notetype1 10 + note F#, 6 + notetype1 3 + note F#, 1 + notetype1 10 + note B_, 6 + notetype1 3 + note B_, 2 + notetype1 10 + note A_, 15 + notetype1 3 + note A_, 15 + notetype1 10 + note G#, 11 + notetype1 3 + note G#, 4 + note __, 7 + notetype1 10 + note A_, 7 + notetype1 3 + note A_, 1 + notetype1 10 + notetype0 10 + note A_, 6 + dutycycle 2 + notetype1 7 + notetype0 1 + inc_octave + note C#, 7 + note C_, 8 + note C#, 7 + note D_, 8 + note E_, 5 + note F#, 5 + note G#, 5 + note A_, 4 + note B_, 4 + inc_octave + note C#, 4 + note D_, 3 + loopchannel 0, .MainLoop + +Branch_f9848: + note C#, 15 + notetype1 3 + note C#, 15 + notetype1 10 + note E_, 15 + notetype1 3 + note E_, 7 + notetype1 10 + note C#, 8 + note D_, 15 + notetype1 3 + note D_, 15 + notetype1 10 + note F#, 15 + notetype1 3 + note F#, 7 + notetype1 10 + note D_, 8 + note E_, 7 + notetype1 3 + note E_, 8 + notetype1 10 + note A_, 15 + note G#, 7 + notetype1 3 + note G#, 8 + notetype1 10 + note F#, 7 + notetype1 3 + note F#, 8 + notetype1 10 + note E_, 15 + note D_, 7 + notetype1 3 + note D_, 8 + dec_octave + notetype1 10 + note B_, 15 + notetype1 3 + note B_, 7 + inc_octave + endchannel + + +Music_TCGChallengeHall_Ch2: + vibrato 15, $33 + notetype2 7 + octave 3 + notetype0 10 +.Loop1 + note __, 6 + loopchannel 2, .Loop1 +.MainLoop + dutycycle 1 + notetype1 9 + notetype2 8 + notetype0 10 + note E_, 6 + note E_, 6 + notetype0 1 + note E_, 7 + notetype1 2 + note E_, 8 + dec_octave + notetype1 8 + note E_, 7 + note E_, 8 + note E_, 7 + notetype1 2 + note E_, 8 + notetype1 8 + note E_, 7 + notetype1 2 + note E_, 8 + notetype1 8 + note E_, 7 + notetype1 2 + note E_, 8 + notetype1 8 + note E_, 15 + note F#, 15 + note G#, 15 + callchannel Branch_f9a28 + note B_, 8 + notetype0 10 + note A_, 6 + note A_, 6 + notetype0 1 + note __, 15 + dutycycle 1 + notetype1 8 + note A_, 7 + notetype1 2 + note A_, 8 + note __, 15 + notetype1 8 + note A_, 7 + notetype1 2 + note A_, 8 + note __, 15 + notetype1 8 + note B_, 7 + notetype1 2 + note B_, 8 + note __, 15 + notetype1 8 + note B_, 7 + notetype1 2 + note B_, 8 + callchannel Branch_f9a28 + note G#, 8 + notetype0 10 + note E_, 6 + note E_, 6 + notetype0 1 + note __, 15 + dutycycle 1 + notetype1 8 + note A_, 7 + notetype1 2 + note A_, 8 + note __, 15 + notetype1 8 + note A_, 7 + notetype1 2 + note A_, 8 + note __, 15 + notetype1 8 + note A_, 15 + note B_, 15 + inc_octave + note C#, 15 + notetype1 2 + note C#, 15 + notetype1 8 + note D_, 7 + notetype1 2 + note D_, 8 + note __, 15 + dec_octave + notetype1 8 + note A_, 7 + notetype1 2 + note A_, 8 + note __, 15 + inc_octave + notetype1 8 + note D_, 7 + dutycycle 2 + notetype1 6 + inc_octave + note D_, 8 + note A_, 7 + notetype1 2 + note A_, 8 + inc_octave + notetype1 6 + note D_, 7 + notetype1 2 + note D_, 8 + notetype1 6 +.Loop2 + note E_, 4 + note F#, 3 + note E_, 4 + note F#, 4 + loopchannel 4, .Loop2 + notetype1 2 + note F#, 5 + note __, 10 + dec_octave + dec_octave + dutycycle 1 + notetype1 8 + note C#, 7 + inc_octave + dutycycle 2 + notetype1 6 + note E_, 8 + note A_, 7 + notetype1 2 + note A_, 8 + inc_octave + notetype1 6 + note C#, 7 + notetype1 2 + note C#, 8 + notetype1 5 +.Loop3 + note D_, 4 + note E_, 3 + note D_, 4 + note E_, 4 + loopchannel 4, .Loop3 + dec_octave + note B_, 15 + inc_octave + note D_, 7 + notetype1 2 + note D_, 8 + notetype1 5 + note C#, 15 + dutycycle 1 + notetype1 8 + octave 2 + note B_, 7 + inc_octave + inc_octave + dutycycle 2 + notetype1 5 + note B_, 8 + inc_octave + notetype0 10 + note C#, 6 + notetype1 2 + notetype0 1 + note C#, 15 + dutycycle 0 + notetype1 7 + octave 2 + note E_, 15 + note F#, 15 + note A#, 15 + note __, 15 + dutycycle 1 + notetype1 8 + inc_octave + note D_, 7 + notetype1 2 + note D_, 8 + note __, 15 + dec_octave + notetype1 8 + note B_, 7 + notetype1 2 + note B_, 8 + note __, 15 + inc_octave + notetype1 8 + note D_, 7 + inc_octave + dutycycle 2 + notetype1 6 + note D_, 8 + note A_, 7 + notetype1 2 + note A_, 8 + inc_octave + notetype1 6 + note D_, 7 + notetype1 2 + note D_, 8 + notetype1 6 +.Loop4 + note E_, 4 + note F#, 3 + note E_, 4 + note F#, 4 + loopchannel 2, .Loop4 + dutycycle 0 + notetype1 7 + dec_octave + dec_octave + note F_, 15 + note __, 7 + note F_, 6 + note __, 2 + notetype0 10 + note F#, 3 + notetype0 1 + note __, 15 + dutycycle 1 + notetype1 8 + note C#, 7 + dutycycle 0 + notetype1 7 + note E_, 6 + note __, 2 + notetype0 10 + note F#, 3 + notetype0 1 + note __, 15 + dec_octave + dutycycle 1 + notetype1 8 + note B_, 7 + inc_octave + dutycycle 0 + notetype1 7 + note D_, 6 + note __, 2 + note E_, 15 + dutycycle 1 + notetype1 8 + note E_, 7 + notetype1 2 + note E_, 8 + dutycycle 0 + notetype1 7 + note D_, 11 + note __, 4 + dutycycle 1 + notetype1 8 + dec_octave + note B_, 7 + inc_octave + dutycycle 0 + notetype1 7 + note D_, 6 + note __, 2 + note C#, 15 + dutycycle 1 + notetype1 8 + notetype2 7 + note C#, 5 + note C#, 5 + note C#, 5 + notetype2 8 + note C#, 7 + notetype1 2 + note C#, 8 + notetype1 8 + note C#, 7 + notetype1 2 + note C#, 8 + dutycycle 0 + notetype1 10 + note A_, 7 + notetype1 3 + note A_, 8 + note __, 15 + notetype0 10 + note __, 3 + loopchannel 0, .MainLoop + +Branch_f9a28: + dutycycle 0 + notetype1 7 + note A_, 15 + dutycycle 1 + notetype1 8 + note A_, 7 + notetype1 2 + note A_, 8 + dutycycle 0 + notetype1 7 + inc_octave + note C#, 15 + dec_octave + dutycycle 1 + notetype1 8 + note A_, 7 + dutycycle 0 + notetype1 7 + note A_, 8 + note B_, 15 + dutycycle 1 + notetype1 8 + note B_, 7 + notetype1 2 + note B_, 8 + dutycycle 0 + notetype1 7 + inc_octave + note D_, 15 + dec_octave + dutycycle 1 + notetype1 8 + note B_, 7 + dutycycle 0 + notetype1 7 + note B_, 8 + inc_octave + note C#, 7 + notetype1 3 + note C#, 8 + dutycycle 1 + notetype1 8 + note C#, 7 + notetype1 2 + note C#, 8 + dutycycle 0 + notetype1 7 + note E_, 7 + note __, 8 + note E_, 7 + note __, 8 + notetype1 7 + note D_, 15 + dutycycle 1 + notetype1 8 + note D_, 7 + notetype1 2 + note D_, 8 + dec_octave + dutycycle 0 + notetype1 7 + note G#, 15 + inc_octave + dutycycle 1 + notetype1 8 + note D_, 7 + dec_octave + dutycycle 0 + notetype1 7 + endchannel + + +Music_TCGChallengeHall_Ch3: + notetype1 1 + notetype2 11 + notetype0 10 +.Loop1 + note __, 6 + loopchannel 2, .Loop1 +.MainLoop + octave 2 + note E_, 6 + note E_, 6 + notetype0 1 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note E_, 7 + note E_, 8 + note E_, 7 + note __, 8 + note E_, 7 + note __, 8 + note E_, 7 + note __, 8 + note E_, 15 + note F#, 15 + note G#, 15 + callchannel Branch_f9b7d + callchannel Branch_f9b92 +.Loop2 + callchannel Branch_f9b7d + loopchannel 3, .Loop2 + callchannel Branch_f9b92 + callchannel Branch_f9b7d + note A_, 15 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note E_, 15 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note A_, 7 + note __, 8 + note A_, 15 + note B_, 15 + inc_octave + note C#, 15 + dec_octave +.Loop3 + note D_, 15 + inc_octave + note A_, 7 + note __, 8 + dec_octave + note A_, 15 + inc_octave + note F#, 7 + note __, 8 + dec_octave + loopchannel 2, .Loop3 + note C#, 15 + inc_octave + note A_, 7 + note __, 8 + dec_octave + note A_, 15 + inc_octave + note A_, 7 + note __, 8 + dec_octave + note C#, 15 + inc_octave + note A_, 7 + note __, 8 + dec_octave + note A_, 15 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note B_, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + note F#, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + note E_, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + note G#, 15 + inc_octave + note G#, 7 + note __, 8 + dec_octave + note A_, 15 + inc_octave + inc_octave + note C#, 7 + note __, 8 + dec_octave + dec_octave + note G_, 15 + inc_octave + inc_octave + note C#, 7 + note __, 8 + dec_octave + dec_octave + note F#, 7 + note __, 8 + note F#, 15 + note G#, 15 + note A#, 15 + note B_, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + note C#, 15 + inc_octave + note F#, 7 + note __, 8 + dec_octave + note D_, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + note D#, 15 + inc_octave + note F#, 7 + note __, 8 + dec_octave + note E_, 15 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note F_, 15 + inc_octave + note G#, 7 + note __, 8 + dec_octave + note F#, 15 + inc_octave + inc_octave + note C#, 7 + note __, 8 + dec_octave + dec_octave + note C#, 15 + inc_octave + note A_, 7 + note __, 8 + dec_octave + note B_, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + note F#, 15 + inc_octave + note F#, 7 + note __, 8 + dec_octave + note E_, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + note G#, 15 + inc_octave + note G#, 7 + note __, 8 + dec_octave + note A_, 7 + note __, 8 + note A_, 5 + note A_, 5 + note A_, 5 + note A_, 7 + note __, 8 + note A_, 7 + note __, 8 + note A_, 7 + note __, 8 + note __, 15 + notetype0 10 + note __, 3 + loopchannel 0, .MainLoop + +Branch_f9b7d: + note A_, 15 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note E_, 15 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note A_, 15 + inc_octave + note F#, 7 + note __, 8 + dec_octave + note E_, 15 + inc_octave + note F#, 7 + note __, 8 + dec_octave + endchannel + +Branch_f9b92: + note A_, 15 + inc_octave + note A_, 7 + note __, 8 + dec_octave + note E_, 15 + inc_octave + inc_octave + note C#, 7 + note __, 8 + dec_octave + dec_octave + note A_, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + note E_, 15 + inc_octave + note B_, 7 + note __, 8 + dec_octave + endchannel + + +Music_TCGChallengeHall_Ch4: + togglenoise $06 + notetype 1 + notetype 10 +.Loop1 + note __, 6 + loopchannel 2, .Loop1 +.MainLoop + notetype 1 + note C#, 4 + note D_, 3 + note D_, 4 + note D_, 4 +.Loop2 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 4 + loopchannel 7, .Loop2 + note C#, 15 + note C#, 7 + note C#, 8 + note C#, 15 + note C#, 15 + note C#, 15 + note C#, 4 + note D_, 3 + note D_, 4 + note D_, 4 + note C#, 15 + note C#, 15 +.Loop3 + note C_, 15 + note C#, 15 + note C_, 15 + note C#, 15 + note C_, 15 + note C#, 4 + note D_, 3 + note D_, 4 + note D_, 4 + note C_, 15 + note C#, 15 + loopchannel 15, .Loop3 + note C_, 15 + note C#, 4 + note D_, 3 + note D_, 4 + note D_, 4 + note C#, 15 + note C#, 15 + notetype 10 + note C#, 3 + note __, 3 + loopchannel 0, .MainLoop + diff --git a/crysaudio/music/TCG/club1.asm b/crysaudio/music/TCG/club1.asm new file mode 100644 index 00000000..f6d31822 --- /dev/null +++ b/crysaudio/music/TCG/club1.asm @@ -0,0 +1,836 @@ +Music_TCGClub1: + db $C0 + dw Music_TCGClub1_Ch1 + db $01 + dw Music_TCGClub1_Ch2 + db $02 + dw Music_TCGClub1_Ch3 + db $03 + dw Music_TCGClub1_Ch4 + +Music_TCGClub1_Ch1: + notetype0 5 + vibrato 20, $33 + notetype2 8 + octave 3 + dutycycle 0 + notetype1 9 + notetype2 8 + note C#, 2 + dec_octave + note A_, 2 + inc_octave + note C#, 2 + note A_, 2 + dutycycle 2 + notetype1 7 + inc_octave + notetype0 1 + note C#, 8 + notetype1 2 + note C#, 2 + notetype1 6 + note A_, 4 + notetype1 7 + note A_, 4 + notetype1 2 + note A_, 2 + dec_octave + dutycycle 0 + notetype1 9 + notetype0 5 + note C#, 2 + dec_octave + note A#, 2 + inc_octave + note C#, 2 + note A#, 2 + dutycycle 2 + notetype1 7 + inc_octave + notetype0 1 + note C#, 8 + notetype1 2 + note C#, 2 + notetype0 5 + notetype1 8 + dec_octave + note B_, 1 + inc_octave + note C_, 1 + vibrato 10, $33 + note C#, 4 + dec_octave + vibrato 20, $33 + note A_, 2 + inc_octave + note C#, 4 + dec_octave + note B_, 2 + notetype1 2 + note B_, 2 + note __, 2 + dutycycle 0 + notetype1 9 + notetype2 8 + note E_, 6 + note __, 2 +.MainLoop + dutycycle 0 + notetype1 10 + octave 3 + note __, 6 + note A_, 4 + note E_, 2 + note A_, 4 + note B_, 2 + inc_octave + note C_, 4 + note C#, 8 + notetype1 4 + note C#, 4 + notetype1 10 + note C#, 2 + note D_, 4 + note E_, 2 + notetype1 4 + note E_, 2 + note __, 2 + notetype1 10 + note D#, 1 + note E_, 7 + note D_, 6 + dec_octave + note A_, 4 + note F#, 2 + notetype1 4 + note F#, 2 + note __, 2 + inc_octave + notetype1 10 + note C_, 1 + note C#, 3 + notetype1 4 + note C#, 2 + notetype1 10 + note C#, 2 + note C_, 4 + dec_octave + note B_, 6 + notetype1 9 + note D_, 4 + note __, 2 + dec_octave + note A_, 2 + dutycycle 2 + notetype1 5 + inc_octave + inc_octave + inc_octave + note C_, 1 + note C#, 5 + dec_octave + dec_octave + dutycycle 0 + notetype1 10 + note A_, 4 + note E_, 2 + note A_, 4 + note B_, 2 + inc_octave + note C_, 4 + note C#, 6 + dec_octave + dec_octave + notetype1 9 + note A#, 1 + note __, 5 + inc_octave + inc_octave + notetype1 10 + note C#, 2 + note D_, 4 + note E_, 2 + notetype1 4 + note E_, 2 + note __, 2 + notetype1 10 + note D#, 1 + note E_, 7 + note D_, 6 + dec_octave + note A_, 4 + note F#, 2 + notetype1 4 + note F#, 2 + note __, 2 + notetype1 10 + inc_octave + note C_, 1 + note C#, 3 + notetype1 4 + note C#, 2 + notetype1 10 + note C#, 2 + note C_, 4 + dec_octave + note B_, 8 + notetype1 4 + note B_, 4 + notetype1 10 + note E_, 2 + note F_, 1 + note F#, 5 + note A_, 6 + note B_, 4 + note A_, 2 + notetype1 4 + note A_, 2 + note __, 2 + notetype1 10 + note E_, 1 + note F_, 7 + note A_, 6 + note B_, 4 + note A_, 2 + notetype1 4 + note A_, 2 + note __, 2 + inc_octave + notetype1 10 + note C_, 1 + note C#, 5 + notetype1 4 + note C#, 2 + notetype1 10 + note C#, 4 + notetype1 4 + note C#, 2 + notetype1 10 + note C#, 4 + note C_, 2 + note C#, 4 + dec_octave + note F#, 2 + notetype1 4 + note F#, 2 + note __, 2 + inc_octave + notetype1 10 + note D#, 1 + note E_, 5 + note D_, 6 + note C#, 4 + notetype1 4 + note C#, 2 + notetype1 10 + note C_, 1 + note C#, 7 + dec_octave + note A_, 4 + note F#, 2 + note A_, 4 + note F#, 2 + notetype1 4 + note F#, 2 + note __, 2 + notetype1 10 + inc_octave + note C_, 1 + note C#, 5 + note D_, 1 + note C#, 1 + dec_octave + note A_, 4 + note F#, 2 + note A_, 4 + note F#, 2 + notetype1 4 + note F#, 2 + note __, 2 + inc_octave + notetype1 10 + note C_, 1 + note C#, 5 + notetype1 4 + note C#, 2 + notetype1 10 + note C#, 4 + notetype1 4 + note C#, 2 + notetype1 10 + note C#, 4 + dec_octave + note A_, 2 + inc_octave + note C#, 4 + dec_octave + note B_, 14 + dutycycle 2 + notetype1 6 + note G#, 2 + note B_, 1 + notetype1 3 + note B_, 1 + inc_octave + notetype1 6 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 6 + note G#, 1 + notetype1 3 + note G#, 1 + notetype1 6 + note B_, 1 + notetype1 3 + note B_, 1 + inc_octave + notetype1 6 + note E_, 1 + notetype1 3 + note E_, 1 + loopchannel 0, .MainLoop + + +Music_TCGClub1_Ch2: + notetype0 5 + vibrato 20, $33 + notetype2 7 + octave 2 + dutycycle 0 + notetype1 9 + notetype2 8 + note A_, 2 + note E_, 2 + note A_, 2 + inc_octave + note C#, 2 + dutycycle 2 + notetype1 5 + notetype0 1 + note A_, 8 + note __, 2 + inc_octave + note C#, 8 + note __, 2 + notetype0 5 + dutycycle 0 + notetype1 9 + dec_octave + dec_octave + note A#, 2 + note E_, 2 + note A#, 2 + inc_octave + note C#, 2 + dutycycle 2 + notetype1 5 + notetype0 1 + note A#, 8 + note __, 2 + dec_octave + notetype0 5 + dutycycle 0 + notetype1 9 + note G_, 1 + note G#, 1 + note A_, 2 + note D_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note G#, 3 + note __, 3 + notetype1 9 + note B_, 6 + note __, 2 +.MainLoop + octave 2 + note __, 4 + inc_octave + notetype1 9 + note C#, 5 + note __, 7 + note C#, 4 + note __, 2 + note C#, 2 + note __, 4 + dec_octave + note A#, 2 + dutycycle 2 + notetype1 5 + octave 5 + note C#, 1 + note D_, 3 + note C#, 2 + dec_octave + note A#, 4 + dec_octave + dutycycle 0 + notetype1 9 + note E_, 4 + note __, 2 + dutycycle 2 + notetype1 5 + octave 5 + note C_, 1 + note C#, 5 + dutycycle 0 + notetype1 9 + octave 3 + note D_, 2 + dutycycle 2 + notetype1 5 + inc_octave + note A_, 4 + note F#, 2 + note E_, 4 + note D_, 2 + note __, 4 + note E_, 4 + note __, 2 + note E_, 2 + note __, 4 + note E_, 2 + note F#, 4 + note A_, 2 + note B_, 4 + note A_, 2 + note __, 2 + dutycycle 0 + notetype1 9 + note __, 2 + dec_octave + note C#, 2 + notetype1 6 + note C#, 4 + notetype1 3 + note C#, 4 + note __, 2 + notetype1 9 + note C#, 2 + notetype1 6 + note D#, 4 + note E_, 6 + notetype1 3 + note E_, 2 + inc_octave + inc_octave + dutycycle 2 + notetype1 5 + note C#, 1 + note D_, 3 + note C#, 2 + dec_octave + note A#, 4 + note F#, 2 + note __, 4 + inc_octave + note C_, 1 + note C#, 5 + dec_octave + dec_octave + dutycycle 0 + notetype1 9 + note D_, 2 + dutycycle 2 + notetype1 5 + inc_octave + note A_, 4 + note F#, 2 + note E_, 4 + note D_, 2 + note __, 4 + note D#, 1 + note E_, 3 + note __, 2 + note E_, 2 + note D#, 4 + note D_, 6 + dec_octave + dutycycle 0 + notetype1 9 + note D_, 4 + note __, 2 + dec_octave + note A_, 2 + note __, 4 + note A_, 2 + dutycycle 2 + notetype1 5 + inc_octave + inc_octave + note F_, 1 + note F#, 3 + note D_, 2 + note C#, 4 + dec_octave + dutycycle 0 + notetype1 9 + note D_, 4 + note __, 2 + dec_octave + note A_, 2 + note __, 4 + note A_, 2 + inc_octave + inc_octave + dutycycle 2 + notetype1 5 + note E_, 1 + note F_, 3 + note D_, 2 + note C#, 4 + dec_octave + dutycycle 0 + notetype1 9 + note D_, 4 + note __, 2 + dec_octave + note A_, 2 + note __, 4 + note B_, 2 + inc_octave + dutycycle 2 + notetype1 5 + note E_, 4 + note G#, 2 + note B_, 4 + inc_octave + note E_, 2 + note __, 4 + dec_octave + dutycycle 0 + notetype1 6 + note A#, 2 + notetype1 3 + note A#, 2 + note __, 2 + inc_octave + notetype1 6 + note C_, 1 + note C#, 5 + dec_octave + note B_, 6 + note A#, 4 + note __, 2 + note G#, 1 + note A_, 5 + notetype1 9 + note D_, 2 + notetype1 6 + note F#, 4 + note D_, 2 + note F#, 4 + dec_octave + notetype1 9 + note A_, 4 + note __, 2 + notetype1 6 + inc_octave + note G#, 1 + note A_, 5 + notetype1 9 + note D_, 2 + notetype1 6 + note F#, 4 + note D_, 2 + note F#, 4 + dec_octave + notetype1 9 + note A_, 4 + note __, 2 + inc_octave + notetype1 6 + note G#, 1 + note A_, 5 + notetype1 9 + note D_, 2 + notetype1 6 + note A_, 4 + note __, 2 + note A_, 4 + dec_octave + notetype1 9 + note A_, 2 + inc_octave + notetype1 6 + note A_, 4 + note G#, 12 + dec_octave + notetype1 9 + note A_, 4 + note __, 2 + note B_, 4 + note __, 2 + inc_octave + note D_, 2 + loopchannel 0, .MainLoop + + +Music_TCGClub1_Ch3: + notetype0 5 + notetype1 1 + notetype2 11 + octave 2 + note A_, 2 + note __, 2 + note E_, 2 + note A_, 2 + note __, 4 + note A#, 2 + note __, 2 + note E_, 2 + note A#, 2 + note __, 4 + note B_, 2 + note B_, 2 + note F#, 2 + note F_, 2 + inc_octave + note D_, 2 + dec_octave + note E_, 2 + note __, 4 + inc_octave + note E_, 6 + dec_octave + note E_, 2 +.MainLoop + octave 2 + note A_, 4 + inc_octave + note A_, 2 + dec_octave + note C#, 6 + note E_, 4 + inc_octave + note A_, 2 + dec_octave + note F_, 4 + inc_octave + note A#, 2 + dec_octave + note F#, 4 + inc_octave + note F#, 2 + note C#, 6 + dec_octave + note A#, 4 + inc_octave + inc_octave + note C#, 2 + dec_octave + dec_octave + note F#, 6 + callchannel Branch_fa01a + octave 2 + note A_, 4 + inc_octave + note A_, 2 + dec_octave + note C#, 6 + note E_, 4 + inc_octave + note A_, 2 + dec_octave + note F_, 4 + inc_octave + inc_octave + note C#, 2 + dec_octave + dec_octave + note F#, 4 + inc_octave + note F#, 2 + note C#, 6 + dec_octave + note A#, 4 + inc_octave + inc_octave + note E_, 2 + dec_octave + dec_octave + note F#, 6 + callchannel Branch_fa01a + octave 2 + note D_, 4 + inc_octave + note F#, 2 + dec_octave + note D_, 4 + note __, 2 + note D_, 4 + inc_octave + note A_, 2 + dec_octave + note D_, 4 + inc_octave + note F#, 2 + dec_octave + note D_, 4 + inc_octave + note F_, 2 + dec_octave + note D_, 4 + note __, 2 + note D_, 4 + inc_octave + note A_, 2 + dec_octave + note D_, 4 + inc_octave + note F_, 2 + dec_octave + note C#, 4 + inc_octave + note E_, 2 + dec_octave + note C#, 6 + note E_, 4 + inc_octave + inc_octave + note E_, 2 + dec_octave + dec_octave + note F_, 6 + note F#, 4 + inc_octave + note A#, 2 + note C#, 6 + dec_octave + note A#, 4 + inc_octave + note F#, 2 + dec_octave + note F#, 6 + note B_, 4 + inc_octave + note A_, 2 + dec_octave + note F#, 6 + note A_, 4 + inc_octave + note F#, 2 + dec_octave + note A#, 4 + inc_octave + inc_octave + note D_, 2 + dec_octave + dec_octave + note B_, 4 + inc_octave + note A_, 2 + dec_octave + note F#, 6 + note D_, 4 + inc_octave + note F#, 2 + dec_octave + note F#, 6 + note E_, 4 + inc_octave + note A_, 2 + dec_octave + note E_, 6 + note E_, 4 + inc_octave + note F#, 2 + dec_octave + note E_, 4 + inc_octave + note F#, 2 + note E_, 4 + note G#, 2 + dec_octave + note E_, 4 + inc_octave + note F#, 2 + dec_octave + note F#, 4 + inc_octave + note G#, 2 + dec_octave + note G#, 4 + inc_octave + note B_, 2 + loopchannel 0, .MainLoop + +Branch_fa01a: + octave 2 + note B_, 4 + inc_octave + note A_, 2 + dec_octave + note C#, 6 + note D_, 4 + inc_octave + note F#, 2 + dec_octave + note D#, 6 + note E_, 4 + inc_octave + note B_, 2 + dec_octave + note B_, 6 + note G#, 4 + inc_octave + note B_, 2 + dec_octave + note E_, 4 + inc_octave + note E_, 2 + endchannel + + +Music_TCGClub1_Ch4: + togglenoise $06 + notetype 5 + octave 1 + note C_, 2 + note __, 2 + note C_, 2 + note C#, 2 + note D#, 2 + note E_, 2 + note C_, 2 + note __, 2 + note C_, 2 + note C#, 2 + note D#, 2 + note E_, 2 + note C#, 4 + note D_, 1 + note D_, 1 + note C#, 4 + note C#, 2 + note __, 4 + note D_, 1 + note D_, 1 + note C#, 4 + note C#, 2 +.MainLoop + callchannel Branch_fa06f + note C_, 4 +.Loop1 + note C#, 2 + loopchannel 4, .Loop1 + callchannel Branch_fa06f + note C_, 4 + note D_, 1 + note D_, 1 + note C#, 4 + note C#, 2 + loopchannel 0, .MainLoop + +Branch_fa06f: +.Loop2 + note C_, 4 + note D#, 2 + note C#, 4 + note D#, 2 + loopchannel 15, .Loop2 + endchannel + diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm new file mode 100644 index 00000000..9c16a635 --- /dev/null +++ b/crysaudio/music/TCG/club2.asm @@ -0,0 +1,324 @@ +Music_TCGClub2: + db $80 + dw Music_TCGClub2_Ch1 + db $01 + dw Music_TCGClub2_Ch2 + db $02 + dw Music_TCGClub2_Ch3 + +Music_TCGClub2_Ch1: + notetype0 6 + dutycycle 2 + notetype2 6 +.MainLoop + octave 4 +.Loop1 + notetype1 7 + note G_, 4 + note E_, 4 + note C_, 4 + notetype1 7 + notetype2 0 + note F#, 4 + notetype2 6 + note F#, 16 + notetype1 7 + note G_, 4 + note A_, 4 + note B_, 4 + notetype1 7 + notetype2 0 + note F#, 4 + notetype2 6 + note F#, 16 + loopchannel 8, .Loop1 + notetype1 7 + note G_, 4 + note D_, 4 + dec_octave + note B_, 4 + inc_octave + notetype1 7 + notetype2 0 + note B_, 4 + notetype2 6 + note B_, 16 + notetype1 7 + note G_, 4 + note D_, 4 + note C_, 4 + notetype1 7 + notetype2 0 + note B_, 4 + notetype2 6 + note B_, 16 + dec_octave + notetype1 7 + note F#, 4 + dec_octave + note D_, 4 + note F#, 4 + note A_, 4 + inc_octave + note D_, 4 + note F#, 4 + note A_, 4 + inc_octave + note D_, 4 + dec_octave + note C_, 4 + dec_octave + note C_, 4 + note E_, 4 + note G_, 4 + inc_octave + note C_, 4 + note E_, 4 + note G_, 4 + inc_octave + note C_, 4 + dec_octave + note D_, 4 + dec_octave + note D_, 4 + note F#, 4 + note A_, 4 + inc_octave + note D_, 4 + note F#, 4 + note A_, 4 + note A_, 3 + notetype0 1 + note A_, 3 + inc_octave + notetype1 7 + note __, 4 + note D_, 5 + notetype0 6 + notetype2 0 + note D_, 15 + notetype2 6 + note D_, 16 + loopchannel 0, .MainLoop + + +Music_TCGClub2_Ch2: + notetype0 6 + dutycycle 2 + notetype2 6 +.MainLoop + octave 2 +.Loop1 + notetype1 7 + note C_, 4 + note G_, 4 + inc_octave + note G_, 4 + inc_octave + notetype1 7 + notetype2 0 + note D_, 4 + notetype2 6 + note D_, 16 + dec_octave + dec_octave + notetype1 7 + note C_, 4 + note G_, 4 + inc_octave + inc_octave + note C_, 4 + notetype1 7 + notetype2 0 + note D_, 4 + notetype2 6 + note D_, 16 + dec_octave + dec_octave + loopchannel 8, .Loop1 + dec_octave + notetype1 7 + note B_, 4 + inc_octave + note G_, 4 + inc_octave + note G_, 4 + inc_octave + notetype1 7 + notetype2 0 + note G_, 4 + notetype2 6 + note G_, 16 + dec_octave + dec_octave + dec_octave + notetype1 7 + note A_, 4 + inc_octave + note A_, 4 + inc_octave + note A_, 4 + inc_octave + notetype1 7 + notetype2 0 + note C_, 4 + notetype2 6 + note C_, 16 + dec_octave + dec_octave + notetype1 7 + note D_, 4 + octave 2 + note F#, 4 + note A_, 4 + inc_octave + note D_, 4 + note F#, 4 + note A_, 4 + inc_octave + note D_, 4 + note F#, 4 + note G_, 4 + dec_octave + dec_octave + note E_, 4 + note G_, 4 + inc_octave + note C_, 4 + note E_, 4 + note G_, 4 + inc_octave + note C_, 4 + note E_, 4 + note F#, 4 + dec_octave + dec_octave + note F#, 4 + note A_, 4 + inc_octave + note D_, 4 + note F#, 4 + note A_, 4 + inc_octave + note D_, 4 + note E_, 3 + notetype0 1 + note E_, 3 + dec_octave + notetype1 7 + note A_, 8 + inc_octave + notetype1 7 + note F#, 7 + notetype0 6 + notetype2 0 + note F#, 14 + notetype2 6 + note F#, 16 + loopchannel 0, .MainLoop + + +Music_TCGClub2_Ch3: + notetype0 6 + notetype1 1 + notetype2 10 + vibrato 35, $33 +.MainLoop + notetype1 3 + note __, 2 + octave 5 + note G_, 4 + note E_, 4 + note C_, 4 + note F#, 2 + note __, 2 + note __, 16 + note G_, 4 + note A_, 4 + note B_, 4 + note F#, 2 + note __, 2 + note __, 14 + notetype1 2 + callchannel Branch_fa1cf + octave 5 + note G_, 8 + callchannel Branch_fa1cf + notetype1 1 + octave 4 + note G_, 8 + callchannel Branch_fa1f3 + octave 4 + note G_, 16 + note G_, 12 + note __, 16 + note __, 8 + note E_, 8 + callchannel Branch_fa1f3 + octave 4 + note G_, 16 + note G_, 12 + note G_, 16 + note G_, 8 + note __, 4 + note A_, 2 + note G_, 2 + note F#, 16 + note F#, 12 + note __, 4 + note F#, 1 + note G_, 15 + note G_, 12 + note __, 4 + note G#, 1 + note A_, 15 + note A_, 16 + note __, 16 + note __, 16 + loopchannel 0, .MainLoop + +Branch_fa1cf: + octave 6 + note C#, 1 + note D_, 15 + note D_, 12 + note C_, 2 + dec_octave + note B_, 2 + note G_, 16 + note G_, 8 + note __, 4 + note E_, 4 + note B_, 4 + inc_octave + note C_, 4 + dec_octave + note B_, 4 + note A_, 16 + note A_, 8 + note A_, 16 + note __, 4 + endchannel + +Branch_fa1f3: + octave 5 + note C#, 1 + note D_, 15 + note D_, 4 + note E_, 4 + dec_octave + note B_, 4 + inc_octave + note C_, 4 + note D_, 16 + note D_, 8 + note __, 4 + note C_, 2 + dec_octave + note B_, 2 + inc_octave + note C_, 2 + dec_octave + note B_, 2 + endchannel + diff --git a/crysaudio/music/TCG/club3.asm b/crysaudio/music/TCG/club3.asm new file mode 100644 index 00000000..dcb10b6a --- /dev/null +++ b/crysaudio/music/TCG/club3.asm @@ -0,0 +1,1060 @@ +Music_TCGClub3: + db $C0 + dw Music_TCGClub3_Ch1 + db $01 + dw Music_TCGClub3_Ch2 + db $02 + dw Music_TCGClub3_Ch3 + db $03 + dw Music_TCGClub3_Ch4 + +Music_TCGClub3_Ch1: + notetype0 9 + vibrato 20, $33 + notetype2 8 +.MainLoop + dutycycle 0 +.Loop1 + octave 2 + notetype1 9 + note __, 4 + note G_, 2 + notetype1 3 + note G_, 1 + inc_octave + notetype1 9 + note C_, 1 + notetype1 3 + note C_, 2 + dec_octave + notetype1 9 + note A#, 6 + note A#, 12 + notetype1 3 + note A#, 4 + note __, 4 + notetype1 9 + note G_, 2 + notetype1 3 + note G_, 1 + inc_octave + notetype1 9 + notetype0 1 + note C_, 5 + note C#, 4 + notetype0 9 + note C_, 1 + notetype1 3 + note C_, 1 + dec_octave + notetype1 9 + note A#, 6 + note A#, 12 + notetype1 3 + note A#, 4 + loopchannel 2, .Loop1 + dutycycle 1 + notetype1 9 + notetype2 7 + callchannel Branch_fa330 + callchannel Branch_fa403 + note A#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note F_, 1 + dec_octave + note D_, 1 + note D#, 1 + inc_octave + note G_, 1 + octave 2 + note G_, 1 + octave 4 + note C#, 1 + note C_, 1 + octave 2 + note G_, 1 + inc_octave + notetype2 8 + notetype0 1 + note G_, 5 + notetype1 3 + note G_, 4 + notetype0 9 + notetype1 8 + note C#, 1 + note C_, 1 + dec_octave + note A#, 1 + notetype1 9 + notetype2 7 + callchannel Branch_fa330 + callchannel Branch_fa403 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note F#, 1 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note F_, 1 + dec_octave + note C#, 1 + note D_, 1 + inc_octave + note F#, 1 + octave 2 + note G_, 1 + octave 4 + note C#, 1 + note C_, 1 + octave 2 + note G_, 1 + octave 4 + dutycycle 2 + notetype1 7 + notetype0 1 + notetype2 8 + note G_, 5 + note C#, 4 + note C_, 5 + dec_octave + note A#, 4 + note G_, 5 + note C#, 4 + note C_, 5 + dec_octave + note A#, 4 + dutycycle 1 + notetype2 7 + notetype0 9 + callchannel Branch_fa370 + callchannel Branch_fa403 + note A#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note F_, 1 + dec_octave + note D_, 1 + note D#, 1 + inc_octave + note G_, 1 + octave 2 + note G_, 1 + octave 4 + note C#, 1 + note C_, 1 + octave 2 + note G_, 1 + inc_octave + notetype2 8 + notetype0 1 + note G_, 5 + notetype1 3 + note G_, 4 + notetype0 9 + notetype1 8 + note C#, 1 + note C_, 1 + dec_octave + note A#, 1 + callchannel Branch_fa370 + callchannel Branch_fa403 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note F#, 1 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note F_, 1 + dec_octave + note C_, 1 + note C#, 1 + inc_octave + note F#, 1 + octave 2 + note G_, 1 + octave 4 + note C#, 1 + note C_, 1 + dec_octave + note A#, 1 + inc_octave + dutycycle 2 + notetype0 1 + notetype2 8 + notetype1 7 + note G_, 5 + note C#, 4 + note C_, 5 + dec_octave + note A#, 4 + note G_, 5 + note C#, 4 + note C_, 5 + dec_octave + note A#, 4 + notetype0 9 + notetype2 8 + loopchannel 0, .MainLoop + +Branch_fa330: + octave 2 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note C#, 1 + note C_, 1 + dec_octave + note D_, 1 + note A#, 1 + note D_, 1 + dec_octave + note G_, 1 + inc_octave + note A#, 1 + dec_octave + notetype0 1 + notetype2 8 + note F_, 5 + note F#, 4 + notetype0 9 + notetype2 7 + note G_, 1 + inc_octave + note E_, 1 + dec_octave + note F_, 1 + note F#, 1 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note F_, 1 + note E_, 1 + dec_octave + note D_, 1 + inc_octave + note G_, 1 + octave 2 + note G_, 1 + octave 4 + note C#, 1 + note C_, 1 + octave 2 + note G_, 1 + note A#, 1 + inc_octave + note C_, 1 + dec_octave + note F_, 1 + note F#, 1 + endchannel + +Branch_fa370: + octave 2 + notetype1 9 + notetype2 7 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note C#, 1 + note C_, 1 + dec_octave + note D_, 1 + note A#, 1 + note D_, 1 + dec_octave + note G_, 1 + inc_octave + note A#, 1 + dec_octave + notetype0 1 + notetype2 8 + note F_, 5 + note F#, 4 + octave 4 + dutycycle 2 + notetype1 7 + note G_, 3 + notetype1 1 + note G_, 2 + inc_octave + notetype1 7 + note D_, 2 + notetype1 1 + dec_octave + note G_, 2 + inc_octave + notetype1 7 + note G_, 3 + notetype1 1 + note D_, 2 + notetype1 7 + note D_, 2 + notetype1 1 + note G_, 2 + dec_octave + notetype1 7 + note G_, 3 + notetype1 1 + inc_octave + note D_, 2 + notetype1 7 + note D_, 2 + notetype1 1 + dec_octave + note G_, 2 + inc_octave + notetype1 7 + note G_, 3 + notetype1 1 + note D_, 2 + notetype1 7 + note D_, 2 + notetype1 1 + note G_, 2 + notetype0 9 + dutycycle 1 + notetype2 7 + notetype1 9 + octave 2 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note F_, 1 + note E_, 1 + dec_octave + note D_, 1 + inc_octave + note G_, 1 + octave 2 + note G_, 1 + octave 4 + note C#, 1 + note C_, 1 + octave 2 + note G_, 1 + octave 5 + dutycycle 2 + notetype0 1 + notetype2 8 + notetype1 7 + octave 5 + note G_, 5 + note C#, 4 + note C_, 5 + dec_octave + note A#, 4 + note G_, 5 + note C#, 4 + note C_, 5 + dec_octave + note A#, 4 + notetype0 9 + dutycycle 1 + notetype2 7 + notetype1 9 + endchannel + +Branch_fa403: + octave 2 + note G_, 1 + inc_octave + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note C#, 1 + note C_, 1 + dec_octave + note D_, 1 + note A#, 1 + note D_, 1 + dec_octave + note G_, 1 + inc_octave + note A#, 1 + dec_octave + notetype0 1 + notetype2 8 + note F_, 5 + note F#, 4 + notetype0 9 + notetype2 7 + note G_, 1 + endchannel + + +Music_TCGClub3_Ch2: + notetype0 9 + vibrato 20, $33 + notetype2 8 +.MainLoop + dutycycle 0 +.Loop1 + octave 2 + notetype1 7 + note __, 4 + note D_, 2 + notetype1 3 + note D_, 1 + notetype1 7 + note F_, 1 + notetype1 3 + note F_, 2 + notetype1 7 + note E_, 6 + note E_, 12 + notetype1 3 + note E_, 4 + note __, 4 + notetype1 7 + note D_, 2 + notetype1 3 + note D_, 1 + notetype1 7 + notetype0 1 + note F_, 5 + note F#, 4 + notetype0 9 + note F_, 1 + notetype1 3 + note F_, 1 + notetype1 7 + note E_, 6 + note E_, 12 + notetype1 3 + note E_, 4 + loopchannel 2, .Loop1 + dutycycle 1 +.Loop2 + callchannel Branch_fa5a6 + notetype0 9 + note __, 1 + inc_octave + notetype1 8 + notetype0 1 + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + notetype1 9 + notetype2 7 + note G_, 1 + dec_octave + notetype0 1 + notetype2 8 + notetype1 8 + note F_, 5 + note F#, 4 + inc_octave + notetype0 9 + notetype1 9 + notetype2 7 + note G_, 1 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 9 + note F_, 1 + notetype1 3 + note F_, 2 + dec_octave + notetype1 9 + note D_, 1 + inc_octave + inc_octave + notetype1 8 + notetype0 1 + note D_, 5 + notetype1 3 + note D_, 4 + notetype1 9 + notetype0 9 + note __, 1 + dec_octave + notetype0 1 + notetype2 8 + note G_, 5 + note D_, 4 + dec_octave + note A#, 5 + notetype1 3 + note A#, 4 + inc_octave + inc_octave + notetype1 9 + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + notetype1 8 + note __, 1 + dec_octave + notetype0 1 + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + notetype1 9 + notetype2 7 + note G_, 1 + dec_octave + notetype0 1 + notetype2 8 + notetype1 8 + note F_, 5 + note F#, 4 + inc_octave + notetype0 9 + notetype1 9 + notetype2 7 + note A#, 1 + notetype1 3 + note A#, 2 + inc_octave + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + dec_octave + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + dec_octave + notetype0 1 + notetype1 8 + note A#, 5 + notetype1 3 + note C_, 4 + notetype0 9 + note __, 1 + dec_octave + notetype1 8 + notetype2 8 + note A#, 1 + note B_, 1 + inc_octave + note C_, 1 + callchannel Branch_fa5a6 + notetype0 9 + note __, 1 + inc_octave + notetype0 1 + notetype1 8 + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + notetype1 9 + notetype2 7 + note G_, 1 + dec_octave + notetype0 1 + notetype2 8 + notetype1 8 + note F_, 5 + note F#, 4 + inc_octave + notetype0 9 + notetype1 9 + notetype2 7 + note G_, 1 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 9 + note F_, 1 + notetype1 3 + note F_, 2 + notetype1 9 + note D_, 1 + inc_octave + notetype1 8 + notetype0 1 + note G_, 5 + notetype1 3 + note G_, 4 + notetype0 9 + note __, 1 + dec_octave + dec_octave + notetype0 1 + notetype1 8 + note G_, 5 + notetype1 3 + note G_, 4 + inc_octave + notetype1 8 + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + note __, 1 + note __, 1 + notetype0 1 + notetype1 8 + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + notetype1 9 + notetype2 7 + note G_, 1 + dec_octave + notetype0 1 + notetype2 8 + notetype1 8 + note F_, 5 + note F#, 4 + inc_octave + inc_octave + notetype0 9 + notetype1 9 + notetype2 7 + note C#, 1 + notetype1 3 + note C#, 2 + notetype1 9 + note C_, 1 + notetype1 3 + note C_, 1 + dec_octave + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 8 + notetype0 1 + note F_, 5 + notetype1 3 + note F_, 4 + notetype1 8 + notetype0 9 + note __, 1 + dec_octave + notetype2 8 + note D_, 1 + note D#, 1 + note E_, 1 + loopchannel 2, .Loop2 + loopchannel 0, .MainLoop + +Branch_fa5a6: + octave 3 + note __, 1 + notetype1 8 + notetype0 1 + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + notetype1 9 + notetype2 7 + note G_, 1 + dec_octave + notetype0 1 + notetype1 8 + notetype2 8 + note F_, 5 + note F#, 4 + inc_octave + notetype0 9 + notetype2 7 + notetype1 9 + note G_, 1 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 9 + note F_, 1 + notetype1 3 + note F_, 2 + notetype1 9 + note E_, 1 + inc_octave + notetype1 8 + notetype2 8 + notetype0 1 + note D_, 5 + notetype1 3 + note D_, 4 + notetype1 8 + notetype0 9 + note __, 1 + dec_octave + notetype0 1 + notetype2 8 + note G_, 5 + note D_, 4 + dec_octave + note A#, 5 + notetype1 3 + note A#, 4 + notetype1 8 + inc_octave + inc_octave + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + note __, 1 + dec_octave + notetype0 1 + notetype1 8 + note D_, 5 + notetype1 3 + note D_, 4 + notetype0 9 + notetype1 9 + notetype2 7 + note G_, 1 + dec_octave + notetype0 1 + notetype1 8 + notetype2 8 + note F_, 5 + note F#, 4 + notetype0 9 + inc_octave + notetype1 9 + notetype2 7 + note A#, 1 + notetype1 3 + note A#, 2 + inc_octave + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + dec_octave + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + dec_octave + notetype1 9 + note A#, 1 + notetype1 3 + note A#, 1 + notetype2 8 + notetype1 8 + note A#, 1 + notetype1 3 + note A#, 2 + endchannel + + +Music_TCGClub3_Ch3: + notetype0 9 + notetype1 1 + notetype2 11 +.Loop1 + octave 2 + note G_, 1 + note __, 1 + note G_, 14 + note __, 1 + inc_octave + note F_, 1 + note __, 2 + note G_, 1 + note __, 2 + dec_octave + note G_, 1 + note __, 1 + note E_, 3 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + loopchannel 4, .Loop1 +.Loop2 + octave 2 + note G_, 1 + octave 4 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + inc_octave + note F_, 1 + note G_, 1 + note __, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note G_, 1 + note __, 1 + octave 5 + note G_, 1 + note __, 1 + octave 2 + note E_, 1 + note F_, 1 + octave 5 + note G_, 1 + octave 2 + note G_, 1 + octave 4 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + inc_octave + note F_, 1 + note G_, 1 + note __, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note G_, 1 + note __, 1 + inc_octave + note F_, 1 + note __, 1 + note E_, 1 + octave 2 + note F_, 1 + note F#, 1 + note D#, 1 + octave 4 + note G_, 1 + note __, 1 + octave 2 + note D#, 1 + inc_octave + note D_, 1 + note D#, 1 + note __, 1 + dec_octave + note D#, 1 + note __, 1 + inc_octave + note D#, 1 + note __, 1 + octave 5 + note G_, 1 + note __, 1 + octave 2 + note C_, 1 + note C#, 1 + octave 5 + note G_, 1 + octave 2 + note D#, 1 + octave 4 + note G_, 1 + note __, 1 + octave 2 + note D#, 1 + inc_octave + note D_, 1 + note D#, 1 + note __, 1 + dec_octave + note D#, 1 + note __, 1 + inc_octave + note D#, 1 + note __, 1 + inc_octave + note F_, 1 + note __, 1 + dec_octave + note D_, 1 + note D#, 1 + note E_, 1 + dec_octave + note C_, 1 + octave 4 + note G_, 1 + note __, 1 + octave 2 + note C_, 1 + note A#, 1 + inc_octave + note C_, 1 + note __, 1 + dec_octave + note C_, 1 + note __, 1 + inc_octave + note C_, 1 + note __, 1 + octave 5 + note G_, 1 + note __, 1 + octave 2 + note A_, 1 + note A#, 1 + octave 5 + note G_, 1 + octave 2 + note C_, 1 + octave 4 + note G_, 1 + note __, 1 + octave 2 + note C_, 1 + note A#, 1 + inc_octave + note C_, 1 + note __, 1 + dec_octave + note C_, 1 + note __, 1 + inc_octave + note C_, 1 + note __, 1 + inc_octave + note F_, 1 + note __, 1 + note E_, 1 + octave 2 + note A#, 1 + note B_, 1 + note D_, 1 + octave 4 + note G_, 1 + note __, 1 + octave 2 + note D_, 1 + inc_octave + note C_, 1 + note D_, 1 + note __, 1 + dec_octave + note D_, 1 + note __, 1 + inc_octave + note D_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 3 + note A#, 1 + dec_octave + note C_, 1 + note C#, 1 + note D_, 1 + octave 4 + note G_, 1 + note __, 1 + octave 2 + note D_, 1 + inc_octave + note C_, 1 + note D_, 1 + note __, 1 + dec_octave + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + inc_octave + note A#, 1 + note __, 1 + dec_octave + note A#, 1 + note B_, 1 + inc_octave + note C_, 1 + loopchannel 2, .Loop2 + loopchannel 0, Music_TCGClub3_Ch3 + + +Music_TCGClub3_Ch4: + togglenoise $06 + notetype 9 + octave 1 +.MainLoop +.Loop1 + callchannel Branch_fa796 + note C#, 2 + note E_, 2 + callchannel Branch_fa796 + note C#, 2 + note D#, 1 + note C#, 1 + loopchannel 3, .Loop1 + callchannel Branch_fa796 + note C#, 2 + note E_, 2 + callchannel Branch_fa796 + note C#, 1 + notetype 1 + note D#, 5 + note C#, 4 + notetype 9 + note C#, 1 + note C#, 1 + loopchannel 0, .MainLoop + +Branch_fa796: + note C_, 2 + note D#, 2 + note C#, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note C_, 1 + note E_, 1 + note C_, 1 + endchannel + diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm new file mode 100644 index 00000000..857086f3 --- /dev/null +++ b/crysaudio/music/TCG/credits.asm @@ -0,0 +1,3386 @@ +Music_TCGCredits: + db $C0 + dw Music_TCGCredits_Ch1 + db $01 + dw Music_TCGCredits_Ch2 + db $02 + dw Music_TCGCredits_Ch3 + db $03 + dw Music_TCGCredits_Ch4 + +Music_TCGCredits_Ch1: + notetype0 13 + vibrato 20, $33 + notetype2 8 + octave 2 + dutycycle 1 + notetype1 5 + note F_, 1 + notetype1 6 + note F_, 2 + notetype0 1 + note F_, 6 + notetype1 3 + note F_, 7 + notetype0 13 + notetype1 7 + note G_, 1 + notetype1 7 + note G_, 2 + notetype0 1 + note G_, 6 + notetype1 4 + note G_, 7 + notetype0 13 + notetype1 7 + note A_, 1 + notetype1 8 + note A_, 2 + notetype0 1 + note A_, 6 + notetype1 4 + note A_, 7 + notetype0 13 + notetype1 8 + note B_, 3 + notetype1 4 + note B_, 1 + inc_octave + notetype1 8 + note C_, 1 + notetype1 3 + note C_, 1 + callchannel Branch_fb5bc + octave 2 + note F_, 1 + notetype1 3 + note F_, 1 + notetype0 13 + octave 2 + notetype1 8 + note A_, 1 + note __, 1 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 8 + note A_, 1 + note B_, 1 + inc_octave + note C_, 1 + notetype1 3 + note C_, 1 + note __, 1 + callchannel Branch_fb5bc + octave 2 + note A_, 2 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 8 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 8 + note B_, 1 + inc_octave + callchannel Branch_fb5e4 + octave 4 + notetype1 10 + note C_, 1 + notetype1 3 + note C_, 1 + dec_octave + notetype1 10 + note G_, 4 + note G_, 8 + notetype1 3 + note G_, 1 + notetype1 10 + note E_, 1 + note F_, 1 + notetype0 1 + note G_, 6 + notetype1 3 + note G_, 7 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 4 + notetype1 3 + note G_, 1 + notetype1 10 + note F_, 1 + notetype1 3 + note F_, 1 + notetype1 10 + notetype0 1 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 2 + note E_, 1 + notetype0 1 + note E_, 6 + note F_, 4 + note E_, 3 + note D_, 13 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 4 + note D_, 8 + notetype1 3 + note D_, 2 + callchannel Branch_fb5e4 + octave 4 + notetype1 10 + note E_, 1 + notetype1 3 + note E_, 1 + dec_octave + notetype1 10 + note G_, 4 + note G_, 8 + notetype1 3 + note G_, 1 + notetype1 10 + note E_, 1 + note F_, 1 + notetype0 1 + note G_, 6 + notetype1 3 + note G_, 7 + notetype1 10 + note G_, 3 + note G#, 10 + note G#, 13 + notetype1 3 + note G#, 13 + inc_octave + notetype1 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 2 + note F_, 1 + notetype1 3 + note F_, 1 + notetype1 10 + note C_, 1 + note D_, 1 + notetype1 3 + note D_, 1 + notetype1 10 + notetype0 1 + note D#, 3 + note E_, 10 + notetype0 13 + note E_, 8 + callchannel Branch_fb60c + notetype0 13 + octave 4 + note G_, 8 + notetype1 3 + note G_, 1 + notetype1 10 + notetype0 1 + note F#, 3 + note G_, 10 + notetype1 3 + note G_, 13 + notetype1 10 + note F_, 13 + notetype1 3 + note F_, 13 + notetype1 10 + note E_, 13 + notetype1 3 + note E_, 13 + notetype1 10 + note E_, 6 + note F_, 7 + note E_, 13 + dec_octave + note A_, 6 + notetype1 3 + note A_, 7 + inc_octave + notetype1 10 + note C_, 6 + notetype1 3 + note C_, 7 + dec_octave + notetype1 10 + note F_, 6 + notetype1 3 + note F_, 13 + note __, 7 + notetype1 10 + note A_, 13 + inc_octave + note C_, 6 + notetype1 3 + note C_, 7 + notetype1 10 + note D#, 3 + note E_, 10 + note E_, 13 + note F_, 6 + notetype1 3 + note F_, 7 + notetype1 10 + note E_, 6 + notetype1 3 + note E_, 7 + notetype1 10 + note C_, 6 + notetype1 3 + note C_, 13 + note __, 7 + notetype1 10 + note C#, 3 + note D_, 10 + note D_, 13 + note C#, 6 + note C_, 7 + dec_octave + note B_, 13 + inc_octave + note C_, 6 + notetype1 3 + note C_, 7 + notetype1 10 + note G_, 6 + notetype1 3 + note G_, 7 + notetype1 10 + notetype0 13 + note E_, 5 + callchannel Branch_fb60c + notetype0 13 + octave 4 + note G_, 3 + notetype1 3 + note G_, 1 + notetype1 10 + note G_, 1 + notetype0 1 + note A_, 6 + notetype1 3 + note A_, 7 + notetype1 10 + note B_, 6 + notetype1 3 + note B_, 7 + notetype1 10 + note B_, 3 + inc_octave + note C_, 10 + notetype1 3 + note C_, 13 + dec_octave + notetype1 10 + note F#, 3 + note G_, 10 + notetype1 3 + note G_, 13 + notetype1 10 + note F_, 13 + notetype1 3 + note F_, 13 + notetype1 10 + note E_, 13 + notetype1 3 + note E_, 13 + notetype1 10 + note E_, 3 + note F_, 10 + note F_, 13 + note E_, 13 + note C_, 6 + notetype1 3 + note C_, 7 + dec_octave + notetype1 10 + note A_, 6 + notetype1 3 + note A_, 7 + note __, 13 + inc_octave + notetype1 10 + note C_, 13 + dec_octave + note A_, 6 + notetype1 3 + note A_, 7 + inc_octave + notetype1 10 + note E_, 3 + note F_, 10 + note F_, 13 + note E_, 13 + note C_, 6 + notetype1 3 + note C_, 7 + dec_octave + notetype1 10 + note G#, 6 + notetype1 3 + note G#, 7 + note __, 13 + inc_octave + notetype1 10 + note C_, 6 + notetype1 3 + note C_, 7 + note __, 13 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 8 + notetype1 3 + note G_, 1 + dec_octave + dec_octave + notetype1 8 + note G_, 1 + notetype1 2 + note G_, 1 + notetype1 8 + note A_, 1 + notetype1 2 + note A_, 1 + notetype1 8 + note B_, 1 + notetype0 1 + notetype1 10 + note G_, 3 + note A_, 3 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note E_, 3 + note F_, 3 + note G_, 4 + callchannel Branch_fb651 + octave 3 + notetype1 10 + note G#, 3 + note A_, 10 + note A_, 13 + notetype1 3 + note A_, 13 + notetype1 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note F#, 3 + note G_, 10 + note G_, 13 + notetype1 3 + note G_, 13 + notetype1 10 + note D#, 3 + note E_, 10 + notetype1 3 + note E_, 13 + notetype1 10 + note D_, 13 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 4 + note D_, 8 + notetype1 3 + note D_, 1 + dec_octave + notetype1 8 + note G_, 1 + notetype0 1 + note A_, 6 + notetype1 2 + note A_, 7 + notetype1 8 + note B_, 6 + notetype1 2 + note B_, 7 + callchannel Branch_fb651 + octave 3 + notetype1 10 + note G_, 3 + note G#, 10 + note G#, 13 + notetype1 3 + note G#, 13 + inc_octave + notetype1 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 2 + note F_, 1 + notetype1 3 + note F_, 1 + notetype1 10 + note C_, 1 + note D_, 1 + notetype1 3 + note D_, 1 + octave 4 + notetype1 10 + notetype0 1 + note D#, 3 + note E_, 10 + notetype0 13 + note E_, 4 + notetype1 3 + note E_, 1 + notetype1 10 + note F_, 1 + notetype0 1 + note G_, 5 + notetype1 3 + note G_, 8 + notetype0 13 + notetype1 10 + note E_, 5 + notetype1 3 + note E_, 1 + notetype1 10 + note F_, 1 + notetype0 1 + note G_, 5 + notetype1 3 + note G_, 8 + notetype0 13 + notetype1 10 + note C_, 5 + notetype1 3 + note C_, 1 + dec_octave + notetype0 1 + notetype1 10 + note A_, 6 + notetype1 3 + note A_, 13 + note __, 7 + inc_octave + notetype1 10 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 2 + notetype1 3 + note D_, 1 + notetype1 10 + note C_, 1 + notetype1 3 + note C_, 1 + dec_octave + notetype1 10 + note G#, 1 + notetype1 3 + note G#, 1 + notetype1 10 + notetype0 1 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 3 + notetype1 3 + note G_, 1 + notetype1 10 + note G_, 1 + notetype0 1 + note A_, 5 + notetype1 3 + note A_, 8 + notetype1 10 + note B_, 5 + notetype1 3 + note B_, 8 + notetype1 10 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + note C_, 2 + notetype0 1 + note C_, 6 + notetype1 3 + note C_, 13 + note __, 7 + dec_octave + notetype1 10 + note B_, 3 + inc_octave + note C_, 10 + note D_, 5 + notetype1 3 + note D_, 8 + notetype1 10 + note E_, 5 + notetype1 3 + note E_, 8 + notetype0 13 + notetype1 10 + note F_, 3 + note E_, 1 + notetype0 1 + note C_, 6 + notetype1 3 + note C_, 13 + note __, 7 + dec_octave + notetype1 10 + note A_, 6 + notetype1 3 + note A_, 13 + note __, 7 + notetype1 10 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + note C_, 2 + notetype0 1 + note C_, 6 + notetype1 3 + note C_, 13 + note __, 7 + notetype1 10 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 2 + notetype1 3 + note D_, 1 + notetype1 10 + note C_, 8 + note C_, 8 + note C_, 8 + notetype1 3 + note C_, 1 + notetype0 13 + octave 2 + notetype1 8 + note A_, 1 + note __, 1 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 8 + note A_, 1 + note B_, 1 + inc_octave + note C_, 1 + notetype1 3 + note C_, 1 + note __, 1 + callchannel Branch_fb5bc + octave 2 + note A_, 2 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 8 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 8 + note B_, 1 + inc_octave + callchannel Branch_fb5e4 + octave 4 + notetype1 10 + note C_, 1 + notetype1 3 + note C_, 1 + dec_octave + notetype1 10 + note G_, 4 + note G_, 8 + notetype1 3 + note G_, 1 + notetype1 10 + note E_, 1 + note F_, 1 + notetype0 1 + note G_, 6 + notetype1 3 + note G_, 7 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 4 + notetype1 3 + note G_, 1 + notetype1 10 + note F_, 1 + notetype1 3 + note F_, 1 + notetype1 10 + notetype0 1 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 2 + note E_, 1 + notetype0 1 + note E_, 6 + note F_, 4 + note E_, 3 + note D_, 13 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 4 + note D_, 8 + notetype1 3 + note D_, 2 + callchannel Branch_fb5e4 + octave 4 + notetype1 10 + note E_, 1 + notetype1 3 + note E_, 1 + dec_octave + notetype1 10 + note G_, 4 + note G_, 8 + notetype1 3 + note G_, 1 + notetype1 10 + note E_, 1 + note F_, 1 + notetype0 1 + note G_, 6 + notetype1 3 + note G_, 7 + notetype1 10 + note G_, 3 + note G#, 10 + note G#, 13 + notetype1 3 + note G#, 13 + inc_octave + notetype1 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 2 + note F_, 1 + notetype1 3 + note F_, 1 + notetype1 10 + note C_, 1 + note D_, 1 + notetype1 3 + note D_, 1 + notetype1 10 + notetype0 1 + note D#, 3 + note E_, 10 + notetype0 13 + note E_, 8 + callchannel Branch_fb60c + notetype0 13 + octave 4 + note G_, 8 + notetype1 3 + note G_, 1 + notetype1 10 + notetype0 1 + note F#, 3 + note G_, 10 + notetype1 3 + note G_, 13 + notetype1 10 + note F_, 13 + notetype1 3 + note F_, 13 + notetype1 10 + note E_, 13 + notetype1 3 + note E_, 13 + notetype1 10 + note E_, 6 + note F_, 7 + note E_, 13 + dec_octave + note A_, 6 + notetype1 3 + note A_, 7 + inc_octave + notetype1 10 + note C_, 6 + notetype1 3 + note C_, 7 + dec_octave + notetype1 10 + note F_, 6 + notetype1 3 + note F_, 13 + note __, 7 + notetype1 10 + note A_, 13 + inc_octave + note C_, 6 + notetype1 3 + note C_, 7 + notetype1 10 + note D#, 3 + note E_, 10 + note E_, 13 + note F_, 6 + notetype1 3 + note F_, 7 + notetype1 10 + note E_, 6 + notetype1 3 + note E_, 7 + notetype1 10 + note C_, 6 + notetype1 3 + note C_, 13 + note __, 7 + notetype1 10 + note C#, 3 + note D_, 10 + note D_, 13 + note C#, 6 + note C_, 7 + dec_octave + note B_, 13 + inc_octave + note C_, 6 + notetype1 3 + note C_, 7 + notetype1 10 + note G_, 6 + notetype1 3 + note G_, 7 + notetype1 10 + notetype0 13 + note E_, 5 + callchannel Branch_fb60c + notetype0 13 + octave 4 + note G_, 3 + notetype1 3 + note G_, 1 + notetype1 10 + note G_, 1 + notetype0 1 + note A_, 6 + notetype1 3 + note A_, 7 + notetype1 10 + note B_, 6 + notetype1 3 + note B_, 7 + notetype1 10 + note B_, 3 + inc_octave + note C_, 10 + notetype1 3 + note C_, 13 + dec_octave + notetype1 10 + note F#, 3 + note G_, 10 + notetype1 3 + note G_, 13 + notetype1 10 + note F_, 13 + notetype1 3 + note F_, 13 + notetype1 10 + note E_, 13 + notetype1 3 + note E_, 13 + notetype1 10 + note E_, 3 + note F_, 10 + note F_, 13 + note E_, 13 + note C_, 6 + notetype1 3 + note C_, 7 + dec_octave + notetype1 10 + note A_, 6 + notetype1 3 + note A_, 7 + note __, 13 + inc_octave + notetype1 10 + note C_, 13 + dec_octave + note A_, 6 + notetype1 3 + note A_, 7 + inc_octave + notetype1 10 + note E_, 3 + note F_, 10 + note F_, 13 + note E_, 13 + note C_, 6 + notetype1 3 + note C_, 7 + dec_octave + notetype1 10 + note G#, 6 + notetype1 3 + note G#, 7 + note __, 13 + inc_octave + notetype1 10 + note C_, 6 + notetype1 3 + note C_, 7 + note __, 13 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 8 + notetype1 3 + note G_, 1 + dec_octave + dec_octave + notetype1 8 + note G_, 1 + notetype1 2 + note G_, 1 + notetype1 8 + note A_, 1 + notetype1 2 + note A_, 1 + notetype1 8 + note B_, 1 + notetype0 1 + notetype1 10 + note G_, 3 + note A_, 3 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note E_, 3 + note F_, 3 + note G_, 4 + callchannel Branch_fb651 + octave 3 + notetype1 10 + note G#, 3 + note A_, 10 + note A_, 13 + notetype1 3 + note A_, 13 + notetype1 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note F#, 3 + note G_, 10 + note G_, 13 + notetype1 3 + note G_, 13 + notetype1 10 + note D#, 3 + note E_, 10 + notetype1 3 + note E_, 13 + notetype1 10 + note D_, 13 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 4 + note D_, 8 + notetype1 3 + note D_, 1 + dec_octave + notetype1 8 + note G_, 1 + notetype0 1 + note A_, 6 + notetype1 2 + note A_, 7 + notetype1 8 + note B_, 6 + notetype1 2 + note B_, 7 + callchannel Branch_fb651 + octave 3 + notetype1 10 + note G_, 3 + note G#, 10 + note G#, 13 + notetype1 3 + note G#, 13 + inc_octave + notetype1 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note C#, 3 + note D_, 10 + note C_, 13 + notetype1 3 + note C_, 13 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 2 + note F_, 1 + notetype1 3 + note F_, 1 + notetype1 10 + note C_, 1 + note D_, 1 + notetype1 3 + note D_, 1 + octave 4 + notetype0 1 + notetype1 10 + note D_, 3 + note D#, 10 + notetype0 13 + note D#, 4 + notetype1 3 + note D#, 1 + notetype1 10 + note D_, 1 + notetype0 1 + note C_, 6 + notetype1 3 + note C_, 7 + notetype1 10 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 3 + notetype1 3 + note F_, 1 + notetype1 10 + note D#, 1 + note F_, 1 + notetype1 3 + note F_, 1 + notetype0 1 + notetype1 10 + note F#, 3 + note G_, 10 + notetype0 13 + note G_, 4 + dec_octave + dec_octave + notetype0 1 + notetype1 9 + note E_, 6 + note A_, 7 + inc_octave + note C_, 6 + dec_octave + note A_, 7 + note G_, 6 + inc_octave + note C_, 7 + note F_, 6 + note D_, 7 + notetype0 13 + note E_, 8 + note E_, 1 + notetype1 3 + note E_, 2 + endchannel + +Branch_fb5bc: + octave 2 + notetype0 13 + note __, 2 + notetype1 8 + note G_, 1 + inc_octave + note C_, 1 + note __, 1 + dec_octave + note A_, 1 + notetype1 3 + note A_, 1 + note __, 2 + notetype1 8 + note B_, 1 + notetype1 3 + note B_, 1 + notetype1 8 + note A_, 1 + note __, 1 + inc_octave + note C_, 1 + notetype1 3 + note C_, 1 + note __, 3 + dec_octave + notetype1 8 + note G_, 1 + inc_octave + note C_, 1 + note __, 1 + endchannel + +Branch_fb5e4: + octave 3 + notetype1 10 + notetype0 1 + note F#, 3 + note G_, 10 + note F_, 6 + notetype1 3 + note F_, 7 + notetype0 13 + notetype1 8 + note E_, 4 + notetype1 3 + note E_, 1 + notetype1 10 + note G_, 1 + notetype1 3 + note G_, 1 + inc_octave + notetype1 10 + notetype0 1 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 4 + notetype1 3 + note D_, 1 + endchannel + +Branch_fb60c: + octave 4 + notetype0 13 + notetype1 3 + note E_, 1 + notetype1 10 + notetype0 1 + note D#, 3 + note E_, 10 + notetype0 13 + notetype1 3 + note E_, 1 + notetype1 10 + note F_, 1 + notetype1 3 + note F_, 1 + notetype1 10 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 10 + notetype0 1 + note G#, 3 + note A_, 10 + notetype0 13 + note A_, 8 + notetype1 3 + note A_, 1 + notetype1 10 + notetype0 1 + note G#, 3 + note A_, 10 + notetype1 3 + note A_, 13 + notetype1 10 + note G_, 13 + notetype1 3 + note G_, 13 + notetype1 10 + note F_, 13 + notetype1 3 + note F_, 13 + notetype1 10 + note F#, 3 + note G_, 10 + endchannel + +Branch_fb651: + octave 3 + notetype1 10 + note D#, 3 + note E_, 10 + note F_, 6 + notetype1 3 + note F_, 7 + notetype1 10 + note G_, 5 + notetype1 3 + note G_, 8 + inc_octave + notetype1 10 + note C#, 3 + note D_, 10 + note D_, 13 + note C_, 6 + notetype1 3 + note C_, 13 + note __, 7 + dec_octave + notetype0 13 + notetype1 10 + note G_, 6 + note G_, 6 + note G_, 8 + notetype1 3 + note G_, 1 + notetype1 10 + notetype0 1 + note D#, 3 + note E_, 10 + note F_, 5 + notetype1 3 + note F_, 8 + notetype1 10 + note G_, 5 + notetype1 3 + note G_, 8 + endchannel + + +Music_TCGCredits_Ch2: + vibrato 20, $33 + notetype2 8 + dutycycle 1 + octave 2 + notetype0 13 + notetype1 4 + note A_, 1 + notetype1 7 + note A_, 2 + notetype0 1 + note A_, 6 + notetype1 2 + note A_, 7 + notetype0 13 + notetype1 8 + note B_, 1 + notetype1 8 + note B_, 2 + notetype0 1 + note B_, 6 + notetype1 3 + note B_, 7 + inc_octave + notetype0 13 + notetype1 6 + note C_, 1 + notetype1 9 + note C_, 2 + notetype0 1 + note C_, 6 + notetype1 3 + note C_, 7 + notetype0 13 + notetype1 9 + note D_, 3 + notetype1 3 + note D_, 1 + notetype0 13 + octave 3 + notetype1 9 + note E_, 1 + notetype1 3 + note E_, 1 + callchannel Branch_fba68 + octave 2 + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + inc_octave + notetype1 9 + note C_, 1 + notetype1 9 + note C_, 1 + dec_octave + notetype1 9 + note B_, 1 + notetype1 3 + note B_, 1 + inc_octave + notetype1 9 + note C_, 1 + note D_, 1 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + callchannel Branch_fba68 + notetype1 9 + octave 3 + notetype0 1 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 1 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 9 + note C_, 1 + notetype1 3 + note C_, 1 + notetype1 9 + note D_, 3 + notetype1 9 + dutycycle 1 +.Loop1 + note __, 2 + note C_, 1 + note __, 1 + loopchannel 2, .Loop1 +.Loop2 + note __, 2 + note D_, 1 + note __, 1 + loopchannel 2, .Loop2 + note __, 2 + note C_, 1 + note __, 2 + callchannel Branch_fba9d + note __, 2 + dutycycle 1 + notetype1 9 + octave 3 + note C_, 1 + note __, 1 +.Loop3 + note __, 2 + note C_, 1 + note __, 1 + loopchannel 4, .Loop3 + note __, 2 + dutycycle 2 + notetype1 7 + notetype0 1 + note E_, 3 + note F_, 10 + note A_, 5 + notetype1 2 + note A_, 8 + inc_octave + notetype1 7 + note C_, 5 + notetype1 2 + note C_, 8 + notetype1 7 + note E_, 5 + notetype1 2 + note E_, 8 + dec_octave + notetype1 9 + dutycycle 1 + note C_, 13 + inc_octave + dutycycle 2 + notetype1 7 + note E_, 3 + note F_, 10 + note F_, 13 + note E_, 5 + note F_, 4 + note E_, 4 + dec_octave + dutycycle 1 + notetype1 9 + note C_, 13 + dutycycle 2 + notetype1 7 + note A_, 5 + notetype1 2 + note A_, 8 + inc_octave + notetype1 7 + note C_, 5 + notetype1 2 + note C_, 8 + notetype1 7 + note C#, 3 + note D_, 10 + dec_octave + dutycycle 1 + notetype1 9 + note C_, 13 + note __, 13 + dec_octave + notetype1 8 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + note C_, 3 + note __, 1 + note E_, 1 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note A#, 3 + note B_, 10 + notetype0 13 + note B_, 4 + note __, 1 + inc_octave + note C_, 1 + dec_octave + dutycycle 1 + notetype1 9 + note D_, 1 + notetype1 8 + note E_, 5 + note __, 1 + callchannel Branch_fba9d + dutycycle 1 + octave 3 + note C_, 1 + note D_, 1 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G#, 1 + note F_, 1 + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + notetype0 1 + note D_, 3 + note D#, 10 + notetype0 13 + note D#, 2 + dec_octave + dec_octave + notetype1 9 + note G#, 1 + note __, 1 + inc_octave + notetype1 8 + note G#, 1 + note A#, 1 + dec_octave + notetype1 9 + note G#, 1 + inc_octave + inc_octave + notetype1 8 + note C_, 3 + dec_octave + notetype1 9 + note C_, 1 + note __, 1 + notetype1 8 + notetype0 1 + note F#, 3 + note G_, 10 + inc_octave + notetype0 13 + notetype2 4 + note C_, 1 + dec_octave + note B_, 1 + notetype2 8 + note A#, 1 + note __, 1 + callchannel Branch_fbacb + octave 3 + notetype1 9 + notetype2 8 + note D_, 1 + notetype0 1 + notetype1 8 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + note __, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 1 + note __, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 1 + note C_, 1 + dec_octave + notetype2 4 + note F_, 1 + notetype2 8 + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note D_, 1 + note __, 1 + notetype2 8 + note F_, 1 + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 2 + notetype2 4 + note D_, 1 + dec_octave + notetype2 8 + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note A_, 1 + note __, 1 + notetype2 8 + note B_, 1 + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note A_, 1 + notetype2 8 + note G_, 1 + notetype2 4 + note A_, 1 + notetype2 8 + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 2 + dec_octave + notetype0 1 + note B_, 3 + inc_octave + note C_, 10 + dec_octave + notetype0 13 + notetype2 4 + note B_, 1 + notetype2 6 + note A#, 2 + callchannel Branch_fbacb + octave 4 + note G_, 1 + notetype2 8 + note E_, 1 + notetype0 13 + note __, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 1 + note __, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + notetype2 7 + note C_, 2 + notetype2 8 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note F_, 1 + note __, 1 + notetype2 8 + note A_, 1 + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + notetype2 7 + note C_, 2 + notetype2 8 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note F_, 1 + note __, 1 + note G#, 1 + notetype2 8 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + note C_, 3 + note __, 1 + dec_octave + note A_, 1 + inc_octave + notetype2 4 + note C_, 1 + dec_octave + notetype2 8 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note A#, 3 + note B_, 10 + note __, 13 + dec_octave + notetype1 9 + note A#, 3 + note B_, 10 + notetype1 2 + note B_, 13 + inc_octave + notetype1 9 + note C_, 13 + notetype1 2 + note C_, 13 + notetype1 9 + notetype0 13 + note D_, 2 + notetype1 2 + note D_, 1 + callchannel Branch_fbb10 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note B_, 1 + note A_, 1 + inc_octave + notetype1 9 + note C_, 1 + notetype1 8 + note E_, 2 + note __, 1 + note C_, 1 + note __, 1 + dec_octave + notetype2 7 + note G_, 1 + notetype2 8 + note G_, 1 + inc_octave + notetype1 9 + note C_, 1 + dec_octave + notetype0 1 + notetype1 8 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note F_, 13 + note A_, 6 + notetype1 2 + note A_, 7 + inc_octave + notetype1 7 + note C_, 6 + notetype1 2 + note C_, 7 + notetype1 7 + note E_, 6 + notetype1 2 + note E_, 7 + dec_octave + dutycycle 1 + notetype1 9 + note C_, 13 + inc_octave + dutycycle 2 + notetype1 7 + note D#, 3 + note E_, 10 + notetype0 13 + note E_, 1 + note F_, 1 + notetype0 1 + note E_, 5 + notetype1 2 + note E_, 8 + notetype1 7 + note D_, 5 + notetype1 2 + note D_, 8 + notetype0 13 + note __, 1 + dec_octave + dec_octave + notetype1 9 + dutycycle 1 + note B_, 1 + inc_octave + notetype0 1 + note C_, 6 + notetype1 2 + note C_, 7 + notetype1 9 + note D_, 6 + notetype1 2 + note D_, 7 + callchannel Branch_fbb10 + octave 3 + note __, 1 + note F_, 1 + note __, 1 + note G#, 1 + note F_, 1 + notetype1 9 + note C_, 1 + inc_octave + notetype0 1 + notetype1 8 + note D_, 3 + note D#, 10 + notetype0 13 + note D#, 2 + dec_octave + dec_octave + notetype1 9 + note G#, 1 + note __, 1 + notetype0 1 + note __, 6 + notetype1 9 + note G#, 7 + inc_octave + note C_, 6 + note D#, 7 + note G_, 6 + note A#, 7 + octave 4 + notetype0 13 + notetype1 8 + note C_, 3 + dec_octave + notetype1 9 + note C_, 1 + note __, 2 + inc_octave + notetype1 8 + note D_, 1 + notetype2 4 + note E_, 1 + notetype2 8 + note C_, 3 + dec_octave + notetype1 9 + note D_, 1 + note __, 2 + inc_octave + notetype1 8 + note D_, 1 + notetype2 4 + note E_, 1 + dec_octave + notetype2 8 + note A_, 3 + notetype1 9 + note C_, 1 + note __, 2 + notetype2 4 + notetype1 8 + note F_, 1 + notetype2 8 + notetype1 9 + note C_, 1 + notetype1 8 + note G#, 3 + notetype1 9 + note C_, 1 + notetype1 8 + note G#, 1 + note __, 1 + note F_, 1 + notetype1 9 + note C_, 1 + notetype1 8 + note E_, 3 + notetype1 9 + note D_, 1 + note __, 1 + dec_octave + notetype1 8 + note B_, 1 + inc_octave + notetype2 4 + note C_, 1 + notetype1 9 + notetype2 8 + note D_, 1 + notetype1 8 + note E_, 3 + notetype1 9 + note C_, 1 + note __, 1 + notetype1 8 + note E_, 1 + notetype2 4 + note F_, 1 + notetype2 8 + notetype1 9 + note C_, 1 + notetype1 8 + note A_, 3 + notetype1 9 + note C_, 1 + notetype2 4 + note A_, 1 + note __, 1 + note F_, 1 + notetype2 8 + notetype1 9 + note C_, 1 + notetype1 8 + note A_, 3 + notetype1 9 + note C_, 1 + note __, 1 + notetype1 8 + note G#, 3 + note __, 1 + notetype0 13 + octave 3 + notetype1 9 + note E_, 1 + notetype1 3 + note E_, 1 + callchannel Branch_fba68 + octave 2 + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + inc_octave + notetype1 9 + note C_, 1 + notetype1 9 + note C_, 1 + dec_octave + notetype1 9 + note B_, 1 + notetype1 3 + note B_, 1 + inc_octave + notetype1 9 + note C_, 1 + note D_, 1 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + callchannel Branch_fba68 + notetype1 9 + octave 3 + notetype0 1 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 1 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 9 + note C_, 1 + notetype1 3 + note C_, 1 + notetype1 9 + note D_, 3 + notetype1 9 + dutycycle 1 +.Loop4 + note __, 2 + note C_, 1 + note __, 1 + loopchannel 2, .Loop4 +.Loop5 + note __, 2 + note D_, 1 + note __, 1 + loopchannel 2, .Loop5 + note __, 2 + note C_, 1 + note __, 2 + callchannel Branch_fba9d + note __, 2 + dutycycle 1 + notetype1 9 + octave 3 + note C_, 1 + note __, 1 +.Loop6 + note __, 2 + note C_, 1 + note __, 1 + loopchannel 4, .Loop6 + note __, 2 + dutycycle 2 + notetype1 7 + notetype0 1 + note E_, 3 + note F_, 10 + note A_, 5 + notetype1 2 + note A_, 8 + inc_octave + notetype1 7 + note C_, 5 + notetype1 2 + note C_, 8 + notetype1 7 + note E_, 5 + notetype1 2 + note E_, 8 + dec_octave + notetype1 9 + dutycycle 1 + note C_, 13 + inc_octave + dutycycle 2 + notetype1 7 + note E_, 3 + note F_, 10 + note F_, 13 + note E_, 5 + note F_, 4 + note E_, 4 + dec_octave + dutycycle 1 + notetype1 9 + note C_, 13 + dutycycle 2 + notetype1 7 + note A_, 5 + notetype1 2 + note A_, 8 + inc_octave + notetype1 7 + note C_, 5 + notetype1 2 + note C_, 8 + notetype1 7 + note C#, 3 + note D_, 10 + dec_octave + dutycycle 1 + notetype1 9 + note C_, 13 + note __, 13 + dec_octave + notetype1 8 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + note C_, 3 + note __, 1 + note E_, 1 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note A#, 3 + note B_, 10 + notetype0 13 + note B_, 4 + note __, 1 + inc_octave + note C_, 1 + dec_octave + dutycycle 1 + notetype1 9 + note D_, 1 + notetype1 8 + note E_, 5 + note __, 1 + callchannel Branch_fba9d + dutycycle 1 + octave 3 + note C_, 1 + note D_, 1 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G#, 1 + note F_, 1 + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + notetype0 1 + note D_, 3 + note D#, 10 + notetype0 13 + note D#, 2 + dec_octave + dec_octave + notetype1 9 + note G#, 1 + note __, 1 + inc_octave + notetype1 8 + note G#, 1 + note A#, 1 + dec_octave + notetype1 9 + note G#, 1 + inc_octave + inc_octave + notetype1 8 + note C_, 3 + dec_octave + notetype1 9 + note C_, 1 + note __, 1 + notetype1 8 + notetype0 1 + note F#, 3 + note G_, 10 + inc_octave + notetype0 13 + notetype2 4 + note C_, 1 + dec_octave + note B_, 1 + notetype2 8 + note A#, 1 + note __, 1 + callchannel Branch_fbacb + octave 3 + notetype1 9 + notetype2 8 + note D_, 1 + notetype0 1 + notetype1 8 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + note __, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 1 + note __, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 1 + note C_, 1 + dec_octave + notetype2 4 + note F_, 1 + notetype2 8 + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note D_, 1 + note __, 1 + notetype2 8 + note F_, 1 + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 2 + notetype2 4 + note D_, 1 + dec_octave + notetype2 8 + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note A_, 1 + note __, 1 + notetype2 8 + note B_, 1 + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note A_, 1 + notetype2 8 + note G_, 1 + notetype2 4 + note A_, 1 + notetype2 8 + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 2 + dec_octave + notetype0 1 + note B_, 3 + inc_octave + note C_, 10 + dec_octave + notetype0 13 + notetype2 4 + note B_, 1 + notetype2 6 + note A#, 2 + callchannel Branch_fbacb + octave 4 + note G_, 1 + notetype2 8 + note E_, 1 + notetype0 13 + note __, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note C_, 1 + note __, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + notetype2 7 + note C_, 2 + notetype2 8 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note F_, 1 + note __, 1 + notetype2 8 + note A_, 1 + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + notetype2 7 + note C_, 2 + notetype2 8 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + notetype1 8 + notetype2 4 + note F_, 1 + note __, 1 + note G#, 1 + notetype2 8 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + note C_, 3 + note __, 1 + dec_octave + note A_, 1 + inc_octave + notetype2 4 + note C_, 1 + dec_octave + notetype2 8 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note A#, 3 + note B_, 10 + note __, 13 + dec_octave + notetype1 9 + note A#, 3 + note B_, 10 + notetype1 2 + note B_, 13 + inc_octave + notetype1 9 + note C_, 13 + notetype1 2 + note C_, 13 + notetype1 9 + notetype0 13 + note D_, 2 + notetype1 2 + note D_, 1 + callchannel Branch_fbb10 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note B_, 1 + note A_, 1 + inc_octave + notetype1 9 + note C_, 1 + notetype1 8 + note E_, 2 + note __, 1 + note C_, 1 + note __, 1 + dec_octave + notetype2 7 + note G_, 1 + notetype2 8 + note G_, 1 + inc_octave + notetype1 9 + note C_, 1 + dec_octave + notetype0 1 + notetype1 8 + note E_, 3 + note F_, 10 + notetype0 13 + note F_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note F_, 13 + note A_, 6 + notetype1 2 + note A_, 7 + inc_octave + notetype1 7 + note C_, 6 + notetype1 2 + note C_, 7 + notetype1 7 + note E_, 6 + notetype1 2 + note E_, 7 + dec_octave + dutycycle 1 + notetype1 9 + note C_, 13 + inc_octave + dutycycle 2 + notetype1 7 + note D#, 3 + note E_, 10 + notetype0 13 + note E_, 1 + note F_, 1 + notetype0 1 + note E_, 5 + notetype1 2 + note E_, 8 + notetype1 7 + note D_, 5 + notetype1 2 + note D_, 8 + notetype0 13 + note __, 1 + dec_octave + dec_octave + notetype1 9 + dutycycle 1 + note B_, 1 + inc_octave + notetype0 1 + note C_, 6 + notetype1 2 + note C_, 7 + notetype1 9 + note D_, 6 + notetype1 2 + note D_, 7 + callchannel Branch_fbb10 + octave 3 + note __, 1 + note F_, 1 + note __, 1 + note G#, 1 + note F_, 1 + notetype1 9 + note C_, 1 + inc_octave + notetype0 1 + notetype1 8 + note D_, 3 + note D#, 10 + notetype0 13 + note D#, 2 + dec_octave + dec_octave + notetype1 9 + note G#, 1 + note __, 1 + notetype0 1 + note __, 6 + notetype1 9 + note G#, 7 + inc_octave + note C_, 6 + note D#, 7 + note G_, 6 + note A#, 7 + octave 4 + notetype0 13 + notetype1 8 + note C_, 1 + note C_, 2 + dec_octave + dec_octave + notetype1 9 + note G#, 1 + note __, 2 + inc_octave + notetype1 8 + note A#, 1 + dec_octave + notetype1 9 + note G#, 1 + inc_octave + inc_octave + notetype1 8 + note C_, 1 + note C_, 2 + dec_octave + notetype1 9 + note C_, 1 + note __, 1 + inc_octave + notetype1 8 + note C_, 1 + note C_, 1 + dec_octave + notetype1 9 + note C_, 1 + inc_octave + notetype1 8 + note E_, 1 + note E_, 4 + dec_octave + dec_octave + notetype0 1 + notetype1 8 + note C_, 6 + note F_, 7 + note A_, 6 + note F_, 7 + note E_, 6 + note G_, 7 + inc_octave + note D_, 6 + dec_octave + note B_, 7 + inc_octave + notetype0 13 + note C_, 8 + note C_, 1 + notetype1 2 + note C_, 2 + endchannel + +Branch_fba68: + octave 3 + notetype1 9 + note C_, 1 + note __, 1 + notetype1 9 + note C_, 1 + note E_, 1 + notetype1 9 + note C_, 1 + notetype1 9 + note F_, 1 + notetype1 3 + note F_, 1 + note __, 1 + notetype1 9 + note C_, 1 + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 9 + note F_, 1 + notetype1 9 + note C_, 1 + notetype1 9 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + notetype1 9 + note C_, 1 + note __, 1 + notetype1 9 + note C_, 1 + note E_, 1 + notetype1 9 + note C_, 1 + endchannel + +Branch_fba9d: + octave 4 + dutycycle 2 + notetype1 7 + notetype0 1 + note F#, 3 + note G_, 10 + dec_octave + dutycycle 1 + notetype1 9 + note C_, 13 + inc_octave + dutycycle 2 + notetype1 7 + note E_, 5 + notetype1 2 + note E_, 8 + notetype1 7 + note E_, 3 + note F_, 10 + note E_, 5 + notetype1 2 + note E_, 8 + dec_octave + notetype0 13 + dutycycle 1 + notetype1 9 + note C_, 1 + dutycycle 2 + notetype1 7 + note G_, 1 + endchannel + +Branch_fbacb: + octave 3 + notetype2 8 +.Loop4 + note A#, 1 + note __, 1 + loopchannel 3, .Loop4 + inc_octave + note C_, 3 + dec_octave + notetype1 9 + note C_, 1 + note __, 1 + notetype1 8 + note A_, 1 + inc_octave + notetype2 4 + note C_, 1 + dec_octave + notetype2 8 + notetype1 9 + note C_, 1 + notetype0 1 + notetype1 8 + note A#, 3 + note B_, 16 + note __, 7 + note A#, 3 + note B_, 10 + dec_octave + notetype0 13 + notetype1 9 + note B_, 1 + inc_octave + notetype1 8 + note B_, 1 + note __, 1 + note A_, 1 + dec_octave + notetype1 9 + note B_, 1 + inc_octave + notetype1 8 + note B_, 3 + notetype1 9 + note D_, 1 + note __, 1 + notetype1 8 + note B_, 1 + inc_octave + notetype2 4 + note D_, 1 + endchannel + +Branch_fbb10: + octave 3 + notetype0 13 + notetype1 8 + note C_, 1 + notetype2 3 + note D_, 1 + notetype1 9 + notetype2 8 + note C_, 1 + notetype1 8 + note B_, 2 + notetype2 3 + note A_, 1 + notetype1 9 + notetype2 8 + note C_, 1 + notetype0 1 + notetype1 8 + note D#, 3 + note E_, 10 + notetype0 13 + note E_, 2 + notetype1 9 + note D_, 1 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note G_, 5 + notetype1 2 + note G_, 8 + notetype1 7 + note F_, 5 + note G_, 4 + note F_, 4 + note E_, 5 + notetype1 2 + note E_, 8 + dec_octave + dutycycle 1 + notetype1 9 + note D_, 13 + inc_octave + dutycycle 2 + notetype1 7 + note C_, 5 + notetype1 2 + note C_, 8 + notetype1 7 + note D_, 13 + note E_, 5 + notetype1 2 + note E_, 8 + notetype1 7 + note C_, 5 + notetype1 2 + note C_, 8 + dec_octave + notetype0 13 + notetype1 7 + note E_, 4 + inc_octave + inc_octave + notetype0 1 + note C_, 5 + notetype1 2 + note C_, 8 + dec_octave + notetype1 7 + note B_, 13 + inc_octave + note C_, 5 + notetype1 2 + note C_, 8 + dec_octave + notetype1 7 + note B_, 5 + notetype1 2 + note B_, 8 + notetype1 7 + note G_, 5 + notetype1 2 + note G_, 8 + dec_octave + dec_octave + dutycycle 1 + notetype1 8 + note B_, 3 + inc_octave + note C_, 10 + notetype0 13 + notetype2 3 + note D_, 1 + note E_, 1 + notetype2 8 + note F_, 2 + endchannel + + +Music_TCGCredits_Ch3: + notetype0 1 + notetype1 1 + notetype2 11 + octave 2 +.Loop1 + note G_, 6 + note __, 7 + loopchannel 12, .Loop1 + note G_, 6 + note A_, 7 + note B_, 6 + inc_octave + note C_, 7 + note D_, 6 + note E_, 7 + note F_, 6 + note G_, 7 + notetype0 1 + octave 3 + callchannel Branch_fbd47 + callchannel Branch_fbe23 + callchannel Branch_fbd47 +.Loop7 + note C_, 6 + note __, 7 + loopchannel 2, .Loop7 + note A_, 13 + note C_, 6 + note __, 7 +.Loop8 + note C_, 6 + note __, 7 + loopchannel 2, .Loop8 + inc_octave + note C_, 13 + dec_octave + note C_, 6 + note __, 7 + callchannel Branch_fbd47 + callchannel Branch_fbe23 + octave 3 +.Loop9 + note C_, 6 + note __, 7 + loopchannel 2, .Loop9 + note G_, 13 + note C_, 6 + note __, 7 +.Loop10 + note C_, 6 + note __, 7 + loopchannel 2, .Loop10 + note G_, 13 + dec_octave + note G_, 13 + notetype0 13 + note G_, 7 + note __, 1 + notetype0 1 + callchannel Branch_fbd47 + callchannel Branch_fbd58 + callchannel Branch_fbd6b + callchannel Branch_fbd7e + callchannel Branch_fbd91 + callchannel Branch_fbda4 + callchannel Branch_fbdb7 + callchannel Branch_fbdca + callchannel Branch_fbd47 + callchannel Branch_fbd58 + callchannel Branch_fbd6b + callchannel Branch_fbd7e + callchannel Branch_fbddd + callchannel Branch_fbdf0 + callchannel Branch_fbd47 + callchannel Branch_fbe03 + callchannel Branch_fbd91 + callchannel Branch_fbdca + callchannel Branch_fbe10 + callchannel Branch_fbd6b + callchannel Branch_fbdb7 + callchannel Branch_fbdca + callchannel Branch_fbd47 + callchannel Branch_fbe03 + callchannel Branch_fbd91 + callchannel Branch_fbdca + callchannel Branch_fbe10 + callchannel Branch_fbd6b + callchannel Branch_fbdb7 + callchannel Branch_fbdf0 + callchannel Branch_fbdca + octave 2 + note G_, 6 + note __, 7 + note G_, 13 + inc_octave + note G_, 6 + note __, 7 + dec_octave + note A_, 6 + note __, 7 + note A_, 6 + note __, 7 + notetype0 13 + note B_, 2 + note G_, 1 + notetype0 1 + callchannel Branch_fbd47 + callchannel Branch_fbd58 + callchannel Branch_fbd6b + callchannel Branch_fbd7e + callchannel Branch_fbd91 + callchannel Branch_fbda4 + callchannel Branch_fbdb7 + callchannel Branch_fbe3d + octave 2 + note B_, 6 + note __, 7 + callchannel Branch_fbd47 + callchannel Branch_fbd58 + callchannel Branch_fbd6b + callchannel Branch_fbd7e + callchannel Branch_fbddd + octave 2 +.Loop11 + note A#, 6 + note __, 7 + loopchannel 2, .Loop11 + inc_octave + note F_, 13 + dec_octave + note A#, 6 + note __, 7 + note A#, 6 + inc_octave + note F_, 7 + note G#, 6 + inc_octave + note C_, 7 + note D#, 6 + note G_, 7 + dec_octave + dec_octave + note A#, 6 + note __, 7 + callchannel Branch_fbd47 + octave 2 +.Loop2 + rept 2 + note B_, 6 + note __, 7 + endr + inc_octave + note G_, 13 + dec_octave + note B_, 6 + note __, 7 + loopchannel 2, .Loop2 +.Loop3 + rept 2 + note A_, 6 + note __, 7 + endr + inc_octave + note F_, 13 + dec_octave + note A_, 6 + note __, 7 + loopchannel 2, .Loop3 +.Loop4 + rept 2 + note G#, 6 + note __, 7 + endr + inc_octave + note F_, 13 + dec_octave + note G#, 6 + note __, 7 + loopchannel 2, .Loop4 + callchannel Branch_fbe10 + callchannel Branch_fbd6b + callchannel Branch_fbdb7 + callchannel Branch_fbe3d + octave 2 + note B_, 13 + notetype0 1 + octave 3 + callchannel Branch_fbd47 + callchannel Branch_fbe23 + callchannel Branch_fbd47 +.Loop12 + note C_, 6 + note __, 7 + loopchannel 2, .Loop12 + note A_, 13 + note C_, 6 + note __, 7 +.Loop13 + note C_, 6 + note __, 7 + loopchannel 2, .Loop13 + inc_octave + note C_, 13 + dec_octave + note C_, 6 + note __, 7 + callchannel Branch_fbd47 + callchannel Branch_fbe23 + octave 3 +.Loop14 + note C_, 6 + note __, 7 + loopchannel 2, .Loop14 + note G_, 13 + note C_, 6 + note __, 7 +.Loop15 + note C_, 6 + note __, 7 + loopchannel 2, .Loop15 + note G_, 13 + dec_octave + note G_, 13 + notetype0 13 + note G_, 7 + note __, 1 + notetype0 1 + callchannel Branch_fbd47 + callchannel Branch_fbd58 + callchannel Branch_fbd6b + callchannel Branch_fbd7e + callchannel Branch_fbd91 + callchannel Branch_fbda4 + callchannel Branch_fbdb7 + callchannel Branch_fbdca + callchannel Branch_fbd47 + callchannel Branch_fbd58 + callchannel Branch_fbd6b + callchannel Branch_fbd7e + callchannel Branch_fbddd + callchannel Branch_fbdf0 + callchannel Branch_fbd47 + callchannel Branch_fbe03 + callchannel Branch_fbd91 + callchannel Branch_fbdca + callchannel Branch_fbe10 + callchannel Branch_fbd6b + callchannel Branch_fbdb7 + callchannel Branch_fbdca + callchannel Branch_fbd47 + callchannel Branch_fbe03 + callchannel Branch_fbd91 + callchannel Branch_fbdca + callchannel Branch_fbe10 + callchannel Branch_fbd6b + callchannel Branch_fbdb7 + callchannel Branch_fbdf0 + callchannel Branch_fbdca + octave 2 + note G_, 6 + note __, 7 + note G_, 13 + inc_octave + note G_, 6 + note __, 7 + dec_octave + note A_, 6 + note __, 7 + note A_, 6 + note __, 7 + notetype0 13 + note B_, 2 + note G_, 1 + notetype0 1 + callchannel Branch_fbd47 + callchannel Branch_fbd58 + callchannel Branch_fbd6b + callchannel Branch_fbd7e + callchannel Branch_fbd91 + callchannel Branch_fbda4 + callchannel Branch_fbdb7 + callchannel Branch_fbe3d + octave 2 + note B_, 6 + note __, 7 + callchannel Branch_fbd47 + callchannel Branch_fbd58 + callchannel Branch_fbd6b + callchannel Branch_fbd7e + callchannel Branch_fbddd + octave 2 +.Loop16 + note A#, 6 + note __, 7 + loopchannel 2, .Loop16 + inc_octave + note F_, 13 + dec_octave + note A#, 6 + note __, 7 + note A#, 6 + inc_octave + note F_, 7 + note G#, 6 + inc_octave + note C_, 7 + note D#, 6 + note G_, 7 + dec_octave + dec_octave + note A#, 6 + note __, 7 + notetype0 1 + octave 2 +.Loop5 + note G#, 6 + note __, 7 + note G#, 6 + note __, 7 + inc_octave + inc_octave + note D#, 13 + dec_octave + dec_octave + note G#, 6 + note __, 7 + loopchannel 2, .Loop5 + inc_octave +.Loop6 + note C#, 6 + note __, 7 + note C#, 6 + note __, 7 + inc_octave + note F_, 13 + dec_octave + note C#, 6 + note __, 7 + loopchannel 2, .Loop6 + note C_, 6 + note __, 7 + note C_, 6 + note __, 7 + inc_octave + note C_, 13 + dec_octave + note C_, 6 + note __, 7 + note C_, 6 + note __, 7 + note C_, 6 + note __, 7 + dec_octave + note G_, 6 + note __, 7 + note G_, 6 + note __, 7 + notetype0 13 + note C_, 8 + note C_, 1 + note __, 2 + endchannel + +Branch_fbd47: + octave 3 +.Loop12 + rept 2 + note C_, 6 + note __, 7 + endr + note G_, 13 + note C_, 6 + note __, 7 + loopchannel 2, .Loop12 + endchannel + +Branch_fbd58: + octave 2 +.Loop13 + rept 2 + note B_, 6 + note __, 7 + endr + inc_octave + note G_, 13 + dec_octave + note B_, 6 + note __, 7 + loopchannel 2, .Loop13 + endchannel + +Branch_fbd6b: + octave 2 +.Loop14 + rept 2 + note A_, 6 + note __, 7 + endr + inc_octave + note G_, 13 + dec_octave + note A_, 6 + note __, 7 + loopchannel 2, .Loop14 + endchannel + +Branch_fbd7e: + octave 2 +.Loop15 + rept 2 + note G_, 6 + note __, 7 + endr + inc_octave + note G_, 13 + dec_octave + note G_, 6 + note __, 7 + loopchannel 2, .Loop15 + endchannel + +Branch_fbd91: + octave 2 +.Loop16 + rept 2 + note F_, 6 + note __, 7 + endr + inc_octave + note F_, 13 + dec_octave + note F_, 6 + note __, 7 + loopchannel 2, .Loop16 + endchannel + +Branch_fbda4: + octave 2 +.Loop17 + rept 2 + note E_, 6 + note __, 7 + endr + inc_octave + note E_, 13 + dec_octave + note E_, 6 + note __, 7 + loopchannel 2, .Loop17 + endchannel + +Branch_fbdb7: + octave 2 +.Loop18 + rept 2 + note D_, 6 + note __, 7 + endr + inc_octave + note F_, 13 + dec_octave + note D_, 6 + note __, 7 + loopchannel 2, .Loop18 + endchannel + +Branch_fbdca: + octave 2 +.Loop19 + rept 2 + note G_, 6 + note __, 7 + endr + inc_octave + note F_, 13 + dec_octave + note G_, 6 + note __, 7 + loopchannel 2, .Loop19 + endchannel + +Branch_fbddd: + octave 2 +.Loop20 + rept 2 + note F_, 6 + note __, 7 + endr + inc_octave + note G#, 13 + dec_octave + note F_, 6 + note __, 7 + loopchannel 2, .Loop20 + endchannel + +Branch_fbdf0: + octave 2 +.Loop21 + rept 2 + note A#, 6 + note __, 7 + endr + inc_octave + note F_, 13 + dec_octave + note A#, 6 + note __, 7 + loopchannel 2, .Loop21 + endchannel + +Branch_fbe03: + octave 3 + note C_, 6 + note __, 7 + dec_octave + note C_, 13 + note __, 13 + note D_, 13 + note __, 13 + note E_, 13 + note __, 13 + note C_, 6 + note __, 7 + endchannel + +Branch_fbe10: + octave 2 +.Loop22 + rept 2 + note E_, 6 + note __, 7 + endr + inc_octave + note G_, 13 + dec_octave + note E_, 6 + note __, 7 + loopchannel 2, .Loop22 + endchannel + +Branch_fbe23: + octave 3 +.Loop23 + note C_, 6 + note __, 7 + loopchannel 2, .Loop23 + note A_, 13 + note C_, 6 + note __, 7 +.Loop24 + note C_, 6 + note __, 7 + loopchannel 2, .Loop24 + note F_, 13 + note C_, 6 + note __, 7 + endchannel + +Branch_fbe3d: + octave 2 +.Loop25 + note G_, 6 + note __, 7 + loopchannel 2, .Loop25 + inc_octave + note F_, 13 + dec_octave + note G_, 6 + note __, 7 + note G_, 6 + note __, 7 + note G_, 13 + note A_, 13 + endchannel + + +Music_TCGCredits_Ch4: + togglenoise $06 + notetype 1 + octave 1 +.Loop1 + note D_, 13 + loopchannel 8, .Loop1 +.Loop2 + note C#, 13 + loopchannel 4, .Loop2 +.Loop3 + note C#, 6 + note C#, 7 + loopchannel 4, .Loop3 +.Loop7 + callchannel Branch_fbed1 + loopchannel 6, .Loop7 + note C_, 13 + note D#, 13 + note C#, 13 + note D#, 6 + note D#, 7 + note C_, 13 + note D#, 13 + note C#, 13 + notetype 13 + note F_, 7 + note C#, 2 + notetype 1 +.Loop8 + callchannel Branch_fbed1 + loopchannel 15, .Loop8 + callchannel Branch_fbedb +.Loop9 + callchannel Branch_fbed1 + loopchannel 7, .Loop9 + callchannel Branch_fbedb +.Loop10 + callchannel Branch_fbed1 + loopchannel 7, .Loop10 + callchannel Branch_fbeea +.Loop11 + callchannel Branch_fbed1 + loopchannel 7, .Loop11 + note C_, 13 + note D#, 13 + note C#, 13 + note D#, 6 + note D#, 7 + note C_, 13 + note D#, 6 + note D_, 4 + note D_, 3 + note C#, 6 + note C#, 7 + note C#, 13 +.Loop12 + callchannel Branch_fbed1 + loopchannel 5, .Loop12 + callchannel Branch_fbeea +.Loop4 + callchannel Branch_fbed1 + loopchannel 7, .Loop4 + note C_, 13 + note D#, 13 + note C#, 13 + note D#, 6 + note D_, 4 + note D_, 3 +.Loop5 + note C#, 6 + note C#, 7 + loopchannel 4, .Loop5 +.Loop13 + callchannel Branch_fbed1 + loopchannel 6, .Loop13 + note C_, 13 + note D#, 13 + note C#, 13 + note D#, 6 + note D#, 7 + note C_, 13 + note D#, 13 + note C#, 13 + notetype 13 + note F_, 7 + note C#, 2 + notetype 1 +.Loop14 + callchannel Branch_fbed1 + loopchannel 15, .Loop14 + callchannel Branch_fbedb +.Loop15 + callchannel Branch_fbed1 + loopchannel 7, .Loop15 + callchannel Branch_fbedb +.Loop16 + callchannel Branch_fbed1 + loopchannel 7, .Loop16 + callchannel Branch_fbeea +.Loop17 + callchannel Branch_fbed1 + loopchannel 7, .Loop17 + note C_, 13 + note D#, 13 + note C#, 13 + note D#, 6 + note D#, 7 + note C_, 13 + note D#, 6 + note D_, 4 + note D_, 3 + note C#, 6 + note C#, 7 + note C#, 13 +.Loop18 + callchannel Branch_fbed1 + loopchannel 5, .Loop18 + callchannel Branch_fbeea +.Loop6 + callchannel Branch_fbed1 + loopchannel 2, .Loop6 + callchannel Branch_fbeea + notetype 13 + note F_, 8 + note __, 3 + endchannel + +Branch_fbed1: + note C_, 13 + note D#, 13 + note C#, 13 + note D#, 6 + note D#, 7 + note C_, 13 + note D#, 13 + note C#, 13 + note E_, 13 + endchannel + +Branch_fbedb: + note C_, 13 + note D#, 6 + note D_, 7 + note C#, 6 + note C#, 7 +.Loop13 + note C#, 6 + note D_, 4 + note D_, 3 + note C#, 6 + note C#, 7 + loopchannel 2, .Loop13 + note C#, 13 + endchannel + +Branch_fbeea: + note C_, 13 + note D#, 13 + note C#, 13 + note D#, 6 + note D_, 4 + note D_, 3 +.Loop14 + note C#, 6 + note C#, 7 + loopchannel 3, .Loop14 + note C#, 13 + endchannel + diff --git a/crysaudio/music/TCG/darkdiddly.asm b/crysaudio/music/TCG/darkdiddly.asm new file mode 100644 index 00000000..3b912202 --- /dev/null +++ b/crysaudio/music/TCG/darkdiddly.asm @@ -0,0 +1,110 @@ +Music_TCGDarkDiddly: + db $80 + dw Music_TCGDarkDiddly_Ch1 + db $01 + dw Music_TCGDarkDiddly_Ch2 + db $02 + dw Music_TCGDarkDiddly_Ch3 + +Music_TCGDarkDiddly_Ch1: + notetype0 3 + notetype2 8 + octave 4 + dutycycle 1 + notetype1 11 + note C_, 4 + dec_octave + note B_, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + note F_, 4 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + dec_octave + note B_, 2 + note A#, 4 + note B_, 2 + notetype1 2 + note B_, 2 + notetype1 11 + note F#, 4 + note G_, 2 + notetype1 2 + note G_, 2 + notetype1 11 + note C_, 2 + notetype1 2 + note C_, 4 + inc_octave + notetype1 11 + note E_, 1 + note G_, 1 + inc_octave + note C_, 2 + notetype1 2 + note C_, 2 + endchannel + + +Music_TCGDarkDiddly_Ch2: + notetype0 3 + notetype2 8 + octave 3 + dutycycle 1 + notetype1 11 + note __, 16 + note C_, 4 + dec_octave + note B_, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + note F_, 4 + note F#, 2 + notetype1 2 + note F#, 2 + notetype1 11 + note C#, 4 + note D_, 2 + notetype1 2 + note D_, 2 + dec_octave + notetype1 11 + note G_, 2 + notetype1 2 + note G_, 6 + inc_octave + inc_octave + notetype1 11 + note E_, 2 + notetype1 2 + note E_, 2 + endchannel + + +Music_TCGDarkDiddly_Ch3: + notetype0 6 + notetype2 11 + notetype1 1 + octave 2 + note __, 16 + note G_, 2 + note F#, 1 + note __, 1 + note D#, 2 + note C#, 1 + note __, 1 + note C_, 1 + note __, 3 + inc_octave + note C_, 1 + endchannel + diff --git a/crysaudio/music/TCG/deckmachine.asm b/crysaudio/music/TCG/deckmachine.asm new file mode 100644 index 00000000..2fbd63db --- /dev/null +++ b/crysaudio/music/TCG/deckmachine.asm @@ -0,0 +1,240 @@ +Music_TCGDeckMachine: + db $C0 + dw Music_TCGDeckMachine_Ch1 + db $01 + dw Music_TCGDeckMachine_Ch2 + db $02 + dw Music_TCGDeckMachine_Ch3 + db $03 + dw Music_TCGDeckMachine_Ch4 + +Music_TCGDeckMachine_Ch1: + notetype2 8 + dutycycle 3 +.MainLoop + octave 5 + notetype0 1 +.Loop1 + notetype2 6 + notetype1 9 + note C_, 7 + notetype1 3 + note C_, 8 + notetype1 4 + note C_, 8 + notetype1 9 + note G_, 7 + notetype1 3 + note G_, 8 + notetype1 4 + note C_, 7 + notetype1 9 + note E_, 7 + notetype1 3 + note E_, 8 + notetype1 4 + note E_, 8 + notetype1 9 + note C_, 7 + notetype1 3 + note C_, 8 + notetype1 4 + note C_, 7 + notetype1 9 + note G_, 7 + notetype1 3 + note G_, 8 + notetype1 9 + notetype2 4 + note F_, 7 + notetype2 5 + notetype1 4 + note G_, 8 + loopchannel 9, .Loop1 + notetype1 9 + note C_, 7 + notetype1 3 + note C_, 8 + notetype1 4 + note C_, 15 + notetype0 10 + note __, 9 + loopchannel 0, .MainLoop + + +Music_TCGDeckMachine_Ch2: + notetype2 8 + dutycycle 1 + notetype2 7 +.MainLoop + octave 3 + notetype0 1 +.Loop1 + note __, 15 + notetype1 11 + note __, 7 + note C_, 8 + notetype1 2 + note C_, 8 + note __, 7 + notetype1 11 + note C_, 7 + notetype1 2 + note C_, 8 + note __, 7 + notetype1 11 + dec_octave + note A_, 8 + notetype1 2 + note A_, 8 + note __, 7 + inc_octave + notetype1 11 + note C_, 7 + notetype1 2 + note C_, 8 + note __, 15 + loopchannel 9, .Loop1 + notetype1 11 + note E_, 7 + notetype1 2 + note E_, 8 + note __, 15 + notetype0 10 + note __, 9 + loopchannel 0, .MainLoop + + +Music_TCGDeckMachine_Ch3: + notetype1 1 + notetype2 11 +.MainLoop + octave 3 + notetype0 1 +.Loop1 + note C_, 7 + note __, 8 + note G_, 7 + inc_octave + note G_, 8 + note __, 7 + dec_octave + note C_, 8 + inc_octave + note E_, 7 + dec_octave + note C_, 8 + note D_, 7 + inc_octave + note C_, 8 + dec_octave + note __, 7 + note A_, 8 + inc_octave + note G_, 7 + dec_octave + dec_octave + note A_, 8 + inc_octave + note D_, 7 + note __, 8 + note E_, 7 + note __, 8 + note G_, 7 + inc_octave + note G_, 8 + note __, 7 + dec_octave + note E_, 8 + inc_octave + note E_, 7 + dec_octave + note C_, 8 + note F_, 7 + inc_octave + note C_, 8 + note __, 7 + dec_octave + note F_, 8 + inc_octave + note G_, 7 + dec_octave + note E_, 8 + note D_, 7 + note __, 8 + loopchannel 4, .Loop1 + note C_, 7 + note __, 8 + note G_, 7 + inc_octave + note G_, 8 + note __, 7 + dec_octave + note C_, 8 + inc_octave + note E_, 7 + dec_octave + dec_octave + note G_, 8 + inc_octave + note C_, 7 + inc_octave + note C_, 8 + note __, 7 + dec_octave + note F_, 8 + inc_octave + note G_, 7 + dec_octave + note E_, 8 + note D_, 7 + note __, 8 + note C_, 15 + note __, 15 + notetype0 10 + note __, 3 + notetype0 1 + note __, 7 + dec_octave + note G_, 15 + note __, 8 + note A_, 7 + note __, 8 + note B_, 7 + note __, 8 + loopchannel 0, .MainLoop + + +Music_TCGDeckMachine_Ch4: + togglenoise $06 + notetype 1 + octave 1 +.MainLoop +.Loop1 + callchannel Branch_f7031 + note E_, 15 + note C#, 7 + note D#, 8 + note E_, 15 + loopchannel 9, .Loop1 + callchannel Branch_f7031 + note E_, 7 + note D_, 4 + note D_, 4 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + loopchannel 0, .MainLoop + +Branch_f7031: + note C_, 7 + note D#, 8 + note E_, 15 + note C#, 7 + note D#, 8 + note E_, 15 + note C_, 7 + note D#, 8 + endchannel + diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm new file mode 100644 index 00000000..0eb4043f --- /dev/null +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -0,0 +1,1917 @@ +Music_TCGDuelTheme1: + db $C0 + dw Music_TCGDuelTheme1_Ch1 + db $01 + dw Music_TCGDuelTheme1_Ch2 + db $02 + dw Music_TCGDuelTheme1_Ch3 + db $03 + dw Music_TCGDuelTheme1_Ch4 + +Music_TCGDuelTheme1_Ch1: + notetype0 7 + vibrato 20, $33 + notetype2 8 + dutycycle 2 +.MainLoop + octave 2 +.Loop1 + note __, 16 + loopchannel 7, .Loop1 + note __, 9 +.Loop2 + note __, 3 + callchannel Branch_f54f9 + notetype1 10 + notetype0 1 + note F_, 4 + note F#, 3 + notetype0 7 + note F#, 1 + notetype1 3 + note F#, 1 + dec_octave + notetype1 10 + note A_, 1 + note __, 2 + inc_octave + notetype1 10 + note D_, 10 + notetype1 3 + note D_, 12 + callchannel Branch_f54f9 + notetype1 10 + note F#, 2 + notetype1 3 + note F#, 1 + notetype1 10 + note A_, 13 + notetype1 3 + note A_, 10 + notetype1 10 + note F#, 1 + notetype1 3 + note F#, 1 + notetype1 10 + note F#, 1 + note G_, 1 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 10 + notetype0 1 + note A#, 4 + note B_, 3 + notetype0 7 + note B_, 15 + notetype1 3 + note B_, 4 + notetype1 10 + notetype0 1 + note A#, 4 + note B_, 3 + notetype0 7 + note B_, 3 + note A_, 3 + notetype1 3 + note A_, 1 + notetype1 10 + note G_, 2 + notetype1 3 + note G_, 2 + notetype1 10 + notetype0 1 + note G#, 4 + note A_, 3 + notetype0 7 + note A_, 15 + notetype1 3 + note A_, 4 + notetype1 10 + notetype0 1 + note G#, 4 + note A_, 3 + notetype0 7 + note A_, 3 + note G_, 4 + note F#, 2 + notetype1 3 + note F#, 2 + notetype1 10 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 15 + notetype1 3 + note G_, 4 + notetype1 10 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 3 + note F#, 4 + note E_, 3 + notetype1 3 + note E_, 1 + notetype1 10 + notetype0 1 + note D#, 4 + note E_, 3 + notetype0 7 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 10 + note D_, 13 + notetype1 3 + note D_, 9 + dec_octave + loopchannel 2, .Loop2 + inc_octave + dutycycle 1 + notetype1 10 + notetype0 1 + note C#, 4 + note D_, 3 + notetype0 7 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Branch_f5538 + notetype0 1 + note G#, 4 + note A_, 3 + notetype0 7 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 10 + note F#, 5 + notetype1 3 + note F#, 1 + dec_octave + notetype1 10 + note A_, 1 + inc_octave + notetype0 1 + note D_, 4 + notetype1 3 + note D_, 3 + notetype1 10 + note F#, 4 + notetype1 3 + note F#, 3 + notetype1 10 + note A_, 4 + notetype1 3 + note A_, 3 + notetype0 7 + note __, 3 + dec_octave + dutycycle 1 + notetype1 10 + notetype2 8 +.Loop3 + note A_, 1 + note __, 2 + loopchannel 3, .Loop3 + inc_octave + notetype0 1 + note C#, 4 + note D_, 3 + notetype0 7 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Branch_f5538 + notetype0 1 + note G#, 4 + note A_, 3 + notetype0 7 + note A_, 5 + note A_, 10 + note A_, 6 + notetype1 3 + note A_, 2 + inc_octave + notetype1 10 + notetype0 1 + note C#, 4 + note D_, 3 + notetype0 7 + note D_, 2 + note C#, 1 + notetype1 3 + note C#, 2 + dec_octave + notetype1 10 + note B_, 1 + notetype1 3 + note B_, 1 + notetype1 10 + notetype0 1 + note A#, 4 + note B_, 3 + notetype0 7 + note B_, 1 + notetype1 3 + note B_, 1 + notetype1 10 + note A_, 13 + note A_, 6 + notetype1 3 + note A_, 2 + dec_octave + notetype1 8 + notetype0 1 + note A_, 5 + inc_octave + note C#, 5 + note E_, 4 + note A_, 5 + inc_octave + note C#, 5 + note E_, 4 + dec_octave + note C#, 5 + note E_, 5 + note A_, 4 + inc_octave + note C#, 5 + note E_, 5 + note A_, 4 + dec_octave + callchannel Branch_f5580 + notetype1 10 + note A_, 2 + note A_, 8 + note A_, 8 + note A_, 6 + dutycycle 1 + notetype1 10 + notetype0 1 + dec_octave + note B_, 4 + inc_octave + note C_, 3 + notetype0 7 + note C#, 1 + note __, 1 + note C#, 1 + note D_, 2 + note E_, 2 + note G_, 2 + dutycycle 2 + callchannel Branch_f5580 + notetype1 10 + notetype0 1 + note G#, 4 + note A_, 3 + notetype0 7 + note A_, 5 + note G_, 2 + note F#, 2 + notetype1 3 + note F#, 2 + notetype1 10 + note E_, 2 + notetype1 3 + note E_, 2 + notetype1 10 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 5 + note F#, 2 + note E_, 2 + notetype1 3 + note E_, 2 + notetype1 10 + note D_, 2 + notetype1 3 + note D_, 2 + notetype1 10 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 8 + notetype1 3 + note D_, 2 + notetype1 10 + note D_, 12 + notetype1 3 + note D_, 2 + notetype1 10 + note D_, 6 + note D_, 8 + note __, 4 + loopchannel 0, .MainLoop + +Branch_f54f9: + octave 2 + notetype1 10 + note A_, 1 + note B_, 1 + inc_octave + note D_, 1 + notetype1 3 + note D_, 1 + notetype1 10 + notetype0 1 + note F_, 4 + note F#, 3 + notetype0 7 + note F#, 10 + notetype1 3 + note F#, 1 + notetype1 10 + note D_, 3 + notetype1 3 + note D_, 1 + notetype1 10 + notetype0 1 + note D#, 4 + note E_, 3 + notetype0 7 + note E_, 5 + notetype1 3 + note E_, 2 + notetype1 10 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 2 + note F#, 1 + notetype1 3 + note F#, 2 + notetype1 10 + note E_, 1 + notetype1 3 + note E_, 1 + endchannel + +Branch_f5538: + note C_, 1 + note __, 2 + dec_octave + note G_, 1 + note __, 2 + note G_, 1 + note __, 2 + dutycycle 2 + notetype1 10 + note G_, 1 + inc_octave + notetype0 1 + note C_, 4 + notetype1 3 + note C_, 3 + notetype1 10 + note E_, 4 + notetype1 3 + note E_, 3 + notetype1 10 + note G_, 4 + notetype1 3 + note G_, 3 + notetype0 7 + note __, 3 + dutycycle 1 + notetype1 10 + notetype2 8 + dec_octave +.Loop4 + note G_, 1 + note __, 2 + loopchannel 3, .Loop4 + inc_octave + dutycycle 2 + notetype1 10 + notetype0 1 + note A#, 4 + note B_, 3 + notetype0 7 + note B_, 2 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 10 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 10 + endchannel + +Branch_f5580: + notetype0 1 + notetype1 10 + note F_, 4 + note F#, 3 + notetype0 7 + note F#, 9 + notetype1 3 + note F#, 2 + notetype1 10 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 10 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 10 + note B_, 2 + notetype1 3 + note B_, 2 + inc_octave + notetype1 10 + notetype0 1 + note F_, 4 + note F#, 3 + notetype0 7 + note F#, 7 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 10 + note D_, 1 + notetype1 3 + note D_, 1 + notetype1 10 + note C#, 2 + notetype1 3 + note C#, 1 + dec_octave + notetype1 10 + note A_, 9 + note F#, 1 + notetype1 3 + note F#, 1 + notetype1 10 + notetype0 1 + note A#, 4 + note B_, 3 + notetype0 7 + note B_, 8 + notetype1 3 + note B_, 1 + notetype1 10 + note A_, 4 + note G_, 4 + note F#, 10 + note G_, 1 + notetype1 3 + note G_, 1 + notetype1 10 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 10 + note D_, 10 + note E_, 2 + note F#, 2 + notetype1 3 + note F#, 2 + endchannel + + +Music_TCGDuelTheme1_Ch2: + notetype0 7 + vibrato 20, $33 + notetype2 8 +.MainLoop + dutycycle 1 + notetype1 9 + octave 2 +.Loop1 + rept 3 + note D_, 1 + note __, 2 + endr + note __, 1 + dec_octave + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 + inc_octave + loopchannel 4, .Loop1 +.Loop2 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note A_, 2 + callchannel Branch_f59f9 + loopchannel 4, .Loop2 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + inc_octave + notetype1 10 + notetype2 6 + note D_, 2 + callchannel Branch_f59f9 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + inc_octave + notetype1 10 + notetype2 6 + note C_, 2 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 3 + dec_octave + note A_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 10 + notetype2 6 + note G_, 1 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note B_, 1 + note __, 2 + inc_octave +.Loop3 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + inc_octave + notetype1 10 + notetype2 6 + note D_, 2 + callchannel Branch_f59f9 + loopchannel 3, .Loop3 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + inc_octave + notetype1 10 + notetype2 6 + note C_, 2 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 3 + dec_octave + note A_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 10 + notetype2 6 + note G_, 1 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note B_, 1 + note __, 2 + inc_octave + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + inc_octave + notetype1 10 + notetype2 6 + note D_, 2 + callchannel Branch_f59f9 + octave 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + inc_octave + notetype1 10 + notetype2 6 + note D_, 2 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note A_, 2 + dutycycle 1 + notetype1 9 + notetype2 8 + note F#, 1 + note __, 1 +.Loop4 + note G_, 1 + note __, 2 + note G_, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note G_, 2 + dutycycle 1 + notetype1 9 + notetype2 8 + note G_, 1 + note __, 3 + note D_, 1 + note __, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note G_, 1 + dutycycle 1 + notetype1 9 + notetype2 8 + note E_, 1 + note __, 2 + loopchannel 2, .Loop4 + note F#, 1 + note __, 2 + note F#, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + inc_octave + note C#, 2 + callchannel Branch_f5a17 + octave 2 + note F#, 1 + note __, 2 + note F#, 1 + inc_octave + dutycycle 2 + notetype1 10 + notetype2 6 + note E_, 2 + callchannel Branch_f5a17 + note E_, 1 + note __, 2 + note E_, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note G_, 2 + dutycycle 1 + notetype1 9 + notetype2 8 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note B_, 1 + dutycycle 1 + notetype1 9 + notetype2 8 + note G_, 1 + note __, 2 + note A_, 1 + note __, 2 + note A_, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note G_, 2 + dutycycle 1 + notetype1 9 + notetype2 8 + note A_, 1 + note __, 3 + note E_, 1 + note __, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note A_, 1 + dutycycle 1 + notetype1 9 + notetype2 8 + note A_, 1 + note __, 2 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note A_, 2 + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 3 + dec_octave + note A_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 10 + notetype2 6 + note A_, 1 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note B_, 1 + note __, 2 + inc_octave + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note A_, 2 + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 3 + dec_octave + note A_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 7 + note E_, 1 + note F#, 1 + note A_, 1 + note __, 1 + notetype1 7 + callchannel Branch_f594d + notetype1 7 + octave 3 + notetype0 1 + note C#, 4 + note D_, 3 + notetype0 7 + note D_, 1 + note __, 1 + dec_octave + note F#, 1 + notetype1 10 + notetype2 6 + note F#, 2 + notetype1 7 + notetype2 8 + note A_, 10 + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + inc_octave + note D_, 2 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 3 + dec_octave + note A_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 7 + note E_, 1 + note F#, 1 + note A_, 1 + note __, 1 + callchannel Branch_f594d + notetype1 7 + octave 3 + note D_, 2 + note __, 1 + note F#, 13 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 2 + note D_, 1 + dutycycle 2 + inc_octave + notetype1 10 + notetype2 6 + note D_, 2 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 3 + inc_octave + dutycycle 2 + notetype1 7 + note D_, 1 + note __, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note __, 1 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 15 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note G_, 1 + note __, 2 + note G_, 1 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 2 + note __, 1 + note F#, 3 + note __, 1 + dec_octave + notetype1 10 + notetype2 6 + note G_, 1 + dutycycle 1 + notetype1 9 + notetype2 8 + note E_, 1 + note __, 2 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note E_, 4 + note F#, 3 + notetype0 7 + note F#, 15 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note F#, 1 + note __, 2 + note F#, 1 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note E_, 4 + note F#, 3 + notetype0 7 + note F#, 2 + note __, 1 + note E_, 3 + note __, 1 + dec_octave + notetype1 10 + notetype2 6 + note A_, 1 + dutycycle 1 + notetype1 9 + notetype2 8 + note E_, 1 + note __, 2 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note D#, 4 + note E_, 3 + notetype0 7 + note E_, 15 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note A_, 1 + note __, 2 + note A_, 1 + dutycycle 2 + notetype1 7 + notetype0 1 + note A#, 4 + note B_, 3 + notetype0 7 + note B_, 2 + note __, 1 + note A_, 3 + note __, 1 + note G_, 3 + note __, 1 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 1 + note __, 1 + note F#, 13 + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + dutycycle 2 + notetype1 10 + notetype2 6 + note D_, 2 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 2 + callchannel Branch_f59b4 + octave 3 + notetype0 1 + notetype1 7 + note F_, 4 + note F#, 3 + notetype0 7 + note F#, 1 + note __, 1 + note D_, 5 + note __, 1 + dec_octave + note F#, 1 + notetype0 1 + note A_, 4 + note __, 3 + inc_octave + note D_, 4 + note __, 3 + note F#, 4 + note __, 3 + notetype0 7 + note __, 3 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 +.Loop5 + note D_, 1 + note __, 2 + loopchannel 3, .Loop5 + callchannel Branch_f59b4 + notetype1 8 + octave 3 + note D_, 16 + note D_, 6 + note __, 2 + notetype0 1 + note G#, 4 + note A_, 3 + notetype0 7 + note A_, 2 + note A_, 1 + note __, 2 + note A_, 1 + note __, 1 + note D_, 2 + note __, 1 + note D_, 13 + note C#, 6 + note __, 2 + dec_octave + notetype1 8 + notetype0 1 + note E_, 5 + note A_, 5 + inc_octave + note C#, 4 + note E_, 5 + note A_, 5 + inc_octave + note C#, 4 + dec_octave + dec_octave + note A_, 5 + inc_octave + note C#, 5 + note E_, 4 + note A_, 5 + inc_octave + note C#, 5 + note E_, 4 + dec_octave + notetype0 7 + callchannel Branch_f598c + note D_, 8 + note D_, 8 + note C#, 6 + dec_octave + dutycycle 1 + notetype1 7 + notetype0 1 + note G_, 4 + note G#, 3 + notetype0 7 + note A_, 1 + note __, 1 + note A_, 1 + note B_, 2 + inc_octave + note C#, 2 + note E_, 2 + dutycycle 2 + callchannel Branch_f598c + note D_, 4 + note E_, 2 + note D_, 2 + note __, 2 + note C#, 2 + note __, 2 + note E_, 6 + note D_, 2 + note C#, 2 + note __, 2 + dec_octave + note A_, 2 + note __, 2 + note G_, 8 + note G_, 8 + note F#, 8 + note F#, 8 + note __, 2 + note G_, 12 + note __, 2 + note G_, 14 + note __, 4 + loopchannel 0, .MainLoop + +Branch_f594d: + octave 3 + notetype0 1 + note C#, 4 + note D_, 3 + notetype0 7 + note D_, 9 + dec_octave + dutycycle 1 + notetype1 9 + dec_octave + note A_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 7 + note A_, 3 + note __, 1 + inc_octave + note C_, 6 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note D#, 4 + note E_, 3 + notetype0 7 + note E_, 2 + note D_, 1 + dec_octave + notetype1 10 + notetype2 6 + note G_, 2 + inc_octave + notetype1 7 + notetype2 8 + note C_, 1 + note __, 1 + endchannel + +Branch_f598c: + notetype1 8 + note D_, 10 + note __, 2 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 2 + note __, 2 + inc_octave + note D_, 8 + note C#, 1 + note __, 1 + dec_octave + note B_, 1 + note __, 1 + note A_, 2 + note __, 1 + note F#, 9 + note D_, 1 + note __, 1 + note G_, 9 + note __, 1 + note F#, 4 + note E_, 4 + note D_, 10 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + dec_octave + note B_, 10 + inc_octave + note C#, 2 + note D_, 2 + note __, 2 + note D_, 2 + endchannel + +Branch_f59b4: + octave 2 + notetype1 8 + notetype0 1 + note G#, 4 + note A_, 3 + notetype0 7 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G_, 1 + note __, 2 + note C_, 1 + note __, 2 + note C_, 1 + note __, 2 + dutycycle 2 + notetype1 7 + note E_, 1 + notetype0 1 + note G_, 4 + note __, 3 + inc_octave + note C_, 4 + note __, 3 + note E_, 4 + note __, 3 + notetype0 7 + note __, 3 + notetype2 8 + dec_octave + dutycycle 1 + notetype1 8 +.Loop6 + note C_, 1 + note __, 2 + loopchannel 3, .Loop6 + inc_octave + dutycycle 2 + notetype1 7 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 2 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + endchannel + +Branch_f59f9: + octave 2 + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 1 + note __, 3 + dec_octave + note A_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype1 10 + notetype2 6 + note A_, 1 + dec_octave + dutycycle 1 + notetype1 9 + notetype2 8 + note B_, 1 + note __, 2 + endchannel + +Branch_f5a17: + octave 2 + dutycycle 1 + notetype1 9 + notetype2 8 + note F#, 1 + note __, 3 + note C#, 1 + note __, 1 + dutycycle 2 + notetype1 10 + notetype2 6 + note A_, 1 + dutycycle 1 + notetype1 9 + notetype2 8 + note E_, 1 + note __, 2 + endchannel + + +Music_TCGDuelTheme1_Ch3: + notetype0 7 + notetype1 1 + notetype2 14 + octave 2 +.MainLoop +.Loop1 + rept 3 + note D_, 1 + note __, 2 + endr + note __, 1 + callchannel Branch_f5c47 + loopchannel 4, .Loop1 +.Loop2 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + inc_octave + note D_, 2 + dec_octave + dec_octave + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + loopchannel 4, .Loop2 + callchannel Branch_f5b8d + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note F#, 2 + dec_octave + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + inc_octave + note D_, 2 + dec_octave + dec_octave + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + callchannel Branch_f5b8d + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note A_, 2 + dec_octave + note D_, 1 + note __, 3 + callchannel Branch_f5c47 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note A_, 2 + dec_octave + note D_, 1 + note __, 2 + note D_, 2 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Branch_f5c7e + octave 3 + note C_, 3 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note C_, 1 + note __, 1 + dec_octave +.Loop3 + note D_, 1 + note __, 2 + loopchannel 3, .Loop3 + inc_octave + note D_, 1 + notetype0 1 + note F#, 4 + note __, 3 + note A_, 4 + note __, 3 + inc_octave + note D_, 4 + note __, 3 + notetype0 7 + note __, 3 + dec_octave + dec_octave +.Loop4 + note D_, 1 + note __, 2 + loopchannel 3, .Loop4 + note D_, 2 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + callchannel Branch_f5c7e + octave 2 + note C_, 3 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + callchannel Branch_f5c60 + octave 2 + note E_, 1 + note __, 1 + note E_, 2 + note B_, 2 + callchannel Branch_f5c60 + octave 2 + note F#, 2 + note G_, 2 + note G#, 2 + callchannel Branch_f5c6f + octave 2 + note A_, 1 + note __, 1 + note A_, 2 + note E_, 2 + callchannel Branch_f5c6f + octave 2 + note B_, 2 + inc_octave + note C_, 2 + note C#, 2 + dec_octave +.Loop5 + callchannel Branch_f5c4d + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 2 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note F#, 1 + note __, 1 + note F#, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note F#, 1 + note __, 1 + note E_, 2 + callchannel Branch_f5c4d + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 2 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note F#, 1 + note __, 1 + note F_, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note F#, 2 + note G_, 2 + note G#, 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 2 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note A_, 2 + note E_, 2 + note C#, 2 + loopchannel 2, .Loop5 +.Loop6 + callchannel Branch_f5c4d + loopchannel 2, .Loop6 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note D_, 1 + note __, 1 + note A_, 14 + note __, 4 + loopchannel 0, .MainLoop + +Branch_f5b8d: + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note A_, 2 + dec_octave + note D_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note G_, 2 + dec_octave + note D_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 +.Loop7 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note A_, 2 + dec_octave + note D_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 + loopchannel 3, .Loop7 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note G_, 2 + dec_octave + note D_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note A_, 2 + dec_octave + note D_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 + note D_, 1 + note __, 2 + note D_, 1 + inc_octave + note A_, 2 + dec_octave + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note E_, 2 + note F#, 1 + note __, 1 +.Loop8 + note G_, 1 + note __, 2 + note G_, 1 + inc_octave + note B_, 2 + dec_octave + note G_, 1 + note __, 3 + note D_, 1 + note __, 1 + note D_, 1 + note E_, 1 + note __, 2 + loopchannel 2, .Loop8 + note F#, 1 + note __, 2 + note F#, 1 + inc_octave + note A_, 2 + dec_octave + note F#, 1 + note __, 3 + note C#, 1 + note __, 1 + note C#, 1 + note E_, 1 + note __, 2 + note F#, 1 + note __, 2 + note F#, 1 + inc_octave + inc_octave + note C#, 2 + dec_octave + dec_octave + note F#, 1 + note __, 3 + note C#, 1 + note __, 1 + note C#, 1 + note E_, 1 + note __, 2 + note E_, 1 + note __, 2 + note E_, 1 + inc_octave + note B_, 2 + dec_octave + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note F#, 1 + note G_, 1 + note __, 2 + note A_, 1 + note __, 2 + note A_, 1 + inc_octave + note B_, 2 + dec_octave + note A_, 1 + note __, 3 + note E_, 1 + note __, 1 + note F#, 1 + note A_, 1 + note __, 2 + endchannel + +Branch_f5c47: + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + note __, 2 + endchannel + +Branch_f5c4d: + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note D_, 1 + note __, 1 + note D_, 2 + endchannel + +Branch_f5c60: + octave 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + endchannel + +Branch_f5c6f: + octave 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 2 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + endchannel + +Branch_f5c7e: + octave 2 +.Loop9 + note C_, 1 + note __, 2 + loopchannel 3, .Loop9 + inc_octave + note C_, 1 + notetype0 1 + note E_, 4 + note __, 3 + note G_, 4 + note __, 3 + inc_octave + note C_, 4 + note __, 3 + notetype0 7 + note __, 3 + dec_octave + dec_octave +.Loop10 + note C_, 1 + note __, 2 + loopchannel 3, .Loop10 + endchannel + + +Music_TCGDuelTheme1_Ch4: + togglenoise $06 + notetype 7 + octave 1 +.MainLoop +.Loop1 + note C_, 2 + note D#, 1 + note E_, 1 + note D#, 1 + note C_, 1 + note D_, 2 + note D#, 1 + note C_, 1 + note E_, 2 + note C#, 1 + note E_, 1 + note __, 1 + note D#, 1 + loopchannel 3, .Loop1 + note C_, 2 + note D#, 1 + note E_, 1 + note D#, 1 + note C_, 1 + note D_, 2 + note D#, 1 + note C#, 1 + note E_, 1 + notetype 1 + note D_, 4 + note D_, 3 + notetype 7 + note C#, 1 + note C#, 1 + note C#, 2 +.Loop2 + callchannel Branch_f5d39 + loopchannel 3, .Loop2 + callchannel Branch_f5d46 +.Loop3 + callchannel Branch_f5d39 + loopchannel 15, .Loop3 + callchannel Branch_f5d46 +.Loop4 + callchannel Branch_f5d39 + loopchannel 15, .Loop4 + note C_, 2 + note D#, 1 + note E_, 1 + note C#, 2 + note E_, 2 + note D#, 1 + note C#, 1 + note E_, 1 + notetype 1 + note D_, 4 + note D_, 3 + notetype 7 +.Loop5 + note C#, 1 + loopchannel 4, .Loop5 +.Loop6 + note C_, 1 + note D#, 1 + note E_, 1 + note C#, 1 + note D#, 1 + note C_, 1 + note E_, 2 + note D#, 1 + note C_, 1 + note D#, 2 + note C#, 2 + note E_, 2 + loopchannel 5, .Loop6 + note C_, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note C_, 1 + note E_, 2 + note D#, 1 + note C_, 1 + note E_, 1 + notetype 1 + note D_, 4 + note D_, 3 + notetype 7 +.Loop7 + note C#, 1 + loopchannel 4, .Loop7 +.Loop8 + callchannel Branch_f5d39 + loopchannel 3, .Loop8 + callchannel Branch_f5d58 +.Loop9 + callchannel Branch_f5d39 + loopchannel 7, .Loop9 + callchannel Branch_f5d46 +.Loop10 + callchannel Branch_f5d39 + loopchannel 7, .Loop10 + callchannel Branch_f5d58 +.Loop11 + callchannel Branch_f5d39 + loopchannel 2, .Loop11 + note C_, 2 + note D#, 1 + note E_, 1 + note C#, 2 + note E_, 2 + note C_, 1 + note D#, 1 + note E_, 2 + note C#, 2 + note F_, 14 + note C#, 4 + loopchannel 0, .MainLoop + +Branch_f5d39: + note C_, 2 + note D#, 1 + note E_, 1 + note C#, 2 + note E_, 2 + note C_, 1 + note D#, 1 + note E_, 2 + note C#, 1 + note E_, 1 + note __, 1 + note D#, 1 + endchannel + +Branch_f5d46: + note C_, 2 + note D#, 1 + note E_, 1 + note C#, 2 + note E_, 2 + note D#, 1 + note C#, 1 + note E_, 1 + notetype 1 + note D_, 4 + note D_, 3 + notetype 7 + note C#, 1 + note C#, 1 + note C#, 2 + endchannel + +Branch_f5d58: + note C_, 2 + note D#, 1 + note E_, 1 + note C#, 2 + note E_, 1 + notetype 1 + note D_, 4 + note D_, 3 + notetype 7 +.Loop12 + note C#, 1 + loopchannel 8, .Loop12 + endchannel + diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm new file mode 100644 index 00000000..0c3a037a --- /dev/null +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -0,0 +1,1193 @@ +Music_TCGDuelTheme2: + db $C0 + dw Music_TCGDuelTheme2_Ch1 + db $01 + dw Music_TCGDuelTheme2_Ch2 + db $02 + dw Music_TCGDuelTheme2_Ch3 + db $03 + dw Music_TCGDuelTheme2_Ch4 + +Music_TCGDuelTheme2_Ch1: + notetype0 9 + vibrato 20, $33 + notetype2 8 + octave 1 + dutycycle 1 + notetype1 9 +.Loop1 + note D_, 2 + note D_, 1 + loopchannel 8, .Loop1 +.MainLoop + octave 1 +.Loop2 + note D_, 2 + note D_, 1 + loopchannel 23, .Loop2 + dutycycle 1 + notetype1 10 + inc_octave + inc_octave + notetype0 1 + note C_, 3 + note D_, 4 + note E_, 3 + note F_, 4 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 3 + notetype0 9 + callchannel Branch_f5f3d + note C_, 6 + notetype0 1 + note C_, 12 + notetype1 3 + note C_, 6 + notetype1 10 + dec_octave + note B_, 12 + notetype1 3 + note B_, 6 + notetype1 10 + note G_, 12 + notetype1 3 + note G_, 6 + notetype0 9 + notetype1 10 + notetype2 8 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 10 + notetype2 6 + note D_, 1 + notetype2 8 + note D_, 9 + note D_, 9 + notetype1 4 + note D_, 3 + dutycycle 2 + notetype2 8 + notetype1 3 + note E_, 4 + notetype1 6 + note E_, 7 + notetype1 2 + note E_, 1 + notetype1 6 + note G_, 4 + notetype1 8 + notetype0 1 + note G_, 12 + notetype1 2 + note G_, 6 + inc_octave + notetype0 9 + notetype1 8 + notetype2 8 + note C_, 3 + dutycycle 1 + notetype1 10 + dec_octave + notetype0 1 + note C_, 3 + note D_, 4 + note E_, 3 + note F_, 4 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 3 + notetype0 9 + callchannel Branch_f5f3d + notetype2 8 + note C_, 4 + notetype0 1 + note C_, 4 + note E_, 5 + note F_, 4 + note F#, 5 + note G_, 12 + notetype1 3 + note G_, 6 + notetype1 10 + note E_, 12 + notetype1 3 + note E_, 6 + notetype0 9 + notetype1 10 + notetype2 8 + note C_, 1 + notetype1 3 + note C_, 1 + notetype1 10 + note D_, 1 + notetype1 3 + note D_, 1 + dec_octave + notetype1 10 + notetype2 6 + note A_, 1 + inc_octave + notetype2 8 + note D_, 9 + note D_, 10 + notetype1 3 + note D_, 1 + notetype1 10 + notetype0 1 + notetype2 8 + note D_, 4 + note D#, 5 + notetype0 9 + note E_, 11 + notetype1 3 + note E_, 1 + notetype1 10 + note G_, 5 + notetype1 3 + note G_, 1 + notetype1 10 + inc_octave + notetype2 8 + note C_, 3 + dec_octave + notetype0 1 + note C_, 3 + note D_, 4 + note E_, 3 + note F_, 4 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 3 + callchannel Branch_f5f90 + note D_, 1 + notetype1 3 + note D_, 1 + dutycycle 1 + notetype1 9 + octave 1 + note D_, 1 +.Loop3 + note D_, 2 + note D_, 1 + loopchannel 3, .Loop3 + dutycycle 2 + notetype1 7 + inc_octave + inc_octave + note G_, 1 + dec_octave + note B_, 1 + inc_octave + note G_, 1 + note A_, 1 + note D_, 1 + note A_, 1 + note B_, 1 + note D_, 1 + note B_, 1 + dutycycle 1 + notetype1 10 + callchannel Branch_f5f62 + octave 4 + notetype1 4 + note F#, 12 + notetype1 10 + note C#, 9 + notetype1 4 + note C#, 1 + notetype1 10 + note C#, 1 + note D_, 1 + note E_, 3 + note D_, 3 + note C#, 3 + dec_octave + notetype2 6 + note B_, 3 + notetype2 8 + note B_, 4 + notetype1 4 + note B_, 1 + inc_octave + notetype1 10 + notetype0 1 + note C#, 4 + dec_octave + note B_, 5 + notetype0 9 + note A_, 6 + notetype1 4 + note A_, 1 + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 2 + note D_, 2 + note __, 2 + note C#, 2 + dutycycle 1 + notetype1 10 + notetype2 8 + callchannel Branch_f5f62 + octave 4 + notetype1 4 + note F#, 6 + dec_octave + notetype1 10 + note B_, 2 + inc_octave + note C#, 2 + note D_, 1 + notetype1 4 + note D_, 1 + notetype1 10 + note D_, 9 + notetype1 4 + note D_, 1 + notetype1 10 + notetype2 7 + note C#, 1 + note D_, 1 + notetype2 8 + note E_, 3 + note D_, 3 + note C#, 3 + dec_octave + notetype2 6 + note A_, 3 + inc_octave + notetype2 8 + note F_, 10 + notetype2 7 + note E_, 1 + note F_, 1 + notetype2 8 + note G_, 3 + note F_, 3 + note E_, 3 + notetype0 1 + note C_, 2 + note C_, 16 + notetype1 4 + note C_, 9 + notetype0 9 + notetype1 10 + notetype2 8 + note A_, 10 + notetype2 7 + note G_, 1 + note F_, 1 + notetype2 8 + note G_, 6 + inc_octave + note C_, 3 + dec_octave + notetype0 1 + note C_, 3 + note D_, 4 + note E_, 3 + note F_, 4 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 3 + callchannel Branch_f5f90 + note D_, 1 + notetype1 3 + note D_, 1 + dutycycle 1 + notetype1 9 + octave 1 + note D_, 1 +.Loop4 + note D_, 2 + note D_, 1 + loopchannel 3, .Loop4 + dutycycle 1 + notetype1 10 + notetype2 8 + octave 5 + note D_, 1 + note C_, 1 + dec_octave + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note G_, 1 + note F_, 1 + note C_, 1 + note D_, 12 + note D_, 12 + dutycycle 1 + notetype1 9 + loopchannel 0, .MainLoop + +Branch_f5f3d: + notetype2 8 + note D_, 12 + note D_, 4 + notetype0 1 + note D_, 7 + notetype1 4 + note D_, 2 + notetype0 9 + note D_, 1 + dec_octave + notetype1 10 + note A_, 4 + notetype0 1 + note A_, 7 + notetype1 4 + note A_, 2 + notetype0 9 + note A_, 1 + inc_octave + notetype1 10 + note C_, 12 + endchannel + +Branch_f5f62: + octave 3 + notetype0 1 + note C#, 3 + note D_, 4 + note E_, 3 + note F#, 4 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C#, 3 + notetype0 9 + note D_, 2 + note C#, 2 + dec_octave + note A_, 2 + note F#, 5 + notetype1 4 + note F#, 1 + inc_octave + notetype1 10 + note D_, 2 + note C#, 2 + dec_octave + note A_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 1 + notetype1 4 + note B_, 1 + notetype1 10 + inc_octave + notetype2 6 + note F#, 1 + notetype2 8 + note F#, 9 + endchannel + +Branch_f5f90: + octave 5 + notetype0 9 +.Loop5 + note D_, 1 + notetype1 3 + note D_, 1 + dutycycle 1 + notetype1 9 + octave 1 + note D_, 1 + rept 5 + note D_, 2 + note D_, 1 + endr + note D_, 2 + dutycycle 1 + notetype1 10 + octave 5 + note C_, 4 + loopchannel 3, .Loop5 + endchannel + + +Music_TCGDuelTheme2_Ch2: + notetype0 9 + vibrato 15, $33 + notetype2 8 + octave 2 + dutycycle 1 + notetype1 7 +.Loop1 + note D_, 2 + note D_, 1 + loopchannel 8, .Loop1 +.MainLoop +.Loop2 + note D_, 2 + note D_, 1 + loopchannel 24, .Loop2 + dutycycle 2 + notetype1 7 +.Loop3 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + loopchannel 12, .Loop3 +.Loop4 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + loopchannel 10, .Loop4 + inc_octave + note C_, 1 + note G_, 1 + inc_octave + note C_, 1 + note G_, 1 + dutycycle 1 + notetype1 7 + dec_octave + note D_, 1 + note __, 1 + dec_octave + notetype2 6 + note A_, 1 + notetype2 8 + note A_, 9 + dutycycle 2 + notetype1 7 +.Loop5 + note A_, 1 + note D_, 1 + note A_, 1 + loopchannel 4, .Loop5 + dutycycle 2 + inc_octave + notetype2 8 + notetype1 3 + note C_, 4 + notetype1 6 + note C_, 7 + note __, 1 + notetype1 6 + note E_, 4 + notetype0 1 + notetype1 8 + note E_, 12 + note __, 6 + notetype0 9 + notetype1 8 + note G_, 3 + dec_octave + dutycycle 1 + notetype1 7 + notetype0 1 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note E_, 4 + note F_, 3 + note G_, 3 + notetype0 9 + dutycycle 2 + notetype1 7 +.Loop6 + note A_, 1 + note D_, 1 + loopchannel 9, .Loop6 +.Loop7 + note D_, 1 + dec_octave + note A_, 1 + inc_octave + loopchannel 3, .Loop7 +.Loop8 + note G_, 1 + note C_, 1 + loopchannel 8, .Loop8 + notetype0 1 + note G_, 4 + dutycycle 1 + notetype1 7 + inc_octave + note C_, 5 + note D_, 4 + note D#, 5 + notetype0 1 + note E_, 12 + note __, 6 + note C_, 12 + note __, 6 + notetype0 9 + dec_octave + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + notetype2 6 + note D_, 1 + notetype2 8 + note A_, 9 + dutycycle 2 + notetype1 7 +.Loop9 + note A_, 1 + note D_, 1 + loopchannel 5, .Loop9 + note A_, 1 + dutycycle 1 + notetype1 7 + notetype0 1 + note A#, 4 + note B_, 5 + notetype0 9 + inc_octave + note C_, 11 + note __, 1 + note E_, 5 + note __, 1 + note G_, 3 + dec_octave + notetype0 1 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note E_, 4 + note F_, 3 + note G_, 3 + callchannel Branch_f618f + note A_, 1 + note __, 1 + dutycycle 1 + notetype1 7 + dec_octave + dec_octave + note D_, 1 +.Loop10 + note D_, 2 + note D_, 1 + loopchannel 3, .Loop10 + dutycycle 2 + notetype1 7 + inc_octave + note E_, 1 + note __, 1 + note E_, 1 + note F#, 1 + note __, 1 + note F#, 1 + note G_, 1 + note __, 1 + note G_, 1 + inc_octave + note C#, 1 + dec_octave + note E_, 1 + inc_octave + note C#, 1 + dutycycle 2 + notetype1 7 + callchannel Branch_f6173 + octave 4 +.Loop11 + note D_, 1 + dec_octave + note G_, 1 + note B_, 1 + note D_, 1 + note G_, 1 + dec_octave + note B_, 1 + inc_octave + inc_octave + loopchannel 4, .Loop11 +.Loop12 + note C#, 1 + dec_octave + note F#, 1 + note A_, 1 + note D_, 1 + note F#, 1 + dec_octave + note A_, 1 + inc_octave + inc_octave + loopchannel 2, .Loop12 + dutycycle 1 + notetype1 9 + octave 2 + note __, 1 + notetype2 8 + note B_, 2 + note B_, 2 + note __, 2 + note A_, 2 + inc_octave + notetype2 8 + note C#, 1 + note D_, 1 + note E_, 1 + dutycycle 2 + notetype1 7 + callchannel Branch_f6173 + octave 3 +.Loop13 + note B_, 1 + note D_, 1 + note G_, 1 + dec_octave + note B_, 1 + inc_octave + note D_, 1 + dec_octave + note G_, 1 + inc_octave + loopchannel 2, .Loop13 +.Loop14 + inc_octave + note C#, 1 + dec_octave + note E_, 1 + note A_, 1 + note C#, 1 + note E_, 1 + dec_octave + note A_, 1 + inc_octave + loopchannel 2, .Loop14 +.Loop15 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note A_, 1 + note D_, 1 + note F_, 1 + dec_octave + note A_, 1 + inc_octave + loopchannel 2, .Loop15 +.Loop16 + inc_octave + note E_, 1 + dec_octave + note G_, 1 + inc_octave + note C_, 1 + dec_octave + note E_, 1 + note G_, 1 + note C_, 1 + loopchannel 2, .Loop16 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note A_, 1 + note D_, 1 + note F_, 1 + dec_octave + note A_, 1 + inc_octave + inc_octave + note C_, 1 + dec_octave + note F_, 1 + note A_, 1 + note D_, 1 + note F_, 1 + dec_octave + note A_, 1 + inc_octave + inc_octave + note E_, 1 + dec_octave + note G_, 1 + inc_octave + note C_, 1 + dec_octave + note E_, 1 + note G_, 1 + note C_, 1 + inc_octave + note E_, 1 + dec_octave + note G_, 1 + inc_octave + note C_, 1 + dutycycle 1 + notetype1 7 + dec_octave + notetype0 1 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note E_, 4 + note F_, 3 + note G_, 3 + callchannel Branch_f618f + note A_, 1 + note __, 1 + dutycycle 1 + notetype1 7 + dec_octave + dec_octave + note D_, 1 +.Loop17 + note D_, 2 + note D_, 1 + loopchannel 3, .Loop17 + note __, 12 + dutycycle 1 + notetype1 7 + inc_octave + note A_, 12 + note A_, 12 + dec_octave + dutycycle 1 + notetype1 7 + loopchannel 0, .MainLoop + +Branch_f6173: + octave 4 +.Loop18 + note C#, 1 + dec_octave + note F#, 1 + note A_, 1 + note D_, 1 + note F#, 1 + dec_octave + note A_, 1 + inc_octave + inc_octave + loopchannel 4, .Loop18 +.Loop19 + note D_, 1 + dec_octave + note G_, 1 + note B_, 1 + note D_, 1 + note G_, 1 + dec_octave + note B_, 1 + inc_octave + inc_octave + loopchannel 4, .Loop19 + endchannel + +Branch_f618f: + octave 4 + notetype0 9 +.Loop20 + note A_, 1 + note __, 1 + notetype1 7 + dec_octave + dec_octave + note D_, 1 + rept 5 + note D_, 2 + note D_, 1 + endr + note D_, 2 + notetype1 7 + inc_octave + inc_octave + note G_, 4 + loopchannel 3, .Loop20 + endchannel + + +Music_TCGDuelTheme2_Ch3: + notetype0 9 + notetype1 1 + notetype2 11 + octave 2 +.Loop1 + callchannel Branch_f62e5 + loopchannel 4, .Loop1 +.MainLoop +.Loop2 + callchannel Branch_f62e5 + loopchannel 44, .Loop2 +.Loop3 + rept 3 + callchannel Branch_f62e5 + endr + octave 2 + note D_, 2 + note C_, 3 + note E_, 1 + loopchannel 3, .Loop3 +.Loop4 + callchannel Branch_f62e5 + loopchannel 2, .Loop4 + octave 2 + note E_, 1 + inc_octave + note E_, 1 + dec_octave + note E_, 1 + note F#, 1 + inc_octave + note F#, 1 + dec_octave + note F#, 1 + note G_, 1 + inc_octave + note G_, 1 + dec_octave + note G_, 1 + note A_, 1 + inc_octave + note A_, 1 + dec_octave + note A_, 1 +.Loop5 + callchannel Branch_f62e5 + loopchannel 4, .Loop5 + octave 2 +.Loop6 + note E_, 2 + note E_, 1 + inc_octave + note E_, 1 + dec_octave + note E_, 1 + inc_octave + note E_, 1 + dec_octave + loopchannel 4, .Loop6 +.Loop7 + note A_, 2 + note A_, 1 + inc_octave + note A_, 1 + dec_octave + note A_, 1 + inc_octave + note A_, 1 + dec_octave + loopchannel 4, .Loop7 +.Loop8 + callchannel Branch_f62e5 + loopchannel 2, .Loop8 + octave 2 + note E_, 1 + inc_octave + note E_, 1 + dec_octave + note E_, 1 + inc_octave + note E_, 1 + dec_octave + note E_, 1 + inc_octave + note E_, 1 + dec_octave + note A_, 1 + inc_octave + note E_, 1 + dec_octave + note A_, 1 + inc_octave + note A_, 1 + dec_octave + note A_, 1 + inc_octave + note A_, 1 +.Loop9 + callchannel Branch_f62e5 + loopchannel 4, .Loop9 + octave 2 +.Loop10 + note E_, 2 + note E_, 1 + inc_octave + note E_, 1 + dec_octave + note E_, 1 + inc_octave + note E_, 1 + dec_octave + loopchannel 4, .Loop10 +.Loop11 + note G_, 2 + note G_, 1 + inc_octave + note G_, 1 + dec_octave + note G_, 1 + inc_octave + note G_, 1 + dec_octave + loopchannel 2, .Loop11 +.Loop12 + note A_, 2 + note A_, 1 + inc_octave + note A_, 1 + dec_octave + note A_, 1 + inc_octave + note A_, 1 + dec_octave + loopchannel 2, .Loop12 +.Loop13 + note A#, 2 + note A#, 1 + inc_octave + note A#, 1 + dec_octave + note A#, 1 + inc_octave + note A#, 1 + dec_octave + loopchannel 2, .Loop13 + inc_octave +.Loop14 + note C_, 2 + note C_, 1 + inc_octave + note C_, 1 + dec_octave + note C_, 1 + inc_octave + note C_, 1 + dec_octave + loopchannel 2, .Loop14 + dec_octave +.Loop15 + note A#, 2 + note A#, 1 + inc_octave + note A#, 1 + dec_octave + note A#, 1 + inc_octave + note A#, 1 + dec_octave + loopchannel 2, .Loop15 + inc_octave +.Loop16 + note C_, 2 + note C_, 1 + inc_octave + note C_, 1 + dec_octave + note C_, 1 + inc_octave + note C_, 1 + dec_octave + loopchannel 2, .Loop16 +.Loop17 + rept 3 + callchannel Branch_f62e5 + endr + octave 2 + note D_, 2 + note C_, 3 + note E_, 1 + loopchannel 3, .Loop17 +.Loop18 + callchannel Branch_f62e5 + loopchannel 2, .Loop18 + octave 3 + note D_, 1 + note C_, 1 + dec_octave + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note G_, 1 + note F_, 1 + note C_, 1 +.Loop19 + callchannel Branch_f62e5 + loopchannel 4, .Loop19 + loopchannel 0, .MainLoop + +Branch_f62e5: + octave 2 + note D_, 2 + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note D_, 1 + inc_octave + note D_, 1 + endchannel + + +Music_TCGDuelTheme2_Ch4: + togglenoise $06 + notetype 9 +.Loop1 + note __, 12 + loopchannel 2, .Loop1 +.MainLoop + note __, 12 + note __, 6 +.Loop2 + note C#, 1 + loopchannel 6, .Loop2 +.Loop3 + callchannel Branch_f637c + loopchannel 3, .Loop3 + note C_, 1 + note D#, 1 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 +.Loop4 + note C#, 1 + loopchannel 6, .Loop4 +.Loop5 + callchannel Branch_f637c + loopchannel 15, .Loop5 + callchannel Branch_f6396 +.Loop6 + callchannel Branch_f637c + rept 6 + note C#, 1 + endr + note C#, 2 + note F_, 3 + note C#, 1 + loopchannel 3, .Loop6 + note C_, 1 + note D#, 1 + note D#, 1 + note C#, 1 + note D#, 1 + note D#, 1 + note C_, 1 + note D#, 1 + notetype 1 + note D#, 4 + note D_, 5 + notetype 9 + note C#, 3 +.Loop7 + note C#, 1 + loopchannel 12, .Loop7 +.Loop8 + callchannel Branch_f637c + callchannel Branch_f6389 + loopchannel 3, .Loop8 + callchannel Branch_f637c + 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 1 + note D_, 4 + note D_, 5 + notetype 9 + note C#, 1 + note C#, 1 + note C#, 1 +.Loop9 + callchannel Branch_f637c + callchannel Branch_f6389 + loopchannel 4, .Loop9 + callchannel Branch_f637c + callchannel Branch_f6396 +.Loop10 + callchannel Branch_f637c + rept 6 + note C#, 1 + endr + note C#, 2 + note F_, 3 + note C#, 1 + loopchannel 3, .Loop10 + callchannel Branch_f637c +.Loop11 + note C#, 1 + loopchannel 12, .Loop11 + note F_, 12 + note __, 12 + loopchannel 0, .MainLoop + +Branch_f637c: + note C_, 1 + note D#, 1 + note D#, 1 + note C#, 1 + note D#, 1 + note D#, 1 + note C_, 1 + note D#, 1 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + endchannel + +Branch_f6389: + note C_, 1 + note D#, 1 + note D#, 1 + note C#, 1 + note D#, 1 + note D#, 1 + note C_, 1 + note D#, 1 + note D#, 1 + note C#, 1 + note D#, 1 + note C#, 1 + endchannel + +Branch_f6396: + note C_, 1 + note D#, 1 + note D#, 1 + note C#, 1 + note D#, 1 + note D#, 1 +.Loop12 + note C#, 1 + loopchannel 6, .Loop12 + endchannel + diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm new file mode 100644 index 00000000..058b7da5 --- /dev/null +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -0,0 +1,1490 @@ +Music_TCGDuelTheme3: + db $C0 + dw Music_TCGDuelTheme3_Ch1 + db $01 + dw Music_TCGDuelTheme3_Ch2 + db $02 + dw Music_TCGDuelTheme3_Ch3 + db $03 + dw Music_TCGDuelTheme3_Ch4 + +Music_TCGDuelTheme3_Ch1: + notetype0 11 + vibrato 20, $33 + notetype2 8 +.MainLoop + octave 2 + dutycycle 0 +.Loop1 + rept 4 + notetype1 9 + note F#, 2 + note __, 1 + endr + notetype1 9 + note E_, 2 + notetype1 9 + note F_, 2 + loopchannel 4, .Loop1 +.Loop2 + callchannel Branch_f67b2 + loopchannel 4, .Loop2 + dutycycle 1 + notetype1 10 +.Loop3 + octave 3 + note C#, 1 + note F#, 1 + notetype0 1 + note G#, 5 + notetype1 3 + note G#, 6 + callchannel Branch_f65a7 + octave 3 + note D_, 1 + note F#, 1 + notetype0 1 + note B_, 5 + notetype1 3 + note B_, 6 + callchannel Branch_f65a7 + loopchannel 2, .Loop3 + dutycycle 0 + notetype1 10 + dec_octave + note __, 2 + notetype0 1 + note E_, 5 + notetype1 2 + note E_, 6 + callchannel Branch_f65cf + note F#, 5 + notetype1 2 + note F#, 6 + notetype0 11 + note __, 1 + dec_octave + dutycycle 0 + notetype1 10 + notetype0 1 + note E_, 5 + notetype1 2 + note E_, 6 + callchannel Branch_f65cf + notetype0 11 + dutycycle 1 + notetype1 10 +.Loop4 + octave 3 + note C#, 1 + note F#, 1 + notetype0 1 + note G#, 5 + notetype1 3 + note G#, 6 + callchannel Branch_f65a7 + octave 3 + note D_, 1 + note F#, 1 + notetype0 1 + note B_, 5 + notetype1 3 + note B_, 6 + notetype1 10 + callchannel Branch_f65a7 + loopchannel 2, .Loop4 + vibrato 10, $33 + dutycycle 0 +.Loop5 + octave 2 + note __, 4 + notetype1 9 + note F#, 2 + notetype1 2 + note F#, 2 + note __, 2 + notetype1 9 + note E_, 2 + notetype1 2 + note E_, 4 + notetype1 9 + note D#, 2 + notetype1 2 + note D#, 4 + notetype1 9 + note D_, 2 + note C#, 2 + loopchannel 2, .Loop5 + vibrato 20, $33 + dutycycle 2 + notetype2 6 +.Loop6 + callchannel Branch_f661d + loopchannel 4, .Loop6 + octave 4 + notetype1 7 + note C#, 5 + notetype1 2 + note C#, 6 + notetype1 7 + note F#, 5 + notetype1 2 + note F#, 6 +.Loop7 + callchannel Branch_f661d + loopchannel 3, .Loop7 + octave 4 + notetype1 7 + note C#, 5 + notetype1 2 + note C#, 6 + notetype1 7 + note F#, 5 + notetype1 2 + note F#, 6 + inc_octave + notetype1 7 + note C#, 5 + notetype1 2 + note C#, 6 + dec_octave + notetype1 7 + note F#, 5 + notetype1 2 + note F#, 6 + dec_octave + notetype0 11 + dutycycle 1 + notetype1 9 + notetype2 8 + note D_, 2 + note C#, 2 + dec_octave + note F#, 3 + inc_octave + notetype0 1 + note D_, 3 + note D#, 2 + note E_, 3 + note F_, 3 + notetype0 11 + note F#, 4 + dec_octave + note G#, 3 + inc_octave + notetype0 1 + note E_, 3 + note F_, 2 + note F#, 3 + note G_, 3 + notetype0 11 + note G#, 4 + dutycycle 0 + octave 2 +.Loop8 + rept 4 + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + note __, 1 + endr + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + rept 4 + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + note __, 1 + endr + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + loopchannel 2, .Loop8 + dutycycle 1 + notetype1 10 + octave 3 + note C#, 1 + note F#, 1 + notetype0 1 + note G#, 5 + notetype1 3 + note G#, 6 + callchannel Branch_f65a7 + octave 3 + note C#, 1 + note F#, 1 + notetype0 1 + note G#, 5 + notetype1 3 + note G#, 6 + inc_octave + notetype1 10 + notetype0 11 + note C#, 9 + notetype1 3 + note C#, 2 + dec_octave + notetype1 10 + note B_, 1 + inc_octave + note C#, 1 + note F#, 1 + note C#, 1 + dec_octave + notetype0 1 + note B_, 5 + notetype1 3 + note B_, 6 + notetype0 11 + notetype1 10 + note F#, 9 + notetype1 3 + note F#, 4 + notetype1 10 + note G#, 1 + note A_, 1 + notetype0 1 + note G#, 5 + notetype1 3 + note G#, 6 + notetype1 10 + notetype0 11 + note B_, 8 + notetype1 3 + note B_, 1 + notetype1 10 + note A_, 2 + note B_, 1 + notetype0 1 + note B_, 5 + notetype1 3 + note B_, 6 + notetype0 11 + inc_octave + notetype1 10 + note C#, 1 + note D_, 1 + notetype0 1 + note C#, 5 + notetype1 3 + note C#, 6 + notetype1 10 + notetype0 11 + note E_, 10 + notetype1 3 + note E_, 1 + notetype1 10 + note D_, 1 + notetype0 1 + note C#, 8 + notetype1 3 + note C#, 3 + dec_octave + notetype1 10 + notetype0 11 + note B_, 1 + inc_octave + note C#, 1 + dec_octave + notetype0 1 + note B_, 5 + notetype1 3 + note B_, 6 + notetype0 11 + notetype1 10 + note E_, 10 + notetype1 3 + note E_, 3 + notetype1 2 + note A_, 3 + notetype1 6 + note A_, 5 + inc_octave + notetype1 4 + note E_, 3 + notetype1 8 + note E_, 3 + notetype1 10 + note E_, 2 + dutycycle 1 +.Loop9 + rept 4 + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + note __, 1 + endr + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + rept 4 + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + note __, 1 + endr + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + loopchannel 4, .Loop9 + loopchannel 0, .MainLoop + +Branch_f65a7: + notetype0 11 + octave 4 + notetype1 10 + note C#, 5 + note C#, 4 + notetype1 3 + note C#, 2 + dec_octave + notetype1 10 + note B_, 1 + inc_octave + note C#, 1 + note F#, 1 + note C#, 1 + dec_octave + notetype0 1 + note B_, 5 + notetype1 3 + note B_, 6 + notetype0 11 + notetype1 10 + inc_octave + note C#, 5 + note C#, 4 + notetype1 3 + note C#, 4 + notetype1 10 + endchannel + +Branch_f65cf: + octave 3 +.Loop10 + notetype0 11 + note __, 2 + notetype0 1 + notetype1 10 + note E_, 5 + notetype1 2 + note E_, 6 + loopchannel 3, .Loop10 + dutycycle 2 + notetype1 8 + note D_, 5 + note G_, 6 + note B_, 5 + inc_octave + note D_, 6 + dec_octave + note G_, 5 + note B_, 6 + inc_octave + note D_, 5 + note G_, 6 + note F#, 5 + notetype1 2 + note F#, 6 + dutycycle 0 + notetype1 10 + notetype0 11 + note __, 1 + dec_octave + notetype0 1 + note E_, 5 + notetype1 2 + note E_, 6 +.Loop11 + notetype0 11 + note __, 2 + notetype0 1 + notetype1 10 + note E_, 5 + notetype1 2 + note E_, 6 + loopchannel 3, .Loop11 + dec_octave + dutycycle 2 + notetype1 8 + note B_, 5 + inc_octave + note E_, 6 + note G_, 5 + note B_, 6 + note E_, 5 + note G_, 6 + note B_, 5 + inc_octave + note E_, 6 + endchannel + +Branch_f661d: + octave 4 + notetype0 1 + notetype1 7 + note C#, 5 + notetype1 2 + note C#, 6 + notetype1 7 + note F#, 5 + notetype1 2 + note F#, 6 + inc_octave + notetype1 7 + note C#, 5 + notetype1 2 + note C#, 6 + dec_octave + notetype1 7 + note F#, 5 + notetype1 2 + note F#, 6 + inc_octave + notetype1 7 + note C#, 5 + notetype1 2 + note C#, 6 + dec_octave + notetype1 7 + note F#, 5 + notetype1 2 + note F#, 6 + endchannel + + +Music_TCGDuelTheme3_Ch2: + notetype0 11 + vibrato 20, $33 + notetype2 8 +.MainLoop + octave 2 + dutycycle 0 +.Loop1 + rept 4 + notetype1 8 + note F#, 2 + note __, 1 + endr + notetype1 8 + note E_, 2 + notetype1 8 + note F_, 2 + loopchannel 4, .Loop1 + octave 3 +.Loop2 + note __, 6 + notetype1 10 + note E_, 1 + notetype1 2 + note E_, 1 + note __, 8 + loopchannel 4, .Loop2 +.Loop3 + rept 2 + callchannel Branch_f67b2 + endr + rept 2 + callchannel Branch_f680a + endr + loopchannel 2, .Loop3 + octave 2 + notetype1 10 + notetype0 11 + note __, 1 + notetype0 1 + note C#, 5 + notetype1 2 + note C#, 6 + notetype1 10 + note A_, 5 + notetype1 2 + note A_, 6 + callchannel Branch_f6866 + octave 4 + note C#, 5 + notetype1 2 + note C#, 6 + dec_octave + dec_octave + dutycycle 0 + notetype1 10 + note C#, 5 + notetype1 2 + note C#, 6 + notetype1 10 + note A_, 5 + notetype1 2 + note A_, 6 + callchannel Branch_f6866 + dutycycle 0 + notetype1 9 +.Loop4 + rept 2 + callchannel Branch_f67b2 + endr + rept 2 + callchannel Branch_f680a + endr + loopchannel 2, .Loop4 + vibrato 10, $33 +.Loop5 + notetype1 10 + notetype2 6 + note F#, 1 + note F#, 1 + notetype2 8 + notetype0 1 + note F#, 5 + notetype1 2 + note F#, 6 + notetype1 10 + notetype2 6 + notetype0 11 + note F#, 1 + inc_octave + notetype1 9 + notetype2 8 + note C#, 2 + dec_octave + notetype1 10 + notetype2 6 + note F#, 1 + note F#, 1 + notetype0 1 + notetype2 8 + note F#, 5 + notetype1 2 + note F#, 6 + notetype1 10 + notetype2 6 + notetype0 11 + note F#, 1 + notetype1 9 + notetype2 8 + note B_, 2 + notetype1 10 + notetype2 6 + note F#, 1 + note F#, 1 + notetype2 8 + notetype0 1 + note F#, 5 + notetype1 2 + note F#, 6 + notetype1 10 + notetype2 6 + notetype0 11 + note F#, 1 + notetype1 9 + notetype2 8 + note B_, 2 + notetype1 10 + notetype2 6 + note F#, 1 + note F#, 1 + notetype0 1 + notetype2 8 + note F#, 5 + notetype1 2 + note F#, 6 + notetype1 10 + notetype2 6 + notetype0 11 + note F#, 1 + notetype2 8 + notetype1 9 + note A_, 2 + note G#, 2 + loopchannel 4, .Loop5 + vibrato 20, $33 + note D_, 3 + notetype0 1 + note A#, 3 + note B_, 2 + inc_octave + note C_, 3 + note C#, 3 + notetype0 11 + note D_, 4 + dec_octave + note E_, 3 + inc_octave + notetype0 1 + note C_, 3 + note C#, 2 + note D_, 3 + note D#, 3 + notetype0 11 + note E_, 4 + octave 3 +.Loop6 + rept 4 + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + note __, 1 + endr + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + rept 4 + notetype1 9 + note D_, 1 + notetype1 3 + note D_, 1 + note __, 1 + endr + notetype1 9 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 9 + note D_, 1 + notetype1 3 + note D_, 1 + loopchannel 6, .Loop6 + dutycycle 1 + inc_octave +.Loop7 + rept 4 + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + endr + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + rept 4 + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + note __, 1 + endr + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + loopchannel 4, .Loop7 + loopchannel 0, .MainLoop + +Branch_f67b2: + octave 2 + notetype1 10 + notetype0 11 + note __, 1 + notetype0 1 + note F#, 5 + notetype1 2 + note F#, 6 + notetype1 10 + note A_, 5 + notetype1 2 + note A_, 6 + notetype1 10 + note F#, 5 + notetype1 2 + note F#, 6 + notetype1 10 + notetype0 11 + note __, 1 + notetype0 1 + note F#, 5 + notetype1 3 + note F#, 6 + inc_octave + notetype1 10 + notetype0 11 + note C_, 1 + dec_octave + notetype0 1 + note B_, 5 + notetype1 2 + note B_, 6 + notetype0 11 + note __, 1 + notetype0 1 + notetype1 10 + note A_, 5 + notetype1 2 + note A_, 6 + notetype0 11 + note __, 1 + notetype0 1 + notetype1 10 + note B_, 5 + notetype1 2 + note B_, 6 + notetype1 10 + note A_, 4 + note B_, 4 + note A_, 3 + note F#, 5 + notetype1 2 + note F#, 6 + notetype0 11 + notetype1 9 + note E_, 1 + notetype1 10 + note F_, 1 + endchannel + +Branch_f680a: + octave 2 + notetype1 10 + notetype0 11 + note __, 1 + notetype0 1 + note G_, 5 + notetype1 2 + note G_, 6 + notetype1 10 + note B_, 5 + notetype1 2 + note B_, 6 + notetype1 10 + note G_, 5 + notetype1 2 + note G_, 6 + notetype0 11 + note __, 1 + notetype0 1 + notetype1 10 + note G_, 5 + notetype1 2 + note G_, 6 + inc_octave + notetype1 10 + notetype0 11 + note C#, 1 + notetype0 1 + note C_, 5 + notetype1 2 + note C_, 6 + notetype1 10 + notetype0 11 + note __, 1 + dec_octave + notetype0 1 + note B_, 5 + notetype1 2 + note B_, 6 + notetype0 11 + note __, 1 + inc_octave + notetype0 1 + notetype1 10 + note C#, 5 + notetype1 2 + note C#, 6 + dec_octave + notetype1 10 + note B_, 4 + inc_octave + note C#, 4 + dec_octave + note B_, 3 + note G_, 5 + notetype1 2 + note G_, 6 + notetype0 11 + notetype1 9 + note B_, 1 + notetype1 10 + note G_, 1 + endchannel + +Branch_f6866: + octave 2 +.Loop8 + notetype0 11 + note __, 1 + notetype0 1 + notetype1 10 + note C#, 5 + notetype1 2 + note C#, 6 + notetype1 10 + note A_, 5 + notetype1 2 + note A_, 6 + loopchannel 3, .Loop8 + dutycycle 2 + notetype1 7 + note B_, 5 + inc_octave + note D_, 6 + note G_, 5 + note B_, 6 + note D_, 5 + note G_, 6 + note B_, 5 + inc_octave + note D_, 6 + note C#, 5 + notetype1 2 + note C#, 6 + dec_octave + dec_octave + dutycycle 0 + notetype1 10 + note C#, 5 + notetype1 2 + note C#, 6 + notetype1 10 + note A_, 5 + notetype1 2 + note A_, 6 +.Loop9 + notetype0 11 + note __, 1 + notetype0 1 + notetype1 10 + note C#, 5 + notetype1 2 + note C#, 6 + notetype1 10 + note A_, 5 + notetype1 2 + note A_, 6 + loopchannel 3, .Loop9 + dutycycle 2 + notetype1 7 + note G_, 5 + note B_, 6 + inc_octave + note E_, 5 + note G_, 6 + dec_octave + note B_, 5 + inc_octave + note E_, 6 + note G_, 5 + note B_, 6 + inc_octave + endchannel + + +Music_TCGDuelTheme3_Ch3: + notetype0 11 + notetype1 1 + notetype2 11 + vibrato 0, $33 +.MainLoop + octave 2 +.Loop1 + rept 4 + note F#, 2 + note __, 1 + endr + note E_, 2 + note F_, 2 + loopchannel 4, .Loop1 +.Loop2 + callchannel Branch_f6973 + loopchannel 4, .Loop2 +.Loop3 + callchannel Branch_f6973 + callchannel Branch_f6992 + loopchannel 2, .Loop3 + octave 2 +.Loop4 + rept 4 + note F#, 1 + note __, 2 + endr + note G_, 2 + note G_, 2 + rept 4 + note F#, 1 + note __, 2 + endr + note E_, 2 + note F_, 2 + loopchannel 2, .Loop4 +.Loop5 + callchannel Branch_f6973 + callchannel Branch_f6992 + loopchannel 2, .Loop5 + vibrato 10, $33 + octave 2 +.Loop6 + callchannel Branch_f69f0 + notetype0 11 + octave 4 + note D_, 2 + note C#, 2 + dec_octave + dec_octave + loopchannel 3, .Loop6 + callchannel Branch_f69f0 + octave 2 + note F#, 2 + note E_, 2 + vibrato 0, $33 + note D_, 3 + notetype0 1 + note A#, 3 + note B_, 2 + inc_octave + note C_, 3 + note C#, 3 + notetype0 11 + note D_, 4 + dec_octave + note E_, 3 + inc_octave + notetype0 1 + note C_, 3 + note C#, 2 + note D_, 3 + note D#, 3 + notetype0 11 + note E_, 4 + dec_octave +.Loop7 + rept 4 + note F#, 1 + note __, 2 + endr + note F#, 2 + note F_, 2 + rept 4 + note E_, 1 + note __, 2 + endr + note E_, 2 + note F_, 2 + loopchannel 6, .Loop7 +.Loop8 + inc_octave + rept 4 + note F#, 1 + dec_octave + note F#, 1 + note F#, 1 + inc_octave + endr + note F#, 1 + dec_octave + note F#, 1 + inc_octave + note F#, 1 + dec_octave + note F#, 1 + inc_octave + rept 4 + note E_, 1 + dec_octave + note E_, 1 + note E_, 1 + inc_octave + endr + note E_, 1 + dec_octave + note E_, 1 + inc_octave + note E_, 1 + dec_octave + note E_, 1 + loopchannel 4, .Loop8 + loopchannel 0, .MainLoop + +Branch_f6973: + octave 2 + note F#, 1 + note __, 1 + inc_octave + inc_octave + note E_, 1 + dec_octave + dec_octave + note F#, 1 + note __, 2 + note F#, 1 + note __, 1 + note __, 1 + note F#, 1 + note __, 1 + inc_octave + inc_octave + note E_, 1 + dec_octave + dec_octave + note E_, 2 + note F_, 2 + endchannel + +Branch_f6992: + octave 2 + note F#, 1 + note __, 1 + inc_octave + inc_octave + note E_, 1 + dec_octave + dec_octave + note F#, 1 + note __, 2 + note F#, 1 + note __, 1 + note __, 1 + note F#, 1 + note __, 1 + inc_octave + inc_octave + note E_, 1 + dec_octave + dec_octave + note F#, 1 + note __, 1 + note F#, 2 + note G_, 1 + note __, 1 + inc_octave + inc_octave + note F#, 1 + dec_octave + dec_octave + note G_, 1 + note __, 2 + note G_, 1 + note __, 1 + note __, 1 + note G_, 1 + note __, 1 + inc_octave + inc_octave + note F#, 1 + dec_octave + dec_octave + note F_, 2 + note F#, 2 + note G_, 1 + note __, 1 + inc_octave + inc_octave + note F#, 1 + dec_octave + dec_octave + note G_, 1 + note __, 2 + note G_, 1 + note __, 1 + note __, 1 + note G_, 1 + note __, 1 + inc_octave + inc_octave + note F#, 1 + dec_octave + dec_octave + note G_, 1 + note __, 1 + note F_, 2 + endchannel + +Branch_f69f0: + octave 2 + note F#, 1 + inc_octave + note C#, 1 + inc_octave + note C#, 1 + dec_octave + dec_octave + note F#, 1 + inc_octave + inc_octave + note F#, 2 + dec_octave + dec_octave + note F#, 1 + inc_octave + note C#, 1 + inc_octave + note C#, 1 + dec_octave + dec_octave + note F#, 1 + inc_octave + inc_octave + note E_, 2 + dec_octave + dec_octave + note F#, 1 + inc_octave + note C#, 1 + inc_octave + note C#, 1 + dec_octave + dec_octave + note F#, 1 + inc_octave + inc_octave + note D#, 2 + dec_octave + dec_octave + note F#, 1 + inc_octave + note C#, 1 + inc_octave + note C#, 1 + dec_octave + dec_octave + note F#, 1 + endchannel + + +Music_TCGDuelTheme3_Ch4: + togglenoise $06 + notetype 11 +.MainLoop +.Loop1 + rept 4 + note E_, 1 + note D#, 1 + note D#, 1 + endr + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + loopchannel 2, .Loop1 +.Loop2 + note C#, 1 + note C_, 1 + note C_, 1 + loopchannel 4, .Loop2 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 +.Loop3 + note C#, 1 + note C_, 1 + note C_, 1 + loopchannel 4, .Loop3 + note C#, 1 + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 1 + note C#, 1 +.Loop4 + callchannel Branch_f6b40 + loopchannel 3, .Loop4 + note C_, 2 + note D#, 1 + note C_, 1 + note C#, 2 + note D#, 1 + note C_, 1 + note D#, 1 + note C_, 1 + note E_, 2 + note C#, 1 + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 1 + note C#, 1 +.Loop5 + callchannel Branch_f6b40 + loopchannel 7, .Loop5 + note C_, 2 + note D#, 1 + note C_, 1 + note C#, 2 + note D#, 1 + note C_, 1 + note D#, 1 + note C_, 1 + note E_, 2 + note C#, 1 + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 1 + note C#, 1 + callchannel Branch_f6b7e + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 1 + note C_, 1 + callchannel Branch_f6b7e + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 2 +.Loop6 + callchannel Branch_f6b40 + loopchannel 7, .Loop6 + note C_, 2 + note D#, 1 + note C_, 1 + note C#, 2 + note D#, 1 + note C_, 1 + note D#, 1 + note C_, 1 + note E_, 2 + note C#, 1 + notetype 1 + note D#, 5 + note D_, 6 + note C#, 5 + note C#, 6 + note C#, 5 + note C#, 6 + notetype 11 + callchannel Branch_f6b4d + note D#, 1 + note C#, 1 + note C_, 1 + callchannel Branch_f6b4d + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 1 + note C_, 1 + callchannel Branch_f6b4d + note D#, 1 + note C#, 1 + note C_, 1 + callchannel Branch_f6b4d + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 2 + note F_, 8 + note __, 4 + notetype 1 + note D_, 3 + note D_, 2 + note C#, 6 + note C#, 5 + note C#, 6 + note C#, 5 + note C#, 6 + notetype 11 + note C#, 1 +.Loop7 + callchannel Branch_f6b65 + notetype 1 + note C_, 6 + loopchannel 7, .Loop7 + callchannel Branch_f6b65 + notetype 1 + note C#, 6 +.Loop8 + callchannel Branch_f6b65 + notetype 1 + note C_, 6 + loopchannel 15, .Loop8 + notetype 11 + note C_, 1 + notetype 1 + note D#, 5 + note C_, 6 + notetype 11 + note C#, 1 + notetype 1 + note D#, 5 + note E_, 6 + note D#, 5 + note D_, 6 + note D#, 5 + note C_, 6 + note C#, 5 + note C#, 6 + note C#, 5 + note C#, 6 + callchannel Branch_f6b9a + note C_, 1 + notetype 1 + note D#, 5 + note D_, 6 + note C#, 5 + note C#, 6 + note C#, 5 + note C#, 6 + callchannel Branch_f6b9a + notetype 1 + note C_, 5 + note D_, 6 + note C#, 5 + note C#, 6 + note C#, 5 + note C#, 6 + note C#, 5 + note C#, 6 + notetype 11 + loopchannel 0, .MainLoop + +Branch_f6b40: + note C_, 2 + note D#, 1 + note C_, 1 + note C#, 2 + note D#, 1 + note C_, 1 + note D#, 1 + note C_, 1 + note E_, 2 + note C#, 2 + note D#, 1 + note C#, 1 + endchannel + +Branch_f6b4d: + note C_, 1 + note C#, 1 + note D#, 1 + note C_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note C#, 1 + note D#, 1 + note C_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note C#, 1 + note D#, 1 + note C_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note C#, 1 + note D#, 1 + note C_, 1 + note C#, 1 + endchannel + +Branch_f6b65: + notetype 11 + note C_, 1 + notetype 1 + note D#, 5 + note C_, 6 + notetype 11 + note C#, 1 + notetype 1 + note D#, 5 + note E_, 6 + note D#, 5 + note D_, 6 + note D#, 5 + note C_, 6 + notetype 11 + note C#, 1 + notetype 1 + note D#, 5 + endchannel + +Branch_f6b7e: + note C_, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note C#, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + note C_, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note E_, 1 + note C_, 1 + note C#, 1 + note C#, 1 + endchannel + +Branch_f6b9a: + notetype 11 +.Loop9 + rept 5 + note C_, 1 + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 1 + endr + note C_, 1 + loopchannel 3, .Loop9 +.Loop10 + note C_, 1 + notetype 1 + note D#, 5 + note D_, 6 + notetype 11 + note C#, 1 + loopchannel 4, .Loop10 + endchannel + diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm new file mode 100644 index 00000000..6e322929 --- /dev/null +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -0,0 +1,329 @@ +Music_TCGHallOfHonor: + db $80 + dw Music_TCGHallOfHonor_Ch1 + db $01 + dw Music_TCGHallOfHonor_Ch2 + db $02 + dw Music_TCGHallOfHonor_Ch3 + +Music_TCGHallOfHonor_Ch1: + notetype0 7 + notetype2 8 + dutycycle 2 +.Loop1 + callchannel Branch_fb016 + loopchannel 4, .Loop1 +.MainLoop +.Loop2 + callchannel Branch_fb016 + loopchannel 8, .Loop2 + octave 4 + notetype1 5 + note C_, 1 + notetype1 2 + note C_, 1 + callchannel Branch_fb044 +.Loop3 + notetype1 5 + note C_, 1 + notetype1 2 + note G_, 1 + callchannel Branch_fb044 + loopchannel 23, .Loop3 + loopchannel 0, .MainLoop + +Branch_fb016: + octave 4 + notetype1 6 + note C_, 1 + notetype1 2 + note C_, 1 + notetype1 6 + note F_, 1 + notetype1 2 + note F_, 1 + notetype1 6 + note G_, 1 + notetype1 2 + note G_, 1 + notetype1 6 + note F_, 1 + notetype1 2 + note F_, 1 + inc_octave + notetype1 6 + note C_, 1 + notetype1 2 + note C_, 1 + dec_octave + notetype1 6 + note F_, 1 + notetype1 2 + note F_, 1 + notetype1 6 + note G_, 1 + notetype1 2 + note G_, 1 + endchannel + +Branch_fb044: + octave 4 + notetype1 5 + note F_, 1 + notetype1 2 + note C_, 1 + notetype1 5 + note G_, 1 + notetype1 2 + note F_, 1 + notetype1 5 + note F_, 1 + notetype1 2 + note G_, 1 + inc_octave + notetype1 5 + note C_, 1 + dec_octave + notetype1 2 + note F_, 1 + notetype1 5 + note F_, 1 + inc_octave + notetype1 2 + note C_, 1 + dec_octave + notetype1 5 + note G_, 1 + notetype1 2 + note F_, 1 + endchannel + + +Music_TCGHallOfHonor_Ch2: + notetype0 7 + notetype2 8 + dutycycle 2 + note __, 2 + notetype0 1 + note __, 4 + notetype0 7 + notetype1 1 +.Loop1 + callchannel Branch_fb1ec + loopchannel 3, .Loop1 + octave 4 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + inc_octave + note C_, 1 + note __, 1 + dec_octave + note F_, 1 + notetype0 1 + note __, 3 + notetype0 7 +.MainLoop + octave 1 + dutycycle 1 +.Loop2 + callchannel Branch_fb0bb + octave 1 + notetype1 7 + note E_, 5 + notetype1 13 + note E_, 11 + note E_, 12 + loopchannel 3, .Loop2 + callchannel Branch_fb0bb + octave 1 + notetype1 7 + note G_, 5 + notetype1 13 + note G_, 11 + note G_, 12 + loopchannel 0, .MainLoop + +Branch_fb0bb: + octave 1 + notetype1 7 + note F_, 5 + notetype1 13 + note F_, 11 + note F_, 12 + notetype1 7 + note E_, 5 + notetype1 13 + note E_, 11 + note E_, 12 + notetype1 7 + note D_, 5 + notetype1 13 + note D_, 11 + note D_, 12 + endchannel + + +Music_TCGHallOfHonor_Ch3: + notetype0 7 + notetype1 2 + notetype2 12 + vibrato 35, $24 + note __, 3 + notetype1 3 +.Loop1 + note __, 14 + loopchannel 4, .Loop1 +.MainLoop + octave 6 +.Loop2 + callchannel Branch_fb1ec + loopchannel 7, .Loop2 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + inc_octave + note C_, 1 + note __, 1 + dec_octave + note F_, 1 + notetype1 1 + octave 5 + notetype0 1 + note B_, 3 + inc_octave + note C_, 4 + notetype0 7 + note C_, 15 + note C_, 8 + dec_octave + note B_, 2 + note A_, 2 + note G_, 6 + note C_, 10 + note C_, 12 + notetype0 1 + note B_, 3 + inc_octave + note C_, 4 + notetype0 7 + note C_, 15 + note C_, 6 + dec_octave + note B_, 2 + inc_octave + note C_, 2 + note D_, 2 + dec_octave + notetype0 1 + note F#, 3 + note G_, 4 + notetype0 7 + note G_, 15 + note G_, 6 + note G_, 2 + note A_, 2 + note B_, 2 + notetype0 1 + note B_, 3 + inc_octave + note C_, 4 + notetype0 7 + note C_, 15 + note C_, 8 + dec_octave + note B_, 2 + note A_, 2 + note G_, 6 + notetype0 1 + note B_, 3 + inc_octave + note C_, 4 + notetype0 7 + note C_, 9 + note C_, 6 + dec_octave + note G_, 2 + inc_octave + note C_, 2 + note E_, 2 + notetype0 1 + note E_, 3 + note F_, 4 + notetype0 7 + note F_, 1 + note E_, 2 + note C_, 2 + note C_, 10 + note C_, 10 + note E_, 2 + notetype0 1 + note E_, 3 + note F_, 4 + notetype0 7 + note F_, 1 + note E_, 2 + note C_, 2 + note C_, 10 + note C_, 12 + notetype0 1 + note F#, 3 + note G_, 4 + notetype0 7 + note G_, 15 + note G_, 8 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note C_, 2 + dec_octave + note G_, 10 + note G_, 10 + note E_, 2 + note F_, 2 + inc_octave + note C_, 2 + note C_, 12 + note C_, 10 + dec_octave + note E_, 2 + note F_, 2 + inc_octave + note C_, 2 + note C_, 12 + note C_, 12 + note __, 3 + notetype1 3 + loopchannel 0, .MainLoop + +Branch_fb1ec: + octave 5 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + inc_octave + note C_, 1 + note __, 1 + dec_octave + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + endchannel + diff --git a/crysaudio/music/TCG/imakuni.asm b/crysaudio/music/TCG/imakuni.asm new file mode 100644 index 00000000..a318bffb --- /dev/null +++ b/crysaudio/music/TCG/imakuni.asm @@ -0,0 +1,532 @@ +Music_TCGImakuni: + db $C0 + dw Music_TCGImakuni_Ch1 + db $01 + dw Music_TCGImakuni_Ch2 + db $02 + dw Music_TCGImakuni_Ch3 + db $03 + dw Music_TCGImakuni_Ch4 + +Music_TCGImakuni_Ch1: + notetype0 3 + vibrato 20, $33 + notetype2 8 + dutycycle 2 + notetype1 10 +.MainLoop +.Loop1 + note __, 10 + loopchannel 16, .Loop1 + callchannel Branch_fadf9 + octave 4 + note D_, 15 + dec_octave + note B_, 7 + note __, 8 + note G_, 7 + note __, 8 + notetype0 9 + note F_, 10 + notetype0 1 + note F_, 7 + note __, 8 + notetype0 9 + note __, 10 + callchannel Branch_fadf9 + callchannel Branch_fae1d + notetype0 1 + octave 4 + note E_, 7 + note __, 15 + note E_, 3 + note C_, 2 + note E_, 3 + note C_, 15 + dec_octave + note G#, 15 + note A_, 7 + note __, 8 + notetype0 3 + note __, 15 + notetype0 1 + note __, 15 + note __, 15 + inc_octave + note E_, 7 + note __, 8 + note F#, 7 + note __, 8 + note G_, 15 + note G_, 7 + note F#, 3 + note G_, 2 + note F#, 3 + note E_, 7 + note __, 8 + note D#, 7 + note __, 8 + note E_, 15 + note C_, 7 + note __, 8 + dec_octave + note G#, 7 + note __, 8 + notetype0 7 + note F#, 15 + notetype0 9 + note __, 10 + callchannel Branch_fadf9 + callchannel Branch_fae1d + dec_octave + notetype0 1 + note F_, 7 + note __, 8 + note B_, 7 + inc_octave + note C_, 8 + dec_octave + note G#, 7 + note A_, 8 + note F_, 7 + note __, 8 + note B_, 7 + inc_octave + note C_, 8 + dec_octave + note G#, 7 + note A_, 8 + notetype0 3 + note F_, 10 + notetype0 1 + note D#, 7 + note __, 8 + note A_, 7 + note A#, 8 + note F#, 7 + note G_, 8 + note D#, 7 + note __, 8 + note A_, 7 + note A#, 8 + note F#, 7 + note G_, 8 + notetype0 3 + note D#, 10 + notetype0 1 +.Loop2 + note D_, 7 + dec_octave + note A_, 8 + note D_, 7 + note A_, 8 + note D_, 7 + note A_, 8 + inc_octave + loopchannel 4, .Loop2 + note D_, 7 + dec_octave + note A_, 8 + note D_, 7 + note A_, 8 + vibrato 5, $33 + notetype0 3 + note D_, 10 + vibrato 20, $33 + loopchannel 0, .MainLoop + +Branch_fadf9: + notetype0 1 + octave 4 + note C#, 7 + note __, 15 + note C#, 3 + note D_, 2 + note C#, 3 + dec_octave + note A#, 15 + note B_, 15 + inc_octave + note D_, 7 + note __, 8 + notetype0 5 + note __, 9 + notetype0 1 + note __, 15 + note __, 15 + note D_, 7 + note __, 8 + note E_, 7 + note __, 8 + note F_, 15 + note F_, 7 + note E_, 3 + note F_, 2 + note E_, 3 + note D_, 7 + note __, 8 + note C#, 7 + note __, 8 + endchannel + +Branch_fae1d: + octave 4 + note D_, 7 + note __, 8 + dec_octave + note G_, 7 + note __, 8 + inc_octave + note G_, 7 + note __, 8 + notetype0 9 + note F_, 10 + notetype0 1 + note F_, 7 + note __, 8 + notetype0 9 + note __, 10 + endchannel + + +Music_TCGImakuni_Ch2: + vibrato 0, $33 + notetype2 8 + dutycycle 1 + notetype1 10 +.Loop1 + callchannel Branch_faea5 + loopchannel 6, .Loop1 +.Loop2 + rept 2 + notetype0 3 + note __, 10 + notetype0 1 + note C_, 7 + note __, 8 + endr + note __, 15 + note C_, 7 + note __, 8 + notetype0 3 + note __, 10 + notetype0 1 + note C_, 7 + note __, 8 + note __, 15 + notetype0 3 + note __, 10 + vibrato 8, $33 + note C_, 10 + vibrato 0, $33 + loopchannel 2, .Loop2 +.Loop3 + callchannel Branch_faea5 + loopchannel 2, .Loop3 + notetype0 1 + octave 2 + note F_, 15 + note F_, 7 + inc_octave + note F_, 8 + note D#, 7 + note __, 8 + note __, 15 + note G#, 7 + note A_, 8 + note F_, 7 + note D#, 8 + notetype0 3 + note __, 10 + notetype0 1 + dec_octave + note D#, 15 + note D#, 7 + inc_octave + note D#, 8 + note C#, 7 + note __, 8 + note __, 15 + note F#, 7 + note G_, 8 + note D#, 7 + note C#, 8 + notetype0 3 + note __, 10 + notetype0 1 +.Loop4 + note D_, 7 + note __, 8 + rept 2 + note __, 15 + endr + loopchannel 4, .Loop4 + note D_, 7 + note __, 8 + note __, 15 + vibrato 5, $33 + note D_, 15 + note D_, 7 + note __, 8 + vibrato 0, $33 + loopchannel 0, Music_TCGImakuni_Ch2 + +Branch_faea5: + octave 3 + notetype0 6 + note __, 10 + notetype0 1 + rept 2 + note __, 15 + note C#, 7 + note __, 8 + endr + vibrato 8, $33 + notetype0 9 + note __, 10 + notetype0 3 + note C#, 10 + vibrato 0, $33 + endchannel + + +Music_TCGImakuni_Ch3: + notetype1 1 + notetype2 11 + vibrato 0, $33 +.MainLoop + callchannel Branch_faf7d + vibrato 8, $33 + notetype0 1 + note D_, 15 + note D_, 7 + inc_octave + vibrato 0, $33 + note G_, 3 + dec_octave + note G_, 2 + dec_octave + note G_, 3 + callchannel Branch_faf7d + vibrato 8, $33 + note D_, 10 + vibrato 0, $33 +.Loop1 + callchannel Branch_faf7d + vibrato 8, $33 + note D_, 10 + vibrato 0, $33 + loopchannel 4, .Loop1 +.Loop2 + octave 3 + notetype0 3 + note C_, 5 + note __, 5 + inc_octave + notetype0 1 + note E_, 7 + note __, 8 + dec_octave + notetype0 3 + note G#, 5 + note A_, 5 + inc_octave + notetype0 1 + note D#, 7 + note __, 8 + note __, 15 + note D#, 7 + note __, 8 + notetype0 3 + note __, 5 + dec_octave + note C_, 5 + inc_octave + notetype0 1 + note E_, 7 + note __, 8 + dec_octave + notetype0 3 + note G#, 5 + note A_, 5 + note __, 5 + inc_octave + vibrato 8, $33 + note D#, 10 + vibrato 0, $33 + loopchannel 2, .Loop2 +.Loop3 + callchannel Branch_faf7d + vibrato 8, $33 + note D_, 10 + vibrato 0, $33 + loopchannel 2, .Loop3 + notetype0 1 + octave 2 + note F_, 15 + note F_, 7 + inc_octave + note F_, 8 + note D#, 7 + note __, 8 + note F_, 7 + note __, 8 + note G#, 7 + note A_, 8 + note F_, 7 + note D#, 8 + vibrato 5, $33 + notetype0 3 + note F_, 10 + vibrato 0, $33 + notetype0 1 + dec_octave + note D#, 15 + note D#, 7 + inc_octave + note D#, 8 + note C#, 7 + note __, 8 + note D#, 7 + note __, 8 + note F#, 7 + note G_, 8 + note D#, 7 + note C#, 8 + vibrato 5, $33 + notetype0 3 + note D#, 10 + vibrato 0, $33 + notetype0 1 +.Loop4 + octave 4 + note C_, 7 + note __, 8 + octave 2 + note D_, 7 + note __, 8 + note D_, 7 + note __, 8 + loopchannel 4, .Loop4 + octave 4 + note C_, 7 + note __, 8 + octave 2 + note D_, 7 + note __, 8 + octave 4 + vibrato 5, $33 + note C_, 15 + note C_, 7 + inc_octave + vibrato 0, $33 + note G_, 3 + dec_octave + note G_, 2 + dec_octave + note G_, 3 + notetype0 8 + loopchannel 0, .MainLoop + +Branch_faf7d: + notetype0 3 + octave 2 + note G_, 5 + note __, 5 + inc_octave + notetype0 1 + note G_, 7 + note __, 8 + notetype0 3 + note C#, 5 + note D_, 5 + inc_octave + notetype0 1 + note D_, 7 + note __, 8 + note __, 15 + note D_, 7 + note __, 8 + notetype0 3 + note __, 5 + octave 2 + note G_, 5 + inc_octave + notetype0 1 + note G_, 7 + note __, 8 + notetype0 3 + note C#, 5 + note D_, 5 + note __, 5 + inc_octave + endchannel + + +Music_TCGImakuni_Ch4: + togglenoise $06 +.MainLoop + notetype 1 + octave 1 +.Loop1 + note C_, 15 + note D#, 7 + note C_, 8 + note C#, 15 + note C_, 15 + note D#, 7 + note D#, 8 + note E_, 15 + note D#, 7 + note D#, 8 + note E_, 15 + note D#, 15 + note C_, 15 + note C#, 15 + note E_, 15 + note C_, 7 + note D#, 8 + note C#, 15 + note C#, 15 + note D#, 7 + note C#, 8 + loopchannel 10, .Loop1 +.Loop2 + notetype 11 + note F_, 2 + notetype 1 + note C#, 8 + note C#, 15 + note C#, 15 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + notetype 3 + note F_, 10 + loopchannel 2, .Loop2 + notetype 1 + note C#, 15 + note D#, 7 + note C#, 8 + note E_, 15 + note C#, 15 + note D#, 7 + note C#, 8 + note E_, 15 + note C#, 15 + note D#, 7 + note C#, 8 + note E_, 15 + note C#, 15 + note D#, 7 + note C#, 8 + note E_, 15 + note C#, 15 + note D#, 4 + note D#, 4 + note C#, 7 + note C#, 15 + note C#, 15 + loopchannel 0, .MainLoop + diff --git a/crysaudio/music/TCG/matchloss.asm b/crysaudio/music/TCG/matchloss.asm new file mode 100644 index 00000000..c7f569da --- /dev/null +++ b/crysaudio/music/TCG/matchloss.asm @@ -0,0 +1,119 @@ +Music_TCGMatchLoss: + db $80 + dw Music_TCGMatchLoss_Ch1 + db $01 + dw Music_TCGMatchLoss_Ch2 + db $02 + dw Music_TCGMatchLoss_Ch3 + +Music_TCGMatchLoss_Ch1: + vibrato 20, $33 + notetype2 8 + octave 4 + dutycycle 2 + notetype1 11 + notetype0 1 + note E_, 3 + note F_, 2 + notetype0 5 + note F_, 3 + note C_, 1 + notetype1 3 + note C_, 3 + dec_octave + notetype1 10 + note A#, 1 + notetype1 3 + note A#, 3 + inc_octave + notetype0 1 + notetype1 10 + note D_, 3 + note D#, 2 + note D#, 16 + dec_octave + note A#, 6 + notetype1 3 + note A#, 16 + notetype1 10 + note G#, 6 + notetype1 3 + note G#, 16 + inc_octave + notetype1 10 + note C_, 3 + note C#, 8 + note C#, 12 + dec_octave + notetype0 6 + note G#, 1 + notetype1 3 + note G#, 3 + notetype1 10 + note F#, 1 + notetype0 7 + notetype1 3 + note F#, 3 + notetype0 1 + notetype1 10 + note B_, 5 + inc_octave + note C_, 4 + notetype0 9 + note C_, 11 + notetype1 3 + note C_, 2 + endchannel + + +Music_TCGMatchLoss_Ch2: + vibrato 20, $33 + notetype2 8 + octave 3 + dutycycle 2 + notetype1 9 + notetype0 9 + note __, 9 + notetype0 11 + note __, 5 + notetype0 1 + note __, 8 + notetype0 9 + note __, 6 + note G_, 6 + note G_, 6 + notetype1 3 + note G_, 2 + endchannel + + +Music_TCGMatchLoss_Ch3: + notetype2 11 + notetype1 1 + octave 2 + notetype0 5 + note A#, 4 + inc_octave + note F_, 4 + note A#, 4 + dec_octave + notetype0 7 + note G#, 3 + inc_octave + notetype0 2 + note D#, 11 + note G#, 11 + dec_octave + notetype0 1 + note F#, 11 + note F#, 12 + inc_octave + notetype0 12 + note C#, 2 + notetype0 2 + note F#, 13 + dec_octave + notetype0 9 + note F_, 12 + endchannel + diff --git a/crysaudio/music/TCG/matchstart1.asm b/crysaudio/music/TCG/matchstart1.asm new file mode 100644 index 00000000..ee2fcd4c --- /dev/null +++ b/crysaudio/music/TCG/matchstart1.asm @@ -0,0 +1,57 @@ +Music_TCGMatchStart1: + db $00 + dw Music_TCGMatchStart1_Ch1 + +Music_TCGMatchStart1_Ch1: + notetype0 1 + notetype2 8 +.Loop1 + dutycycle 2 + notetype1 15 + octave 3 + note C_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + inc_octave + note G_, 1 + octave 3 + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + inc_octave + note A_, 1 + octave 4 + dutycycle 1 + note C_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + inc_octave + note G_, 1 + octave 4 + note D_, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + inc_octave + note A_, 1 + loopchannel 3, .Loop1 + octave 4 + notetype1 6 + note E_, 1 + inc_octave + note E_, 1 + octave 4 + notetype1 2 + dec_octave + note B_, 1 + inc_octave + note B_, 1 + endchannel + diff --git a/crysaudio/music/TCG/matchstart2.asm b/crysaudio/music/TCG/matchstart2.asm new file mode 100644 index 00000000..79daf477 --- /dev/null +++ b/crysaudio/music/TCG/matchstart2.asm @@ -0,0 +1,179 @@ +Music_TCGMatchStart2: + db $40 + dw Music_TCGMatchStart2_Ch1 + db $01 + dw Music_TCGMatchStart2_Ch2 + +Music_TCGMatchStart2_Ch1: + notetype0 1 + notetype2 8 + octave 2 + notetype1 15 + dutycycle 0 + note C_, 1 + note E_, 1 + note A_, 1 + inc_octave + note C_, 1 + note E_, 1 + note A_, 1 + dec_octave + note D_, 1 + note F_, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note B_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note C_, 1 + note E_, 1 + note B_, 1 + inc_octave + note C_, 1 + octave 3 + note C_, 1 + note E_, 1 + note A_, 1 + inc_octave + note C_, 1 + note E_, 1 + note A_, 1 + dec_octave + note D_, 1 + note F_, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note B_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note C_, 1 + note E_, 1 + note B_, 1 + inc_octave + note C_, 1 + octave 4 + note C_, 1 + note E_, 1 + note A_, 1 + inc_octave + note C_, 1 + note E_, 1 + note A_, 1 + dec_octave + note D_, 1 + note F_, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note B_, 1 + dec_octave + notetype1 6 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note C_, 1 + note E_, 1 + notetype1 2 + note G_, 1 + note B_, 1 + inc_octave + note C_, 1 + endchannel + + +Music_TCGMatchStart2_Ch2: + notetype0 1 + notetype2 8 + note __, 4 + octave 2 + notetype1 6 + dutycycle 0 + note C_, 1 + note E_, 1 + note A_, 1 + inc_octave + note C_, 1 + note E_, 1 + note A_, 1 + dec_octave + note D_, 1 + note F_, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note B_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note C_, 1 + note E_, 1 + note B_, 1 + inc_octave + note C_, 1 + octave 3 + note C_, 1 + note E_, 1 + note A_, 1 + inc_octave + note C_, 1 + note E_, 1 + note A_, 1 + dec_octave + note D_, 1 + note F_, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note B_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note C_, 1 + note E_, 1 + note B_, 1 + inc_octave + note C_, 1 + octave 4 + note C_, 1 + note E_, 1 + note A_, 1 + inc_octave + note C_, 1 + note E_, 1 + note A_, 1 + dec_octave + note D_, 1 + note F_, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note B_, 1 + dec_octave + notetype1 2 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note C_, 1 + note E_, 1 + endchannel + diff --git a/crysaudio/music/TCG/matchstart3.asm b/crysaudio/music/TCG/matchstart3.asm new file mode 100644 index 00000000..1a4c9e34 --- /dev/null +++ b/crysaudio/music/TCG/matchstart3.asm @@ -0,0 +1,328 @@ +Music_TCGMatchStart3: + db $40 + dw Music_TCGMatchStart3_Ch1 + db $01 + dw Music_TCGMatchStart3_Ch2 + +Music_TCGMatchStart3_Ch1: + notetype0 1 + notetype2 8 + octave 2 + notetype1 15 + dutycycle 1 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 3 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 5 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 2 + dutycycle 3 + note D_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + octave 3 + note D_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + octave 4 + note D_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + octave 5 + note D_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + octave 2 + dutycycle 1 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + octave 3 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + octave 4 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + octave 5 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + dec_octave + octave 4 + notetype1 6 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + octave 5 + notetype1 2 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + endchannel + + +Music_TCGMatchStart3_Ch2: + notetype0 1 + notetype2 8 + note __, 4 + octave 2 + notetype1 6 + dutycycle 1 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 3 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 5 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 2 + dutycycle 3 + note D_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + octave 3 + note D_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + octave 4 + note D_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note E_, 1 + note G_, 1 + note B_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + octave 5 + note D_, 1 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + octave 2 + dutycycle 1 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + octave 3 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + octave 4 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + dec_octave + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + octave 5 + note E_, 1 + note G_, 1 + note B_, 1 + inc_octave + note D_, 1 + dec_octave + octave 4 + notetype1 2 + note F_, 1 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + endchannel + diff --git a/crysaudio/music/TCG/matchvictory.asm b/crysaudio/music/TCG/matchvictory.asm new file mode 100644 index 00000000..0dec839d --- /dev/null +++ b/crysaudio/music/TCG/matchvictory.asm @@ -0,0 +1,149 @@ +Music_TCGMatchVictory: + db $80 + dw Music_TCGMatchVictory_Ch1 + db $01 + dw Music_TCGMatchVictory_Ch2 + db $02 + dw Music_TCGMatchVictory_Ch3 + +Music_TCGMatchVictory_Ch1: + vibrato 20, $33 + notetype2 8 + octave 3 + dutycycle 0 + notetype1 11 + notetype0 1 + note A_, 15 + note A_, 9 + notetype1 2 + note A_, 5 + notetype1 11 + note A_, 7 + notetype1 2 + note A_, 3 + notetype1 11 + note F_, 7 + notetype1 2 + note F_, 3 + notetype1 11 + note A_, 7 + notetype1 2 + note A_, 2 + notetype1 11 + note B_, 11 + notetype1 2 + note B_, 10 + inc_octave + notetype1 11 + note C_, 10 + notetype1 2 + note C_, 11 + notetype1 11 + note D_, 10 + notetype1 2 + note D_, 10 + notetype1 11 + note C#, 8 + notetype1 2 + note C#, 13 + notetype1 11 + note D_, 5 + notetype1 2 + note D_, 6 + notetype1 11 + notetype0 8 + note E_, 12 + notetype1 2 + note E_, 4 + endchannel + + +Music_TCGMatchVictory_Ch2: + vibrato 20, $33 + notetype2 8 + octave 3 + dutycycle 0 + notetype1 11 + notetype0 1 + note F_, 5 + notetype1 2 + note F_, 5 + dec_octave + notetype1 11 + note A_, 5 + inc_octave + note C_, 5 + note F_, 5 + notetype1 2 + note F_, 4 + notetype1 11 + note C_, 7 + notetype1 2 + note C_, 3 + dec_octave + notetype1 11 + note A_, 7 + notetype1 2 + note A_, 3 + inc_octave + notetype1 11 + note C_, 7 + notetype1 2 + note C_, 2 + notetype1 11 + note G_, 11 + notetype1 2 + note G_, 10 + notetype1 11 + note A_, 10 + notetype1 2 + note A_, 11 + notetype1 11 + note B_, 10 + notetype1 2 + note B_, 10 + notetype1 11 + note A_, 8 + notetype1 2 + note A_, 13 + notetype1 11 + note B_, 5 + notetype1 2 + note B_, 6 + inc_octave + notetype1 11 + notetype0 8 + note C#, 12 + notetype1 2 + note C#, 4 + endchannel + + +Music_TCGMatchVictory_Ch3: + notetype2 11 + notetype1 1 + octave 2 + notetype0 1 + note F_, 15 + note F_, 9 + note __, 5 + note F_, 7 + note __, 3 + note F_, 7 + note __, 3 + note F_, 7 + note __, 2 + note G_, 11 + note __, 10 + note G_, 11 + note __, 10 + note G_, 10 + note __, 10 + note A_, 8 + note __, 13 + note E_, 5 + note __, 6 + notetype0 8 + note A_, 12 + endchannel + diff --git a/crysaudio/music/TCG/medal.asm b/crysaudio/music/TCG/medal.asm new file mode 100644 index 00000000..83153db6 --- /dev/null +++ b/crysaudio/music/TCG/medal.asm @@ -0,0 +1,151 @@ +Music_TCGMedal: + db $80 + dw Music_TCGMedal_Ch1 + db $01 + dw Music_TCGMedal_Ch2 + db $02 + dw Music_TCGMedal_Ch3 + +Music_TCGMedal_Ch1: + vibrato 20, $33 + notetype2 8 + octave 2 + dutycycle 1 + notetype1 10 + notetype0 1 + note E_, 5 + note A_, 5 + inc_octave + note C#, 5 + note E_, 5 + note A_, 5 + inc_octave + note C#, 5 + dec_octave + dec_octave + note A_, 5 + inc_octave + note C#, 5 + note E_, 5 + note A_, 5 + inc_octave + note C#, 5 + note E_, 5 + notetype0 15 + note A_, 2 + notetype0 1 + note A_, 10 + notetype1 3 + note A_, 5 + notetype1 10 + notetype2 7 + note A_, 5 + note A_, 5 + note A_, 5 + notetype2 8 + note A_, 15 + notetype1 3 + note A_, 5 + notetype1 10 + note A_, 16 + notetype1 3 + note A_, 5 + notetype1 10 + note A_, 16 + notetype1 3 + note A_, 6 + notetype1 10 + notetype0 9 + note A_, 5 + note A_, 8 + notetype0 1 + note A_, 2 + notetype1 3 + note A_, 16 + endchannel + + +Music_TCGMedal_Ch2: + vibrato 20, $33 + notetype2 8 + octave 1 + dutycycle 0 + notetype1 9 + notetype0 1 + note A_, 5 + inc_octave + note C#, 5 + note E_, 5 + note A_, 5 + inc_octave + note C#, 5 + note E_, 5 + dec_octave + note C#, 5 + note E_, 5 + note A_, 5 + inc_octave + note C#, 5 + note E_, 5 + note A_, 5 + inc_octave + notetype0 15 + note C_, 2 + notetype0 1 + note C_, 10 + notetype1 2 + note C_, 5 + notetype1 10 + notetype2 7 + note C_, 5 + note C_, 5 + note C_, 5 + notetype2 8 + note D_, 15 + notetype1 3 + note D_, 5 + notetype1 9 + note D_, 16 + notetype1 2 + note D_, 5 + notetype1 9 + note D_, 16 + notetype1 3 + note D_, 6 + notetype1 9 + notetype0 9 + note C#, 5 + note C#, 8 + notetype0 1 + note C#, 2 + notetype1 2 + note C#, 16 + endchannel + + +Music_TCGMedal_Ch3: + notetype2 11 + notetype1 1 + octave 2 + notetype0 1 + notetype0 15 + note __, 4 + note F_, 2 + notetype0 1 + note F_, 10 + note __, 5 + note F_, 5 + note F_, 5 + note F_, 5 + note A#, 15 + note __, 5 + note A#, 16 + note __, 5 + note A#, 16 + note __, 6 + notetype0 9 + note A_, 13 + notetype0 1 + note A_, 2 + endchannel + diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm new file mode 100644 index 00000000..dadd5187 --- /dev/null +++ b/crysaudio/music/TCG/overworld.asm @@ -0,0 +1,1324 @@ +Music_TCGOverworld: + db $C0 + dw Music_TCGOverworld_Ch1 + db $01 + dw Music_TCGOverworld_Ch2 + db $02 + dw Music_TCGOverworld_Ch3 + db $03 + dw Music_TCGOverworld_Ch4 + +Music_TCGOverworld_Ch1: + notetype0 7 + dutycycle 0 + vibrato 25, $33 + notetype1 10 + notetype2 7 + octave 3 + note __, 3 + callchannel Branch_f72ba + note __, 3 +.MainLoop + callchannel Branch_f72ba + dutycycle 1 + notetype2 8 + octave 3 + notetype1 10 + note A_, 5 + notetype1 3 + note A_, 1 + inc_octave + notetype1 10 + note C_, 5 + notetype1 3 + note C_, 1 + notetype1 10 + note F_, 3 + notetype0 1 + note E_, 11 + notetype1 3 + note E_, 10 + notetype1 10 + notetype0 7 + note G_, 3 + notetype0 1 + note F_, 11 + notetype1 3 + note F_, 10 + notetype0 7 + notetype1 10 + note C_, 12 + notetype1 3 + note C_, 2 + dutycycle 0 + notetype1 9 + notetype2 7 + octave 3 + note E_, 4 + note E_, 3 + note E_, 3 + dutycycle 1 + notetype1 10 + notetype2 8 + callchannel Branch_f72fb + note C_, 6 + notetype1 3 + note C_, 6 + notetype1 10 + note C_, 3 + note D_, 3 + note E_, 3 + note G_, 6 + notetype1 3 + note G_, 3 + notetype1 10 + note F_, 4 + notetype1 3 + note F_, 2 + notetype1 10 + note C_, 3 + dec_octave + note A_, 6 + note A#, 9 + notetype1 3 + note A#, 6 + notetype1 10 + note A#, 3 + inc_octave + note D_, 3 + note F_, 3 + note A_, 3 + notetype1 3 + note A_, 6 + notetype1 10 + note G_, 3 + notetype1 3 + note G_, 3 + notetype1 10 + note E_, 3 + note D_, 3 + notetype1 3 + note D_, 3 + notetype1 10 + note E_, 2 + notetype1 3 + note E_, 1 + notetype1 10 + notetype2 8 + note C_, 9 + notetype1 3 + note C_, 3 + notetype1 10 + dec_octave + note A_, 3 + inc_octave + notetype0 1 + note C_, 11 + notetype1 4 + note C_, 10 + notetype0 7 + notetype1 10 + note G_, 3 + notetype0 1 + note F_, 11 + notetype1 4 + note F_, 10 + notetype0 7 + notetype1 10 + note C_, 12 + notetype1 3 + note C_, 6 + dutycycle 2 + notetype2 8 + notetype1 6 + octave 4 + note G_, 1 + note E_, 1 + note C_, 1 + dec_octave + note G_, 1 + note E_, 1 + note C_, 1 + dutycycle 1 + notetype1 10 + notetype2 8 + callchannel Branch_f72fb + note C_, 6 + notetype1 3 + note C_, 6 + notetype1 10 + note C_, 3 + note D_, 3 + note E_, 3 + note F_, 9 + notetype1 3 + note F_, 12 + notetype1 10 + note F_, 2 + note G_, 1 + note A_, 1 + notetype1 3 + note A_, 2 + notetype1 10 + note A_, 12 + notetype1 3 + note A_, 3 + notetype1 10 + note D_, 3 + note A_, 3 + note A#, 9 + notetype1 3 + note A#, 6 + notetype1 10 + note A_, 5 + notetype1 3 + note A_, 1 + notetype1 10 + note G_, 5 + notetype1 3 + note G_, 1 + notetype1 9 + note F_, 8 + note F_, 8 + note F_, 8 + note F_, 8 + note F_, 8 + note F_, 8 + notetype1 3 + note F_, 3 + dutycycle 0 + notetype1 10 + notetype2 7 + loopchannel 0, .MainLoop + +Branch_f72ba: + octave 3 + note F_, 3 + note F_, 2 + note A_, 1 + inc_octave + notetype1 10 + notetype2 4 + note C_, 1 + note __, 1 + dec_octave + notetype1 9 + notetype2 7 + note A#, 3 + note A#, 1 + inc_octave + notetype1 10 + notetype2 4 + note D_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note G_, 3 + note A#, 3 + note __, 3 + note A_, 3 + note A_, 2 + inc_octave + note C_, 1 + notetype1 10 + notetype2 4 + note C_, 1 + note __, 1 + dec_octave + notetype1 9 + notetype2 7 + note A#, 3 + note A#, 1 + inc_octave + notetype1 10 + notetype2 4 + note D_, 1 + note __, 2 + notetype1 9 + notetype2 7 + note C_, 3 + dec_octave + note A#, 3 + endchannel + +Branch_f72fb: + octave 4 + notetype1 10 + note D_, 5 + notetype1 3 + note D_, 1 + notetype1 10 + note F_, 5 + notetype1 3 + note F_, 1 + notetype1 10 + note A_, 3 + notetype0 1 + note G_, 11 + notetype1 3 + note G_, 10 + notetype0 7 + inc_octave + notetype1 10 + note C_, 3 + dec_octave + notetype0 1 + note A#, 11 + notetype1 3 + note A#, 10 + notetype0 7 + notetype1 10 + note C#, 12 + notetype1 3 + note C#, 6 + notetype1 10 + note D#, 3 + notetype0 1 + note C#, 11 + notetype1 3 + note C#, 10 + notetype1 10 + notetype0 7 + endchannel + + +Music_TCGOverworld_Ch2: + notetype0 7 + dutycycle 0 + vibrato 30, $33 + notetype2 7 + octave 3 + callchannel Branch_f7535 +.MainLoop + callchannel Branch_f7535 + notetype1 9 + notetype2 7 + note __, 3 + note C_, 5 + note C_, 3 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note C_, 4 + note C_, 3 + note C_, 3 + note __, 3 + note C_, 5 + note C_, 3 + notetype1 9 + notetype2 4 + inc_octave + note G_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note D_, 4 + note D_, 3 + note C_, 3 + note __, 3 + dec_octave + note A#, 5 + inc_octave + note D_, 3 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note C_, 4 + note C_, 3 + dec_octave + note A#, 3 + note __, 3 + note A#, 5 + inc_octave + note C#, 3 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note C#, 4 + dec_octave + note F_, 3 + note A#, 3 + note __, 3 + inc_octave + note C_, 3 + note E_, 2 + note C_, 3 + notetype1 9 + notetype2 4 + inc_octave + note G_, 1 + notetype2 7 + notetype1 6 + notetype2 8 + octave 3 + note E_, 3 + note F_, 3 + note G_, 3 + notetype2 7 + note A#, 6 + notetype1 9 + notetype2 7 + octave 3 + note D_, 3 + notetype1 6 + notetype2 8 + octave 3 + note A_, 3 + notetype1 9 + notetype2 7 + octave 2 + note A_, 2 + inc_octave + inc_octave + notetype1 9 + notetype2 4 + note F_, 1 + dec_octave + note __, 2 + notetype1 9 + notetype2 7 + note D_, 4 + note D_, 3 + dec_octave + note A_, 3 + note __, 3 + note A#, 3 + inc_octave + note D_, 2 + dec_octave + note A#, 3 + notetype1 9 + notetype2 4 + inc_octave + inc_octave + note F_, 1 + note __, 2 + dec_octave + dec_octave + notetype1 9 + notetype2 7 + note A#, 4 + note A#, 3 + note A#, 3 + note __, 3 + note A#, 3 + inc_octave + note D_, 2 + dec_octave + note A#, 3 + notetype1 9 + notetype2 4 + inc_octave + note A_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note A#, 6 + inc_octave + note D_, 1 + dec_octave + note A#, 3 + note __, 3 + inc_octave + note C_, 5 + note C_, 3 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 2 + notetype1 9 + notetype2 7 + dec_octave + note C_, 4 + note C_, 3 + note C_, 3 + note __, 3 + note C_, 5 + note C_, 3 + notetype1 9 + notetype2 4 + inc_octave + note G_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note D_, 4 + dutycycle 2 + notetype1 6 + notetype2 8 + octave 4 + note C_, 1 + dec_octave + note G_, 1 + note E_, 1 + note C_, 1 + dec_octave + note G_, 1 + note E_, 1 + dutycycle 0 + notetype1 9 + notetype2 7 + octave 2 + note __, 3 + note A#, 5 + inc_octave + note D_, 3 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note C_, 4 + note C_, 3 + dec_octave + note A#, 3 + note __, 3 + note A#, 5 + inc_octave + note C#, 3 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note C#, 4 + note C#, 3 + note C#, 3 + note __, 3 + note C_, 3 + dec_octave + note A_, 2 + inc_octave + note C_, 3 + notetype1 9 + notetype2 4 + inc_octave + note G_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note C_, 4 + note E_, 3 + note C_, 3 + note __, 3 + note D_, 6 + dec_octave + note B_, 2 + inc_octave + inc_octave + notetype1 9 + notetype2 4 + note F_, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 7 + note D_, 4 + notetype1 6 + notetype2 8 + octave 4 + note D_, 2 + note E_, 1 + note F_, 1 + notetype1 2 + note F_, 2 + notetype1 6 + note F_, 11 + notetype1 9 + notetype2 7 + octave 4 + notetype1 9 + notetype2 4 + note F_, 1 + note __, 2 + dec_octave + dec_octave + notetype1 9 + notetype2 7 + note A#, 1 + notetype1 6 + notetype2 8 + octave 3 + note A#, 3 + inc_octave + note F_, 3 + note G_, 9 + notetype1 9 + notetype2 7 + octave 3 + note D_, 2 + dec_octave + note A#, 3 + inc_octave + inc_octave + notetype1 9 + notetype2 4 + note F_, 1 + notetype2 8 + notetype1 6 + octave 4 + note C_, 5 + notetype1 2 + note C_, 1 + dec_octave + notetype1 9 + note A#, 5 + notetype1 2 + note A#, 1 + notetype1 9 + notetype2 7 + octave 3 + note __, 3 + note F_, 3 + note C_, 2 + note F_, 1 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 1 + dec_octave + notetype1 9 + notetype2 7 + note G_, 3 + note G_, 3 + notetype0 1 + notetype1 9 + notetype2 8 + inc_octave + note F_, 4 + note C_, 3 + notetype0 7 + dec_octave + notetype1 9 + notetype2 7 + note E_, 3 + note G_, 2 + inc_octave + notetype1 9 + notetype2 4 + note F_, 1 + notetype1 9 + notetype2 7 + dec_octave + note __, 3 + note A_, 3 + note F_, 2 + note A_, 1 + inc_octave + notetype1 9 + notetype2 4 + note F_, 1 + note __, 1 + dec_octave + notetype1 9 + notetype2 7 + note G_, 3 + note G_, 3 + notetype0 1 + notetype1 9 + notetype2 8 + inc_octave + note F_, 4 + note C_, 3 + dec_octave + notetype0 7 + notetype1 9 + notetype2 7 + note A_, 3 + note G_, 2 + inc_octave + notetype1 9 + notetype2 4 + note F_, 1 + loopchannel 0, .MainLoop + +Branch_f7535: + octave 3 + notetype1 9 + notetype2 7 + note __, 3 + note C_, 3 + note C_, 2 + note F_, 1 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 1 + dec_octave + notetype1 9 + notetype2 7 + note G_, 3 + note G_, 1 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 1 + dec_octave + notetype2 8 + notetype0 1 + inc_octave + note F_, 4 + note C_, 3 + notetype0 7 + notetype1 9 + notetype2 7 + dec_octave + note E_, 3 + note G_, 2 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + dec_octave + note __, 3 + notetype1 9 + notetype2 8 + note F_, 3 + note F_, 2 + note A_, 1 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 1 + dec_octave + notetype1 9 + notetype2 7 + note G_, 3 + note G_, 1 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + note __, 1 + dec_octave + notetype2 8 + notetype0 1 + inc_octave + note F_, 4 + note C_, 3 + notetype0 7 + notetype1 9 + notetype2 7 + dec_octave + note A_, 3 + note G_, 2 + notetype1 9 + notetype2 4 + inc_octave + note F_, 1 + dec_octave + endchannel + + +Music_TCGOverworld_Ch3: + notetype0 7 + notetype1 1 + notetype2 11 + octave 2 + callchannel Branch_f77f8 + note F_, 2 + inc_octave + note C_, 1 +.MainLoop + callchannel Branch_f77f8 + note F_, 3 + callchannel Branch_f7826 + octave 2 + note F_, 1 + note A#, 2 + note __, 1 + octave 4 + note C#, 2 + dec_octave + note F_, 1 + note A#, 1 + note __, 1 + inc_octave + note F_, 2 + note __, 1 + inc_octave + note C#, 1 + octave 2 + note A#, 1 + note __, 1 + octave 4 + note G_, 1 + octave 2 + note A#, 1 + note __, 1 + note F_, 1 + inc_octave + note A#, 2 + dec_octave + note A#, 1 + octave 4 + note C#, 2 + octave 2 + note F_, 1 + note A_, 2 + note __, 1 + octave 4 + note E_, 2 + octave 2 + note A_, 1 + octave 4 + note G_, 2 + note E_, 1 + dec_octave + note E_, 1 + note __, 1 + inc_octave + inc_octave + note E_, 1 + octave 2 + note A_, 1 + note __, 1 + inc_octave + note A_, 1 + note __, 2 + dec_octave + note A_, 1 + inc_octave + note A_, 1 + note E_, 1 + note C_, 1 + dec_octave + note A_, 1 + note __, 1 + inc_octave + note A_, 1 + dec_octave + note D_, 2 + note __, 1 + octave 4 + note F_, 2 + octave 2 + note A_, 1 + inc_octave + note D_, 2 + dec_octave + note A_, 1 + octave 4 + note D_, 2 + inc_octave + note C_, 1 + octave 2 + note D_, 2 + octave 4 + note F_, 2 + note __, 1 + octave 2 + note A_, 1 + octave 4 + note F_, 2 + octave 2 + note D_, 1 + octave 4 + note D_, 2 + octave 2 + note A_, 1 + note G_, 2 + note __, 1 + octave 4 + note D_, 2 + octave 2 + note G_, 1 + octave 4 + note F_, 2 + note D_, 1 + dec_octave + note D_, 1 + note __, 1 + inc_octave + note A#, 1 + octave 2 + note G_, 1 + note __, 1 + octave 4 + note D_, 2 + note __, 1 + dec_octave + note D_, 1 + inc_octave + note F_, 2 + octave 2 + note G_, 1 + octave 4 + note D_, 2 + dec_octave + note D_, 1 + note C_, 2 + note __, 1 + inc_octave + note D_, 2 + octave 2 + note G_, 1 + octave 4 + note F_, 2 + note D_, 1 + octave 2 + note C_, 1 + note __, 1 + octave 4 + note F_, 1 + dec_octave + note C_, 1 + note __, 1 + inc_octave + note D_, 2 + note __, 1 + octave 2 + note E_, 1 + inc_octave + note C_, 1 + note __, 1 + inc_octave + note F_, 1 + note E_, 2 + octave 2 + note E_, 1 + callchannel Branch_f7826 + octave 3 + note C_, 1 + note C#, 2 + note __, 1 + inc_octave + note C#, 2 + octave 2 + note G#, 1 + inc_octave + note C#, 1 + note __, 1 + inc_octave + note F_, 2 + note __, 1 + inc_octave + note C#, 1 + octave 3 + note C#, 1 + note __, 1 + inc_octave + note G_, 1 + dec_octave + note C#, 1 + note __, 1 + dec_octave + note G#, 1 + octave 4 + note G_, 2 + dec_octave + note C#, 1 + inc_octave + note F_, 2 + octave 2 + note G#, 1 + inc_octave + note C_, 2 + note __, 1 + inc_octave + note E_, 2 + dec_octave + note G_, 1 + inc_octave + note C_, 2 + note E_, 1 + dec_octave + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + octave 3 + note C_, 1 + note __, 1 + inc_octave + note E_, 2 + note __, 1 + octave 2 + note G_, 1 + octave 4 + note G_, 2 + dec_octave + note C_, 1 + inc_octave + note E_, 2 + octave 2 + note G_, 1 + note B_, 2 + note __, 1 + octave 4 + note F_, 2 + dec_octave + note F_, 1 + note B_, 2 + note F_, 1 + inc_octave + note D_, 2 + inc_octave + note D_, 1 + octave 2 + note B_, 2 + octave 4 + note F_, 2 + note __, 1 + dec_octave + note F_, 1 + note B_, 2 + note F_, 1 + dec_octave + note B_, 2 + note __, 1 + note A#, 2 + note __, 1 + octave 4 + note D_, 2 + dec_octave + note F_, 1 + note A#, 2 + note F_, 1 + inc_octave + note F_, 2 + inc_octave + note D_, 1 + octave 2 + note A#, 1 + note __, 1 + octave 4 + note D_, 1 + octave 2 + note A#, 1 + note __, 2 + note A#, 2 + inc_octave + note F_, 1 + note A#, 1 + note __, 2 + note C_, 2 + note __, 1 + inc_octave + note D_, 2 + octave 2 + note G_, 1 + octave 4 + note F_, 2 + note D_, 1 + octave 2 + note C_, 1 + note __, 1 + octave 5 + note D_, 1 + octave 3 + note C_, 1 + note __, 1 + inc_octave + note D_, 2 + note __, 1 + octave 2 + note E_, 1 + inc_octave + note C_, 1 + dec_octave + note G_, 1 + note E_, 1 + note C_, 1 + note __, 1 + note E_, 1 + note F_, 3 + octave 4 + note A_, 2 + dec_octave + note C_, 1 + inc_octave + note F_, 2 + note A_, 1 + inc_octave + note C_, 1 + dec_octave + note __, 1 + note A#, 2 + note __, 1 + note A#, 1 + inc_octave + note D_, 1 + dec_octave + note __, 2 + note G_, 2 + dec_octave + note C_, 1 + inc_octave + note A#, 2 + inc_octave + note C_, 1 + octave 2 + note F_, 3 + octave 5 + note C_, 2 + octave 3 + note C_, 1 + inc_octave + note A_, 2 + inc_octave + note C_, 1 + note C_, 1 + note __, 1 + dec_octave + note A#, 2 + note __, 1 + note A#, 1 + inc_octave + note D_, 1 + note __, 2 + note C_, 2 + octave 3 + note C_, 1 + inc_octave + note A#, 2 + dec_octave + note C_, 1 + loopchannel 0, .MainLoop + +Branch_f77f8: + octave 2 + note F_, 3 + octave 4 + note A_, 2 + dec_octave + note C_, 1 + note F_, 2 + note C_, 1 + note __, 2 + note F_, 1 + note __, 2 + note F_, 1 + note __, 2 + note C_, 1 + note F_, 2 + note C_, 1 + dec_octave + note F_, 2 + inc_octave + note C_, 1 + dec_octave + note F_, 3 + octave 5 + note C_, 2 + octave 3 + note C_, 1 + note F_, 2 + note C_, 1 + note __, 2 + note F_, 1 + note __, 2 + note F_, 1 + note __, 2 + note C_, 1 + note F_, 2 + note C_, 1 + dec_octave + endchannel + +Branch_f7826: + octave 2 + note F_, 2 + note __, 1 + octave 4 + note F_, 2 + dec_octave + note C_, 1 + note F_, 1 + note __, 1 + inc_octave + note F_, 2 + note __, 1 + inc_octave + note C_, 1 + octave 2 + note F_, 1 + note __, 1 + octave 4 + note G_, 1 + octave 2 + note F_, 1 + note __, 1 + note C_, 1 + octave 4 + note G_, 2 + octave 2 + note F_, 1 + octave 4 + note F_, 2 + octave 2 + note G_, 1 + note A_, 2 + note __, 1 + octave 4 + note E_, 2 + dec_octave + note E_, 1 + note A_, 1 + note __, 1 + inc_octave + note E_, 2 + note __, 1 + inc_octave + note C_, 1 + octave 2 + note A_, 1 + note __, 1 + octave 4 + note E_, 1 + octave 2 +.Loop1 + note A_, 1 + note __, 1 + note E_, 1 + loopchannel 2, .Loop1 + note A_, 2 + note __, 1 + note A#, 2 + note __, 1 + octave 4 + note D_, 2 + dec_octave + note F_, 1 + note A#, 1 + note __, 1 + inc_octave + note F_, 2 + note __, 1 + inc_octave + note D_, 1 + octave 2 + note A#, 1 + note __, 1 + octave 4 + note D_, 1 + octave 2 + note A#, 1 + note __, 1 + note F_, 1 + octave 4 + note D_, 2 + octave 2 + note A#, 1 + octave 4 + note D_, 2 + endchannel + + +Music_TCGOverworld_Ch4: + togglenoise $06 + notetype 7 + octave 1 + callchannel Branch_f78ee + callchannel Branch_f78fb +.MainLoop + callchannel Branch_f78ee + note C_, 3 + note D#, 2 + note C_, 1 + note C#, 3 + note D#, 2 + note E_, 1 + note C_, 2 + note D#, 1 + note D#, 3 + note C#, 1 + note D#, 1 + note D#, 1 + note C#, 3 +.Loop1 + callchannel Branch_f78ee + callchannel Branch_f78fb + loopchannel 3, .Loop1 + callchannel Branch_f78ee + callchannel Branch_f790a +.Loop2 + callchannel Branch_f78ee + callchannel Branch_f78fb + loopchannel 3, .Loop2 + callchannel Branch_f78ee + callchannel Branch_f790a + callchannel Branch_f78ee + callchannel Branch_f78fb + loopchannel 0, .MainLoop + +Branch_f78ee: + note C_, 3 + note D#, 2 + note C_, 1 + note C#, 3 + note D#, 2 + note E_, 1 + note C_, 2 + note D#, 1 + note D#, 3 + note C#, 3 + note D#, 2 + note E_, 1 + endchannel + +Branch_f78fb: + note C_, 3 + note D#, 2 + note C_, 1 + note C#, 3 + note D#, 2 + note E_, 1 + note C_, 2 + note D#, 1 + note D#, 3 + note C#, 1 + note D#, 1 + note D#, 1 + note D#, 2 + note E_, 1 + endchannel + +Branch_f790a: + note C_, 3 + note D#, 2 + note C_, 1 + note C#, 3 + note D#, 2 + note E_, 1 + note C_, 2 + note D#, 1 + note D#, 3 + note C#, 1 + note D#, 1 + note D#, 1 + note C#, 2 + note C#, 1 + endchannel + diff --git a/crysaudio/music/TCG/pausemenu.asm b/crysaudio/music/TCG/pausemenu.asm new file mode 100644 index 00000000..6577e9fd --- /dev/null +++ b/crysaudio/music/TCG/pausemenu.asm @@ -0,0 +1,588 @@ +Music_TCGPauseMenu: + db $C0 + dw Music_TCGPauseMenu_Ch1 + db $01 + dw Music_TCGPauseMenu_Ch2 + db $02 + dw Music_TCGPauseMenu_Ch3 + db $03 + dw Music_TCGPauseMenu_Ch4 + +Music_TCGPauseMenu_Ch2: + notetype0 7 + notetype2 8 + dutycycle 2 +.MainLoop + notetype1 7 +.Loop1 + note __, 16 + loopchannel 4, .Loop1 + notetype0 1 + octave 6 + note C_, 4 + dec_octave + note __, 3 + note B_, 4 + inc_octave + notetype1 3 + note C_, 3 + dec_octave + notetype1 7 + note G_, 4 + notetype1 3 + note B_, 3 + notetype1 7 + note D_, 4 + notetype1 3 + note G_, 3 + callchannel Branch_f6c24 + callchannel Branch_f6c60 + notetype1 7 + octave 6 + note C_, 4 + dec_octave + notetype1 3 + note E_, 3 + notetype1 7 + note B_, 4 + inc_octave + notetype1 3 + note C_, 3 + dec_octave + notetype1 7 + note G_, 4 + notetype1 3 + note B_, 3 + notetype1 7 + note D_, 4 + notetype1 3 + note G_, 3 + callchannel Branch_f6c24 + callchannel Branch_f6c60 + octave 6 + notetype1 6 + note C_, 4 + dec_octave + notetype1 3 + note E_, 3 + callchannel Branch_f6ce9 + callchannel Branch_f6c80 +.Loop2 + octave 6 + notetype2 4 + note C_, 1 + callchannel Branch_f6ce9 + callchannel Branch_f6c80 + loopchannel 3, .Loop2 + notetype2 8 + loopchannel 0, .MainLoop + +Branch_f6c24: +.Loop3 + octave 6 + notetype1 7 + note C_, 4 + dec_octave + notetype1 3 + note D_, 3 + notetype1 7 + note B_, 4 + inc_octave + notetype1 3 + note C_, 3 + dec_octave + notetype1 7 + note G_, 4 + notetype1 3 + note B_, 3 + notetype1 7 + note D_, 4 + notetype1 3 + note G_, 3 + loopchannel 3, .Loop3 + inc_octave + notetype1 7 + note C_, 4 + dec_octave + notetype1 3 + note D_, 3 + notetype1 7 + note B_, 4 + inc_octave + notetype1 3 + note C_, 3 + dec_octave + notetype1 7 + note G_, 4 + notetype1 3 + note B_, 3 + notetype1 7 + note E_, 4 + notetype1 3 + note G_, 3 + endchannel + +Branch_f6c60: +.Loop4 + octave 6 + notetype1 7 + note C_, 4 + dec_octave + notetype1 3 + note E_, 3 + notetype1 7 + note B_, 4 + inc_octave + notetype1 3 + note C_, 3 + dec_octave + notetype1 7 + note G_, 4 + notetype1 3 + note B_, 3 + notetype1 7 + note E_, 4 + notetype1 3 + note G_, 3 + loopchannel 3, .Loop4 + endchannel + +Branch_f6c80: + octave 6 + notetype2 4 + note C_, 1 + octave 3 + notetype1 7 + notetype2 8 + notetype0 1 + note C_, 4 + notetype1 2 + note C_, 3 + notetype1 6 + notetype0 7 + octave 5 + notetype2 4 + note G_, 1 + note E_, 1 + octave 3 + notetype2 8 + notetype1 7 + notetype0 1 + note E_, 4 + notetype1 2 + note E_, 3 + notetype0 7 + notetype1 6 + octave 5 + notetype2 4 + note B_, 1 + note G_, 1 + dec_octave + notetype1 7 + notetype2 8 + notetype0 1 + note C_, 4 + notetype1 2 + note C_, 3 + notetype1 6 + notetype0 7 + octave 6 + notetype2 4 + note C_, 1 + octave 3 + notetype2 8 + notetype1 7 + notetype0 1 + note C_, 4 + notetype1 2 + note C_, 3 + notetype0 7 + octave 5 + notetype1 6 + notetype2 4 + note G_, 1 + note E_, 1 + notetype1 7 + octave 3 + notetype2 8 + notetype0 1 + note E_, 4 + notetype1 2 + note E_, 3 + notetype0 7 + notetype1 6 + octave 5 + notetype2 4 + note B_, 1 + note G_, 1 + note E_, 1 + endchannel + +Branch_f6ce9: + octave 2 + notetype0 1 + notetype2 8 + notetype1 7 + note B_, 4 + notetype1 2 + note B_, 3 + notetype0 7 + notetype1 6 + octave 5 + notetype2 4 + note G_, 1 + note D_, 1 + octave 3 + notetype1 7 + notetype2 8 + notetype0 1 + note D_, 4 + notetype1 2 + note D_, 3 + notetype0 7 + notetype1 6 + octave 5 + notetype2 4 + note B_, 1 + note G_, 1 + notetype1 7 + octave 3 + notetype2 8 + notetype0 1 + note B_, 4 + notetype1 2 + note B_, 3 + notetype1 6 + notetype0 7 + octave 6 + notetype2 4 + note C_, 1 + notetype1 7 + octave 2 + notetype2 8 + notetype0 1 + note B_, 4 + notetype1 2 + note B_, 3 + notetype0 7 + notetype1 6 + octave 5 + notetype2 4 + note G_, 1 + note D_, 1 + notetype1 7 + octave 3 + notetype2 8 + notetype0 1 + note D_, 4 + notetype1 2 + note D_, 3 + notetype0 7 + notetype1 6 + octave 5 + notetype2 4 + note B_, 1 + note G_, 1 + note D_, 1 + endchannel + + +Music_TCGPauseMenu_Ch1: + notetype0 7 + notetype2 8 + dutycycle 2 +.MainLoop + notetype1 8 +.Loop1 + note __, 16 + loopchannel 7, .Loop1 + octave 5 + note __, 8 + notetype0 1 +.Loop2 + note B_, 4 + note G_, 3 + note E_, 4 + note C_, 3 + dec_octave + loopchannel 4, .Loop2 + notetype0 7 +.Loop3 + octave 1 + notetype1 13 + note G_, 1 + octave 3 + notetype1 7 + notetype0 1 + note D_, 4 + notetype1 2 + note D_, 3 + notetype1 13 + notetype0 7 + octave 1 + notetype2 6 + note G_, 1 + notetype2 4 + note G_, 1 + octave 3 + notetype2 8 + notetype1 7 + notetype0 1 + note F#, 4 + notetype1 2 + note F#, 3 + dec_octave + notetype1 13 + notetype0 7 + note D_, 1 + note G_, 1 + octave 4 + notetype1 7 + notetype0 1 + note F#, 4 + notetype1 2 + note F#, 3 + notetype0 7 + octave 1 + notetype1 13 + notetype2 8 + note G_, 1 + octave 3 + notetype1 7 + notetype0 1 + note D_, 4 + notetype1 2 + note D_, 3 + notetype0 7 + notetype1 13 + octave 1 + notetype2 6 + note G_, 1 + notetype2 4 + note G_, 1 + octave 3 + notetype2 8 + notetype0 1 + note F#, 4 + notetype1 2 + note F#, 3 + notetype0 7 + octave 1 + notetype1 13 + note B_, 1 + inc_octave + note C_, 1 + note C#, 1 + dec_octave + note D_, 1 + octave 3 + notetype1 7 + notetype0 1 + note E_, 4 + notetype1 2 + note E_, 3 + notetype1 13 + notetype0 7 + octave 1 + notetype2 6 + note D_, 1 + notetype2 4 + note D_, 1 + octave 3 + notetype2 8 + notetype0 1 + note G_, 4 + notetype1 2 + note G_, 3 + notetype0 7 + dec_octave + notetype1 13 + note C_, 1 + note D_, 1 + octave 4 + notetype1 7 + notetype0 1 + note G_, 4 + notetype1 2 + note G_, 3 + notetype0 7 + octave 1 + notetype1 13 + notetype2 8 + note D_, 1 + octave 3 + notetype1 7 + notetype0 1 + note E_, 4 + notetype1 2 + note E_, 3 + notetype0 7 + notetype1 13 + notetype2 6 + octave 1 + note D_, 1 + notetype2 4 + note D_, 1 + octave 3 + notetype2 8 + notetype0 1 + note G_, 4 + notetype1 2 + note G_, 3 + notetype0 7 + octave 1 + notetype1 13 + note C_, 1 + note C#, 1 + inc_octave + note D_, 1 + loopchannel 4, .Loop3 + loopchannel 0, .MainLoop + + +Music_TCGPauseMenu_Ch3: + notetype0 1 + notetype2 13 + notetype1 2 + octave 5 + note G_, 7 + note F#, 4 + notetype1 3 + note G_, 3 + notetype1 2 + note D_, 4 + notetype1 3 + note F#, 3 + dec_octave + notetype1 2 + note B_, 4 + inc_octave + notetype1 3 + note D_, 3 +.MainLoop + octave 5 +.Loop1 + notetype1 2 + note G_, 4 + dec_octave + notetype1 3 + note B_, 3 + inc_octave + notetype1 2 + note F#, 4 + notetype1 3 + note G_, 3 + notetype1 2 + note D_, 4 + notetype1 3 + note F#, 3 + dec_octave + notetype1 2 + note B_, 4 + inc_octave + notetype1 3 + note D_, 3 + loopchannel 3, .Loop1 + notetype1 2 + note G_, 4 + dec_octave + notetype1 3 + note B_, 3 + inc_octave + notetype1 2 + note E_, 4 + notetype1 3 + note G_, 3 + notetype1 2 + note C_, 4 + notetype1 3 + note E_, 3 + dec_octave + notetype1 2 + note A_, 4 + inc_octave + notetype1 3 + note C_, 3 +.Loop2 + notetype1 2 + note G_, 4 + dec_octave + notetype1 3 + note A_, 3 + inc_octave + notetype1 2 + note E_, 4 + notetype1 3 + note G_, 3 + notetype1 2 + note C_, 4 + notetype1 3 + note E_, 3 + dec_octave + notetype1 2 + note A_, 4 + inc_octave + notetype1 3 + note C_, 3 + loopchannel 3, .Loop2 + notetype1 2 + note G_, 4 + dec_octave + notetype1 3 + note A_, 3 + inc_octave + notetype1 2 + note F#, 4 + notetype1 3 + note G_, 3 + notetype1 2 + note D_, 4 + notetype1 3 + note F#, 3 + dec_octave + notetype1 2 + note B_, 4 + inc_octave + notetype1 3 + note D_, 3 + loopchannel 0, .MainLoop + + +Music_TCGPauseMenu_Ch4: + togglenoise $06 + notetype 7 + octave 1 +.MainLoop +.Loop1 + rept 7 + note C_, 1 + note D#, 1 + note E_, 2 + note C#, 1 + note D#, 1 + note E_, 1 + note D_, 1 + note C_, 1 + note D#, 1 + note E_, 2 + note C#, 1 + note D#, 1 + note E_, 1 + note C#, 1 + endr + note C_, 1 + note D#, 1 + note E_, 2 + note C#, 1 + note D#, 1 + note E_, 1 + notetype 1 + note D_, 4 + note D_, 3 + notetype 7 + rept 8 + note C#, 1 + endr + loopchannel 2, .Loop1 + loopchannel 0, .MainLoop + diff --git a/crysaudio/music/TCG/pcmainmenu.asm b/crysaudio/music/TCG/pcmainmenu.asm new file mode 100644 index 00000000..35eb39ae --- /dev/null +++ b/crysaudio/music/TCG/pcmainmenu.asm @@ -0,0 +1,349 @@ +Music_TCGPCMainMenu: + db $C0 + dw Music_TCGPCMainMenu_Ch1 + db $01 + dw Music_TCGPCMainMenu_Ch2 + db $02 + dw Music_TCGPCMainMenu_Ch3 + db $03 + dw Music_TCGPCMainMenu_Ch4 + +Music_TCGPCMainMenu_Ch1: + notetype0 7 + notetype2 8 + octave 3 + dutycycle 2 +.MainLoop + callchannel Branch_f90c2 + note __, 4 + dec_octave + dutycycle 1 + notetype2 5 + notetype1 6 + note F_, 1 + note __, 1 + dutycycle 2 + notetype2 8 + notetype1 12 + note A_, 1 + notetype1 3 + note A_, 1 + note __, 2 + inc_octave + notetype1 12 + note C_, 1 + notetype1 3 + note C_, 1 + dec_octave + dutycycle 1 + notetype2 5 + notetype1 6 + note F_, 1 + note __, 1 + dutycycle 2 + notetype2 8 + notetype1 12 + note B_, 1 + notetype1 3 + note B_, 1 + callchannel Branch_f90c2 + note __, 4 + dec_octave + dutycycle 1 + notetype2 5 + notetype1 6 + note F_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype2 8 + notetype1 12 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 2 + notetype1 12 + note C_, 1 + notetype1 3 + note C_, 1 + dutycycle 1 + notetype2 5 + notetype1 6 + dec_octave + note F_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype2 8 + notetype1 12 + note D_, 1 + notetype1 3 + note D_, 1 + loopchannel 0, .MainLoop + +Branch_f90c2: + octave 3 + note __, 4 + dutycycle 1 + notetype1 6 + notetype2 5 + note G_, 1 + note __, 3 + notetype2 8 + dutycycle 2 + notetype1 12 + note B_, 2 + inc_octave + note D_, 1 + notetype1 2 + note D_, 1 + dec_octave + dutycycle 1 + notetype1 6 + notetype2 5 + note G_, 1 + note __, 1 + inc_octave + dutycycle 2 + notetype2 8 + notetype1 12 + note C_, 1 + notetype1 3 + note C_, 1 + endchannel + + +Music_TCGPCMainMenu_Ch2: + notetype0 7 + notetype2 8 + octave 3 + dutycycle 2 +.MainLoop + callchannel Branch_f915e + note __, 4 + inc_octave + dutycycle 1 + notetype2 5 + notetype1 6 + note C_, 1 + note __, 1 + dec_octave + dutycycle 2 + notetype2 8 + notetype1 8 + note F_, 1 + notetype1 2 + note F_, 1 + note __, 2 + notetype1 8 + note A_, 1 + notetype1 2 + note A_, 1 + dutycycle 1 + notetype2 5 + notetype1 6 + inc_octave + note C_, 1 + note __, 1 + dec_octave + dutycycle 2 + notetype2 8 + notetype1 8 + note G_, 1 + notetype1 2 + note G_, 1 + callchannel Branch_f915e + note __, 4 + inc_octave + dutycycle 1 + notetype2 5 + notetype1 6 + note C_, 1 + note __, 1 + dutycycle 2 + notetype2 8 + notetype1 8 + note C_, 1 + notetype1 2 + note C_, 1 + note __, 2 + dec_octave + notetype1 8 + note A_, 1 + notetype1 2 + note A_, 1 + dutycycle 1 + inc_octave + notetype1 6 + notetype2 5 + note C_, 1 + note __, 1 + dec_octave + dutycycle 2 + notetype2 8 + notetype1 8 + note B_, 1 + notetype1 2 + note B_, 1 + loopchannel 0, .MainLoop + +Branch_f915e: + octave 4 + note __, 4 + dutycycle 1 + notetype2 5 + notetype1 6 + note D_, 1 + note __, 3 + dutycycle 2 + notetype2 8 + dec_octave + notetype1 8 + note G_, 2 + note B_, 1 + notetype1 2 + note B_, 1 + inc_octave + dutycycle 1 + notetype2 5 + notetype1 6 + note D_, 1 + note __, 1 + dec_octave + dutycycle 2 + notetype2 8 + notetype1 8 + note A_, 1 + notetype1 2 + note A_, 1 + endchannel + + +Music_TCGPCMainMenu_Ch3: + notetype0 7 + notetype1 1 + notetype2 11 +.MainLoop + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + notetype0 1 + note A#, 4 + note B_, 3 + notetype0 7 + note B_, 1 + note __, 1 + inc_octave + note C_, 1 + note __, 1 + note C_, 1 + note C#, 2 + note D_, 2 + dec_octave + note G_, 1 + note F#, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + notetype0 1 + note G#, 4 + note A_, 3 + notetype0 7 + note A_, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note B_, 2 + inc_octave + note C_, 2 + dec_octave + note F_, 1 + note F#, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + notetype0 1 + note A#, 4 + note B_, 3 + notetype0 7 + note B_, 1 + note __, 1 + inc_octave + note C_, 1 + note __, 1 + note C_, 1 + note C#, 2 + note D_, 2 + dec_octave + note G_, 1 + note F#, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + notetype0 1 + note B_, 4 + inc_octave + note C_, 3 + notetype0 7 + note C_, 1 + note __, 1 + notetype0 1 + note F#, 4 + note G_, 3 + notetype0 7 + note G_, 1 + note F_, 1 + note C_, 2 + note F_, 2 + notetype0 1 + note C_, 3 + dec_octave + note B_, 3 + note A#, 3 + note A_, 3 + note G#, 2 + notetype0 7 + loopchannel 0, .MainLoop + + +Music_TCGPCMainMenu_Ch4: + togglenoise $06 + notetype 7 + octave 1 +.MainLoop +.Loop1 + callchannel Branch_f9248 + note D#, 1 + note C_, 1 + note C#, 2 + note D#, 1 + note E_, 1 + loopchannel 7, .Loop1 + callchannel Branch_f9248 + note E_, 1 + notetype 1 + note D_, 4 + note D_, 3 + notetype 7 + note C#, 2 + note C#, 1 + note C#, 1 + loopchannel 0, .MainLoop + +Branch_f9248: + note C_, 2 + note D#, 1 + note D#, 1 + note C#, 2 + note D#, 1 + note E_, 1 + note C_, 1 + note D_, 1 + endchannel + diff --git a/crysaudio/music/TCG/pokemondome.asm b/crysaudio/music/TCG/pokemondome.asm new file mode 100644 index 00000000..87f4c04d --- /dev/null +++ b/crysaudio/music/TCG/pokemondome.asm @@ -0,0 +1,792 @@ +Music_TCGPokemonDome: + db $C0 + dw Music_TCGPokemonDome_Ch1 + db $01 + dw Music_TCGPokemonDome_Ch2 + db $02 + dw Music_TCGPokemonDome_Ch3 + db $03 + dw Music_TCGPokemonDome_Ch4 + +Music_TCGPokemonDome_Ch1: + notetype0 7 + vibrato 20, $33 + notetype2 8 + octave 2 + dutycycle 0 + notetype1 10 + notetype0 1 + note G_, 5 + note A_, 5 + note B_, 4 + inc_octave + note C_, 5 + note D_, 5 + note E_, 4 + note C_, 5 + note D_, 5 + note E_, 4 + note F_, 5 + note G_, 5 + note A_, 4 + note F_, 5 + note G_, 5 + note A_, 4 + note B_, 5 + inc_octave + note C_, 5 + note D_, 4 + dec_octave + note B_, 5 + inc_octave + note C_, 5 + note D_, 4 + note E_, 5 + note F_, 5 + note G_, 4 + dutycycle 1 + notetype1 8 + dec_octave + notetype0 1 + note C_, 11 + notetype1 3 + note C_, 3 + notetype1 8 + note C_, 11 + notetype1 3 + note C_, 10 + note __, 7 + notetype1 8 + note C_, 4 + notetype1 3 + note C_, 3 + notetype1 8 + note C_, 4 + notetype1 3 + note C_, 3 + notetype1 8 + note C_, 11 + notetype1 3 + note C_, 3 + notetype1 8 + note C_, 11 + notetype1 3 + note C_, 10 + notetype0 7 + note __, 3 + notetype1 8 + notetype0 1 + note D_, 11 + notetype1 3 + note D_, 3 + notetype1 8 + note D_, 11 + notetype1 3 + note D_, 10 + note __, 7 + notetype1 8 + note D_, 4 + notetype1 3 + note D_, 3 + notetype1 8 + note D_, 4 + notetype1 3 + note D_, 3 + notetype1 8 + note D_, 11 + notetype1 3 + note D_, 3 + notetype1 8 + note D_, 11 + notetype1 3 + note D_, 3 +.MainLoop + notetype0 7 + dutycycle 1 + notetype1 10 + octave 2 + note G_, 4 + inc_octave + dutycycle 1 + notetype1 8 + notetype0 1 + note E_, 11 + notetype1 3 + note E_, 3 + notetype1 8 + notetype0 1 + note E_, 11 + notetype1 3 + note E_, 10 + note __, 7 + notetype1 8 + note E_, 4 + notetype1 3 + note E_, 3 + notetype1 8 + note E_, 4 + notetype1 3 + note E_, 3 + notetype1 8 + note E_, 11 + notetype1 3 + note E_, 3 + notetype1 8 + note E_, 11 + notetype1 3 + note E_, 10 + notetype0 7 + note __, 3 + notetype1 8 + notetype0 1 + note D_, 11 + notetype1 3 + note D_, 3 + notetype1 8 + note D_, 11 + notetype1 3 + note D_, 10 + note __, 7 + notetype0 1 + notetype1 8 + note D_, 4 + notetype1 3 + note D_, 3 + notetype1 8 + note D_, 4 + notetype1 3 + note D_, 3 + notetype1 8 + note D_, 11 + notetype1 3 + note D_, 3 + notetype1 8 + note D_, 11 + notetype1 3 + note D_, 3 + dutycycle 0 + notetype1 10 + dec_octave + notetype0 1 + note B_, 4 + inc_octave + note C_, 3 + note D_, 4 + note E_, 3 + note F_, 4 + note G_, 3 + note A_, 4 + note B_, 3 + notetype0 7 + inc_octave + note C_, 12 + dec_octave + note G_, 1 + notetype1 3 + note G_, 1 + note __, 1 + inc_octave + notetype1 10 + note C_, 1 + note D_, 10 + notetype1 3 + note D_, 2 + notetype1 10 + note G_, 3 + notetype1 3 + note G_, 1 + notetype1 10 + note F_, 10 + notetype1 3 + note F_, 2 + notetype1 10 + note C_, 3 + notetype1 3 + note C_, 1 + notetype1 10 + note F_, 10 + note E_, 1 + notetype1 3 + note E_, 1 + notetype1 10 + note D_, 3 + notetype1 3 + note D_, 1 + notetype1 10 + note E_, 12 + dec_octave + note G_, 1 + notetype1 3 + note G_, 1 + note __, 1 + inc_octave + notetype1 10 + note C_, 1 + note D_, 8 + dec_octave + note A_, 4 + inc_octave + note D_, 3 + notetype1 3 + note D_, 1 + notetype1 10 + note C_, 14 + notetype1 3 + note C_, 2 + dec_octave + notetype1 10 + note B_, 10 + notetype1 3 + note B_, 2 + notetype1 10 + note G_, 4 + note A_, 12 + note B_, 1 + notetype1 3 + note B_, 2 + inc_octave + notetype1 10 + note C_, 1 + note D_, 8 + note E_, 4 + note F_, 4 + note G_, 8 + note G_, 8 + note G_, 8 + notetype1 3 + note G_, 2 + notetype1 10 + note F_, 2 + note E_, 2 + notetype1 3 + note E_, 1 + notetype1 10 + notetype0 1 + note E_, 5 + notetype1 3 + note E_, 2 + notetype0 7 + notetype1 10 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + dec_octave + notetype1 10 + note A_, 1 + inc_octave + note C_, 8 + note G_, 1 + notetype1 3 + note G_, 2 + notetype1 10 + note F_, 1 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + dec_octave + notetype1 10 + note A_, 1 + inc_octave + note C_, 8 + note G_, 1 + notetype1 3 + note G_, 2 + notetype1 10 + note F_, 1 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + dec_octave + notetype1 10 + note G#, 1 + inc_octave + note C_, 12 + note C_, 8 + note D_, 8 + note C_, 8 + note C_, 8 + note C_, 12 + loopchannel 0, .MainLoop + + +Music_TCGPokemonDome_Ch2: + notetype0 7 + vibrato 20, $33 + notetype2 8 + octave 1 + dutycycle 0 + notetype1 8 + notetype0 1 + note B_, 5 + inc_octave + note C_, 5 + note D_, 4 + note E_, 5 + note F_, 5 + note G_, 4 + note E_, 5 + note F_, 5 + note G_, 4 + note A_, 5 + note B_, 5 + inc_octave + note C_, 4 + dec_octave + note A_, 5 + note B_, 5 + inc_octave + note C_, 4 + note D_, 5 + note E_, 5 + note F_, 4 + note D_, 5 + note E_, 5 + note F_, 4 + note G_, 5 + note A_, 5 + note B_, 4 +.MainLoop + dutycycle 1 + notetype1 7 + octave 3 + notetype0 1 + note E_, 11 + notetype1 3 + note E_, 3 + notetype1 7 + note E_, 11 + notetype1 3 + note E_, 10 + note __, 7 + notetype1 7 + note E_, 4 + notetype1 3 + note E_, 3 + notetype1 7 + note E_, 4 + notetype1 3 + note E_, 3 + notetype1 7 + note E_, 11 + notetype1 3 + note E_, 3 + notetype1 7 + note E_, 11 + notetype1 3 + note E_, 10 + notetype0 7 + note __, 3 + callchannel Branch_f9554 + notetype0 7 + note __, 4 + notetype1 7 + notetype0 1 + note G_, 11 + notetype1 3 + note G_, 3 + notetype1 7 + note G_, 11 + notetype1 3 + note G_, 10 + note __, 7 + notetype1 7 + note G_, 4 + notetype1 3 + note G_, 3 + notetype1 7 + note G_, 4 + notetype1 3 + note G_, 3 + notetype1 7 + note G_, 11 + notetype1 3 + note G_, 3 + notetype1 7 + note G_, 11 + notetype1 3 + note G_, 10 + notetype0 7 + note __, 3 + callchannel Branch_f9554 + dutycycle 0 + notetype1 8 + dec_octave + notetype0 1 + note G_, 4 + note A_, 3 + note B_, 4 + inc_octave + note C_, 3 + note D_, 4 + note E_, 3 + note F_, 4 + note F#, 3 + notetype0 7 + note G_, 10 + note F_, 1 + note __, 1 + note E_, 1 + notetype1 2 + note E_, 1 + note __, 1 + notetype1 7 + note G_, 1 + note G_, 10 + note A_, 2 + note B_, 2 + note G_, 2 + inc_octave + note C_, 10 + note __, 2 + dec_octave + note A_, 3 + note __, 1 + note G#, 10 + note A#, 1 + note __, 1 + note G#, 3 + note __, 1 + note G_, 8 + inc_octave + note C_, 4 + dec_octave + note E_, 4 + note F#, 8 + note F#, 4 + notetype2 6 + note F#, 3 + notetype2 8 + notetype0 1 + note F#, 5 + note __, 2 + notetype0 7 + note F_, 14 + note __, 2 + dec_octave + note G_, 1 + note A_, 1 + note B_, 1 + inc_octave + note C_, 1 + note D_, 1 + dec_octave + note B_, 1 + inc_octave + note C_, 1 + note D_, 1 + note E_, 1 + note C_, 1 + note D_, 1 + note E_, 1 + note F_, 1 + note F_, 1 + note A_, 1 + note B_, 1 + dutycycle 1 + notetype1 8 + notetype0 1 +.Loop1 + note F_, 5 + note C_, 5 + dec_octave + note A_, 4 + inc_octave + note C_, 5 + dec_octave + note A_, 5 + note F_, 4 + inc_octave + loopchannel 4, .Loop1 +.Loop2 + note G#, 5 + note F_, 5 + note C_, 4 + note F_, 5 + note C_, 5 + dec_octave + note G#, 4 + inc_octave + loopchannel 4, .Loop2 +.Loop3 + inc_octave + note D_, 5 + dec_octave + note B_, 5 + note G_, 4 + note B_, 5 + note G_, 5 + note D_, 4 + loopchannel 4, .Loop3 +.Loop4 + inc_octave + note C#, 5 + dec_octave + note A#, 5 + note G_, 4 + note A#, 5 + note G_, 5 + note E_, 4 + loopchannel 3, .Loop4 + inc_octave + note C#, 5 + dec_octave + note C#, 5 + note E_, 4 + note G_, 5 + note A#, 5 + inc_octave + note C#, 4 + dutycycle 0 + notetype1 8 + notetype0 7 +.Loop5 + note C_, 1 + notetype1 2 + note C_, 1 + note __, 1 + notetype1 7 + dec_octave + note F_, 1 + note A_, 8 + inc_octave + note E_, 1 + notetype1 2 + note E_, 1 + note __, 1 + notetype1 7 + note D_, 1 + loopchannel 2, .Loop5 + note C_, 1 + notetype1 2 + note C_, 1 + note __, 1 + dec_octave + notetype1 7 + note F_, 1 + note G#, 12 + note C_, 1 + dec_octave + note F_, 1 + note G#, 1 + inc_octave + note C_, 1 + note F_, 1 + dec_octave + note G#, 1 + inc_octave + note C_, 1 + note F_, 1 + note G#, 1 + note C_, 1 + note F_, 1 + note G#, 1 + inc_octave + note C_, 1 + dec_octave + note F_, 1 + note G#, 1 + note B_, 1 + loopchannel 0, .MainLoop + +Branch_f9554: + notetype0 1 + notetype1 7 + note F_, 11 + notetype1 3 + note F_, 3 + notetype1 7 + note F_, 11 + notetype1 3 + note F_, 10 + note __, 7 + notetype1 7 + note F_, 4 + notetype1 3 + note F_, 3 + notetype1 7 + note F_, 4 + notetype1 3 + note F_, 3 +.Loop6 + notetype1 7 + note F_, 11 + notetype1 3 + note F_, 3 + loopchannel 2, .Loop6 + endchannel + + +Music_TCGPokemonDome_Ch3: + notetype0 7 + notetype1 1 + notetype2 11 + octave 2 + notetype0 1 +.Loop1 + note G_, 5 + note G_, 5 + note G_, 4 + loopchannel 8, .Loop1 + notetype0 7 +.MainLoop + inc_octave + note C_, 2 + note C_, 2 + note __, 2 + note C_, 1 + note C_, 1 + callchannel Branch_f9613 + octave 2 + note C_, 2 + inc_octave + note C_, 2 + note __, 2 + note C_, 1 + note C_, 1 + callchannel Branch_f9613 + octave 3 + note C_, 2 + note C_, 2 + note __, 2 + note C_, 1 + note C_, 1 + note C_, 2 + note C_, 2 + note __, 2 + dec_octave + note G_, 2 + note B_, 2 + note B_, 2 + note __, 2 + note B_, 1 + note B_, 1 + note B_, 2 + note B_, 2 + note __, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note __, 2 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 2 + note __, 2 + note F_, 2 + note G#, 2 + note G#, 2 + note __, 2 + note G#, 1 + note G#, 1 + note G#, 2 + note G#, 2 + note __, 2 + note F_, 2 +.Loop2 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 1 + note G_, 1 + loopchannel 2, .Loop2 +.Loop3 + note F#, 2 + note F#, 2 + note __, 2 + note F#, 1 + note F#, 1 + loopchannel 2, .Loop3 +.Loop4 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 1 + note G_, 1 + loopchannel 4, .Loop4 +.Loop5 + note F_, 2 + note F_, 2 + note __, 2 + note F_, 1 + note F_, 1 + loopchannel 4, .Loop5 +.Loop6 + note E_, 2 + note E_, 2 + note __, 2 + note E_, 1 + note E_, 1 + loopchannel 2, .Loop6 +.Loop7 + note A_, 2 + note A_, 2 + note __, 2 + note A_, 1 + note A_, 1 + loopchannel 2, .Loop7 +.Loop8 + note D_, 2 + note D_, 2 + note __, 2 + note D_, 1 + note D_, 1 + loopchannel 4, .Loop8 +.Loop9 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 1 + note G_, 1 + loopchannel 4, .Loop9 + loopchannel 0, .MainLoop + +Branch_f9613: + octave 3 + note C_, 2 + note C_, 2 + note __, 2 + dec_octave + note G_, 2 + inc_octave + note C_, 2 + note C_, 2 + note __, 2 + note C_, 1 + note C_, 1 + note C_, 2 + note C_, 2 + dec_octave + note G_, 2 + note G_, 2 + endchannel + + +Music_TCGPokemonDome_Ch4: + togglenoise $06 + notetype 7 + octave 1 + note F_, 8 + notetype 1 + note C#, 4 + note D_, 3 +.Loop1 + note D_, 4 + note D_, 3 + loopchannel 7, .Loop1 +.MainLoop +.Loop2 + notetype 7 + note C#, 2 + note C#, 2 + note __, 2 + notetype 1 + note C#, 4 + note D_, 3 + note D_, 4 + note D_, 3 + loopchannel 2, .Loop2 + loopchannel 0, .MainLoop + diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm new file mode 100644 index 00000000..aad71d28 --- /dev/null +++ b/crysaudio/music/TCG/ronald.asm @@ -0,0 +1,1222 @@ +Music_TCGRonald: + db $C0 + dw Music_TCGRonald_Ch1 + db $01 + dw Music_TCGRonald_Ch2 + db $02 + dw Music_TCGRonald_Ch3 + db $03 + dw Music_TCGRonald_Ch4 + +Music_TCGRonald_Ch1: + vibrato 12, $33 + notetype2 8 + dutycycle 0 +.MainLoop + octave 3 + notetype0 13 +.Loop1 + notetype1 9 + notetype2 3 + note D_, 1 + note D_, 1 + notetype2 4 + note F_, 1 + note __, 2 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + notetype1 9 + notetype2 8 + note E_, 2 + note __, 1 + dec_octave + notetype1 9 + notetype2 3 + note G_, 1 + inc_octave + note D_, 1 + notetype2 4 + note F_, 1 + note __, 2 + note F_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + notetype2 8 + notetype1 9 + note G_, 2 + note __, 1 + loopchannel 2, .Loop1 +.Loop2 + vibrato 20, $33 + callchannel Branch_fa9aa + notetype0 1 + octave 4 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 2 + vibrato 12, $33 + callchannel Branch_fa9ec + loopchannel 2, .Loop2 +.Loop3 + vibrato 20, $33 + callchannel Branch_fa9cb + notetype0 1 + octave 4 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 2 + vibrato 12, $33 + callchannel Branch_fa9ec + loopchannel 2, .Loop3 + callchannel Branch_fa9aa + vibrato 20, $33 + notetype0 1 + octave 4 + note C#, 3 + note D_, 3 + note __, 7 + dutycycle 2 + notetype1 9 + note __, 6 + dec_octave + notetype2 4 + note G_, 7 + inc_octave + note F_, 6 + dec_octave + note G_, 7 + inc_octave + note E_, 6 + dec_octave + note G_, 7 + inc_octave + note D_, 6 + dec_octave + note G_, 7 + inc_octave + notetype2 8 + note C_, 4 + note C#, 4 + note C_, 5 + dec_octave + notetype2 4 + note A#, 6 + inc_octave + note C_, 7 + dec_octave + note A#, 6 + note G_, 7 + note F_, 6 + note F#, 7 + notetype2 8 + note G_, 6 + notetype2 4 + note C#, 7 + note C_, 6 + dec_octave + note A#, 7 + inc_octave + notetype2 8 + note C_, 4 + note C#, 4 + note C_, 5 + dec_octave + note A#, 6 + inc_octave + notetype2 4 + note C_, 7 + dec_octave + note A#, 6 + note G_, 7 + note F_, 6 + note F#, 7 + note G_, 6 + notetype2 8 + note A#, 7 + inc_octave + note C_, 6 + note D_, 7 + notetype0 13 + callchannel Branch_fa9aa + notetype0 1 + octave 4 + note C#, 3 + note D_, 3 + note __, 7 + dutycycle 2 + notetype1 9 + note __, 6 + dec_octave + notetype2 4 + note G_, 7 + inc_octave + note F_, 6 + dec_octave + note G_, 7 + inc_octave + note E_, 6 + dec_octave + note G_, 7 + inc_octave + note D_, 6 + dec_octave + note G_, 7 + inc_octave + notetype2 8 + note C_, 4 + note C#, 4 + note C_, 5 + dec_octave + notetype2 4 + note A#, 6 + inc_octave + note C_, 7 + dec_octave + note A#, 6 + note G_, 7 + note F_, 6 + note F#, 7 + note G_, 6 + notetype2 8 + note A#, 7 + inc_octave + notetype2 4 + note C_, 6 + dec_octave + note A#, 7 + inc_octave + notetype2 8 + note C#, 4 + note C_, 4 + dec_octave + note A#, 5 + notetype2 4 + note G_, 6 + note F_, 7 + note G_, 6 + note C#, 7 + note C_, 6 + dec_octave + note A#, 7 + inc_octave + notetype2 8 + note C_, 4 + note C#, 4 + note C_, 5 + dec_octave + notetype2 4 + note A#, 6 + note G_, 7 + notetype2 8 + callchannel Branch_fa9cb + notetype0 1 + octave 4 + note C#, 3 + note D_, 3 + note __, 7 + dutycycle 2 + notetype1 9 + note __, 13 + notetype2 4 + note F_, 6 + note __, 7 + notetype2 8 + note E_, 4 + note F_, 4 + note E_, 5 + notetype2 4 + note D_, 6 + note __, 7 + notetype2 8 + note E_, 6 + notetype2 4 + note C_, 7 + dec_octave + note G_, 6 + inc_octave + note C_, 7 + note C#, 6 + note D_, 7 + dec_octave + notetype2 8 + note A#, 6 + notetype2 4 + note G_, 7 + note __, 6 + note F_, 7 + notetype2 8 + note F#, 6 + notetype2 4 + note G_, 7 + notetype2 8 + note A#, 6 + notetype2 4 + note G_, 7 + note A#, 6 + inc_octave + note C_, 7 + notetype2 8 + note C#, 6 + notetype2 4 + note D_, 7 + note F_, 6 + note D_, 7 + notetype2 8 + note F_, 6 + dec_octave + notetype2 4 + note G_, 7 + dec_octave + note G_, 6 + inc_octave + note D_, 7 + dutycycle 1 + notetype1 10 + notetype2 8 + callchannel Branch_fa9cb + notetype0 1 + octave 4 + note C#, 3 + note D_, 3 + note __, 7 + note __, 13 + dec_octave + note G_, 3 + note G#, 10 + note G_, 3 + note __, 10 + notetype0 13 + note F_, 4 + vibrato 12, $33 + notetype0 1 + notetype1 9 + note C_, 6 + note __, 7 + note __, 13 + note F_, 6 + note __, 7 + note __, 13 + note A_, 6 + note __, 7 + note __, 13 + notetype0 13 + notetype1 9 + note G_, 2 + note __, 1 + vibrato 20, $33 + notetype0 1 + notetype1 10 + note F#, 3 + note G_, 10 + note A#, 3 + note __, 10 + note G_, 3 + note __, 10 + inc_octave + note D_, 13 + note __, 13 + dec_octave + note A#, 6 + note __, 7 + note __, 13 + note A#, 3 + inc_octave + note C_, 10 + note __, 13 + dec_octave + note A#, 3 + note __, 10 + inc_octave + note C_, 13 + dec_octave + note A#, 3 + note __, 10 + inc_octave + note C#, 4 + note C_, 4 + dec_octave + note A#, 5 + note G_, 3 + note __, 10 + note B_, 3 + inc_octave + note C_, 10 + dec_octave + note A#, 3 + note __, 10 + note __, 13 + inc_octave + note G_, 3 + note __, 10 + note C_, 4 + note C#, 4 + note C_, 5 + dec_octave + note A#, 3 + note __, 10 + inc_octave + note C_, 13 + dec_octave + note A#, 3 + note __, 10 + note G_, 3 + note __, 10 + inc_octave + note E_, 3 + note F_, 10 + note __, 13 + note D#, 13 + note __, 13 + note D_, 6 + note __, 7 + note __, 13 + note C_, 6 + note __, 7 + note __, 13 + note C#, 3 + note __, 10 + note C#, 3 + note D_, 10 + dec_octave + note A#, 3 + note __, 10 + note G_, 3 + note __, 10 + notetype0 13 + note A#, 3 + note __, 4 + notetype0 1 + note B_, 3 + inc_octave + note C_, 16 + note __, 7 + note E_, 3 + note F_, 10 + note __, 6 + note D_, 7 + note __, 13 + note C_, 6 + note __, 7 + note C#, 3 + note D_, 10 + notetype0 13 + note D_, 5 + note __, 1 + dec_octave + note D_, 8 + note __, 1 + dutycycle 0 + vibrato 12, $33 + loopchannel 0, .MainLoop + +Branch_fa9aa: + octave 4 + dutycycle 1 + notetype1 10 + note __, 2 + notetype0 1 + note G#, 3 + note A_, 3 + note __, 7 + note __, 13 + note F_, 13 + note D_, 3 + note __, 10 + note __, 13 + note E_, 6 + note __, 7 + notetype0 13 + note __, 1 + note F_, 1 + notetype0 1 + note G_, 3 + note __, 10 + note E_, 6 + note __, 7 + note __, 13 + note C_, 6 + note __, 7 + note __, 13 + endchannel + +Branch_fa9cb: + octave 4 + dutycycle 1 + notetype1 10 + notetype0 1 + note D#, 3 + note E_, 10 + note F_, 3 + note __, 10 + note G_, 3 + note __, 10 + note E_, 6 + note __, 7 + note __, 13 + note C_, 6 + note __, 7 + note __, 13 + note D_, 6 + note __, 7 + note __, 13 + note D#, 3 + note E_, 10 + note F_, 3 + note __, 10 + note G_, 3 + note __, 10 + note E_, 13 + note C_, 6 + note __, 7 + note __, 13 + endchannel + +Branch_fa9ec: + octave 3 + dutycycle 0 + notetype1 9 + notetype0 1 + note F_, 6 + note __, 7 + notetype0 13 + note __, 2 + notetype0 1 + note F_, 6 + note __, 7 + notetype0 13 + note __, 3 + notetype0 1 + note F_, 6 + note __, 7 + note __, 13 + note A_, 6 + note __, 7 + note __, 13 + notetype0 13 + notetype1 9 + note G_, 2 + note __, 1 + endchannel + + +Music_TCGRonald_Ch2: + vibrato 12, $33 + notetype2 8 + dutycycle 0 +.MainLoop + octave 2 +.Loop1 + notetype0 1 + notetype1 9 + note G_, 3 + note __, 3 + note G_, 3 + note __, 4 + note A#, 3 + note __, 10 + inc_octave + note D_, 6 + dec_octave + note G_, 3 + note __, 4 + note A#, 3 + note __, 3 + note __, 13 + note G_, 3 + note D_, 4 + note A#, 6 + note __, 7 + note D_, 3 + note __, 3 + note G_, 3 + note __, 4 + note G_, 6 + note __, 7 + note __, 13 + note A#, 6 + note __, 13 + note G_, 3 + note A#, 4 + inc_octave + note D_, 6 + note __, 7 + note __, 13 + notetype0 13 + notetype1 9 + note C_, 2 + note __, 1 + dec_octave + notetype0 1 + notetype1 9 + note D_, 3 + note __, 3 + note G_, 3 + note __, 4 + note A#, 3 + note __, 10 + inc_octave + note D_, 6 + dec_octave + note G_, 3 + note __, 4 + note A#, 3 + note __, 3 + note __, 13 + note G_, 3 + note A#, 4 + inc_octave + note D_, 6 + note __, 7 + dec_octave + note D_, 3 + note __, 3 + note G_, 3 + note __, 4 + note G_, 6 + note __, 7 + note __, 13 + inc_octave + note D_, 6 + note __, 13 + dec_octave + note A#, 3 + inc_octave + note D_, 4 + note F_, 6 + note __, 7 + note __, 13 + notetype0 13 + notetype1 9 + note E_, 2 + note __, 1 + dec_octave + loopchannel 2, .Loop1 +.Loop2 + callchannel Branch_fab76 + notetype2 8 + notetype1 8 + note C_, 2 + note __, 1 + callchannel Branch_fab76 + notetype2 8 + notetype1 8 + note E_, 2 + note __, 1 + loopchannel 4, .Loop2 +.Loop3 + vibrato 20, $33 + notetype1 8 + notetype0 13 + dutycycle 1 + octave 4 + note __, 2 + notetype2 4 + note F_, 1 + note __, 1 + notetype2 8 + note D_, 1 + dec_octave + dec_octave + notetype2 4 + dutycycle 0 + notetype1 9 + note A#, 1 + note __, 1 + inc_octave + inc_octave + dutycycle 1 + notetype1 8 + note C_, 1 + note __, 1 + notetype2 8 + note D_, 1 + notetype2 3 + note E_, 1 + notetype2 4 + note C_, 1 + note __, 1 + dec_octave + note A_, 1 + note __, 1 + note A#, 1 + note __, 2 + vibrato 12, $33 + dutycycle 0 + notetype1 9 + note F_, 1 + note __, 2 + note F_, 1 + note __, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + notetype2 8 + notetype1 9 + note G_, 2 + note __, 1 + loopchannel 2, .Loop3 + vibrato 20, $33 + callchannel Branch_fab8a + octave 3 + note __, 2 + vibrato 12, $33 + dutycycle 0 + notetype1 9 + notetype2 4 + note F_, 1 + note __, 2 + note F_, 1 + note __, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + notetype2 8 + notetype1 9 + note G_, 2 + note __, 1 + vibrato 20, $33 + callchannel Branch_fab8a + octave 3 + note __, 1 + notetype0 1 + notetype2 8 + note E_, 3 + note F_, 10 + note E_, 3 + note __, 10 + notetype0 13 + note D_, 4 + dec_octave + vibrato 12, $33 + dutycycle 0 + notetype1 9 + notetype2 4 + note G_, 1 + note __, 1 + inc_octave + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + notetype2 8 + notetype1 9 + note E_, 2 + note __, 1 + callchannel Branch_fabb1 + note __, 1 + notetype2 4 + octave 2 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + inc_octave + notetype2 8 + notetype1 9 + note C_, 2 + note __, 1 + notetype1 9 + note __, 2 + notetype2 4 + note F_, 1 + note __, 2 + note F_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + notetype2 8 + notetype1 9 + note F_, 2 + note __, 1 + callchannel Branch_fabb1 + note __, 1 + octave 2 + notetype2 4 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + inc_octave + notetype2 8 + notetype1 9 + note C_, 2 + note __, 1 + note __, 2 + dec_octave + notetype1 9 + notetype2 4 + note G_, 1 + note __, 2 + note G_, 1 + note __, 1 + vibrato 20, $33 + notetype2 8 + dutycycle 1 + notetype1 7 + note F#, 8 + note __, 1 + dutycycle 0 + vibrato 12, $33 + loopchannel 0, .MainLoop + +Branch_fab76: + octave 2 + notetype1 9 + notetype0 13 + note __, 2 + notetype2 4 + note A#, 1 + note __, 2 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + inc_octave + note D_, 1 + note __, 1 + endchannel + +Branch_fab8a: + octave 4 + dutycycle 1 + notetype1 8 + notetype0 13 + note C_, 1 + notetype2 3 + note D_, 1 + note E_, 1 + notetype2 4 + note C_, 1 + note __, 1 + dec_octave + note A_, 1 + note __, 1 + note A#, 1 + note __, 1 + inc_octave + notetype2 8 + note C_, 1 + notetype2 3 + note D_, 1 + note E_, 1 + notetype2 8 + note C_, 1 + dec_octave + notetype2 4 + note A_, 1 + note __, 1 + note A#, 1 + endchannel + +Branch_fabb1: + octave 2 + notetype1 9 + notetype0 13 + note __, 2 + notetype2 4 + note A#, 1 + note __, 2 + note A#, 1 + note __, 1 + inc_octave + note C_, 1 + endchannel + + +Music_TCGRonald_Ch3: + notetype0 1 + notetype1 1 + notetype2 11 +.MainLoop + octave 2 +.Loop1 + note G_, 13 + note G_, 2 + note __, 4 + note G_, 5 + note __, 2 + inc_octave + note A#, 6 + dec_octave + note F_, 2 + note __, 5 + note F_, 6 + note F#, 3 + note __, 4 + note G_, 2 + note __, 4 + note G_, 3 + note __, 10 + note F_, 7 + note G_, 6 + note __, 7 + inc_octave + note C_, 13 + note __, 6 + inc_octave + note C_, 2 + note __, 11 + dec_octave + note C_, 2 + note __, 5 + dec_octave + note E_, 13 + note __, 6 + note F_, 7 + note __, 6 + note F_, 7 + note F#, 13 + note G_, 13 + inc_octave + note C_, 6 + note __, 7 + dec_octave + loopchannel 4, .Loop1 +.Loop2 + callchannel Branch_fac94 + octave 3 + note A#, 6 + callchannel Branch_facbb + callchannel Branch_fac94 + octave 4 + note F_, 6 + callchannel Branch_facbb + loopchannel 8, .Loop2 + callchannel Branch_facc5 + octave 2 + note D_, 13 + note __, 6 + inc_octave + note D_, 2 + note __, 5 + inc_octave + note D_, 6 + octave 2 + note D_, 2 + note __, 5 + note D_, 13 + octave 4 + note D_, 6 + octave 2 + note A_, 7 + note __, 6 + inc_octave + note C_, 7 + note C_, 13 + note C#, 13 + note D_, 6 + note __, 7 + dec_octave + note C_, 13 + note C_, 2 + note __, 4 + note C_, 5 + note __, 2 + octave 4 + note D_, 6 + octave 2 + note G_, 2 + note __, 5 + note G_, 6 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note C_, 2 + note __, 4 + note C_, 3 + note __, 4 + octave 4 + note D_, 6 + octave 2 + note G_, 7 + note C_, 6 + note __, 7 + note D_, 13 + note __, 6 + inc_octave + note D_, 2 + note __, 5 + inc_octave + note D_, 6 + octave 2 + note D_, 2 + note __, 5 + note D_, 13 + octave 4 + note F_, 6 + octave 2 + note A_, 7 + note __, 6 + inc_octave + note D_, 7 + note D_, 13 + dec_octave + note A_, 13 + note D_, 6 + note __, 7 + callchannel Branch_facc5 + octave 2 + note G#, 13 + note __, 6 + inc_octave + note G#, 2 + note __, 5 + inc_octave + note D_, 6 + octave 2 + note G#, 2 + note __, 5 + note G#, 13 + octave 4 + note D_, 6 + dec_octave + note D#, 7 + note __, 6 + note G#, 7 + note G#, 13 + dec_octave + note G#, 13 + inc_octave + note D#, 6 + note __, 7 + dec_octave + note A_, 13 + note A_, 2 + note __, 4 + note A_, 5 + note __, 2 + octave 4 + note D_, 6 + dec_octave + note E_, 2 + note __, 5 + note E_, 6 + note E_, 3 + note __, 4 + dec_octave + note A_, 2 + note __, 4 + note A_, 3 + note __, 4 + octave 4 + note D_, 6 + dec_octave + note E_, 7 + dec_octave + note A_, 6 + note __, 7 + notetype0 13 + note G#, 8 + note __, 1 + notetype0 1 + loopchannel 0, .MainLoop + +Branch_fac94: + octave 2 + note G_, 13 + note G_, 2 + note __, 4 + note G_, 5 + note __, 2 + octave 4 + note D_, 6 + dec_octave + note D_, 2 + note __, 5 + note D_, 6 + note G_, 3 + note __, 4 + dec_octave + note G_, 2 + note __, 4 + note G_, 3 + note __, 4 + octave 4 + note D_, 6 + octave 2 + note F_, 7 + note G_, 6 + note __, 7 + inc_octave + note C_, 13 + note __, 6 + inc_octave + note C_, 2 + note __, 5 + note D_, 6 + dec_octave + note C_, 2 + note __, 5 + dec_octave + note E_, 13 + inc_octave + endchannel + +Branch_facbb: + octave 2 + note F_, 7 + note __, 6 + note F_, 7 + note F#, 13 + note G_, 13 + inc_octave + note C_, 6 + note __, 7 + endchannel + +Branch_facc5: + octave 2 + note D#, 13 + note D#, 2 + note __, 4 + note D#, 5 + note __, 2 + octave 4 + note D_, 6 + octave 2 + note A#, 2 + note __, 5 + note A#, 6 + inc_octave + note D#, 3 + note __, 4 + dec_octave + note D#, 2 + note __, 4 + note D#, 3 + note __, 4 + octave 4 + note D_, 6 + octave 2 + note A#, 7 + note D#, 6 + note __, 7 + endchannel + + +Music_TCGRonald_Ch4: + togglenoise $06 + notetype 1 + octave 1 +.MainLoop +.Loop1 + callchannel Branch_fad46 + note D#, 13 + callchannel Branch_fad4f + note D_, 7 + note C_, 6 + note D_, 7 + note E_, 6 + note C_, 7 + note C#, 13 + note D#, 6 + note D_, 7 + loopchannel 3, .Loop1 + callchannel Branch_fad46 + note D#, 13 + callchannel Branch_fad4f + note D_, 7 + note C_, 13 + note E_, 6 + note D_, 3 + note D_, 4 +.Loop2 + note C#, 6 + note C#, 7 + loopchannel 2, .Loop2 +.Loop3 + rept 7 + callchannel Branch_fad46 + note D#, 13 + callchannel Branch_fad4f + note D_, 7 + note C_, 6 + note D_, 7 + note E_, 6 + note C_, 7 + note C#, 13 + note D#, 6 + note D_, 7 + endr + callchannel Branch_fad46 + note D#, 13 + callchannel Branch_fad4f + note D_, 3 + note D_, 4 + rept 4 + note C#, 6 + note C#, 7 + endr + loopchannel 2, .Loop3 +.Loop4 + callchannel Branch_fad46 + note D#, 13 + loopchannel 6, .Loop4 + callchannel Branch_fad46 + notetype 13 + note F_, 4 + notetype 1 + note __, 6 + note D_, 3 + note D_, 4 + note C#, 6 + note C#, 7 +.Loop5 + note D_, 6 + note C#, 7 + loopchannel 2, .Loop5 + note C#, 6 + note D_, 7 + loopchannel 0, .MainLoop + +Branch_fad46: + note C_, 13 + note E_, 6 + note C_, 7 + note C#, 13 + note C_, 6 + note D_, 7 + note C_, 13 + note E_, 6 + note C_, 7 + note C#, 13 + endchannel + +Branch_fad4f: + note C_, 13 + note E_, 6 + note C_, 7 + note C#, 13 + note C_, 6 + endchannel + diff --git a/crysaudio/music/TCG/titlescreen.asm b/crysaudio/music/TCG/titlescreen.asm new file mode 100644 index 00000000..be992edc --- /dev/null +++ b/crysaudio/music/TCG/titlescreen.asm @@ -0,0 +1,544 @@ +Music_TCGTitleScreen: + db $C0 + dw Music_TCGTitleScreen_Ch1 + db $01 + dw Music_TCGTitleScreen_Ch2 + db $02 + dw Music_TCGTitleScreen_Ch3 + db $03 + dw Music_TCGTitleScreen_Ch4 + +Music_TCGTitleScreen_Ch1: + notetype0 7 + dutycycle 0 + vibrato 20, $33 + notetype1 10 + notetype2 8 + octave 3 + note G_, 1 + notetype1 3 + note G_, 1 + note __, 1 + notetype1 10 + notetype2 6 + note F_, 1 + notetype2 8 + note E_, 3 + notetype1 3 + note E_, 1 + notetype1 10 + note G_, 3 + notetype1 3 + note G_, 1 + inc_octave + notetype1 10 + note D_, 5 + notetype1 3 + note D_, 1 + notetype1 13 + notetype2 6 + note C_, 2 + dec_octave + notetype2 8 + note G_, 10 + notetype1 3 + note G_, 2 + notetype1 13 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + notetype1 10 + notetype2 6 + note G_, 1 + notetype2 8 + note G_, 5 + notetype1 3 + note G_, 1 + notetype1 10 + notetype2 6 + note F_, 2 + notetype2 8 + note F_, 2 + notetype0 1 + note E_, 5 + note F_, 4 + note E_, 5 + notetype0 7 + note D_, 1 + notetype1 3 + note D_, 1 + notetype1 10 + note C_, 1 + notetype1 3 + note C_, 1 + notetype1 10 + notetype2 8 + note D_, 11 + notetype1 3 + note D_, 1 + notetype1 13 + note G_, 1 + notetype1 3 + note G_, 1 + note __, 1 + notetype1 10 + notetype2 6 + note F_, 1 + notetype2 8 + note E_, 3 + notetype1 3 + note E_, 1 + notetype1 10 + note G_, 3 + notetype1 3 + note G_, 1 + inc_octave + notetype1 10 + note D_, 5 + notetype1 3 + note D_, 1 + notetype1 13 + notetype2 6 + note E_, 2 + dec_octave + notetype2 8 + note G_, 8 + notetype1 3 + note G_, 2 + notetype1 13 + note E_, 2 + note F_, 2 + note G_, 2 + note G#, 3 + notetype1 3 + note G#, 1 + notetype1 13 + inc_octave + note C_, 3 + notetype1 3 + note C_, 1 + notetype1 10 + note D_, 5 + notetype1 3 + note D_, 1 + notetype1 13 + notetype2 6 + note C_, 2 + notetype2 8 + note G_, 9 + notetype1 3 + note G_, 1 + notetype1 13 + note F_, 2 + note C_, 2 + note D_, 2 +.Loop1 + note E_, 10 + notetype1 3 + note E_, 2 + notetype1 10 + note E_, 1 + notetype1 3 + note E_, 1 + note __, 1 + notetype1 10 + notetype2 6 + note E_, 1 + notetype2 8 + loopchannel 2, .Loop1 + note E_, 12 + notetype1 3 + note E_, 2 + notetype1 10 + note D_, 1 + note C_, 1 + note D_, 1 + notetype1 3 + note D_, 1 + note __, 1 + notetype1 10 + notetype2 6 + note G_, 1 + notetype2 8 + note G_, 8 + notetype1 3 + note G_, 2 + notetype1 10 + notetype0 1 + notetype2 7 + note G_, 5 + note G_, 4 + note G_, 5 + notetype2 8 + notetype0 7 + note G_, 9 + notetype1 3 + note G_, 1 + notetype1 10 + note F_, 2 + note C_, 2 + note D_, 2 + note E_, 10 + notetype1 3 + note E_, 2 + notetype1 10 + note C_, 1 + notetype1 3 + note C_, 1 + note __, 1 + notetype2 6 + notetype1 10 + note E_, 1 + notetype2 8 + note E_, 6 + notetype1 3 + note E_, 2 + notetype1 10 + note D_, 3 + notetype1 3 + note D_, 1 + notetype1 10 + note C_, 3 + notetype1 3 + note C_, 1 + notetype1 10 + note C_, 6 + notetype1 3 + note C_, 2 + dec_octave + notetype1 10 + note B_, 5 + notetype1 3 + note B_, 2 + notetype1 10 + inc_octave + notetype2 6 + note C_, 1 + notetype2 8 + note C_, 8 + note C_, 8 + note C_, 8 + notetype1 3 + note C_, 8 + endchannel + + +Music_TCGTitleScreen_Ch2: + notetype0 7 + dutycycle 0 + vibrato 20, $33 + notetype1 8 + notetype2 8 + octave 2 + note B_, 1 + notetype1 2 + note B_, 1 + note __, 1 + inc_octave + notetype1 8 + notetype2 6 + note D_, 1 + notetype2 8 + note C_, 3 + notetype1 2 + note C_, 1 + notetype1 8 + note E_, 3 + note __, 1 + note G_, 5 + note __, 1 + notetype2 6 + note G_, 2 + notetype2 8 + note E_, 10 + note __, 2 + note C_, 1 + note __, 2 + notetype2 6 + note E_, 1 + notetype2 8 + note F_, 5 + note __, 1 + notetype2 6 + note C_, 2 + notetype2 7 + note C_, 2 + notetype2 8 + note C_, 2 + dec_octave + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 4 + note A_, 1 + note __, 2 + inc_octave + notetype2 6 + note C_, 1 + dec_octave + notetype2 8 + note B_, 3 + note __, 1 + note B_, 1 + note __, 2 + inc_octave + notetype2 6 + note D_, 1 + notetype2 8 + note C_, 3 + notetype1 2 + note C_, 1 + notetype1 8 + note E_, 3 + note __, 1 + note G_, 5 + note __, 1 + notetype2 6 + note G_, 2 + notetype2 8 + note E_, 8 + note __, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 3 + note __, 1 + note G#, 3 + note __, 1 + note G#, 5 + note __, 1 + notetype2 6 + note F_, 2 + notetype2 8 + note G#, 9 + note __, 1 + note G#, 2 + note F_, 2 + note G#, 2 + inc_octave + note C_, 10 + note __, 2 + dec_octave + note A_, 1 + notetype1 2 + note A_, 1 + note __, 1 + notetype1 8 + inc_octave + notetype2 6 + note C_, 1 + notetype2 8 + dec_octave + note B_, 10 + note __, 2 + note G_, 1 + notetype1 2 + note G_, 1 + note __, 1 + notetype1 8 + notetype2 6 + note B_, 1 + notetype2 8 + note A_, 12 + notetype1 2 + note A_, 2 + notetype1 8 + note B_, 1 + note A_, 1 + note B_, 1 + notetype1 2 + note B_, 1 + note __, 1 + notetype1 8 + inc_octave + notetype2 6 + note D_, 1 + notetype2 8 + note D_, 8 + note __, 2 + notetype0 1 + notetype2 7 + note D_, 5 + note D_, 4 + note D_, 5 + notetype0 7 + notetype2 8 + note C_, 9 + note __, 1 + note C_, 2 + dec_octave + notetype2 7 + note G#, 2 + notetype2 8 + note G#, 2 + note G_, 10 + note __, 2 + note G_, 1 + note __, 2 + notetype2 6 + note G_, 1 + notetype2 8 + note A_, 6 + note __, 2 + note F#, 3 + note __, 1 + note A_, 3 + note __, 1 + note F_, 6 + note __, 2 + note F_, 5 + note __, 2 + notetype2 6 + note F_, 1 + notetype2 8 + note F_, 7 + note __, 1 + notetype0 1 + notetype2 8 + note F_, 14 + note __, 5 + note D_, 13 + note __, 5 + note F_, 14 + note __, 5 + notetype0 7 + note E_, 8 + notetype1 2 + note E_, 8 + endchannel + + +Music_TCGTitleScreen_Ch3: + notetype0 7 + notetype2 14 + notetype1 1 + octave 3 + note __, 4 + callchannel Branch_f52f0 + note F_, 4 + note F_, 4 + note E_, 4 + note E_, 4 + note D_, 4 + note D_, 4 + note G_, 4 + note G_, 4 + inc_octave + callchannel Branch_f52f0 +.Loop1 + note F_, 4 + loopchannel 4, .Loop1 +.Loop2 + note A#, 4 + loopchannel 4, .Loop2 +.Loop3 + note A_, 2 + note A_, 2 + note __, 2 + note A_, 1 + note A_, 1 + loopchannel 2, .Loop3 +.Loop4 + note G_, 2 + note G_, 2 + note __, 2 + note G_, 1 + note G_, 1 + loopchannel 2, .Loop4 +.Loop5 + note F_, 2 + note F_, 2 + note __, 2 + note F_, 1 + note F_, 1 + loopchannel 2, .Loop5 +.Loop6 + note E_, 2 + note E_, 2 + note __, 2 + note E_, 1 + note E_, 1 + loopchannel 2, .Loop6 +.Loop7 + note G#, 4 + loopchannel 4, .Loop7 +.Loop8 + note G_, 4 + loopchannel 4, .Loop8 +.Loop9 + note F#, 4 + loopchannel 4, .Loop9 +.Loop10 + note G_, 4 + loopchannel 4, .Loop10 + inc_octave + note C_, 4 + note C_, 4 + notetype0 1 + note C_, 9 + note C_, 10 + dec_octave + note G_, 9 + note G_, 9 + note G_, 9 + note G_, 10 + notetype0 7 + note C_, 8 + endchannel + +Branch_f52f0: + note C_, 4 + note C_, 4 + dec_octave + note B_, 4 + note B_, 4 + note A_, 4 + note A_, 4 + note G_, 4 + note G_, 4 + endchannel + + +Music_TCGTitleScreen_Ch4: + togglenoise $06 + notetype 7 + octave 1 + note __, 4 +.Loop1 + callchannel Branch_f5312 + loopchannel 16, .Loop1 +.Loop2 + callchannel Branch_f531e + loopchannel 8, .Loop2 +.Loop3 + callchannel Branch_f5312 + loopchannel 10, .Loop3 + note C#, 8 + endchannel + +Branch_f5312: + notetype 7 + note C#, 2 + note D_, 2 + note C#, 2 + notetype 1 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + endchannel + +Branch_f531e: + notetype 7 + note C#, 2 + note C#, 2 + note __, 2 + notetype 1 + note C#, 4 + note D_, 3 + note D_, 4 + note D_, 3 + endchannel + diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm new file mode 100644 index 00000000..068c7e40 --- /dev/null +++ b/crysaudio/music/TCG2/credits.asm @@ -0,0 +1,4353 @@ +Music_TCG2Credits: + db $C0 + dw Music_TCG2Credits_Ch1 + db $01 + dw Music_TCG2Credits_Ch2 + db $02 + dw Music_TCG2Credits_Ch3 + db $03 + dw Music_TCG2Credits_Ch4 + +Music_TCG2Credits_Ch2: + notetype1 10 + dutycycle 2 + notetype1 15 + notetype0 1 + octave 1 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + notetype1 13 + note __, 15 + inc_octave + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + inc_octave + note A_, 14 + note A_, 15 + inc_octave + note D_, 14 + note D_, 15 + dec_octave + dec_octave + dec_octave + note A_, 14 + note A_, 15 + inc_octave + note E_, 14 + note E_, 15 + note B_, 14 + note B_, 15 + inc_octave + note G_, 14 + note G_, 15 + dec_octave + note D_, 14 + note D_, 15 + note A_, 14 + note A_, 15 + inc_octave + note A_, 14 + note A_, 15 + inc_octave + note D_, 14 + note D_, 15 + dec_octave + dec_octave + dec_octave + note A_, 14 + note A_, 15 + inc_octave + note E_, 14 + note E_, 15 + note B_, 14 + note B_, 15 + inc_octave + note G_, 14 + note G_, 15 + dec_octave + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + inc_octave + note A_, 14 + note A_, 15 + inc_octave + note D_, 14 + note D_, 15 + dec_octave + dec_octave + dec_octave + note A_, 14 + note A_, 15 + inc_octave + note E_, 14 + note E_, 15 + note B_, 14 + note B_, 15 + inc_octave + note G_, 14 + note G_, 15 + dec_octave + note D_, 14 + note D_, 15 + note A_, 14 + note A_, 15 + inc_octave + note A_, 14 + note A_, 15 + inc_octave + note D_, 14 + note D_, 15 + dec_octave + dec_octave + note D_, 14 + note D_, 15 + note A_, 14 + note A_, 15 + inc_octave + note F_, 14 + note F_, 15 + note D#, 14 + note D#, 15 + dec_octave + note G_, 14 + note G_, 15 + inc_octave + note E_, 14 + note E_, 15 + inc_octave + note D_, 14 + note D_, 15 + dec_octave + note G_, 14 + note G_, 15 + dec_octave + dec_octave + note G_, 14 + note G_, 15 + inc_octave + note D#, 14 + note D#, 15 + inc_octave + note D_, 14 + note D_, 15 + dec_octave + note C_, 14 + note __, 15 + note F#, 14 + note F#, 15 + inc_octave + note C#, 14 + note C#, 15 + note A_, 14 + note A_, 15 + inc_octave + note F#, 14 + note F#, 15 + dec_octave + dec_octave + dec_octave + note B_, 14 + note B_, 15 + inc_octave + note G_, 14 + note G_, 15 + note B_, 14 + note B_, 15 + inc_octave + note G_, 14 + note G_, 15 + dec_octave + note E_, 14 + note E_, 15 + inc_octave + note C_, 14 + note C_, 15 + note E_, 14 + note E_, 15 + note C_, 14 + note C_, 15 + dec_octave + note E_, 14 + note E_, 15 + inc_octave + note C_, 14 + note C_, 15 + note E_, 14 + note E_, 15 + note C_, 14 + note C_, 15 + dec_octave + note G_, 14 + note G_, 15 + inc_octave + note G_, 14 + note G_, 15 + inc_octave + note C_, 14 + note C_, 15 + dec_octave + note D#, 14 + note D#, 15 + dec_octave + note A_, 14 + note A_, 15 + inc_octave + note G_, 14 + dutycycle 1 + octave 2 + notetype1 10 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + notetype1 14 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 2 + note D_, 1 + octave 1 + vibrato 29, $33 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 4 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 4 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + octave 3 + note B_, 3 + inc_octave + note C_, 11 + note C_, 15 + note C_, 14 + dec_octave + note A_, 15 + note F_, 14 + note F_, 15 + inc_octave + note C_, 14 + note C_, 15 + dec_octave + note B_, 14 + dutycycle 1 + vibrato 29, $33 + octave 1 + notetype1 10 + note G_, 15 + notetype1 14 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 4 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + inc_octave + note D_, 4 + note D_, 3 + note D_, 7 + notetype1 10 + note G_, 15 + notetype1 14 + note G_, 14 + note G_, 15 + note G_, 4 + note G_, 3 + note G_, 7 + note G_, 15 + note D_, 14 + dec_octave + note G_, 15 + note G_, 4 + note F#, 3 + note F#, 4 + note F_, 3 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note G_, 14 + notetype1 10 + inc_octave + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 3 + notetype1 14 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + dec_octave + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 4 + note B_, 3 + note A#, 4 + note A_, 3 + notetype0 4 + note E_, 15 + note E_, 14 + note A_, 15 + note A_, 14 + notetype0 1 + inc_octave + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + note D_, 14 + note D_, 15 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + dec_octave + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note A_, 4 + dutycycle 2 + notetype1 13 + notetype0 1 + vibrato 0, $33 + octave 2 + note B_, 10 + inc_octave + notetype0 4 + note G_, 15 + note G_, 14 + notetype0 1 + dutycycle 1 + vibrato 29, $33 + notetype1 14 + octave 1 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note G_, 4 + note G_, 3 + note G_, 7 + inc_octave + notetype0 4 + note C_, 15 + note C_, 14 + notetype0 1 + dec_octave + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 4 + note B_, 3 + note A#, 4 + note A_, 3 + notetype0 4 + note E_, 15 + note E_, 14 + notetype0 1 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note B_, 14 + inc_octave + note C_, 15 + note C#, 14 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + note D_, 14 + note D_, 15 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + dec_octave + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note G_, 15 + note G_, 14 + note G_, 4 + note F#, 4 + note F#, 4 + note F_, 3 + note D_, 14 + note D_, 15 + note D_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note A_, 14 + note __, 15 + note B_, 14 + note B_, 15 + note G_, 14 + inc_octave + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + dec_octave + note F#, 4 + note G_, 3 + note G_, 7 + notetype0 4 + note C_, 15 + note C_, 14 + note B_, 15 + note B_, 14 + note A#, 15 + note A#, 14 + notetype0 1 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + inc_octave + note D#, 4 + note E_, 3 + note E_, 7 + note A_, 15 + note A_, 14 + note A_, 15 + note E_, 14 + note E_, 15 + dec_octave + note A_, 14 + inc_octave + note E_, 15 + note D#, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + dec_octave + note A_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note E_, 14 + note E_, 15 + note E_, 14 + note F#, 15 + note F#, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + inc_octave + note D_, 4 + note D_, 3 + note D_, 7 + notetype1 10 + note G_, 15 + notetype1 14 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 4 + note G_, 3 + note G_, 4 + note G_, 3 + dec_octave + notetype0 4 + note G_, 15 + note G_, 14 + notetype0 1 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note A_, 15 + note B_, 14 + inc_octave + notetype0 4 + note C_, 15 + note C_, 14 + dec_octave + note B_, 15 + note B_, 14 + notetype0 1 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + inc_octave + note C_, 14 + note C#, 15 + note D_, 4 + note D_, 3 + note D_, 7 + note D_, 14 + dec_octave + note A_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note E_, 15 + note F#, 14 + notetype0 4 + note G_, 15 + note G_, 14 + note F#, 15 + note F#, 14 + note F_, 15 + note F_, 14 + note E_, 15 + note E_, 14 + notetype0 1 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note B_, 14 + inc_octave + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 4 + note C_, 3 + note C_, 4 + note C_, 3 + dec_octave + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + notetype1 10 + note D_, 15 + notetype1 14 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note A_, 14 + inc_octave + note D_, 15 + note B_, 7 + note __, 7 + note A_, 8 + note __, 7 + note G_, 7 + note __, 7 + note F#, 8 + note __, 7 + note E_, 7 + note __, 7 + note D_, 8 + note __, 7 + note C_, 7 + note __, 7 + dutycycle 1 + vibrato 29, $33 + notetype1 14 + octave 1 + note G_, 15 + note G_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + note D_, 14 + note __, 15 + dutycycle 2 + notetype1 13 + notetype0 1 + vibrato 0, $33 + octave 3 + note __, 4 + note C_, 3 + note C_, 7 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note __, 15 + dutycycle 1 + vibrato 29, $33 + notetype1 14 + octave 1 + note D_, 14 + octave 1 + note G_, 15 + note G_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + note D_, 14 + note __, 15 + dutycycle 2 + notetype1 13 + notetype0 1 + vibrato 0, $33 + octave 3 + note __, 4 + note C_, 3 + note C_, 7 + note C_, 15 + note C_, 14 + note C_, 15 + dutycycle 1 + vibrato 29, $33 + notetype1 14 + octave 1 + note A#, 4 + note B_, 3 + note B_, 7 + note B_, 15 + inc_octave + note C_, 14 + note C#, 15 + note D_, 14 + octave 1 + note G_, 15 + note G_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + note D_, 14 + note __, 15 + dutycycle 2 + notetype1 13 + notetype0 1 + vibrato 0, $33 + octave 3 + note __, 4 + note C_, 3 + note C_, 7 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note __, 15 + dutycycle 1 + vibrato 29, $33 + notetype1 14 + octave 1 + note D_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + note D_, 14 + note __, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note A#, 4 + note B_, 3 + note B_, 4 + note B_, 3 + note B_, 15 + inc_octave + note C_, 7 + note __, 7 + note C#, 15 + note D_, 11 + note __, 3 + dec_octave + note G_, 15 + note G_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + note D_, 14 + note __, 15 + note C_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + inc_octave + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 15 + dec_octave + note A_, 14 + note D_, 15 + note A_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + inc_octave + note G_, 14 + note __, 15 + note D_, 14 + dec_octave + note G_, 15 + note C_, 14 + note D_, 15 + note A_, 14 + inc_octave + note C_, 15 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 15 + dec_octave + note A_, 14 + note D_, 15 + note A_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + note D_, 14 + note __, 15 + note C_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + inc_octave + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 15 + dec_octave + note A_, 14 + note D_, 15 + note A_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + inc_octave + note G_, 14 + note __, 15 + note D_, 14 + dec_octave + note G_, 15 + note D_, 14 + note G_, 15 + note G_, 14 + inc_octave + inc_octave + note D_, 15 + note C_, 14 + dec_octave + note B_, 15 + dec_octave + note G_, 14 + note A_, 15 + note B_, 14 + inc_octave + notetype1 7 + note C_, 15 + note C_, 14 + notetype1 14 + note C_, 15 + note C_, 14 + note C_, 15 + dec_octave + note G_, 14 + note G_, 15 + inc_octave + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 15 + note C_, 14 + dec_octave + note G_, 15 + note C_, 14 + note C_, 15 + inc_octave + note C_, 14 + dec_octave + note A_, 15 + note A#, 14 + note B_, 15 + note B_, 14 + note B_, 8 + note __, 7 + note A#, 4 + note A#, 3 + note A#, 4 + note B_, 3 + note B_, 15 + note F#, 14 + note F_, 15 + note D#, 14 + note E_, 15 + note B_, 14 + inc_octave + note D_, 15 + note E_, 14 + note E_, 15 + dec_octave + note B_, 14 + note E_, 15 + note E_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note E_, 14 + note A_, 15 + note E_, 14 + note D#, 15 + note D_, 14 + note D_, 15 + note A_, 14 + inc_octave + note C_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + dec_octave + note D_, 15 + note D_, 14 +.Loop1 + note G#, 11 + note __, 4 + note G#, 11 + note __, 3 + loopchannel 8, .Loop1 +.Loop2 + note C#, 11 + note __, 4 + note C#, 11 + note __, 3 + loopchannel 8, .Loop2 +.Loop3 + note G_, 11 + note __, 4 + note G_, 11 + note __, 3 + loopchannel 8, .Loop3 +.Loop4 + note C#, 11 + note __, 4 + note C#, 11 + note __, 3 + loopchannel 4, .Loop4 +.Loop5 + note C_, 11 + note __, 4 + note C_, 11 + note __, 3 + loopchannel 4, .Loop5 + note B_, 8 + inc_octave + note B_, 4 + note __, 3 + note A_, 4 + note __, 3 + note B_, 4 + note __, 3 + note F#, 8 + note D_, 4 + note __, 3 + dec_octave + note A_, 4 + note __, 3 + note B_, 4 + note __, 3 + inc_octave + note D_, 4 + note __, 4 + note F#, 4 + note __, 3 + note A_, 4 + note __, 3 + note B_, 4 + note __, 3 + dec_octave + note E_, 8 + inc_octave + note E_, 4 + note __, 3 + note D_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 8 + note G_, 4 + note __, 3 + note E_, 4 + note __, 3 + note B_, 4 + note __, 3 + inc_octave + note E_, 4 + note __, 4 + note G_, 4 + note __, 3 + note B_, 4 + note __, 3 + inc_octave + note E_, 4 + note __, 3 + dec_octave + dec_octave + note A_, 11 + note __, 4 + note A_, 11 + note __, 3 + note A_, 11 + note __, 4 + note A_, 11 + note __, 3 + note A_, 11 + note __, 4 + note A_, 11 + note __, 3 + inc_octave + note C_, 11 + note __, 4 + note C#, 11 + note __, 3 + notetype0 2 + note D_, 15 + note D_, 14 + dec_octave + note D_, 15 + note D_, 14 + notetype0 1 +.Loop6 + rept 4 + note G_, 11 + note __, 4 + note G_, 11 + note __, 3 + endr + rept 4 + note D_, 11 + note __, 4 + note D_, 11 + note __, 3 + endr + loopchannel 3, .Loop6 +.Loop7 + note G_, 11 + note __, 4 + note D_, 11 + note __, 3 + loopchannel 4, .Loop7 + notetype0 4 + note G_, 15 + note G_, 14 + notetype0 2 + note G_, 14 + endchannel + + +Music_TCG2Credits_Ch1: + notetype1 10 + dutycycle 2 + notetype1 13 + notetype0 1 + note __, 15 + octave 2 + note D_, 14 + note A_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 4 + note __, 15 + note E_, 14 + note G_, 15 + inc_octave + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 4 + note __, 15 + dec_octave + note D_, 14 + note A_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 4 + note __, 15 + note E_, 14 + note G_, 15 + inc_octave + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 4 + notetype1 13 + dec_octave + dec_octave + note G_, 16 + note G_, 13 + inc_octave + note G_, 16 + note G_, 13 + note G_, 16 + note G_, 13 + inc_octave + note B_, 16 + note B_, 13 + dec_octave + dec_octave + note D_, 16 + note D_, 13 + inc_octave + note D_, 16 + note D_, 13 + note F_, 16 + note F_, 13 + inc_octave + note C_, 16 + note C_, 13 + dec_octave + dec_octave + note G_, 16 + note G_, 13 + inc_octave + note G_, 16 + note G_, 13 + note B_, 16 + note B_, 13 + inc_octave + note B_, 16 + note B_, 13 + dec_octave + dec_octave + note D_, 16 + note D_, 13 + inc_octave + note D_, 16 + note D_, 13 + note F_, 16 + note F_, 13 + inc_octave + note C_, 16 + note C_, 13 + dec_octave + dec_octave + note G_, 16 + note G_, 13 + inc_octave + note G_, 16 + note G_, 13 + note G_, 16 + note G_, 13 + inc_octave + note B_, 16 + note B_, 13 + dec_octave + dec_octave + note D_, 16 + note D_, 13 + inc_octave + note D_, 16 + note D_, 13 + note F_, 16 + note F_, 13 + inc_octave + note C_, 16 + note C_, 13 + dec_octave + dec_octave + note G_, 16 + note G_, 13 + inc_octave + note G_, 16 + note G_, 13 + note B_, 16 + note B_, 13 + inc_octave + note B_, 16 + note B_, 13 + dec_octave + dec_octave + note G_, 16 + note G_, 13 + inc_octave + note F_, 16 + note F_, 13 + note B_, 16 + note B_, 13 + inc_octave + note D_, 16 + note D_, 13 + dec_octave + note C_, 16 + note C_, 13 + inc_octave + note D_, 16 + note D_, 13 + note G_, 16 + note G_, 13 + inc_octave + note C_, 16 + note C_, 13 + dec_octave + dec_octave + dec_octave + note C_, 16 + note C_, 13 + inc_octave + note D_, 16 + note D_, 13 + note G_, 16 + note G_, 13 + inc_octave + note C_, 16 + note C_, 13 + dec_octave + dec_octave + note B_, 16 + note B_, 13 + inc_octave + note A_, 16 + note A_, 13 + inc_octave + note D_, 16 + note D_, 13 + inc_octave + note D_, 16 + note D_, 13 + dec_octave + dec_octave + dec_octave + note E_, 16 + note E_, 13 + inc_octave + note F#, 16 + note F#, 13 + inc_octave + note D_, 16 + note D_, 13 + note F#, 16 + note F#, 13 + dec_octave + dec_octave + note A_, 16 + note A_, 13 + inc_octave + note B_, 16 + note B_, 13 + inc_octave + note G_, 16 + note G_, 13 + dec_octave + note B_, 16 + note B_, 13 + dec_octave + note A_, 16 + note A_, 13 + inc_octave + note B_, 16 + note B_, 13 + inc_octave + note G_, 16 + note G_, 13 + dec_octave + note B_, 16 + note B_, 13 + note C_, 16 + note C_, 13 + inc_octave + note D#, 16 + note D#, 13 + inc_octave + note D_, 16 + note D_, 13 + dec_octave + note D_, 16 + note D_, 13 + dec_octave + note D_, 16 + note D_, 13 + inc_octave + note E_, 16 + note E_, 13 + note F#, 15 + note D_, 14 + note C_, 15 + dec_octave + note A_, 14 + dec_octave + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + inc_octave + note A_, 14 + note B_, 15 + inc_octave + note D_, 14 + dec_octave + dec_octave + dec_octave + note D_, 15 + note A_, 14 + inc_octave + note D_, 15 + note E_, 14 + note F_, 15 + note B_, 14 + inc_octave + note C_, 15 + note G_, 14 + dec_octave + dec_octave + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note A_, 14 + note B_, 15 + inc_octave + note A_, 14 + note B_, 15 + note __, 14 + dec_octave + dec_octave + note D_, 15 + note A_, 14 + inc_octave + note D_, 15 + note E_, 14 + note F_, 15 + note B_, 14 + inc_octave + note C_, 15 + note __, 14 + dec_octave + dec_octave + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + inc_octave + note A_, 14 + note B_, 15 + inc_octave + note D_, 14 + dec_octave + dec_octave + dec_octave + note D_, 15 + note A_, 14 + inc_octave + note D_, 15 + note E_, 14 + note F_, 15 + note B_, 14 + inc_octave + note C_, 15 + note G_, 14 + dec_octave + dec_octave + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note A_, 14 + note B_, 15 + inc_octave + note A_, 14 + note B_, 15 + inc_octave + note D_, 14 + note __, 15 + dec_octave + dec_octave + note D_, 14 + note F_, 15 + note A_, 14 + note B_, 15 + inc_octave + note F_, 14 + note D_, 15 + note D#, 14 + dec_octave + note C_, 15 + note G_, 14 + inc_octave + note D_, 15 + note E_, 14 + note G_, 15 + inc_octave + note D_, 14 + note C_, 15 + dec_octave + note G_, 14 + note __, 15 + dec_octave + note G_, 14 + inc_octave + note D_, 15 + note D#, 14 + note G_, 15 + inc_octave + note D_, 14 + note C_, 15 + dec_octave + note C_, 14 + note __, 15 + dec_octave + note F#, 14 + note A_, 15 + inc_octave + note C#, 14 + note D_, 15 + note A_, 14 + inc_octave + note D_, 15 + note F#, 14 + note __, 15 + dec_octave + dec_octave + dec_octave + note B_, 14 + inc_octave + note F#, 15 + note G_, 14 + inc_octave + note D_, 15 + dec_octave + note B_, 14 + inc_octave + note F#, 15 + note G_, 14 + note __, 15 + dec_octave + note E_, 14 + inc_octave + note C_, 15 + dec_octave + note B_, 14 + inc_octave + note C_, 15 + note G_, 14 + note C_, 15 + dec_octave + note B_, 14 + note __, 15 + note A_, 14 + inc_octave + note C_, 15 + note G_, 14 + note F#, 15 + note D_, 14 + note C_, 15 + note D_, 14 + note __, 15 + dec_octave + note A_, 14 + inc_octave + note C_, 15 + dec_octave + note B_, 14 + inc_octave + note C_, 15 + note G_, 14 + dec_octave + note A_, 15 + inc_octave + note C_, 10 + notetype1 13 + note D_, 4 + notetype0 4 + note D_, 15 + note G_, 14 + notetype0 1 + octave 3 + note C_, 8 + note C_, 7 + note E_, 7 + note C_, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note B_, 8 + note E_, 7 + note E_, 7 + note B_, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note C_, 8 + note E_, 7 + note D#, 7 + note C_, 7 + note A_, 8 + note D#, 7 + note F#, 7 + note A_, 7 + inc_octave + note C_, 8 + dec_octave + note F#, 7 + note A_, 7 + inc_octave + note C_, 7 + dec_octave + note F#, 8 + note A_, 7 + note A_, 7 + note F#, 7 + note D_, 8 + note A_, 7 + note F#, 7 + note D_, 7 + note A_, 8 + note F#, 7 + note F#, 7 + note A_, 7 + inc_octave + note D_, 8 + dec_octave + note F#, 7 + note F#, 7 + inc_octave + note D_, 7 + dec_octave + note A_, 8 + note F#, 7 + note F#, 7 + note A_, 7 + dec_octave + note B_, 8 + inc_octave + note F#, 7 + note E_, 7 + dec_octave + note B_, 7 + inc_octave + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note B_, 8 + note E_, 7 + note G_, 7 + note B_, 7 + inc_octave + note D_, 8 + dec_octave + note G_, 7 + note G_, 7 + inc_octave + note D_, 7 + dec_octave + note C_, 8 + note G_, 7 + note E_, 7 + note C_, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note B_, 8 + note E_, 7 + note E_, 7 + note B_, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note C_, 8 + note G_, 7 + note E_, 7 + note C_, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note B_, 8 + note E_, 7 + note E_, 7 + note B_, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note C_, 8 + note E_, 7 + note D_, 7 + note C_, 7 + note G_, 8 + note D_, 7 + inc_octave + note C_, 7 + dec_octave + note G_, 7 + inc_octave + note D_, 8 + note C_, 7 + note G_, 7 + note D_, 7 + note D_, 8 + note G_, 7 + note C_, 7 + note D_, 7 + dec_octave + note B_, 8 + inc_octave + note C_, 7 + dec_octave + note G_, 7 + note B_, 7 + note D_, 8 + note G_, 7 + note C_, 7 + note D_, 7 + dec_octave + note B_, 8 + inc_octave + note C_, 7 + note D_, 7 + dec_octave + note B_, 7 + inc_octave + note G_, 8 + note D_, 7 + note B_, 7 + note G_, 7 + note C_, 8 + note B_, 7 + note E_, 7 + note C_, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note B_, 8 + note E_, 7 + note E_, 7 + note B_, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note C_, 8 + note E_, 7 + note D#, 7 + note C_, 7 + note A_, 8 + note D#, 7 + note D#, 7 + note A_, 7 + inc_octave + note C_, 8 + dec_octave + note D#, 7 + note D#, 7 + inc_octave + note C_, 7 + note D#, 8 + dec_octave + note D#, 7 + note A_, 7 + inc_octave + note D#, 7 + dec_octave + note D_, 8 + note A_, 7 + note F#, 7 + note D_, 7 + note A_, 8 + note F#, 7 + note F#, 7 + note A_, 7 + inc_octave + note D_, 8 + dec_octave + note F#, 7 + note F#, 7 + inc_octave + note D_, 7 + dec_octave + note A_, 8 + note F#, 7 + note F#, 7 + note A_, 7 + dec_octave + note A#, 8 + inc_octave + note F#, 7 + note C#, 7 + dec_octave + note A#, 7 + inc_octave + note E_, 8 + note C#, 7 + note C#, 7 + note E_, 7 + note G_, 8 + note C#, 7 + note E_, 7 + note G_, 7 + note A#, 8 + note E_, 7 + note G_, 7 + note A#, 7 + dec_octave + note G_, 8 + inc_octave + note G_, 7 + note C_, 7 + dec_octave + note G_, 7 + inc_octave + note D_, 8 + note C_, 7 + note C_, 7 + note D_, 7 + note G_, 8 + note C_, 7 + note C_, 7 + note G_, 7 + note D_, 8 + note C_, 7 + note C_, 7 + note D_, 7 + note G_, 8 + note C_, 7 + inc_octave + note C_, 7 + dec_octave + note G_, 7 + inc_octave + note D_, 8 + note C_, 7 + note C_, 7 + note D_, 7 + note G_, 8 + note C_, 7 + note C_, 7 + note G_, 7 + note D_, 8 + note C_, 7 + note C_, 7 + note D_, 7 + dec_octave + dec_octave + note G_, 8 + inc_octave + inc_octave + note C_, 7 + dec_octave + note C_, 7 + dec_octave + note G_, 7 + inc_octave + note D_, 8 + note C_, 7 + note G_, 7 + note D_, 7 + inc_octave + note C_, 8 + dec_octave + note G_, 7 + inc_octave + note D_, 7 + note C_, 7 + note G_, 8 + note D_, 7 + note D_, 7 + note G_, 7 + note F#, 8 + note D_, 7 + note D_, 7 + note F#, 7 + note C_, 8 + note D_, 7 + dec_octave + note A_, 7 + inc_octave + note C_, 7 + dec_octave + note F#, 8 + note A_, 7 + note D_, 7 + note F#, 7 + octave 2 + note D_, 4 + note E_, 4 + note F#, 4 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note D_, 8 + note D_, 7 + note D_, 7 + note __, 7 + note G_, 8 + note D_, 7 + note D_, 7 + note G_, 7 + note A_, 8 + note D_, 7 + note D_, 7 + note A_, 7 + note B_, 8 + note D_, 7 + note D_, 7 + note B_, 7 + note __, 8 + note D_, 7 + note D_, 7 + note __, 7 + note F#, 8 + note D_, 7 + note D_, 7 + note F#, 7 + note A_, 8 + note D_, 7 + note D_, 7 + note A_, 7 + inc_octave + note D_, 8 + dec_octave + note D_, 7 + note D_, 7 + inc_octave + note D_, 7 + note __, 8 + dec_octave + note D_, 7 + note D_, 7 + note __, 7 + note F_, 8 + note D_, 7 + note D_, 7 + note F_, 7 + note A_, 8 + note D_, 7 + note D_, 7 + note A_, 7 + inc_octave + note D_, 8 + dec_octave + note D_, 7 + note D_, 7 + inc_octave + note D_, 7 + note __, 8 + dec_octave + note D_, 7 + note D_, 7 + note __, 7 + note F_, 8 + note D_, 7 + note D_, 7 + note F_, 7 + note A_, 8 + note D_, 7 + note D_, 7 + note A_, 7 + note B_, 8 + note D_, 7 + note D_, 7 + note B_, 7 + note __, 8 + note D_, 7 + note E_, 7 + note __, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note A_, 8 + note E_, 7 + note E_, 7 + note A_, 7 + note B_, 8 + note E_, 7 + note E_, 7 + note B_, 7 + note __, 8 + note E_, 7 + note D_, 7 + note __, 7 + note G_, 8 + note D_, 7 + note D_, 7 + note G_, 7 + note A_, 8 + note D_, 7 + note D_, 7 + note A_, 7 + note B_, 8 + note D_, 7 + note D_, 7 + note B_, 7 + note __, 8 + note D_, 7 + note E_, 7 + note __, 7 + note G_, 8 + note E_, 7 + inc_octave + note E_, 7 + dec_octave + note G_, 7 + note E_, 8 + inc_octave + note E_, 7 + note G_, 7 + dec_octave + note E_, 7 + note E_, 8 + inc_octave + note G_, 7 + note F_, 3 + note F#, 11 + note F#, 8 + note F#, 7 + note E_, 7 + note F#, 7 + note D_, 8 + note E_, 7 + note C_, 7 + note D_, 7 + dec_octave + note B_, 8 + inc_octave + note C_, 7 + dec_octave + note A_, 7 + note B_, 7 + note G_, 8 + note A_, 7 + note A_, 7 + note G_, 7 + note __, 8 + note A_, 7 + note D_, 7 + note __, 7 + note G_, 8 + note D_, 7 + note D_, 7 + note G_, 7 + note A_, 8 + note D_, 7 + note D_, 7 + note A_, 7 + note B_, 8 + note D_, 7 + note D_, 7 + note B_, 7 + note __, 8 + note D_, 7 + note D_, 7 + note __, 7 + note F#, 8 + note D_, 7 + note D_, 7 + note F#, 7 + note A_, 8 + note D_, 7 + note D_, 7 + note A_, 7 + inc_octave + note D_, 8 + dec_octave + note D_, 7 + note D_, 7 + inc_octave + note D_, 7 + note __, 8 + dec_octave + note D_, 7 + note D_, 7 + note __, 7 + note F_, 8 + note D_, 7 + inc_octave + note D_, 7 + dec_octave + note F_, 7 + note D_, 8 + inc_octave + note D_, 7 + note F_, 7 + dec_octave + note D_, 7 + note D_, 8 + inc_octave + note F_, 7 + note D#, 3 + note E_, 11 + note E_, 8 + note E_, 7 + note D_, 7 + note E_, 7 + note C_, 8 + note D_, 7 + dec_octave + note B_, 7 + inc_octave + note C_, 7 + dec_octave + note A_, 8 + note B_, 7 + note G#, 7 + note A_, 7 + note A_, 8 + note G#, 7 + note B_, 7 + note A_, 7 + note __, 8 + note B_, 7 + note E_, 7 + note __, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + inc_octave + note C_, 8 + dec_octave + note E_, 7 + note E_, 7 + inc_octave + note C_, 7 + note E_, 8 + dec_octave + note E_, 7 + note E_, 7 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note E_, 7 + note D#, 7 + note __, 7 + note A_, 8 + note D#, 7 + note D#, 7 + note A_, 7 + inc_octave + note C_, 8 + dec_octave + note D#, 7 + note D#, 7 + inc_octave + note C_, 7 + note D#, 8 + dec_octave + note D#, 7 + note D#, 7 + inc_octave + note D#, 7 + note __, 8 + dec_octave + note D#, 7 + note A_, 7 + note __, 7 + inc_octave + note C_, 8 + dec_octave + note A_, 7 + note A_, 7 + inc_octave + note C_, 7 + note D#, 8 + dec_octave + note A_, 7 + inc_octave + note C_, 7 + note D#, 7 + note G_, 8 + note C_, 7 + note C_, 7 + note F#, 4 + note G_, 3 + note F#, 8 + note F#, 7 + note E_, 7 + note F#, 7 + note D_, 8 + note E_, 7 + note C_, 7 + note D_, 7 + dec_octave + note B_, 8 + inc_octave + note C_, 7 + dec_octave + note A_, 7 + note B_, 7 + note G_, 8 + note A_, 7 + note F#, 7 + note G_, 7 + octave 3 + note __, 15 + dec_octave + note D_, 14 + note G_, 15 + note B_, 14 + inc_octave + note D_, 15 + dec_octave + note G_, 14 + note B_, 15 + note F_, 7 + inc_octave + note F_, 7 + notetype0 3 + note F_, 15 + note F_, 14 + notetype0 1 + note __, 15 + note __, 14 + note __, 15 + dec_octave + note D_, 14 + note G_, 15 + note B_, 14 + inc_octave + note D_, 15 + dec_octave + note G_, 14 + note B_, 15 + note F_, 7 + inc_octave + note F_, 7 + notetype0 3 + note F_, 15 + note F_, 14 + notetype0 1 + note __, 15 + note __, 14 + note __, 15 + dec_octave + note D_, 14 + note G_, 15 + note B_, 14 + inc_octave + note D_, 15 + dec_octave + note G_, 14 + note B_, 15 + note F_, 7 + inc_octave + note F_, 7 + notetype0 3 + note F_, 15 + note F_, 14 + notetype0 1 + note __, 15 + note __, 14 + note __, 15 + dec_octave + note D_, 14 + note G_, 15 + note B_, 14 + inc_octave + note D_, 15 + dec_octave + note G_, 14 + note B_, 15 + note F_, 7 + inc_octave + note F_, 7 + notetype0 3 + note F_, 15 + note F_, 14 + notetype0 1 + note __, 15 + note __, 14 + octave 1 + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + inc_octave + note A_, 14 + note B_, 15 + inc_octave + note D_, 14 + dec_octave + dec_octave + dec_octave + note D_, 15 + note A_, 14 + inc_octave + note D_, 15 + note E_, 14 + note F_, 15 + note B_, 14 + inc_octave + note C_, 15 + note G_, 14 + dec_octave + dec_octave + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note A_, 14 + note B_, 15 + inc_octave + note A_, 14 + note B_, 15 + octave 3 + note B_, 3 + inc_octave + note C_, 11 + note C_, 15 + note C_, 14 + dec_octave + note A_, 15 + note F_, 14 + note __, 15 + inc_octave + note C_, 14 + note __, 15 + dec_octave + note B_, 14 + vibrato 0, $33 + octave 1 + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note D_, 14 + note G_, 15 + inc_octave + note A_, 14 + note B_, 15 + inc_octave + note D_, 14 + dec_octave + dec_octave + dec_octave + note D_, 15 + note A_, 14 + inc_octave + note D_, 15 + note E_, 14 + note F_, 15 + note B_, 14 + inc_octave + note C_, 15 + note G_, 14 + dec_octave + dec_octave + note G_, 15 + inc_octave + note D_, 14 + note G_, 15 + note A_, 14 + note B_, 15 + inc_octave + note A_, 14 + note B_, 15 + inc_octave + note D_, 14 + note __, 15 + dec_octave + dec_octave + note D_, 14 + note F_, 15 + note A_, 14 + note B_, 15 + inc_octave + note F_, 14 + note D_, 15 + note D#, 14 + dec_octave + note C_, 15 + note G_, 14 + inc_octave + note D_, 15 + note E_, 14 + note G_, 15 + inc_octave + note D_, 14 + note C_, 15 + dec_octave + note G_, 14 + note __, 15 + dec_octave + note G_, 14 + inc_octave + note D_, 15 + note D#, 14 + note G_, 15 + inc_octave + note D_, 14 + note C_, 15 + dec_octave + note C_, 14 + note __, 15 + dec_octave + note F#, 14 + note A_, 15 + octave 4 + note F#, 14 + octave 3 + note D_, 15 + octave 4 + note E_, 14 + octave 3 + note D_, 15 + octave 3 + note B_, 14 + note B_, 15 + octave 1 + note B_, 14 + inc_octave + note F#, 15 + note G_, 14 + inc_octave + note D_, 15 + dec_octave + note B_, 14 + inc_octave + note F#, 15 + note G_, 14 + note __, 15 + dec_octave + note E_, 14 + inc_octave + note C_, 15 + dec_octave + note B_, 14 + inc_octave + note C_, 15 + note G_, 14 + note C_, 15 + dec_octave + note B_, 14 + note __, 15 + note A_, 14 + inc_octave + note C_, 15 + note G_, 14 + note F#, 15 + note D_, 14 + note C_, 15 + note D_, 14 + octave 3 + note __, 15 + note C_, 7 + note __, 7 + note D#, 8 + note C_, 7 + note C_, 7 + note D#, 7 + note G_, 8 + note C_, 7 + note D#, 7 + note G_, 7 + note A#, 8 + note D#, 7 + note D#, 7 + note A#, 7 + note __, 8 + note D#, 7 + note C_, 7 + note __, 7 + note D#, 8 + note C_, 7 + note C_, 7 + note D#, 7 + note G_, 8 + note C_, 7 + note D#, 7 + note G_, 7 + note A#, 8 + note D#, 7 + note D#, 7 + note A#, 7 + note __, 8 + note D#, 7 + note F_, 7 + note __, 7 + note G#, 8 + note F_, 7 + note F_, 7 + note G#, 7 + inc_octave + note C_, 8 + dec_octave + note F_, 7 + note G#, 7 + inc_octave + note C_, 7 + note D#, 8 + dec_octave + note G#, 7 + note G#, 7 + inc_octave + note D#, 7 + note __, 8 + dec_octave + note G#, 7 + note F_, 7 + note __, 7 + note G#, 8 + note F_, 7 + note F_, 7 + note G#, 7 + inc_octave + note C_, 8 + dec_octave + note F_, 7 + note G#, 7 + inc_octave + note C_, 7 + note D#, 8 + dec_octave + note G#, 7 + note G#, 7 + inc_octave + note D#, 7 + note __, 8 + dec_octave + note G#, 7 + note D_, 7 + note __, 7 + note F#, 8 + note D_, 7 + note D_, 7 + note F#, 7 + note A_, 8 + note D_, 7 + note F#, 7 + note A_, 7 + inc_octave + note D_, 8 + dec_octave + note F#, 7 + note F#, 7 + inc_octave + note D_, 7 + note __, 8 + dec_octave + note F#, 7 + note D_, 7 + note __, 7 + note F#, 8 + note D_, 7 + note D_, 7 + note F#, 7 + note A_, 8 + note D_, 7 + note F#, 7 + note A_, 7 + inc_octave + note D_, 8 + dec_octave + note F#, 7 + note F#, 7 + inc_octave + note D_, 7 + note __, 8 + dec_octave + note F#, 7 + note E_, 7 + note __, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note B_, 8 + note E_, 7 + note G_, 7 + note B_, 7 + inc_octave + note E_, 8 + dec_octave + note G_, 7 + note G_, 7 + inc_octave + note E_, 7 + note __, 8 + dec_octave + note G_, 7 + note E_, 7 + note __, 7 + note G_, 8 + note E_, 7 + note E_, 7 + note G_, 7 + note B_, 8 + note E_, 7 + note G_, 7 + note B_, 7 + inc_octave + note E_, 8 + dec_octave + note G_, 7 + note G_, 7 + inc_octave + note E_, 7 + octave 4 + note F#, 15 + octave 3 + note F#, 4 + note D_, 3 + note D_, 4 + note F#, 3 + note A_, 4 + note D_, 4 + inc_octave + note D_, 4 + dec_octave + note A_, 3 + octave 4 + note D_, 14 + octave 5 + note D_, 4 + dec_octave + note A_, 4 + note A_, 4 + inc_octave + note D_, 3 + octave 3 + note B_, 14 + note E_, 15 + octave 3 + note B_, 4 + note E_, 3 + note E_, 4 + note B_, 3 + note B_, 4 + note E_, 4 + inc_octave + note E_, 4 + dec_octave + note B_, 3 + octave 4 + note D_, 14 + octave 5 + note E_, 4 + dec_octave + note B_, 4 + note B_, 4 + inc_octave + note E_, 3 + octave 3 + note G_, 14 + note A_, 4 + octave 4 + note E_, 4 + note __, 7 + octave 3 + note G_, 7 + note __, 7 + inc_octave + note C_, 8 + dec_octave + note G_, 7 + note G_, 7 + inc_octave + note C_, 7 + note G_, 8 + dec_octave + note G_, 7 + note G_, 7 + inc_octave + note G_, 7 + octave 3 + note C_, 4 + note D_, 4 + note E_, 4 + note F_, 3 + note G_, 4 + note A_, 3 + note A#, 4 + note B_, 3 + inc_octave + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + dec_octave + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note __, 8 + octave 2 + note B_, 4 + note __, 3 + inc_octave + note D_, 4 + dec_octave + note B_, 3 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + dec_octave + note B_, 4 + note B_, 4 + inc_octave + note G_, 3 + note D_, 4 + dec_octave + note B_, 3 + inc_octave + note G_, 4 + note D_, 3 + note __, 4 + note G_, 4 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 4 + dec_octave + note B_, 3 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + dec_octave + note B_, 4 + note B_, 4 + inc_octave + note G_, 3 + note D_, 4 + dec_octave + note B_, 3 + inc_octave + note G_, 4 + note D_, 3 + note __, 4 + note G_, 4 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 4 + dec_octave + note A_, 3 + note A_, 4 + inc_octave + note C_, 3 + note F_, 4 + dec_octave + note A_, 4 + note A_, 4 + inc_octave + note F_, 3 + note C_, 4 + dec_octave + note A_, 3 + inc_octave + note F_, 4 + note C_, 3 + note __, 4 + note F_, 4 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 4 + dec_octave + note A_, 3 + note A_, 4 + inc_octave + note C_, 3 + note F_, 4 + dec_octave + note A_, 4 + note A_, 4 + inc_octave + note F_, 3 + note C_, 4 + dec_octave + note A_, 3 + inc_octave + note F_, 4 + note C_, 3 + note __, 4 + note F_, 4 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 4 + dec_octave + note B_, 3 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + dec_octave + note B_, 4 + note B_, 4 + inc_octave + note G_, 3 + note D_, 4 + dec_octave + note B_, 3 + inc_octave + note G_, 4 + note D_, 3 + note __, 4 + note G_, 4 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 4 + dec_octave + note B_, 3 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + dec_octave + note B_, 4 + note B_, 4 + inc_octave + note G_, 3 + note D_, 4 + dec_octave + note B_, 3 + inc_octave + note G_, 4 + note D_, 3 + note __, 4 + note G_, 4 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 4 + dec_octave + note A_, 3 + note A_, 4 + note __, 3 + inc_octave + note F_, 4 + dec_octave + note A_, 4 + note A_, 4 + inc_octave + note F_, 3 + note C_, 4 + dec_octave + note A_, 3 + inc_octave + note F_, 4 + note C_, 3 + note __, 4 + note F_, 4 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 4 + dec_octave + note A_, 3 + note A_, 4 + inc_octave + note C_, 3 + note F_, 4 + dec_octave + note A_, 4 + note A_, 4 + inc_octave + note F_, 3 + note C_, 4 + dec_octave + note A_, 3 + inc_octave + note F_, 4 + note C_, 3 + note __, 4 + note F_, 4 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 4 + dec_octave + note B_, 3 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + dec_octave + note B_, 4 + note B_, 4 + inc_octave + note G_, 3 + note D_, 4 + dec_octave + note B_, 3 + inc_octave + note G_, 4 + note D_, 3 + note __, 4 + note G_, 4 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 4 + dec_octave + note B_, 3 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + dec_octave + note B_, 4 + note B_, 4 + inc_octave + note G_, 3 + note D_, 4 + dec_octave + note B_, 3 + inc_octave + note G_, 4 + note D_, 3 + note __, 4 + note G_, 4 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 4 + dec_octave + note A_, 3 + note A_, 4 + inc_octave + note C_, 3 + note F_, 4 + dec_octave + note A_, 4 + note A_, 4 + inc_octave + note F_, 3 + note C_, 4 + dec_octave + note A_, 3 + inc_octave + note F_, 4 + note C_, 3 + note __, 4 + note F_, 4 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 4 + dec_octave + note A_, 3 + note A_, 4 + inc_octave + note C_, 3 + note F_, 4 + dec_octave + note A_, 4 + note A_, 4 + inc_octave + note F_, 3 + note C_, 4 + dec_octave + note A_, 3 + inc_octave + note F_, 4 + note C_, 3 + dec_octave + note B_, 4 + inc_octave + note F_, 4 + dec_octave + note G_, 4 + note B_, 3 + inc_octave + note D_, 4 + dec_octave + note G_, 3 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + dec_octave + note B_, 4 + inc_octave + note D_, 4 + note G_, 3 + note B_, 4 + note D_, 3 + note G_, 4 + note B_, 3 + inc_octave + note D_, 4 + dec_octave + note G_, 4 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + dec_octave + note B_, 3 + inc_octave + note D_, 4 + note G_, 3 + dec_octave + dec_octave + note A_, 4 + note B_, 4 + inc_octave + note D_, 4 + note G_, 3 + note B_, 4 + inc_octave + note D_, 3 + note G_, 4 + note A_, 3 + inc_octave + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + notetype0 2 + note G_, 14 + endchannel + + +Music_TCG2Credits_Ch3: + notetype1 10 + db $f3, $cc, $cc, $cc, $cc, $bc, $cc, $bc, $cc, $c0, $00, $00, $00, $00, $00, $00, $0b + notetype0 1 + notetype1 1 + octave 5 + vibrato 15, $33 + notetype1 2 + note G#, 3 + note A_, 12 + note A_, 14 + note A_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + vibrato 0, $33 + note D_, 15 + note D_, 14 + note G#, 3 + vibrato 10, $33 + note A_, 12 + note A_, 14 + note A_, 15 + note A_, 14 + vibrato 0, $33 + note G_, 15 + note G_, 5 + note A_, 9 + note A_, 15 + note B_, 14 + note B_, 3 + inc_octave + note C_, 5 + note C_, 14 + dec_octave + note B_, 7 + note B_, 15 + vibrato 16, $33 + note G_, 14 + notetype0 4 + note G_, 15 + note G_, 14 + notetype0 2 + note G_, 15 + note G_, 14 + notetype0 1 + note G#, 3 + note A_, 12 + note A_, 14 + note A_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + vibrato 0, $33 + note D_, 15 + note D_, 14 + note G#, 3 + vibrato 10, $33 + note A_, 12 + note A_, 14 + note A_, 15 + vibrato 0, $33 + note G_, 14 + note G_, 15 + note A_, 14 + note B_, 15 + inc_octave + note C_, 14 + note C#, 3 + note D_, 5 + note D_, 14 + note C_, 7 + note C_, 15 + dec_octave + note B_, 14 + note B_, 15 + vibrato 16, $33 + note G_, 14 + notetype0 4 + note G_, 15 + note G_, 14 + notetype0 1 + note G_, 2 + notetype0 3 + note G_, 9 + notetype0 1 + notetype1 1 + note __, 15 + note __, 14 + note __, 15 + callchannel Branch_1dfa9d + note B_, 15 + note B_, 14 + vibrato 0, $33 + inc_octave + note D_, 15 + note F#, 14 + note F#, 15 + note G_, 14 + note G_, 15 + vibrato 14, $33 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + vibrato 0, $33 + note C#, 3 + note D_, 12 + note D_, 7 + note C_, 15 + note C_, 7 + dec_octave + note B_, 14 + note B_, 15 + note B_, 14 + inc_octave + note C_, 15 + dec_octave + vibrato 14, $33 + note E_, 14 + note E_, 15 + note E_, 14 + note E_, 15 + note E_, 14 + note E_, 15 + note E_, 14 + note E_, 15 + note E_, 14 + vibrato 0, $33 + inc_octave + note C#, 3 + note D_, 12 + note D_, 7 + note C_, 15 + note C_, 7 + dec_octave + note B_, 14 + note B_, 15 + note B_, 14 + inc_octave + note C_, 15 + dec_octave + vibrato 14, $33 + note D#, 14 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 14 + vibrato 0, $33 + vibrato 15, $33 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + vibrato 0, $33 + notetype1 2 + note B_, 15 + note B_, 14 + note B_, 15 + dec_octave + notetype1 1 + callchannel Branch_1dfa9d + callchannel Branch_1dfb57 + notetype0 2 + note G_, 14 + notetype0 1 + note __, 1 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + note D#, 3 + vibrato 12, $33 + note E_, 12 + note E_, 14 + note E_, 15 + vibrato 0, $33 + note C_, 14 + note E_, 15 + note E_, 14 + note A#, 3 + note B_, 12 + vibrato 14, $33 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + vibrato 0, $33 + note F_, 3 + note F#, 11 + note F#, 15 + note E_, 14 + note E_, 15 + vibrato 14, $33 + note D_, 14 + note D_, 14 + note D_, 14 + note D_, 15 + vibrato 0, $33 + dec_octave + note B_, 14 + inc_octave + note D_, 15 + note A_, 14 + note F#, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + vibrato 0, $33 + note D_, 14 + note D_, 15 + dec_octave + note B_, 14 + note B_, 15 + note B_, 3 + inc_octave + vibrato 14, $33 + note C_, 11 + note C_, 15 + note C_, 14 + vibrato 0, $33 + note G_, 15 + note G_, 14 + note G_, 15 + note C_, 14 + note C_, 15 + vibrato 14, $33 + dec_octave + note B_, 14 + note B_, 15 + note B_, 14 + vibrato 0, $33 + note A_, 15 + note A_, 14 + note G_, 15 + note G_, 14 + note A_, 15 + note G_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + inc_octave + note D_, 14 + note D_, 15 + note D_, 14 + dec_octave + note A#, 3 + vibrato 12, $33 + note B_, 12 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 7 + note B_, 7 + note __, 15 + note __, 14 + vibrato 0, $33 + inc_octave + note D#, 3 + vibrato 12, $33 + note E_, 12 + note E_, 14 + note E_, 15 + vibrato 0, $33 + note C_, 14 + note E_, 15 + note E_, 14 + note A#, 3 + note B_, 12 + vibrato 14, $33 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + vibrato 0, $33 + note B_, 14 + note B_, 15 + inc_octave + note C_, 14 + note C_, 15 + vibrato 14, $33 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + vibrato 0, $33 + note C#, 2 + note D_, 12 + note D_, 15 + note E_, 14 + note F#, 15 + vibrato 14, $33 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + vibrato 0, $33 + note F#, 14 + note F#, 15 + note E_, 14 + note E_, 15 + vibrato 14, $33 + note D_, 14 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 4 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + vibrato 0, $33 + note F#, 3 + note G_, 11 + note F#, 15 + vibrato 14, $33 + note D_, 14 + notetype0 4 + note D_, 15 + note D_, 14 + notetype0 2 + note D_, 15 + note D_, 14 + notetype0 1 + note D_, 1 + notetype0 2 + note D_, 14 + notetype0 1 + vibrato 0, $33 + note C#, 3 + note D_, 12 + note C_, 14 + dec_octave + vibrato 15, $33 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + vibrato 0, $33 + inc_octave + note D_, 14 + note D_, 15 + note G#, 3 + vibrato 11, $33 + note A_, 11 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + vibrato 0, $33 + note G_, 14 + note G_, 15 + vibrato 14, $33 + notetype0 1 + note D_, 14 + notetype0 4 + note D_, 15 + note D_, 14 + notetype0 1 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + vibrato 0, $33 + dec_octave + note B_, 15 + inc_octave + note C_, 14 + note D_, 15 + vibrato 14, $33 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + vibrato 0, $33 + note C_, 14 + note C_, 15 + dec_octave + vibrato 14, $33 + note B_, 14 + note B_, 15 + note B_, 14 + vibrato 0, $33 + note A_, 15 + note A_, 14 + note G_, 15 + note B_, 14 + note B_, 15 + vibrato 14, $33 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + vibrato 0, $33 + notetype1 2 + inc_octave + note C_, 7 + notetype0 2 + note C_, 11 + notetype0 8 + notetype0 1 + note E_, 7 + notetype0 2 + note E_, 11 + notetype0 1 + note D_, 14 + note D_, 15 + note C_, 14 + dec_octave + note B_, 15 + note A_, 14 + note G_, 15 + note F#, 14 + inc_octave + notetype1 1 + note C#, 3 + note D_, 12 + note C_, 14 + dec_octave + vibrato 14, $33 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + vibrato 0, $33 + inc_octave + note D_, 14 + note D_, 15 + note G#, 3 + vibrato 11, $33 + note A_, 11 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + vibrato 0, $33 + note B_, 14 + note B_, 15 + vibrato 14, $33 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + vibrato 0, $33 + dec_octave + notetype1 2 + note B_, 3 + inc_octave + note C_, 11 + note C_, 15 + dec_octave + note B_, 14 + note A_, 15 + note G#, 14 + note F_, 15 + inc_octave + notetype1 1 + note C_, 14 + dec_octave + note B_, 15 + inc_octave + note C_, 14 + note C_, 15 + note C_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note C_, 14 + note C_, 15 + dec_octave + note A#, 3 + vibrato 11, $33 + note B_, 11 + note B_, 15 + note B_, 14 + vibrato 0, $33 + note A_, 15 + note A_, 14 + note G_, 15 + note G_, 14 + note A_, 15 + note A_, 7 + note G_, 4 + note A_, 3 + vibrato 15, $33 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + dec_octave + note G_, 7 + notetype1 2 + note G_, 7 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + notetype1 2 + note G_, 15 + note G_, 14 + note __, 15 + note __, 14 +.Loop1 + note __, 15 + note __, 14 + note __, 8 + octave 3 + notetype1 2 + note D_, 14 + note G_, 15 + note B_, 14 + inc_octave + note D_, 15 + dec_octave + note G_, 7 + notetype1 1 + note G_, 7 + notetype1 2 + note G_, 7 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + notetype1 2 + note G_, 15 + note G_, 14 + note __, 15 + note __, 14 + loopchannel 2, .Loop1 + note __, 15 + note __, 14 + note __, 8 + octave 3 + notetype1 2 + note D_, 14 + note G_, 15 + note B_, 14 + inc_octave + note D_, 15 + dec_octave + note G_, 7 + inc_octave + notetype1 1 + note C_, 7 + notetype1 2 + note C_, 7 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + notetype1 3 + note C_, 15 + vibrato 0, $33 + note __, 14 + notetype1 1 + note __, 15 + note __, 14 + note __, 15 + callchannel Branch_1dfa9d + callchannel Branch_1dfb57 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + vibrato 0, $33 + inc_octave + note C_, 4 + note D_, 3 + note D#, 4 + note F_, 3 + note F#, 3 + vibrato 26, $33 + note G_, 12 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + vibrato 29, $33 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 1 + notetype0 2 + note F_, 14 + notetype0 1 + vibrato 29, $33 + note F#, 15 + note F#, 14 + note F#, 15 + note F#, 14 + note F#, 15 + note F#, 14 + note F#, 15 + note F#, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note F#, 4 + note G_, 3 + note A_, 4 + note A#, 3 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + vibrato 0, $33 + dec_octave + note A_, 4 + note B_, 4 + inc_octave + note C_, 4 + note D_, 3 + note E_, 4 + note F_, 3 + note G_, 4 + note G#, 3 + note G#, 3 + note A_, 12 + note A_, 14 + note A_, 15 + note F#, 14 + note F#, 15 + note D_, 14 + note F#, 3 + vibrato 12, $33 + note G_, 12 + note G_, 14 + note G_, 15 + vibrato 0, $33 + note F#, 14 + note E_, 15 + dec_octave + note B_, 14 + inc_octave + note C_, 15 + note G_, 14 + vibrato 15, $33 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 1 + notetype0 2 + note G_, 14 + notetype0 1 + vibrato 0, $33 + note F#, 3 + vibrato 12, $33 + note G_, 12 + note G_, 14 + note G_, 15 + note G_, 14 + vibrato 15, $33 + note F#, 15 + note F#, 14 + note F#, 15 + note F#, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + vibrato 0, $33 + note G#, 3 + vibrato 12, $33 + note A_, 12 + note A_, 14 + note A_, 15 + note A_, 14 + vibrato 0, $33 + vibrato 15, $33 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + vibrato 0, $33 + note G#, 3 + vibrato 12, $33 + note A_, 12 + note A_, 14 + note A_, 15 + note A_, 14 + vibrato 0, $33 + vibrato 15, $33 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + vibrato 0, $33 + note G#, 3 + vibrato 12, $33 + note A_, 12 + note A_, 14 + note A_, 15 + note A_, 14 + vibrato 0, $33 + note A#, 3 + vibrato 26, $33 + note B_, 12 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + vibrato 0, $33 + notetype0 1 + notetype1 2 + note B_, 14 + notetype1 3 + note B_, 7 + note __, 7 + endchannel + +Branch_1dfa9d: + octave 3 + note A_, 14 + note B_, 15 + inc_octave + note D_, 14 + note G_, 15 + vibrato 14, $33 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + vibrato 0, $33 + note A_, 14 + note A_, 15 + inc_octave + note C_, 14 + note C_, 15 + dec_octave + vibrato 14, $33 + note B_, 14 + note B_, 15 + note B_, 14 + vibrato 0, $33 + note G_, 15 + note D_, 14 + note D_, 15 + note B_, 14 + note B_, 15 + vibrato 14, $33 + note A_, 14 + note A_, 15 + note A_, 14 + vibrato 0, $33 + note F_, 15 + note C_, 14 + note C_, 15 + note A_, 14 + note A_, 15 + vibrato 14, $33 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + vibrato 0, $33 + dec_octave + note A_, 14 + note B_, 15 + inc_octave + note D_, 14 + note G_, 15 + note F_, 14 + note F_, 15 + note A_, 14 + note A_, 15 + inc_octave + note C_, 14 + note C_, 15 + note E_, 14 + note E_, 15 + vibrato 14, $33 + note D_, 14 + note D_, 15 + note D_, 14 + vibrato 0, $33 + dec_octave + note B_, 15 + note G_, 14 + note G_, 15 + note F#, 14 + note F#, 15 + vibrato 14, $33 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + vibrato 0, $33 + note D#, 14 + note E_, 15 + note E_, 14 + note E_, 15 + note B_, 14 + note B_, 15 + note A_, 14 + note A_, 15 + vibrato 14, $33 + note D#, 14 + note D#, 15 + note D#, 14 + note D#, 15 + vibrato 0, $33 + note G#, 3 + note A_, 11 + note A_, 15 + note G_, 14 + note A_, 15 + note A#, 3 + vibrato 11, $33 + note B_, 11 + endchannel + +Branch_1dfb57: + octave 4 + note B_, 15 + note B_, 14 + vibrato 0, $33 + inc_octave + note D_, 15 + note A_, 14 + note A_, 15 + note G_, 14 + note G_, 15 + vibrato 14, $33 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + vibrato 0, $33 + note C#, 3 + note D_, 12 + note D_, 7 + note C_, 15 + note C_, 7 + dec_octave + note B_, 14 + note B_, 15 + note B_, 14 + inc_octave + note C_, 15 + dec_octave + note E_, 14 + note E_, 15 + note G#, 3 + note A_, 11 + note A_, 15 + note A_, 4 + note G_, 5 + note A_, 5 + note G_, 15 + note G_, 14 + note F#, 15 + note F#, 14 + note E_, 15 + note F#, 14 + note F#, 15 + vibrato 14, $33 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + endchannel + + +Music_TCG2Credits_Ch4: + togglenoise $06 + octave 1 + notetype 4 +.Loop1 + note __, 15 + note __, 14 + loopchannel 40, .Loop1 + notetype 1 +.Loop2 + note D#, 15 + note D#, 14 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + loopchannel 15, .Loop2 + note D#, 15 + note D#, 14 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + callchannel Branch_1dfd47 + callchannel Branch_1dfd54 + callchannel Branch_1dfd47 + callchannel Branch_1dfd54 + callchannel Branch_1dfd47 + callchannel Branch_1dfd54 + note C_, 15 + note C_, 14 + note D#, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C_, 14 + note D#, 15 + note E_, 14 + note D#, 15 + note C#, 14 + note E_, 15 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 15 + note C#, 14 + note D#, 15 + note C#, 14 + callchannel Branch_1dfd47 + callchannel Branch_1dfd54 + callchannel Branch_1dfd47 + callchannel Branch_1dfd54 + callchannel Branch_1dfd47 + callchannel Branch_1dfd54 + callchannel Branch_1dfd47 + note C_, 15 + note C#, 14 + note E_, 15 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 15 + note C#, 14 + note E_, 15 + note C#, 14 + callchannel Branch_1dfd61 + note D#, 15 + note C#, 14 + note D#, 15 + note C_, 14 + note C#, 15 + note C_, 14 + note D#, 15 + note C#, 4 + note C#, 5 + note C#, 5 + callchannel Branch_1dfd61 + note D#, 15 + note C#, 14 + note D#, 15 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 15 + note C#, 14 + note E_, 15 + note C_, 14 + callchannel Branch_1dfd61 + note D#, 15 + note C#, 14 + note D#, 15 + note C_, 14 + note C#, 15 + note C_, 14 + note D#, 15 + note C#, 4 + note C#, 5 + note C#, 5 + note C_, 15 + note C#, 14 + note E_, 15 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 15 + note C_, 14 + note C_, 15 + notetype 6 + note F_, 9 + notetype 1 + note __, 4 + note __, 14 + note __, 15 + note D#, 14 + notetype 4 + note E_, 7 + notetype 1 + note __, 1 + callchannel Branch_1dfd6e + callchannel Branch_1dfd7a + callchannel Branch_1dfd6e + note C_, 15 + note C#, 14 + note E_, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C#, 14 + note C_, 15 + note C#, 14 + callchannel Branch_1dfd6e + callchannel Branch_1dfd7a + callchannel Branch_1dfd6e + note C_, 15 + note C#, 14 + note E_, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C#, 14 + note C_, 15 + note C#, 14 + callchannel Branch_1dfd6e + callchannel Branch_1dfd7a + callchannel Branch_1dfd6e + note C_, 15 + note C#, 14 + note E_, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C#, 14 + note C_, 15 + note C#, 14 + callchannel Branch_1dfd6e + note C_, 15 + note C#, 14 + note E_, 15 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 15 + note C#, 14 + note C_, 15 + note C#, 14 + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + note C_, 15 + note D#, 14 + note C#, 15 + note D#, 14 + note C_, 15 + note D#, 14 + note C#, 15 + note C#, 7 + note C#, 7 + note C_, 15 + note C#, 7 + note C#, 7 + note C#, 15 + note E_, 14 + note C_, 15 + note C#, 14 + note C_, 15 + note C#, 7 + note C#, 7 + note C#, 15 + note E_, 4 + note C#, 5 + note C#, 5 + note C#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note D#, 14 + note C#, 15 + note D#, 14 + note C_, 15 + note D#, 7 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 14 + notetype 7 + note F_, 16 + notetype 1 + note __, 4 + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + callchannel Branch_1dfd8d + note C_, 15 + note D#, 14 + note C#, 15 + note D#, 14 + note C_, 8 + note C#, 7 + note D#, 7 + note C#, 4 + note C#, 3 + note C#, 8 + note C#, 7 + note C#, 14 + note C#, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C_, 14 + note C#, 8 + note C_, 14 + note C_, 7 + note C#, 15 + note C_, 14 + notetype 7 + note F_, 16 + notetype 1 + note __, 4 + endchannel + +Branch_1dfd47: + octave 1 + notetype 1 + note C_, 15 + note C_, 14 + note D#, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C_, 14 + note D#, 15 + note C_, 14 + endchannel + +Branch_1dfd54: + octave 1 + notetype 1 + note C_, 15 + note C_, 14 + note D#, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C_, 14 + note D#, 15 + note C#, 14 + endchannel + +Branch_1dfd61: + octave 1 + notetype 1 + note C_, 15 + note C_, 14 + note D#, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C_, 14 + note D#, 15 + note E_, 14 + endchannel + +Branch_1dfd6e: + octave 1 + notetype 1 + note C_, 15 + note C_, 14 + note D#, 15 + note C_, 14 + note C#, 15 + note C_, 14 + note D#, 15 + note C_, 14 + endchannel + +Branch_1dfd7a: + octave 1 + notetype 1 + note C_, 15 + note C#, 14 + note E_, 15 + note C_, 7 + note C_, 7 + note C#, 15 + note C_, 14 + note D#, 15 + note C#, 4 + note C#, 5 + note C#, 5 + endchannel + +Branch_1dfd8d: + octave 1 + notetype 1 + note C_, 15 + note D#, 14 + note C#, 15 + note D#, 14 + note C_, 15 + note D#, 14 + note C#, 15 + note E_, 14 + endchannel + diff --git a/crysaudio/music/TCG2/diddly1.asm b/crysaudio/music/TCG2/diddly1.asm new file mode 100644 index 00000000..5d74e97b --- /dev/null +++ b/crysaudio/music/TCG2/diddly1.asm @@ -0,0 +1,240 @@ +Music_TCG2Diddly1: + db $80 + dw Music_TCG2Diddly1_Ch1 + db $01 + dw Music_TCG2Diddly1_Ch2 + db $02 + dw Music_TCG2Diddly1_Ch3 + +Music_TCG2Diddly1_Ch2: + notetype1 10 + notetype0 1 + octave 2 + note D#, 2 + note E_, 3 + note D#, 3 + note E_, 3 + note D#, 2 + note E_, 3 + note D#, 3 + note E_, 3 + note D#, 2 + note E_, 3 + note D#, 3 + note E_, 3 + note D#, 2 + note E_, 3 + note D#, 3 + note E_, 3 + note F_, 2 + note G#, 3 + note F_, 3 + note G#, 3 + note B_, 2 + inc_octave + note D_, 3 + note F_, 3 + note G#, 3 + note F_, 2 + note G#, 3 + note B_, 3 + inc_octave + note D_, 3 + note F_, 2 + dec_octave + note B_, 3 + inc_octave + note D_, 3 + note F_, 2 + note G#, 3 + note B_, 3 + inc_octave + note D_, 3 + dec_octave + note G#, 2 + note B_, 3 + inc_octave + note D_, 3 + note F_, 3 + dec_octave + note G#, 2 + note B_, 3 + inc_octave + note D_, 3 + note F_, 3 + dec_octave + note G#, 2 + note B_, 3 + inc_octave + note D_, 3 + note F_, 3 + dec_octave + note G#, 2 + note B_, 3 + inc_octave + note D_, 3 + note F_, 3 + dec_octave + note G#, 2 + note B_, 3 + inc_octave + note D_, 3 + note F_, 3 + endchannel + + +Music_TCG2Diddly1_Ch1: + notetype1 10 + notetype0 1 + octave 1 + note G_, 2 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 2 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 2 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 2 + note G#, 3 + note B_, 3 + inc_octave + note D_, 3 + dec_octave + note B_, 2 + inc_octave + note D_, 3 + dec_octave + note B_, 3 + inc_octave + note D_, 3 + dec_octave + note B_, 2 + inc_octave + note D_, 3 + note E_, 3 + note G#, 3 + note A#, 2 + inc_octave + note D_, 3 + dec_octave + note A#, 3 + inc_octave + note D_, 3 + note E_, 2 + note D_, 3 + note E_, 3 + note G#, 3 + note E_, 2 + note G#, 3 + note A#, 3 + note G#, 3 + note A#, 2 + inc_octave + note D_, 3 + dec_octave + note G#, 3 + note A#, 3 + note A#, 2 + inc_octave + note D_, 3 + dec_octave + note G#, 3 + note A#, 3 + note A#, 2 + inc_octave + note D_, 3 + dec_octave + note G#, 3 + note A#, 3 + note A#, 2 + inc_octave + note D_, 3 + dec_octave + note G#, 3 + note A#, 3 + note A#, 2 + inc_octave + note D_, 3 + dec_octave + note G#, 3 + note A#, 3 + endchannel + + +Music_TCG2Diddly1_Ch3: + notetype1 10 + notetype2 15 + notetype0 1 + octave 2 + notetype1 1 + note C_, 2 + note C#, 3 + notetype1 2 + note C_, 3 + note C#, 3 + note C_, 2 + note C#, 3 + note C_, 3 + note C#, 3 + note C_, 2 + note C#, 3 + note C_, 3 + note C#, 3 + note C_, 2 + note C#, 3 + note E_, 3 + note G_, 3 + note E_, 2 + note G_, 3 + note A#, 3 + notetype1 1 + inc_octave + note C_, 3 + dec_octave + note G_, 2 + note A#, 3 + inc_octave + note C_, 3 + note E_, 3 + dec_octave + note A#, 2 + inc_octave + note C_, 3 + note E_, 3 + note G_, 3 + note C_, 2 + note E_, 3 + note G_, 3 + note A#, 3 + note E_, 2 + note G_, 3 + note A#, 3 + inc_octave + note C_, 3 + dec_octave + note G_, 2 + note A#, 3 + inc_octave + note C_, 3 + note E_, 3 + dec_octave + notetype1 2 + note G_, 2 + note A#, 3 + inc_octave + note C_, 3 + note E_, 3 + dec_octave + notetype1 128 + note G_, 2 + note A#, 3 + inc_octave + note C_, 3 + note E_, 3 + endchannel + diff --git a/crysaudio/music/TCG2/diddly2.asm b/crysaudio/music/TCG2/diddly2.asm new file mode 100644 index 00000000..63edc713 --- /dev/null +++ b/crysaudio/music/TCG2/diddly2.asm @@ -0,0 +1,224 @@ +Music_TCG2Diddly2: + db $80 + dw Music_TCG2Diddly2_Ch1 + db $01 + dw Music_TCG2Diddly2_Ch2 + db $02 + dw Music_TCG2Diddly2_Ch3 + +Music_TCG2Diddly2_Ch2: + notetype1 10 + notetype0 1 + octave 2 + note B_, 5 + note D_, 4 + note F_, 4 + note G#, 4 + note B_, 4 + inc_octave + note D_, 4 + note F_, 5 + dec_octave + note G#, 4 + note B_, 4 + inc_octave + note D_, 4 + note F_, 4 + note G#, 4 + note B_, 5 + note D_, 4 + note F_, 4 + note G#, 4 + note B_, 4 + inc_octave + note D_, 4 + note F_, 5 + dec_octave + note F_, 4 + note G#, 4 + note B_, 4 + inc_octave + note D_, 4 + note F_, 4 + note G_, 4 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 4 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 4 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 3 + note G#, 3 + note G_, 4 + note G#, 3 + endchannel + + +Music_TCG2Diddly2_Ch1: + notetype1 10 + notetype0 1 + octave 2 + note F_, 4 + dec_octave + note G#, 4 + note B_, 4 + inc_octave + note D_, 4 + note F_, 4 + note G#, 4 + note B_, 4 + note D_, 4 + note F_, 4 + note G#, 4 + note B_, 4 + inc_octave + note D_, 4 + note F_, 4 + dec_octave + note G#, 4 + note B_, 4 + inc_octave + note D_, 4 + note F_, 4 + note G#, 4 + note B_, 4 + dec_octave + note B_, 4 + inc_octave + note D_, 4 + note F_, 4 + note G#, 4 + note A_, 4 + note B_, 4 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 4 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 4 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 3 + inc_octave + note C_, 3 + dec_octave + note B_, 4 + inc_octave + note C_, 3 + endchannel + + +Music_TCG2Diddly2_Ch3: + notetype1 10 + notetype2 14 + notetype0 1 + notetype1 1 + octave 2 + note G_, 5 + notetype1 2 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 5 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + notetype1 3 + note G_, 5 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + notetype1 3 + note G_, 5 + note G_, 4 + note G_, 4 + notetype1 3 + note G_, 4 + notetype1 2 + note G_, 4 + note G_, 4 + notetype1 1 + note G_, 5 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + notetype1 2 + note G_, 5 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + notetype1 3 + note G_, 5 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + endchannel + diff --git a/crysaudio/music/TCG2/diddly3.asm b/crysaudio/music/TCG2/diddly3.asm new file mode 100644 index 00000000..63877909 --- /dev/null +++ b/crysaudio/music/TCG2/diddly3.asm @@ -0,0 +1,65 @@ +Music_TCG2Diddly3: + db $80 + dw Music_TCG2Diddly3_Ch1 + db $01 + dw Music_TCG2Diddly3_Ch2 + db $02 + dw Music_TCG2Diddly3_Ch3 + +Music_TCG2Diddly3_Ch2: + notetype1 10 + notetype0 1 + octave 5 + note C_, 3 + dec_octave + note C_, 2 + note C_, 1 + note G_, 3 + inc_octave + note C_, 3 + note G_, 3 + inc_octave + note C_, 5 + note C_, 6 + endchannel + + +Music_TCG2Diddly3_Ch1: + notetype1 10 + notetype0 1 + note __, 1 + octave 5 + note C_, 3 + dec_octave + note C_, 2 + note C_, 1 + note G_, 3 + inc_octave + note C_, 3 + note G_, 3 + inc_octave + note C_, 5 + note C_, 6 + endchannel + + +Music_TCG2Diddly3_Ch3: + notetype1 10 + notetype2 15 + notetype0 1 + notetype1 2 + notetype0 1 + octave 5 + note G_, 3 + dec_octave + note G_, 3 + note E_, 3 + inc_octave + note C_, 3 + note E_, 3 + inc_octave + note C_, 4 + notetype1 128 + note C_, 4 + endchannel + diff --git a/crysaudio/music/TCG2/diddly4.asm b/crysaudio/music/TCG2/diddly4.asm new file mode 100644 index 00000000..5a450cf5 --- /dev/null +++ b/crysaudio/music/TCG2/diddly4.asm @@ -0,0 +1,68 @@ +Music_TCG2Diddly4: + db $80 + dw Music_TCG2Diddly4_Ch1 + db $01 + dw Music_TCG2Diddly4_Ch2 + db $02 + dw Music_TCG2Diddly4_Ch3 + +Music_TCG2Diddly4_Ch2: + notetype1 10 + notetype0 1 + octave 3 + note C_, 4 + note C_, 2 + note A_, 4 + note A_, 2 + note F_, 4 + note F_, 2 + inc_octave + note C_, 4 + note C_, 1 + dec_octave + note A_, 4 + note A_, 2 + inc_octave + note F_, 15 + note F_, 11 + endchannel + + +Music_TCG2Diddly4_Ch1: + notetype1 10 + notetype0 1 + octave 2 + note A_, 4 + note A_, 2 + inc_octave + note C_, 4 + note C_, 2 + dec_octave + note A_, 4 + note A_, 2 + inc_octave + note F_, 4 + note F_, 1 + note C_, 4 + note C_, 2 + note A_, 15 + note A_, 11 + endchannel + + +Music_TCG2Diddly4_Ch3: + notetype1 10 + notetype2 14 + notetype0 1 + notetype1 2 + notetype0 1 + note __, 6 + note __, 5 + note __, 6 + note __, 5 + note __, 6 + octave 4 + note F_, 16 + note F_, 6 + endchannel + diff --git a/crysaudio/music/TCG2/diddly5.asm b/crysaudio/music/TCG2/diddly5.asm new file mode 100644 index 00000000..5eb14580 --- /dev/null +++ b/crysaudio/music/TCG2/diddly5.asm @@ -0,0 +1,65 @@ +Music_TCG2Diddly5: + db $40 + dw Music_TCG2Diddly5_Ch1 + db $01 + dw Music_TCG2Diddly5_Ch2 + +Music_TCG2Diddly5_Ch2: + notetype1 10 + notetype0 1 + octave 3 + note G_, 2 + note B_, 3 + inc_octave + note D_, 3 + note G_, 3 + dec_octave + note B_, 2 + inc_octave + note D_, 3 + note G_, 3 + note B_, 3 + note D_, 2 + note G_, 3 + note B_, 3 + inc_octave + note D_, 3 + dec_octave + note G_, 2 + note B_, 3 + inc_octave + note D_, 3 + note G_, 3 + note G_, 3 + endchannel + + +Music_TCG2Diddly5_Ch1: + notetype1 10 + notetype0 1 + octave 2 + note B_, 2 + inc_octave + note D_, 3 + note G_, 3 + dec_octave + note B_, 3 + inc_octave + note D_, 2 + note G_, 3 + note B_, 3 + note D_, 3 + note G_, 2 + note B_, 3 + inc_octave + note D_, 3 + dec_octave + note G_, 3 + note B_, 2 + inc_octave + note D_, 3 + note G_, 3 + note B_, 3 + note B_, 3 + endchannel + diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm new file mode 100644 index 00000000..a539f8b6 --- /dev/null +++ b/crysaudio/music/TCG2/diddly6.asm @@ -0,0 +1,256 @@ +Music_TCG2Diddly6: + db $C0 + dw Music_TCG2Diddly6_Ch1 + db $01 + dw Music_TCG2Diddly6_Ch2 + db $02 + dw Music_TCG2Diddly6_Ch3 + db $03 + dw Music_TCG2Diddly6_Ch4 + +Music_TCG2Diddly6_Ch2: + notetype1 10 + notetype0 1 + octave 3 + note F_, 2 + note G_, 3 + note A_, 2 + note B_, 3 + inc_octave + note C_, 2 + note D_, 3 + note E_, 2 + note F_, 3 + note G_, 16 + note G_, 14 + note G_, 11 + note A#, 16 + note A#, 5 + note A#, 10 + note G_, 6 + note A#, 4 + note A_, 16 + note A_, 14 + note A_, 11 + inc_octave + note C_, 16 + note C_, 14 + note C_, 11 + dec_octave + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 13 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 7 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 2 + notetype0 2 + note B_, 10 + endchannel + + +Music_TCG2Diddly6_Ch1: + notetype1 10 + notetype0 1 + octave 3 + note C_, 2 + note D_, 3 + note E_, 2 + note F_, 3 + note G_, 2 + note A_, 3 + note B_, 2 + inc_octave + note C_, 3 + dec_octave + note G_, 6 + inc_octave + note D#, 5 + dec_octave + note A#, 5 + inc_octave + note G_, 5 + dec_octave + note G_, 5 + inc_octave + note D#, 5 + dec_octave + note A#, 5 + inc_octave + note G_, 5 + dec_octave + note G_, 6 + inc_octave + note D#, 5 + dec_octave + note A#, 5 + inc_octave + note G_, 5 + dec_octave + note G_, 5 + inc_octave + note D#, 5 + dec_octave + note A#, 5 + inc_octave + note G_, 5 + dec_octave + note A_, 6 + inc_octave + note F_, 5 + note C_, 5 + note A_, 5 + dec_octave + note A_, 5 + inc_octave + note F_, 5 + note C_, 5 + note A_, 5 + dec_octave + note A_, 6 + inc_octave + note F_, 5 + note C_, 5 + note A_, 5 + dec_octave + note A_, 5 + inc_octave + note F_, 5 + note C_, 5 + note A_, 5 + octave 4 + note D_, 6 + octave 4 + note G_, 5 + note D_, 5 + note B_, 5 + dec_octave + note G_, 5 + inc_octave + note D_, 5 + dec_octave + note D_, 5 + note B_, 5 + dec_octave + note B_, 6 + inc_octave + note G_, 5 + dec_octave + note G_, 5 + inc_octave + note D_, 5 + dec_octave + note D_, 5 + note B_, 5 + note G_, 5 + inc_octave + note D_, 5 + dec_octave + note B_, 6 + inc_octave + note G_, 5 + note D_, 5 + note B_, 5 + note G_, 5 + inc_octave + note D_, 5 + dec_octave + note B_, 5 + inc_octave + note G_, 5 + note D_, 6 + note B_, 5 + note G_, 5 + inc_octave + note D_, 5 + dec_octave + note B_, 5 + note G_, 5 + note B_, 5 + inc_octave + note D_, 5 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 2 + notetype0 2 + note G_, 10 + endchannel + + +Music_TCG2Diddly6_Ch3: + notetype1 10 + notetype2 15 + notetype1 1 + notetype0 1 + note __, 10 + note __, 10 + octave 2 + note D#, 16 + note D#, 16 + note D#, 16 + note D#, 16 + note D#, 16 + note D#, 2 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 2 +.Loop1 + notetype0 7 + note G_, 3 + notetype0 10 + note D_, 2 + loopchannel 4, .Loop1 + notetype0 1 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 2 + notetype0 2 + note G_, 10 + endchannel + + +Music_TCG2Diddly6_Ch4: + togglenoise $06 + octave 1 + notetype 1 + note __, 10 + note __, 10 + note C#, 6 +.Loop1 + note D_, 5 + loopchannel 7, .Loop1 +.Loop2 + note D_, 6 + rept 7 + note D_, 5 + endr + loopchannel 3, .Loop2 +.Loop3 + notetype 7 + note C#, 3 + notetype 10 + note C#, 2 + loopchannel 4, .Loop3 + notetype 7 + note F_, 12 + endchannel + diff --git a/crysaudio/music/TCG2/fort1.asm b/crysaudio/music/TCG2/fort1.asm new file mode 100644 index 00000000..19f5fcb8 --- /dev/null +++ b/crysaudio/music/TCG2/fort1.asm @@ -0,0 +1,1350 @@ +Music_TCG2Fort1: + db $C0 + dw Music_TCG2Fort1_Ch1 + db $01 + dw Music_TCG2Fort1_Ch2 + db $02 + dw Music_TCG2Fort1_Ch3 + db $03 + dw Music_TCG2Fort1_Ch4 + +Music_TCG2Fort1_Ch2: + notetype1 10 + notetype0 1 + octave 2 + note A#, 3 + note B_, 3 + inc_octave + note C_, 3 + note C#, 6 + note C#, 2 + note C#, 16 + note __, 7 + note E_, 6 + note E_, 16 + note __, 2 + vibrato 16, $33 + octave 4 + note D#, 3 + note E_, 4 +.MainLoop + callchannel Branch_1ed865 + note C#, 16 + note C#, 15 + note E_, 2 + note F#, 14 + note F#, 8 + note F#, 7 + callchannel Branch_1ed865 + note C#, 16 + note D#, 15 + note E_, 16 + note F#, 15 + callchannel Branch_1ed8a8 + note G_, 16 + note F#, 15 + note E_, 16 + note D_, 8 + note D_, 15 + note D_, 8 + dec_octave + note B_, 8 + note B_, 15 + note B_, 8 + inc_octave + note D#, 3 + note E_, 12 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 + note D#, 2 + note E_, 14 + note E_, 15 + note F#, 16 + note F#, 15 + callchannel Branch_1ed8a8 + note G_, 16 + note F#, 15 + note E_, 16 + note D_, 8 + note D_, 15 + note D_, 8 + dec_octave + note B_, 8 + note B_, 7 + inc_octave + note D#, 2 + note E_, 14 + note E_, 15 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 13 + note E_, 2 + note D#, 6 + note D#, 16 + note __, 9 + note D#, 6 + note D#, 16 + note __, 9 + note F#, 16 + note G#, 8 + note G#, 7 + callchannel Branch_1edb5a + octave 4 + note B_, 8 + note B_, 15 + note B_, 8 + note D#, 8 + note D#, 7 + callchannel Branch_1edb5a + octave 4 + note F#, 8 + note F#, 7 + note F#, 16 + note E_, 8 + note E_, 7 + note E_, 16 + note E_, 8 + note E_, 7 + note E_, 16 + note D#, 15 + note E_, 16 + note F#, 8 + note F#, 7 + note F#, 16 + note G#, 8 + note G#, 7 + callchannel Branch_1edb5a + octave 4 + note B_, 8 + note B_, 15 + note B_, 8 + note D#, 8 + note D#, 7 + callchannel Branch_1edb5a + octave 4 + note D#, 2 + note E_, 13 + note E_, 16 + note E_, 15 + callchannel Branch_1edb5a + octave 4 + note E_, 15 + note E_, 16 + note D#, 15 + note E_, 16 + note F#, 8 + note F#, 7 + note F#, 16 + note G#, 8 + note G#, 7 + callchannel Branch_1edb5a + octave 4 + note B_, 8 + note B_, 15 + note B_, 8 + note D#, 8 + note D#, 7 + callchannel Branch_1edb5a + octave 4 + note F#, 8 + note F#, 7 + note F#, 16 + note E_, 8 + note E_, 7 + note E_, 16 + note E_, 8 + note E_, 7 + note E_, 16 + note D#, 15 + note E_, 16 + note F#, 8 + note F#, 7 + note F#, 16 + note G#, 8 + note G#, 7 + callchannel Branch_1edb5a + octave 4 + note B_, 8 + note B_, 15 + note B_, 8 + note D#, 8 + note D#, 7 + callchannel Branch_1edb5a + octave 4 + note D#, 2 + note E_, 13 + note E_, 16 + note E_, 15 + callchannel Branch_1edb5a + octave 4 + note E_, 15 + note E_, 16 + note D#, 15 + note E_, 16 + note F#, 8 + note F#, 7 + note F#, 16 + note G_, 8 + note G_, 7 + callchannel Branch_1edb5a + octave 4 + note B_, 8 + note B_, 15 + note B_, 8 + note G_, 8 + note G_, 7 + callchannel Branch_1edb5a + octave 4 + note G_, 2 + note A_, 13 + note A_, 16 + note A_, 15 + callchannel Branch_1edb5a + octave 4 + note F#, 15 + note F#, 16 + note F#, 15 + callchannel Branch_1edb5a + octave 4 + note F#, 8 + note F#, 7 + note G_, 16 + note F#, 8 + note F#, 7 + note E_, 8 + note E_, 8 + note D_, 8 + note D_, 15 + note D_, 8 + dec_octave + note B_, 8 + note B_, 15 + note B_, 8 + inc_octave + note D#, 2 + note E_, 13 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 + note E_, 16 + note E_, 15 +.Loop1 + note D#, 6 + note D#, 16 + note __, 9 + loopchannel 2, .Loop1 + loopchannel 0, .MainLoop + +Branch_1ed865: + octave 4 + note D#, 16 + note C#, 15 + note D#, 16 + note G#, 8 + note G#, 15 + note G#, 8 + dec_octave + note B_, 8 + note B_, 15 + note B_, 8 + inc_octave + note D_, 2 + note D#, 6 + note D#, 7 + note D#, 16 + note C#, 8 + note C#, 7 + note C#, 16 + note C#, 8 + note C#, 7 + note C#, 16 + note D#, 15 + note E_, 16 + note F#, 8 + note F#, 7 + note D#, 16 + note C#, 15 + note D#, 16 + note G#, 8 + note G#, 15 + note G#, 8 + dec_octave + note B_, 8 + note B_, 15 + note B_, 8 + inc_octave + note C_, 2 + note C#, 13 + note C#, 16 + note C#, 15 + note C#, 16 + note C#, 15 + endchannel + +Branch_1ed8a8: + octave 4 + note G_, 16 + note F#, 15 + note G_, 16 + note B_, 8 + note B_, 15 + note B_, 8 + note G_, 8 + note G_, 15 + note G_, 8 + note G#, 3 + note A_, 12 + note A_, 16 + note A_, 15 + note A_, 16 + note F#, 15 + note F#, 16 + note F#, 15 + note F#, 16 + note F#, 8 + note F#, 7 + endchannel + + +Music_TCG2Fort1_Ch1: + notetype1 10 + notetype0 1 + dutycycle 0 + notetype1 9 + vibrato 18, $33 + octave 2 + note __, 9 + note A_, 6 + note A_, 16 + note __, 9 + inc_octave + note C#, 6 + note C#, 10 + note __, 8 + note __, 7 +.MainLoop + octave 3 +.Loop1 + note __, 16 + note __, 15 + note D#, 6 + note D#, 10 + note __, 15 + loopchannel 2, .Loop1 +.Loop2 + note __, 16 + note __, 15 + note C#, 6 + note C#, 10 + note __, 15 + loopchannel 2, .Loop2 +.Loop3 + note __, 16 + note __, 15 + note D#, 6 + note D#, 10 + note __, 15 + loopchannel 2, .Loop3 + note __, 16 + note __, 15 + note C#, 6 + note C#, 10 + note __, 15 + notetype1 8 + note D#, 3 + note E_, 13 + note E_, 15 + note D#, 16 + note D#, 15 + dec_octave + note B_, 16 + note B_, 15 + octave 3 + note D#, 6 + note D#, 10 + note __, 15 + note __, 16 + note __, 15 + note D#, 6 + note D#, 10 + note __, 15 +.Loop4 + note __, 16 + note __, 15 + note C#, 6 + note C#, 10 + note __, 15 + loopchannel 2, .Loop4 +.Loop5 + note __, 16 + note __, 15 + note D#, 6 + note D#, 10 + note __, 15 + loopchannel 2, .Loop5 + note __, 16 + note __, 15 + note C#, 6 + note C#, 10 + note __, 8 + octave 4 + note D_, 3 + note D#, 4 + note E_, 16 + dec_octave + note B_, 15 + inc_octave + note C#, 16 + note D#, 15 + note E_, 16 + note D_, 15 + callchannel Branch_1edb4e + octave 4 + note G_, 8 + note G_, 15 + note G_, 8 + note E_, 8 + note E_, 7 + callchannel Branch_1edb4e + octave 4 + note F#, 15 + note F#, 16 + note F#, 15 + callchannel Branch_1edb4e + inc_octave + note D_, 15 + note D_, 16 + note D_, 15 + callchannel Branch_1edb4e + octave 4 + note D_, 8 + note D_, 7 + note E_, 16 + note D_, 15 + callchannel Branch_1edb4e + note B_, 8 + note B_, 15 + note B_, 8 + note G_, 8 + note G_, 7 + callchannel Branch_1edb4e + octave 4 + note C_, 15 + note C_, 16 + note C_, 15 + callchannel Branch_1edb4e + octave 4 + note __, 15 + note C_, 16 + note C_, 15 + note D_, 16 + note D_, 15 + note E_, 16 + note D_, 15 + callchannel Branch_1edb4e + octave 4 + note G_, 8 + note G_, 15 + note G_, 8 + note E_, 8 + note E_, 7 + callchannel Branch_1edb4e + octave 4 + note F#, 15 + note F#, 16 + note F#, 15 + callchannel Branch_1edb4e + octave 4 + note D_, 15 + note D_, 16 + note D_, 15 + callchannel Branch_1edb4e + octave 4 + note D_, 8 + note D_, 7 + note E_, 16 + note D_, 15 + note C_, 16 + dec_octave + note B_, 8 + note B_, 15 + note B_, 8 + octave 3 + note D_, 6 + note D_, 9 + inc_octave + note C_, 16 + note C_, 15 + note C_, 16 + dec_octave + note G_, 8 + note G_, 7 + note A_, 16 + note A_, 15 + note A_, 16 + note B_, 8 + note B_, 7 + inc_octave + note C_, 16 + note C_, 15 + dec_octave + note D_, 4 + note E_, 4 + note F_, 4 + note G_, 4 + note A_, 4 + note B_, 4 + inc_octave + note C_, 4 + note D_, 3 + dec_octave + note A_, 6 + note A_, 16 + note __, 9 + note A_, 6 + note A_, 16 + note __, 9 + inc_octave + note D#, 16 + note E_, 8 + note E_, 7 + callchannel Branch_1edb4e + octave 4 + note G#, 8 + note G#, 15 + note G#, 8 + dec_octave + note B_, 8 + note B_, 7 + callchannel Branch_1edb4e + octave 4 + note D#, 8 + note D#, 7 + note D#, 16 + note C#, 8 + note C#, 7 + callchannel Branch_1edb4e + note __, 8 + note __, 7 + octave 4 + note C#, 16 + dec_octave + note B_, 15 + callchannel Branch_1edb4e + octave 4 + note D#, 8 + note D#, 7 + note D#, 16 + note E_, 8 + note E_, 7 + callchannel Branch_1edb4e + octave 4 + note G#, 8 + note G#, 15 + note G#, 8 + dec_octave + note B_, 8 + note B_, 7 + callchannel Branch_1edb4e + octave 4 + note C#, 15 + note C#, 16 + note C#, 15 + callchannel Branch_1edb4e + octave 3 + note A_, 15 + note A_, 8 + note A_, 8 + note A_, 15 + callchannel Branch_1edb4e + octave 4 + note D#, 8 + note D#, 7 + note D#, 16 + note E_, 8 + note E_, 7 + callchannel Branch_1edb4e + octave 4 + note G#, 8 + note G#, 15 + note G#, 8 + dec_octave + note B_, 8 + note B_, 7 + callchannel Branch_1edb4e + octave 4 + note D#, 8 + note D#, 7 + note D#, 16 + note C#, 8 + note C#, 7 + callchannel Branch_1edb4e + note __, 8 + note __, 7 + octave 4 + note C#, 16 + dec_octave + note B_, 15 + callchannel Branch_1edb4e + octave 4 + note D#, 8 + note D#, 7 + note D#, 16 + note E_, 8 + note E_, 7 + callchannel Branch_1edb4e + octave 4 + note G#, 8 + note G#, 15 + note G#, 8 + dec_octave + note B_, 8 + note B_, 7 + callchannel Branch_1edb4e + octave 4 + note C#, 15 + note C#, 16 + note C#, 15 + callchannel Branch_1edb4e + octave 3 + note A_, 15 + note A_, 8 + note A_, 8 + note A_, 15 + callchannel Branch_1edb4e + octave 3 + note A_, 15 + inc_octave + note D_, 16 + note E_, 8 + note E_, 7 + callchannel Branch_1edb4e + octave 4 + note G_, 8 + note G_, 15 + note G_, 8 + note E_, 8 + note E_, 7 + callchannel Branch_1edb4e + octave 4 + note F#, 15 + note F#, 16 + note F#, 15 + callchannel Branch_1edb4e + octave 4 + note D_, 15 + note D_, 16 + note D_, 15 + callchannel Branch_1edb4e + octave 4 + note D_, 8 + note D_, 7 + note E_, 16 + note D_, 8 + note D_, 7 + callchannel Branch_1edb4e + octave 3 + note B_, 8 + note B_, 15 + note B_, 8 + note G_, 8 + note G_, 7 + callchannel Branch_1edb4e + octave 4 + note C_, 15 + note C_, 16 + note C_, 15 + note C_, 16 + dec_octave + note G_, 8 + note G_, 7 + note A_, 16 + note A_, 15 + note A_, 16 + note B_, 8 + note B_, 7 + inc_octave + note C_, 16 + note C_, 15 + dec_octave + note D_, 4 + note E_, 4 + note F_, 4 + note G_, 4 + note A_, 4 + note B_, 4 + inc_octave + note C_, 4 + note D_, 3 + dec_octave +.Loop6 + note A_, 6 + note A_, 16 + note __, 9 + loopchannel 2, .Loop6 + loopchannel 0, .MainLoop + +Branch_1edb4e: + octave 3 + note E_, 6 + note E_, 10 + endchannel + +Branch_1edb5a: + octave 3 + note E_, 6 + note E_, 10 + endchannel + + +Music_TCG2Fort1_Ch3: + notetype1 10 + notetype0 1 + notetype2 14 + notetype1 1 + octave 2 + note __, 9 + note F#, 6 + note F#, 16 + note __, 9 + note B_, 6 + note B_, 16 + note __, 9 +.MainLoop + octave 2 + note E_, 16 + note E_, 15 + inc_octave + note G#, 16 + dec_octave + note B_, 15 + inc_octave + note E_, 16 + dec_octave + note E_, 15 + inc_octave + note G#, 16 + dec_octave + note E_, 15 + note A_, 16 + note A_, 15 + inc_octave + note G#, 16 + note A_, 15 + note __, 16 + note E_, 15 + note G#, 16 + dec_octave + note A_, 15 + note E_, 16 + note E_, 15 + inc_octave + note G#, 16 + dec_octave + note B_, 15 + inc_octave + note E_, 16 + dec_octave + note E_, 15 + inc_octave + note G#, 16 + dec_octave + note E_, 15 + note A_, 16 + note A_, 15 + inc_octave + note G#, 16 + note A_, 15 + dec_octave + note A_, 16 + note A_, 15 + note B_, 16 + note B_, 15 + note E_, 16 + note E_, 15 + inc_octave + note G#, 16 + dec_octave + note B_, 15 + inc_octave + note E_, 16 + dec_octave + note E_, 15 + inc_octave + note G#, 16 + dec_octave + note E_, 15 + note A_, 16 + note A_, 15 + inc_octave + note G#, 16 + note A_, 15 + note __, 16 + note E_, 15 + note G#, 16 + dec_octave + note A_, 15 + note E_, 16 + note E_, 15 + inc_octave + note G#, 16 + dec_octave + note B_, 15 + inc_octave + note E_, 16 + dec_octave + note E_, 15 + inc_octave + note G#, 16 + dec_octave + note E_, 15 + note A_, 16 + note A_, 15 + inc_octave + note G#, 16 + note A_, 15 + dec_octave + note A_, 16 + note A_, 15 + note B_, 16 + note B_, 15 + inc_octave + note C_, 16 + note C_, 15 + note B_, 16 + dec_octave + note G_, 15 + inc_octave + note C_, 16 + dec_octave + note G_, 15 + inc_octave + note B_, 16 + dec_octave + note B_, 15 + note B_, 8 + note __, 8 + note B_, 15 + inc_octave + note A_, 16 + note B_, 15 + note __, 16 + note F#, 15 + note A_, 16 + dec_octave + note B_, 15 + note A_, 8 + note __, 8 + note A_, 15 + inc_octave + note G_, 16 + dec_octave + note A_, 15 + note B_, 8 + note __, 8 + note B_, 15 + inc_octave + note A_, 16 + dec_octave + note B_, 4 + inc_octave + note C_, 11 + note C_, 16 + note C_, 15 + note B_, 16 + dec_octave + note G_, 15 + inc_octave + note C_, 16 + note C_, 15 + dec_octave + note B_, 16 + note B_, 15 + note A_, 16 + note A_, 15 + inc_octave + inc_octave + note C_, 16 + dec_octave + dec_octave + note E_, 15 + note A_, 16 + note E_, 15 + inc_octave + inc_octave + note C_, 16 + dec_octave + dec_octave + note B_, 15 + note B_, 8 + note __, 8 + note B_, 15 + inc_octave + note A_, 16 + note B_, 15 + note __, 16 + note F#, 15 + note A_, 16 + dec_octave + note B_, 15 + inc_octave + note C_, 8 + note __, 8 + note G_, 8 + note __, 7 + inc_octave + note G_, 16 + dec_octave + dec_octave + note B_, 8 + note __, 7 + inc_octave + note F#, 8 + note __, 8 + note F#, 8 + note __, 7 + dec_octave + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 + inc_octave + note C_, 16 + dec_octave + note F_, 8 + note __, 7 + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 + inc_octave + note C_, 16 + dec_octave + note F_, 8 + note __, 7 + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 + inc_octave + note C_, 16 + note F_, 8 + note __, 7 + dec_octave + note B_, 10 + note __, 16 + note __, 5 + note B_, 10 + note __, 16 + note __, 5 + note E_, 8 + note __, 8 + note E_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note E_, 8 + note __, 8 + note E_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note A_, 8 + note __, 8 + note A_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note A_, 8 + note __, 8 + note A_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note E_, 8 + note __, 8 + note E_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note E_, 8 + note __, 8 + note E_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note A_, 8 + note __, 8 + note A_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note B_, 8 + note __, 8 + note B_, 7 + note __, 8 + inc_octave + note A_, 16 + note F#, 8 + note __, 7 + dec_octave + note E_, 8 + note __, 8 + note E_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note E_, 8 + note __, 8 + note E_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note A_, 8 + note __, 8 + note A_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note A_, 8 + note __, 8 + note A_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note E_, 8 + note __, 8 + note E_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note E_, 8 + note __, 8 + note E_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note A_, 8 + note __, 8 + note A_, 7 + note __, 8 + inc_octave + note G#, 16 + note E_, 8 + note __, 7 + dec_octave + note B_, 8 + note __, 8 + note B_, 7 + note __, 8 + inc_octave + note A_, 16 + note F#, 8 + note __, 7 + note C_, 8 + note __, 8 + note C_, 7 + note __, 8 + note G_, 16 + note G_, 8 + note __, 7 + note C_, 8 + note __, 8 + note C_, 7 + note __, 8 + note G_, 16 + note G_, 8 + note __, 7 + dec_octave + note G_, 8 + note __, 8 + note G_, 7 + note __, 8 + inc_octave + note B_, 16 + note D_, 8 + note __, 7 + dec_octave + note G_, 8 + note __, 8 + note G_, 7 + note __, 8 + inc_octave + note B_, 16 + note D_, 8 + note __, 7 + dec_octave + note A_, 8 + note __, 8 + inc_octave + note E_, 8 + note __, 7 + note G_, 16 + dec_octave + note B_, 15 + note B_, 16 + inc_octave + note A_, 15 + note F#, 8 + note __, 8 + dec_octave + note B_, 8 + note __, 7 + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 + note F_, 8 + note __, 8 + note F_, 8 + note __, 7 +.Loop1 + note B_, 7 + note B_, 16 + note __, 8 + loopchannel 2, .Loop1 + loopchannel 0, .MainLoop + + +Music_TCG2Fort1_Ch4: + togglenoise $06 + notetype 1 + note __, 1 + octave 1 + note __, 9 + note F#, 16 + note __, 15 + note F#, 16 + note __, 15 +.MainLoop +.Loop1 + callchannel Branch_1edebb + callchannel Branch_1edec8 + loopchannel 3, .Loop1 + callchannel Branch_1edebb + callchannel Branch_1eded5 + callchannel Branch_1edebb + callchannel Branch_1edec8 + callchannel Branch_1edebb + callchannel Branch_1eded5 + callchannel Branch_1edebb + callchannel Branch_1edec8 + note C_, 16 + note D#, 15 + note F#, 16 + note C_, 15 + note D#, 16 + note F#, 15 + note C_, 16 + note D#, 15 + note C_, 16 + note D#, 8 + note D#, 7 + note C_, 16 + note D#, 15 + note C_, 16 + note D#, 15 + note C_, 16 + note D#, 15 + note C_, 16 + note D_, 5 + note D_, 5 + note D_, 5 + note D_, 16 + note D#, 5 + note D#, 5 + note D#, 5 + note D_, 16 + note __, 15 +.Loop2 + callchannel Branch_1edee2 + callchannel Branch_1edeef + loopchannel 3, .Loop2 + callchannel Branch_1edee2 + note C_, 16 + note D#, 15 + note D_, 16 + note D#, 8 + note D#, 7 + note C_, 16 + note D#, 8 + note D_, 7 + note D_, 8 + note D_, 8 + note D_, 15 + callchannel Branch_1edee2 + callchannel Branch_1edee2 + note C_, 16 + note E_, 15 + note D_, 16 + note D_, 15 + note C_, 16 + note D_, 5 + note D_, 5 + note D_, 5 + note D_, 16 + note D#, 15 + note D_, 16 + note D#, 15 + note D_, 16 + note D#, 8 + note D#, 7 + note D_, 16 + note D#, 15 + note D_, 16 + note D#, 15 + note D_, 16 + note D#, 15 + note D_, 16 + note D_, 5 + note D_, 5 + note D_, 5 + note D_, 16 + note D#, 5 + note D#, 5 + note D#, 5 + note D_, 16 + note __, 15 + loopchannel 0, .MainLoop + +Branch_1edebb: + octave 1 + notetype 1 + note C_, 16 + note D#, 15 + note F#, 16 + note D#, 8 + note D#, 7 + note C_, 16 + note D#, 15 + note F#, 16 + note D#, 15 + endchannel + +Branch_1edec8: + octave 1 + notetype 1 + note C_, 16 + note D#, 15 + note F#, 16 + note D#, 8 + note D#, 7 + note C_, 16 + note D#, 15 + note F#, 16 + note E_, 15 + endchannel + +Branch_1eded5: + octave 1 + notetype 1 + note C_, 16 + note D#, 15 + note F#, 16 + note D#, 8 + note D#, 7 + note F#, 16 + note C_, 15 + note F#, 16 + note C_, 15 + endchannel + +Branch_1edee2: + octave 1 + notetype 1 + note C_, 16 + note D#, 15 + note D_, 16 + note D#, 8 + note D#, 7 + note C_, 16 + note D#, 15 + note D_, 16 + note D#, 15 + endchannel + +Branch_1edeef: + octave 1 + notetype 1 + note C_, 16 + note D#, 15 + note D_, 16 + note D#, 8 + note D#, 7 + note C_, 16 + note D#, 15 + note D_, 16 + note E_, 15 + endchannel + diff --git a/crysaudio/music/TCG2/fort2.asm b/crysaudio/music/TCG2/fort2.asm new file mode 100644 index 00000000..db2a5da7 --- /dev/null +++ b/crysaudio/music/TCG2/fort2.asm @@ -0,0 +1,1837 @@ +Music_TCG2Fort2: + db $C0 + dw Music_TCG2Fort2_Ch1 + db $01 + dw Music_TCG2Fort2_Ch2 + db $02 + dw Music_TCG2Fort2_Ch3 + db $03 + dw Music_TCG2Fort2_Ch4 + +Music_TCG2Fort2_Ch2: + notetype1 10 + notetype0 1 +.MainLoop + octave 3 +.Loop1 + note __, 8 + callchannel Branch_1ee109 + note __, 4 + note G_, 3 + note __, 4 + note __, 8 + callchannel Branch_1ee109 + note G_, 4 + note F#, 3 + note G_, 4 + loopchannel 4, .Loop1 + vibrato 30, $33 + octave 2 + note B_, 15 + inc_octave + note D_, 8 + note D_, 7 + note F#, 15 + note E_, 8 + note E_, 7 + note G#, 2 + note A_, 15 + note A_, 6 + note G_, 7 + note G_, 15 + note C#, 15 + note C#, 10 + note C#, 15 + note C#, 15 + note C#, 5 + note C#, 15 + note C#, 4 + note C#, 11 + note D_, 4 + note D_, 11 + note C#, 5 + note D_, 5 + note C#, 5 + dec_octave + note A_, 8 + note A_, 7 + note A#, 3 + note B_, 5 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 10 + note B_, 15 + note __, 8 + note A_, 3 + note A#, 4 + note B_, 15 + inc_octave + note D_, 8 + note D_, 7 + note F#, 15 + note E_, 8 + note E_, 7 + note G#, 2 + note A_, 15 + note A_, 6 + note G_, 7 + note G_, 15 + note C_, 15 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 10 + dec_octave + note B_, 5 + inc_octave + note C_, 5 + dec_octave + note B_, 5 + note G_, 8 + note G_, 7 + note G#, 2 + note A_, 16 + note A_, 5 + inc_octave + note D_, 1 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 10 + note D_, 8 + octave 3 + note D#, 15 + vibrato 30, $33 + octave 2 + note A_, 3 + note A#, 4 + note B_, 15 + inc_octave + note D_, 8 + note D_, 7 + note F#, 15 + note E_, 8 + note E_, 7 + note G#, 2 + note A_, 15 + note A_, 6 + note G_, 7 + note G_, 15 + note C#, 15 + note C#, 8 + note C#, 16 + note C#, 16 + note C#, 5 + note C#, 15 + note C#, 4 + note C#, 11 + note D_, 4 + note D_, 11 + note C#, 5 + note D_, 5 + note C#, 5 + dec_octave + note A_, 8 + note A_, 7 + note A#, 3 + note B_, 5 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 15 + note B_, 15 + note B_, 15 + note B_, 8 + inc_octave + note E_, 3 + note F_, 4 + note F#, 15 + note G_, 8 + note G_, 7 + note A_, 15 + note B_, 8 + note B_, 7 + note F_, 2 + note F#, 16 + note F#, 5 + note E_, 16 + note E_, 16 + note E_, 5 + note E_, 15 + note E_, 15 + note G#, 2 + note A_, 16 + note A_, 5 + note G#, 3 + note G_, 4 + note F#, 15 + note F#, 15 + note F#, 15 + note F#, 15 + note F#, 4 + note F#, 11 + note G_, 4 + note G_, 11 + note F#, 5 + note G_, 5 + note F#, 5 + note D_, 8 + note D_, 7 + note F_, 3 + note F#, 16 + note F#, 16 + note F#, 16 + note F#, 16 + note F#, 16 + note F#, 16 + note F#, 16 + note F#, 5 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 10 + note E_, 15 + note E_, 15 +.Loop2 + octave 2 + note A#, 8 + inc_octave + note C_, 7 + note F_, 8 + note A#, 5 + note A#, 10 + note A_, 5 + note A_, 10 + note F_, 5 + note F_, 10 + note G_, 5 + note G_, 10 + note C_, 3 + note C_, 4 + vibrato 8, $33 + note C_, 8 + note C_, 15 + note C_, 7 + vibrato 0, $33 + dec_octave + note A#, 8 + inc_octave + note C_, 7 + note F_, 8 + note A#, 5 + note A#, 10 + note A_, 5 + note A_, 10 + note F_, 5 + note F_, 10 + note G_, 5 + note G_, 10 + inc_octave + note C_, 3 + note C_, 4 + vibrato 8, $33 + note C_, 8 + note C_, 15 + note C_, 7 + vibrato 0, $33 + loopchannel 2, .Loop2 + octave 3 + note C#, 8 + note D#, 7 + note G#, 8 + inc_octave + note C#, 5 + note C#, 10 + note C_, 5 + note C_, 10 + dec_octave + note G#, 5 + note G#, 10 + note A#, 5 + note A#, 10 + note D#, 3 + note D#, 4 + vibrato 8, $33 + note D#, 8 + note D#, 15 + note D#, 7 + vibrato 0, $33 + note C#, 8 + note D#, 7 + note G#, 8 + inc_octave + note C#, 5 + note C#, 10 + note C_, 5 + note C_, 10 + dec_octave + note G#, 5 + note G#, 10 + note A#, 5 + note A#, 10 + inc_octave + note D#, 3 + note D#, 4 + vibrato 8, $33 + note D#, 8 + note D#, 15 + note D#, 7 + vibrato 0, $33 + octave 3 + note C#, 8 + note D#, 7 + note G#, 8 + inc_octave + note C#, 5 + note C#, 10 + note C_, 5 + note C_, 10 + dec_octave + note G#, 5 + note G#, 10 + note A#, 5 + note A#, 10 + note D#, 3 + note D#, 4 + vibrato 8, $33 + note D#, 8 + note D#, 15 + note D#, 7 + vibrato 0, $33 + note C#, 8 + note D#, 7 + note G#, 8 + inc_octave + note C#, 5 + note C#, 10 + note C_, 5 + note C_, 10 + dec_octave + note G#, 3 + note G#, 4 + note G_, 2 + note G#, 13 + note G#, 8 + note A#, 15 + note A#, 7 + vibrato 15, $33 + note B_, 15 + note B_, 15 + note B_, 15 + note B_, 15 + note A#, 2 + vibrato 2, $33 + note B_, 13 + note B_, 15 + note B_, 15 + loopchannel 0, .MainLoop + +Branch_1ee109: + octave 2 + note B_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note F#, 4 + note __, 4 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + note A_, 3 + note __, 12 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note G_, 4 + note __, 4 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note F#, 4 + endchannel + + +Music_TCG2Fort2_Ch1: + notetype1 10 + notetype0 1 +.MainLoop + octave 3 + note E_, 4 + note E_, 4 + inc_octave + note E_, 3 + dec_octave + note E_, 4 + inc_octave + inc_octave + note E_, 4 + dec_octave + note E_, 4 + note E_, 3 + inc_octave + note E_, 4 + inc_octave + note E_, 4 + dec_octave + dec_octave + note E_, 4 + dec_octave + note E_, 3 + inc_octave + inc_octave + inc_octave + note E_, 4 + dec_octave + dec_octave + note E_, 4 + dec_octave + note E_, 4 + inc_octave + inc_octave + note E_, 3 + dec_octave + note E_, 4 + dec_octave + note E_, 4 + inc_octave + inc_octave + note E_, 4 + dec_octave + note E_, 3 + dec_octave + note E_, 4 + inc_octave + inc_octave + note E_, 4 + dec_octave + note E_, 4 + note E_, 3 + inc_octave + note E_, 4 + inc_octave + note E_, 4 + dec_octave + dec_octave + note E_, 4 + dec_octave + note E_, 3 + inc_octave + inc_octave + inc_octave + note E_, 4 + dec_octave + dec_octave + note E_, 4 + dec_octave + note E_, 4 + inc_octave + inc_octave + note E_, 3 + dec_octave + note E_, 4 +.Loop1 + dec_octave + note E_, 4 + inc_octave + inc_octave + note E_, 4 + dec_octave + note E_, 3 + dec_octave + note E_, 4 + inc_octave + inc_octave + note E_, 4 + dec_octave + note E_, 4 + note E_, 3 + inc_octave + note E_, 4 + inc_octave + note E_, 4 + dec_octave + dec_octave + note E_, 4 + dec_octave + note E_, 3 + inc_octave + inc_octave + inc_octave + note E_, 4 + dec_octave + dec_octave + note E_, 4 + dec_octave + note E_, 4 + inc_octave + inc_octave + note E_, 3 + dec_octave + note E_, 4 + loopchannel 14, .Loop1 +.Loop2 + note __, 8 + callchannel Branch_1ee109 + note __, 4 + note G_, 3 + note __, 4 + note __, 8 + callchannel Branch_1ee109 + note G_, 4 + note F#, 3 + note G_, 4 + loopchannel 2, .Loop2 + note __, 8 + callchannel Branch_1ee109 + note __, 4 + note G_, 3 + note __, 4 + note __, 8 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note C_, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note C_, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note C_, 4 + note __, 4 + note E_, 3 + note __, 12 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note C_, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note C_, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note C_, 4 + note E_, 4 + note D#, 3 + note E_, 4 + note __, 8 + callchannel Branch_1ee109 + note __, 4 + note G_, 3 + note __, 4 + note __, 8 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + note G_, 3 + note __, 12 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note D_, 4 + octave 3 + note F#, 4 + note G_, 7 + note G_, 8 + note G_, 3 + note __, 4 +.Loop3 + octave 2 + note __, 8 + callchannel Branch_1ee109 + note __, 4 + note G_, 3 + note __, 4 + note __, 8 + callchannel Branch_1ee109 + note G_, 4 + note F#, 3 + note G_, 4 + loopchannel 2, .Loop3 + note __, 8 + callchannel Branch_1ee109 + note __, 4 + note G_, 3 + note __, 4 + note __, 8 + octave 2 + note A_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note F#, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + note A_, 3 + note __, 12 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note G_, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note F#, 4 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + note __, 8 + callchannel Branch_1ee109 + note __, 4 + note G_, 3 + note __, 4 + note __, 8 + callchannel Branch_1ee109 + note G_, 4 + note F#, 3 + note G_, 4 +.Loop4 + note F_, 4 + note F_, 4 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note C_, 3 + note C_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 4 + note G_, 11 + note G_, 4 + note G_, 11 + note G_, 4 + note F_, 4 + note F_, 4 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note C_, 3 + note C_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 4 + vibrato 8, $33 + note G_, 14 + note G_, 16 + vibrato 0, $33 + loopchannel 2, .Loop4 + note F_, 4 + note F_, 4 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note C_, 3 + note C_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 4 + note G_, 11 + note G_, 4 + note G_, 11 + note G_, 4 + note F_, 4 + note F_, 4 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note C_, 3 + note C_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 4 + vibrato 8, $33 + note G_, 14 + note G_, 16 + vibrato 0, $33 + note F_, 4 + note F_, 4 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note C_, 3 + note C_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 4 + note G_, 11 + note G_, 4 + note G_, 11 + note G_, 4 + note F_, 4 + note F_, 4 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note F_, 3 + note F_, 12 + note C_, 3 + note C_, 4 + note C_, 2 + note C#, 13 + note C#, 8 + note D#, 15 + note D#, 7 + note E_, 15 + note E_, 8 + note A_, 5 + note A_, 2 + note D_, 4 + note D_, 4 + note D#, 3 + note D#, 4 + note E_, 4 + note E_, 4 + dec_octave + note B_, 3 + note B_, 12 + inc_octave + note G_, 5 + note G_, 2 + dec_octave + note A_, 4 + note A_, 4 + note A#, 3 + note A#, 4 + note B_, 4 + note B_, 4 + inc_octave + inc_octave + note G_, 5 + note G_, 2 + loopchannel 0, .MainLoop + + +Music_TCG2Fort2_Ch3: + notetype1 10 + notetype2 15 + notetype1 2 + octave 4 + octave 3 + notetype0 1 + note __, 15 + note __, 15 + octave 4 + note D_, 4 + note __, 4 + note __, 15 + note F#, 3 + note __, 4 + note __, 15 + note __, 15 + note D_, 4 + note __, 4 + note __, 7 + note D_, 4 + note __, 4 + note __, 7 +.MainLoop +.Loop1 + note __, 15 + note __, 15 + octave 4 + note D_, 4 + note __, 4 + note __, 15 + note F#, 3 + note __, 4 + note __, 15 + note __, 15 + note D_, 4 + note __, 4 + note __, 7 + note D_, 4 + note __, 4 + note __, 7 + loopchannel 2, .Loop1 + note __, 15 + note __, 15 + octave 4 + note D_, 4 + note __, 4 + note __, 15 + note F#, 3 + note __, 4 + note __, 15 + note __, 15 + note D_, 4 + note __, 4 + note __, 7 + notetype1 1 + octave 2 + note A_, 2 + note A#, 2 + note B_, 11 +.Loop2 + octave 2 + note E_, 15 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 2 + note E_, 4 + note __, 4 + note E_, 7 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + loopchannel 3, .Loop2 + octave 2 + note E_, 15 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 2 + note E_, 4 + note __, 4 + note E_, 7 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note D_, 7 + octave 2 + note C_, 15 + note __, 8 + note C_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note C_, 7 + note B_, 8 + inc_octave + inc_octave + note F#, 3 + note __, 4 + octave 3 + note C_, 8 + dec_octave + note C_, 7 + note C_, 1 + note __, 7 + note C_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note C_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note C_, 7 + octave 2 + note F_, 4 + note __, 4 + note F_, 7 + note __, 8 + note F_, 7 + octave 4 + note C_, 4 + note __, 4 + dec_octave + dec_octave + note F_, 7 + inc_octave + note E_, 8 + inc_octave + note C_, 3 + note __, 4 + octave 3 + note F_, 8 + dec_octave + note F_, 7 + note F_, 1 + note __, 7 + note F_, 7 + octave 4 + note C_, 4 + note __, 4 + octave 3 + note F_, 7 + octave 4 + note C_, 4 + note __, 4 + octave 3 + note F_, 7 + octave 2 + note F#, 15 + note __, 8 + note F#, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note F#, 7 + inc_octave + note E_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note F#, 8 + dec_octave + note F#, 7 + note F#, 1 + note __, 7 + note F#, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note F#, 7 + octave 4 + note D_, 4 + note __, 4 + octave 2 + note A#, 7 + note B_, 4 + note __, 4 + note B_, 7 + note __, 8 + note B_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note B_, 7 + inc_octave + note A_, 8 + inc_octave + note D_, 3 + note __, 4 + octave 3 + note B_, 8 + dec_octave + note B_, 7 + note B_, 1 + note __, 7 + note B_, 7 + note __, 8 + octave 2 + note E_, 2 + note F_, 13 + note F#, 4 + note __, 3 + octave 2 + note E_, 15 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 2 + note E_, 4 + note __, 4 + note E_, 7 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 2 + note E_, 15 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 2 + note E_, 4 + note __, 4 + note E_, 7 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note D_, 7 + octave 2 + note C_, 15 + note __, 8 + note C_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note C_, 7 + note B_, 8 + inc_octave + inc_octave + note F#, 3 + note __, 4 + octave 3 + note C_, 8 + dec_octave + note C_, 7 + note C_, 1 + note __, 7 + note C_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note C_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note C_, 7 + octave 2 + note D_, 15 + note __, 8 + note D_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note D_, 7 + note A_, 8 + inc_octave + inc_octave + note F#, 3 + note __, 4 + octave 2 + note B_, 8 + note B_, 7 + note B_, 1 + note __, 7 + note B_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note B_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note B_, 7 + octave 2 + note E_, 15 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 2 + note E_, 4 + note __, 4 + note E_, 7 + note __, 8 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + dec_octave + dec_octave + note E_, 7 + inc_octave + note D_, 8 + inc_octave + note F#, 3 + note __, 4 + octave 3 + note E_, 8 + dec_octave + note E_, 7 + note E_, 1 + note __, 7 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 4 + note D_, 4 + note __, 4 + octave 3 + note E_, 7 + octave 2 +.Loop3 + note C_, 15 + note __, 8 + note C_, 4 + note __, 3 + inc_octave + note C_, 8 + dec_octave + note C_, 4 + note __, 11 + note C_, 4 + note __, 11 + inc_octave + note C_, 4 + note __, 3 + dec_octave + note C_, 8 + note C_, 4 + note __, 3 + note D_, 15 + note D_, 15 + note C_, 15 + note __, 8 + note C_, 4 + note __, 3 + inc_octave + note C_, 8 + dec_octave + note C_, 4 + note __, 11 + note C_, 4 + note __, 11 + inc_octave + note C_, 4 + note __, 3 + dec_octave + note C_, 8 + note C_, 4 + note __, 3 + note D_, 15 + note D_, 15 + loopchannel 2, .Loop3 + octave 2 + note D#, 15 + note __, 8 + note D#, 4 + note __, 3 + inc_octave + note D#, 8 + dec_octave + note D#, 4 + note __, 11 + note D#, 4 + note __, 11 + inc_octave + note D#, 4 + note __, 3 + dec_octave + note D#, 8 + note D#, 4 + note __, 3 + note F_, 15 + note F_, 15 + note D#, 15 + note __, 8 + note D#, 4 + note __, 3 + inc_octave + note D#, 8 + dec_octave + note D#, 4 + note __, 11 + note D#, 4 + note __, 11 + inc_octave + note D#, 4 + note __, 3 + dec_octave + note D#, 8 + note D#, 4 + note __, 3 + note F_, 15 + note F_, 15 + note D#, 15 + note __, 8 + note D#, 4 + note __, 3 + inc_octave + note D#, 8 + dec_octave + note D#, 4 + note __, 11 + note D#, 4 + note __, 11 + inc_octave + note D#, 4 + note __, 3 + dec_octave + note D#, 8 + note D#, 4 + note __, 3 + note F_, 15 + note F_, 15 + note D#, 15 + note __, 8 + note D#, 4 + note __, 3 + inc_octave + note D#, 8 + dec_octave + note D#, 4 + note __, 11 + note D#, 4 + note __, 3 + note D#, 15 + note __, 8 + note F_, 15 + note F_, 7 + note F#, 15 + note F#, 8 + octave 4 + notetype1 2 + note E_, 7 + notetype1 1 + octave 3 + note E_, 8 + note F_, 7 + note F#, 8 + dec_octave + note F#, 7 + note B_, 8 + octave 4 + notetype1 2 + note D_, 7 + octave 3 + notetype1 2 + note A_, 8 + note A#, 7 + note B_, 8 + notetype1 2 + octave 5 + note D_, 7 + notetype1 1 + octave 2 + note E_, 8 + note __, 7 + note __, 15 + octave 4 + note D_, 4 + note __, 4 + note __, 15 + note F#, 3 + note __, 4 + note __, 15 + note __, 15 + note D_, 4 + note __, 4 + note __, 7 + note D_, 4 + note __, 4 + note __, 7 + loopchannel 0, .MainLoop + + +Music_TCG2Fort2_Ch4: + togglenoise $06 + notetype 1 + octave 1 +.MainLoop +.Loop1 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note E_, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + loopchannel 3, .Loop1 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note E_, 7 + note C_, 8 + note D#, 7 + note E_, 8 + note C#, 3 + note C#, 4 + note C#, 8 + note C#, 7 + note C_, 8 + note C#, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note E_, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note C#, 7 + callchannel Branch_1ee771 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note E_, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note C#, 3 + note C#, 4 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 +.Loop2 + callchannel Branch_1ee771 + loopchannel 7, .Loop2 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note C#, 3 + note C#, 4 + note C#, 8 + note C#, 7 + note C_, 8 + note C#, 7 + note C#, 8 + note E_, 15 + note C#, 7 +.Loop3 + callchannel Branch_1ee771 + loopchannel 6, .Loop3 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note E_, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note C#, 3 + note C#, 4 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + callchannel Branch_1ee785 + note C_, 8 + note D#, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note E_, 7 + note D#, 8 + note C_, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note C_, 7 + note C#, 15 + note D#, 4 + note D#, 4 + note D#, 3 + note D#, 4 + callchannel Branch_1ee785 + note C_, 8 + note D#, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note E_, 7 + note D#, 8 + note C_, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 3 + note C#, 4 + note C#, 8 + note C#, 7 + callchannel Branch_1ee785 + note C_, 8 + note D#, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note E_, 7 + note D#, 8 + note C_, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note C_, 7 + note C#, 15 + note D#, 4 + note D#, 4 + note D#, 3 + note D#, 4 + callchannel Branch_1ee785 + note C_, 8 + note D#, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note E_, 7 + note D#, 8 + note C_, 7 + note E_, 15 + note C#, 8 + note E_, 15 + note C#, 7 + note E_, 15 + note D#, 8 + note C#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note C#, 7 + note D#, 8 + note C#, 7 + note E_, 8 + note C#, 4 + note C#, 3 + note C#, 8 + note C#, 3 + note __, 4 + loopchannel 0, .MainLoop + +Branch_1ee771: + octave 1 + notetype 1 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note E_, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note C#, 7 + endchannel + +Branch_1ee785: + octave 1 + notetype 1 + note C_, 8 + note D#, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note E_, 7 + note D#, 8 + note C_, 7 + note D#, 8 + note C#, 7 + note D#, 8 + note C_, 7 + note C#, 15 + note C#, 15 + endchannel + diff --git a/crysaudio/music/TCG2/fort3.asm b/crysaudio/music/TCG2/fort3.asm new file mode 100644 index 00000000..2fad55a0 --- /dev/null +++ b/crysaudio/music/TCG2/fort3.asm @@ -0,0 +1,1855 @@ +Music_TCG2Fort3: + db $C0 + dw Music_TCG2Fort3_Ch1 + db $01 + dw Music_TCG2Fort3_Ch2 + db $02 + dw Music_TCG2Fort3_Ch3 + db $03 + dw Music_TCG2Fort3_Ch4 + +Music_TCG2Fort3_Ch2: + notetype1 10 + notetype0 1 + note __, 14 +.MainLoop + octave 3 + vibrato 60, $33 + note __, 15 + note __, 14 + note C_, 4 + note C#, 4 + note D_, 14 + note C_, 7 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note __, 15 + note __, 14 + dec_octave + note A#, 4 + inc_octave + note C_, 4 + note C_, 14 + dec_octave + note A#, 7 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + inc_octave + note __, 15 + note __, 14 + note C_, 4 + note C#, 4 + note D_, 14 + note C_, 7 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note __, 15 + note __, 14 + dec_octave + note A#, 4 + inc_octave + note C_, 4 + note C_, 14 + dec_octave + note A#, 7 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 8 + inc_octave + note C_, 4 + note C#, 3 + note C_, 7 + dec_octave + note A#, 7 + inc_octave + note C_, 8 + dec_octave + note A#, 7 + note G_, 7 + note F_, 7 + octave 3 + note G_, 4 + note G_, 4 + note G#, 4 + note G#, 3 + note A_, 14 + inc_octave + note C_, 15 + dec_octave + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note E_, 8 + note F_, 7 + note E_, 7 + note C_, 7 + note D_, 15 + note D_, 14 + note D_, 15 + note F_, 4 + note F_, 3 + note F_, 4 + note F_, 3 + note F#, 4 + note F#, 4 + note F#, 4 + note F#, 3 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + octave 3 + note G_, 4 + note G_, 4 + note G#, 4 + note G#, 3 + note A_, 14 + inc_octave + note C_, 15 + dec_octave + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note E_, 8 + note F_, 7 + note E_, 7 + note C_, 7 + note D_, 15 + note D_, 14 + note D_, 15 + dec_octave + note F_, 4 + note F_, 3 + note F_, 4 + note F_, 3 + note F#, 4 + note F#, 4 + note F#, 4 + note F#, 3 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 8 + note A_, 7 + note A#, 7 + inc_octave + note C_, 7 + vibrato 11, $33 + note C_, 4 + note C_, 4 + note C#, 4 + note C#, 3 + note D_, 14 + vibrato 0, $33 + note C_, 15 + vibrato 29, $33 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note D#, 14 + note D_, 15 + note C_, 7 + note C_, 7 + vibrato 11, $33 + note C_, 4 + note C_, 4 + note C#, 4 + note C#, 3 + note D_, 14 + note D_, 15 + dec_octave + vibrato 29, $33 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 8 + note A_, 7 + note A#, 7 + inc_octave + note C_, 7 + vibrato 11, $33 + note C_, 4 + note C_, 4 + note C#, 4 + note C#, 3 + note D_, 14 + vibrato 0, $33 + note C_, 15 + vibrato 29, $33 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note D#, 14 + note D_, 15 + note C_, 7 + note C_, 7 + vibrato 11, $33 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 3 + note C#, 4 + note C#, 3 + note C#, 4 + note C#, 3 + vibrato 30, $33 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 14 +.Loop1 + octave 1 + note G_, 15 + note __, 7 + note G_, 4 + note __, 11 + note G_, 4 + note __, 3 + inc_octave + note F_, 7 + note G_, 4 + note F_, 3 + dec_octave + note G_, 2 + inc_octave + note G_, 6 + inc_octave + note F_, 4 + note __, 3 + note F_, 4 + note __, 3 + note __, 4 + note __, 3 + note F_, 4 + note F_, 11 + note F_, 7 + note G_, 4 + note F_, 3 + dec_octave + dec_octave + note G_, 4 + inc_octave + inc_octave + note G_, 4 + dec_octave + note G_, 4 + note G_, 10 + dec_octave + note G_, 4 + inc_octave + note G_, 3 + inc_octave + note G_, 4 + note G_, 4 + dec_octave + dec_octave + note G_, 4 + inc_octave + inc_octave + note G_, 3 + note F_, 7 + note G_, 4 + note F_, 3 + dec_octave + dec_octave + note G_, 4 + inc_octave + inc_octave + note G_, 4 + note G_, 4 + note __, 3 + note __, 4 + note __, 3 + note G_, 4 + note __, 3 + note B_, 4 + note B_, 4 + inc_octave + note C_, 7 + dec_octave + note A#, 14 + dec_octave + dec_octave + note G_, 15 + note __, 7 + note G_, 4 + note __, 3 + note __, 8 + note G_, 4 + note __, 3 + inc_octave + note F_, 7 + note G_, 4 + note F_, 3 + dec_octave + note G_, 2 + inc_octave + note G_, 6 + inc_octave + note F_, 4 + note __, 3 + note F_, 4 + note __, 10 + note F_, 4 + note __, 4 + note F_, 4 + note __, 3 + note F_, 7 + note G_, 4 + note F_, 3 + dec_octave + dec_octave + note G_, 4 + inc_octave + inc_octave + note G_, 4 + dec_octave + note G_, 4 + note __, 3 + dec_octave + note G_, 1 + note __, 2 + inc_octave + note G_, 4 + dec_octave + note G_, 4 + note __, 3 + inc_octave + inc_octave + note G_, 4 + note __, 4 + dec_octave + dec_octave + note G_, 4 + inc_octave + inc_octave + note G_, 3 + note F_, 7 + note G_, 4 + note F_, 3 + dec_octave + dec_octave + note G_, 4 + inc_octave + inc_octave + note G_, 4 + note C_, 4 + note C#, 3 + note C_, 7 + dec_octave + note A#, 7 + inc_octave + note C_, 8 + dec_octave + note A#, 7 + note G_, 7 + note F_, 7 + loopchannel 2, .Loop1 + loopchannel 0, .MainLoop + + +Music_TCG2Fort3_Ch1: + notetype1 10 + notetype0 1 + note __, 14 +.MainLoop + octave 3 + vibrato 60, $33 + note __, 15 + note __, 14 + note C_, 4 + note C#, 4 + note D_, 14 + note C_, 7 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note __, 15 + note __, 14 + dec_octave + note A#, 4 + inc_octave + note C_, 4 + note C_, 14 + dec_octave + note A#, 7 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + inc_octave + note __, 15 + note __, 14 + note C_, 4 + note C#, 4 + note D_, 14 + note C_, 7 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note __, 15 + note __, 14 + dec_octave + note A#, 4 + inc_octave + note C_, 4 + note C_, 14 + dec_octave + note A#, 7 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + octave 2 + note A#, 8 + note __, 7 + note A#, 7 + note __, 7 + note __, 8 + note A#, 7 + note __, 7 + inc_octave + note C_, 7 + vibrato 12, $33 + octave 2 +.Loop1 + note __, 15 + note __, 14 + note G#, 4 + note A_, 4 + note A#, 7 + note A_, 14 + note A_, 8 + note A_, 4 + note __, 3 + note C_, 7 + note __, 7 + note F_, 15 + note G_, 7 + note __, 7 + note __, 15 + note __, 4 + note F_, 5 + note A_, 5 + inc_octave + note E_, 4 + note F_, 4 + note F_, 14 + note F_, 7 + note __, 8 + dec_octave + note A_, 7 + note __, 14 + note A_, 4 + note A_, 4 + note A#, 7 + note A_, 7 + note __, 7 + note __, 15 + note __, 14 + note A#, 4 + note B_, 4 + inc_octave + note C_, 7 + dec_octave + note A#, 14 + note A#, 8 + inc_octave + note C_, 4 + note __, 3 + note __, 14 + dec_octave + note F_, 15 + note G_, 7 + note __, 7 + note __, 15 + note __, 4 + dec_octave + note A#, 5 + inc_octave + note D_, 5 + inc_octave + note C#, 4 + note D_, 4 + note D_, 14 + note D_, 7 + note __, 8 + dec_octave + note A_, 7 + note __, 14 + note B_, 4 + note B_, 4 + inc_octave + note C_, 7 + dec_octave + note A#, 7 + note __, 7 + loopchannel 2, .Loop1 + note __, 15 + note __, 14 + note A#, 4 + note B_, 4 + inc_octave + note C_, 7 + dec_octave + note G#, 14 + note G#, 8 + inc_octave + note G_, 4 + note __, 3 + dec_octave + note C_, 7 + note __, 7 + note G_, 15 + note G#, 7 + note __, 7 + note __, 15 + note __, 4 + inc_octave + note C_, 5 + note D#, 5 + note A_, 4 + note A#, 4 + note A#, 14 + note A#, 7 + note __, 8 + note F_, 7 + note __, 14 + dec_octave + note A_, 4 + note A_, 4 + note A#, 7 + note F_, 7 + note __, 7 + note __, 15 + note __, 14 + note A#, 4 + note B_, 4 + inc_octave + note C_, 7 + dec_octave + note A#, 14 + note A#, 8 + inc_octave + note D_, 4 + note __, 3 + dec_octave + note C_, 7 + note __, 7 + note F_, 15 + note G_, 7 + note __, 7 + note __, 15 + note __, 4 + dec_octave + note A#, 5 + inc_octave + note D_, 5 + inc_octave + note C#, 4 + note D_, 4 + note D_, 14 + note D_, 7 + note __, 8 + dec_octave + note A_, 7 + note __, 14 + note B_, 4 + note B_, 4 + inc_octave + note C_, 7 + dec_octave + note A#, 7 + note __, 7 + note __, 15 + note __, 14 + note A#, 4 + note B_, 4 + inc_octave + note C_, 7 + dec_octave + note G#, 14 + note G#, 8 + inc_octave + note G_, 4 + note __, 3 + dec_octave + note C_, 7 + note __, 7 + note G_, 15 + note G#, 7 + note __, 7 + note __, 15 + note __, 4 + inc_octave + note C_, 5 + note D#, 5 + note A_, 4 + note A#, 4 + note A#, 14 + note A#, 7 + note __, 8 + note F_, 7 + note __, 14 + dec_octave + note A_, 4 + note A_, 4 + note A#, 7 + note F_, 7 + note __, 7 + note __, 15 + note __, 14 + inc_octave + note C_, 4 + note C#, 4 + note D_, 7 + note C_, 14 + note C_, 8 + dec_octave + note G_, 4 + note __, 3 + note __, 14 + inc_octave + note D_, 15 + note G_, 3 + note __, 11 + note __, 8 + note G_, 4 + note __, 3 + note __, 14 + note G_, 4 + note G_, 4 + note G_, 7 + note __, 7 + note G_, 4 + note __, 3 + note __, 8 + note A#, 4 + note __, 3 + note __, 14 + note A_, 4 + note A_, 4 + note A#, 7 + note F_, 7 + note __, 7 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + note __, 8 + note C_, 4 + note __, 3 + note __, 14 + note C_, 4 + note __, 4 + note __, 7 + note C_, 7 + note D_, 4 + note __, 3 + note __, 8 + dec_octave + dec_octave + note G_, 4 + note __, 3 + note __, 14 + inc_octave + inc_octave + note D_, 4 + note __, 11 + note C_, 7 + note D_, 4 + note __, 3 + note __, 8 + note C_, 4 + note __, 3 + note __, 14 + note F#, 4 + note F#, 4 + note G_, 7 + note F_, 14 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + note __, 8 + note C_, 4 + note __, 3 + note __, 14 + note C_, 4 + note __, 11 + note C_, 7 + note D_, 4 + note __, 3 + note __, 8 + dec_octave + dec_octave + note G_, 4 + note __, 3 + note __, 14 + inc_octave + inc_octave + note D_, 4 + note __, 11 + note C_, 7 + note D_, 4 + note __, 3 + note __, 8 + note F_, 14 + note __, 7 + note F_, 8 + note __, 7 + note C_, 7 + note __, 7 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + note __, 8 + note C_, 4 + note __, 3 + note __, 14 + note C_, 4 + note __, 11 + note C_, 7 + note D_, 4 + note __, 3 + note __, 8 + dec_octave + dec_octave + note G_, 4 + note __, 3 + note __, 14 + inc_octave + inc_octave + note D_, 4 + note __, 11 + note C_, 7 + note D_, 4 + note __, 3 + note __, 8 + note C_, 4 + note __, 3 + note __, 14 + note F#, 4 + note F#, 4 + note G_, 7 + note F_, 14 + note __, 15 + note __, 14 + note __, 15 + note __, 14 + note __, 8 + note C_, 4 + note __, 3 + note __, 14 + note C_, 4 + note __, 11 + note C_, 7 + note D_, 4 + note __, 3 + note __, 8 + dec_octave + dec_octave + note G_, 4 + note __, 3 + note __, 14 + inc_octave + inc_octave + note D_, 4 + note __, 11 + note C_, 7 + note D_, 4 + note __, 3 + note __, 8 + note F_, 14 + note __, 7 + note F_, 8 + note __, 7 + note C_, 7 + note __, 7 + loopchannel 0, .MainLoop + + +Music_TCG2Fort3_Ch3: + notetype1 10 + notetype0 1 + notetype2 11 + notetype1 1 + octave 3 + note F_, 7 + note F#, 7 +.MainLoop + vibrato 60, $33 + octave 3 + note G_, 15 + inc_octave + note D_, 14 + notetype1 2 + note F_, 4 + note F#, 4 + note G_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 7 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + notetype1 3 + note F_, 15 + dec_octave + notetype1 1 + note F_, 7 + note F#, 7 + note G_, 15 + inc_octave + note D_, 14 + notetype1 2 + note D#, 4 + note E_, 4 + note F_, 14 + note D#, 14 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 7 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 14 + notetype1 3 + note D#, 15 + dec_octave + notetype1 1 + note F_, 7 + note F#, 7 + note G_, 15 + inc_octave + note D_, 14 + notetype1 2 + note F_, 4 + note F#, 4 + note G_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 7 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + notetype1 3 + note F_, 15 + dec_octave + notetype1 1 + note F_, 7 + note F#, 7 + note G_, 15 + inc_octave + note D_, 14 + notetype1 2 + note D#, 4 + note E_, 4 + note F_, 14 + note D#, 14 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 7 + note D#, 15 + note D#, 14 + note D#, 15 + dec_octave + notetype1 1 + note F_, 7 + note G_, 15 + inc_octave + note C#, 7 + note C_, 7 + dec_octave + note A#, 7 + inc_octave + note C_, 8 + dec_octave + note A#, 7 + note F_, 7 + note F#, 7 +.Loop1 + note G_, 15 + inc_octave + note D_, 7 + note __, 7 + callchannel Branch_1ef06a + note F_, 4 + note F#, 4 + note G_, 7 + note F_, 14 + callchannel Branch_1ef06f + dec_octave + note G_, 1 + note __, 7 + inc_octave + callchannel Branch_1ef06a + note F_, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + note D_, 14 + note F_, 15 + note G_, 7 + note __, 7 + inc_octave + note D_, 1 + note __, 7 + dec_octave + note G_, 1 + note __, 6 + note G_, 3 + note __, 11 + inc_octave + inc_octave + callchannel Branch_1ef06a + note C_, 15 + note C_, 14 + callchannel Branch_1ef06f + dec_octave + dec_octave + note G_, 4 + note __, 4 + inc_octave + callchannel Branch_1ef06a + note F_, 7 + callchannel Branch_1ef06f + dec_octave + note D_, 14 + note F_, 15 + note F#, 7 + note __, 7 + note G_, 15 + inc_octave + note D_, 7 + note __, 7 + callchannel Branch_1ef06a + note F_, 4 + note F#, 4 + note G_, 7 + note F_, 14 + callchannel Branch_1ef06f + dec_octave + note G_, 1 + note __, 7 + callchannel Branch_1ef06a + inc_octave + note A_, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + note D_, 14 + note F_, 15 + note G_, 7 + note __, 7 + inc_octave + note D_, 1 + note __, 7 + dec_octave + note G_, 1 + note __, 6 + note G_, 3 + note __, 11 + inc_octave + callchannel Branch_1ef06a + note A_, 15 + note A_, 14 + callchannel Branch_1ef06f + dec_octave + note G_, 4 + note __, 4 + inc_octave + callchannel Branch_1ef06a + note F_, 7 + callchannel Branch_1ef06f + note D_, 7 + dec_octave + note D_, 4 + note __, 3 + note F_, 15 + note G_, 3 + note __, 11 + loopchannel 2, .Loop1 + note G#, 15 + inc_octave + note D#, 7 + note __, 7 + callchannel Branch_1ef06a + note F#, 4 + note G_, 4 + note G#, 7 + callchannel Branch_1ef06f + inc_octave + note C_, 14 + dec_octave + dec_octave + note G#, 1 + note __, 7 + inc_octave + inc_octave + callchannel Branch_1ef06a + note D#, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + dec_octave + note D#, 14 + note A#, 15 + note G#, 7 + note __, 7 + note G#, 1 + note __, 7 + note D#, 1 + note __, 6 + inc_octave + note D#, 3 + note __, 11 + inc_octave + callchannel Branch_1ef06a + note G_, 15 + note G_, 14 + callchannel Branch_1ef06f + dec_octave + dec_octave + note G#, 4 + note __, 4 + inc_octave + inc_octave + callchannel Branch_1ef06a + note D_, 7 + callchannel Branch_1ef06f + dec_octave + note D#, 14 + dec_octave + note A#, 15 + note F_, 7 + note __, 7 + note G_, 15 + inc_octave + note D_, 7 + note __, 7 + callchannel Branch_1ef06a + note F_, 4 + note F#, 4 + note G_, 7 + note F_, 14 + callchannel Branch_1ef06f + dec_octave + note G_, 1 + note __, 7 + inc_octave + callchannel Branch_1ef06a + note A_, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + note D_, 14 + note F_, 15 + note G_, 7 + note __, 7 + inc_octave + note D_, 1 + note __, 7 + dec_octave + note G_, 1 + note __, 6 + note G_, 3 + note __, 11 + inc_octave + callchannel Branch_1ef06a + note A_, 15 + note A_, 14 + callchannel Branch_1ef06f + dec_octave + note G_, 4 + note __, 4 + inc_octave + callchannel Branch_1ef06a + note F_, 7 + callchannel Branch_1ef06f + note D_, 7 + dec_octave + note D_, 4 + note __, 3 + note F_, 15 + note G_, 3 + note __, 11 + note G#, 15 + inc_octave + note D#, 7 + note __, 7 + callchannel Branch_1ef06a + note F#, 4 + note G_, 4 + note G#, 7 + callchannel Branch_1ef06f + inc_octave + note C_, 14 + dec_octave + dec_octave + note G#, 1 + note __, 7 + inc_octave + inc_octave + callchannel Branch_1ef06a + note D#, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + dec_octave + note D#, 14 + note A#, 15 + note G#, 7 + note __, 7 + note G#, 1 + note __, 7 + note D#, 1 + note __, 6 + inc_octave + note D#, 3 + note __, 11 + inc_octave + callchannel Branch_1ef06a + note G_, 15 + note G_, 14 + callchannel Branch_1ef06f + dec_octave + dec_octave + note G#, 4 + note __, 4 + inc_octave + inc_octave + callchannel Branch_1ef06a + note D_, 7 + callchannel Branch_1ef06f + dec_octave + note D#, 14 + dec_octave + note A#, 15 + note F_, 7 + note __, 7 + note A_, 15 + inc_octave + note E_, 7 + note __, 7 + callchannel Branch_1ef06a + note A#, 4 + note B_, 4 + inc_octave + note C_, 7 + dec_octave + note G_, 14 + callchannel Branch_1ef06f + dec_octave + note A_, 1 + note __, 7 + inc_octave + callchannel Branch_1ef06a + note D_, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + note E_, 7 + note __, 7 + note A_, 15 + note G_, 7 + note C#, 4 + note __, 3 + note D_, 8 + inc_octave + inc_octave + callchannel Branch_1ef06a + note C_, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + note D_, 4 + note __, 3 + dec_octave + note C_, 4 + note __, 3 + inc_octave + inc_octave + callchannel Branch_1ef06a + note C_, 15 + callchannel Branch_1ef06f + dec_octave + dec_octave + note D_, 1 + note __, 6 + inc_octave + inc_octave + callchannel Branch_1ef06a + note C_, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + dec_octave + note D_, 4 + note __, 4 + inc_octave + inc_octave + callchannel Branch_1ef06a + note F_, 4 + note __, 3 + callchannel Branch_1ef06f + dec_octave + note C_, 4 + note __, 3 + note C#, 4 + note __, 3 + inc_octave + note E_, 4 + note E_, 4 + note F_, 7 + callchannel Branch_1ef06f + dec_octave + dec_octave + note D_, 14 + callchannel Branch_1ef040 + octave 2 + note G_, 3 + note __, 12 + inc_octave + note G_, 7 + dec_octave + note G_, 3 + note __, 12 + note G_, 4 + note __, 3 + inc_octave + note F_, 7 + note G_, 7 + dec_octave + note G_, 3 + note __, 12 + inc_octave + inc_octave + note D_, 7 + dec_octave + note D_, 4 + note __, 3 + inc_octave + note F_, 8 + note F#, 7 + note G_, 14 + callchannel Branch_1ef040 + octave 2 + note G_, 3 + note __, 16 + note __, 3 + note G_, 4 + note __, 3 + note __, 8 + note G_, 4 + note __, 3 + inc_octave + note F_, 7 + note G_, 7 + dec_octave + note G_, 3 + note __, 12 + inc_octave + inc_octave + note D_, 7 + dec_octave + note D_, 4 + note __, 3 + inc_octave + note F_, 8 + note F#, 7 + note G_, 14 + callchannel Branch_1ef040 + octave 2 + note G_, 3 + note __, 12 + inc_octave + note G_, 7 + dec_octave + note G_, 3 + note __, 12 + note G_, 4 + note __, 3 + inc_octave + note F_, 7 + note G_, 7 + dec_octave + note G_, 3 + note __, 12 + inc_octave + inc_octave + note D_, 7 + dec_octave + note D_, 4 + note __, 3 + inc_octave + note F_, 8 + note F#, 7 + note G_, 14 + callchannel Branch_1ef040 + octave 2 + note G_, 3 + note __, 12 + inc_octave + note G_, 7 + dec_octave + note G_, 3 + note __, 12 + note G_, 4 + note __, 3 + inc_octave + note F_, 7 + note G_, 7 + dec_octave + note G_, 4 + note __, 4 + inc_octave + note C_, 7 + note C#, 7 + note D_, 7 + note F_, 8 + note D_, 7 + note F_, 7 + note F#, 7 + loopchannel 0, .MainLoop + +Branch_1ef040: + octave 2 + note G_, 15 + note __, 7 + note G_, 4 + note __, 3 + inc_octave + note G_, 8 + dec_octave + note G_, 4 + note __, 3 + inc_octave + note F_, 7 + note G_, 7 + dec_octave + note G_, 2 + note __, 6 + inc_octave + inc_octave + note A#, 7 + note D_, 7 + dec_octave + note D_, 4 + note __, 3 + note F_, 4 + note __, 4 + note F#, 4 + note __, 3 + note G_, 3 + note __, 11 + endchannel + +Branch_1ef06a: + notetype1 1 + vibrato 12, $33 + endchannel + +Branch_1ef06f: + notetype1 1 + vibrato 0, $33 + endchannel + + +Music_TCG2Fort3_Ch4: + togglenoise $06 + notetype 1 + octave 1 + note __, 14 +.MainLoop + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note E_, 14 + note D#, 8 + note F#, 7 + note C_, 7 + note D#, 7 + note E_, 15 + note A_, 7 + note D#, 4 + note D#, 3 + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note E_, 14 + note D#, 8 + note F#, 7 + note C_, 7 + note D#, 7 + note E_, 15 + note A_, 7 + note D#, 4 + note D#, 3 + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note A_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note E_, 14 + note D#, 8 + note F#, 7 + note C_, 7 + note D#, 7 + note E_, 15 + note A_, 7 + note D#, 4 + note D#, 3 + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note E_, 14 + note D#, 8 + note F#, 7 + note C_, 7 + note D#, 7 + note E_, 15 + note A_, 7 + note D#, 4 + note D#, 3 + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 7 + note D_, 4 + note D_, 3 + note D_, 8 + note D_, 14 + note D_, 7 + callchannel Branch_1ef1de + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note E_, 14 + callchannel Branch_1ef1de + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note D#, 4 + note D#, 5 + note D#, 5 + callchannel Branch_1ef1de + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note E_, 14 + callchannel Branch_1ef1de + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note A_, 15 + note D_, 14 + callchannel Branch_1ef1de + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note E_, 14 + callchannel Branch_1ef1de + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note D#, 4 + note D#, 5 + note D#, 5 + callchannel Branch_1ef1de + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note E_, 14 + callchannel Branch_1ef1de + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 8 + note D_, 14 + note D_, 7 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note C#, 14 + note D#, 15 + note C_, 7 + note D#, 7 + note D#, 15 + note A_, 14 + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note C#, 14 + note D#, 15 + note C_, 7 + note D#, 7 + note D#, 15 + note A_, 14 + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 7 + note C_, 8 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note D_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note C#, 14 + note D#, 15 + note C_, 7 + note D#, 7 + note D#, 15 + note A_, 14 + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note C#, 7 + note D#, 8 + note C_, 7 + note D#, 4 + note D#, 5 + note D#, 5 + note D_, 15 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note C#, 14 + note D#, 15 + note C_, 7 + note D#, 7 + note D#, 15 + note A_, 14 + note C_, 8 + note C#, 7 + note E_, 14 + note A_, 8 + note D#, 7 + note D#, 7 + note D_, 7 + note D#, 8 + note C#, 4 + note C#, 3 + note C#, 7 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + loopchannel 0, .MainLoop + +Branch_1ef1de: + octave 1 + notetype 1 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 15 + note E_, 14 + note D#, 15 + note C_, 7 + note D#, 7 + note D#, 15 + note A_, 14 + endchannel + diff --git a/crysaudio/music/TCG2/fort4.asm b/crysaudio/music/TCG2/fort4.asm new file mode 100644 index 00000000..fc763fc1 --- /dev/null +++ b/crysaudio/music/TCG2/fort4.asm @@ -0,0 +1,1847 @@ +Music_TCG2Fort4: + db $C0 + dw Music_TCG2Fort4_Ch1 + db $01 + dw Music_TCG2Fort4_Ch2 + db $02 + dw Music_TCG2Fort4_Ch3 + db $03 + dw Music_TCG2Fort4_Ch4 + +Music_TCG2Fort4_Ch2: + notetype1 10 + notetype0 1 + octave 2 + note C_, 16 +.MainLoop + notetype0 1 + octave 2 + notetype0 4 + notetype2 7 +.Loop1 + note D_, 1 + note D_, 3 + note __, 4 + inc_octave + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + dec_octave + note D_, 1 + note D_, 3 + note __, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note __, 4 + note C_, 1 + note C_, 3 + loopchannel 4, .Loop1 + dutycycle 1 + octave 3 + notetype2 8 + notetype0 8 + notetype1 2 + note E_, 14 + notetype1 11 + vibrato 1, $33 + note E_, 2 + note E_, 6 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note E_, 4 + note E_, 2 + notetype1 1 + note D_, 10 + notetype1 11 + note D_, 14 + note D_, 2 + notetype1 11 + note D_, 4 + note D_, 2 + notetype1 2 + note G_, 10 + notetype1 11 + note G_, 6 + note G_, 2 + note F_, 3 + note C_, 3 + note F_, 2 + vibrato 40, $33 + notetype0 1 + note E_, 4 + notetype0 8 + notetype0 1 + note F_, 4 + notetype0 8 + note E_, 5 + note E_, 10 + note E_, 12 + note E_, 4 + notetype1 2 + note E_, 14 + notetype1 11 + vibrato 1, $33 + note E_, 2 + note E_, 6 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 4 + note A_, 2 + notetype1 1 + note G_, 10 + notetype1 11 + note G_, 14 + note G_, 2 + vibrato 0, $33 + notetype1 1 + note A_, 4 + note A_, 2 + notetype1 11 + note G_, 6 + note D_, 2 + note D_, 2 + notetype1 1 + note G_, 6 + note G_, 2 + note F_, 4 + notetype1 11 + note G_, 3 + notetype0 4 + note F_, 1 + note G_, 1 + notetype0 8 + vibrato 0, $33 + notetype1 1 + note F_, 7 + notetype1 11 + vibrato 1, $33 + note F_, 8 + vibrato 0, $33 + notetype0 4 + note E_, 1 + note F_, 1 + notetype0 8 + vibrato 48, $33 + note E_, 8 + notetype1 1 + note F_, 4 + notetype1 11 + note G_, 4 + notetype1 1 + note A_, 6 + notetype1 11 + note A_, 2 + notetype1 1 + note G_, 6 + notetype1 11 + note G_, 2 + notetype1 1 + inc_octave + note C_, 6 + notetype1 11 + note C_, 2 + dec_octave + notetype1 1 + note G_, 6 + notetype1 11 + note G_, 2 + notetype1 12 + note A_, 1 + note A_, 1 + note __, 2 + notetype0 1 + octave 3 + notetype0 4 + notetype2 7 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + dec_octave + note D_, 1 + note D_, 3 + note __, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note __, 4 + note C_, 1 + note C_, 3 +.Loop2 + note D_, 1 + note D_, 3 + note __, 4 + inc_octave + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + dec_octave + note D_, 1 + note D_, 3 + note __, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note __, 4 + note C_, 1 + note C_, 3 + loopchannel 3, .Loop2 + dutycycle 1 + octave 3 + notetype2 8 + vibrato 0, $33 + notetype0 8 +.Loop3 + notetype1 1 + note A_, 6 + notetype1 11 + note A_, 2 + notetype1 1 + note G_, 6 + notetype1 11 + note G_, 2 + notetype1 1 + inc_octave + note C_, 6 + notetype1 11 + note C_, 2 + dec_octave + notetype1 1 + note G_, 6 + notetype1 11 + note G_, 2 + loopchannel 2, .Loop3 + notetype1 8 + notetype0 1 + note A_, 4 + notetype0 8 + notetype0 1 + notetype1 9 + note A#, 4 + notetype0 8 + vibrato 40, $33 + notetype1 8 + note A_, 15 + note A_, 16 + note A_, 16 + note A_, 8 + note A_, 1 + dec_octave + notetype0 1 + notetype1 12 + note A#, 8 + inc_octave + note C#, 5 + note C#, 3 + note E_, 5 + note E_, 3 + note G_, 5 + note G_, 3 + note A#, 5 + note A#, 3 + inc_octave + note C#, 5 + note C#, 3 + note E_, 5 + note E_, 3 + loopchannel 0, .MainLoop + + +Music_TCG2Fort4_Ch1: + notetype1 10 + notetype1 15 + dutycycle 2 + vibrato 0, $33 + notetype0 1 + octave 3 + note G_, 5 + note G_, 5 + note G_, 6 + notetype0 8 + note G_, 4 + note __, 12 +.MainLoop + notetype0 8 + note __, 16 + note __, 16 + note __, 16 + notetype0 4 + octave 4 + note __, 1 + note __, 1 + note A_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note A_, 1 + note __, 1 + dec_octave + note A_, 1 + note A_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note A_, 1 + note __, 1 + dec_octave + note A_, 1 + note A_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note A_, 1 + note __, 1 + dec_octave + note A_, 1 + note A_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note A_, 1 + note __, 1 + dec_octave + note A_, 1 + note G#, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note G#, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + dec_octave + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note G#, 1 + note D_, 1 + note F_, 1 + note G#, 1 + note __, 1 + note F_, 1 + dec_octave + note G#, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note G#, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + dec_octave + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note G#, 1 + note D_, 1 + note F_, 1 + note G#, 1 + note __, 1 + note F_, 1 + dec_octave + note G#, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note G#, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + dec_octave + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note G#, 1 + note D_, 1 + note F_, 1 + note G#, 1 + note __, 1 + note F_, 1 + dec_octave + note G#, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note G#, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + dec_octave + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note G#, 1 + note D_, 1 + note F_, 1 + note G#, 1 +.Loop1 + note __, 1 + note F_, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note D#, 1 + dec_octave + note G_, 1 + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + dec_octave + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + note A#, 1 + note D#, 1 + note F_, 1 + note A#, 1 + note __, 1 + note F_, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note D#, 1 + dec_octave + note G_, 1 + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + dec_octave + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + note A#, 1 + note D#, 1 + note F_, 1 + note A#, 1 + loopchannel 2, .Loop1 + note __, 1 + note F_, 1 + dec_octave + note A_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note A_, 1 + note __, 1 + dec_octave + note A_, 1 + note A_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note A_, 1 +.Loop2 + note __, 1 + dec_octave + note A_, 1 + note A_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note A_, 1 + note __, 1 + dec_octave + note A_, 1 + note A_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note D_, 1 + note E_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note E_, 1 + note A_, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note A_, 1 + loopchannel 3, .Loop2 + note __, 1 + dec_octave + note A_, 1 + note G_, 1 + note __, 1 + inc_octave + note D#, 1 + dec_octave + note G_, 1 + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + dec_octave + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + note A#, 1 + note D#, 1 + note F_, 1 + note A#, 1 + note __, 1 + note F_, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note D#, 1 + dec_octave + note G_, 1 + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + dec_octave + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + note A#, 1 + note D#, 1 + note F_, 1 + note A#, 1 + note __, 1 + note F_, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note D#, 1 + dec_octave + note G_, 1 + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + dec_octave + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + note A#, 1 + note D#, 1 + note F_, 1 + note A#, 1 + note __, 1 + note F_, 1 + dec_octave + note G_, 1 + note __, 1 + inc_octave + note D#, 1 + dec_octave + note G_, 1 + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + dec_octave + note A#, 1 + inc_octave + note D#, 1 + note F_, 1 + note A#, 1 + note D#, 1 + note F_, 1 + note A#, 1 +.Loop3 + note __, 1 + note F_, 1 + dec_octave + note B_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note B_, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + dec_octave + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note A_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + note __, 1 + note F_, 1 + dec_octave + note B_, 1 + note __, 1 + inc_octave + note D_, 1 + dec_octave + note B_, 1 + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + dec_octave + note B_, 1 + inc_octave + note D_, 1 + note F_, 1 + note A_, 1 + note D_, 1 + note F_, 1 + note A_, 1 + loopchannel 2, .Loop3 + note __, 1 + note F_, 1 + dec_octave + note A#, 1 + note __, 1 + inc_octave + note C#, 1 + dec_octave + note A#, 1 + note A#, 1 + inc_octave + note C#, 1 + note F_, 1 + dec_octave + note A#, 1 + inc_octave + note C#, 1 + note F_, 1 + note A_, 1 + note C#, 1 + note F_, 1 + note A_, 1 + note __, 1 + note F_, 1 + dec_octave + note A#, 1 + note __, 1 + inc_octave + note C#, 1 + dec_octave + note A#, 1 + note A#, 1 + inc_octave + note C#, 1 + note F_, 1 + dec_octave + note A#, 1 + inc_octave + note C#, 1 + note F_, 1 + note A_, 1 + note C#, 1 + note F_, 1 + note A_, 1 + note __, 1 + note F_, 1 + dec_octave + note A_, 1 + note __, 1 + inc_octave + note C#, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note C#, 1 + note F_, 1 + dec_octave + note A_, 1 + inc_octave + note C#, 1 + note F_, 1 + note A_, 1 + note C#, 1 + note F_, 1 + note A_, 1 + note __, 1 + note F_, 1 + dec_octave + note A_, 1 + note __, 1 + inc_octave + note C#, 1 + dec_octave + note A_, 1 + note A_, 1 + inc_octave + note C#, 1 + note F_, 1 + dec_octave + note A_, 1 + inc_octave + note C#, 1 + note F_, 1 + note A_, 1 + note C#, 1 + note F_, 1 + note A_, 1 + dutycycle 1 + octave 3 + notetype2 8 + notetype0 8 + octave 3 + notetype1 1 + note F_, 6 + notetype1 11 + note F_, 2 + notetype1 1 + note D_, 6 + notetype1 11 + note D_, 2 + notetype1 1 + note G_, 6 + notetype1 11 + note G_, 2 + notetype1 1 + note D_, 6 + notetype1 11 + note D_, 2 + notetype1 12 + note E_, 1 + note E_, 1 + note __, 1 + notetype1 15 + dutycycle 2 + vibrato 0, $33 + notetype0 1 + octave 3 + note G_, 4 + note G_, 4 + notetype0 8 + note G_, 4 + note __, 4 + inc_octave + note C_, 4 + dec_octave +.Loop4 + notetype0 8 + note __, 3 + notetype0 1 + octave 3 + note G_, 4 + note G_, 4 + notetype0 8 + note G_, 4 + inc_octave + note __, 4 + note C_, 4 + dec_octave + loopchannel 3, .Loop4 + dutycycle 1 + octave 3 + notetype2 8 + notetype0 8 + octave 3 + notetype1 1 + note D#, 6 + notetype1 11 + note D#, 2 + notetype1 1 + note C#, 6 + notetype1 11 + note C#, 2 + notetype1 1 + note G_, 6 + notetype1 11 + note G_, 2 + notetype1 1 + note C#, 6 + callchannel Branch_1f1c7c + dutycycle 1 + octave 3 + notetype2 8 + notetype0 8 + octave 3 + notetype1 1 + note E_, 6 + notetype1 11 + note E_, 2 + notetype1 1 + note D_, 6 + notetype1 11 + note D_, 2 + notetype1 1 + note G_, 6 + notetype1 11 + note G_, 2 + notetype1 1 + note D_, 6 + notetype1 11 + note D_, 2 + octave 3 + notetype0 1 + note E_, 4 + note F_, 4 + notetype0 8 + note E_, 5 + callchannel Branch_1f1c69 + octave 3 + note E_, 2 + note D_, 1 + note D_, 1 + callchannel Branch_1f1c97 + octave 3 + note E_, 1 + note E_, 2 + note F_, 6 + callchannel Branch_1f1c69 + octave 3 + note F_, 2 + note G_, 1 + note G_, 1 + callchannel Branch_1f1c97 + octave 3 + note F_, 1 + note F_, 2 + notetype0 1 + note E_, 4 + note F_, 4 + notetype0 8 + note E_, 5 + callchannel Branch_1f1c69 + octave 3 + note E_, 2 + dec_octave + note B_, 1 + note B_, 1 + callchannel Branch_1f1c97 + octave 3 + note D_, 1 + note D_, 2 + notetype0 1 + note C#, 4 + note D_, 4 + notetype0 8 + note C#, 7 + note C#, 1 + notetype0 1 + octave 2 + note G_, 8 + note A#, 5 + note A#, 3 + inc_octave + note C#, 5 + note C#, 3 + note E_, 5 + note E_, 3 + note G_, 5 + note G_, 3 + note A#, 5 + note A#, 3 + inc_octave + note C#, 5 + note C#, 3 + notetype0 8 + note __, 16 + loopchannel 0, .MainLoop + +Branch_1f1c69: + notetype1 15 + dutycycle 2 + vibrato 0, $33 + notetype0 1 + octave 3 + note G_, 16 + notetype0 8 + endchannel + +Branch_1f1c7c: + notetype1 15 + dutycycle 2 + vibrato 0, $33 + notetype0 1 + octave 3 + note G_, 5 + note G_, 5 + note G_, 6 + notetype0 8 + endchannel + +Branch_1f1c97: + notetype1 15 + dutycycle 2 + vibrato 0, $33 + notetype0 1 + octave 4 + note G_, 8 + notetype0 8 + endchannel + + +Music_TCG2Fort4_Ch3: + notetype1 10 + notetype2 11 + notetype1 1 + notetype0 1 + octave 2 + note C_, 16 +.MainLoop + callchannel Branch_1f1ff8 +.Loop1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + note A_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note C_, 16 + loopchannel 2, .Loop1 +.Loop2 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G#, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note G#, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G#, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note G#, 4 + note __, 4 + note D_, 4 + note __, 4 + note G#, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note C_, 16 + loopchannel 2, .Loop2 +.Loop3 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G_, 4 + note __, 4 + note D#, 4 + note __, 4 + inc_octave + note D#, 4 + note __, 4 + dec_octave + note G_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G_, 4 + note __, 4 + note D#, 4 + note __, 4 + inc_octave + note D#, 4 + note __, 4 + dec_octave + note G_, 4 + note __, 4 + note D#, 4 + note __, 4 + note G_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note C_, 16 + loopchannel 2, .Loop3 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + note A_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note C_, 16 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note A_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note G#, 4 + note A_, 4 + inc_octave + note C_, 8 + dec_octave + note G_, 8 + note A_, 8 + note F_, 8 + note G_, 8 + note C_, 8 +.Loop4 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note A_, 4 + note __, 4 + note D_, 4 + note __, 4 + note A_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note C_, 16 + loopchannel 2, .Loop4 +.Loop5 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G_, 4 + note __, 4 + note D#, 4 + note __, 4 + inc_octave + note D#, 4 + note __, 4 + dec_octave + note G_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G_, 4 + note __, 4 + note D#, 4 + note __, 4 + inc_octave + note D#, 4 + note __, 4 + dec_octave + note G_, 4 + note __, 4 + note D#, 4 + note __, 4 + note G_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note C_, 16 + loopchannel 2, .Loop5 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note G_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note G_, 4 + note __, 4 + note D_, 4 + note __, 4 + note G_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note C_, 16 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note G_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note D_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note G_, 4 + note __, 4 + note D_, 4 + note __, 4 + inc_octave + note D_, 4 + note __, 4 + dec_octave + note G_, 4 + note __, 4 + note D_, 4 + note __, 4 + note G_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note G_, 16 + note A_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note F_, 4 + note __, 4 + note C#, 4 + note __, 4 + inc_octave + note C#, 4 + note __, 4 + dec_octave + note F_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note A_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note F_, 4 + note __, 4 + note C#, 4 + note __, 4 + inc_octave + note C#, 4 + note __, 4 + dec_octave + note F_, 4 + note __, 4 + note C#, 4 + note __, 4 + note F_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note G_, 16 + note A_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note E_, 4 + note __, 4 + note C#, 4 + note __, 4 + inc_octave + note C#, 4 + note __, 4 + dec_octave + note E_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note A_, 16 + inc_octave + inc_octave + inc_octave + notetype1 2 + note E_, 4 + note __, 4 + note C#, 4 + note __, 4 + inc_octave + note C#, 4 + note __, 4 + dec_octave + note E_, 4 + note __, 4 + note C#, 4 + note __, 4 + note E_, 4 + note __, 4 + dec_octave + dec_octave + dec_octave + notetype1 1 + note G_, 8 + note A_, 8 + vibrato 48, $33 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + note A#, 16 + callchannel Branch_1f1ff8 + vibrato 48, $33 + notetype0 8 + note D#, 16 + note D#, 16 + note E_, 16 + note E_, 16 + notetype0 1 + note A_, 16 + note __, 16 + inc_octave + note A_, 16 + dec_octave + note A_, 16 + note __, 16 + note __, 16 + note __, 16 + note E_, 16 + note A#, 16 + note __, 16 + inc_octave + inc_octave + note D_, 16 + dec_octave + dec_octave + note A#, 16 + note __, 16 + note __, 16 + note __, 16 + note G_, 16 + note A_, 16 + note __, 16 + inc_octave + note A_, 16 + dec_octave + note A_, 16 + note __, 16 + note __, 16 + note __, 16 + note G_, 16 + note A_, 16 + note A_, 16 + note A_, 16 + note A_, 16 + note __, 8 + note A_, 8 + inc_octave + note E_, 4 + note __, 4 + note G_, 4 + note __, 4 + note A_, 4 + note __, 4 + note E_, 4 + note __, 4 + note G_, 4 + note __, 4 + note A_, 4 + note __, 4 + loopchannel 0, .MainLoop + +Branch_1f1ff8: + octave 2 +.Loop6 + note D_, 8 + note __, 8 + note __, 16 + inc_octave + inc_octave + note F_, 5 + note __, 3 + notetype1 2 + note F_, 5 + note __, 3 + notetype1 1 + dec_octave + dec_octave + note D_, 16 + note __, 16 + inc_octave + note A_, 5 + note __, 3 + notetype1 2 + note A_, 5 + note __, 3 + notetype1 1 + dec_octave + note __, 16 + note C_, 16 + loopchannel 3, .Loop6 + note D_, 16 + note __, 16 + inc_octave + inc_octave + note F_, 5 + note __, 3 + notetype1 2 + note F_, 5 + note __, 3 + notetype1 1 + dec_octave + dec_octave + note D_, 16 + note __, 16 + inc_octave + note A_, 5 + note __, 3 + notetype1 2 + note A_, 5 + note __, 3 + notetype1 1 + dec_octave + note __, 16 + note C_, 8 + note C#, 8 + endchannel + + +Music_TCG2Fort4_Ch4: + togglenoise $06 + notetype 8 + note __, 2 +.MainLoop + note C_, 2 + note D#, 1 + note F#, 1 + note A_, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note F#, 2 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note A_, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note C#, 2 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note A_, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note F#, 2 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note A_, 2 + note C_, 2 + note D#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 1 + note C#, 1 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + note C_, 2 + note D#, 1 + note F#, 1 + note A_, 2 + note C_, 2 + note D#, 1 + note C#, 1 + note D#, 2 + note C#, 2 + note C#, 1 + note C#, 1 + note C_, 2 + note D#, 1 + note F#, 1 + note A_, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note F#, 2 + note C#, 2 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + callchannel Branch_1f2131 + note C_, 2 + note D#, 1 + note F#, 1 + note A_, 2 + note C_, 2 + note D#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note G_, 16 + note __, 16 + note C_, 2 + note D#, 1 + note F#, 1 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note F#, 2 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note C#, 2 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note F#, 2 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note C#, 2 + note C_, 2 + note D#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 1 + note C#, 1 + note G_, 16 + note __, 16 + note G_, 16 + note __, 16 + note C_, 2 + note D#, 1 + note F#, 1 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note F#, 2 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note C#, 2 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note C#, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note F#, 2 + note C#, 2 + note G_, 9 + notetype 1 + note C#, 4 + note C#, 4 + notetype 8 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + loopchannel 0, .MainLoop + +Branch_1f2131: + note C_, 2 + note D#, 1 + note F#, 1 + note A_, 2 + note C_, 2 + note D#, 1 + note F#, 1 + note D#, 2 + note F#, 2 + note E_, 2 + endchannel + diff --git a/crysaudio/music/TCG2/gamecorner.asm b/crysaudio/music/TCG2/gamecorner.asm new file mode 100644 index 00000000..841011cc --- /dev/null +++ b/crysaudio/music/TCG2/gamecorner.asm @@ -0,0 +1,1513 @@ +Music_TCG2GameCorner: + db $C0 + dw Music_TCG2GameCorner_Ch1 + db $01 + dw Music_TCG2GameCorner_Ch2 + db $02 + dw Music_TCG2GameCorner_Ch3 + db $03 + dw Music_TCG2GameCorner_Ch4 + +Music_TCG2GameCorner_Ch2: + notetype1 10 +.MainLoop + octave 1 + vibrato 1, $33 + notetype0 1 +.Loop1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note __, 12 + note __, 3 + loopchannel 14, .Loop1 + note __, 16 + note __, 11 + callchannel Branch_1e75c7 + octave 4 + note A_, 7 + note __, 6 +.Loop2 + note __, 14 + octave 2 + note A_, 7 + note A_, 6 + loopchannel 14, .Loop2 + note A_, 7 + note A_, 7 + note __, 13 + callchannel Branch_1e75c7 + octave 4 + note A_, 7 + octave 4 + vibrato 1, $33 + note C_, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + dec_octave + note A_, 7 + note A_, 7 + note F#, 7 + note F#, 6 + note F_, 7 + note F_, 7 + inc_octave + note D_, 7 + note D_, 6 + note C#, 14 + note C#, 7 + note C_, 6 + note C#, 7 + note C#, 7 + dec_octave + note A_, 7 + note A_, 6 + note G#, 7 + note G#, 7 + note A_, 7 + note A_, 6 + note E_, 14 + note E_, 13 + note E_, 7 + note A_, 7 + note B_, 7 + inc_octave + note C_, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + dec_octave + note A_, 7 + note A_, 7 + note F#, 7 + note F#, 6 + note F_, 7 + note F_, 7 + inc_octave + note D_, 7 + note D_, 6 + note C#, 14 + note C#, 7 + note C_, 6 + note C#, 14 + note C#, 13 + note C#, 14 + note C#, 13 + note C#, 14 + note C#, 7 + note C#, 13 + note C#, 7 + note D_, 7 + note D#, 6 + note E_, 7 + note E_, 7 + note E_, 7 + note E_, 6 + note D#, 7 + note D#, 7 + note E_, 7 + note E_, 6 + note E_, 7 + note E_, 7 + note G_, 7 + note G_, 6 + note F#, 14 + note F#, 7 + note E_, 4 + note E_, 2 + note E_, 7 + note E_, 7 + note D_, 7 + note D_, 6 + note C#, 7 + note C#, 7 + note D_, 7 + note D_, 6 + note F_, 14 + note F_, 13 + note E_, 7 + note E_, 7 + note D_, 7 + note D_, 6 + note C#, 7 + note C#, 7 + dec_octave + note A_, 7 + note A_, 6 + note E_, 14 + note E_, 7 + inc_octave + note C#, 6 + dec_octave + note B_, 7 + note B_, 7 + note G#, 7 + note G#, 6 + note E_, 7 + note E_, 7 + note B_, 7 + note B_, 6 + note A_, 12 + note A_, 2 + octave 3 + note A_, 7 + note C_, 6 + note C#, 7 + note E_, 7 + note F#, 7 + note __, 6 + note A_, 6 + note __, 8 + dec_octave + note A_, 7 + inc_octave + note E_, 6 + inc_octave + note A_, 7 + note __, 7 + note __, 13 + loopchannel 0, .MainLoop + +Branch_1e75c7: + vibrato 1, $33 + octave 4 + note __, 7 + note C#, 7 + note D_, 7 + note D#, 6 +.Loop3 + note E_, 7 + note E_, 7 + note E_, 7 + note E_, 6 + note F#, 7 + note E_, 7 + note D#, 7 + note F#, 6 + loopchannel 2, .Loop3 + note E_, 7 + note E_, 7 + note A_, 7 + note A_, 6 + note G#, 14 + note G#, 7 + note F#, 6 + note D_, 14 + note D_, 13 + note D_, 14 + dec_octave + note B_, 7 + inc_octave + note C#, 6 +.Loop4 + note D_, 7 + note D_, 7 + note D_, 7 + note D_, 6 + note E_, 7 + note D_, 7 + note C#, 7 + note E_, 6 + loopchannel 2, .Loop4 + note D_, 7 + note D_, 7 + note G#, 7 + note G#, 6 + note F#, 14 + note F#, 7 + note E_, 6 + note C#, 14 + note C#, 13 + note C#, 7 + note C#, 7 + note D_, 7 + note D#, 6 +.Loop5 + note E_, 7 + note E_, 7 + note E_, 7 + note E_, 6 + note F#, 7 + note E_, 7 + note D#, 7 + note F#, 6 + loopchannel 2, .Loop5 + note E_, 7 + note E_, 7 + note A_, 7 + note A_, 6 + note B_, 14 + note B_, 7 + note A_, 6 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 7 + note G#, 6 + note A_, 7 + note A_, 7 + note A_, 7 + note A_, 6 + note G#, 7 + note G#, 7 + note F#, 7 + note F#, 6 + note E_, 7 + note E_, 7 + note C#, 7 + note C#, 6 + dec_octave + note A_, 7 + note A_, 7 + inc_octave + note D_, 7 + note D_, 6 + note C#, 7 + note C#, 7 + dec_octave + note A_, 7 + note A_, 6 + note B_, 7 + note B_, 7 + note G#, 7 + note G#, 6 + note A_, 14 + note A_, 13 + note A_, 14 + endchannel + + +Music_TCG2GameCorner_Ch1: + notetype1 10 +.MainLoop + notetype1 12 + dutycycle 2 + vibrato 0, $33 + notetype0 1 +.Loop1 + octave 4 + note __, 16 + note __, 11 + note __, 7 + note __, 7 + note __, 7 + note D_, 6 + note D_, 7 + note D_, 7 + note D_, 7 + dec_octave + note G_, 6 + inc_octave + note C_, 14 + dec_octave + note D_, 13 + loopchannel 3, .Loop1 + note __, 16 + note __, 11 + note __, 16 + note __, 11 + note __, 16 + note __, 11 + note __, 16 + note __, 11 + callchannel Branch_1e778f + octave 3 + note D#, 7 + dec_octave + note A_, 7 + inc_octave + note D#, 7 + note F#, 6 + note D_, 7 + dec_octave + note B_, 7 + inc_octave + note D_, 7 + note G#, 6 + note A_, 7 + note E_, 7 + note C#, 7 + note E_, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + inc_octave + note E_, 7 + note __, 6 +.Loop2 + note __, 14 + octave 2 + note E_, 7 + note __, 6 + loopchannel 14, .Loop2 + note E_, 7 + note E_, 7 + note E_, 7 + note E_, 6 + note F#, 7 + note F#, 7 + note G#, 7 + note G#, 6 + callchannel Branch_1e778f + octave 3 + note D#, 7 + octave 2 + note A_, 7 + octave 3 + note D#, 7 + note F#, 6 + note D_, 7 + octave 2 + note B_, 7 + octave 3 + note D_, 7 + note G#, 6 + note A_, 7 + note E_, 7 + note C#, 7 + note E_, 6 + octave 2 + note A_, 7 + octave 4 + note C#, 3 + note E_, 4 + note E_, 7 + note __, 6 + dec_octave + dec_octave + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note F#, 6 + dec_octave + note A_, 7 + inc_octave + note A_, 7 + note F#, 7 + note C#, 6 + dec_octave + note G#, 6 + note __, 8 + note B_, 7 + inc_octave + note E_, 6 + dec_octave + note G#, 7 + inc_octave + note G#, 7 + note E_, 7 + dec_octave + note B_, 6 + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note D#, 7 + note F#, 6 + dec_octave + note A_, 7 + inc_octave + note A_, 7 + note F#, 7 + note D#, 6 + dec_octave + note G#, 6 + note __, 8 + note B_, 7 + inc_octave + note E_, 6 + dec_octave + note G#, 7 + inc_octave + note G#, 7 + note E_, 7 + dec_octave + note B_, 6 + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 7 + inc_octave + note A_, 7 + note F#, 7 + note E_, 6 + note C#, 7 + dec_octave + note A_, 7 + note G_, 7 + note A_, 6 + note A#, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A#, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A#, 7 + inc_octave + note G_, 7 + note F#, 7 + note C#, 6 + dec_octave + note A#, 7 + inc_octave + note C#, 7 + note F#, 7 + note C#, 6 + dec_octave + note B_, 6 + note __, 8 + inc_octave + note D_, 7 + note F#, 6 + dec_octave + note B_, 7 + inc_octave + note F#, 7 + note D_, 7 + dec_octave + note B_, 6 + inc_octave + note D_, 6 + note __, 8 + note F_, 7 + note A_, 6 + note D_, 7 + note B_, 7 + note A_, 7 + note F_, 6 + dec_octave + note E_, 6 + note __, 8 + note E_, 7 + inc_octave + note C_, 6 + dec_octave + note E_, 7 + inc_octave + note E_, 7 + note A_, 7 + note __, 6 + dec_octave + note E_, 6 + note __, 8 + note E_, 7 + note G_, 6 + note E_, 7 + note B_, 7 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note E_, 7 + note __, 6 + note __, 7 + note __, 7 + note __, 7 + note __, 6 + note E_, 6 + note __, 8 + note __, 3 + octave 3 + note C#, 7 + note A_, 3 + octave 4 + note E_, 7 + note __, 7 + note __, 7 + note __, 6 + loopchannel 0, .MainLoop + +Branch_1e778f: + octave 2 + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note B_, 6 + note __, 8 + inc_octave + note F#, 7 + note D_, 6 + dec_octave + note B_, 7 + inc_octave + note G#, 7 + note F#, 7 + note D_, 6 + dec_octave + note E_, 6 + note __, 8 + note G#, 7 + note B_, 6 + note E_, 7 + inc_octave + note C#, 7 + dec_octave + note B_, 7 + note G#, 6 + note E_, 6 + note __, 8 + note G#, 7 + note B_, 6 + note E_, 7 + inc_octave + note C#, 7 + dec_octave + note B_, 7 + note G#, 6 + note E_, 6 + note __, 8 + note G#, 7 + note B_, 6 + note E_, 7 + inc_octave + note C#, 7 + dec_octave + note B_, 7 + note G#, 6 + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + note A_, 7 + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note F#, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note C#, 7 + note E_, 6 + dec_octave + note A_, 7 + inc_octave + note G_, 7 + note E_, 7 + note C#, 6 + dec_octave + note A_, 6 + note __, 8 + inc_octave + note D_, 7 + note F#, 6 + dec_octave + note A_, 7 + inc_octave + note A_, 7 + note F#, 7 + note D_, 6 + note D_, 7 + dec_octave + note A_, 7 + inc_octave + note D_, 7 + note F#, 6 + note D#, 7 + dec_octave + note A_, 7 + inc_octave + note D#, 7 + note F#, 6 + note E_, 7 + note C#, 7 + note E_, 7 + note A_, 6 + note F#, 7 + note C#, 7 + note F#, 7 + note A_, 6 + endchannel + + +Music_TCG2GameCorner_Ch3: + notetype1 10 + notetype2 11 + notetype1 1 + notetype0 1 +.MainLoop + octave 2 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 4 + note __, 3 + note E_, 16 + note E_, 4 + note F#, 7 + note __, 7 + note G#, 7 + note __, 6 + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note B_, 11 + note __, 3 + inc_octave + note B_, 7 + note __, 6 + dec_octave + note F#, 11 + note __, 3 + inc_octave + note B_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note B_, 11 + note __, 3 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note B_, 11 + note __, 3 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + note G#, 11 + note __, 2 + note A_, 11 + note __, 3 + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + note G#, 11 + note __, 2 + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + note C#, 11 + note __, 3 + note A_, 7 + note __, 6 + note D_, 11 + note __, 3 + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note D_, 11 + note __, 3 + note D_, 11 + note __, 2 + note D#, 11 + note __, 3 + note D#, 11 + note __, 2 + note E_, 11 + note __, 3 + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + note F#, 11 + note __, 2 + note B_, 11 + note __, 3 + note B_, 11 + note __, 2 + note E_, 11 + note __, 3 + note E_, 11 + note __, 2 + note A_, 11 + note __, 3 + note E_, 11 + note __, 2 + note A_, 11 + note __, 3 + inc_octave + note A_, 5 + note __, 8 + dec_octave + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 14 + note E_, 13 + note F#, 14 + note G#, 13 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 11 + note __, 16 + note E_, 11 + note __, 16 + note A_, 4 + note __, 3 + note E_, 16 + note E_, 4 + note F#, 7 + note __, 7 + note G#, 7 + note __, 6 + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note B_, 11 + note __, 3 + inc_octave + note B_, 7 + note __, 6 + dec_octave + note F#, 11 + note __, 3 + inc_octave + note B_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note B_, 11 + note __, 3 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note B_, 11 + note __, 3 + inc_octave + note E_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + note G#, 11 + note __, 2 + note A_, 11 + note __, 3 + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + note G#, 11 + note __, 2 + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note E_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + note C#, 11 + note __, 3 + note A_, 7 + note __, 6 + note D_, 11 + note __, 3 + note A_, 7 + note __, 6 + dec_octave + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + dec_octave + note D_, 11 + note __, 3 + note D_, 11 + note __, 2 + note D#, 11 + note __, 3 + note D#, 11 + note __, 2 + note E_, 11 + note __, 3 + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + note F#, 11 + note __, 2 + note B_, 11 + note __, 3 + note B_, 11 + note __, 2 + note E_, 11 + note __, 3 + note E_, 11 + note __, 2 + note A_, 11 + note __, 3 + note E_, 11 + note __, 2 + note A_, 11 + note __, 3 + inc_octave + note A_, 7 + note __, 6 + note D_, 11 + note __, 3 + dec_octave + note A_, 11 + note __, 2 + note F#, 11 + note __, 3 + note D_, 11 + note __, 2 + note E_, 11 + note __, 3 + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + note G#, 11 + note __, 2 + note A_, 11 + note __, 3 + inc_octave + note C#, 11 + note __, 2 + note E_, 11 + note __, 3 + note F#, 11 + note __, 2 + note A_, 11 + note __, 3 + note F#, 11 + note __, 2 + note E_, 11 + note __, 3 + note C#, 11 + note __, 2 + dec_octave + note B_, 11 + note __, 3 + inc_octave + note C#, 11 + note __, 2 + note D_, 11 + note __, 3 + note D#, 11 + note __, 2 + note E_, 11 + note __, 3 + dec_octave + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + note G#, 11 + note __, 2 + note A_, 11 + note __, 3 + inc_octave + note C#, 11 + note __, 2 + note E_, 11 + note __, 3 + note F#, 11 + note __, 2 + note A_, 11 + note __, 3 + dec_octave + note A_, 11 + note __, 2 + note G_, 11 + note __, 3 + note F_, 11 + note __, 2 + note F#, 11 + note __, 3 + note A#, 11 + note __, 2 + inc_octave + note C#, 11 + note __, 3 + note E_, 11 + note __, 2 + note F#, 11 + note __, 3 + dec_octave + note F#, 11 + note __, 2 + note G#, 11 + note __, 3 + note A#, 11 + note __, 2 + note B_, 11 + note __, 3 + inc_octave + note F#, 11 + note __, 2 + note B_, 11 + note __, 3 + note F#, 11 + note __, 2 + dec_octave + note B_, 11 + note __, 3 + note A_, 11 + note __, 2 + note G#, 11 + note __, 3 + note F#, 11 + note __, 2 + note E_, 11 + note __, 3 + note E_, 11 + note __, 16 + note __, 14 + note E_, 11 + note __, 2 + note E_, 11 + note __, 16 + note __, 13 + note A_, 14 + note __, 7 + inc_octave + note C_, 6 + note C#, 7 + note E_, 7 + note F#, 7 + note __, 6 + note A_, 7 + note __, 7 + dec_octave + note E_, 7 + note __, 6 + note A_, 7 + note __, 7 + note __, 7 + note __, 6 + loopchannel 0, .MainLoop + + +Music_TCG2GameCorner_Ch4: + togglenoise $06 +.MainLoop + octave 1 + notetype 1 +.Loop1 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + loopchannel 13, .Loop1 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 14 + note __, 13 + note __, 14 + note __, 13 +.Loop2 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 14 + note C#, 13 + note C_, 14 + note C#, 7 + note C#, 6 + loopchannel 3, .Loop2 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C#, 14 + note C#, 7 + note C#, 6 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 14 + note C#, 13 + note C_, 14 + note C#, 7 + note C#, 6 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 +.Loop3 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + loopchannel 5, .Loop3 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 3 + note C#, 3 + note C#, 14 + note C#, 13 + note C#, 14 + note F_, 13 +.Loop4 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + loopchannel 14, .Loop4 + note C_, 7 + note C#, 3 + note C#, 4 + note C#, 7 + note C#, 6 + note C#, 14 + note C#, 7 + note C#, 6 +.Loop5 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 14 + note C#, 13 + note C_, 14 + note C#, 7 + note C#, 6 + loopchannel 3, .Loop5 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C#, 14 + note C#, 7 + note C#, 6 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 14 + note C#, 13 + note C_, 14 + note C#, 7 + note C#, 6 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 +.Loop6 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + loopchannel 5, .Loop6 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 3 + note C#, 3 + note C#, 14 + note C#, 13 + note C#, 14 + note A_, 13 +.Loop7 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + loopchannel 3, .Loop7 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 4 + note C#, 4 + note C#, 5 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C_, 14 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 13 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 14 + note C#, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note A#, 7 + note C_, 6 + note C#, 14 + note C#, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note E_, 13 + note C#, 14 + note C#, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 3 + note C#, 4 + note C#, 13 + note C#, 14 + note A_, 13 + loopchannel 0, .MainLoop + diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm new file mode 100644 index 00000000..3153229f --- /dev/null +++ b/crysaudio/music/TCG2/grblimp.asm @@ -0,0 +1,729 @@ +Music_TCG2GRBlimp: + db $C0 + dw Music_TCG2GRBlimp_Ch1 + db $01 + dw Music_TCG2GRBlimp_Ch2 + db $02 + dw Music_TCG2GRBlimp_Ch3 + db $03 + dw Music_TCG2GRBlimp_Ch4 + +Music_TCG2GRBlimp_Ch2: + notetype1 10 + vibrato 28, $33 + notetype2 8 + octave 4 + dutycycle 2 + notetype1 7 + vibrato 28, $33 + callchannel Branch_1e7cf5 + note G#, 16 + note G#, 5 + note G#, 7 + inc_octave + note C_, 16 + note C_, 5 + dec_octave + note A#, 4 + inc_octave + note C_, 3 + dec_octave + note A#, 14 + note A#, 5 + note G_, 14 + note A#, 5 + note D#, 14 + note G_, 4 + notetype0 6 + note F_, 14 + notetype0 1 + note F_, 14 + callchannel Branch_1e7cf5 + note G#, 16 + note G#, 5 + note G#, 7 + inc_octave + note C_, 16 + note C_, 5 + dec_octave + note A#, 4 + inc_octave + note C_, 3 + dec_octave + note A#, 14 + note A#, 5 + note F_, 14 + note F_, 5 + note A#, 14 + note A#, 4 + inc_octave + notetype0 6 + note C_, 14 + notetype0 1 + note C_, 14 + notetype0 1 + note C_, 5 + note C#, 5 + note D#, 4 + note F_, 16 + note F_, 12 + note F_, 16 + note F_, 12 + note F_, 14 + note F_, 14 + note D#, 14 + note D#, 7 + note C#, 7 + note C_, 7 + note C#, 7 + note __, 7 + dec_octave + note G#, 5 + inc_octave + note C#, 2 + dec_octave + vibrato 14, $33 + note A#, 14 + note A#, 16 + note A#, 16 + note A#, 10 + note A#, 14 + note A#, 5 + inc_octave + note C_, 5 + note C#, 4 + vibrato 28, $33 + note D#, 16 + note D#, 12 + note D#, 16 + note D#, 12 + note D#, 14 + note D#, 14 + note C#, 14 + note D#, 7 + dec_octave + note B_, 7 + note A#, 7 + note B_, 7 + note __, 7 + note F#, 4 + note B_, 3 + vibrato 14, $33 + note G#, 14 + note G#, 16 + note G#, 16 + note G#, 10 + note G#, 14 + note G#, 5 + note A#, 5 + note B_, 4 + inc_octave + vibrato 28, $33 + note C#, 16 + note C#, 12 + note C#, 16 + note C#, 16 + note C#, 10 + dec_octave + note B_, 7 + inc_octave + note C#, 7 + dec_octave + note F#, 14 + note B_, 7 + note F#, 7 + inc_octave + note C#, 16 + note C#, 12 + note C#, 16 + note C#, 16 + note C#, 10 + note C#, 14 + note C#, 5 + note C#, 5 + note D#, 4 + note C#, 5 + note E_, 5 + note D#, 4 + note D#, 16 + note D#, 12 + note D#, 14 + note C#, 5 + note D#, 5 + note C#, 4 + note C_, 14 + note C_, 5 + dec_octave + note G#, 14 + inc_octave + note C_, 5 + note C_, 14 + dec_octave + note G#, 4 + inc_octave + vibrato 28, $33 + notetype0 7 + note D_, 16 + note D_, 2 + endchannel + +Branch_1e7cf5: + octave 4 + notetype0 1 + note C_, 4 + note C_, 3 + note D_, 4 + note C_, 3 + notetype0 7 + note D#, 10 + note D#, 2 + notetype0 1 + note D_, 4 + note D_, 3 + note C_, 4 + note D_, 3 + dec_octave + note A#, 4 + inc_octave + note C_, 3 + note D_, 4 + dec_octave + note A#, 3 + notetype0 7 + inc_octave + note C_, 12 + note C_, 2 + dec_octave + notetype0 1 + note A_, 4 + note A_, 3 + note A_, 4 + note A_, 3 + note A#, 16 + note A#, 5 + note A#, 7 + note G_, 16 + note G_, 5 + note G_, 7 + note D#, 14 + note D#, 5 + inc_octave + note D_, 14 + note D#, 5 + dec_octave + note A#, 14 + note A#, 4 + inc_octave + note C_, 7 + dec_octave + note A#, 14 + note F_, 4 + inc_octave + note C_, 3 + dec_octave + note F_, 16 + note F_, 12 + note F_, 16 + note F_, 12 + note F_, 14 + inc_octave + note C_, 4 + note C_, 3 + note D_, 4 + note C_, 3 + notetype0 7 + note D#, 10 + note D#, 2 + notetype0 1 + note D_, 4 + note D_, 3 + note C_, 4 + note D_, 3 + dec_octave + note A#, 4 + inc_octave + note C_, 3 + note D_, 4 + dec_octave + note A#, 3 + inc_octave + note C_, 7 + note D_, 7 + dec_octave + note __, 7 + note F_, 4 + inc_octave + note C_, 3 + dec_octave + note F_, 16 + note F_, 12 + note F_, 16 + note F_, 12 + note F_, 14 + note F_, 4 + note F_, 3 + note G_, 4 + note F_, 3 + endchannel + + +Music_TCG2GRBlimp_Ch1: + notetype1 10 + vibrato 28, $33 + notetype2 8 + notetype0 7 + octave 3 + callchannel Branch_1e7e8a + note C#, 14 + note C#, 7 + note C#, 7 + note F_, 14 + note F_, 7 + note F_, 7 + note G_, 14 + note G_, 5 + note D#, 14 + note D#, 5 + dec_octave + note A#, 14 + inc_octave + note D#, 4 + dec_octave + note A#, 14 + note A#, 14 + note A#, 14 + note A_, 4 + note A#, 3 + note G_, 4 + note A_, 3 + note A_, 14 + note A_, 14 + note A_, 14 + callchannel Branch_1e7e8a + note D#, 16 + note D#, 5 + note D#, 7 + note G#, 16 + note G#, 5 + note G#, 7 + note F_, 14 + note F_, 5 + note C#, 14 + note C#, 5 + note F_, 14 + note F_, 4 + note F_, 16 + note F_, 12 + note F_, 16 + note E_, 4 + note F_, 3 + note E_, 4 + note D_, 3 + note E_, 16 + note E_, 12 + dec_octave + note D_, 4 + note E_, 3 + note G_, 4 + note A#, 3 + inc_octave + note D_, 4 + note F_, 3 + note G_, 4 + inc_octave + note C_, 3 + vibrato 28, $33 + note C#, 14 + dec_octave + note C#, 3 + inc_octave + note C#, 4 + dec_octave + note C#, 3 + note C#, 4 + note F_, 5 + note C#, 5 + note C#, 4 + note F_, 5 + note F_, 5 + note C#, 4 + vibrato 7, $33 + note G#, 7 + note G#, 14 + note G#, 7 + inc_octave + note C_, 7 + dec_octave + note G#, 7 + note __, 7 + note A#, 4 + note A#, 3 + note G#, 7 + note A#, 7 + dec_octave + note A#, 3 + inc_octave + note G#, 4 + dec_octave + note A#, 3 + note A#, 4 + inc_octave + note C#, 5 + dec_octave + note A#, 5 + note A#, 4 + inc_octave + note C#, 5 + note C#, 5 + dec_octave + note A#, 4 + inc_octave + note F#, 7 + note F#, 16 + note F#, 5 + note F#, 14 + note F#, 7 + note F#, 7 + vibrato 28, $33 + note B_, 14 + dec_octave + note B_, 3 + inc_octave + note B_, 4 + dec_octave + note B_, 3 + note B_, 4 + inc_octave + note D#, 5 + dec_octave + note B_, 5 + note B_, 4 + inc_octave + note D#, 5 + note D#, 5 + dec_octave + note B_, 4 + inc_octave + vibrato 7, $33 + note F#, 7 + note F#, 14 + note F#, 7 + note A#, 7 + note F#, 7 + note __, 7 + note G#, 4 + note G#, 3 + note F#, 7 + note F#, 7 + dec_octave + note G#, 3 + inc_octave + note F#, 4 + dec_octave + note G#, 3 + note G#, 4 + note B_, 5 + note G#, 5 + note G#, 4 + note B_, 5 + note B_, 5 + note G#, 4 + inc_octave + note E_, 7 + note E_, 16 + note E_, 4 + note E_, 14 + dec_octave + note B_, 7 + note B_, 7 + vibrato 28, $33 + inc_octave + note E_, 14 + note C#, 3 + note E_, 4 + note C#, 3 + note C#, 4 + note E_, 5 + note C#, 5 + note C#, 4 + note E_, 5 + note E_, 5 + note C#, 4 + note A_, 14 + note G#, 7 + note A_, 7 + note D#, 14 + note G#, 7 + note D#, 7 + note A_, 14 + note C#, 3 + note A_, 4 + note C#, 3 + note C#, 4 + note E_, 5 + note C#, 5 + note C#, 4 + note E_, 5 + note E_, 5 + note C#, 4 + note A_, 7 + note A_, 14 + note A_, 7 + note A_, 5 + note A_, 4 + note B_, 4 + note A_, 5 + inc_octave + note C#, 5 + dec_octave + note A_, 4 + vibrato 14, $33 + note A#, 14 + note A#, 16 + note A#, 5 + note A#, 7 + note A#, 7 + note A#, 7 + note G#, 14 + note G#, 5 + note D#, 14 + note G#, 5 + note G#, 14 + note D#, 4 + vibrato 28, $33 + notetype0 7 + note A#, 16 + note A#, 2 + endchannel + +Branch_1e7e8a: + octave 3 + notetype0 1 + note A_, 4 + note A_, 3 + note A_, 4 + note A_, 3 + notetype0 7 + note A#, 10 + note A#, 2 + notetype0 1 + note A#, 4 + note A#, 3 + note A#, 4 + note A#, 3 + note G_, 4 + note A#, 3 + note A#, 4 + note G_, 3 + notetype0 7 + note A_, 12 + note A_, 2 + notetype0 1 + note F_, 4 + note F_, 3 + note F_, 4 + note F_, 3 + note G_, 16 + note G_, 5 + note G_, 7 + note D#, 16 + note D#, 5 + note D#, 7 + dec_octave + note A#, 14 + note A#, 5 + inc_octave + note G_, 14 + note G_, 5 + note D#, 14 + note D#, 4 + note F_, 7 + note D#, 14 + note C_, 4 + note F_, 3 + note C_, 16 + note C_, 12 + note C_, 16 + note C_, 12 + note C_, 14 + note A_, 4 + note A_, 3 + note A_, 4 + note A_, 3 + notetype0 7 + note A#, 10 + note A#, 2 + notetype0 1 + note A#, 4 + note A#, 3 + note A#, 4 + note A#, 3 + note G_, 4 + note A#, 3 + note A#, 4 + note G_, 3 + note A_, 7 + note A#, 14 + note C_, 4 + note F_, 3 + note C_, 16 + note C_, 12 + note C_, 16 + note C_, 12 + note C_, 14 + note C_, 4 + note C_, 3 + note D_, 4 + note C_, 3 + endchannel + + +Music_TCG2GRBlimp_Ch3: + notetype1 10 + notetype2 11 + notetype1 1 + octave 2 + notetype0 1 + note __, 14 + notetype0 7 +.Loop1 + note F_, 4 + note C_, 4 + loopchannel 11, .Loop1 + note F_, 4 + note D#, 4 + note C#, 4 + note C#, 4 + note C_, 4 + note C_, 4 +.Loop2 + note F_, 4 + note C_, 4 + loopchannel 13, .Loop2 + note F_, 4 + note G_, 4 + note G#, 4 + note G#, 4 + note C#, 4 + note C#, 4 + note C_, 4 + note G_, 4 + inc_octave + note C_, 4 + dec_octave + note C_, 4 + note C#, 4 + note G#, 4 + inc_octave + note C#, 4 + dec_octave + note G#, 4 + note F#, 4 + note C#, 4 + note F#, 4 + note C#, 4 + note B_, 4 + note F#, 4 + note B_, 4 + note F#, 4 + note E_, 4 + note B_, 4 + note E_, 4 + note B_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note C#, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note A#, 4 + notetype0 1 + note G#, 10 + note G#, 9 + note D#, 10 + note D#, 9 + note G#, 10 + note G#, 8 + note G#, 4 + note A_, 4 + note A#, 6 + notetype0 7 + note A#, 14 + note A#, 2 + endchannel + + +Music_TCG2GRBlimp_Ch4: + togglenoise $06 + notetype 9 + octave 1 + notetype 1 + note __, 14 +.Loop1 + note C#, 14 + note C#, 14 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + note C#, 7 + note C#, 7 + note C#, 14 + note C#, 14 + note D_, 3 + note D_, 4 + rept 3 + note D_, 3 + note D_, 4 + endr + note C#, 14 + note C#, 14 + note C#, 7 + note C#, 14 + note C#, 7 + note C#, 14 + note C#, 14 + note D_, 3 + note D_, 4 + rept 3 + note D_, 3 + note D_, 4 + endr + loopchannel 11, .Loop1 + note C#, 14 + note C#, 14 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + note C#, 7 + note C#, 7 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + note C#, 5 + note C#, 16 + note __, 3 + note C#, 16 + note __, 2 + note D_, 3 + note D_, 4 +.Loop2 + note D_, 3 + note D_, 4 + loopchannel 5, .Loop2 +.Loop3 + note D_, 3 + note D_, 4 + loopchannel 5, .Loop3 +.Loop4 + note D_, 3 + note D_, 4 + loopchannel 5, .Loop4 + note D_, 14 + endchannel + diff --git a/crysaudio/music/TCG2/grcastle.asm b/crysaudio/music/TCG2/grcastle.asm new file mode 100644 index 00000000..7955855c --- /dev/null +++ b/crysaudio/music/TCG2/grcastle.asm @@ -0,0 +1,2030 @@ +Music_TCG2GRCastle: + db $C0 + dw Music_TCG2GRCastle_Ch1 + db $01 + dw Music_TCG2GRCastle_Ch2 + db $02 + dw Music_TCG2GRCastle_Ch3 + db $03 + dw Music_TCG2GRCastle_Ch4 + +Music_TCG2GRCastle_Ch2: + notetype1 10 + notetype0 1 + note __, 12 + octave 1 + vibrato 1, $33 + note B_, 9 + note __, 4 + note B_, 9 + note __, 3 + note __, 13 + inc_octave + note E_, 2 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note E_, 13 + note E_, 12 + vibrato 0, $33 + note D_, 13 + note E_, 12 + note E_, 1 + note __, 4 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + inc_octave + note E_, 12 + note E_, 13 + dec_octave + note E_, 2 + note __, 4 + note __, 1 + note __, 5 + note G_, 7 + note A_, 6 + note G_, 12 + note E_, 13 + note D_, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + note E_, 2 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note E_, 13 + note E_, 12 + vibrato 0, $33 + note D_, 13 + note E_, 12 + note E_, 1 + note __, 4 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note A_, 3 + note A_, 3 + note A#, 6 + note A_, 13 + note G_, 12 +.MainLoop + octave 2 + notetype1 7 + note E_, 16 + note E_, 9 + notetype1 11 + note E_, 16 + note E_, 9 + octave 2 + vibrato 37, $33 + note A_, 4 + note A_, 3 + note A_, 3 + note A_, 3 + note A#, 3 + note A#, 3 + note A#, 3 + note A#, 3 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 9 + note B_, 16 + note A_, 13 + note B_, 12 + vibrato 25, $33 + inc_octave + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + vibrato 29, $33 + note C_, 4 + note C_, 3 + note C_, 3 + note C_, 3 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 3 + note D_, 13 + note D_, 12 + vibrato 13, $33 + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + vibrato 25, $33 + dec_octave + note A_, 4 + note A_, 3 + note A_, 3 + note A_, 3 + note A#, 3 + note A#, 3 + note A#, 3 + note A#, 3 + note B_, 13 + inc_octave + note C_, 12 + dec_octave + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + vibrato 37, $33 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + inc_octave + note C_, 4 + note C_, 3 + note C_, 3 + note C_, 3 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 3 + note D_, 13 + dec_octave + note A_, 12 + note A_, 13 + note A_, 12 + inc_octave + note D_, 13 + note D_, 12 + dec_octave + note A_, 4 + note A_, 3 + note A_, 3 + note A_, 3 + note A#, 3 + note A#, 3 + note A#, 3 + note A#, 3 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 9 + note B_, 16 + note A_, 13 + note B_, 12 + vibrato 25, $33 + inc_octave + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + note C_, 4 + note C_, 3 + note C_, 3 + note C_, 3 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 3 + note D_, 13 + note D_, 12 + vibrato 13, $33 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + vibrato 25, $33 + note E_, 4 + note E_, 3 + note E_, 3 + note E_, 3 + note F_, 3 + note F_, 3 + note F_, 3 + note F_, 3 + note F#, 13 + note G_, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 16 + note D_, 9 + note F#, 13 + note F#, 12 + note F_, 4 + note F#, 9 + note F#, 12 + note F#, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 16 + note E_, 9 + note E_, 4 + note E_, 3 + note E_, 3 + note E_, 3 + note D#, 3 + note D#, 3 + note D#, 3 + note D#, 2 + note D_, 1 + octave 2 + notetype1 8 + note B_, 16 + note B_, 9 + note B_, 3 + inc_octave + note D_, 16 + note D_, 6 + note D#, 4 + note E_, 13 + note E_, 12 + note E_, 9 + note A#, 3 + vibrato 25, $33 + note B_, 9 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note A_, 16 + note A_, 9 + note G_, 16 + note G_, 9 + note F#, 13 + note G_, 12 + note F#, 13 + note D_, 12 + note D_, 13 + note C_, 4 + dec_octave + note B_, 4 + note A#, 4 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + note F#, 13 + note F#, 12 + note G_, 13 + note G_, 12 + note G_, 13 + inc_octave + note D#, 3 + note E_, 9 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note D#, 4 + note E_, 15 + note F#, 6 + note F#, 13 + note G_, 12 + note F#, 4 + note G_, 3 + note F#, 6 + note F#, 12 + note D_, 13 + dec_octave + note A#, 6 + note B_, 6 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + inc_octave + note C_, 16 + note C_, 9 + note D_, 16 + note D_, 9 + note D#, 4 + note E_, 13 + note E_, 12 + note E_, 9 + note A#, 3 + vibrato 25, $33 + note B_, 9 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note A_, 16 + note A_, 9 + note G_, 16 + note G_, 9 + note F#, 13 + note G_, 12 + note F#, 13 + note G#, 3 + note A_, 9 + note A_, 13 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 13 + note D_, 12 + note D_, 13 + note D_, 12 + note D_, 13 + note D_, 12 + dec_octave + note A#, 4 + note B_, 9 + note B_, 12 + inc_octave + note D_, 13 + note D_, 12 + note D#, 4 + note E_, 9 + note E_, 12 + note D_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 6 + note A_, 6 + note A_, 13 + note G_, 12 + note F#, 4 + note G_, 3 + note F#, 6 + note F#, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F#, 12 + note F#, 13 + note F#, 12 + octave 1 + vibrato 50, $33 +.Loop1 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 16 + loopchannel 4, .Loop1 + note E_, 16 + octave 3 + note E_, 7 + note B_, 6 + note A_, 6 + note E_, 6 + inc_octave + note D_, 7 + dec_octave + note A_, 6 + note G_, 6 + inc_octave + note D_, 6 + note C_, 7 + dec_octave + note G_, 6 + inc_octave + note F_, 6 + note C_, 6 + dec_octave + note A#, 7 + inc_octave + note F_, 6 + note D#, 6 + dec_octave + note A#, 6 + inc_octave + note G#, 7 + note D#, 6 + dec_octave + note A_, 6 + inc_octave + note G#, 6 + note D_, 7 + dec_octave + note A_, 6 + inc_octave + note G_, 6 + note D_, 6 + dec_octave + note G_, 7 + inc_octave + note G_, 6 + note C_, 6 + dec_octave + note G_, 6 + note F#, 7 + inc_octave + note C_, 6 + dec_octave + note B_, 6 + note F#, 6 + note E_, 7 + note B_, 6 + note A_, 6 + note E_, 6 + inc_octave + note D_, 7 + dec_octave + note A_, 6 + note G_, 6 + inc_octave + note D_, 6 + note C_, 7 + dec_octave + note G_, 6 + inc_octave + note F_, 6 + note C_, 6 + dec_octave + note A#, 7 + inc_octave + note F_, 6 + note D#, 6 + dec_octave + note A#, 6 + inc_octave + note G#, 7 + note D#, 6 + dec_octave + note A_, 6 + inc_octave + note G#, 6 + note D_, 7 + dec_octave + note A_, 6 + inc_octave + note G_, 6 + note D_, 6 + dec_octave + loopchannel 0, .MainLoop + + +Music_TCG2GRCastle_Ch1: + notetype1 10 + notetype0 1 + note __, 12 + octave 1 + vibrato 1, $33 + note __, 13 + note __, 12 + note __, 13 + note B_, 2 + note __, 2 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + vibrato 7, $33 + note B_, 13 + note B_, 12 + vibrato 0, $33 + note A_, 13 + note B_, 12 + note __, 13 + inc_octave + note B_, 12 + note B_, 13 + note __, 12 + note D_, 7 + note __, 6 + note __, 12 + dec_octave + note B_, 13 + note __, 12 + note B_, 9 + note __, 4 + note B_, 9 + note __, 3 + note __, 13 + note B_, 2 + note __, 2 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + vibrato 7, $33 + note B_, 13 + note B_, 12 + vibrato 0, $33 + note A_, 13 + note B_, 12 + note B_, 1 + note __, 4 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + inc_octave + note E_, 3 + note E_, 3 + note F_, 6 + note E_, 13 + note D_, 12 + note E_, 13 + note D_, 12 + dec_octave + note A_, 13 + note A#, 12 +.MainLoop + octave 2 + vibrato 0, $33 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note E_, 9 + note __, 4 + note E_, 2 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note E_, 13 + note E_, 12 + vibrato 0, $33 + note D_, 13 + note E_, 12 + note E_, 2 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note G_, 12 + note G_, 13 + vibrato 0, $33 + note G_, 2 + note __, 4 + note G_, 1 + note __, 5 + note G_, 7 + note A_, 6 + note G_, 12 + note E_, 13 + note D_, 12 + note F_, 9 + note __, 4 + note F_, 9 + note __, 3 + note F_, 9 + note __, 4 + note F_, 2 + note __, 2 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + vibrato 7, $33 + note F_, 13 + note F_, 12 + vibrato 0, $33 + note E_, 13 + note F_, 12 + note F_, 2 + note __, 3 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + vibrato 7, $33 + note A_, 12 + note A_, 13 + vibrato 0, $33 + note F_, 2 + note __, 4 + note F_, 1 + note __, 5 + note E_, 7 + note F_, 6 + note E_, 12 + note C_, 13 + note F_, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note E_, 9 + note __, 4 + note E_, 2 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note E_, 13 + note E_, 12 + vibrato 0, $33 + note D_, 13 + note E_, 12 + note E_, 2 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note G_, 12 + note G_, 13 + vibrato 0, $33 + note G_, 2 + note __, 4 + note G_, 1 + note __, 5 + note G_, 7 + note A_, 6 + note G_, 12 + note E_, 13 + note D_, 12 + note F_, 9 + note __, 4 + note F_, 9 + note __, 3 + note F_, 9 + note __, 4 + note F_, 2 + note __, 2 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + vibrato 7, $33 + inc_octave + note C_, 13 + note C_, 12 + dec_octave + vibrato 0, $33 + note E_, 13 + note F_, 12 + note F_, 2 + note __, 3 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + vibrato 7, $33 + note A_, 12 + note A_, 13 + vibrato 0, $33 + note A_, 2 + note __, 4 + note A_, 1 + note __, 5 + note A_, 7 + note B_, 6 + note A_, 12 + note F_, 13 + note A_, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note E_, 9 + note __, 4 + note E_, 2 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note E_, 13 + note E_, 12 + vibrato 0, $33 + note D_, 13 + note E_, 12 + note E_, 2 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note G_, 12 + note G_, 13 + vibrato 0, $33 + note G_, 2 + note __, 4 + note G_, 1 + note __, 5 + note G_, 7 + note A_, 6 + note G_, 12 + note E_, 13 + note D_, 12 + note F_, 9 + note __, 4 + note F_, 9 + note __, 3 + note F_, 9 + note __, 4 + note F_, 2 + note __, 2 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + vibrato 7, $33 + note F_, 13 + note F_, 12 + vibrato 0, $33 + note E_, 13 + note F_, 12 + note F_, 2 + note __, 3 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + vibrato 7, $33 + note A_, 12 + note A_, 13 + vibrato 0, $33 + note F_, 2 + note __, 4 + note F_, 1 + note __, 5 + note E_, 7 + note F_, 6 + note E_, 12 + note C_, 13 + note F_, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note E_, 9 + note __, 4 + note E_, 2 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note E_, 13 + note E_, 12 + vibrato 0, $33 + note D_, 13 + note E_, 12 + note E_, 2 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + vibrato 7, $33 + note G_, 12 + note G_, 13 + vibrato 0, $33 + note G_, 2 + note __, 4 + note G_, 1 + note __, 5 + note G_, 7 + note A_, 6 + note G_, 12 + note E_, 13 + note D_, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note E_, 13 + note E_, 2 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note B_, 13 + note B_, 12 + note A_, 13 + note B_, 12 + note E_, 2 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + inc_octave + note E_, 12 + dec_octave + note A_, 13 + note B_, 12 + note E_, 7 + note F_, 6 + note E_, 12 + note D_, 13 + dec_octave + note A_, 12 + octave 2 + note E_, 13 + note E_, 12 + note E_, 13 + note A#, 3 + note B_, 9 + note B_, 13 + note B_, 12 + inc_octave + note D_, 4 + note D_, 3 + note D_, 3 + note D_, 3 + note D#, 3 + note D#, 3 + note D#, 3 + note D#, 3 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note F#, 16 + note F#, 9 + note E_, 13 + note E_, 12 + note D_, 13 + note D_, 12 + note D_, 13 + note G#, 3 + note A_, 9 + note A_, 13 + note A_, 12 + vibrato 25, $33 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + vibrato 0, $33 + dec_octave + note B_, 13 + note B_, 12 + inc_octave + note E_, 13 + note E_, 12 + note C#, 4 + note D_, 9 + note D_, 12 + note D_, 13 + dec_octave + note B_, 12 + note B_, 13 + note B_, 12 + vibrato 25, $33 + inc_octave + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + vibrato 0, $33 + dec_octave + note B_, 13 + inc_octave + note C_, 12 + note A_, 13 + note F#, 12 + note D_, 13 + note D_, 12 + note D_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + vibrato 25, $33 + note D_, 13 + note D_, 12 + note D_, 13 + note D_, 12 + note D_, 13 + note D_, 12 + vibrato 0, $33 + dec_octave + dec_octave + note B_, 13 + note B_, 12 + note A_, 13 + note A_, 12 + inc_octave + note G_, 13 + note G_, 12 + note G_, 13 + note A#, 3 + note B_, 9 + note B_, 13 + note B_, 12 + inc_octave + note D_, 4 + note D_, 3 + note D_, 3 + note D_, 3 + note D#, 3 + note D#, 3 + note D#, 3 + note D#, 3 + note E_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note F#, 16 + note F#, 9 + note E_, 13 + note E_, 12 + note D_, 13 + note D_, 12 + note D_, 13 + note F_, 3 + note F#, 9 + note F#, 13 + note F#, 12 + dec_octave + vibrato 25, $33 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + vibrato 0, $33 + note A_, 13 + note A_, 12 + note B_, 13 + note B_, 12 + inc_octave + note C_, 13 + note C_, 12 + note C_, 13 + note F#, 3 + note G_, 9 + note G_, 13 + note G_, 12 + dec_octave + vibrato 25, $33 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + note A_, 13 + note A_, 12 + inc_octave + note C_, 13 + note C_, 12 + dec_octave + note A_, 13 + note A_, 12 + note A_, 13 + inc_octave + note D_, 3 + note D_, 3 + note D#, 3 + note D#, 3 + note E_, 13 + note E_, 12 + note C#, 13 + note C#, 12 + note D#, 13 + note D#, 12 + note D#, 13 + note D#, 12 + note D#, 13 + note D#, 12 + note D#, 13 + note D#, 12 + octave 3 + note E_, 7 + note __, 6 + note A_, 6 + note E_, 6 + inc_octave + note D_, 7 + dec_octave + note A_, 6 + note G_, 6 + inc_octave + note D_, 6 + note C_, 7 + dec_octave + note G_, 6 + inc_octave + note F_, 6 + note C_, 6 + dec_octave + note A#, 7 + inc_octave + note F_, 6 + note D#, 6 + dec_octave + note A#, 6 + inc_octave + note G#, 7 + note D#, 6 + dec_octave + note A_, 6 + inc_octave + note G#, 6 + note D_, 7 + dec_octave + note A_, 6 + inc_octave + note G_, 6 + note D_, 6 + dec_octave + note G_, 7 + inc_octave + note G_, 6 + note C_, 6 + dec_octave + note G_, 6 + note F#, 7 + inc_octave + note C_, 6 + dec_octave + note B_, 6 + note F#, 6 + note E_, 7 + note B_, 6 + note A_, 6 + note E_, 6 + inc_octave + note D_, 7 + dec_octave + note A_, 6 + note G_, 6 + inc_octave + note D_, 6 + note C_, 7 + dec_octave + note G_, 6 + inc_octave + note F_, 6 + note C_, 6 + dec_octave + note A#, 7 + inc_octave + note F_, 6 + note D#, 6 + dec_octave + note A#, 6 + inc_octave + note G#, 7 + note D#, 6 + dec_octave + note A_, 6 + inc_octave + note G#, 6 + note D_, 7 + dec_octave + note A_, 6 + inc_octave + note G_, 6 + note D_, 6 + dec_octave + note G_, 7 + inc_octave + note G_, 6 + note C_, 6 + dec_octave + note G_, 6 + note F#, 7 + inc_octave + note C_, 6 + dec_octave + note B_, 6 + note F#, 6 + octave 3 + note A_, 7 + note __, 6 + inc_octave + note D_, 6 + dec_octave + note A_, 6 + inc_octave + note G_, 7 + note D_, 6 + note C_, 6 + note G_, 6 + note F_, 7 + note C_, 6 + note A#, 6 + note F_, 6 + note D#, 7 + note A#, 6 + note G#, 6 + note D#, 6 + inc_octave + note C#, 7 + dec_octave + note G#, 6 + note D_, 6 + inc_octave + note C#, 6 + dec_octave + note G_, 7 + note D_, 6 + inc_octave + note C_, 6 + dec_octave + note G_, 6 + note C_, 7 + inc_octave + note C_, 6 + dec_octave + note F_, 6 + note C_, 6 + dec_octave + note B_, 7 + inc_octave + note F_, 6 + note E_, 6 + dec_octave + note B_, 6 + note A_, 7 + inc_octave + note E_, 6 + note D_, 6 + dec_octave + note A_, 6 + inc_octave + note G_, 7 + note D_, 6 + note C_, 6 + note G_, 6 + note F_, 7 + note C_, 6 + note A#, 6 + note F_, 6 + note D#, 7 + note A#, 6 + note G#, 6 + note D#, 6 + inc_octave + note C#, 7 + dec_octave + note G#, 6 + note D_, 6 + inc_octave + note C#, 6 + dec_octave + note G_, 7 + note D_, 6 + inc_octave + note C_, 6 + dec_octave + note G_, 6 + dec_octave + note G_, 7 + inc_octave + note G_, 6 + note C_, 6 + dec_octave + note G_, 6 + note F#, 7 + inc_octave + note C_, 6 + dec_octave + note B_, 6 + note F#, 6 + loopchannel 0, .MainLoop + + +Music_TCG2GRCastle_Ch3: + notetype1 10 + notetype2 11 + notetype1 1 + notetype0 1 + note __, 12 + vibrato 0, $33 + octave 2 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + note __, 12 + note __, 13 + note __, 12 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + note A_, 12 + note A#, 13 + note B_, 9 + note __, 3 + inc_octave + note D_, 13 + dec_octave + note B_, 12 + note A_, 13 + note G_, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + note __, 12 + note E_, 16 + note E_, 9 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + note A#, 12 + note A_, 13 + note G_, 12 + note A_, 13 + note G_, 12 + note D_, 13 + note D#, 12 +.MainLoop + octave 2 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b72 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b9e + note B_, 9 + note __, 3 + note A_, 13 + note B_, 12 + note D_, 13 + note D#, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b72 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b9e + note B_, 9 + note __, 3 + note A_, 13 + note B_, 12 + note D_, 13 + note D#, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b72 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b9e + note B_, 9 + note __, 3 + note A_, 13 + note B_, 12 + note D_, 13 + note D#, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b88 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + inc_octave + note D_, 6 + note E_, 6 + note D_, 13 + dec_octave + note B_, 12 + note A_, 13 + note G_, 12 + note D_, 13 + note D#, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b72 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b9e + note B_, 9 + note __, 3 + note A_, 13 + note B_, 12 + note D_, 13 + note D#, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b72 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b9e + note B_, 9 + note __, 3 + note A_, 13 + note B_, 12 + note D_, 13 + note D#, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + note __, 13 + note __, 1 + callchannel Branch_1f2b72 + note D_, 13 + note E_, 9 + note __, 3 + note __, 13 + callchannel Branch_1f2b9e + note B_, 9 + note __, 3 + note A_, 13 + note B_, 12 + note D_, 13 + note D#, 12 + note E_, 9 + note __, 4 + note E_, 9 + note __, 3 + callchannel Branch_1f2baa + note D_, 13 + note E_, 9 + note __, 3 + callchannel Branch_1f2bbf + note B_, 12 + inc_octave + note D_, 13 + note E_, 12 + dec_octave + note A#, 13 + note A_, 12 + note G_, 13 + note D_, 12 + vibrato 0, $33 + note C_, 13 + note C_, 12 + note C_, 13 + note G_, 12 + note G_, 13 + note G_, 12 + vibrato 25, $33 + note B_, 7 + inc_octave + note C_, 16 + note C_, 2 + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + note D_, 16 + note D_, 9 + note C_, 16 + note C_, 9 + vibrato 0, $33 + dec_octave + note B_, 13 + note B_, 12 + note B_, 13 + note F#, 12 + note F#, 13 + note F#, 12 + vibrato 25, $33 + note A_, 3 + note A#, 3 + note A#, 3 + note B_, 3 + note B_, 13 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note F#, 16 + note F#, 9 + note B_, 16 + note B_, 9 + note A_, 13 + note A_, 12 + note A_, 13 + note E_, 12 + note E_, 13 + note E_, 12 + note G_, 4 + note G#, 3 + note A_, 16 + note A_, 2 + note A_, 13 + note G_, 12 + note G_, 13 + note G_, 12 + note F#, 16 + note F#, 9 + note G_, 16 + note G_, 9 + note E_, 13 + note E_, 12 + note E_, 13 + note A_, 3 + note A#, 3 + note B_, 16 + note B_, 15 + inc_octave + note D_, 4 + note D#, 3 + note E_, 16 + note E_, 2 + note E_, 13 + dec_octave + note A#, 3 + note B_, 9 + inc_octave + note E_, 13 + dec_octave + note B_, 12 + note E_, 16 + note E_, 9 + note D_, 16 + note D_, 9 + note C_, 13 + note C_, 12 + note C_, 13 + note G_, 12 + note G_, 13 + note G_, 12 + vibrato 25, $33 + note B_, 7 + inc_octave + note C_, 16 + note C_, 2 + note C_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + note D_, 16 + note D_, 9 + note C_, 16 + note C_, 9 + vibrato 0, $33 + dec_octave + note B_, 13 + note B_, 12 + note B_, 13 + note F#, 12 + note F#, 13 + note F#, 12 + vibrato 25, $33 + note A_, 3 + note A#, 3 + note A#, 3 + note B_, 3 + note B_, 13 + note B_, 13 + note B_, 12 + note B_, 13 + note B_, 12 + note F#, 16 + note F#, 9 + note B_, 16 + note B_, 9 + note F_, 13 + note F_, 12 + note F_, 13 + inc_octave + note C_, 12 + note C_, 13 + note C_, 12 + note D#, 4 + note D#, 3 + note E_, 3 + note E_, 3 + note F_, 12 + note F_, 13 + note C_, 12 + note C_, 13 + note C_, 12 + dec_octave + note F_, 16 + note F_, 9 + inc_octave + note C_, 16 + note C_, 9 + dec_octave + note B_, 13 + note B_, 12 + note B_, 13 + inc_octave + note F#, 12 + note F#, 13 + note F#, 12 + vibrato 40, $33 + note A_, 4 + note A_, 3 + note A#, 3 + note A#, 3 + note B_, 12 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 16 + note B_, 2 + note B_, 3 + note B_, 2 + note B_, 2 + note B_, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note A#, 2 + note A_, 1 + vibrato 50, $33 + octave 2 + notetype0 10 + note E_, 10 + note E_, 10 + note E_, 10 + note E_, 10 + note E_, 10 + note E_, 10 + notetype0 5 + notetype1 3 + note E_, 15 + notetype1 1 + notetype0 1 + note D_, 13 + note E_, 12 + note __, 13 + inc_octave + note D_, 3 + note D#, 3 + note E_, 6 + note D_, 13 + dec_octave + note B_, 12 + note A#, 13 + note A_, 12 + note D_, 13 + note D#, 12 + loopchannel 0, .MainLoop + +Branch_1f2b72: + notetype1 2 + octave 2 + note B_, 2 + note __, 2 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + vibrato 7, $33 + note B_, 13 + note B_, 12 + vibrato 0, $33 + notetype1 1 + octave 2 + endchannel + +Branch_1f2b88: + notetype1 2 + octave 3 + note C_, 2 + note __, 1 + note C_, 1 + note __, 3 + note C_, 1 + note __, 3 + vibrato 7, $33 + note F_, 13 + note F_, 12 + vibrato 0, $33 + notetype1 1 + octave 2 + endchannel + +Branch_1f2b9e: + notetype1 2 + octave 3 + note D_, 12 + note D_, 13 + notetype1 1 + octave 2 + endchannel + +Branch_1f2baa: + notetype1 2 + octave 2 + note B_, 13 + note B_, 2 + note __, 2 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + vibrato 7, $33 + note B_, 13 + note B_, 12 + vibrato 0, $33 + notetype1 1 + octave 2 + endchannel + +Branch_1f2bbf: + notetype1 2 + octave 2 + note B_, 2 + note __, 3 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + notetype1 1 + endchannel + + +Music_TCG2GRCastle_Ch4: + togglenoise $06 + notetype 1 + octave 1 + note C#, 4 + note C#, 4 + note C#, 4 + note C_, 16 + note __, 9 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note D#, 13 + note C#, 12 + note D#, 13 + note C_, 12 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note C#, 4 + note C#, 4 + note C#, 4 + note C_, 13 + note C_, 12 + note C#, 13 + note C_, 12 + note C#, 13 + note D#, 6 + note C#, 6 + note C#, 13 + note C#, 12 + note D#, 13 + note C#, 12 + note C#, 13 + note C_, 12 + note C#, 13 + note C_, 6 + note C#, 6 + note C#, 13 + note C#, 4 + note C#, 4 + note C#, 4 +.MainLoop +.Loop1 + note C_, 13 + note C_, 12 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note D#, 12 + note D#, 13 + note C#, 12 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note C#, 4 + note C#, 4 + note C#, 4 + loopchannel 3, .Loop1 + note C_, 13 + note C_, 12 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note D#, 12 + note D#, 13 + note C#, 12 + note C#, 13 + note C_, 12 + note C#, 13 + note C#, 12 + note C_, 13 + note C#, 4 + note C#, 4 + note C#, 4 +.Loop2 + note C_, 13 + note C_, 12 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note D#, 12 + note D#, 13 + note C#, 12 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note C#, 4 + note C#, 4 + note C#, 4 + loopchannel 3, .Loop2 + note C_, 13 + note C_, 12 + note D#, 13 + note C_, 12 + note C#, 13 + note D#, 6 + note C#, 6 + note C#, 13 + note E_, 12 + note D#, 13 + note C#, 12 + note C#, 13 + note D#, 4 + note D#, 4 + note D#, 4 + note C#, 13 + note D#, 6 + note C#, 6 + note C#, 13 + note C#, 4 + note C#, 4 + note C#, 4 + callchannel Branch_1f2d0c + callchannel Branch_1f2d18 + callchannel Branch_1f2d0c + note D#, 13 + note C_, 12 + note E_, 13 + note D#, 6 + note D#, 6 + note D#, 13 + note D#, 12 + note C#, 13 + note D#, 4 + note D#, 4 + note D#, 4 + callchannel Branch_1f2d0c + callchannel Branch_1f2d18 + callchannel Branch_1f2d0c + note D#, 13 + note C_, 12 + note E_, 13 + note D#, 6 + note D#, 6 + note C#, 13 + note D#, 4 + note D#, 4 + note D#, 4 + note C#, 13 + note C#, 12 + callchannel Branch_1f2d0c + callchannel Branch_1f2d18 + callchannel Branch_1f2d0c + note D#, 13 + note C_, 12 + note E_, 13 + note D#, 6 + note D#, 6 + note D#, 13 + note D#, 12 + note C#, 13 + note D#, 4 + note D#, 4 + note D#, 4 + callchannel Branch_1f2d0c + callchannel Branch_1f2d18 + callchannel Branch_1f2d0c + note D#, 13 + note C_, 12 + note E_, 13 + note D#, 6 + note D#, 6 + note C#, 13 + note C_, 12 + note E_, 13 + note C#, 4 + note C#, 4 + note C#, 4 + notetype 6 + note G_, 16 + notetype 1 + note __, 4 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 4 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 4 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 8 + note C#, 4 + note C#, 4 + note C#, 4 + note C_, 16 + note __, 9 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note D#, 12 + note D#, 13 + note C#, 12 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note C#, 4 + note C#, 4 + note C#, 4 + note C_, 16 + note __, 9 + note D#, 13 + note C_, 12 + note C#, 16 + note __, 9 + note C_, 13 + note C#, 12 + note C_, 13 + note C#, 12 + note C#, 13 + note C#, 12 + note C#, 13 + note C#, 12 + note C#, 13 + note C_, 12 + loopchannel 0, .MainLoop + +Branch_1f2d0c: + note C_, 13 + note D#, 12 + note E_, 13 + note C_, 6 + note D#, 6 + note D#, 13 + note D#, 12 + note E_, 13 + note D#, 4 + note D#, 4 + note D#, 4 + endchannel + +Branch_1f2d18: + note D#, 13 + note C_, 12 + note E_, 13 + note D#, 6 + note D#, 6 + note D#, 13 + note D#, 12 + note E_, 13 + note D#, 4 + note D#, 4 + note D#, 4 + endchannel + diff --git a/crysaudio/music/TCG2/grchallengecup.asm b/crysaudio/music/TCG2/grchallengecup.asm new file mode 100644 index 00000000..4440ace3 --- /dev/null +++ b/crysaudio/music/TCG2/grchallengecup.asm @@ -0,0 +1,1197 @@ +Music_TCG2GRChallengeCup: + db $C0 + dw Music_TCG2GRChallengeCup_Ch1 + db $01 + dw Music_TCG2GRChallengeCup_Ch2 + db $02 + dw Music_TCG2GRChallengeCup_Ch3 + db $03 + dw Music_TCG2GRChallengeCup_Ch4 + +Music_TCG2GRChallengeCup_Ch2: + notetype1 10 + notetype0 1 + octave 4 + vibrato 24, $33 + note C_, 4 + note C#, 4 + note D_, 4 + note D#, 4 + note E_, 15 + note E_, 15 + note E_, 8 + note E_, 7 + note E_, 5 + note E_, 3 + note F_, 5 + note E_, 2 + note G_, 15 + note G_, 5 + note F_, 15 + note F_, 5 + note D_, 15 + note D_, 5 + note E_, 15 + note E_, 15 + note E_, 8 + note E_, 7 + note E_, 5 + note E_, 3 + note E_, 5 + note E_, 2 + note D_, 15 + note D_, 5 + dec_octave + note B_, 15 + note B_, 5 + inc_octave + note D_, 15 + note D_, 5 + note E_, 15 + note E_, 8 + note E_, 7 + note A_, 5 + note E_, 5 + note E_, 5 + note A_, 5 + note A_, 5 + note E_, 5 + note B_, 15 + note B_, 5 + note G_, 15 + note G_, 5 + note B_, 15 + note B_, 5 + notetype1 2 + notetype0 6 + note A_, 10 + notetype0 1 + note A_, 15 + note A_, 10 + notetype1 10 + note A_, 5 + note A_, 15 + note A_, 15 +.Loop1 + octave 2 + notetype2 8 + note E_, 5 + note E_, 10 + note E_, 5 + note E_, 3 + note E_, 5 + note E_, 2 + note E_, 15 + note E_, 5 + note E_, 3 + note E_, 5 + note E_, 2 + loopchannel 2, .Loop1 +.MainLoop +.Loop2 + octave 2 + notetype2 8 + note F_, 5 + note F_, 10 + note F_, 5 + note F_, 3 + note F_, 5 + note F_, 2 + note F_, 15 + note F_, 5 + note F_, 3 + note F_, 5 + note F_, 2 + loopchannel 2, .Loop2 +.Loop3 + octave 2 + notetype2 8 + note F#, 5 + note F#, 10 + note F#, 5 + note F#, 3 + note F#, 5 + note F#, 2 + note F#, 15 + note F#, 5 + note F#, 3 + note F#, 5 + note F#, 2 + loopchannel 2, .Loop3 + octave 2 + notetype2 8 + note F_, 5 + note F_, 10 + note F_, 5 + note F_, 3 + note F_, 5 + note F_, 2 + note F_, 15 + note F_, 5 + note F_, 3 + note F_, 5 + note F_, 2 + octave 2 + notetype2 8 + note F_, 5 + note F_, 10 + note F_, 5 + note F_, 3 + note F_, 5 + note F_, 2 + vibrato 15, $33 + octave 3 + note E_, 15 + note E_, 8 + note E_, 5 + note E_, 2 + inc_octave + vibrato 30, $33 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 8 + note E_, 7 + dec_octave + note A_, 15 + note B_, 15 + inc_octave + note C_, 15 + vibrato 15, $33 + note D_, 15 + note D_, 15 + note D_, 15 + note C_, 8 + note D_, 7 + note C_, 15 + note C_, 15 + note C_, 15 + dec_octave + note A_, 8 + note B_, 7 + inc_octave + note C_, 15 + note C_, 15 + note C_, 15 + vibrato 0, $33 + note C_, 8 + note C_, 7 + dec_octave + note B_, 15 + note A_, 8 + note B_, 7 + note G_, 8 + note A_, 7 + note B_, 8 + note G_, 7 + vibrato 30, $33 + note A_, 15 + note A_, 15 + note A_, 15 + note A_, 15 + note A_, 15 + note A_, 15 + note E_, 15 + note E_, 8 + note E_, 5 + note E_, 2 + inc_octave + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 8 + note E_, 7 + dec_octave + note A_, 15 + note B_, 15 + inc_octave + note C_, 15 + vibrato 15, $33 + note D_, 15 + note D_, 15 + note D_, 15 + note C_, 8 + note D_, 7 + note C_, 15 + note C_, 15 + note C_, 15 + dec_octave + note A_, 8 + note B_, 7 + vibrato 0, $33 + inc_octave + note C_, 15 + note C_, 8 + note C_, 7 + note E_, 15 + note E_, 8 + note E_, 7 + note D_, 15 + note D_, 5 + note G_, 15 + note G_, 5 + note D_, 15 + note D_, 5 + vibrato 15, $33 + note F_, 15 + note F_, 15 + note F_, 15 + note E_, 8 + note F_, 7 + note E_, 15 + note E_, 15 + note E_, 15 + note F_, 8 + note G_, 7 + note A_, 15 + note A_, 15 + note A_, 15 + note A_, 8 + note A_, 7 + note A_, 15 + note G_, 8 + note A_, 7 + note F_, 8 + note G_, 7 + note A_, 8 + note F_, 7 + note G_, 15 + note G_, 8 + note C_, 5 + note G_, 2 + vibrato 0, $33 + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + note D_, 8 + note E_, 7 + vibrato 15, $33 + note F_, 15 + note F_, 15 + note F_, 15 + note F_, 8 + note F_, 7 + note F_, 15 + note E_, 8 + note F_, 7 + note D_, 8 + note E_, 7 + note F_, 8 + note D_, 7 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + dec_octave + note A_, 8 + note B_, 7 + inc_octave + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 8 + note C_, 7 + note D_, 15 + note C_, 8 + note D_, 7 + dec_octave + note B_, 8 + inc_octave + note C_, 7 + dec_octave + note A_, 8 + note B_, 7 + note G_, 15 + note G_, 15 + inc_octave + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note F_, 15 + note F_, 8 + note E_, 5 + note F_, 2 + note E_, 15 + note E_, 15 + note E_, 8 + note F_, 7 + note E_, 5 + note F_, 3 + note C_, 5 + note E_, 2 + dec_octave + note A_, 15 + note A_, 5 + inc_octave + note C_, 15 + note D_, 5 + note D_, 15 + note D_, 5 + note C_, 15 + note C_, 15 + note C_, 15 + dec_octave + note B_, 4 + inc_octave + note C_, 4 + dec_octave + note B_, 4 + note A_, 3 + note B_, 15 + note B_, 15 + note B_, 15 + inc_octave + note C_, 8 + note D_, 7 + vibrato 30, $33 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + note E_, 15 + loopchannel 0, .MainLoop + + +Music_TCG2GRChallengeCup_Ch1: + notetype1 10 + notetype0 1 + octave 3 + vibrato 24, $33 + note G_, 4 + note G#, 4 + note A_, 4 + note A#, 4 + inc_octave + note C#, 15 + note C#, 15 + note C#, 8 + note C#, 7 + note C#, 5 + note C#, 3 + note C#, 5 + note C#, 2 + note D_, 15 + note D_, 5 + note D_, 15 + note D_, 5 + dec_octave + note A#, 15 + note A#, 5 + inc_octave + note C#, 15 + note C#, 15 + note C#, 8 + note C#, 7 + note C#, 5 + note C#, 3 + note C#, 5 + note C#, 2 + dec_octave + note B_, 15 + note B_, 5 + note G_, 15 + note G_, 5 + note B_, 15 + note B_, 5 + inc_octave + note C_, 15 + note C_, 8 + note C_, 7 + note C_, 5 + note C_, 5 + note C_, 5 + note C_, 5 + note C_, 5 + note C_, 5 + note D_, 15 + note D_, 5 + dec_octave + note B_, 15 + note B_, 5 + inc_octave + note D_, 15 + note D_, 5 + notetype1 2 + notetype0 6 + note C#, 10 + notetype0 1 + note C#, 15 + note C#, 10 + notetype1 9 + note C#, 5 + note C#, 15 + note C#, 15 +.Loop1 + octave 1 + notetype2 8 + note A_, 5 + note A_, 10 + note A_, 5 + note A_, 3 + note A_, 5 + note A_, 2 + inc_octave + note B_, 15 + dec_octave + note A_, 5 + note A_, 3 + note A_, 5 + note A_, 2 + loopchannel 2, .Loop1 +.MainLoop +.Loop2 + octave 1 + notetype2 8 + note A_, 5 + note A_, 10 + note A_, 5 + note A_, 3 + note A_, 5 + note A_, 2 + inc_octave + note B_, 15 + dec_octave + note A_, 5 + note A_, 3 + note A_, 5 + note A_, 2 + loopchannel 5, .Loop2 + octave 1 + notetype2 8 + note A_, 5 + note A_, 10 + note A_, 5 + note A_, 3 + note A_, 5 + note A_, 2 + inc_octave + note B_, 15 + note B_, 8 + dec_octave + notetype1 8 + octave 2 + note A_, 5 + note __, 2 + inc_octave + note A_, 15 + note A_, 15 + callchannel Branch_1f3140 + note __, 15 + note __, 15 + note E_, 15 + callchannel Branch_1f3140 + note G_, 15 + note F#, 15 + note F#, 15 + callchannel Branch_1f3140 + note F#, 8 + note __, 7 + note F#, 15 + note F#, 15 + callchannel Branch_1f3140 + note F#, 5 + note __, 3 + note F#, 5 + note __, 2 + note F_, 15 + note F_, 15 + callchannel Branch_1f3140 + note F_, 8 + note __, 7 + note D_, 15 + note C_, 8 + note __, 7 + callchannel Branch_1f3140 + note D_, 8 + note __, 7 + note E_, 15 + note E_, 15 + callchannel Branch_1f3140 + note __, 15 + note __, 8 + callchannel Branch_1f3150 + note __, 15 + dec_octave + note A_, 15 + note __, 8 + note A_, 7 + inc_octave + note A_, 15 + note A_, 15 + callchannel Branch_1f3140 + note __, 15 + note __, 15 + note E_, 15 + callchannel Branch_1f3140 + note G_, 15 + note F#, 15 + note F#, 15 + callchannel Branch_1f3140 + note F#, 8 + note __, 7 + note F#, 15 + note F#, 15 + callchannel Branch_1f3140 + note F#, 5 + note __, 3 + note F#, 5 + note __, 2 + note F_, 15 + note F_, 8 + note __, 7 + callchannel Branch_1f3140 + note __, 8 + note __, 7 + note B_, 15 + note __, 5 + note B_, 10 + callchannel Branch_1f3140 + note __, 15 + inc_octave + note C_, 15 + note C_, 15 + callchannel Branch_1f3140 + octave 3 + note G_, 8 + note F_, 7 + note G_, 15 + note G_, 15 + callchannel Branch_1f3140 + note A_, 8 + note A#, 7 + inc_octave + note C_, 15 + note C_, 15 + callchannel Branch_1f3140 + octave 4 + note C_, 8 + note __, 7 + dec_octave + note B_, 15 + note B_, 8 + note __, 7 + callchannel Branch_1f3140 + octave 4 + note D_, 8 + note __, 7 + note C_, 15 + note __, 8 + dec_octave + note G_, 5 + note __, 2 + note G_, 15 + note G_, 15 + note G_, 8 + callchannel Branch_1f3150 + note __, 8 + note __, 7 + callchannel Branch_1f3140 + octave 3 + note F_, 8 + note G_, 7 + note A_, 15 + note A_, 15 + callchannel Branch_1f3140 + note A_, 8 + note __, 7 + note G#, 13 + note __, 2 + note G#, 8 + note __, 7 + callchannel Branch_1f3140 + note G#, 8 + note __, 7 + note A_, 15 + note A_, 15 + callchannel Branch_1f3140 + note __, 15 + note __, 8 + callchannel Branch_1f3150 + note __, 15 + callchannel Branch_1f3140 + note E_, 8 + note G_, 7 + note A_, 15 + note A_, 15 + callchannel Branch_1f3140 + note A_, 8 + note __, 7 + note B_, 15 + note A_, 5 + note __, 10 + callchannel Branch_1f3140 + note F_, 8 + note __, 7 + note E_, 15 + note E_, 15 + inc_octave + notetype1 6 + note D_, 15 + note D_, 15 + notetype1 6 + note C#, 15 + note C#, 15 + callchannel Branch_1f3140 + note __, 8 + dec_octave + note G_, 5 + note __, 2 + note A_, 15 + note A_, 15 + callchannel Branch_1f3140 + note A_, 8 + note F_, 7 + note D_, 15 + note __, 5 + note F_, 10 + callchannel Branch_1f3140 + note __, 15 + note G_, 15 + note G_, 15 + callchannel Branch_1f3140 + note G_, 4 + note D_, 4 + note C_, 4 + note D_, 3 + note D_, 15 + note D_, 15 + note __, 15 + note G#, 8 + note B_, 7 + note A_, 15 + note A_, 15 + octave 2 + note B_, 15 + notetype2 8 + note E_, 5 + note E_, 3 + note E_, 5 + note E_, 2 + note E_, 5 + note E_, 10 + note E_, 5 + note E_, 3 + note E_, 5 + note E_, 2 + note B_, 15 + note E_, 5 + note E_, 3 + note E_, 5 + note E_, 2 + loopchannel 0, .MainLoop + +Branch_1f3140: + octave 2 + note E_, 15 + octave 3 + endchannel + +Branch_1f3150: + octave 2 + note G_, 4 + note G_, 3 + notetype1 8 + octave 3 + endchannel + + +Music_TCG2GRChallengeCup_Ch3: + notetype1 10 + notetype0 1 + notetype2 11 + notetype1 1 + octave 5 + note __, 16 + octave 2 + note A_, 15 + note A_, 15 + note A_, 8 + note __, 7 + note A_, 5 + note __, 3 + note A_, 5 + note __, 2 + note A#, 15 + note __, 5 + note A#, 15 + note __, 5 + note A#, 15 + note __, 5 + note A_, 15 + note A_, 15 + note A_, 8 + note __, 7 + note A_, 5 + note __, 3 + note A_, 5 + note __, 2 + note G_, 15 + note __, 5 + note G_, 15 + note __, 5 + note G_, 15 + note __, 5 + note F_, 15 + note F_, 15 + note F_, 8 + note __, 7 + note F_, 5 + note __, 3 + note F_, 5 + note __, 2 + note G_, 15 + note __, 5 + note G_, 15 + note __, 5 + note G_, 15 + note __, 5 + note A_, 16 + note A_, 16 + note A_, 16 + note A_, 16 + note A_, 16 + note A_, 10 + note __, 16 + note __, 14 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + octave 2 + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + octave 2 + note A_, 8 + note A_, 7 +.MainLoop + octave 2 +.Loop1 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + octave 2 + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + octave 2 + note A_, 8 + note A_, 7 + loopchannel 3, .Loop1 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 8 + octave 4 + note C_, 4 + note __, 3 + octave 2 + note F#, 15 + note G_, 15 + note G#, 15 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note B_, 15 + note B_, 8 + note B_, 7 + callchannel Branch_1f333b + note B_, 8 + note B_, 7 + inc_octave + note C_, 15 + note C_, 8 + note C_, 7 + callchannel Branch_1f333b + octave 3 + note C_, 8 + dec_octave + note G_, 7 + note C_, 8 + inc_octave + inc_octave + note E_, 4 + note __, 3 + dec_octave + dec_octave + note C_, 8 + note C_, 7 + note D_, 15 + note E_, 15 + note F_, 15 + note F_, 8 + note F_, 7 + callchannel Branch_1f333b + note F_, 8 + note F_, 7 + note F_, 15 + note F_, 8 + note F_, 7 + callchannel Branch_1f333b + note F_, 8 + note F_, 7 + note E_, 15 + note E_, 8 + note E_, 7 + callchannel Branch_1f333b + note E_, 8 + note E_, 7 + note E_, 8 + inc_octave + inc_octave + note C_, 4 + note __, 3 + dec_octave + dec_octave + note E_, 8 + note E_, 7 + callchannel Branch_1f333b + note E_, 8 + note E_, 7 + note D_, 15 + note D_, 8 + note D_, 7 + callchannel Branch_1f333b + note D_, 8 + note D_, 7 + note E_, 15 + note E_, 8 + note E_, 7 + callchannel Branch_1f333b + note E_, 8 + note E_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note G_, 8 + inc_octave + inc_octave + note C_, 4 + note __, 3 + dec_octave + dec_octave + note G_, 8 + note G_, 7 + callchannel Branch_1f333b + note G_, 8 + note G_, 7 + note F_, 15 + note F_, 8 + note F_, 7 + callchannel Branch_1f333b + note F_, 8 + note F_, 7 + note F_, 15 + note F_, 8 + note F_, 7 + callchannel Branch_1f333b + note F_, 8 + note F_, 7 + note E_, 15 + note E_, 8 + note E_, 7 + callchannel Branch_1f333b + note E_, 8 + note E_, 7 + note D#, 8 + inc_octave + inc_octave + note C#, 4 + note __, 3 + dec_octave + dec_octave + note D#, 8 + note D#, 7 + callchannel Branch_1f333b + note D#, 8 + note D#, 7 + note D_, 15 + note D_, 8 + note D_, 7 + callchannel Branch_1f333b + note D_, 8 + note D_, 7 + note D_, 15 + note D_, 8 + note D_, 7 + callchannel Branch_1f333b + note D_, 8 + note D_, 7 + note G_, 15 + note G_, 8 + note G_, 7 + callchannel Branch_1f333b + inc_octave + note D_, 8 + note D_, 7 + note G_, 15 + dec_octave + note G_, 15 + note G#, 15 + inc_octave + note G#, 15 + dec_octave + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + note A_, 15 + note A_, 8 + note A_, 7 + callchannel Branch_1f333b + note A_, 8 + note A_, 7 + loopchannel 0, .MainLoop + +Branch_1f333b: + octave 3 + notetype1 2 + note A_, 15 + notetype1 1 + octave 2 + endchannel + + +Music_TCG2GRChallengeCup_Ch4: + togglenoise $06 + notetype 1 + octave 1 + note __, 16 +.Loop1 + note C#, 16 + note __, 16 + note __, 13 + note C#, 5 + note C#, 5 + note C#, 5 + note C#, 16 + note __, 4 + note C#, 16 + note __, 4 + note C#, 16 + note __, 4 + loopchannel 3, .Loop1 + notetype 5 + note F_, 16 + notetype 1 + note __, 10 + note C#, 8 + note C_, 15 + note C#, 7 + callchannel Branch_1f33e9 +.MainLoop + callchannel Branch_1f33fd + callchannel Branch_1f33e9 + note C_, 8 + note C#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note C#, 4 + note C#, 3 + note C#, 8 + note C#, 7 + note D#, 8 + note C#, 4 + note C#, 3 + note C#, 8 + note C#, 7 + note C#, 8 + note E_, 7 + callchannel Branch_1f33e9 + callchannel Branch_1f33fd + callchannel Branch_1f33e9 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C_, 8 + note C#, 7 + note D#, 8 + note D#, 7 + note C#, 8 + note C_, 7 + note E_, 8 + note C#, 7 + callchannel Branch_1f33e9 + callchannel Branch_1f33fd + callchannel Branch_1f33e9 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C_, 8 + note C#, 7 + note D#, 8 + note C#, 4 + note C#, 3 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 +.Loop2 + callchannel Branch_1f33e9 + callchannel Branch_1f33fd + loopchannel 3, .Loop2 + callchannel Branch_1f33e9 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note C#, 4 + note C#, 3 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 8 + note C#, 7 + callchannel Branch_1f33e9 + loopchannel 0, .MainLoop + +Branch_1f33e9: + octave 1 + notetype 1 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C_, 8 + note D#, 7 + note D#, 8 + note C_, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note E_, 7 + endchannel + +Branch_1f33fd: + octave 1 + notetype 1 + note C_, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C#, 8 + note D#, 7 + note D#, 8 + note D#, 7 + note C_, 8 + note C#, 7 + note D#, 8 + note D#, 7 + note C#, 8 + note D#, 7 + note E_, 8 + note C#, 7 + endchannel + diff --git a/crysaudio/music/TCG2/grdueltheme1.asm b/crysaudio/music/TCG2/grdueltheme1.asm new file mode 100644 index 00000000..9eee7f4b --- /dev/null +++ b/crysaudio/music/TCG2/grdueltheme1.asm @@ -0,0 +1,2444 @@ +Music_TCG2GRDuelTheme1: + db $C0 + dw Music_TCG2GRDuelTheme1_Ch1 + db $01 + dw Music_TCG2GRDuelTheme1_Ch2 + db $02 + dw Music_TCG2GRDuelTheme1_Ch3 + db $03 + dw Music_TCG2GRDuelTheme1_Ch4 + +Music_TCG2GRDuelTheme1_Ch2: + notetype1 10 + notetype0 1 + octave 3 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note G_, 7 + note G_, 7 + note G_, 8 + note G_, 7 + note G_, 7 + note G_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 +.MainLoop +.Loop1 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note G_, 7 + note G_, 7 + note G_, 8 + note G_, 7 + note G_, 7 + note G_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + loopchannel 2, .Loop1 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note G_, 7 + note G_, 7 + note G_, 8 + note G_, 7 + note G_, 7 + note G_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 7 + callchannel Branch_1f5ae8 + octave 3 + note G_, 7 + note G_, 7 + note G_, 8 + note G_, 7 + note G_, 7 + note G_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note G_, 7 + note G_, 7 + note G_, 8 + note G_, 7 + note G_, 7 + note G_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 7 + callchannel Branch_1f5ae8 + octave 3 + note G_, 7 + note G_, 7 + note G_, 8 + note G_, 7 + note G_, 7 + note G_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note G_, 7 + note G_, 7 + note G_, 8 + note G_, 7 + note G_, 7 + note G_, 7 + note F_, 8 + octave 2 + note A_, 7 + note A#, 7 + inc_octave + note C#, 4 + note __, 3 + note F_, 8 + note F#, 7 + note A_, 7 + note A#, 3 + note __, 4 + inc_octave + note C_, 15 + note C_, 7 + dec_octave + note A#, 7 + note A#, 8 + note A_, 5 + note A_, 9 + note F_, 4 + note F_, 3 + note C#, 15 + note C#, 14 + note G_, 15 + note G_, 7 + note F#, 4 + note F_, 3 + note E_, 9 + note F_, 5 + note F_, 5 + note G_, 5 + note G_, 5 + note E_, 9 + note C_, 5 + note C_, 5 + dec_octave + note G_, 5 + note G_, 5 + note A_, 15 + note A_, 14 + inc_octave + note D_, 15 + note D_, 7 + note D_, 7 + note G_, 3 + note A_, 12 + note A_, 7 + note G_, 7 + note G_, 8 + note D_, 7 + note D_, 7 + dec_octave + note A#, 7 + inc_octave + note F_, 15 + note F_, 14 + note G_, 15 + note G_, 7 + note F#, 4 + note F_, 3 + note E_, 15 + note E_, 14 + note E_, 8 + note F_, 7 + note E_, 7 + note E_, 7 + note D_, 15 + note D_, 7 + note D_, 7 + note C#, 3 + note D_, 12 + note F_, 7 + note F_, 7 + inc_octave + note C_, 15 + note C_, 7 + dec_octave + note A#, 7 + note A#, 8 + note A_, 5 + note A_, 9 + note F_, 3 + note F_, 4 + note C#, 15 + note C#, 14 + note G_, 15 + note G_, 8 + note F#, 3 + note F_, 3 + note E_, 9 + note F_, 5 + note F_, 5 + note G_, 5 + note G_, 5 + note E_, 9 + note C_, 5 + note C_, 5 + dec_octave + note G_, 5 + note G_, 5 + note A_, 15 + note A_, 14 + inc_octave + note D_, 15 + note D_, 7 + note D_, 7 + note A_, 15 + note A_, 14 + note A_, 8 + note G_, 7 + note G_, 14 + note B_, 3 + inc_octave + note C_, 12 + note C_, 7 + dec_octave + note A_, 15 + note A#, 7 + note A_, 3 + note A_, 4 + note G_, 3 + note G_, 4 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 7 + note A_, 7 +.Loop2 + octave 2 + note A_, 5 + note A#, 5 + inc_octave + note C#, 5 + note E_, 5 + note F_, 5 + note G_, 4 + inc_octave + note D#, 3 + note E_, 12 + note E_, 7 + note C_, 7 + note C_, 8 + dec_octave + note A_, 5 + note A_, 9 + note F_, 4 + note F_, 3 + note G_, 15 + note G_, 4 + note G_, 7 + note B_, 3 + inc_octave + note C_, 15 + dec_octave + note A#, 7 + note A#, 7 + note A_, 15 + note A_, 7 + note F_, 7 + note F_, 15 + note G_, 7 + note G_, 7 + note G#, 3 + note A_, 12 + note A_, 7 + note G_, 7 + note G_, 15 + note G_, 7 + note G_, 7 + inc_octave + note D#, 3 + note E_, 12 + note E_, 7 + note C_, 7 + note C_, 8 + dec_octave + note A_, 5 + note A_, 9 + note F_, 4 + note F_, 3 + note G_, 15 + note G_, 4 + note G_, 7 + note B_, 3 + inc_octave + note C_, 15 + dec_octave + note A#, 7 + note A#, 7 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + loopchannel 2, .Loop2 + octave 2 + note A_, 5 + note A#, 5 + inc_octave + note C#, 5 + note E_, 5 + note F_, 5 + note G_, 4 + note G#, 3 + note A_, 12 + note A_, 7 + note G_, 15 + note G_, 7 + note D_, 5 + note D_, 9 + note C#, 15 + note C#, 14 + note G_, 15 + note G_, 8 + note F#, 3 + note F_, 3 + note E_, 9 + note F_, 5 + note F_, 5 + note G_, 5 + note G_, 5 + note E_, 9 + note C_, 5 + note C_, 5 + dec_octave + note G_, 5 + note G_, 5 + note A_, 15 + note A_, 14 + octave 2 + note G_, 5 + note A_, 5 + note A#, 5 + inc_octave + note C_, 5 + note D_, 5 + note E_, 4 + note A_, 15 + note A_, 7 + note G_, 7 + note G_, 8 + note D_, 5 + note D_, 9 + dec_octave + note A#, 7 + inc_octave + note E_, 3 + note F_, 12 + note F_, 7 + note F_, 7 + note G_, 15 + note G_, 8 + note F#, 3 + note F_, 3 + note E_, 15 + note E_, 14 + note E_, 15 + note E_, 14 + note E_, 15 + note E_, 14 + note E_, 15 + note E_, 14 + note E_, 15 + octave 3 + octave 3 + note G_, 7 + note G_, 7 + note G_, 8 + note G_, 7 + note G_, 7 + note G_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + loopchannel 0, .MainLoop + +Branch_1f5ae8: + octave 2 + note A#, 3 + note B_, 4 + vibrato 19, $33 + inc_octave + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 8 + note E_, 7 + note G_, 7 + note G_, 7 + note A#, 3 + note B_, 12 + note B_, 14 + note B_, 15 + note A_, 7 + note A_, 7 + inc_octave + note D_, 15 + note C_, 14 + dec_octave + note B_, 5 + note B_, 5 + note G_, 9 + note A_, 10 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 8 + note B_, 3 + inc_octave + note C_, 4 + note C_, 14 + dec_octave + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 8 + octave 3 + note F_, 7 + note F_, 14 + octave 3 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 14 + note C_, 8 + note E_, 7 + note G_, 7 + note G_, 7 + note A#, 3 + note B_, 12 + note B_, 14 + note B_, 15 + note A_, 7 + note A_, 7 + inc_octave + note D_, 15 + note C_, 14 + dec_octave + note B_, 5 + note B_, 5 + note G_, 9 + note A_, 10 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 15 + note A#, 14 + note A#, 8 + inc_octave + note C_, 14 + note C_, 7 + note C#, 3 + note D_, 12 + note D_, 14 + note D_, 15 + note C_, 7 + dec_octave + note A#, 7 + note A_, 15 + note A_, 7 + note B_, 4 + inc_octave + note C_, 15 + note C_, 3 + dec_octave + note A#, 7 + note A#, 7 + note A_, 15 + note A_, 14 + note A_, 15 + note A#, 7 + note A#, 7 + note A_, 15 + note A_, 7 + note F_, 15 + note F_, 7 + note G_, 7 + note G_, 7 + note G#, 3 + note A_, 12 + note A_, 14 + note A_, 15 + note A_, 7 + note A_, 7 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note G_, 14 + note G_, 15 + note F_, 7 + note F_, 7 + note B_, 2 + inc_octave + note C_, 13 + dec_octave + note G_, 14 + note G_, 8 + note F_, 7 + note F_, 7 + note C_, 4 + note C_, 3 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 14 + note F_, 15 + note F_, 8 + note E_, 3 + note D#, 3 + note D_, 15 + note D#, 7 + note D#, 7 + note G_, 8 + note G_, 7 + note A#, 5 + note A#, 9 + inc_octave + note D_, 15 + note D_, 7 + note C_, 7 + note C_, 15 + note E_, 3 + note F_, 7 + note F_, 4 + note D_, 15 + note D_, 14 + note D_, 15 + note D#, 7 + note D#, 7 + note D_, 15 + note C_, 7 + note C_, 7 + dec_octave + note F#, 15 + inc_octave + note C_, 7 + note C_, 7 + dec_octave + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + endchannel + + +Music_TCG2GRDuelTheme1_Ch1: + notetype1 10 + notetype0 1 + octave 3 + note __, 15 + octave 3 + note C_, 7 + note C_, 7 + note C_, 8 + note C_, 7 + note C_, 7 + note C_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 +.MainLoop +.Loop1 + note __, 15 + octave 3 + note C_, 7 + note C_, 7 + note C_, 8 + note C_, 7 + note C_, 7 + note C_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 + loopchannel 3, .Loop1 + octave 3 +.Loop2 + note __, 15 + note E_, 7 + note E_, 15 + note E_, 7 + note E_, 14 + note E_, 8 + note E_, 14 + note E_, 7 + note E_, 15 + note E_, 7 + note E_, 7 + loopchannel 2, .Loop2 + note __, 15 + note F_, 7 + note F_, 15 + note F_, 7 + note F_, 14 + note F_, 8 + note F_, 14 + note F_, 7 + note F_, 15 + note F_, 7 + note F_, 7 + note __, 15 + note F_, 7 + note F_, 15 + note F_, 7 + note F_, 14 + note F_, 8 + note F_, 14 + note F_, 7 + note F_, 8 + note C#, 7 + note C#, 14 +.Loop3 + note __, 15 + note E_, 7 + note E_, 15 + note E_, 7 + note E_, 14 + note E_, 8 + note E_, 14 + note E_, 7 + note E_, 15 + note E_, 7 + note E_, 7 + loopchannel 2, .Loop3 + note __, 15 + note D#, 7 + note D#, 15 + note D#, 7 + note D#, 14 + note D#, 8 + note D#, 14 + note D#, 7 + note D#, 15 + note D#, 7 + note D#, 7 + note __, 15 + note G_, 7 + note G_, 15 + note G_, 7 + note G_, 14 + note G_, 8 + note G_, 14 + note G_, 7 + note G_, 15 + note G_, 7 + note G_, 7 + note __, 15 + note D_, 7 + note D_, 15 + note D_, 7 + note D_, 14 + note D_, 8 + note D_, 14 + note D_, 7 + note D_, 15 + note D_, 7 + note D_, 7 + note __, 15 + note C#, 7 + note C#, 15 + note C#, 7 + note C#, 14 + note C#, 8 + note C#, 14 + note C#, 7 + note C#, 15 + note C#, 7 + note C#, 7 + note __, 15 + note C_, 7 + note C_, 15 + note C_, 7 + note C_, 14 + note C_, 8 + note C_, 14 + note C_, 7 + note C_, 15 + note C_, 7 + note C_, 7 + dec_octave + note __, 15 + note B_, 7 + note B_, 15 + note B_, 7 + note B_, 14 + note B_, 8 + note B_, 14 + note B_, 7 + note B_, 15 + note B_, 7 + note B_, 7 +.Loop4 + note __, 15 + note A#, 7 + note A#, 15 + note A#, 7 + note A#, 14 + note A#, 8 + note A#, 14 + note A#, 7 + note A#, 15 + note A#, 7 + note A#, 7 + loopchannel 2, .Loop4 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note F_, 8 + note F_, 7 + note F_, 7 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 + note __, 15 + octave 3 + note C_, 7 + note C_, 7 + note C_, 8 + note C_, 7 + note C_, 7 + note C_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 7 + octave 2 + note G_, 3 + note G#, 4 + vibrato 19, $33 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 8 + inc_octave + note C_, 7 + note E_, 7 + note E_, 7 + note F#, 3 + note G_, 12 + note G_, 14 + note G_, 15 + note E_, 7 + note E_, 7 + note B_, 15 + note A_, 14 + note G_, 10 + note E_, 5 + note E_, 5 + note C_, 5 + note C_, 4 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 7 + note F_, 15 + note G_, 7 + note G_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 14 + note F_, 8 + octave 3 + note C#, 7 + note C#, 14 + octave 2 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 15 + note A_, 14 + note A_, 8 + inc_octave + note C_, 7 + note E_, 7 + note E_, 7 + note F#, 3 + note G_, 12 + note G_, 14 + note G_, 15 + note E_, 7 + note E_, 7 + note B_, 15 + note A_, 14 + note G_, 10 + note E_, 5 + note E_, 5 + note C_, 5 + note C_, 4 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 14 + note D#, 15 + note D#, 14 + note D#, 8 + note G_, 14 + note G_, 7 + note A#, 15 + note A#, 14 + note A#, 15 + note A_, 7 + note G_, 7 + note F_, 15 + note F_, 7 + note A_, 15 + note A_, 7 + note G_, 7 + note G_, 7 + note F_, 15 + note F_, 14 + note F_, 15 + note F_, 7 + note F_, 7 + note F_, 15 + note F_, 7 + note D_, 15 + note D_, 7 + note D_, 7 + note D_, 7 + note C#, 15 + note C#, 14 + note C#, 15 + note C#, 7 + note C#, 7 + note C#, 15 + note C#, 14 + note C#, 15 + note C#, 7 + note C#, 7 + note C_, 15 + note C_, 14 + note C_, 15 + note C_, 7 + note C_, 7 + note A_, 15 + note D_, 14 + note D_, 8 + note C_, 7 + note C_, 7 + dec_octave + note G_, 4 + note G_, 3 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 14 + note B_, 15 + note B_, 7 + note B_, 7 + note B_, 15 + note B_, 14 + note A#, 15 + note A#, 7 + note A#, 7 + inc_octave + note D#, 8 + note D#, 7 + note G_, 5 + note G_, 9 + note A#, 15 + note A#, 7 + note A_, 7 + note A_, 15 + inc_octave + note D_, 10 + note D_, 4 + dec_octave + note F#, 15 + note F#, 14 + note F#, 15 + note F#, 7 + note F#, 7 + note F#, 15 + note F#, 7 + note F#, 7 + note C_, 15 + note F#, 7 + note F#, 7 + note E_, 15 + octave 3 + octave 3 + note E_, 7 + note E_, 15 + note E_, 7 + note E_, 14 + note F_, 8 + note F_, 14 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 + note __, 15 + octave 3 + note C_, 7 + note C_, 7 + note C_, 8 + note C_, 7 + note C_, 7 + note C_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note C#, 8 + note __, 7 + octave 2 + note A_, 7 + note A#, 7 + inc_octave + note C#, 4 + note __, 4 + note F_, 7 + note F#, 7 + note A_, 7 + note A#, 4 + note __, 4 + note __, 7 + note D_, 7 + note D_, 7 + note D_, 8 + note D_, 7 + note D_, 7 + note D_, 7 + note __, 15 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note __, 15 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note __, 15 + note C_, 7 + note C_, 7 + note C_, 8 + note C_, 7 + note C_, 7 + note C_, 7 + dec_octave + note __, 15 + note A_, 7 + note A_, 7 + note A_, 8 + note A_, 7 + note A_, 7 + note A_, 7 + note __, 15 + note A#, 7 + note A#, 7 + note A#, 8 + note A#, 7 + note A#, 7 + note A#, 7 + inc_octave + note __, 15 + note C_, 7 + note C_, 7 + note C_, 8 + note C_, 7 + note C_, 7 + note C_, 7 + note __, 15 + dec_octave + note A#, 7 + note A#, 7 + note A#, 8 + note A#, 7 + note A#, 7 + note A#, 7 + inc_octave + note __, 15 + note D_, 7 + note D_, 7 + note D_, 8 + note D_, 7 + note D_, 7 + note D_, 7 + note __, 15 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note __, 15 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note __, 15 + note C_, 7 + note C_, 7 + note C_, 8 + note C_, 7 + note C_, 7 + note C_, 7 +.Loop5 + note __, 15 + note C#, 7 + note C#, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + loopchannel 2, .Loop5 + note __, 15 + note D_, 7 + note D_, 7 + note D_, 8 + note D_, 7 + note D_, 7 + note D_, 7 + note __, 15 + note C#, 7 + note C#, 7 + octave 2 + note F_, 5 + note G_, 5 + note A_, 5 + note A#, 5 + inc_octave + note C#, 5 + note E_, 4 + inc_octave + note C_, 15 + note C_, 7 + dec_octave + note A_, 7 + note A_, 8 + note F_, 5 + note F_, 9 + note C_, 4 + note C_, 3 + note C#, 15 + note C#, 7 + note G_, 15 + note G_, 7 + note G_, 7 + note G_, 7 + note E_, 15 + note E_, 7 + note C_, 15 + note C_, 7 + note C_, 7 + note C_, 7 + note C#, 15 + note C#, 7 + note C#, 7 + note C#, 15 + note C#, 7 + note C#, 7 + inc_octave + note C_, 15 + note C_, 7 + dec_octave + note A_, 7 + note A_, 8 + note F_, 5 + note F_, 9 + note C_, 4 + note C_, 3 + dec_octave + note A#, 15 + note A#, 7 + inc_octave + note G_, 15 + note G_, 7 + note G_, 7 + note G_, 7 + note E_, 15 + note E_, 14 + note E_, 15 + note E_, 7 + note E_, 7 + note F_, 15 + note F_, 14 + note A_, 15 + note A_, 14 + inc_octave + note C_, 15 + note C_, 7 + dec_octave + note A_, 7 + note A_, 8 + note F_, 5 + note F_, 9 + note C_, 4 + note C_, 3 + note C#, 15 + note C#, 7 + note G_, 15 + note G_, 7 + note G_, 7 + note G_, 7 + note E_, 15 + note E_, 7 + note C_, 15 + note C_, 7 + note C_, 7 + note C_, 7 + note C#, 15 + note C#, 7 + note C#, 7 + note C#, 15 + note C#, 7 + note C#, 7 + inc_octave + note C_, 15 + note C_, 7 + dec_octave + note A_, 7 + note A_, 8 + note F_, 5 + note F_, 9 + note C_, 4 + note C_, 3 + dec_octave + note A#, 15 + note A#, 7 + inc_octave + note G_, 15 + note G_, 7 + note G_, 7 + note G_, 7 + note D_, 15 + note D_, 14 + note D_, 15 + note D_, 7 + note D_, 7 + note C#, 15 + note C#, 14 + octave 2 + note F_, 5 + note G_, 5 + note A_, 5 + note A#, 5 + inc_octave + note C#, 5 + note E_, 4 + octave 3 + note __, 15 + note F_, 7 + note F_, 15 + note F_, 7 + note F_, 14 + note F_, 8 + note F_, 14 + note F_, 7 + note F_, 15 + note F_, 7 + note F_, 7 + note __, 15 + note C_, 7 + note C_, 15 + note C_, 7 + note C_, 14 + note F_, 8 + note F_, 14 + note F_, 7 + octave 3 + note D_, 15 + note D_, 7 + note D_, 7 + note F_, 15 + note F_, 7 + note E_, 7 + note E_, 8 + dec_octave + note A#, 5 + note A#, 9 + note G_, 7 + octave 3 + notetype1 7 +.Loop6 + note C#, 15 + note C#, 7 + note C#, 7 + loopchannel 2, .Loop6 + octave 3 + note __, 15 + octave 3 + note E_, 7 + note E_, 15 + note E_, 7 + note E_, 14 + note F_, 8 + note F_, 14 + note F_, 7 + note F_, 15 + note __, 14 + note __, 15 + octave 3 + note E_, 7 + note E_, 7 + note E_, 8 + note E_, 7 + note E_, 7 + note E_, 7 + note C#, 8 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 15 + note __, 14 + loopchannel 0, .MainLoop + + +Music_TCG2GRDuelTheme1_Ch3: + notetype1 10 + notetype0 1 + notetype2 11 + notetype1 1 + octave 3 +.Loop1 + callchannel Branch_1f6313 + loopchannel 2, .Loop1 +.MainLoop + octave 3 +.Loop2 + callchannel Branch_1f6313 + loopchannel 6, .Loop2 + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + notetype0 11 + note D#, 2 + note A#, 2 + inc_octave + notetype0 1 + note D#, 14 + dec_octave + notetype0 11 + note D#, 2 + note A#, 2 + inc_octave + notetype0 1 + note D#, 14 + dec_octave + notetype0 11 + note D#, 2 + note A#, 2 + inc_octave + notetype0 1 + note D#, 14 + dec_octave + notetype0 11 + note D#, 2 + note C_, 2 + notetype0 1 + note C#, 14 + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + notetype0 11 + note C_, 2 + note G_, 2 + inc_octave + notetype0 1 + note C_, 14 + dec_octave + notetype0 11 + note C_, 2 + note G_, 2 + notetype0 1 + note F#, 14 + notetype0 11 + note F_, 2 + inc_octave + note C_, 2 + notetype0 1 + note F_, 14 + dec_octave + notetype0 11 + note F_, 2 + inc_octave + note C_, 2 + dec_octave + dec_octave + notetype0 1 + note A_, 14 + notetype0 11 + note A#, 2 + inc_octave + note F_, 2 + notetype0 1 + note A#, 14 + dec_octave + notetype0 11 + note A#, 2 + inc_octave + note F_, 2 + notetype0 1 + note E_, 14 + notetype0 11 + note D#, 2 + note A#, 2 + inc_octave + notetype0 1 + note D#, 14 + dec_octave + notetype0 11 + note D#, 2 + note A#, 2 + notetype0 1 + note D#, 14 + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note G_, 2 + inc_octave + note D_, 2 + notetype0 1 + note G_, 14 + dec_octave + notetype0 11 + note G_, 2 + inc_octave + note D_, 2 + notetype0 1 + note C#, 14 + notetype0 11 + note C_, 2 + note G_, 2 + inc_octave + notetype0 1 + note C_, 14 + dec_octave + notetype0 11 + note C_, 2 + note G_, 2 + notetype0 1 + note A#, 14 + notetype0 11 + note G#, 2 + inc_octave + note D#, 2 + dec_octave + notetype0 1 + note D#, 14 + notetype0 11 + note G#, 2 + inc_octave + note D#, 2 + dec_octave + notetype0 1 + note G#, 14 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + notetype0 11 + note D#, 2 + note A#, 2 + inc_octave + notetype0 1 + note D#, 14 + dec_octave + notetype0 11 + note D#, 2 + note A#, 2 + inc_octave + notetype0 1 + note D#, 14 + dec_octave + notetype0 11 + note D#, 2 + note A#, 2 + inc_octave + notetype0 1 + note D#, 14 + dec_octave + notetype0 11 + note D#, 2 + note C_, 2 + notetype0 1 + note C#, 14 + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + notetype0 11 + note C_, 2 + note G_, 2 + inc_octave + notetype0 1 + note C_, 14 + dec_octave + notetype0 11 + note C_, 2 + note G_, 2 + notetype0 1 + note F#, 14 + notetype0 11 + note F_, 2 + inc_octave + note C_, 2 + notetype0 1 + note F_, 14 + dec_octave + notetype0 11 + note F_, 2 + inc_octave + note C_, 2 + dec_octave + dec_octave + notetype0 1 + note A_, 14 + notetype0 11 + note A#, 2 + inc_octave + note F_, 2 + notetype0 1 + note A#, 14 + dec_octave + notetype0 11 + note A#, 2 + inc_octave + note F_, 2 + notetype0 1 + note E_, 14 + notetype0 11 + note D#, 2 + note A#, 2 + inc_octave + notetype0 1 + note D#, 14 + dec_octave + notetype0 11 + note D#, 2 + note A#, 2 + notetype0 1 + note D#, 14 + notetype0 11 + note D_, 2 + note A_, 2 + inc_octave + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + dec_octave + notetype0 11 + note G_, 2 + inc_octave + note D_, 2 + notetype0 1 + note G_, 14 + dec_octave + notetype0 11 + note G_, 2 + inc_octave + note D_, 2 + notetype0 1 + note C#, 14 + notetype0 11 + note C_, 2 + note G_, 2 + inc_octave + notetype0 1 + note C_, 14 + dec_octave + notetype0 11 + note C_, 2 + note G_, 2 + notetype0 1 + note A#, 14 + notetype0 11 + note G#, 2 + inc_octave + note D#, 2 + dec_octave + notetype0 1 + note D#, 14 + notetype0 11 + note G#, 2 + inc_octave + note D#, 2 + dec_octave + notetype0 1 + note G#, 14 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + note D#, 16 + note D#, 13 + note __, 16 + note __, 13 + notetype0 1 + note G_, 15 + note A_, 14 + note A#, 15 + note B_, 14 + inc_octave + note C_, 15 + dec_octave + note D_, 14 + note D#, 15 + note E_, 14 + note F_, 15 + inc_octave + note C_, 14 + note F_, 15 + dec_octave + note B_, 14 + note A#, 15 + note F_, 14 + note A#, 15 + note A_, 14 + note G_, 15 + inc_octave + note D_, 14 + note F_, 15 + note G_, 14 + note F#, 15 + note C#, 14 + dec_octave + note F#, 15 + note C#, 14 + note F_, 15 + inc_octave + note C_, 14 + note F_, 15 + dec_octave + note B_, 14 + note A#, 15 + note F_, 14 + note A#, 15 + note A_, 14 + note G_, 15 + note A_, 14 + note A#, 15 + note B_, 14 + inc_octave + note C_, 15 + dec_octave + note D_, 14 + note D#, 15 + note E_, 14 + note F_, 15 + inc_octave + note C_, 14 + note F_, 15 + dec_octave + note B_, 14 + note A#, 15 + note F_, 14 + note A#, 15 + note F_, 14 + note D#, 15 + note A#, 14 + inc_octave + note C#, 15 + dec_octave + note A#, 14 + inc_octave + note F_, 15 + note C#, 14 + dec_octave + note A#, 15 + note D#, 14 + note E_, 15 + note F#, 14 + note G_, 15 + note G#, 14 + note A_, 15 + note B_, 14 + inc_octave + note C_, 15 + note C#, 14 + dec_octave + callchannel Branch_1f6313 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + notetype0 11 + note C_, 2 + note G_, 2 + notetype0 1 + note C_, 14 + notetype0 11 + note A#, 2 + note F_, 2 + notetype0 1 + note A#, 14 + notetype0 11 + note A_, 2 + note E_, 2 + notetype0 1 + note A_, 14 + notetype0 11 + note G_, 2 + note D_, 2 + notetype0 1 + note G_, 14 + notetype0 11 + note C_, 2 + note G_, 2 + notetype0 1 + note C_, 14 + notetype0 11 + note F_, 2 + note C_, 2 + dec_octave + notetype0 1 + note B_, 14 + notetype0 11 + note A#, 2 + inc_octave + note F_, 2 + notetype0 1 + note A#, 14 + notetype0 11 + note G_, 2 + note D_, 2 + notetype0 1 + note G_, 14 + notetype0 1 + note D#, 16 + note D#, 13 + note D#, 16 + note D#, 13 + callchannel Branch_1f6313 + callchannel Branch_1f6313 + loopchannel 0, .MainLoop + +Branch_1f6313: + octave 3 + notetype0 11 + note D_, 2 + note A_, 2 + notetype0 1 + note D_, 14 + notetype0 11 + note D#, 2 + note A#, 2 + notetype0 1 + note D#, 14 + endchannel + + +Music_TCG2GRDuelTheme1_Ch4: + togglenoise $06 + notetype 1 + octave 1 + callchannel Branch_1f6503 + callchannel Branch_1f6503 + callchannel Branch_1f6503 +.MainLoop + note D#, 8 + note D#, 7 + note E_, 7 + note D#, 7 + note D#, 8 + note E_, 7 + note D#, 7 + note D#, 7 + note E_, 8 + note D#, 7 + note D#, 7 + note E_, 7 + note D#, 8 + note C#, 7 + note C#, 14 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 7 + note C#, 7 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note E_, 7 + note D#, 8 + note C#, 7 + note C#, 14 +.Loop1 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 14 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + loopchannel 6, .Loop1 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 14 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note C#, 7 + note C#, 7 + note E_, 7 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 7 + note C#, 7 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note E_, 7 + note D#, 8 + note C#, 7 + note C#, 14 +.Loop2 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 14 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + loopchannel 6, .Loop2 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 14 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note C#, 7 + note C#, 7 + note E_, 7 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 7 + note C#, 7 + note C_, 15 + note D#, 14 + note C#, 8 + note D#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note D#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note D#, 7 + note C#, 7 + note C#, 8 + note C#, 7 + note C_, 7 + note E_, 7 + note C#, 15 + note __, 14 + note __, 15 + note __, 14 + note C_, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 14 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 7 + note C#, 7 + note C_, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 14 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 7 + note C#, 7 + note C_, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 14 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 7 + note C#, 7 + note C_, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note D#, 14 + note F#, 15 + note D#, 7 + note F#, 7 + note D#, 8 + note F#, 7 + note E_, 14 + note C_, 15 + note F#, 14 + note D#, 8 + note F#, 7 + note D#, 14 + note D#, 8 + note F#, 7 + note D#, 7 + note F#, 7 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 5 + note C#, 5 + note C#, 5 +.Loop3 + note C_, 15 + note C#, 14 + note D#, 8 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 15 + note C_, 7 + note C#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + loopchannel 3, .Loop3 + note C_, 15 + note C#, 14 + note D#, 8 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 15 + note C_, 7 + note C#, 7 + note D#, 8 + note C#, 7 + note E_, 7 + note C#, 7 +.Loop4 + note C_, 15 + note C#, 14 + note D#, 8 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 15 + note C_, 7 + note C#, 7 + note D#, 8 + note C#, 7 + note E_, 14 + loopchannel 3, .Loop4 + note C_, 15 + note C#, 14 + note D#, 8 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 15 + note C_, 7 + note C#, 7 + note D#, 8 + note C#, 7 + note C#, 4 + note C#, 5 + note C#, 5 + note C_, 15 + note C#, 14 + note D#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note C#, 7 + note __, 7 + note D#, 8 + note C#, 7 + note E_, 7 + note C#, 7 + note C_, 15 + note C#, 7 + note __, 7 + note D#, 8 + note C#, 7 + note E_, 14 + note C_, 15 + note C#, 7 + note __, 7 + note D#, 8 + note C#, 7 + note E_, 7 + note C#, 7 + note C_, 15 + note C#, 7 + note __, 7 + note D#, 8 + note C#, 7 + note E_, 14 + note C#, 16 + note __, 13 + note C#, 16 + note __, 13 +.Loop5 + callchannel Branch_1f6503 + loopchannel 2, .Loop5 + callchannel Branch_1f6503 + loopchannel 0, .MainLoop + +Branch_1f6503: + octave 1 + notetype 1 + note D#, 8 + note D#, 7 + note E_, 7 + note D#, 7 + note D#, 8 + note E_, 7 + note D#, 7 + note D#, 7 + note E_, 8 + note D#, 7 + note D#, 7 + note E_, 7 + note D#, 8 + note D#, 7 + note E_, 7 + note D#, 7 + endchannel + diff --git a/crysaudio/music/TCG2/grdueltheme2.asm b/crysaudio/music/TCG2/grdueltheme2.asm new file mode 100644 index 00000000..bef94fc1 --- /dev/null +++ b/crysaudio/music/TCG2/grdueltheme2.asm @@ -0,0 +1,2657 @@ +Music_TCG2GRDuelTheme2: + db $C0 + dw Music_TCG2GRDuelTheme2_Ch1 + db $01 + dw Music_TCG2GRDuelTheme2_Ch2 + db $02 + dw Music_TCG2GRDuelTheme2_Ch3 + db $03 + dw Music_TCG2GRDuelTheme2_Ch4 + +Music_TCG2GRDuelTheme2_Ch2: + notetype1 10 + octave 3 + notetype0 1 + note G#, 3 + note A_, 11 + note A_, 7 + note G_, 13 + note G_, 7 + note E_, 13 + note E_, 7 + note D_, 4 + note E_, 3 + note D#, 7 + note E_, 6 + note C_, 7 + dec_octave + note A_, 7 + note G_, 4 + note A_, 3 + note G#, 3 + note G_, 3 + note A_, 7 + note A_, 7 + vibrato 27, $33 + octave 3 + note C_, 7 + note G_, 6 + octave 4 + note D#, 4 + note E_, 3 + note E_, 7 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 +.MainLoop + octave 3 + note A_, 7 + note A_, 7 + callchannel Branch_1ef490 + octave 3 + note C_, 5 + note D_, 5 + note D#, 5 + note E_, 4 + note G_, 4 + note G#, 4 + octave 3 + note A_, 7 + note A_, 7 + callchannel Branch_1ef490 + octave 2 + note G_, 5 + note G#, 5 + note A_, 5 + inc_octave + note C_, 4 + note D_, 4 + note D#, 4 + note E_, 14 + note E_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + octave 3 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1ef5f5 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + note __, 3 + note F#, 14 + note F#, 6 + note E_, 14 + note E_, 7 + note C_, 6 + callchannel Branch_1ef5f5 + octave 3 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note __, 7 + callchannel Branch_1ef602 + note E_, 14 + note E_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + octave 3 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1ef5f5 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + note __, 3 + note F#, 14 + note F#, 6 + note B_, 14 + note B_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note __, 7 + callchannel Branch_1ef615 + octave 3 + note G_, 3 + note G#, 3 + note A_, 14 + note A_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + note D_, 13 + note F_, 14 + note F_, 7 + note G_, 13 + note G_, 7 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note F_, 13 + note G_, 14 + note A_, 13 + note E_, 14 + note E_, 7 + note C_, 6 + callchannel Branch_1ef5f5 + note D_, 13 + dec_octave + note A_, 14 + note A_, 7 + inc_octave + note D#, 3 + note E_, 3 + note E_, 14 + note C_, 13 + note C_, 14 + note C_, 13 + note C_, 14 + note C_, 13 + note C_, 14 + note C_, 13 + note D_, 5 + note E_, 5 + note F_, 5 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 14 + note A_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + note D_, 13 + note F_, 14 + note F_, 7 + note G_, 13 + note G_, 7 + note F_, 7 + note F_, 6 + note A#, 3 + inc_octave + note C_, 4 + note C_, 14 + dec_octave + note A#, 6 + callchannel Branch_1ef5f5 + note F_, 13 + note G#, 14 + note G#, 13 + note A#, 14 + note A#, 7 + note A_, 3 + note G#, 3 + note G_, 14 + note G_, 13 + note G_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + inc_octave + note C_, 14 + note C_, 13 + note C_, 14 + dec_octave + note B_, 13 + note B_, 14 + note B_, 13 + note G_, 7 + note G_, 7 + note __, 13 + octave 2 + note G_, 5 + note G#, 5 + note A_, 5 + inc_octave + note C_, 4 + note D_, 4 + note D#, 4 + note E_, 14 + note E_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + octave 3 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1ef5f5 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + note __, 3 + note F#, 14 + note F#, 6 + note E_, 14 + note E_, 7 + note C_, 6 + callchannel Branch_1ef5f5 + octave 3 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note __, 7 + callchannel Branch_1ef602 + note E_, 14 + note E_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + octave 3 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1ef5f5 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + note __, 3 + note F#, 14 + note F#, 6 + note B_, 14 + note B_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 7 + callchannel Branch_1ef628 + octave 2 + note G_, 5 + note G#, 5 + note A_, 5 + inc_octave + note C_, 4 + note D_, 4 + note D#, 4 + note E_, 14 + note E_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + octave 3 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1ef5f5 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + note __, 3 + note F#, 14 + note F#, 6 + note E_, 14 + note E_, 7 + note C_, 6 + callchannel Branch_1ef5f5 + octave 3 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note __, 7 + callchannel Branch_1ef602 + note E_, 14 + note E_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + octave 3 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1ef5f5 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + note __, 3 + note F#, 14 + note F#, 6 + note B_, 14 + note B_, 7 + note G_, 6 + callchannel Branch_1ef5f5 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + octave 2 + note G_, 4 + inc_octave + note C_, 5 + note F_, 5 + note G_, 13 + note G_, 7 + note A_, 14 + note A_, 6 + note A_, 4 + note A#, 16 + note A#, 7 + note A#, 14 + note A#, 13 + note A#, 14 + note A#, 13 + note A#, 14 + note A#, 13 + note A#, 14 + note A#, 13 + note A#, 14 + note G_, 7 + note A#, 6 + inc_octave + note C#, 3 + note D_, 4 + note D_, 14 + note C_, 6 + note C_, 14 + dec_octave + note A#, 7 + inc_octave + note C_, 6 + dec_octave + note A_, 14 + note A_, 7 + note A#, 6 + note A_, 7 + note A#, 7 + inc_octave + note C_, 7 + note C_, 6 + dec_octave + note A_, 14 + note A_, 7 + note F_, 6 + note F_, 14 + note D_, 7 + note F_, 6 + note G#, 3 + note A_, 11 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + octave 2 + note A#, 13 + inc_octave + note C#, 4 + note D_, 10 + dec_octave + note A#, 13 + octave 3 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note D#, 13 + note D#, 7 + octave 2 + note A#, 5 + note A#, 2 + octave 3 + note A#, 7 + note A#, 13 + inc_octave + note C_, 14 + note C_, 6 + dec_octave + note A_, 14 + note A_, 7 + note A#, 6 + note A_, 7 + note A#, 7 + note A_, 7 + note A_, 6 + note F_, 14 + note F_, 7 + note D_, 6 + note F_, 7 + note D_, 7 + note G#, 3 + note A_, 10 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + octave 2 + note G_, 14 + note A_, 13 + octave 3 + note G_, 14 + note G_, 7 + note A_, 6 + note G_, 7 + note A_, 7 + note A#, 7 + note G_, 6 + note B_, 4 + vibrato 14, $33 + inc_octave + note C_, 10 + note C_, 13 + note C_, 14 + note C_, 13 + vibrato 0, $33 + note C_, 14 + note C_, 7 + dec_octave + note A#, 6 + inc_octave + note C_, 7 + dec_octave + note A#, 7 + note F#, 7 + note A#, 6 + note D_, 14 + note D_, 7 + note A_, 3 + note A#, 3 + note A#, 14 + note F#, 7 + note F#, 6 + note G#, 4 + vibrato 10, $33 + note A_, 10 + note A_, 13 + note A_, 14 + vibrato 0, $33 + note G_, 13 + note G_, 7 + note G_, 7 + note D_, 13 + note D_, 7 + note E_, 14 + note E_, 6 + note F_, 14 + note F_, 8 + note F_, 5 + octave 3 + note C#, 5 + note C#, 9 + note G_, 13 + note G_, 14 + note A_, 13 + note A_, 7 + note A#, 14 + note A#, 6 + inc_octave + note C_, 14 + note C_, 13 + note C_, 14 + vibrato 27, $33 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note C_, 14 + note C_, 13 + note C_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D#, 3 + note E_, 10 + note E_, 14 + note E_, 8 + note E_, 5 + octave 3 + note E_, 4 + note E_, 3 + inc_octave + note D_, 7 + dec_octave + note B_, 4 + inc_octave + note D_, 3 + dec_octave + note G_, 3 + note B_, 3 + note B_, 7 + note G_, 4 + note B_, 3 + note D_, 4 + note G_, 3 + note G_, 3 + note D_, 3 + note E_, 7 + note E_, 7 + callchannel Branch_1ef490 + octave 2 + note B_, 14 + inc_octave + note C_, 13 + note __, 14 + callchannel Branch_1ef490 + octave 3 + note C_, 5 + note D_, 5 + note D#, 5 + note E_, 4 + note G_, 4 + note G#, 4 + loopchannel 0, .MainLoop + +Branch_1ef490: + octave 3 + note C_, 5 + note C_, 8 + note __, 7 + note C_, 5 + note C_, 9 + note __, 6 + note __, 7 + note C_, 5 + note C_, 9 + note __, 6 + note D_, 14 + note C_, 13 + note __, 14 + note C_, 5 + note C_, 8 + note __, 7 + note C_, 5 + note C_, 9 + note __, 6 + note __, 7 + note C_, 5 + note C_, 9 + note __, 6 + dec_octave + note B_, 14 + inc_octave + note C_, 13 + note __, 14 + note C_, 5 + note C_, 8 + note __, 7 + note C_, 5 + note C_, 9 + note __, 6 + note __, 7 + note C_, 5 + note C_, 9 + note __, 6 + note D_, 14 + note C_, 13 + note __, 14 + note C_, 5 + note C_, 8 + note __, 7 + note C_, 5 + note C_, 9 + note __, 6 + note __, 7 + note C_, 5 + note C_, 9 + note __, 6 + endchannel + +Branch_1ef5f5: + octave 2 + octave 3 + note C_, 5 + note C_, 9 + endchannel + +Branch_1ef602: + octave 3 + note E_, 7 + dec_octave + note G_, 4 + note A_, 4 + note G_, 5 + inc_octave + note D_, 14 + note C_, 13 + octave 3 + endchannel + +Branch_1ef615: + octave 3 + note E_, 7 + dec_octave + note G_, 4 + note A_, 4 + note G_, 5 + inc_octave + note D_, 14 + note C_, 7 + octave 3 + endchannel + +Branch_1ef628: + octave 3 + note E_, 7 + dec_octave + note G_, 4 + note A_, 4 + note G_, 5 + endchannel + + +Music_TCG2GRDuelTheme2_Ch1: + notetype1 10 + octave 2 + notetype0 1 + octave 3 + note E_, 14 + note __, 7 + note D_, 13 + note __, 7 + note C_, 13 + note __, 7 + dec_octave + note G_, 4 + note __, 3 + note A_, 7 + inc_octave + note C_, 4 + note __, 2 + dec_octave + note A_, 7 + note E_, 7 + note D_, 4 + note __, 3 + note D#, 4 + note __, 2 + note E_, 7 + note __, 7 + octave 3 + note __, 3 + note E_, 7 + note B_, 3 + note G#, 14 + note G#, 13 + note G#, 14 + note G#, 13 + note G#, 14 + note G#, 13 +.MainLoop +.Loop1 + octave 3 + note E_, 7 + note E_, 7 + callchannel Branch_1ef8d6 + note __, 14 + callchannel Branch_1ef8f0 + loopchannel 2, .Loop1 + octave 3 + note C_, 14 + note C_, 7 + note E_, 6 + callchannel Branch_1efa34 + note D_, 13 + note D_, 14 + note D_, 7 + callchannel Branch_1efa41 + note D_, 14 + note D_, 13 + callchannel Branch_1efa34 + note C_, 7 + note D_, 6 + note E_, 14 + note D_, 7 + note C_, 6 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 14 + note D_, 6 + note C_, 14 + note C_, 7 + dec_octave + note A_, 6 + callchannel Branch_1efa34 + octave 2 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1efa4a + octave 2 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note __, 7 + callchannel Branch_1efa51 + octave 3 + note C_, 14 + note C_, 7 + note E_, 6 + callchannel Branch_1efa34 + note D_, 13 + note D_, 14 + note D_, 7 + callchannel Branch_1efa41 + note D_, 14 + note D_, 13 + callchannel Branch_1efa34 + note C_, 7 + note D_, 6 + note E_, 14 + note D_, 7 + note C_, 6 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 14 + note D_, 6 + note G_, 14 + note G_, 7 + note E_, 6 + callchannel Branch_1efa34 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1efa4a + octave 3 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note __, 7 + callchannel Branch_1efa51 + octave 3 + note __, 14 + note __, 13 + note D_, 5 + note D_, 9 + note __, 13 + note __, 7 + note D_, 5 + note D_, 2 + note D_, 13 + note F_, 14 + dec_octave + note A#, 13 + note __, 14 + note __, 13 + note A#, 5 + note A#, 9 + note __, 13 + inc_octave + note __, 7 + note D_, 5 + note D_, 2 + note D_, 13 + note E_, 14 + note F_, 13 +.Loop2 + note __, 14 + note __, 13 + note E_, 5 + note E_, 9 + note __, 13 + note __, 7 + note E_, 5 + note E_, 2 + dec_octave + note A_, 13 + inc_octave + note C_, 14 + dec_octave + note A_, 13 + inc_octave + loopchannel 2, .Loop2 + note __, 14 + note __, 13 + note D_, 5 + note D_, 9 + note __, 13 + note __, 7 + note D_, 5 + note D_, 2 + note D_, 13 + note F_, 14 + dec_octave + note A#, 13 + inc_octave + note __, 14 + note __, 13 + note C#, 5 + note C#, 9 + note __, 13 + note __, 7 + note G#, 5 + note G#, 2 + note F_, 13 + dec_octave + note A_, 5 + note A#, 5 + inc_octave + note C_, 5 + note D_, 4 + note E_, 4 + note F_, 4 + octave 3 + note C_, 14 + note C_, 13 + note C_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note F_, 14 + note F_, 13 + note F_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note C_, 7 + note C_, 14 + note C_, 6 + note G#, 7 + note G#, 14 + note __, 6 + octave 3 + note C_, 14 + note C_, 7 + note E_, 6 + callchannel Branch_1efa34 + note D_, 13 + note D_, 14 + note D_, 7 + callchannel Branch_1efa41 + note D_, 14 + note D_, 13 + callchannel Branch_1efa34 + note C_, 7 + note D_, 6 + note E_, 14 + note D_, 7 + note C_, 6 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 14 + note D_, 6 + note C_, 14 + note C_, 7 + dec_octave + note A_, 6 + callchannel Branch_1efa34 + octave 2 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1efa4a + octave 2 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note __, 7 + callchannel Branch_1efa51 + octave 3 + note C_, 14 + note C_, 7 + note E_, 6 + callchannel Branch_1efa34 + note D_, 13 + note D_, 14 + note D_, 7 + callchannel Branch_1efa41 + note D_, 14 + note D_, 13 + callchannel Branch_1efa34 + note C_, 7 + note D_, 6 + note E_, 14 + note D_, 7 + note C_, 6 + dec_octave + note B_, 4 + note __, 3 + inc_octave + note D_, 14 + note D_, 6 + note G_, 14 + note G_, 7 + note E_, 6 + callchannel Branch_1efa34 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1efa4a + octave 3 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note __, 7 + callchannel Branch_1efa62 + octave 2 + note A_, 14 + note A_, 7 + inc_octave + note C_, 6 + callchannel Branch_1efa34 + note D_, 13 + note D_, 14 + note D_, 7 + callchannel Branch_1efa41 + note D_, 14 + note D_, 13 + callchannel Branch_1efa34 + octave 2 + note A_, 7 + note B_, 6 + inc_octave + note C_, 14 + dec_octave + note B_, 7 + note A_, 6 + note G_, 4 + note G_, 3 + note B_, 14 + note B_, 6 + note A_, 14 + note A_, 7 + dec_octave + note E_, 6 + callchannel Branch_1efa34 + octave 2 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1efa4a + octave 2 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 7 + callchannel Branch_1efa51 + octave 2 + note A_, 14 + note A_, 7 + inc_octave + note C_, 6 + callchannel Branch_1efa34 + note D_, 13 + note D_, 14 + note D_, 7 + callchannel Branch_1efa41 + note D_, 14 + note D_, 13 + callchannel Branch_1efa34 + octave 2 + note A_, 7 + note B_, 6 + inc_octave + note C_, 14 + dec_octave + note B_, 7 + note A_, 6 + note G_, 4 + note G_, 3 + note B_, 14 + note B_, 6 + inc_octave + note D_, 14 + note D_, 7 + dec_octave + note A_, 6 + callchannel Branch_1efa34 + octave 2 + note F#, 13 + note F#, 14 + note F#, 13 + callchannel Branch_1efa4a + octave 3 + note __, 7 + note E_, 5 + note E_, 9 + note __, 6 + note C_, 5 + note C_, 9 + note __, 13 + note C_, 5 + note C_, 9 + octave 3 + note E_, 13 + note E_, 7 + note F_, 14 + note E_, 6 + octave 3 + note D#, 14 + note D#, 13 + octave 2 + note A#, 5 + note A#, 9 + note __, 13 + note __, 7 + octave 3 + note D#, 5 + note D#, 9 + dec_octave + note G_, 6 + note A#, 14 + note G_, 13 + octave 3 + note D#, 14 + note D#, 13 + octave 2 + note A#, 5 + note A#, 9 + octave 3 + note D_, 7 + note __, 6 + note A#, 14 + note A#, 7 + note A_, 13 + note A_, 7 + note G_, 7 + note __, 6 + note F_, 14 + note F_, 7 + note G_, 6 + octave 3 + note D_, 5 + note D_, 9 + octave 3 + note A_, 7 + note __, 6 + note F_, 14 + note F_, 7 + octave 2 + note A#, 6 + inc_octave + note D_, 14 + dec_octave + note A#, 13 + octave 3 + note F_, 14 + note F_, 13 + note F_, 14 + note F_, 13 + note F_, 7 + octave 3 + note F_, 5 + note F_, 2 + dec_octave + note G_, 13 + note A#, 4 + note __, 3 + note __, 7 + note G_, 13 + octave 3 + note D#, 14 + note D#, 13 + octave 2 + note A#, 5 + note A#, 9 + note __, 13 + note __, 7 + octave 3 + note D#, 5 + note D#, 9 + dec_octave + note G_, 6 + note A#, 14 + note G_, 13 + octave 3 + note D#, 14 + note D#, 13 + octave 2 + note A#, 5 + note A#, 9 + octave 3 + note C_, 13 + octave 3 + note D#, 5 + note D#, 9 + octave 3 + note G_, 7 + note __, 13 + note A_, 14 + note __, 6 + note F_, 14 + note F_, 7 + note G_, 6 + octave 3 + note D_, 5 + note D_, 9 + octave 3 + note F_, 7 + note __, 6 + note D_, 14 + note D_, 7 + octave 2 + note F_, 6 + note A_, 14 + note F_, 13 + octave 3 + note F_, 14 + note F_, 13 + note F_, 14 + note F_, 13 + note F_, 7 + octave 3 + note D_, 5 + note D_, 2 + dec_octave + note F_, 4 + note G_, 3 + note G_, 6 + note D#, 14 + note F_, 13 + octave 3 + note __, 14 + note __, 13 + note C_, 5 + note C_, 9 + note __, 13 + note __, 7 + note F_, 5 + note F_, 9 + dec_octave + note G_, 6 + note A#, 14 + note G_, 13 + inc_octave + note __, 14 + note __, 13 + note F_, 5 + note F_, 9 + note __, 13 + note __, 7 + note A#, 5 + note A#, 2 + note C_, 13 + note D#, 14 + note F_, 13 + note __, 14 + note __, 13 + octave 2 + note A#, 5 + note A#, 9 + note __, 13 + note __, 7 + note A#, 5 + note A#, 9 + note F_, 6 + note A#, 14 + note F_, 13 + inc_octave + note __, 14 + note __, 13 + note F_, 5 + note F_, 9 + note __, 13 + note __, 7 + note F_, 5 + note F_, 9 + dec_octave + note A#, 6 + octave 2 + note A_, 5 + note A#, 5 + inc_octave + note C_, 5 + note D_, 4 + note E_, 4 + note F_, 4 + note F_, 14 + note F_, 7 + octave 3 + note F_, 6 + note F_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 7 + note G_, 6 + note D_, 5 + note E_, 5 + note F_, 5 + note G_, 4 + note A_, 4 + note B_, 4 + note F_, 14 + note F_, 7 + octave 3 + note F_, 6 + note F_, 14 + octave 3 + note G_, 13 + note G_, 7 + octave 3 + note G_, 5 + note G_, 9 + note __, 6 + octave 3 + note G#, 14 + note G#, 7 + note G#, 6 + note G#, 14 + note A_, 13 + note A_, 14 + note A_, 7 + note D_, 3 + note D#, 3 + dec_octave + note B_, 4 + note B_, 3 + inc_octave + note B_, 7 + note G_, 4 + note B_, 3 + note D_, 3 + note G_, 3 + note G_, 7 + note D_, 4 + note G_, 3 + dec_octave + note B_, 4 + inc_octave + note D_, 3 + note D_, 3 + dec_octave + note B_, 3 + dec_octave + note B_, 7 + note B_, 7 + callchannel Branch_1ef8d6 + note __, 14 + callchannel Branch_1ef8d6 + note __, 14 + callchannel Branch_1ef8d6 + note __, 14 + callchannel Branch_1ef8f0 + loopchannel 0, .MainLoop + +Branch_1ef8d6: + octave 2 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + note A_, 14 + note G_, 13 + note __, 14 + note __, 13 + note __, 7 + note G_, 5 + note G_, 9 + note __, 6 + note __, 7 + note G_, 5 + note G_, 9 + note __, 6 + note F#, 14 + note G_, 13 + endchannel + +Branch_1ef8f0: + octave 2 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + note A_, 14 + note G_, 13 + note __, 14 + note __, 13 + note __, 7 + note G_, 5 + note G_, 9 + note __, 6 + note __, 7 + note G_, 5 + note G_, 9 + note __, 6 + note B_, 14 + inc_octave + note C_, 13 + endchannel + +Branch_1efa34: + octave 2 + octave 3 + note E_, 5 + note E_, 9 + endchannel + +Branch_1efa41: + octave 2 + octave 3 + note C_, 6 + note D_, 14 + note C_, 13 + endchannel + +Branch_1efa4a: + octave 2 + note A_, 14 + note G_, 13 + endchannel + +Branch_1efa51: + octave 2 + note G_, 5 + inc_octave + note C_, 9 + dec_octave + note __, 6 + note A_, 14 + note G_, 13 + endchannel + +Branch_1efa62: + octave 2 + note G_, 5 + inc_octave + note C_, 9 + dec_octave + note __, 6 + inc_octave + note D_, 14 + note C_, 13 + endchannel + + +Music_TCG2GRDuelTheme2_Ch3: + notetype1 10 + notetype2 15 + notetype0 1 + notetype1 1 + octave 2 + note A_, 14 + note A_, 4 + note __, 3 + inc_octave + note C_, 13 + note C_, 4 + note __, 3 + note D_, 13 + inc_octave + note D_, 4 + note __, 3 + dec_octave + note D_, 7 + note D#, 7 + note E_, 6 + dec_octave + note G_, 7 + note E_, 7 + note G_, 7 + note G#, 6 + note A_, 7 + note __, 16 + note __, 4 + note A#, 14 + note A#, 7 + note A#, 3 + note __, 3 + note A#, 7 + inc_octave + note F_, 4 + note __, 3 + note A#, 13 + note F_, 14 + dec_octave + note A#, 13 +.MainLoop + callchannel Branch_1efd79 + callchannel Branch_1efd91 + callchannel Branch_1efd79 + callchannel Branch_1efd91 + callchannel Branch_1efd79 + callchannel Branch_1efd91 + callchannel Branch_1efd79 + callchannel Branch_1efd91 + callchannel Branch_1efda8 + callchannel Branch_1efdc0 + callchannel Branch_1efda8 + callchannel Branch_1efdd9 + callchannel Branch_1efda8 + callchannel Branch_1efdc0 + callchannel Branch_1efda8 + callchannel Branch_1efdd9 + octave 2 + note G_, 14 + note G_, 4 + note __, 3 + note G_, 6 + inc_octave + note F_, 5 + note __, 2 + dec_octave + note D_, 4 + note __, 3 + note F_, 7 + note F#, 6 + note G_, 4 + note __, 3 + inc_octave + note A#, 5 + note __, 2 + dec_octave + note A#, 13 + inc_octave + note C_, 14 + dec_octave + note A#, 13 + note G_, 14 + note G_, 4 + note __, 3 + note G_, 6 + inc_octave + note F_, 5 + note __, 2 + dec_octave + note D_, 4 + note __, 3 + note F_, 7 + note F#, 6 + note G_, 4 + note __, 3 + inc_octave + note A#, 5 + note __, 2 + dec_octave + note E_, 13 + note F_, 14 + note F#, 13 +.Loop1 + octave 2 + note F_, 14 + note F_, 4 + note __, 3 + note F_, 6 + inc_octave + note A_, 5 + note __, 2 + dec_octave + inc_octave + note C_, 4 + note __, 3 + note E_, 7 + note F_, 6 + dec_octave + note F_, 4 + note __, 3 + inc_octave + inc_octave + note C_, 5 + note __, 2 + dec_octave + dec_octave + inc_octave + note F_, 13 + dec_octave + note A#, 14 + inc_octave + note C_, 13 + loopchannel 2, .Loop1 + octave 2 + note G_, 14 + note G_, 4 + note __, 3 + note G_, 6 + inc_octave + note F_, 5 + note __, 2 + dec_octave + note D_, 4 + note __, 3 + note F_, 7 + note F#, 6 + note G_, 4 + note __, 3 + inc_octave + note A#, 5 + note __, 2 + dec_octave + note F_, 13 + note G_, 14 + note F_, 13 + note D#, 14 + note D#, 4 + note __, 3 + note D#, 6 + inc_octave + note A#, 5 + note __, 2 + dec_octave + note A#, 4 + note __, 3 + inc_octave + note C#, 7 + note D_, 6 + note D#, 4 + note __, 3 + inc_octave + note C#, 5 + note __, 2 + dec_octave + dec_octave + note D#, 13 + inc_octave + note D#, 14 + dec_octave + note D#, 13 + inc_octave + note D_, 7 + dec_octave + note A_, 4 + note __, 3 + note D_, 4 + note __, 3 + note A_, 4 + note __, 2 + note D_, 4 + note __, 3 + note A_, 4 + note __, 3 + inc_octave + note E_, 7 + dec_octave + note B_, 4 + note __, 2 + note E_, 4 + note __, 3 + note B_, 4 + note __, 3 + note E_, 4 + note __, 3 + note B_, 4 + note __, 2 + inc_octave + note G_, 7 + note D_, 4 + note __, 3 + dec_octave + note G_, 4 + note __, 3 + inc_octave + note D_, 4 + note __, 2 + dec_octave + note G_, 4 + note __, 3 + inc_octave + note D_, 4 + note __, 3 + note A_, 7 + note E_, 4 + note __, 2 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note E_, 4 + note __, 3 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note E_, 4 + note __, 2 + note D_, 7 + dec_octave + note A_, 4 + note __, 3 + note D_, 4 + note __, 3 + note A_, 4 + note __, 2 + note A#, 7 + inc_octave + note F_, 4 + note __, 3 + note A#, 7 + note G#, 4 + note __, 2 + callchannel Branch_1efda8 + callchannel Branch_1efdc0 + callchannel Branch_1efda8 + callchannel Branch_1efdd9 + callchannel Branch_1efda8 + callchannel Branch_1efdc0 + callchannel Branch_1efda8 + callchannel Branch_1efdd9 + callchannel Branch_1efda8 + callchannel Branch_1efdc0 + callchannel Branch_1efda8 + callchannel Branch_1efdd9 + callchannel Branch_1efda8 + callchannel Branch_1efdc0 + callchannel Branch_1efda8 + octave 2 + note A_, 4 + note __, 3 + inc_octave + note A_, 5 + note __, 2 + note G_, 7 + note A_, 4 + note __, 2 + note G_, 5 + note __, 2 + dec_octave + note E_, 4 + note __, 3 + note G_, 7 + note G#, 6 + note A_, 7 + note __, 7 + note A_, 13 + note A_, 4 + note __, 3 + note G_, 14 + note G_, 3 + note __, 3 +.Loop2 + octave 2 + note F_, 14 + note F_, 4 + note __, 3 + note F_, 6 + inc_octave + note G_, 5 + note __, 2 + note C_, 4 + note __, 3 + note D#, 7 + note F_, 6 + dec_octave + note F_, 4 + note __, 3 + inc_octave + note A#, 5 + note __, 2 + note F_, 13 + note C_, 14 + note D#, 13 + loopchannel 2, .Loop2 + octave 2 + note F_, 14 + note F_, 4 + note __, 3 + note F_, 6 + inc_octave + note A#, 5 + note __, 2 + note C_, 4 + note __, 3 + note D#, 7 + note F_, 6 + dec_octave + note F_, 4 + note __, 3 + inc_octave + inc_octave + note F_, 5 + note __, 2 + dec_octave + note F_, 13 + note C_, 14 + note D#, 13 + octave 2 + note F_, 14 + note F_, 4 + note __, 3 + note F_, 6 + inc_octave + inc_octave + note D_, 5 + note __, 2 + dec_octave + note C_, 4 + note __, 3 + note D#, 7 + note F_, 6 + dec_octave + note F_, 4 + note __, 3 + inc_octave + inc_octave + note D_, 5 + note __, 2 + dec_octave + note F_, 13 + note C_, 14 + note D#, 13 + octave 2 + note F_, 14 + note F_, 4 + note __, 3 + note F_, 6 + inc_octave + note G_, 5 + note __, 2 + note C_, 4 + note __, 3 + note D#, 7 + note F_, 6 + dec_octave + note F_, 4 + note __, 3 + inc_octave + note A#, 5 + note __, 2 + note F_, 13 + note C_, 14 + note D#, 13 + octave 2 + note F_, 14 + note F_, 4 + note __, 3 + note F_, 6 + inc_octave + note G_, 5 + note __, 2 + note C_, 4 + note __, 3 + note D#, 7 + note F_, 6 + dec_octave + note F_, 4 + note __, 3 + inc_octave + note G_, 5 + note __, 2 + note F_, 13 + note C_, 14 + note D#, 13 + dec_octave + octave 2 + note A#, 14 + note A#, 4 + note __, 3 + note A#, 6 + inc_octave + note A_, 5 + note __, 2 + dec_octave + note F_, 4 + note __, 3 + note A_, 7 + note A#, 6 + note A#, 4 + note __, 3 + inc_octave + inc_octave + note D_, 5 + note __, 2 + dec_octave + note F_, 13 + note A_, 14 + note F_, 13 + octave 2 + note A#, 14 + note A#, 4 + note __, 3 + note A#, 6 + inc_octave + inc_octave + note D_, 5 + note __, 2 + dec_octave + dec_octave + note F_, 4 + note __, 3 + note A_, 7 + note A#, 6 + note A#, 4 + note __, 3 + inc_octave + note A_, 5 + note __, 2 + dec_octave + note F_, 13 + note A_, 14 + note F_, 13 + octave 2 + note G#, 14 + note G#, 4 + note __, 3 + note G#, 6 + inc_octave + note G_, 5 + note __, 2 + note D#, 4 + note __, 3 + note G_, 7 + note G#, 6 + dec_octave + note G#, 4 + note __, 3 + inc_octave + inc_octave + note C_, 5 + note __, 2 + dec_octave + note D#, 13 + note G_, 14 + note D#, 13 + octave 2 + note D_, 14 + note D_, 4 + note __, 3 + note D_, 6 + inc_octave + inc_octave + note C_, 5 + note __, 2 + dec_octave + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + note D_, 6 + dec_octave + note D_, 4 + note __, 3 + inc_octave + inc_octave + note F_, 5 + note __, 2 + dec_octave + dec_octave + note A_, 13 + inc_octave + note C_, 14 + dec_octave + note A_, 13 + note G_, 14 + note G_, 4 + note __, 3 + note G_, 6 + inc_octave + note F_, 5 + note __, 2 + note D_, 4 + note __, 3 + note F_, 7 + note G_, 6 + dec_octave + note G_, 4 + note __, 3 + inc_octave + note F_, 5 + note __, 2 + dec_octave + note G_, 13 + inc_octave + note D_, 14 + note C#, 13 + dec_octave + note D#, 14 + note D#, 4 + note __, 3 + note D#, 6 + inc_octave + note A#, 5 + note __, 2 + dec_octave + note A#, 4 + note __, 3 + inc_octave + note C#, 7 + note D#, 6 + dec_octave + note D#, 4 + note __, 3 + inc_octave + inc_octave + note C#, 5 + note __, 2 + dec_octave + note D#, 13 + dec_octave + note A#, 14 + inc_octave + note C#, 13 + note D_, 7 + dec_octave + note A_, 4 + note __, 3 + note D_, 4 + note __, 3 + inc_octave + inc_octave + note C_, 5 + note __, 1 + dec_octave + dec_octave + note D_, 4 + note __, 3 + note D_, 2 + note __, 5 + note E_, 13 + note E_, 4 + note __, 3 + inc_octave + inc_octave + note G_, 5 + note __, 2 + dec_octave + note E_, 13 + dec_octave + note B_, 14 + inc_octave + note D_, 13 + note E_, 7 + dec_octave + note E_, 4 + note __, 3 + note E_, 2 + note __, 5 + inc_octave + inc_octave + note D_, 5 + note __, 1 + dec_octave + dec_octave + note E_, 4 + note __, 3 + inc_octave + note E_, 7 + note D_, 7 + note E_, 6 + dec_octave + note E_, 4 + note __, 3 + inc_octave + inc_octave + note D_, 5 + note __, 2 + dec_octave + dec_octave + note B_, 13 + inc_octave + note D_, 14 + dec_octave + note B_, 13 + inc_octave + note D_, 7 + dec_octave + note A_, 4 + note __, 3 + note D_, 4 + note __, 3 + inc_octave + inc_octave + note C_, 5 + note __, 1 + dec_octave + dec_octave + note D_, 4 + note __, 3 + note D_, 2 + note __, 5 + note E_, 13 + note E_, 4 + note __, 3 + inc_octave + inc_octave + note D_, 5 + note __, 2 + dec_octave + note E_, 13 + dec_octave + note A#, 14 + inc_octave + inc_octave + note D_, 5 + note __, 2 + dec_octave + dec_octave + note A#, 3 + note __, 3 + note A#, 7 + inc_octave + note A#, 4 + note __, 3 + dec_octave + note E_, 13 + note E_, 14 + note E_, 4 + note __, 3 + inc_octave + note D_, 6 + note E_, 7 + dec_octave + note D_, 4 + note __, 3 + note D#, 4 + note __, 3 + note E_, 4 + note __, 2 + note G_, 7 + note E_, 4 + note __, 3 + note G_, 4 + note __, 3 + note G#, 4 + note __, 2 + callchannel Branch_1efd79 + callchannel Branch_1efd91 + callchannel Branch_1efd79 + callchannel Branch_1efd91 + callchannel Branch_1efd79 + callchannel Branch_1efd91 + callchannel Branch_1efd79 + callchannel Branch_1efd91 + loopchannel 0, .MainLoop + +Branch_1efd79: + octave 2 + note A_, 14 + inc_octave + note G_, 5 + note __, 2 + dec_octave + note A_, 6 + note A_, 4 + note __, 3 + inc_octave + note G_, 5 + note __, 2 + dec_octave + inc_octave + note G_, 7 + note G#, 6 + note A_, 4 + note __, 3 + note G_, 5 + note __, 2 + note C_, 13 + note D_, 14 + note E_, 13 + endchannel + +Branch_1efd91: + octave 2 + note A_, 14 + inc_octave + note G_, 5 + note __, 2 + dec_octave + note A_, 6 + note A_, 4 + note __, 3 + note A_, 1 + note __, 6 + inc_octave + note G_, 7 + note G#, 6 + note A_, 4 + note __, 3 + dec_octave + note A_, 2 + note __, 5 + note F#, 13 + note G_, 14 + note G#, 13 + endchannel + +Branch_1efda8: + octave 2 + note A_, 14 + note A_, 4 + note __, 3 + note A_, 6 + inc_octave + note G_, 5 + note __, 2 + dec_octave + note E_, 4 + note __, 3 + note G_, 7 + note G#, 6 + note A_, 4 + note __, 3 + inc_octave + inc_octave + note C_, 5 + note __, 2 + dec_octave + note C_, 13 + note D_, 14 + note C_, 13 + endchannel + +Branch_1efdc0: + octave 2 + note A_, 14 + note A_, 4 + note __, 3 + note A_, 6 + inc_octave + note G_, 5 + note __, 2 + dec_octave + note E_, 4 + note __, 3 + note G_, 7 + note G#, 6 + note A_, 4 + note __, 3 + inc_octave + inc_octave + note C_, 5 + note __, 2 + dec_octave + dec_octave + note F#, 13 + note G_, 14 + note G#, 13 + endchannel + +Branch_1efdd9: + octave 2 + note A_, 14 + note A_, 4 + note __, 3 + note A_, 6 + inc_octave + inc_octave + note C_, 5 + note __, 2 + dec_octave + dec_octave + note E_, 4 + note __, 3 + note G_, 7 + note G#, 6 + note A_, 4 + note __, 3 + inc_octave + inc_octave + note C_, 5 + note __, 2 + dec_octave + dec_octave + note F#, 13 + note G_, 14 + note G#, 13 + endchannel + + +Music_TCG2GRDuelTheme2_Ch4: + togglenoise $06 + octave 1 + notetype 1 + note E_, 14 + note C#, 7 + note E_, 13 + note C#, 7 + note E_, 13 + note D#, 7 + note C#, 3 + note C#, 4 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C_, 7 + note C_, 6 + note C#, 14 + note C_, 4 + note C_, 4 + note C_, 5 + note C#, 14 + note C_, 7 + note C#, 6 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 4 + note C#, 4 + note C#, 5 + note C#, 7 + note C#, 7 + note C_, 13 +.MainLoop + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 14 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 13 + note C#, 7 + note C_, 7 + note E_, 13 + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 14 + note D#, 7 + note D#, 6 + note C_, 7 + note C#, 7 + note E_, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note C_, 7 + note C#, 6 + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 14 + note D#, 7 + note D#, 6 + note C_, 7 + note C#, 7 + note E_, 13 + note C#, 14 + note C#, 7 + note C#, 6 + note C#, 14 + note E_, 7 + note C_, 6 + note C#, 14 + note C#, 13 + note E_, 7 + note C_, 7 + note C#, 13 + note C#, 14 + note E_, 7 + note C_, 6 + note C#, 14 + note C#, 13 + note E_, 7 + note C_, 7 + note C#, 13 + note C#, 3 + note C#, 4 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 14 + note D#, 7 + note C#, 3 + note C#, 3 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 4 + note C#, 4 + note C#, 5 + note C#, 7 + note C#, 7 + note D#, 6 + note C#, 6 + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + note C_, 7 + note C#, 7 + note E_, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note C#, 7 + note C_, 6 + note C#, 14 + note C_, 13 + note C#, 7 + note C_, 14 + note C#, 6 + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 14 + note D#, 7 + note D#, 6 + note C_, 7 + note C#, 7 + note E_, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + callchannel Branch_1effeb + callchannel Branch_1effdc + callchannel Branch_1effeb + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 15 + note D#, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 14 + note E_, 7 + note C_, 6 + note C#, 14 + note C#, 13 + note D#, 7 + note C_, 7 + note E_, 13 + note C#, 14 + note E_, 13 + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 14 + note D#, 7 + note D#, 6 + note C_, 7 + note C#, 7 + note E_, 13 + note C#, 7 + note D#, 7 + note C#, 7 + note C#, 6 + note C#, 14 + note E_, 7 + note C_, 6 + note C#, 14 + note C#, 13 + note D#, 7 + note C#, 7 + note E_, 13 + note C#, 14 + note D#, 7 + note C#, 6 + note C_, 14 + note C#, 13 + note D#, 7 + note E_, 7 + note C#, 7 + note C_, 6 + note C#, 4 + note C#, 5 + note C#, 5 + note C#, 4 + note C#, 4 + note C#, 5 + note C#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + notetype 6 + note F_, 16 + notetype 1 + note __, 12 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 12 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 12 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 1 + note D#, 4 + note D#, 5 + note D#, 5 + note E_, 13 +.Loop1 + note D#, 7 + note D#, 7 + note E_, 13 + note D#, 7 + note E_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note E_, 13 + note D#, 7 + note E_, 7 + note D#, 7 + note D#, 6 + loopchannel 3, .Loop1 + note D#, 7 + note D#, 7 + note E_, 13 + note D#, 7 + note E_, 7 + note D#, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + loopchannel 0, .MainLoop + +Branch_1effdc: + octave 1 + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 14 + note D#, 7 + note D#, 6 + note C_, 7 + note C#, 7 + note E_, 13 + note C#, 7 + note C_, 7 + note D#, 7 + note C#, 6 + endchannel + +Branch_1effeb: + octave 1 + note C_, 14 + note D#, 7 + note C_, 6 + note C#, 14 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 13 + note C#, 7 + note C_, 7 + note E_, 13 + endchannel + diff --git a/crysaudio/music/TCG2/grdueltheme3.asm b/crysaudio/music/TCG2/grdueltheme3.asm new file mode 100644 index 00000000..2da1d4db --- /dev/null +++ b/crysaudio/music/TCG2/grdueltheme3.asm @@ -0,0 +1,3654 @@ +Music_TCG2GRDuelTheme3: + db $C0 + dw Music_TCG2GRDuelTheme3_Ch1 + db $01 + dw Music_TCG2GRDuelTheme3_Ch2 + db $02 + dw Music_TCG2GRDuelTheme3_Ch3 + db $03 + dw Music_TCG2GRDuelTheme3_Ch4 + +Music_TCG2GRDuelTheme3_Ch2: + notetype1 10 +.MainLoop + notetype0 1 +.Loop1 + octave 3 + note D_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + inc_octave + inc_octave + note E_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + loopchannel 7, .Loop1 + octave 3 + note D_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + inc_octave + inc_octave + note E_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + callchannel Branch_1f672f + note B_, 13 +.Loop2 + octave 3 + note D_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + octave 4 + note D_, 3 + note D_, 4 + dec_octave + note __, 7 + octave 1 + note B_, 3 + note __, 3 + inc_octave + inc_octave + note E_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + loopchannel 7, .Loop2 + octave 3 + note D_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + octave 4 + note D_, 3 + note D_, 4 + dec_octave + note __, 7 + octave 1 + note B_, 3 + note __, 3 + inc_octave + inc_octave + note E_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + callchannel Branch_1f672f + octave 3 + vibrato 58, $33 + note E_, 4 + note F#, 3 + note G_, 3 + note A_, 3 + note A#, 3 + note B_, 4 + note B_, 14 + inc_octave + note C_, 6 + note C_, 14 + dec_octave + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note D#, 3 + note E_, 4 + note E_, 14 + note F#, 6 + note F#, 14 + note G_, 7 + note G_, 6 + note G#, 3 + note A_, 4 + note A_, 14 + note G_, 6 + note G_, 14 + vibrato 27, $33 + note F#, 7 + note F#, 6 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + dec_octave + note B_, 14 + note B_, 7 + inc_octave + note C_, 6 + note C_, 14 + vibrato 52, $33 + note F#, 3 + note G_, 10 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note E_, 7 + note E_, 6 + note A#, 3 + note B_, 11 + note B_, 7 + note A_, 6 + note A_, 14 + note G_, 7 + note G_, 6 + note G#, 3 + note A_, 4 + note A_, 14 + inc_octave + note D_, 6 + note D_, 14 + dec_octave + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note G_, 7 + note F#, 6 + note E_, 14 + note E_, 7 + note C_, 6 + note C_, 14 + note F#, 3 + note G_, 10 + note E_, 14 + note E_, 7 + note A#, 3 + note B_, 3 + note B_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 7 + note A_, 6 + note A#, 3 + note B_, 4 + note B_, 14 + inc_octave + note D_, 6 + note D_, 14 + note C_, 13 + dec_octave + note B_, 14 + note B_, 7 + note E_, 6 + note E_, 14 + note G#, 3 + note A_, 10 + note A_, 14 + note A_, 13 + note A_, 14 + note A_, 13 + note A_, 14 + note G_, 7 + note G_, 13 + note A_, 7 + note A_, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 3 + note G_, 11 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note F#, 14 + note G_, 7 + note G_, 6 + note A_, 7 + note A_, 7 + note B_, 7 + note B_, 6 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 3 + note G_, 11 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + note G_, 14 + note G_, 13 + loopchannel 0, .MainLoop + +Branch_1f672f: + octave 3 + note E_, 3 + note F_, 3 + vibrato 40, $33 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F_, 3 + note F#, 11 + note F#, 7 + note D_, 6 + note D_, 14 + dec_octave + note B_, 13 + inc_octave + note D#, 3 + note E_, 11 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note F_, 3 + note F#, 11 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 7 + note G_, 13 + note G_, 7 + note A_, 7 + note A_, 6 + note F_, 3 + note F#, 11 + note F#, 13 + note F#, 14 + vibrato 28, $33 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note D#, 3 + note E_, 11 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note F#, 13 + note F#, 7 + note G_, 14 + note G_, 6 + note G#, 3 + note A_, 11 + note A_, 7 + note G_, 6 + note G_, 14 + note F#, 7 + note F#, 6 + note E_, 14 + note E_, 7 + note F#, 6 + note F#, 14 + dec_octave + note B_, 7 + note B_, 6 + inc_octave + note D_, 14 + note D_, 13 + note D_, 14 + note F_, 3 + note F#, 10 + note F#, 14 + note F#, 13 + dec_octave + note B_, 14 + note B_, 13 + note B_, 14 + note B_, 13 + note B_, 14 + note B_, 13 + note B_, 14 + note B_, 13 + note B_, 14 + note B_, 13 + inc_octave + note D#, 3 + vibrato 11, $33 + note E_, 11 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note F#, 13 + note F#, 7 + note G_, 14 + note G_, 6 + note G#, 3 + note A_, 11 + note A_, 13 + note A_, 14 + note A#, 3 + note B_, 10 + note B_, 14 + note B_, 13 + note G_, 14 + note G_, 13 + note G#, 3 + note A_, 11 + note A_, 13 + note A_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note G_, 14 + note G_, 13 + note G#, 3 + note A_, 11 + note A_, 13 + note A_, 14 + note A_, 13 + note B_, 14 + note B_, 13 + note B_, 14 + endchannel + + +Music_TCG2GRDuelTheme3_Ch1: + notetype1 10 +.MainLoop + notetype0 1 +.Loop1 + octave 2 + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + note __, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + note __, 3 + note __, 3 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + note __, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note __, 3 + note __, 3 + loopchannel 7, .Loop1 + octave 2 + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + note __, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + note __, 3 + note __, 3 + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + note __, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + octave 1 + note G_, 3 + note __, 3 +.Loop2 + octave 3 + note D_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + inc_octave + inc_octave + note E_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + loopchannel 2, .Loop2 +.Loop3 + octave 3 + note C#, 3 + note __, 4 + dec_octave + note C#, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C#, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C#, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C#, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note C#, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C#, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C#, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C#, 3 + note __, 3 + loopchannel 2, .Loop3 +.Loop4 + octave 3 + note D_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + inc_octave + inc_octave + note E_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + loopchannel 2, .Loop4 +.Loop5 + octave 3 + note C#, 3 + note __, 4 + dec_octave + note C#, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C#, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C#, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C#, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note C#, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C#, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C#, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C#, 3 + note __, 3 + loopchannel 2, .Loop5 +.Loop6 + octave 3 + note C_, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C_, 3 + note __, 3 + loopchannel 2, .Loop6 +.Loop7 + octave 3 + note D_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + inc_octave + inc_octave + note E_, 3 + note __, 4 + dec_octave + dec_octave + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + dec_octave + note B_, 3 + note __, 3 + loopchannel 2, .Loop7 + octave 3 + note C_, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C_, 3 + note __, 3 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note D#, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note D#, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note D#, 3 + note __, 4 + note C_, 3 + note __, 3 + inc_octave + note D#, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note D#, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note D#, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note D#, 3 + note __, 4 + note C_, 3 + note __, 3 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C_, 3 + note __, 3 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note C_, 3 + note __, 4 + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 3 + dec_octave + note E_, 3 + note __, 4 + inc_octave + note C_, 3 + note __, 4 + dec_octave + note E_, 3 + note __, 4 + note C_, 3 + note __, 3 + note B_, 3 + note __, 4 + note B_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 3 + note B_, 3 + note __, 4 + note G_, 3 + note __, 4 + note A_, 3 + note __, 4 + note F#, 3 + note __, 3 +.Loop8 + octave 2 + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + note __, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + octave 3 + note B_, 3 + note B_, 4 + note __, 13 + octave 2 + note B_, 3 + note __, 4 + inc_octave + note E_, 3 + note __, 4 + note __, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + dec_octave + note __, 3 + note __, 3 + loopchannel 7, .Loop8 + octave 2 + note A_, 3 + note __, 4 + inc_octave + note D_, 3 + note __, 4 + note __, 3 + note __, 4 + dec_octave + note A_, 3 + note __, 3 + inc_octave + note D_, 3 + note __, 4 + dec_octave + octave 3 + note B_, 3 + note B_, 4 + note __, 13 + octave 2 + note B_, 3 + note __, 4 + octave 2 + note A_, 7 + note A#, 4 + note A#, 3 + note B_, 4 + note B_, 2 + inc_octave + note D_, 7 + dec_octave + note B_, 4 + note B_, 3 + note A_, 4 + note A_, 3 + octave 1 + note B_, 3 + note __, 3 + octave 3 + vibrato 0, $33 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 12 + note D_, 14 + note D_, 13 + note D_, 14 + note __, 13 + note D_, 14 + note D_, 4 + note __, 3 + dec_octave + note B_, 6 + note __, 14 + note G_, 13 + inc_octave + note C#, 16 + note C#, 16 + note C#, 16 + note C#, 16 + note C#, 16 + note C#, 16 + note C#, 12 + note C#, 14 + note C#, 13 + note C#, 14 + note C#, 13 + note __, 7 + callchannel Branch_1f6dd9 + octave 3 + vibrato 0, $33 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 12 + note D_, 14 + note D_, 13 + note D_, 14 + note __, 13 + note D_, 14 + note D_, 4 + note __, 3 + note D_, 6 + note D_, 11 + note __, 3 + note D_, 13 + note C#, 14 + note C#, 13 + note __, 14 + note C#, 13 + note C#, 14 + note C#, 13 + note C#, 14 + note C#, 13 + note C#, 14 + note C#, 13 + note C#, 14 + note C#, 13 + note __, 7 + callchannel Branch_1f6dd9 + octave 3 + note C_, 14 + note C_, 13 + note C_, 14 + note C_, 14 + note __, 14 + note C_, 13 + note __, 7 + note C_, 14 + note __, 6 + note C_, 14 + note __, 7 + note C_, 6 + note C_, 11 + note __, 3 + note C_, 7 + note __, 6 + note C_, 14 + note __, 7 + note C_, 16 + note __, 4 + dec_octave + note G_, 7 + note __, 6 + note B_, 14 + note B_, 13 + note __, 14 + inc_octave + note D_, 13 + note D_, 14 + note __, 13 + dec_octave + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note __, 7 + callchannel Branch_1f6df4 + octave 3 + note C_, 14 + note C_, 13 + note C_, 14 + note C_, 13 + note __, 14 + note D_, 13 + note __, 7 + note E_, 13 + note __, 6 + note D#, 14 + note D#, 13 + note __, 14 + note G_, 13 + note G_, 14 + note G_, 12 + note __, 1 + note D#, 14 + note __, 13 + note E_, 14 + note E_, 13 + note __, 14 + dec_octave + note B_, 13 + note B_, 14 + note B_, 13 + inc_octave + note E_, 14 + note __, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note __, 13 + note D#, 7 + octave 2 + note A_, 3 + note __, 4 + inc_octave + note C_, 4 + note __, 3 + note D#, 3 + note __, 3 + note F#, 4 + note __, 3 + note A_, 4 + note __, 3 + inc_octave + note C_, 4 + note __, 3 + note D#, 3 + note __, 3 + octave 3 + note G_, 14 + note G_, 7 + note A_, 6 + octave 2 + note B_, 4 + note __, 3 + callchannel Branch_1f6dbf + octave 3 + note C_, 7 + octave 2 + note B_, 4 + note __, 3 + note __, 13 + octave 3 + note C#, 3 + note D_, 11 + dec_octave + note B_, 13 + octave 3 + note C_, 14 + note C_, 13 + octave 2 + note B_, 4 + note __, 3 + callchannel Branch_1f6dbf + octave 3 + note C_, 7 + octave 2 + note B_, 4 + note __, 3 + note __, 7 + octave 3 + note D_, 6 + octave 2 + note A_, 14 + note B_, 13 + octave 3 + note F#, 14 + note F#, 7 + note E_, 6 + octave 3 + note F#, 4 + note __, 3 + callchannel Branch_1f6dbf + octave 3 + dec_octave + note A_, 7 + octave 3 + note F#, 4 + note __, 3 + note __, 13 + octave 3 + note F#, 3 + note G_, 11 + note F#, 13 + octave 3 + dec_octave + note A_, 14 + note A_, 13 + octave 3 + note F#, 4 + note __, 3 + callchannel Branch_1f6dbf + note __, 7 + octave 3 + note F#, 4 + note __, 3 + note __, 13 + octave 3 + note F#, 4 + note G_, 5 + note F#, 5 + note D_, 13 + octave 3 + dec_octave + note G_, 14 + note G_, 7 + note A_, 6 + octave 2 + note B_, 4 + note __, 3 + callchannel Branch_1f6dbf + octave 3 + note E_, 7 + octave 2 + note B_, 4 + note __, 3 + note __, 13 + octave 3 + note C#, 3 + note D_, 11 + dec_octave + note B_, 13 + octave 3 + note E_, 14 + note E_, 13 + octave 2 + note B_, 4 + note __, 3 + callchannel Branch_1f6dbf + octave 3 + note G_, 7 + octave 2 + note B_, 4 + note __, 3 + note __, 7 + octave 3 + note F#, 6 + octave 2 + note A_, 14 + note B_, 13 + octave 3 + note D_, 14 + note D_, 7 + note C_, 6 + octave 3 + note F#, 4 + note __, 3 + callchannel Branch_1f6dbf + octave 3 + note C_, 7 + octave 3 + note F#, 4 + note __, 3 + note __, 13 + octave 3 + note F#, 3 + note G_, 11 + note F#, 13 + octave 3 + note D_, 14 + note D_, 13 + octave 3 + note F#, 4 + note __, 3 + callchannel Branch_1f6dbf + note __, 7 + octave 3 + note F#, 4 + note __, 3 + note __, 13 + octave 3 + note F#, 4 + note G_, 5 + note F#, 5 + octave 3 + note E_, 7 + note D#, 6 + octave 3 + note C_, 14 + note C_, 7 + dec_octave + note A_, 6 + octave 3 + note C_, 4 + note __, 3 + note __, 7 + octave 3 + note E_, 13 + note C_, 7 + octave 3 + note C_, 4 + note __, 3 + note __, 7 + octave 3 + note G_, 6 + octave 2 + note B_, 3 + inc_octave + note C_, 11 + dec_octave + note A_, 13 + octave 3 + note E_, 14 + note E_, 13 + octave 3 + note E_, 4 + note __, 10 + note __, 13 + note __, 7 + octave 3 + note E_, 4 + note __, 3 + note __, 13 + octave 2 + note B_, 3 + inc_octave + note C_, 11 + dec_octave + note A_, 13 + octave 3 + note G_, 14 + note G_, 7 + note A_, 6 + octave 3 + note G_, 4 + note __, 3 + note __, 7 + octave 3 + note A_, 13 + note G_, 7 + octave 3 + note G_, 4 + note __, 3 + note __, 7 + octave 3 + note C_, 6 + octave 2 + note B_, 3 + inc_octave + note C_, 11 + dec_octave + note A_, 13 + octave 3 + note F#, 14 + note F#, 13 + octave 2 + note F#, 4 + note __, 10 + note __, 13 + note __, 7 + octave 3 + note F#, 4 + note __, 3 + octave 3 + note E_, 7 + note __, 6 + note __, 7 + note F#, 7 + note __, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note D_, 14 + note E_, 7 + note E_, 6 + note F#, 7 + note F#, 7 + note G_, 7 + note G_, 6 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + loopchannel 0, .MainLoop + +Branch_1f6dbf: + octave 3 + note G_, 4 + note G_, 3 + inc_octave + note G_, 4 + note G_, 3 + dec_octave + note G_, 3 + note G_, 3 + endchannel + +Branch_1f6dd9: + octave 2 + note C#, 4 + note __, 3 + note E_, 4 + note __, 3 + inc_octave + note C#, 4 + note __, 2 + dec_octave + note E_, 4 + note __, 3 + inc_octave + note C#, 4 + note __, 3 + dec_octave + note E_, 4 + note __, 3 + note C#, 3 + note __, 3 + endchannel + +Branch_1f6df4: + octave 1 + note B_, 4 + note __, 3 + inc_octave + note E_, 4 + note __, 3 + inc_octave + note D_, 4 + note __, 2 + dec_octave + note E_, 4 + note __, 3 + inc_octave + note D_, 4 + note __, 3 + dec_octave + note E_, 4 + note __, 3 + dec_octave + note B_, 3 + note __, 3 + endchannel + + +Music_TCG2GRDuelTheme3_Ch3: + notetype1 10 + notetype2 11 + notetype0 1 + notetype1 1 +.MainLoop + octave 3 + vibrato 48, $33 +.Loop1 + note D_, 14 + note D_, 7 + note E_, 6 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 7 + notetype1 3 + note E_, 6 + notetype1 1 + loopchannel 3, .Loop1 + note D_, 14 + note D_, 7 + note E_, 6 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + notetype1 3 + note E_, 7 + notetype1 1 + inc_octave + note D_, 7 + note E_, 7 + dec_octave + note B_, 6 + inc_octave + note D_, 7 + dec_octave + note A_, 7 + note B_, 7 + note G_, 6 +.Loop2 + note D_, 14 + note D_, 7 + note E_, 6 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 7 + notetype1 3 + note E_, 6 + notetype1 1 + note D_, 14 + note D_, 7 + note E_, 6 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + notetype1 3 + note E_, 7 + notetype1 1 + note B_, 7 + inc_octave + note D_, 7 + dec_octave + note A_, 6 + note B_, 7 + note G_, 7 + note A_, 7 + note F#, 3 + note __, 3 + loopchannel 3, .Loop2 + note D_, 14 + note D_, 7 + note E_, 6 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + note E_, 14 + note E_, 13 + vibrato 0, $33 + note F_, 14 + note F_, 13 + note F_, 14 + note F_, 13 + note F_, 14 + note F_, 13 + note F_, 14 + note F_, 7 + notetype1 3 + note F_, 6 + notetype1 1 + vibrato 48, $33 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note F#, 14 + note F#, 13 + note B_, 14 + note B_, 13 + note B_, 14 + note B_, 13 + notetype1 3 + note B_, 7 + notetype1 1 + note B_, 7 + inc_octave + note D_, 7 + dec_octave + note A_, 6 + note B_, 7 + note G_, 7 + note A_, 7 + note F#, 3 + note __, 3 +.Loop3 + note D_, 14 + note D_, 7 + note E_, 6 + note E_, 3 + note __, 4 + inc_octave + inc_octave + inc_octave + note E_, 7 + dec_octave + dec_octave + note D_, 5 + note __, 2 + note D_, 2 + note __, 4 + note E_, 4 + note __, 3 + note E_, 2 + note __, 5 + dec_octave + note B_, 4 + note __, 3 + note B_, 1 + note __, 5 + inc_octave + note D_, 7 + note E_, 7 + dec_octave + note D_, 4 + note __, 3 + note E_, 3 + note __, 3 + note D_, 14 + note D_, 7 + note E_, 6 + note E_, 3 + note __, 4 + inc_octave + inc_octave + inc_octave + note E_, 7 + dec_octave + dec_octave + note D_, 5 + note __, 2 + note D_, 2 + note __, 4 + note E_, 4 + note __, 3 + note E_, 2 + note __, 5 + dec_octave + note B_, 4 + note __, 3 + note B_, 1 + note __, 5 + inc_octave + note D_, 7 + dec_octave + note B_, 4 + note __, 3 + note A_, 4 + note __, 3 + note G_, 3 + note __, 3 + loopchannel 4, .Loop3 + note D_, 14 + note D_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D#, 13 + note E_, 14 + note E_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D#, 13 + note E_, 14 + note E_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note B_, 7 + inc_octave + note D_, 4 + note __, 3 + dec_octave + note A_, 4 + note __, 2 + note B_, 7 + note G_, 4 + note __, 3 + note A_, 4 + note __, 3 + note F#, 4 + note __, 2 + note D_, 14 + note D_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D#, 13 + note E_, 14 + note E_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D#, 13 + note E_, 14 + note __, 7 + note E_, 6 + note __, 7 + note B_, 7 + inc_octave + note D_, 7 + note E_, 6 + note __, 7 + dec_octave + note B_, 7 + inc_octave + note D_, 7 + dec_octave + note A_, 6 + note B_, 7 + note G_, 7 + note A_, 7 + note F#, 3 + note __, 3 + note D_, 14 + note D_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D#, 13 + note E_, 14 + note E_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note D#, 13 + note E_, 14 + note E_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 4 + note B_, 7 + inc_octave + note D_, 4 + note __, 3 + dec_octave + note A_, 4 + note __, 2 + note B_, 7 + note G_, 4 + note __, 3 + note A_, 4 + note __, 3 + note F#, 4 + note __, 2 + note D_, 14 + note D_, 7 + note E_, 6 + inc_octave + note E_, 2 + note __, 12 + dec_octave + note B_, 4 + note __, 3 + note E_, 3 + note __, 3 + note E_, 4 + note __, 3 + note E_, 4 + note __, 3 + dec_octave + note B_, 13 + inc_octave + note D_, 14 + note E_, 13 + note F_, 14 + note F_, 7 + note F_, 6 + inc_octave + note F_, 2 + note __, 12 + note C_, 4 + note __, 3 + dec_octave + note F_, 3 + note __, 3 + note F_, 4 + note __, 3 + note F_, 4 + note __, 3 + note C_, 13 + note D#, 14 + note F_, 13 + note F#, 14 + note F#, 7 + note F#, 6 + inc_octave + note F#, 2 + note __, 12 + note C#, 4 + note __, 3 + dec_octave + note F#, 3 + note __, 3 + note F#, 4 + note __, 3 + note F#, 4 + note __, 3 + note C#, 13 + note E_, 14 + note C#, 13 + note B_, 14 + note B_, 7 + note B_, 6 + inc_octave + note B_, 1 + note __, 13 + note F#, 4 + note __, 3 + dec_octave + note B_, 3 + note __, 3 + note B_, 4 + note __, 3 + inc_octave + note F#, 7 + note A_, 7 + inc_octave + note C_, 6 + note D#, 7 + note F#, 7 + note A_, 7 + inc_octave + note C_, 6 + octave 3 + note C_, 14 + note C_, 2 + note __, 5 + note C_, 6 + inc_octave + note G_, 7 + dec_octave + note G_, 4 + note __, 3 + note B_, 7 + note G_, 4 + note __, 2 + note C_, 3 + note __, 4 + inc_octave + note G_, 7 + dec_octave + note G_, 7 + note C_, 3 + note __, 3 + inc_octave + note C_, 14 + dec_octave + note G_, 13 + note C_, 14 + note C_, 2 + note __, 5 + note C_, 6 + inc_octave + note G_, 7 + dec_octave + note G_, 4 + note __, 3 + note B_, 7 + note G_, 4 + note __, 2 + note C_, 3 + note __, 4 + inc_octave + note G_, 7 + dec_octave + note G_, 7 + note C_, 3 + note __, 3 + inc_octave + note C_, 14 + dec_octave + note G_, 13 + note C_, 14 + note C_, 2 + note __, 5 + note C_, 6 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + dec_octave + note A_, 4 + note __, 2 + note C_, 3 + note __, 4 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 7 + note C_, 3 + note __, 3 + note B_, 14 + note A_, 13 + note C_, 14 + note C_, 2 + note __, 5 + note C_, 6 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + dec_octave + note A_, 4 + note __, 2 + note C_, 3 + note __, 4 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 7 + note C_, 3 + note __, 3 + note G_, 14 + note A_, 13 + note C_, 14 + note C_, 2 + note __, 5 + note C_, 6 + inc_octave + note G_, 7 + dec_octave + note G_, 4 + note __, 3 + note B_, 7 + note G_, 4 + note __, 2 + note C_, 3 + note __, 4 + inc_octave + note G_, 7 + dec_octave + note G_, 7 + note C_, 3 + note __, 3 + inc_octave + note C_, 14 + dec_octave + note G_, 13 + note C_, 14 + note C_, 2 + note __, 5 + note C_, 6 + inc_octave + note G_, 7 + dec_octave + note G_, 4 + note __, 3 + note B_, 6 + note G_, 4 + note __, 2 + note C_, 3 + note __, 4 + inc_octave + note G_, 7 + dec_octave + note G_, 7 + note C_, 3 + note __, 3 + inc_octave + note C_, 14 + dec_octave + note G_, 13 + note C_, 14 + note C_, 2 + note __, 5 + note C_, 6 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + dec_octave + note A_, 4 + note __, 2 + note C_, 3 + note __, 4 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 7 + note C_, 3 + note __, 3 + note B_, 14 + note A_, 13 + note C_, 14 + note C_, 2 + note __, 5 + note C_, 6 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + dec_octave + note A_, 4 + note __, 2 + note C_, 3 + note __, 4 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 7 + note C_, 3 + note __, 3 + note G_, 14 + note A_, 13 + note D_, 14 + note D_, 2 + note __, 5 + note D_, 6 + inc_octave + note A_, 7 + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + dec_octave + note A_, 4 + note __, 2 + note D_, 3 + note __, 4 + inc_octave + note A_, 7 + dec_octave + note A_, 7 + note F_, 3 + note __, 3 + note C_, 14 + note C#, 13 + note D_, 14 + note D_, 2 + note __, 5 + note D_, 6 + inc_octave + inc_octave + note C_, 7 + dec_octave + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + dec_octave + note A_, 4 + note __, 2 + note D_, 3 + note __, 4 + inc_octave + inc_octave + note C_, 7 + dec_octave + dec_octave + note A_, 7 + note F_, 3 + note __, 3 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 2 + note __, 5 + note D_, 6 + inc_octave + inc_octave + note C_, 7 + dec_octave + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + dec_octave + note A_, 4 + note __, 2 + note D_, 3 + note __, 4 + inc_octave + inc_octave + note C_, 7 + dec_octave + dec_octave + note A_, 7 + note F_, 3 + note __, 3 + note C_, 14 + note C#, 13 + note D_, 14 + note D_, 2 + note __, 5 + note D_, 6 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 4 + note __, 3 + inc_octave + note C_, 7 + dec_octave + note A_, 4 + note __, 2 + note D_, 3 + note __, 4 + inc_octave + inc_octave + note D_, 7 + dec_octave + dec_octave + note A_, 7 + note F_, 3 + note __, 3 + note D_, 14 + note D_, 13 + callchannel Branch_1f72b7 + note D_, 14 + note D_, 7 + note D_, 6 + note D_, 7 + inc_octave + note D_, 7 + note C_, 7 + note D_, 6 + dec_octave + note A_, 7 + note E_, 7 + note C_, 7 + note C#, 6 + note D_, 14 + note A_, 13 + inc_octave + note C_, 14 + note D_, 13 + callchannel Branch_1f72b7 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + note D_, 14 + note D_, 13 + loopchannel 0, .MainLoop + +Branch_1f72b7: + octave 3 + note E_, 7 + inc_octave + note E_, 7 + note D_, 7 + note E_, 6 + dec_octave + note B_, 7 + note D_, 7 + note E_, 7 + inc_octave + note E_, 6 + note D_, 7 + note E_, 7 + dec_octave + note B_, 7 + note E_, 6 + endchannel + + +Music_TCG2GRDuelTheme3_Ch4: + togglenoise $06 +.MainLoop + notetype 1 + octave 1 + note D#, 7 + note D#, 7 + note E_, 7 + note C#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note E_, 7 + note D#, 6 + note D#, 7 + note E_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note E_, 7 + note C#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note E_, 7 + note D#, 6 + note D#, 7 + note E_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note E_, 7 + note C#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note E_, 7 + note D#, 6 + note D#, 7 + note E_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note E_, 7 + note C#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note E_, 7 + note D#, 6 + note D#, 7 + note E_, 7 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 7 + note D#, 6 + note C_, 7 + note E_, 7 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 7 + note D#, 6 + note C_, 7 + note E_, 7 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 7 + note D#, 6 + note C_, 7 + note E_, 7 + note D#, 7 + note D#, 6 + note C_, 7 + note D#, 7 + note E_, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note C#, 7 + note E_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note C#, 7 + note E_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note C#, 7 + note E_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note C#, 7 + note E_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note C#, 7 + note E_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note C#, 7 + note E_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note C#, 7 + note E_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note D#, 7 + note C#, 7 + note E_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C_, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 3 + note C#, 3 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note D#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 3 + note C#, 3 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 3 + note C#, 3 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C_, 7 + note D#, 7 + note D#, 6 + note D#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note E_, 6 + note D#, 7 + note C#, 4 + note C#, 3 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note E_, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note E_, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note E_, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note C#, 7 + note E_, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note E_, 7 + note C#, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note C_, 7 + note D#, 6 + note C#, 7 + note C_, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note E_, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note D#, 7 + note C#, 3 + note C#, 3 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note E_, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note C#, 6 + note E_, 7 + note C_, 7 + note C#, 7 + note D#, 6 + note C_, 7 + note C#, 7 + note E_, 7 + note C_, 6 + note C_, 7 + note D#, 7 + note D#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note D#, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note E_, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C#, 7 + note C#, 6 + note C_, 7 + note C#, 7 + note E_, 7 + note C_, 6 + note C#, 7 + note D#, 7 + note C_, 7 + note C#, 6 + note E_, 7 + note C_, 7 + note C#, 7 + note D#, 6 + notetype 9 + note F_, 9 + notetype 1 + note C_, 7 + note C#, 7 + note C#, 7 + note C#, 6 + note C#, 7 + note C#, 7 + note C#, 7 + note C#, 6 + loopchannel 0, .MainLoop + diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm new file mode 100644 index 00000000..4974cd3e --- /dev/null +++ b/crysaudio/music/TCG2/groverworld.asm @@ -0,0 +1,1518 @@ +Music_TCG2GROverworld: + db $C0 + dw Music_TCG2GROverworld_Ch1 + db $01 + dw Music_TCG2GROverworld_Ch2 + db $02 + dw Music_TCG2GROverworld_Ch3 + db $03 + dw Music_TCG2GROverworld_Ch4 + +Music_TCG2GROverworld_Ch2: + notetype1 10 +.MainLoop + callchannel Branch_1eae1e + note A#, 16 + note A#, 9 + note A#, 8 + inc_octave + note D_, 16 + note D_, 9 + note D_, 8 + note C_, 16 + note C_, 6 + dec_octave + note A_, 16 + note A_, 6 + note F_, 16 + note F_, 6 + notetype0 11 + note G_, 12 + notetype0 1 + octave 2 + note B_, 9 + note B_, 16 + note __, 8 + note __, 9 + note __, 8 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 11 + note B_, 10 + note B_, 6 + note __, 16 + note __, 1 + callchannel Branch_1eae1e + note A#, 16 + note A#, 9 + note A#, 8 + inc_octave + note D_, 16 + note D_, 9 + note D_, 8 + note C_, 16 + note C_, 6 + dec_octave + note G_, 16 + note G_, 6 + inc_octave + note C_, 16 + note C_, 6 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 12 + note D_, 8 + note D_, 16 + octave 3 + note D_, 4 + note D_, 4 + note F_, 5 + note F_, 3 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 3 + note G_, 16 + note A_, 7 + note G_, 8 + note A_, 8 + note __, 2 + note A#, 5 + note A#, 3 + note A_, 8 + note A_, 1 + note A#, 7 + note A#, 1 + note A_, 5 + note A#, 3 + note F_, 5 + note A_, 3 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 3 + note D_, 16 + note C_, 7 + note D_, 8 + note C_, 8 + note __, 2 + dec_octave + note A#, 5 + note A#, 3 + inc_octave + note C_, 7 + dec_octave + note A#, 8 + inc_octave + note C_, 8 + note __, 2 + note F_, 5 + note F_, 3 + note F_, 16 + note F_, 16 + note F_, 16 + note D#, 8 + note D#, 8 + dec_octave + note A#, 9 + note A#, 8 + inc_octave + note D#, 8 + note D#, 8 + note D_, 8 + note D_, 1 + note D#, 7 + note D#, 1 + note D_, 5 + note D#, 3 + note C_, 5 + note D_, 3 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 3 + note D_, 16 + note D#, 16 + note D#, 1 + note F_, 15 + note F_, 1 + note G_, 7 + note F_, 8 + note G_, 8 + inc_octave + note __, 2 + note D_, 5 + note D_, 3 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 3 + note D_, 16 + note C_, 9 + note D_, 8 + note D_, 8 + note C_, 8 + note F_, 6 + note D_, 5 + note C_, 11 + note D_, 11 + dec_octave + note A_, 16 + note A_, 16 + note A_, 16 + note A_, 16 + note A_, 2 + note A_, 16 + note G_, 5 + note A_, 3 + note F_, 5 + note G_, 3 + note G_, 16 + note G_, 16 + note G_, 2 + note G_, 16 + note D_, 8 + note D_, 8 + note G_, 16 + note G_, 6 + note A_, 16 + note A_, 6 + note A#, 16 + note A#, 6 + notetype0 11 + note A#, 6 + note A_, 6 + note G_, 6 + notetype0 1 + notetype0 11 + note F_, 3 + notetype0 1 + note F_, 1 + note F_, 16 + loopchannel 0, .MainLoop + +Branch_1eae1e: + octave 3 + notetype0 1 + vibrato 33, $33 + octave 3 + note D_, 5 + note D_, 3 + note E_, 5 + note E_, 3 + note F_, 16 + note F_, 16 + note F_, 16 + note F_, 16 + note F_, 16 + note F_, 3 + note F_, 16 + note E_, 5 + note E_, 4 + note D_, 5 + note E_, 3 + note C_, 5 + note D_, 3 + note E_, 5 + note D_, 3 + note D_, 7 + note E_, 8 + note D_, 8 + note __, 2 + dec_octave + note G_, 5 + note G_, 3 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 3 + note G_, 16 + note G_, 5 + note G_, 3 + note G_, 5 + note G_, 3 + note F_, 16 + note F_, 9 + note F_, 8 + note A_, 16 + note A_, 9 + note A_, 8 + inc_octave + note C_, 16 + note C_, 9 + note C_, 8 + note E_, 16 + note E_, 9 + note E_, 8 + note D_, 7 + note D_, 8 + note __, 8 + note __, 2 + dec_octave + note G_, 5 + inc_octave + note D_, 3 + dec_octave + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 3 + note G_, 16 + inc_octave + note D_, 5 + note D_, 3 + note E_, 5 + note D_, 3 + note F_, 16 + note F_, 16 + note F_, 16 + note F_, 16 + note F_, 16 + note F_, 3 + note F_, 16 + note E_, 5 + note E_, 4 + note D_, 5 + note E_, 3 + note C_, 5 + note D_, 3 + note E_, 5 + note D_, 3 + note D_, 7 + note E_, 8 + note D_, 8 + note __, 2 + dec_octave + note G_, 5 + note G_, 3 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 16 + note G_, 3 + note G_, 5 + note G_, 3 + note A_, 5 + note G_, 3 + endchannel + + +Music_TCG2GROverworld_Ch1: + notetype1 10 + notetype0 1 + note __, 16 +.MainLoop + notetype0 1 + octave 3 + note C_, 9 + note C_, 16 + note __, 8 + note __, 9 + note __, 8 + note C_, 6 + note C_, 2 + note C_, 6 + note C_, 2 + note C_, 6 + note C_, 11 + note C_, 10 + note C_, 6 + note __, 16 + note __, 1 + note __, 16 + dec_octave + note B_, 9 + note B_, 16 + note __, 8 + note __, 9 + note __, 8 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 11 + note B_, 10 + note B_, 6 + note __, 16 + note __, 1 + note __, 16 + note A_, 9 + note A_, 16 + note __, 8 + note __, 9 + note __, 8 + note F_, 6 + note F_, 2 + note F_, 6 + note F_, 2 + note A_, 6 + note A_, 11 + note A_, 10 + note A_, 6 + note __, 16 + note __, 1 + note __, 16 + note B_, 9 + note B_, 16 + note __, 8 + note __, 9 + note __, 8 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 11 + note B_, 10 + note B_, 6 + note __, 16 + note __, 1 + note __, 16 + inc_octave + note C_, 9 + note C_, 16 + note __, 8 + note __, 9 + note __, 8 + note C_, 6 + note C_, 2 + note C_, 6 + note C_, 2 + note C_, 6 + note C_, 11 + note C_, 10 + note C_, 6 + note __, 16 + note __, 1 + note __, 16 + dec_octave + note B_, 9 + note B_, 16 + note __, 8 + note __, 9 + note __, 8 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 11 + note B_, 10 + note B_, 6 + note __, 16 + note __, 1 + note __, 16 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 6 + note G_, 2 + note G_, 6 + note G_, 2 + note A_, 6 + note A_, 11 + note F_, 10 + note F_, 6 + note __, 16 + note __, 1 + note __, 16 + inc_octave + note C_, 9 + note C_, 16 + note __, 8 + note __, 9 + note __, 8 + note C_, 6 + note C_, 2 + note C_, 6 + note C_, 2 + note C_, 6 + note C_, 11 + note C_, 10 + note C_, 6 + note __, 16 + note __, 1 + note __, 16 + dec_octave + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 6 + note G_, 2 + note G_, 6 + note G_, 2 + note G_, 6 + note G_, 11 + note G_, 10 + note G_, 6 + note __, 16 + note __, 1 + octave 2 + notetype2 8 + note B_, 5 + note B_, 3 + inc_octave + note C_, 5 + note C_, 3 + notetype0 1 + octave 3 + note C_, 8 + note C_, 1 + octave 5 + note C_, 4 + note C_, 4 + note F_, 4 + note C_, 4 + note C_, 4 + note F_, 4 + inc_octave + note C_, 5 + dec_octave + note C_, 4 + note C_, 4 + inc_octave + note C_, 4 + octave 3 + note C_, 6 + note C_, 2 + note C_, 6 + note C_, 2 + note C_, 8 + note C_, 1 + octave 5 + note C_, 4 + note C_, 4 + octave 3 + note C_, 7 + note C_, 1 + octave 5 + note C_, 4 + note C_, 4 + inc_octave + note C_, 4 + dec_octave + note C_, 5 + note C_, 4 + inc_octave + note C_, 4 + octave 2 + notetype2 8 + note A_, 5 + note A_, 3 + inc_octave + note C_, 5 + note C_, 3 + notetype0 1 + octave 2 + note B_, 8 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note D_, 4 + note G_, 4 + note B_, 5 + note D_, 4 + note D_, 4 + note B_, 4 + octave 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 8 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + octave 2 + note B_, 7 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + note B_, 4 + note D_, 5 + note D_, 4 + note B_, 4 + octave 2 + notetype2 8 + note B_, 5 + note B_, 3 + inc_octave + note D_, 5 + note D_, 3 + notetype0 1 + octave 3 + note C_, 8 + note C_, 1 + octave 5 + note C_, 4 + note C_, 4 + note F_, 4 + note C_, 4 + note C_, 4 + note F_, 4 + inc_octave + note C_, 5 + dec_octave + note C_, 4 + note C_, 4 + inc_octave + note C_, 4 + octave 2 + note F_, 6 + note F_, 2 + note F_, 6 + note F_, 2 + note A_, 8 + note A_, 1 + octave 5 + note C_, 4 + note C_, 4 + octave 2 + note A_, 7 + note A_, 1 + octave 5 + note C_, 4 + note C_, 4 + inc_octave + note C_, 4 + dec_octave + note C_, 5 + note C_, 4 + inc_octave + note C_, 4 + octave 3 + notetype2 8 + note C_, 8 + note C_, 8 + notetype0 1 + octave 2 + note B_, 8 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note D_, 4 + note G_, 4 + note B_, 5 + note D_, 4 + note D_, 4 + note D_, 4 + octave 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 8 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + octave 2 + note B_, 7 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + note B_, 4 + note D_, 5 + note D_, 4 + note B_, 4 + octave 2 + notetype2 8 + note B_, 5 + note B_, 3 + inc_octave + note C_, 5 + note C_, 3 + notetype0 1 + octave 3 + note C_, 8 + note C_, 1 + octave 5 + note C_, 4 + note C_, 4 + note F_, 4 + note C_, 4 + note C_, 4 + note F_, 4 + inc_octave + note C_, 5 + dec_octave + note C_, 4 + note C_, 4 + inc_octave + note C_, 4 + octave 3 + note C_, 6 + note C_, 2 + note C_, 6 + note C_, 2 + note C_, 8 + note C_, 1 + octave 5 + note C_, 4 + note C_, 4 + octave 3 + note C_, 7 + note C_, 1 + octave 5 + note C_, 4 + note C_, 4 + inc_octave + note C_, 4 + dec_octave + note C_, 5 + note C_, 4 + inc_octave + note C_, 4 + octave 2 + notetype2 8 + note A_, 5 + note A_, 3 + inc_octave + note C_, 5 + note C_, 3 + notetype0 1 + octave 2 + note B_, 8 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note D_, 4 + note G_, 4 + note B_, 5 + note D_, 4 + note D_, 4 + note B_, 4 + octave 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 8 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + octave 2 + note B_, 7 + note B_, 1 + octave 5 + note D_, 4 + note D_, 4 + note B_, 4 + note D_, 5 + note D_, 4 + note B_, 4 + octave 2 + notetype2 8 + note B_, 5 + note B_, 3 + inc_octave + note C_, 5 + note C_, 3 + note D_, 16 + note D_, 9 + note D_, 8 + note F_, 16 + note F_, 9 + note F_, 8 + note E_, 16 + note E_, 6 + note C_, 16 + note C_, 6 + note E_, 16 + note E_, 6 + notetype0 11 + note G_, 6 + note F#, 3 + notetype0 1 + octave 2 + note D_, 6 + note D#, 6 + note F_, 5 + note G_, 6 + note A_, 5 + note A#, 5 + notetype0 1 + octave 3 + note D_, 8 + note D_, 1 + octave 2 + note G_, 4 + note __, 4 + inc_octave + note D_, 4 + dec_octave + note G_, 4 + note G_, 4 + inc_octave + note D_, 4 + note G_, 5 + dec_octave + note G_, 4 + inc_octave + note D_, 4 + note G_, 4 + octave 3 + note D_, 6 + note D_, 2 + octave 3 + note G_, 4 + note __, 4 + inc_octave + note D_, 5 + dec_octave + note G_, 4 + note G_, 4 + inc_octave + note D_, 4 + octave 3 + note D_, 7 + note D_, 1 + octave 3 + note D_, 4 + note __, 4 + note G_, 5 + note D_, 4 + dec_octave + note A#, 4 + inc_octave + note G_, 4 + note D_, 4 + dec_octave + note A#, 4 + note G_, 4 + inc_octave + note D_, 4 + notetype0 1 + octave 3 + note F_, 8 + note F_, 1 + octave 3 + note D_, 4 + note __, 4 + note A_, 4 + note D_, 4 + note D_, 4 + note A_, 4 + inc_octave + note D_, 5 + dec_octave + note D_, 4 + note A_, 4 + inc_octave + note D_, 4 + octave 3 + note D_, 6 + note D_, 2 + octave 4 + note D_, 4 + note __, 4 + note A_, 5 + note D_, 4 + note D_, 4 + note A_, 4 + octave 2 + note A_, 7 + note A_, 1 + octave 3 + note A_, 4 + note __, 4 + inc_octave + note D_, 5 + dec_octave + note A_, 4 + note F_, 4 + inc_octave + note D_, 4 + dec_octave + note A_, 4 + note F_, 4 + note D_, 4 + note A_, 4 + notetype0 1 + octave 2 + note G#, 8 + note G#, 1 + octave 2 + note F_, 4 + note __, 4 + inc_octave + note C_, 4 + dec_octave + note F_, 4 + note F_, 4 + inc_octave + note C_, 4 + note F_, 5 + dec_octave + note F_, 4 + inc_octave + note C_, 4 + note F_, 4 + octave 3 + note C_, 6 + note C_, 2 + octave 3 + note F_, 4 + note __, 4 + inc_octave + note C_, 5 + dec_octave + note F_, 4 + note F_, 4 + inc_octave + note C_, 4 + octave 3 + note F_, 7 + note F_, 1 + octave 3 + note C_, 4 + note __, 4 + note F_, 5 + note C_, 4 + dec_octave + note G#, 4 + inc_octave + note F_, 4 + note C_, 4 + dec_octave + note G#, 4 + note F_, 4 + inc_octave + note C_, 4 + notetype0 1 + octave 2 + note A#, 8 + note A#, 1 + octave 2 + note A#, 4 + note __, 4 + inc_octave + note D_, 4 + dec_octave + note A#, 4 + note A#, 4 + inc_octave + note D_, 4 + note F_, 5 + dec_octave + note A#, 4 + inc_octave + note D_, 4 + note F_, 4 + octave 2 + note A#, 6 + note A#, 2 + octave 3 + note F_, 4 + note __, 4 + inc_octave + note D_, 5 + dec_octave + note F_, 4 + note F_, 4 + inc_octave + note D_, 4 + octave 2 + note A#, 7 + note A#, 1 + octave 3 + note D_, 4 + note __, 4 + note F_, 5 + note D_, 4 + dec_octave + note A#, 4 + inc_octave + note F_, 4 + note D_, 4 + dec_octave + note A#, 4 + note F_, 4 + inc_octave + note D_, 4 + notetype0 1 + octave 3 + note C_, 8 + note C_, 1 + octave 3 + note C_, 4 + note __, 4 + note G_, 4 + note C_, 4 + note C_, 4 + note G_, 4 + inc_octave + note C_, 5 + dec_octave + note C_, 4 + note G_, 4 + inc_octave + note C_, 4 + octave 3 + note G_, 6 + note G_, 2 + octave 4 + note C_, 4 + note __, 4 + note G_, 5 + note C_, 4 + note C_, 4 + note G_, 4 + octave 3 + note G_, 7 + note G_, 1 + octave 3 + note G_, 4 + note __, 4 + inc_octave + note C_, 5 + dec_octave + note G_, 4 + note D#, 4 + inc_octave + note C_, 4 + dec_octave + note G_, 4 + note D#, 4 + note C_, 4 + note G_, 4 + notetype0 1 + octave 4 + note C_, 8 + note C_, 1 + octave 3 + note C_, 4 + note __, 4 + note F_, 4 + note C_, 4 + note C_, 4 + note F_, 4 + note A_, 5 + note C_, 4 + note F_, 4 + note A_, 4 + octave 3 + note F_, 6 + note F_, 2 + octave 3 + note A_, 4 + note __, 4 + inc_octave + note F_, 5 + dec_octave + note A_, 4 + note A_, 4 + inc_octave + note F_, 4 + octave 3 + note C_, 7 + note C_, 1 + octave 3 + note F_, 4 + note __, 4 + note A_, 5 + note F_, 4 + note C_, 4 + note A_, 4 + note F_, 4 + note C_, 4 + dec_octave + note A_, 4 + inc_octave + note F_, 4 + notetype0 1 + octave 3 + note D#, 8 + note D#, 1 + octave 2 + note G_, 4 + note __, 4 + inc_octave + note D_, 4 + dec_octave + note G_, 4 + note G_, 4 + inc_octave + note D_, 4 + note G_, 5 + dec_octave + note G_, 4 + inc_octave + note D_, 4 + note G_, 4 + octave 2 + note A#, 6 + note A#, 2 + octave 3 + note G_, 4 + note __, 4 + inc_octave + note D_, 5 + dec_octave + note G_, 4 + note G_, 4 + inc_octave + note D_, 4 + octave 3 + note D#, 7 + note D#, 1 + octave 3 + note D_, 4 + note __, 4 + note G_, 5 + note D_, 4 + dec_octave + note A#, 4 + inc_octave + note G_, 4 + note D_, 4 + dec_octave + note A#, 4 + note G_, 4 + inc_octave + note D_, 4 + octave 3 + notetype0 11 + note F_, 12 + note D#, 6 + notetype0 11 + note C_, 3 + notetype0 1 + note C_, 1 + note C_, 16 + note __, 16 + loopchannel 0, .MainLoop + + +Music_TCG2GROverworld_Ch3: + notetype1 10 + notetype2 11 + notetype1 1 + notetype0 1 + note __, 16 +.MainLoop +.Loop1 + octave 2 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 8 + note G_, 8 + note G_, 6 + note G_, 11 + note G_, 16 + note __, 16 + note __, 1 + note __, 16 + loopchannel 3, .Loop1 + octave 2 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 8 + note G_, 8 + note G_, 6 + note G_, 11 + note G_, 16 + note __, 16 + note __, 1 + note D_, 8 + note D_, 8 +.Loop2 + octave 2 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 8 + note G_, 8 + note G_, 6 + note G_, 11 + note G_, 16 + note __, 16 + note __, 1 + note __, 16 + loopchannel 2, .Loop2 + octave 2 + note D#, 9 + note D#, 16 + note __, 8 + note __, 9 + note __, 8 + note D#, 8 + note D#, 8 + note F_, 6 + note F_, 11 + note F_, 16 + note __, 16 + note __, 1 + note F_, 8 + note F_, 8 + octave 2 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 8 + note G_, 8 + note G_, 6 + note G_, 11 + note G_, 8 + note G_, 8 + note __, 16 + note __, 1 + note __, 16 + octave 2 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 8 + note G_, 8 + note G_, 6 + note G_, 11 + note G_, 8 + note G_, 8 + note __, 16 + note __, 1 + note D_, 8 + note D_, 8 +.Loop3 + octave 2 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 8 + note G_, 8 + note G_, 6 + note G_, 11 + note G_, 16 + note __, 16 + note __, 1 + note __, 16 + loopchannel 3, .Loop3 + octave 2 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 8 + note G_, 8 + note G_, 6 + note G_, 11 + note G_, 16 + note __, 16 + note __, 1 + note D_, 8 + note D_, 8 +.Loop4 + octave 2 + note G_, 9 + note G_, 16 + note __, 8 + note __, 9 + note __, 8 + note G_, 8 + note G_, 8 + note G_, 6 + note G_, 11 + note G_, 16 + note __, 16 + note __, 1 + note __, 16 + loopchannel 2, .Loop4 + octave 2 + note A#, 9 + note A#, 16 + note __, 8 + note __, 9 + note __, 8 + note A#, 8 + note A#, 8 + inc_octave + note C_, 6 + note C_, 11 + note C_, 16 + note __, 16 + note __, 1 + note C_, 8 + note C_, 8 + notetype0 1 + note D_, 16 + note D_, 16 + note D_, 9 + note D_, 8 + note D_, 9 + dec_octave + note A_, 8 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 2 + octave 2 + note D#, 9 + note D#, 16 + note __, 8 + note __, 9 + note __, 8 + note D#, 5 + note D#, 11 + note __, 16 + note __, 1 + note D#, 5 + note D#, 11 + note D#, 16 + note D#, 1 + note A_, 8 + note A_, 8 + octave 2 + note A#, 9 + note A#, 16 + note __, 8 + note __, 9 + note __, 8 + note A#, 5 + note A#, 11 + note __, 16 + note __, 1 + note A#, 5 + note A#, 11 + note A#, 16 + note A#, 1 + note A#, 8 + note A#, 8 + octave 2 + note C#, 9 + note C#, 16 + note __, 8 + note __, 9 + note __, 8 + note C#, 5 + note C#, 11 + note __, 16 + note __, 1 + note C#, 5 + note C#, 11 + note C#, 16 + note C#, 1 + note C#, 8 + note C#, 8 + octave 2 + note C_, 9 + note C_, 16 + note __, 8 + note __, 9 + note __, 8 + note C_, 5 + note C_, 11 + note __, 9 + inc_octave + note G_, 8 + inc_octave + note C_, 8 + dec_octave + note G_, 8 + dec_octave + note A#, 9 + inc_octave + note F_, 8 + note A#, 8 + note F_, 8 + octave 2 + note G#, 9 + note G#, 16 + note __, 8 + note __, 9 + note __, 8 + note G#, 5 + note G#, 11 + note __, 16 + note __, 1 + note G#, 5 + note G#, 11 + note G#, 16 + note G#, 1 + note G#, 8 + note G#, 8 + octave 2 + note D_, 9 + note D_, 16 + note __, 8 + note __, 9 + note __, 8 + note D_, 5 + note D_, 11 + note __, 16 + note __, 1 + note D_, 5 + note D_, 11 + note D_, 16 + note D_, 1 + note D_, 8 + note D_, 8 + octave 2 + note D#, 9 + note D#, 16 + note __, 8 + note __, 9 + note __, 8 + note D#, 5 + note D#, 11 + note __, 16 + note __, 1 + note D#, 5 + note D#, 11 + note D#, 16 + note D#, 1 + note D#, 8 + note D#, 8 + vibrato 32, $33 + notetype0 11 + note F_, 3 + note F_, 3 + note F_, 3 + notetype0 1 + note F_, 16 + note A#, 4 + note B_, 4 + inc_octave + note C_, 9 + notetype0 11 + note F_, 3 + note F_, 3 + note F_, 3 + notetype0 1 + note F_, 16 + note __, 16 + note __, 1 + loopchannel 0, .MainLoop + endchannel + + +Music_TCG2GROverworld_Ch4: + togglenoise $06 + notetype 1 + note __, 16 +.MainLoop + octave 1 + notetype 1 +.Loop1 + note C#, 9 + note C#, 8 + note D_, 6 + note D_, 5 + note D_, 5 + note C#, 16 + note __, 1 + note C#, 16 + note D_, 6 + note D_, 6 + note D_, 5 + note C#, 16 + note C#, 16 + note __, 1 + note C#, 16 + loopchannel 16, .Loop1 + note C#, 9 + note C#, 8 + note D_, 6 + note D_, 5 + note D_, 5 + note C#, 16 + note __, 1 + note C#, 16 + note C#, 9 + note C#, 8 + note C#, 16 + note D_, 6 + note D_, 6 + note D_, 5 + note D_, 6 + note D_, 5 + note D_, 5 +.Loop2 + note C#, 9 + note C#, 8 + note D_, 6 + note D_, 5 + note D_, 5 + rept 2 + note C#, 16 + note __, 1 + note C#, 16 + endr + note C#, 16 + note __, 1 + note D_, 6 + note D_, 5 + note D_, 5 + loopchannel 7, .Loop2 + notetype 11 + note F_, 12 + note __, 12 + loopchannel 0, .MainLoop + notetype 4 + notetype2 8 + dutycycle 2 + notetype1 11 + octave 4 + note C_, 4 + endchannel + notetype 4 + notetype2 8 + dutycycle 2 + notetype1 11 + octave 3 + note D_, 4 + endchannel + notetype 4 + notetype2 11 + notetype1 2 + notetype2 8 + octave 1 + note C_, 4 + endchannel + notetype 4 + note F_, 4 + endchannel + diff --git a/crysaudio/music/TCG2/herecomesgr.asm b/crysaudio/music/TCG2/herecomesgr.asm new file mode 100644 index 00000000..c2c88b75 --- /dev/null +++ b/crysaudio/music/TCG2/herecomesgr.asm @@ -0,0 +1,1632 @@ +Music_TCG2HereComesGR: + db $C0 + dw Music_TCG2HereComesGR_Ch1 + db $01 + dw Music_TCG2HereComesGR_Ch2 + db $02 + dw Music_TCG2HereComesGR_Ch3 + db $03 + dw Music_TCG2HereComesGR_Ch4 + +Music_TCG2HereComesGR_Ch2: + notetype1 10 +.MainLoop + notetype0 1 + octave 2 + callchannel Branch_1ea5ed + note __, 10 + note __, 11 + note __, 10 + note __, 16 + note __, 16 + note __, 10 + note C_, 6 + note C#, 5 + note D_, 10 + note F_, 16 + note F_, 5 + callchannel Branch_1ea5ed + note __, 10 + note __, 11 + note __, 10 + note B_, 6 + inc_octave + note C_, 5 + note C#, 16 + note C#, 15 + note C_, 16 + note C_, 16 + dec_octave + note B_, 5 + note A#, 5 + octave 2 + callchannel Branch_1ea5ed + note __, 10 + note __, 11 + note __, 10 + note __, 16 + note __, 16 + note __, 10 + note C_, 6 + note C#, 5 + note D_, 10 + note F_, 16 + note F_, 5 + callchannel Branch_1ea5ed + note __, 10 + note __, 11 + note __, 10 + note G_, 11 + inc_octave + note G_, 5 + note G_, 5 + note C#, 11 + note C_, 5 + note C#, 5 + note C_, 10 + dec_octave + note A#, 10 + note F_, 11 + note G#, 10 + octave 2 + callchannel Branch_1ea5ed + octave 4 + notetype2 4 + note D_, 10 + note D_, 11 + note __, 10 + note __, 11 + note C_, 10 + octave 1 + notetype2 8 +.Loop1 + note G_, 3 + note __, 1 + note G_, 2 + note __, 1 + loopchannel 3, .Loop1 + inc_octave + note C#, 6 + note D_, 5 + note D_, 10 + note F_, 16 + note F_, 5 + octave 2 + callchannel Branch_1ea5ed + octave 4 + notetype2 4 + note D_, 10 + note D_, 11 + note __, 10 + octave 2 + notetype2 8 + note B_, 6 + inc_octave + note C_, 5 + note C#, 16 + note C#, 15 + note C_, 16 + note C_, 16 + dec_octave + note B_, 5 + note A#, 5 + octave 2 + callchannel Branch_1ea5ed + octave 4 + notetype2 4 + note D_, 10 + note D_, 11 + note __, 10 + note __, 11 + note C_, 10 + octave 1 + notetype2 8 +.Loop2 + note G_, 3 + note __, 1 + note G_, 2 + note __, 1 + loopchannel 3, .Loop2 + inc_octave + note C#, 6 + note D_, 5 + note D_, 10 + note F_, 16 + note F_, 5 + octave 2 + callchannel Branch_1ea5ed + notetype2 4 + notetype2 4 + octave 4 + note G_, 10 + note G_, 11 + notetype2 8 + octave 3 + note G_, 10 + note G_, 11 + note C_, 5 + note C#, 5 + note D_, 6 + note D_, 5 + note F_, 5 + note F_, 5 + note C_, 6 + note C#, 5 + note C_, 10 + callchannel Branch_1ea90c + callchannel Branch_1ea66f + octave 2 + callchannel Branch_1ea5ed + octave 4 + note D_, 4 + note D_, 6 + octave 2 + notetype2 8 + note D_, 11 + octave 3 + notetype2 8 + note C#, 10 + note D_, 6 + note D_, 5 + note F_, 5 + note F_, 5 + note C_, 4 + note C#, 3 + note C_, 4 + dec_octave + note A#, 5 + note A#, 5 + inc_octave + note C_, 11 + dec_octave + note A#, 3 + inc_octave + note C_, 3 + dec_octave + note A#, 4 + callchannel Branch_1ea90c + callchannel Branch_1ea66f + octave 2 + callchannel Branch_1ea5ed + octave 4 + notetype2 6 + note F_, 10 + note __, 11 + note G_, 10 + note __, 11 + notetype2 8 + octave 3 + note C#, 10 + note D_, 6 + note D_, 5 + note F_, 5 + note F_, 5 + note C_, 3 + note C#, 4 + note C_, 4 + dec_octave + note A#, 5 + note A#, 5 + callchannel Branch_1ea90c + callchannel Branch_1ea66f + octave 2 + callchannel Branch_1ea5ed + octave 4 + note D_, 4 + note D_, 6 + octave 2 + notetype2 8 + note D_, 11 + octave 3 + notetype2 8 + note C#, 10 + note D_, 6 + note D_, 5 + note F_, 5 + note D_, 5 + note C_, 4 + note C#, 3 + note C_, 4 + dec_octave + note A#, 5 + note A#, 5 + inc_octave + note C_, 11 + dec_octave + note A#, 3 + inc_octave + note C_, 3 + dec_octave + note A#, 4 + callchannel Branch_1ea90c + note C_, 11 + dec_octave + note B_, 2 + note B_, 2 + note A#, 1 + note A#, 1 + note A_, 1 + note A_, 1 + note G#, 1 + note G#, 1 + notetype2 8 + octave 2 + note A#, 16 + note A#, 5 + notetype2 8 + octave 1 + note A_, 3 + note B_, 3 + inc_octave + note C_, 3 + note E_, 3 + note G_, 3 + inc_octave + note C_, 2 + note F_, 2 + note A_, 2 + callchannel Branch_1ea603 + octave 3 + note C_, 8 + note C_, 3 + note C_, 10 + dec_octave + note A#, 11 + inc_octave + note C_, 10 + note C_, 11 + octave 4 + note C_, 4 + note C_, 6 + octave 1 + notetype2 8 + note G_, 5 + note __, 6 + note G_, 5 + note __, 5 + octave 3 + notetype2 4 + note __, 11 + note F_, 10 + note F_, 11 + notetype2 8 + note C_, 2 + note __, 1 + note C_, 1 + note __, 2 + note C_, 2 + note __, 1 + note C_, 1 + notetype2 8 + octave 2 + note B_, 6 + inc_octave + note C_, 5 + note C#, 16 + note C#, 5 + note C#, 10 + callchannel Branch_1ea603 + octave 3 + note C_, 11 + notetype2 8 + inc_octave + note F_, 4 + note F_, 6 + dec_octave + note C_, 5 + note C_, 6 + dec_octave + note B_, 10 + inc_octave + inc_octave + notetype2 8 + note E_, 4 + note E_, 7 + dec_octave + dec_octave + notetype2 8 + note B_, 5 + note B_, 5 + note A#, 11 + inc_octave + inc_octave + notetype2 8 + note D#, 4 + note D#, 6 + dec_octave + dec_octave + octave 2 + notetype2 8 + note A#, 5 + note A#, 6 + note G#, 10 + inc_octave + inc_octave + notetype2 8 + note C#, 4 + note C#, 7 + dec_octave + dec_octave + notetype2 8 + note G#, 5 + note G#, 5 + note F_, 16 + note F_, 5 + note F#, 16 + note F#, 5 + loopchannel 0, .MainLoop + +Branch_1ea5ed: + note G_, 8 + note G_, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note G_, 11 + endchannel + +Branch_1ea5f8: + note D_, 8 + note D_, 3 + note D_, 10 + note C_, 11 + note D_, 10 + note D_, 11 + endchannel + +Branch_1ea603: + octave 3 + note C_, 8 + note C_, 3 + note C_, 10 + dec_octave + note A#, 11 + inc_octave + note C_, 10 + note C_, 11 + octave 4 + notetype2 8 + note C_, 4 + note C_, 6 + octave 1 + notetype2 8 + note G_, 5 + note __, 6 + note G_, 5 + note __, 5 + octave 3 + notetype2 4 + note __, 11 + note F_, 10 + note F_, 11 + notetype2 8 + note C_, 2 + note __, 1 + note C_, 1 + note __, 2 + note C_, 2 + note __, 1 + note C_, 1 + octave 2 + note A#, 16 + note A#, 5 + note B_, 16 + note B_, 5 + endchannel + +Branch_1ea64e: + notetype2 8 + octave 3 + note G#, 16 + note G#, 16 + note G#, 10 + note G#, 2 + note __, 4 + note G#, 1 + note __, 4 + note G#, 2 + note __, 4 + note G#, 1 + note __, 3 + note G_, 16 + note G_, 5 + note G_, 11 + note F#, 5 + note F_, 5 + dec_octave + endchannel + +Branch_1ea66f: + notetype2 8 + octave 2 + note E_, 16 + note E_, 5 + note F_, 16 + note F_, 5 + note F#, 16 + note F#, 5 + endchannel + endchannel + + +Music_TCG2HereComesGR_Ch1: + notetype1 10 +.MainLoop + notetype0 1 + octave 2 + octave 2 + callchannel Branch_1ea5f8 + note __, 10 + note __, 11 + note __, 10 + note __, 16 + note __, 16 + note __, 10 + note __, 6 + note __, 5 + note __, 10 + note __, 16 + note __, 5 + callchannel Branch_1ea5f8 + note __, 10 + note __, 11 + note __, 10 + note F#, 6 + note G_, 5 + note G#, 16 + note G#, 15 + note G_, 16 + note G_, 16 + note F#, 5 + note F_, 5 + octave 2 + callchannel Branch_1ea5f8 + note __, 10 + note __, 11 + note __, 10 + note __, 16 + note __, 16 + note __, 10 + note __, 6 + note __, 5 + note __, 10 + note __, 16 + note __, 5 + callchannel Branch_1ea5f8 + note __, 10 + note __, 11 + note __, 10 + note G_, 11 + inc_octave + note C_, 5 + note __, 5 + dec_octave + note A#, 11 + note A_, 5 + note A#, 5 + note G#, 10 + note F_, 10 + note C_, 11 + note C#, 10 + octave 2 + callchannel Branch_1ea5f8 + octave 4 + notetype2 4 + note C_, 10 + note C_, 11 + note __, 10 + note __, 11 + dec_octave + notetype2 4 + note A#, 10 + octave 1 + notetype2 8 +.Loop1 + note D_, 2 + note __, 1 + note D_, 2 + note __, 2 + loopchannel 3, .Loop1 + note __, 11 + note __, 10 + note __, 11 + note __, 10 + octave 2 + callchannel Branch_1ea5f8 + octave 4 + notetype2 4 + note C_, 10 + note C_, 11 + note __, 10 + octave 2 + notetype2 8 + note F#, 6 + note G_, 5 + note G#, 16 + note G#, 15 + note G_, 16 + note G_, 16 + note F#, 5 + note F_, 5 + octave 2 + callchannel Branch_1ea5f8 + octave 4 + notetype2 4 + note C_, 10 + note C_, 11 + note __, 10 + note __, 11 + dec_octave + note A#, 10 + octave 1 + notetype2 8 +.Loop2 + note D_, 2 + note __, 1 + note D_, 2 + note __, 2 + loopchannel 3, .Loop2 + note __, 11 + note __, 10 + note __, 11 + note __, 10 + octave 2 + callchannel Branch_1ea5f8 + octave 4 + notetype2 4 + note C_, 10 + note C_, 11 + octave 3 + notetype2 8 + note C_, 10 + dec_octave + note __, 11 + note G_, 5 + note G#, 5 + note A_, 6 + note A_, 5 + inc_octave + note C_, 5 + note C_, 5 + dec_octave + note G_, 6 + note G#, 5 + note G_, 10 + notetype2 8 + octave 2 + note A#, 11 + note G_, 10 + callchannel Branch_1ea64e + note __, 11 + note __, 10 + note __, 11 + note __, 10 + note __, 11 + note __, 10 + note __, 16 + note __, 5 + note __, 16 + note __, 5 + octave 4 + note __, 11 + notetype2 4 + note C_, 10 + note __, 11 + dec_octave + octave 2 + notetype2 8 + note F_, 10 + callchannel Branch_1ea5ed + note __, 10 + octave 2 + notetype2 8 + note G_, 16 + note G_, 5 + callchannel Branch_1ea64e + note __, 16 + note __, 5 + note __, 16 + note __, 5 + note __, 16 + note __, 5 + note __, 16 + note __, 5 + note __, 16 + note __, 5 + note __, 11 + notetype2 6 + octave 3 + note A#, 10 + note __, 11 + inc_octave + note C_, 10 + note __, 11 + notetype2 8 + octave 2 + note G_, 10 + note F_, 11 + note G_, 10 + note G_, 11 + note D_, 10 + octave 2 + notetype2 8 + note G_, 11 + note G_, 10 + callchannel Branch_1ea64e + note __, 16 + note __, 5 + note __, 16 + note __, 5 + note __, 16 + note __, 5 + note __, 16 + note __, 5 + note __, 16 + note __, 5 + octave 4 + note __, 11 + notetype2 4 + note C_, 10 + note __, 11 + dec_octave + octave 2 + notetype2 8 + note F_, 10 + note G_, 8 + note G_, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note G_, 11 + note __, 10 + octave 2 + notetype2 8 + note G_, 16 + note G_, 5 + octave 3 + note G#, 16 + note G#, 16 + note G#, 10 + note G#, 2 + note __, 4 + note G#, 1 + note __, 4 + note G#, 2 + note __, 4 + note G#, 1 + note __, 3 + note G_, 16 + note G_, 5 + note G_, 16 + note G_, 5 + dec_octave + note F_, 6 + note F#, 5 + note G_, 10 + octave 3 + note G_, 3 + note G_, 3 + inc_octave + note C_, 3 + dec_octave + note G_, 2 + note F_, 3 + inc_octave + note C_, 2 + dec_octave + note A#, 3 + note F_, 2 + inc_octave + note D#, 3 + dec_octave + note A#, 3 + inc_octave + note G#, 3 + note D#, 2 + inc_octave + note C#, 3 + dec_octave + note G#, 2 + inc_octave + note F#, 3 + note C#, 2 + callchannel Branch_1ea8d3 + octave 2 + callchannel Branch_1ea5ed + notetype2 4 + octave 3 + note A#, 10 + note A#, 11 + octave 1 + notetype2 8 + note __, 10 + octave 2 + notetype2 4 + note __, 11 + note A#, 10 + note A#, 11 + notetype2 8 + note C_, 2 + note __, 1 + note C_, 2 + note __, 1 + note C_, 2 + note __, 1 + note C_, 1 + notetype2 8 + octave 2 + note F#, 6 + note G_, 5 + note G#, 16 + note G#, 5 + note G#, 10 + callchannel Branch_1ea8d3 + octave 2 + note G_, 11 + notetype2 8 + inc_octave + inc_octave + note C_, 4 + note C_, 6 + dec_octave + dec_octave + note G_, 5 + note G_, 6 + note F#, 10 + inc_octave + notetype2 8 + note B_, 4 + note B_, 7 + dec_octave + notetype2 8 + note F#, 5 + note F#, 5 + note F_, 11 + inc_octave + notetype2 8 + note A#, 4 + note A#, 6 + dec_octave + octave 2 + notetype2 8 + note F_, 5 + note F_, 6 + note D#, 10 + inc_octave + notetype2 8 + note G#, 4 + note G#, 7 + dec_octave + notetype2 8 + note D#, 5 + note D#, 5 + note C_, 16 + note C_, 5 + note C#, 16 + note C#, 5 + loopchannel 0, .MainLoop + +Branch_1ea8d3: + octave 2 + note G_, 8 + note G_, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note G_, 11 + octave 3 + notetype2 4 + note A#, 10 + note A#, 11 + note __, 10 + octave 2 + notetype2 4 + note __, 11 + note A#, 10 + note __, 11 + notetype2 8 + note G_, 2 + note __, 1 + note G_, 2 + note __, 1 + note G_, 2 + note __, 1 + note G_, 1 + octave 2 + note F_, 16 + note F_, 5 + note F#, 16 + note F#, 5 + endchannel + +Branch_1ea90c: + vibrato 11, $33 + octave 1 + note A_, 4 + note B_, 3 + inc_octave + note D_, 3 + note G_, 3 + note B_, 2 + inc_octave + note D_, 2 + note F_, 2 + note G_, 2 + note A#, 10 + note A#, 16 + note A#, 16 + dec_octave + note C_, 4 + note D_, 3 + note F_, 2 + note A_, 2 + note B_, 2 + inc_octave + note D_, 2 + note F_, 2 + note A_, 2 + note B_, 2 + inc_octave + note C_, 11 + note C_, 10 + note C_, 11 + note C_, 10 + endchannel + + +Music_TCG2HereComesGR_Ch3: + notetype1 10 + notetype0 1 + notetype2 11 + notetype1 1 +.MainLoop + octave 5 + octave 2 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note __, 16 + note __, 16 + note __, 10 + note __, 16 + note __, 16 + note __, 10 + note C_, 5 + note C#, 6 + note D_, 10 + note F_, 16 + note F_, 5 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note __, 16 + note __, 16 + note __, 10 + note G#, 6 + note A_, 5 + note A#, 16 + note A#, 15 + note A_, 16 + note A_, 16 + note A_, 10 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note __, 16 + note __, 16 + note __, 10 + note __, 16 + note __, 16 + note __, 10 + note C_, 5 + note C#, 6 + note D_, 10 + note F_, 16 + note F_, 5 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note __, 16 + note __, 15 + inc_octave + note C#, 10 + note D_, 11 + inc_octave + notetype1 2 + note C_, 10 + notetype1 1 + dec_octave + note C#, 11 + note C_, 10 + dec_octave + note A#, 11 + inc_octave + note C_, 10 + dec_octave + note F_, 11 + note G#, 10 + notetype1 1 + octave 2 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note __, 11 + octave 5 + note G_, 10 + notetype1 3 + note G_, 11 + octave 2 + notetype1 2 + note F_, 10 + note G_, 11 + octave 5 + note F_, 10 + octave 2 + notetype1 1 + note __, 10 + note __, 11 + note C_, 5 + note C#, 6 + note D_, 10 + note F_, 16 + note F_, 5 + notetype1 1 + octave 2 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note __, 11 + octave 5 + note G_, 10 + notetype1 3 + note G_, 11 + notetype1 1 + octave 2 + note __, 10 + note G#, 6 + note A_, 5 + note A#, 16 + note A#, 15 + note A_, 16 + note A_, 16 + note A_, 10 + notetype1 1 + octave 2 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note __, 11 + octave 5 + note G_, 10 + notetype1 3 + note G_, 11 + octave 2 + notetype1 2 + note F_, 10 + note G_, 11 + octave 5 + note F_, 10 + notetype1 1 + octave 2 + note __, 10 + note __, 11 + note C_, 5 + note C#, 6 + note D_, 10 + note F_, 16 + note F_, 5 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 8 + note __, 2 + note G_, 5 + note __, 6 + inc_octave + note F_, 10 + note __, 11 + note G_, 10 + octave 3 + note __, 11 + note C#, 10 + note D_, 11 + note F_, 10 + dec_octave + note A#, 11 + note F_, 10 + note G_, 11 + note A_, 10 + callchannel Branch_1eaaf6 + note __, 11 + octave 2 + note G_, 5 + note __, 5 + note E_, 16 + note E_, 5 + note F_, 16 + note F_, 5 + note F#, 16 + note F#, 5 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 8 + note __, 13 + inc_octave + note F_, 8 + note __, 13 + note G_, 8 + note __, 2 + note __, 16 + note __, 16 + note __, 16 + note __, 5 + dec_octave + note D_, 10 + note F_, 11 + note G_, 10 + callchannel Branch_1eaaf6 + note __, 11 + octave 2 + note G#, 5 + note A_, 5 + inc_octave + note C_, 11 + note D_, 5 + note __, 5 + note F#, 6 + note G_, 5 + note A#, 10 + inc_octave + note C_, 6 + note C_, 5 + dec_octave + note B_, 5 + note A#, 5 + octave 2 + note D_, 16 + note D_, 16 + inc_octave + note D_, 8 + note __, 2 + note __, 11 + inc_octave + inc_octave + note F_, 10 + notetype1 3 + note F_, 11 + dec_octave + dec_octave + notetype1 2 + dec_octave + note C_, 10 + note D_, 8 + note __, 13 + inc_octave + note G_, 3 + note __, 8 + dec_octave + note G_, 3 + note __, 7 + notetype1 1 + note C_, 16 + note C_, 5 + note C#, 16 + note C#, 5 + octave 2 + note D_, 16 + note D_, 16 + inc_octave + note D_, 8 + note __, 2 + note __, 11 + inc_octave + inc_octave + note F_, 10 + notetype1 3 + note F_, 11 + dec_octave + dec_octave + notetype1 2 + dec_octave + note C_, 10 + note D_, 8 + note __, 13 + inc_octave + note G_, 3 + note __, 8 + dec_octave + note G_, 3 + note __, 7 + notetype1 1 + note C#, 6 + note D_, 5 + note D#, 16 + note D#, 15 + octave 2 + note D_, 16 + note D_, 16 + inc_octave + note D_, 8 + note __, 2 + note __, 11 + inc_octave + inc_octave + note F_, 10 + notetype1 3 + note F_, 11 + dec_octave + dec_octave + notetype1 2 + dec_octave + note C_, 10 + note D_, 8 + note __, 13 + inc_octave + note G_, 3 + note __, 8 + dec_octave + note G_, 3 + note __, 7 + notetype1 1 + note C_, 16 + note C_, 5 + note C#, 16 + note C#, 5 + note D_, 16 + note D_, 5 + note D_, 2 + note __, 9 + note C#, 16 + note C#, 5 + note C#, 2 + note __, 8 + note C_, 16 + note C_, 5 + note __, 11 + note G#, 2 + note A_, 3 + note A#, 16 + note A#, 10 + note F_, 16 + note F_, 5 + note F#, 16 + note F#, 5 + loopchannel 0, .MainLoop + +Branch_1eaaf6: + vibrato 11, $33 + octave 2 + note A#, 11 + note A#, 7 + note __, 3 + note A#, 2 + note __, 9 + inc_octave + note A#, 5 + note __, 5 + dec_octave + note A#, 5 + note __, 6 + note G#, 5 + note __, 5 + note G#, 6 + note A_, 5 + note A_, 10 + note __, 11 + inc_octave + note A_, 5 + note __, 5 + dec_octave + note A_, 11 + note E_, 10 + note F_, 16 + note F_, 5 + note F#, 16 + note F#, 5 + notetype1 1 + octave 2 + note G_, 8 + note __, 3 + note G_, 10 + note F_, 11 + note G_, 10 + note __, 11 + octave 5 + note G_, 10 + notetype1 3 + note G_, 11 + octave 2 + notetype1 1 + note __, 10 + note __, 16 + note __, 16 + note __, 16 + note __, 5 + note D_, 10 + note F_, 11 + note G_, 10 + note A#, 11 + note A#, 7 + note __, 3 + note A#, 2 + note __, 9 + inc_octave + note A#, 5 + note __, 5 + dec_octave + note A#, 5 + note __, 6 + note B_, 5 + note __, 5 + note A#, 6 + note B_, 5 + inc_octave + note C_, 10 + endchannel + + +Music_TCG2HereComesGR_Ch4: + togglenoise $06 +.MainLoop + notetype 1 + octave 1 + callchannel Branch_1eacf7 + callchannel Branch_1ead02 + callchannel Branch_1eacf7 + note D#, 11 + note C#, 10 + note E_, 11 + note C_, 10 + note C#, 11 + note C#, 10 + note D#, 11 + note C#, 3 + note C#, 3 + note C#, 4 + callchannel Branch_1eacf7 + note D#, 11 + note C_, 10 + note E_, 7 + note C_, 7 + note C_, 7 + note C#, 16 + note __, 5 + note D#, 11 + note C#, 10 + callchannel Branch_1eacf7 + note C_, 11 + note C#, 10 + note E_, 11 + note C#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 11 + note C#, 10 + callchannel Branch_1eacf7 + note D#, 11 + note C_, 10 + note E_, 7 + note C_, 4 + note C_, 4 + note C_, 3 + note C_, 3 + note C#, 11 + note C_, 10 + note D#, 11 + note C_, 4 + note C#, 3 + note C#, 3 + note C_, 16 + note __, 5 + note D#, 11 + note C_, 10 + note C#, 16 + note __, 5 + note D#, 11 + note C_, 5 + note C_, 5 + note D#, 11 + note C#, 10 + note E_, 11 + note C#, 4 + note C#, 3 + note C#, 3 + note C#, 11 + note C#, 10 + note D#, 11 + note C#, 5 + note C#, 5 + callchannel Branch_1eacf7 + note D#, 11 + note C_, 10 + note E_, 7 + note C_, 4 + note C_, 4 + note C_, 3 + note C_, 3 + note C#, 11 + note C_, 10 + note D#, 11 + note C_, 4 + note C#, 3 + note C#, 3 + note C_, 11 + note C_, 10 + note D#, 11 + note C_, 5 + note C_, 5 + note C#, 11 + note C_, 10 + note D#, 11 + note C_, 10 + note D#, 11 + note C#, 10 + note E_, 11 + note C#, 5 + note C#, 5 + note C#, 11 + note D#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 11 + note D#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C#, 11 + note C_, 10 + note E_, 16 + note __, 5 + note D#, 11 + note C#, 10 + note E_, 11 + note C#, 10 + note C#, 11 + note D#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 11 + note C_, 10 + note D#, 11 + note C_, 10 + note C#, 11 + note E_, 10 + note C_, 11 + note C#, 4 + note C#, 3 + note C#, 3 + note C_, 11 + note C#, 10 + note E_, 11 + note C#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 11 + note C#, 4 + note C#, 3 + note C#, 3 + note C_, 11 + note D#, 10 + note E_, 11 + note C_, 5 + note C#, 5 + note C#, 11 + note C_, 10 + note C#, 16 + note __, 5 + note D#, 11 + note C#, 10 + note E_, 11 + note C_, 10 + note C#, 11 + note D#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 16 + note __, 5 + note D#, 11 + note C_, 10 + note C#, 11 + note C_, 10 + note __, 11 + note C_, 10 + note __, 11 + note C#, 10 + note E_, 11 + note C_, 10 + note C#, 11 + note D#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 11 + note D#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C#, 11 + note C_, 10 + note E_, 16 + note __, 5 + note D#, 11 + note C#, 10 + note E_, 11 + note C#, 10 + note C#, 11 + note D#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 11 + note C_, 10 + note D#, 11 + note C_, 10 + note C#, 11 + note E_, 10 + note C_, 11 + note C#, 4 + note C#, 3 + note C#, 3 + note C_, 11 + note C#, 10 + note E_, 11 + note C#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 11 + note C#, 4 + note C#, 3 + note C#, 3 + note C_, 11 + note D#, 10 + note E_, 11 + note C_, 5 + note C#, 5 + note C#, 11 + note C_, 10 + note C#, 16 + note __, 5 + note D#, 11 + note C#, 10 + note C#, 11 + note C#, 5 + note C#, 5 + note C#, 11 + note C#, 5 + note C#, 5 + note C#, 11 + note C#, 5 + note C#, 5 + note C_, 16 + note __, 5 + note D#, 11 + note C_, 4 + note D#, 3 + note D#, 3 + note E_, 11 + note C#, 10 + note D#, 11 + note C_, 10 + note D#, 11 + note C_, 10 + note E_, 11 + note C#, 4 + note C#, 3 + note C#, 3 + note C#, 11 + note C#, 10 + note D#, 11 + note C#, 5 + note C#, 5 + note C_, 16 + note __, 5 + note D#, 11 + note C_, 4 + note D#, 3 + note D#, 3 + note E_, 11 + note C#, 10 + note D#, 11 + note C_, 10 + note D#, 11 + note C#, 10 + note E_, 11 + note C_, 5 + note C_, 5 + notetype 2 + note G_, 15 + notetype 1 + note __, 1 + note C#, 4 + note C#, 3 + note C#, 3 + note C_, 16 + note __, 5 + note D#, 11 + note C_, 4 + note D#, 3 + note D#, 3 + note E_, 11 + note C#, 10 + note D#, 11 + note C_, 10 + note D#, 11 + note C_, 10 + note E_, 11 + note C#, 4 + note C#, 3 + note C#, 3 + note C#, 11 + note D#, 5 + note C#, 5 + note C#, 11 + note C#, 10 + note C_, 11 + note D#, 10 + note C#, 11 + note C_, 10 + note D#, 11 + note C#, 10 + note C_, 11 + note D#, 10 + note C#, 11 + note C_, 10 + note D#, 11 + note C#, 10 + note C#, 11 + note D#, 5 + note C#, 5 + note C#, 4 + note C#, 4 + note C#, 3 + note C#, 4 + note C#, 3 + note C#, 3 + loopchannel 0, .MainLoop + +Branch_1eacf7: + note C_, 16 + note __, 5 + note D#, 11 + note C_, 10 + note C#, 16 + note __, 5 + note D#, 11 + note C_, 10 + endchannel + +Branch_1ead02: + note D#, 11 + note C_, 10 + note E_, 11 + note C_, 5 + note C_, 5 + note C#, 16 + note __, 5 + note D#, 11 + note C#, 10 + endchannel + diff --git a/crysaudio/music/TCG2/imakuni2.asm b/crysaudio/music/TCG2/imakuni2.asm new file mode 100644 index 00000000..f2900804 --- /dev/null +++ b/crysaudio/music/TCG2/imakuni2.asm @@ -0,0 +1,2147 @@ +Music_TCG2Imakuni2: + db $C0 + dw Music_TCG2Imakuni2_Ch1 + db $01 + dw Music_TCG2Imakuni2_Ch2 + db $02 + dw Music_TCG2Imakuni2_Ch3 + db $03 + dw Music_TCG2Imakuni2_Ch4 + +Music_TCG2Imakuni2_Ch2: + notetype1 10 +.MainLoop + notetype0 1 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + inc_octave + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + dec_octave + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note __, 5 + note __, 12 + dec_octave + note E_, 5 + note __, 11 + inc_octave + note __, 9 + note __, 8 + note C_, 16 + note C#, 5 + note __, 12 + note D#, 16 + note E_, 5 + note __, 12 + dec_octave + note F#, 16 + note G_, 9 + note __, 8 + note G#, 8 + note __, 8 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + inc_octave + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + dec_octave + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note __, 5 + note __, 12 + dec_octave + note E_, 5 + note __, 11 + note __, 9 + callchannel Branch_1f3762 + note __, 8 + octave 2 + note E_, 16 + note G_, 16 + note G_, 5 + note G_, 4 + note G#, 4 + note G#, 2 + note A_, 2 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + inc_octave + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + dec_octave + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note __, 5 + note __, 12 + dec_octave + note E_, 5 + note __, 11 + inc_octave + note __, 9 + note __, 8 + note C_, 16 + note C#, 5 + note __, 12 + note D#, 16 + note E_, 5 + note __, 12 + dec_octave + note F#, 16 + note G_, 9 + note __, 8 + note G#, 8 + note __, 8 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + inc_octave + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + dec_octave + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note __, 5 + note __, 12 + dec_octave + note G_, 16 + note A_, 9 + inc_octave + inc_octave + callchannel Branch_1f3762 + note __, 8 + octave 3 + note __, 16 + note D#, 9 + note E_, 8 + note E_, 16 + vibrato 1, $33 + octave 4 + note D#, 5 + note __, 4 + note __, 16 + note D_, 3 + note E_, 3 + note D#, 2 + note C_, 9 + note C_, 8 + note C#, 16 + note E_, 5 + note __, 4 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + note E_, 5 + note __, 12 + note F#, 5 + note __, 11 + note G_, 9 + note G_, 16 + note F#, 3 + note G_, 3 + note F#, 2 + note E_, 5 + note __, 12 + note D#, 5 + note __, 11 + note E_, 9 + note E_, 8 + note C#, 5 + note __, 11 + dec_octave + note A_, 5 + note __, 12 + notetype1 9 + note G_, 16 + note G_, 9 + note G_, 8 + note G_, 16 + note G_, 4 + note G_, 5 + note G_, 4 + note G_, 4 + note G_, 4 + note F#, 4 + note F#, 4 + note F#, 3 + note F_, 1 + note __, 9 + callchannel Branch_1f3762 + octave 2 + note __, 8 + octave 2 + note E_, 16 + note G_, 9 + note G_, 8 + note G_, 5 + note G_, 4 + note G#, 4 + note G#, 2 + note A_, 1 + vibrato 1, $33 + octave 4 + note D#, 5 + note __, 4 + note __, 16 + note D_, 3 + note E_, 3 + note D#, 2 + note C_, 9 + note C_, 8 + note C#, 16 + note E_, 5 + note __, 4 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + note E_, 5 + note __, 12 + note F#, 5 + note __, 11 + note G_, 9 + note G_, 16 + note F#, 3 + note G_, 3 + note F#, 2 + note E_, 5 + note __, 12 + note D#, 5 + note __, 11 + note E_, 9 + note E_, 8 + dec_octave + note A_, 5 + note __, 11 + inc_octave + note A_, 5 + note __, 12 + notetype1 8 + note G_, 16 + note G_, 9 + note G_, 8 + note G_, 16 + note G_, 4 + note G_, 5 + note G_, 4 + note G_, 4 + note G_, 4 + note F#, 4 + note F#, 4 + note F#, 3 + note F_, 1 + octave 2 + note A_, 9 + inc_octave + note C#, 5 + note __, 3 + note __, 16 + inc_octave + note E_, 5 + note __, 12 + dec_octave + note C#, 5 + note __, 3 + note C#, 4 + note E_, 4 + note A_, 5 + note __, 4 + note __, 8 + octave 3 + note __, 8 + note A_, 8 + note G#, 9 + note A_, 8 + inc_octave + note E_, 8 + note F_, 8 + vibrato 1, $33 + octave 4 + note F#, 5 + note __, 4 + note __, 16 + note F#, 3 + note D_, 3 + note F#, 2 + note D_, 9 + note D_, 8 + dec_octave + note A#, 16 + note B_, 5 + note __, 4 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + octave 4 + note F#, 5 + note __, 12 + note G#, 5 + note __, 11 + note A_, 9 + note A_, 16 + note G#, 3 + note A_, 3 + note G#, 2 + note F#, 5 + note __, 12 + note F_, 5 + note __, 11 + note F#, 9 + note F#, 8 + note D_, 5 + note __, 11 + dec_octave + note A#, 5 + note __, 12 + notetype1 9 + note G#, 16 + note G#, 9 + note G#, 8 + note G#, 16 + note G#, 5 + note G#, 4 + note G#, 4 + note G#, 4 + note G#, 4 + note G_, 4 + note G_, 4 + note G_, 3 + note F#, 1 + note __, 9 + callchannel Branch_1f3762 + note __, 8 + note __, 16 + octave 3 + note D#, 9 + note E_, 8 + note E_, 16 + vibrato 1, $33 + octave 4 + note D#, 5 + note __, 4 + note __, 16 + note D_, 3 + note E_, 3 + note D#, 2 + note C_, 9 + note C_, 8 + note C#, 16 + note E_, 5 + note __, 4 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + note E_, 5 + note __, 12 + note F#, 5 + note __, 11 + note G_, 9 + note G_, 16 + note F#, 3 + note G_, 3 + note F#, 2 + note E_, 5 + note __, 12 + note D#, 5 + note __, 11 + note E_, 9 + note E_, 8 + dec_octave + note A_, 5 + note __, 11 + inc_octave + note A_, 5 + note __, 12 + notetype1 8 + note G_, 16 + note G_, 9 + note G_, 8 + note G_, 16 + note G_, 4 + note G_, 5 + note G_, 4 + note G_, 4 + note G_, 4 + note F#, 4 + note F#, 4 + note F#, 3 + note F_, 1 + octave 2 + note A_, 9 + inc_octave + note C#, 5 + note __, 3 + note __, 16 + inc_octave + note E_, 5 + note __, 12 + dec_octave + note C#, 5 + note __, 3 + inc_octave + note C#, 4 + note E_, 4 + note A_, 5 + note __, 4 + note __, 8 + note __, 16 + octave 3 + note B_, 5 + note A_, 4 + note E_, 4 + note C_, 4 + dec_octave + note A_, 4 + note F_, 4 + note D_, 4 + dec_octave + note B_, 4 + inc_octave + note D#, 5 + note E_, 4 + note G#, 8 + note B_, 8 + inc_octave + note D_, 8 + note D_, 9 + note C#, 8 + dec_octave + note B_, 8 + note D#, 8 + note E_, 9 + note G#, 8 + note B_, 8 + note __, 8 + inc_octave + note C#, 5 + note D_, 4 + note C#, 4 + note D_, 4 + note C#, 4 + note D_, 4 + note C#, 4 + note D_, 4 + dec_octave + note C#, 5 + note D_, 4 + note F#, 8 + note A_, 8 + inc_octave + note C_, 8 + note C_, 9 + dec_octave + note B_, 8 + note A_, 8 + note C#, 8 + note D_, 9 + note F#, 8 + note A_, 8 + note __, 8 + note B_, 5 + inc_octave + note C_, 4 + dec_octave + note B_, 4 + inc_octave + note C_, 4 + dec_octave + note B_, 4 + inc_octave + note C_, 4 + dec_octave + note B_, 4 + inc_octave + note C_, 4 + dec_octave + note D#, 5 + note E_, 4 + note G#, 8 + note B_, 8 + inc_octave + note D_, 8 + note D_, 9 + note C#, 8 + dec_octave + note B_, 8 + note E_, 9 + note F_, 8 + note A_, 8 + inc_octave + note C_, 8 + note D#, 8 + note D#, 9 + note D_, 8 + note C_, 8 + dec_octave + note F_, 8 + note B_, 5 + note E_, 4 + note G#, 4 + note B_, 4 + inc_octave + note E_, 4 + dec_octave + note G#, 4 + note B_, 4 + inc_octave + note E_, 4 + note G#, 5 + dec_octave + note B_, 4 + inc_octave + note E_, 4 + note G#, 4 + note B_, 4 + inc_octave + note E_, 4 + note G#, 4 + note B_, 4 + inc_octave +.Loop1 + note E_, 5 + note __, 6 + loopchannel 3, .Loop1 + octave 2 + note G_, 16 + note G_, 5 + note G_, 4 + note G#, 4 + note G#, 2 + note A_, 2 + loopchannel 0, .MainLoop + +Branch_1f3762: + notetype0 1 + octave 4 + note C#, 5 + note __, 3 + note C#, 5 + note __, 11 + note C#, 5 + note __, 4 + note __, 16 + note C#, 5 + note __, 3 + note C#, 5 + note __, 4 + endchannel + + +Music_TCG2Imakuni2_Ch1: + notetype1 10 +.MainLoop + notetype0 1 + octave 4 + note __, 9 + note __, 8 + note __, 8 + note __, 8 + note E_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + note D#, 5 + note __, 11 + dec_octave + note __, 9 + note __, 8 + note D#, 5 + note __, 11 + note __, 9 + note __, 8 + note G#, 16 + note A_, 5 + note __, 12 + inc_octave + note C_, 16 + note C#, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + note __, 8 + note __, 8 + inc_octave + note __, 9 + note __, 8 + note __, 8 + note __, 8 + note E_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + note D#, 5 + note __, 11 + dec_octave + note __, 9 + note __, 8 + note D#, 5 + note __, 11 + inc_octave + inc_octave + note __, 9 + note C_, 5 + note __, 3 + note C_, 5 + note __, 11 + note C_, 5 + note __, 4 + note __, 16 + note C_, 5 + note __, 3 + note C_, 5 + note __, 12 + dec_octave + dec_octave + note __, 16 + note __, 9 + note __, 8 + note __, 16 + octave 4 + note __, 9 + note __, 8 + note __, 8 + note __, 8 + note E_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + note D#, 5 + note __, 11 + dec_octave + note __, 9 + note __, 8 + note D#, 5 + note __, 11 + note __, 9 + note __, 8 + note G#, 16 + note A_, 5 + note __, 12 + inc_octave + note C_, 16 + note C#, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + note __, 8 + note __, 8 + inc_octave + note __, 9 + note __, 8 + note __, 8 + note __, 8 + note E_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + note D#, 5 + note __, 11 + dec_octave + note __, 9 + note __, 8 + note E_, 5 + note __, 11 + inc_octave + inc_octave + note __, 9 + note C_, 5 + note __, 3 + note C_, 5 + note __, 11 + note C_, 5 + note __, 4 + note __, 16 + note C_, 5 + note __, 3 + note C_, 5 + note __, 12 + dec_octave + dec_octave + note __, 16 + note G_, 9 + note G#, 8 + note G#, 16 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note C#, 2 + note __, 15 + dec_octave + note E_, 5 + note __, 11 + note A_, 9 + inc_octave + note C#, 5 + note __, 3 + note __, 16 + dec_octave + note A_, 5 + note __, 4 + note __, 8 + inc_octave + inc_octave + note G#, 5 + note __, 3 + dec_octave + note C#, 4 + note E_, 4 + note A_, 5 + note __, 4 + note __, 8 + callchannel Branch_1f3a58 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note C#, 2 + note __, 15 + dec_octave + note E_, 5 + note __, 11 + note __, 9 + callchannel Branch_1f3762 + note __, 8 + note __, 16 + note __, 9 + note __, 8 + note __, 16 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note C#, 2 + note __, 15 + dec_octave + note E_, 5 + note __, 11 + note A_, 9 + inc_octave + note C#, 5 + note __, 3 + note __, 16 + dec_octave + note A_, 5 + note __, 4 + note __, 8 + inc_octave + inc_octave + note G#, 5 + note __, 3 + dec_octave + note C#, 4 + note E_, 4 + note A_, 5 + note __, 4 + note __, 8 + callchannel Branch_1f3a58 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note C#, 2 + note __, 15 + dec_octave + note E_, 5 + note __, 11 + note __, 9 + inc_octave + note __, 5 + note __, 3 + note __, 16 + inc_octave + note C#, 5 + note __, 12 + dec_octave + note C_, 5 + note __, 3 + note __, 8 + note E_, 5 + note __, 4 + dec_octave + note A_, 8 + callchannel Branch_1f3a58 + octave 3 + note D_, 9 + note __, 8 + note __, 8 + note D_, 3 + note F#, 3 + note A_, 2 + inc_octave + note D_, 5 + note __, 12 + dec_octave + note A#, 16 + note B_, 9 + note __, 8 + note A_, 5 + note __, 11 + note F#, 2 + note __, 15 + note C#, 5 + note __, 11 + note D_, 9 + note F#, 5 + note __, 3 + note __, 16 + note D_, 5 + note __, 4 + note __, 8 + inc_octave + inc_octave + note C#, 5 + note __, 3 + dec_octave + dec_octave + note F#, 4 + note A_, 4 + inc_octave + note D_, 5 + note __, 4 + note __, 8 + callchannel Branch_1f3a58 + octave 3 + note __, 9 + note __, 8 + note __, 8 + note D_, 3 + note F#, 3 + note A_, 2 + inc_octave + note D_, 5 + note __, 12 + dec_octave + note A#, 16 + note B_, 9 + note __, 8 + note A_, 5 + note __, 11 + note F#, 2 + note __, 15 + note C#, 5 + note __, 11 + note __, 9 + callchannel Branch_1f3762 + note __, 8 + note __, 16 + octave 2 + note G_, 9 + note G#, 8 + note G#, 16 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note C#, 2 + note __, 15 + dec_octave + note E_, 5 + note __, 11 + note A_, 9 + inc_octave + note C#, 5 + note __, 3 + note __, 16 + dec_octave + note A_, 5 + note __, 4 + note __, 8 + inc_octave + inc_octave + note G#, 5 + note __, 3 + dec_octave + note C#, 4 + note E_, 4 + note A_, 5 + note __, 4 + note __, 8 + callchannel Branch_1f3a58 + octave 2 + note A_, 9 + note __, 8 + note __, 8 + note A_, 3 + inc_octave + note C#, 3 + note E_, 2 + note A_, 5 + note __, 12 + note F#, 16 + note G_, 9 + note __, 8 + note E_, 5 + note __, 11 + note C#, 2 + note __, 15 + dec_octave + note E_, 5 + note __, 11 + note __, 9 + inc_octave + note C_, 5 + note __, 3 + note __, 16 + inc_octave + note C#, 5 + note __, 12 + dec_octave + note C_, 5 + note __, 3 + note __, 8 + inc_octave + note E_, 5 + note __, 4 + note __, 8 + octave 2 + note G_, 8 + note __, 8 + inc_octave + note C_, 9 + note C_, 8 + note D_, 8 + note __, 8 + vibrato 1, $33 + octave 3 + note E_, 9 + note G#, 8 + note B_, 4 + note __, 4 + inc_octave + note C#, 4 + note D_, 13 + note C#, 8 + dec_octave + note B_, 8 + note D#, 8 + note E_, 9 + note G#, 8 + note B_, 8 + note __, 8 + inc_octave + note G_, 5 + note G#, 4 + note G_, 4 + note G#, 4 + note G_, 4 + note G#, 4 + note G_, 4 + note G#, 4 + dec_octave + note D_, 9 + note F#, 8 + note A_, 4 + note __, 4 + note B_, 4 + inc_octave + note C_, 13 + dec_octave + note B_, 8 + note A_, 8 + note C#, 8 + note D_, 9 + note F#, 8 + note A_, 8 + note __, 8 + inc_octave + note F_, 5 + note F#, 4 + note F_, 4 + note F#, 4 + note F_, 4 + note F#, 4 + note F_, 4 + note F#, 4 + dec_octave + note E_, 9 + note G#, 8 + note B_, 4 + note __, 4 + inc_octave + note C#, 4 + note D_, 13 + note C#, 8 + dec_octave + note B_, 8 + note E_, 4 + note __, 4 + note F_, 9 + note A_, 8 + inc_octave + note C_, 4 + note __, 4 + note D_, 4 + note D#, 13 + note D_, 8 + note C_, 8 + dec_octave + note F_, 8 + notetype1 4 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 2 +.Loop1 + note B_, 5 + note __, 6 + loopchannel 3, .Loop1 + note B_, 5 + note __, 6 + note B_, 5 + note __, 6 + note B_, 5 + note __, 6 + loopchannel 0, .MainLoop + +Branch_1f3a58: + octave 4 + note C_, 8 + note C#, 8 + note C_, 9 + note C#, 8 + note C_, 8 + note C#, 8 + endchannel + + +Music_TCG2Imakuni2_Ch3: + notetype1 10 + notetype0 1 + notetype2 11 + notetype1 1 +.MainLoop + octave 2 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + note A_, 9 + note __, 8 + note F#, 16 + note G_, 9 + note __, 16 + note __, 16 + note __, 9 + dec_octave + notetype1 2 + note G_, 16 + note A_, 9 + notetype1 1 + note __, 16 + note __, 8 + note __, 9 + note __, 16 + note __, 8 + note __, 9 + note __, 8 + note F#, 16 + note G_, 9 + note __, 8 + note G#, 8 + note __, 8 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + note A_, 9 + note __, 8 + note F#, 16 + note G_, 9 + note __, 16 + note __, 8 + note __, 9 + note __, 8 + dec_octave + notetype1 2 + note G_, 16 + note A_, 9 + notetype1 1 + callchannel Branch_1f3d18 + octave 2 + notetype1 1 + note __, 8 + note E_, 8 + note __, 8 + note G_, 16 + note G_, 5 + note G_, 4 + note G#, 4 + note G#, 2 + note A_, 2 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + note A_, 9 + note __, 8 + note F#, 16 + note G_, 9 + note __, 16 + note __, 8 + note __, 9 + note __, 8 + dec_octave + notetype1 2 + note G_, 16 + note A_, 9 + notetype1 1 + note __, 16 + note __, 8 + note __, 9 + note __, 16 + note __, 8 + note __, 9 + note __, 8 + note F#, 16 + note G_, 9 + note __, 8 + note G#, 8 + note __, 8 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + note A_, 9 + note __, 8 + note F#, 16 + note G_, 9 + note __, 16 + note __, 8 + note __, 9 + note __, 8 + dec_octave + note G_, 16 + note A_, 9 + callchannel Branch_1f3d18 + note __, 8 + note __, 16 + octave 2 + notetype1 1 + note A_, 9 + note A#, 16 + note A#, 8 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + inc_octave + note E_, 5 + note __, 4 + dec_octave + note __, 8 + note F#, 16 + note G_, 9 + note __, 8 + inc_octave + note D#, 5 + note __, 3 + note __, 8 + notetype1 2 + note C#, 2 + notetype1 1 + note __, 15 + dec_octave + dec_octave + note E_, 16 + note A_, 5 + note __, 4 + inc_octave + inc_octave + note C_, 5 + note __, 3 + dec_octave + note E_, 2 + note __, 6 + inc_octave + note D#, 2 + note __, 6 + note A_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + dec_octave + note E_, 5 + note __, 11 + note G_, 9 + note G_, 8 + note G#, 16 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + inc_octave + note E_, 5 + note __, 4 + dec_octave + dec_octave + note __, 8 + inc_octave + note F#, 16 + note G_, 9 + note __, 8 + inc_octave + note D#, 5 + note __, 3 + note __, 8 + notetype1 2 + note C#, 2 + notetype1 1 + note __, 15 + dec_octave + dec_octave + note E_, 16 + note A_, 9 + callchannel Branch_1f3d18 + octave 2 + notetype1 1 + note __, 8 + note E_, 8 + note __, 8 + note G_, 9 + note G_, 8 + note G_, 4 + note G_, 4 + note G#, 4 + note G#, 3 + note A_, 1 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + inc_octave + note E_, 5 + note __, 4 + dec_octave + note __, 8 + note F#, 16 + note G_, 9 + note __, 8 + inc_octave + note D#, 5 + note __, 3 + note __, 8 + notetype1 2 + note C#, 2 + notetype1 1 + note __, 15 + dec_octave + dec_octave + note E_, 16 + note A_, 5 + note __, 4 + inc_octave + inc_octave + note C_, 5 + note __, 3 + dec_octave + note E_, 2 + note __, 6 + inc_octave + note D#, 2 + note __, 6 + note A_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + dec_octave + note E_, 5 + note __, 11 + note G_, 9 + note G_, 8 + note G#, 16 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + inc_octave + note E_, 5 + note __, 4 + dec_octave + note __, 8 + note F#, 16 + note G_, 9 + note __, 8 + inc_octave + note D#, 5 + note __, 3 + note __, 8 + notetype1 2 + note C#, 2 + notetype1 1 + note __, 15 + dec_octave + dec_octave + note E_, 16 + note A_, 5 + note __, 4 + inc_octave + inc_octave + note C_, 5 + note __, 3 + dec_octave + note E_, 2 + note __, 6 + inc_octave + note D#, 2 + note __, 6 + note A_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + dec_octave + note A_, 5 + note __, 11 + inc_octave + note C_, 9 + note C_, 8 + note C_, 4 + note C_, 4 + note C#, 4 + note C#, 3 + note D_, 1 + note D_, 9 + note __, 16 + note __, 8 + inc_octave + note A_, 5 + note __, 4 + dec_octave + note __, 8 + note A#, 16 + note B_, 9 + note __, 8 + inc_octave + note G#, 5 + note __, 3 + note __, 8 + notetype1 2 + note F#, 2 + notetype1 1 + note __, 15 + dec_octave + note C#, 16 + note D_, 5 + note __, 4 + inc_octave + note F_, 5 + note __, 3 + dec_octave + note A_, 2 + note __, 6 + inc_octave + note D_, 2 + note __, 6 + inc_octave + note D_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + dec_octave + dec_octave + note A_, 5 + note __, 11 + inc_octave + note C_, 9 + note C_, 8 + note C#, 16 + note D_, 9 + note __, 16 + note __, 8 + inc_octave + note A_, 5 + note __, 4 + dec_octave + note __, 8 + note A#, 16 + note B_, 9 + note __, 8 + inc_octave + note G#, 5 + note __, 3 + note __, 8 + notetype1 2 + note F#, 2 + notetype1 1 + note __, 15 + dec_octave + note C#, 16 + note D_, 9 + callchannel Branch_1f3d18 + octave 2 + notetype1 1 + note __, 16 + note __, 8 + note A_, 9 + note A#, 16 + note A#, 8 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + inc_octave + note E_, 5 + note __, 4 + dec_octave + note __, 8 + note F#, 16 + note G_, 9 + note __, 8 + inc_octave + note D#, 5 + note __, 3 + note __, 8 + notetype1 2 + note C#, 2 + notetype1 1 + note __, 15 + dec_octave + dec_octave + note E_, 16 + note A_, 5 + note __, 4 + inc_octave + inc_octave + note C_, 5 + note __, 3 + dec_octave + note E_, 2 + note __, 6 + inc_octave + note D#, 2 + note __, 6 + note A_, 5 + note __, 12 + note __, 16 + note __, 9 + note __, 8 + dec_octave + dec_octave + note E_, 5 + note __, 11 + note G_, 9 + note G_, 8 + note G#, 16 + note A_, 9 + note __, 16 + note __, 8 + inc_octave + inc_octave + note E_, 5 + note __, 4 + dec_octave + dec_octave + note __, 8 + inc_octave + note F#, 16 + note G_, 9 + note __, 8 + inc_octave + note D#, 5 + note __, 3 + note __, 8 + notetype1 2 + note C#, 2 + notetype1 1 + note __, 15 + dec_octave + dec_octave + note E_, 16 + note A_, 5 + note __, 12 + inc_octave + note E_, 2 + note __, 6 + note D#, 2 + note __, 6 + note A_, 5 + note __, 12 + dec_octave + note G_, 5 + note __, 11 + note A_, 5 + note __, 12 + note G_, 8 + note __, 8 + inc_octave + note C_, 9 + note C_, 8 + note D_, 8 + note __, 8 + dec_octave + note E_, 9 + note E_, 8 + note __, 8 + inc_octave + note E_, 8 + note __, 9 + note E_, 8 + note D_, 8 + note E_, 8 + note __, 9 + dec_octave + note E_, 8 + inc_octave + note E_, 8 + note __, 8 + dec_octave + note E_, 9 + note E_, 8 + note D#, 16 + note D_, 9 + note D_, 8 + note __, 8 + inc_octave + note D_, 8 + note __, 9 + note D_, 8 + note C_, 8 + note D_, 8 + note __, 9 + dec_octave + note D_, 8 + inc_octave + note D_, 8 + note __, 8 + dec_octave + note D_, 9 + note D_, 8 + note D#, 16 + note E_, 9 + note __, 8 + note E_, 8 + inc_octave + note E_, 8 + note __, 9 + note E_, 8 + dec_octave + note E_, 8 + note __, 8 + note F_, 9 + note __, 8 + note F_, 8 + inc_octave + note F_, 8 + note __, 9 + note F_, 8 + dec_octave + note F_, 8 + note D#, 8 + note E_, 3 + note __, 2 + note E_, 4 + note D_, 4 + note D#, 4 + note E_, 3 + note __, 1 + note E_, 4 + note D_, 4 + note D#, 4 + note E_, 3 + note __, 2 + note E_, 4 + note D_, 4 + note D#, 4 + note E_, 3 + note __, 1 + note G#, 4 + note B_, 4 + inc_octave + note D_, 4 + note E_, 9 + note __, 2 + notetype1 2 + note E_, 4 + note __, 6 + notetype1 3 + note E_, 4 + note __, 6 + note __, 2 + notetype1 1 + dec_octave + note G_, 16 + note G_, 5 + note G_, 4 + note G#, 4 + note G#, 2 + note A_, 2 + loopchannel 0, .MainLoop + +Branch_1f3d18: + notetype1 1 +.Loop1 + notetype1 1 + octave 7 + note C#, 1 + notetype1 3 + dec_octave + note C#, 7 + loopchannel 2, .Loop1 + note __, 8 + octave 7 + notetype1 1 + note C#, 1 + notetype1 3 + dec_octave + note C#, 7 + note __, 1 + note __, 16 +.Loop2 + notetype1 1 + octave 7 + note C#, 1 + notetype1 3 + dec_octave + note C#, 7 + loopchannel 2, .Loop2 + note __, 1 + endchannel + + +Music_TCG2Imakuni2_Ch4: + togglenoise $06 +.MainLoop + notetype 1 + octave 1 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note A#, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note E_, 16 + note D#, 16 + note __, 1 + note C_, 16 + note C#, 16 + note __, 1 + note C#, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note C#, 16 + note __, 1 + note C#, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note E_, 8 + note C#, 4 + note C#, 4 + note C#, 9 + note G#, 8 + note G#, 16 + note G#, 16 + note __, 1 + note D#, 8 + note G#, 8 + note G#, 16 + note __, 1 + note C#, 16 + note C#, 16 + note __, 1 + note C#, 6 + note C#, 5 + note C#, 5 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note E_, 16 + note D#, 16 + note __, 1 + note C_, 16 + note C#, 16 + note __, 1 + note C#, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note C#, 16 + note __, 1 + note C#, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note C#, 16 + note __, 1 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 9 + note G#, 8 + note G#, 16 + note G#, 16 + note __, 1 + note D#, 8 + note G#, 8 + note G#, 16 + note __, 1 + note __, 16 + notetype 2 + note E_, 16 + notetype 1 + note __, 1 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note E_, 16 + note C_, 16 + note __, 1 + note D#, 16 + note C#, 16 + note __, 1 + note E_, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C#, 8 + note C#, 16 + note __, 1 + note C#, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 9 + note G#, 8 + note G#, 16 + note G#, 16 + note __, 1 + note D#, 8 + note G#, 8 + note G#, 16 + note __, 1 + note C#, 16 + note C#, 16 + note __, 1 + note C#, 6 + note C#, 5 + note C#, 5 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note E_, 16 + note C_, 16 + note __, 1 + note D#, 16 + note C#, 16 + note __, 1 + note E_, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C#, 8 + note C#, 16 + note __, 1 + note C#, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C_, 16 + note __, 1 + note D#, 16 + note C#, 16 + note __, 1 + note D#, 8 + note C#, 8 + note C#, 16 + note __, 1 + note C#, 16 + note C#, 16 + note __, 1 + note C#, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note E_, 16 + note C_, 16 + note __, 1 + note D#, 16 + note C#, 16 + note __, 1 + note E_, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C#, 8 + note C#, 16 + note __, 1 + note C#, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 9 + note G#, 8 + note G#, 16 + note G#, 16 + note __, 1 + note D#, 8 + note G#, 8 + note G#, 16 + note __, 1 + note __, 16 + notetype 2 + note E_, 16 + notetype 1 + note __, 1 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note E_, 16 + note C_, 16 + note __, 1 + note D#, 16 + note C#, 16 + note __, 1 + note E_, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C#, 8 + note C#, 16 + note __, 1 + note C#, 16 + note C_, 16 + note __, 1 + note D#, 8 + note C_, 8 + note C#, 16 + note __, 1 + note E_, 16 + note D#, 9 + note D#, 8 + note E_, 16 + note D#, 16 + note __, 1 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C_, 16 + note __, 1 + note D#, 16 + note C#, 16 + note __, 1 + note D#, 8 + note C#, 8 + note C#, 16 + note __, 1 + note E_, 16 + note C#, 9 + note C#, 4 + note C#, 4 + note C#, 8 + note C#, 4 + note C#, 4 + note C_, 16 + note __, 1 + note C#, 8 + note E_, 16 + note __, 1 + note C#, 8 + note D#, 8 + note D#, 8 + note C_, 9 + note C#, 8 + note E_, 8 + note C#, 4 + note C#, 4 + note C#, 9 + note C#, 8 + note D#, 8 + note C#, 8 + note C_, 9 + note C#, 4 + note C#, 4 + note C#, 8 + note C_, 16 + note __, 1 + note C_, 8 + note C#, 8 + note C#, 4 + note C#, 4 + note C_, 9 + note C#, 8 + note E_, 8 + note C#, 4 + note C#, 4 + note C#, 9 + note D#, 4 + note C#, 4 + note C#, 8 + note C#, 8 + note C_, 9 + note C#, 8 + note C#, 8 + note C#, 8 + note D#, 9 + note C#, 4 + note C#, 4 + note C#, 8 + note C#, 8 + note C_, 9 + note D#, 4 + note C#, 4 + note C#, 8 + note E_, 8 + note D#, 9 + note C#, 4 + note C#, 4 + note C#, 8 + note C#, 8 + note C#, 9 + note C#, 4 + note C#, 4 + note C#, 8 + note C#, 4 + note C#, 4 + note C#, 9 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 4 + note C#, 16 + note __, 1 + note __, 16 + notetype 2 + note E_, 16 + notetype 1 + note __, 1 + loopchannel 0, .MainLoop + diff --git a/crysaudio/music/TCG2/ishihara.asm b/crysaudio/music/TCG2/ishihara.asm new file mode 100644 index 00000000..cb45d0d8 --- /dev/null +++ b/crysaudio/music/TCG2/ishihara.asm @@ -0,0 +1,2334 @@ +Music_TCG2Ishihara: + db $C0 + dw Music_TCG2Ishihara_Ch1 + db $01 + dw Music_TCG2Ishihara_Ch2 + db $02 + dw Music_TCG2Ishihara_Ch3 + db $03 + dw Music_TCG2Ishihara_Ch4 + +Music_TCG2Ishihara_Ch2: + notetype1 10 + notetype0 1 + note __, 13 + note __, 14 + note __, 13 +.MainLoop + octave 2 + note F_, 5 + note __, 9 + note F_, 5 + note __, 8 + note A_, 5 + note __, 9 + note A_, 5 + note __, 8 + note D#, 5 + note __, 9 + note D#, 5 + note __, 8 + note G_, 5 + note __, 9 + note G_, 5 + note __, 8 + note F_, 5 + note __, 9 + note F_, 5 + note __, 8 + note A_, 5 + note __, 9 + note A_, 5 + note __, 8 + note D#, 5 + note __, 9 + note D#, 5 + note __, 8 + note G_, 16 + note G_, 11 + note F_, 5 + note __, 9 + note F_, 5 + note __, 8 + note A_, 5 + note __, 9 + note A_, 5 + note __, 8 + note D#, 5 + note __, 9 + note D#, 5 + note __, 8 + note G_, 5 + note __, 9 + note G_, 5 + note __, 8 + note F_, 5 + note __, 2 + note F_, 5 + note __, 2 + octave 4 + note G#, 13 + note A_, 5 + note __, 2 + note A_, 7 + dec_octave + note B_, 13 + inc_octave + note C_, 5 + note __, 2 + note C_, 7 + dec_octave + note G#, 13 + note A_, 2 + note __, 5 + note A_, 7 + note E_, 13 + note F_, 5 + note __, 2 + note F_, 7 + octave 2 + note C_, 5 + note __, 8 + note A_, 5 + note __, 9 + note A_, 5 + note __, 8 + note D#, 5 + note __, 9 + note D#, 5 + note __, 8 + note G_, 5 + note __, 9 + note G_, 5 + note __, 8 + note F_, 5 + note __, 9 + note F_, 5 + note __, 8 + note A_, 5 + note __, 9 + note A_, 5 + note __, 8 + note D#, 5 + note __, 9 + note D#, 5 + note __, 8 + note G_, 16 + note G_, 11 + note F_, 5 + note __, 9 + note F_, 5 + note __, 8 + note A_, 5 + note __, 9 + note A_, 5 + note __, 8 + note D#, 5 + note __, 9 + note D#, 5 + note __, 8 + note G_, 5 + note __, 9 + note G_, 5 + note __, 8 + note F_, 5 + note __, 2 + note F_, 5 + note __, 2 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + callchannel Branch_1dd880 + note C#, 14 + note F_, 7 + note C#, 6 + note G#, 7 + note F_, 7 + note B_, 4 + inc_octave + note C_, 9 + note C_, 14 + dec_octave + note A#, 4 + inc_octave + note C_, 4 + dec_octave + note A#, 5 + note A_, 7 + note G#, 7 + note G_, 7 + note A_, 6 + callchannel Branch_1dd880 + note C#, 14 + note F_, 7 + note C#, 6 + note G#, 7 + note F_, 7 + note B_, 4 + inc_octave + note C_, 9 + note C_, 14 + dec_octave + note A#, 4 + inc_octave + note C_, 4 + dec_octave + note A#, 5 + note G#, 7 + note A#, 7 + note G_, 7 + note G#, 6 + callchannel Branch_1dd809 + octave 2 + note A_, 13 + callchannel Branch_1ddc41 + callchannel Branch_1dd849 + note F_, 13 + note F_, 14 + note F_, 13 + note F_, 14 + note F_, 13 + note F_, 14 + octave 2 + note A_, 13 + callchannel Branch_1ddc41 + callchannel Branch_1ddc4e + callchannel Branch_1dd809 + octave 2 + note A_, 13 + callchannel Branch_1ddc41 + callchannel Branch_1dd849 + note E_, 3 + note F_, 10 + note F_, 14 + octave 3 + note F_, 13 + note A_, 5 + note A_, 9 + inc_octave + note C_, 5 + note C_, 8 + note F_, 5 + note F_, 9 + note F_, 4 + note A_, 4 + inc_octave + note C_, 5 + note F_, 5 + note F_, 9 + note __, 13 + loopchannel 0, .MainLoop + +Branch_1dd809: + octave 4 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + note F_, 14 + note G_, 7 + note F_, 6 + note G#, 7 + note G_, 7 + note A_, 3 + note A#, 10 + note A#, 14 + note G_, 7 + note A_, 6 + note F_, 7 + note G_, 7 + note D#, 13 + note D#, 14 + note D#, 13 + note D#, 14 + note C_, 7 + note C_, 6 + note C#, 7 + note C_, 7 + note C#, 7 + note __, 6 + note F_, 14 + note D#, 7 + note F_, 6 + note D#, 7 + note __, 7 + note C#, 7 + note __, 6 + note C#, 7 + note __, 7 + note C_, 13 + note C_, 14 + note C_, 13 + note C_, 14 + note C_, 13 + note C_, 14 + endchannel + +Branch_1dd849: + octave 4 + note C_, 7 + note C_, 6 + note C_, 14 + note C#, 7 + note C_, 6 + note F_, 7 + note C#, 7 + note G_, 3 + note G#, 10 + note G#, 14 + note G_, 7 + note G#, 6 + note F_, 7 + note G_, 7 + note F#, 3 + note G_, 10 + note G_, 14 + note A#, 7 + note G_, 6 + note F_, 7 + note A#, 7 + note D#, 13 + note D#, 14 + note D#, 13 + note D#, 14 + note D#, 7 + note D#, 6 + note F_, 14 + note G_, 7 + note F_, 6 + note G#, 7 + note G_, 7 + note G_, 13 + note G_, 7 + note G_, 7 + note D#, 13 + note G_, 7 + note D#, 7 + endchannel + +Branch_1dd880: + octave 4 + note E_, 4 + note F_, 3 + note __, 7 + note E_, 4 + note F_, 3 + note __, 6 + note A_, 7 + note __, 7 + note A_, 7 + note __, 6 + note D#, 14 + note F_, 7 + note D#, 6 + note G_, 7 + note F_, 7 + note F_, 7 + note G_, 6 + note F_, 7 + note __, 7 + note C_, 7 + note __, 6 + note C_, 7 + note __, 7 + note D_, 3 + note D#, 10 + note D#, 14 + note D_, 7 + note D#, 6 + dec_octave + note A#, 7 + inc_octave + note D_, 7 + note D_, 7 + dec_octave + note A#, 6 + inc_octave + note C_, 7 + note D_, 7 + note C_, 7 + note __, 6 + dec_octave + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + note D#, 14 + note F_, 7 + note D#, 6 + note G_, 7 + note F_, 7 + note F_, 7 + note G_, 6 + octave 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 1 + dec_octave + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + note A#, 13 + note A#, 14 + inc_octave + note D_, 5 + note __, 2 + note D_, 5 + note __, 1 + dec_octave + note A#, 5 + note __, 2 + note A#, 5 + note __, 2 + inc_octave + note D_, 5 + note __, 2 + note D_, 5 + note __, 1 + octave 4 + note A_, 7 + note __, 7 + note A_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + dec_octave + note G_, 14 + note A_, 7 + note G_, 6 + note A#, 7 + note A_, 7 + note A_, 7 + note A#, 6 + note A_, 7 + note __, 7 + note F_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F#, 3 + note G_, 10 + note G_, 14 + note F_, 7 + note G_, 6 + note D_, 7 + note F_, 7 + note F_, 7 + note D_, 6 + note D#, 7 + note F_, 7 + note D#, 7 + note __, 6 + dec_octave + note A_, 7 + note __, 7 + note A_, 7 + note __, 6 + note A#, 14 + inc_octave + note C_, 7 + dec_octave + note A#, 6 + inc_octave + note D_, 7 + note C_, 7 + note F_, 7 + note D_, 6 + octave 2 + note F_, 5 + note __, 2 + note F_, 5 + note __, 2 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 1 + dec_octave + note F_, 5 + note __, 2 + note F_, 5 + note __, 2 + note A#, 5 + note __, 2 + note A#, 6 + note A#, 14 + inc_octave + note C_, 13 + note C_, 14 + dec_octave + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + octave 4 + note D_, 14 + note E_, 7 + note D_, 6 + note F_, 7 + note E_, 7 + note F#, 4 + note G_, 9 + note G_, 14 + note E_, 7 + note G_, 6 + note D_, 7 + note E_, 7 + note E_, 7 + note D_, 6 + note C_, 14 + dec_octave + note A_, 7 + inc_octave + note C_, 6 + note F#, 3 + note G_, 11 + note F_, 13 + note F_, 14 + note F_, 13 + note F_, 14 + note C_, 7 + note F_, 6 + note D_, 14 + note E_, 7 + note D_, 6 + note F_, 7 + note E_, 7 + note G#, 4 + note A_, 9 + note A_, 14 + note G_, 7 + note A_, 6 + note E_, 7 + note G_, 7 + note D_, 7 + note E_, 6 + note C_, 14 + note C_, 13 + note C_, 14 + note C_, 13 + note C_, 14 + note C_, 13 + note C_, 14 + note __, 13 + note D_, 14 + note E_, 7 + note D_, 6 + note F_, 7 + note E_, 7 + note F#, 4 + note G_, 9 + note G_, 14 + note E_, 7 + note G_, 6 + note D_, 7 + note E_, 7 + note E_, 7 + note D_, 6 + note C_, 14 + note D_, 7 + note C_, 6 + note E_, 7 + note D_, 7 + note F_, 13 + note F_, 14 + note C_, 7 + note F_, 6 + dec_octave + note A_, 7 + inc_octave + note C_, 7 + dec_octave + note A#, 13 + note A#, 14 + inc_octave + note D_, 7 + dec_octave + note A#, 6 + inc_octave + note F_, 7 + note D_, 7 + note C_, 13 + note C_, 14 + note E_, 7 + note C_, 6 + note G_, 7 + note E_, 7 + note C#, 13 + endchannel + + +Music_TCG2Ishihara_Ch1: + notetype1 10 + notetype0 1 + note __, 13 + note __, 14 + note __, 13 +.MainLoop +.Loop1 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + loopchannel 3, .Loop1 + note __, 14 + octave 4 + note E_, 13 + note F_, 5 + note __, 2 + note F_, 7 + dec_octave + note G#, 13 + note A_, 5 + note __, 2 + note A_, 7 + note E_, 13 + note F_, 5 + note __, 2 + note F_, 7 + dec_octave + note A#, 13 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + octave 2 + note C_, 5 + note __, 8 + note F_, 5 + note __, 9 + note F_, 5 + note __, 8 + dec_octave + note A#, 5 + note __, 9 + note A#, 5 + note __, 8 + inc_octave + note E_, 5 + note __, 9 + note D#, 5 + note __, 8 + note C_, 5 + note __, 9 + note C_, 5 + note __, 8 + note F_, 5 + note __, 9 + note F_, 5 + note __, 8 + dec_octave + note A#, 5 + note __, 9 + note A#, 5 + note __, 8 + inc_octave + note D#, 16 + note D#, 11 + note C_, 5 + note __, 9 + note C_, 5 + note __, 8 + note F_, 5 + note __, 9 + note F_, 5 + note __, 8 + dec_octave + note A#, 5 + note __, 9 + note A#, 5 + note __, 8 + inc_octave + note D#, 5 + note __, 9 + note D#, 5 + note __, 8 + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + callchannel Branch_1ddc75 + note F_, 14 + note C#, 7 + note C#, 6 + note F_, 7 + note F_, 7 + note G_, 3 + note G#, 10 + note G#, 14 + note G_, 4 + note G#, 4 + note G_, 5 + octave 2 + note F_, 4 + note G_, 3 + note A_, 4 + note A#, 3 + inc_octave + note C_, 4 + note D_, 3 + note D#, 3 + note E_, 3 + callchannel Branch_1ddc75 + note F_, 14 + note C#, 7 + note C#, 6 + note F_, 7 + note F_, 7 + note G_, 3 + note G#, 10 + note G#, 14 + note G_, 4 + note G#, 4 + note G_, 5 + note F_, 14 + octave 2 + note G#, 4 + note A#, 3 + note B_, 3 + inc_octave + note C_, 3 + octave 3 + note G#, 7 + note G#, 7 + note __, 13 + octave 3 + callchannel Branch_1ddc41 + callchannel Branch_1ddc4e + note __, 14 + octave 3 + note D#, 13 + note F_, 7 + note __, 7 + note F#, 3 + vibrato 3, $33 + note G_, 10 + note G_, 14 + vibrato 0, $33 + note D#, 7 + note __, 6 + callchannel Branch_1ddc41 + vibrato 7, $33 + note C_, 7 + note C_, 6 + note C_, 14 + vibrato 0, $33 + callchannel Branch_1ddc4e + callchannel Branch_1ddc41 + callchannel Branch_1ddc4e + note __, 14 + note C#, 13 + callchannel Branch_1ddc41 + note F_, 7 + note __, 6 + note G_, 14 + note G#, 7 + note __, 6 + note A#, 7 + note __, 7 + vibrato 7, $33 + note A_, 13 + note A_, 14 + vibrato 0, $33 + note F_, 7 + note __, 6 + callchannel Branch_1ddc41 + dec_octave + note A#, 7 + note __, 6 + note A_, 14 + octave 2 + note F_, 13 + callchannel Branch_1ddc41 + callchannel Branch_1ddc4e + note C_, 3 + vibrato 3, $33 + note C#, 11 + note C#, 13 + vibrato 0, $33 + callchannel Branch_1ddc41 + callchannel Branch_1ddc4e + note __, 14 + note F_, 7 + note __, 6 + note G#, 7 + note __, 7 + note A_, 3 + vibrato 7, $33 + note A#, 10 + note A#, 14 + vibrato 0, $33 + note G_, 7 + note __, 6 + callchannel Branch_1ddc41 + dec_octave + vibrato 7, $33 + note A#, 13 + note A#, 14 + vibrato 0, $33 + callchannel Branch_1ddc4e + callchannel Branch_1ddc41 + callchannel Branch_1ddc4e + octave 3 + note C#, 14 + note D#, 7 + note __, 6 + callchannel Branch_1ddc41 + note D#, 13 + note D#, 7 + note __, 7 + dec_octave + note A#, 7 + note __, 6 + callchannel Branch_1ddc41 + octave 2 + note A_, 3 + vibrato 7, $33 + note A#, 10 + note A#, 14 + vibrato 0, $33 + inc_octave + note F_, 7 + note __, 6 + callchannel Branch_1ddc41 + dec_octave + note A#, 7 + note __, 6 + note A_, 14 + callchannel Branch_1ddc4e + octave 2 + note C#, 4 + note D#, 3 + note F_, 4 + note F#, 3 + note G#, 4 + note A#, 3 + note B_, 3 + inc_octave + note C_, 3 + vibrato 7, $33 + note C#, 14 + note C#, 13 + octave 3 + note G#, 7 + note __, 7 + callchannel Branch_1ddc68 + octave 4 + note C#, 14 + callchannel Branch_1ddc68 + octave 4 + note F_, 7 + note __, 7 + note F#, 3 + note G_, 10 + note G_, 14 + callchannel Branch_1ddc68 + octave 3 + note G#, 7 + note __, 7 + note G_, 13 + note G_, 14 + callchannel Branch_1ddc68 + callchannel Branch_1ddc5b + octave 3 + note A_, 7 + note __, 6 + note A#, 7 + note __, 7 + note __, 13 + inc_octave + note C#, 14 + note C_, 7 + note __, 6 + note __, 14 + dec_octave + note A#, 7 + note __, 6 + note __, 14 + note A#, 13 + note A#, 14 + note A_, 7 + note __, 6 + note G_, 7 + note __, 7 + note A_, 13 + note A_, 14 + octave 2 + note F_, 13 + callchannel Branch_1ddc5b + octave 3 + note A_, 7 + note __, 6 + note G#, 12 + note __, 2 + note G#, 7 + note __, 6 + callchannel Branch_1ddc5b + octave 4 + note E_, 3 + note F_, 10 + note F_, 14 + note D#, 7 + note __, 6 + callchannel Branch_1ddc5b + octave 4 + note D_, 3 + note D#, 10 + note D#, 14 + note G_, 7 + note __, 6 + callchannel Branch_1ddc5b + octave 3 + note G_, 13 + note G_, 14 + callchannel Branch_1ddc4e + callchannel Branch_1ddc41 + callchannel Branch_1ddc4e + inc_octave + note C#, 14 + octave 2 + note C#, 4 + note G#, 4 + inc_octave + note C#, 5 + inc_octave + note C#, 5 + note C#, 9 + octave 4 + note D#, 13 + note __, 14 + octave 2 + note D#, 4 + note A#, 4 + inc_octave + note D#, 5 + inc_octave + note D#, 5 + note D#, 9 + octave 3 + note A_, 13 + note A_, 14 + octave 3 + note C_, 13 + note F_, 5 + note F_, 9 + note A_, 5 + note A_, 8 + inc_octave + note C_, 5 + note C_, 9 + note __, 13 + inc_octave + note C_, 5 + note C_, 9 + note __, 13 + loopchannel 0, .MainLoop + +Branch_1ddc41: + octave 3 + note C_, 5 + note C_, 9 + endchannel + +Branch_1ddc4e: + octave 3 + note C_, 5 + note C_, 8 + endchannel + +Branch_1ddc5b: + octave 3 + note C_, 5 + note C_, 9 + endchannel + +Branch_1ddc68: + octave 3 + note C_, 5 + note C_, 8 + endchannel + +Branch_1ddc75: + octave 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 1 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 1 + dec_octave + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + note G_, 5 + note __, 1 + note A#, 5 + note __, 2 + note A#, 5 + note __, 2 + note A#, 5 + note __, 2 + note A#, 5 + note __, 1 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 1 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 1 + dec_octave + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + note G_, 5 + note __, 1 + note A#, 14 + note A#, 5 + note A#, 8 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 1 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 1 + dec_octave + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + note G_, 5 + note __, 1 + note A#, 5 + note __, 2 + note A#, 5 + note __, 2 + note A#, 5 + note __, 2 + note A#, 5 + note __, 1 + note __, 14 + note __, 13 + note __, 14 + note G_, 13 + note G_, 14 + note A#, 5 + note __, 2 + note A#, 5 + note __, 1 + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + note A#, 5 + note __, 2 + note A#, 5 + note __, 1 + octave 4 + note E_, 4 + note F_, 3 + note __, 7 + octave 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 1 + octave 4 + note A_, 7 + note __, 16 + note __, 4 + note D#, 14 + note F_, 7 + note __, 6 + octave 2 + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + octave 4 + note F_, 7 + note __, 6 + octave 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 2 + octave 4 + note C_, 7 + note __, 6 + octave 3 + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + octave 4 + note D_, 3 + note D#, 10 + note D#, 14 + note D_, 7 + note __, 6 + octave 2 + note G_, 5 + note __, 2 + note G_, 5 + note __, 2 + octave 4 + note D_, 7 + note __, 6 + note C_, 7 + note __, 7 + octave 2 + note A_, 5 + note __, 2 + note A_, 5 + note __, 1 + octave 3 + note F_, 7 + note __, 7 + note __, 7 + note __, 6 + note G_, 14 + note A_, 7 + note __, 6 + octave 2 + note G_, 5 + note __, 2 + note __, 5 + note __, 2 + octave 4 + note C_, 7 + note __, 6 + octave 2 + note __, 14 + note __, 13 + note __, 14 + note F_, 5 + note __, 2 + note F_, 6 + note F_, 14 + note G_, 5 + note __, 2 + note G_, 5 + note __, 1 + octave 2 + note C_, 4 + note D_, 3 + note E_, 4 + note F_, 3 + note G_, 4 + note A_, 3 + note A#, 3 + inc_octave + note C_, 3 + octave 2 + note __, 14 + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + inc_octave + note D_, 5 + note __, 2 + note D_, 5 + note __, 2 + note D_, 5 + note __, 2 + note D_, 5 + note __, 1 + note __, 9 + note __, 5 + dec_octave + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + inc_octave + note D_, 5 + note __, 2 + note D_, 5 + note __, 2 + dec_octave + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + note __, 14 + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 1 + note __, 9 + note __, 5 + dec_octave + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + inc_octave + note E_, 5 + note __, 2 + note E_, 5 + note __, 2 + dec_octave + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + note __, 14 + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + inc_octave + note D_, 5 + note __, 2 + note D_, 5 + note __, 2 + note D_, 5 + note __, 2 + note D_, 5 + note __, 1 + note __, 9 + note __, 5 + dec_octave + note G_, 5 + note __, 2 + note G_, 5 + note __, 1 + inc_octave + note D_, 5 + note __, 2 + note D_, 5 + note __, 2 + dec_octave + note G_, 5 + note __, 2 + note G_, 5 + note __, 1 + note __, 14 + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note C_, 5 + note __, 1 + note __, 9 + note __, 5 + dec_octave + note A_, 13 + note A#, 14 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 1 + note __, 14 + dec_octave + note F_, 5 + note __, 2 + note F_, 5 + note __, 1 + inc_octave + note D_, 5 + note __, 2 + note D_, 5 + note __, 2 + note D_, 5 + note __, 2 + note D_, 5 + note __, 1 + note __, 9 + note __, 5 + dec_octave + note G_, 5 + note __, 2 + note G_, 5 + note __, 1 + inc_octave + note E_, 5 + note __, 2 + note E_, 5 + note __, 2 + dec_octave + note G_, 5 + note __, 2 + note G_, 5 + note __, 1 + note __, 14 + note B_, 13 + inc_octave + note C#, 5 + note __, 2 + note C#, 5 + note __, 2 + note D_, 13 + note D_, 14 + dec_octave + note A_, 5 + note __, 2 + note A_, 5 + note __, 1 + inc_octave + note C_, 5 + note __, 2 + note C_, 5 + note __, 2 + note D_, 13 + note D_, 14 + dec_octave + note A#, 7 + note A#, 6 + inc_octave + note D_, 7 + note D_, 7 + note E_, 13 + note E_, 14 + note C_, 7 + note C_, 6 + note E_, 7 + note E_, 7 + note F_, 13 + endchannel + + +Music_TCG2Ishihara_Ch3: + notetype1 10 + notetype2 11 + notetype1 1 + notetype0 1 + note __, 13 + octave 2 + note C_, 14 + note C#, 4 + note D_, 3 + note D#, 3 + note E_, 3 +.MainLoop + octave 2 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + dec_octave + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + dec_octave + note D#, 7 + note __, 7 + note C_, 7 + note __, 6 + note D#, 7 + note __, 7 + note E_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + dec_octave + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + note F_, 14 + inc_octave + inc_octave + note E_, 13 + note F_, 4 + note __, 10 + dec_octave + note B_, 13 + inc_octave + note C_, 4 + note __, 10 + dec_octave + note E_, 13 + note F_, 4 + note __, 10 + note C_, 13 + dec_octave + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + dec_octave + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + dec_octave + note D#, 7 + note __, 7 + note C_, 7 + note __, 6 + note D#, 7 + note __, 7 + note E_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + dec_octave + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + note F_, 14 + note A#, 13 + note B_, 7 + note __, 7 + inc_octave + note C_, 7 + note __, 6 + vibrato 7, $33 + note D#, 7 + note D#, 7 + vibrato 0, $33 + note C_, 7 + note __, 6 + note D#, 7 + note __, 7 + note E_, 7 + note __, 6 + callchannel Branch_1de0c5 + octave 2 + note A#, 14 + inc_octave + note F_, 13 + note A#, 7 + note __, 7 + note D#, 13 + note D#, 14 + dec_octave + note A#, 13 + note D#, 14 + note E_, 7 + note __, 6 + callchannel Branch_1de0c5 + octave 2 + note A#, 14 + inc_octave + note F_, 13 + note A#, 7 + note __, 7 + note D#, 13 + note D#, 14 + dec_octave + note A#, 13 + note D#, 14 + note D_, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + inc_octave + note G#, 14 + dec_octave + note G#, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + inc_octave + inc_octave + note C#, 14 + dec_octave + dec_octave + note G_, 7 + note __, 6 + note G#, 7 + note __, 7 + note G#, 7 + note __, 6 + inc_octave + inc_octave + note C_, 14 + dec_octave + dec_octave + note D#, 7 + note __, 6 + note G#, 7 + note __, 7 + note G#, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note A_, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note B_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note D#, 14 + dec_octave + note C_, 7 + note __, 6 + dec_octave + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note F_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 13 + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + inc_octave + note G#, 14 + dec_octave + note G#, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + inc_octave + inc_octave + note C#, 14 + dec_octave + dec_octave + note C#, 7 + note __, 6 + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + inc_octave + note D#, 14 + dec_octave + dec_octave + note G_, 7 + note __, 6 + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note G_, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + inc_octave + inc_octave + note C#, 14 + dec_octave + dec_octave + note F_, 7 + note __, 6 + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note F_, 13 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note C_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + inc_octave + inc_octave + note C#, 14 + dec_octave + dec_octave + note G#, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + inc_octave + inc_octave + note C#, 14 + dec_octave + dec_octave + note G_, 7 + note __, 6 + note G#, 7 + note __, 7 + note G#, 7 + note __, 6 + inc_octave + inc_octave + note D#, 14 + dec_octave + dec_octave + note D#, 7 + note __, 6 + note G#, 7 + note __, 7 + note G#, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note A_, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + inc_octave + inc_octave + note C#, 14 + dec_octave + dec_octave + note B_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note D#, 14 + dec_octave + note C_, 7 + note __, 6 + dec_octave + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note F_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 13 + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + inc_octave + note G#, 14 + dec_octave + note G#, 7 + note __, 6 + note C#, 7 + note __, 7 + note C#, 7 + note __, 6 + inc_octave + note G#, 14 + dec_octave + note G#, 7 + note __, 6 + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note G_, 7 + note __, 6 + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note G_, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + inc_octave + inc_octave + note G#, 14 + dec_octave + dec_octave + note C_, 13 + note C_, 7 + note __, 7 + inc_octave + note C_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + dec_octave + note F_, 13 + note F_, 7 + note __, 7 + note F_, 13 + note A_, 7 + note __, 7 + inc_octave + note C_, 7 + note __, 6 + note F_, 7 + note __, 7 + note __, 7 + note __, 6 + inc_octave + inc_octave + note F_, 7 + notetype1 3 + note F_, 7 + note __, 13 + notetype1 1 + loopchannel 0, .MainLoop + +Branch_1de0c5: + octave 2 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + dec_octave + note F_, 7 + note __, 6 + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note A#, 7 + note __, 7 + note D#, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + dec_octave + note F_, 7 + note __, 6 + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note G_, 14 + dec_octave + note C_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + dec_octave + note F_, 7 + note __, 6 + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + note A#, 7 + note __, 7 + note D#, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + dec_octave + note C_, 13 + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + note D#, 14 + note E_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note F_, 14 + dec_octave + note F_, 7 + note __, 6 + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note D#, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note A_, 14 + dec_octave + note F_, 7 + note __, 6 + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note C_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note A_, 14 + dec_octave + note F_, 7 + note __, 6 + note D#, 7 + note __, 7 + note D#, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note D#, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note C_, 7 + note __, 7 + dec_octave + note G_, 13 + note __, 14 + note A_, 13 + note A_, 14 + note F_, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + inc_octave + note A_, 14 + note A_, 13 + dec_octave + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + inc_octave + note A_, 14 + dec_octave + note A#, 7 + note __, 6 + note A_, 7 + note __, 7 + note A_, 7 + note __, 6 + inc_octave + note A_, 14 + note A_, 13 + dec_octave + note A_, 7 + note __, 7 + note A_, 7 + note __, 6 + inc_octave + note A_, 14 + dec_octave + note A_, 7 + note __, 6 + note G_, 7 + note __, 7 + note G_, 7 + note __, 6 + inc_octave + note A#, 14 + note A#, 13 + dec_octave + note C_, 7 + note __, 7 + note C_, 7 + note __, 6 + inc_octave + note A#, 14 + dec_octave + note C_, 7 + note __, 6 + note F_, 7 + note __, 7 + note F_, 7 + note __, 6 + inc_octave + note A_, 14 + note A_, 13 + dec_octave + note F_, 7 + note __, 7 + note F_, 13 + note G_, 14 + note A_, 7 + note __, 6 + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + inc_octave + note A_, 14 + note A_, 13 + dec_octave + note A#, 7 + note __, 7 + note A#, 7 + note __, 6 + inc_octave + inc_octave + note C_, 14 + dec_octave + dec_octave + note A#, 7 + note __, 6 + note A_, 7 + note __, 7 + note B_, 7 + note __, 6 + inc_octave + note C#, 7 + note __, 7 + note D_, 13 + note D_, 14 + dec_octave + note D_, 7 + note __, 6 + inc_octave + inc_octave + note C_, 14 + dec_octave + dec_octave + note G_, 13 + note G_, 14 + inc_octave + note D_, 13 + note G_, 7 + note __, 7 + dec_octave + note A_, 13 + note A_, 14 + inc_octave + note E_, 13 + note A_, 7 + note __, 7 + dec_octave + note A#, 13 + endchannel + + +Music_TCG2Ishihara_Ch4: + togglenoise $06 + notetype 1 + octave 1 + note D#, 13 + notetype 9 + note E_, 3 + notetype 1 +.MainLoop + callchannel Branch_1de321 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note C#, 13 + note C_, 14 + note D#, 13 + note C#, 14 + note D#, 7 + note C#, 6 + note C#, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 12 + callchannel Branch_1de321 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note C#, 13 + note C_, 14 + note D#, 13 + note C#, 14 + note D#, 7 + note C#, 6 + note C#, 14 + note __, 13 + note __, 14 + note __, 13 + note __, 14 + note __, 13 + note D#, 7 + note D#, 7 + note E_, 13 +.Loop1 + callchannel Branch_1de321 + callchannel Branch_1de321 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note E_, 13 + note C_, 14 + note D#, 4 + note D#, 4 + note D#, 5 + note C#, 14 + note C#, 13 + callchannel Branch_1de321 + callchannel Branch_1de321 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note C#, 13 + note C_, 14 + note E_, 13 + note C#, 7 + note C#, 7 + note C#, 13 + callchannel Branch_1de321 + callchannel Branch_1de321 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note C#, 13 + note C_, 14 + note C#, 4 + note C#, 4 + note C#, 5 + note C#, 14 + note C#, 13 + callchannel Branch_1de321 + note C_, 14 + note C#, 13 + note C#, 14 + note C_, 16 + note __, 11 + note C#, 13 + note C#, 14 + note E_, 13 + note __, 14 + note C#, 13 + note C#, 14 + note C_, 16 + note __, 11 + note C#, 13 + note C#, 14 + note C_, 13 + note __, 14 + note C#, 13 + note C#, 14 + note C_, 13 + note __, 14 + note C#, 4 + note C#, 4 + note C#, 5 + note C#, 14 + note C#, 13 + loopchannel 2, .Loop1 + callchannel Branch_1de321 + callchannel Branch_1de321 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note C#, 13 + note C_, 14 + note C#, 13 + note C#, 14 + note C#, 13 + callchannel Branch_1de321 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note C#, 13 + note C_, 14 + note C#, 13 + note C#, 14 + note E_, 13 + note __, 14 + note C#, 4 + note C#, 4 + note C#, 5 + note C#, 14 + note C#, 13 + note C#, 14 + note D#, 7 + note C#, 6 + note C#, 14 + note C#, 13 + callchannel Branch_1de321 + callchannel Branch_1de321 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note C#, 13 + note C_, 14 + note C#, 4 + note C#, 4 + note C#, 5 + note C#, 14 + note C#, 13 + callchannel Branch_1de321 + note C_, 14 + note C_, 13 + note C#, 14 + note E_, 13 + note C#, 14 + note D#, 7 + note C#, 6 + note C#, 14 + note C#, 13 + note C_, 14 + note C#, 5 + note C#, 4 + note C#, 4 + note C#, 14 + note C_, 13 + note D#, 14 + note C#, 13 + note C#, 14 + note C_, 13 + note __, 14 + note C#, 13 + note C#, 14 + note C#, 13 + note C#, 14 + note D#, 5 + note D#, 4 + note D#, 4 + notetype 9 + note F_, 3 + notetype 1 + loopchannel 0, .MainLoop + +Branch_1de321: + note C_, 14 + note C_, 13 + note C#, 14 + note C#, 13 + note C_, 14 + note D#, 13 + note C#, 14 + note E_, 13 + endchannel + diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm new file mode 100644 index 00000000..c916b5fe --- /dev/null +++ b/crysaudio/music/TCG2/titlescreen.asm @@ -0,0 +1,1420 @@ +Music_TCG2TitleScreen: + db $C0 + dw Music_TCG2TitleScreen_Ch1 + db $01 + dw Music_TCG2TitleScreen_Ch2 + db $02 + dw Music_TCG2TitleScreen_Ch3 + db $03 + dw Music_TCG2TitleScreen_Ch4 + +Music_TCG2TitleScreen_Ch2: + notetype1 10 + octave 3 + notetype0 1 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note E_, 4 + note F_, 3 + note F#, 4 + vibrato 0, $33 +.Loop1 + note G_, 16 + note G_, 14 + note G_, 15 + rept 3 + note G_, 4 + note G_, 1 + endr + loopchannel 4, .Loop1 +.Loop2 + note G_, 3 + note A_, 4 + note G_, 4 + note A_, 4 + loopchannel 8, .Loop2 + notetype0 10 + note G_, 3 + octave 2 + notetype2 4 + dutycycle 2 + note F_, 3 + note E_, 3 + octave 3 + notetype2 8 + notetype0 1 + note G_, 8 + note G_, 7 + note __, 8 + note F_, 5 + note F_, 2 + notetype0 5 + note E_, 3 + note E_, 3 + note G_, 3 + note G_, 3 + inc_octave + vibrato 15, $33 + note D_, 6 + note D_, 3 + notetype0 1 + note C_, 7 + note C_, 8 + dec_octave + vibrato 30, $33 + notetype0 10 + note G_, 6 + note G_, 3 + notetype0 1 + note E_, 8 + note E_, 15 + note G_, 5 + note G_, 2 + note G_, 15 + note G_, 15 + note G_, 15 + note F_, 8 + note F_, 7 + note F_, 15 + note E_, 5 + note F_, 5 + note E_, 5 + note D_, 7 + note F_, 8 + note C_, 7 + note D_, 8 + note D_, 15 + note D_, 16 + note D_, 16 + note D_, 16 + note D_, 12 + note D_, 15 + note G_, 8 + note G_, 7 + note __, 8 + note F_, 5 + note F_, 2 + notetype0 5 + note E_, 3 + note E_, 3 + note G_, 3 + note G_, 3 + inc_octave + vibrato 15, $33 + note D_, 6 + note D_, 3 + notetype0 1 + note E_, 8 + note E_, 7 + dec_octave + vibrato 30, $33 + notetype0 10 + note G_, 6 + notetype0 5 + note G_, 3 + note E_, 3 + note F_, 3 + notetype0 1 + note G_, 8 + note G_, 7 + note G#, 15 + note G#, 8 + note G#, 7 + inc_octave + note C_, 15 + note C_, 8 + note C_, 7 + vibrato 15, $33 + note D_, 15 + note D_, 15 + note D_, 15 + note C_, 8 + note C_, 7 + note F#, 4 + vibrato 25, $33 + note G_, 11 + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note F_, 8 + note G_, 7 + note C_, 15 + note D_, 8 + note D_, 7 + vibrato 26, $33 + octave 4 + note D_, 4 + note D#, 11 + note D#, 15 + note D#, 15 + note D#, 15 + note D#, 15 + note D#, 15 + note F_, 8 + note F_, 15 + note D#, 5 + note D#, 2 + note D_, 8 + note D#, 3 + note D_, 4 + note D_, 4 + note D#, 4 + dec_octave + note A#, 4 + inc_octave + note D_, 3 + dec_octave + vibrato 15, $33 + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note G#, 8 + note G#, 15 + note A#, 5 + note G#, 2 + inc_octave + note C_, 8 + dec_octave + note A#, 7 + inc_octave + note C_, 8 + note G_, 5 + note C_, 2 + note G_, 15 + note G_, 15 + note G_, 15 + note F_, 8 + note G_, 7 + note A#, 7 + note G_, 3 + note D#, 7 + note A#, 3 + note C_, 7 + note D#, 3 + note D_, 8 + note D#, 4 + note D_, 3 + note D_, 4 + note D#, 4 + dec_octave + note A#, 4 + inc_octave + note D_, 3 + dec_octave + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note G#, 5 + note G_, 3 + note A#, 5 + note G#, 2 + inc_octave + note C_, 15 + note C_, 15 + note C_, 8 + note G_, 4 + note G_, 3 + note D#, 4 + note G_, 4 + note C_, 4 + note D#, 3 + dec_octave + note B_, 15 + inc_octave + note C_, 8 + note F#, 4 + note G_, 15 + note G_, 3 + note F_, 8 + note G_, 7 + note D_, 7 + note D_, 3 + note D#, 7 + note D_, 3 + note F_, 7 + note D#, 3 + note D_, 7 + note F_, 3 + note A#, 7 + note D_, 3 + note F_, 7 + note A#, 3 + note D#, 15 + note D#, 8 + note C_, 15 + note D_, 3 + note C_, 4 + note D#, 4 + note D_, 4 + note F_, 3 + note D#, 4 + note G_, 15 + note G_, 16 + note G_, 14 + note F_, 8 + note G_, 7 + note G_, 15 + note F_, 8 + note A_, 3 + note A#, 12 + note G#, 3 + note A#, 4 + note D#, 4 + note A#, 4 + note G#, 3 + note D#, 4 + notetype0 5 + note G_, 12 + note G_, 6 + note G_, 3 + octave 4 + note G_, 1 + note A_, 1 + note B_, 1 + notetype0 1 + vibrato 20, $33 + inc_octave + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + dec_octave + note B_, 8 + inc_octave + note C_, 15 + dec_octave + note A_, 5 + note B_, 2 + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note E_, 5 + note G_, 3 + note G_, 5 + note E_, 2 + note A_, 15 + note A_, 15 + note A_, 15 + note A_, 15 + note A_, 15 + note G_, 8 + note A_, 7 + note F_, 8 + note G_, 7 + note A_, 8 + note F_, 7 + note G_, 8 + note A_, 3 + note G_, 4 + note G_, 4 + note A_, 4 + note E_, 3 + note G_, 4 + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + notetype2 8 + octave 3 + note D_, 8 + note D_, 7 + octave 4 + note D_, 5 + note C_, 3 + note E_, 5 + note D_, 2 + note F_, 15 + note F_, 15 + note F_, 15 + note F_, 15 + note F_, 8 + note F_, 7 + note E_, 8 + note F_, 7 + note D_, 8 + note E_, 7 + note F_, 8 + note D_, 7 + note E_, 8 + note F_, 15 + dec_octave + note G_, 5 + inc_octave + note E_, 2 + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + dec_octave + note A_, 5 + inc_octave + note C_, 3 + note C_, 5 + dec_octave + note A_, 2 + inc_octave + vibrato 0, $33 + note D_, 16 + note D_, 14 + note D_, 15 + note D_, 8 + note E_, 7 + note D_, 15 + note D_, 8 + dec_octave + note A_, 16 + note A_, 7 + inc_octave + note C_, 8 + dec_octave + note A_, 7 + inc_octave + note C_, 16 + note C_, 14 + note C_, 15 + dec_octave + note B_, 4 + inc_octave + note C_, 4 + dec_octave + note B_, 3 + note A_, 4 + note B_, 16 + note B_, 14 + note B_, 15 + inc_octave + note C_, 8 + dec_octave + note B_, 7 + inc_octave + vibrato 30, $33 + note C_, 16 + note C_, 14 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 10 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 16 + note C_, 12 + note C_, 12 + endchannel + + +Music_TCG2TitleScreen_Ch1: + notetype1 10 + octave 3 + notetype0 1 + note __, 2 + note G_, 3 + note A_, 4 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note E_, 4 + note F_, 3 + note F#, 2 + vibrato 0, $33 + note D_, 16 + note D_, 14 + note D_, 15 +.Loop1 + note D_, 4 + note D_, 1 + loopchannel 3, .Loop1 + note C_, 16 + note C_, 14 + note C_, 15 +.Loop2 + note C_, 4 + note C_, 1 + loopchannel 3, .Loop2 + dec_octave + note B_, 16 + note B_, 14 + note B_, 15 +.Loop3 + note B_, 4 + note B_, 1 + loopchannel 3, .Loop3 + note A_, 16 + note A_, 14 + note A_, 15 +.Loop4 + note A_, 4 + note A_, 1 + loopchannel 3, .Loop4 + vibrato 28, $33 + notetype0 10 + note G_, 12 + note G_, 3 + note __, 3 + note __, 3 + notetype0 1 + octave 2 + octave 2 + notetype2 8 + notetype0 1 + note B_, 8 + note B_, 7 + note __, 8 + inc_octave + note D_, 5 + note D_, 2 + notetype0 5 + note C_, 3 + note C_, 3 + note E_, 3 + note E_, 3 + vibrato 15, $33 + note G_, 6 + note G_, 3 + notetype0 1 + note G_, 8 + note G_, 7 + note E_, 15 + octave 3 + note E_, 8 + inc_octave + note C_, 7 + note D_, 8 + note C_, 7 + note C_, 8 + note D_, 7 +.Loop5 + note G_, 4 + note A_, 4 + note G_, 3 + note A_, 4 + loopchannel 2, .Loop5 + notetype0 1 + octave 3 + note C_, 8 + note C_, 7 + note __, 8 + note D_, 5 + note C_, 2 + vibrato 0, $33 + note F_, 15 + note F_, 15 + note F_, 15 + note C_, 8 + note C_, 7 + note C_, 15 + dec_octave + note A_, 8 + inc_octave + note C_, 7 + dec_octave + note F_, 8 + note A_, 7 + note E_, 8 + note F_, 7 + note F_, 8 + octave 2 + note A_, 7 + note B_, 4 + note A_, 4 + inc_octave + note C_, 4 + dec_octave + note B_, 3 + inc_octave + note D_, 8 + note F_, 4 + note D_, 3 + note A_, 4 + note F_, 4 + inc_octave + note C_, 4 + dec_octave + note A_, 3 + note B_, 15 + note A_, 5 + note B_, 5 + note A_, 5 + note E_, 8 + note A_, 7 + note D_, 8 + note E_, 7 + octave 3 + notetype0 5 + note C_, 3 + note C_, 3 + note E_, 3 + note E_, 3 + vibrato 15, $33 + note G_, 6 + note G_, 3 + notetype0 1 + note G_, 8 + note G_, 7 + note E_, 15 + octave 3 + note E_, 8 + inc_octave + note C_, 7 + note D_, 8 + note C_, 7 + note C_, 8 + note D_, 7 + note G_, 4 + note A_, 4 + note G_, 3 + note A_, 4 + notetype0 1 + octave 3 + note C_, 15 + note D_, 15 + note E_, 8 + note E_, 7 + note F_, 15 + octave 3 + note C_, 8 + note F_, 7 + note G#, 8 + note F_, 7 + note F_, 8 + note G#, 7 + octave 3 + notetype0 1 + note G#, 16 + note G#, 14 + note G#, 15 + note F_, 8 + note F_, 7 + inc_octave + note D#, 15 + octave 3 + note F_, 8 + note G#, 7 + inc_octave + note C_, 8 + note C_, 7 + dec_octave + note G#, 8 + inc_octave + note C_, 7 + note D_, 4 + note D#, 4 + dec_octave + note F_, 7 + note G#, 4 + note F_, 4 + inc_octave + note C_, 4 + dec_octave + note F_, 3 + inc_octave + note F_, 3 + note C_, 2 + dec_octave + note G#, 3 + inc_octave + note C_, 2 + note C_, 3 + dec_octave + note G#, 2 + inc_octave + note F_, 3 + note C_, 2 + note G#, 3 + note F_, 2 + inc_octave + note C_, 3 + dec_octave + note G#, 2 + notetype1 3 + note C_, 3 + dec_octave + note G#, 3 + note __, 2 + notetype0 1 + octave 3 + note G#, 3 + note G#, 4 + inc_octave + note C_, 4 + dec_octave + note G#, 4 + note G#, 3 + inc_octave + note C_, 4 + note D#, 4 + dec_octave + note G#, 4 + note G#, 3 + inc_octave + note D#, 4 + note G_, 4 + dec_octave + note G#, 4 + note G#, 3 + inc_octave + note G_, 8 + dec_octave + note G#, 4 + note G#, 4 + note G#, 3 + inc_octave + note C_, 4 + dec_octave + note G#, 4 + note G#, 3 + inc_octave + note C_, 4 + note D#, 4 + dec_octave + note G#, 4 + note G#, 3 + inc_octave + note D#, 4 + note G_, 4 + dec_octave + note G#, 4 + note G#, 3 + inc_octave + note G_, 4 + note G_, 4 + dec_octave + note G#, 4 + note D_, 4 + note D_, 3 + note G_, 4 + note D_, 4 + note D_, 3 + note G_, 4 + note A#, 4 + note D_, 4 + note D_, 3 + note A#, 4 + inc_octave + note D_, 4 + dec_octave + note D_, 4 + note D_, 3 + inc_octave + note D_, 8 + dec_octave + note D_, 4 + note D_, 4 + note D_, 3 + note G_, 4 + note D_, 4 + note D_, 3 + note G_, 4 + note A#, 4 + note D_, 4 + note D_, 3 + note A#, 4 + inc_octave + note D_, 4 + dec_octave + note D_, 4 + note D_, 3 + inc_octave + note D_, 4 + note D_, 4 + dec_octave + note D_, 4 + note F_, 3 + note F_, 4 + note G#, 4 + note F_, 4 + note F_, 3 + note G#, 4 + inc_octave + note C_, 4 + dec_octave + note F_, 4 + note F_, 3 + inc_octave + note C_, 4 + note D#, 4 + dec_octave + note F_, 4 + note F_, 3 + inc_octave + note D#, 8 + dec_octave + note F_, 4 + note F_, 4 + note F_, 3 + note G#, 4 + note F_, 4 + note F_, 3 + note G#, 4 + inc_octave + note C_, 4 + dec_octave + note F_, 4 + note F_, 3 + inc_octave + note C_, 4 + note D#, 4 + dec_octave + note F_, 4 + note F_, 3 + inc_octave + note D#, 4 + note D#, 4 + dec_octave + note F_, 4 + note D#, 4 + note D#, 3 + note G_, 4 + note D#, 4 + note D#, 3 + note G_, 4 + note A#, 4 + note D#, 4 + note D#, 3 + note A#, 4 + inc_octave + note D_, 4 + dec_octave + note D#, 4 + note D#, 3 + inc_octave + note D_, 8 + dec_octave + note D#, 4 + note D#, 4 + note D#, 3 + note G_, 4 + note D#, 4 + note D#, 3 + note G_, 4 + note A#, 4 + note D#, 4 + note E_, 3 + note A#, 4 + inc_octave + note C_, 4 + dec_octave + note E_, 4 + note E_, 3 + inc_octave + note C_, 4 + octave 3 + note D#, 8 + note D#, 7 + note C_, 5 + note D#, 5 + note G#, 5 + inc_octave + note C_, 8 + dec_octave + note G#, 7 + note G#, 5 + inc_octave + note C_, 5 + note D#, 5 + note F#, 15 + note D#, 8 + note F#, 7 + dec_octave + note B_, 8 + inc_octave + note D#, 7 + dec_octave + note G#, 8 + note B_, 7 + note A#, 15 + note A#, 8 + note F_, 7 + note A#, 8 + note F_, 5 + note F#, 2 + note A#, 8 + note F_, 5 + note A#, 2 + vibrato 8, $33 + note G_, 8 + note G_, 15 + note G_, 7 + note C_, 8 + note C_, 15 + note C_, 7 + note F_, 8 + note C_, 7 + note C_, 5 + note F_, 5 + note A_, 5 + inc_octave + note C_, 8 + dec_octave + note A_, 7 + note F_, 5 + note A_, 5 + inc_octave + note C_, 5 + note F_, 15 + note C_, 8 + note C_, 7 + dec_octave + note A_, 8 + inc_octave + note C_, 7 + dec_octave + note F_, 8 + note A_, 7 + note G_, 8 + note F_, 7 + note D_, 5 + note G_, 5 + note B_, 5 + inc_octave + note D_, 8 + dec_octave + note B_, 7 + note B_, 5 + inc_octave + note D_, 5 + note G_, 5 + note B_, 8 + note B_, 15 + note B_, 7 + dec_octave + dec_octave + dec_octave + note B_, 3 + inc_octave + note D_, 4 + note G_, 4 + note B_, 4 + inc_octave + note F_, 3 + note B_, 4 + inc_octave + note D_, 4 + note E_, 4 +.Loop6 + octave 4 + notetype2 8 + note E_, 16 + note E_, 14 + notetype2 8 + octave 3 + note C_, 8 + note C_, 7 + dec_octave + notetype2 8 + note E_, 5 + note E_, 3 + note E_, 5 + note E_, 2 + rept 2 + note E_, 8 + note E_, 7 + endr + inc_octave + notetype2 8 + note C_, 8 + note C_, 7 + note __, 8 + octave 4 + notetype2 8 + note E_, 5 + note E_, 2 + loopchannel 2, .Loop6 + octave 4 + notetype2 8 + note E_, 16 + note E_, 14 + notetype2 8 + octave 3 + note C_, 8 + note C_, 7 + dec_octave + notetype2 8 + note F_, 5 + note F_, 3 + note F_, 5 + note F_, 2 + note F_, 8 + note F_, 7 + octave 4 + notetype2 8 + note E_, 8 + note E_, 7 + octave 3 + notetype2 8 + note C_, 8 + note C_, 7 + octave 4 + notetype2 8 + note D_, 5 + note D_, 3 + note C_, 5 + note D_, 2 + note D_, 8 + note C_, 4 + note __, 11 + dec_octave + note G_, 4 + inc_octave + note D_, 3 + dec_octave + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + dec_octave + note B_, 3 + inc_octave + note C_, 4 + note D_, 4 + note E_, 4 + note F_, 3 + note G_, 4 + note A_, 4 + note B_, 4 + vibrato 30, $33 + inc_octave + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + note C_, 15 + dec_octave + note G#, 8 + inc_octave + note C_, 7 + dec_octave + note F_, 8 + note A#, 7 + inc_octave + note C_, 8 + note F_, 7 + note C_, 8 + note C_, 15 + dec_octave + note E_, 5 + inc_octave + note C_, 2 + dec_octave + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note G_, 15 + note E_, 5 + note G_, 3 + note G_, 5 + note E_, 2 + note F#, 16 + note F#, 14 + note F#, 15 + note F#, 5 + note F#, 3 + note F#, 5 + note F#, 2 + note F#, 15 + note F#, 8 + note F#, 16 + note F#, 4 + note F#, 3 + note F#, 8 + note F#, 7 + note F_, 16 + note F_, 14 + note F_, 15 + note F_, 8 + note F_, 7 + note F_, 16 + note F_, 14 + note F_, 15 + note F_, 8 + note F_, 7 + note F_, 16 + note F_, 14 + note F_, 15 + note F_, 5 + note F_, 3 + note F_, 5 + note F_, 2 + note F_, 15 + note F_, 5 + note D_, 15 + note F_, 5 + note F_, 15 + note D_, 5 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 16 + note E_, 10 + note E_, 12 + endchannel + + +Music_TCG2TitleScreen_Ch3: + notetype1 10 + notetype2 11 + notetype1 1 + notetype0 1 + note __, 14 + note __, 14 + notetype0 5 + octave 3 + note D_, 9 + note D_, 1 + note D_, 1 + note D_, 1 + note C_, 9 + note C_, 1 + note C_, 1 + note C_, 1 + dec_octave + note B_, 9 + note B_, 1 + note B_, 1 + note B_, 1 + note A_, 9 + note A_, 1 + note A_, 1 + note A_, 1 + notetype0 10 + note G_, 12 + note G_, 3 + note F_, 3 + note E_, 3 + note D_, 3 + notetype0 5 + octave 3 + note C_, 6 + note C_, 6 + dec_octave + note B_, 6 + note B_, 6 + note A_, 6 + note A_, 6 + note G_, 6 + note G_, 6 + note F_, 6 + note F_, 6 + note E_, 6 + note E_, 6 + note D_, 6 + note D_, 6 + note G_, 6 + note A_, 3 + note B_, 3 + inc_octave + note C_, 6 + note C_, 6 + dec_octave + note B_, 6 + note B_, 6 + note A_, 6 + note A_, 6 + note G_, 6 + note G_, 6 + note F_, 6 + note F_, 6 + note F_, 6 + note F_, 6 + note A#, 6 + note A#, 6 + note A#, 6 + note A_, 6 + notetype0 5 + note G#, 3 + note G#, 6 + notetype0 1 + note G#, 7 + note G#, 8 + notetype0 5 + note G#, 3 + note G#, 6 + note G#, 3 + note G_, 3 + note G_, 6 + notetype0 1 + note G_, 7 + note G_, 8 + notetype0 5 + note G_, 3 + note G_, 6 + note G_, 3 + note F_, 3 + note F_, 6 + notetype0 1 + note F_, 7 + note F_, 8 + notetype0 5 + note A#, 3 + note A#, 6 + note E_, 3 + note D#, 3 + note D#, 6 + notetype0 1 + note D#, 7 + note D#, 8 + notetype0 5 + note D#, 3 + note D#, 3 + note E_, 6 + note F_, 6 + note F_, 6 + note G#, 6 + note G#, 6 + note G_, 6 + note G_, 6 + note C_, 6 + note C_, 6 + note D_, 6 + note D_, 6 + note D_, 6 + note D_, 6 + note G_, 6 + note G_, 6 + note G_, 6 + note G_, 6 + notetype0 5 + octave 2 +.Loop1 + notetype0 5 + note A_, 3 + note A_, 3 + callchannel Branch_1ea254 + notetype0 1 + note A_, 7 + note A_, 8 + loopchannel 2, .Loop1 +.Loop2 + notetype0 5 + note G_, 3 + note G_, 3 + callchannel Branch_1ea254 + notetype0 1 + note G_, 7 + note G_, 8 + loopchannel 2, .Loop2 +.Loop3 + notetype0 5 + note F_, 3 + note F_, 3 + callchannel Branch_1ea254 + notetype0 1 + note F_, 7 + note F_, 8 + loopchannel 2, .Loop3 + notetype0 5 + note E_, 3 + note E_, 3 + callchannel Branch_1ea254 + notetype0 1 + note E_, 7 + note E_, 8 + notetype0 5 + note E_, 3 + note E_, 3 + callchannel Branch_1ea26d + notetype0 1 + note E_, 7 + note E_, 8 + notetype0 5 + octave 2 + note G#, 6 + note G#, 6 + note G#, 6 + note G#, 6 + note G_, 6 + note G_, 6 + note G_, 6 + note G_, 6 + note F#, 6 + note F#, 6 + note F#, 6 + note F#, 6 + note G_, 6 + note G_, 6 + note G_, 6 + note G_, 6 + inc_octave + note C_, 3 + dec_octave + note G_, 3 + inc_octave + note C_, 3 + dec_octave + note G_, 3 + inc_octave + note C_, 4 + dec_octave + note G_, 4 + note G_, 4 + notetype0 10 + note C_, 12 + endchannel + +Branch_1ea254: + notetype0 1 + octave 4 + notetype1 1 + note E_, 8 + notetype1 3 + note E_, 7 + notetype1 1 + octave 2 + endchannel + +Branch_1ea26d: + notetype0 1 + octave 4 + notetype1 1 + note G_, 8 + notetype1 3 + note G_, 7 + notetype1 1 + octave 2 + endchannel + + +Music_TCG2TitleScreen_Ch4: + togglenoise $06 + octave 1 + notetype 1 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 3 + note D_, 4 + notetype 5 +.Loop1 + note F_, 9 + note C#, 1 + note C#, 1 + note C#, 1 + loopchannel 4, .Loop1 + notetype 1 + note D_, 5 +.Loop2 + note D_, 5 + loopchannel 23, .Loop2 + notetype 10 + note F_, 12 + notetype 1 +.Loop3 + note C#, 15 + note C#, 15 + note C#, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + loopchannel 15, .Loop3 + note C#, 15 + note C#, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 +.Loop4 + note C#, 15 + note C#, 15 + note E_, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + loopchannel 7, .Loop4 + note C#, 15 + note C#, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 +.Loop5 + note C#, 15 + note C#, 15 + note C#, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + loopchannel 7, .Loop5 + note C#, 15 + note C#, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 +.Loop6 + note C#, 15 + note C#, 16 + note C#, 14 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + loopchannel 8, .Loop6 +.Loop7 + note C#, 15 + note C#, 15 + note C#, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + loopchannel 8, .Loop7 + note C#, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + note C#, 15 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 3 + note D_, 4 + note D_, 4 + note D_, 4 + note C#, 5 + notetype 5 + note C#, 4 + note C#, 4 + note F_, 12 + endchannel + diff --git a/crysaudio/music/aftertherivalfight.asm b/crysaudio/music/aftertherivalfight.asm new file mode 100644 index 00000000..3d06b88d --- /dev/null +++ b/crysaudio/music/aftertherivalfight.asm @@ -0,0 +1,71 @@ +Music_AfterTheRivalFight: ; f5127 + dbw $c0, Music_AfterTheRivalFight_Ch1 + dbw $01, Music_AfterTheRivalFight_Ch2 + dbw $02, Music_AfterTheRivalFight_Ch3 + dbw $03, Music_AfterTheRivalFight_Ch4 +; f5133 + +Music_AfterTheRivalFight_Ch1: ; f5133 + tempo 112 + volume $77 + dutycycle $0 + tone $0001 + vibrato $8, $14 + stereopanning $f0 + notetype $c, $b2 + octave 2 + note G#, 4 + note G#, 4 + intensity $82 + octave 3 + note G#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1 +; f5153 + +Music_AfterTheRivalFight_Ch2: ; f5153 + dutycycle $1 + vibrato $6, $35 + stereopanning $f + notetype $c, $c2 + octave 4 + note G#, 4 + note G#, 4 + intensity $a2 + note G#, 2 + note G#, 2 + note G#, 2 + note G#, 2 + loopchannel 0, Music_AfterTheRivalFight_branch_f502e +; f516a + +Music_AfterTheRivalFight_Ch3: ; f516a + notetype $c, $28 + octave 3 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + note G#, 2 + note F#, 2 + note F_, 2 + note D#, 2 + loopchannel 0, Music_AfterTheRivalFight_branch_f509d +; f517a + +Music_AfterTheRivalFight_Ch4: ; f517a + 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 +; f518a + + diff --git a/crysaudio/music/azaleatown.asm b/crysaudio/music/azaleatown.asm new file mode 100644 index 00000000..55365d9a --- /dev/null +++ b/crysaudio/music/azaleatown.asm @@ -0,0 +1,665 @@ +Music_AzaleaTown: ; f57e8 + dbw $c0, Music_AzaleaTown_Ch1 + dbw $01, Music_AzaleaTown_Ch2 + dbw $02, Music_AzaleaTown_Ch3 + dbw $03, Music_AzaleaTown_Ch4 +; f57f4 + +Music_AzaleaTown_Ch1: ; f57f4 + tempo 160 + volume $77 + dutycycle $2 + stereopanning $f + notetype $c, $a1 + note __, 2 +Music_AzaleaTown_branch_f5801: ; f5801 + intensity $a1 + octave 3 + note F_, 2 + intensity $61 + note F_, 2 + note F_, 2 + intensity $a1 + note F_, 2 + intensity $61 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + loopchannel 2, Music_AzaleaTown_branch_f5801 +Music_AzaleaTown_branch_f5816: ; f5816 + callchannel Music_AzaleaTown_branch_f588c + stereopanning $f0 + intensity $a4 + note G#, 2 + note A#, 1 + note __, 3 + octave 4 + note C_, 4 + notetype $6, $a4 + 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 + note D#, 4 + note C_, 4 + note __, 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 + note A#, 4 + octave 4 + note C#, 2 + note __, 2 + note C_, 2 + note __, 2 + intensity $a1 + octave 3 + note C#, 4 + note A_, 2 + note __, 14 + callchannel Music_AzaleaTown_branch_f5912 + intensity $a3 + octave 4 + note C_, 1 + note C#, 3 + note F_, 2 + note __, 2 + note C#, 2 + note __, 2 + intensity $a1 + octave 3 + note G_, 4 + note A#, 4 + note G_, 8 + intensity $a2 + note A#, 4 + octave 4 + note C#, 4 + octave 3 + note A#, 4 + note F#, 4 + note C#, 8 + note F#, 4 + note __, 4 + note A#, 4 + octave 4 + note C#, 4 + octave 3 + note A#, 4 + note G_, 4 + note C#, 4 + note __, 4 + note G_, 4 + note __, 4 + octave 4 + note C#, 4 + note D#, 4 + note C#, 4 + octave 3 + note G#, 4 + note D#, 4 + note C#, 4 + octave 2 + note G#, 4 + note __, 8 + notetype $c, $2f + octave 3 + note G#, 14 + note __, 2 + loopchannel 0, Music_AzaleaTown_branch_f5816 +; f588c + +Music_AzaleaTown_branch_f588c: ; f588c + notetype $c, $a1 + octave 4 + note F_, 2 + intensity $61 + note F_, 2 + note F_, 2 + intensity $a1 + note D#, 2 + intensity $61 + note D#, 2 + note D#, 2 + intensity $a1 + note F_, 2 + intensity $61 + note F_, 2 + intensity $a1 + note A#, 2 + intensity $61 + note A#, 2 + note A#, 2 + intensity $a1 + note G#, 2 + intensity $61 + note G#, 2 + note G#, 2 + intensity $a1 + note A_, 2 + intensity $61 + note A_, 2 + intensity $a1 + note C_, 2 + intensity $61 + note C_, 2 + note C_, 2 + intensity $a1 + note C#, 2 + intensity $61 + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 2 + intensity $a1 + note D#, 2 + intensity $61 + note D#, 2 + note D#, 2 + intensity $a1 + note C#, 2 + intensity $61 + note C#, 2 + note C#, 2 + note C#, 2 + note __, 2 + intensity $a1 + octave 3 + note F_, 2 + intensity $61 + note F_, 2 + note F_, 2 + intensity $a1 + note F#, 2 + intensity $61 + note F#, 2 + note F#, 2 + note F#, 2 + note F#, 2 + intensity $a1 + note F_, 2 + intensity $61 + note F_, 2 + note F_, 2 + intensity $a1 + note D#, 2 + intensity $61 + note D#, 2 + note D#, 2 + intensity $a1 + note C#, 2 + intensity $61 + note C#, 2 + intensity $a1 + note C_, 2 + intensity $61 + note C_, 2 + note C_, 2 + intensity $a1 + octave 2 + note A#, 2 + intensity $61 + note A#, 2 + note A#, 2 + intensity $a1 + octave 3 + note C#, 2 + intensity $61 + note C#, 2 + endchannel +; f5912 + +Music_AzaleaTown_branch_f5912: ; f5912 + intensity $61 + note G#, 8 + note G#, 8 + intensity $81 + note A_, 8 + intensity $a1 + note A_, 8 + endchannel +; f591d + +Music_AzaleaTown_Ch2: ; f591d + vibrato $12, $23 + dutycycle $2 + stereopanning $f0 + notetype $c, $62 + note __, 1 + octave 4 + note D_, 1 + intensity $b1 + note D#, 2 + intensity $71 + note D#, 2 + note D#, 2 + intensity $b1 + note C#, 2 + intensity $71 + note C#, 2 + note C#, 2 + intensity $51 + note C#, 2 + note C#, 2 + intensity $b1 + note C_, 2 + intensity $71 + note C_, 2 + note C_, 2 + intensity $b1 + note C#, 2 + intensity $71 + note C#, 2 + note C#, 2 + notetype $6, $b4 + note F_, 7 + dutycycle $1 + octave 5 + note C_, 1 +Music_AzaleaTown_branch_f5952: ; f5952 + callchannel Music_AzaleaTown_branch_f59c7 + note C#, 4 + note C_, 2 + note C#, 1 + note __, 3 + notetype $6, $b4 + note D#, 11 + note __, 8 + dutycycle $1 + octave 5 + note C_, 1 + callchannel Music_AzaleaTown_branch_f59c7 + note __, 2 + note C#, 2 + note C_, 2 + octave 3 + note G#, 2 + notetype $6, $b4 + note __, 3 + octave 4 + note G_, 1 + note G#, 12 + note F#, 4 + note F_, 4 + dutycycle $0 + note D_, 1 + note D#, 3 + note C#, 4 + note C_, 2 + note __, 2 + note G#, 4 + note __, 4 + note F#, 4 + note __, 4 + note F_, 4 + note D#, 4 + note F_, 2 + note __, 2 + note D#, 2 + note __, 2 + note C#, 8 + note __, 12 + note D_, 1 + note D#, 3 + note C#, 4 + note C_, 2 + note __, 2 + note G#, 4 + note __, 4 + note A_, 4 + note __, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 1 + octave 5 + note C_, 3 + note C#, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 4 + note F_, 4 + note __, 4 + note D#, 4 + note __, 4 + note C#, 4 + dutycycle $2 + note F_, 4 + note D#, 4 + note C#, 4 + note F_, 4 + note __, 4 + note D#, 4 + note __, 4 + note C#, 4 + note F_, 4 + note D#, 4 + note C#, 4 + note F_, 4 + note __, 4 + note A#, 4 + note __, 4 + octave 5 + note C_, 4 + notetype $c, $b7 + octave 4 + note G#, 12 + note D#, 4 + intensity $1f + note C_, 14 + notetype $6, $b4 + dutycycle $1 + note G#, 2 + octave 5 + note C_, 2 + loopchannel 0, Music_AzaleaTown_branch_f5952 +; f59c7 + +Music_AzaleaTown_branch_f59c7: ; f59c7 + note C#, 4 + octave 4 + note G#, 2 + note __, 2 + octave 5 + note C_, 2 + note __, 2 + note C#, 8 + note D#, 8 + note F_, 2 + note __, 1 + note G_, 1 + note G#, 12 + note F_, 2 + note __, 6 + note D#, 8 + note F_, 2 + note __, 1 + note C_, 1 + notetype $c, $a8 + vibrato $0, $0 + note C#, 8 + intensity $a7 + vibrato $12, $23 + note C#, 16 + note __, 4 + intensity $b4 + dutycycle $2 + octave 3 + note A#, 2 + octave 4 + note C#, 1 + note __, 1 + note F#, 8 + note __, 2 + note F#, 2 + note F_, 2 + note D#, 1 + note __, 1 + note C#, 6 + note C_, 2 + note __, 2 + note C_, 4 + note C#, 1 + notetype $6, $b4 + note __, 1 + note D_, 1 + notetype $c, $b7 + note D#, 12 + intensity $b4 + endchannel +; f5a08 + +Music_AzaleaTown_Ch3: ; f5a08 + stereopanning $ff + vibrato $6, $26 + notetype $c, $25 + octave 2 + note G#, 1 + octave 3 + note C_, 1 + note C#, 1 + note __, 5 + note C#, 1 + note __, 3 + note C#, 1 + note __, 1 + octave 2 + note G#, 4 + octave 3 + note C#, 1 + note __, 5 + note C#, 1 + note __, 3 + note C#, 1 + note __, 1 + note G#, 4 +Music_AzaleaTown_branch_f5a24: ; f5a24 + callchannel Music_AzaleaTown_branch_f5a86 + note G#, 4 + note D#, 2 + callchannel Music_AzaleaTown_branch_f5a86 + note G#, 2 + note __, 2 + note F#, 2 + callchannel Music_AzaleaTown_branch_f5acf + note A#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note F_, 2 + octave 3 + note A_, 4 + octave 4 + note C#, 1 + note __, 3 + note F_, 1 + note __, 1 + callchannel Music_AzaleaTown_branch_f5acf + octave 2 + note A#, 2 + octave 3 + note F_, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 2 + octave 2 + note A#, 2 + octave 3 + note D#, 1 + note __, 3 + note G_, 2 + octave 2 + note F#, 1 + note __, 5 + note F#, 1 + note F#, 1 + note F#, 1 + note __, 1 + octave 3 + note C#, 2 + note __, 2 + octave 2 + note F_, 1 + note F#, 1 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + octave 3 + note C#, 2 + note __, 2 + octave 2 + note F#, 1 + note G_, 1 + note G#, 1 + note __, 5 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note F#, 1 + note G_, 1 + note G#, 1 + note __, 5 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + loopchannel 0, Music_AzaleaTown_branch_f5a24 +; f5a86 + +Music_AzaleaTown_branch_f5a86: ; f5a86 + note C#, 1 + note __, 5 + note C#, 1 + note __, 3 + note C#, 1 + note __, 1 + octave 2 + note G#, 4 + octave 3 + note F_, 1 + note __, 5 + note F_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F_, 4 + note A_, 2 + intensity $15 + note A#, 1 + note __, 1 + intensity $25 + octave 4 + note C#, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note A_, 4 + octave 4 + note C#, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note G#, 4 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G_, 6 + note __, 4 + note F#, 1 + note __, 5 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note C#, 4 + note G_, 1 + note __, 5 + note G_, 1 + note __, 3 + note C#, 4 + note G_, 1 + note __, 1 + note G#, 1 + note __, 5 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 5 + note G#, 1 + note __, 1 + note C_, 1 + note __, 1 + endchannel +; f5acf + +Music_AzaleaTown_branch_f5acf: ; f5acf + intensity $35 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + intensity $25 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + endchannel +; f5ae5 + +Music_AzaleaTown_Ch4: ; f5ae5 + togglenoise $3 + notetype $c + note F_, 2 +Music_AzaleaTown_branch_f5aea: ; f5aea + note D#, 2 + note F#, 2 + 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 +; f5b03 + + diff --git a/crysaudio/music/battletowerlobby.asm b/crysaudio/music/battletowerlobby.asm new file mode 100644 index 00000000..f4031b20 --- /dev/null +++ b/crysaudio/music/battletowerlobby.asm @@ -0,0 +1,315 @@ +Music_BattleTowerLobby: ; 17948b + dbw $c0, Music_BattleTowerLobby_Ch1 + dbw $01, Music_BattleTowerLobby_Ch2 + dbw $02, Music_BattleTowerLobby_Ch3 + dbw $03, Music_BattleTowerLobby_Ch4 +; 179497 + +Music_BattleTowerLobby_Ch1: ; 179497 + tempo 152 + volume $77 + dutycycle $3 + tone $0001 + vibrato $8, $22 + stereopanning $f0 + notetype $c, $72 +Music_BattleTowerLobby_branch_1794a9: ; 1794a9 + notetype $c, $72 + octave 3 + note G#, 2 + notetype $c, $73 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note G#, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note G#, 2 + notetype $c, $72 + note F#, 2 + notetype $c, $73 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note E_, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + notetype $c, $72 + note G#, 2 + notetype $c, $73 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note G#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note B_, 2 + octave 4 + note E_, 2 + notetype $c, $72 + note F#, 3 + notetype $c, $73 + note D_, 1 + note E_, 2 + octave 3 + note B_, 2 + note G#, 2 + note E_, 2 + note G#, 2 + note B_, 2 + notetype $c, $72 + note C#, 2 + notetype $c, $73 + note D#, 2 + note E_, 2 + note C#, 1 + octave 2 + note B_, 1 + note A_, 4 + notetype $c, $62 + note A_, 4 + notetype $c, $72 + note B_, 2 + notetype $c, $73 + octave 3 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 4 + notetype $c, $62 + octave 2 + note G#, 4 + notetype $c, $72 + note A_, 2 + notetype $c, $73 + note B_, 2 + octave 3 + note C#, 2 + note D_, 1 + note E_, 1 + note D_, 2 + note E_, 2 + note F#, 2 + note A_, 2 + notetype $c, $72 + note B_, 2 + notetype $c, $73 + note B_, 4 + note A_, 1 + note G#, 1 + notetype $c, $72 + note F#, 4 + notetype $c, $75 + octave 2 + note B_, 4 + loopchannel 0, Music_BattleTowerLobby_branch_1794a9 +; 17953a + +Music_BattleTowerLobby_Ch2: ; 17953a + dutycycle $2 + vibrato $10, $34 + stereopanning $f + notetype $c, $82 +Music_BattleTowerLobby_branch_179544: ; 179544 + notetype $c, $82 + octave 4 + note E_, 2 + note E_, 4 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note B_, 4 + note A_, 2 + note G#, 2 + note A_, 3 + note E_, 1 + octave 3 + note B_, 4 + notetype $c, $65 + note F#, 4 + octave 2 + note B_, 4 + notetype $c, $82 + octave 4 + note E_, 2 + note E_, 4 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note B_, 4 + note A_, 2 + note G#, 2 + note A_, 3 + note F#, 1 + notetype $c, $87 + note G#, 12 + notetype $c, $82 + octave 3 + note A_, 2 + notetype $c, $84 + note A_, 4 + note F#, 1 + note G#, 1 + note A_, 4 + notetype $c, $82 + note C#, 4 + octave 4 + note G#, 2 + notetype $c, $84 + note G#, 4 + note F#, 1 + note G#, 1 + note E_, 4 + notetype $c, $82 + octave 3 + note E_, 4 + octave 4 + note F#, 2 + notetype $c, $84 + note F#, 4 + note A_, 1 + note G#, 1 + note A_, 4 + note D_, 4 + notetype $c, $82 + note E_, 2 + notetype $c, $84 + note E_, 4 + note F#, 1 + note E_, 1 + note D#, 4 + notetype $c, $73 + octave 3 + note D#, 1 + note F#, 1 + note B_, 1 + octave 4 + note D#, 1 + loopchannel 0, Music_BattleTowerLobby_branch_179544 +; 1795ae + +Music_BattleTowerLobby_Ch3: ; 1795ae + notetype $c, $11 +Music_BattleTowerLobby_branch_1795b1: ; 1795b1 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note D#, 2 + note __, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + note B_, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note E_, 2 + note __, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note G#, 2 + note B_, 2 + octave 3 + note E_, 2 + note __, 2 + note D_, 2 + octave 2 + note F#, 2 + note A_, 2 + octave 3 + note F#, 2 + octave 2 + note F#, 2 + note A_, 2 + octave 3 + note D_, 2 + note F#, 2 + note E_, 2 + octave 2 + note B_, 2 + note E_, 2 + note B_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note F#, 2 + loopchannel 0, Music_BattleTowerLobby_branch_1795b1 +; 179610 + +Music_BattleTowerLobby_Ch4: ; 179610 + togglenoise $0 +Music_BattleTowerLobby_branch_179612: ; 179612 + notetype $c + note __, 2 + note F_, 4 + note F_, 4 + note F_, 2 + note F_, 4 + loopchannel 0, Music_BattleTowerLobby_branch_179612 +; 17961d + + diff --git a/crysaudio/music/battletowertheme.asm b/crysaudio/music/battletowertheme.asm new file mode 100644 index 00000000..20782b84 --- /dev/null +++ b/crysaudio/music/battletowertheme.asm @@ -0,0 +1,699 @@ +Music_BattleTowerTheme: ; 178889 + dbw $c0, Music_BattleTowerTheme_Ch1 + dbw $01, Music_BattleTowerTheme_Ch2 + dbw $02, Music_BattleTowerTheme_Ch3 + dbw $03, Music_BattleTowerTheme_Ch4 +; 178895 + +Music_BattleTowerTheme_Ch1: ; 178895 + tempo 141 + volume $77 + tone $0001 + vibrato $12, $34 + stereopanning $f + notetype $6, $94 +Music_BattleTowerTheme_branch_1788a5: ; 1788a5 + note __, 16 + note __, 16 + note __, 12 + note __, 12 + dutycycle $2 + octave 3 + note C_, 2 + note E_, 2 + note G_, 4 + callchannel Music_BattleTowerTheme_branch_17895e + note G_, 2 + note __, 2 + note C_, 4 + note __, 4 + intensity $92 + note G_, 2 + note F_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + octave 4 + note E_, 2 + note G_, 2 + note E_, 2 + octave 3 + note G_, 2 + note E_, 2 + callchannel Music_BattleTowerTheme_branch_17895e + note G_, 2 + note __, 2 + octave 2 + note A#, 4 + note __, 4 + intensity $92 + octave 3 + note G_, 2 + note D#, 2 + note C_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + note F_, 2 + note C_, 2 + octave 3 + note A_, 2 + note F_, 2 + intensity $93 + note D_, 2 + note __, 2 + note E_, 4 + note F_, 4 + note G_, 2 + note A_, 2 + note A#, 8 + octave 2 + note A#, 8 + octave 3 + note C_, 2 + note __, 2 + note D_, 4 + note E_, 4 + note F_, 2 + note G_, 2 + note A_, 8 + octave 2 + note A_, 8 + note A#, 2 + note __, 2 + octave 3 + note C_, 4 + note D_, 4 + note D#, 2 + note F_, 2 + note D#, 4 + note F_, 4 + note G_, 4 + note A#, 4 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note F_, 4 + note __, 4 + octave 2 + note A_, 2 + octave 3 + note C_, 2 + note E_, 4 + note __, 4 + dutycycle $3 + note C_, 2 + note E_, 2 + note G_, 4 + note A_, 4 + note F_, 8 + note F_, 2 + note G_, 2 + note A_, 8 + note G_, 4 + note F_, 4 + note D_, 8 + note A#, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note D#, 2 + note F_, 4 + octave 3 + note F_, 8 + note C#, 2 + note D#, 2 + note F_, 8 + note G_, 4 + note F_, 4 + note F_, 4 + note C_, 8 + note G_, 2 + note F_, 2 + note E_, 8 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G_, 2 + note E_, 2 + note C_, 4 + note F_, 8 + note C_, 2 + note F_, 2 + note A_, 8 + note A#, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + note F_, 8 + note A#, 4 + octave 4 + note D_, 8 + octave 3 + note A#, 2 + note A_, 2 + note F_, 4 + note G#, 4 + note F_, 8 + note G#, 4 + note F_, 4 + note D#, 4 + note C#, 4 + note F_, 4 + intensity $94 + octave 4 + note C_, 4 + octave 3 + note E_, 6 + note __, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 4 + note __, 12 + loopchannel 0, Music_BattleTowerTheme_branch_1788a5 +; 17895e + +Music_BattleTowerTheme_branch_17895e: ; 17895e + intensity $94 + note A_, 2 + note __, 2 + note C_, 4 + note __, 4 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note C_, 4 + note F_, 4 + note __, 4 + note A_, 4 + endchannel +; 17896d + +Music_BattleTowerTheme_Ch2: ; 17896d + vibrato $12, $34 +Music_BattleTowerTheme_branch_178970: ; 178970 + dutycycle $3 + notetype $6, $b8 + octave 3 + note F_, 2 + note __, 2 + octave 2 + note A_, 4 + note __, 4 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 2 + note A_, 4 + octave 3 + note F_, 4 + note __, 4 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note F_, 2 + note __, 2 + octave 2 + note A_, 4 + note __, 4 + tone $0001 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note F_, 4 + note __, 4 + tone $0000 + intensity $b7 + note G_, 2 + octave 4 + note C_, 2 + note E_, 4 + callchannel Music_BattleTowerTheme_branch_178a15 + note A#, 4 + note __, 2 + note F_, 2 + notetype $c, $b7 + note C_, 12 + notetype $6, $b7 + callchannel Music_BattleTowerTheme_branch_178a15 + notetype $c, $b7 + note A#, 2 + note __, 1 + note G_, 1 + note A_, 12 + note A#, 1 + note __, 1 + note A#, 4 + note G_, 1 + note A_, 1 + note A#, 4 + note D_, 4 + note A_, 1 + note __, 1 + note A_, 4 + note G_, 1 + note A_, 1 + note F_, 8 + note G_, 1 + note __, 1 + note G_, 4 + note A#, 1 + note A_, 1 + note A#, 4 + note D#, 4 + note F_, 1 + note __, 1 + note F_, 4 + note G_, 1 + note F_, 1 + note E_, 8 + stereopanning $f0 + dutycycle $2 + note F_, 6 + note A_, 1 + note A#, 1 + octave 5 + note C_, 4 + octave 4 + note A#, 2 + note A_, 2 + note A#, 16 + note A#, 6 + note G_, 1 + note A_, 1 + note A#, 4 + octave 5 + note C_, 2 + octave 4 + note A#, 2 + note A_, 6 + note A#, 1 + note A_, 1 + note G_, 8 + note A_, 6 + note F_, 1 + note A_, 1 + octave 5 + note C_, 4 + note D_, 2 + note D#, 2 + note D_, 6 + note C_, 2 + octave 4 + note A#, 8 + octave 5 + note C#, 6 + note C_, 2 + octave 4 + note A#, 2 + note G#, 2 + note F_, 2 + note G#, 2 + note G_, 5 + note __, 1 + notetype $6, $b7 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 4 + note __, 4 + stereopanning $ff + dutycycle $3 + octave 3 + note C_, 2 + note D_, 2 + note E_, 4 + loopchannel 0, Music_BattleTowerTheme_branch_178970 +; 178a15 + +Music_BattleTowerTheme_branch_178a15: ; 178a15 + note F_, 2 + note __, 2 + note F_, 8 + note C_, 2 + note F_, 2 + octave 5 + note C_, 8 + octave 4 + note A#, 4 + note A_, 4 + endchannel +; 178a20 + +Music_BattleTowerTheme_Ch3: ; 178a20 + vibrato $12, $34 + notetype $6, $16 +Music_BattleTowerTheme_branch_178a26: ; 178a26 + stereopanning $ff + callchannel Music_BattleTowerTheme_branch_178afe + note C_, 2 + note __, 2 + note F_, 4 + note __, 4 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note F_, 4 + note __, 4 + stereopanning $f0 + note C_, 8 + callchannel Music_BattleTowerTheme_branch_178afe + note C_, 2 + note __, 2 + note F_, 4 + note __, 4 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 4 + note C_, 4 + note __, 4 + note C_, 2 + note __, 2 + callchannel Music_BattleTowerTheme_branch_178afe + octave 2 + note A#, 2 + note __, 2 + octave 3 + note D#, 4 + note __, 4 + octave 2 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note C_, 4 + note F_, 4 + note __, 4 + note C_, 1 + note __, 1 + note C_, 2 + octave 2 + note A#, 2 + note __, 2 + note A#, 4 + note F_, 4 + octave 3 + note F_, 1 + note __, 1 + note F_, 2 + octave 2 + note A#, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + note F_, 8 + note C_, 2 + note __, 2 + note C_, 4 + octave 2 + note F_, 4 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 + note F_, 8 + note D#, 2 + note __, 2 + note D#, 4 + octave 2 + note G_, 4 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 2 + note G_, 2 + note __, 2 + note A#, 2 + note __, 2 + octave 3 + note D#, 8 + note F_, 2 + note __, 2 + note C_, 4 + note __, 4 + note C_, 2 + octave 2 + note F_, 2 + note G_, 4 + note __, 4 + stereopanning $ff + note G_, 2 + octave 3 + note C_, 2 + note E_, 4 + note F_, 4 + note C_, 8 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 4 + note C_, 6 + note __, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F_, 4 + note D_, 8 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A#, 4 + note A_, 4 + note F_, 4 + note D_, 4 + note F_, 4 + note C#, 8 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A#, 4 + note F_, 8 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C_, 4 + note F_, 8 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 4 + note C_, 4 + note D_, 4 + note E_, 4 + note F_, 4 + note C_, 8 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 4 + note C_, 8 + note F_, 2 + note __, 2 + note F_, 4 + octave 2 + note A#, 8 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A#, 4 + octave 2 + note A#, 4 + octave 3 + note D_, 4 + note E_, 4 + note F_, 4 + octave 2 + note G#, 8 + octave 3 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note G#, 4 + octave 2 + note G#, 8 + octave 3 + note C#, 4 + note C_, 4 + note G_, 8 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 4 + note __, 12 + loopchannel 0, Music_BattleTowerTheme_branch_178a26 +; 178afe + +Music_BattleTowerTheme_branch_178afe: ; 178afe + octave 3 + note C_, 2 + note __, 2 + note F_, 4 + note __, 4 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F_, 4 + note C_, 4 + note __, 4 + note C_, 2 + note __, 2 + endchannel +; 178b0d + +Music_BattleTowerTheme_Ch4: ; 178b0d + togglenoise $3 + notetype $c +Music_BattleTowerTheme_branch_178b11: ; 178b11 + callchannel Music_BattleTowerTheme_branch_178b58 + note D_, 2 + note D_, 4 + note D_, 1 + note D_, 1 + note D_, 4 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 +Music_BattleTowerTheme_branch_178b1d: ; 178b1d + callchannel Music_BattleTowerTheme_branch_178b58 + callchannel Music_BattleTowerTheme_branch_178b61 + loopchannel 2, Music_BattleTowerTheme_branch_178b1d + callchannel Music_BattleTowerTheme_branch_178b6c + callchannel Music_BattleTowerTheme_branch_178b61 + callchannel Music_BattleTowerTheme_branch_178b6c + note D_, 2 + note D_, 4 + note D_, 1 + note D_, 1 + note D_, 8 +Music_BattleTowerTheme_branch_178b35: ; 178b35 + callchannel Music_BattleTowerTheme_branch_178b76 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + loopchannel 3, Music_BattleTowerTheme_branch_178b35 + callchannel Music_BattleTowerTheme_branch_178b76 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + note D_, 4 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + loopchannel 0, Music_BattleTowerTheme_branch_178b11 +; 178b58 + +Music_BattleTowerTheme_branch_178b58: ; 178b58 + note D_, 2 + note D_, 4 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 4 + note D_, 1 + note D_, 1 + endchannel +; 178b61 + +Music_BattleTowerTheme_branch_178b61: ; 178b61 + note D_, 2 + note D_, 4 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + endchannel +; 178b6c + +Music_BattleTowerTheme_branch_178b6c: ; 178b6c + note D_, 2 + note D_, 4 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + endchannel +; 178b76 + +Music_BattleTowerTheme_branch_178b76: ; 178b76 + note D_, 2 + note C#, 2 + note D_, 2 + note D_, 1 + note C#, 1 + note D_, 2 + note C#, 2 + note D_, 2 + note D_, 1 + note C#, 1 + endchannel +; 178b81 + + diff --git a/crysaudio/music/bicycle.asm b/crysaudio/music/bicycle.asm new file mode 100644 index 00000000..0a1a68fd --- /dev/null +++ b/crysaudio/music/bicycle.asm @@ -0,0 +1,523 @@ +Music_Bicycle: ; ee119 + dbw $c0, Music_Bicycle_Ch1 + dbw $01, Music_Bicycle_Ch2 + dbw $02, Music_Bicycle_Ch3 + dbw $03, Music_Bicycle_Ch4 +; ee125 + +Music_Bicycle_Ch1: ; ee125 + tempo 140 + volume $77 + dutycycle $3 + tone $0001 + stereopanning $f + vibrato $8, $15 + notetype $c, $b4 + octave 3 + note B_, 6 + note A_, 6 + note G_, 4 + intensity $b0 + note A_, 6 + intensity $b6 + note A_, 8 + intensity $b2 + note F#, 2 +Music_Bicycle_branch_ee144: ; ee144 + stereopanning $f + intensity $b2 + note G_, 2 + note G_, 2 + note E_, 2 + note E_, 2 + note F#, 1 + note E_, 1 + note D#, 2 + note D_, 2 + note D_, 2 + note E_, 2 + note E_, 2 + note C_, 2 + note C_, 2 + octave 2 + note B_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 3 + note C_, 2 + note C_, 2 + note E_, 2 + note E_, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note G_, 2 + note G_, 2 + note E_, 2 + note E_, 2 + note F#, 1 + note E_, 1 + note D#, 2 + note D_, 2 + note D_, 2 + note E_, 2 + note E_, 2 + note C_, 2 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + intensity $82 + note F#, 2 + intensity $b2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note A_, 2 + stereopanning $f0 + intensity $b6 + note B_, 4 + note G_, 4 + octave 4 + note D_, 4 + octave 3 + note G_, 4 + note A_, 4 + note F#, 4 + octave 4 + note D_, 4 + octave 3 + note F#, 4 + note G_, 4 + note E_, 4 + octave 4 + note C_, 4 + octave 3 + note E_, 4 + note F#, 4 + note D_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note A_, 4 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + note G_, 2 + note B_, 2 + octave 4 + note D_, 2 + note G_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note F#, 2 + note A_, 2 + octave 4 + note C_, 2 + note F#, 2 + note C_, 2 + octave 3 + note A_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note C_, 2 + octave 3 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + note A_, 2 + loopchannel 0, Music_Bicycle_branch_ee144 +; ee1de + +Music_Bicycle_Ch2: ; ee1de + dutycycle $2 + vibrato $10, $24 + stereopanning $f0 + notetype $c, $c6 + octave 4 + note D_, 6 + note C_, 6 + octave 3 + note B_, 4 + intensity $c2 + octave 4 + note D_, 2 + note D_, 1 + note E_, 1 + note D_, 2 + note D_, 1 + note E_, 1 + note D_, 2 + intensity $c3 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 +Music_Bicycle_branch_ee1fd: ; ee1fd + stereopanning $ff + dutycycle $2 + intensity $c3 + octave 3 + note B_, 4 + note G_, 4 + note A_, 4 + note F#, 4 + intensity $c2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + intensity $c5 + note D_, 8 + intensity $c4 + note E_, 4 + note G_, 4 + intensity $c2 + note E_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note G_, 2 + intensity $c5 + note F#, 8 + intensity $c3 + note B_, 4 + note G_, 4 + note A_, 4 + note F#, 4 + intensity $c2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + intensity $c5 + note D_, 8 + intensity $c4 + note E_, 4 + note G_, 4 + intensity $c2 + note E_, 2 + octave 4 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note E_, 2 + intensity $c7 + note F#, 8 + stereopanning $f + callchannel Music_Bicycle_branch_ee263 + note F#, 4 + intensity $c3 + note A_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note F#, 4 + intensity $c7 + callchannel Music_Bicycle_branch_ee263 + note F#, 4 + intensity $c3 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 4 + loopchannel 0, Music_Bicycle_branch_ee1fd +; ee263 + +Music_Bicycle_branch_ee263: ; ee263 + note G_, 6 + note B_, 6 + note G_, 4 + note F#, 6 + note A_, 6 + note F#, 4 + note E_, 6 + note G_, 6 + note E_, 4 + endchannel +; ee26d + +Music_Bicycle_Ch3: ; ee26d + notetype $c, $14 + note __, 16 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note C_, 2 + note E_, 2 + note D_, 2 + octave 3 + note A_, 1 + note __, 1 +Music_Bicycle_branch_ee27f: ; ee27f + callchannel Music_Bicycle_branch_ee333 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + callchannel Music_Bicycle_branch_ee333 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 +Music_Bicycle_branch_ee2e9: ; ee2e9 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note D_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note D_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + loopchannel 2, Music_Bicycle_branch_ee2e9 + loopchannel 0, Music_Bicycle_branch_ee27f +; ee333 + +Music_Bicycle_branch_ee333: ; ee333 + octave 3 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note D_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note D_, 1 + note __, 1 + note B_, 1 + note __, 1 + endchannel +; ee345 + +Music_Bicycle_Ch4: ; ee345 + togglenoise $0 + notetype $c + note __, 16 + note __, 16 +Music_Bicycle_branch_ee34b: ; ee34b + note __, 2 +Music_Bicycle_branch_ee34c: ; ee34c + stereopanning $f0 + note F_, 4 + 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 +; ee35e + + diff --git a/crysaudio/music/buenaspassword.asm b/crysaudio/music/buenaspassword.asm new file mode 100644 index 00000000..6961159b --- /dev/null +++ b/crysaudio/music/buenaspassword.asm @@ -0,0 +1,647 @@ +Music_BuenasPassword: ; 178153 + dbw $c0, Music_BuenasPassword_Ch1 + dbw $01, Music_BuenasPassword_Ch2 + dbw $02, Music_BuenasPassword_Ch3 + dbw $03, Music_BuenasPassword_Ch4 +; 17815f + +Music_BuenasPassword_Ch1: ; 17815f + tempo 136 + volume $77 + tone $0001 + notetype $c, $b3 + note __, 8 +Music_BuenasPassword_branch_17816b: ; 17816b + stereopanning $ff + note __, 16 + note __, 16 + dutycycle $3 + notetype $6, $97 + stereopanning $f + octave 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 2 + note G#, 2 + note __, 10 + note __, 10 + stereopanning $f0 + note C#, 2 + note F_, 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 2 + note G#, 2 + note __, 12 + dutycycle $2 + callchannel Music_BuenasPassword_branch_178204 + stereopanning $ff + callchannel Music_BuenasPassword_branch_1782df + callchannel Music_BuenasPassword_branch_178222 + callchannel Music_BuenasPassword_branch_178204 + stereopanning $ff + callchannel Music_BuenasPassword_branch_1782df + callchannel Music_BuenasPassword_branch_178222 + callchannel Music_BuenasPassword_branch_178204 + dutycycle $1 + note C#, 2 + note __, 2 + note D#, 2 + note __, 2 + note F#, 2 + note __, 1 + note G#, 2 + note __, 1 + note A#, 2 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note B_, 2 + note __, 2 + note B_, 2 + note G#, 2 + note B_, 2 + note A#, 2 + note G#, 2 + note G_, 1 + note D#, 3 + note C#, 2 + octave 2 + note B_, 2 + note A#, 1 + note G#, 3 + note A#, 2 + note G_, 2 + note A#, 1 + octave 3 + note C#, 3 + note D#, 2 + note C#, 2 + note D#, 1 + note G_, 3 + note B_, 2 + note __, 2 + note A#, 2 + note __, 2 + note G#, 2 + note __, 1 + note F#, 2 + note __, 1 + note D#, 2 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C#, 2 + note __, 2 + note G#, 2 + octave 4 + note C#, 2 + note F_, 2 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note G#, 1 + note F#, 3 + note F_, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note B_, 1 + note G#, 3 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note G#, 1 + note D#, 2 + note F#, 1 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + loopchannel 0, Music_BuenasPassword_branch_17816b +; 178204 + +Music_BuenasPassword_branch_178204: ; 178204 + stereopanning $f + notetype $6, $84 + octave 4 + note D#, 2 + intensity $71 + note C#, 1 + note C_, 1 + intensity $51 + octave 3 + note A#, 1 + note G#, 1 + intensity $31 + note G_, 1 + note F_, 1 + intensity $11 + note D#, 1 + note C#, 1 + note C_, 1 + note __, 1 + notetype $c, $84 + endchannel +; 178222 + +Music_BuenasPassword_branch_178222: ; 178222 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 2 + endchannel +; 178231 + +Music_BuenasPassword_Ch2: ; 178231 + vibrato $12, $34 + dutycycle $2 + notetype $c, $a5 + note __, 7 + octave 3 + note F#, 1 +Music_BuenasPassword_branch_17823c: ; 17823c + stereopanning $ff + callchannel Music_BuenasPassword_branch_1782df + callchannel Music_BuenasPassword_branch_1782a4 + stereopanning $ff + callchannel Music_BuenasPassword_branch_1782cc + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 + note G#, 16 + callchannel Music_BuenasPassword_branch_1782a4 + stereopanning $ff + callchannel Music_BuenasPassword_branch_1782cc + note B_, 2 + note A#, 2 + note B_, 2 + note G#, 16 + callchannel Music_BuenasPassword_branch_1782a4 + note F#, 2 + note __, 2 + note G#, 2 + note __, 2 + note A#, 2 + note __, 1 + note B_, 2 + note __, 1 + octave 4 + note C#, 2 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D#, 2 + note __, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note D#, 14 + note C#, 1 + note D#, 1 + note C#, 6 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 8 + note F#, 2 + note __, 2 + note F_, 2 + note __, 2 + note D#, 2 + note __, 1 + note C#, 2 + note __, 1 + octave 3 + note B_, 2 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 2 + note __, 2 + octave 4 + note C#, 2 + note F_, 2 + note G#, 2 + note B_, 14 + note A#, 1 + note B_, 1 + note G#, 10 + intensity $84 + octave 2 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + intensity $a5 + loopchannel 0, Music_BuenasPassword_branch_17823c +; 1782a4 + +Music_BuenasPassword_branch_1782a4: ; 1782a4 + octave 3 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 2 + stereopanning $f0 + octave 4 + note G#, 1 + notetype $6, $81 + note G_, 1 + note F_, 1 + intensity $71 + note D#, 1 + note C#, 1 + intensity $61 + note C_, 1 + octave 3 + note A#, 1 + intensity $41 + note G#, 1 + intensity $21 + note G_, 1 + note F_, 1 + note __, 1 + notetype $c, $a5 + endchannel +; 1782cc + +Music_BuenasPassword_branch_1782cc: ; 1782cc + octave 4 + note G#, 2 + note __, 2 + note F#, 2 + note __, 2 + note F_, 2 + note __, 1 + note D#, 2 + note __, 1 + note C#, 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 1 + note __, 1 + note D#, 2 + note __, 2 + endchannel +; 1782df + +Music_BuenasPassword_branch_1782df: ; 1782df + octave 3 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note D#, 1 + note __, 1 + note F#, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note B_, 1 + note G#, 3 + octave 3 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note D#, 1 + note __, 1 + note F#, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note B_, 1 + note G#, 2 + octave 3 + note F#, 1 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note D#, 1 + note __, 1 + note F#, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note B_, 1 + note G#, 3 + endchannel +; 178311 + +Music_BuenasPassword_Ch3: ; 178311 + notetype $c, $14 + note __, 8 +Music_BuenasPassword_branch_178315: ; 178315 + callchannel Music_BuenasPassword_branch_1783a7 + callchannel Music_BuenasPassword_branch_1783a7 + callchannel Music_BuenasPassword_branch_1783a7 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note F#, 1 + note __, 1 + octave 2 + note G#, 1 + octave 3 + note D#, 2 + octave 2 + note G#, 1 + note __, 2 + note B_, 1 + note __, 1 + note G#, 4 + loopchannel 3, Music_BuenasPassword_branch_178315 + note F#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note C#, 1 + octave 2 + note F#, 1 + note __, 1 + octave 3 + note C#, 1 + octave 2 + note F#, 1 + note __, 1 + note A#, 2 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note F#, 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note G#, 2 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note D#, 2 + octave 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note G#, 1 + note D#, 1 + note __, 1 + note A#, 1 + note D#, 1 + note __, 1 + note G#, 2 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note D#, 1 + note __, 1 + note A#, 1 + note D#, 1 + note __, 1 + octave 3 + note D#, 2 + octave 2 + note D#, 1 + note __, 1 + note G_, 2 + callchannel Music_BuenasPassword_branch_1783bc + octave 3 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F_, 1 + note C#, 1 + note __, 1 + note G#, 1 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note F_, 2 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note C#, 2 + callchannel Music_BuenasPassword_branch_1783bc + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note G#, 2 + octave 3 + note D#, 1 + octave 2 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + loopchannel 0, Music_BuenasPassword_branch_178315 +; 1783a7 + +Music_BuenasPassword_branch_1783a7: ; 1783a7 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note F#, 1 + note __, 1 + octave 2 + note G#, 1 + octave 3 + note D#, 2 + octave 2 + note G#, 1 + octave 3 + note C#, 1 + note __, 1 + note B_, 1 + note __, 1 + note C#, 1 + note F_, 2 + note C#, 1 + endchannel +; 1783bc + +Music_BuenasPassword_branch_1783bc: ; 1783bc + octave 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + octave 2 + note G#, 1 + note __, 1 + note B_, 2 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note G#, 2 + endchannel +; 1783d0 + +Music_BuenasPassword_Ch4: ; 1783d0 + togglenoise $3 + notetype $c + note D#, 2 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 +Music_BuenasPassword_branch_1783d9: ; 1783d9 + callchannel Music_BuenasPassword_branch_17840c + callchannel Music_BuenasPassword_branch_17840c + callchannel Music_BuenasPassword_branch_17840c + callchannel Music_BuenasPassword_branch_178424 + loopchannel 4, Music_BuenasPassword_branch_1783d9 + callchannel Music_BuenasPassword_branch_17840c + callchannel Music_BuenasPassword_branch_17840c + callchannel Music_BuenasPassword_branch_17840c + stereopanning $ff + note D#, 2 + stereopanning $f0 + note G_, 2 + stereopanning $ff + note D_, 2 + stereopanning $f + note G_, 1 + note G_, 1 + stereopanning $f0 + note G_, 2 + stereopanning $ff + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + loopchannel 0, Music_BuenasPassword_branch_1783d9 +; 17840c + +Music_BuenasPassword_branch_17840c: ; 17840c + stereopanning $ff + note D#, 2 + stereopanning $f0 + note G_, 2 + stereopanning $ff + note D_, 2 + stereopanning $f + note G_, 1 + note G_, 1 + stereopanning $f0 + note G_, 2 + stereopanning $ff + note D#, 2 + note D_, 2 + stereopanning $f + note G_, 2 + endchannel +; 178424 + +Music_BuenasPassword_branch_178424: ; 178424 + stereopanning $ff + note D#, 2 + stereopanning $f0 + note G_, 2 + stereopanning $ff + note D_, 2 + stereopanning $f + note G_, 1 + note G_, 1 + stereopanning $f0 + note G_, 2 + stereopanning $ff + note D#, 2 + note D_, 2 + note D_, 1 + note D_, 1 + endchannel +; 17843b + + diff --git a/crysaudio/music/bugcatchingcontest.asm b/crysaudio/music/bugcatchingcontest.asm new file mode 100644 index 00000000..f52d5045 --- /dev/null +++ b/crysaudio/music/bugcatchingcontest.asm @@ -0,0 +1,675 @@ +Music_BugCatchingContest: ; f7c16 + dbw $c0, Music_BugCatchingContest_Ch1 + dbw $01, Music_BugCatchingContest_Ch2 + dbw $02, Music_BugCatchingContest_Ch3 + dbw $03, Music_BugCatchingContest_Ch4 +; f7c22 + +Music_BugCatchingContest_Ch1: ; f7c22 + tempo 144 + volume $77 + stereopanning $f + vibrato $8, $24 + dutycycle $2 + notetype $c, $b7 + note __, 8 + octave 4 + note C#, 1 + note __, 1 + note C#, 3 + note __, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note __, 1 + note D_, 3 + note __, 1 + note D_, 1 + note D_, 1 + note D#, 1 + note __, 1 + note D#, 3 + note __, 1 + note D#, 1 + note D#, 1 + note E_, 1 + note __, 1 + note E_, 3 + note __, 1 + note E_, 1 + note E_, 1 +Music_BugCatchingContest_branch_f7c4b: ; f7c4b + notetype $c, $b1 +Music_BugCatchingContest_branch_f7c4e: ; f7c4e + note __, 2 + octave 2 + note A_, 2 + loopchannel 4, Music_BugCatchingContest_branch_f7c4e +Music_BugCatchingContest_branch_f7c55: ; f7c55 + note __, 2 + note B_, 2 + loopchannel 8, Music_BugCatchingContest_branch_f7c55 + intensity $b4 + dutycycle $1 + octave 3 + note B_, 6 + note A_, 1 + note B_, 1 + note A_, 6 + octave 4 + note D_, 1 + note E_, 1 + intensity $b1 + dutycycle $2 +Music_BugCatchingContest_branch_f7c6b: ; f7c6b + note __, 2 + octave 2 + note A_, 2 + loopchannel 4, Music_BugCatchingContest_branch_f7c6b + note __, 2 + note B_, 2 + note __, 2 + note B_, 2 + notetype $6, $b7 + octave 4 + note E_, 4 + note __, 1 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note G_, 1 + note B_, 8 + octave 5 + note E_, 8 + intensity $b1 + note __, 4 + octave 2 + note B_, 4 + note __, 4 + octave 3 + note E_, 4 + note __, 4 + note E_, 4 +Music_BugCatchingContest_branch_f7c8e: ; f7c8e + note __, 4 + octave 2 + note A_, 4 + loopchannel 3, Music_BugCatchingContest_branch_f7c8e + intensity $a7 + octave 4 + note F#, 4 + note A_, 4 + note __, 4 + octave 3 + note G_, 2 + note B_, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note B_, 2 + note G_, 2 + octave 4 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 8 + note __, 4 + octave 3 + note F#, 2 + note A_, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note A_, 2 + note F#, 2 + octave 4 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 8 + note D_, 2 + note __, 2 + octave 3 + note B_, 2 + note G_, 2 + octave 4 + note G_, 2 + note __, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + note __, 2 + note G#, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note G#, 2 + note B_, 2 + note C#, 2 + note __, 2 + note C#, 6 + note __, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note __, 2 + note D_, 6 + note __, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note __, 2 + note D#, 6 + note __, 2 + note D#, 2 + note D#, 2 + note E_, 2 + note __, 2 + note E_, 6 + note __, 2 + note E_, 2 + note E_, 2 + loopchannel 0, Music_BugCatchingContest_branch_f7c4b +; f7cf4 + +Music_BugCatchingContest_Ch2: ; f7cf4 + stereopanning $f0 + vibrato $8, $23 + dutycycle $1 + notetype $c, $c7 + note __, 8 +Music_BugCatchingContest_branch_f7cff: ; f7cff + octave 4 + note A_, 1 + note __, 1 + note A_, 3 + note __, 1 + note A_, 1 + note A_, 1 + loopchannel 4, Music_BugCatchingContest_branch_f7cff +Music_BugCatchingContest_branch_f7d0a: ; f7d0a + dutycycle $0 + callchannel Music_BugCatchingContest_branch_f7d8e + octave 2 + note E_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note E_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note A_, 2 + octave 3 + note A_, 1 + note __, 1 + octave 2 + note G#, 2 + octave 3 + note G#, 1 + note __, 1 + octave 2 + note G_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note E_, 2 + octave 3 + note E_, 1 + note __, 1 + callchannel Music_BugCatchingContest_branch_f7d8e + octave 2 + note E_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note A_, 2 + octave 4 + note C#, 1 + note __, 1 + octave 2 + note E_, 2 + octave 4 + note C#, 1 + note __, 1 + octave 2 + note D_, 2 + octave 3 + note F#, 1 + note __, 1 + octave 1 + note A_, 2 + octave 3 + note F#, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note F#, 1 + note __, 1 + octave 2 + note D#, 2 + octave 3 + note A_, 1 + note __, 1 + dutycycle $0 + note __, 2 + octave 5 + note D_, 1 + note __, 1 + note C#, 2 + note D_, 1 + note __, 1 + octave 4 + note B_, 8 + note __, 2 + octave 5 + note D_, 1 + note __, 1 + note C#, 2 + note D_, 1 + note __, 1 + octave 4 + note A_, 8 + note __, 2 + octave 5 + note D_, 4 + note F#, 2 + note E_, 2 + note D_, 1 + note __, 1 + note C#, 2 + note D_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 10 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 10 + loopchannel 0, Music_BugCatchingContest_branch_f7d0a +; f7d8e + +Music_BugCatchingContest_branch_f7d8e: ; f7d8e + octave 2 + note D_, 2 + octave 3 + note F#, 1 + note __, 1 + octave 1 + note A_, 2 + octave 3 + note F#, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note F#, 1 + note __, 1 + octave 2 + note C#, 2 + octave 3 + note F#, 1 + note __, 1 + octave 2 + note E_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note C#, 2 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note D#, 2 + octave 3 + note G_, 1 + note __, 1 + endchannel +; f7db7 + +Music_BugCatchingContest_Ch3: ; f7db7 + stereopanning $ff + vibrato $10, $23 + notetype $c, $14 + note __, 8 + octave 3 + note A_, 1 + note __, 1 + note A_, 3 + note __, 1 + note A_, 1 + note A_, 1 + note B_, 1 + note __, 1 + note B_, 3 + note __, 1 + note B_, 1 + note B_, 1 + octave 4 + note C_, 1 + note __, 1 + note C_, 3 + note __, 1 + note C_, 1 + note C_, 1 + note C#, 1 + note __, 1 + note C#, 3 + note __, 1 + note C#, 1 + note C#, 1 +Music_BugCatchingContest_branch_f7dda: ; f7dda + notetype $c, $14 + note F#, 5 + note __, 1 + note F#, 1 + note G_, 1 + note A_, 4 + octave 5 + note D_, 4 + note C#, 2 + intensity $10 + note E_, 1 + note G_, 1 + note B_, 1 + note __, 1 + note G_, 1 + note E_, 1 + notetype $6, $20 + octave 6 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note E_, 8 + intensity $14 + octave 4 + note E_, 10 + note __, 2 + note E_, 2 + note F#, 2 + note G_, 8 + octave 5 + note C#, 8 + note __, 4 + intensity $10 + note E_, 2 + note G_, 2 + note A_, 2 + note __, 2 + note E_, 2 + note C_, 2 + octave 6 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 8 + intensity $15 + octave 5 + note F#, 4 + note __, 4 + note G_, 4 + note __, 4 + note A_, 4 + note __, 4 + octave 6 + note D_, 4 + note __, 4 + note C#, 12 + octave 5 + note B_, 2 + octave 6 + note C#, 2 + octave 5 + note B_, 4 + note __, 4 + octave 6 + note G_, 4 + note F#, 4 + note __, 4 + octave 5 + note G_, 4 + note A_, 4 + note B_, 4 + octave 6 + note E_, 4 + note D_, 4 + note C#, 4 + octave 5 + note B_, 2 + octave 6 + note C#, 2 + note D_, 4 + note __, 8 + octave 5 + note B_, 4 + note A_, 4 + note __, 1 + note D#, 1 + note F#, 1 + note A_, 1 + octave 6 + note C_, 8 + octave 3 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note D_, 2 + note __, 2 + note B_, 2 + note __, 2 + note E_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note D_, 2 + note __, 2 + note F#, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note F#, 2 + note __, 2 + note D#, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note A_, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 2 + note B_, 2 + note __, 2 + note D_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G#, 2 + note __, 2 + note B_, 2 + note __, 2 + note E_, 2 + note __, 2 + note B_, 2 + note __, 2 + note A_, 2 + note __, 2 + note A_, 6 + note __, 2 + note A_, 2 + note A_, 2 + note B_, 2 + note __, 2 + note B_, 6 + note __, 2 + note B_, 2 + note B_, 2 + octave 4 + note C_, 2 + note __, 2 + note C_, 6 + note __, 2 + note C_, 2 + note C_, 2 + note C#, 2 + note __, 2 + note C#, 6 + note __, 2 + note C#, 2 + note C#, 2 + loopchannel 0, Music_BugCatchingContest_branch_f7dda +; f7e9a + +Music_BugCatchingContest_Ch4: ; f7e9a + 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: ; 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 +; f7ee2 + +Music_BugCatchingContest_branch_f7ee2: ; 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 +; f7ef3 + diff --git a/crysaudio/music/burnedtower.asm b/crysaudio/music/burnedtower.asm new file mode 100644 index 00000000..358a76c0 --- /dev/null +++ b/crysaudio/music/burnedtower.asm @@ -0,0 +1,267 @@ +Music_BurnedTower: ; f6a99 + dbw $c0, Music_BurnedTower_Ch1 + dbw $01, Music_BurnedTower_Ch2 + dbw $02, Music_BurnedTower_Ch3 + dbw $03, Music_BurnedTower_Ch4 +; f6aa5 + +Music_BurnedTower_Ch1: ; f6aa5 + tempo 168 + volume $77 + dutycycle $1 + tone $0004 + vibrato $8, $45 + stereopanning $f0 + notetype $c, $91 + note __, 2 + octave 2 + note A_, 4 + note A_, 4 + note A_, 2 + intensity $80 + octave 3 + note D#, 6 + intensity $91 + note D_, 4 + note D_, 4 + note D_, 2 + intensity $80 + note C#, 6 +Music_BurnedTower_branch_f6ac8: ; f6ac8 + intensity $91 + octave 2 + note A_, 4 + note A_, 4 + note A_, 2 + intensity $80 + note A#, 6 + loopchannel 2, Music_BurnedTower_branch_f6ac8 + tempo 150 +Music_BurnedTower_branch_f6ad8: ; f6ad8 + intensity $b1 + octave 2 + note A_, 4 + note A_, 4 + note A_, 2 + intensity $a0 + octave 3 + note D#, 6 + intensity $b1 + note D_, 4 + note D_, 4 + note D_, 2 + intensity $a0 + note C#, 6 + intensity $b1 + octave 2 + note A_, 4 + note A_, 4 + note A_, 2 + intensity $a0 + note A#, 6 + intensity $b1 + note A_, 4 + note A_, 4 + note A_, 2 + intensity $b3 + note A#, 16 + note A#, 16 + note A#, 16 + note G#, 6 + intensity $b1 + note A_, 4 + note A_, 4 + note A_, 2 + intensity $a0 + note A#, 6 + intensity $b1 + note B_, 4 + note B_, 4 + note B_, 2 + intensity $a0 + octave 3 + note F_, 6 + intensity $b1 + note E_, 4 + note E_, 4 + note E_, 2 + intensity $a0 + note D#, 6 +Music_BurnedTower_branch_f6b17: ; f6b17 + intensity $b1 + octave 2 + note B_, 4 + note B_, 4 + note B_, 2 + intensity $a0 + octave 3 + note C_, 6 + loopchannel 2, Music_BurnedTower_branch_f6b17 + loopchannel 0, Music_BurnedTower_branch_f6ad8 +; f6b29 + +Music_BurnedTower_Ch2: ; f6b29 + dutycycle $2 + vibrato $20, $82 + tone $0002 + notetype $c, $70 + callchannel Music_BurnedTower_branch_f6b8e + intensity $c5 +Music_BurnedTower_branch_f6b39: ; f6b39 + callchannel Music_BurnedTower_branch_f6b8e + intensity $c1 + dutycycle $3 + note __, 2 + octave 2 + note A_, 4 + note A_, 4 + note A_, 2 + intensity $b0 + octave 3 + note D#, 6 + intensity $c1 + note D_, 4 + note D_, 4 + note D_, 2 + intensity $b0 + note C#, 6 + intensity $c1 + octave 2 + note A_, 4 + note A_, 4 + note A_, 2 + intensity $b0 + note A#, 4 + intensity $c1 + intensity $c2 + octave 3 + note A_, 1 + note G_, 1 + note A_, 1 + octave 4 + note C_, 1 + vibrato $0, $0 + intensity $3d + note E_, 8 + vibrato $20, $83 + intensity $b0 + octave 2 + note G_, 4 + dutycycle $2 + intensity $b0 + octave 3 + note F#, 4 + note E_, 2 + note F#, 2 + note G_, 4 + note B_, 4 + octave 4 + note C#, 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + note G_, 4 + note E_, 4 + intensity $b7 + note F#, 16 + loopchannel 0, Music_BurnedTower_branch_f6b39 +; f6b8e + +Music_BurnedTower_branch_f6b8e: ; f6b8e + octave 3 + note E_, 4 + note D_, 2 + note E_, 2 + note F_, 4 + note A_, 4 + note B_, 4 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 4 + note F_, 4 + note E_, 4 + note D_, 2 + note E_, 2 + note F_, 4 + note D_, 4 + note E_, 16 + endchannel +; f6ba2 + +Music_BurnedTower_Ch3: ; f6ba2 + stereopanning $f + notetype $c, $14 + note __, 16 + note __, 16 + note __, 16 + note __, 12 + octave 3 + note D#, 4 +Music_BurnedTower_branch_f6bad: ; f6bad + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note F_, 4 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note D#, 4 + loopchannel 4, Music_BurnedTower_branch_f6bad +Music_BurnedTower_branch_f6bc3: ; f6bc3 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note __, 2 + note F#, 2 + note __, 2 + note F#, 2 + note G_, 4 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note __, 2 + note F#, 2 + note __, 2 + note F#, 2 + note F_, 4 + loopchannel 2, Music_BurnedTower_branch_f6bc3 + loopchannel 0, Music_BurnedTower_branch_f6bad +; f6bdd + +Music_BurnedTower_Ch4: ; f6bdd + togglenoise $0 + notetype $c +Music_BurnedTower_branch_f6be1: ; f6be1 + note __, 16 + loopchannel 4, Music_BurnedTower_branch_f6be1 + note __, 2 +Music_BurnedTower_branch_f6be7: ; f6be7 + stereopanning $f0 + note G_, 2 + note G#, 2 + note G_, 4 + note G#, 2 + note G_, 4 + loopchannel 0, Music_BurnedTower_branch_f6be7 +; f6bf2 + + diff --git a/crysaudio/music/celadoncity.asm b/crysaudio/music/celadoncity.asm new file mode 100644 index 00000000..12db4dad --- /dev/null +++ b/crysaudio/music/celadoncity.asm @@ -0,0 +1,398 @@ +Music_CeladonCity: ; f435b + dbw $80, Music_CeladonCity_Ch1 + dbw $01, Music_CeladonCity_Ch2 + dbw $02, Music_CeladonCity_Ch3 +; f4364 + +Music_CeladonCity_Ch1: ; f4364 + tempo 146 + volume $77 + tone $0001 +Music_CeladonCity_branch_f436c: ; f436c + stereopanning $f + notetype $c, $a6 + octave 3 + note A_, 7 + intensity $a1 + note G#, 1 + note A_, 1 + note D_, 3 + note E_, 2 + note F#, 2 + callchannel Music_CeladonCity_branch_f43cc +Music_CeladonCity_branch_f437d: ; f437d + note D_, 2 + note F#, 1 + note A_, 1 + note D_, 1 + note F#, 1 + note A_, 1 + note F#, 1 + loopchannel 3, Music_CeladonCity_branch_f437d + note D_, 2 + note G_, 1 + note B_, 1 + octave 4 + note D_, 1 + note C_, 1 + octave 3 + note B_, 1 + note G_, 1 + callchannel Music_CeladonCity_branch_f43cc + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 16 + callchannel Music_CeladonCity_branch_f43e1 + callchannel Music_CeladonCity_branch_f43fe + octave 2 + note B_, 2 + note A#, 1 + note B_, 1 + octave 3 + note D_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note G#, 1 + note A_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A_, 1 + callchannel Music_CeladonCity_branch_f43e1 + callchannel Music_CeladonCity_branch_f43fe + note D_, 2 + note C#, 1 + note D_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 8 + loopchannel 0, Music_CeladonCity_branch_f436c +; f43cc + +Music_CeladonCity_branch_f43cc: ; f43cc + note D_, 2 + note G_, 1 + note B_, 1 + note D_, 1 + note G_, 1 + note B_, 1 + note G_, 1 + loopchannel 3, Music_CeladonCity_branch_f43cc + note D_, 2 + note F#, 1 + note A_, 1 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + octave 3 + note A_, 1 + endchannel +; f43e1 + +Music_CeladonCity_branch_f43e1: ; f43e1 + octave 2 + note G_, 2 + note B_, 1 + octave 3 + note D_, 1 + loopchannel 4, Music_CeladonCity_branch_f43e1 + note C_, 2 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note C#, 1 + note D_, 1 + octave 3 + note B_, 1 + endchannel +; f43fe + +Music_CeladonCity_branch_f43fe: ; f43fe + note D_, 2 + note F#, 1 + note A_, 1 + loopchannel 4, Music_CeladonCity_branch_f43fe + endchannel +; f4406 + +Music_CeladonCity_Ch2: ; f4406 + vibrato $12, $34 + dutycycle $2 + stereopanning $f0 + notetype $c, $b7 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 8 +Music_CeladonCity_branch_f441a: ; f441a + callchannel Music_CeladonCity_branch_f4463 + note A_, 4 + note F#, 4 + note A_, 2 + note F#, 6 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note A_, 2 + note B_, 2 + note G_, 4 + note B_, 4 + callchannel Music_CeladonCity_branch_f4463 + intensity $c1 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 4 + note D_, 1 + note E_, 1 + note F#, 1 + note A_, 1 + intensity $b3 + octave 5 + note D_, 6 + intensity $a2 + octave 1 + note F#, 2 + callchannel Music_CeladonCity_branch_f4474 + octave 1 + note G_, 3 + note B_, 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 6 + note F#, 2 + callchannel Music_CeladonCity_branch_f4474 + octave 1 + note A_, 3 + octave 2 + note D_, 1 + note A_, 4 + note D_, 6 + intensity $97 + octave 4 + note F#, 1 + note A_, 1 + octave 5 + note D_, 16 + loopchannel 0, Music_CeladonCity_branch_f441a +; f4463 + +Music_CeladonCity_branch_f4463: ; f4463 + intensity $b2 + octave 4 + note B_, 4 + note G_, 4 + note B_, 2 + note G_, 6 + note B_, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 8 + endchannel +; f4474 + +Music_CeladonCity_branch_f4474: ; f4474 + note G_, 3 + note B_, 1 + octave 2 + note D_, 4 + octave 1 + note G_, 2 + note B_, 2 + octave 2 + note D_, 4 + octave 1 + note G_, 3 + octave 2 + note C_, 1 + note D_, 4 + octave 1 + note G_, 2 + note B_, 2 + octave 2 + note D_, 4 + octave 1 + note A_, 3 + octave 2 + note D_, 1 + note F#, 4 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note F#, 4 + endchannel +; f4492 + +Music_CeladonCity_Ch3: ; f4492 + vibrato $12, $24 +Music_CeladonCity_branch_f4495: ; f4495 + notetype $c, $25 + octave 3 + note A_, 2 + note __, 2 + note F#, 2 + note __, 2 + note D_, 8 + callchannel Music_CeladonCity_branch_f44fd +Music_CeladonCity_branch_f44a1: ; f44a1 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note D_, 4 + loopchannel 3, Music_CeladonCity_branch_f44a1 + octave 2 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note D_, 3 + octave 2 + note F#, 1 + callchannel Music_CeladonCity_branch_f44fd + note A_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 3 + note F#, 3 + octave 2 + note G#, 1 + note A_, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + note E_, 2 + note C#, 2 + note D_, 2 + note __, 6 + octave 2 + note A_, 2 + note __, 6 + intensity $10 + callchannel Music_CeladonCity_branch_f4510 + octave 5 + note E_, 2 + note __, 2 + note F#, 2 + note __, 2 + note D_, 4 + note __, 4 + note C_, 8 + octave 4 + note A_, 2 + note B_, 2 + octave 5 + note C_, 2 + note D_, 2 + note E_, 2 + note __, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note __, 4 + callchannel Music_CeladonCity_branch_f4510 + octave 5 + note E_, 2 + note __, 2 + note D_, 2 + note E_, 2 + note D_, 4 + note __, 4 + note C_, 8 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note __, 6 + loopchannel 0, Music_CeladonCity_branch_f4495 +; f44fd + +Music_CeladonCity_branch_f44fd: ; f44fd + octave 2 + note G_, 2 + note __, 2 + octave 3 + note D_, 4 + loopchannel 3, Music_CeladonCity_branch_f44fd + octave 2 + note A_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + note F#, 3 + octave 2 + note G#, 1 + endchannel +; f4510 + +Music_CeladonCity_branch_f4510: ; f4510 + octave 5 + note D_, 8 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note B_, 2 + endchannel +; f4518 + + diff --git a/crysaudio/music/championbattle.asm b/crysaudio/music/championbattle.asm new file mode 100644 index 00000000..b524de44 --- /dev/null +++ b/crysaudio/music/championbattle.asm @@ -0,0 +1,793 @@ +Music_ChampionBattle: ; ea9c1 + dbw $80, Music_ChampionBattle_Ch1 + dbw $01, Music_ChampionBattle_Ch2 + dbw $02, Music_ChampionBattle_Ch3 +; ea9ca + +Music_ChampionBattle_Ch1: ; ea9ca + ftempo 98 + volume $77 + dutycycle $3 + tone $0002 + vibrato $12, $15 + notetype $c, $b2 + octave 2 + note A#, 8 + note A#, 8 + note A#, 8 + note A#, 4 + intensity $b7 + note B_, 4 +Music_ChampionBattle_branch_ea9e2: ; ea9e2 + callchannel Music_ChampionBattle_branch_eaaee + octave 3 + note D#, 4 + loopchannel 2, Music_ChampionBattle_branch_ea9e2 + callchannel Music_ChampionBattle_branch_eaaee + octave 3 + note E_, 4 +Music_ChampionBattle_branch_ea9f0: ; ea9f0 + callchannel Music_ChampionBattle_branch_eaafc + loopchannel 3, Music_ChampionBattle_branch_ea9f0 + callchannel Music_ChampionBattle_branch_eab06 +Music_ChampionBattle_branch_ea9fa: ; ea9fa + callchannel Music_ChampionBattle_branch_eaafc + loopchannel 7, Music_ChampionBattle_branch_ea9fa + callchannel Music_ChampionBattle_branch_eab06 + intensity $b2 + note A#, 2 + note A#, 2 + intensity $b7 + octave 3 + note D#, 4 + intensity $b2 + octave 2 + note A#, 2 + note A#, 2 + intensity $b7 + octave 3 + note E_, 4 + intensity $b2 + octave 2 + note A#, 2 + note A#, 2 + intensity $b7 + octave 3 + note F#, 4 + intensity $b2 + octave 2 + note A#, 2 + note A#, 2 + intensity $b7 + octave 3 + note G#, 4 + intensity $a0 + note A#, 8 + octave 2 + note A#, 8 + octave 3 + note B_, 12 + intensity $b2 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 +Music_ChampionBattle_branch_eaa35: ; eaa35 + callchannel Music_ChampionBattle_branch_eab0f + note E_, 2 + note E_, 2 + intensity $b7 + note F#, 4 +Music_ChampionBattle_branch_eaa3d: ; eaa3d + intensity $b2 + note E_, 2 + note E_, 2 + intensity $b7 + note G#, 4 + loopchannel 2, Music_ChampionBattle_branch_eaa3d + intensity $b2 + note E_, 2 + note E_, 2 + intensity $b7 + note B_, 4 + callchannel Music_ChampionBattle_branch_eab0f + note E_, 2 + note E_, 2 + intensity $b7 + note F#, 4 + intensity $b2 + note E_, 2 + note E_, 2 + intensity $b7 + note G#, 4 + intensity $b2 + note E_, 2 + note E_, 2 + intensity $b7 + note B_, 4 + intensity $b2 + note E_, 2 + note E_, 2 + intensity $b7 + octave 4 + note E_, 4 + callchannel Music_ChampionBattle_branch_eab24 + note B_, 4 + note G#, 4 + callchannel Music_ChampionBattle_branch_eab24 + octave 4 + note D_, 4 + note D_, 4 + intensity $a0 + octave 3 + note A#, 8 + octave 2 + note A#, 8 + octave 3 + note F#, 8 + octave 2 + note F#, 8 + intensity $60 + note B_, 16 + intensity $70 + note B_, 16 + intensity $80 + octave 3 + note C#, 16 + intensity $a0 + note D#, 16 + intensity $b4 + octave 4 + note F#, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note D_, 4 + note C#, 4 + note F#, 4 + note F#, 4 + note F#, 4 + note F_, 4 + note E_, 4 + note D#, 4 + note F#, 2 + note G#, 2 + note D#, 2 + note E_, 2 + note F#, 4 + note F#, 4 + note __, 16 + intensity $90 + octave 3 + note F#, 8 + intensity $b4 + note E_, 4 + note E_, 4 + intensity $90 + note D#, 16 + note C#, 16 +Music_ChampionBattle_branch_eaab1: ; eaab1 + intensity $b2 + octave 2 + note A#, 2 + note A#, 2 + intensity $b7 + octave 3 + note D#, 4 + loopchannel 4, Music_ChampionBattle_branch_eaab1 +Music_ChampionBattle_branch_eaabe: ; eaabe + intensity $b2 + note C_, 2 + note C_, 2 + intensity $b7 + note D#, 4 + loopchannel 2, Music_ChampionBattle_branch_eaabe + intensity $b2 + note C_, 2 + note C_, 2 + intensity $b7 + note F#, 4 + intensity $b2 + note C_, 2 + note C_, 2 + intensity $b7 + note G#, 4 + callchannel Music_ChampionBattle_branch_eab31 + octave 3 + note D#, 2 + note D#, 2 + intensity $b7 + note B_, 4 + callchannel Music_ChampionBattle_branch_eab31 + octave 3 + note D#, 2 + note D#, 2 + intensity $b7 + octave 4 + note D_, 4 + loopchannel 0, Music_ChampionBattle_branch_eaa35 +; eaaee + +Music_ChampionBattle_branch_eaaee: ; eaaee + intensity $b2 + octave 2 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 2 + intensity $b7 + endchannel +; eaafc + +Music_ChampionBattle_branch_eaafc: ; eaafc + intensity $b2 + octave 2 + note A#, 2 + note A#, 2 + intensity $b7 + octave 3 + note D#, 4 + endchannel +; eab06 + +Music_ChampionBattle_branch_eab06: ; eab06 + intensity $b2 + octave 2 + note A#, 2 + note A#, 2 + intensity $b7 + note B_, 4 + endchannel +; eab0f + +Music_ChampionBattle_branch_eab0f: ; eab0f + intensity $b5 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + note F#, 4 + note F_, 2 + note E_, 2 + note B_, 2 + note F#, 2 + note A#, 2 + note F_, 2 + note A_, 2 + note E_, 2 + note G#, 2 + note D#, 2 + note G_, 2 + intensity $b2 + endchannel +; eab24 + +Music_ChampionBattle_branch_eab24: ; eab24 + intensity $b2 + octave 3 + note A#, 2 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 2 + intensity $b7 + endchannel +; eab31 + +Music_ChampionBattle_branch_eab31: ; eab31 + intensity $b2 + note D#, 2 + note D#, 2 + intensity $b7 + note A#, 4 + intensity $b2 + note D#, 2 + note D#, 2 + intensity $b7 + note B_, 4 + intensity $b2 + note D#, 2 + note D#, 2 + intensity $b7 + octave 4 + note C#, 4 + intensity $b2 + endchannel +; eab4a + +Music_ChampionBattle_Ch2: ; eab4a + dutycycle $3 + vibrato $8, $36 + tone $0001 + notetype $c, $c2 + octave 3 + note D#, 8 + note D#, 8 + note D#, 8 + note D#, 4 + intensity $c7 + note D_, 4 + callchannel Music_ChampionBattle_branch_eac4f + note A#, 4 + callchannel Music_ChampionBattle_branch_eac4f + note B_, 4 + callchannel Music_ChampionBattle_branch_eac4f + octave 4 + note C#, 4 + callchannel Music_ChampionBattle_branch_eac5c + note D_, 4 + callchannel Music_ChampionBattle_branch_eac5c + note F_, 4 + callchannel Music_ChampionBattle_branch_eac5c + note D_, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note A#, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note B_, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + octave 4 + note C_, 4 + intensity $c2 + octave 3 + note D#, 2 + note D#, 2 + intensity $c7 + octave 4 + note C#, 4 + note D#, 8 + octave 3 + note D#, 8 + octave 4 + note E_, 8 + intensity $3c + note E_, 8 +Music_ChampionBattle_branch_eab9d: ; eab9d + intensity $c5 + note D#, 6 + octave 3 + note A#, 6 + octave 4 + note D#, 2 + note D_, 2 + note C#, 4 + note C_, 4 + octave 3 + note B_, 4 + note A#, 4 + intensity $c7 + note B_, 8 + octave 4 + note E_, 8 + intensity $c2 + octave 3 + note G#, 2 + note G#, 2 + intensity $c7 + note B_, 4 + intensity $c2 + note G#, 2 + note G#, 2 + intensity $c7 + octave 4 + note C#, 4 + intensity $c5 + note D#, 6 + octave 3 + note A#, 6 + octave 4 + note D#, 2 + note D_, 2 + note C#, 4 + note C_, 4 + octave 3 + note B_, 4 + note A#, 2 + note B_, 2 + intensity $c7 + octave 4 + note E_, 8 + note G#, 8 + note E_, 8 + note B_, 8 + callchannel Music_ChampionBattle_branch_eac79 + note E_, 4 + note E_, 4 + callchannel Music_ChampionBattle_branch_eac79 + note F#, 4 + note F#, 4 + intensity $c7 + note D#, 8 + octave 3 + note D#, 8 + octave 4 + note C#, 8 + octave 3 + note C#, 8 + intensity $b0 + note D#, 16 + note D#, 16 + note F_, 16 + note F#, 16 + intensity $c4 +Music_ChampionBattle_branch_eabef: ; eabef + octave 5 + note D#, 4 + note D_, 4 + note C#, 4 + note C_, 4 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + octave 4 + note B_, 4 + note B_, 4 + loopchannel 2, Music_ChampionBattle_branch_eabef + intensity $b0 + octave 3 + note D#, 16 + note B_, 16 + note A#, 16 + note G#, 16 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note A#, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note B_, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note A#, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note A_, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note A#, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note B_, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + octave 4 + note C#, 4 + intensity $c2 + octave 3 + note D#, 2 + note D#, 2 + intensity $c7 + octave 4 + note D_, 4 + intensity $b0 + note D#, 8 + note E_, 8 + note F#, 8 + note E_, 8 + note D#, 8 + note E_, 8 + note F#, 8 + note G#, 8 + loopchannel 0, Music_ChampionBattle_branch_eab9d +; eac4f + +Music_ChampionBattle_branch_eac4f: ; eac4f + intensity $c2 + note D#, 2 + note D#, 6 + note D#, 2 + note D#, 6 + note D#, 2 + note D#, 6 + note D#, 2 + note D#, 2 + intensity $c7 + endchannel +; eac5c + +Music_ChampionBattle_branch_eac5c: ; eac5c + intensity $c2 + octave 3 + note D#, 2 + note D#, 2 + intensity $c7 + note A#, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note B_, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + note A#, 4 + intensity $c2 + note D#, 2 + note D#, 2 + intensity $c7 + endchannel +; eac79 + +Music_ChampionBattle_branch_eac79: ; eac79 + intensity $c1 + note D#, 2 + note D#, 4 + note D#, 4 + note D#, 4 + note D#, 4 + note D#, 4 + note D#, 2 + intensity $c5 + endchannel +; eac85 + +Music_ChampionBattle_Ch3: ; eac85 + notetype $c, $14 +Music_ChampionBattle_branch_eac88: ; eac88 + octave 3 + note D#, 1 + note __, 7 + loopchannel 3, Music_ChampionBattle_branch_eac88 + note D#, 1 + note __, 3 + note E_, 4 + callchannel Music_ChampionBattle_branch_ead61 + callchannel Music_ChampionBattle_branch_ead61 + callchannel Music_ChampionBattle_branch_ead61 + callchannel Music_ChampionBattle_branch_ead6f + note D_, 4 + callchannel Music_ChampionBattle_branch_ead6f + note A_, 4 + callchannel Music_ChampionBattle_branch_ead6f + note D_, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 4 + note C#, 4 + note D#, 8 + octave 3 + note D#, 8 + note B_, 4 + note G_, 2 + note B_, 2 + note F#, 2 + note A#, 2 + note F_, 2 + note A_, 2 +Music_ChampionBattle_branch_eacc6: ; eacc6 + note D#, 2 + note A#, 2 + loopchannel 8, Music_ChampionBattle_branch_eacc6 +Music_ChampionBattle_branch_eaccc: ; eaccc + note E_, 2 + note B_, 2 + loopchannel 5, Music_ChampionBattle_branch_eaccc + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 +Music_ChampionBattle_branch_eacda: ; eacda + note D#, 2 + note A#, 2 + loopchannel 8, Music_ChampionBattle_branch_eacda +Music_ChampionBattle_branch_eace0: ; eace0 + note E_, 2 + note B_, 2 + loopchannel 8, Music_ChampionBattle_branch_eace0 + callchannel Music_ChampionBattle_branch_ead83 + octave 3 + note D#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + octave 4 + note D_, 2 + note C#, 2 + note C_, 2 + callchannel Music_ChampionBattle_branch_ead83 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + octave 4 + note D_, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 8 + note D#, 8 + note B_, 8 + note D#, 8 +Music_ChampionBattle_branch_ead05: ; ead05 + note D#, 2 + note F#, 2 + loopchannel 16, Music_ChampionBattle_branch_ead05 + callchannel Music_ChampionBattle_branch_ead8e + octave 3 + note E_, 2 + note B_, 2 + octave 4 + note D#, 2 + note E_, 2 + note F#, 2 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + note E_, 2 + callchannel Music_ChampionBattle_branch_ead8e +Music_ChampionBattle_branch_ead1d: ; ead1d + octave 3 + note E_, 2 + note B_, 2 + loopchannel 4, Music_ChampionBattle_branch_ead1d +Music_ChampionBattle_branch_ead24: ; ead24 + note D#, 2 + note A#, 2 + loopchannel 5, Music_ChampionBattle_branch_ead24 + note B_, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 +Music_ChampionBattle_branch_ead32: ; ead32 + note E_, 2 + note B_, 2 + loopchannel 5, Music_ChampionBattle_branch_ead32 + octave 4 + note C#, 2 + note E_, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 +Music_ChampionBattle_branch_ead40: ; ead40 + note D#, 2 + note G#, 2 + loopchannel 8, Music_ChampionBattle_branch_ead40 +Music_ChampionBattle_branch_ead46: ; ead46 + note D#, 2 + note A#, 2 + loopchannel 7, Music_ChampionBattle_branch_ead46 + note B_, 2 + note A#, 2 +Music_ChampionBattle_branch_ead4e: ; ead4e + octave 3 + note D#, 2 + note A#, 2 + octave 4 + note D_, 2 + note D#, 2 + loopchannel 7, Music_ChampionBattle_branch_ead4e + note C#, 2 + octave 3 + note B_, 2 + note A#, 2 + note G#, 2 + loopchannel 0, Music_ChampionBattle_branch_eacc6 +; ead61 + +Music_ChampionBattle_branch_ead61: ; ead61 + note D#, 1 + note __, 1 + note D#, 1 + note __, 5 + loopchannel 3, Music_ChampionBattle_branch_ead61 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 4 + endchannel +; ead6f + +Music_ChampionBattle_branch_ead6f: ; ead6f + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + endchannel +; ead83 + +Music_ChampionBattle_branch_ead83: ; ead83 + octave 3 + note D#, 2 + note F#, 2 + note D#, 2 + note F#, 2 + note D#, 2 + octave 4 + note D_, 2 + note C#, 2 + note C_, 2 + endchannel +; ead8e + +Music_ChampionBattle_branch_ead8e: ; ead8e + octave 3 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + octave 4 + note D#, 2 + note E_, 2 + endchannel +; ead99 + + diff --git a/crysaudio/music/cherrygrovecity.asm b/crysaudio/music/cherrygrovecity.asm new file mode 100644 index 00000000..9751bd04 --- /dev/null +++ b/crysaudio/music/cherrygrovecity.asm @@ -0,0 +1,312 @@ +Music_CherrygroveCity: ; f5b03 + dbw $c0, Music_CherrygroveCity_Ch1 + dbw $01, Music_CherrygroveCity_Ch2 + dbw $02, Music_CherrygroveCity_Ch3 + dbw $03, Music_CherrygroveCity_Ch4 +; f5b0f + +Music_CherrygroveCity_Ch1: ; f5b0f + tempo 152 + volume $77 + dutycycle $3 + tone $0001 + vibrato $8, $15 + stereopanning $f0 + notetype $c, $b5 + note __, 10 + octave 3 + note C_, 2 + note D_, 2 + note E_, 2 +Music_CherrygroveCity_branch_f5b26: ; f5b26 + note A_, 4 + note G#, 2 + note A_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note A_, 6 + note F_, 2 + note C_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + note E_, 2 + note G_, 4 + note F#, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note G_, 6 + note E_, 2 + note C_, 2 + octave 2 + note A#, 2 + note A_, 2 + octave 3 + note C_, 2 + intensity $b7 + octave 2 + note A#, 6 + octave 3 + note D_, 6 + note A#, 4 + note A_, 6 + note F_, 2 + note C_, 8 + octave 2 + note A#, 6 + octave 3 + note D_, 6 + intensity $b5 + note A_, 4 + note G_, 4 + note E_, 4 + note D_, 4 + note E_, 4 + octave 2 + note A#, 6 + octave 3 + note D_, 6 + note A#, 4 + note A_, 6 + note F_, 2 + note C_, 4 + octave 2 + note B_, 4 + note A#, 6 + octave 3 + note C#, 2 + octave 2 + note A#, 4 + note G_, 4 + note A_, 4 + octave 3 + note C_, 4 + octave 2 + note A_, 4 + octave 3 + note C_, 4 + loopchannel 0, Music_CherrygroveCity_branch_f5b26 +; f5b74 + +Music_CherrygroveCity_Ch2: ; f5b74 + dutycycle $3 + vibrato $10, $36 + stereopanning $f + notetype $c, $c3 + octave 3 + note C_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note G_, 2 + note A_, 2 + note A#, 2 +Music_CherrygroveCity_branch_f5b87: ; f5b87 + intensity $c6 + octave 4 + note C_, 6 + note D_, 4 + intensity $b3 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + intensity $c7 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note F_, 8 + intensity $c6 + note A#, 6 + octave 4 + note C_, 4 + intensity $b3 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + intensity $c7 + note A#, 6 + note G_, 2 + note E_, 8 + intensity $a0 + note D_, 6 + note F_, 6 + octave 4 + note D_, 4 + note C_, 6 + intensity $a5 + octave 3 + note A_, 2 + intensity $c7 + note F_, 8 + intensity $a0 + note D_, 6 + note F_, 6 + octave 4 + note D_, 4 + intensity $c7 + note C_, 16 + intensity $b5 + octave 3 + note D_, 6 + note F_, 6 + octave 4 + note D_, 4 + note C_, 6 + octave 3 + note A_, 2 + note F_, 8 + note C#, 6 + note F_, 6 + note G_, 4 + intensity $a0 + note F_, 8 + intensity $a7 + note F_, 8 + loopchannel 0, Music_CherrygroveCity_branch_f5b87 +; f5bd8 + +Music_CherrygroveCity_Ch3: ; f5bd8 + notetype $c, $16 + note __, 4 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 +Music_CherrygroveCity_branch_f5be4: ; f5be4 + note A_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 4 + octave 3 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 4 + octave 3 + note F_, 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 + note A#, 2 + octave 4 + note C_, 4 + octave 3 + note F_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 4 + note A#, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note A_, 4 + note F_, 2 + note A_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note F_, 4 + note A#, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note F_, 4 + note A#, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note A_, 4 + note F_, 2 + note A_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note F_, 4 + note A#, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + loopchannel 0, Music_CherrygroveCity_branch_f5be4 +; f5c48 + +Music_CherrygroveCity_Ch4: ; f5c48 + togglenoise $3 + notetype $c + note __, 16 +Music_CherrygroveCity_branch_f5c4d: ; f5c4d + note C#, 2 + note __, 2 + 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 +; f5c60 + + diff --git a/crysaudio/music/clair.asm b/crysaudio/music/clair.asm new file mode 100644 index 00000000..65808d6a --- /dev/null +++ b/crysaudio/music/clair.asm @@ -0,0 +1,445 @@ +Music_Clair: ; 1fa8d + dbw $c0, Music_Clair_Ch1 + dbw $01, Music_Clair_Ch2 + dbw $02, Music_Clair_Ch3 + dbw $03, Music_Clair_Ch4 +; 1fa99 + +Music_Clair_Ch1: ; 1fa99 + tempo 136 + volume $77 + tone $0001 + vibrato $12, $34 + stereopanning $f + notetype $c, $93 + dutycycle $3 +Music_Clair_branch_1faab: ; 1faab + octave 4 + note F_, 1 + note F#, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + loopchannel 2, Music_Clair_branch_1faab + octave 3 + note B_, 1 + note __, 1 + note G#, 1 + dutycycle $2 + intensity $92 + octave 5 + note F_, 1 + note G_, 4 + intensity $a7 + dutycycle $3 + octave 3 + note D#, 4 + note F_, 4 + note G_, 4 +Music_Clair_branch_1fac9: ; 1fac9 + intensity $93 + callchannel Music_Clair_branch_1fb12 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 2 + octave 2 + note G_, 1 + note A#, 1 + octave 3 + note C#, 2 + octave 2 + note A#, 1 + note G_, 1 + callchannel Music_Clair_branch_1fb12 + note D#, 1 + note C#, 1 + note D#, 2 + octave 4 + note A#, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A#, 1 + octave 5 + note D#, 1 + callchannel Music_Clair_branch_1fb2e + dutycycle $3 + note G#, 3 + note F_, 2 + note __, 1 + note A#, 4 + dutycycle $2 + note D#, 1 + note C#, 1 + note D#, 1 + note G_, 1 + note A#, 1 + octave 5 + note D#, 1 + callchannel Music_Clair_branch_1fb2e + dutycycle $3 + note D#, 3 + note C#, 2 + note __, 1 + octave 3 + note B_, 4 + dutycycle $2 + note G#, 1 + note C#, 1 + note D#, 1 + note G#, 1 + note B_, 1 + octave 4 + note D#, 1 + loopchannel 0, Music_Clair_branch_1fac9 +; 1fb12 + +Music_Clair_branch_1fb12: ; 1fb12 + dutycycle $3 + stereopanning $ff + octave 3 + note B_, 1 + note __, 2 + note G#, 5 + dutycycle $2 + stereopanning $f + octave 2 + note B_, 2 + note G#, 1 + note B_, 1 + octave 3 + note D#, 1 + note __, 1 + note D#, 1 + note F#, 1 + note F_, 1 + note C#, 1 + note __, 1 + note F_, 1 + note C#, 1 + note __, 1 + endchannel +; 1fb2e + +Music_Clair_branch_1fb2e: ; 1fb2e + octave 4 + note F#, 1 + note D#, 1 + note __, 1 + note F#, 1 + note D#, 1 + note __, 1 + octave 3 + note D#, 1 + note G#, 1 + note B_, 2 + note G#, 1 + note B_, 1 + octave 4 + note D#, 1 + note __, 1 + note D#, 1 + note F#, 1 + endchannel +; 1fb41 + +Music_Clair_Ch2: ; 1fb41 + dutycycle $3 + vibrato $12, $34 + notetype $6, $b7 +Music_Clair_branch_1fb49: ; 1fb49 + octave 3 + note A#, 2 + note B_, 2 + note A#, 2 + note __, 2 + note G#, 2 + note __, 2 + loopchannel 2, Music_Clair_branch_1fb49 + note F_, 2 + note __, 2 + note C#, 2 + note __, 2 + intensity $82 + note D#, 2 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + intensity $92 + note G_, 2 + octave 4 + note C#, 2 + note D#, 2 + octave 3 + note A#, 2 + intensity $b2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + intensity $c2 + note C#, 2 + note D#, 2 + note G_, 2 + note A#, 2 + intensity $b7 +Music_Clair_branch_1fb77: ; 1fb77 + callchannel Music_Clair_branch_1fba6 + note F#, 2 + note __, 4 + note D#, 12 + note __, 2 + note D#, 4 + note C#, 4 + octave 3 + note B_, 3 + note A#, 1 + note B_, 6 + octave 4 + note C#, 4 + note __, 2 + octave 3 + note A#, 16 + note __, 4 + forceoctave $c + callchannel Music_Clair_branch_1fba6 + forceoctave $0 + octave 5 + note F#, 2 + note __, 4 + note D#, 12 + note __, 2 + octave 4 + note G#, 4 + note A#, 4 + note B_, 3 + octave 5 + note C_, 1 + note C#, 6 + octave 4 + note A#, 4 + note __, 2 + note G#, 16 + note __, 4 + loopchannel 0, Music_Clair_branch_1fb77 +; 1fba6 + +Music_Clair_branch_1fba6: ; 1fba6 + octave 4 + note F#, 2 + note __, 4 + note D#, 12 + note __, 2 + octave 3 + note G#, 4 + note A#, 4 + note B_, 3 + octave 4 + note C_, 1 + note C#, 6 + octave 3 + note B_, 4 + note __, 2 + octave 4 + note D#, 16 + note __, 4 + endchannel +; 1fbb9 + +Music_Clair_Ch3: ; 1fbb9 + notetype $c, $14 + forceoctave $c + octave 3 + note C#, 2 + note __, 4 + octave 2 + note G#, 1 + note B_, 1 + octave 3 + note C#, 2 + note __, 4 + octave 2 + note G#, 1 + note B_, 1 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note A#, 4 + note G#, 4 + note G_, 4 +Music_Clair_branch_1fbd1: ; 1fbd1 + callchannel Music_Clair_branch_1fc3c + octave 2 + note C#, 2 + note __, 1 + note G#, 2 + note __, 1 + note C#, 2 + note __, 2 + note D#, 2 + note A#, 2 + note D#, 2 + callchannel Music_Clair_branch_1fc3c + octave 2 + note G#, 2 + note __, 1 + note C#, 2 + note __, 1 + note D#, 2 + note __, 2 + note D#, 1 + note C#, 1 + note D#, 1 + note F_, 1 + note G_, 1 + note A#, 1 + octave 1 + note G#, 2 + note __, 1 + octave 2 + note D#, 2 + note __, 1 + octave 1 + note G#, 2 + octave 3 + note F#, 1 + note __, 1 + octave 1 + note G#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 2 + octave 1 + note G#, 2 + octave 2 + note C#, 2 + note __, 1 + note G#, 2 + note __, 1 + note C#, 2 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note D#, 1 + octave 3 + note A#, 1 + octave 2 + note A#, 2 + octave 3 + note G_, 1 + octave 2 + note D#, 1 + octave 1 + note G#, 2 + note __, 1 + octave 2 + note D#, 2 + note __, 1 + octave 1 + note G#, 2 + octave 3 + note F#, 1 + note __, 1 + octave 1 + note G#, 1 + octave 3 + note D#, 1 + octave 2 + note D#, 2 + octave 1 + note G#, 2 + octave 2 + note D#, 2 + note __, 1 + note G_, 2 + note __, 1 + note G#, 2 + octave 2 + note B_, 1 + note __, 1 + octave 1 + note G#, 1 + octave 2 + note A#, 1 + note D#, 2 + note G#, 1 + octave 1 + note G#, 1 + loopchannel 0, Music_Clair_branch_1fbd1 +; 1fc3c + +Music_Clair_branch_1fc3c: ; 1fc3c + octave 1 + note G#, 2 + note __, 1 + octave 2 + note D#, 2 + note __, 1 + octave 1 + note G#, 2 + note __, 2 + note G#, 2 + octave 2 + note D#, 2 + octave 1 + note G#, 2 + endchannel +; 1fc4b + +Music_Clair_Ch4: ; 1fc4b + togglenoise $3 + notetype $c + stereopanning $f0 + note B_, 8 + note B_, 8 + note B_, 6 + stereopanning $ff + note D#, 1 + note D#, 1 + note D_, 2 + note D#, 1 + note D#, 1 + note D_, 2 + note D_, 1 + note D_, 1 +Music_Clair_branch_1fc5e: ; 1fc5e + stereopanning $ff + callchannel Music_Clair_branch_1fc6e + note G_, 1 + stereopanning $ff + callchannel Music_Clair_branch_1fc6e + note F#, 1 + loopchannel 0, Music_Clair_branch_1fc5e +; 1fc6e + +Music_Clair_branch_1fc6e: ; 1fc6e + note D#, 2 + stereopanning $f0 + note G_, 2 + stereopanning $ff + note D_, 2 + stereopanning $f0 + note G_, 1 + note G_, 1 + note G_, 2 + stereopanning $ff + note D#, 1 + stereopanning $f0 + note G_, 1 + stereopanning $ff + note D_, 2 + stereopanning $f0 + note G_, 1 + endchannel +; 1fc87 + + diff --git a/crysaudio/music/contestresults.asm b/crysaudio/music/contestresults.asm new file mode 100644 index 00000000..7b0f4815 --- /dev/null +++ b/crysaudio/music/contestresults.asm @@ -0,0 +1,180 @@ +Music_ContestResults: ; efb3e + dbw $c0, Music_ContestResults_Ch1 + dbw $01, Music_ContestResults_Ch2 + dbw $02, Music_ContestResults_Ch3 + dbw $03, Music_ContestResults_Ch4 +; efb4a + +Music_ContestResults_Ch1: ; efb4a + tempo 144 + volume $77 + notetype $c, $51 +Music_ContestResults_branch_efb52: ; efb52 + note __, 2 + octave 2 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + note __, 2 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note __, 2 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note __, 2 + note B_, 1 + note __, 3 + note A#, 1 + note __, 3 + note A_, 1 + note __, 3 + note G_, 1 + note __, 1 + loopchannel 0, Music_ContestResults_branch_efb52 +; efb7b + +Music_ContestResults_Ch2: ; efb7b + notetype $c, $61 +Music_ContestResults_branch_efb7e: ; efb7e + octave 2 + note C_, 2 + octave 3 + note E_, 1 + note __, 1 + octave 1 + note G_, 2 + octave 3 + note E_, 1 + note __, 1 + octave 1 + note A_, 2 + octave 3 + note E_, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note E_, 1 + note __, 1 + octave 2 + note D_, 2 + octave 3 + note F_, 1 + note __, 1 + octave 1 + note A_, 2 + octave 3 + note F_, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note F_, 1 + note __, 1 + octave 2 + note C#, 2 + octave 3 + note F_, 1 + note __, 1 +Music_ContestResults_branch_efba6: ; efba6 + octave 2 + note D_, 2 + octave 3 + note F_, 1 + note __, 1 + octave 1 + note A_, 2 + octave 3 + note F_, 1 + note __, 1 + loopchannel 2, Music_ContestResults_branch_efba6 + octave 2 + note G_, 2 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note D_, 2 + octave 3 + note F#, 1 + note __, 1 + octave 2 + note G_, 2 + octave 3 + note F_, 1 + note __, 1 + octave 2 + note D_, 2 + octave 3 + note D_, 1 + note __, 1 + loopchannel 0, Music_ContestResults_branch_efb7e +; efbcc + +Music_ContestResults_Ch3: ; efbcc + vibrato $8, $24 + notetype $c, $23 +Music_ContestResults_branch_efbd2: ; efbd2 + octave 4 + note E_, 5 + note __, 1 + note E_, 1 + note F_, 1 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 8 + note A_, 8 + note D_, 5 + note __, 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 +; efbe9 + +Music_ContestResults_Ch4: ; efbe9 + togglenoise $4 + notetype $6 +Music_ContestResults_branch_efbed: ; 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 +; efc01 + + diff --git a/crysaudio/music/credits.asm b/crysaudio/music/credits.asm new file mode 100644 index 00000000..d721eb77 --- /dev/null +++ b/crysaudio/music/credits.asm @@ -0,0 +1,1696 @@ +Music_Credits: ; 1f31c + dbw $c0, Music_Credits_Ch1 + dbw $01, Music_Credits_Ch2 + dbw $02, Music_Credits_Ch3 + dbw $03, Music_Credits_Ch4 +; 1f328 + +Music_Credits_Ch1: ; 1f328 + ftempo 139 + volume $77 + stereopanning $f + dutycycle $3 + notetype $c, $2f + octave 2 + note G_, 16 + notetype $6, $a7 + octave 3 + note B_, 12 + note A#, 2 + note A_, 2 + note B_, 1 + octave 4 + note C_, 7 + note D_, 8 + callchannel Music_Credits_branch_1f483 + note __, 4 + octave 3 + note B_, 2 + note __, 2 + note A_, 2 + note B_, 2 + note __, 2 + note A_, 2 + note B_, 2 + intensity $96 + note A_, 1 + note G_, 1 + octave 3 + note D_, 1 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + intensity $94 + note G_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + octave 1 + 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 + octave 3 + note B_, 2 + octave 4 + note G_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note B_, 2 + octave 4 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note B_, 2 + octave 4 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note E_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note B_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note C_, 2 + octave 3 + note B_, 2 + callchannel Music_Credits_branch_1f4f8 + callchannel Music_Credits_branch_1f559 + note B_, 1 + octave 4 + note C_, 7 + note D_, 8 + intensity $a7 + octave 5 + note E_, 2 + note C#, 2 + octave 4 + note A_, 2 + note E_, 2 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note E_, 2 + note C#, 2 + note C#, 1 + note D_, 7 + note E_, 7 + octave 3 + note __, 1 + forceoctave $2 + callchannel Music_Credits_branch_1f483 + callchannel Music_Credits_branch_1f4ed + callchannel Music_Credits_branch_1f4f8 + callchannel Music_Credits_branch_1f559 + forceoctave $0 + octave 3 + note A_, 12 + notetype $8, $a7 + note D_, 1 + note D_, 1 + note D_, 1 + callchannel Music_Credits_branch_1f582 + octave 3 + note B_, 6 + note A_, 6 + note A_, 6 + note G_, 6 + note A#, 6 + note A#, 6 + note A_, 6 + octave 4 + note C#, 6 + callchannel Music_Credits_branch_1f582 + ftempo 143 + octave 4 + note D_, 6 + octave 3 + note B_, 6 + note G_, 6 + octave 4 + note D_, 6 + ftempo 146 + note E_, 6 + note F#, 6 + note A_, 6 + octave 5 + note C#, 6 + notetype $c, $a7 +Music_Credits_branch_1f407: ; 1f407 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + loopchannel 6, Music_Credits_branch_1f407 + notetype $8, $a7 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + ftempo 153 + notetype $c, $a7 + octave 3 + note C_, 1 + note E_, 1 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note E_, 1 + note G_, 1 + octave 4 + note C_, 1 + note E_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + notetype $8, $a7 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + notetype $c, $a7 + octave 3 + note D_, 1 + note F#, 1 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F#, 1 + note A_, 1 + octave 4 + note D_, 1 + note E_, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + notetype $8, $a7 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + ftempo 160 + notetype $c, $a7 + octave 2 + note G_, 1 + note __, 3 + note E_, 1 + note __, 3 + notetype $8, $a7 + octave 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C#, 1 + note __, 1 + notetype $c, $a7 + octave 2 + note D_, 1 + note __, 7 + intensity $c7 + octave 2 + note D_, 16 + intensity $b8 + intensity $b7 + note __, 16 + note __, 16 + note __, 16 + endchannel +; 1f483 + +Music_Credits_branch_1f483: ; 1f483 + note C_, 16 + note F#, 1 + note G_, 3 + note E_, 4 + note D_, 4 + note E_, 4 + note D_, 4 + octave 3 + note B_, 2 + note __, 2 + note A#, 2 + note B_, 2 + note __, 2 + note A#, 2 + note B_, 4 + note G_, 4 + note __, 4 + octave 4 + note D_, 4 + note __, 4 + note E_, 4 + octave 3 + note A#, 4 + note G_, 4 + note E_, 4 + note G_, 4 + octave 4 + note G_, 4 + note C_, 4 + note D_, 4 + note C_, 2 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 4 + octave 3 + note A_, 4 + note __, 4 + octave 4 + note C_, 4 + octave 3 + note G#, 8 + note F_, 4 + note C_, 7 + note G#, 1 + note A_, 1 + note A#, 7 + note G#, 4 + note __, 4 + octave 4 + note C_, 4 + octave 3 + note G_, 4 + note E_, 4 + note C_, 4 + note E_, 4 + note G_, 4 + octave 4 + note C_, 4 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 6 + note C_, 1 + note __, 1 + endchannel +; 1f4ed + +Music_Credits_branch_1f4ed: ; 1f4ed + octave 4 + note C_, 4 + octave 3 + note D_, 4 + note G_, 4 + note B_, 8 + octave 4 + note D_, 4 + note C_, 4 + note D#, 4 + endchannel +; 1f4f8 + +Music_Credits_branch_1f4f8: ; 1f4f8 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + note C_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + note D_, 2 + note E_, 2 + note A_, 4 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note F_, 2 + note D_, 2 + octave 3 + note B_, 2 + note G_, 2 + note B_, 2 + octave 4 + note D_, 2 + note F_, 2 + note F#, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note C_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note G_, 4 + note A_, 2 + note B_, 2 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + note E_, 4 + octave 3 + note G#, 8 + octave 4 + note C_, 8 + note E_, 4 + octave 3 + note A_, 2 + octave 4 + note F_, 2 + note C_, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + octave 3 + note A_, 2 + octave 4 + note F_, 2 + note C_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + endchannel +; 1f559 + +Music_Credits_branch_1f559: ; 1f559 + octave 3 + note A_, 2 + octave 4 + note F#, 2 + note C_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note C_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note C_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note F#, 2 + note C_, 2 + note F#, 2 + note C_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note B_, 12 + note A#, 2 + note A_, 2 + endchannel +; 1f582 + +Music_Credits_branch_1f582: ; 1f582 + note __, 6 + octave 3 + note D_, 6 + note E_, 6 + note F_, 6 + note F#, 6 + note A_, 6 + octave 4 + note F#, 6 + note C#, 6 + endchannel +; 1f58d + +Music_Credits_Ch2: ; 1f58d + dutycycle $1 + vibrato $14, $23 + notetype $c, $2f + stereopanning $f0 + octave 4 + note G_, 16 + intensity $c7 + octave 5 + note G_, 8 + octave 3 + note G_, 4 + note F_, 4 + notetype $6, $c7 + callchannel Music_Credits_branch_1f6cb + octave 1 + note G_, 2 + note __, 2 + octave 2 + note G_, 2 + note __, 2 + note F#, 2 + note G_, 2 + note __, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + intensity $97 + 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 + octave 4 + note B_, 1 + octave 5 + note C_, 11 + octave 4 + note B_, 8 + note A_, 8 + note B_, 4 + note F#, 1 + note G_, 15 + notetype $c, $c7 + octave 5 + note E_, 15 + notetype $6, $c7 + note G_, 1 + note G#, 1 + note A_, 2 + note E_, 2 + note C_, 2 + octave 4 + note A_, 2 + octave 5 + note E_, 2 + note C_, 2 + octave 4 + note A_, 2 + note E_, 2 + callchannel Music_Credits_branch_1f748 + octave 4 + note B_, 1 + octave 5 + note C_, 11 + octave 4 + note B_, 8 + octave 5 + note C_, 12 + notetype $c, $c7 + note D_, 16 + note G_, 8 + octave 3 + note G_, 4 + note F_, 4 + octave 5 + note A_, 1 + note E_, 1 + note C#, 1 + octave 4 + note A_, 1 + octave 5 + note E_, 1 + note C#, 1 + octave 4 + note A_, 1 + note E_, 1 + octave 3 + note A_, 4 + note G_, 4 + notetype $6, $c7 + forceoctave $2 + callchannel Music_Credits_branch_1f6cb + callchannel Music_Credits_branch_1f73f + callchannel Music_Credits_branch_1f748 + forceoctave $0 + octave 5 + note C#, 1 + note D_, 11 + note C#, 8 + note D_, 12 + notetype $c, $c7 + note E_, 16 + note A_, 14 + notetype $8, $c7 + octave 2 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 6 + octave 3 + note F#, 6 + note G_, 6 + note G#, 6 + note A_, 6 + octave 4 + note C#, 6 + note A_, 6 + note G_, 6 + note G_, 6 + note F#, 6 + note F#, 6 + note E_, 6 + note E_, 6 + note D_, 6 + note C#, 6 + note E_, 6 + octave 1 + note D_, 3 + note __, 3 + note D_, 3 + note __, 3 + note D_, 3 + note __, 3 + note D_, 3 + note __, 3 + note F#, 3 + note __, 3 + note F#, 3 + note __, 3 + note F#, 3 + notetype $c, $c7 + octave 2 + note F#, 1 + note __, 1 + octave 1 + note F#, 2 + octave 2 + note F#, 1 + note __, 1 +Music_Credits_branch_1f657: ; 1f657 + octave 1 + note G_, 2 + octave 2 + note G_, 1 + note __, 1 + loopchannel 4, Music_Credits_branch_1f657 + octave 1 + note A_, 1 + octave 2 + note A_, 1 + note E_, 1 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note A_, 1 + note E_, 1 + note A_, 1 + octave 1 + note A_, 1 + octave 3 + note C#, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note G_, 1 + note A_, 1 + octave 4 + note C#, 1 + octave 5 + note D_, 12 + notetype $8, $c7 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C#, 1 + note __, 1 + notetype $c, $c7 + note D_, 12 + notetype $8, $c7 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C#, 1 + note __, 1 + note D_, 9 + notetype $c, $c7 + octave 4 + note F#, 1 + note A_, 1 + octave 5 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + notetype $8, $c7 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + notetype $c, $c7 + note C_, 1 + note __, 3 + note C_, 1 + note __, 3 + notetype $8, $c7 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C#, 1 + note __, 1 + notetype $c, $c7 + note D_, 1 + note __, 7 + intensity $c8 + intensity $c7 + octave 1 + note D_, 16 + intensity $c7 + note __, 16 + note __, 16 + note __, 16 + endchannel +; 1f6cb + +Music_Credits_branch_1f6cb: ; 1f6cb + octave 2 + note C_, 4 + intensity $b1 + octave 5 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 2 + note __, 2 + intensity $c7 + octave 2 + note C_, 1 + note __, 1 + note C_, 4 + note __, 12 + octave 1 + note B_, 4 + note __, 10 + note B_, 1 + note __, 1 + note B_, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 2 + note G_, 2 + octave 1 + note B_, 6 + note A#, 4 + intensity $b1 + octave 5 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 2 + note __, 2 + intensity $c7 + octave 1 + note A#, 1 + note __, 1 + note A#, 4 + note __, 12 + note A_, 4 + note __, 10 + note A_, 1 + note __, 1 + note A_, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 2 + note F_, 2 + octave 1 + note A_, 6 + note G#, 4 + intensity $b1 + octave 5 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + octave 5 + note C_, 2 + note __, 2 + intensity $c7 + octave 1 + note G#, 1 + note __, 1 + note G#, 4 + note __, 12 + note G_, 4 + note __, 10 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + octave 2 + note E_, 2 + octave 1 + note G_, 6 + note F#, 4 + note __, 2 + note F#, 2 + note F#, 2 + octave 2 + note D_, 2 + octave 1 + note F#, 4 + note A_, 2 + octave 2 + note D_, 2 + note F#, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note A_, 2 + octave 3 + note C_, 2 + endchannel +; 1f73f + +Music_Credits_branch_1f73f: ; 1f73f + octave 1 + note G_, 4 + note __, 4 + note G_, 2 + note __, 2 + octave 2 + note G_, 12 + note F#, 8 + endchannel +; 1f748 + +Music_Credits_branch_1f748: ; 1f748 + octave 4 + note A_, 8 + note B_, 8 + octave 5 + note C_, 8 + note E_, 8 + notetype $c, $c7 + note D_, 16 + octave 4 + note G_, 4 + note A_, 4 + note B_, 4 + octave 5 + note D_, 4 + note C_, 10 + notetype $6, $c7 + octave 4 + note B_, 1 + octave 5 + note C_, 3 + octave 4 + note B_, 4 + octave 5 + note C_, 4 + notetype $c, $c7 + octave 4 + note A_, 10 + notetype $6, $c7 + note G#, 1 + note A_, 3 + note B_, 4 + octave 5 + note C_, 4 + endchannel +; 1f772 + +Music_Credits_Ch3: ; 1f772 + vibrato $16, $23 + notetype $c, $34 + stereopanning $ff + octave 6 + note G_, 1 + note D_, 1 + note C_, 1 + octave 5 + note G_, 1 + octave 6 + note G_, 1 + note D_, 1 + note C_, 1 + octave 5 + note G_, 1 + intensity $24 + octave 6 + note G_, 1 + note D_, 1 + note C_, 1 + octave 5 + note G_, 1 + intensity $14 + octave 6 + note G_, 1 + note D_, 1 + note C_, 1 + octave 5 + note G_, 1 + octave 6 + note G_, 1 + note D_, 1 + octave 5 + note B_, 1 + note G_, 1 + octave 6 + note D_, 1 + octave 5 + note B_, 1 + note G_, 1 + note D_, 1 + notetype $6, $14 + note D#, 1 + note E_, 7 + note F_, 8 + callchannel Music_Credits_branch_1f8aa + octave 4 + note G_, 1 + note __, 1 + octave 5 + note G_, 1 + note __, 1 + note F#, 1 + note G_, 1 + note __, 1 + note F#, 1 + note G_, 1 + notetype $6, $14 + intensity $24 + note F_, 1 + note E_, 1 + intensity $14 + note E_, 4 + note __, 4 + note F_, 4 + callchannel Music_Credits_branch_1f8aa + callchannel Music_Credits_branch_1f8db + callchannel Music_Credits_branch_1f8e7 + callchannel Music_Credits_branch_1f934 + octave 2 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 + note G_, 2 + octave 3 + note G_, 2 + note __, 2 + octave 2 + note G_, 1 + note __, 1 + note G_, 2 + octave 3 + note G_, 2 + octave 2 + note G_, 4 + note B_, 2 + octave 3 + note D_, 2 + note F#, 2 + note G_, 2 + octave 2 + note E_, 4 + note __, 2 + note E_, 1 + note __, 1 + note E_, 2 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note E_, 1 + note __, 1 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 4 + note G#, 2 + note B_, 2 + octave 3 + note D#, 2 + note E_, 2 + octave 2 + note A_, 4 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note G#, 2 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note G#, 2 + note G_, 2 + octave 3 + note E_, 2 + note __, 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 + octave 5 + note D#, 1 + note E_, 7 + note F_, 8 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note E_, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 4 + note C#, 2 + note __, 2 + octave 5 + note F_, 1 + note F#, 7 + note G_, 8 + forceoctave $2 + callchannel Music_Credits_branch_1f8aa + callchannel Music_Credits_branch_1f8db + forceoctave $12 + callchannel Music_Credits_branch_1f8e7 + forceoctave $2 + callchannel Music_Credits_branch_1f934 + callchannel Music_Credits_branch_1f94b + forceoctave $0 + octave 6 + note C#, 2 + octave 5 + note A_, 2 + note E_, 2 + note C#, 2 + note A_, 2 + note E_, 2 + notetype $8, $14 + octave 2 + note D_, 1 + note D_, 1 + note D_, 1 + notetype $c, $14 + note D_, 16 + note F#, 16 + note G_, 16 + note G_, 8 + note A_, 8 + note __, 4 + octave 4 + note F#, 4 + note G_, 4 + note G#, 4 + note A_, 4 + octave 5 + note C#, 4 + note A_, 4 + note G_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note G_, 4 + note A_, 4 + note B_, 4 + octave 6 + note C#, 4 + note E_, 4 + intensity $15 + octave 4 + note D_, 6 + note F#, 2 + note A_, 8 + note E_, 6 + note G_, 2 + octave 5 + note C_, 6 + octave 4 + note B_, 1 + note A#, 1 + note A_, 8 + intensity $14 + octave 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + notetype $8, $14 + octave 3 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + notetype $c, $14 + octave 5 + note G_, 1 + note __, 3 + note E_, 1 + note __, 3 + notetype $8, $14 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + notetype $c, $14 + note A_, 1 + note __, 16 + note __, 16 + note __, 16 + endchannel +; 1f8aa + +Music_Credits_branch_1f8aa: ; 1f8aa + note G_, 16 + octave 6 + note C#, 1 + note D_, 3 + note C_, 4 + octave 5 + note B_, 4 + octave 6 + note C_, 4 + notetype $c, $14 + octave 5 + note G_, 10 + note E_, 2 + note __, 2 + note F_, 2 + note G_, 10 + notetype $6, $14 + note G#, 1 + note A_, 7 + note E_, 4 + note G_, 12 + note F_, 8 + note D_, 4 + note __, 4 + note E_, 4 + notetype $c, $14 + note F_, 10 + notetype $6, $14 + note F#, 1 + note G_, 7 + note F_, 4 + note E_, 4 + note D#, 4 + note E_, 4 + note B_, 12 + note A_, 8 + notetype $c, $14 + note D_, 16 + endchannel +; 1f8db + +Music_Credits_branch_1f8db: ; 1f8db + notetype $6, $14 + note F#, 1 + note G_, 3 + octave 4 + note G_, 4 + octave 5 + note D_, 4 + note G_, 12 + note G#, 8 + endchannel +; 1f8e7 + +Music_Credits_branch_1f8e7: ; 1f8e7 + octave 3 + note F_, 4 + note __, 2 + note F_, 2 + note __, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note F_, 4 + note G_, 4 + note __, 2 + note G_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + note G_, 2 + octave 4 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 4 + note E_, 4 + note __, 2 + note E_, 2 + note __, 2 + note B_, 2 + note G_, 2 + note E_, 2 + note B_, 2 + note __, 2 + note B_, 2 + note __, 2 + note G_, 2 + note B_, 2 + note E_, 4 + note A_, 4 + note __, 2 + note A_, 2 + note __, 2 + octave 4 + note E_, 2 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note __, 2 + note G#, 2 + octave 4 + note C_, 2 + note E_, 2 + note C_, 2 + octave 3 + note G#, 2 + endchannel +; 1f934 + +Music_Credits_branch_1f934: ; 1f934 + octave 2 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 2 + octave 3 + note F_, 2 + note __, 2 + octave 2 + note F_, 1 + note __, 1 + note F_, 2 + octave 3 + note F_, 2 + octave 2 + note F_, 4 + note A_, 2 + octave 3 + note C_, 2 + note E_, 2 + note F_, 2 + endchannel +; 1f94b + +Music_Credits_branch_1f94b: ; 1f94b + octave 2 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + note F#, 2 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note F#, 1 + note __, 1 + note F#, 2 + octave 3 + note F#, 2 + octave 2 + note F#, 4 + note A_, 2 + octave 3 + note C_, 2 + note F_, 2 + note F#, 2 + note G_, 8 + octave 4 + note C_, 8 + note D_, 8 + note F_, 8 + octave 6 + note G_, 2 + note D_, 2 + octave 5 + note B_, 2 + note G_, 2 + octave 6 + note D_, 2 + octave 5 + note B_, 2 + note G_, 2 + note D_, 2 + endchannel +; 1f973 + +Music_Credits_Ch4: ; 1f973 + 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: ; 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: ; 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: ; 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 +; 1fa4d + +Music_Credits_branch_1fa4d: ; 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 +; 1fa6d + +Music_Credits_branch_1fa6d: ; 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 +; 1fa8d + + diff --git a/crysaudio/music/crystalopening.asm b/crysaudio/music/crystalopening.asm new file mode 100644 index 00000000..dad4fa44 --- /dev/null +++ b/crysaudio/music/crystalopening.asm @@ -0,0 +1,366 @@ +Music_CrystalOpening: ; 1786e8 + dbw $c0, Music_CrystalOpening_Ch1 + dbw $01, Music_CrystalOpening_Ch2 + dbw $02, Music_CrystalOpening_Ch3 + dbw $03, Music_CrystalOpening_Ch4 +; 1786f4 + +Music_CrystalOpening_Ch1: ; 1786f4 + ftempo 136 + volume $77 + tone $0002 + vibrato $10, $34 + dutycycle $3 + stereopanning $f0 + notetype $c, $92 + octave 2 + note F#, 2 + note F#, 4 + note F#, 2 + note F#, 2 + note F#, 4 + note F#, 2 + note F#, 2 + note F#, 4 + note F#, 2 + note F#, 2 + note F#, 6 + notetype $c, $b4 + octave 2 + note B_, 2 + note F#, 2 + note E_, 2 + note B_, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note F#, 2 + octave 3 + note C#, 2 + octave 2 + note F#, 2 + note C#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + octave 3 + note F#, 2 + octave 2 + note F#, 2 + note B_, 2 + octave 3 + note E_, 2 + note F#, 2 + note E_, 2 + octave 2 + note B_, 2 + note F#, 2 + note B_, 2 + octave 3 + note E_, 2 + note F#, 2 + note E_, 2 + octave 2 + note B_, 2 + note F#, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note D_, 8 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note G_, 2 + octave 3 + note D_, 2 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + note E_, 2 + note D_, 2 + note A_, 2 + octave 3 + note A_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note F#, 2 + octave 4 + note C_, 2 + notetype $c, $a0 + note D_, 8 + note D_, 8 + notetype $c, $a7 + note D_, 8 + notetype $c, $b2 + octave 2 + note D_, 16 + endchannel +; 17877a + +Music_CrystalOpening_Ch2: ; 17877a + notetype $c, $a2 + dutycycle $3 + vibrato $8, $44 + octave 2 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 2 + note B_, 4 + note B_, 2 + note B_, 2 + note B_, 2 + notetype $c, $a2 + octave 2 + note E_, 1 + note B_, 1 + octave 3 + note E_, 1 + note F#, 1 + notetype $c, $c7 + note E_, 8 + note F#, 8 + octave 2 + note B_, 8 + notetype $c, $b0 + octave 3 + note B_, 8 + notetype $c, $c7 + note B_, 16 + note __, 16 + note G_, 8 + note A_, 8 + note D_, 8 + notetype $c, $c7 + octave 4 + note D_, 8 + notetype $c, $7c + note D_, 8 + notetype $c, $c7 + note D_, 8 + note G_, 8 + notetype $c, $b0 + note F#, 8 + note F#, 8 + notetype $c, $c7 + note F#, 8 + notetype $c, $c2 + octave 3 + note D_, 16 + endchannel +; 1787c8 + +Music_CrystalOpening_Ch3: ; 1787c8 + notetype $c, $16 + octave 1 + note B_, 4 + notetype $6, $16 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + notetype $c, $16 + note B_, 4 + note B_, 4 + note B_, 4 + notetype $6, $16 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + notetype $c, $16 + note B_, 4 + note B_, 4 + octave 2 + note B_, 8 + note F#, 8 + note D#, 8 + note B_, 4 + note F#, 4 + note B_, 4 + octave 3 + note E_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 4 + octave 2 + note A_, 8 + octave 3 + note D_, 8 + octave 2 + note A_, 8 + note F#, 8 + octave 3 + note D_, 4 + note E_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note C#, 4 + note C_, 8 + note D_, 8 + note D_, 16 + octave 2 + note D_, 1 + note __, 15 + endchannel +; 178810 + +Music_CrystalOpening_Ch4: ; 178810 + stereopanning $f + togglenoise $3 + notetype $c + note __, 16 + note __, 12 + octave 2 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 4 + notetype $8 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 6 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 3 + notetype $c + note C#, 1 + note C#, 1 + note G_, 1 + note G_, 1 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 1 + note C#, 1 + note G_, 2 + note D_, 1 + note C#, 1 + note A_, 1 + note G_, 1 + note D_, 1 + note D_, 1 + note G_, 1 + note __, 1 + note C#, 1 + note C#, 1 + note A_, 1 + note G_, 1 + note C#, 1 + note D_, 1 + note G_, 1 + note G_, 1 + note D_, 1 + note D_, 1 + note A_, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 4 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 4 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note A_, 1 + note G_, 1 + note D_, 1 + note C#, 1 + note G_, 1 + note G_, 1 + note C#, 1 + note C#, 1 + note A_, 1 + note G_, 1 + note D_, 1 + note C#, 1 + note G_, 1 + note G_, 1 + note D_, 1 + note C#, 1 + note A_, 1 + note G_, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note A_, 1 + note G_, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note G_, 1 + note D_, 1 + note C#, 1 + note C#, 2 + note D_, 2 + note __, 2 + note D_, 2 + note D_, 2 + note __, 6 + note __, 16 + note __, 16 + endchannel +; 178889 + + diff --git a/crysaudio/music/custom/ceruleanGSC.asm b/crysaudio/music/custom/ceruleanGSC.asm new file mode 100644 index 00000000..f9b07bc4 --- /dev/null +++ b/crysaudio/music/custom/ceruleanGSC.asm @@ -0,0 +1,948 @@ +Music_CeruleanGSC: ; f5127 + dbw $c0, Music_CeruleanGSC_Ch1 + dbw $01, Music_CeruleanGSC_Ch2 + dbw $02, Music_CeruleanGSC_Ch3 + dbw $03, Music_CeruleanGSC_Ch4 + +Music_CeruleanGSC_Ch1: + tempo $94 + volume $77 + notetype $C, $B2 + dutycycle 2 + octave 4 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 +Music_CeruleanGSC_Loop1: + intensity $B1 + octave 3 + note G#, 2 + octave 4 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + octave 3 + note B_, 2 + octave 4 + note G#, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + note D#, 2 + note B_, 2 + note D#, 2 + note B_, 2 + octave 3 + note B_, 4 + note B_, 2 + note G#, 1 + note G#, 1 + note E_, 2 + note F#, 2 + intensity $B4 + note G#, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 8 + intensity $B2 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note E_, 2 + note F#, 2 + intensity $B4 + note G#, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note D#, 8 + octave 3 + note E_, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note __, 3 + note B_, 4 + note G#, 4 + note B_, 2 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note __, 3 + note D#, 4 + octave 3 + note B_, 4 + note A_, 1 + note G#, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + note __, 1 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 1 + note __, 1 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + octave 5 + note B_, 1 + note F#, 1 + note D#, 1 + note C#, 1 + octave 4 + note B_, 1 + octave 5 + note C#, 1 + note D#, 1 + note F#, 1 + note B_, 8 + intensity $B6 + octave 3 + note G#, 8 + note G#, 4 + note B_, 4 + octave 4 + note E_, 4 + note F#, 4 + note G#, 8 +;Channel1_Bar16: + note D#, 8 + octave 3 + note B_, 4 + octave 4 + note B_, 4 +;Channel1_Bar17: + note A_, 4 + note B_, 4 + intensity $B2 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 +;Channel1_Bar18: + loopchannel 0, Music_CeruleanGSC_Loop1 + +Music_CeruleanGSC_Ch2: +;Channel2_Bar1: + vibrato 12,$34 + dutycycle 2 + notetype 2, $C2 + note __, 2 + notetype 12, $C2 + octave 5 + note E_, 2 + note D#, 2 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C#, 2 + notetype 2, $C2 + note D#, 10 +;Channel2_Bar2: +Music_CeruleanGSC_Loop2: + notetype 12, $C2 + note E_, 6 + octave 3 + note E_, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 +;Channel2_Bar3: + intensity $C4 + note G#, 6 + note A_, 1 + note G#, 1 + note F#, 14 +;Channel2_Bar4: + intensity $C2 + note E_, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 +;Channel2_Bar5: + intensity $C4 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 14 +;Channel2_Bar6: + intensity $C2 + dutycycle 1 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 +;Channel2_Bar7: + intensity $C4 + note G#, 6 + note A_, 1 + note G#, 1 + note F#, 8 +;Channel2_Bar8: + intensity $C2 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 2 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 2 + note D#, 2 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 +;Channel2_Bar9: + intensity $C4 + note G#, 6 + note E_, 1 + note G#, 1 + note B_, 8 +;Channel2_Bar10: + octave 3 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 1 + note E_, 1 + note __, 3 + unknownmusic0xde 10 + dutycycle 0 + octave 4 + note G#, 4 + note E_, 4 +;Channel2_Bar11: + unknownmusic0xde 85 + dutycycle 1 + octave 3 + note D#, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note __, 3 + unknownmusic0xde 10 + dutycycle 0 + octave 4 + note B_, 4 + note F#, 4 +;Channel2_Bar12: + unknownmusic0xde 85 + dutycycle 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 1 + note E_, 1 + note __, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note __, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note A_, 1 +;Channel2_Bar13: + note B_, 1 + note F#, 1 + note D#, 1 + note C#, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 1 + note F#, 1 + note B_, 8 +;Channel2_Bar14: + unknownmusic0xde 10 + intensity $C6 + dutycycle 2 + octave 4 + note E_, 8 + octave 3 + note B_, 4 + octave 4 + note F#, 4 +;Channel2_Bar15: + note G#, 4 + note A_, 4 + note B_, 8 +;Channel2_Bar16: + note B_, 8 + note G#, 4 + octave 5 + note D#, 4 +;Channel2_Bar17: + note C#, 4 + note D#, 4 + unknownmusic0xde 170 + notetype 2, $C2 + note __, 2 + notetype 12, $C2 + note E_, 2 + note D#, 2 + note C#, 2 + notetype 2, $C2 + note D#, 10 +;Channel2_Bar18: + loopchannel 0, Music_CeruleanGSC_Loop2 + +Music_CeruleanGSC_Ch3: + notetype 6, $15 + vibrato 12, $24 +;Channel3_Bar1: + note __, 16 + octave 4 + note E_, 3 + note __, 1 + note D#, 3 + note __, 1 + note C#, 3 + note __, 1 + note C_, 3 + note __, 1 +;Channel3_Bar2: +Music_CeruleanGSC_Loop3: + octave 1 + note E_, 2 + note __, 6 + note E_, 2 + note __, 4 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 2 + octave 1 + note E_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 2 + octave 1 + note F#, 2 + note __, 6 + note F#, 2 + note __, 4 + octave 2 + note C#, 2 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note B_, 2 + note __, 2 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note B_, 2 + note __, 2 + octave 1 + note E_, 2 + note __, 6 + note E_, 2 + note __, 4 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 2 + octave 1 + note E_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 2 + octave 1 + note F#, 2 + note __, 6 + note F#, 2 + note __, 4 + octave 2 + note C#, 2 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note B_, 2 + note __, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 2 + octave 4 + note B_, 2 + octave 3 + note B_, 2 + octave 1 + note E_, 2 + note __, 2 + octave 5 + note G#, 1 + note __, 3 + octave 1 + note E_, 2 + note __, 2 + octave 5 + note G#, 1 + note __, 1 + octave 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 5 + note G#, 1 + note __, 1 + octave 2 + note E_, 2 + octave 1 + note E_, 2 + octave 2 + note E_, 2 + octave 5 + note G#, 1 + note __, 1 + octave 1 + note E_, 2 + note F#, 2 + note __, 2 + octave 6 + note C#, 1 + note __, 3 + octave 1 + note F#, 2 + note __, 2 + octave 6 + note C#, 1 + note __, 1 + octave 2 + note C#, 2 + octave 1 + note B_, 2 + note __, 2 + octave 6 + note D#, 1 + note __, 1 + octave 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 2 + octave 6 + note D#, 1 + note __, 1 + octave 1 + note B_, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 4 + note E_, 2 + octave 5 + note E_, 2 + octave 1 + note E_, 2 + note __, 2 + octave 5 + note G#, 1 + note __, 1 + octave 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 5 + note G#, 1 + note __, 1 + octave 2 + note E_, 2 + octave 1 + note E_, 2 + octave 2 + note E_, 2 + octave 5 + note G#, 1 + note __, 1 + octave 1 + note E_, 2 + note F#, 2 + note __, 2 + octave 5 + note E_, 1 + note __, 3 + octave 1 + note F#, 2 + note __, 2 + octave 5 + note E_, 1 + note __, 1 + octave 2 + note C#, 2 + octave 1 + note B_, 2 + note __, 2 + octave 5 + note F#, 1 + note __, 1 + octave 1 + note B_, 2 + note G#, 2 + octave 4 + note D#, 2 + octave 5 + note G#, 1 + note __, 1 + octave 3 + note G#, 2 + octave 2 + note C#, 2 + note __, 6 + note C#, 2 + note __, 4 + note C#, 1 + note __, 1 + note C#, 2 + note __, 2 + octave 3 + note C#, 2 + note __, 2 + octave 2 + note C#, 2 + note __, 2 + octave 3 + note C#, 2 + note __, 2 + octave 1 + note G#, 2 + note __, 6 + note G#, 2 + note __, 4 + note G#, 1 + note __, 1 + note G#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 2 + octave 1 + note G#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 2 + octave 1 + note A_, 4 + octave 2 + note A_, 2 + note __, 2 + octave 1 + note A_, 2 + note __, 2 + note G#, 4 + octave 2 + note G#, 2 + note __, 2 + octave 1 + note G#, 2 + note __, 2 + note F#, 4 + octave 2 + note F#, 2 + note __, 2 + octave 1 + note F#, 2 + note __, 2 + note B_, 2 + note __, 2 + note B_, 8 + note __, 16 + note __, 4 + octave 2 + note E_, 2 + note __, 2 + octave 1 + note E_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 6 + note E_, 2 + note __, 2 + octave 1 + note E_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 6 + note F#, 2 + note __, 2 + octave 1 + note F#, 2 + note __, 2 + octave 2 + note F#, 2 + note __, 6 + note F#, 2 + note __, 2 + octave 1 + note F#, 2 + note __, 2 + octave 2 + note F#, 2 + note __, 6 + note G#, 2 + note __, 2 + octave 1 + note G#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 6 + note G#, 2 + note __, 2 + octave 1 + note G#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 6 + note A_, 2 + note __, 2 + octave 1 + note A_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 6 + note A_, 2 + note __, 2 + octave 1 + note A_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + loopchannel 0, Music_CeruleanGSC_Loop3 + +Music_CeruleanGSC_Ch4: + notetype $C + togglenoise 0 +;Channel4_Bar1: + note __, 16 +;Channel4_Bar2: +Music_CeruleanGSC_Loop4: + 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 +;Channel4_Bar3: + 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 +;Channel4_Bar4: + 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 +;Channel4_Bar5: + 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 F_, 1 +;Channel4_Bar6: + 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 +;Channel4_Bar7: + 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 A#, 2 +;Channel4_Bar8: + note F_, 1 + note F_, 1 + note G_, 1 + note F_, 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 +;Channel4_Bar9: + note A_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note A_, 2 + note A#, 2 + note D_, 2 + note D_, 1 + note F_, 1 +;Channel4_Bar10: + 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 +;Channel4_Bar11: + 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 A#, 2 +;Channel4_Bar12: + note A#, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note A_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note A_, 2 + note G_, 1 + note G_, 1 +;Channel4_Bar13: + note D_, 2 + note D_, 2 + note D_, 12 +;Channel4_Bar14: + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 +;Channel4_Bar15: + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 +;Channel4_Bar16: + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 +;Channel4_Bar17: + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note A#, 2 + note D_, 2 + note F_, 1 + note F_, 1 +;Channel4_Bar18: + loopchannel 0, Music_CeruleanGSC_Loop4 diff --git a/crysaudio/music/custom/cinnabarGSC.asm b/crysaudio/music/custom/cinnabarGSC.asm new file mode 100644 index 00000000..567c43a7 --- /dev/null +++ b/crysaudio/music/custom/cinnabarGSC.asm @@ -0,0 +1,181 @@ +Music_CinnabarGSC: ; f5127 + dbw $40, Music_CinnabarGSC_Ch1 + dbw $01, Music_CinnabarGSC_Ch2 + +Music_CinnabarGSC_Ch1: + tempo $118 + volume $77 + dutycycle 1 + notetype $C, $B6 +;Channel1_Bar1: +Music_CinnabarGSC_Loop1: + note __, 4 + octave 3 + note D_, 4 + note E_, 6 + note C#, 2 +;Channel1_Bar2: + note D_, 4 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 +;Channel1_Bar3: + note B_, 4 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 +;Channel1_Bar4: + note G_, 8 + note F#, 4 + note E_, 4 +;Channel1_Bar5: + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 +;Channel1_Bar6: + note G_, 4 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 +;Channel1_Bar7: + note B_, 4 + note G_, 4 + note F#, 3 + note E_, 1 + note F#, 2 + note A_, 2 +;Channel1_Bar8: + note G_, 4 + octave 4 + note D_, 1 + note E_, 1 + note D_, 4 + note D_, 1 + note E_, 1 + note D_, 4 +;Channel1_Bar9: + octave 3 + note B_, 6 + note G_, 2 + note E_, 8 +;Channel1_Bar10: + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note F#, 8 +;Channel1_Bar11: + octave 4 + note F#, 6 + note D_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 +;Channel1_Bar12: + note G_, 8 + note F#, 4 + note E_, 4 +;Channel1_Bar13: + loopchannel 0, Music_CinnabarGSC_Loop1 + +Music_CinnabarGSC_Ch2: + dutycycle 1 + notetype $C, $C6 +;Channel2_Bar1: +Music_CinnabarGSC_Loop2: + octave 3 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 +;Channel2_Bar2: + note D_, 4 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 +;Channel2_Bar3: + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note E_, 2 +;Channel2_Bar4: + note D_, 4 + octave 3 + note B_, 8 + note A_, 4 +;Channel2_Bar5: + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 +;Channel2_Bar6: + note D_, 4 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 +;Channel2_Bar7: + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 +;Channel2_Bar8: + note D_, 4 + octave 3 + note A_, 4 + note G_, 4 + note F#, 4 +;Channel2_Bar9: + octave 4 + note D_, 6 + octave 3 + note B_, 2 + note G_, 8 +;Channel2_Bar10: + octave 4 + note E_, 6 + note C_, 2 + octave 3 + note A_, 8 +;Channel2_Bar11: + octave 4 + note A_, 6 + note F#, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 +;Channel2_Bar12: + note B_, 4 + octave 4 + note D_, 4 + octave 3 + note B_, 2 + note A_, 6 +;Channel2_Bar13: + loopchannel 0, Music_CinnabarGSC_Loop2 diff --git a/crysaudio/music/custom/cinnabarremix.asm b/crysaudio/music/custom/cinnabarremix.asm new file mode 100644 index 00000000..cfe8883c --- /dev/null +++ b/crysaudio/music/custom/cinnabarremix.asm @@ -0,0 +1,478 @@ +Music_CinnabarRemix: + dbw $C0, Music_CinnabarRemix_Ch1 + dbw $01, Music_CinnabarRemix_Ch2 + dbw $02, Music_CinnabarRemix_Ch3 + dbw $03, Music_CinnabarRemix_Ch4 + +Music_CinnabarRemix_Ch1: ; b86d (2:786d) + tempo 144 + volume 119 + dutycycle 2 + +Music_CinnabarRemix_branch_b878: + notetype 12, 181 + note __, 4 + octave 3 + note D_, 4 + note E_, 6 + note C#, 2 + notetype 12, 177 + note D_, 4 + notetype 12, 181 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + notetype 12, 177 + note B_, 4 + notetype 12, 181 + note G_, 4 + note F#, 4 + note E_, 2 + note F#, 2 + notetype 12, 177 + note G_, 4 + notetype 12, 181 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 4 + note F#, 6 + note A_, 2 + notetype 12, 177 + note G_, 4 + notetype 12, 181 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note B_, 4 + note G_, 4 + note F#, 3 + note E_, 1 + note F#, 2 + note A_, 2 + notetype 12, 162 + note G_, 4 + octave 4 + note D_, 1 + note E_, 1 + note D_, 4 + notetype 12, 114 + note D_, 1 + note E_, 1 + note D_, 4 + notetype 12, 167 + octave 3 + note B_, 6 + note G_, 2 + note E_, 8 + octave 4 + note C_, 6 + octave 3 + note A_, 2 + note F#, 8 + octave 4 + note F#, 6 + note D_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 4 + note E_, 4 + loopchannel 0, Music_CinnabarRemix_branch_b878 + + +Music_CinnabarRemix_Ch2: ; b8d4 (2:78d4) + dutycycle 2 + vibrato 12,$34 + +Music_CinnabarRemix_branch_b8d9: + unknownmusic0xde 170 + notetype 12, $C2 + octave 3 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 + notetype 12, 193 + note D_, 4 + notetype 12, 199 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + notetype 12, 193 + note D_, 4 + notetype 12, 199 + octave 3 + note B_, 8 + note A_, 4 + note G_, 6 + note A_, 1 + note B_, 1 + octave 4 + note C_, 6 + note D_, 1 + note E_, 1 + notetype 12, 193 + note D_, 4 + notetype 12, 199 + note G_, 4 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note D_, 4 + note C_, 3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note D_, 1 + note E_, 1 + notetype 12, 193 + note D_, 4 + notetype 12, 199 + octave 3 + note A_, 4 + note G_, 4 + note F#, 4 + notetype 12, 176 + unknownmusic0xde 10 + octave 4 + note D_, 6 + octave 3 + note B_, 2 + note G_, 8 + octave 4 + note E_, 6 + note C_, 2 + octave 3 + note A_, 8 + octave 4 + note A_, 6 + note F#, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 4 + octave 4 + note D_, 4 + octave 3 + note B_, 2 + note A_, 6 + loopchannel 0, Music_CinnabarRemix_branch_b8d9 + + +Music_CinnabarRemix_Ch3: ; b93d (2:793d) + notetype 6, $25 + vibrato 12, $24 +Music_CinnabarRemix_branch_b93f: + octave 2 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note A_, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F#, 1 + note __, 1 + note G_, 1 + note __, 3 + note B_, 4 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 4 + octave 2 + note B_, 1 + note __, 3 + octave 3 + note D_, 2 + octave 2 + note B_, 1 + note B_, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note B_, 1 + note __, 1 + note G_, 1 + note __, 3 + octave 3 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 2 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 3 + octave 3 + note A_, 2 + note F#, 1 + note F#, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note C_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 3 + octave 3 + note D_, 2 + note C_, 1 + note C_, 1 + octave 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 2 + octave 3 + note C_, 1 + note __, 1 + loopchannel 0, Music_CinnabarRemix_branch_b93f +; 0xb9eb +Music_CinnabarRemix_Ch4: + notetype $c + togglenoise 0 +Music_CinnabarRemix_Loop4: + 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 + note A#, 4 + note A_, 4 + 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 + note A_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note A_, 4 + note A#, 4 + 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 + note A_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note A#, 4 + note A_, 4 + 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 + note A_, 2 + note G_, 1 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 1 + note A_, 4 + note A#, 4 + note A_, 4 + note A#, 4 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note G_, 1 + note G_, 1 + note F_, 2 + note G_, 1 + note G_, 1 + note F_, 2 + note G_, 1 + note G_, 1 + note F_, 2 + note G_, 1 + note G_, 1 + loopchannel 0, Music_CinnabarRemix_Loop4 diff --git a/crysaudio/music/custom/johtoGSC.asm b/crysaudio/music/custom/johtoGSC.asm new file mode 100644 index 00000000..f92e608e --- /dev/null +++ b/crysaudio/music/custom/johtoGSC.asm @@ -0,0 +1,2355 @@ +Music_JohtoGSC: + dbw $80, Music_JohtoGSC_Ch1 + dbw $01, Music_JohtoGSC_Ch2 + dbw $02, Music_JohtoGSC_Ch3 + +Music_JohtoGSC_Ch1: + ftempo 102 + volume $77 + notetype $C, $C2 + dutycycle 1 + vibrato $12, $24 + note __, 8 + octave 3 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + dutycycle 2 + note E_, 6 + note E_, 6 + note E_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + intensity $C7 + note D_, 4 + intensity $C2 + note E_, 6 + note D_, 6 + note E_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + intensity $C7 + note F_, 4 + intensity $C2 + octave 4 + note E_, 6 + note E_, 6 + note E_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + octave 3 + note A_, 2 + note A#, 2 + intensity $C7 + note B_, 4 + intensity $C2 + octave 4 + note E_, 6 + note E_, 6 + note E_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + intensity $C7 + note G_, 4 +Music_JohtoGSC_Loop1: + intensity $C2 + octave 3 + note E_, 2 + note D_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note F_, 2 + note D_, 2 + intensity $C7 + note A#, 4 + intensity $C2 + note G_, 1 + note F_, 1 + note E_, 1 + note G_, 1 + intensity $C7 + octave 4 + note C_, 4 + intensity $C2 + octave 3 + note A_, 1 + note G_, 1 + note F_, 1 + note A_, 1 + intensity $C7 + octave 4 + note D_, 4 + intensity $C2 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + octave 4 + note C_, 1 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note E_, 2 + note D_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note F_, 2 + note D_, 2 + intensity $C7 + note F_, 4 + intensity $C2 + note E_, 2 + note F_, 2 + intensity $C7 + octave 4 + note C_, 4 + intensity $C2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + intensity $C7 + octave 3 + note F_, 16 + note A_, 6 + note E_, 6 + note A#, 4 + octave 4 + note D_, 6 + note F_, 4 + intensity $C2 + note E_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + intensity $C7 + note A_, 16 + note E_, 8 + note D_, 8 + note E_, 8 + note F_, 8 + note E_, 8 + note D_, 8 + note G_, 8 + note F_, 8 + note D_, 8 + note C_, 8 + note D_, 8 + note D#, 8 + note D_, 8 + note C_, 8 + note D_, 8 + note D#, 8 + note D_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + intensity $C2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note F_, 2 + note G_, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 2 + note D#, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note D#, 2 + note D_, 2 + note D#, 4 + intensity $C7 + note C_, 8 + note D#, 4 + note D_, 4 + note C_, 4 + note D#, 4 + intensity $C2 + note E_, 2 + note D#, 2 + note E_, 4 + intensity $C7 + note C#, 8 + note F_, 4 + note D#, 4 + note C#, 4 + note F_, 4 + intensity $C2 + note F#, 2 + note F_, 2 + note F#, 4 + intensity $C7 + note D_, 8 + note F#, 4 + note E_, 4 + note D_, 4 + note F#, 4 + note G_, 8 + note D#, 8 + note A#, 8 + note G_, 8 + note D#, 16 + note __, 16 + note F_, 8 + note G_, 4 + note D#, 4 + note F_, 4 + intensity $C2 + note G_, 2 + note D#, 2 + intensity $C7 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note F_, 8 + note G_, 4 + note D#, 4 + note F_, 4 + intensity $C2 + note G_, 2 + note D#, 2 + intensity $C7 + note F_, 4 + note F_, 4 + note F_, 8 + note G_, 4 + note D#, 4 + note F_, 4 + intensity $C2 + note G_, 2 + note D#, 2 + intensity $C7 + note F_, 4 + octave 2 + note A#, 4 + octave 3 + note F_, 8 + note G_, 4 + note D#, 4 + note F_, 4 + intensity $C2 + note G_, 2 + note D#, 2 + intensity $C7 + note F_, 4 + note F_, 4 + note F_, 8 + note G_, 4 + note D#, 4 + note F_, 4 + intensity $C2 + note G#, 2 + note G_, 2 + intensity $C7 + note F_, 8 + note F_, 8 + note G_, 4 + note D#, 4 + note F_, 4 + intensity $C2 + note G_, 2 + note D#, 2 + intensity $C7 + note F_, 8 + note F_, 8 + note G_, 4 + note D#, 4 + note F_, 4 + intensity $C2 + note G_, 2 + note D#, 2 + intensity $C7 + note G#, 16 + octave 4 + note C_, 16 + intensity $C2 + octave 3 + note D#, 6 + note D#, 6 + note D#, 4 + note D#, 6 + note D#, 6 + note F_, 4 + note D#, 6 + note D#, 6 + note D#, 4 + note D#, 6 + note D#, 6 + note F_, 4 + note G#, 6 + note G_, 6 + note F_, 4 + note D#, 4 + note F_, 4 + note G_, 4 + note D#, 4 + note F_, 4 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note F_, 4 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note F_, 2 + note G_, 2 + note G#, 2 + octave 4 + note C_, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 6 + note D#, 6 + note G_, 4 + octave 4 + note C#, 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 4 + note F_, 4 + note C#, 2 + note D#, 2 + note F_, 4 + note C#, 2 + note D#, 2 + note A#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + intensity $C7 + octave 2 + note A#, 8 + octave 3 + note D#, 8 + octave 2 + note A#, 8 + octave 3 + note G_, 8 + note D#, 8 + note A#, 8 + note G_, 8 + octave 4 + note D#, 8 + octave 3 + note A#, 16 + note G_, 6 + note A#, 6 + intensity $C2 + note G#, 2 + note G_, 2 + intensity $C7 + note D#, 16 + note A#, 6 + intensity $C2 + note G_, 4 + note G_, 2 + intensity $C7 + note A#, 16 + note __, 16 + note __, 4 + octave 4 + note D_, 16 + note F_, 16 + loopchannel 0, Music_JohtoGSC_Loop1 +Music_JohtoGSC_Ch2: + notetype $C, $D2 + dutycycle 1 + vibrato $6, $36 + octave 4 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note G#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note G#, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note G#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note G#, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note G#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note G#, 1 + octave 3 + note B_, 1 + note A#, 1 + note B_, 1 + octave 4 + note G#, 1 + octave 3 + note A#, 1 + note A_, 1 + note A#, 1 + intensity $D7 + dutycycle 2 + octave 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note E_, 2 + note G_, 2 + note E_, 2 + note A_, 1 + note A_, 1 + note E_, 2 + note G_, 2 + note E_, 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note E_, 2 + note G_, 2 + note E_, 2 + note A_, 1 + note A_, 1 + note E_, 2 + note G_, 2 + note E_, 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note E_, 2 + note G_, 2 + note E_, 2 + note A_, 1 + note A_, 1 + note E_, 2 + note G_, 2 + note E_, 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note E_, 2 + note G_, 2 + note E_, 2 + note A_, 1 + note A_, 1 + note E_, 2 + note G_, 2 + note G#, 2 + octave 3 + note C_, 1 + octave 2 + note C_, 1 + note G_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C_, 1 + note C_, 1 + octave 2 + note G_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C_, 1 + octave 2 + note C_, 1 + note G_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C_, 1 + note C_, 1 + octave 2 + note G_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C_, 1 + octave 2 + note C_, 1 + note G_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C_, 1 + note C_, 1 + octave 2 + note G_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C_, 1 + octave 2 + note C_, 1 + note G_, 2 + note A#, 2 + note G_, 2 + octave 3 + note C_, 1 + note C_, 1 + octave 2 + note G_, 2 + note A#, 2 + note G_, 2 +Music_JohtoGSC_Loop2: + octave 1 + note A_, 1 + note A_, 1 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note E_, 1 + note E_, 1 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note E_, 1 + note E_, 1 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note F_, 2 + octave 2 + note F_, 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note F_, 2 + octave 2 + note F_, 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note E_, 1 + note E_, 1 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note E_, 1 + note E_, 1 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note F_, 2 + octave 2 + note F_, 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note F_, 2 + octave 2 + note F_, 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note E_, 1 + note E_, 1 + note A_, 1 + note A_, 1 + note E_, 2 + note A_, 2 + note E_, 1 + octave 1 + note E_, 1 + octave 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note E_, 2 + note A_, 2 + note E_, 1 + note E_, 1 + note A_, 1 + note A_, 1 + note E_, 2 + note A_, 2 + note E_, 1 + octave 1 + note E_, 1 + octave 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note E_, 2 + note A_, 2 + note E_, 1 + note E_, 1 + note A_, 1 + note A_, 1 + note E_, 2 + note A_, 2 + note E_, 1 + octave 1 + note E_, 1 + octave 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note E_, 2 + note A_, 2 + note A_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + note D_, 1 + note D_, 1 + note A_, 1 + note A_, 1 + note D_, 2 + note A_, 2 + note D_, 1 + octave 1 + note D_, 1 + octave 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note D_, 2 + note A_, 2 + note D_, 1 + note D_, 1 + note A_, 1 + note A_, 1 + note D_, 2 + note A_, 2 + note D_, 1 + octave 1 + note D_, 1 + octave 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note D_, 2 + note A_, 2 + note D_, 1 + note D_, 1 + note A_, 1 + note A_, 1 + note D_, 2 + note A_, 2 + note D_, 1 + octave 1 + note D_, 1 + octave 2 + note A_, 1 + octave 1 + note A_, 1 + octave 2 + note D_, 2 + note A_, 2 + note A_, 2 + octave 3 + note D_, 2 + note C_, 2 + octave 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 2 + note C_, 1 + note C_, 1 + note G_, 1 + note G_, 1 + note C_, 2 + note G_, 2 + note C_, 1 + octave 1 + note C_, 1 + octave 2 + note G_, 1 + octave 1 + note G_, 1 + octave 2 + note C_, 2 + note G_, 2 + note C_, 1 + note C_, 1 + note G_, 1 + note G_, 1 + note C_, 2 + note G_, 2 + note C_, 1 + octave 1 + note C_, 1 + octave 2 + note G_, 1 + octave 1 + note G_, 1 + octave 2 + note C_, 2 + note G_, 2 + note C_, 1 + note C_, 1 + note G_, 1 + note G_, 1 + note C_, 2 + note G_, 2 + note C_, 1 + octave 1 + note C_, 1 + octave 2 + note G_, 1 + octave 1 + note G_, 1 + octave 2 + note C_, 2 + note G_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note D_, 2 + octave 1 + note G_, 1 + note G_, 1 + octave 2 + note G_, 6 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note F_, 6 + octave 1 + note E_, 1 + note E_, 1 + octave 2 + note E_, 6 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 6 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + octave 2 + note D#, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + octave 2 + note D#, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note C_, 1 + note C_, 1 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + octave 1 + note C_, 1 + note C_, 1 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + octave 1 + note C_, 1 + note C_, 1 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + octave 1 + note C_, 1 + note C_, 1 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + octave 1 + note C#, 1 + note C#, 1 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note C#, 2 + octave 1 + note C#, 1 + note C#, 1 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note C#, 2 + octave 1 + note C#, 1 + note C#, 1 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note C#, 2 + octave 1 + note C#, 1 + note C#, 1 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note C#, 2 + octave 1 + note D_, 1 + note D_, 1 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + octave 1 + note D_, 1 + note D_, 1 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + octave 1 + note D_, 1 + note D_, 1 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + octave 1 + note D_, 1 + note D_, 1 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + note D#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + note D#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + note D#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + note D#, 2 + note G_, 1 + note G_, 1 + octave 3 + note A#, 2 + note G_, 2 + octave 2 + note A#, 2 + note G_, 1 + note G_, 1 + octave 3 + note A#, 2 + note G_, 2 + octave 2 + note A#, 2 + note G_, 1 + note G_, 1 + octave 3 + note A#, 2 + note G_, 2 + octave 2 + note A#, 2 + note G_, 1 + note G_, 1 + octave 3 + note A#, 2 + note G_, 2 + octave 2 + note A#, 2 + note A#, 1 + note A#, 1 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note A#, 2 + note G#, 2 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A#, 2 + note D#, 2 + note F_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note F_, 4 + note A#, 1 + note A#, 1 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note A#, 2 + note G#, 2 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + note A#, 4 + note A#, 1 + note A#, 1 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note A#, 2 + note G#, 2 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A#, 2 + note D#, 2 + note F_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note F_, 4 + note A#, 1 + note A#, 1 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note C#, 2 + note C_, 2 + octave 2 + note A#, 2 + note G#, 2 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A#, 2 + octave 3 + note C_, 2 + octave 2 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + note A#, 4 + note C#, 1 + note C#, 1 + octave 3 + note C#, 6 + octave 2 + note C_, 1 + note C_, 1 + octave 3 + note C_, 6 + octave 1 + note A#, 1 + note A#, 1 + octave 2 + note A#, 6 + octave 1 + note G#, 1 + note G#, 1 + octave 2 + note G#, 6 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note F_, 6 + octave 1 + note G_, 1 + note G_, 1 + octave 2 + note G_, 6 + octave 1 + note G#, 1 + note G#, 1 + octave 2 + note G#, 6 + octave 1 + note A#, 1 + note A#, 1 + octave 2 + note A#, 6 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note F_, 6 + octave 1 + note G_, 1 + note G_, 1 + octave 2 + note G_, 6 + octave 1 + note G#, 2 + octave 2 + note G#, 2 + note D#, 2 + note G#, 2 + octave 3 + note C_, 8 + octave 2 + note C_, 2 + octave 3 + note C_, 4 + note D#, 2 + note D#, 8 + octave 2 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note G#, 1 + note G#, 1 + octave 3 + note C#, 2 + note G#, 2 + note C#, 2 + octave 2 + note G#, 2 + octave 1 + note C#, 1 + note C#, 1 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + octave 1 + note G#, 1 + note G#, 1 + octave 3 + note C#, 2 + note G#, 2 + note C#, 2 + octave 2 + note G#, 2 + octave 1 + note C#, 1 + note C#, 1 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 1 + note G#, 1 + note G#, 1 + octave 3 + note C#, 2 + note G#, 2 + note C#, 2 + octave 2 + note G#, 2 + octave 1 + note C#, 1 + note C#, 1 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + octave 1 + note G#, 1 + note G#, 1 + octave 3 + note C#, 2 + note G#, 2 + note C#, 2 + octave 2 + note G#, 2 + octave 1 + note C#, 1 + note C#, 1 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + octave 1 + note D#, 1 + note D#, 1 + octave 2 + note D#, 6 + octave 1 + note C#, 1 + note C#, 1 + octave 2 + note C#, 6 + octave 1 + note C_, 1 + note C_, 1 + octave 2 + note C_, 7 + octave 1 + note A#, 1 + note A#, 6 + note A#, 1 + note A#, 1 + octave 2 + note A#, 6 + octave 1 + note G#, 1 + note G#, 1 + octave 2 + note G#, 6 + octave 1 + note G_, 1 + note G_, 1 + octave 2 + note G_, 6 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note F_, 6 + octave 3 + note D#, 2 + note D#, 2 + octave 4 + note D#, 6 + octave 2 + note D#, 2 + octave 3 + note D#, 4 + octave 2 + note A#, 2 + note A#, 2 + octave 3 + note A#, 6 + octave 1 + note A#, 2 + octave 2 + note A#, 4 + note G_, 2 + note G_, 2 + octave 3 + note G_, 6 + octave 1 + note G_, 2 + octave 2 + note G_, 4 + note D#, 2 + note D#, 2 + octave 3 + note D#, 6 + octave 1 + note D#, 2 + octave 2 + note D#, 4 + note A_, 2 + note A_, 2 + octave 3 + note A_, 6 + octave 1 + note A_, 2 + octave 2 + note A_, 4 + octave 3 + note C_, 2 + note C_, 2 + octave 4 + note C_, 6 + octave 2 + note C_, 2 + octave 3 + note C_, 4 + octave 2 + note A#, 2 + note A#, 2 + octave 3 + note A#, 6 + octave 1 + note A#, 2 + octave 2 + note A#, 4 + octave 3 + note D_, 2 + note D_, 2 + octave 4 + note D_, 6 + octave 2 + note D_, 2 + octave 3 + note D_, 4 + loopchannel 0, Music_JohtoGSC_Loop2 +Music_JohtoGSC_Ch3: + notetype $C, 21 + vibrato $12, $23 + octave 2 + note D_, 1 + octave 4 + note D_, 1 + octave 3 + note D_, 2 + octave 2 + note C#, 1 + octave 4 + note C#, 1 + octave 3 + note C#, 2 + octave 2 + note C_, 1 + octave 4 + note C_, 1 + octave 3 + note C_, 2 + octave 1 + note B_, 1 + octave 3 + note B_, 1 + octave 2 + note B_, 2 + octave 1 + note A#, 1 + octave 3 + note A#, 1 + octave 2 + note A#, 2 + octave 1 + note A_, 1 + octave 3 + note A_, 1 + octave 2 + note A_, 2 + octave 1 + note G#, 1 + octave 3 + note G#, 1 + octave 2 + note G#, 2 + note G_, 1 + note G#, 1 + note A_, 2 + intensity 24 + octave 5 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note A_, 4 + note A_, 2 + octave 3 + note A_, 4 + octave 4 + note A_, 6 + note A#, 4 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note A_, 4 + note A_, 2 + octave 3 + note A_, 4 + octave 4 + note A_, 6 + note A#, 4 + octave 6 + note C_, 4 + octave 5 + note C_, 2 + octave 6 + note C_, 4 + octave 5 + note C_, 2 + octave 6 + note C_, 4 + note C_, 2 + octave 5 + note C_, 4 + octave 6 + note C_, 6 + note C#, 4 + intensity 16 + note C_, 2 + octave 4 + note E_, 2 + note A_, 2 + octave 6 + note C_, 2 + octave 4 + note E_, 2 + note A_, 2 + octave 6 + note C_, 2 + octave 4 + note E_, 2 + octave 6 + note C_, 2 + octave 4 + note E_, 2 + note B_, 2 + octave 6 + note C_, 2 + octave 5 + note C_, 2 + note E_, 2 + note B_, 4 +Music_JohtoGSC_Loop3: + intensity 21 + octave 4 + note A_, 6 + octave 5 + note E_, 6 + note D_, 2 + note E_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note F_, 4 + note __, 2 + note F_, 4 + note __, 2 + note F_, 4 + note A#, 4 + note __, 2 + note A#, 4 + note __, 2 + note A#, 4 + intensity 20 + octave 4 + note A_, 6 + octave 5 + note E_, 6 + note D_, 2 + note E_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note F_, 4 + note __, 2 + note F_, 4 + note __, 2 + note F_, 4 + note D_, 4 + octave 4 + note A#, 2 + octave 5 + note D_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note A#, 2 + octave 6 + note D_, 2 + note C#, 12 + octave 5 + note A#, 4 + note A_, 4 + octave 4 + note A_, 2 + octave 5 + note A_, 4 + octave 4 + note A_, 2 + octave 5 + note A_, 4 + note A_, 16 + intensity 16 + octave 4 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + note A_, 2 + note G_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + note A_, 2 + note G_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + note A_, 2 + note G_, 2 + note A#, 2 + note A_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A#, 1 + note __, 1 + intensity 21 + note G_, 2 + note F_, 2 + note G_, 2 + note G#, 4 + note G_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note G#, 4 + note G_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note G#, 4 + note G_, 2 + note F_, 2 + note G#, 2 + note F_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + intensity 24 + note G_, 4 + note D_, 2 + octave 5 + note D_, 6 + note C_, 2 + note D_, 2 + note F_, 4 + note E_, 4 + note D_, 4 + note C_, 4 + note D#, 16 + note G_, 16 + intensity 21 + octave 4 + note F_, 2 + note D#, 2 + note F_, 4 + note D#, 4 + note F_, 4 + note G_, 4 + note F_, 4 + note D#, 4 + note G_, 4 + note G#, 2 + note G_, 2 + note G#, 4 + note F_, 4 + note G_, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note G#, 4 + note A_, 2 + note G#, 2 + note A_, 4 + note F#, 4 + note G#, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note A_, 4 + note A#, 4 + note __, 2 + note A#, 4 + note __, 2 + note A#, 4 + octave 5 + note D#, 4 + note __, 2 + note D#, 4 + note __, 2 + note D#, 4 + intensity 36 + octave 4 + note A#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note A#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note A#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note A#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + intensity 37 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note D#, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + octave 5 + note G_, 1 + octave 4 + note D#, 1 + note A#, 1 + note D#, 1 + intensity 16 + octave 5 + note F_, 2 + octave 4 + note F_, 2 + note A#, 2 + octave 5 + note F_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note C_, 8 + note F_, 2 + octave 4 + note F_, 2 + note A#, 2 + octave 5 + note F_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note F_, 2 + note G_, 2 + note F_, 8 + note F_, 2 + octave 4 + note F_, 2 + note A#, 2 + octave 5 + note F_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note F_, 2 + octave 4 + note A#, 2 + octave 5 + note C_, 16 + note D#, 16 + intensity 21 + octave 4 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 6 + note G_, 4 + note G_, 4 + note D#, 2 + note G_, 6 + note G#, 4 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 6 + note G_, 4 + note G_, 6 + note G_, 6 + note G#, 4 + intensity 24 + octave 5 + note D#, 2 + octave 4 + note D#, 2 + octave 5 + note D#, 2 + note A#, 6 + note G#, 2 + note G_, 2 + note G#, 2 + octave 4 + note G#, 2 + octave 5 + note G_, 4 + note F_, 4 + note D#, 4 + note F_, 4 + note __, 2 + note F_, 4 + note __, 2 + note F_, 4 + note G#, 4 + note __, 2 + note G#, 4 + note __, 2 + note G#, 4 + note D#, 2 + octave 4 + note D#, 2 + octave 5 + note D#, 2 + note A#, 6 + note G#, 2 + note G_, 2 + note G#, 2 + octave 4 + note G#, 2 + octave 5 + note G_, 4 + note F_, 4 + note D#, 4 + note C#, 4 + note __, 2 + note C#, 4 + note __, 2 + note C#, 4 + note C#, 4 + note C_, 4 + intensity 21 + octave 4 + note A#, 4 + note G#, 4 + note G_, 1 + note __, 1 + note G_, 4 + note D#, 2 + note A#, 8 + note A#, 1 + note __, 1 + note A#, 4 + note G_, 2 + octave 5 + note D#, 8 + note D#, 1 + note __, 1 + note D#, 4 + octave 4 + note A#, 2 + octave 5 + note G_, 8 + note G_, 1 + note __, 1 + note G_, 4 + note D#, 2 + note A#, 8 + note G_, 2 + octave 4 + note G_, 2 + octave 5 + note G_, 2 + note A#, 6 + note G#, 2 + note G_, 2 + note D#, 4 + note __, 2 + note D#, 4 + note __, 2 + note D#, 4 + intensity 20 + note D#, 2 + octave 4 + note D#, 2 + octave 5 + note D#, 2 + note A#, 6 + note G#, 2 + note G_, 2 + note D#, 4 + note __, 2 + note D#, 4 + note __, 2 + note D#, 4 + octave 4 + note A_, 4 + octave 3 + note A_, 2 + octave 5 + note E_, 6 + note D_, 2 + note E_, 2 + note G_, 2 + octave 4 + note G_, 2 + octave 5 + note F#, 4 + note E_, 4 + note D_, 4 + note F_, 4 + note __, 2 + note F_, 4 + note __, 2 + note F_, 4 + note A#, 4 + note __, 2 + note A#, 4 + note __, 2 + note A#, 4 + loopchannel 0, Music_JohtoGSC_Loop3 diff --git a/crysaudio/music/custom/kantogymleaderremix.asm b/crysaudio/music/custom/kantogymleaderremix.asm new file mode 100644 index 00000000..10164d6c --- /dev/null +++ b/crysaudio/music/custom/kantogymleaderremix.asm @@ -0,0 +1,1059 @@ +Music_KantoGymLeaderRemix: + dbw $80, Music_KantoGymLeaderRemix_Ch1 + dbw $01, Music_KantoGymLeaderRemix_Ch2 + dbw $02, Music_KantoGymLeaderRemix_Ch3 + +Music_KantoGymLeaderRemix_Ch1: + ftempo 101 + volume $77 + dutycycle $3 + tone $0002 + vibrato $12, $15 + notetype $c, $b2 + octave 3 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 8 + intensity $b7 + note B_, 2 + intensity $b2 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 8 + intensity $b7 + octave 3 + note E_, 2 + intensity $b2 + octave 2 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 8 + intensity $b7 + note B_, 2 + intensity $b2 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + intensity $b4 + octave 3 + note E_, 4 + note E_, 4 + note E_, 2 +Music_KantoGymLeaderRemix_Loop1: + octave 2 + note C#, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + note C#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + octave 3 + note C#, 1 + octave 2 + note B_, 1 + note G#, 1 + note C#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note __, 4 + octave 1 + note A_, 4 + note __, 4 + note B_, 4 + note __, 4 + note A_, 4 + note __, 2 + note G#, 2 + note __, 4 + note A_, 4 + note __, 4 + note B_, 4 + note __, 4 + note A_, 4 + note __, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note __, 4 + octave 2 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note __, 4 + note G#, 12 + note __, 4 + octave 3 + note E_, 12 + octave 2 + note A#, 4 + note G#, 4 + note A#, 4 + note B_, 2 + octave 3 + note C#, 4 + octave 2 + note F#, 2 + note A#, 2 + octave 3 + note C#, 2 + note F#, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + note __, 4 + note E_, 12 + octave 2 + note G#, 1 + note F#, 1 + note G#, 1 + note A#, 1 + note B_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + note D#, 1 + note C#, 1 + octave 2 + note B_, 1 + note A#, 1 + note G#, 1 + note A#, 4 + note B_, 4 + note G#, 2 + note A#, 6 + octave 3 + note C#, 4 + octave 2 + note B_, 2 + note A#, 4 + note G#, 6 + note A#, 4 + note B_, 4 + note G#, 2 + note A#, 6 + octave 3 + note C#, 4 + note E_, 2 + note D#, 4 + octave 2 + note B_, 6 + note A#, 4 + note B_, 4 + note G#, 2 + note A#, 6 + note B_, 4 + note A#, 2 + note G#, 4 + note F#, 6 + note A#, 4 + note B_, 4 + note G#, 2 + note A#, 6 + octave 3 + note C#, 4 + note E_, 2 + note D#, 4 + octave 2 + note B_, 6 + loopchannel 0, Music_KantoGymLeaderRemix_Loop1 + +Music_KantoGymLeaderRemix_Ch2: + dutycycle $3 + vibrato $8, $36 + tone $0001 + notetype $c, $c2 + +Music_KantoGymBattle_branch_ec852R: ; ec852 + octave 4 + note A#, 1 + note G#, 1 + note A#, 1 + octave 5 + note D#, 1 + loopchannel 8, Music_KantoGymBattle_branch_ec852R + octave 3 + +Music_KantoGymBattle_branch_ec85dR: ; ec85d + intensity $c2 + note D#, 2 + note D#, 2 + note F#, 1 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 2 + note D#, 2 + note A#, 1 + note G#, 1 + note F#, 1 + note A#, 1 + note D#, 2 + note D#, 2 + note B_, 1 + note A#, 1 + note G#, 1 + note B_, 1 + note D_, 2 + intensity $c7 + note E_, 2 + intensity $c2 + note D#, 2 + note D#, 2 + note F#, 1 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 2 + note D#, 2 + note A#, 1 + note G#, 1 + note F#, 1 + note A#, 1 + note D#, 2 + note D#, 2 + note B_, 1 + note A#, 1 + note G#, 1 + note B_, 1 + note G#, 2 + intensity $c7 + note B_, 2 + intensity $c2 + octave 4 + loopchannel 2, Music_KantoGymBattle_branch_ec85dR +Music_KantoGymLeaderRemix_Loop2: + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note B_, 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 4 + note F#, 1 + note __, 1 + note G#, 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 2 + note F#, 2 + note E_, 2 + note G#, 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 13 + note F#, 1 + note __, 1 + note F#, 1 + note __, 13 + note F#, 1 + note __, 1 + note F#, 1 + note __, 13 + note F#, 1 + note __, 1 + note F#, 1 + note __, 13 + note F#, 1 + note __, 1 + note F#, 1 + note __, 13 + note F#, 1 + note __, 1 + note F#, 1 + note __, 13 + note F#, 1 + note __, 1 + note F#, 1 + note __, 13 + note F#, 1 + note __, 1 + note F#, 1 + note __, 13 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 12 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 12 + note A#, 16 + note F#, 16 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 12 + note G#, 8 + note B_, 8 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + note B_, 6 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note D_, 6 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + note B_, 6 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note C#, 2 + octave 1 + note F#, 2 + octave 2 + note D_, 6 + loopchannel 0, Music_KantoGymLeaderRemix_Loop2 + +Music_KantoGymLeaderRemix_Ch3: + notetype $c, $19 + octave 2 + note E_, 1 + note __, 1 + +Music_KantoGymBattle_branch_ec934R: ; ec934 + note B_, 3 + note __, 1 + loopchannel 6, Music_KantoGymBattle_branch_ec934R + note B_, 2 + note G#, 2 + note B_, 2 + +Music_KantoGymBattle_branch_ec93dR: ; ec93d + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 4 + note D_, 1 + note __, 1 + note F_, 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 4 + note D#, 1 + note __, 1 + note E_, 2 + loopchannel 2, Music_KantoGymBattle_branch_ec93dR +Music_KantoGymLeaderRemix_Loop3: + + notetype $C, 21 + octave 4 + note A#, 4 + note G#, 4 + note A#, 4 + note B_, 2 + octave 5 + note C#, 4 + octave 4 + note B_, 4 + note A#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A#, 2 + note E_, 8 + note G#, 8 + note B_, 10 + note G#, 6 + note A#, 4 + note G#, 4 + note A#, 4 + note B_, 2 + octave 5 + note C#, 4 + octave 4 + note B_, 4 + note A#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A#, 2 + note G#, 8 + note F#, 8 + note E_, 8 + note B_, 4 + note B_, 2 + note G#, 2 + note __, 4 + intensity 20 + octave 3 + note A_, 1 + note G_, 1 + note F#, 1 + note A_, 1 + note __, 4 + note B_, 1 + note A_, 1 + note F#, 1 + note B_, 1 + note __, 4 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note F#, 1 + octave 4 + note C#, 1 + note __, 2 + octave 3 + note B_, 1 + note F#, 1 + note B_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note A_, 1 + note G#, 1 + note F#, 1 + note A_, 1 + note __, 4 + note B_, 1 + note A_, 1 + note F#, 1 + note B_, 1 + note __, 4 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note F#, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 5 + intensity 21 + octave 4 + note F#, 4 + note G_, 4 + note E_, 4 + note F#, 4 + note G_, 4 + note E_, 4 + note D_, 4 + note C#, 16 + note __, 16 + note __, 4 + note F#, 4 + note G_, 4 + note E_, 4 + note F#, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note F#, 16 + octave 5 + note C#, 16 + note __, 4 + intensity 16 + octave 4 + note E_, 12 + note __, 4 + note G#, 12 + note A#, 16 + note A#, 16 + note __, 4 + note G#, 12 + octave 5 + note E_, 8 + octave 4 + note B_, 8 + octave 5 + note F#, 16 + note F#, 16 + note __, 16 + note __, 12 + intensity 20 + octave 4 + note F#, 1 + note A#, 1 + octave 5 + note C#, 1 + note F_, 1 + note F#, 16 + note C#, 16 + note E_, 16 + note G#, 8 + note __, 2 + note E_, 6 + loopchannel 0, Music_KantoGymLeaderRemix_Loop3 diff --git a/crysaudio/music/custom/naljogymbattle.asm b/crysaudio/music/custom/naljogymbattle.asm new file mode 100644 index 00000000..5984742f --- /dev/null +++ b/crysaudio/music/custom/naljogymbattle.asm @@ -0,0 +1,1073 @@ +;Composed by GRonnoc for Koolboyman's Pokemon Prism +;revised by FroggestSpirit +Music_NaljoGymBattle: + dbw $80, Music_NaljoGymBattle_Ch1 + dbw $01, Music_NaljoGymBattle_Ch2 + dbw $02, Music_NaljoGymBattle_Ch3 + +Music_NaljoGymBattle_Ch1: + ftempo 101 + volume $77 + notetype $c, $b2 + dutycycle $3 + tone $0002 + vibrato $12, $15 + octave 2 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + intensity $b4 + note A_, 6 + intensity $b2 + note A_, 6 + intensity $b4 + note A_, 6 + intensity $b2 + note A_, 6 + intensity $b4 + note G_, 4 + note A#, 4 + note A_, 6 + intensity $b2 + note A_, 6 + intensity $b4 + note A_, 6 + intensity $b2 + note A_, 6 + intensity $b4 + note G_, 4 + intensity $b2 + note A#, 2 + octave 4 + note A_, 1 + octave 5 + note C_, 1 + intensity $b4 + note D_, 6 + intensity $b2 + note D_, 6 + intensity $b4 + note D_, 6 + intensity $b2 + note D_, 6 + intensity $b4 + note C_, 4 + note D#, 4 + note D_, 6 + intensity $b2 + note D_, 6 + intensity $b4 + note D_, 6 + intensity $b2 + note D_, 6 + intensity $b4 + note D#, 4 + note F_, 4 +Music_NaljoGymBattle_Loop1: + intensity $b2 + octave 3 + note F_, 2 + note D_, 2 + note F_, 2 + note A_, 4 + note F_, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note A_, 2 + octave 5 + note D_, 6 + octave 3 + note D_, 6 + note D_, 6 + note D_, 6 + note C_, 4 + note D#, 4 + note F_, 2 + note D_, 2 + note F_, 2 + note A_, 4 + note D#, 2 + note C_, 2 + note D#, 2 + octave 4 + note D_, 4 + octave 3 + note A_, 2 + octave 4 + note D_, 4 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note D#, 2 + intensity $b7 + note F_, 16 + note __, 12 + intensity $b4 + note C_, 4 + octave 3 + note A#, 6 + note F_, 6 + note D_, 2 + note E_, 2 + note F_, 6 + note A#, 6 + note A#, 2 + octave 4 + note D_, 2 + note F_, 8 + note C_, 8 + note F_, 6 + note C_, 6 + note F_, 4 + intensity $b7 + octave 3 + note A#, 16 + note F_, 16 + octave 4 + note C_, 16 + octave 3 + note E_, 15 + octave 5 + note C_, 1 + note D_, 6 + intensity $b2 + octave 3 + note D_, 6 + intensity $b4 + note D_, 6 + intensity $b2 + note D_, 6 + intensity $b4 + note C_, 4 + note D#, 4 + octave 4 + note D_, 6 + intensity $b2 + octave 3 + note A_, 6 + intensity $b4 + note A_, 6 + intensity $b2 + note A_, 6 + note G_, 2 + note F_, 2 + note E_, 2 + note C_, 2 + intensity $b7 + note D_, 16 + note C_, 16 + octave 2 + note F_, 16 + note E_, 16 + note F_, 16 + note __, 16 + note F_, 16 + note E_, 14 + intensity $b2 + dutycycle $2 + octave 3 + note A_, 1 + octave 4 + note C_, 1 + note D_, 2 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 4 + note E_, 2 + note F_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 4 + note A#, 2 + note A_, 2 + note A#, 2 + intensity $b7 + octave 5 + note C_, 16 + note __, 16 + intensity $b4 + octave 3 + note A_, 8 + note G_, 8 + note F_, 8 + note E_, 8 + note C_, 8 + note D_, 8 + note E_, 8 + note G_, 8 + note A_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 4 + note F_, 2 + note G_, 2 + note A_, 4 + note F_, 4 + note D_, 4 + note A_, 4 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + note G_, 2 + note A_, 2 + note A#, 4 + note F_, 4 + note D_, 4 + note A#, 4 + note A_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 4 + note A_, 4 + octave 4 + note D_, 4 + note E_, 4 + intensity $b7 + note F_, 16 + note E_, 12 + intensity $b2 + dutycycle $3 + note F_, 2 + note E_, 2 + loopchannel 0, Music_NaljoGymBattle_Loop1 +Music_NaljoGymBattle_Ch2: + notetype $c, $c2 + dutycycle $3 + vibrato $8, $36 + tone $0001 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + note D_, 6 + note D_, 6 + note D_, 6 + note D_, 6 + note C_, 4 + note D#, 4 + note D_, 6 + note D_, 6 + note D_, 6 + note D_, 6 + note D#, 4 + note C_, 4 + note A_, 6 + note A_, 6 + note A_, 6 + note A_, 6 + note G_, 4 + note A#, 4 + note A_, 6 + note A_, 6 + note A_, 6 + note A_, 6 + note G_, 4 + note A#, 2 + octave 3 + note A_, 1 + octave 4 + note C_, 1 +Music_NaljoGymBattle_Loop2: + intensity $c7 + note D_, 6 + note D#, 6 + note F_, 4 + note G_, 6 + note A_, 6 + note D#, 4 + note D_, 16 + note __, 14 + octave 3 + note A_, 1 + octave 4 + note C_, 1 + note D_, 6 + note D#, 6 + note F_, 4 + note G_, 6 + note A_, 6 + note A#, 4 + note A_, 16 + note __, 12 + note F_, 2 + note E_, 2 + note D_, 6 + octave 3 + note A#, 6 + note F_, 4 + note A#, 6 + octave 4 + note D_, 6 + note F_, 2 + note G_, 2 + note A_, 4 + note G_, 4 + note F_, 4 + note G_, 4 + note A_, 6 + note G_, 6 + note F_, 4 + note D_, 16 + note __, 14 + note E_, 1 + note F_, 1 + note E_, 16 + note __, 12 + note F_, 2 + note E_, 2 + intensity $c3 + note D_, 6 + octave 3 + note A_, 6 + note A_, 6 + note A_, 6 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 + octave 5 + note D_, 6 + octave 3 + note D_, 6 + note D_, 6 + note D_, 6 + note D#, 4 + note C_, 4 + intensity $c7 + octave 2 + note A_, 16 + note G_, 16 + note A#, 16 + note A_, 12 + note F_, 2 + note G_, 2 + note A_, 16 + note __, 16 + note A_, 16 + note __, 16 + octave 3 + note A_, 8 + note G_, 8 + note F_, 8 + note E_, 8 + note C_, 16 + note __, 4 + intensity $c3 + note D_, 4 + note E_, 4 + note G_, 4 + note A_, 2 + note F_, 2 + note D_, 2 + note A_, 4 + note F_, 2 + note D_, 2 + note A_, 2 + note A#, 2 + note F_, 2 + note D_, 2 + note A#, 4 + note F_, 2 + note D_, 2 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note E_, 2 + octave 4 + note C_, 4 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note D_, 2 + intensity $c7 + note E_, 16 + note D_, 16 + note D_, 12 + note D_, 2 + note E_, 2 + note F_, 16 + note F_, 12 + note F_, 2 + note G_, 2 + note A_, 16 + note A_, 12 + note A_, 2 + note A#, 2 + note A_, 16 + note G_, 16 + loopchannel 0, Music_NaljoGymBattle_Loop2 +Music_NaljoGymBattle_Ch3: + notetype $4, $19 + octave 3 + note D_, 11 + note __, 1 + note D_, 3 + note __, 1 + note D_, 3 + note __, 1 + note D_, 3 + note __, 1 + note D_, 11 + note __, 1 + note D_, 3 + note __, 1 + note D_, 3 + note __, 1 + note D_, 3 + note __, 1 + notetype $c, $19 + note D_, 8 + note D#, 8 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note F_, 2 +Music_NaljoGymBattle_Loop3: + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note A_, 2 + note D_, 2 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note C_, 2 + note G_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note G_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + octave 1 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 3 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note A_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + note A#, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + loopchannel 0, Music_NaljoGymBattle_Loop3 diff --git a/crysaudio/music/custom/naljowildbattle.asm b/crysaudio/music/custom/naljowildbattle.asm new file mode 100644 index 00000000..32a04f25 --- /dev/null +++ b/crysaudio/music/custom/naljowildbattle.asm @@ -0,0 +1,810 @@ +;Composed by LevusBevus for Koolboyman's Pokemon Prism +;revised by FroggestSpirit +Music_NaljoWildBattle: + dbw $80, Music_NaljoWildBattle_Ch1 + dbw $01, Music_NaljoWildBattle_Ch2 + dbw $02, Music_NaljoWildBattle_Ch3 + + +Music_NaljoWildBattle_Ch1: + ftempo 104 + volume $77 + stereopanning $f + dutycycle $3 + tone $0002 + vibrato $12, $15 + notetype $c, $b2 + octave 4 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + octave 2 + intensity $b4 + note A_, 2 + note __, 2 + note D_, 2 + note F_, 2 + note __, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note __, 2 + note A#, 6 + note A#, 2 + note A#, 4 + note A#, 4 + octave 2 + note A_, 2 + note __, 2 + note D_, 2 + note F_, 2 + note __, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note __, 2 + note A_, 6 + note A_, 2 + note A_, 4 + note A_, 4 + octave 2 + note A_, 2 + note __, 2 + note D_, 2 + note F_, 2 + note __, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note __, 2 + note A#, 6 + note A#, 2 + note A#, 4 + note A#, 4 + octave 2 + note A_, 2 + note __, 2 + note D_, 2 + note F_, 2 + note __, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note __, 2 + intensity $b7 + note F_, 8 + note A_, 8 + +Music_NaljoWildBattle_branch_19f26b: + note D_, 6 + note G_, 6 + note D_, 4 + note A_, 6 + note G_, 6 + note D_, 4 + note C_, 6 + note G_, 6 + note C_, 4 + note A_, 6 + note G_, 6 + note C_, 4 + note D_, 6 + note G_, 6 + note D_, 4 + note A_, 6 + note G_, 6 + note D_, 4 + octave 1 + note A_, 6 + octave 2 + note C#, 6 + octave 1 + note A_, 4 + octave 2 + note E_, 6 + note C#, 6 + octave 1 + note A_, 4 + octave 2 + note D_, 6 + note G_, 6 + note D_, 4 + note A_, 6 + note G_, 6 + note D_, 4 + note C_, 6 + note G_, 6 + note C_, 4 + note A_, 6 + note G_, 6 + note C_, 4 + note D_, 6 + note G_, 6 + note D_, 4 + note A_, 6 + note G_, 6 + note D_, 4 + note D_, 6 + note G_, 6 + note D_, 4 + note A#, 6 + note G_, 6 + note D_, 4 + intensity $a2 + dutycycle 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note G_, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note G_, 2 + octave 3 + note G_, 2 + octave 4 + note G_, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note G_, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note G_, 2 + octave 3 + note G_, 2 + octave 4 + note G_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + octave 4 + note F_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + octave 4 + note D_, 2 + intensity $b7 + dutycycle 3 + octave 2 + loopchannel 0, Music_NaljoWildBattle_branch_19f26b + +Music_NaljoWildBattle_Ch2: + dutycycle $3 + tone $0001 + vibrato $8, $36 + notetype $c, $c2 + +Music_NaljoWildBattle_branch_19f11b: + octave 3 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + loopchannel 8, Music_NaljoWildBattle_branch_19f11b + octave 3 + intensity $c4 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + note D#, 6 + note D#, 2 + note D#, 4 + note D#, 4 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + note E_, 6 + note E_, 2 + note E_, 4 + note E_, 4 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + note D#, 6 + note D#, 2 + note D#, 4 + note D#, 4 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note __, 2 + intensity $c7 + note F_, 8 + note D#, 8 + +Music_NaljoWildBattle_branch_19f167: + note D_, 6 + note A_, 4 + note G_, 1 + note A_, 1 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + note A_, 16 + note F_, 16 + note D_, 6 + note A_, 4 + note G_, 1 + note A_, 1 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + octave 4 + note C_, 4 + note C#, 4 + octave 3 + note A_, 16 + note E_, 16 + note D_, 6 + note A_, 4 + note G_, 1 + note A_, 1 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + note A_, 16 + note F_, 16 + note D_, 6 + note A_, 4 + note G_, 1 + note A_, 1 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 4 + octave 4 + note C_, 4 + note C#, 4 + note D_, 16 + octave 3 + note D_, 16 + octave 4 + intensity $c2 + note D_, 2 + note D_, 2 + octave 3 + intensity $c7 + note A_, 8 + note __, 2 + intensity $c2 + note D#, 2 + note D_, 2 + note D_, 2 + octave 2 + intensity $c7 + note A_, 12 + octave 3 + note D_, 8 + intensity $c2 + note C_, 4 + octave 2 + note A#, 2 + note A#, 1 + note A_, 1 + intensity $c7 + note A#, 16 + octave 4 + intensity $c2 + note D_, 2 + note D_, 2 + octave 3 + intensity $c7 + note A_, 8 + note __, 2 + intensity $c2 + note D#, 2 + note D_, 2 + note D_, 2 + octave 2 + intensity $c7 + note A_, 12 + octave 3 + note C_, 8 + octave 2 + intensity $c2 + note F_, 3 + note G_, 3 + note A_, 2 + intensity $c7 + note G_, 8 + octave 3 + intensity $c2 + note C#, 1 + note D_, 1 + note D#, 1 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + octave 4 + note C#, 1 + note D_, 2 + octave 3 + note D_, 2 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + intensity $c7 + note F_, 8 + note D#, 8 + loopchannel 0, Music_NaljoWildBattle_branch_19f167 + + +Music_NaljoWildBattle_Ch3: + notetype $c, $14 + octave 4 + note D_, 2 + note D_, 1 + note D_, 1 + note D#, 2 + note D#, 1 + note D_, 1 + note E_, 2 + note E_, 1 + note D#, 1 + note F_, 2 + note F_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note F_, 1 + note G_, 2 + note G_, 1 + note F#, 1 + note G#, 2 + note G#, 1 + note G_, 1 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + note F#, 2 + note D#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note D_, 2 + octave 3 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + note F#, 2 + note D#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note D_, 2 + note D_, 16 + +Music_NaljoWildBattle_branch_19f3ba: + octave 3 + note A_, 2 + octave 4 + note D_, 2 + loopchannel 8, Music_NaljoWildBattle_branch_19f3ba + +Music_NaljoWildBattle_branch_19f3c2: + note C_, 2 + note F_, 2 + loopchannel 8, Music_NaljoWildBattle_branch_19f3c2 + +Music_NaljoWildBattle_branch_19f3c8: + octave 3 + note A_, 2 + octave 4 + note D_, 2 + loopchannel 8, Music_NaljoWildBattle_branch_19f3c8 + octave 3 + +Music_NaljoWildBattle_branch_19f3d1: + note E_, 2 + note A_, 2 + loopchannel 8, Music_NaljoWildBattle_branch_19f3d1 + +Music_NaljoWildBattle_branch_19f3d7: + octave 3 + note A_, 2 + octave 3 + note D_, 2 + loopchannel 8, Music_NaljoWildBattle_branch_19f3d7 + +Music_NaljoWildBattle_branch_19f3df: + note C_, 2 + note F_, 2 + loopchannel 8, Music_NaljoWildBattle_branch_19f3df + +Music_NaljoWildBattle_branch_19f3e5: + octave 3 + note A_, 2 + octave 4 + note D_, 2 + loopchannel 8, Music_NaljoWildBattle_branch_19f3e5 + +Music_NaljoWildBattle_branch_19f3ed: + note D_, 2 + note G_, 2 + loopchannel 8, Music_NaljoWildBattle_branch_19f3ed + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A#, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A#, 2 + octave 5 + note D_, 2 + octave 4 + note A#, 2 + note G_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note D_, 2 + octave 3 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note D_, 4 + note D_, 6 + octave 3 + note A_, 2 + note A#, 2 + octave 4 + note C#, 2 + note D_, 16 + loopchannel 0, Music_NaljoWildBattle_branch_19f3ba + diff --git a/crysaudio/music/custom/nuggetbridge.asm b/crysaudio/music/custom/nuggetbridge.asm new file mode 100644 index 00000000..5a43ddd4 --- /dev/null +++ b/crysaudio/music/custom/nuggetbridge.asm @@ -0,0 +1,663 @@ +Music_NuggetBridge: + dbw $c0, Music_NuggetBridge_Ch1 + dbw $01, Music_NuggetBridge_Ch2 + dbw $02, Music_NuggetBridge_Ch3 + dbw $03, Music_NuggetBridge_Ch4 + +Music_NuggetBridge_Ch1: + tempo $A8 + volume $77 + dutycycle 1 + notetype $C, $B5 +;Channel1_Bar1: + octave 2 + note G#, 6 + note G#, 1 + note B_, 1 + note A_, 4 + note F#, 2 + octave 3 + note C#, 2 +;Channel1_Bar2: +Music_NuggetBridge_Loop1: + octave 2 + note B_, 3 + note G#, 1 + note A_, 6 + dutycycle 2 + note A_, 1 + note G#, 1 + note F#, 4 +;Channel1_Bar3: + dutycycle 1 + note G#, 6 + note G#, 1 + note B_, 1 + note A_, 4 + note F#, 2 + octave 3 + note C#, 2 +;Channel1_Bar4: + octave 2 + note B_, 3 + note G#, 1 + octave 3 + note E_, 6 + dutycycle 2 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D_, 4 +;Channel1_Bar5: + note A_, 2 + note E_, 2 + octave 2 + note A_, 4 + octave 3 + note G#, 2 + note E_, 2 + octave 2 + note G#, 4 +;Channel1_Bar6: + octave 3 + note F#, 2 + note C#, 2 + octave 2 + note F#, 4 + octave 3 + note E_, 2 + note C#, 2 + note D#, 2 + note C#, 2 +;Channel1_Bar7: + octave 2 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 6 + note F#, 2 + octave 3 + note D_, 4 +;Channel1_Bar8: + note E_, 3 + octave 2 + note A_, 1 + note G#, 6 + note E_, 2 + note A_, 2 + note G#, 2 +;Channel1_Bar9: + intensity $B2 + note B_, 2 + note B_, 1 + octave 3 + note C#, 1 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note D_, 2 + note A_, 4 +;Channel1_Bar10: + note G#, 3 + note F#, 1 + note E_, 6 + intensity $B1 + octave 2 + note E_, 1 + note F#, 1 + note G#, 2 + note F#, 1 + note E_, 1 +;Channel1_Bar11: + intensity $B2 + note B_, 2 + note B_, 1 + octave 3 + note C#, 1 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note D_, 2 + note A_, 4 +;Channel1_Bar12: + note G#, 3 + note F#, 1 + note E_, 6 + intensity $B1 + octave 2 + note G#, 1 + note A_, 1 + note B_, 2 + note A_, 1 + note G#, 1 +;Channel1_Bar13: + intensity $B2 + note B_, 2 + note B_, 1 + octave 3 + note C#, 1 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 4 +;Channel1_Bar14: + octave 2 + note B_, 2 + note B_, 1 + octave 3 + note C#, 1 + note D#, 2 + note D#, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + intensity $B5 + note A_, 4 +;Channel1_Bar15: + dutycycle 1 + note G#, 6 + octave 2 + note G#, 1 + note B_, 1 + note A_, 4 + note F#, 2 + octave 3 + note C#, 2 +;Channel1_Bar16: + loopchannel 0, Music_NuggetBridge_Loop1 + +Music_NuggetBridge_Ch2: + dutycycle 1 + notetype $C, $C5 +;Channel2_Bar1: + octave 3 + note E_, 6 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note F#, 6 + note A_, 2 +;Channel2_Bar2: +Music_NuggetBridge_Loop2: + note G#, 3 + note E_, 1 + note F#, 12 +;Channel2_Bar3: + note E_, 6 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note F#, 6 + note A_, 2 +;Channel2_Bar4: + note G#, 3 + note E_, 1 + note B_, 12 +;Channel2_Bar5: + dutycycle 0 + octave 4 + note C#, 6 + octave 3 + note B_, 1 + note A_, 1 + note B_, 6 + note A_, 1 + note G#, 1 +;Channel2_Bar6: + note A_, 6 + note G#, 1 + note F#, 1 + note G#, 4 + dutycycle 2 + note F#, 2 + note E_, 2 +;Channel2_Bar7: + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 8 + note A_, 4 +;Channel2_Bar8: + note G#, 3 + note F#, 1 + note E_, 8 + dutycycle 1 + note F#, 2 + note E_, 2 +;Channel2_Bar9: + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 4 + octave 4 + note C#, 4 +;Channel2_Bar10: + octave 3 + note B_, 3 + note A_, 1 + note G#, 12 +;Channel2_Bar11: + dutycycle 0 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 4 + octave 4 + note C#, 4 +;Channel2_Bar12: + octave 3 + note B_, 3 + note A_, 1 + note G#, 12 +;Channel2_Bar13: + dutycycle 2 + note D_, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 2 + note A_, 1 + note B_, 1 + octave 4 + note C#, 4 +;Channel2_Bar14: + octave 3 + note D#, 2 + note D#, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G#, 1 + note A_, 2 + note B_, 1 + octave 4 + note C#, 1 + notetype 6, $C5 + note D#, 4 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D#, 1 +;Channel2_Bar15: + notetype $C, $C5 + dutycycle 1 + note E_, 6 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note F#, 6 + note A_, 2 +;Channel2_Bar16: + loopchannel 0, Music_NuggetBridge_Loop2 + +Music_NuggetBridge_Ch3: + notetype $C, $15 +;Channel3_Bar1: + octave 2 + note E_, 4 + note __, 8 + note D_, 4 +;Channel3_Bar2: +Music_NuggetBridge_Loop3: + note E_, 1 + note __, 11 + octave 1 + note B_, 4 +;Channel3_Bar3: + octave 2 + note E_, 4 + note __, 8 + note D_, 4 +;Channel3_Bar4: + note E_, 1 + note __, 11 + note G#, 4 +;Channel3_Bar5: + notetype 4, $24 + octave 3 + note A_, 2 + octave 5 + note C#, 2 + note E_, 2 + note A_, 2 + octave 6 + note C#, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C#, 2 + octave 5 + note A_, 2 + note E_, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note B_, 2 + octave 5 + note E_, 2 + note G#, 2 + note B_, 2 + octave 6 + note E_, 2 + note G#, 2 + note E_, 2 + octave 5 + note B_, 2 + note G#, 2 + note E_, 2 + octave 4 + note B_, 2 +;Channel3_Bar6: + octave 3 + note F#, 2 + octave 4 + note A_, 2 + octave 5 + note C#, 2 + note F#, 2 + note A_, 2 + octave 6 + note C#, 2 + note F#, 2 + note C#, 2 + octave 5 + note A_, 2 + note F#, 2 + note C#, 2 + octave 4 + note A_, 2 + octave 3 + note C#, 2 + octave 4 + note E_, 2 + note G#, 2 + octave 5 + note C#, 2 + note E_, 2 + note G#, 2 + octave 6 + note C#, 3 + note __, 9 + notetype $C, $15 + callchannel Music_NuggetBridge_Bar7 + callchannel Music_NuggetBridge_Bar7 + callchannel Music_NuggetBridge_Bar7 + callchannel Music_NuggetBridge_Bar7 + callchannel Music_NuggetBridge_Bar8 + callchannel Music_NuggetBridge_Bar8 + callchannel Music_NuggetBridge_Bar8 + callchannel Music_NuggetBridge_Bar8 + callchannel Music_NuggetBridge_Bar9 + callchannel Music_NuggetBridge_Bar9 + callchannel Music_NuggetBridge_Bar9 + callchannel Music_NuggetBridge_Bar9 + callchannel Music_NuggetBridge_Bar10 + callchannel Music_NuggetBridge_Bar10 + callchannel Music_NuggetBridge_Bar10 + callchannel Music_NuggetBridge_Bar10 + callchannel Music_NuggetBridge_Bar11 + callchannel Music_NuggetBridge_Bar11 + callchannel Music_NuggetBridge_Bar11 + callchannel Music_NuggetBridge_Bar11 + callchannel Music_NuggetBridge_Bar12 + callchannel Music_NuggetBridge_Bar12 + callchannel Music_NuggetBridge_Bar12 + callchannel Music_NuggetBridge_Bar12 +;Channel3_Bar13: + notetype 6, $15 + octave 1 + note B_, 2 + note __, 16 + note __, 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 6 + note __, 2 +;Channel3_Bar14: + note B_, 2 + note __, 16 + note __, 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 6 + note __, 2 +;Channel3_Bar15: + notetype $C, $15 + octave 2 + note E_, 4 + note __, 8 + note D_, 4 +;Channel3_Bar16: + loopchannel 0, Music_NuggetBridge_Loop3 + +Music_NuggetBridge_Bar7: + octave 2 + note D_, 1 + note __, 1 + intensity $24 + octave 5 + note A_, 1 + octave 4 + note D_, 1 + intensity $15 + endchannel +Music_NuggetBridge_Bar8: + octave 2 + note E_, 1 + note __, 1 + intensity $24 + octave 5 + note B_, 1 + octave 4 + note E_, 1 + intensity $15 + endchannel +Music_NuggetBridge_Bar9: + octave 1 + note B_, 1 + note __, 1 + intensity $24 + octave 6 + note D_, 1 + octave 4 + note F#, 1 + intensity $15 + endchannel +Music_NuggetBridge_Bar10: + octave 2 + note E_, 1 + note __, 1 + intensity $24 + octave 6 + note E_, 1 + octave 4 + note B_, 1 + intensity $15 + endchannel +Music_NuggetBridge_Bar11: + octave 1 + note B_, 1 + intensity $24 + octave 4 + note A_, 1 + octave 6 + note F#, 1 + octave 5 + note D_, 1 + intensity $15 + endchannel +Music_NuggetBridge_Bar12: + octave 2 + note E_, 1 + intensity $24 + octave 4 + note B_, 1 + octave 6 + note G#, 1 + octave 5 + note E_, 1 + intensity $15 + endchannel + +Music_NuggetBridge_Ch4: + notetype 4 + togglenoise 0 +;Channel4_Bar1: + note A_, 16 + note __, 2 + note D_, 3 + note D_, 3 + note D_, 12 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar2: +Music_NuggetBridge_Loop4: + note D_, 16 + note __, 2 + note D_, 3 + note D_, 3 + note D_, 12 + note D_, 3 + note D_, 3 + note D_, 3 + note D_, 3 +;Channel4_Bar3: + note D_, 16 + note __, 2 + note D_, 3 + note D_, 3 + note D_, 12 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar4: + note D_, 16 + note __, 2 + note D_, 3 + note D_, 3 + note D_, 12 + note D_, 3 + note D_, 3 + note D_, 3 + note D_, 3 +;Channel4_Bar5: + note A_, 16 + note __, 16 + note __, 16 +;Channel4_Bar6: + note __, 16 + note __, 16 + note __, 16 +;Channel4_Bar7: + note D_, 12 + note D_, 12 + note D_, 12 + note D_, 6 + note D_, 3 + note D_, 3 +;Channel4_Bar8: + note D_, 12 + note D_, 12 + note D_, 12 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar9: + note D_, 12 + note D_, 12 + note D_, 12 + note D_, 6 + note D_, 3 + note D_, 3 +;Channel4_Bar10: + note D_, 12 + note D_, 12 + note D_, 12 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar11: + note D_, 12 + note D_, 12 + note D_, 12 + note D_, 6 + note D_, 3 + note D_, 3 +;Channel4_Bar12: + note D_, 12 + note D_, 12 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 3 + note D_, 3 + note D_, 3 + note D_, 3 +;Channel4_Bar13: + note D_, 16 + note __, 14 + note D_, 3 + note D_, 3 + note A_, 6 + note D_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar14: + note D_, 16 + note __, 14 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 3 + note D_, 3 + note D_, 3 + note D_, 3 +;Channel4_Bar15: + note A_, 16 + note __, 2 + note D_, 3 + note D_, 3 + note D_, 12 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar16: + loopchannel 0, Music_NuggetBridge_Loop4 diff --git a/crysaudio/music/custom/palletbattle.asm b/crysaudio/music/custom/palletbattle.asm new file mode 100644 index 00000000..c915e58e --- /dev/null +++ b/crysaudio/music/custom/palletbattle.asm @@ -0,0 +1,670 @@ +;Composed by Cat333Pokemon for Koolboyman's Pokemon Prism +;revised by FroggestSpirit +Music_PalletBattle: ; 1ec454 + dbw $80, Music_PalletBattle_Ch1 + dbw $01, Music_PalletBattle_Ch2 + dbw $02, Music_PalletBattle_Ch3 +; 1ec45d + + +Music_PalletBattle_Ch1: ; 1edb00 + ftempo 96 + volume $77 + stereopanning $f0 + dutycycle $3 + tone $0002 + vibrato $10, $12 + notetype $c, $b2 + octave 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 2 + note C_, 1 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C_, 1 + +Music_PalletBattle_branch_1edc47: ; 1edc47 + note E_, 4 + octave 2 + note G_, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note E_, 2 + note B_, 2 + note G_, 4 + octave 3 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note F_, 2 + note G_, 2 + note D_, 4 + octave 1 + note B_, 4 + octave 2 + note G_, 4 + note D_, 4 + octave 1 + note G_, 4 + note D_, 4 + note B_, 4 + note G_, 4 + octave 2 + note G_, 4 + octave 3 + note E_, 2 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note B_, 4 + octave 3 + note C_, 2 + note D_, 2 + note E_, 2 + note G_, 2 + note G_, 2 + note F_, 2 + note D_, 4 + octave 2 + note B_, 4 + octave 3 + note G_, 4 + note D_, 4 + octave 2 + note B_, 4 + note G_, 4 + octave 3 + note D_, 4 + octave 2 + note G_, 2 + note G_, 2 + octave 3 + note C_, 4 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + note G_, 2 + octave 3 + note D_, 2 + note C_, 2 + octave 2 + note B_, 4 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note G_, 2 + note B_, 2 + octave 3 + note C_, 2 + note D_, 2 + note D_, 4 + octave 2 + note B_, 4 + octave 3 + note G_, 4 + note D_, 4 + octave 2 + note B_, 4 + note G_, 4 + octave 3 + note D_, 4 + octave 2 + note B_, 4 + octave 3 + note G_, 4 + note G_, 2 + note F_, 2 + note E_, 2 + octave 2 + note G_, 2 + note G_, 2 + note B_, 2 + octave 3 + note C_, 4 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note G_, 2 + octave 2 + note G_, 4 + note E_, 4 + note C_, 4 + octave 1 + note G_, 4 + octave 2 + note C_, 4 + octave 1 + note G_, 4 + note E_, 4 + note C_, 4 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + octave 3 + note G#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + octave 3 + note D#, 2 + note D#, 2 + octave 2 + note G#, 2 + octave 3 + note D#, 2 + note D#, 2 + octave 2 + note G#, 2 + octave 3 + note D#, 2 + octave 2 + note G#, 2 + octave 3 + note D#, 2 + note D#, 2 + octave 2 + note G#, 2 + octave 3 + note D#, 2 + note D#, 2 + octave 2 + note G#, 2 + octave 3 + note D#, 2 + octave 2 + note G#, 2 + octave 3 + note F_, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F#, 2 + note F#, 2 + note C_, 2 + note F#, 2 + note F#, 2 + note C_, 2 + note F#, 2 + note C_, 2 + note G#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note D#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + intensity $b8 + note G_, 16 + note G_, 16 + note D_, 16 + note D_, 16 + note G_, 16 + note G_, 16 + note D_, 16 + note D_, 16 + intensity $b2 + octave 3 + loopchannel 0, Music_PalletBattle_branch_1edc47 + +Music_PalletBattle_Ch2: ; 1edc10 + dutycycle $3 + tone $0001 + vibrato $8, $36 + notetype $c, $c2 + octave 5 + note C#, 1 + note C_, 1 + octave 4 + note A#, 1 + note A_, 1 + note A#, 1 + note A#, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + +Music_PalletBattle_branch_1edb37: ; 1edb37 + note G_, 4 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + note C_, 4 + note F_, 2 + note E_, 2 + note D_, 2 + note G_, 2 + octave 2 + note A_, 2 + note B_, 2 + intensity $c7 + note G_, 16 + note __, 16 + octave 3 + intensity $c2 + note C_, 4 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note D_, 4 + note E_, 2 + note F_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + intensity $c7 + note G_, 16 + note __, 12 + intensity $c2 + note D_, 2 + note D_, 2 + note E_, 4 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note F_, 2 + note E_, 2 + note D_, 4 + note E_, 2 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + note F_, 2 + intensity $c7 + note G_, 16 + note __, 16 + octave 4 + intensity $c2 + note C_, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note D_, 2 + note E_, 4 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + octave 3 + intensity $c7 + note C_, 16 + note __, 16 + +Music_PalletBattle_branch_1edb87: ; 1edb87 + octave 4 + intensity $c2 + note C#, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + loopchannel 2, Music_PalletBattle_branch_1edb87 + +Music_PalletBattle_branch_1edb99: ; 1edb99 + note G#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + loopchannel 2, Music_PalletBattle_branch_1edb99 + +Music_PalletBattle_branch_1edba5: ; 1edba5 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + loopchannel 2, Music_PalletBattle_branch_1edba5 + +Music_PalletBattle_branch_1edbb7: ; 1edbb7 + note G#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + loopchannel 2, Music_PalletBattle_branch_1edbb7 + note A#, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note B_, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + +Music_PalletBattle_branch_1edbef: ; 1edbef + octave 3 + intensity $c8 + note C_, 16 + note C_, 16 + octave 2 + note G_, 16 + note G_, 16 + loopchannel 2, Music_PalletBattle_branch_1edbef + intensity $c2 + octave 3 + loopchannel 0, Music_PalletBattle_branch_1edb37 + +Music_PalletBattle_Ch3: ; 1ede10 + notetype $c, $19 + note __, 16 + note __, 16 + +Music_PalletBattle_branch_1ede24: ; 1ede24 + octave 3 + +Music_PalletBattle_branch_1ede25: ; 1ede25 + note C_, 2 + note G_, 2 + loopchannel 8, Music_PalletBattle_branch_1ede25 + +Music_PalletBattle_branch_1ede2b: ; 1ede2b + octave 2 + note G_, 2 + octave 3 + note D_, 2 + loopchannel 8, Music_PalletBattle_branch_1ede2b + octave 3 + +Music_PalletBattle_branch_1ede34: ; 1ede34 + note C_, 2 + note G_, 2 + loopchannel 8, Music_PalletBattle_branch_1ede34 + +Music_PalletBattle_branch_1ede3a: ; 1ede3a + octave 2 + note G_, 2 + octave 3 + note D_, 2 + loopchannel 8, Music_PalletBattle_branch_1ede3a + octave 3 + +Music_PalletBattle_branch_1ede43: ; 1ede43 + note C_, 2 + note G_, 2 + loopchannel 8, Music_PalletBattle_branch_1ede43 + +Music_PalletBattle_branch_1ede49: ; 1ede49 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + loopchannel 8, Music_PalletBattle_branch_1ede49 + octave 3 + +Music_PalletBattle_branch_1ede52: ; 1ede52 + note C_, 2 + note G_, 2 + loopchannel 16, Music_PalletBattle_branch_1ede52 + octave 3 + +Music_PalletBattle_branch_1ede59: ; 1ede59 + note C#, 2 + note G#, 2 + loopchannel 8, Music_PalletBattle_branch_1ede59 + +Music_PalletBattle_branch_1ede5f: ; 1ede5f + octave 2 + note G#, 2 + octave 3 + note D#, 2 + loopchannel 8, Music_PalletBattle_branch_1ede5f + octave 3 + +Music_PalletBattle_branch_1ede68: ; 1ede68 + note C#, 2 + note G#, 2 + loopchannel 8, Music_PalletBattle_branch_1ede68 + +Music_PalletBattle_branch_1ede6e: ; 1ede6e + octave 2 + note G#, 2 + octave 3 + note D#, 2 + loopchannel 8, Music_PalletBattle_branch_1ede6e + +Music_PalletBattle_branch_1ede76: ; 1ede76 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + loopchannel 4, Music_PalletBattle_branch_1ede76 + +Music_PalletBattle_branch_1ede7e: ; 1ede7e + octave 2 + note B_, 2 + octave 3 + note F#, 2 + loopchannel 4, Music_PalletBattle_branch_1ede7e + +Music_PalletBattle_branch_1ede86: ; 1ede86 + octave 3 + note C#, 2 + note G#, 2 + loopchannel 4, Music_PalletBattle_branch_1ede86 + +Music_PalletBattle_branch_1ede8d: ; 1ede8d + note D#, 2 + note A#, 2 + loopchannel 4, Music_PalletBattle_branch_1ede8d + octave 3 + +Music_PalletBattle_branch_1ede94: ; 1ede94 + note C_, 2 + note G_, 2 + loopchannel 8, Music_PalletBattle_branch_1ede94 + +Music_PalletBattle_branch_1ede9a: ; 1ede9a + octave 2 + note G_, 2 + octave 3 + note D_, 2 + loopchannel 8, Music_PalletBattle_branch_1ede9a + octave 3 + +Music_PalletBattle_branch_1edea3: ; 1edea3 + note C_, 2 + note G_, 2 + loopchannel 8, Music_PalletBattle_branch_1edea3 + +Music_PalletBattle_branch_1edea9: ; 1edea9 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + loopchannel 8, Music_PalletBattle_branch_1edea9 + loopchannel 0, Music_PalletBattle_branch_1ede24 +; 1edeb5 diff --git a/crysaudio/music/custom/pokeathelonfinal.asm b/crysaudio/music/custom/pokeathelonfinal.asm new file mode 100644 index 00000000..8ac83311 --- /dev/null +++ b/crysaudio/music/custom/pokeathelonfinal.asm @@ -0,0 +1,2574 @@ +Music_PokeathelonFinal: + dbw $C0, Music_PokeathelonFinal_Ch1 + dbw $01, Music_PokeathelonFinal_Ch2 + dbw $02, Music_PokeathelonFinal_Ch3 + dbw $03, Music_PokeathelonFinal_Ch4 + +Music_PokeathelonFinal_Ch1: + tempo $84 + volume $77 + tone $0002 + notetype $2, $C3 + vibrato 8, $24 + dutycycle 2 + + octave 4 + note D#, 1 + note D_, 1 + note C#, 2 + note C_, 1 + octave 3 + note B_, 1 + + note A_, 1 + note G#, 1 + note G_, 2 + note F#, 1 + note F_, 1 + + note D#, 1 + note D_, 1 + note C#, 2 + note C_, 1 + octave 2 + note B_, 1 + + octave 1 + note D_, 1 + note C#, 1 + note C_, 4 + + note D_, 1 + note C#, 1 + note C_, 4 + + octave 4 + note D#, 1 + note D_, 1 + note C#, 2 + note C_, 1 + octave 3 + note B_, 1 + + note A_, 1 + note G#, 1 + note G_, 2 + note F#, 1 + note F_, 1 + + note D#, 1 + note D_, 1 + note C#, 2 + note C_, 1 + octave 2 + note B_, 1 + + octave 1 + note D_, 1 + note C#, 1 + note C_, 4 + + notetype $C, $C3 + note __, 7 + dutycycle 0 + octave 3 + note F_, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note F_, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 +Music_PokeathelonFinal_Loop1: + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note F_, 2 + octave 3 + note F_, 2 + note G_, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note G_, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note G_, 2 + octave 3 + note G_, 2 + note F#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note F#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note F#, 2 + octave 3 + note F#, 2 + note C#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note F_, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note F_, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note F_, 2 + octave 3 + note G_, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note D#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note D#, 2 + octave 3 + note G_, 2 + note A#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note G_, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note G_, 2 + octave 3 + note G_, 2 + note G#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note G#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note G#, 2 + octave 3 + note G#, 2 + note A#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + octave 2 + intensity $C3 + note A#, 2 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $C3 + octave 3 + note A_, 6 + note C#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + intensity $C3 + octave 3 + note C_, 1 + note C#, 2 + note D#, 1 + intensity $81 + octave 2 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + intensity $C3 + octave 3 + note D_, 1 + note D#, 2 + note C#, 1 + intensity $81 + octave 2 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + intensity $C3 + octave 3 + note C_, 1 + note C#, 2 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $C3 + octave 3 + note C_, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + intensity $C3 + octave 3 + note C_, 1 + note C#, 2 + note D#, 1 + intensity $81 + octave 2 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + intensity $C3 + note F#, 1 + note G_, 2 + intensity $81 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + intensity $C3 + octave 3 + note E_, 1 + note F_, 2 + note F#, 1 + intensity $81 + octave 2 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $91 + octave 4 + note A#, 1 + intensity $81 + octave 2 + note A#, 1 + note A#, 1 + note A#, 1 + intensity $C3 + octave 3 + note C#, 1 + intensity $A2 + octave 5 + note F_, 1 + octave 4 + note A#, 1 + octave 5 + note F_, 1 + octave 2 + note F_, 2 + octave 4 + note A#, 1 + octave 5 + note F_, 1 + octave 3 + note A#, 1 + octave 5 + note F_, 1 + octave 2 + note F_, 1 + intensity $C3 + octave 3 + note C_, 1 + note C#, 2 + intensity $A2 + note D#, 1 + octave 5 + note F_, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 4 + note A#, 1 + octave 5 + note D#, 1 + intensity $C3 + octave 2 + note G_, 2 + intensity $A2 + octave 4 + note A#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 2 + note G_, 1 + intensity $C3 + octave 3 + note D_, 1 + note D#, 2 + intensity $A2 + note C#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 4 + note A#, 1 + octave 5 + note D#, 1 + intensity $C3 + octave 2 + note F#, 2 + intensity $A2 + octave 4 + note A#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 2 + note F#, 1 + intensity $C3 + octave 3 + note C_, 1 + note C#, 2 + intensity $A2 + octave 2 + note A#, 1 + intensity $C7 + dutycycle 1 + octave 4 + notetype $6, $C7 + note A#, 1 + note B_, 1 + notetype $C, $C7 + octave 5 + note C_, 6 + note C_, 1 + note C#, 1 + dutycycle 0 + note __, 2 + intensity $C3 + octave 2 + note F_, 4 + note F_, 2 + intensity $A2 + octave 3 + note C#, 1 + octave 5 + note F_, 1 + octave 4 + note A#, 1 + octave 5 + note F_, 1 + intensity $C3 + octave 2 + note C#, 2 + intensity $A2 + octave 4 + note A#, 1 + octave 5 + note F_, 1 + octave 3 + note A#, 1 + octave 5 + note F_, 1 + octave 2 + note C#, 1 + intensity $C3 + octave 3 + note C_, 1 + note C#, 2 + intensity $A2 + note D#, 1 + octave 5 + note F_, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 4 + note A#, 1 + octave 5 + note D#, 1 + intensity $C3 + octave 2 + note D#, 2 + intensity $A2 + octave 4 + note A#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 2 + note D#, 1 + intensity $C3 + octave 3 + note D_, 1 + note D#, 2 + intensity $A2 + note F#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + octave 4 + note A#, 1 + octave 5 + note D#, 1 + intensity $C3 + octave 2 + note F#, 2 + intensity $A2 + octave 4 + note A#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note D#, 1 + intensity $C3 + octave 2 + note F#, 1 + octave 3 + note E_, 1 + note F_, 2 + intensity $A2 + note F#, 1 + octave 5 + note D#, 1 + octave 3 + note A#, 1 + octave 5 + note F#, 1 + octave 4 + note A#, 1 + octave 5 + note F#, 1 + octave 2 + note F#, 2 + octave 4 + note A#, 1 + octave 5 + note F#, 1 + octave 3 + note A#, 1 + octave 5 + note F_, 1 + intensity $C3 + octave 2 + note F_, 2 + intensity $A2 + octave 3 + note A#, 1 + octave 5 + note F_, 1 + intensity $B0 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 6 + octave 3 + note B_, 6 + octave 4 + note D_, 4 + note C#, 6 + octave 3 + note A_, 6 + note G_, 4 + note F#, 6 + octave 4 + note C#, 6 + note D_, 4 + octave 3 + note E_, 14 + note E_, 1 + note F#, 1 + note G_, 6 + note G_, 6 + note A_, 4 + note F#, 6 + note E_, 6 + note D_, 4 + note E_, 6 + note C_, 6 + note E_, 4 + note F#, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note F#, 4 + intensity $C3 + octave 2 + note G#, 2 + intensity $A1 + note C#, 1 + note C#, 1 + intensity $C3 + dutycycle 1 + note G#, 2 + intensity $A1 + dutycycle 0 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + intensity $C3 + dutycycle 1 + note G#, 2 + intensity $A1 + dutycycle 0 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + intensity $C3 + note B_, 2 + intensity $A1 + octave 1 + note B_, 1 + note B_, 1 + intensity $C3 + dutycycle 1 + octave 2 + note B_, 2 + intensity $A1 + dutycycle 0 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + intensity $C3 + dutycycle 1 + note B_, 2 + intensity $A1 + dutycycle 0 + octave 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + intensity $C3 + octave 2 + note B_, 2 + intensity $A1 + note E_, 1 + note E_, 1 + intensity $C3 + dutycycle 1 + note B_, 2 + intensity $A1 + dutycycle 0 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + intensity $C3 + dutycycle 1 + note B_, 2 + intensity $A1 + dutycycle 0 + octave 1 + note G#, 1 + note G#, 1 + note G#, 1 + note G#, 1 + intensity $C3 + octave 3 + note C#, 2 + intensity $A1 + octave 1 + note A_, 1 + note A_, 1 + intensity $C3 + dutycycle 1 + octave 3 + note C#, 2 + intensity $A1 + dutycycle 0 + octave 1 + note A_, 1 + note A_, 1 + note A_, 1 + note A_, 1 + intensity $C3 + dutycycle 1 + octave 3 + note C#, 2 + intensity $A1 + dutycycle 0 + octave 1 + note A_, 1 + note A_, 1 + note A_, 1 + note A_, 1 + intensity $C3 + octave 2 + note A_, 2 + intensity $A1 + note C#, 1 + note C#, 1 + intensity $C3 + dutycycle 1 + note A_, 2 + intensity $A1 + dutycycle 0 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + intensity $C3 + dutycycle 1 + note A_, 2 + intensity $A1 + dutycycle 0 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + intensity $C3 + note B_, 2 + intensity $A1 + note D#, 1 + note D#, 1 + intensity $C3 + dutycycle 1 + note B_, 2 + intensity $A1 + dutycycle 0 + note D#, 1 + note D#, 1 + note D#, 1 + note D#, 1 + intensity $C3 + dutycycle 1 + note B_, 2 + intensity $A1 + dutycycle 0 + note D#, 1 + note D#, 1 + note D#, 1 + note D#, 1 + intensity $C3 + note G#, 2 + intensity $A1 + note E_, 1 + note E_, 1 + intensity $C3 + dutycycle 1 + note G#, 2 + intensity $A1 + dutycycle 0 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + intensity $C3 + dutycycle 1 + note G#, 2 + intensity $A1 + dutycycle 0 + note E_, 1 + note E_, 1 + note E_, 1 + note E_, 1 + intensity $C3 + dutycycle 1 + note G#, 2 + intensity $A1 + dutycycle 0 + octave 1 + note E_, 1 + note E_, 1 + intensity $C3 + dutycycle 1 + octave 2 + note G#, 2 + intensity $A1 + dutycycle 0 + note E_, 1 + note E_, 1 + intensity $C3 + dutycycle 1 + note F_, 2 + intensity $A1 + dutycycle 0 + octave 1 + note A_, 1 + note A_, 1 + intensity $C3 + dutycycle 1 + octave 2 + note F_, 2 + intensity $A1 + dutycycle 0 + octave 1 + note A_, 1 + note A_, 1 + intensity $C3 + dutycycle 1 + octave 3 + note F_, 2 + dutycycle 0 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + dutycycle 1 + octave 2 + intensity $C3 + note F_, 2 + dutycycle 0 + octave 1 + intensity $81 + note A#, 1 + note A#, 1 + loopchannel 0, Music_PokeathelonFinal_Loop1 +Music_PokeathelonFinal_Ch2: + notetype $C, $E2 + tone $0001 + vibrato 8, $24 + dutycycle 1 + octave 3 + note __, 8 + note F_, 1 + note F#, 1 + note G#, 1 + octave 4 + note C_, 1 + note F_, 1 + note D#, 1 + note C#, 1 + note C_, 1 + intensity $C2 + note C#, 8 +Music_PokeathelonFinal_Loop2: + notetype $4, $C2 + note __, 11 + note C_, 1 + notetype $C, $C2 + note C#, 2 + note D#, 10 + notetype $4, $C2 + note __, 11 + note D_, 1 + notetype $C, $C2 + note D#, 2 + note C#, 10 + notetype $4, $C2 + note __, 11 + note C_, 1 + notetype $C, $C2 + note C#, 2 + octave 3 + note A#, 6 + intensity $B1 + dutycycle 2 + octave 4 + note A#, 1 + note F_, 1 + note A#, 1 + octave 5 + note C#, 1 + note F_, 1 + note D#, 1 + note C#, 1 + note C_, 1 + octave 4 + note A#, 1 + note A_, 1 + note A#, 1 + octave 5 + note C_, 1 + intensity $C2 + dutycycle 1 + octave 4 + note C#, 8 + notetype $4, $C2 + note __, 11 + note C_, 1 + notetype $C, $C2 + note C#, 2 + note D#, 10 + notetype $4, $C2 + note __, 11 + note D_, 1 + notetype $C, $C2 + note D#, 2 + note F_, 10 + notetype $4, $C2 + note __, 11 + note E_, 1 + notetype $C, $C2 + note F_, 2 + note F#, 10 + notetype $4, $C2 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note E_, 1 + note F_, 1 + note G_, 1 + notetype $C, $C2 + note G#, 6 + intensity $C8 + dutycycle 0 + octave 3 + note A#, 10 + note F_, 2 + note A#, 2 + note G#, 4 + note G_, 4 + note D#, 8 + note D#, 1 + note F_, 1 + note F#, 12 + note G#, 2 + note F_, 6 + intensity $B1 + dutycycle 2 + octave 4 + note A#, 1 + note F_, 1 + note A#, 1 + octave 5 + note C#, 1 + note F_, 1 + note D#, 1 + note C#, 1 + note C_, 1 + octave 4 + note A#, 1 + note A_, 1 + note A#, 1 + octave 5 + note C_, 1 + intensity $C8 + dutycycle 0 + octave 3 + note A#, 10 + note D#, 2 + note A#, 2 + note G#, 8 + note G_, 6 + note D#, 2 + note D#, 1 + note F_, 1 + note F#, 12 + note G#, 2 + note A#, 8 + note A_, 1 + note A#, 1 + octave 4 + note C_, 8 + dutycycle 1 + note A#, 10 + note F_, 2 + note A#, 2 + note G#, 4 + note G_, 4 + note D#, 8 + note D#, 1 + note F_, 1 + note F#, 12 + note G#, 2 + note F_, 10 + octave 5 + note D#, 1 + note F_, 1 + note D#, 1 + note C#, 1 + note C_, 1 + octave 4 + note A#, 1 + note G#, 1 + note F_, 1 + note A#, 10 + note D#, 2 + note A#, 2 + note G#, 8 + note G_, 6 + note D#, 1 + note __, 1 + note D#, 1 + note F_, 1 + note F#, 12 + note G#, 2 + note A#, 8 + intensity $C2 + note A_, 1 + note A#, 1 + octave 5 + note C_, 1 + note C_, 1 + octave 4 + note A_, 1 + note F_, 1 + note C_, 1 + note F_, 1 + dutycycle 2 + octave 3 + note G_, 1 + note A_, 1 + note B_, 2 + dutycycle 1 + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + dutycycle 2 + note G_, 2 + dutycycle 1 + note D_, 1 + octave 2 + note B_, 1 + note G_, 1 + note B_, 1 + dutycycle 2 + octave 3 + note B_, 2 + dutycycle 1 + note G_, 1 + note D_, 1 + dutycycle 2 + note A_, 2 + dutycycle 1 + note E_, 1 + note C#, 1 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + dutycycle 2 + note E_, 2 + dutycycle 1 + note C#, 1 + octave 2 + note A_, 1 + note E_, 1 + note A_, 1 + dutycycle 2 + octave 3 + note E_, 2 + dutycycle 1 + note C#, 1 + octave 2 + note A_, 1 + dutycycle 2 + octave 3 + note D_, 2 + dutycycle 1 + octave 2 + note B_, 1 + note F#, 1 + note D_, 1 + note F#, 1 + dutycycle 2 + octave 3 + note A_, 2 + dutycycle 1 + note F#, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + dutycycle 2 + note B_, 2 + dutycycle 1 + note F#, 1 + note D_, 1 + dutycycle 2 + note C#, 2 + dutycycle 1 + octave 2 + note A_, 1 + note F#, 1 + octave 3 + note F#, 1 + note C#, 1 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note A_, 1 + note F#, 1 + note C#, 1 + note F#, 1 + octave 4 + note C#, 1 + octave 3 + note A_, 1 + dutycycle 2 + note C#, 1 + note D_, 1 + note E_, 2 + dutycycle 1 + note E_, 1 + note C_, 1 + octave 2 + note G_, 1 + octave 3 + note C_, 1 + dutycycle 2 + note E_, 2 + dutycycle 1 + note E_, 1 + note C_, 1 + octave 2 + note G_, 1 + octave 3 + note C_, 1 + dutycycle 2 + note F#, 2 + dutycycle 1 + note C_, 1 + octave 2 + note G_, 1 + dutycycle 2 + octave 3 + note D_, 2 + dutycycle 1 + note D_, 1 + octave 2 + note B_, 1 + note F#, 1 + note B_, 1 + dutycycle 2 + octave 3 + note C#, 2 + dutycycle 1 + octave 2 + note B_, 1 + note F#, 1 + note D_, 1 + note F#, 1 + dutycycle 2 + note B_, 2 + dutycycle 1 + note F#, 1 + note D_, 1 + dutycycle 2 + octave 3 + note C_, 2 + dutycycle 1 + note C_, 1 + octave 2 + note A_, 1 + note E_, 1 + note C_, 1 + dutycycle 2 + note A_, 2 + dutycycle 1 + note E_, 1 + note C_, 1 + note E_, 1 + note A_, 1 + dutycycle 2 + octave 3 + note C_, 2 + dutycycle 1 + octave 2 + note A_, 1 + note E_, 1 + dutycycle 2 + octave 3 + note D_, 2 + dutycycle 1 + octave 2 + note A_, 1 + note F#, 1 + note D_, 1 + note F#, 1 + dutycycle 2 + octave 3 + note E_, 1 + note D_, 1 + intensity $B0 + dutycycle 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 6 + note C#, 6 + note E_, 4 + note F#, 6 + octave 3 + note B_, 6 + octave 4 + notetype $6, $B0 + note F#, 8 + note G#, 1 + note A_, 11 + notetype $C, $B0 + note G#, 6 + note F#, 4 + note E_, 15 + notetype $6, $B0 + note F#, 1 + note G_, 1 + notetype $C, $B0 + note G#, 6 + note F#, 6 + note B_, 4 + note G#, 6 + note F#, 6 + note E_, 4 + note D#, 16 + note C#, 6 + intensity $C2 + note D#, 1 + note C#, 1 + note C_, 1 + octave 3 + note F_, 1 + note A_, 1 + octave 4 + note C_, 1 + note F_, 1 + note D#, 1 + note C#, 1 + note C_, 1 + note C#, 8 + loopchannel 0, Music_PokeathelonFinal_Loop2 +Music_PokeathelonFinal_Ch3: + notetype $C, $14 + note __, 16 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 +Music_PokeathelonFinal_Loop3: + callchannel Music_PokeathelonFinal_Branch3A + intensity $14 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note F#, 4 + octave 1 + note F_, 1 + note F_, 1 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + callchannel Music_PokeathelonFinal_Branch3A + callchannel Music_PokeathelonFinal_Branch3A + callchannel Music_PokeathelonFinal_Branch3B + intensity $14 + note F_, 1 + intensity $24 + note F_, 1 + intensity $14 + octave 2 + note F_, 1 + intensity $24 + note F_, 1 + intensity $14 + octave 1 + note F_, 1 + intensity $24 + note F_, 1 + intensity $14 + octave 2 + note F_, 1 + intensity $24 + note F_, 1 + intensity $14 + octave 1 + note G_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note G_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 2 + note G_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note G_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note G_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 2 + note G_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note G_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 2 + note G_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 7 + note E_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 7 + note E_, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 6 + note E_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 7 + note E_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 6 + note E_, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 6 + note E_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 7 + note E_, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 7 + note E_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note B_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note B_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note B_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 5 + note A_, 1 + intensity $14 + octave 2 + note F#, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 5 + note A_, 1 + intensity $14 + octave 2 + note F#, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 5 + note A_, 1 + intensity $14 + octave 2 + note F#, 1 + intensity $20 + octave 5 + note A_, 1 + intensity $14 + octave 2 + note C_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note C_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 3 + note C_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 2 + note C_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note C_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 3 + note C_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note C_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 3 + note C_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 2 + note B_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 2 + note B_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note B_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note B_, 1 + intensity $20 + octave 5 + note B_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 5 + note A_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 5 + note A_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 5 + note A_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 6 + note A_, 1 + intensity $14 + octave 2 + note D_, 1 + intensity $20 + octave 6 + note D_, 1 + intensity $14 + octave 2 + note D_, 1 + intensity $20 + octave 7 + note D_, 1 + intensity $14 + octave 3 + note D_, 1 + intensity $20 + octave 7 + note D_, 1 + intensity $14 + octave 2 + note D_, 1 + intensity $20 + octave 6 + note D_, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 6 + note F#, 1 + intensity $14 + octave 3 + note C#, 1 + intensity $20 + octave 6 + note F#, 1 + intensity $14 + octave 3 + note F#, 1 + intensity $20 + octave 2 + note F#, 1 + intensity $14 + note F#, 1 + intensity $20 + note F#, 1 + intensity $14 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 4 + note G#, 1 + intensity $14 + octave 3 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 4 + note G#, 1 + intensity $14 + octave 3 + note C#, 1 + intensity $20 + octave 4 + note G#, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 3 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note D#, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 2 + note D#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 3 + note D#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note D#, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 2 + note D#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 3 + note D#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note D#, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 3 + note D#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note E_, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 2 + note E_, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 3 + note E_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note E_, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 2 + note E_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 3 + note E_, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 2 + note E_, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 3 + note E_, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note A_, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 2 + note A_, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 2 + note F#, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 2 + note F#, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note F#, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 2 + note F#, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 1 + note G#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note G#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note G#, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 1 + note G#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 1 + note G#, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 2 + note G#, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 1 + note G#, 1 + intensity $20 + octave 6 + note B_, 1 + intensity $14 + octave 2 + note G#, 1 + intensity $20 + octave 4 + note B_, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 4 + note G#, 1 + intensity $14 + octave 3 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 4 + note G#, 1 + intensity $14 + octave 3 + note C#, 1 + intensity $20 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note C#, 1 + intensity $20 + octave 4 + note G#, 1 + intensity $14 + octave 3 + note C#, 1 + intensity $20 + octave 4 + note G#, 1 + intensity $14 + octave 1 + note G#, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note G#, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 2 + note G#, 1 + intensity $20 + octave 7 + note C#, 1 + intensity $14 + octave 1 + note G#, 1 + intensity $20 + octave 5 + note C#, 1 + intensity $14 + octave 1 + note F_, 1 + intensity $20 + octave 6 + note F_, 1 + intensity $14 + octave 2 + note F_, 1 + intensity $20 + octave 4 + note F_, 1 + intensity $14 + octave 1 + note F_, 1 + intensity $20 + octave 4 + note F_, 1 + intensity $14 + octave 2 + note F_, 1 + intensity $20 + octave 6 + note F_, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + loopchannel 0, Music_PokeathelonFinal_Loop3 +Music_PokeathelonFinal_Branch3A: + intensity $14 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + loopchannel 7, Music_PokeathelonFinal_Branch3A + db $FF +Music_PokeathelonFinal_Branch3B: + intensity $14 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 2 + note A#, 1 + intensity $24 + note A#, 1 + intensity $14 + octave 1 + note A#, 1 + intensity $24 + note A#, 1 + db $FF +Music_PokeathelonFinal_Ch4: + notetype $C + togglenoise 1 + note F#, 3 + note F#, 3 + note F#, 3 + note D#, 1 + note D_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note F#, 2 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 +Music_PokeathelonFinal_Loop4: + callchannel Music_PokeathelonFinal_Branch4A + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note C#, 1 + note C#, 1 + note F#, 2 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note F#, 4 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note F#, 2 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note F#, 2 + note A#, 1 + note A#, 1 + note C#, 1 + note C#, 1 + note F#, 4 + note C#, 1 + note C#, 1 + note F#, 2 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + callchannel Music_PokeathelonFinal_Branch4A + note D_, 1 + note C#, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note E_, 4 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + callchannel Music_PokeathelonFinal_Branch4A + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note C#, 1 + note C#, 1 + note F#, 2 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + callchannel Music_PokeathelonFinal_Branch4A + note D_, 1 + note C#, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note E_, 4 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + callchannel Music_PokeathelonFinal_Branch4A + note C#, 1 + note B_, 1 + note C#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note C#, 1 + note C#, 1 + note F#, 2 + note A_, 2 + note C#, 1 + note B_, 1 + note A_, 2 + callchannel Music_PokeathelonFinal_Branch4B + note B_, 1 + note D_, 1 + note A_, 2 + note C#, 1 + note B_, 1 + note E_, 2 + note B_, 1 + note B_, 1 + note A_, 2 + note C#, 1 + note B_, 1 + note A_, 2 + callchannel Music_PokeathelonFinal_Branch4B + note B_, 1 + note B_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 2 + note F#, 2 + note G_, 1 + note A_, 1 + note C#, 1 + note B_, 1 + note G_, 1 + note A_, 1 + callchannel Music_PokeathelonFinal_Branch4C + note B_, 1 + note D_, 1 + note G_, 1 + note A_, 1 + note C#, 1 + note B_, 1 + note E_, 2 + note B_, 1 + note B_, 1 + note G_, 1 + note A_, 1 + note C#, 1 + note B_, 1 + note G_, 1 + note A_, 1 + callchannel Music_PokeathelonFinal_Branch4C + note B_, 1 + note B_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note B_, 1 + note C#, 1 + note C#, 1 + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + loopchannel 0, Music_PokeathelonFinal_Loop4 +Music_PokeathelonFinal_Branch4A: + note B_, 1 + note B_, 1 + note A#, 1 + note A#, 1 + note C#, 1 + note B_, 1 + note A#, 1 + note A#, 1 + loopchannel 6, Music_PokeathelonFinal_Branch4A + db $FF +Music_PokeathelonFinal_Branch4B: + note B_, 1 + note B_, 1 + note A_, 2 + note C#, 1 + note B_, 1 + note A_, 2 + loopchannel 6, Music_PokeathelonFinal_Branch4B + db $FF +Music_PokeathelonFinal_Branch4C: + note B_, 1 + note B_, 1 + note G#, 1 + note A_, 1 + note C#, 1 + note B_, 1 + note G#, 1 + note A_, 1 + loopchannel 6, Music_PokeathelonFinal_Branch4C + db $FF diff --git a/crysaudio/music/custom/shop.asm b/crysaudio/music/custom/shop.asm new file mode 100644 index 00000000..8b5a79bf --- /dev/null +++ b/crysaudio/music/custom/shop.asm @@ -0,0 +1,1114 @@ +Music_Shop: + dbw $c0, Music_Shop_Ch1 + dbw $01, Music_Shop_Ch2 + dbw $02, Music_Shop_Ch3 + dbw $03, Music_Shop_Ch4 + +Music_Shop_Ch1: + tempo $90 + volume $77 + dutycycle 1 + notetype $C, $B2 +;Channel1_Bar1: + octave 4 + note C#, 4 + note C#, 4 + note C_, 2 + note C_, 4 + octave 3 + note B_, 6 +;Channel1_Bar2: + note A#, 12 +;Channel1_Bar3: +Music_Shop_Loop1: + note D#, 4 + octave 2 + note A#, 2 + octave 3 + note D#, 4 + octave 2 + note F#, 4 + octave 3 + note D#, 4 +;Channel1_Bar4: + octave 2 + note F#, 2 + note B_, 2 + note F#, 4 + octave 3 + note D#, 4 + octave 2 + note B_, 2 +;Channel1_Bar5: + note A_, 4 + note F#, 2 + octave 3 + note D#, 4 + octave 2 + note A_, 4 + octave 3 + note D#, 4 +;Channel1_Bar6: + octave 2 + note F#, 2 + note A_, 2 + note F#, 4 + octave 3 + note D#, 4 + octave 2 + note A_, 2 +;Channel1_Bar7: + note G#, 4 + note B_, 2 + note E_, 4 + note B_, 4 + note G#, 4 +;Channel1_Bar8: + note F_, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 4 + octave 3 + note D_, 4 + note F_, 2 +;Channel1_Bar9: + note B_, 4 + note F#, 2 + note B_, 2 + note F#, 2 + intensity $B4 + note F_, 2 + note F#, 2 + note G#, 2 +;Channel1_Bar10: + note A#, 16 +;Channel1_Bar11: + dutycycle 2 + note A#, 4 + note B_, 2 + note D#, 4 + note F#, 4 + note D#, 1 + note F#, 1 +;Channel1_Bar12: + note B_, 2 + note F#, 2 + note B_, 2 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 +;Channel1_Bar13: + octave 3 + note A_, 4 + note B_, 2 + note D#, 4 + note F#, 4 + note D#, 1 + note F#, 1 +;Channel1_Bar14: + note A_, 2 + note D#, 2 + note F#, 2 + note B_, 4 + note A_, 4 + note F#, 1 + note A_, 1 +;Channel1_Bar15: + note B_, 4 + note B_, 2 + note E_, 4 + note B_, 4 + note E_, 4 +;Channel1_Bar16: + octave 2 + note F_, 2 + octave 3 + note D_, 2 + note F_, 4 + note D_, 4 + note G#, 2 +;Channel1_Bar17: + note B_, 4 + note F#, 2 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 +;Channel1_Bar18: + note A#, 8 + note E_, 2 + note C#, 2 + note F#, 2 + note E_, 2 +;Channel1_Bar19: + intensity $B1 + dutycycle 0 + note D#, 2 + octave 2 + note G_, 2 + note A#, 2 + note G_, 4 + note A#, 4 + octave 3 + note D#, 4 +;Channel1_Bar20: + octave 2 + note G_, 2 + note A#, 2 + note G_, 4 + octave 3 + note D#, 4 + octave 2 + note A#, 2 +;Channel1_Bar21: + octave 3 + note D#, 2 + octave 2 + note G#, 2 + note B_, 2 + note G#, 4 + octave 3 + note D#, 4 + octave 2 + note B_, 4 +;Channel1_Bar22: + note G#, 2 + note B_, 2 + note G#, 4 + octave 3 + note D#, 4 + octave 2 + note G#, 2 +;Channel1_Bar23: + intensity $B4 + dutycycle 1 + octave 3 + note G_, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note A#, 2 + note A_, 2 + note A#, 2 + octave 4 + note D#, 2 +;Channel1_Bar24: + octave 3 + note D#, 2 + octave 2 + note A#, 2 + octave 4 + note D#, 1 + note D_, 1 + note D#, 2 + note F_, 1 + note E_, 1 + note F_, 2 + note G_, 1 + note F#, 1 + note G_, 2 +;Channel1_Bar25: + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + octave 3 + note B_, 4 + note D#, 4 + note C#, 4 +;Channel1_Bar26: + octave 4 + note C#, 2 + note D#, 2 + octave 3 + note B_, 4 + note D#, 4 + octave 2 + note G#, 2 +;Channel1_Bar27: + intensity $B2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G#, 4 + note B_, 4 + note D#, 2 +;Channel1_Bar28: + note D_, 2 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + note G#, 4 + note F_, 4 + note D_, 2 +;Channel1_Bar29: + note C#, 2 + octave 2 + note F#, 2 + note A#, 2 + octave 3 + note C#, 2 + note F#, 2 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 +;Channel1_Bar30: + octave 4 + note C#, 2 + octave 3 + note B_, 4 + note A#, 10 +;Channel1_Bar31: + loopchannel 0, Music_Shop_Loop1 + +Music_Shop_Ch2: + dutycycle 2 + notetype $C, $B1 +;Channel2_Bar1: + octave 4 + note F#, 4 + note F#, 4 + note F#, 2 + note F#, 4 + note F#, 6 +;Channel2_Bar2: + intensity $C5 + note F#, 6 + dutycycle 1 + octave 3 + note F#, 2 + note G#, 2 + note A#, 2 +;Channel2_Bar3: +Music_Shop_Loop2: + octave 4 + note C#, 3 + octave 3 + note F#, 1 + octave 4 + note D#, 2 + octave 3 + note B_, 8 + note B_, 1 + octave 4 + note C#, 1 +;Channel2_Bar4: + note D#, 2 + note D_, 2 + note D#, 2 + note E_, 6 + note D#, 1 + note E_, 1 + note F#, 2 +;Channel2_Bar5: + note C#, 3 + octave 3 + note F#, 1 + octave 4 + note D#, 2 + octave 3 + note B_, 8 + note B_, 1 + octave 4 + note C#, 1 +;Channel2_Bar6: + note D#, 2 + note D_, 2 + note D#, 2 + note G#, 6 + note E_, 1 + note D#, 1 + note C#, 2 +;Channel2_Bar7: + note D#, 3 + octave 3 + note G#, 1 + octave 4 + note E_, 2 + note C#, 12 +;Channel2_Bar8: + octave 3 + note G#, 6 + note A#, 4 + note B_, 4 +;Channel2_Bar9: + octave 4 + note D#, 6 + note E_, 1 + note D#, 1 + note C#, 2 + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 +;Channel2_Bar10: + intensity $C2 + octave 4 + note C#, 8 + note B_, 2 + note F#, 2 + note E_, 2 + note D#, 2 +;Channel2_Bar11: + intensity $C5 + note C#, 3 + octave 3 + note F#, 1 + octave 4 + note D#, 2 + octave 3 + note B_, 8 + note B_, 1 + octave 4 + note C#, 1 +;Channel2_Bar12: + note D#, 6 + note E_, 4 + note D#, 2 + note E_, 2 + note F#, 2 +;Channel2_Bar13: + note C#, 3 + octave 3 + note F#, 1 + octave 4 + note D#, 2 + octave 3 + note B_, 8 + note B_, 1 + octave 4 + note C#, 1 +;Channel2_Bar14: + notetype 6, $C5 + note D#, 11 + note G_, 1 + note G#, 8 + note F#, 8 + octave 3 + note B_, 2 + octave 4 + note C#, 2 +;Channel2_Bar15: + note D#, 6 + octave 3 + note G#, 2 + octave 4 + note E_, 4 + note C#, 16 + note __, 8 +;Channel2_Bar16: + octave 3 + note G#, 4 + note G_, 4 + note G#, 4 + note A#, 4 + note G#, 4 + note A#, 4 + note B_, 3 + octave 4 + note D_, 1 +;Channel2_Bar17: + note D#, 12 + note E_, 2 + note D#, 2 + note C#, 4 + octave 3 + note B_, 4 + note A#, 4 + note B_, 4 +;Channel2_Bar18: + notetype $C, $C5 + octave 4 + note C#, 12 + dutycycle 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 +;Channel2_Bar19: + note D#, 4 + note D#, 4 + note D#, 2 + note D_, 2 + notetype 6, $C5 + note D#, 3 + note G#, 1 + note A#, 12 +;Channel2_Bar20: + note G_, 8 + note D#, 8 + note C#, 8 +;Channel2_Bar21: + note C#, 6 + note C#, 1 + note D_, 1 + note D#, 4 + octave 3 + note B_, 8 + note A#, 4 + note B_, 4 + octave 4 + note C#, 12 +;Channel2_Bar22: + note D#, 4 + note G#, 12 + octave 3 + note B_, 4 + octave 4 + note C#, 4 +;Channel2_Bar23: + note D#, 8 + note D#, 8 + note D#, 4 + note D_, 4 + note D#, 3 + note G#, 1 + note A#, 12 +;Channel2_Bar24: + note G_, 2 + note F#, 2 + note G_, 4 + note G#, 2 + note G_, 2 + note G#, 4 + note A#, 2 + note A_, 2 + note A#, 4 +;Channel2_Bar25: + note A#, 8 + note B_, 4 + note G#, 8 + note G_, 4 + note G#, 4 + note A#, 12 +;Channel2_Bar26: + note B_, 4 + note G#, 7 + dutycycle 0 + octave 5 + note C_, 1 + note C#, 4 + octave 4 + note B_, 4 + note A#, 4 +;Channel2_Bar27: + notetype $C, $C5 + note B_, 15 + notetype 6, $C5 + note G#, 1 + note A#, 1 +;Channel2_Bar28: + notetype $C, $C5 + note B_, 10 + note G#, 2 + note A#, 2 + note B_, 2 +;Channel2_Bar29: + note A#, 10 + note G#, 2 + note A#, 2 + note G#, 2 +;Channel2_Bar30: + note A#, 2 + note G#, 4 + note F#, 10 +;Channel2_Bar31: + dutycycle 1 + loopchannel 0, Music_Shop_Loop2 + +Music_Shop_Ch3: + notetype $C, $14 +;Channel3_Bar1: + octave 4 + note D#, 1 + note __, 3 + note D#, 1 + note __, 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note C#, 1 + note __, 5 +;Channel3_Bar2: + octave 3 + note F#, 5 + note __, 7 +;Channel3_Bar3: +Music_Shop_Loop3: + octave 2 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 +;Channel3_Bar4: + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 +;Channel3_Bar5: + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 +;Channel3_Bar6: + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 +;Channel3_Bar7: + note E_, 4 + note __, 2 + note E_, 1 + note __, 1 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 +;Channel3_Bar8: + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note B_, 4 + note __, 2 + note B_, 1 + note __, 1 +;Channel3_Bar9: + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + octave 3 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 +;Channel3_Bar10: + octave 2 + note F#, 2 + note __, 14 + callchannel Music_Shop_Branch + callchannel Music_Shop_Branch + callchannel Music_Shop_Branch + callchannel Music_Shop_Branch +;Channel3_Bar15: + note E_, 4 + intensity $24 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note E_, 1 + note __, 1 + note B_, 4 + intensity $24 + octave 5 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note B_, 1 + note __, 1 +;Channel3_Bar16: + note F_, 4 + intensity $24 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note F_, 1 + note __, 1 + note B_, 4 + intensity $24 + octave 5 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note B_, 1 + note __, 1 +;Channel3_Bar17: + note F#, 4 + intensity $24 + octave 6 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note F#, 4 + intensity $24 + octave 5 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + octave 3 + note F#, 1 + octave 2 + note __, 1 +;Channel3_Bar18: + note F#, 2 + note __, 6 + octave 3 + note C#, 4 + octave 2 + note F#, 4 +;Channel3_Bar19: + note D#, 4 + note __, 2 + note D#, 1 + note __, 1 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 +;Channel3_Bar20: + note A#, 4 + note __, 2 + note A#, 1 + note __, 1 + note D#, 4 + note G_, 4 +;Channel3_Bar21: + note G#, 4 + note __, 2 + note G#, 1 + note __, 1 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 +;Channel3_Bar22: + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + note F_, 4 + note E_, 4 +;Channel3_Bar23: + note D#, 4 + octave 4 + note A#, 1 + octave 2 + note __, 1 + note D#, 1 + note __, 1 + note G_, 4 + octave 4 + note G_, 1 + octave 2 + note __, 1 + note G_, 1 + note __, 1 +;Channel3_Bar24: + note A#, 4 + octave 4 + note A#, 1 + octave 2 + note __, 1 + note A#, 1 + note __, 1 + note D#, 4 + note G_, 4 +;Channel3_Bar25: + note G#, 4 + intensity $24 + octave 6 + note D#, 1 + intensity $14 + octave 2 + note __, 1 + note G#, 1 + note __, 1 + note G_, 4 + intensity $24 + octave 6 + note D#, 1 + intensity $14 + octave 2 + note __, 1 + note G_, 1 + note __, 1 +;Channel3_Bar26: + note F#, 4 + intensity $24 + octave 6 + note D#, 1 + intensity $14 + octave 2 + note __, 1 + note F#, 1 + note __, 1 + note F_, 4 + intensity $24 + octave 6 + note D#, 1 + intensity $14 + octave 2 + note __, 1 + note F_, 1 + note __, 1 +;Channel3_Bar27: + note E_, 4 + intensity $24 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note E_, 1 + note __, 1 + octave 1 + note B_, 4 + intensity $24 + octave 5 + note G#, 1 + intensity $14 + octave 1 + note __, 1 + note B_, 1 + note __, 1 +;Channel3_Bar28: + octave 2 + note F_, 4 + intensity $24 + octave 6 + note G#, 1 + intensity $14 + octave 2 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note B_, 4 + intensity $24 + octave 6 + note D_, 1 + intensity $14 + octave 1 + note __, 1 + note B_, 1 + note __, 1 +;Channel3_Bar29: + octave 2 + note F#, 4 + intensity $24 + octave 6 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note C#, 4 + intensity $24 + octave 5 + note F#, 1 + intensity $14 + octave 3 + note __, 1 + note C#, 1 + note __, 1 +;Channel3_Bar30: + octave 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 3 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 +;Channel3_Bar31: + loopchannel 0, Music_Shop_Loop3 +Music_Shop_Branch: + note B_, 4 + intensity $24 + octave 6 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + note B_, 1 + note __, 1 + note F#, 4 + intensity $24 + octave 5 + note F#, 1 + intensity $14 + octave 2 + note __, 1 + note F#, 1 + note __, 1 + endchannel + +Music_Shop_Ch4: + notetype $C + togglenoise 0 +;Channel4_Bar1: + note G_, 4 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 6 +;Channel4_Bar2: + note A#, 12 +;Channel4_Bar3: +Music_Shop_Loop4: + note A#, 4 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar4: + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 +;Channel4_Bar5: + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar6: + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 +;Channel4_Bar7: + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar8: + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 +;Channel4_Bar9: + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar10: + note G_, 16 +;Channel4_Bar11: + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar12: + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 +;Channel4_Bar13: + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar14: + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 +;Channel4_Bar15: + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar16: + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 +;Channel4_Bar17: + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note D_, 2 +;Channel4_Bar18: + note G_, 16 +;Channel4_Bar19: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar20: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar21: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar22: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar23: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar24: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar25: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar26: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar27: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar28: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar29: + note A#, 4 + note G_, 2 + note D_, 2 + note A#, 4 + note G_, 2 + note D_, 2 +;Channel4_Bar30: + note G_, 2 + note A#, 4 + note A#, 4 + note D_, 2 + note G_, 2 + note G_, 2 +;Channel4_Bar31: + loopchannel 0, Music_Shop_Loop4 diff --git a/crysaudio/music/custom/sinnohtrainer.asm b/crysaudio/music/custom/sinnohtrainer.asm new file mode 100644 index 00000000..e69de29b diff --git a/crysaudio/music/dancinghall.asm b/crysaudio/music/dancinghall.asm new file mode 100644 index 00000000..2a7e6e51 --- /dev/null +++ b/crysaudio/music/dancinghall.asm @@ -0,0 +1,314 @@ +Music_DancingHall: ; ef9bc + dbw $80, Music_DancingHall_Ch1 + dbw $01, Music_DancingHall_Ch2 + dbw $02, Music_DancingHall_Ch3 +; ef9c5 + + + + +Music_DancingHall_Ch1: ; ef9c6 + tempo 208 + volume $77 + stereopanning $f + notetype $6, $b7 + note __, 3 + dutycycle $0 +Music_DancingHall_branch_ef9d3: ; ef9d3 + notetype $c, $b7 + callchannel Music_DancingHall_branch_efa17 + note __, 16 + callchannel Music_DancingHall_branch_efa17 + note __, 16 + note __, 16 + note __, 16 + intensity $b1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note F_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note B_, 1 + octave 4 + note D_, 1 + note F_, 2 + notetype $8, $b1 + note D_, 1 + note E_, 1 + note D_, 1 + octave 3 + note B_, 3 + note A_, 3 + notetype $c, $b1 + note B_, 1 + note A_, 1 + note D_, 1 + note E_, 1 + octave 4 + note F_, 2 + notetype $8, $b1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + octave 3 + note B_, 1 + notetype $c, $b5 + note A_, 1 + note __, 1 + note B_, 1 + note B_, 1 + note A_, 1 + note __, 1 + note F_, 2 + loopchannel 0, Music_DancingHall_branch_ef9d3 +; efa17 + +Music_DancingHall_branch_efa17: ; efa17 + octave 3 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + endchannel +; efa2c + +Music_DancingHall_Ch2: ; efa2c + stereopanning $f0 + notetype $6, $a1 + dutycycle $0 + vibrato $10, $24 + note __, 3 +Music_DancingHall_branch_efa37: ; efa37 + notetype $6, $a2 + callchannel Music_DancingHall_branch_efa7a + callchannel Music_DancingHall_branch_efa7a + intensity $a7 + octave 2 + note D_, 16 + note F_, 16 + notetype $c, $a7 + note E_, 16 + octave 3 + note F_, 1 + note A_, 1 + note B_, 1 + octave 4 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note A_, 1 + note B_, 2 + notetype $8, $a7 + note A_, 1 + note B_, 1 + note A_, 1 + note F_, 3 + note D_, 3 + notetype $c, $a7 + note E_, 1 + note D_, 1 + octave 3 + note A_, 1 + note B_, 1 + octave 4 + note A_, 2 + notetype $8, $a7 + note F_, 1 + note A_, 1 + note F_, 1 + notetype $c, $a7 + note E_, 1 + note __, 1 + note F_, 1 + note F_, 1 + note E_, 1 + note __, 1 + note D_, 2 + loopchannel 0, Music_DancingHall_branch_efa37 +; efa7a + +Music_DancingHall_branch_efa7a: ; efa7a + intensity $a1 + octave 4 + note E_, 4 + octave 2 + note E_, 4 + octave 4 + note E_, 4 + octave 2 + note E_, 4 + octave 4 + note B_, 4 + note A_, 4 + note F_, 4 + note A_, 4 + intensity $33 + note D_, 1 + note F_, 1 + intensity $63 + note D_, 1 + note F_, 1 + intensity $93 + note D_, 1 + note F_, 1 + intensity $c3 + note D_, 1 + note F_, 1 + intensity $e3 + note D_, 1 + note F_, 1 + intensity $a3 + note D_, 1 + note F_, 1 + intensity $83 + note D_, 1 + note F_, 1 + intensity $53 + note D_, 1 + note F_, 1 + intensity $73 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + intensity $a3 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + intensity $b3 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + intensity $c3 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + intensity $d3 + octave 3 + note E_, 1 + note B_, 1 + intensity $e3 + note E_, 1 + note B_, 1 + intensity $f3 + note A_, 1 + octave 4 + note D_, 1 + intensity $f3 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + endchannel +; efad6 + +Music_DancingHall_Ch3: ; efad6 + stereopanning $ff + vibrato $16, $24 + notetype $6, $10 + octave 5 + note A_, 1 + note B_, 1 + octave 6 + note D_, 1 +Music_DancingHall_branch_efae3: ; efae3 + note E_, 13 + note D_, 1 + note E_, 1 + note A_, 1 + note B_, 16 + intensity $14 + octave 3 + note F_, 16 + note E_, 14 + intensity $10 + octave 6 + note E_, 1 + note F_, 1 + note E_, 13 + note D_, 1 + note E_, 1 + note A_, 1 + note B_, 16 + intensity $14 + octave 3 + note F_, 16 + note E_, 16 + intensity $13 + octave 4 + note F_, 2 + note A_, 2 + note B_, 2 + octave 5 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note A_, 2 + note A#, 1 + note B_, 3 + notetype $8, $13 + note A_, 1 + note B_, 1 + note A_, 1 + note F_, 3 + note D_, 3 + notetype $c, $13 + note E_, 1 + note D_, 1 + octave 4 + note A_, 1 + note B_, 1 + octave 5 + note A_, 2 + notetype $8, $13 + note F_, 1 + note A_, 1 + note F_, 1 + notetype $6, $13 + note D#, 1 + note E_, 3 + note D_, 4 + octave 4 + note B_, 4 + octave 5 + note D_, 4 + intensity $14 + octave 3 + note D_, 16 + note F_, 16 + note E_, 16 + note E_, 13 + intensity $10 + octave 5 + note A_, 1 + note B_, 1 + octave 6 + note D_, 1 + loopchannel 0, Music_DancingHall_branch_efae3 +; efb3e + + diff --git a/crysaudio/music/darkcave.asm b/crysaudio/music/darkcave.asm new file mode 100644 index 00000000..813c9dd5 --- /dev/null +++ b/crysaudio/music/darkcave.asm @@ -0,0 +1,494 @@ +Music_DarkCave: ; ea2be + dbw $c0, Music_DarkCave_Ch1 + dbw $01, Music_DarkCave_Ch2 + dbw $02, Music_DarkCave_Ch3 + dbw $03, Music_DarkCave_Ch4 +; ea2ca + +Music_DarkCave_Ch1: ; ea2ca + tempo 128 + volume $77 + dutycycle $3 + tone $0001 + vibrato $11, $15 + stereopanning $f0 + notetype $c, $a7 +Music_DarkCave_branch_ea2dc: ; ea2dc + note __, 16 + loopchannel 4, Music_DarkCave_branch_ea2dc + octave 3 + note D#, 16 + note D_, 16 + note C#, 16 + note C_, 16 + intensity $a3 +Music_DarkCave_branch_ea2e8: ; ea2e8 + callchannel Music_DarkCave_branch_ea333 + loopchannel 3, Music_DarkCave_branch_ea2e8 + intensity $b7 + note G#, 8 + note D#, 8 + note G_, 8 + note D_, 8 + note F_, 8 + note C#, 8 + note D#, 8 + note G_, 8 + note G#, 8 + note D#, 8 + note G_, 8 + note D_, 8 + note F_, 8 + note C#, 8 + note D#, 8 + note C_, 8 + intensity $a3 +Music_DarkCave_branch_ea303: ; ea303 + callchannel Music_DarkCave_branch_ea333 + loopchannel 2, Music_DarkCave_branch_ea303 + note __, 16 + note __, 8 + intensity $b7 + octave 2 + note F_, 2 + note G_, 2 + note G#, 4 + octave 3 + note D#, 16 + note __, 8 + octave 2 + note G#, 2 + note G_, 2 + note G#, 4 + octave 3 + note D#, 16 + note G_, 2 + note __, 6 + note F_, 2 + note G_, 2 + note G#, 4 + note G_, 16 + note F_, 2 + note __, 6 + note G#, 2 + note G_, 2 + note G#, 4 + intensity $a3 +Music_DarkCave_branch_ea328: ; ea328 + callchannel Music_DarkCave_branch_ea333 + loopchannel 2, Music_DarkCave_branch_ea328 + loopchannel 0, Music_DarkCave_branch_ea2e8 +; ea333 + +Music_DarkCave_branch_ea333: ; ea333 + octave 4 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + note D#, 2 + note C_, 2 + note D_, 2 + octave 3 + note G_, 2 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note G_, 2 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note F_, 2 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note F_, 2 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + endchannel +; ea36a + +Music_DarkCave_Ch2: ; ea36a + dutycycle $1 + vibrato $12, $36 + stereopanning $f + notetype $c, $a7 +Music_DarkCave_branch_ea374: ; ea374 + note __, 16 + loopchannel 4, Music_DarkCave_branch_ea374 + octave 3 + note G_, 16 + note A#, 16 + note F_, 16 + note G_, 16 +Music_DarkCave_branch_ea37e: ; ea37e + note __, 16 + loopchannel 4, Music_DarkCave_branch_ea37e + note __, 8 + stereopanning $ff + intensity $c7 + octave 5 + note C_, 8 + intensity $c4 + note D_, 2 + note C_, 2 + octave 4 + note A#, 2 + note G_, 4 + note A#, 2 + octave 5 + note D_, 4 + intensity $b0 + note C#, 4 + intensity $b7 + note C#, 12 + intensity $59 + note C_, 8 + intensity $c7 + note C_, 8 + note __, 8 + intensity $c7 + note C_, 8 + intensity $c4 + note D_, 2 + note C_, 2 + octave 4 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + octave 5 + note D_, 4 + intensity $c7 + note C#, 12 + intensity $c3 + note C_, 2 + note C#, 2 + intensity $b0 + note D#, 10 + intensity $b7 + note D#, 6 + stereopanning $f + intensity $c4 + octave 4 + note F_, 4 + note D#, 2 + note D_, 2 + note D#, 4 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + note D_, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 8 + octave 3 + note A#, 8 + intensity $b0 + octave 4 + note D#, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 8 + note F_, 4 + note D#, 2 + note D_, 2 + note D#, 4 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + note D_, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 4 + note C_, 2 + note C#, 2 + note C_, 2 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + intensity $b0 + note C_, 8 + intensity $b7 + note C_, 8 + intensity $c7 + stereopanning $ff + note __, 8 + octave 5 + note C_, 8 + intensity $c4 + note D_, 2 + note C_, 2 + octave 4 + note A#, 2 + note G_, 4 + note A#, 2 + octave 5 + note D_, 4 + intensity $49 + note C#, 8 + intensity $c7 + note C#, 8 + intensity $b0 + note C_, 8 + intensity $b7 + note C_, 8 + note __, 8 + intensity $c7 + note C_, 8 + intensity $c4 + note D_, 2 + note C_, 2 + octave 4 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + octave 5 + note D_, 4 + intensity $b0 + note C#, 8 + intensity $b7 + note C#, 8 + intensity $b0 + note C_, 8 + intensity $b7 + note C_, 8 + intensity $c7 + note __, 16 + stereopanning $f + note __, 8 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + note C#, 4 + note C_, 16 + note __, 8 + note C#, 2 + note C_, 2 + note C#, 4 + note C_, 16 + intensity $c2 + note D#, 8 + intensity $c7 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + note C#, 4 + note C_, 16 + intensity $c2 + octave 3 + note A#, 8 + intensity $c7 + octave 4 + note C#, 2 + note C_, 2 + intensity $c4 + note C#, 16 + note __, 4 + note __, 16 + note __, 16 + note __, 16 + intensity $b7 + octave 5 + note D#, 16 + note D_, 16 + note F_, 16 + note D#, 16 + loopchannel 0, Music_DarkCave_branch_ea37e +; ea46e + +Music_DarkCave_Ch3: ; ea46e + notetype $c, $27 +Music_DarkCave_branch_ea471: ; ea471 + callchannel Music_DarkCave_branch_ea4ce + loopchannel 2, Music_DarkCave_branch_ea471 +Music_DarkCave_branch_ea478: ; ea478 + callchannel Music_DarkCave_branch_ea4ce + loopchannel 7, Music_DarkCave_branch_ea478 + callchannel Music_DarkCave_branch_ea4c3 + octave 3 + note C_, 4 + note G_, 2 + note D#, 4 + note G_, 2 + note D#, 4 + note F_, 2 + note __, 2 + octave 2 + note A#, 12 + callchannel Music_DarkCave_branch_ea4c3 + octave 3 + note C_, 4 + note G_, 2 + note D#, 4 + note G_, 2 + note D#, 4 + note F_, 2 + note __, 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 +; ea4a7 + +Music_DarkCave_branch_ea4a7: ; ea4a7 + octave 3 + note C_, 4 + note G_, 2 + note D#, 4 + note G_, 2 + note F_, 4 + note D#, 2 + note __, 2 + octave 2 + note A#, 4 + note A#, 2 + octave 3 + note C_, 2 + note C#, 4 + note C_, 4 + note G_, 2 + note D#, 4 + note G_, 2 + note D#, 4 + note F_, 2 + note __, 2 + octave 2 + note A#, 4 + octave 3 + note C#, 2 + note C_, 2 + note C#, 4 + endchannel +; ea4c3 + +Music_DarkCave_branch_ea4c3: ; ea4c3 + octave 3 + note C_, 4 + note G_, 2 + note D#, 4 + note G_, 2 + note F_, 4 + note D#, 2 + note __, 2 + octave 2 + note A#, 12 + endchannel +; ea4ce + +Music_DarkCave_branch_ea4ce: ; ea4ce + octave 2 + note C_, 4 + note G_, 2 + note D#, 4 + note G_, 2 + note F_, 4 + note D#, 2 + note __, 2 + octave 1 + note A#, 4 + note A#, 2 + octave 2 + note C_, 2 + note C#, 4 + note C_, 4 + note G_, 2 + note D#, 4 + note G_, 2 + note D#, 4 + note F_, 2 + note __, 2 + octave 1 + note A#, 4 + octave 2 + note C#, 2 + note C_, 2 + note C#, 4 + endchannel +; ea4ea + +Music_DarkCave_Ch4: ; ea4ea + togglenoise $3 + notetype $c +Music_DarkCave_branch_ea4ee: ; ea4ee + stereopanning $ff + note D#, 8 + 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 +; ea50d + + diff --git a/crysaudio/music/dragonsden.asm b/crysaudio/music/dragonsden.asm new file mode 100644 index 00000000..44f3fc5a --- /dev/null +++ b/crysaudio/music/dragonsden.asm @@ -0,0 +1,182 @@ +Music_DragonsDen: ; eece8 + dbw $c0, Music_DragonsDen_Ch1 + dbw $01, Music_DragonsDen_Ch2 + dbw $02, Music_DragonsDen_Ch3 + dbw $03, Music_DragonsDen_Ch4 +; eecf4 + +Music_DragonsDen_Ch1: ; eecf4 + tempo 144 + volume $77 + dutycycle $0 + tone $0004 + stereopanning $f0 + notetype $c, $80 +Music_DragonsDen_branch_eed03: ; 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 +; eed1e + +Music_DragonsDen_branch_eed1e: ; eed1e + octave 3 + note A#, 12 + note A_, 4 + note A#, 12 + note A_, 4 + note A#, 6 + octave 4 + note C_, 4 + note C#, 6 + note E_, 16 + note D#, 12 + note D_, 4 + octave 3 + note G#, 16 + endchannel +; eed2d + +Music_DragonsDen_branch_eed2d: ; eed2d + intensity $b1 + note __, 2 + octave 4 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 3 + note C#, 4 + note C#, 3 + note C#, 3 + note C#, 4 + note C#, 2 + note C#, 2 + endchannel +; eed3c + +Music_DragonsDen_Ch2: ; eed3c + dutycycle $0 + tone $0004 + stereopanning $f + notetype $c, $90 +Music_DragonsDen_branch_eed46: ; eed46 + callchannel Music_DragonsDen_branch_eed5e + note __, 16 + 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 +; eed5e + +Music_DragonsDen_branch_eed5e: ; eed5e + octave 4 + note D#, 12 + note D_, 4 + note D#, 12 + note D_, 4 + note D#, 6 + note F_, 4 + note F#, 6 + note A_, 16 + note G#, 12 + note G_, 4 + note C#, 16 + endchannel +; eed6b + +Music_DragonsDen_branch_eed6b: ; eed6b + intensity $c1 +Music_DragonsDen_branch_eed6d: ; eed6d + octave 5 + note C#, 4 + octave 4 + note G#, 4 + note G#, 4 + note G#, 4 + loopchannel 2, Music_DragonsDen_branch_eed6d + endchannel +; eed78 + +Music_DragonsDen_Ch3: ; eed78 +Music_DragonsDen_branch_eed78: ; eed78 + notetype $c, $14 + octave 4 + note C#, 2 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + loopchannel 15, Music_DragonsDen_branch_eed78 + note __, 16 + notetype $6, $27 +Music_DragonsDen_branch_eed99: ; eed99 + octave 3 + note C#, 4 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 4 + octave 3 + note C#, 4 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 4 + octave 3 + note C#, 4 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + loopchannel 16, Music_DragonsDen_branch_eed99 + loopchannel 0, Music_DragonsDen_branch_eed78 +; eedb7 + +Music_DragonsDen_Ch4: ; eedb7 + togglenoise $0 + notetype $c + note __, 16 + note __, 16 +Music_DragonsDen_branch_eedbd: ; eedbd + stereopanning $f0 + note F_, 4 + stereopanning $f + note F#, 4 + note F#, 4 + stereopanning $f0 + note F#, 4 + loopchannel 0, Music_DragonsDen_branch_eedbd +; eedcb + + diff --git a/crysaudio/music/ecruteakcity.asm b/crysaudio/music/ecruteakcity.asm new file mode 100644 index 00000000..20a2c9fc --- /dev/null +++ b/crysaudio/music/ecruteakcity.asm @@ -0,0 +1,676 @@ +Music_EcruteakCity: ; ef2d0 + dbw $80, Music_EcruteakCity_Ch1 + dbw $01, Music_EcruteakCity_Ch2 + dbw $02, Music_EcruteakCity_Ch3 +; ef2d9 + +Music_EcruteakCity_Ch1: ; ef2d9 + tempo 197 + volume $77 + stereopanning $f + vibrato $12, $25 + dutycycle $2 +Music_EcruteakCity_branch_ef2e5: ; ef2e5 + notetype $c, $57 + note __, 10 + octave 4 + note C_, 6 + note __, 10 + note C_, 6 + note __, 16 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + note D_, 4 + intensity $60 + note __, 4 + note __, 16 + note __, 10 + note G_, 2 + note A_, 2 + note A#, 2 + note __, 8 + note G#, 2 + note G_, 2 + note F_, 2 + octave 5 + note C_, 6 + notetype $6, $67 + note C#, 4 + note D_, 10 + note __, 2 + stereopanning $ff + octave 4 + note B_, 8 + stereopanning $f + octave 3 + note A#, 1 + note B_, 11 + octave 4 + note C_, 4 + note E_, 4 + note G_, 12 + note A#, 12 + note G_, 4 + note __, 4 + note A#, 4 + octave 5 + note C#, 4 + note E_, 2 + note __, 2 + octave 3 + note A_, 8 + octave 4 + note C_, 8 + note F_, 4 + note __, 12 + note E_, 1 + note F_, 11 + note G_, 2 + note __, 2 + note A_, 4 + note G_, 4 + note __, 8 + intensity $52 + callchannel Music_EcruteakCity_branch_ef37f + note D_, 2 + octave 4 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + callchannel Music_EcruteakCity_branch_ef391 + intensity $52 + note A#, 2 + note G_, 2 + note E_, 2 + note C#, 2 + note G_, 2 + note E_, 2 + note C#, 2 + octave 4 + note A#, 2 + octave 5 + note E_, 2 + note C#, 2 + octave 4 + note A#, 2 + note G_, 2 + note A#, 2 + note G_, 2 + note E_, 2 + note C#, 2 + callchannel Music_EcruteakCity_branch_ef37f + note D_, 2 + note C_, 2 + octave 4 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + octave 5 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + octave 4 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + octave 5 + note C_, 2 + callchannel Music_EcruteakCity_branch_ef391 + loopchannel 0, Music_EcruteakCity_branch_ef2e5 +; ef37f + +Music_EcruteakCity_branch_ef37f: ; ef37f + octave 5 + note E_, 2 + note C_, 2 + octave 4 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 2 + octave 5 + note C_, 2 + note E_, 2 + note C_, 2 + loopchannel 2, Music_EcruteakCity_branch_ef37f + endchannel +; ef391 + +Music_EcruteakCity_branch_ef391: ; ef391 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + octave 5 + note D_, 2 + note F_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + octave 4 + note A_, 2 + octave 5 + note E_, 2 + note C_, 2 + octave 4 + note A_, 2 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 2 + note E_, 2 + note C_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + octave 3 + note A_, 2 +Music_EcruteakCity_branch_ef3be: ; ef3be + octave 4 + note F_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 2 + octave 5 + note C_, 2 + note F_, 2 + loopchannel 2, Music_EcruteakCity_branch_ef3be +Music_EcruteakCity_branch_ef3d0: ; ef3d0 + octave 4 + note G_, 2 + note B_, 2 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + octave 5 + note D_, 2 + note G_, 2 + loopchannel 2, Music_EcruteakCity_branch_ef3d0 + intensity $50 + dutycycle $0 + note E_, 16 + note G_, 16 + dutycycle $2 + endchannel +; ef3eb + +Music_EcruteakCity_Ch2: ; ef3eb + vibrato $12, $25 + dutycycle $3 + stereopanning $f0 +Music_EcruteakCity_branch_ef3f2: ; ef3f2 + notetype $6, $67 + note __, 16 + note __, 5 + octave 4 + note G_, 1 + octave 5 + note D_, 1 + note E_, 9 + note __, 16 + note __, 5 + octave 4 + note A_, 1 + octave 5 + note E_, 1 + note F_, 9 + notetype $c, $77 + note __, 10 + note D_, 2 + note C_, 2 + octave 4 + note G#, 2 + note G_, 4 + note A_, 4 + note B_, 4 + notetype $6, $93 + intensity $97 + dutycycle $2 + octave 3 + note G_, 7 + octave 4 + note C#, 1 + note D_, 11 + note __, 1 + note C_, 2 + note __, 2 + note C_, 16 + note F_, 8 + note __, 4 + note E_, 4 + note __, 4 + note E_, 4 + note F_, 4 + note G_, 4 + note E_, 4 + note C_, 2 + note __, 2 + note C_, 4 + octave 3 + note A_, 2 + note F_, 1 + note A_, 1 + octave 4 + note C_, 16 + note E_, 4 + note G_, 2 + note __, 2 + note E_, 4 + note D_, 10 + note __, 1 + stereopanning $ff + note D#, 9 + stereopanning $f0 + dutycycle $0 + octave 5 + note C#, 1 + note D_, 11 + note C_, 2 + note __, 2 + note C_, 16 + note F_, 12 + note E_, 4 + note __, 4 + note E_, 4 + note F_, 4 + note G_, 2 + octave 4 + note A_, 1 + octave 5 + note C_, 1 + note E_, 1 + note A_, 3 + note E_, 2 + note __, 2 + note E_, 4 + note C_, 2 + note __, 2 + note C_, 4 + octave 4 + note A_, 2 + note __, 2 + note B_, 4 + octave 5 + note C_, 2 + octave 4 + note G_, 1 + note B_, 1 + octave 5 + note D#, 1 + note E_, 11 + note D_, 2 + note __, 2 + note D_, 8 + dutycycle $1 + octave 4 + note E_, 4 + note G_, 3 + note G#, 1 + note A_, 16 + octave 3 + note A_, 4 + octave 4 + note C_, 2 + note __, 2 + note E_, 4 + note D_, 12 + note C_, 4 + note __, 4 + octave 3 + note B_, 4 + note __, 4 + octave 4 + note F_, 8 + note G_, 12 + note F_, 8 + note __, 4 + note E_, 8 + note D_, 4 + note C_, 2 + note __, 2 + octave 3 + note B_, 4 + octave 4 + note C_, 2 + note __, 6 + octave 3 + note B_, 4 + note __, 4 + octave 4 + note C_, 4 + octave 3 + note A_, 16 + note __, 4 + octave 4 + note F_, 4 + note E_, 4 + note D_, 4 + note C_, 12 + octave 3 + note B_, 4 + note __, 4 + octave 4 + note C_, 4 + note D_, 4 + note D#, 4 + notetype $c, $83 + note E_, 16 + intensity $80 + note D_, 4 + note C#, 4 + note F_, 4 + notetype $6, $80 + note G_, 7 + note G#, 1 + intensity $87 + note A_, 12 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 3 + note G#, 1 + note A_, 4 + note E_, 2 + note __, 2 + note E_, 4 + note D_, 2 + note __, 2 + note C#, 4 + note D_, 12 + octave 3 + note B_, 4 + octave 4 + note F_, 4 + note G_, 12 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 4 + note G_, 4 + note D_, 2 + note __, 1 + note A#, 1 + note B_, 12 + octave 5 + note C_, 4 + octave 4 + note A_, 8 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + notetype $c, $87 + note F_, 10 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 8 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note E_, 16 + loopchannel 0, Music_EcruteakCity_branch_ef3f2 +; ef4e1 + +Music_EcruteakCity_Ch3: ; ef4e1 + stereopanning $ff +Music_EcruteakCity_branch_ef4e3: ; ef4e3 + vibrato $12, $25 + notetype $c, $25 + octave 3 + note C_, 2 + note G_, 2 + octave 4 + note D_, 2 + note E_, 10 + octave 3 + note C_, 2 + note A_, 2 + octave 4 + note E_, 2 + note F_, 10 + octave 3 + note C_, 2 + note G_, 2 + octave 4 + note D_, 2 + note E_, 10 + note G_, 4 + note F#, 4 + note F_, 4 + octave 3 + note B_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 4 + note D_, 2 + note E_, 10 + octave 3 + note C#, 2 + note G_, 2 + note A#, 2 + octave 4 + note D_, 2 + note __, 2 + note C#, 2 + note D_, 2 + note E_, 2 + octave 3 + note D_, 2 + note A_, 1 + note __, 1 + octave 4 + note E_, 2 + note F_, 1 + note __, 1 + note G#, 8 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + note F_, 2 + note G#, 2 + note B_, 2 + note G_, 1 + note G#, 5 + octave 3 + note C_, 2 + note G_, 2 + octave 4 + note D_, 2 + note E_, 2 + note G_, 2 + octave 5 + note C_, 2 + note D_, 2 + note E_, 2 + octave 3 + note C#, 2 + note A#, 2 + octave 4 + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note G_, 1 + note __, 1 + octave 3 + note F_, 8 + octave 4 + note A_, 2 + octave 5 + note C_, 1 + note __, 1 + note D_, 2 + note E_, 1 + note __, 1 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note G_, 2 + note B_, 2 + octave 4 + note D_, 2 + callchannel Music_EcruteakCity_branch_ef569 + octave 4 + note C_, 8 + note E_, 8 + note G_, 8 + note B_, 8 + note A#, 8 + note G_, 8 + note E_, 8 + note C#, 8 + notetype $c, $25 + callchannel Music_EcruteakCity_branch_ef569 + octave 4 + note C_, 8 + octave 3 + note G_, 8 + note E_, 8 + note D_, 8 + loopchannel 0, Music_EcruteakCity_branch_ef4e3 +; ef569 + +Music_EcruteakCity_branch_ef569: ; ef569 + octave 3 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 4 + note __, 2 + note C_, 1 + note __, 1 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 2 + note __, 2 + note F_, 1 + note __, 1 + note E_, 4 + note __, 2 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + note B_, 1 + note __, 1 + note A_, 4 + note __, 2 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 4 + note __, 2 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 4 + note __, 2 + octave 4 + note D_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A#, 1 + notetype $6, $25 + note __, 1 + note B_, 1 + endchannel +; ef5b1 + + diff --git a/crysaudio/music/elmslab.asm b/crysaudio/music/elmslab.asm new file mode 100644 index 00000000..86d8a7b8 --- /dev/null +++ b/crysaudio/music/elmslab.asm @@ -0,0 +1,544 @@ +Music_ElmsLab: ; ea040 + dbw $c0, Music_ElmsLab_Ch1 + dbw $01, Music_ElmsLab_Ch2 + dbw $02, Music_ElmsLab_Ch3 + dbw $03, Music_ElmsLab_Ch4 +; ea04c + +Music_ElmsLab_Ch1: ; ea04c + tempo 144 + volume $77 + dutycycle $3 + tone $0001 + vibrato $10, $15 + stereopanning $f0 + notetype $c, $b2 + octave 2 + note F_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + intensity $b6 + octave 3 + note C_, 8 + intensity $b2 + octave 2 + note A#, 2 + note A_, 2 + note G_, 2 + octave 3 + note C_, 8 + note F_, 4 + note F_, 4 + note F_, 8 + note A_, 4 + note A_, 4 + note A_, 2 +Music_ElmsLab_branch_ea075: ; ea075 + note __, 2 + note A_, 2 + note G#, 2 + note A_, 2 + intensity $b7 + octave 4 + note C_, 4 + intensity $b5 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + intensity $b4 + note F_, 8 + intensity $b5 + octave 3 + note A_, 2 + note G#, 2 + note A_, 2 + note F_, 2 + intensity $b7 + note F_, 8 + intensity $b5 + note A_, 2 + note G_, 2 + note F_, 2 + intensity $b2 + note G_, 4 + intensity $b5 + note A_, 2 + note G#, 2 + note A_, 2 + intensity $b7 + note F_, 4 + intensity $b5 + note C_, 4 + intensity $b7 + note D_, 8 + intensity $b4 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + intensity $b7 + note E_, 8 + intensity $b4 + note G_, 2 + note F_, 2 + note E_, 2 + note G_, 2 + intensity $b7 + note F_, 8 + intensity $b4 + note G_, 2 + note A_, 2 + note A#, 2 + note A_, 2 + intensity $b2 + note G_, 4 + intensity $b4 + note F_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + intensity $b2 + note G_, 6 + intensity $b7 + note F_, 4 + octave 4 + note C_, 2 + octave 3 + note F_, 4 + note D_, 2 + note A#, 4 + note A_, 4 + intensity $b4 + note G_, 2 + note F_, 2 + note G_, 2 + intensity $b2 + note A_, 6 + intensity $b7 + note E_, 4 + note A#, 2 + note E_, 6 + intensity $b3 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note G_, 2 + intensity $b2 + note E_, 6 + intensity $b4 + note F_, 4 + octave 4 + note C_, 4 + octave 3 + note F_, 2 + octave 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + intensity $b7 + note A#, 8 + octave 4 + note E_, 4 + note D_, 4 + note C_, 4 + octave 3 + note A#, 4 + octave 4 + note C_, 4 + note D_, 4 + note D#, 4 + note E_, 4 + intensity $b4 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note F_, 2 + note A_, 2 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note F_, 2 + note A_, 2 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note F_, 2 + note A_, 2 + intensity $b2 + note F_, 2 + note F_, 4 + loopchannel 0, Music_ElmsLab_branch_ea075 +; ea128 + +Music_ElmsLab_Ch2: ; ea128 + dutycycle $3 + vibrato $10, $26 + stereopanning $f + notetype $c, $c3 + octave 4 + note F_, 2 + note E_, 2 + note D_, 2 + octave 3 + note B_, 2 + intensity $c5 + octave 4 + note C_, 8 + intensity $c3 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note E_, 2 + intensity $c2 + note F_, 6 + octave 4 + note C_, 4 + note C_, 4 + note C_, 8 + note C_, 4 + note C_, 4 + note C_, 2 + stereopanning $ff +Music_ElmsLab_branch_ea14f: ; ea14f + intensity $c6 + octave 4 + note F_, 6 + intensity $c2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + intensity $c7 + note A_, 6 + intensity $c2 + note F_, 2 + intensity $c7 + note C_, 8 + intensity $c7 + note D_, 6 + intensity $c3 + note C#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 2 + intensity $c7 + note F_, 6 + intensity $c3 + note C_, 2 + intensity $c7 + octave 3 + note A_, 10 + intensity $c3 + note A#, 2 + note A#, 2 + octave 4 + note D_, 2 + intensity $c5 + note C_, 4 + octave 3 + note A#, 6 + intensity $c3 + octave 4 + note C_, 2 + note C_, 2 + note E_, 2 + intensity $c4 + note D_, 4 + note C_, 6 + intensity $c2 + note D_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + intensity $c2 + note G_, 4 + intensity $c6 + note C_, 4 + note D_, 4 + intensity $c4 + note E_, 6 + intensity $c3 + note F_, 2 + note F_, 2 + note G_, 2 + intensity $c7 + note A_, 4 + intensity $c3 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note G_, 1 + note F_, 2 + intensity $c7 + note D_, 11 + intensity $c3 + note E_, 2 + note E_, 2 + note F_, 2 + intensity $c7 + note G_, 4 + intensity $c3 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note F_, 1 + note D_, 2 + intensity $c7 + note C_, 11 + intensity $c4 + note F_, 2 + note F_, 2 + note G_, 2 + intensity $c7 + note A_, 4 + intensity $c4 + note G_, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note A#, 1 + octave 5 + note C_, 2 + note D_, 5 + intensity $c3 + note E_, 2 + note D_, 2 + intensity $c7 + note C_, 4 + octave 4 + note A#, 4 + note A_, 4 + note G_, 4 + octave 5 + note C_, 4 + octave 4 + note A#, 4 + note A_, 4 + note G_, 4 + intensity $b0 + note F_, 8 + intensity $a0 + note F_, 8 + intensity $a7 + note F_, 10 + intensity $c2 + note C_, 2 + note F_, 2 + intensity $c4 + octave 3 + note E_, 2 + loopchannel 0, Music_ElmsLab_branch_ea14f +; ea1fd + +Music_ElmsLab_Ch3: ; ea1fd + stereopanning $f + notetype $c, $25 + note __, 8 + note __, 14 + octave 3 + note C_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note C_, 2 + note D_, 2 + note E_, 2 +Music_ElmsLab_branch_ea216: ; ea216 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note D_, 2 + note A_, 2 + octave 2 + note A_, 2 + octave 3 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note A#, 2 + note D_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note D_, 2 + note A#, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note A_, 2 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note F_, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note F_, 2 + note B_, 2 + octave 4 + note C_, 2 + note __, 2 + note C_, 4 + octave 3 + note A#, 4 + note G_, 4 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note G_, 2 + note A#, 2 + note D_, 2 + note A#, 2 + note G_, 2 + note A#, 2 + note D_, 2 + note A_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note G_, 2 + note A#, 2 + note D_, 2 + note A#, 2 + note G_, 2 + note A#, 2 + note A_, 2 + note G_, 2 + note C_, 4 + note D_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G_, 4 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note A_, 2 + loopchannel 0, Music_ElmsLab_branch_ea216 +; ea2b1 + +Music_ElmsLab_Ch4: ; ea2b1 + stereopanning $f0 + togglenoise $0 + notetype $c + note __, 16 + note __, 2 +Music_ElmsLab_branch_ea2b9: ; ea2b9 + note G_, 4 + loopchannel 0, Music_ElmsLab_branch_ea2b9 +; ea2be + + diff --git a/crysaudio/music/evolution.asm b/crysaudio/music/evolution.asm new file mode 100644 index 00000000..1f9613e6 --- /dev/null +++ b/crysaudio/music/evolution.asm @@ -0,0 +1,212 @@ +Music_Evolution: ; f06e1 + dbw $c0, Music_Evolution_Ch1 + dbw $01, Music_Evolution_Ch2 + dbw $02, Music_Evolution_Ch3 + dbw $03, Music_Evolution_Ch4 +; f06ed + +Music_Evolution_Ch1: ; f06ed + ftempo 132 + volume $77 + vibrato $6, $34 + tone $0001 + dutycycle $2 + notetype $c, $92 + octave 3 + unknownmusic0xe0 $0, $4a + note C_, 1 + unknownmusic0xe0 $0, $4a + note G_, 1 + unknownmusic0xe0 $0, $4a + note C_, 1 + unknownmusic0xe0 $0, $4a + note G_, 1 + note __, 4 + dutycycle $3 + stereopanning $f +Music_Evolution_branch_f0713: ; f0713 + callchannel Music_Evolution_branch_f0737 + notetype $c, $a4 + note F#, 4 + callchannel Music_Evolution_branch_f0737 + notetype $c, $a4 + note F#, 4 + loopchannel 2, Music_Evolution_branch_f0713 + callchannel Music_Evolution_branch_f0743 + notetype $c, $a4 + note G#, 4 + callchannel Music_Evolution_branch_f0743 + notetype $c, $a4 + note G#, 4 + loopchannel 0, Music_Evolution_branch_f0713 +; f0737 + +Music_Evolution_branch_f0737: ; f0737 + notetype $c, $a2 + octave 3 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + note G_, 4 + note C_, 4 + endchannel +; f0743 + +Music_Evolution_branch_f0743: ; f0743 + notetype $c, $a2 + octave 3 + note D_, 4 + note A_, 4 + note D_, 4 + note A_, 4 + note D_, 4 + note A_, 4 + note D_, 4 + endchannel +; f074f + +Music_Evolution_Ch2: ; f074f + dutycycle $2 + vibrato $8, $25 + notetype $c, $a2 + octave 4 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + note __, 4 + dutycycle $3 + stereopanning $f0 +Music_Evolution_branch_f0761: ; f0761 + callchannel Music_Evolution_branch_f0787 + notetype $c, $b5 + note A_, 4 + callchannel Music_Evolution_branch_f0787 + notetype $c, $b5 + note B_, 4 + loopchannel 2, Music_Evolution_branch_f0761 + callchannel Music_Evolution_branch_f0793 + notetype $c, $b5 + note B_, 4 + callchannel Music_Evolution_branch_f0793 + notetype $c, $b5 + octave 4 + note C#, 4 + octave 3 + loopchannel 0, Music_Evolution_branch_f0761 +; f0787 + +Music_Evolution_branch_f0787: ; f0787 + notetype $c, $b2 + octave 3 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + endchannel +; f0793 + +Music_Evolution_branch_f0793: ; f0793 + notetype $c, $b2 + octave 3 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + note E_, 4 + note A_, 4 + endchannel +; f079f + +Music_Evolution_Ch3: ; f079f + notetype $c, $16 + note __, 8 +Music_Evolution_branch_f07a3: ; f07a3 + callchannel Music_Evolution_branch_f07bf + octave 3 + note A_, 4 + callchannel Music_Evolution_branch_f07bf + octave 3 + note B_, 4 + loopchannel 2, Music_Evolution_branch_f07a3 + callchannel Music_Evolution_branch_f07d5 + octave 3 + note B_, 4 + callchannel Music_Evolution_branch_f07d5 + octave 4 + note C#, 4 + loopchannel 0, Music_Evolution_branch_f07a3 +; f07bf + +Music_Evolution_branch_f07bf: ; f07bf + octave 2 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + endchannel +; f07d5 + +Music_Evolution_branch_f07d5: ; f07d5 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + endchannel +; f07eb + +Music_Evolution_Ch4: ; f07eb + togglenoise $5 + notetype $c + note __, 8 +Music_Evolution_branch_f07f0: ; f07f0 + stereopanning $f0 + note A#, 6 + note A#, 4 + stereopanning $f + note E_, 2 + note E_, 2 + note E_, 2 + loopchannel 0, Music_Evolution_branch_f07f0 +; f07fd + + diff --git a/crysaudio/music/gamecorner.asm b/crysaudio/music/gamecorner.asm new file mode 100644 index 00000000..4dd29e0a --- /dev/null +++ b/crysaudio/music/gamecorner.asm @@ -0,0 +1,823 @@ +Music_GameCorner: ; edd6d + dbw $c0, Music_GameCorner_Ch1 + dbw $01, Music_GameCorner_Ch2 + dbw $02, Music_GameCorner_Ch3 + dbw $03, Music_GameCorner_Ch4 +; edd79 + +Music_GameCorner_Ch1: ; edd79 + tempo 147 + volume $77 + stereopanning $f + notetype $c, $91 + note __, 8 +Music_GameCorner_branch_edd84: ; edd84 + intensity $91 + note __, 16 + 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 + note G#, 3 + note G#, 3 + note A#, 2 + note A#, 2 + note G#, 2 + note G_, 2 + intensity $71 +Music_GameCorner_branch_eddb1: ; eddb1 + 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: ; eddbb + 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: ; eddc5 + octave 4 + note D#, 1 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + loopchannel 4, Music_GameCorner_branch_eddc5 +Music_GameCorner_branch_eddd0: ; eddd0 + octave 4 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 + octave 4 + note A_, 1 + loopchannel 4, Music_GameCorner_branch_eddd0 +Music_GameCorner_branch_edddb: ; edddb + 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: ; edde5 + 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: ; eddef + octave 4 + note B_, 1 + octave 5 + note D_, 1 + note G_, 1 + note D_, 1 + loopchannel 4, Music_GameCorner_branch_eddef + octave 3 + note D_, 1 + note D_, 1 + note D_, 3 + note F_, 2 + note F_, 9 + loopchannel 0, Music_GameCorner_branch_edd84 +; ede03 + +Music_GameCorner_branch_ede03: ; ede03 + note __, 2 + octave 4 + note A#, 3 + note G_, 3 + note D#, 3 + octave 3 + note F_, 3 + note F_, 2 + note __, 2 + note G#, 3 + note G#, 3 + note A#, 2 + note A#, 2 + note G#, 1 + note A#, 3 + endchannel +; ede13 + +Music_GameCorner_branch_ede13: ; ede13 + note __, 2 + octave 4 + note A#, 3 + note G_, 3 + note D#, 3 + octave 3 + note F_, 3 + note F_, 2 + endchannel +; ede1c + +Music_GameCorner_Ch2: ; ede1c + stereopanning $ff + vibrato $8, $24 + notetype $c, $a1 + note __, 8 +Music_GameCorner_branch_ede25: ; ede25 + intensity $92 + dutycycle $1 + callchannel Music_GameCorner_branch_ede75 + octave 1 + note F_, 2 + octave 3 + note G#, 2 + octave 1 + note F_, 1 + octave 3 + note G#, 2 + intensity $a4 + note G#, 3 + intensity $92 + note G_, 2 + note A#, 1 + octave 4 + note C_, 3 + callchannel Music_GameCorner_branch_ede75 + octave 4 + note F_, 2 + note D#, 2 + note F_, 1 + note D#, 2 + intensity $a4 + note G_, 3 + note F_, 4 + dutycycle $2 + intensity $c7 + octave 3 + note D#, 1 + note F_, 1 + note G_, 6 + note F_, 6 + note C_, 4 + note D_, 6 + note D#, 6 + note F_, 4 + note D_, 6 + note C_, 6 + octave 2 + note A#, 4 + note A_, 4 + note __, 10 + octave 3 + note D#, 1 + note F_, 1 + note G_, 6 + note F_, 6 + note C_, 4 + note D_, 6 + note D#, 6 + note F_, 2 + note D#, 1 + note F_, 1 + note G_, 16 + intensity $92 + note G_, 1 + note G_, 1 + note G_, 3 + note A#, 2 + note A#, 9 + intensity $a4 + loopchannel 0, Music_GameCorner_branch_ede25 +; ede75 + +Music_GameCorner_branch_ede75: ; ede75 + octave 1 + note C_, 2 + octave 3 + note D#, 3 + note D#, 3 + note D#, 3 + note F_, 3 + note F_, 2 + octave 1 + note C_, 2 + octave 3 + note D#, 3 + note D#, 3 + note F_, 2 + note F_, 2 + note D#, 1 + note F_, 3 + octave 1 + note C_, 2 + octave 3 + note D#, 3 + note D#, 3 + note D#, 3 + note F_, 3 + note F_, 2 + octave 1 + note C_, 2 + octave 3 + note D#, 3 + note D#, 3 + note F_, 2 + note C_, 2 + note D#, 1 + note F_, 3 + octave 1 + note C_, 2 + octave 5 + note D_, 3 + octave 4 + note A#, 3 + note G_, 2 + note C_, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D#, 2 + note F_, 1 + note D#, 2 + intensity $a4 + note F_, 3 + note G_, 4 + intensity $92 + note F#, 1 + note F_, 1 + octave 1 + note C_, 2 + octave 5 + note D_, 3 + octave 4 + note A#, 3 + note G_, 2 + note C_, 2 + note D_, 2 + note D#, 2 + octave 1 + note F_, 1 + octave 4 + note F_, 1 + note D#, 2 + note G_, 1 + note D#, 2 + intensity $a4 + note A#, 3 + note A_, 2 + intensity $92 + note A#, 1 + octave 5 + note C_, 3 + octave 1 + note C_, 2 + octave 5 + note D_, 3 + octave 4 + note A#, 3 + note G_, 2 + note C_, 2 + note D_, 2 + note D#, 2 + note F_, 2 + note D#, 2 + note F_, 1 + note D#, 2 + intensity $a4 + note F_, 3 + note G_, 4 + intensity $92 + note F#, 1 + note F_, 1 + octave 1 + note C_, 2 + octave 5 + note D_, 3 + octave 4 + note A#, 3 + note G_, 2 + note C_, 2 + note D_, 2 + note D#, 2 + endchannel +; edee8 + +Music_GameCorner_Ch3: ; edee8 + vibrato $8, $22 + notetype $c, $14 + note __, 8 +Music_GameCorner_branch_edeef: ; edeef + stereopanning $ff + notetype $c, $14 + callchannel Music_GameCorner_branch_edfdd + callchannel Music_GameCorner_branch_edff8 + octave 4 + note G_, 1 + note A_, 3 + callchannel Music_GameCorner_branch_edfdd + callchannel Music_GameCorner_branch_edff8 + 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 + octave 2 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + octave 2 + note F_, 1 + octave 5 + note C_, 1 + octave 3 + note F_, 1 + octave 5 + note D#, 3 + note D_, 1 + note __, 1 + note D#, 1 + note F_, 1 + note __, 2 + callchannel Music_GameCorner_branch_edfdd + callchannel Music_GameCorner_branch_edff8 + octave 4 + note G_, 1 + note A_, 3 + callchannel Music_GameCorner_branch_edfdd + callchannel Music_GameCorner_branch_edff8 + 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 + octave 2 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + intensity $15 + callchannel Music_GameCorner_branch_ee03f + octave 2 + note C_, 2 + note __, 1 + note C_, 1 + octave 3 + note C_, 1 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note C_, 1 + octave 3 + note C_, 1 + octave 2 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note C_, 1 + note __, 1 + octave 3 + note C_, 1 + octave 2 + note F_, 2 + note __, 1 + note F_, 1 + octave 3 + note F_, 1 + octave 2 + note F_, 1 + note __, 1 + note F_, 1 + note F_, 1 + octave 3 + note F_, 1 + octave 2 + note F_, 2 + octave 3 + note F_, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note F_, 1 + callchannel Music_GameCorner_branch_ee03f + octave 2 + note G_, 2 + note __, 1 + note G_, 1 + octave 3 + note G_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note G_, 1 + octave 3 + note G_, 1 + octave 2 + note G_, 2 + octave 3 + note G_, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + octave 2 + note B_, 1 + note B_, 1 + note B_, 1 + note __, 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 4 + notetype $6, $15 + octave 3 + note D_, 1 + note C_, 1 + octave 2 + note B_, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + loopchannel 0, Music_GameCorner_branch_edeef +; edfdd + +Music_GameCorner_branch_edfdd: ; edfdd + octave 2 + note C_, 1 + octave 3 + note C_, 1 + octave 4 + note G_, 1 + note C_, 1 + octave 3 + note C_, 1 + octave 4 + note G_, 1 + note C_, 1 + octave 3 + note C_, 1 + octave 4 + note G_, 1 + note C_, 1 + octave 3 + note C_, 1 + octave 4 + note A_, 1 + note C_, 1 + octave 3 + note C_, 1 + octave 4 + note A_, 2 + endchannel +; edff8 + +Music_GameCorner_branch_edff8: ; edff8 + octave 2 + note C_, 1 + octave 3 + note C_, 1 + octave 4 + note G_, 1 + note C_, 1 + octave 3 + note C_, 1 + octave 4 + note G_, 1 + note C_, 1 + octave 3 + note C_, 1 + octave 4 + note A#, 1 + note __, 1 + note A_, 1 + note __, 1 + endchannel +; ee00c + +Music_GameCorner_branch_ee00c: ; ee00c + octave 2 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note D_, 3 + endchannel +; ee024 + +Music_GameCorner_branch_ee024: ; ee024 + octave 2 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note C_, 1 + octave 4 + note F_, 1 + octave 3 + note F_, 1 + octave 5 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note D_, 1 + octave 3 + note F_, 1 + note __, 1 + endchannel +; ee03f + +Music_GameCorner_branch_ee03f: ; ee03f + octave 2 + note F_, 2 + note __, 1 + note F_, 1 + octave 3 + note F_, 1 + octave 2 + note F_, 1 + note __, 1 + note F_, 1 + note F_, 1 + octave 3 + note F_, 1 + octave 2 + note F_, 2 + octave 3 + note F_, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note F_, 1 + octave 2 + note G_, 2 + note __, 1 + note G_, 1 + octave 3 + note G_, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note G_, 1 + octave 3 + note G_, 1 + octave 2 + note F_, 1 + octave 3 + note F_, 1 + octave 2 + note D#, 1 + octave 3 + note D#, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + endchannel +; ee06f + +Music_GameCorner_Ch4: ; ee06f + 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: ; ee07f + callchannel Music_GameCorner_branch_ee106 +Music_GameCorner_branch_ee082: ; 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: ; 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: ; 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: ; 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: ; 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: ; 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 +; ee106 + +Music_GameCorner_branch_ee106: ; 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 +; ee10f + +Music_GameCorner_branch_ee10f: ; 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 +; ee119 + + diff --git a/crysaudio/music/goldenrodcity.asm b/crysaudio/music/goldenrodcity.asm new file mode 100644 index 00000000..0a94a995 --- /dev/null +++ b/crysaudio/music/goldenrodcity.asm @@ -0,0 +1,489 @@ +Music_GoldenrodCity: ; eb453 + dbw $c0, Music_GoldenrodCity_Ch1 + dbw $01, Music_GoldenrodCity_Ch2 + dbw $02, Music_GoldenrodCity_Ch3 + dbw $03, Music_GoldenrodCity_Ch4 +; eb45f + +Music_GoldenrodCity_Ch1: ; eb45f + stereopanning $f + tempo 176 + volume $77 + notetype $c, $97 + note __, 16 + note __, 16 + note __, 16 + note __, 16 +Music_GoldenrodCity_branch_eb46d: ; eb46d + dutycycle $0 + callchannel Music_GoldenrodCity_branch_eb4a9 + octave 3 + note G#, 1 + octave 4 + note C_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note F#, 1 + note G#, 1 + octave 5 + note C_, 1 + intensity $71 + dutycycle $0 + callchannel Music_GoldenrodCity_branch_eb4d1 + intensity $77 + note D#, 2 + note F_, 2 + note F#, 2 + note G#, 4 + intensity $71 + callchannel Music_GoldenrodCity_branch_eb4d1 + note D#, 1 + note F#, 1 + intensity $77 + 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 + note C_, 4 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + loopchannel 0, Music_GoldenrodCity_branch_eb46d +; eb4a9 + +Music_GoldenrodCity_branch_eb4a9: ; eb4a9 + octave 4 + note C#, 2 + octave 3 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + octave 4 + note C_, 2 + octave 3 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note A#, 2 + note F_, 1 + note __, 1 + note C#, 2 + note F_, 1 + note __, 1 + note D#, 2 + note C_, 2 + note C#, 2 + note D#, 2 + note F#, 2 + note C#, 1 + note __, 3 + note C#, 1 + note __, 1 + note F#, 2 + note C#, 1 + note __, 1 + note F#, 2 + note A#, 2 + note C#, 2 + note D#, 2 + note G#, 2 + octave 4 + note C#, 2 + endchannel +; eb4d1 + +Music_GoldenrodCity_branch_eb4d1: ; eb4d1 + octave 4 + note F_, 1 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + note C#, 1 + octave 3 + note G#, 1 + note F_, 1 + note G#, 1 + octave 4 + note C#, 1 + note F_, 1 + note C#, 1 + note F_, 1 + note D#, 1 + note C_, 1 + octave 3 + note G#, 1 + octave 4 + note C_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note F#, 1 + note C_, 1 + octave 3 + note G#, 1 + note F#, 1 + note G#, 1 + octave 4 + note C_, 1 + note D#, 1 + note C_, 1 + note D#, 1 + note C#, 1 + octave 3 + note A#, 1 + note F#, 1 + note A#, 1 + octave 4 + note C#, 1 + note F_, 1 + note C#, 1 + note F_, 1 + octave 3 + note A#, 1 + note F#, 1 + note C#, 1 + note F#, 1 + note A#, 1 + octave 4 + note C#, 1 + octave 3 + note A#, 1 + octave 4 + note C#, 1 + note D#, 1 + note C_, 1 + octave 3 + note G#, 1 + octave 4 + note C_, 1 + note D#, 1 + note F#, 1 + endchannel +; eb519 + +Music_GoldenrodCity_Ch2: ; eb519 + stereopanning $f0 + vibrato $12, $23 + dutycycle $2 + notetype $c, $97 +Music_GoldenrodCity_branch_eb523: ; eb523 + intensity $97 + callchannel Music_GoldenrodCity_branch_eb555 + octave 4 + note F_, 2 + note F#, 2 + note G#, 2 + note F_, 2 + note D#, 8 + callchannel Music_GoldenrodCity_branch_eb555 + 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 + 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 + note F_, 2 + note D#, 2 + note C#, 2 + note C_, 2 + octave 4 + note G#, 2 + loopchannel 0, Music_GoldenrodCity_branch_eb523 +; eb555 + +Music_GoldenrodCity_branch_eb555: ; eb555 + octave 4 + note F_, 4 + note C#, 4 + note D#, 4 + note C_, 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 6 + octave 3 + note G#, 1 + octave 3 + note A_, 1 + note A#, 4 + octave 4 + note C#, 4 + octave 3 + note A#, 2 + octave 4 + note A#, 2 + note G#, 2 + note F#, 2 + dutycycle $1 + endchannel +; eb572 + +Music_GoldenrodCity_branch_eb572: ; eb572 + note C#, 6 + note F_, 6 + note C#, 4 + note C_, 6 + note D#, 6 + note C_, 2 + octave 4 + note G#, 1 + note A_, 1 + note A#, 6 + octave 5 + note C#, 6 + octave 4 + note A#, 4 + octave 5 + note C_, 4 + note D#, 2 + endchannel +; eb584 + +Music_GoldenrodCity_Ch3: ; eb584 + stereopanning $ff + vibrato $8, $23 + notetype $c, $25 +Music_GoldenrodCity_branch_eb58c: ; eb58c + callchannel Music_GoldenrodCity_branch_eb5aa + callchannel Music_GoldenrodCity_branch_eb5aa + callchannel Music_GoldenrodCity_branch_eb5d2 + note __, 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 + octave 3 + note G#, 2 + note F#, 2 + note D#, 2 + octave 2 + note G#, 2 + loopchannel 0, Music_GoldenrodCity_branch_eb58c +; eb5aa + +Music_GoldenrodCity_branch_eb5aa: ; eb5aa + octave 3 + note C#, 4 + note __, 2 + note C#, 1 + note __, 1 + note C_, 4 + note __, 2 + note C_, 1 + note __, 1 + octave 2 + note A#, 4 + note __, 2 + note A#, 1 + note __, 1 + note G#, 4 + note __, 2 + note G#, 1 + note __, 1 + note F#, 4 + note __, 2 + note F#, 1 + note __, 1 + octave 3 + note D#, 4 + note __, 2 + note D#, 1 + note __, 1 + note G#, 4 + note __, 2 + note G#, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + note G#, 3 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + endchannel +; eb5d2 + +Music_GoldenrodCity_branch_eb5d2: ; eb5d2 + note C#, 1 + note __, 1 + octave 4 + note C#, 1 + octave 3 + note C#, 1 + note __, 2 + note C#, 1 + note __, 5 + octave 4 + note C_, 1 + note C#, 1 + octave 3 + note G#, 2 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + octave 3 + note C_, 1 + note __, 2 + note C_, 1 + note __, 5 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note G#, 2 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note A#, 1 + octave 2 + note A#, 1 + note __, 2 + note A#, 1 + note __, 5 + octave 3 + note A_, 1 + note A#, 1 + note F#, 2 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note G#, 1 + octave 2 + note G#, 1 + note __, 2 + note G#, 1 + endchannel +; eb606 + +Music_GoldenrodCity_Ch4: ; eb606 + 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: ; 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: ; 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 +; eb663 + +Music_GoldenrodCity_branch_eb663: ; 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 +; eb66d + +Music_GoldenrodCity_branch_eb66d: ; 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 +; eb676 + + diff --git a/crysaudio/music/goldsilveropening.asm b/crysaudio/music/goldsilveropening.asm new file mode 100644 index 00000000..4459d1ba --- /dev/null +++ b/crysaudio/music/goldsilveropening.asm @@ -0,0 +1,621 @@ +Music_GoldSilverOpening: ; f7055 + dbw $80, Music_GoldSilverOpening_Ch1 + dbw $01, Music_GoldSilverOpening_Ch2 + dbw $02, Music_GoldSilverOpening_Ch3 +; f705e + +Music_GoldSilverOpening_Ch1: ; f705e + ftempo 256 + volume $77 + tone $0001 + dutycycle $2 + stereopanning $f0 + notetype $c, $b7 + octave 1 + note G#, 16 + note G#, 16 + ftempo 168 + dutycycle $3 + notetype $6, $c7 + octave 3 + note F_, 12 + note A_, 4 + octave 4 + note C_, 12 + octave 3 + note B_, 2 + note A#, 2 + note G_, 12 + note A#, 4 + octave 4 + note D#, 12 + note D_, 2 + note C#, 2 + notetype $6, $b5 + note C_, 8 + octave 3 + note F_, 8 + note A_, 8 + note B_, 4 + octave 4 + note C_, 4 + notetype $6, $b3 + octave 3 + note A#, 8 + note C#, 8 + octave 2 + note F#, 8 + octave 1 + note B_, 8 + notetype $6, $b2 + note __, 4 + octave 3 + note A#, 4 + note A#, 8 + note G#, 4 + note G#, 8 + note G_, 4 + note G_, 8 + note F#, 4 + note F#, 8 + octave 2 + note A_, 4 + note A_, 8 + note G#, 4 + note G#, 8 + note G_, 4 + note G_, 8 + note F#, 4 + note A_, 8 + note A_, 4 + note A_, 8 + note G#, 6 + note G#, 6 + note F#, 4 + note G_, 4 + note F_, 4 + notetype $8, $b3 + octave 4 + note F_, 1 + note G_, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 5 + note C_, 1 + dutycycle $2 + notetype $c, $b3 + note D_, 1 + note C#, 1 + note D_, 4 + note A_, 1 + note G#, 1 + note A_, 4 + octave 4 + note A#, 2 + octave 5 + note D_, 2 + note F_, 2 + note G_, 6 + note D#, 2 + note D_, 2 + note C_, 2 + note D#, 4 + note F#, 2 + dutycycle $3 + notetype $8, $92 + note A_, 1 + note F_, 1 + note D#, 1 + note C_, 1 + octave 4 + note A_, 1 + note G_, 1 + note F_, 1 + note D#, 1 + note C_, 1 + octave 3 + note A_, 3 + notetype $c, $b2 + note A#, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note D#, 2 + intensity $c2 + note F_, 2 + note G_, 2 + note A_, 16 + endchannel +; f70f8 + +Music_GoldSilverOpening_Ch2: ; f70f8 + tone $0001 + stereopanning $f + notetype $c, $b7 + dutycycle $2 + octave 2 + note C_, 16 + note C_, 16 + dutycycle $3 + notetype $c, $b2 + note __, 2 + notetype $6, $62 + octave 1 + note F_, 2 + note A_, 2 + octave 2 + note C_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + octave 3 + note C_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + octave 5 + note C_, 2 + note E_, 2 + octave 1 + note D#, 2 + note G_, 2 + note A#, 2 + octave 2 + note D_, 2 + note D#, 2 + note G_, 2 + note A#, 2 + octave 3 + note D_, 2 + note D#, 2 + note G_, 2 + note A#, 2 + octave 4 + note D_, 2 + note D#, 2 + note G_, 2 + notetype $c, $b7 + octave 1 + note F_, 16 + intensity $83 + octave 4 + note F_, 2 + intensity $81 + note D_, 2 + intensity $93 + note G#, 2 + intensity $91 + note F_, 2 + intensity $a3 + octave 5 + note C#, 2 + intensity $a1 + octave 4 + note A#, 2 + intensity $b3 + octave 5 + note F#, 2 + intensity $c1 + note D#, 2 + intensity $b3 + octave 1 + note A#, 2 + notetype $6, $b2 + octave 4 + note D_, 4 + note D_, 4 + octave 1 + note F_, 4 + octave 4 + note D_, 4 + note D_, 4 + octave 2 + note C_, 4 + octave 4 + note D#, 4 + note D#, 4 + octave 1 + note F_, 4 + octave 4 + note D#, 4 + note D#, 4 + octave 1 + note A#, 4 + octave 3 + note D_, 4 + note D_, 4 + octave 1 + note B_, 4 + octave 3 + note D_, 4 + note D_, 4 + octave 2 + note C_, 4 + octave 3 + note D#, 4 + note D#, 4 + octave 1 + note B_, 4 + octave 3 + note D#, 4 + note F#, 4 + octave 1 + note A#, 4 + octave 3 + note D_, 4 + note D_, 4 + octave 1 + note B_, 4 + octave 3 + note D_, 6 + note D_, 2 + octave 2 + note C_, 4 + octave 3 + note D#, 4 + note D#, 16 + octave 2 + note D#, 2 + octave 3 + note G_, 4 + note G_, 4 + note G_, 2 + octave 2 + note D#, 4 + octave 3 + note F#, 4 + note F#, 4 + octave 2 + note D_, 2 + octave 3 + note F_, 4 + note F_, 4 + note F_, 2 + octave 2 + note G_, 4 + octave 3 + note B_, 4 + note B_, 4 + octave 2 + note C_, 4 + octave 3 + note D#, 4 + note D#, 4 + octave 2 + note C_, 4 + octave 3 + note D#, 4 + note D#, 16 + notetype $6, $a2 + note F_, 4 + note G_, 4 + note G#, 4 + notetype $6, $c2 + note A_, 4 + note A#, 4 + octave 4 + note C_, 4 + notetype $6, $d2 + octave 3 + note A_, 4 + octave 4 + note C_, 4 + note D#, 16 + endchannel +; f71c8 + +Music_GoldSilverOpening_Ch3: ; f71c8 + notetype $6, $10 + octave 2 + note D_, 4 + notetype $6, $20 + note D_, 4 + notetype $6, $30 + note D_, 4 + note __, 12 + note __, 8 + notetype $6, $10 + octave 2 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 6 + note D_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 6 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 6 + note D_, 1 + note __, 1 + notetype $8, $10 + note F_, 1 + octave 5 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note F_, 1 + note A_, 1 + note F_, 1 + octave 4 + note B_, 1 + octave 5 + note F_, 1 + octave 4 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note F_, 1 + note A_, 1 + note F_, 1 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + octave 3 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note F_, 1 + octave 5 + note A_, 3 + notetype $c, $10 + note G_, 1 + note __, 1 + octave 6 + note C_, 2 + octave 5 + note A#, 1 + note __, 1 + octave 6 + note F_, 2 + note D#, 1 + note __, 1 + note A#, 2 + note G#, 1 + note __, 1 + note __, 16 + note __, 4 + notetype $6, $10 + octave 2 + note G_, 1 + note __, 3 + note A_, 2 + note __, 2 + octave 5 + note F_, 12 + note D_, 4 + note D_, 6 + note F_, 2 + note D#, 12 + note G#, 2 + note __, 2 + note F#, 6 + note D#, 2 + note F_, 12 + note D_, 2 + note __, 2 + note D#, 6 + note F_, 2 + note G_, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 2 + note __, 2 + note A_, 4 + note D#, 4 + note F_, 2 + note __, 2 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A#, 1 + note __, 9 + notetype $c, $10 + note __, 14 + octave 3 + note F_, 2 + note D#, 1 + note __, 1 + note C_, 1 + note __, 13 + endchannel +; f7308 + + diff --git a/crysaudio/music/goldsilveropening2.asm b/crysaudio/music/goldsilveropening2.asm new file mode 100644 index 00000000..005983e9 --- /dev/null +++ b/crysaudio/music/goldsilveropening2.asm @@ -0,0 +1,224 @@ +Music_GoldSilverOpening2: ; f7308 + dbw $c0, Music_GoldSilverOpening2_Ch1 + dbw $01, Music_GoldSilverOpening2_Ch2 + dbw $02, Music_GoldSilverOpening2_Ch3 + dbw $03, Music_GoldSilverOpening2_Ch4 +; f7314 + +Music_GoldSilverOpening2_Ch1: ; f7314 + ftempo 92 + volume $77 + dutycycle $3 + tone $0002 + stereopanning $f + notetype $c, $3d + octave 3 + note D#, 8 +Music_GoldSilverOpening2_branch_f7325: ; f7325 + notetype $c, $c1 + octave 3 + note D_, 2 + note D_, 2 + note D_, 2 + intensity $b7 + note D#, 10 + intensity $c1 + note D_, 2 + note D_, 2 + note D_, 2 + intensity $b7 + note F_, 4 + note D#, 4 + note C_, 2 + loopchannel 2, Music_GoldSilverOpening2_branch_f7325 + intensity $c1 + note D_, 2 + note D_, 2 + note D_, 2 + intensity $b7 + note D#, 10 + intensity $c1 + note D_, 2 + note D_, 2 + note D_, 2 + intensity $b7 + note F_, 4 + note G_, 4 + note A#, 2 + intensity $b0 + note A_, 16 + note A_, 16 + intensity $b2 + octave 4 + note D_, 16 + endchannel +; f7358 + +Music_GoldSilverOpening2_Ch2: ; f7358 + dutycycle $3 + vibrato $14, $14 + stereopanning $f0 + notetype $c, $3f + octave 3 + note A#, 8 + notetype $c, $d1 + octave 3 + note A_, 2 + note A_, 2 + note A_, 2 + intensity $c7 + note A#, 10 + intensity $d1 + note A_, 2 + note A_, 2 + note A_, 2 + intensity $c7 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + note G_, 2 + intensity $d1 + note A_, 2 + note A_, 2 + note A_, 2 + intensity $c7 + note A#, 10 + intensity $d1 + note A_, 2 + note A_, 2 + note A_, 2 + intensity $c7 + octave 4 + note C_, 4 + note C#, 4 + note D#, 2 + intensity $c7 + note D_, 8 + note D#, 8 + note F_, 8 + note A#, 8 + intensity $b0 + octave 5 + note D_, 16 + note D_, 16 + intensity $c2 + note D_, 16 + endchannel +; f739c + +Music_GoldSilverOpening2_Ch3: ; f739c + notetype $c, $17 + note __, 8 + octave 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A#, 8 + note __, 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 4 + note F_, 4 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note C_, 2 + note D#, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note C_, 2 + note D#, 2 + note D_, 2 + note F#, 2 + note A#, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + note A_, 2 + note F#, 2 + note D#, 2 + note D_, 2 + note F#, 2 + note A#, 2 + octave 3 + note D_, 2 + octave 2 + note A#, 2 + note F#, 2 + note A#, 2 + octave 3 + note C#, 2 + note D_, 2 + note __, 14 + endchannel +; f73ea + +Music_GoldSilverOpening2_Ch4: ; f73ea + 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: ; 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 +; f7411 + + diff --git a/crysaudio/music/gym.asm b/crysaudio/music/gym.asm new file mode 100644 index 00000000..089ef90d --- /dev/null +++ b/crysaudio/music/gym.asm @@ -0,0 +1,576 @@ +Music_Gym: ; f48ae + dbw $c0, Music_Gym_Ch1 + dbw $01, Music_Gym_Ch2 + dbw $02, Music_Gym_Ch3 + dbw $03, Music_Gym_Ch4 +; f48ba + +Music_Gym_Ch1: ; f48ba + tempo 156 + volume $77 + stereopanning $f + vibrato $12, $24 + dutycycle $1 + notetype $c, $b7 +Music_Gym_branch_f48c9: ; f48c9 + octave 4 + note F#, 2 + octave 2 + note A_, 1 + note A_, 1 + note A_, 1 + note __, 3 + octave 4 + note E_, 2 + octave 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 3 + octave 4 + note D_, 2 + octave 2 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + octave 3 + note D_, 1 + note D_, 1 + note B_, 1 + note G_, 1 + note D_, 1 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note A_, 1 + note E_, 1 + octave 4 + note E_, 1 + octave 3 + note A_, 12 + note F#, 2 + note A_, 2 + note G_, 1 + note __, 2 + note E_, 1 + note E_, 2 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 8 + note A_, 4 + note F#, 2 + note A_, 2 + note E_, 1 + note __, 1 + note E_, 1 + note F#, 1 + note G_, 4 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + octave 4 + note C_, 2 + note D_, 6 + octave 3 + note A_, 2 + note F#, 2 + note E_, 2 + note G_, 2 + note A_, 2 + note B_, 1 + note __, 2 + note G_, 1 + note G_, 4 + octave 4 + note E_, 1 + note __, 2 + note C_, 1 + note C_, 2 + octave 3 + note B_, 1 + note A#, 1 + note A_, 12 + note F#, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 2 + note C_, 2 + note E_, 2 + note C_, 1 + note E_, 1 + note G_, 4 + note D_, 6 + octave 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + octave 4 + note F#, 3 + note G_, 4 + note F#, 4 + note E_, 4 + note C_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note E_, 1 + note __, 2 + octave 3 + note B_, 4 + note F#, 2 + note D_, 2 + note F#, 2 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + octave 4 + note D_, 4 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + note G_, 1 + octave 4 + note E_, 4 + note F#, 6 + octave 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note A_, 1 + octave 4 + note F#, 3 + note A_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 1 + octave 3 + note B_, 1 + note F#, 1 + octave 4 + note E_, 1 + note F#, 4 + note E_, 1 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note F#, 1 + note G_, 4 + note A_, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note A_, 4 + octave 5 + note D_, 4 + octave 4 + note A_, 1 + note G_, 1 + note F#, 1 + note E_, 1 + loopchannel 0, Music_Gym_branch_f48c9 +; f497c + +Music_Gym_Ch2: ; f497c + dutycycle $1 + stereopanning $f0 +Music_Gym_branch_f4980: ; f4980 + notetype $c, $c3 + octave 2 + note D_, 2 + octave 1 + note D_, 1 + note D_, 1 + note D_, 2 + note A_, 1 + octave 2 + note F#, 1 + note C_, 2 + octave 1 + note C_, 1 + note C_, 1 + note C_, 2 + octave 2 + note G_, 1 + note E_, 1 + octave 1 + note G_, 2 + octave 1 + note G_, 1 + note G_, 1 + note G_, 2 + octave 1 + note G_, 1 + note G_, 1 + note A_, 4 + octave 2 + note A_, 2 + octave 3 + note C_, 1 + note C#, 1 + callchannel Music_Gym_branch_f49e9 + octave 3 + note E_, 2 + note C_, 1 + note C#, 1 + callchannel Music_Gym_branch_f49e9 + octave 3 + note C_, 1 + note E_, 1 + note G_, 1 + octave 4 + note C_, 1 + intensity $d2 + callchannel Music_Gym_branch_f4a15 + octave 1 + note F#, 1 + note B_, 1 + note F#, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + note A#, 4 + note A#, 2 + note F_, 1 + note F_, 1 + note G_, 1 + octave 2 + note C_, 1 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note E_, 2 + callchannel Music_Gym_branch_f4a15 + octave 1 + note G_, 1 + octave 2 + note C_, 1 + octave 1 + note G_, 2 + octave 2 + note E_, 2 + note C_, 2 + note D_, 4 + note D_, 2 + octave 1 + note A_, 1 + note A_, 1 + note A_, 1 + octave 2 + note D_, 1 + octave 1 + note A_, 2 + octave 2 + note F#, 2 + note D_, 2 + loopchannel 0, Music_Gym_branch_f4980 +; f49e9 + +Music_Gym_branch_f49e9: ; f49e9 + octave 3 + note D_, 3 + octave 2 + note D_, 3 + note D_, 2 + note D_, 1 + note D_, 1 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note C_, 3 + octave 2 + note C_, 3 + note C_, 2 + note C_, 1 + note C_, 1 + note C_, 2 + octave 3 + note E_, 2 + note C_, 1 + note C#, 1 + note D_, 3 + octave 2 + note D_, 3 + note D_, 2 + note D_, 1 + note D_, 1 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note C_, 3 + octave 2 + note C_, 3 + note C_, 2 + note C_, 1 + note C_, 1 + note C_, 2 + endchannel +; f4a15 + +Music_Gym_branch_f4a15: ; f4a15 + octave 2 + note D_, 4 + note D_, 2 + octave 1 + note A_, 1 + note A_, 1 + note A_, 1 + octave 2 + note D_, 1 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + note D_, 2 + note C_, 4 + note C_, 2 + octave 1 + note G_, 1 + note G_, 1 + note G_, 1 + octave 2 + note C_, 1 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note C_, 2 + octave 1 + note B_, 2 + note __, 2 + note B_, 2 + note F#, 1 + note F#, 1 + endchannel +; f4a37 + +Music_Gym_Ch3: ; f4a37 + vibrato $14, $23 + stereopanning $ff +Music_Gym_branch_f4a3c: ; f4a3c + notetype $c, $14 + octave 6 + note D_, 2 + octave 4 + note D_, 1 + note D_, 1 + note D_, 1 + note __, 1 + octave 5 + note A_, 1 + octave 6 + note D_, 1 + note C_, 2 + octave 4 + note C_, 1 + note C_, 1 + note C_, 1 + note __, 1 + octave 5 + note A_, 1 + octave 6 + note C_, 1 + octave 5 + note B_, 2 + octave 3 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + octave 5 + note B_, 1 + note B_, 1 + note B_, 4 + octave 6 + note C#, 4 + octave 5 + note D_, 12 + octave 4 + note A_, 2 + octave 5 + note D_, 2 + note E_, 1 + note __, 2 + note C_, 1 + note C_, 4 + note G_, 4 + note E_, 4 + note D_, 12 + octave 4 + note A_, 2 + octave 5 + note D_, 2 + note C_, 1 + note __, 1 + note C_, 1 + note D_, 1 + note E_, 8 + note __, 4 + note F#, 12 + note E_, 2 + note F#, 2 + note G_, 1 + note __, 2 + note E_, 1 + note E_, 4 + octave 6 + note C_, 1 + note __, 2 + octave 5 + note G_, 1 + note G_, 4 + note F#, 12 + note E_, 2 + note F#, 2 + note G_, 2 + note E_, 1 + note G_, 1 + octave 6 + note C_, 8 + octave 5 + note B_, 4 + intensity $13 + callchannel Music_Gym_branch_f4ab3 + note __, 2 + note A_, 2 + octave 6 + note D_, 2 + octave 5 + note A_, 2 + octave 6 + note C_, 4 + octave 5 + note A#, 4 + note A_, 4 + note G_, 4 + callchannel Music_Gym_branch_f4ab3 + note A_, 1 + note __, 1 + note A_, 1 + note B_, 1 + octave 6 + note C_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note E_, 1 + note F#, 8 + note E_, 4 + loopchannel 0, Music_Gym_branch_f4a3c +; f4ab3 + +Music_Gym_branch_f4ab3: ; f4ab3 + octave 5 + note A_, 6 + octave 6 + note D_, 6 + octave 5 + note A_, 4 + octave 6 + note C_, 4 + octave 5 + note B_, 4 + note A_, 4 + note G_, 4 + note F#, 1 + note __, 1 + note F#, 1 + note G_, 1 + note A_, 4 + endchannel +; f4ac5 + +Music_Gym_Ch4: ; f4ac5 + togglenoise $4 +Music_Gym_branch_f4ac7: ; 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: ; 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: ; 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 +; f4b0c + + diff --git a/crysaudio/music/gymleadervictory.asm b/crysaudio/music/gymleadervictory.asm new file mode 100644 index 00000000..59771300 --- /dev/null +++ b/crysaudio/music/gymleadervictory.asm @@ -0,0 +1,432 @@ +Music_GymLeaderVictory: ; f462c + dbw $c0, Music_GymLeaderVictory_Ch1 + dbw $01, Music_GymLeaderVictory_Ch2 + dbw $02, Music_GymLeaderVictory_Ch3 + dbw $03, Music_GymLeaderVictory_Ch4 +; f4638 + +Music_GymLeaderVictory_Ch1: ; f4638 + ftempo 116 + volume $77 + vibrato $12, $34 + dutycycle $3 + tone $0001 + notetype $c, $b7 + octave 4 + note D_, 6 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + note F#, 6 + note D_, 1 + note F#, 1 + note A_, 6 + note F#, 1 + note A_, 1 + octave 5 + note D_, 8 + stereopanning $f +Music_GymLeaderVictory_branch_f4658: ; f4658 + dutycycle $1 + callchannel Music_GymLeaderVictory_branch_f4689 + octave 4 + note C#, 4 + note E_, 4 + callchannel Music_GymLeaderVictory_branch_f4689 + note F#, 8 + loopchannel 2, Music_GymLeaderVictory_branch_f4658 + dutycycle $2 + callchannel Music_GymLeaderVictory_branch_f46a0 + note A_, 4 + note G_, 4 + note F#, 6 + note D_, 1 + note E_, 1 + note F#, 6 + note E_, 2 + note D_, 8 + note C#, 8 + dutycycle $3 + callchannel Music_GymLeaderVictory_branch_f46a0 + note C#, 4 + note E_, 4 + note G_, 6 + note A_, 1 + note G_, 1 + note A_, 6 + note G_, 2 + intensity $87 + note F#, 16 + loopchannel 0, Music_GymLeaderVictory_branch_f4658 +; f4689 + +Music_GymLeaderVictory_branch_f4689: ; f4689 + intensity $91 + octave 3 + note F#, 2 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 1 + note F#, 1 + note E_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 1 + note E_, 1 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 1 + note D_, 1 + endchannel +; f46a0 + +Music_GymLeaderVictory_branch_f46a0: ; f46a0 + intensity $87 + octave 3 + note F#, 14 + note D_, 1 + note F#, 1 + note A_, 8 + note F#, 4 + note A_, 1 + note G#, 1 + note F#, 1 + note A_, 1 + note G#, 14 + note E_, 1 + note G#, 1 + note B_, 8 + octave 4 + note D_, 4 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 14 + octave 3 + note A_, 1 + octave 4 + note C#, 1 + note E_, 8 + endchannel +; f46bd + +Music_GymLeaderVictory_Ch2: ; f46bd + vibrato $12, $34 + dutycycle $3 + notetype $c, $d7 + octave 4 + note A_, 6 + note F#, 1 + note A_, 1 + octave 5 + note D_, 6 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + note F#, 16 +Music_GymLeaderVictory_branch_f46d0: ; f46d0 + dutycycle $3 + intensity $a1 + callchannel Music_GymLeaderVictory_branch_f4711 + note A_, 4 + note A_, 4 + callchannel Music_GymLeaderVictory_branch_f4711 + note D_, 6 + dutycycle $2 + note B_, 1 + octave 5 + note C#, 1 + callchannel Music_GymLeaderVictory_branch_f4711 + note A_, 4 + note A_, 4 + callchannel Music_GymLeaderVictory_branch_f4711 + note D_, 8 + dutycycle $3 + callchannel Music_GymLeaderVictory_branch_f4720 + note F#, 4 + note E_, 4 + note D_, 14 + octave 4 + note B_, 2 + intensity $a7 + note A_, 16 + dutycycle $2 + callchannel Music_GymLeaderVictory_branch_f4720 + octave 4 + note A_, 4 + octave 5 + note C#, 4 + note D_, 14 + note E_, 2 + intensity $a6 + note D_, 12 + note __, 2 + dutycycle $3 + octave 4 + note B_, 1 + octave 5 + note C#, 1 + loopchannel 0, Music_GymLeaderVictory_branch_f46d0 +; f4711 + +Music_GymLeaderVictory_branch_f4711: ; f4711 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 4 + octave 5 + note C#, 2 + octave 4 + note B_, 2 + note A_, 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + endchannel +; f4720 + +Music_GymLeaderVictory_branch_f4720: ; f4720 + intensity $98 + note A_, 6 + note F#, 1 + note A_, 1 + octave 5 + note D_, 8 + note D_, 16 + octave 4 + note B_, 6 + note G#, 1 + note B_, 1 + octave 5 + note E_, 8 + note E_, 16 + octave 4 + note G_, 6 + note E_, 1 + note G_, 1 + octave 5 + note C#, 8 + note C#, 8 + endchannel +; f4737 + +Music_GymLeaderVictory_Ch3: ; f4737 + notetype $c, $25 + octave 3 + note F#, 16 + note D_, 10 + octave 2 + note A_, 2 + note B_, 2 + octave 3 + note C#, 2 + stereopanning $f0 +Music_GymLeaderVictory_branch_f4744: ; f4744 + note D_, 2 + note __, 4 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note __, 4 + octave 2 + note A_, 2 + note B_, 2 + note __, 4 + note G_, 2 + note A_, 2 + note __, 2 + octave 3 + note C#, 4 + note D_, 2 + note __, 4 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note __, 4 + octave 2 + note A_, 2 + note B_, 2 + note __, 4 + note G_, 2 + octave 3 + note D_, 2 + note __, 6 + loopchannel 2, Music_GymLeaderVictory_branch_f4744 + callchannel Music_GymLeaderVictory_branch_f479e + octave 3 + note D_, 2 + note __, 2 + note D_, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note D_, 2 + note F#, 2 + note D_, 2 + note A_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + callchannel Music_GymLeaderVictory_branch_f479e + octave 3 + note D_, 2 + note __, 2 + note G_, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note D_, 2 + note G_, 2 + note E_, 2 + note D_, 2 + note __, 2 + note D_, 2 + note A_, 2 + note __, 2 + octave 2 + note A_, 2 + note B_, 2 + octave 3 + note C#, 2 + loopchannel 0, Music_GymLeaderVictory_branch_f4744 +; f479e + +Music_GymLeaderVictory_branch_f479e: ; f479e + octave 3 + note D_, 2 + note __, 2 + note D_, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note D_, 2 + note F#, 2 + note D_, 2 + note A_, 2 + note __, 2 + note D_, 2 + note F#, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + octave 4 + note E_, 2 + note __, 2 + octave 3 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note __, 2 + note E_, 2 + note G#, 2 + note __, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + note __, 2 + note A_, 2 + octave 3 + note A_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + octave 3 + note A_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note __, 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + endchannel +; f47e5 + +Music_GymLeaderVictory_Ch4: ; f47e5 + togglenoise $4 + notetype $c + note B_, 16 + note B_, 16 +Music_GymLeaderVictory_branch_f47eb: ; f47eb + callchannel Music_GymLeaderVictory_branch_f480b + note D#, 6 + 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: ; 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 +; f480b + +Music_GymLeaderVictory_branch_f480b: ; f480b + note D#, 6 + note D#, 2 + note D#, 4 + note D_, 2 + note D#, 2 + loopchannel 3, Music_GymLeaderVictory_branch_f480b + endchannel +; f4815 + + diff --git a/crysaudio/music/halloffame.asm b/crysaudio/music/halloffame.asm new file mode 100644 index 00000000..26b249a9 --- /dev/null +++ b/crysaudio/music/halloffame.asm @@ -0,0 +1,179 @@ +Music_HallOfFame: ; f05bf + dbw $c0, Music_HallOfFame_Ch1 + dbw $01, Music_HallOfFame_Ch2 + dbw $02, Music_HallOfFame_Ch3 + dbw $03, Music_HallOfFame_Ch4 +; f05cb + +Music_HallOfFame_Ch1: ; f05cb + tempo 112 + volume $77 + dutycycle $2 + vibrato $c, $22 + tone $0001 + stereopanning $f0 + notetype $c, $93 + note __, 16 + note __, 16 + note __, 16 + note __, 12 + octave 3 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 +Music_HallOfFame_branch_f05e6: ; f05e6 + intensity $97 + octave 4 + note C_, 8 + intensity $77 + note C_, 8 + intensity $97 + note E_, 8 + intensity $77 + note E_, 8 + intensity $97 + note F#, 8 + intensity $77 + note F#, 8 + intensity $77 + note F_, 8 + intensity $57 + note F_, 8 + loopchannel 3, Music_HallOfFame_branch_f05e6 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + loopchannel 0, Music_HallOfFame_branch_f05e6 +; f060b + +Music_HallOfFame_Ch2: ; f060b + vibrato $8, $25 + dutycycle $3 +Music_HallOfFame_branch_f0610: ; f0610 + notetype $c, $c4 + octave 3 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note G_, 2 + note D_, 2 + note G_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note A_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 10 + note F_, 2 + note C_, 2 + note F_, 2 + note A#, 4 + note A_, 4 + note F_, 2 + loopchannel 0, Music_HallOfFame_branch_f0610 +; f062e + +Music_HallOfFame_Ch3: ; f062e +Music_HallOfFame_branch_f062e: ; f062e + notetype $c, $28 +Music_HallOfFame_branch_f0631: ; f0631 + octave 3 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + note C_, 2 + note F_, 2 + loopchannel 3, Music_HallOfFame_branch_f0631 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + note F#, 4 + note A_, 4 + note F#, 4 + note A_, 4 + note E_, 4 + note G_, 4 + note E_, 4 + note G_, 4 + loopchannel 0, Music_HallOfFame_branch_f062e +; f066d + +Music_HallOfFame_Ch4: ; f066d + togglenoise $5 + notetype $c + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype $6 +Music_HallOfFame_branch_f0677: ; 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 +; f0697 + + diff --git a/crysaudio/music/healpokemon.asm b/crysaudio/music/healpokemon.asm new file mode 100644 index 00000000..88aaad8f --- /dev/null +++ b/crysaudio/music/healpokemon.asm @@ -0,0 +1,56 @@ +Music_HealPokemon: ; f0697 + dbw $80, Music_HealPokemon_Ch1 + dbw $01, Music_HealPokemon_Ch2 + dbw $02, Music_HealPokemon_Ch3 +; f06a0 + +Music_HealPokemon_Ch1: ; f06a0 + ftempo 144 + volume $77 + fdutycycle $2 + tone $0001 + notetype $c, $81 + note __, 2 + unknownmusic0xe0 $0, $40 + note B_, 2 + unknownmusic0xe0 $0, $55 + note B_, 2 + unknownmusic0xe0 $0, $45 + note E_, 2 + note __, 4 + unknownmusic0xe0 $0, $30 + note E_, 4 + unknownmusic0xe0 $0, $40 + note B_, 4 + endchannel +; f06c4 + +Music_HealPokemon_Ch2: ; f06c4 + fdutycycle $2 + notetype $c, $c3 + octave 4 + note B_, 4 + note B_, 4 + note B_, 2 + note G#, 2 + notetype $c, $c4 + octave 5 + note E_, 8 + endchannel +; f06d4 + +Music_HealPokemon_Ch3: ; f06d4 + notetype $c, $10 + octave 4 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note G#, 2 + note E_, 6 + note __, 2 + endchannel +; f06e1 + + diff --git a/crysaudio/music/indigoplateau.asm b/crysaudio/music/indigoplateau.asm new file mode 100644 index 00000000..b76539a9 --- /dev/null +++ b/crysaudio/music/indigoplateau.asm @@ -0,0 +1,192 @@ +Music_IndigoPlateau: ; ee852 + dbw $c0, Music_IndigoPlateau_Ch1 + dbw $01, Music_IndigoPlateau_Ch2 + dbw $02, Music_IndigoPlateau_Ch3 + dbw $03, Music_IndigoPlateau_Ch4 +; ee85e + +Music_IndigoPlateau_Ch1: ; ee85e + tempo 128 + volume $77 + dutycycle $3 + tone $0002 + stereopanning $f +Music_IndigoPlateau_branch_ee86a: ; ee86a + callchannel Music_IndigoPlateau_branch_ee881 + octave 3 + note D_, 4 + callchannel Music_IndigoPlateau_branch_ee881 + octave 3 + note D#, 4 + callchannel Music_IndigoPlateau_branch_ee881 + octave 3 + note D#, 4 + callchannel Music_IndigoPlateau_branch_ee881 + note A#, 4 + loopchannel 0, Music_IndigoPlateau_branch_ee86a +; ee881 + +Music_IndigoPlateau_branch_ee881: ; ee881 + notetype $c, $b6 + octave 2 + note A_, 4 + intensity $b2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + intensity $a0 + endchannel +; ee892 + +Music_IndigoPlateau_Ch2: ; ee892 + dutycycle $3 + vibrato $10, $22 + stereopanning $f0 +Music_IndigoPlateau_branch_ee899: ; ee899 + callchannel Music_IndigoPlateau_branch_ee8e9 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee8e9 + note A#, 4 + callchannel Music_IndigoPlateau_branch_ee8e9 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee8e9 + note C#, 4 + intensity $c7 + note A_, 6 + note D_, 2 + note G_, 2 + note A#, 2 + note A_, 8 + intensity $b0 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee8e9 + note A#, 4 + intensity $c7 + octave 4 + note D_, 6 + note D#, 2 + note C_, 4 + note D_, 8 + intensity $b0 + octave 3 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee8e9 + note C#, 4 + intensity $c7 + octave 4 + note C_, 6 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note F#, 8 + intensity $b0 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee8e9 + note A#, 4 + intensity $c7 + octave 4 + note D_, 6 + note D#, 2 + note F_, 4 + note F#, 8 + intensity $b0 + octave 3 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee8e9 + note C#, 4 + loopchannel 0, Music_IndigoPlateau_branch_ee899 +; ee8e9 + +Music_IndigoPlateau_branch_ee8e9: ; ee8e9 + notetype $c, $c6 + octave 3 + note D_, 4 + intensity $c2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 2 + intensity $b0 + endchannel +; ee8fa + +Music_IndigoPlateau_Ch3: ; ee8fa + notetype $c, $19 +Music_IndigoPlateau_branch_ee8fd: ; ee8fd + callchannel Music_IndigoPlateau_branch_ee915 + octave 3 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee915 + octave 3 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee915 + octave 3 + note A_, 4 + callchannel Music_IndigoPlateau_branch_ee915 + octave 3 + note F#, 4 + loopchannel 0, Music_IndigoPlateau_branch_ee8fd +; ee915 + +Music_IndigoPlateau_branch_ee915: ; ee915 + octave 3 + note D_, 1 + note __, 3 + octave 2 + note A_, 1 + note __, 3 + octave 3 + note C_, 1 + note __, 3 + note D_, 1 + note __, 3 + octave 2 + note A_, 1 + note __, 3 + endchannel +; ee924 + +Music_IndigoPlateau_Ch4: ; ee924 + stereopanning $f0 + togglenoise $0 + notetype $c +Music_IndigoPlateau_branch_ee92a: ; ee92a + note D#, 4 + note D_, 2 + 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 +; ee94b + + diff --git a/crysaudio/music/johtogymbattle.asm b/crysaudio/music/johtogymbattle.asm new file mode 100644 index 00000000..0ef75426 --- /dev/null +++ b/crysaudio/music/johtogymbattle.asm @@ -0,0 +1,1034 @@ +Music_JohtoGymBattle: ; ea50d + dbw $80, Music_JohtoGymBattle_Ch1 + dbw $01, Music_JohtoGymBattle_Ch2 + dbw $02, Music_JohtoGymBattle_Ch3 +; ea516 + +Music_JohtoGymBattle_Ch1: ; ea516 + ftempo 101 + volume $77 + dutycycle $3 + tone $0002 + vibrato $12, $15 + notetype $c, $b2 +Music_JohtoGymBattle_branch_ea526: ; ea526 + octave 3 + note A#, 1 + note A_, 1 + note G#, 1 + note A_, 1 + loopchannel 4, Music_JohtoGymBattle_branch_ea526 +Music_JohtoGymBattle_branch_ea52f: ; ea52f + note C#, 1 + note C_, 1 + octave 2 + note A#, 1 + octave 3 + note C_, 1 + loopchannel 3, Music_JohtoGymBattle_branch_ea52f + intensity $4b + note C#, 4 + intensity $b2 + note D_, 6 + note D#, 6 + note C_, 4 + note F_, 6 + note D_, 6 + note D#, 4 + note D_, 6 + note D#, 6 + note C_, 4 + note F_, 6 + note G_, 6 + intensity $b7 + note C_, 4 + intensity $b2 + note G_, 6 + note G#, 6 + note F_, 4 + note G#, 6 + note F_, 6 + note G#, 4 + note G_, 6 + note G#, 6 + note F_, 4 + note G#, 6 + octave 4 + note C_, 6 + octave 3 + note G#, 2 + note F_, 2 +Music_JohtoGymBattle_branch_ea55d: ; ea55d + intensity $b5 + note D_, 6 + note G_, 6 + note F_, 2 + note G_, 2 + note G#, 4 + note G_, 4 + note F_, 4 + note G_, 4 + intensity $b7 + note G#, 12 + intensity $b2 + note G_, 4 + intensity $b7 + octave 4 + note C#, 12 + intensity $b2 + note C_, 4 + intensity $b5 + octave 3 + note D_, 6 + note G_, 6 + note F_, 2 + note G_, 2 + note G#, 4 + note G_, 4 + note F_, 4 + note G_, 4 + intensity $b7 + note G#, 8 + note G_, 8 + note F_, 8 + note D#, 8 + intensity $70 + note C_, 8 + intensity $77 + note C_, 8 + intensity $b4 + note D#, 2 + note E_, 2 + note F_, 6 + note G_, 2 + note D#, 4 + intensity $77 + octave 2 + note A#, 8 + note A#, 8 + intensity $c5 + octave 3 + note G_, 2 + note G#, 2 + note A#, 6 + note A#, 2 + note G#, 4 + intensity $c7 + note G_, 8 + note F_, 4 + note E_, 2 + note C#, 2 + intensity $a0 + note C_, 8 + intensity $a7 + note C_, 8 + intensity $b2 + note F_, 6 + note F_, 4 + note E_, 2 + note F_, 4 + note F_, 6 + note F_, 6 + note F_, 2 + note G#, 2 + note E_, 6 + note E_, 4 + note F_, 2 + note E_, 2 + note C#, 2 + note C_, 6 + note C_, 6 + note C_, 4 + note F_, 6 + note F_, 2 + note G#, 2 + note E_, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note C_, 4 + note F_, 6 + note E_, 2 + note G#, 2 + note E_, 2 + note G_, 4 + note E_, 4 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 6 + note G_, 4 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note C_, 2 + note C_, 6 + note C_, 6 + note C_, 4 + note C#, 6 + note C#, 6 + note C#, 4 + note D_, 6 + note D_, 6 + note D_, 4 + note D#, 6 + note D#, 6 + note D#, 4 + intensity $80 + note G_, 16 + intensity $90 + note G#, 16 + intensity $a0 + note A_, 8 + note A#, 2 + note A_, 2 + note G#, 2 + note A_, 2 + intensity $b0 + note A#, 8 + note B_, 2 + note A#, 2 + note A_, 2 + octave 4 + note C#, 2 + intensity $b7 + note C_, 8 + note C#, 4 + note C_, 4 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + note G#, 4 + note D#, 4 + note G#, 4 + note D#, 4 + note D#, 4 + octave 3 + note G#, 4 + octave 4 + note D#, 4 + octave 3 + note G#, 4 + note G#, 8 + note A_, 4 + note G#, 4 + note D#, 2 + note G#, 2 + note D#, 2 + octave 4 + note C#, 2 + octave 3 + note D#, 2 + note A_, 2 + note D#, 2 + note G_, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 4 + octave 4 + note C#, 4 + octave 3 + note G#, 4 + note G#, 4 + note C#, 4 + note G#, 4 + note C#, 4 + note B_, 8 + note A_, 8 + note G#, 8 + note F#, 8 + intensity $b4 + note A_, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + octave 4 + note E_, 4 + intensity $92 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + intensity $b2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + intensity $c2 + note D#, 16 + intensity $50 + octave 3 + note C_, 16 + note F_, 16 + note E_, 16 + intensity $97 + note D#, 10 + intensity $b4 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + note F#, 2 + loopchannel 0, Music_JohtoGymBattle_branch_ea55d +; ea65f + +Music_JohtoGymBattle_Ch2: ; ea65f + dutycycle $3 + vibrato $8, $36 + tone $0001 + notetype $c, $c2 +Music_JohtoGymBattle_branch_ea66a: ; ea66a + octave 4 + note F#, 1 + note F_, 1 + note E_, 1 + note A#, 1 + loopchannel 4, Music_JohtoGymBattle_branch_ea66a +Music_JohtoGymBattle_branch_ea673: ; ea673 + note F#, 1 + note F_, 1 + note F#, 1 + note A#, 1 + loopchannel 4, Music_JohtoGymBattle_branch_ea673 + note A_, 6 + octave 3 + note A#, 6 + note G_, 4 + octave 4 + note D_, 6 + octave 3 + note A_, 6 + note A#, 4 + note A_, 6 + note A#, 6 + note G_, 4 + octave 4 + note D_, 6 + note D#, 6 + intensity $b0 + octave 3 + note D#, 4 + intensity $c2 + octave 4 + note D_, 2 + intensity $92 + octave 3 + note D_, 2 + note D_, 2 + intensity $c2 + octave 4 + note D#, 4 + intensity $92 + octave 3 + note D_, 2 + intensity $c2 + octave 4 + note C_, 4 + note G_, 2 + notetype $c, $92 + octave 3 + note D_, 2 + note D_, 2 + intensity $c2 + octave 4 + note D_, 4 + intensity $92 + octave 3 + note D_, 2 + intensity $c2 + octave 4 + note D#, 2 + intensity $92 + octave 3 + note D#, 2 + intensity $c2 + octave 4 + note D_, 2 + intensity $92 + octave 3 + note D_, 2 + note D_, 2 + intensity $c2 + octave 4 + note D#, 4 + intensity $92 + octave 3 + note D_, 2 + intensity $c2 + octave 4 + note C_, 2 + intensity $92 + octave 3 + note D#, 2 + intensity $c2 + octave 4 + note G_, 2 + intensity $92 + octave 3 + note F_, 2 + note F_, 2 + intensity $c2 + octave 4 + note G#, 2 + intensity $92 + octave 3 + note F_, 2 + note F_, 2 + intensity $c2 + octave 4 + note F#, 2 + intensity $b2 + octave 3 + note G#, 1 + note A_, 1 +Music_JohtoGymBattle_branch_ea6ee: ; ea6ee + intensity $c7 + note A#, 8 + intensity $c4 + octave 4 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + intensity $c7 + note C#, 8 + intensity $c4 + note F_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + intensity $b0 + note F_, 6 + intensity $b7 + note F_, 6 + intensity $c2 + note D#, 4 + intensity $b0 + note G#, 6 + intensity $b7 + note G#, 6 + intensity $c2 + note F_, 4 + intensity $c7 + octave 3 + note A#, 8 + intensity $c4 + octave 4 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + intensity $c7 + note C#, 8 + intensity $c4 + note F_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + intensity $b0 + note C#, 16 + intensity $b7 + note C#, 16 + intensity $a4 + octave 3 + note F_, 6 + note D#, 6 + note F_, 4 + intensity $c6 + octave 4 + note C_, 6 + octave 3 + note A#, 6 + octave 4 + note C_, 4 + intensity $a4 + octave 3 + note C#, 6 + note C_, 6 + note C#, 4 + intensity $c6 + octave 4 + note C#, 6 + note C_, 6 + note C#, 4 + intensity $3c + note C_, 10 + intensity $b7 + note C_, 6 + intensity $b0 + note E_, 8 + intensity $b7 + note E_, 8 + intensity $b0 + octave 3 + note C#, 16 + octave 2 + note A#, 8 + octave 3 + note C#, 6 + note D#, 2 + note C_, 16 + note E_, 16 + intensity $a0 + octave 5 + note C#, 4 + intensity $a7 + octave 5 + note C#, 12 + intensity $b7 + octave 4 + note A#, 8 + octave 5 + note C#, 6 + note D#, 2 + intensity $a0 + note C_, 8 + intensity $a7 + note C_, 8 + intensity $3e + note E_, 6 + intensity $a6 + note E_, 10 + intensity $c2 + octave 3 + note F_, 6 + note F_, 6 + note F_, 4 + note F#, 6 + note F#, 6 + note F#, 4 + note G_, 6 + note G_, 6 + note G_, 4 + note G#, 6 + note G#, 6 + note G#, 4 + intensity $90 + octave 4 + note C_, 16 + intensity $a0 + note C#, 16 + intensity $b0 + note D_, 16 + intensity $b7 + note D#, 8 + intensity $4c + note D#, 6 + intensity $c2 + note F#, 1 + note G_, 1 + intensity $c7 + note G#, 8 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 4 + octave 5 + note C_, 4 + octave 4 + note A_, 4 + note G#, 4 + octave 5 + note D#, 4 + octave 4 + note G#, 4 + octave 5 + note D#, 4 + octave 4 + note G#, 4 + octave 5 + note D#, 2 + note C#, 2 + note C_, 2 + note C#, 2 + note C_, 2 + octave 4 + note A_, 2 + note G#, 2 + note A_, 2 + note D#, 8 + note E_, 2 + note D#, 2 + note C#, 2 + note E_, 2 + note D#, 4 + note G#, 4 + note E_, 4 + note C#, 4 + note G#, 4 + note C#, 4 + note G#, 4 + note C#, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D#, 8 + note C#, 8 + octave 3 + note B_, 8 + note A_, 8 + octave 4 + note D#, 4 + note G#, 4 + note E_, 4 + note A_, 4 + intensity $c0 + note G#, 8 + intensity $c7 + note G#, 8 + intensity $c2 + note G#, 16 + intensity $80 + octave 3 + note F_, 16 + octave 4 + note C_, 16 + octave 3 + note B_, 16 + note G_, 16 + loopchannel 0, Music_JohtoGymBattle_branch_ea6ee +; ea7f4 + +Music_JohtoGymBattle_Ch3: ; ea7f4 + notetype $c, $19 + octave 4 + note F_, 1 + note __, 1 + octave 3 + note A_, 2 + octave 4 + note F_, 1 + note __, 1 + octave 3 + note G#, 2 + octave 4 + note F_, 1 + note __, 1 + octave 3 + note G_, 2 + octave 4 + note F_, 1 + note __, 1 + octave 3 + note F#, 2 + octave 4 + note G#, 1 + note __, 1 + octave 3 + note F_, 2 + octave 4 + note G#, 1 + note __, 1 + octave 3 + note E_, 2 + note F_, 2 + note G_, 2 + note G#, 4 + callchannel Music_JohtoGymBattle_branch_ea952 + note G_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note G#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note F#, 4 + callchannel Music_JohtoGymBattle_branch_ea952 + note G_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note G#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 +Music_JohtoGymBattle_branch_ea83f: ; ea83f + callchannel Music_JohtoGymBattle_branch_ea963 + callchannel Music_JohtoGymBattle_branch_ea963 + callchannel Music_JohtoGymBattle_branch_ea96a + note C#, 2 + note G#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + note A#, 2 + note A_, 2 + note G#, 2 + callchannel Music_JohtoGymBattle_branch_ea963 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note G#, 2 + note G_, 2 + callchannel Music_JohtoGymBattle_branch_ea96a + callchannel Music_JohtoGymBattle_branch_ea96a + note C_, 2 + note G_, 2 + note A#, 2 + note C_, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note A#, 2 + callchannel Music_JohtoGymBattle_branch_ea971 + callchannel Music_JohtoGymBattle_branch_ea96a + callchannel Music_JohtoGymBattle_branch_ea978 + octave 3 + note G_, 2 + note G#, 2 + note F_, 2 + callchannel Music_JohtoGymBattle_branch_ea971 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + callchannel Music_JohtoGymBattle_branch_ea96a + callchannel Music_JohtoGymBattle_branch_ea978 + octave 3 + note C_, 2 + note C#, 2 + note G#, 2 + callchannel Music_JohtoGymBattle_branch_ea971 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + callchannel Music_JohtoGymBattle_branch_ea96a + callchannel Music_JohtoGymBattle_branch_ea978 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note G#, 2 + callchannel Music_JohtoGymBattle_branch_ea971 + note C_, 2 + note G_, 2 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + callchannel Music_JohtoGymBattle_branch_ea983 + note __, 2 + callchannel Music_JohtoGymBattle_branch_ea990 + octave 4 + note C#, 2 + callchannel Music_JohtoGymBattle_branch_ea99c + note __, 2 + note D#, 2 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + octave 4 + note D#, 2 + callchannel Music_JohtoGymBattle_branch_ea983 + note G_, 2 + callchannel Music_JohtoGymBattle_branch_ea990 + note G#, 2 + callchannel Music_JohtoGymBattle_branch_ea99c + note A_, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + note D#, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + octave 4 + note D#, 2 + note D_, 4 + callchannel Music_JohtoGymBattle_branch_ea9a9 + note D#, 2 + note G#, 2 + note D#, 2 + octave 4 + note C#, 2 + octave 3 + note D#, 2 + note A_, 2 + note D#, 2 + note G#, 2 + callchannel Music_JohtoGymBattle_branch_ea9a9 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + callchannel Music_JohtoGymBattle_branch_ea9b1 + note C#, 2 + note F#, 2 + note C#, 2 + octave 4 + note C#, 2 + octave 3 + note C#, 2 + note A_, 2 + note C#, 2 + note G_, 2 + callchannel Music_JohtoGymBattle_branch_ea9b1 + note C#, 2 + note F#, 2 + note C#, 2 + note F#, 2 + note C#, 2 + note D#, 2 + note E_, 2 + note A_, 2 + callchannel Music_JohtoGymBattle_branch_ea9a9 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note D#, 2 + note G#, 2 + note D#, 2 + note A_, 2 + note D#, 2 + note B_, 2 + note D#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + note D#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note D#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + callchannel Music_JohtoGymBattle_branch_ea9b8 + note F_, 2 + note C_, 2 + note D#, 2 + note F_, 2 + note D#, 2 + note D#, 2 + note C#, 2 + note D#, 2 + callchannel Music_JohtoGymBattle_branch_ea9b8 + note F_, 2 + note C_, 2 + note D#, 2 + note F_, 2 + note D#, 2 + note F#, 2 + note F_, 2 + note D#, 2 + loopchannel 0, Music_JohtoGymBattle_branch_ea83f +; ea952 + +Music_JohtoGymBattle_branch_ea952: ; ea952 + note G_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note G#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note F_, 2 + note D#, 2 + note F_, 2 + endchannel +; ea963 + +Music_JohtoGymBattle_branch_ea963: ; ea963 + note D_, 2 + note G_, 2 + loopchannel 4, Music_JohtoGymBattle_branch_ea963 + endchannel +; ea96a + +Music_JohtoGymBattle_branch_ea96a: ; ea96a + note C#, 2 + note G#, 2 + loopchannel 4, Music_JohtoGymBattle_branch_ea96a + endchannel +; ea971 + +Music_JohtoGymBattle_branch_ea971: ; ea971 + note C_, 2 + note G_, 2 + loopchannel 4, Music_JohtoGymBattle_branch_ea971 + endchannel +; ea978 + +Music_JohtoGymBattle_branch_ea978: ; ea978 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + endchannel +; ea983 + +Music_JohtoGymBattle_branch_ea983: ; ea983 + octave 3 + note C_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 2 + endchannel +; ea990 + +Music_JohtoGymBattle_branch_ea990: ; ea990 + note C#, 2 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note C#, 2 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note C#, 2 + endchannel +; ea99c + +Music_JohtoGymBattle_branch_ea99c: ; ea99c + octave 3 + note D_, 2 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + endchannel +; ea9a9 + +Music_JohtoGymBattle_branch_ea9a9: ; ea9a9 + octave 3 + note D#, 2 + note G#, 2 + loopchannel 4, Music_JohtoGymBattle_branch_ea9a9 + endchannel +; ea9b1 + +Music_JohtoGymBattle_branch_ea9b1: ; ea9b1 + note C#, 2 + note F#, 2 + loopchannel 4, Music_JohtoGymBattle_branch_ea9b1 + endchannel +; ea9b8 + +Music_JohtoGymBattle_branch_ea9b8: ; ea9b8 + note F_, 2 + note C_, 2 + note D#, 2 + note F_, 2 + note F#, 2 + note F#, 2 + note F_, 2 + note D#, 2 + endchannel +; ea9c1 + + diff --git a/crysaudio/music/johtotrainerbattle.asm b/crysaudio/music/johtotrainerbattle.asm new file mode 100644 index 00000000..41ea2d06 --- /dev/null +++ b/crysaudio/music/johtotrainerbattle.asm @@ -0,0 +1,1350 @@ +Music_JohtoTrainerBattle: ; f6096 + dbw $80, Music_JohtoTrainerBattle_Ch1 + dbw $01, Music_JohtoTrainerBattle_Ch2 + dbw $02, Music_JohtoTrainerBattle_Ch3 +; f609f + +Music_JohtoTrainerBattle_Ch1: ; f609f + ftempo 102 + volume $77 + dutycycle $3 + tone $0002 + vibrato $12, $15 + notetype $c, $92 + note __, 8 + octave 3 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + intensity $b2 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note E_, 6 + note E_, 6 + note E_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + intensity $b7 + note D_, 4 + intensity $b2 + note E_, 6 + note D_, 6 + note E_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + intensity $b7 + note F_, 4 + intensity $b2 + octave 4 + note E_, 6 + note E_, 6 + note E_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + octave 3 + note A_, 2 + note A#, 2 + intensity $b7 + note B_, 4 + intensity $b2 + octave 4 + note E_, 6 + note E_, 6 + note E_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 6 + intensity $b7 + note G_, 4 +Music_JohtoTrainerBattle_branch_f6102: ; f6102 + intensity $b4 + callchannel Music_JohtoTrainerBattle_branch_f629f + intensity $b7 + note A#, 4 + intensity $b3 + note G_, 1 + note F_, 1 + note E_, 1 + note G_, 1 + intensity $b7 + octave 4 + note C_, 4 + intensity $b3 + octave 3 + note A_, 1 + note G_, 1 + note F_, 1 + note A_, 1 + intensity $b7 + octave 4 + note D_, 4 + intensity $b3 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + octave 4 + note C_, 1 + intensity $b5 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + callchannel Music_JohtoTrainerBattle_branch_f629f + intensity $b7 + note F_, 4 + note E_, 2 + note F_, 2 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + intensity $a0 + octave 3 + note F_, 8 + intensity $a7 + note F_, 8 + intensity $b7 + note A_, 6 + note E_, 6 + note A#, 4 + octave 4 + note C#, 6 + note F_, 4 + note E_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + intensity $a0 + note A_, 8 + intensity $a7 + note A_, 8 + intensity $b7 + note E_, 8 + note D_, 8 + note E_, 8 + note F_, 8 + note E_, 8 + note D_, 8 + note G_, 8 + note F_, 8 + note D_, 8 + note C_, 8 + note D_, 8 + note D#, 8 + note D_, 8 + note C_, 8 + note D_, 8 + note D#, 8 + note D_, 8 + note D#, 8 + note E_, 8 + note F_, 8 + intensity $b4 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note F_, 2 + note G_, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 2 + note D#, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + intensity $b5 + note D#, 2 + note D_, 2 + intensity $b2 + note D#, 4 + intensity $b7 + note C_, 8 + note D#, 4 + note C#, 4 + note C_, 4 + note D#, 4 + intensity $b5 + note E_, 2 + note D#, 2 + intensity $b2 + note E_, 4 + intensity $b7 + note C#, 8 + note F_, 4 + note D#, 4 + note C#, 4 + note F_, 4 + intensity $b5 + note F#, 2 + note F_, 2 + intensity $b2 + note F#, 4 + intensity $b7 + note D_, 8 + note F#, 4 + note E_, 4 + note D_, 4 + note F#, 4 + note G_, 8 + note D#, 8 + note A#, 8 + note G_, 8 + intensity $a0 + note D#, 4 + intensity $a7 + note D#, 12 + note __, 16 +Music_JohtoTrainerBattle_branch_f61bd: ; f61bd + intensity $b7 + note F_, 8 + intensity $b4 + note G_, 4 + note D#, 4 + note F_, 4 + note G_, 2 + note D#, 2 + note F_, 4 + octave 2 + note A#, 4 + intensity $b7 + octave 3 + note F_, 8 + intensity $b4 + note G_, 4 + note D#, 4 + note F_, 4 + note G_, 2 + note D#, 2 + note F_, 4 + note F_, 4 + loopchannel 2, Music_JohtoTrainerBattle_branch_f61bd + intensity $b7 + note F_, 8 + intensity $b4 + note G_, 4 + note D#, 4 + note F_, 4 + note G#, 2 + note G_, 2 + intensity $b7 + note F_, 8 + note F_, 8 + intensity $b5 + note G_, 4 + note D#, 4 + note F_, 4 + note G_, 2 + note D#, 2 + intensity $b7 + note F_, 8 + note F_, 8 + intensity $b5 + note G_, 4 + note D#, 4 + note F_, 4 + note G_, 2 + note D#, 2 + intensity $3f + note G#, 8 + intensity $b7 + note G#, 8 + intensity $a0 + octave 4 + note C_, 8 + intensity $a7 + note C_, 8 + intensity $b2 + octave 3 + note D#, 6 + note D#, 6 + note D#, 4 + note D#, 6 + note D#, 6 + intensity $b7 + note F_, 4 + intensity $b2 + note D#, 6 + note D#, 6 + note D#, 4 + note D#, 6 + note D#, 6 + intensity $4c + note F_, 4 + intensity $b7 + note G#, 6 + note G_, 6 + note F_, 4 + note D#, 4 + note F_, 4 + note G_, 4 + note D#, 4 + note F_, 4 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note F_, 4 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note F_, 2 + note G_, 2 + note G#, 2 + octave 4 + note C_, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 6 + note D#, 6 + note G_, 4 + octave 4 + note C#, 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 4 + note F_, 4 + note C#, 2 + note D#, 2 + note F_, 4 + note C#, 2 + note D#, 2 + note A#, 4 + note G#, 4 + note G_, 4 + note F_, 4 + intensity $90 + octave 2 + note A#, 8 + octave 3 + note D#, 8 + octave 2 + note A#, 8 + octave 3 + note G_, 8 + intensity $a0 + note D#, 8 + note A#, 8 + note G_, 8 + octave 4 + note D#, 8 + intensity $a0 + octave 3 + note A#, 8 + intensity $a7 + note A#, 8 + intensity $b7 + note G_, 6 + note A#, 6 + note G#, 2 + note G_, 2 + intensity $a0 + note D#, 8 + intensity $a7 + note D#, 8 + intensity $b4 + note A#, 6 + note G_, 4 + note G_, 2 + note A#, 12 + note __, 16 + note __, 8 + intensity $a0 + octave 4 + note D_, 4 + intensity $a7 + note D_, 12 + intensity $a0 + note F_, 8 + intensity $a7 + note F_, 8 + intensity $b3 + callchannel Music_JohtoTrainerBattle_branch_f629f + note F_, 4 + note E_, 2 + note F_, 2 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + intensity $a0 + octave 3 + note F_, 10 + intensity $a7 + note F_, 6 + loopchannel 0, Music_JohtoTrainerBattle_branch_f6102 +; f629f + +Music_JohtoTrainerBattle_branch_f629f: ; f629f + octave 3 + note E_, 2 + note D_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note F_, 2 + note D_, 2 + endchannel +; f62b3 + +Music_JohtoTrainerBattle_Ch2: ; f62b3 + dutycycle $3 + vibrato $8, $36 + tone $0001 + notetype $c, $c2 + octave 4 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note G#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note G#, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note G#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note G#, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note G#, 1 + octave 3 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + note G#, 1 + octave 3 + note B_, 1 + note A#, 1 + note B_, 1 + octave 4 + note G#, 1 + octave 3 + note A#, 1 + note A_, 1 + note A#, 1 + intensity $c2 + octave 4 + note A_, 6 + callchannel Music_JohtoTrainerBattle_branch_f649a + intensity $c2 + note A_, 6 + callchannel Music_JohtoTrainerBattle_branch_f649a + intensity $c2 + octave 5 + note C_, 6 + note C_, 6 + note C_, 4 + note C_, 6 + note C_, 6 + intensity $c7 + note C#, 4 + intensity $c2 + note C_, 2 + intensity $a4 + octave 3 + note E_, 2 + note A_, 2 + intensity $c2 + octave 5 + note C_, 2 + intensity $a4 + octave 3 + note E_, 2 + note A_, 2 + intensity $c2 + octave 5 + note C_, 2 + intensity $a4 + octave 3 + note E_, 2 + intensity $c2 + octave 5 + note C_, 2 + intensity $a4 + octave 3 + note E_, 2 + note B_, 2 + intensity $c2 + octave 5 + note C_, 2 + intensity $a4 + octave 4 + note C_, 2 + note E_, 2 + intensity $c7 + note B_, 4 +Music_JohtoTrainerBattle_branch_f632a: ; f632a + callchannel Music_JohtoTrainerBattle_branch_f64a3 + intensity $3e + note A#, 8 + intensity $c7 + note A#, 8 + callchannel Music_JohtoTrainerBattle_branch_f64a3 + intensity $c4 + note D_, 4 + octave 3 + note A#, 2 + octave 4 + note D_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note A#, 2 + note A_, 2 + note A#, 2 + octave 5 + note D_, 2 + intensity $b0 + note C#, 8 + intensity $b7 + note C#, 4 + intensity $c7 + octave 4 + note A#, 4 + intensity $b0 + note A_, 16 + intensity $b7 + note A_, 16 +Music_JohtoTrainerBattle_branch_f635a: ; f635a + intensity $c3 + octave 3 + note A_, 2 + note G_, 2 + note A_, 2 + intensity $c7 + note A#, 4 + intensity $c3 + note A_, 2 + note G_, 2 + note A#, 2 + loopchannel 3, Music_JohtoTrainerBattle_branch_f635a + note A_, 2 + octave 4 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 2 +Music_JohtoTrainerBattle_branch_f6376: ; f6376 + note G_, 2 + note F_, 2 + note G_, 2 + intensity $c7 + note G#, 4 + intensity $c3 + note G_, 2 + note F_, 2 + note G#, 2 + loopchannel 3, Music_JohtoTrainerBattle_branch_f6376 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note G#, 2 + intensity $c7 + note G_, 6 + octave 4 + note D_, 6 + note C_, 2 + note D_, 2 + note F_, 4 + note E_, 4 + note D_, 4 + note C_, 4 + intensity $b0 + note D#, 10 + intensity $b7 + note D#, 6 + intensity $90 + note G_, 8 + intensity $97 + note G_, 8 + intensity $c7 + octave 3 + note F_, 8 + note D#, 4 + note F_, 4 + note G_, 4 + note F_, 4 + note D#, 4 + note G_, 4 + note G#, 8 + note F_, 4 + note G_, 4 + note G#, 4 + note G_, 4 + note F_, 4 + note G#, 4 + note A_, 8 + note F#, 4 + note G#, 4 + note A_, 4 + note G#, 4 + note F#, 4 + note A_, 4 + intensity $b0 + note A#, 8 + note A#, 8 + intensity $b0 + octave 4 + note D#, 8 + intensity $b7 + 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: ; f63dd + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note G_, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note G_, 2 + octave 3 + note A#, 2 + loopchannel 8, Music_JohtoTrainerBattle_branch_f63dd + callchannel Music_JohtoTrainerBattle_branch_f64be + octave 3 + note A#, 2 + intensity $c7 + octave 4 + note C_, 8 + callchannel Music_JohtoTrainerBattle_branch_f64be + note G_, 2 + intensity $c7 + note F_, 8 + callchannel Music_JohtoTrainerBattle_branch_f64be + octave 3 + note A#, 2 + intensity $b0 + octave 4 + note C_, 8 + intensity $b7 + note C_, 8 + intensity $1f + note D#, 12 + intensity $c7 + note D#, 4 + intensity $c2 + octave 3 + note G_, 4 + note D#, 2 + note G_, 6 + note G_, 4 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 6 + intensity $c7 + note G#, 4 + intensity $c2 + note G_, 4 + note D#, 2 + note G_, 6 + note G_, 4 + note G_, 6 + note G_, 6 + intensity $4c + note G#, 4 + callchannel Music_JohtoTrainerBattle_branch_f64d2 + intensity $b0 + note F_, 8 + intensity $b7 + note F_, 8 + intensity $b0 + note G#, 8 + intensity $b7 + note G#, 8 + callchannel Music_JohtoTrainerBattle_branch_f64d2 + intensity $b0 + note C#, 8 + intensity $b7 + note C#, 8 + intensity $c7 + note C#, 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 4 + note G_, 6 + note D#, 2 + note A#, 8 + note A#, 6 + note G_, 2 + octave 4 + note D#, 8 + note D#, 6 + octave 3 + note A#, 2 + octave 4 + note G_, 8 + note G_, 6 + note D#, 2 + note A#, 8 + note G_, 6 + note A#, 6 + note G#, 2 + note G_, 2 + intensity $b0 + note D#, 8 + intensity $b7 + note D#, 8 + intensity $c7 + note D#, 6 + note A#, 6 + note G#, 2 + note G_, 2 + intensity $b0 + note D#, 8 + intensity $b7 + note D#, 8 + intensity $c7 + octave 3 + note A_, 6 + octave 4 + note E_, 6 + note D_, 2 + note E_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + intensity $b0 + note F_, 8 + intensity $b7 + note F_, 8 + intensity $b0 + note A#, 8 + intensity $b7 + note A#, 8 + callchannel Music_JohtoTrainerBattle_branch_f64a3 + intensity $c7 + note D_, 4 + octave 3 + note A#, 2 + octave 4 + note D_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + loopchannel 0, Music_JohtoTrainerBattle_branch_f632a +; f649a + +Music_JohtoTrainerBattle_branch_f649a: ; f649a + octave 3 + note A_, 6 + note A_, 4 + note A_, 6 + note A_, 6 + intensity $c7 + note A#, 4 + endchannel +; f64a3 + +Music_JohtoTrainerBattle_branch_f64a3: ; f64a3 + intensity $c7 + octave 3 + note A_, 6 + octave 4 + note E_, 6 + note D_, 2 + note E_, 2 + note G_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + intensity $b0 + note F_, 8 + intensity $b7 + note F_, 8 + endchannel +; f64b6 + +Music_JohtoTrainerBattle_branch_f64b6: ; f64b6 + octave 3 + note A#, 2 + note D#, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + endchannel +; f64be + +Music_JohtoTrainerBattle_branch_f64be: ; f64be + intensity $c7 + octave 4 + note F_, 4 + intensity $c4 + octave 3 + note A#, 2 + octave 4 + note F_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note F_, 2 + endchannel +; f64d2 + +Music_JohtoTrainerBattle_branch_f64d2: ; f64d2 + intensity $c7 + octave 4 + note D#, 6 + note A#, 6 + note G#, 2 + note G_, 2 + note G#, 4 + note G_, 4 + note F_, 4 + note D#, 4 + endchannel +; f64de + +Music_JohtoTrainerBattle_Ch3: ; f64de + notetype $c, $19 + octave 4 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 2 + note A#, 2 + note A_, 2 + note G#, 2 +Music_JohtoTrainerBattle_branch_f6501: ; f6501 + note A_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note E_, 2 + loopchannel 3, Music_JohtoTrainerBattle_branch_f6501 + note A_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note G#, 2 + callchannel Music_JohtoTrainerBattle_branch_f6676 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + callchannel Music_JohtoTrainerBattle_branch_f6676 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 +Music_JohtoTrainerBattle_branch_f6531: ; f6531 + callchannel Music_JohtoTrainerBattle_branch_f6681 + note E_, 2 + callchannel Music_JohtoTrainerBattle_branch_f6692 + callchannel Music_JohtoTrainerBattle_branch_f6692 + callchannel Music_JohtoTrainerBattle_branch_f6681 + note A_, 2 + callchannel Music_JohtoTrainerBattle_branch_f6692 + callchannel Music_JohtoTrainerBattle_branch_f6692 + callchannel Music_JohtoTrainerBattle_branch_f669d + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + callchannel Music_JohtoTrainerBattle_branch_f669d + note E_, 2 + octave 4 + note F_, 2 + note E_, 2 + note D_, 2 + octave 3 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + callchannel Music_JohtoTrainerBattle_branch_f66a5 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + callchannel Music_JohtoTrainerBattle_branch_f66a5 + note D_, 2 + octave 4 + note D_, 2 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A#, 2 + callchannel Music_JohtoTrainerBattle_branch_f66ac + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + callchannel Music_JohtoTrainerBattle_branch_f66ac + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note D_, 2 + note G_, 8 + note F_, 8 + note E_, 8 + note D#, 8 +Music_JohtoTrainerBattle_branch_f6591: ; f6591 + octave 3 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note A_, 2 + octave 4 + note C_, 2 + loopchannel 2, Music_JohtoTrainerBattle_branch_f6591 + callchannel Music_JohtoTrainerBattle_branch_f66ac + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note G_, 2 +Music_JohtoTrainerBattle_branch_f65ac: ; f65ac + note C#, 2 + note G#, 2 + loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac + note B_, 2 + note A_, 2 +Music_JohtoTrainerBattle_branch_f65b4: ; f65b4 + note D_, 2 + note A_, 2 + loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 +Music_JohtoTrainerBattle_branch_f65c0: ; f65c0 + note A#, 4 + note D#, 4 + loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0 +Music_JohtoTrainerBattle_branch_f65c6: ; f65c6 + octave 4 + note G_, 4 + octave 3 + note A#, 4 + loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6 +Music_JohtoTrainerBattle_branch_f65ce: ; f65ce + callchannel Music_JohtoTrainerBattle_branch_f66b4 + note D#, 2 + note F_, 8 + callchannel Music_JohtoTrainerBattle_branch_f66b4 + octave 4 + note C_, 2 + octave 3 + note A#, 8 + loopchannel 2, Music_JohtoTrainerBattle_branch_f65ce + octave 4 + note C#, 8 + note C_, 8 + octave 3 + note A#, 8 + note G#, 8 + note F_, 8 + note G_, 8 + note G#, 8 + note A#, 8 + note F_, 8 + note G_, 8 + note G#, 4 + note D#, 2 + note G#, 2 + octave 4 + note C_, 8 + note C_, 8 + note D#, 8 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + note D#, 2 + note A#, 2 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + note D#, 2 + note A#, 2 + octave 4 + note C_, 2 + note C#, 2 + note D#, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 +Music_JohtoTrainerBattle_branch_f661e: ; f661e + note D#, 2 + note A#, 2 + loopchannel 8, Music_JohtoTrainerBattle_branch_f661e +Music_JohtoTrainerBattle_branch_f6624: ; f6624 + note C#, 2 + note G#, 2 + loopchannel 6, Music_JohtoTrainerBattle_branch_f6624 + note C#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 +Music_JohtoTrainerBattle_branch_f6630: ; f6630 + note D#, 2 + note A#, 2 + loopchannel 8, Music_JohtoTrainerBattle_branch_f6630 +Music_JohtoTrainerBattle_branch_f6636: ; f6636 + note C#, 2 + note G#, 2 + loopchannel 4, Music_JohtoTrainerBattle_branch_f6636 + note C#, 2 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G_, 2 + note G#, 2 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note D#, 8 + note C#, 8 + note C_, 8 + octave 2 + note A#, 8 + octave 3 + note A#, 8 + note G#, 8 + note G_, 8 + note F_, 8 + octave 4 + note D#, 8 + note D#, 8 + octave 3 + note A#, 8 + note A#, 8 + note G_, 8 + note G_, 8 + note D#, 8 + note D#, 4 + note A#, 4 + note A_, 16 + octave 4 + note C_, 16 + octave 3 + note A#, 16 + octave 4 + note D_, 16 + octave 3 + note A_, 16 + octave 4 + note C_, 16 + octave 3 + note A#, 16 + octave 4 + note D_, 8 + note __, 2 + octave 3 + note A_, 2 + note A#, 2 + octave 4 + note D_, 2 + loopchannel 0, Music_JohtoTrainerBattle_branch_f6531 +; f6676 + +Music_JohtoTrainerBattle_branch_f6676: ; f6676 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 + note A_, 2 + note A#, 2 + note G_, 2 + endchannel +; f6681 + +Music_JohtoTrainerBattle_branch_f6681: ; f6681 + octave 3 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + endchannel +; f6692 + +Music_JohtoTrainerBattle_branch_f6692: ; f6692 + octave 3 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A_, 2 + note A#, 2 + octave 4 + note D_, 2 + endchannel +; f669d + +Music_JohtoTrainerBattle_branch_f669d: ; f669d + octave 3 + note E_, 2 + note A_, 2 + loopchannel 4, Music_JohtoTrainerBattle_branch_f669d + endchannel +; f66a5 + +Music_JohtoTrainerBattle_branch_f66a5: ; f66a5 + note D_, 2 + note A_, 2 + loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5 + endchannel +; f66ac + +Music_JohtoTrainerBattle_branch_f66ac: ; f66ac + octave 3 + note C_, 2 + note G_, 2 + loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac + endchannel +; f66b4 + +Music_JohtoTrainerBattle_branch_f66b4: ; f66b4 + note A#, 4 + note D#, 2 + note A#, 2 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A#, 2 + endchannel +; f66c3 + + diff --git a/crysaudio/music/johtowildbattle.asm b/crysaudio/music/johtowildbattle.asm new file mode 100644 index 00000000..d5ff7d86 --- /dev/null +++ b/crysaudio/music/johtowildbattle.asm @@ -0,0 +1,592 @@ +Music_JohtoWildBattle: ; f5dc5 + dbw $80, Music_JohtoWildBattle_Ch1 + dbw $01, Music_JohtoWildBattle_Ch2 + dbw $02, Music_JohtoWildBattle_Ch3 +; f5dce + +Music_JohtoWildBattle_Ch1: ; f5dce + ftempo 104 + volume $77 + dutycycle $3 + tone $0002 + vibrato $12, $15 +Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb + notetype $c, $b2 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + intensity $b2 + note G_, 6 + octave 2 + note A#, 6 + octave 3 + note D_, 4 + note C_, 4 + note C#, 4 + note D_, 8 + note D#, 6 + octave 2 + note A#, 6 + octave 3 + note D#, 4 + note C_, 4 + note D_, 4 + intensity $b5 + note D#, 8 + intensity $b2 + octave 4 + note D_, 6 + octave 3 + note A#, 6 + octave 4 + note D_, 4 + note C_, 4 + note C#, 4 + note D_, 8 + note D#, 6 + octave 3 + note A#, 6 + octave 4 + note D#, 4 + note C_, 4 + note D_, 4 + intensity $6f + note D#, 8 +Music_JohtoWildBattle_branch_f5e2d: ; f5e2d + intensity $b6 + octave 3 + note D_, 6 + octave 2 + note B_, 6 + note B_, 4 + octave 3 + note F_, 6 + note E_, 6 + note C_, 4 + note G#, 8 + note A#, 1 + note A_, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + octave 4 + note C_, 8 + octave 3 + note B_, 1 + note A#, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + note D_, 6 + octave 2 + note B_, 6 + note B_, 4 + octave 3 + note F_, 6 + note E_, 6 + note D_, 4 + note E_, 8 + note D_, 8 + note C_, 8 + note F_, 8 + note D#, 6 + note C_, 6 + note C_, 4 + note F#, 6 + note F_, 6 + note C#, 4 + note A_, 8 + note B_, 1 + note A#, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C#, 8 + note C_, 1 + octave 3 + note B_, 1 + note A_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 6 + note C_, 6 + note C_, 4 + note F#, 6 + note F_, 6 + note C#, 4 + note F_, 8 + note D#, 8 + note C#, 8 + note F#, 8 + intensity $b7 + note E_, 6 + note D_, 6 + note E_, 4 + note F_, 6 + note E_, 6 + note C_, 4 + note F_, 8 + note C_, 8 + note E_, 6 + note D_, 6 + note F_, 4 + note G_, 16 + octave 4 + note D_, 8 + note G_, 8 + note G_, 16 + note D_, 16 + octave 3 + note C_, 4 + note D_, 4 + note C_, 4 + octave 2 + note B_, 4 + octave 3 + note C_, 16 + note D_, 4 + note E_, 4 + note D_, 4 + note F#, 4 + note G_, 16 + loopchannel 0, Music_JohtoWildBattle_branch_f5e2d +; f5ea2 + +Music_JohtoWildBattle_Ch2: ; f5ea2 + dutycycle $3 + vibrato $8, $36 + tone $0001 + callchannel Music_JohtoWildBattle_branch_f5f5d + notetype $c, $c2 + octave 4 + note G_, 6 +Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2 + octave 3 + note D_, 6 + note G_, 4 + note F_, 4 + note F#, 4 + note G_, 8 + note G#, 6 + note D_, 6 + note G#, 4 + note F_, 4 + note G_, 4 + intensity $c7 + note G#, 8 + intensity $c2 + octave 4 + note G_, 6 + note D_, 6 + note G_, 4 + note F_, 4 + note F#, 4 + note G_, 8 + note G#, 6 + note D_, 6 + note G#, 4 + note F_, 4 + note G_, 4 + intensity $6f + note G#, 8 +Music_JohtoWildBattle_branch_f5ed1: ; f5ed1 + intensity $c4 + octave 3 + note G_, 6 + note D_, 6 + note D_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C#, 2 + intensity $b0 + note D#, 16 + intensity $b7 + note D#, 16 + intensity $c4 + octave 3 + note G_, 6 + note D_, 6 + note D_, 2 + note G_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note A_, 4 + note B_, 4 + intensity $b0 + note A_, 16 + intensity $b6 + note A_, 16 + intensity $c4 + note G#, 6 + note D#, 6 + note D#, 2 + note G#, 2 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A#, 2 + octave 4 + note D_, 2 + intensity $b0 + note E_, 16 + intensity $b7 + note E_, 16 + intensity $c4 + octave 3 + note G#, 6 + note D#, 6 + note D#, 2 + note G#, 2 + octave 4 + note C#, 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 4 + intensity $b0 + note A#, 16 + intensity $b5 + note A#, 16 + intensity $c6 + octave 4 + note B_, 12 + note G_, 2 + note B_, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 12 + octave 3 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C_, 2 + intensity $c7 + note D_, 16 + note G_, 8 + octave 5 + note C_, 8 + octave 4 + note B_, 16 + note G_, 16 + octave 3 + note E_, 4 + note F#, 4 + note E_, 4 + note D_, 4 + note E_, 16 + note G_, 4 + note A_, 4 + note G_, 4 + note A#, 4 + note B_, 16 + loopchannel 0, Music_JohtoWildBattle_branch_f5ed1 +; f5f5d + +Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d +Music_JohtoWildBattle_branch_f5f5d: ; f5f5d + notetype $c, $c2 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + octave 5 + note G_, 1 + endchannel +; f5f91 + +Music_JohtoWildBattle_Ch3: ; f5f91 + notetype $c, $14 +Music_JohtoWildBattleNight_branch_f5f94: ; f5f94 + octave 4 + note G_, 2 + octave 5 + note D_, 2 + octave 4 + note G_, 2 + octave 5 + note C#, 2 + octave 4 + note F#, 2 + octave 5 + note C_, 2 + octave 4 + note F#, 2 + note B_, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + callchannel Music_JohtoWildBattle_branch_f6055 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note D#, 2 + note G_, 2 + note F_, 2 +Music_JohtoWildBattle_branch_f5fc6: ; f5fc6 + note D_, 2 + note G_, 2 + loopchannel 6, Music_JohtoWildBattle_branch_f5fc6 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + callchannel Music_JohtoWildBattle_branch_f6055 + note F_, 2 + note F_, 2 + note G_, 2 + note G_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 +Music_JohtoWildBattle_branch_f5fdb: ; f5fdb + note D_, 2 + note G_, 2 + loopchannel 7, Music_JohtoWildBattle_branch_f5fdb + note F#, 4 + callchannel Music_JohtoWildBattle_branch_f6055 + callchannel Music_JohtoWildBattle_branch_f6055 +Music_JohtoWildBattle_branch_f5fe8: ; f5fe8 + note D_, 2 + note G_, 2 + loopchannel 7, Music_JohtoWildBattle_branch_f5fe8 + note D_, 2 + note A_, 2 +Music_JohtoWildBattle_branch_f5ff0: ; f5ff0 + note C_, 2 + note F_, 2 + loopchannel 5, Music_JohtoWildBattle_branch_f5ff0 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + callchannel Music_JohtoWildBattle_branch_f6055 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note G_, 4 +Music_JohtoWildBattle_branch_f6006: ; f6006 + note E_, 2 + note A_, 2 + loopchannel 8, Music_JohtoWildBattle_branch_f6006 + callchannel Music_JohtoWildBattle_branch_f6055 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note A#, 2 + note C#, 2 + note F#, 2 + note C#, 2 + note F#, 2 + note C#, 2 + note F#, 2 + note C#, 2 + note F#, 2 + note C#, 2 + note F#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note F_, 2 + note D#, 2 +Music_JohtoWildBattle_branch_f6027: ; f6027 + note D_, 2 + note G_, 2 + loopchannel 8, Music_JohtoWildBattle_branch_f6027 +Music_JohtoWildBattle_branch_f602d: ; f602d + note C_, 2 + note F_, 2 + loopchannel 7, Music_JohtoWildBattle_branch_f602d + note E_, 2 + note C_, 2 + note D_, 4 + note G_, 4 + note D_, 4 + note G_, 4 +Music_JohtoWildBattle_branch_f6039: ; f6039 + note D_, 2 + note G_, 2 + loopchannel 12, Music_JohtoWildBattle_branch_f6039 +Music_JohtoWildBattle_branch_f603f: ; f603f + note C_, 2 + note E_, 2 + loopchannel 7, Music_JohtoWildBattle_branch_f603f + note F_, 2 + note F#, 2 +Music_JohtoWildBattle_branch_f6047: ; f6047 + note D_, 2 + note G_, 2 + loopchannel 6, Music_JohtoWildBattle_branch_f6047 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + loopchannel 0, Music_JohtoWildBattle_branch_f5fdb +; f6055 + +Music_JohtoWildBattle_branch_f6055: ; f6055 + note D#, 2 + note G#, 2 + loopchannel 4, Music_JohtoWildBattle_branch_f6055 + endchannel +; f605c + + diff --git a/crysaudio/music/johtowildbattlenight.asm b/crysaudio/music/johtowildbattlenight.asm new file mode 100644 index 00000000..0c5bee45 --- /dev/null +++ b/crysaudio/music/johtowildbattlenight.asm @@ -0,0 +1,34 @@ +Music_JohtoWildBattleNight: ; f605c + dbw $80, Music_JohtoWildBattleNight_Ch1 + dbw $01, Music_JohtoWildBattleNight_Ch2 + dbw $02, Music_JohtoWildBattleNight_Ch3 +; f6065 + +Music_JohtoWildBattleNight_Ch1: ; f6065 + ftempo 107 + volume $77 + dutycycle $3 + tone $0002 + vibrato $10, $25 + loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb +; f6076 + +Music_JohtoWildBattleNight_Ch2: ; f6076 + dutycycle $3 + vibrato $20, $36 + tone $0001 + callchannel Music_JohtoWildBattleNight_branch_f5f5d + notetype $c, $c2 + octave 4 + note G_, 6 + tone $0001 + dutycycle $2 + loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2 +; f608f + +Music_JohtoWildBattleNight_Ch3: ; f608f + notetype $c, $11 + loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94 +; f6096 + + diff --git a/crysaudio/music/kantogymbattle.asm b/crysaudio/music/kantogymbattle.asm new file mode 100644 index 00000000..3c43a464 --- /dev/null +++ b/crysaudio/music/kantogymbattle.asm @@ -0,0 +1,618 @@ +Music_KantoGymBattle: ; ec720 + dbw $80, Music_KantoGymBattle_Ch1 + dbw $01, Music_KantoGymBattle_Ch2 + dbw $02, Music_KantoGymBattle_Ch3 +; ec729 + +Music_KantoGymBattle_Ch1: ; ec729 + ftempo 101 + volume $77 + dutycycle $3 + tone $0002 + vibrato $12, $15 + notetype $c, $b2 + octave 3 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + note A#, 1 + note B_, 1 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 8 + intensity $b7 + note B_, 2 + intensity $b2 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 8 + intensity $b7 + octave 3 + note E_, 2 + intensity $b2 + octave 2 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 8 + intensity $b7 + note B_, 2 + intensity $b2 + note A#, 2 + note A#, 6 + note A#, 2 + note A#, 6 + note A#, 2 + intensity $b4 + octave 3 + note E_, 4 + note E_, 4 + note E_, 2 +Music_KantoGymBattle_branch_ec78b: ; ec78b + callchannel Music_KantoGymBattle_branch_ec832 + octave 2 + note A#, 2 + intensity $b7 + note G#, 8 + note B_, 8 + octave 3 + note D#, 10 + note E_, 6 + callchannel Music_KantoGymBattle_branch_ec832 + note D#, 2 + intensity $b7 + note C#, 8 + octave 2 + note B_, 8 + note G#, 10 + octave 3 + note E_, 6 + intensity $b2 + note D#, 2 + note D#, 2 + note G_, 1 + note E_, 1 + note D#, 1 + note G_, 1 + note D#, 2 + note D#, 2 + note A#, 1 + note G#, 1 + note E_, 1 + note A#, 1 + note D#, 2 + note D#, 2 + note B_, 1 + note A#, 1 + note G#, 1 + note B_, 1 + note D#, 2 + intensity $b7 + note E_, 2 + intensity $b2 + note D#, 2 + note D#, 2 + note G_, 1 + note E_, 1 + note D#, 1 + note G_, 1 + note D#, 2 + note D#, 2 + note A#, 1 + note G#, 1 + note E_, 1 + note A#, 1 + note D#, 2 + note D#, 2 + note B_, 1 + note A#, 1 + note G#, 1 + note B_, 1 + note G#, 2 + intensity $b5 + note B_, 2 + note D#, 2 + note C#, 2 + octave 2 + note A#, 4 + note D#, 2 + note G#, 2 + note B_, 2 + octave 3 + note E_, 2 + note D#, 4 + note C#, 2 + octave 2 + note A#, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 3 + note C#, 2 + intensity $b7 + octave 2 + note B_, 8 + note A#, 8 + note G#, 10 + note B_, 6 + intensity $b5 + octave 3 + note D#, 2 + note C#, 2 + octave 2 + note A#, 4 + note D#, 2 + note G#, 2 + note B_, 2 + octave 3 + note E_, 2 + note D#, 4 + note C#, 2 + octave 2 + note A#, 2 + note A#, 2 + note G#, 2 + note A#, 2 + octave 3 + note C#, 2 + intensity $b7 + note E_, 8 + note F#, 8 + note G_, 16 + intensity $b2 + octave 2 + note G#, 2 + note G#, 2 + intensity $b7 + octave 3 + note C#, 12 + intensity $b2 + note G#, 2 + note F_, 4 + intensity $b5 + octave 2 + note F_, 4 + note G_, 2 + note G#, 2 + note A#, 2 + intensity $b2 + note A#, 2 + note A#, 2 + intensity $b7 + octave 3 + note D#, 12 + intensity $b2 + note A#, 2 + note G_, 4 + intensity $b7 + octave 4 + note D#, 6 + intensity $4c + octave 3 + note D_, 4 + loopchannel 0, Music_KantoGymBattle_branch_ec78b +; ec832 + +Music_KantoGymBattle_branch_ec832: ; ec832 + intensity $b5 + note D#, 2 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 2 + octave 2 + note A#, 2 + note D#, 2 + note G#, 2 + note A#, 2 + octave 3 + note D#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + endchannel +; ec847 + +Music_KantoGymBattle_Ch2: ; ec847 + dutycycle $3 + vibrato $8, $36 + tone $0001 + notetype $c, $c2 +Music_KantoGymBattle_branch_ec852: ; ec852 + octave 4 + note A#, 1 + note G#, 1 + note A#, 1 + octave 5 + note D#, 1 + loopchannel 8, Music_KantoGymBattle_branch_ec852 + octave 3 +Music_KantoGymBattle_branch_ec85d: ; ec85d + intensity $c2 + note D#, 2 + note D#, 2 + note F#, 1 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 2 + note D#, 2 + note A#, 1 + note G#, 1 + note F#, 1 + note A#, 1 + note D#, 2 + note D#, 2 + note B_, 1 + note A#, 1 + note G#, 1 + note B_, 1 + note D_, 2 + intensity $c7 + note E_, 2 + intensity $c2 + note D#, 2 + note D#, 2 + note F#, 1 + note E_, 1 + note D#, 1 + note F#, 1 + note D#, 2 + note D#, 2 + note A#, 1 + note G#, 1 + note F#, 1 + note A#, 1 + note D#, 2 + note D#, 2 + note B_, 1 + note A#, 1 + note G#, 1 + note B_, 1 + note G#, 2 + intensity $c7 + note B_, 2 + intensity $c2 + octave 4 + loopchannel 2, Music_KantoGymBattle_branch_ec85d +Music_KantoGymBattle_branch_ec894: ; ec894 + callchannel Music_KantoGymBattle_branch_ec907 + note E_, 8 + note G#, 8 + note B_, 10 + note G#, 6 + callchannel Music_KantoGymBattle_branch_ec907 + note E_, 8 + note G#, 8 + note B_, 10 + octave 4 + note E_, 6 + note D#, 8 + intensity $b7 + note D#, 8 + intensity $a2 + note __, 6 + octave 5 + note E_, 4 + note E_, 4 + note E_, 2 + intensity $a0 + note D#, 8 + intensity $a7 + note D#, 8 + note __, 12 + intensity $c5 + octave 3 + note A#, 4 + note B_, 4 + note G#, 4 + note A#, 4 + note B_, 4 + note G#, 4 + note E_, 4 + intensity $b0 + note D#, 8 + note D#, 16 + intensity $b7 + note D#, 12 + intensity $c5 + note A#, 4 + note B_, 4 + note G#, 4 + note A#, 4 + note B_, 4 + note G#, 4 + note B_, 4 + intensity $b0 + note A#, 8 + intensity $b7 + note A#, 8 + intensity $b0 + octave 4 + note D#, 8 + intensity $b7 + note D#, 8 + intensity $c2 + octave 3 + note C#, 2 + note C#, 2 + intensity $c7 + note F_, 8 + intensity $c2 + octave 4 + note C#, 4 + note F_, 2 + note C#, 4 + intensity $c7 + note G#, 4 + note G_, 2 + note F_, 2 + note D#, 2 + intensity $c2 + octave 3 + note D#, 2 + note D#, 2 + intensity $c7 + note G_, 8 + intensity $c2 + octave 4 + note D#, 4 + note G_, 2 + note D#, 4 + intensity $c7 + note A#, 6 + octave 3 + note A_, 4 + loopchannel 0, Music_KantoGymBattle_branch_ec894 +; ec907 + +Music_KantoGymBattle_branch_ec907: ; ec907 + dutycycle $2 + intensity $d1 + octave 3 + note A#, 2 + intensity $a2 + note A#, 2 + intensity $d1 + note G#, 2 + intensity $a2 + note G#, 2 + intensity $d1 + note A#, 2 + intensity $a2 + note A#, 2 + intensity $c5 + note B_, 2 + octave 4 + note C#, 2 + note C#, 2 + octave 3 + note B_, 4 + note A#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A#, 2 + dutycycle $3 + intensity $b0 + endchannel +; ec92e + +Music_KantoGymBattle_Ch3: ; ec92e + notetype $c, $19 + octave 2 + note E_, 1 + note __, 1 +Music_KantoGymBattle_branch_ec934: ; ec934 + note B_, 3 + note __, 1 + loopchannel 6, Music_KantoGymBattle_branch_ec934 + note B_, 2 + note G#, 2 + note B_, 2 +Music_KantoGymBattle_branch_ec93d: ; ec93d + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 4 + note D_, 1 + note __, 1 + note F_, 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 4 + note D#, 1 + note __, 1 + note E_, 2 + loopchannel 2, Music_KantoGymBattle_branch_ec93d +Music_KantoGymBattle_branch_ec965: ; ec965 + octave 2 + note D#, 2 + note A#, 2 + loopchannel 8, Music_KantoGymBattle_branch_ec965 +Music_KantoGymBattle_branch_ec96c: ; ec96c + note E_, 2 + note B_, 2 + loopchannel 4, Music_KantoGymBattle_branch_ec96c + octave 1 + note B_, 2 + octave 2 + note E_, 2 + octave 1 + note B_, 2 + octave 2 + note E_, 4 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 +Music_KantoGymBattle_branch_ec97f: ; ec97f + octave 2 + note F#, 2 + octave 3 + note C#, 2 + loopchannel 8, Music_KantoGymBattle_branch_ec97f +Music_KantoGymBattle_branch_ec987: ; ec987 + octave 2 + note E_, 2 + note B_, 2 + loopchannel 7, Music_KantoGymBattle_branch_ec987 + octave 3 + note E_, 2 + octave 2 + note B_, 2 +Music_KantoGymBattle_branch_ec992: ; ec992 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note D#, 1 + note __, 1 + note E_, 2 + loopchannel 2, Music_KantoGymBattle_branch_ec992 +Music_KantoGymBattle_branch_ec9a8: ; ec9a8 + note D#, 2 + note A#, 2 + loopchannel 7, Music_KantoGymBattle_branch_ec9a8 + octave 3 + note C#, 2 + octave 2 + note A#, 2 + note E_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + note B_, 2 + octave 3 + note E_, 2 +Music_KantoGymBattle_branch_ec9bb: ; ec9bb + octave 2 + note E_, 2 + note B_, 2 + loopchannel 5, Music_KantoGymBattle_branch_ec9bb +Music_KantoGymBattle_branch_ec9c2: ; ec9c2 + octave 2 + note F#, 2 + octave 3 + note C#, 2 + loopchannel 7, Music_KantoGymBattle_branch_ec9c2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + octave 2 + note E_, 2 + note A#, 2 + octave 3 + note E_, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note C#, 2 +Music_KantoGymBattle_branch_ec9d8: ; ec9d8 + octave 2 + note D#, 2 + note A#, 2 + loopchannel 4, Music_KantoGymBattle_branch_ec9d8 +Music_KantoGymBattle_branch_ec9df: ; ec9df + note C#, 2 + note G#, 2 + loopchannel 8, Music_KantoGymBattle_branch_ec9df +Music_KantoGymBattle_branch_ec9e5: ; ec9e5 + note D#, 2 + note A#, 2 + loopchannel 4, Music_KantoGymBattle_branch_ec9e5 + octave 3 + note D#, 2 + octave 2 + note A#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note A#, 2 + octave 3 + note D#, 2 + note F_, 2 + loopchannel 0, Music_KantoGymBattle_branch_ec965 +; ec9fa + + diff --git a/crysaudio/music/kantotrainerbattle.asm b/crysaudio/music/kantotrainerbattle.asm new file mode 100644 index 00000000..eb83243d --- /dev/null +++ b/crysaudio/music/kantotrainerbattle.asm @@ -0,0 +1,2297 @@ +Music_KantoTrainerBattle: ; ec9fa + dbw $80, Music_KantoTrainerBattle_Ch1 + dbw $01, Music_KantoTrainerBattle_Ch2 + dbw $02, Music_KantoTrainerBattle_Ch3 +; eca03 + + + + +Music_KantoTrainerBattle_Ch1: ; eca04 + ftempo 114 + volume $77 + forceoctave $1b + notetype $c, $b3 + vibrato $12, $24 + dutycycle $1 + note __, 1 + octave 4 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + dutycycle $2 + intensity $b1 + octave 4 + note D#, 2 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note D#, 2 + note __, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + note __, 2 + note D#, 2 + note __, 2 + octave 3 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 4 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note D#, 2 + note __, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + note __, 2 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + intensity $b3 + note D#, 2 + note __, 4 + note F_, 2 + note __, 4 + note F#, 2 + note __, 2 + note D#, 2 + note F_, 2 + note __, 2 + note F#, 2 + note __, 2 + note D#, 2 + note F_, 2 + note F#, 2 +Music_KantoTrainerBattle_branch_eca88: ; eca88 + notetype $c, $b7 + note D#, 4 + note __, 2 + note C_, 10 + note __, 4 + note D#, 2 + note C_, 2 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 8 + note F_, 8 + note G#, 8 + octave 5 + note C#, 4 + note C#, 1 + octave 4 + note G#, 1 + note F_, 1 + note C#, 1 + note D#, 4 + note __, 2 + note C_, 10 + note __, 4 + note D#, 2 + note C_, 2 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D#, 6 + note D_, 6 + note C_, 2 + note __, 2 + note __, 2 + note D_, 2 + note __, 4 + note F_, 2 + note __, 2 + note G#, 2 + note G_, 1 + note F#, 1 + octave 3 + note G#, 1 + note F_, 1 + note C_, 1 + note G#, 1 + octave 4 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + note C_, 1 + octave 3 + note G#, 1 + note F_, 1 + note __, 5 + octave 4 + note D#, 8 + note D_, 4 + octave 3 + note F_, 1 + note A_, 1 + octave 4 + note C_, 1 + note D#, 1 + note D_, 4 + octave 3 + note D_, 4 + octave 4 + note F_, 4 + octave 3 + note D_, 4 + note __, 4 + note D_, 4 + note __, 4 + note D_, 4 + note G#, 1 + note F_, 1 + note C_, 1 + note G#, 1 + octave 4 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + note C_, 1 + octave 3 + note G#, 1 + note F_, 1 + note __, 5 + octave 4 + note D#, 8 + note D_, 4 + octave 3 + note F_, 1 + note A_, 1 + octave 4 + note C_, 1 + note D#, 1 + note D_, 4 + octave 3 + note D_, 4 + note __, 4 + note D_, 4 + note A#, 1 + octave 4 + note D_, 1 + note F_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 4 + note F_, 2 + note D_, 2 + octave 3 + note A#, 2 + note D_, 2 + octave 4 + note D_, 2 + intensity $67 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + note __, 3 + note D#, 4 + notetype $6, $67 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 7 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + octave 4 + note C_, 8 + intensity $77 + note C#, 2 + note D_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note __, 6 + note E_, 8 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 7 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 3 + note G#, 1 + note __, 3 + octave 4 + note C#, 8 + intensity $87 + note D_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note __, 6 + note F_, 8 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 7 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + octave 4 + note D_, 8 + intensity $97 + note D#, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note __, 6 + note F#, 8 + intensity $a7 + note G#, 8 + note A#, 8 + intensity $b7 + octave 5 + note D_, 8 + note D_, 2 + note __, 6 + octave 4 + note A#, 2 + note F#, 2 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note F#, 2 + note D#, 2 + octave 3 + note A#, 2 + note F#, 2 + octave 4 + note G#, 2 + note __, 2 + note D#, 12 + intensity $b1 + octave 6 + note C_, 2 + note C_, 2 + note C_, 8 + note C_, 2 + note C_, 2 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + intensity $b7 + octave 4 + note A#, 2 + note F#, 2 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note F#, 2 + note D#, 2 + octave 3 + note A#, 2 + note F#, 2 + octave 4 + note F#, 2 + note __, 2 + note B_, 4 + note A#, 4 + note G#, 4 + note F#, 4 + note F_, 4 + note D#, 4 + note D_, 4 + note D#, 8 + note F#, 8 + octave 5 + note C_, 8 + note D#, 8 + octave 4 + note C#, 16 + notetype $c, $b7 + ;ch1 insert + + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 4 + note F_, 2 + note F#, 2 + note F_, 2 + note F#, 2 + note F_, 2 + note F#, 2 + note F_, 2 + octave 3 + note G#, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note C#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + intensity 183 + note D#, 16 + note C#, 16 + octave 2 + note B_, 16 + note G#, 12 + octave 3 + note D#, 1 + note F_, 1 + note G#, 1 + octave 4 + note C#, 1 + note D#, 6 + note D#, 2 + note F#, 8 + octave 3 + note B_, 6 + note B_, 2 + octave 4 + note C#, 8 + note D#, 6 + note D#, 2 + note F_, 8 + note F#, 6 + note F#, 2 + note G#, 8 + note F_, 2 + note __, 2 + note F_, 2 + note F_, 2 + note __, 4 + note F_, 2 + note __, 2 + note F_, 2 + note __, 2 + note F_, 2 + note F_, 2 + note __, 4 + note F_, 2 + note __, 2 + note F_, 2 + note __, 2 + note F_, 2 + note F_, 2 + note __, 4 + note F_, 2 + note __, 2 + note F_, 2 + note __, 2 + note F_, 2 + note F_, 2 + note __, 4 + note F_, 2 + note __, 2 + octave 3 + note D_, 2 + note D#, 4 + note C_, 2 + note D_, 4 + note __, 2 + note D_, 1 + note D#, 1 + note F_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 9 + note D#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note __, 5 + note D_, 1 + note D#, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 2 + note F_, 2 + note F#, 2 + note G#, 2 + note E_, 1 + note F_, 1 + note F#, 1 + note G_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note __, 5 + note D#, 1 + note E_, 1 + note __, 2 + note G_, 2 + note F_, 4 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note F_, 8 + note G_, 8 + note G#, 8 + octave 4 + note C#, 4 + octave 3 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 4 + loopchannel 0, Music_KantoTrainerBattle_branch_eca88 +; ecbea + +Music_KantoTrainerBattle_Ch2: ; ecbea + forceoctave $1b + vibrato $6, $36 + dutycycle $1 + notetype $c, $d1 + octave 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note A#, 4 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + dutycycle $3 + intensity $62 +Music_KantoTrainerBattle_branch_ecc04: ; ecc04 + octave 3 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + loopchannel 14, Music_KantoTrainerBattle_branch_ecc04 + note G_, 1 + note G#, 1 + note G_, 1 + note F_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + octave 2 + note B_, 1 + intensity $d7 + dutycycle $2 + note C_, 2 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + octave 1 + note A#, 2 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + note A_, 2 + octave 2 + note A_, 1 + note __, 1 + octave 1 + note A_, 1 + note __, 1 + note G#, 2 + octave 2 + note G#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + note G_, 1 + note B_, 1 + octave 2 + note D_, 1 + note F_, 1 + note G_, 1 + note B_, 1 + octave 3 + note D_, 1 + note F_, 1 +Music_KantoTrainerBattle_branch_ecc41: ; ecc41 + notetype $c, $d7 + octave 2 + note C_, 1 + note C_, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note C_, 2 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note C_, 2 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note C_, 2 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note C#, 1 + note C#, 1 + note G#, 1 + note __, 1 + octave 3 + note C#, 2 + octave 2 + note C#, 2 + note G#, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note C#, 2 + note G#, 1 + note __, 1 + note A#, 2 + note C#, 1 + note C#, 1 + note F_, 1 + note __, 1 + note G#, 2 + octave 3 + note C#, 1 + note __, 1 + note F_, 2 + note G#, 1 + note __, 1 + note A#, 2 + octave 2 + note C_, 1 + note C_, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note C_, 2 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note C_, 2 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note C_, 2 + note A_, 1 + note __, 1 + note F_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 1 + note A#, 1 + note A#, 1 + octave 2 + note F_, 1 + note __, 1 + note A#, 2 + octave 1 + note A#, 2 + octave 2 + note F_, 1 + note __, 1 + note A_, 2 + octave 1 + note A#, 2 + octave 2 + note F_, 1 + note __, 1 + note G#, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 2 + note F_, 1 + note __, 1 + note G_, 2 + note A#, 1 + note __, 1 + octave 3 + note D_, 2 + note F_, 1 + note __, 1 + note A#, 2 + octave 1 + note F_, 2 + octave 2 + note F_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note F_, 2 + octave 2 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 1 + note F_, 2 + octave 2 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 1 + note F_, 2 + octave 2 + note D_, 1 + note __, 1 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + note A_, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note F_, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note F#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note G_, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note G#, 4 + octave 1 + note F_, 2 + octave 2 + note F_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note F_, 2 + octave 2 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 1 + note F_, 2 + octave 2 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 1 + note F_, 2 + octave 2 + note D_, 1 + note __, 1 + note D#, 1 + note C_, 1 + octave 1 + note A#, 1 + note A_, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note F_, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note F#, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note G_, 4 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note G#, 4 + vibrato $12, $24 + notetype $c, $78 + octave 4 + note G_, 16 + intensity $77 + note G_, 16 + notetype $6, $88 + note G#, 16 + intensity $87 + note G#, 15 + note G_, 1 + note G#, 7 + note A_, 1 + note A#, 3 + note A_, 1 + note G#, 8 + note G_, 4 + note F_, 6 + note __, 2 + notetype $c, $98 + note A_, 16 + intensity $97 + note A_, 16 + intensity $a7 + note A#, 16 + intensity $d7 + octave 5 + note D_, 8 + note F_, 8 + vibrato $4, $36 + octave 2 + note A#, 4 + note D#, 4 + note C_, 1 + note __, 1 + intensity $d8 + note G#, 6 + intensity $d7 + note G#, 16 + note A#, 4 + note D#, 4 + note D#, 1 + note __, 1 + octave 3 + note D#, 14 + octave 2 + note C_, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + notetype $6, $d7 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 3 + note G#, 8 + octave 4 + note F_, 2 + note F#, 2 + note F_, 2 + note D#, 2 + note F_, 2 + note __, 2 + note D#, 2 + note __, 2 + ;ch2 insert + forceoctave $00 + octave 3 + note E_, 2 + note __, 2 + note F_, 2 + note __, 2 + note G_, 2 + note __, 2 + note C_, 2 + note __, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + octave 2 + note B_, 1 + note A#, 1 + notetype $c, $d2 + note G#, 1 + note __, 2 + note G#, 1 + note __, 2 + note E_, 1 + note __, 1 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + octave 1 + note A_, 1 + octave 2 + note A_, 2 + note E_, 1 + octave 1 + note A_, 2 + octave 2 + note F_, 2 + octave 1 + note A_, 1 + octave 2 + note A_, 2 + note F_, 1 + octave 1 + note A_, 1 + note A_, 2 + octave 2 + note F#, 1 + octave 1 + note A_, 2 + octave 2 + note A_, 1 + note F#, 1 + octave 1 + note A_, 2 + octave 2 + note G_, 2 + octave 1 + note A_, 1 + octave 2 + note A_, 2 + note A_, 1 + octave 1 + note A#, 2 + octave 2 + note F_, 2 + octave 1 + note A#, 1 + octave 2 + note A#, 2 + note F_, 1 + octave 1 + note A#, 2 + octave 2 + note F#, 2 + octave 1 + note A#, 1 + octave 2 + note A#, 2 + note F#, 1 + octave 1 + note A#, 1 + note A#, 2 + octave 2 + note G_, 1 + octave 1 + note A#, 2 + octave 2 + note A#, 1 + note G_, 1 + octave 1 + note A#, 2 + octave 2 + note G#, 2 + octave 1 + note A#, 1 + octave 2 + note A#, 2 + note A#, 1 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note F_, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note F#, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note G_, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 2 + note A_, 2 + octave 1 + note A#, 2 + octave 2 + note F_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 2 + note A#, 2 + octave 1 + note A#, 2 + octave 2 + note F_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 2 + note A#, 2 + octave 1 + note A#, 2 + octave 2 + note F_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 2 + note A#, 2 + octave 1 + note A#, 2 + octave 2 + note F_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 2 + note A#, 2 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note F_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note F_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note E_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note E_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note D_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note D_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note E_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note E_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note F_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note F_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note E_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note E_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note D_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note D_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note E_, 4 + octave 1 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + octave 3 + note E_, 4 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note B_, 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note A_, 3 + octave 3 + note E_, 1 + note E_, 2 + octave 2 + note B_, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note E_, 1 + note E_, 1 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note A_, 1 + note A_, 1 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note E_, 1 + note E_, 1 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note F_, 2 + octave 2 + note F_, 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note A#, 1 + note A#, 1 + octave 3 + note F_, 2 + octave 2 + note F_, 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note F_, 1 + note F_, 1 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 1 + note B_, 1 + note B_, 1 + octave 3 + note F#, 2 + octave 2 + note F#, 2 + note B_, 2 + octave 3 + note F#, 2 + octave 1 + note F#, 1 + note F#, 1 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 1 + note B_, 1 + note B_, 1 + octave 3 + note F#, 2 + octave 2 + note F#, 2 + note B_, 2 + octave 3 + note F#, 2 + octave 1 + note F#, 1 + note F#, 1 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + octave 2 + note C_, 1 + note C_, 1 + octave 3 + note G_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note G_, 2 + octave 1 + note G_, 1 + note G_, 1 + octave 3 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 + forceoctave $1b + + loopchannel 0, Music_KantoTrainerBattle_branch_ecc41 +; ecdd2 + +Music_KantoTrainerBattle_Ch3: ; ecdd2 + forceoctave $1b + vibrato $12, $23 + notetype $c, $15 + octave 2 + note A#, 1 + octave 4 + note A#, 1 + octave 3 + note A#, 2 + octave 2 + note A_, 1 + octave 4 + note A_, 1 + octave 3 + note A_, 2 + octave 2 + note G#, 1 + octave 4 + note G#, 1 + octave 3 + note G#, 2 + octave 2 + note G_, 1 + octave 4 + note G_, 1 + octave 3 + note G_, 2 + octave 2 + note F#, 1 + octave 4 + note F#, 1 + octave 3 + note F#, 2 + octave 2 + note F_, 1 + octave 4 + note F_, 1 + octave 3 + note F_, 2 + octave 2 + note E_, 1 + octave 4 + note E_, 1 + octave 3 + note E_, 2 + note D_, 1 + note F_, 1 + note B_, 1 + octave 4 + note D_, 1 + intensity $18 + octave 6 + note C_, 2 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 5 + note F_, 2 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 5 + note F#, 2 + octave 4 + note C_, 1 + note D#, 1 + octave 5 + note D#, 2 + note F_, 2 + note __, 2 + note F#, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note D#, 2 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 5 + note F_, 2 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 5 + note F#, 2 + octave 4 + note C_, 1 + note D#, 1 + octave 5 + note D#, 2 + note F_, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 6 + note C_, 2 + note __, 4 + note D_, 2 + note __, 4 + note D#, 2 + note __, 2 + note C_, 2 + note D_, 2 + note __, 2 + note D#, 2 + note __, 2 + octave 5 + note G_, 2 + note A#, 2 + note B_, 2 +Music_KantoTrainerBattle_branch_ece5a: ; ece5a + notetype $c, $14 + octave 6 + note C_, 4 + notetype $6, $14 + octave 5 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + notetype $c, $14 + note G_, 10 + note __, 2 + notetype $6, $14 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + octave 6 + note C_, 6 + octave 5 + note A_, 1 + note G#, 1 + note G_, 8 + octave 6 + note C_, 7 + octave 5 + note B_, 1 + notetype $c, $14 + octave 6 + note C#, 16 + note C#, 8 + note F_, 4 + note G#, 1 + note F_, 1 + note C#, 1 + octave 5 + note G#, 1 + octave 6 + note C_, 4 + notetype $6, $14 + octave 5 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + notetype $c, $14 + note G_, 10 + note __, 2 + notetype $6, $14 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + octave 6 + note C_, 6 + octave 5 + note A_, 1 + note G#, 1 + note G_, 8 + octave 6 + note C_, 7 + octave 5 + note B_, 1 + note A#, 16 + note A#, 16 + note A#, 13 + note B_, 1 + octave 6 + note C_, 1 + note C#, 1 + note D_, 8 + note F_, 2 + note D_, 2 + octave 5 + note A#, 2 + note A_, 2 + notetype $c, $10 + note G#, 11 + intensity $14 + note C_, 1 + note F_, 1 + note __, 1 + note G#, 1 + note __, 1 + intensity $10 + octave 6 + note C_, 6 + notetype $6, $10 + octave 5 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G#, 16 + notetype $c, $10 + note A#, 16 + intensity $25 + note D_, 1 + octave 4 + note A#, 1 + note F_, 1 + note A#, 1 + octave 5 + note F_, 1 + note D_, 1 + octave 4 + note A#, 1 + octave 5 + note D_, 1 + note A#, 1 + note F_, 1 + note D_, 1 + note F_, 1 + octave 6 + note D_, 2 + note C#, 1 + note C_, 1 + intensity $10 + octave 5 + note G#, 11 + intensity $14 + note C_, 1 + note F_, 1 + note __, 1 + note G#, 1 + note __, 1 + intensity $10 + octave 6 + note C_, 7 + notetype $6, $10 + note C#, 1 + note D_, 1 + notetype $c, $10 + note D#, 8 + note D_, 12 + note G#, 1 + note F_, 1 + intensity $25 + octave 5 + note A#, 1 + note F_, 1 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 2 + note F_, 2 + intensity $24 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + octave 3 + note D#, 1 + octave 4 + note C_, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + intensity $14 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + intensity $15 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + intensity $15 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note F#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note F#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note F#, 1 + octave 4 + note D#, 1 + octave 3 + note A#, 1 + octave 4 + note D#, 1 + octave 3 + note F#, 1 + octave 4 + note D#, 1 + intensity $14 + octave 3 + note F_, 1 + note G#, 1 + note B_, 1 + octave 4 + note D_, 1 + octave 3 + note G#, 1 + note B_, 1 + octave 4 + note D_, 1 + note F_, 1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + note F_, 1 + note G#, 1 + note D_, 1 + note F_, 1 + note G#, 1 + octave 5 + note D_, 1 + octave 6 + note D#, 4 + octave 5 + note A#, 4 + octave 6 + note C#, 1 + note __, 1 + note C_, 6 + octave 4 + note C_, 1 + note D#, 1 + note G#, 1 + octave 5 + note C_, 1 + note D#, 1 + note G#, 1 + octave 6 + note C_, 1 + note D#, 1 + note G#, 1 + note D#, 1 + note C_, 1 + octave 5 + note G#, 1 + note D#, 1 + note C_, 1 + octave 4 + note G#, 1 + note D#, 1 + octave 6 + note D#, 4 + octave 5 + note A#, 4 + note B_, 1 + note __, 1 + octave 6 + note F#, 12 + note F_, 1 + note F#, 1 + note G#, 16 + note F_, 16 + ;ch3 insert + note F_, 16 + note C#, 6 + octave 5 + note A#, 14 + octave 6 + note C#, 4 + octave 5 + note A#, 4 + octave 6 + note C#, 4 + octave 5 + note B_, 4 + octave 6 + notetype $6, $14 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + notetype $c, $14 + note F#, 14 + octave 5 + note B_, 4 + intensity $15 + note F#, 4 + note D#, 4 + note C#, 6 + octave 4 + note A#, 14 + octave 5 + note C#, 4 + note F_, 2 + note D#, 2 + note C#, 2 + note F_, 2 + note D#, 2 + octave 4 + note B_, 4 + octave 5 + note F#, 10 + intensity $14 + note G#, 6 + note F#, 6 + note D#, 4 + note F#, 16 + note F_, 16 + note D#, 16 + note F_, 16 + intensity $15 + note F#, 16 + note F_, 16 + note G#, 16 + note F#, 16 + intensity $18 + octave 4 + note B_, 2 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + note __, 2 + note A#, 2 + note __, 2 + octave 3 + note A#, 2 + octave 4 + note A#, 2 + note __, 2 + octave 3 + note A#, 2 + octave 4 + note A#, 2 + note __, 2 + octave 5 + note C#, 2 + note __, 2 + octave 4 + note C#, 2 + octave 5 + note C#, 2 + note __, 2 + octave 4 + note C#, 2 + octave 5 + note C#, 2 + note __, 2 + octave 4 + note B_, 2 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note B_, 2 + note __, 2 + octave 3 + note A#, 2 + octave 4 + note A#, 2 + note __, 2 + intensity $15 + note A#, 4 + octave 5 + note C_, 4 + octave 4 + note G#, 1 + note __, 1 + note A#, 6 + note __, 4 + octave 5 + note C_, 1 + note C#, 1 + note D_, 2 + note F_, 2 + note D#, 2 + note D_, 1 + note C#, 1 + note C_, 2 + octave 4 + note B_, 16 + note __, 2 + note B_, 2 + octave 5 + note C#, 2 + note F#, 2 + note F_, 2 + note D#, 2 + note C#, 1 + note C_, 1 + octave 4 + note B_, 2 + octave 5 + note C_, 16 + note __, 2 + note C_, 2 + note D_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note D#, 1 + note C#, 1 + note C_, 2 + note C#, 16 + intensity $14 + note F_, 8 + note G#, 8 + + loopchannel 0, Music_KantoTrainerBattle_branch_ece5a +; ed06d + + diff --git a/crysaudio/music/kantowildbattle.asm b/crysaudio/music/kantowildbattle.asm new file mode 100644 index 00000000..6146b53a --- /dev/null +++ b/crysaudio/music/kantowildbattle.asm @@ -0,0 +1,1229 @@ +Music_KantoWildBattle: ; ed06d + dbw $80, Music_KantoWildBattle_Ch1 + dbw $01, Music_KantoWildBattle_Ch2 + dbw $02, Music_KantoWildBattle_Ch3 +; ed076 + + + + +Music_KantoWildBattle_Ch1: ; ed077 + ftempo 112 + volume $77 + vibrato $12, $23 + dutycycle $2 + notetype $c, $b7 + note __, 16 + octave 4 + note A#, 6 + note A_, 1 + note G#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 +Music_KantoWildBattle_branch_ed091: ; ed091 + notetype $c, $b7 + callchannel Music_KantoWildBattle_branch_ed18a + octave 4 + note F_, 4 + note C#, 4 + octave 3 + note B_, 8 + callchannel Music_KantoWildBattle_branch_ed18a + note __, 8 + note G_, 1 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note G_, 1 + note B_, 1 + octave 4 + note D_, 1 + note D#, 1 + intensity $b1 + note E_, 6 + note C_, 6 + octave 3 + note G_, 4 + octave 4 + note E_, 6 + note C_, 6 + note E_, 4 + intensity $b7 + note F_, 1 + note C#, 1 + octave 3 + note G#, 1 + octave 4 + note C_, 1 + note C#, 1 + octave 3 + note G#, 1 + note F_, 1 + note G_, 1 + note G#, 4 + note F#, 1 + note G_, 1 + note G#, 1 + octave 4 + note C_, 1 + note C#, 4 + octave 3 + note F_, 1 + note G#, 1 + octave 4 + note C#, 1 + note E_, 1 + note F_, 3 + note G_, 1 + note G#, 4 + intensity $b1 + octave 3 + note G_, 6 + note F_, 6 + note E_, 4 + note G#, 6 + note G_, 6 + note F_, 4 + octave 4 + note C_, 6 + octave 3 + note A#, 6 + note G_, 4 + notetype $8, $b7 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note E_, 2 + note F_, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + octave 2 + note G#, 2 + notetype $c, $b7 + octave 3 + note G#, 4 + octave 4 + note C#, 4 + intensity $71 + note F_, 1 + note F_, 1 + intensity $91 + note F_, 1 + note F_, 1 + intensity $b1 + note G#, 1 + note G#, 1 + intensity $d1 + note G#, 1 + note G#, 1 + intensity $c7 + note E_, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 12 + note E_, 8 + intensity $b1 + note E_, 1 + note D_, 1 + note C_, 1 + octave 3 + note A#, 1 + note A_, 1 + note G_, 1 + note F_, 1 + note E_, 1 + intensity $b7 + note D_, 8 + note F_, 8 + note A#, 8 + octave 4 + note D_, 8 + octave 3 + note G_, 8 + octave 4 + note C_, 8 + note E_, 8 + note G_, 8 + note __, 8 + octave 3 + note D#, 8 + note G#, 8 + octave 4 + note C_, 8 + octave 3 + note A#, 8 + note __, 8 + octave 4 + note D_, 8 + octave 3 + note G#, 2 + note F_, 2 + note D_, 2 + note F_, 2 + octave 4 + note C_, 4 + note __, 6 + note C_, 1 + note __, 5 + note C#, 2 + note C_, 1 + note __, 13 + note C#, 4 + note __, 6 + note C#, 1 + note __, 5 + note F_, 2 + note D#, 1 + note __, 5 + note C#, 8 +Music_KantoWildBattle_branch_ed15b: ; ed15b + intensity $b1 + octave 3 + note C_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + loopchannel 8, Music_KantoWildBattle_branch_ed15b +Music_KantoWildBattle_branch_ed166: ; ed166 + note C#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + loopchannel 8, Music_KantoWildBattle_branch_ed166 +Music_KantoWildBattle_branch_ed16e: ; ed16e + note C_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + loopchannel 16, Music_KantoWildBattle_branch_ed16e +Music_KantoWildBattle_branch_ed176: ; ed176 + note C#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + loopchannel 8, Music_KantoWildBattle_branch_ed176 +Music_KantoWildBattle_branch_ed17e: ; ed17e + note C_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + loopchannel 8, Music_KantoWildBattle_branch_ed17e + loopchannel 0, Music_KantoWildBattle_branch_ed091 +; ed18a + +Music_KantoWildBattle_branch_ed18a: ; ed18a + octave 4 + note C_, 1 + note __, 5 + octave 3 + note B_, 1 + note __, 5 + note A#, 1 + note __, 3 + note __, 10 + octave 4 + note C_, 2 + note __, 2 + note D#, 2 + note C#, 1 + note __, 5 + note C_, 1 + note __, 5 + octave 3 + note B_, 1 + note __, 3 + endchannel +; ed19f + +Music_KantoWildBattle_Ch2: ; ed19f + dutycycle $1 + vibrato $12, $23 + notetype $c, $b1 + octave 4 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 +Music_KantoWildBattle_branch_ed1c8: ; ed1c8 + notetype $c, $b7 + callchannel Music_KantoWildBattle_branch_ed2c6 + octave 2 + note F_, 2 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note G_, 2 + callchannel Music_KantoWildBattle_branch_ed2c6 + octave 2 + note G_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note F_, 1 + note F#, 1 + notetype $6, $b7 + callchannel Music_KantoWildBattle_branch_ed307 + callchannel Music_KantoWildBattle_branch_ed307 + forceoctave $1 + callchannel Music_KantoWildBattle_branch_ed307 + callchannel Music_KantoWildBattle_branch_ed307 + forceoctave $0 + callchannel Music_KantoWildBattle_branch_ed307 + callchannel Music_KantoWildBattle_branch_ed307 + callchannel Music_KantoWildBattle_branch_ed307 + callchannel Music_KantoWildBattle_branch_ed307 + forceoctave $1 + callchannel Music_KantoWildBattle_branch_ed307 + callchannel Music_KantoWildBattle_branch_ed307 + forceoctave $0 + callchannel Music_KantoWildBattle_branch_ed307 + callchannel Music_KantoWildBattle_branch_ed307 + note __, 16 + octave 3 + note A#, 16 + octave 4 + note D_, 16 + note F_, 16 + notetype $c, $b7 + note E_, 16 + note G_, 8 + octave 5 + note C_, 8 + note __, 8 + octave 3 + note G#, 8 + octave 4 + note C_, 8 + note D#, 8 + note F_, 8 + note F_, 1 + octave 3 + note A#, 1 + note G#, 1 + note A#, 1 + octave 4 + note F_, 1 + octave 3 + note A#, 1 + note G#, 1 + note A#, 1 + octave 4 + note G#, 8 + note G#, 1 + note F_, 1 + note D_, 1 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + note D_, 1 + octave 3 + note B_, 1 + note G#, 1 + notetype $6, $b7 + callchannel Music_KantoWildBattle_branch_ed31b + forceoctave $1 + callchannel Music_KantoWildBattle_branch_ed31b + forceoctave $0 + callchannel Music_KantoWildBattle_branch_ed340 + octave 2 + note C_, 2 + note __, 2 + octave 3 + note G_, 4 + octave 2 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 4 + note C_, 4 + octave 2 + note C_, 2 + note __, 2 + octave 4 + note D#, 4 + octave 2 + note C_, 2 + note __, 2 + octave 4 + note C#, 4 + octave 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 4 + note C#, 4 + octave 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 4 + note C#, 4 + octave 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 4 + note C#, 4 + octave 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 4 + note C#, 4 + octave 2 + note C#, 2 + note __, 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 + forceoctave $1 + callchannel Music_KantoWildBattle_branch_ed340 + forceoctave $0 + note C#, 2 + note __, 2 + octave 3 + note G#, 4 + octave 2 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 4 + note C#, 4 + octave 2 + note C#, 2 + note __, 2 + octave 3 + note A#, 4 + octave 2 + note C#, 2 + note __, 2 + callchannel Music_KantoWildBattle_branch_ed340 + note C_, 2 + note __, 2 + octave 3 + note G_, 4 + octave 2 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 4 + note C_, 4 + octave 2 + note C_, 2 + note __, 2 + octave 3 + note A#, 4 + octave 2 + note C_, 2 + note __, 2 + loopchannel 0, Music_KantoWildBattle_branch_ed1c8 +; ed2c6 + +Music_KantoWildBattle_branch_ed2c6: ; ed2c6 + octave 2 + note C_, 1 + note __, 2 + note C_, 1 + octave 1 + note G_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + octave 1 + note G_, 1 + note __, 2 + note G_, 1 + octave 2 + note C_, 3 + note C_, 1 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note F#, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note C#, 1 + note __, 2 + note C#, 1 + octave 1 + note G#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note C#, 2 + octave 1 + note G#, 1 + note __, 2 + note G#, 1 + octave 2 + note C#, 1 + note __, 2 + note C#, 1 + octave 1 + note G#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + octave 1 + note G_, 2 + endchannel +; ed307 + +Music_KantoWildBattle_branch_ed307: ; ed307 + octave 2 + note C_, 2 + note __, 4 + note C_, 1 + note __, 1 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 4 + note __, 2 + note C_, 2 + note __, 2 + note C_, 2 + octave 3 + note C_, 2 + note __, 2 + octave 2 + note C_, 4 + endchannel +; ed31b + +Music_KantoWildBattle_branch_ed31b: ; ed31b + octave 2 + note C_, 2 + note __, 4 + note C_, 2 + note __, 4 + octave 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 2 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 2 + note C_, 6 + note C_, 2 + note __, 4 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note E_, 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 2 + note __, 4 + note C_, 2 + note E_, 2 + note G_, 2 + note B_, 2 + octave 3 + note C_, 2 + endchannel +; ed340 + +Music_KantoWildBattle_branch_ed340: ; ed340 + octave 3 + note G_, 4 + octave 2 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 3 + note G_, 4 + octave 2 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 3 + note G_, 4 + octave 2 + note C_, 2 + note __, 2 + endchannel +; ed354 + +Music_KantoWildBattle_branch_ed354: ; ed354 + note C_, 2 + note __, 2 + octave 3 + note G_, 4 + octave 2 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 3 + note G_, 4 + octave 2 + note C_, 2 + note __, 2 + octave 3 + note G_, 4 + octave 2 + note C_, 2 + note __, 2 + endchannel +; ed368 + +Music_KantoWildBattle_Ch3: ; ed368 + vibrato $14, $23 + notetype $c, $14 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + octave 4 + note C_, 1 + octave 3 + note C#, 1 + note __, 1 + note C#, 1 + octave 4 + note C#, 1 + octave 3 + note D_, 1 + note __, 1 + note D_, 1 + octave 4 + note D_, 1 + octave 3 + note D#, 1 + note __, 1 + note D#, 1 + octave 4 + note D#, 1 + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + octave 4 + note E_, 1 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + octave 4 + note F_, 1 + octave 3 + note F#, 1 + note __, 1 + note F#, 1 + octave 4 + note F#, 1 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + octave 4 + note G_, 1 +Music_KantoWildBattle_branch_ed39e: ; ed39e + notetype $c, $14 + octave 5 + note G_, 1 + note __, 2 + octave 4 + note G_, 1 + note __, 2 + octave 5 + note G_, 1 + note __, 3 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note G_, 1 + note __, 2 + octave 4 + note G_, 1 + octave 3 + note G_, 1 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note D#, 6 + octave 5 + note D#, 2 + note __, 2 + note G_, 2 + note G#, 1 + note __, 2 + octave 4 + note G#, 1 + note __, 2 + octave 5 + note G#, 1 + note __, 3 + octave 4 + note G#, 1 + note __, 1 + octave 5 + note G#, 1 + note __, 2 + octave 4 + note G#, 1 + octave 6 + note C#, 6 + octave 5 + note G#, 1 + note F_, 1 + note B_, 1 + note G_, 1 + note F_, 1 + note D_, 1 + note G_, 1 + note F_, 1 + note D_, 1 + octave 4 + note B_, 1 + octave 5 + note G_, 1 + note __, 2 + octave 4 + note G_, 1 + note __, 2 + octave 5 + note G_, 1 + note __, 3 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note G_, 1 + note __, 2 + octave 4 + note G_, 1 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + note G_, 6 + octave 5 + note D#, 2 + note __, 2 + note G_, 2 + note G#, 1 + note __, 2 + octave 4 + note G_, 1 + note __, 2 + octave 5 + note G#, 1 + note __, 3 + octave 4 + note G_, 1 + note __, 1 + octave 5 + note G#, 1 + note __, 2 + octave 4 + note G_, 1 + note C#, 4 + note G#, 4 + octave 5 + note F_, 7 + note F#, 1 + note G_, 2 + intensity $24 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + intensity $14 + octave 5 + note F#, 2 + intensity $24 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + intensity $14 + octave 5 + note E_, 2 + intensity $24 + note C_, 1 + octave 4 + note G_, 1 + intensity $14 + octave 5 + note G_, 2 + intensity $24 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + intensity $14 + octave 5 + note A_, 2 + intensity $24 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + intensity $14 + octave 5 + note G_, 2 + intensity $24 + note C_, 1 + octave 4 + note G#, 1 + intensity $14 + octave 5 + note G#, 12 + note G_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C#, 1 + note F_, 1 + note G#, 1 + octave 6 + note C_, 1 + note C#, 8 + octave 5 + note C_, 2 + intensity $24 + octave 4 + note E_, 1 + note G_, 1 + note E_, 1 + note G_, 1 + intensity $14 + note A#, 2 + intensity $24 + note E_, 1 + note G_, 1 + note E_, 1 + note G_, 1 + intensity $14 + note G#, 2 + intensity $24 + note E_, 1 + note G_, 1 + intensity $14 + octave 5 + note C#, 2 + intensity $24 + octave 4 + note E_, 1 + note G_, 1 + note E_, 1 + note G_, 1 + intensity $14 + octave 5 + note C_, 2 + intensity $24 + octave 4 + note E_, 1 + note G_, 1 + note E_, 1 + note G_, 1 + intensity $14 + note A#, 2 + intensity $24 + note E_, 1 + note G_, 1 + intensity $14 + octave 5 + note F_, 2 + intensity $24 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + intensity $14 + note E_, 2 + intensity $24 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + intensity $14 + note D_, 2 + intensity $24 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + intensity $14 + octave 4 + note A#, 4 + octave 5 + note C_, 4 + note D_, 4 + note F_, 4 + note G#, 16 + notetype $6, $14 + note G#, 1 + note __, 1 + intensity $24 + note G#, 1 + note __, 1 + intensity $34 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + intensity $24 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + intensity $14 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 6 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 5 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + notetype $c, $15 + note G_, 12 + note G_, 8 + notetype $6, $15 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + intensity $24 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + intensity $14 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + notetype $c, $14 + octave 2 + note A#, 16 + note A#, 1 + note __, 2 + note A#, 1 + note __, 2 + note A#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 2 + note A#, 1 + note __, 2 + note A#, 1 + note __, 1 + note C_, 1 + note __, 2 + notetype $6, $15 + note C_, 1 + note __, 1 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 4 + note __, 2 + note C_, 2 + note __, 2 + note C_, 2 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note C_, 4 + note C_, 2 + note __, 4 + note C_, 1 + note __, 1 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 4 + note __, 2 + note C_, 2 + note __, 2 + note C_, 2 + octave 2 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + notetype $c, $14 + note G#, 16 + note G#, 16 + note A#, 2 + note __, 2 + note A#, 1 + note __, 3 + note A#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 5 + note E_, 4 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + note B_, 1 + octave 5 + note C_, 1 + note __, 1 + note E_, 1 + note __, 5 + note F_, 2 + note E_, 1 + note __, 1 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note C_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + note E_, 1 + note G_, 1 + note F_, 4 + octave 4 + note C#, 1 + note F_, 1 + note G#, 1 + octave 5 + note C_, 1 + note C#, 1 + note __, 1 + note F_, 1 + note __, 5 + note G#, 2 + note G_, 1 + note __, 5 + note F_, 8 + intensity $13 + note G_, 6 + note F#, 6 + note E_, 2 + note __, 2 + note G_, 6 + note A_, 6 + note G_, 2 + note __, 2 + note G#, 12 + note G_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note __, 4 + octave 6 + note C#, 8 + octave 5 + note C_, 6 + octave 4 + note A#, 6 + note G#, 2 + note __, 2 + octave 5 + note C#, 6 + note C_, 6 + octave 4 + note A#, 2 + note __, 2 + octave 5 + note F_, 6 + note E_, 6 + note D_, 2 + note __, 2 + octave 4 + note A#, 4 + octave 5 + note C_, 4 + note D_, 4 + note F_, 4 + note G#, 16 + note G#, 16 + note G_, 16 + note G_, 16 + loopchannel 0, Music_KantoWildBattle_branch_ed39e +; ed5c6 + + diff --git a/crysaudio/music/lakeofrage.asm b/crysaudio/music/lakeofrage.asm new file mode 100644 index 00000000..8a57ab38 --- /dev/null +++ b/crysaudio/music/lakeofrage.asm @@ -0,0 +1,329 @@ +Music_LakeOfRage: ; ee6c5 + dbw $c0, Music_LakeOfRage_Ch1 + dbw $01, Music_LakeOfRage_Ch2 + dbw $02, Music_LakeOfRage_Ch3 + dbw $03, Music_LakeOfRage_Ch4 +; ee6d1 + +Music_LakeOfRage_Ch1: ; ee6d1 + tempo 144 + volume $77 + dutycycle $3 + tone $0002 + vibrato $8, $22 + stereopanning $f0 + notetype $c, $b4 + octave 3 + note D_, 6 + note D_, 10 + note D_, 6 + note D_, 6 + note E_, 4 +Music_LakeOfRage_branch_ee6e9: ; ee6e9 + intensity $b5 + note F#, 6 + note E_, 6 + note D_, 4 + octave 4 + note D_, 6 + note C_, 4 + note E_, 2 + note D_, 4 + octave 3 + note B_, 6 + note G_, 2 + notetype $8, $b5 + note D_, 4 + note G_, 4 + note B_, 4 + notetype $c, $b4 + note D_, 3 + note F#, 1 + intensity $b7 + note A_, 8 + note F#, 4 + note A_, 3 + octave 4 + note C#, 1 + note D_, 12 + notetype $8, $b4 + octave 3 + note C_, 4 + octave 2 + note B_, 4 + note A_, 4 + notetype $8, $b7 + note A_, 12 + notetype $c, $b7 + octave 3 + note C_, 12 + intensity $b4 + note E_, 4 + note D_, 2 + intensity $b7 + octave 2 + note A_, 10 + intensity $b4 + octave 3 + note E_, 4 + note D_, 3 + note E_, 1 + intensity $b7 + note F#, 8 + note D_, 6 + note C_, 1 + note E_, 1 + note C_, 8 + note E_, 6 + note E_, 1 + note G_, 1 + note E_, 8 + note G_, 6 + note F#, 1 + note G_, 1 + intensity $a0 + note A_, 7 + intensity $a7 + note A_, 7 + note A_, 1 + octave 4 + note C_, 1 + intensity $a0 + note D_, 6 + intensity $a7 + note D_, 6 + loopchannel 0, Music_LakeOfRage_branch_ee6e9 +; ee749 + +Music_LakeOfRage_Ch2: ; ee749 + dutycycle $3 + vibrato $20, $44 + stereopanning $ff + notetype $c, $90 + octave 3 + note G_, 8 + intensity $97 + note G_, 8 + intensity $a0 + note A_, 8 + intensity $a7 + note A_, 8 +Music_LakeOfRage_branch_ee75e: ; ee75e + notetype $8, $c7 + octave 4 + note D_, 16 + octave 3 + note A_, 4 + octave 4 + note D_, 4 + note A_, 16 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + notetype $c, $c7 + note G_, 12 + note B_, 4 + note A_, 3 + note G_, 1 + intensity $b0 + note F#, 12 + intensity $b7 + note F#, 16 + notetype $8, $c3 + octave 3 + note G_, 4 + note F#, 4 + note E_, 4 + note C_, 15 + notetype $c, $c3 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + note __, 1 + note E_, 1 + note G_, 1 + intensity $c5 + octave 5 + note C_, 10 + intensity $c3 + octave 4 + note A_, 4 + note G_, 4 + note F#, 4 + note E_, 2 + notetype $8, $c3 + note D_, 4 + note E_, 4 + note F#, 4 + notetype $8, $c7 + note A_, 12 + notetype $8, $c3 + octave 3 + note G_, 4 + note F#, 4 + note E_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note A_, 4 + octave 4 + note E_, 4 + note D_, 4 + note C_, 4 + note G_, 4 + note F#, 4 + note E_, 4 + notetype $8, $c7 + note F#, 16 + note D_, 4 + note F#, 4 + notetype $c, $c7 + note A_, 16 + loopchannel 0, Music_LakeOfRage_branch_ee75e +; ee7c1 + +Music_LakeOfRage_Ch3: ; ee7c1 + stereopanning $f + notetype $c, $16 + octave 3 + note G_, 4 + note __, 2 + note G_, 4 + note __, 6 + note F#, 4 + note __, 2 + note F#, 4 + note __, 2 + note E_, 4 +Music_LakeOfRage_branch_ee7d0: ; ee7d0 + octave 3 + note D_, 4 + octave 2 + note A_, 2 + octave 3 + note D_, 4 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note F_, 4 + note C_, 2 + note F_, 4 + note C_, 2 + note F_, 2 + note F#, 2 + note G_, 4 + note D_, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note B_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note A_, 4 + note D_, 2 + note E_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note A_, 2 + octave 4 + note D_, 4 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + octave 3 + note E_, 4 + note C_, 2 + note E_, 4 + note C_, 2 + note E_, 2 + note C_, 2 + note G_, 4 + note C_, 2 + note G_, 4 + note C_, 2 + note G_, 2 + note C_, 2 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note F#, 2 + octave 4 + note D_, 4 + octave 3 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 4 + note C_, 2 + note G_, 4 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 4 + note C_, 2 + note G_, 4 + note C_, 2 + note G_, 2 + note C_, 2 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 2 + note D_, 2 + note D_, 4 + octave 2 + note A_, 2 + octave 3 + note D_, 4 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + loopchannel 0, Music_LakeOfRage_branch_ee7d0 +; ee835 + +Music_LakeOfRage_Ch4: ; ee835 + stereopanning $f0 + togglenoise $3 + notetype $c +Music_LakeOfRage_branch_ee83b: ; ee83b + note D_, 2 + note D_, 1 + 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 +; ee852 + + diff --git a/crysaudio/music/lakeofragerocketradio.asm b/crysaudio/music/lakeofragerocketradio.asm new file mode 100644 index 00000000..2abd2931 --- /dev/null +++ b/crysaudio/music/lakeofragerocketradio.asm @@ -0,0 +1,41 @@ +Music_LakeOfRageRocketRadio: ; ef5b1 + dbw $80, Music_LakeOfRageRocketRadio_Ch1 + dbw $01, Music_LakeOfRageRocketRadio_Ch2 + dbw $02, Music_LakeOfRageRocketRadio_Ch3 +; ef5ba + +Music_LakeOfRageRocketRadio_Ch1: ; ef5ba + tempo 160 + volume $77 + dutycycle $1 + tone $1118 + vibrato $0, $f0 + stereopanning $f0 +Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9 + notetype $c, $a7 + octave 7 + note G_, 4 + note F#, 4 + note G_, 4 + note F#, 4 + note __, 16 + loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 +; ef5d6 + +Music_LakeOfRageRocketRadio_Ch2: ; ef5d6 + dutycycle $1 + vibrato $13, $e8 + notetype $c, $a7 + note __, 2 + stereopanning $f + loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 +; ef5e5 + +Music_LakeOfRageRocketRadio_Ch3: ; ef5e5 + notetype $c, $26 + vibrato $10, $44 + note __, 4 + loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 +; ef5f0 + + diff --git a/crysaudio/music/lavendertown.asm b/crysaudio/music/lavendertown.asm new file mode 100644 index 00000000..88aabb03 --- /dev/null +++ b/crysaudio/music/lavendertown.asm @@ -0,0 +1,524 @@ +Music_LavenderTown: ; ef72f + dbw $80, Music_LavenderTown_Ch1 + dbw $01, Music_LavenderTown_Ch2 + dbw $02, Music_LavenderTown_Ch3 +; ef738 + + + + +Music_LavenderTown_Ch1: ; ef739 + 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: ; ef74c + callchannel Music_LavenderTown_branch_ef7fd + intensity $93 + octave 5 + note D_, 2 + intensity $43 + note D_, 2 + intensity $93 + note F#, 2 + intensity $43 + note F#, 2 + intensity $93 + note B_, 2 + intensity $43 + note B_, 2 + intensity $93 + note A_, 2 + intensity $43 + note A_, 2 + callchannel Music_LavenderTown_branch_ef87f + intensity $93 + intensity $93 + note F_, 2 + intensity $83 + note F_, 2 + intensity $93 + note D_, 2 + intensity $43 + note D_, 2 + intensity $93 + octave 4 + note B_, 2 + intensity $43 + note B_, 2 + intensity $93 + note G_, 2 + intensity $43 + note G_, 2 + callchannel Music_LavenderTown_branch_ef7fd + intensity $93 + octave 5 + note D_, 2 + intensity $43 + note D_, 2 + intensity $93 + note G_, 2 + intensity $43 + note G_, 2 + intensity $93 + note B_, 2 + intensity $43 + note B_, 2 + intensity $93 + note G_, 2 + intensity $43 + note G_, 2 + callchannel Music_LavenderTown_branch_ef87f + intensity $93 + octave 6 + note C_, 2 + intensity $43 + note C_, 2 + intensity $93 + octave 5 + note G_, 2 + intensity $43 + note G_, 2 + intensity $93 + note E_, 2 + intensity $43 + note E_, 2 + intensity $93 + note C_, 2 + intensity $43 + note C_, 2 + octave 3 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + note E_, 2 + note F_, 2 + note C_, 2 + octave 3 + note A_, 2 + note F_, 2 +Music_LavenderTown_branch_ef7ca: ; ef7ca + octave 3 + note C_, 2 + note E_, 2 + note G_, 2 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note E_, 2 + note C_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + note E_, 2 + note F_, 2 + note C_, 2 + octave 3 + note A_, 2 + note F_, 2 + loopchannel 2, Music_LavenderTown_branch_ef7ca + note F#, 2 + note A_, 2 + octave 4 + note C_, 2 + note F#, 2 + note A_, 2 + note C_, 2 + octave 3 + note A_, 2 + note F#, 2 + note G_, 2 + octave 4 + note C_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 8 + note B_, 8 + loopchannel 0, Music_LavenderTown_branch_ef74c +; ef7fd + +Music_LavenderTown_branch_ef7fd: ; ef7fd + intensity $83 + octave 5 + note C_, 2 + intensity $43 + note C_, 2 + intensity $83 + note G_, 2 + intensity $43 + note G_, 2 + intensity $83 + octave 6 + note C_, 2 + intensity $43 + note C_, 2 + intensity $83 + octave 5 + note G_, 2 + intensity $43 + note G_, 2 + intensity $83 + note D_, 2 + intensity $43 + note D_, 2 + intensity $83 + note A_, 2 + intensity $43 + note A_, 2 + intensity $83 + octave 6 + note D_, 2 + intensity $43 + note D_, 2 + intensity $83 + octave 5 + note A_, 2 + intensity $43 + note A_, 2 + intensity $83 + note E_, 2 + intensity $43 + note E_, 2 + intensity $83 + note B_, 2 + intensity $43 + note B_, 2 + intensity $83 + octave 6 + note E_, 2 + intensity $43 + note E_, 2 + intensity $83 + octave 5 + note B_, 2 + intensity $43 + note B_, 2 + intensity $83 + note C#, 2 + intensity $43 + note C#, 2 + intensity $83 + note G_, 2 + intensity $43 + note G_, 2 + intensity $83 + note A#, 2 + intensity $43 + note A#, 2 + intensity $83 + note G_, 2 + intensity $43 + note G_, 2 + intensity $83 + note C_, 2 + intensity $43 + note C_, 2 + intensity $83 + note F_, 2 + intensity $43 + note F_, 2 + intensity $83 + octave 6 + note C_, 2 + intensity $43 + note C_, 2 + intensity $83 + octave 5 + note F_, 2 + intensity $43 + note F_, 2 + endchannel +; ef87f + +Music_LavenderTown_branch_ef87f: ; ef87f + intensity $93 + octave 5 + note G_, 2 + intensity $83 + note G_, 2 + intensity $83 + note F_, 2 + intensity $43 + note F_, 2 + intensity $83 + note D_, 2 + intensity $43 + note D_, 2 + intensity $83 + note G_, 2 + intensity $43 + note G_, 2 + endchannel +; ef899 + +Music_LavenderTown_Ch2: ; ef899 + dutycycle $1 + vibrato $8, $24 + stereopanning $ff +Music_LavenderTown_branch_ef8a0: ; ef8a0 + notetype $c, $a3 + octave 5 + note C_, 2 + intensity $63 + note C_, 2 + intensity $a3 + note G_, 2 + intensity $63 + note G_, 2 + intensity $a3 + note B_, 2 + intensity $63 + note B_, 2 + intensity $a3 + note F#, 2 + intensity $63 + note F#, 2 + loopchannel 3, Music_LavenderTown_branch_ef8a0 + intensity $a3 + note C_, 2 + intensity $63 + note C_, 2 + intensity $a3 + note G_, 2 + intensity $63 + note G_, 2 + intensity $a3 + note B_, 2 + intensity $63 + note B_, 2 + intensity $a3 + octave 6 + note D_, 2 + intensity $63 + note D_, 2 +Music_LavenderTown_branch_ef8d7: ; ef8d7 + intensity $b5 + callchannel Music_LavenderTown_branch_ef915 + octave 2 + note F#, 4 + octave 3 + note C_, 4 + note F#, 4 + note A_, 4 + octave 2 + note G_, 4 + octave 3 + note C_, 4 + note D_, 4 + note G_, 4 + note F_, 4 + note D_, 4 + octave 2 + note B_, 4 + note G_, 4 + callchannel Music_LavenderTown_branch_ef915 + octave 2 + note G_, 4 + octave 3 + note C_, 4 + note F_, 4 + note G_, 4 + note C_, 4 + note F_, 4 + note G_, 4 + note F_, 4 + note C_, 4 + note E_, 4 + note G_, 4 + octave 4 + note C_, 4 + intensity $b7 + octave 2 + note F_, 16 + note C_, 16 + note F_, 16 + note C_, 16 + note F_, 16 + note F#, 16 + note G_, 16 + octave 1 + note G_, 8 + intensity $57 + octave 5 + note D_, 1 + note F_, 1 + note G_, 6 + loopchannel 0, Music_LavenderTown_branch_ef8d7 +; ef915 + +Music_LavenderTown_branch_ef915: ; ef915 + octave 2 + note C_, 4 + note G_, 4 + octave 3 + note E_, 4 + octave 2 + note G_, 4 + note D_, 4 + note A_, 4 + octave 3 + note F_, 4 + octave 2 + note A_, 4 + note E_, 4 + note B_, 4 + octave 3 + note G_, 4 + note F_, 4 + note E_, 4 + note C#, 4 + octave 2 + note A#, 4 + note G_, 4 + note F_, 4 + octave 3 + note C_, 4 + note A_, 4 + note C_, 4 + endchannel +; ef932 + +Music_LavenderTown_Ch3: ; ef932 + vibrato $12, $24 + notetype $c, $13 + stereopanning $f0 + note __, 16 + note __, 16 + note __, 16 + note __, 8 + octave 5 + note E_, 4 + note F_, 4 +Music_LavenderTown_branch_ef941: ; ef941 + intensity $12 + octave 5 + note G_, 4 + note __, 4 + note G_, 4 + note __, 4 + note E_, 4 + note __, 4 + note E_, 4 + note F_, 4 + note G_, 4 + note F_, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note __, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note F_, 10 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 8 + octave 4 + note A_, 4 + octave 5 + note D_, 4 + note E_, 12 + note F_, 2 + note E_, 2 + note D_, 12 + note E_, 2 + note F_, 2 + note G_, 4 + note __, 4 + note G_, 4 + note __, 4 + note E_, 4 + note __, 4 + note E_, 4 + note F_, 4 + note G_, 4 + note F_, 4 + note E_, 4 + note B_, 4 + note C#, 8 + note __, 2 + note C#, 2 + note D_, 2 + note E_, 2 + note F_, 10 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 12 + note C_, 2 + note D_, 2 + note C_, 16 + note C_, 12 + note __, 4 + intensity $24 + note A_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 6 + note C_, 4 + octave 5 + note G_, 4 + note F_, 4 + note E_, 4 + note D_, 4 + note C_, 4 + note A_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 6 + note C_, 4 + octave 5 + note G_, 4 + octave 6 + note F_, 4 + notetype $8, $24 + note E_, 2 + note F_, 2 + note E_, 2 + notetype $c, $24 + note D_, 4 + note C_, 4 + octave 5 + note A_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 6 + note C_, 4 + octave 5 + note G_, 4 + note A_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 6 + note C_, 4 + note C#, 4 + note D_, 12 + note C_, 4 + octave 5 + note B_, 12 + note E_, 2 + note F_, 2 + loopchannel 0, Music_LavenderTown_branch_ef941 +; ef9bc + + diff --git a/crysaudio/music/lighthouse.asm b/crysaudio/music/lighthouse.asm new file mode 100644 index 00000000..74abfcde --- /dev/null +++ b/crysaudio/music/lighthouse.asm @@ -0,0 +1,316 @@ +Music_Lighthouse: ; ee569 + dbw $c0, Music_Lighthouse_Ch1 + dbw $01, Music_Lighthouse_Ch2 + dbw $02, Music_Lighthouse_Ch3 + dbw $03, Music_Lighthouse_Ch4 +; ee575 + +Music_Lighthouse_Ch1: ; ee575 + tempo 144 + volume $77 + dutycycle $3 + tone $0004 + vibrato $8, $45 + stereopanning $f +Music_Lighthouse_branch_ee584: ; ee584 + notetype $c, $b3 + octave 3 + note C#, 8 + octave 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 3 + note C#, 4 + octave 2 + note B_, 4 + note A_, 4 + note B_, 4 + note G#, 1 + note __, 7 + octave 3 + note C_, 4 + octave 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note C_, 2 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C#, 8 + octave 2 + note C#, 2 + note F#, 2 + note G#, 2 + octave 3 + note C_, 2 + note D_, 2 + note C#, 2 + octave 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 2 + note G#, 1 + note __, 7 + octave 3 + note C_, 12 + octave 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + octave 3 + note C_, 1 + note __, 3 + octave 2 + note A_, 4 + octave 3 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 + note E_, 4 + note F#, 2 + note E_, 2 + note D#, 12 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 8 + note A_, 4 + octave 3 + note A_, 4 + note G#, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + octave 3 + note C#, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 12 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G#, 8 + loopchannel 0, Music_Lighthouse_branch_ee584 +; ee5fc + +Music_Lighthouse_Ch2: ; ee5fc + dutycycle $3 + tone $0002 + vibrato $10, $45 +Music_Lighthouse_branch_ee604: ; ee604 + notetype $c, $c5 + octave 3 + note G#, 12 + note F#, 2 + note G#, 2 + note A_, 8 + octave 4 + note C#, 8 + note C_, 1 + note __, 7 + octave 3 + note G#, 16 + intensity $c5 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note G#, 12 + note F#, 2 + note G#, 2 + note A_, 8 + octave 4 + note C#, 8 + note C_, 1 + note __, 7 + note D#, 12 + octave 3 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 3 + note D#, 1 + note __, 3 + octave 4 + note E_, 12 + note D#, 2 + note C#, 2 + octave 3 + note G#, 12 + note A#, 4 + note B_, 2 + octave 4 + note C#, 2 + note D#, 12 + octave 3 + note D#, 2 + note C#, 2 + note D#, 2 + note C#, 2 + note C_, 8 + octave 4 + note E_, 12 + note D#, 2 + note C#, 2 + octave 3 + note G#, 12 + octave 4 + note C_, 4 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + note D#, 12 + octave 3 + note D#, 2 + note C#, 2 + note D#, 2 + note C#, 2 + note C_, 8 + loopchannel 0, Music_Lighthouse_branch_ee604 +; ee656 + +Music_Lighthouse_Ch3: ; ee656 + notetype $c, $19 + stereopanning $f0 +Music_Lighthouse_branch_ee65b: ; ee65b + octave 2 + note G#, 2 + note __, 2 + note D#, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 2 + note __, 2 +Music_Lighthouse_branch_ee664: ; ee664 + note G#, 2 + note __, 2 + note D#, 2 + note __, 2 + note F#, 2 + note __, 2 + note A_, 2 + note __, 2 + loopchannel 2, Music_Lighthouse_branch_ee664 + note G#, 2 + note __, 2 + note D#, 2 + note __, 2 + note F#, 2 + note __, 2 + note A_, 2 + octave 3 + note C_, 2 + note C#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 +Music_Lighthouse_branch_ee683: ; ee683 + note C#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + loopchannel 2, Music_Lighthouse_branch_ee683 + note C#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 3 + note D#, 2 + note F#, 2 +Music_Lighthouse_branch_ee69b: ; ee69b + note E_, 2 + note __, 2 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 + note F_, 2 + note __, 2 + loopchannel 8, Music_Lighthouse_branch_ee69b + loopchannel 0, Music_Lighthouse_branch_ee65b +; ee6ad + +Music_Lighthouse_Ch4: ; ee6ad + togglenoise $0 + notetype $c +Music_Lighthouse_branch_ee6b1: ; ee6b1 + stereopanning $f + note G#, 4 + 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 +; ee6c5 + + diff --git a/crysaudio/music/lookbeauty.asm b/crysaudio/music/lookbeauty.asm new file mode 100644 index 00000000..7f08f2ff --- /dev/null +++ b/crysaudio/music/lookbeauty.asm @@ -0,0 +1,333 @@ +Music_LookBeauty: ; eee3e + dbw $c0, Music_LookBeauty_Ch1 + dbw $01, Music_LookBeauty_Ch2 + dbw $02, Music_LookBeauty_Ch3 + dbw $03, Music_LookBeauty_Ch4 +; eee4a + +Music_LookBeauty_Ch1: ; eee4a + stereopanning $f + vibrato $12, $25 + dutycycle $2 + tempo 128 + volume $77 + notetype $c, $a3 + note __, 16 + note __, 8 + octave 4 + note C_, 8 + dutycycle $3 +Music_LookBeauty_branch_eee5f: ; eee5f + note __, 4 + octave 3 + note D_, 1 + note __, 5 + note D_, 1 + note __, 5 + note __, 2 + note D_, 1 + note __, 3 + note D_, 1 + note __, 5 + note D_, 4 + note __, 4 + note D_, 1 + note __, 5 + note D_, 1 + note __, 5 + note __, 2 + note D_, 1 + note __, 3 + note D_, 1 + note __, 3 + note D_, 2 + note __, 2 + note D_, 2 + note __, 4 + note E_, 1 + note __, 5 + note E_, 1 + note __, 5 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 4 + note __, 4 + note F#, 1 + note __, 5 + note F#, 1 + note __, 3 + note D_, 2 + note D_, 1 + note __, 7 + octave 2 + note A_, 1 + octave 3 + note C_, 1 + note D#, 1 + note F#, 1 + note D#, 1 + note F#, 1 + note A_, 1 + octave 4 + note C_, 1 + loopchannel 0, Music_LookBeauty_branch_eee5f +; eee9c + +Music_LookBeauty_Ch2: ; eee9c + stereopanning $f0 + vibrato $10, $23 + dutycycle $2 + notetype $c, $c7 + octave 3 + note D_, 1 + note __, 1 + octave 5 + note D_, 6 + note C_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + note A#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 2 + note D_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + dutycycle $3 +Music_LookBeauty_branch_eeec5: ; eeec5 + notetype $c, $c7 + note G_, 16 + note A_, 8 + note B_, 8 + note A_, 10 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 2 + note G#, 8 + note __, 2 + note F_, 2 + note __, 2 + note E_, 2 + intensity $b7 + vibrato $10, $24 + octave 5 + note C_, 15 + notetype $6, $c7 + intensity $c5 + vibrato $10, $23 + note __, 1 + note C#, 1 + note D_, 16 + note C_, 16 + octave 4 + note B_, 16 + note __, 4 + octave 5 + note D_, 2 + note __, 2 + octave 4 + note B_, 2 + note __, 2 + note A_, 6 + note __, 14 + note F#, 8 + note A_, 8 + loopchannel 0, Music_LookBeauty_branch_eeec5 +; eeefa + +Music_LookBeauty_Ch3: ; eeefa + stereopanning $ff + vibrato $8, $12 + notetype $c, $15 + note __, 16 + octave 5 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 3 + note D_, 7 + note F#, 1 +Music_LookBeauty_branch_eef0f: ; eef0f + note G_, 4 + octave 4 + note B_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + note G_, 2 + note G_, 1 + octave 4 + note A#, 1 + note B_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 3 + octave 4 + note B_, 4 + octave 3 + note E_, 4 + octave 4 + note B_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note E_, 2 + note E_, 1 + octave 4 + note G_, 1 + note G#, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 3 + note G#, 2 + note __, 2 + note B_, 2 + octave 3 + note A_, 4 + octave 5 + note C_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + note A_, 2 + note A_, 1 + octave 4 + note B_, 1 + octave 5 + note C_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + note D_, 1 + note __, 3 + note C_, 4 + octave 3 + note D_, 4 + octave 4 + note B_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 4 + note A_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 4 + note A_, 2 + note A_, 1 + note __, 7 + octave 3 + note D_, 8 + loopchannel 0, Music_LookBeauty_branch_eef0f +; eef8b + +Music_LookBeauty_Ch4: ; eef8b + togglenoise $3 + notetype $c + note __, 16 + note __, 16 +Music_LookBeauty_branch_eef91: ; eef91 + callchannel Music_LookBeauty_branch_eefa1 + callchannel Music_LookBeauty_branch_eefa1 + callchannel Music_LookBeauty_branch_eefa1 + callchannel Music_LookBeauty_branch_eefa1 + loopchannel 0, Music_LookBeauty_branch_eef91 +; eefa1 + +Music_LookBeauty_branch_eefa1: ; 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 +; eefb2 + + diff --git a/crysaudio/music/lookhiker.asm b/crysaudio/music/lookhiker.asm new file mode 100644 index 00000000..a213b49c --- /dev/null +++ b/crysaudio/music/lookhiker.asm @@ -0,0 +1,122 @@ +Music_LookHiker: ; f7411 + dbw $c0, Music_LookHiker_Ch1 + dbw $01, Music_LookHiker_Ch2 + dbw $02, Music_LookHiker_Ch3 + dbw $03, Music_LookHiker_Ch4 +; f741d + +Music_LookHiker_Ch1: ; f741d + tempo 132 + volume $77 + tone $0001 + vibrato $12, $24 + dutycycle $2 + stereopanning $f + notetype $c, $68 + octave 3 + note F#, 2 + note F_, 2 + note F#, 8 +Music_LookHiker_branch_f7433: ; f7433 + note D_, 2 + note D#, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note __, 4 + note F#, 2 + note __, 4 + note F#, 2 + note __, 2 + note F#, 2 + note __, 6 + loopchannel 0, Music_LookHiker_branch_f7433 +; f7443 + +Music_LookHiker_Ch2: ; f7443 + dutycycle $0 + notetype $c, $a1 + note __, 4 + octave 1 + note B_, 1 + note B_, 5 + octave 2 + note F#, 1 + note F#, 5 + octave 1 + note B_, 1 + octave 2 + note D_, 1 + note F#, 1 + note D_, 1 + intensity $a1 +Music_LookHiker_branch_f7457: ; f7457 + octave 1 + note B_, 1 + note B_, 2 + octave 2 + note D_, 1 + note D_, 2 + note F#, 1 + note F#, 2 + note A#, 1 + note A#, 2 + octave 1 + note B_, 1 + octave 2 + note D_, 1 + note F#, 1 + note D_, 1 + loopchannel 0, Music_LookHiker_branch_f7457 +; f746b + +Music_LookHiker_Ch3: ; f746b + vibrato $12, $24 + stereopanning $f0 + notetype $c, $14 + octave 4 + note B_, 2 + note A#, 2 + note B_, 8 +Music_LookHiker_branch_f7477: ; f7477 + octave 5 + note D#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + callchannel Music_LookHiker_branch_f748a + note G_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + callchannel Music_LookHiker_branch_f748a + loopchannel 0, Music_LookHiker_branch_f7477 +; f748a + +Music_LookHiker_branch_f748a: ; f748a + octave 4 + note B_, 2 + note __, 4 + note B_, 2 + note __, 4 + note B_, 2 + note __, 2 + note B_, 2 + note __, 6 + endchannel +; f7494 + +Music_LookHiker_Ch4: ; f7494 + togglenoise $3 + notetype $c + note F_, 4 + note __, 16 +Music_LookHiker_branch_f749a: ; f749a + note D#, 2 + note G_, 2 + note D_, 2 + note G_, 2 + loopchannel 0, Music_LookHiker_branch_f749a +; f74a2 + + diff --git a/crysaudio/music/lookkimonogirl.asm b/crysaudio/music/lookkimonogirl.asm new file mode 100644 index 00000000..06e15297 --- /dev/null +++ b/crysaudio/music/lookkimonogirl.asm @@ -0,0 +1,276 @@ +Music_LookKimonoGirl: ; f79b8 + dbw $80, Music_LookKimonoGirl_Ch1 + dbw $01, Music_LookKimonoGirl_Ch2 + dbw $02, Music_LookKimonoGirl_Ch3 +; f79c1 + + + + +Music_LookKimonoGirl_Ch1: ; f79c2 + tempo 160 + volume $77 + stereopanning $f + dutycycle $1 + notetype $6, $87 + tone $0001 + callchannel Music_LookKimonoGirl_branch_f7aa8 + tone $0000 +Music_LookKimonoGirl_branch_f79d7: ; 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 + octave 3 + note E_, 1 + intensity $54 + octave 4 + note E_, 1 + intensity $b4 + octave 3 + note D_, 1 + intensity $54 + octave 4 + note D_, 1 + intensity $b4 + octave 2 + note B_, 1 + intensity $54 + octave 3 + note B_, 1 + intensity $b4 + octave 2 + note A_, 1 + intensity $54 + octave 3 + note A_, 1 + loopchannel 0, Music_LookKimonoGirl_branch_f79d7 +; f7a13 + +Music_LookKimonoGirl_branch_f7a13: ; f7a13 + intensity $b4 + octave 2 + note F_, 1 + intensity $74 + octave 3 + note F_, 1 + intensity $b4 + octave 2 + note A_, 1 + intensity $74 + octave 3 + note A_, 1 + intensity $b4 + octave 2 + note B_, 1 + intensity $74 + octave 3 + note B_, 1 + intensity $b4 + octave 3 + note D_, 1 + intensity $74 + octave 4 + note D_, 1 + endchannel +; f7a34 + +Music_LookKimonoGirl_branch_f7a34: ; f7a34 + intensity $b4 + octave 2 + note E_, 1 + intensity $74 + octave 3 + note E_, 1 + intensity $b4 + octave 2 + note A_, 1 + intensity $74 + octave 3 + note A_, 1 + intensity $b4 + octave 2 + note B_, 1 + intensity $74 + octave 3 + note B_, 1 + intensity $b4 + octave 3 + note D_, 1 + intensity $74 + octave 4 + note D_, 1 + endchannel +; f7a55 + +Music_LookKimonoGirl_Ch2: ; f7a55 + dutycycle $0 + notetype $6, $a7 + stereopanning $f0 + callchannel Music_LookKimonoGirl_branch_f7aa8 +Music_LookKimonoGirl_branch_f7a5f: ; f7a5f + dutycycle $3 + notetype $c, $91 + octave 5 + note E_, 1 + note D_, 1 + octave 4 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + octave 3 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note E_, 1 + note D_, 1 + callchannel Music_LookKimonoGirl_branch_f7a94 + octave 5 + note F_, 1 + note D_, 1 + octave 4 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note F_, 1 + note D_, 1 + note F_, 1 + note D_, 1 + octave 3 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note E_, 1 + note D_, 1 + callchannel Music_LookKimonoGirl_branch_f7a94 + loopchannel 0, Music_LookKimonoGirl_branch_f7a5f +; f7a94 + +Music_LookKimonoGirl_branch_f7a94: ; f7a94 + octave 5 + note B_, 1 + note A_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + octave 4 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note D_, 1 + octave 3 + note B_, 1 + note E_, 1 + endchannel +; f7aa8 + +Music_LookKimonoGirl_branch_f7aa8: ; f7aa8 + octave 4 + note E_, 1 + octave 5 + note E_, 16 + note __, 1 + note E_, 2 + note __, 3 + intensity $b7 + note E_, 2 + note __, 2 + intensity $b7 + note E_, 2 + note __, 1 + intensity $a7 + note E_, 2 + note __, 1 + notetype $6, $65 + note E_, 2 + note __, 1 + intensity $54 + note E_, 2 + note __, 1 + intensity $63 + note E_, 2 + note E_, 2 + intensity $91 + note E_, 2 + intensity $a1 + note E_, 1 + notetype $8, $b1 + note E_, 1 + note E_, 1 + endchannel +; f7ad4 + +Music_LookKimonoGirl_Ch3: ; f7ad4 + stereopanning $ff + vibrato $12, $24 + notetype $6, $13 + note __, 1 + note __, 16 + octave 5 + note E_, 1 + note F_, 1 + note E_, 2 + notetype $c, $13 + note E_, 12 + notetype $6, $13 + octave 5 + note D_, 2 + note E_, 2 +Music_LookKimonoGirl_branch_f7aec: ; f7aec + octave 5 + note D_, 4 + note E_, 4 + note F_, 4 + note A_, 4 + note B_, 4 + note A_, 4 + note B_, 4 + octave 6 + note D_, 4 + note E_, 8 + note F_, 1 + note F#, 1 + note F_, 2 + note D_, 4 + note E_, 8 + note D_, 4 + note E_, 4 + note F_, 8 + note A_, 8 + note B_, 1 + octave 7 + note C_, 1 + octave 6 + note B_, 2 + note A_, 4 + note F_, 4 + note D_, 4 + note E_, 1 + note F_, 1 + note E_, 10 + note F_, 2 + note E_, 2 + note D_, 8 + note E_, 8 + loopchannel 0, Music_LookKimonoGirl_branch_f7aec +; f7b13 + + diff --git a/crysaudio/music/looklass.asm b/crysaudio/music/looklass.asm new file mode 100644 index 00000000..17f44173 --- /dev/null +++ b/crysaudio/music/looklass.asm @@ -0,0 +1,121 @@ +Music_LookLass: ; ed79b + dbw $c0, Music_LookLass_Ch1 + dbw $01, Music_LookLass_Ch2 + dbw $02, Music_LookLass_Ch3 + dbw $03, Music_LookLass_Ch4 +; ed7a7 + +Music_LookLass_Ch1: ; ed7a7 + tempo 132 + volume $77 + tone $0001 + dutycycle $2 + notetype $c, $c7 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note B_, 14 + stereopanning $f + dutycycle $0 +Music_LookLass_branch_ed7bd: ; ed7bd + intensity $a2 + octave 3 + note E_, 4 + intensity $a1 + note E_, 4 + note E_, 4 + note E_, 2 + intensity $a3 + note B_, 2 + loopchannel 0, Music_LookLass_branch_ed7bd +; ed7cd + +Music_LookLass_Ch2: ; ed7cd + stereopanning $f0 + dutycycle $0 + notetype $c, $83 + note __, 16 +Music_LookLass_branch_ed7d5: ; ed7d5 + intensity $92 + octave 2 + note B_, 4 + intensity $91 + note B_, 4 + note B_, 4 + note B_, 2 + intensity $93 + octave 3 + note G#, 2 + loopchannel 0, Music_LookLass_branch_ed7d5 +; ed7e6 + +Music_LookLass_Ch3: ; ed7e6 + notetype $c, $10 + note __, 8 + octave 6 + note E_, 2 + note D#, 2 + note C#, 2 + note C_, 2 +Music_LookLass_branch_ed7ef: ; ed7ef + octave 5 + note B_, 2 + note __, 2 + octave 6 + note D#, 2 + note __, 2 + note E_, 2 + note __, 2 + note D#, 2 + note __, 2 + note C#, 2 + note C_, 2 + octave 5 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + octave 6 + note C#, 2 + octave 5 + note B_, 2 + note __, 2 + octave 6 + note C#, 2 + note __, 2 + octave 5 + note B_, 2 + note __, 2 + note A_, 2 + note __, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + loopchannel 0, Music_LookLass_branch_ed7ef +; ed81a + +Music_LookLass_Ch4: ; ed81a + togglenoise $4 + notetype $c + note C_, 16 +Music_LookLass_branch_ed81f: ; ed81f + notetype $6 + note D_, 8 + 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 +; ed82d + + diff --git a/crysaudio/music/lookmysticalman.asm b/crysaudio/music/lookmysticalman.asm new file mode 100644 index 00000000..4aac6e69 --- /dev/null +++ b/crysaudio/music/lookmysticalman.asm @@ -0,0 +1,621 @@ +Music_LookMysticalMan: ; 17843b + dbw $c0, Music_LookMysticalMan_Ch1 + dbw $01, Music_LookMysticalMan_Ch2 + dbw $02, Music_LookMysticalMan_Ch3 + dbw $03, Music_LookMysticalMan_Ch4 +; 178447 + +Music_LookMysticalMan_Ch1: ; 178447 + tempo 136 + volume $77 + vibrato $a, $34 + tone $0001 + stereopanning $f + notetype $c, $b3 + note __, 8 +Music_LookMysticalMan_branch_178458: ; 178458 + dutycycle $3 + notetype $6, $96 + octave 3 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 2 + note F#, 2 + note __, 4 + note F#, 2 + note __, 9 + note __, 9 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 2 + note E_, 2 + note __, 4 + note E_, 2 + note __, 9 + note __, 9 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C#, 2 + note E_, 2 + note __, 4 + note E_, 2 + note __, 9 + note __, 9 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C#, 2 + note E_, 2 + note __, 3 + note F_, 1 + note F#, 4 + note __, 4 + note E_, 4 + note __, 4 + note C#, 4 + dutycycle $2 + callchannel Music_LookMysticalMan_branch_1784f9 + octave 4 + note C#, 2 + note __, 2 + octave 3 + note B_, 2 + note __, 2 + note A#, 2 + octave 4 + note C#, 6 + note __, 4 + octave 3 + note F#, 4 + note __, 4 + note E_, 4 + callchannel Music_LookMysticalMan_branch_1784f9 + octave 4 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 3 + note A#, 2 + note B_, 6 + note A#, 4 + note F#, 4 + intensity $a5 + dutycycle $0 + octave 4 + note F#, 2 + note A#, 6 + dutycycle $2 + intensity $72 +Music_LookMysticalMan_branch_1784b4: ; 1784b4 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + note F#, 2 + note D_, 2 + loopchannel 4, Music_LookMysticalMan_branch_1784b4 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + note F#, 2 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note D_, 2 + octave 2 + note A_, 2 + note B_, 2 + octave 3 + note D_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 4 + note D_, 2 + note F#, 2 + note B_, 2 +Music_LookMysticalMan_branch_1784d4: ; 1784d4 + octave 5 + note D_, 2 + octave 4 + note G#, 2 + note E_, 2 + octave 3 + note B_, 2 + loopchannel 4, Music_LookMysticalMan_branch_1784d4 + octave 5 + note C#, 2 + octave 4 + note A#, 2 + note F#, 2 + note C#, 2 + octave 3 + note A#, 2 + note F#, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + note E_, 2 + note F#, 2 + note A#, 2 + octave 4 + note C#, 2 + note E_, 2 + note F#, 2 + note A#, 2 + loopchannel 0, Music_LookMysticalMan_branch_178458 +; 1784f9 + +Music_LookMysticalMan_branch_1784f9: ; 1784f9 + note D_, 16 + octave 4 + note D_, 2 + note __, 2 + note E_, 2 + note __, 2 + note F#, 2 + note D_, 6 + octave 3 + note E_, 16 + note B_, 2 + note __, 2 + octave 4 + note C#, 2 + note __, 2 + note D_, 2 + octave 3 + note B_, 6 + octave 4 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note D_, 2 + note C#, 6 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 3 + note B_, 2 + note A_, 6 + endchannel +; 17851a + +Music_LookMysticalMan_Ch2: ; 17851a + dutycycle $3 + vibrato $a, $34 + notetype $c, $b3 + note __, 8 +Music_LookMysticalMan_branch_178523: ; 178523 + stereopanning $f0 + notetype $6, $b8 + octave 3 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 2 + note B_, 2 + note __, 4 + note B_, 2 + note __, 6 + stereopanning $ff + note B_, 8 + note A_, 4 + stereopanning $f0 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 2 + note G#, 2 + note __, 4 + note G#, 2 + note __, 6 + stereopanning $ff + note F#, 8 + note G#, 4 + stereopanning $f0 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 2 + note A_, 2 + note __, 4 + note A_, 2 + note __, 6 + stereopanning $ff + note A_, 8 + note G_, 4 + stereopanning $f0 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 2 + note F#, 2 + note __, 3 + note A_, 1 + note A#, 4 + note __, 4 + note F#, 4 + note __, 4 + note E_, 4 + callchannel Music_LookMysticalMan_branch_17859a + note F#, 2 + note __, 2 + note E_, 2 + note __, 2 + note D_, 2 + note E_, 6 + callchannel Music_LookMysticalMan_branch_1785c8 + callchannel Music_LookMysticalMan_branch_17859a + note F#, 2 + note __, 2 + note F#, 2 + note __, 2 + note E_, 2 + note D_, 6 + callchannel Music_LookMysticalMan_branch_1785c8 + notetype $c, $b7 + note B_, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 1 + note C#, 2 + note __, 1 + octave 3 + note B_, 16 + note __, 2 + note B_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 2 + note C#, 2 + note __, 1 + octave 3 + note B_, 2 + note __, 1 + note A#, 16 + note __, 2 + loopchannel 0, Music_LookMysticalMan_branch_178523 +; 17859a + +Music_LookMysticalMan_branch_17859a: ; 17859a + note B_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 2 + note F#, 2 + note A_, 6 + note B_, 8 + note __, 2 + note A_, 2 + note B_, 2 + octave 5 + note C#, 2 + note D_, 2 + note __, 2 + note C#, 2 + note __, 2 + note D_, 2 + note C#, 6 + octave 4 + note B_, 12 + intensity $88 + note A#, 1 + note A_, 1 + intensity $68 + note G#, 1 + note F#, 1 + intensity $b8 + octave 5 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 4 + note B_, 2 + note A_, 6 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + note F#, 2 + note E_, 6 + endchannel +; 1785c8 + +Music_LookMysticalMan_branch_1785c8: ; 1785c8 + note C#, 8 + intensity $88 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + intensity $68 + note G#, 1 + note F#, 1 + intensity $48 + note E_, 1 + note C#, 1 + note __, 1 + intensity $b8 + endchannel +; 1785db + +Music_LookMysticalMan_Ch3: ; 1785db + notetype $6, $16 + note __, 16 +Music_LookMysticalMan_branch_1785df: ; 1785df + octave 2 + note B_, 4 + octave 3 + note A_, 2 + note __, 2 + note F#, 4 + octave 2 + note B_, 1 + note __, 1 + note B_, 4 + note A_, 2 + note B_, 2 + octave 3 + note B_, 2 + octave 2 + note B_, 2 + octave 3 + note A_, 2 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + note E_, 4 + note G#, 2 + note __, 2 + note B_, 4 + note E_, 1 + note __, 1 + note E_, 6 + octave 2 + note A#, 2 + note B_, 6 + note G#, 4 + note A_, 4 + octave 3 + note G_, 2 + note __, 2 + note E_, 4 + octave 2 + note A_, 1 + note __, 1 + note A_, 4 + note G_, 2 + note A_, 2 + octave 3 + note A_, 2 + octave 2 + note A_, 2 + octave 3 + note G_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 +Music_LookMysticalMan_branch_178615: ; 178615 + octave 2 + note F#, 4 + note A#, 2 + note __, 2 + octave 3 + note C#, 4 + octave 2 + note F#, 1 + note __, 1 + note F#, 6 + note G#, 4 + note __, 4 + note A#, 4 + note B_, 4 + octave 3 + note A_, 2 + note __, 2 + note F#, 4 + octave 2 + note B_, 1 + note __, 1 + note B_, 6 + octave 3 + note D_, 2 + note __, 2 + note F#, 2 + note D_, 6 + note E_, 4 + note G#, 2 + note __, 2 + note B_, 4 + note E_, 1 + note __, 1 + note E_, 6 + note D_, 2 + note __, 2 + octave 2 + note B_, 2 + note G#, 6 + note A_, 4 + octave 3 + note C#, 2 + note __, 2 + note E_, 4 + octave 2 + note A_, 1 + note __, 1 + note A_, 6 + octave 3 + note E_, 4 + note C#, 2 + octave 2 + note E_, 6 + loopchannel 2, Music_LookMysticalMan_branch_178615 + note F#, 4 + note A#, 2 + note __, 2 + octave 3 + note C#, 2 + note F#, 6 + octave 2 + note F#, 2 + note __, 2 + octave 3 + note C#, 4 + octave 2 + note A#, 2 + octave 3 + note F#, 6 + octave 2 + note B_, 4 + octave 3 + note B_, 4 + octave 2 + note B_, 4 + octave 3 + note F#, 2 + note A_, 6 + octave 2 + note B_, 4 + octave 3 + note F#, 4 + octave 2 + note B_, 4 + note A_, 4 + note __, 2 + note A#, 4 + note __, 2 + note B_, 6 + note __, 2 + note B_, 4 + note A_, 4 + note F#, 4 + note E_, 4 + octave 3 + note E_, 4 + octave 2 + note E_, 4 + note G#, 2 + octave 3 + note D_, 6 + octave 2 + note E_, 4 + note B_, 4 + octave 3 + note E_, 4 + note F#, 4 + note __, 2 + note E_, 4 + note __, 2 + note C#, 8 + octave 2 + note B_, 8 + note A#, 4 + loopchannel 0, Music_LookMysticalMan_branch_1785df +; 17868e + +Music_LookMysticalMan_Ch4: ; 17868e + togglenoise $3 + notetype $c + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 1 + note D_, 1 +Music_LookMysticalMan_branch_178697: ; 178697 + callchannel Music_LookMysticalMan_branch_1786d3 + callchannel Music_LookMysticalMan_branch_1786d9 + callchannel Music_LookMysticalMan_branch_1786d3 + callchannel Music_LookMysticalMan_branch_1786df + loopchannel 2, Music_LookMysticalMan_branch_178697 + callchannel Music_LookMysticalMan_branch_1786d3 + callchannel Music_LookMysticalMan_branch_1786d9 + callchannel Music_LookMysticalMan_branch_1786d3 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 1 + note D_, 1 + note D_, 2 + note D#, 2 + note D_, 2 + note D_, 1 + note D_, 1 +Music_LookMysticalMan_branch_1786ba: ; 1786ba + note D_, 2 + note D#, 2 + note D_, 3 + note D#, 1 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 3 + note D#, 1 + note D#, 2 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + loopchannel 2, Music_LookMysticalMan_branch_1786ba + loopchannel 0, Music_LookMysticalMan_branch_178697 +; 1786d3 + +Music_LookMysticalMan_branch_1786d3: ; 1786d3 + note D#, 4 + note D_, 3 + note D#, 3 + note D#, 2 + note D_, 4 + endchannel +; 1786d9 + +Music_LookMysticalMan_branch_1786d9: ; 1786d9 + note D#, 4 + note D_, 3 + note D_, 3 + note D#, 2 + note D_, 4 + endchannel +; 1786df + +Music_LookMysticalMan_branch_1786df: ; 1786df + note D#, 4 + note D_, 2 + note D#, 1 + note D_, 3 + note D_, 2 + note D#, 2 + note D_, 1 + note D_, 1 + endchannel +; 1786e8 + + diff --git a/crysaudio/music/lookofficer.asm b/crysaudio/music/lookofficer.asm new file mode 100644 index 00000000..31ff6e67 --- /dev/null +++ b/crysaudio/music/lookofficer.asm @@ -0,0 +1,144 @@ +Music_LookOfficer: ; ed82d + dbw $80, Music_LookOfficer_Ch1 + dbw $01, Music_LookOfficer_Ch2 + dbw $02, Music_LookOfficer_Ch3 +; ed836 + +Music_LookOfficer_Ch1: ; ed836 + tempo 116 + volume $77 + tone $0001 + vibrato $12, $34 + stereopanning $f + dutycycle $3 + notetype $c, $a7 + octave 4 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 12 + intensity $2f + octave 3 + note B_, 16 +Music_LookOfficer_branch_ed852: ; ed852 + intensity $82 + note __, 4 + note B_, 6 + note G#, 4 + note B_, 6 + note B_, 6 + note G#, 4 + note B_, 2 + intensity $2f + note A#, 16 + note A_, 16 + loopchannel 0, Music_LookOfficer_branch_ed852 +; ed863 + +Music_LookOfficer_Ch2: ; ed863 + vibrato $12, $34 + dutycycle $3 + notetype $c, $b7 + octave 5 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 12 + dutycycle $3 + intensity $a2 + octave 1 + note B_, 4 + octave 2 + note A_, 2 + octave 1 + note B_, 4 + octave 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note D#, 2 +Music_LookOfficer_branch_ed882: ; ed882 + note E_, 2 + note G#, 2 + octave 3 + note E_, 2 + octave 2 + note E_, 2 + note G#, 2 + note B_, 2 + note E_, 2 + note G#, 2 + loopchannel 2, Music_LookOfficer_branch_ed882 + forceoctave $1 + callchannel Music_LookOfficer_branch_ed89e + forceoctave $0 + callchannel Music_LookOfficer_branch_ed89e + loopchannel 0, Music_LookOfficer_branch_ed882 +; ed89e + +Music_LookOfficer_branch_ed89e: ; ed89e + octave 1 + note A_, 2 + octave 2 + note C#, 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note C#, 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note C#, 2 + endchannel +; ed8ad + +Music_LookOfficer_Ch3: ; ed8ad + vibrato $14, $14 + stereopanning $f0 + notetype $c, $14 + note __, 10 + octave 3 + note B_, 2 + note __, 2 + note B_, 2 + intensity $12 + octave 5 + note D#, 2 + note __, 1 + note F_, 2 + note __, 1 + note A_, 2 + note B_, 2 + note __, 1 + octave 6 + note C#, 2 + note __, 1 + note D#, 2 +Music_LookOfficer_branch_ed8c8: ; ed8c8 + note E_, 6 + note D#, 6 + note C#, 4 + octave 5 + note B_, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note B_, 2 + octave 6 + note C#, 2 + note F_, 8 + note D_, 8 + note E_, 8 + note C#, 8 + loopchannel 0, Music_LookOfficer_branch_ed8c8 +; ed8dd + + diff --git a/crysaudio/music/lookpokemaniac.asm b/crysaudio/music/lookpokemaniac.asm new file mode 100644 index 00000000..5bbc8639 --- /dev/null +++ b/crysaudio/music/lookpokemaniac.asm @@ -0,0 +1,166 @@ +Music_LookPokemaniac: ; ebde1 + dbw $80, Music_LookPokemaniac_Ch1 + dbw $01, Music_LookPokemaniac_Ch2 + dbw $02, Music_LookPokemaniac_Ch3 +; ebdea + +Music_LookPokemaniac_Ch1: ; ebdea + stereopanning $f + tempo 144 + volume $77 + vibrato $2, $33 + tone $0002 + notetype $c, $b3 + note __, 8 +Music_LookPokemaniac_branch_ebdfb: ; ebdfb + note __, 4 + octave 3 + note A#, 1 + note __, 3 + note A#, 1 + note __, 3 + loopchannel 4, Music_LookPokemaniac_branch_ebdfb + note __, 4 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + loopchannel 4, Music_LookPokemaniac_branch_ebdfb + loopchannel 0, Music_LookPokemaniac_branch_ebdfb +; ebe12 + +Music_LookPokemaniac_Ch2: ; ebe12 + stereopanning $ff + vibrato $2, $33 + tone $0001 + notetype $c, $b3 + octave 2 + note A_, 1 + note F#, 1 + note D#, 1 + note C_, 1 + octave 1 + note A_, 4 +Music_LookPokemaniac_branch_ebe24: ; ebe24 + octave 2 + note C_, 2 + note __, 2 + octave 3 + note F#, 1 + note __, 3 + note A_, 1 + note __, 3 + octave 1 + note G_, 2 + note __, 2 + octave 3 + note C_, 1 + note __, 3 + note D#, 1 + note __, 3 + loopchannel 2, Music_LookPokemaniac_branch_ebe24 +Music_LookPokemaniac_branch_ebe38: ; ebe38 + octave 1 + note A_, 2 + note __, 2 + octave 3 + note D#, 1 + note __, 3 + note F#, 1 + note __, 3 + octave 1 + note E_, 2 + note __, 2 + octave 2 + note A_, 1 + note __, 3 + octave 3 + note C_, 1 + note __, 3 + loopchannel 2, Music_LookPokemaniac_branch_ebe38 + loopchannel 0, Music_LookPokemaniac_branch_ebe24 +; ebe51 + +Music_LookPokemaniac_Ch3: ; ebe51 + stereopanning $f0 + vibrato $6, $33 + notetype $c, $15 + octave 4 + note C_, 1 + note D#, 1 + note F#, 1 + note A_, 1 + octave 5 + note C_, 4 + intensity $10 +Music_LookPokemaniac_branch_ebe62: ; ebe62 + callchannel Music_LookPokemaniac_branch_ebe70 + intensity $14 + callchannel Music_LookPokemaniac_branch_ebe70 + intensity $10 + loopchannel 0, Music_LookPokemaniac_branch_ebe62 +; ebe70 + +Music_LookPokemaniac_branch_ebe70: ; ebe70 + note A#, 6 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 6 + note F_, 2 + note F#, 2 + note A_, 2 + octave 4 + note D#, 4 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 5 + note F#, 4 + note C_, 1 + note __, 1 + note F#, 1 + note __, 1 + note C_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 6 + note F#, 2 + note F_, 2 + note E_, 2 + note D#, 6 + note D_, 2 + note D#, 2 + note F#, 2 + note C_, 4 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note D#, 4 + octave 4 + note A_, 1 + note __, 1 + octave 5 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note C_, 1 + note __, 1 + endchannel +; ebeab + + diff --git a/crysaudio/music/lookrival.asm b/crysaudio/music/lookrival.asm new file mode 100644 index 00000000..d86eb074 --- /dev/null +++ b/crysaudio/music/lookrival.asm @@ -0,0 +1,362 @@ +Music_LookRival: ; f4f79 + dbw $c0, Music_LookRival_Ch1 + dbw $01, Music_LookRival_Ch2 + dbw $02, Music_LookRival_Ch3 + dbw $03, Music_LookRival_Ch4 +; f4f85 + +Music_LookRival_Ch1: ; f4f85 + tempo 112 + volume $77 + dutycycle $1 + tone $0001 + vibrato $12, $15 + stereopanning $f + notetype $c, $b2 + octave 4 + note C_, 1 + octave 3 + note A#, 1 + note G#, 2 + note A#, 1 + note G#, 1 + note F#, 2 + note F_, 6 + intensity $b7 + note G#, 6 + intensity $b2 + note A#, 4 + note F_, 2 + note G#, 4 + intensity $a0 + note G#, 10 + intensity $a5 + note G#, 8 + intensity $a6 + note F#, 8 +Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1 +Music_LookRival_branch_f4fb1: ; f4fb1 + intensity $b5 + note F_, 4 + note D#, 2 + note F_, 6 + note F_, 2 + note G_, 2 + note G#, 4 + note A#, 4 + note G#, 2 + note G_, 4 + intensity $a0 + note F_, 2 + intensity $a7 + note F_, 16 + intensity $66 + note __, 2 + note F_, 2 + note G_, 4 + intensity $b6 + note G#, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 2 + note A#, 6 + intensity $b4 + note A#, 2 + octave 4 + note C_, 2 + note C#, 2 + note C#, 2 + note D#, 2 + note D#, 2 + note C#, 2 + note C_, 6 + intensity $b7 + octave 3 + note A#, 12 + note G#, 2 + note G_, 2 + note G#, 2 + note A#, 10 + note B_, 4 + octave 4 + note C_, 6 + octave 3 + note A#, 6 + octave 4 + note D_, 2 + note C_, 2 + octave 3 + note A#, 6 + note G_, 10 + note A#, 6 + note G#, 6 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note G#, 8 + note F_, 6 + note C_, 2 +Music_LookRival_branch_f4ff7: ; f4ff7 + intensity $b2 + note F_, 6 + intensity $b7 + note G#, 4 + note F#, 2 + note F_, 2 + note D#, 2 + loopchannel 3, Music_LookRival_branch_f4ff7 + intensity $b2 + note F_, 2 + note G#, 4 + intensity $b7 + note G#, 6 + note F#, 4 + loopchannel 0, Music_LookRival_branch_f4fb1 +; f5010 + +Music_LookRival_Ch2: ; f5010 + dutycycle $3 + vibrato $8, $36 + stereopanning $f0 + notetype $c, $c2 + octave 4 + note F#, 2 + note F_, 2 + note D#, 2 + note C#, 2 + note C_, 6 + intensity $c7 + note D#, 6 + intensity $c2 + note F_, 4 + note C_, 2 + note D#, 4 + intensity $b0 + note D#, 10 + intensity $b7 + note D#, 16 +Music_AfterTheRivalFight_branch_f502e: ; f502e +Music_LookRival_branch_f502e: ; f502e + intensity $c7 + note C_, 12 + intensity $c4 + note C_, 2 + note D_, 2 + note D#, 4 + note D_, 4 + note C_, 2 + note D_, 4 + intensity $b0 + note C_, 6 + intensity $b7 + note C_, 8 + intensity $b4 + octave 3 + note A_, 2 + note G_, 2 + note A_, 2 + intensity $c6 + octave 4 + note C_, 6 + intensity $c7 + note D#, 8 + note F_, 12 + intensity $c4 + note F_, 2 + note G_, 2 + note G#, 2 + note G#, 2 + note G_, 2 + note G_, 2 + note F_, 2 + intensity $c4 + note G_, 6 + intensity $b0 + note F_, 16 + intensity $b7 + note F_, 16 + intensity $b0 + note G_, 12 + note F_, 4 + note E_, 16 + note F_, 12 + note D#, 4 + intensity $c7 + note D_, 8 + intensity $c4 + note C_, 2 + note D_, 2 + note D#, 1 + note D_, 1 + note D#, 2 +Music_LookRival_branch_f5070: ; f5070 + intensity $c2 + note C_, 6 + intensity $c7 + note D#, 6 + intensity $c2 + note F_, 4 + loopchannel 3, Music_LookRival_branch_f5070 + note C_, 2 + note D#, 4 + intensity $c7 + note D#, 10 + loopchannel 0, Music_LookRival_branch_f502e +; f5086 + +Music_LookRival_Ch3: ; f5086 + notetype $c, $28 + note __, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note F#, 2 + note F_, 4 + note G#, 2 + note D#, 4 + note C_, 2 + note D_, 2 + note D#, 2 + note G#, 2 + note F#, 2 + note F_, 2 + note D#, 10 + note D#, 10 + note C_, 2 + note D#, 2 + note F#, 2 +Music_AfterTheRivalFight_branch_f509d: ; f509d +Music_LookRival_branch_f509d: ; f509d + callchannel Music_LookRival_branch_f50ef + loopchannel 3, Music_LookRival_branch_f509d + note F_, 4 + note C_, 2 + note D#, 4 + note G#, 2 + note G_, 2 + note F#, 2 + callchannel Music_LookRival_branch_f50f7 + note A#, 2 + note F_, 2 + note G_, 2 + note G#, 4 + note F_, 2 + note G_, 2 + note G#, 1 + note A_, 1 + callchannel Music_LookRival_branch_f50ff + note A#, 2 + note F_, 2 + note G_, 2 + note G#, 4 + note F_, 2 + note A#, 2 + note B_, 2 + octave 4 + note C_, 4 + octave 3 + note G_, 2 + note A#, 4 + note G_, 2 + note A_, 2 + note A#, 2 + octave 4 + note C_, 4 + octave 3 + note G_, 2 + note A#, 4 + note G_, 2 + 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 + note F_, 2 + note C_, 2 + note D_, 2 + note D#, 4 + note C_, 2 + note D_, 2 + note D#, 1 + note E_, 1 + note F_, 2 + note C_, 2 + note D_, 2 + note D#, 4 + note C_, 2 + note F#, 2 + note E_, 2 + loopchannel 0, Music_LookRival_branch_f509d +; f50ef + +Music_LookRival_branch_f50ef: ; f50ef + note F_, 2 + note C_, 2 + note D_, 2 + note D#, 4 + note C_, 2 + note D_, 2 + note D#, 2 + endchannel +; f50f7 + +Music_LookRival_branch_f50f7: ; f50f7 + note A#, 2 + note F_, 2 + note G_, 2 + note G#, 4 + note F_, 2 + note G_, 2 + note G#, 2 + endchannel +; f50ff + +Music_LookRival_branch_f50ff: ; f50ff + note A#, 4 + note F_, 2 + note G#, 4 + note F_, 2 + note G_, 2 + note G#, 2 + endchannel +; f5106 + +Music_LookRival_Ch4: ; f5106 + 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: ; f5118 +Music_LookRival_branch_f5118: ; 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 +; f5127 + + diff --git a/crysaudio/music/lookrocket.asm b/crysaudio/music/lookrocket.asm new file mode 100644 index 00000000..d02c7f5f --- /dev/null +++ b/crysaudio/music/lookrocket.asm @@ -0,0 +1,418 @@ +Music_LookRocket: ; f74a2 + dbw $c0, Music_LookRocket_Ch1 + dbw $01, Music_LookRocket_Ch2 + dbw $02, Music_LookRocket_Ch3 + dbw $03, Music_LookRocket_Ch4 +; f74ae + +Music_LookRocket_Ch1: ; f74ae + tempo 123 + volume $77 + forceoctave $2 + stereopanning $f + dutycycle $3 + vibrato $5, $64 + notetype $c, $a8 + octave 4 + note C_, 1 + note D_, 1 + callchannel Music_LookRocket_branch_f74e6 + dutycycle $1 +Music_LookRocket_branch_f74c7: ; f74c7 + intensity $a8 + callchannel Music_LookRocket_branch_f74f7 + callchannel Music_LookRocket_branch_f758a + 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 +; f74e6 + +Music_LookRocket_branch_f74e6: ; f74e6 +Music_RocketTheme_branch_f74e6: ; f74e6 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + note C_, 1 + note __, 3 + octave 2 + note F_, 1 + note G#, 1 + note B_, 1 + octave 3 + note D_, 1 + note F_, 1 + note G#, 1 + endchannel +; f74f7 + +Music_LookRocket_branch_f74f7: ; f74f7 +Music_RocketTheme_branch_f74f7: ; f74f7 + note __, 2 + octave 3 + note D#, 1 + note __, 5 + note D#, 4 + octave 2 + note A_, 2 + octave 3 + note D#, 1 + note F_, 1 + note F#, 6 + note D#, 1 + note __, 3 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + endchannel +; f750c + +Music_LookRocket_branch_f750c: ; f750c +Music_RocketTheme_branch_f750c: ; f750c + note __, 2 + octave 2 + note B_, 1 + note __, 7 + octave 3 + note C_, 1 + note __, 5 + endchannel +; f7514 + +Music_LookRocket_Ch2: ; f7514 + forceoctave $2 + vibrato $4, $64 + dutycycle $3 + notetype $c, $b7 + stereopanning $ff + octave 5 + note C_, 1 + note D_, 1 + callchannel Music_LookRocket_branch_f7547 +Music_LookRocket_branch_f7526: ; f7526 + intensity $b7 + callchannel Music_LookRocket_branch_f758a + 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 +; f7547 + +Music_LookRocket_branch_f7547: ; f7547 +Music_RocketTheme_branch_f7547: ; f7547 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + note C_, 1 + note __, 3 + octave 3 + note B_, 6 + dutycycle $0 + endchannel +; f7554 + +Music_LookRocket_branch_f7554: ; f7554 +Music_RocketTheme_branch_f7554: ; f7554 + note __, 2 + octave 4 + note D#, 1 + note __, 5 + note F_, 4 + note C_, 1 + note D_, 1 + note D#, 1 + note F_, 1 + note F#, 6 + note D#, 1 + note __, 3 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 5 + note D#, 1 + note __, 1 + endchannel +; f7568 + +Music_LookRocket_branch_f7568: ; f7568 +Music_RocketTheme_branch_f7568: ; f7568 + note __, 2 + octave 3 + note F_, 1 + note __, 7 + note F#, 1 + note __, 5 + endchannel +; f756f + +Music_LookRocket_branch_f756f: ; f756f +Music_RocketTheme_branch_f756f: ; f756f + intensity $63 + note G#, 1 + note F_, 1 + note D_, 1 + octave 2 + note B_, 1 + intensity $a3 + octave 3 + note A_, 1 + note F#, 1 + note D#, 1 + note C_, 1 + intensity $c3 + note A#, 1 + note G_, 1 + note E_, 1 + note C#, 1 + intensity $f3 + note B_, 1 + note G#, 1 + note F_, 1 + note D_, 1 + endchannel +; f758a + +Music_LookRocket_branch_f758a: ; f758a +Music_RocketTheme_branch_f758a: ; f758a + octave 3 + note __, 2 + note G_, 1 + note __, 5 + note A_, 8 + note A#, 6 + note A_, 1 + note __, 3 + note A#, 1 + note __, 1 + note A_, 1 + note __, 1 + endchannel +; f7597 + +Music_LookRocket_Ch3: ; f7597 + forceoctave $2 + vibrato $4, $22 + notetype $c, $14 + stereopanning $f0 + note __, 2 + callchannel Music_LookRocket_branch_f75bf +Music_LookRocket_branch_f75a5: ; 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 +; f75bf + +Music_LookRocket_branch_f75bf: ; f75bf +Music_RocketTheme_branch_f75bf: ; f75bf + octave 3 + note F_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note D_, 1 + note __, 3 + octave 3 + note D_, 6 + endchannel +; f75cc + +Music_LookRocket_branch_f75cc: ; f75cc +Music_RocketTheme_branch_f75cc: ; f75cc + octave 2 + note G#, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F#, 1 + note __, 1 + endchannel +; f75e1 + +Music_LookRocket_branch_f75e1: ; f75e1 +Music_RocketTheme_branch_f75e1: ; f75e1 + intensity $24 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note F#, 1 + note __, 1 + intensity $14 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + endchannel +; f75fe + +Music_LookRocket_branch_f75fe: ; f75fe +Music_RocketTheme_branch_f75fe: ; f75fe + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + endchannel +; f7623 + +Music_LookRocket_branch_f7623: ; f7623 +Music_RocketTheme_branch_f7623: ; f7623 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + note G#, 1 + note F#, 1 + note D#, 1 + note C_, 1 + endchannel +; f7638 + +Music_LookRocket_Ch4: ; f7638 + togglenoise $3 + notetype $c + note __, 2 + callchannel Music_LookRocket_branch_f765c +Music_LookRocket_branch_f7640: ; f7640 + callchannel Music_LookRocket_branch_f7664 + callchannel Music_LookRocket_branch_f7664 + 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 +; f765c + +Music_LookRocket_branch_f765c: ; f765c +Music_RocketTheme_branch_f765c: ; f765c + note C_, 8 + note D_, 2 + note D#, 2 + note C#, 1 + note C#, 1 + note D_, 1 + note D_, 1 + endchannel +; f7664 + +Music_LookRocket_branch_f7664: ; f7664 +Music_RocketTheme_branch_f7664: ; 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 +; f766d + + diff --git a/crysaudio/music/looksage.asm b/crysaudio/music/looksage.asm new file mode 100644 index 00000000..f815d212 --- /dev/null +++ b/crysaudio/music/looksage.asm @@ -0,0 +1,184 @@ +Music_LookSage: ; ee35e + dbw $40, Music_LookSage_Ch1 + dbw $02, Music_LookSage_Ch3 +; ee364 + +Music_LookSage_Ch1: ; ee364 + tempo 144 + stereopanning $f + volume $77 + dutycycle $3 + notetype $c, $b3 + note __, 2 + note __, 16 + callchannel Music_LookSage_branch_ee3fa + intensity $b3 + octave 3 + note D_, 2 + intensity $93 + note D_, 2 + intensity $b3 + note E_, 2 + intensity $93 + note E_, 2 + intensity $b3 + note A_, 2 + intensity $93 + note A_, 2 + intensity $b3 + note F_, 2 + intensity $93 + note F_, 2 +Music_LookSage_branch_ee38e: ; ee38e + intensity $b3 + note D_, 2 + intensity $93 + note D_, 2 + intensity $b3 + octave 2 + note B_, 2 + intensity $93 + note B_, 2 + intensity $b3 + note A_, 2 + intensity $93 + note A_, 2 + intensity $b3 + note B_, 2 + intensity $93 + note B_, 2 + intensity $b3 + octave 3 + note D_, 2 + intensity $93 + note D_, 2 + intensity $b3 + octave 2 + note B_, 2 + intensity $93 + note B_, 2 + intensity $b3 + octave 3 + note D_, 2 + intensity $93 + note D_, 2 + intensity $b3 + note E_, 2 + intensity $93 + note E_, 2 + intensity $b3 + note F_, 2 + intensity $93 + note F_, 2 + intensity $b3 + note D_, 2 + intensity $93 + note D_, 2 + intensity $b3 + note E_, 2 + intensity $93 + note E_, 2 + intensity $b3 + note A_, 2 + intensity $93 + note A_, 2 + intensity $b3 + note D_, 2 + intensity $93 + note D_, 2 + intensity $b3 + octave 2 + note B_, 2 + intensity $93 + note B_, 2 + intensity $b3 + note A_, 2 + intensity $93 + note A_, 2 + intensity $b3 + note B_, 2 + intensity $93 + note B_, 2 + callchannel Music_LookSage_branch_ee3fa + loopchannel 0, Music_LookSage_branch_ee38e +; ee3fa + +Music_LookSage_branch_ee3fa: ; ee3fa + intensity $b3 + octave 2 + note E_, 2 + intensity $93 + note E_, 2 + intensity $b3 + note A_, 2 + intensity $93 + note A_, 2 + intensity $b3 + note B_, 2 + intensity $93 + note B_, 2 + intensity $b3 + note A_, 2 + intensity $93 + note A_, 2 + endchannel +; ee414 + +Music_LookSage_Ch3: ; ee414 + stereopanning $f0 + vibrato $16, $23 + notetype $c, $10 + octave 5 + note B_, 1 + octave 6 + note C_, 1 + octave 5 + note B_, 16 + vibrato $7, $23 + note B_, 8 + vibrato $14, $23 + octave 6 + note D_, 6 + note E_, 1 + note F_, 1 + note E_, 14 + note G_, 1 + note G#, 1 +Music_LookSage_branch_ee430: ; ee430 + note A_, 12 + note B_, 4 + note D_, 9 + note E_, 1 + note F_, 1 + note D_, 1 + vibrato $0, $0 + note E_, 4 + vibrato $7, $23 + note E_, 8 + vibrato $14, $23 + octave 5 + note B_, 8 + octave 6 + note F_, 8 + notetype $6, $10 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 5 + note B_, 1 + note A#, 1 + note A_, 1 + note __, 4 + octave 6 + note E_, 2 + note F_, 2 + notetype $c, $10 + note E_, 14 + note G_, 1 + note G#, 1 + loopchannel 0, Music_LookSage_branch_ee430 +; ee45f + + diff --git a/crysaudio/music/lookyoungster.asm b/crysaudio/music/lookyoungster.asm new file mode 100644 index 00000000..ff932f8f --- /dev/null +++ b/crysaudio/music/lookyoungster.asm @@ -0,0 +1,304 @@ +Music_LookYoungster: ; f66c3 + dbw $80, Music_LookYoungster_Ch1 + dbw $01, Music_LookYoungster_Ch2 + dbw $02, Music_LookYoungster_Ch3 +; f66cc + +Music_LookYoungster_Ch1: ; f66cc + tempo 118 + volume $77 + stereopanning $f + dutycycle $3 + notetype $c, $a3 + octave 3 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + intensity $3e + note B_, 16 + intensity $c3 + octave 4 + note C_, 1 + note __, 3 + note C_, 4 + note __, 2 + note C_, 6 + intensity $b3 +Music_LookYoungster_branch_f66ea: ; f66ea + note __, 2 + octave 3 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note C_, 1 + note __, 3 + note C_, 1 + note __, 1 + note __, 16 + note __, 2 + octave 3 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note C_, 1 + note __, 3 + note C_, 1 + note __, 1 + note __, 16 + loopchannel 0, Music_LookYoungster_branch_f66ea +; f670e + + + + +Music_LookYoungster_Ch2: ; f670f + stereopanning $f0 + vibrato $12, $26 + dutycycle $1 + notetype $c, $a3 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note C#, 1 + note D_, 1 + intensity $3e + notetype $c, $2e + note G_, 16 + notetype $c, $b3 + intensity $c3 + note F_, 1 + note __, 3 + note F_, 4 + note __, 2 + note F#, 6 +Music_LookYoungster_branch_f672f: ; f672f + dutycycle $3 + intensity $b3 + note __, 2 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + note F_, 1 + note __, 3 + note F_, 1 + note __, 1 + intensity $97 + dutycycle $2 + note D#, 1 + note F_, 1 + note D#, 1 + note D_, 1 + note C_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 3 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + dutycycle $3 + intensity $b3 + note __, 2 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + note F_, 1 + note __, 3 + note F_, 1 + note __, 1 + dutycycle $2 + intensity $97 + note G#, 1 + note A#, 1 + note G#, 1 + note G_, 1 + note F_, 1 + note __, 1 + note C_, 1 + note __, 3 + octave 3 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + loopchannel 0, Music_LookYoungster_branch_f672f +; f6783 + + + + +Music_LookYoungster_Ch3: ; f6784 + stereopanning $ff + vibrato $2, $24 + notetype $c, $25 + note __, 4 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + intensity $15 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 4 + note __, 2 + note G#, 6 + intensity $25 +Music_LookYoungster_branch_f67ae: ; f67ae + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + loopchannel 0, Music_LookYoungster_branch_f67ae +; f6810 + + + + + diff --git a/crysaudio/music/magnettrain.asm b/crysaudio/music/magnettrain.asm new file mode 100644 index 00000000..a3686a89 --- /dev/null +++ b/crysaudio/music/magnettrain.asm @@ -0,0 +1,276 @@ +Music_MagnetTrain: ; ef5f0 + dbw $c0, Music_MagnetTrain_Ch1 + dbw $01, Music_MagnetTrain_Ch2 + dbw $02, Music_MagnetTrain_Ch3 + dbw $03, Music_MagnetTrain_Ch4 +; ef5fc + +Music_MagnetTrain_Ch1: ; ef5fc + ftempo 110 + volume $77 + stereopanning $f + vibrato $14, $23 + dutycycle $2 + notetype $c, $b2 + note __, 16 + note __, 16 + intensity $b7 + octave 4 + note D_, 1 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note D_, 1 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note D_, 1 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note D_, 1 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note E_, 1 + note C_, 1 + octave 3 + note A_, 1 + octave 4 + note C_, 1 + note E_, 1 + note C_, 1 + octave 3 + note A_, 1 + octave 4 + note C_, 1 + note E_, 1 + note C_, 1 + octave 3 + note A_, 1 + octave 4 + note C_, 1 + note E_, 1 + note C_, 1 + notetype $6, $b7 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + notetype $c, $b7 + note D_, 16 + endchannel +; ef648 + +Music_MagnetTrain_Ch2: ; ef648 + vibrato $14, $23 + dutycycle $1 + notetype $c, $d2 + stereopanning $f0 + notetype $c, $d8 + octave 1 + note F_, 12 + note __, 2 + notetype $6, $d7 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 2 + note F_, 4 + note __, 4 + note F_, 4 + note __, 4 + note F_, 4 + note __, 4 + note F_, 4 + note __, 4 + dutycycle $3 + notetype $c, $d7 + octave 4 + note G_, 16 + note A_, 13 + note __, 1 + notetype $6, $d7 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + notetype $c, $d7 + note A_, 16 + endchannel +; ef67d + +Music_MagnetTrain_Ch3: ; ef67d + stereopanning $ff + vibrato $10, $23 + notetype $c, $15 + octave 6 + note C_, 1 + octave 5 + note G_, 1 + note D#, 1 + note C_, 1 + note G_, 1 + note D#, 1 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note D#, 1 + note C_, 1 + octave 4 + note G_, 1 + note D#, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + note D#, 1 + note C_, 1 + note G_, 1 + note D#, 1 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 1 + note D#, 1 + note G_, 1 + note C_, 1 + note D#, 1 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note G_, 1 + octave 5 + note C_, 1 + note D#, 1 + note G_, 1 + note C_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 1 + octave 3 + note D_, 1 + octave 2 + note D_, 16 + endchannel +; ef6f4 + +Music_MagnetTrain_Ch4: ; ef6f4 + 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 +; ef711 + + + + +Music_MagnetTrain_branch_ef71e: ; 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 +; ef72f + + diff --git a/crysaudio/music/mainmenu.asm b/crysaudio/music/mainmenu.asm new file mode 100644 index 00000000..8ed8d4d6 --- /dev/null +++ b/crysaudio/music/mainmenu.asm @@ -0,0 +1,149 @@ +Music_MainMenu: ; f78fd + dbw $c0, Music_MainMenu_Ch1 + dbw $01, Music_MainMenu_Ch2 + dbw $02, Music_MainMenu_Ch3 + dbw $03, Music_MainMenu_Ch4 +; f7909 + +Music_MainMenu_Ch1: ; f7909 + tempo 160 + volume $77 + dutycycle $3 + tone $0001 + vibrato $10, $15 + stereopanning $f0 + notetype $c, $f + octave 3 + note D_, 8 +Music_MainMenu_branch_f791d: ; f791d + notetype $c, $92 + octave 3 + note C#, 6 + note C#, 1 + note C#, 1 + note C#, 2 + note C#, 2 + note C#, 4 + loopchannel 2, Music_MainMenu_branch_f791d + note D#, 6 + note D#, 1 + note D#, 1 + note D#, 2 + note D#, 2 + note D#, 4 + octave 2 + note B_, 6 + note B_, 1 + note B_, 1 + note B_, 2 + note B_, 2 + notetype $c, $94 + octave 3 + note C_, 4 + loopchannel 0, Music_MainMenu_branch_f791d +; f7940 + +Music_MainMenu_Ch2: ; f7940 + dutycycle $3 + stereopanning $f + notetype $c, $f + octave 3 + note G_, 8 +Music_MainMenu_branch_f7949: ; f7949 + notetype $c, $a2 + note F#, 6 + note F#, 1 + note F#, 1 + note F#, 2 + note F#, 2 + note F#, 4 + loopchannel 2, Music_MainMenu_branch_f7949 + note G#, 6 + note G#, 1 + note G#, 1 + note G#, 2 + note G#, 2 + note G#, 4 + note E_, 6 + note E_, 1 + note E_, 1 + note E_, 2 + note E_, 2 + notetype $c, $a4 + note F_, 4 + loopchannel 0, Music_MainMenu_branch_f7949 +; f7969 + +Music_MainMenu_Ch3: ; f7969 + stereopanning $f0 + notetype $c, $25 + note __, 8 +Music_MainMenu_branch_f796f: ; f796f + octave 2 + note F#, 1 + note __, 5 + note F#, 1 + note F#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + loopchannel 2, Music_MainMenu_branch_f796f + note G#, 1 + note __, 5 + note G#, 1 + note G#, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note E_, 1 + note __, 5 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 3 + loopchannel 0, Music_MainMenu_branch_f796f +; f7996 + +Music_MainMenu_Ch4: ; f7996 + 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: ; 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 +; f79b8 + + diff --git a/crysaudio/music/mobileadapter.asm b/crysaudio/music/mobileadapter.asm new file mode 100644 index 00000000..6c0c7ca7 --- /dev/null +++ b/crysaudio/music/mobileadapter.asm @@ -0,0 +1,671 @@ +Music_MobileAdapter: ; 1fc87 + dbw $c0, Music_MobileAdapter_Ch1 + dbw $01, Music_MobileAdapter_Ch2 + dbw $02, Music_MobileAdapter_Ch3 + dbw $03, Music_MobileAdapter_Ch4 +; 1fc93 + +Music_MobileAdapter_Ch1: ; 1fc93 + tempo 132 + volume $77 + tone $0001 + stereopanning $f + dutycycle $2 + notetype $c, $84 + note __, 2 + note __, 6 + octave 3 + note G_, 1 + octave 4 + note D_, 1 + note E_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 4 +Music_MobileAdapter_branch_1fcad: ; 1fcad + callchannel Music_MobileAdapter_branch_1fd39 + note D_, 1 + note C#, 1 + note D_, 2 + octave 3 + note A_, 1 + note G_, 1 + note A_, 2 + note F#, 1 + note E_, 1 + note F#, 2 + note D_, 1 + note C#, 1 + note D_, 2 + callchannel Music_MobileAdapter_branch_1fd39 + note D_, 1 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + note F#, 1 + note E_, 1 + note D_, 1 + note C#, 1 + intensity $94 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 4 + octave 5 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 4 + note C#, 8 + intensity $92 + note F#, 1 + note G_, 1 + note A_, 2 + note G#, 2 + note A_, 2 + intensity $94 + note E_, 3 + octave 3 + note A_, 3 + note E_, 4 + octave 4 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note B_, 8 + intensity $92 + octave 4 + note B_, 1 + octave 5 + note C_, 1 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + octave 5 + note C#, 3 + intensity $94 + octave 4 + note C#, 3 + octave 3 + note A_, 4 + octave 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note F#, 10 + octave 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note D_, 10 + octave 4 + note A_, 8 + intensity $a1 + octave 3 + note C#, 1 + note D_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 2 + octave 3 + note A_, 1 + note G_, 1 + note A_, 2 + intensity $94 + note F#, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 4 + intensity $77 + callchannel Music_MobileAdapter_branch_1ff09 + loopchannel 0, Music_MobileAdapter_branch_1fcad +; 1fd39 + +Music_MobileAdapter_branch_1fd39: ; 1fd39 + intensity $94 + octave 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 2 + octave 3 + note F#, 10 + octave 4 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + octave 3 + note G_, 8 + intensity $a1 + note B_, 1 + octave 4 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 1 + note E_, 1 + note D_, 1 + note C#, 1 + octave 3 + note B_, 1 + note A_, 1 + note E_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note E_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C#, 1 + endchannel +; 1fd63 + +Music_MobileAdapter_Ch2: ; 1fd63 + notetype $c, $c1 + vibrato $10, $23 + dutycycle $2 + octave 3 + note G_, 1 + note B_, 1 + octave 4 + note D_, 1 + note C#, 1 + note D_, 2 + octave 3 + note B_, 1 + note A#, 1 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + intensity $b4 + octave 4 + note D_, 1 + note F#, 1 +Music_MobileAdapter_branch_1fd80: ; 1fd80 + callchannel Music_MobileAdapter_branch_1fdfe + note A_, 4 + note G_, 4 + note A_, 4 + note E_, 4 + note F#, 12 + note __, 2 + note D_, 1 + note F#, 1 + callchannel Music_MobileAdapter_branch_1fdfe + octave 5 + note C#, 4 + octave 4 + note A_, 4 + octave 5 + note F#, 4 + note E_, 4 + note D_, 12 + note __, 2 + note C#, 1 + note D_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 4 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 9 + intensity $a2 + octave 3 + note E_, 3 + note C#, 2 + intensity $b4 + octave 5 + note D_, 1 + note C#, 1 + octave 4 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note C#, 4 + note D_, 2 + note E_, 2 + note F#, 2 + note E_, 9 + intensity $a2 + octave 3 + note A_, 3 + note E_, 2 + intensity $b4 + octave 5 + note F#, 1 + note G_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 4 + note F#, 2 + note E_, 2 + note D_, 1 + note C#, 1 + octave 4 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note G_, 4 + note F#, 2 + note D_, 2 + octave 4 + note A#, 1 + note B_, 1 + octave 5 + note C#, 12 + note E_, 4 + note D_, 16 + dutycycle $1 + intensity $71 + callchannel Music_MobileAdapter_branch_1fe16 + octave 4 + note E_, 1 + note A_, 1 + octave 5 + note C#, 1 + note E_, 1 + callchannel Music_MobileAdapter_branch_1fe16 + note __, 2 + dutycycle $2 + intensity $b4 + octave 4 + note D_, 1 + note F#, 1 + loopchannel 0, Music_MobileAdapter_branch_1fd80 +; 1fdfe + +Music_MobileAdapter_branch_1fdfe: ; 1fdfe + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 2 + octave 5 + note D_, 4 + note C#, 2 + octave 4 + note B_, 2 + note G_, 1 + note A_, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 2 + octave 5 + note E_, 4 + note D_, 2 + note C#, 2 + octave 4 + note B_, 2 + endchannel +; 1fe16 + +Music_MobileAdapter_branch_1fe16: ; 1fe16 + octave 5 + note F#, 1 + note D_, 1 + octave 4 + note A_, 1 + note F#, 1 + octave 5 + note F#, 1 + note D_, 1 + octave 4 + note A_, 1 + note F#, 1 + octave 5 + note F#, 1 + note D_, 1 + octave 4 + note A#, 1 + note F#, 1 + octave 5 + note F#, 1 + note D_, 1 + octave 4 + note A#, 1 + note F#, 1 + octave 5 + note G_, 1 + note D_, 1 + octave 4 + note B_, 1 + note G_, 1 + octave 5 + note G_, 1 + note D_, 1 + octave 4 + note B_, 1 + note G_, 1 + octave 5 + note C#, 4 + endchannel +; 1fe3d + +Music_MobileAdapter_Ch3: ; 1fe3d + notetype $c, $14 + note __, 2 + octave 3 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note G_, 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + note A_, 4 +Music_MobileAdapter_branch_1fe4f: ; 1fe4f + callchannel Music_MobileAdapter_branch_1fecf + callchannel Music_MobileAdapter_branch_1fee3 + callchannel Music_MobileAdapter_branch_1feee + note D_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + callchannel Music_MobileAdapter_branch_1fecf + callchannel Music_MobileAdapter_branch_1fee3 + callchannel Music_MobileAdapter_branch_1feee + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 4 + callchannel Music_MobileAdapter_branch_1fee3 + callchannel Music_MobileAdapter_branch_1fef7 + note B_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + callchannel Music_MobileAdapter_branch_1fef7 + octave 3 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + callchannel Music_MobileAdapter_branch_1fee3 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 4 + callchannel Music_MobileAdapter_branch_1ff09 + loopchannel 0, Music_MobileAdapter_branch_1fe4f +; 1fecf + +Music_MobileAdapter_branch_1fecf: ; 1fecf + octave 3 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + loopchannel 4, Music_MobileAdapter_branch_1fecf +Music_MobileAdapter_branch_1fed8: ; 1fed8 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + loopchannel 4, Music_MobileAdapter_branch_1fed8 + endchannel +; 1fee3 + +Music_MobileAdapter_branch_1fee3: ; 1fee3 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + loopchannel 4, Music_MobileAdapter_branch_1fee3 + endchannel +; 1feee + +Music_MobileAdapter_branch_1feee: ; 1feee + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + endchannel +; 1fef7 + +Music_MobileAdapter_branch_1fef7: ; 1fef7 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note A_, 1 + octave 3 + note E_, 2 + note __, 1 + octave 2 + note A_, 4 + endchannel +; 1ff09 + +Music_MobileAdapter_branch_1ff09: ; 1ff09 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note A_, 1 + octave 3 + note D_, 3 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note A#, 1 + octave 3 + note D_, 3 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note B_, 1 + octave 3 + note D_, 3 + octave 2 + note A_, 2 + note __, 6 + loopchannel 2, Music_MobileAdapter_branch_1ff09 + endchannel +; 1ff2c + +Music_MobileAdapter_Ch4: ; 1ff2c + togglenoise $3 + stereopanning $f0 + notetype $c + note __, 2 + note __, 10 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 +Music_MobileAdapter_branch_1ff38: ; 1ff38 + callchannel Music_MobileAdapter_branch_1ff60 + callchannel Music_MobileAdapter_branch_1ff60 +Music_MobileAdapter_branch_1ff3e: ; 1ff3e + note __, 4 + note D_, 8 + note D_, 8 + note D_, 4 + note D_, 1 + note D_, 3 + note D_, 4 + loopchannel 2, Music_MobileAdapter_branch_1ff3e +Music_MobileAdapter_branch_1ff49: ; 1ff49 + note __, 4 + note D_, 4 + loopchannel 11, Music_MobileAdapter_branch_1ff49 + note __, 2 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + note __, 4 + note D_, 8 + note D_, 8 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + loopchannel 0, Music_MobileAdapter_branch_1ff38 +; 1ff60 + +Music_MobileAdapter_branch_1ff60: ; 1ff60 + note __, 4 + note D_, 4 + loopchannel 7, Music_MobileAdapter_branch_1ff60 + note __, 2 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + endchannel +; 1ff6c + diff --git a/crysaudio/music/mobileadaptermenu.asm b/crysaudio/music/mobileadaptermenu.asm new file mode 100644 index 00000000..90086aa6 --- /dev/null +++ b/crysaudio/music/mobileadaptermenu.asm @@ -0,0 +1,284 @@ +Music_MobileAdapterMenu: ; 17801f + dbw $80, Music_MobileAdapterMenu_Ch1 + dbw $01, Music_MobileAdapterMenu_Ch2 + dbw $02, Music_MobileAdapterMenu_Ch3 +; 178028 + +Music_MobileAdapterMenu_Ch1: ; 178028 + tempo 168 + volume $77 + tone $0001 + stereopanning $f + dutycycle $2 + notetype $c, $66 + note __, 2 +Music_MobileAdapterMenu_branch_178038: ; 178038 + callchannel Music_MobileAdapterMenu_branch_178057 + callchannel Music_MobileAdapterMenu_branch_178076 + octave 3 + note F#, 4 + note B_, 4 + note F#, 2 + note B_, 1 + note __, 1 + note D#, 4 + callchannel Music_MobileAdapterMenu_branch_178076 + octave 3 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 3 + note E_, 1 + note D#, 8 + callchannel Music_MobileAdapterMenu_branch_178057 + loopchannel 0, Music_MobileAdapterMenu_branch_178038 +; 178057 + +Music_MobileAdapterMenu_branch_178057: ; 178057 + octave 3 + note G#, 7 + octave 4 + note E_, 1 + note D#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + note F#, 4 + note E_, 8 + note D#, 1 + note __, 1 + note C#, 1 + note __, 1 + note D#, 4 + note G#, 7 + octave 4 + note E_, 1 + note D#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + note F#, 4 + note A_, 2 + note E_, 2 + note A_, 3 + note A_, 1 + note G#, 8 + endchannel +; 178076 + +Music_MobileAdapterMenu_branch_178076: ; 178076 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note C#, 3 + octave 3 + note B_, 1 + note A_, 2 + octave 4 + note E_, 1 + note __, 1 + note C#, 4 + endchannel +; 178084 + +Music_MobileAdapterMenu_Ch2: ; 178084 + stereopanning $f0 + notetype $c, $84 + dutycycle $2 + octave 4 + note E_, 1 + note G#, 1 +Music_MobileAdapterMenu_branch_17808e: ; 17808e + callchannel Music_MobileAdapterMenu_branch_1780ae + note E_, 8 + callchannel Music_MobileAdapterMenu_branch_1780d7 + note D#, 2 + note C#, 2 + note D#, 3 + note E_, 1 + note F#, 8 + callchannel Music_MobileAdapterMenu_branch_1780d7 + note D#, 2 + note E_, 2 + note F#, 3 + note G#, 1 + note F#, 6 + note E_, 1 + note G#, 1 + callchannel Music_MobileAdapterMenu_branch_1780ae + note E_, 6 + note E_, 1 + note G#, 1 + loopchannel 0, Music_MobileAdapterMenu_branch_17808e +; 1780ae + +Music_MobileAdapterMenu_branch_1780ae: ; 1780ae + octave 4 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 3 + note G#, 1 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + note D#, 2 + note E_, 3 + note G#, 1 + note F#, 6 + note E_, 1 + note G#, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 3 + note G#, 1 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 3 + note D#, 1 + endchannel +; 1780d7 + +Music_MobileAdapterMenu_branch_1780d7: ; 1780d7 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 3 + note F#, 1 + note E_, 2 + note A_, 1 + note __, 1 + note E_, 4 + endchannel +; 1780e2 + +Music_MobileAdapterMenu_Ch3: ; 1780e2 + vibrato $8, $34 + notetype $c, $25 + note __, 2 +Music_MobileAdapterMenu_branch_1780e9: ; 1780e9 + callchannel Music_MobileAdapterMenu_branch_178119 + octave 2 + note B_, 1 + note G#, 1 + callchannel Music_MobileAdapterMenu_branch_178146 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note F#, 2 + note __, 1 + note D#, 1 + note F#, 2 + note D#, 1 + note __, 1 + octave 2 + note B_, 2 + note F#, 1 + note G#, 1 + callchannel Music_MobileAdapterMenu_branch_178146 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note F#, 2 + note __, 1 + note D#, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + note F#, 4 + callchannel Music_MobileAdapterMenu_branch_178119 + note __, 2 + loopchannel 0, Music_MobileAdapterMenu_branch_1780e9 +; 178119 + +Music_MobileAdapterMenu_branch_178119: ; 178119 + octave 3 + note E_, 2 + note __, 2 + note B_, 2 + note __, 1 + note G#, 1 + note D#, 1 + note __, 1 + note B_, 1 + note __, 1 + note D#, 4 + note C#, 2 + note __, 2 + note A_, 2 + note __, 1 + note F#, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + note F#, 4 + note E_, 2 + note __, 2 + note B_, 2 + note __, 1 + note G#, 1 + note D#, 1 + note __, 1 + note B_, 1 + note __, 1 + note D#, 4 + note C#, 2 + note __, 2 + note A_, 2 + note __, 1 + note C#, 1 + note E_, 3 + intensity $35 + note E_, 3 + intensity $25 + endchannel +; 178146 + +Music_MobileAdapterMenu_branch_178146: ; 178146 + note A_, 2 + note __, 2 + octave 3 + note A_, 2 + note __, 1 + note C#, 1 + note A_, 2 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note A_, 4 + endchannel +; 178153 + + diff --git a/crysaudio/music/mobilecenter.asm b/crysaudio/music/mobilecenter.asm new file mode 100644 index 00000000..0adc750a --- /dev/null +++ b/crysaudio/music/mobilecenter.asm @@ -0,0 +1,489 @@ +Music_MobileCenter: ; 17961d + dbw $c0, Music_MobileCenter_Ch1 + dbw $01, Music_MobileCenter_Ch2 + dbw $02, Music_MobileCenter_Ch3 + dbw $03, Music_MobileCenter_Ch4 +; 179629 + +Music_MobileCenter_Ch1: ; 179629 + tempo 160 + volume $77 + dutycycle $1 + tone $0002 + vibrato $8, $22 + stereopanning $f0 + notetype $c, $a2 + octave 3 + note E_, 2 + note F_, 2 + note G_, 4 + note G_, 2 + note A_, 2 + note B_, 4 +Music_MobileCenter_branch_179642: ; 179642 + octave 3 + note E_, 2 + note C_, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note E_, 2 + note C_, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note B_, 4 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + note C_, 4 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 4 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note D_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note G_, 8 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 4 + note G_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 4 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 4 + note F_, 2 + note G_, 2 + note A_, 2 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + loopchannel 0, Music_MobileCenter_branch_179642 +; 1796cc + +Music_MobileCenter_Ch2: ; 1796cc + notetype $c, $c2 + dutycycle $3 + note __, 10 + octave 1 + note G_, 2 + note A_, 2 + note B_, 2 +Music_MobileCenter_branch_1796d6: ; 1796d6 + octave 2 + note C_, 2 + note E_, 2 + octave 1 + note G_, 2 + octave 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note G_, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note C_, 2 + note E_, 2 + octave 1 + note G_, 2 + octave 2 + note E_, 2 + note C_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note G_, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 1 + note G_, 2 + octave 2 + note G_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note C_, 2 + note E_, 2 + octave 1 + note G_, 2 + octave 2 + note E_, 2 + note C_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note D_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note D_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note D_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note D_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note E_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + loopchannel 0, Music_MobileCenter_branch_1796d6 +; 179777 + +Music_MobileCenter_Ch3: ; 179777 + notetype $c, $24 + vibrato $10, $34 + octave 4 + note G_, 2 + note A_, 2 + note B_, 4 + note B_, 2 + octave 5 + note C_, 2 + note D_, 4 + notetype $c, $25 +Music_MobileCenter_branch_179788: ; 179788 + note C_, 2 + octave 4 + note G_, 2 + octave 5 + note C_, 2 + note G_, 4 + note F_, 4 + note E_, 2 + note D_, 2 + octave 4 + note B_, 6 + notetype $c, $10 + octave 6 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 7 + note D_, 1 + note __, 3 + notetype $c, $25 + octave 4 + note B_, 2 + note G_, 2 + note B_, 2 + octave 5 + note E_, 4 + note D_, 4 + octave 4 + note B_, 2 + octave 5 + note C_, 2 + note E_, 6 + octave 4 + note E_, 2 + note F_, 2 + note D_, 2 + note E_, 2 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + octave 5 + note C_, 2 + note G_, 4 + note F_, 4 + note E_, 2 + note D_, 2 + octave 4 + note B_, 6 + notetype $c, $10 + octave 6 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 7 + note D_, 1 + note __, 3 + notetype $c, $25 + octave 4 + note B_, 2 + note G_, 2 + note B_, 2 + octave 5 + note E_, 4 + note D_, 4 + octave 4 + note B_, 2 + octave 5 + note C_, 8 + octave 4 + note G_, 2 + note A_, 2 + note B_, 2 + octave 5 + note D_, 2 + vibrato $18, $44 + note E_, 8 + note G_, 8 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 8 + octave 4 + note B_, 8 + octave 5 + note D_, 8 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 8 + note E_, 8 + note G_, 8 + note F_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 8 + note G_, 4 + note F_, 2 + note E_, 2 + note F_, 8 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 8 + vibrato $10, $34 + loopchannel 0, Music_MobileCenter_branch_179788 +; 179807 + +Music_MobileCenter_Ch4: ; 179807 + togglenoise $3 + stereopanning $f + notetype $c + note A_, 8 + note A_, 4 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 +Music_MobileCenter_branch_179813: ; 179813 + note A_, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note A_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + loopchannel 3, Music_MobileCenter_branch_179813 + note A_, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note A_, 2 + note D_, 2 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + loopchannel 0, Music_MobileCenter_branch_179813 +; 17982d + diff --git a/crysaudio/music/mom.asm b/crysaudio/music/mom.asm new file mode 100644 index 00000000..5ae89e85 --- /dev/null +++ b/crysaudio/music/mom.asm @@ -0,0 +1,114 @@ +Music_Mom: ; f6bf2 + dbw $81, Music_Mom_Ch2 + dbw $02, Music_Mom_Ch3 + dbw $03, Music_Mom_Ch4 +; f6bfb + +Music_Mom_Ch2: ; f6bfb + tempo 144 + volume $77 + stereopanning $f + dutycycle $2 + notetype $6, $b3 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note G#, 1 + note A_, 1 + note B_, 8 +Music_Mom_branch_f6c0e: ; f6c0e + notetype $c, $b1 + note __, 4 + octave 3 + note C#, 6 + note D_, 4 + note C_, 2 + note __, 2 + note C#, 6 + octave 2 + note E_, 4 + note A#, 2 + note B_, 2 + loopchannel 0, Music_Mom_branch_f6c0e +; f6c20 + +Music_Mom_Ch3: ; f6c20 + stereopanning $f0 + notetype $6, $25 + octave 3 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 + note G#, 1 + note E_, 8 + intensity $23 +Music_Mom_branch_f6c2e: ; f6c2e + octave 2 + note A_, 2 + note __, 6 + octave 4 + note E_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note F#, 8 + note D#, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note E_, 2 + note __, 6 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 6 + note C#, 4 + note D_, 2 + note __, 2 + loopchannel 0, Music_Mom_branch_f6c2e +; f6c51 + +Music_Mom_Ch4: ; f6c51 + togglenoise $3 + notetype $c + note __, 6 +Music_Mom_branch_f6c56: ; f6c56 + note D#, 1 + note __, 1 + 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 +; f6c72 + + diff --git a/crysaudio/music/mtmoon.asm b/crysaudio/music/mtmoon.asm new file mode 100644 index 00000000..c697daa7 --- /dev/null +++ b/crysaudio/music/mtmoon.asm @@ -0,0 +1,145 @@ +Music_MtMoon: ; edb29 + dbw $c0, Music_MtMoon_Ch1 + dbw $01, Music_MtMoon_Ch2 + dbw $02, Music_MtMoon_Ch3 + dbw $03, Music_MtMoon_Ch4 +; edb35 + +Music_MtMoon_Ch1: ; edb35 + tempo 208 + volume $77 + dutycycle $2 + tone $0001 + vibrato $8, $14 + stereopanning $f0 + notetype $c, $45 + note __, 2 + loopchannel 0, Music_MtMoon_branch_edb56 +; edb4c + +Music_MtMoon_Ch2: ; edb4c + vibrato $b, $15 + dutycycle $2 + notetype $c, $84 + stereopanning $f +Music_MtMoon_branch_edb56: ; edb56 + octave 4 + note D#, 6 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note B_, 6 + octave 4 + note C#, 10 + note G#, 6 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note F#, 2 + note G#, 2 + octave 5 + note C_, 2 + octave 4 + note G#, 2 + note F#, 6 + note E_, 2 + note D#, 2 + note E_, 6 + note F#, 6 + note E_, 4 + loopchannel 0, Music_MtMoon_branch_edb56 +; edb8a + +Music_MtMoon_Ch3: ; edb8a +Music_MtMoon_branch_edb8a: ; edb8a + notetype $c, $28 +Music_MtMoon_branch_edb8d: ; edb8d + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + loopchannel 3, Music_MtMoon_branch_edb8d + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + note D#, 2 + note E_, 2 +Music_MtMoon_branch_edbab: ; edbab + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note G#, 2 + loopchannel 4, Music_MtMoon_branch_edbab + loopchannel 0, Music_MtMoon_branch_edb8a +; edbbf + +Music_MtMoon_Ch4: ; edbbf + togglenoise $5 + notetype $c +Music_MtMoon_branch_edbc3: ; edbc3 + stereopanning $f + note A#, 4 + 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 +; edbd8 + + diff --git a/crysaudio/music/mtmoonsquare.asm b/crysaudio/music/mtmoonsquare.asm new file mode 100644 index 00000000..d990cb0f --- /dev/null +++ b/crysaudio/music/mtmoonsquare.asm @@ -0,0 +1,112 @@ +Music_MtMoonSquare: ; f4815 + dbw $40, Music_MtMoonSquare_Ch1 + dbw $01, Music_MtMoonSquare_Ch2 +; f481b + +Music_MtMoonSquare_Ch1: ; f481b + tempo 112 + volume $77 + dutycycle $2 + tone $0001 + note __, 1 +Music_MtMoonSquare_branch_f4826: ; f4826 + notetype $c, $44 +Music_MtMoonSquare_branch_f4829: ; f4829 + octave 4 + note D_, 2 + note E_, 2 + note F#, 4 + note F#, 2 + note A_, 2 + octave 5 + note D_, 4 + loopchannel 2, Music_MtMoonSquare_branch_f4829 +Music_MtMoonSquare_branch_f4835: ; f4835 + octave 4 + note E_, 2 + note F#, 2 + note G#, 4 + note G#, 2 + note B_, 2 + octave 5 + note E_, 4 + loopchannel 2, Music_MtMoonSquare_branch_f4835 +Music_MtMoonSquare_branch_f4841: ; f4841 + octave 4 + note C#, 2 + note D_, 2 + note E_, 4 + note E_, 2 + note G_, 2 + octave 5 + note C#, 4 + loopchannel 2, Music_MtMoonSquare_branch_f4841 +Music_MtMoonSquare_branch_f484d: ; f484d + octave 4 + note D_, 2 + note E_, 2 + note F#, 4 + note F#, 2 + note A_, 2 + octave 5 + note D_, 4 + loopchannel 2, Music_MtMoonSquare_branch_f484d + loopchannel 0, Music_MtMoonSquare_branch_f4826 +; f485d + +Music_MtMoonSquare_Ch2: ; f485d + dutycycle $2 + vibrato $18, $24 +Music_MtMoonSquare_branch_f4862: ; f4862 + notetype $c, $82 +Music_MtMoonSquare_branch_f4865: ; f4865 + octave 4 + note D_, 2 + note E_, 2 + note F#, 4 + note F#, 2 + note A_, 2 + octave 5 + note D_, 4 + notetype $c, $62 + loopchannel 2, Music_MtMoonSquare_branch_f4865 + notetype $c, $82 +Music_MtMoonSquare_branch_f4877: ; f4877 + octave 4 + note E_, 2 + note F#, 2 + note G#, 4 + note G#, 2 + note B_, 2 + octave 5 + note E_, 4 + notetype $c, $62 + loopchannel 2, Music_MtMoonSquare_branch_f4877 + notetype $c, $82 +Music_MtMoonSquare_branch_f4889: ; f4889 + octave 4 + note C#, 2 + note D_, 2 + note E_, 4 + note E_, 2 + note G_, 2 + octave 5 + note C#, 4 + notetype $c, $62 + loopchannel 2, Music_MtMoonSquare_branch_f4889 + notetype $c, $82 +Music_MtMoonSquare_branch_f489b: ; f489b + octave 4 + note D_, 2 + note E_, 2 + note F#, 4 + note F#, 2 + note A_, 2 + octave 5 + note D_, 4 + notetype $c, $62 + loopchannel 2, Music_MtMoonSquare_branch_f489b + loopchannel 0, Music_MtMoonSquare_branch_f4862 +; f48ae + + diff --git a/crysaudio/music/music_labels.txt b/crysaudio/music/music_labels.txt new file mode 100644 index 00000000..f22ed7d9 --- /dev/null +++ b/crysaudio/music/music_labels.txt @@ -0,0 +1,103 @@ +Music_Nothing +Music_TitleScreen +Music_Route1 +Music_Route3 +Music_Route12 +Music_MagnetTrain +Music_KantoGymLeaderBattle +Music_KantoTrainerBattle +Music_KantoWildPokemonBattle +Music_PokemonCenter +Music_LookHiker +Music_LookLass +Music_LookOfficer +Music_HealPokemon +Music_LavenderTown +Music_Route2 +Music_MtMoon +Music_ShowMeAround +Music_GameCorner +Music_Bicycle +Music_HallOfFame +Music_ViridianCity +Music_CeladonCity +Music_TrainerVictory +Music_WildPokemonVictory +Music_GymLeaderVictory +Music_MtMoonSquare +Music_Gym +Music_PalletTown +Music_ProfOaksPokemonTalk +Music_ProfOak +Music_LookRival +Music_AfterTheRivalFight +Music_Surf +Music_Evolution +Music_NationalPark +Music_Credits +Music_AzaleaTown +Music_CherrygroveCity +Music_LookKimonoGirl +Music_UnionCave +Music_JohtoWildPokemonBattle +Music_JohtoTrainerBatle +Music_Route30 +Music_EcruteakCity +Music_VioletCity +Music_JohtoGymLeaderBattle +Music_ChampionBattle +Music_RivalBattle +Music_RocketBattle +Music_ElmsLab +Music_DarkCave +Music_Route29 +Music_Route36 +Music_SSAqua +Music_LookYoungster +Music_LookBeauty +Music_LookRocket +Music_LookPokemaniac +Music_LookSage +Music_NewBarkTown +Music_GoldenrodCity +Music_VermilionCity +Music_PokemonChannel +Music_PokeFluteChannel +Music_TinTower +Music_SproutTower +Music_BurnedTower +Music_Lighthouse +Music_LakeOfRage +Music_IndigoPlateau +Music_Route37 +Music_RocketHideout +Music_DragonsDen +Music_JohtoWildPokemonBattleNight +Music_RuinsOfAlphRadioSignal +Music_SuccessfulCapture +Music_Route26 +Music_Mom +Music_VictoryRoad +Music_PokemonLullaby +Music_PokemonMarch +Music_GoldSilverOpening +Music_GoldSilverOpening2 +Music_MainMenu +Music_RuinsOfAlphInterior +Music_RocketTheme +Music_DancingHall +Music_BugCatchingContestResults +Music_BugCatchingContest +Music_LakeOfRageRocketsRadioSignal +Music_Printer +Music_PostCredits +Music_Clair +Music_MobileAdapterMenu +Music_MobileAdapter +Music_BuenasPassword +Music_LookMysticalMan +Music_CrystalOpening +Music_BattleTowerTheme +Music_SuicuneBattle +Music_BattleTowerLobby +Music_MobileCenter diff --git a/crysaudio/music/nationalpark.asm b/crysaudio/music/nationalpark.asm new file mode 100644 index 00000000..7e7ccf28 --- /dev/null +++ b/crysaudio/music/nationalpark.asm @@ -0,0 +1,670 @@ +Music_NationalPark: ; f54e8 + dbw $c0, Music_NationalPark_Ch1 + dbw $01, Music_NationalPark_Ch2 + dbw $02, Music_NationalPark_Ch3 + dbw $03, Music_NationalPark_Ch4 +; f54f4 + +Music_NationalPark_Ch1: ; f54f4 + tempo 192 + volume $77 + stereopanning $f + vibrato $18, $24 + dutycycle $1 + notetype $c, $77 + note __, 2 +Music_NationalPark_branch_f5504: ; f5504 + callchannel Music_NationalPark_branch_f554a + callchannel Music_NationalPark_branch_f554a + notetype $6, $67 + callchannel Music_NationalPark_branch_f563a + notetype $c, $77 + note __, 16 + octave 2 + note A#, 1 + octave 3 + note D_, 1 + note F_, 1 + note G#, 1 + note D_, 1 + note F_, 1 + note A#, 1 + notetype $6, $67 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + callchannel Music_NationalPark_branch_f563a + intensity $77 + octave 3 + note E_, 1 + note F_, 5 + note D#, 4 + note __, 2 + note C_, 12 + note F_, 8 + note C#, 1 + intensity $98 + note D_, 16 + intensity $77 + note D_, 7 + notetype $c, $77 + note __, 4 + loopchannel 0, Music_NationalPark_branch_f5504 +; f554a + +Music_NationalPark_branch_f554a: ; f554a + octave 2 + note G#, 6 + octave 3 + note F_, 2 + intensity $47 + note F_, 1 + note G#, 1 + intensity $57 + note F_, 1 + note G#, 1 + intensity $77 + note F_, 1 + note G#, 1 + intensity $97 + note F_, 1 + note G#, 1 + intensity $77 + octave 2 + note A_, 6 + octave 3 + note F#, 2 + intensity $47 + note F#, 1 + note A_, 1 + intensity $57 + note F#, 1 + note A_, 1 + intensity $77 + note F#, 1 + note A_, 1 + intensity $97 + note F#, 1 + note A_, 1 + intensity $77 + octave 2 + note G#, 6 + octave 3 + note F_, 2 + intensity $47 + octave 4 + note C_, 1 + note C#, 1 + intensity $57 + note C_, 1 + note C#, 1 + intensity $77 + note C_, 1 + note C#, 1 + intensity $97 + note C_, 1 + note C#, 1 + intensity $77 + octave 2 + note A_, 6 + octave 3 + note C#, 2 + intensity $47 + octave 4 + note C#, 1 + note D#, 1 + intensity $57 + note C#, 1 + note D#, 1 + intensity $77 + note C#, 1 + note D#, 1 + intensity $97 + note C#, 1 + note D#, 1 + intensity $77 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + intensity $47 + octave 4 + note C#, 1 + note D#, 1 + intensity $57 + note C#, 1 + note D#, 1 + intensity $77 + note C#, 1 + note D#, 1 + intensity $97 + note C#, 1 + note D#, 1 + intensity $77 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note C_, 2 + note D#, 2 + note C_, 2 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + intensity $57 + octave 4 + note F_, 1 + note D#, 1 + intensity $67 + note D_, 1 + note D#, 1 + intensity $77 + note F_, 1 + note F#, 1 + intensity $97 + note G#, 1 + note A#, 1 + intensity $77 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + intensity $47 + octave 4 + note C#, 1 + note D#, 1 + intensity $57 + note C#, 1 + note D#, 1 + intensity $77 + note C#, 1 + note D#, 1 + intensity $97 + note C#, 1 + note D#, 1 + intensity $77 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note D#, 2 + note C_, 2 + note D#, 2 + note C_, 2 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + endchannel +; f563a + +Music_NationalPark_branch_f563a: ; f563a + note __, 16 + note __, 3 + octave 4 + note A#, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 4 + note __, 16 + note __, 3 + note A_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 2 + note __, 4 + endchannel +; f5652 + +Music_NationalPark_Ch2: ; f5652 + vibrato $14, $24 + dutycycle $1 + notetype $c, $a7 + note __, 2 + stereopanning $f0 +Music_NationalPark_branch_f565d: ; f565d + notetype $c, $a7 + callchannel Music_NationalPark_branch_f56b8 + octave 3 + note D_, 8 + callchannel Music_NationalPark_branch_f56b8 + note __, 2 + intensity $a7 + octave 4 + note G#, 2 + note F#, 2 + note F_, 2 + notetype $6, $a7 + callchannel Music_NationalPark_branch_f56f5 + octave 3 + note B_, 1 + octave 4 + note C_, 5 + octave 3 + note G#, 4 + note __, 2 + octave 4 + note A#, 8 + note G#, 2 + note __, 2 + note F#, 2 + note __, 2 + note G#, 4 + note E_, 1 + note F_, 14 + intensity $87 + note G_, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + intensity $a7 + callchannel Music_NationalPark_branch_f56f5 + octave 3 + note B_, 1 + octave 4 + note C_, 5 + octave 3 + note G#, 4 + note __, 2 + note A#, 12 + octave 4 + note C_, 8 + octave 3 + note A_, 1 + vibrato $0, $0 + intensity $b8 + note A#, 16 + vibrato $14, $24 + intensity $b7 + note A#, 11 + octave 2 + note D#, 2 + note D_, 2 + loopchannel 0, Music_NationalPark_branch_f565d +; f56b8 + +Music_NationalPark_branch_f56b8: ; f56b8 + octave 2 + note C#, 6 + note G#, 2 + octave 3 + note C#, 8 + octave 2 + note C#, 6 + note A_, 2 + octave 3 + note C#, 8 + octave 2 + note C#, 6 + note G#, 2 + octave 3 + note C#, 8 + octave 2 + note C#, 6 + note A_, 2 + octave 3 + note F#, 8 + octave 1 + note F#, 6 + octave 2 + note C#, 2 + note A#, 8 + octave 1 + note F#, 6 + octave 2 + note C#, 2 + note A_, 8 + octave 1 + note F_, 6 + octave 2 + note C_, 2 + note G#, 8 + octave 1 + note A#, 6 + octave 2 + note F_, 2 + octave 3 + note D_, 8 + octave 1 + note F#, 6 + octave 2 + note C#, 2 + note A#, 8 + octave 1 + note F#, 6 + octave 2 + note C#, 2 + note A_, 8 + octave 1 + note F_, 6 + octave 2 + note C_, 2 + note G#, 8 + octave 1 + note A#, 6 + octave 2 + note F_, 2 + endchannel +; f56f5 + +Music_NationalPark_branch_f56f5: ; f56f5 + octave 4 + note E_, 1 + note F_, 5 + note F#, 4 + note __, 2 + note C#, 7 + intensity $87 + octave 5 + note E_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 2 + intensity $a7 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + octave 4 + note E_, 1 + note F_, 5 + note F#, 4 + note __, 2 + note D#, 7 + intensity $87 + octave 5 + note D_, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note D#, 2 + intensity $a7 + octave 4 + note D_, 2 + note C#, 2 + endchannel +; f5723 + +Music_NationalPark_Ch3: ; f5723 + vibrato $16, $24 + notetype $c, $11 + octave 4 + note G#, 1 + note A#, 1 + stereopanning $ff +Music_NationalPark_branch_f572e: ; f572e + callchannel Music_NationalPark_branch_f5756 + octave 5 + note A#, 14 + octave 4 + note G#, 1 + note A#, 1 + callchannel Music_NationalPark_branch_f5756 + octave 5 + note A#, 8 + octave 4 + note D_, 8 + intensity $15 + callchannel Music_NationalPark_branch_f578f + octave 4 + note D_, 1 + octave 3 + note F_, 3 + callchannel Music_NationalPark_branch_f578f + octave 4 + note D_, 1 + octave 3 + note F_, 1 + intensity $11 + octave 4 + note G#, 1 + note A#, 1 + loopchannel 0, Music_NationalPark_branch_f572e +; f5756 + +Music_NationalPark_branch_f5756: ; f5756 + octave 5 + note C_, 16 + note C#, 14 + note G#, 1 + note A#, 1 + octave 6 + note C_, 16 + note C#, 10 + note C_, 2 + note C#, 2 + note D#, 2 + note F_, 2 + note D#, 2 + note C#, 2 + octave 5 + note A#, 10 + octave 6 + note F_, 2 + note D#, 2 + note C#, 2 + octave 5 + note A_, 9 + octave 6 + note D_, 1 + octave 6 + note D#, 2 + note C#, 2 + note C_, 2 + octave 5 + note G#, 4 + octave 6 + note G#, 4 + note D#, 2 + note F_, 14 + note D_, 1 + note D#, 1 + note F_, 2 + note D#, 2 + note C#, 2 + octave 5 + note A#, 10 + octave 6 + note F_, 2 + note D#, 2 + note C#, 2 + octave 5 + note A_, 10 + octave 6 + note D#, 2 + note C#, 2 + note C_, 2 + octave 5 + note G#, 4 + note A#, 4 + octave 6 + note C_, 2 + endchannel +; f578f + +Music_NationalPark_branch_f578f: ; f578f + octave 2 + note F#, 3 + octave 3 + note C#, 2 + note __, 1 + note A#, 4 + note C#, 1 + note __, 1 + note A#, 1 + note C#, 3 + octave 2 + note F#, 3 + octave 3 + note C#, 2 + note __, 1 + note A_, 4 + note C#, 1 + note __, 1 + note A_, 1 + note C#, 3 + octave 2 + note F_, 3 + octave 3 + note C_, 2 + note __, 1 + note G#, 4 + note C_, 1 + note __, 1 + note G#, 1 + note C_, 3 + octave 2 + note A#, 3 + octave 3 + note F_, 2 + note __, 1 + octave 4 + note D_, 4 + octave 3 + note F_, 1 + note __, 1 + endchannel +; f57b8 + +Music_NationalPark_Ch4: ; f57b8 + togglenoise $3 + notetype $c + note __, 2 +Music_NationalPark_branch_f57bd: ; f57bd + note __, 16 + loopchannel 23, Music_NationalPark_branch_f57bd + note __, 8 + note A#, 2 + note D_, 2 + note A#, 1 + note D_, 1 + note B_, 2 +Music_NationalPark_branch_f57c8: ; 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 +; f57e8 + + diff --git a/crysaudio/music/newbarktown.asm b/crysaudio/music/newbarktown.asm new file mode 100644 index 00000000..3853132d --- /dev/null +++ b/crysaudio/music/newbarktown.asm @@ -0,0 +1,335 @@ +Music_NewBarkTown: ; eb2d3 + dbw $80, Music_NewBarkTown_Ch1 + dbw $01, Music_NewBarkTown_Ch2 + dbw $02, Music_NewBarkTown_Ch3 +; eb2dc + + + + +Music_NewBarkTown_Ch1: ; eb2dd + tempo 187 + volume $77 + stereopanning $f + vibrato $12, $23 + notetype $c, $87 + note __, 4 +Music_NewBarkTown_branch_eb2eb: ; eb2eb + dutycycle $0 + callchannel Music_NewBarkTown_branch_eb349 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note G_, 2 + note F#, 2 + dutycycle $2 + intensity $82 + note E_, 1 + note F#, 1 + note E_, 1 + note D_, 1 + note C#, 1 + octave 2 + note B_, 1 + note A_, 1 + note G_, 1 + dutycycle $0 + intensity $87 + callchannel Music_NewBarkTown_branch_eb349 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note E_, 2 + dutycycle $2 + intensity $82 + note C#, 1 + note __, 1 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note E_, 1 + note G_, 1 + note A_, 1 + octave 4 + 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 + octave 2 + note G_, 2 + note B_, 2 + octave 3 + note D_, 2 + note F#, 4 + note G_, 4 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note E_, 2 + note G_, 4 + note A_, 4 + note B_, 2 + intensity $87 + loopchannel 0, Music_NewBarkTown_branch_eb2eb +; eb349 + +Music_NewBarkTown_branch_eb349: ; eb349 + octave 3 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 2 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note A#, 2 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note B_, 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 4 + note C_, 2 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note G_, 2 + octave 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note E_, 2 + octave 2 + note B_, 1 + note __, 1 + endchannel +; eb37c + +Music_NewBarkTown_branch_eb37c: ; eb37c + octave 2 + note G_, 2 + note B_, 2 + octave 3 + note D_, 2 + note F#, 4 + note G_, 4 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note E_, 2 + note G_, 4 + note A_, 4 + note E_, 2 + endchannel +; eb38d + +Music_NewBarkTown_Ch2: ; eb38d + stereopanning $ff + vibrato $12, $23 + notetype $6, $a7 + note __, 8 +Music_NewBarkTown_branch_eb396: ; eb396 + dutycycle $2 + notetype $6, $a7 + callchannel Music_NewBarkTown_branch_eb3bf + callchannel Music_NewBarkTown_branch_eb3bf + callchannel Music_NewBarkTown_branch_eb3f2 + intensity $87 + octave 5 + note B_, 6 + note A_, 6 + intensity $77 + octave 6 + note D_, 4 + note C#, 16 + callchannel Music_NewBarkTown_branch_eb3f2 + intensity $87 + octave 5 + note B_, 6 + note A_, 6 + intensity $77 + octave 6 + note D_, 4 + note E_, 16 + loopchannel 0, Music_NewBarkTown_branch_eb396 +; eb3bf + +Music_NewBarkTown_branch_eb3bf: ; eb3bf + octave 2 + note D_, 4 + note __, 8 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 8 + note A#, 2 + note __, 2 + note D_, 4 + note __, 8 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 8 + octave 3 + note C_, 2 + note __, 2 + octave 2 + note G_, 4 + note __, 8 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 1 + note G#, 2 + note __, 2 + note G#, 8 + octave 2 + note D_, 2 + note __, 2 + note A_, 4 + note __, 8 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 1 + note A_, 2 + note __, 2 + note A_, 8 + octave 2 + note C#, 4 + endchannel +; eb3f2 + +Music_NewBarkTown_branch_eb3f2: ; eb3f2 + notetype $6, $97 + dutycycle $2 + octave 4 + note B_, 12 + note A_, 12 + note G_, 8 + notetype $c, $97 + note E_, 16 + endchannel +; eb400 + +Music_NewBarkTown_Ch3: ; eb400 + stereopanning $f0 + notetype $c, $10 + octave 5 + note D_, 2 + note E_, 2 +Music_NewBarkTown_branch_eb408: ; eb408 + vibrato $16, $23 + note F#, 4 + note A_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note G_, 2 + note F#, 6 + note D_, 2 + octave 4 + note A_, 6 + note G_, 1 + note A_, 1 + note B_, 4 + octave 5 + note D_, 4 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note E_, 6 + note F#, 2 + note E_, 4 + note __, 2 + note D_, 1 + note E_, 1 + note F#, 4 + note A_, 4 + note A#, 2 + note A_, 2 + note G_, 2 + note A#, 2 + note A_, 6 + octave 6 + note C#, 2 + note D_, 6 + octave 5 + note E_, 1 + note F#, 1 + note G_, 6 + note A_, 2 + note B_, 8 + note A_, 6 + note G_, 1 + note F#, 1 + note E_, 4 + note __, 4 + intensity $25 + vibrato $12, $53 + octave 2 + note G_, 16 + note A_, 16 + note G_, 16 + note A_, 16 + note G_, 16 + note A_, 16 + note G_, 16 + note A_, 14 + intensity $10 + vibrato $16, $23 + octave 5 + note D_, 1 + note E_, 1 + loopchannel 0, Music_NewBarkTown_branch_eb408 +; eb453 + + diff --git a/crysaudio/music/nothing.asm b/crysaudio/music/nothing.asm new file mode 100644 index 00000000..1cd93367 --- /dev/null +++ b/crysaudio/music/nothing.asm @@ -0,0 +1,14 @@ +Music_Nothing: ; e91a3 + dbw $c0, Music_Nothing_Ch1 + dbw $01, Music_Nothing_Ch2 + dbw $02, Music_Nothing_Ch3 + dbw $03, Music_Nothing_Ch4 +; e91af + +Music_Nothing_Ch1: ; e91af +Music_Nothing_Ch2: ; e91af +Music_Nothing_Ch3: ; e91af +Music_Nothing_Ch4: ; e91af + endchannel +; e91b0 + diff --git a/crysaudio/music/pallettown.asm b/crysaudio/music/pallettown.asm new file mode 100644 index 00000000..6518cbd9 --- /dev/null +++ b/crysaudio/music/pallettown.asm @@ -0,0 +1,363 @@ +Music_PalletTown: ; f4b0c + dbw $80, Music_PalletTown_Ch1 + dbw $01, Music_PalletTown_Ch2 + dbw $02, Music_PalletTown_Ch3 +; f4b15 + +Music_PalletTown_Ch1: ; f4b15 + tempo 188 + volume $77 + vibrato $12, $24 + tone $0001 + stereopanning $f +Music_PalletTown_branch_f4b22: ; f4b22 + dutycycle $2 + notetype $c, $78 + octave 3 + note B_, 12 + note A_, 1 + note D_, 1 + note F#, 1 + note A_, 1 + note B_, 12 + note D#, 1 + note G_, 1 + note B_, 1 + octave 4 + note D#, 1 + note E_, 4 + note D_, 4 + note C_, 4 + octave 3 + note A_, 4 + intensity $77 + note G_, 8 + intensity $78 + note F#, 4 + note A_, 4 + note B_, 12 + note A_, 1 + note D_, 1 + note F#, 1 + note A_, 1 + note G_, 2 + note B_, 2 + octave 4 + note E_, 2 + note G_, 4 + note F#, 2 + note G_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 8 + intensity $77 + note B_, 8 +Music_PalletTown_branch_f4b59: ; f4b59 + dutycycle $3 + intensity $92 + note G_, 2 + note E_, 2 + note G_, 2 + note E_, 2 + note G_, 2 + note D#, 2 + note G_, 2 + note D#, 2 + intensity $5f + note G_, 1 + note A_, 1 + note B_, 1 + octave 4 + note C_, 1 + note D_, 2 + note G_, 4 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + loopchannel 2, Music_PalletTown_branch_f4b59 + intensity $3f + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note A_, 4 + note G_, 4 + note F#, 4 + note D_, 4 + note E_, 4 + intensity $72 + note C_, 1 + note E_, 1 + note G_, 1 + octave 4 + note C_, 1 + note D_, 1 + note A_, 1 + octave 5 + note D_, 2 + intensity $62 + note D_, 2 + intensity $22 + note D_, 2 + intensity $2f + octave 3 + note D_, 4 + note E_, 4 + note G_, 6 + note A_, 1 + note G_, 1 + intensity $1f + note F#, 8 + loopchannel 0, Music_PalletTown_branch_f4b22 +; f4ba1 + +Music_PalletTown_Ch2: ; f4ba1 + vibrato $12, $44 + dutycycle $2 + stereopanning $f0 +Music_PalletTown_branch_f4ba8: ; f4ba8 + notetype $c, $88 + octave 1 + note G_, 2 + note B_, 2 + octave 2 + note D_, 2 + note G_, 6 + note F#, 4 + octave 1 + note G_, 2 + note B_, 2 + octave 2 + note D_, 2 + note G_, 6 + octave 1 + note B_, 4 + octave 2 + note C_, 2 + octave 1 + note G_, 2 + note B_, 2 + octave 2 + note C_, 4 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note D_, 2 + note __, 4 + note D_, 4 + note F#, 4 + octave 1 + note G_, 2 + note B_, 2 + octave 2 + note D_, 2 + note G_, 6 + note F#, 4 + note E_, 2 + note D_, 2 + note E_, 2 + octave 1 + note B_, 4 + octave 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 8 + note A_, 8 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note D_, 4 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note D_, 2 +Music_PalletTown_branch_f4be5: ; f4be5 + intensity $a2 + octave 3 + note E_, 2 + octave 2 + note C_, 2 + octave 3 + note E_, 2 + octave 2 + note C_, 2 + octave 3 + note D#, 2 + octave 2 + note C_, 2 + octave 3 + note D#, 2 + octave 2 + note C_, 2 + intensity $93 + note G_, 6 + note G_, 1 + note G_, 3 + note D_, 2 + note G_, 4 + loopchannel 2, Music_PalletTown_branch_f4be5 + note C_, 2 + octave 3 + note E_, 4 + octave 2 + note C_, 1 + octave 3 + note C_, 3 + octave 2 + note C_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + octave 3 + note D_, 4 + octave 2 + note D_, 1 + note G_, 3 + note E_, 2 + note G_, 2 + note E_, 2 + intensity $1f + note F#, 4 + intensity $88 + note F#, 4 + note B_, 4 + note G_, 4 + note A_, 2 + note D_, 2 + note G_, 2 + note D_, 4 + note C_, 2 + octave 1 + note B_, 2 + note A_, 2 + loopchannel 0, Music_PalletTown_branch_f4ba8 +; f4c2a + +Music_PalletTown_Ch3: ; f4c2a + vibrato $14, $24 +Music_PalletTown_branch_f4c2d: ; f4c2d + notetype $c, $10 + octave 6 + note D_, 2 + note C_, 2 + octave 5 + note B_, 2 + note A_, 2 + octave 6 + note G_, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note D_, 6 + octave 5 + note B_, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 6 + note C_, 8 + note __, 2 + octave 5 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 6 + octave 6 + note C_, 1 + octave 5 + note B_, 1 + note A_, 8 + octave 6 + note D_, 2 + note C_, 2 + octave 5 + note B_, 2 + octave 6 + note D_, 2 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 6 + note D_, 1 + note __, 1 + note D_, 8 + note C_, 2 + octave 5 + note B_, 2 + note A_, 2 + note G_, 2 + octave 6 + note D_, 2 + note C_, 2 + octave 5 + note B_, 2 + note A_, 2 + note G_, 8 + note __, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 6 + note C_, 8 + note D_, 6 + note C_, 2 + octave 5 + note B_, 8 + note __, 2 + note G_, 2 + note A_, 2 + note B_, 2 + octave 6 + note C_, 2 + note __, 2 + note C_, 4 + note D_, 6 + note C_, 1 + note D_, 1 + octave 5 + note B_, 8 + note __, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note A_, 8 + note E_, 4 + note B_, 4 + note A_, 8 + note G_, 4 + note E_, 4 + note F#, 7 + note __, 1 + note G_, 3 + note __, 1 + note B_, 3 + note __, 1 + note B_, 8 + note A_, 8 + loopchannel 0, Music_PalletTown_branch_f4c2d +; f4c9f + + diff --git a/crysaudio/music/pinball/bluefield.asm b/crysaudio/music/pinball/bluefield.asm new file mode 100644 index 00000000..82d3485b --- /dev/null +++ b/crysaudio/music/pinball/bluefield.asm @@ -0,0 +1,1466 @@ +Music_Pinballbluefield: ; 40cbb + dbw $c0, Music_Pinballbluefield_Ch1 + dbw $01, Music_Pinballbluefield_Ch2 + dbw $02, Music_Pinballbluefield_Ch3 + dbw $03, Music_Pinballbluefield_Ch4 +; 40cc7 + +Music_Pinballbluefield_Ch1: ; 40cc7 + tempo 144 + volume $77 + vibrato $9, $34 + tone $0001 + notetype $8, $a2 + dutycycle $3 + octave 3 + note A_, 4 + intensity $a1 + note C_, 2 + note F_, 2 + note A_, 2 + intensity $a3 + note A_, 7 + note __, 1 + intensity $a1 + note C_, 2 + note F#, 2 + note A_, 2 + intensity $a2 + note B_, 4 + intensity $a1 + note A#, 2 + note A_, 2 + note __, 2 + note D_, 2 + note __, 12 +Music_Pinballbluefield_branch_40cf1: ; 40cf1 + notetype $8, $61 + dutycycle $2 + note __, 12 + note __, 12 + note __, 10 + note A#, 2 + note __, 4 + intensity $91 + note G_, 2 + intensity $a1 + note A#, 2 + note __, 2 + intensity $c1 + note A#, 2 + notetype $c, $b3 + note __, 16 + notetype $8, $a2 + dutycycle $3 + note B_, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + note __, 2 + note G_, 2 + note __, 6 + note D_, 2 + note F_, 2 + note G_, 2 + note F#, 1 + note G_, 5 + note __, 4 + note E_, 6 + note __, 8 + note A_, 1 + note A#, 5 + note __, 4 + note A#, 2 + note __, 4 + intensity $91 + dutycycle $2 + octave 5 + note G_, 2 + note A_, 2 + note __, 2 + note A#, 2 + intensity $a2 + dutycycle $3 + octave 3 + note G#, 1 + note A_, 2 + note __, 1 + note A_, 2 + note A_, 2 + note __, 2 + note F_, 2 + note __, 4 + note F_, 2 + note __, 4 + note A_, 2 + note B_, 2 + note __, 2 + note D_, 2 + note G_, 2 + note __, 2 + note B_, 2 + note __, 12 + intensity $91 + dutycycle $2 + note __, 12 + note __, 4 + octave 5 + note C_, 2 + note __, 6 + note __, 12 + note __, 4 + octave 4 + note B_, 2 + note __, 6 + note __, 12 + note __, 4 + note B_, 2 + note __, 6 + note __, 4 + note G_, 1 + note __, 11 + note G_, 2 + note __, 6 + note __, 12 + note __, 4 + note F_, 2 + note __, 6 + note __, 12 + note __, 4 + note F_, 2 + note __, 6 + intensity $41 + octave 3 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + intensity $51 + note G_, 2 + intensity $61 + note B_, 2 + note __, 4 + intensity $91 + octave 4 + note G_, 2 + note __, 6 + intensity $a2 + dutycycle $3 + octave 3 + note F#, 1 + note G_, 4 + note __, 1 + note E_, 4 + note __, 2 + note A#, 4 + note __, 2 + octave 4 + note C#, 2 + note __, 2 + note D#, 1 + note E_, 5 + intensity $91 + dutycycle $2 + note __, 2 + octave 5 + note C_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 3 + note A_, 2 + note __, 4 + octave 4 + note E_, 2 + intensity $91 + dutycycle $2 + octave 5 + note C_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 3 + note A_, 2 + note G_, 1 + note G#, 2 + note __, 1 + note F_, 2 + intensity $91 + dutycycle $2 + octave 5 + note D_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 3 + note F_, 2 + note __, 4 + note G#, 2 + intensity $91 + dutycycle $2 + octave 5 + note D_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 4 + note C_, 2 + octave 3 + note A#, 1 + note B_, 3 + note __, 2 + intensity $91 + dutycycle $2 + octave 5 + note D_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 3 + note G_, 2 + note __, 4 + note B_, 2 + intensity $91 + dutycycle $2 + octave 5 + note D_, 2 + note __, 2 + intensity $a2 + dutycycle $3 + octave 3 + note G_, 2 + octave 4 + note F#, 1 + note G_, 3 + note __, 2 + note A_, 2 + note __, 2 + note E_, 2 + note __, 6 + intensity $91 + dutycycle $2 + octave 5 + note E_, 2 + note __, 4 + note F_, 2 + note C_, 2 + octave 4 + note A_, 2 + note F_, 2 + note C_, 2 + octave 3 + note A_, 2 + note F_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + note D_, 2 + note B_, 2 + intensity $41 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + intensity $51 + note G_, 2 + intensity $61 + note B_, 2 + intensity $71 + note G_, 2 + intensity $81 + note B_, 2 + intensity $91 + note G_, 2 + intensity $a1 + note B_, 2 + intensity $b1 + note G_, 2 + intensity $c1 + note B_, 2 + intensity $a2 + dutycycle $3 + note G#, 1 + intensity $a4 + note A_, 9 + intensity $a2 + note F_, 2 + note __, 4 + note F_, 2 + note __, 4 + note D_, 2 + intensity $a7 + note F#, 1 + note G_, 11 + note B_, 12 + notetype $c, $b3 + note __, 16 + loopchannel 0, Music_Pinballbluefield_branch_40cf1 +; 40e48 + +Music_Pinballbluefield_Ch2: ; 40e48 + vibrato $9, $34 + notetype $8, $b2 + dutycycle $3 + octave 4 + note E_, 4 + intensity $b1 + octave 3 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + intensity $b3 + note E_, 7 + note __, 1 + intensity $b1 + octave 3 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + intensity $b2 + note E_, 4 + intensity $b1 + note D#, 2 + note D_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 4 + intensity $b2 + note G_, 2 + note A_, 2 + note __, 2 + note B_, 2 +Music_Pinballbluefield_branch_40e75: ; 40e75 + notetype $8, $b2 + octave 4 + note C#, 1 + note D_, 5 + intensity $81 + dutycycle $2 + octave 3 + note G_, 2 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 6 + intensity $81 + dutycycle $2 + octave 3 + note G_, 2 + note A_, 2 + note __, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D#, 1 + note E_, 5 + intensity $41 + dutycycle $2 + octave 3 + note A#, 2 + intensity $51 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note F_, 2 + intensity $71 + dutycycle $2 + octave 3 + note G_, 2 + intensity $81 + note A#, 2 + intensity $b2 + dutycycle $3 + octave 4 + note E_, 2 + note F_, 2 + intensity $b1 + dutycycle $2 + octave 3 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note G_, 2 + note D#, 1 + note E_, 2 + note __, 1 + note D#, 2 + note D_, 2 + intensity $81 + dutycycle $2 + octave 3 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 2 + intensity $81 + dutycycle $2 + octave 3 + note F_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + note A_, 2 + intensity $81 + dutycycle $2 + note A#, 2 + note B_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 2 + note E_, 2 + note __, 2 + note G_, 2 + note E_, 2 + note __, 2 + note D_, 2 + note __, 6 + octave 3 + note G_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 1 + note D_, 5 + intensity $81 + dutycycle $2 + octave 3 + note G_, 2 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 6 + intensity $91 + dutycycle $2 + octave 5 + note G_, 2 + note F#, 2 + note __, 2 + note F_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D#, 1 + note E_, 5 + intensity $81 + dutycycle $2 + octave 3 + note G_, 2 + note A#, 2 + intensity $b2 + dutycycle $3 + octave 4 + note F_, 2 + intensity $81 + dutycycle $2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + intensity $b2 + dutycycle $3 + note E_, 2 + note F_, 2 + note __, 2 + note G_, 2 + note D#, 1 + note E_, 2 + note __, 1 + note D#, 2 + note D_, 2 + note __, 2 + note C_, 2 + intensity $81 + dutycycle $2 + octave 3 + note F_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + note A_, 2 + intensity $81 + dutycycle $2 + note A#, 2 + note B_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 2 + note E_, 2 + note __, 2 + note G_, 2 + note E_, 2 + note __, 2 + note D_, 2 + note __, 6 + note E_, 2 + note F_, 2 + note G_, 2 + note G#, 1 + note A_, 3 + intensity $91 + dutycycle $2 + octave 5 + note C_, 2 + octave 3 + note E_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + note __, 2 + intensity $b2 + dutycycle $3 + note E_, 2 + note __, 4 + note D_, 6 + intensity $91 + dutycycle $2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note __, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + note E_, 2 + note __, 2 + note F_, 2 + note G_, 4 + intensity $91 + dutycycle $2 + note B_, 2 + octave 3 + note E_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + intensity $91 + dutycycle $2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + intensity $b2 + dutycycle $3 + note G_, 2 + intensity $91 + dutycycle $2 + octave 3 + note G_, 2 + note B_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + note C#, 1 + note D_, 2 + note __, 1 + note C_, 2 + octave 3 + note B_, 2 + note __, 2 + octave 4 + note C_, 2 + intensity $91 + dutycycle $2 + octave 3 + note C_, 2 + note E_, 2 + intensity $b2 + dutycycle $3 + note B_, 2 + intensity $91 + dutycycle $2 + note E_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 2 + octave 3 + note A_, 4 + intensity $91 + dutycycle $2 + octave 4 + note F_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + intensity $b2 + dutycycle $3 + note F_, 2 + intensity $91 + dutycycle $2 + octave 3 + note F_, 2 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note E_, 2 + intensity $91 + dutycycle $2 + octave 3 + note D_, 2 + note F_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + note C_, 4 + intensity $91 + dutycycle $2 + note F_, 2 + octave 3 + note D_, 2 + note F_, 2 + intensity $b2 + dutycycle $3 + note B_, 2 + intensity $91 + dutycycle $2 + note F_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C_, 2 + intensity $91 + dutycycle $2 + octave 3 + note G_, 2 + note B_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + intensity $b4 + note E_, 12 + intensity $71 + dutycycle $2 + octave 3 + note G_, 2 + intensity $81 + note B_, 2 + intensity $91 + note G_, 2 + intensity $a1 + note B_, 2 + intensity $b1 + note G_, 2 + intensity $c1 + note B_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note C#, 1 + note D_, 4 + note __, 1 + note C#, 4 + note __, 2 + note F_, 4 + note __, 2 + note G_, 2 + note __, 2 + note G#, 1 + note A_, 5 + intensity $91 + dutycycle $2 + octave 5 + note C_, 2 + octave 3 + note E_, 2 + note F_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note E_, 2 + note __, 4 + note A_, 2 + note __, 4 + note E_, 2 + note D#, 1 + note E_, 2 + note __, 1 + note D_, 2 + note C#, 2 + note __, 2 + note D_, 2 + note __, 4 + note C#, 2 + note __, 4 + note D_, 2 + note F#, 1 + note G_, 3 + intensity $91 + dutycycle $2 + note B_, 2 + octave 3 + note D_, 2 + note E_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + intensity $91 + dutycycle $2 + octave 3 + note E_, 2 + note G_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note G_, 2 + intensity $91 + dutycycle $2 + octave 3 + note G_, 2 + note B_, 2 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + note A#, 1 + note B_, 3 + intensity $91 + dutycycle $2 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 5 + note C_, 2 + note __, 2 + octave 4 + note A_, 2 + note __, 4 + intensity $91 + dutycycle $2 + note A_, 2 + intensity $b2 + dutycycle $3 + octave 3 + note A_, 2 + note __, 2 + octave 4 + note C_, 2 + note E_, 1 + note F_, 3 + intensity $91 + dutycycle $2 + note A_, 2 + note A_, 2 + note __, 2 + intensity $b2 + dutycycle $3 + note C_, 2 + intensity $b1 + notetype $8, $91 + dutycycle $2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + intensity $b2 + dutycycle $3 + note F_, 2 + intensity $91 + dutycycle $2 + note A_, 2 + note F_, 2 + intensity $b2 + dutycycle $3 + note C_, 2 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note __, 1 + octave 3 + note B_, 2 + note A_, 2 + note __, 2 + note B_, 2 + note __, 6 + note G_, 6 + octave 4 + note D#, 1 + notetype $c, $b7 + note E_, 14 + notetype $8, $b2 + note __, 2 + note C#, 1 + intensity $b4 + note D_, 9 + intensity $b2 + note C_, 2 + note __, 4 + note C_, 2 + note __, 4 + octave 3 + note A_, 2 + octave 4 + note D#, 1 + notetype $c, $b7 + note E_, 14 + notetype $8, $b2 + note __, 2 + intensity $93 + dutycycle $2 + octave 3 + note B_, 1 + octave 4 + note C_, 5 + octave 3 + note A_, 6 + note B_, 4 + intensity $b2 + dutycycle $3 + note G_, 2 + note A_, 2 + note __, 2 + note B_, 2 + loopchannel 0, Music_Pinballbluefield_branch_40e75 +; 4111e + +Music_Pinballbluefield_Ch3: ; 4111e + forceoctave $10 + notetype $8, $22 + octave 3 + note F_, 4 + note __, 6 + note F#, 7 + note __, 7 + note G_, 4 + note __, 6 + octave 2 + note G_, 2 + note __, 12 +Music_Pinballbluefield_branch_4112d: ; 4112d + callchannel Music_Pinballbluefield_branch_412dd + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D_, 2 + note __, 2 + note B_, 2 + note __, 6 + note D_, 2 + octave 2 + note B_, 2 + note G_, 2 + callchannel Music_Pinballbluefield_branch_412dd + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D_, 2 + note __, 2 + octave 2 + note G_, 2 + note __, 12 + note F_, 2 + note __, 2 + octave 6 + note E_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note F_, 2 + note __, 2 + octave 6 + note E_, 1 + note __, 1 + octave 2 + note F_, 2 + note __, 2 + note F_, 1 + note __, 1 + note F_, 2 + note __, 2 + octave 6 + note D_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note F_, 2 + note __, 2 + octave 6 + note D_, 1 + note __, 1 + octave 2 + note F_, 2 + note __, 2 + note F_, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 6 + note D_, 1 + note __, 1 + octave 2 + note E_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 6 + note D_, 1 + note __, 1 + octave 2 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 6 + note C_, 1 + note __, 1 + octave 2 + note E_, 2 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 6 + note C_, 1 + note __, 1 + octave 2 + note E_, 2 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note D_, 2 + note __, 2 + octave 6 + note C_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note D_, 2 + note __, 2 + octave 6 + note C_, 1 + note __, 1 + octave 2 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + note D_, 2 + note __, 2 + octave 5 + note B_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 2 + note __, 2 + octave 5 + note B_, 1 + note __, 1 + octave 2 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + note C_, 2 + note __, 2 + octave 5 + note B_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 2 + note __, 2 + octave 5 + note B_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C#, 2 + note __, 2 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note C#, 2 + note __, 2 + note C_, 2 + note C#, 2 + note __, 2 + note G_, 2 + note F_, 2 + note __, 2 + octave 6 + note D#, 2 + note E_, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note F_, 2 + note __, 4 + octave 6 + note E_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 6 + note E_, 1 + note __, 1 + octave 2 + note F_, 2 + note __, 2 + octave 6 + note E_, 2 + note F_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note F_, 2 + note __, 4 + octave 6 + note F_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 6 + note F_, 1 + note __, 1 + octave 2 + note E_, 2 + note __, 2 + octave 6 + note F#, 2 + note G_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note E_, 2 + note __, 4 + octave 6 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + octave 2 + note E_, 2 + note __, 2 + octave 6 + note G#, 2 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note E_, 2 + note __, 4 + octave 6 + note A_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 6 + note A_, 1 + note __, 1 + octave 2 + note D_, 2 + note __, 2 + octave 6 + note C#, 2 + note D_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note D_, 2 + note __, 4 + octave 6 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + octave 2 + note D_, 2 + note __, 2 + octave 5 + note A#, 2 + note B_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + octave 5 + note B_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 5 + note B_, 1 + note __, 1 + octave 2 + note C_, 2 + note __, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 2 + note __, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 3 + note C_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note C_, 2 + note __, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 2 + note __, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 3 + note C_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + loopchannel 0, Music_Pinballbluefield_branch_4112d +; 412dd + +Music_Pinballbluefield_branch_412dd: ; 412dd + octave 3 + note C_, 3 + note __, 1 + octave 4 + note C_, 2 + octave 3 + note B_, 3 + note __, 3 + note A#, 3 + note __, 3 + note A_, 3 + note __, 3 + note G_, 2 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note A#, 6 + octave 3 + note A#, 6 + note A_, 2 + note __, 2 + note E_, 2 + note D_, 2 + note __, 4 + octave 4 + note D_, 1 + note __, 1 + note C#, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 3 + note A_, 2 + note __, 2 + note F_, 2 + note D_, 2 + note __, 2 + note A_, 2 + endchannel +; 41306 + +Music_Pinballbluefield_Ch4: ; 41306 + togglenoise $0 + notetype $8 + note F#, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note F#, 8 + note G_, 2 + note G_, 2 + note G_, 2 + note F#, 4 + note G_, 2 + note G_, 4 + note F#, 2 + note D#, 4 + note D_, 2 + note D#, 2 + note D_, 2 + note D_, 2 +Music_Pinballbluefield_branch_4131b: ; 4131b + note F#, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D#, 4 + note F#, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D#, 4 + note F#, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note F#, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note C_, 4 + note G_, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 4 + note D#, 2 + note F#, 6 + note G_, 2 + note G_, 2 + note G_, 2 +Music_Pinballbluefield_branch_4133e: ; 4133e + note D#, 4 + note G_, 2 + note F#, 4 + note G_, 2 + note D#, 4 + note G_, 2 + note G_, 4 + note D#, 2 + loopchannel 3, Music_Pinballbluefield_branch_4133e + note D#, 4 + note G_, 2 + note F#, 4 + note G_, 2 + note __, 6 + note C#, 2 + note C#, 2 + note D_, 2 + callchannel Music_Pinballbluefield_branch_41386 + callchannel Music_Pinballbluefield_branch_41386 + note D#, 4 + note F#, 2 + note D_, 4 + note G_, 2 + note D#, 4 + note D_, 2 + note F#, 2 + note D#, 2 + note D_, 2 + note D#, 4 + note F#, 2 + note D_, 4 + note D_, 2 + note D#, 4 + note F#, 2 + note D_, 4 + note D_, 2 +Music_Pinballbluefield_branch_41369: ; 41369 + callchannel Music_Pinballbluefield_branch_41386 + loopchannel 3, Music_Pinballbluefield_branch_41369 + note F#, 4 + note D#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 2 + note F#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 2 +Music_Pinballbluefield_branch_4137b: ; 4137b + callchannel Music_Pinballbluefield_branch_41386 + loopchannel 10, Music_Pinballbluefield_branch_4137b + loopchannel 0, Music_Pinballbluefield_branch_4131b +; 41386 + +Music_Pinballbluefield_branch_41386: ; 41386 + note D#, 4 + note F#, 2 + note D_, 4 + note G_, 2 + note D#, 4 + note F#, 2 + note D_, 4 + note D#, 2 + endchannel +; 4138f + + diff --git a/crysaudio/music/pinball/catchem_blue.asm b/crysaudio/music/pinball/catchem_blue.asm new file mode 100644 index 00000000..fbef2250 --- /dev/null +++ b/crysaudio/music/pinball/catchem_blue.asm @@ -0,0 +1,2149 @@ +Music_Pinballcatchem_blue: ; 4138f + dbw $c0, Music_Pinballcatchem_blue_Ch1 + dbw $01, Music_Pinballcatchem_blue_Ch2 + dbw $02, Music_Pinballcatchem_blue_Ch3 + dbw $03, Music_Pinballcatchem_blue_Ch4 +; 4139b + +Music_Pinballcatchem_blue_Ch1: ; 4139b + tempo 160 + volume $77 + vibrato $9, $34 + tone $0001 + notetype $c, $b3 + note __, 16 +Music_Pinballcatchem_blue_branch_413aa: ; 413aa + notetype $8, $a2 + dutycycle $3 + octave 4 + note C#, 2 + note __, 12 + note __, 10 + octave 3 + note A#, 2 + note __, 12 + note A#, 3 + note __, 7 + octave 4 + note C#, 2 + note __, 1 + intensity $81 + octave 2 + note A#, 2 + octave 3 + note C#, 1 + note A#, 2 + octave 4 + note C#, 1 + octave 3 + note C#, 2 + intensity $a2 + note A#, 2 + note __, 2 + octave 4 + note F_, 3 + note __, 6 + note C#, 2 + note __, 12 + note D#, 3 + note __, 7 + intensity $81 + dutycycle $2 + octave 3 + note A#, 2 + octave 4 + note F_, 1 + note A#, 2 + note F_, 3 + note A_, 1 + note A#, 2 + note F_, 1 + note __, 3 + note G#, 5 + note G_, 1 + note G#, 2 + note D#, 1 + note __, 3 + note F#, 5 + note F_, 1 + note F#, 2 + note F_, 4 + note G#, 3 + dutycycle $3 + octave 3 + note A#, 2 + octave 4 + note C_, 3 + dutycycle $2 + note D#, 1 + note A#, 2 + note F_, 1 + note A#, 3 + note F_, 2 + note A_, 1 + note A#, 2 + note F_, 4 + note G#, 5 + note G_, 1 + note G#, 2 + note F_, 1 + intensity $a1 + dutycycle $3 + note C#, 3 + note C#, 3 + note C_, 2 + octave 3 + note A#, 4 + note G#, 2 + note G_, 1 + note F#, 2 + note A_, 1 + note __, 2 + intensity $a3 + note A_, 3 + intensity $81 + dutycycle $2 + octave 5 + note E_, 1 + note F_, 2 + octave 4 + note A#, 3 + note F_, 3 + note A_, 1 + note A#, 2 + note F_, 4 + note G#, 3 + note G_, 2 + intensity $83 + note G#, 3 + intensity $81 + octave 5 + note C_, 1 + note C#, 2 + octave 4 + note A#, 3 + note F_, 3 + note F_, 1 + note F#, 2 + note F_, 1 + note __, 3 + octave 5 + note C_, 2 + octave 4 + note F_, 1 + note B_, 2 + intensity $83 + octave 5 + note C_, 3 + intensity $81 + octave 4 + note F_, 1 + note __, 6 + intensity $a1 + dutycycle $3 + note C#, 3 + note C_, 3 + octave 3 + note A#, 2 + intensity $a2 + note F_, 2 + note __, 5 + intensity $a1 + note F#, 2 + note F#, 1 + note A#, 3 + intensity $a3 + note F#, 3 + note __, 12 + note __, 6 + intensity $81 + dutycycle $2 + octave 4 + note D_, 2 + note A#, 3 + octave 5 + note C_, 1 + note D_, 3 + note F_, 1 + note D_, 1 + note F_, 1 + intensity $73 + note A#, 3 + note __, 9 + note __, 12 + intensity $72 + note D_, 2 + note __, 4 + intensity $71 + note D_, 2 + note D_, 1 + note D_, 2 + note D_, 1 + note __, 12 + note __, 2 + intensity $81 + note C_, 1 + intensity $91 + note C_, 3 + intensity $81 + note C_, 2 + intensity $91 + note C_, 4 + note __, 12 + note __, 6 + intensity $71 + note D_, 2 + note D_, 1 + note D_, 2 + note D_, 1 + notetype $c, $b3 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype $8, $a2 + dutycycle $3 + note __, 12 + octave 4 + note F_, 2 + note __, 10 + callchannel Music_Pinballcatchem_blue_branch_4158d + note G#, 2 + note F_, 1 + octave 4 + note D_, 2 + octave 3 + note F_, 1 + note G#, 2 + note F_, 1 + note G#, 2 + note F_, 1 + note G_, 2 + octave 5 + note F#, 1 + note G_, 2 + octave 3 + note F_, 1 + note G_, 2 + octave 5 + note G_, 1 + octave 3 + note G_, 2 + octave 5 + note G_, 1 + octave 3 + note D#, 2 + note G_, 1 + note A#, 2 + note G_, 1 + note D#, 2 + note A#, 1 + note D#, 2 + note A#, 1 + note E_, 2 + note G_, 1 + note A#, 2 + note G_, 1 + note E_, 2 + note A#, 1 + note G_, 2 + note A#, 1 + note __, 12 + note __, 2 + intensity $a4 + dutycycle $3 + note A#, 3 + note __, 3 + note A_, 4 + dutycycle $2 + callchannel Music_Pinballcatchem_blue_branch_4158d + note G#, 2 + note D_, 1 + note F_, 2 + note D_, 1 + note F_, 2 + note D_, 1 + note F_, 2 + intensity $a2 + dutycycle $3 + note D#, 3 + note __, 4 + intensity $a1 + note D#, 2 + note C_, 2 + note D#, 2 + intensity $a2 + note D#, 2 + note __, 4 + note G_, 2 + note __, 4 + intensity $a1 + note F_, 2 + note C_, 3 + octave 2 + note B_, 1 + octave 3 + note C_, 2 + note C_, 1 + octave 4 + note C_, 2 + intensity $97 + note D#, 12 + note __, 1 + intensity $94 + note D_, 6 + note __, 6 + note C#, 6 + note __, 6 + intensity $a1 + note C_, 6 + note C_, 2 + note C_, 1 + note C#, 2 + octave 3 + note B_, 1 + intensity $a4 + octave 4 + note C_, 6 + note __, 12 + note __, 3 + intensity $a1 + octave 3 + note B_, 2 + octave 4 + note C_, 1 + intensity $a2 + note C#, 2 + note __, 1 + intensity $a1 + note C#, 3 + note C#, 3 + note C#, 5 + intensity $a3 + octave 3 + note D#, 3 + note __, 3 + note F#, 3 + octave 4 + note D_, 1 + intensity $97 + note D#, 12 + note __, 6 + intensity $81 + octave 2 + note G#, 2 + note G#, 2 + note G#, 2 + intensity $a1 + octave 3 + note F#, 3 + note C#, 3 + note F#, 2 + note E_, 1 + intensity $82 + note F_, 3 + note __, 12 + intensity $a1 + note D#, 3 + note D#, 3 + note G#, 2 + note D_, 1 + intensity $a3 + note D#, 3 + note __, 9 + intensity $81 + dutycycle $2 + note C#, 3 + note F#, 3 + note C#, 3 + note F#, 3 + note C#, 1 + note F#, 1 + note C#, 1 + note G#, 6 + note G#, 3 + octave 4 + note C_, 1 + octave 3 + note G#, 1 + octave 4 + note C_, 1 + note C_, 1 + note D#, 1 + note C_, 1 + note D#, 1 + intensity $41 + note C_, 1 + note D#, 1 + intensity $a1 + note C_, 1 + intensity $51 + note D#, 1 + intensity $a1 + note C_, 1 + note D#, 1 + intensity $61 + note C_, 1 + note D#, 1 + intensity $a1 + octave 3 + note G#, 1 + intensity $71 + octave 4 + note D#, 1 + octave 3 + note G#, 1 + octave 4 + note D#, 1 + intensity $a1 + octave 3 + note G#, 1 + intensity $81 + octave 4 + note D#, 1 + octave 3 + note G#, 1 + intensity $91 + octave 4 + note G#, 1 + octave 3 + note G#, 1 + intensity $a1 + octave 4 + note G#, 1 + octave 3 + note G#, 1 + octave 4 + note G#, 1 + loopchannel 0, Music_Pinballcatchem_blue_branch_413aa +; 4158d + +Music_Pinballcatchem_blue_branch_4158d: ; 4158d + intensity $71 + dutycycle $2 + octave 2 + note A#, 2 + octave 3 + note F_, 1 + note A#, 2 + note F_, 1 + octave 2 + note A#, 2 + octave 3 + note F_, 1 + note A#, 2 + note F_, 1 + octave 2 + note A_, 2 + octave 3 + note F_, 1 + note A_, 2 + note F_, 1 + octave 2 + note A_, 2 + octave 3 + note F_, 1 + note A_, 2 + note F_, 1 + endchannel +; 415aa + +Music_Pinballcatchem_blue_Ch2: ; 415aa + vibrato $9, $34 + notetype $c, $b3 + note __, 16 +Music_Pinballcatchem_blue_branch_415b1: ; 415b1 + notetype $8, $b2 + dutycycle $3 + callchannel Music_Pinballcatchem_blue_branch_418d2 + intensity $b2 + note G_, 2 + note __, 1 + intensity $b1 + octave 3 + note G_, 2 + note A#, 1 + octave 4 + note C#, 2 + note D#, 3 + intensity $b2 + note F_, 2 + note __, 1 + note F#, 3 + note __, 1 + intensity $b1 + note F_, 1 + note F#, 1 + note F_, 1 + note D#, 2 + note C_, 1 + callchannel Music_Pinballcatchem_blue_branch_418d2 + intensity $b2 + note A#, 2 + note __, 1 + intensity $b1 + octave 3 + note G_, 2 + note A#, 1 + octave 4 + note C#, 2 + note D#, 1 + note F_, 2 + note G_, 3 + intensity $b2 + note G#, 3 + note __, 3 + intensity $b1 + octave 3 + note A#, 1 + note A#, 2 + note A#, 1 + callchannel Music_Pinballcatchem_blue_branch_41900 + note A#, 3 + octave 4 + note C#, 3 + note C#, 2 + note C#, 3 + intensity $b4 + note C_, 7 + intensity $b1 + note F#, 2 + note G#, 3 + note C_, 1 + callchannel Music_Pinballcatchem_blue_branch_41900 + octave 4 + note F_, 3 + note F_, 3 + note D#, 2 + note C#, 4 + note C_, 2 + octave 3 + note B_, 1 + note A#, 2 + octave 4 + note F#, 3 + intensity $b3 + note G#, 4 + callchannel Music_Pinballcatchem_blue_branch_41900 + note A#, 3 + octave 4 + note C#, 3 + note C#, 2 + note C#, 3 + intensity $b4 + note C_, 7 + note __, 3 + intensity $b1 + octave 3 + note A#, 2 + note A#, 1 + intensity $b1 + octave 4 + note C#, 2 + octave 3 + note A#, 4 + octave 4 + note F_, 2 + intensity $91 + octave 3 + note A#, 1 + intensity $b2 + octave 4 + note D#, 2 + intensity $81 + octave 3 + note F_, 1 + intensity $b1 + octave 4 + note C#, 2 + intensity $b2 + octave 3 + note A#, 2 + note __, 5 + intensity $b1 + note A#, 2 + note A#, 1 + octave 4 + note C#, 3 + intensity $b3 + octave 3 + note A#, 3 + note __, 6 + intensity $b1 + octave 4 + note A#, 2 + octave 3 + note A#, 3 + note A#, 1 + octave 4 + note F_, 2 + intensity $b2 + note D#, 3 + note __, 1 + intensity $b1 + note F_, 2 + note G_, 1 + note F_, 2 + note G_, 1 + note F_, 2 + note G_, 1 + note F_, 2 + note G_, 1 + note F_, 3 + note __, 6 + intensity $91 + dutycycle $2 + octave 6 + note D_, 1 + octave 5 + note A#, 1 + note G_, 1 + intensity $b2 + dutycycle $3 + octave 4 + note D_, 2 + intensity $91 + octave 3 + note G_, 1 + note A#, 2 + octave 4 + note D_, 1 + intensity $b1 + note D_, 2 + note D_, 1 + note D_, 2 + intensity $b2 + note D_, 2 + note __, 1 + intensity $91 + dutycycle $2 + note G_, 1 + note A#, 2 + octave 5 + note D_, 1 + intensity $b1 + dutycycle $3 + octave 3 + note A#, 2 + note A#, 1 + note A#, 2 + octave 4 + note D_, 1 + note C_, 3 + intensity $b2 + note F_, 3 + note __, 8 + intensity $91 + dutycycle $2 + octave 5 + note E_, 1 + note F_, 2 + octave 4 + note F_, 1 + octave 5 + note E_, 2 + note F_, 3 + octave 4 + note F_, 1 + intensity $b1 + dutycycle $3 + note D_, 2 + note D_, 1 + intensity $b2 + note D_, 3 + intensity $b1 + note D_, 2 + note D_, 1 + note D_, 2 + note D_, 1 + intensity $91 + dutycycle $2 + octave 5 + note D_, 2 + note D_, 1 + note D_, 3 + intensity $b1 + dutycycle $3 + octave 3 + note A#, 2 + note A#, 1 + note A#, 2 + octave 4 + note D_, 1 + intensity $b2 + note C_, 3 + intensity $91 + dutycycle $2 + octave 3 + note A_, 3 + note F_, 2 + note A_, 1 + octave 4 + note C_, 2 + note F_, 1 + octave 6 + note C_, 1 + octave 5 + note A_, 1 + note F_, 1 + note D#, 1 + note C_, 1 + octave 4 + note A_, 1 + note F_, 1 + note D#, 1 + intensity $b2 + dutycycle $3 + octave 3 + note B_, 1 + octave 4 + note C_, 2 + note __, 1 + octave 3 + note A#, 2 + note __, 1 + note G_, 2 + note __, 1 + note A#, 2 + intensity $b1 + octave 4 + note C_, 3 + note D_, 4 + intensity $b2 + octave 3 + note A#, 2 + note __, 1 + intensity $91 + dutycycle $2 + octave 4 + note A#, 2 + note A_, 2 + note G#, 1 + octave 3 + note A_, 1 + intensity $b2 + dutycycle $3 + note A#, 2 + note __, 1 + note A#, 2 + note __, 1 + note A#, 2 + intensity $b1 + octave 4 + note F_, 3 + intensity $b2 + note C#, 1 + note D_, 2 + intensity $91 + dutycycle $2 + octave 3 + note A#, 1 + octave 4 + note F_, 1 + note A#, 1 + octave 5 + note F_, 1 + note A#, 1 + note F_, 1 + octave 4 + note A#, 1 + intensity $b2 + dutycycle $3 + octave 3 + note A#, 2 + octave 4 + note D_, 1 + note D#, 2 + note D_, 2 + note __, 1 + note C#, 1 + note C_, 2 + note __, 1 + octave 3 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note A#, 2 + note __, 1 + octave 4 + note C_, 2 + note __, 1 + octave 3 + note A_, 2 + note A#, 1 + octave 4 + note C_, 2 + octave 3 + note B_, 1 + note A#, 2 + note __, 1 + note A_, 2 + note A#, 2 + note B_, 2 + octave 4 + note C_, 2 + note __, 4 + note D_, 2 + note __, 1 + note D#, 2 + note __, 1 + note F_, 2 + note A_, 1 + note A#, 2 + note __, 1 + intensity $b1 + note A#, 2 + octave 5 + note C_, 3 + octave 4 + note A#, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 2 + note A_, 3 + note G_, 3 + intensity $b2 + note F_, 2 + note __, 1 + intensity $b1 + note G_, 3 + note F_, 3 + note F_, 2 + note D_, 3 + intensity $b2 + octave 3 + note A#, 3 + intensity $91 + dutycycle $2 + octave 5 + note A_, 1 + note A#, 2 + octave 4 + note A#, 1 + intensity $b1 + dutycycle $3 + octave 3 + note A#, 2 + intensity $91 + dutycycle $2 + octave 5 + note A#, 1 + intensity $b1 + dutycycle $3 + octave 4 + note C_, 2 + intensity $91 + dutycycle $2 + octave 5 + note A#, 1 + intensity $b1 + dutycycle $3 + octave 4 + note D_, 3 + note D_, 3 + note D_, 2 + note D#, 3 + note F_, 2 + note __, 2 + note F_, 3 + note D#, 3 + note D_, 3 + intensity $b2 + note D_, 1 + intensity $91 + note D#, 1 + intensity $b1 + note C_, 2 + note __, 2 + intensity $91 + dutycycle $2 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 + note D#, 1 + note F_, 1 + note C_, 1 + note __, 2 + intensity $b3 + dutycycle $3 + octave 4 + note A#, 3 + intensity $91 + dutycycle $2 + octave 3 + note E_, 1 + intensity $b1 + note F_, 2 + intensity $b3 + dutycycle $3 + octave 5 + note C_, 4 + intensity $b2 + dutycycle $3 + note __, 2 + intensity $b2 + octave 4 + note A_, 1 + note A#, 2 + note __, 1 + intensity $b1 + note A#, 2 + octave 5 + note C_, 3 + octave 4 + note A#, 1 + octave 5 + note C_, 1 + octave 4 + note A#, 2 + note A_, 2 + note A#, 1 + note G_, 3 + note F_, 3 + note G_, 2 + intensity $91 + note D_, 1 + intensity $b1 + note F_, 2 + intensity $91 + octave 3 + note A#, 1 + intensity $b1 + octave 4 + note F_, 2 + note D_, 3 + intensity $b2 + octave 3 + note A#, 3 + note __, 3 + intensity $91 + note A_, 1 + intensity $b1 + note A#, 2 + octave 4 + note D_, 2 + note C_, 2 + intensity $b2 + octave 3 + note A#, 2 + note __, 4 + octave 4 + note D_, 2 + note __, 4 + intensity $b1 + note C_, 2 + octave 3 + note F_, 3 + note F_, 1 + note F_, 2 + note F_, 1 + octave 4 + note F_, 2 + notetype $c, $a8 + note A#, 9 + intensity $a3 + note A#, 3 + notetype $8, $b3 + note __, 1 + note __, 5 + note A_, 1 + intensity $b3 + note A#, 6 + note __, 6 + intensity $b1 + note G#, 2 + octave 3 + note G#, 3 + note G#, 1 + octave 4 + note G#, 2 + note G#, 1 + note A#, 2 + note G_, 1 + intensity $b3 + note G#, 6 + intensity $91 + dutycycle $2 + note C_, 2 + note D#, 2 + note C_, 2 + octave 5 + note C_, 1 + octave 4 + note G#, 1 + note D#, 1 + note C_, 1 + octave 3 + note G#, 1 + note D#, 1 + note C_, 1 + octave 2 + note G#, 1 + note D#, 1 + intensity $b1 + dutycycle $3 + octave 4 + note G#, 1 + note __, 1 + note A_, 1 + intensity $b2 + note A#, 2 + note __, 1 + intensity $b1 + note A#, 3 + note A#, 3 + note A#, 3 + note C_, 2 + intensity $b4 + note G#, 3 + intensity $b1 + note C_, 1 + note C_, 2 + intensity $b4 + note A#, 3 + intensity $b1 + note G_, 1 + intensity $b6 + note G#, 12 + intensity $91 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + octave 3 + note C_, 4 + intensity $b1 + octave 4 + note G_, 1 + note G#, 3 + note A#, 3 + note G#, 3 + note A#, 2 + intensity $b2 + note G_, 1 + note G#, 3 + intensity $91 + dutycycle $2 + octave 5 + note G#, 1 + note D#, 1 + note C_, 1 + octave 4 + note G#, 1 + note D#, 1 + note C_, 1 + note D#, 1 + note F_, 1 + intensity $b1 + dutycycle $3 + note F#, 1 + note G_, 3 + note G#, 3 + note G#, 3 + note F_, 2 + note G_, 1 + intensity $b2 + note G#, 3 + intensity $91 + dutycycle $2 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note G_, 1 + note F#, 1 + note G_, 1 + intensity $b1 + dutycycle $3 + note G#, 3 + intensity $b1 + dutycycle $3 + note A#, 3 + note G#, 3 + note A#, 3 + note G#, 1 + note A#, 1 + note G#, 1 + intensity $91 + dutycycle $2 + note D#, 1 + note C_, 1 + note D#, 1 + note G#, 1 + note D#, 1 + intensity $92 + dutycycle $3 + octave 5 + note C_, 1 + intensity $b2 + note C#, 2 + note __, 1 + notetype $c, $b8 + note C_, 2 + intensity $b8 + note C_, 12 + intensity $b4 + note C_, 4 + loopchannel 0, Music_Pinballcatchem_blue_branch_415b1 +; 418d2 + +Music_Pinballcatchem_blue_branch_418d2: ; 418d2 + intensity $b2 + octave 4 + note A#, 2 + note __, 1 + octave 3 + note A#, 2 + notetype $8, $91 + note F_, 1 + notetype $8, $b1 + octave 4 + note C#, 2 + note D#, 1 + notetype $8, $91 + octave 3 + note F_, 2 + notetype $8, $b2 + octave 4 + note F_, 2 + note __, 1 + notetype $8, $91 + note D#, 1 + notetype $8, $b2 + note G#, 3 + notetype $8, $91 + octave 3 + note A#, 2 + octave 4 + note C#, 1 + note F_, 2 + note G#, 1 + endchannel +; 41900 + +Music_Pinballcatchem_blue_branch_41900: ; 41900 + intensity $b1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + notetype $8, $a1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + notetype $8, $91 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + octave 4 + note C#, 2 + octave 3 + note A#, 1 + notetype $8, $81 + octave 4 + note C#, 2 + notetype $8, $91 + octave 3 + note A#, 1 + notetype $8, $a1 + note A#, 2 + notetype $8, $b1 + note A#, 1 + endchannel +; 41933 + +Music_Pinballcatchem_blue_Ch3: ; 41933 + notetype $c, $b3 + note __, 16 +Music_Pinballcatchem_blue_branch_41937: ; 41937 + notetype $8, $22 + octave 1 + note A#, 2 + note __, 6 + note A#, 1 + note __, 2 + note G#, 2 + note __, 4 + note G#, 1 + note __, 2 + note G#, 1 + note __, 2 + note F#, 1 + note G_, 2 + note __, 12 + note F#, 3 + note __, 1 + note G#, 2 + note __, 3 + note A_, 1 + note A#, 2 + note __, 3 + note A#, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 2 + note G#, 2 + note __, 4 + note G#, 1 + octave 2 + note G#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 2 + note F#, 1 + note G_, 2 + note __, 3 + note G_, 1 + octave 2 + note G_, 1 + note __, 1 + octave 1 + note G_, 1 + note __, 2 + note G_, 1 + note __, 2 + note F_, 3 + note __, 6 + note A_, 1 + callchannel Music_Pinballcatchem_blue_branch_41b46 + note F#, 2 + octave 2 + note F#, 1 + note __, 2 + octave 1 + note F#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 2 + note __, 1 + octave 2 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note F#, 2 + note __, 1 + note F_, 2 + note A_, 1 + callchannel Music_Pinballcatchem_blue_branch_41b5b + callchannel Music_Pinballcatchem_blue_branch_41b46 + octave 2 + note F#, 1 + note C#, 1 + octave 1 + note A#, 1 + note F#, 1 + note __, 2 + note F#, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 2 + octave 1 + note F#, 1 + note F_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 2 + octave 1 + note F_, 1 + note F_, 1 + note __, 1 + octave 2 + note F_, 3 + note A_, 1 + callchannel Music_Pinballcatchem_blue_branch_41b5b + octave 1 + note A#, 2 + note __, 3 + note A#, 1 + octave 2 + note F_, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 2 + note A#, 1 + octave 2 + note A#, 3 + note __, 8 + intensity $32 + octave 1 + note D_, 1 +Music_Pinballcatchem_blue_branch_419ba: ; 419ba + intensity $22 + note D#, 2 + note __, 3 + note D#, 1 + note G_, 1 + note __, 1 + note F#, 1 + note G_, 1 + note __, 2 + note A#, 1 + note __, 1 + note A_, 1 + note A#, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 2 + octave 1 + note A#, 1 + note __, 2 + note G_, 1 + note F_, 2 + note __, 3 + note F_, 1 + note A_, 1 + note __, 1 + note G#, 1 + note A_, 1 + note __, 2 + octave 2 + note C_, 1 + note __, 1 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + note __, 1 + note F_, 1 + note __, 2 + note C_, 1 + note __, 2 + octave 1 + note A_, 1 + loopchannel 2, Music_Pinballcatchem_blue_branch_419ba + note G_, 2 + octave 2 + note D_, 1 + note G_, 1 + note __, 2 + octave 1 + note G_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 2 + octave 1 + note F_, 1 + note F#, 2 + note F#, 1 + octave 2 + note F#, 1 + note __, 2 + note A#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 1 + note F_, 2 + octave 2 + note D_, 1 + note F_, 1 + note __, 2 + octave 1 + note F_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 2 + octave 1 + note A#, 1 + note E_, 2 + note A#, 1 + octave 2 + note D_, 1 + note __, 1 + note G_, 1 + note D_, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 2 + note B_, 1 + octave 2 + note C_, 2 + note __, 1 + note C_, 2 + note __, 1 + note D_, 2 + note __, 1 + note D_, 2 + note __, 1 + note D#, 2 + note __, 1 + note D#, 2 + note __, 1 + note E_, 2 + note __, 1 + note E_, 2 + note __, 1 + note F_, 2 + octave 3 + note D#, 1 + note __, 2 + octave 2 + note F_, 1 + note F_, 1 + note __, 1 + octave 3 + note D#, 2 + note C_, 2 + octave 2 + note A_, 2 + note __, 9 + octave 1 + note A_, 1 + callchannel Music_Pinballcatchem_blue_branch_41b7e + note G#, 2 + note __, 1 + note F_, 2 + note __, 1 + note D_, 2 + note __, 1 + octave 1 + note A#, 2 + note F#, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 2 + note A#, 1 + octave 2 + note D#, 2 + note __, 1 + note G_, 2 + note __, 1 + octave 3 + note D#, 1 + note D_, 1 + octave 2 + note A#, 1 + note G_, 2 + note __, 1 + note D#, 2 + note A#, 1 + note __, 2 + note D#, 1 + note E_, 2 + note __, 1 + note E_, 2 + note __, 1 + note G_, 2 + note __, 1 + note A#, 2 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F_, 1 + note __, 2 + note A#, 1 + note F_, 1 + note __, 1 + note F_, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 2 + note E_, 3 + note __, 3 + note F_, 3 + octave 1 + note A_, 1 + callchannel Music_Pinballcatchem_blue_branch_41b7e + note G#, 2 + note __, 1 + note F_, 2 + note __, 1 + note D_, 2 + note __, 1 + octave 1 + note A#, 2 + note G_, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 2 + octave 2 + note C_, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note F#, 2 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note F_, 2 + octave 1 + note F_, 1 + note __, 2 + note F_, 1 + note F_, 1 + note __, 1 + octave 2 + note C_, 1 + note D#, 1 + note __, 1 + note D_, 1 + intensity $32 + octave 3 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + octave 2 + note A#, 1 + octave 3 + note C_, 1 + octave 2 + note A#, 1 + octave 3 + note C_, 1 + octave 2 + note A#, 1 + octave 3 + note C_, 1 + intensity $22 + note D_, 1 + note F_, 1 + note A#, 1 + octave 4 + note D_, 1 + note F_, 1 + note __, 1 + octave 1 + note F#, 1 + note __, 1 + note F#, 1 + note A#, 2 + note __, 1 + octave 2 + note C#, 2 + note __, 1 + note F_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note F#, 2 + note __, 1 + note F_, 2 + note __, 1 + note D#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 2 + note G#, 1 + note G#, 1 + note __, 1 + note G#, 1 + note A#, 1 + note __, 1 + note G#, 1 + note G#, 2 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 6 + note F#, 1 + note __, 1 + note F#, 1 + note A#, 2 + note __, 1 + octave 2 + note C#, 2 + note __, 1 + note F_, 2 + note __, 3 + intensity $32 + octave 3 + note C_, 3 + note __, 3 + note C#, 3 + note __, 1 + intensity $22 + octave 2 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 2 + note __, 1 + note E_, 2 + note __, 1 + note D#, 2 + note __, 1 + note D_, 2 + note __, 1 + note C#, 2 + note __, 1 + note C_, 2 + note __, 1 + note D#, 2 + note __, 1 + octave 1 + note F#, 1 + note __, 2 + note F#, 1 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note C_, 1 + note C#, 3 + note __, 12 + octave 1 + note G#, 1 + note __, 2 + note G#, 1 + note __, 2 + octave 2 + note C_, 1 + note __, 1 + note D_, 1 + note D#, 3 + note __, 9 + octave 1 + note G_, 3 + note F#, 2 + octave 2 + note F#, 1 + note F_, 2 + note __, 1 + note E_, 2 + note __, 1 + note D#, 2 + note __, 1 + note D_, 2 + note __, 1 + note C#, 2 + note __, 1 + note G#, 2 + note __, 1 + notetype $c, $22 + octave 3 + note D#, 2 + note D#, 16 + loopchannel 0, Music_Pinballcatchem_blue_branch_41937 +; 41b46 + +Music_Pinballcatchem_blue_branch_41b46: ; 41b46 + note A#, 2 + note __, 1 + octave 2 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + octave 1 + note A#, 2 + note __, 1 + note G#, 2 + note __, 1 + octave 2 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + octave 1 + note G#, 2 + note __, 1 + endchannel +; 41b5b + +Music_Pinballcatchem_blue_branch_41b5b: ; 41b5b + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note F#, 2 + note __, 1 + note F_, 2 + note __, 1 + note E_, 2 + note __, 1 + note F_, 2 + note __, 1 + octave 1 + note F#, 2 + note __, 1 + note F#, 2 + note __, 1 + note G_, 2 + note __, 1 + note G_, 2 + note __, 1 + octave 2 + note G#, 2 + note __, 1 + note G_, 2 + octave 3 + note D#, 1 + note __, 2 + octave 2 + note F_, 4 + endchannel +; 41b7e + +Music_Pinballcatchem_blue_branch_41b7e: ; 41b7e + note A#, 2 + note __, 3 + note A#, 1 + octave 2 + note F_, 1 + note __, 1 + note D_, 1 + note __, 2 + octave 1 + note A#, 1 + note A_, 1 + note __, 1 + note A_, 1 + octave 2 + note D_, 2 + note __, 1 + note F_, 1 + note __, 2 + note A_, 2 + note G_, 1 + endchannel +; 41b93 + +Music_Pinballcatchem_blue_Ch4: ; 41b93 + togglenoise $0 + notetype $8 + note D#, 3 + note D_, 3 + note D#, 2 + note D_, 1 + note F#, 2 + note G_, 1 + note D_, 3 + note D_, 3 + note C#, 2 + note C#, 1 + note D_, 2 + note D_, 1 +Music_Pinballcatchem_blue_branch_41ba3: ; 41ba3 + note D_, 3 + note D#, 2 + note D#, 1 + note D#, 2 + note D#, 3 + note C#, 1 + note D_, 3 + note D_, 3 + note D#, 2 + note D_, 1 + note D#, 2 + note D_, 1 + note D#, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 2 + note G_, 1 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 1 + note D_, 3 + note G_, 2 + note D#, 1 + note D_, 5 + note D_, 3 + note G_, 1 + note F#, 3 + note D_, 2 + note G_, 1 + note F#, 2 + note D_, 1 + note G_, 2 + note G_, 1 + note F#, 2 + note D#, 1 + note D_, 2 + note G_, 1 + note F#, 2 + note G_, 1 + note D#, 2 + note D_, 1 + note C_, 5 + note D_, 1 + note D_, 2 + note D#, 1 + callchannel Music_Pinballcatchem_blue_branch_41cfe + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note F#, 3 + callchannel Music_Pinballcatchem_blue_branch_41cfe + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D_, 1 + note D#, 2 + note D#, 1 + callchannel Music_Pinballcatchem_blue_branch_41cfe + note D_, 1 + note C#, 1 + note C#, 1 + note D_, 3 + note D_, 2 + note D#, 1 + note F#, 3 + callchannel Music_Pinballcatchem_blue_branch_41cfe + note D_, 2 + note D_, 1 + note D_, 2 + note D_, 1 + note D#, 2 + note C_, 1 + note D_, 2 + note D_, 1 + note D_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note F#, 3 + callchannel Music_Pinballcatchem_blue_branch_41cfe + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note D_, 1 + note D_, 2 + note D#, 1 + callchannel Music_Pinballcatchem_blue_branch_41cfe + note D_, 1 + note C#, 1 + note C#, 1 + note D_, 3 + note D_, 2 + note D#, 1 + note F#, 3 + callchannel Music_Pinballcatchem_blue_branch_41cfe + note D_, 2 + note D#, 3 + note D#, 1 + note D#, 2 + note B_, 1 + note D_, 2 + note D_, 1 + note D_, 2 + note D#, 3 + note D_, 1 + note D_, 2 + note D_, 3 + note D_, 1 + note B_, 12 + callchannel Music_Pinballcatchem_blue_branch_41d05 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D#, 3 + note D_, 2 + note D_, 1 + note D_, 3 + note D_, 2 + note D_, 1 + callchannel Music_Pinballcatchem_blue_branch_41d05 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 2 + note D_, 1 + note G_, 2 + note G_, 1 + note D#, 3 + note C#, 1 + note C#, 1 + note D_, 1 + note D_, 3 + note D_, 2 + note D_, 1 + callchannel Music_Pinballcatchem_blue_branch_41d12 + note D_, 2 + note D_, 2 + note D_, 2 + callchannel Music_Pinballcatchem_blue_branch_41d12 + note G_, 2 + note G_, 1 + note F#, 3 +Music_Pinballcatchem_blue_branch_41c5e: ; 41c5e + note G_, 2 + note G_, 1 + note F#, 3 + loopchannel 4, Music_Pinballcatchem_blue_branch_41c5e + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note C_, 6 + callchannel Music_Pinballcatchem_blue_branch_41d1c + note D#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note D#, 1 + callchannel Music_Pinballcatchem_blue_branch_41d1c + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 2 + note D_, 3 + note D#, 1 + note D#, 3 + note D#, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note D#, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note D_, 2 + note D_, 1 + note D#, 2 + note D_, 3 + note D#, 1 + note D#, 2 + note D_, 2 + note D_, 2 + callchannel Music_Pinballcatchem_blue_branch_41d23 + note D_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + callchannel Music_Pinballcatchem_blue_branch_41d23 + note D_, 2 + note G_, 1 + note D_, 2 + note D_, 1 + callchannel Music_Pinballcatchem_blue_branch_41d23 + note D_, 2 + note G_, 1 + note F#, 3 + note F#, 3 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note D#, 3 + note C#, 1 + note C#, 1 + note D_, 1 + note D_, 3 + note D_, 2 + note D_, 1 +Music_Pinballcatchem_blue_branch_41cba: ; 41cba + callchannel Music_Pinballcatchem_blue_branch_41d30 + loopchannel 4, Music_Pinballcatchem_blue_branch_41cba + callchannel Music_Pinballcatchem_blue_branch_41d30 + note D#, 2 + note D_, 3 + note D_, 1 + note D#, 2 + note D_, 3 + note D_, 1 + callchannel Music_Pinballcatchem_blue_branch_41d30 + callchannel Music_Pinballcatchem_blue_branch_41d30 + callchannel Music_Pinballcatchem_blue_branch_41d30 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 3 + note D_, 3 + note D#, 2 + note D_, 1 + callchannel Music_Pinballcatchem_blue_branch_41d30 + note D#, 2 + note D_, 1 + note D#, 2 + note D_, 1 + note D_, 2 + note D_, 1 + note D#, 2 + note D_, 1 + callchannel Music_Pinballcatchem_blue_branch_41d30 + callchannel Music_Pinballcatchem_blue_branch_41d30 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 3 + note D_, 2 + note D_, 1 + note D#, 2 + note C#, 1 + note D_, 3 + note D_, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 2 + note D_, 1 + loopchannel 0, Music_Pinballcatchem_blue_branch_41ba3 +; 41cfe + +Music_Pinballcatchem_blue_branch_41cfe: ; 41cfe + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + endchannel +; 41d05 + +Music_Pinballcatchem_blue_branch_41d05: ; 41d05 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note D#, 1 + endchannel +; 41d12 + +Music_Pinballcatchem_blue_branch_41d12: ; 41d12 + note D#, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note D_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + endchannel +; 41d1c + +Music_Pinballcatchem_blue_branch_41d1c: ; 41d1c + note D#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + endchannel +; 41d23 + +Music_Pinballcatchem_blue_branch_41d23: ; 41d23 + note D#, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note D_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note D#, 2 + note G_, 1 + note D#, 2 + note G_, 1 + endchannel +; 41d30 + +Music_Pinballcatchem_blue_branch_41d30: ; 41d30 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + endchannel +; 41d37 + + diff --git a/crysaudio/music/pinball/catchem_red.asm b/crysaudio/music/pinball/catchem_red.asm new file mode 100644 index 00000000..12768339 --- /dev/null +++ b/crysaudio/music/pinball/catchem_red.asm @@ -0,0 +1,1516 @@ +Music_Pinballcatchem_red: ; 3d2ed + dbw $c0, Music_Pinballcatchem_red_Ch1 + dbw $01, Music_Pinballcatchem_red_Ch2 + dbw $02, Music_Pinballcatchem_red_Ch3 + dbw $03, Music_Pinballcatchem_red_Ch4 +; 3d2f9 + +Music_Pinballcatchem_red_Ch1: ; 3d2f9 + tempo 160 + volume $77 + dutycycle $3 + vibrato $12, $34 + tone $0001 + notetype $8, $a2 + note __, 12 + note __, 12 +Music_Pinballcatchem_red_branch_3d30b: ; 3d30b + octave 3 + note D#, 8 + note F#, 4 + note D#, 8 + note D#, 4 + note D#, 8 + note F#, 4 + note D#, 8 + note D#, 4 + note __, 12 + note __, 12 + note __, 12 + note __, 12 + callchannel Music_Pinballcatchem_red_branch_3d360 + intensity $92 + octave 4 + note A_, 2 + note A_, 3 + note A_, 16 + note __, 3 + callchannel Music_Pinballcatchem_red_branch_3d360 + intensity $92 + octave 4 + note A_, 2 + note A_, 3 + note A_, 16 + note __, 3 + intensity $a2 + note __, 12 + note __, 12 + note __, 12 + octave 4 + note G_, 2 + note F_, 3 + note D#, 3 + note D_, 12 + note __, 6 + note D#, 6 + octave 5 + note C_, 16 + note __, 12 + intensity $72 + octave 6 + note D_, 2 + note C_, 1 + octave 5 + note A#, 6 + octave 6 + note D_, 3 + note C_, 6 + octave 5 + note A#, 16 + intensity $a2 + note __, 2 + note D_, 2 + note D_, 3 + note C_, 3 + note D_, 4 + note __, 12 + note __, 12 + note __, 12 + note __, 12 + octave 4 + note A#, 2 + note A#, 3 + note A#, 16 + note __, 3 + octave 5 + note C_, 2 + note C_, 3 + note C_, 16 + note __, 3 + loopchannel 0, Music_Pinballcatchem_red_branch_3d30b +; 3d360 + +Music_Pinballcatchem_red_branch_3d360: ; 3d360 + intensity $52 + note __, 3 + octave 3 + note F_, 5 + note F_, 3 + note F_, 13 + note __, 3 + note G_, 5 + note G_, 4 + note G_, 5 + note A_, 7 + intensity $a2 + note __, 12 + note __, 12 + note __, 12 + note __, 12 + note __, 12 + octave 5 + note D#, 2 + note D_, 3 + note C_, 7 + note __, 12 + note __, 5 + octave 4 + note C_, 7 + note __, 12 + note __, 12 + note __, 12 + note __, 8 + note D_, 16 + note __, 12 + note A#, 2 + note A#, 3 + note A#, 16 + note __, 3 + endchannel +; 3d386 + +Music_Pinballcatchem_red_Ch2: ; 3d386 + dutycycle $1 + vibrato $12, $34 + notetype $8, $c1 + note __, 12 + note __, 6 + octave 4 + note G#, 2 + note F#, 1 + note F_, 2 + note D#, 1 +Music_Pinballcatchem_red_branch_3d395: ; 3d395 + dutycycle $1 + intensity $c1 + note D_, 2 + octave 3 + note A#, 1 + note G_, 2 + note D#, 1 + note G_, 2 + octave 4 + note F_, 4 + note D_, 2 + octave 2 + note A#, 1 + octave 3 + note D#, 2 + note F_, 1 + note G_, 2 + octave 4 + note C_, 4 + note D_, 2 + octave 3 + note D#, 1 + note G_, 2 + note A#, 1 + octave 4 + note D_, 2 + note F_, 4 + note D_, 2 + octave 3 + note C_, 1 + note D#, 2 + note F_, 1 + note A_, 2 + octave 4 + note C_, 4 + note __, 12 + note __, 12 + note __, 12 + note __, 12 + callchannel Music_Pinballcatchem_red_branch_3d4fe + intensity $92 + octave 5 + note F_, 2 + note F_, 3 + intensity $94 + note F_, 12 + note __, 7 + callchannel Music_Pinballcatchem_red_branch_3d4fe + intensity $92 + octave 5 + note F_, 2 + note F_, 3 + intensity $94 + note F_, 13 + dutycycle $2 + intensity $82 + octave 5 + note C_, 3 + note D_, 3 + intensity $a2 + note D#, 2 + intensity $81 + octave 3 + note A#, 1 + octave 4 + note D#, 2 + note G_, 1 + note A#, 2 + octave 5 + note D_, 1 + intensity $a2 + note D#, 3 + note F_, 2 + note D#, 1 + intensity $81 + octave 4 + note G_, 2 + intensity $a2 + octave 5 + note D_, 1 + intensity $82 + octave 4 + note A#, 2 + intensity $a2 + octave 5 + note C_, 3 + intensity $83 + note C#, 1 + intensity $a2 + note D_, 2 + intensity $81 + octave 3 + note A#, 1 + octave 4 + note D_, 2 + note F_, 1 + note A_, 2 + octave 5 + note C#, 1 + intensity $a2 + note D_, 3 + intensity $93 + note D#, 2 + note D_, 3 + note C_, 3 + octave 4 + note A#, 4 + intensity $a2 + octave 5 + note D#, 3 + note D_, 3 + note C_, 3 + note D#, 5 + intensity $a4 + note G_, 4 + intensity $82 + octave 4 + note F_, 2 + intensity $a4 + octave 5 + note F_, 4 + intensity $81 + octave 4 + note A_, 2 + note A#, 1 + intensity $a2 + octave 5 + note D_, 2 + note F_, 4 + note D#, 3 + note D_, 3 + intensity $62 + octave 4 + note F_, 2 + note G#, 1 + intensity $82 + note B_, 2 + octave 5 + note D_, 1 + intensity $a2 + note F_, 2 + note G#, 1 + intensity $a3 + note A#, 2 + intensity $82 + note A_, 1 + intensity $a3 + note G_, 3 + intensity $82 + note D#, 2 + octave 4 + note A#, 1 + intensity $a3 + octave 5 + note A#, 2 + intensity $82 + note D#, 1 + intensity $a3 + note A_, 3 + intensity $82 + note G_, 2 + note D#, 1 + intensity $a3 + note G_, 3 + intensity $82 + note D#, 2 + note C_, 1 + intensity $a3 + note F_, 3 + note G#, 6 + intensity $a2 + note G_, 3 + note F_, 2 + note F_, 3 + note D#, 3 + intensity $a3 + note F_, 4 + note G_, 2 + intensity $52 + octave 4 + note C_, 1 + intensity $a3 + octave 5 + note F_, 2 + intensity $52 + octave 4 + note D#, 1 + note G_, 2 + note A#, 1 + intensity $a3 + octave 5 + note D#, 2 + intensity $52 + note C_, 1 + intensity $a3 + note A_, 2 + intensity $62 + octave 4 + note D_, 1 + intensity $a3 + octave 5 + note G_, 2 + intensity $62 + octave 4 + note F_, 1 + note A_, 2 + octave 5 + note C_, 1 + intensity $a3 + note F_, 2 + intensity $62 + note D_, 1 + intensity $a3 + note A#, 2 + intensity $72 + octave 4 + note D#, 1 + intensity $a3 + octave 5 + note A_, 2 + intensity $72 + octave 4 + note G_, 1 + note A#, 2 + octave 5 + note D_, 1 + intensity $a3 + note G_, 2 + intensity $72 + note F_, 1 + intensity $a3 + octave 6 + note C_, 2 + intensity $82 + octave 4 + note E_, 1 + intensity $a3 + octave 6 + note D_, 2 + intensity $82 + octave 4 + note G_, 1 + note A#, 2 + octave 5 + note C_, 1 + intensity $a3 + note A#, 2 + intensity $82 + note E_, 1 + intensity $a2 + octave 6 + note C_, 2 + note C_, 3 + intensity $a4 + note C_, 7 + intensity $82 + octave 5 + note C_, 2 + octave 4 + note F_, 1 + note A#, 2 + octave 5 + note C_, 1 + note A_, 2 + note F_, 1 + octave 6 + note C_, 2 + octave 5 + note A#, 1 + intensity $a2 + note A_, 2 + note A_, 3 + intensity $a4 + note A_, 13 + dutycycle $1 + intensity $82 + octave 4 + note G#, 2 + note F#, 1 + note F_, 2 + note D#, 1 + loopchannel 0, Music_Pinballcatchem_red_branch_3d395 +; 3d4fe + +Music_Pinballcatchem_red_branch_3d4fe: ; 3d4fe + intensity $72 + octave 4 + note __, 3 + note D_, 5 + note D_, 3 + note D_, 13 + note __, 3 + note D#, 5 + note D#, 3 + note D#, 1 + note D#, 5 + note F_, 4 + octave 3 + note F_, 3 + intensity $c3 + octave 4 + note D_, 2 + intensity $62 + octave 3 + note A#, 1 + note F_, 2 + note A#, 1 + intensity $c3 + octave 4 + note D#, 2 + intensity $62 + octave 3 + note A#, 1 + note F_, 2 + note A#, 1 + intensity $c3 + octave 4 + note F_, 2 + intensity $62 + note D_, 1 + octave 3 + note A#, 2 + octave 4 + note D_, 1 + intensity $c3 + note A#, 2 + intensity $62 + note D_, 1 + octave 3 + note A#, 2 + octave 4 + note F_, 1 + intensity $c3 + note A_, 2 + intensity $62 + note D#, 1 + note C_, 2 + octave 3 + note A_, 1 + octave 4 + note C_, 2 + note D#, 1 + intensity $c3 + note G_, 2 + note A_, 1 + note G_, 2 + intensity $62 + note D#, 1 + note C_, 2 + octave 3 + note G_, 1 + octave 4 + note C_, 2 + note D#, 1 + note C_, 2 + note D#, 1 + note C_, 2 + octave 3 + note G_, 1 + intensity $c3 + octave 4 + note D#, 2 + intensity $62 + octave 3 + note G_, 1 + intensity $c3 + octave 4 + note F_, 2 + intensity $62 + octave 3 + note G_, 1 + intensity $c3 + octave 4 + note G_, 2 + intensity $62 + note C_, 1 + intensity $c3 + octave 5 + note C_, 2 + octave 4 + note A#, 3 + note A_, 4 + intensity $a3 + note G_, 2 + note A_, 1 + intensity $c3 + note A#, 2 + intensity $73 + note F_, 1 + note D_, 2 + octave 3 + note A#, 1 + octave 4 + note D_, 2 + note F_, 1 + intensity $c3 + note G_, 3 + note F_, 2 + intensity $73 + note D_, 1 + octave 3 + note G#, 2 + intensity $b4 + octave 4 + note G#, 7 + intensity $73 + note D#, 2 + note G_, 1 + intensity $c3 + note A#, 2 + intensity $73 + note D#, 1 + octave 3 + note A#, 2 + intensity $c3 + octave 4 + note A_, 1 + note A#, 2 + intensity $73 + note D#, 1 + intensity $c3 + note G_, 3 + intensity $73 + octave 3 + note G_, 2 + note D#, 1 + note G_, 2 + note A#, 1 + octave 4 + note D#, 2 + note G_, 1 + note D_, 2 + note F_, 1 + intensity $c3 + note A#, 3 + intensity $73 + note D_, 2 + intensity $c3 + note A_, 1 + note A#, 2 + intensity $73 + octave 3 + note A#, 1 + intensity $c3 + octave 4 + note F_, 2 + intensity $73 + note D_, 1 + note F_, 2 + octave 3 + note A#, 1 + note F_, 2 + intensity $b4 + octave 4 + note G#, 4 + intensity $73 + note D#, 2 + note G_, 1 + intensity $c3 + note A#, 2 + intensity $73 + note G_, 1 + note D#, 2 + octave 3 + note A#, 1 + intensity $c3 + octave 5 + note D_, 2 + intensity $73 + octave 4 + note D#, 1 + intensity $c3 + octave 5 + note C_, 2 + octave 4 + note A#, 1 + intensity $73 + note E_, 2 + intensity $c3 + note A_, 1 + note A#, 2 + intensity $73 + note E_, 1 + intensity $c3 + note B_, 3 + intensity $a3 + octave 5 + note C_, 2 + note C_, 3 + note C_, 7 + intensity $72 + octave 4 + note C_, 2 + octave 3 + note F_, 1 + note A#, 2 + octave 4 + note C_, 1 + note A_, 2 + note F_, 1 + octave 5 + note C_, 2 + octave 4 + note A#, 1 + endchannel +; 3d60e + +Music_Pinballcatchem_red_Ch3: ; 3d60e + notetype $8, $23 + note __, 12 + note __, 6 + octave 2 + note D#, 6 +Music_Pinballcatchem_red_branch_3d615: ; 3d615 + note F_, 1 + note __, 7 + note G#, 4 + note F_, 1 + note __, 7 + note F#, 4 + note F_, 1 + note __, 7 + note G#, 4 + note F_, 1 + note __, 7 + note A_, 4 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note F_, 2 + note __, 1 + note D_, 2 + note __, 1 + octave 1 + note A#, 2 + note __, 1 + octave 2 + note D_, 2 + note __, 1 + note D#, 2 + note __, 1 + octave 3 + note C_, 2 + note __, 1 + octave 2 + note B_, 2 + note __, 1 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note G_, 2 + note __, 1 + note F_, 2 + note __, 1 + note A_, 2 + note __, 1 +Music_Pinballcatchem_red_branch_3d645: ; 3d645 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note F_, 2 + note __, 1 + note D_, 2 + note __, 1 + octave 1 + note A#, 2 + note __, 1 + octave 2 + note D_, 2 + note __, 1 + note D#, 2 + note __, 1 + octave 3 + note C_, 2 + note __, 1 + octave 2 + note B_, 2 + note __, 1 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note G_, 2 + note __, 1 + note D#, 2 + note __, 1 + note C_, 2 + note __, 1 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note F_, 2 + note __, 1 + note D_, 2 + note __, 1 + octave 1 + note A#, 2 + note __, 1 + octave 2 + note D_, 2 + note __, 1 + note C_, 2 + note __, 1 + note D#, 2 + note __, 1 + note G_, 2 + note __, 1 + octave 3 + note C_, 2 + note __, 1 + octave 2 + note B_, 2 + note __, 1 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note G_, 2 + note __, 1 + octave 3 + note C_, 2 + note __, 1 + octave 2 + note B_, 2 + note __, 1 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 2 + note F_, 4 + note C_, 2 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note A_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note F#, 2 + note __, 1 + note F_, 2 + octave 3 + note F_, 6 + note __, 1 + octave 2 + note D#, 2 + note __, 1 + octave 3 + note D#, 2 + note __, 1 + note D_, 2 + note __, 1 + note C#, 2 + note __, 1 + note C_, 2 + note __, 1 + octave 2 + note B_, 2 + note __, 1 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note A#, 1 + note F_, 1 + note D#, 1 + note D_, 2 + note __, 1 + note D#, 2 + note __, 1 + note F_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note F_, 4 + octave 2 + note G_, 2 + note __, 1 + note D#, 2 + note __, 1 + note C_, 2 + note __, 1 + note F#, 2 + note __, 1 + note G_, 2 + note __, 1 + note E_, 2 + note __, 1 + note C_, 2 + note __, 1 + octave 1 + note A#, 2 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 2 + note F_, 7 + note C_, 2 + note __, 1 + octave 2 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note F_, 2 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 2 + note C_, 7 + octave 2 + note A_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note A_, 2 + note __, 1 + loopchannel 2, Music_Pinballcatchem_red_branch_3d645 + note C_, 2 + note __, 10 + note C_, 1 + note __, 1 + note F_, 1 + note C_, 2 + note __, 1 + note C_, 2 + note __, 1 + octave 1 + note B_, 3 + note A#, 2 + note __, 7 + note A#, 1 + note __, 2 + octave 2 + note A#, 1 + note __, 1 + note F_, 1 + note __, 2 + note D_, 1 + note __, 2 + note F_, 3 + octave 1 + note B_, 1 + octave 2 + note C_, 2 + note __, 7 + note C_, 2 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note C_, 4 + octave 2 + note D#, 1 + note __, 1 + note A_, 4 + octave 1 + note A#, 2 + note __, 7 + note A#, 2 + note __, 1 + octave 2 + note G#, 1 + note F_, 1 + note D_, 1 + octave 1 + note B_, 2 + note __, 1 + note G#, 2 + note __, 1 + note B_, 2 + octave 2 + note D_, 1 + note D#, 3 + note D_, 1 + note __, 1 + note D#, 3 + note __, 1 + note G_, 2 + note __, 1 + note A_, 3 + note D#, 1 + note __, 1 + note C_, 1 + octave 3 + note C_, 3 + octave 2 + note A_, 1 + note __, 1 + note D#, 1 + octave 3 + note D_, 2 + note __, 1 + note C_, 2 + note __, 1 + octave 2 + note F_, 2 + note __, 1 + note G#, 2 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 2 + octave 3 + note F_, 1 + note __, 2 + octave 2 + note G#, 3 + note C#, 1 + note C_, 2 + octave 3 + note C_, 1 + octave 2 + note A#, 2 + note __, 1 + note G_, 2 + note __, 1 + note D#, 2 + note __, 1 + note D_, 2 + octave 3 + note D_, 1 + note C_, 2 + note __, 1 + octave 2 + note A_, 2 + note __, 1 + note F_, 3 + note D#, 2 + octave 3 + note D#, 1 + note D_, 2 + note __, 1 + octave 2 + note A#, 2 + note __, 1 + note G_, 2 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 2 + note G_, 1 + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note E_, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 2 + note F_, 7 + note C_, 2 + note __, 1 + octave 2 + note A#, 2 + note __, 1 + note A_, 2 + note __, 1 + note F_, 2 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 2 + note F_, 7 + octave 2 + note A_, 2 + note __, 1 + note G#, 2 + note __, 1 + note G_, 2 + note __, 1 + note A_, 2 + note __, 1 + loopchannel 0, Music_Pinballcatchem_red_branch_3d615 +; 3d7b3 + +Music_Pinballcatchem_red_Ch4: ; 3d7b3 + togglenoise $0 + notetype $8 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 +Music_Pinballcatchem_red_branch_3d7c3: ; 3d7c3 + note D#, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note F#, 4 + note D#, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note F#, 4 + note D#, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note F#, 4 + note D#, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note F#, 4 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 3 + note D_, 2 + note C_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 3 + note F#, 1 + note G_, 2 + note G_, 1 + note C_, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 3 + note F#, 1 + note __, 6 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D#, 2 + note F#, 3 + note F#, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 1 + note G_, 2 + note F#, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 1 + note D_, 2 + note F#, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note F#, 3 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 3 + note F#, 1 + note G_, 2 + note G_, 1 + note C_, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 3 + note F#, 7 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D#, 2 + note F#, 3 + note F#, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 1 + note G_, 2 + note F#, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 1 + note D_, 2 + note F#, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 3 + note D#, 2 + note D#, 1 + note C_, 3 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 3 + note G_, 4 + note D_, 3 + note G_, 2 + note G_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D_, 2 + note D_, 1 + note F#, 3 + note C_, 2 + note D_, 3 + note D_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D_, 2 + note D_, 4 + note D_, 2 + note F#, 4 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 3 + note G_, 4 + note D_, 3 + note G_, 2 + note G_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D_, 2 + note D_, 1 + note F#, 3 + note C_, 2 + note D_, 3 + note D_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D#, 3 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note G_, 2 + note G_, 1 + note D_, 3 + note G_, 2 + note G_, 1 + note D_, 2 + note D#, 1 + note G_, 2 + note F#, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 2 + note D#, 1 + note D_, 2 + note F#, 1 + note G_, 2 + note G_, 1 + note F#, 3 + note D_, 1 + note D_, 1 + note D_, 1 + note D_, 3 + note D#, 2 + note D#, 1 + note C_, 3 + loopchannel 0, Music_Pinballcatchem_red_branch_3d7c3 +; 3d973 + + diff --git a/crysaudio/music/pinball/diglettstage_digletts.asm b/crysaudio/music/pinball/diglettstage_digletts.asm new file mode 100644 index 00000000..ab648514 --- /dev/null +++ b/crysaudio/music/pinball/diglettstage_digletts.asm @@ -0,0 +1,807 @@ +Music_Pinballdiglettstage_digletts: ; 44cb9 + dbw $c0, Music_Pinballdiglettstage_digletts_Ch1 + dbw $01, Music_Pinballdiglettstage_digletts_Ch2 + dbw $02, Music_Pinballdiglettstage_digletts_Ch3 + dbw $03, Music_Pinballdiglettstage_digletts_Ch4 +; 44cc5 + +Music_Pinballdiglettstage_digletts_Ch1: ; 44cc5 + tempo 208 + volume $77 + notetype $6, $73 + dutycycle $2 + note __, 8 + octave 6 + note C_, 2 + octave 2 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 +Music_Pinballdiglettstage_digletts_branch_44ce1: ; 44ce1 + dutycycle $3 + callchannel Music_Pinballdiglettstage_digletts_branch_44d6e + callchannel Music_Pinballdiglettstage_digletts_branch_44d6e + callchannel Music_Pinballdiglettstage_digletts_branch_44d8e + callchannel Music_Pinballdiglettstage_digletts_branch_44d8e + callchannel Music_Pinballdiglettstage_digletts_branch_44d6e + callchannel Music_Pinballdiglettstage_digletts_branch_44d6e + callchannel Music_Pinballdiglettstage_digletts_branch_44d8e + octave 2 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 2 + note __, 2 + octave 4 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + notetype $c, $73 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype $6, $73 + dutycycle $0 +Music_Pinballdiglettstage_digletts_branch_44d25: ; 44d25 + octave 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 3 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44d25 +Music_Pinballdiglettstage_digletts_branch_44d48: ; 44d48 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 3 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44d48 + loopchannel 0, Music_Pinballdiglettstage_digletts_branch_44ce1 +; 44d6e + +Music_Pinballdiglettstage_digletts_branch_44d6e: ; 44d6e + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 3 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + endchannel +; 44d8e + +Music_Pinballdiglettstage_digletts_branch_44d8e: ; 44d8e + octave 2 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 3 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + endchannel +; 44daf + +Music_Pinballdiglettstage_digletts_Ch2: ; 44daf + notetype $6, $b3 + vibrato $9, $34 + dutycycle $2 + tone $0001 + note __, 8 + octave 5 + note C_, 2 + dutycycle $3 + octave 2 + note C_, 1 + note __, 1 + note C#, 1 + note __, 1 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 +Music_Pinballdiglettstage_digletts_branch_44dce: ; 44dce + dutycycle $2 + intensity $b3 + callchannel Music_Pinballdiglettstage_digletts_branch_44eaf + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 4 + note G_, 1 + note G#, 3 + note F_, 6 + note __, 2 + note D_, 1 + note __, 1 + note G#, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + note B_, 1 + note __, 1 + callchannel Music_Pinballdiglettstage_digletts_branch_44eaf + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 4 + note G_, 1 + note G#, 3 + note F_, 6 + note __, 2 + note D_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + intensity $92 + dutycycle $0 +Music_Pinballdiglettstage_digletts_branch_44e16: ; 44e16 + octave 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note D#, 3 + note __, 1 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44e16 +Music_Pinballdiglettstage_digletts_branch_44e3e: ; 44e3e + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note G#, 3 + note __, 1 + note G#, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44e3e + dutycycle $2 +Music_Pinballdiglettstage_digletts_branch_44e66: ; 44e66 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 3 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44e66 +Music_Pinballdiglettstage_digletts_branch_44e89: ; 44e89 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 3 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + loopchannel 2, Music_Pinballdiglettstage_digletts_branch_44e89 + loopchannel 0, Music_Pinballdiglettstage_digletts_branch_44dce +; 44eaf + +Music_Pinballdiglettstage_digletts_branch_44eaf: ; 44eaf + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note B_, 1 + octave 4 + note C_, 3 + octave 3 + note F_, 6 + note __, 2 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note D#, 2 + note __, 2 + intensity $b8 + note C_, 2 + intensity $b3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note B_, 1 + octave 4 + note C_, 3 + octave 3 + note F_, 6 + note __, 2 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note C_, 2 + note __, 2 + note D#, 2 + note D_, 1 + note __, 1 + note C_, 2 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 4 + note G_, 1 + note G#, 3 + note F_, 6 + note __, 2 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note C_, 2 + note __, 2 + octave 4 + note D#, 2 + note D_, 1 + note __, 1 + note C_, 2 + endchannel +; 44efb + +Music_Pinballdiglettstage_digletts_Ch3: ; 44efb + notetype $6, $22 + note __, 8 + octave 4 + note E_, 2 + octave 1 + note C_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 +Music_Pinballdiglettstage_digletts_branch_44f10: ; 44f10 + callchannel Music_Pinballdiglettstage_digletts_branch_44f69 + callchannel Music_Pinballdiglettstage_digletts_branch_44f69 + callchannel Music_Pinballdiglettstage_digletts_branch_44f8e + callchannel Music_Pinballdiglettstage_digletts_branch_44f8e + callchannel Music_Pinballdiglettstage_digletts_branch_44f69 + callchannel Music_Pinballdiglettstage_digletts_branch_44f69 + callchannel Music_Pinballdiglettstage_digletts_branch_44f8e + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note G#, 2 + note D_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + callchannel Music_Pinballdiglettstage_digletts_branch_44f69 + callchannel Music_Pinballdiglettstage_digletts_branch_44f69 + callchannel Music_Pinballdiglettstage_digletts_branch_44f8e + callchannel Music_Pinballdiglettstage_digletts_branch_44f8e + callchannel Music_Pinballdiglettstage_digletts_branch_44f69 + callchannel Music_Pinballdiglettstage_digletts_branch_44f69 + callchannel Music_Pinballdiglettstage_digletts_branch_44f8e + callchannel Music_Pinballdiglettstage_digletts_branch_44f8e + loopchannel 0, Music_Pinballdiglettstage_digletts_branch_44f10 +; 44f69 + +Music_Pinballdiglettstage_digletts_branch_44f69: ; 44f69 + octave 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note D#, 3 + note __, 1 + note D#, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + endchannel +; 44f8e + +Music_Pinballdiglettstage_digletts_branch_44f8e: ; 44f8e + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note G#, 3 + note __, 1 + note G#, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + endchannel +; 44fb1 + +Music_Pinballdiglettstage_digletts_Ch4: ; 44fb1 + togglenoise $0 + notetype $6 + note C#, 1 + note C#, 1 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 2 + note D_, 2 +Music_Pinballdiglettstage_digletts_branch_44fc3: ; 44fc3 + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + callchannel Music_Pinballdiglettstage_digletts_branch_4502f + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + callchannel Music_Pinballdiglettstage_digletts_branch_4502f + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D_, 1 + note D_, 1 + note D_, 2 + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + callchannel Music_Pinballdiglettstage_digletts_branch_4502f + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D_, 2 + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + callchannel Music_Pinballdiglettstage_digletts_branch_4502f + callchannel Music_Pinballdiglettstage_digletts_branch_4501f + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note D_, 2 + loopchannel 0, Music_Pinballdiglettstage_digletts_branch_44fc3 +; 4501f + +Music_Pinballdiglettstage_digletts_branch_4501f: ; 4501f + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 4 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + endchannel +; 4502f + +Music_Pinballdiglettstage_digletts_branch_4502f: ; 4502f + note D#, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 2 + note D#, 4 + note D#, 2 + note D_, 2 + note D_, 2 + note D#, 2 + note D#, 2 + note D_, 1 + note D_, 1 + note D_, 2 + endchannel +; 45040 + + diff --git a/crysaudio/music/pinball/diglettstage_dugtrio.asm b/crysaudio/music/pinball/diglettstage_dugtrio.asm new file mode 100644 index 00000000..00925a91 --- /dev/null +++ b/crysaudio/music/pinball/diglettstage_dugtrio.asm @@ -0,0 +1,1148 @@ +Music_Pinballdiglettstage_dugtrio: ; 45040 + dbw $c0, Music_Pinballdiglettstage_dugtrio_Ch1 + dbw $01, Music_Pinballdiglettstage_dugtrio_Ch2 + dbw $02, Music_Pinballdiglettstage_dugtrio_Ch3 + dbw $03, Music_Pinballdiglettstage_dugtrio_Ch4 +; 4504c + +Music_Pinballdiglettstage_dugtrio_Ch1: ; 4504c + tempo 144 + volume $77 + notetype $c, $83 + note __, 16 + dutycycle $2 +Music_Pinballdiglettstage_dugtrio_branch_45057: ; 45057 + note __, 16 + note __, 12 + notetype $6, $73 + octave 4 + note F_, 1 + intensity $43 + note F_, 1 + intensity $73 + note F#, 1 + intensity $43 + note F#, 1 + note __, 2 + intensity $73 + note G_, 1 + intensity $43 + note G_, 1 + notetype $c, $83 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 9 + notetype $6, $73 + octave 5 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + notetype $c, $83 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_45057 +; 4509e + +Music_Pinballdiglettstage_dugtrio_Ch2: ; 4509e + dutycycle $2 + tone $0001 + notetype $c, $b3 + note __, 12 + notetype $6, $83 + octave 3 + note D#, 1 + intensity $53 + note D#, 1 + intensity $83 + octave 4 + note D#, 1 + intensity $53 + note D#, 1 + intensity $83 + octave 3 + note E_, 1 + intensity $53 + note E_, 1 + intensity $83 + octave 4 + note E_, 1 + intensity $53 + note E_, 1 +Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4 + panning $ff + notetype $c, $b3 + note __, 16 + note __, 8 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 + intensity $83 + octave 5 + note C#, 1 + intensity $53 + note C#, 1 + intensity $83 + note D_, 1 + intensity $33 + note D_, 1 + note __, 2 + intensity $83 + note D#, 1 + intensity $53 + note D#, 1 + notetype $c, $b3 + note __, 16 + note __, 8 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45221 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 + panning $ff + callchannel Music_Pinballdiglettstage_dugtrio_branch_4529e + forceoctave $4 + panning $f0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb + panning $f + callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4 + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 + panning $ff + callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb + callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4 + intensity $83 + note __, 2 + octave 6 + note C_, 1 + note __, 1 + octave 5 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + intensity $43 + note C_, 1 + note __, 1 + intensity $53 + octave 4 + note A#, 1 + note __, 1 + intensity $63 + octave 5 + note C_, 1 + note __, 1 + intensity $73 + note E_, 1 + note __, 1 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 + panning $f + callchannel Music_Pinballdiglettstage_dugtrio_branch_4529e + forceoctave $4 + panning $f0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb + callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4 + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 + panning $ff + intensity $83 + octave 1 + note D#, 1 + intensity $53 + note D#, 1 + intensity $83 + note D#, 1 + intensity $53 + note D#, 1 + intensity $83 + octave 2 + note D#, 1 + intensity $53 + note D#, 1 + intensity $83 + octave 1 + note D#, 1 + intensity $53 + note D#, 1 + intensity $83 + octave 2 + note C#, 1 + intensity $53 + note C#, 1 + intensity $83 + note D_, 1 + intensity $53 + note D_, 1 + note __, 2 + intensity $83 + note D#, 1 + intensity $53 + note D#, 1 + forceoctave $1 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45221 + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_452fd + panning $f0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_4532e + forceoctave $e + panning $f + callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 + forceoctave $a + callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 + panning $ff + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45345 + panning $f0 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note C#, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_452fd + callchannel Music_Pinballdiglettstage_dugtrio_branch_4532e + panning $f + forceoctave $e + callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 + forceoctave $a + callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45345 + panning $ff + intensity $83 + octave 1 + note C_, 1 + note __, 1 + octave 6 + note C_, 1 + intensity $53 + octave 5 + note G_, 1 + intensity $83 + note A#, 1 + note __, 1 + note G_, 1 + intensity $53 + note C_, 1 + note E_, 1 + note __, 1 + intensity $83 + note C_, 1 + intensity $53 + octave 4 + note G_, 1 + intensity $83 + note A#, 1 + note __, 1 + note G_, 1 + intensity $53 + note C_, 1 + intensity $83 + note E_, 1 + note __, 1 + note C_, 1 + intensity $53 + octave 3 + note G_, 1 + intensity $83 + note A#, 1 + note __, 1 + note G_, 1 + intensity $53 + note E_, 1 + panning $f0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 + loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_450c4 +; 45213 + +Music_Pinballdiglettstage_dugtrio_branch_45213: ; 45213 + notetype $6, $83 + octave 1 + note B_, 1 + intensity $53 + octave 2 + note C_, 1 + loopchannel 4, Music_Pinballdiglettstage_dugtrio_branch_45213 + endchannel +; 45221 + +Music_Pinballdiglettstage_dugtrio_branch_45221: ; 45221 + notetype $6, $33 + octave 2 + note G_, 1 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + octave 3 + note C_, 1 + note C#, 1 + note D_, 1 + note D#, 1 + intensity $43 + note E_, 1 + intensity $53 + note F_, 1 + intensity $63 + note F#, 1 + intensity $73 + note G_, 1 + intensity $83 + note G#, 1 + intensity $93 + note A_, 1 + intensity $a3 + note A#, 1 + endchannel +; 45245 + +Music_Pinballdiglettstage_dugtrio_branch_45245: ; 45245 + panning $f0 + intensity $83 + octave 3 + note F_, 1 + note B_, 1 + intensity $53 + note F_, 1 + note B_, 1 + intensity $83 + note F_, 1 + octave 4 + note C_, 1 + intensity $53 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + intensity $83 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + intensity $53 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + intensity $83 + octave 3 + note F_, 1 + note B_, 1 + intensity $53 + note F_, 1 + note B_, 1 + panning $f + intensity $83 + note F_, 1 + octave 4 + note C_, 1 + intensity $53 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + intensity $83 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + intensity $53 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + intensity $83 + octave 3 + note F_, 1 + note B_, 1 + intensity $53 + note F_, 1 + note B_, 1 + intensity $83 + note F_, 1 + octave 4 + note C_, 1 + intensity $53 + octave 3 + note F_, 1 + octave 4 + note C_, 1 + endchannel +; 4529e + +Music_Pinballdiglettstage_dugtrio_branch_4529e: ; 4529e + intensity $83 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + intensity $53 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + intensity $83 + octave 3 + note G#, 1 + octave 4 + note D_, 1 + intensity $53 + octave 3 + note G#, 1 + octave 4 + note D_, 1 + intensity $83 + octave 3 + note F_, 1 + octave 4 + note C#, 1 + intensity $53 + octave 3 + note F_, 1 + octave 4 + note C#, 1 + intensity $83 + note C#, 1 + note G_, 1 + intensity $53 + note C#, 1 + note G_, 1 + endchannel +; 452cb + +Music_Pinballdiglettstage_dugtrio_branch_452cb: ; 452cb + intensity $73 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + intensity $63 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + intensity $53 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + intensity $43 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + endchannel +; 452e4 + +Music_Pinballdiglettstage_dugtrio_branch_452e4: ; 452e4 + intensity $33 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + intensity $43 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + intensity $53 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + intensity $63 + octave 3 + note A_, 1 + octave 4 + note D#, 1 + endchannel +; 452fd + +Music_Pinballdiglettstage_dugtrio_branch_452fd: ; 452fd + intensity $83 + octave 4 + note C_, 1 + note __, 1 + octave 1 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 1 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + endchannel +; 4532e + +Music_Pinballdiglettstage_dugtrio_branch_4532e: ; 4532e + octave 1 + note G_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 1 + note G_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D_, 1 + note __, 1 + endchannel +; 45345 + +Music_Pinballdiglettstage_dugtrio_branch_45345: ; 45345 + intensity $83 + octave 4 + note C_, 1 + note __, 1 + octave 1 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 1 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + endchannel +; 45375 + +Music_Pinballdiglettstage_dugtrio_Ch3: ; 45375 + notetype $6, $12 + octave 1 + note A_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note C#, 1 + intensity $32 + note C#, 1 + intensity $12 + octave 3 + note C#, 1 + intensity $32 + note C#, 1 + intensity $12 + octave 2 + note D_, 1 + intensity $32 + note D_, 1 + intensity $12 + octave 3 + note D_, 1 + intensity $32 + note D_, 1 + intensity $12 + octave 2 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 3 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 2 + note E_, 1 + intensity $32 + note E_, 1 + intensity $12 + octave 3 + note E_, 1 + intensity $32 + note E_, 1 +Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5 + forceoctave $2 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454d5 + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454d5 + forceoctave $2 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe + callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 + forceoctave $2 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe + callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 + forceoctave $2 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 + intensity $12 + octave 1 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 2 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 1 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 2 + note C#, 1 + intensity $32 + note C#, 1 + intensity $12 + note D_, 1 + intensity $32 + note D_, 1 + note __, 2 + intensity $12 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 1 + note D#, 1 + intensity $32 + note D#, 1 + note __, 6 + intensity $12 + note B_, 1 + octave 2 + note C_, 1 + intensity $32 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + intensity $12 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + intensity $32 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + forceoctave $2 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe + callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 + forceoctave $2 + callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 + intensity $22 + octave 4 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + intensity $32 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + intensity $22 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + note C#, 1 + note G_, 1 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45565 + forceoctave $4 + callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a + forceoctave $0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a + forceoctave $4 + callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a + forceoctave $0 + intensity $12 + note F#, 1 + note G_, 1 + intensity $32 + note F#, 1 + note G_, 1 + intensity $12 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + intensity $22 + callchannel Music_Pinballdiglettstage_dugtrio_branch_45565 + octave 2 + note C_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + forceoctave $4 + callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a + loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_453c5 +; 454d5 + +Music_Pinballdiglettstage_dugtrio_branch_454d5: ; 454d5 + intensity $12 + octave 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + octave 1 + note D#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + note D_, 1 + note __, 3 + note D#, 1 + note __, 1 + intensity $22 + octave 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + octave 1 + note D#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + note D_, 1 + note __, 3 + note D#, 1 + note __, 1 + endchannel +; 454fe + +Music_Pinballdiglettstage_dugtrio_branch_454fe: ; 454fe + intensity $12 + octave 1 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 2 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 1 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 2 + note C#, 1 + intensity $32 + note C#, 1 + intensity $12 + note D_, 1 + intensity $32 + note D_, 1 + note __, 2 + intensity $12 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 1 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 2 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 1 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + note D#, 1 + intensity $32 + note D#, 1 + intensity $12 + octave 2 + note D#, 1 + intensity $32 + note D#, 1 + endchannel +; 45556 + +Music_Pinballdiglettstage_dugtrio_branch_45556: ; 45556 + intensity $12 + octave 1 + note E_, 1 + intensity $32 + note E_, 1 + intensity $12 + octave 2 + note E_, 1 + intensity $32 + note E_, 1 + endchannel +; 45565 + +Music_Pinballdiglettstage_dugtrio_branch_45565: ; 45565 + octave 3 + note E_, 1 + note __, 5 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 5 + octave 3 + note E_, 1 + note __, 5 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note __, 4 + note G_, 1 + note __, 1 + note A_, 1 + note __, 5 + note G_, 1 + note __, 1 + note A_, 1 + note __, 16 + note __, 1 + note E_, 1 + note __, 5 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 5 + octave 3 + note E_, 1 + note __, 5 + note G_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + endchannel +; 4559a + +Music_Pinballdiglettstage_dugtrio_branch_4559a: ; 4559a + intensity $12 + octave 1 + note F#, 1 + note G_, 1 + intensity $32 + note F#, 1 + note G_, 1 + intensity $12 + note F#, 1 + note G_, 1 + intensity $32 + note F#, 1 + note G_, 1 + endchannel +; 455ac + +Music_Pinballdiglettstage_dugtrio_Ch4: ; 455ac + togglenoise $1 + notetype $c + note C_, 8 + notetype $8 + note D_, 1 + note C#, 1 + note C#, 1 + notetype $c + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D_, 1 +Music_Pinballdiglettstage_dugtrio_branch_455be: ; 455be + callchannel Music_Pinballdiglettstage_dugtrio_branch_455df + loopchannel 7, Music_Pinballdiglettstage_dugtrio_branch_455be + callchannel Music_Pinballdiglettstage_dugtrio_branch_455f0 + callchannel Music_Pinballdiglettstage_dugtrio_branch_455df + callchannel Music_Pinballdiglettstage_dugtrio_branch_455df + callchannel Music_Pinballdiglettstage_dugtrio_branch_455df + callchannel Music_Pinballdiglettstage_dugtrio_branch_455f0 +Music_Pinballdiglettstage_dugtrio_branch_455d4: ; 455d4 + callchannel Music_Pinballdiglettstage_dugtrio_branch_455df + loopchannel 8, Music_Pinballdiglettstage_dugtrio_branch_455d4 + loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_455be +; 455df + +Music_Pinballdiglettstage_dugtrio_branch_455df: ; 455df + note D#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note D#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note D#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note D#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + endchannel +; 455f0 + +Music_Pinballdiglettstage_dugtrio_branch_455f0: ; 455f0 + note D#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note D#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + note D#, 1 + note D_, 1 + note D_, 1 + note D#, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D_, 1 + endchannel +; 45601 + + diff --git a/crysaudio/music/pinball/endcredits.asm b/crysaudio/music/pinball/endcredits.asm new file mode 100644 index 00000000..d0e1c93d --- /dev/null +++ b/crysaudio/music/pinball/endcredits.asm @@ -0,0 +1,1724 @@ +Music_Pinballendcredits: ; 4ccb5 + dbw $c0, Music_Pinballendcredits_Ch1 + dbw $01, Music_Pinballendcredits_Ch2 + dbw $02, Music_Pinballendcredits_Ch3 + dbw $03, Music_Pinballendcredits_Ch4 +; 4ccc1 + +Music_Pinballendcredits_Ch1: ; 4ccc1 + tempo 144 + volume $77 + tone $0001 + vibrato $14, $24 + dutycycle $2 + notetype $8, $93 + note __, 3 + octave 3 + note F#, 3 + octave 4 + note F#, 3 + note E_, 3 + note D_, 3 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 +Music_Pinballendcredits_branch_4ccdf: ; 4ccdf + notetype $6, $48 + octave 3 + note A_, 1 + intensity $18 + note A_, 1 + intensity $48 + octave 4 + note D_, 1 + intensity $18 + note D_, 1 + loopchannel 2, Music_Pinballendcredits_branch_4ccdf +Music_Pinballendcredits_branch_4ccf2: ; 4ccf2 + intensity $68 + octave 3 + note A_, 1 + intensity $28 + note A_, 1 + intensity $68 + octave 4 + note D_, 1 + intensity $28 + note D_, 1 + loopchannel 2, Music_Pinballendcredits_branch_4ccf2 +Music_Pinballendcredits_branch_4cd04: ; 4cd04 + intensity $88 + octave 3 + note A_, 1 + intensity $28 + note A_, 1 + intensity $88 + octave 4 + note F#, 1 + intensity $28 + note F#, 1 + loopchannel 2, Music_Pinballendcredits_branch_4cd04 + intensity $a8 + octave 3 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + octave 4 + note F#, 1 + intensity $28 + note F#, 1 + intensity $88 + note D_, 4 + dutycycle $3 + intensity $98 + callchannel Music_Pinballendcredits_branch_4cef5 +Music_Pinballendcredits_branch_4cd2e: ; 4cd2e + forceoctave $1 + callchannel Music_Pinballendcredits_branch_4cef5 + forceoctave $5 + callchannel Music_Pinballendcredits_branch_4cef5 + forceoctave $0 + note D_, 2 + note __, 2 + note D_, 4 + note __, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + note G_, 2 + note D_, 2 + octave 5 + note D_, 6 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + note D_, 4 + note __, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D#, 2 + note __, 2 + note D#, 4 + note __, 4 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 2 + note __, 2 + note E_, 4 + note __, 4 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 2 + note __, 2 + note F_, 4 + note __, 4 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note C_, 2 + octave 3 + note E_, 4 + note F#, 2 + note __, 2 + note E_, 2 + note __, 2 + note E_, 1 + note __, 15 + notetype $c, $b3 + note __, 16 + notetype $6, $88 + octave 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 4 + note __, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + note G_, 8 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 4 + note __, 4 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 2 + note __, 2 + note F_, 4 + octave 3 + note B_, 4 + note F_, 4 + note G_, 2 + intensity $28 + note G_, 2 + notetype $8, $88 + note C_, 1 + note E_, 1 + note G_, 1 + notetype $c, $88 + octave 4 + note C_, 1 + intensity $28 + note C_, 1 + notetype $8, $88 + octave 3 + note E_, 1 + note G_, 1 + octave 4 + note C_, 1 + notetype $c, $88 + note C#, 1 + intensity $28 + note C#, 1 + notetype $8, $68 + octave 3 + note G_, 1 + octave 4 + note C#, 1 + note F#, 1 + notetype $c, $68 + note G_, 1 + note E_, 1 + note C#, 1 + octave 3 + note A_, 1 + intensity $88 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + note F#, 1 + note D_, 1 + note A_, 1 + note F#, 1 + note D_, 1 + octave 2 + note A_, 1 + octave 4 + note F#, 1 + note E_, 1 + note D_, 1 + octave 3 + note A_, 1 + notetype $6, $88 + octave 4 + note G#, 1 + note A_, 7 + dutycycle $2 + vibrato $14, $4 + note __, 8 + notetype $8, $88 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A#, 6 + note __, 6 + note __, 6 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A_, 6 + note __, 6 + note __, 6 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + intensity $58 + note A#, 6 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note B_, 6 + note B_, 1 + note __, 1 + intensity $68 + note B_, 1 + note __, 1 + intensity $78 + note B_, 1 + note __, 1 + notetype $c, $88 + octave 5 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + notetype $8, $98 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + vibrato $14, $24 + notetype $c, $62 + octave 3 + note B_, 2 + octave 4 + note C_, 1 + octave 3 + note G_, 1 + octave 4 + note C_, 2 + note E_, 2 + notetype $8, $62 + note G_, 2 + note F#, 2 + note F_, 2 + note E_, 2 + note D#, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + note A_, 2 + notetype $c, $62 + note G_, 1 + note D_, 1 + note G_, 1 + note B_, 1 + octave 4 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + note C_, 1 + octave 3 + note A_, 1 + note E_, 1 + note A_, 1 + octave 5 + note A_, 1 + intensity $18 + note A_, 1 + intensity $62 + note E_, 1 + note C_, 1 + octave 4 + note C_, 1 + octave 3 + note A_, 1 + note F_, 1 + octave 4 + note C_, 1 + octave 5 + note A_, 1 + intensity $18 + note A_, 1 + intensity $62 + note F_, 1 + note C_, 1 + intensity $98 + octave 3 + note A_, 3 + note G#, 1 + note G_, 1 + note __, 1 + note A_, 2 + note __, 2 + note B_, 2 + notetype $8, $98 + octave 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + intensity $85 + octave 5 + note E_, 6 + note D#, 6 + note D_, 6 + note C#, 6 + note D_, 6 + note C_, 6 + octave 4 + note B_, 6 + octave 5 + note D_, 6 + dutycycle $3 + notetype $6, $a8 + octave 4 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 4 + note __, 4 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + notetype $8, $a8 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + notetype $c, $52 + note F#, 1 + note A_, 1 + intensity $72 + note F#, 1 + note A_, 1 + intensity $92 + note F#, 1 + note A_, 1 + intensity $b2 + note F#, 1 + note A_, 1 + intensity $52 + note F#, 1 + octave 5 + note D_, 1 + intensity $72 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + intensity $92 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + intensity $b2 + octave 4 + note A_, 1 + octave 5 + note D_, 1 + intensity $98 + octave 3 + note B_, 1 + note __, 1 + note B_, 2 + note __, 2 + notetype $6, $98 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 2 + note __, 2 + note B_, 2 + note __, 10 + loopchannel 0, Music_Pinballendcredits_branch_4cd2e +; 4cef5 + +Music_Pinballendcredits_branch_4cef5: ; 4cef5 + octave 3 + note B_, 2 + note __, 2 + note B_, 4 + note __, 4 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 2 + note __, 2 + note B_, 2 + note __, 10 + endchannel +; 4cf03 + +Music_Pinballendcredits_Ch2: ; 4cf03 + vibrato $14, $24 + dutycycle $2 + notetype $c, $b3 + note __, 2 + octave 4 + note D_, 2 + octave 5 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + notetype $8, $b3 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note F#, 2 + note F_, 2 + intensity $57 + note F#, 6 + intensity $67 + note G_, 6 + intensity $87 + note A_, 6 + intensity $a7 + octave 5 + note C_, 6 + dutycycle $3 + notetype $6, $a8 + octave 4 + note G_, 2 + intensity $28 + note G_, 2 + callchannel Music_Pinballendcredits_branch_4d1f2 +Music_Pinballendcredits_branch_4cf36: ; 4cf36 + forceoctave $2 + callchannel Music_Pinballendcredits_branch_4d21e + note A_, 2 + intensity $28 + note A_, 2 + intensity $a8 + octave 5 + note G_, 2 + intensity $88 + octave 2 + note A_, 1 + note G#, 1 + intensity $a8 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + forceoctave $5 + callchannel Music_Pinballendcredits_branch_4d21e + octave 5 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + octave 4 + note E_, 4 + intensity $78 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + forceoctave $4 + callchannel Music_Pinballendcredits_branch_4d21e + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + octave 5 + note G_, 6 + octave 3 + note A_, 1 + note A#, 1 + note B_, 4 + note A#, 4 + note A_, 4 + note B_, 4 + intensity $28 + note B_, 2 + note __, 2 + dutycycle $2 + intensity $a2 + octave 4 + note B_, 1 + intensity $22 + note B_, 1 + intensity $a2 + note B_, 2 + note A#, 1 + intensity $22 + note A#, 1 + intensity $a2 + note A#, 2 + note A_, 1 + intensity $22 + note A_, 1 + intensity $a2 + note A_, 2 + dutycycle $3 + intensity $a8 + octave 3 + note B_, 4 + note A#, 4 + note A_, 4 + note B_, 4 + intensity $28 + note B_, 2 + note __, 2 + dutycycle $2 + intensity $a2 + octave 4 + note B_, 1 + intensity $22 + note B_, 1 + intensity $a2 + note B_, 2 + octave 5 + note C_, 1 + intensity $22 + note C_, 1 + intensity $a2 + note C_, 2 + note D_, 1 + intensity $22 + note D_, 1 + intensity $a2 + note D_, 2 + dutycycle $3 + intensity $a8 + octave 4 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a8 + note E_, 2 + octave 3 + note G_, 4 + note A_, 2 + intensity $28 + note A_, 2 + intensity $a8 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 2 + note __, 1 + intensity $a8 + note B_, 4 + notetype $8, $a8 + note A_, 2 + note G#, 2 + note G_, 2 + notetype $6, $a8 + note F_, 1 + note F#, 3 + note E_, 2 + intensity $28 + note E_, 2 + intensity $a8 + note D_, 2 + intensity $28 + note D_, 2 + note __, 4 + intensity $a8 + octave 4 + note D_, 2 + note F#, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note A#, 8 + dutycycle $2 + callchannel Music_Pinballendcredits_branch_4d24f + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + octave 5 + note C_, 4 + note D_, 4 + callchannel Music_Pinballendcredits_branch_4d24f + note G_, 4 + note A_, 4 + note G_, 4 + octave 5 + note E_, 4 + octave 4 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note A_, 4 + note G_, 2 + intensity $28 + note G_, 2 + note __, 3 + intensity $a8 + note A#, 1 + note B_, 4 + note A_, 4 + note G_, 4 + note G#, 1 + note A_, 11 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + octave 5 + note D_, 2 + octave 4 + note A_, 2 + note F#, 2 + note D_, 2 + octave 5 + note F_, 1 + note F#, 7 + vibrato $14, $4 + callchannel Music_Pinballendcredits_branch_4d23e + intensity $a8 + note G_, 6 + octave 2 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + note A#, 1 + intensity $28 + note A#, 1 + intensity $a8 + octave 3 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + octave 2 + note D_, 6 +Music_Pinballendcredits_branch_4d073: ; 4d073 + octave 5 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + loopchannel 3, Music_Pinballendcredits_branch_4d073 + note F#, 6 + octave 2 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + callchannel Music_Pinballendcredits_branch_4d23e + intensity $68 + note G_, 6 +Music_Pinballendcredits_branch_4d098: ; 4d098 + intensity $68 + note G_, 1 + intensity $18 + note G_, 1 + loopchannel 3, Music_Pinballendcredits_branch_4d098 + intensity $88 + note G#, 6 +Music_Pinballendcredits_branch_4d0a5: ; 4d0a5 + intensity $78 + note G#, 1 + intensity $18 + note G#, 1 + loopchannel 3, Music_Pinballendcredits_branch_4d0a5 +Music_Pinballendcredits_branch_4d0af: ; 4d0af + notetype $c, $a8 + note A_, 1 + intensity $28 + note A_, 1 + loopchannel 2, Music_Pinballendcredits_branch_4d0af +Music_Pinballendcredits_branch_4d0ba: ; 4d0ba + notetype $8, $b8 + note A_, 1 + intensity $28 + note A_, 1 + loopchannel 2, Music_Pinballendcredits_branch_4d0ba + intensity $b8 + note A_, 1 + vibrato $14, $24 + dutycycle $2 + intensity $78 + octave 4 + note D#, 1 + notetype $c, $a8 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note A_, 2 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note A#, 2 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note A_, 2 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note B_, 1 + intensity $28 + note B_, 1 + intensity $a8 + note B_, 1 + intensity $28 + note B_, 1 + intensity $a8 + note A#, 2 + note B_, 1 + intensity $28 + note B_, 1 + intensity $a8 + octave 5 + note D_, 2 + note C_, 1 + intensity $28 + note C_, 1 + intensity $a8 + octave 4 + note B_, 2 + octave 5 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + note C_, 2 + octave 4 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a8 + note F#, 2 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note A_, 2 + note B_, 1 + intensity $28 + note B_, 1 + intensity $a8 + note A_, 2 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note F#, 3 + note F_, 1 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a8 + note F#, 2 + intensity $28 + note F#, 1 + note __, 1 + intensity $a8 + note G_, 2 + notetype $8, $a8 + octave 5 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + note D_, 1 + intensity $78 + dutycycle $3 + octave 3 + note D#, 1 + notetype $6, $a8 + note E_, 2 + intensity $28 + note E_, 2 + intensity $a8 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note A_, 4 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note A#, 4 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note A_, 4 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + note A#, 4 + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + octave 4 + note D_, 4 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + octave 3 + note B_, 4 + octave 4 + note D_, 2 + intensity $28 + note D_, 2 +Music_Pinballendcredits_branch_4d1a3: ; 4d1a3 + intensity $b8 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + loopchannel 2, Music_Pinballendcredits_branch_4d1a3 + intensity $b8 + note C_, 4 + intensity $28 + note C_, 2 + note __, 2 +Music_Pinballendcredits_branch_4d1b5: ; 4d1b5 + intensity $b8 + note C_, 1 + intensity $28 + note C_, 1 + loopchannel 2, Music_Pinballendcredits_branch_4d1b5 +Music_Pinballendcredits_branch_4d1bf: ; 4d1bf + intensity $b8 + note C#, 2 + intensity $28 + note C#, 2 + loopchannel 2, Music_Pinballendcredits_branch_4d1bf + notetype $8, $b8 + note C#, 1 + intensity $28 + note C#, 1 + intensity $b8 + octave 4 + note B_, 1 + intensity $28 + note B_, 1 + intensity $b8 + octave 5 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + note D_, 12 + intensity $b8 + note F#, 12 + notetype $6, $a8 + note G_, 2 + intensity $28 + note G_, 2 + callchannel Music_Pinballendcredits_branch_4d1f2 + loopchannel 0, Music_Pinballendcredits_branch_4cf36 +; 4d1f2 + +Music_Pinballendcredits_branch_4d1f2: ; 4d1f2 + intensity $a8 + octave 4 + note G_, 4 + intensity $28 + note G_, 2 + note __, 2 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + forceoctave $0 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + octave 5 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + octave 2 + note G_, 2 + intensity $28 + note G_, 2 + note __, 4 + endchannel +; 4d21e + +Music_Pinballendcredits_branch_4d21e: ; 4d21e + notetype $6, $a8 + octave 4 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note G_, 4 + intensity $28 + note G_, 2 + note __, 2 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + forceoctave $0 + endchannel +; 4d23e + +Music_Pinballendcredits_branch_4d23e: ; 4d23e + notetype $8, $a8 + octave 2 + note D_, 6 +Music_Pinballendcredits_branch_4d243: ; 4d243 + intensity $a8 + octave 5 + note F#, 1 + intensity $28 + note F#, 1 + loopchannel 3, Music_Pinballendcredits_branch_4d243 + endchannel +; 4d24f + +Music_Pinballendcredits_branch_4d24f: ; 4d24f + octave 4 + note B_, 4 + note A#, 4 + note A_, 4 + note B_, 2 + intensity $28 + note B_, 2 + note __, 4 + intensity $a8 + endchannel +; 4d25b + +Music_Pinballendcredits_Ch3: ; 4d25b + notetype $8, $12 + octave 1 + note D_, 1 + intensity $22 + note D_, 1 + note D_, 1 + notetype $c, $22 + octave 2 + note D_, 16 + notetype $6, $32 + octave 1 + note D_, 5 + note __, 3 + note D_, 5 + note __, 3 + intensity $22 + note D_, 3 + note __, 1 + notetype $8, $12 + octave 3 + note D_, 1 + intensity $32 + note D_, 1 + note D_, 1 + intensity $12 + note D_, 3 + octave 2 + note D_, 1 + intensity $22 + note D_, 1 + note D_, 1 + callchannel Music_Pinballendcredits_branch_4d401 + note __, 2 + octave 1 + note G_, 2 + note __, 6 +Music_Pinballendcredits_branch_4d28e: ; 4d28e + callchannel Music_Pinballendcredits_branch_4d401 + intensity $32 + octave 1 + note A_, 1 + note G#, 1 + intensity $22 + note G_, 2 + note __, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + callchannel Music_Pinballendcredits_branch_4d401 + note __, 2 + intensity $32 + note G_, 4 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + intensity $22 + octave 2 + note G_, 2 + note __, 2 + note G_, 4 + note __, 4 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 2 + note G_, 2 + octave 4 + note B_, 6 + note __, 2 +Music_Pinballendcredits_branch_4d2bd: ; 4d2bd + octave 1 + note G_, 2 + note __, 2 + note G_, 4 + note __, 4 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + octave 2 + note G_, 4 + note __, 4 + octave 1 + note G_, 1 + note __, 1 + intensity $32 + note G_, 1 + note __, 1 + intensity $22 + loopchannel 2, Music_Pinballendcredits_branch_4d2bd + octave 2 + note C_, 1 + note __, 1 + note G_, 2 + note C_, 2 + octave 1 + note G_, 2 + octave 2 + note C_, 6 + note __, 2 + note C#, 1 + note __, 3 + note G_, 4 + notetype $8, $22 + note C#, 2 + note G_, 2 + octave 3 + note C#, 2 + notetype $6, $22 + octave 2 + note C#, 1 + note D_, 3 + note D_, 2 + note __, 2 + note A_, 2 + note __, 6 + octave 3 + note D_, 2 + note F#, 2 + octave 4 + note C_, 2 + note D_, 2 + note C#, 8 + callchannel Music_Pinballendcredits_branch_4d412 + octave 2 + note B_, 2 + note __, 2 + note B_, 2 + note D#, 2 + octave 1 + note G_, 2 + note G_, 2 + callchannel Music_Pinballendcredits_branch_4d412 + octave 2 + note B_, 4 + note __, 4 + octave 1 + note G_, 2 + note G_, 2 + octave 2 + note C_, 2 + note __, 2 + octave 1 + note G_, 2 + note __, 6 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C#, 2 + note __, 2 + note G_, 2 + note __, 2 + octave 3 + note C#, 8 + octave 2 + note D_, 2 + note __, 2 + note D_, 2 + note __, 6 + note D_, 1 + note __, 1 + note D_, 1 + note __, 13 + notetype $8, $32 + octave 3 + note D_, 1 + note D_, 1 + note D_, 1 + intensity $22 + octave 1 + note D_, 6 + octave 2 + note D_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + intensity $32 + octave 3 + note D#, 6 + intensity $22 + octave 1 + note C#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + octave 1 + note D_, 6 + octave 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + intensity $32 + octave 3 + note D_, 6 + intensity $22 + octave 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note D_, 6 + octave 2 + note D_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + intensity $32 + note D_, 6 + note D_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + note D_, 6 + note D_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + notetype $c, $12 + octave 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + notetype $8, $12 + note D_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + notetype $c, $22 + octave 2 + note C_, 1 + note __, 1 + note C_, 2 + note __, 2 + note G_, 2 + note C#, 1 + note __, 1 + note C#, 2 + note G_, 2 + note C#, 2 + note D_, 1 + note __, 1 + note D_, 2 + note __, 2 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 2 + note E_, 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + octave 3 + note E_, 2 + octave 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note C_, 4 + octave 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 2 + notetype $8, $22 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + intensity $32 + note B_, 1 + octave 3 + note C_, 12 + note C#, 12 + note D_, 12 + note E_, 12 + notetype $6, $12 + octave 2 + note C_, 1 + note __, 1 + note G_, 1 + note __, 1 + note C_, 4 + note __, 4 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + notetype $8, $12 + note C#, 1 + note __, 1 + note G_, 1 + note __, 1 + note C#, 1 + note __, 1 + intensity $22 + note A_, 12 + octave 3 + note D_, 12 + callchannel Music_Pinballendcredits_branch_4d401 + note __, 2 + octave 1 + note G_, 2 + note __, 6 + loopchannel 0, Music_Pinballendcredits_branch_4d28e +; 4d401 + +Music_Pinballendcredits_branch_4d401: ; 4d401 + notetype $6, $22 + octave 2 + note G_, 2 + note __, 2 + note G_, 4 + note __, 4 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + octave 3 + note G_, 2 + endchannel +; 4d412 + +Music_Pinballendcredits_branch_4d412: ; 4d412 + octave 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 2 + note B_, 4 + note __, 4 + octave 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + endchannel +; 4d424 + +Music_Pinballendcredits_Ch4: ; 4d424 + togglenoise $1 + notetype $8 + note D_, 1 + note C#, 1 + note C#, 1 + notetype $c + note B_, 16 + note __, 15 + notetype $6 + note C#, 1 + note C#, 1 +Music_Pinballendcredits_branch_4d433: ; 4d433 + notetype $6 + callchannel Music_Pinballendcredits_branch_4d51d + loopchannel 4, Music_Pinballendcredits_branch_4d433 + note E_, 4 + note C#, 8 + note D_, 2 + note C#, 2 + note E_, 4 + note D_, 8 + note D_, 2 + note C#, 2 + note E_, 4 + note C#, 8 + note D_, 2 + note C#, 2 + note E_, 4 + note C#, 4 + note D_, 4 + note D_, 2 + note D_, 2 + note E_, 2 + note C#, 2 + note D_, 4 + note E_, 8 + note E_, 4 + note D_, 4 + notetype $8 + note E_, 2 + note D_, 2 + note E_, 2 + notetype $c + note D_, 1 + note C#, 1 + note D_, 2 + note D_, 4 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + notetype $6 + note D_, 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 D_, 2 + note C#, 8 + note D_, 2 + note C#, 2 + note E_, 4 + note D_, 4 + note D_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note E_, 4 + note D_, 8 + note D_, 2 + note C#, 2 + note E_, 2 + note D_, 2 + note E_, 4 + note D_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note E_, 4 + note D_, 8 + note D_, 2 + note C#, 2 + note E_, 4 + note D_, 12 + callchannel Music_Pinballendcredits_branch_4d51d +Music_Pinballendcredits_branch_4d493: ; 4d493 + note B_, 8 + notetype $8 + note E_, 2 + note C#, 2 + note D_, 2 + note E_, 3 + note D_, 3 + notetype $6 + note D_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + loopchannel 3, Music_Pinballendcredits_branch_4d493 + note D_, 4 + note C#, 4 + notetype $8 + note E_, 2 + note C#, 2 + note D_, 2 + note E_, 3 + note D_, 3 + note E_, 2 + note C#, 2 + note D_, 2 + note D_, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note E_, 3 + note C#, 1 + note C#, 1 + note C#, 1 + note E_, 3 + note C#, 1 + note C#, 1 + note C#, 1 + notetype $6 + note D_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 4 + note C#, 4 + note E_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + note E_, 4 + note C#, 4 + note D_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note E_, 4 + note C#, 2 + note D_, 2 + note B_, 8 + note E_, 4 + notetype $8 + note C#, 1 + note C#, 1 + note C#, 1 + notetype $c + note B_, 4 + note E_, 2 + note C#, 2 + note E_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note E_, 2 + note C#, 2 + notetype $8 + note E_, 2 + note C#, 2 + note D_, 2 + notetype $c + note B_, 16 + note __, 16 + note E_, 1 + note D_, 1 + note E_, 4 + note E_, 1 + note D_, 1 + note E_, 2 + note E_, 2 + notetype $8 + note E_, 2 + note D_, 2 + note E_, 2 + notetype $6 + note D_, 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 E_, 1 + note D_, 1 + note D_, 1 + note B_, 12 + loopchannel 0, Music_Pinballendcredits_branch_4d433 +; 4d51d + +Music_Pinballendcredits_branch_4d51d: ; 4d51d + note E_, 4 + note C#, 8 + note D_, 2 + note C#, 2 + note E_, 4 + note D_, 4 + note D_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + endchannel +; 4d52c + + diff --git a/crysaudio/music/pinball/fieldselect.asm b/crysaudio/music/pinball/fieldselect.asm new file mode 100644 index 00000000..76e73f7b --- /dev/null +++ b/crysaudio/music/pinball/fieldselect.asm @@ -0,0 +1,447 @@ +Music_Pinballfieldselect: ; 494bb + dbw $c0, Music_Pinballfieldselect_Ch1 + dbw $01, Music_Pinballfieldselect_Ch2 + dbw $02, Music_Pinballfieldselect_Ch3 + dbw $03, Music_Pinballfieldselect_Ch4 +; 494c7 + +Music_Pinballfieldselect_Ch1: ; 494c7 + tempo 152 + volume $77 + tone $0001 + dutycycle $2 + notetype $8, $71 + note __, 12 + note __, 2 + octave 6 + note F_, 2 + note __, 2 + dutycycle $3 + notetype $6, $58 + octave 5 + note C_, 1 + note C#, 1 + intensity $68 + note C_, 1 + note C#, 1 + intensity $78 + note C_, 1 + intensity $98 + note C#, 1 + intensity $b8 + note C_, 1 + note C#, 1 +Music_Pinballfieldselect_branch_494ef: ; 494ef + dutycycle $2 + intensity $a8 + octave 3 + note A#, 1 + note __, 16 + note __, 5 + callchannel Music_Pinballfieldselect_branch_49514 + note __, 14 + callchannel Music_Pinballfieldselect_branch_49514 + note __, 14 + callchannel Music_Pinballfieldselect_branch_49514 + panning $ff + note __, 14 + intensity $a4 + octave 3 + note A#, 1 + intensity $24 + note A#, 1 + intensity $a4 + note A#, 4 + note B_, 4 + loopchannel 0, Music_Pinballfieldselect_branch_494ef +; 49514 + +Music_Pinballfieldselect_branch_49514: ; 49514 + intensity $81 + octave 4 + note F#, 2 + panning $f + note A#, 2 + intensity $74 + note F#, 2 + panning $f0 + intensity $64 + note A#, 2 + intensity $54 + note F#, 2 + panning $f + intensity $44 + note A#, 2 + intensity $34 + note F#, 2 + panning $f0 + intensity $24 + note A#, 2 + intensity $14 + note F#, 2 + endchannel +; 49537 + +Music_Pinballfieldselect_Ch2: ; 49537 + dutycycle $2 + notetype $c, $b4 + octave 4 + note C#, 1 + octave 3 + note C#, 1 + intensity $24 + note C#, 1 + intensity $b4 + note C#, 1 + note C#, 1 + octave 4 + note C#, 1 + octave 3 + note C#, 1 + intensity $24 + note C#, 1 + notetype $8, $b4 + note C#, 2 + octave 5 + note C#, 2 + octave 3 + note C#, 2 + notetype $c, $b4 + octave 4 + note C#, 1 + octave 3 + note C#, 1 + notetype $6, $b4 + note B_, 1 + octave 4 + note C_, 3 +Music_Pinballfieldselect_branch_49563: ; 49563 + intensity $b4 + note C#, 1 + intensity $24 + note C#, 1 + intensity $91 + octave 3 + note F#, 2 + note C#, 2 + intensity $b4 + note A#, 1 + intensity $24 + note A#, 1 + intensity $b4 + note F#, 1 + intensity $24 + note F#, 1 + intensity $b4 + note C#, 1 + intensity $24 + note C#, 1 + intensity $91 + octave 4 + note F#, 2 + intensity $b4 + note C#, 1 + intensity $24 + note C#, 1 + note __, 2 + intensity $b4 + note C#, 1 + intensity $24 + note C#, 1 + intensity $91 + note A#, 2 + intensity $b4 + octave 3 + note A#, 1 + intensity $24 + note A#, 1 + intensity $b4 + note F#, 1 + intensity $24 + note F#, 1 + intensity $b4 + note C#, 2 + intensity $94 + octave 4 + note C_, 1 + intensity $b4 + note C#, 3 + callchannel Music_Pinballfieldselect_branch_49630 + note __, 2 + intensity $b4 + note D_, 1 + intensity $24 + note D_, 1 + intensity $91 + note A#, 2 + intensity $b4 + octave 3 + note A#, 1 + intensity $24 + note A#, 1 + intensity $b4 + note F#, 1 + intensity $24 + note F#, 1 + intensity $b4 + note D_, 2 + intensity $94 + octave 4 + note C#, 1 + intensity $b4 + note D_, 3 + note D#, 1 + intensity $24 + note D#, 1 + intensity $91 + octave 3 + note F#, 2 + note D#, 2 + intensity $b4 + note A#, 1 + intensity $24 + note A#, 1 + intensity $b4 + note F#, 1 + intensity $24 + note F#, 1 + intensity $b4 + note D#, 1 + intensity $24 + note D#, 1 + intensity $91 + octave 4 + note F#, 2 + intensity $b4 + note D#, 1 + intensity $24 + note D#, 1 + note __, 2 + intensity $b4 + note D#, 1 + intensity $24 + note D#, 1 + intensity $91 + note A#, 2 + intensity $b4 + octave 3 + note A#, 1 + intensity $24 + note A#, 1 + intensity $b4 + note F#, 1 + intensity $24 + note F#, 1 + intensity $b4 + note D#, 2 + intensity $94 + octave 4 + note D_, 1 + intensity $b4 + note D#, 3 + callchannel Music_Pinballfieldselect_branch_49630 + note __, 2 + intensity $b4 + note D_, 1 + intensity $24 + note D_, 1 + intensity $91 + note A#, 2 + intensity $b4 + note F#, 1 + intensity $24 + note F#, 1 + intensity $b4 + note F#, 4 + note G#, 4 + loopchannel 0, Music_Pinballfieldselect_branch_49563 +; 49630 + +Music_Pinballfieldselect_branch_49630: ; 49630 + intensity $b4 + note D_, 1 + intensity $24 + note D_, 1 + intensity $91 + octave 3 + note F#, 2 + note D_, 2 + intensity $b4 + note A#, 1 + intensity $24 + note A#, 1 + intensity $b4 + note F#, 1 + intensity $24 + note F#, 1 + intensity $b4 + note D_, 1 + intensity $24 + note D_, 1 + intensity $91 + octave 4 + note F#, 2 + intensity $b4 + note D_, 1 + intensity $24 + note D_, 1 + endchannel +; 49658 + +Music_Pinballfieldselect_Ch3: ; 49658 + notetype $6, $22 + octave 1 + note B_, 3 + note __, 1 + octave 2 + note C_, 3 + note __, 1 + note C#, 3 + note __, 1 + note D_, 3 + note __, 1 + notetype $8, $22 + note D#, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + notetype $c, $22 + note F_, 1 + octave 3 + note F_, 1 + notetype $6, $22 + note G#, 1 + note A_, 3 +Music_Pinballfieldselect_branch_49678: ; 49678 + octave 1 + note F#, 4 + note __, 2 + octave 2 + note C#, 1 + note __, 1 + note C#, 6 + octave 1 + note F#, 1 + note __, 3 + octave 2 + note C#, 1 + note __, 3 + note F_, 1 + note __, 1 + note F#, 4 + octave 1 + note F#, 2 + note __, 2 + note F#, 4 + note __, 2 + octave 2 + note D_, 1 + note __, 1 + note D_, 6 + octave 1 + note F#, 1 + note __, 3 + octave 2 + note D_, 1 + note __, 3 + note F_, 1 + note __, 1 + note F#, 4 + octave 1 + note F#, 2 + note __, 2 + note F#, 4 + note __, 2 + octave 2 + note D#, 1 + note __, 1 + note D#, 6 + octave 1 + note F#, 1 + note __, 3 + octave 2 + note D#, 1 + note __, 3 + note F_, 1 + note __, 1 + note F#, 4 + octave 1 + note F#, 2 + note __, 2 + note F#, 4 + note __, 2 + octave 2 + note D_, 1 + note __, 1 + note D_, 6 + octave 1 + note F#, 1 + note __, 3 + octave 2 + note D_, 1 + note __, 3 + octave 3 + note C#, 1 + note __, 1 + note C#, 4 + octave 2 + note F_, 4 + loopchannel 0, Music_Pinballfieldselect_branch_49678 +; 496c5 + +Music_Pinballfieldselect_Ch4: ; 496c5 + togglenoise $0 + notetype $6 + note G#, 1 + note G#, 1 + note G#, 4 + note F#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + notetype $8 + note D_, 2 + note D_, 2 + note D_, 2 + notetype $c + note D#, 1 + note D_, 1 + note D_, 2 +Music_Pinballfieldselect_branch_496db: ; 496db + note D#, 4 + note D_, 1 + note D#, 2 + note D#, 2 + note D#, 5 + note D_, 2 + note D#, 3 + note C#, 1 + note D_, 1 + note D#, 2 + note D#, 2 + note D#, 3 + note D#, 1 + note D#, 1 + note D_, 2 + note D#, 3 + note D#, 1 + note D_, 3 + note D#, 4 + note D#, 2 + note D#, 1 + note D_, 2 + note D#, 3 + note D#, 1 + note D_, 2 + note D#, 2 + note D#, 3 + note D_, 1 + note D_, 2 + note D_, 1 + note D_, 1 + loopchannel 0, Music_Pinballfieldselect_branch_496db +; 496fe + + diff --git a/crysaudio/music/pinball/gameover.asm b/crysaudio/music/pinball/gameover.asm new file mode 100644 index 00000000..e3dafa97 --- /dev/null +++ b/crysaudio/music/pinball/gameover.asm @@ -0,0 +1,197 @@ +Music_Pinballgameover: ; 4231d + dbw $c0, Music_Pinballgameover_Ch1 + dbw $01, Music_Pinballgameover_Ch2 + dbw $02, Music_Pinballgameover_Ch3 + dbw $03, Music_Pinballgameover_Ch4 +; 42329 + +Music_Pinballgameover_Ch1: ; 42329 + tempo 152 + volume $77 + dutycycle $3 + vibrato $18, $34 + notetype $8, $91 + octave 3 + note C_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + note E_, 2 + note D#, 2 + note C_, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note G#, 2 + octave 5 + note C_, 2 + intensity $98 + octave 3 + note G_, 4 + intensity $71 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + intensity $98 + note A_, 6 + intensity $71 + note C_, 2 + intensity $98 + note F_, 4 + intensity $71 + note C_, 2 + notetype $c, $98 + note E_, 16 + intensity $78 + note B_, 8 + vibrato $0, $34 + intensity $77 + note B_, 8 + note __, 2 + endchannel +; 4236b + +Music_Pinballgameover_Ch2: ; 4236b + dutycycle $1 + vibrato $20, $34 + notetype $8, $a8 + octave 5 + note E_, 4 + octave 4 + note F_, 1 + intensity $28 + note F_, 1 + intensity $a8 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $a8 + note G_, 6 + note F_, 1 + intensity $28 + note F_, 1 + intensity $a8 + note D#, 4 + note F_, 1 + intensity $28 + note F_, 1 + intensity $a8 + note D_, 4 + octave 4 + note D#, 1 + intensity $28 + note D#, 1 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note A#, 1 + intensity $28 + note A#, 1 + intensity $a8 + octave 5 + note C_, 6 + octave 4 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + octave 5 + note C_, 4 + octave 4 + note C#, 1 + intensity $28 + note C#, 1 + notetype $c, $a8 + note B_, 16 + intensity $88 + octave 5 + note D_, 8 + vibrato $0, $34 + intensity $87 + octave 5 + note D_, 8 + note __, 2 + endchannel +; 423cc + +Music_Pinballgameover_Ch3: ; 423cc + notetype $8, $22 + octave 2 + note F_, 4 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 2 + note G#, 6 + octave 3 + note D#, 1 + note __, 1 + note C_, 4 + note D#, 1 + note __, 1 + octave 2 + note D#, 4 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 6 + note A_, 1 + note __, 1 + note G#, 4 + note F_, 1 + note __, 1 + notetype $c, $22 + note C_, 16 + note C_, 8 + note C_, 8 + note __, 2 + endchannel +; 423f8 + +Music_Pinballgameover_Ch4: ; 423f8 + togglenoise $0 + notetype $8 + note D_, 4 + note D#, 2 + note D_, 2 + note C#, 4 + note C#, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 2 + note C#, 4 + note C#, 2 + note C#, 2 + note C#, 2 + note C#, 6 + note F#, 6 + note F#, 2 + notetype $c + note B_, 16 + note __, 16 + note __, 2 + endchannel +; 42413 + + diff --git a/crysaudio/music/pinball/gengarstage_gastly.asm b/crysaudio/music/pinball/gengarstage_gastly.asm new file mode 100644 index 00000000..85022caf --- /dev/null +++ b/crysaudio/music/pinball/gengarstage_gastly.asm @@ -0,0 +1,386 @@ +Music_Pinballgengarstage_gastly: ; 3ddea + dbw $80, Music_Pinballgengarstage_gastly_Ch1 + dbw $01, Music_Pinballgengarstage_gastly_Ch2 + dbw $02, Music_Pinballgengarstage_gastly_Ch3 +; 3ddf3 + +Music_Pinballgengarstage_gastly_Ch1: ; 3ddf3 +Music_Pinballgengarstage_haunter_branch_3ddf3: ; 3ddf3 + tempo 272 + volume $77 +Music_Pinballgengarstage_gastly_branch_3ddf8: ; 3ddf8 + vibrato $12, $33 + dutycycle $3 + notetype $6, $48 + octave 5 + note G#, 1 + note A_, 1 + note A#, 1 + note B_, 1 + notetype $c, $48 + octave 6 + note C_, 14 + vibrato $0, $33 + intensity $46 + note C_, 8 + note __, 8 + note __, 16 + note __, 16 + note __, 16 + vibrato $12, $33 + dutycycle $3 + notetype $6, $48 + octave 4 + note G#, 1 + note A_, 16 + vibrato $0, $33 + note A_, 11 + intensity $38 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + dutycycle $2 + vibrato $12, $53 + notetype $6, $b8 + octave 3 + note D_, 2 + note C#, 2 + note G_, 2 + notetype $c, $98 + note F#, 9 + notetype $6, $48 + note F_, 1 + note E_, 1 + notetype $6, $28 + note D#, 1 + note D_, 1 + notetype $c, $b3 + note __, 2 + note __, 16 + loopchannel 0, Music_Pinballgengarstage_gastly_branch_3ddf8 +; 3de4c + +Music_Pinballgengarstage_gastly_Ch2: ; 3de4c +Music_Pinballgengarstage_haunter_branch_3de4c: ; 3de4c + tone $0001 +Music_Pinballgengarstage_gastly_branch_3de4f: ; 3de4f + dutycycle $3 + vibrato $12, $33 + notetype $6, $48 + octave 6 + note C#, 1 + note D_, 1 + note D#, 1 + note E_, 1 + notetype $c, $48 + note F_, 14 + vibrato $0, $33 + intensity $46 + note F_, 8 + dutycycle $2 + vibrato $12, $33 + notetype $6, $98 + octave 4 + note F#, 1 + intensity $28 + note F#, 1 + intensity $98 + note F_, 1 + intensity $28 + note F_, 1 + intensity $98 + note A#, 1 + intensity $28 + note A#, 1 + intensity $98 + note A_, 4 + intensity $68 + note C#, 4 + intensity $48 + note C_, 2 + intensity $18 + note C_, 2 + intensity $68 + octave 3 + note A#, 4 + intensity $88 + note A_, 2 + intensity $28 + note A_, 2 + intensity $88 + note F#, 6 + callchannel Music_Pinballgengarstage_gastly_branch_3dee0 + callchannel Music_Pinballgengarstage_gastly_branch_3dee0 + note __, 16 + dutycycle $3 + intensity $48 + octave 5 + note G_, 1 + note G#, 16 + vibrato $0, $33 + note G#, 11 + vibrato $12, $33 + intensity $38 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + dutycycle $2 + vibrato $12, $53 + intensity $b8 + octave 3 + note F#, 2 + note F_, 2 + note B_, 2 + notetype $c, $a8 + note A#, 9 + notetype $6, $48 + note A_, 1 + note G#, 1 + notetype $6, $38 + note G_, 1 + note F#, 1 + intensity $78 + octave 1 + note F#, 4 + notetype $c, $b3 + note __, 14 + notetype $6, $a8 + octave 2 + note B_, 1 + note A#, 1 + note G_, 1 + note F#, 1 + loopchannel 0, Music_Pinballgengarstage_gastly_branch_3de4f +; 3dee0 + +Music_Pinballgengarstage_gastly_branch_3dee0: ; 3dee0 + intensity $28 + note F_, 1 + note F#, 1 + intensity $38 + note F_, 1 + note F#, 1 + intensity $48 + note F_, 1 + note F#, 1 + intensity $58 + note F_, 1 + note F#, 1 + intensity $68 + note F_, 1 + note F#, 1 + intensity $78 + note F_, 1 + note F#, 1 + intensity $b8 + note F_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + intensity $a8 + note F_, 1 + note F#, 1 + intensity $88 + note F_, 1 + note F#, 1 + intensity $78 + note F_, 1 + note F#, 1 + intensity $68 + note F_, 1 + note F#, 1 + intensity $58 + note F_, 1 + note F#, 1 + intensity $48 + note F_, 1 + note F#, 1 + intensity $28 + note F_, 1 + note F#, 1 + intensity $18 + note F_, 1 + note F#, 1 + endchannel +; 3df1f + +Music_Pinballgengarstage_gastly_Ch3: ; 3df1f +Music_Pinballgengarstage_gastly_branch_3df1f: ; 3df1f +Music_Pinballgengarstage_haunter_branch_3df1f: ; 3df1f + notetype $6, $22 + octave 1 + note B_, 2 + notetype $6, $32 + octave 2 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + notetype $6, $22 + octave 1 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + notetype $6, $32 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + notetype $6, $22 + octave 1 + note B_, 2 + notetype $6, $32 + octave 3 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note __, 2 + notetype $6, $22 + octave 1 + note B_, 2 + notetype $6, $32 + octave 4 + note F_, 1 + note F#, 1 + note G_, 1 + note G#, 1 + note __, 2 + notetype $6, $22 + octave 1 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + notetype $6, $32 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + octave 4 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + notetype $6, $22 + octave 2 + note D_, 2 + note __, 6 + notetype $6, $32 + note D_, 2 + note __, 6 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note B_, 2 + note __, 6 + notetype $6, $22 + octave 2 + note D_, 2 + note __, 6 + notetype $6, $32 + note D_, 2 + note __, 6 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note B_, 2 + note __, 6 +Music_Pinballgengarstage_gastly_branch_3dfb0: ; 3dfb0 + notetype $6, $22 + octave 1 + note B_, 2 + notetype $6, $32 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + loopchannel 3, Music_Pinballgengarstage_gastly_branch_3dfb0 + notetype $6, $22 + octave 1 + note B_, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + notetype $6, $22 + octave 1 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + notetype $6, $32 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + notetype $6, $12 + note F#, 4 + notetype $6, $32 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + notetype $6, $22 + note B_, 1 + note A#, 1 + note G_, 1 + note F#, 1 + loopchannel 0, Music_Pinballgengarstage_gastly_branch_3df1f +; 3dffc + + diff --git a/crysaudio/music/pinball/gengarstage_hauntergengar.asm b/crysaudio/music/pinball/gengarstage_hauntergengar.asm new file mode 100644 index 00000000..b5c6fe95 --- /dev/null +++ b/crysaudio/music/pinball/gengarstage_hauntergengar.asm @@ -0,0 +1,809 @@ +Music_Pinballgengarstage_haunter: ; 3dffc + dbw $80, Music_Pinballgengarstage_haunter_Ch1 + dbw $01, Music_Pinballgengarstage_haunter_Ch2 + dbw $02, Music_Pinballgengarstage_haunter_Ch3 +; 3e005 + +Music_Pinballgengarstage_haunter_Ch1: ; 3e005 + forceoctave $2 + callchannel Music_Pinballgengarstage_haunter_branch_3ddf3 +Music_Pinballgengarstage_haunter_Ch2: ; 3e00a + forceoctave $2 + callchannel Music_Pinballgengarstage_haunter_branch_3de4c +Music_Pinballgengarstage_haunter_Ch3: ; 3e00f + forceoctave $2 + callchannel Music_Pinballgengarstage_haunter_branch_3df1f + +Music_Pinballgengarstage_gengar: ; 3e014 + dbw $c0, Music_Pinballgengarstage_gengar_Ch1 + dbw $01, Music_Pinballgengarstage_gengar_Ch2 + dbw $02, Music_Pinballgengarstage_gengar_Ch3 + dbw $03, Music_Pinballgengarstage_gengar_Ch4 +; 3e020 + +Music_Pinballgengarstage_gengar_Ch1: ; 3e020 + tempo 124 + volume $77 + notetype $c, $b3 + dutycycle $3 + notetype $6, $21 + note __, 16 + octave 4 + note E_, 1 + note A_, 1 + intensity $48 + note E_, 1 + note A_, 1 + intensity $68 + note E_, 1 + note A_, 1 + intensity $88 + note E_, 1 + note A_, 1 + intensity $a8 + note E_, 1 + note A_, 1 + intensity $88 + note E_, 1 + note A_, 1 + intensity $68 + note E_, 1 + note A_, 1 + intensity $48 + note E_, 1 + note A_, 1 + intensity $28 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + intensity $38 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + intensity $48 + note G#, 1 + note F_, 1 + note G#, 1 + note F_, 1 + note G#, 1 + intensity $58 + note F_, 1 + note G#, 1 + intensity $68 + note F_, 1 + note G#, 1 + intensity $78 + note F_, 1 + note G#, 1 + intensity $88 + note F_, 1 + note G#, 1 + intensity $98 + note F_, 1 + note G#, 1 + intensity $a8 + note F_, 1 + note G#, 1 + intensity $b8 + note F_, 1 + note G#, 1 +Music_Pinballgengarstage_gengar_branch_3e081: ; 3e081 +Music_Pinballgengarstage_haunter_branch_3e081: ; 3e081 + vibrato $8, $33 + intensity $81 + octave 2 + note F_, 2 + note F_, 1 + note __, 1 + note F_, 2 + note F_, 1 + note __, 1 + note F_, 2 + note F_, 1 + note __, 1 + note F_, 2 + note F_, 1 + note __, 1 + intensity $88 + octave 3 + note D_, 6 + octave 2 + note B_, 6 + note G#, 2 + note __, 2 + intensity $81 + note C_, 2 + note C_, 1 + note __, 1 + note C_, 2 + note C_, 1 + note __, 1 + note C_, 2 + note C_, 1 + note __, 1 + note C_, 2 + note C_, 1 + note __, 1 + intensity $88 + note A_, 6 + note F#, 6 + note D#, 2 + note __, 2 + loopchannel 2, Music_Pinballgengarstage_haunter_branch_3e081 + callchannel Music_Pinballgengarstage_haunter_branch_3e12f + forceoctave $3 + callchannel Music_Pinballgengarstage_haunter_branch_3e12f + forceoctave $8 + callchannel Music_Pinballgengarstage_haunter_branch_3e12f + forceoctave $0 + intensity $88 + octave 4 + note C#, 4 + intensity $81 + octave 3 + note D#, 1 + note __, 1 + intensity $88 + octave 4 + note C_, 4 + intensity $81 + octave 3 + note D_, 1 + note __, 1 + intensity $88 + note B_, 4 + intensity $81 + note C#, 1 + note __, 1 + intensity $88 + note A#, 4 + intensity $81 + note C_, 1 + note __, 1 + intensity $88 + note A_, 2 + note G#, 2 + note G_, 2 + note F#, 2 + callchannel Music_Pinballgengarstage_haunter_branch_3e14e + intensity $81 + octave 2 + note C_, 2 + note C_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note C_, 1 + note __, 1 + note C#, 2 + note D_, 1 + note __, 1 + note D#, 2 + note E_, 1 + note __, 1 + note F_, 2 + note F#, 1 + note __, 1 + note G_, 2 + callchannel Music_Pinballgengarstage_haunter_branch_3e14e + intensity $88 + octave 2 + note B_, 2 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note B_, 2 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + vibrato $6, $53 + intensity $88 + octave 2 + note A#, 1 + note B_, 11 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + loopchannel 0, Music_Pinballgengarstage_haunter_branch_3e081 +; 3e12f + +Music_Pinballgengarstage_gengar_branch_3e12f: ; 3e12f +Music_Pinballgengarstage_haunter_branch_3e12f: ; 3e12f + intensity $88 + octave 3 + note C_, 4 + intensity $81 + octave 2 + note C_, 2 + note C_, 1 + note __, 1 + note C_, 2 + note C_, 1 + note __, 1 + note C_, 2 + note C_, 1 + note __, 1 + intensity $88 + octave 3 + note C_, 4 + intensity $81 + octave 2 + note C_, 2 + octave 3 + note C_, 2 + note __, 2 + intensity $88 + note F#, 6 + endchannel +; 3e14e + +Music_Pinballgengarstage_gengar_branch_3e14e: ; 3e14e +Music_Pinballgengarstage_haunter_branch_3e14e: ; 3e14e + intensity $81 + octave 2 + note F_, 2 + note __, 2 + note F_, 2 + note F_, 2 + note G#, 2 + intensity $88 + note B_, 6 + intensity $81 + note F_, 2 + note __, 2 + note F_, 2 + note F_, 2 + note B_, 2 + intensity $88 + octave 3 + note D_, 6 + endchannel +; 3e165 + +Music_Pinballgengarstage_gengar_Ch2: ; 3e165 + dutycycle $1 + vibrato $12, $34 + notetype $6, $b8 + octave 4 + note A_, 1 + intensity $28 + note A_, 1 + intensity $b8 + note A#, 1 + intensity $28 + note A#, 1 + intensity $b8 + note B_, 1 + intensity $28 + note B_, 1 + intensity $b8 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $48 + octave 4 + note A_, 1 + intensity $18 + note A_, 1 + intensity $68 + note A#, 1 + intensity $18 + note A#, 1 + intensity $88 + note B_, 1 + intensity $18 + note B_, 1 + intensity $a8 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $b8 + note C#, 16 + note D_, 16 + octave 4 + note B_, 16 + vibrato $8, $33 +Music_Pinballgengarstage_gengar_branch_3e1a8: ; 3e1a8 + intensity $91 + octave 2 + note G#, 2 + note G#, 1 + note __, 1 + note G#, 2 + note G#, 1 + note __, 1 + note G#, 2 + note G#, 1 + note __, 1 + note G#, 2 + note G#, 1 + note __, 1 + intensity $b8 + octave 3 + note F_, 6 + note D_, 6 + octave 2 + note B_, 2 + intensity $18 + note B_, 2 + intensity $91 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + intensity $b8 + octave 3 + note C_, 6 + octave 2 + note A_, 6 + note F#, 2 + intensity $18 + note F#, 2 + loopchannel 2, Music_Pinballgengarstage_gengar_branch_3e1a8 + callchannel Music_Pinballgengarstage_gengar_branch_3e25f + forceoctave $3 + callchannel Music_Pinballgengarstage_gengar_branch_3e25f + forceoctave $8 + callchannel Music_Pinballgengarstage_gengar_branch_3e25f + forceoctave $0 + intensity $b8 + octave 4 + note E_, 4 + intensity $a1 + octave 3 + note F#, 1 + note __, 1 + intensity $b8 + octave 4 + note D#, 4 + intensity $a1 + octave 3 + note F_, 1 + note __, 1 + intensity $b8 + octave 4 + note D_, 4 + intensity $a1 + octave 3 + note E_, 1 + note __, 1 + intensity $b8 + octave 4 + note C#, 4 + intensity $a1 + octave 3 + note D#, 1 + note __, 1 + intensity $a8 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + note A_, 2 + callchannel Music_Pinballgengarstage_gengar_branch_3e280 + intensity $a1 + octave 2 + note D#, 2 + note D#, 1 + note __, 1 + octave 3 + note D#, 2 + octave 2 + note D#, 1 + note __, 1 + octave 3 + note D#, 2 + octave 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 3 + note D#, 2 + octave 2 + note D#, 1 + note __, 1 + note E_, 2 + note F_, 1 + note __, 1 + note F#, 2 + note G_, 1 + note __, 1 + note G#, 2 + note A_, 1 + note __, 1 + note A#, 2 + callchannel Music_Pinballgengarstage_gengar_branch_3e280 + intensity $a1 + note D_, 2 + octave 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + vibrato $6, $43 + intensity $b8 + octave 3 + note C#, 1 + note D_, 11 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + loopchannel 0, Music_Pinballgengarstage_gengar_branch_3e1a8 +; 3e25f + +Music_Pinballgengarstage_gengar_branch_3e25f: ; 3e25f + intensity $b8 + octave 3 + note D#, 4 + intensity $91 + octave 2 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + intensity $b8 + octave 3 + note D#, 4 + intensity $a1 + octave 2 + note D#, 2 + octave 3 + note D#, 2 + intensity $18 + note D#, 2 + intensity $b8 + note A_, 6 + endchannel +; 3e280 + +Music_Pinballgengarstage_gengar_branch_3e280: ; 3e280 + intensity $91 + octave 2 + note G#, 2 + note __, 2 + note G#, 2 + note G#, 2 + note B_, 2 + intensity $b8 + octave 3 + note D_, 6 + intensity $91 + octave 2 + note G#, 2 + note __, 2 + note G#, 2 + note G#, 2 + octave 3 + note D_, 2 + intensity $b8 + note F_, 6 + endchannel +; 3e299 + +Music_Pinballgengarstage_gengar_Ch3: ; 3e299 + notetype $6, $22 + octave 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + notetype $6, $32 + note D#, 1 + note __, 1 + notetype $6, $32 + octave 3 + note D#, 1 + note __, 1 + notetype $6, $22 + octave 2 + note D#, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 2 + note D#, 16 + notetype $6, $32 + note D_, 1 + note C#, 1 + note C_, 1 + octave 1 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + notetype $6, $22 + note D#, 16 + notetype $6, $12 + forceoctave $28 + octave 3 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + forceoctave $0 +Music_Pinballgengarstage_gengar_branch_3e2db: ; 3e2db + notetype $6, $22 + octave 1 + note G#, 2 + note G#, 1 + note __, 1 + note G#, 2 + note G#, 1 + note __, 1 + note G#, 2 + note G#, 1 + note __, 1 + note G#, 2 + note G#, 1 + note __, 1 + octave 2 + note F_, 6 + note D_, 6 + octave 1 + note B_, 2 + note __, 2 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + octave 2 + note C_, 6 + octave 1 + note A_, 6 + note F#, 2 + note __, 2 + loopchannel 2, Music_Pinballgengarstage_gengar_branch_3e2db + callchannel Music_Pinballgengarstage_gengar_branch_3e36d + forceoctave $3 + callchannel Music_Pinballgengarstage_gengar_branch_3e36d + forceoctave $8 + callchannel Music_Pinballgengarstage_gengar_branch_3e36d + forceoctave $0 + note E_, 4 + octave 2 + note F#, 1 + note __, 1 + octave 3 + note D#, 4 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note D_, 4 + octave 2 + note E_, 1 + note __, 1 + octave 3 + note C#, 4 + octave 2 + note D#, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 + note A_, 2 + callchannel Music_Pinballgengarstage_gengar_branch_3e382 + octave 1 + note D#, 2 + note D#, 1 + note __, 1 + octave 2 + note D#, 2 + octave 1 + note D#, 1 + note __, 1 + octave 2 + note D#, 2 + octave 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 2 + note D#, 2 + octave 1 + note D#, 1 + note __, 1 + note E_, 2 + note F_, 1 + note __, 1 + note F#, 2 + note G_, 1 + note __, 1 + note G#, 2 + note A_, 1 + note __, 1 + note A#, 2 + callchannel Music_Pinballgengarstage_gengar_branch_3e382 + note D_, 2 + octave 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note D_, 2 + octave 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note C#, 1 + note D_, 11 + note C#, 2 + note C_, 2 + octave 1 + note B_, 2 + note A#, 2 + loopchannel 0, Music_Pinballgengarstage_gengar_branch_3e2db +; 3e36d + +Music_Pinballgengarstage_gengar_branch_3e36d: ; 3e36d + octave 2 + note D#, 4 + octave 1 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + note D#, 2 + note D#, 1 + note __, 1 + octave 2 + note D#, 4 + octave 1 + note D#, 2 + octave 2 + note D#, 2 + note __, 2 + note A_, 6 + endchannel +; 3e382 + +Music_Pinballgengarstage_gengar_branch_3e382: ; 3e382 + octave 1 + note G#, 2 + note __, 2 + note G#, 2 + note G#, 2 + note B_, 2 + octave 2 + note D_, 6 + octave 1 + note G#, 2 + note __, 2 + note G#, 2 + note G#, 2 + octave 2 + note D_, 2 + note F_, 6 + endchannel +; 3e393 + +Music_Pinballgengarstage_gengar_Ch4: ; 3e393 + togglenoise $0 + notetype $c + note F_, 16 + note __, 16 +Music_Pinballgengarstage_gengar_branch_3e399: ; 3e399 + callchannel Music_Pinballgengarstage_gengar_branch_3e3c3 + loopchannel 7, Music_Pinballgengarstage_gengar_branch_3e399 + note D_, 2 + note D#, 1 + note D_, 2 + note D#, 1 + note D_, 2 + note D#, 1 + note D_, 2 + note D#, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D_, 1 +Music_Pinballgengarstage_gengar_branch_3e3ac: ; 3e3ac + callchannel Music_Pinballgengarstage_gengar_branch_3e3c3 + loopchannel 3, Music_Pinballgengarstage_gengar_branch_3e3ac + note D#, 2 + note D_, 2 + note D#, 1 + note D#, 1 + note D_, 2 + note D#, 2 + note D_, 1 + note D#, 1 + note C#, 1 + note C#, 1 + note D_, 1 + note D_, 1 + loopchannel 0, Music_Pinballgengarstage_gengar_branch_3e399 +; 3e3c3 + +Music_Pinballgengarstage_gengar_branch_3e3c3: ; 3e3c3 + note D#, 2 + note D_, 2 + note D#, 1 + note D#, 1 + note D_, 2 + note D#, 2 + note D_, 1 + note D#, 2 + note D#, 1 + note D_, 2 + endchannel +; 3e3ce + diff --git a/crysaudio/music/pinball/hiscorescreen.asm b/crysaudio/music/pinball/hiscorescreen.asm new file mode 100644 index 00000000..98d19dcc --- /dev/null +++ b/crysaudio/music/pinball/hiscorescreen.asm @@ -0,0 +1,1170 @@ +Music_Pinballhiscorescreen: ; 41d37 + dbw $c0, Music_Pinballhiscorescreen_Ch1 + dbw $01, Music_Pinballhiscorescreen_Ch2 + dbw $02, Music_Pinballhiscorescreen_Ch3 + dbw $03, Music_Pinballhiscorescreen_Ch4 +; 41d43 + +Music_Pinballhiscorescreen_Ch1: ; 41d43 + tempo 112 + volume $77 + tone $0001 + notetype $c, $b3 + note __, 16 +Music_Pinballhiscorescreen_branch_41d4f: ; 41d4f + notetype $8, $92 + dutycycle $2 + callchannel Music_Pinballhiscorescreen_branch_41e36 + note G#, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note F#, 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note E_, 4 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 5 + note F#, 3 + note __, 1 + note F#, 1 + note __, 1 + intensity $82 + callchannel Music_Pinballhiscorescreen_branch_41e36 + note A_, 4 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note G#, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note B_, 4 + note B_, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 1 + note A#, 1 + note __, 5 + note A#, 3 + note __, 1 + note B_, 1 + note __, 1 + callchannel Music_Pinballhiscorescreen_branch_41e36 + note A_, 4 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note G#, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note B_, 4 + note B_, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 1 + note A#, 1 + note __, 3 + intensity $84 + octave 4 + note E_, 2 + note G#, 4 + note __, 2 +Music_Pinballhiscorescreen_branch_41db2: ; 41db2 + intensity $81 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + note B_, 4 + note F#, 2 + note B_, 4 + note F#, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note F_, 2 + note G#, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 2 + intensity $91 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + intensity $81 + note A#, 2 + octave 3 + note C#, 2 + note F_, 2 + note A#, 4 + note F_, 2 + note A#, 4 + note F_, 2 + note F#, 2 + note F_, 2 + note E_, 2 + intensity $91 + note D#, 2 + note G#, 2 + note A#, 2 + octave 4 + note D#, 2 + note G#, 2 + note A#, 2 + octave 5 + note D#, 2 + octave 4 + note A#, 2 + note G_, 2 + note D#, 2 + octave 3 + note A#, 2 + note G_, 2 + loopchannel 3, Music_Pinballhiscorescreen_branch_41db2 + intensity $81 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + note B_, 4 + note F#, 2 + note B_, 4 + note F#, 2 + note E_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note F_, 2 + note G#, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 2 + octave 4 + note C#, 4 + octave 3 + note G#, 2 + intensity $91 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + intensity $81 + note A#, 2 + octave 3 + note C#, 2 + note F_, 2 + note A#, 4 + note F_, 2 + note A#, 4 + note F_, 2 + note F#, 2 + note F_, 2 + note E_, 2 + intensity $91 + note D#, 2 + note G_, 2 + note A#, 2 + octave 4 + note D#, 2 + note G_, 2 + intensity $94 + note A#, 9 + intensity $54 + note A_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + loopchannel 0, Music_Pinballhiscorescreen_branch_41d4f +; 41e36 + +Music_Pinballhiscorescreen_branch_41e36: ; 41e36 + octave 3 + note G#, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note F#, 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note G#, 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + note F#, 1 + note __, 5 + note F#, 4 + note F#, 1 + note __, 1 + loopchannel 3, Music_Pinballhiscorescreen_branch_41e36 + endchannel +; 41e56 + +Music_Pinballhiscorescreen_Ch2: ; 41e56 + vibrato $12, $34 + notetype $c, $b3 + note __, 16 +Music_Pinballhiscorescreen_branch_41e5d: ; 41e5d + dutycycle $2 + notetype $8, $a2 + callchannel Music_Pinballhiscorescreen_branch_41fd5 + callchannel Music_Pinballhiscorescreen_branch_41fd5 + forceoctave $2 + callchannel Music_Pinballhiscorescreen_branch_41fd5 + forceoctave $0 + intensity $a2 + note E_, 4 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a2 + note E_, 1 + intensity $28 + note E_, 1 + note __, 2 + intensity $a2 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a2 + note D_, 4 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a2 + note D_, 1 + intensity $28 + note D_, 1 + note __, 2 + intensity $a2 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a2 + note C#, 4 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + note __, 2 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + note __, 4 + dutycycle $3 + intensity $98 + note D_, 3 + intensity $88 + note G_, 1 + note G#, 1 + note A_, 1 + notetype $c, $a8 + note A#, 16 + notetype $8, $98 + note A#, 2 + intensity $48 + note A#, 2 + note __, 2 + intensity $98 + note B_, 4 + note C#, 2 + note A#, 4 + note B_, 4 + note __, 2 + intensity $68 + note B_, 1 + octave 5 + note C_, 1 + intensity $98 + note C#, 12 + note C#, 4 + octave 4 + note B_, 2 + note A#, 4 + note F#, 4 + intensity $38 + note F#, 2 + note __, 13 + intensity $68 + note F_, 1 + intensity $98 + note F#, 4 + octave 5 + note D#, 2 + notetype $c, $a8 + note D#, 16 + notetype $8, $a8 + intensity $48 + note D#, 2 + note __, 4 + intensity $98 + note D#, 6 + note C#, 6 + octave 4 + note A#, 6 + note F#, 16 + note G#, 2 + note A_, 4 + note G#, 14 + intensity $48 + note G#, 2 + note __, 2 + intensity $98 + note A#, 2 + note B_, 4 + note A#, 2 + notetype $c, $98 + note A#, 16 + intensity $48 + note A#, 2 + note __, 2 + notetype $8, $98 + note B_, 4 + intensity $48 + note B_, 2 + intensity $98 + note A#, 4 + note B_, 4 + intensity $48 + note B_, 2 + intensity $68 + note B_, 1 + octave 5 + note C_, 1 + intensity $98 + note C#, 16 + octave 4 + note B_, 2 + note A#, 4 + note F#, 4 + intensity $58 + note F_, 1 + note E_, 1 + intensity $48 + note D#, 1 + note D_, 1 + intensity $28 + note D_, 2 + note __, 9 + intensity $68 + note F_, 1 + intensity $98 + note F#, 4 + octave 5 + note D#, 2 + notetype $c, $98 + note D#, 16 + notetype $8, $98 + note D#, 2 + intensity $48 + note D#, 2 + note __, 2 + intensity $98 + note D#, 4 + octave 4 + note F#, 1 + intensity $48 + note F#, 1 + intensity $98 + octave 5 + note C#, 4 + octave 4 + note F#, 1 + intensity $48 + note F#, 1 + intensity $98 + note A#, 4 + intensity $48 + note A#, 1 + intensity $68 + note F_, 1 + intensity $98 + note F#, 16 + note G#, 2 + note A_, 4 + note G#, 14 + intensity $48 + note G#, 2 + note __, 2 + intensity $98 + dutycycle $2 + note A#, 2 + note B_, 4 + intensity $58 + octave 5 + note C#, 1 + note D_, 1 + callchannel Music_Pinballhiscorescreen_branch_42021 + callchannel Music_Pinballhiscorescreen_branch_42047 + callchannel Music_Pinballhiscorescreen_branch_42021 + intensity $a8 + note C#, 4 + intensity $a1 + note C_, 2 + note C#, 4 + octave 4 + note A#, 2 + note __, 6 + intensity $a8 + octave 5 + note G#, 5 + intensity $48 + note G#, 1 + intensity $a8 + note G_, 1 + note G#, 9 + intensity $a1 + note G_, 2 + note __, 4 + intensity $a8 + note G#, 2 + note A#, 1 + intensity $28 + note A#, 1 + note __, 2 + intensity $a8 + octave 6 + note D#, 2 + dutycycle $3 + callchannel Music_Pinballhiscorescreen_branch_42021 + callchannel Music_Pinballhiscorescreen_branch_42047 + callchannel Music_Pinballhiscorescreen_branch_42021 + intensity $a8 + note C#, 4 + intensity $a1 + note C_, 2 + note C#, 4 + octave 4 + note A#, 2 + note __, 6 + intensity $a8 + note G_, 1 + note G#, 5 + intensity $a2 + note G_, 2 + note __, 2 + note G#, 2 + note A#, 2 + note __, 2 + intensity $a8 + octave 5 + note D#, 9 + intensity $64 + note D_, 1 + note C#, 1 + note C_, 1 + octave 4 + note B_, 1 + note A#, 1 + loopchannel 0, Music_Pinballhiscorescreen_branch_41e5d +; 41fd5 + +Music_Pinballhiscorescreen_branch_41fd5: ; 41fd5 + intensity $a2 + octave 4 + note C#, 4 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + note __, 2 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a2 + note C#, 4 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + note __, 2 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a2 + note C#, 4 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + note __, 2 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a2 + note C#, 1 + intensity $28 + note C#, 1 + note __, 4 + intensity $a2 + note C#, 4 + note C#, 1 + intensity $28 + note C#, 1 + endchannel +; 42021 + +Music_Pinballhiscorescreen_branch_42021: ; 42021 + intensity $a8 + octave 5 + note D#, 4 + intensity $a1 + note C#, 2 + note D#, 4 + octave 4 + note B_, 2 + note __, 6 + intensity $a8 + octave 5 + note F#, 4 + intensity $78 + note D#, 1 + note E_, 1 + intensity $a8 + note F_, 4 + intensity $a1 + note D#, 2 + note F_, 4 + note C#, 2 + note __, 6 + intensity $a8 + octave 4 + note A#, 4 + intensity $78 + note B_, 1 + octave 5 + note C_, 1 + endchannel +; 42047 + +Music_Pinballhiscorescreen_branch_42047: ; 42047 + intensity $a8 + note C#, 4 + intensity $a1 + note C_, 2 + note C#, 4 + octave 4 + note A#, 2 + note __, 6 + intensity $a8 + octave 5 + note G#, 5 + intensity $78 + note G_, 1 + intensity $a8 + note G#, 4 + intensity $a1 + note A#, 2 + note G#, 4 + intensity $a8 + note G_, 8 + intensity $48 + note G_, 2 + note __, 2 + intensity $78 + note C#, 1 + note D_, 1 + endchannel +; 4206b + +Music_Pinballhiscorescreen_Ch3: ; 4206b + notetype $c, $22 + note __, 16 + notetype $8, $22 +Music_Pinballhiscorescreen_branch_42072: ; 42072 + forceoctave $2 + callchannel Music_Pinballhiscorescreen_branch_42153 + forceoctave $0 + callchannel Music_Pinballhiscorescreen_branch_42153 + callchannel Music_Pinballhiscorescreen_branch_4219a + octave 2 + note D_, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note F#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + note B_, 4 + note __, 2 + octave 2 + note C#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note D_, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note C#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + note B_, 1 + note __, 5 + octave 2 + note D_, 3 + note __, 1 + note D_, 1 + note __, 1 + forceoctave $2 + callchannel Music_Pinballhiscorescreen_branch_42153 + forceoctave $0 + callchannel Music_Pinballhiscorescreen_branch_42153 + callchannel Music_Pinballhiscorescreen_branch_4219a + callchannel Music_Pinballhiscorescreen_branch_421e1 + octave 2 + note B_, 4 + note __, 2 + octave 3 + note E_, 4 + notetype $8, $32 + octave 2 + note E_, 1 + note __, 1 + notetype $8, $22 + forceoctave $2 + callchannel Music_Pinballhiscorescreen_branch_42153 + forceoctave $0 + callchannel Music_Pinballhiscorescreen_branch_42153 + callchannel Music_Pinballhiscorescreen_branch_4219a + callchannel Music_Pinballhiscorescreen_branch_421e1 + note B_, 4 + octave 3 + note E_, 2 + octave 2 + note B_, 4 + note E_, 1 + note __, 1 + callchannel Music_Pinballhiscorescreen_branch_42219 + callchannel Music_Pinballhiscorescreen_branch_42244 + note D#, 1 + note __, 3 + octave 1 + note G_, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 3 + note G_, 1 + note __, 1 + callchannel Music_Pinballhiscorescreen_branch_42219 + callchannel Music_Pinballhiscorescreen_branch_42244 + note D#, 1 + note __, 3 + octave 5 + note D#, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 2 + callchannel Music_Pinballhiscorescreen_branch_42219 + callchannel Music_Pinballhiscorescreen_branch_42244 + note D#, 1 + note __, 3 + octave 1 + note G_, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 3 + note G_, 1 + note __, 1 + callchannel Music_Pinballhiscorescreen_branch_42219 + octave 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 3 + note F_, 1 + note __, 1 + note A#, 1 + note __, 3 + note B_, 1 + note __, 1 + octave 2 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 3 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 3 + note G_, 1 + note __, 1 + loopchannel 0, Music_Pinballhiscorescreen_branch_42072 +; 42153 + +Music_Pinballhiscorescreen_branch_42153: ; 42153 + octave 2 + note E_, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note G#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + note B_, 4 + note __, 2 + octave 2 + note C#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note E_, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note C#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + note B_, 4 + note __, 2 + octave 2 + note G#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + endchannel +; 4219a + +Music_Pinballhiscorescreen_branch_4219a: ; 4219a + octave 2 + note D#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note F#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + note B_, 4 + note __, 2 + octave 2 + note C#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note D#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note C#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + note B_, 4 + note __, 2 + octave 2 + note B_, 4 + notetype $8, $32 + octave 1 + note A#, 1 + note __, 1 + notetype $8, $22 + endchannel +; 421e1 + +Music_Pinballhiscorescreen_branch_421e1: ; 421e1 + octave 2 + note D_, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note F#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + note A_, 4 + note __, 2 + note B_, 4 + notetype $8, $32 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note E_, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note G#, 4 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + notetype $8, $22 + endchannel +; 42219 + +Music_Pinballhiscorescreen_branch_42219: ; 42219 + octave 1 + note B_, 2 + note __, 2 + note B_, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 3 + note F#, 1 + note __, 1 + note B_, 1 + note __, 3 + octave 2 + note C_, 1 + note __, 1 + note C#, 2 + note __, 2 + note C#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 1 + note __, 3 + octave 1 + note G#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 3 + note C_, 1 + note __, 1 + endchannel +; 42244 + +Music_Pinballhiscorescreen_branch_42244: ; 42244 + octave 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 3 + note F_, 1 + note __, 1 + note A#, 1 + note __, 3 + note B_, 1 + note __, 1 + octave 2 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + endchannel +; 42265 + +Music_Pinballhiscorescreen_Ch4: ; 42265 + togglenoise $1 + notetype $8 + note D_, 4 + note C#, 2 + note D_, 4 + note C#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note D_, 4 + note D_, 2 +Music_Pinballhiscorescreen_branch_42272: ; 42272 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + callchannel Music_Pinballhiscorescreen_branch_42309 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + note D_, 4 + note D_, 2 + note D#, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 2 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + callchannel Music_Pinballhiscorescreen_branch_42309 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + note D#, 4 + note F_, 2 + note D_, 2 + note D_, 2 + note F_, 2 + note D#, 4 + note D_, 2 + note D_, 4 + note D_, 2 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + callchannel Music_Pinballhiscorescreen_branch_42309 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + note D#, 4 + note F_, 2 + note D_, 4 + note F_, 6 + note D_, 2 + note D_, 4 + note D_, 2 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + note D#, 4 + note F_, 2 + note D_, 2 + note D_, 2 + note F_, 2 + note D#, 4 + note D#, 2 + note D_, 2 + note D_, 2 + note D_, 2 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + callchannel Music_Pinballhiscorescreen_branch_42313 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + callchannel Music_Pinballhiscorescreen_branch_42313 + callchannel Music_Pinballhiscorescreen_branch_422ee + callchannel Music_Pinballhiscorescreen_branch_42300 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + note D_, 4 + note D_, 2 + loopchannel 0, Music_Pinballhiscorescreen_branch_42272 +; 422ee + +Music_Pinballhiscorescreen_branch_422ee: ; 422ee + note D#, 4 + note F_, 2 + note D_, 4 + note F_, 2 + note D#, 4 + note D#, 2 + note D_, 4 + note D_, 2 + note D#, 4 + note F_, 2 + note D_, 2 + note D_, 2 + note F_, 2 + note D#, 4 + note D#, 2 + note D_, 4 + note D#, 2 + endchannel +; 42300 + +Music_Pinballhiscorescreen_branch_42300: ; 42300 + note D#, 4 + note F_, 2 + note D_, 4 + note F_, 2 + note D#, 4 + note F_, 2 + note D_, 4 + note F_, 2 + endchannel +; 42309 + +Music_Pinballhiscorescreen_branch_42309: ; 42309 + note D#, 4 + note F_, 2 + note D_, 2 + note D_, 2 + note F_, 2 + note D#, 4 + note D#, 2 + note D_, 4 + note D#, 2 + endchannel +; 42313 + +Music_Pinballhiscorescreen_branch_42313: ; 42313 + note D#, 4 + note F_, 2 + note D_, 2 + note D_, 2 + note F_, 2 + note D#, 4 + note D#, 2 + note D_, 4 + note D_, 2 + endchannel +; 4231d + + diff --git a/crysaudio/music/pinball/hurryup_blue.asm b/crysaudio/music/pinball/hurryup_blue.asm new file mode 100644 index 00000000..cffa3968 --- /dev/null +++ b/crysaudio/music/pinball/hurryup_blue.asm @@ -0,0 +1,268 @@ +Music_Pinballhurryup_blue: ; 42413 + dbw $80, Music_Pinballhurryup_blue_Ch1 + dbw $01, Music_Pinballhurryup_blue_Ch2 + dbw $02, Music_Pinballhurryup_blue_Ch3 +; 4241c + +Music_Pinballhurryup_blue_Ch1: ; 4241c + tempo 117 + volume $77 + dutycycle $2 + tone $0001 + notetype $c, $98 + octave 3 + note A_, 1 + note A#, 1 + note B_, 1 + note __, 1 + note A#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + intensity $a8 + note D_, 2 + note F_, 2 +Music_Pinballhurryup_blue_branch_4243c: ; 4243c + intensity $91 + note __, 2 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 2 + note __, 2 + note E_, 4 + note E_, 4 + note E_, 3 + note E_, 1 + note F_, 1 + note E_, 1 + note __, 2 + note F_, 3 + note G_, 1 + note F_, 4 + note F_, 3 + note D_, 1 + note F_, 1 + note D_, 1 + note __, 2 + note G_, 3 + note A_, 1 + note G_, 4 + note G_, 6 + loopchannel 0, Music_Pinballhurryup_blue_branch_4243c +; 4245b + +Music_Pinballhurryup_blue_Ch2: ; 4245b + dutycycle $2 + vibrato $9, $33 + notetype $c, $a8 + octave 4 + note E_, 1 + note F_, 1 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note F#, 1 + intensity $28 + note F#, 1 + intensity $a8 + note F_, 1 + intensity $28 + note F_, 1 + intensity $a8 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a8 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + note C_, 1 + intensity $28 + note C_, 1 + intensity $a8 + octave 3 + note B_, 2 + octave 4 + note D_, 2 +Music_Pinballhurryup_blue_branch_42490: ; 42490 + dutycycle $2 + callchannel Music_Pinballhurryup_blue_branch_424b4 + callchannel Music_Pinballhurryup_blue_branch_424ba + callchannel Music_Pinballhurryup_blue_branch_424b4 + callchannel Music_Pinballhurryup_blue_branch_424ba + callchannel Music_Pinballhurryup_blue_branch_424b4 + dutycycle $3 + callchannel Music_Pinballhurryup_blue_branch_424ba + dutycycle $2 + callchannel Music_Pinballhurryup_blue_branch_424b4 + dutycycle $3 + callchannel Music_Pinballhurryup_blue_branch_424ba + loopchannel 0, Music_Pinballhurryup_blue_branch_42490 +; 424b4 + +Music_Pinballhurryup_blue_branch_424b4: ; 424b4 + octave 1 + note D_, 1 + intensity $28 + note D_, 1 + endchannel +; 424ba + +Music_Pinballhurryup_blue_branch_424ba: ; 424ba + intensity $a3 + octave 4 + note G_, 2 + intensity $a1 + octave 3 + note B_, 1 + intensity $a3 + octave 4 + note F_, 2 + intensity $a1 + octave 3 + note A_, 1 + intensity $a3 + octave 4 + note E_, 2 + intensity $a1 + octave 3 + note G_, 1 + intensity $a3 + octave 4 + note D#, 2 + intensity $a1 + octave 3 + note A_, 1 + intensity $a3 + octave 4 + note F_, 2 + note E_, 3 + note D#, 1 + note D_, 2 + note E_, 4 + note D#, 1 + intensity $28 + note D#, 1 + intensity $a3 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F_, 3 + note E_, 1 + note D_, 2 + note F_, 4 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a3 + note F_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note E_, 3 + note D#, 1 + note D_, 2 + note E_, 4 + note D#, 2 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + endchannel +; 42507 + +Music_Pinballhurryup_blue_Ch3: ; 42507 + notetype $c, $22 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 1 + note B_, 2 + octave 2 + note G_, 2 +Music_Pinballhurryup_blue_branch_4251f: ; 4251f + intensity $12 + note D_, 1 + note __, 3 + intensity $22 + octave 1 + note D_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + note B_, 2 + octave 2 + note C_, 2 + note __, 2 + octave 1 + note G_, 1 + note __, 3 + octave 2 + note C_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note C#, 2 + note D_, 2 + note __, 2 + octave 1 + note G_, 1 + note __, 3 + octave 2 + note D_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + note D#, 2 + note E_, 2 + note __, 2 + octave 1 + note G_, 1 + note __, 3 + octave 2 + note E_, 2 + note E_, 1 + note __, 1 + note D#, 2 + note D_, 2 + loopchannel 0, Music_Pinballhurryup_blue_branch_4251f +; 4255b + diff --git a/crysaudio/music/pinball/hurryup_red.asm b/crysaudio/music/pinball/hurryup_red.asm new file mode 100644 index 00000000..930374f5 --- /dev/null +++ b/crysaudio/music/pinball/hurryup_red.asm @@ -0,0 +1,269 @@ +Music_Pinballhurryup_red: ; 3dca2 + dbw $80, Music_Pinballhurryup_red_Ch1 + dbw $01, Music_Pinballhurryup_red_Ch2 + dbw $02, Music_Pinballhurryup_red_Ch3 +; 3dcab + +Music_Pinballhurryup_red_Ch1: ; 3dcab + tempo 117 + volume $77 + dutycycle $2 + tone $0001 + notetype $c, $98 + octave 3 + note A_, 1 + note A#, 1 + note B_, 1 + note __, 1 + note A#, 1 + note __, 1 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + intensity $a8 + note D_, 2 + note F_, 2 +Music_Pinballhurryup_red_branch_3dccb: ; 3dccb + intensity $91 + note __, 2 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 2 + note __, 2 + note E_, 4 + note E_, 4 + note E_, 3 + note E_, 1 + note F_, 1 + note E_, 1 + note __, 2 + note F_, 3 + note G_, 1 + note F_, 4 + note F_, 3 + note D_, 1 + note F_, 1 + note D_, 1 + note __, 2 + note G_, 3 + note A_, 1 + note G_, 4 + note G_, 6 + loopchannel 0, Music_Pinballhurryup_red_branch_3dccb +; 3dcea + +Music_Pinballhurryup_red_Ch2: ; 3dcea + dutycycle $2 + vibrato $9, $33 + notetype $c, $a8 + octave 4 + note E_, 1 + note F_, 1 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note F#, 1 + intensity $28 + note F#, 1 + intensity $a8 + note F_, 1 + intensity $28 + note F_, 1 + intensity $a8 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a8 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + note C_, 1 + intensity $28 + note C_, 1 + intensity $a8 + octave 3 + note B_, 2 + octave 4 + note D_, 2 +Music_Pinballhurryup_red_branch_3dd1f: ; 3dd1f + dutycycle $2 + callchannel Music_Pinballhurryup_red_branch_3dd43 + callchannel Music_Pinballhurryup_red_branch_3dd49 + callchannel Music_Pinballhurryup_red_branch_3dd43 + callchannel Music_Pinballhurryup_red_branch_3dd49 + callchannel Music_Pinballhurryup_red_branch_3dd43 + dutycycle $3 + callchannel Music_Pinballhurryup_red_branch_3dd49 + dutycycle $2 + callchannel Music_Pinballhurryup_red_branch_3dd43 + dutycycle $3 + callchannel Music_Pinballhurryup_red_branch_3dd49 + loopchannel 0, Music_Pinballhurryup_red_branch_3dd1f +; 3dd43 + +Music_Pinballhurryup_red_branch_3dd43: ; 3dd43 + octave 1 + note D_, 1 + intensity $28 + note D_, 1 + endchannel +; 3dd49 + +Music_Pinballhurryup_red_branch_3dd49: ; 3dd49 + intensity $a3 + octave 4 + note G_, 2 + intensity $a1 + octave 3 + note B_, 1 + intensity $a3 + octave 4 + note F_, 2 + intensity $a1 + octave 3 + note A_, 1 + intensity $a3 + octave 4 + note E_, 2 + intensity $a1 + octave 3 + note G_, 1 + intensity $a3 + octave 4 + note D#, 2 + intensity $a1 + octave 3 + note A_, 1 + intensity $a3 + octave 4 + note F_, 2 + note E_, 3 + note D#, 1 + note D_, 2 + note E_, 4 + note D#, 1 + intensity $28 + note D#, 1 + intensity $a3 + note D_, 1 + note C#, 1 + note D_, 1 + note E_, 1 + note F_, 3 + note E_, 1 + note D_, 2 + note F_, 4 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a3 + note F_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 1 + note E_, 3 + note D#, 1 + note D_, 2 + note E_, 4 + note D#, 2 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + endchannel +; 3dd96 + +Music_Pinballhurryup_red_Ch3: ; 3dd96 + notetype $c, $22 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 1 + note B_, 2 + octave 2 + note G_, 2 +Music_Pinballhurryup_red_branch_3ddae: ; 3ddae + intensity $12 + note D_, 1 + note __, 3 + intensity $22 + octave 1 + note D_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + note B_, 2 + octave 2 + note C_, 2 + note __, 2 + octave 1 + note G_, 1 + note __, 3 + octave 2 + note C_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note C_, 1 + note __, 1 + note C#, 2 + note D_, 2 + note __, 2 + octave 1 + note G_, 1 + note __, 3 + octave 2 + note D_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + note D#, 2 + note E_, 2 + note __, 2 + octave 1 + note G_, 1 + note __, 3 + octave 2 + note E_, 2 + note E_, 1 + note __, 1 + note D#, 2 + note D_, 2 + loopchannel 0, Music_Pinballhurryup_red_branch_3ddae +; 3ddea + + diff --git a/crysaudio/music/pinball/meowthstage.asm b/crysaudio/music/pinball/meowthstage.asm new file mode 100644 index 00000000..522616b6 --- /dev/null +++ b/crysaudio/music/pinball/meowthstage.asm @@ -0,0 +1,1070 @@ +Music_Pinballmeowthstage: ; 496fe + dbw $c0, Music_Pinballmeowthstage_Ch1 + dbw $01, Music_Pinballmeowthstage_Ch2 + dbw $02, Music_Pinballmeowthstage_Ch3 + dbw $03, Music_Pinballmeowthstage_Ch4 +; 4970a + +Music_Pinballmeowthstage_Ch1: ; 4970a + tempo 96 + volume $77 + vibrato $12, $24 + dutycycle $3 + notetype $8, $93 + callchannel Music_Pinballmeowthstage_branch_497e7 +Music_Pinballmeowthstage_branch_4971a: ; 4971a + intensity $91 + octave 3 + note __, 6 + note D#, 4 + octave 2 + note B_, 2 + octave 3 + note D#, 4 + note F#, 8 + note __, 6 + note F#, 4 + note D#, 2 + note F#, 4 + note A#, 8 + note __, 6 + note F#, 4 + note D#, 2 + note A_, 4 + note F#, 2 + note D#, 4 + note C_, 2 + intensity $97 + note D#, 4 + note __, 2 + note C#, 4 + note __, 2 + note C_, 4 + note __, 2 + note C#, 4 + note __, 2 + callchannel Music_Pinballmeowthstage_branch_49804 + intensity $91 + note __, 6 + note G_, 4 + octave 4 + note C#, 2 + octave 3 + note G_, 4 + note E_, 2 + note C#, 4 + note E_, 2 + intensity $97 + note F#, 4 + note __, 2 + note D#, 4 + note __, 2 + note F#, 4 + note __, 2 + note A#, 4 + note __, 2 + intensity $97 + note B_, 4 + note __, 2 + intensity $91 + note D#, 4 + octave 2 + note B_, 2 + octave 3 + note D#, 4 + note F#, 8 + intensity $97 + note A#, 4 + note __, 2 + intensity $91 + note F#, 4 + note D#, 2 + note F#, 4 + note A#, 8 + note D#, 1 + note __, 3 + intensity $97 + note A_, 6 + note __, 2 + intensity $91 + note F#, 6 + note D#, 6 + intensity $97 + note D#, 4 + note __, 2 + note C#, 4 + note __, 2 + note C_, 4 + note __, 2 + note C#, 4 + note __, 2 + callchannel Music_Pinballmeowthstage_branch_49804 + intensity $97 + note A#, 4 + note B_, 2 + octave 4 + note C_, 4 + note C#, 6 + octave 3 + note B_, 2 + note A#, 2 + note __, 2 + intensity $91 + note C#, 2 + octave 4 + note D#, 14 + note __, 10 + callchannel Music_Pinballmeowthstage_branch_49814 + intensity $97 + note B_, 14 + note __, 2 + intensity $91 + note E_, 2 + note B_, 4 + note G#, 2 + intensity $97 + note A#, 8 + note __, 2 + intensity $91 + note G#, 8 + note A#, 6 + intensity $97 + note F#, 14 + note __, 2 + intensity $91 + note E_, 6 + note D#, 2 + intensity $97 + octave 4 + note D#, 12 + note __, 4 + intensity $91 + note E_, 6 + note D#, 2 + callchannel Music_Pinballmeowthstage_branch_49814 + intensity $97 + note E_, 14 + note __, 2 + intensity $91 + note E_, 2 + note F#, 4 + note G#, 2 + intensity $97 + note F_, 8 + note __, 2 + intensity $91 + note E_, 8 + note F_, 6 + notetype $c, $97 + note A#, 12 + notetype $8, $97 + note G#, 2 + note __, 4 + intensity $91 + note F#, 4 + octave 4 + note C#, 6 + intensity $97 + octave 5 + note C#, 10 + note __, 4 + forceoctave $c + callchannel Music_Pinballmeowthstage_branch_497e7 + forceoctave $0 + loopchannel 0, Music_Pinballmeowthstage_branch_4971a +; 497e7 + +Music_Pinballmeowthstage_branch_497e7: ; 497e7 + intensity $91 + octave 2 + note A#, 4 + note B_, 2 + octave 3 + note C_, 4 + intensity $97 + note C#, 4 + note __, 2 + intensity $91 + note C_, 2 + octave 2 + note B_, 4 + note A#, 2 + note __, 4 + intensity $97 + octave 4 + note C#, 4 + note __, 4 + intensity $91 + octave 3 + note A#, 6 + note F#, 6 + endchannel +; 49804 + +Music_Pinballmeowthstage_branch_49804: ; 49804 + intensity $91 + octave 3 + note __, 6 + note C#, 4 + octave 2 + note A#, 2 + octave 3 + note C#, 4 + note E_, 8 + note __, 6 + note E_, 4 + note C#, 2 + note E_, 4 + note G#, 8 + endchannel +; 49814 + +Music_Pinballmeowthstage_branch_49814: ; 49814 + intensity $91 + octave 4 + note G_, 4 + note G#, 2 + note A#, 4 + intensity $97 + note A#, 6 + intensity $91 + note G#, 2 + note G_, 4 + octave 3 + note A#, 2 + octave 4 + note C#, 4 + note D#, 2 + note C#, 4 + octave 3 + note B_, 6 + note A#, 6 + note B_, 2 + octave 4 + note G_, 4 + note G#, 2 + note A#, 4 + intensity $97 + octave 5 + note C#, 6 + intensity $91 + octave 4 + note A#, 2 + note A#, 4 + note G_, 2 + octave 3 + note A#, 4 + note B_, 2 + note A#, 4 + note G#, 6 + note G_, 6 + note G#, 2 + endchannel +; 49841 + +Music_Pinballmeowthstage_Ch2: ; 49841 + vibrato $12, $24 + dutycycle $3 + notetype $8, $b3 + callchannel Music_Pinballmeowthstage_branch_4993c +Music_Pinballmeowthstage_branch_4984c: ; 4984c + callchannel Music_Pinballmeowthstage_branch_4995b + callchannel Music_Pinballmeowthstage_branch_499bb + intensity $b1 + octave 4 + note F#, 4 + note C_, 2 + note C#, 4 + note F#, 2 + note C_, 4 + note C#, 2 + note F#, 4 + note C#, 2 + intensity $b7 + note E_, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b7 + octave 4 + note E_, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b7 + octave 4 + note E_, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b7 + octave 4 + note D#, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b7 + octave 4 + note D#, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b7 + octave 4 + note D#, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b7 + octave 4 + note D_, 4 + intensity $18 + note D_, 2 + intensity $b7 + note D#, 4 + intensity $18 + note D#, 1 + intensity $68 + note D_, 1 + callchannel Music_Pinballmeowthstage_branch_4995b + callchannel Music_Pinballmeowthstage_branch_499bb + intensity $b7 + octave 4 + note F#, 4 + note G#, 2 + note A_, 4 + note A#, 6 + note G#, 2 + note F#, 2 + intensity $18 + note F#, 2 + intensity $b1 + octave 3 + note F#, 2 + octave 4 + note B_, 4 + intensity $78 + octave 2 + note F#, 1 + note __, 1 + note F#, 3 + intensity $18 + note F#, 2 + note __, 1 + intensity $78 + note G#, 4 + intensity $18 + note G#, 2 + intensity $78 + note A_, 4 + intensity $18 + note A_, 1 + intensity $78 + octave 4 + note A_, 1 + callchannel Music_Pinballmeowthstage_branch_499e5 + intensity $b7 + note G#, 14 + intensity $18 + note G#, 2 + intensity $b1 + note C#, 2 + note G#, 4 + note E_, 2 + intensity $b7 + note F#, 8 + intensity $18 + note F#, 2 + intensity $b1 + note E_, 8 + note F#, 6 + intensity $b7 + note D#, 14 + intensity $18 + note D#, 2 + intensity $b1 + note C#, 6 + octave 3 + note B_, 2 + intensity $b7 + octave 4 + note B_, 12 + intensity $18 + note B_, 2 + note __, 2 + intensity $b1 + octave 5 + note C#, 6 + octave 4 + note B_, 2 + callchannel Music_Pinballmeowthstage_branch_499e5 + intensity $b7 + note G#, 14 + intensity $18 + note G#, 2 + intensity $b1 + note G#, 2 + note A#, 4 + note B_, 2 + intensity $b7 + note B_, 8 + intensity $18 + note B_, 2 + intensity $b1 + note A#, 8 + note B_, 6 + notetype $c, $b7 + octave 5 + note C#, 12 + notetype $8, $b7 + octave 4 + note B_, 2 + intensity $18 + note B_, 2 + note __, 2 + intensity $b1 + note A#, 4 + note F#, 6 + intensity $b7 + octave 5 + note F#, 10 + intensity $18 + note F#, 2 + note __, 2 + forceoctave $c + callchannel Music_Pinballmeowthstage_branch_4993c + forceoctave $0 + loopchannel 0, Music_Pinballmeowthstage_branch_4984c +; 4993c + +Music_Pinballmeowthstage_branch_4993c: ; 4993c + intensity $b1 + octave 3 + note F#, 4 + note G#, 2 + note A_, 4 + intensity $b7 + note A#, 4 + intensity $18 + note A#, 2 + intensity $b1 + note A_, 2 + note G#, 4 + note F#, 2 + note __, 4 + intensity $b7 + octave 4 + note F#, 4 + intensity $18 + note F#, 2 + note __, 2 + intensity $b1 + note E_, 6 + note C#, 6 + endchannel +; 4995b + +Music_Pinballmeowthstage_branch_4995b: ; 4995b + intensity $b7 + octave 4 + note D#, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b7 + octave 4 + note D#, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b7 + octave 4 + note D#, 1 + intensity $68 + octave 3 + note B_, 1 + intensity $b1 + octave 4 + note D_, 4 + note D#, 2 + note G#, 4 + note D_, 2 + note D#, 4 + note G#, 2 + note D_, 4 + note D#, 2 + note G#, 4 + note D_, 2 + note D#, 4 + note G#, 2 + note D_, 4 + note D#, 2 + note G#, 4 + note D_, 2 + note D#, 4 + note G#, 2 + note D_, 4 + note D#, 2 + note G#, 4 + note D#, 2 + intensity $b7 + note F#, 1 + intensity $68 + note C#, 1 + intensity $b7 + note F#, 1 + intensity $68 + note C#, 1 + intensity $b1 + note F#, 2 + note E_, 1 + intensity $68 + note C#, 1 + intensity $b7 + note E_, 1 + intensity $68 + note C#, 1 + intensity $b7 + note E_, 1 + intensity $68 + note C#, 1 + intensity $b7 + note D#, 4 + intensity $18 + note D#, 2 + intensity $b7 + note E_, 4 + intensity $18 + note E_, 1 + intensity $68 + note C_, 1 + endchannel +; 499bb + +Music_Pinballmeowthstage_branch_499bb: ; 499bb + intensity $b7 + octave 4 + note C#, 1 + intensity $68 + octave 3 + note A#, 1 + intensity $b7 + octave 4 + note C#, 1 + intensity $68 + octave 3 + note A#, 1 + intensity $b7 + octave 4 + note C#, 1 + intensity $68 + octave 3 + note A#, 1 + intensity $b1 + octave 4 + note C_, 4 + note C#, 2 + note F#, 4 + note C_, 2 + note C#, 4 + note F#, 2 + note C_, 4 + note C#, 2 + note F#, 4 + note C_, 2 + note C#, 4 + note F#, 2 + note C_, 4 + note C#, 2 + endchannel +; 499e5 + +Music_Pinballmeowthstage_branch_499e5: ; 499e5 + intensity $b1 + octave 4 + note A#, 4 + note B_, 2 + octave 5 + note C#, 4 + intensity $b7 + note C#, 6 + intensity $b1 + octave 4 + note B_, 2 + note A#, 4 + note D#, 1 + intensity $78 + note A_, 1 + intensity $b1 + note A#, 4 + note B_, 2 + note A#, 4 + note G#, 6 + note G_, 6 + note G#, 1 + intensity $78 + note A_, 1 + intensity $b1 + note A#, 4 + note B_, 2 + octave 5 + note C#, 4 + intensity $b7 + note E_, 6 + intensity $b1 + note D#, 2 + note C#, 4 + octave 4 + note A#, 2 + octave 5 + note C#, 4 + note D#, 2 + note C#, 4 + octave 4 + note B_, 6 + note A#, 6 + note B_, 2 + endchannel +; 49a1b + +Music_Pinballmeowthstage_Ch3: ; 49a1b + notetype $8, $22 + callchannel Music_Pinballmeowthstage_branch_49add +Music_Pinballmeowthstage_branch_49a21: ; 49a21 + callchannel Music_Pinballmeowthstage_branch_49af9 + octave 3 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note G_, 2 + note __, 2 + note F#, 1 + note __, 1 + note E_, 2 + note __, 2 + note C#, 1 + note __, 1 + octave 1 + note B_, 4 + note __, 2 + octave 2 + note D#, 4 + note __, 2 + note F#, 4 + note __, 2 + note A#, 4 + note __, 2 + callchannel Music_Pinballmeowthstage_branch_49af9 + octave 2 + note A#, 4 + note B_, 2 + octave 3 + note C_, 4 + note C#, 6 + octave 2 + note B_, 2 + note A#, 2 + note __, 2 + octave 1 + note A#, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note F#, 1 + note __, 1 + note F#, 3 + note __, 3 + note G#, 4 + note __, 2 + note A_, 4 + note __, 2 + callchannel Music_Pinballmeowthstage_branch_49b66 + octave 2 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note G#, 6 + note __, 6 + note F#, 2 + note __, 2 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note A#, 6 + note __, 6 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note F#, 4 + note E_, 2 + note D#, 4 + note F#, 2 + octave 1 + note B_, 1 + note __, 2 + intensity $32 + octave 2 + note G#, 1 + intensity $22 + note A_, 8 + note G#, 2 + note __, 4 + note F#, 2 + note __, 4 + callchannel Music_Pinballmeowthstage_branch_49b66 + octave 2 + note B_, 2 + note __, 2 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 6 + note __, 6 + note B_, 2 + note __, 2 + note B_, 1 + note __, 1 + note F_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F_, 1 + note __, 1 + note G#, 4 + note G_, 2 + note G#, 4 + note A_, 2 + note F#, 2 + note __, 2 + note F#, 1 + note __, 1 + note F_, 4 + note __, 2 + note E_, 4 + note __, 2 + note D#, 4 + note __, 2 + note C#, 4 + note __, 2 + octave 1 + note B_, 4 + note __, 2 + note A#, 4 + note __, 2 + octave 2 + note C#, 4 + note __, 2 + forceoctave $c + callchannel Music_Pinballmeowthstage_branch_49add + forceoctave $0 + loopchannel 0, Music_Pinballmeowthstage_branch_49a21 +; 49add + +Music_Pinballmeowthstage_branch_49add: ; 49add + octave 1 + note F#, 1 + note __, 3 + octave 2 + note C#, 1 + note __, 1 + note D#, 1 + note __, 3 + note E_, 4 + note __, 2 + note D#, 1 + note __, 1 + note C#, 1 + note __, 3 + octave 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 4 + note __, 2 + note G_, 1 + note __, 1 + note G#, 1 + note __, 5 + note A#, 1 + note __, 5 + endchannel +; 49af9 + +Music_Pinballmeowthstage_branch_49af9: ; 49af9 + octave 1 + note B_, 2 + note __, 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 2 + note D#, 2 + note __, 2 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D#, 2 + note __, 2 + note F#, 1 + note __, 1 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + note A#, 2 + note __, 2 + note G#, 1 + note __, 1 + note F#, 2 + note __, 2 + note E_, 1 + note __, 1 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 2 + note __, 2 + note F#, 1 + note __, 1 + note E_, 2 + note __, 2 + note D#, 1 + note __, 1 + note C#, 4 + note __, 2 + note E_, 4 + note __, 2 + note G#, 4 + note __, 2 + note E_, 4 + note __, 2 + note C#, 2 + note __, 2 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + note F#, 2 + note __, 2 + note C#, 1 + note __, 1 + note F#, 2 + note __, 2 + note A#, 1 + note __, 1 + note C#, 2 + note __, 2 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note C#, 2 + note __, 2 + octave 2 + note A#, 1 + note __, 1 + note A_, 2 + note __, 2 + note A#, 1 + note __, 1 + endchannel +; 49b66 + +Music_Pinballmeowthstage_branch_49b66: ; 49b66 + octave 2 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + note G_, 4 + note __, 2 + note A#, 4 + note __, 2 + octave 3 + note D#, 4 + note __, 2 + octave 2 + note G#, 4 + note __, 2 + note G_, 4 + note __, 2 + note F#, 4 + note __, 2 + note F_, 4 + note __, 2 + note G_, 4 + note __, 2 + note D#, 1 + note __, 3 + note G_, 2 + note __, 4 + note A#, 2 + note __, 4 + octave 3 + note D#, 2 + octave 2 + note G#, 4 + note __, 2 + note G_, 4 + note __, 2 + note F#, 4 + note __, 2 + note F_, 4 + note __, 2 + endchannel +; 49b8f + +Music_Pinballmeowthstage_Ch4: ; 49b8f + togglenoise $1 + notetype $c + note C_, 16 + note __, 8 + notetype $8 + note G_, 2 + note G_, 2 + note G_, 2 + note G#, 4 + note G_, 2 +Music_Pinballmeowthstage_branch_49b9c: ; 49b9c + callchannel Music_Pinballmeowthstage_branch_49bf0 + callchannel Music_Pinballmeowthstage_branch_49bf9 +Music_Pinballmeowthstage_branch_49ba2: ; 49ba2 + callchannel Music_Pinballmeowthstage_branch_49bf0 + loopchannel 7, Music_Pinballmeowthstage_branch_49ba2 + callchannel Music_Pinballmeowthstage_branch_49bf9 +Music_Pinballmeowthstage_branch_49bac: ; 49bac + callchannel Music_Pinballmeowthstage_branch_49bf0 + loopchannel 5, Music_Pinballmeowthstage_branch_49bac + notetype $c + note G_, 16 + notetype $8 + callchannel Music_Pinballmeowthstage_branch_49bf0 + callchannel Music_Pinballmeowthstage_branch_49bf9 + callchannel Music_Pinballmeowthstage_branch_49bf0 + callchannel Music_Pinballmeowthstage_branch_49bf9 +Music_Pinballmeowthstage_branch_49bc4: ; 49bc4 + callchannel Music_Pinballmeowthstage_branch_49bf0 + loopchannel 3, Music_Pinballmeowthstage_branch_49bc4 + callchannel Music_Pinballmeowthstage_branch_49bf9 + callchannel Music_Pinballmeowthstage_branch_49bf0 + callchannel Music_Pinballmeowthstage_branch_49bf9 + callchannel Music_Pinballmeowthstage_branch_49bf0 + callchannel Music_Pinballmeowthstage_branch_49bf9 +Music_Pinballmeowthstage_branch_49bda: ; 49bda + callchannel Music_Pinballmeowthstage_branch_49bf0 + loopchannel 4, Music_Pinballmeowthstage_branch_49bda + notetype $c + note __, 16 + note __, 8 + notetype $8 + note G_, 2 + note G_, 2 + note G_, 2 + note G#, 4 + note G_, 2 + loopchannel 0, Music_Pinballmeowthstage_branch_49b9c +; 49bf0 + +Music_Pinballmeowthstage_branch_49bf0: ; 49bf0 + note G#, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G#, 4 + note G_, 2 + note G_, 4 + note G_, 2 + endchannel +; 49bf9 + +Music_Pinballmeowthstage_branch_49bf9: ; 49bf9 + note G_, 1 + note G_, 1 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G#, 4 + note G_, 2 + note G_, 4 + note G_, 2 + endchannel +; 49c04 + diff --git a/crysaudio/music/pinball/mewtwostage.asm b/crysaudio/music/pinball/mewtwostage.asm new file mode 100644 index 00000000..57cba01f --- /dev/null +++ b/crysaudio/music/pinball/mewtwostage.asm @@ -0,0 +1,1369 @@ +Music_Pinballmewtwostage: ; 48cb9 + dbw $c0, Music_Pinballmewtwostage_Ch1 + dbw $01, Music_Pinballmewtwostage_Ch2 + dbw $02, Music_Pinballmewtwostage_Ch3 + dbw $03, Music_Pinballmewtwostage_Ch4 +; 48cc5 + +Music_Pinballmewtwostage_Ch1: ; 48cc5 + tempo 112 + volume $77 + dutycycle $2 + notetype $c, $48 + note __, 16 + note __, 16 + note __, 16 + note __, 16 +Music_Pinballmewtwostage_branch_48cd3: ; 48cd3 + notetype $c, $48 + soundinput $88 + intensity $48 + octave 4 + note C_, 1 + note D_, 1 + note C_, 1 + note D_, 1 + intensity $58 + note C_, 1 + note D_, 1 + intensity $68 + note C_, 1 + note D_, 1 + intensity $78 + note C_, 1 + note D_, 1 + intensity $88 + note C_, 1 + note D_, 1 + intensity $98 + note C_, 1 + note D_, 1 + intensity $b8 + note C_, 1 + note D_, 1 + intensity $c1 + callchannel Music_Pinballmewtwostage_branch_48e46 + callchannel Music_Pinballmewtwostage_branch_48e5c + callchannel Music_Pinballmewtwostage_branch_48e46 + soundinput $ab + octave 2 + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + callchannel Music_Pinballmewtwostage_branch_48dc4 + intensity $c1 + callchannel Music_Pinballmewtwostage_branch_48e46 + callchannel Music_Pinballmewtwostage_branch_48ddc + callchannel Music_Pinballmewtwostage_branch_48df4 + callchannel Music_Pinballmewtwostage_branch_48e11 + callchannel Music_Pinballmewtwostage_branch_48ddc + callchannel Music_Pinballmewtwostage_branch_48e20 + callchannel Music_Pinballmewtwostage_branch_48dc4 + intensity $c1 + callchannel Music_Pinballmewtwostage_branch_48e46 + intensity $c1 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 1 + intensity $a1 + soundinput $ad + octave 4 + note F_, 1 + soundinput $ad + note F_, 1 + soundinput $ad + note C#, 1 + note __, 1 + soundinput $ad + octave 3 + note G_, 1 + intensity $c1 + soundinput $ab + octave 2 + note F_, 1 + callchannel Music_Pinballmewtwostage_branch_48e46 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + intensity $b1 + soundinput $ad + octave 4 + note C#, 1 + note __, 1 + soundinput $ad + octave 3 + note G_, 1 + note __, 1 + callchannel Music_Pinballmewtwostage_branch_48dc4 + intensity $c1 + callchannel Music_Pinballmewtwostage_branch_48e46 + callchannel Music_Pinballmewtwostage_branch_48e5c + callchannel Music_Pinballmewtwostage_branch_48e46 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + intensity $b1 + soundinput $ad + octave 4 + note D#, 1 + soundinput $ad + note D#, 1 + soundinput $ad + note C#, 1 + soundinput $ad + note C#, 1 + soundinput $ad + octave 3 + note A#, 1 + soundinput $ad + note A#, 1 + intensity $c1 + soundinput $ab + octave 2 + note F_, 1 + callchannel Music_Pinballmewtwostage_branch_48e46 + callchannel Music_Pinballmewtwostage_branch_48e5c + callchannel Music_Pinballmewtwostage_branch_48e46 + callchannel Music_Pinballmewtwostage_branch_48e5c + callchannel Music_Pinballmewtwostage_branch_48e46 + callchannel Music_Pinballmewtwostage_branch_48ddc + callchannel Music_Pinballmewtwostage_branch_48df4 + callchannel Music_Pinballmewtwostage_branch_48e11 + callchannel Music_Pinballmewtwostage_branch_48ddc + callchannel Music_Pinballmewtwostage_branch_48e20 + callchannel Music_Pinballmewtwostage_branch_48dc4 + loopchannel 0, Music_Pinballmewtwostage_branch_48cd3 +; 48dc4 + +Music_Pinballmewtwostage_branch_48dc4: ; 48dc4 + notetype $8, $b1 + soundinput $ad + octave 4 + note D#, 1 + soundinput $ad + note D#, 1 + soundinput $ad + note D#, 1 + notetype $c, $b1 + soundinput $ad + octave 3 + note B_, 1 + soundinput $ad + note F#, 1 + endchannel +; 48ddc + +Music_Pinballmewtwostage_branch_48ddc: ; 48ddc + intensity $c1 + soundinput $ab + octave 2 + note F_, 1 + note __, 1 + intensity $b1 + soundinput $ad + octave 4 + note F_, 1 + note __, 1 + soundinput $ad + octave 3 + note G_, 1 + note __, 1 + soundinput $ad + note C_, 1 + note __, 1 + endchannel +; 48df4 + +Music_Pinballmewtwostage_branch_48df4: ; 48df4 + intensity $c1 + soundinput $ab + octave 2 + note F_, 1 + note __, 1 + dutycycle $0 + intensity $a8 + soundinput $88 + octave 3 + note C#, 1 + note __, 1 + dutycycle $2 + intensity $c1 + soundinput $ab + octave 2 + note F_, 1 + note __, 2 + soundinput $ab + note F_, 1 + endchannel +; 48e11 + +Music_Pinballmewtwostage_branch_48e11: ; 48e11 + intensity $c1 + soundinput $ab + note F_, 1 + note __, 1 + soundinput $ab + note F_, 1 + note __, 1 + soundinput $ab + note F_, 1 + note __, 3 + endchannel +; 48e20 + +Music_Pinballmewtwostage_branch_48e20: ; 48e20 + intensity $c1 + soundinput $ab + note F_, 1 + note __, 1 + dutycycle $0 + intensity $a8 + soundinput $88 + octave 3 + note C#, 1 + note __, 1 + dutycycle $2 + intensity $c1 + soundinput $ab + octave 2 + note F_, 1 + note __, 3 + dutycycle $0 + intensity $a8 + soundinput $88 + octave 3 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + dutycycle $2 + endchannel +; 48e46 + +Music_Pinballmewtwostage_branch_48e46: ; 48e46 + soundinput $ab + octave 2 + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 1 + soundinput $ab + note F_, 1 + note __, 1 + endchannel +; 48e5c + +Music_Pinballmewtwostage_branch_48e5c: ; 48e5c + soundinput $ab + octave 2 + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 3 + soundinput $ab + note F_, 1 + note __, 2 + soundinput $ab + note F_, 1 + endchannel +; 48e71 + +Music_Pinballmewtwostage_Ch2: ; 48e71 + dutycycle $2 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 4 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 4 + callchannel Music_Pinballmewtwostage_branch_49062 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 4 + callchannel Music_Pinballmewtwostage_branch_49033 + callchannel Music_Pinballmewtwostage_branch_49043 + callchannel Music_Pinballmewtwostage_branch_49043 + callchannel Music_Pinballmewtwostage_branch_49043 + callchannel Music_Pinballmewtwostage_branch_49043 + callchannel Music_Pinballmewtwostage_branch_49062 + note __, 4 + intensity $c8 + octave 3 + note C_, 1 + intensity $a8 + octave 2 + note A_, 1 + intensity $78 + note F_, 1 + intensity $48 + note D_, 1 + callchannel Music_Pinballmewtwostage_branch_49033 +Music_Pinballmewtwostage_branch_48ea6: ; 48ea6 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 12 + loopchannel 3, Music_Pinballmewtwostage_branch_48ea6 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 4 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 4 +Music_Pinballmewtwostage_branch_48eb6: ; 48eb6 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 12 + loopchannel 3, Music_Pinballmewtwostage_branch_48eb6 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 8 + callchannel Music_Pinballmewtwostage_branch_49033 +Music_Pinballmewtwostage_branch_48ec5: ; 48ec5 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 12 + loopchannel 3, Music_Pinballmewtwostage_branch_48ec5 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 4 + callchannel Music_Pinballmewtwostage_branch_49033 + note __, 4 +Music_Pinballmewtwostage_branch_48ed5: ; 48ed5 + vibrato $12, $4 + notetype $c, $1e + octave 4 + note G_, 16 + vibrato $12, $43 + callchannel Music_Pinballmewtwostage_branch_48f3f + callchannel Music_Pinballmewtwostage_branch_48fd6 + callchannel Music_Pinballmewtwostage_branch_48fe4 + callchannel Music_Pinballmewtwostage_branch_48fd6 + callchannel Music_Pinballmewtwostage_branch_48ff6 + callchannel Music_Pinballmewtwostage_branch_48f3f + dutycycle $3 + intensity $98 + callchannel Music_Pinballmewtwostage_branch_49018 + notetype $c, $98 + note F#, 12 + note A_, 4 + note A#, 3 + notetype $6, $98 + note D#, 1 + note D_, 1 + notetype $c, $98 + note C#, 2 + note D_, 2 + intensity $28 + note D_, 2 + intensity $18 + note D_, 2 + note __, 4 + notetype $6, $98 + callchannel Music_Pinballmewtwostage_branch_49018 + note F#, 14 + note F_, 1 + note F#, 1 + note G_, 14 + note F#, 1 + note G_, 1 + note G#, 12 + note A#, 1 + note B_, 1 + octave 5 + note C_, 1 + note C#, 1 + note D_, 2 + octave 4 + note A_, 2 + note F#, 2 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note D_, 2 + octave 2 + note A_, 2 + dutycycle $2 + callchannel Music_Pinballmewtwostage_branch_48fd6 + callchannel Music_Pinballmewtwostage_branch_48fe4 + callchannel Music_Pinballmewtwostage_branch_48fd6 + callchannel Music_Pinballmewtwostage_branch_48ff6 + loopchannel 0, Music_Pinballmewtwostage_branch_48ed5 +; 48f3f + +Music_Pinballmewtwostage_branch_48f3f: ; 48f3f + notetype $6, $b8 + octave 1 + note G_, 2 + intensity $98 + octave 4 + note F_, 1 + note F#, 1 + note G_, 2 + intensity $18 + note G_, 2 + intensity $98 + note A#, 2 + intensity $18 + note A#, 2 + intensity $98 + note E_, 4 + intensity $b8 + octave 1 + note G_, 2 + note __, 2 + intensity $98 + octave 3 + note A#, 2 + intensity $18 + note A#, 2 + intensity $98 + note A_, 2 + intensity $18 + note A_, 2 + intensity $98 + note A#, 4 + octave 4 + note G_, 2 + intensity $18 + note G_, 2 + intensity $98 + note A#, 2 + intensity $18 + note A#, 2 + intensity $98 + octave 5 + note F_, 2 + intensity $18 + note F_, 2 + intensity $98 + note E_, 2 + intensity $18 + note E_, 2 + intensity $b8 + octave 1 + note G_, 2 + note __, 2 + intensity $98 + octave 5 + note C#, 12 + octave 4 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 2 + note __, 2 + note A#, 2 + intensity $18 + note A#, 2 + intensity $98 + note E_, 4 + intensity $b8 + octave 1 + note G_, 2 + note __, 2 + intensity $98 + octave 3 + note A#, 2 + intensity $18 + note A#, 2 + intensity $98 + note A_, 2 + intensity $18 + note A_, 2 + intensity $98 + note A#, 4 + octave 4 + note G_, 2 + intensity $18 + note G_, 2 + intensity $98 + note A#, 2 + intensity $b8 + octave 1 + note G_, 2 + intensity $98 + octave 5 + note F_, 2 + intensity $18 + note F_, 2 + intensity $98 + note E_, 2 + intensity $18 + note E_, 2 + intensity $b8 + octave 1 + note G_, 2 + note __, 2 + intensity $98 + octave 5 + note G_, 8 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + endchannel +; 48fd6 + +Music_Pinballmewtwostage_branch_48fd6: ; 48fd6 + intensity $b8 + octave 1 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + endchannel +; 48fe4 + +Music_Pinballmewtwostage_branch_48fe4: ; 48fe4 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 2 + dutycycle $0 + octave 3 + note G_, 2 + note __, 2 + dutycycle $2 + octave 1 + note G_, 2 + note __, 4 + note G_, 2 + endchannel +; 48ff6 + +Music_Pinballmewtwostage_branch_48ff6: ; 48ff6 + note G_, 2 + note __, 2 + dutycycle $0 + octave 3 + note G_, 2 + dutycycle $2 + octave 1 + note G_, 2 + note G_, 2 + note __, 6 + dutycycle $0 + octave 3 + note G_, 2 + note __, 2 + note A#, 2 + note __, 2 + dutycycle $2 + intensity $68 + octave 5 + note G_, 1 + note __, 1 + octave 6 + note C#, 2 + octave 5 + note A#, 1 + note __, 1 + octave 6 + note F_, 2 + endchannel +; 49018 + +Music_Pinballmewtwostage_branch_49018: ; 49018 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + note G_, 2 + note A_, 2 + note A#, 15 + note B_, 1 + octave 5 + note C_, 7 + octave 4 + note B_, 1 + note A#, 8 + note A_, 3 + note G#, 1 + note G_, 12 + intensity $28 + note G_, 2 + note __, 2 + intensity $98 + note D_, 1 + note D#, 1 + note E_, 1 + note F_, 1 + endchannel +; 49033 + +Music_Pinballmewtwostage_branch_49033: ; 49033 + notetype $3, $c8 + octave 2 + note F_, 1 + intensity $b8 + note C#, 1 + intensity $98 + octave 1 + note A_, 1 + intensity $58 + note F#, 1 + endchannel +; 49043 + +Music_Pinballmewtwostage_branch_49043: ; 49043 + notetype $3, $c8 + octave 3 + note A#, 1 + intensity $a8 + note F#, 1 + intensity $88 + note D#, 1 + intensity $78 + note C#, 1 + endchannel +; 49052 + + + + +Music_Pinballmewtwostage_branch_49062: ; 49062 + notetype $3, $c8 + octave 3 + note F#, 1 + intensity $a8 + note D_, 1 + intensity $78 + octave 2 + note B_, 1 + intensity $48 + note A#, 1 + endchannel +; 49072 + +Music_Pinballmewtwostage_Ch3: ; 49072 + notetype $c, $22 + note __, 16 + octave 1 + note G_, 1 + octave 3 + note G_, 1 + note F#, 1 + note F_, 1 + octave 1 + note G_, 1 + octave 3 + note E_, 1 + note D#, 1 + note D_, 1 + octave 1 + note G_, 1 + octave 3 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + octave 1 + note G_, 1 + octave 2 + note A#, 1 + octave 1 + note G_, 1 + octave 2 + note A_, 1 + octave 1 + note G_, 1 + notetype $6, $32 + octave 5 + note G_, 1 + note __, 1 + octave 6 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + intensity $22 + octave 1 + note G_, 2 + note __, 2 + intensity $32 + octave 6 + note G_, 1 + note __, 3 + intensity $22 + octave 1 + note G_, 2 + intensity $32 + octave 6 + note D_, 1 + note __, 1 + octave 1 + note G_, 2 + octave 6 + note G_, 1 + note __, 1 + intensity $22 + octave 1 + note G_, 2 + intensity $32 + octave 5 + note G_, 1 + note __, 1 + octave 6 + note G_, 1 + note __, 1 + intensity $22 + octave 1 + note G_, 2 + note G_, 2 + octave 2 + note G_, 2 + note G#, 2 + note A_, 2 + octave 1 + note G_, 2 + octave 2 + note A#, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 1 + note G_, 2 + octave 3 + note C#, 2 + note D_, 2 + note D#, 2 + octave 1 + note G_, 2 + octave 3 + note E_, 2 + octave 1 + note G_, 2 + octave 3 + note F_, 2 +Music_Pinballmewtwostage_branch_490e0: ; 490e0 + notetype $c, $32 + octave 3 + note G#, 8 + notetype $6, $22 + note G#, 8 + intensity $12 + note G#, 8 + callchannel Music_Pinballmewtwostage_branch_49156 + callchannel Music_Pinballmewtwostage_branch_491e6 + callchannel Music_Pinballmewtwostage_branch_49156 + intensity $22 + callchannel Music_Pinballmewtwostage_branch_49237 + octave 2 + note D_, 2 + note __, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note __, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note __, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note __, 2 + note A_, 2 + octave 3 + note C#, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note A_, 2 + octave 2 + note D_, 2 + note __, 2 + note A_, 2 + octave 3 + note D_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note D_, 2 + octave 2 + note G#, 2 + note F#, 2 + note D_, 2 + octave 1 + note A_, 2 + callchannel Music_Pinballmewtwostage_branch_49237 + octave 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + octave 3 + note D_, 2 + note A_, 2 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + note G#, 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + note G#, 2 + note D_, 2 + octave 2 + note G#, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note D_, 2 + note G_, 2 + note D_, 2 + octave 2 + note G_, 2 + note F#, 4 + note D_, 4 + note F#, 4 + octave 1 + note A_, 4 + callchannel Music_Pinballmewtwostage_branch_491e6 + loopchannel 0, Music_Pinballmewtwostage_branch_490e0 +; 49156 + +Music_Pinballmewtwostage_branch_49156: ; 49156 + notetype $6, $32 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + intensity $22 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + note E_, 1 + intensity $12 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + intensity $22 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + intensity $32 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + octave 4 + note D_, 1 + octave 3 + note F_, 1 + loopchannel 2, Music_Pinballmewtwostage_branch_49156 + endchannel +; 491e6 + +Music_Pinballmewtwostage_branch_491e6: ; 491e6 + notetype $6, $32 + octave 4 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + intensity $22 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + note A_, 1 + note C#, 1 + intensity $12 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + intensity $22 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + intensity $32 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + note A#, 1 + note D_, 1 + loopchannel 2, Music_Pinballmewtwostage_branch_491e6 + endchannel +; 49237 + +Music_Pinballmewtwostage_branch_49237: ; 49237 + octave 2 + note D#, 2 + note __, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note D#, 2 + note __, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note D#, 2 + note __, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note D#, 2 + note __, 2 + note A#, 2 + octave 3 + note D_, 2 + note D#, 2 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + note A#, 2 + octave 2 + note D#, 2 + note __, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note D#, 2 + note __, 2 + note A#, 2 + octave 3 + note D#, 2 + octave 2 + note D#, 2 + note __, 2 + note D_, 2 + note F#, 2 + endchannel +; 49267 + +Music_Pinballmewtwostage_Ch4: ; 49267 + togglenoise $0 + notetype $c + note G#, 2 + note G#, 2 + note G#, 1 + note G#, 2 + note G#, 1 + 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 + callchannel Music_Pinballmewtwostage_branch_492e5 + callchannel Music_Pinballmewtwostage_branch_492f6 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 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 +Music_Pinballmewtwostage_branch_49292: ; 49292 + note __, 16 + callchannel Music_Pinballmewtwostage_branch_49306 + callchannel Music_Pinballmewtwostage_branch_492f6 + callchannel Music_Pinballmewtwostage_branch_492e5 + callchannel Music_Pinballmewtwostage_branch_49317 + callchannel Music_Pinballmewtwostage_branch_49306 + callchannel Music_Pinballmewtwostage_branch_4932d + callchannel Music_Pinballmewtwostage_branch_4934d + callchannel Music_Pinballmewtwostage_branch_49306 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note C#, 1 + note G#, 2 + note D_, 1 + note D_, 1 + callchannel Music_Pinballmewtwostage_branch_492e5 + callchannel Music_Pinballmewtwostage_branch_49317 + callchannel Music_Pinballmewtwostage_branch_492e5 + callchannel Music_Pinballmewtwostage_branch_49363 + callchannel Music_Pinballmewtwostage_branch_492e5 + callchannel Music_Pinballmewtwostage_branch_49363 + callchannel Music_Pinballmewtwostage_branch_492e5 + callchannel Music_Pinballmewtwostage_branch_49363 + callchannel Music_Pinballmewtwostage_branch_492e5 + callchannel Music_Pinballmewtwostage_branch_49363 + callchannel Music_Pinballmewtwostage_branch_49306 + callchannel Music_Pinballmewtwostage_branch_4932d + callchannel Music_Pinballmewtwostage_branch_4934d + loopchannel 0, Music_Pinballmewtwostage_branch_49292 +; 492e5 + +Music_Pinballmewtwostage_branch_492e5: ; 492e5 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note D_, 1 + endchannel +; 492f6 + +Music_Pinballmewtwostage_branch_492f6: ; 492f6 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 2 + note D_, 1 + note D_, 1 + endchannel +; 49306 + +Music_Pinballmewtwostage_branch_49306: ; 49306 + note D_, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note D_, 1 + endchannel +; 49317 + +Music_Pinballmewtwostage_branch_49317: ; 49317 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + notetype $8 + note D_, 1 + note D_, 1 + note D_, 1 + notetype $c + note D_, 1 + note D_, 1 + endchannel +; 4932d + +Music_Pinballmewtwostage_branch_4932d: ; 4932d + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + note C#, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 2 + note D_, 1 + note D_, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note D_, 1 + endchannel +; 4934d + +Music_Pinballmewtwostage_branch_4934d: ; 4934d + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note D_, 1 + note G_, 1 + note D_, 1 + note G_, 1 + notetype $8 + note D_, 1 + note D_, 1 + note D_, 1 + notetype $c + note D_, 1 + note D_, 1 + endchannel +; 49363 + +Music_Pinballmewtwostage_branch_49363: ; 49363 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note C#, 1 + note G#, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + note G#, 1 + note D_, 1 + note G#, 1 + endchannel +; 49374 + + diff --git a/crysaudio/music/pinball/nameentry.asm b/crysaudio/music/pinball/nameentry.asm new file mode 100644 index 00000000..f96c822b --- /dev/null +++ b/crysaudio/music/pinball/nameentry.asm @@ -0,0 +1,2049 @@ +Music_Pinballnameentry: ; 4d52c + dbw $c0, Music_Pinballnameentry_Ch1 + dbw $01, Music_Pinballnameentry_Ch2 + dbw $02, Music_Pinballnameentry_Ch3 + dbw $03, Music_Pinballnameentry_Ch4 +; 4d538 + +Music_Pinballnameentry_Ch1: ; 4d538 + tempo 144 + volume $77 + dutycycle $3 + vibrato $18, $34 + tone $0001 + notetype $c, $88 + note __, 12 + octave 4 + note C_, 4 + notetype $8, $a8 + octave 3 + note A_, 4 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 3 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + note __, 1 + note D#, 3 + note __, 3 +Music_Pinballnameentry_branch_4d55c: ; 4d55c + dutycycle $2 + intensity $68 + forceoctave $7 + callchannel Music_Pinballnameentry_branch_4d80d + forceoctave $5 + callchannel Music_Pinballnameentry_branch_4d80d + callchannel Music_Pinballnameentry_branch_4d80d +Music_Pinballnameentry_branch_4d56d: ; 4d56d + forceoctave $3 + callchannel Music_Pinballnameentry_branch_4d80d + loopchannel 3, Music_Pinballnameentry_branch_4d56d + forceoctave $0 + callchannel Music_Pinballnameentry_branch_4d80d + octave 3 + note C#, 4 + note __, 2 + note C#, 2 + note __, 2 + note C_, 4 + note __, 10 + intensity $88 + octave 4 + note C_, 1 + note C#, 3 + note F_, 1 + note __, 1 + intensity $81 + octave 6 + note C#, 2 + octave 5 + note G#, 2 + note F_, 14 + intensity $88 + octave 3 + note B_, 1 + octave 4 + note C_, 3 + intensity $81 + note D#, 2 + octave 6 + note C_, 2 + octave 5 + note G#, 2 + note D#, 14 + intensity $88 + octave 3 + note A#, 1 + note B_, 3 + octave 4 + note D#, 1 + note __, 1 + intensity $81 + octave 5 + note B_, 2 + note F#, 2 + note D#, 6 + intensity $88 + octave 4 + note G#, 6 + note F_, 1 + note __, 1 + note A#, 4 + note G#, 1 + note __, 1 + intensity $81 + octave 6 + note C#, 2 + octave 5 + note A#, 2 + intensity $88 + octave 4 + note F#, 6 + note __, 2 + intensity $81 + note A#, 2 + note F#, 2 + note C#, 2 + intensity $88 + octave 3 + note G#, 1 + note A_, 3 + octave 4 + note C#, 1 + note __, 1 + intensity $81 + octave 6 + note C#, 2 + octave 5 + note A_, 2 + note F#, 6 + intensity $88 + octave 4 + note F#, 1 + note __, 1 + note G#, 4 + note F#, 1 + note __, 1 + intensity $88 + octave 3 + note G_, 1 + note G#, 3 + intensity $98 + octave 4 + note F_, 1 + note __, 7 + intensity $88 + octave 3 + note G#, 1 + intensity $14 + note G#, 1 + intensity $88 + octave 4 + note C#, 1 + intensity $14 + note C#, 1 + intensity $88 + note G#, 1 + intensity $14 + note G#, 1 + intensity $98 + octave 5 + note C#, 5 + intensity $88 + note D_, 1 + note D#, 8 + note __, 2 + octave 4 + note A#, 2 + note G_, 4 + note D#, 1 + note __, 5 + note G_, 1 + note __, 1 + intensity $78 + octave 3 + note C_, 1 + intensity $14 + note C_, 1 + intensity $78 + note D#, 1 + intensity $14 + note D#, 1 + intensity $78 + note G#, 1 + intensity $14 + note G#, 1 + intensity $78 + octave 4 + note C_, 1 + intensity $14 + note C_, 1 + intensity $78 + note D#, 1 + intensity $14 + note D#, 1 + intensity $98 + note F#, 8 + intensity $14 + note F#, 2 + note __, 4 + intensity $73 + octave 3 + note G_, 1 + note G#, 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 4 + note D#, 1 + note __, 4 + note D_, 1 + note D#, 2 + note E_, 4 + octave 3 + note B_, 2 + octave 4 + note D_, 1 + note D#, 5 + note __, 3 + note F_, 1 + note F#, 2 + note D#, 2 + intensity $71 + octave 5 + note D#, 4 + note D#, 2 + note D_, 2 + note C#, 2 + intensity $73 + octave 4 + note F#, 4 + intensity $71 + note B_, 2 + intensity $73 + note F#, 4 + intensity $71 + note B_, 5 + intensity $73 + note D_, 1 + note D#, 2 + octave 3 + note B_, 4 + octave 4 + note D#, 2 + note C#, 4 + note __, 2 + octave 3 + note B_, 4 + note __, 2 + note G#, 4 + note __, 2 + octave 4 + note F_, 4 + note __, 2 + intensity $71 + note C#, 2 + note F#, 2 + note C#, 2 + intensity $73 + note F#, 4 + intensity $71 + note C#, 2 + intensity $73 + note F#, 4 + intensity $71 + note C#, 2 + intensity $73 + octave 3 + note A_, 4 + octave 4 + note C#, 2 + intensity $73 + note F_, 4 + intensity $71 + octave 5 + note C#, 2 + intensity $73 + octave 4 + note F_, 4 + intensity $71 + octave 5 + note C#, 2 + intensity $73 + octave 3 + note G#, 1 + note A_, 3 + octave 4 + note C#, 1 + note __, 1 + note C#, 4 + note E_, 1 + note __, 1 + intensity $71 + note C#, 2 + note E_, 2 + note C#, 2 + intensity $73 + note E_, 4 + intensity $71 + note C#, 2 + intensity $73 + note D#, 1 + note E_, 3 + note C#, 1 + note __, 1 + octave 3 + note B_, 4 + octave 4 + note C#, 2 + intensity $74 + note F#, 6 + note __, 6 + octave 3 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + octave 5 + note D#, 1 + dutycycle $3 + intensity $84 + octave 4 + note E_, 4 + octave 3 + note B_, 1 + note __, 1 + note A_, 4 + note G#, 1 + note __, 5 + note G#, 1 + note __, 1 + note A_, 4 + note B_, 2 + octave 4 + note D#, 6 + note __, 2 + note D_, 2 + note C#, 2 + note C_, 2 + note __, 2 + octave 3 + note B_, 2 + note A#, 2 + note __, 2 + note A_, 2 + note G#, 4 + note G_, 1 + note __, 1 + note G#, 4 + octave 4 + note C#, 1 + note D_, 5 + note C#, 6 + octave 3 + note G#, 2 + note B_, 6 + note G#, 4 + note __, 2 + octave 4 + note F#, 4 + note F_, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note F#, 2 + octave 3 + note F#, 4 + note G#, 2 + note A_, 4 + note B_, 6 + note A_, 2 + note G#, 4 + intensity $87 + note A_, 10 + intensity $84 + note B_, 2 + octave 4 + note C#, 2 + note F_, 2 + note __, 2 + note A_, 2 + note C#, 2 + note __, 2 + octave 5 + note C#, 2 + octave 4 + note B_, 4 + note A_, 2 + note G#, 4 + note F#, 2 + note E_, 4 + note D#, 2 + note E_, 4 + note F#, 2 + intensity $88 + note A_, 1 + intensity $28 + note A_, 1 + intensity $88 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $88 + octave 4 + note A_, 1 + intensity $28 + note A_, 1 + intensity $88 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $88 + octave 4 + note A_, 1 + intensity $28 + note A_, 1 + intensity $88 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $88 + octave 4 + note E_, 1 + intensity $28 + note E_, 1 + intensity $88 + note A_, 1 + intensity $28 + note A_, 1 + intensity $88 + note E_, 1 + intensity $28 + note E_, 1 + intensity $88 + note A_, 1 + intensity $28 + note A_, 1 + intensity $88 + note E_, 1 + intensity $28 + note E_, 1 + intensity $88 + note A_, 1 + intensity $28 + note A_, 1 + intensity $68 + note A_, 1 + intensity $28 + note A_, 1 + intensity $78 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $88 + octave 4 + note A_, 1 + intensity $28 + note A_, 1 + intensity $98 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $a8 + octave 4 + note A_, 1 + intensity $28 + note A_, 1 + intensity $b8 + octave 5 + note C_, 1 + intensity $28 + note C_, 1 + intensity $68 + note C_, 1 + intensity $28 + note C_, 1 + intensity $78 + note D#, 1 + intensity $28 + note D#, 1 + intensity $88 + note C_, 1 + intensity $28 + note C_, 1 + intensity $98 + note D#, 1 + intensity $28 + note D#, 1 + intensity $a8 + note C_, 1 + intensity $28 + note C_, 1 + intensity $b8 + note D#, 1 + intensity $28 + note D#, 1 + intensity $78 + octave 4 + note E_, 1 + intensity $28 + note E_, 1 + intensity $78 + note G#, 1 + intensity $28 + note G#, 1 + intensity $78 + note B_, 1 + intensity $28 + note B_, 1 + intensity $78 + octave 5 + note D#, 1 + intensity $28 + note D#, 1 + intensity $88 + note E_, 1 + intensity $28 + note E_, 1 + intensity $98 + note G#, 1 + intensity $28 + note G#, 1 + intensity $a8 + note B_, 1 + intensity $24 + note B_, 4 + dutycycle $2 + vibrato $18, $4 + intensity $78 + note A#, 1 + intensity $98 + note B_, 6 + intensity $28 + note G#, 2 + intensity $18 + note G#, 2 + note __, 2 + dutycycle $3 + vibrato $18, $34 + notetype $c, $88 + note __, 8 + octave 3 + note B_, 4 + notetype $8, $a8 + note E_, 4 + note F#, 1 + note __, 1 + note G#, 1 + note __, 3 + note F#, 6 + note G#, 1 + note __, 1 + note A_, 4 + note B_, 1 + note __, 1 + loopchannel 0, Music_Pinballnameentry_branch_4d55c +; 4d80d + +Music_Pinballnameentry_branch_4d80d: ; 4d80d + octave 2 + note A#, 2 + note __, 4 + note A#, 2 + note __, 4 + note A#, 2 + note __, 4 + note A#, 2 + note __, 4 + endchannel +; 4d817 + +Music_Pinballnameentry_Ch2: ; 4d817 + dutycycle $3 + vibrato $18, $34 + notetype $8, $a8 + octave 3 + note A#, 4 + octave 4 + note C_, 1 + intensity $28 + note C_, 1 + intensity $a8 + note C#, 1 + intensity $28 + note C#, 1 + note __, 2 + intensity $a8 + note C_, 6 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + note D#, 6 + note C#, 4 + note D#, 1 + intensity $28 + note D#, 1 + intensity $a8 + note E_, 1 + intensity $28 + note E_, 1 + note __, 2 + intensity $a8 + note D#, 6 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a8 + note F#, 3 + intensity $28 + note F#, 1 + intensity $a8 + note F_, 1 + note F#, 1 +Music_Pinballnameentry_branch_4d854: ; 4d854 + vibrato $18, $34 + octave 4 + note G#, 12 + intensity $28 + note G#, 2 + note __, 2 + intensity $a8 + octave 5 + note D#, 6 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + octave 4 + note G#, 12 + intensity $91 + note C_, 2 + note D#, 2 + note G#, 2 + note F#, 2 + note F_, 2 + note D#, 1 + note F#, 1 + intensity $a8 + note G#, 12 + intensity $28 + note G#, 2 + note __, 2 + intensity $a8 + octave 5 + note D#, 6 + note C#, 1 + intensity $78 + note E_, 1 + intensity $a8 + note F_, 4 + note D#, 1 + intensity $28 + note D#, 2 + note __, 3 + intensity $a8 + note C#, 6 + intensity $28 + note C#, 1 + intensity $a8 + octave 4 + note B_, 1 + octave 5 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note C#, 2 + octave 4 + note A_, 12 + intensity $28 + note A_, 2 + note __, 2 + intensity $a8 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + note B_, 4 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + note G#, 8 + intensity $28 + note G#, 1 + intensity $78 + octave 5 + note C_, 1 + intensity $a8 + note C#, 8 + note F_, 5 + intensity $78 + note A_, 1 + intensity $a8 + note A#, 3 + intensity $28 + note A#, 1 + intensity $a8 + note F_, 2 + intensity $28 + note F_, 2 + note __, 2 + intensity $a8 + note D#, 2 + intensity $28 + note D#, 2 + note __, 2 + intensity $a8 + octave 4 + note A#, 2 + intensity $28 + note A#, 2 + note __, 2 + intensity $a8 + octave 5 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + octave 4 + note B_, 1 + octave 5 + note C_, 3 + note C#, 1 + intensity $28 + note C#, 2 + note __, 3 + intensity $a8 + note D#, 8 + dutycycle $2 + octave 4 + note F_, 2 + intensity $28 + note F_, 2 + intensity $a8 + note F#, 1 + intensity $28 + note F#, 1 + intensity $78 + note G_, 1 + intensity $a8 + note G#, 11 + note F_, 1 + intensity $28 + note F_, 3 + intensity $a8 + octave 5 + note D#, 6 + note C#, 2 + octave 4 + note G#, 12 + intensity $91 + note C_, 2 + note D#, 2 + note G#, 2 + intensity $93 + note F#, 2 + intensity $91 + note F_, 2 + note D#, 1 + note G_, 1 + intensity $a8 + note G#, 12 + intensity $88 + note D#, 1 + intensity $18 + note D#, 3 + intensity $a8 + octave 5 + note D#, 6 + note C#, 1 + intensity $78 + note E_, 1 + intensity $a8 + note F_, 4 + intensity $88 + note D#, 1 + intensity $18 + note D#, 2 + note __, 3 + intensity $a8 + note C#, 6 + intensity $28 + note C#, 1 + intensity $78 + octave 4 + note B_, 1 + intensity $a8 + octave 5 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note C#, 2 + octave 4 + note A_, 12 + intensity $88 + note F#, 1 + intensity $18 + note F#, 3 + intensity $a1 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + note B_, 4 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + note G#, 8 + intensity $28 + note G#, 2 + intensity $a8 + octave 5 + note C#, 6 + intensity $28 + note C#, 2 + intensity $a8 + note F_, 5 + intensity $78 + note A_, 1 + intensity $a8 + vibrato $18, $24 + note A#, 8 + vibrato $18, $34 + intensity $28 + note A#, 2 + intensity $a8 + note F_, 2 + note D#, 4 + octave 4 + note A#, 1 + intensity $28 + note A#, 2 + note __, 3 + intensity $a8 + octave 5 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + octave 4 + note B_, 1 + octave 5 + note C_, 3 + note C#, 1 + intensity $28 + note C#, 2 + note __, 3 + intensity $a8 + note D#, 8 + dutycycle $3 + octave 4 + note E_, 4 + note F#, 1 + intensity $28 + note F#, 1 + callchannel Music_Pinballnameentry_branch_4da64 + note F#, 4 + intensity $28 + note F#, 2 + callchannel Music_Pinballnameentry_branch_4da8d + intensity $28 + note A_, 3 + intensity $78 + note G#, 1 + intensity $88 + note A_, 2 + intensity $a8 + note B_, 4 + octave 5 + note C#, 2 + octave 4 + note B_, 6 + intensity $28 + note B_, 2 + note __, 4 + dutycycle $2 + intensity $a8 + note F#, 1 + intensity $28 + note F#, 1 + intensity $a8 + note B_, 1 + intensity $28 + note B_, 1 + intensity $a8 + octave 5 + note D#, 1 + intensity $28 + note D#, 1 + intensity $a8 + note F#, 1 + intensity $28 + note F#, 1 + intensity $a8 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + note B_, 1 + intensity $78 + note G_, 1 + vibrato $18, $24 + forceoctave $c + callchannel Music_Pinballnameentry_branch_4da64 + forceoctave $0 + octave 5 + note F_, 1 + note F#, 5 + forceoctave $c + callchannel Music_Pinballnameentry_branch_4da8d + intensity $28 + note A_, 2 + octave 5 + note __, 2 + forceoctave $0 + intensity $a8 + note A_, 2 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note F#, 2 + note E_, 12 + intensity $28 + note E_, 2 + note __, 2 + intensity $a8 + note C_, 2 + note E_, 4 + note C_, 1 + intensity $28 + note C_, 1 + intensity $a8 + note E_, 12 + note F#, 12 + note G#, 1 + note G#, 16 + intensity $78 + vibrato $18, $4 + note G_, 1 + intensity $a8 + note G#, 6 + vibrato $18, $34 + dutycycle $3 + octave 3 + note A_, 4 + note B_, 1 + intensity $28 + note B_, 1 + intensity $a8 + octave 4 + note C#, 1 + intensity $28 + note C#, 2 + note __, 1 + intensity $a8 + octave 3 + note B_, 6 + octave 4 + note C#, 1 + intensity $28 + note C#, 1 + intensity $a8 + note D#, 6 + note C#, 4 + note D#, 1 + intensity $28 + note D#, 1 + intensity $a8 + note E_, 1 + intensity $28 + note E_, 2 + note __, 1 + intensity $a8 + note D#, 6 + note E_, 1 + intensity $28 + note E_, 1 + intensity $a8 + note F#, 4 + note F_, 1 + note F#, 1 + loopchannel 0, Music_Pinballnameentry_branch_4d854 +; 4da64 + +Music_Pinballnameentry_branch_4da64: ; 4da64 + intensity $a8 + octave 4 + note G#, 12 + intensity $28 + note G#, 2 + note __, 1 + intensity $88 + note G_, 1 + intensity $a8 + note G#, 2 + note A_, 4 + note G#, 2 + note F#, 6 + intensity $28 + note F#, 3 + intensity $a8 + note A#, 1 + note B_, 10 + note A#, 2 + note A_, 2 + note G#, 12 + intensity $28 + note G#, 3 + intensity $78 + note G_, 1 + intensity $88 + note G#, 2 + intensity $a8 + note A_, 4 + note G#, 2 + endchannel +; 4da8d + +Music_Pinballnameentry_branch_4da8d: ; 4da8d + intensity $a8 + octave 4 + note F_, 4 + intensity $28 + note F_, 2 + intensity $a8 + note F#, 4 + intensity $28 + note F#, 2 + intensity $a8 + note G#, 4 + note A_, 14 + intensity $28 + note A_, 2 + note __, 2 + intensity $a8 + note A_, 2 + note G#, 4 + note F#, 2 + note B_, 8 + intensity $28 + note B_, 2 + intensity $a8 + note A_, 2 + intensity $28 + note A_, 2 + note __, 4 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note A_, 14 + endchannel +; 4dabc + +Music_Pinballnameentry_Ch3: ; 4dabc + notetype $8, $22 + octave 1 + note F#, 2 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + octave 1 + note F#, 1 + note __, 3 + octave 3 + note C#, 1 + note __, 1 + octave 1 + note G#, 2 + octave 3 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 3 + octave 3 + note D#, 1 + note __, 1 + octave 1 + note A_, 2 + octave 3 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 1 + note A_, 1 + note __, 3 + octave 3 + note E_, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 1 + note B_, 2 + octave 3 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 +Music_Pinballnameentry_branch_4daf5: ; 4daf5 + note G#, 2 + note __, 2 + note C#, 1 + note __, 1 + note G#, 2 + note __, 2 + note C#, 1 + note __, 1 + note G#, 2 + note __, 2 + note C#, 1 + note __, 1 + note G#, 2 + note __, 2 + note C#, 1 + note __, 1 + note G#, 2 + note __, 2 + note C_, 1 + note __, 1 + note G#, 2 + note __, 2 + note C_, 1 + note __, 1 + note G#, 2 + note __, 2 + note C_, 1 + note __, 1 + note G#, 2 + note __, 2 + note C_, 1 + note __, 1 + note G#, 2 + note __, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note G#, 2 + note __, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note G#, 2 + note __, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note G#, 2 + note __, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note F#, 2 + note __, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note F_, 2 + note __, 2 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note F_, 2 + note __, 2 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note F_, 2 + note __, 2 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note F_, 2 + note __, 2 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note D#, 4 + octave 2 + note G#, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note G#, 4 + octave 3 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 2 + note C#, 2 + note __, 2 + note C#, 1 + note __, 1 + notetype $8, $32 + octave 3 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 3 + notetype $8, $22 + octave 1 + note G#, 1 + note __, 1 + octave 2 + note C#, 2 + note __, 2 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note C_, 2 + note __, 2 + note C_, 1 + note __, 1 + notetype $8, $32 + octave 3 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C_, 1 + note __, 1 + note G#, 1 + note __, 3 + notetype $8, $22 + octave 1 + note G#, 1 + note __, 1 + octave 2 + note C_, 2 + note __, 2 + octave 1 + note A#, 1 + note __, 1 + note B_, 2 + note __, 2 + note B_, 1 + note __, 1 + notetype $8, $32 + octave 3 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 3 + notetype $8, $22 + octave 1 + note G#, 1 + note __, 1 + note B_, 2 + note __, 2 + note A_, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 1 + note __, 1 + notetype $8, $32 + octave 3 + note A#, 1 + note __, 1 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note A#, 1 + note __, 3 + notetype $8, $22 + octave 1 + note F#, 1 + note __, 1 + note A#, 2 + note __, 2 + note G#, 1 + note __, 1 + note A_, 2 + note __, 2 + note A_, 1 + note __, 1 + notetype $8, $32 + octave 3 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 3 + notetype $8, $22 + octave 1 + note F#, 1 + note __, 1 + note A_, 2 + note __, 2 + note G_, 1 + note __, 1 + note G#, 2 + note __, 2 + note G#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 1 + note F_, 1 + note __, 1 + note G#, 2 + note __, 2 + note F#, 1 + note __, 1 + note G_, 2 + note __, 2 + note G_, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + note G_, 1 + note __, 1 + note D#, 1 + note __, 1 + notetype $8, $22 + octave 1 + note G#, 2 + note __, 2 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + notetype $8, $12 + note B_, 2 + note __, 2 + octave 2 + note D#, 1 + note __, 1 + note F#, 4 + notetype $8, $32 + octave 1 + note B_, 2 + notetype $8, $22 + octave 2 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + note E_, 1 + notetype $8, $32 + note D_, 1 + notetype $8, $22 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + note D#, 2 + note __, 2 + note D#, 1 + notetype $8, $32 + note C#, 1 + notetype $8, $22 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 1 + notetype $8, $32 + note C_, 1 + notetype $8, $22 + note C#, 2 + note __, 2 + note C#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note C#, 4 + octave 2 + note B_, 1 + note __, 5 + note G#, 2 + callchannel Music_Pinballnameentry_branch_4ddc7 + note D#, 6 + note __, 6 + notetype $8, $32 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + notetype $8, $22 + octave 2 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + note E_, 1 + notetype $8, $32 + note D_, 1 + notetype $8, $22 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D#, 2 + note __, 2 + note D#, 1 + note __, 1 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note D#, 1 + notetype $8, $32 + note C#, 1 + notetype $8, $22 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note D_, 1 + notetype $8, $32 + note C_, 1 + notetype $8, $22 + note C#, 2 + note __, 2 + note C#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note C#, 4 + octave 2 + note B_, 1 + note __, 5 + note G#, 2 + callchannel Music_Pinballnameentry_branch_4ddc7 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + notetype $8, $32 + note D#, 12 + octave 2 + note A_, 12 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + octave 1 + note B_, 1 + note __, 1 + octave 2 + note E_, 2 + octave 1 + note B_, 2 + note E_, 2 + note __, 3 + notetype $8, $32 + octave 2 + note D#, 1 + notetype $8, $22 + note E_, 6 + octave 1 + note A_, 3 + note __, 1 + note A_, 1 + note __, 1 + octave 2 + note E_, 1 + note __, 3 + octave 1 + note B_, 6 + octave 2 + note D#, 1 + note __, 1 + note F#, 6 + note A_, 4 + note E_, 1 + note __, 1 + note C#, 1 + note __, 3 + note B_, 6 + note F#, 1 + note __, 1 + note B_, 4 + octave 3 + note D#, 1 + note __, 1 + loopchannel 0, Music_Pinballnameentry_branch_4daf5 +; 4ddc7 + +Music_Pinballnameentry_branch_4ddc7: ; 4ddc7 + note F#, 2 + note __, 2 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note F#, 2 + note __, 2 + note F#, 1 + note __, 1 + note C#, 2 + note __, 2 + note F#, 1 + notetype $8, $32 + note E_, 1 + notetype $8, $22 + note F_, 2 + note __, 2 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + note F_, 2 + note __, 2 + note F_, 1 + note __, 1 + note C#, 2 + note __, 2 + note F_, 1 + notetype $8, $32 + note D#, 1 + notetype $8, $22 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + note C#, 2 + note __, 2 + note E_, 1 + notetype $8, $32 + note D_, 1 + notetype $8, $22 + endchannel +; 4de10 + +Music_Pinballnameentry_Ch4: ; 4de10 + togglenoise $0 + notetype $c + note F_, 16 + note __, 8 + notetype $8 + note D#, 2 + note D_, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note D_, 2 +Music_Pinballnameentry_branch_4de1e: ; 4de1e + callchannel Music_Pinballnameentry_branch_4dec7 + note D_, 2 + note G_, 2 + note G#, 2 + callchannel Music_Pinballnameentry_branch_4dec7 + note D_, 2 + note G_, 2 + note C#, 2 + callchannel Music_Pinballnameentry_branch_4dec7 + note D_, 2 + note G_, 2 + note G#, 2 + callchannel Music_Pinballnameentry_branch_4ded1 + note G#, 2 + note G_, 2 + note D_, 2 + callchannel Music_Pinballnameentry_branch_4dec7 + note D_, 2 + note G_, 2 + note G#, 2 + callchannel Music_Pinballnameentry_branch_4dec7 + note D_, 2 + note G_, 2 + note C#, 2 + callchannel Music_Pinballnameentry_branch_4ded1 + note D_, 2 + note G_, 2 + note D_, 2 + callchannel Music_Pinballnameentry_branch_4dec7 + note D_, 2 + note D_, 2 + note D_, 2 +Music_Pinballnameentry_branch_4de4e: ; 4de4e + callchannel Music_Pinballnameentry_branch_4dedb + note D#, 2 + note G_, 2 + note D#, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note G_, 2 + note C#, 2 + loopchannel 3, Music_Pinballnameentry_branch_4de4e + callchannel Music_Pinballnameentry_branch_4dedb + note D#, 2 + note G_, 2 + note D#, 2 + note D_, 2 + note G_, 2 + note D#, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D#, 2 + note G_, 2 + note F#, 2 + note D_, 4 + note D#, 2 + note D#, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note D_, 2 +Music_Pinballnameentry_branch_4de7a: ; 4de7a + callchannel Music_Pinballnameentry_branch_4dee8 + loopchannel 5, Music_Pinballnameentry_branch_4de7a + note D#, 2 + note G_, 2 + note F#, 2 + note D_, 4 + note D#, 2 + note D#, 2 + note G#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 2 + note D_, 12 + note D#, 2 + note D_, 2 + note D#, 2 + note C#, 2 + note C#, 2 + note D_, 2 +Music_Pinballnameentry_branch_4de93: ; 4de93 + callchannel Music_Pinballnameentry_branch_4dee8 + loopchannel 7, Music_Pinballnameentry_branch_4de93 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note G#, 2 + note G#, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note D_, 2 + note F#, 9 + note G_, 1 + note G_, 1 + note G_, 1 + note F#, 12 + note D#, 2 + note G_, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note C#, 2 + note D_, 2 + note D_, 2 + notetype $c + note __, 16 + note __, 8 + notetype $8 + note D_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note C#, 2 + note D_, 2 + loopchannel 0, Music_Pinballnameentry_branch_4de1e +; 4dec7 + +Music_Pinballnameentry_branch_4dec7: ; 4dec7 + note D#, 2 + note G_, 2 + note G#, 2 + note D_, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + endchannel +; 4ded1 + +Music_Pinballnameentry_branch_4ded1: ; 4ded1 + note D#, 2 + note G_, 2 + note G#, 2 + note D_, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + endchannel +; 4dedb + +Music_Pinballnameentry_branch_4dedb: ; 4dedb + note D#, 2 + note G_, 2 + note D#, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note G_, 2 + endchannel +; 4dee8 + +Music_Pinballnameentry_branch_4dee8: ; 4dee8 + note D#, 2 + note G_, 2 + note F#, 2 + note D_, 4 + note D#, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note D_, 2 + note G_, 2 + note F#, 2 + endchannel +; 4def4 + diff --git a/crysaudio/music/pinball/options.asm b/crysaudio/music/pinball/options.asm new file mode 100644 index 00000000..a948e41d --- /dev/null +++ b/crysaudio/music/pinball/options.asm @@ -0,0 +1,229 @@ +Music_Pinballoptions: ; 49374 + dbw $80, Music_Pinballoptions_Ch1 + dbw $01, Music_Pinballoptions_Ch2 + dbw $02, Music_Pinballoptions_Ch3 +; 4937d + +Music_Pinballoptions_Ch1: ; 4937d + tempo 272 + volume $77 + endchannel +; 49383 + +Music_Pinballoptions_Ch2: ; 49383 + dutycycle $2 + tone $0001 +Music_Pinballoptions_branch_49388: ; 49388 + callchannel Music_Pinballoptions_branch_49406 + intensity $a2 + note A_, 1 + intensity $52 + note A_, 1 + intensity $22 + note A_, 2 + intensity $a2 + note G#, 1 + intensity $52 + note G#, 1 + callchannel Music_Pinballoptions_branch_49406 + intensity $a2 + note B_, 1 + intensity $52 + note B_, 1 + intensity $22 + note B_, 2 + intensity $a2 + octave 6 + note C#, 1 + intensity $52 + note C#, 1 + intensity $a2 + note D#, 1 + intensity $52 + note D#, 1 + intensity $a2 + octave 5 + note F#, 1 + intensity $52 + note F#, 1 + intensity $a2 + note G#, 1 + intensity $52 + note G#, 1 + intensity $a2 + note F#, 1 + intensity $52 + note F#, 1 + intensity $22 + note F#, 2 + intensity $a2 + note A#, 1 + intensity $52 + note A#, 1 + intensity $a2 + note G#, 1 + intensity $52 + note G#, 1 + intensity $a2 + note F#, 1 + intensity $52 + note F#, 1 + intensity $a2 + note F#, 1 + intensity $52 + note F#, 1 + intensity $a2 + note F_, 1 + intensity $52 + note F_, 1 + intensity $a2 + note E_, 1 + intensity $52 + note E_, 1 + intensity $a2 + note D#, 1 + intensity $52 + note D#, 1 + intensity $a2 + note C#, 1 + intensity $52 + note C#, 1 + intensity $22 + note C#, 4 + intensity $a2 + note A_, 1 + intensity $52 + note A_, 1 + loopchannel 0, Music_Pinballoptions_branch_49388 +; 49406 + +Music_Pinballoptions_branch_49406: ; 49406 + notetype $c, $a2 + octave 5 + note A#, 1 + intensity $52 + note A#, 1 + intensity $a2 + note A_, 1 + intensity $52 + note A_, 1 + intensity $a2 + note G#, 1 + intensity $52 + note G#, 1 + intensity $a2 + note A#, 1 + intensity $52 + note A#, 1 + intensity $22 + note A#, 2 + endchannel +; 49424 + +Music_Pinballoptions_Ch3: ; 49424 +Music_Pinballoptions_branch_49424: ; 49424 + callchannel Music_Pinballoptions_branch_494ac + intensity $22 + octave 5 + note C#, 1 + intensity $32 + note C#, 1 + note __, 2 + callchannel Music_Pinballoptions_branch_494ac + intensity $22 + octave 5 + note D_, 1 + intensity $32 + note D_, 1 + note __, 2 + callchannel Music_Pinballoptions_branch_494ac + intensity $22 + octave 5 + note D#, 1 + intensity $32 + note D#, 1 + note __, 2 + callchannel Music_Pinballoptions_branch_494ac + intensity $22 + octave 5 + note E_, 1 + intensity $32 + note E_, 1 + note __, 2 + intensity $22 + octave 3 + note B_, 1 + intensity $32 + note B_, 1 + intensity $22 + octave 4 + note D#, 1 + intensity $32 + note D#, 1 + intensity $22 + note F#, 1 + intensity $32 + note F#, 1 + note __, 2 + intensity $22 + note C_, 1 + intensity $32 + note C_, 1 + intensity $22 + note D#, 1 + intensity $32 + note D#, 1 + intensity $22 + note F#, 1 + intensity $32 + note F#, 1 + note __, 2 + intensity $22 + note C#, 1 + intensity $32 + note C#, 1 + intensity $22 + note F_, 1 + intensity $32 + note F_, 1 + intensity $22 + note G#, 1 + intensity $32 + note G#, 1 + intensity $22 + note F_, 1 + intensity $32 + note F_, 1 + intensity $22 + note G#, 1 + intensity $32 + note G#, 1 + intensity $22 + note F_, 1 + intensity $32 + note F_, 1 + intensity $22 + note G#, 1 + intensity $32 + note G#, 1 + intensity $22 + note B_, 1 + intensity $32 + note B_, 1 + loopchannel 0, Music_Pinballoptions_branch_49424 +; 494ac + +Music_Pinballoptions_branch_494ac: ; 494ac + notetype $c, $22 + octave 4 + note F#, 1 + intensity $32 + note F#, 1 + intensity $22 + note A#, 1 + intensity $32 + note A#, 1 + endchannel +; 494bb + + diff --git a/crysaudio/music/pinball/pokedex.asm b/crysaudio/music/pinball/pokedex.asm new file mode 100644 index 00000000..1b2e1d9a --- /dev/null +++ b/crysaudio/music/pinball/pokedex.asm @@ -0,0 +1,709 @@ +Music_Pinballpokedex: ; 3d973 + dbw $c0, Music_Pinballpokedex_Ch1 + dbw $01, Music_Pinballpokedex_Ch2 + dbw $02, Music_Pinballpokedex_Ch3 + dbw $03, Music_Pinballpokedex_Ch4 +; 3d97f + +Music_Pinballpokedex_Ch1: ; 3d97f + tempo 157 + volume $77 + notetype $c, $b3 + note __, 4 +Music_Pinballpokedex_branch_3d988: ; 3d988 + notetype $c, $92 + dutycycle $2 + note __, 4 + octave 4 + note C#, 1 + note __, 5 + note C#, 1 + note __, 3 + note E_, 1 + note __, 1 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note C_, 1 + note __, 3 + note C_, 1 + note __, 3 + note D_, 1 + note __, 3 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note __, 16 + note __, 4 + note C#, 1 + note __, 5 + note C#, 1 + note __, 3 + note E_, 1 + note __, 1 + note __, 2 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note C_, 1 + note __, 3 + note C_, 1 + note __, 3 + note D_, 1 + note __, 3 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note __, 1 + note __, 16 + callchannel Music_Pinballpokedex_branch_3d9e2 + note __, 2 + note D_, 1 + note __, 3 + intensity $52 + note D_, 1 + note __, 3 + intensity $72 + note D_, 1 + note __, 3 + intensity $b2 + note D_, 1 + note __, 1 + callchannel Music_Pinballpokedex_branch_3d9e2 + note __, 2 + note D_, 1 + note __, 3 + note E_, 1 + note __, 9 + loopchannel 0, Music_Pinballpokedex_branch_3d988 +; 3d9e2 + +Music_Pinballpokedex_branch_3d9e2: ; 3d9e2 + intensity $92 + note __, 4 + note F#, 1 + note __, 5 + note F#, 1 + note __, 3 + note A_, 1 + note __, 1 + note __, 2 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note F_, 1 + note __, 3 + note F_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + note C_, 1 + note __, 3 + note D_, 1 + note __, 1 + endchannel +; 3d9ff + +Music_Pinballpokedex_Ch2: ; 3d9ff + notetype $c, $b3 + note __, 4 + tone $0001 +Music_Pinballpokedex_branch_3da06: ; 3da06 + notetype $c, $a2 + dutycycle $2 + note __, 4 + octave 4 + note G#, 1 + note __, 5 + note F#, 1 + note __, 3 + note B_, 1 + note __, 1 + note __, 2 + note B_, 1 + note __, 3 + note A_, 1 + note __, 1 + note G_, 1 + note __, 3 + note E_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note G#, 1 + note __, 1 + note A_, 1 + note __, 3 + intensity $b2 + note G#, 1 + note __, 1 + notetype $6, $a2 + note __, 2 + note __, 1 + note G_, 1 + notetype $c, $a2 + note G#, 2 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + notetype $6, $b2 + octave 3 + note G#, 1 + note A_, 1 + note A#, 2 + note G#, 2 + note __, 2 + note F_, 2 + note __, 2 + note D_, 2 + note __, 2 + intensity $61 + note __, 2 + note A_, 2 + octave 4 + note C#, 2 + note E_, 2 + intensity $b2 + note G#, 2 + intensity $61 + note E_, 2 + note C#, 2 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 2 + intensity $b2 + note F#, 2 + note __, 2 + intensity $61 + note E_, 2 + note G_, 2 + intensity $b2 + note B_, 2 + note __, 2 + intensity $61 + note E_, 2 + note G_, 2 + intensity $b2 + note B_, 2 + note __, 2 + intensity $61 + note C_, 2 + note E_, 2 + intensity $b2 + note A_, 2 + intensity $61 + note C_, 2 + intensity $b2 + note G_, 2 + intensity $61 + octave 3 + note G_, 2 + note B_, 2 + octave 4 + note D_, 2 + intensity $b2 + note E_, 2 + note __, 4 + intensity $82 + note G#, 2 + intensity $b2 + note A_, 2 + intensity $61 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + note F#, 2 + intensity $b2 + note A_, 2 + intensity $61 + octave 3 + note F#, 2 + note B_, 2 + octave 4 + note D_, 2 + intensity $b2 + note G#, 2 + note __, 2 + note A_, 2 + note __, 2 + intensity $61 + octave 3 + note B_, 2 + note __, 2 + intensity $b2 + octave 4 + note G#, 2 + note __, 2 + note __, 3 + intensity $92 + note G_, 1 + intensity $a2 + note G#, 4 + note F_, 2 + note __, 2 + note D_, 2 + note __, 2 + intensity $b2 + octave 3 + note G#, 1 + note A_, 1 + note A#, 2 + note G#, 2 + note __, 2 + note F_, 2 + note __, 2 + note D_, 2 + note __, 2 + callchannel Music_Pinballpokedex_branch_3dae5 + note __, 4 + intensity $b2 + note A_, 2 + note __, 6 + intensity $52 + note A_, 2 + note __, 6 + intensity $82 + note A_, 2 + note __, 6 + intensity $c2 + note A_, 2 + note __, 2 + callchannel Music_Pinballpokedex_branch_3dae5 + note __, 4 + intensity $b2 + note A_, 2 + note __, 6 + note G#, 2 + notetype $c, $b3 + note __, 9 + loopchannel 0, Music_Pinballpokedex_branch_3da06 +; 3dae5 + +Music_Pinballpokedex_branch_3dae5: ; 3dae5 + note __, 2 + intensity $61 + octave 4 + note D_, 2 + note F#, 2 + note A_, 2 + intensity $b2 + octave 5 + note C#, 2 + intensity $61 + octave 4 + note A_, 2 + note F#, 2 + note D_, 2 + note F#, 2 + note A_, 2 + intensity $b2 + note B_, 2 + note __, 2 + intensity $61 + note A_, 2 + octave 5 + note C_, 2 + intensity $b2 + note E_, 2 + note __, 2 + intensity $61 + octave 4 + note A_, 2 + octave 5 + note C_, 2 + intensity $b2 + note E_, 2 + note __, 2 + intensity $61 + octave 4 + note F_, 2 + note A_, 2 + intensity $b2 + octave 5 + note D_, 2 + intensity $61 + octave 4 + note F_, 2 + intensity $b2 + octave 5 + note C_, 2 + intensity $61 + octave 4 + note C_, 2 + note E_, 2 + note G_, 2 + intensity $b2 + note A_, 2 + note __, 4 + intensity $82 + note A#, 2 + intensity $b2 + note B_, 2 + note __, 6 + note B_, 2 + note __, 6 + note A_, 2 + note __, 2 + note G_, 2 + note __, 6 + note A_, 2 + note __, 2 + endchannel +; 3db3a + +Music_Pinballpokedex_Ch3: ; 3db3a + notetype $c, $22 + note __, 4 +Music_Pinballpokedex_branch_3db3e: ; 3db3e + notetype $c, $22 + octave 1 + note A_, 4 + octave 2 + note A_, 1 + note __, 1 + octave 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 3 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note C_, 2 + octave 3 + note C_, 1 + note __, 3 + octave 2 + note C_, 1 + note __, 1 + octave 1 + note G_, 4 + octave 2 + note G_, 1 + note __, 1 + octave 1 + note G_, 1 + note __, 1 + notetype $6, $22 + note B_, 7 + note __, 1 + octave 2 + note B_, 2 + note __, 2 + octave 1 + note B_, 2 + note __, 2 + note F#, 3 + note __, 1 + octave 2 + note B_, 2 + note __, 6 + octave 1 + note A#, 2 + notetype $c, $22 + note __, 1 + note __, 16 + note A_, 4 + octave 2 + note A_, 1 + note __, 1 + octave 1 + note A_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 2 + note A_, 1 + note __, 3 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note C_, 2 + octave 3 + note C_, 1 + note __, 3 + octave 2 + note C_, 1 + note __, 1 + octave 1 + note G_, 4 + octave 2 + note G_, 1 + note __, 1 + octave 1 + note G_, 1 + note __, 1 + notetype $6, $22 + note B_, 7 + note __, 1 + octave 2 + note B_, 2 + note __, 2 + octave 1 + note B_, 2 + note __, 2 + note F#, 3 + note __, 1 + octave 2 + note B_, 2 + note __, 6 + octave 1 + note A#, 2 + note __, 2 + note __, 4 + notetype $6, $32 + octave 5 + note G#, 2 + note __, 2 + note F_, 2 + note __, 2 + note D_, 2 + note __, 2 + octave 4 + note G#, 1 + note A_, 1 + note A#, 2 + note G#, 2 + note __, 2 + note F_, 2 + note __, 2 + note D_, 2 + note __, 2 + notetype $6, $22 + octave 2 + note D_, 8 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note D_, 2 + note __, 2 + octave 1 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 6 + note F_, 2 + note __, 2 + octave 2 + note F_, 4 + octave 3 + note F_, 2 + note __, 6 + octave 2 + note F_, 2 + note __, 2 + note C_, 8 + octave 3 + note C_, 2 + note __, 2 + octave 2 + note C_, 2 + note __, 2 + note C_, 8 + octave 3 + note C_, 2 + note __, 2 + octave 2 + note C_, 2 + note __, 2 + octave 1 + note G_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 6 + note B_, 2 + note __, 2 + octave 1 + note B_, 4 + octave 2 + note B_, 2 + note __, 6 + notetype $6, $32 + octave 1 + note A#, 2 + note __, 2 + note A#, 4 + notetype $6, $22 + octave 2 + note A#, 2 + note __, 6 + octave 1 + note A#, 2 + note __, 2 + octave 2 + note D_, 8 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note D_, 2 + note __, 2 + octave 1 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 6 + note F_, 2 + note __, 2 + octave 2 + note F_, 4 + octave 3 + note F_, 2 + note __, 6 + octave 2 + note F_, 2 + note __, 2 + note C_, 8 + octave 3 + note C_, 2 + note __, 2 + octave 2 + note C_, 2 + note __, 2 + note C_, 8 + octave 3 + note C_, 2 + note __, 2 + octave 2 + note C_, 2 + note __, 2 + octave 1 + note G_, 2 + note __, 2 + octave 2 + note E_, 2 + note __, 6 + note B_, 2 + note __, 2 + note __, 4 + note B_, 2 + note __, 6 + octave 3 + note B_, 2 + note __, 6 + octave 2 + note E_, 2 + note __, 2 + octave 1 + note B_, 2 + note __, 2 + note E_, 2 + notetype $c, $22 + note __, 1 + loopchannel 0, Music_Pinballpokedex_branch_3db3e +; 3dc48 + +Music_Pinballpokedex_Ch4: ; 3dc48 + togglenoise $0 + notetype $8 + note F_, 3 + note C#, 1 + note C#, 1 + note C#, 1 +Music_Pinballpokedex_branch_3dc50: ; 3dc50 + notetype $8 + callchannel Music_Pinballpokedex_branch_3dc7c + callchannel Music_Pinballpokedex_branch_3dc97 + callchannel Music_Pinballpokedex_branch_3dc7c + callchannel Music_Pinballpokedex_branch_3dc97 + callchannel Music_Pinballpokedex_branch_3dc7c + note G_, 3 + note G_, 3 + note G_, 3 + note E_, 3 + note E_, 3 + note E_, 3 + note E_, 3 + note E_, 3 + callchannel Music_Pinballpokedex_branch_3dc7c + note G_, 3 + note F#, 3 + note G_, 3 + note E_, 3 + note E_, 3 + note D#, 3 + notetype $c + note G_, 1 + note G_, 1 + note G_, 1 + note G_, 1 + loopchannel 0, Music_Pinballpokedex_branch_3dc50 +; 3dc7c + +Music_Pinballpokedex_branch_3dc7c: ; 3dc7c + note F#, 3 + note G_, 3 + note E_, 3 + note G_, 3 + note G_, 3 + note E_, 3 + note G_, 3 + note E_, 3 + note G_, 3 + note E_, 3 + note G_, 3 + note G_, 1 + note G_, 1 + note G_, 1 + note E_, 3 + note G_, 3 + note G_, 3 + note F#, 3 + note E_, 3 + note G_, 3 + note E_, 3 + note G_, 3 + note E_, 3 + note E_, 3 + note G_, 3 + note F#, 3 + endchannel +; 3dc97 + +Music_Pinballpokedex_branch_3dc97: ; 3dc97 + note G_, 3 + note G_, 3 + note G_, 3 + note G_, 1 + note G_, 1 + note G_, 1 + note E_, 3 + note E_, 3 + note D#, 3 + note D#, 3 + endchannel +; 3dca2 + + diff --git a/crysaudio/music/pinball/redfield.asm b/crysaudio/music/pinball/redfield.asm new file mode 100644 index 00000000..ff557946 --- /dev/null +++ b/crysaudio/music/pinball/redfield.asm @@ -0,0 +1,1423 @@ +Music_Pinballredfield: ; 3ccbf + dbw $c0, Music_Pinballredfield_Ch1 + dbw $01, Music_Pinballredfield_Ch2 + dbw $02, Music_Pinballredfield_Ch3 + dbw $03, Music_Pinballredfield_Ch4 +; 3cccb + +Music_Pinballredfield_Ch1: ; 3cccb + tempo 144 + volume $77 + dutycycle $3 + vibrato $12, $34 + tone $0001 + notetype $8, $b3 + octave 3 + note D#, 4 + intensity $83 + octave 2 + note F#, 2 + note B_, 2 + octave 3 + note D#, 2 + intensity $b3 + note D#, 8 + intensity $83 + octave 2 + note F#, 2 + octave 3 + note C_, 2 + note D#, 2 + intensity $b3 + note F_, 4 + intensity $82 + note E_, 2 + note D#, 4 + intensity $a3 + note G#, 6 + note __, 8 +Music_Pinballredfield_branch_3ccf9: ; 3ccf9 + note __, 8 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + intensity $83 + octave 4 + note C#, 4 + intensity $82 + octave 3 + note B_, 6 + note G#, 6 + intensity $84 + note F_, 16 + note __, 6 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 10 + intensity $83 + octave 4 + note C#, 4 + intensity $82 + octave 3 + note B_, 6 + note G#, 6 + intensity $84 + note F_, 16 + note __, 6 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 6 + intensity $21 + note A#, 2 + intensity $41 + octave 4 + note C#, 2 + intensity $61 + octave 3 + note A#, 2 + intensity $81 + octave 4 + note C#, 2 + intensity $a1 + octave 3 + note A#, 2 + intensity $c1 + octave 4 + note C#, 12 + note __, 5 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 1 + loopchannel 0, Music_Pinballredfield_branch_3ccf9 +; 3cd5b + +Music_Pinballredfield_Ch2: ; 3cd5b + dutycycle $2 + vibrato $12, $34 + notetype $8, $c4 + octave 3 + note A#, 4 + intensity $a2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + intensity $c4 + note A#, 8 + intensity $a2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + intensity $c3 + note A#, 4 + intensity $a2 + note A_, 2 + note G#, 4 + intensity $c5 + octave 4 + note C#, 14 +Music_Pinballredfield_branch_3cd81: ; 3cd81 + callchannel Music_Pinballredfield_branch_3cf69 + dutycycle $3 + intensity $a3 + octave 4 + note F_, 4 + intensity $a2 + note F#, 6 + note G_, 6 + intensity $a4 + note G#, 8 + callchannel Music_Pinballredfield_branch_3cfa5 + note A#, 4 + note F#, 2 + intensity $92 + panning $f + note A#, 4 + note F#, 2 + intensity $72 + panning $f0 + note A#, 4 + note F#, 2 + panning $f + intensity $42 + note A#, 4 + note F#, 10 + panning $ff + note __, 16 + callchannel Music_Pinballredfield_branch_3cf69 + dutycycle $3 + intensity $a3 + octave 4 + note F_, 4 + intensity $a2 + note F#, 6 + note G_, 6 + intensity $a6 + note G#, 8 + callchannel Music_Pinballredfield_branch_3cfa5 + intensity $b2 + note A#, 4 + intensity $a2 + note F#, 16 + note __, 4 + intensity $1d + note __, 12 + octave 4 + note E_, 12 + dutycycle $0 + intensity $a2 + octave 5 + note D#, 2 + intensity $52 + octave 4 + note D#, 2 + note F#, 2 + note A#, 2 + note F#, 2 + note D#, 2 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + intensity $a2 + note B_, 2 + intensity $52 + note F#, 2 + note D#, 2 + intensity $a2 + octave 5 + note F#, 2 + intensity $52 + octave 4 + note D#, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note D#, 2 + intensity $a2 + octave 5 + note G#, 2 + intensity $52 + octave 4 + note D#, 2 + intensity $a2 + octave 5 + note F#, 2 + note F_, 2 + intensity $52 + octave 4 + note F#, 2 + intensity $a2 + octave 5 + note D#, 2 + note C#, 2 + intensity $52 + octave 4 + note C#, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + note F_, 2 + intensity $a2 + note A#, 2 + intensity $52 + note F_, 2 + note C#, 2 + intensity $a2 + octave 5 + note C#, 2 + intensity $52 + octave 4 + note E_, 2 + note G#, 2 + octave 5 + note C#, 2 + note E_, 2 + note G#, 2 + octave 6 + note C#, 2 + octave 5 + note G#, 2 + note E_, 2 + note C#, 2 + octave 4 + note G#, 2 + note E_, 2 + intensity $a2 + note G#, 2 + intensity $52 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + note D#, 2 + octave 3 + note B_, 2 + note G#, 2 + note B_, 2 + intensity $a2 + octave 4 + note G#, 2 + note A#, 2 + intensity $52 + note D#, 2 + intensity $a2 + note B_, 2 + intensity $52 + note D#, 2 + note F_, 2 + intensity $a2 + note B_, 2 + note A#, 2 + intensity $52 + note F_, 2 + note C#, 2 + intensity $a2 + note G#, 2 + intensity $52 + note D#, 2 + note F_, 2 + intensity $a2 + note B_, 2 + intensity $52 + note F_, 2 + note C#, 2 + intensity $a2 + note A#, 2 + intensity $52 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note F_, 2 + note C#, 2 + octave 3 + note A#, 2 + note F#, 2 + octave 4 + note C#, 2 + note F_, 2 + intensity $a2 + note F#, 2 + intensity $52 + note C#, 2 + octave 3 + note A#, 2 + intensity $a2 + octave 5 + note C#, 2 + intensity $52 + octave 3 + note A#, 2 + octave 4 + note E_, 2 + octave 3 + note A#, 2 + octave 4 + note E_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note E_, 2 + note C#, 2 + note E_, 2 + note G_, 2 + note A#, 2 + intensity $a2 + octave 5 + note D#, 2 + intensity $52 + octave 4 + note D#, 2 + note F#, 2 + note A#, 2 + note F#, 2 + note D#, 2 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + intensity $a2 + note B_, 2 + intensity $52 + note F#, 2 + note D#, 2 + intensity $a2 + octave 5 + note F#, 2 + intensity $52 + octave 4 + note D#, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note D#, 2 + intensity $a2 + octave 5 + note G#, 2 + intensity $52 + octave 4 + note D#, 2 + intensity $a2 + octave 5 + note F#, 2 + note F_, 2 + intensity $52 + octave 4 + note F#, 2 + intensity $a2 + octave 5 + note D#, 2 + note C#, 2 + intensity $52 + octave 4 + note C#, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note C#, 2 + octave 3 + note G#, 2 + octave 4 + note C#, 2 + intensity $a2 + octave 5 + note C#, 2 + note D#, 2 + intensity $52 + octave 4 + note F_, 2 + intensity $a2 + octave 5 + note E_, 4 + intensity $52 + octave 4 + note E_, 2 + note G#, 2 + intensity $a2 + octave 5 + note D#, 2 + intensity $52 + note E_, 2 + note G#, 2 + intensity $a2 + note C#, 2 + intensity $52 + note G#, 2 + note E_, 2 + intensity $a2 + octave 4 + note A#, 2 + intensity $52 + note G#, 2 + note E_, 2 + intensity $a2 + note B_, 2 + intensity $52 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + note D#, 2 + octave 3 + note B_, 2 + note G#, 2 + note B_, 2 + intensity $a2 + octave 4 + note B_, 2 + octave 5 + note C#, 2 + intensity $52 + octave 4 + note D#, 2 + intensity $a2 + octave 5 + note D_, 2 + intensity $52 + octave 4 + note D_, 2 + note F#, 2 + note B_, 2 + intensity $a2 + octave 5 + note C#, 2 + intensity $52 + octave 4 + note F#, 2 + note D_, 2 + intensity $a2 + note B_, 2 + intensity $52 + note D_, 2 + note F#, 2 + intensity $a2 + octave 5 + note D_, 2 + intensity $52 + octave 4 + note F#, 2 + intensity $a2 + octave 5 + note C#, 2 + intensity $52 + octave 3 + note F#, 2 + note A#, 2 + octave 4 + note C#, 2 + note F_, 2 + note C#, 2 + octave 3 + note A#, 2 + note F#, 2 + note A#, 2 + octave 4 + note C#, 2 + note F_, 2 + note C#, 2 + octave 3 + note A#, 2 + note G#, 2 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + note D#, 2 + octave 3 + note B_, 2 + note G#, 2 + note B_, 2 + octave 4 + note D#, 2 + note F#, 2 + note D#, 2 + octave 3 + note B_, 2 + loopchannel 0, Music_Pinballredfield_branch_3cd81 +; 3cf69 + +Music_Pinballredfield_branch_3cf69: ; 3cf69 + dutycycle $2 + intensity $c2 + octave 4 + note C#, 2 + intensity $72 + octave 3 + note C#, 2 + note F#, 2 + intensity $c2 + note B_, 2 + intensity $72 + note C#, 2 + note F#, 2 + intensity $c2 + note A#, 4 + intensity $72 + note C#, 2 + note D#, 4 + note C#, 2 + note E_, 4 + intensity $c2 + note A#, 2 + note B_, 4 + octave 4 + note C#, 6 + note C#, 2 + octave 3 + note B_, 4 + note A#, 2 + note B_, 4 + note G#, 2 + intensity $92 + panning $f0 + note B_, 4 + note G#, 2 + intensity $72 + panning $f + note B_, 4 + note G#, 2 + panning $f0 + intensity $42 + note B_, 4 + note G#, 2 + panning $ff + endchannel +; 3cfa5 + +Music_Pinballredfield_branch_3cfa5: ; 3cfa5 + dutycycle $2 + intensity $c2 + octave 3 + note B_, 2 + intensity $72 + note D#, 2 + note F#, 2 + intensity $c2 + note A#, 2 + intensity $72 + note D#, 2 + note F#, 2 + intensity $c2 + note G#, 4 + intensity $72 + note D_, 2 + note F#, 4 + note D_, 2 + note G#, 4 + intensity $c2 + note G#, 2 + note A#, 4 + intensity $c3 + note B_, 6 + intensity $c2 + note B_, 2 + note A#, 4 + note G#, 2 + endchannel +; 3cfcc + +Music_Pinballredfield_Ch3: ; 3cfcc + notetype $8, $23 + octave 2 + note B_, 4 + note __, 6 + octave 3 + note C_, 7 + note __, 7 + note C#, 4 + note __, 6 + octave 4 + note F_, 6 + note __, 2 + octave 3 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 +Music_Pinballredfield_branch_3cfe1: ; 3cfe1 + octave 2 + note F#, 1 + note __, 3 + octave 3 + note F#, 1 + note __, 1 + note F_, 4 + note __, 2 + note E_, 4 + note __, 2 + note D#, 4 + note __, 2 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note A#, 4 + note A#, 1 + note __, 1 + note B_, 1 + note __, 3 + octave 3 + note C#, 1 + note __, 1 + note D#, 4 + note __, 2 + note D#, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 3 + note G_, 1 + note __, 1 + note G#, 1 + note __, 3 + octave 3 + note D#, 1 + note __, 1 + note F_, 4 + note G#, 1 + note __, 5 + note B_, 1 + note __, 5 + octave 4 + note C#, 6 + note __, 2 + octave 2 + note G#, 1 + note __, 3 + octave 3 + note G#, 1 + note __, 1 + note G_, 4 + note __, 2 + note F#, 4 + note __, 2 + note D#, 4 + note __, 2 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note G#, 4 + note B_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 3 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note B_, 4 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note G#, 4 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + note D#, 4 + note E_, 1 + note __, 1 + note F_, 4 + note E_, 1 + note __, 1 + note D#, 4 + note D_, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 3 + octave 3 + note F#, 1 + note __, 1 + note F_, 4 + note __, 2 + note E_, 4 + note __, 2 + note D#, 4 + note __, 2 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note A#, 4 + note A#, 1 + note __, 1 + note B_, 1 + note __, 3 + octave 3 + note C#, 1 + note __, 1 + note D#, 4 + note __, 2 + note D#, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 3 + note G_, 1 + note __, 1 + note G#, 1 + note __, 3 + octave 3 + note D#, 1 + note __, 1 + note F_, 4 + note G#, 1 + note __, 5 + note B_, 1 + note __, 5 + octave 4 + note C#, 6 + note __, 2 + octave 2 + note G#, 1 + note __, 3 + octave 3 + note G#, 1 + note __, 1 + note G_, 4 + note __, 2 + note F#, 4 + note __, 2 + note D#, 4 + note __, 2 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note G#, 4 + note B_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 3 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note B_, 4 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note A#, 4 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note G#, 4 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note F#, 2 + note __, 10 + octave 3 + note E_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 2 + note B_, 3 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 7 + note B_, 3 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 7 + note A#, 3 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 3 + note A#, 1 + note __, 7 + note A#, 3 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 3 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 5 + note G#, 3 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 7 + note G#, 3 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 7 + note F#, 3 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 7 + note G_, 3 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 5 + note B_, 3 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 7 + note B_, 3 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 1 + note __, 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 7 + note A#, 3 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 3 + note A#, 1 + note __, 7 + note A#, 3 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 3 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 5 + note G#, 3 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 7 + note G#, 3 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note F#, 2 + octave 2 + note G#, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note G#, 1 + note __, 1 + note G#, 2 + note __, 4 + note F#, 3 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 1 + note __, 7 + note G#, 3 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 3 + note G#, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + note F_, 1 + note __, 1 + note C#, 1 + note __, 1 + loopchannel 0, Music_Pinballredfield_branch_3cfe1 +; 3d1cd + +Music_Pinballredfield_Ch4: ; 3d1cd + togglenoise $0 + notetype $8 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 +Music_Pinballredfield_branch_3d1e4: ; 3d1e4 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note G_, 8 + note __, 16 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note D_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note D_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + note G_, 4 + note G_, 2 + note D_, 4 + note G_, 2 + loopchannel 0, Music_Pinballredfield_branch_3d1e4 +; 3d2ed + + diff --git a/crysaudio/music/pinball/seelstage.asm b/crysaudio/music/pinball/seelstage.asm new file mode 100644 index 00000000..2e4ca4de --- /dev/null +++ b/crysaudio/music/pinball/seelstage.asm @@ -0,0 +1,1434 @@ +Music_Pinballseelstage: ; 45601 + dbw $c0, Music_Pinballseelstage_Ch1 + dbw $01, Music_Pinballseelstage_Ch2 + dbw $02, Music_Pinballseelstage_Ch3 + dbw $03, Music_Pinballseelstage_Ch4 +; 4560d + +Music_Pinballseelstage_Ch1: ; 4560d + tempo 153 + volume $77 + tone $0001 +Music_Pinballseelstage_branch_45615: ; 45615 + dutycycle $1 + notetype $c, $b3 + note __, 16 + notetype $6, $54 + note __, 4 + octave 4 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 16 + note __, 5 + notetype $c, $b3 + note __, 16 + note __, 2 + notetype $6, $54 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 16 + note __, 1 + notetype $c, $b3 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 2 + notetype $6, $54 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 16 + note __, 5 + notetype $c, $b3 + note __, 16 + note __, 2 + notetype $6, $54 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 16 + note __, 1 + dutycycle $2 + forceoctave $7 + callchannel Music_Pinballseelstage_branch_4570a + forceoctave $0 + callchannel Music_Pinballseelstage_branch_456f0 + forceoctave $4 + callchannel Music_Pinballseelstage_branch_4570a + forceoctave $0 + callchannel Music_Pinballseelstage_branch_4570a + forceoctave $7 + callchannel Music_Pinballseelstage_branch_4570a + notetype $8, $b3 + note __, 12 + note __, 12 + note __, 12 + forceoctave $7 + callchannel Music_Pinballseelstage_branch_4570a + forceoctave $0 + callchannel Music_Pinballseelstage_branch_456f0 + forceoctave $c + callchannel Music_Pinballseelstage_branch_4570a + forceoctave $4 + callchannel Music_Pinballseelstage_branch_4570a + forceoctave $0 + notetype $c, $b3 + note __, 16 + note __, 9 + notetype $6, $b1 + octave 2 + note F#, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 5 + note D#, 1 + note __, 1 + intensity $c2 + note F#, 2 + callchannel Music_Pinballseelstage_branch_45725 + note __, 8 + intensity $52 + note F_, 2 + intensity $51 + note F#, 6 + note B_, 2 + octave 5 + note C_, 4 + note C_, 4 + note F#, 4 + note F#, 2 + callchannel Music_Pinballseelstage_branch_45725 + note __, 8 + intensity $52 + note F_, 2 + intensity $51 + note F#, 16 + note __, 2 + intensity $62 + octave 3 + note D#, 2 + note C_, 2 + callchannel Music_Pinballseelstage_branch_45725 + dutycycle $1 + intensity $73 + octave 1 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + note G#, 2 + note A_, 1 + note __, 3 + note A#, 1 + note __, 1 + note B_, 1 + note __, 15 + loopchannel 0, Music_Pinballseelstage_branch_45615 +; 456f0 + +Music_Pinballseelstage_branch_456f0: ; 456f0 + intensity $a4 + octave 3 + note F#, 2 + intensity $24 + note F#, 2 + intensity $64 + note F#, 2 + intensity $14 + note F#, 2 + intensity $44 + note F#, 2 + intensity $14 + note F#, 2 + intensity $a4 + note B_, 2 + intensity $14 + note B_, 2 + endchannel +; 4570a + +Music_Pinballseelstage_branch_4570a: ; 4570a + notetype $6, $a4 + octave 3 + note E_, 2 + intensity $24 + note E_, 2 + intensity $64 + note E_, 2 + intensity $14 + note E_, 2 + intensity $44 + note E_, 2 + intensity $14 + note E_, 2 + intensity $24 + note E_, 2 + intensity $14 + note E_, 2 + endchannel +; 45725 + +Music_Pinballseelstage_branch_45725: ; 45725 + note __, 8 + intensity $52 + octave 4 + note A#, 2 + intensity $51 + note B_, 6 + note __, 16 + note __, 8 + intensity $52 + note A_, 2 + intensity $51 + note A#, 6 + note __, 16 + note __, 8 + intensity $52 + note G_, 2 + intensity $51 + note G#, 6 + note __, 16 + endchannel +; 4573f + +Music_Pinballseelstage_Ch2: ; 4573f +Music_Pinballseelstage_branch_4573f: ; 4573f + dutycycle $2 + notetype $6, $a1 + callchannel Music_Pinballseelstage_branch_45924 + note __, 15 + note __, 9 + callchannel Music_Pinballseelstage_branch_45924 + note __, 6 + intensity $54 + octave 4 + note G#, 1 + note __, 15 + note __, 2 + forceoctave $5 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_45935 + forceoctave $3 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_45969 + intensity $b2 + octave 3 + note C_, 2 + intensity $43 + callchannel Music_Pinballseelstage_branch_45980 + forceoctave $5 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_45935 + forceoctave $7 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_45969 + intensity $42 + octave 3 + note G_, 2 + callchannel Music_Pinballseelstage_branch_459b6 + intensity $52 + note F#, 2 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + note A#, 2 + note B_, 2 + notetype $6, $91 + callchannel Music_Pinballseelstage_branch_45924 + note __, 15 + note __, 9 + callchannel Music_Pinballseelstage_branch_45924 + note __, 6 + intensity $54 + octave 4 + note G#, 1 + note __, 15 + note __, 2 + intensity $b1 + forceoctave $5 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_45935 + forceoctave $3 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_45969 + forceoctave $c + intensity $a3 + octave 3 + note C_, 2 + callchannel Music_Pinballseelstage_branch_45980 + forceoctave $5 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_45935 + forceoctave $7 + callchannel Music_Pinballseelstage_branch_4594f + forceoctave $0 + callchannel Music_Pinballseelstage_branch_45969 + intensity $32 + forceoctave $c + octave 2 + note G_, 2 + callchannel Music_Pinballseelstage_branch_459b6 + forceoctave $0 + intensity $b1 + octave 2 + note B_, 1 + intensity $18 + note B_, 1 + intensity $b1 + note A#, 1 + intensity $18 + note A#, 1 + intensity $b1 + note B_, 1 + intensity $18 + note B_, 1 + intensity $b1 + octave 4 + note B_, 1 + intensity $18 + note B_, 1 + intensity $81 + octave 5 + note D#, 1 + intensity $18 + note D#, 1 + intensity $91 + note F#, 1 + intensity $18 + note F#, 1 + intensity $b2 + note B_, 2 + callchannel Music_Pinballseelstage_branch_459ef + note __, 10 + intensity $82 + note G_, 2 + intensity $a4 + note G#, 4 + callchannel Music_Pinballseelstage_branch_45a01 + note __, 10 + intensity $82 + note A#, 2 + intensity $a4 + note B_, 4 + callchannel Music_Pinballseelstage_branch_45a14 + note __, 10 + intensity $82 + note A_, 2 + intensity $a4 + note A#, 4 + callchannel Music_Pinballseelstage_branch_45a25 + intensity $51 + octave 5 + note F_, 2 + note F#, 4 + note F#, 4 + intensity $82 + octave 4 + note A#, 2 + intensity $a4 + note B_, 4 + octave 5 + callchannel Music_Pinballseelstage_branch_459ef + intensity $32 + octave 3 + note A#, 2 + intensity $42 + octave 4 + note C#, 2 + intensity $52 + octave 3 + note A#, 2 + intensity $62 + octave 4 + note C#, 2 + intensity $72 + note E_, 2 + intensity $92 + note G_, 2 + intensity $a4 + note G#, 4 + callchannel Music_Pinballseelstage_branch_45a01 + intensity $32 + octave 3 + note G#, 2 + intensity $42 + note B_, 2 + intensity $52 + note G#, 2 + intensity $62 + note B_, 2 + intensity $72 + octave 4 + note F#, 2 + intensity $92 + note A#, 2 + intensity $a4 + note B_, 4 + callchannel Music_Pinballseelstage_branch_45a14 + intensity $32 + octave 3 + note F#, 2 + intensity $42 + note A#, 2 + intensity $52 + note F#, 2 + intensity $62 + note A#, 2 + intensity $72 + octave 4 + note C#, 2 + intensity $92 + note A_, 2 + intensity $a4 + note A#, 4 + callchannel Music_Pinballseelstage_branch_45a25 + intensity $71 + octave 4 + note A_, 2 + intensity $61 + note F#, 2 + intensity $51 + note D#, 2 + note C_, 2 + octave 3 + note A_, 2 + note F#, 2 + intensity $74 + octave 4 + note B_, 4 + intensity $72 + octave 5 + note C#, 2 + intensity $71 + octave 4 + note G#, 2 + intensity $72 + note B_, 2 + intensity $71 + note E_, 6 + intensity $72 + note E_, 2 + note G#, 2 + note __, 10 + note G_, 2 + intensity $74 + note G#, 4 + intensity $72 + note F#, 2 + intensity $71 + note C#, 2 + intensity $72 + note F_, 2 + intensity $71 + octave 3 + note A#, 6 + intensity $72 + octave 4 + note F#, 2 + note B_, 2 + note __, 10 + note A#, 2 + intensity $74 + note B_, 4 + intensity $72 + note A#, 2 + intensity $71 + note E_, 2 + intensity $72 + note G#, 2 + intensity $71 + note C#, 6 + intensity $72 + note F#, 2 + note A#, 2 + note __, 10 + note A_, 2 + intensity $74 + note A#, 4 + intensity $b3 + note B_, 1 + intensity $63 + note D#, 1 + note __, 2 + intensity $b3 + note B_, 1 + note D#, 1 + note __, 2 + intensity $63 + note G#, 2 + intensity $b3 + note A_, 1 + intensity $63 + note C#, 1 + note __, 2 + intensity $b3 + note A#, 1 + intensity $63 + note D_, 1 + intensity $b3 + note B_, 1 + note D#, 1 + note __, 6 + intensity $61 + octave 5 + note F#, 1 + note E_, 1 + note C#, 1 + octave 4 + note A#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 3 + note A#, 1 + loopchannel 0, Music_Pinballseelstage_branch_4573f +; 45924 + +Music_Pinballseelstage_branch_45924: ; 45924 + octave 2 + note B_, 2 + note F#, 2 + note A#, 2 + note B_, 2 + note __, 15 + note __, 1 + octave 3 + note F#, 2 + note D#, 2 + note D_, 2 + note D#, 2 + note B_, 2 + note G#, 2 + note G_, 2 + note G#, 2 + endchannel +; 45935 + +Music_Pinballseelstage_branch_45935: ; 45935 + intensity $a4 + octave 4 + note D#, 2 + intensity $24 + note D#, 2 + intensity $74 + note D#, 2 + intensity $24 + note D#, 2 + intensity $54 + note D#, 2 + intensity $14 + note D#, 2 + intensity $a4 + note F#, 2 + intensity $24 + note F#, 2 + endchannel +; 4594f + +Music_Pinballseelstage_branch_4594f: ; 4594f + intensity $a4 + octave 4 + note C#, 2 + intensity $24 + note C#, 2 + intensity $74 + note C#, 2 + intensity $24 + note C#, 2 + intensity $54 + note C#, 2 + intensity $14 + note C#, 2 + intensity $34 + note C#, 2 + intensity $14 + note C#, 2 + endchannel +; 45969 + +Music_Pinballseelstage_branch_45969: ; 45969 + intensity $a4 + octave 4 + note E_, 2 + intensity $24 + note E_, 2 + intensity $74 + note E_, 2 + intensity $24 + note E_, 2 + intensity $54 + note E_, 2 + intensity $14 + note E_, 2 + intensity $34 + note E_, 2 + endchannel +; 45980 + +Music_Pinballseelstage_branch_45980: ; 45980 + intensity $52 + note C#, 2 + octave 2 + note G#, 2 + intensity $b2 + octave 3 + note G#, 2 + intensity $52 + note C#, 2 + intensity $b2 + note C_, 2 + intensity $52 + note C#, 2 + intensity $b2 + note E_, 2 + note C#, 2 + note F#, 2 + intensity $52 + octave 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 + intensity $92 + octave 3 + note C#, 2 + intensity $b2 + note D#, 2 + intensity $52 + octave 2 + note F#, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note F#, 2 + intensity $82 + note G#, 2 + intensity $92 + note A#, 2 + endchannel +; 459b6 + +Music_Pinballseelstage_branch_459b6: ; 459b6 + intensity $b2 + octave 3 + note G#, 2 + intensity $52 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note G#, 2 + intensity $b2 + note F#, 2 + intensity $52 + note E_, 2 + intensity $b2 + note G#, 2 + intensity $52 + octave 2 + note F#, 2 + note A#, 2 + octave 3 + note C#, 2 + intensity $b2 + note F#, 2 + intensity $52 + note A#, 2 + intensity $b2 + note B_, 2 + intensity $52 + note C#, 2 + note E_, 2 + note G#, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note A#, 2 + intensity $b2 + note B_, 2 + endchannel +; 459ef + +Music_Pinballseelstage_branch_459ef: ; 459ef + intensity $b2 + note C#, 2 + intensity $51 + octave 4 + note G#, 2 + intensity $b2 + note B_, 2 + intensity $51 + note E_, 6 + intensity $b2 + note E_, 2 + note G#, 2 + endchannel +; 45a01 + +Music_Pinballseelstage_branch_45a01: ; 45a01 + intensity $b2 + note F#, 2 + intensity $51 + note C#, 2 + intensity $b2 + note F_, 2 + intensity $51 + octave 3 + note A#, 6 + intensity $b2 + octave 4 + note F#, 2 + note B_, 2 + endchannel +; 45a14 + +Music_Pinballseelstage_branch_45a14: ; 45a14 + intensity $b2 + note A#, 2 + intensity $51 + note E_, 2 + intensity $b2 + note G#, 2 + intensity $51 + note C#, 6 + intensity $b2 + note F#, 2 + note A#, 2 + endchannel +; 45a25 + +Music_Pinballseelstage_branch_45a25: ; 45a25 + intensity $b2 + note B_, 2 + intensity $51 + note F#, 2 + intensity $b2 + note A#, 2 + intensity $51 + note D#, 6 + intensity $b2 + note B_, 2 + octave 5 + note D#, 2 + endchannel +; 45a37 + +Music_Pinballseelstage_Ch3: ; 45a37 +Music_Pinballseelstage_branch_45a37: ; 45a37 + callchannel Music_Pinballseelstage_branch_45baa + callchannel Music_Pinballseelstage_branch_45bb9 + callchannel Music_Pinballseelstage_branch_45baa + callchannel Music_Pinballseelstage_branch_45bb9 + callchannel Music_Pinballseelstage_branch_45baa + notetype $6, $22 + note E_, 2 + note __, 12 + octave 1 + note F#, 2 + note A_, 2 + note __, 6 + note A#, 2 + note __, 6 + octave 2 + note C#, 2 + note __, 12 + octave 1 + note F#, 2 + note A#, 2 + note __, 2 + octave 2 + note F#, 2 + note __, 6 + note F#, 2 + note __, 2 + note D#, 2 + note __, 12 + octave 1 + note F#, 2 + note G#, 2 + note __, 6 + note A#, 2 + note __, 6 + callchannel Music_Pinballseelstage_branch_45baa + notetype $6, $22 + note E_, 2 + note __, 12 + octave 1 + note G#, 2 + note B_, 2 + note __, 6 + octave 2 + note E_, 2 + note __, 6 + note E_, 2 + note __, 12 + note C#, 2 + note F#, 2 + note __, 2 + note A#, 2 + note __, 6 + note A#, 2 + note __, 2 + note B_, 2 + note __, 14 + octave 1 + note B_, 2 + note __, 14 + callchannel Music_Pinballseelstage_branch_45baa + callchannel Music_Pinballseelstage_branch_45bb9 + callchannel Music_Pinballseelstage_branch_45baa + notetype $6, $22 + note E_, 2 + note __, 2 + notetype $6, $32 + octave 4 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + notetype $6, $22 + octave 1 + note F#, 2 + note A_, 2 + note __, 6 + notetype $6, $32 + octave 4 + note F_, 8 + notetype $6, $22 + callchannel Music_Pinballseelstage_branch_45bd1 + octave 2 + note E_, 2 + note __, 2 + notetype $6, $32 + octave 5 + note D#, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + notetype $6, $22 + octave 1 + note F#, 2 + note A_, 2 + note __, 6 + note A#, 2 + note __, 6 + octave 2 + note C#, 2 + note __, 2 + notetype $6, $32 + octave 5 + note D#, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + notetype $6, $22 + octave 1 + note F#, 2 + note A#, 2 + note __, 2 + octave 2 + note F#, 2 + note __, 6 + note F#, 2 + note __, 2 + note D#, 2 + note __, 2 + notetype $6, $32 + octave 5 + note D_, 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 3 + notetype $6, $22 + octave 1 + note F#, 2 + note G#, 2 + note __, 6 + note A#, 2 + note __, 6 + callchannel Music_Pinballseelstage_branch_45bd1 + note E_, 2 + note __, 2 + notetype $6, $32 + octave 5 + note D#, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + notetype $6, $22 + octave 1 + note G#, 2 + note B_, 2 + note __, 6 + octave 2 + note E_, 2 + note __, 6 + note E_, 2 + note __, 2 + notetype $6, $32 + octave 5 + note D#, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + notetype $6, $22 + octave 2 + note C#, 2 + note F#, 2 + note __, 2 + note A#, 2 + note __, 6 + note A#, 2 + note __, 2 + note B_, 2 + note __, 2 + notetype $6, $32 + octave 5 + note D_, 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 3 + note D#, 1 + note __, 1 + octave 1 + note B_, 2 + octave 5 + note D#, 1 + note __, 3 + notetype $6, $22 + note D#, 1 + note __, 3 + note D#, 1 + note __, 3 + note D#, 1 + note __, 1 + callchannel Music_Pinballseelstage_branch_45bec + callchannel Music_Pinballseelstage_branch_45c23 + callchannel Music_Pinballseelstage_branch_45bec + callchannel Music_Pinballseelstage_branch_45c23 + notetype $6, $32 + octave 2 + note E_, 2 + note __, 6 + octave 5 + note G_, 2 + note G#, 1 + note __, 3 + octave 2 + note E_, 2 + note __, 2 + octave 1 + note B_, 2 + note __, 2 + octave 3 + note D#, 2 + note E_, 2 + note __, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note D#, 2 + note __, 6 + octave 5 + note F_, 2 + note F#, 1 + note __, 3 + octave 2 + note D#, 2 + note __, 2 + octave 1 + note G#, 2 + note __, 2 + octave 3 + note D_, 2 + note D#, 2 + note __, 2 + octave 2 + note D#, 2 + octave 3 + note D#, 2 + octave 2 + note C#, 2 + note __, 6 + octave 5 + note D#, 2 + note E_, 1 + note __, 3 + octave 2 + note C#, 2 + note __, 2 + note F#, 2 + note __, 2 + octave 3 + note C_, 2 + note C#, 2 + note __, 2 + octave 2 + note F#, 2 + octave 3 + note C#, 2 + note D#, 1 + note __, 3 + note D#, 1 + note __, 3 + note C_, 2 + note C#, 1 + note __, 3 + note D_, 1 + note __, 1 + note D#, 1 + note __, 7 + octave 4 + note A#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + octave 3 + note A#, 1 + note F#, 1 + note E_, 1 + note C#, 1 + loopchannel 0, Music_Pinballseelstage_branch_45a37 +; 45baa + +Music_Pinballseelstage_branch_45baa: ; 45baa + notetype $c, $22 + octave 1 + note B_, 1 + note __, 6 + note F#, 1 + note A_, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + endchannel +; 45bb9 + +Music_Pinballseelstage_branch_45bb9: ; 45bb9 + note E_, 1 + note __, 1 + notetype $6, $32 + octave 4 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 3 + notetype $6, $22 + octave 1 + note F#, 2 + note A_, 2 + note __, 6 + note A#, 2 + note __, 6 + endchannel +; 45bd1 + +Music_Pinballseelstage_branch_45bd1: ; 45bd1 + octave 1 + note B_, 2 + note __, 2 + notetype $6, $32 + octave 5 + note D_, 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 3 + notetype $6, $22 + octave 1 + note F#, 2 + note A_, 2 + note __, 2 + octave 2 + note F#, 2 + note __, 6 + note F#, 2 + note __, 2 + endchannel +; 45bec + +Music_Pinballseelstage_branch_45bec: ; 45bec + octave 2 + note E_, 2 + note __, 6 + notetype $6, $32 + octave 5 + note G_, 2 + notetype $6, $22 + note G#, 1 + note __, 3 + octave 2 + note E_, 2 + note __, 2 + octave 1 + note B_, 2 + note __, 2 + octave 3 + note D#, 2 + note E_, 2 + note __, 2 + octave 2 + note E_, 2 + octave 3 + note E_, 2 + octave 2 + note D#, 2 + note __, 6 + notetype $6, $32 + octave 5 + note F_, 2 + notetype $6, $22 + note F#, 1 + note __, 3 + octave 2 + note D#, 2 + note __, 2 + octave 1 + note G#, 2 + note __, 2 + octave 3 + note D_, 2 + note D#, 2 + note __, 2 + octave 2 + note D#, 2 + octave 3 + note D#, 2 + endchannel +; 45c23 + +Music_Pinballseelstage_branch_45c23: ; 45c23 + octave 2 + note C#, 2 + note __, 6 + notetype $6, $32 + octave 5 + note D#, 2 + notetype $6, $22 + note E_, 1 + note __, 3 + octave 2 + note C#, 2 + note __, 2 + octave 1 + note F#, 2 + note __, 2 + octave 3 + note C_, 2 + note C#, 2 + note __, 2 + octave 2 + note F#, 2 + octave 3 + note C#, 2 + octave 1 + note B_, 2 + note __, 6 + notetype $6, $32 + octave 5 + note D_, 2 + notetype $6, $22 + note D#, 1 + note __, 3 + octave 1 + note B_, 2 + note __, 2 + octave 2 + note F#, 2 + note __, 2 + note F#, 2 + note A_, 2 + note __, 2 + note F#, 2 + note A_, 2 + endchannel +; 45c57 + +Music_Pinballseelstage_Ch4: ; 45c57 + togglenoise $2 +Music_Pinballseelstage_branch_45c59: ; 45c59 + notetype $c + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d26 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d26 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d32 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d32 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d32 + callchannel Music_Pinballseelstage_branch_45d1b + note D#, 2 + note G_, 1 + note G_, 1 + note D_, 4 + note D#, 1 + note G_, 1 + note D_, 2 + note D_, 1 + note D#, 1 + note D_, 1 + note D_, 1 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d26 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d26 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d32 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d32 + callchannel Music_Pinballseelstage_branch_45d1b + callchannel Music_Pinballseelstage_branch_45d32 + callchannel Music_Pinballseelstage_branch_45d1b + note D#, 2 + note G_, 1 + note G_, 1 + note D_, 4 + note D#, 1 + note D#, 1 + note G_, 1 + note D_, 1 + note D#, 1 + note D_, 1 + note D_, 1 + note D_, 1 + callchannel Music_Pinballseelstage_branch_45d3e + note D_, 1 + note G_, 1 + note G#, 1 + note G#, 1 + callchannel Music_Pinballseelstage_branch_45d3e + note D_, 1 + note D_, 1 + note G#, 1 + note G_, 1 + callchannel Music_Pinballseelstage_branch_45d3e + note D_, 1 + note G_, 1 + note G#, 1 + note G#, 1 + callchannel Music_Pinballseelstage_branch_45d3e + note D_, 1 + note G_, 1 + note D_, 1 + note D_, 1 + callchannel Music_Pinballseelstage_branch_45d3e + note D_, 1 + note G_, 1 + note G#, 1 + note G#, 1 + callchannel Music_Pinballseelstage_branch_45d3e + note D_, 1 + note D_, 1 + note G#, 1 + note G_, 1 + callchannel Music_Pinballseelstage_branch_45d3e + note D_, 1 + note G_, 1 + note G#, 1 + note G#, 1 + callchannel Music_Pinballseelstage_branch_45d3e + note D_, 1 + note D_, 1 + note G_, 1 + note D_, 1 + notetype $c + note C_, 2 + note C#, 2 + note E_, 2 + note F_, 2 + note F#, 2 + note A_, 2 + note A#, 2 + note B_, 4 + note A#, 2 + note A_, 2 + note F#, 2 + note F_, 2 + note E_, 2 + note C#, 2 + note C_, 2 + note C_, 1 + note C#, 1 + note E_, 1 + note F_, 1 + note F#, 1 + note A_, 1 + note A#, 1 + note B_, 2 + note A#, 1 + note A_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note C#, 1 + note C_, 1 + notetype $6 + note D_, 4 + note D_, 4 + note D#, 2 + note D_, 4 + note D_, 2 + note D_, 8 + note D#, 4 + note D#, 2 + note D_, 2 + loopchannel 0, Music_Pinballseelstage_branch_45c59 +; 45d1b + +Music_Pinballseelstage_branch_45d1b: ; 45d1b + note D#, 2 + note G_, 1 + note G_, 1 + note D_, 3 + note D#, 1 + note D#, 2 + note D#, 1 + note G_, 1 + note D_, 3 + note D#, 1 + endchannel +; 45d26 + +Music_Pinballseelstage_branch_45d26: ; 45d26 + note D#, 2 + note G_, 1 + note G_, 1 + note D_, 4 + note D#, 1 + note G_, 1 + note D_, 2 + note D#, 1 + note D#, 1 + note D_, 1 + note G_, 1 + endchannel +; 45d32 + +Music_Pinballseelstage_branch_45d32: ; 45d32 + note D#, 2 + note G_, 1 + note G_, 1 + note D_, 4 + note D#, 1 + note G_, 1 + note D_, 2 + note D#, 1 + note D#, 1 + note D_, 1 + note D_, 1 + endchannel +; 45d3e + +Music_Pinballseelstage_branch_45d3e: ; 45d3e + 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 + endchannel +; 45d4b + + diff --git a/crysaudio/music/pinball/titlescreen.asm b/crysaudio/music/pinball/titlescreen.asm new file mode 100644 index 00000000..09c47501 --- /dev/null +++ b/crysaudio/music/pinball/titlescreen.asm @@ -0,0 +1,1103 @@ +Music_Pinballtitlescreen: ; 45d4b + dbw $c0, Music_Pinballtitlescreen_Ch1 + dbw $01, Music_Pinballtitlescreen_Ch2 + dbw $02, Music_Pinballtitlescreen_Ch3 + dbw $03, Music_Pinballtitlescreen_Ch4 +; 45d57 + +Music_Pinballtitlescreen_Ch1: ; 45d57 + tempo 130 + volume $77 + tone $0001 + dutycycle $2 + notetype $c, $92 + note __, 2 + note __, 2 + octave 4 + note C_, 2 + notetype $6, $61 + note C_, 2 + note D#, 2 + note C_, 2 + note D#, 2 + intensity $92 + octave 3 + note A_, 2 + note __, 6 + note A_, 2 + note __, 6 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + intensity $41 + octave 4 + note C#, 2 + note G_, 2 + intensity $51 + note C#, 2 + note G_, 2 + intensity $71 + note C#, 2 + note G_, 2 + intensity $91 + note C#, 2 + note G_, 2 + intensity $a1 + note C#, 2 + note G_, 2 +Music_Pinballtitlescreen_branch_45d91: ; 45d91 + intensity $88 + note __, 4 + octave 3 + note C_, 2 + note __, 2 + loopchannel 8, Music_Pinballtitlescreen_branch_45d91 + intensity $61 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note D_, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note G_, 2 + note A#, 2 + octave 4 + note D#, 2 + note C#, 4 + note C_, 4 + octave 3 + note A#, 16 + intensity $91 + octave 4 + note G#, 2 + note D#, 2 + intensity $88 + octave 3 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + note C_, 2 + note __, 2 + intensity $91 + octave 4 + note G#, 2 + note F_, 2 + intensity $88 + octave 3 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + note C_, 2 + note __, 6 + note C_, 2 + note __, 2 + intensity $91 + octave 5 + note C#, 2 + octave 4 + note G#, 2 + intensity $61 + octave 3 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note F_, 2 + note C#, 2 + note D_, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + octave 2 + note B_, 2 + note __, 16 + note __, 7 + intensity $68 + octave 5 + note D_, 1 + intensity $78 + note D#, 8 + intensity $88 + note __, 4 + octave 3 + note F_, 2 + note __, 6 + note F_, 2 + note __, 6 + note F_, 2 + note __, 6 + note F_, 2 + note __, 2 + note __, 4 + note G#, 2 + note __, 6 + note G#, 2 + note __, 6 + note A_, 2 + note __, 6 + note A_, 2 + note __, 2 + note __, 4 + octave 4 + note C#, 2 + note __, 6 + note C#, 2 + note __, 6 + octave 3 + note A#, 2 + note __, 6 + note A#, 2 + note __, 2 + intensity $72 + note D#, 2 + note G_, 2 + octave 4 + note C#, 2 + note D#, 2 + note C#, 4 + note C_, 4 + octave 3 + note A#, 4 + note G#, 4 + note G_, 4 + octave 4 + note D#, 4 + intensity $71 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + intensity $88 + octave 3 + note F_, 2 + intensity $71 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note C_, 2 + intensity $88 + octave 3 + note F_, 2 + intensity $71 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + intensity $88 + octave 3 + note F_, 2 + intensity $71 + octave 4 + note D_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + intensity $88 + octave 3 + note F_, 2 + intensity $71 + octave 4 + note D_, 2 + note C_, 2 + note D#, 2 + intensity $88 + octave 3 + note G#, 2 + intensity $71 + octave 4 + note D#, 2 + note C_, 2 + note D#, 2 + intensity $88 + octave 3 + note G#, 2 + intensity $71 + octave 4 + note D#, 2 + note C_, 2 + note D#, 2 + intensity $88 + octave 3 + note A_, 2 + intensity $71 + octave 4 + note D#, 2 + note F_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note A_, 2 + note C#, 2 + note A#, 2 + intensity $88 + note F_, 2 + intensity $71 + note A#, 2 + note C#, 2 + note A#, 2 + intensity $88 + note F_, 2 + intensity $71 + note A#, 2 + note D_, 2 + note A#, 2 + intensity $88 + note F_, 2 + intensity $71 + note A#, 2 + note D_, 2 + note A#, 2 + intensity $88 + note F_, 2 + intensity $71 + note A#, 2 + intensity $57 + note G_, 8 + intensity $77 + note G#, 8 + intensity $97 + note A_, 8 + intensity $a7 + note A#, 8 + loopchannel 0, Music_Pinballtitlescreen_branch_45d91 +; 45eae + +Music_Pinballtitlescreen_Ch2: ; 45eae + notetype $c, $b3 + dutycycle $2 + vibrato $9, $24 + note __, 2 + intensity $a8 + octave 2 + note G#, 1 + note __, 1 + intensity $a8 + octave 4 + note G#, 6 + intensity $a1 + note G_, 1 + notetype $6, $71 + note D#, 2 + note C_, 2 + note D#, 2 + intensity $a1 + note G_, 2 + intensity $71 + note D#, 2 + note C_, 2 + note D#, 2 + intensity $a1 + note F_, 2 + intensity $71 + note C#, 2 + intensity $a1 + note E_, 2 + intensity $71 + note C#, 2 + intensity $a1 + note D#, 2 + intensity $71 + note C#, 2 + notetype $c, $a8 + note A#, 10 +Music_Pinballtitlescreen_branch_45ee7: ; 45ee7 + notetype $c, $a8 + dutycycle $2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + octave 4 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + octave 3 + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + octave 4 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note C#, 2 + intensity $28 + note C#, 2 + intensity $a8 + note D#, 2 + callchannel Music_Pinballtitlescreen_branch_460da + intensity $a8 + note G#, 1 + intensity $28 + note G#, 1 + intensity $a8 + note G_, 1 + intensity $28 + note G_, 1 + intensity $a8 + note F#, 1 + intensity $28 + note F#, 1 + intensity $a8 + note F_, 1 + intensity $28 + note F_, 1 + intensity $a8 + note D#, 1 + intensity $28 + note D#, 1 + notetype $6, $61 + note G#, 4 + note G_, 4 + intensity $78 + note A#, 2 + intensity $68 + note B_, 2 + intensity $a8 + octave 4 + note C_, 6 + octave 3 + note B_, 2 + note A#, 4 + octave 4 + note C_, 4 + intensity $28 + note C_, 4 + intensity $a8 + octave 3 + note B_, 4 + intensity $28 + note B_, 4 + intensity $a8 + note A#, 4 + octave 4 + note C_, 6 + octave 3 + note B_, 2 + note A#, 4 + octave 4 + note C_, 4 + intensity $28 + note C_, 4 + intensity $a8 + note C#, 4 + intensity $28 + note C#, 4 + intensity $a8 + note D#, 4 + notetype $c, $a8 + callchannel Music_Pinballtitlescreen_branch_460da + notetype $6, $a2 + note G#, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note D_, 1 + intensity $28 + note D_, 1 + intensity $a8 + note D#, 1 + intensity $28 + note D#, 1 + intensity $a8 + octave 2 + note A#, 2 + intensity $28 + note A#, 2 + intensity $a8 + note A_, 1 + intensity $28 + note A_, 1 + intensity $a8 + note A#, 1 + intensity $28 + note A#, 1 + intensity $a8 + note D#, 3 + intensity $68 + octave 4 + note F#, 1 + intensity $78 + note G_, 8 + dutycycle $3 + intensity $a8 + note F_, 2 + intensity $28 + note F_, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note A#, 2 + intensity $28 + note A#, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 1 + intensity $58 + note A#, 1 + intensity $a8 + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note A#, 2 + intensity $28 + note A#, 2 + intensity $a8 + note G#, 2 + intensity $58 + note A#, 1 + note B_, 1 + intensity $a8 + octave 5 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + octave 4 + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + octave 5 + note C_, 2 + intensity $28 + note C_, 1 + intensity $58 + note D_, 1 + intensity $a8 + note D#, 2 + intensity $28 + note D#, 2 + intensity $a8 + note C#, 2 + intensity $28 + note C#, 2 + intensity $a8 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note D#, 2 + intensity $28 + note D#, 2 + intensity $a8 + note C#, 2 + intensity $28 + note C#, 2 + intensity $a8 + octave 4 + note F_, 2 + intensity $28 + note F_, 2 + intensity $a8 + note G_, 2 + intensity $28 + note G_, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note A#, 2 + intensity $28 + note A#, 2 + intensity $a8 + octave 5 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + octave 4 + note A#, 2 + intensity $28 + note A#, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note G_, 6 + note F#, 2 + note F_, 2 + intensity $28 + note F_, 2 + intensity $a8 + note G_, 8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note A#, 4 + intensity $48 + note A_, 1 + note G#, 1 + intensity $28 + note G_, 1 + note F#, 1 + intensity $a8 + note F_, 2 + intensity $28 + note F_, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note A#, 2 + intensity $28 + note A#, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + note A#, 2 + intensity $28 + note A#, 2 + intensity $a8 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + octave 5 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + octave 4 + note B_, 2 + intensity $28 + note B_, 2 + intensity $a8 + octave 5 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note D#, 2 + intensity $28 + note D#, 2 + intensity $a8 + note C#, 2 + intensity $28 + note C#, 2 + intensity $a8 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note D#, 2 + intensity $28 + note D#, 2 + intensity $a8 + note C#, 8 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note C#, 2 + intensity $28 + note C#, 2 + intensity $a8 + note D_, 8 + note C_, 2 + intensity $28 + note C_, 2 + intensity $a8 + note D_, 2 + intensity $28 + note D_, 2 + notetype $c, $a8 + note D#, 16 + loopchannel 0, Music_Pinballtitlescreen_branch_45ee7 +; 460da + +Music_Pinballtitlescreen_branch_460da: ; 460da + note F_, 2 + octave 3 + note G#, 2 + note A#, 2 + note G#, 2 + intensity $28 + note G#, 2 + intensity $a8 + octave 4 + note C_, 1 + intensity $28 + note C_, 1 + intensity $a8 + octave 3 + note A#, 1 + intensity $28 + note A#, 1 + intensity $a8 + note G#, 1 + intensity $28 + note G#, 1 + endchannel +; 460f7 + +Music_Pinballtitlescreen_Ch3: ; 460f7 + notetype $c, $22 + note __, 2 + octave 1 + note G#, 1 + note __, 1 + octave 2 + note D#, 6 + octave 1 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A#, 1 + note __, 1 + octave 2 + note C#, 1 + note __, 1 + octave 1 + note A#, 1 + note __, 1 + octave 2 + note D#, 4 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + note G_, 1 + note __, 1 +Music_Pinballtitlescreen_branch_46115: ; 46115 + notetype $c, $22 + callchannel Music_Pinballtitlescreen_branch_461df + callchannel Music_Pinballtitlescreen_branch_46210 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 7 + callchannel Music_Pinballtitlescreen_branch_461df + callchannel Music_Pinballtitlescreen_branch_46210 + note D#, 1 + note __, 1 + note A#, 1 + note __, 1 + note D#, 1 + note __, 5 + notetype $6, $22 + octave 1 + note D#, 3 + notetype $6, $32 + octave 3 + note A_, 1 + notetype $6, $22 + note A#, 8 + notetype $c, $22 + callchannel Music_Pinballtitlescreen_branch_46210 + callchannel Music_Pinballtitlescreen_branch_46222 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 1 + note __, 1 + callchannel Music_Pinballtitlescreen_branch_46210 + callchannel Music_Pinballtitlescreen_branch_46222 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note A#, 1 + notetype $6, $32 + octave 4 + note D#, 1 + note __, 1 + notetype $6, $22 + octave 3 + note G_, 2 + notetype $6, $32 + octave 4 + note D#, 1 + note __, 1 + notetype $6, $22 + octave 2 + note A#, 2 + notetype $6, $32 + octave 4 + note D#, 1 + note __, 1 + notetype $6, $22 + octave 3 + note G_, 2 + notetype $6, $32 + octave 4 + note D#, 1 + note __, 1 + notetype $6, $22 + octave 2 + note A#, 2 + notetype $6, $32 + octave 4 + note D#, 1 + note __, 1 + notetype $6, $22 + octave 3 + note G_, 2 + notetype $6, $32 + octave 4 + note D#, 1 + note __, 1 + notetype $6, $12 + octave 3 + note G_, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 2 + note D#, 4 + loopchannel 0, Music_Pinballtitlescreen_branch_46115 +; 461df + +Music_Pinballtitlescreen_branch_461df: ; 461df + octave 1 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note E_, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note F#, 1 + note __, 1 + octave 1 + note G#, 1 + note __, 1 + octave 3 + note F#, 1 + note __, 1 + endchannel +; 46210 + +Music_Pinballtitlescreen_branch_46210: ; 46210 + octave 2 + note C#, 1 + note __, 1 + note G#, 1 + note __, 1 + note C#, 1 + note __, 1 + note G#, 1 + note __, 1 + note D_, 1 + note __, 1 + note G#, 1 + note __, 1 + note D_, 1 + note __, 1 + note G#, 1 + note __, 1 + endchannel +; 46222 + +Music_Pinballtitlescreen_branch_46222: ; 46222 + note D#, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note D#, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note F_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + endchannel +; 4623a + +Music_Pinballtitlescreen_Ch4: ; 4623a + togglenoise $1 + notetype $8 + note D_, 1 + note D_, 1 + note D_, 1 + notetype $c + note D#, 2 + note B_, 6 + note A_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + callchannel Music_Pinballtitlescreen_branch_462b8 +Music_Pinballtitlescreen_branch_4624f: ; 4624f + notetype $c + callchannel Music_Pinballtitlescreen_branch_462cb + note A_, 2 + note G_, 1 + note G_, 1 + note A_, 2 + note G_, 1 + note G_, 1 + notetype $8 + note A_, 1 + note G_, 1 + note G_, 1 + notetype $c + note A_, 1 + note G_, 1 + note A_, 2 + note G_, 1 + note G_, 1 + callchannel Music_Pinballtitlescreen_branch_462cb + note A_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 8 + callchannel Music_Pinballtitlescreen_branch_462cb + callchannel Music_Pinballtitlescreen_branch_462b8 + callchannel Music_Pinballtitlescreen_branch_462cb + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note A_, 1 + note D#, 1 + notetype $6 + note __, 1 + note B_, 9 + notetype $c + callchannel Music_Pinballtitlescreen_branch_462cb + callchannel Music_Pinballtitlescreen_branch_462cb + note A_, 2 + note G_, 1 + note G_, 1 + note A_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 2 + note G_, 1 + note G_, 1 +Music_Pinballtitlescreen_branch_4629d: ; 4629d + note A_, 2 + note G_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + note A_, 1 + note G_, 1 + loopchannel 2, Music_Pinballtitlescreen_branch_4629d + callchannel Music_Pinballtitlescreen_branch_462cb + callchannel Music_Pinballtitlescreen_branch_462cb + callchannel Music_Pinballtitlescreen_branch_462cb + callchannel Music_Pinballtitlescreen_branch_462cb + loopchannel 0, Music_Pinballtitlescreen_branch_4624f +; 462b8 + +Music_Pinballtitlescreen_branch_462b8: ; 462b8 + note A_, 2 + note G_, 1 + note G_, 1 + note A_, 2 + note G_, 1 + note G_, 1 + notetype $8 + note A_, 1 + note G_, 1 + note G_, 1 + notetype $c + note G_, 1 + note G_, 1 + note A_, 2 + note G_, 1 + note G_, 1 + endchannel +; 462cb + +Music_Pinballtitlescreen_branch_462cb: ; 462cb + note A_, 2 + note G_, 1 + note G_, 1 + loopchannel 4, Music_Pinballtitlescreen_branch_462cb + endchannel +; 462d3 + diff --git a/crysaudio/music/pokeflutechannel.asm b/crysaudio/music/pokeflutechannel.asm new file mode 100644 index 00000000..9256fe54 --- /dev/null +++ b/crysaudio/music/pokeflutechannel.asm @@ -0,0 +1,234 @@ +Music_PokeFluteChannel: ; f7b13 + dbw $80, Music_PokeFluteChannel_Ch1 + dbw $01, Music_PokeFluteChannel_Ch2 + dbw $02, Music_PokeFluteChannel_Ch3 +; f7b1c + +Music_PokeFluteChannel_Ch1: ; f7b1c + tempo 240 + volume $77 + stereopanning $f0 + dutycycle $3 + tone $0002 + notetype $c, $b4 + note __, 4 + octave 3 + note E_, 8 + note E_, 8 + notetype $c, $b3 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 16 + note __, 2 + octave 2 + note G_, 4 + note A_, 8 +Music_PokeFluteChannel_branch_f7b40: ; f7b40 + octave 3 + note E_, 2 + note G_, 2 + note F_, 4 + octave 2 + note F_, 8 + octave 3 + note G_, 2 + note A_, 2 + note G_, 4 + octave 2 + note E_, 4 + octave 3 + note G_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 8 + note A_, 8 + note G_, 8 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note B_, 4 + note G_, 8 + octave 3 + note C_, 4 + note E_, 2 + note D_, 2 + octave 2 + note G_, 4 + note A_, 8 + loopchannel 0, Music_PokeFluteChannel_branch_f7b40 +; f7b68 + +Music_PokeFluteChannel_Ch2: ; f7b68 + stereopanning $f + dutycycle $3 + tone $0001 + notetype $c, $c4 + note __, 4 + octave 3 + note C_, 8 + octave 2 + note G_, 8 + note A_, 8 + octave 3 + note E_, 8 + notetype $c, $c3 + octave 2 + note E_, 2 + note G_, 2 + octave 3 + note C_, 2 + note E_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note E_, 2 + note D_, 2 + octave 2 + note E_, 2 + octave 3 + note C_, 2 + octave 2 + note F_, 2 + octave 3 + note C_, 2 + octave 2 + note E_, 2 + note G_, 2 +Music_PokeFluteChannel_branch_f7b94: ; f7b94 + octave 3 + note C_, 2 + note E_, 2 + octave 2 + note A_, 4 + note C_, 4 + octave 3 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + octave 2 + note G_, 4 + note C_, 4 + note G_, 2 + note E_, 2 + octave 3 + note C_, 2 + octave 2 + note A_, 2 + note D_, 2 + note G_, 2 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note F#, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + note G_, 2 + note D_, 2 + octave 2 + note D_, 4 + note G_, 4 + note E_, 2 + octave 3 + note C_, 2 + note C_, 4 + octave 2 + note G_, 2 + octave 3 + note E_, 2 + octave 2 + note G_, 2 + note B_, 2 + note E_, 2 + octave 3 + note C_, 2 + octave 2 + note F_, 2 + octave 3 + note C_, 2 + octave 2 + note E_, 2 + note G_, 2 + loopchannel 0, Music_PokeFluteChannel_branch_f7b94 +; f7bd5 + +Music_PokeFluteChannel_Ch3: ; f7bd5 + vibrato $10, $14 + notetype $c, $10 + callchannel Music_PokeFluteChannel_branch_f7c05 + callchannel Music_PokeFluteChannel_branch_f7c05 +Music_PokeFluteChannel_branch_f7be1: ; f7be1 + note __, 4 + octave 4 + note C_, 2 + octave 5 + note F_, 2 + note E_, 2 + note F_, 2 + octave 6 + note C_, 4 + note __, 4 + octave 4 + note C_, 2 + octave 5 + note G_, 2 + note F#, 2 + note G_, 2 + octave 6 + note C_, 4 + octave 5 + note B_, 2 + note A_, 2 + note B_, 4 + note A_, 2 + note G_, 2 + note A_, 4 + note G_, 2 + note F#, 2 + note G_, 8 + note __, 4 + callchannel Music_PokeFluteChannel_branch_f7c05 + loopchannel 0, Music_PokeFluteChannel_branch_f7be1 +; f7c05 + +Music_PokeFluteChannel_branch_f7c05: ; f7c05 + octave 5 + note E_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + octave 6 + note C_, 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 5 + note G_, 2 + note A_, 2 + note F_, 2 + note G_, 4 + endchannel +; f7c16 + + diff --git a/crysaudio/music/pokemoncenter.asm b/crysaudio/music/pokemoncenter.asm new file mode 100644 index 00000000..9ea5c7da --- /dev/null +++ b/crysaudio/music/pokemoncenter.asm @@ -0,0 +1,416 @@ +Music_PokemonCenter: ; ed5c6 + dbw $c0, Music_PokemonCenter_Ch1 + dbw $01, Music_PokemonCenter_Ch2 + dbw $02, Music_PokemonCenter_Ch3 + dbw $03, Music_PokemonCenter_Ch4 +; ed5d2 + +Music_PokemonCenter_Ch1: ; ed5d2 + tempo 152 + volume $77 + dutycycle $2 + vibrato $a, $14 + tone $0001 +Music_PokemonCenter_branch_ed5df: ; ed5df + stereopanning $f + notetype $c, $83 + octave 3 + note F#, 2 + note F_, 2 + note F#, 2 + octave 4 + note D_, 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note F#, 2 + note F_, 2 + note F#, 2 + octave 4 + note D_, 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + notetype $c, $b4 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + stereopanning $f0 + note F#, 2 + note E_, 2 + note D_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note G_, 4 + note E_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 4 + note C#, 2 + note D_, 2 + note E_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 2 + note A_, 8 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 4 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D_, 2 + note E_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 4 + note G_, 2 + note A_, 2 + note B_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + loopchannel 0, Music_PokemonCenter_branch_ed5df +; ed671 + +Music_PokemonCenter_Ch2: ; ed671 + vibrato $10, $25 +Music_PokemonCenter_branch_ed674: ; ed674 + stereopanning $ff + callchannel Music_PokemonCenter_branch_ed6d1 + stereopanning $f + notetype $c, $a5 + octave 3 + note A_, 4 + note E_, 4 + stereopanning $ff + callchannel Music_PokemonCenter_branch_ed6e4 + note D_, 2 + note F#, 6 + stereopanning $f + notetype $c, $a5 + octave 3 + note A_, 4 + note E_, 4 + stereopanning $ff + callchannel Music_PokemonCenter_branch_ed6d1 + stereopanning $f + notetype $c, $a5 + octave 3 + note A_, 4 + note E_, 4 + stereopanning $ff + callchannel Music_PokemonCenter_branch_ed6e4 + note D_, 8 + stereopanning $f + notetype $c, $a5 + octave 3 + note D_, 4 + note E_, 4 + notetype $c, $c6 + octave 4 + note F#, 8 + note A_, 8 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 8 + note C#, 8 + note E_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + note F#, 8 + note A_, 8 + note G_, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note B_, 8 + note A_, 4 + note G_, 2 + note F#, 2 + note G_, 8 + note F#, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 8 + loopchannel 0, Music_PokemonCenter_branch_ed674 +; ed6d1 + +Music_PokemonCenter_branch_ed6d1: ; ed6d1 + dutycycle $2 + notetype $c, $c2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + intensity $c3 + note A_, 4 + note G_, 4 + note F#, 2 + note E_, 2 + note C#, 6 + endchannel +; ed6e4 + +Music_PokemonCenter_branch_ed6e4: ; ed6e4 + notetype $c, $c2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + intensity $c3 + note F#, 4 + note E_, 4 + note C#, 2 + endchannel +; ed6f3 + +Music_PokemonCenter_Ch3: ; ed6f3 + notetype $c, $28 +Music_PokemonCenter_branch_ed6f6: ; ed6f6 + stereopanning $f0 + octave 3 + note D_, 1 + note __, 5 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + callchannel Music_PokemonCenter_branch_ed76f + callchannel Music_PokemonCenter_branch_ed778 + note F#, 1 + note __, 5 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 5 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 1 + note __, 1 + callchannel Music_PokemonCenter_branch_ed76f + callchannel Music_PokemonCenter_branch_ed778 + note D_, 1 + note __, 5 + note F#, 1 + note __, 3 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + stereopanning $ff + callchannel Music_PokemonCenter_branch_ed783 + note G_, 1 + note __, 5 + note B_, 1 + note __, 3 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 5 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + note F#, 1 + note __, 5 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note A_, 1 + note __, 1 + callchannel Music_PokemonCenter_branch_ed783 + note G_, 1 + note __, 5 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + note B_, 1 + note __, 1 + note E_, 1 + note __, 5 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 1 + note F#, 1 + note __, 5 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note E_, 1 + note __, 1 + loopchannel 0, Music_PokemonCenter_branch_ed6f6 +; ed76f + +Music_PokemonCenter_branch_ed76f: ; ed76f + note E_, 1 + note __, 5 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + endchannel +; ed778 + +Music_PokemonCenter_branch_ed778: ; ed778 + note E_, 1 + note __, 5 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + endchannel +; ed783 + +Music_PokemonCenter_branch_ed783: ; ed783 + note F#, 1 + note __, 5 + note A_, 1 + note __, 3 + note A_, 1 + note __, 3 + note A_, 1 + note __, 1 + endchannel +; ed78c + +Music_PokemonCenter_Ch4: ; ed78c + togglenoise $3 + notetype $c + stereopanning $ff +Music_PokemonCenter_branch_ed792: ; ed792 + note G_, 6 + note G_, 4 + note G_, 2 + note G_, 2 + note G_, 2 + loopchannel 0, Music_PokemonCenter_branch_ed792 +; ed79b + + diff --git a/crysaudio/music/pokemonchannel.asm b/crysaudio/music/pokemonchannel.asm new file mode 100644 index 00000000..4cab1f28 --- /dev/null +++ b/crysaudio/music/pokemonchannel.asm @@ -0,0 +1,238 @@ +Music_PokemonChannel: ; ee45f + dbw $c0, Music_PokemonChannel_Ch1 + dbw $01, Music_PokemonChannel_Ch2 + dbw $02, Music_PokemonChannel_Ch3 + dbw $03, Music_PokemonChannel_Ch4 +; ee46b + +Music_PokemonChannel_Ch1: ; ee46b + tempo 128 + volume $77 + vibrato $8, $38 + dutycycle $1 + stereopanning $f + notetype $c, $b3 + octave 2 + note B_, 1 + note __, 2 + note F#, 1 + note B_, 1 + note __, 1 + octave 3 + note F#, 4 + dutycycle $0 + octave 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + notetype $6, $b3 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + dutycycle $1 + octave 3 + note C_, 2 + note __, 4 + note G_, 2 + note C_, 2 + note __, 2 + note B_, 8 + dutycycle $0 + note C_, 4 + note C_, 4 + octave 2 + note G_, 2 + note __, 2 + dutycycle $3 + octave 4 + note D_, 2 + note __, 2 + note D_, 2 + note __, 2 + octave 3 + note G_, 2 + note B_, 2 + octave 4 + note D_, 2 + note F#, 2 + note G_, 2 + note __, 2 + note D#, 2 + note __, 2 + note C_, 2 + note __, 2 + note D#, 2 + note __, 2 + note __, 8 + octave 3 + note G_, 2 + note __, 6 + note B_, 2 + note __, 6 + note D_, 2 + note __, 6 + endchannel +; ee4be + +Music_PokemonChannel_Ch2: ; ee4be + dutycycle $1 + vibrato $8, $38 + stereopanning $ff + notetype $c, $b3 + octave 3 + note G_, 3 + note A_, 1 + note B_, 1 + note __, 1 + octave 4 + note D_, 4 + dutycycle $0 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + notetype $6, $b3 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + dutycycle $1 + octave 4 + note C_, 6 + note D_, 2 + note E_, 2 + note __, 2 + note G_, 8 + dutycycle $0 + octave 3 + note G_, 4 + note F#, 4 + note E_, 2 + note __, 2 + dutycycle $3 + octave 4 + note B_, 2 + note __, 2 + note A#, 2 + note __, 2 + note B_, 8 + octave 5 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 4 + note A#, 2 + note __, 2 + note G#, 2 + note __, 2 + note __, 8 + note D_, 2 + octave 3 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 4 + note G_, 2 + note __, 6 + octave 3 + note G_, 2 + note __, 6 + endchannel +; ee50e + +Music_PokemonChannel_Ch3: ; ee50e + vibrato $8, $38 + notetype $c, $25 + stereopanning $f0 + octave 2 + note G_, 1 + note __, 2 + note B_, 1 + octave 3 + note D_, 1 + note __, 1 + note G_, 6 + note __, 4 + note C_, 1 + note __, 2 + octave 2 + note G_, 1 + octave 3 + note C_, 1 + note __, 1 + note E_, 6 + note __, 4 + octave 4 + note G_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 3 + note G_, 4 + note G#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G#, 1 + note __, 1 + note D_, 1 + octave 3 + note B_, 1 + note G_, 1 + note B_, 1 + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + endchannel +; ee549 + +Music_PokemonChannel_Ch4: ; ee549 + togglenoise $3 + notetype $c +Music_PokemonChannel_branch_ee54d: ; ee54d + note A#, 3 + note A#, 1 + 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 +; ee569 + + diff --git a/crysaudio/music/pokemonlullaby.asm b/crysaudio/music/pokemonlullaby.asm new file mode 100644 index 00000000..7abf53f9 --- /dev/null +++ b/crysaudio/music/pokemonlullaby.asm @@ -0,0 +1,138 @@ +Music_PokemonLullaby: ; f6d79 + dbw $80, Music_PokemonLullaby_Ch1 + dbw $01, Music_PokemonLullaby_Ch2 + dbw $02, Music_PokemonLullaby_Ch3 +; f6d82 + +Music_PokemonLullaby_Ch1: ; f6d82 + tempo 224 + volume $77 + dutycycle $3 + tone $0001 +Music_PokemonLullaby_branch_f6d8c: ; f6d8c + notetype $c, $a7 + octave 3 + note G_, 16 + octave 4 + note C_, 16 + stereopanning $f0 + octave 3 + note G_, 16 + stereopanning $f + octave 4 + note C_, 8 + stereopanning $f0 + octave 3 + note B_, 8 + stereopanning $f + note G_, 16 + stereopanning $f0 + octave 4 + note C_, 8 + stereopanning $f + octave 3 + note B_, 8 + stereopanning $f0 + note G_, 8 + stereopanning $ff + note __, 2 + note G_, 2 + note G_, 2 + note B_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note G_, 16 + octave 4 + note C_, 8 + octave 3 + note B_, 8 + loopchannel 0, Music_PokemonLullaby_branch_f6d8c +; f6dc4 + +Music_PokemonLullaby_Ch2: ; f6dc4 + vibrato $10, $14 + dutycycle $0 + notetype $c, $b4 +Music_PokemonLullaby_branch_f6dcc: ; f6dcc + note __, 16 + note __, 10 + octave 4 + note G_, 2 + note F#, 2 + note G_, 2 + intensity $b7 + note E_, 12 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + note E_, 10 + intensity $b5 + note D_, 2 + note D_, 2 + intensity $c7 + note E_, 2 + note F_, 4 + note E_, 4 + note F_, 4 + intensity $b5 + note G_, 2 + note G_, 2 + note D#, 2 + intensity $b7 + note E_, 14 + intensity $87 + octave 3 + note F_, 8 + note G_, 4 + intensity $b5 + octave 4 + note G_, 2 + note G_, 2 + intensity $b7 + note D#, 2 + note E_, 16 + note __, 14 + loopchannel 0, Music_PokemonLullaby_branch_f6dcc +; f6e03 + +Music_PokemonLullaby_Ch3: ; f6e03 + notetype $c, $11 +Music_PokemonLullaby_branch_f6e06: ; f6e06 + stereopanning $f0 + octave 4 + note C_, 2 + note E_, 2 + note G_, 2 + note B_, 2 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + stereopanning $f + note D_, 2 + note F_, 2 + note A_, 2 + octave 5 + note C_, 2 + note D_, 2 + note C_, 2 + octave 4 + note B_, 2 + note A_, 2 + loopchannel 0, Music_PokemonLullaby_branch_f6e06 +; f6e23 + + diff --git a/crysaudio/music/pokemonmarch.asm b/crysaudio/music/pokemonmarch.asm new file mode 100644 index 00000000..c939dd88 --- /dev/null +++ b/crysaudio/music/pokemonmarch.asm @@ -0,0 +1,471 @@ +Music_PokemonMarch: ; f6e23 + dbw $c0, Music_PokemonMarch_Ch1 + dbw $01, Music_PokemonMarch_Ch2 + dbw $02, Music_PokemonMarch_Ch3 + dbw $03, Music_PokemonMarch_Ch4 +; f6e2f + +Music_PokemonMarch_Ch1: ; f6e2f + tempo 144 + volume $77 + stereopanning $f0 + dutycycle $3 + tone $0001 + notetype $c, $42 + octave 3 + note D_, 4 + intensity $62 + note D_, 4 + intensity $82 + note D_, 4 + intensity $a2 + note D_, 4 + notetype $8, $a2 +Music_PokemonMarch_branch_f6e4c: ; f6e4c + callchannel Music_PokemonMarch_branch_f6eae + note D#, 2 + note C_, 2 + note D#, 2 + note C_, 2 + callchannel Music_PokemonMarch_branch_f6eae + note D#, 2 + note C_, 2 + note D#, 2 + note G_, 2 + callchannel Music_PokemonMarch_branch_f6eae + note C_, 2 + note C_, 2 + note D#, 2 + note C_, 2 + callchannel Music_PokemonMarch_branch_f6eae + note D#, 2 + note C_, 2 + note C#, 2 + note D#, 2 + callchannel Music_PokemonMarch_branch_f6eb8 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + callchannel Music_PokemonMarch_branch_f6eb8 + note F_, 2 + note D_, 2 + note F_, 2 + note A_, 2 + callchannel Music_PokemonMarch_branch_f6eb8 + note D_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + callchannel Music_PokemonMarch_branch_f6eb8 + note F_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + callchannel Music_PokemonMarch_branch_f6eb8 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + callchannel Music_PokemonMarch_branch_f6eae + note D#, 2 + note C_, 2 + note D#, 2 + note C_, 2 + octave 2 + note A#, 2 + note A#, 2 + octave 3 + note C_, 2 + note D_, 2 + note C#, 2 + note C_, 2 + octave 2 + note A#, 2 + note __, 4 + note D#, 2 + note __, 4 + octave 3 + note D#, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note F#, 2 + note F_, 2 + note D#, 4 + note F_, 2 + note G_, 4 + note A#, 2 + loopchannel 0, Music_PokemonMarch_branch_f6e4c +; f6eae + +Music_PokemonMarch_branch_f6eae: ; f6eae + note __, 4 + octave 3 + note D#, 1 + note D_, 1 + note D#, 2 + note __, 2 + note D#, 2 + note D#, 2 + note __, 2 + endchannel +; f6eb8 + +Music_PokemonMarch_branch_f6eb8: ; f6eb8 + note __, 4 + note F_, 1 + note E_, 1 + note F_, 2 + note __, 2 + note F_, 2 + note F_, 2 + note __, 2 + endchannel +; f6ec1 + +Music_PokemonMarch_Ch2: ; f6ec1 + dutycycle $2 + vibrato $10, $22 + notetype $c, $b2 + octave 3 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 +Music_PokemonMarch_branch_f6ece: ; f6ece + notetype $c, $b7 + octave 3 + note G#, 12 + notetype $8, $b3 + note D#, 2 + note G#, 2 + note A#, 2 + octave 4 + note C_, 2 + note __, 16 + note __, 6 + notetype $8, $b7 + octave 3 + note G#, 16 + notetype $8, $b3 + note D#, 2 + note G#, 4 + note A#, 2 + octave 4 + note C_, 4 + note C#, 2 + note C_, 4 + note C#, 2 + note C_, 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G#, 2 + notetype $8, $b7 + note A#, 16 + notetype $8, $b3 + note A#, 2 + note F_, 2 + note A#, 2 + octave 4 + note C_, 2 + note D_, 2 + note __, 16 + note __, 6 + notetype $8, $b7 + octave 3 + note A#, 16 + notetype $8, $b3 + note F_, 2 + note A#, 4 + octave 4 + note C_, 2 + note D_, 4 + note D#, 2 + note D_, 4 + note D#, 2 + note D_, 4 + note D#, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + notetype $8, $b7 + note A#, 16 + notetype $8, $b3 + note A_, 2 + note A#, 4 + octave 4 + note C_, 2 + notetype $8, $b7 + octave 3 + note G#, 16 + notetype $8, $b3 + note A#, 2 + note G#, 4 + note F_, 2 + note D#, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note F#, 2 + note F_, 2 + note D#, 2 + note __, 2 + octave 4 + note D#, 1 + note D_, 1 + note D#, 1 + note __, 5 + octave 3 + note G_, 2 + note G_, 2 + note G#, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note __, 2 + octave 4 + note G_, 1 + note F#, 1 + note G_, 1 + note __, 5 + loopchannel 0, Music_PokemonMarch_branch_f6ece +; f6f4d + +Music_PokemonMarch_Ch3: ; f6f4d + stereopanning $f + notetype $c, $16 + note __, 16 + notetype $8, $16 +Music_PokemonMarch_branch_f6f56: ; f6f56 + callchannel Music_PokemonMarch_branch_f6fe8 + note __, 2 + octave 4 + note D#, 2 + callchannel Music_PokemonMarch_branch_f6fe8 + octave 4 + note G#, 2 + note D#, 2 + callchannel Music_PokemonMarch_branch_f6fe8 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note G#, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note G#, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + note G_, 2 + note G#, 2 +Music_PokemonMarch_branch_f6f7b: ; f6f7b + octave 3 + note A#, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note A_, 2 + note __, 1 + octave 4 + note F_, 2 + note __, 1 + loopchannel 3, Music_PokemonMarch_branch_f6f7b + octave 3 + note A#, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note A#, 2 + note __, 2 + octave 4 + note F_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A#, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note G_, 2 + note __, 2 + octave 4 + note F_, 2 + octave 3 + note F_, 2 + note G_, 2 + note A#, 2 + note G#, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note G#, 2 + note __, 2 + octave 4 + note C_, 2 + note D#, 2 + note D#, 2 + note F_, 2 + note G_, 2 + note F#, 2 + note F_, 2 + note D#, 2 + note __, 4 + octave 3 + note D#, 2 + note __, 4 + octave 4 + note G_, 2 + note G_, 2 + note G#, 2 + note A#, 2 + note A_, 2 + note G#, 2 + note G_, 2 + note __, 2 + note D#, 2 + note F_, 2 + note __, 2 + note G#, 2 + loopchannel 0, Music_PokemonMarch_branch_f6f56 +; f6fe8 + +Music_PokemonMarch_branch_f6fe8: ; f6fe8 + octave 3 + note G#, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note F_, 2 + note __, 2 + octave 4 + note D#, 2 + octave 3 + note G_, 2 + endchannel +; f6ffa + +Music_PokemonMarch_Ch4: ; f6ffa + stereopanning $f0 + togglenoise $5 + notetype $8 + callchannel Music_PokemonMarch_branch_f704c +Music_PokemonMarch_branch_f7003: ; f7003 + callchannel Music_PokemonMarch_branch_f7042 + note C_, 4 + 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 +; f7042 + +Music_PokemonMarch_branch_f7042: ; 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 +; f704c + +Music_PokemonMarch_branch_f704c: ; 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 +; f7055 + + diff --git a/crysaudio/music/postcredits.asm b/crysaudio/music/postcredits.asm new file mode 100644 index 00000000..fd2aa8fe --- /dev/null +++ b/crysaudio/music/postcredits.asm @@ -0,0 +1,269 @@ +Music_PostCredits: ; cfd9e + dbw $40, Music_PostCredits_Ch1 + dbw $01, Music_PostCredits_Ch2 +; cfda4 + + + + +Music_PostCredits_Ch1: ; cfda5 + ftempo 271 + volume $77 + forceoctave $3 + dutycycle $2 + notetype $c, $93 + note __, 8 +Music_PostCredits_branch_cfdb2: ; cfdb2 + octave 3 + note C_, 2 + note E_, 2 + note G_, 2 + octave 4 + note C_, 2 + note E_, 2 + intensity $73 + note E_, 2 + intensity $53 + note E_, 2 + intensity $43 + note E_, 2 + intensity $93 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + note G_, 2 + note B_, 2 + octave 4 + note D_, 2 + intensity $73 + note D_, 2 + intensity $53 + note D_, 2 + intensity $43 + note D_, 2 + intensity $93 + octave 2 + note A#, 2 + octave 3 + note D_, 2 + note G_, 2 + note A#, 2 + octave 4 + note D_, 2 + intensity $73 + note D_, 2 + intensity $53 + note D_, 2 + intensity $43 + note D_, 2 + intensity $93 + octave 2 + note A_, 2 + octave 3 + note C_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + intensity $73 + note C_, 2 + intensity $53 + note C_, 2 + intensity $43 + note C_, 2 + intensity $93 + octave 2 + note G#, 2 + octave 3 + note C_, 2 + note F_, 2 + note G#, 2 + octave 4 + note C_, 2 + intensity $73 + note C_, 2 + intensity $53 + note C_, 2 + intensity $43 + note C_, 2 + intensity $93 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note E_, 2 + note G_, 2 + octave 4 + note C_, 2 + intensity $73 + note C_, 2 + intensity $63 + note C_, 2 + intensity $43 + note C_, 2 + intensity $93 + octave 2 + note F#, 2 + note A_, 2 + octave 3 + note D_, 2 + note F#, 2 + note A_, 2 + intensity $73 + note A_, 2 + intensity $63 + note A_, 2 + intensity $43 + note A_, 2 + intensity $93 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note D_, 2 + note G_, 2 + note G_, 2 + intensity $73 + note G_, 2 + intensity $93 + note D_, 2 + octave 2 + note G_, 2 + loopchannel 0, Music_PostCredits_branch_cfdb2 +; cfe48 + +Music_PostCredits_Ch2: ; cfe48 + forceoctave $3 + dutycycle $2 + notetype $c, $a3 + octave 5 + note E_, 2 + intensity $73 + note E_, 2 + intensity $a3 + note F_, 2 + intensity $73 + note F_, 2 +Music_PostCredits_branch_cfe5a: ; cfe5a + intensity $a3 + note G_, 2 + intensity $73 + note G_, 2 + intensity $53 + note G_, 2 + intensity $43 + note G_, 2 + intensity $93 + octave 6 + note D_, 2 + note C_, 2 + octave 5 + note B_, 2 + octave 6 + note C_, 2 + octave 5 + note G_, 2 + intensity $73 + note G_, 2 + intensity $53 + note G_, 2 + intensity $43 + note G_, 2 + intensity $33 + note G_, 2 + intensity $a3 + note E_, 2 + intensity $73 + note E_, 2 + intensity $a3 + note F_, 2 + note G_, 2 + intensity $73 + note G_, 2 + intensity $53 + note G_, 2 + intensity $43 + note G_, 2 + intensity $33 + note G_, 2 + intensity $a3 + note A_, 2 + intensity $73 + note A_, 2 + intensity $a3 + note E_, 2 + note G_, 2 + intensity $73 + note G_, 2 + intensity $53 + note G_, 2 + intensity $a3 + note F_, 2 + intensity $73 + note F_, 2 + intensity $53 + note F_, 2 + intensity $a3 + note D_, 2 + note E_, 2 + note F_, 2 + intensity $73 + note F_, 2 + intensity $53 + note F_, 2 + intensity $43 + note F_, 2 + intensity $33 + note F_, 2 + intensity $a3 + note G_, 2 + intensity $73 + note G_, 2 + intensity $a3 + note F_, 2 + note E_, 2 + note D#, 2 + note E_, 2 + note B_, 2 + intensity $73 + note B_, 2 + intensity $53 + note B_, 2 + intensity $a3 + note A_, 2 + intensity $73 + note A_, 2 + intensity $a3 + note D_, 2 + intensity $73 + note D_, 2 + intensity $53 + note D_, 2 + intensity $43 + note D_, 2 + intensity $33 + note D_, 2 + note D_, 2 + intensity $23 + note D_, 2 + note D_, 2 + intensity $a3 + note G_, 2 + intensity $73 + octave 4 + note G_, 2 + intensity $a3 + octave 5 + note D_, 2 + note G_, 2 + intensity $73 + note G_, 2 + intensity $53 + note G_, 2 + intensity $a3 + note E_, 2 + note F_, 2 + loopchannel 0, Music_PostCredits_branch_cfe5a +; cff04 + diff --git a/crysaudio/music/printer.asm b/crysaudio/music/printer.asm new file mode 100644 index 00000000..eed30972 --- /dev/null +++ b/crysaudio/music/printer.asm @@ -0,0 +1,322 @@ +Music_Printer: ; f07fd + dbw $02, Music_Printer_Ch3 +; f0800 + +Music_Printer_Ch3: ; f0800 + tempo 256 + notetype $c, $20 + octave 4 + note B_, 6 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note B_, 6 + octave 5 + note C#, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + octave 5 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 4 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 +Music_Printer_branch_f0823: ; f0823 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 5 + note C#, 1 + note C_, 1 + note C#, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 5 + note E_, 1 + note D#, 1 + note E_, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note B_, 1 + note A#, 1 + note B_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D#, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + loopchannel 0, Music_Printer_branch_f0823 +; f0941 + diff --git a/crysaudio/music/profoak.asm b/crysaudio/music/profoak.asm new file mode 100644 index 00000000..c2b67608 --- /dev/null +++ b/crysaudio/music/profoak.asm @@ -0,0 +1,325 @@ +Music_ProfOak: ; f4dea + dbw $80, Music_ProfOak_Ch1 + dbw $01, Music_ProfOak_Ch2 + dbw $02, Music_ProfOak_Ch3 +; f4df3 + +Music_ProfOak_Ch1: ; f4df3 + tempo 118 + volume $77 + vibrato $12, $34 + tone $0001 + stereopanning $f0 + dutycycle $3 + notetype $c, $98 + octave 2 + note F#, 1 + note B_, 1 + octave 3 + note D#, 1 + note F#, 1 + note A_, 16 + note G#, 8 + intensity $97 + note G#, 8 +Music_ProfOak_branch_f4e10: ; f4e10 + intensity $91 + callchannel Music_ProfOak_branch_f4e42 + callchannel Music_ProfOak_branch_f4e42 + callchannel Music_ProfOak_branch_f4e4d + callchannel Music_ProfOak_branch_f4e4d + loopchannel 2, Music_ProfOak_branch_f4e10 +Music_ProfOak_branch_f4e22: ; f4e22 + callchannel Music_ProfOak_branch_f4e58 + callchannel Music_ProfOak_branch_f4e58 + callchannel Music_ProfOak_branch_f4e6c + callchannel Music_ProfOak_branch_f4e6c + forceoctave $2 + callchannel Music_ProfOak_branch_f4e58 + callchannel Music_ProfOak_branch_f4e58 + forceoctave $0 + callchannel Music_ProfOak_branch_f4e6c + callchannel Music_ProfOak_branch_f4e6c + loopchannel 0, Music_ProfOak_branch_f4e22 +; f4e42 + +Music_ProfOak_branch_f4e42: ; f4e42 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note G#, 2 + note E_, 2 + note B_, 2 + note E_, 2 + note G#, 2 + note E_, 2 + endchannel +; f4e4d + +Music_ProfOak_branch_f4e4d: ; f4e4d + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + note D#, 2 + note B_, 2 + note D#, 2 + note F#, 2 + note D#, 2 + endchannel +; f4e58 + +Music_ProfOak_branch_f4e58: ; f4e58 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + note E_, 2 + note C#, 1 + note E_, 1 + note C#, 2 + intensity $92 + note A_, 2 + intensity $91 + note C#, 2 + intensity $92 + note E_, 2 + intensity $91 + endchannel +; f4e6c + +Music_ProfOak_branch_f4e6c: ; f4e6c + octave 2 + note B_, 1 + octave 3 + note E_, 1 + intensity $92 + note G#, 4 + note E_, 4 + intensity $91 + note E_, 1 + note G#, 1 + intensity $92 + note B_, 4 + intensity $91 + endchannel +; f4e7e + +Music_ProfOak_Ch2: ; f4e7e + vibrato $12, $34 + dutycycle $3 + notetype $c, $a8 + octave 3 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A#, 1 + note B_, 16 + intensity $a7 + note B_, 10 + dutycycle $2 +Music_ProfOak_branch_f4e92: ; f4e92 + intensity $b2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + intensity $91 + note B_, 2 + octave 5 + note C#, 2 + note D#, 2 + note E_, 4 + note D#, 2 + note C#, 4 + intensity $b2 + octave 3 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 1 + note __, 1 + note B_, 4 + intensity $91 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 4 + note B_, 2 + note B_, 4 + loopchannel 2, Music_ProfOak_branch_f4e92 + note __, 6 + intensity $b4 +Music_ProfOak_branch_f4ebf: ; f4ebf + note C#, 6 + octave 3 + note A_, 1 + octave 4 + note C#, 1 + note E_, 6 + note C#, 1 + note E_, 1 + note F#, 4 + note E_, 4 + note D#, 4 + note C#, 4 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note E_, 8 + intensity $82 + note B_, 6 + note G#, 1 + note B_, 1 + intensity $83 + octave 5 + note E_, 8 + intensity $b4 + octave 3 + note A_, 6 + note F#, 1 + note A_, 1 + octave 4 + note D#, 8 + note E_, 4 + note D#, 4 + note C#, 4 + note C_, 4 + octave 3 + note B_, 6 + note G#, 1 + note B_, 1 + octave 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note G#, 16 + loopchannel 0, Music_ProfOak_branch_f4ebf +; f4ef5 + +Music_ProfOak_Ch3: ; f4ef5 + stereopanning $f + notetype $c, $14 + note __, 4 + octave 3 + note E_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 1 + octave 3 + note A_, 2 + note __, 2 + octave 2 + note B_, 2 + octave 3 + note B_, 1 + note __, 1 + note E_, 2 + callchannel Music_ProfOak_branch_f4f3d +Music_ProfOak_branch_f4f0d: ; f4f0d + callchannel Music_ProfOak_branch_f4f3d + callchannel Music_ProfOak_branch_f4f3d + callchannel Music_ProfOak_branch_f4f4c + callchannel Music_ProfOak_branch_f4f4c + loopchannel 2, Music_ProfOak_branch_f4f0d +Music_ProfOak_branch_f4f1d: ; f4f1d + callchannel Music_ProfOak_branch_f4f5a + callchannel Music_ProfOak_branch_f4f5a + callchannel Music_ProfOak_branch_f4f69 + callchannel Music_ProfOak_branch_f4f69 + forceoctave $2 + callchannel Music_ProfOak_branch_f4f5a + callchannel Music_ProfOak_branch_f4f5a + forceoctave $0 + callchannel Music_ProfOak_branch_f4f69 + callchannel Music_ProfOak_branch_f4f69 + loopchannel 0, Music_ProfOak_branch_f4f1d +; f4f3d + +Music_ProfOak_branch_f4f3d: ; f4f3d + note E_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 1 + octave 3 + note G#, 2 + note __, 2 + octave 2 + note B_, 2 + octave 3 + note B_, 1 + note __, 1 + note E_, 2 + endchannel +; f4f4c + +Music_ProfOak_branch_f4f4c: ; f4f4c + octave 2 + note B_, 2 + note __, 2 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note D#, 2 + note __, 2 + note F#, 2 + note B_, 1 + note __, 1 + note D#, 2 + endchannel +; f4f5a + +Music_ProfOak_branch_f4f5a: ; f4f5a + octave 2 + note A_, 2 + note __, 2 + octave 3 + note A_, 1 + note __, 1 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note E_, 2 + note A_, 1 + note __, 1 + note C#, 2 + endchannel +; f4f69 + +Music_ProfOak_branch_f4f69: ; f4f69 + octave 2 + note G#, 2 + note __, 2 + octave 3 + note G#, 1 + note __, 1 + octave 2 + note G#, 2 + note __, 2 + octave 3 + note E_, 2 + note G#, 1 + note __, 1 + octave 2 + note B_, 2 + endchannel +; f4f79 + + diff --git a/crysaudio/music/profoakspokemontalk.asm b/crysaudio/music/profoakspokemontalk.asm new file mode 100644 index 00000000..1678fd46 --- /dev/null +++ b/crysaudio/music/profoakspokemontalk.asm @@ -0,0 +1,314 @@ +Music_ProfOaksPokemonTalk: ; f4c9f + dbw $80, Music_ProfOaksPokemonTalk_Ch1 + dbw $01, Music_ProfOaksPokemonTalk_Ch2 + dbw $02, Music_ProfOaksPokemonTalk_Ch3 +; f4ca8 + + + + +Music_ProfOaksPokemonTalk_Ch1: ; f4ca9 + tempo 164 + volume $77 + stereopanning $f + vibrato $6, $25 + dutycycle $1 + notetype $c, $94 + note __, 8 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 1 +Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3 + note D#, 6 + note C#, 1 + octave 3 + note B_, 1 + note F#, 1 + note G#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note A#, 1 + note B_, 2 + note F#, 1 + note G#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note G#, 1 + note F#, 1 + note __, 1 + note A#, 4 + octave 4 + note D#, 6 + note C#, 1 + octave 3 + note B_, 1 + note G#, 1 + note B_, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 1 + note B_, 1 + note F#, 1 + note A#, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note A#, 1 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note A#, 4 + note E_, 2 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note G#, 2 + note E_, 1 + note G#, 1 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 4 + note F#, 2 + note D#, 1 + note F#, 1 + note B_, 2 + note F#, 1 + note B_, 1 + octave 4 + note D#, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 4 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note E_, 2 + note F#, 2 + note C#, 2 + note E_, 2 + note F#, 2 + note E_, 2 + note C#, 2 + octave 3 + note A#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3 +; f4d31 + +Music_ProfOaksPokemonTalk_Ch2: ; f4d31 + vibrato $8, $24 + dutycycle $3 + notetype $c, $a7 + stereopanning $ff + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 1 + note E_, 1 + note C#, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note D#, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note E_, 1 + note F#, 1 + note G#, 1 + note A#, 1 +Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d + note B_, 6 + note A#, 1 + note G#, 1 + note F#, 6 + note F_, 1 + note F#, 1 + note G#, 4 + note F#, 8 + note F#, 4 + note G#, 6 + note F#, 1 + note E_, 1 + note D#, 6 + note D_, 1 + note D#, 1 + note E_, 4 + note D#, 8 + note D#, 4 + note E_, 6 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note G#, 8 + note F#, 6 + note D#, 1 + note F#, 1 + note B_, 8 + note A#, 4 + note B_, 2 + note A#, 2 + note G#, 4 + note A#, 2 + note G#, 2 + note F#, 2 + note C#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d +; f4d82 + +Music_ProfOaksPokemonTalk_Ch3: ; f4d82 + vibrato $6, $38 + notetype $c, $25 + stereopanning $f0 + note __, 8 + octave 3 + note F#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + note E_, 1 + note D#, 1 + note C#, 1 + octave 2 + note A#, 1 +Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95 + note B_, 6 + octave 3 + note D#, 1 + note F#, 1 + note B_, 6 + note D#, 1 + note C#, 1 + octave 2 + note B_, 4 + octave 3 + note B_, 8 + octave 4 + note D#, 4 + octave 3 + note G#, 6 + note D#, 1 + note G#, 1 + octave 2 + note G#, 6 + octave 3 + note D#, 1 + note G#, 1 + note D#, 6 + note F#, 2 + note A#, 2 + note G#, 2 + note F#, 2 + note D#, 2 + note E_, 2 + note __, 4 + note E_, 1 + note E_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note B_, 4 + note F#, 2 + note __, 4 + note F#, 1 + note F#, 1 + octave 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note B_, 4 + note F#, 2 + octave 4 + note F#, 2 + octave 3 + note E_, 2 + octave 4 + note E_, 2 + octave 3 + note C#, 2 + octave 4 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note A#, 2 + octave 2 + note F#, 2 + octave 3 + note A#, 1 + note __, 1 + note G#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95 +; f4dea + + diff --git a/crysaudio/music/rivalbattle.asm b/crysaudio/music/rivalbattle.asm new file mode 100644 index 00000000..4be71571 --- /dev/null +++ b/crysaudio/music/rivalbattle.asm @@ -0,0 +1,871 @@ +Music_RivalBattle: ; e974f + dbw $80, Music_RivalBattle_Ch1 + dbw $01, Music_RivalBattle_Ch2 + dbw $02, Music_RivalBattle_Ch3 +; e9758 + +Music_RivalBattle_Ch1: ; e9758 + ftempo 102 + volume $77 + dutycycle $3 + tone $0002 + vibrato $8, $15 + notetype $c, $b2 + octave 3 + note F#, 2 + note A#, 4 + intensity $b7 + note A#, 10 + intensity $b2 + note F#, 2 + octave 4 + note C#, 4 + intensity $b7 + note C#, 6 + note E_, 4 +Music_RivalBattle_branch_e9777: ; e9777 + intensity $b2 + octave 2 + note A#, 6 + intensity $b7 + octave 3 + note C#, 6 + intensity $b2 + note D#, 4 + loopchannel 3, Music_RivalBattle_branch_e9777 + intensity $b2 + octave 2 + note A#, 2 + octave 3 + note C#, 4 + intensity $b7 + note C#, 10 +Music_RivalBattle_branch_e978f: ; e978f + intensity $b2 + octave 3 + note G#, 6 + intensity $b7 + note B_, 6 + intensity $b2 + octave 4 + note C#, 4 + loopchannel 3, Music_RivalBattle_branch_e978f + intensity $b2 + octave 3 + note G#, 2 + note B_, 4 + intensity $4d + note B_, 10 +Music_RivalBattle_branch_e97a6: ; e97a6 + intensity $b7 + note A#, 6 + note F#, 6 + note D#, 4 + note F_, 4 + note F#, 4 + note G#, 2 + note A#, 6 + intensity $b2 + note F_, 1 + note D#, 1 + note C#, 1 + note D#, 1 + intensity $b7 + note F_, 4 + intensity $b2 + note G#, 1 + note F#, 1 + note F_, 1 + note F#, 1 + intensity $b7 + note G#, 4 + intensity $b6 + note G#, 2 + note A#, 2 + note B_, 2 + note A#, 2 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + intensity $b7 + octave 3 + note A#, 6 + note F#, 6 + note A#, 4 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note A#, 2 + note G#, 6 + note F_, 6 + octave 4 + note C#, 6 + octave 3 + note G#, 4 + intensity $b5 + note C#, 2 + note F_, 2 + note G#, 2 + octave 4 + note C_, 2 + note C#, 2 + octave 3 + note G#, 2 + note F_, 2 + note G#, 2 + intensity $b7 + note F#, 10 + intensity $b4 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + intensity $b7 + note F_, 4 + note D#, 4 + note C#, 2 + note D#, 6 + intensity $a0 + note F_, 8 + intensity $a7 + note F_, 8 + intensity $a0 + octave 2 + note A#, 8 + intensity $a7 + note A#, 8 + intensity $b7 + octave 3 + note F#, 10 + intensity $b5 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + note F_, 2 + note D#, 2 + note C#, 2 + note D#, 2 + note G#, 2 + note F#, 2 + note F_, 2 + note G#, 2 + intensity $a0 + note A#, 16 + intensity $a7 + note A#, 16 + intensity $a0 + note B_, 8 + intensity $a7 + note B_, 4 + intensity $b7 + note G#, 4 + intensity $b5 + octave 4 + note E_, 2 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note F#, 2 + note E_, 2 + note D#, 2 + note C#, 2 +Music_RivalBattle_branch_e9837: ; e9837 + octave 3 + note A#, 2 + note E_, 2 + note A#, 2 + octave 4 + note D#, 2 + note E_, 2 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + note E_, 2 + note D#, 2 + octave 3 + note A#, 2 + note D#, 2 + note A#, 2 + octave 4 + note D#, 2 + loopchannel 2, Music_RivalBattle_branch_e9837 + intensity $94 + octave 3 + note D#, 8 + octave 2 + note A#, 8 + octave 3 + note G_, 8 + note F_, 8 + intensity $96 + octave 2 + note G#, 8 + note A#, 8 + note B_, 8 + octave 3 + note C#, 8 + intensity $b7 + octave 4 + note D#, 8 + octave 3 + note A#, 8 + octave 4 + note G_, 8 + note F_, 8 + octave 3 + note G#, 8 + note A#, 8 + note B_, 8 + octave 4 + note C#, 8 + intensity $a0 + note D#, 8 + intensity $a7 + note D#, 8 + intensity $a0 + octave 3 + note G_, 8 + intensity $a7 + note G_, 8 + intensity $b7 + note D#, 8 + note C#, 8 + note D#, 4 + note C#, 4 + octave 2 + note B_, 4 + octave 3 + note C#, 4 + intensity $c7 + octave 2 + note A#, 6 + octave 3 + note C#, 6 + note D#, 4 + note E_, 6 + note D#, 6 + note C#, 4 + note G#, 6 + note E_, 6 + note D#, 4 + note C#, 6 + note D#, 6 + note D_, 4 + octave 2 + note G#, 6 + note B_, 6 + octave 3 + note C#, 4 + note D_, 6 + note C#, 6 + octave 2 + note B_, 4 + octave 3 + note F#, 6 + note D_, 6 + note C#, 4 + octave 2 + note B_, 6 + octave 3 + note C#, 10 + loopchannel 0, Music_RivalBattle_branch_e97a6 +; e98af + +Music_RivalBattle_Ch2: ; e98af + dutycycle $3 + vibrato $8, $36 + tone $0001 + notetype $c, $c2 + octave 4 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 + intensity $c2 + octave 4 + note D#, 6 + intensity $c7 + octave 3 + note F#, 6 + intensity $c2 + note G#, 4 +Music_RivalBattle_branch_e98ea: ; e98ea + intensity $c2 + note D#, 6 + intensity $c7 + note F#, 6 + intensity $c2 + note G#, 4 + loopchannel 2, Music_RivalBattle_branch_e98ea + intensity $c2 + note D#, 2 + note F#, 4 + intensity $c7 + note F#, 8 + intensity $a2 + note B_, 1 + octave 4 + note C_, 1 +Music_RivalBattle_branch_e9903: ; e9903 + intensity $c2 + note C#, 6 + intensity $c7 + note E_, 6 + intensity $c2 + note F#, 4 + loopchannel 3, Music_RivalBattle_branch_e9903 + intensity $c2 + note C#, 2 + note E_, 4 + intensity $b0 + note E_, 4 + intensity $b7 + note E_, 6 +Music_RivalBattle_branch_e991a: ; e991a + callchannel Music_RivalBattle_branch_e99e0 + intensity $b0 + note G#, 8 + intensity $b7 + note G#, 8 + callchannel Music_RivalBattle_branch_e99e0 + intensity $4e + note G#, 8 + intensity $b7 + note G#, 8 + intensity $b0 + octave 3 + note B_, 10 + intensity $b7 + note B_, 6 + intensity $b0 + octave 4 + note C#, 8 + octave 3 + note B_, 8 + intensity $b0 + note A#, 10 + intensity $b7 + note A#, 6 + intensity $2f + note D#, 10 + intensity $b7 + note D#, 6 + intensity $b0 + note B_, 10 + intensity $b7 + note B_, 6 + intensity $c7 + octave 4 + note C#, 8 + octave 3 + note B_, 8 + intensity $b0 + octave 4 + note D#, 16 + intensity $b7 + note D#, 16 + intensity $b0 + note E_, 4 + intensity $b7 + note E_, 6 + intensity $c7 + note E_, 2 + note G#, 2 + note B_, 2 + octave 5 + note C#, 8 + octave 4 + note B_, 8 + intensity $b0 + note A#, 10 + intensity $b7 + note A#, 6 + intensity $b0 + note A_, 10 + intensity $b7 + note A_, 6 + intensity $b0 + note G#, 10 + intensity $b7 + note G#, 6 + intensity $b0 + note G_, 10 + intensity $b7 + note G_, 6 + intensity $a4 + octave 3 + note G_, 8 + note D#, 8 + note A#, 8 + note G#, 8 + intensity $a6 + octave 2 + note B_, 8 + octave 3 + note C#, 8 + note D#, 8 + note F_, 8 + intensity $c7 + octave 4 + note G_, 8 + note D#, 8 + note A#, 8 + note G#, 8 + octave 3 + note B_, 8 + octave 4 + note C#, 8 + note D#, 8 + note F_, 8 + intensity $b0 + note G_, 16 + note D#, 16 + octave 3 + note B_, 8 + note A#, 8 + note G#, 8 + intensity $c7 + note F_, 8 +Music_RivalBattle_branch_e99a6: ; e99a6 + intensity $c2 + octave 3 + note A#, 6 + intensity $c7 + octave 4 + note C#, 6 + intensity $c2 + note D#, 4 + loopchannel 3, Music_RivalBattle_branch_e99a6 + intensity $c2 + octave 3 + note A#, 2 + octave 4 + note C#, 4 + intensity $b7 + note C#, 6 + intensity $9a + note C#, 4 +Music_RivalBattle_branch_e99c1: ; e99c1 + intensity $c2 + octave 3 + note G#, 6 + intensity $c7 + note B_, 6 + intensity $c2 + octave 4 + note C#, 4 + loopchannel 3, Music_RivalBattle_branch_e99c1 + intensity $c2 + octave 3 + note G#, 2 + note B_, 4 + intensity $c7 + note B_, 6 + intensity $6a + octave 4 + note D_, 4 + loopchannel 0, Music_RivalBattle_branch_e991a +; e99e0 + +Music_RivalBattle_branch_e99e0: ; e99e0 + intensity $c7 + note D#, 10 + intensity $c4 + octave 3 + note A#, 2 + octave 4 + note D#, 2 + note F#, 2 + intensity $c5 + note F_, 4 + note D#, 4 + intensity $c2 + note C#, 2 + intensity $c7 + note D#, 6 + intensity $b0 + note F_, 8 + intensity $b7 + note F_, 8 + endchannel +; e99fb + +Music_RivalBattle_Ch3: ; e99fb + notetype $c, $19 + octave 3 + note F#, 2 + note A#, 2 + note __, 2 + note A#, 10 + octave 3 + note F#, 2 + octave 4 + note C#, 2 + note __, 2 + note C#, 6 + octave 3 + note C#, 2 + note D_, 2 +Music_RivalBattle_branch_e9a0c: ; e9a0c + note D#, 2 + note C#, 2 + note D#, 2 + note F#, 4 + note E_, 2 + note D#, 2 + note C#, 2 + loopchannel 4, Music_RivalBattle_branch_e9a0c +Music_RivalBattle_branch_e9a17: ; e9a17 + octave 3 + note C#, 2 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note E_, 4 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 + loopchannel 3, Music_RivalBattle_branch_e9a17 + octave 3 + note C#, 2 + note E_, 2 + note C#, 2 + octave 2 + note B_, 4 + octave 3 + note C_, 2 + note C#, 2 + note D_, 2 +Music_RivalBattle_branch_e9a30: ; e9a30 + callchannel Music_RivalBattle_branch_e9b47 + octave 2 + note A#, 2 + octave 4 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note B_, 2 + octave 2 + note A#, 2 + octave 3 + note A#, 2 + octave 2 + note A#, 2 + octave 3 + note G#, 2 + callchannel Music_RivalBattle_branch_e9b50 + note C#, 2 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 4 + note C#, 2 + note C_, 2 + octave 2 + note B_, 2 + callchannel Music_RivalBattle_branch_e9b47 + octave 2 + note A#, 2 + octave 3 + note A#, 2 + octave 2 + note A#, 2 + octave 3 + note G#, 2 + octave 2 + note A#, 2 + octave 3 + note F#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + callchannel Music_RivalBattle_branch_e9b50 +Music_RivalBattle_branch_e9a66: ; e9a66 + note C#, 2 + note G#, 2 + loopchannel 4, Music_RivalBattle_branch_e9a66 + callchannel Music_RivalBattle_branch_e9b5c + note G#, 2 + note F#, 2 +Music_RivalBattle_branch_e9a71: ; e9a71 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + loopchannel 4, Music_RivalBattle_branch_e9a71 + octave 2 + note A#, 2 + octave 3 + note F#, 2 + octave 2 + note A#, 2 + octave 3 + note F#, 2 + octave 2 + note A#, 2 + octave 3 + note F#, 2 + note F_, 2 + note D#, 2 + callchannel Music_RivalBattle_branch_e9b5c + octave 2 + note B_, 2 + octave 3 + note D_, 2 + callchannel Music_RivalBattle_branch_e9b65 + octave 3 + note D#, 2 + octave 4 + note D#, 2 + callchannel Music_RivalBattle_branch_e9b65 + octave 3 + note D#, 2 + note A#, 2 + note E_, 2 + note B_, 2 + octave 4 + note E_, 2 + octave 3 + note E_, 2 + note B_, 2 + octave 4 + note E_, 2 + octave 3 + note E_, 2 + octave 4 + note E_, 2 + octave 3 + note E_, 2 + note B_, 2 + octave 4 + note E_, 2 + octave 3 + note E_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note G#, 2 +Music_RivalBattle_branch_e9ab3: ; e9ab3 + note D#, 2 + note A#, 2 + loopchannel 4, Music_RivalBattle_branch_e9ab3 +Music_RivalBattle_branch_e9ab9: ; e9ab9 + note D#, 2 + note A_, 2 + loopchannel 4, Music_RivalBattle_branch_e9ab9 +Music_RivalBattle_branch_e9abf: ; e9abf + note D#, 2 + note G#, 2 + loopchannel 4, Music_RivalBattle_branch_e9abf +Music_RivalBattle_branch_e9ac5: ; e9ac5 + note D#, 2 + note G_, 2 + loopchannel 12, Music_RivalBattle_branch_e9ac5 +Music_RivalBattle_branch_e9acb: ; e9acb + octave 2 + note B_, 2 + octave 3 + note D#, 2 + loopchannel 4, Music_RivalBattle_branch_e9acb +Music_RivalBattle_branch_e9ad3: ; e9ad3 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + loopchannel 4, Music_RivalBattle_branch_e9ad3 + note D#, 2 + note G_, 2 + note A#, 2 + note D#, 2 + note G_, 2 + note A#, 2 + note D#, 2 + note A#, 2 + note D#, 2 + note G_, 2 + note A#, 2 + note D#, 2 + note G_, 2 + note A#, 2 + note D#, 2 + note A#, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note B_, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + note B_, 2 + octave 2 + note B_, 2 + octave 3 + note B_, 2 + octave 2 + note B_, 2 + octave 3 + note G#, 2 + note B_, 2 + octave 2 + note B_, 2 + octave 4 + note D#, 2 + note C#, 2 + octave 3 + note B_, 2 + note G#, 2 + note G_, 8 + note D#, 8 + note A#, 8 + note G_, 8 + octave 2 + note B_, 8 + octave 3 + note C#, 8 + note D#, 8 + note F_, 8 +Music_RivalBattle_branch_e9b10: ; e9b10 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + loopchannel 7, Music_RivalBattle_branch_e9b10 + note E_, 2 + note D#, 2 +Music_RivalBattle_branch_e9b1a: ; e9b1a + octave 2 + note A#, 2 + octave 3 + note D#, 2 + loopchannel 6, Music_RivalBattle_branch_e9b1a + octave 2 + note A#, 2 + octave 3 + note F#, 2 + note F_, 2 + note E_, 2 +Music_RivalBattle_branch_e9b28: ; e9b28 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + loopchannel 7, Music_RivalBattle_branch_e9b28 + note D_, 2 + note C#, 2 +Music_RivalBattle_branch_e9b32: ; e9b32 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + loopchannel 4, Music_RivalBattle_branch_e9b32 + octave 2 + note B_, 2 + note G#, 2 + note B_, 2 + octave 3 + note F_, 4 + note E_, 2 + note D#, 2 + note D_, 2 + loopchannel 0, Music_RivalBattle_branch_e9a30 +; e9b47 + +Music_RivalBattle_branch_e9b47: ; e9b47 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + loopchannel 4, Music_RivalBattle_branch_e9b47 + endchannel +; e9b50 + +Music_RivalBattle_branch_e9b50: ; e9b50 + note C#, 2 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note G#, 4 + octave 4 + note C#, 2 + octave 3 + note C#, 2 + note G#, 2 + endchannel +; e9b5c + +Music_RivalBattle_branch_e9b5c: ; e9b5c + octave 2 + note B_, 2 + octave 3 + note F#, 2 + loopchannel 7, Music_RivalBattle_branch_e9b5c + endchannel +; e9b65 + +Music_RivalBattle_branch_e9b65: ; e9b65 + octave 3 + note D#, 2 + note A#, 2 + octave 4 + note D#, 2 + loopchannel 2, Music_RivalBattle_branch_e9b65 + endchannel +; e9b6f + + diff --git a/crysaudio/music/rocketbattle.asm b/crysaudio/music/rocketbattle.asm new file mode 100644 index 00000000..495da3c9 --- /dev/null +++ b/crysaudio/music/rocketbattle.asm @@ -0,0 +1,1042 @@ +Music_RocketBattle: ; e9b6f + dbw $80, Music_RocketBattle_Ch1 + dbw $01, Music_RocketBattle_Ch2 + dbw $02, Music_RocketBattle_Ch3 +; e9b78 + +Music_RocketBattle_Ch1: ; e9b78 + ftempo 101 + volume $77 + dutycycle $3 + tone $0002 + vibrato $10, $15 + notetype $c, $b2 + octave 4 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 2 + note B_, 1 +Music_RocketBattle_branch_e9bad: ; e9bad + intensity $b2 + octave 3 + note C_, 6 + note C_, 4 + note E_, 2 + intensity $b7 + note D_, 4 + loopchannel 3, Music_RocketBattle_branch_e9bad + intensity $b2 + note C_, 6 + note C_, 6 + intensity $b7 + note D_, 4 +Music_RocketBattle_branch_e9bc1: ; e9bc1 + intensity $b2 + octave 4 + note E_, 6 + note E_, 4 + note G_, 2 + intensity $b7 + note F_, 4 + loopchannel 3, Music_RocketBattle_branch_e9bc1 + intensity $b2 + note E_, 6 + note E_, 4 + intensity $b7 + note D_, 2 + note D#, 4 + intensity $b3 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note E_, 2 + note A#, 2 + note F_, 2 + note F_, 2 + note A_, 2 + note D_, 2 + note D_, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + intensity $b5 + note G_, 4 + intensity $b3 + note G_, 2 + note F_, 2 + note D#, 2 + note D_, 2 + note C#, 2 + note D_, 2 + intensity $b5 + note D#, 4 + intensity $b3 + note D#, 2 + note D_, 2 + note F_, 2 +Music_RocketBattle_branch_e9c02: ; e9c02 + octave 4 + note E_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 4 + note D_, 2 + octave 3 + note F_, 2 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note D_, 2 + note D_, 2 + octave 4 + note E_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 4 + note D_, 2 + octave 3 + note E_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + intensity $b5 + note G_, 4 + intensity $b3 + note G_, 2 + note F_, 2 + octave 4 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + intensity $b5 + note F_, 4 + intensity $b2 + octave 3 + note F_, 2 + note G_, 2 + note G#, 4 + intensity $b5 + note D_, 4 + note C_, 4 + note D_, 4 + note E_, 2 + intensity $b2 + note F_, 2 + note A_, 4 + intensity $b7 + note A_, 4 + intensity $b5 + note A_, 2 + note G_, 2 + note F_, 4 + note D_, 4 + note C_, 4 + note D_, 4 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note A#, 2 + note G_, 2 + note A_, 2 + note A#, 2 + intensity $b7 + octave 4 + note E_, 6 + note D_, 4 + octave 3 + note G_, 2 + note A#, 4 + note A_, 6 + note G_, 4 + note E_, 2 + note F_, 4 + note E_, 6 + note D_, 6 + note D#, 4 + intensity $a0 + note E_, 8 + intensity $a7 + note E_, 8 + intensity $b7 + octave 2 + note A_, 8 + note G_, 8 + note A_, 8 + note A#, 8 + note A_, 8 + note G_, 8 + note A_, 8 + octave 3 + note C#, 8 + note D_, 8 + note C#, 8 + octave 2 + note A#, 8 + note A_, 8 + octave 3 + note D_, 8 + note C#, 8 + note D_, 8 + note E_, 8 + octave 2 + note A#, 6 + octave 3 + note D_, 6 + note C_, 4 + intensity $b5 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 2 + note G_, 2 + note A_, 2 + note A#, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note A#, 2 + note A_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + octave 4 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note A#, 2 + note G_, 2 + intensity $b2 + note E_, 6 + note E_, 6 + note E_, 4 + note E_, 6 + note E_, 4 + intensity $b7 + note G_, 2 + note F_, 4 + intensity $b2 + note E_, 6 + note E_, 4 + intensity $b7 + note G_, 2 + note F_, 4 + intensity $b2 + note E_, 6 + octave 4 + note D_, 1 + note D#, 1 + intensity $a0 + note E_, 8 + intensity $b2 + octave 3 + note F_, 6 + note F_, 4 + intensity $b7 + note A#, 2 + note G_, 4 +Music_RocketBattle_branch_e9cc5: ; e9cc5 + intensity $b2 + note F_, 6 + note F_, 4 + intensity $b7 + note A_, 2 + note G_, 4 + loopchannel 2, Music_RocketBattle_branch_e9cc5 + intensity $b2 + note F_, 6 + octave 4 + note D_, 1 + note E_, 1 + intensity $a0 + note F_, 8 + intensity $b3 + note D_, 2 + octave 3 + note A_, 2 + note E_, 2 + note A_, 4 + note A_, 2 + intensity $b7 + octave 4 + note D_, 4 + intensity $b3 + note D#, 2 + octave 3 + note A#, 2 + note G_, 2 + note A#, 4 + note A#, 2 + intensity $b7 + octave 4 + note D_, 4 + intensity $b3 + note E_, 2 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 4 + note C_, 2 + intensity $b7 + note D#, 4 + intensity $a0 + note E_, 4 + intensity $a7 + note E_, 6 + intensity $a0 + octave 3 + note G#, 6 + intensity $b3 + note C_, 2 + note E_, 2 + note E_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note F_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note D_, 2 + note C_, 2 + note E_, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + note C_, 2 + note C_, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + intensity $b5 + note D_, 4 + intensity $b3 + note D_, 2 + note C_, 2 + octave 2 + note A#, 2 + octave 3 + note D_, 2 + note C#, 2 + note D_, 2 + intensity $b5 + note D#, 4 + intensity $b3 + note D#, 2 + note D_, 2 + note F_, 2 + loopchannel 0, Music_RocketBattle_branch_e9c02 +; e9d3e + +Music_RocketBattle_Ch2: ; e9d3e + dutycycle $3 + vibrato $8, $36 + tone $0001 + notetype $c, $b2 + octave 4 + note A_, 4 + note A#, 4 + note B_, 4 + octave 5 + note C_, 1 + intensity $82 + octave 4 + note G#, 1 + note A_, 1 + note G#, 1 + intensity $c2 + octave 5 + note C#, 1 + intensity $92 + octave 4 + note G#, 1 + note A_, 1 + note G#, 1 + intensity $c2 + octave 5 + note D_, 1 + intensity $a2 + octave 4 + note G#, 1 + note A_, 1 + note G#, 1 + intensity $c2 + octave 5 + note D#, 1 + intensity $b2 + octave 4 + note G#, 1 + note A_, 1 + note G#, 1 + intensity $c2 + octave 5 + note E_, 1 + octave 4 + note G#, 1 + note A_, 1 + note G#, 1 +Music_RocketBattle_branch_e9d7b: ; e9d7b + intensity $c2 + octave 3 + note A_, 6 + note A_, 4 + octave 4 + note C_, 2 + intensity $c7 + octave 3 + note A#, 4 + loopchannel 3, Music_RocketBattle_branch_e9d7b + intensity $c2 + note A_, 6 + note A_, 6 + intensity $4a + note G#, 4 +Music_RocketBattle_branch_e9d91: ; e9d91 + intensity $c2 + octave 4 + note A_, 6 + note A_, 4 + octave 5 + note C_, 2 + intensity $c7 + octave 4 + note A#, 4 + loopchannel 3, Music_RocketBattle_branch_e9d91 + intensity $c2 + note A_, 6 + note A_, 4 + intensity $c7 + note G_, 2 + note G#, 4 + callchannel Music_RocketBattle_branch_e9ea0 + intensity $b0 + note F_, 16 + intensity $b7 + note F_, 16 +Music_RocketBattle_branch_e9db1: ; e9db1 + callchannel Music_RocketBattle_branch_e9ea0 + intensity $b0 + note F_, 8 + intensity $b7 + note F_, 8 + intensity $b0 + note A#, 8 + intensity $b7 + note A#, 8 + intensity $c4 + octave 3 + note A_, 2 + note G_, 2 + note A_, 2 + intensity $c7 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + intensity $c2 + note A_, 2 + octave 4 + note C_, 4 + intensity $b0 + note C_, 6 + intensity $b7 + note C_, 4 + intensity $c4 + octave 3 + note A#, 2 + note A_, 2 + note A#, 2 + intensity $c7 + octave 4 + note D_, 4 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + intensity $c2 + note A#, 2 + octave 4 + note D_, 4 + intensity $b0 + note D_, 4 + intensity $b7 + note D_, 6 + intensity $4f + note A_, 6 + intensity $a0 + note G_, 6 + note F_, 4 + note E_, 6 + note F_, 6 + note G_, 4 + note A_, 6 + note A#, 6 + note G#, 4 + note A_, 6 + intensity $a7 + note A_, 10 + intensity $3f + octave 3 + note D_, 8 + intensity $b7 + note D_, 8 + intensity $3f + note C#, 8 + intensity $b7 + note C#, 8 + intensity $3f + note D_, 8 + intensity $b7 + note D_, 8 + intensity $3f + note E_, 8 + intensity $b7 + note E_, 8 + intensity $4e + note F_, 8 + intensity $a0 + note F_, 8 + note E_, 16 + note F_, 16 + note A_, 16 + intensity $3f + note F_, 16 + intensity $c7 + octave 4 + note D_, 8 + note C#, 8 + intensity $b0 + note E_, 8 + intensity $b7 + note E_, 8 + intensity $3c + note A_, 6 + intensity $c7 + note A_, 10 + intensity $c2 + octave 3 + note A_, 6 + note A_, 6 + note A_, 4 + note A_, 6 + note A_, 4 + intensity $c7 + octave 4 + note C_, 2 + octave 3 + note A#, 4 + intensity $c2 + note A_, 6 + note A_, 4 + intensity $c7 + octave 4 + note C_, 2 + octave 3 + note A#, 4 + intensity $c2 + note A_, 6 + intensity $c7 + octave 4 + note G_, 1 + note G#, 1 + note A_, 8 +Music_RocketBattle_branch_e9e5a: ; e9e5a + intensity $c2 + octave 3 + note A#, 6 + note A#, 4 + intensity $c7 + octave 4 + note D_, 2 + note C_, 4 + loopchannel 3, Music_RocketBattle_branch_e9e5a + intensity $c2 + octave 3 + note A#, 6 + intensity $c7 + octave 4 + note G_, 1 + note A_, 1 + note A#, 8 + intensity $c7 + note A_, 6 + note G_, 6 + note A_, 4 + note A#, 6 + octave 5 + note D_, 6 + octave 4 + note A#, 4 + note A_, 6 + note G_, 6 + intensity $c5 + note A_, 4 + intensity $b0 + note A_, 8 + intensity $b7 + note A_, 8 + intensity $c6 + octave 3 + note A_, 6 + note G#, 6 + note E_, 4 + note A_, 6 + note G#, 6 + note E_, 4 + intensity $b0 + note F_, 8 + intensity $b7 + note F_, 8 + intensity $3d + note A#, 8 + intensity $c7 + note A#, 8 + loopchannel 0, Music_RocketBattle_branch_e9db1 +; e9ea0 + +Music_RocketBattle_branch_e9ea0: ; e9ea0 + intensity $c6 + octave 4 + note A_, 6 + note G#, 6 + note E_, 4 + note A_, 6 + note G#, 6 + note E_, 4 + endchannel +; e9eaa + +Music_RocketBattle_Ch3: ; e9eaa + notetype $c, $19 + octave 3 + note A_, 2 + octave 4 + note E_, 2 + octave 3 + note G#, 2 + octave 4 + note E_, 2 + octave 3 + note G_, 2 + octave 4 + note E_, 2 + octave 3 + note F#, 2 + octave 4 + note E_, 2 + octave 3 + note F_, 2 + octave 4 + note E_, 2 + octave 3 + note E_, 2 + octave 4 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A#, 2 +Music_RocketBattle_branch_e9ecc: ; e9ecc + callchannel Music_RocketBattle_branch_e9fe6 + loopchannel 3, Music_RocketBattle_branch_e9ecc + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 +Music_RocketBattle_branch_e9edf: ; e9edf + callchannel Music_RocketBattle_branch_e9fe6 + loopchannel 3, Music_RocketBattle_branch_e9edf + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note G_, 2 + octave 2 + note G_, 2 + note A_, 2 + note A#, 2 + callchannel Music_RocketBattle_branch_e9ff3 + callchannel Music_RocketBattle_branch_ea010 + octave 3 + note F_, 2 + callchannel Music_RocketBattle_branch_ea01d +Music_RocketBattle_branch_e9efe: ; e9efe + callchannel Music_RocketBattle_branch_e9ff3 + callchannel Music_RocketBattle_branch_ea010 + octave 3 + note A#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + callchannel Music_RocketBattle_branch_ea02a + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note A_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note A_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 +Music_RocketBattle_branch_e9f25: ; e9f25 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + loopchannel 5, Music_RocketBattle_branch_e9f25 + note A#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note A#, 2 + octave 2 + note A#, 2 + octave 3 + note A#, 2 + callchannel Music_RocketBattle_branch_ea02a + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + callchannel Music_RocketBattle_branch_ea02a + callchannel Music_RocketBattle_branch_ea02a +Music_RocketBattle_branch_e9f4e: ; e9f4e + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + octave 2 + note A#, 2 + note A_, 2 + octave 3 + note D_, 2 + note G_, 2 + note F_, 2 + loopchannel 7, Music_RocketBattle_branch_e9f4e + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + octave 2 + note A#, 2 + note A_, 2 + octave 3 + note A_, 2 + note G_, 2 + note F_, 2 +Music_RocketBattle_branch_e9f6a: ; e9f6a + octave 2 + note A#, 2 + octave 3 + note F_, 2 + loopchannel 4, Music_RocketBattle_branch_e9f6a + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 +Music_RocketBattle_branch_e9f7c: ; e9f7c + octave 2 + note A_, 2 + octave 3 + note E_, 2 + loopchannel 13, Music_RocketBattle_branch_e9f7c + octave 2 + note A_, 2 + octave 3 + note E_, 4 + note D_, 2 + note C_, 2 + octave 2 + note A#, 2 +Music_RocketBattle_branch_e9f8c: ; e9f8c + octave 2 + note A_, 2 + octave 3 + note E_, 2 + loopchannel 4, Music_RocketBattle_branch_e9f8c + octave 2 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note A#, 4 + note A_, 2 + note G_, 2 + note A#, 2 +Music_RocketBattle_branch_e9f9e: ; e9f9e + octave 2 + note A#, 2 + octave 3 + note F_, 2 + loopchannel 7, Music_RocketBattle_branch_e9f9e + note E_, 2 + note F_, 2 +Music_RocketBattle_branch_e9fa8: ; e9fa8 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + loopchannel 5, Music_RocketBattle_branch_e9fa8 + octave 3 + note A#, 2 + octave 4 + note D_, 4 + note C_, 2 + octave 3 + note A#, 2 + note G_, 2 + callchannel Music_RocketBattle_branch_ea033 + octave 3 + note E_, 2 + callchannel Music_RocketBattle_branch_ea010 + octave 3 + note F_, 2 + callchannel Music_RocketBattle_branch_ea033 + octave 3 + note A_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + callchannel Music_RocketBattle_branch_e9ff3 + callchannel Music_RocketBattle_branch_ea010 + octave 3 + note F_, 2 + callchannel Music_RocketBattle_branch_ea01d + loopchannel 0, Music_RocketBattle_branch_e9efe +; e9fe6 + +Music_RocketBattle_branch_e9fe6: ; e9fe6 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + note A#, 2 + octave 3 + note E_, 2 + note G_, 2 + note F_, 2 + endchannel +; e9ff3 + +Music_RocketBattle_branch_e9ff3: ; e9ff3 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D#, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note D#, 2 + note D_, 2 + endchannel +; ea010 + +Music_RocketBattle_branch_ea010: ; ea010 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note A#, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note A#, 2 + octave 2 + note A#, 2 + endchannel +; ea01d + +Music_RocketBattle_branch_ea01d: ; ea01d + octave 2 + note A#, 2 + octave 3 + note F_, 2 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + octave 2 + note A#, 2 + octave 3 + note F_, 2 + endchannel +; ea02a + +Music_RocketBattle_branch_ea02a: ; ea02a + octave 2 + note A_, 2 + octave 3 + note E_, 2 + loopchannel 4, Music_RocketBattle_branch_ea02a + endchannel +; ea033 + +Music_RocketBattle_branch_ea033: ; ea033 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note A_, 2 + octave 2 + note A_, 2 + octave 3 + note E_, 2 + note A_, 2 + octave 2 + note A_, 2 + endchannel +; ea040 + + diff --git a/crysaudio/music/rockethideout.asm b/crysaudio/music/rockethideout.asm new file mode 100644 index 00000000..90f1fa82 --- /dev/null +++ b/crysaudio/music/rockethideout.asm @@ -0,0 +1,315 @@ +Music_RocketHideout: ; eeb75 + dbw $c0, Music_RocketHideout_Ch1 + dbw $01, Music_RocketHideout_Ch2 + dbw $02, Music_RocketHideout_Ch3 + dbw $03, Music_RocketHideout_Ch4 +; eeb81 + +Music_RocketHideout_Ch1: ; eeb81 + tempo 144 + volume $77 + dutycycle $3 + tone $0004 + vibrato $10, $44 + notetype $c, $b3 + stereopanning $f0 +Music_RocketHideout_branch_eeb93: ; eeb93 + note __, 16 + loopchannel 4, Music_RocketHideout_branch_eeb93 +Music_RocketHideout_branch_eeb98: ; eeb98 + octave 2 + note D#, 2 + note __, 2 + note A#, 4 + note A_, 2 + note __, 6 + note D#, 2 + note A#, 4 + note A_, 2 + note __, 8 + loopchannel 2, Music_RocketHideout_branch_eeb98 + octave 3 + note A#, 2 + note A_, 2 + note F_, 2 + note F#, 2 + octave 4 + note C#, 2 + note C_, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note F_, 2 + note F#, 2 + octave 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note A_, 2 + note F#, 2 + note F_, 2 + note D#, 2 + note F_, 2 + note F#, 2 + note A#, 2 + note F#, 2 + note F_, 2 + note D#, 2 + note F_, 2 + note F#, 2 + note A_, 2 + octave 2 + note A#, 2 + note B_, 2 + octave 3 + note D#, 2 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note G_, 2 + note G#, 2 + octave 4 + note D#, 2 + note D_, 2 + note D#, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note G_, 2 + note G#, 2 + octave 4 + note D#, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note G#, 2 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note G#, 2 + note B_, 2 + note C_, 2 + note C#, 2 + note F_, 2 + note G_, 2 + note __, 16 + intensity $b7 + octave 2 + note G#, 16 + note __, 16 + note A_, 16 + intensity $b3 +Music_RocketHideout_branch_eebfe: ; eebfe + note __, 16 + loopchannel 4, Music_RocketHideout_branch_eebfe + loopchannel 0, Music_RocketHideout_branch_eeb93 +; eec07 + +Music_RocketHideout_Ch2: ; eec07 + dutycycle $3 + tone $0002 + vibrato $0, $f0 + notetype $c, $c4 + stereopanning $f +Music_RocketHideout_branch_eec14: ; eec14 + octave 2 + note D#, 2 + note __, 2 + note A#, 4 + note A_, 2 + note __, 6 + note D#, 2 + note A#, 4 + note A_, 2 + note __, 8 + note D#, 2 + note __, 2 + note A#, 4 + note A_, 2 + note __, 6 + note D#, 2 + note A#, 4 + note A_, 2 + note __, 8 + octave 3 + note D#, 12 + note A#, 2 + note A_, 2 + octave 4 + note C#, 8 + note C_, 8 + octave 3 + note A#, 12 + note A_, 4 + note F#, 8 + note F_, 8 + octave 4 + note D#, 12 + note A#, 2 + note A_, 2 + note F#, 8 + note F_, 8 + note D#, 12 + note D_, 4 + octave 3 + note B_, 8 + note A#, 8 + octave 4 + note F_, 12 + octave 5 + note C_, 2 + octave 4 + note B_, 2 + note G#, 8 + note G_, 8 + note F_, 12 + note E_, 4 + note C#, 8 + note C_, 8 + octave 2 + note C#, 2 + note __, 2 + note G#, 4 + note G_, 2 + note __, 6 + intensity $c7 + octave 3 + note C#, 16 + intensity $c4 + octave 2 + note C#, 2 + note __, 2 + note G#, 4 + note G_, 2 + note __, 6 + intensity $c7 + octave 3 + note C#, 16 + intensity $c4 + octave 2 + note C#, 2 + note __, 2 + note G#, 4 + note G_, 2 + note __, 6 + note C#, 2 + note G#, 4 + note G_, 2 + note __, 8 + note C#, 2 + note __, 2 + note G#, 4 + note G_, 2 + note __, 6 + note C#, 2 + note G#, 4 + note G_, 2 + note __, 8 + loopchannel 0, Music_RocketHideout_branch_eec14 +; eec79 + +Music_RocketHideout_Ch3: ; eec79 + notetype $c, $19 +Music_RocketHideout_branch_eec7c: ; eec7c + octave 2 + note D#, 2 + note __, 2 + note A#, 4 + note A_, 2 + note __, 6 + note D#, 2 + note A#, 4 + note A_, 2 + note __, 8 + loopchannel 6, Music_RocketHideout_branch_eec7c +Music_RocketHideout_branch_eec8a: ; eec8a + note F_, 2 + note __, 2 + octave 3 + note C_, 4 + octave 2 + note B_, 2 + note __, 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: ; eec9b + note C#, 2 + note __, 2 + note G#, 4 + note G_, 2 + note __, 6 + octave 3 + note C#, 16 + loopchannel 2, Music_RocketHideout_branch_eec9b +Music_RocketHideout_branch_eeca6: ; eeca6 + octave 2 + note C#, 2 + note __, 2 + note G#, 4 + note G_, 2 + note __, 6 + note C#, 2 + note G#, 4 + note G_, 2 + note __, 8 + loopchannel 2, Music_RocketHideout_branch_eeca6 + loopchannel 0, Music_RocketHideout_branch_eec7c +; eecb8 + +Music_RocketHideout_Ch4: ; eecb8 + 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: ; 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 +; eecdb + +Music_RocketHideout_branch_eecdb: ; 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 +; eece8 + + diff --git a/crysaudio/music/rockettheme.asm b/crysaudio/music/rockettheme.asm new file mode 100644 index 00000000..3f53452e --- /dev/null +++ b/crysaudio/music/rockettheme.asm @@ -0,0 +1,484 @@ +Music_RocketTheme: ; f766d + dbw $c0, Music_RocketTheme_Ch1 + dbw $01, Music_RocketTheme_Ch2 + dbw $02, Music_RocketTheme_Ch3 + dbw $03, Music_RocketTheme_Ch4 +; f7679 + +Music_RocketTheme_Ch1: ; f7679 + tempo 128 + volume $77 + dutycycle $3 + stereopanning $f + vibrato $5, $64 + notetype $c, $a8 + octave 4 + note C_, 1 + note D_, 1 +Music_RocketTheme_branch_f768b: ; 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 + 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 + octave 4 + note F_, 1 + note F#, 3 + note F_, 2 + note __, 2 + note D#, 2 + note __, 2 + note C_, 2 + note D_, 2 + note D#, 2 + note C_, 2 + octave 3 + note A#, 2 + note G_, 2 + note A#, 2 + octave 4 + note C_, 2 + note __, 4 + note D_, 4 + note __, 4 + note D#, 4 + note __, 4 + note D#, 2 + note F#, 2 + callchannel Music_RocketTheme_branch_f7727 + octave 3 + note F#, 1 + note G_, 3 + note F_, 2 + note __, 2 + note D#, 2 + note __, 2 + note C_, 2 + note D_, 2 + note D#, 2 + note C_, 2 + octave 2 + note A#, 2 + note G_, 2 + note A#, 2 + octave 3 + note C_, 2 + note __, 4 + note D_, 4 + note __, 4 + note D#, 4 + note F_, 2 + note E_, 2 + note D#, 2 + note D_, 2 +Music_RocketTheme_branch_f76ef: ; f76ef + note __, 4 + note F_, 2 + note __, 14 + note F#, 2 + note __, 10 + loopchannel 3, Music_RocketTheme_branch_f76ef + note __, 4 + note F_, 2 + note __, 14 + note F#, 2 + note __, 2 + note F#, 2 + note __, 2 + note D#, 2 + note C_, 2 +Music_RocketTheme_branch_f7701: ; f7701 + note F#, 2 + note A_, 2 + loopchannel 4, Music_RocketTheme_branch_f7701 +Music_RocketTheme_branch_f7707: ; f7707 + note G_, 2 + note A#, 2 + loopchannel 4, Music_RocketTheme_branch_f7707 +Music_RocketTheme_branch_f770d: ; f770d + note G#, 2 + note B_, 2 + loopchannel 4, Music_RocketTheme_branch_f770d +Music_RocketTheme_branch_f7713: ; f7713 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + loopchannel 4, Music_RocketTheme_branch_f7713 + notetype $c, $b3 + note __, 16 + note __, 12 + note F_, 2 + note C_, 1 + note D_, 1 + loopchannel 0, Music_RocketTheme_branch_f768b +; f7727 + +Music_RocketTheme_branch_f7727: ; f7727 + note __, 7 + note B_, 1 + octave 4 + note C_, 2 + note __, 6 + note C_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 6 + octave 4 + note D#, 12 + note D_, 8 + octave 3 + note A#, 2 + note __, 6 + note G_, 2 + note __, 2 + note A_, 2 + note __, 2 + note A#, 2 + note __, 10 + endchannel +; f773e + +Music_RocketTheme_Ch2: ; f773e + stereopanning $ff + vibrato $4, $64 + dutycycle $3 + notetype $c, $b7 + octave 5 + note C_, 1 + note D_, 1 +Music_RocketTheme_branch_f774b: ; f774b + notetype $c, $b7 + callchannel Music_RocketTheme_branch_f7547 + intensity $b7 + callchannel Music_RocketTheme_branch_f758a + 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 + octave 4 + note A_, 1 + vibrato $0, $0 + intensity $b8 + note A#, 14 + vibrato $5, $22 + intensity $b7 + note A#, 5 + vibrato $6, $64 + notetype $c, $b7 + note A#, 12 + note __, 2 + octave 5 + note C_, 1 + note D_, 1 + callchannel Music_RocketTheme_branch_f7800 + note B_, 1 + vibrato $0, $0 + intensity $b8 + octave 4 + note C_, 14 + vibrato $5, $22 + intensity $b7 + note C_, 5 + vibrato $6, $64 + notetype $c, $b7 + 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 + octave 4 + note D_, 1 + note D#, 9 + note D_, 1 + note C#, 1 + note C_, 12 + note F_, 2 + note __, 2 + note F#, 2 + note __, 2 + callchannel Music_RocketTheme_branch_f781c + octave 3 + note B_, 2 + note __, 2 + octave 4 + note C_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D#, 8 + note __, 4 + note D_, 2 + note __, 2 + note C_, 2 + octave 3 + note G_, 2 + note B_, 1 + octave 4 + note C_, 15 + note C#, 16 + note D_, 16 + note D#, 16 + note E_, 2 + note C#, 2 + octave 3 + note A#, 2 + note G_, 2 + octave 4 + note F_, 2 + note D_, 2 + octave 3 + note B_, 2 + note G#, 2 + octave 4 + note F#, 2 + note D#, 2 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note G_, 2 + note E_, 2 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note G#, 2 + note F_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note A_, 2 + note F#, 2 + note D#, 2 + note C_, 2 + note A#, 2 + note G_, 2 + note E_, 2 + note C#, 2 + note B_, 4 + octave 5 + note C_, 2 + note D_, 2 + loopchannel 0, Music_RocketTheme_branch_f774b +; f7800 + +Music_RocketTheme_branch_f7800: ; f7800 + notetype $6, $b7 + note __, 7 + octave 4 + note D_, 1 + note D#, 2 + note __, 6 + note D#, 2 + note __, 2 + note C_, 2 + note __, 6 + note F#, 12 + note F_, 8 + note D#, 2 + note __, 6 + note C_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D#, 2 + note __, 2 + octave 3 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + endchannel +; f781c + +Music_RocketTheme_branch_f781c: ; f781c + octave 3 + note B_, 1 + octave 4 + note C_, 3 + note D#, 4 + note C_, 4 + note F#, 8 + note F_, 8 + note C_, 4 + endchannel +; f7826 + +Music_RocketTheme_Ch3: ; f7826 + stereopanning $f0 + vibrato $4, $22 + notetype $c, $14 + note __, 2 +Music_RocketTheme_branch_f782f: ; f782f + notetype $c, $14 + callchannel Music_RocketTheme_branch_f75bf + 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 + octave 3 + note C_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note A#, 1 + note G_, 1 + note E_, 1 + note C#, 1 + note D_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + octave 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D#, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + note C_, 1 + octave 3 + note A_, 1 + note F#, 1 + note D#, 1 + note E_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + octave 3 + note F#, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 4 + note F_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 3 + note B_, 2 + octave 4 + note G#, 1 + note __, 1 + loopchannel 0, Music_RocketTheme_branch_f782f +; f78be + +Music_RocketTheme_Ch4: ; f78be + togglenoise $3 + notetype $c + note __, 2 +Music_RocketTheme_branch_f78c3: ; f78c3 + callchannel Music_RocketTheme_branch_f765c + callchannel Music_RocketTheme_branch_f7664 + 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: ; 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 +; f78fd + + diff --git a/crysaudio/music/route1.asm b/crysaudio/music/route1.asm new file mode 100644 index 00000000..d988c4bc --- /dev/null +++ b/crysaudio/music/route1.asm @@ -0,0 +1,656 @@ +Music_Route1: ; ec000 + dbw $80, Music_Route1_Ch1 + dbw $01, Music_Route1_Ch2 + dbw $02, Music_Route1_Ch3 +; ec009 + + + + +Music_Route1_Ch1: ; ec00a + stereopanning $f + tempo 184 + volume $77 + vibrato $16, $11 + dutycycle $3 + notetype $c, $83 + octave 4 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note G_, 1 + note A_, 1 + note G_, 2 + note E_, 2 + note G_, 1 + note E_, 1 + octave 4 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 3 + note E_, 1 + note E_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + intensity $81 + octave 5 + note D_, 2 + note D_, 2 + intensity $83 + note __, 2 +Music_Route1_branch_ec04a: ; ec04a + intensity $83 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note __, 4 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note __, 2 + note __, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 3 + octave 4 + note D_, 1 + octave 3 + note E_, 2 + intensity $81 + note G_, 2 + note G_, 2 + intensity $83 + note __, 2 + note __, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note __, 4 + octave 4 + note C#, 2 + octave 3 + note A_, 2 + note __, 2 + note __, 2 + octave 4 + note C#, 2 + note C#, 1 + octave 3 + note B_, 1 + note A_, 1 + note G_, 1 + note F#, 2 + note A_, 2 + octave 4 + note D_, 2 + note __, 2 + note __, 2 + octave 3 + note F#, 1 + note G_, 1 + note A_, 4 + note __, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 1 + note G_, 1 + note A_, 2 + note A_, 1 + note B_, 1 + note A_, 2 + note A_, 1 + note B_, 1 + note A_, 2 + intensity $81 + octave 4 + note G_, 2 + note G_, 2 + intensity $83 + octave 3 + note F#, 1 + note E_, 1 + note __, 2 + note E_, 1 + note F#, 1 + note G_, 6 + note E_, 1 + octave 2 + note B_, 1 + octave 3 + note C#, 2 + note E_, 1 + note F#, 1 + note G_, 4 + notetype $8, $83 + note A_, 1 + note B_, 1 + note A_, 1 + notetype $c, $83 + note G_, 1 + note E_, 1 + note F#, 2 + intensity $81 + octave 4 + note A_, 2 + note A_, 2 + intensity $83 + octave 3 + note A_, 1 + note G_, 1 + intensity $77 + intensity $1d + note F#, 4 + note A_, 4 + note G_, 2 + note F#, 2 + note E_, 2 + note G_, 2 + note F#, 4 + note A_, 3 + note F#, 1 + note E_, 2 + note A_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 1 + note G_, 1 + dutycycle $2 + intensity $87 + octave 6 + note F#, 4 + note A_, 4 + note G_, 2 + note F#, 2 + note E_, 3 + note G_, 1 + note F#, 2 + note D_, 2 + note E_, 2 + note C#, 2 + note D_, 2 + intensity $81 + octave 5 + note D_, 2 + note D_, 2 + note __, 2 + loopchannel 0, Music_Route1_branch_ec04a +; ec0eb + +Music_Route1_Ch2: ; ec0eb + stereopanning $f0 + vibrato $12, $22 + dutycycle $2 + notetype $c, $92 + octave 4 + note F#, 1 + note G_, 1 + callchannel Music_Route1_branch_ec198 + octave 3 + note A_, 2 + note A_, 2 + octave 4 + note F#, 1 + note G_, 1 + callchannel Music_Route1_branch_ec1aa + note C#, 2 + note E_, 2 + note D_, 2 + intensity $81 + note F#, 2 + note F#, 2 + intensity $82 + octave 4 + note D_, 1 + note E_, 1 + dutycycle $2 +Music_Route1_branch_ec112: ; ec112 + intensity $82 + callchannel Music_Route1_branch_ec188 + intensity $81 + octave 3 + note A_, 2 + note A_, 2 + intensity $82 + octave 4 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note E_, 2 + note C#, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note F#, 1 + note E_, 1 + note E_, 1 + note F#, 1 + note D_, 2 + note __, 2 + note F#, 2 + note D_, 1 + note E_, 1 + callchannel Music_Route1_branch_ec188 + intensity $81 + note A_, 2 + note A_, 2 + intensity $82 + note C#, 1 + note D_, 1 + note E_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + octave 4 + note B_, 4 + notetype $8, $92 + note C#, 1 + note D_, 1 + note C#, 1 + notetype $c, $92 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D_, 2 + intensity $81 + octave 5 + note D_, 2 + note D_, 2 + intensity $82 + octave 4 + note F#, 1 + note G_, 1 + callchannel Music_Route1_branch_ec198 + note __, 4 + note F#, 1 + note G_, 1 + callchannel Music_Route1_branch_ec1aa + notetype $8, $92 + note C#, 1 + note D_, 1 + note C#, 1 + notetype $c, $92 + octave 4 + note B_, 1 + octave 5 + note C#, 1 + note D_, 2 + intensity $81 + note F#, 2 + note F#, 2 + intensity $82 + octave 4 + note D_, 1 + note E_, 1 + loopchannel 0, Music_Route1_branch_ec112 +; ec188 + +Music_Route1_branch_ec188: ; ec188 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note F#, 2 + note D_, 1 + note E_, 1 + note F#, 2 + note F#, 2 + note G_, 3 + note F#, 1 + note E_, 2 + endchannel +; ec198 + +Music_Route1_branch_ec198: ; ec198 + note A_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 2 + octave 5 + note D_, 2 + octave 4 + note A_, 2 + note F#, 2 + note D_, 3 + note F#, 1 + note E_, 2 + endchannel +; ec1aa + +Music_Route1_branch_ec1aa: ; ec1aa + note A_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + octave 5 + note D_, 2 + note C#, 2 + octave 4 + note B_, 3 + note G_, 1 + note A_, 2 + octave 5 + note D_, 2 + endchannel +; ec1b8 + +Music_Route1_Ch3: ; ec1b8 + stereopanning $ff + vibrato $10, $23 + notetype $c, $25 + note __, 2 + octave 3 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note F#, 1 + note __, 3 + octave 3 + note D_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note G_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + note D_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 3 + octave 3 + note C#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note C#, 1 + octave 3 + note A_, 1 + note D_, 1 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + note F#, 1 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + note F#, 1 + note A_, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note B_, 1 + octave 4 + note G_, 1 + note D_, 1 + octave 3 + note B_, 1 + note G_, 1 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note E_, 1 + note G_, 1 + note E_, 1 + note A_, 1 + octave 4 + note C#, 1 + note G_, 1 + note F#, 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 +Music_Route1_branch_ec20c: ; ec20c + octave 3 + note D_, 1 + note __, 1 + octave 4 + note D_, 2 + octave 3 + note C#, 1 + note __, 1 + octave 4 + note C#, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note B_, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note A_, 2 + note D_, 1 + note __, 1 + octave 4 + note D_, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note A_, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note B_, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note A_, 2 + note C#, 1 + note __, 1 + octave 4 + note C#, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note A_, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note B_, 2 + note C_, 1 + note __, 1 + octave 4 + note C_, 2 + octave 3 + note C#, 1 + note __, 1 + octave 4 + note C#, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note C#, 1 + octave 3 + note B_, 1 + note A_, 2 + note G_, 1 + note E_, 1 + octave 2 + note D_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note E_, 1 + note __, 1 + octave 3 + note E_, 2 + octave 2 + note F#, 1 + note __, 1 + octave 3 + note F#, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + note E_, 2 + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 4 + note E_, 2 + octave 3 + note C#, 1 + note __, 1 + octave 4 + note C#, 2 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note B_, 2 + octave 2 + note A_, 1 + note __, 1 + octave 3 + note A_, 2 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note G_, 1 + note B_, 1 + octave 4 + note C#, 2 + note E_, 1 + note C#, 1 + octave 3 + note A_, 1 + note G_, 1 + note E_, 1 + note C#, 1 + note D_, 2 + octave 4 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + octave 3 + note D_, 4 + note F#, 4 + note G_, 2 + note A_, 2 + note B_, 3 + note G_, 1 + note F#, 2 + note D_, 2 + octave 2 + note A_, 3 + octave 3 + note D_, 1 + note A_, 1 + note B_, 1 + note A_, 1 + note B_, 1 + note A_, 3 + note G_, 1 + note F#, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note G_, 2 + note F#, 2 + note E_, 3 + note C#, 1 + note D_, 2 + note F#, 2 + note A_, 2 + octave 4 + note C#, 2 + note D_, 2 + octave 5 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + loopchannel 0, Music_Route1_branch_ec20c +; ec2ca + + diff --git a/crysaudio/music/route12.asm b/crysaudio/music/route12.asm new file mode 100644 index 00000000..0a35ab6b --- /dev/null +++ b/crysaudio/music/route12.asm @@ -0,0 +1,462 @@ +Music_Route12: ; ec506 + dbw $c0, Music_Route12_Ch1 + dbw $01, Music_Route12_Ch2 + dbw $02, Music_Route12_Ch3 + dbw $03, Music_Route12_Ch4 +; ec512 + +Music_Route12_Ch1: ; ec512 + tempo 148 + volume $77 + vibrato $12, $34 + tone $0001 + stereopanning $f + dutycycle $3 + notetype $c, $98 + octave 3 + note G#, 1 + note __, 2 + note A_, 1 + note G#, 8 + octave 2 + note B_, 1 + octave 3 + note E_, 1 + note F#, 1 + note G#, 1 + note F#, 1 + note __, 2 + note E_, 1 + intensity $97 + note D#, 12 +Music_Route12_branch_ec535: ; ec535 + dutycycle $2 + intensity $96 + callchannel Music_Route12_branch_ec5b1 + callchannel Music_Route12_branch_ec5bf + callchannel Music_Route12_branch_ec5b1 + note E_, 1 + note __, 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 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + note G#, 1 + note E_, 1 + octave 4 + note D#, 1 + octave 3 + note B_, 1 + note G#, 1 + note D#, 1 + octave 4 + note D_, 1 + octave 3 + note B_, 1 + note G#, 1 + note D_, 1 + note C#, 1 + note F_, 1 + note G#, 1 + note B_, 1 + dutycycle $3 + intensity $7f + octave 4 + note C#, 3 + octave 3 + note B_, 3 + note A_, 1 + note __, 1 + note A_, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 4 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 3 + note A_, 3 + note G#, 1 + note __, 1 + note G#, 4 + note B_, 2 + note A_, 2 + note B_, 1 + note A_, 1 + note G#, 4 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note E_, 2 + note D#, 3 + note F#, 3 + note D#, 2 + note E_, 8 + note F#, 8 + note D#, 4 + note F#, 4 +Music_Route12_branch_ec59b: ; ec59b + intensity $97 + note G#, 1 + note A_, 1 + note B_, 4 + octave 2 + note B_, 1 + octave 3 + note D#, 1 + note E_, 1 + note __, 1 + note E_, 1 + note F#, 1 + note G#, 4 + loopchannel 2, Music_Route12_branch_ec59b + loopchannel 0, Music_Route12_branch_ec535 +; ec5b1 + +Music_Route12_branch_ec5b1: ; ec5b1 + octave 3 + note G#, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + note B_, 1 + octave 3 + note D#, 1 + note E_, 4 + note G#, 4 + endchannel +; ec5bf + +Music_Route12_branch_ec5bf: ; ec5bf + note A_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note G#, 1 + note A_, 4 + note F#, 4 + endchannel +; ec5ca + +Music_Route12_Ch2: ; ec5ca + dutycycle $3 + vibrato $12, $34 + notetype $c, $b8 + octave 4 + note E_, 1 + note __, 2 + note F#, 1 + note E_, 12 + octave 3 + note B_, 1 + note __, 2 + octave 4 + note C_, 1 + intensity $b7 + octave 3 + note B_, 8 + note D#, 1 + note F#, 1 + note B_, 1 + octave 4 + note D#, 1 +Music_Route12_branch_ec5e5: ; ec5e5 + dutycycle $3 + intensity $b7 + callchannel Music_Route12_branch_ec647 + note F#, 1 + note A_, 1 + note G#, 1 + note F#, 1 + note G#, 2 + note __, 1 + note E_, 1 + octave 3 + note B_, 12 + dutycycle $2 + octave 2 + note B_, 1 + note __, 2 + octave 3 + note C_, 1 + octave 2 + note B_, 4 + octave 3 + note D#, 4 + note F#, 4 + dutycycle $3 + callchannel Music_Route12_branch_ec647 + note A_, 1 + octave 5 + note C#, 1 + octave 4 + note B_, 1 + note A_, 1 + note B_, 2 + note __, 1 + note A_, 1 + intensity $b8 + note G#, 6 + intensity $b7 + note G#, 6 + intensity $6f + note G#, 16 + dutycycle $2 + intensity $a8 + note A_, 3 + note G#, 3 + note F#, 1 + note __, 1 + note F#, 8 + intensity $a7 + note F#, 10 + note __, 2 + note F#, 4 + intensity $a8 + note G#, 3 + note F#, 3 + note E_, 1 + note __, 1 + note E_, 8 + intensity $a7 + note E_, 10 + note __, 2 + note E_, 4 + note F#, 3 + note D#, 3 + octave 3 + note B_, 2 + intensity $a8 + octave 4 + note B_, 8 + note B_, 8 + note A_, 8 + note G#, 1 + note F#, 1 + note E_, 14 + note E_, 10 + intensity $a4 + note E_, 6 + loopchannel 0, Music_Route12_branch_ec5e5 +; ec647 + +Music_Route12_branch_ec647: ; ec647 + octave 4 + note E_, 6 + intensity $b1 + octave 3 + note B_, 1 + note B_, 1 + intensity $b7 + note B_, 4 + octave 4 + note B_, 4 + note A_, 4 + note G#, 4 + note F#, 4 + endchannel +; ec657 + +Music_Route12_Ch3: ; ec657 + vibrato $12, $54 + notetype $c, $16 + octave 3 + note G#, 2 + note __, 4 + note G#, 1 + note A_, 1 + note B_, 2 + note __, 2 + note E_, 4 + note D#, 2 + note __, 4 + note D#, 1 + note E_, 1 + note F#, 2 + note __, 2 + note D#, 4 +Music_Route12_branch_ec66c: ; ec66c + callchannel Music_Route12_branch_ec6b4 + note F#, 1 + note __, 1 + note E_, 1 + note __, 3 + note D#, 1 + note E_, 1 + note F#, 4 + octave 2 + note B_, 4 + callchannel Music_Route12_branch_ec6b4 + note E_, 1 + note __, 1 + note B_, 1 + note __, 3 + octave 2 + note B_, 1 + octave 3 + note C#, 1 + note D_, 4 + note F_, 4 + note F#, 13 + note __, 1 + note F#, 1 + note G#, 1 + note A_, 5 + note __, 1 + note A_, 1 + note B_, 1 + octave 4 + note C_, 4 + octave 3 + note F#, 4 + note E_, 14 + note G#, 1 + note A_, 1 + note B_, 6 + note E_, 1 + note F#, 1 + note G_, 4 + note E_, 4 + octave 2 + note B_, 5 + note __, 1 + note B_, 1 + octave 3 + note D#, 1 + note F#, 8 + note E_, 8 + note F#, 4 + note D#, 4 +Music_Route12_branch_ec6a3: ; ec6a3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 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 +; ec6b4 + +Music_Route12_branch_ec6b4: ; ec6b4 + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note F#, 1 + note G#, 4 + note E_, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 3 + note D_, 1 + note E_, 1 + note F#, 4 + note D_, 4 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note F#, 1 + note G#, 4 + note E_, 4 + endchannel +; ec6ce + +Music_Route12_Ch4: ; ec6ce + 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: ; 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: ; 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: ; 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 +; ec717 + +Music_Route12_branch_ec717: ; 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 +; ec720 + + diff --git a/crysaudio/music/route2.asm b/crysaudio/music/route2.asm new file mode 100644 index 00000000..bb0ad13b --- /dev/null +++ b/crysaudio/music/route2.asm @@ -0,0 +1,530 @@ +Music_Route2: ; ed8dd + dbw $c0, Music_Route2_Ch1 + dbw $01, Music_Route2_Ch2 + dbw $02, Music_Route2_Ch3 + dbw $03, Music_Route2_Ch4 +; ed8e9 + +Music_Route2_Ch1: ; ed8e9 + 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: ; ed8fb + intensity $b1 + octave 3 + note B_, 4 + note B_, 4 + note B_, 4 + note B_, 4 + octave 4 + note E_, 4 + 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 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note F_, 2 + note D_, 2 + octave 3 + note B_, 2 + note G_, 2 + callchannel Music_Route2_branch_ed971 + note G_, 2 + octave 4 + note C_, 2 + note D_, 2 + note G_, 2 + note F_, 2 + note D_, 2 + octave 3 + note B_, 2 + note G_, 2 + loopchannel 0, Music_Route2_branch_ed8fb +; ed931 + +Music_Route2_branch_ed931: ; ed931 + octave 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + note C_, 4 + intensity $b7 + note C_, 4 + octave 3 + note B_, 4 + intensity $b1 + endchannel +; ed940 + +Music_Route2_branch_ed940: ; ed940 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + note E_, 2 + note A#, 2 + note E_, 2 + note A#, 2 + note E_, 2 + note A#, 2 + note E_, 2 + note A#, 2 + note C_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note C_, 2 + note A_, 2 + note C_, 2 + note G#, 2 + note C_, 2 + note G#, 2 + intensity $b7 + octave 2 + note B_, 2 + octave 3 + note G#, 2 + octave 2 + note B_, 2 + octave 3 + note G_, 2 + intensity $b1 + endchannel +; ed971 + +Music_Route2_branch_ed971: ; ed971 + note B_, 2 + note G_, 2 + note B_, 2 + note G_, 2 + note B_, 2 + note G#, 2 + note B_, 2 + note G#, 2 + octave 4 + note E_, 2 + note C_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + endchannel +; ed996 + +Music_Route2_Ch2: ; ed996 + stereopanning $ff + vibrato $8, $24 + notetype $c, $b2 + callchannel Music_Route2_branch_ed9ba +Music_Route2_branch_ed9a1: ; ed9a1 + intensity $b2 + callchannel Music_Route2_branch_ed9ba + 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 +; ed9ba + +Music_Route2_branch_ed9ba: ; ed9ba + octave 4 + note E_, 4 + note E_, 4 + note E_, 2 + octave 2 + note C_, 2 + octave 4 + note E_, 2 + octave 2 + note C_, 2 + octave 4 + note A#, 4 + note A#, 4 + note A#, 2 + octave 2 + note G_, 2 + octave 4 + note A#, 2 + octave 2 + note G_, 2 + octave 4 + note A_, 4 + note A_, 4 + note A_, 4 + note A_, 4 + note G#, 4 + note G#, 4 + intensity $b7 + note G#, 4 + note G_, 4 + intensity $b2 + endchannel +; ed9dc + +Music_Route2_branch_ed9dc: ; ed9dc + octave 2 + note C_, 4 + note __, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 2 + note __, 2 + note C_, 1 + note __, 1 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + note G_, 1 + note __, 1 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 2 + note __, 2 + note F_, 1 + note __, 1 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 4 + note D_, 4 + endchannel +; eda02 + +Music_Route2_branch_eda02: ; eda02 + octave 2 + note E_, 4 + note __, 2 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + note E_, 1 + note __, 1 + note A_, 4 + note __, 2 + note A_, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 2 + note __, 2 + note G#, 1 + note __, 1 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 2 + note __, 2 + note F#, 1 + note __, 1 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + note G_, 1 + note __, 1 + endchannel +; eda2c + +Music_Route2_Ch3: ; eda2c + stereopanning $f0 + vibrato $16, $15 + notetype $c, $14 + octave 4 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + note B_, 1 + note __, 3 + octave 5 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 + callchannel Music_Route2_branch_eda9e + octave 3 + note D_, 4 +Music_Route2_branch_eda4b: ; eda4b + notetype $c, $15 + octave 3 + note C_, 4 + note __, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 2 + note __, 2 + note C_, 1 + note __, 1 + note G_, 4 + note __, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + note G_, 1 + note __, 1 + callchannel Music_Route2_branch_eda9e + octave 3 + note D_, 2 + intensity $10 + octave 6 + note C_, 1 + note D_, 1 + callchannel Music_Route2_branch_edaaf + note __, 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 D#, 1 + note E_, 7 + note D_, 4 + octave 5 + note B_, 1 + octave 6 + note C_, 3 + octave 5 + note B_, 4 + note A_, 4 + note B_, 8 + note G_, 4 + octave 6 + note A_, 4 + note G_, 4 + callchannel Music_Route2_branch_edacb + note __, 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 +; eda9e + +Music_Route2_branch_eda9e: ; eda9e + octave 3 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 2 + note __, 2 + note F_, 1 + note __, 1 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 4 + endchannel +; edaaf + +Music_Route2_branch_edaaf: ; edaaf + octave 6 + note E_, 10 + note D_, 2 + note __, 2 + note C_, 2 + notetype $6, $10 + octave 5 + note F#, 1 + note G_, 15 + note A_, 4 + note A#, 4 + note __, 4 + octave 6 + note C_, 2 + note D_, 2 + note D#, 1 + note E_, 16 + note E_, 7 + note F_, 4 + note E_, 4 + note D#, 1 + note E_, 3 + note D_, 4 + note C_, 4 + note D_, 4 + endchannel +; edacb + +Music_Route2_branch_edacb: ; edacb + octave 5 + note B_, 16 + note __, 4 + octave 6 + note C#, 1 + note D_, 7 + note E_, 4 + octave 5 + note B_, 1 + octave 6 + note C_, 16 + note C_, 3 + note D_, 4 + note __, 4 + note E_, 4 + note F_, 16 + endchannel +; edadc + +Music_Route2_Ch4: ; edadc + togglenoise $5 + notetype $c +Music_Route2_branch_edae0: ; edae0 + note A_, 4 + note A_, 4 + 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: ; 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: ; 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: ; 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: ; 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 +; edb29 + + diff --git a/crysaudio/music/route26.asm b/crysaudio/music/route26.asm new file mode 100644 index 00000000..577f7807 --- /dev/null +++ b/crysaudio/music/route26.asm @@ -0,0 +1,677 @@ +Music_Route26: ; eefb2 + dbw $c0, Music_Route26_Ch1 + dbw $01, Music_Route26_Ch2 + dbw $02, Music_Route26_Ch3 + dbw $03, Music_Route26_Ch4 +; eefbe + +Music_Route26_Ch1: ; eefbe + stereopanning $f + vibrato $12, $23 + tempo 151 + volume $77 + vibrato $14, $23 + dutycycle $0 + notetype $c, $a7 + octave 3 + note D_, 4 + note __, 4 + note D#, 4 + note __, 4 + note F#, 4 + note __, 4 + note G#, 12 + notetype $8, $a7 + octave 4 + note C_, 2 + octave 3 + note G#, 2 + note F#, 2 +Music_Route26_branch_eefe0: ; eefe0 + dutycycle $0 + notetype $c, $a7 + octave 3 + note F_, 1 + note __, 2 + note C#, 1 + note F_, 3 + note G_, 1 + note G#, 1 + note __, 2 + note F_, 1 + octave 4 + note C#, 4 + note D#, 4 + octave 3 + note B_, 4 + note A_, 4 + note F#, 4 + note F_, 1 + note __, 1 + note C#, 1 + note F_, 1 + note G#, 3 + note G_, 1 + note G#, 1 + note __, 1 + note F_, 1 + note G#, 1 + octave 4 + note C#, 4 + note E_, 4 + note D#, 4 + octave 3 + note A_, 4 + note B_, 4 + note A#, 1 + note __, 1 + note F_, 1 + note A#, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note A#, 1 + octave 4 + note C#, 1 + note F_, 4 + note C#, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + note A#, 4 + note __, 2 + notetype $6, $a7 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note __, 2 + notetype $8, $a5 + note G#, 2 + octave 4 + note C#, 2 + note D#, 2 + note G#, 6 + note F#, 6 + note D#, 6 + note C#, 6 + octave 3 + note A#, 6 + octave 4 + note C_, 6 + octave 3 + note G#, 6 + dutycycle $2 + notetype $c, $a5 + note A_, 3 + note G#, 3 + note F#, 4 + note C#, 2 + note D#, 2 + note E_, 2 + note F#, 2 + note B_, 4 + note A_, 2 + note G#, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note G#, 4 + note F#, 4 + note E_, 4 + note D#, 4 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note G#, 2 + note F_, 4 + note F#, 2 + notetype $6, $a5 + note G#, 7 + octave 4 + note C_, 1 + note C#, 8 + notetype $8, $a5 + octave 3 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 6 + notetype $6, $a5 + note __, 7 + octave 4 + note D#, 1 + note E_, 8 + notetype $8, $a5 + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 6 + note __, 6 + notetype $c, $a5 + octave 2 + note B_, 1 + note F#, 1 + note B_, 1 + octave 3 + note E_, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note B_, 1 + octave 4 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note F#, 1 + note B_, 1 + note F#, 1 + note E_, 1 + octave 3 + note B_, 1 + note F#, 4 + note D#, 4 + octave 2 + note B_, 4 + note __, 4 + loopchannel 0, Music_Route26_branch_eefe0 +; ef09d + +Music_Route26_Ch2: ; ef09d + stereopanning $f0 + vibrato $14, $23 + dutycycle $2 + notetype $c, $c7 + octave 1 + note A#, 4 + note __, 2 + notetype $6, $c7 + note A#, 1 + note __, 1 + octave 2 + note A#, 1 + note __, 1 + octave 1 + note G#, 8 + note __, 4 + note G#, 1 + note __, 1 + octave 2 + note G#, 1 + note __, 1 + octave 1 + note F#, 8 + note __, 4 + note F#, 1 + note __, 1 + octave 2 + note F#, 1 + note __, 1 + notetype $c, $c7 + octave 1 + note G#, 12 + notetype $8, $c7 + note G#, 2 + octave 2 + note C_, 2 + note D#, 2 +Music_Route26_branch_ef0ce: ; ef0ce + dutycycle $2 + notetype $c, $c2 + octave 2 + note C#, 6 + note C#, 1 + note G#, 1 + note C#, 2 + note C#, 2 + note G#, 2 + note C#, 2 + octave 1 + note B_, 6 + note B_, 1 + octave 2 + note A_, 1 + octave 1 + note B_, 2 + note B_, 2 + note B_, 2 + note B_, 2 + callchannel Music_Route26_branch_ef14e + note A_, 6 + note A_, 1 + octave 2 + note B_, 1 + notetype $8, $c2 + octave 1 + note B_, 2 + note B_, 2 + note B_, 2 + octave 2 + note B_, 2 + note B_, 2 + note B_, 2 + notetype $c, $c2 + callchannel Music_Route26_branch_ef14e + intensity $c7 + octave 2 + note F#, 4 + note __, 2 + notetype $6, $c2 + 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: ; ef10e + octave 2 + note G#, 2 + note G#, 2 + note G#, 2 + octave 1 + note G#, 6 + loopchannel 3, Music_Route26_branch_ef10e + octave 2 + note G#, 2 + note G#, 2 + note G#, 2 + notetype $c, $c7 + note F#, 1 + note D#, 1 + note C_, 1 + octave 1 + note G#, 1 + dutycycle $3 + octave 4 + note C#, 6 + note D#, 6 + note E_, 4 + note F#, 6 + note B_, 4 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 6 + note D#, 2 + note __, 2 + note D#, 2 + note G#, 2 + note D#, 2 + note F_, 2 + note __, 2 + note F_, 2 + note F#, 6 + note G#, 4 + note A_, 8 + note __, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note A_, 8 + note __, 4 + note G#, 2 + note A_, 2 + note B_, 12 + note __, 4 + note D#, 12 + note D#, 1 + note C#, 1 + note C_, 1 + note D#, 1 + loopchannel 0, Music_Route26_branch_ef0ce +; ef14e + +Music_Route26_branch_ef14e: ; ef14e + note A#, 6 + note A#, 1 + octave 2 + note A#, 1 + octave 1 + note A#, 2 + note A#, 2 + octave 2 + note A#, 2 + octave 1 + note A#, 2 + endchannel +; ef15a + +Music_Route26_Ch3: ; ef15a + stereopanning $ff + vibrato $12, $23 + notetype $c, $14 + vibrato $18, $23 + octave 4 + note A#, 4 + note __, 2 + notetype $6, $14 + note F_, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 5 + note C_, 8 + note __, 4 + octave 4 + note G#, 1 + note __, 1 + octave 5 + note C_, 1 + note __, 1 + note C#, 8 + note __, 4 + octave 4 + note A#, 1 + note __, 1 + octave 5 + note C#, 1 + note __, 1 + notetype $c, $14 + note D#, 12 + notetype $8, $14 + note F#, 2 + note F_, 2 + note D#, 2 +Music_Route26_branch_ef18a: ; ef18a + vibrato $18, $23 + notetype $c, $14 + octave 5 + note C#, 1 + note __, 2 + octave 4 + note G#, 1 + callchannel Music_Route26_branch_ef22f + vibrato $25, $13 + note C#, 1 + note __, 1 + octave 4 + note G#, 1 + octave 5 + note C#, 1 + callchannel Music_Route26_branch_ef22f + note F_, 1 + note __, 1 + note C#, 1 + note F_, 1 + note A#, 8 + note A#, 1 + note __, 1 + octave 6 + note C_, 1 + note __, 1 + note C#, 12 + note D#, 4 + note C#, 8 + note C_, 8 + octave 5 + note A#, 8 + octave 6 + note C_, 4 + note G#, 1 + note D#, 1 + note C_, 1 + octave 5 + note G#, 1 + intensity $15 + octave 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + notetype $6, $15 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 3 + note A_, 2 + note __, 2 + octave 2 + note A_, 4 + note B_, 2 + note __, 2 + note B_, 2 + note __, 6 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 3 + note B_, 2 + note __, 2 + note A_, 4 + note G#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 6 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 2 + note __, 2 + note G#, 2 + note __, 2 + octave 3 + note G#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 2 + octave 3 + note C#, 2 + note __, 10 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 4 + note F_, 2 + note __, 2 + note C#, 4 + octave 3 + note F#, 8 + notetype $8, $15 + octave 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + note F#, 6 + note __, 6 + octave 4 + note C_, 6 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 6 + note __, 6 + notetype $c, $15 + octave 2 + note B_, 16 + note B_, 8 + octave 3 + note F#, 4 + note D#, 1 + note __, 1 + octave 2 + note G#, 1 + octave 3 + note C_, 1 + loopchannel 0, Music_Route26_branch_ef18a +; ef22f + +Music_Route26_branch_ef22f: ; ef22f + octave 5 + note F_, 8 + note C#, 2 + note F_, 2 + note G#, 4 + note F#, 4 + note C#, 4 + note D#, 4 + endchannel +; ef238 + +Music_Route26_Ch4: ; ef238 + togglenoise $4 + notetype $c +Music_Route26_branch_ef23c: ; ef23c + note B_, 6 + note D_, 1 + note D_, 1 + loopchannel 3, Music_Route26_branch_ef23c + callchannel Music_Route26_branch_ef2b0 +Music_Route26_branch_ef246: ; ef246 + notetype $6 + callchannel Music_Route26_branch_ef29a + 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: ; 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: ; 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 +; ef29a + +Music_Route26_branch_ef29a: ; 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 +; ef2a8 + +Music_Route26_branch_ef2a8: ; ef2a8 + note E_, 12 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 4 + note E_, 4 + note D_, 4 + endchannel +; ef2b0 + +Music_Route26_branch_ef2b0: ; 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 +; ef2d0 + + diff --git a/crysaudio/music/route29.asm b/crysaudio/music/route29.asm new file mode 100644 index 00000000..3703e62e --- /dev/null +++ b/crysaudio/music/route29.asm @@ -0,0 +1,528 @@ +Music_Route29: ; f0386 + dbw $c0, Music_Route29_Ch1 + dbw $01, Music_Route29_Ch2 + dbw $02, Music_Route29_Ch3 + dbw $03, Music_Route29_Ch4 +; f0392 + +Music_Route29_Ch1: ; f0392 + tempo 146 + volume $77 + dutycycle $3 + tone $0001 + vibrato $10, $15 + stereopanning $f + notetype $c, $b2 + note __, 2 +Music_Route29_branch_f03a5: ; f03a5 + note __, 2 + octave 4 + note C_, 2 + note E_, 2 + note C_, 4 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 4 + note A_, 2 + note F#, 2 + note C_, 4 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + note D_, 4 + octave 4 + note C_, 2 + note E_, 2 + note C_, 4 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 4 + note A_, 2 + note C_, 2 + note D_, 2 + note G_, 2 + note C_, 2 + note C_, 4 + note G_, 2 + octave 4 + note C_, 2 + note E_, 2 + note C_, 2 + octave 3 + note E_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note F_, 1 + note G_, 1 + note A_, 2 + note C_, 2 + note F#, 2 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note B_, 4 + note E_, 2 + octave 4 + note C_, 2 + note E_, 2 + note E_, 2 + octave 3 + note E_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note D_, 1 + note G_, 1 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note G_, 2 + note E_, 1 + note F_, 1 + note G_, 2 + note G_, 2 + note F_, 8 + intensity $b4 + note A_, 4 + octave 4 + note C_, 2 + octave 3 + note A_, 10 + note E_, 4 + note G_, 2 + note E_, 2 + intensity $b2 + note G_, 6 + intensity $b4 + note F_, 4 + note A_, 2 + note G_, 2 + note F_, 2 + intensity $b2 + note A_, 4 + intensity $b4 + note C#, 4 + note E_, 2 + note G_, 4 + intensity $b3 + note E_, 8 + intensity $b4 + note A_, 2 + note G_, 2 + note A_, 2 + octave 4 + note C_, 4 + intensity $b2 + octave 3 + note A_, 6 + intensity $b4 + note G_, 2 + note E_, 2 + note G_, 2 + octave 4 + note C_, 4 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + intensity $b2 + note G_, 4 + note B_, 4 + intensity $b4 + note G_, 2 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 4 + note E_, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note G_, 4 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + intensity $b2 + note C_, 2 + note G_, 2 + note G_, 4 + loopchannel 0, Music_Route29_branch_f03a5 +; f044d + +Music_Route29_Ch2: ; f044d + dutycycle $3 + vibrato $12, $36 + notetype $c, $c2 + octave 4 + note C_, 1 + note D_, 1 +Music_Route29_branch_f0458: ; f0458 + callchannel Music_Route29_branch_f04de + note F_, 1 + note E_, 1 + note D_, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + octave 3 + note E_, 2 + note E_, 2 + octave 4 + note C_, 1 + note D_, 1 + callchannel Music_Route29_branch_f04de + note F_, 1 + note E_, 1 + note D_, 2 + note D_, 2 + octave 3 + note B_, 2 + intensity $c4 + octave 4 + note C_, 8 + octave 3 + note A_, 2 + note A_, 2 + octave 4 + note C_, 2 + note C_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + octave 3 + note G_, 2 + note G_, 2 + octave 4 + note C_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + octave 3 + note F_, 2 + note F_, 2 + note A_, 2 + note A_, 2 + octave 4 + note D_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + octave 3 + note A#, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + octave 4 + note C_, 2 + note C_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + octave 3 + note G_, 2 + note G_, 2 + octave 4 + note C_, 2 + note C_, 2 + note E_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note F_, 2 + intensity $c2 + note E_, 4 + note D_, 4 + intensity $c4 + note C_, 2 + octave 3 + note G_, 2 + octave 4 + note E_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + octave 4 + note E_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + octave 4 + note E_, 2 + octave 3 + note G_, 2 + intensity $c2 + octave 4 + note C_, 2 + note C_, 2 + note C_, 2 + octave 4 + note C_, 1 + note D_, 1 + loopchannel 0, Music_Route29_branch_f0458 +; f04de + +Music_Route29_branch_f04de: ; f04de + note E_, 2 + note E_, 2 + note G_, 2 + note G_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + note F_, 1 + note E_, 1 + note D_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + octave 4 + note A_, 2 + note G_, 2 + note C_, 1 + note D_, 1 + note E_, 2 + note E_, 2 + note G_, 2 + note G_, 2 + note C_, 2 + note D_, 2 + note E_, 2 + note C_, 2 + endchannel +; f04fb + +Music_Route29_Ch3: ; f04fb + stereopanning $f0 + notetype $c, $25 + vibrato $9, $27 + note __, 2 +Music_Route29_branch_f0504: ; f0504 + note __, 2 + octave 3 + note G_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 3 + octave 3 + note A_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note E_, 1 + note __, 3 + note C_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 3 + note F_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note E_, 4 + note G_, 4 + octave 4 + note C_, 4 + octave 3 + note G_, 4 + note F_, 4 + note F#, 4 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note E_, 4 + note G_, 4 + octave 4 + note C_, 4 + octave 3 + note G_, 2 + note E_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 2 + note D_, 2 + note C_, 6 + octave 3 + note F_, 6 + note A_, 4 + octave 4 + note C_, 6 + octave 3 + note G_, 6 + note A_, 2 + note A#, 2 + note B_, 6 + note G_, 6 + octave 4 + note D_, 2 + note F_, 2 + octave 3 + note A_, 6 + note E_, 2 + octave 4 + note E_, 2 + note C#, 2 + octave 3 + note A_, 2 + note G_, 2 + note A_, 6 + octave 4 + note C_, 6 + octave 3 + note A_, 4 + note G_, 6 + octave 4 + note C_, 6 + note F_, 2 + note E_, 2 + note F_, 6 + note F_, 2 + note E_, 2 + note __, 2 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note C_, 6 + octave 3 + note G_, 6 + octave 4 + note C_, 4 + note E_, 4 + note C_, 4 + octave 3 + note G_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note C_, 1 + note __, 3 + loopchannel 0, Music_Route29_branch_f0504 +; f05a9 + +Music_Route29_Ch4: ; f05a9 + stereopanning $f + togglenoise $0 + notetype $c + note __, 2 +Music_Route29_branch_f05b0: ; f05b0 + note __, 2 + note F_, 2 + 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 +; f05bf + + diff --git a/crysaudio/music/route3.asm b/crysaudio/music/route3.asm new file mode 100644 index 00000000..5f7e66d9 --- /dev/null +++ b/crysaudio/music/route3.asm @@ -0,0 +1,512 @@ +Music_Route3: ; ec2ca + dbw $c0, Music_Route3_Ch1 + dbw $01, Music_Route3_Ch2 + dbw $02, Music_Route3_Ch3 + dbw $03, Music_Route3_Ch4 +; ec2d6 + +Music_Route3_Ch1: ; ec2d6 + stereopanning $f + tempo 160 + volume $77 + notetype $c, $91 + note __, 10 + dutycycle $0 + vibrato $14, $6 + octave 3 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note F_, 1 + note D_, 1 + note F_, 1 + note D_, 1 + note F_, 1 + note D_, 1 + note F_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note F#, 1 + note G#, 1 +Music_Route3_branch_ec307: ; ec307 + callchannel Music_Route3_branch_ec3a4 + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + intensity $6f + note G_, 1 + note D_, 1 + intensity $77 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + note G_, 1 + note D_, 1 + note E_, 1 + note G#, 1 + note B_, 4 + intensity $6f + octave 3 + note G#, 2 + note E_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note E_, 8 + note D#, 1 + note E_, 1 + note G#, 2 + octave 2 + note B_, 4 + octave 3 + note D_, 2 + note E_, 2 + note G#, 2 + note B_, 2 + note A_, 1 + note G#, 1 + note F_, 3 + note E_, 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note F_, 2 + intensity $91 + note F#, 1 + note D_, 1 + octave 2 + note A_, 1 + octave 3 + note D_, 1 + note F#, 1 + note A_, 1 + note F#, 1 + note A_, 1 + note B_, 1 + note G#, 1 + note E_, 1 + note G#, 1 + note E_, 1 + note G#, 1 + note B_, 1 + octave 4 + note D_, 1 + loopchannel 0, Music_Route3_branch_ec307 +; ec3a4 + +Music_Route3_branch_ec3a4: ; ec3a4 + octave 3 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + loopchannel 3, Music_Route3_branch_ec3a4 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 +Music_Route3_branch_ec3b1: ; ec3b1 + note A_, 1 + note E_, 1 + note C#, 1 + note E_, 1 + loopchannel 3, Music_Route3_branch_ec3b1 + note C#, 1 + note E_, 1 + note C#, 1 + note E_, 1 +Music_Route3_branch_ec3bd: ; ec3bd + note G_, 1 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + loopchannel 3, Music_Route3_branch_ec3bd + octave 2 + note B_, 1 + octave 3 + note D_, 1 + octave 2 + note B_, 1 + octave 3 + note D_, 1 + endchannel +; ec3d0 + +Music_Route3_Ch2: ; ec3d0 + stereopanning $f0 + notetype $c, $5e + dutycycle $2 + vibrato $6, $3 + octave 4 + note E_, 1 + note G_, 1 + note G#, 6 + intensity $87 + note F#, 1 + note G#, 1 + note A_, 1 + note __, 7 + note C#, 4 + note E_, 4 + note D_, 4 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + intensity $a7 + dutycycle $2 + octave 3 + note A_, 1 + octave 4 + note C#, 1 + note E_, 1 + note G#, 1 +Music_Route3_branch_ec3f5: ; ec3f5 + intensity $7d + callchannel Music_Route3_branch_ec443 + note G_, 1 + note B_, 10 + intensity $b7 + note B_, 6 + intensity $7d + note __, 4 + dutycycle $3 + note G#, 4 + callchannel Music_Route3_branch_ec443 + note B_, 1 + intensity $7d + octave 5 + note D_, 5 + intensity $b7 + octave 5 + note D_, 5 + dutycycle $0 + octave 3 + note D_, 1 + note G_, 1 + note B_, 1 + note __, 1 + note G_, 1 + note B_, 1 + octave 4 + note D_, 4 + intensity $8f + dutycycle $2 + octave 4 + note E_, 2 + note D_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 2 + octave 3 + note A_, 8 + note G#, 1 + note A_, 1 + note B_, 2 + note E_, 4 + octave 4 + note E_, 8 + note D_, 1 + note C#, 1 + note D_, 3 + note C#, 3 + octave 3 + note A_, 10 + dutycycle $2 + octave 4 + note F#, 6 + note E_, 1 + note F#, 1 + note G#, 6 + note F#, 1 + note G#, 1 + loopchannel 0, Music_Route3_branch_ec3f5 +; ec443 + +Music_Route3_branch_ec443: ; ec443 + note A_, 6 + note E_, 1 + note A_, 1 + octave 5 + note C#, 7 + intensity $b7 + octave 5 + note C#, 3 + intensity $7d + octave 4 + note E_, 2 + note A_, 2 + octave 5 + note E_, 2 + note D_, 2 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + note G_, 6 + note D_, 1 + endchannel +; ec45b + +Music_Route3_Ch3: ; ec45b + stereopanning $ff + vibrato $6, $3 + notetype $c, $13 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + note E_, 6 + note D_, 1 + octave 3 + note B_, 1 + intensity $14 + octave 3 + note A_, 1 + note __, 1 + octave 2 + note A_, 2 + note __, 2 + note A_, 1 + note A_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note G#, 2 + callchannel Music_Route3_branch_ec4bd +Music_Route3_branch_ec47f: ; 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 + note A_, 2 + octave 3 + note C#, 2 + note E_, 2 + note A_, 6 + note G#, 2 + note F#, 2 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + note G#, 2 + note E_, 1 + note __, 1 + note E_, 2 + note B_, 2 + octave 3 + note E_, 2 + note F_, 6 + note E_, 2 + note D_, 2 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note C#, 2 + note D_, 1 + note __, 1 + note D_, 2 + note __, 2 + note D_, 1 + note D_, 1 + note E_, 1 + note __, 1 + note E_, 2 + note __, 2 + note F#, 1 + note G#, 1 + loopchannel 0, Music_Route3_branch_ec47f +; ec4bd + +Music_Route3_branch_ec4bd: ; ec4bd + octave 3 + note A_, 1 + note __, 1 + octave 2 + note A_, 2 + note __, 2 + note A_, 1 + note A_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note A_, 2 + octave 2 + note G#, 2 + endchannel +; ec4ce + +Music_Route3_branch_ec4ce: ; ec4ce + octave 3 + note G_, 1 + note __, 1 + octave 2 + note A_, 2 + note __, 2 + note A_, 1 + note A_, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note D_, 2 + note G_, 2 + note G_, 1 + note __, 1 + octave 2 + note G_, 2 + note __, 2 + note G_, 1 + note G_, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G#, 2 + note B_, 2 + endchannel +; ec4eb + +Music_Route3_Ch4: ; ec4eb + togglenoise $4 + notetype $c + note __, 10 +Music_Route3_branch_ec4f0: ; ec4f0 + notetype $c + note D_, 2 + 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 +; ec506 + + diff --git a/crysaudio/music/route30.asm b/crysaudio/music/route30.asm new file mode 100644 index 00000000..0ea33abb --- /dev/null +++ b/crysaudio/music/route30.asm @@ -0,0 +1,680 @@ +Music_Route30: ; efc01 + dbw $c0, Music_Route30_Ch1 + dbw $01, Music_Route30_Ch2 + dbw $02, Music_Route30_Ch3 + dbw $03, Music_Route30_Ch4 +; efc0d + +Music_Route30_Ch1: ; efc0d + tempo 144 + volume $77 + dutycycle $3 + tone $0001 + vibrato $10, $15 + stereopanning $f0 + notetype $c, $b2 + octave 3 + 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 + intensity $4e + note C_, 4 +Music_Route30_branch_efc2e: ; efc2e + intensity $b6 + note D_, 6 + intensity $b4 + octave 2 + note B_, 2 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + intensity $b6 + note F_, 6 + intensity $b4 + note C_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note C_, 2 + note D_, 2 + note G_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note B_, 1 + octave 4 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + intensity $b7 + octave 3 + note B_, 12 + intensity $b5 + note F_, 6 + note C_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note C_, 2 + octave 4 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note G_, 2 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + intensity $b6 + note D_, 4 + note G_, 4 + note D_, 4 + intensity $b3 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + octave 2 + note B_, 1 + octave 3 + note C_, 1 + intensity $b6 + octave 2 + note B_, 4 + octave 3 + note D_, 4 + octave 2 + note B_, 4 + intensity $b4 + octave 3 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + intensity $b6 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + note E_, 4 + note D_, 2 + octave 3 + note G_, 4 + note A_, 4 + note B_, 4 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + intensity $b7 + note D_, 14 + intensity $b6 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + note A_, 2 + note G_, 2 + note F_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + note B_, 2 + octave 4 + note C_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note C_, 2 + note D_, 2 + octave 3 + note G_, 2 + octave 4 + note D_, 2 + intensity $b5 + octave 3 + note B_, 2 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 4 + octave 3 + note G_, 2 + note B_, 2 + octave 4 + note D_, 2 + loopchannel 0, Music_Route30_branch_efc2e +; efcda + +Music_Route30_Ch2: ; efcda + dutycycle $3 + vibrato $12, $36 + stereopanning $f + notetype $c, $c2 + octave 3 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 2 + note G_, 2 + note G_, 4 + note G_, 6 + note G_, 1 + note G_, 1 + note G_, 2 + note G_, 2 + intensity $c4 + note D_, 1 + note E_, 1 + note F_, 1 + note F#, 1 +Music_Route30_branch_efcf6: ; efcf6 + intensity $c7 + note G_, 10 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + note G_, 2 + octave 4 + note F_, 10 + note E_, 2 + note D_, 2 + note C_, 2 + note D_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + intensity $b0 + note D_, 4 + intensity $b7 + note D_, 8 + intensity $3f + note D_, 8 + intensity $b7 + note D_, 8 + intensity $c7 + note C_, 10 + note C_, 2 + octave 3 + note A_, 2 + note F_, 2 + octave 4 + note F_, 10 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 6 + note G_, 2 + octave 4 + note D_, 8 + octave 3 + note G_, 6 + note D_, 2 + note B_, 8 + note C_, 2 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + note D_, 2 + note F_, 8 + note A_, 8 + note G_, 2 + intensity $b0 + note D_, 4 + intensity $b7 + note D_, 10 + intensity $c7 + note C_, 4 + octave 3 + note B_, 4 + note A_, 4 + note G_, 4 + note A_, 4 + note B_, 4 + octave 4 + note C_, 4 + note D_, 4 + note F_, 8 + octave 5 + note C_, 8 + octave 4 + note B_, 2 + intensity $b0 + note G_, 6 + intensity $b7 + note G_, 8 + intensity $c7 + note B_, 2 + intensity $b0 + note G_, 4 + intensity $b7 + note G_, 8 + intensity $a7 + octave 3 + note F#, 2 + loopchannel 0, Music_Route30_branch_efcf6 +; efd5f + +Music_Route30_Ch3: ; efd5f + notetype $c, $27 + octave 2 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 +Music_Route30_branch_efd79: ; efd79 + note G_, 1 + note __, 1 + note B_, 2 + note __, 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note D_, 2 + note A_, 2 + octave 2 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note E_, 2 + note D_, 2 + octave 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note A_, 2 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 3 + note C_, 2 + note F_, 2 + octave 2 + note F_, 1 + note F_, 1 + note F_, 1 + note __, 1 + octave 3 + note E_, 2 + octave 2 + note F_, 2 + note F#, 2 + note G_, 1 + note __, 1 + note B_, 2 + octave 3 + note G_, 2 + octave 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note B_, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 4 + note D_, 2 + octave 3 + note B_, 2 + octave 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + octave 3 + note G_, 2 + octave 2 + note G_, 2 + note G#, 2 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A_, 1 + note A_, 1 + note A_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note F_, 2 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + note __, 1 + note A_, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note E_, 2 + note D_, 2 + octave 2 + note B_, 1 + note B_, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 2 + note A_, 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note B_, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 2 + octave 2 + note B_, 2 + note A_, 1 + note A_, 1 + note A_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note F_, 2 + note E_, 2 + note C_, 1 + note C_, 1 + note C_, 1 + note __, 1 + note A_, 2 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note C_, 2 + note D_, 2 + octave 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 3 + note E_, 2 + note D_, 2 + octave 2 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 1 + octave 3 + note D_, 2 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + loopchannel 0, Music_Route30_branch_efd79 +; efe7a + +Music_Route30_Ch4: ; efe7a + togglenoise $3 + notetype $c + callchannel Music_Route30_branch_efeb8 + callchannel Music_Route30_branch_efec1 +Music_Route30_branch_efe84: ; efe84 + callchannel Music_Route30_branch_efecd + callchannel Music_Route30_branch_efed7 + 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 +; efeb8 + +Music_Route30_branch_efeb8: ; 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 +; efec1 + +Music_Route30_branch_efec1: ; 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 +; efecd + +Music_Route30_branch_efecd: ; 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 +; efed7 + +Music_Route30_branch_efed7: ; 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 +; efee1 + +Music_Route30_branch_efee1: ; 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 +; efef5 + diff --git a/crysaudio/music/route36.asm b/crysaudio/music/route36.asm new file mode 100644 index 00000000..cd605db5 --- /dev/null +++ b/crysaudio/music/route36.asm @@ -0,0 +1,530 @@ +Music_Route36: ; e94e9 + dbw $c0, Music_Route36_Ch1 + dbw $01, Music_Route36_Ch2 + dbw $02, Music_Route36_Ch3 + dbw $03, Music_Route36_Ch4 +; e94f5 + +Music_Route36_Ch1: ; e94f5 + tempo 144 + volume $77 + dutycycle $3 + tone $0001 + vibrato $10, $15 + stereopanning $f + notetype $c, $b3 + octave 3 + note C_, 4 + note C_, 6 + note F_, 1 + note E_, 1 + intensity $b5 + note F_, 8 + intensity $b3 + note F_, 6 + note A#, 1 + note A_, 1 + intensity $5d + note A#, 4 +Music_Route36_branch_e9517: ; e9517 + intensity $b5 + note F_, 4 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + note D#, 2 + note A#, 4 + note A_, 4 + note G_, 2 + note A#, 4 + note F_, 4 + note A_, 2 + note G_, 2 + note F_, 2 + note E_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note A#, 4 + note A_, 4 + octave 4 + note D#, 4 + octave 3 + note A#, 2 + intensity $b6 + octave 4 + note F_, 10 + intensity $b5 + note C_, 2 + note F_, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note D#, 4 + note D_, 4 + note C_, 2 + octave 3 + note A#, 4 + intensity $b4 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note F#, 2 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note F#, 2 + note A_, 2 + octave 4 + note D_, 2 + intensity $a4 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 2 + stereopanning $f0 + intensity $95 + octave 3 + note D_, 6 + octave 2 + note A_, 6 + octave 3 + note D_, 4 + octave 2 + note A_, 6 + octave 3 + note D_, 6 + note E_, 4 + intensity $b5 + note D_, 6 + note A_, 6 + note G_, 4 + intensity $a5 + octave 2 + note A_, 6 + octave 3 + note F#, 6 + note E_, 4 + note D_, 6 + octave 2 + note A_, 6 + octave 3 + note D_, 4 + intensity $b5 + note F#, 6 + note E_, 6 + note C#, 4 + note D_, 6 + note A_, 6 + note G_, 4 + octave 2 + note A_, 6 + octave 3 + note F#, 6 + note D_, 4 + note C_, 6 + note G_, 6 + note C_, 2 + note E_, 2 + intensity $b7 + note C_, 6 + note G_, 4 + note D_, 2 + note E_, 2 + note G_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + octave 4 + note D_, 6 + note C_, 2 + octave 3 + note B_, 2 + note A_, 6 + note D_, 6 + stereopanning $f + intensity $b5 + note D#, 2 + note E_, 2 + loopchannel 0, Music_Route36_branch_e9517 +; e95af + +Music_Route36_Ch2: ; e95af + dutycycle $3 + vibrato $10, $36 + stereopanning $f0 + notetype $c, $c2 + octave 3 + note F_, 2 + note C_, 1 + note F_, 1 + intensity $c7 + note A_, 8 + note C_, 4 + intensity $c3 + octave 4 + note C_, 2 + octave 3 + note A_, 1 + octave 4 + note C_, 1 + intensity $c7 + note F_, 8 + octave 3 + note G_, 4 +Music_Route36_branch_e95ce: ; e95ce + intensity $c7 + octave 4 + note C_, 10 + intensity $c4 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + note A_, 2 + note G_, 3 + intensity $c2 + note D#, 1 + intensity $c7 + note D#, 12 + note C_, 10 + intensity $c4 + octave 3 + note A_, 2 + octave 4 + note C_, 2 + note F_, 2 + intensity $c2 + note D#, 2 + note D#, 1 + note F_, 1 + intensity $c7 + note G_, 12 + note A_, 10 + intensity $c4 + note F_, 2 + note A_, 2 + octave 5 + note C_, 2 + octave 4 + note A#, 3 + note A_, 1 + intensity $c7 + note G_, 8 + note A#, 4 + intensity $b0 + note A_, 16 + intensity $b7 + note A_, 16 + stereopanning $f + intensity $a4 + octave 3 + note A_, 6 + note G_, 6 + note F#, 4 + note E_, 6 + note F#, 6 + note G_, 4 + intensity $b3 + note A_, 2 + note F#, 1 + note A_, 1 + intensity $b7 + octave 4 + note D_, 12 + intensity $a4 + octave 3 + note F#, 2 + note D_, 1 + note F#, 1 + intensity $a7 + note A_, 12 + intensity $c7 + note A_, 6 + note G_, 6 + note F#, 4 + note B_, 6 + note A_, 6 + note G_, 4 + intensity $c3 + note A_, 2 + note F#, 1 + note A_, 1 + intensity $c7 + octave 4 + note D_, 12 + intensity $c3 + octave 3 + note F#, 2 + note D_, 1 + note F#, 1 + intensity $c7 + note A_, 12 + intensity $c2 + note G_, 2 + note E_, 1 + note G_, 1 + intensity $b0 + octave 4 + note C_, 2 + intensity $b7 + note C_, 10 + intensity $c5 + octave 3 + note G_, 2 + note E_, 1 + note G_, 1 + intensity $c7 + octave 4 + note C_, 8 + note C#, 4 + stereopanning $ff + note D_, 6 + note A_, 6 + note G_, 2 + note F#, 2 + intensity $b0 + note D_, 4 + intensity $b7 + note D_, 8 + stereopanning $f0 + intensity $c4 + octave 3 + note F#, 1 + note G_, 1 + note A_, 1 + note B_, 1 + loopchannel 0, Music_Route36_branch_e95ce +; e966b + +Music_Route36_Ch3: ; e966b + notetype $c, $25 + octave 3 + note F_, 1 + note __, 3 + note F_, 1 + note __, 1 + octave 4 + note C_, 4 + octave 3 + note C_, 2 + note F_, 2 + note C_, 2 + note D#, 1 + note __, 3 + note D#, 1 + note __, 1 + octave 4 + note F_, 4 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + note E_, 2 +Music_Route36_branch_e9684: ; e9684 + note F_, 4 + note C_, 2 + note F_, 4 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 4 + note D#, 2 + note G_, 4 + note D#, 2 + note G_, 2 + note D#, 2 + note F_, 4 + note C_, 2 + note F_, 4 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 4 + note D#, 2 + note G_, 4 + note D#, 2 + note G_, 2 + note D#, 2 + note A_, 4 + note F_, 2 + note A_, 4 + note F_, 2 + note A_, 2 + note F_, 2 + note A#, 4 + note G_, 2 + note A#, 4 + note G_, 2 + note A#, 2 + note G_, 2 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 2 + note D_, 2 + note D_, 4 + octave 2 + note A_, 2 + octave 3 + note D_, 4 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 2 + note D_, 2 + note G_, 4 + note E_, 2 + note G_, 4 + note E_, 2 + note G_, 2 + note E_, 2 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note E_, 2 + note A_, 2 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 2 + note D_, 2 + note G_, 4 + note E_, 2 + note G_, 4 + note E_, 2 + note G_, 2 + note E_, 2 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 2 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 4 + note D_, 2 + note F#, 2 + note D_, 2 + note G_, 4 + note C_, 2 + note G_, 4 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 4 + note C_, 2 + note G_, 4 + note C_, 2 + note E_, 2 + note G_, 2 + note A_, 6 + octave 4 + note F#, 4 + octave 3 + note D_, 2 + note A_, 2 + octave 4 + note D_, 2 + note C_, 3 + note E_, 1 + note F#, 6 + octave 3 + note D_, 2 + note D#, 2 + note E_, 2 + loopchannel 0, Music_Route36_branch_e9684 +; e9709 + +Music_Route36_Ch4: ; e9709 + togglenoise $1 + notetype $c + callchannel Music_Route36_branch_e9734 + callchannel Music_Route36_branch_e9741 +Music_Route36_branch_e9713: ; e9713 + callchannel Music_Route36_branch_e9734 + callchannel Music_Route36_branch_e973b + callchannel Music_Route36_branch_e9734 + callchannel Music_Route36_branch_e9741 + loopchannel 2, Music_Route36_branch_e9713 +Music_Route36_branch_e9723: ; e9723 + note A#, 4 + note A_, 2 + 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 +; e9734 + +Music_Route36_branch_e9734: ; e9734 + note A_, 4 + note A_, 6 + note A#, 1 + note A#, 1 + note A_, 2 + note A#, 2 + endchannel +; e973b + +Music_Route36_branch_e973b: ; e973b + note A_, 4 + note A_, 6 + note B_, 1 + note A#, 1 + note A_, 4 + endchannel +; e9741 + +Music_Route36_branch_e9741: ; 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 +; e974f + + diff --git a/crysaudio/music/route37.asm b/crysaudio/music/route37.asm new file mode 100644 index 00000000..a8d40ccf --- /dev/null +++ b/crysaudio/music/route37.asm @@ -0,0 +1,440 @@ +Music_Route37: ; ee94b + dbw $c0, Music_Route37_Ch1 + dbw $01, Music_Route37_Ch2 + dbw $02, Music_Route37_Ch3 + dbw $03, Music_Route37_Ch4 +; ee957 + +Music_Route37_Ch1: ; ee957 + tempo 144 + volume $77 + dutycycle $3 + tone $0002 + vibrato $10, $22 + notetype $c, $b3 + note __, 16 + note __, 16 +Music_Route37_branch_ee969: ; ee969 + intensity $b3 + note __, 2 + octave 2 + note F#, 2 + note B_, 2 + octave 3 + note E_, 2 + intensity $b7 + note D#, 10 + intensity $b3 + note E_, 4 + note D#, 4 + note C#, 4 + octave 2 + note B_, 2 + octave 3 + note D#, 3 + octave 2 + note B_, 1 + intensity $b7 + note F#, 8 + note B_, 8 + octave 3 + note B_, 12 + intensity $b3 + note __, 2 + octave 2 + note F#, 2 + note B_, 2 + octave 3 + note E_, 2 + intensity $b7 + note D#, 10 + octave 2 + note A_, 4 + octave 3 + note C#, 4 + note E_, 4 + note A_, 2 + note F#, 3 + note A_, 1 + note B_, 6 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + note F#, 2 + note B_, 2 + note A_, 4 + note F#, 4 + note E_, 2 + note D#, 4 + stereopanning $f +Music_Route37_branch_ee9a5: ; ee9a5 + callchannel Music_Route37_branch_ee9da + octave 3 + note C#, 4 + loopchannel 2, Music_Route37_branch_ee9a5 + callchannel Music_Route37_branch_ee9e9 + octave 3 + note F#, 4 + callchannel Music_Route37_branch_ee9e9 + octave 3 + note F#, 4 + callchannel Music_Route37_branch_ee9da + octave 3 + note E_, 4 + callchannel Music_Route37_branch_ee9da + octave 3 + note G#, 4 + callchannel Music_Route37_branch_ee9e9 + octave 4 + note D#, 4 + callchannel Music_Route37_branch_ee9e9 + 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 +; ee9da + +Music_Route37_branch_ee9da: ; ee9da + intensity $c2 + octave 2 + note A_, 2 + note A_, 1 + note A_, 1 + note A_, 2 + note A_, 1 + note A_, 1 + note A_, 1 + note A_, 1 + note A_, 2 + intensity $b7 + endchannel +; ee9e9 + +Music_Route37_branch_ee9e9: ; ee9e9 + intensity $c2 + octave 2 + note B_, 2 + note B_, 1 + note B_, 1 + note B_, 2 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 2 + intensity $b7 + endchannel +; ee9f8 + +Music_Route37_Ch2: ; ee9f8 + dutycycle $3 + vibrato $1c, $12 + notetype $c, $c2 + octave 2 + note B_, 2 + notetype $c, $c1 + note B_, 1 + note B_, 1 + intensity $c2 + note B_, 2 + intensity $c1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + intensity $c2 + note B_, 6 + note B_, 2 + intensity $c1 + note B_, 1 + note B_, 1 + intensity $c2 + note B_, 2 + intensity $c1 + note B_, 1 + note B_, 1 + note B_, 1 + note B_, 1 + intensity $c2 + note B_, 2 +Music_Route37_branch_eea24: ; eea24 + callchannel Music_Route37_branch_eeab7 + intensity $c6 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + note A_, 4 + note E_, 4 + intensity $b0 + note F#, 8 + intensity $b7 + note F#, 8 + intensity $c7 + note D#, 12 + callchannel Music_Route37_branch_eeab7 + intensity $c7 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + octave 4 + note C#, 4 + note E_, 4 + intensity $b0 + note D#, 16 + intensity $b0 + note D#, 8 + intensity $b7 + note D#, 8 + intensity $c4 + note __, 4 + octave 3 + note A_, 3 + octave 4 + note E_, 1 + note A_, 4 + note G#, 4 + intensity $a0 + note C#, 6 + note D#, 6 + note E_, 4 + intensity $c3 + note F#, 3 + note E_, 1 + intensity $b0 + note D#, 6 + intensity $b7 + note D#, 6 + intensity $c3 + octave 3 + note B_, 3 + note F#, 1 + intensity $b0 + octave 4 + note D#, 6 + intensity $b7 + octave 4 + note D#, 6 + intensity $c4 + note __, 4 + octave 3 + note A_, 3 + octave 4 + note E_, 1 + note A_, 4 + note G#, 4 + intensity $b0 + note C#, 6 + note D#, 6 + note E_, 4 + intensity $c3 + note F#, 3 + note D#, 1 + intensity $b0 + note B_, 6 + intensity $b7 + note B_, 6 + intensity $c3 + note B_, 3 + note F#, 1 + intensity $b0 + octave 5 + note D#, 6 + intensity $b7 + octave 5 + note D#, 6 + intensity $c2 + octave 3 + note F#, 2 + note F#, 1 + note F#, 1 + note F#, 2 + intensity $c1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + intensity $c2 + note F#, 6 + note F#, 2 + note F#, 1 + note F#, 1 + note F#, 2 + intensity $c1 + note F#, 1 + note F#, 1 + note F#, 1 + note F#, 1 + intensity $c2 + note F#, 2 + loopchannel 0, Music_Route37_branch_eea24 +; eeab7 + +Music_Route37_branch_eeab7: ; eeab7 + intensity $c7 + octave 3 + note F#, 4 + intensity $b0 + note B_, 5 + intensity $b7 + note B_, 5 + intensity $c3 + note F#, 2 + note F#, 2 + note B_, 2 + endchannel +; eeac7 + +Music_Route37_Ch3: ; eeac7 + stereopanning $f0 + notetype $c, $14 +Music_Route37_branch_eeacc: ; eeacc + octave 2 + note F#, 2 + note __, 6 + loopchannel 4, Music_Route37_branch_eeacc +Music_Route37_branch_eead3: ; eead3 + callchannel Music_Route37_branch_eeb32 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note B_, 2 + note F#, 2 + note A_, 2 + note F#, 2 + note E_, 2 +Music_Route37_branch_eeae0: ; eeae0 + note D#, 2 + note F#, 2 + loopchannel 4, Music_Route37_branch_eeae0 + callchannel Music_Route37_branch_eeb32 + callchannel Music_Route37_branch_eeb32 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note G#, 2 + note B_, 2 + note F#, 2 + note A_, 2 + octave 3 + note C#, 2 + octave 2 + note A_, 2 + callchannel Music_Route37_branch_eeb32 +Music_Route37_branch_eeafb: ; eeafb + octave 2 + note B_, 2 + octave 3 + note D#, 2 + loopchannel 4, Music_Route37_branch_eeafb +Music_Route37_branch_eeb03: ; eeb03 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + loopchannel 7, Music_Route37_branch_eeb03 + note E_, 2 + note C#, 2 + callchannel Music_Route37_branch_eeb3c +Music_Route37_branch_eeb10: ; eeb10 + octave 2 + note B_, 2 + octave 3 + note F#, 2 + loopchannel 4, Music_Route37_branch_eeb10 +Music_Route37_branch_eeb18: ; eeb18 + octave 2 + note A_, 2 + octave 3 + note C#, 2 + loopchannel 7, Music_Route37_branch_eeb18 + note E_, 2 + note C#, 2 + callchannel Music_Route37_branch_eeb3c + callchannel Music_Route37_branch_eeb32 +Music_Route37_branch_eeb28: ; eeb28 + note F#, 2 + note __, 6 + loopchannel 4, Music_Route37_branch_eeb28 + loopchannel 0, Music_Route37_branch_eead3 +; eeb32 + +Music_Route37_branch_eeb32: ; eeb32 + octave 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + note F#, 2 + note B_, 2 + endchannel +; eeb3c + +Music_Route37_branch_eeb3c: ; eeb3c + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + octave 2 + note B_, 2 + octave 3 + note D#, 2 + endchannel +; eeb4d + +Music_Route37_Ch4: ; eeb4d + stereopanning $f + togglenoise $0 +Music_Route37_branch_eeb51: ; eeb51 + notetype $c + callchannel Music_Route37_branch_eeb6b + 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 +; eeb6b + +Music_Route37_branch_eeb6b: ; 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 +; eeb75 + + diff --git a/crysaudio/music/ruinsofalphinterior.asm b/crysaudio/music/ruinsofalphinterior.asm new file mode 100644 index 00000000..61521126 --- /dev/null +++ b/crysaudio/music/ruinsofalphinterior.asm @@ -0,0 +1,52 @@ +Music_RuinsOfAlphInterior: ; ebd9e + dbw $80, Music_RuinsOfAlphInterior_Ch1 + dbw $01, Music_RuinsOfAlphInterior_Ch2 + dbw $02, Music_RuinsOfAlphInterior_Ch3 +; ebda7 + +Music_RuinsOfAlphInterior_Ch1: ; ebda7 + tempo 224 + volume $77 + dutycycle $0 + stereopanning $f0 + notetype $c, $44 + note __, 1 + loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 +; ebdb8 + +Music_RuinsOfAlphInterior_Ch2: ; ebdb8 + tone $0002 + dutycycle $0 + stereopanning $f + notetype $c, $a4 +Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + octave 4 + note C#, 2 + note D#, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 +; ebdd4 + +Music_RuinsOfAlphInterior_Ch3: ; ebdd4 + notetype $c, $10 +Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + note E_, 2 + note __, 10 + loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7 +; ebde1 + + diff --git a/crysaudio/music/ruinsofalphradio.asm b/crysaudio/music/ruinsofalphradio.asm new file mode 100644 index 00000000..a9676b60 --- /dev/null +++ b/crysaudio/music/ruinsofalphradio.asm @@ -0,0 +1,81 @@ +Music_RuinsOfAlphRadio: ; eedcb + dbw $80, Music_RuinsOfAlphRadio_Ch1 + dbw $01, Music_RuinsOfAlphRadio_Ch2 + dbw $02, Music_RuinsOfAlphRadio_Ch3 +; eedd4 + +Music_RuinsOfAlphRadio_Ch1: ; eedd4 + tempo 160 + volume $77 + dutycycle $0 + tone $0118 + vibrato $0, $f0 + stereopanning $f0 +Music_RuinsOfAlphRadio_branch_eede3: ; 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 +; eee01 + +Music_RuinsOfAlphRadio_branch_eee01: ; eee01 + octave 4 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note C_, 8 + endchannel +; eee08 + +Music_RuinsOfAlphRadio_branch_eee08: ; eee08 + octave 4 + note G_, 1 + note F#, 1 + note G_, 1 + note F#, 1 + note C_, 4 + note G_, 1 + octave 5 + note C_, 8 + endchannel +; eee12 + +Music_RuinsOfAlphRadio_Ch2: ; eee12 + dutycycle $1 + vibrato $1, $e0 +Music_RuinsOfAlphRadio_branch_eee17: ; eee17 + stereopanning $f + notetype $6, $81 + 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 +; eee32 + +Music_RuinsOfAlphRadio_Ch3: ; eee32 + notetype $6, $26 +Music_RuinsOfAlphRadio_branch_eee35: ; eee35 + octave 2 + note C_, 1 + note C#, 1 + note C_, 1 + note __, 16 + loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35 +; eee3e + + diff --git a/crysaudio/music/showmearound.asm b/crysaudio/music/showmearound.asm new file mode 100644 index 00000000..a0fc13fb --- /dev/null +++ b/crysaudio/music/showmearound.asm @@ -0,0 +1,364 @@ +Music_ShowMeAround: ; edbd8 + dbw $c0, Music_ShowMeAround_Ch1 + dbw $01, Music_ShowMeAround_Ch2 + dbw $02, Music_ShowMeAround_Ch3 + dbw $03, Music_ShowMeAround_Ch4 +; edbe4 + +Music_ShowMeAround_Ch1: ; edbe4 + tempo 144 + volume $77 + stereopanning $f + dutycycle $2 + notetype $c, $b1 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note G#, 2 + note F#, 2 + note E_, 2 + note D_, 2 + octave 3 + note B_, 4 + note G#, 1 + note B_, 1 + octave 4 + note D_, 1 + note E_, 1 + note G#, 8 +Music_ShowMeAround_branch_edc01: ; 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 +; edc15 + +Music_ShowMeAround_branch_edc15: ; edc15 + note __, 4 + octave 3 + note C#, 1 + note __, 5 + note D_, 4 + note C_, 1 + note __, 1 + note __, 4 + octave 2 + note E_, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 4 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 3 + endchannel +; edc2a + +Music_ShowMeAround_Ch2: ; edc2a + stereopanning $ff + dutycycle $2 + notetype $c, $b1 + octave 5 + note E_, 2 + note D_, 2 + note C#, 2 + note D_, 2 + note C#, 2 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note E_, 4 + note E_, 1 + note G#, 1 + note B_, 1 + octave 5 + note D_, 1 + note E_, 8 + dutycycle $1 +Music_ShowMeAround_branch_edc44: ; edc44 + callchannel Music_ShowMeAround_branch_edc98 + callchannel Music_ShowMeAround_branch_edc98 + callchannel Music_ShowMeAround_branch_edc86 + note A_, 4 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note C#, 2 + octave 3 + note B_, 4 + callchannel Music_ShowMeAround_branch_edc86 + note A_, 2 + note A_, 2 + note G#, 2 + note E_, 2 + note F#, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A_, 4 + callchannel Music_ShowMeAround_branch_edc8e + note A_, 4 + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note A_, 4 + note G#, 1 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note __, 1 + note D#, 1 + note E_, 1 + callchannel Music_ShowMeAround_branch_edc8e + note A_, 2 + octave 5 + note E_, 2 + note D_, 2 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note A_, 2 + note A_, 4 + loopchannel 0, Music_ShowMeAround_branch_edc44 +; edc86 + +Music_ShowMeAround_branch_edc86: ; edc86 + octave 3 + note A_, 2 + octave 4 + note C#, 2 + note E_, 4 + note D_, 2 + note F#, 2 + endchannel +; edc8e + +Music_ShowMeAround_branch_edc8e: ; edc8e + octave 5 + note C#, 2 + octave 4 + note A_, 2 + note A_, 4 + octave 5 + note F#, 2 + octave 4 + note A_, 2 + endchannel +; edc98 + +Music_ShowMeAround_branch_edc98: ; edc98 + note __, 4 + octave 3 + note C#, 1 + note __, 5 + note D_, 4 + note C_, 1 + note __, 1 + note __, 2 + note C#, 1 + note __, 5 + octave 2 + note E_, 1 + note __, 3 + note A#, 2 + note B_, 1 + note __, 1 + endchannel +; edca9 + +Music_ShowMeAround_Ch3: ; edca9 + stereopanning $f0 + vibrato $10, $22 + notetype $6, $25 + octave 2 + note B_, 1 + note __, 3 + octave 3 + note D_, 1 + note __, 3 + note E_, 1 + note __, 3 + note G#, 1 + note __, 3 + note B_, 1 + note __, 3 + octave 4 + note D_, 1 + note __, 3 + note E_, 1 + note __, 3 + note G#, 1 + note __, 3 + note D_, 2 + note __, 6 + note D_, 2 + octave 3 + note B_, 2 + note G#, 2 + note B_, 2 + note E_, 2 + note __, 6 + intensity $14 + octave 2 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + note F_, 1 + note E_, 2 + intensity $14 +Music_ShowMeAround_branch_edcd9: ; 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 +; edcef + +Music_ShowMeAround_branch_edcef: ; edcef + octave 2 + note A_, 2 + note __, 6 + octave 4 + note E_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note F#, 8 + note D#, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note E_, 2 + note __, 6 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 6 + note C#, 4 + note D_, 2 + note __, 2 + endchannel +; edd0f + +Music_ShowMeAround_branch_edd0f: ; edd0f + octave 2 + note A_, 2 + note __, 6 + octave 4 + note E_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note F#, 8 + note D#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 6 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note B_, 2 + note __, 2 + note C#, 2 + note __, 2 + note E_, 2 + note __, 2 + octave 2 + note A_, 2 + note __, 6 + endchannel +; edd30 + +Music_ShowMeAround_Ch4: ; edd30 + togglenoise $3 + notetype $c + note __, 16 + note __, 8 + note D_, 2 + note D#, 2 + note F#, 4 +Music_ShowMeAround_branch_edd39: ; 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 +; edd4f + +Music_ShowMeAround_branch_edd4f: ; 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 +; edd5e + +Music_ShowMeAround_branch_edd5e: ; 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 +; edd6d + + diff --git a/crysaudio/music/sprouttower.asm b/crysaudio/music/sprouttower.asm new file mode 100644 index 00000000..b587ad04 --- /dev/null +++ b/crysaudio/music/sprouttower.asm @@ -0,0 +1,249 @@ +Music_SproutTower: ; f6974 + dbw $c0, Music_SproutTower_Ch1 + dbw $01, Music_SproutTower_Ch2 + dbw $02, Music_SproutTower_Ch3 + dbw $03, Music_SproutTower_Ch4 +; f6980 + +Music_SproutTower_Ch1: ; f6980 + tempo 176 + volume $77 + dutycycle $3 + tone $0002 + vibrato $8, $45 + stereopanning $f + notetype $c, $a3 + note __, 16 + note __, 16 +Music_SproutTower_branch_f6994: ; f6994 + note __, 6 + octave 3 + note F_, 2 + note F#, 4 + note F#, 4 + note F_, 4 + note C_, 4 + note C#, 4 + note D#, 4 + note D#, 4 + note D#, 4 + note F#, 4 + note F#, 4 + note F_, 2 + note F#, 2 + note G#, 2 + note F#, 2 + note F_, 4 + note F#, 2 + note D#, 10 + note F#, 2 + note F_, 2 + note D#, 2 + note C#, 2 + intensity $a5 + note C_, 8 + intensity $a3 + note C#, 2 + note C_, 2 + octave 2 + note A#, 2 + octave 3 + note C#, 2 + intensity $a7 + note C_, 16 + intensity $a3 + note F_, 4 + note F_, 4 + note F#, 4 + note F#, 4 + note F_, 4 + note F_, 4 + note D#, 4 + note D#, 4 + loopchannel 0, Music_SproutTower_branch_f6994 +; f69c8 + +Music_SproutTower_Ch2: ; f69c8 + dutycycle $3 + tone $0001 + vibrato $8, $48 + notetype $c, $b2 + octave 3 + note F_, 4 + note F_, 4 + note F#, 4 + note F#, 4 + note F_, 4 + note F_, 4 + note D#, 4 + note D#, 4 +Music_SproutTower_branch_f69dc: ; f69dc + intensity $b5 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + octave 4 + note C#, 4 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note F#, 4 + intensity $b7 + note F_, 8 + intensity $b5 + note F#, 4 + note A#, 4 + octave 4 + note C_, 2 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + note C#, 2 + note D#, 2 + note C#, 2 + note C_, 8 + intensity $b5 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + note F#, 2 + intensity $b7 + note A#, 8 + intensity $b5 + octave 4 + note C_, 2 + octave 3 + note A#, 2 + note F#, 2 + note D#, 2 + intensity $b7 + note F_, 8 + intensity $b3 + note F_, 4 + note F_, 4 + note F#, 4 + note A#, 2 + note F_, 1 + note A#, 1 + intensity $b7 + octave 4 + note C_, 16 + note __, 16 + loopchannel 0, Music_SproutTower_branch_f69dc +; f6a25 + +Music_SproutTower_Ch3: ; f6a25 + vibrato $14, $e8 + notetype $c, $14 + octave 3 + note F_, 2 + note __, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note D#, 2 + note __, 2 + note F#, 2 + note F_, 2 + note __, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note D#, 2 + note __, 2 + note F#, 2 + stereopanning $f0 +Music_SproutTower_branch_f6a3e: ; f6a3e + note __, 4 + note C_, 2 + note F_, 2 + note F#, 2 + note D#, 2 + note __, 2 + note F#, 2 + note F_, 2 + note __, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note D#, 2 + note __, 2 + note F_, 2 + note D#, 2 + note __, 2 + octave 2 + note A#, 2 + octave 3 + note D#, 2 + note F#, 2 + note D#, 2 + note __, 2 + note F#, 2 + note F_, 2 + note __, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note D#, 2 + note __, 2 + note F#, 2 + note F_, 8 + note F#, 4 + note A#, 4 + note D#, 8 + note F_, 4 + note F#, 4 + note F_, 16 + note F_, 2 + note __, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note D#, 2 + note __, 2 + note F_, 2 + note F_, 2 + note __, 2 + note C_, 2 + note F_, 2 + note F#, 2 + note D#, 2 + note __, 2 + note F_, 2 + loopchannel 0, Music_SproutTower_branch_f6a3e +; f6a7a + +Music_SproutTower_Ch4: ; f6a7a + togglenoise $0 + notetype $c + note __, 4 +Music_SproutTower_branch_f6a7f: ; f6a7f + note F#, 4 + stereopanning $f0 + 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 +; f6a99 + + diff --git a/crysaudio/music/ssaqua.asm b/crysaudio/music/ssaqua.asm new file mode 100644 index 00000000..ae10d639 --- /dev/null +++ b/crysaudio/music/ssaqua.asm @@ -0,0 +1,1189 @@ +Music_SSAqua: ; ead99 + dbw $c0, Music_SSAqua_Ch1 + dbw $01, Music_SSAqua_Ch2 + dbw $02, Music_SSAqua_Ch3 + dbw $03, Music_SSAqua_Ch4 +; eada5 + +Music_SSAqua_Ch1: ; eada5 + tempo 117 + volume $77 + stereopanning $f + tone $0001 + vibrato $12, $33 + dutycycle $2 + notetype $6, $97 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 +Music_SSAqua_branch_eadbc: ; eadbc + octave 2 + note G_, 16 + note __, 8 + note G_, 2 + note __, 2 + notetype $c, $97 + note G_, 2 + note G_, 10 + note __, 4 + notetype $6, $97 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 16 + note __, 8 + note G_, 2 + note __, 2 + notetype $c, $97 + note G_, 2 + note G_, 8 + note __, 8 + dutycycle $1 + intensity $61 + callchannel Music_SSAqua_branch_eaff5 + octave 5 + note G_, 1 + octave 4 + note B_, 1 + note A_, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note B_, 1 + note A_, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note B_, 1 + note A_, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + 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 + note D_, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + notetype $c, $97 + note __, 16 + note __, 16 + intensity $95 + note __, 2 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + note __, 1 + note E_, 1 + note C_, 1 + octave 3 + note E_, 1 + note C_, 1 + note E_, 1 + note G_, 1 + octave 4 + note C_, 1 + note E_, 1 + note G_, 1 + octave 5 + note C_, 1 + octave 4 + note E_, 6 + note D_, 2 + note C_, 1 + note D_, 1 + note F#, 1 + note A_, 1 + octave 5 + note C_, 1 + note D_, 1 + octave 4 + note G_, 1 + note F#, 1 + dutycycle $2 + intensity $97 + note G_, 8 + note F#, 8 + note E_, 8 + note D_, 8 + octave 3 + note B_, 8 + note A#, 2 + note __, 2 + note B_, 1 + note __, 1 + octave 4 + note F#, 2 + intensity $75 + octave 5 + note A_, 4 + note F#, 4 + note D_, 4 + octave 4 + note A#, 2 + notetype $6, $97 + note D_, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + intensity $97 + note G_, 16 + note A_, 16 + note B_, 4 + note __, 4 + note B_, 4 + note __, 4 + octave 4 + note E_, 8 + note G_, 8 + note F#, 1 + vibrato $0, $0 + intensity $88 + note G_, 10 + vibrato $2, $23 + intensity $87 + note G_, 9 + vibrato $8, $33 + note C_, 4 + note E_, 4 + note C_, 4 + note D_, 12 + note F#, 12 + note __, 8 + octave 2 + note B_, 2 + octave 3 + note D_, 2 + note F#, 2 + note A_, 2 + note D_, 2 + note F#, 2 + note A_, 2 + octave 4 + note D_, 2 + note F#, 2 + notetype $c, $97 + note __, 7 + note __, 16 + note __, 16 + note G_, 8 + note F#, 1 + note D_, 1 + octave 3 + note A_, 1 + octave 4 + note D_, 1 + octave 3 + note A_, 1 + note F#, 1 + note D_, 1 + octave 2 + note A_, 1 + note B_, 1 + octave 3 + note D_, 1 + note F#, 1 + note A_, 1 + note D_, 1 + note F#, 1 + note A_, 1 + octave 4 + note D_, 1 + note F#, 1 + note __, 7 + note __, 16 + note __, 2 + note E_, 2 + note G_, 1 + note __, 1 + note E_, 1 + notetype $6, $97 + note __, 1 + note C_, 1 + note C#, 4 + octave 3 + note B_, 2 + note __, 2 + note A_, 3 + note __, 1 + note G_, 2 + note __, 2 + note F#, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note A_, 2 + note F#, 2 + note D_, 2 + note A_, 2 + octave 4 + note D_, 2 + octave 3 + note A_, 2 + note F#, 2 + note A_, 2 + octave 4 + note C_, 2 + note D_, 2 + note F#, 2 + note A_, 2 + loopchannel 0, Music_SSAqua_branch_eadbc +; eaeca + +Music_SSAqua_Ch2: ; eaeca + stereopanning $f0 + dutycycle $2 + vibrato $8, $33 + notetype $c, $b7 + note __, 2 +Music_SSAqua_branch_eaed5: ; 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 + note B_, 1 + note __, 1 + note G_, 1 + note __, 3 + octave 3 + note G_, 6 + note G_, 1 + note B_, 1 + octave 4 + note C#, 1 + note E_, 1 + forceoctave $c + callchannel Music_SSAqua_branch_eafe0 + forceoctave $0 + octave 3 + note B_, 1 + note __, 1 + note G_, 1 + note __, 3 + octave 4 + note G_, 6 + note __, 2 + dutycycle $3 + intensity $b7 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + callchannel Music_SSAqua_branch_eaf88 + note G_, 4 + note __, 4 + note G_, 8 + note A_, 8 + note B_, 8 + notetype $c, $b7 + octave 5 + note C_, 10 + note D_, 2 + note C_, 2 + octave 4 + note G_, 2 + note B_, 6 + note A_, 6 + note __, 2 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + callchannel Music_SSAqua_branch_eaf88 + note G_, 4 + note __, 4 + note G_, 8 + note A_, 8 + note B_, 8 + octave 5 + note D#, 1 + vibrato $0, $0 + intensity $98 + note E_, 10 + vibrato $4, $23 + intensity $97 + note E_, 9 + vibrato $8, $23 + note D_, 4 + note C_, 4 + octave 4 + note G_, 4 + note B_, 12 + note A_, 12 + note __, 4 + dutycycle $0 + note B_, 2 + note A_, 2 + callchannel Music_SSAqua_branch_eafd5 + notetype $6, $b7 + note G#, 1 + note A_, 11 + note G_, 2 + note F#, 2 + note G_, 12 + note __, 4 + note __, 4 + note E_, 2 + note __, 2 + note E_, 2 + note __, 2 + note G_, 2 + note __, 2 + note A_, 2 + note __, 2 + note E_, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 2 + note __, 2 + note A_, 16 + note A#, 12 + note B_, 2 + note A_, 2 + callchannel Music_SSAqua_branch_eafd5 + notetype $6, $b7 + note G#, 1 + note A_, 11 + note B_, 4 + note G_, 12 + note __, 4 + note __, 4 + octave 5 + note C_, 4 + note D_, 2 + note __, 2 + note C_, 2 + note __, 1 + octave 4 + note A#, 1 + note B_, 4 + note A_, 2 + note __, 2 + note G_, 4 + note E_, 2 + note __, 2 + note F#, 8 + note G_, 8 + note A_, 8 + note __, 8 + loopchannel 0, Music_SSAqua_branch_eaed5 +; eaf88 + +Music_SSAqua_branch_eaf88: ; eaf88 + note D_, 6 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 2 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 2 + octave 3 + note B_, 1 + octave 4 + note C_, 1 + note D_, 2 + note __, 2 + note G_, 2 + note __, 2 + note A_, 2 + note __, 2 + note A#, 2 + note __, 2 + note B_, 6 + note F#, 6 + note __, 4 + dutycycle $1 + notetype $6, $b7 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 5 + note D_, 1 + note __, 1 + note F#, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 4 + note A#, 1 + note __, 1 + note F#, 1 + note __, 1 + note A#, 1 + note __, 1 + note F#, 1 + note __, 1 + dutycycle $3 + note E_, 2 + note F#, 2 + note G_, 12 + note E_, 2 + note F#, 2 + note G_, 4 + note E_, 2 + note F#, 2 + note G_, 4 + note E_, 2 + note F#, 2 + endchannel +; eafd5 + +Music_SSAqua_branch_eafd5: ; eafd5 + notetype $c, $b7 + note B_, 10 + note F#, 1 + note __, 1 + note B_, 1 + note __, 1 + note F#, 1 + note __, 1 + endchannel +; eafe0 + +Music_SSAqua_branch_eafe0: ; eafe0 + octave 3 + note D_, 10 + note E_, 1 + note __, 3 + note D_, 1 + note __, 1 + note C#, 12 + octave 2 + note A_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note C_, 8 + note __, 2 + octave 2 + note B_, 1 + note __, 3 + note A_, 1 + note __, 1 + endchannel +; eaff5 + +Music_SSAqua_branch_eaff5: ; eaff5 + octave 5 + note G_, 1 + note D_, 1 + octave 4 + note B_, 1 + note G_, 1 + octave 5 + note G_, 1 + note D_, 1 + octave 4 + note B_, 1 + note G_, 1 + octave 5 + note G_, 1 + note D_, 1 + octave 4 + note B_, 1 + note G_, 1 + octave 5 + note G_, 1 + note D_, 1 + octave 4 + note B_, 1 + note G_, 1 + octave 5 + note G_, 1 + note C#, 1 + octave 4 + note A#, 1 + note G_, 1 + octave 5 + note G_, 1 + note C#, 1 + octave 4 + note A#, 1 + note G_, 1 + octave 5 + note G_, 1 + note C#, 1 + octave 4 + note A#, 1 + note G_, 1 + octave 5 + note G_, 1 + note C#, 1 + octave 4 + note A#, 1 + note G_, 1 + octave 5 + note G_, 1 + note C_, 1 + octave 4 + note A_, 1 + note G_, 1 + octave 5 + note G_, 1 + note C_, 1 + octave 4 + note A_, 1 + note G_, 1 + octave 5 + note G_, 1 + note C_, 1 + octave 4 + note A_, 1 + note G_, 1 + octave 5 + note G_, 1 + note C_, 1 + octave 4 + note A_, 1 + note G_, 1 + endchannel +; eb03e + +Music_SSAqua_branch_eb03e: ; eb03e + octave 5 + note G_, 1 + octave 4 + note B_, 1 + note A_, 1 + note G_, 1 + octave 5 + note G_, 1 + octave 4 + note B_, 1 + note A_, 1 + note G_, 1 + octave 5 + note G_, 1 + note D_, 1 + octave 4 + note B_, 1 + note G_, 1 + note B_, 1 + note G_, 1 + note C#, 1 + octave 3 + note G_, 1 + endchannel +; eb056 + +Music_SSAqua_Ch3: ; eb056 + stereopanning $ff + vibrato $8, $34 + notetype $6, $15 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 +Music_SSAqua_branch_eb063: ; eb063 + note G_, 16 + note __, 8 + note G_, 2 + note __, 2 + notetype $c, $15 + note G_, 2 + note G_, 10 + note __, 4 + notetype $6, $15 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 16 + note __, 8 + note G_, 2 + note __, 2 + notetype $c, $15 + note G_, 2 + note G_, 8 + note B_, 1 + octave 3 + note C#, 1 + note D_, 1 + note G_, 1 + note D_, 1 + note G_, 1 + note B_, 1 + octave 4 + note E_, 1 + callchannel Music_SSAqua_branch_eb14d + callchannel Music_SSAqua_branch_eb14d +Music_SSAqua_branch_eb08d: ; eb08d + note G_, 2 + note __, 2 + octave 3 + note G_, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 3 + note G_, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 3 + note G_, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 3 + note G_, 1 + note __, 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 + octave 3 + note E_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 3 + octave 3 + note D#, 2 + note __, 2 + octave 4 + note D#, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 1 + note __, 3 + octave 3 + note D#, 2 + note __, 2 + octave 4 + note D#, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note C_, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note C_, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note C#, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note C#, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + callchannel Music_SSAqua_branch_eb230 + octave 3 + note E_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 3 + octave 3 + note E_, 2 + note __, 2 + octave 4 + note D#, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note C#, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note C#, 1 + note __, 3 + octave 3 + note C_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note C_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note C#, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note C#, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + loopchannel 0, Music_SSAqua_branch_eb063 +; eb14d + +Music_SSAqua_branch_eb14d: ; eb14d + notetype $6, $15 + octave 2 + note G_, 2 + note __, 6 + note G_, 2 + note __, 6 + note G_, 2 + note __, 2 + octave 3 + note G_, 2 + note __, 2 + octave 2 + note G_, 2 + note __, 4 + note G_, 1 + note __, 1 + note G_, 2 + note __, 6 + note G_, 2 + note __, 2 + octave 3 + note G_, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 3 + note G_, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 4 + note G_, 1 + note __, 1 + endchannel +; eb172 + +Music_SSAqua_branch_eb172: ; eb172 + octave 2 + note G_, 2 + note __, 2 + octave 4 + note D_, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 4 + note D_, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + note G_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 2 + note G_, 2 + note __, 2 + octave 4 + note G_, 4 + note F#, 4 + note E_, 2 + note __, 2 + octave 2 + note B_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 2 + note B_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 2 + note A#, 2 + note __, 2 + octave 3 + note A#, 1 + note __, 3 + octave 2 + note A#, 2 + note __, 2 + octave 3 + note A#, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note A_, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note A_, 1 + note __, 3 + octave 2 + note A#, 2 + note __, 2 + octave 3 + note A#, 1 + note __, 3 + octave 2 + note A#, 2 + note __, 2 + octave 3 + note A#, 1 + note __, 1 + note D#, 1 + note __, 1 + note E_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 3 + octave 3 + note E_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 3 + octave 3 + note D#, 2 + note __, 2 + octave 4 + note D#, 1 + note __, 3 + octave 3 + note D#, 2 + note __, 2 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 1 + note D_, 2 + note __, 2 + octave 4 + note D_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note D_, 1 + note __, 3 + octave 3 + note C#, 2 + note __, 2 + octave 4 + note B_, 4 + note G_, 4 + note E_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note C_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 3 + octave 2 + note A_, 2 + note __, 2 + octave 4 + note E_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note G_, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 3 + note D_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + endchannel +; eb230 + +Music_SSAqua_branch_eb230: ; eb230 + octave 2 + note B_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 2 + note B_, 2 + note __, 2 + octave 4 + note F#, 1 + note __, 3 + octave 2 + note B_, 2 + note __, 2 + octave 4 + note D#, 1 + note __, 3 + octave 2 + note B_, 2 + note __, 2 + octave 4 + note D#, 1 + note __, 3 + endchannel +; eb249 + +Music_SSAqua_Ch4: ; eb249 + togglenoise $3 + notetype $c + note __, 2 +Music_SSAqua_branch_eb24e: ; eb24e + note G#, 1 + note G_, 1 + 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 +; eb2ae + +Music_SSAqua_branch_eb2ae: ; 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 +; eb2bb + +Music_SSAqua_branch_eb2bb: ; 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 +; eb2c7 + +Music_SSAqua_branch_eb2c7: ; 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 +; eb2d3 + + diff --git a/crysaudio/music/successfulcapture.asm b/crysaudio/music/successfulcapture.asm new file mode 100644 index 00000000..aa9ea0b4 --- /dev/null +++ b/crysaudio/music/successfulcapture.asm @@ -0,0 +1,28 @@ +Music_SuccessfulCapture: ; f4602 + dbw $80, Music_SuccessfulCapture_Ch1 + dbw $01, Music_SuccessfulCapture_Ch2 + dbw $02, Music_SuccessfulCapture_Ch3 +; f460b + +Music_SuccessfulCapture_Ch1: ; f460b + ftempo 126 + volume $77 + fdutycycle $3 + tone $0001 + notetype $c, $a1 + jumpchannel Music_SuccessfulCapture_branch_f4536 +; f461b + +Music_SuccessfulCapture_Ch2: ; f461b + vibrato $12, $24 + notetype $c, $c1 + fdutycycle $2 + jumpchannel Music_SuccessfulCapture_branch_f4585 +; f4626 + +Music_SuccessfulCapture_Ch3: ; f4626 + notetype $c, $25 + jumpchannel Music_SuccessfulCapture_branch_f45cf +; f462c + + diff --git a/crysaudio/music/suicunebattle.asm b/crysaudio/music/suicunebattle.asm new file mode 100644 index 00000000..35003a43 --- /dev/null +++ b/crysaudio/music/suicunebattle.asm @@ -0,0 +1,2062 @@ +Music_SuicuneBattle: ; 178b81 + dbw $80, Music_SuicuneBattle_Ch1 + dbw $01, Music_SuicuneBattle_Ch2 + dbw $02, Music_SuicuneBattle_Ch3 +; 178b8a + +Music_SuicuneBattle_Ch1: ; 178b8a + ftempo 101 + volume $77 + dutycycle $3 + tone $0002 + vibrato $12, $15 + notetype $c, $b7 + octave 4 + note A_, 1 + note G#, 1 + note G_, 4 + note E_, 2 + note D#, 1 + note D_, 1 + note C#, 4 + octave 3 + note A#, 2 + note A_, 1 + note G#, 1 + note G_, 4 + note E_, 2 + note D#, 1 + note D_, 1 + note C#, 4 + octave 2 + note A#, 2 + notetype $c, $b2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 2 + notetype $c, $b3 + octave 4 + note F_, 4 + note E_, 2 + notetype $c, $b2 + octave 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 2 + notetype $c, $b3 + octave 4 + note F_, 4 + note E_, 2 + notetype $c, $b2 + octave 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 2 + notetype $c, $b3 + octave 4 + note F_, 4 + note E_, 2 + notetype $c, $b2 + octave 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 4 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 1 + note B_, 1 + octave 3 + note E_, 1 + note G#, 1 +Music_SuicuneBattle_branch_178bfc: ; 178bfc + notetype $c, $b4 + octave 2 + note A_, 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 4 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note A_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note G_, 4 + note D_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note F_, 4 + note E_, 2 + note D_, 2 + note F_, 2 + note G_, 2 + note E_, 2 + octave 2 + note G_, 2 + octave 3 + note E_, 2 + note G_, 2 + note A_, 6 + note G_, 4 + note F_, 4 + note E_, 2 + note D_, 6 + octave 2 + note A_, 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 4 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + note D_, 2 + note A_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note C_, 2 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note G_, 4 + note D_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note F_, 4 + note E_, 2 + note D_, 2 + note F_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note C_, 2 + note A_, 4 + note G_, 2 + note F_, 2 + note A_, 2 + note G_, 2 + note A_, 2 + note C_, 2 + octave 4 + note C_, 4 + octave 3 + note A_, 2 + note G_, 2 + note C_, 2 + notetype $c, $b3 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note __, 2 + note E_, 4 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note C_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note __, 2 + notetype $c, $b6 + octave 3 + note G_, 10 + notetype $c, $b3 + note C_, 2 + octave 2 + note G_, 2 + note __, 2 + notetype $c, $b7 + octave 3 + note G_, 10 + notetype $c, $b3 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + note __, 2 + note E_, 4 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + note B_, 2 + octave 3 + note C_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 2 + note B_, 2 + note A_, 2 + note B_, 2 + octave 3 + note G_, 2 + note C_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note F#, 2 + octave 2 + note B_, 2 + octave 3 + note B_, 2 + note F#, 2 + note E_, 2 + octave 2 + note A_, 2 + octave 3 + note A_, 2 + note E_, 2 + note C_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + notetype $c, $b2 + octave 2 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + note B_, 6 + note B_, 2 + notetype $c, $b4 + octave 3 + note C_, 6 + notetype $c, $b2 + octave 2 + note B_, 2 + note B_, 2 + notetype $c, $b5 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 2 + note B_, 2 + note B_, 2 + notetype $c, $b5 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 2 + note B_, 2 + note B_, 2 + notetype $c, $b5 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 1 + octave 3 + note F#, 1 + note A_, 1 + octave 4 + note C_, 1 + notetype $c, $b2 + octave 3 + note B_, 2 + note B_, 2 + notetype $c, $b5 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 3 + note B_, 2 + note B_, 2 + notetype $c, $b5 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 3 + note B_, 2 + note B_, 2 + notetype $c, $b5 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 3 + note B_, 2 + notetype $c, $b5 + octave 4 + note C_, 6 + notetype $c, $b2 + octave 3 + note B_, 2 + note B_, 2 + notetype $c, $b4 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 3 + note B_, 2 + note B_, 2 + notetype $c, $b4 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 3 + note B_, 2 + note B_, 2 + notetype $c, $b4 + octave 1 + note F#, 4 + notetype $c, $b2 + octave 3 + note B_, 2 + notetype $c, $b5 + octave 4 + note C_, 6 + notetype $c, $b7 + octave 2 + note B_, 8 + note E_, 8 + octave 3 + note C_, 8 + octave 2 + note A_, 8 + note B_, 8 + note E_, 8 + note F_, 10 + note C_, 2 + note D_, 2 + note C_, 2 + notetype $c, $a0 + octave 1 + note F#, 8 + note B_, 8 + note G_, 8 + octave 2 + note C_, 8 + octave 1 + note B_, 8 + note E_, 8 + note F_, 8 + notetype $c, $a7 + note F_, 8 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + notetype $c, $b2 + note __, 4 + octave 3 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 8 + note D_, 8 + note F_, 8 + note F_, 8 + note F_, 8 + note F_, 8 + note F_, 8 + note F_, 8 + note F_, 8 + note F_, 4 + note E_, 8 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + vibrato $8, $24 + dutycycle $2 + notetype $c, $96 + octave 4 + note E_, 6 + note F#, 6 + octave 3 + note A_, 4 + octave 4 + note A_, 16 + vibrato $12, $15 + dutycycle $3 + loopchannel 0, Music_SuicuneBattle_branch_178bfc +; 178dec + +Music_SuicuneBattle_Ch2: ; 178dec + dutycycle $3 + vibrato $14, $34 + tone $0001 + notetype $c, $c3 + octave 5 + note E_, 1 + octave 4 + note E_, 1 + note A_, 2 + octave 5 + note E_, 1 + octave 4 + note E_, 1 + note A_, 2 + octave 5 + note E_, 1 + octave 4 + note E_, 1 + note A_, 2 + octave 5 + note E_, 1 + octave 4 + note E_, 1 + note A_, 2 + octave 5 + note E_, 1 + octave 4 + note E_, 1 + note A_, 2 + octave 5 + note E_, 1 + octave 4 + note E_, 1 + note A_, 2 + octave 5 + note E_, 1 + octave 4 + note E_, 1 + note A_, 2 + octave 5 + note E_, 1 + octave 4 + note E_, 1 + note A_, 6 + notetype $c, $c2 + octave 2 + note E_, 8 + note E_, 8 + note E_, 8 + notetype $c, $c3 + octave 4 + note A#, 4 + notetype $c, $c2 + note A_, 4 + octave 2 + note E_, 8 + note E_, 8 + note E_, 8 + notetype $c, $c3 + octave 4 + note A#, 4 + notetype $c, $c2 + note A_, 4 + octave 4 + note E_, 8 + note E_, 8 + note E_, 8 + notetype $c, $c3 + octave 4 + note A#, 4 + notetype $c, $c2 + note A_, 4 + octave 4 + note E_, 8 + note E_, 8 + note E_, 8 + note E_, 4 +Music_SuicuneBattle_branch_178e4e: ; 178e4e + notetype $c, $c7 + octave 3 + note A_, 8 + note B_, 8 + note D_, 8 + notetype $c, $b0 + octave 4 + note D_, 8 + notetype $c, $b6 + note D_, 8 + vibrato $10, $24 + dutycycle $2 + notetype $c, $a4 + octave 5 + note A_, 6 + note B_, 6 + note D_, 4 + octave 6 + note D_, 8 + vibrato $14, $34 + dutycycle $3 + notetype $c, $c7 + octave 4 + note C_, 8 + note D_, 8 + octave 3 + note G_, 8 + octave 4 + note F_, 8 + notetype $c, $b0 + note E_, 10 + notetype $c, $b7 + note E_, 6 + notetype $c, $a5 + octave 2 + note G_, 4 + note A_, 4 + note G_, 4 + note B_, 4 + notetype $c, $c7 + octave 3 + note A_, 8 + note B_, 8 + note D_, 8 + notetype $c, $c7 + octave 4 + note D_, 8 + notetype $c, $4c + note D_, 4 + notetype $c, $c6 + note D_, 4 + notetype $c, $a4 + vibrato $8, $24 + dutycycle $2 + octave 5 + note A_, 6 + note B_, 6 + note D_, 4 + octave 6 + note D_, 8 + vibrato $14, $34 + notetype $c, $c7 + dutycycle $3 + octave 4 + note C_, 8 + note D_, 8 + octave 3 + note G_, 8 + octave 4 + note F_, 8 + notetype $c, $4c + note E_, 8 + notetype $c, $c7 + note E_, 8 + notetype $c, $c6 + note C_, 8 + note G_, 8 + notetype $c, $c2 + octave 3 + note F#, 2 + note G_, 2 + note __, 2 + note B_, 4 + note A_, 2 + note G_, 2 + note F#, 2 + note F#, 2 + note G_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note C_, 2 + note __, 2 + notetype $c, $c7 + octave 4 + note C_, 10 + notetype $c, $c3 + octave 4 + note G_, 2 + note C_, 2 + note __, 2 + notetype $c, $c7 + octave 5 + note C_, 10 + notetype $c, $c3 + octave 4 + note F#, 2 + note G_, 2 + note __, 2 + note B_, 4 + note A_, 2 + note G_, 2 + note F#, 2 + note F#, 2 + note G_, 2 + note B_, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + notetype $c, $c7 + note G_, 8 + note F#, 8 + note E_, 8 + note G_, 8 + notetype $c, $c2 + octave 3 + note F#, 2 + note F#, 6 + note F#, 2 + note F#, 6 + note F#, 2 + note F#, 6 + note F#, 2 + notetype $c, $b7 + note G_, 6 + notetype $c, $c2 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 3 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 3 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 3 + note F#, 2 + notetype $c, $c7 + note G_, 6 + notetype $c, $c2 + octave 4 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 4 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 4 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 4 + note F#, 2 + notetype $c, $c7 + note G_, 6 + notetype $c, $c2 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 4 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 4 + note F#, 2 + note F#, 2 + notetype $c, $c7 + octave 1 + note B_, 4 + notetype $c, $c2 + octave 4 + note F#, 2 + notetype $c, $c7 + note G_, 6 + notetype $c, $b0 + octave 3 + note F#, 8 + octave 2 + note B_, 8 + octave 3 + note G_, 8 + note E_, 8 + note F#, 8 + octave 2 + note B_, 8 + octave 3 + note C_, 8 + notetype $c, $b7 + octave 3 + note C_, 8 + notetype $c, $c7 + octave 1 + note B_, 8 + octave 2 + note E_, 8 + note C_, 8 + note F_, 8 + note E_, 8 + octave 1 + note B_, 8 + notetype $c, $b0 + octave 2 + note C_, 10 + notetype $c, $b7 + octave 2 + note C_, 6 + notetype $c, $c3 + octave 1 + note B_, 2 + octave 2 + note E_, 2 + octave 1 + note F_, 2 + octave 2 + note F_, 4 + note E_, 2 + octave 1 + note B_, 2 + note F_, 2 + note B_, 2 + octave 2 + note E_, 2 + note F_, 2 + note E_, 2 + octave 1 + note B_, 2 + note F_, 2 + note B_, 2 + octave 2 + note E_, 2 + octave 1 + note B_, 2 + octave 2 + note E_, 2 + octave 1 + note F_, 2 + octave 2 + note F_, 4 + note E_, 2 + octave 1 + note B_, 2 + note F_, 2 + note B_, 2 + octave 2 + note E_, 2 + note F_, 2 + note E_, 2 + octave 1 + note B_, 2 + note F_, 2 + note B_, 2 + octave 2 + note E_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note F_, 2 + octave 3 + note F_, 4 + note E_, 2 + octave 2 + note B_, 2 + note F_, 2 + note B_, 2 + octave 3 + note E_, 2 + note F_, 2 + note E_, 2 + octave 2 + note B_, 2 + note F_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note F_, 2 + octave 3 + note F_, 4 + note E_, 2 + octave 2 + note B_, 2 + note F_, 2 + note B_, 2 + octave 3 + note E_, 2 + note F_, 2 + note E_, 2 + octave 2 + note B_, 2 + note F_, 2 + note B_, 2 + octave 3 + note E_, 2 + note D_, 2 + note G_, 2 + octave 2 + note G#, 2 + octave 3 + note G#, 4 + note G_, 2 + note D_, 2 + octave 2 + note G#, 2 + octave 3 + note D_, 2 + note G_, 2 + note G#, 2 + note G_, 2 + note D_, 2 + octave 2 + note G#, 2 + octave 3 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 2 + note G#, 2 + octave 3 + note G#, 4 + note G_, 2 + note D_, 2 + octave 2 + note G#, 2 + octave 3 + note D_, 2 + note G_, 2 + note G#, 2 + note G_, 2 + note D_, 2 + octave 2 + note G#, 2 + octave 3 + note D_, 2 + note G_, 2 + note B_, 2 + octave 4 + note E_, 2 + octave 3 + note F_, 2 + octave 4 + note F_, 4 + note E_, 2 + octave 3 + note B_, 2 + note F_, 2 + note B_, 2 + octave 4 + note E_, 2 + note F_, 2 + note E_, 2 + octave 3 + note B_, 2 + note F_, 2 + note B_, 2 + octave 4 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + octave 3 + note F_, 2 + octave 4 + note F_, 4 + note E_, 2 + octave 3 + note B_, 2 + note F_, 2 + note B_, 2 + octave 4 + note E_, 2 + note F_, 2 + note E_, 2 + octave 3 + note B_, 2 + note F_, 2 + note B_, 2 + octave 4 + note E_, 2 + note D_, 2 + note G_, 2 + octave 3 + note G#, 2 + octave 4 + note G#, 4 + note G_, 2 + note D_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + note G_, 2 + note G#, 2 + note G_, 2 + note D_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note G#, 2 + octave 4 + note G#, 4 + note G_, 2 + note D_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + note G_, 2 + note G#, 2 + note G_, 2 + note D_, 2 + octave 3 + note G#, 2 + octave 4 + note D_, 2 + note G_, 2 + notetype $c, $c2 + note A_, 8 + notetype $c, $c3 + octave 2 + note A_, 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 4 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 4 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + octave 3 + note C_, 2 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note G_, 4 + note D_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note D_, 2 + note C_, 2 + note D_, 2 + octave 2 + note G_, 2 + octave 3 + note G_, 4 + note D_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note D_, 2 + note G_, 2 + note D_, 2 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + note D_, 2 + octave 2 + note A_, 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 4 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + note A_, 2 + note B_, 2 + note E_, 2 + octave 3 + note E_, 4 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note A_, 2 + note E_, 2 + note A_, 2 + note B_, 2 + loopchannel 0, Music_SuicuneBattle_branch_178e4e +; 179122 + +Music_SuicuneBattle_Ch3: ; 179122 + notetype $c, $18 + note __, 16 + note __, 4 + octave 2 + note A_, 4 + note D_, 2 + note E_, 2 + note A#, 2 + note G_, 2 + note D_, 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 4 + note E_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 4 + note E_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note E_, 2 + note A_, 4 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 4 + note E_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note E_, 2 + note A_, 2 + note E_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note E_, 2 + note D_, 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 4 + note E_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note E_, 2 + note A_, 4 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note E_, 2 + notetype $c, $16 +Music_SuicuneBattle_branch_179182: ; 179182 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note A_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + note D_, 2 + note A_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 4 + octave 2 + note G_, 2 + note F_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note A_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + note D_, 2 + note A_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + note C_, 2 + octave 3 + note C_, 4 + octave 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + note B_, 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + note B_, 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 4 + note C_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + note D_, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note D_, 2 + note A_, 2 + note D_, 2 + note A_, 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note G_, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note B_, 2 + octave 2 + note F#, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + note A_, 2 + note E_, 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + note F#, 2 + note F#, 2 + note __, 4 + note F#, 2 + note F#, 2 + note __, 4 + note F#, 2 + note F#, 2 + note __, 4 + note F#, 2 + note G_, 6 + note F#, 2 + note F#, 2 + note __, 4 + note F#, 2 + note F#, 2 + note __, 4 + note F#, 2 + note F#, 2 + note __, 4 + note F#, 2 + note G_, 6 + note B_, 2 + note B_, 2 + octave 1 + note B_, 4 + octave 2 + note B_, 2 + note B_, 2 + octave 1 + note B_, 4 + octave 2 + note B_, 2 + note B_, 2 + octave 1 + note B_, 4 + octave 2 + note B_, 2 + octave 3 + note C_, 6 + note F#, 2 + note F#, 2 + octave 1 + note B_, 4 + octave 3 + note F#, 2 + note F#, 2 + octave 1 + note B_, 4 + octave 3 + note F#, 2 + note F#, 2 + octave 1 + note B_, 4 + octave 3 + note F#, 2 + note G_, 6 + octave 2 + note F#, 8 + octave 1 + note B_, 8 + octave 2 + note G_, 8 + note E_, 8 + note F#, 8 + octave 1 + note B_, 8 + octave 2 + note C_, 10 + note C_, 2 + note D_, 2 + note C_, 2 + octave 1 + note B_, 8 + octave 2 + note E_, 8 + note C_, 8 + note F_, 8 + note E_, 8 + octave 1 + note B_, 8 + octave 2 + note C_, 16 + note __, 4 + octave 1 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + note __, 4 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + note __, 4 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + note __, 4 + note B_, 2 + note __, 6 + note B_, 2 + note __, 2 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + note F_, 2 + note B_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note G#, 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note G#, 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note G#, 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + note D_, 2 + note G#, 2 + note B_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 2 + note F_, 2 + note B_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note B_, 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + note B_, 2 + octave 1 + note B_, 2 + octave 2 + note F_, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + note D_, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note D_, 2 + note G#, 2 + note D_, 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + octave 3 + note D_, 2 + octave 2 + note G#, 2 + note D_, 2 + note G#, 2 + note A_, 4 + note __, 4 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note A_, 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + octave 1 + note A_, 2 + octave 2 + note D_, 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + octave 3 + note C_, 2 + octave 2 + note C_, 2 + note G_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + note A_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note E_, 2 + octave 1 + note A_, 2 + octave 2 + note A_, 4 + note E_, 2 + note D_, 2 + note E_, 2 + loopchannel 0, Music_SuicuneBattle_branch_179182 +; 17948b + + diff --git a/crysaudio/music/surf.asm b/crysaudio/music/surf.asm new file mode 100644 index 00000000..687982c4 --- /dev/null +++ b/crysaudio/music/surf.asm @@ -0,0 +1,738 @@ +Music_Surf: ; f518a + dbw $80, Music_Surf_Ch1 + dbw $01, Music_Surf_Ch2 + dbw $02, Music_Surf_Ch3 +; f5193 + + + + +Music_Surf_Ch1: ; f5194 + tempo 108 + volume $77 + notetype $c, $a7 + stereopanning $f +Music_Surf_branch_f519e: ; f519e + dutycycle $2 + vibrato $10, $24 + intensity $73 + octave 3 + note F_, 1 + note __, 1 + note D#, 1 + note __, 1 + intensity $73 + note F_, 1 + note __, 1 + note D#, 1 + note __, 1 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + intensity $73 + note F_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + note D#, 1 + intensity $93 + note __, 1 + note G#, 1 + note __, 1 + note D#, 1 + note __, 1 + intensity $a7 + note F_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F_, 1 + note __, 1 + note D#, 1 + intensity $b7 + note __, 1 + note A#, 2 + note G#, 2 + note F_, 2 + note D_, 2 + notetype $8, $c7 + octave 2 + note A#, 2 + octave 3 + note D_, 2 + note F_, 2 + intensity $f7 + 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 + octave 4 + note C_, 2 + octave 3 + note G_, 2 + note D#, 2 + note C_, 2 + note D#, 2 + note G_, 2 + octave 4 + note C_, 2 + note D#, 2 + note G_, 2 + dutycycle $1 + notetype $6, $97 + callchannel Music_Surf_branch_f5293 + intensity $a8 + note G#, 6 + note A_, 6 + note A#, 3 + octave 4 + note D_, 3 + intensity $a8 + dutycycle $1 + callchannel Music_Surf_branch_f52d9 + octave 3 + note D#, 8 + note G#, 8 + note D#, 8 + dutycycle $3 + notetype $8, $98 + callchannel Music_Surf_branch_f52d9 + notetype $c, $a7 + octave 3 + note D#, 12 + octave 2 + note F_, 4 + note D#, 4 + note F_, 4 + note G#, 4 + note D#, 2 + note G#, 2 + note B_, 2 + octave 3 + note D#, 2 + loopchannel 0, Music_Surf_branch_f519e +; f5233 + +Music_Surf_branch_f5233: ; f5233 + notetype $c, $a7 + octave 3 + note D#, 4 + note A#, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note D#, 4 + note A#, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note C#, 4 + note A#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note C#, 4 + note A#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note A#, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + octave 3 + note C_, 4 + note G#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note C_, 4 + note G#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note G#, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + notetype $6, $a7 + octave 3 + note A#, 1 + note B_, 15 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note G#, 8 + note F_, 8 + note C#, 4 + note D_, 4 + endchannel +; f5293 + +Music_Surf_branch_f5293: ; f5293 + octave 4 + note G#, 16 + note D#, 4 + note C_, 4 + octave 3 + note G#, 4 + octave 4 + note C_, 4 + note D_, 4 + note D#, 4 + note G_, 4 + note G#, 4 + notetype $8, $92 + note A#, 2 + note F_, 2 + note D_, 2 + note F_, 2 + note D_, 2 + octave 3 + note A#, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + note F_, 2 + note A#, 2 + note F_, 2 + note D_, 2 + octave 2 + note A#, 2 + octave 3 + note D_, 2 + note F_, 2 + note G#, 2 + note A#, 2 + octave 4 + note D_, 2 + notetype $6, $97 + note C#, 1 + note D_, 15 + note G_, 4 + note D_, 4 + octave 3 + note A#, 4 + octave 4 + note D_, 4 + note F_, 4 + note G_, 4 + note A_, 4 + note A#, 4 + notetype $8, $92 + octave 5 + note C_, 2 + octave 4 + note G_, 2 + note D#, 2 + note G_, 2 + note D#, 2 + note C_, 2 + note D#, 2 + note C_, 2 + octave 3 + note G_, 2 + endchannel +; f52d9 + +Music_Surf_branch_f52d9: ; f52d9 + octave 3 + note A#, 3 + note G_, 3 + note A#, 3 + octave 4 + note D#, 9 + notetype $6, $58 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G#, 1 + note G_, 1 + intensity $a8 + note D#, 4 + note D_, 4 + note D#, 4 + note G_, 4 + note A_, 4 + note G#, 4 + note G_, 4 + note F#, 4 + note F_, 4 + note E_, 4 + note G_, 8 + note C#, 8 + note A#, 8 + note A_, 1 + note A#, 3 + note G#, 4 + octave 4 + note C_, 4 + note F_, 12 + intensity $58 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A#, 1 + note A_, 1 + note G_, 1 + intensity $a8 + note G#, 8 + octave 4 + note D#, 4 + octave 3 + note B_, 4 + note G#, 8 + note D#, 8 + octave 2 + note B_, 8 + endchannel +; f5317 + +Music_Surf_Ch2: ; f5317 +Music_Surf_branch_f5317: ; f5317 + notetype $c, $c2 + stereopanning $f0 + dutycycle $2 + vibrato $14, $23 +Music_Surf_branch_f5321: ; f5321 + octave 1 + note A#, 4 + octave 2 + note A#, 1 + note __, 3 + note A#, 1 + note __, 3 + loopchannel 3, Music_Surf_branch_f5321 + octave 1 + note A#, 4 + octave 2 + note F_, 1 + note __, 3 + note A#, 1 + note __, 3 +Music_Surf_branch_f5333: ; f5333 + note D#, 4 + note G_, 2 + note G#, 2 + note A#, 4 + note D#, 4 + note G_, 2 + note G#, 2 + note A#, 4 + note C#, 4 + note G_, 2 + note G#, 2 + note A#, 4 + note C#, 4 + note G_, 2 + note G#, 2 + note A#, 4 + note C_, 4 + note F_, 2 + note G_, 2 + note G#, 4 + note C_, 4 + note F_, 2 + note G_, 2 + note G#, 4 + octave 1 + note B_, 4 + octave 2 + note F_, 2 + note G_, 2 + note G#, 2 + note A#, 2 + note B_, 4 + note A#, 4 + note G#, 4 + loopchannel 2, Music_Surf_branch_f5333 + intensity $c7 + callchannel Music_Surf_branch_f53b2 + note D#, 4 + note D_, 4 + note C#, 4 + callchannel Music_Surf_branch_f53b2 + 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 + octave 3 + note B_, 16 + octave 4 + note C#, 8 + forceoctave $c + 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 + forceoctave $0 + notetype $c, $b8 + octave 4 + note B_, 12 + dutycycle $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 +; f53b2 + +Music_Surf_branch_f53b2: ; f53b2 + octave 1 + note G#, 4 + octave 3 + note F_, 4 + note D#, 4 + octave 1 + note G#, 4 + octave 3 + note D#, 4 + note D_, 4 + octave 1 + note A#, 4 + octave 3 + note C_, 4 + octave 2 + note A#, 4 + octave 1 + note A#, 4 + octave 2 + note G#, 4 + note A#, 4 + octave 1 + note G_, 4 + octave 3 + note D_, 4 + note C_, 4 + octave 1 + note G_, 4 + octave 2 + note A#, 4 + note G_, 4 + note C_, 4 + octave 3 + note F_, 4 + note G_, 4 + endchannel +; f53d6 + +Music_Surf_branch_f53d6: ; f53d6 + octave 4 + note F_, 4 + note D#, 4 + note F_, 4 + note G_, 12 + intensity $58 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + note C_, 1 + octave 3 + note B_, 1 + note A_, 1 + endchannel +; f53e8 + +Music_Surf_branch_f53e8: ; f53e8 + note A#, 7 + octave 4 + note C_, 8 + note C#, 16 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 16 + note G_, 8 + endchannel +; f53f3 + +Music_Surf_branch_f53f3: ; f53f3 + note F#, 1 + note G_, 3 + note F_, 4 + note G_, 4 + note G#, 12 + intensity $58 + note G_, 1 + note F#, 1 + note F_, 1 + note E_, 1 + note D#, 1 + note D_, 1 + note C#, 1 + octave 3 + note B_, 1 + endchannel +; f5404 + +Music_Surf_branch_f5404: ; f5404 + octave 4 + note C_, 8 + note G_, 4 + note G#, 4 + note A#, 8 + note G#, 8 + note D#, 8 + endchannel +; f540c + +Music_Surf_Ch3: ; f540c +Music_Surf_branch_f540c: ; f540c + stereopanning $ff + notetype $c, $15 + vibrato $16, $23 + octave 4 + note A#, 12 + octave 5 + note C_, 12 + note D_, 8 + note D#, 4 + note F_, 4 + note G_, 4 + note G#, 4 + intensity $12 + note A#, 12 + note __, 4 + note G#, 4 + note G_, 4 + notetype $6, $12 + note F#, 1 + note G_, 15 + note G#, 4 + note G_, 4 + note F_, 16 + octave 4 + note A#, 8 + notetype $c, $12 + octave 5 + note G#, 16 + note G_, 4 + note F_, 4 + notetype $6, $12 + note E_, 1 + note F_, 15 + note G_, 4 + note F_, 4 + note D#, 16 + note F_, 8 + notetype $c, $14 + note A#, 12 + note __, 4 + note G#, 4 + note G_, 4 + notetype $6, $14 + note F#, 1 + note G_, 15 + note G#, 4 + note G_, 4 + note F_, 16 + octave 4 + note A#, 8 + notetype $c, $14 + octave 5 + note G#, 16 + note G_, 4 + note F_, 4 + notetype $6, $14 + note E_, 1 + note F_, 15 + note G_, 4 + note F_, 4 + note D#, 16 + octave 6 + note D#, 8 + notetype $c, $13 + note C_, 16 + note D_, 4 + note D#, 4 + notetype $6, $13 + note D_, 1 + note D#, 15 + note D_, 4 + note C_, 4 + octave 5 + note D_, 16 + octave 6 + note D_, 8 + notetype $c, $13 + octave 5 + note A#, 12 + notetype $6, $13 + note A_, 1 + note A#, 7 + octave 6 + note C_, 8 + note D_, 8 + note F_, 16 + note D#, 4 + note D_, 4 + note D#, 16 + note D_, 8 + notetype $c, $14 + note C_, 12 + note C_, 4 + note D_, 4 + note D#, 4 + notetype $6, $14 + note D_, 1 + note D#, 15 + note D_, 4 + note C_, 4 + octave 5 + note D_, 16 + octave 6 + note D_, 8 + notetype $c, $14 + octave 5 + note A#, 12 + notetype $6, $14 + note A_, 1 + note A#, 7 + octave 6 + note C_, 8 + note D_, 8 + notetype $c, $14 + note F_, 12 + note G_, 8 + octave 5 + note A#, 4 + intensity $15 + callchannel Music_Surf_branch_f54c8 + octave 2 + note B_, 4 + octave 3 + note D#, 4 + note F_, 4 + note G#, 4 + note A#, 4 + note B_, 4 + callchannel Music_Surf_branch_f54c8 + octave 2 + note B_, 4 + octave 3 + note D#, 4 + note G#, 4 + note B_, 12 + octave 2 + note B_, 12 + octave 3 + note D#, 8 + octave 2 + note B_, 4 + loopchannel 0, Music_Surf_branch_f540c +; f54c8 + +Music_Surf_branch_f54c8: ; f54c8 + octave 3 + note D#, 4 + note G_, 1 + note __, 3 + note A#, 1 + note __, 3 + note D#, 4 + note G_, 1 + note __, 3 + note A#, 1 + note __, 3 + note C#, 4 + note G_, 1 + note __, 3 + note A#, 1 + note __, 3 + note C#, 4 + note G_, 1 + note __, 3 + note A#, 1 + note __, 3 + note C_, 4 + note F_, 1 + note __, 3 + note G#, 1 + note __, 3 + note C_, 4 + note F_, 1 + note __, 3 + note G#, 1 + note __, 3 + endchannel +; f54e8 + + diff --git a/crysaudio/music/tintower.asm b/crysaudio/music/tintower.asm new file mode 100644 index 00000000..e9dd5c31 --- /dev/null +++ b/crysaudio/music/tintower.asm @@ -0,0 +1,298 @@ +Music_TinTower: ; f6811 + dbw $c0, Music_TinTower_Ch1 + dbw $01, Music_TinTower_Ch2 + dbw $02, Music_TinTower_Ch3 + dbw $03, Music_TinTower_Ch4 +; f681d + +Music_TinTower_Ch1: ; f681d + tempo 208 + volume $77 + dutycycle $3 + tone $0004 + vibrato $8, $45 +Music_TinTower_branch_f682a: ; f682a + stereopanning $f0 + notetype $c, $a5 + octave 3 + note G_, 4 + note C_, 4 + note G#, 8 + note G_, 4 + note C_, 4 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note G_, 4 + note C_, 4 + note G#, 4 + note F_, 4 + note G_, 4 + octave 2 + note G_, 4 + octave 3 + note G_, 6 + note A#, 2 + note G_, 2 + note F_, 2 + note C#, 2 + note G_, 2 + note G#, 8 + note G_, 4 + octave 4 + note C_, 4 + octave 3 + note G#, 2 + note G_, 2 + note F_, 2 + note G#, 2 + note G_, 2 + note C#, 2 + octave 2 + note A#, 2 + octave 3 + note G_, 2 + note G#, 4 + note F_, 4 + note G_, 4 + octave 2 + note G_, 4 + octave 3 + note G_, 8 + intensity $a2 + octave 2 + note G_, 4 + note G_, 12 + note G_, 4 + note G_, 8 + intensity $a7 + note G_, 4 + intensity $a2 + note G#, 4 + note G#, 8 + intensity $a7 + note G_, 4 + intensity $a2 + note G#, 4 + note G#, 8 + intensity $a7 + note A#, 4 + intensity $a2 + note G_, 4 + note G_, 12 + note G_, 4 + note G_, 12 + note G_, 4 + note G_, 12 + note G_, 4 + note G_, 8 + intensity $a5 + octave 3 + note A#, 4 + loopchannel 0, Music_TinTower_branch_f682a +; f688b + +Music_TinTower_Ch2: ; f688b + dutycycle $3 + tone $0002 + vibrato $18, $44 +Music_TinTower_branch_f6893: ; f6893 + stereopanning $ff +Music_TinTower_branch_f6895: ; f6895 + notetype $c, $b5 + octave 4 + note C_, 4 + note C_, 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 4 + note F_, 4 + note C#, 4 + octave 3 + note A#, 4 + octave 4 + note C_, 4 + note C_, 4 + note C#, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note C_, 4 + octave 3 + note C_, 4 + octave 4 + note C_, 8 + stereopanning $f + loopchannel 2, Music_TinTower_branch_f6895 + intensity $b2 + octave 3 + note C_, 4 + note C_, 12 + note C_, 4 + note C_, 8 + intensity $b7 + note C_, 4 + intensity $b2 + note C#, 4 + note C#, 8 + intensity $b7 + note C_, 4 + intensity $b2 + note C#, 4 + note C#, 8 + intensity $b7 + note D#, 4 + intensity $90 + stereopanning $ff + note G_, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + note G#, 2 + note G_, 2 + note G#, 2 + note G_, 4 + note C_, 4 + note G_, 8 + note G_, 4 + octave 4 + note C_, 4 + octave 3 + note A#, 2 + octave 4 + note C_, 2 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 4 + octave 3 + note C_, 4 + octave 4 + note C_, 6 + intensity $95 + note C#, 2 + loopchannel 0, Music_TinTower_branch_f6893 +; f68f8 + +Music_TinTower_Ch3: ; f68f8 + notetype $c, $14 +Music_TinTower_branch_f68fb: ; f68fb + note __, 16 + note __, 16 + note __, 16 + note __, 10 + octave 2 + note G_, 2 + note G#, 2 + note A#, 2 + octave 3 + note C_, 8 + note C#, 8 + note E_, 8 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + note C#, 2 + note D#, 2 + note C_, 8 + note C#, 8 + note E_, 8 + octave 4 + note C_, 8 + octave 3 + note C_, 1 + note __, 3 + note C_, 1 + note __, 11 + note C_, 1 + note __, 3 + note C_, 1 + note __, 7 + note C_, 4 + note C#, 1 + note __, 3 + note C#, 1 + note __, 7 + note C_, 4 + note C#, 1 + note __, 3 + note C#, 1 + note __, 7 + note D#, 4 + stereopanning $f + note C_, 1 + note __, 3 + note C_, 1 + note __, 11 + note C_, 1 + note __, 3 + note C_, 1 + note __, 3 + stereopanning $ff + octave 2 + note A#, 2 + octave 3 + note C_, 2 + note C#, 2 + note D#, 2 + stereopanning $f + note C_, 1 + note __, 3 + note C_, 1 + note __, 11 + note C_, 1 + note __, 3 + note C_, 1 + note __, 11 + stereopanning $ff + loopchannel 0, Music_TinTower_branch_f68fb +; f6948 + +Music_TinTower_Ch4: ; f6948 + togglenoise $0 + notetype $c +Music_TinTower_branch_f694c: ; f694c + stereopanning $f + note G_, 2 + 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 +; f6974 + + diff --git a/crysaudio/music/titlescreen.asm b/crysaudio/music/titlescreen.asm new file mode 100644 index 00000000..87966c58 --- /dev/null +++ b/crysaudio/music/titlescreen.asm @@ -0,0 +1,1181 @@ +Music_TitleScreen: ; eb808 + dbw $c0, Music_TitleScreen_Ch1 + dbw $01, Music_TitleScreen_Ch2 + dbw $02, Music_TitleScreen_Ch3 + dbw $03, Music_TitleScreen_Ch4 +; eb814 + +Music_TitleScreen_Ch1: ; eb814 + ftempo 134 + volume $77 + dutycycle $3 + tone $0002 + vibrato $10, $12 + stereopanning $f0 + notetype $c, $a7 + intensity $a0 + octave 3 + note __, 4 + intensity $a7 + octave 2 + note G_, 1 + note __, 2 + note A_, 1 + note B_, 8 + note G_, 4 + octave 3 + note C_, 1 + note __, 2 + note D_, 1 + note E_, 8 + note C_, 4 + octave 2 + note B_, 1 + note __, 2 + octave 3 + note C_, 1 + octave 2 + note B_, 8 + note A_, 4 + note A_, 1 + note __, 2 + note B_, 1 + octave 3 + note C_, 6 + note E_, 4 + note F#, 2 + stereopanning $ff + octave 4 + note G_, 1 + stereopanning $f0 + octave 3 + note D_, 5 + octave 2 + note B_, 2 + octave 3 + note D_, 4 + octave 2 + note B_, 4 + octave 3 + note C_, 6 + note F_, 6 + note C_, 4 + note D_, 6 + intensity $b7 + note D#, 1 + note E_, 1 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + notetype $8, $a7 + note C_, 4 + octave 2 + note B_, 4 + octave 3 + note C_, 4 + note D_, 9 + octave 2 + note B_, 3 + octave 3 + note D_, 6 + octave 2 + note B_, 6 + octave 3 + note C_, 3 + note D_, 6 + note E_, 3 + note E_, 4 + note E_, 4 + note C_, 4 + notetype $8, $a0 + octave 2 + note B_, 6 + notetype $8, $a7 + note B_, 6 + notetype $8, $a7 + octave 3 + note F_, 4 + note E_, 4 + note C_, 4 + notetype $8, $a0 + note D_, 6 + notetype $8, $a7 + note D_, 6 + notetype $8, $a7 + note __, 3 + octave 2 + note B_, 3 + octave 3 + note C_, 3 + note D_, 3 + note D_, 9 + octave 2 + note B_, 3 + octave 3 + note D_, 6 + octave 2 + note B_, 6 + octave 3 + note C_, 9 + note F_, 9 + note C_, 6 + note D_, 9 + notetype $c, $b7 + note D#, 1 + note E_, 1 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + notetype $8, $a7 + note C_, 4 + octave 2 + note B_, 4 + octave 3 + note C_, 4 + note D_, 9 + octave 2 + note B_, 3 + octave 3 + note D_, 9 + notetype $8, $b7 + note G_, 3 + note A_, 4 + note G_, 4 + note F_, 4 + note F_, 6 + note E_, 6 + note D_, 9 + note F_, 3 + note G_, 3 + note D_, 6 + note G_, 3 + notetype $8, $54 + octave 2 + note G_, 3 + note B_, 3 + notetype $8, $94 + octave 3 + note D_, 3 + note G_, 3 + ftempo 136 + notetype $8, $b4 + note F_, 3 + note A_, 3 + notetype $8, $d4 + octave 4 + note C_, 3 + note F_, 3 + ftempo 138 + notetype $8, $b4 + note D_, 9 + note C_, 9 + octave 3 + note A#, 6 + notetype $c, $b7 + note F_, 1 + note E_, 1 + note D_, 1 + note E_, 1 + note F_, 4 + octave 4 + note D_, 4 + note F_, 4 + note E_, 6 + octave 3 + note G_, 2 + notetype $8, $b7 + note A_, 4 + note G_, 4 + note F_, 4 + note G_, 12 + octave 4 + note C_, 6 + ftempo 136 + note C#, 6 + ftempo 134 + callchannel Music_TitleScreen_branch_eb96d + octave 4 + note C_, 4 + note C_, 4 + note C#, 4 + callchannel Music_TitleScreen_branch_eb96d + octave 4 + note C_, 4 + note C_, 4 + note C#, 4 + callchannel Music_TitleScreen_branch_eb96d + octave 3 + note E_, 4 + note E_, 4 + note C_, 4 + notetype $c, $a0 + note D_, 6 + notetype $c, $a7 + note D_, 10 + intensity $a0 + note C_, 8 + intensity $a7 + note C_, 8 + intensity $a0 + octave 2 + note B_, 8 + intensity $a7 + note B_, 8 + octave 3 + note C_, 8 + octave 2 + note B_, 8 + octave 3 + note D_, 8 + octave 2 + note B_, 8 + octave 3 + note C_, 8 + note F_, 8 + note A_, 8 + note G_, 6 + note G_, 1 + note F#, 1 + note F_, 8 + note E_, 8 + intensity $a0 + note D_, 16 + intensity $a7 + note D_, 16 + intensity $a3 + octave 2 + note G_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + notetype $8, $b2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note F#, 2 + notetype $c, $b7 + note G_, 1 + note __, 3 + octave 1 + note G_, 1 + note __, 11 + endchannel +; eb96d + +Music_TitleScreen_branch_eb96d: ; eb96d + notetype $c, $c3 + note D_, 1 +Music_TitleScreen_branch_eb971: ; eb971 + note __, 1 + octave 2 + note D_, 1 + octave 1 + note A_, 1 + octave 2 + note D_, 1 + loopchannel 5, Music_TitleScreen_branch_eb971 + note __, 1 + note D_, 1 + octave 1 + note A_, 1 + notetype $8, $b7 + endchannel +; eb984 + +Music_TitleScreen_Ch2: ; eb984 + dutycycle $3 + vibrato $14, $12 + notetype $c, $c7 + intensity $a4 + octave 1 + note G_, 1 + octave 2 + note D_, 1 + note G_, 1 + octave 3 + note C_, 1 + intensity $c2 + octave 3 + note B_, 1 + note __, 2 + note A_, 1 + intensity $b0 + note G_, 6 + intensity $b7 + note G_, 6 + note __, 16 + note __, 16 + intensity $c7 + octave 4 + note C_, 1 + note __, 2 + note D_, 1 + note E_, 8 + note F#, 2 + note E_, 1 + note F#, 1 + octave 3 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + stereopanning $f0 + intensity $97 + octave 2 + note A_, 4 + note F_, 4 + stereopanning $ff + intensity $c7 + octave 4 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + stereopanning $f0 + intensity $97 + octave 2 + note A_, 6 + octave 3 + note C_, 2 + stereopanning $f + intensity $a3 + octave 4 + note D_, 4 + note D_, 2 + note C_, 4 + note C_, 2 + octave 3 + note B_, 4 + stereopanning $ff + intensity $c7 + octave 3 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + stereopanning $f0 + intensity $97 + octave 2 + note A_, 2 + note F_, 4 + note A_, 2 + stereopanning $ff + notetype $8, $c7 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + octave 4 + note C_, 4 + note D_, 12 + stereopanning $f0 + notetype $8, $b7 + octave 2 + note A_, 9 + stereopanning $f + notetype $c, $c7 + note G_, 1 + note A_, 1 + note B_, 6 + note E_, 1 + note F#, 1 + note G_, 4 + notetype $c, $4b + note A_, 4 + stereopanning $ff + notetype $c, $c7 + octave 3 + note G_, 6 + note B_, 2 + octave 4 + note D_, 8 + stereopanning $f0 + intensity $97 + octave 2 + note A_, 2 + note F_, 6 + stereopanning $ff + intensity $c7 + octave 4 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + stereopanning $f0 + intensity $97 + octave 3 + note C_, 2 + octave 2 + note A_, 6 + note B_, 6 + note G_, 2 + notetype $8, $c7 + note F_, 4 + note G_, 4 + note F_, 4 + stereopanning $ff + octave 3 + note G_, 9 + note B_, 3 + octave 4 + note D_, 12 + stereopanning $f0 + notetype $8, $a7 + octave 3 + note D_, 4 + note C_, 4 + note D_, 4 + stereopanning $ff + notetype $8, $c7 + octave 4 + note F_, 4 + note E_, 4 + note F_, 4 + note G_, 9 + note A#, 3 + notetype $c, $b0 + note G_, 8 + notetype $c, $b7 + note G_, 8 + intensity $c6 + note A_, 4 + intensity $5d + note A_, 4 + intensity $c7 + note A#, 6 + intensity $c3 + note F_, 2 + intensity $c7 + note F_, 8 + intensity $a7 + octave 3 + note A#, 8 + intensity $c7 + octave 4 + note A#, 4 + note B_, 4 + octave 5 + note C_, 6 + intensity $c3 + octave 4 + note G_, 2 + intensity $c7 + note G_, 8 + intensity $a7 + octave 3 + note E_, 8 + intensity $c7 + octave 5 + note C_, 4 + note C#, 4 + tone $0001 + stereopanning $f + callchannel Music_TitleScreen_branch_ebae7 + note C#, 4 + callchannel Music_TitleScreen_branch_ebae7 + note C#, 4 + callchannel Music_TitleScreen_branch_ebae7 + octave 4 + note A_, 4 + stereopanning $ff + tone $0000 + notetype $c, $b0 + octave 3 + note B_, 6 + notetype $c, $b7 + note B_, 10 + intensity $c7 + note A_, 8 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + note G_, 8 + note F_, 8 + note A_, 8 + intensity $b0 + note G_, 8 + intensity $b7 + note G_, 8 + intensity $c7 + note F_, 8 + octave 4 + note F_, 6 + note E_, 1 + note D#, 1 + note D_, 8 + octave 2 + note B_, 8 + octave 3 + note C_, 8 + note A_, 6 + note F_, 1 + note A_, 1 + intensity $b0 + note G_, 16 + intensity $b7 + note G_, 16 + intensity $c2 + octave 4 + note G_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + intensity $90 + note G_, 4 + notetype $8, $c2 + octave 3 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F#, 2 + notetype $c, $c7 + note G_, 1 + note __, 3 + octave 2 + note G_, 1 + note __, 11 + endchannel +; ebae7 + +Music_TitleScreen_branch_ebae7: ; ebae7 + notetype $c, $b2 + note D_, 1 +Music_TitleScreen_branch_ebaeb: ; ebaeb + octave 3 + note A_, 1 + octave 4 + note D_, 1 + note A_, 1 + note D_, 1 + loopchannel 5, Music_TitleScreen_branch_ebaeb + octave 3 + note A_, 1 + octave 4 + note D_, 1 + note A_, 1 + notetype $8, $b7 + octave 5 + note C_, 4 + note C_, 4 + endchannel +; ebb01 + +Music_TitleScreen_Ch3: ; ebb01 + stereopanning $f + vibrato $10, $14 + tone $0001 + notetype $c, $16 + octave 3 + octave 3 + note __, 4 + octave 2 + note G_, 2 + note D_, 1 + note C#, 1 + note D_, 1 + note __, 1 + note G_, 2 + note D_, 1 + note __, 1 + note D_, 2 + note G_, 2 + note D_, 2 + note F_, 2 + note C_, 1 + octave 1 + note B_, 1 + octave 2 + note C_, 1 + note __, 1 + note F_, 2 + note C_, 1 + note __, 1 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 2 + note D_, 1 + note C#, 1 + note D_, 1 + note __, 1 + note G_, 2 + note D_, 1 + note __, 1 + note D_, 2 + note G_, 2 + note D_, 2 + note A_, 2 + note F_, 1 + note E_, 1 + note F_, 1 + note __, 1 + note A_, 2 + note F_, 2 + note A_, 4 + octave 3 + note C_, 2 + octave 2 + note G_, 4 + note D_, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note D_, 2 + note A_, 4 + note F_, 2 + note A_, 4 + note F_, 2 + note A_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note B_, 2 + note G_, 2 + note G_, 4 + note B_, 2 + note A_, 4 + note B_, 2 + octave 3 + note C_, 4 + octave 2 + note G_, 4 + note D_, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note D_, 2 + note A_, 4 + note F_, 2 + note A_, 4 + note F_, 2 + note A_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note B_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + octave 3 + note D_, 4 + octave 2 + note G_, 4 + note D_, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note D_, 2 + note A_, 4 + note F_, 2 + note A_, 4 + note F_, 2 + note A_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + note B_, 2 + note G_, 2 + octave 3 + note D_, 4 + octave 2 + note G_, 2 + octave 3 + note D_, 4 + octave 2 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note A_, 2 + note G_, 4 + note D_, 2 + note G_, 4 + note D_, 2 + note G_, 2 + note D_, 2 + note A_, 4 + note F_, 2 + note A_, 4 + note F_, 2 + note A_, 2 + octave 3 + note C_, 2 + octave 2 + note B_, 4 + note G_, 2 + note B_, 4 + note G_, 2 + octave 3 + note D_, 2 + octave 2 + note G_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + note A_, 2 + note A_, 2 + note F_, 2 + note A_, 2 + octave 3 + note C_, 2 + note D_, 6 + octave 2 + note A#, 6 + octave 3 + note F_, 4 + note A#, 6 + note F_, 6 + note D_, 4 + note E_, 6 + note C_, 6 + note E_, 4 + octave 4 + note C_, 6 + octave 3 + note G_, 6 + note E_, 4 + note D_, 1 + note __, 1 + stereopanning $ff + notetype $c, $16 + tone $0000 + octave 4 + note A_, 2 + octave 5 + note D_, 2 + note A_, 6 + note G_, 2 + note F#, 2 + note D_, 1 + note __, 2 + note E_, 1 + note F#, 4 + notetype $8, $16 + octave 3 + note C_, 4 + note C_, 4 + note C#, 4 + notetype $c, $16 + note D_, 1 + note __, 1 + octave 4 + note A_, 2 + octave 5 + note D_, 2 + note A_, 6 + note G_, 2 + note F#, 2 + note B_, 1 + note __, 2 + note A_, 1 + note A_, 4 + notetype $8, $16 + octave 3 + note C_, 4 + note C_, 4 + note C#, 4 + notetype $c, $16 + note D_, 1 + note __, 1 + notetype $c, $16 + octave 4 + note A_, 2 + octave 5 + note D_, 2 + note G_, 6 + note E_, 2 + note G_, 2 + note F#, 1 + note E_, 1 + note D_, 6 + tone $0001 + notetype $8, $16 + octave 3 + note C_, 4 + note C_, 4 + note E_, 2 + note F#, 2 + stereopanning $f + notetype $c, $16 + note G_, 16 + note F_, 16 + note G_, 8 + note D_, 6 + note D_, 1 + note E_, 1 + note F_, 2 + note F_, 12 + note E_, 1 + note D#, 1 + note D_, 8 + note G_, 8 + note F_, 8 + note A_, 8 + note G_, 8 + note D_, 6 + note D_, 1 + note E_, 1 + note F_, 16 + note G_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 3 + octave 2 + note G_, 1 + note __, 3 + note G_, 1 + note __, 5 + note G_, 1 + note G_, 1 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + note G_, 1 + note __, 3 + notetype $8, $16 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note F_, 2 + note A_, 2 + notetype $c, $16 + note G_, 1 + note __, 3 + octave 1 + note G_, 1 + note __, 11 + endchannel +; ebc5c + +Music_TitleScreen_Ch4: ; ebc5c + togglenoise $5 + stereopanning $f0 + notetype $c + note __, 4 + 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: ; 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 +; ebd77 + +Music_TitleScreen_branch_ebd77: ; 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 +; ebd81 + +Music_TitleScreen_branch_ebd81: ; 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 +; ebd8b + +Music_TitleScreen_branch_ebd8b: ; ebd8b + note C_, 2 + note C_, 1 + note C_, 1 + loopchannel 4, Music_TitleScreen_branch_ebd8b + endchannel +; ebd93 + +Music_TitleScreen_branch_ebd93: ; 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 +; ebd9e + + diff --git a/crysaudio/music/trainervictory.asm b/crysaudio/music/trainervictory.asm new file mode 100644 index 00000000..c4394b6b --- /dev/null +++ b/crysaudio/music/trainervictory.asm @@ -0,0 +1,237 @@ +Music_TrainerVictory: ; ebeab + dbw $80, Music_TrainerVictory_Ch1 + dbw $01, Music_TrainerVictory_Ch2 + dbw $02, Music_TrainerVictory_Ch3 +; ebeb4 + +Music_TrainerVictory_Ch1: ; ebeb4 + ftempo 120 + volume $77 + dutycycle $2 + tone $0001 + notetype $8, $b1 + octave 4 + note E_, 2 + note E_, 2 + note E_, 2 + note E_, 2 + note F#, 2 + note G_, 2 + intensity $b6 + note A_, 12 + stereopanning $f +Music_TrainerVictory_branch_ebecd: ; ebecd + intensity $72 + callchannel Music_TrainerVictory_branch_ebf11 + intensity $51 + note C#, 2 + note E_, 2 + note F#, 2 + note A_, 2 + note B_, 2 + octave 4 + note C#, 2 + intensity $72 + octave 3 + note A_, 2 + note __, 2 + octave 4 + note C#, 2 + note E_, 6 + loopchannel 2, Music_TrainerVictory_branch_ebecd + callchannel Music_TrainerVictory_branch_ebf11 + note A_, 2 + note __, 2 + note F_, 2 + note A_, 6 + note A#, 2 + note __, 2 + note G_, 2 + note A#, 6 +Music_TrainerVictory_branch_ebef2: ; ebef2 + intensity $72 + octave 4 + note D_, 2 + note C#, 2 + octave 3 + note A_, 2 + loopchannel 3, Music_TrainerVictory_branch_ebef2 + note F#, 2 + note A_, 2 + octave 4 + note D_, 2 +Music_TrainerVictory_branch_ebf01: ; ebf01 + octave 4 + note C#, 2 + octave 3 + note B_, 2 + note A_, 2 + loopchannel 3, Music_TrainerVictory_branch_ebf01 + note E_, 2 + note F#, 2 + note G_, 2 + loopchannel 0, Music_TrainerVictory_branch_ebecd +; ebf11 + +Music_TrainerVictory_branch_ebf11: ; ebf11 + octave 3 + note F#, 2 + note __, 2 + note D_, 2 + note F#, 6 + note G_, 2 + note __, 2 + note E_, 2 + note G_, 6 + endchannel +; ebf1b + +Music_TrainerVictory_Ch2: ; ebf1b + vibrato $12, $34 + dutycycle $3 + notetype $8, $d1 + octave 4 + note A_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + note B_, 2 + octave 5 + note C#, 2 + intensity $d6 + note D_, 12 + stereopanning $f0 +Music_TrainerVictory_branch_ebf30: ; ebf30 + notetype $8, $82 + callchannel Music_TrainerVictory_branch_ebf56 + note F#, 2 + note __, 2 + note G_, 2 + note A_, 6 + note E_, 2 + note __, 2 + note F#, 2 + note G_, 6 + loopchannel 2, Music_TrainerVictory_branch_ebf30 + callchannel Music_TrainerVictory_branch_ebf56 + note F_, 2 + note __, 2 + note C_, 2 + note F_, 6 + note G_, 2 + note __, 2 + note D_, 2 + note G_, 6 + notetype $c, $88 + note F#, 16 + note E_, 16 + loopchannel 0, Music_TrainerVictory_branch_ebf30 +; ebf56 + +Music_TrainerVictory_branch_ebf56: ; ebf56 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note A_, 2 + octave 4 + note D_, 6 + note E_, 2 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 6 + endchannel +; ebf64 + +Music_TrainerVictory_Ch3: ; ebf64 + notetype $8, $25 + octave 3 + note G_, 6 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 6 + note D_, 2 + note C#, 2 + octave 2 + note B_, 2 +Music_TrainerVictory_branch_ebf74: ; ebf74 + callchannel Music_TrainerVictory_branch_ebfb1 + octave 3 + note C#, 2 + note __, 2 + note C#, 2 + note A_, 2 + note F#, 2 + note C#, 2 + octave 2 + note A_, 2 + note __, 2 + octave 3 + note A_, 1 + note __, 1 + note A_, 6 + loopchannel 2, Music_TrainerVictory_branch_ebf74 + callchannel Music_TrainerVictory_branch_ebfb1 + octave 3 + note C_, 2 + note __, 2 + note C_, 2 + note A_, 2 + note F_, 2 + note C_, 2 + note D_, 2 + note __, 2 + note D_, 2 + octave 4 + note D_, 2 + octave 3 + note A#, 2 + note G_, 2 + note D_, 2 + note F#, 2 + note A_, 2 + octave 4 + note D_, 12 + octave 3 + note A_, 2 + note F#, 2 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note E_, 2 + note A_, 12 + note G_, 2 + note E_, 2 + note C#, 2 + loopchannel 0, Music_TrainerVictory_branch_ebf74 +; ebfb1 + +Music_TrainerVictory_branch_ebfb1: ; ebfb1 + octave 2 + note A_, 2 + note __, 2 + note A_, 2 + octave 3 + note F#, 2 + note D_, 2 + octave 2 + note A_, 2 + note B_, 2 + note __, 2 + note B_, 2 + octave 3 + note G_, 2 + note E_, 2 + octave 2 + note B_, 2 + endchannel +; ebfc3 + diff --git a/crysaudio/music/unioncave.asm b/crysaudio/music/unioncave.asm new file mode 100644 index 00000000..dc49f102 --- /dev/null +++ b/crysaudio/music/unioncave.asm @@ -0,0 +1,270 @@ +Music_UnionCave: ; f5c60 + dbw $c0, Music_UnionCave_Ch1 + dbw $01, Music_UnionCave_Ch2 + dbw $02, Music_UnionCave_Ch3 + dbw $03, Music_UnionCave_Ch4 +; f5c6c + +Music_UnionCave_Ch1: ; f5c6c + tempo 160 + volume $77 + dutycycle $1 + tone $0002 + vibrato $18, $34 + stereopanning $f +Music_UnionCave_branch_f5c7b: ; f5c7b + notetype $c, $b3 +Music_UnionCave_branch_f5c7e: ; f5c7e + callchannel Music_UnionCave_branch_f5ccf + loopchannel 4, Music_UnionCave_branch_f5c7e +Music_UnionCave_branch_f5c85: ; f5c85 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + note E_, 4 + note C#, 2 + note E_, 2 + note F_, 4 + loopchannel 8, Music_UnionCave_branch_f5c85 +Music_UnionCave_branch_f5c91: ; f5c91 + octave 2 + note A_, 2 + octave 3 + note D_, 2 + note F_, 4 + note D_, 2 + note F_, 2 + note F#, 4 + loopchannel 4, Music_UnionCave_branch_f5c91 + note __, 4 + intensity $80 + note F_, 16 + note F#, 16 + note G_, 16 + note F#, 16 + note G_, 8 + note F#, 8 + note F_, 8 + note E_, 8 + note G_, 8 + note F#, 8 + octave 4 + 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 +; f5ccf + +Music_UnionCave_branch_f5ccf: ; f5ccf + octave 2 + note G#, 2 + octave 3 + note C#, 2 + note E_, 12 + endchannel +; f5cd5 + +Music_UnionCave_Ch2: ; f5cd5 + dutycycle $3 + vibrato $8, $24 +Music_UnionCave_branch_f5cda: ; f5cda + notetype $c, $c4 + callchannel Music_UnionCave_branch_f5d34 + intensity $c5 + callchannel Music_UnionCave_branch_f5d34 + intensity $c7 + callchannel Music_UnionCave_branch_f5d34 + intensity $c4 + note C#, 4 + octave 3 + note B_, 4 + octave 4 + note D_, 2 + note E_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 4 + octave 3 + note B_, 4 + octave 4 + note D_, 8 + octave 3 + note B_, 4 + octave 4 + note D_, 4 + note F#, 2 + note F_, 2 + note C#, 2 + octave 3 + note B_, 2 + octave 4 + note C#, 8 + note D_, 4 + note C#, 4 + note __, 4 + intensity $a0 + note C_, 16 + note C#, 16 + note D_, 16 + note C#, 16 + note E_, 16 + 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 +; f5d34 + +Music_UnionCave_branch_f5d34: ; f5d34 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + octave 4 + note C#, 2 + note D#, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 4 + octave 3 + note A#, 4 + octave 4 + note C#, 8 + octave 3 + note A#, 4 + octave 4 + note C#, 4 + note F_, 2 + note E_, 2 + note C_, 2 + octave 3 + note A#, 2 + octave 4 + note C_, 8 + note C#, 4 + note C_, 4 + endchannel +; f5d52 + +Music_UnionCave_branch_f5d52: ; f5d52 + octave 2 + note G#, 2 + octave 3 + note C#, 2 + note E_, 12 + endchannel +; f5d58 + +Music_UnionCave_Ch3: ; f5d58 + notetype $c, $16 + stereopanning $f0 +Music_UnionCave_branch_f5d5d: ; f5d5d + note __, 16 + loopchannel 7, Music_UnionCave_branch_f5d5d + note __, 14 + octave 4 + note C_, 2 +Music_UnionCave_branch_f5d65: ; f5d65 + note __, 2 + octave 3 + note E_, 2 + note __, 2 + note E_, 2 + note G#, 2 + note E_, 2 + note __, 2 + octave 4 + note C_, 2 + loopchannel 4, Music_UnionCave_branch_f5d65 +Music_UnionCave_branch_f5d73: ; f5d73 + note __, 2 + octave 3 + note F_, 2 + note __, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note __, 2 + octave 4 + note C#, 2 + loopchannel 4, Music_UnionCave_branch_f5d73 + note __, 4 + note C_, 8 + octave 3 + note B_, 8 + note A#, 8 + note A_, 8 + octave 4 + note C#, 8 + note C_, 8 + octave 3 + note B_, 8 + note A#, 8 +Music_UnionCave_branch_f5d8d: ; f5d8d + note A_, 4 + note G_, 4 + note A#, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 2 + note G_, 2 + loopchannel 3, Music_UnionCave_branch_f5d8d + note A_, 4 + note G_, 4 + note A#, 8 +Music_UnionCave_branch_f5d9c: ; f5d9c + note __, 16 + loopchannel 4, Music_UnionCave_branch_f5d9c + loopchannel 0, Music_UnionCave_branch_f5d5d +; f5da5 + +Music_UnionCave_Ch4: ; f5da5 + togglenoise $1 + notetype $c +Music_UnionCave_branch_f5da9: ; f5da9 + stereopanning $f0 + note E_, 4 + 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 +; f5dc1 + + + + + diff --git a/crysaudio/music/vermilioncity.asm b/crysaudio/music/vermilioncity.asm new file mode 100644 index 00000000..f7c550f4 --- /dev/null +++ b/crysaudio/music/vermilioncity.asm @@ -0,0 +1,351 @@ +Music_VermilionCity: ; eb676 + dbw $80, Music_VermilionCity_Ch1 + dbw $01, Music_VermilionCity_Ch2 + dbw $02, Music_VermilionCity_Ch3 +; eb67f + + + + +Music_VermilionCity_Ch1: ; eb680 + stereopanning $f + tempo 176 + volume $77 + dutycycle $2 + notetype $c, $65 + octave 4 + note B_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note D_, 4 + octave 3 + note B_, 4 + note A_, 2 + note B_, 1 + octave 4 + note D_, 1 + note E_, 1 + note G#, 1 + note B_, 1 + octave 5 + note D_, 1 + vibrato $10, $23 +Music_VermilionCity_branch_eb6a0: ; eb6a0 + dutycycle $1 + notetype $c, $85 + callchannel Music_VermilionCity_branch_eb6f9 + 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 + note F_, 4 + octave 4 + note D_, 4 + note E_, 1 + note C#, 1 + octave 3 + note A_, 1 + note E_, 1 + octave 4 + note C#, 1 + octave 3 + 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 + note F#, 2 + note __, 2 + note F#, 2 + note __, 2 + note F#, 2 + note __, 2 + note F#, 2 + callchannel Music_VermilionCity_branch_eb70c + callchannel Music_VermilionCity_branch_eb70c + intensity $87 + dutycycle $2 + octave 4 + note D_, 8 + octave 3 + note G#, 8 + note E_, 8 + note B_, 8 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + octave 2 + note B_, 4 + note G#, 4 + note B_, 4 + octave 3 + note D_, 4 + loopchannel 0, Music_VermilionCity_branch_eb6a0 +; eb6f9 + +Music_VermilionCity_branch_eb6f9: ; eb6f9 + octave 3 + note C#, 4 + note E_, 4 + note F#, 2 + note A_, 2 + note E_, 2 + note G#, 2 + endchannel +; eb701 + +Music_VermilionCity_branch_eb701: ; eb701 + note D_, 2 + note F_, 2 + note A_, 2 + octave 4 + note D_, 2 + note E_, 2 + note C#, 2 + octave 3 + note A_, 2 + note E_, 2 + endchannel +; eb70c + +Music_VermilionCity_branch_eb70c: ; eb70c + note __, 2 + note F#, 2 + note A_, 2 + note F#, 2 + octave 4 + note D_, 2 + octave 3 + note F#, 2 + note A_, 2 + note F#, 2 + note __, 2 + note G#, 2 + note B_, 2 + note G#, 2 + octave 4 + note E_, 2 + octave 3 + note G#, 2 + note B_, 2 + note G#, 2 + endchannel +; eb721 + +Music_VermilionCity_Ch2: ; eb721 + stereopanning $ff + dutycycle $3 + notetype $c, $77 + vibrato $10, $23 + octave 5 + note E_, 4 + note D_, 4 + octave 4 + note B_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + note F#, 4 + note G#, 4 +Music_VermilionCity_branch_eb735: ; eb735 + notetype $c, $97 + callchannel Music_VermilionCity_branch_eb768 + note G#, 2 + callchannel Music_VermilionCity_branch_eb768 + note E_, 2 + intensity $b7 + 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 + note F#, 6 + note E_, 1 + note F#, 1 + note E_, 8 + note A_, 6 + note G#, 1 + note A_, 1 + note G#, 8 + note G#, 14 + notetype $6, $57 + note __, 1 + octave 4 + note E_, 1 + note G#, 1 + note B_, 1 + notetype $c, $87 + octave 5 + note E_, 16 + loopchannel 0, Music_VermilionCity_branch_eb735 +; eb768 + +Music_VermilionCity_branch_eb768: ; eb768 + octave 1 + note A_, 8 + octave 2 + note F#, 4 + note E_, 4 + note D_, 6 + note C#, 1 + note D_, 1 + note E_, 8 + octave 1 + note A_, 8 + octave 2 + note F#, 4 + note E_, 4 + note D_, 6 + note E_, 1 + note D_, 1 + note C#, 2 + note E_, 2 + octave 1 + note A_, 2 + endchannel +; eb77e + +Music_VermilionCity_branch_eb77e: ; eb77e + note F#, 8 + note B_, 8 + note A_, 4 + note G#, 4 + note F#, 4 + note E_, 4 + endchannel +; eb785 + +Music_VermilionCity_Ch3: ; eb785 + stereopanning $f0 + vibrato $22, $23 + notetype $c, $25 + octave 2 + note E_, 4 + note B_, 4 + octave 3 + note E_, 4 + note B_, 4 + note D_, 4 + note E_, 4 + note D_, 2 + octave 3 + note B_, 1 + note G#, 1 + note F#, 1 + note E_, 1 + note D_, 1 + octave 2 + note B_, 1 +Music_VermilionCity_branch_eb79e: ; eb79e + notetype $c, $22 + callchannel Music_VermilionCity_branch_eb7de + octave 5 + note A_, 6 + intensity $24 + note E_, 1 + note G#, 1 + callchannel Music_VermilionCity_branch_eb7de + note A_, 8 + intensity $14 + octave 3 + note D_, 4 + note C#, 4 + octave 2 + note B_, 4 + note A_, 4 + octave 3 + note D_, 2 + note __, 4 + note D_, 1 + note D_, 1 + callchannel Music_VermilionCity_branch_eb7f5 + octave 4 + note D_, 2 + octave 3 + note D_, 2 + note __, 2 + note D_, 2 + callchannel Music_VermilionCity_branch_eb7f5 + intensity $25 + octave 3 + note E_, 8 + octave 4 + note E_, 8 + octave 3 + note B_, 8 + octave 4 + note E_, 8 + octave 2 + note E_, 16 + octave 3 + note E_, 14 + intensity $22 + octave 5 + note E_, 1 + note G#, 1 + loopchannel 0, Music_VermilionCity_branch_eb79e +; eb7de + +Music_VermilionCity_branch_eb7de: ; eb7de + octave 5 + note A_, 8 + octave 6 + note D_, 4 + note C#, 4 + octave 5 + note B_, 6 + note A_, 1 + note B_, 1 + octave 6 + note C#, 8 + octave 5 + note A_, 8 + octave 6 + note D_, 4 + note C#, 4 + octave 5 + note B_, 6 + octave 6 + note C#, 1 + octave 5 + note B_, 1 + endchannel +; eb7f5 + +Music_VermilionCity_branch_eb7f5: ; eb7f5 + note A_, 1 + note __, 1 + note A_, 2 + note __, 2 + note F#, 2 + note E_, 2 + note __, 4 + note E_, 1 + note E_, 1 + octave 4 + note E_, 1 + note __, 1 + note D_, 2 + note __, 2 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + endchannel +; eb808 + + diff --git a/crysaudio/music/victoryroad.asm b/crysaudio/music/victoryroad.asm new file mode 100644 index 00000000..babb91de --- /dev/null +++ b/crysaudio/music/victoryroad.asm @@ -0,0 +1,207 @@ +Music_VictoryRoad: ; f6c72 + dbw $c0, Music_VictoryRoad_Ch1 + dbw $01, Music_VictoryRoad_Ch2 + dbw $02, Music_VictoryRoad_Ch3 + dbw $03, Music_VictoryRoad_Ch4 +; f6c7e + +Music_VictoryRoad_Ch1: ; f6c7e + tempo 144 + volume $77 + stereopanning $f + dutycycle $3 + tone $0002 + notetype $c, $b3 +Music_VictoryRoad_branch_f6c8d: ; f6c8d + callchannel Music_VictoryRoad_branch_f6cb9 + loopchannel 6, Music_VictoryRoad_branch_f6c8d +Music_VictoryRoad_branch_f6c94: ; f6c94 + intensity $b2 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note D_, 1 + note __, 1 + octave 2 + note A_, 1 + intensity $b7 + octave 3 + note C#, 3 + octave 2 + note A_, 1 + octave 3 + note D_, 3 + octave 2 + note A_, 1 + octave 3 + note G#, 3 + loopchannel 2, Music_VictoryRoad_branch_f6c94 +Music_VictoryRoad_branch_f6cae: ; f6cae + callchannel Music_VictoryRoad_branch_f6cb9 + loopchannel 2, Music_VictoryRoad_branch_f6cae + loopchannel 0, Music_VictoryRoad_branch_f6c8d +; f6cb9 + +Music_VictoryRoad_branch_f6cb9: ; f6cb9 + intensity $b2 + octave 2 + note G_, 1 + note B_, 1 + octave 3 + note C_, 1 + note __, 1 + octave 2 + note G_, 1 + intensity $b7 + note B_, 3 + note G_, 1 + octave 3 + note C_, 3 + octave 2 + note G_, 1 + octave 3 + note F#, 3 + endchannel +; f6cce + +Music_VictoryRoad_Ch2: ; f6cce + dutycycle $3 + vibrato $10, $24 +Music_VictoryRoad_branch_f6cd3: ; f6cd3 + notetype $c, $c2 + callchannel Music_VictoryRoad_branch_f6d1e + note __, 2 + callchannel Music_VictoryRoad_branch_f6d1e + note __, 1 + octave 4 + note C_, 1 + notetype $c, $b0 + note E_, 8 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + note E_, 15 + note D#, 1 + notetype $c, $b0 + note E_, 8 + octave 5 + note C_, 4 + octave 4 + note B_, 4 + notetype $c, $b0 + octave 5 + note E_, 8 + notetype $c, $b7 + note E_, 8 + notetype $c, $c7 + note D_, 8 + stereopanning $f0 + note C#, 4 + stereopanning $f + octave 4 + note A_, 4 + stereopanning $ff + octave 5 + note C_, 8 + stereopanning $f + octave 4 + note A#, 4 + stereopanning $f0 + note F_, 4 + stereopanning $ff + note A_, 12 + note D_, 1 + note F#, 1 + note A_, 1 + octave 5 + note C#, 1 + note D_, 16 + loopchannel 0, Music_VictoryRoad_branch_f6cd3 +; f6d1e + +Music_VictoryRoad_branch_f6d1e: ; f6d1e + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note F#, 1 + note F#, 1 + note __, 2 + note G#, 1 + note G#, 1 + note __, 2 + note A_, 1 + note A_, 1 + endchannel +; f6d2c + +Music_VictoryRoad_Ch3: ; f6d2c + stereopanning $f0 + notetype $c, $28 +Music_VictoryRoad_branch_f6d31: ; f6d31 + callchannel Music_VictoryRoad_branch_f6d52 + loopchannel 6, Music_VictoryRoad_branch_f6d31 +Music_VictoryRoad_branch_f6d38: ; f6d38 + note D_, 1 + note __, 1 + note B_, 1 + note __, 1 + note F_, 1 + note A_, 3 + note D_, 1 + note B_, 1 + note __, 2 + note D_, 1 + note B_, 3 + loopchannel 2, Music_VictoryRoad_branch_f6d38 +Music_VictoryRoad_branch_f6d47: ; f6d47 + callchannel Music_VictoryRoad_branch_f6d52 + loopchannel 2, Music_VictoryRoad_branch_f6d47 + loopchannel 0, Music_VictoryRoad_branch_f6d31 +; f6d52 + +Music_VictoryRoad_branch_f6d52: ; f6d52 + octave 3 + note C_, 1 + note __, 1 + note A_, 1 + note __, 1 + note D#, 1 + note G_, 3 + note C_, 1 + note A_, 1 + note __, 2 + note C_, 1 + note A_, 3 + endchannel +; f6d5f + +Music_VictoryRoad_Ch4: ; f6d5f + togglenoise $0 + notetype $c +Music_VictoryRoad_branch_f6d63: ; f6d63 + note D_, 2 + note D_, 2 + 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 +; f6d79 + + diff --git a/crysaudio/music/violetcity.asm b/crysaudio/music/violetcity.asm new file mode 100644 index 00000000..c8580a2a --- /dev/null +++ b/crysaudio/music/violetcity.asm @@ -0,0 +1,784 @@ +Music_VioletCity: ; f0000 + dbw $c0, Music_VioletCity_Ch1 + dbw $01, Music_VioletCity_Ch2 + dbw $02, Music_VioletCity_Ch3 + dbw $03, Music_VioletCity_Ch4 +; f000c + +Music_VioletCity_Ch1: ; f000c + tempo 164 + volume $77 + vibrato $12, $25 + dutycycle $2 + notetype $c, $95 + note __, 16 + stereopanning $f0 + octave 2 + note E_, 1 + note G#, 1 + note B_, 1 + stereopanning $ff + octave 3 + note D#, 1 + note G#, 1 + note __, 1 + note A#, 4 + note G#, 2 + note F#, 2 + note C#, 2 + stereopanning $f + octave 2 + note D#, 1 + note F#, 1 + note A#, 1 + stereopanning $ff + octave 3 + note C#, 1 + note F#, 1 + note __, 1 + note D#, 4 + note G#, 2 + note D#, 2 + octave 2 + note G#, 2 + note C#, 1 + note E_, 1 + note G#, 1 + note B_, 1 + octave 3 + note G#, 1 + note __, 1 + octave 2 + note B_, 4 + notetype $6, $91 + octave 3 + note C#, 2 + note F_, 2 + note C#, 2 + note F_, 2 + note G#, 2 + note B_, 2 + intensity $a4 + octave 2 + note B_, 8 + note __, 4 + octave 3 + note C#, 12 + note __, 8 +Music_VioletCity_branch_f0056: ; f0056 + notetype $6, $95 + note __, 4 + octave 2 + note B_, 2 + octave 3 + note C#, 2 + note D#, 4 + note D#, 2 + note E_, 2 + note D#, 2 + note __, 2 + note F#, 2 + note __, 2 + note G#, 2 + note __, 2 + note B_, 2 + note __, 2 + stereopanning $f0 + octave 4 + note C#, 2 + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C#, 2 + stereopanning $ff + note C_, 2 + octave 3 + note G#, 2 + note E_, 2 + octave 4 + note C_, 2 + stereopanning $f + octave 3 + note B_, 2 + note __, 2 + note B_, 2 + note __, 2 + note A#, 8 + stereopanning $ff + note __, 4 + note C#, 2 + note E_, 2 + note A#, 4 + note A#, 2 + octave 4 + note C#, 2 + octave 3 + note A#, 2 + note __, 2 + note F#, 2 + note __, 2 + note E_, 2 + note __, 2 + note C#, 2 + note __, 2 + stereopanning $f + note D#, 8 + stereopanning $ff + note E_, 8 + stereopanning $f0 + note F_, 2 + note __, 2 + note F_, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 4 + stereopanning $ff + note G#, 2 + note D#, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 1 + octave 3 + note D#, 1 + note __, 1 + note B_, 4 + note G#, 2 + note G#, 2 + note A#, 2 + note __, 2 + note A#, 2 + note __, 2 + note D#, 4 + note F#, 2 + note __, 2 + notetype $c, $95 + note __, 8 + octave 4 + note F_, 3 + dutycycle $1 + notetype $6, $75 + note G#, 1 + note B_, 1 + octave 5 + note D#, 8 + notetype $c, $93 + dutycycle $2 + note __, 16 + notetype $6, $91 + stereopanning $f0 + octave 3 + note E_, 2 + octave 2 + note B_, 2 + note G#, 2 + octave 3 + note E_, 2 + stereopanning $f + octave 2 + note B_, 2 + note G#, 2 + note B_, 2 + octave 3 + note E_, 2 + intensity $a4 + stereopanning $ff + note D#, 8 + note __, 8 + dutycycle $3 + intensity $84 + note __, 4 + note G_, 2 + note A_, 2 + note B_, 4 + octave 4 + note D_, 4 + note C#, 4 + notetype $8, $84 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note A_, 3 + notetype $c, $84 + note F#, 1 + note __, 1 + note F#, 2 + note C#, 1 + note __, 1 + note F#, 2 + note D_, 4 + note E_, 4 + note F#, 2 + note B_, 1 + note __, 1 + note B_, 1 + octave 4 + note C#, 1 + note D_, 2 + note F#, 2 + note E_, 2 + notetype $8, $84 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 3 + notetype $c, $84 + octave 3 + note B_, 1 + note __, 1 + note A_, 2 + note F#, 1 + note __, 1 + note A_, 2 + octave 4 + note E_, 4 + note D_, 4 + note C#, 2 + note G#, 1 + note E_, 1 + octave 3 + note B_, 1 + octave 4 + note E_, 1 + note G#, 1 + note __, 1 + note G#, 1 + note A#, 1 + note B_, 4 + note __, 4 + note G#, 1 + note F_, 1 + octave 3 + note B_, 1 + octave 4 + note F_, 1 + note G#, 1 + note __, 1 + note G#, 1 + note A#, 1 + note B_, 4 + note __, 4 + note C#, 1 + octave 3 + note B_, 1 + note F#, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note F#, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 1 + note F#, 1 + note C#, 1 + note F#, 1 + note A#, 1 + octave 4 + note C#, 1 + note F#, 1 + note A#, 1 + octave 5 + note C#, 1 + dutycycle $2 + octave 4 + note C#, 6 + note C_, 1 + octave 3 + note B_, 1 + octave 4 + note C#, 4 + note __, 4 + loopchannel 0, Music_VioletCity_branch_f0056 +; f0162 + +Music_VioletCity_Ch2: ; f0162 + vibrato $12, $24 + dutycycle $2 + notetype $c, $c7 + note __, 16 + octave 3 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 4 + note D#, 4 + note C#, 2 + octave 3 + note A#, 2 + note G#, 2 + note F#, 1 + note __, 1 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + octave 4 + note C#, 4 + octave 3 + note B_, 2 + note A#, 2 + note B_, 2 + note G#, 1 + note __, 1 + note A#, 1 + note __, 1 + note B_, 1 + note __, 1 + note G#, 4 + note A#, 2 + note B_, 2 + octave 4 + note C#, 2 + note D#, 2 + octave 3 + note F#, 2 + octave 4 + note D#, 1 + note __, 1 + note C#, 6 + note __, 2 + note D#, 1 + note E_, 1 +Music_VioletCity_branch_f0199: ; f0199 + intensity $b7 + note F#, 4 + note __, 2 + note F#, 1 + note G#, 1 + note F#, 1 + note __, 1 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note F#, 1 + note __, 1 + note E_, 14 + note C#, 1 + note D#, 1 + note E_, 4 + note __, 2 + note E_, 1 + note F#, 1 + note E_, 1 + note __, 1 + note D#, 1 + note __, 1 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + note D#, 12 + note __, 2 + octave 3 + note B_, 1 + octave 4 + note C#, 1 + note D#, 4 + note __, 2 + note D#, 1 + note E_, 1 + note D#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 3 + note B_, 2 + octave 4 + note C#, 1 + note __, 1 + note D#, 4 + note G#, 4 + note B_, 3 + note __, 3 + note C#, 1 + note D#, 1 + note E_, 2 + octave 3 + note G#, 2 + note B_, 2 + octave 4 + note E_, 2 + note D#, 1 + octave 3 + note F#, 1 + note B_, 1 + octave 4 + note D#, 1 + note C#, 1 + octave 3 + note E_, 1 + note A#, 1 + octave 4 + note C#, 1 + octave 3 + note B_, 12 + note __, 4 + intensity $a7 + dutycycle $3 + note __, 2 + note B_, 1 + octave 4 + note C#, 1 + note D_, 2 + note F#, 2 + note E_, 2 + notetype $8, $a7 + note D_, 1 + note E_, 1 + note D_, 1 + note C#, 3 + notetype $c, $a7 + octave 3 + note B_, 1 + note __, 1 + note A_, 2 + note F#, 1 + note __, 1 + note A_, 2 + octave 4 + note E_, 4 + note D_, 4 + note C#, 2 + note __, 2 + note G_, 1 + note A_, 1 + note B_, 2 + octave 5 + note D_, 2 + note C#, 2 + notetype $8, $a7 + octave 4 + note B_, 1 + octave 5 + note C#, 1 + octave 4 + note B_, 1 + note A_, 3 + notetype $c, $a7 + note G_, 1 + note __, 1 + note F#, 2 + note C#, 1 + note __, 1 + note F#, 2 + vibrato $0, $0 + intensity $87 + octave 5 + note E_, 4 + note F#, 4 + note D_, 1 + note E_, 1 + note F#, 12 + note __, 2 + note D_, 1 + note E_, 1 + note F#, 12 + note __, 2 + octave 4 + note A#, 1 + note B_, 1 + octave 5 + note C#, 11 + note __, 5 + vibrato $12, $24 + intensity $a7 + dutycycle $2 + octave 4 + note A#, 6 + note A_, 1 + note G#, 1 + note F#, 4 + note __, 2 + note D#, 1 + note E_, 1 + loopchannel 0, Music_VioletCity_branch_f0199 +; f0247 + +Music_VioletCity_Ch3: ; f0247 + notetype $c, $25 + note __, 16 + note __, 6 + octave 4 + note E_, 4 + note __, 6 + note __, 6 + octave 3 + note G#, 4 + note __, 6 + note __, 6 + note F_, 4 + note __, 6 + octave 2 + note F#, 4 + octave 3 + note C#, 1 + note __, 1 + note A#, 4 + note A_, 1 + note G#, 1 + note F#, 2 + octave 2 + note A#, 2 +Music_VioletCity_branch_f0261: ; f0261 + notetype $c, $25 + note B_, 1 + note __, 5 + note B_, 1 + note B_, 1 + note __, 2 + note B_, 1 + note __, 1 + octave 3 + note F#, 2 + octave 2 + note F#, 1 + note __, 1 + octave 3 + note C#, 1 + note __, 5 + note C#, 1 + note C#, 1 + note __, 2 + note C#, 1 + note __, 1 + note G#, 2 + octave 2 + note G#, 1 + note __, 1 + note F#, 1 + note __, 5 + note F#, 1 + note F#, 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note F#, 2 + note C#, 1 + note __, 1 + octave 2 + note B_, 1 + note __, 5 + note B_, 1 + note B_, 1 + note __, 2 + note B_, 1 + note __, 1 + octave 3 + note B_, 4 + note G#, 1 + note __, 5 + note G#, 1 + note G#, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note F#, 2 + note F#, 1 + note __, 1 + notetype $6, $25 + octave 3 + note C#, 2 + note F_, 2 + note G#, 2 + note B_, 2 + octave 4 + note C#, 2 + note F_, 2 + note G#, 2 + note B_, 2 + octave 4 + note C#, 6 + notetype $c, $25 + note __, 5 + notetype $6, $25 + octave 2 + note E_, 2 + note __, 10 + note E_, 2 + note E_, 2 + note F#, 2 + note __, 2 + note F#, 2 + note __, 2 + octave 3 + note C#, 4 + note C_, 4 + octave 2 + note B_, 2 + note __, 10 + note B_, 2 + note B_, 2 + note __, 4 + note B_, 2 + note __, 2 + note A_, 8 + callchannel Music_VioletCity_branch_f0311 + note F#, 2 + note __, 10 + note B_, 2 + note B_, 2 + note B_, 2 + note __, 2 + note A#, 8 + note A_, 2 + note __, 2 + callchannel Music_VioletCity_branch_f0311 + note F#, 2 + note __, 10 + note B_, 2 + note B_, 2 + note B_, 2 + note __, 2 + note A#, 8 + note A_, 2 + note __, 2 + octave 3 + note E_, 2 + note __, 10 + note E_, 2 + note E_, 2 + note __, 4 + note E_, 2 + note __, 2 + note B_, 4 + note G#, 2 + note F#, 2 + note F_, 2 + note __, 10 + note F_, 2 + note F_, 2 + note __, 4 + note F_, 2 + note __, 2 + octave 4 + note C#, 4 + octave 3 + note A#, 2 + note G#, 2 + note F#, 2 + note __, 10 + note F#, 2 + note F#, 2 + octave 2 + note F#, 2 + note __, 2 + note F#, 2 + note __, 2 + octave 3 + note F#, 4 + octave 2 + note F#, 2 + note G#, 2 + octave 3 + note F#, 12 + note G#, 2 + note A_, 2 + note A#, 8 + note __, 4 + octave 2 + note A#, 4 + loopchannel 0, Music_VioletCity_branch_f0261 +; f0311 + +Music_VioletCity_branch_f0311: ; f0311 + note G_, 2 + note __, 10 + note G_, 2 + note G_, 2 + note A_, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 3 + note E_, 4 + octave 2 + note A_, 4 + endchannel +; f031e + +Music_VioletCity_Ch4: ; f031e + 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: ; 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 +; f036c + +Music_VioletCity_branch_f036c: ; 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 +; f037a + +Music_VioletCity_branch_f037a: ; 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 +; f0386 + + diff --git a/crysaudio/music/viridiancity.asm b/crysaudio/music/viridiancity.asm new file mode 100644 index 00000000..82236a5f --- /dev/null +++ b/crysaudio/music/viridiancity.asm @@ -0,0 +1,800 @@ +Music_ViridianCity: ; f4000 + dbw $c0, Music_ViridianCity_Ch1 + dbw $01, Music_ViridianCity_Ch2 + dbw $02, Music_ViridianCity_Ch3 + dbw $03, Music_ViridianCity_Ch4 +; f400c + +Music_ViridianCity_Ch1: ; f400c + tempo 157 + volume $77 + stereopanning $f + dutycycle $2 + vibrato $12, $34 + notetype $c, $a7 + octave 3 + note F#, 1 + note __, 3 + note F#, 2 + note __, 4 + note F#, 2 + note __, 2 + note F#, 1 + note __, 1 + note F#, 4 + note __, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note A_, 2 + note __, 2 + note F#, 1 + note __, 1 + note F#, 1 + note __, 3 + note F#, 2 + note __, 4 + note F#, 2 + note __, 2 + note G_, 1 + note __, 1 + note __, 4 + note G_, 8 + note __, 4 +Music_ViridianCity_branch_f4039: ; f4039 + callchannel Music_ViridianCity_branch_f40c5 + note __, 4 + callchannel Music_ViridianCity_branch_f40c5 + octave 4 + note C_, 4 + callchannel Music_ViridianCity_branch_f410f + octave 4 + note B_, 2 + note G_, 2 + note D_, 2 + octave 3 + note B_, 2 + note F#, 2 + note E_, 2 + note F#, 1 + note __, 1 + note A_, 1 + note __, 3 + note F#, 2 + note A_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note __, 2 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note C#, 1 + note __, 1 + note F#, 1 + note __, 1 + intensity $87 + octave 5 + note F#, 4 + note F_, 4 + intensity $a7 + octave 3 + note G_, 6 + note B_, 8 + octave 4 + note E_, 2 + note __, 2 + note E_, 2 + octave 3 + note B_, 4 + note G_, 2 + note F#, 2 + note E_, 4 + note D_, 2 + octave 2 + note A_, 2 + octave 3 + note D_, 1 + note __, 1 + note F#, 1 + note __, 3 + note D_, 2 + note F#, 1 + note __, 1 + note A_, 1 + note __, 1 + note __, 2 + note F#, 2 + note A_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note D#, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 2 + callchannel Music_ViridianCity_branch_f410f + octave 4 + note A_, 2 + note G_, 2 + note D_, 2 + note G_, 2 + octave 3 + note F#, 2 + note E_, 2 + note F#, 1 + note __, 1 + note A_, 1 + note __, 3 + note F#, 2 + note A_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + note __, 2 + note E_, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 3 + note A_, 2 + note __, 2 + note F#, 2 + note G_, 6 + note B_, 1 + note __, 1 + octave 4 + note E_, 4 + note F#, 2 + note G_, 6 + note E_, 2 + note __, 2 + octave 3 + note G_, 2 + octave 4 + note E_, 2 + note __, 2 + note F#, 6 + note D_, 4 + octave 3 + note A_, 4 + note F#, 4 + note G_, 1 + note __, 3 + note G_, 8 + note A#, 4 + loopchannel 0, Music_ViridianCity_branch_f4039 +; f40c5 + +Music_ViridianCity_branch_f40c5: ; f40c5 + octave 3 + note A_, 1 + note __, 3 + note A_, 2 + note __, 4 + note A_, 2 + note __, 2 + note A_, 1 + note __, 1 + octave 4 + note C_, 4 + note __, 2 + octave 3 + note A_, 2 + note __, 2 + octave 4 + note C_, 2 + octave 3 + note A_, 1 + note __, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note B_, 1 + note __, 3 + note G_, 2 + note __, 4 + note G_, 2 + note __, 2 + octave 4 + note D_, 2 + note __, 2 + octave 3 + note B_, 2 + note __, 2 + note G_, 1 + note __, 1 + note G_, 4 + note __, 2 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 3 + note D_, 2 + note __, 4 + note D_, 2 + note __, 2 + note D_, 1 + note __, 1 + octave 3 + note G_, 4 + note __, 2 + octave 4 + note C#, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 4 + note C#, 1 + note __, 1 + octave 3 + note A_, 1 + note __, 3 + note F#, 2 + note __, 4 + note F#, 2 + note __, 2 + note G_, 1 + note __, 1 + note __, 4 + note G_, 8 + endchannel +; f410f + +Music_ViridianCity_branch_f410f: ; f410f + octave 3 + note B_, 2 + note D_, 2 + note G_, 1 + note __, 1 + note B_, 1 + note __, 3 + note G_, 2 + note B_, 1 + note __, 1 + octave 4 + note D_, 1 + note __, 1 + note __, 2 + octave 3 + note B_, 2 + octave 4 + note D_, 1 + note __, 1 + note G_, 1 + note __, 1 + endchannel +; f4125 + +Music_ViridianCity_Ch2: ; f4125 + vibrato $10, $46 + dutycycle $1 + notetype $c, $b7 + stereopanning $f0 + octave 2 + note D_, 4 + note __, 2 + note A_, 1 + note __, 1 + note A_, 4 + note __, 4 + note D_, 4 + note __, 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C#, 4 + octave 2 + note A_, 1 + note __, 1 + note D_, 4 + note __, 2 + note A_, 1 + note __, 1 + note A_, 4 + note __, 2 + note E_, 1 + note __, 1 + note __, 4 + note E_, 8 + note __, 4 +Music_ViridianCity_branch_f414c: ; f414c + callchannel Music_ViridianCity_branch_f41c0 + note __, 4 + callchannel Music_ViridianCity_branch_f41c0 + octave 2 + note F#, 4 + callchannel Music_ViridianCity_branch_f4201 + note G_, 4 + note __, 2 + octave 3 + note D_, 1 + note __, 1 + octave 2 + note G_, 1 + note __, 1 + octave 3 + note D_, 4 + octave 2 + note B_, 2 + callchannel Music_ViridianCity_branch_f420b + note __, 2 + note F#, 2 + note __, 2 + octave 3 + note C#, 1 + note __, 1 + note C#, 4 + note C_, 4 + callchannel Music_ViridianCity_branch_f4215 + note E_, 4 + note __, 2 + note B_, 1 + note __, 1 + note E_, 2 + note B_, 2 + note G_, 4 + note D_, 4 + note __, 2 + note A_, 1 + note __, 1 + note A_, 4 + note C_, 2 + note C#, 2 + note __, 2 + note D#, 2 + note A_, 1 + note __, 1 + octave 3 + note C_, 1 + note __, 1 + note D#, 2 + note C_, 2 + octave 2 + note A_, 2 + note F#, 2 + callchannel Music_ViridianCity_branch_f4201 + note G_, 4 + note __, 2 + note B_, 1 + note __, 1 + note G_, 1 + note __, 1 + note B_, 4 + note G_, 2 + callchannel Music_ViridianCity_branch_f420b + note __, 2 + note F#, 2 + note __, 2 + note A_, 2 + note __, 2 + octave 3 + note C_, 2 + note __, 2 + octave 2 + note D#, 2 + callchannel Music_ViridianCity_branch_f4215 + note E_, 4 + note __, 2 + note A#, 1 + note __, 1 + note A#, 4 + note __, 2 + note G_, 1 + note __, 1 + note D_, 4 + note __, 2 + note A_, 1 + note __, 1 + note A_, 4 + note __, 2 + note D_, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 8 + octave 1 + note A_, 4 + loopchannel 0, Music_ViridianCity_branch_f414c +; f41c0 + +Music_ViridianCity_branch_f41c0: ; f41c0 + octave 2 + note D_, 4 + note __, 2 + note A_, 1 + note __, 1 + note A_, 4 + note __, 4 + note D#, 4 + note __, 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 3 + note C_, 4 + octave 2 + note A_, 1 + note __, 1 + note E_, 4 + note __, 2 + note B_, 1 + note __, 1 + note B_, 4 + note __, 4 + note E_, 4 + note __, 2 + note B_, 1 + note __, 1 + note B_, 1 + note __, 1 + octave 3 + note D_, 4 + octave 2 + note B_, 1 + note __, 1 + note G_, 4 + note __, 2 + octave 3 + note D_, 1 + note __, 1 + note D_, 4 + note __, 4 + octave 2 + note A_, 4 + note __, 2 + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note G_, 4 + note E_, 1 + note __, 1 + octave 2 + note D_, 4 + note __, 2 + note A_, 1 + note __, 1 + note A_, 4 + note __, 2 + note E_, 1 + note __, 1 + note __, 4 + note E_, 8 + endchannel +; f4201 + +Music_ViridianCity_branch_f4201: ; f4201 + note G_, 4 + note __, 2 + octave 3 + note D_, 1 + note __, 1 + note D_, 4 + octave 2 + note F_, 2 + note F#, 2 + endchannel +; f420b + +Music_ViridianCity_branch_f420b: ; f420b + note F#, 4 + note __, 2 + octave 3 + note C#, 1 + note __, 1 + note C#, 4 + octave 2 + note E_, 2 + note F_, 2 + endchannel +; f4215 + +Music_ViridianCity_branch_f4215: ; f4215 + octave 2 + note E_, 4 + note __, 2 + note B_, 1 + note __, 1 + note B_, 4 + note D_, 2 + note D#, 2 + endchannel +; f421e + +Music_ViridianCity_Ch3: ; f421e + vibrato $12, $24 + notetype $c, $13 + stereopanning $ff + octave 4 + note A_, 1 + note __, 3 + note A_, 2 + note __, 4 + note A_, 2 + note __, 2 + note A_, 1 + note __, 1 + note A_, 4 + note __, 2 + octave 5 + note F#, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 4 + note A_, 1 + note __, 1 + note A_, 1 + note __, 3 + note A_, 2 + note __, 4 + note A_, 2 + note __, 2 + octave 5 + note D_, 1 + note __, 1 + note __, 4 + note D_, 8 + note F#, 2 + note G_, 2 +Music_ViridianCity_branch_f4246: ; f4246 + intensity $13 + callchannel Music_ViridianCity_branch_f42a2 + octave 5 + note F#, 2 + note G_, 2 + callchannel Music_ViridianCity_branch_f42a2 + note E_, 4 + vibrato $18, $25 + intensity $25 + note B_, 12 + note G_, 4 + octave 6 + note D_, 8 + note E_, 2 + note D_, 2 + note C#, 2 + octave 5 + note B_, 2 + note A_, 12 + note F#, 4 + note A_, 8 + note A_, 4 + note G#, 4 + note E_, 10 + note E_, 2 + note F#, 2 + note G_, 2 + note __, 2 + note G_, 2 + note F#, 4 + note E_, 4 + note G_, 4 + note F#, 12 + note D_, 4 + note A_, 4 + note __, 4 + octave 6 + note C_, 8 + octave 5 + note B_, 12 + octave 6 + note C#, 2 + note D_, 2 + note E_, 2 + note __, 2 + note D_, 2 + note __, 2 + note C#, 2 + note __, 2 + octave 5 + note B_, 2 + note __, 2 + note A_, 10 + note A_, 2 + note B_, 2 + octave 6 + note C_, 2 + note __, 2 + octave 5 + note B_, 2 + note __, 2 + note A_, 2 + note __, 2 + note F#, 2 + note __, 2 + note G_, 12 + note G_, 2 + note A_, 2 + note A#, 6 + note A_, 2 + note __, 2 + note G_, 2 + note A#, 2 + note __, 2 + note A_, 14 + note __, 4 + note D_, 1 + note __, 3 + note D_, 8 + note E_, 4 + loopchannel 0, Music_ViridianCity_branch_f4246 +; f42a2 + +Music_ViridianCity_branch_f42a2: ; f42a2 + octave 5 + note A_, 2 + note __, 2 + note G_, 2 + note __, 2 + note F#, 2 + note __, 6 + note __, 2 + note F#, 2 + note G_, 2 + note A_, 2 + note __, 2 + note A_, 2 + note G_, 2 + note F#, 2 + note G_, 2 + note E_, 2 + octave 4 + note B_, 2 + note __, 4 + note B_, 2 + note __, 2 + octave 5 + note G_, 2 + note __, 2 + note D_, 2 + note __, 2 + octave 4 + note B_, 1 + note __, 1 + note B_, 4 + octave 5 + note E_, 2 + note F#, 2 + note G_, 2 + note __, 2 + note F#, 2 + note __, 2 + note E_, 2 + note __, 6 + note __, 2 + note E_, 2 + note F#, 2 + note G_, 2 + note __, 2 + note G_, 2 + note F#, 2 + note E_, 2 + note F#, 2 + note D_, 2 + octave 4 + note A_, 2 + note __, 4 + note A_, 2 + note __, 2 + octave 5 + note D_, 1 + note __, 1 + note __, 4 + note D_, 8 + endchannel +; f42df + +Music_ViridianCity_Ch4: ; f42df + togglenoise $3 + notetype $c + callchannel Music_ViridianCity_branch_f431d + callchannel Music_ViridianCity_branch_f432c +Music_ViridianCity_branch_f42e9: ; f42e9 + callchannel Music_ViridianCity_branch_f431d + callchannel Music_ViridianCity_branch_f431d + 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 +; f431d + +Music_ViridianCity_branch_f431d: ; 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 +; f432c + +Music_ViridianCity_branch_f432c: ; 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 +; f433b + +Music_ViridianCity_branch_f433b: ; 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 +; f434b + +Music_ViridianCity_branch_f434b: ; 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 +; f435b + + diff --git a/crysaudio/music/wildpokemonvictory.asm b/crysaudio/music/wildpokemonvictory.asm new file mode 100644 index 00000000..df9adc22 --- /dev/null +++ b/crysaudio/music/wildpokemonvictory.asm @@ -0,0 +1,191 @@ +Music_WildPokemonVictory: ; f4518 + dbw $80, Music_WildPokemonVictory_Ch1 + dbw $01, Music_WildPokemonVictory_Ch2 + dbw $02, Music_WildPokemonVictory_Ch3 +; f4521 + +Music_WildPokemonVictory_Ch1: ; f4521 + ftempo 126 + volume $77 + dutycycle $3 + tone $0001 + notetype $c, $b1 + octave 3 + note B_, 1 + note A_, 1 + note G#, 1 + note F#, 1 + intensity $b6 + note E_, 12 +Music_SuccessfulCapture_branch_f4536: ; f4536 + stereopanning $f +Music_WildPokemonVictory_branch_f4538: ; f4538 + callchannel Music_WildPokemonVictory_branch_f455c + note F#, 2 + note F#, 2 + note F#, 4 + callchannel Music_WildPokemonVictory_branch_f455c + note G#, 4 + intensity $78 + octave 3 + note G_, 4 + forceoctave $1 + callchannel Music_WildPokemonVictory_branch_f455c + note F#, 2 + note F#, 2 + note F#, 4 + callchannel Music_WildPokemonVictory_branch_f455c + note G#, 4 + forceoctave $0 + intensity $78 + octave 3 + note F#, 4 + loopchannel 0, Music_WildPokemonVictory_branch_f4538 +; f455c + +Music_WildPokemonVictory_branch_f455c: ; f455c + intensity $71 + octave 3 + note G#, 1 + note B_, 1 + octave 4 + note E_, 2 + octave 3 + note B_, 2 + octave 4 + note E_, 2 + octave 3 + note G#, 1 + note F#, 1 + note E_, 1 + note F#, 1 + note G#, 2 + note E_, 2 + note A_, 1 + octave 4 + note C#, 1 + note E_, 2 + note E_, 2 + note A_, 2 + endchannel +; f4575 + +Music_WildPokemonVictory_Ch2: ; f4575 + vibrato $12, $24 + dutycycle $2 + notetype $c, $d1 + octave 4 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + intensity $d6 + note B_, 12 +Music_SuccessfulCapture_branch_f4585: ; f4585 + stereopanning $f0 +Music_WildPokemonVictory_branch_f4587: ; f4587 + callchannel Music_WildPokemonVictory_branch_f45b5 + octave 4 + note B_, 2 + note B_, 2 + note B_, 4 + callchannel Music_WildPokemonVictory_branch_f45b5 + octave 4 + note B_, 4 + intensity $81 + note C_, 1 + note E_, 1 + note G_, 1 + note A#, 1 + forceoctave $1 + callchannel Music_WildPokemonVictory_branch_f45b5 + octave 4 + note B_, 2 + note B_, 2 + note B_, 4 + callchannel Music_WildPokemonVictory_branch_f45b5 + octave 4 + note B_, 4 + forceoctave $0 + intensity $81 + octave 3 + note B_, 1 + octave 4 + note D#, 1 + note F#, 1 + note A_, 1 + loopchannel 0, Music_WildPokemonVictory_branch_f4587 +; f45b5 + +Music_WildPokemonVictory_branch_f45b5: ; f45b5 + intensity $81 + octave 4 + note B_, 2 + note A_, 2 + note G#, 2 + note A_, 2 + note B_, 2 + note B_, 2 + note B_, 4 + octave 5 + note C#, 2 + note C#, 2 + note C#, 4 + endchannel +; f45c4 + +Music_WildPokemonVictory_Ch3: ; f45c4 + notetype $c, $20 + note __, 6 + octave 6 + note D#, 1 + note __, 1 + note E_, 1 + note __, 3 + note E_, 1 + note __, 3 +Music_SuccessfulCapture_branch_f45cf: ; f45cf +Music_WildPokemonVictory_branch_f45cf: ; f45cf + callchannel Music_WildPokemonVictory_branch_f45f4 + note D#, 2 + note C#, 2 + octave 2 + note B_, 2 + note __, 2 + callchannel Music_WildPokemonVictory_branch_f45f4 + note E_, 2 + note __, 2 + note C_, 4 + forceoctave $1 + callchannel Music_WildPokemonVictory_branch_f45f4 + note D#, 2 + note C#, 2 + octave 2 + note B_, 2 + note __, 2 + callchannel Music_WildPokemonVictory_branch_f45f4 + note E_, 2 + note __, 2 + forceoctave $0 + octave 2 + note B_, 4 + loopchannel 0, Music_WildPokemonVictory_branch_f45cf +; f45f4 + +Music_WildPokemonVictory_branch_f45f4: ; f45f4 + intensity $25 + octave 3 + note E_, 2 + note __, 4 + note E_, 2 + note __, 2 + note D_, 2 + note __, 2 + note D_, 2 + note C#, 2 + note __, 4 + note C#, 2 + endchannel +; f4602 + + diff --git a/crysaudio/music_pointers.asm b/crysaudio/music_pointers.asm new file mode 100644 index 00000000..63fb8a3c --- /dev/null +++ b/crysaudio/music_pointers.asm @@ -0,0 +1,131 @@ +; See song sections in main.asm: +; Songs i +; Songs ii +; Songs iii +; Songs I +; Songs II +; Songs III +; Songs IV +; Songs V + +; e906e + dbw BANK(Music_Nothing), Music_Nothing ; 0xe91a3 + dbw BANK(Music_TitleScreen), Music_TitleScreen ; 0xeb808 + dbw BANK(Music_Route1), Music_Route1 ; 0xec000 + dbw BANK(Music_Route3), Music_Route3 ; 0xec2ca + dbw BANK(Music_Route12), Music_Route12 ; 0xec506 + dbw BANK(Music_MagnetTrain), Music_MagnetTrain ; 0xef5f0 + dbw BANK(Music_KantoGymBattle), Music_KantoGymBattle ; 0xec720 + dbw BANK(Music_KantoTrainerBattle), Music_KantoTrainerBattle ; 0xec9fa + dbw BANK(Music_KantoWildBattle), Music_KantoWildBattle ; 0xed06d + dbw BANK(Music_PokemonCenter), Music_PokemonCenter ; 0xed5c6 + dbw BANK(Music_LookHiker), Music_LookHiker ; 0xf7411 + dbw BANK(Music_LookLass), Music_LookLass ; 0xed79b + dbw BANK(Music_LookOfficer), Music_LookOfficer ; 0xed82d + dbw BANK(Music_HealPokemon), Music_HealPokemon ; 0xf0697 + dbw BANK(Music_LavenderTown), Music_LavenderTown ; 0xef72f + dbw BANK(Music_Route2), Music_Route2 ; 0xed8dd + dbw BANK(Music_MtMoon), Music_MtMoon ; 0xedb29 + dbw BANK(Music_ShowMeAround), Music_ShowMeAround ; 0xedbd8 + dbw BANK(Music_GameCorner), Music_GameCorner ; 0xedd6d + dbw BANK(Music_Bicycle), Music_Bicycle ; 0xee119 + dbw BANK(Music_HallOfFame), Music_HallOfFame ; 0xf05bf + dbw BANK(Music_ViridianCity), Music_ViridianCity ; 0xf4000 + dbw BANK(Music_CeladonCity), Music_CeladonCity ; 0xf435b + dbw BANK(Music_TrainerVictory), Music_TrainerVictory ; 0xebeab + dbw BANK(Music_WildPokemonVictory), Music_WildPokemonVictory ; 0xf4518 + dbw BANK(Music_GymLeaderVictory), Music_GymLeaderVictory ; 0xf462c + dbw BANK(Music_MtMoonSquare), Music_MtMoonSquare ; 0xf4815 + dbw BANK(Music_Gym), Music_Gym ; 0xf48ae + dbw BANK(Music_PalletTown), Music_PalletTown ; 0xf4b0c + dbw BANK(Music_ProfOaksPokemonTalk), Music_ProfOaksPokemonTalk ; 0xf4c9f + dbw BANK(Music_ProfOak), Music_ProfOak ; 0xf4dea + dbw BANK(Music_LookRival), Music_LookRival ; 0xf4f79 + dbw BANK(Music_AfterTheRivalFight), Music_AfterTheRivalFight ; 0xf5127 + dbw BANK(Music_Surf), Music_Surf ; 0xf518a + dbw BANK(Music_Evolution), Music_Evolution ; 0xf06e1 + dbw BANK(Music_NationalPark), Music_NationalPark ; 0xf54e8 + dbw BANK(Music_Credits), Music_Credits ; 0x1f31c + dbw BANK(Music_AzaleaTown), Music_AzaleaTown ; 0xf57e8 + dbw BANK(Music_CherrygroveCity), Music_CherrygroveCity ; 0xf5b03 + dbw BANK(Music_LookKimonoGirl), Music_LookKimonoGirl ; 0xf79b8 + dbw BANK(Music_UnionCave), Music_UnionCave ; 0xf5c60 + dbw BANK(Music_JohtoWildBattle), Music_JohtoWildBattle ; 0xf5dc5 + dbw BANK(Music_JohtoTrainerBattle), Music_JohtoTrainerBattle ; 0xf6096 + dbw BANK(Music_Route30), Music_Route30 ; 0xefc01 + dbw BANK(Music_EcruteakCity), Music_EcruteakCity ; 0xef2d0 + dbw BANK(Music_VioletCity), Music_VioletCity ; 0xf0000 + dbw BANK(Music_JohtoGymBattle), Music_JohtoGymBattle ; 0xea50d + dbw BANK(Music_ChampionBattle), Music_ChampionBattle ; 0xea9c1 + dbw BANK(Music_RivalBattle), Music_RivalBattle ; 0xe974f + dbw BANK(Music_RocketBattle), Music_RocketBattle ; 0xe9b6f + dbw BANK(Music_ElmsLab), Music_ElmsLab ; 0xea040 + dbw BANK(Music_DarkCave), Music_DarkCave ; 0xea2be + dbw BANK(Music_Route29), Music_Route29 ; 0xf0386 + dbw BANK(Music_Route36), Music_Route36 ; 0xe94e9 + dbw BANK(Music_SSAqua), Music_SSAqua ; 0xead99 + dbw BANK(Music_LookYoungster), Music_LookYoungster ; 0xf66c3 + dbw BANK(Music_LookBeauty), Music_LookBeauty ; 0xeee3e + dbw BANK(Music_LookRocket), Music_LookRocket ; 0xf74a2 + dbw BANK(Music_LookPokemaniac), Music_LookPokemaniac ; 0xebde1 + dbw BANK(Music_LookSage), Music_LookSage ; 0xee35e + dbw BANK(Music_NewBarkTown), Music_NewBarkTown ; 0xeb2d3 + dbw BANK(Music_GoldenrodCity), Music_GoldenrodCity ; 0xeb453 + dbw BANK(Music_VermilionCity), Music_VermilionCity ; 0xeb676 + dbw BANK(Music_PokemonChannel), Music_PokemonChannel ; 0xee45f + dbw BANK(Music_PokeFluteChannel), Music_PokeFluteChannel ; 0xf7b13 + dbw BANK(Music_TinTower), Music_TinTower ; 0xf6811 + dbw BANK(Music_SproutTower), Music_SproutTower ; 0xf6974 + dbw BANK(Music_BurnedTower), Music_BurnedTower ; 0xf6a99 + dbw BANK(Music_Lighthouse), Music_Lighthouse ; 0xee569 + dbw BANK(Music_LakeOfRage), Music_LakeOfRage ; 0xee6c5 + dbw BANK(Music_IndigoPlateau), Music_IndigoPlateau ; 0xee852 + dbw BANK(Music_Route37), Music_Route37 ; 0xee94b + dbw BANK(Music_RocketHideout), Music_RocketHideout ; 0xeeb75 + dbw BANK(Music_DragonsDen), Music_DragonsDen ; 0xeece8 + dbw BANK(Music_JohtoWildBattleNight), Music_JohtoWildBattleNight ; 0xf605c + dbw BANK(Music_RuinsOfAlphRadio), Music_RuinsOfAlphRadio ; 0xeedcb + dbw BANK(Music_SuccessfulCapture), Music_SuccessfulCapture ; 0xf4602 + dbw BANK(Music_Route26), Music_Route26 ; 0xeefb2 + dbw BANK(Music_Mom), Music_Mom ; 0xf6bf2 + dbw BANK(Music_VictoryRoad), Music_VictoryRoad ; 0xf6c72 + dbw BANK(Music_PokemonLullaby), Music_PokemonLullaby ; 0xf6d79 + dbw BANK(Music_PokemonMarch), Music_PokemonMarch ; 0xf6e23 + dbw BANK(Music_GoldSilverOpening), Music_GoldSilverOpening ; 0xf7055 + dbw BANK(Music_GoldSilverOpening2), Music_GoldSilverOpening2 ; 0xf7308 + dbw BANK(Music_MainMenu), Music_MainMenu ; 0xf78fd + dbw BANK(Music_RuinsOfAlphInterior), Music_RuinsOfAlphInterior ; 0xebd9e + dbw BANK(Music_RocketTheme), Music_RocketTheme ; 0xf766d + dbw BANK(Music_DancingHall), Music_DancingHall ; 0xef9bc + dbw BANK(Music_ContestResults), Music_ContestResults ; 0xefb3e + dbw BANK(Music_BugCatchingContest), Music_BugCatchingContest ; 0xf7c16 + dbw BANK(Music_LakeOfRageRocketRadio), Music_LakeOfRageRocketRadio ; 0xef5b1 + dbw BANK(Music_Printer), Music_Printer ; 0xf07fd + dbw BANK(Music_PostCredits), Music_PostCredits ; 0xcfd9e + +; Crystal adds the following songs: + + dbw BANK(Music_Clair), Music_Clair ; 0x1fa8d + dbw BANK(Music_MobileAdapterMenu), Music_MobileAdapterMenu ; 0x17801f + dbw BANK(Music_MobileAdapter), Music_MobileAdapter ; 0x1fc87 + dbw BANK(Music_BuenasPassword), Music_BuenasPassword ; 0x178153 + dbw BANK(Music_LookMysticalMan), Music_LookMysticalMan ; 0x17843b + dbw BANK(Music_CrystalOpening), Music_CrystalOpening ; 0x1786e8 + dbw BANK(Music_BattleTowerTheme), Music_BattleTowerTheme ; 0x178889 + dbw BANK(Music_SuicuneBattle), Music_SuicuneBattle ; 0x178b81 + dbw BANK(Music_BattleTowerLobby), Music_BattleTowerLobby ; 0x17948b + dbw BANK(Music_MobileCenter), Music_MobileCenter ; 0x17961d + +;Remixes and custom songs: + + dbw BANK(Music_JohtoGSC), Music_JohtoGSC + dbw BANK(Music_CeruleanGSC), Music_CeruleanGSC + dbw BANK(Music_CinnabarGSC), Music_CinnabarGSC + dbw BANK(Music_NuggetBridge), Music_NuggetBridge + dbw BANK(Music_Shop), Music_Shop + dbw BANK(Music_PokeathelonFinal), Music_PokeathelonFinal + dbw BANK(Music_PokeRadar), Music_PokeRadar + dbw BANK(Music_NaljoWildBattle), Music_NaljoWildBattle + dbw BANK(Music_NaljoGymBattle), Music_NaljoGymBattle + dbw BANK(Music_PalletBattle), Music_PalletBattle + diff --git a/crysaudio/music_pointers2.asm b/crysaudio/music_pointers2.asm new file mode 100644 index 00000000..03c58930 --- /dev/null +++ b/crysaudio/music_pointers2.asm @@ -0,0 +1,130 @@ +; See song sections in main.asm: +; Songs i +; Songs ii +; Songs iii +; Songs I +; Songs II +; Songs III +; Songs IV +; Songs V + +; e906e + dbw BANK(Music_Nothing), Music_Nothing ; 0xe91a3 + dbw BANK(Music_RBYTitleScreen), Music_RBYTitleScreen ; 0xeb808 + dbw BANK(Music_Routes1), Music_Routes1 ; 0xec000 + dbw BANK(Music_Routes3), Music_Routes3 ; 0xec2ca + dbw BANK(Music_Routes4), Music_Routes4 ; 0xec506 + dbw BANK(Music_MagnetTrain), Music_MagnetTrain ; unchanged + dbw BANK(Music_GymLeaderBattle), Music_GymLeaderBattle ; 0xec720 + dbw BANK(Music_TrainerBattle), Music_TrainerBattle ; 0xec9fa + dbw BANK(Music_WildBattle), Music_WildBattle ; 0xed06d + dbw BANK(Music_PokemonCenter), Music_PokemonCenter ; unchanged + dbw BANK(Music_LookHiker), Music_LookHiker ; unchanged + dbw BANK(Music_LookLass), Music_LookLass ; unchanged + dbw BANK(Music_LookOfficer), Music_LookOfficer ; unchanged + dbw BANK(Music_HealPokemon), Music_HealPokemon ; unchanged + dbw BANK(Music_Lavender), Music_Lavender ; 0xef72f + dbw BANK(Music_Dungeon2), Music_Dungeon2 ; 0xed8dd + dbw BANK(Music_Dungeon3), Music_Dungeon3 ; 0xedb29 + dbw BANK(Music_MuseumGuy), Music_MuseumGuy ; 0xedbd8 + dbw BANK(Music_RBYGameCorner), Music_RBYGameCorner ; 0xedd6d + dbw BANK(Music_BikeRiding), Music_BikeRiding ; 0xee119 + dbw BANK(Music_HallOfFame), Music_HallOfFame ; unchanged + dbw BANK(Music_Cities1), Music_Cities1 ; 0xf4000 + dbw BANK(Music_Celadon), Music_Celadon ; 0xf435b + dbw BANK(Music_TrainerVictory), Music_TrainerVictory ; unchanged + dbw BANK(Music_WildPokemonVictory), Music_WildPokemonVictory ; unchanged + dbw BANK(Music_GymLeaderVictory), Music_GymLeaderVictory ; unchanged + dbw BANK(Music_MtMoonSquare), Music_MtMoonSquare ; unchanged + dbw BANK(Music_RBYGym), Music_RBYGym ; 0xf48ae + dbw BANK(Music_RBYPalletTown), Music_RBYPalletTown ; 0xf4b0c + dbw BANK(Music_OaksLab), Music_OaksLab ; 0xf4c9f + dbw BANK(Music_MeetProfOak), Music_MeetProfOak ; 0xf4dea + dbw BANK(Music_LookRival), Music_LookRival ; unchanged + dbw BANK(Music_AfterTheRivalFight), Music_AfterTheRivalFight ; unchanged + dbw BANK(Music_Surf), Music_Surf ; unchanged + dbw BANK(Music_Evolution), Music_Evolution ; unchanged + dbw BANK(Music_NationalPark), Music_NationalPark ; 0xf54e8 + dbw BANK(Music_Credits), Music_Credits ; 0x1f31c + dbw BANK(Music_AzaleaTown), Music_AzaleaTown ; 0xf57e8 + dbw BANK(Music_CherrygroveCity), Music_CherrygroveCity ; 0xf5b03 + dbw BANK(Music_LookKimonoGirl), Music_LookKimonoGirl ; 0xf79b8 + dbw BANK(Music_UnionCave), Music_UnionCave ; 0xf5c60 + dbw BANK(Music_SinnohWildBattle), Music_SinnohWildBattle ; 0xf5dc5 + dbw BANK(Music_SinnohTrainerBattle), Music_SinnohTrainerBattle ; 0xf6096 + dbw BANK(Music_Route206), Music_Route206 ; 0xefc01 + dbw BANK(Music_EcruteakCity), Music_EcruteakCity ; 0xef2d0 + dbw BANK(Music_VioletCity), Music_VioletCity ; 0xf0000 + dbw BANK(Music_JohtoGymBattle), Music_JohtoGymBattle ; 0xea50d + dbw BANK(Music_ChampionBattle), Music_ChampionBattle ; 0xea9c1 + dbw BANK(Music_RivalBattle), Music_RivalBattle ; 0xe974f + dbw BANK(Music_RocketBattle), Music_RocketBattle ; 0xe9b6f + dbw BANK(Music_ElmsLab), Music_ElmsLab ; 0xea040 + dbw BANK(Music_DarkCave), Music_DarkCave ; 0xea2be + dbw BANK(Music_Route29), Music_Route29 ; 0xf0386 + dbw BANK(Music_Route36), Music_Route36 ; 0xe94e9 + dbw BANK(Music_SSAqua), Music_SSAqua ; 0xead99 + dbw BANK(Music_LookYoungster), Music_LookYoungster ; 0xf66c3 + dbw BANK(Music_LookBeauty), Music_LookBeauty ; 0xeee3e + dbw BANK(Music_LookRocket), Music_LookRocket ; 0xf74a2 + dbw BANK(Music_LookPokemaniac), Music_LookPokemaniac ; 0xebde1 + dbw BANK(Music_LookSage), Music_LookSage ; 0xee35e + dbw BANK(Music_NewBarkTown), Music_NewBarkTown ; 0xeb2d3 + dbw BANK(Music_JubilifeCity), Music_JubilifeCity ; 0xeb453 + dbw BANK(Music_Vermilion), Music_Vermilion ; 0xeb676 + dbw BANK(Music_PokemonChannel), Music_PokemonChannel ; 0xee45f + dbw BANK(Music_PokeFluteChannel), Music_PokeFluteChannel ; 0xf7b13 + dbw BANK(Music_TinTower), Music_TinTower ; 0xf6811 + dbw BANK(Music_SproutTower), Music_SproutTower ; 0xf6974 + dbw BANK(Music_BurnedTower), Music_BurnedTower ; 0xf6a99 + dbw BANK(Music_Lighthouse), Music_Lighthouse ; 0xee569 + dbw BANK(Music_LakeOfRage), Music_LakeOfRage ; 0xee6c5 + dbw BANK(Music_IndigoPlateau), Music_IndigoPlateau ; unchanged + dbw BANK(Music_Route37), Music_Route37 ; 0xee94b + dbw BANK(Music_RocketHideout), Music_RocketHideout ; 0xeeb75 + dbw BANK(Music_DragonsDen), Music_DragonsDen ; 0xeece8 + dbw BANK(Music_SinnohWildBattle), Music_SinnohWildBattle ; 0xf605c + dbw BANK(Music_RuinsOfAlphRadio), Music_RuinsOfAlphRadio ; 0xeedcb + dbw BANK(Music_SuccessfulCapture), Music_SuccessfulCapture ; 0xf4602 + dbw BANK(Music_Route26), Music_Route26 ; 0xeefb2 + dbw BANK(Music_Mom), Music_Mom ; 0xf6bf2 + dbw BANK(Music_VictoryRoad), Music_VictoryRoad ; 0xf6c72 + dbw BANK(Music_PokemonLullaby), Music_PokemonLullaby ; 0xf6d79 + dbw BANK(Music_PokemonMarch), Music_PokemonMarch ; 0xf6e23 + dbw BANK(Music_GoldSilverOpening), Music_GoldSilverOpening ; 0xf7055 + dbw BANK(Music_GoldSilverOpening2), Music_GoldSilverOpening2 ; 0xf7308 + dbw BANK(Music_MainMenu), Music_MainMenu ; 0xf78fd + dbw BANK(Music_RuinsOfAlphInterior), Music_RuinsOfAlphInterior ; 0xebd9e + dbw BANK(Music_RocketTheme), Music_RocketTheme ; 0xf766d + dbw BANK(Music_DancingHall), Music_DancingHall ; 0xef9bc + dbw BANK(Music_ContestResults), Music_ContestResults ; 0xefb3e + dbw BANK(Music_BugCatchingContest), Music_BugCatchingContest ; 0xf7c16 + dbw BANK(Music_LakeOfRageRocketRadio), Music_LakeOfRageRocketRadio ; 0xef5b1 + dbw BANK(Music_Printer), Music_Printer ; 0xf07fd + dbw BANK(Music_PostCredits), Music_PostCredits ; 0xcfd9e + +; Crystal adds the following songs: + + dbw BANK(Music_Clair), Music_Clair ; 0x1fa8d + dbw BANK(Music_MobileAdapterMenu), Music_MobileAdapterMenu ; 0x17801f + dbw BANK(Music_MobileAdapter), Music_MobileAdapter ; 0x1fc87 + dbw BANK(Music_BuenasPassword), Music_BuenasPassword ; 0x178153 + dbw BANK(Music_LookMysticalMan), Music_LookMysticalMan ; 0x17843b + dbw BANK(Music_CrystalOpening), Music_CrystalOpening ; 0x1786e8 + dbw BANK(Music_BattleTowerTheme), Music_BattleTowerTheme ; 0x178889 + dbw BANK(Music_SuicuneBattle), Music_SuicuneBattle ; 0x178b81 + dbw BANK(Music_BattleTowerLobby), Music_BattleTowerLobby ; 0x17948b + dbw BANK(Music_MobileCenter), Music_MobileCenter ; 0x17961d + +;Remixes and custom songs: + + dbw BANK(Music_JohtoGSC), Music_JohtoGSC + dbw BANK(Music_CeruleanGSC), Music_CeruleanGSC + dbw BANK(Music_CinnabarGSC), Music_CinnabarGSC + dbw BANK(Music_NuggetBridge), Music_NuggetBridge + dbw BANK(Music_Shop), Music_Shop + dbw BANK(Music_PokeathelonFinal), Music_PokeathelonFinal + dbw BANK(Music_PokeRadar), Music_PokeRadar + dbw BANK(Music_NaljoWildBattle), Music_NaljoWildBattle + dbw BANK(Music_NaljoGymBattle), Music_NaljoGymBattle + dbw BANK(Music_PalletBattle), Music_PalletBattle diff --git a/crysaudio/music_pointers_music_test.asm b/crysaudio/music_pointers_music_test.asm new file mode 100644 index 00000000..b39a3e1c --- /dev/null +++ b/crysaudio/music_pointers_music_test.asm @@ -0,0 +1,272 @@ +; See song sections in main.asm: +; Songs i +; Songs ii +; Songs iii +; Songs I +; Songs II +; Songs III +; Songs IV +; Songs V + +; e906e + dbw BANK(Music_Nothing), Music_Nothing ; 0xe91a3 + dbw BANK(Music_TitleScreen), Music_TitleScreen ; 0xeb808 + dbw BANK(Music_Route1), Music_Route1 ; 0xec000 + dbw BANK(Music_Route3), Music_Route3 ; 0xec2ca + dbw BANK(Music_Route12), Music_Route12 ; 0xec506 + dbw BANK(Music_MagnetTrain), Music_MagnetTrain ; 0xef5f0 + dbw BANK(Music_KantoGymBattle), Music_KantoGymBattle ; 0xec720 + dbw BANK(Music_KantoTrainerBattle), Music_KantoTrainerBattle ; 0xec9fa + dbw BANK(Music_KantoWildBattle), Music_KantoWildBattle ; 0xed06d + dbw BANK(Music_PokemonCenter), Music_PokemonCenter ; 0xed5c6 + dbw BANK(Music_LookHiker), Music_LookHiker ; 0xf7411 + dbw BANK(Music_LookLass), Music_LookLass ; 0xed79b + dbw BANK(Music_LookOfficer), Music_LookOfficer ; 0xed82d + dbw BANK(Music_HealPokemon), Music_HealPokemon ; 0xf0697 + dbw BANK(Music_LavenderTown), Music_LavenderTown ; 0xef72f + dbw BANK(Music_Route2), Music_Route2 ; 0xed8dd + dbw BANK(Music_MtMoon), Music_MtMoon ; 0xedb29 + dbw BANK(Music_ShowMeAround), Music_ShowMeAround ; 0xedbd8 + dbw BANK(Music_GameCorner), Music_GameCorner ; 0xedd6d + dbw BANK(Music_Bicycle), Music_Bicycle ; 0xee119 + dbw BANK(Music_HallOfFame), Music_HallOfFame ; 0xf05bf + dbw BANK(Music_ViridianCity), Music_ViridianCity ; 0xf4000 + dbw BANK(Music_CeladonCity), Music_CeladonCity ; 0xf435b + dbw BANK(Music_TrainerVictory), Music_TrainerVictory ; 0xebeab + dbw BANK(Music_WildPokemonVictory), Music_WildPokemonVictory ; 0xf4518 + dbw BANK(Music_GymLeaderVictory), Music_GymLeaderVictory ; 0xf462c + dbw BANK(Music_MtMoonSquare), Music_MtMoonSquare ; 0xf4815 + dbw BANK(Music_Gym), Music_Gym ; 0xf48ae + dbw BANK(Music_PalletTown), Music_PalletTown ; 0xf4b0c + dbw BANK(Music_ProfOaksPokemonTalk), Music_ProfOaksPokemonTalk ; 0xf4c9f + dbw BANK(Music_ProfOak), Music_ProfOak ; 0xf4dea + dbw BANK(Music_LookRival), Music_LookRival ; 0xf4f79 + dbw BANK(Music_AfterTheRivalFight), Music_AfterTheRivalFight ; 0xf5127 + dbw BANK(Music_Surf), Music_Surf ; 0xf518a + dbw BANK(Music_Evolution), Music_Evolution ; 0xf06e1 + dbw BANK(Music_NationalPark), Music_NationalPark ; 0xf54e8 + dbw BANK(Music_Credits), Music_Credits ; 0x1f31c + dbw BANK(Music_AzaleaTown), Music_AzaleaTown ; 0xf57e8 + dbw BANK(Music_CherrygroveCity), Music_CherrygroveCity ; 0xf5b03 + dbw BANK(Music_LookKimonoGirl), Music_LookKimonoGirl ; 0xf79b8 + dbw BANK(Music_UnionCave), Music_UnionCave ; 0xf5c60 + dbw BANK(Music_JohtoWildBattle), Music_JohtoWildBattle ; 0xf5dc5 + dbw BANK(Music_JohtoTrainerBattle), Music_JohtoTrainerBattle ; 0xf6096 + dbw BANK(Music_Route30), Music_Route30 ; 0xefc01 + dbw BANK(Music_EcruteakCity), Music_EcruteakCity ; 0xef2d0 + dbw BANK(Music_VioletCity), Music_VioletCity ; 0xf0000 + dbw BANK(Music_JohtoGymBattle), Music_JohtoGymBattle ; 0xea50d + dbw BANK(Music_ChampionBattle), Music_ChampionBattle ; 0xea9c1 + dbw BANK(Music_RivalBattle), Music_RivalBattle ; 0xe974f + dbw BANK(Music_RocketBattle), Music_RocketBattle ; 0xe9b6f + dbw BANK(Music_ElmsLab), Music_ElmsLab ; 0xea040 + dbw BANK(Music_DarkCave), Music_DarkCave ; 0xea2be + dbw BANK(Music_Route29), Music_Route29 ; 0xf0386 + dbw BANK(Music_Route36), Music_Route36 ; 0xe94e9 + dbw BANK(Music_SSAqua), Music_SSAqua ; 0xead99 + dbw BANK(Music_LookYoungster), Music_LookYoungster ; 0xf66c3 + dbw BANK(Music_LookBeauty), Music_LookBeauty ; 0xeee3e + dbw BANK(Music_LookRocket), Music_LookRocket ; 0xf74a2 + dbw BANK(Music_LookPokemaniac), Music_LookPokemaniac ; 0xebde1 + dbw BANK(Music_LookSage), Music_LookSage ; 0xee35e + dbw BANK(Music_NewBarkTown), Music_NewBarkTown ; 0xeb2d3 + dbw BANK(Music_GoldenrodCity), Music_GoldenrodCity ; 0xeb453 + dbw BANK(Music_VermilionCity), Music_VermilionCity ; 0xeb676 + dbw BANK(Music_PokemonChannel), Music_PokemonChannel ; 0xee45f + dbw BANK(Music_PokeFluteChannel), Music_PokeFluteChannel ; 0xf7b13 + dbw BANK(Music_TinTower), Music_TinTower ; 0xf6811 + dbw BANK(Music_SproutTower), Music_SproutTower ; 0xf6974 + dbw BANK(Music_BurnedTower), Music_BurnedTower ; 0xf6a99 + dbw BANK(Music_Lighthouse), Music_Lighthouse ; 0xee569 + dbw BANK(Music_LakeOfRage), Music_LakeOfRage ; 0xee6c5 + dbw BANK(Music_IndigoPlateau), Music_IndigoPlateau ; 0xee852 + dbw BANK(Music_Route37), Music_Route37 ; 0xee94b + dbw BANK(Music_RocketHideout), Music_RocketHideout ; 0xeeb75 + dbw BANK(Music_DragonsDen), Music_DragonsDen ; 0xeece8 + dbw BANK(Music_JohtoWildBattleNight), Music_JohtoWildBattleNight ; 0xf605c + dbw BANK(Music_RuinsOfAlphRadio), Music_RuinsOfAlphRadio ; 0xeedcb + dbw BANK(Music_SuccessfulCapture), Music_SuccessfulCapture ; 0xf4602 + dbw BANK(Music_Route26), Music_Route26 ; 0xeefb2 + dbw BANK(Music_Mom), Music_Mom ; 0xf6bf2 + dbw BANK(Music_VictoryRoad), Music_VictoryRoad ; 0xf6c72 + dbw BANK(Music_PokemonLullaby), Music_PokemonLullaby ; 0xf6d79 + dbw BANK(Music_PokemonMarch), Music_PokemonMarch ; 0xf6e23 + dbw BANK(Music_GoldSilverOpening), Music_GoldSilverOpening ; 0xf7055 + dbw BANK(Music_GoldSilverOpening2), Music_GoldSilverOpening2 ; 0xf7308 + dbw BANK(Music_MainMenu), Music_MainMenu ; 0xf78fd + dbw BANK(Music_RuinsOfAlphInterior), Music_RuinsOfAlphInterior ; 0xebd9e + dbw BANK(Music_RocketTheme), Music_RocketTheme ; 0xf766d + dbw BANK(Music_DancingHall), Music_DancingHall ; 0xef9bc + dbw BANK(Music_ContestResults), Music_ContestResults ; 0xefb3e + dbw BANK(Music_BugCatchingContest), Music_BugCatchingContest ; 0xf7c16 + dbw BANK(Music_LakeOfRageRocketRadio), Music_LakeOfRageRocketRadio ; 0xef5b1 + dbw BANK(Music_Printer), Music_Printer ; 0xf07fd + dbw BANK(Music_PostCredits), Music_PostCredits ; 0xcfd9e + +; Crystal adds the following songs: + + dbw BANK(Music_Clair), Music_Clair ; 0x1fa8d + dbw BANK(Music_MobileAdapterMenu), Music_MobileAdapterMenu ; 0x17801f + dbw BANK(Music_MobileAdapter), Music_MobileAdapter ; 0x1fc87 + dbw BANK(Music_BuenasPassword), Music_BuenasPassword ; 0x178153 + dbw BANK(Music_LookMysticalMan), Music_LookMysticalMan ; 0x17843b + dbw BANK(Music_CrystalOpening), Music_CrystalOpening ; 0x1786e8 + dbw BANK(Music_BattleTowerTheme), Music_BattleTowerTheme ; 0x178889 + dbw BANK(Music_SuicuneBattle), Music_SuicuneBattle ; 0x178b81 + dbw BANK(Music_BattleTowerLobby), Music_BattleTowerLobby ; 0x17948b + dbw BANK(Music_MobileCenter), Music_MobileCenter ; 0x17961d + +; RBY songs: + + dbw BANK(Music_IntroBattle), Music_IntroBattle + dbw BANK(Music_YellowIntro), Music_YellowIntro + dbw BANK(Music_RBYTitleScreen), Music_RBYTitleScreen + dbw BANK(Music_Routes2), Music_Routes2 + dbw BANK(Music_RBYPalletTown), Music_RBYPalletTown + dbw BANK(Music_MeetProfOak), Music_MeetProfOak + dbw BANK(Music_OaksLab), Music_OaksLab + dbw BANK(Music_MeetRival), Music_MeetRival + dbw BANK(Music_FarewellRival), Music_FarewellRival + dbw BANK(Music_Routes1), Music_Routes1 + dbw BANK(Music_Cities1), Music_Cities1 + dbw BANK(Music_Pokecenter), Music_Pokecenter + dbw BANK(Music_PkmnHealed), Music_PkmnHealed + dbw BANK(Music_Dungeon2), Music_Dungeon2 + dbw BANK(Music_MuseumGuy), Music_MuseumGuy + dbw BANK(Music_RBYGym), Music_RBYGym + dbw BANK(Music_JigglypuffSong), Music_JigglypuffSong + dbw BANK(Music_Routes3), Music_Routes3 + dbw BANK(Music_Dungeon3), Music_Dungeon3 + dbw BANK(Music_MeetJessieJames), Music_MeetJessieJames + dbw BANK(Music_Cities2), Music_Cities2 + dbw BANK(Music_Vermilion), Music_Vermilion + dbw BANK(Music_SSAnne), Music_SSAnne + dbw BANK(Music_Routes4), Music_Routes4 + dbw BANK(Music_Lavender), Music_Lavender + dbw BANK(Music_PokemonTower), Music_PokemonTower + dbw BANK(Music_Celadon), Music_Celadon + dbw BANK(Music_RBYGameCorner), Music_RBYGameCorner + dbw BANK(Music_Dungeon1), Music_Dungeon1 + dbw BANK(Music_BikeRiding), Music_BikeRiding + dbw BANK(Music_SafariZone), Music_SafariZone + dbw BANK(Music_SurfingPikachu), Music_SurfingPikachu + dbw BANK(Music_SilphCo), Music_SilphCo + dbw BANK(Music_Surfing), Music_Surfing + dbw BANK(Music_Cinnabar), Music_Cinnabar + dbw BANK(Music_CinnabarMansion), Music_CinnabarMansion + dbw BANK(Music_RBYIndigoPlateau), Music_RBYIndigoPlateau + dbw BANK(Music_RBYHallOfFame), Music_RBYHallOfFame + dbw BANK(Music_RBYCredits), Music_RBYCredits + dbw BANK(Music_MeetMaleTrainer), Music_MeetMaleTrainer + dbw BANK(Music_MeetFemaleTrainer), Music_MeetFemaleTrainer + dbw BANK(Music_MeetEvilTrainer), Music_MeetEvilTrainer + dbw BANK(Music_WildBattle), Music_WildBattle ; 0xec9fa + dbw BANK(Music_TrainerBattle), Music_TrainerBattle ; 0xec9fa + dbw BANK(Music_GymLeaderBattle), Music_GymLeaderBattle ; 0xec9fa + dbw BANK(Music_FinalBattle), Music_FinalBattle ; 0xec9fa + dbw BANK(Music_DefeatedWildMon), Music_DefeatedWildMon + dbw BANK(Music_DefeatedTrainer), Music_DefeatedTrainer + dbw BANK(Music_DefeatedGymLeader), Music_DefeatedGymLeader + dbw BANK(Music_UnusedSong), Music_UnusedSong + dbw BANK(Music_YellowUnusedSong), Music_YellowUnusedSong + +;Diamond and Pearl + dbw BANK(Music_SinnohWildBattle), Music_SinnohWildBattle + dbw BANK(Music_SinnohTrainerBattle), Music_SinnohTrainerBattle + dbw BANK(Music_JubilifeCity), Music_JubilifeCity + dbw BANK(Music_Route206), Music_Route206 + dbw BANK(Music_PokeRadar), Music_PokeRadar + +;Remixes and custom songs: + + dbw BANK(Music_CeruleanGSC), Music_CeruleanGSC + dbw BANK(Music_CinnabarGSC), Music_CinnabarGSC + dbw BANK(Music_CinnabarRemix), Music_CinnabarRemix + dbw BANK(Music_NuggetBridge), Music_NuggetBridge + dbw BANK(Music_Shop), Music_Shop + dbw BANK(Music_PokeathelonFinal), Music_PokeathelonFinal + dbw BANK(Music_JohtoGSC), Music_JohtoGSC + dbw BANK(Music_KantoGymLeaderRemix), Music_KantoGymLeaderRemix + dbw BANK(Music_NaljoWildBattle), Music_NaljoWildBattle + dbw BANK(Music_NaljoGymBattle), Music_NaljoGymBattle + dbw BANK(Music_PalletBattle), Music_PalletBattle + +; TCG songs: + + dbw BANK(Music_TCGTitleScreen), Music_TCGTitleScreen + dbw BANK(Music_TCGDuelTheme1), Music_TCGDuelTheme1 + dbw BANK(Music_TCGDuelTheme2), Music_TCGDuelTheme2 + dbw BANK(Music_TCGDuelTheme3), Music_TCGDuelTheme3 + dbw BANK(Music_TCGPauseMenu), Music_TCGPauseMenu + dbw BANK(Music_TCGPCMainMenu), Music_TCGPCMainMenu + dbw BANK(Music_TCGDeckMachine), Music_TCGDeckMachine + dbw BANK(Music_TCGCardPop), Music_TCGCardPop + dbw BANK(Music_TCGOverworld), Music_TCGOverworld + dbw BANK(Music_TCGPokemonDome), Music_TCGPokemonDome + dbw BANK(Music_TCGChallengeHall), Music_TCGChallengeHall + dbw BANK(Music_TCGClub1), Music_TCGClub1 + dbw BANK(Music_TCGClub2), Music_TCGClub2 + dbw BANK(Music_TCGClub3), Music_TCGClub3 + dbw BANK(Music_TCGRonald), Music_TCGRonald + dbw BANK(Music_TCGImakuni), Music_TCGImakuni + dbw BANK(Music_TCGHallOfHonor), Music_TCGHallOfHonor + dbw BANK(Music_TCGCredits), Music_TCGCredits + dbw BANK(Music_TCGMatchStart1), Music_TCGMatchStart1 + dbw BANK(Music_TCGMatchStart2), Music_TCGMatchStart2 + dbw BANK(Music_TCGMatchStart3), Music_TCGMatchStart3 + dbw BANK(Music_TCGMatchVictory), Music_TCGMatchVictory + dbw BANK(Music_TCGMatchLoss), Music_TCGMatchLoss + dbw BANK(Music_TCGDarkDiddly), Music_TCGDarkDiddly + dbw BANK(Music_TCGBoosterPack), Music_TCGBoosterPack + dbw BANK(Music_TCGMedal), Music_TCGMedal + +; TCG2 songs: + + dbw BANK(Music_TCG2TitleScreen), Music_TCG2TitleScreen + dbw BANK(Music_TCG2HereComesGR), Music_TCG2HereComesGR + dbw BANK(Music_TCG2GROverworld), Music_TCG2GROverworld + dbw BANK(Music_TCG2Fort1), Music_TCG2Fort1 + dbw BANK(Music_TCG2Fort2), Music_TCG2Fort2 + dbw BANK(Music_TCG2Fort3), Music_TCG2Fort3 + dbw BANK(Music_TCG2Fort4), Music_TCG2Fort4 + dbw BANK(Music_TCG2GRCastle), Music_TCG2GRCastle + dbw BANK(Music_TCG2GRChallengeCup), Music_TCG2GRChallengeCup + dbw BANK(Music_TCG2GameCorner), Music_TCG2GameCorner + dbw BANK(Music_TCG2GRBlimp), Music_TCG2GRBlimp + dbw BANK(Music_TCG2GRDuelTheme1), Music_TCG2GRDuelTheme1 + dbw BANK(Music_TCG2GRDuelTheme2), Music_TCG2GRDuelTheme2 + dbw BANK(Music_TCG2GRDuelTheme3), Music_TCG2GRDuelTheme3 + dbw BANK(Music_TCG2Ishihara), Music_TCG2Ishihara + dbw BANK(Music_TCG2Imakuni2), Music_TCG2Imakuni2 + dbw BANK(Music_TCG2Credits), Music_TCG2Credits + dbw BANK(Music_TCG2Diddly1), Music_TCG2Diddly1 + dbw BANK(Music_TCG2Diddly2), Music_TCG2Diddly2 + dbw BANK(Music_TCG2Diddly3), Music_TCG2Diddly3 + dbw BANK(Music_TCG2Diddly4), Music_TCG2Diddly4 + dbw BANK(Music_TCG2Diddly5), Music_TCG2Diddly5 + dbw BANK(Music_TCG2Diddly6), Music_TCG2Diddly6 + +; Pinball songs: + + dbw BANK(Music_Pinballredfield), Music_Pinballredfield + dbw BANK(Music_Pinballcatchem_red), Music_Pinballcatchem_red + dbw BANK(Music_Pinballhurryup_red), Music_Pinballhurryup_red + dbw BANK(Music_Pinballpokedex), Music_Pinballpokedex + dbw BANK(Music_Pinballgengarstage_gastly), Music_Pinballgengarstage_gastly + dbw BANK(Music_Pinballgengarstage_haunter), Music_Pinballgengarstage_haunter + dbw BANK(Music_Pinballgengarstage_gengar), Music_Pinballgengarstage_gengar + dbw BANK(Music_Pinballbluefield), Music_Pinballbluefield + dbw BANK(Music_Pinballcatchem_blue), Music_Pinballcatchem_blue + dbw BANK(Music_Pinballhurryup_blue), Music_Pinballhurryup_blue + dbw BANK(Music_Pinballhiscorescreen), Music_Pinballhiscorescreen + dbw BANK(Music_Pinballgameover), Music_Pinballgameover + dbw BANK(Music_Pinballdiglettstage_digletts), Music_Pinballdiglettstage_digletts + dbw BANK(Music_Pinballdiglettstage_dugtrio), Music_Pinballdiglettstage_dugtrio + dbw BANK(Music_Pinballseelstage), Music_Pinballseelstage + dbw BANK(Music_Pinballtitlescreen), Music_Pinballtitlescreen + dbw BANK(Music_Pinballmewtwostage), Music_Pinballmewtwostage + dbw BANK(Music_Pinballoptions), Music_Pinballoptions + dbw BANK(Music_Pinballfieldselect), Music_Pinballfieldselect + dbw BANK(Music_Pinballmeowthstage), Music_Pinballmeowthstage + dbw BANK(Music_Pinballendcredits), Music_Pinballendcredits + dbw BANK(Music_Pinballnameentry), Music_Pinballnameentry diff --git a/crysaudio/rbsfx.asm b/crysaudio/rbsfx.asm new file mode 100644 index 00000000..214816f9 --- /dev/null +++ b/crysaudio/rbsfx.asm @@ -0,0 +1,126 @@ +; sed 's/(\(.*\) - SFX_Headers_[0-9a-z]*) \/ 3/RB\1/g' + +;02: entire sfx_02_5f.asm +;08: from $40 sfx_08_77.asm +;1f: from $5d sfx_1f_67.asm + +; see music_constants.asm + +SFX: +RedSfxHeaderPointers: + dbw 0, 0 + dbw BANK(SFX_Get_Item1_1), SFX_Get_Item1_1 + + dbw BANK(SFX_Get_Item2_1), SFX_Get_Item2_1 + dbw BANK(SFX_Tink_1), SFX_Tink_1 + dbw BANK(SFX_Heal_HP_1), SFX_Heal_HP_1 + dbw BANK(SFX_Heal_Ailment_1), SFX_Heal_Ailment_1 + dbw BANK(SFX_Start_Menu_1), SFX_Start_Menu_1 + dbw BANK(SFX_Press_AB_1), SFX_Press_AB_1 + + dbw BANK(SFX_Pokedex_Rating_1), SFX_Pokedex_Rating_1 + dbw BANK(SFX_Get_Key_Item_1), SFX_Get_Key_Item_1 + dbw BANK(SFX_Poisoned_1), SFX_Poisoned_1 + dbw BANK(SFX_Trade_Machine_1), SFX_Trade_Machine_1 + dbw BANK(SFX_Turn_On_PC_1), SFX_Turn_On_PC_1 + dbw BANK(SFX_Turn_Off_PC_1), SFX_Turn_Off_PC_1 + dbw BANK(SFX_Enter_PC_1), SFX_Enter_PC_1 + dbw BANK(SFX_Shrink_1), SFX_Shrink_1 + dbw BANK(SFX_Switch_1), SFX_Switch_1 + dbw BANK(SFX_Healing_Machine_1), SFX_Healing_Machine_1 + dbw BANK(SFX_Teleport_Exit1_1), SFX_Teleport_Exit1_1 + dbw BANK(SFX_Teleport_Enter1_1), SFX_Teleport_Enter1_1 + dbw BANK(SFX_Teleport_Exit2_1), SFX_Teleport_Exit2_1 + dbw BANK(SFX_Ledge_1), SFX_Ledge_1 + dbw BANK(SFX_Teleport_Enter2_1), SFX_Teleport_Enter2_1 + dbw BANK(SFX_Fly_1), SFX_Fly_1 + dbw BANK(SFX_Denied_1), SFX_Denied_1 + dbw BANK(SFX_Arrow_Tiles_1), SFX_Arrow_Tiles_1 + dbw BANK(SFX_Push_Boulder_1), SFX_Push_Boulder_1 + dbw BANK(SFX_SS_Anne_Horn_1), SFX_SS_Anne_Horn_1 + dbw BANK(SFX_Withdraw_Deposit_1), SFX_Withdraw_Deposit_1 + dbw BANK(SFX_Cut_1), SFX_Cut_1 + dbw BANK(SFX_Go_Inside_1), SFX_Go_Inside_1 + dbw BANK(SFX_Swap_1), SFX_Swap_1 + dbw BANK(SFX_59_1), SFX_59_1 + dbw BANK(SFX_Purchase_1), SFX_Purchase_1 + dbw BANK(SFX_Collision_1), SFX_Collision_1 + dbw BANK(SFX_Go_Outside_1), SFX_Go_Outside_1 + dbw BANK(SFX_Save_1), SFX_Save_1 + + dbw BANK(SFX_Pokeflute), SFX_Pokeflute + dbw BANK(SFX_Safari_Zone_PA), SFX_Safari_Zone_PA + + dbw BANK(SFX_Level_Up), SFX_Level_Up + + dbw BANK(SFX_Ball_Toss), SFX_Ball_Toss + dbw BANK(SFX_Ball_Poof), SFX_Ball_Poof + dbw BANK(SFX_Faint_Thud), SFX_Faint_Thud + dbw BANK(SFX_Run), SFX_Run + dbw BANK(SFX_Dex_Page_Added), SFX_Dex_Page_Added + dbw BANK(SFX_Caught_Mon), SFX_Caught_Mon + dbw BANK(SFX_Peck), SFX_Peck + dbw BANK(SFX_Faint_Fall), SFX_Faint_Fall + dbw BANK(SFX_Battle_09), SFX_Battle_09 + dbw BANK(SFX_Pound), SFX_Pound + dbw BANK(SFX_Battle_0B), SFX_Battle_0B + dbw BANK(SFX_Battle_0C), SFX_Battle_0C + dbw BANK(SFX_Battle_0D), SFX_Battle_0D + dbw BANK(SFX_Battle_0E), SFX_Battle_0E + dbw BANK(SFX_Battle_0F), SFX_Battle_0F + dbw BANK(SFX_Damage), SFX_Damage + dbw BANK(SFX_Not_Very_Effective), SFX_Not_Very_Effective + dbw BANK(SFX_Battle_12), SFX_Battle_12 + dbw BANK(SFX_Battle_13), SFX_Battle_13 + dbw BANK(SFX_Battle_14), SFX_Battle_14 + dbw BANK(SFX_Vine_Whip), SFX_Vine_Whip + dbw BANK(SFX_Battle_16), SFX_Battle_16 + dbw BANK(SFX_Battle_17), SFX_Battle_17 + dbw BANK(SFX_Battle_18), SFX_Battle_18 + dbw BANK(SFX_Battle_19), SFX_Battle_19 + dbw BANK(SFX_Super_Effective), SFX_Super_Effective + dbw BANK(SFX_Battle_1B), SFX_Battle_1B + dbw BANK(SFX_Battle_1C), SFX_Battle_1C + dbw BANK(SFX_Doubleslap), SFX_Doubleslap + dbw BANK(SFX_Battle_1E), SFX_Battle_1E + dbw BANK(SFX_Horn_Drill), SFX_Horn_Drill + dbw BANK(SFX_Battle_20), SFX_Battle_20 + dbw BANK(SFX_Battle_21), SFX_Battle_21 + dbw BANK(SFX_Battle_22), SFX_Battle_22 + dbw BANK(SFX_Battle_23), SFX_Battle_23 + dbw BANK(SFX_Battle_24), SFX_Battle_24 + dbw BANK(SFX_Battle_25), SFX_Battle_25 + dbw BANK(SFX_Battle_26), SFX_Battle_26 + dbw BANK(SFX_Battle_27), SFX_Battle_27 + dbw BANK(SFX_Battle_28), SFX_Battle_28 + dbw BANK(SFX_Battle_29), SFX_Battle_29 + dbw BANK(SFX_Battle_2A), SFX_Battle_2A + dbw BANK(SFX_Battle_2B), SFX_Battle_2B + dbw BANK(SFX_Battle_2C), SFX_Battle_2C + dbw BANK(SFX_Psybeam), SFX_Psybeam + dbw BANK(SFX_Battle_2E), SFX_Battle_2E + dbw BANK(SFX_Battle_2F), SFX_Battle_2F + dbw BANK(SFX_Psychic_M), SFX_Psychic_M + dbw BANK(SFX_Battle_31), SFX_Battle_31 + dbw BANK(SFX_Battle_32), SFX_Battle_32 + dbw BANK(SFX_Battle_33), SFX_Battle_33 + dbw BANK(SFX_Battle_34), SFX_Battle_34 + dbw BANK(SFX_Battle_35), SFX_Battle_35 + dbw BANK(SFX_Battle_36), SFX_Battle_36 + dbw BANK(SFX_Silph_Scope), SFX_Silph_Scope + + dbw BANK(SFX_Intro_Lunge), SFX_Intro_Lunge + dbw BANK(SFX_Intro_Hip), SFX_Intro_Hip + dbw BANK(SFX_Intro_Hop), SFX_Intro_Hop + dbw BANK(SFX_Intro_Raise), SFX_Intro_Raise + dbw BANK(SFX_Intro_Crash), SFX_Intro_Crash + dbw BANK(SFX_Intro_Whoosh), SFX_Intro_Whoosh + dbw BANK(SFX_Slots_Stop_Wheel), SFX_Slots_Stop_Wheel + dbw BANK(SFX_Slots_Reward), SFX_Slots_Reward + dbw BANK(SFX_Slots_New_Spin), SFX_Slots_New_Spin + dbw BANK(SFX_Shooting_Star), SFX_Shooting_Star + + dbw BANK(Sfx_NotVeryEffective), Sfx_NotVeryEffective + dbw BANK(Sfx_Damage), Sfx_Damage + dbw BANK(Sfx_SuperEffective), Sfx_SuperEffective + diff --git a/crysaudio/red_pointers.asm b/crysaudio/red_pointers.asm new file mode 100644 index 00000000..32ca8ab9 --- /dev/null +++ b/crysaudio/red_pointers.asm @@ -0,0 +1,50 @@ +tbp: MACRO + dbw BANK(\1), \1 + ENDM + + tbp Music_Nothing + tbp Music_RBYPalletTown + tbp Music_Pokecenter + tbp Music_RBYGym + tbp Music_Cities1 + tbp Music_Cities2 + tbp Music_Celadon + tbp Music_Cinnabar + tbp Music_Vermilion + tbp Music_Lavender + tbp Music_SSAnne + tbp Music_MeetProfOak + tbp Music_MeetRival + tbp Music_MuseumGuy + tbp Music_SafariZone + tbp Music_PkmnHealed + tbp Music_Routes1 + tbp Music_Routes2 + tbp Music_Routes3 + tbp Music_Routes4 + tbp Music_RBYIndigoPlateau + tbp Music_GymLeaderBattle + tbp Music_TrainerBattle + tbp Music_WildBattle + tbp Music_FinalBattle + tbp Music_DefeatedTrainer + tbp Music_DefeatedWildMon + tbp Music_DefeatedGymLeader + tbp Music_RBYTitleScreen + tbp Music_RBYCredits + tbp Music_RBYHallOfFame + tbp Music_OaksLab + tbp Music_JigglypuffSong + tbp Music_BikeRiding + tbp Music_Surfing + tbp Music_RBYGameCorner + tbp Music_IntroBattle + tbp Music_Dungeon1 + tbp Music_Dungeon2 + tbp Music_Dungeon3 + tbp Music_CinnabarMansion + tbp Music_PokemonTower + tbp Music_SilphCo + tbp Music_MeetEvilTrainer + tbp Music_MeetFemaleTrainer + tbp Music_MeetMaleTrainer diff --git a/crysaudio/sfx.asm b/crysaudio/sfx.asm new file mode 100644 index 00000000..a7bab7e0 --- /dev/null +++ b/crysaudio/sfx.asm @@ -0,0 +1,5635 @@ +Sfx_PokeballsPlacedOnTable: ; f0941 + dbw $04, Sfx_PokeballsPlacedOnTable_Ch5 +; f0944 + +Sfx_BallWiggle: ; f0944 + dbw $04, Sfx_BallWiggle_Ch5 +; f0947 + +Sfx_Potion: ; f0947 + dbw $04, Sfx_Potion_Ch5 +; f094a + +Sfx_FullHeal: ; f094a + dbw $04, Sfx_FullHeal_Ch5 +; f094d + +Sfx_Menu: ; f094d + dbw $07, Sfx_Menu_Ch8 +; f0950 + +Sfx_ReadText2: ; f0950 +Sfx_ReadText: ; f0950 + dbw $04, Sfx_ReadText2_Ch5 +; f0953 + +Sfx_Poison: ; f0953 + dbw $04, Sfx_Poison_Ch5 +; f0956 + +Sfx_GotSafariBalls: ; f0956 + dbw $04, Sfx_GotSafariBalls_Ch5 +; f0959 + +Sfx_BootPc: ; f0959 + dbw $04, Sfx_BootPc_Ch5 +; f095c + +Sfx_ShutDownPc: ; f095c + dbw $04, Sfx_ShutDownPc_Ch5 +; f095f + +Sfx_ChoosePcOption: ; f095f + dbw $04, Sfx_ChoosePcOption_Ch5 +; f0962 + +Sfx_EscapeRope: ; f0962 + dbw $04, Sfx_EscapeRope_Ch5 +; f0965 + +Sfx_PushButton: ; f0965 + dbw $04, Sfx_PushButton_Ch5 +; f0968 + +Sfx_SecondPartOfItemfinder: ; f0968 + dbw $04, Sfx_SecondPartOfItemfinder_Ch5 +; f096b + +Sfx_WarpTo: ; f096b + dbw $04, Sfx_WarpTo_Ch5 +; f096e + +Sfx_WarpFrom: ; f096e + dbw $04, Sfx_WarpFrom_Ch5 +; f0971 + +Sfx_ChangeDexMode: ; f0971 + dbw $04, Sfx_ChangeDexMode_Ch5 +; f0974 + +Sfx_JumpOverLedge: ; f0974 + dbw $04, Sfx_JumpOverLedge_Ch5 +; f0977 + +Sfx_GrassRustle: ; f0977 + dbw $07, Sfx_GrassRustle_Ch8 +; f097a + +Sfx_Fly: ; f097a + dbw $07, Sfx_Fly_Ch8 +; f097d + +Sfx_Wrong: ; f097d + dbw $44, Sfx_Wrong_Ch5 + dbw $05, Sfx_Wrong_Ch6 +; f0983 + +Sfx_Squeak: ; f0983 + dbw $04, Sfx_Squeak_Ch5 +; f0986 + +Sfx_Strength: ; f0986 + dbw $07, Sfx_Strength_Ch8 +; f0989 + +Sfx_Boat: ; f0989 + dbw $44, Sfx_Boat_Ch5 + dbw $05, Sfx_Boat_Ch6 +; f098f + +Sfx_WallOpen: ; f098f + dbw $04, Sfx_WallOpen_Ch5 +; f0992 + +Sfx_PlacePuzzlePieceDown: ; f0992 + dbw $07, Sfx_PlacePuzzlePieceDown_Ch8 +; f0995 + +Sfx_EnterDoor: ; f0995 + dbw $07, Sfx_EnterDoor_Ch8 +; f0998 + +Sfx_SwitchPokemon: ; f0998 + dbw $44, Sfx_SwitchPokemon_Ch5 + dbw $05, Sfx_SwitchPokemon_Ch6 +; f099e + +Sfx_Tally: ; f099e + dbw $44, Sfx_Tally_Ch5 + dbw $05, Sfx_Tally_Ch6 +; f09a4 + +Sfx_Transaction: ; f09a4 + dbw $44, Sfx_Transaction_Ch5 + dbw $05, Sfx_Transaction_Ch6 +; f09aa + +Sfx_Bump: ; f09aa + dbw $04, Sfx_Bump_Ch5 +; f09ad + +Sfx_ExitBuilding: ; f09ad + dbw $07, Sfx_ExitBuilding_Ch8 +; f09b0 + +Sfx_Save: ; f09b0 + dbw $44, Sfx_Save_Ch5 + dbw $05, Sfx_Save_Ch6 +; f09b6 + +Sfx_Save_Ch5: ; f09b6 + dutycycle $2 + sound $2, $f1, $0700 + sound $1, $e1, $0600 + sound $1, $e1, $0680 + sound $1, $e1, $06c0 + sound $2, $e1, $0700 + sound $2, $e1, $07c0 + sound $f, $f2, $07e0 + endchannel +; f09d5 + +Sfx_Save_Ch6: ; f09d5 + dutycycle $2 + sound $2, $8, $0000 + sound $2, $a1, $0701 + sound $1, $91, $0601 + sound $1, $91, $0681 + sound $1, $91, $06c1 + sound $2, $91, $0701 + sound $2, $91, $07c1 + sound $f, $d2, $07e1 + endchannel +; f09f8 + +Sfx_Pokeflute: ; f09f8 + dbw $06, Sfx_Pokeflute_Ch7 +; f09fb + +Sfx_ElevatorEnd: ; f09fb + dbw $04, Sfx_ElevatorEnd_Ch5 +; f09fe + +Sfx_ThrowBall: ; f09fe + dbw $44, Sfx_ThrowBall_Ch5 + dbw $05, Sfx_ThrowBall_Ch6 +; f0a04 + +Sfx_BallPoof: ; f0a04 + dbw $44, Sfx_BallPoof_Ch5 + dbw $07, Sfx_BallPoof_Ch8 +; f0a0a + +Sfx_Unknown3A: ; f0a0a + dbw $44, Sfx_Unknown3A_Ch5 + dbw $07, Sfx_Unknown3A_Ch8 +; f0a10 + +Sfx_Run: ; f0a10 + dbw $07, Sfx_Run_Ch8 +; f0a13 + +Sfx_SlotMachineStart: ; f0a13 + dbw $44, Sfx_SlotMachineStart_Ch5 + dbw $05, Sfx_SlotMachineStart_Ch6 +; f0a19 + +Sfx_Call: ; f0a19 + dbw $04, Sfx_Call_Ch5 +; f0a1c + +Sfx_Unknown60: ; f0a1c + dbw $07, Sfx_Unknown60_Ch8 +; f0a1f + +Sfx_Unknown61: ; f0a1f + dbw $07, Sfx_Unknown61_Ch8 +; f0a22 + +Sfx_Unknown62: ; f0a22 + dbw $07, Sfx_Unknown62_Ch8 +; f0a25 + +Sfx_Unknown63: ; f0a25 + dbw $07, Sfx_Unknown63_Ch8 +; f0a28 + +Sfx_Burn: ; f0a28 + dbw $07, Sfx_Burn_Ch8 +; f0a2b + +Sfx_TitleScreenEntrance: ; f0a2b + dbw $07, Sfx_TitleScreenEntrance_Ch8 +; f0a2e + +Sfx_Unknown66: ; f0a2e + dbw $04, Sfx_Unknown66_Ch5 +; f0a31 + +Sfx_GetCoinFromSlots: ; f0a31 + dbw $04, Sfx_GetCoinFromSlots_Ch5 +; f0a34 + +Sfx_PayDay: ; f0a34 + dbw $44, Sfx_PayDay_Ch5 + dbw $05, Sfx_PayDay_Ch6 +; f0a3a + +Sfx_Metronome: ; f0a3a + dbw $04, Sfx_Metronome_Ch5 +; f0a3d + +Sfx_Peck: ; f0a3d + dbw $07, Sfx_Peck_Ch8 +; f0a40 + +Sfx_Kinesis: ; f0a40 + dbw $04, Sfx_Kinesis_Ch5 +; f0a43 + +Sfx_Lick: ; f0a43 + dbw $04, Sfx_Lick_Ch5 +; f0a46 + +Sfx_Pound: ; f0a46 + dbw $07, Sfx_Pound_Ch8 +; f0a49 + +Sfx_MovePuzzlePiece: ; f0a49 + dbw $07, Sfx_MovePuzzlePiece_Ch8 +; f0a4c + +Sfx_CometPunch: ; f0a4c + dbw $07, Sfx_CometPunch_Ch8 +; f0a4f + +Sfx_MegaPunch: ; f0a4f + dbw $07, Sfx_MegaPunch_Ch8 +; f0a52 + +Sfx_Scratch: ; f0a52 + dbw $07, Sfx_Scratch_Ch8 +; f0a55 + +Sfx_Vicegrip: ; f0a55 + dbw $07, Sfx_Vicegrip_Ch8 +; f0a58 + +Sfx_RazorWind: ; f0a58 + dbw $07, Sfx_RazorWind_Ch8 +; f0a5b + +Sfx_Cut: ; f0a5b + dbw $07, Sfx_Cut_Ch8 +; f0a5e + +Sfx_WingAttack: ; f0a5e + dbw $07, Sfx_WingAttack_Ch8 +; f0a61 + +Sfx_Whirlwind: ; f0a61 + dbw $07, Sfx_Whirlwind_Ch8 +; f0a64 + +Sfx_Bind: ; f0a64 + dbw $07, Sfx_Bind_Ch8 +; f0a67 + +Sfx_VineWhip: ; f0a67 + dbw $07, Sfx_VineWhip_Ch8 +; f0a6a + +Sfx_DoubleKick: ; f0a6a + dbw $07, Sfx_DoubleKick_Ch8 +; f0a6d + +Sfx_MegaKick: ; f0a6d + dbw $07, Sfx_MegaKick_Ch8 +; f0a70 + +Sfx_Headbutt: ; f0a70 + dbw $07, Sfx_Headbutt_Ch8 +; f0a73 + +Sfx_HornAttack: ; f0a73 + dbw $07, Sfx_HornAttack_Ch8 +; f0a76 + +Sfx_Tackle: ; f0a76 + dbw $07, Sfx_Tackle_Ch8 +; f0a79 + +Sfx_PoisonSting: ; f0a79 + dbw $07, Sfx_PoisonSting_Ch8 +; f0a7c + +Sfx_Powder: ; f0a7c + dbw $07, Sfx_Powder_Ch8 +; f0a7f + +Sfx_Doubleslap: ; f0a7f + dbw $07, Sfx_Doubleslap_Ch8 +; f0a82 + +Sfx_Bite: ; f0a82 + dbw $44, Sfx_Bite_Ch5 + dbw $07, Sfx_Bite_Ch8 +; f0a88 + +Sfx_JumpKick: ; f0a88 + dbw $07, Sfx_JumpKick_Ch8 +; f0a8b + +Sfx_Stomp: ; f0a8b + dbw $07, Sfx_Stomp_Ch8 +; f0a8e + +Sfx_TailWhip: ; f0a8e + dbw $07, Sfx_TailWhip_Ch8 +; f0a91 + +Sfx_KarateChop: ; f0a91 + dbw $07, Sfx_KarateChop_Ch8 +; f0a94 + +Sfx_Submission: ; f0a94 + dbw $07, Sfx_Submission_Ch8 +; f0a97 + +Sfx_WaterGun: ; f0a97 + dbw $44, Sfx_WaterGun_Ch5 + dbw $07, Sfx_WaterGun_Ch8 +; f0a9d + +Sfx_SwordsDance: ; f0a9d + dbw $07, Sfx_SwordsDance_Ch8 +; f0aa0 + +Sfx_Thunder: ; f0aa0 + dbw $07, Sfx_Thunder_Ch8 +; f0aa3 + +Sfx_Supersonic: ; f0aa3 + dbw $84, Sfx_Supersonic_Ch5 + dbw $05, Sfx_Supersonic_Ch6 + dbw $07, Sfx_Supersonic_Ch8 +; f0aac + +Sfx_Leer: ; f0aac + dbw $84, Sfx_Leer_Ch5 + dbw $05, Sfx_Leer_Ch6 + dbw $07, Sfx_Leer_Ch8 +; f0ab5 + +Sfx_Ember: ; f0ab5 + dbw $44, Sfx_Ember_Ch5 + dbw $07, Sfx_Ember_Ch8 +; f0abb + +Sfx_Bubblebeam: ; f0abb + dbw $84, Sfx_Bubblebeam_Ch5 + dbw $05, Sfx_Bubblebeam_Ch6 + dbw $07, Sfx_Bubblebeam_Ch8 +; f0ac4 + +Sfx_HydroPump: ; f0ac4 + dbw $44, Sfx_HydroPump_Ch5 + dbw $07, Sfx_HydroPump_Ch8 +; f0aca + +Sfx_Surf: ; f0aca + dbw $84, Sfx_Surf_Ch5 + dbw $05, Sfx_Surf_Ch6 + dbw $07, Sfx_Surf_Ch8 +; f0ad3 + +Sfx_Psybeam: ; f0ad3 + dbw $84, Sfx_Psybeam_Ch5 + dbw $05, Sfx_Psybeam_Ch6 + dbw $07, Sfx_Psybeam_Ch8 +; f0adc + +Sfx_Charge: ; f0adc + dbw $84, Sfx_Charge_Ch5 + dbw $05, Sfx_Charge_Ch6 + dbw $07, Sfx_Charge_Ch8 +; f0ae5 + +Sfx_Thundershock: ; f0ae5 + dbw $84, Sfx_Thundershock_Ch5 + dbw $05, Sfx_Thundershock_Ch6 + dbw $07, Sfx_Thundershock_Ch8 +; f0aee + +Sfx_Psychic: ; f0aee + dbw $84, Sfx_Psychic_Ch5 + dbw $05, Sfx_Psychic_Ch6 + dbw $07, Sfx_Psychic_Ch8 +; f0af7 + +Sfx_Screech: ; f0af7 + dbw $44, Sfx_Screech_Ch5 + dbw $05, Sfx_Screech_Ch6 +; f0afd + +Sfx_BoneClub: ; f0afd + dbw $44, Sfx_BoneClub_Ch5 + dbw $05, Sfx_BoneClub_Ch6 +; f0b03 + +Sfx_Sharpen: ; f0b03 + dbw $44, Sfx_Sharpen_Ch5 + dbw $05, Sfx_Sharpen_Ch6 +; f0b09 + +Sfx_EggBomb: ; f0b09 + dbw $84, Sfx_EggBomb_Ch5 + dbw $05, Sfx_EggBomb_Ch6 + dbw $07, Sfx_EggBomb_Ch8 +; f0b12 + +Sfx_Sing: ; f0b12 + dbw $44, Sfx_Sing_Ch5 + dbw $05, Sfx_Sing_Ch6 +; f0b18 + +Sfx_HyperBeam: ; f0b18 + dbw $84, Sfx_HyperBeam_Ch5 + dbw $05, Sfx_HyperBeam_Ch6 + dbw $07, Sfx_HyperBeam_Ch8 +; f0b21 + +Sfx_Shine: ; f0b21 + dbw $04, Sfx_Shine_Ch5 +; f0b24 + +Sfx_Unknown5F: ; f0b24 + dbw $84, Sfx_Unknown5F_Ch5 + dbw $05, Sfx_Unknown5F_Ch6 +Sfx_Sandstorm: ; f0b2a + dbw $07, Sfx_Sandstorm_Ch8 +; f0b2d + +Sfx_HangUp: ; f0b2d + dbw $04, Sfx_HangUp_Ch5 +; f0b30 + +Sfx_NoSignal: ; f0b30 + dbw $04, Sfx_NoSignal_Ch5 +; f0b33 + +Sfx_Elevator: ; f0b33 + dbw $c4, Sfx_Elevator_Ch5 + dbw $05, Sfx_Elevator_Ch6 + dbw $06, Sfx_Elevator_Ch7 + dbw $07, Sfx_Elevator_Ch8 +; f0b3f + +Sfx_DexFanfare5079: ; f0b3f +Sfx_LevelUp: ; f0b3f + dbw $c4, Sfx_DexFanfare5079_Ch5 + dbw $05, Sfx_DexFanfare5079_Ch6 + dbw $06, Sfx_DexFanfare5079_Ch7 + dbw $07, Sfx_DexFanfare5079_Ch8 +; f0b4b + +Sfx_DexFanfare5079_Ch5: ; f0b4b +Sfx_LevelUp_Ch5: ; f0b4b + togglesfx + tempo 120 + volume $77 + dutycycle $2 + notetype $8, $b1 + octave 3 + note B_, 2 + note B_, 2 + note B_, 2 + intensity $b3 + octave 4 + note G#, 12 + endchannel +; f0b5f + +Sfx_DexFanfare5079_Ch6: ; f0b5f +Sfx_LevelUp_Ch6: ; f0b5f + togglesfx + dutycycle $2 + notetype $8, $c1 + octave 4 + note E_, 2 + note E_, 2 + note E_, 2 + intensity $c3 + note B_, 12 + endchannel +; f0b6d + +Sfx_DexFanfare5079_Ch7: ; f0b6d +Sfx_LevelUp_Ch7: ; f0b6d + togglesfx + notetype $8, $25 + octave 4 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + octave 5 + note E_, 5 + intensity $35 + note E_, 3 + note __, 4 + endchannel +; f0b7f + +Sfx_DexFanfare5079_Ch8: ; f0b7f +Sfx_LevelUp_Ch8: ; f0b7f + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 12 + endchannel +; f0b86 + +Sfx_KeyItem: ; f0b86 + dbw $c4, Sfx_KeyItem_Ch5 + dbw $05, Sfx_KeyItem_Ch6 + dbw $06, Sfx_KeyItem_Ch7 + dbw $07, Sfx_KeyItem_Ch8 +; f0b92 + +Sfx_KeyItem_Ch5: ; f0b92 + togglesfx + tempo 120 + volume $77 + dutycycle $2 + notetype $6, $b1 + octave 3 + note B_, 4 + note B_, 2 + note B_, 2 + note B_, 4 + octave 4 + note E_, 4 + intensity $b3 + note G#, 16 + endchannel +; f0ba8 + +Sfx_KeyItem_Ch6: ; f0ba8 + togglesfx + dutycycle $2 + notetype $6, $c1 + octave 4 + note E_, 4 + note E_, 2 + note E_, 2 + note E_, 4 + note G#, 4 + intensity $c3 + note B_, 16 + endchannel +; f0bb8 + +Sfx_KeyItem_Ch7: ; f0bb8 + togglesfx + notetype $6, $25 + octave 4 + note G#, 2 + note __, 2 + note G#, 1 + note __, 1 + note G#, 1 + note __, 1 + note G#, 2 + note __, 2 + note B_, 2 + note __, 2 + octave 5 + note E_, 8 + intensity $35 + note E_, 4 + note __, 4 + endchannel +; f0bce + +Sfx_KeyItem_Ch8: ; f0bce + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 16 + endchannel +; f0bd5 + +Sfx_DexFanfare2049: ; f0bd5 + dbw $c4, Sfx_DexFanfare2049_Ch5 + dbw $05, Sfx_DexFanfare2049_Ch6 + dbw $06, Sfx_DexFanfare2049_Ch7 + dbw $07, Sfx_DexFanfare2049_Ch8 +; f0be1 + +Sfx_DexFanfare2049_Ch5: ; f0be1 + togglesfx + tempo 104 + volume $77 + dutycycle $2 + notetype $c, $88 + octave 3 + note A_, 4 + note __, 2 + note A_, 1 + note __, 1 + note A#, 4 + note __, 2 + note A#, 1 + note __, 1 + octave 4 + note C_, 2 + note __, 2 + octave 3 + note A#, 2 + note __, 2 + note A_, 2 + note __, 6 + endchannel +; f0bfe + +Sfx_DexFanfare2049_Ch6: ; f0bfe + togglesfx + dutycycle $2 + notetype $c, $c1 + octave 5 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 4 + note A#, 2 + octave 5 + note C_, 2 + note D_, 2 + note E_, 2 + note F_, 4 + note G_, 4 + note F_, 8 + endchannel +; f0c13 + +Sfx_DexFanfare2049_Ch7: ; f0c13 + togglesfx + notetype $c, $25 + octave 4 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note A_, 2 + note __, 2 + note E_, 2 + note __, 2 + note F_, 2 + note __, 6 + endchannel +; f0c27 + +Sfx_DexFanfare2049_Ch8: ; f0c27 + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 16 + note __, 16 + endchannel +; f0c2f + +Sfx_Item: ; f0c2f + dbw $c4, Sfx_Item_Ch5 + dbw $05, Sfx_Item_Ch6 + dbw $06, Sfx_Item_Ch7 + dbw $07, Sfx_Item_Ch8 +; f0c3b + +Sfx_Item_Ch5: ; f0c3b + togglesfx + tempo 108 + volume $77 + vibrato $8, $27 + dutycycle $2 + notetype $8, $b2 + octave 4 + note C_, 6 + note C_, 2 + note F_, 2 + note C_, 2 + note G_, 4 + note G_, 4 + note G_, 4 + note F_, 12 + note __, 12 + endchannel +; f0c54 + +Sfx_Item_Ch6: ; f0c54 + togglesfx + vibrato $8, $27 + dutycycle $2 + notetype $8, $c3 + octave 4 + note A_, 6 + note A_, 2 + note A_, 2 + note A_, 2 + note A#, 4 + note A#, 4 + note A#, 4 + note A_, 12 + note __, 12 + endchannel +; f0c68 + +Sfx_Item_Ch7: ; f0c68 + togglesfx + notetype $8, $25 + octave 4 + note F_, 4 + note __, 2 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + note D#, 2 + note __, 2 + note D#, 2 + note __, 2 + note E_, 2 + note __, 2 + note F_, 6 + intensity $35 + note F_, 4 + note __, 14 + endchannel +; f0c81 + +Sfx_Item_Ch8: ; f0c81 + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 16 + note __, 16 + endchannel +; f0c89 + +Sfx_CaughtMon: ; f0c89 + dbw $c4, Sfx_CaughtMon_Ch5 + dbw $05, Sfx_CaughtMon_Ch6 + dbw $06, Sfx_CaughtMon_Ch7 + dbw $07, Sfx_CaughtMon_Ch8 +; f0c95 + +Sfx_CaughtMon_Ch5: ; f0c95 + togglesfx + tempo 112 + volume $77 + vibrato $8, $27 + dutycycle $2 + notetype $8, $b3 + octave 4 + note C_, 6 + octave 3 + note A_, 6 + note F_, 12 + intensity $b1 + octave 4 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note D#, 2 + note G_, 2 + intensity $b3 + note F_, 12 + endchannel +; f0cb5 + +Sfx_CaughtMon_Ch6: ; f0cb5 + togglesfx + dutycycle $2 + vibrato $8, $27 + notetype $8, $c3 + octave 4 + note A_, 6 + note F_, 6 + note C_, 12 + intensity $c1 + note A#, 2 + note A#, 2 + note A#, 2 + note G_, 2 + note G_, 2 + note A#, 2 + intensity $c3 + note A_, 12 + endchannel +; f0cce + +Sfx_CaughtMon_Ch7: ; f0cce + togglesfx + notetype $8, $25 + octave 3 + note C_, 12 + note C_, 6 + octave 2 + note A_, 2 + octave 3 + note C_, 2 + note F_, 2 + note G_, 6 + note A#, 6 + note A_, 6 + intensity $35 + note A_, 3 + note __, 3 + endchannel +; f0ce2 + +Sfx_CaughtMon_Ch8: ; f0ce2 + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 16 + note __, 16 + endchannel +; f0cea + +Sfx_DexFanfare80109: ; f0cea + dbw $c4, Sfx_DexFanfare80109_Ch5 + dbw $05, Sfx_DexFanfare80109_Ch6 + dbw $06, Sfx_DexFanfare80109_Ch7 + dbw $07, Sfx_DexFanfare80109_Ch8 +; f0cf6 + +Sfx_DexFanfare80109_Ch5: ; f0cf6 + togglesfx + tempo 112 + volume $77 + vibrato $8, $27 + dutycycle $2 + notetype $c, $b1 + octave 4 + note D#, 2 + note D#, 1 + note D#, 1 + octave 3 + note A#, 2 + note A#, 1 + note A#, 1 + octave 4 + note D#, 2 + note D#, 1 + note D#, 1 + note F_, 2 + note F_, 1 + note F_, 1 + intensity $a5 + note A#, 16 + endchannel +; f0d17 + +Sfx_DexFanfare80109_Ch6: ; f0d17 + togglesfx + vibrato $8, $27 + dutycycle $2 + notetype $c, $c1 + octave 4 + note G_, 2 + note G_, 1 + note G_, 1 + note D#, 2 + note D#, 1 + note D#, 1 + note G#, 2 + note G#, 1 + note G#, 1 + note A#, 2 + note A#, 1 + note A#, 1 + intensity $b5 + octave 5 + note D#, 16 + endchannel +; f0d32 + +Sfx_DexFanfare80109_Ch7: ; f0d32 + togglesfx + notetype $c, $25 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note A#, 2 + octave 4 + note D#, 1 + note __, 1 + octave 3 + note A#, 2 + octave 4 + note D#, 1 + note __, 1 + note C_, 2 + note D_, 1 + note __, 1 + octave 3 + note A#, 2 + note D#, 4 + intensity $35 + note D#, 3 + note __, 9 + endchannel +; f0d4e + +Sfx_DexFanfare80109_Ch8: ; f0d4e + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 16 + note __, 16 + endchannel +; f0d56 + +Sfx_Fanfare2: ; f0d56 + dbw $84, Sfx_Fanfare2_Ch5 + dbw $05, Sfx_Fanfare2_Ch6 + dbw $07, Sfx_Fanfare2_Ch8 +; f0d5f + +UnknownSfx: ; f0d5f + dbw $c4, UnknownSfx_Ch5 + dbw $05, UnknownSfx_Ch6 + dbw $06, UnknownSfx_Ch7 + dbw $07, UnknownSfx_Ch8 +; f0d6b + +UnknownSfx_Ch5: ; f0d6b + togglesfx + tempo 124 + volume $77 + vibrato $8, $27 + dutycycle $2 + notetype $c, $b1 + octave 4 + note F_, 2 + note F_, 1 + note F_, 1 + note C_, 2 + note C_, 1 + note C_, 1 + note E_, 2 + note G_, 1 + note G_, 1 + note C_, 2 + note E_, 1 + note E_, 1 + intensity $a5 + note F_, 16 + endchannel +; f0d8a + +UnknownSfx_Ch6: ; f0d8a + togglesfx + vibrato $8, $27 + dutycycle $2 + notetype $c, $c1 + octave 4 + note A_, 2 + note A_, 1 + note A_, 1 + note F_, 2 + note F_, 1 + note F_, 1 + octave 5 + note C_, 2 + note C_, 1 + note C_, 1 + octave 4 + note A#, 2 + note A#, 1 + note A#, 1 + intensity $b5 + note A_, 16 + endchannel +; f0da6 + +UnknownSfx_Ch7: ; f0da6 + togglesfx + notetype $c, $25 + octave 4 + note F_, 8 + note C_, 2 + note E_, 2 + note G_, 2 + note A#, 2 + note A_, 4 + intensity $35 + note A_, 3 + note __, 9 + endchannel +; f0db6 + +UnknownSfx_Ch8: ; f0db6 + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 16 + note __, 16 + endchannel +; f0dbe + +Sfx_Fanfare: ; f0dbe + dbw $84, Sfx_Fanfare_Ch5 + dbw $05, Sfx_Fanfare_Ch6 + dbw $07, Sfx_Fanfare_Ch8 +; f0dc7 + +Sfx_RegisterPhoneNumber: ; f0dc7 + dbw $c4, Sfx_RegisterPhoneNumber_Ch5 + dbw $05, Sfx_RegisterPhoneNumber_Ch6 + dbw $06, Sfx_RegisterPhoneNumber_Ch7 + dbw $07, Sfx_RegisterPhoneNumber_Ch8 +; f0dd3 + +Sfx_RegisterPhoneNumber_Ch5: ; f0dd3 + togglesfx + tempo 124 + volume $77 + dutycycle $3 + notetype $c, $a2 + note __, 2 + octave 3 + note C_, 4 + note G#, 4 + octave 4 + note C_, 2 + octave 3 + note F_, 1 + note G#, 2 + note C_, 1 + note F_, 2 + note A#, 3 + octave 4 + note C#, 3 + note C_, 2 + note __, 8 + endchannel +; f0def + + + + +Sfx_RegisterPhoneNumber_Ch6: ; f0df0 + togglesfx + dutycycle $3 + notetype $c, $c2 + note __, 2 + octave 4 + note D#, 2 + note C#, 2 + note C_, 2 + note D#, 2 + note F_, 2 + note __, 1 + note G#, 3 + octave 5 + note C_, 2 + note D#, 3 + octave 4 + note G_, 3 + note G#, 2 + note __, 8 + endchannel +; f0e07 + + + + +Sfx_RegisterPhoneNumber_Ch7: ; f0e08 + togglesfx + notetype $c, $25 + note __, 2 + octave 3 + note D#, 7 + note __, 1 + note G#, 2 + note __, 1 + note C_, 2 + note __, 1 + note G#, 2 + note G_, 2 + note __, 1 + note A#, 3 + note G#, 2 + note __, 8 + endchannel +; f0e1b + + + + +Sfx_RegisterPhoneNumber_Ch8: ; f0e1c + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 2 + note __, 16 + note __, 16 + endchannel +; f0e25 + + + + +Sfx_3RdPlace: ; f0e26 + dbw $84, Sfx_3RdPlace_Ch5 + dbw $05, Sfx_3RdPlace_Ch6 + dbw $06, Sfx_3RdPlace_Ch7 +; f0e2f + +Sfx_3RdPlace_Ch5: ; f0e2f + togglesfx + tempo 120 + volume $77 + dutycycle $2 + notetype $c, $a4 + octave 4 + note F_, 1 + note A_, 1 + octave 5 + note C_, 1 + note F_, 1 + note __, 1 + note C_, 1 + note D_, 6 + endchannel +; f0e44 + + + + +Sfx_3RdPlace_Ch6: ; f0e45 + togglesfx + dutycycle $2 + notetype $c, $b4 + octave 4 + note A_, 1 + octave 5 + note C_, 1 + note F_, 1 + note A_, 1 + note __, 1 + note F_, 1 + note G_, 6 + endchannel +; f0e55 + + + + +Sfx_3RdPlace_Ch7: ; f0e56 + togglesfx + notetype $c, $25 + octave 3 + note A_, 1 + note F_, 1 + note A_, 1 + octave 4 + note C_, 1 + note __, 1 + octave 3 + note A_, 1 + note B_, 6 + endchannel +; f0e65 + + + + +Sfx_GetEggFromDaycareLady: ; f0e66 +Sfx_GetEggFromDaycareMan: ; f0e66 + dbw $c4, Sfx_GetEggFromDaycareLady_Ch5 + dbw $05, Sfx_GetEggFromDaycareLady_Ch6 + dbw $06, Sfx_GetEggFromDaycareLady_Ch7 + dbw $07, Sfx_GetEggFromDaycareLady_Ch8 +; f0e72 + +Sfx_GetEggFromDaycareLady_Ch5: ; f0e72 +Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 + togglesfx + tempo 120 + volume $77 + vibrato $12, $34 + dutycycle $2 + notetype $8, $a1 + note __, 2 + octave 3 + note C_, 2 + note F_, 2 + note A_, 2 + note F_, 2 + note A#, 2 + octave 4 + note D_, 2 + intensity $a2 + note F_, 6 + intensity $a1 + dutycycle $3 + octave 3 + note E_, 2 + note G_, 2 + octave 4 + note C_, 2 + intensity $a4 + note F_, 9 + note __, 9 + endchannel +; f0e9a + + + + +Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b +Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b + togglesfx + vibrato $12, $34 + dutycycle $3 + notetype $8, $c2 + note __, 2 + octave 4 + note F_, 2 + note __, 2 + note A_, 2 + intensity $c1 + note A#, 2 + note A_, 2 + note A#, 2 + intensity $c2 + octave 5 + note C_, 6 + intensity $c1 + octave 4 + note C_, 2 + note E_, 2 + note G_, 2 + intensity $c4 + note A_, 9 + note __, 9 + endchannel +; f0ebd + + + + +Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe +Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe + togglesfx + notetype $8, $25 + note __, 2 + octave 3 + note C_, 6 + octave 2 + note A#, 6 + octave 3 + note C_, 2 + note F_, 2 + note G_, 2 + note A#, 6 + note A_, 9 + note __, 9 + endchannel +; f0ecf + + + + +Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0 +Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0 + togglesfx + sfxtogglenoise $4 + notetype $8 + note __, 2 + notetype $c + note __, 16 + note __, 12 + endchannel +; f0edb + + + + +Sfx_MoveDeleted: ; f0edc + dbw $c4, Sfx_MoveDeleted_Ch5 + dbw $05, Sfx_MoveDeleted_Ch6 + dbw $06, Sfx_MoveDeleted_Ch7 + dbw $07, Sfx_MoveDeleted_Ch8 +; f0ee8 + +Sfx_MoveDeleted_Ch5: ; f0ee8 + togglesfx + tempo 116 + volume $77 + dutycycle $2 + vibrato $c, $44 + notetype $c, $a4 + note __, 8 + octave 2 + note G_, 1 + note __, 2 + note C#, 1 + note E_, 1 + note D#, 1 + note E_, 4 + intensity $a1 + note G_, 2 + note F_, 2 + note E_, 2 + note D_, 2 + note G#, 2 + note B_, 2 + intensity $a6 + octave 3 + note D_, 10 + note __, 6 + endchannel +; f0f0c + + + + +Sfx_MoveDeleted_Ch6: ; f0f0d + togglesfx + dutycycle $3 + vibrato $c, $44 + notetype $c, $74 + octave 1 + note B_, 1 + octave 2 + note D_, 1 + note F_, 1 + note G#, 1 + intensity $94 + note D_, 1 + note F_, 1 + note G#, 1 + note B_, 1 + intensity $b4 + octave 3 + note C#, 1 + note __, 2 + octave 2 + note A#, 1 + octave 3 + note C#, 4 + note __, 2 + intensity $b1 + note C#, 2 + note D#, 2 + note E_, 2 + intensity $b6 + note F_, 16 + note __, 6 + endchannel +; f0f36 + + + + +Sfx_MoveDeleted_Ch7: ; f0f37 + togglesfx + notetype $6, $25 + octave 2 + note G#, 8 + note A_, 8 + note A#, 2 + note __, 4 + note A#, 1 + note __, 1 + note A#, 8 + note __, 4 + octave 3 + note C#, 2 + note __, 2 + note C_, 2 + note __, 2 + octave 2 + note A#, 2 + note __, 2 + notetype $c, $20 + note B_, 16 + note __, 6 + endchannel +; f0f52 + + + + +Sfx_MoveDeleted_Ch8: ; f0f53 + togglesfx + sfxtogglenoise $3 + notetype $c + note F_, 8 + note __, 16 + note __, 16 + note __, 6 + endchannel +; f0f5d + + + + +Sfx_2ndPlace: ; f0f5e + dbw $c4, Sfx_2ndPlace_Ch5 + dbw $05, Sfx_2ndPlace_Ch6 + dbw $06, Sfx_2ndPlace_Ch7 + dbw $07, Sfx_2ndPlace_Ch8 +; f0f6a + +Sfx_2ndPlace_Ch5: ; f0f6a + togglesfx + tempo 116 + volume $77 + dutycycle $2 + vibrato $c, $34 + notetype $8, $a1 + octave 4 + note E_, 2 + note E_, 2 + note E_, 2 + note C_, 2 + octave 3 + note A_, 2 + note F_, 2 + note A_, 2 + octave 4 + note C_, 2 + note F_, 2 + note C_, 2 + octave 3 + note A_, 2 + octave 4 + note F_, 2 + note A_, 2 + note A_, 2 + note A_, 2 + intensity $a7 + note B_, 12 + note __, 6 + endchannel +; f0f91 + + + + +Sfx_2ndPlace_Ch6: ; f0f92 + togglesfx + dutycycle $2 + notetype $8, $b1 + octave 4 + note G_, 2 + note G_, 2 + note G_, 2 + note A_, 4 + note B_, 2 + intensity $b4 + octave 5 + note C_, 12 + intensity $b1 + note C_, 2 + note C_, 2 + note C_, 2 + intensity $b7 + note D_, 12 + note __, 6 + endchannel +; f0fac + + + + +Sfx_2ndPlace_Ch7: ; f0fad + togglesfx + notetype $8, $25 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note F_, 2 + note __, 2 + octave 3 + note F_, 2 + octave 2 + note F_, 2 + note __, 2 + octave 3 + note F_, 2 + octave 2 + note F_, 2 + note __, 2 + octave 3 + note F_, 2 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note G_, 12 + note __, 6 + endchannel +; f0fd1 + + + + +Sfx_2ndPlace_Ch8: ; f0fd2 + togglesfx + sfxtogglenoise $3 + notetype $8 +Sfx_2ndPlace_branch_f0fd7: ; f0fd7 + note C#, 1 + loopchannel 6, Sfx_2ndPlace_branch_f0fd7 + note B_, 12 + note B_, 12 + note B_, 12 + note __, 6 + endchannel +; f0fe1 + + + + +Sfx_1stPlace: ; f0fe2 + dbw $c4, Sfx_1stPlace_Ch5 + dbw $05, Sfx_1stPlace_Ch6 + dbw $06, Sfx_1stPlace_Ch7 + dbw $07, Sfx_1stPlace_Ch8 +; f0fee + +Sfx_1stPlace_Ch5: ; f0fee + togglesfx + tempo 124 + volume $77 + dutycycle $3 + vibrato $c, $34 + notetype $c, $a1 + octave 5 + note D_, 2 + octave 4 + note B_, 2 + octave 5 + note D_, 2 + note A#, 1 + note F_, 1 + note D_, 1 + note F_, 1 + intensity $91 + note D_, 1 + octave 4 + note A#, 1 + note F_, 1 + note A#, 1 + intensity $81 + octave 5 + note D_, 1 + octave 4 + note A#, 1 + note F_, 1 + note D_, 1 + intensity $a1 + note C_, 2 + note E_, 2 + note G_, 2 + intensity $a7 + note A_, 10 + note __, 6 + endchannel +; f101f + + + + +Sfx_1stPlace_Ch6: ; f1020 + togglesfx + dutycycle $3 + vibrato $c, $34 + notetype $c, $c1 + octave 3 + note B_, 2 + note G_, 2 + note B_, 2 + intensity $b6 + octave 4 + note D_, 12 + intensity $c1 + note E_, 2 + note G_, 2 + octave 5 + note C_, 2 + intensity $b7 + note D_, 10 + note __, 6 + endchannel +; f103c + + + + +Sfx_1stPlace_Ch7: ; f103d + togglesfx + notetype $c, $25 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 6 + note F_, 6 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + note D_, 10 + note __, 6 + endchannel +; f1053 + + + + +Sfx_1stPlace_Ch8: ; f1054 + togglesfx + sfxtogglenoise $4 + notetype $6 + note D_, 4 + note D_, 4 + note D_, 4 + note B_, 12 + note B_, 10 + note C#, 1 + note C#, 1 + note D_, 4 + note D_, 4 + note D_, 4 + notetype $c + note B_, 10 + note __, 6 + endchannel +; f1068 + + + + +Sfx_ChooseACard: ; f1069 + dbw $c4, Sfx_ChooseACard_Ch5 + dbw $05, Sfx_ChooseACard_Ch6 + dbw $06, Sfx_ChooseACard_Ch7 + dbw $07, Sfx_ChooseACard_Ch8 +; f1075 + +Sfx_ChooseACard_Ch5: ; f1075 + togglesfx + tempo 152 + volume $77 + dutycycle $3 + notetype $6, $a4 + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 4 + note C#, 4 + octave 3 + note F_, 1 + note __, 1 + note F_, 1 + note __, 1 + octave 4 + note D_, 4 + octave 3 + note E_, 1 + note __, 1 + note E_, 1 + note __, 1 + octave 4 + note E_, 4 + intensity $71 + octave 3 + note E_, 1 + note F#, 1 + note G#, 1 + note A_, 1 + intensity $91 + note B_, 1 + octave 4 + note C#, 1 + note D_, 1 + note D#, 1 + intensity $a4 + note E_, 4 + note __, 12 + endchannel +; f10a8 + + + + +Sfx_ChooseACard_Ch6: ; f10a9 + togglesfx + dutycycle $3 + notetype $6, $b4 + octave 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note E_, 4 + octave 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note F_, 4 + octave 3 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + octave 4 + note G_, 4 + note G#, 8 + note A_, 4 + note __, 12 + endchannel +; f10c8 + + + + +Sfx_ChooseACard_Ch7: ; f10c9 + togglesfx + notetype $6, $25 + octave 3 + note C#, 1 + note __, 1 + note C#, 1 + note __, 1 + octave 2 + note A_, 4 + octave 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note A_, 4 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + octave 2 + note A_, 4 + octave 3 + note E_, 2 + octave 2 + note G#, 2 + note B_, 2 + note G#, 2 + note A_, 4 + note __, 12 + endchannel +; f10eb + + + + +Sfx_ChooseACard_Ch8: ; f10ec + togglesfx + sfxtogglenoise $4 + notetype $6 + note D_, 2 + note C#, 2 + note B_, 4 + note D_, 2 + note C#, 2 + note B_, 4 + note D_, 2 + note C#, 2 + note D_, 1 + note C#, 1 + note D_, 1 + note C#, 1 + note D_, 2 + note C#, 2 + note C#, 2 + note D_, 2 + note B_, 16 + endchannel +; f1103 + + + + +Sfx_GetTm: ; f1104 + dbw $c4, Sfx_GetTm_Ch5 + dbw $05, Sfx_GetTm_Ch6 + dbw $06, Sfx_GetTm_Ch7 + dbw $07, Sfx_GetTm_Ch8 +; f1110 + +Sfx_GetTm_Ch5: ; f1110 + togglesfx + tempo 144 + volume $77 + dutycycle $3 + vibrato $8, $24 + notetype $c, $a3 + octave 4 + note D_, 1 + note __, 1 + octave 3 + note B_, 1 + octave 4 + note D_, 1 + note G_, 6 + intensity $b1 + note E_, 2 + note F#, 2 + note G_, 2 + intensity $a5 + note F#, 8 + note __, 6 + endchannel +; f1130 + + + + +Sfx_GetTm_Ch6: ; f1131 + togglesfx + dutycycle $3 + vibrato $8, $24 + notetype $c, $b3 + octave 4 + note G_, 1 + note __, 1 + note D_, 1 + note G_, 1 + note B_, 6 + intensity $c1 + note A_, 2 + note B_, 2 + octave 5 + note C_, 2 + intensity $b5 + note D_, 8 + note __, 6 + endchannel +; f114b + + + + +Sfx_GetTm_Ch7: ; f114c + togglesfx + notetype $6, $25 + octave 2 + note B_, 2 + note __, 2 + note G_, 2 + note B_, 2 + octave 3 + note D_, 4 + octave 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 4 + octave 3 + note C_, 2 + note __, 2 + octave 2 + note B_, 2 + note __, 2 + octave 3 + note C_, 4 + octave 2 + note A_, 16 + note __, 6 + endchannel +; f1169 + + + + +Sfx_GetTm_Ch8: ; f116a + togglesfx + sfxtogglenoise $4 + notetype $6 + note D_, 4 + note C#, 2 + note D_, 2 + note B_, 8 + note D_, 4 + note C#, 4 + note D_, 4 + note C#, 1 + note C#, 1 + note D_, 2 + note B_, 16 + note __, 6 + endchannel +; f117c + + + + +Sfx_GetBadge: ; f117d + dbw $c4, Sfx_GetBadge_Ch5 + dbw $05, Sfx_GetBadge_Ch6 + dbw $06, Sfx_GetBadge_Ch7 + dbw $07, Sfx_GetBadge_Ch8 +; f1189 + +Sfx_GetBadge_Ch5: ; f1189 + togglesfx + tempo 120 + volume $77 + dutycycle $2 + vibrato $8, $24 + notetype $6, $92 + octave 4 + note F_, 3 + callchannel Sfx_GetBadge_branch_f11aa + note A#, 3 + forceoctave $2 + callchannel Sfx_GetBadge_branch_f11aa + forceoctave $0 + intensity $a7 + note A_, 16 + note __, 6 + endchannel +; f11a9 + + + + +Sfx_GetBadge_branch_f11aa: ; f11aa + note __, 5 + octave 3 + note F_, 2 + note G#, 2 + octave 4 + note C#, 2 + note F_, 2 + note C#, 2 + octave 3 + note F_, 2 + note G#, 2 + octave 4 + note C#, 2 + octave 3 + note F_, 2 + note G#, 2 + octave 4 + note C#, 2 + note F_, 2 + endchannel +; f11be + +Sfx_GetBadge_Ch6: ; f11be + togglesfx + dutycycle $3 + vibrato $8, $24 + notetype $6, $b5 + octave 5 + note C#, 3 + note __, 3 + octave 4 + note G#, 1 + note __, 1 + note G#, 8 + octave 3 + note C#, 2 + note __, 2 + octave 2 + note G#, 2 + note __, 1 + intensity $95 + octave 5 + note C_, 1 + intensity $b5 + note C#, 2 + note __, 2 + note D_, 2 + note __, 2 + note D#, 3 + note __, 3 + octave 4 + note A#, 1 + note __, 1 + note A#, 8 + octave 3 + note D#, 2 + note __, 2 + octave 2 + note A#, 2 + note __, 1 + intensity $95 + octave 5 + note D_, 1 + intensity $b5 + note D#, 8 + note F_, 16 + note __, 6 + endchannel +; f11f4 + + + + +Sfx_GetBadge_Ch7: ; f11f5 + togglesfx + notetype $6, $25 + octave 2 + note G#, 3 + note __, 3 + octave 3 + note C#, 1 + note __, 1 + note C#, 8 + note G#, 2 + note __, 2 + note F_, 2 + note __, 2 + note C#, 2 + note C_, 2 + octave 2 + note A#, 2 + note G#, 2 + note G_, 3 + note __, 3 + octave 3 + note D#, 1 + note __, 1 + note D#, 8 + note A#, 2 + note __, 2 + note G_, 2 + note __, 2 + note G_, 2 + note F_, 2 + note G_, 2 + note D#, 2 + note F_, 16 + note __, 6 + endchannel +; f121a + + + + +Sfx_GetBadge_Ch8: ; f121b + togglesfx + sfxtogglenoise $4 + notetype $6 +Sfx_GetBadge_branch_f1220: ; f1220 + note B_, 12 + note D_, 1 + note D_, 1 + note D_, 2 + note D_, 4 + note D_, 4 + note D_, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + loopchannel 2, Sfx_GetBadge_branch_f1220 + note B_, 16 + note __, 6 + endchannel +; f1235 + + + + +Sfx_QuitSlots: ; f1236 + dbw $c4, Sfx_QuitSlots_Ch5 + dbw $05, Sfx_QuitSlots_Ch6 + dbw $06, Sfx_QuitSlots_Ch7 + dbw $07, Sfx_QuitSlots_Ch8 +; f1242 + +Sfx_QuitSlots_Ch5: ; f1242 + togglesfx + tempo 144 + volume $77 + dutycycle $2 + notetype $8, $82 + octave 3 + note G#, 2 + note __, 4 + note C#, 2 + note F_, 2 + note G#, 2 + note F_, 2 + note G#, 2 + octave 4 + note D_, 2 + note F_, 2 + note D_, 2 + octave 3 + note B_, 2 + note A#, 2 + note F#, 2 + note A#, 2 + note G#, 2 + note F#, 2 + intensity $97 + note G#, 14 + note __, 6 + endchannel +; f1265 + + + + +Sfx_QuitSlots_Ch6: ; f1266 + togglesfx + dutycycle $2 + notetype $8, $b3 + note __, 3 + octave 4 + note B_, 1 + octave 5 + note C_, 2 + octave 4 + note G#, 4 + note A#, 2 + intensity $c1 + note B_, 4 + note A#, 2 + note G#, 4 + note F_, 2 + note F#, 4 + note F_, 2 + note D#, 4 + intensity $b7 + note F_, 14 + note __, 6 + endchannel +; f1282 + + + + +Sfx_QuitSlots_Ch7: ; f1283 + togglesfx + notetype $8, $25 + octave 3 + note C#, 2 + note __, 2 + note F_, 2 + note D#, 2 + note C#, 2 + note G#, 2 + note D_, 2 + note __, 2 + note D_, 2 + octave 2 + note G#, 2 + note B_, 2 + octave 3 + note D_, 2 + note D#, 2 + note __, 2 + octave 2 + note A#, 2 + octave 3 + note C_, 2 + note __, 2 + note C#, 14 + note __, 6 + endchannel +; f12a0 + + + + +Sfx_QuitSlots_Ch8: ; f12a1 + togglesfx + sfxtogglenoise $3 + notetype $8 + note D#, 6 + note D_, 4 + note D#, 2 + note D#, 4 + note D#, 2 + note D_, 4 + note D#, 2 + note D_, 4 + note D#, 2 + note D_, 4 + note B_, 14 + note __, 6 + endchannel +; f12b3 + + + + +Sfx_Protect: ; f12b4 + dbw $44, Sfx_Protect_Ch5 + dbw $07, Sfx_Protect_Ch8 +; f12ba + +Sfx_Protect_Ch5: ; f12ba + togglesfx + notetype $1, $f1 + dutycycle $0 +Sfx_Protect_branch_f12c0: ; f12c0 + octave 5 + note F_, 5 + note A_, 5 + octave 6 + note C_, 5 + note E_, 5 + octave 5 + note F#, 5 + note A#, 5 + octave 6 + note C#, 5 + note E_, 5 + loopchannel 3, Sfx_Protect_branch_f12c0 + intensity $c1 + octave 5 + note F_, 5 + note A_, 5 + intensity $91 + octave 6 + note C_, 5 + note E_, 5 + intensity $71 + octave 5 + note F#, 5 + note A#, 5 + intensity $51 + octave 6 + note C#, 5 + note E_, 5 + endchannel +; f12e5 + +Sfx_Protect_Ch8: ; f12e5 +Sfx_Protect_branch_f12e5: ; f12e5 + noise $9, $9e, $0 + noise $9, $be, $11 + loopchannel 6, Sfx_Protect_branch_f12e5 + noise $9, $a7, $0 + noise $10, $75, $11 + endchannel +; f12f6 + +Sfx_Sketch: ; f12f6 + dbw $04, Sfx_Sketch_Ch5 +; f12f9 + +Sfx_Sketch_Ch5: ; f12f9 + dutycycle $1 + soundinput $a5 +Sfx_Sketch_branch_f12fd: ; f12fd + sound $2, $f1, $06e0 + sound $d, $af, $05b0 + sound $4, $0, $0000 + sound $9, $f4, $0718 + loopchannel 3, Sfx_Sketch_branch_f12fd + soundinput $8 + endchannel +; f1314 + +Sfx_RainDance: ; f1314 + dbw $07, Sfx_RainDance_Ch8 +; f1317 + +Sfx_RainDance_Ch8: ; f1317 +Sfx_RainDance_branch_f1317: ; f1317 + noise $b, $7d, $50 + noise $6, $7d, $4f + noise $b, $7f, $47 + noise $f, $6e, $22 + loopchannel 3, Sfx_RainDance_branch_f1317 + noise $6, $6d, $50 + noise $5, $5d, $4f + noise $5, $4f, $47 + noise $a, $32, $46 + endchannel +; f1334 + +Sfx_Aeroblast: ; f1334 + dbw $44, Sfx_Aeroblast_Ch5 + dbw $07, Sfx_Aeroblast_Ch8 +; f133a + +Sfx_Aeroblast_Ch5: ; f133a + unknownmusic0xde $f2 + soundinput $f5 + sound $1c, $f8, $0580 + soundinput $8 + endchannel +; f1345 + +Sfx_Aeroblast_Ch8: ; f1345 + noise $4, $f8, $6c + noise $4, $c8, $5c + noise $4, $78, $5b + noise $10, $31, $5a + endchannel +; f1352 + +Sfx_Spark: ; f1352 + dbw $07, Sfx_Spark_Ch8 +; f1355 + +Sfx_Spark_Ch8: ; f1355 +Sfx_Spark_branch_f1355: ; f1355 + noise $4, $f8, $5d + noise $4, $d8, $6f + loopchannel 2, Sfx_Spark_branch_f1355 + endchannel +; f1360 + +Sfx_Curse: ; f1360 + dbw $44, Sfx_Curse_Ch5 + dbw $07, Sfx_Curse_Ch8 +; f1366 + +Sfx_Curse_Ch5: ; f1366 + dutycycle $3 + sound $4, $f2, $0483 + sound $4, $f2, $0511 + sound $4, $f2, $0589 + sound $4, $f2, $05ed + endchannel +; f1379 + +Sfx_Curse_Ch8: ; f1379 + noise $14, $9a, $9 + endchannel +; f137d + +Sfx_Rage: ; f137d + dbw $44, Sfx_Rage_Ch5 + dbw $07, Sfx_Rage_Ch8 +; f1383 + +Sfx_Rage_Ch5: ; f1383 + dutycycle $0 + sound $3, $d1, $07b0 + sound $3, $d1, $07c2 + sound $18, $d2, $07d5 + endchannel +; f1392 + +Sfx_Rage_Ch8: ; f1392 + noise $3, $f4, $1a + noise $3, $f4, $19 + noise $18, $f2, $18 + endchannel +; f139c + +Sfx_Thief: ; f139c + dbw $07, Sfx_Thief_Ch8 +; f139f + +Sfx_Thief_Ch8: ; f139f +Sfx_Thief_branch_f139f: ; f139f + noise $0, $0, $0 + noise $4, $e1, $12 + noise $0, $0, $0 + noise $2, $b1, $22 + loopchannel 2, Sfx_Thief_branch_f139f + endchannel +; f13b0 + +Sfx_Thief2: ; f13b0 + dbw $04, Sfx_Thief2_Ch5 +; f13b3 + +Sfx_Thief2_Ch5: ; f13b3 + togglesfx + notetype $2, $f4 + dutycycle $0 + octave 4 + note C#, 3 + note A#, 3 + intensity $d2 + note C#, 3 + note A#, 3 + intensity $b1 + note C_, 3 + note A_, 3 + intensity $81 + note C_, 3 + note A_, 3 + togglesfx + endchannel +; f13ca + +Sfx_SpiderWeb: ; f13ca + dbw $44, Sfx_SpiderWeb_Ch5 + dbw $07, Sfx_SpiderWeb_Ch8 +; f13d0 + +Sfx_SpiderWeb_Ch5: ; f13d0 + dutycycle $0 + sound $20, $7f, $0720 + soundinput $95 + sound $4, $f8, $0620 + sound $4, $e8, $0630 + sound $4, $d8, $0640 + sound $4, $95, $0620 + sound $4, $73, $0630 + sound $4, $51, $0640 + soundinput $8 + endchannel +; f13f3 + +Sfx_SpiderWeb_Ch8: ; f13f3 + noise $20, $ef, $0 + endchannel +; f13f7 + +Sfx_MindReader: ; f13f7 + dbw $44, Sfx_MindReader_Ch5 + dbw $07, Sfx_MindReader_Ch8 +; f13fd + +Sfx_MindReader_Ch5: ; f13fd + togglesfx + dutycycle $2 + notetype $2, $f1 + octave 5 + note C_, 3 + intensity $41 + note C_, 3 + intensity $f1 + note C#, 3 + intensity $41 + note C#, 3 + intensity $f1 + note D_, 3 + intensity $41 + note D_, 3 + togglesfx + endchannel +; f1416 + +Sfx_MindReader_Ch8: ; f1416 + noise $11, $af, $19 + noise $12, $af, $18 + endchannel +; f141d + +Sfx_Nightmare: ; f141d + dbw $04, Sfx_Nightmare_Ch5 +; f1420 + +Sfx_Nightmare_Ch5: ; f1420 + dutycycle $0 + soundinput $34 +Sfx_Nightmare_branch_f1424: ; f1424 + sound $3, $ba, $0631 + sound $2, $0, $0000 + sound $3, $f8, $0621 + sound $2, $0, $0000 + sound $3, $f8, $0611 + sound $2, $0, $0000 + sound $3, $e8, $0601 + sound $2, $0, $0000 + sound $3, $e8, $05f1 + sound $2, $0, $0000 + loopchannel 2, Sfx_Nightmare_branch_f1424 + soundinput $8 + endchannel +; f1453 + +Sfx_Snore: ; f1453 + dbw $07, Sfx_Snore_Ch8 +; f1456 + +Sfx_Snore_Ch8: ; f1456 + noise $2, $ea, $4b + noise $2, $ea, $5b + noise $2, $0, $0 + noise $4, $ee, $47 + noise $4, $ee, $46 + noise $4, $ee, $45 + endchannel +; f1469 + +Sfx_SweetKiss: ; f1469 + dbw $04, Sfx_SweetKiss_Ch5 +; f146c + +Sfx_SweetKiss_Ch5: ; f146c + dutycycle $2 +Sfx_SweetKiss_branch_f146e: ; f146e + sound $2, $c1, $07c8 + sound $2, $d1, $07da + loopchannel 2, Sfx_SweetKiss_branch_f146e + sound $1a, $f1, $07e2 + endchannel +; f147f + +Sfx_SweetKiss2: ; f147f + dbw $04, Sfx_SweetKiss2_Ch5 +; f1482 + +Sfx_SweetKiss2_Ch5: ; f1482 + dutycycle $0 + soundinput $97 + sound $2, $f4, $0772 + sound $4, $0, $0000 + sound $2, $c4, $0772 + sound $4, $0, $0000 + sound $2, $b4, $0772 + sound $4, $0, $0000 + sound $2, $a1, $0772 + soundinput $8 + endchannel +; f14a5 + +Sfx_BellyDrum: ; f14a5 + dbw $44, Sfx_BellyDrum_Ch5 + dbw $07, Sfx_BellyDrum_Ch8 +; f14ab + +Sfx_BellyDrum_Ch5: ; f14ab + dutycycle $2 + soundinput $ac + sound $c, $f1, $05a3 + soundinput $8 + endchannel +; f14b6 + +Sfx_BellyDrum_Ch8: ; f14b6 + noise $c, $b1, $6c + endchannel +; f14ba + +Sfx_Unknown7F: ; f14ba + dbw $04, Sfx_Unknown7F_Ch5 +; f14bd + +Sfx_Unknown7F_Ch5: ; f14bd + dutycycle $2 + soundinput $95 + sound $2, $c9, $03b3 + sound $5, $f8, $0463 + sound $4, $d1, $0543 + soundinput $8 + endchannel +; f14d0 + +Sfx_SludgeBomb: ; f14d0 + dbw $44, Sfx_SludgeBomb_Ch5 + dbw $07, Sfx_SludgeBomb_Ch8 +; f14d6 + +Sfx_SludgeBomb_Ch5: ; f14d6 + dutycycle $2 + soundinput $c5 + sound $3, $f8, $0581 + sound $1, $0, $0000 + soundinput $cb + sound $10, $f2, $05d1 + soundinput $8 + endchannel +; f14eb + +Sfx_SludgeBomb_Ch8: ; f14eb + noise $3, $e2, $6e + noise $1, $0, $0 + noise $10, $e2, $6d + endchannel +; f14f5 + +Sfx_Foresight: ; f14f5 + dbw $04, Sfx_Foresight_Ch5 +; f14f8 + +Sfx_Foresight_Ch5: ; f14f8 + sound $3, $f4, $07b5 + sound $3, $f5, $07c8 + sound $8, $f4, $07da + sound $2, $0, $0000 + sound $8, $c1, $07da + sound $2, $0, $0000 + sound $8, $91, $07da + endchannel +; f1515 + +Sfx_Spite: ; f1515 + dbw $04, Sfx_Spite_Ch5 +; f1518 + +Sfx_Spite_Ch5: ; f1518 + togglesfx + vibrato $0, $12 + dutycycle $3 + soundinput $fd + notetype $3, $f8 + octave 3 + note F_, 3 + note G#, 3 + note B_, 3 + note E_, 3 + note G_, 3 + note A#, 3 + intensity $bf + note D#, 3 + note F#, 3 + note A_, 3 + intensity $5f + note D_, 3 + intensity $2f + note F_, 3 + note G#, 3 + soundinput $8 + togglesfx + endchannel +; f153a + +Sfx_Outrage: ; f153a + dbw $07, Sfx_Outrage_Ch8 +; f153d + +Sfx_Outrage_Ch8: ; f153d + noise $b, $ea, $6c + noise $b, $ea, $6b + noise $b, $ea, $6a + noise $b, $ea, $69 + noise $b, $e1, $59 + endchannel +; f154d + +Sfx_PerishSong: ; f154d + dbw $44, Sfx_PerishSong_Ch5 + dbw $05, Sfx_PerishSong_Ch6 +; f1553 + +Sfx_PerishSong_Ch5: ; f1553 + togglesfx + dutycycle $0 + vibrato $12, $53 + notetype $8, $af + octave 4 + note A_, 9 + note G#, 9 + togglesfx + endchannel +; f1561 + +Sfx_PerishSong_Ch6: ; f1561 + togglesfx + dutycycle $0 + vibrato $12, $53 + notetype $8, $af + octave 4 + note C_, 9 + octave 3 + note B_, 9 + togglesfx + endchannel +; f1570 + +Sfx_GigaDrain: ; f1570 + dbw $44, Sfx_GigaDrain_Ch5 + dbw $07, Sfx_GigaDrain_Ch8 +; f1576 + +Sfx_GigaDrain_Ch5: ; f1576 + dutycycle $2 + soundinput $97 + sound $4, $f8, $0680 + sound $14, $f8, $0680 + sound $14, $c8, $0660 + sound $14, $a8, $0670 + sound $14, $88, $0680 + sound $14, $f8, $0561 + sound $14, $c8, $0541 + sound $14, $a8, $0521 + sound $14, $88, $0511 + soundinput $8 + endchannel +; f15a1 + +Sfx_GigaDrain_Ch8: ; f15a1 + noise $4, $c8, $44 + noise $14, $c8, $50 + noise $14, $c8, $52 + noise $14, $c8, $54 + noise $14, $c8, $56 + noise $40, $c7, $57 + endchannel +; f15b4 + +Sfx_Attract: ; f15b4 + dbw $04, Sfx_Attract_Ch5 +; f15b7 + +Sfx_Attract_Ch5: ; f15b7 + dutycycle $0 + soundinput $77 + sound $4, $a9, $06f0 + sound $c, $f8, $0720 + soundinput $7f + sound $8, $f1, $0740 + soundinput $8 + endchannel +; f15cc + +Sfx_Kinesis2: ; f15cc + dbw $04, Sfx_Kinesis2_Ch5 +; f15cf + +Sfx_Kinesis2_Ch5: ; f15cf + dutycycle $0 + sound $2, $f3, $0796 + sound $2, $23, $0796 + sound $14, $f1, $07c4 + endchannel +; f15de + +Sfx_ZapCannon: ; f15de + dbw $07, Sfx_ZapCannon_Ch8 +; f15e1 + +Sfx_ZapCannon_Ch8: ; f15e1 +Sfx_ZapCannon_branch_f15e1: ; f15e1 + noise $2, $e1, $49 + noise $0, $0, $0 + loopchannel 8, Sfx_ZapCannon_branch_f15e1 + noise $8, $e1, $49 + endchannel +; f15ef + +Sfx_MeanLook: ; f15ef + dbw $04, Sfx_MeanLook_Ch5 +; f15f2 + +Sfx_MeanLook_Ch5: ; f15f2 + soundinput $77 + dutycycle $3 + sound $2, $f8, $0720 +Sfx_MeanLook_branch_f15fa: ; f15fa + sound $1, $88, $0660 + sound $2, $f8, $0790 + loopchannel 5, Sfx_MeanLook_branch_f15fa + sound $c, $f8, $0700 + sound $c, $c8, $0720 + sound $c, $a8, $0700 + sound $c, $78, $0720 + sound $c, $48, $0700 + sound $c, $28, $0720 + soundinput $8 + endchannel +; f1621 + +Sfx_HealBell: ; f1621 + dbw $04, Sfx_HealBell_Ch5 +; f1624 + +Sfx_HealBell_Ch5: ; f1624 + dutycycle $1 + sound $1, $f1, $07da + sound $1, $d1, $07d9 + sound $1, $f1, $07da + sound $8, $d1, $07db + endchannel +; f1637 + +Sfx_Return: ; f1637 + dbw $04, Sfx_Return_Ch5 +; f163a + +Sfx_Return_Ch5: ; f163a + dutycycle $0 +Sfx_Return_branch_f163c: ; f163c + soundinput $bf + sound $8, $f1, $0759 + soundinput $57 + sound $8, $f1, $0759 + sound $10, $0, $0000 + loopchannel 2, Sfx_Return_branch_f163c + soundinput $8 + endchannel +; f1653 + +Sfx_ExpBar: ; f1653 + dbw $04, Sfx_ExpBar_Ch5 +; f1656 + +Sfx_ExpBar_Ch5: ; f1656 + dutycycle $2 + soundinput $d7 + sound $8, $e1, $0750 + soundinput $e7 + sound $8, $48, $06e0 + sound $8, $58, $06f8 + sound $8, $68, $0710 + sound $8, $78, $0728 + sound $8, $88, $0740 + sound $8, $98, $0758 + sound $10, $a8, $0770 + soundinput $8 + endchannel +; f167f + +Sfx_MilkDrink: ; f167f + dbw $04, Sfx_MilkDrink_Ch5 +; f1682 + +Sfx_MilkDrink_Ch5: ; f1682 + dutycycle $2 +Sfx_MilkDrink_branch_f1684: ; f1684 + soundinput $a4 + sound $2, $ea, $04e0 + sound $d, $f7, $0290 + soundinput $9e + sound $4, $c9, $05e1 + sound $2, $0, $0000 + loopchannel 6, Sfx_MilkDrink_branch_f1684 + soundinput $8 + endchannel +; f169f + +Sfx_Present: ; f169f + dbw $04, Sfx_Present_Ch5 +; f16a2 + +Sfx_Present_Ch5: ; f16a2 + dutycycle $2 + soundinput $d6 +Sfx_Present_branch_f16a6: ; f16a6 + sound $2, $f1, $0740 + sound $1, $0, $0000 + loopchannel 3, Sfx_Present_branch_f16a6 + sound $10, $f1, $0780 + soundinput $8 + endchannel +; f16b9 + +Sfx_MorningSun: ; f16b9 + dbw $04, Sfx_MorningSun_Ch5 +; f16bc + +Sfx_MorningSun_Ch5: ; f16bc + dutycycle $3 +Sfx_MorningSun_branch_f16be: ; f16be + sound $2, $f1, $07e4 + sound $2, $f1, $07e0 + sound $5, $f2, $07e7 + loopchannel 3, Sfx_MorningSun_branch_f16be + sound $1, $0, $0000 + sound $8, $c2, $07e7 + sound $1, $0, $0000 + sound $8, $82, $07e7 + endchannel +; f16df + +Sfx_Moonlight: ; f16df + dbw $04, Sfx_Moonlight_Ch5 +; f16e2 + +Sfx_Moonlight_Ch5: ; f16e2 + dutycycle $2 +Sfx_Moonlight_branch_f16e4: ; f16e4 + sound $1, $f8, $07d0 + sound $4, $f1, $07e0 + loopchannel 2, Sfx_Moonlight_branch_f16e4 + sound $10, $f1, $07e0 + sound $10, $d1, $07e0 + sound $10, $81, $07e0 + endchannel +; f16fd + +Sfx_Encore: ; f16fd + dbw $44, Sfx_Encore_Ch5 + dbw $07, Sfx_Encore_Ch8 +; f1703 + +Sfx_Encore_Ch5: ; f1703 + dutycycle $2 + soundinput $ce + sound $10, $0, $0000 +Sfx_Encore_branch_f170b: ; f170b + sound $2, $f8, $0774 + sound $24, $0, $0000 + loopchannel 2, Sfx_Encore_branch_f170b + soundinput $8 + endchannel +; f171a + +Sfx_Encore_Ch8: ; f171a + noise $30, $1f, $36 + noise $30, $76, $36 + endchannel +; f1721 + +Sfx_BeatUp: ; f1721 + dbw $07, Sfx_BeatUp_Ch8 +; f1724 + +Sfx_BeatUp_Ch8: ; f1724 + noise $2, $e8, $69 + noise $6, $d8, $24 + noise $2, $e8, $6c + noise $4, $c8, $46 + noise $6, $d1, $24 + endchannel +; f1734 + +Sfx_SweetScent: ; f1734 + dbw $04, Sfx_SweetScent_Ch5 +; f1737 + +Sfx_SweetScent_Ch5: ; f1737 + dutycycle $2 + soundinput $96 + sound $6, $f8, $0760 + sound $6, $e8, $0720 + soundinput $df + sound $16, $f1, $0730 + soundinput $8 + endchannel +; f174c + +Sfx_BatonPass: ; f174c + dbw $44, Sfx_BatonPass_Ch5 + dbw $07, Sfx_BatonPass_Ch8 +; f1752 + +Sfx_BatonPass_Ch5: ; f1752 + dutycycle $2 + soundinput $f7 + sound $20, $f2, $0680 + sound $1, $f1, $0760 + sound $20, $0, $0000 + sound $1, $f1, $0760 + sound $1a, $0, $0000 + sound $1, $f1, $0760 + soundinput $8 + endchannel +; f1771 + +Sfx_BatonPass_Ch8: ; f1771 + noise $20, $f2, $20 + endchannel +; f1775 + +Sfx_EggCrack: ; f1775 + dbw $04, Sfx_EggCrack_Ch5 +; f1778 + +Sfx_EggCrack_Ch5: ; f1778 + togglesfx + notetype $1, $f1 + dutycycle $0 + octave 4 + note D#, 1 + note C_, 1 + note __, 1 + note F#, 1 + endchannel +; f1784 + +Sfx_Evolved: ; f1784 + dbw $04, Sfx_Evolved_Ch5 +; f1787 + +Sfx_Evolved_Ch5: ; f1787 + togglesfx + notetype $1, $c1 + octave 4 + note C_, 2 + note E_, 2 + note C_, 2 + note E_, 3 + note G_, 3 + note B_, 3 + octave 5 + note E_, 2 + note C_, 2 + note E_, 2 + note G_, 3 + note B_, 3 + octave 7 + note C_, 16 + endchannel +; f179b + +Sfx_MasterBall: ; f179b + dbw $04, Sfx_MasterBall_Ch5 +; f179e + +Sfx_MasterBall_Ch5: ; f179e + togglesfx + dutycycle $1 + notetype $2, $e1 + octave 6 + note B_, 2 + octave 7 + note D_, 2 + octave 6 + note B_, 2 + note G_, 2 + note B_, 2 + note A#, 2 + note A_, 2 + note A#, 2 + note A_, 2 + intensity $c1 + note G#, 2 + note G_, 2 + note F#, 2 + intensity $91 + note F_, 2 + note E_, 2 + note D#, 2 + intensity $61 + note D_, 2 + note C#, 2 + note C_, 2 + endchannel +; f17c0 + +Sfx_EggHatch: ; f17c0 + dbw $04, Sfx_EggHatch_Ch5 +; f17c3 + +Sfx_EggHatch_Ch5: ; f17c3 + togglesfx + notetype $2, $f1 + dutycycle $2 + octave 5 + note E_, 1 + note C_, 1 + note __, 1 + note G_, 1 + note D_, 1 + intensity $e2 + note B_, 7 + intensity $82 + note B_, 7 + intensity $42 + note B_, 7 + endchannel +; f17d9 + +Sfx_GsIntroCharizardFireball: ; f17d9 + dbw $07, Sfx_GsIntroCharizardFireball_Ch8 +; f17dc + +Sfx_GsIntroCharizardFireball_Ch8: ; f17dc + noise $8, $cf, $4d + noise $8, $f1, $37 +Sfx_GsIntroCharizardFireball_branch_f17e2: ; f17e2 + noise $1, $f8, $4f + noise $0, $c8, $26 + noise $1, $d8, $5f + noise $0, $a8, $37 + loopchannel 12, Sfx_GsIntroCharizardFireball_branch_f17e2 + noise $3, $f8, $6f + noise $4, $d8, $5f + noise $c, $d8, $5c + noise $28, $d3, $4f + endchannel +; f17ff + +Sfx_GsIntroPokemonAppears: ; f17ff + dbw $07, Sfx_GsIntroPokemonAppears_Ch8 +; f1802 + +Sfx_GsIntroPokemonAppears_Ch8: ; f1802 + noise $1, $88, $4f + noise $2, $8f, $2 + noise $2, $5f, $12 + noise $2, $3f, $22 + noise $0, $f8, $27 + noise $1, $f8, $4f + noise $8, $f1, $0 + endchannel +; f1818 + +Sfx_Flash: ; f1818 + dbw $04, Sfx_Flash_Ch5 +; f181b + +Sfx_Flash_Ch5: ; f181b + dutycycle $1 + soundinput $ef + sound $1, $40, $07e8 + sound $1, $60, $07e8 + sound $2, $80, $07e8 + sound $5, $a0, $07e8 + sound $6, $a0, $07e8 + sound $7, $80, $07e8 + sound $8, $60, $07e8 + sound $9, $30, $07e8 + sound $f, $12, $07e8 + soundinput $8 + endchannel +; f1846 + +Sfx_GameFreakLogoGs: ; f1846 + dbw $04, Sfx_GameFreakLogoGs_Ch5 +; f1849 + +Sfx_GameFreakLogoGs_Ch5: ; f1849 + dutycycle $3 + soundinput $7f + sound $4, $55, $07e2 + sound $5, $75, $07e2 + sound $6, $94, $07e2 + sound $7, $b4, $07e2 + sound $8, $b3, $07e2 + sound $9, $93, $07e2 + sound $a, $72, $07e2 + sound $a, $53, $07e2 + sound $a, $34, $07e2 + sound $a, $15, $07e2 + soundinput $8 + endchannel +; f1878 + +Sfx_DexFanfareLessThan20: ; f1878 + dbw $c4, Sfx_DexFanfareLessThan20_Ch5 + dbw $05, Sfx_DexFanfareLessThan20_Ch6 + dbw $06, Sfx_DexFanfareLessThan20_Ch7 + dbw $07, Sfx_DexFanfareLessThan20_Ch8 +; f1884 + +Sfx_DexFanfareLessThan20_Ch5: ; f1884 + togglesfx + tempo 124 + volume $77 + notetype $8, $b1 + octave 3 + note A_, 4 + note F#, 2 + note A_, 4 + note F#, 2 + note C#, 6 + note G_, 6 + note F#, 6 + note E_, 2 + note E_, 2 + note E_, 2 + note D_, 6 + endchannel +; f189a + + + + +Sfx_DexFanfareLessThan20_Ch6: ; f189b + togglesfx + notetype $8, $c1 + octave 3 + note B_, 4 + note A_, 2 + note B_, 4 + note A_, 2 + note D#, 6 + note A#, 6 + note A_, 6 + note A_, 2 + note A_, 2 + note G_, 2 + note F#, 6 + endchannel +; f18ac + + + + +Sfx_DexFanfareLessThan20_Ch7: ; f18ad + togglesfx + notetype $8, $25 + octave 4 + note D_, 6 + octave 3 + note A_, 2 + note __, 2 + note A_, 2 + note A#, 4 + note G_, 2 + octave 4 + note D#, 6 + note D_, 2 + note __, 4 + octave 3 + note E_, 1 + note __, 1 + note F#, 1 + note __, 1 + note G_, 1 + note __, 1 + note A_, 2 + note __, 6 + endchannel +; f18c7 + + + + +Sfx_DexFanfareLessThan20_Ch8: ; f18c8 + togglesfx + sfxtogglenoise $4 + notetype $c + note C#, 6 + note __, 16 + note __, 12 + endchannel +; f18d1 + + + + +Sfx_DexFanfare140169: ; f18d2 + dbw $c4, Sfx_DexFanfare140169_Ch5 + dbw $05, Sfx_DexFanfare140169_Ch6 + dbw $06, Sfx_DexFanfare140169_Ch7 + dbw $07, Sfx_DexFanfare140169_Ch8 +; f18de + +Sfx_DexFanfare140169_Ch5: ; f18de + togglesfx + tempo 120 + volume $77 + dutycycle $3 + vibrato $12, $34 + notetype $6, $b1 + note __, 8 + octave 3 + note E_, 4 + note E_, 4 + note A_, 4 + octave 4 + note C#, 4 + intensity $a4 + note D_, 4 + note C_, 4 + octave 3 + note A_, 2 + note G_, 2 + note F#, 4 + note G_, 16 + octave 2 + note B_, 8 + note __, 8 + endchannel +; f1900 + + + + +Sfx_DexFanfare140169_Ch6: ; f1901 + togglesfx + dutycycle $2 + vibrato $12, $34 + notetype $6, $c1 + octave 4 + note E_, 4 + note F#, 4 + note G_, 4 + note G_, 4 + note G_, 4 + note G_, 4 + intensity $b4 + note F#, 4 + note G_, 4 + note A_, 4 + octave 5 + note C_, 4 + octave 4 + note B_, 16 + note G_, 8 + note __, 8 + endchannel +; f191d + + + + +Sfx_DexFanfare140169_Ch7: ; f191e + togglesfx + notetype $c, $25 + note __, 4 + octave 2 + note A_, 1 + octave 3 + note C#, 1 + note E_, 1 + note A_, 3 + note C#, 1 + note __, 1 + note D_, 1 + note F#, 1 + note A_, 1 + octave 4 + note D_, 3 + octave 2 + note A_, 1 + note __, 1 + note G_, 1 + note B_, 1 + octave 3 + note D_, 1 + note G_, 3 + octave 2 + note B_, 1 + note __, 1 + note G_, 4 + note __, 4 + endchannel +; f193e + + + + +Sfx_DexFanfare140169_Ch8: ; f193f + togglesfx + sfxtogglenoise $4 + notetype $c + note C_, 4 +Sfx_DexFanfare140169_branch_f1945: ; f1945 + note D_, 4 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + loopchannel 3, Sfx_DexFanfare140169_branch_f1945 + note D_, 8 + endchannel +; f1950 + + + + +Sfx_DexFanfare170199: ; f1951 + dbw $c4, Sfx_DexFanfare170199_Ch5 + dbw $05, Sfx_DexFanfare170199_Ch6 + dbw $06, Sfx_DexFanfare170199_Ch7 + dbw $07, Sfx_DexFanfare170199_Ch8 +; f195d + +Sfx_DexFanfare170199_Ch5: ; f195d + togglesfx + tempo 112 + volume $77 + vibrato $12, $34 + dutycycle $3 + notetype $8, $b4 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 6 + note __, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + intensity $c1 + note F_, 4 + note G_, 4 + note A_, 4 + notetype $c, $a8 + note A#, 12 + note __, 4 + endchannel +; f1981 + + + + +Sfx_DexFanfare170199_Ch6: ; f1982 + togglesfx + vibrato $12, $34 + dutycycle $3 + notetype $8, $c4 + octave 3 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 6 + note __, 2 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + intensity $d1 + octave 4 + note D#, 4 + note D#, 4 + note D#, 4 + notetype $c, $b8 + note D_, 12 + note __, 4 + endchannel +; f19a2 + + + + +Sfx_DexFanfare170199_Ch7: ; f19a3 + togglesfx + notetype $8, $25 + octave 3 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note D#, 6 + note __, 2 + note D#, 1 + note __, 1 + note D#, 1 + note __, 1 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + note C_, 2 + note __, 2 + notetype $c, $25 + octave 2 + note A#, 12 + note __, 4 + endchannel +; f19bf + + + + +Sfx_DexFanfare170199_Ch8: ; f19c0 + togglesfx + sfxtogglenoise $4 + notetype $8 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 4 + note D_, 2 + note D_, 2 + note D_, 4 + note D_, 4 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + notetype $c + note B_, 16 + endchannel +; f19d5 + + + + +Sfx_DexFanfare200229: ; f19d6 + dbw $c4, Sfx_DexFanfare200229_Ch5 + dbw $05, Sfx_DexFanfare200229_Ch6 + dbw $06, Sfx_DexFanfare200229_Ch7 + dbw $07, Sfx_DexFanfare200229_Ch8 +; f19e2 + +Sfx_DexFanfare200229_Ch5: ; f19e2 + togglesfx + tempo 124 + volume $77 + vibrato $12, $34 + dutycycle $3 + notetype $8, $b2 + octave 3 + note C_, 2 + note E_, 2 + note G_, 2 + octave 4 + note C_, 4 + octave 3 + note B_, 4 + note A_, 4 + note A#, 4 + octave 4 + note D#, 4 + note G_, 4 + notetype $c, $a8 + note F#, 12 + note __, 4 + endchannel +; f1a03 + + + + +Sfx_DexFanfare200229_Ch6: ; f1a04 + togglesfx + vibrato $12, $34 + dutycycle $3 + notetype $8, $b2 + octave 3 + note E_, 2 + note G_, 2 + octave 4 + note C_, 2 + note E_, 4 + note D_, 4 + note C_, 4 + note D#, 4 + note G_, 4 + note A#, 4 + notetype $c, $b8 + note A_, 12 + note __, 4 + endchannel +; f1a1e + + + + +Sfx_DexFanfare200229_Ch7: ; f1a1f + togglesfx + notetype $8, $25 + octave 3 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 1 + note __, 1 + note C_, 2 + note E_, 2 + note G_, 2 + octave 4 + note C_, 2 + octave 3 + note C_, 4 + note D#, 2 + note G_, 2 + note A#, 2 + octave 4 + note D#, 2 + octave 3 + note D#, 4 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note A_, 2 + octave 3 + note D_, 1 + note __, 1 + note D_, 1 + note __, 1 + octave 2 + note A_, 2 + octave 3 + note D_, 6 + note __, 6 + endchannel +; f1a49 + + + + +Sfx_DexFanfare200229_Ch8: ; f1a4a + togglesfx + sfxtogglenoise $4 + notetype $8 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note D_, 4 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note D_, 4 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 2 + note B_, 12 + endchannel +; f1a65 + + + + +Sfx_DexFanfare230Plus: ; f1a66 + dbw $c4, Sfx_DexFanfare230Plus_Ch5 + dbw $05, Sfx_DexFanfare230Plus_Ch6 + dbw $06, Sfx_DexFanfare230Plus_Ch7 + dbw $07, Sfx_DexFanfare230Plus_Ch8 +; f1a72 + +Sfx_DexFanfare230Plus_Ch5: ; f1a72 + togglesfx + tempo 112 + volume $77 + vibrato $12, $34 + dutycycle $3 + notetype $8, $a5 + octave 3 + note B_, 2 + note G_, 2 + note B_, 2 + octave 4 + note D_, 14 + note __, 2 + dutycycle $2 + intensity $85 + octave 2 + note F_, 1 + note __, 1 + note F_, 6 + intensity $a5 + dutycycle $3 + octave 3 + note A_, 2 + note G_, 2 + note F_, 10 + note __, 2 + dutycycle $2 + intensity $85 + octave 2 + note F_, 1 + note __, 1 + note F_, 6 + intensity $a5 + dutycycle $3 + octave 3 + note A#, 12 + intensity $b2 + note G_, 4 + note A_, 4 + note A#, 4 + notetype $c, $a8 + note A_, 14 + note __, 2 + endchannel +; f1ab1 + + + + +Sfx_DexFanfare230Plus_Ch6: ; f1ab2 + togglesfx + vibrato $12, $34 + dutycycle $3 + notetype $8, $b5 + octave 4 + note G_, 2 + note D_, 2 + note G_, 2 + note F_, 14 + note __, 4 + note F_, 2 + note E_, 2 + note D_, 2 + note C_, 2 + octave 3 + note B_, 2 + note A_, 10 + note __, 4 + note A_, 2 + octave 4 + note C_, 2 + note D_, 2 + note D#, 12 + intensity $c2 + note G_, 4 + note G_, 4 + note G_, 4 + notetype $c, $b8 + note F#, 14 + note __, 2 + endchannel +; f1ad9 + + + + +Sfx_DexFanfare230Plus_Ch7: ; f1ada + togglesfx + notetype $8, $25 + octave 3 + note G_, 6 + note A#, 4 + note F_, 2 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 1 + note __, 1 + note A#, 2 + note __, 2 + note D_, 1 + note __, 1 + note D_, 6 + note A_, 4 + note F_, 2 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 1 + note __, 1 + note A_, 2 + note __, 2 + note C_, 1 + note __, 1 + note C_, 6 + note G_, 4 + note D#, 2 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + note A#, 4 + note G_, 4 + note D#, 4 + notetype $c, $25 + note D_, 14 + note __, 2 + endchannel +; f1b0b + + + + +Sfx_DexFanfare230Plus_Ch8: ; f1b0c + togglesfx + sfxtogglenoise $4 + notetype $8 + note D_, 2 + note D_, 2 + note D_, 2 +Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 + note D_, 6 + note D_, 2 + note D_, 2 + note D_, 2 + note D_, 6 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + note C#, 1 + loopchannel 2, Sfx_DexFanfare230Plus_branch_f1b14 + note D_, 6 + note D_, 2 + note D_, 2 + note C#, 1 + note C#, 1 + note D_, 4 + note D_, 4 + note D_, 4 +Sfx_DexFanfare230Plus_branch_f1b2b: ; f1b2b + note C#, 1 + loopchannel 18, Sfx_DexFanfare230Plus_branch_f1b2b + note D_, 6 + endchannel +; f1b32 + + + + +Sfx_NotVeryEffective: ; f1b33 + dbw $07, Sfx_NotVeryEffective_Ch8 +; f1b36 + +Sfx_NotVeryEffective_Ch8: ; f1b36 + noise $4, $f1, $5f + noise $1, $a0, $42 + noise $10, $f1, $53 + endchannel +; f1b40 + +Sfx_Damage: ; f1b40 + dbw $07, Sfx_Damage_Ch8 +; f1b43 + +Sfx_Damage_Ch8: ; f1b43 + noise $4, $f1, $5e + noise $1, $a0, $12 + noise $4, $f0, $32 + noise $10, $f1, $44 + endchannel +; f1b50 + +Sfx_SuperEffective: ; f1b50 + dbw $07, Sfx_SuperEffective_Ch8 +; f1b53 + +Sfx_SuperEffective_Ch8: ; f1b53 + noise $3, $f1, $4f + noise $1, $c8, $22 + noise $2, $f8, $3f + noise $3, $d0, $15 + noise $20, $f2, $35 + endchannel +; f1b63 + +Sfx_BallBounce: ; f1b63 + dbw $44, Sfx_BallBounce_Ch5 + dbw $05, Sfx_BallBounce_Ch6 +; f1b69 + +Sfx_BallBounce_Ch5: ; f1b69 + dutycycle $2 + sound $8, $e1, $0740 + sound $17, $0, $0000 + sound $8, $b1, $0740 + sound $17, $0, $0000 + sound $8, $81, $0740 + sound $17, $0, $0000 + sound $8, $51, $0740 + sound $17, $0, $0000 + endchannel +; f1b8c + +Sfx_BallBounce_Ch6: ; f1b8c + dutycycle $2 + sound $2, $8, $0000 + sound $8, $b1, $0741 + sound $17, $0, $0000 + sound $8, $81, $0741 + sound $17, $0, $0000 + sound $8, $51, $0741 + sound $17, $0, $0000 + sound $8, $21, $0741 + sound $17, $0, $0000 + endchannel +; f1bb3 + +Sfx_SweetScent2: ; f1bb3 + dbw $44, Sfx_SweetScent2_Ch5 + dbw $07, Sfx_SweetScent2_Ch8 +; f1bb9 + +Sfx_SweetScent2_Ch5: ; f1bb9 + soundinput $af + dutycycle $1 + sound $6, $f8, $05f0 + sound $2, $f1, $0620 + sound $10, $f1, $0650 + soundinput $8 + endchannel +; f1bcc + +Sfx_SweetScent2_Ch8: ; f1bcc + noise $2, $e8, $22 + noise $11, $aa, $0 +Sfx_SweetScent2_branch_f1bd2: ; f1bd2 + noise $4, $d9, $10 + noise $8, $91, $0 + noise $2, $61, $7 + loopchannel 5, Sfx_SweetScent2_branch_f1bd2 + noise $4, $99, $0 + noise $a, $61, $0 + noise $6, $59, $0 + noise $2, $21, $7 + endchannel +; f1bec + +Sfx_HitEndOfExpBar: ; f1bec + dbw $44, Sfx_HitEndOfExpBar_Ch5 + dbw $05, Sfx_HitEndOfExpBar_Ch6 +; f1bf2 + +Sfx_HitEndOfExpBar_Ch5: ; f1bf2 + dutycycle $2 + sound $1, $e1, $0789 + sound $1, $e1, $07a2 + sound $10, $e1, $07b1 + endchannel +; f1c01 + +Sfx_HitEndOfExpBar_Ch6: ; f1c01 + dutycycle $2 + sound $1, $e1, $07a2 + sound $1, $e1, $07b1 + sound $10, $e1, $07c4 + endchannel +; f1c10 + +Sfx_GiveTrademon: ; f1c10 + dbw $04, Sfx_GiveTrademon_Ch5 +; f1c13 + +Sfx_GiveTrademon_Ch5: ; f1c13 + sound $20, $0, $0000 + dutycycle $1 + soundinput $a7 + sound $1b, $f4, $0750 + sound $1b, $d4, $0750 + sound $1b, $b4, $0750 + sound $1b, $94, $0750 + sound $1b, $74, $0750 + sound $1b, $54, $0750 + sound $1b, $34, $0750 + sound $1b, $14, $0750 + soundinput $8 + endchannel +; f1c3e + +Sfx_GetTrademon: ; f1c3e + dbw $04, Sfx_GetTrademon_Ch5 +; f1c41 + +Sfx_GetTrademon_Ch5: ; f1c41 + sound $20, $0, $0000 + dutycycle $2 + soundinput $bf + sound $1b, $14, $07bc + sound $1b, $34, $07bc + sound $1b, $54, $07bc + sound $1b, $74, $07bc + sound $1b, $94, $07bc + sound $1b, $b4, $07bc + sound $1b, $d4, $07bc + sound $1b, $f4, $07bc + soundinput $8 + endchannel +; f1c6c + +Sfx_TrainArrived: ; f1c6c + dbw $84, Sfx_TrainArrived_Ch5 + dbw $05, Sfx_TrainArrived_Ch6 + dbw $07, Sfx_TrainArrived_Ch8 +; f1c75 + +Sfx_TrainArrived_Ch6: ; f1c75 + tone $0008 + sound $8, $0, $0000 +Sfx_TrainArrived_Ch5: ; f1c7c + dutycycle $2 + sound $4, $5f, $0691 + sound $4, $6f, $0694 + sound $4, $78, $0697 + sound $4, $7f, $069a + sound $4, $68, $06ae + sound $10, $6f, $06ab + sound $68, $65, $06a8 + endchannel +; f1c9b + +Sfx_TrainArrived_Ch8: ; f1c9b + noise $5, $af, $10 + noise $4, $9f, $20 + noise $4, $8f, $21 + noise $4, $7f, $22 + noise $4, $8f, $21 + noise $4, $9f, $20 + noise $4, $9f, $10 + noise $68, $a3, $0 + endchannel +; f1cb4 + +Sfx_2Boops: ; f1cb4 + dbw $04, Sfx_2Boops_Ch5 +; f1cb7 + +Sfx_2Boops_Ch5: ; f1cb7 + dutycycle $2 +Sfx_2Boops_branch_f1cb9: ; f1cb9 + soundinput $79 + sound $1, $99, $0563 + sound $4, $f2, $04b5 + soundinput $43 + sound $10, $f8, $05cd + loopchannel 2, Sfx_2Boops_branch_f1cb9 + soundinput $8 + endchannel +; f1cd0 + +Sfx_UnknownCB: ; f1cd0 + dbw $07, Sfx_UnknownCB_Ch8 +; f1cd3 + +Sfx_Menu_Ch8: ; f1cd3 + noise $1, $e2, $33 + noise $8, $e1, $22 + endchannel +; f1cda + +Sfx_Pokeflute_Ch7: ; f1cda + tempo 256 + volume $77 + togglesfx + vibrato $10, $14 + notetype $c, $10 + octave 5 + note E_, 2 + note F_, 2 + note G_, 4 + note A_, 2 + note G_, 2 + octave 6 + note C_, 4 + note C_, 2 + note D_, 2 + note C_, 2 + octave 5 + note G_, 2 + note A_, 2 + note F_, 2 + note G_, 8 + note __, 12 + endchannel +; f1cf8 + +Sfx_PlacePuzzlePieceDown_Ch8: ; f1cf8 + noise $2, $f7, $24 + noise $2, $f7, $34 + noise $4, $f7, $44 + noise $8, $f4, $55 + noise $8, $f1, $44 + endchannel +; f1d08 + +Sfx_EnterDoor_Ch8: ; f1d08 + noise $9, $f1, $44 + noise $8, $d1, $43 + endchannel +; f1d0f + +Sfx_SwitchPokemon_Ch5: ; f1d0f + dutycycle $2 + sound $8, $e1, $0740 + endchannel +; f1d16 + +Sfx_SwitchPokemon_Ch6: ; f1d16 + dutycycle $2 + sound $2, $8, $0000 + sound $8, $b1, $0741 + endchannel +; f1d21 + +Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21 + dutycycle $2 + soundinput $3a + sound $4, $f2, $0200 + soundinput $22 + sound $8, $e2, $0200 + soundinput $8 + endchannel +; f1d32 + +Sfx_BallWiggle_Ch5: ; f1d32 + dutycycle $2 + soundinput $3a + sound $4, $f2, $0400 + soundinput $22 + sound $8, $e2, $0400 + soundinput $8 + endchannel +; f1d43 + +Sfx_Tally_Ch5: ; f1d43 + dutycycle $2 + sound $4, $f1, $0780 + endchannel +; f1d4a + +Sfx_Tally_Ch6: ; f1d4a + dutycycle $2 + sound $1, $8, $0000 + sound $4, $a1, $0761 + endchannel +; f1d55 + +Sfx_Transaction_Ch5: ; f1d55 + dutycycle $2 + sound $4, $e1, $0700 + sound $18, $f2, $07e0 + endchannel +; f1d60 + +Sfx_Transaction_Ch6: ; f1d60 + dutycycle $2 + sound $1, $8, $0000 + sound $4, $91, $06c1 + sound $18, $a2, $07a1 + endchannel +; f1d6f + +Sfx_Bump_Ch5: ; f1d6f + dutycycle $2 + soundinput $5a + sound $f, $f1, $0300 + soundinput $8 + endchannel +; f1d7a + +Sfx_ExitBuilding_Ch8: ; f1d7a + noise $2, $f1, $54 + noise $c, $71, $23 + noise $2, $b1, $54 + noise $c, $61, $23 + noise $6, $41, $54 + endchannel +; f1d8a + +Sfx_ReadText2_Ch5: ; f1d8a +Sfx_ReadText_Ch5: ; f1d8a + dutycycle $2 + sound $0, $91, $07c0 + sound $0, $81, $07d0 + sound $0, $91, $07c0 + sound $c, $a1, $07d0 + endchannel +; f1d9d + +Sfx_Potion_Ch5: ; f1d9d + dutycycle $2 + soundinput $17 + sound $f, $f0, $04f0 + sound $f, $f2, $0650 + soundinput $8 + endchannel +; f1dac + +Sfx_Poison_Ch5: ; f1dac +Sfx_Poison_branch_f1dac: ; f1dac + dutycycle $0 + soundinput $14 + sound $4, $f2, $0600 + loopchannel 4, Sfx_Poison_branch_f1dac + sound $f, $f3, $0600 + soundinput $8 + endchannel +; f1dbf + +Sfx_FullHeal_Ch5: ; f1dbf + dutycycle $2 + soundinput $14 + sound $4, $f2, $0600 + sound $4, $f2, $0600 + soundinput $17 + sound $f, $f2, $0600 + soundinput $8 + endchannel +; f1dd4 + +Sfx_GotSafariBalls_Ch5: ; f1dd4 + dutycycle $2 + soundinput $15 + sound $f, $f0, $04f0 + sound $f, $f2, $0650 + soundinput $8 + endchannel +; f1de3 + +Sfx_BootPc_Ch5: ; f1de3 + dutycycle $2 + sound $f, $f2, $07c0 + sound $f, $0, $0000 + sound $3, $a1, $0780 + sound $3, $a1, $0700 + sound $3, $a1, $0740 + sound $3, $a1, $0700 + sound $3, $a1, $0780 + sound $3, $a1, $0700 + sound $3, $a1, $07c0 + sound $8, $a1, $0700 + endchannel +; f1e0e + +Sfx_ShutDownPc_Ch5: ; f1e0e + dutycycle $2 + sound $4, $f0, $0600 + sound $4, $f0, $0400 + sound $4, $f0, $0200 + sound $1, $0, $0000 + endchannel +; f1e21 + +Sfx_ChoosePcOption_Ch5: ; f1e21 + dutycycle $2 + sound $6, $f0, $0700 + sound $4, $0, $0000 + sound $6, $f0, $0700 + sound $1, $0, $0000 + endchannel +; f1e34 + +Sfx_EscapeRope_Ch5: ; f1e34 + dutycycle $1 + soundinput $17 + sound $f, $d7, $0600 + sound $f, $b7, $0580 + sound $f, $87, $0500 + sound $f, $47, $0480 + sound $f, $17, $0400 + soundinput $8 + endchannel +; f1e4f + +Sfx_PushButton_Ch5: ; f1e4f + dutycycle $2 + sound $4, $0, $0000 + sound $2, $f1, $0680 + sound $1, $0, $0000 + sound $4, $f1, $0780 + sound $4, $0, $0000 + endchannel +; f1e66 + +Sfx_SecondPartOfItemfinder_Ch5: ; f1e66 + dutycycle $2 + soundinput $2c + sound $4, $f2, $0500 + soundinput $22 + sound $2, $f1, $0500 + soundinput $8 + sound $1, $0, $0000 + endchannel +; f1e7b + +Sfx_WarpTo_Ch5: ; f1e7b + dutycycle $1 + soundinput $17 + sound $f, $d7, $0500 + sound $f, $b7, $0580 + sound $f, $87, $0600 + sound $f, $47, $0680 + sound $f, $17, $0700 + soundinput $8 + endchannel +; f1e96 + +Sfx_WarpFrom_Ch5: ; f1e96 + dutycycle $1 + soundinput $17 + sound $f, $d7, $0700 + sound $f, $b7, $0680 + sound $f, $87, $0600 + sound $f, $47, $0580 + sound $f, $17, $0500 + soundinput $8 + endchannel +; f1eb1 + +Sfx_ChangeDexMode_Ch5: ; f1eb1 + dutycycle $1 + soundinput $16 + sound $f, $d2, $0500 + soundinput $8 + endchannel +; f1ebc + +Sfx_JumpOverLedge_Ch5: ; f1ebc + dutycycle $2 + soundinput $95 + sound $f, $f2, $0400 + soundinput $8 + endchannel +; f1ec7 + +Sfx_GrassRustle_Ch8: ; f1ec7 + noise $2, $f1, $32 + noise $2, $0, $0 + noise $2, $f1, $22 + noise $1, $0, $0 + endchannel +; f1ed4 + +Sfx_Fly_Ch8: ; f1ed4 + noise $2, $f1, $12 + noise $2, $0, $0 + noise $2, $a1, $12 + noise $2, $0, $0 + noise $2, $d1, $12 + noise $2, $0, $0 + noise $2, $81, $12 + noise $2, $0, $0 + noise $2, $b1, $12 + noise $2, $0, $0 + noise $2, $61, $12 + noise $2, $0, $0 + noise $2, $91, $12 + noise $2, $0, $0 + noise $2, $41, $12 + noise $2, $0, $0 + endchannel +; f1f05 + +Sfx_Wrong_Ch5: ; f1f05 + dutycycle $3 + soundinput $5a + sound $4, $f0, $0500 + soundinput $8 + sound $4, $0, $0000 + sound $f, $f0, $0500 + sound $1, $0, $0000 + endchannel +; f1f1c + +Sfx_Wrong_Ch6: ; f1f1c + dutycycle $3 + sound $4, $f0, $0401 + sound $4, $0, $0000 + sound $f, $f0, $0401 + sound $1, $0, $0000 + endchannel +; f1f2f + +Sfx_Squeak_Ch5: ; f1f2f + dutycycle $0 + soundinput $17 + sound $f, $d2, $0700 + soundinput $8 + endchannel +; f1f3a + +Sfx_Strength_Ch8: ; f1f3a + noise $4, $a2, $23 + noise $8, $f1, $34 + noise $f, $0, $0 + noise $2, $f7, $24 + noise $2, $f7, $34 + noise $4, $f7, $44 + noise $8, $f4, $55 + noise $8, $f1, $44 + endchannel +; f1f53 + +Sfx_Boat_Ch5: ; f1f53 + dutycycle $2 + sound $f, $f0, $0500 + sound $4, $0, $0000 + sound $f, $f0, $0500 + sound $f, $f0, $0500 + sound $f, $f0, $0500 + sound $f, $f0, $0500 + sound $f, $f2, $0500 + endchannel +; f1f72 + +Sfx_Boat_Ch6: ; f1f72 + dutycycle $3 + sound $f, $f0, $0482 + sound $4, $0, $0000 + sound $f, $f0, $0482 + sound $f, $f0, $0482 + sound $f, $f0, $0482 + sound $f, $f0, $0482 + sound $f, $f2, $0482 + endchannel +; f1f91 + +Sfx_WallOpen_Ch5: ; f1f91 + dutycycle $1 + soundinput $3a + sound $4, $f2, $0500 + soundinput $22 + sound $4, $e2, $0500 + soundinput $3a + sound $4, $f2, $0700 + soundinput $22 + sound $f, $e2, $0700 + soundinput $8 + endchannel +; f1fae + +Sfx_ElevatorEnd_Ch5: ; f1fae + dutycycle $2 + sound $f, $f3, $0730 + sound $8, $65, $0730 + sound $f, $f4, $0700 + sound $f, $74, $0700 + sound $f, $44, $0700 + sound $f, $24, $0700 + endchannel +; f1fc9 + +Sfx_ThrowBall_Ch5: ; f1fc9 + dutycycle $2 + soundinput $2f + sound $f, $f2, $0780 + endchannel +; f1fd2 + +Sfx_ThrowBall_Ch6: ; f1fd2 + dutycycle $2 + sound $f, $c2, $0782 + endchannel +; f1fd9 + +Sfx_Shine_Ch5: ; f1fd9 + dutycycle $0 + sound $0, $d2, $0700 + sound $0, $d2, $0740 + sound $0, $d2, $0780 + sound $0, $d2, $07c0 + sound $a, $e1, $07e0 + sound $1, $0, $0000 + endchannel +; f1ff4 + +Sfx_BallPoof_Ch5: ; f1ff4 + dutycycle $2 + soundinput $16 + sound $f, $f2, $0400 + soundinput $8 + endchannel +; f1fff + +Sfx_BallPoof_Ch8: ; f1fff + noise $f, $a2, $22 + endchannel +; f2003 + +Sfx_Unknown3A_Ch5: ; f2003 + sound $f, $d1, $0200 + soundinput $8 + endchannel +; f200a + +Sfx_Unknown3A_Ch8: ; f200a + noise $4, $f5, $33 + noise $8, $f4, $22 + noise $f, $f2, $21 + endchannel +; f2014 + +Sfx_Run_Ch8: ; f2014 + noise $2, $61, $23 + noise $2, $a1, $33 + noise $2, $c1, $33 + noise $2, $51, $11 + noise $2, $f1, $33 + noise $2, $41, $11 + noise $2, $c1, $33 + noise $2, $31, $11 + noise $2, $81, $33 + noise $2, $31, $11 + noise $8, $41, $33 + endchannel +; f2036 + +Sfx_SlotMachineStart_Ch5: ; f2036 + dutycycle $2 + soundinput $44 + sound $f, $f0, $04f0 + soundinput $17 + sound $f, $f2, $0650 + soundinput $8 + endchannel +; f2047 + +Sfx_SlotMachineStart_Ch6: ; f2047 + dutycycle $2 + sound $f, $92, $0600 + sound $f, $92, $0782 + endchannel +; f2052 + +Sfx_Call_Ch5: ; f2052 + soundinput $67 + sound $4, $f7, $07a0 + sound $4, $f7, $07a0 + sound $4, $f7, $07a0 + sound $4, $f7, $07a0 + sound $4, $f7, $07a0 + soundinput $8 + sound $4, $0, $0000 + endchannel +; f206f + +Sfx_Peck_Ch8: ; f206f + noise $2, $a1, $12 + endchannel +; f2073 + +Sfx_Kinesis_Ch5: ; f2073 + dutycycle $1 + soundinput $af + sound $f, $f2, $0780 + soundinput $8 + endchannel +; f207e + +Sfx_Lick_Ch5: ; f207e + dutycycle $1 + soundinput $97 + sound $f, $f2, $0500 + soundinput $8 + endchannel +; f2089 + +Sfx_Pound_Ch8: ; f2089 + noise $2, $a1, $22 + endchannel +; f208d + +Sfx_MovePuzzlePiece_Ch8: ; f208d + noise $8, $f1, $54 + endchannel +; f2091 + +Sfx_CometPunch_Ch8: ; f2091 + noise $f, $8f, $11 + noise $4, $ff, $12 + noise $a, $f1, $55 + endchannel +; f209b + +Sfx_MegaPunch_Ch8: ; f209b + noise $f, $8f, $34 + noise $8, $f2, $35 + noise $a, $f1, $55 + endchannel +; f20a5 + +Sfx_Scratch_Ch8: ; f20a5 + noise $f, $9f, $23 + noise $8, $f1, $21 + endchannel +; f20ac + +Sfx_Vicegrip_Ch8: ; f20ac + noise $2, $e1, $4b + noise $a, $f1, $44 + noise $2, $e1, $3a + noise $6, $f1, $34 + endchannel +; f20b9 + +Sfx_RazorWind_Ch8: ; f20b9 + noise $2, $f4, $44 + noise $2, $f4, $14 + noise $f, $f1, $32 + endchannel +; f20c3 + +Sfx_Cut_Ch8: ; f20c3 + noise $4, $8f, $55 + noise $2, $f4, $44 + noise $8, $f4, $22 + noise $f, $f2, $21 + endchannel +; f20d0 + +Sfx_WingAttack_Ch8: ; f20d0 +Sfx_WingAttack_branch_f20d0: ; f20d0 + noise $8, $4f, $23 + noise $4, $c4, $22 + noise $6, $f2, $23 + loopchannel 4, Sfx_WingAttack_branch_f20d0 + endchannel +; f20de + +Sfx_Whirlwind_Ch8: ; f20de + noise $8, $4f, $33 + noise $4, $c4, $22 + noise $6, $f2, $23 + noise $f, $f2, $22 + endchannel +; f20eb + +Sfx_Bind_Ch8: ; f20eb + noise $8, $ff, $32 + noise $8, $f4, $43 + noise $8, $f2, $54 + noise $8, $f1, $65 + endchannel +; f20f8 + +Sfx_VineWhip_Ch8: ; f20f8 + noise $1, $c2, $33 + noise $2, $f2, $21 + noise $1, $e2, $33 + noise $1, $c2, $32 + noise $1, $92, $12 + noise $1, $b2, $31 + noise $c, $91, $10 + noise $8, $f2, $41 + endchannel +; f2111 + +Sfx_DoubleKick_Ch8: ; f2111 + noise $1, $94, $23 + noise $1, $b4, $22 + noise $8, $f1, $44 + endchannel +; f211b + +Sfx_MegaKick_Ch8: ; f211b + noise $2, $94, $33 + noise $4, $b4, $22 + noise $4, $f1, $44 + noise $8, $f1, $55 + endchannel +; f2128 + +Sfx_Headbutt_Ch8: ; f2128 + noise $4, $ff, $55 + noise $8, $f1, $65 + endchannel +; f212f + +Sfx_HornAttack_Ch8: ; f212f + noise $2, $84, $43 + noise $2, $c4, $22 + noise $8, $f2, $34 + endchannel +; f2139 + +Sfx_Tackle_Ch8: ; f2139 + noise $4, $f1, $34 + noise $f, $f2, $64 + endchannel +; f2140 + +Sfx_PoisonSting_Ch8: ; f2140 + noise $2, $f1, $22 + noise $f, $f2, $12 + endchannel +; f2147 + +Sfx_Powder_Ch8: ; f2147 + noise $2, $c2, $1 + noise $f, $f4, $1 + noise $f, $f2, $1 + endchannel +; f2151 + +Sfx_Doubleslap_Ch8: ; f2151 + noise $8, $f1, $32 + noise $8, $f1, $33 + endchannel +; f2158 + +Sfx_Bite_Ch5: ; f2158 + dutycycle $0 + soundinput $3a + sound $4, $f2, $0200 + soundinput $22 + sound $8, $e2, $0200 + soundinput $8 + endchannel +; f2169 + +Sfx_Bite_Ch8: ; f2169 + noise $0, $d1, $42 + noise $4, $a1, $32 + noise $0, $d1, $22 + noise $6, $a1, $32 + endchannel +; f2176 + +Sfx_JumpKick_Ch8: ; f2176 + noise $3, $92, $31 + noise $3, $b2, $32 + noise $3, $c2, $33 + noise $8, $f1, $54 + endchannel +; f2183 + +Sfx_Stomp_Ch8: ; f2183 + noise $c, $f1, $54 + noise $8, $f1, $64 + endchannel +; f218a + +Sfx_TailWhip_Ch8: ; f218a + noise $2, $f1, $33 + noise $2, $c1, $32 + noise $2, $a1, $31 + noise $f, $82, $32 + noise $8, $f1, $34 + endchannel +; f219a + +Sfx_KarateChop_Ch8: ; f219a + noise $2, $d2, $32 + noise $f, $f2, $43 + endchannel +; f21a1 + +Sfx_Submission_Ch8: ; f21a1 + noise $2, $f2, $43 + noise $4, $b5, $32 + noise $9, $86, $31 + noise $7, $64, $0 + noise $f, $f2, $55 + endchannel +; f21b1 + +Sfx_WaterGun_Ch5: ; f21b1 + dutycycle $1 + soundinput $97 + sound $f, $f2, $0700 + soundinput $8 + endchannel +; f21bc + +Sfx_WaterGun_Ch8: ; f21bc + noise $f, $3f, $22 + noise $f, $f2, $21 + endchannel +; f21c3 + +Sfx_SwordsDance_Ch8: ; f21c3 + noise $f, $4f, $41 + noise $8, $8f, $41 + noise $8, $cf, $41 + noise $8, $f2, $42 + noise $f, $f2, $41 + endchannel +; f21d3 + +Sfx_Thunder_Ch8: ; f21d3 + noise $a, $ff, $50 + noise $f, $ff, $51 + noise $8, $f2, $51 + noise $6, $ff, $52 + noise $6, $ff, $53 + noise $8, $ff, $54 + noise $f, $f2, $54 + endchannel +; f21e9 + +Sfx_Supersonic_Ch5: ; f21e9 + dutycycle $2 + sound $f, $3f, $07c0 +Sfx_Supersonic_branch_f21ef: ; f21ef + sound $f, $df, $07c0 + loopchannel 4, Sfx_Supersonic_branch_f21ef + sound $f, $d1, $07c0 + endchannel +; f21fc + +Sfx_Supersonic_Ch6: ; f21fc + unknownmusic0xde $b3 + sound $f, $2f, $07c8 +Sfx_Supersonic_branch_f2202: ; f2202 + sound $f, $cf, $07c7 + loopchannel 4, Sfx_Supersonic_branch_f2202 + sound $f, $c1, $07c8 + endchannel +; f220f + +Sfx_Supersonic_Ch8: ; f220f +Sfx_Supersonic_branch_f220f: ; f220f + noise $3, $97, $12 + noise $3, $a1, $11 + loopchannel 10, Sfx_Supersonic_branch_f220f + endchannel +; f221a + +Sfx_Leer_Ch5: ; f221a +Sfx_Leer_branch_f221a: ; f221a + dutycycle $0 + sound $0, $f1, $07c0 + sound $0, $f1, $0700 + loopchannel 12, Sfx_Leer_branch_f221a + endchannel +; f2229 + +Sfx_Leer_Ch6: ; f2229 +Sfx_Leer_branch_f2229: ; f2229 + unknownmusic0xde $b3 + sound $0, $e1, $07c1 + sound $0, $e1, $0701 + loopchannel 12, Sfx_Leer_branch_f2229 + endchannel +; f2238 + +Sfx_Leer_Ch8: ; f2238 +Sfx_Leer_branch_f2238: ; f2238 + noise $1, $d1, $49 + noise $1, $d1, $29 + loopchannel 6, Sfx_Leer_branch_f2238 + endchannel +; f2243 + +Sfx_Ember_Ch5: ; f2243 +Sfx_Ember_branch_f2243: ; f2243 + unknownmusic0xde $c9 + sound $b, $f3, $0120 + sound $9, $d3, $0150 + loopchannel 5, Sfx_Ember_branch_f2243 + sound $8, $e3, $0130 + sound $f, $c2, $0110 + endchannel +; f225a + +Sfx_Ember_Ch8: ; f225a +Sfx_Ember_branch_f225a: ; f225a + noise $a, $f3, $35 + noise $e, $f6, $45 + loopchannel 4, Sfx_Ember_branch_f225a + noise $c, $f4, $bc + noise $c, $f5, $9c + noise $f, $f4, $ac + endchannel +; f226e + +Sfx_Bubblebeam_Ch5: ; f226e +Sfx_Bubblebeam_branch_f226e: ; f226e + unknownmusic0xde $39 + sound $4, $f4, $0600 + sound $3, $c4, $0500 + sound $5, $b5, $0600 + sound $d, $e2, $06c0 + loopchannel 3, Sfx_Bubblebeam_branch_f226e + sound $8, $d1, $0600 + endchannel +; f2289 + +Sfx_Bubblebeam_Ch6: ; f2289 +Sfx_Bubblebeam_branch_f2289: ; f2289 + unknownmusic0xde $8d + sound $5, $e4, $05e0 + sound $4, $b4, $04e0 + sound $6, $a5, $05e8 + sound $e, $d1, $06a0 + loopchannel 3, Sfx_Bubblebeam_branch_f2289 + endchannel +; f22a0 + +Sfx_Bubblebeam_Ch8: ; f22a0 +Sfx_Bubblebeam_branch_f22a0: ; f22a0 + noise $5, $c3, $33 + noise $3, $92, $43 + noise $a, $b5, $33 + noise $f, $c3, $32 + loopchannel 2, Sfx_Bubblebeam_branch_f22a0 + endchannel +; f22b1 + +Sfx_HydroPump_Ch5: ; f22b1 +Sfx_HydroPump_branch_f22b1: ; f22b1 + unknownmusic0xde $d2 + sound $3, $81, $0300 + sound $3, $c1, $0400 + sound $3, $f1, $0500 + sound $3, $b1, $0400 + sound $3, $71, $0300 + loopchannel 5, Sfx_HydroPump_branch_f22b1 + sound $8, $81, $0400 + endchannel +; f22d0 + +Sfx_HydroPump_Ch8: ; f22d0 +Sfx_HydroPump_branch_f22d0: ; f22d0 + noise $3, $62, $22 + noise $3, $a2, $32 + noise $3, $d2, $33 + noise $3, $92, $23 + noise $3, $52, $12 + loopchannel 5, Sfx_HydroPump_branch_f22d0 + noise $8, $81, $12 + endchannel +; f22e7 + +Sfx_Surf_Ch5: ; f22e7 +Sfx_Surf_branch_f22e7: ; f22e7 + unknownmusic0xde $39 + sound $f, $f4, $0500 + sound $f, $c4, $0400 + sound $f, $e2, $05c0 + loopchannel 3, Sfx_Surf_branch_f22e7 + endchannel +; f22fa + +Sfx_Surf_Ch6: ; f22fa +Sfx_Surf_branch_f22fa: ; f22fa + unknownmusic0xde $8d + sound $7, $e4, $0430 + sound $f, $b4, $0330 + sound $f, $a2, $0438 + loopchannel 4, Sfx_Surf_branch_f22fa + endchannel +; f230d + +Sfx_Surf_Ch8: ; f230d +Sfx_Surf_branch_f230d: ; f230d + noise $9, $f4, $44 + noise $9, $f2, $43 + noise $f, $f4, $42 + noise $f, $f4, $41 + loopchannel 3, Sfx_Surf_branch_f230d + endchannel +; f231e + +Sfx_Psybeam_Ch5: ; f231e +Sfx_Psybeam_branch_f231e: ; f231e + unknownmusic0xde $a1 + sound $a, $f1, $0640 + sound $a, $f3, $0680 + sound $a, $f2, $0620 + loopchannel 4, Sfx_Psybeam_branch_f231e + sound $a, $f1, $0640 + endchannel +; f2335 + +Sfx_Psybeam_Ch6: ; f2335 +Sfx_Psybeam_branch_f2335: ; f2335 + unknownmusic0xde $b3 + sound $a, $f3, $0571 + sound $7, $e3, $0531 + sound $a, $f1, $0551 + loopchannel 4, Sfx_Psybeam_branch_f2335 + sound $a, $f1, $0571 + endchannel +; f234c + +Sfx_Psybeam_Ch8: ; f234c +Sfx_Psybeam_branch_f234c: ; f234c + noise $2, $d1, $4a + noise $2, $d2, $2a + loopchannel 21, Sfx_Psybeam_branch_f234c + endchannel +; f2357 + +Sfx_Charge_Ch5: ; f2357 +Sfx_Charge_branch_f2357: ; f2357 + dutycycle $0 + sound $2, $f1, $0200 + sound $3, $f1, $0700 + sound $4, $f1, $0500 + sound $5, $f1, $07f0 + loopchannel 8, Sfx_Charge_branch_f2357 + endchannel +; f236e + +Sfx_Charge_Ch6: ; f236e +Sfx_Charge_branch_f236e: ; f236e + unknownmusic0xde $b3 + sound $2, $e1, $0302 + sound $3, $e1, $07f2 + sound $4, $e1, $0602 + sound $5, $e1, $0702 + loopchannel 8, Sfx_Charge_branch_f236e + endchannel +; f2385 + +Sfx_Charge_Ch8: ; f2385 +Sfx_Charge_branch_f2385: ; f2385 + noise $2, $d3, $10 + noise $3, $d3, $11 + noise $2, $d2, $10 + noise $5, $d2, $12 + loopchannel 9, Sfx_Charge_branch_f2385 + endchannel +; f2396 + +Sfx_Thundershock_Ch5: ; f2396 +Sfx_Thundershock_branch_f2396: ; f2396 + unknownmusic0xde $2b + sound $3, $f1, $07f0 + sound $4, $f2, $0200 + loopchannel 8, Sfx_Thundershock_branch_f2396 + endchannel +; f23a5 + +Sfx_Thundershock_Ch6: ; f23a5 +Sfx_Thundershock_branch_f23a5: ; f23a5 + unknownmusic0xde $b3 + sound $4, $e2, $0202 + sound $4, $e1, $07e2 + loopchannel 9, Sfx_Thundershock_branch_f23a5 + endchannel +; f23b4 + +Sfx_Thundershock_Ch8: ; f23b4 +Sfx_Thundershock_branch_f23b4: ; f23b4 + noise $4, $ff, $43 + noise $4, $f2, $44 + loopchannel 9, Sfx_Thundershock_branch_f23b4 + endchannel +; f23bf + +Sfx_Psychic_Ch5: ; f23bf + dutycycle $2 + soundinput $f7 + sound $8, $c4, $07bd + sound $8, $c4, $07be + sound $8, $c4, $07bf + sound $8, $c4, $07c0 + sound $f, $c4, $07c1 + sound $f, $f2, $07c0 + soundinput $8 + endchannel +; f23de + +Sfx_Psychic_Ch6: ; f23de + dutycycle $2 + sound $8, $c4, $0770 + sound $8, $c4, $0761 + sound $8, $c4, $0762 + sound $8, $c4, $0763 + sound $f, $c4, $0764 + sound $f, $f2, $0764 + endchannel +; f23f9 + +Sfx_Psychic_Ch8: ; f23f9 + noise $f, $3f, $14 + noise $f, $cf, $13 + noise $f, $cf, $12 + noise $f, $cf, $11 + noise $f, $cf, $10 + noise $f, $c2, $10 + endchannel +; f240c + +Sfx_Screech_Ch5: ; f240c + dutycycle $2 + sound $f, $ff, $07e0 + sound $f, $ff, $07e0 + sound $f, $ff, $07e0 + sound $f, $ff, $07e0 + sound $f, $f2, $07e0 + endchannel +; f2423 + +Sfx_Screech_Ch6: ; f2423 + dutycycle $3 + sound $f, $ff, $07e2 + sound $f, $ff, $07e1 + sound $f, $ff, $07e2 + sound $f, $ff, $07e1 + sound $f, $f2, $07e2 + endchannel +; f243a + +Sfx_BoneClub_Ch5: ; f243a + dutycycle $2 + soundinput $af + sound $8, $f1, $0700 + soundinput $8 + endchannel +; f2445 + +Sfx_BoneClub_Ch6: ; f2445 + dutycycle $3 + sound $8, $f1, $0701 + endchannel +; f244c + +Sfx_Sharpen_Ch5: ; f244c + dutycycle $2 + sound $6, $f1, $0500 + sound $6, $f1, $0580 + sound $6, $f1, $0600 + sound $6, $f1, $0680 + sound $8, $f1, $0700 + endchannel +; f2463 + +Sfx_Sharpen_Ch6: ; f2463 + dutycycle $3 + sound $6, $e1, $0510 + sound $6, $e1, $0590 + sound $6, $e1, $0610 + sound $6, $e1, $0690 + sound $8, $e1, $0710 + endchannel +; f247a + +Sfx_EggBomb_Ch5: ; f247a + unknownmusic0xde $ed + sound $8, $ff, $03f8 + sound $f, $ff, $0400 + sound $f, $f3, $0400 + endchannel +; f2489 + +Sfx_EggBomb_Ch6: ; f2489 + unknownmusic0xde $b4 + sound $8, $ef, $03c0 + sound $f, $ef, $03c0 + sound $f, $e3, $03c0 + endchannel +; f2498 + +Sfx_EggBomb_Ch8: ; f2498 + noise $4, $ff, $51 + noise $8, $ff, $54 + noise $f, $ff, $55 + noise $f, $f3, $56 + endchannel +; f24a5 + +Sfx_Sing_Ch5: ; f24a5 + togglesfx + vibrato $a, $24 + dutycycle $2 + notetype $a, $87 + octave 5 + note G_, 8 + octave 6 + note F_, 4 + note D#, 4 + octave 5 + note G_, 8 + endchannel +; f24b6 + +Sfx_Sing_Ch6: ; f24b6 + togglesfx + vibrato $a, $23 + dutycycle $2 + notetype $b, $67 + octave 5 + note G_, 8 + notetype $a, $67 + octave 6 + note F_, 4 + note D#, 4 + octave 5 + note G_, 8 + endchannel +; f24ca + +Sfx_HyperBeam_Ch5: ; f24ca + dutycycle $0 + sound $2, $f1, $0780 + sound $2, $f1, $0700 + sound $2, $f1, $0790 + sound $2, $f1, $0700 + sound $2, $f1, $07a0 + sound $2, $f1, $0700 + sound $2, $f1, $07b0 + sound $2, $f1, $0700 + sound $2, $f1, $07c0 + sound $2, $f1, $0700 + sound $2, $f1, $07d0 +Sfx_HyperBeam_branch_f24f8: ; f24f8 + sound $2, $f1, $0700 + sound $2, $f1, $07e0 + loopchannel 12, Sfx_HyperBeam_branch_f24f8 + sound $f, $f1, $0700 + endchannel +; f2509 + +Sfx_HyperBeam_Ch6: ; f2509 + unknownmusic0xde $b3 + sound $2, $f1, $0781 + sound $2, $f1, $0701 + sound $2, $f1, $0791 + sound $2, $f1, $0701 + sound $2, $f1, $07a1 + sound $2, $f1, $0701 + sound $2, $f1, $07b1 + sound $2, $f1, $0701 + sound $2, $f1, $07c1 + sound $2, $f1, $0701 + sound $2, $f1, $07d1 +Sfx_HyperBeam_branch_f2537: ; f2537 + sound $2, $f1, $0701 + sound $2, $f1, $07e1 + loopchannel 12, Sfx_HyperBeam_branch_f2537 + sound $f, $f1, $0701 + endchannel +; f2548 + +Sfx_HyperBeam_Ch8: ; f2548 +Sfx_HyperBeam_branch_f2548: ; f2548 + noise $1, $d1, $49 + noise $1, $d1, $29 + loopchannel 26, Sfx_HyperBeam_branch_f2548 + endchannel +; f2553 + +Sfx_Unknown60_Ch8: ; f2553 + noise $6, $20, $10 + noise $6, $2f, $40 + noise $6, $4f, $41 + noise $6, $8f, $41 + noise $6, $cf, $42 + noise $8, $d7, $42 + noise $f, $e7, $43 + noise $f, $f2, $43 + endchannel +; f256c + +Sfx_UnknownCB_Ch8: ; f256c + noise $1, $10, $10 + noise $2, $20, $10 + noise $2, $30, $20 + noise $2, $40, $20 + noise $2, $50, $21 + noise $2, $60, $22 + noise $4, $70, $22 + noise $8, $80, $22 + noise $f, $94, $22 + endchannel +; f2588 + +Sfx_Unknown61_Ch8: ; f2588 + noise $4, $d1, $41 + endchannel +; f258c + +Sfx_Unknown62_Ch8: ; f258c + noise $4, $c1, $42 + endchannel +; f2590 + +Sfx_Unknown63_Ch8: ; f2590 + noise $2, $6f, $21 + noise $2, $af, $31 + noise $f, $f2, $41 + endchannel +; f259a + +Sfx_Burn_Ch8: ; f259a + noise $2, $d2, $32 + noise $f, $f2, $43 + endchannel +; f25a1 + +Sfx_TitleScreenEntrance_Ch8: ; f25a1 + noise $2, $70, $22 + noise $2, $80, $23 + noise $2, $90, $24 + noise $2, $a0, $25 + noise $2, $b0, $26 + noise $f, $c2, $26 + endchannel +; f25b4 + +Sfx_Unknown66_Ch5: ; f25b4 + dutycycle $2 + sound $1, $f2, $06a0 + sound $1, $f2, $06e0 + sound $8, $f1, $0700 + endchannel +; f25c3 + +Sfx_GetCoinFromSlots_Ch5: ; f25c3 + dutycycle $2 + sound $2, $f1, $0700 + sound $8, $81, $07e0 + endchannel +; f25ce + +Sfx_PayDay_Ch5: ; f25ce + dutycycle $3 + sound $5, $e1, $0700 + sound $2, $e1, $0780 + sound $f, $f1, $07c0 + endchannel +; f25dd + +Sfx_PayDay_Ch6: ; f25dd + dutycycle $2 + sound $4, $c1, $06c1 + sound $2, $c1, $0741 + sound $f, $d1, $0781 + endchannel +; f25ec + +Sfx_Metronome_Ch5: ; f25ec + dutycycle $2 + soundinput $5f + sound $4, $40, $07e0 + sound $4, $60, $07e0 + sound $4, $80, $07e0 + sound $8, $a0, $07e0 + sound $8, $a0, $07e0 + sound $8, $80, $07e0 + sound $8, $60, $07e0 + sound $8, $30, $07e0 + sound $f, $12, $07e0 + soundinput $8 + endchannel +; f2617 + +Sfx_Unknown5F_Ch5: ; f2617 +Sfx_Unknown5F_branch_f2617: ; f2617 + sound $2, $f7, $0601 + sound $2, $f7, $0701 + loopchannel 8, Sfx_Unknown5F_branch_f2617 + endchannel +; f2624 + +Sfx_Unknown5F_Ch6: ; f2624 + sound $1, $f7, $ffff + sound $2, $f7, $0602 + sound $2, $f7, $0702 + loopchannel 8, Sfx_Unknown5F_branch_f2617 + endchannel +; f2635 + +Sfx_Fanfare2_Ch5: ; f2635 + togglesfx + sfxpriorityon + tempo 256 + volume $77 + tone $0001 + dutycycle $3 + notetype $6, $b5 + octave 3 + note G#, 4 + notetype $4, $b2 + note F_, 2 + note G#, 2 + note A_, 2 + note A#, 2 + note F#, 2 + note A#, 2 + octave 4 + note C_, 4 + note C_, 2 + notetype $4, $b6 + note C#, 12 + sfxpriorityoff + endchannel +; f2658 + +Sfx_Fanfare2_Ch6: ; f2658 + togglesfx + dutycycle $2 + notetype $6, $c5 + octave 4 + note C#, 6 + notetype $4, $c1 + note C#, 1 + note C#, 1 + note C#, 1 + notetype $4, $c2 + note D#, 2 + note C#, 2 + note D#, 2 + note E_, 4 + note E_, 2 + notetype $4, $c6 + note F_, 12 + endchannel +; f2673 + +Sfx_Fanfare2_Ch8: ; f2673 + togglesfx + notetype $6 + note C_, 1 + octave 5 + note C#, 2 + note __, 2 + note C#, 2 + note __, 2 + notetype $4 + note C_, 1 + note C#, 2 + note __, 2 + note C#, 2 + note D#, 2 + note __, 2 + note F_, 2 + note G#, 6 + endchannel +; f2687 + +Sfx_Fanfare_Ch5: ; f2687 + togglesfx + sfxpriorityon + tempo 256 + volume $77 + dutycycle $3 + tone $0001 + notetype $6, $b3 + octave 3 + note F_, 4 + note C#, 4 + note F#, 4 + note D#, 4 + note G#, 4 + note F_, 4 + note A#, 4 + note F#, 4 + notetype $4, $b3 + note A#, 4 + note B_, 4 + octave 4 + note C_, 4 + note C#, 4 + note D#, 4 + note C_, 4 + notetype $4, $b6 + note C#, 12 + sfxpriorityoff + endchannel +; f26af + +Sfx_Fanfare_Ch6: ; f26af + togglesfx + dutycycle $2 + notetype $6, $c4 + octave 4 + note C#, 4 + notetype $4, $c4 + note C#, 2 + octave 3 + note A#, 2 + octave 4 + note C#, 2 + note D#, 6 + note D#, 2 + octave 3 + note B_, 2 + octave 4 + note D#, 2 + note F_, 6 + note F_, 2 + note C#, 2 + note F_, 2 + note F#, 6 + note F#, 2 + note D#, 2 + note F#, 2 + note C#, 4 + note D#, 4 + note E_, 4 + note F_, 4 + note F#, 4 + note G#, 4 + notetype $4, $c6 + note F#, 12 + endchannel +; f26d8 + +Sfx_Fanfare_Ch8: ; f26d8 + togglesfx + notetype $6 + note C_, 1 + octave 4 + note A#, 4 + note __, 4 + note B_, 4 + note __, 4 + octave 5 + note C#, 4 + note __, 4 + note D#, 4 + note __, 4 + notetype $4 + note C_, 1 + note F_, 4 + note D#, 4 + note C#, 4 + note A#, 4 + note G#, 4 + note F_, 4 + note F#, 6 + endchannel +; f26f1 + +Sfx_HangUp_Ch5: ; f26f1 + dutycycle $2 + sound $4, $b8, $077b + sound $2, $21, $077b + sound $10, $0, $0000 +Sfx_HangUp_branch_f26ff: ; f26ff +Sfx_NoSignal_Ch5: ; f26ff +Sfx_NoSignal_branch_f26ff: ; f26ff + dutycycle $2 + sound $14, $e8, $070b + sound $1c, $0, $0000 + loopchannel 3, Sfx_HangUp_branch_f26ff + endchannel +; f270e + +Sfx_Sandstorm_Ch8: ; f270e +Sfx_Sandstorm_branch_f270e: ; f270e +Sfx_Unknown5F_Ch8: ; f270e +Sfx_Unknown5F_branch_f270e: ; f270e + noise $1, $f8, $41 + noise $2, $9c, $24 + noise $0, $0, $0 + noise $3, $59, $16 + noise $2, $0, $0 + loopchannel 3, Sfx_Sandstorm_branch_f270e + endchannel +; f2722 + +Sfx_Elevator_Ch5: ; f2722 + dutycycle $2 + soundinput $5a +Sfx_Elevator_branch_f2726: ; f2726 + sound $2, $f1, $0300 + loopchannel 48, Sfx_Elevator_branch_f2726 + soundinput $8 + dutycycle $2 + sound $f, $f3, $0730 + sound $8, $65, $0730 + sound $f, $f4, $0700 + sound $f, $74, $0700 + sound $f, $44, $0700 + sound $f, $24, $0700 + endchannel +; f274b + +Sfx_Elevator_Ch6: ; f274b +Sfx_Elevator_Ch7: ; f274b + sound $60, $0, $0000 + sound $53, $0, $0000 + endchannel +; f2754 + +Sfx_Elevator_Ch8: ; f2754 + noise $60, $0, $0 + noise $53, $0, $0 + endchannel +; f275b + +Sfx_StopSlot: ; f275b + dbw $04, Sfx_StopSlot_Ch5 +; f275e + +Sfx_StopSlot_Ch5: ; f275e + dutycycle $2 + sound $1, $f8, $0760 + sound $4, $82, $0760 + endchannel +; f2769 + +Sfx_GlassTing: ; f2769 + dbw $04, Sfx_GlassTing_Ch5 +; f276c + +Sfx_GlassTing_Ch5: ; f276c + dutycycle $2 + sound $20, $d1, $07dc + endchannel +; f2773 + +Sfx_GlassTing2: ; f2773 + dbw $44, Sfx_GlassTing2_Ch5 + dbw $05, Sfx_GlassTing2_Ch6 +; f2779 + +Sfx_GlassTing2_Ch5: ; f2779 + dutycycle $2 + sound $10, $f1, $07dc + endchannel +; f2780 + +Sfx_GlassTing2_Ch6: ; f2780 + dutycycle $2 + sound $10, $d1, $07dd + endchannel +; f2787 diff --git a/crysaudio/sfx_crystal.asm b/crysaudio/sfx_crystal.asm new file mode 100644 index 00000000..08806a7c --- /dev/null +++ b/crysaudio/sfx_crystal.asm @@ -0,0 +1,303 @@ +Sfx_IntroUnown1: ; 17982d + dbw $04, Sfx_IntroUnown1_Ch5 +; 179830 + +Sfx_IntroUnown1_Ch5: ; 179830 + vibrato $1, $a3 + dutycycle $2 + sound $8, $39, $0705 + sound $20, $e2, $0705 + endchannel +; 17983e + +Sfx_IntroUnown2: ; 17983e + dbw $05, Sfx_IntroUnown2_Ch6 +; 179841 + +Sfx_IntroUnown2_Ch6: ; 179841 + vibrato $1, $73 + dutycycle $2 + sound $8, $39, $0758 + sound $20, $e2, $0758 + endchannel +; 17984f + +Sfx_IntroUnown3: ; 17984f + dbw $06, Sfx_IntroUnown3_Ch7 +; 179852 + +Sfx_IntroUnown3_Ch7: ; 179852 + vibrato $1, $53 + sound $3, $32, $07c2 + sound $3, $22, $07c2 + sound $3, $12, $07c2 + sound $10, $12, $07c2 + sound $6, $22, $07c2 + sound $6, $32, $07c2 + endchannel +; 17986e + +Sfx_DittoPopUp: ; 17986e + dbw $04, Sfx_DittoPopUp_Ch5 +; 179871 + +Sfx_DittoPopUp_Ch5: ; 179871 + dutycycle $2 + soundinput $1e + sound $3, $82, $0700 + sound $1, $31, $0701 + soundinput $16 + sound $4, $b1, $0640 + sound $10, $31, $0641 + endchannel +; 179888 + +Sfx_DittoTransform: ; 179888 + dbw $04, Sfx_DittoTransform_Ch5 +; 17988b + +Sfx_DittoTransform_Ch5: ; 17988b + dutycycle $1 + soundinput $26 + sound $14, $3b, $0440 + sound $4, $97, $04c0 + sound $4, $67, $04c1 + sound $4, $42, $04c2 + endchannel +; 1798a0 + +Sfx_IntroSuicune1: ; 1798a0 + dbw $07, Sfx_IntroSuicune1_Ch8 +; 1798a3 + +Sfx_IntroSuicune1_Ch8: ; 1798a3 + noise $1, $58, $59 + noise $2, $91, $23 + endchannel +; 1798aa + +Sfx_IntroPichu: ; 1798aa + dbw $04, Sfx_IntroPichu_Ch5 +; 1798ad + +Sfx_IntroPichu_Ch5: ; 1798ad + dutycycle $3 + soundinput $4d + sound $1, $88, $0770 + sound $3, $0, $0000 + soundinput $17 + sound $2, $88, $0776 + endchannel +; 1798c0 + +Sfx_IntroSuicune2: ; 1798c0 + dbw $07, Sfx_IntroSuicune2_Ch8 +; 1798c3 + +Sfx_IntroSuicune2_Ch8: ; 1798c3 + noise $1, $a7, $31 + noise $1, $91, $0 + noise $1, $92, $21 + noise $1, $91, $0 + noise $1, $92, $22 + noise $1, $82, $11 + noise $1, $82, $22 + noise $1, $72, $11 + noise $1, $72, $12 + noise $1, $62, $10 + noise $1, $63, $0 + noise $1, $53, $10 + noise $1, $43, $0 + noise $1, $33, $10 + noise $1, $23, $0 + noise $1, $13, $10 + endchannel +; 1798f4 + +Sfx_IntroSuicune3: ; 1798f4 + dbw $07, Sfx_IntroSuicune3_Ch8 +; 1798f7 + +Sfx_IntroSuicune3_Ch8: ; 1798f7 + noise $1, $88, $31 + noise $8, $39, $11 + noise $4, $a4, $10 + noise $4, $44, $10 + noise $4, $24, $10 + endchannel +; 179907 + +Sfx_DittoBounce: ; 179907 + dbw $04, Sfx_DittoBounce_Ch5 +; 17990a + +Sfx_DittoBounce_Ch5: ; 17990a + dutycycle $2 + soundinput $2c + sound $2, $82, $04b0 + sound $0, $31, $04b0 + soundinput $34 + sound $10, $b1, $0420 + endchannel +; 17991d + +Sfx_IntroSuicune4: ; 17991d + dbw $07, Sfx_IntroSuicune4_Ch8 +; 179920 + +Sfx_IntroSuicune4_Ch8: ; 179920 + noise $1, $a1, $5c + noise $0, $0, $0 + noise $1, $c1, $4d + noise $0, $0, $0 + noise $4, $b2, $31 + noise $0, $0, $0 + noise $4, $a2, $2 + noise $0, $0, $0 + noise $4, $92, $1 + noise $0, $0, $0 + noise $20, $72, $0 + endchannel +; 179942 + +Sfx_GameFreakPresents: ; 179942 + dbw $04, Sfx_GameFreakPresents_Ch5 +; 179945 + +Sfx_GameFreakPresents_Ch5: ; 179945 + togglesfx + dutycycle $2 + notetype $2, $b1 + soundinput $ff + forceoctave $1a + octave 5 + note C_, 2 + note E_, 2 + note G_, 2 + octave 6 + note C_, 2 + note E_, 2 + note G_, 3 + intensity $81 + note G_, 3 + intensity $51 + note G_, 3 + intensity $31 + note G_, 3 + endchannel +; 179961 + +Sfx_Tingle: ; 179961 + dbw $04, Sfx_Tingle_Ch5 +; 179964 + +Sfx_Tingle_Ch5: ; 179964 + togglesfx + dutycycle $1 + forceoctave $b + notetype $1, $b1 +Sfx_Tingle_branch_17996c: ; 17996c + octave 5 + note C_, 3 + octave 6 + note G_, 2 + octave 5 + note C_, 3 + note __, 2 + loopchannel 2, Sfx_Tingle_branch_17996c + note C_, 2 + intensity $a1 + note G_, 13 + endchannel +; 17997c + +Sfx_TwoPcBeeps: ; 17997c + dbw $04, Sfx_TwoPcBeeps_Ch5 +; 17997f + +Sfx_TwoPcBeeps_Ch5: ; 17997f + dutycycle $2 + sound $2, $e8, $07c2 + sound $2, $28, $07c2 + sound $2, $e8, $07c2 + sound $2, $28, $07c2 + endchannel +; 179992 + +Sfx_4NoteDitty: ; 179992 + dbw $84, Sfx_4NoteDitty_Ch5 + dbw $05, Sfx_4NoteDitty_Ch6 + dbw $06, Sfx_4NoteDitty_Ch7 +; 17999b + +Sfx_4NoteDitty_Ch5: ; 17999b + togglesfx + dutycycle $2 + notetype $2, $e8 + forceoctave $2 + octave 4 + note C_, 2 + intensity $48 + note C_, 2 + intensity $e8 + note G_, 2 + intensity $48 + note G_, 2 + octave 5 + intensity $e8 + note E_, 2 + intensity $48 + note E_, 2 + octave 6 + intensity $e8 + note C_, 2 + intensity $43 + note C_, 16 + endchannel +; 1799bd + +Sfx_4NoteDitty_Ch6: ; 1799bd + togglesfx + notetype $2, $b8 + note __, 9 + note __, 16 + endchannel +; 1799c4 + +Sfx_4NoteDitty_Ch7: ; 1799c4 + togglesfx + notetype $2, $b8 + note __, 9 + note __, 16 + endchannel +; 1799cb + +Sfx_Twinkle: ; 1799cb + dbw $04, Sfx_Twinkle_Ch5 +; 1799ce + +Sfx_Twinkle_Ch5: ; 1799ce + togglesfx + dutycycle $0 + forceoctave $2 + notetype $2, $e1 + octave 3 + note G_, 2 + intensity $b1 + octave 4 + note D_, 2 + intensity $e1 + note B_, 2 + intensity $b1 + note G_, 2 + intensity $e1 + octave 5 + note D_, 2 + intensity $b1 + octave 4 + note B_, 2 + intensity $e1 + octave 5 + note G_, 6 + endchannel +; 1799ef diff --git a/crysaudio/sfx_pointers.asm b/crysaudio/sfx_pointers.asm new file mode 100644 index 00000000..807ce2a0 --- /dev/null +++ b/crysaudio/sfx_pointers.asm @@ -0,0 +1,214 @@ +; e927c +; dbw BANK(Sfx_DexFanfare5079), Sfx_DexFanfare5079 + dbw BANK(Sfx_Item), Sfx_Item + dbw BANK(Sfx_Item), Sfx_Item + dbw BANK(Sfx_CaughtMon), Sfx_CaughtMon + dbw BANK(Sfx_PokeballsPlacedOnTable), Sfx_PokeballsPlacedOnTable + dbw BANK(Sfx_Potion), Sfx_Potion + dbw BANK(Sfx_FullHeal), Sfx_FullHeal + dbw BANK(Sfx_Menu), Sfx_Menu + dbw BANK(Sfx_ReadText), Sfx_ReadText + dbw BANK(Sfx_ReadText2), Sfx_ReadText2 + dbw BANK(Sfx_DexFanfare2049), Sfx_DexFanfare2049 + dbw BANK(Sfx_DexFanfare80109), Sfx_DexFanfare80109 + dbw BANK(Sfx_Poison), Sfx_Poison + dbw BANK(Sfx_GotSafariBalls), Sfx_GotSafariBalls + dbw BANK(Sfx_BootPc), Sfx_BootPc + dbw BANK(Sfx_ShutDownPc), Sfx_ShutDownPc + dbw BANK(Sfx_ChoosePcOption), Sfx_ChoosePcOption + dbw BANK(Sfx_EscapeRope), Sfx_EscapeRope + dbw BANK(Sfx_PushButton), Sfx_PushButton + dbw BANK(Sfx_SecondPartOfItemfinder), Sfx_SecondPartOfItemfinder + dbw BANK(Sfx_WarpTo), Sfx_WarpTo + dbw BANK(Sfx_WarpFrom), Sfx_WarpFrom + dbw BANK(Sfx_ChangeDexMode), Sfx_ChangeDexMode + dbw BANK(Sfx_JumpOverLedge), Sfx_JumpOverLedge + dbw BANK(Sfx_GrassRustle), Sfx_GrassRustle + dbw BANK(Sfx_Fly), Sfx_Fly + dbw BANK(Sfx_Wrong), Sfx_Wrong + dbw BANK(Sfx_Squeak), Sfx_Squeak + dbw BANK(Sfx_Strength), Sfx_Strength + dbw BANK(Sfx_Boat), Sfx_Boat + dbw BANK(Sfx_WallOpen), Sfx_WallOpen + dbw BANK(Sfx_PlacePuzzlePieceDown), Sfx_PlacePuzzlePieceDown + dbw BANK(Sfx_EnterDoor), Sfx_EnterDoor + dbw BANK(Sfx_SwitchPokemon), Sfx_SwitchPokemon + dbw BANK(Sfx_Tally), Sfx_Tally + dbw BANK(Sfx_Transaction), Sfx_Transaction + dbw BANK(Sfx_ExitBuilding), Sfx_ExitBuilding + dbw BANK(Sfx_Bump), Sfx_Bump + dbw BANK(Sfx_Save), Sfx_Save + dbw BANK(Sfx_Pokeflute), Sfx_Pokeflute + dbw BANK(Sfx_ElevatorEnd), Sfx_ElevatorEnd + dbw BANK(Sfx_ThrowBall), Sfx_ThrowBall + dbw BANK(Sfx_BallPoof), Sfx_BallPoof + dbw BANK(Sfx_Unknown3A), Sfx_Unknown3A + dbw BANK(Sfx_Run), Sfx_Run + dbw BANK(Sfx_SlotMachineStart), Sfx_SlotMachineStart + dbw BANK(Sfx_Fanfare), Sfx_Fanfare + dbw BANK(Sfx_Peck), Sfx_Peck + dbw BANK(Sfx_Kinesis), Sfx_Kinesis + dbw BANK(Sfx_Lick), Sfx_Lick + dbw BANK(Sfx_Pound), Sfx_Pound + dbw BANK(Sfx_MovePuzzlePiece), Sfx_MovePuzzlePiece + dbw BANK(Sfx_CometPunch), Sfx_CometPunch + dbw BANK(Sfx_MegaPunch), Sfx_MegaPunch + dbw BANK(Sfx_Scratch), Sfx_Scratch + dbw BANK(Sfx_Vicegrip), Sfx_Vicegrip + dbw BANK(Sfx_RazorWind), Sfx_RazorWind + dbw BANK(Sfx_Cut), Sfx_Cut + dbw BANK(Sfx_WingAttack), Sfx_WingAttack + dbw BANK(Sfx_Whirlwind), Sfx_Whirlwind + dbw BANK(Sfx_Bind), Sfx_Bind + dbw BANK(Sfx_VineWhip), Sfx_VineWhip + dbw BANK(Sfx_DoubleKick), Sfx_DoubleKick + dbw BANK(Sfx_MegaKick), Sfx_MegaKick + dbw BANK(Sfx_Headbutt), Sfx_Headbutt + dbw BANK(Sfx_HornAttack), Sfx_HornAttack + dbw BANK(Sfx_Tackle), Sfx_Tackle + dbw BANK(Sfx_PoisonSting), Sfx_PoisonSting + dbw BANK(Sfx_Powder), Sfx_Powder + dbw BANK(Sfx_Doubleslap), Sfx_Doubleslap + dbw BANK(Sfx_Bite), Sfx_Bite + dbw BANK(Sfx_JumpKick), Sfx_JumpKick + dbw BANK(Sfx_Stomp), Sfx_Stomp + dbw BANK(Sfx_TailWhip), Sfx_TailWhip + dbw BANK(Sfx_KarateChop), Sfx_KarateChop + dbw BANK(Sfx_Submission), Sfx_Submission + dbw BANK(Sfx_WaterGun), Sfx_WaterGun + dbw BANK(Sfx_SwordsDance), Sfx_SwordsDance + dbw BANK(Sfx_Thunder), Sfx_Thunder + dbw BANK(Sfx_Supersonic), Sfx_Supersonic + dbw BANK(Sfx_Leer), Sfx_Leer + dbw BANK(Sfx_Ember), Sfx_Ember + dbw BANK(Sfx_Bubblebeam), Sfx_Bubblebeam + dbw BANK(Sfx_HydroPump), Sfx_HydroPump + dbw BANK(Sfx_Surf), Sfx_Surf + dbw BANK(Sfx_Psybeam), Sfx_Psybeam + dbw BANK(Sfx_Charge), Sfx_Charge + dbw BANK(Sfx_Thundershock), Sfx_Thundershock + dbw BANK(Sfx_Psychic), Sfx_Psychic + dbw BANK(Sfx_Screech), Sfx_Screech + dbw BANK(Sfx_BoneClub), Sfx_BoneClub + dbw BANK(Sfx_Sharpen), Sfx_Sharpen + dbw BANK(Sfx_EggBomb), Sfx_EggBomb + dbw BANK(Sfx_Sing), Sfx_Sing + dbw BANK(Sfx_HyperBeam), Sfx_HyperBeam + dbw BANK(Sfx_Shine), Sfx_Shine + dbw BANK(Sfx_Unknown5F), Sfx_Unknown5F + dbw BANK(Sfx_Unknown60), Sfx_Unknown60 + dbw BANK(Sfx_Unknown61), Sfx_Unknown61 + dbw BANK(Sfx_Unknown62), Sfx_Unknown62 + dbw BANK(Sfx_Unknown63), Sfx_Unknown63 + dbw BANK(Sfx_Burn), Sfx_Burn + dbw BANK(Sfx_TitleScreenEntrance), Sfx_TitleScreenEntrance + dbw BANK(Sfx_Unknown66), Sfx_Unknown66 + dbw BANK(Sfx_GetCoinFromSlots), Sfx_GetCoinFromSlots + dbw BANK(Sfx_PayDay), Sfx_PayDay + dbw BANK(Sfx_Metronome), Sfx_Metronome + dbw BANK(Sfx_Call), Sfx_Call + dbw BANK(Sfx_HangUp), Sfx_HangUp + dbw BANK(Sfx_NoSignal), Sfx_NoSignal + dbw BANK(Sfx_Sandstorm), Sfx_Sandstorm + dbw BANK(Sfx_Elevator), Sfx_Elevator + dbw BANK(Sfx_Protect), Sfx_Protect + dbw BANK(Sfx_Sketch), Sfx_Sketch + dbw BANK(Sfx_RainDance), Sfx_RainDance + dbw BANK(Sfx_Aeroblast), Sfx_Aeroblast + dbw BANK(Sfx_Spark), Sfx_Spark + dbw BANK(Sfx_Curse), Sfx_Curse + dbw BANK(Sfx_Rage), Sfx_Rage + dbw BANK(Sfx_Thief), Sfx_Thief + dbw BANK(Sfx_Thief2), Sfx_Thief2 + dbw BANK(Sfx_SpiderWeb), Sfx_SpiderWeb + dbw BANK(Sfx_MindReader), Sfx_MindReader + dbw BANK(Sfx_Nightmare), Sfx_Nightmare + dbw BANK(Sfx_Snore), Sfx_Snore + dbw BANK(Sfx_SweetKiss), Sfx_SweetKiss + dbw BANK(Sfx_SweetKiss2), Sfx_SweetKiss2 + dbw BANK(Sfx_BellyDrum), Sfx_BellyDrum + dbw BANK(Sfx_Unknown7F), Sfx_Unknown7F + dbw BANK(Sfx_SludgeBomb), Sfx_SludgeBomb + dbw BANK(Sfx_Foresight), Sfx_Foresight + dbw BANK(Sfx_Spite), Sfx_Spite + dbw BANK(Sfx_Outrage), Sfx_Outrage + dbw BANK(Sfx_PerishSong), Sfx_PerishSong + dbw BANK(Sfx_GigaDrain), Sfx_GigaDrain + dbw BANK(Sfx_Attract), Sfx_Attract + dbw BANK(Sfx_Kinesis2), Sfx_Kinesis2 + dbw BANK(Sfx_ZapCannon), Sfx_ZapCannon + dbw BANK(Sfx_MeanLook), Sfx_MeanLook + dbw BANK(Sfx_HealBell), Sfx_HealBell + dbw BANK(Sfx_Return), Sfx_Return + dbw BANK(Sfx_ExpBar), Sfx_ExpBar + dbw BANK(Sfx_MilkDrink), Sfx_MilkDrink + dbw BANK(Sfx_Present), Sfx_Present + dbw BANK(Sfx_MorningSun), Sfx_MorningSun + dbw BANK(Sfx_LevelUp), Sfx_LevelUp + dbw BANK(Sfx_KeyItem), Sfx_KeyItem + dbw BANK(Sfx_Fanfare2), Sfx_Fanfare2 + dbw BANK(Sfx_RegisterPhoneNumber), Sfx_RegisterPhoneNumber + dbw BANK(Sfx_3RdPlace), Sfx_3RdPlace + dbw BANK(Sfx_GetEggFromDaycareMan), Sfx_GetEggFromDaycareMan + dbw BANK(Sfx_GetEggFromDaycareLady), Sfx_GetEggFromDaycareLady + dbw BANK(Sfx_MoveDeleted), Sfx_MoveDeleted + dbw BANK(Sfx_2ndPlace), Sfx_2ndPlace + dbw BANK(Sfx_1stPlace), Sfx_1stPlace + dbw BANK(Sfx_ChooseACard), Sfx_ChooseACard + dbw BANK(Sfx_GetTm), Sfx_GetTm + dbw BANK(Sfx_GetBadge), Sfx_GetBadge + dbw BANK(Sfx_QuitSlots), Sfx_QuitSlots + dbw BANK(Sfx_EggCrack), Sfx_EggCrack + dbw BANK(Sfx_DexFanfareLessThan20), Sfx_DexFanfareLessThan20 + dbw BANK(Sfx_DexFanfare140169), Sfx_DexFanfare140169 + dbw BANK(Sfx_DexFanfare170199), Sfx_DexFanfare170199 + dbw BANK(Sfx_DexFanfare200229), Sfx_DexFanfare200229 + dbw BANK(Sfx_DexFanfare230Plus), Sfx_DexFanfare230Plus + dbw BANK(Sfx_Evolved), Sfx_Evolved + dbw BANK(Sfx_MasterBall), Sfx_MasterBall + dbw BANK(Sfx_EggHatch), Sfx_EggHatch + dbw BANK(Sfx_GsIntroCharizardFireball), Sfx_GsIntroCharizardFireball + dbw BANK(Sfx_GsIntroPokemonAppears), Sfx_GsIntroPokemonAppears + dbw BANK(Sfx_Flash), Sfx_Flash + dbw BANK(Sfx_GameFreakLogoGs), Sfx_GameFreakLogoGs + dbw BANK(Sfx_NotVeryEffective), Sfx_NotVeryEffective + dbw BANK(Sfx_Damage), Sfx_Damage + dbw BANK(Sfx_SuperEffective), Sfx_SuperEffective + dbw BANK(Sfx_BallBounce), Sfx_BallBounce + dbw BANK(Sfx_Moonlight), Sfx_Moonlight + dbw BANK(Sfx_Encore), Sfx_Encore + dbw BANK(Sfx_BeatUp), Sfx_BeatUp + dbw BANK(Sfx_BatonPass), Sfx_BatonPass + dbw BANK(Sfx_BallWiggle), Sfx_BallWiggle + dbw BANK(Sfx_SweetScent), Sfx_SweetScent + dbw BANK(Sfx_SweetScent2), Sfx_SweetScent2 + dbw BANK(Sfx_HitEndOfExpBar), Sfx_HitEndOfExpBar + dbw BANK(Sfx_GiveTrademon), Sfx_GiveTrademon + dbw BANK(Sfx_GetTrademon), Sfx_GetTrademon + dbw BANK(Sfx_TrainArrived), Sfx_TrainArrived + dbw BANK(Sfx_StopSlot), Sfx_StopSlot + dbw BANK(Sfx_2Boops), Sfx_2Boops + dbw BANK(Sfx_GlassTing), Sfx_GlassTing + dbw BANK(Sfx_GlassTing2), Sfx_GlassTing2 + +; Crystal adds the following SFX: + + dbw BANK(Sfx_IntroUnown1), Sfx_IntroUnown1 + dbw BANK(Sfx_IntroUnown2), Sfx_IntroUnown2 + dbw BANK(Sfx_IntroUnown3), Sfx_IntroUnown3 + dbw BANK(Sfx_DittoPopUp), Sfx_DittoPopUp + dbw BANK(Sfx_DittoTransform), Sfx_DittoTransform + dbw BANK(Sfx_IntroSuicune1), Sfx_IntroSuicune1 + dbw BANK(Sfx_IntroPichu), Sfx_IntroPichu + dbw BANK(Sfx_IntroSuicune2), Sfx_IntroSuicune2 + dbw BANK(Sfx_IntroSuicune3), Sfx_IntroSuicune3 + dbw BANK(Sfx_DittoBounce), Sfx_DittoBounce + dbw BANK(Sfx_IntroSuicune4), Sfx_IntroSuicune4 + dbw BANK(Sfx_GameFreakPresents), Sfx_GameFreakPresents + dbw BANK(Sfx_Tingle), Sfx_Tingle + dbw BANK(Sfx_UnknownCB), Sfx_UnknownCB + dbw BANK(Sfx_TwoPcBeeps), Sfx_TwoPcBeeps + dbw BANK(Sfx_4NoteDitty), Sfx_4NoteDitty + dbw BANK(Sfx_Twinkle), Sfx_Twinkle +; e94e9 + diff --git a/crysaudio/trainer_encounters.asm b/crysaudio/trainer_encounters.asm new file mode 100644 index 00000000..de748d26 --- /dev/null +++ b/crysaudio/trainer_encounters.asm @@ -0,0 +1,96 @@ +; Currently, must be in the same bank as the sound engine. + +PlayTrainerEncounterMusic:: ; e900a +; input: e = trainer type + ; turn fade off + xor a + ld [MusicFade], a + ; play nothing for one frame + push de + ld de, $0000 ; id: Music_Nothing + call PlayMusic + call DelayFrame + ; play new song + call MaxVolume + pop de + ld d, $00 + ld hl, TrainerEncounterMusic + add hl, de + ld e, [hl] + call PlayMusic + ret +; e9027 + +TrainerEncounterMusic: ; e9027 + db MUSIC_HIKER_ENCOUNTER + db MUSIC_YOUNGSTER_ENCOUNTER ; falkner + db MUSIC_LASS_ENCOUNTER ; whitney + db MUSIC_YOUNGSTER_ENCOUNTER ; bugsy + db MUSIC_OFFICER_ENCOUNTER ; morty + db MUSIC_OFFICER_ENCOUNTER ; pryce + db MUSIC_LASS_ENCOUNTER ; jasmine + db MUSIC_OFFICER_ENCOUNTER ; chuck + db MUSIC_BEAUTY_ENCOUNTER ; clair + db MUSIC_RIVAL_ENCOUNTER ; rival1 + db MUSIC_HIKER_ENCOUNTER ; pokemon_prof + db MUSIC_HIKER_ENCOUNTER ; will + db MUSIC_HIKER_ENCOUNTER ; cal + db MUSIC_OFFICER_ENCOUNTER ; bruno + db MUSIC_HIKER_ENCOUNTER ; karen + db MUSIC_HIKER_ENCOUNTER ; koga + db MUSIC_OFFICER_ENCOUNTER ; champion + db MUSIC_YOUNGSTER_ENCOUNTER ; brock + db MUSIC_LASS_ENCOUNTER ; misty + db MUSIC_OFFICER_ENCOUNTER ; lt_surge + db MUSIC_ROCKET_ENCOUNTER ; scientist + db MUSIC_OFFICER_ENCOUNTER ; erika + db MUSIC_YOUNGSTER_ENCOUNTER ; youngster + db MUSIC_YOUNGSTER_ENCOUNTER ; schoolboy + db MUSIC_YOUNGSTER_ENCOUNTER ; bird_keeper + db MUSIC_LASS_ENCOUNTER ; lass + db MUSIC_LASS_ENCOUNTER ; janine + db MUSIC_HIKER_ENCOUNTER ; cooltrainerm + db MUSIC_BEAUTY_ENCOUNTER ; cooltrainerf + db MUSIC_BEAUTY_ENCOUNTER ; beauty + db MUSIC_POKEMANIAC_ENCOUNTER ; pokemaniac + db MUSIC_ROCKET_ENCOUNTER ; gruntm + db MUSIC_HIKER_ENCOUNTER ; gentleman + db MUSIC_BEAUTY_ENCOUNTER ; skier + db MUSIC_BEAUTY_ENCOUNTER ; teacher + db MUSIC_BEAUTY_ENCOUNTER ; sabrina + db MUSIC_YOUNGSTER_ENCOUNTER ; bug_catcher + db MUSIC_HIKER_ENCOUNTER ; fisher + db MUSIC_HIKER_ENCOUNTER ; swimmerm + db MUSIC_BEAUTY_ENCOUNTER ; swimmerf + db MUSIC_HIKER_ENCOUNTER ; sailor + db MUSIC_POKEMANIAC_ENCOUNTER ; super_nerd + db MUSIC_RIVAL_ENCOUNTER ; rival2 + db MUSIC_HIKER_ENCOUNTER ; guitarist + db MUSIC_HIKER_ENCOUNTER ; hiker + db MUSIC_HIKER_ENCOUNTER ; biker + db MUSIC_OFFICER_ENCOUNTER ; blaine + db MUSIC_POKEMANIAC_ENCOUNTER ; burglar + db MUSIC_HIKER_ENCOUNTER ; firebreather + db MUSIC_POKEMANIAC_ENCOUNTER ; juggler + db MUSIC_HIKER_ENCOUNTER ; blackbelt_t + db MUSIC_ROCKET_ENCOUNTER ; executivem + db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t + db MUSIC_LASS_ENCOUNTER ; picnicker + db MUSIC_YOUNGSTER_ENCOUNTER ; camper + db MUSIC_ROCKET_ENCOUNTER ; executivef + db MUSIC_SAGE_ENCOUNTER ; sage + db MUSIC_SAGE_ENCOUNTER ; medium + db MUSIC_HIKER_ENCOUNTER ; boarder + db MUSIC_HIKER_ENCOUNTER ; pokefanm + db MUSIC_KIMONO_ENCOUNTER ; kimono_girl + db MUSIC_LASS_ENCOUNTER ; twins + db MUSIC_BEAUTY_ENCOUNTER ; pokefanf + db MUSIC_HIKER_ENCOUNTER ; red + db MUSIC_RIVAL_ENCOUNTER ; blue + db MUSIC_HIKER_ENCOUNTER ; officer + db MUSIC_ROCKET_ENCOUNTER ; gruntf + db MUSIC_HIKER_ENCOUNTER ; mysticalman + db MUSIC_HIKER_ENCOUNTER + db MUSIC_HIKER_ENCOUNTER + db MUSIC_HIKER_ENCOUNTER +; e906e diff --git a/crysmacros.asm b/crysmacros.asm new file mode 100644 index 00000000..b8a65f16 --- /dev/null +++ b/crysmacros.asm @@ -0,0 +1,47 @@ +; rgbds macros + + + + + + + +note: MACRO + db \1 << 4 + (\2 - 1) + ENDM + +; pitch +__ EQU 0 +C_ EQU 1 +C# EQU 2 +D_ EQU 3 +D# EQU 4 +E_ EQU 5 +F_ EQU 6 +F# EQU 7 +G_ EQU 8 +G# EQU 9 +A_ EQU 10 +A# EQU 11 +B_ EQU 12 + +inc_octave: MACRO + db $f4 + ENDM + +dec_octave: MACRO + db $f5 + ENDM + +notetype0: MACRO + db $f6, \1 + ENDM + +notetype1: MACRO + db $f7, \1 + ENDM + +notetype2: MACRO + db $f8, \1 + ENDM + diff --git a/data/map_songs.asm b/data/map_songs.asm index 892f475e..018c206c 100755 --- a/data/map_songs.asm +++ b/data/map_songs.asm @@ -1,249 +1,250 @@ MapSongBanks: - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ;PALLET_TOWN - db MUSIC_CITIES1, BANK(Music_Cities1) ; VIRIDIAN_CITY - db MUSIC_CITIES1, BANK(Music_Cities1) ; PEWTER_CITY - db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_CITY - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LAVENDER_TOWN - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VERMILION_CITY - db MUSIC_CELADON, BANK(Music_Celadon) ; CELADON_CITY - db MUSIC_CITIES2, BANK(Music_Cities2) ; FUCHSIA_CITY - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; CINNABAR_ISLAND - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; INDIGO_PLATEAU - db MUSIC_CITIES1, BANK(Music_Cities1) ; SAFFRON_CITY - db MUSIC_CITIES1, BANK(Music_Cities1) ; unused - db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_1 - db MUSIC_ROUTES1, BANK(Music_Routes1) ; ROUTE_2 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_3 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_4 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_5 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_6 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_7 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_8 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_9 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_10 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_11 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_12 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_13 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_14 - db MUSIC_ROUTES4, BANK(Music_Routes4) ; ROUTE_15 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_16 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_17 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_18 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_19 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_20 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_21 - db MUSIC_ROUTES3, BANK(Music_Routes3) ; ROUTE_22 - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; ROUTE_23 - db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_24 - db MUSIC_ROUTES2, BANK(Music_Routes2) ; ROUTE_25 - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse1F - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; RedsHouse2F - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; BluesHouse - db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; OaksLab - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianPokecenter - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; ViridianMart - db MUSIC_CITIES1, BANK(Music_Cities1) ; School - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianHouse - db MUSIC_GYM, BANK(Music_Gym) ; ViridianGym - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveRoute2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestExit - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2House - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestEntrance - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ViridianForest - db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum2F - db MUSIC_GYM, BANK(Music_Gym) ; PewterGym - db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterMart - db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon1 - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon2 - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon3 - db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouseTrashed - db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanPokecenter - db MUSIC_GYM, BANK(Music_Gym) ; CeruleanGym - db MUSIC_CITIES2, BANK(Music_Cities2) ; BikeShop - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanMart - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; MtMoonPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; CeruleanHouseTrashed - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route5Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute5 - db MUSIC_CITIES1, BANK(Music_Cities1) ; DayCareM - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route6Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundTunnelEntranceRoute6 - db MUSIC_VERMILION, BANK(Music_Vermilion) ; FREEZE - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route7Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute7 - db MUSIC_CELADON, BANK(Music_Celadon) ;FREEZE - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route8Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; UndergroundPathEntranceRoute8 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; RockTunnelPokecenter - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel1 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; PowerPlant - db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11Gate - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveEntranceRoute11 - db MUSIC_VERMILION, BANK(Music_Vermilion) ; Route11GateUpstairs - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12Gate - db MUSIC_CITIES2, BANK(Music_Cities2) ; BillsHouse - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionPokecenter - db MUSIC_VERMILION, BANK(Music_Vermilion) ; FanClub - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; VermilionMart - db MUSIC_GYM, BANK(Music_Gym) ; VermilionGym - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse1 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; VermilionDock - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne1 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne2 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne3 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne4 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne5 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne6 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne7 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne8 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne9 - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ; SSAnne10 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad1 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ;unused - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ;unused - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ;unused - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Lance - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_SS_ANNE, BANK(Music_SSAnne) ;unused - db MUSIC_PALLET_TOWN, BANK(Music_PalletTown) ; HallofFameRoom - db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathNS - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; Gary - db MUSIC_ROUTES1, BANK(Music_Routes1) ; UndergroundPathWE - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart3 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart4 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartRoof - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMartElevator - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion1 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion2 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion3 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion4 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonMansion5 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonPokecenter - db MUSIC_GYM, BANK(Music_Gym) ; CeladonGym - db MUSIC_GAME_CORNER, BANK(Music_GameCorner) ; CeladonGameCorner - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeladonMart5 - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonPrizeRoom - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonDiner - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHouse - db MUSIC_CELADON, BANK(Music_Celadon) ; CeladonHotel - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderPokecenter - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower1 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower2 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower3 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower4 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower5 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower6 - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; PokemonTower7 - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; LavenderMart - db MUSIC_LAVENDER, BANK(Music_Lavender) ; LavenderHouse2 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaMart - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; FuchsiaPokecenter - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse2 - db MUSIC_CITIES2, BANK(Music_Cities2) ; SafariZoneEntrance - db MUSIC_GYM, BANK(Music_Gym) ; FuchsiaGym - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaMeetingRoom - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands2 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands3 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands4 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands5 - db MUSIC_CITIES2, BANK(Music_Cities2) ; VermilionHouse2 - db MUSIC_CITIES2, BANK(Music_Cities2) ; FuchsiaHouse3 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion1 - db MUSIC_GYM, BANK(Music_Gym) ; CinnabarGym - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab1 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab2 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab3 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) ; Lab4 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarPokecenter - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarMart - db MUSIC_CINNABAR, BANK(Music_Cinnabar) - db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; IndigoPlateauLobby - db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse1F - db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse2F - db MUSIC_CITIES1, BANK(Music_Cities1) ; FightingDojo - db MUSIC_GYM, BANK(Music_Gym) ; SaffronGym - db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronMart - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo1 - db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; SaffronPokecenter - db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15GateUpstairs - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateUpstairs - db MUSIC_CELADON, BANK(Music_Celadon) ; Route16House - db MUSIC_CELADON, BANK(Music_Celadon) ; Route12House - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18Gate - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route18GateUpstairs - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; SeafoamIslands1 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; Route22Gate - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad2 - db MUSIC_CITIES1, BANK(Music_Cities1) ; Route12GateUpstairs - db MUSIC_VERMILION, BANK(Music_Vermilion) ; VermilionHouse3 - db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCave - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; VictoryRoad3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout1 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout2 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideout4 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; RocketHideoutElevator - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo2 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo3 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo4 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo5 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo6 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo7 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo8 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion2 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion3 - db MUSIC_CINNABAR_MANSION, BANK(Music_CinnabarMansion) ; Mansion4 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneEast - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneNorth - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneWest - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneCenter - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse1 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneSecretHouse - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse2 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse3 - db MUSIC_SAFARI_ZONE, BANK(Music_SafariZone) ; SafariZoneRestHouse4 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon2 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon3 - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; UnknownDungeon1 - db MUSIC_CITIES2, BANK(Music_Cities2) ; NameRater - db MUSIC_CITIES1, BANK(Music_Cities1) ; CeruleanHouse2 - db MUSIC_CINNABAR, BANK(Music_Cinnabar) - db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; RockTunnel2 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo9 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo10 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCo11 - db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenter - db MUSIC_CELADON, BANK(Music_Celadon) ; Colosseum - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_SILPH_CO, BANK(Music_SilphCo) - db MUSIC_GYM, BANK(Music_Gym) ; Lorelei - db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; Bruno - db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; Agatha + db MUSIC_PALLET_TOWN, 0 ;PALLET_TOWN + db MUSIC_CITIES1, 0 ; VIRIDIAN_CITY + db MUSIC_CITIES1, 0 ; PEWTER_CITY + db MUSIC_CITIES2, 0 ; CERULEAN_CITY + db MUSIC_LAVENDER, 0 ; LAVENDER_TOWN + db MUSIC_VERMILION, 0 ; VERMILION_CITY + db MUSIC_CELADON, 0 ; CELADON_CITY + db MUSIC_CITIES2, 0 ; FUCHSIA_CITY + db MUSIC_CINNABAR, 0 ; CINNABAR_ISLAND + db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU + db MUSIC_CITIES1, 0 ; SAFFRON_CITY + db MUSIC_CITIES1, 0 ; unused + db MUSIC_ROUTES1, 0 ; ROUTE_1 + db MUSIC_ROUTES1, 0 ; ROUTE_2 + db MUSIC_ROUTES3, 0 ; ROUTE_3 + db MUSIC_ROUTES3, 0 ; ROUTE_4 + db MUSIC_ROUTES3, 0 ; ROUTE_5 + db MUSIC_ROUTES3, 0 ; ROUTE_6 + db MUSIC_ROUTES3, 0 ; ROUTE_7 + db MUSIC_ROUTES3, 0 ; ROUTE_8 + db MUSIC_ROUTES3, 0 ; ROUTE_9 + db MUSIC_ROUTES3, 0 ; ROUTE_10 + db MUSIC_ROUTES4, 0 ; ROUTE_11 + db MUSIC_ROUTES4, 0 ; ROUTE_12 + db MUSIC_ROUTES4, 0 ; ROUTE_13 + db MUSIC_ROUTES4, 0 ; ROUTE_14 + db MUSIC_ROUTES4, 0 ; ROUTE_15 + db MUSIC_ROUTES3, 0 ; ROUTE_16 + db MUSIC_ROUTES3, 0 ; ROUTE_17 + db MUSIC_ROUTES3, 0 ; ROUTE_18 + db MUSIC_ROUTES3, 0 ; ROUTE_19 + db MUSIC_ROUTES3, 0 ; ROUTE_20 + db MUSIC_ROUTES3, 0 ; ROUTE_21 + db MUSIC_ROUTES3, 0 ; ROUTE_22 + db MUSIC_INDIGO_PLATEAU, 0 ; ROUTE_23 + db MUSIC_ROUTES2, 0 ; ROUTE_24 + db MUSIC_ROUTES2, 0 ; ROUTE_25 + db MUSIC_PALLET_TOWN, 0 ; RedsHouse1F + db MUSIC_PALLET_TOWN, 0 ; RedsHouse2F + db MUSIC_PALLET_TOWN, 0 ; BluesHouse + db MUSIC_OAKS_LAB, 0 ; OaksLab + db MUSIC_POKECENTER, 0 ; ViridianPokecenter + db MUSIC_POKECENTER, 0 ; ViridianMart + db MUSIC_CITIES1, 0 ; School + db MUSIC_CITIES1, 0 ; ViridianHouse + db MUSIC_GYM, 0 ; ViridianGym + db MUSIC_DUNGEON2, 0 ; DiglettsCaveRoute2 + db MUSIC_CITIES1, 0 ; ViridianForestExit + db MUSIC_CITIES1, 0 ; Route2House + db MUSIC_CITIES1, 0 ; Route2Gate + db MUSIC_CITIES1, 0 ; ViridianForestEntrance + db MUSIC_DUNGEON2, 0 ; ViridianForest + db MUSIC_CITIES1, 0 ; Museum1F + db MUSIC_CITIES1, 0 ; Museum2F + db MUSIC_GYM, 0 ; PewterGym + db MUSIC_CITIES1, 0 ; PewterHouse1 + db MUSIC_POKECENTER, 0 ; PewterMart + db MUSIC_CITIES1, 0 ; PewterHouse2 + db MUSIC_POKECENTER, 0 ; PewterPokecenter + db MUSIC_DUNGEON3, 0 ; MtMoon1 + db MUSIC_DUNGEON3, 0 ; MtMoon2 + db MUSIC_DUNGEON3, 0 ; MtMoon3 + db MUSIC_CITIES2, 0 ; CeruleanHouseTrashed + db MUSIC_CITIES2, 0 ; CeruleanHouse1 + db MUSIC_POKECENTER, 0 ; CeruleanPokecenter + db MUSIC_GYM, 0 ; CeruleanGym + db MUSIC_CITIES2, 0 ; BikeShop + db MUSIC_POKECENTER, 0 ; CeruleanMart + db MUSIC_POKECENTER, 0 ; MtMoonPokecenter + db MUSIC_DUNGEON3, 0 ; CeruleanHouseTrashed + db MUSIC_CITIES1, 0 ; Route5Gate + db MUSIC_CITIES1, 0 ; UndergroundTunnelEntranceRoute5 + db MUSIC_CITIES1, 0 ; DayCareM + db MUSIC_CITIES1, 0 ; Route6Gate + db MUSIC_CITIES1, 0 ; UndergroundTunnelEntranceRoute6 + db MUSIC_VERMILION, 0 ; FREEZE + db MUSIC_CITIES1, 0 ; Route7Gate + db MUSIC_CITIES1, 0 ; UndergroundPathEntranceRoute7 + db MUSIC_CELADON, 0 ;FREEZE + db MUSIC_CITIES1, 0 ; Route8Gate + db MUSIC_CITIES1, 0 ; UndergroundPathEntranceRoute8 + db MUSIC_POKECENTER, 0 ; RockTunnelPokecenter + db MUSIC_DUNGEON3, 0 ; RockTunnel1 + db MUSIC_DUNGEON1, 0 ; PowerPlant + db MUSIC_VERMILION, 0 ; Route11Gate + db MUSIC_DUNGEON2, 0 ; DiglettsCaveEntranceRoute11 + db MUSIC_VERMILION, 0 ; Route11GateUpstairs + db MUSIC_CITIES1, 0 ; Route12Gate + db MUSIC_CITIES2, 0 ; BillsHouse + db MUSIC_POKECENTER, 0 ; VermilionPokecenter + db MUSIC_VERMILION, 0 ; FanClub + db MUSIC_POKECENTER, 0 ; VermilionMart + db MUSIC_GYM, 0 ; VermilionGym + db MUSIC_VERMILION, 0 ; VermilionHouse1 + db MUSIC_SS_ANNE, 0 ; VermilionDock + db MUSIC_SS_ANNE, 0 ; SSAnne1 + db MUSIC_SS_ANNE, 0 ; SSAnne2 + db MUSIC_SS_ANNE, 0 ; SSAnne3 + db MUSIC_SS_ANNE, 0 ; SSAnne4 + db MUSIC_SS_ANNE, 0 ; SSAnne5 + db MUSIC_SS_ANNE, 0 ; SSAnne6 + db MUSIC_SS_ANNE, 0 ; SSAnne7 + db MUSIC_SS_ANNE, 0 ; SSAnne8 + db MUSIC_SS_ANNE, 0 ; SSAnne9 + db MUSIC_SS_ANNE, 0 ; SSAnne10 + db MUSIC_DUNGEON2, 0 ;unused + db MUSIC_DUNGEON2, 0 ;unused + db MUSIC_SS_ANNE, 0 ;unused + db MUSIC_DUNGEON3, 0 ; VictoryRoad1 + db MUSIC_POKEMON_TOWER, 0 ;unused + db MUSIC_DUNGEON1, 0 ;unused + db MUSIC_SILPH_CO, 0 ;unused + db MUSIC_SILPH_CO, 0 ;unused + db MUSIC_INDIGO_PLATEAU, 0 ; Lance + db MUSIC_SS_ANNE, 0 ;unused + db MUSIC_SS_ANNE, 0 ;unused + db MUSIC_SS_ANNE, 0 ;unused + db MUSIC_SS_ANNE, 0 ;unused + db MUSIC_PALLET_TOWN, 0 ; HallofFameRoom + db MUSIC_ROUTES1, 0 ; UndergroundPathNS + db MUSIC_INDIGO_PLATEAU, 0 ; Gary + db MUSIC_ROUTES1, 0 ; UndergroundPathWE + db MUSIC_POKECENTER, 0 ; CeladonMart1 + db MUSIC_POKECENTER, 0 ; CeladonMart2 + db MUSIC_POKECENTER, 0 ; CeladonMart3 + db MUSIC_POKECENTER, 0 ; CeladonMart4 + db MUSIC_POKECENTER, 0 ; CeladonMartRoof + db MUSIC_POKECENTER, 0 ; CeladonMartElevator + db MUSIC_CELADON, 0 ; CeladonMansion1 + db MUSIC_CELADON, 0 ; CeladonMansion2 + db MUSIC_CELADON, 0 ; CeladonMansion3 + db MUSIC_CELADON, 0 ; CeladonMansion4 + db MUSIC_CELADON, 0 ; CeladonMansion5 + db MUSIC_POKECENTER, 0 ; CeladonPokecenter + db MUSIC_GYM, 0 ; CeladonGym + db MUSIC_GAME_CORNER, 0 ; CeladonGameCorner + db MUSIC_POKECENTER, 0 ; CeladonMart5 + db MUSIC_CELADON, 0 ; CeladonPrizeRoom + db MUSIC_CELADON, 0 ; CeladonDiner + db MUSIC_CELADON, 0 ; CeladonHouse + db MUSIC_CELADON, 0 ; CeladonHotel + db MUSIC_POKECENTER, 0 ; LavenderPokecenter + db MUSIC_POKEMON_TOWER, 0 ; PokemonTower1 + db MUSIC_POKEMON_TOWER, 0 ; PokemonTower2 + db MUSIC_POKEMON_TOWER, 0 ; PokemonTower3 + db MUSIC_POKEMON_TOWER, 0 ; PokemonTower4 + db MUSIC_POKEMON_TOWER, 0 ; PokemonTower5 + db MUSIC_POKEMON_TOWER, 0 ; PokemonTower6 + db MUSIC_POKEMON_TOWER, 0 ; PokemonTower7 + db MUSIC_LAVENDER, 0 ; LavenderHouse1 + db MUSIC_POKECENTER, 0 ; LavenderMart + db MUSIC_LAVENDER, 0 ; LavenderHouse2 + db MUSIC_POKECENTER, 0 ; FuchsiaMart + db MUSIC_CITIES2, 0 ; FuchsiaHouse1 + db MUSIC_POKECENTER, 0 ; FuchsiaPokecenter + db MUSIC_CITIES2, 0 ; FuchsiaHouse2 + db MUSIC_CITIES2, 0 ; SafariZoneEntrance + db MUSIC_GYM, 0 ; FuchsiaGym + db MUSIC_CITIES2, 0 ; FuchsiaMeetingRoom + db MUSIC_DUNGEON2, 0 ; SeafoamIslands2 + db MUSIC_DUNGEON2, 0 ; SeafoamIslands3 + db MUSIC_DUNGEON2, 0 ; SeafoamIslands4 + db MUSIC_DUNGEON2, 0 ; SeafoamIslands5 + db MUSIC_CITIES2, 0 ; VermilionHouse2 + db MUSIC_CITIES2, 0 ; FuchsiaHouse3 + db MUSIC_CINNABAR_MANSION, 0 ; Mansion1 + db MUSIC_GYM, 0 ; CinnabarGym + db MUSIC_CINNABAR, 0 ; Lab1 + db MUSIC_CINNABAR, 0 ; Lab2 + db MUSIC_CINNABAR, 0 ; Lab3 + db MUSIC_CINNABAR, 0 ; Lab4 + db MUSIC_POKECENTER, 0 ; CinnabarPokecenter + db MUSIC_POKECENTER, 0 ; CinnabarMart + db MUSIC_CINNABAR, 0 + db MUSIC_INDIGO_PLATEAU, 0 ; IndigoPlateauLobby + db MUSIC_CITIES1, 0 ; CopycatsHouse1F + db MUSIC_CITIES1, 0 ; CopycatsHouse2F + db MUSIC_CITIES1, 0 ; FightingDojo + db MUSIC_GYM, 0 ; SaffronGym + db MUSIC_CITIES1, 0 ; SaffronHouse1 + db MUSIC_POKECENTER, 0 ; SaffronMart + db MUSIC_SILPH_CO, 0 ; SilphCo1 + db MUSIC_POKECENTER, 0 ; SaffronPokecenter + db MUSIC_CITIES1, 0 ; SaffronHouse2 + db MUSIC_CITIES1, 0 ; Route15Gate + db MUSIC_CITIES1, 0 ; Route15GateUpstairs + db MUSIC_CITIES1, 0 ; Route16Gate + db MUSIC_CITIES1, 0 ; Route16GateUpstairs + db MUSIC_CELADON, 0 ; Route16House + db MUSIC_CELADON, 0 ; Route12House + db MUSIC_CITIES1, 0 ; Route18Gate + db MUSIC_CITIES1, 0 ; Route18GateUpstairs + db MUSIC_DUNGEON2, 0 ; SeafoamIslands1 + db MUSIC_DUNGEON2, 0 ; Route22Gate + db MUSIC_DUNGEON3, 0 ; VictoryRoad2 + db MUSIC_CITIES1, 0 ; Route12GateUpstairs + db MUSIC_VERMILION, 0 ; VermilionHouse3 + db MUSIC_DUNGEON2, 0 ; DiglettsCave + db MUSIC_DUNGEON3, 0 ; VictoryRoad3 + db MUSIC_DUNGEON1, 0 ; RocketHideout1 + db MUSIC_DUNGEON1, 0 ; RocketHideout2 + db MUSIC_DUNGEON1, 0 ; RocketHideout3 + db MUSIC_DUNGEON1, 0 ; RocketHideout4 + db MUSIC_DUNGEON1, 0 ; RocketHideoutElevator + db MUSIC_DUNGEON1, 0 + db MUSIC_DUNGEON1, 0 + db MUSIC_DUNGEON1, 0 + db MUSIC_SILPH_CO, 0 ; SilphCo2 + db MUSIC_SILPH_CO, 0 ; SilphCo3 + db MUSIC_SILPH_CO, 0 ; SilphCo4 + db MUSIC_SILPH_CO, 0 ; SilphCo5 + db MUSIC_SILPH_CO, 0 ; SilphCo6 + db MUSIC_SILPH_CO, 0 ; SilphCo7 + db MUSIC_SILPH_CO, 0 ; SilphCo8 + db MUSIC_CINNABAR_MANSION, 0 ; Mansion2 + db MUSIC_CINNABAR_MANSION, 0 ; Mansion3 + db MUSIC_CINNABAR_MANSION, 0 ; Mansion4 + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneEast + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneNorth + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneWest + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneCenter + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneRestHouse1 + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneSecretHouse + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneRestHouse2 + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneRestHouse3 + db MUSIC_SAFARI_ZONE, 0 ; SafariZoneRestHouse4 + db MUSIC_DUNGEON1, 0 ; UnknownDungeon2 + db MUSIC_DUNGEON1, 0 ; UnknownDungeon3 + db MUSIC_DUNGEON1, 0 ; UnknownDungeon1 + db MUSIC_CITIES2, 0 ; NameRater + db MUSIC_CITIES1, 0 ; CeruleanHouse2 + db MUSIC_CINNABAR, 0 + db MUSIC_DUNGEON3, 0 ; RockTunnel2 + db MUSIC_SILPH_CO, 0 ; SilphCo9 + db MUSIC_SILPH_CO, 0 ; SilphCo10 + db MUSIC_SILPH_CO, 0 ; SilphCo11 + db MUSIC_SILPH_CO, 0 ; SilphCoElevator + db MUSIC_SILPH_CO, 0 + db MUSIC_SILPH_CO, 0 + db MUSIC_CELADON, 0 ; BattleCenterM + db MUSIC_CELADON, 0 ; TradeCenterM + db MUSIC_SILPH_CO, 0 + db MUSIC_SILPH_CO, 0 + db MUSIC_SILPH_CO, 0 + db MUSIC_SILPH_CO, 0 + db MUSIC_GYM, 0 ; Lorelei + db MUSIC_DUNGEON1, 0 ; Bruno + db MUSIC_POKEMON_TOWER, 0 ; Agatha + diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm index 82aa6d52..c13c58c4 100755 --- a/engine/HoF_room_pc.asm +++ b/engine/HoF_room_pc.asm @@ -23,7 +23,7 @@ HallOfFamePC: call EnableLCD ld a, $ff call PlaySoundWaitForCurrent - ld c, BANK(Music_Credits) + ld c, 0 ; BANK(Music_Credits) ld a, MUSIC_CREDITS call PlayMusic ld c, 128 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 373136a8..c9ed134a 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -200,7 +200,7 @@ PlayAnimation: push hl push de call GetMoveSound - call PlaySound + call nc, AnimPlaySFX pop de pop hl .skipPlayingSound @@ -256,6 +256,15 @@ PlayAnimation: .AnimationOver ret +AnimPlaySFX: + push de + ld e, a + xor a + ld d, a + call PlaySFX + pop de + ret + LoadSubanimation: ld a,[wSubAnimAddrPtr + 1] ld h,a @@ -551,7 +560,7 @@ PlaySubanimation: cp a,$FF jr z,.skipPlayingSound call GetMoveSound - call PlaySound + call nc, AnimPlaySFX .skipPlayingSound ld hl,wOAMBuffer ; base address of OAM buffer ld a,l @@ -2328,18 +2337,28 @@ GetMoveSound: .next ld a,[wEnemyMonSpecies] .Continue - push hl - call GetCryData - ld b,a - pop hl - ld a,[wFrequencyModifier] - add [hl] - ld [wFrequencyModifier],a - inc hl - ld a,[wTempoModifier] - add [hl] - ld [wTempoModifier],a - jr .done + push af + ld a, 1 + ld [wSFXDontWait], a + pop af + call PlayCry + xor a + ld [wSFXDontWait], a + ld a, b + scf + ret + ;push hl + ;call GetCryData + ;ld b,a + ;pop hl + ;ld a,[wFrequencyModifier] + ;add [hl] + ;ld [wFrequencyModifier],a + ;inc hl + ;ld a,[wTempoModifier] + ;add [hl] + ;ld [wTempoModifier],a + ;jr .done .NotCryMove ld a,[hli] ld [wFrequencyModifier],a @@ -3011,24 +3030,27 @@ PlayApplyingAttackSound: ; play a different sound depending if move is not very effective, neutral, or super-effective ; don't play any sound at all if move is ineffective call WaitForSoundToFinish - ld a, [wDamageMultipliers] + ld a, [wDamageMultipliers] ; effectiveness and $7f ret z cp 10 ld a, $20 ld b, $30 - ld c, SFX_DAMAGE + ld c, GSSFX_DAMAGE ; SFX_DAMAGE jr z, .playSound ld a, $e0 ld b, $ff - ld c, SFX_SUPER_EFFECTIVE + ld c, GSSFX_SUPER_EFFECTIVE ; SFX_SUPER_EFFECTIVE jr nc, .playSound ld a, $50 ld b, $1 - ld c, SFX_NOT_VERY_EFFECTIVE + ld c, GSSFX_NOT_VERY_EFFECTIVE ; SFX_NOT_VERY_EFFECTIVE .playSound ld [wFrequencyModifier], a ld a, b ld [wTempoModifier], a ld a, c - jp PlaySound + jp PlaySound + + + diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 153a9048..3085ff60 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -955,7 +955,7 @@ EndLowHealthAlarm: ; This function is called when the player has the won the battle. It turns off ; the low health alarm and prevents it from reactivating until the next battle. xor a - ld [wLowHealthAlarm], a ; turn off low health alarm + ld [wDanger], a ; turn off low health alarm ld [wChannelSoundIDs + Ch4], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating @@ -1051,7 +1051,7 @@ PlayBattleVictoryMusic: ld a, $ff ld [wNewSoundID], a call PlaySoundWaitForCurrent - ld c, BANK(Music_DefeatedTrainer) + ld c, 0 ; BANK(Music_DefeatedTrainer) pop af call PlayMusic jp Delay3 @@ -1098,11 +1098,11 @@ RemoveFaintedPlayerMon: predef FlagActionPredef ; clear gain exp flag for fainted mon ld hl, wEnemyBattleStatus1 res 2, [hl] ; reset "attacking multiple times" flag - ld a, [wLowHealthAlarm] + ld a, [wDanger] bit 7, a ; skip sound flag (red bar (?)) jr z, .skipWaitForSound ld a, $ff - ld [wLowHealthAlarm], a ;disable low health alarm + ld [wDanger], a ;disable low health alarm call WaitForSoundToFinish .skipWaitForSound ; a is 0, so this zeroes the enemy's accumulated damage. @@ -1949,7 +1949,7 @@ DrawPlayerHUDAndHPBar: cp HP_BAR_RED jr z, .setLowHealthAlarm .fainted - ld hl, wLowHealthAlarm + ld hl, wDanger bit 7, [hl] ;low health alarm enabled? ld [hl], $0 ret z @@ -1957,7 +1957,7 @@ DrawPlayerHUDAndHPBar: ld [wChannelSoundIDs + Ch4], a ret .setLowHealthAlarm - ld hl, wLowHealthAlarm + ld hl, wDanger set 7, [hl] ;enable low health alarm ret diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index c77e3b39..4635ec1f 100755 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -45,7 +45,7 @@ EndOfBattle: predef EvolutionAfterBattle .resetVariables xor a - ld [wLowHealthAlarm], a ;disable low health alarm + ld [wDanger], a ;disable low health alarm ld [wChannelSoundIDs + Ch4], a ld [wIsInBattle], a ld [wBattleType], a diff --git a/engine/cable_club.asm b/engine/cable_club.asm index 474dbd11..0f7fff2a 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -284,7 +284,7 @@ CableClub_DoBattleOrTradeAgain: predef HealParty jp ReturnToCableClubRoom .trading - ld c, BANK(Music_GameCorner) + ld c, 0 ; BANK(Music_GameCorner) ld a, MUSIC_GAME_CORNER call PlayMusic jr CallCurrentTradeCenterFunction @@ -917,7 +917,7 @@ CableClub_Run: ld [hJoy5], a ld a, 10 ld [wAudioFadeOutControl], a - ld a, BANK(Music_Celadon) + ld a, 0 ; BANK(Music_Celadon) ld [wAudioSavedROMBank], a ld a, MUSIC_CELADON ld [wNewSoundID], a diff --git a/engine/evolution.asm b/engine/evolution.asm index a2c52765..c7431784 100755 --- a/engine/evolution.asm +++ b/engine/evolution.asm @@ -7,7 +7,7 @@ EvolveMon: ld a, [wd0b5] push af xor a - ld [wLowHealthAlarm], a + ld [wDanger], a ld [wChannelSoundIDs + Ch4], a dec a ld [wNewSoundID], a @@ -41,7 +41,7 @@ EvolveMon: ld a, [wEvoOldSpecies] call PlayCry call WaitForSoundToFinish - ld c, BANK(Music_SafariZone) + ld c, 0 ; BANK(Music_SafariZone) ld a, MUSIC_SAFARI_ZONE call PlayMusic ld c, 80 diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index 9eb4edc5..81666e83 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -33,7 +33,7 @@ AnimateHallOfFame: .skipInc ld a, $90 ld [hWY], a - ld c, BANK(Music_HallOfFame) + ld c, 0 ; BANK(Music_HallOfFame) ld a, MUSIC_HALL_OF_FAME call PlayMusic ld hl, wPartySpecies diff --git a/engine/hidden_object_functions17.asm b/engine/hidden_object_functions17.asm index 1b571d35..b336f817 100755 --- a/engine/hidden_object_functions17.asm +++ b/engine/hidden_object_functions17.asm @@ -473,3 +473,10 @@ VermilionGymTrashFailText: call PlaySound call WaitForSoundToFinish jp TextScriptEnd + +; Trash cans are broken and can read the 255th entry sometimes for +; the second can. +; rgblink was placing stuff here, so the behavior was different from +; original Red. This is the simplest non-code fix: allocate zeroes as +; far as the broken code could reach. + ds 255 diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index f04c1deb..b9d1b4ed 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -67,13 +67,11 @@ SafariZoneGameOver: ld [wAudioFadeOutControl], a dec a call PlaySound - ld c, BANK(SFX_Safari_Zone_PA) + ld c, 0 ; BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA - call PlayMusic -.waitForMusicToPlay - ld a, [wChannelSoundIDs + Ch4] - cp SFX_SAFARI_ZONE_PA - jr nz, .waitForMusicToPlay + call PlaySound + call WaitForSoundToFinish + ld a, TEXT_SAFARI_GAME_OVER ld [hSpriteIndexOrTextID], a call DisplayTextID diff --git a/engine/intro.asm b/engine/intro.asm index ed532681..20bedd3b 100755 --- a/engine/intro.asm +++ b/engine/intro.asm @@ -328,12 +328,12 @@ PlayShootingStar: ld c, 40 call DelayFrames .next - ld a, BANK(Music_IntroBattle) + ld a, 0 ; BANK(Music_IntroBattle) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, MUSIC_INTRO_BATTLE ld [wNewSoundID], a - call PlaySound + call PlayMusic call IntroClearMiddleOfScreen call ClearSprites jp Delay3 diff --git a/engine/items/items.asm b/engine/items/items.asm index f8873a6e..9f160bf2 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -989,7 +989,7 @@ ItemUseMedicine: jp .cureStatusAilment .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a - ld [wLowHealthAlarm],a ;disable low health alarm + ld [wDanger],a ;disable low health alarm ld [wChannelSoundIDs + Ch4],a push hl push de @@ -1771,11 +1771,11 @@ ItemUsePokeflute: ; if some pokemon were asleep ld hl,PlayedFluteHadEffectText call PrintText - ld a,[wLowHealthAlarm] + ld a,[wDanger] and a,$80 jr nz,.skipMusic call WaitForSoundToFinish ; wait for sound to end - callba Music_PokeFluteInBattle ; play in-battle pokeflute music + ;callba Music_PokeFluteInBattle ; play in-battle pokeflute music ; XXX .musicWaitLoop ; wait for music to finish playing ld a,[wChannelSoundIDs + Ch6] and a ; music off? @@ -1847,12 +1847,9 @@ PlayedFluteHadEffectText: ld a,$ff call PlaySound ; turn off music ld a, SFX_POKEFLUE - ld c, BANK(SFX_Pokeflute) - call PlayMusic -.musicWaitLoop ; wait for music to finish playing - ld a,[wChannelSoundIDs + Ch2] - cp a, SFX_POKEFLUE - jr z,.musicWaitLoop + ld c, 0 ; BANK(SFX_Pokeflute) + call PlaySound + call WaitForSoundToFinish call PlayDefaultMusic ; start playing normal music again .done jp TextScriptEnd ; end text diff --git a/engine/menu/bills_pc.asm b/engine/menu/bills_pc.asm index 85a546e1..98175559 100644 --- a/engine/menu/bills_pc.asm +++ b/engine/menu/bills_pc.asm @@ -224,9 +224,11 @@ BillsPCDeposit: jp c, BillsPCMenu call DisplayDepositWithdrawMenu jp nc, BillsPCMenu + call WaitForSoundToFinish ld a, [wcf91] - call GetCryData - call PlaySoundWaitForCurrent + call PlayCry + ;call GetCryData + ;call PlaySoundWaitForCurrent ld a, PARTY_TO_BOX ld [wMoveMonType], a call MoveMon @@ -276,9 +278,11 @@ BillsPCWithdraw: ld a, [wWhichPokemon] ld hl, wBoxMonNicks call GetPartyMonName + call WaitForSoundToFinish ld a, [wcf91] - call GetCryData - call PlaySoundWaitForCurrent + call PlayCry + ;call GetCryData + ;call PlaySoundWaitForCurrent xor a ; BOX_TO_PARTY ld [wMoveMonType], a call MoveMon @@ -551,4 +555,3 @@ JustAMomentText:: OpenBillsPCText:: db $FD ; FuncTX_BillsPC - diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 2da3a0f6..56882eaf 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -143,8 +143,10 @@ HandlePokedexSideMenu: ; play pokemon cry .choseCry ld a,[wd11e] - call GetCryData - call PlaySound + push af + call PlayCry + pop af + ld [wd11e], a jr .handleMenuInput .choseArea diff --git a/engine/oak_speech.asm b/engine/oak_speech.asm index 43efecbc..09ef25c9 100755 --- a/engine/oak_speech.asm +++ b/engine/oak_speech.asm @@ -34,7 +34,7 @@ SetDefaultNames: OakSpeech: ld a,$FF call PlaySound ; stop music - ld a, BANK(Music_Routes2) + ld a, 0 ; BANK(Music_Routes2) ld c,a ld a, MUSIC_ROUTES2 call PlayMusic @@ -128,7 +128,7 @@ OakSpeech: call ResetPlayerSpriteData ld a,[H_LOADEDROMBANK] push af - ld a, BANK(Music_PalletTown) + ld a, 0 ; BANK(Music_PalletTown) ld [wAudioROMBank],a ld [wAudioSavedROMBank],a ld a, 10 diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 7ff4ff71..3db2ebbd 100755 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -17,9 +17,9 @@ ShakeElevator: add d ld [hSCY], a push bc - ld c, BANK(SFX_Collision_1) + ld c, 0 ; BANK(SFX_Collision_1) ld a, SFX_COLLISION - call PlayMusic + call PlaySound pop bc ld c, 2 call DelayFrames @@ -29,9 +29,9 @@ ShakeElevator: ld [hSCY], a ld a, $ff call PlaySound - ld c, BANK(SFX_Safari_Zone_PA) + ld c, 0 ; BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA - call PlayMusic + call PlaySound .musicLoop ld a, [wChannelSoundIDs + Ch4] cp SFX_SAFARI_ZONE_PA diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 38a44cfb..c2cac383 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,4 +1,7 @@ AnimateHealingMachine: + xor a + call PlayMusic + ld de, PokeCenterFlashingMonitorAndHealBall ld hl, vChars0 + $7c0 lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), $03 ; loads one too many tiles @@ -15,15 +18,17 @@ AnimateHealingMachine: ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData call CopyHealingMachineOAM - ld a, 4 - ld [wAudioFadeOutControl], a - ld a, $ff - ld [wNewSoundID], a - call PlaySound -.waitLoop - ld a, [wAudioFadeOutControl] - and a ; is fade-out finished? - jr nz, .waitLoop ; if not, check again + +; ld a, 4 +; ld [wAudioFadeOutControl], a +; ld a, $ff +; ld [wNewSoundID], a +; call PlaySound +;.waitLoop +; ld a, [wAudioFadeOutControl] +; and a ; is fade-out finished? +; jr nz, .waitLoop ; if not, check again + ld a, [wPartyCount] ld b, a .partyLoop @@ -35,24 +40,25 @@ AnimateHealingMachine: dec b jr nz, .partyLoop ld a, [wAudioROMBank] - cp BANK(Audio3_UpdateMusic) + cp $1f ; 0 ; BANK(Audio3_UpdateMusic) XXXXX ld [wAudioSavedROMBank], a jr nz, .next ld a, $ff ld [wNewSoundID], a call PlaySound - ld a, BANK(Music_PkmnHealed) + ld a, 0 ; BANK(Music_PkmnHealed) ld [wAudioROMBank], a .next ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a - call PlaySound + call PlayMusic ld d, $28 call FlashSprite8Times .waitLoop2 - ld a, [wChannelSoundIDs] - cp MUSIC_PKMN_HEALED ; is the healed music still playing? - jr z, .waitLoop2 ; if so, check gain + ld a, [Channel1MusicID] + and a + jr nz, .waitLoop2 + ld c, 32 call DelayFrames pop af @@ -60,6 +66,8 @@ AnimateHealingMachine: pop hl pop af ld [hl], a + + jp UpdateSprites PokeCenterFlashingMonitorAndHealBall: diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 6d05859e..0c0e46bd 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -117,6 +117,9 @@ UpdateNPCSprite: ld hl, wMapSpriteData add l ld l, a + jr nc, .nc + inc h +.nc ld a, [hl] ; read movement byte 2 ld [wCurSpriteMovement2], a ld h, $c1 diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 98d1b7a7..14f1f736 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -162,12 +162,12 @@ PewterMuseumGuyMovementScriptPointerTable: dw PewterMovementScript_Done PewterMovementScript_WalkToMuseum: - ld a, BANK(Music_MuseumGuy) + ld a, 0 ; BANK(Music_MuseumGuy) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, MUSIC_MUSEUM_GUY ld [wNewSoundID], a - call PlaySound + call PlayMusic ld a, [wSpriteIndex] swap a ld [wNPCMovementScriptSpriteOffset], a @@ -218,12 +218,12 @@ PewterGymGuyMovementScriptPointerTable: dw PewterMovementScript_Done PewterMovementScript_WalkToGym: - ld a, BANK(Music_MuseumGuy) + ld a, 0 ; BANK(Music_MuseumGuy) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, MUSIC_MUSEUM_GUY ld [wNewSoundID], a - call PlaySound + call PlayMusic ld a, [wSpriteIndex] swap a ld [wNPCMovementScriptSpriteOffset], a diff --git a/engine/overworld/pokecenter.asm b/engine/overworld/pokecenter.asm index f26bedf8..05ef1e79 100755 --- a/engine/overworld/pokecenter.asm +++ b/engine/overworld/pokecenter.asm @@ -30,7 +30,7 @@ DisplayPokemonCenterDialogue_: ld a, [wMapMusicSoundID] ld [wLastMusicSoundID], a ld [wNewSoundID], a - call PlaySound + call PlayMusic ld hl, PokemonFightingFitText call PrintText ld a, $14 diff --git a/engine/predefs.asm b/engine/predefs.asm index 605cba3a..97cec6f7 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -58,7 +58,7 @@ PredefPointers:: add_predef ScaleSpriteByTwo add_predef LoadMonBackPic add_predef CopyDownscaledMonTiles - dbw $03,JumpMoveEffect ; wrong bank + add_predef LoadMissableObjects ; dbw $03,JumpMoveEffect ; wrong bank XXXXX add_predef HealParty add_predef MoveAnimation add_predef DivideBCDPredef diff --git a/engine/save.asm b/engine/save.asm index 4fb2c4c8..ef16b637 100755 --- a/engine/save.asm +++ b/engine/save.asm @@ -4,6 +4,10 @@ LoadSAV: call ClearScreen call LoadFontTilePatterns call LoadTextBoxTilePatterns + + ld a, 1 + ld [wHaltAudio], a + call LoadSAV0 jr c, .badsum call LoadSAV1 @@ -25,6 +29,9 @@ LoadSAV: ld a, $1 ; bad checksum .goodsum ld [wSaveFileStatus], a + + ld a, 0 + ld [wHaltAudio], a ret FileDataDestroyedText: @@ -274,9 +281,18 @@ SaveSAVtoSRAM2: SaveSAVtoSRAM: ld a, $2 ld [wSaveFileStatus], a + + ld a, 1 + ld [wHaltAudio], a + call SaveSAVtoSRAM0 call SaveSAVtoSRAM1 - jp SaveSAVtoSRAM2 + call SaveSAVtoSRAM2 + + ld a, 0 + ld [wHaltAudio], a + + ret SAVCheckSum: ;Check Sum (result[1 byte] is complemented) @@ -391,6 +407,9 @@ WhenYouChangeBoxText: CopyBoxToOrFromSRAM: ; copy an entire box from hl to de with b as the SRAM bank + ld a, 1 + ld [wHaltAudio], a + push hl ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -416,6 +435,9 @@ CopyBoxToOrFromSRAM: xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a + + xor a + ld [wHaltAudio], a ret DisplayChangeBoxMenu: @@ -513,6 +535,9 @@ BoxNoText: EmptyAllSRAMBoxes: ; marks all boxes in SRAM as empty (initialisation for the first time the ; player changes the box) + ld a, 1 + ld [wHaltAudio], a + ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -526,6 +551,9 @@ EmptyAllSRAMBoxes: xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a + + xor a + ld [wHaltAudio], a ret EmptySRAMBoxesInBank: @@ -557,6 +585,9 @@ EmptySRAMBox: ret GetMonCountsForAllBoxes: + ld a, 1 + ld [wHaltAudio], a + ld hl, wBoxMonCounts push hl ld a, SRAM_ENABLE @@ -583,6 +614,8 @@ GetMonCountsForAllBoxes: ld a, [wNumInBox] ld [hl], a + xor a + ld [wHaltAudio], a ret GetMonCountsForBoxesInBank: @@ -604,6 +637,9 @@ SAVCheckRandomID: ;checks if Sav file is the same by checking player's name 1st letter ($a598) ; and the two random numbers generated at game beginning ;(which are stored at wPlayerID)s + ld a, 1 + ld [wHaltAudio], a + ld a,$0a ld [MBC1SRamEnable],a ld a,$01 @@ -632,6 +668,9 @@ SAVCheckRandomID: ld a,$00 ld [MBC1SRamBankingMode],a ld [MBC1SRamEnable],a + + xor a + ld [wHaltAudio], a ret SaveHallOfFameTeams: @@ -670,6 +709,9 @@ LoadHallOfFameTeams: ; fallthrough HallOfFame_Copy: + ld a, 1 + ld [wHaltAudio], a + ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -680,9 +722,15 @@ HallOfFame_Copy: xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a + + xor a + ld [wHaltAudio], a ret ClearSAV: + ld a, 1 + ld [wHaltAudio], a + ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -698,6 +746,9 @@ ClearSAV: xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a + + xor a + ld [wHaltAudio], a ret PadSRAM_FF: diff --git a/engine/titlescreen.asm b/engine/titlescreen.asm index f4cce5b4..f97b0f39 100755 --- a/engine/titlescreen.asm +++ b/engine/titlescreen.asm @@ -17,7 +17,7 @@ SetDefaultNamesBeforeTitlescreen: ld [hli], a ld [hli], a ld [hl], a - ld a, BANK(Music_TitleScreen) + ld a, 0 ; BANK(Music_TitleScreen) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a @@ -181,6 +181,9 @@ ENDC ret .finishedBouncingPokemonLogo + xor a + ld [hSCY], a + call LoadScreenTilesFromBuffer1 ld c, 36 call DelayFrames @@ -213,7 +216,7 @@ ENDC call WaitForSoundToFinish ld a, MUSIC_TITLE_SCREEN ld [wNewSoundID], a - call PlaySound + call PlayMusic xor a ld [wUnusedCC5B], a diff --git a/home.asm b/home.asm index 0a2d829d..34eb43e5 100644 --- a/home.asm +++ b/home.asm @@ -82,8 +82,6 @@ HideSprites:: INCLUDE "home/copy.asm" - - SECTION "Entry", ROM0 [$100] nop @@ -308,12 +306,7 @@ LoadFrontSpriteByMonIndex:: ld [MBC1RomBank], a ret - -PlayCry:: -; Play monster a's cry. - call GetCryData - call PlaySound - jp WaitForSoundToFinish +; PlayCry GetCryData:: ; Load cry data for monster a. @@ -2604,7 +2597,7 @@ PlayTrainerMusic:: ld [wAudioFadeOutControl], a ld a, $ff call PlaySound - ld a, BANK(Music_MeetEvilTrainer) + ld a, 0 ; BANK(Music_MeetEvilTrainer) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, [wEngagedTrainerClass] @@ -2632,7 +2625,7 @@ PlayTrainerMusic:: ld a, MUSIC_MEET_MALE_TRAINER .PlaySound ld [wNewSoundID], a - jp PlaySound + jp PlayMusic INCLUDE "data/trainer_types.asm" @@ -3209,23 +3202,67 @@ PlaySoundWaitForCurrent:: ; Wait for sound to finish playing WaitForSoundToFinish:: - ld a, [wLowHealthAlarm] - and $80 +WaitSFX:: +; infinite loop until sfx is done playing + ld a, [Danger] + and a + ret nz + ld a, [wSFXDontWait] + and a ret nz push hl -.waitLoop - ld hl, wChannelSoundIDs + Ch4 - xor a - or [hl] - inc hl - or [hl] - inc hl - inc hl - or [hl] - jr nz, .waitLoop + +.loop + ; ch5 on? + ld hl, Channel5 + Channel1Flags - Channel1 + bit 0, [hl] + jr nz, .loop + ; ch6 on? + ld hl, Channel6 + Channel1Flags - Channel1 + bit 0, [hl] + jr nz, .loop + ; ch7 on? + ld hl, Channel7 + Channel1Flags - Channel1 + bit 0, [hl] + jr nz, .loop + ; ch8 on? + ld hl, Channel8 + Channel1Flags - Channel1 + bit 0, [hl] + jr nz, .loop + pop hl ret +WaitForSongToFinish:: +.loop + call IsSongPlaying + jr c, .loop + ret + +IsSongPlaying:: + ; ch1 on? + ld hl, Channel1 + Channel1Flags - Channel1 + bit 0, [hl] + jr nz, .playing + ; ch2 on? + ld hl, Channel2 + Channel1Flags - Channel1 + bit 0, [hl] + jr nz, .playing + ; ch3 on? + ld hl, Channel3 + Channel1Flags - Channel1 + bit 0, [hl] + jr nz, .playing + ; ch4 on? + ld hl, Channel4 + Channel1Flags - Channel1 + bit 0, [hl] + jr z, .notPlaying +.playing + scf + ret +.notPlaying + xor a + ret + NamePointers:: dw MonsterNames dw MoveNames diff --git a/home/audio.asm b/home/audio.asm index c982d9d6..b218f89f 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -34,7 +34,7 @@ PlayDefaultMusicCommon:: ld b, a ld a, d and a ; should current music be faded out first? - ld a, BANK(Music_BikeRiding) + ld a, 0 ; BANK(Music_BikeRiding) jr nz, .next2 ; Only change the audio ROM bank if the current music isn't going to be faded @@ -64,155 +64,236 @@ PlayDefaultMusicCommon:: ld a, b ld [wLastMusicSoundID], a ld [wNewSoundID], a - jp PlaySound + + ld [MusicFadeID], a + ld a, 8 + ld [MusicFade], a + ;call FadeMusic ; called in updatemusic + ret UpdateMusic6Times:: -; This is called when entering a map, before fading out the current music and -; playing the default music (i.e. the map's music or biking/surfing music). - ld a, [wAudioROMBank] - ld b, a - cp BANK(Audio1_UpdateMusic) - jr nz, .checkForAudio2 + ;jp UpdateSound + ;ret ; XXX UpdateMusic -; audio 1 - ld hl, Audio1_UpdateMusic - jr .next - -.checkForAudio2 - cp BANK(Audio2_UpdateMusic) - jr nz, .audio3 - -; audio 2 - ld hl, Audio2_UpdateMusic - jr .next - -.audio3 - ld hl, Audio3_UpdateMusic - -.next - ld c, 6 -.loop - push bc - push hl - call Bankswitch - pop hl - pop bc - dec c - jr nz, .loop +CompareMapMusicBankWithCurrentBank: ret -CompareMapMusicBankWithCurrentBank:: -; Compares the map music's audio ROM bank with the current audio ROM bank -; and updates the audio ROM bank variables. -; Returns whether the banks are different in carry. - ld a, [wMapMusicROMBank] +; plays musicSFX specified by a. If value is $ff, music is stopped +PlaySound:: + push de + cp $ff + jr nz, .notff + xor a + call PlayMusic + pop de + ret +.notff ld e, a - ld a, [wAudioROMBank] - cp e - jr nz, .differentBanks - ld [wAudioSavedROMBank], a - and a + xor a + ld d, a + call PlaySFX + pop de ret -.differentBanks - ld a, c ; this is a fade-out counter value and it's always non-zero + +OpenSRAMForSound:: + ld a, SRAM_ENABLE + ld [MBC1SRamEnable], a + xor a + ld [MBC1SRamBankingMode], a + ld [MBC1SRamBank], a + ret + +;SoundRestart:: +; push hl +; push de +; push bc +; push af +; +; call OpenSRAMForSound +; +; ld a, [hROMBank] +; push af +; ld a, BANK(_SoundRestart) +; ld [hROMBank], a +; ld [MBC1RomBank], a +; +; call _SoundRestart +; +; pop af +; ld [hROMBank], a +; ld [MBC1RomBank], a +; +; pop af +; pop bc +; pop de +; pop hl +; ret + + +UpdateSound:: +; push hl +; push de +; push bc +; push af + ld a, [wHaltAudio] and a - ld a, e - jr nz, .next -; If the fade-counter is non-zero, we don't change the audio ROM bank because -; it's needed to keep playing the music as it fades out. The FadeOutAudio -; routine will take care of copying [wAudioSavedROMBank] to [wAudioROMBank] -; when the music has faded out. - ld [wAudioROMBank], a -.next - ld [wAudioSavedROMBank], a - scf + ret nz + + ld a, [hROMBank] + push af + ld a, BANK(_UpdateSound) + ld [hROMBank], a + ld [MBC1RomBank], a + + call _UpdateSound + + pop af + ld [hROMBank], a + ld [MBC1RomBank], a + +; pop af +; pop bc +; pop de +; pop hl ret PlayMusic:: - ld b, a - ld [wNewSoundID], a + ld e, a xor a - ld [wAudioFadeOutControl], a - ld a, c - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a - ld a, b + ld d, a +; Play music de. -; plays music specified by a. If value is $ff, music is stopped -PlaySound:: push hl push de push bc - ld b, a - ld a, [wNewSoundID] - and a - jr z, .next - xor a - ld [wChannelSoundIDs + Ch4], a - ld [wChannelSoundIDs + Ch5], a - ld [wChannelSoundIDs + Ch6], a - ld [wChannelSoundIDs + Ch7], a -.next - ld a, [wAudioFadeOutControl] - and a ; has a fade-out length been specified? - jr z, .noFadeOut - ld a, [wNewSoundID] - and a ; is the new sound ID 0? - jr z, .done ; if so, do nothing - xor a - ld [wNewSoundID], a - ld a, [wLastMusicSoundID] - cp $ff ; has the music been stopped? - jr nz, .fadeOut ; if not, fade out the current music -; If it has been stopped, start playing the new music immediately. - xor a - ld [wAudioFadeOutControl], a -.noFadeOut - xor a - ld [wNewSoundID], a - ld a, [H_LOADEDROMBANK] - ld [hSavedROMBank], a - ld a, [wAudioROMBank] - ld [H_LOADEDROMBANK], a + push af + + ld a, [hROMBank] + push af + ld a, BANK(_PlayMusic) ; and BANK(_SoundRestart) + ld [hROMBank], a ld [MBC1RomBank], a - cp BANK(Audio1_PlaySound) - jr nz, .checkForAudio2 -; audio 1 - ld a, b - call Audio1_PlaySound - jr .next2 + call _PlayMusic -.checkForAudio2 - cp BANK(Audio2_PlaySound) - jr nz, .audio3 - -; audio 2 - ld a, b - call Audio2_PlaySound - jr .next2 - -.audio3 - ld a, b - call Audio3_PlaySound - -.next2 - ld a, [hSavedROMBank] - ld [H_LOADEDROMBANK], a + pop af + ld [hROMBank], a ld [MBC1RomBank], a - jr .done + jr PopAllRet -.fadeOut - ld a, b - ld [wLastMusicSoundID], a - ld a, [wAudioFadeOutControl] - ld [wAudioFadeOutCounterReloadValue], a - ld [wAudioFadeOutCounter], a - ld a, b - ld [wAudioFadeOutControl], a -.done +PlayCry:: +; Play monster a's cry. +; Play a cry given parameters in header de + + push hl + push de + push bc + push af + ld [wd11e], a + predef IndexToPokedex + ld a, [wd11e] + dec a + ld e, a + ld d, 0 + +; Save current bank + ld a, [hROMBank] + push af + +; Cry headers are stuck in one bank. + ld a, BANK(CryHeaders) + ld [hROMBank], a + ld [$2000], a + +; Each header is 6 bytes long: + ld hl, CryHeaders + add hl, de + add hl, de + add hl, de + add hl, de + add hl, de + add hl, de + + ld e, [hl] + inc hl + ld d, [hl] + inc hl + + ld a, [hli] + ld [CryPitch], a + ld a, [hli] + ld [CryEcho], a + ld a, [hli] + ld [CryLength], a + ld a, [hl] + ld [CryLength+1], a + + ld a, BANK(PlayCry_) + ld [hROMBank], a + ld [$2000], a + + call PlayCry_ + + pop af + ld [hROMBank], a + ld [$2000], a + + call WaitForSoundToFinish + + jr PopAllRet + +PlaySFX:: +; Play sound effect de. +; Sound effects are ordered by priority (lowest to highest) + + push hl + push de + push bc + push af + +; Is something already playing? + ;call CheckSFX + ;jr nc, .play +; Does it have priority? + ;ld a, [CurSFX] + ;cp e + ;jr c, .quit + +PlaySFX_play +.play + ld a, [hROMBank] + push af + ld a, BANK(_PlaySFX) + ld [hROMBank], a + ld [$2000], a ; bankswitch + + ld a, e + ld [CurSFX], a + call _PlaySFX + + pop af + ld [hROMBank], a + ld [$2000], a ; bankswitch +.quit +PopAllRet: + pop af pop bc pop de pop hl ret + +_LoadMusicByte:: +; CurMusicByte = [a:de] +GLOBAL LoadMusicByte + + ld [hROMBank], a + ld [MBC1RomBank], a + + ld a, [de] + ld [CurMusicByte], a + ld a, BANK(LoadMusicByte) + + ld [hROMBank], a + ld [MBC1RomBank], a + ret diff --git a/home/init.asm b/home/init.asm index cb5c6583..7e4fa82c 100644 --- a/home/init.asm +++ b/home/init.asm @@ -97,7 +97,7 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB - ld a, BANK(SFX_Shooting_Star) + ld a, 0 ; BANK(SFX_Shooting_Star) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, $9c @@ -126,7 +126,12 @@ ClearVram: StopAllSounds:: - ld a, BANK(Audio1_UpdateMusic) + call OpenSRAMForSound + ld hl, MusicPlaying + ld bc, (wChannelSelectorSwitches+8) - Crysaudio + call FillMemory + + ld a, 0 ; BANK(Audio1_UpdateMusic) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a xor a diff --git a/home/overworld.asm b/home/overworld.asm index ec8f1925..78683e0a 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -771,15 +771,28 @@ HandleBlackOut:: jp SpecialEnterMap StopMusic:: - ld [wAudioFadeOutControl], a - ld a, $ff - ld [wNewSoundID], a - call PlaySound -.wait - ld a, [wAudioFadeOutControl] - and a - jr nz, .wait - jp StopAllSounds + xor a + ld [MusicFadeID], a + ld a, 1 + ld [MusicFade], a +.wait0 + ld a, [MusicFadeCount] + and a + jr z, .wait0 +.wait1 + ld a, [MusicFadeCount] + and a + jr nz, .wait1 + ret +; ld [wAudioFadeOutControl], a +; ld a, $ff +; ld [wNewSoundID], a +; call PlaySound +;.wait +; ld a, [wAudioFadeOutControl] +; and a +; jr nz, .wait +; jp StopAllSounds HandleFlyWarpOrDungeonWarp:: call UpdateSprites @@ -1244,9 +1257,15 @@ CollisionCheckOnLand:: call CheckTilePassable jr nc,.noCollision .collision - ld a,[wChannelSoundIDs + Ch4] - cp SFX_COLLISION ; check if collision sound is already playing - jr z,.setCarry + ;ld a,[wChannelSoundIDs + Ch4] + ;cp SFX_COLLISION ; check if collision sound is already playing + ; curSFX is not cleared for some reason. + + ; ch5 on? + ld hl, Channel5 + Channel1Flags - Channel1 + bit 0, [hl] + + jr nz,.setCarry ld a,SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry diff --git a/home/vblank.asm b/home/vblank.asm index e80fba75..19203452 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -50,27 +50,28 @@ VBlank:: ld [H_FRAMECOUNTER], a .skipDec - call FadeOutAudio +; call FadeOutAudio - ld a, [wAudioROMBank] ; music ROM bank - ld [H_LOADEDROMBANK], a - ld [MBC1RomBank], a + call UpdateSound +; ld a, [wAudioROMBank] ; music ROM bank +; ld [H_LOADEDROMBANK], a +; ld [MBC1RomBank], a - cp BANK(Audio1_UpdateMusic) - jr nz, .checkForAudio2 -.audio1 - call Audio1_UpdateMusic - jr .afterMusic -.checkForAudio2 - cp BANK(Audio2_UpdateMusic) - jr nz, .audio3 -.audio2 - call Music_DoLowHealthAlarm - call Audio2_UpdateMusic - jr .afterMusic -.audio3 - call Audio3_UpdateMusic -.afterMusic +; cp BANK(Audio1_UpdateMusic) +; jr nz, .checkForAudio2 +;.audio1 +; call Audio1_UpdateMusic +; jr .afterMusic +;.checkForAudio2 +; cp BANK(Audio2_UpdateMusic) +; jr nz, .audio3 +;.audio2 +; call Music_DoLowHealthAlarm +; call Audio2_UpdateMusic +; jr .afterMusic +;.audio3 +; call Audio3_UpdateMusic +;.afterMusic callba TrackPlayTime ; keep track of time played diff --git a/hram.asm b/hram.asm index 9c13e5a1..9b7db62b 100644 --- a/hram.asm +++ b/hram.asm @@ -184,6 +184,7 @@ hJoy6 EQU $FFB6 hJoy7 EQU $FFB7 H_LOADEDROMBANK EQU $FFB8 +hROMBank EQU $FFB8 ; XXXXX hSavedROMBank EQU $FFB9 diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm index 5cf5a809..417eb83d 100755 --- a/macros/asm_macros.asm +++ b/macros/asm_macros.asm @@ -136,6 +136,16 @@ dbbw: MACRO dw \3 ENDM +bigdw: MACRO ; big-endian word + dw ((\1)/$100) + (((\1)&$ff)*$100) +ENDM + +dt: MACRO ; three-byte (big-endian) + db (\1 >> 16) & $ff + db (\1 >> 8) & $ff + db \1 & $ff +ENDM + ; Predef macro. predef_const: MACRO const \1PredefID @@ -186,3 +196,8 @@ tx_pre_jump: MACRO tx_pre_id \1 jp PrintPredefTextID ENDM + +inc_section: MACRO + SECTION \1, ROMX + include \1 +ENDM diff --git a/macros/audio_macros.asm b/macros/audio_macros.asm index 71304bf8..d16607bc 100755 --- a/macros/audio_macros.asm +++ b/macros/audio_macros.asm @@ -31,71 +31,25 @@ audio: MACRO ENDM unknownsfx0x10: MACRO - db $10 + db $dd ; soundinput db \1 ENDM unknownsfx0x20: MACRO - db $20 | \1 + ; noise/sound + db \1 + ;db $20 | \1 db \2 db \3 db \4 ENDM unknownnoise0x20: MACRO - db $20 | \1 + db \1 ; | $20 db \2 db \3 ENDM -;format: pitch length (in 16ths) -C_: MACRO - db $00 | (\1 - 1) -ENDM - -C#: MACRO - db $10 | (\1 - 1) -ENDM - -D_: MACRO - db $20 | (\1 - 1) -ENDM - -D#: MACRO - db $30 | (\1 - 1) -ENDM - -E_: MACRO - db $40 | (\1 - 1) -ENDM - -F_: MACRO - db $50 | (\1 - 1) -ENDM - -F#: MACRO - db $60 | (\1 - 1) -ENDM - -G_: MACRO - db $70 | (\1 - 1) -ENDM - -G#: MACRO - db $80 | (\1 - 1) -ENDM - -A_: MACRO - db $90 | (\1 - 1) -ENDM - -A#: MACRO - db $A0 | (\1 - 1) -ENDM - -B_: MACRO - db $B0 | (\1 - 1) -ENDM ;format: instrument length (in 16ths) snare1: MACRO @@ -193,85 +147,17 @@ mutedsnare4: MACRO db $13 ENDM +duty: MACRO + ;db $EC + db $db + db \1 +ENDM + ;format: rest length (in 16ths) rest: MACRO db $C0 | (\1 - 1) ENDM -; format: notetype speed, volume, fade -notetype: MACRO - db $D0 | \1 - db (\2 << 4) | \3 -ENDM - -dspeed: MACRO - db $D0 | \1 -ENDM - -octave: MACRO - db $E8 - \1 -ENDM - -toggleperfectpitch: MACRO - db $E8 -ENDM - -;format: vibrato delay, rate, depth -vibrato: MACRO - db $EA - db \1 - db (\2 << 4) | \3 -ENDM - -pitchbend: MACRO - db $EB - db \1 - db \2 -ENDM - -duty: MACRO - db $EC - db \1 -ENDM - -tempo: MACRO - db $ED - db \1 / $100 - db \1 % $100 -ENDM - -stereopanning: MACRO - db $EE - db \1 -ENDM - -volume: MACRO - db $F0 - db (\1 << 4) | \2 -ENDM - executemusic: MACRO - db $F8 -ENDM - -dutycycle: MACRO - db $FC - db \1 -ENDM - -;format: callchannel address -callchannel: MACRO - db $FD - dw \1 -ENDM - -;format: loopchannel count, address -loopchannel: MACRO - db $FE - db \1 - dw \2 -ENDM - -endchannel: MACRO - db $FF + togglesfx ENDM diff --git a/main.asm b/main.asm index da2d3671..d2a0bf72 100755 --- a/main.asm +++ b/main.asm @@ -2094,3 +2094,22 @@ INCLUDE "engine/evolution.asm" INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/items/tm_prices.asm" + +SECTION "bank38",ROMX,BANK[$38] +SpriteBank1: + ds $4000 +SECTION "bank39",ROMX,BANK[$39] +SpriteBank2: + ds $4000 +SECTION "bank3a",ROMX,BANK[$3A] +SpriteBank3: + ds $4000 +SECTION "bank3b",ROMX,BANK[$3b] +SpriteBank4: + ds $4000 +SECTION "bank3e",ROMX,BANK[$3e] +SpriteBank5: + ds $4000 +SECTION "bank3f",ROMX,BANK[$3f] +SpriteBank6: + ds $4000 diff --git a/scripts/ceruleancity.asm b/scripts/ceruleancity.asm index d6269a64..97960209 100755 --- a/scripts/ceruleancity.asm +++ b/scripts/ceruleancity.asm @@ -68,7 +68,7 @@ CeruleanCityScript0: ld [wNewSoundID], a call PlaySound .asm_19512 - ld c, BANK(Music_MeetRival) + ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic xor a diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index e73d7cf8..a051edef 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -350,7 +350,7 @@ OaksLabScript10: call SetSpriteFacingDirectionAndDelay ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a - ld c, BANK(Music_MeetRival) + ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $f diff --git a/scripts/pallettown.asm b/scripts/pallettown.asm index a06dfd54..30e06c35 100755 --- a/scripts/pallettown.asm +++ b/scripts/pallettown.asm @@ -29,7 +29,7 @@ PalletTownScript0: ld [wPlayerMovingDirection],a ld a,$FF call PlaySound ; stop music - ld a, BANK(Music_MeetProfOak) + ld a, 0 ; BANK(Music_MeetProfOak) ld c,a ld a, MUSIC_MEET_PROF_OAK ; “oak appears” music call PlayMusic diff --git a/scripts/pewterpokecenter.asm b/scripts/pewterpokecenter.asm index 5de1e6b7..ab5de8f2 100755 --- a/scripts/pewterpokecenter.asm +++ b/scripts/pewterpokecenter.asm @@ -37,7 +37,7 @@ PewterJigglypuffText: jr nz, .findMatchingFacingDirectionLoop dec hl push hl - ld c, BANK(Music_JigglypuffSong) + ld c, 0 ; BANK(Music_JigglypuffSong) ld a, MUSIC_JIGGLYPUFF_SONG call PlayMusic pop hl @@ -58,11 +58,10 @@ PewterJigglypuffText: ld c, 24 call DelayFrames - ld a, [wChannelSoundIDs] - ld b, a - ld a, [wChannelSoundIDs + Ch1] - or b - jr nz, .loop + push hl + call IsSongPlaying + pop hl + jr c, .loop ld c, 48 call DelayFrames diff --git a/scripts/pokemontower2.asm b/scripts/pokemontower2.asm index 383b175d..db894863 100755 --- a/scripts/pokemontower2.asm +++ b/scripts/pokemontower2.asm @@ -25,7 +25,7 @@ PokemonTower2Script0: ld a, $ff ld [wNewSoundID], a call PlaySound - ld c, BANK(Music_MeetRival) + ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic ResetEvent EVENT_POKEMON_TOWER_RIVAL_ON_LEFT diff --git a/scripts/redshouse1f.asm b/scripts/redshouse1f.asm index cbfb35c8..c6bf07eb 100755 --- a/scripts/redshouse1f.asm +++ b/scripts/redshouse1f.asm @@ -30,14 +30,11 @@ MomHealPokemon: predef HealParty ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a - call PlaySound -.next - ld a, [wChannelSoundIDs] - cp MUSIC_PKMN_HEALED - jr z, .next + call PlayMusic + call WaitForSongToFinish ld a, [wMapMusicSoundID] ld [wNewSoundID], a - call PlaySound + call PlayMusic call GBFadeInFromWhite ld hl, MomHealText2 jp PrintText diff --git a/scripts/route22.asm b/scripts/route22.asm index 86c3768b..1b312cf3 100755 --- a/scripts/route22.asm +++ b/scripts/route22.asm @@ -92,7 +92,7 @@ Route22Script0: ld [wNewSoundID], a call PlaySound .asm_50f4e - ld c, BANK(Music_MeetRival) + ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $1 diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index b211c8a9..2e0c6122 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -133,7 +133,7 @@ SilphCo7Script0: ld a, $ff ld [wNewSoundID], a call PlaySound - ld c, BANK(Music_MeetRival) + ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, $9 diff --git a/scripts/ssanne2.asm b/scripts/ssanne2.asm index 654b881a..c2fd9849 100755 --- a/scripts/ssanne2.asm +++ b/scripts/ssanne2.asm @@ -27,7 +27,7 @@ SSAnne2Script0: ld a, $ff ld [wNewSoundID], a call PlaySound - ld c, BANK(Music_MeetRival) + ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic ld a, [wCoordIndex] diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm index 0df842c2..8fa267da 100755 --- a/scripts/ssanne7.asm +++ b/scripts/ssanne7.asm @@ -45,22 +45,19 @@ SSAnne7RubText: TX_FAR _SSAnne7RubText TX_ASM ld a, [wAudioROMBank] - cp BANK(Audio3_UpdateMusic) + cp $1f ; 0 ; BANK(Audio3_UpdateMusic) XXXXX ld [wAudioSavedROMBank], a jr nz, .asm_61908 ld a, $ff ld [wNewSoundID], a call PlaySound - ld a, Bank(Music_PkmnHealed) + ld a, 0 ; Bank(Music_PkmnHealed) ld [wAudioROMBank], a .asm_61908 ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a - call PlaySound -.asm_61910 - ld a, [wChannelSoundIDs] - cp MUSIC_PKMN_HEALED - jr z, .asm_61910 + call PlayMusic + call WaitForSongToFinish call PlayDefaultMusic SetEvent EVENT_RUBBED_CAPTAINS_BACK ld hl, wd72d diff --git a/scripts/vermiliondock.asm b/scripts/vermiliondock.asm index 5b5d520b..88ef10d0 100755 --- a/scripts/vermiliondock.asm +++ b/scripts/vermiliondock.asm @@ -42,7 +42,7 @@ VermilionDock_1db9b: ld [wJoyIgnore], a ld [wNewSoundID], a call PlaySound - ld c, BANK(Music_Surfing) + ld c, 0 ; BANK(Music_Surfing) ld a, MUSIC_SURFING call PlayMusic callba LoadSmokeTileFourTimes diff --git a/wram.asm b/wram.asm index cc2d332a..8c1b0023 100755 --- a/wram.asm +++ b/wram.asm @@ -201,8 +201,10 @@ wFrequencyModifier:: ; c0f1 wTempoModifier:: ; c0f2 ds 1 - ds 13 + ds 11 +wHaltAudio:: ds 1 +wSFXDontWait:: ds 1 SECTION "Sprite State Data", WRAM0[$c100] @@ -3226,3 +3228,320 @@ wStack:: ; dfff INCLUDE "sram.asm" + + +SECTION "crysaudio", SRAM, BANK[0] +Crysaudio:: +MusicPlaying:: ; c100 +; nonzero if playing + ds 1 + +Channels:: +Channel1:: +Channel1MusicID:: ; c101 + ds 2 +Channel1MusicBank:: ; c103 + ds 1 +Channel1Flags:: ; c104 +; 0: on/off +; 1: subroutine +; 2: +; 3: +; 4: noise sampling on/off +; 5: +; 6: +; 7: + ds 1 +Channel1Flags2:: ; c105 +; 0: vibrato on/off +; 1: +; 2: duty cycle on/off +; 3: +; 4: +; 5: +; 6: +; 7: + ds 1 +Channel1Flags3:: ; c106 +; 0: vibrato up/down +; 1: +; 2: +; 3: +; 4: +; 5: +; 6: +; 7: + ds 1 +Channel1MusicAddress:: ; c107 + ds 2 +Channel1LastMusicAddress:: ; c109 + ds 2 +; could have been meant as a third-level address + ds 2 +Channel1NoteFlags:: ; c10d +; 0: +; 1: +; 2: +; 3: +; 4: +; 5: rest +; 6: +; 7: + ds 1 +Channel1Condition:: ; c10e +; used for conditional jumps + ds 1 +Channel1DutyCycle:: ; c10f +; uses top 2 bits only +; 0: 12.5% +; 1: 25% +; 2: 50% +; 3: 75% + ds 1 +Channel1Intensity:: ; c110 +; hi: pressure +; lo: velocity + ds 1 +Channel1Frequency:: +; 11 bits +Channel1FrequencyLo:: ; c111 + ds 1 +Channel1FrequencyHi:: ; c112 + ds 1 +Channel1Pitch:: ; c113 +; 0: rest +; 1: C +; 2: C# +; 3: D +; 4: D# +; 5: E +; 6: F +; 7: F# +; 8: G +; 9: G# +; a: A +; b: A# +; c: B + ds 1 +Channel1Octave:: ; c114 +; 0: highest +; 7: lowest + ds 1 +Channel1StartingOctave:: ; c115 +; raises existing octaves by this value +; used for repeating phrases in a higher octave to save space + ds 1 +Channel1NoteDuration:: ; c116 +; number of frames remaining in the current note + ds 1 +; c117 + ds 1 +; c118 + ds 1 +Channel1LoopCount:: ; c119 + ds 1 +Channel1Tempo:: ; c11a + ds 2 +Channel1Tracks:: ; c11c +; hi: l +; lo: r + ds 1 +; c11d + ds 1 + +Channel1VibratoDelayCount:: ; c11e +; initialized at the value in VibratoDelay +; decrements each frame +; at 0, vibrato starts + ds 1 +Channel1VibratoDelay:: ; c11f +; number of frames a note plays until vibrato starts + ds 1 +Channel1VibratoExtent:: ; c120 +; difference in + ds 1 +Channel1VibratoRate:: ; c121 +; counts down from a max of 15 frames +; over which the pitch is alternated +; hi: init frames +; lo: frame count + ds 1 + +; c122 + ds 1 +; c123 + ds 1 +; c124 + ds 1 +; c125 + ds 1 +; c126 + ds 1 +; c127 + ds 1 +Channel1CryPitch:: ; c128 + ds 1 +Channel1CryEcho:: ; c129 + ds 1 + ds 4 +Channel1NoteLength:: ; c12e +; # frames per 16th note + ds 1 +; c12f + ds 1 +; c130 + ds 1 +; c131 + ds 1 +; c132 + ds 1 +; end + +Channel2:: ; c133 + ds 50 +Channel3:: ; c165 + ds 50 +Channel4:: ; c197 + ds 50 + +SFXChannels:: +Channel5:: ; c1c9 + ds 50 +Channel6:: ; c1fb + ds 50 +Channel7:: ; c22d + ds 50 +Channel8:: ; c25f + ds 50 + +; c291 + ds 1 +; c292 + ds 1 +; c293 + ds 1 +; c294 + ds 1 +; c295 + ds 1 +; c296 + ds 1 +; c297 + ds 1 + +CurMusicByte:: ; c298 + ds 1 +CurChannel:: ; c299 + ds 1 +Volume:: ; c29a +; corresponds to $ff24 +; Channel control / ON-OFF / Volume (R/W) +; bit 7 - Vin->SO2 ON/OFF +; bit 6-4 - SO2 output level (volume) (# 0-7) +; bit 3 - Vin->SO1 ON/OFF +; bit 2-0 - SO1 output level (volume) (# 0-7) + ds 1 +SoundOutput:: ; c29b +; corresponds to $ff25 +; bit 4-7: ch1-4 so2 on/off +; bit 0-3: ch1-4 so1 on/off + ds 1 +SoundInput:: ; c29c +; corresponds to $ff26 +; bit 7: global on/off +; bit 0: ch1 on/off +; bit 1: ch2 on/off +; bit 2: ch3 on/off +; bit 3: ch4 on/off + ds 1 + +MusicID:: +MusicIDLo:: ; c29d + ds 1 +MusicIDHi:: ; c29e + ds 1 +MusicBank:: ; c29f + ds 1 +NoiseSampleAddress:: +NoiseSampleAddressLo:: ; c2a0 + ds 1 +NoiseSampleAddressHi:: ; c2a1 + ds 1 +; noise delay? ; c2a2 + ds 1 +; c2a3 + ds 1 +MusicNoiseSampleSet:: ; c2a4 + ds 1 +SFXNoiseSampleSet:: ; c2a5 + ds 1 +Danger:: ; c2a6 +wDanger:: ; because i'm dumb +; bit 7: on/off +; bit 4: pitch +; bit 0-3: counter + ds 1 +MusicFade:: ; c2a7 +; fades volume over x frames +; bit 7: fade in/out +; bit 0-5: number of frames for each volume level +; $00 = none (default) + ds 1 +MusicFadeCount:: ; c2a8 + ds 1 +MusicFadeID:: +MusicFadeIDLo:: ; c2a9 + ds 1 +MusicFadeIDHi:: ; c2aa + ds 1 + ds 5 +CryPitch:: ; c2b0 + ds 1 +CryEcho:: ; c2b1 + ds 1 +CryLength:: ; c2b2 + ds 2 +LastVolume:: ; c2b4 + ds 1 + ds 1 +SFXPriority:: ; c2b6 +; if nonzero, turn off music when playing sfx + ds 1 + ds 6 +CryTracks:: ; c2bd +; plays only in left or right track depending on what side the monster is on +; both tracks active outside of battle + ds 1 + ds 1 +CurSFX:: ; c2bf +; id of sfx currently playing + ds 1 +CurMusic:: ; c2c0 +; id of music currently playing + ds 1 + +wTranspositionInterval:: ds 1 + +; misc crys labels +Options:: ds 1 +GBPrinter:: ds 1 +PlayerState:: ds 1 + +wSongSelection:: ds 2 +wNumNoteLines:: ds 1 +wTmpCh:: ds 1 +wChLastNotes:: ds 3 +wVolTimer:: ds 1 +wC1Vol:: ds 1 +wC1VolSub:: ds 1 +wC2Vol:: ds 1 +wC2VolSub:: ds 1 +wC3Vol:: ds 1 +wC3VolSub:: ds 1 +wC4Vol:: ds 1 +wC4VolSub:: ds 1 +wNoteEnded:: ds 3 +wSelectorTop:: ds 1 +wSelectorCur:: ds 1 +wChannelSelector:: ds 1 +wChannelSelectorSwitches:: ds 8 From 84e5331fccafb8dee8ebabd2b767603cdab47804 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 14 Apr 2019 13:24:55 -0500 Subject: [PATCH 02/33] Bug fix: stop channels from cutting out during battle --- constants/music_constants.asm | 2 ++ crysaudio/engine.asm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 0b1e29ad..b12d3474 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -92,6 +92,8 @@ const_value = 1 const MUSIC_MEET_FEMALE_TRAINER const MUSIC_MEET_MALE_TRAINER + const NUM_SONGS + const_value = 1 ; AUDIO_1 AUDIO_3 diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index bdcc26e5..3f293bbe 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -2515,6 +2515,8 @@ _PlayMusic:: ; e8b30 ld a, e and a jp z, _SoundRestart + cp NUM_SONGS + ret nc ; sfx ; load music call MusicOff ld hl, MusicID From 094594bffbe5b6346e8b1dc668119d9bc076ceb1 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 14 Apr 2019 13:38:15 -0500 Subject: [PATCH 03/33] Remove leftovers from CrystalComplete --- audio.asm | 6 - crysaudio/engine.asm | 50 ----- crysaudio/music_pointers2.asm | 130 ----------- crysaudio/music_pointers_music_test.asm | 272 ------------------------ wram.asm | 2 - 5 files changed, 460 deletions(-) delete mode 100644 crysaudio/music_pointers2.asm delete mode 100644 crysaudio/music_pointers_music_test.asm diff --git a/audio.asm b/audio.asm index 94b0c339..b5c86300 100644 --- a/audio.asm +++ b/audio.asm @@ -410,16 +410,10 @@ INCLUDE "crysaudio/engine.asm" ; What music plays when a trainer notices you ;INCLUDE "crysaudio/trainer_encounters.asm" -MusicMT: -INCLUDE "crysaudio/music_pointers_music_test.asm" - Music: INCLUDE "crysaudio/red_pointers.asm" ;INCLUDE "crysaudio/music_pointers.asm" -Music2: -INCLUDE "crysaudio/music_pointers2.asm" - INCLUDE "crysaudio/music/nothing.asm" diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index 3f293bbe..cc9eda2e 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -2298,35 +2298,6 @@ GetFrequency: ; e8a5d ; de: frequency ; get octave - ld a, [CurChannel] - cp 3 - jr nc, .added - ld a, [wTranspositionInterval] - bit 7, a - jr nz, .negative -.positive - add e - ld e, a - cp 13 - jr c, .added - sub 12 - ld e, a - dec d - jr .added -.negative - dec e - add e - jr c, .c - inc a - add 12 - ld e, a - inc d - jr .added -.c - inc a - ld e, a -.added - ; get starting octave ld hl, Channel1StartingOctave - Channel1 add hl, bc @@ -2507,9 +2478,6 @@ SetLRTracks: ; e8b1b ret ; e8b30 -SongTranspositions: - ds 46 - _PlayMusic:: ; e8b30 call OpenSRAMForSound ld a, e @@ -2523,19 +2491,7 @@ _PlayMusic:: ; e8b30 ld [hl], e ; song number inc hl ld [hl], d ; MusicIDHi (always $00) - - ld hl, SongTranspositions - add hl, de - ld a, [hl] - ld [wTranspositionInterval], a - - ld a, [GBPrinter] - bit 1, a - jr nz, .MTMusic - bit 0, a - jr nz, .AltMusic ld hl, Music -.ContinueMusic add hl, de ; three add hl, de ; byte add hl, de ; pointer @@ -2580,12 +2536,6 @@ _PlayMusic:: ; e8b30 ret ; e8b79 -.AltMusic - ld hl, Music2 - jr .ContinueMusic -.MTMusic - ld hl, MusicMT - jr .ContinueMusic PlayCry_:: ; e8b79 ; Play cry de using parameters: ; CryPitch diff --git a/crysaudio/music_pointers2.asm b/crysaudio/music_pointers2.asm deleted file mode 100644 index 03c58930..00000000 --- a/crysaudio/music_pointers2.asm +++ /dev/null @@ -1,130 +0,0 @@ -; See song sections in main.asm: -; Songs i -; Songs ii -; Songs iii -; Songs I -; Songs II -; Songs III -; Songs IV -; Songs V - -; e906e - dbw BANK(Music_Nothing), Music_Nothing ; 0xe91a3 - dbw BANK(Music_RBYTitleScreen), Music_RBYTitleScreen ; 0xeb808 - dbw BANK(Music_Routes1), Music_Routes1 ; 0xec000 - dbw BANK(Music_Routes3), Music_Routes3 ; 0xec2ca - dbw BANK(Music_Routes4), Music_Routes4 ; 0xec506 - dbw BANK(Music_MagnetTrain), Music_MagnetTrain ; unchanged - dbw BANK(Music_GymLeaderBattle), Music_GymLeaderBattle ; 0xec720 - dbw BANK(Music_TrainerBattle), Music_TrainerBattle ; 0xec9fa - dbw BANK(Music_WildBattle), Music_WildBattle ; 0xed06d - dbw BANK(Music_PokemonCenter), Music_PokemonCenter ; unchanged - dbw BANK(Music_LookHiker), Music_LookHiker ; unchanged - dbw BANK(Music_LookLass), Music_LookLass ; unchanged - dbw BANK(Music_LookOfficer), Music_LookOfficer ; unchanged - dbw BANK(Music_HealPokemon), Music_HealPokemon ; unchanged - dbw BANK(Music_Lavender), Music_Lavender ; 0xef72f - dbw BANK(Music_Dungeon2), Music_Dungeon2 ; 0xed8dd - dbw BANK(Music_Dungeon3), Music_Dungeon3 ; 0xedb29 - dbw BANK(Music_MuseumGuy), Music_MuseumGuy ; 0xedbd8 - dbw BANK(Music_RBYGameCorner), Music_RBYGameCorner ; 0xedd6d - dbw BANK(Music_BikeRiding), Music_BikeRiding ; 0xee119 - dbw BANK(Music_HallOfFame), Music_HallOfFame ; unchanged - dbw BANK(Music_Cities1), Music_Cities1 ; 0xf4000 - dbw BANK(Music_Celadon), Music_Celadon ; 0xf435b - dbw BANK(Music_TrainerVictory), Music_TrainerVictory ; unchanged - dbw BANK(Music_WildPokemonVictory), Music_WildPokemonVictory ; unchanged - dbw BANK(Music_GymLeaderVictory), Music_GymLeaderVictory ; unchanged - dbw BANK(Music_MtMoonSquare), Music_MtMoonSquare ; unchanged - dbw BANK(Music_RBYGym), Music_RBYGym ; 0xf48ae - dbw BANK(Music_RBYPalletTown), Music_RBYPalletTown ; 0xf4b0c - dbw BANK(Music_OaksLab), Music_OaksLab ; 0xf4c9f - dbw BANK(Music_MeetProfOak), Music_MeetProfOak ; 0xf4dea - dbw BANK(Music_LookRival), Music_LookRival ; unchanged - dbw BANK(Music_AfterTheRivalFight), Music_AfterTheRivalFight ; unchanged - dbw BANK(Music_Surf), Music_Surf ; unchanged - dbw BANK(Music_Evolution), Music_Evolution ; unchanged - dbw BANK(Music_NationalPark), Music_NationalPark ; 0xf54e8 - dbw BANK(Music_Credits), Music_Credits ; 0x1f31c - dbw BANK(Music_AzaleaTown), Music_AzaleaTown ; 0xf57e8 - dbw BANK(Music_CherrygroveCity), Music_CherrygroveCity ; 0xf5b03 - dbw BANK(Music_LookKimonoGirl), Music_LookKimonoGirl ; 0xf79b8 - dbw BANK(Music_UnionCave), Music_UnionCave ; 0xf5c60 - dbw BANK(Music_SinnohWildBattle), Music_SinnohWildBattle ; 0xf5dc5 - dbw BANK(Music_SinnohTrainerBattle), Music_SinnohTrainerBattle ; 0xf6096 - dbw BANK(Music_Route206), Music_Route206 ; 0xefc01 - dbw BANK(Music_EcruteakCity), Music_EcruteakCity ; 0xef2d0 - dbw BANK(Music_VioletCity), Music_VioletCity ; 0xf0000 - dbw BANK(Music_JohtoGymBattle), Music_JohtoGymBattle ; 0xea50d - dbw BANK(Music_ChampionBattle), Music_ChampionBattle ; 0xea9c1 - dbw BANK(Music_RivalBattle), Music_RivalBattle ; 0xe974f - dbw BANK(Music_RocketBattle), Music_RocketBattle ; 0xe9b6f - dbw BANK(Music_ElmsLab), Music_ElmsLab ; 0xea040 - dbw BANK(Music_DarkCave), Music_DarkCave ; 0xea2be - dbw BANK(Music_Route29), Music_Route29 ; 0xf0386 - dbw BANK(Music_Route36), Music_Route36 ; 0xe94e9 - dbw BANK(Music_SSAqua), Music_SSAqua ; 0xead99 - dbw BANK(Music_LookYoungster), Music_LookYoungster ; 0xf66c3 - dbw BANK(Music_LookBeauty), Music_LookBeauty ; 0xeee3e - dbw BANK(Music_LookRocket), Music_LookRocket ; 0xf74a2 - dbw BANK(Music_LookPokemaniac), Music_LookPokemaniac ; 0xebde1 - dbw BANK(Music_LookSage), Music_LookSage ; 0xee35e - dbw BANK(Music_NewBarkTown), Music_NewBarkTown ; 0xeb2d3 - dbw BANK(Music_JubilifeCity), Music_JubilifeCity ; 0xeb453 - dbw BANK(Music_Vermilion), Music_Vermilion ; 0xeb676 - dbw BANK(Music_PokemonChannel), Music_PokemonChannel ; 0xee45f - dbw BANK(Music_PokeFluteChannel), Music_PokeFluteChannel ; 0xf7b13 - dbw BANK(Music_TinTower), Music_TinTower ; 0xf6811 - dbw BANK(Music_SproutTower), Music_SproutTower ; 0xf6974 - dbw BANK(Music_BurnedTower), Music_BurnedTower ; 0xf6a99 - dbw BANK(Music_Lighthouse), Music_Lighthouse ; 0xee569 - dbw BANK(Music_LakeOfRage), Music_LakeOfRage ; 0xee6c5 - dbw BANK(Music_IndigoPlateau), Music_IndigoPlateau ; unchanged - dbw BANK(Music_Route37), Music_Route37 ; 0xee94b - dbw BANK(Music_RocketHideout), Music_RocketHideout ; 0xeeb75 - dbw BANK(Music_DragonsDen), Music_DragonsDen ; 0xeece8 - dbw BANK(Music_SinnohWildBattle), Music_SinnohWildBattle ; 0xf605c - dbw BANK(Music_RuinsOfAlphRadio), Music_RuinsOfAlphRadio ; 0xeedcb - dbw BANK(Music_SuccessfulCapture), Music_SuccessfulCapture ; 0xf4602 - dbw BANK(Music_Route26), Music_Route26 ; 0xeefb2 - dbw BANK(Music_Mom), Music_Mom ; 0xf6bf2 - dbw BANK(Music_VictoryRoad), Music_VictoryRoad ; 0xf6c72 - dbw BANK(Music_PokemonLullaby), Music_PokemonLullaby ; 0xf6d79 - dbw BANK(Music_PokemonMarch), Music_PokemonMarch ; 0xf6e23 - dbw BANK(Music_GoldSilverOpening), Music_GoldSilverOpening ; 0xf7055 - dbw BANK(Music_GoldSilverOpening2), Music_GoldSilverOpening2 ; 0xf7308 - dbw BANK(Music_MainMenu), Music_MainMenu ; 0xf78fd - dbw BANK(Music_RuinsOfAlphInterior), Music_RuinsOfAlphInterior ; 0xebd9e - dbw BANK(Music_RocketTheme), Music_RocketTheme ; 0xf766d - dbw BANK(Music_DancingHall), Music_DancingHall ; 0xef9bc - dbw BANK(Music_ContestResults), Music_ContestResults ; 0xefb3e - dbw BANK(Music_BugCatchingContest), Music_BugCatchingContest ; 0xf7c16 - dbw BANK(Music_LakeOfRageRocketRadio), Music_LakeOfRageRocketRadio ; 0xef5b1 - dbw BANK(Music_Printer), Music_Printer ; 0xf07fd - dbw BANK(Music_PostCredits), Music_PostCredits ; 0xcfd9e - -; Crystal adds the following songs: - - dbw BANK(Music_Clair), Music_Clair ; 0x1fa8d - dbw BANK(Music_MobileAdapterMenu), Music_MobileAdapterMenu ; 0x17801f - dbw BANK(Music_MobileAdapter), Music_MobileAdapter ; 0x1fc87 - dbw BANK(Music_BuenasPassword), Music_BuenasPassword ; 0x178153 - dbw BANK(Music_LookMysticalMan), Music_LookMysticalMan ; 0x17843b - dbw BANK(Music_CrystalOpening), Music_CrystalOpening ; 0x1786e8 - dbw BANK(Music_BattleTowerTheme), Music_BattleTowerTheme ; 0x178889 - dbw BANK(Music_SuicuneBattle), Music_SuicuneBattle ; 0x178b81 - dbw BANK(Music_BattleTowerLobby), Music_BattleTowerLobby ; 0x17948b - dbw BANK(Music_MobileCenter), Music_MobileCenter ; 0x17961d - -;Remixes and custom songs: - - dbw BANK(Music_JohtoGSC), Music_JohtoGSC - dbw BANK(Music_CeruleanGSC), Music_CeruleanGSC - dbw BANK(Music_CinnabarGSC), Music_CinnabarGSC - dbw BANK(Music_NuggetBridge), Music_NuggetBridge - dbw BANK(Music_Shop), Music_Shop - dbw BANK(Music_PokeathelonFinal), Music_PokeathelonFinal - dbw BANK(Music_PokeRadar), Music_PokeRadar - dbw BANK(Music_NaljoWildBattle), Music_NaljoWildBattle - dbw BANK(Music_NaljoGymBattle), Music_NaljoGymBattle - dbw BANK(Music_PalletBattle), Music_PalletBattle diff --git a/crysaudio/music_pointers_music_test.asm b/crysaudio/music_pointers_music_test.asm deleted file mode 100644 index b39a3e1c..00000000 --- a/crysaudio/music_pointers_music_test.asm +++ /dev/null @@ -1,272 +0,0 @@ -; See song sections in main.asm: -; Songs i -; Songs ii -; Songs iii -; Songs I -; Songs II -; Songs III -; Songs IV -; Songs V - -; e906e - dbw BANK(Music_Nothing), Music_Nothing ; 0xe91a3 - dbw BANK(Music_TitleScreen), Music_TitleScreen ; 0xeb808 - dbw BANK(Music_Route1), Music_Route1 ; 0xec000 - dbw BANK(Music_Route3), Music_Route3 ; 0xec2ca - dbw BANK(Music_Route12), Music_Route12 ; 0xec506 - dbw BANK(Music_MagnetTrain), Music_MagnetTrain ; 0xef5f0 - dbw BANK(Music_KantoGymBattle), Music_KantoGymBattle ; 0xec720 - dbw BANK(Music_KantoTrainerBattle), Music_KantoTrainerBattle ; 0xec9fa - dbw BANK(Music_KantoWildBattle), Music_KantoWildBattle ; 0xed06d - dbw BANK(Music_PokemonCenter), Music_PokemonCenter ; 0xed5c6 - dbw BANK(Music_LookHiker), Music_LookHiker ; 0xf7411 - dbw BANK(Music_LookLass), Music_LookLass ; 0xed79b - dbw BANK(Music_LookOfficer), Music_LookOfficer ; 0xed82d - dbw BANK(Music_HealPokemon), Music_HealPokemon ; 0xf0697 - dbw BANK(Music_LavenderTown), Music_LavenderTown ; 0xef72f - dbw BANK(Music_Route2), Music_Route2 ; 0xed8dd - dbw BANK(Music_MtMoon), Music_MtMoon ; 0xedb29 - dbw BANK(Music_ShowMeAround), Music_ShowMeAround ; 0xedbd8 - dbw BANK(Music_GameCorner), Music_GameCorner ; 0xedd6d - dbw BANK(Music_Bicycle), Music_Bicycle ; 0xee119 - dbw BANK(Music_HallOfFame), Music_HallOfFame ; 0xf05bf - dbw BANK(Music_ViridianCity), Music_ViridianCity ; 0xf4000 - dbw BANK(Music_CeladonCity), Music_CeladonCity ; 0xf435b - dbw BANK(Music_TrainerVictory), Music_TrainerVictory ; 0xebeab - dbw BANK(Music_WildPokemonVictory), Music_WildPokemonVictory ; 0xf4518 - dbw BANK(Music_GymLeaderVictory), Music_GymLeaderVictory ; 0xf462c - dbw BANK(Music_MtMoonSquare), Music_MtMoonSquare ; 0xf4815 - dbw BANK(Music_Gym), Music_Gym ; 0xf48ae - dbw BANK(Music_PalletTown), Music_PalletTown ; 0xf4b0c - dbw BANK(Music_ProfOaksPokemonTalk), Music_ProfOaksPokemonTalk ; 0xf4c9f - dbw BANK(Music_ProfOak), Music_ProfOak ; 0xf4dea - dbw BANK(Music_LookRival), Music_LookRival ; 0xf4f79 - dbw BANK(Music_AfterTheRivalFight), Music_AfterTheRivalFight ; 0xf5127 - dbw BANK(Music_Surf), Music_Surf ; 0xf518a - dbw BANK(Music_Evolution), Music_Evolution ; 0xf06e1 - dbw BANK(Music_NationalPark), Music_NationalPark ; 0xf54e8 - dbw BANK(Music_Credits), Music_Credits ; 0x1f31c - dbw BANK(Music_AzaleaTown), Music_AzaleaTown ; 0xf57e8 - dbw BANK(Music_CherrygroveCity), Music_CherrygroveCity ; 0xf5b03 - dbw BANK(Music_LookKimonoGirl), Music_LookKimonoGirl ; 0xf79b8 - dbw BANK(Music_UnionCave), Music_UnionCave ; 0xf5c60 - dbw BANK(Music_JohtoWildBattle), Music_JohtoWildBattle ; 0xf5dc5 - dbw BANK(Music_JohtoTrainerBattle), Music_JohtoTrainerBattle ; 0xf6096 - dbw BANK(Music_Route30), Music_Route30 ; 0xefc01 - dbw BANK(Music_EcruteakCity), Music_EcruteakCity ; 0xef2d0 - dbw BANK(Music_VioletCity), Music_VioletCity ; 0xf0000 - dbw BANK(Music_JohtoGymBattle), Music_JohtoGymBattle ; 0xea50d - dbw BANK(Music_ChampionBattle), Music_ChampionBattle ; 0xea9c1 - dbw BANK(Music_RivalBattle), Music_RivalBattle ; 0xe974f - dbw BANK(Music_RocketBattle), Music_RocketBattle ; 0xe9b6f - dbw BANK(Music_ElmsLab), Music_ElmsLab ; 0xea040 - dbw BANK(Music_DarkCave), Music_DarkCave ; 0xea2be - dbw BANK(Music_Route29), Music_Route29 ; 0xf0386 - dbw BANK(Music_Route36), Music_Route36 ; 0xe94e9 - dbw BANK(Music_SSAqua), Music_SSAqua ; 0xead99 - dbw BANK(Music_LookYoungster), Music_LookYoungster ; 0xf66c3 - dbw BANK(Music_LookBeauty), Music_LookBeauty ; 0xeee3e - dbw BANK(Music_LookRocket), Music_LookRocket ; 0xf74a2 - dbw BANK(Music_LookPokemaniac), Music_LookPokemaniac ; 0xebde1 - dbw BANK(Music_LookSage), Music_LookSage ; 0xee35e - dbw BANK(Music_NewBarkTown), Music_NewBarkTown ; 0xeb2d3 - dbw BANK(Music_GoldenrodCity), Music_GoldenrodCity ; 0xeb453 - dbw BANK(Music_VermilionCity), Music_VermilionCity ; 0xeb676 - dbw BANK(Music_PokemonChannel), Music_PokemonChannel ; 0xee45f - dbw BANK(Music_PokeFluteChannel), Music_PokeFluteChannel ; 0xf7b13 - dbw BANK(Music_TinTower), Music_TinTower ; 0xf6811 - dbw BANK(Music_SproutTower), Music_SproutTower ; 0xf6974 - dbw BANK(Music_BurnedTower), Music_BurnedTower ; 0xf6a99 - dbw BANK(Music_Lighthouse), Music_Lighthouse ; 0xee569 - dbw BANK(Music_LakeOfRage), Music_LakeOfRage ; 0xee6c5 - dbw BANK(Music_IndigoPlateau), Music_IndigoPlateau ; 0xee852 - dbw BANK(Music_Route37), Music_Route37 ; 0xee94b - dbw BANK(Music_RocketHideout), Music_RocketHideout ; 0xeeb75 - dbw BANK(Music_DragonsDen), Music_DragonsDen ; 0xeece8 - dbw BANK(Music_JohtoWildBattleNight), Music_JohtoWildBattleNight ; 0xf605c - dbw BANK(Music_RuinsOfAlphRadio), Music_RuinsOfAlphRadio ; 0xeedcb - dbw BANK(Music_SuccessfulCapture), Music_SuccessfulCapture ; 0xf4602 - dbw BANK(Music_Route26), Music_Route26 ; 0xeefb2 - dbw BANK(Music_Mom), Music_Mom ; 0xf6bf2 - dbw BANK(Music_VictoryRoad), Music_VictoryRoad ; 0xf6c72 - dbw BANK(Music_PokemonLullaby), Music_PokemonLullaby ; 0xf6d79 - dbw BANK(Music_PokemonMarch), Music_PokemonMarch ; 0xf6e23 - dbw BANK(Music_GoldSilverOpening), Music_GoldSilverOpening ; 0xf7055 - dbw BANK(Music_GoldSilverOpening2), Music_GoldSilverOpening2 ; 0xf7308 - dbw BANK(Music_MainMenu), Music_MainMenu ; 0xf78fd - dbw BANK(Music_RuinsOfAlphInterior), Music_RuinsOfAlphInterior ; 0xebd9e - dbw BANK(Music_RocketTheme), Music_RocketTheme ; 0xf766d - dbw BANK(Music_DancingHall), Music_DancingHall ; 0xef9bc - dbw BANK(Music_ContestResults), Music_ContestResults ; 0xefb3e - dbw BANK(Music_BugCatchingContest), Music_BugCatchingContest ; 0xf7c16 - dbw BANK(Music_LakeOfRageRocketRadio), Music_LakeOfRageRocketRadio ; 0xef5b1 - dbw BANK(Music_Printer), Music_Printer ; 0xf07fd - dbw BANK(Music_PostCredits), Music_PostCredits ; 0xcfd9e - -; Crystal adds the following songs: - - dbw BANK(Music_Clair), Music_Clair ; 0x1fa8d - dbw BANK(Music_MobileAdapterMenu), Music_MobileAdapterMenu ; 0x17801f - dbw BANK(Music_MobileAdapter), Music_MobileAdapter ; 0x1fc87 - dbw BANK(Music_BuenasPassword), Music_BuenasPassword ; 0x178153 - dbw BANK(Music_LookMysticalMan), Music_LookMysticalMan ; 0x17843b - dbw BANK(Music_CrystalOpening), Music_CrystalOpening ; 0x1786e8 - dbw BANK(Music_BattleTowerTheme), Music_BattleTowerTheme ; 0x178889 - dbw BANK(Music_SuicuneBattle), Music_SuicuneBattle ; 0x178b81 - dbw BANK(Music_BattleTowerLobby), Music_BattleTowerLobby ; 0x17948b - dbw BANK(Music_MobileCenter), Music_MobileCenter ; 0x17961d - -; RBY songs: - - dbw BANK(Music_IntroBattle), Music_IntroBattle - dbw BANK(Music_YellowIntro), Music_YellowIntro - dbw BANK(Music_RBYTitleScreen), Music_RBYTitleScreen - dbw BANK(Music_Routes2), Music_Routes2 - dbw BANK(Music_RBYPalletTown), Music_RBYPalletTown - dbw BANK(Music_MeetProfOak), Music_MeetProfOak - dbw BANK(Music_OaksLab), Music_OaksLab - dbw BANK(Music_MeetRival), Music_MeetRival - dbw BANK(Music_FarewellRival), Music_FarewellRival - dbw BANK(Music_Routes1), Music_Routes1 - dbw BANK(Music_Cities1), Music_Cities1 - dbw BANK(Music_Pokecenter), Music_Pokecenter - dbw BANK(Music_PkmnHealed), Music_PkmnHealed - dbw BANK(Music_Dungeon2), Music_Dungeon2 - dbw BANK(Music_MuseumGuy), Music_MuseumGuy - dbw BANK(Music_RBYGym), Music_RBYGym - dbw BANK(Music_JigglypuffSong), Music_JigglypuffSong - dbw BANK(Music_Routes3), Music_Routes3 - dbw BANK(Music_Dungeon3), Music_Dungeon3 - dbw BANK(Music_MeetJessieJames), Music_MeetJessieJames - dbw BANK(Music_Cities2), Music_Cities2 - dbw BANK(Music_Vermilion), Music_Vermilion - dbw BANK(Music_SSAnne), Music_SSAnne - dbw BANK(Music_Routes4), Music_Routes4 - dbw BANK(Music_Lavender), Music_Lavender - dbw BANK(Music_PokemonTower), Music_PokemonTower - dbw BANK(Music_Celadon), Music_Celadon - dbw BANK(Music_RBYGameCorner), Music_RBYGameCorner - dbw BANK(Music_Dungeon1), Music_Dungeon1 - dbw BANK(Music_BikeRiding), Music_BikeRiding - dbw BANK(Music_SafariZone), Music_SafariZone - dbw BANK(Music_SurfingPikachu), Music_SurfingPikachu - dbw BANK(Music_SilphCo), Music_SilphCo - dbw BANK(Music_Surfing), Music_Surfing - dbw BANK(Music_Cinnabar), Music_Cinnabar - dbw BANK(Music_CinnabarMansion), Music_CinnabarMansion - dbw BANK(Music_RBYIndigoPlateau), Music_RBYIndigoPlateau - dbw BANK(Music_RBYHallOfFame), Music_RBYHallOfFame - dbw BANK(Music_RBYCredits), Music_RBYCredits - dbw BANK(Music_MeetMaleTrainer), Music_MeetMaleTrainer - dbw BANK(Music_MeetFemaleTrainer), Music_MeetFemaleTrainer - dbw BANK(Music_MeetEvilTrainer), Music_MeetEvilTrainer - dbw BANK(Music_WildBattle), Music_WildBattle ; 0xec9fa - dbw BANK(Music_TrainerBattle), Music_TrainerBattle ; 0xec9fa - dbw BANK(Music_GymLeaderBattle), Music_GymLeaderBattle ; 0xec9fa - dbw BANK(Music_FinalBattle), Music_FinalBattle ; 0xec9fa - dbw BANK(Music_DefeatedWildMon), Music_DefeatedWildMon - dbw BANK(Music_DefeatedTrainer), Music_DefeatedTrainer - dbw BANK(Music_DefeatedGymLeader), Music_DefeatedGymLeader - dbw BANK(Music_UnusedSong), Music_UnusedSong - dbw BANK(Music_YellowUnusedSong), Music_YellowUnusedSong - -;Diamond and Pearl - dbw BANK(Music_SinnohWildBattle), Music_SinnohWildBattle - dbw BANK(Music_SinnohTrainerBattle), Music_SinnohTrainerBattle - dbw BANK(Music_JubilifeCity), Music_JubilifeCity - dbw BANK(Music_Route206), Music_Route206 - dbw BANK(Music_PokeRadar), Music_PokeRadar - -;Remixes and custom songs: - - dbw BANK(Music_CeruleanGSC), Music_CeruleanGSC - dbw BANK(Music_CinnabarGSC), Music_CinnabarGSC - dbw BANK(Music_CinnabarRemix), Music_CinnabarRemix - dbw BANK(Music_NuggetBridge), Music_NuggetBridge - dbw BANK(Music_Shop), Music_Shop - dbw BANK(Music_PokeathelonFinal), Music_PokeathelonFinal - dbw BANK(Music_JohtoGSC), Music_JohtoGSC - dbw BANK(Music_KantoGymLeaderRemix), Music_KantoGymLeaderRemix - dbw BANK(Music_NaljoWildBattle), Music_NaljoWildBattle - dbw BANK(Music_NaljoGymBattle), Music_NaljoGymBattle - dbw BANK(Music_PalletBattle), Music_PalletBattle - -; TCG songs: - - dbw BANK(Music_TCGTitleScreen), Music_TCGTitleScreen - dbw BANK(Music_TCGDuelTheme1), Music_TCGDuelTheme1 - dbw BANK(Music_TCGDuelTheme2), Music_TCGDuelTheme2 - dbw BANK(Music_TCGDuelTheme3), Music_TCGDuelTheme3 - dbw BANK(Music_TCGPauseMenu), Music_TCGPauseMenu - dbw BANK(Music_TCGPCMainMenu), Music_TCGPCMainMenu - dbw BANK(Music_TCGDeckMachine), Music_TCGDeckMachine - dbw BANK(Music_TCGCardPop), Music_TCGCardPop - dbw BANK(Music_TCGOverworld), Music_TCGOverworld - dbw BANK(Music_TCGPokemonDome), Music_TCGPokemonDome - dbw BANK(Music_TCGChallengeHall), Music_TCGChallengeHall - dbw BANK(Music_TCGClub1), Music_TCGClub1 - dbw BANK(Music_TCGClub2), Music_TCGClub2 - dbw BANK(Music_TCGClub3), Music_TCGClub3 - dbw BANK(Music_TCGRonald), Music_TCGRonald - dbw BANK(Music_TCGImakuni), Music_TCGImakuni - dbw BANK(Music_TCGHallOfHonor), Music_TCGHallOfHonor - dbw BANK(Music_TCGCredits), Music_TCGCredits - dbw BANK(Music_TCGMatchStart1), Music_TCGMatchStart1 - dbw BANK(Music_TCGMatchStart2), Music_TCGMatchStart2 - dbw BANK(Music_TCGMatchStart3), Music_TCGMatchStart3 - dbw BANK(Music_TCGMatchVictory), Music_TCGMatchVictory - dbw BANK(Music_TCGMatchLoss), Music_TCGMatchLoss - dbw BANK(Music_TCGDarkDiddly), Music_TCGDarkDiddly - dbw BANK(Music_TCGBoosterPack), Music_TCGBoosterPack - dbw BANK(Music_TCGMedal), Music_TCGMedal - -; TCG2 songs: - - dbw BANK(Music_TCG2TitleScreen), Music_TCG2TitleScreen - dbw BANK(Music_TCG2HereComesGR), Music_TCG2HereComesGR - dbw BANK(Music_TCG2GROverworld), Music_TCG2GROverworld - dbw BANK(Music_TCG2Fort1), Music_TCG2Fort1 - dbw BANK(Music_TCG2Fort2), Music_TCG2Fort2 - dbw BANK(Music_TCG2Fort3), Music_TCG2Fort3 - dbw BANK(Music_TCG2Fort4), Music_TCG2Fort4 - dbw BANK(Music_TCG2GRCastle), Music_TCG2GRCastle - dbw BANK(Music_TCG2GRChallengeCup), Music_TCG2GRChallengeCup - dbw BANK(Music_TCG2GameCorner), Music_TCG2GameCorner - dbw BANK(Music_TCG2GRBlimp), Music_TCG2GRBlimp - dbw BANK(Music_TCG2GRDuelTheme1), Music_TCG2GRDuelTheme1 - dbw BANK(Music_TCG2GRDuelTheme2), Music_TCG2GRDuelTheme2 - dbw BANK(Music_TCG2GRDuelTheme3), Music_TCG2GRDuelTheme3 - dbw BANK(Music_TCG2Ishihara), Music_TCG2Ishihara - dbw BANK(Music_TCG2Imakuni2), Music_TCG2Imakuni2 - dbw BANK(Music_TCG2Credits), Music_TCG2Credits - dbw BANK(Music_TCG2Diddly1), Music_TCG2Diddly1 - dbw BANK(Music_TCG2Diddly2), Music_TCG2Diddly2 - dbw BANK(Music_TCG2Diddly3), Music_TCG2Diddly3 - dbw BANK(Music_TCG2Diddly4), Music_TCG2Diddly4 - dbw BANK(Music_TCG2Diddly5), Music_TCG2Diddly5 - dbw BANK(Music_TCG2Diddly6), Music_TCG2Diddly6 - -; Pinball songs: - - dbw BANK(Music_Pinballredfield), Music_Pinballredfield - dbw BANK(Music_Pinballcatchem_red), Music_Pinballcatchem_red - dbw BANK(Music_Pinballhurryup_red), Music_Pinballhurryup_red - dbw BANK(Music_Pinballpokedex), Music_Pinballpokedex - dbw BANK(Music_Pinballgengarstage_gastly), Music_Pinballgengarstage_gastly - dbw BANK(Music_Pinballgengarstage_haunter), Music_Pinballgengarstage_haunter - dbw BANK(Music_Pinballgengarstage_gengar), Music_Pinballgengarstage_gengar - dbw BANK(Music_Pinballbluefield), Music_Pinballbluefield - dbw BANK(Music_Pinballcatchem_blue), Music_Pinballcatchem_blue - dbw BANK(Music_Pinballhurryup_blue), Music_Pinballhurryup_blue - dbw BANK(Music_Pinballhiscorescreen), Music_Pinballhiscorescreen - dbw BANK(Music_Pinballgameover), Music_Pinballgameover - dbw BANK(Music_Pinballdiglettstage_digletts), Music_Pinballdiglettstage_digletts - dbw BANK(Music_Pinballdiglettstage_dugtrio), Music_Pinballdiglettstage_dugtrio - dbw BANK(Music_Pinballseelstage), Music_Pinballseelstage - dbw BANK(Music_Pinballtitlescreen), Music_Pinballtitlescreen - dbw BANK(Music_Pinballmewtwostage), Music_Pinballmewtwostage - dbw BANK(Music_Pinballoptions), Music_Pinballoptions - dbw BANK(Music_Pinballfieldselect), Music_Pinballfieldselect - dbw BANK(Music_Pinballmeowthstage), Music_Pinballmeowthstage - dbw BANK(Music_Pinballendcredits), Music_Pinballendcredits - dbw BANK(Music_Pinballnameentry), Music_Pinballnameentry diff --git a/wram.asm b/wram.asm index e0c01b49..38ad170b 100755 --- a/wram.asm +++ b/wram.asm @@ -3493,8 +3493,6 @@ CurMusic:: ; c2c0 ; id of music currently playing ds 1 -wTranspositionInterval:: ds 1 - ; misc crys labels Options:: ds 1 GBPrinter:: ds 1 From 735d5bd4c2eb3ce5e84332ba35f0e9535896a1f6 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 20 Apr 2019 18:26:43 -0500 Subject: [PATCH 04/33] Manually merge pokecrystal audio files and remove more CrystalComplete leftovers --- audio.asm | 205 +- constants/hardware_constants.asm | 18 + crysaudio/audio_constants.asm | 132 + crysaudio/cries.asm | 3965 +++++++-------- crysaudio/cry_constants.asm | 74 + crysaudio/cry_headers.asm | 1792 +------ crysaudio/cry_pointers.asm | 139 +- crysaudio/drumkits.asm | 275 + crysaudio/engine.asm | 2676 ++++------ crysaudio/enum.asm | 23 + crysaudio/music/DPPt/EternaForest.asm | 979 ---- crysaudio/music/DPPt/WinPokeSinnoh.asm | 289 -- crysaudio/music/DPPt/WinTrainerSinnoh.asm | 461 -- crysaudio/music/DPPt/frontierbrain.asm | 2285 --------- crysaudio/music/DPPt/jubilifecity.asm | 614 --- crysaudio/music/DPPt/pokeradar.asm | 209 - crysaudio/music/DPPt/route201.asm | 381 -- crysaudio/music/DPPt/route203.asm | 2014 -------- crysaudio/music/DPPt/route205.asm | 1080 ---- crysaudio/music/DPPt/route206.asm | 984 ---- crysaudio/music/DPPt/sinnohtrainer.asm | 1623 ------ crysaudio/music/DPPt/sinnohwild.asm | 1176 ----- crysaudio/music/RBY/defeatedgymleader.asm | 2 +- crysaudio/music/RBY/defeatedtrainer.asm | 2 +- crysaudio/music/RBY/defeatedwildmon.asm | 2 +- crysaudio/music/RBY/finalbattle.asm | 2 +- crysaudio/music/RBY/gymleaderbattle.asm | 2 +- crysaudio/music/RBY/introbattle.asm | 2 +- crysaudio/music/RBY/jigglypuffsong.asm | 6 +- crysaudio/music/RBY/lavender.asm | 2 +- crysaudio/music/RBY/pkmnhealed.asm | 16 +- crysaudio/music/RBY/pokemontower.asm | 2 +- crysaudio/music/RBY/safarizone.asm | 10 +- crysaudio/music/RBY/titlescreen.asm | 2 +- crysaudio/music/RBY/trainerbattle.asm | 2 +- crysaudio/music/RBY/wildbattle.asm | 2 +- crysaudio/music/RBY/yellowintro.asm | 2 +- crysaudio/music/RBY/yellowunusedsong.asm | 2 +- crysaudio/music/RSE/frontierbrain.asm | 2418 --------- crysaudio/music/TCG/battletheme1.asm | 2019 -------- crysaudio/music/TCG2/credits.asm | 2 +- crysaudio/music/TCG2/diddly1.asm | 2 +- crysaudio/music/TCG2/diddly3.asm | 2 +- crysaudio/music/TCG2/diddly6.asm | 2 +- crysaudio/music/TCG2/fort2.asm | 2 +- crysaudio/music/TCG2/grdueltheme2.asm | 2 +- crysaudio/music/aftertherivalfight.asm | 25 +- crysaudio/music/azaleatown.asm | 50 +- crysaudio/music/battletowerlobby.asm | 33 +- crysaudio/music/battletowertheme.asm | 60 +- crysaudio/music/bicycle.asm | 43 +- crysaudio/music/buenaspassword.asm | 60 +- crysaudio/music/bugcatchingcontest.asm | 48 +- crysaudio/music/burnedtower.asm | 44 +- crysaudio/music/celadoncity.asm | 51 +- crysaudio/music/championbattle.asm | 103 +- crysaudio/music/cherrygrovecity.asm | 33 +- crysaudio/music/clair.asm | 58 +- crysaudio/music/contestresults.asm | 35 +- crysaudio/music/credits.asm | 106 +- crysaudio/music/crystalopening.asm | 27 +- crysaudio/music/custom/ceruleanGSC.asm | 948 ---- crysaudio/music/custom/cinnabarGSC.asm | 181 - crysaudio/music/custom/cinnabarremix.asm | 478 -- crysaudio/music/custom/johtoGSC.asm | 2355 --------- .../music/custom/kantogymleaderremix.asm | 1059 ---- crysaudio/music/custom/naljogymbattle.asm | 1073 ---- crysaudio/music/custom/naljowildbattle.asm | 810 --- crysaudio/music/custom/nuggetbridge.asm | 663 --- crysaudio/music/custom/palletbattle.asm | 670 --- crysaudio/music/custom/pokeathelonfinal.asm | 2574 ---------- crysaudio/music/custom/shop.asm | 1114 ----- crysaudio/music/custom/sinnohtrainer.asm | 0 crysaudio/music/dancinghall.asm | 35 +- crysaudio/music/darkcave.asm | 55 +- crysaudio/music/dragonsden.asm | 49 +- crysaudio/music/ecruteakcity.asm | 39 +- crysaudio/music/elmslab.asm | 33 +- crysaudio/music/evolution.asm | 61 +- crysaudio/music/gamecorner.asm | 89 +- crysaudio/music/goldenrodcity.asm | 59 +- crysaudio/music/goldsilveropening.asm | 24 +- crysaudio/music/goldsilveropening2.asm | 31 +- crysaudio/music/gym.asm | 46 +- crysaudio/music/gymleadervictory.asm | 55 +- crysaudio/music/halloffame.asm | 35 +- crysaudio/music/healpokemon.asm | 36 +- crysaudio/music/indigoplateau.asm | 42 +- crysaudio/music/johtogymbattle.asm | 69 +- crysaudio/music/johtotrainerbattle.asm | 97 +- crysaudio/music/johtowildbattle.asm | 60 +- crysaudio/music/johtowildbattlenight.asm | 22 +- crysaudio/music/kantogymbattle.asm | 62 +- crysaudio/music/kantotrainerbattle.asm | 973 +--- crysaudio/music/kantowildbattle.asm | 82 +- crysaudio/music/lakeofrage.asm | 33 +- crysaudio/music/lakeofragerocketradio.asm | 22 +- crysaudio/music/lavendertown.asm | 42 +- crysaudio/music/lighthouse.asm | 39 +- crysaudio/music/lookbeauty.asm | 36 +- crysaudio/music/lookhiker.asm | 36 +- crysaudio/music/lookkimonogirl.asm | 43 +- crysaudio/music/looklass.asm | 33 +- crysaudio/music/lookmysticalman.asm | 59 +- crysaudio/music/lookofficer.asm | 33 +- crysaudio/music/lookpokemaniac.asm | 31 +- crysaudio/music/lookrival.asm | 54 +- crysaudio/music/lookrocket.asm | 114 +- crysaudio/music/looksage.asm | 22 +- crysaudio/music/lookyoungster.asm | 35 +- crysaudio/music/magnettrain.asm | 47 +- crysaudio/music/mainmenu.asm | 33 +- crysaudio/music/mobileadapter.asm | 65 +- crysaudio/music/mobileadaptermenu.asm | 44 +- crysaudio/music/mobilecenter.asm | 32 +- crysaudio/music/mom.asm | 26 +- crysaudio/music/mtmoon.asm | 35 +- crysaudio/music/mtmoonsquare.asm | 35 +- crysaudio/music/music_labels.txt | 103 - crysaudio/music/nationalpark.asm | 53 +- crysaudio/music/newbarktown.asm | 41 +- crysaudio/music/nothing.asm | 21 +- crysaudio/music/pallettown.asm | 30 +- crysaudio/music/pinball/bluefield.asm | 2 +- .../music/pinball/diglettstage_dugtrio.asm | 60 +- crysaudio/music/pinball/endcredits.asm | 16 +- .../pinball/gengarstage_hauntergengar.asm | 28 +- crysaudio/music/pinball/hiscorescreen.asm | 16 +- crysaudio/music/pinball/meowthstage.asm | 12 +- crysaudio/music/pinball/nameentry.asm | 16 +- crysaudio/music/pinball/seelstage.asm | 62 +- crysaudio/music/pokeflutechannel.asm | 29 +- crysaudio/music/pokemoncenter.asm | 48 +- crysaudio/music/pokemonchannel.asm | 27 +- crysaudio/music/pokemonlullaby.asm | 26 +- crysaudio/music/pokemonmarch.asm | 50 +- crysaudio/music/postcredits.asm | 27 +- crysaudio/music/printer.asm | 11 +- crysaudio/music/profoak.asm | 64 +- crysaudio/music/profoakspokemontalk.asm | 29 +- crysaudio/music/rivalbattle.asm | 85 +- crysaudio/music/rocketbattle.asm | 79 +- crysaudio/music/rockethideout.asm | 46 +- crysaudio/music/rockettheme.asm | 54 +- crysaudio/music/route1.asm | 38 +- crysaudio/music/route12.asm | 56 +- crysaudio/music/route2.asm | 68 +- crysaudio/music/route26.asm | 56 +- crysaudio/music/route29.asm | 36 +- crysaudio/music/route3.asm | 49 +- crysaudio/music/route30.asm | 47 +- crysaudio/music/route36.asm | 44 +- crysaudio/music/route37.asm | 67 +- crysaudio/music/ruinsofalphinterior.asm | 24 +- crysaudio/music/ruinsofalphradio.asm | 32 +- crysaudio/music/showmearound.asm | 57 +- crysaudio/music/sprouttower.asm | 33 +- crysaudio/music/ssaqua.asm | 72 +- crysaudio/music/successfulcapture.asm | 26 +- crysaudio/music/suicunebattle.asm | 28 +- crysaudio/music/surf.asm | 64 +- crysaudio/music/tintower.asm | 35 +- crysaudio/music/titlescreen.asm | 63 +- crysaudio/music/trainervictory.asm | 40 +- crysaudio/music/unioncave.asm | 60 +- crysaudio/music/vermilioncity.asm | 50 +- crysaudio/music/victoryroad.asm | 50 +- crysaudio/music/violetcity.asm | 42 +- crysaudio/music/viridiancity.asm | 66 +- crysaudio/music/wildpokemonvictory.asm | 55 +- crysaudio/music_pointers.asm | 247 +- crysaudio/notes.asm | 26 + crysaudio/rbsfx.asm | 224 +- crysaudio/red_pointers.asm | 98 +- crysaudio/sfx.asm | 4451 +++++++---------- crysaudio/sfx_crystal.asm | 274 +- crysaudio/sfx_pointers.asm | 424 +- crysaudio/trainer_encounters.asm | 163 +- crysaudio/wave_samples.asm | 23 + crysmacros.asm | 329 +- engine/overworld/healing_machine.asm | 2 +- home.asm | 18 +- home/audio.asm | 26 +- home/init.asm | 5 +- home/overworld.asm | 10 +- macros/asm_macros.asm | 6 +- macros/data_macros.asm | 4 + main.asm | 19 - wram.asm | 399 +- 189 files changed, 9015 insertions(+), 41631 deletions(-) create mode 100644 crysaudio/audio_constants.asm create mode 100644 crysaudio/cry_constants.asm create mode 100644 crysaudio/drumkits.asm create mode 100644 crysaudio/enum.asm delete mode 100644 crysaudio/music/DPPt/EternaForest.asm delete mode 100644 crysaudio/music/DPPt/WinPokeSinnoh.asm delete mode 100644 crysaudio/music/DPPt/WinTrainerSinnoh.asm delete mode 100644 crysaudio/music/DPPt/frontierbrain.asm delete mode 100644 crysaudio/music/DPPt/jubilifecity.asm delete mode 100644 crysaudio/music/DPPt/pokeradar.asm delete mode 100644 crysaudio/music/DPPt/route201.asm delete mode 100644 crysaudio/music/DPPt/route203.asm delete mode 100644 crysaudio/music/DPPt/route205.asm delete mode 100644 crysaudio/music/DPPt/route206.asm delete mode 100644 crysaudio/music/DPPt/sinnohtrainer.asm delete mode 100644 crysaudio/music/DPPt/sinnohwild.asm delete mode 100644 crysaudio/music/RSE/frontierbrain.asm delete mode 100644 crysaudio/music/TCG/battletheme1.asm delete mode 100644 crysaudio/music/custom/ceruleanGSC.asm delete mode 100644 crysaudio/music/custom/cinnabarGSC.asm delete mode 100644 crysaudio/music/custom/cinnabarremix.asm delete mode 100644 crysaudio/music/custom/johtoGSC.asm delete mode 100644 crysaudio/music/custom/kantogymleaderremix.asm delete mode 100644 crysaudio/music/custom/naljogymbattle.asm delete mode 100644 crysaudio/music/custom/naljowildbattle.asm delete mode 100644 crysaudio/music/custom/nuggetbridge.asm delete mode 100644 crysaudio/music/custom/palletbattle.asm delete mode 100644 crysaudio/music/custom/pokeathelonfinal.asm delete mode 100644 crysaudio/music/custom/shop.asm delete mode 100644 crysaudio/music/custom/sinnohtrainer.asm delete mode 100644 crysaudio/music/music_labels.txt create mode 100644 crysaudio/notes.asm create mode 100644 crysaudio/wave_samples.asm diff --git a/audio.asm b/audio.asm index b5c86300..ad1b2eb7 100644 --- a/audio.asm +++ b/audio.asm @@ -1,154 +1,7 @@ INCLUDE "constants.asm" INCLUDE "crysmacros.asm" - -; crystal.py macros: -octave: MACRO - db $d8 - (\1) - ENDM - -notetype: MACRO - db $d8, \1 -IF _NARG==2 - db \2 -ENDC - ENDM -forceoctave: MACRO - db $d9, \1 - ENDM -tempo: MACRO - db $da - bigdw \1 - ENDM -dutycycle: MACRO - db $db, \1 - ENDM -intensity: MACRO - db $dc, \1 - ENDM -soundinput: MACRO - db $dd, \1 - ENDM -unknownmusic0xde: MACRO - db $de, \1 - ENDM -togglesfx: MACRO - db $df - ENDM -unknownmusic0xe0: MACRO - db $e0, \1, \2 - ENDM -vibrato: MACRO - db $e1, \1, \2 - ENDM -unknownmusic0xe2: MACRO - db $e2, \1 - ENDM -togglenoise: MACRO - db $e3, \1 - ENDM -panning: MACRO - db $e4, \1 - ENDM -volume: MACRO - db $e5, \1 - ENDM -tone: MACRO - db $e6 - bigdw \1 - ENDM -unknownmusic0xe7: MACRO - db $e7, \1 - ENDM -unknownmusic0xe8: MACRO - db $e8, \1 - ENDM -globaltempo: MACRO - db $e9 - bigdw \1 - ENDM -restartchannel: MACRO - dbw $ea, \1 - ENDM -newsong: MACRO - db $eb - bigdw \1 - ENDM -sfxpriorityon: MACRO - db $ec - ENDM -sfxpriorityoff: MACRO - db $ed - ENDM -unknownmusic0xee: MACRO - dbw $ee, \1 - ENDM -stereopanning: MACRO - db $ef, \1 - ENDM -sfxtogglenoise: MACRO - db $f0, \1 - ENDM -ftempo: MACRO - db $f1 - bigdw \1 - ENDM -fdutycycle: MACRO - db $f2, \1 - ENDM -music0xf3: MACRO - db $f3 - ENDM -incoctave: MACRO - db $f4 - ENDM -decoctave: MACRO - db $f5 - ENDM -music0xf6: MACRO - db $f6 - ENDM -music0xf7: MACRO - db $f7 - ENDM -music0xf8: MACRO - db $f8 - ENDM -unknownmusic0xf9: MACRO - db $f9, \1 - ENDM -setcondition: MACRO - db $fa, \1 - ENDM -jumpif: MACRO - db $fb, \1 - dw \2 - ENDM -jumpchannel: MACRO - dbw $fc, \1 - ENDM -loopchannel: MACRO - db $fd, \1 - dw \2 - ENDM -callchannel: MACRO - dbw $fe, \1 - ENDM -endchannel: MACRO - db $ff - ENDM - - -sound: MACRO - db \1, \2 - dw \3 - ENDM - -noise: MACRO - db \1, \2, \3 - ENDM - -toggleperfectpitch: MACRO ; XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - ENDM +INCLUDE "crysaudio/audio_constants.asm" +INCLUDE "crysaudio/cry_constants.asm" SECTION "Sound Effect Headers 1", ROMX ; BANK $02 @@ -285,7 +138,7 @@ PlayBattleMusic:: xor a ld [wAudioFadeOutControl], a ld [wLowHealthAlarm], a - ld [MusicFade], a + ld [wMusicFade], a dec a ld [wNewSoundID], a call PlayMusic ; stop music @@ -404,24 +257,18 @@ OwnedMonValues: SECTION "Audio Engine 1", ROMX - INCLUDE "crysaudio/engine.asm" - -; What music plays when a trainer notices you ;INCLUDE "crysaudio/trainer_encounters.asm" -Music: INCLUDE "crysaudio/red_pointers.asm" ;INCLUDE "crysaudio/music_pointers.asm" - INCLUDE "crysaudio/music/nothing.asm" -Cries: INCLUDE "crysaudio/cry_pointers.asm" -;SFX: INCLUDE "crysaudio/rbsfx.asm" +;INCLUDE "crysaudio/sfx_pointers.asm" SECTION "Songs 1", ROMX @@ -581,6 +428,7 @@ SECTION "RBY Songs 1", ROMX inc_section "crysaudio/music/RBY/wildbattle.asm" inc_section "crysaudio/music/RBY/finalbattle.asm" + SECTION "RBY Songs 2", ROMX inc_section "crysaudio/music/RBY/defeatedtrainer.asm" @@ -612,37 +460,6 @@ SECTION "RBY Songs 2", ROMX inc_section "crysaudio/music/RBY/meetjessiejames.asm" inc_section "crysaudio/music/RBY/yellowunusedsong.asm" -SECTION "Custom Songs 1", ROMX - - inc_section "crysaudio/music/custom/johtoGSC.asm" - inc_section "crysaudio/music/custom/ceruleanGSC.asm" - inc_section "crysaudio/music/custom/cinnabarGSC.asm" - inc_section "crysaudio/music/custom/nuggetbridge.asm" - inc_section "crysaudio/music/custom/shop.asm" - inc_section "crysaudio/music/custom/pokeathelonfinal.asm" - -SECTION "Custom Songs 2", ROMX - - inc_section "crysaudio/music/custom/naljowildbattle.asm" - inc_section "crysaudio/music/custom/naljogymbattle.asm" - inc_section "crysaudio/music/custom/palletbattle.asm" - inc_section "crysaudio/music/custom/cinnabarremix.asm" - inc_section "crysaudio/music/custom/kantogymleaderremix.asm" - -SECTION "DPPt Songs 1", ROMX - - inc_section "crysaudio/music/DPPt/pokeradar.asm" - inc_section "crysaudio/music/DPPt/sinnohtrainer.asm" - inc_section "crysaudio/music/DPPt/sinnohwild.asm" - inc_section "crysaudio/music/DPPt/WinPokeSinnoh.asm" - inc_section "crysaudio/music/DPPt/WinTrainerSinnoh.asm" - inc_section "crysaudio/music/DPPt/route201.asm" - inc_section "crysaudio/music/DPPt/route203.asm" - inc_section "crysaudio/music/DPPt/route205.asm" - inc_section "crysaudio/music/DPPt/route206.asm" - inc_section "crysaudio/music/DPPt/jubilifecity.asm" - inc_section "crysaudio/music/DPPt/EternaForest.asm" - inc_section "crysaudio/music/DPPt/frontierbrain.asm" SECTION "TCG Songs 1", ROMX inc_section "crysaudio/music/TCG/titlescreen.asm" @@ -660,6 +477,7 @@ SECTION "TCG Songs 1", ROMX inc_section "crysaudio/music/TCG/club2.asm" inc_section "crysaudio/music/TCG/club3.asm" + SECTION "TCG Songs 2", ROMX inc_section "crysaudio/music/TCG/ronald.asm" inc_section "crysaudio/music/TCG/imakuni.asm" @@ -674,6 +492,7 @@ SECTION "TCG Songs 2", ROMX inc_section "crysaudio/music/TCG/boosterpack.asm" inc_section "crysaudio/music/TCG/medal.asm" + SECTION "TCG2 Songs 1", ROMX inc_section "crysaudio/music/TCG2/titlescreen.asm" inc_section "crysaudio/music/TCG2/herecomesgr.asm" @@ -685,6 +504,7 @@ SECTION "TCG2 Songs 1", ROMX inc_section "crysaudio/music/TCG2/grcastle.asm" inc_section "crysaudio/music/TCG2/grchallengecup.asm" + SECTION "TCG2 Songs 2", ROMX inc_section "crysaudio/music/TCG2/gamecorner.asm" inc_section "crysaudio/music/TCG2/grblimp.asm" @@ -693,6 +513,7 @@ SECTION "TCG2 Songs 2", ROMX inc_section "crysaudio/music/TCG2/grdueltheme3.asm" inc_section "crysaudio/music/TCG2/ishihara.asm" + SECTION "TCG2 Songs 3", ROMX inc_section "crysaudio/music/TCG2/imakuni2.asm" inc_section "crysaudio/music/TCG2/credits.asm" @@ -703,6 +524,7 @@ SECTION "TCG2 Songs 3", ROMX inc_section "crysaudio/music/TCG2/diddly5.asm" inc_section "crysaudio/music/TCG2/diddly6.asm" + SECTION "Pinball Songs", ROMX inc_section "crysaudio/music/pinball/redfield.asm" inc_section "crysaudio/music/pinball/catchem_red.asm" @@ -718,6 +540,7 @@ SECTION "Pinball Songs", ROMX inc_section "crysaudio/music/pinball/diglettstage_digletts.asm" inc_section "crysaudio/music/pinball/diglettstage_dugtrio.asm" + SECTION "Pinball Songs 2", ROMX inc_section "crysaudio/music/pinball/seelstage.asm" inc_section "crysaudio/music/pinball/titlescreen.asm" @@ -728,6 +551,7 @@ SECTION "Pinball Songs 2", ROMX inc_section "crysaudio/music/pinball/endcredits.asm" inc_section "crysaudio/music/pinball/nameentry.asm" + SECTION "Sound Effects", ROMX INCLUDE "crysaudio/sfx.asm" @@ -738,11 +562,8 @@ SECTION "Crystal Sound Effects", ROMX INCLUDE "crysaudio/sfx_crystal.asm" - SECTION "Cries", ROMX -CryHeaders:: INCLUDE "crysaudio/cry_headers.asm" +INCLUDE "crysaudio/cry_headers.asm" INCLUDE "crysaudio/cries.asm" - - diff --git a/constants/hardware_constants.asm b/constants/hardware_constants.asm index 9f2aa1b7..b9aa240d 100644 --- a/constants/hardware_constants.asm +++ b/constants/hardware_constants.asm @@ -48,6 +48,7 @@ rNR11 EQU $ff11 ; Channel 1 Sound length/Wave pattern duty (R/W) rNR12 EQU $ff12 ; Channel 1 Volume Envelope (R/W) rNR13 EQU $ff13 ; Channel 1 Frequency lo (Write Only) rNR14 EQU $ff14 ; Channel 1 Frequency hi (R/W) +rNR20 EQU $ff15 ; Channel 2 Sweep register (R/W) rNR21 EQU $ff16 ; Channel 2 Sound Length/Wave Pattern Duty (R/W) rNR22 EQU $ff17 ; Channel 2 Volume Envelope (R/W) rNR23 EQU $ff18 ; Channel 2 Frequency lo data (W) @@ -57,6 +58,7 @@ rNR31 EQU $ff1b ; Channel 3 Sound Length rNR32 EQU $ff1c ; Channel 3 Select output level (R/W) rNR33 EQU $ff1d ; Channel 3 Frequency's lower data (W) rNR34 EQU $ff1e ; Channel 3 Frequency's higher data (R/W) +rNR40 EQU $ff1f ; Channel 4 Sweep register (R/W) rNR41 EQU $ff20 ; Channel 4 Sound Length (R/W) rNR42 EQU $ff21 ; Channel 4 Volume Envelope (R/W) rNR43 EQU $ff22 ; Channel 4 Polynomial Counter (R/W) @@ -64,6 +66,22 @@ rNR44 EQU $ff23 ; Channel 4 Counter/consecutive; Initial (R/W) rNR50 EQU $ff24 ; Channel control / ON-OFF / Volume (R/W) rNR51 EQU $ff25 ; Selection of Sound output terminal (R/W) rNR52 EQU $ff26 ; Sound on/off +rWave_0 EQU $ff30 +rWave_1 EQU $ff31 +rWave_2 EQU $ff32 +rWave_3 EQU $ff33 +rWave_4 EQU $ff34 +rWave_5 EQU $ff35 +rWave_6 EQU $ff36 +rWave_7 EQU $ff37 +rWave_8 EQU $ff38 +rWave_9 EQU $ff39 +rWave_a EQU $ff3a +rWave_b EQU $ff3b +rWave_c EQU $ff3c +rWave_d EQU $ff3d +rWave_e EQU $ff3e +rWave_f EQU $ff3f rLCDC EQU $ff40 ; LCD Control (R/W) rLCDC_ENABLE EQU 7 rLCDC_ENABLE_MASK EQU 1 << rLCDC_ENABLE diff --git a/crysaudio/audio_constants.asm b/crysaudio/audio_constants.asm new file mode 100644 index 00000000..f0708d77 --- /dev/null +++ b/crysaudio/audio_constants.asm @@ -0,0 +1,132 @@ +; pitch +; FrequencyTable indexes (see audio/notes.asm) + const_def + const __ ; 0 + const C_ ; 1 + const C# ; 2 + const D_ ; 3 + const D# ; 4 + const E_ ; 5 + const F_ ; 6 + const F# ; 7 + const G_ ; 8 + const G# ; 9 + const A_ ; a + const A# ; b + const B_ ; c + const CC ; d (used for pitchoffset) + +; channel +; ChannelPointers indexes (see audio/engine.asm) + const_def + const CHAN1 ; 0 + const CHAN2 ; 1 + const CHAN3 ; 2 + const CHAN4 ; 3 +NUM_MUSIC_CHANS EQU const_value + const CHAN5 ; 4 + const CHAN6 ; 5 + const CHAN7 ; 6 + const CHAN8 ; 7 +NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS +NUM_CHANNELS EQU const_value + +; channel_struct members (see macros/wram.asm) +CHANNEL_MUSIC_ID EQUS "(wChannel1MusicID - wChannel1)" +CHANNEL_MUSIC_BANK EQUS "(wChannel1MusicBank - wChannel1)" +CHANNEL_FLAGS1 EQUS "(wChannel1Flags1 - wChannel1)" +CHANNEL_FLAGS2 EQUS "(wChannel1Flags2 - wChannel1)" +CHANNEL_FLAGS3 EQUS "(wChannel1Flags3 - wChannel1)" +CHANNEL_MUSIC_ADDRESS EQUS "(wChannel1MusicAddress - wChannel1)" +CHANNEL_LAST_MUSIC_ADDRESS EQUS "(wChannel1LastMusicAddress - wChannel1)" +CHANNEL_NOTE_FLAGS EQUS "(wChannel1NoteFlags - wChannel1)" +CHANNEL_CONDITION EQUS "(wChannel1Condition - wChannel1)" +CHANNEL_DUTY_CYCLE EQUS "(wChannel1DutyCycle - wChannel1)" +CHANNEL_INTENSITY EQUS "(wChannel1Intensity - wChannel1)" +CHANNEL_FREQUENCY EQUS "(wChannel1Frequency - wChannel1)" +CHANNEL_PITCH EQUS "(wChannel1Pitch - wChannel1)" +CHANNEL_OCTAVE EQUS "(wChannel1Octave - wChannel1)" +CHANNEL_PITCH_OFFSET EQUS "(wChannel1PitchOffset - wChannel1)" +CHANNEL_NOTE_DURATION EQUS "(wChannel1NoteDuration - wChannel1)" +CHANNEL_FIELD16 EQUS "(wChannel1Field16 - wChannel1)" +CHANNEL_LOOP_COUNT EQUS "(wChannel1LoopCount - wChannel1)" +CHANNEL_TEMPO EQUS "(wChannel1Tempo - wChannel1)" +CHANNEL_TRACKS EQUS "(wChannel1Tracks - wChannel1)" +CHANNEL_SFX_DUTY_LOOP EQUS "(wChannel1SFXDutyLoop - wChannel1)" +CHANNEL_VIBRATO_DELAY_COUNT EQUS "(wChannel1VibratoDelayCount - wChannel1)" +CHANNEL_VIBRATO_DELAY EQUS "(wChannel1VibratoDelay - wChannel1)" +CHANNEL_VIBRATO_EXTENT EQUS "(wChannel1VibratoExtent - wChannel1)" +CHANNEL_VIBRATO_RATE EQUS "(wChannel1VibratoRate - wChannel1)" +CHANNEL_PITCH_WHEEL_TARGET EQUS "(wChannel1PitchWheelTarget - wChannel1)" +CHANNEL_PITCH_WHEEL_AMOUNT EQUS "(wChannel1PitchWheelAmount - wChannel1)" +CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION EQUS "(wChannel1PitchWheelAmountFraction - wChannel1)" +CHANNEL_FIELD25 EQUS "(wChannel1Field25 - wChannel1)" +CHANNEL_CRY_PITCH EQUS "(wChannel1CryPitch - wChannel1)" +CHANNEL_FIELD29 EQUS "(wChannel1Field29 - wChannel1)" +CHANNEL_FIELD2A EQUS "(wChannel1Field2a - wChannel1)" +CHANNEL_FIELD2C EQUS "(wChannel1Field2c - wChannel1)" +CHANNEL_NOTE_LENGTH EQUS "(wChannel1NoteLength - wChannel1)" +CHANNEL_FIELD2E EQUS "(wChannel1Field2e - wChannel1)" +CHANNEL_FIELD2F EQUS "(wChannel1Field2f - wChannel1)" +CHANNEL_FIELD30 EQUS "(wChannel1Field30 - wChannel1)" +CHANNEL_STRUCT_LENGTH EQUS "(wChannel2 - wChannel1)" + +NOISE_CHAN_F EQU 2 ; bit set in CHAN5-CHAN7 + +; Flags1 + const_def + const SOUND_CHANNEL_ON ; 0 + const SOUND_SUBROUTINE ; 1 + const SOUND_LOOPING ; 2 + const SOUND_SFX ; 3 + const SOUND_NOISE ; 4 + const SOUND_REST ; 5 + +; Flags2 + const_def + const SOUND_VIBRATO ; 0 + const SOUND_PITCH_WHEEL ; 1 + const SOUND_DUTY ; 2 + const SOUND_UNKN_0B ; 3 + const SOUND_CRY_PITCH ; 4 + const SOUND_UNKN_0D ; 5 + const SOUND_UNKN_0E ; 6 + const SOUND_UNKN_0F ; 7 + +; Flags3 + const_def + const SOUND_VIBRATO_DIR ; 0 + const SOUND_PITCH_WHEEL_DIR ; 1 + +; NoteFlags + const_def + const NOTE_DUTY_OVERRIDE ; 0 + const NOTE_FREQ_OVERRIDE ; 1 + const NOTE_UNUSED ; 2 + const NOTE_UNKN_3 ; 3 + const NOTE_NOISE_SAMPLING ; 4 + const NOTE_REST ; 5 + const NOTE_VIBRATO_OVERRIDE ; 6 + +; wVolume +VOLUME_SO1_F EQU 3 +VOLUME_SO2_F EQU 7 +VOLUME_SO1_LEVEL EQU %00000111 +VOLUME_SO2_LEVEL EQU %01110000 +MAX_VOLUME EQU $77 + +; wSoundInput +SOUND_INPUT_CH1_F EQU 0 +SOUND_INPUT_CH2_F EQU 1 +SOUND_INPUT_CH3_F EQU 2 +SOUND_INPUT_CH4_F EQU 3 +SOUND_INPUT_GLOBAL_F EQU 7 + +; wLowHealthAlarm +DANGER_PITCH_F EQU 4 +DANGER_ON_F EQU 7 + +; wMusicFade +MUSIC_FADE_IN_F EQU 7 + +TRUE EQU 1 diff --git a/crysaudio/cries.asm b/crysaudio/cries.asm index 85abcc69..b8d9d214 100644 --- a/crysaudio/cries.asm +++ b/crysaudio/cries.asm @@ -1,2306 +1,2045 @@ -Cry_26: ; f2d81 - dbw $84, Cry_26_Ch5 - dbw $05, Cry_26_Ch6 - dbw $07, Cry_26_Ch8 -; f2d8a +Cry_Marill: + musicheader 3, 5, Cry_Marill_Ch5 + musicheader 1, 6, Cry_Marill_Ch6 + musicheader 1, 8, Cry_Marill_Ch8 -Cry_28: ; f2d8a - dbw $44, Cry_28_Ch5 - dbw $05, Cry_28_Ch6 -; f2d90 +Cry_Togepi: + musicheader 2, 5, Cry_Togepi_Ch5 + musicheader 1, 6, Cry_Togepi_Ch6 -Cry_2C: ; f2d90 - dbw $44, Cry_2C_Ch5 - dbw $05, Cry_2C_Ch6 -; f2d96 +Cry_Togetic: + musicheader 2, 5, Cry_Togetic_Ch5 + musicheader 1, 6, Cry_Togetic_Ch6 -Cry_27: ; f2d96 - dbw $84, Cry_27_Ch5 - dbw $05, Cry_27_Ch6 - dbw $07, Cry_27_Ch8 -; f2d9f +Cry_Spinarak: + musicheader 3, 5, Cry_Spinarak_Ch5 + musicheader 1, 6, Cry_Spinarak_Ch6 + musicheader 1, 8, Cry_Spinarak_Ch8 -Cry_2A: ; f2d9f - dbw $84, Cry_2A_Ch5 - dbw $05, Cry_2A_Ch6 - dbw $07, Cry_2A_Ch8 -; f2da8 +Cry_Raikou: + musicheader 3, 5, Cry_Raikou_Ch5 + musicheader 1, 6, Cry_Raikou_Ch6 + musicheader 1, 8, Cry_Raikou_Ch8 -Cry_2D: ; f2da8 - dbw $84, Cry_2D_Ch5 - dbw $05, Cry_2D_Ch6 - dbw $07, Cry_2D_Ch8 -; f2db1 +Cry_Hoothoot: + musicheader 3, 5, Cry_Hoothoot_Ch5 + musicheader 1, 6, Cry_Hoothoot_Ch6 + musicheader 1, 8, Cry_Hoothoot_Ch8 -Cry_2E: ; f2db1 - dbw $44, Cry_2E_Ch5 - dbw $05, Cry_2E_Ch6 -; f2db7 +Cry_Sentret: + musicheader 2, 5, Cry_Sentret_Ch5 + musicheader 1, 6, Cry_Sentret_Ch6 -Cry_2F: ; f2db7 - dbw $84, Cry_2F_Ch5 - dbw $05, Cry_2F_Ch6 - dbw $07, Cry_2F_Ch8 -; f2dc0 +Cry_Slowking: + musicheader 3, 5, Cry_Slowking_Ch5 + musicheader 1, 6, Cry_Slowking_Ch6 + musicheader 1, 8, Cry_Slowking_Ch8 -Cry_2B: ; f2dc0 - dbw $44, Cry_2B_Ch5 - dbw $05, Cry_2B_Ch6 -; f2dc6 +Cry_Mareep: + musicheader 2, 5, Cry_Mareep_Ch5 + musicheader 1, 6, Cry_Mareep_Ch6 -Cry_30: ; f2dc6 - dbw $84, Cry_30_Ch5 - dbw $05, Cry_30_Ch6 - dbw $07, Cry_30_Ch8 -; f2dcf +Cry_Cyndaquil: + musicheader 3, 5, Cry_Cyndaquil_Ch5 + musicheader 1, 6, Cry_Cyndaquil_Ch6 + musicheader 1, 8, Cry_Cyndaquil_Ch8 -Cry_31: ; f2dcf - dbw $84, Cry_31_Ch5 - dbw $05, Cry_31_Ch6 - dbw $07, Cry_31_Ch8 -; f2dd8 +Cry_Chikorita: + musicheader 3, 5, Cry_Chikorita_Ch5 + musicheader 1, 6, Cry_Chikorita_Ch6 + musicheader 1, 8, Cry_Chikorita_Ch8 -Cry_33: ; f2dd8 - dbw $44, Cry_33_Ch5 - dbw $07, Cry_33_Ch8 -; f2dde +Cry_Gligar: + musicheader 2, 5, Cry_Gligar_Ch5 + musicheader 1, 8, Cry_Gligar_Ch8 -Cry_29: ; f2dde - dbw $84, Cry_29_Ch5 - dbw $05, Cry_29_Ch6 - dbw $07, Cry_29_Ch8 -; f2de7 +Cry_Girafarig: + musicheader 3, 5, Cry_Girafarig_Ch5 + musicheader 1, 6, Cry_Girafarig_Ch6 + musicheader 1, 8, Cry_Girafarig_Ch8 -Cry_35: ; f2de7 - dbw $44, Cry_35_Ch5 - dbw $07, Cry_35_Ch8 -; f2ded +Cry_Slugma: + musicheader 2, 5, Cry_Slugma_Ch5 + musicheader 1, 8, Cry_Slugma_Ch8 -Cry_36: ; f2ded - dbw $84, Cry_36_Ch5 - dbw $05, Cry_36_Ch6 - dbw $07, Cry_36_Ch8 -; f2df6 +Cry_Ledyba: + musicheader 3, 5, Cry_Ledyba_Ch5 + musicheader 1, 6, Cry_Ledyba_Ch6 + musicheader 1, 8, Cry_Ledyba_Ch8 -Cry_38: ; f2df6 - dbw $84, Cry_38_Ch5 - dbw $05, Cry_38_Ch6 - dbw $07, Cry_38_Ch8 -; f2dff +Cry_Wooper: + musicheader 3, 5, Cry_Wooper_Ch5 + musicheader 1, 6, Cry_Wooper_Ch6 + musicheader 1, 8, Cry_Wooper_Ch8 -Cry_43: ; f2dff - dbw $84, Cry_43_Ch5 - dbw $05, Cry_43_Ch6 - dbw $07, Cry_43_Ch8 -; f2e08 +Cry_Donphan: + musicheader 3, 5, Cry_Donphan_Ch5 + musicheader 1, 6, Cry_Donphan_Ch6 + musicheader 1, 8, Cry_Donphan_Ch8 -Cry_3A: ; f2e08 - dbw $84, Cry_3A_Ch5 - dbw $05, Cry_3A_Ch6 - dbw $07, Cry_3A_Ch8 -; f2e11 +Cry_Typhlosion: + musicheader 3, 5, Cry_Typhlosion_Ch5 + musicheader 1, 6, Cry_Typhlosion_Ch6 + musicheader 1, 8, Cry_Typhlosion_Ch8 -Cry_3B: ; f2e11 - dbw $84, Cry_3B_Ch5 - dbw $05, Cry_3B_Ch6 - dbw $07, Cry_3B_Ch8 -; f2e1a +Cry_Natu: + musicheader 3, 5, Cry_Natu_Ch5 + musicheader 1, 6, Cry_Natu_Ch6 + musicheader 1, 8, Cry_Natu_Ch8 -Cry_3C: ; f2e1a - dbw $84, Cry_3C_Ch5 - dbw $05, Cry_3C_Ch6 - dbw $07, Cry_3C_Ch8 -; f2e23 +Cry_Teddiursa: + musicheader 3, 5, Cry_Teddiursa_Ch5 + musicheader 1, 6, Cry_Teddiursa_Ch6 + musicheader 1, 8, Cry_Teddiursa_Ch8 -Cry_3D: ; f2e23 - dbw $84, Cry_3D_Ch5 - dbw $05, Cry_3D_Ch6 - dbw $07, Cry_3D_Ch8 -; f2e2c +Cry_Sunflora: + musicheader 3, 5, Cry_Sunflora_Ch5 + musicheader 1, 6, Cry_Sunflora_Ch6 + musicheader 1, 8, Cry_Sunflora_Ch8 -Cry_3E: ; f2e2c - dbw $84, Cry_3E_Ch5 - dbw $05, Cry_3E_Ch6 - dbw $07, Cry_3E_Ch8 -; f2e35 +Cry_Ampharos: + musicheader 3, 5, Cry_Ampharos_Ch5 + musicheader 1, 6, Cry_Ampharos_Ch6 + musicheader 1, 8, Cry_Ampharos_Ch8 -Cry_32: ; f2e35 - dbw $84, Cry_32_Ch5 - dbw $05, Cry_32_Ch6 - dbw $07, Cry_32_Ch8 -; f2e3e +Cry_Totodile: + musicheader 3, 5, Cry_Totodile_Ch5 + musicheader 1, 6, Cry_Totodile_Ch6 + musicheader 1, 8, Cry_Totodile_Ch8 -Cry_34: ; f2e3e - dbw $84, Cry_34_Ch5 - dbw $05, Cry_34_Ch6 - dbw $07, Cry_34_Ch8 -; f2e47 +Cry_Cleffa: + musicheader 3, 5, Cry_Cleffa_Ch5 + musicheader 1, 6, Cry_Cleffa_Ch6 + musicheader 1, 8, Cry_Cleffa_Ch8 -Cry_40: ; f2e47 - dbw $84, Cry_40_Ch5 - dbw $05, Cry_40_Ch6 - dbw $07, Cry_40_Ch8 -; f2e50 +Cry_Pichu: + musicheader 3, 5, Cry_Pichu_Ch5 + musicheader 1, 6, Cry_Pichu_Ch6 + musicheader 1, 8, Cry_Pichu_Ch8 -Cry_41: ; f2e50 - dbw $84, Cry_41_Ch5 - dbw $05, Cry_41_Ch6 - dbw $07, Cry_41_Ch8 -; f2e59 +Cry_Aipom: + musicheader 3, 5, Cry_Aipom_Ch5 + musicheader 1, 6, Cry_Aipom_Ch6 + musicheader 1, 8, Cry_Aipom_Ch8 -Cry_42: ; f2e59 - dbw $84, Cry_42_Ch5 - dbw $05, Cry_42_Ch6 - dbw $07, Cry_42_Ch8 -; f2e62 +Cry_Dunsparce: + musicheader 3, 5, Cry_Dunsparce_Ch5 + musicheader 1, 6, Cry_Dunsparce_Ch6 + musicheader 1, 8, Cry_Dunsparce_Ch8 -Cry_3F: ; f2e62 - dbw $84, Cry_3F_Ch5 - dbw $05, Cry_3F_Ch6 - dbw $07, Cry_3F_Ch8 -; f2e6b +Cry_Magcargo: + musicheader 3, 5, Cry_Magcargo_Ch5 + musicheader 1, 6, Cry_Magcargo_Ch6 + musicheader 1, 8, Cry_Magcargo_Ch8 -Cry_37: ; f2e6b - dbw $84, Cry_37_Ch5 - dbw $05, Cry_37_Ch6 - dbw $07, Cry_37_Ch8 -; f2e74 +Cry_Entei: + musicheader 3, 5, Cry_Entei_Ch5 + musicheader 1, 6, Cry_Entei_Ch6 + musicheader 1, 8, Cry_Entei_Ch8 -Cry_39: ; f2e74 - dbw $84, Cry_39_Ch5 - dbw $05, Cry_39_Ch6 - dbw $07, Cry_39_Ch8 -; f2e7d +Cry_Mantine: + musicheader 3, 5, Cry_Mantine_Ch5 + musicheader 1, 6, Cry_Mantine_Ch6 + musicheader 1, 8, Cry_Mantine_Ch8 -Cry_37_Ch5: ; f2e7d +Cry_Entei_Ch5: soundinput $ff - unknownmusic0xde $63 - sound $1, $f8, $05f8 - sound $8, $9f, $04d8 - sound $6, $f8, $05c4 - sound $14, $f2, $0574 + 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 -; f2e94 -Cry_37_Ch6: ; f2e94 - unknownmusic0xde $33 - sound $1, $c8, $0640 - sound $6, $ff, $0668 - sound $7, $a8, $0534 - sound $14, $a2, $04a4 +Cry_Entei_Ch6: + sound_duty 3, 0, 3, 0 + sound __, 2, $c8, $0640 + sound __, 7, $ff, $0668 + sound __, 8, $a8, $0534 + sound C_, 5, $a2, $04a4 endchannel -; f2ea7 -Cry_37_Ch8: ; f2ea7 - noise $a, $d6, $6a - noise $6, $bc, $6c - noise $6, $e2, $5c - noise $20, $b4, $6c +Cry_Entei_Ch8: + noise __, 11, $d6, $6a + noise __, 7, $bc, $6c + noise __, 7, $e2, $5c + noise C#, 1, $b4, $6c endchannel -; f2eb4 -Cry_3F_Ch5: ; f2eb4 - unknownmusic0xde $c4 - sound $4, $af, $0720 - sound $2, $f8, $071c - sound $2, $f8, $0718 - sound $2, $f8, $0708 - sound $2, $f8, $070e - sound $c, $c8, $0712 - sound $4, $91, $070e +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 -; f2ed3 -Cry_3F_Ch6: ; f2ed3 - unknownmusic0xde $a - sound $1, $b8, $0710 - sound $3, $d8, $072c - sound $4, $d8, $0665 - sound $1, $b8, $0656 - sound $1, $d8, $065c - sound $c, $f8, $0760 - sound $4, $c1, $0750 +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 -; f2ef2 -Cry_3F_Ch8: ; f2ef2 - noise $2, $e8, $3b -Cry_3F_branch_f2ef5: ; f2ef5 - noise $1, $f1, $4e - loopchannel 5, Cry_3F_branch_f2ef5 - noise $2, $d8, $3f - noise $14, $c2, $5f +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 -; f2f03 -Cry_42_Ch5: ; f2f03 - unknownmusic0xde $22 - sound $1, $f8, $05b0 - sound $1, $f8, $04b4 - sound $1, $f8, $05b8 - sound $3, $f8, $05c0 - sound $8, $c8, $0490 - sound $8, $c8, $0480 +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 $10, $c3, $0490 + sound C_, 1, $c3, $0490 soundinput $88 endchannel -; f2f26 -Cry_42_Ch6: ; f2f26 - unknownmusic0xde $22 - sound $8, $b8, $04c8 - sound $20, $b5, $0410 +Cry_Dunsparce_Ch6: + sound_duty 2, 0, 2, 0 + sound __, 9, $b8, $04c8 + sound C#, 1, $b5, $0410 endchannel -; f2f31 -Cry_42_Ch8: ; f2f31 - noise $3, $ff, $4b - noise $3, $ef, $4c - noise $20, $b5, $5f +Cry_Dunsparce_Ch8: + noise __, 4, $ff, $4b + noise __, 4, $ef, $4c + noise C#, 1, $b5, $5f endchannel -; f2f3b -Cry_2F_Ch5: ; f2f3b - unknownmusic0xde $33 - sound $2, $f1, $0550 - sound $2, $f1, $0530 - sound $2, $f1, $0510 - sound $2, $f2, $0650 - sound $2, $f2, $0640 - sound $2, $f2, $0630 - sound $10, $f2, $0550 +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 -; f2f5a -Cry_2F_Ch6: ; f2f5a - unknownmusic0xde $f2 - sound $4, $e1, $0620 - sound $5, $e2, $0500 - sound $6, $e1, $0620 - sound $2, $e1, $0520 - sound $10, $e2, $0500 +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 -; f2f71 -Cry_2F_Ch8: ; f2f71 - noise $2, $8a, $5d - noise $2, $9a, $4c - noise $5, $9a, $5d - noise $2, $9a, $4d - noise $2, $9a, $4b - noise $2, $9a, $4d - noise $2, $9a, $5f - noise $10, $b2, $6f +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 -; f2f8a -Cry_40_Ch5: ; f2f8a +Cry_Pichu_Ch5: dutycycle $0 soundinput $f7 - sound $2, $f8, $078d - sound $2, $f8, $0791 + sound __, 3, $f8, $078d + sound __, 3, $f8, $0791 soundinput $ff - sound $2, $f8, $07ad + sound __, 3, $f8, $07ad soundinput $88 - sound $2, $f8, $07b4 + sound __, 3, $f8, $07b4 soundinput $f7 - sound $2, $f8, $07b8 + sound __, 3, $f8, $07b8 soundinput $88 endchannel -; f2fab -Cry_40_Ch6: ; f2fab - unknownmusic0xde $10 - sound $2, $c8, $076d - sound $2, $c8, $0771 - sound $2, $c8, $078d - sound $2, $c8, $0794 - sound $2, $c8, $0798 +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 -; f2fc2 -Cry_40_Ch8: ; f2fc2 - noise $2, $b8, $1 - noise $2, $b8, $19 - noise $2, $c8, $18 - noise $2, $b8, $10 - noise $8, $c2, $18 +Cry_Pichu_Ch8: + noise __, 3, $b8, $1 + noise __, 3, $b8, $19 + noise __, 3, $c8, $18 + noise __, 3, $b8, $10 + noise __, 9, $c2, $18 endchannel -; f2fd2 -Cry_26_Ch5: ; f2fd2 - unknownmusic0xde $22 - sound $2, $88, $06d8 - sound $8, $e2, $06e0 - sound $2, $61, $06e5 - sound $2, $e8, $06c0 - sound $2, $e8, $06b8 - sound $2, $d8, $06b0 - sound $8, $c1, $06aa +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 -; f2ff1 -Cry_26_Ch6: ; f2ff1 - unknownmusic0xde $63 - sound $2, $68, $06b1 - sound $5, $c1, $06b9 - sound $5, $99, $0760 - sound $2, $b8, $068c - sound $2, $a8, $0684 - sound $a, $92, $067b +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 -; f300c -Cry_26_Ch8: ; f300c - noise $1, $99, $6c - noise $1, $92, $5c - noise $a, $62, $4c - noise $2, $68, $6a - noise $2, $68, $6b - noise $a, $62, $6c +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 -; f301f -Cry_28_Ch5: ; f301f +Cry_Togepi_Ch5: tone $0002 -Cry_28_Ch6: ; f3022 -Cry_2C_branch_f3022: ; f3022 - unknownmusic0xde $52 - sound $4, $f1, $0796 - sound $4, $f1, $072d - sound $7, $0, $0000 - sound $10, $f1, $07a7 +Cry_Togepi_Ch6: +Cry_Togetic_branch_f3022: + sound_duty 2, 0, 1, 1 + sound __, 5, $f1, $0796 + sound __, 5, $f1, $072d + sound __, 8, $0, 0 + sound C_, 1, $f1, $07a7 endchannel -; f3035 -Cry_2C_Ch5: ; f3035 +Cry_Togetic_Ch5: tone $0002 -Cry_2C_Ch6: ; f3038 -Cry_2C_branch_f3038: ; f3038 - callchannel Cry_2C_branch_f3022 - loopchannel 2, Cry_2C_branch_f3038 - sound $e, $0, $0000 - sound $8, $f2, $07c2 +Cry_Togetic_Ch6: + callchannel Cry_Togetic_branch_f3022 + loopchannel 2, Cry_Togetic_Ch6 + sound __, 15, $0, 0 + sound __, 9, $f2, $07c2 endchannel -; f3048 -Cry_27_Ch5: ; f3048 +Cry_Spinarak_Ch5: dutycycle $1 - sound $3, $2c, $07c4 - sound $1, $0, $0001 - sound $5, $59, $07b9 - sound $6, $b4, $07bb + sound __, 4, $2c, $07c4 + sound __, 2, $0, $0001 + sound __, 6, $59, $07b9 + sound __, 7, $b4, $07bb endchannel -; f305b -Cry_27_Ch6: ; f305b - unknownmusic0xde $2a - sound $3, $2c, $07c7 - sound $1, $0, $0000 - sound $5, $59, $07be - sound $6, $b4, $07bd +Cry_Spinarak_Ch6: + sound_duty 2, 2, 2, 0 + sound __, 4, $2c, $07c7 + sound __, 2, $0, 0 + sound __, 6, $59, $07be + sound __, 7, $b4, $07bd endchannel -; f306e -Cry_27_Ch8: ; f306e - noise $3, $92, $10 - noise $1, $39, $0 - noise $5, $69, $10 - noise $6, $93, $0 +Cry_Spinarak_Ch8: + noise __, 4, $92, $10 + noise __, 2, $39, $0 + noise __, 6, $69, $10 + noise __, 7, $93, $0 endchannel -; f307b -Cry_2A_Ch5: ; f307b - unknownmusic0xde $f8 - sound $2, $f1, $04b0 - sound $2, $f7, $0590 - sound $8, $f8, $0510 - sound $3, $f2, $06c0 - sound $3, $f8, $06ba - sound $3, $f2, $06b0 - sound $10, $f2, $0690 +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 -; f309a -Cry_2A_Ch6: ; f309a - unknownmusic0xde $f2 - sound $2, $f1, $0720 - sound $2, $e1, $0650 - sound $4, $f1, $0750 - sound $4, $d1, $03a0 - sound $3, $f1, $0670 - sound $3, $e1, $0680 - sound $3, $f2, $0690 - sound $10, $e2, $06a0 +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 -; f30bd -Cry_2A_Ch8: ; f30bd - noise $2, $89, $2e - noise $2, $99, $1f - noise $4, $89, $4e - noise $4, $89, $7b - noise $3, $d8, $4b - noise $3, $e7, $4c - noise $3, $ec, $4d - noise $10, $d2, $4f +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 -; f30d6 -Cry_2D_Ch5: ; f30d6 - unknownmusic0xde $66 - sound $4, $78, $0650 - sound $4, $f8, $0660 - sound $4, $f8, $065c - sound $1, $f8, $067c - sound $4, $f8, $0680 - sound $4, $f8, $067c - sound $4, $f8, $0678 - sound $4, $f1, $0674 +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 -; f30f9 -Cry_2D_Ch6: ; f30f9 - unknownmusic0xde $22 -Cry_2D_branch_f30fb: ; f30fb - sound $2, $a1, $0600 - loopchannel 3, Cry_2D_branch_f30fb -Cry_2D_branch_f3103: ; f3103 - sound $2, $a1, $0630 - loopchannel 4, Cry_2D_branch_f3103 - sound $4, $a2, $0634 - sound $4, $91, $0638 +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 -; f3114 -Cry_2D_Ch8: ; f3114 - noise $1, $68, $36 - noise $10, $88, $6a - noise $1, $98, $5e - noise $10, $a7, $6e +Cry_Hoothoot_Ch8: + noise __, 2, $68, $36 + noise C_, 1, $88, $6a + noise __, 2, $98, $5e + noise C_, 1, $a7, $6e endchannel -; f3121 -Cry_2E_Ch5: ; f3121 +Cry_Sentret_Ch5: tone $0020 dutycycle $0 - jumpchannel Cry_2E_branch_f312b -; f3129 + jumpchannel Cry_Sentret_branch_f312b -Cry_2E_Ch6: ; f3129 - unknownmusic0xde $1b -Cry_2E_branch_f312b: ; f312b - sound $8, $39, $072d - sound $8, $f1, $0720 +Cry_Sentret_Ch6: + sound_duty 3, 2, 1, 0 +Cry_Sentret_branch_f312b: + sound __, 9, $39, $072d + sound __, 9, $f1, $0720 endchannel -; f3134 -Cry_2E_Ch8: ; f3134 - noise $8, $3b, $0 - noise $8, $92, $0 +Cry_Sentret_Ch8: + noise __, 9, $3b, $0 + noise __, 9, $92, $0 endchannel -; f313b -Cry_2B_Ch5: ; f313b +Cry_Mareep_Ch5: tone $0020 dutycycle $0 - jumpchannel Cry_2B_branch_f3145 -; f3143 + jumpchannel Cry_Mareep_branch_f3145 -Cry_2B_Ch6: ; f3143 - unknownmusic0xde $1 -Cry_2B_branch_f3145: ; f3145 -Cry_33_branch_f3145: ; f3145 - sound $4, $3a, $073d - sound $6, $f8, $0762 - sound $6, $f8, $0760 - sound $6, $f1, $075e +Cry_Mareep_Ch6: + sound_duty 1, 0, 0, 0 +Cry_Mareep_branch_f3145: +Cry_Gligar_branch_f3145: + sound __, 5, $3a, $073d + sound __, 7, $f8, $0762 + sound __, 7, $f8, $0760 + sound __, 7, $f1, $075e endchannel -; f3156 -Cry_30_Ch5: ; f3156 +Cry_Cyndaquil_Ch5: tone $0020 -Cry_30_Ch6: ; f3159 +Cry_Cyndaquil_Ch6: dutycycle $2 - sound $8, $2f, $0107 -Cry_30_branch_f315f: ; f315f - sound $0, $e1, $0483 - sound $0, $51, $044e - loopchannel 4, Cry_30_branch_f315f -Cry_30_branch_f316b: ; f316b - sound $0, $e1, $03da - sound $1, $51, $0312 - loopchannel 4, Cry_30_branch_f316b + 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 -; f3178 -Cry_30_Ch8: ; f3178 -Cry_33_Ch8: ; f3178 - noise $8, $3f, $52 - noise $20, $93, $4f +Cry_Cyndaquil_Ch8: +Cry_Gligar_Ch8: + noise __, 9, $3f, $52 + noise C#, 1, $93, $4f endchannel -; f317f -Cry_31_Ch5: ; f317f +Cry_Chikorita_Ch5: tone $0020 -Cry_31_Ch6: ; f3182 - unknownmusic0xde $21 - sound $2, $c8, $0641 - sound $2, $48, $0641 - sound $6, $f8, $0790 - sound $4, $f8, $078e - sound $4, $f1, $078b +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 -; f3199 -Cry_31_Ch8: ; f3199 - noise $4, $91, $10 - noise $8, $94, $3 +Cry_Chikorita_Ch8: + noise __, 5, $91, $10 + noise __, 9, $94, $3 endchannel -; f31a0 -Cry_33_Ch5: ; f31a0 - unknownmusic0xde $a2 - jumpchannel Cry_33_branch_f3145 -; f31a5 +Cry_Gligar_Ch5: + sound_duty 2, 0, 2, 2 + jumpchannel Cry_Gligar_branch_f3145 -Cry_29_Ch5: ; f31a5 +Cry_Girafarig_Ch5: dutycycle $1 tone $0004 - jumpchannel Cry_29_branch_f31af -; f31ad + jumpchannel Cry_Girafarig_branch_f31af -Cry_29_Ch6: ; f31ad - unknownmusic0xde $41 -Cry_29_branch_f31af: ; f31af - sound $4, $68, $0758 - sound $2, $e8, $0760 - sound $2, $e8, $0767 - sound $2, $e8, $076c - sound $7, $f1, $0767 +Cry_Girafarig_Ch6: + sound_duty 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 -; f31c4 -Cry_29_Ch8: ; f31c4 - noise $4, $29, $0 - noise $2, $39, $1 - noise $2, $49, $2 - noise $2, $59, $1 - noise $7, $41, $0 +Cry_Girafarig_Ch8: + noise __, 5, $29, $0 + noise __, 3, $39, $1 + noise __, 3, $49, $2 + noise __, 3, $59, $1 + noise __, 8, $41, $0 endchannel -; f31d4 -Cry_35_Ch5: ; f31d4 - unknownmusic0xde $91 - sound $c, $f2, $07a6 - sound $4, $f8, $07b0 - sound $4, $e8, $03b0 - sound $6, $f8, $03a0 - sound $8, $e1, $0290 +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 -; f31eb -Cry_35_Ch8: ; f31eb - noise $c, $b2, $50 - noise $8, $a8, $60 - noise $6, $a8, $5b - noise $8, $a1, $5c +Cry_Slugma_Ch8: + noise __, 13, $b2, $50 + noise __, 9, $a8, $60 + noise __, 7, $a8, $5b + noise __, 9, $a1, $5c endchannel -; f31f8 -Cry_36_Ch5: ; f31f8 +Cry_Ledyba_Ch5: tone $0002 dutycycle $2 - jumpchannel Cry_36_branch_f3202 -; f3200 + jumpchannel Cry_Ledyba_branch_f3202 -Cry_36_Ch6: ; f3200 - unknownmusic0xde $1 -Cry_36_branch_f3202: ; f3202 - sound $3, $f8, $0791 - sound $3, $d8, $078d - sound $2, $0, $0000 - sound $1, $78, $06c1 - sound $1, $f8, $0741 - sound $4, $e1, $0751 +Cry_Ledyba_Ch6: + sound_duty 1, 0, 0, 0 +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 -; f321b -Cry_36_Ch8: ; f321b - noise $3, $59, $21 - noise $3, $81, $0 - noise $2, $20, $0 - noise $1, $80, $21 - noise $1, $80, $10 - noise $4, $87, $0 +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 -; f322e -Cry_38_Ch5: ; f322e -Cry_43_Ch5: ; f322e +Cry_Wooper_Ch5: +Cry_Donphan_Ch5: dutycycle $2 - sound $2, $99, $0718 - sound $4, $ab, $0722 - sound $8, $ab, $0734 - sound $4, $d6, $0716 - sound $8, $d1, $0712 - sound $8, $0, $0000 + sound __, 3, $99, $0718 + sound __, 5, $ab, $0722 + sound __, 9, $ab, $0734 + sound __, 5, $d6, $0716 + sound __, 9, $d1, $0712 + sound __, 9, $0, 0 endchannel -; f3249 -Cry_38_Ch6: ; f3249 -Cry_43_Ch6: ; f3249 - unknownmusic0xde $7 - sound $2, $b9, $0738 - sound $4, $cb, $0742 - sound $8, $cb, $0754 - sound $4, $f6, $0736 - sound $8, $f1, $0732 - sound $8, $0, $0000 +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 -; f3264 -Cry_38_Ch8: ; f3264 - noise $2, $5b, $4 - noise $4, $68, $13 - noise $8, $68, $20 - noise $4, $68, $13 - noise $10, $51, $4 +Cry_Wooper_Ch8: + noise __, 3, $5b, $4 + noise __, 5, $68, $13 + noise __, 9, $68, $20 + noise __, 5, $68, $13 + noise C_, 1, $51, $4 endchannel -; f3274 -Cry_43_Ch8: ; f3274 - noise $2, $8b, $59 - noise $4, $a8, $6a - noise $8, $a8, $70 - noise $4, $a8, $69 - noise $10, $92, $6c +Cry_Donphan_Ch8: + noise __, 3, $8b, $59 + noise __, 5, $a8, $6a + noise __, 9, $a8, $70 + noise __, 5, $a8, $69 + noise C_, 1, $92, $6c endchannel -; f3284 -Cry_3A_Ch5: ; f3284 -Cry_3C_Ch5: ; f3284 - unknownmusic0xde $12 -Cry_3A_branch_f3286: ; f3286 -Cry_3C_branch_f3286: ; f3286 - sound $3, $c1, $0791 - loopchannel 3, Cry_3A_branch_f3286 -Cry_3A_branch_f328e: ; f328e -Cry_3C_branch_f328e: ; f328e - sound $3, $d1, $04b1 - loopchannel 6, Cry_3A_branch_f328e -Cry_3A_branch_f3296: ; f3296 -Cry_3C_branch_f3296: ; f3296 - sound $1, $d1, $0491 - sound $1, $b1, $0451 - loopchannel 6, Cry_3A_branch_f3296 -Cry_3A_branch_f32a2: ; f32a2 -Cry_3C_branch_f32a2: ; f32a2 - sound $1, $a3, $0471 - sound $1, $81, $0441 - loopchannel 6, Cry_3A_branch_f32a2 -Cry_3A_branch_f32ae: ; f32ae -Cry_3C_branch_f32ae: ; f32ae - sound $1, $41, $0421 - sound $1, $21, $0401 - loopchannel 4, Cry_3A_branch_f32ae +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 -; f32bb -Cry_3A_Ch6: ; f32bb -Cry_3C_Ch6: ; f32bb - unknownmusic0xde $78 - sound $8, $99, $0740 - sound $8, $79, $0746 - sound $10, $f6, $078d - sound $8, $f8, $0791 - sound $8, $f8, $078d - sound $8, $f8, $0787 - sound $18, $e2, $0783 +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 -; f32da -Cry_3A_Ch8: ; f32da - noise $10, $a6, $16 - noise $18, $98, $3d - noise $20, $98, $5c - noise $20, $75, $5f +Cry_Typhlosion_Ch8: + noise C_, 1, $a6, $16 + noise C_, 9, $98, $3d + noise C#, 1, $98, $5c + noise C#, 1, $75, $5f endchannel -; f32e7 -Cry_3B_Ch5: ; f32e7 - unknownmusic0xde $de -Cry_39_branch_f32e9: ; f32e9 -Cry_3D_branch_f32e9: ; f32e9 - sound $4, $f8, $07b1 - sound $4, $f8, $07b0 - sound $4, $48, $07af -Cry_39_branch_f32f5: ; f32f5 - sound $4, $f8, $07b2 - sound $4, $f8, $07b3 - sound $4, $48, $07b4 +Cry_Natu_Ch5: + sound_duty 2, 3, 1, 3 +Cry_Mantine_branch_f32e9: +Cry_Sunflora_branch_f32e9: + sound __, 5, $f8, $07b1 + sound __, 5, $f8, $07b0 + sound __, 5, $48, $07af +Cry_Mantine_branch_f32f5: + sound __, 5, $f8, $07b2 + sound __, 5, $f8, $07b3 + sound __, 5, $48, $07b4 endchannel -; f3302 -Cry_39_branch_f3302: ; f3302 -Cry_3B_Ch6: ; f3302 -Cry_3D_Ch6: ; f3302 - unknownmusic0xde $f2 - sound $4, $f8, $07b2 - sound $4, $f8, $07b1 - sound $4, $28, $07b0 -Cry_39_branch_f3310: ; f3310 - sound $4, $f8, $07b4 - sound $4, $f8, $07b6 - sound $4, $48, $07b8 +Cry_Mantine_branch_f3302: +Cry_Natu_Ch6: +Cry_Sunflora_Ch6: + sound_duty 2, 0, 3, 3 + sound __, 5, $f8, $07b2 + sound __, 5, $f8, $07b1 + sound __, 5, $28, $07b0 +Cry_Mantine_branch_f3310: + sound __, 5, $f8, $07b4 + sound __, 5, $f8, $07b6 + sound __, 5, $48, $07b8 endchannel -; f331d -Cry_39_branch_f331d: ; f331d -Cry_3B_Ch8: ; f331d -Cry_3D_Ch8: ; f331d - noise $4, $88, $5 - noise $4, $88, $4 - noise $4, $38, $3 -Cry_39_branch_f3326: ; f3326 - noise $4, $88, $5 - noise $4, $88, $4 - noise $4, $87, $4 +Cry_Mantine_branch_f331d: +Cry_Natu_Ch8: +Cry_Sunflora_Ch8: + noise __, 5, $88, $5 + noise __, 5, $88, $4 + noise __, 5, $38, $3 +Cry_Mantine_branch_f3326: + noise __, 5, $88, $5 + noise __, 5, $88, $4 + noise __, 5, $87, $4 endchannel -; f3330 -Cry_3C_Ch8: ; f3330 - noise $8, $a6, $3a - noise $8, $a1, $5a +Cry_Teddiursa_Ch8: + noise __, 9, $a6, $3a + noise __, 9, $a1, $5a endchannel -; f3337 -Cry_3D_Ch5: ; f3337 +Cry_Sunflora_Ch5: dutycycle $0 - jumpchannel Cry_3D_branch_f32e9 -; f333c + jumpchannel Cry_Sunflora_branch_f32e9 -Cry_39_Ch5: ; f333c +Cry_Mantine_Ch5: dutycycle $0 - callchannel Cry_39_branch_f32e9 - callchannel Cry_39_branch_f32f5 + callchannel Cry_Mantine_branch_f32e9 + callchannel Cry_Mantine_branch_f32f5 endchannel -; f3345 -Cry_39_Ch6: ; f3345 - callchannel Cry_39_branch_f3302 - callchannel Cry_39_branch_f3310 +Cry_Mantine_Ch6: + callchannel Cry_Mantine_branch_f3302 + callchannel Cry_Mantine_branch_f3310 endchannel -; f334c -Cry_39_Ch8: ; f334c - callchannel Cry_39_branch_f331d - callchannel Cry_39_branch_f3326 +Cry_Mantine_Ch8: + callchannel Cry_Mantine_branch_f331d + callchannel Cry_Mantine_branch_f3326 endchannel -; f3353 -Cry_3E_Ch5: ; f3353 - unknownmusic0xde $de -Cry_3E_branch_f3355: ; f3355 - sound $1, $c1, $0520 - sound $1, $a1, $0420 - loopchannel 4, Cry_3E_branch_f3355 +Cry_Ampharos_Ch5: + sound_duty 2, 3, 1, 3 +.loop + sound __, 2, $c1, $0520 + sound __, 2, $a1, $0420 + loopchannel 4, .loop dutycycle $0 - sound $4, $78, $0760 - sound $4, $78, $0730 - sound $18, $c2, $0420 + sound __, 5, $78, $0760 + sound __, 5, $78, $0730 + sound C_, 9, $c2, $0420 endchannel -; f3370 -Cry_3E_Ch6: ; f3370 - unknownmusic0xde $32 - sound $8, $f8, $0700 - sound $7, $f8, $0720 - sound $4, $f8, $0790 - sound $4, $f8, $0760 - sound $18, $f2, $0730 +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 -; f3387 -Cry_3E_Ch8: ; f3387 - noise $4, $88, $6d - noise $4, $d8, $68 - noise $7, $c8, $69 - noise $4, $98, $3a - noise $4, $98, $3c - noise $18, $d2, $5b +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 -; f339a -Cry_32_Ch5: ; f339a - unknownmusic0xde $32 - sound $8, $f8, $0330 - sound $8, $f8, $0340 - sound $8, $c8, $07b2 - sound $8, $b8, $07b3 - sound $20, $b2, $07b4 +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 -; f33b1 -Cry_32_Ch6: ; f33b1 - unknownmusic0xde $12 - sound $8, $e8, $0320 - sound $8, $e8, $0328 - sound $8, $98, $0780 - sound $8, $88, $0782 - sound $20, $72, $0784 +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 -; f33c8 -Cry_32_Ch8: ; f33c8 - noise $2, $be, $49 - noise $5, $be, $3a - noise $2, $be, $29 - noise $28, $d3, $6e +Cry_Totodile_Ch8: + noise __, 3, $be, $49 + noise __, 6, $be, $3a + noise __, 3, $be, $29 + noise C#, 9, $d3, $6e endchannel -; f33d5 -Cry_34_Ch5: ; f33d5 - unknownmusic0xde $39 +Cry_Cleffa_Ch5: + sound_duty 1, 2, 3, 0 soundinput $ff - sound $2, $f8, $0720 - sound $2, $f8, $0727 - sound $2, $f8, $0780 + sound __, 3, $f8, $0720 + sound __, 3, $f8, $0727 + sound __, 3, $f8, $0780 soundinput $88 - sound $2, $f8, $0779 - sound $4, $f8, $0740 - sound $4, $f8, $073c + sound __, 3, $f8, $0779 + sound __, 5, $f8, $0740 + sound __, 5, $f8, $073c soundinput $ff - sound $8, $f1, $0737 + sound __, 9, $f1, $0737 soundinput $88 endchannel -; f33fc - -Cry_34_Ch6: ; f33fc - unknownmusic0xde $22 - sound $6, $b2, $071e - sound $5, $92, $0779 - sound $4, $82, $073e - sound $8, $a1, $0735 - endchannel -; f340f - -Cry_34_Ch8: ; f340f - noise $2, $64, $7f - noise $2, $84, $7d - noise $2, $a4, $6f - noise $2, $64, $6c - noise $2, $94, $6f - noise $2, $61, $6b - endchannel -; f3422 - -Cry_41_Ch5: ; f3422 - unknownmusic0xde $d2 - sound $3, $f8, $06b0 - sound $1, $f8, $06a5 - sound $1, $f8, $069d - sound $7, $f1, $068a - sound $3, $f8, $0736 - sound $3, $f8, $0720 - sound $14, $f2, $070e - endchannel -; f3441 - -Cry_41_Ch6: ; f3441 - unknownmusic0xde $27 -Cry_41_branch_f3443: ; f3443 - sound $1, $f1, $07b4 - loopchannel 8, Cry_41_branch_f3443 -Cry_41_branch_f344b: ; f344b - sound $1, $c1, $0790 - loopchannel 3, Cry_41_branch_f344b -Cry_41_branch_f3453: ; f3453 - sound $1, $b1, $078d - loopchannel 2, Cry_41_branch_f3453 - sound $10, $92, $0795 - endchannel -; f3460 - -Cry_41_Ch8: ; f3460 -Cry_41_branch_f3460: ; f3460 - noise $0, $f1, $28 - loopchannel 4, Cry_41_branch_f3460 - noise $0, $91, $49 - noise $1, $a8, $4a - noise $0, $e1, $4b - noise $5, $d2, $4f - noise $3, $c2, $4e - noise $3, $b2, $4d - noise $14, $a3, $4c - endchannel -; f347d - -Cry_00: ; f347d - dbw $84, Cry_00_Ch5 - dbw $05, Cry_00_Ch6 - dbw $07, Cry_00_Ch8 -; f3486 - -Cry_01: ; f3486 - dbw $84, Cry_01_Ch5 - dbw $05, Cry_01_Ch6 - dbw $07, Cry_01_Ch8 -; f348f - -Cry_02: ; f348f - dbw $84, Cry_02_Ch5 - dbw $05, Cry_02_Ch6 - dbw $07, Cry_02_Ch8 -; f3498 - -Cry_03: ; f3498 - dbw $84, Cry_03_Ch5 - dbw $05, Cry_03_Ch6 - dbw $07, Cry_03_Ch8 -; f34a1 - -Cry_04: ; f34a1 - dbw $84, Cry_04_Ch5 - dbw $05, Cry_04_Ch6 - dbw $07, Cry_04_Ch8 -; f34aa - -Cry_05: ; f34aa - dbw $84, Cry_05_Ch5 - dbw $05, Cry_05_Ch6 - dbw $07, Cry_05_Ch8 -; f34b3 - -Cry_06: ; f34b3 - dbw $84, Cry_06_Ch5 - dbw $05, Cry_06_Ch6 - dbw $07, Cry_06_Ch8 -; f34bc - -Cry_07: ; f34bc - dbw $84, Cry_07_Ch5 - dbw $05, Cry_07_Ch6 - dbw $07, Cry_07_Ch8 -; f34c5 - -Cry_08: ; f34c5 - dbw $84, Cry_08_Ch5 - dbw $05, Cry_08_Ch6 - dbw $07, Cry_08_Ch8 -; f34ce - -Cry_09: ; f34ce - dbw $84, Cry_09_Ch5 - dbw $05, Cry_09_Ch6 - dbw $07, Cry_09_Ch8 -; f34d7 - -Cry_0A: ; f34d7 - dbw $84, Cry_0A_Ch5 - dbw $05, Cry_0A_Ch6 - dbw $07, Cry_0A_Ch8 -; f34e0 - -Cry_0B: ; f34e0 - dbw $84, Cry_0B_Ch5 - dbw $05, Cry_0B_Ch6 - dbw $07, Cry_0B_Ch8 -; f34e9 - -Cry_0C: ; f34e9 - dbw $84, Cry_0C_Ch5 - dbw $05, Cry_0C_Ch6 - dbw $07, Cry_0C_Ch8 -; f34f2 - -Cry_0D: ; f34f2 - dbw $84, Cry_0D_Ch5 - dbw $05, Cry_0D_Ch6 - dbw $07, Cry_0D_Ch8 -; f34fb - -Cry_0E: ; f34fb - dbw $84, Cry_0E_Ch5 - dbw $05, Cry_0E_Ch6 - dbw $07, Cry_0E_Ch8 -; f3504 - -Cry_0F: ; f3504 - dbw $84, Cry_0F_Ch5 - dbw $05, Cry_0F_Ch6 - dbw $07, Cry_0F_Ch8 -; f350d - -Cry_10: ; f350d - dbw $84, Cry_10_Ch5 - dbw $05, Cry_10_Ch6 - dbw $07, Cry_10_Ch8 -; f3516 - -Cry_11: ; f3516 - dbw $84, Cry_11_Ch5 - dbw $05, Cry_11_Ch6 - dbw $07, Cry_11_Ch8 -; f351f - -Cry_12: ; f351f - dbw $84, Cry_12_Ch5 - dbw $05, Cry_12_Ch6 - dbw $07, Cry_12_Ch8 -; f3528 - -Cry_13: ; f3528 - dbw $84, Cry_13_Ch5 - dbw $05, Cry_13_Ch6 - dbw $07, Cry_13_Ch8 -; f3531 - -Cry_14: ; f3531 - dbw $84, Cry_14_Ch5 - dbw $05, Cry_14_Ch6 - dbw $07, Cry_14_Ch8 -; f353a - -Cry_15: ; f353a - dbw $84, Cry_15_Ch5 - dbw $05, Cry_15_Ch6 - dbw $07, Cry_15_Ch8 -; f3543 - -Cry_16: ; f3543 - dbw $84, Cry_16_Ch5 - dbw $05, Cry_16_Ch6 - dbw $07, Cry_16_Ch8 -; f354c - -Cry_17: ; f354c - dbw $84, Cry_17_Ch5 - dbw $05, Cry_17_Ch6 - dbw $07, Cry_17_Ch8 -; f3555 - -Cry_18: ; f3555 - dbw $84, Cry_18_Ch5 - dbw $05, Cry_18_Ch6 - dbw $07, Cry_18_Ch8 -; f355e - -Cry_19: ; f355e - dbw $84, Cry_19_Ch5 - dbw $05, Cry_19_Ch6 - dbw $07, Cry_19_Ch8 -; f3567 - -Cry_1A: ; f3567 - dbw $84, Cry_1A_Ch5 - dbw $05, Cry_1A_Ch6 - dbw $07, Cry_1A_Ch8 -; f3570 - -Cry_1B: ; f3570 - dbw $84, Cry_1B_Ch5 - dbw $05, Cry_1B_Ch6 - dbw $07, Cry_1B_Ch8 -; f3579 - -Cry_1C: ; f3579 - dbw $84, Cry_1C_Ch5 - dbw $05, Cry_1C_Ch6 - dbw $07, Cry_1C_Ch8 -; f3582 - -Cry_1D: ; f3582 - dbw $84, Cry_1D_Ch5 - dbw $05, Cry_1D_Ch6 - dbw $07, Cry_1D_Ch8 -; f358b - -Cry_1E: ; f358b - dbw $84, Cry_1E_Ch5 - dbw $05, Cry_1E_Ch6 - dbw $07, Cry_1E_Ch8 -; f3594 - -Cry_1F: ; f3594 - dbw $84, Cry_1F_Ch5 - dbw $05, Cry_1F_Ch6 - dbw $07, Cry_1F_Ch8 -; f359d - -Cry_20: ; f359d - dbw $84, Cry_20_Ch5 - dbw $05, Cry_20_Ch6 - dbw $07, Cry_20_Ch8 -; f35a6 - -Cry_21: ; f35a6 - dbw $84, Cry_21_Ch5 - dbw $05, Cry_21_Ch6 - dbw $07, Cry_21_Ch8 -; f35af - -Cry_22: ; f35af - dbw $84, Cry_22_Ch5 - dbw $05, Cry_22_Ch6 - dbw $07, Cry_22_Ch8 -; f35b8 - -Cry_23: ; f35b8 - dbw $84, Cry_23_Ch5 - dbw $05, Cry_23_Ch6 - dbw $07, Cry_23_Ch8 -; f35c1 - -Cry_24: ; f35c1 - dbw $84, Cry_24_Ch5 - dbw $05, Cry_24_Ch6 - dbw $07, Cry_24_Ch8 -; f35ca - -Cry_25: ; f35ca - dbw $84, Cry_25_Ch5 - dbw $05, Cry_25_Ch6 - dbw $07, Cry_25_Ch8 -; f35d3 - -Unknown_Cry_Ch5: ; f35d3 - unknownmusic0xde $f0 - sound $f, $e0, $0780 - sound $f, $f0, $0784 - sound $f, $c3, $05e0 - sound $f, $c4, $0600 - sound $a, $6c, $0780 - sound $8, $71, $0784 - endchannel -; f35ee - -Unknown_Cry_Ch6: ; f35ee - unknownmusic0xde $5 - sound $f, $a0, $0741 - sound $f, $b0, $0743 - sound $f, $93, $05b1 - sound $f, $94, $05c1 - sound $a, $4c, $0741 - sound $8, $31, $0746 - endchannel -; f3609 - -Unknown_Cry_Ch8: ; f3609 - noise $2, $f2, $4c - noise $6, $e0, $3a - noise $f, $d0, $3a - noise $8, $d0, $2c - noise $6, $e6, $4c - noise $c, $7d, $4c - noise $f, $d3, $4c - endchannel -; f361f - -Cry_09_Ch5: ; f361f - unknownmusic0xde $f0 - sound $f, $f7, $07a0 - sound $6, $e6, $07a3 - sound $a, $f4, $07a0 - unknownmusic0xde $a5 - sound $a, $f6, $07d8 - sound $4, $e3, $07d7 - sound $f, $f2, $07d8 - endchannel -; f363c - -Cry_09_Ch6: ; f363c - unknownmusic0xde $5 - sound $2, $8, $0000 - sound $f, $a7, $06a1 - sound $6, $86, $06a2 - sound $a, $74, $06a1 - unknownmusic0xde $5f - sound $a, $76, $06d6 - sound $4, $83, $06d9 - sound $f, $a2, $06d7 - endchannel -; f365d - -Cry_09_Ch8: ; f365d - noise $2, $f2, $3c - noise $8, $e4, $3e - noise $f, $d7, $3c - noise $6, $c5, $3b - noise $6, $e4, $3d - noise $8, $b6, $3c - noise $6, $d4, $3d - noise $8, $c1, $3b - endchannel -; f3676 - -Cry_23_Ch5: ; f3676 - unknownmusic0xde $f0 - sound $f, $f7, $07c0 - sound $6, $e4, $07c1 - sound $a, $f6, $07c0 - sound $4, $d3, $07c2 - sound $8, $c1, $07c0 - endchannel -; f368d - -Cry_23_Ch6: ; f368d - unknownmusic0xde $5f - sound $f, $97, $0781 - sound $6, $84, $0780 - sound $a, $96, $0781 - sound $f, $83, $0781 - endchannel -; f36a0 - -Cry_23_Ch8: ; f36a0 - noise $3, $f2, $3c - noise $d, $e6, $2c - noise $f, $d7, $3c - noise $8, $c1, $2c - endchannel -; f36ad - -Cry_24_Ch5: ; f36ad - unknownmusic0xde $f0 - sound $f, $f7, $0680 - sound $a, $e6, $0684 - sound $f, $d7, $0690 - sound $8, $d5, $0690 - sound $6, $c4, $0688 - sound $5, $d3, $0670 - sound $4, $d3, $0660 - sound $8, $c1, $0640 - endchannel -; f36d0 - -Cry_24_Ch6: ; f36d0 - unknownmusic0xde $5 - sound $f, $b7, $0641 - sound $a, $96, $0642 - sound $f, $a7, $0651 - sound $8, $a5, $0651 - sound $6, $94, $0647 - sound $5, $a3, $0631 - sound $4, $93, $0622 - sound $8, $71, $0601 - endchannel -; f36f3 - -Cry_24_Ch8: ; f36f3 - noise $f, $e4, $3c - noise $a, $c7, $4c - noise $a, $c7, $3c - noise $c, $b7, $4c - noise $f, $a2, $5c - endchannel -; f3703 - -Cry_11_Ch5: ; f3703 - unknownmusic0xde $f0 - sound $6, $f7, $07a0 - sound $8, $e6, $07a4 - sound $4, $d6, $07a0 - sound $f, $d3, $0720 - sound $8, $c3, $0723 - sound $2, $c2, $0728 - sound $8, $b1, $0730 - endchannel -; f3722 - -Cry_11_Ch6: ; f3722 - unknownmusic0xde $a - sound $4, $8, $0000 - sound $6, $a7, $0741 - sound $8, $86, $0743 - sound $4, $76, $0741 - sound $d, $83, $06c2 - sound $7, $73, $06c1 - sound $3, $82, $06cc - sound $8, $71, $06d8 - endchannel -; f3745 - -Cry_11_Ch8: ; f3745 - noise $2, $f2, $4c - noise $6, $e6, $3a - noise $4, $d7, $3a - noise $6, $d6, $2c - noise $8, $e5, $3c - noise $c, $d2, $3d - noise $8, $d1, $2c - endchannel -; f375b - -Cry_25_Ch5: ; f375b - unknownmusic0xde $a5 - sound $6, $f4, $0740 - sound $f, $e3, $0730 - sound $4, $f4, $0740 - sound $5, $b3, $0748 - sound $8, $d1, $0750 - endchannel -; f3772 - -Cry_25_Ch6: ; f3772 - unknownmusic0xde $77 - sound $6, $c3, $0712 - sound $f, $b3, $0704 - sound $3, $c3, $0712 - sound $4, $c3, $0721 - sound $8, $b1, $0732 - endchannel -; f3789 - -Cry_25_Ch8: ; f3789 - noise $8, $d6, $2c - noise $c, $c6, $3c - noise $a, $b6, $2c - noise $8, $91, $1c - endchannel -; f3796 - -Cry_03_Ch5: ; f3796 - unknownmusic0xde $f0 - sound $4, $f7, $0608 - sound $6, $e6, $0600 - sound $6, $d7, $05f0 - sound $6, $c4, $05e0 - sound $5, $d3, $05c0 - sound $4, $d3, $05a0 - sound $8, $e1, $0580 - endchannel -; f37b5 - -Cry_03_Ch6: ; f37b5 - unknownmusic0xde $a - sound $4, $c7, $0504 - sound $6, $a6, $0502 - sound $6, $97, $04f1 - sound $4, $b4, $04e1 - sound $5, $a3, $04c2 - sound $4, $b3, $04a3 - sound $8, $c1, $0482 - endchannel -; f37d4 - -Cry_03_Ch8: ; f37d4 - noise $c, $e4, $4c - noise $a, $c7, $5c - noise $c, $b6, $4c - noise $f, $a2, $5c - endchannel -; f37e1 - -Cry_0F_Ch5: ; f37e1 - unknownmusic0xde $f1 - sound $4, $f7, $07c0 - sound $c, $e6, $07c2 - sound $6, $b5, $0680 - sound $4, $c4, $0670 - sound $4, $b5, $0660 - sound $8, $c1, $0640 - endchannel -; f37fc - -Cry_0F_Ch6: ; f37fc - unknownmusic0xde $cc - sound $3, $c7, $0781 - sound $c, $b6, $0780 - sound $6, $a5, $0641 - sound $4, $c4, $0632 - sound $6, $b5, $0621 - sound $8, $a1, $0602 - endchannel -; f3817 - -Cry_0F_Ch8: ; f3817 - noise $3, $e4, $3c - noise $c, $d6, $2c - noise $4, $e4, $3c - noise $8, $b7, $5c - noise $f, $c2, $5d - endchannel -; f3827 - -Cry_10_Ch5: ; f3827 - unknownmusic0xde $c9 - sound $8, $f7, $0680 - sound $2, $f7, $0660 - sound $1, $e7, $0640 - sound $1, $e7, $0620 - sound $f, $d1, $0600 - sound $4, $c7, $0740 - sound $4, $a7, $0730 - sound $f, $91, $0720 - endchannel -; f384a - -Cry_10_Ch6: ; f384a - unknownmusic0xde $79 - sound $a, $e7, $0682 - sound $2, $e7, $0662 - sound $1, $d7, $0642 - sound $1, $d7, $0622 - sound $f, $c1, $0602 - sound $4, $b7, $0742 - sound $2, $97, $0732 - sound $f, $81, $0722 - endchannel -; f386d - -Cry_10_Ch8: ; f386d - noise $4, $74, $21 - noise $4, $74, $10 - noise $4, $71, $20 - endchannel -; f3877 - -Cry_00_Ch5: ; f3877 - unknownmusic0xde $f5 - sound $4, $f3, $0718 - sound $f, $e5, $0798 - sound $8, $91, $0758 - endchannel -; f3886 - -Cry_00_Ch6: ; f3886 - unknownmusic0xde $a0 - sound $5, $b3, $0708 - sound $f, $c5, $0788 - sound $8, $71, $0748 - endchannel -; f3895 - -Cry_00_Ch8: ; f3895 - noise $3, $a1, $1c - noise $e, $94, $2c - noise $8, $81, $1c - endchannel -; f389f - -Cry_0E_Ch5: ; f389f - unknownmusic0xde $a5 - sound $4, $e1, $0700 - sound $4, $f2, $0780 - sound $2, $92, $0740 - sound $8, $e1, $0600 - endchannel -; f38b2 - -Cry_0E_Ch6: ; f38b2 - unknownmusic0xde $a - sound $4, $b1, $06e1 - sound $3, $c2, $06e1 - sound $3, $62, $0681 - sound $8, $b1, $05e1 - endchannel -; f38c5 - -Cry_0E_Ch8: ; f38c5 - noise $2, $61, $32 - noise $2, $61, $21 - noise $8, $61, $11 - endchannel -; f38cf - -Cry_06_Ch5: ; f38cf - unknownmusic0xde $fa - sound $6, $83, $0247 - sound $f, $62, $0226 - sound $4, $52, $0245 - sound $9, $63, $0206 - sound $f, $82, $0225 - sound $f, $42, $0207 -Cry_06_Ch6: ; f38e9 - endchannel -; f38ea - -Cry_06_Ch8: ; f38ea - noise $8, $d4, $8c - noise $4, $e2, $9c - noise $f, $c6, $8c - noise $8, $e4, $ac - noise $f, $d7, $9c - noise $f, $f2, $ac - endchannel -; f38fd - -Cry_07_Ch5: ; f38fd - unknownmusic0xde $f0 - sound $4, $f3, $06e0 - sound $f, $e4, $0640 - sound $8, $c1, $0620 - endchannel -; f390c - -Cry_07_Ch6: ; f390c - unknownmusic0xde $a - sound $3, $c3, $0683 - sound $e, $b4, $0602 - sound $8, $a1, $0601 - endchannel -; f391b - -Cry_07_Ch8: ; f391b - noise $4, $d3, $5c - noise $f, $e6, $4c - noise $8, $b1, $5c - endchannel -; f3925 - -Cry_05_Ch5: ; f3925 - unknownmusic0xde $a - sound $6, $e2, $0500 - sound $6, $e3, $0580 - sound $6, $d3, $0570 - sound $8, $a1, $0560 - endchannel -; f3938 - -Cry_05_Ch6: ; f3938 - unknownmusic0xde $f5 - sound $6, $e2, $0482 - sound $6, $d3, $0501 - sound $6, $b2, $04e2 - sound $8, $81, $04c1 -Cry_05_Ch8: ; f394a - endchannel -; f394b - -Cry_0B_Ch5: ; f394b - unknownmusic0xde $cc - sound $4, $f1, $0700 - sound $4, $e1, $0780 - sound $4, $d1, $0740 - sound $4, $e1, $0740 - sound $4, $f1, $0780 - sound $4, $d1, $0700 - sound $4, $f1, $0701 - sound $4, $d1, $0782 - sound $4, $c1, $0742 - sound $8, $b1, $0741 - endchannel -; f3976 - -Cry_0B_Ch6: ; f3976 - unknownmusic0xde $44 - sound $c, $8, $0000 - sound $4, $f1, $0701 - sound $4, $e1, $0782 - sound $4, $d1, $0741 - sound $4, $e1, $0741 - sound $4, $f1, $0782 - sound $8, $d1, $0701 - endchannel -; f3995 - -Cry_0B_Ch8: ; f3995 - noise $f, $8, $0 - noise $4, $8, $0 - noise $4, $d1, $4c - noise $4, $b1, $2c - noise $4, $d1, $3c - noise $4, $b1, $3c - noise $4, $c1, $2c - noise $8, $a1, $4c - endchannel -; f39ae - -Cry_0C_Ch5: ; f39ae - unknownmusic0xde $cc - sound $8, $f5, $0600 - sound $2, $d2, $0638 - sound $2, $c2, $0630 - sound $2, $c2, $0628 - sound $2, $b2, $0620 - sound $2, $b2, $0610 - sound $2, $a2, $0618 - sound $2, $b2, $0610 - sound $8, $c1, $0620 - endchannel -; f39d5 - -Cry_0C_Ch6: ; f39d5 - unknownmusic0xde $44 - sound $c, $c3, $05c0 - sound $3, $b1, $05f9 - sound $2, $a1, $05f1 - sound $2, $a1, $05e9 - sound $2, $91, $05e1 - sound $2, $91, $05d9 - sound $2, $81, $05d1 - sound $2, $91, $05d9 - sound $8, $91, $05e1 -Cry_0C_Ch8: ; f39fb - endchannel -; f39fc - -Cry_02_Ch5: ; f39fc - unknownmusic0xde $0 - sound $8, $f5, $0480 - sound $2, $e1, $05e0 - sound $8, $d1, $05dc - endchannel -; f3a0b - -Cry_02_Ch6: ; f3a0b - unknownmusic0xde $a5 - sound $7, $95, $0441 - sound $2, $81, $0521 - sound $8, $61, $051a -Cry_02_Ch8: ; f3a19 - endchannel -; f3a1a - -Cry_0D_Ch5: ; f3a1a -Cry_0D_branch_f3a1a: ; f3a1a - unknownmusic0xde $88 - sound $5, $f2, $0650 - sound $9, $d1, $0660 - sound $5, $e2, $0612 - sound $9, $c1, $0622 - sound $5, $f2, $0610 - sound $6, $d1, $0620 - loopchannel 2, Cry_0D_branch_f3a1a - endchannel -; f3a39 - -Cry_0D_Ch6: ; f3a39 - unknownmusic0xde $40 - sound $4, $8, $0000 - sound $5, $f2, $0651 - sound $9, $d1, $0661 - sound $5, $e2, $0614 - sound $8, $c1, $0624 - sound $5, $f2, $0611 - sound $c, $d1, $0621 - sound $5, $e2, $0614 - sound $8, $c1, $0624 - sound $5, $f2, $0611 - sound $4, $d1, $0621 - endchannel -; f3a68 - -Cry_0D_Ch8: ; f3a68 - noise $6, $d2, $1c - noise $9, $b1, $2c - noise $8, $c2, $2c - noise $9, $b1, $3c - noise $6, $c2, $2c - noise $9, $a2, $3c - noise $7, $c2, $2c - noise $5, $a1, $3c - noise $9, $c2, $2c - noise $4, $a1, $3c - endchannel -; f3a87 - -Cry_01_Ch5: ; f3a87 - unknownmusic0xde $a0 - sound $4, $f3, $0600 - sound $8, $d5, $0760 - sound $3, $e2, $0720 - sound $8, $d1, $0710 - endchannel -; f3a9a - -Cry_01_Ch6: ; f3a9a - unknownmusic0xde $5a - sound $5, $b3, $06f1 - sound $7, $c5, $0752 - sound $3, $a2, $0711 - sound $8, $b1, $0601 - endchannel -; f3aad - -Cry_01_Ch8: ; f3aad - noise $3, $a2, $3c - noise $c, $94, $2c - noise $3, $82, $1c - noise $8, $71, $2c - endchannel -; f3aba - -Cry_0A_Ch5: ; f3aba - unknownmusic0xde $f0 - sound $8, $f7, $06e0 - sound $6, $e6, $06e5 - sound $3, $f4, $06e0 - sound $3, $f6, $06d0 - sound $3, $e3, $06c0 - sound $4, $f2, $06b0 - sound $f, $a2, $06c8 - endchannel -; f3ad9 - -Cry_0A_Ch6: ; f3ad9 - unknownmusic0xde $5 - sound $3, $8, $0000 - sound $8, $a7, $06a1 - sound $6, $86, $06a3 - sound $3, $74, $06a1 - sound $3, $76, $0691 - sound $3, $83, $0682 - sound $4, $a2, $0671 - sound $f, $72, $0689 - endchannel -; f3afc - -Cry_0A_Ch8: ; f3afc - noise $2, $f2, $3c - noise $8, $e4, $3e - noise $8, $d7, $3c - noise $5, $c5, $3b - noise $3, $d4, $2c - noise $2, $b6, $3c - noise $3, $a4, $2c - noise $8, $91, $3c - endchannel -; f3b15 - -Cry_08_Ch5: ; f3b15 - unknownmusic0xde $f0 - sound $f, $f6, $0565 - sound $a, $e4, $057c - sound $3, $c2, $055c - sound $f, $b2, $053c - endchannel -; f3b28 - -Cry_08_Ch6: ; f3b28 - unknownmusic0xde $5a - sound $e, $d6, $0503 - sound $9, $b4, $051b - sound $4, $92, $04fa - sound $f, $a2, $04db - endchannel -; f3b3b - -Cry_08_Ch8: ; f3b3b - noise $c, $e6, $4c - noise $b, $d7, $5c - noise $f, $c2, $4c - endchannel -; f3b45 - -Cry_04_Ch5: ; f3b45 - unknownmusic0xde $f0 - sound $4, $f7, $06a0 - sound $8, $e6, $06a4 - sound $4, $d6, $06a0 - sound $c, $d3, $0620 - sound $8, $c3, $0624 - sound $4, $c2, $0620 - sound $8, $b1, $0610 - endchannel -; f3b64 - -Cry_04_Ch6: ; f3b64 - unknownmusic0xde $5a - sound $4, $e7, $0601 - sound $8, $d6, $0603 - sound $4, $c6, $0601 - sound $c, $c3, $0581 - sound $8, $b3, $0583 - sound $4, $b2, $0582 - sound $8, $a1, $0571 - endchannel -; f3b83 - -Cry_04_Ch8: ; f3b83 - noise $7, $d6, $5c - noise $8, $e6, $4c - noise $4, $d4, $5c - noise $4, $d4, $4c - noise $7, $c3, $4c - noise $8, $a1, $5c - endchannel -; f3b96 - -Cry_19_Ch5: ; f3b96 - unknownmusic0xde $1b - sound $7, $d2, $0740 - sound $f, $e5, $0760 - sound $18, $c1, $0730 - endchannel -; f3ba5 - -Cry_19_Ch6: ; f3ba5 - unknownmusic0xde $81 - sound $2, $c2, $0701 - sound $4, $c2, $0708 - sound $f, $d7, $0741 - sound $18, $a2, $0701 -Cry_19_Ch8: ; f3bb7 - endchannel -; f3bb8 - -Cry_16_Ch5: ; f3bb8 - unknownmusic0xde $f0 - sound $f, $d7, $0780 - sound $4, $e6, $07a0 - sound $f, $d2, $0740 - endchannel -; f3bc7 - -Cry_16_Ch6: ; f3bc7 - unknownmusic0xde $5a - sound $f, $c7, $0753 - sound $5, $b6, $0772 - sound $f, $c2, $0711 - endchannel -; f3bd6 - -Cry_16_Ch8: ; f3bd6 - noise $d, $f6, $4c - noise $4, $e6, $3c - noise $f, $f2, $4c - endchannel -; f3be0 - -Cry_1B_Ch5: ; f3be0 - unknownmusic0xde $f0 - sound $6, $f7, $06c0 - sound $f, $e7, $0700 - sound $4, $f4, $06f0 - sound $4, $e4, $06e0 - sound $8, $d1, $06d0 - endchannel -; f3bf7 - -Cry_1B_Ch6: ; f3bf7 - unknownmusic0xde $a - sound $7, $e6, $0681 - sound $e, $d5, $06c1 - sound $4, $c4, $06b1 - sound $4, $d4, $06a1 - sound $8, $c1, $0691 - endchannel -; f3c0e - -Cry_1B_Ch8: ; f3c0e - noise $a, $a6, $3c - noise $e, $94, $2c - noise $5, $a3, $3c - noise $8, $91, $2c - endchannel -; f3c1b - -Cry_12_Ch5: ; f3c1b - unknownmusic0xde $a5 - sound $c, $f2, $0440 - sound $f, $e3, $04a0 - sound $4, $d2, $0490 - sound $8, $d1, $0480 - endchannel -; f3c2e - -Cry_12_Ch6: ; f3c2e - unknownmusic0xde $ee - sound $b, $d2, $0438 - sound $e, $c6, $0498 - sound $3, $b2, $0488 - sound $8, $b1, $0478 - endchannel -; f3c41 - -Cry_12_Ch8: ; f3c41 - noise $a, $e6, $6c - noise $f, $d2, $5c - noise $3, $c2, $6c - noise $8, $d1, $5c - endchannel -; f3c4e - -Cry_13_Ch5: ; f3c4e - unknownmusic0xde $33 - sound $f, $f6, $05c0 - sound $8, $e3, $05bc - sound $6, $d2, $05d0 - sound $6, $b2, $05e0 - sound $6, $c2, $05f0 - sound $8, $b1, $0600 - endchannel -; f3c69 - -Cry_13_Ch6: ; f3c69 - unknownmusic0xde $99 - sound $e, $c6, $04b1 - sound $7, $c3, $04ad - sound $5, $b2, $04c1 - sound $8, $92, $04d1 - sound $6, $a2, $04e1 - sound $8, $91, $04f1 - endchannel -; f3c84 - -Cry_13_Ch8: ; f3c84 - noise $a, $e6, $5c - noise $a, $d6, $6c - noise $4, $c2, $4c - noise $6, $d3, $5c - noise $8, $b3, $4c - noise $8, $a1, $5c - endchannel -; f3c97 - -Cry_14_Ch5: ; f3c97 - unknownmusic0xde $f0 - sound $8, $e4, $0790 - sound $f, $f5, $07c0 - sound $8, $d1, $07d8 - endchannel -; f3ca6 - -Cry_14_Ch6: ; f3ca6 - unknownmusic0xde $a5 - sound $a, $c4, $0771 - sound $f, $b6, $07a2 - sound $8, $a1, $07b7 - endchannel -; f3cb5 - -Cry_14_Ch8: ; f3cb5 - noise $8, $e4, $4c - noise $e, $c4, $3c - noise $8, $d1, $2c - endchannel -; f3cbf - -Cry_1E_Ch5: ; f3cbf - unknownmusic0xde $f0 - sound $6, $f2, $0600 - sound $6, $e2, $0640 - sound $6, $d2, $0680 - sound $6, $e2, $06c0 - sound $6, $d2, $0700 - sound $6, $c2, $0740 - sound $6, $b2, $0780 - sound $8, $a1, $07c0 - endchannel -; f3ce2 - -Cry_1E_Ch6: ; f3ce2 - unknownmusic0xde $11 - sound $3, $8, $0001 - sound $6, $c2, $05c1 - sound $6, $b2, $0602 - sound $6, $a2, $0641 - sound $6, $b2, $0682 - sound $6, $a2, $06c2 - sound $6, $92, $0701 - sound $6, $a2, $0742 - sound $8, $81, $0781 - endchannel -; f3d09 - -Cry_1E_Ch8: ; f3d09 - noise $6, $8, $1 - noise $5, $e2, $5c - noise $5, $c2, $4c - noise $5, $d2, $3c - noise $5, $b2, $2c - noise $5, $c2, $1c - noise $5, $a2, $1b - noise $5, $92, $1a - noise $8, $81, $18 - endchannel -; f3d25 - -Cry_15_Ch5: ; f3d25 - unknownmusic0xde $f0 - sound $4, $f3, $0780 - sound $f, $e7, $0700 - sound $8, $d3, $0710 - sound $4, $c2, $0700 - sound $4, $d2, $06f0 - sound $8, $c1, $06e0 - endchannel -; f3d40 - -Cry_15_Ch6: ; f3d40 - unknownmusic0xde $5a - sound $6, $c3, $0701 - sound $e, $b7, $0681 - sound $7, $b3, $0692 - sound $3, $a2, $0681 - sound $4, $b2, $0672 - sound $8, $a1, $0661 - endchannel -; f3d5b - -Cry_15_Ch8: ; f3d5b - noise $6, $e3, $5c - noise $e, $d6, $4c - noise $6, $c6, $3c - noise $3, $b3, $4c - noise $3, $a2, $5c - noise $8, $b1, $6c - endchannel -; f3d6e - -Cry_17_Ch5: ; f3d6e - unknownmusic0xde $f - sound $f, $f7, $0500 - sound $f, $e7, $0508 - sound $8, $b4, $0480 - sound $f, $a2, $0460 - endchannel -; f3d81 - -Cry_17_Ch6: ; f3d81 - unknownmusic0xde $44 - sound $e, $d7, $0481 - sound $e, $c7, $0489 - sound $a, $b4, $0401 - sound $f, $c2, $03e1 - endchannel -; f3d94 - -Cry_17_Ch8: ; f3d94 - noise $e, $f7, $7c - noise $c, $f6, $6c - noise $9, $e4, $7c - noise $f, $e2, $6c - endchannel -; f3da1 - -Cry_1C_Ch5: ; f3da1 - unknownmusic0xde $f5 - sound $7, $d6, $07e1 - sound $6, $c6, $07e2 - sound $9, $d6, $07e1 - sound $7, $c6, $07e0 - sound $5, $b6, $07e2 - sound $7, $c6, $07e1 - sound $6, $b6, $07e0 - sound $8, $a1, $07df - endchannel -; f3dc4 - -Cry_1C_Ch6: ; f3dc4 - unknownmusic0xde $44 - sound $6, $c3, $07c9 - sound $6, $b3, $07c7 - sound $a, $c4, $07c3 - sound $8, $b4, $07c7 - sound $6, $c3, $07c9 - sound $f, $a2, $07c5 - endchannel -; f3ddf - -Cry_1C_Ch8: ; f3ddf - noise $d, $19, $7c - noise $d, $f7, $8c - noise $c, $d6, $7c - noise $8, $c4, $6c - noise $f, $b3, $5c - endchannel -; f3def - -Cry_1A_Ch5: ; f3def - unknownmusic0xde $f0 - sound $6, $f7, $0740 - sound $c, $e6, $0744 - sound $6, $d5, $0750 - sound $4, $c3, $0760 - sound $3, $c3, $0780 - sound $8, $d1, $07a0 - endchannel -; f3e0a - -Cry_1A_Ch6: ; f3e0a - unknownmusic0xde $a - sound $6, $c7, $0701 - sound $b, $b6, $0702 - sound $6, $a5, $0711 - sound $4, $93, $0721 - sound $3, $a3, $0741 - sound $8, $91, $0762 - endchannel -; f3e25 - -Cry_1A_Ch8: ; f3e25 - noise $3, $e2, $3c - noise $8, $d6, $4c - noise $5, $d4, $3c - noise $c, $c7, $4c - noise $2, $e2, $3c - noise $8, $d1, $2c - endchannel -; f3e38 - -Cry_1D_Ch5: ; f3e38 - unknownmusic0xde $f4 - sound $f, $f0, $0705 - sound $a, $e0, $0700 - sound $6, $b4, $0710 - sound $4, $d3, $0700 - sound $6, $b2, $0620 - sound $8, $a1, $0624 - endchannel -; f3e53 - -Cry_1D_Ch6: ; f3e53 - unknownmusic0xde $22 - sound $f, $b0, $06c3 - sound $a, $a0, $06c1 - sound $6, $84, $06d2 - sound $4, $93, $06c1 - sound $6, $82, $05e1 - sound $8, $61, $05e8 - endchannel -; f3e6e - -Cry_1D_Ch8: ; f3e6e - noise $6, $e6, $4c - noise $f, $d6, $3c - noise $a, $c5, $4a - noise $1, $b2, $5b - noise $f, $c2, $4c - endchannel -; f3e7e - -Cry_18_Ch5: ; f3e7e - unknownmusic0xde $50 - sound $a, $f5, $0680 - sound $3, $e2, $06a0 - sound $3, $f2, $06c0 - sound $3, $e2, $06e0 - sound $3, $d2, $0700 - sound $3, $c2, $06e0 - sound $3, $d2, $06c0 - sound $8, $c1, $06a0 - endchannel -; f3ea1 - -Cry_18_Ch6: ; f3ea1 - unknownmusic0xde $f - sound $9, $d5, $0631 - sound $3, $d2, $0652 - sound $3, $e2, $0671 - sound $3, $b2, $0691 - sound $3, $c2, $06b2 - sound $3, $b2, $0691 - sound $3, $c2, $0671 - sound $8, $b1, $0651 - endchannel -; f3ec4 - -Cry_18_Ch8: ; f3ec4 - noise $6, $e3, $4c - noise $4, $c3, $3c - noise $5, $d4, $3c - noise $4, $c4, $2c - noise $6, $b4, $3c - noise $8, $c1, $2c - endchannel -; f3ed7 - -Cry_1F_Ch5: ; f3ed7 - unknownmusic0xde $a5 - sound $3, $f4, $0641 - sound $d, $d6, $0721 - sound $8, $f4, $0719 - sound $8, $c1, $071a - endchannel -; f3eea - -Cry_1F_Ch6: ; f3eea - unknownmusic0xde $cc - sound $4, $f4, $0580 - sound $e, $e6, $06e0 - sound $8, $d5, $06d8 - sound $8, $d1, $06dc - endchannel -; f3efd - -Cry_1F_Ch8: ; f3efd - noise $5, $c4, $46 - noise $d, $a5, $44 - noise $8, $c4, $45 - noise $8, $b1, $44 - endchannel -; f3f0a - -Cry_20_Ch5: ; f3f0a - unknownmusic0xde $f0 - sound $d, $f1, $0511 - sound $d, $e1, $0515 - sound $d, $e1, $0511 - sound $8, $d1, $0511 - endchannel -; f3f1d - -Cry_20_Ch6: ; f3f1d - unknownmusic0xde $15 - sound $c, $e1, $050c - sound $c, $d1, $0510 - sound $e, $c1, $050c - sound $8, $c1, $050a - endchannel -; f3f30 - -Cry_20_Ch8: ; f3f30 - noise $e, $f2, $65 - noise $d, $e2, $55 - noise $e, $d2, $56 - noise $8, $d1, $66 - endchannel -; f3f3d - -Cry_21_Ch5: ; f3f3d - unknownmusic0xde $1b - sound $3, $f3, $0564 - sound $2, $e2, $0544 - sound $5, $d1, $0522 - sound $2, $b2, $0484 - sound $8, $d1, $04a2 - sound $3, $f3, $0524 - sound $4, $e4, $04e4 - sound $8, $d1, $0502 - endchannel -; f3f60 - -Cry_21_Ch6: ; f3f60 - unknownmusic0xde $cc - sound $3, $d3, $0560 - sound $2, $c2, $0540 - sound $5, $c1, $0520 - sound $2, $92, $0480 - sound $8, $c1, $04a0 - sound $3, $d3, $0520 - sound $3, $c4, $04e0 - sound $8, $c1, $0500 -Cry_21_Ch8: ; f3f82 - endchannel -; f3f83 - -Cry_22_Ch5: ; f3f83 - unknownmusic0xde $11 - sound $2, $3d, $0381 - sound $7, $f5, $0601 - sound $1, $c2, $0481 - sound $8, $91, $0381 - endchannel -; f3f96 - -Cry_22_Ch6: ; f3f96 - unknownmusic0xde $ee - sound $2, $3e, $05b0 - sound $7, $d5, $075d - sound $1, $b2, $06b0 - sound $8, $61, $05b0 - endchannel -; f3fa9 - -Cry_22_Ch8: ; f3fa9 - noise $2, $92, $49 - noise $7, $b5, $29 - noise $1, $a2, $39 - noise $8, $91, $49 - endchannel -; f3fb6 + +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 + +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 + +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 + +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 + +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 + +Cry_Nidoran_M: + musicheader 3, 5, Cry_Nidoran_M_Ch5 + musicheader 1, 6, Cry_Nidoran_M_Ch6 + musicheader 1, 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 + +Cry_Slowpoke: + musicheader 3, 5, Cry_Slowpoke_Ch5 + musicheader 1, 6, Cry_Slowpoke_Ch6 + musicheader 1, 8, Cry_Slowpoke_Ch8 + +Cry_Kangaskhan: + musicheader 3, 5, Cry_Kangaskhan_Ch5 + musicheader 1, 6, Cry_Kangaskhan_Ch6 + musicheader 1, 8, Cry_Kangaskhan_Ch8 + +Cry_Charmander: + musicheader 3, 5, Cry_Charmander_Ch5 + musicheader 1, 6, Cry_Charmander_Ch6 + musicheader 1, 8, Cry_Charmander_Ch8 + +Cry_Grimer: + musicheader 3, 5, Cry_Grimer_Ch5 + musicheader 1, 6, Cry_Grimer_Ch6 + musicheader 1, 8, Cry_Grimer_Ch8 + +Cry_Voltorb: + musicheader 3, 5, Cry_Voltorb_Ch5 + musicheader 1, 6, Cry_Voltorb_Ch6 + musicheader 1, 8, Cry_Voltorb_Ch8 + +Cry_Muk: + musicheader 3, 5, Cry_Muk_Ch5 + musicheader 1, 6, Cry_Muk_Ch6 + musicheader 1, 8, Cry_Muk_Ch8 + +Cry_Oddish: + musicheader 3, 5, Cry_Oddish_Ch5 + musicheader 1, 6, Cry_Oddish_Ch6 + musicheader 1, 8, Cry_Oddish_Ch8 + +Cry_Raichu: + musicheader 3, 5, Cry_Raichu_Ch5 + musicheader 1, 6, Cry_Raichu_Ch6 + musicheader 1, 8, Cry_Raichu_Ch8 + +Cry_Nidoqueen: + musicheader 3, 5, Cry_Nidoqueen_Ch5 + musicheader 1, 6, Cry_Nidoqueen_Ch6 + musicheader 1, 8, Cry_Nidoqueen_Ch8 + +Cry_Diglett: + musicheader 3, 5, Cry_Diglett_Ch5 + musicheader 1, 6, Cry_Diglett_Ch6 + musicheader 1, 8, Cry_Diglett_Ch8 + +Cry_Seel: + musicheader 3, 5, Cry_Seel_Ch5 + musicheader 1, 6, Cry_Seel_Ch6 + musicheader 1, 8, Cry_Seel_Ch8 + +Cry_Drowzee: + musicheader 3, 5, Cry_Drowzee_Ch5 + musicheader 1, 6, Cry_Drowzee_Ch6 + musicheader 1, 8, Cry_Drowzee_Ch8 + +Cry_Pidgey: + musicheader 3, 5, Cry_Pidgey_Ch5 + musicheader 1, 6, Cry_Pidgey_Ch6 + musicheader 1, 8, Cry_Pidgey_Ch8 + +Cry_Bulbasaur: + musicheader 3, 5, Cry_Bulbasaur_Ch5 + musicheader 1, 6, Cry_Bulbasaur_Ch6 + musicheader 1, 8, Cry_Bulbasaur_Ch8 + +Cry_Spearow: + musicheader 3, 5, Cry_Spearow_Ch5 + musicheader 1, 6, Cry_Spearow_Ch6 + musicheader 1, 8, Cry_Spearow_Ch8 + +Cry_Rhydon: + musicheader 3, 5, Cry_Rhydon_Ch5 + musicheader 1, 6, Cry_Rhydon_Ch6 + musicheader 1, 8, Cry_Rhydon_Ch8 + +Cry_Golem: + musicheader 3, 5, Cry_Golem_Ch5 + musicheader 1, 6, Cry_Golem_Ch6 + musicheader 1, 8, Cry_Golem_Ch8 + +Cry_Blastoise: + musicheader 3, 5, Cry_Blastoise_Ch5 + musicheader 1, 6, Cry_Blastoise_Ch6 + musicheader 1, 8, Cry_Blastoise_Ch8 + +Cry_Pidgeotto: + musicheader 3, 5, Cry_Pidgeotto_Ch5 + musicheader 1, 6, Cry_Pidgeotto_Ch6 + musicheader 1, 8, Cry_Pidgeotto_Ch8 + +Cry_Weedle: + musicheader 3, 5, Cry_Weedle_Ch5 + musicheader 1, 6, Cry_Weedle_Ch6 + musicheader 1, 8, Cry_Weedle_Ch8 + +Cry_Caterpie: + musicheader 3, 5, Cry_Caterpie_Ch5 + musicheader 1, 6, Cry_Caterpie_Ch6 + musicheader 1, 8, Cry_Caterpie_Ch8 + +Cry_Ekans: + musicheader 3, 5, Cry_Ekans_Ch5 + musicheader 1, 6, Cry_Ekans_Ch6 + musicheader 1, 8, Cry_Ekans_Ch8 + +Cry_Fearow: + musicheader 3, 5, Cry_Fearow_Ch5 + musicheader 1, 6, Cry_Fearow_Ch6 + musicheader 1, 8, Cry_Fearow_Ch8 + +Cry_Clefairy: + musicheader 3, 5, Cry_Clefairy_Ch5 + musicheader 1, 6, Cry_Clefairy_Ch6 + musicheader 1, 8, Cry_Clefairy_Ch8 + +Cry_Venonat: + musicheader 3, 5, Cry_Venonat_Ch5 + musicheader 1, 6, Cry_Venonat_Ch6 + musicheader 1, 8, Cry_Venonat_Ch8 + +Cry_Lapras: + musicheader 3, 5, Cry_Lapras_Ch5 + musicheader 1, 6, Cry_Lapras_Ch6 + musicheader 1, 8, Cry_Lapras_Ch8 + +Cry_Metapod: + musicheader 3, 5, Cry_Metapod_Ch5 + musicheader 1, 6, Cry_Metapod_Ch6 + musicheader 1, 8, Cry_Metapod_Ch8 + +Cry_Squirtle: + musicheader 3, 5, Cry_Squirtle_Ch5 + musicheader 1, 6, Cry_Squirtle_Ch6 + musicheader 1, 8, Cry_Squirtle_Ch8 + +Cry_Paras: + musicheader 3, 5, Cry_Paras_Ch5 + musicheader 1, 6, Cry_Paras_Ch6 + musicheader 1, 8, Cry_Paras_Ch8 + +Cry_Growlithe: + musicheader 3, 5, Cry_Growlithe_Ch5 + musicheader 1, 6, Cry_Growlithe_Ch6 + musicheader 1, 8, Cry_Growlithe_Ch8 + +Cry_Krabby: + musicheader 3, 5, Cry_Krabby_Ch5 + musicheader 1, 6, Cry_Krabby_Ch6 + musicheader 1, 8, Cry_Krabby_Ch8 + +Cry_Psyduck: + musicheader 3, 5, Cry_Psyduck_Ch5 + musicheader 1, 6, Cry_Psyduck_Ch6 + musicheader 1, 8, Cry_Psyduck_Ch8 + +Cry_Rattata: + musicheader 3, 5, Cry_Rattata_Ch5 + musicheader 1, 6, Cry_Rattata_Ch6 + musicheader 1, 8, Cry_Rattata_Ch8 + +Cry_Vileplume: + musicheader 3, 5, Cry_Vileplume_Ch5 + musicheader 1, 6, Cry_Vileplume_Ch6 + musicheader 1, 8, Cry_Vileplume_Ch8 + +Cry_Vulpix: + musicheader 3, 5, Cry_Vulpix_Ch5 + musicheader 1, 6, Cry_Vulpix_Ch6 + musicheader 1, 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 + +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 + +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 + +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 + +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 + +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 + +Cry_Vileplume_Ch8: + noise __, 4, $f2, $3c + noise __, 14, $e6, $2c + noise __, 16, $d7, $3c + noise __, 9, $c1, $2c + endchannel + +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 + +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 + +Cry_Vulpix_Ch8: + noise __, 16, $e4, $3c + noise __, 11, $c7, $4c + noise __, 11, $c7, $3c + noise __, 13, $b7, $4c + noise __, 16, $a2, $5c + endchannel + +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 + +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 + +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 + +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 + +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 + +Cry_Weepinbell_Ch8: + noise __, 9, $d6, $2c + noise __, 13, $c6, $3c + noise __, 11, $b6, $2c + noise __, 9, $91, $1c + endchannel + +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 + +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 + +Cry_Kangaskhan_Ch8: + noise __, 13, $e4, $4c + noise __, 11, $c7, $5c + noise __, 13, $b6, $4c + noise __, 16, $a2, $5c + endchannel + +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 + +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 + +Cry_Bulbasaur_Ch8: + noise __, 4, $e4, $3c + noise __, 13, $d6, $2c + noise __, 5, $e4, $3c + noise __, 9, $b7, $5c + noise __, 16, $c2, $5d + endchannel + +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 + +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 + +Cry_Spearow_Ch8: + noise __, 5, $74, $21 + noise __, 5, $74, $10 + noise __, 5, $71, $20 + endchannel + +Cry_Nidoran_M_Ch5: + sound_duty 1, 1, 3, 3 + sound __, 5, $f3, $0718 + sound __, 16, $e5, $0798 + sound __, 9, $91, $0758 + endchannel + +Cry_Nidoran_M_Ch6: + sound_duty 0, 0, 2, 2 + sound __, 6, $b3, $0708 + sound __, 16, $c5, $0788 + sound __, 9, $71, $0748 + endchannel + +Cry_Nidoran_M_Ch8: + noise __, 4, $a1, $1c + noise __, 15, $94, $2c + noise __, 9, $81, $1c + endchannel + +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 + +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 + +Cry_Pidgey_Ch8: + noise __, 3, $61, $32 + noise __, 3, $61, $21 + noise __, 9, $61, $11 + endchannel + +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 +Cry_Voltorb_Ch6: + endchannel + +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 + +Cry_Muk_Ch5: + sound_duty 0, 0, 3, 3 + sound __, 5, $f3, $06e0 + sound __, 16, $e4, $0640 + sound __, 9, $c1, $0620 + endchannel + +Cry_Muk_Ch6: + sound_duty 2, 2, 0, 0 + sound __, 4, $c3, $0683 + sound __, 15, $b4, $0602 + sound __, 9, $a1, $0601 + endchannel + +Cry_Muk_Ch8: + noise __, 5, $d3, $5c + noise __, 16, $e6, $4c + noise __, 9, $b1, $5c + endchannel + +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 + +Cry_Grimer_Ch6: + sound_duty 1, 1, 3, 3 + sound __, 7, $e2, $0482 + sound __, 7, $d3, $0501 + sound __, 7, $b2, $04e2 + sound __, 9, $81, $04c1 +Cry_Grimer_Ch8: + endchannel + +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 + +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 + +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 + +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 + +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 +Cry_Seel_Ch8: + endchannel + +Cry_Slowpoke_Ch5: + sound_duty 0, 0, 0, 0 + sound __, 9, $f5, $0480 + sound __, 3, $e1, $05e0 + sound __, 9, $d1, $05dc + endchannel + +Cry_Slowpoke_Ch6: + sound_duty 1, 1, 2, 2 + sound __, 8, $95, $0441 + sound __, 3, $81, $0521 + sound __, 9, $61, $051a +Cry_Slowpoke_Ch8: + endchannel + +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 + +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 + +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 + +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 + +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 + +Cry_Nidoran_F_Ch8: + noise __, 4, $a2, $3c + noise __, 13, $94, $2c + noise __, 4, $82, $1c + noise __, 9, $71, $2c + endchannel + +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 + +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 + +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 + +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 + +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 + +Cry_Oddish_Ch8: + noise __, 13, $e6, $4c + noise __, 12, $d7, $5c + noise __, 16, $c2, $4c + endchannel + +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 + +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 + +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 + +Cry_Clefairy_Ch5: + sound_duty 3, 2, 1, 0 + sound __, 8, $d2, $0740 + sound __, 16, $e5, $0760 + sound C_, 9, $c1, $0730 + endchannel + +Cry_Clefairy_Ch6: + sound_duty 1, 0, 0, 2 + sound __, 3, $c2, $0701 + sound __, 5, $c2, $0708 + sound __, 16, $d7, $0741 + sound C_, 9, $a2, $0701 +Cry_Clefairy_Ch8: + endchannel + +Cry_Caterpie_Ch5: + sound_duty 0, 0, 3, 3 + sound __, 16, $d7, $0780 + sound __, 5, $e6, $07a0 + sound __, 16, $d2, $0740 + endchannel + +Cry_Caterpie_Ch6: + sound_duty 2, 2, 1, 1 + sound __, 16, $c7, $0753 + sound __, 6, $b6, $0772 + sound __, 16, $c2, $0711 + endchannel + +Cry_Caterpie_Ch8: + noise __, 14, $f6, $4c + noise __, 5, $e6, $3c + noise __, 16, $f2, $4c + endchannel + +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 + +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 + +Cry_Lapras_Ch8: + noise __, 11, $a6, $3c + noise __, 15, $94, $2c + noise __, 6, $a3, $3c + noise __, 9, $91, $2c + endchannel + +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 + +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 + +Cry_Golem_Ch8: + noise __, 11, $e6, $6c + noise __, 16, $d2, $5c + noise __, 4, $c2, $6c + noise __, 9, $d1, $5c + endchannel + +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 + +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 + +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 + +Cry_Pidgeotto_Ch5: + sound_duty 0, 0, 3, 3 + sound __, 9, $e4, $0790 + sound __, 16, $f5, $07c0 + sound __, 9, $d1, $07d8 + endchannel + +Cry_Pidgeotto_Ch6: + sound_duty 1, 1, 2, 2 + sound __, 11, $c4, $0771 + sound __, 16, $b6, $07a2 + sound __, 9, $a1, $07b7 + endchannel + +Cry_Pidgeotto_Ch8: + noise __, 9, $e4, $4c + noise __, 15, $c4, $3c + noise __, 9, $d1, $2c + endchannel + +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 + +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 + +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 + +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 + +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 + +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 + +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 + +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 + +Cry_Ekans_Ch8: + noise __, 15, $f7, $7c + noise __, 13, $f6, $6c + noise __, 10, $e4, $7c + noise __, 16, $e2, $6c + endchannel + +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 + +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 + +Cry_Metapod_Ch8: + noise __, 14, $19, $7c + noise __, 14, $f7, $8c + noise __, 13, $d6, $7c + noise __, 9, $c4, $6c + noise __, 16, $b3, $5c + endchannel + +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 + +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 + +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 + +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 + +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 + +Cry_Squirtle_Ch8: + noise __, 7, $e6, $4c + noise __, 16, $d6, $3c + noise __, 11, $c5, $4a + noise __, 2, $b2, $5b + noise __, 16, $c2, $4c + endchannel + +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 + +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 + +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 + +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 + +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 + +Cry_Growlithe_Ch8: + noise __, 6, $c4, $46 + noise __, 14, $a5, $44 + noise __, 9, $c4, $45 + noise __, 9, $b1, $44 + endchannel + +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 + +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 + +Cry_Krabby_Ch8: + noise __, 15, $f2, $65 + noise __, 14, $e2, $55 + noise __, 15, $d2, $56 + noise __, 9, $d1, $66 + endchannel + +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 + +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 +Cry_Psyduck_Ch8: + endchannel + +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 + +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 + +Cry_Rattata_Ch8: + noise __, 3, $92, $49 + noise __, 8, $b5, $29 + noise __, 2, $a2, $39 + noise __, 9, $91, $49 + endchannel diff --git a/crysaudio/cry_constants.asm b/crysaudio/cry_constants.asm new file mode 100644 index 00000000..654aac52 --- /dev/null +++ b/crysaudio/cry_constants.asm @@ -0,0 +1,74 @@ +; Cries indexes (see audio/cry_pointers.asm) + const_def + +; gen 1 + const CRY_NIDORAN_M + const CRY_NIDORAN_F + const CRY_SLOWPOKE + const CRY_KANGASKHAN + const CRY_CHARMANDER + const CRY_GRIMER + const CRY_VOLTORB + const CRY_MUK + const CRY_ODDISH + const CRY_RAICHU + const CRY_NIDOQUEEN + const CRY_DIGLETT + const CRY_SEEL + const CRY_DROWZEE + const CRY_PIDGEY + const CRY_BULBASAUR + const CRY_SPEAROW + const CRY_RHYDON + const CRY_GOLEM + const CRY_BLASTOISE + const CRY_PIDGEOTTO + const CRY_WEEDLE + const CRY_CATERPIE + const CRY_EKANS + const CRY_FEAROW + const CRY_CLEFAIRY + const CRY_VENONAT + const CRY_LAPRAS + const CRY_METAPOD + const CRY_SQUIRTLE + const CRY_PARAS + const CRY_GROWLITHE + const CRY_KRABBY + const CRY_PSYDUCK + const CRY_RATTATA + const CRY_VILEPLUME + const CRY_VULPIX + const CRY_WEEPINBELL + +; gen 2 + const CRY_MARILL + const CRY_SPINARAK + const CRY_TOGEPI + const CRY_GIRAFARIG + const CRY_RAIKOU + const CRY_MAREEP + const CRY_TOGETIC + const CRY_HOOTHOOT + const CRY_SENTRET + const CRY_SLOWKING + const CRY_CYNDAQUIL + const CRY_CHIKORITA + const CRY_TOTODILE + const CRY_GLIGAR + const CRY_CLEFFA + const CRY_SLUGMA + const CRY_LEDYBA + const CRY_ENTEI + const CRY_WOOPER + const CRY_MANTINE + const CRY_TYPHLOSION + const CRY_NATU + const CRY_TEDDIURSA + const CRY_SUNFLORA + const CRY_AMPHAROS + const CRY_MAGCARGO + const CRY_PICHU + const CRY_AIPOM + const CRY_DUNSPARCE + const CRY_DONPHAN diff --git a/crysaudio/cry_headers.asm b/crysaudio/cry_headers.asm index 1a80e143..a57eac98 100644 --- a/crysaudio/cry_headers.asm +++ b/crysaudio/cry_headers.asm @@ -1,1530 +1,262 @@ -BulbasaurCryHeader: ; 0xf2787 - dw $0f ; cry id - db $80 ; pitch - db $00 ; echo - dw $081 ; length - -IvysaurCryHeader: ; 0xf278d - dw $0f ; cry id - db $20 ; pitch - db $00 ; echo - dw $100 ; length - -VenusaurCryHeader: ; 0xf2793 - dw $0f ; cry id - db $00 ; pitch - db $00 ; echo - dw $140 ; length - -CharmanderCryHeader: ; 0xf2799 - dw $04 ; cry id - db $60 ; pitch - db $00 ; echo - dw $0c0 ; length - -CharmeleonCryHeader: ; 0xf279f - dw $04 ; cry id - db $20 ; pitch - db $00 ; echo - dw $0c0 ; length - -CharizardCryHeader: ; 0xf27a5 - dw $04 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -SquirtleCryHeader: ; 0xf27ab - dw $1d ; cry id - db $60 ; pitch - db $00 ; echo - dw $0c0 ; length - -WartortleCryHeader: ; 0xf27b1 - dw $1d ; cry id - db $20 ; pitch - db $00 ; echo - dw $0c0 ; length - -BlastoiseCryHeader: ; 0xf27b7 - dw $13 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -CaterpieCryHeader: ; 0xf27bd - dw $16 ; cry id - db $80 ; pitch - db $00 ; echo - dw $0a0 ; length - -MetapodCryHeader: ; 0xf27c3 - dw $1c ; cry id - db $cc ; pitch - db $00 ; echo - dw $081 ; length - -ButterfreeCryHeader: ; 0xf27c9 - dw $16 ; cry id - db $77 ; pitch - db $00 ; echo - dw $0c0 ; length - -WeedleCryHeader: ; 0xf27cf - dw $15 ; cry id - db $ee ; pitch - db $00 ; echo - dw $081 ; length - -KakunaCryHeader: ; 0xf27d5 - dw $13 ; cry id - db $ff ; pitch - db $00 ; echo - dw $081 ; length - -BeedrillCryHeader: ; 0xf27db - dw $13 ; cry id - db $60 ; pitch - db $00 ; echo - dw $100 ; length - -PidgeyCryHeader: ; 0xf27e1 - dw $0e ; cry id - db $df ; pitch - db $00 ; echo - dw $084 ; length - -PidgeottoCryHeader: ; 0xf27e7 - dw $14 ; cry id - db $28 ; pitch - db $00 ; echo - dw $140 ; length - -PidgeotCryHeader: ; 0xf27ed - dw $14 ; cry id - db $11 ; pitch - db $00 ; echo - dw $17f ; length - -RattataCryHeader: ; 0xf27f3 - dw $22 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -RaticateCryHeader: ; 0xf27f9 - dw $22 ; cry id - db $20 ; pitch - db $00 ; echo - dw $17f ; length - -SpearowCryHeader: ; 0xf27ff - dw $10 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -FearowCryHeader: ; 0xf2805 - dw $18 ; cry id - db $40 ; pitch - db $00 ; echo - dw $120 ; length - -EkansCryHeader: ; 0xf280b - dw $17 ; cry id - db $12 ; pitch - db $00 ; echo - dw $0c0 ; length - -ArbokCryHeader: ; 0xf2811 - dw $17 ; cry id - db $e0 ; pitch - db $00 ; echo - dw $090 ; length - -PikachuCryHeader: ; 0xf2817 - dw $0f ; cry id - db $ee ; pitch - db $00 ; echo - dw $081 ; length - -RaichuCryHeader: ; 0xf281d - dw $09 ; cry id - db $ee ; pitch - db $00 ; echo - dw $088 ; length - -SandshrewCryHeader: ; 0xf2823 - dw $00 ; cry id - db $20 ; pitch - db $00 ; echo - dw $0c0 ; length - -SandslashCryHeader: ; 0xf2829 - dw $00 ; cry id - db $ff ; pitch - db $00 ; echo - dw $17f ; length - -NidoranFCryHeader: ; 0xf282f - dw $01 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -NidorinaCryHeader: ; 0xf2835 - dw $01 ; cry id - db $2c ; pitch - db $00 ; echo - dw $160 ; length - -NidoqueenCryHeader: ; 0xf283b - dw $0a ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -NidoranMCryHeader: ; 0xf2841 - dw $00 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -NidorinoCryHeader: ; 0xf2847 - dw $00 ; cry id - db $2c ; pitch - db $00 ; echo - dw $140 ; length - -NidokingCryHeader: ; 0xf284d - dw $09 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -ClefairyCryHeader: ; 0xf2853 - dw $19 ; cry id - db $cc ; pitch - db $00 ; echo - dw $081 ; length - -ClefableCryHeader: ; 0xf2859 - dw $19 ; cry id - db $aa ; pitch - db $00 ; echo - dw $0a0 ; length - -VulpixCryHeader: ; 0xf285f - dw $24 ; cry id - db $4f ; pitch - db $00 ; echo - dw $090 ; length - -NinetalesCryHeader: ; 0xf2865 - dw $24 ; cry id - db $88 ; pitch - db $00 ; echo - dw $0e0 ; length - -JigglypuffCryHeader: ; 0xf286b - dw $0e ; cry id - db $ff ; pitch - db $00 ; echo - dw $0b5 ; length - -WigglytuffCryHeader: ; 0xf2871 - dw $0e ; cry id - db $68 ; pitch - db $00 ; echo - dw $0e0 ; length - -ZubatCryHeader: ; 0xf2877 - dw $1d ; cry id - db $e0 ; pitch - db $00 ; echo - dw $100 ; length - -GolbatCryHeader: ; 0xf287d - dw $1d ; cry id - db $fa ; pitch - db $00 ; echo - dw $100 ; length - -OddishCryHeader: ; 0xf2883 - dw $08 ; cry id - db $dd ; pitch - db $00 ; echo - dw $081 ; length - -GloomCryHeader: ; 0xf2889 - dw $08 ; cry id - db $aa ; pitch - db $00 ; echo - dw $0c0 ; length - -VileplumeCryHeader: ; 0xf288f - dw $23 ; cry id - db $22 ; pitch - db $00 ; echo - dw $17f ; length - -ParasCryHeader: ; 0xf2895 - dw $1e ; cry id - db $20 ; pitch - db $00 ; echo - dw $160 ; length - -ParasectCryHeader: ; 0xf289b - dw $1e ; cry id - db $42 ; pitch - db $00 ; echo - dw $17f ; length - -VenonatCryHeader: ; 0xf28a1 - dw $1a ; cry id - db $44 ; pitch - db $00 ; echo - dw $0c0 ; length - -VenomothCryHeader: ; 0xf28a7 - dw $1a ; cry id - db $29 ; pitch - db $00 ; echo - dw $100 ; length - -DiglettCryHeader: ; 0xf28ad - dw $0b ; cry id - db $aa ; pitch - db $00 ; echo - dw $081 ; length - -DugtrioCryHeader: ; 0xf28b3 - dw $0b ; cry id - db $2a ; pitch - db $00 ; echo - dw $090 ; length - -MeowthCryHeader: ; 0xf28b9 - dw $19 ; cry id - db $77 ; pitch - db $00 ; echo - dw $090 ; length - -PersianCryHeader: ; 0xf28bf - dw $19 ; cry id - db $99 ; pitch - db $00 ; echo - dw $17f ; length - -PsyduckCryHeader: ; 0xf28c5 - dw $21 ; cry id - db $20 ; pitch - db $00 ; echo - dw $0e0 ; length - -GolduckCryHeader: ; 0xf28cb - dw $21 ; cry id - db $ff ; pitch - db $00 ; echo - dw $0c0 ; length - -MankeyCryHeader: ; 0xf28d1 - dw $0a ; cry id - db $dd ; pitch - db $00 ; echo - dw $0e0 ; length - -PrimeapeCryHeader: ; 0xf28d7 - dw $0a ; cry id - db $af ; pitch - db $00 ; echo - dw $0c0 ; length - -GrowlitheCryHeader: ; 0xf28dd - dw $1f ; cry id - db $20 ; pitch - db $00 ; echo - dw $0c0 ; length - -ArcanineCryHeader: ; 0xf28e3 - dw $15 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -PoliwagCryHeader: ; 0xf28e9 - dw $0e ; cry id - db $ff ; pitch - db $00 ; echo - dw $17f ; length - -PoliwhirlCryHeader: ; 0xf28ef - dw $0e ; cry id - db $77 ; pitch - db $00 ; echo - dw $0e0 ; length - -PoliwrathCryHeader: ; 0xf28f5 - dw $0e ; cry id - db $00 ; pitch - db $00 ; echo - dw $17f ; length - -AbraCryHeader: ; 0xf28fb - dw $1c ; cry id - db $c0 ; pitch - db $00 ; echo - dw $081 ; length - -KadabraCryHeader: ; 0xf2901 - dw $1c ; cry id - db $a8 ; pitch - db $00 ; echo - dw $140 ; length - -AlakazamCryHeader: ; 0xf2907 - dw $1c ; cry id - db $98 ; pitch - db $00 ; echo - dw $17f ; length - -MachopCryHeader: ; 0xf290d - dw $1f ; cry id - db $ee ; pitch - db $00 ; echo - dw $081 ; length - -MachokeCryHeader: ; 0xf2913 - dw $1f ; cry id - db $48 ; pitch - db $00 ; echo - dw $0e0 ; length - -MachampCryHeader: ; 0xf2919 - dw $1f ; cry id - db $08 ; pitch - db $00 ; echo - dw $140 ; length - -BellsproutCryHeader: ; 0xf291f - dw $21 ; cry id - db $55 ; pitch - db $00 ; echo - dw $081 ; length - -WeepinbellCryHeader: ; 0xf2925 - dw $25 ; cry id - db $44 ; pitch - db $00 ; echo - dw $0a0 ; length - -VictreebelCryHeader: ; 0xf292b - dw $25 ; cry id - db $66 ; pitch - db $00 ; echo - dw $14c ; length - -TentacoolCryHeader: ; 0xf2931 - dw $1a ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -TentacruelCryHeader: ; 0xf2937 - dw $1a ; cry id - db $ee ; pitch - db $00 ; echo - dw $17f ; length - -GeodudeCryHeader: ; 0xf293d - dw $24 ; cry id - db $f0 ; pitch - db $00 ; echo - dw $090 ; length - -GravelerCryHeader: ; 0xf2943 - dw $24 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -GolemCryHeader: ; 0xf2949 - dw $12 ; cry id - db $e0 ; pitch - db $00 ; echo - dw $0c0 ; length - -PonytaCryHeader: ; 0xf294f - dw $25 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -RapidashCryHeader: ; 0xf2955 - dw $25 ; cry id - db $20 ; pitch - db $00 ; echo - dw $140 ; length - -SlowpokeCryHeader: ; 0xf295b - dw $02 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -SlowbroCryHeader: ; 0xf2961 - dw $1f ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -MagnemiteCryHeader: ; 0xf2967 - dw $1c ; cry id - db $80 ; pitch - db $00 ; echo - dw $0e0 ; length - -MagnetonCryHeader: ; 0xf296d - dw $1c ; cry id - db $20 ; pitch - db $00 ; echo - dw $140 ; length - -FarfetchDCryHeader: ; 0xf2973 - dw $10 ; cry id - db $dd ; pitch - db $00 ; echo - dw $081 ; length - -DoduoCryHeader: ; 0xf2979 - dw $0b ; cry id - db $bb ; pitch - db $00 ; echo - dw $081 ; length - -DodrioCryHeader: ; 0xf297f - dw $0b ; cry id - db $99 ; pitch - db $00 ; echo - dw $0a0 ; length - -SeelCryHeader: ; 0xf2985 - dw $0c ; cry id - db $88 ; pitch - db $00 ; echo - dw $140 ; length - -DewgongCryHeader: ; 0xf298b - dw $0c ; cry id - db $23 ; pitch - db $00 ; echo - dw $17f ; length - -GrimerCryHeader: ; 0xf2991 - dw $05 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -MukCryHeader: ; 0xf2997 - dw $07 ; cry id - db $ef ; pitch - db $00 ; echo - dw $17f ; length - -ShellderCryHeader: ; 0xf299d - dw $18 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -CloysterCryHeader: ; 0xf29a3 - dw $18 ; cry id - db $6f ; pitch - db $00 ; echo - dw $160 ; length - -GastlyCryHeader: ; 0xf29a9 - dw $1c ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -HaunterCryHeader: ; 0xf29af - dw $1c ; cry id - db $30 ; pitch - db $00 ; echo - dw $0c0 ; length - -GengarCryHeader: ; 0xf29b5 - dw $07 ; cry id - db $00 ; pitch - db $00 ; echo - dw $17f ; length - -OnixCryHeader: ; 0xf29bb - dw $17 ; cry id - db $ff ; pitch - db $00 ; echo - dw $140 ; length - -DrowzeeCryHeader: ; 0xf29c1 - dw $0d ; cry id - db $88 ; pitch - db $00 ; echo - dw $0a0 ; length - -HypnoCryHeader: ; 0xf29c7 - dw $0d ; cry id - db $ee ; pitch - db $00 ; echo - dw $0c0 ; length - -KrabbyCryHeader: ; 0xf29cd - dw $20 ; cry id - db $20 ; pitch - db $00 ; echo - dw $160 ; length - -KinglerCryHeader: ; 0xf29d3 - dw $20 ; cry id - db $ee ; pitch - db $00 ; echo - dw $160 ; length - -VoltorbCryHeader: ; 0xf29d9 - dw $06 ; cry id - db $ed ; pitch - db $00 ; echo - dw $100 ; length - -ElectrodeCryHeader: ; 0xf29df - dw $06 ; cry id - db $a8 ; pitch - db $00 ; echo - dw $110 ; length - -ExeggcuteCryHeader: ; 0xf29e5 - dw $0b ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -ExeggutorCryHeader: ; 0xf29eb - dw $0d ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -CuboneCryHeader: ; 0xf29f1 - dw $19 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -MarowakCryHeader: ; 0xf29f7 - dw $08 ; cry id - db $4f ; pitch - db $00 ; echo - dw $0e0 ; length - -HitmonleeCryHeader: ; 0xf29fd - dw $12 ; cry id - db $80 ; pitch - db $00 ; echo - dw $140 ; length - -HitmonchanCryHeader: ; 0xf2a03 - dw $0c ; cry id - db $ee ; pitch - db $00 ; echo - dw $140 ; length - -LickitungCryHeader: ; 0xf2a09 - dw $0c ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -KoffingCryHeader: ; 0xf2a0f - dw $12 ; cry id - db $e6 ; pitch - db $00 ; echo - dw $15d ; length - -WeezingCryHeader: ; 0xf2a15 - dw $12 ; cry id - db $ff ; pitch - db $00 ; echo - dw $17f ; length - -RhyhornCryHeader: ; 0xf2a1b - dw $04 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -RhydonCryHeader: ; 0xf2a21 - dw $11 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -ChanseyCryHeader: ; 0xf2a27 - dw $14 ; cry id - db $0a ; pitch - db $00 ; echo - dw $140 ; length - -TangelaCryHeader: ; 0xf2a2d - dw $12 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -KangaskhanCryHeader: ; 0xf2a33 - dw $03 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -HorseaCryHeader: ; 0xf2a39 - dw $19 ; cry id - db $99 ; pitch - db $00 ; echo - dw $090 ; length - -SeadraCryHeader: ; 0xf2a3f - dw $19 ; cry id - db $3c ; pitch - db $00 ; echo - dw $081 ; length - -GoldeenCryHeader: ; 0xf2a45 - dw $16 ; cry id - db $80 ; pitch - db $00 ; echo - dw $0c0 ; length - -SeakingCryHeader: ; 0xf2a4b - dw $16 ; cry id - db $10 ; pitch - db $00 ; echo - dw $17f ; length - -StaryuCryHeader: ; 0xf2a51 - dw $1e ; cry id - db $02 ; pitch - db $00 ; echo - dw $0a0 ; length - -StarmieCryHeader: ; 0xf2a57 - dw $1e ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -MrMimeCryHeader: ; 0xf2a5d - dw $20 ; cry id - db $08 ; pitch - db $00 ; echo - dw $0c0 ; length - -ScytherCryHeader: ; 0xf2a63 - dw $16 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -JynxCryHeader: ; 0xf2a69 - dw $0d ; cry id - db $ff ; pitch - db $00 ; echo - dw $17f ; length - -ElectabuzzCryHeader: ; 0xf2a6f - dw $06 ; cry id - db $8f ; pitch - db $00 ; echo - dw $17f ; length - -MagmarCryHeader: ; 0xf2a75 - dw $04 ; cry id - db $ff ; pitch - db $00 ; echo - dw $0b0 ; length - -PinsirCryHeader: ; 0xf2a7b - dw $14 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -TaurosCryHeader: ; 0xf2a81 - dw $1d ; cry id - db $11 ; pitch - db $00 ; echo - dw $0c0 ; length - -MagikarpCryHeader: ; 0xf2a87 - dw $17 ; cry id - db $80 ; pitch - db $00 ; echo - dw $080 ; length - -GyaradosCryHeader: ; 0xf2a8d - dw $17 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -LaprasCryHeader: ; 0xf2a93 - dw $1b ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -DittoCryHeader: ; 0xf2a99 - dw $0e ; cry id - db $ff ; pitch - db $00 ; echo - dw $17f ; length - -EeveeCryHeader: ; 0xf2a9f - dw $1a ; cry id - db $88 ; pitch - db $00 ; echo - dw $0e0 ; length - -VaporeonCryHeader: ; 0xf2aa5 - dw $1a ; cry id - db $aa ; pitch - db $00 ; echo - dw $17f ; length - -JolteonCryHeader: ; 0xf2aab - dw $1a ; cry id - db $3d ; pitch - db $00 ; echo - dw $100 ; length - -FlareonCryHeader: ; 0xf2ab1 - dw $1a ; cry id - db $10 ; pitch - db $00 ; echo - dw $0a0 ; length - -PorygonCryHeader: ; 0xf2ab7 - dw $25 ; cry id - db $aa ; pitch - db $00 ; echo - dw $17f ; length - -OmanyteCryHeader: ; 0xf2abd - dw $1f ; cry id - db $f0 ; pitch - db $00 ; echo - dw $081 ; length - -OmastarCryHeader: ; 0xf2ac3 - dw $1f ; cry id - db $ff ; pitch - db $00 ; echo - dw $0c0 ; length - -KabutoCryHeader: ; 0xf2ac9 - dw $16 ; cry id - db $bb ; pitch - db $00 ; echo - dw $0c0 ; length - -KabutopsCryHeader: ; 0xf2acf - dw $18 ; cry id - db $ee ; pitch - db $00 ; echo - dw $081 ; length - -AerodactylCryHeader: ; 0xf2ad5 - dw $23 ; cry id - db $20 ; pitch - db $00 ; echo - dw $170 ; length - -SnorlaxCryHeader: ; 0xf2adb - dw $05 ; cry id - db $55 ; pitch - db $00 ; echo - dw $081 ; length - -ArticunoCryHeader: ; 0xf2ae1 - dw $09 ; cry id - db $80 ; pitch - db $00 ; echo - dw $0c0 ; length - -ZapdosCryHeader: ; 0xf2ae7 - dw $18 ; cry id - db $ff ; pitch - db $00 ; echo - dw $100 ; length - -MoltresCryHeader: ; 0xf2aed - dw $09 ; cry id - db $f8 ; pitch - db $00 ; echo - dw $0c0 ; length - -DratiniCryHeader: ; 0xf2af3 - dw $0f ; cry id - db $60 ; pitch - db $00 ; echo - dw $0c0 ; length - -DragonairCryHeader: ; 0xf2af9 - dw $0f ; cry id - db $40 ; pitch - db $00 ; echo - dw $100 ; length - -DragoniteCryHeader: ; 0xf2aff - dw $0f ; cry id - db $3c ; pitch - db $00 ; echo - dw $140 ; length - -MewtwoCryHeader: ; 0xf2b05 - dw $1e ; cry id - db $99 ; pitch - db $00 ; echo - dw $17f ; length - -MewCryHeader: ; 0xf2b0b - dw $1e ; cry id - db $ee ; pitch - db $00 ; echo - dw $17f ; length - -ChikoritaCryHeader: ; 0xf2b11 - dw $31 ; cry id - db $f0 ; pitch - db $ff ; echo - dw $0b0 ; length - -BayleefCryHeader: ; 0xf2b17 - dw $31 ; cry id - db $de ; pitch - db $ff ; echo - dw $120 ; length - -MeganiumCryHeader: ; 0xf2b1d - dw $31 ; cry id - db $49 ; pitch - db $ff ; echo - dw $200 ; length - -CyndaquilCryHeader: ; 0xf2b23 - dw $30 ; cry id - db $47 ; pitch - db $03 ; echo - dw $080 ; length - -QuilavaCryHeader: ; 0xf2b29 - dw $30 ; cry id - db $21 ; pitch - db $03 ; echo - dw $120 ; length - -TyphlosionCryHeader: ; 0xf2b2f - dw $3a ; cry id - db $00 ; pitch - db $0f ; echo - dw $0d4 ; length - -TotodileCryHeader: ; 0xf2b35 - dw $32 ; cry id - db $6c ; pitch - db $04 ; echo - dw $0e8 ; length - -CroconawCryHeader: ; 0xf2b3b - dw $32 ; cry id - db $40 ; pitch - db $04 ; echo - dw $110 ; length - -FeraligatrCryHeader: ; 0xf2b41 - dw $32 ; cry id - db $fc ; pitch - db $03 ; echo - dw $180 ; length - -SentretCryHeader: ; 0xf2b47 - dw $2e ; cry id - db $8a ; pitch - db $00 ; echo - dw $0b8 ; length - -FurretCryHeader: ; 0xf2b4d - dw $2e ; cry id - db $6b ; pitch - db $00 ; echo - dw $102 ; length - -HoothootCryHeader: ; 0xf2b53 - dw $2d ; cry id - db $91 ; pitch - db $00 ; echo - dw $0d8 ; length - -NoctowlCryHeader: ; 0xf2b59 - dw $2d ; cry id - db $00 ; pitch - db $00 ; echo - dw $1a0 ; length - -LedybaCryHeader: ; 0xf2b5f - dw $36 ; cry id - db $00 ; pitch - db $00 ; echo - dw $0de ; length - -LedianCryHeader: ; 0xf2b65 - dw $36 ; cry id - db $6a ; pitch - db $ff ; echo - dw $138 ; length - -SpinarakCryHeader: ; 0xf2b6b - dw $27 ; cry id - db $11 ; pitch - db $00 ; echo - dw $200 ; length - -AriadosCryHeader: ; 0xf2b71 - dw $27 ; cry id - db $52 ; pitch - db $ff ; echo - dw $1e2 ; length - -CrobatCryHeader: ; 0xf2b77 - dw $1d ; cry id - db $f0 ; pitch - db $ff ; echo - dw $140 ; length - -ChinchouCryHeader: ; 0xf2b7d - dw $30 ; cry id - db $c9 ; pitch - db $03 ; echo - dw $140 ; length - -LanturnCryHeader: ; 0xf2b83 - dw $30 ; cry id - db $d0 ; pitch - db $02 ; echo - dw $110 ; length - -PichuCryHeader: ; 0xf2b89 - dw $40 ; cry id - db $00 ; pitch - db $00 ; echo - dw $140 ; length - -CleffaCryHeader: ; 0xf2b8f - dw $34 ; cry id - db $61 ; pitch - db $00 ; echo - dw $091 ; length - -IgglybuffCryHeader: ; 0xf2b95 - dw $31 ; cry id - db $e8 ; pitch - db $00 ; echo - dw $0e8 ; length - -TogepiCryHeader: ; 0xf2b9b - dw $28 ; cry id - db $10 ; pitch - db $00 ; echo - dw $100 ; length - -TogeticCryHeader: ; 0xf2ba1 - dw $2c ; cry id - db $3b ; pitch - db $00 ; echo - dw $038 ; length - -NatuCryHeader: ; 0xf2ba7 - dw $3b ; cry id - db $99 ; pitch - db $ff ; echo - dw $100 ; length - -XatuCryHeader: ; 0xf2bad - dw $3b ; cry id - db $59 ; pitch - db $ff ; echo - dw $168 ; length - -MareepCryHeader: ; 0xf2bb3 - dw $2b ; cry id - db $22 ; pitch - db $00 ; echo - dw $0d8 ; length - -FlaaffyCryHeader: ; 0xf2bb9 - dw $2b ; cry id - db $f9 ; pitch - db $ff ; echo - dw $180 ; length - -AmpharosCryHeader: ; 0xf2bbf - dw $3e ; cry id - db $84 ; pitch - db $ff ; echo - dw $0e8 ; length - -BellossomCryHeader: ; 0xf2bc5 - dw $34 ; cry id - db $84 ; pitch - db $00 ; echo - dw $150 ; length - -MarillCryHeader: ; 0xf2bcb - dw $26 ; cry id - db $1b ; pitch - db $01 ; echo - dw $120 ; length - -AzumarillCryHeader: ; 0xf2bd1 - dw $26 ; cry id - db $b6 ; pitch - db $00 ; echo - dw $180 ; length - -SudowoodoCryHeader: ; 0xf2bd7 - dw $34 ; cry id - db $40 ; pitch - db $0f ; echo - dw $180 ; length - -PolitoedCryHeader: ; 0xf2bdd - dw $34 ; cry id - db $5d ; pitch - db $fd ; echo - dw $1c8 ; length - -HoppipCryHeader: ; 0xf2be3 - dw $34 ; cry id - db $3b ; pitch - db $00 ; echo - dw $0c8 ; length - -SkiploomCryHeader: ; 0xf2be9 - dw $34 ; cry id - db $27 ; pitch - db $00 ; echo - dw $138 ; length - -JumpluffCryHeader: ; 0xf2bef - dw $34 ; cry id - db $00 ; pitch - db $00 ; echo - dw $180 ; length - -AipomCryHeader: ; 0xf2bf5 - dw $41 ; cry id - db $af ; pitch - db $ff ; echo - dw $0e8 ; length - -SunkernCryHeader: ; 0xf2bfb - dw $26 ; cry id - db $2b ; pitch - db $01 ; echo - dw $0b8 ; length - -SunfloraCryHeader: ; 0xf2c01 - dw $3d ; cry id - db $e0 ; pitch - db $ff ; echo - dw $180 ; length - -YanmaCryHeader: ; 0xf2c07 - dw $32 ; cry id - db $31 ; pitch - db $00 ; echo - dw $0c8 ; length - -WooperCryHeader: ; 0xf2c0d - dw $38 ; cry id - db $93 ; pitch - db $00 ; echo - dw $0af ; length - -QuagsireCryHeader: ; 0xf2c13 - dw $38 ; cry id - db $3a ; pitch - db $ff ; echo - dw $140 ; length - -EspeonCryHeader: ; 0xf2c19 - dw $41 ; cry id - db $a2 ; pitch - db $00 ; echo - dw $140 ; length - -UmbreonCryHeader: ; 0xf2c1f - dw $1a ; cry id - db $17 ; pitch - db $ff ; echo - dw $0f0 ; length - -MurkrowCryHeader: ; 0xf2c25 - dw $26 ; cry id - db $e1 ; pitch - db $ff ; echo - dw $180 ; length - -SlowkingCryHeader: ; 0xf2c2b - dw $2f ; cry id - db $04 ; pitch - db $01 ; echo - dw $200 ; length - -MisdreavusCryHeader: ; 0xf2c31 - dw $2d ; cry id - db $30 ; pitch - db $01 ; echo - dw $0e8 ; length - -UnownCryHeader: ; 0xf2c37 - dw $2d ; cry id - db $62 ; pitch - db $01 ; echo - dw $100 ; length - -WobbuffetCryHeader: ; 0xf2c3d - dw $3e ; cry id - db $7b ; pitch - db $02 ; echo - dw $144 ; length - -GirafarigCryHeader: ; 0xf2c43 - dw $29 ; cry id - db $41 ; pitch - db $00 ; echo - dw $200 ; length - -PinecoCryHeader: ; 0xf2c49 - dw $2f ; cry id - db $80 ; pitch - db $00 ; echo - dw $100 ; length - -ForretressCryHeader: ; 0xf2c4f - dw $2f ; cry id - db $00 ; pitch - db $00 ; echo - dw $180 ; length - -DunsparceCryHeader: ; 0xf2c55 - dw $42 ; cry id - db $c4 ; pitch - db $01 ; echo - dw $100 ; length - -GligarCryHeader: ; 0xf2c5b - dw $33 ; cry id - db $fe ; pitch - db $fe ; echo - dw $100 ; length - -SteelixCryHeader: ; 0xf2c61 - dw $3a ; cry id - db $ef ; pitch - db $00 ; echo - dw $0f7 ; length - -SnubbullCryHeader: ; 0xf2c67 - dw $42 ; cry id - db $12 ; pitch - db $01 ; echo - dw $0e8 ; length - -GranbullCryHeader: ; 0xf2c6d - dw $42 ; cry id - db $00 ; pitch - db $00 ; echo - dw $180 ; length - -QwilfishCryHeader: ; 0xf2c73 - dw $2f ; cry id - db $60 ; pitch - db $01 ; echo - dw $0e0 ; length - -ScizorCryHeader: ; 0xf2c79 - dw $3e ; cry id - db $00 ; pitch - db $00 ; echo - dw $160 ; length - -ShuckleCryHeader: ; 0xf2c7f - dw $42 ; cry id - db $90 ; pitch - db $02 ; echo - dw $0a8 ; length - -HeracrossCryHeader: ; 0xf2c85 - dw $3e ; cry id - db $35 ; pitch - db $00 ; echo - dw $0e0 ; length - -SneaselCryHeader: ; 0xf2c8b - dw $38 ; cry id - db $53 ; pitch - db $00 ; echo - dw $0af ; length - -TeddiursaCryHeader: ; 0xf2c91 - dw $3c ; cry id - db $a2 ; pitch - db $07 ; echo - dw $06e ; length - -UrsaringCryHeader: ; 0xf2c97 - dw $3c ; cry id - db $40 ; pitch - db $06 ; echo - dw $0d8 ; length - -SlugmaCryHeader: ; 0xf2c9d - dw $35 ; cry id - db $28 ; pitch - db $fe ; echo - dw $140 ; length - -MagcargoCryHeader: ; 0xf2ca3 - dw $3f ; cry id - db $f3 ; pitch - db $fd ; echo - dw $1c0 ; length - -SwinubCryHeader: ; 0xf2ca9 - dw $30 ; cry id - db $fe ; pitch - db $01 ; echo - dw $140 ; length - -PiloswineCryHeader: ; 0xf2caf - dw $3f ; cry id - db $f7 ; pitch - db $fe ; echo - dw $100 ; length - -CorsolaCryHeader: ; 0xf2cb5 - dw $3f ; cry id - db $a1 ; pitch - db $00 ; echo - dw $0e8 ; length - -RemoraidCryHeader: ; 0xf2cbb - dw $3d ; cry id - db $0d ; pitch - db $00 ; echo - dw $100 ; length - -OctilleryCryHeader: ; 0xf2cc1 - dw $32 ; cry id - db $00 ; pitch - db $00 ; echo - dw $180 ; length - -DelibirdCryHeader: ; 0xf2cc7 - dw $3c ; cry id - db $02 ; pitch - db $00 ; echo - dw $06a ; length - -MantineCryHeader: ; 0xf2ccd - dw $39 ; cry id - db $42 ; pitch - db $ff ; echo - dw $0f0 ; length - -SkarmoryCryHeader: ; 0xf2cd3 - dw $3e ; cry id - db $a9 ; pitch - db $08 ; echo - dw $180 ; length - -HoundourCryHeader: ; 0xf2cd9 - dw $30 ; cry id - db $39 ; pitch - db $00 ; echo - dw $140 ; length - -HoundoomCryHeader: ; 0xf2cdf - dw $32 ; cry id - db $f6 ; pitch - db $fe ; echo - dw $100 ; length - -KingdraCryHeader: ; 0xf2ce5 - dw $35 ; cry id - db $fb ; pitch - db $02 ; echo - dw $100 ; length - -PhanpyCryHeader: ; 0xf2ceb - dw $2e ; cry id - db $48 ; pitch - db $00 ; echo - dw $230 ; length - -DonphanCryHeader: ; 0xf2cf1 - dw $43 ; cry id - db $00 ; pitch - db $00 ; echo - dw $1a0 ; length - -Porygon2CryHeader: ; 0xf2cf7 - dw $29 ; cry id - db $73 ; pitch - db $00 ; echo - dw $240 ; length - -StantlerCryHeader: ; 0xf2cfd - dw $41 ; cry id - db $a0 ; pitch - db $fe ; echo - dw $180 ; length - -SmeargleCryHeader: ; 0xf2d03 - dw $40 ; cry id - db $e6 ; pitch - db $fd ; echo - dw $1f0 ; length - -TyrogueCryHeader: ; 0xf2d09 - dw $41 ; cry id - db $2c ; pitch - db $00 ; echo - dw $108 ; length - -HitmontopCryHeader: ; 0xf2d0f - dw $35 ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -SmoochumCryHeader: ; 0xf2d15 - dw $26 ; cry id - db $68 ; pitch - db $00 ; echo - dw $100 ; length - -ElekidCryHeader: ; 0xf2d1b - dw $3d ; cry id - db $28 ; pitch - db $fd ; echo - dw $0b4 ; length - -MagbyCryHeader: ; 0xf2d21 - dw $3c ; cry id - db $76 ; pitch - db $01 ; echo - dw $03a ; length - -MiltankCryHeader: ; 0xf2d27 - dw $33 ; cry id - db $33 ; pitch - db $fe ; echo - dw $1a0 ; length - -BlisseyCryHeader: ; 0xf2d2d - dw $2f ; cry id - db $93 ; pitch - db $02 ; echo - dw $140 ; length - -RaikouCryHeader: ; 0xf2d33 - dw $2a ; cry id - db $2e ; pitch - db $02 ; echo - dw $120 ; length - -EnteiCryHeader: ; 0xf2d39 - dw $37 ; cry id - db $00 ; pitch - db $00 ; echo - dw $1a0 ; length - -SuicuneCryHeader: ; 0xf2d3f - dw $3f ; cry id - db $00 ; pitch - db $00 ; echo - dw $180 ; length - -LarvitarCryHeader: ; 0xf2d45 - dw $2a ; cry id - db $5f ; pitch - db $00 ; echo - dw $0d0 ; length - -PupitarCryHeader: ; 0xf2d4b - dw $27 ; cry id - db $25 ; pitch - db $fe ; echo - dw $150 ; length - -TyranitarCryHeader: ; 0xf2d51 - dw $2a ; cry id - db $00 ; pitch - db $ff ; echo - dw $180 ; length - -LugiaCryHeader: ; 0xf2d57 - dw $3a ; cry id - db $00 ; pitch - db $00 ; echo - dw $100 ; length - -HoOhCryHeader: ; 0xf2d5d - dw $41 ; cry id - db $00 ; pitch - db $00 ; echo - dw $180 ; length - -CelebiCryHeader: ; 0xf2d63 - dw $37 ; cry id - db $4a ; pitch - db $01 ; echo - dw $111 ; length - -CryHeader252: ; 0xf2d69 - dw 0 ; cry id - db 0 ; pitch - db 0 ; echo - dw 0 ; length - -CryHeader253: ; 0xf2d6f - dw 0 ; cry id - db 0 ; pitch - db 0 ; echo - dw 0 ; length - -CryHeader254: ; 0xf2d75 - dw 0 ; cry id - db 0 ; pitch - db 0 ; echo - dw 0 ; length - -CryHeader255: ; 0xf2d7b - dw 0 ; cry id - db 0 ; pitch - db 0 ; echo - dw 0 ; length - +mon_cry: MACRO +; index, pitch, length + dw \1, \2, \3 +ENDM + +PokemonCries:: +; entries correspond to constants/pokemon_constants.asm + mon_cry CRY_BULBASAUR, $080, $081 ; BULBASAUR + mon_cry CRY_BULBASAUR, $020, $100 ; IVYSAUR + mon_cry CRY_BULBASAUR, $000, $140 ; VENUSAUR + mon_cry CRY_CHARMANDER, $060, $0c0 ; CHARMANDER + mon_cry CRY_CHARMANDER, $020, $0c0 ; CHARMELEON + mon_cry CRY_CHARMANDER, $000, $100 ; CHARIZARD + mon_cry CRY_SQUIRTLE, $060, $0c0 ; SQUIRTLE + mon_cry CRY_SQUIRTLE, $020, $0c0 ; WARTORTLE + mon_cry CRY_BLASTOISE, $000, $100 ; BLASTOISE + mon_cry CRY_CATERPIE, $080, $0a0 ; CATERPIE + mon_cry CRY_METAPOD, $0cc, $081 ; METAPOD + mon_cry CRY_CATERPIE, $077, $0c0 ; BUTTERFREE + mon_cry CRY_WEEDLE, $0ee, $081 ; WEEDLE + mon_cry CRY_BLASTOISE, $0ff, $081 ; KAKUNA + mon_cry CRY_BLASTOISE, $060, $100 ; BEEDRILL + mon_cry CRY_PIDGEY, $0df, $084 ; PIDGEY + mon_cry CRY_PIDGEOTTO, $028, $140 ; PIDGEOTTO + mon_cry CRY_PIDGEOTTO, $011, $17f ; PIDGEOT + mon_cry CRY_RATTATA, $000, $100 ; RATTATA + mon_cry CRY_RATTATA, $020, $17f ; RATICATE + mon_cry CRY_SPEAROW, $000, $100 ; SPEAROW + mon_cry CRY_FEAROW, $040, $120 ; FEAROW + mon_cry CRY_EKANS, $012, $0c0 ; EKANS + mon_cry CRY_EKANS, $0e0, $090 ; ARBOK + mon_cry CRY_BULBASAUR, $0ee, $081 ; PIKACHU + mon_cry CRY_RAICHU, $0ee, $088 ; RAICHU + mon_cry CRY_NIDORAN_M, $020, $0c0 ; SANDSHREW + mon_cry CRY_NIDORAN_M, $0ff, $17f ; SANDSLASH + mon_cry CRY_NIDORAN_F, $000, $100 ; NIDORAN_F + mon_cry CRY_NIDORAN_F, $02c, $160 ; NIDORINA + mon_cry CRY_NIDOQUEEN, $000, $100 ; NIDOQUEEN + mon_cry CRY_NIDORAN_M, $000, $100 ; NIDORAN_M + mon_cry CRY_NIDORAN_M, $02c, $140 ; NIDORINO + mon_cry CRY_RAICHU, $000, $100 ; NIDOKING + mon_cry CRY_CLEFAIRY, $0cc, $081 ; CLEFAIRY + mon_cry CRY_CLEFAIRY, $0aa, $0a0 ; CLEFABLE + mon_cry CRY_VULPIX, $04f, $090 ; VULPIX + mon_cry CRY_VULPIX, $088, $0e0 ; NINETALES + mon_cry CRY_PIDGEY, $0ff, $0b5 ; JIGGLYPUFF + mon_cry CRY_PIDGEY, $068, $0e0 ; WIGGLYTUFF + mon_cry CRY_SQUIRTLE, $0e0, $100 ; ZUBAT + mon_cry CRY_SQUIRTLE, $0fa, $100 ; GOLBAT + mon_cry CRY_ODDISH, $0dd, $081 ; ODDISH + mon_cry CRY_ODDISH, $0aa, $0c0 ; GLOOM + mon_cry CRY_VILEPLUME, $022, $17f ; VILEPLUME + mon_cry CRY_PARAS, $020, $160 ; PARAS + mon_cry CRY_PARAS, $042, $17f ; PARASECT + mon_cry CRY_VENONAT, $044, $0c0 ; VENONAT + mon_cry CRY_VENONAT, $029, $100 ; VENOMOTH + mon_cry CRY_DIGLETT, $0aa, $081 ; DIGLETT + mon_cry CRY_DIGLETT, $02a, $090 ; DUGTRIO + mon_cry CRY_CLEFAIRY, $077, $090 ; MEOWTH + mon_cry CRY_CLEFAIRY, $099, $17f ; PERSIAN + mon_cry CRY_PSYDUCK, $020, $0e0 ; PSYDUCK + mon_cry CRY_PSYDUCK, $0ff, $0c0 ; GOLDUCK + mon_cry CRY_NIDOQUEEN, $0dd, $0e0 ; MANKEY + mon_cry CRY_NIDOQUEEN, $0af, $0c0 ; PRIMEAPE + mon_cry CRY_GROWLITHE, $020, $0c0 ; GROWLITHE + mon_cry CRY_WEEDLE, $000, $100 ; ARCANINE + mon_cry CRY_PIDGEY, $0ff, $17f ; POLIWAG + mon_cry CRY_PIDGEY, $077, $0e0 ; POLIWHIRL + mon_cry CRY_PIDGEY, $000, $17f ; POLIWRATH + mon_cry CRY_METAPOD, $0c0, $081 ; ABRA + mon_cry CRY_METAPOD, $0a8, $140 ; KADABRA + mon_cry CRY_METAPOD, $098, $17f ; ALAKAZAM + mon_cry CRY_GROWLITHE, $0ee, $081 ; MACHOP + mon_cry CRY_GROWLITHE, $048, $0e0 ; MACHOKE + mon_cry CRY_GROWLITHE, $008, $140 ; MACHAMP + mon_cry CRY_PSYDUCK, $055, $081 ; BELLSPROUT + mon_cry CRY_WEEPINBELL, $044, $0a0 ; WEEPINBELL + mon_cry CRY_WEEPINBELL, $066, $14c ; VICTREEBEL + mon_cry CRY_VENONAT, $000, $100 ; TENTACOOL + mon_cry CRY_VENONAT, $0ee, $17f ; TENTACRUEL + mon_cry CRY_VULPIX, $0f0, $090 ; GEODUDE + mon_cry CRY_VULPIX, $000, $100 ; GRAVELER + mon_cry CRY_GOLEM, $0e0, $0c0 ; GOLEM + mon_cry CRY_WEEPINBELL, $000, $100 ; PONYTA + mon_cry CRY_WEEPINBELL, $020, $140 ; RAPIDASH + mon_cry CRY_SLOWPOKE, $000, $100 ; SLOWPOKE + mon_cry CRY_GROWLITHE, $000, $100 ; SLOWBRO + mon_cry CRY_METAPOD, $080, $0e0 ; MAGNEMITE + mon_cry CRY_METAPOD, $020, $140 ; MAGNETON + mon_cry CRY_SPEAROW, $0dd, $081 ; FARFETCH_D + mon_cry CRY_DIGLETT, $0bb, $081 ; DODUO + mon_cry CRY_DIGLETT, $099, $0a0 ; DODRIO + mon_cry CRY_SEEL, $088, $140 ; SEEL + mon_cry CRY_SEEL, $023, $17f ; DEWGONG + mon_cry CRY_GRIMER, $000, $100 ; GRIMER + mon_cry CRY_MUK, $0ef, $17f ; MUK + mon_cry CRY_FEAROW, $000, $100 ; SHELLDER + mon_cry CRY_FEAROW, $06f, $160 ; CLOYSTER + mon_cry CRY_METAPOD, $000, $100 ; GASTLY + mon_cry CRY_METAPOD, $030, $0c0 ; HAUNTER + mon_cry CRY_MUK, $000, $17f ; GENGAR + mon_cry CRY_EKANS, $0ff, $140 ; ONIX + mon_cry CRY_DROWZEE, $088, $0a0 ; DROWZEE + mon_cry CRY_DROWZEE, $0ee, $0c0 ; HYPNO + mon_cry CRY_KRABBY, $020, $160 ; KRABBY + mon_cry CRY_KRABBY, $0ee, $160 ; KINGLER + mon_cry CRY_VOLTORB, $0ed, $100 ; VOLTORB + mon_cry CRY_VOLTORB, $0a8, $110 ; ELECTRODE + mon_cry CRY_DIGLETT, $000, $100 ; EXEGGCUTE + mon_cry CRY_DROWZEE, $000, $100 ; EXEGGUTOR + mon_cry CRY_CLEFAIRY, $000, $100 ; CUBONE + mon_cry CRY_ODDISH, $04f, $0e0 ; MAROWAK + mon_cry CRY_GOLEM, $080, $140 ; HITMONLEE + mon_cry CRY_SEEL, $0ee, $140 ; HITMONCHAN + mon_cry CRY_SEEL, $000, $100 ; LICKITUNG + mon_cry CRY_GOLEM, $0e6, $15d ; KOFFING + mon_cry CRY_GOLEM, $0ff, $17f ; WEEZING + mon_cry CRY_CHARMANDER, $000, $100 ; RHYHORN + mon_cry CRY_RHYDON, $000, $100 ; RHYDON + mon_cry CRY_PIDGEOTTO, $00a, $140 ; CHANSEY + mon_cry CRY_GOLEM, $000, $100 ; TANGELA + mon_cry CRY_KANGASKHAN, $000, $100 ; KANGASKHAN + mon_cry CRY_CLEFAIRY, $099, $090 ; HORSEA + mon_cry CRY_CLEFAIRY, $03c, $081 ; SEADRA + mon_cry CRY_CATERPIE, $080, $0c0 ; GOLDEEN + mon_cry CRY_CATERPIE, $010, $17f ; SEAKING + mon_cry CRY_PARAS, $002, $0a0 ; STARYU + mon_cry CRY_PARAS, $000, $100 ; STARMIE + mon_cry CRY_KRABBY, $008, $0c0 ; MR__MIME + mon_cry CRY_CATERPIE, $000, $100 ; SCYTHER + mon_cry CRY_DROWZEE, $0ff, $17f ; JYNX + mon_cry CRY_VOLTORB, $08f, $17f ; ELECTABUZZ + mon_cry CRY_CHARMANDER, $0ff, $0b0 ; MAGMAR + mon_cry CRY_PIDGEOTTO, $000, $100 ; PINSIR + mon_cry CRY_SQUIRTLE, $011, $0c0 ; TAUROS + mon_cry CRY_EKANS, $080, $080 ; MAGIKARP + mon_cry CRY_EKANS, $000, $100 ; GYARADOS + mon_cry CRY_LAPRAS, $000, $100 ; LAPRAS + mon_cry CRY_PIDGEY, $0ff, $17f ; DITTO + mon_cry CRY_VENONAT, $088, $0e0 ; EEVEE + mon_cry CRY_VENONAT, $0aa, $17f ; VAPOREON + mon_cry CRY_VENONAT, $03d, $100 ; JOLTEON + mon_cry CRY_VENONAT, $010, $0a0 ; FLAREON + mon_cry CRY_WEEPINBELL, $0aa, $17f ; PORYGON + mon_cry CRY_GROWLITHE, $0f0, $081 ; OMANYTE + mon_cry CRY_GROWLITHE, $0ff, $0c0 ; OMASTAR + mon_cry CRY_CATERPIE, $0bb, $0c0 ; KABUTO + mon_cry CRY_FEAROW, $0ee, $081 ; KABUTOPS + mon_cry CRY_VILEPLUME, $020, $170 ; AERODACTYL + mon_cry CRY_GRIMER, $055, $081 ; SNORLAX + mon_cry CRY_RAICHU, $080, $0c0 ; ARTICUNO + mon_cry CRY_FEAROW, $0ff, $100 ; ZAPDOS + mon_cry CRY_RAICHU, $0f8, $0c0 ; MOLTRES + mon_cry CRY_BULBASAUR, $060, $0c0 ; DRATINI + mon_cry CRY_BULBASAUR, $040, $100 ; DRAGONAIR + mon_cry CRY_BULBASAUR, $03c, $140 ; DRAGONITE + mon_cry CRY_PARAS, $099, $17f ; MEWTWO + mon_cry CRY_PARAS, $0ee, $17f ; MEW + mon_cry CRY_CHIKORITA, -$010, $0b0 ; CHIKORITA + mon_cry CRY_CHIKORITA, -$022, $120 ; BAYLEEF + mon_cry CRY_CHIKORITA, -$0b7, $200 ; MEGANIUM + mon_cry CRY_CYNDAQUIL, $347, $080 ; CYNDAQUIL + mon_cry CRY_CYNDAQUIL, $321, $120 ; QUILAVA + mon_cry CRY_TYPHLOSION, $f00, $0d4 ; TYPHLOSION + mon_cry CRY_TOTODILE, $46c, $0e8 ; TOTODILE + mon_cry CRY_TOTODILE, $440, $110 ; CROCONAW + mon_cry CRY_TOTODILE, $3fc, $180 ; FERALIGATR + mon_cry CRY_SENTRET, $08a, $0b8 ; SENTRET + mon_cry CRY_SENTRET, $06b, $102 ; FURRET + mon_cry CRY_HOOTHOOT, $091, $0d8 ; HOOTHOOT + mon_cry CRY_HOOTHOOT, $000, $1a0 ; NOCTOWL + mon_cry CRY_LEDYBA, $000, $0de ; LEDYBA + mon_cry CRY_LEDYBA, -$096, $138 ; LEDIAN + mon_cry CRY_SPINARAK, $011, $200 ; SPINARAK + mon_cry CRY_SPINARAK, -$0ae, $1e2 ; ARIADOS + mon_cry CRY_SQUIRTLE, -$010, $140 ; CROBAT + mon_cry CRY_CYNDAQUIL, $3c9, $140 ; CHINCHOU + mon_cry CRY_CYNDAQUIL, $2d0, $110 ; LANTURN + mon_cry CRY_PICHU, $000, $140 ; PICHU + mon_cry CRY_CLEFFA, $061, $091 ; CLEFFA + mon_cry CRY_CHIKORITA, $0e8, $0e8 ; IGGLYBUFF + mon_cry CRY_TOGEPI, $010, $100 ; TOGEPI + mon_cry CRY_TOGETIC, $03b, $038 ; TOGETIC + mon_cry CRY_NATU, -$067, $100 ; NATU + mon_cry CRY_NATU, -$0a7, $168 ; XATU + mon_cry CRY_MAREEP, $022, $0d8 ; MAREEP + mon_cry CRY_MAREEP, -$007, $180 ; FLAAFFY + mon_cry CRY_AMPHAROS, -$07c, $0e8 ; AMPHAROS + mon_cry CRY_CLEFFA, $084, $150 ; BELLOSSOM + mon_cry CRY_MARILL, $11b, $120 ; MARILL + mon_cry CRY_MARILL, $0b6, $180 ; AZUMARILL + mon_cry CRY_CLEFFA, $f40, $180 ; SUDOWOODO + mon_cry CRY_CLEFFA, -$2a3, $1c8 ; POLITOED + mon_cry CRY_CLEFFA, $03b, $0c8 ; HOPPIP + mon_cry CRY_CLEFFA, $027, $138 ; SKIPLOOM + mon_cry CRY_CLEFFA, $000, $180 ; JUMPLUFF + mon_cry CRY_AIPOM, -$051, $0e8 ; AIPOM + mon_cry CRY_MARILL, $12b, $0b8 ; SUNKERN + mon_cry CRY_SUNFLORA, -$020, $180 ; SUNFLORA + mon_cry CRY_TOTODILE, $031, $0c8 ; YANMA + mon_cry CRY_WOOPER, $093, $0af ; WOOPER + mon_cry CRY_WOOPER, -$0c6, $140 ; QUAGSIRE + mon_cry CRY_AIPOM, $0a2, $140 ; ESPEON + mon_cry CRY_VENONAT, -$0e9, $0f0 ; UMBREON + mon_cry CRY_MARILL, -$01f, $180 ; MURKROW + mon_cry CRY_SLOWKING, $104, $200 ; SLOWKING + mon_cry CRY_HOOTHOOT, $130, $0e8 ; MISDREAVUS + mon_cry CRY_HOOTHOOT, $162, $100 ; UNOWN + mon_cry CRY_AMPHAROS, $27b, $144 ; WOBBUFFET + mon_cry CRY_GIRAFARIG, $041, $200 ; GIRAFARIG + mon_cry CRY_SLOWKING, $080, $100 ; PINECO + mon_cry CRY_SLOWKING, $000, $180 ; FORRETRESS + mon_cry CRY_DUNSPARCE, $1c4, $100 ; DUNSPARCE + mon_cry CRY_GLIGAR, -$102, $100 ; GLIGAR + mon_cry CRY_TYPHLOSION, $0ef, $0f7 ; STEELIX + mon_cry CRY_DUNSPARCE, $112, $0e8 ; SNUBBULL + mon_cry CRY_DUNSPARCE, $000, $180 ; GRANBULL + mon_cry CRY_SLOWKING, $160, $0e0 ; QWILFISH + mon_cry CRY_AMPHAROS, $000, $160 ; SCIZOR + mon_cry CRY_DUNSPARCE, $290, $0a8 ; SHUCKLE + mon_cry CRY_AMPHAROS, $035, $0e0 ; HERACROSS + mon_cry CRY_WOOPER, $053, $0af ; SNEASEL + mon_cry CRY_TEDDIURSA, $7a2, $06e ; TEDDIURSA + mon_cry CRY_TEDDIURSA, $640, $0d8 ; URSARING + mon_cry CRY_SLUGMA, -$1d8, $140 ; SLUGMA + mon_cry CRY_MAGCARGO, -$20d, $1c0 ; MAGCARGO + mon_cry CRY_CYNDAQUIL, $1fe, $140 ; SWINUB + mon_cry CRY_MAGCARGO, -$109, $100 ; PILOSWINE + mon_cry CRY_MAGCARGO, $0a1, $0e8 ; CORSOLA + mon_cry CRY_SUNFLORA, $00d, $100 ; REMORAID + mon_cry CRY_TOTODILE, $000, $180 ; OCTILLERY + mon_cry CRY_TEDDIURSA, $002, $06a ; DELIBIRD + mon_cry CRY_MANTINE, -$0be, $0f0 ; MANTINE + mon_cry CRY_AMPHAROS, $8a9, $180 ; SKARMORY + mon_cry CRY_CYNDAQUIL, $039, $140 ; HOUNDOUR + mon_cry CRY_TOTODILE, -$10a, $100 ; HOUNDOOM + mon_cry CRY_SLUGMA, $2fb, $100 ; KINGDRA + mon_cry CRY_SENTRET, $048, $230 ; PHANPY + mon_cry CRY_DONPHAN, $000, $1a0 ; DONPHAN + mon_cry CRY_GIRAFARIG, $073, $240 ; PORYGON2 + mon_cry CRY_AIPOM, -$160, $180 ; STANTLER + mon_cry CRY_PICHU, -$21a, $1f0 ; SMEARGLE + mon_cry CRY_AIPOM, $02c, $108 ; TYROGUE + mon_cry CRY_SLUGMA, $000, $100 ; HITMONTOP + mon_cry CRY_MARILL, $068, $100 ; SMOOCHUM + mon_cry CRY_SUNFLORA, -$2d8, $0b4 ; ELEKID + mon_cry CRY_TEDDIURSA, $176, $03a ; MAGBY + mon_cry CRY_GLIGAR, -$1cd, $1a0 ; MILTANK + mon_cry CRY_SLOWKING, $293, $140 ; BLISSEY + mon_cry CRY_RAIKOU, $22e, $120 ; RAIKOU + mon_cry CRY_ENTEI, $000, $1a0 ; ENTEI + mon_cry CRY_MAGCARGO, $000, $180 ; SUICUNE + mon_cry CRY_RAIKOU, $05f, $0d0 ; LARVITAR + mon_cry CRY_SPINARAK, -$1db, $150 ; PUPITAR + mon_cry CRY_RAIKOU, -$100, $180 ; TYRANITAR + mon_cry CRY_TYPHLOSION, $000, $100 ; LUGIA + mon_cry CRY_AIPOM, $000, $180 ; HO_OH + mon_cry CRY_ENTEI, $14a, $111 ; CELEBI + mon_cry CRY_NIDORAN_M, 0, 0 ; 252 + mon_cry CRY_NIDORAN_M, 0, 0 ; 253 + mon_cry CRY_NIDORAN_M, 0, 0 ; 254 + mon_cry CRY_NIDORAN_M, 0, 0 ; 255 diff --git a/crysaudio/cry_pointers.asm b/crysaudio/cry_pointers.asm index d58a6f09..ec6b17e0 100644 --- a/crysaudio/cry_pointers.asm +++ b/crysaudio/cry_pointers.asm @@ -1,70 +1,69 @@ -; e91b0 - dbw BANK(Cry_00), Cry_00 - dbw BANK(Cry_01), Cry_01 - dbw BANK(Cry_02), Cry_02 - dbw BANK(Cry_03), Cry_03 - dbw BANK(Cry_04), Cry_04 - dbw BANK(Cry_05), Cry_05 - dbw BANK(Cry_06), Cry_06 - dbw BANK(Cry_07), Cry_07 - dbw BANK(Cry_08), Cry_08 - dbw BANK(Cry_09), Cry_09 - dbw BANK(Cry_0A), Cry_0A - dbw BANK(Cry_0B), Cry_0B - dbw BANK(Cry_0C), Cry_0C - dbw BANK(Cry_0D), Cry_0D - dbw BANK(Cry_0E), Cry_0E - dbw BANK(Cry_0F), Cry_0F - dbw BANK(Cry_10), Cry_10 - dbw BANK(Cry_11), Cry_11 - dbw BANK(Cry_12), Cry_12 - dbw BANK(Cry_13), Cry_13 - dbw BANK(Cry_14), Cry_14 - dbw BANK(Cry_15), Cry_15 - dbw BANK(Cry_16), Cry_16 - dbw BANK(Cry_17), Cry_17 - dbw BANK(Cry_18), Cry_18 - dbw BANK(Cry_19), Cry_19 - dbw BANK(Cry_1A), Cry_1A - dbw BANK(Cry_1B), Cry_1B - dbw BANK(Cry_1C), Cry_1C - dbw BANK(Cry_1D), Cry_1D - dbw BANK(Cry_1E), Cry_1E - dbw BANK(Cry_1F), Cry_1F - dbw BANK(Cry_20), Cry_20 - dbw BANK(Cry_21), Cry_21 - dbw BANK(Cry_22), Cry_22 - dbw BANK(Cry_23), Cry_23 - dbw BANK(Cry_24), Cry_24 - dbw BANK(Cry_25), Cry_25 - dbw BANK(Cry_26), Cry_26 - dbw BANK(Cry_27), Cry_27 - dbw BANK(Cry_28), Cry_28 - dbw BANK(Cry_29), Cry_29 - dbw BANK(Cry_2A), Cry_2A - dbw BANK(Cry_2B), Cry_2B - dbw BANK(Cry_2C), Cry_2C - dbw BANK(Cry_2D), Cry_2D - dbw BANK(Cry_2E), Cry_2E - dbw BANK(Cry_2F), Cry_2F - dbw BANK(Cry_30), Cry_30 - dbw BANK(Cry_31), Cry_31 - dbw BANK(Cry_32), Cry_32 - dbw BANK(Cry_33), Cry_33 - dbw BANK(Cry_34), Cry_34 - dbw BANK(Cry_35), Cry_35 - dbw BANK(Cry_36), Cry_36 - dbw BANK(Cry_37), Cry_37 - dbw BANK(Cry_38), Cry_38 - dbw BANK(Cry_39), Cry_39 - dbw BANK(Cry_3A), Cry_3A - dbw BANK(Cry_3B), Cry_3B - dbw BANK(Cry_3C), Cry_3C - dbw BANK(Cry_3D), Cry_3D - dbw BANK(Cry_3E), Cry_3E - dbw BANK(Cry_3F), Cry_3F - dbw BANK(Cry_40), Cry_40 - dbw BANK(Cry_41), Cry_41 - dbw BANK(Cry_42), Cry_42 - dbw BANK(Cry_43), Cry_43 -; e927c +Cries: + dba Cry_Nidoran_M + dba Cry_Nidoran_F + dba Cry_Slowpoke + dba Cry_Kangaskhan + dba Cry_Charmander + dba Cry_Grimer + dba Cry_Voltorb + dba Cry_Muk + dba Cry_Oddish + dba Cry_Raichu + dba Cry_Nidoqueen + dba Cry_Diglett + dba Cry_Seel + dba Cry_Drowzee + dba Cry_Pidgey + dba Cry_Bulbasaur + dba Cry_Spearow + dba Cry_Rhydon + dba Cry_Golem + dba Cry_Blastoise + dba Cry_Pidgeotto + dba Cry_Weedle + dba Cry_Caterpie + dba Cry_Ekans + dba Cry_Fearow + dba Cry_Clefairy + dba Cry_Venonat + dba Cry_Lapras + dba Cry_Metapod + dba Cry_Squirtle + dba Cry_Paras + dba Cry_Growlithe + dba Cry_Krabby + dba Cry_Psyduck + dba Cry_Rattata + dba Cry_Vileplume + dba Cry_Vulpix + dba Cry_Weepinbell + dba Cry_Marill + dba Cry_Spinarak + dba Cry_Togepi + dba Cry_Girafarig + dba Cry_Raikou + dba Cry_Mareep + dba Cry_Togetic + dba Cry_Hoothoot + dba Cry_Sentret + dba Cry_Slowking + dba Cry_Cyndaquil + dba Cry_Chikorita + dba Cry_Totodile + dba Cry_Gligar + dba Cry_Cleffa + dba Cry_Slugma + dba Cry_Ledyba + dba Cry_Entei + dba Cry_Wooper + dba Cry_Mantine + dba Cry_Typhlosion + dba Cry_Natu + dba Cry_Teddiursa + dba Cry_Sunflora + dba Cry_Ampharos + dba Cry_Magcargo + dba Cry_Pichu + dba Cry_Aipom + dba Cry_Dunsparce + dba Cry_Donphan diff --git a/crysaudio/drumkits.asm b/crysaudio/drumkits.asm new file mode 100644 index 00000000..9bdbc553 --- /dev/null +++ b/crysaudio/drumkits.asm @@ -0,0 +1,275 @@ +Drumkits: + dw Drumkit0 + dw Drumkit1 + dw Drumkit2 + dw Drumkit3 + dw Drumkit4 + dw Drumkit5 + dw Drumkit6 + +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 +Drumkit1: + dw Drum00 + dw HiHat1 + dw Snare5 + dw Snare6 + dw Snare7 + dw HiHat2 + dw HiHat3 + dw Snare8 + dw Triangle3 + dw Triangle4 + dw Snare9 + dw Snare10 + dw Snare11 +Drumkit2: + dw Drum00 + dw Snare1 + dw Snare9 + dw Snare10 + dw Snare11 + dw Drum05 + dw Triangle1 + dw Triangle2 + dw HiHat1 + dw Snare5 + dw Snare6 + dw Snare7 + dw HiHat2 +Drumkit3: + dw Drum21 + dw Snare12 + dw Snare13 + dw Snare14 + dw Kick1 + dw Triangle5 + dw Drum20 + dw Drum27 + dw Drum28 + dw Drum29 + dw Drum21 + dw Kick2 + dw Crash2 +Drumkit4: + dw Drum21 + dw Drum20 + dw Snare13 + dw Snare14 + dw Kick1 + dw Drum33 + dw Triangle5 + dw Drum35 + dw Drum31 + dw Drum32 + dw Drum36 + dw Kick2 + dw Crash1 +Drumkit5: + dw Drum00 + dw Snare9 + dw Snare10 + dw Snare11 + dw Drum27 + dw Drum28 + dw Drum29 + dw Drum05 + dw Triangle1 + dw Crash1 + dw Snare14 + dw Snare13 + dw Kick2 +Drumkit6: + dw Drum00 + dw Kick2 + dw Snare9 + dw Snare10 + dw Snare11 + dw Crash2 + dw Crash1 + dw Snare9 + dw Snare9 + dw Snare9 + dw Snare9 + dw Snare9 + +Drum00: +; unused + noise C#, 1, $11, $00 + endchannel + +Snare1: + noise C#, 1, $c1, $33 + endchannel + +Snare2: + noise C#, 1, $b1, $33 + endchannel + +Snare3: + noise C#, 1, $a1, $33 + endchannel + +Snare4: + noise C#, 1, $81, $33 + endchannel + +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 + +Triangle1: + noise C#, 1, $51, $2a + endchannel + +Triangle2: + noise C#, 2, $41, $2b + noise C#, 1, $61, $2a + endchannel + +HiHat1: + noise C#, 1, $81, $10 + endchannel + +Snare5: + noise C#, 1, $82, $23 + endchannel + +Snare6: + noise C#, 1, $82, $25 + endchannel + +Snare7: + noise C#, 1, $82, $26 + endchannel + +HiHat2: + noise C#, 1, $a1, $10 + endchannel + +HiHat3: + noise C#, 1, $a2, $11 + endchannel + +Snare8: + noise C#, 1, $a2, $50 + endchannel + +Triangle3: + noise C#, 1, $a1, $18 + noise C#, 1, $31, $33 + endchannel + +Triangle4: + noise C#, 3, $91, $28 + noise C#, 1, $71, $18 + endchannel + +Snare9: + noise C#, 1, $91, $22 + endchannel + +Snare10: + noise C#, 1, $71, $22 + endchannel + +Snare11: + noise C#, 1, $61, $22 + endchannel + +Drum20: + noise C#, 1, $11, $11 + endchannel + +Drum21: + endchannel + +Snare12: + noise C#, 1, $91, $33 + endchannel + +Snare13: + noise C#, 1, $51, $32 + endchannel + +Snare14: + noise C#, 1, $81, $31 + endchannel + +Kick1: + noise C#, 1, $88, $6b + noise C#, 1, $71, $00 + endchannel + +Triangle5: + noise D_, 1, $91, $18 + endchannel + +Drum27: + noise C#, 8, $92, $10 + endchannel + +Drum28: + noise D_, 4, $91, $00 + noise D_, 4, $11, $00 + endchannel + +Drum29: + noise D_, 4, $91, $11 + noise D_, 4, $11, $00 + endchannel + +Crash1: + noise D_, 4, $88, $15 + noise C#, 1, $65, $12 + endchannel + +Drum31: + noise D_, 4, $51, $21 + noise D_, 4, $11, $11 + endchannel + +Drum32: + noise D_, 4, $51, $50 + noise D_, 4, $11, $11 + endchannel + +Drum33: + noise C#, 1, $a1, $31 + endchannel + +Crash2: + noise C#, 1, $84, $12 + endchannel + +Drum35: + noise D_, 4, $81, $00 + noise D_, 4, $11, $00 + endchannel + +Drum36: + noise D_, 4, $81, $21 + noise D_, 4, $11, $11 + endchannel + +Kick2: + noise C#, 1, $a8, $6b + noise C#, 1, $71, $00 + endchannel diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index cc9eda2e..bc93939a 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -5,9 +5,8 @@ ; Notable functions: ; FadeMusic ; PlayStereoSFX -; PlayCry -_SoundRestart:: ; e8000 +_MapSetup_Sound_Off:: ; restart sound operation ; clear all relevant hardware registers & wram push hl @@ -23,14 +22,14 @@ _SoundRestart:: ; e8000 ld [hli], a ; ff26 ; music channels ld hl, rNR10 ; sound channel registers - ld e, $04 ; number of channels + ld e, NUM_MUSIC_CHANS .clearsound ; sound channel 1 2 3 4 xor a - ld [hli], a ; rNR10, $ff15, rNR30, $ff1f ; sweep = 0 + ld [hli], a ; rNR10, rNR20, rNR30, rNR40 ; sweep = 0 ld [hli], a ; rNR11, rNR21, rNR31, rNR41 ; length/wavepattern = 0 - ld a, $08 + ld a, $8 ld [hli], a ; rNR12, rNR22, rNR32, rNR42 ; envelope = 0 xor a ld [hli], a ; rNR13, rNR23, rNR33, rNR43 ; frequency lo = 0 @@ -39,196 +38,191 @@ _SoundRestart:: ; e8000 dec e jr nz, .clearsound - ld hl, Channel1 ; start of channel data - ld de, $01bf ; length of area to clear (entire sound wram area) -.clearchannels ; clear Crysaudio+$01-Crysaudio+$1bf + ld hl, wChannels ; start of channel data + ld de, wChannelsEnd - wChannels ; length of area to clear (entire sound wram area) +.clearchannels xor a ld [hli], a dec de ld a, e or d jr nz, .clearchannels - ld a, $77 ; max - ld [Volume], a + ld a, MAX_VOLUME + ld [wVolume], a call MusicOn pop af pop bc pop de pop hl ret -; e803d -MusicFadeRestart: ; e803d +MusicFadeRestart: ; restart but keep the music id to fade in to - ld a, [MusicFadeIDHi] + ld a, [wMusicFadeID + 1] push af - ld a, [MusicFadeIDLo] + ld a, [wMusicFadeID] push af - call _SoundRestart + call _MapSetup_Sound_Off pop af - ld [MusicFadeIDLo], a + ld [wMusicFadeID], a pop af - ld [MusicFadeIDHi], a + ld [wMusicFadeID + 1], a ret -; e8051 -MusicOn: ; e8051 - ld a, $01 - ld [MusicPlaying], a +MusicOn: + ld a, 1 + ld [wMusicPlaying], a ret -; e8057 -MusicOff: ; e8057 +MusicOff: xor a - ld [MusicPlaying], a + ld [wMusicPlaying], a ret -; e805c -_UpdateSound:: ; e805c +_UpdateSound:: call OpenSRAMForSound ; called once per frame ; no use updating audio if it's not playing - ld a, [MusicPlaying] + ld a, [wMusicPlaying] and a ret z ; start at ch1 xor a - ld [CurChannel], a ; just - ld [SoundOutput], a ; off - ld bc, Channel1 + ld [wCurChannel], a ; just + ld [wSoundOutput], a ; off + ld bc, wChannel1 .loop ; is the channel active? - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 0, [hl] + bit SOUND_CHANNEL_ON, [hl] jp z, .nextchannel ; check time left in the current note - ld hl, Channel1NoteDuration - Channel1 + ld hl, CHANNEL_NOTE_DURATION add hl, bc ld a, [hl] - cp a, $02 ; 1 or 0? + cp $2 ; 1 or 0? jr c, .noteover dec [hl] - jr .asm_e8093 + jr .continue_sound_update + .noteover ; reset vibrato delay - ld hl, Channel1VibratoDelay - Channel1 + ld hl, CHANNEL_VIBRATO_DELAY add hl, bc ld a, [hl] - ld hl, Channel1VibratoDelayCount - Channel1 + ld hl, CHANNEL_VIBRATO_DELAY_COUNT add hl, bc ld [hl], a ; turn vibrato off for now - ld hl, Channel1Flags2 - Channel1 + ld hl, CHANNEL_FLAGS2 add hl, bc - res 1, [hl] + res SOUND_PITCH_WHEEL, [hl] ; get next note call ParseMusic -.asm_e8093 - ; - call Functione84f9 +.continue_sound_update + call ApplyPitchWheel ; duty cycle - ld hl, Channel1DutyCycle - Channel1 + ld hl, CHANNEL_DUTY_CYCLE add hl, bc ld a, [hli] - ld [Crysaudio+$192], a + ld [wCurTrackDuty], a ; intensity ld a, [hli] - ld [Crysaudio+$193], a + ld [wCurTrackIntensity], a ; frequency ld a, [hli] - ld [Crysaudio+$194], a + ld [wCurTrackFrequency], a ld a, [hl] - ld [Crysaudio+$195], a - ; - call Functione8466 ; handle vibrato and other things + ld [wCurTrackFrequency + 1], a + ; vibrato, noise + call HandleTrackVibrato ; handle vibrato and other things call HandleNoise ; turn off music when playing sfx? - ld a, [SFXPriority] + ld a, [wSFXPriority] and a jr z, .next ; are we in a sfx channel right now? - ld a, [CurChannel] - cp a, $04 + ld a, [wCurChannel] + cp NUM_MUSIC_CHANS jr nc, .next ; are any sfx channels active? ; if so, mute - ld hl, Crysaudio+$cc ; Channel5Flags - bit 0, [hl] + ld hl, wChannel5Flags1 + bit SOUND_CHANNEL_ON, [hl] jr nz, .restnote - ld hl, Crysaudio+$fe ; Channel6Flags - bit 0, [hl] + ld hl, wChannel6Flags1 + bit SOUND_CHANNEL_ON, [hl] jr nz, .restnote - ld hl, Crysaudio+$130 ; Channel7Flags - bit 0, [hl] + ld hl, wChannel7Flags1 + bit SOUND_CHANNEL_ON, [hl] jr nz, .restnote - ld hl, Crysaudio+$162 ; Channel8Flags - bit 0, [hl] + ld hl, wChannel8Flags1 + bit SOUND_CHANNEL_ON, [hl] jr z, .next .restnote - ld hl, Channel1NoteFlags - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 5, [hl] ; Rest + set NOTE_REST, [hl] ; Rest .next ; are we in a sfx channel right now? - ld a, [CurChannel] - cp a, $04 ; sfx - jr nc, .asm_e80ee - ld hl, $00cb + ld a, [wCurChannel] + cp NUM_MUSIC_CHANS + jr nc, .sfx_channel + ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1 add hl, bc - bit 0, [hl] - jr nz, .asm_e80fc -.asm_e80ee + bit SOUND_CHANNEL_ON, [hl] + jr nz, .sound_channel_on +.sfx_channel call UpdateChannels - ld hl, Channel1Tracks - Channel1 + ld hl, CHANNEL_TRACKS add hl, bc - ld a, [SoundOutput] + ld a, [wSoundOutput] or [hl] - ld [SoundOutput], a -.asm_e80fc + ld [wSoundOutput], a +.sound_channel_on ; clear note flags - ld hl, Channel1NoteFlags - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc xor a ld [hl], a .nextchannel ; next channel - ld hl, Channel2 - Channel1 + ld hl, CHANNEL_STRUCT_LENGTH add hl, bc ld c, l ld b, h - ld a, [CurChannel] + ld a, [wCurChannel] inc a - ld [CurChannel], a - cp a, $08 ; are we done? + ld [wCurChannel], a + cp NUM_CHANNELS ; are we done? jp nz, .loop ; do it all again - ; writing to hardware registers? - call Functione8307 + + call PlayDanger ; fade music in/out call FadeMusic ; write volume to hardware register - ld a, [Volume] - ld [rNR50], a + ld a, [wVolume] + ldh [rNR50], a ; write SO on/off to hardware register - ld a, [SoundOutput] - ld [rNR51], a + ld a, [wSoundOutput] + ldh [rNR51], a ret -; e8125 -UpdateChannels: ; e8125 +UpdateChannels: ld hl, .ChannelFnPtrs - ld a, [CurChannel] - and a, $07 + ld a, [wCurChannel] + and $7 add a ld e, a - ld d, $00 + ld d, 0 add hl, de ld a, [hli] ld h, [hl] ld l, a jp hl -.ChannelFnPtrs +.ChannelFnPtrs: dw .Channel1 dw .Channel2 dw .Channel3 @@ -240,403 +234,427 @@ UpdateChannels: ; e8125 dw .Channel7 dw .Channel8 -.Channel1 - ld a, [Crysaudio+$1a6] - bit 7, a +.Channel1: + ld a, [wDanger] ; XXX + bit DANGER_ON_F, a ret nz -.Channel5 - ld hl, Channel1NoteFlags - Channel1 +.Channel5: + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - bit 3, [hl] + bit NOTE_UNKN_3, [hl] jr z, .asm_e8159 ; - ld a, [SoundInput] - ld [rNR10], a + ld a, [wSoundInput] + ldh [rNR10], a .asm_e8159 - bit 5, [hl] ; rest + bit NOTE_REST, [hl] ; rest jr nz, .ch1rest - bit 4, [hl] + bit NOTE_NOISE_SAMPLING, [hl] jr nz, .asm_e81a2 - bit 1, [hl] - jr nz, .asm_e816b - bit 6, [hl] + bit NOTE_FREQ_OVERRIDE, [hl] + jr nz, .frequency_override + bit NOTE_VIBRATO_OVERRIDE, [hl] jr nz, .asm_e8184 - jr .asm_e8175 -.asm_e816b - ld a, [Crysaudio+$194] - ld [rNR13], a - ld a, [Crysaudio+$195] - ld [rNR14], a -.asm_e8175 - bit 0, [hl] + jr .check_duty_override + +.frequency_override + ld a, [wCurTrackFrequency] + ldh [rNR13], a + ld a, [wCurTrackFrequency + 1] + ldh [rNR14], a +.check_duty_override + bit NOTE_DUTY_OVERRIDE, [hl] ret z - ld a, [Crysaudio+$192] + ld a, [wCurTrackDuty] ld d, a - ld a, [rNR11] - and a, $3f ; sound length + ldh a, [rNR11] + and $3f ; sound length or d - ld [rNR11], a + ldh [rNR11], a ret + .asm_e8184 - ld a, [Crysaudio+$192] + ld a, [wCurTrackDuty] ld d, a - ld a, [rNR11] - and a, $3f ; sound length + ldh a, [rNR11] + and $3f ; sound length or d - ld [rNR11], a - ld a, [Crysaudio+$194] - ld [rNR13], a + ldh [rNR11], a + ld a, [wCurTrackFrequency] + ldh [rNR13], a ret + .ch1rest - ld a, [rNR52] - and a, %10001110 ; ch1 off - ld [rNR52], a + ldh a, [rNR52] + and %10001110 ; ch1 off + ldh [rNR52], a ld hl, rNR10 call ClearChannel ret + .asm_e81a2 - ld hl, Crysaudio+$192 + ld hl, wCurTrackDuty ld a, $3f ; sound length or [hl] - ld [rNR11], a - ld a, [Crysaudio+$193] - ld [rNR12], a - ld a, [Crysaudio+$194] - ld [rNR13], a - ld a, [Crysaudio+$195] - or a, $80 - ld [rNR14], a + ldh [rNR11], a + ld a, [wCurTrackIntensity] + ldh [rNR12], a + ld a, [wCurTrackFrequency] + ldh [rNR13], a + ld a, [wCurTrackFrequency + 1] + or $80 + ldh [rNR14], a ret -.Channel2 -.Channel6 - ld hl, Channel1NoteFlags - Channel1 +.Channel2: +.Channel6: + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - bit 5, [hl] ; rest + bit NOTE_REST, [hl] ; rest jr nz, .ch2rest - bit 4, [hl] + bit NOTE_NOISE_SAMPLING, [hl] jr nz, .asm_e8204 - bit 6, [hl] + bit NOTE_VIBRATO_OVERRIDE, [hl] jr nz, .asm_e81e6 - bit 0, [hl] + bit NOTE_DUTY_OVERRIDE, [hl] ret z - ld a, [Crysaudio+$192] + ld a, [wCurTrackDuty] ld d, a - ld a, [rNR21] - and a, $3f ; sound length + ldh a, [rNR21] + and $3f ; sound length or d - ld [rNR21], a + ldh [rNR21], a ret + .asm_e81db ; unused - ld a, [Crysaudio+$194] - ld [rNR23], a - ld a, [Crysaudio+$195] - ld [rNR24], a + ld a, [wCurTrackFrequency] + ldh [rNR23], a + ld a, [wCurTrackFrequency + 1] + ldh [rNR24], a ret + .asm_e81e6 - ld a, [Crysaudio+$192] + ld a, [wCurTrackDuty] ld d, a - ld a, [rNR21] - and a, $3f ; sound length + ldh a, [rNR21] + and $3f ; sound length or d - ld [rNR21], a - ld a, [Crysaudio+$194] - ld [rNR23], a + ldh [rNR21], a + ld a, [wCurTrackFrequency] + ldh [rNR23], a ret + .ch2rest - ld a, [rNR52] - and a, %10001101 ; ch2 off - ld [rNR52], a - ld hl, $ff15 + ldh a, [rNR52] + and %10001101 ; ch2 off + ldh [rNR52], a + ld hl, rNR20 call ClearChannel ret + .asm_e8204 - ld hl, Crysaudio+$192 + ld hl, wCurTrackDuty ld a, $3f ; sound length or [hl] - ld [rNR21], a - ld a, [Crysaudio+$193] - ld [rNR22], a - ld a, [Crysaudio+$194] - ld [rNR23], a - ld a, [Crysaudio+$195] - or a, $80 ; initial (restart) - ld [rNR24], a + ldh [rNR21], a + ld a, [wCurTrackIntensity] + ldh [rNR22], a + ld a, [wCurTrackFrequency] + ldh [rNR23], a + ld a, [wCurTrackFrequency + 1] + or $80 ; initial (restart) + ldh [rNR24], a ret -.Channel3 -.Channel7 - ld hl, Channel1NoteFlags - Channel1 +.Channel3: +.Channel7: + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - bit 5, [hl] ; rest + bit NOTE_REST, [hl] ; rest jr nz, .ch3rest - bit 4, [hl] + bit NOTE_NOISE_SAMPLING, [hl] jr nz, .asm_e824d - bit 6, [hl] + bit NOTE_VIBRATO_OVERRIDE, [hl] jr nz, .asm_e823a ret + .asm_e822f ; unused - ld a, [Crysaudio+$194] - ld [rNR33], a - ld a, [Crysaudio+$195] - ld [rNR34], a + ld a, [wCurTrackFrequency] + ldh [rNR33], a + ld a, [wCurTrackFrequency + 1] + ldh [rNR34], a ret + .asm_e823a - ld a, [Crysaudio+$194] - ld [rNR33], a + ld a, [wCurTrackFrequency] + ldh [rNR33], a ret + .ch3rest - ld a, [rNR52] - and a, %10001011 ; ch3 off - ld [rNR52], a + ldh a, [rNR52] + and %10001011 ; ch3 off + ldh [rNR52], a ld hl, rNR30 call ClearChannel ret + .asm_e824d - ld a, $3f - ld [rNR31], a + ld a, $3f ; sound length + ldh [rNR31], a xor a - ld [rNR30], a + ldh [rNR30], a call .asm_e8268 ld a, $80 - ld [rNR30], a - ld a, [Crysaudio+$194] - ld [rNR33], a - ld a, [Crysaudio+$195] - or a, $80 - ld [rNR34], a + ldh [rNR30], a + ld a, [wCurTrackFrequency] + ldh [rNR33], a + ld a, [wCurTrackFrequency + 1] + or $80 + ldh [rNR34], a ret + .asm_e8268 push hl - ld a, [Crysaudio+$193] - and a, $0f ; only 0-9 are valid + ld a, [wCurTrackIntensity] + and $f ; only 0-9 are valid ld l, a - ld h, $00 + ld h, 0 ; hl << 4 - ; each wavepattern is $0f bytes long + ; each wavepattern is $f bytes long ; so seeking is done in $10s +rept 4 add hl, hl - add hl, hl - add hl, hl - add hl, hl +endr ld de, WaveSamples add hl, de cp $f jr z, .skip - ; load wavepattern into $ff30-$ff3f + ; load wavepattern into rWave_0-rWave_f ld a, [hli] - ld [$ff30], a + ldh [rWave_0], a ld a, [hli] - ld [$ff31], a + ldh [rWave_1], a ld a, [hli] - ld [$ff32], a + ldh [rWave_2], a ld a, [hli] - ld [$ff33], a + ldh [rWave_3], a ld a, [hli] - ld [$ff34], a + ldh [rWave_4], a ld a, [hli] - ld [$ff35], a + ldh [rWave_5], a ld a, [hli] - ld [$ff36], a + ldh [rWave_6], a ld a, [hli] - ld [$ff37], a + ldh [rWave_7], a ld a, [hli] - ld [$ff38], a + ldh [rWave_8], a ld a, [hli] - ld [$ff39], a + ldh [rWave_9], a ld a, [hli] - ld [$ff3a], a + ldh [rWave_a], a ld a, [hli] - ld [$ff3b], a + ldh [rWave_b], a ld a, [hli] - ld [$ff3c], a + ldh [rWave_c], a ld a, [hli] - ld [$ff3d], a + ldh [rWave_d], a ld a, [hli] - ld [$ff3e], a + ldh [rWave_e], a ld a, [hli] - ld [$ff3f], a + ldh [rWave_f], a .skip pop hl - ld a, [Crysaudio+$193] - and a, $f0 + ld a, [wCurTrackIntensity] + and $f0 sla a - ld [rNR32], a + ldh [rNR32], a ret -.Channel4 -.Channel8 - ld hl, Channel1NoteFlags - Channel1 +.Channel4: +.Channel8: + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - bit 5, [hl] ; rest + bit NOTE_REST, [hl] ; rest jr nz, .ch4rest - bit 4, [hl] + bit NOTE_NOISE_SAMPLING, [hl] jr nz, .asm_e82d4 ret + .asm_e82c1 ; unused - ld a, [Crysaudio+$194] - ld [rNR43], a + ld a, [wCurTrackFrequency] + ldh [rNR43], a ret + .ch4rest - ld a, [rNR52] - and a, %10000111 ; ch4 off - ld [rNR52], a - ld hl, $ff1f + ldh a, [rNR52] + and %10000111 ; ch4 off + ldh [rNR52], a + ld hl, rNR40 call ClearChannel ret + .asm_e82d4 ld a, $3f ; sound length - ld [rNR41], a - ld a, [Crysaudio+$193] - ld [rNR42], a - ld a, [Crysaudio+$194] - ld [rNR43], a + ldh [rNR41], a + ld a, [wCurTrackIntensity] + ldh [rNR42], a + ld a, [wCurTrackFrequency] + ldh [rNR43], a ld a, $80 - ld [rNR44], a + ldh [rNR44], a ret -; e82e7 -_CheckSFX: ; e82e7 +_CheckSFX: ; return carry if any sfx channels are active - ld hl, Crysaudio+$cc ; Channel5Flags - bit 0, [hl] + ld hl, wChannel5Flags1 + bit SOUND_CHANNEL_ON, [hl] jr nz, .sfxon - ld hl, Crysaudio+$fe ; Channel6Flags - bit 0, [hl] + ld hl, wChannel6Flags1 + bit SOUND_CHANNEL_ON, [hl] jr nz, .sfxon - ld hl, Crysaudio+$130 ; Channel7Flags - bit 0, [hl] + ld hl, wChannel7Flags1 + bit SOUND_CHANNEL_ON, [hl] jr nz, .sfxon - ld hl, Crysaudio+$162 ; Channel8Flags - bit 0, [hl] + ld hl, wChannel8Flags1 + bit SOUND_CHANNEL_ON, [hl] jr nz, .sfxon and a ret + .sfxon scf ret -; e8307 -Functione8307: ; e8307 -; what is Crysaudio+$1a6? - ld a, [Crysaudio+$1a6] - bit 7, a +PlayDanger: + ld a, [wDanger] ; XXX + bit DANGER_ON_F, a ret z - and a, $7f + + ; Don't do anything if SFX is being played + and $ff ^ (1 << DANGER_ON_F) ld d, a call _CheckSFX - jr c, .asm_e8335 + jr c, .increment + + ; Play the high tone and a - jr z, .asm_e8323 - cp a, $10 - jr z, .asm_e831e - jr .asm_e8335 -.asm_e831e - ld hl, Tablee8354 - jr .updatehw -.asm_e8323 - ld hl, Tablee8350 -.updatehw + jr z, .begin + + ; Play the low tone + cp 16 + jr z, .halfway + + jr .increment + +.halfway + ld hl, DangerSoundLow + jr .applychannel + +.begin + ld hl, DangerSoundHigh + +.applychannel xor a - ld [rNR10], a ; sweep off + ldh [rNR10], a ld a, [hli] - ld [rNR11], a ; sound length / duty cycle + ldh [rNR11], a ld a, [hli] - ld [rNR12], a ; ch1 volume envelope + ldh [rNR12], a ld a, [hli] - ld [rNR13], a ; ch1 frequency lo + ldh [rNR13], a ld a, [hli] - ld [rNR14], a ; ch1 frequency hi -.asm_e8335 + ldh [rNR14], a + +.increment ld a, d inc a - cp a, $1e - jr c, .asm_e833c + cp 30 ; Ending frame + jr c, .noreset xor a -.asm_e833c - or a, $80 - ld [Crysaudio+$1a6], a - ; is hw ch1 on? - ld a, [SoundOutput] - and a, $11 - ret nz - ; if not, turn it on - ld a, [SoundOutput] - or a, $11 - ld [SoundOutput], a - ret -; e8350 +.noreset + ; Make sure the danger sound is kept on + or 1 << DANGER_ON_F + ld [wDanger], a ; XXX -Tablee8350: ; e8350 + ; Enable channel 1 if it's off + ld a, [wSoundOutput] + and $11 + ret nz + ld a, [wSoundOutput] + or $11 + ld [wSoundOutput], a + ret + +DangerSoundHigh: db $80 ; duty 50% - db $e2 ; volume $e, envelope decrease sweep 2 + db $e2 ; volume 14, envelope decrease sweep 2 db $50 ; frequency: $750 db $87 ; restart sound -; e8354 -Tablee8354: ; e8354 +DangerSoundLow: db $80 ; duty 50% - db $e2 ; volume $e, envelope decrease sweep 2 + db $e2 ; volume 14, envelope decrease sweep 2 db $ee ; frequency: $6ee db $86 ; restart sound -; e8358 -FadeMusic:: ; e8358 +FadeMusic: ; fade music if applicable ; usage: -; write to MusicFade +; write to wMusicFade ; song fades out at the given rate -; load song id in MusicFadeID +; load song id in wMusicFadeID ; fade new song in ; notes: ; max # frames per volume level is $3f ; fading? - ld a, [MusicFade] + ld a, [wMusicFade] and a ret z ; has the count ended? - ld a, [MusicFadeCount] + ld a, [wMusicFadeCount] and a jr z, .update ; count down dec a - ld [MusicFadeCount], a + ld [wMusicFadeCount], a ret + .update - ld a, [MusicFade] + ld a, [wMusicFade] ld d, a ; get new count - and a, $3f - ld [MusicFadeCount], a + and $3f + ld [wMusicFadeCount], a ; get SO1 volume - ld a, [Volume] - and a, $07 + ld a, [wVolume] + and VOLUME_SO1_LEVEL ; which way are we fading? - bit 7, d + bit MUSIC_FADE_IN_F, d jr nz, .fadein ; fading out and a jr z, .novolume dec a jr .updatevolume + .novolume ; make sure volume is off xor a - ld [Volume], a + ld [wVolume], a ; did we just get on a bike? - ld a, [PlayerState] - cp a, $01 ; bicycle + ld a, [wWalkBikeSurfState] ; XXX + cp 1 ; PLAYER_BIKE jr z, .bicycle push bc ; restart sound call MusicFadeRestart ; get new song id - ld a, [MusicFadeIDLo] + ld a, [wMusicFadeID] and a jr z, .quit ; this assumes there are fewer than 256 songs! ld e, a - ld a, [MusicFadeIDHi] + ld a, [wMusicFadeID + 1] ld d, a ; load new song call _PlayMusic @@ -645,8 +663,9 @@ FadeMusic:: ; e8358 pop bc ; stop fading xor a - ld [MusicFade], a + ld [wMusicFade], a ret + .bicycle push bc ; restart sound @@ -654,131 +673,133 @@ FadeMusic:: ; e8358 ; this turns the volume up ; turn it back down xor a - ld [Volume], a + ld [wVolume], a ; get new song id - ld a, [MusicFadeIDLo] + ld a, [wMusicFadeID] ld e, a - ld a, [MusicFadeIDHi] + ld a, [wMusicFadeID + 1] ld d, a ; load new song call _PlayMusic pop bc ; fade in - ld hl, MusicFade - set 7, [hl] + ld hl, wMusicFade + set MUSIC_FADE_IN_F, [hl] ret + .fadein ; are we done? - cp a, $07 + cp MAX_VOLUME & $f jr nc, .maxvolume ; inc volume inc a jr .updatevolume + .maxvolume ; we're done xor a - ld [MusicFade], a + ld [wMusicFade], a ret + .updatevolume ; hi = lo ld d, a swap a or d - ld [Volume], a + ld [wVolume], a ret -; e83d1 -LoadNote: ; e83d1 - ; check mute?? - ld hl, Channel1Flags2 - Channel1 +LoadNote: + ; wait for pitch wheel to finish + ld hl, CHANNEL_FLAGS2 add hl, bc - bit 1, [hl] + bit SOUND_PITCH_WHEEL, [hl] ret z ; get note duration - ld hl, Channel1NoteDuration - Channel1 + ld hl, CHANNEL_NOTE_DURATION add hl, bc ld a, [hl] - ld hl, Crysaudio+$197 ; ???? + ld hl, wCurNoteDuration sub [hl] jr nc, .ok - ld a, $01 + ld a, 1 .ok ld [hl], a ; get frequency - ld hl, Channel1Frequency - Channel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] - ; ???? - ld hl, $0021 + ; get direction of pitch wheel + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, e sub [hl] ld e, a ld a, d - sbc a, $00 + sbc 0 ld d, a - ; ???? - ld hl, $0022 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc sub [hl] - jr nc, .asm_e8420 - ; ???? - ld hl, Channel1Flags3 - Channel1 + jr nc, .greater_than + ld hl, CHANNEL_FLAGS3 add hl, bc - set 1, [hl] + set SOUND_PITCH_WHEEL_DIR, [hl] ; get frequency - ld hl, Channel1Frequency - Channel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] ; ???? - ld hl, $0021 + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, [hl] sub e ld e, a ld a, d - sbc a, $00 + sbc 0 ld d, a ; ???? - ld hl, $0022 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc ld a, [hl] sub d ld d, a - jr .asm_e843e -.asm_e8420 - ; ???? - ld hl, Channel1Flags3 - Channel1 + jr .resume + +.greater_than + ld hl, CHANNEL_FLAGS3 add hl, bc - res 1, [hl] + res SOUND_PITCH_WHEEL_DIR, [hl] ; get frequency - ld hl, Channel1Frequency - Channel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] - ; ???? - ld hl, $0021 + ; get distance from pitch wheel target + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, e sub [hl] ld e, a ld a, d - sbc a, $00 + sbc 0 ld d, a - ; ???? - ld hl, $0022 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc sub [hl] ld d, a -.asm_e843e +.resume + ; de = x * [wCurNoteDuration] + y + ; x + 1 -> d + ; y -> a push bc - ld hl, Crysaudio+$197 - ld b, $00 ; loop count + ld hl, wCurNoteDuration + ld b, 0 ; quotient .loop inc b ld a, e @@ -790,80 +811,77 @@ LoadNote: ; e83d1 jr z, .quit dec d jr .loop + .quit - ld a, e ; result + ld a, e ; remainder add [hl] - ld d, b ; loop count - ; ???? + ld d, b ; quotient pop bc - ld hl, $0023 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT add hl, bc - ld [hl], d - ld hl, $0024 + ld [hl], d ; quotient + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION add hl, bc - ld [hl], a - ; clear ???? - ld hl, $0025 + ld [hl], a ; remainder + ld hl, CHANNEL_FIELD25 add hl, bc xor a ld [hl], a ret -; e8466 -Functione8466: ; e8466 -; handle vibrato and other things -; unknowns: Crysaudio+$192, Crysaudio+$194 - ld hl, Channel1Flags2 - Channel1 +HandleTrackVibrato: +; handle duty, cry pitch, and vibrato + ld hl, CHANNEL_FLAGS2 add hl, bc - bit 2, [hl] + bit SOUND_DUTY, [hl] ; duty jr z, .next - ld hl, $001c + ld hl, CHANNEL_SFX_DUTY_LOOP add hl, bc ld a, [hl] rlca rlca ld [hl], a - and a, $c0 - ld [Crysaudio+$192], a - ld hl, Channel1NoteFlags - Channel1 + and $c0 + ld [wCurTrackDuty], a + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 0, [hl] + set NOTE_DUTY_OVERRIDE, [hl] .next - ld hl, Channel1Flags2 - Channel1 + ld hl, CHANNEL_FLAGS2 add hl, bc - bit 4, [hl] + bit SOUND_CRY_PITCH, [hl] jr z, .vibrato - ld hl, $0027 + ld hl, CHANNEL_CRY_PITCH add hl, bc ld e, [hl] inc hl ld d, [hl] - ld hl, Crysaudio+$194 + ld hl, wCurTrackFrequency ld a, [hli] ld h, [hl] ld l, a add hl, de ld e, l ld d, h - ld hl, Crysaudio+$194 + ld hl, wCurTrackFrequency ld [hl], e inc hl ld [hl], d .vibrato ; is vibrato on? - ld hl, Channel1Flags2 - Channel1 + ld hl, CHANNEL_FLAGS2 add hl, bc - bit 0, [hl] ; vibrato + bit SOUND_VIBRATO, [hl] ; vibrato jr z, .quit ; is vibrato active for this note yet? ; is the delay over? - ld hl, Channel1VibratoDelayCount - Channel1 + ld hl, CHANNEL_VIBRATO_DELAY_COUNT add hl, bc ld a, [hl] and a jr nz, .subexit ; is the extent nonzero? - ld hl, Channel1VibratoExtent - Channel1 + ld hl, CHANNEL_VIBRATO_EXTENT add hl, bc ld a, [hl] and a @@ -871,14 +889,15 @@ Functione8466: ; e8466 ; save it for later ld d, a ; is it time to toggle vibrato up/down? - ld hl, Channel1VibratoRate - Channel1 + ld hl, CHANNEL_VIBRATO_RATE add hl, bc ld a, [hl] - and a, $0f ; count + and $f ; count jr z, .toggle .subexit dec [hl] jr .quit + .toggle ; refresh count ld a, [hl] @@ -886,181 +905,189 @@ Functione8466: ; e8466 or [hl] ld [hl], a ; ???? - ld a, [Crysaudio+$194] + ld a, [wCurTrackFrequency] ld e, a ; toggle vibrato up/down - ld hl, Channel1Flags3 - Channel1 + ld hl, CHANNEL_FLAGS3 add hl, bc - bit 0, [hl] ; vibrato up/down + bit SOUND_VIBRATO_DIR, [hl] ; vibrato up/down jr z, .down ; up ; vibrato down - res 0, [hl] + res SOUND_VIBRATO_DIR, [hl] ; get the delay ld a, d - and a, $0f ; lo + and $f ; lo ; ld d, a ld a, e sub d - jr nc, .asm_e84ef - ld a, $00 - jr .asm_e84ef + jr nc, .no_carry + ld a, 0 + jr .no_carry + .down ; vibrato up - set 0, [hl] + set SOUND_VIBRATO_DIR, [hl] ; get the delay ld a, d - and a, $f0 ; hi + and $f0 ; hi swap a ; move it to lo ; add e - jr nc, .asm_e84ef + jr nc, .no_carry ld a, $ff -.asm_e84ef - ld [Crysaudio+$194], a +.no_carry + ld [wCurTrackFrequency], a ; - ld hl, Channel1NoteFlags - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 6, [hl] + set NOTE_VIBRATO_OVERRIDE, [hl] .quit ret -; e84f9 -Functione84f9: ; e84f9 - ; quit if ???? - ld hl, Channel1Flags2 - Channel1 +ApplyPitchWheel: + ; quit if pitch wheel inactive + ld hl, CHANNEL_FLAGS2 add hl, bc - bit 1, [hl] + bit SOUND_PITCH_WHEEL, [hl] ret z ; de = Frequency - ld hl, Channel1Frequency - Channel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld e, [hl] inc hl ld d, [hl] - ; - ld hl, Channel1Flags3 - Channel1 + ; check whether pitch wheel is going up or down + ld hl, CHANNEL_FLAGS3 add hl, bc - bit 1, [hl] - jr z, .next - ; - ld hl, $0023 + bit SOUND_PITCH_WHEEL_DIR, [hl] + jr z, .decreasing + ; frequency += [Channel*PitchWheelAmount] + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT add hl, bc ld l, [hl] - ld h, $00 + ld h, 0 add hl, de ld d, h ld e, l - ; get ???? - ld hl, $0024 + ; [Channel*Field25] += [Channel*PitchWheelAmountFraction] + ; if rollover: Frequency += 1 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION add hl, bc ld a, [hl] - ; add it to ???? - ld hl, $0025 + ld hl, CHANNEL_FIELD25 add hl, bc add [hl] ld [hl], a - ld a, $00 + ld a, 0 adc e ld e, a - ld a, $00 + ld a, 0 adc d ld d, a - ; - ld hl, $0022 + ; Compare the dw at [Channel*PitchWheelTarget] to de. + ; If frequency is greater, we're finished. + ; Otherwise, load the frequency and set two flags. + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc ld a, [hl] cp d - jp c, .quit1 - jr nz, .quit2 - ld hl, $0021 + jp c, .finished_pitch_wheel + jr nz, .continue_pitch_wheel + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, [hl] cp e - jp c, .quit1 - jr .quit2 -.next + jp c, .finished_pitch_wheel + jr .continue_pitch_wheel + +.decreasing + ; frequency -= [Channel*PitchWheelAmount] ld a, e - ld hl, $0023 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT add hl, bc ld e, [hl] sub e ld e, a ld a, d - sbc a, $00 + sbc 0 ld d, a - ld hl, $0024 + ; [Channel*Field25] *= 2 + ; if rollover: Frequency -= 1 + ld hl, CHANNEL_PITCH_WHEEL_AMOUNT_FRACTION add hl, bc ld a, [hl] add a ld [hl], a ld a, e - sbc a, $00 + sbc 0 ld e, a ld a, d - sbc a, $00 - ld d,a - ld hl, $0022 + sbc 0 + ld d, a + ; Compare the dw at [Channel*PitchWheelTarget] to de. + ; If frequency is lower, we're finished. + ; Otherwise, load the frequency and set two flags. + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc ld a, d cp [hl] - jr c, .quit1 - jr nz, .quit2 - ld hl, $0021 + jr c, .finished_pitch_wheel + jr nz, .continue_pitch_wheel + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld a, e cp [hl] - jr nc, .quit2 -.quit1 - ld hl, Channel1Flags2 - Channel1 + jr nc, .continue_pitch_wheel +.finished_pitch_wheel + ld hl, CHANNEL_FLAGS2 add hl, bc - res 1, [hl] - ld hl, Channel1Flags3 - Channel1 + res SOUND_PITCH_WHEEL, [hl] + ld hl, CHANNEL_FLAGS3 add hl, bc - res 1, [hl] + res SOUND_PITCH_WHEEL_DIR, [hl] ret -.quit2 - ld hl, Channel1Frequency - Channel1 + +.continue_pitch_wheel + ld hl, CHANNEL_FREQUENCY add hl, bc ld [hl], e inc hl ld [hl], d - ld hl, Channel1NoteFlags - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 1, [hl] - set 0, [hl] + set NOTE_FREQ_OVERRIDE, [hl] + set NOTE_DUTY_OVERRIDE, [hl] ret -; e858c -HandleNoise: ; e858c +HandleNoise: ; is noise sampling on? - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 4, [hl] ; noise sampling + bit SOUND_NOISE, [hl] ; noise sampling ret z ; are we in a sfx channel? - ld a, [CurChannel] - bit 2, a ; sfx + ld a, [wCurChannel] + bit NOISE_CHAN_F, a jr nz, .next ; is ch8 on? (noise) - ld hl, Crysaudio+$162 ; Channel8Flags - bit 0, [hl] ; on? + ld hl, wChannel8Flags1 + bit SOUND_CHANNEL_ON, [hl] ; on? jr z, .next ; is ch8 playing noise? - bit 4, [hl] + bit SOUND_NOISE, [hl] ret nz ; quit if so ; .next - ld a, [Crysaudio+$1a2] + ld a, [wNoiseSampleDelay] and a jr z, ReadNoiseSample dec a - ld [Crysaudio+$1a2], a + ld [wNoiseSampleDelay], a ret -; e85af -ReadNoiseSample: ; e85af +ReadNoiseSample: ; sample struct: ; [wx] [yy] [zz] ; w: ? either 2 or 3 @@ -1068,8 +1095,8 @@ ReadNoiseSample: ; e85af ; zz: intensity ; yy: frequency - ; de = [NoiseSampleAddress] - ld hl, NoiseSampleAddress + ; de = [wNoiseSampleAddress] + ld hl, wNoiseSampleAddress ld e, [hl] inc hl ld d, [hl] @@ -1082,40 +1109,40 @@ ReadNoiseSample: ; e85af ld a, [de] inc de - cp $ff + cp endchannel_cmd jr z, .quit and $f inc a - ld [Crysaudio+$1a2], a + ld [wNoiseSampleDelay], a ld a, [de] inc de - ld [Crysaudio+$193], a + ld [wCurTrackIntensity], a ld a, [de] inc de - ld [Crysaudio+$194], a + ld [wCurTrackFrequency], a xor a - ld [Crysaudio+$195], a + ld [wCurTrackFrequency + 1], a - ld hl, NoiseSampleAddress + ld hl, wNoiseSampleAddress ld [hl], e inc hl ld [hl], d - ld hl, Channel1NoteFlags - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 4, [hl] + set NOTE_NOISE_SAMPLING, [hl] ret + .quit ret -; e85e1 -ParseMusic: ; e85e1 +ParseMusic: ; parses until a note is read or the song is ended call GetMusicByte ; store next byte in a - cp a, $ff ; is the song over? - jr z, .readff - cp a, $d0 ; is it a note? + cp endchannel_cmd + jr z, .endchannel + cp FIRST_MUSIC_CMD jr c, .readnote ; then it's a command .readcommand @@ -1123,233 +1150,213 @@ ParseMusic: ; e85e1 jr ParseMusic ; start over .readnote -; CurMusicByte contains current note +; wCurMusicByte contains current note ; special notes - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 3, [hl] - jp nz, Functione8698 - bit 5, [hl] - jp nz, Functione8698 - bit 4, [hl] ; noise sample + bit SOUND_SFX, [hl] + jp nz, ParseSFXOrRest + bit SOUND_REST, [hl] ; rest + jp nz, ParseSFXOrRest + bit SOUND_NOISE, [hl] ; noise sample jp nz, GetNoiseSample ; normal note ; set note duration (bottom nybble) - ld a, [CurMusicByte] - and a, $0f + ld a, [wCurMusicByte] + and $f call SetNoteDuration ; get note pitch (top nybble) - ld a, [CurChannel] - ld e, a - ld d, 0 - ld hl, wChannelSelectorSwitches - add hl, de - ld a, [hl] - and a - jr z, .notMuted - xor a - jr .rest -.notMuted - ld a, [CurMusicByte] + ld a, [wCurMusicByte] swap a - and a, $0f - jr z, .rest ; pitch $0 -> rest + and $f + jr z, .rest ; pitch 0-> rest ; update pitch - ld hl, Channel1Pitch - Channel1 + ld hl, CHANNEL_PITCH add hl, bc ld [hl], a ; store pitch in e ld e, a ; store octave in d - ld hl, Channel1Octave - Channel1 + ld hl, CHANNEL_OCTAVE add hl, bc ld d, [hl] ; update frequency call GetFrequency - ld hl, Channel1Frequency - Channel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld [hl], e inc hl ld [hl], d ; ???? - ld hl, Channel1NoteFlags - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 4, [hl] + set NOTE_NOISE_SAMPLING, [hl] jp LoadNote + .rest ; note = rest - ld hl, Channel1Pitch - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - ld [hl], a - - ld hl, Channel1NoteFlags - Channel1 - add hl, bc - set 5, [hl] ; Rest + set NOTE_REST, [hl] ; Rest ret -; -.readff + +.endchannel ; $ff is reached in music data - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 1, [hl] ; in a subroutine? + bit SOUND_SUBROUTINE, [hl] ; in a subroutine? jr nz, .readcommand ; execute - ld a, [CurChannel] - cp a, $04 ; channels 0-3? - jr nc, .asm_e8651 + ld a, [wCurChannel] + cp CHAN5 + jr nc, .chan_5to8 ; ???? - ld hl, $00cb + ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1 add hl, bc - bit 0, [hl] + bit SOUND_CHANNEL_ON, [hl] jr nz, .ok -.asm_e8651 - ld hl, Channel1Flags - Channel1 +.chan_5to8 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 5, [hl] + bit SOUND_REST, [hl] call nz, RestoreVolume ; end music - ld a, [CurChannel] - cp a, $04 ; channel 5? + ld a, [wCurChannel] + cp CHAN5 jr nz, .ok ; ???? xor a - ld [rNR10], a ; sweep = 0 + ldh [rNR10], a ; sweep = 0 .ok ; stop playing ; turn channel off - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - res 0, [hl] + res SOUND_CHANNEL_ON, [hl] ; note = rest - ld hl, Channel1NoteFlags - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 5, [hl] + set NOTE_REST, [hl] ; clear music id & bank - ld hl, Channel1MusicID - Channel1 + ld hl, CHANNEL_MUSIC_ID add hl, bc xor a ld [hli], a ; id hi ld [hli], a ; id lo ld [hli], a ; bank ret -; e8679 -RestoreVolume: ; e8679 +RestoreVolume: ; ch5 only - ld a, [CurChannel] - cp a, $04 + ld a, [wCurChannel] + cp CHAN5 ret nz xor a - ld hl, Crysaudio+$122 + ld hl, wChannel6CryPitch ld [hli], a ld [hl], a - ld hl, Crysaudio+$186 + ld hl, wChannel8CryPitch ld [hli], a ld [hl], a - ld a, [LastVolume] - ld [Volume], a + ld a, [wLastVolume] + ld [wVolume], a xor a - ld [LastVolume], a - ld [SFXPriority], a + ld [wLastVolume], a + ld [wSFXPriority], a ret -; e8698 -Functione8698: ; e8698 +ParseSFXOrRest: ; turn noise sampling on - ld hl, Channel1NoteFlags - Channel1 + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 4, [hl] ; noise sample + set NOTE_NOISE_SAMPLING, [hl] ; noise sample ; update note duration - ld a, [CurMusicByte] + ld a, [wCurMusicByte] call SetNoteDuration ; top nybble doesnt matter? ; update intensity from next param call GetMusicByte - ld hl, Channel1Intensity - Channel1 + ld hl, CHANNEL_INTENSITY add hl, bc ld [hl], a ; update lo frequency from next param call GetMusicByte - ld hl, Channel1FrequencyLo - Channel1 + ld hl, CHANNEL_FREQUENCY add hl, bc ld [hl], a ; are we on the last channel? (noise sampling) - ld a, [CurChannel] - and a, $03 - cp a, $03 + ld a, [wCurChannel] + maskbits NUM_MUSIC_CHANS + cp CHAN4 ret z ; update hi frequency from next param call GetMusicByte - ld hl, Channel1FrequencyHi - Channel1 + ld hl, CHANNEL_FREQUENCY + 1 add hl, bc ld [hl], a ret -; e86c5 -GetNoiseSample: ; e86c5 -; load ptr to sample header in NoiseSampleAddress +GetNoiseSample: +; load ptr to sample header in wNoiseSampleAddress ; are we on the last channel? - ld a, [CurChannel] - and a, $03 - cp a, $03 + ld a, [wCurChannel] + and NUM_MUSIC_CHANS + -1 + cp CHAN4 ; ret if not ret nz ; update note duration - ld a, [CurMusicByte] - and a, $0f + ld a, [wCurMusicByte] + and $f call SetNoteDuration - ld a, [wChannelSelectorSwitches+3] - and a - ret nz ; check current channel - ld a, [CurChannel] - bit 2, a ; are we in a sfx channel? + ld a, [wCurChannel] + bit NOISE_CHAN_F, a jr nz, .sfx - ld hl, Crysaudio+$162 ; Channel8Flags - bit 0, [hl] ; is ch8 on? (noise) + ld hl, wChannel8Flags1 + bit SOUND_CHANNEL_ON, [hl] ; is ch8 on? (noise) ret nz - ld a, [MusicNoiseSampleSet] + ld a, [wMusicNoiseSampleSet] jr .next + .sfx - ld a, [SFXNoiseSampleSet] + ld a, [wSFXNoiseSampleSet] .next ; load noise sample set id into de ld e, a - ld d, $00 + ld d, 0 ; load ptr to noise sample set in hl - ld hl, NoiseSampleSetsPointers + ld hl, Drumkits add hl, de add hl, de ld a, [hli] ld h, [hl] ld l, a ; get pitch - ld a, [CurMusicByte] + ld a, [wCurMusicByte] swap a ; non-rest note? - and a, $0f + and $f ret z ; use 'pitch' to seek noise sample set ld e, a - ld d, $00 + ld d, 0 add hl, de add hl, de - ; load sample pointer into NoiseSampleAddress + ; load sample pointer into wNoiseSampleAddress ld a, [hli] - ld [NoiseSampleAddressLo], a + ld [wNoiseSampleAddress], a ld a, [hl] - ld [NoiseSampleAddressHi], a + ld [wNoiseSampleAddress + 1], a ; clear ???? xor a - ld [Crysaudio+$1a2], a + ld [wNoiseSampleDelay], a ret -; e870f -ParseMusicCommand: ; e870f +ParseMusicCommand: ; reload command - ld a, [CurMusicByte] + ld a, [wCurMusicByte] ; get command # - sub a, $d0 ; first command + sub FIRST_MUSIC_CMD ld e, a - ld d, $00 + ld d, 0 ; seek command pointer ld hl, MusicCommands add hl, de @@ -1359,44 +1366,42 @@ ParseMusicCommand: ; e870f ld h, [hl] ld l, a jp hl -; e8720 -MusicCommands: ; e8720 -; pointer to each command in order - ; octaves - dw MusicD0 ; octave 8 - dw MusicD1 ; octave 7 - dw MusicD2 ; octave 6 - dw MusicD3 ; octave 5 - dw MusicD4 ; octave 4 - dw MusicD5 ; octave 3 - dw MusicD6 ; octave 2 - dw MusicD7 ; octave 1 - dw MusicD8 ; note length + intensity - dw MusicD9 ; set starting octave - dw MusicDA ; tempo - dw MusicDB ; duty cycle - dw MusicDC ; intensity - dw MusicDD ; update sound status - dw MusicDE ; ???? + duty cycle - dw MusicDF ; - dw MusicE0 ; - dw MusicE1 ; vibrato - dw MusicE2 ; - dw MusicE3 ; music noise sampling - dw MusicE4 ; force panning - dw MusicE5 ; volume - dw MusicE6 ; tune - dw MusicE7 ; - dw MusicE8 ; - dw MusicE9 ; global tempo - dw MusicEA ; restart current channel from header - dw MusicEB ; new song - dw MusicEC ; sfx priority on - dw MusicED ; sfx priority off - dw MusicEE ; - dw MusicEF ; stereo panning - dw MusicF0 ; sfx noise sampling +MusicCommands: +; entries correspond to macros/sound.asm enumeration + dw Music_Octave8 ; octave 8 + dw Music_Octave7 ; octave 7 + dw Music_Octave6 ; octave 6 + dw Music_Octave5 ; octave 5 + dw Music_Octave4 ; octave 4 + dw Music_Octave3 ; octave 3 + dw Music_Octave2 ; octave 2 + dw Music_Octave1 ; octave 1 + dw Music_NoteType ; note length + intensity + dw Music_ForceOctave ; set starting octave + dw Music_Tempo ; tempo + dw Music_DutyCycle ; duty cycle + dw Music_Intensity ; intensity + dw Music_SoundStatus ; update sound status + dw Music_SoundDuty ; sfx duty + dw Music_ToggleSFX ; sound on/off + dw Music_SlidePitchTo ; pitch wheel + dw Music_Vibrato ; vibrato + dw MusicE2 ; unused + dw Music_ToggleNoise ; music noise sampling + dw Music_Panning ; force panning + dw Music_Volume ; volume + dw Music_Tone ; tone + dw MusicE7 ; unused + dw MusicE8 ; unused + dw Music_TempoRelative ; global tempo + dw Music_RestartChannel ; restart current channel from header + dw Music_NewSong ; new song + dw Music_SFXPriorityOn ; sfx priority on + dw Music_SFXPriorityOff ; sfx priority off + dw MusicEE ; unused + dw Music_StereoPanning ; stereo panning + dw Music_SFXToggleNoise ; sfx noise sampling dw MusicF1 ; nothing dw MusicF2 ; nothing dw MusicF3 ; nothing @@ -1405,79 +1410,59 @@ MusicCommands: ; e8720 dw MusicF6 ; nothing dw MusicF7 ; nothing dw MusicF8 ; nothing - dw MusicF9 ; - dw MusicFA ; - dw MusicFB ; - dw MusicFC ; jump - dw MusicFD ; loop - dw MusicFE ; call - dw MusicFF ; return -; e8780 + dw MusicF9 ; unused + dw Music_SetCondition ; setcondition + dw Music_JumpIf ; jumpif + dw Music_JumpChannel ; jump + dw Music_LoopChannel ; loop + dw Music_CallChannel ; call + dw Music_EndChannel ; return -MusicF1: ; e8780 -; global tempo -; params: 2 -; de: tempo - call GetMusicByte - ld d, a - call GetMusicByte - ld e, a - call SetGlobalTempo - ret - -MusicF2: ; e8780 -; duty cycle -; params: 1 - call GetMusicByte - rrca - rrca - and a, $c0 - ld hl, Channel1DutyCycle - Channel1 - add hl, bc - ld [hl], a - ret - -MusicF3: ; e8780 +MusicF1: +MusicF2: +MusicF3: ;custom waveform ld e, 16 - ld hl, $ff30 + ld hl, rWave_0 .read call GetMusicByte - ldi [hl], a + ld [hli], a dec e jr nz, .read ret -MusicF4: ; e8780 +MusicF4: ;inc_octave - ld hl, Channel1Octave - Channel1 + ld hl, CHANNEL_OCTAVE add hl, bc ld a, [hl] dec a + and 7 ld [hl], a ret -MusicF5: ; e8780 +MusicF5: ;dec_octave - ld hl, Channel1Octave - Channel1 + ld hl, CHANNEL_OCTAVE add hl, bc ld a, [hl] inc a + and 7 ld [hl], a ret -MusicF6: ; e8780 +MusicF6: ;notetype0 call GetMusicByte - ld hl, $002d + ld hl, CHANNEL_NOTE_LENGTH add hl, bc ld [hl], a ret -MusicF7: ; e8780 +MusicF7: ;notetype1 call GetMusicByte - ld hl, Channel1Intensity - Channel1 + ld hl, CHANNEL_INTENSITY add hl, bc rla rla @@ -1493,10 +1478,10 @@ MusicF7: ; e8780 ld [hl], a ret -MusicF8: ; e8780 +MusicF8: ;notetype2 call GetMusicByte - ld hl, Channel1Intensity - Channel1 + ld hl, CHANNEL_INTENSITY add hl, bc push bc ld b, a @@ -1506,31 +1491,29 @@ MusicF8: ; e8780 pop bc ld [hl], a ret -; e8781 -MusicFF: ; e8781 +Music_EndChannel: ; called when $ff is encountered w/ subroutine flag set ; end music stream ; return to caller of the subroutine ; reset subroutine flag - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - res 1, [hl] + res SOUND_SUBROUTINE, [hl] ; copy LastMusicAddress to MusicAddress - ld hl, Channel1LastMusicAddress - Channel1 + ld hl, CHANNEL_LAST_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl ld d, [hl] - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ret -; e8796 -MusicFE: ; e8796 +Music_CallChannel: ; call music stream (subroutine) ; parameters: ll hh ; pointer to subroutine ; get pointer from next 2 bytes @@ -1540,31 +1523,30 @@ MusicFE: ; e8796 ld d, a push de ; copy MusicAddress to LastMusicAddress - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl ld d, [hl] - ld hl, Channel1LastMusicAddress - Channel1 + ld hl, CHANNEL_LAST_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ; load pointer into MusicAddress pop de - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ; set subroutine flag - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - set 1, [hl] + set SOUND_SUBROUTINE, [hl] ret -; e87bc -MusicFC: ; e87bc +Music_JumpChannel: ; jump ; parameters: ll hh ; pointer ; get pointer from next 2 bytes @@ -1572,15 +1554,14 @@ MusicFC: ; e87bc ld e, a call GetMusicByte ld d, a - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ret -; e87cc -MusicFD: ; e87cc +Music_LoopChannel: ; loops xx - 1 times ; 00: infinite ; params: 3 @@ -1590,20 +1571,20 @@ MusicFD: ; e87cc ; get loop count call GetMusicByte - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 2, [hl] ; has the loop been initiated? + bit SOUND_LOOPING, [hl] ; has the loop been initiated? jr nz, .checkloop and a ; loop counter 0 = infinite jr z, .loop ; initiate loop dec a - set 2, [hl] ; set loop flag - ld hl, Channel1LoopCount - Channel1 + set SOUND_LOOPING, [hl] ; set loop flag + ld hl, CHANNEL_LOOP_COUNT add hl, bc ld [hl], a ; store loop counter .checkloop - ld hl, Channel1LoopCount - Channel1 + ld hl, CHANNEL_LOOP_COUNT add hl, bc ld a, [hl] and a ; are we done? @@ -1616,7 +1597,7 @@ MusicFD: ; e87cc call GetMusicByte ld d, a ; load new pointer into MusicAddress - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl @@ -1625,11 +1606,11 @@ MusicFD: ; e87cc .endloop ; reset loop flag - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - res 2, [hl] + res SOUND_LOOPING, [hl] ; skip to next command - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl @@ -1640,9 +1621,8 @@ MusicFD: ; e87cc dec hl ld [hl], e ret -; e880e -MusicFA: ; e880e +Music_SetCondition: ; set condition for a jump ; used with FB ; params: 1 @@ -1650,13 +1630,12 @@ MusicFA: ; e880e ; set condition call GetMusicByte - ld hl, Channel1Condition - Channel1 + ld hl, CHANNEL_CONDITION add hl, bc ld [hl], a ret -; e8817 -MusicFB: ; e8817 +Music_JumpIf: ; conditional jump ; used with FA ; params: 3 @@ -1667,13 +1646,13 @@ MusicFB: ; e8817 ; a = condition call GetMusicByte ; if existing condition matches, jump to new address - ld hl, Channel1Condition - Channel1 + ld hl, CHANNEL_CONDITION add hl, bc cp [hl] jr z, .jump ; skip to next command ; get address - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl @@ -1686,6 +1665,7 @@ MusicFB: ; e8817 dec hl ld [hl], e ret + .jump ; jump to the new address ; get pointer @@ -1694,15 +1674,14 @@ MusicFB: ; e8817 call GetMusicByte ld d, a ; update pointer in MusicAddress - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ret -; e883e -MusicEE; e883e +MusicEE: ; conditional jump ; checks a byte in ram corresponding to the current channel ; doesn't seem to be set by any commands @@ -1711,12 +1690,12 @@ MusicEE; e883e ; if ????, jump ; get channel - ld a, [CurChannel] - and a, $03 ; ch0-3 + ld a, [wCurChannel] + maskbits NUM_MUSIC_CHANS ld e, a - ld d, $00 - ; hl = Crysaudio+$1b8 + channel id - ld hl, Crysaudio+$1b8 + ld d, 0 + ; hl = wChannel1JumpCondition + channel id + ld hl, wChannel1JumpCondition add hl, de ; if set, jump ld a, [hl] @@ -1724,7 +1703,7 @@ MusicEE; e883e jr nz, .jump ; skip to next command ; get address - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld e, [hl] inc hl @@ -1737,46 +1716,44 @@ MusicEE; e883e dec hl ld [hl], e ret + .jump ; reset jump flag - ld [hl], $00 + ld [hl], 0 ; de = pointer call GetMusicByte ld e, a call GetMusicByte ld d, a ; update address - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld [hl], e inc hl ld [hl], d ret -; e886d -MusicF9: ; e886d +MusicF9: ; sets some flag ; seems to be unused ; params: 0 - ld a, $01 - ld [Crysaudio+$1b5], a + ld a, TRUE + ld [wUnusedMusicF9Flag], a ret -; e8873 -MusicE2: ; e8873 +MusicE2: ; seems to have been dummied out ; params: 1 call GetMusicByte - ld hl, $002c + ld hl, CHANNEL_FIELD2C add hl, bc ld [hl], a - ld hl, Channel1Flags2 - Channel1 + ld hl, CHANNEL_FLAGS2 add hl, bc - set 3, [hl] + set SOUND_UNKN_0B, [hl] ret -; e8882 -MusicE1: ; e8882 +Music_Vibrato: ; vibrato ; params: 2 ; 1: [xx] @@ -1786,400 +1763,339 @@ MusicE1: ; e8882 ; z: rate (# frames per cycle) ; set vibrato flag? - ld hl, Channel1Flags2 - Channel1 + ld hl, CHANNEL_FLAGS2 add hl, bc - set 0, [hl] + set SOUND_VIBRATO, [hl] ; start at lower frequency (extent is positive) - ld hl, Channel1Flags3 - Channel1 + ld hl, CHANNEL_FLAGS3 add hl, bc - res 0, [hl] + res SOUND_VIBRATO_DIR, [hl] ; get delay call GetMusicByte ; update delay - ld hl, Channel1VibratoDelay - Channel1 + ld hl, CHANNEL_VIBRATO_DELAY add hl, bc ld [hl], a ; update delay count - ld hl, Channel1VibratoDelayCount - Channel1 + ld hl, CHANNEL_VIBRATO_DELAY_COUNT add hl, bc ld [hl], a ; update extent ; this is split into halves only to get added back together at the last second ; get extent/rate call GetMusicByte - ld hl, Channel1VibratoExtent - Channel1 + ld hl, CHANNEL_VIBRATO_EXTENT add hl, bc ld d, a ; get top nybble - and a, $f0 + and $f0 swap a srl a ; halve ld e, a - adc a, $00 ; round up + adc 0 ; round up swap a or e ld [hl], a ; update rate - ld hl, Channel1VibratoRate - Channel1 + ld hl, CHANNEL_VIBRATO_RATE add hl, bc ; get bottom nybble ld a, d - and a, $0f + and $f ld d, a swap a or d ld [hl], a ret -; e88bd -MusicE0: ; e88bd -; ???? +Music_SlidePitchTo: +; set the target for pitch wheel ; params: 2 +; note duration +; target note call GetMusicByte - ld [Crysaudio+$197], a + ld [wCurNoteDuration], a + call GetMusicByte + ; pitch in e ld d, a - and a, $0f + and $f ld e, a + + ; octave in d ld a, d swap a - and a, $0f + and $f ld d, a call GetFrequency - ld hl, $0021 + ld hl, CHANNEL_PITCH_WHEEL_TARGET add hl, bc ld [hl], e - ld hl, $0022 + ld hl, CHANNEL_PITCH_WHEEL_TARGET + 1 add hl, bc ld [hl], d - ld hl, Channel1Flags2 - Channel1 + ld hl, CHANNEL_FLAGS2 add hl, bc - set 1, [hl] + set SOUND_PITCH_WHEEL, [hl] ret -; e88e4 -MusicE6: ; e88e4 +Music_Tone: ; tone -; params: 2 - ld hl, Channel1Flags2 - Channel1 +; params: 1 (dw) + ld hl, CHANNEL_FLAGS2 add hl, bc - set 4, [hl] - ld hl, $0028 + set SOUND_CRY_PITCH, [hl] + ld hl, CHANNEL_CRY_PITCH + 1 add hl, bc call GetMusicByte ld [hld], a call GetMusicByte ld [hl], a ret -; e88f7 -MusicE7: ; e88f7 -; shrug +MusicE7: +; unused ; params: 1 - ld hl, Channel1Flags2 - Channel1 + ld hl, CHANNEL_FLAGS2 add hl, bc - set 6, [hl] + set SOUND_UNKN_0E, [hl] call GetMusicByte - ld hl, $0029 + ld hl, CHANNEL_FIELD29 add hl, bc ld [hl], a ret -; e8906 -MusicDE: ; e8906 -; ???? + duty cycle -; params: 1 - ; - ld hl, Channel1Flags2 - Channel1 +Music_SoundDuty: +; sequence of 4 duty cycles to be looped +; params: 1 (4 2-bit duty cycle arguments) + ld hl, CHANNEL_FLAGS2 add hl, bc - set 2, [hl] ; duty cycle - ; + set SOUND_DUTY, [hl] ; duty cycle + ; sound duty sequence call GetMusicByte rrca rrca - ld hl, $001c + ld hl, CHANNEL_SFX_DUTY_LOOP add hl, bc ld [hl], a ; update duty cycle - and a, $c0 ; only uses top 2 bits - ld hl, Channel1DutyCycle - Channel1 + and $c0 ; only uses top 2 bits + ld hl, CHANNEL_DUTY_CYCLE add hl, bc ld [hl], a ret -; e891e -MusicE8: ; e891e -; shrug +MusicE8: +; unused ; params: 1 - ld hl, Channel1Flags2 - Channel1 + ld hl, CHANNEL_FLAGS2 add hl, bc - set 5, [hl] + set SOUND_UNKN_0D, [hl] call GetMusicByte - ld hl, $002a + ld hl, CHANNEL_FIELD2A add hl, bc ld [hl], a ret -; e892d -MusicDF: ; e892d +Music_ToggleSFX: ; toggle something ; params: none - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 3, [hl] + bit SOUND_SFX, [hl] jr z, .on - res 3, [hl] + res SOUND_SFX, [hl] ret -.on - set 3, [hl] - ret -; e893b -MusicE3: ; e893b +.on + set SOUND_SFX, [hl] + ret + +Music_ToggleNoise: ; toggle music noise sampling ; can't be used as a straight toggle since the param is not read from on->off ; params: ; noise on: 1 ; noise off: 0 ; check if noise sampling is on - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 4, [hl] + bit SOUND_NOISE, [hl] jr z, .on ; turn noise sampling off - res 4, [hl] + res SOUND_NOISE, [hl] ret + .on ; turn noise sampling on - set 4, [hl] + set SOUND_NOISE, [hl] call GetMusicByte - ld [MusicNoiseSampleSet], a + ld [wMusicNoiseSampleSet], a ret -; e894f -MusicF0: ; e894f +Music_SFXToggleNoise: ; toggle sfx noise sampling ; params: ; on: 1 ; off: 0 ; check if noise sampling is on - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - bit 4, [hl] + bit SOUND_NOISE, [hl] jr z, .on ; turn noise sampling off - res 4, [hl] + res SOUND_NOISE, [hl] ret + .on ; turn noise sampling on - set 4, [hl] + set SOUND_NOISE, [hl] call GetMusicByte - ld [SFXNoiseSampleSet], a + ld [wSFXNoiseSampleSet], a ret -; e8963 -MusicD8: ; e8963 +Music_NoteType: ; note length ; # frames per 16th note -; intensity: see MusicDC +; intensity: see Music_Intensity ; params: 2 ; note length call GetMusicByte - ld hl, $002d + ld hl, CHANNEL_NOTE_LENGTH add hl, bc ld [hl], a - ld a, [CurChannel] - and a, $03 - cp a, $03 + ld a, [wCurChannel] + maskbits NUM_MUSIC_CHANS + cp CHAN4 ret z ; intensity - call MusicDC + call Music_Intensity ret -; e8977 -MusicDD: ; e8977 +Music_SoundStatus: ; update sound status ; params: 1 call GetMusicByte - ld [SoundInput], a - ld hl, Channel1NoteFlags - Channel1 + ld [wSoundInput], a + ld hl, CHANNEL_NOTE_FLAGS add hl, bc - set 3, [hl] + set NOTE_UNKN_3, [hl] ret -; e8984 -MusicDB: ; e8984 -; duty cycle, includes nite check +Music_DutyCycle: +; duty cycle ; params: 1 - ld a, [GBPrinter] - bit 2, a - jr nz, .ForceNite ;for the Music test - bit 3, a - jp nz, MusicF2 ;skip nite check -.ForceNite - ld a, [CurChannel] - cp a, $04 - jp nc, MusicF2 ;skip nite check call GetMusicByte rrca rrca - and a, $c0 - ld hl, Channel1DutyCycle - Channel1 + and $c0 + ld hl, CHANNEL_DUTY_CYCLE add hl, bc - ld d, a - ld a, [GBPrinter] - bit 2, a - jr nz, .NiteDuty ;for the Music test - ;ld a, [TimeOfDay] - ;cp NITE - ;jr z, .NiteDuty - ld a, d ld [hl], a ret -.NiteDuty - ld a, d - xor a, $40 - ld [hl], a - ret -; e8991 -MusicDC: ; e8991 +Music_Intensity: ; intensity ; params: 1 ; hi: pressure ; lo: velocity call GetMusicByte - ld hl, Channel1Intensity - Channel1 + ld hl, CHANNEL_INTENSITY add hl, bc ld [hl], a ret -; e899a -MusicDA: ; e899a -; global tempo includes nite check +Music_Tempo: +; global tempo ; params: 2 ; de: tempo - ld a, [GBPrinter] - bit 2, a - jr nz, .ForceNite ;for the Music test - bit 3, a - jp nz, MusicF1 ;skip nite check -.ForceNite - ld a, [CurChannel] - cp a, $04 - jp nc, MusicF1 ;skip nite check call GetMusicByte ld d, a call GetMusicByte ld e, a - ld a, [GBPrinter] - bit 2, a - jr nz, .NiteTempo ;for the Music test - ;ld a, [TimeOfDay] - ;cp NITE - ;jr z, .NiteTempo call SetGlobalTempo ret -.NiteTempo - push de - srl d - rr e - srl d - rr e - push de - pop hl - pop de - add hl, de - push hl - pop de - call SetGlobalTempo - ret -; e89a6 -MusicD0: ; e89a6 -MusicD1: ; e89a6 -MusicD2: ; e89a6 -MusicD3: ; e89a6 -MusicD4: ; e89a6 -MusicD5: ; e89a6 -MusicD6: ; e89a6 -MusicD7: ; e89a6 +Music_Octave8: +Music_Octave7: +Music_Octave6: +Music_Octave5: +Music_Octave4: +Music_Octave3: +Music_Octave2: +Music_Octave1: ; set octave based on lo nybble of the command - ld hl, Channel1Octave - Channel1 + ld hl, CHANNEL_OCTAVE add hl, bc - ld a, [CurMusicByte] + ld a, [wCurMusicByte] and 7 ld [hl], a ret -; e89b1 -MusicD9: ; e89b1 +Music_ForceOctave: ; set starting octave ; this forces all notes up by the starting octave ; params: 1 call GetMusicByte - ld hl, Channel1StartingOctave - Channel1 + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld [hl], a ret -; e89ba -MusicEF: ; e89ba +Music_StereoPanning: ; stereo panning ; params: 1 - ; stereo on? - ld a, [Options] - bit 5, a ; stereo - jr nz, MusicE4 - ; skip param - call GetMusicByte - ret -; e89c5 +; ; stereo on? +; ld a, [wOptions] +; bit STEREO, a +; jr nz, Music_Panning +; ; skip param +; call GetMusicByte +; ret -MusicE4: ; e89c5 +Music_Panning: ; force panning ; params: 1 call SetLRTracks call GetMusicByte - ld hl, Channel1Tracks - Channel1 + ld hl, CHANNEL_TRACKS add hl, bc and [hl] ld [hl], a ret -; e89d2 -MusicE5: ; e89d2 +Music_Volume: ; set volume ; params: 1 ; see Volume ; read param even if it's not used call GetMusicByte ; is the song fading? - ld a, [MusicFade] + ld a, [wMusicFade] and a ret nz ; reload param - ld a, [CurMusicByte] + ld a, [wCurMusicByte] ; set volume - ld [Volume], a + ld [wVolume], a ret -; e89e1 -MusicE9: ; e89e1 -; set global tempo to current channel tempo +- param +Music_TempoRelative: +; set global tempo to current channel tempo +/- param ; params: 1 signed call GetMusicByte ld e, a ; check sign - cp a, $80 + cp $80 jr nc, .negative ;positive - ld d, $00 + ld d, 0 jr .ok + .negative - ld d, $ff + ld d, -1 .ok - ld hl, Channel1Tempo - Channel1 + ld hl, CHANNEL_TEMPO add hl, bc ld a, [hli] ld h, [hl] @@ -2189,25 +2105,22 @@ MusicE9: ; e89e1 ld d, h call SetGlobalTempo ret -; e89fd -MusicEC: ; e89fd +Music_SFXPriorityOn: ; turn sfx priority on ; params: none - ld a, $01 - ld [SFXPriority], a + ld a, 1 + ld [wSFXPriority], a ret -; e8a03 -MusicED: ; e8a03 +Music_SFXPriorityOff: ; turn sfx priority off ; params: none xor a - ld [SFXPriority], a + ld [wSFXPriority], a ret -; e8a08 -MusicEA: ; e8a08 +Music_RestartChannel: ; restart current channel from channel header (same bank) ; params: 2 (5) ; ll hh: pointer to new channel header @@ -2216,17 +2129,17 @@ MusicEA: ; e8a08 ; zzyy: pointer to new music data ; update music id - ld hl, Channel1MusicID - Channel1 + ld hl, CHANNEL_MUSIC_ID add hl, bc ld a, [hli] - ld [MusicIDLo], a + ld [wMusicID], a ld a, [hl] - ld [MusicIDHi], a + ld [wMusicID + 1], a ; update music bank - ld hl, Channel1MusicBank - Channel1 + ld hl, CHANNEL_MUSIC_BANK add hl, bc ld a, [hl] - ld [MusicBank], a + ld [wMusicBank], a ; get pointer to new channel header call GetMusicByte ld l, a @@ -2240,9 +2153,8 @@ MusicEA: ; e8a08 call StartChannel pop bc ; restore current channel ret -; e8a30 -MusicEB: ; e8a30 +Music_NewSong: ; new song ; params: 2 ; de: song id @@ -2254,29 +2166,28 @@ MusicEB: ; e8a30 call _PlayMusic pop bc ret -; e8a3e -GetMusicByte: ; e8a3e +GetMusicByte: ; returns byte from current address in a ; advances to next byte in music data ; input: bc = start of current channel push hl push de ; load address into de - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld a, [hli] ld e, a ld d, [hl] ; load bank into a - ld hl, Channel1MusicBank - Channel1 + ld hl, CHANNEL_MUSIC_BANK add hl, bc ld a, [hl] ; get byte - call _LoadMusicByte ; load data into CurMusicByte + call _LoadMusicByte ; load data into wCurMusicByte inc de ; advance to next byte for next time this is called ; update channeldata address - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc ld a, e ld [hli], a @@ -2285,11 +2196,10 @@ GetMusicByte: ; e8a3e pop de pop hl ; store channeldata in a - ld a, [CurMusicByte] + ld a, [wCurMusicByte] ret -; e8a5d -GetFrequency: ; e8a5d +GetFrequency: ; generate frequency ; input: ; d: octave @@ -2299,22 +2209,21 @@ GetFrequency: ; e8a5d ; get octave ; get starting octave - ld hl, Channel1StartingOctave - Channel1 + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld a, [hl] swap a ; hi nybble - and a, $0f + and $f ; add current octave add d push af ; we'll use this later ; get starting octave - ld hl, Channel1StartingOctave - Channel1 + ld hl, CHANNEL_PITCH_OFFSET add hl, bc ld a, [hl] - and a, $0f ; lo nybble - ; + and $f ; lo nybble ld l, a ; ok - ld d, $00 + ld d, 0 ld h, d add hl, de ; add current pitch add hl, hl ; skip 2 bytes for each @@ -2325,67 +2234,67 @@ GetFrequency: ; e8a5d ld d, [hl] ; get our octave pop af + ; shift right by [7 - octave] bits .loop ; [7 - octave] loops - cp a, $07 + cp $7 jr nc, .ok ; sra de sra d rr e inc a jr .loop + .ok ld a, d - and a, $07 ; top 3 bits for frequency (11 total) + and $7 ; top 3 bits for frequency (11 total) ld d, a ret -; e8a8d -SetNoteDuration: ; e8a8d +SetNoteDuration: ; input: a = note duration in 16ths ; store delay units in de inc a ld e, a - ld d, $00 + ld d, 0 ; store NoteLength in a - ld hl, Channel1NoteLength - Channel1 + ld hl, CHANNEL_NOTE_LENGTH add hl, bc ld a, [hl] ; multiply NoteLength by delay units - ld l, $00 ; just multiply - call MultiplySimple - ld a, l ; % $100 + ld l, 0 ; just multiply + call .Multiply + ld a, l ; low ; store Tempo in de - ld hl, Channel1Tempo - Channel1 + ld hl, CHANNEL_TEMPO add hl, bc ld e, [hl] inc hl ld d, [hl] ; add ???? to the next result - ld hl, $0016 + ld hl, CHANNEL_FIELD16 add hl, bc ld l, [hl] - ; multiply Tempo by last result (NoteLength * delay % $100) - call MultiplySimple + ; multiply Tempo by last result (NoteLength * LOW(delay)) + call .Multiply ; copy result to de ld e, l ld d, h ; store result in ???? - ld hl, $0016 + ld hl, CHANNEL_FIELD16 add hl, bc ld [hl], e ; store result in NoteDuration - ld hl, Channel1NoteDuration - Channel1 + ld hl, CHANNEL_NOTE_DURATION add hl, bc ld [hl], d ret -; e8ab8 -MultiplySimple: ; e8ab8 +.Multiply: ; multiplies a and de ; adds the result to l ; stores the result in hl - ld h, $00 + ld h, 0 .loop ; halve a srl a @@ -2401,118 +2310,114 @@ MultiplySimple: ; e8ab8 and a jr nz, .loop ret -; e8ac7 -SetGlobalTempo: ; e8ac7 +SetGlobalTempo: push bc ; save current channel ; are we dealing with music or sfx? - ld a, [CurChannel] - cp a, $04 + ld a, [wCurChannel] + cp CHAN5 jr nc, .sfxchannels - ld bc, Channel1 - call SetTempo - ld bc, Channel2 - call SetTempo - ld bc, Channel3 - call SetTempo - ld bc, Channel4 - call SetTempo + ld bc, wChannel1 + call Tempo + ld bc, wChannel2 + call Tempo + ld bc, wChannel3 + call Tempo + ld bc, wChannel4 + call Tempo jr .end + .sfxchannels - ld bc, Channel5 - call SetTempo - ld bc, Channel6 - call SetTempo - ld bc, Channel7 - call SetTempo - ld bc, Channel8 - call SetTempo + ld bc, wChannel5 + call Tempo + ld bc, wChannel6 + call Tempo + ld bc, wChannel7 + call Tempo + ld bc, wChannel8 + call Tempo .end pop bc ; restore current channel ret -; e8b03 -SetTempo: ; e8b03 +Tempo: ; input: ; de: note length ; update Tempo - ld hl, Channel1Tempo - Channel1 + ld hl, CHANNEL_TEMPO add hl, bc ld [hl], e inc hl ld [hl], d ; clear ???? xor a - ld hl, $0016 + ld hl, CHANNEL_FIELD16 add hl, bc ld [hl], a ret -; e8b11 -StartChannel: ; e8b11 +StartChannel: call SetLRTracks - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - set 0, [hl] ; turn channel on + set SOUND_CHANNEL_ON, [hl] ; turn channel on ret -; e8b1b -SetLRTracks: ; e8b1b +SetLRTracks: ; set tracks for a the current channel to default ; seems to be redundant since this is overwritten by stereo data later push de ; store current channel in de - ld a, [CurChannel] - and a, $03 + ld a, [wCurChannel] + maskbits NUM_MUSIC_CHANS ld e, a - ld d, $00 + ld d, 0 ; get this channel's lr tracks call GetLRTracks add hl, de ; de = channel 0-3 ld a, [hl] ; load lr tracks into Tracks - ld hl, Channel1Tracks - Channel1 + ld hl, CHANNEL_TRACKS add hl, bc ld [hl], a pop de ret -; e8b30 -_PlayMusic:: ; e8b30 +_PlayMusic:: call OpenSRAMForSound ld a, e and a - jp z, _SoundRestart + jp z, _MapSetup_Sound_Off cp NUM_SONGS ret nc ; sfx ; load music call MusicOff - ld hl, MusicID + ld hl, wMusicID ld [hl], e ; song number inc hl - ld [hl], d ; MusicIDHi (always $00) + ld [hl], d ; (always 0) ld hl, Music add hl, de ; three add hl, de ; byte add hl, de ; pointer ld a, [hli] - ld [MusicBank], a + ld [wMusicBank], a ld e, [hl] inc hl ld d, [hl] ; music header address - + ; pre-emptively disable all channels. for some reason, this ; does not happen. xor a - ld [Channel1+3], a - ld [Channel2+3], a - ld [Channel3+3], a - ld [Channel4+3], a - + ld [wChannel1 + CHANNEL_FLAGS1], a + ld [wChannel2 + CHANNEL_FLAGS1], a + ld [wChannel3 + CHANNEL_FLAGS1], a + ld [wChannel4 + CHANNEL_FLAGS1], a + call LoadMusicByte ; store first byte of music header in a rlca rlca - and a, $03 ; get number of channels + maskbits NUM_MUSIC_CHANS inc a .loop ; start playing channels @@ -2523,196 +2428,193 @@ _PlayMusic:: ; e8b30 dec a jr nz, .loop xor a - ld [Crysaudio+$1b5], a - ld [Crysaudio+$1b8], a - ld [Crysaudio+$1b9], a - ld [Crysaudio+$1ba], a - ld [Crysaudio+$1bb], a - ld [NoiseSampleAddressLo], a - ld [NoiseSampleAddressHi], a - ld [Crysaudio+$1a2], a - ld [MusicNoiseSampleSet], a + ld [wUnusedMusicF9Flag], a + ld [wChannel1JumpCondition], a + ld [wChannel2JumpCondition], a + ld [wChannel3JumpCondition], a + ld [wChannel4JumpCondition], a + ld [wNoiseSampleAddress], a + ld [wNoiseSampleAddress + 1], a + ld [wNoiseSampleDelay], a + ld [wMusicNoiseSampleSet], a call MusicOn ret -; e8b79 -PlayCry_:: ; e8b79 +_PlayCry:: ; Play cry de using parameters: -; CryPitch -; CryEcho -; CryLength +; wCryPitch +; wCryLength + call MusicOff - + ; Overload the music id with the cry id - ld hl, MusicID + ld hl, wMusicID ld [hl], e inc hl ld [hl], d - + ; 3-byte pointers (bank, address) ld hl, Cries add hl, de add hl, de add hl, de - + ld a, [hli] - ld [MusicBank], a - + ld [wMusicBank], a + ld e, [hl] inc hl ld d, [hl] - + ; Read the cry's sound header call LoadMusicByte ; Top 2 bits contain the number of channels rlca rlca - and a, 3 - + maskbits NUM_MUSIC_CHANS + ; For each channel: inc a .loop push af call LoadChannel - - ld hl, Channel1Flags - Channel1 + + ld hl, CHANNEL_FLAGS1 add hl, bc - set 5, [hl] - - ld hl, Channel1Flags2 - Channel1 + set SOUND_REST, [hl] + + ld hl, CHANNEL_FLAGS2 add hl, bc - set 4, [hl] - - ld hl, Channel1CryPitch - Channel1 + set SOUND_CRY_PITCH, [hl] + + ld hl, CHANNEL_CRY_PITCH add hl, bc - ld a, [CryPitch] + ld a, [wCryPitch] ld [hli], a - ld a, [CryEcho] + ld a, [wCryPitch + 1] ld [hl], a - + ; No tempo for channel 4 - ld a, [CurChannel] - and a, 3 - cp 3 + ld a, [wCurChannel] + maskbits NUM_MUSIC_CHANS + cp CHAN4 jr nc, .start - + ; Tempo is effectively length - ld hl, Channel1Tempo - Channel1 + ld hl, CHANNEL_TEMPO add hl, bc - ld a, [CryLength] + ld a, [wCryLength] ld [hli], a - ld a, [CryLength+1] + ld a, [wCryLength + 1] ld [hl], a .start call StartChannel - ld a, [Crysaudio+$1bc] + ld a, [wStereoPanningMask] and a jr z, .next - + ; Stereo only: Play cry from the monster's side. ; This only applies in-battle. - - ld a, [Options] - bit 5, a ; stereo - jr z, .next - -; [Tracks] &= [CryTracks] - ld hl, Channel1Tracks - Channel1 + +; ld a, [wOptions] +; bit STEREO, a +; jr z, .next + +; [Tracks] &= [wCryTracks] + ld hl, CHANNEL_TRACKS add hl, bc ld a, [hl] - ld hl, CryTracks - and a, [hl] - ld hl, Channel1Tracks - Channel1 + ld hl, wCryTracks + and [hl] + ld hl, CHANNEL_TRACKS add hl, bc ld [hl], a - + .next pop af dec a jr nz, .loop - - + ; Cries play at max volume, so we save the current volume for later. - ld a, [LastVolume] + ld a, [wLastVolume] and a jr nz, .end - - ld a, [Volume] - ld [LastVolume], a - ld a, $77 - ld [Volume], a - + + ld a, [wVolume] + ld [wLastVolume], a + ld a, MAX_VOLUME + ld [wVolume], a + .end ld a, 1 ; stop playing music - ld [SFXPriority], a + ld [wSFXPriority], a call MusicOn ret -; e8c04 -_PlaySFX:: ; e8c04 +_PlaySFX:: ; clear channels if they aren't already call MusicOff - ld hl, Crysaudio+$cc ; Channel5Flags - bit 0, [hl] ; ch5 on? + ld hl, wChannel5Flags1 + bit SOUND_CHANNEL_ON, [hl] ; ch5 on? jr z, .ch6 - res 0, [hl] ; turn it off + res SOUND_CHANNEL_ON, [hl] ; turn it off xor a - ld [rNR11], a ; length/wavepattern = 0 - ld a, $08 - ld [rNR12], a ; envelope = 0 + ldh [rNR11], a ; length/wavepattern = 0 + ld a, $8 + ldh [rNR12], a ; envelope = 0 xor a - ld [rNR13], a ; frequency lo = 0 + ldh [rNR13], a ; frequency lo = 0 ld a, $80 - ld [rNR14], a ; restart sound (freq hi = 0) + ldh [rNR14], a ; restart sound (freq hi = 0) xor a - ld [SoundInput], a ; global sound off - ld [rNR10], a ; sweep = 0 + ld [wSoundInput], a ; global sound off + ldh [rNR10], a ; sweep = 0 .ch6 - ld hl, Crysaudio+$fe ; ch6 on? - bit 0, [hl] + ld hl, wChannel6Flags1 + bit SOUND_CHANNEL_ON, [hl] jr z, .ch7 - res 0, [hl] ; turn it off + res SOUND_CHANNEL_ON, [hl] ; turn it off xor a - ld [rNR21], a ; length/wavepattern = 0 - ld a, $08 - ld [rNR22], a ; envelope = 0 + ldh [rNR21], a ; length/wavepattern = 0 + ld a, $8 + ldh [rNR22], a ; envelope = 0 xor a - ld [rNR23], a ; frequency lo = 0 + ldh [rNR23], a ; frequency lo = 0 ld a, $80 - ld [rNR24], a ; restart sound (freq hi = 0) + ldh [rNR24], a ; restart sound (freq hi = 0) .ch7 - ld hl, Crysaudio+$130 ; ch7 on? - bit 0, [hl] + ld hl, wChannel7Flags1 + bit SOUND_CHANNEL_ON, [hl] jr z, .ch8 - res 0, [hl] ; turn it off + res SOUND_CHANNEL_ON, [hl] ; turn it off xor a - ld [rNR30], a ; sound mode #3 off - ld [rNR31], a ; length/wavepattern = 0 - ld a, $08 - ld [rNR32], a ; envelope = 0 + ldh [rNR30], a ; sound mode #3 off + ldh [rNR31], a ; length/wavepattern = 0 + ld a, $8 + ldh [rNR32], a ; envelope = 0 xor a - ld [rNR33], a ; frequency lo = 0 + ldh [rNR33], a ; frequency lo = 0 ld a, $80 - ld [rNR34], a ; restart sound (freq hi = 0) + ldh [rNR34], a ; restart sound (freq hi = 0) .ch8 - ld hl, Crysaudio+$162 ; ch8 on? - bit 0, [hl] + ld hl, wChannel8Flags1 + bit SOUND_CHANNEL_ON, [hl] jr z, .chscleared - res 0, [hl] ; turn it off + res SOUND_CHANNEL_ON, [hl] ; turn it off xor a - ld [rNR41], a ; length/wavepattern = 0 - ld a, $08 - ld [rNR42], a ; envelope = 0 + ldh [rNR41], a ; length/wavepattern = 0 + ld a, $8 + ldh [rNR42], a ; envelope = 0 xor a - ld [rNR43], a ; frequency lo = 0 + ldh [rNR43], a ; frequency lo = 0 ld a, $80 - ld [rNR44], a ; restart sound (freq hi = 0) + ldh [rNR44], a ; restart sound (freq hi = 0) xor a - ld [NoiseSampleAddressLo], a - ld [NoiseSampleAddressHi], a + ld [wNoiseSampleAddress], a + ld [wNoiseSampleAddress + 1], a .chscleared ; start reading sfx header for # chs - ld hl, MusicID + ld hl, wMusicID ld [hl], e inc hl ld [hl], d @@ -2722,7 +2624,7 @@ _PlaySFX:: ; e8c04 add hl, de ; pointers ; get bank ld a, [hli] - ld [MusicBank], a + ld [wMusicBank], a ; get address ld e, [hl] inc hl @@ -2731,151 +2633,147 @@ _PlaySFX:: ; e8c04 call LoadMusicByte rlca ; top 2 rlca ; bits - and a, $03 + maskbits NUM_MUSIC_CHANS inc a ; # channels -> # loops .startchannels push af call LoadChannel ; bc = current channel - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - set 3, [hl] + set SOUND_SFX, [hl] call StartChannel pop af dec a jr nz, .startchannels call MusicOn xor a - ld [SFXPriority], a + ld [wSFXPriority], a ret -; e8ca6 - -PlayStereoSFX:: ; e8ca6 +PlayStereoSFX:: ; play sfx de call MusicOff - + ; standard procedure if stereo's off - ld a, [Options] - bit 5, a - jp z, _PlaySFX - +; ld a, [wOptions] +; bit STEREO, a +; jp z, _PlaySFX + ; else, let's go ahead with this - ld hl, MusicID + ld hl, wMusicID ld [hl], e inc hl ld [hl], d - + ; get sfx ptr ld hl, SFX add hl, de add hl, de add hl, de - + ; bank ld a, [hli] - ld [MusicBank], a + ld [wMusicBank], a ; address ld e, [hl] inc hl ld d, [hl] - + ; bit 2-3 call LoadMusicByte rlca rlca - and 3 ; ch1-4 + maskbits NUM_MUSIC_CHANS inc a - + .loop push af call LoadChannel - - ld hl, Channel1Flags - Channel1 + + ld hl, CHANNEL_FLAGS1 add hl, bc - set 3, [hl] - + set SOUND_SFX, [hl] + push de ; get tracks for this channel - ld a, [CurChannel] - and 3 ; ch1-4 + ld a, [wCurChannel] + maskbits NUM_MUSIC_CHANS ld e, a - ld d, $0 + ld d, 0 call GetLRTracks add hl, de ld a, [hl] - ld hl, Crysaudio+$1bc + ld hl, wStereoPanningMask and [hl] - - ld hl, Channel1Tracks - Channel1 + + ld hl, CHANNEL_TRACKS add hl, bc ld [hl], a - - ld hl, $0030 ; Crysaudio+$31 - Channel1 + + ld hl, CHANNEL_FIELD30 add hl, bc ld [hl], a - - ld a, [CryTracks] + + ld a, [wCryTracks] cp 2 ; ch 1-2 - jr c, .asm_e8d0c - + jr c, .skip + ; ch3-4 - ld a, [Crysaudio+$1be] - - ld hl, $002e ; Crysaudio+$2f - Channel1 + ld a, [wSFXDuration] + + ld hl, CHANNEL_FIELD2E add hl, bc ld [hl], a - - ld hl, $002f ; Crysaudio+$30 - Channel1 + + ld hl, CHANNEL_FIELD2F add hl, bc ld [hl], a - - ld hl, Channel1Flags2 - Channel1 + + ld hl, CHANNEL_FLAGS2 add hl, bc - set 7, [hl] - -.asm_e8d0c + set SOUND_UNKN_0F, [hl] + +.skip pop de - + ; turn channel on - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - set 0, [hl] ; on - + set SOUND_CHANNEL_ON, [hl] ; on + ; done? pop af dec a jr nz, .loop - + ; we're done call MusicOn ret -; e8d1b - -LoadChannel: ; e8d1b +LoadChannel: ; prep channel for use ; input: ; de: ; get pointer to current channel call LoadMusicByte inc de - and a, $07 ; bit 0-2 (current channel) - ld [CurChannel], a + and $7 ; bit 0-2 (current channel) + ld [wCurChannel], a ld c, a - ld b, $00 + ld b, 0 ld hl, ChannelPointers add hl, bc add hl, bc ld c, [hl] inc hl ld b, [hl] ; bc = channel pointer - ld hl, Channel1Flags - Channel1 + ld hl, CHANNEL_FLAGS1 add hl, bc - res 0, [hl] ; channel off + res SOUND_CHANNEL_ON, [hl] ; channel off call ChannelInit ; load music pointer - ld hl, Channel1MusicAddress - Channel1 + ld hl, CHANNEL_MUSIC_ADDRESS add hl, bc call LoadMusicByte ld [hli], a @@ -2884,21 +2782,20 @@ LoadChannel: ; e8d1b ld [hl], a inc de ; load music id - ld hl, Channel1MusicID - Channel1 + ld hl, CHANNEL_MUSIC_ID add hl, bc - ld a, [MusicIDLo] + ld a, [wMusicID] ld [hli], a - ld a, [MusicIDHi] + ld a, [wMusicID + 1] ld [hl], a ; load music bank - ld hl, Channel1MusicBank - Channel1 + ld hl, CHANNEL_MUSIC_BANK add hl, bc - ld a, [MusicBank] + ld a, [wMusicBank] ld [hl], a ret -; e8d5b -ChannelInit: ; e8d5b +ChannelInit: ; make sure channel is cleared ; set default tempo and note length in case nothing is loaded ; input: @@ -2906,449 +2803,84 @@ ChannelInit: ; e8d5b push de xor a ; get channel struct location and length - ld hl, Channel1MusicID - Channel1 ; start + ld hl, CHANNEL_MUSIC_ID ; start add hl, bc - ld e, Channel2 - Channel1 ; channel struct length + ld e, CHANNEL_STRUCT_LENGTH ; channel struct length ; clear channel .loop ld [hli], a dec e jr nz, .loop ; set tempo to default ($100) - ld hl, Channel1Tempo - Channel1 + ld hl, CHANNEL_TEMPO add hl, bc xor a ld [hli], a inc a ld [hl], a - ; set note length to default ($01) (fast) - ld hl, Channel1NoteLength - Channel1 + ; set note length to default ($1) (fast) + ld hl, CHANNEL_NOTE_LENGTH add hl, bc ld [hl], a pop de ret -; e8d76 -LoadMusicByte:: ; e8d76 +LoadMusicByte:: ; input: ; de = current music address ; output: -; a = CurMusicByte - ld a, [MusicBank] +; a = wCurMusicByte + ld a, [wMusicBank] call _LoadMusicByte - ld a, [CurMusicByte] + ld a, [wCurMusicByte] ret -; e8d80 -FrequencyTable: ; e8d80 - dw $0000 ; filler - dw $f82c - dw $f89d - dw $f907 - dw $f96b - dw $f9ca - dw $fa23 - dw $fa77 - dw $fac7 - dw $fb12 - dw $fb58 - dw $fb9b - dw $fbda - dw $fc16 - dw $fc4e - dw $fc83 - dw $fcb5 - dw $fce5 - dw $fd11 - dw $fd3b - dw $fd63 - dw $fd89 - dw $fdac - dw $fdcd - dw $fded -; e8db2 +INCLUDE "crysaudio/notes.asm" -WaveSamples: ; e8db2 - ; these are streams of 32 4-bit values used as wavepatterns - ; nothing interesting here! - db $02, $46, $8a, $ce, $ff, $fe, $ed, $dc, $cb, $a9, $87, $65, $44, $33, $22, $11 - db $02, $46, $8a, $ce, $ef, $ff, $fe, $ee, $dd, $cb, $a9, $87, $65, $43, $22, $11 - db $13, $69, $bd, $ee, $ee, $ff, $ff, $ed, $de, $ff, $ff, $ee, $ee, $db, $96, $31 - db $02, $46, $8a, $cd, $ef, $fe, $de, $ff, $ee, $dc, $ba, $98, $76, $54, $32, $10 - db $01, $23, $45, $67, $8a, $cd, $ee, $f7, $7f, $ee, $dc, $a8, $76, $54, $32, $10 - db $00, $11, $22, $33, $44, $33, $22, $11, $ff, $ee, $cc, $aa, $88, $aa, $cc, $ee - db $02, $46, $8a, $ce, $cb, $a9, $87, $65, $ff, $fe, $ed, $dc, $44, $33, $22, $11 - db $c0, $a9, $87, $f5, $ff, $fe, $ed, $dc, $44, $33, $22, $f1, $02, $46, $8a, $ce - db $44, $33, $22, $1f, $00, $46, $8a, $ce, $f8, $fe, $ed, $dc, $cb, $a9, $87, $65 - db $11, $00, $00, $08, $00, $13, $57, $9a, $b4, $ba, $a9, $98, $87, $65, $43, $21 - db $79, $bd, $ff, $ff, $ff, $ff, $fd, $b9, $75, $31, $00, $00, $00, $00, $01, $35 - db $01, $12, $23, $34, $45, $56, $67, $77, $88, $99, $aa, $bb, $cc, $dd, $ee, $ff - db $46, $8a, $cc, $cc, $cc, $cc, $ca, $86, $42, $11, $00, $00, $00, $00, $01, $12 - db $7a, $df, $ff, $da, $74, $10, $00, $14, $7a, $df, $ff, $da, $74, $10, $00, $14 - db $ee, $ee, $ee, $ee, $ee, $ee, $ee, $ee, $00, $00, $00, $00, $00, $00, $00, $00 - db $ee, $ee, $ee, $ee, $ee, $ee, $ed, $cb, $21, $00, $00, $00, $00, $00, $00, $00 -; e8e52 +INCLUDE "crysaudio/wave_samples.asm" -NoiseSampleSetsPointers: ; e8e52 - dw NoiseSampleSets0 - dw NoiseSampleSets1 - dw NoiseSampleSets2 - dw NoiseSampleSets3 - dw NoiseSampleSets4 - dw NoiseSampleSets5 - dw NoiseSampleSets6 -; e8e5e +INCLUDE "crysaudio/drumkits.asm" -NoiseSampleSets: -NoiseSampleSets0: ; e8e5e - dw NoiseSampleSet00 ; rest - dw NoiseSampleSet01 ; c - dw NoiseSampleSet02 ; c# - dw NoiseSampleSet03 ; d - dw NoiseSampleSet04 ; d# - dw NoiseSampleSet05 ; e - dw NoiseSampleSet06 ; f - dw NoiseSampleSet07 ; f# - dw NoiseSampleSet08 ; g - dw NoiseSampleSet09 ; g# - dw NoiseSampleSet10 ; a - dw NoiseSampleSet11 ; a# - dw NoiseSampleSet12 ; b -NoiseSampleSets1: ; e8e78 - dw NoiseSampleSet00 - dw NoiseSampleSet08 - dw NoiseSampleSet09 - dw NoiseSampleSet10 - dw NoiseSampleSet11 - dw NoiseSampleSet12 - dw NoiseSampleSet13 - dw NoiseSampleSet14 - dw NoiseSampleSet15 - dw NoiseSampleSet16 - dw NoiseSampleSet17 - dw NoiseSampleSet18 - dw NoiseSampleSet19 -NoiseSampleSets2: ; e8e92 - dw NoiseSampleSet00 - dw NoiseSampleSet01 - dw NoiseSampleSet17 - dw NoiseSampleSet18 - dw NoiseSampleSet19 - dw NoiseSampleSet05 - dw NoiseSampleSet06 - dw NoiseSampleSet07 - dw NoiseSampleSet08 - dw NoiseSampleSet09 - dw NoiseSampleSet10 - dw NoiseSampleSet11 - dw NoiseSampleSet12 -NoiseSampleSets3: ; e8eac - dw NoiseSampleSet21 - dw NoiseSampleSet22 - dw NoiseSampleSet23 - dw NoiseSampleSet24 - dw NoiseSampleSet25 - dw NoiseSampleSet26 - dw NoiseSampleSet20 - dw NoiseSampleSet27 - dw NoiseSampleSet28 - dw NoiseSampleSet29 - dw NoiseSampleSet21 - dw NoiseSampleSet37 - dw NoiseSampleSet34 -NoiseSampleSets4: ; e8ec6 - dw NoiseSampleSet21 - dw NoiseSampleSet20 - dw NoiseSampleSet23 - dw NoiseSampleSet24 - dw NoiseSampleSet25 - dw NoiseSampleSet33 - dw NoiseSampleSet26 - dw NoiseSampleSet35 - dw NoiseSampleSet31 - dw NoiseSampleSet32 - dw NoiseSampleSet36 - dw NoiseSampleSet37 - dw NoiseSampleSet30 -NoiseSampleSets5: ; e8ee0 - dw NoiseSampleSet00 - dw NoiseSampleSet17 - dw NoiseSampleSet18 - dw NoiseSampleSet19 - dw NoiseSampleSet27 - dw NoiseSampleSet28 - dw NoiseSampleSet29 - dw NoiseSampleSet05 - dw NoiseSampleSet06 - dw NoiseSampleSet30 - dw NoiseSampleSet24 - dw NoiseSampleSet23 - dw NoiseSampleSet37 -NoiseSampleSets6: - dw NoiseSampleSet00 - dw NoiseSampleSet37 - dw NoiseSampleSet17 - dw NoiseSampleSet18 - dw NoiseSampleSet19 - dw NoiseSampleSet34 - dw NoiseSampleSet30 - dw NoiseSampleSet17 - dw NoiseSampleSet17 - dw NoiseSampleSet17 - dw NoiseSampleSet17 - dw NoiseSampleSet17 -; e8efa - -NoiseSampleSet00: ; e8efa -; unused - db $20, $11, $00 - db $ff ; end -; e8efe - -NoiseSampleSet01: ; e8efe - db $20, $c1, $33 - db $ff ; end -; e8f02 - -NoiseSampleSet02: ; e8f02 - db $20, $b1, $33 - db $ff ; end -; e8f06 - -NoiseSampleSet03: ; e8f06 - db $20, $a1, $33 - db $ff ; end -; e8f0a - -NoiseSampleSet04: ; e8f0a - db $20, $81, $33 - db $ff ; end -; e8f0e - -NoiseSampleSet05: ; e8f0e - db $27, $84, $37 - db $26, $84, $36 - db $25, $83, $35 - db $24, $83, $34 - db $23, $82, $33 - db $22, $81, $32 - db $ff ; end -; e8f21 - -NoiseSampleSet06: ; e8f21 - db $20, $51, $2a - db $ff ; end -; e8f25 - -NoiseSampleSet07: ; e8f25 - db $21, $41, $2b - db $20, $61, $2a - db $ff ; end -; e8f2c - -NoiseSampleSet08: ; e8f2c - db $20, $81, $10 - db $ff ; end -; e8f30 - -NoiseSampleSet09: ; e8f30 - db $20, $82, $23 - db $ff ; end -; e8f34 - -NoiseSampleSet10: ; e8f34 - db $20, $82, $25 - db $ff ; end -; e8f38 - -NoiseSampleSet11: ; e8f38 - db $20, $82, $26 - db $ff ; end -; e8f3c - -NoiseSampleSet12: ; e8f3c - db $20, $a1, $10 - db $ff ; end -; e8f40 - -NoiseSampleSet13: ; e8f40 - db $20, $a2, $11 - db $ff ; end -; e8f44 - -NoiseSampleSet14: ; e8f44 - db $20, $a2, $50 - db $ff ; end -; e8f48 - -NoiseSampleSet15: ; e8f48 - db $20, $a1, $18 - db $20, $31, $33 - db $ff ; end -; e8f4f - -NoiseSampleSet16: ; e8f4f - db $22, $91, $28 - db $20, $71, $18 - db $ff ; end -; e8f56 - -NoiseSampleSet17: ; e8f56 - db $20, $91, $22 - db $ff ; end -; e8f5a - -NoiseSampleSet18: ; e8f5a - db $20, $71, $22 - db $ff ; end -; e8f5e - -NoiseSampleSet19: ; e8f5e - db $20, $61, $22 - db $ff ; end -; e8f62 - -NoiseSampleSet20: ; e8f62 - db $20, $11, $11 - db $ff ; end -; e8f66 - -NoiseSampleSet21: ; e8f66 - db $ff -; e8f67 - -NoiseSampleSet22: ; e8f67 - db $20, $91, $33 - db $ff ; end -; e8f6b - -NoiseSampleSet23: ; e8f6b - db $20, $51, $32 - db $ff ; end -; e8f6f - -NoiseSampleSet24: ; e8f6f - db $20, $81, $31 - db $ff ; end -; e8f73 - -NoiseSampleSet25: ; e8f73 - db $20, $88, $6b - db $20, $71, $00 - db $ff ; end -; e8f7a - -NoiseSampleSet26: ; e8f7a - db $30, $91, $18 - db $ff ; end -; e8f7e - -NoiseSampleSet27: ; e8f7e - db $27, $92, $10 - db $ff ; end -; e8f82 - -NoiseSampleSet28: ; e8f82 - db $33, $91, $00 - db $33, $11, $00 - db $ff ; end -; e8f89 - -NoiseSampleSet29: ; e8f89 - db $33, $91, $11 - db $33, $11, $00 - db $ff ; end -; e8f90 - -NoiseSampleSet30: ; e8f90 - db $33, $88, $15 - db $20, $65, $12 - db $ff ; end -; e8f97 - -NoiseSampleSet31: ; e8f97 - db $33, $51, $21 - db $33, $11, $11 - db $ff ; end -; e8f9e - -NoiseSampleSet32: ; e8f9e - db $33, $51, $50 - db $33, $11, $11 - db $ff ; end -; e8fa5 - -NoiseSampleSet33: ; e8fa5 - db $20, $a1, $31 - db $ff ; end -; e8fa9 - -NoiseSampleSet34: ; e8fa9 - db $20, $84, $12 - db $ff ; end -; e8fad - -NoiseSampleSet35: ; e8fad - db $33, $81, $00 - db $33, $11, $00 - db $ff ; end -; e8fb4 - -NoiseSampleSet36: ; e8fb4 - db $33, $81, $21 - db $33, $11, $11 - db $ff ; end -; e8fbb - -NoiseSampleSet37: ; e8fbb - db $20, $a8, $6b - db $20, $71, $00 - db $ff ; end -; e8fc2 - -GetLRTracks: ; e8fc2 +GetLRTracks: ; gets the default sound l/r channels ; stores mono/stereo table in hl - ld a, [Options] - bit 5, a ; stereo - ; made redundant, could have had a purpose in gold - jr nz, .stereo - ld hl, MonoTracks - ret +; ld a, [wOptions] +; bit STEREO, a +; ; made redundant, could have had a purpose in gold +; jr nz, .stereo +; ld hl, MonoTracks +; ret + .stereo ld hl, StereoTracks ret -; e8fd1 -MonoTracks: ; e8fd1 +MonoTracks: ; bit corresponds to track # ; hi: left channel ; lo: right channel db $11, $22, $44, $88 -; e8fd5 -StereoTracks: ; e8fd5 +StereoTracks: ; made redundant ; seems to be modified on a per-song basis db $11, $22, $44, $88 -; e8fd9 -ChannelPointers: ; e8fd9 +ChannelPointers: ; music channels - dw Channel1 - dw Channel2 - dw Channel3 - dw Channel4 + dw wChannel1 + dw wChannel2 + dw wChannel3 + dw wChannel4 ; sfx channels - dw Channel5 - dw Channel6 - dw Channel7 - dw Channel8 -; e8fe9 + dw wChannel5 + dw wChannel6 + dw wChannel7 + dw wChannel8 -ClearChannels:: ; e8fe9 +ClearChannels:: ; runs ClearChannel for all 4 channels -; doesn't seem to be used, but functionally identical to SoundRestart +; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off ld hl, rNR50 xor a ld [hli], a @@ -3356,28 +2888,26 @@ ClearChannels:: ; e8fe9 ld a, $80 ld [hli], a ld hl, rNR10 - ld e, $04 + ld e, NUM_MUSIC_CHANS .loop call ClearChannel dec e jr nz, .loop ret -; e8ffe -ClearChannel: ; e8ffe -; input: hl = beginning hw sound register (rNR10, $ff15, rNR30, $ff1f) +ClearChannel: +; input: hl = beginning hw sound register (rNR10, rNR20, rNR30, rNR40) ; output: 00 00 80 00 80 ; sound channel 1 2 3 4 xor a - ld [hli], a ; rNR10, $ff15, rNR30, $ff1f ; sweep = 0 + ld [hli], a ; rNR10, rNR20, rNR30, rNR40 ; sweep = 0 ld [hli], a ; rNR11, rNR21, rNR31, rNR41 ; length/wavepattern = 0 - ld a, $08 + ld a, $8 ld [hli], a ; rNR12, rNR22, rNR32, rNR42 ; envelope = 0 xor a ld [hli], a ; rNR13, rNR23, rNR33, rNR43 ; frequency lo = 0 ld a, $80 ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0) ret -; e900a diff --git a/crysaudio/enum.asm b/crysaudio/enum.asm new file mode 100644 index 00000000..4c1cb9b8 --- /dev/null +++ b/crysaudio/enum.asm @@ -0,0 +1,23 @@ +; Enumerate variables + +enum_start: MACRO +if _NARG >= 1 +__enum__ = \1 +else +__enum__ = 0 +endc +if _NARG >= 2 +__enumdir__ = \2 +else +__enumdir__ = +1 +endc +ENDM + +enum: MACRO +\1 = __enum__ +__enum__ = __enum__ + __enumdir__ +ENDM + +enum_set: MACRO +__enum__ = \1 +ENDM diff --git a/crysaudio/music/DPPt/EternaForest.asm b/crysaudio/music/DPPt/EternaForest.asm deleted file mode 100644 index 06956aec..00000000 --- a/crysaudio/music/DPPt/EternaForest.asm +++ /dev/null @@ -1,979 +0,0 @@ -Music_EternaForest:: - dbw $C0, Music_EternaForest_Ch1 - dbw $01, Music_EternaForest_Ch2 - dbw $02, Music_EternaForest_Ch3 - dbw $03, Music_EternaForest_Ch4 - -Music_EternaForest_Ch1: - tempo $88 - volume $77 -Music_EternaForest_Ch1_loop: - notetype $C, $82 - dutycycle 0 - octave 5 - note __, 1 - note B_, 5 - intensity $72 - note B_, 6 - intensity $62 - note B_, 6 - intensity $52 - note B_, 6 - intensity $42 - note B_, 9 - intensity $82 - note B_, 5 - intensity $72 - note B_, 6 - intensity $62 - note B_, 6 - intensity $52 - note B_, 6 - intensity $42 - note B_, 7 - intensity $82 - octave 4 - note B_, 5 - intensity $72 - note B_, 6 - intensity $62 - note B_, 6 - intensity $52 - note B_, 6 - intensity $42 - note B_, 9 - intensity $82 - octave 5 - note F#, 5 - intensity $72 - note F#, 6 - intensity $62 - note F#, 6 - intensity $52 - note F#, 6 - intensity $42 - note F#, 9 - intensity $82 - octave 4 - note F#, 5 - intensity $72 - note F#, 6 - intensity $62 - note F#, 6 - intensity $82 - note D_, 6 - intensity $72 - note D_, 4 - intensity $82 - note C_, 16 - dutycycle 1 - note __, 16 - note __, 12 - octave 6 - note C_, 2 - octave 5 - note F#, 2 - octave 6 - note C_, 12 - octave 5 - note F#, 2 - note C_, 2 - note F#, 14 - octave 4 - note B_, 2 - octave 5 - note D_, 10 - octave 3 - note B_, 4 - note A_, 2 - note B_, 2 - octave 4 - note F#, 8 - octave 3 - note B_, 4 - note F#, 2 - octave 4 - note D_, 6 - octave 3 - note G_, 2 - octave 4 - note D_, 6 - octave 3 - note A_, 2 - octave 4 - note D_, 16 - note __, 16 - note __, 2 - octave 6 - note D_, 2 - octave 5 - note G_, 2 - notetype $F, $82 - note B_, 16 - notetype $C, $82 - octave 6 - note D_, 2 - octave 5 - note F#, 2 - notetype $F, $82 - note A_, 16 - notetype $C, $82 - octave 6 - note D_, 2 - octave 5 - note G_, 2 - note D_, 4 - octave 3 - note B_, 2 - octave 4 - note B_, 2 - octave 3 - note A_, 2 - note B_, 2 - octave 4 - note F#, 8 - octave 3 - note B_, 2 - octave 4 - note B_, 2 - octave 3 - note F#, 2 - octave 4 - note F#, 2 - octave 5 - note F#, 4 - octave 3 - note G_, 2 - octave 4 - note G_, 2 - octave 5 - note G_, 4 - octave 4 - note D_, 2 - octave 5 - note D_, 2 - octave 6 - note D_, 8 - octave 4 - note G_, 2 - octave 5 - note C_, 2 - note G_, 2 - octave 4 - note G_, 2 - octave 6 - note C_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note D_, 2 - octave 4 - note G_, 4 - octave 5 - note D_, 2 - note G_, 8 - octave 4 - note G_, 2 - note B_, 2 - octave 5 - note G_, 2 - octave 4 - note G_, 2 - octave 5 - note B_, 2 - octave 6 - note G_, 2 - note F#, 2 - note G_, 2 - note D_, 2 - octave 4 - note G_, 4 - octave 5 - note D_, 2 - note G_, 6 - note B_, 4 - note G_, 4 - note A_, 2 - note D_, 6 - octave 4 - note B_, 4 - note G_, 4 - note A_, 2 - octave 5 - note D_, 2 - note E_, 16 - note __, 6 - note F#, 4 - note G_, 2 - note F#, 4 - note D_, 16 - note __, 6 - note A_, 4 - note B_, 2 - note A_, 4 - note E_, 16 - note __, 16 - note __, 2 - octave 6 - note D_, 2 - note C_, 2 - octave 5 - note G_, 2 - note E_, 2 - note C_, 2 - octave 4 - note B_, 2 - note G_, 2 - note C_, 2 - octave 6 - note D#, 2 - note C_, 2 - octave 5 - note A_, 2 - note F#, 2 - note D#, 2 - note C_, 2 - octave 4 - note A_, 2 - note D#, 3 - dutycycle 0 - octave 5 - note B_, 5 - intensity $72 - note B_, 6 - intensity $62 - note B_, 6 - intensity $52 - note B_, 6 - intensity $42 - note B_, 9 - intensity $82 - note B_, 5 - intensity $72 - note B_, 6 - intensity $62 - note B_, 6 - intensity $52 - note B_, 6 - intensity $42 - note B_, 9 - intensity $82 - note B_, 5 - intensity $72 - note B_, 6 - intensity $62 - note B_, 6 - intensity $52 - note B_, 6 - intensity $42 - note B_, 9 - intensity $82 - note B_, 5 - intensity $72 - note B_, 6 - intensity $62 - note B_, 6 - intensity $52 - note B_, 6 - intensity $42 - note B_, 8 - loopchannel 0, Music_EternaForest_Ch1_loop - -Music_EternaForest_Ch2: -Music_EternaForest_Ch2_loop: - notetype $C, $92 - dutycycle 0 - octave 5 - note D_, 6 - intensity $82 - note D_, 6 - intensity $72 - note D_, 6 - intensity $62 - note D_, 6 - intensity $52 - note D_, 8 - intensity $92 - note E_, 6 - intensity $82 - note E_, 6 - intensity $72 - note E_, 6 - intensity $62 - note E_, 6 - intensity $52 - note E_, 6 - intensity $92 - octave 4 - note E_, 6 - intensity $82 - note E_, 6 - intensity $72 - note E_, 6 - intensity $62 - note E_, 6 - intensity $52 - note E_, 8 - intensity $92 - note B_, 6 - intensity $82 - note B_, 6 - intensity $72 - note B_, 6 - intensity $62 - note B_, 6 - intensity $52 - note B_, 8 - intensity $92 - octave 3 - note B_, 6 - intensity $82 - note B_, 6 - intensity $72 - note B_, 6 - intensity $62 - note G_, 6 - intensity $52 - note G_, 4 - intensity $92 - note F#, 6 - intensity $B6 - dutycycle 2 - octave 2 - note C_, 2 - note __, 4 - octave 1 - note C_, 2 - note __, 16 - note __, 8 - octave 2 - note C_, 2 - note __, 4 - octave 1 - note C_, 2 - note __, 16 - note __, 8 - note G_, 2 - note __, 4 - octave 1 - note G_, 2 - note __, 16 - note __, 16 - note __, 8 - octave 1 - note E_, 2 - note __, 6 - note D_, 2 - note __, 6 - octave 2 - note C_, 2 - note __, 4 - octave 1 - note C_, 2 - note __, 16 - note __, 8 - octave 2 - note C_, 2 - note __, 4 - octave 1 - note C_, 2 - note __, 16 - note __, 8 - note G_, 2 - note __, 4 - octave 1 - note G_, 2 - note __, 16 - note __, 16 - note __, 8 - octave 1 - note E_, 2 - note __, 6 - note D_, 2 - note __, 6 - octave 1 - note A_, 2 - note __, 4 - note A_, 2 - note __, 2 - note A_, 2 - note __, 1 - note A_, 2 - note __, 1 - note B_, 2 - note __, 4 - note B_, 2 - note __, 2 - note B_, 2 - note __, 1 - note B_, 2 - note __, 1 - octave 1 - note E_, 2 - note __, 4 - note E_, 2 - note __, 2 - note E_, 2 - note __, 1 - note E_, 2 - note __, 1 - note D_, 2 - note __, 4 - note D_, 2 - note __, 2 - note D_, 2 - note __, 1 - note D_, 2 - note __, 1 - octave 1 - note A_, 2 - note __, 6 - note B_, 2 - note __, 6 - note A_, 2 - note __, 2 - note B_, 2 - note __, 2 - octave 1 - note C_, 2 - note D_, 2 - note __, 2 - note C_, 16 - note __, 16 - note __, 2 - octave 1 - note B_, 16 - note __, 16 - note __, 4 - octave 1 - note A_, 4 - octave 2 - note C_, 4 - octave 1 - note A_, 4 - note B_, 4 - octave 2 - note D_, 4 - note F#, 4 - note A_, 4 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 4 - octave 4 - note C_, 6 - octave 3 - note C_, 10 - intensity $92 - dutycycle 0 - octave 5 - note C_, 6 - intensity $82 - note C_, 6 - intensity $72 - note C_, 6 - intensity $62 - note C_, 6 - intensity $52 - note C_, 8 - intensity $92 - octave 4 - note G_, 6 - intensity $82 - note G_, 6 - intensity $72 - note G_, 6 - intensity $62 - note G_, 6 - intensity $52 - note G_, 8 - intensity $92 - octave 5 - note C_, 6 - intensity $82 - note C_, 6 - intensity $72 - note C_, 6 - intensity $62 - note C_, 6 - intensity $52 - note C_, 8 - intensity $92 - octave 4 - note G_, 6 - intensity $82 - note G_, 6 - intensity $72 - note G_, 6 - intensity $62 - note G_, 6 - intensity $52 - note G_, 8 - loopchannel 0, Music_EternaForest_Ch2_loop - -Music_EternaForest_Ch3: -Music_EternaForest_Ch3_loop: - notetype $C, $12 - vibrato $10, $14 - octave 7 - note __, 16 - note __, 16 - note __, 16 - octave 5 - note B_, 2 - octave 6 - note C_, 2 - note __, 2 - octave 5 - note B_, 2 - note A_, 2 - note B_, 2 - note __, 2 - octave 6 - note C_, 2 - octave 5 - note B_, 2 - note __, 2 - note F#, 2 - note G_, 2 - note __, 2 - note A_, 2 - note __, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note __, 2 - note A_, 2 - note G_, 2 - note __, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note __, 2 - note F#, 2 - note D_, 2 - note __, 2 - octave 4 - note B_, 2 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 2 - octave 5 - note B_, 2 - octave 6 - note C_, 2 - note __, 2 - octave 5 - note B_, 2 - note A_, 2 - note B_, 2 - note __, 2 - octave 6 - note C_, 2 - octave 5 - note B_, 2 - note __, 2 - note F#, 2 - note G_, 2 - note __, 2 - note A_, 2 - note __, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note __, 2 - note A_, 2 - note G_, 2 - note __, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note __, 2 - note F#, 2 - note D_, 2 - note __, 2 - octave 4 - note B_, 2 - note __, 16 - note __, 16 - note __, 16 - note __, 14 - octave 5 - note E_, 2 - note F#, 2 - note G_, 2 - note B_, 2 - note __, 2 - note A_, 2 - octave 6 - note D_, 2 - note C_, 2 - note __, 2 - octave 5 - note B_, 2 - note F#, 2 - note __, 2 - note G_, 2 - note A_, 2 - note __, 2 - note B_, 2 - note __, 2 - octave 6 - note C_, 2 - octave 5 - note B_, 2 - octave 6 - note C_, 2 - note __, 2 - note D_, 2 - note __, 2 - note A_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note __, 2 - note D_, 2 - note __, 2 - octave 5 - note B_, 2 - note __, 16 - note __, 16 - note __, 16 - note __, 4 - octave 4 - note G_, 8 - octave 5 - note C_, 4 - octave 4 - note B_, 8 - octave 5 - note D_, 4 - note A_, 4 - note G_, 12 - octave 4 - note B_, 4 - octave 5 - note D_, 8 - note G_, 4 - note A_, 4 - note G_, 8 - note E_, 4 - note F#, 4 - note G_, 4 - note A_, 4 - note B_, 4 - octave 6 - note C_, 2 - note D_, 4 - note E_, 2 - notetype $8, $12 - note F#, 4 - note G_, 4 - note F#, 4 - note D_, 4 - octave 5 - note B_, 4 - octave 6 - note E_, 4 - notetype $C, $12 - octave 5 - note G_, 16 - notetype $8, $12 - note A_, 4 - note B_, 4 - note A_, 4 - note G_, 4 - note E_, 4 - note A_, 4 - notetype $C, $12 - note D_, 12 - note A_, 4 - note G_, 8 - note E_, 4 - note A_, 8 - note G_, 4 - note B_, 4 - note A_, 4 - octave 6 - note D_, 16 - note C_, 16 - note C_, 8 - octave 5 - note C_, 2 - octave 6 - note F#, 2 - note F#, 2 - octave 5 - note C_, 2 - octave 6 - note A_, 2 - note B_, 4 - note __, 16 - note __, 2 - octave 4 - note G_, 2 - octave 6 - note D_, 2 - note D_, 2 - octave 4 - note G_, 2 - octave 6 - note A_, 2 - note B_, 4 - note __, 16 - note __, 2 - octave 5 - note C_, 2 - octave 6 - note F#, 2 - note F#, 2 - octave 5 - note C_, 2 - octave 6 - note A_, 2 - note B_, 2 - octave 7 - note D_, 2 - note __, 16 - note __, 2 - octave 4 - note G_, 2 - octave 6 - note D_, 2 - note D_, 2 - octave 4 - note G_, 2 - octave 6 - note A_, 2 - note B_, 2 - octave 7 - note D_, 2 - note __, 10 - loopchannel 0, Music_EternaForest_Ch3_loop - -Music_EternaForest_Ch4: - togglenoise 4 -Music_EternaForest_Ch4_loop: - notetype $C - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note D#, 2 - note F#, 1 - note D#, 1 - note C_, 2 - note D#, 2 - note F#, 2 - note D#, 2 - note C_, 1 - note D#, 1 - note F#, 2 - note D#, 2 - note F#, 1 - note D#, 1 - note C_, 2 - note D#, 2 - note F#, 2 - note D#, 2 - note C_, 1 - note D#, 1 - note F#, 2 - note D#, 2 - note F#, 1 - note D#, 1 - note C_, 2 - note D#, 2 - note F#, 2 - note D#, 2 - note C_, 1 - note D#, 1 - note F#, 2 - note D#, 2 - note F#, 1 - note D#, 1 - note C_, 2 - note D#, 2 - note F#, 2 - note D#, 2 - note C_, 1 - note D#, 1 - note F#, 2 - note D#, 2 - note D#, 2 - note C_, 1 - note D#, 2 - note C_, 1 - note D#, 2 - note D#, 2 - note C_, 1 - note D#, 2 - note C_, 1 - note D#, 2 - note D#, 2 - note C_, 1 - note C_, 2 - note C_, 1 - note C_, 2 - note C_, 2 - note C_, 1 - note D#, 2 - note C_, 1 - note F#, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - loopchannel 0, Music_EternaForest_Ch4_loop diff --git a/crysaudio/music/DPPt/WinPokeSinnoh.asm b/crysaudio/music/DPPt/WinPokeSinnoh.asm deleted file mode 100644 index 2f9f8824..00000000 --- a/crysaudio/music/DPPt/WinPokeSinnoh.asm +++ /dev/null @@ -1,289 +0,0 @@ -Music_WinPokeSinnoh:: - dbw $80, Music_WinPokeSinnoh_Ch1 - dbw $01, Music_WinPokeSinnoh_Ch2 - dbw $02, Music_WinPokeSinnoh_Ch3 - -Music_WinPokeSinnoh_Ch1: - tempo $68 - volume $77 - notetype $C, $A2 - dutycycle 2 - octave 3 - note B_, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note E_, 2 - octave 4 - note D#, 2 - note E_, 2 - octave 3 - note G#, 2 - octave 4 - note E_, 4 -Music_WinPokeSinnoh_Ch1_loop: - octave 2 - note E_, 4 - octave 1 - note B_, 4 - octave 2 - note E_, 2 - note G#, 4 - note E_, 4 - note A_, 4 - note E_, 2 - note G#, 4 - note E_, 4 - note E_, 4 - octave 1 - note B_, 4 - octave 2 - note E_, 2 - note G#, 4 - note E_, 4 - note A_, 4 - note E_, 2 - note G#, 4 - note G_, 4 - note F_, 4 - note C_, 4 - note F_, 2 - note A_, 4 - note F_, 4 - note A#, 4 - note F_, 2 - note A_, 4 - note F_, 4 - note F_, 4 - note C_, 4 - note F_, 2 - note A_, 4 - note F_, 4 - note A#, 4 - note F_, 2 - note A_, 4 - note B_, 4 - loopchannel 0, Music_WinPokeSinnoh_Ch1_loop - -Music_WinPokeSinnoh_Ch2: - notetype $C, $B2 - dutycycle 2 - octave 4 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - intensity $B7 - note B_, 12 -Music_WinPokeSinnoh_Ch2_loop: - octave 4 - intensity $B2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 - octave 5 - note C#, 2 - note C#, 2 - note C#, 4 - octave 4 - note B_, 2 - note B_, 2 - note B_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 - octave 5 - note C#, 2 - note C#, 2 - note C#, 4 - octave 4 - note B_, 8 - octave 5 - note C_, 2 - octave 4 - note A#, 2 - note A_, 2 - note A#, 2 - octave 5 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 2 - note C_, 2 - note C_, 4 - note C_, 2 - octave 4 - note A#, 2 - note A_, 2 - note A#, 2 - octave 5 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 8 - loopchannel 0, Music_WinPokeSinnoh_Ch2_loop - -Music_WinPokeSinnoh_Ch3: - notetype $C, $12 - octave 5 - note __, 4 - notetype $9, $12 - note B_, 2 - notetype $6, $12 - note __, 1 - note G#, 3 - note __, 1 - note E_, 3 - note __, 1 - octave 4 - note B_, 3 - note __, 1 - octave 5 - note E_, 3 - note __, 1 - note G#, 3 - note __, 1 -Music_WinPokeSinnoh_Ch3_loop: - note G#, 3 - note __, 1 - note E_, 3 - note __, 1 - octave 4 - note B_, 3 - note __, 1 - octave 5 - note E_, 3 - note __, 1 - note G#, 3 - note __, 1 - octave 4 - note B_, 3 - note __, 1 - octave 5 - note E_, 3 - note __, 5 - note A_, 3 - note __, 1 - note C#, 3 - note __, 1 - note E_, 3 - note __, 5 - note G#, 3 - note __, 1 - octave 4 - note B_, 3 - note __, 1 - octave 5 - note E_, 3 - note __, 5 - note G#, 3 - note __, 1 - note E_, 3 - note __, 1 - octave 4 - note G#, 3 - note __, 1 - note B_, 3 - note __, 1 - octave 5 - note E_, 3 - note __, 1 - note G#, 3 - note __, 1 - octave 4 - note B_, 3 - note __, 5 - octave 5 - note E_, 3 - note __, 1 - note A_, 3 - note __, 1 - note C#, 3 - note __, 5 - note E_, 3 - note __, 1 - note D#, 3 - note __, 1 - note D_, 3 - note __, 1 - note C#, 3 - note __, 1 - note F_, 3 - note __, 1 - note C_, 3 - note __, 1 - octave 4 - note A_, 3 - note __, 1 - octave 5 - note C_, 3 - note __, 1 - note F_, 3 - note __, 1 - octave 4 - note A_, 3 - note __, 1 - octave 5 - note C_, 3 - note __, 5 - note F_, 3 - note __, 1 - octave 4 - note A#, 3 - note __, 1 - octave 5 - note D_, 3 - note __, 5 - note F_, 3 - note __, 1 - octave 4 - note A_, 3 - note __, 1 - octave 5 - note C_, 3 - note __, 5 - note F_, 3 - note __, 1 - note C_, 3 - note __, 1 - octave 4 - note A_, 3 - note __, 1 - octave 5 - note C_, 3 - note __, 1 - note F_, 3 - note __, 1 - note A_, 3 - note __, 1 - note C_, 3 - note __, 5 - note F_, 3 - note __, 1 - note A#, 3 - note __, 1 - note D_, 3 - note __, 5 - note F_, 3 - note __, 1 - note F_, 3 - note __, 1 - note F#, 3 - note __, 1 - note G_, 3 - note __, 1 - loopchannel 0, Music_WinPokeSinnoh_Ch3_loop diff --git a/crysaudio/music/DPPt/WinTrainerSinnoh.asm b/crysaudio/music/DPPt/WinTrainerSinnoh.asm deleted file mode 100644 index f88eafa0..00000000 --- a/crysaudio/music/DPPt/WinTrainerSinnoh.asm +++ /dev/null @@ -1,461 +0,0 @@ -Music_WinTrainerSinnoh:: - dbw $80, Music_WinTrainerSinnoh_Ch1 - dbw $01, Music_WinTrainerSinnoh_Ch2 - dbw $02, Music_WinTrainerSinnoh_Ch3 - -Music_WinTrainerSinnoh_Ch1: - tempo $7C - volume $77 - notetype $C, $A2 - dutycycle 2 - octave 1 - note __, 12 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 -Music_WinTrainerSinnoh_Ch1_loop: - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - octave 2 - note D#, 1 - octave 3 - note D#, 1 - octave 4 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - note D#, 1 - octave 1 - note D#, 1 - octave 2 - note D#, 1 - octave 3 - note D#, 1 - octave 4 - note D#, 1 - octave 1 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 4 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 4 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 4 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 4 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - octave 3 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - octave 2 - note D#, 1 - octave 3 - note D#, 1 - octave 4 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - octave 3 - note D#, 1 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - octave 2 - note D#, 1 - octave 3 - note D#, 1 - octave 4 - note D#, 1 - octave 3 - note D#, 1 - octave 2 - note D#, 1 - octave 1 - note D#, 1 - loopchannel 0, Music_WinTrainerSinnoh_Ch1_loop - -Music_WinTrainerSinnoh_Ch2: - notetype $C, $B2 - dutycycle 1 - octave 4 - note __, 8 - octave 5 - note G_, 1 - octave 4 - note A#, 1 - note G_, 1 - note D#, 1 - note G_, 1 - note D#, 1 - octave 3 - note A#, 1 - note G_, 1 -Music_WinTrainerSinnoh_Ch2_loop: - intensity $97 - octave 3 - note A#, 7 - octave 4 - note G_, 1 - octave 3 - note A_, 7 - octave 4 - note A_, 1 - octave 3 - note A#, 7 - octave 4 - note A#, 1 - octave 3 - note G#, 7 - octave 4 - note G#, 1 - octave 3 - note G_, 1 - octave 4 - note G_, 1 - octave 3 - note G_, 5 - octave 4 - note G_, 1 - octave 3 - note A_, 1 - octave 4 - note A_, 1 - octave 3 - note A_, 5 - octave 4 - note A_, 1 - octave 3 - note A#, 1 - octave 4 - note A#, 1 - octave 3 - note A#, 5 - octave 4 - note A#, 1 - octave 3 - note F#, 1 - octave 4 - note F#, 1 - octave 3 - note F#, 5 - intensity $B1 - octave 5 - note F#, 1 - note G_, 1 - note G_, 1 - octave 4 - note A#, 1 - note A#, 1 - octave 5 - note D#, 1 - note D#, 1 - octave 4 - note A#, 1 - note A#, 1 - octave 5 - note G#, 1 - note G#, 1 - note C_, 1 - note C_, 1 - note F_, 1 - note F_, 1 - note C_, 1 - note C_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note C#, 1 - note F#, 1 - note F#, 1 - note C#, 1 - note C#, 1 - octave 6 - note C_, 1 - note C_, 1 - octave 5 - note D#, 1 - note D#, 1 - note G#, 1 - note G#, 1 - note D#, 1 - note D#, 1 - note A#, 1 - note A#, 1 - octave 4 - note A#, 1 - note A#, 1 - octave 5 - note D#, 1 - note D#, 1 - octave 4 - note D#, 1 - note D#, 1 - octave 5 - note G_, 1 - note G_, 1 - octave 4 - note A#, 1 - note A#, 1 - octave 5 - note D#, 1 - note D#, 1 - octave 4 - note D#, 1 - note D#, 1 - octave 5 - note G#, 1 - note G#, 1 - note C_, 1 - note C_, 1 - note F_, 1 - note F_, 1 - octave 4 - note G#, 1 - note G#, 1 - octave 5 - note D_, 1 - note D_, 1 - octave 4 - note D_, 1 - note D_, 1 - octave 5 - note G#, 1 - note G#, 1 - octave 4 - note G#, 1 - note G#, 1 - loopchannel 0, Music_WinTrainerSinnoh_Ch2_loop - -Music_WinTrainerSinnoh_Ch3: - notetype $C, $12 - vibrato $0E, $25 - octave 5 - note A#, 1 - notetype $4, $12 - note __, 1 - note A#, 3 - note __, 1 - note A#, 3 - note __, 1 - note A#, 3 - note __, 1 - octave 6 - note C_, 4 - note D_, 4 - notetype $C, $12 - note D#, 8 -Music_WinTrainerSinnoh_Ch3_loop: - octave 5 - note D#, 4 - octave 4 - note A#, 2 - octave 5 - note D#, 2 - note F_, 4 - note C_, 2 - note F_, 2 - note G_, 4 - note G#, 2 - note A#, 2 - note F_, 4 - note G_, 2 - note G#, 2 - note D#, 3 - octave 4 - note A#, 3 - octave 5 - note D#, 2 - note F_, 3 - note C_, 3 - note F_, 2 - note G_, 3 - note G#, 3 - note A#, 2 - note F#, 3 - note G#, 3 - note A#, 2 - note D#, 2 - octave 4 - note A#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - octave 5 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F#, 2 - note C#, 2 - note F#, 2 - note C#, 2 - note G#, 2 - note D#, 2 - note G#, 2 - note D#, 2 - note G_, 16 - note F_, 16 - loopchannel 0, Music_WinTrainerSinnoh_Ch3_loop diff --git a/crysaudio/music/DPPt/frontierbrain.asm b/crysaudio/music/DPPt/frontierbrain.asm deleted file mode 100644 index a993660d..00000000 --- a/crysaudio/music/DPPt/frontierbrain.asm +++ /dev/null @@ -1,2285 +0,0 @@ -Music_FrontierBrain:: - dbw $80, Music_FrontierBrain_Ch1 - dbw $01, Music_FrontierBrain_Ch2 - dbw $02, Music_FrontierBrain_Ch3 - -Music_FrontierBrain_Ch1: - tempo $60 - volume $77 - notetype $C, $C2 - dutycycle 1 - tone $0002 - vibrato $06, $34 - note __, 4 - notetype $8, $C2 - octave 3 - note B_, 2 - octave 4 - note F_, 2 - note B_, 2 - octave 3 - note A#, 2 - octave 4 - note E_, 2 - note A#, 2 - octave 3 - note A_, 2 - octave 4 - note D#, 2 - note A_, 2 - octave 3 - note G#, 2 - octave 4 - note D_, 2 - note G#, 2 - octave 3 - note G_, 2 - octave 4 - note C#, 2 - note G_, 2 - octave 3 - note F#, 2 - octave 4 - note C_, 2 - note F#, 2 - octave 3 - note F_, 2 - note B_, 2 - octave 4 - note F_, 2 -Music_FrontierBrain_Ch1_loop: - notetype $C, $C2 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note A_, 2 - octave 3 - note A_, 16 - note __, 16 - note __, 2 - notetype $8, $C1 - octave 4 - note A_, 2 - note A_, 1 - note A_, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - notetype $C, $C1 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - intensity $C2 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note A_, 2 - octave 3 - note A_, 16 - note __, 16 - note __, 2 - notetype $8, $C1 - octave 4 - note G#, 2 - note G#, 1 - note G#, 1 - note G#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - note G#, 2 - notetype $C, $C1 - note G#, 1 - note A_, 1 - note G#, 1 - note F#, 1 - intensity $C2 - note B_, 2 - octave 3 - note B_, 2 - octave 4 - note B_, 2 - octave 3 - note B_, 2 - octave 4 - note B_, 2 - octave 3 - note B_, 2 - octave 4 - note B_, 2 - octave 3 - note B_, 16 - note __, 16 - note __, 2 - notetype $8, $C2 - dutycycle 2 - note B_, 1 - octave 4 - note D#, 1 - note F#, 1 - note A_, 1 - note B_, 1 - octave 5 - note C#, 1 - note D#, 1 - note F#, 1 - note A_, 1 - note B_, 1 - octave 6 - note C#, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note C#, 1 - octave 5 - note B_, 1 - note A_, 1 - note F#, 1 - note D#, 1 - note C#, 1 - octave 4 - note B_, 1 - note A_, 1 - note F#, 1 - note D#, 4 - intensity $C4 - dutycycle 1 - note E_, 9 - note E_, 9 - note E_, 6 - note E_, 9 - note E_, 6 - notetype $C, $C4 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note A_, 1 - octave 4 - note E_, 6 - note E_, 6 - note E_, 6 - note E_, 6 - note E_, 4 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note G#, 3 - octave 4 - note E_, 4 - octave 3 - note B_, 2 - octave 4 - note E_, 2 - octave 3 - note B_, 2 - note G#, 2 - octave 4 - note E_, 4 - note G#, 2 - note E_, 2 - note B_, 2 - note G#, 2 - octave 5 - note E_, 2 - octave 4 - note B_, 2 - octave 5 - note G#, 2 - intensity $C2 - dutycycle 2 - octave 4 - note E_, 1 - note G_, 1 - note B_, 1 - octave 5 - note E_, 1 - note F#, 1 - note E_, 1 - octave 4 - note B_, 1 - note G_, 1 - note B_, 1 - note G_, 1 - note B_, 1 - octave 5 - note E_, 1 - note F#, 1 - note E_, 1 - octave 4 - note B_, 1 - note G_, 1 - note B_, 1 - note G_, 1 - note B_, 1 - octave 5 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - octave 4 - note B_, 1 - octave 5 - note E_, 1 - octave 4 - note B_, 1 - note G_, 1 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note E_, 1 - note G_, 1 - note E_, 1 - note G#, 1 - note B_, 1 - octave 5 - note E_, 1 - note F#, 1 - note E_, 1 - octave 4 - note B_, 1 - note G#, 1 - note E_, 1 - note G#, 1 - note B_, 1 - octave 5 - note E_, 1 - note F#, 1 - note E_, 1 - octave 4 - note B_, 1 - note G_, 1 - note E_, 1 - note G#, 1 - note B_, 1 - octave 5 - note E_, 1 - note G#, 1 - note B_, 1 - note G#, 1 - note E_, 1 - octave 4 - note B_, 1 - note G#, 1 - note E_, 1 - octave 5 - note E_, 1 - octave 4 - note B_, 1 - octave 5 - note E_, 1 - note F#, 1 - note G#, 1 - octave 6 - note C_, 1 - octave 5 - note A_, 1 - note G_, 1 - note E_, 1 - note C_, 1 - octave 4 - note A_, 1 - note G_, 1 - note E_, 1 - note C_, 1 - octave 3 - note G_, 1 - octave 4 - note C_, 1 - note E_, 1 - note G_, 1 - octave 5 - note C_, 1 - octave 4 - note G_, 1 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note D#, 1 - note F#, 1 - note A_, 1 - note B_, 1 - octave 5 - note D#, 1 - octave 4 - note B_, 1 - note F#, 1 - note D#, 1 - note F#, 1 - note B_, 1 - octave 5 - note D#, 1 - note F#, 1 - note D#, 1 - octave 4 - note B_, 1 - note F#, 1 - note C#, 1 - note E_, 1 - note G_, 1 - note G#, 1 - octave 5 - note C#, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note C#, 1 - octave 4 - note G#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - octave 3 - note G#, 1 - note F#, 1 - note E_, 15 - intensity $C4 - dutycycle 1 - octave 2 - note A_, 1 - octave 3 - note C_, 1 - note C#, 6 - note C#, 6 - note C#, 6 - note C#, 6 - octave 2 - note B_, 4 - octave 3 - note D_, 4 - note C#, 6 - note C#, 6 - note C#, 6 - note C#, 6 - note D_, 4 - octave 2 - note B_, 4 - octave 3 - note C#, 6 - note C#, 6 - note C#, 6 - note C#, 6 - octave 2 - note B_, 4 - octave 3 - note D_, 4 - octave 2 - note B_, 6 - note B_, 6 - note B_, 6 - note F#, 6 - note B_, 4 - octave 3 - note D#, 4 - octave 2 - note B_, 6 - note B_, 6 - note B_, 4 - note B_, 6 - note B_, 6 - octave 3 - note C_, 4 - note C#, 6 - note C#, 6 - note C#, 6 - note C#, 6 - note D_, 4 - octave 2 - note B_, 4 - intensity $C2 - dutycycle 0 - octave 4 - note G#, 2 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 2 - intensity $B7 - note A_, 4 - note G#, 4 - note G_, 2 - note C#, 2 - octave 3 - note G_, 2 - octave 4 - note D_, 2 - note C#, 2 - octave 3 - note G_, 2 - note E_, 2 - octave 4 - note G_, 2 - note F#, 2 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note F_, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - notetype $8, $B7 - octave 4 - note G_, 2 - octave 3 - note B_, 2 - note G_, 2 - octave 4 - note F#, 2 - octave 3 - note A#, 2 - note F#, 2 - octave 4 - note F_, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note E_, 2 - octave 3 - note G#, 2 - note E_, 2 - notetype $C, $B7 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note D_, 3 - dutycycle 1 - octave 4 - note C_, 6 - note C_, 6 - note C_, 4 - note C_, 6 - note C_, 4 - octave 3 - note G_, 1 - note A_, 1 - note G_, 1 - note F_, 1 - octave 4 - note C_, 6 - note C_, 6 - note C_, 6 - note C_, 6 - note C_, 4 - octave 3 - note G_, 1 - note A_, 1 - note G_, 1 - note E_, 3 - octave 4 - note C_, 4 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - octave 3 - note G_, 2 - note E_, 2 - octave 4 - note C_, 4 - note E_, 2 - note C_, 2 - note G_, 2 - note E_, 2 - octave 5 - note C_, 2 - octave 4 - note G_, 2 - octave 5 - note E_, 2 - intensity $C2 - dutycycle 2 - octave 4 - note C_, 1 - note D#, 1 - note G_, 1 - octave 5 - note C_, 1 - note D_, 1 - note C_, 1 - octave 4 - note G_, 1 - note D#, 1 - note G_, 1 - note D#, 1 - note G_, 1 - octave 5 - note C_, 1 - note D_, 1 - note C_, 1 - octave 4 - note G_, 1 - note D#, 1 - note G_, 1 - note D#, 1 - note G_, 1 - octave 5 - note C_, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 1 - octave 4 - note G_, 1 - note D#, 1 - note C_, 1 - octave 3 - note G_, 1 - octave 4 - note C_, 1 - note D#, 1 - note C_, 1 - note E_, 1 - note G_, 1 - octave 5 - note C_, 1 - note D_, 1 - note C_, 1 - octave 4 - note G_, 1 - note E_, 1 - note C_, 1 - note E_, 1 - note G_, 1 - octave 5 - note C_, 1 - note D_, 1 - note C_, 1 - octave 4 - note G_, 1 - note D#, 1 - note C_, 1 - note E_, 1 - note G_, 1 - octave 5 - note C_, 1 - note E_, 1 - note G_, 1 - note E_, 1 - note C_, 1 - octave 4 - note G_, 1 - note E_, 1 - note C_, 1 - octave 5 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 1 - note D_, 1 - note E_, 1 - note G#, 1 - note F_, 1 - note D#, 1 - note C_, 1 - octave 4 - note G#, 1 - note F_, 1 - note D#, 1 - note C_, 1 - octave 3 - note G#, 1 - note D#, 1 - note G#, 1 - octave 4 - note C_, 1 - note D#, 1 - note G#, 1 - note D#, 1 - note C_, 1 - octave 3 - note G_, 1 - note B_, 1 - octave 4 - note D_, 1 - note F_, 1 - note G_, 1 - note B_, 1 - note G_, 1 - note D_, 1 - octave 3 - note B_, 1 - octave 4 - note D_, 1 - note G_, 1 - note B_, 1 - octave 5 - note D_, 1 - octave 4 - note B_, 1 - note G_, 1 - note D_, 16 - note __, 9 - notetype $8, $C7 - dutycycle 1 - octave 3 - note A_, 2 - notetype $A, $00 - note __, 2 - notetype $8, $C7 - note F_, 1 - notetype $4, $00 - note __, 1 - notetype $C, $C7 - octave 4 - note C_, 12 - note D_, 4 - note F_, 1 - note G_, 1 - note F_, 1 - note D_, 1 - octave 3 - note B_, 8 - note G_, 1 - note A_, 1 - note G_, 1 - note F#, 1 - note G_, 10 - notetype $8, $C7 - note G_, 1 - notetype $4, $00 - note __, 1 - intensity $C7 - note G_, 2 - note __, 1 - notetype $C, $C7 - note G_, 16 - notetype $8, $C7 - note B_, 2 - notetype $A, $00 - note __, 2 - notetype $8, $C7 - note G_, 1 - notetype $4, $00 - note __, 1 - notetype $C, $C7 - octave 4 - note D_, 12 - note D#, 8 - note E_, 12 - dutycycle 2 - note C#, 1 - notetype $4, $00 - note __, 1 - intensity $C7 - note C#, 3 - note __, 1 - note C#, 3 - note __, 1 - note C#, 16 - octave 3 - note B_, 3 - note __, 1 - note B_, 3 - note __, 1 - notetype $C, $C7 - note B_, 8 - notetype $8, $C7 - dutycycle 1 - note F_, 2 - notetype $A, $00 - note __, 2 - notetype $8, $C7 - note C_, 1 - notetype $4, $00 - note __, 1 - intensity $C7 - note A_, 12 - octave 4 - note C_, 4 - note __, 5 - octave 3 - note A_, 2 - note __, 1 - octave 4 - note F_, 16 - note __, 16 - note __, 16 - note __, 6 - note C_, 6 - octave 3 - note F#, 4 - note __, 5 - note C_, 2 - note __, 1 - note A_, 12 - octave 4 - note C_, 4 - note __, 5 - octave 3 - note A_, 2 - note __, 1 - notetype $C, $C7 - octave 4 - note F#, 12 - octave 5 - note C_, 8 - notetype $8, $C2 - octave 3 - note B_, 2 - octave 4 - note F_, 2 - note B_, 2 - octave 3 - note A#, 2 - octave 4 - note E_, 2 - note A#, 2 - octave 3 - note A_, 2 - octave 4 - note D#, 2 - note A_, 2 - octave 3 - note G#, 2 - octave 4 - note D_, 2 - note G#, 2 - octave 3 - note G_, 2 - octave 4 - note C#, 2 - note G_, 2 - octave 3 - note F#, 2 - octave 4 - note C_, 2 - note F#, 2 - octave 3 - note F_, 2 - note B_, 2 - octave 4 - note F_, 2 - loopchannel 0, Music_FrontierBrain_Ch1_loop - -Music_FrontierBrain_Ch2: - notetype $8, $D4 - dutycycle 3 - tone $0001 - vibrato $0A, $25 - octave 3 - note B_, 2 - octave 4 - note F_, 2 - note B_, 2 - octave 5 - note D_, 6 - note C#, 6 - note C_, 6 - octave 4 - note B_, 6 - note A#, 6 - note A_, 6 - note G#, 6 -Music_FrontierBrain_Ch2_loop: - notetype $C, $D4 - octave 2 - note __, 8 - note A_, 2 - note G#, 4 - note B_, 2 - octave 3 - note C_, 6 - note D_, 2 - note D#, 4 - octave 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note A_, 1 - octave 3 - note C_, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 6 - note D_, 4 - note C_, 4 - octave 2 - note B_, 2 - note A_, 2 - note G#, 2 - note B_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note D#, 1 - note F_, 1 - note E_, 2 - note E_, 2 - note F_, 2 - note A_, 2 - note G#, 4 - note B_, 2 - octave 3 - note C_, 6 - note D#, 2 - note F_, 4 - note D_, 2 - note D#, 2 - note C_, 1 - note D_, 1 - note C#, 2 - note G_, 6 - note F_, 4 - note D#, 4 - octave 2 - note B_, 2 - note A_, 2 - note G#, 2 - note B_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note D#, 2 - note E_, 6 - intensity $D7 - octave 3 - note E_, 4 - note __, 4 - note F_, 4 - note __, 4 - note F#, 4 - note __, 4 - note G_, 4 - note __, 2 - note E_, 2 - note __, 2 - note F_, 2 - note __, 2 - note F#, 2 - note __, 2 - note G_, 2 - note __, 2 - note G#, 2 - note __, 2 - note A_, 2 - note __, 2 - note A#, 2 - note __, 2 - note B_, 2 - note __, 2 - octave 4 - note E_, 6 - note F#, 2 - note __, 2 - note G#, 2 - note __, 2 - note A_, 2 - note G#, 6 - note A_, 2 - note __, 2 - note B_, 4 - intensity $B0 - note G#, 16 - intensity $C7 - note E_, 16 - note __, 2 - note E_, 6 - note F#, 2 - note __, 2 - note G#, 4 - note A_, 2 - note G#, 4 - note A_, 2 - note __, 2 - note B_, 6 - intensity $D2 - note E_, 6 - note E_, 6 - note E_, 6 - intensity $D5 - octave 3 - note B_, 6 - intensity $D2 - octave 4 - note E_, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 6 - note E_, 6 - note E_, 6 - intensity $D5 - octave 3 - note B_, 6 - intensity $D2 - octave 4 - note E_, 4 - note F#, 4 - note E_, 6 - note E_, 6 - note D#, 2 - note C#, 4 - intensity $D5 - note D#, 6 - note E_, 2 - note __, 2 - note F#, 4 - note G#, 16 - note __, 14 - intensity $D2 - octave 3 - note C#, 1 - note G_, 1 - note G#, 6 - note G#, 6 - note G#, 6 - note G#, 6 - note F#, 4 - note A_, 4 - note G#, 6 - note G#, 6 - note G#, 6 - note G#, 6 - note A_, 4 - note F#, 2 - intensity $D7 - dutycycle 0 - octave 4 - note E_, 1 - note F#, 1 - note G#, 2 - intensity $C1 - note C#, 4 - intensity $C7 - octave 5 - note C#, 6 - note E_, 6 - octave 4 - note E_, 1 - note F#, 1 - note G#, 4 - note F#, 4 - note E_, 4 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 16 - note __, 6 - note D#, 1 - note E_, 1 - note F#, 2 - intensity $C1 - octave 3 - note B_, 4 - intensity $C7 - octave 4 - note B_, 6 - octave 5 - note D#, 6 - octave 4 - note D#, 1 - note E_, 1 - note F#, 4 - note B_, 4 - note A_, 4 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 16 - note __, 6 - intensity $C2 - dutycycle 1 - note G#, 1 - note B_, 1 - octave 5 - note C#, 2 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 2 - intensity $C7 - note E_, 4 - note D#, 4 - note D_, 8 - note C#, 8 - note C_, 8 - octave 4 - note B_, 8 - octave 5 - note D_, 4 - note C#, 4 - note C_, 4 - octave 4 - note B_, 4 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - octave 3 - note B_, 1 - note G_, 1 - note __, 2 - intensity $D7 - dutycycle 3 - octave 4 - note C_, 6 - note D_, 2 - note __, 2 - note E_, 2 - note __, 2 - note F_, 2 - note E_, 6 - note F_, 2 - note __, 2 - note G_, 4 - note E_, 16 - note C_, 16 - note __, 2 - note C_, 6 - note D_, 2 - note __, 2 - note E_, 4 - note F_, 2 - note E_, 4 - note F_, 2 - note __, 2 - note G_, 6 - intensity $D2 - octave 5 - note C_, 6 - note C_, 6 - note C_, 6 - intensity $D5 - octave 4 - note G_, 6 - intensity $D2 - octave 5 - note C_, 4 - octave 4 - note G_, 4 - octave 5 - note C_, 6 - note C_, 6 - note C_, 6 - intensity $D5 - octave 4 - note G_, 6 - intensity $D2 - octave 5 - note C_, 4 - note D_, 4 - note C_, 6 - note C_, 6 - octave 4 - note B_, 2 - note A_, 4 - intensity $D5 - note B_, 6 - octave 5 - note C_, 4 - note D_, 16 - note __, 1 - intensity $D1 - octave 4 - note A_, 1 - note B_, 1 - octave 5 - note C_, 1 - note E_, 3 - octave 4 - note A_, 1 - intensity $D7 - note A_, 12 - octave 5 - note E_, 4 - note D_, 4 - note C_, 4 - note D_, 4 - octave 4 - note B_, 1 - octave 5 - note C_, 1 - octave 4 - note B_, 1 - note A_, 1 - note B_, 16 - note __, 9 - intensity $D1 - note G_, 1 - note A_, 1 - note B_, 1 - octave 5 - note D_, 3 - octave 4 - note G_, 1 - intensity $D7 - note G_, 12 - note B_, 4 - note G_, 4 - octave 5 - note G_, 4 - note F_, 4 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note E_, 8 - notetype $8, $D7 - dutycycle 2 - octave 4 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 8 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 6 - intensity $D1 - dutycycle 3 - note A_, 2 - note B_, 2 - octave 5 - note C_, 2 - notetype $C, $D1 - note E_, 3 - octave 4 - note A_, 1 - intensity $D7 - note A_, 12 - octave 3 - note F_, 2 - note C_, 4 - note F_, 4 - note A_, 2 - notetype $8, $D1 - octave 4 - note A_, 2 - note B_, 2 - octave 5 - note C_, 2 - notetype $C, $D1 - note E_, 3 - octave 4 - note A_, 1 - intensity $D7 - note A_, 12 - octave 3 - note F#, 2 - note C_, 4 - note F#, 4 - note A_, 4 - octave 4 - note C_, 2 - octave 5 - note D_, 16 - note __, 12 - loopchannel 0, Music_FrontierBrain_Ch2_loop - -Music_FrontierBrain_Ch3: - notetype $C, $19 - vibrato $00, $20 - note __, 4 - notetype $8, $19 - octave 2 - note F#, 2 - octave 3 - note C_, 2 - note F#, 2 - octave 2 - note F_, 2 - note B_, 2 - octave 3 - note F_, 2 - octave 2 - note E_, 2 - note A#, 2 - octave 3 - note E_, 2 - octave 2 - note D#, 2 - note A_, 2 - octave 3 - note D#, 2 - octave 2 - note D_, 2 - note G#, 2 - octave 3 - note D_, 2 - octave 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note C_, 2 - note F#, 2 - octave 3 - note C_, 2 -Music_FrontierBrain_Ch3_loop: - notetype $C, $19 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note B_, 2 - octave 3 - note D#, 1 - note D_, 1 - note C_, 2 - octave 2 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 3 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - note D_, 2 - note D#, 1 - note D_, 1 - octave 2 - note A#, 3 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note B_, 2 - octave 3 - note D#, 1 - note D_, 1 - note C_, 2 - octave 2 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 3 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - note D_, 2 - note D#, 1 - note D_, 1 - octave 2 - note A#, 2 - notetype $8, $19 - note E_, 2 - note __, 1 - note E_, 2 - note __, 1 - octave 3 - note E_, 6 - octave 2 - note E_, 2 - note __, 1 - note E_, 2 - note __, 1 - octave 3 - note F_, 6 - octave 2 - note E_, 2 - note __, 1 - note E_, 2 - note __, 1 - octave 3 - note F#, 6 - octave 2 - note E_, 2 - note __, 1 - note E_, 2 - note __, 1 - octave 3 - note G_, 6 - octave 2 - note E_, 3 - octave 3 - note E_, 3 - octave 2 - note E_, 3 - octave 3 - note F_, 3 - octave 2 - note E_, 3 - octave 3 - note F#, 3 - octave 2 - note E_, 3 - octave 3 - note G_, 3 - octave 2 - note E_, 3 - octave 3 - note G#, 3 - octave 2 - note E_, 3 - octave 3 - note A_, 3 - octave 2 - note E_, 3 - octave 3 - note A#, 3 - octave 2 - note E_, 3 - octave 3 - note B_, 3 - octave 2 - note E_, 3 - octave 3 - note E_, 3 - octave 2 - note E_, 3 - octave 3 - note E_, 3 - octave 2 - note E_, 3 - octave 3 - note E_, 3 - octave 2 - note E_, 3 - notetype $C, $19 - octave 3 - note E_, 1 - note D#, 1 - note E_, 2 - octave 2 - note E_, 1 - note __, 1 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - note E_, 2 - octave 3 - note E_, 1 - octave 2 - note B_, 1 - note G#, 1 - note F#, 1 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - octave 3 - note E_, 1 - note D#, 1 - note E_, 2 - octave 2 - note E_, 1 - note __, 1 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - note E_, 2 - octave 3 - note E_, 1 - octave 2 - note B_, 1 - note G#, 1 - note F#, 1 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - octave 3 - note E_, 1 - note D#, 1 - note E_, 2 - octave 2 - note E_, 1 - note __, 1 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - note E_, 2 - octave 3 - note E_, 1 - octave 2 - note B_, 1 - note G#, 1 - note F#, 1 - note D_, 2 - octave 3 - note D_, 2 - octave 2 - note D_, 2 - octave 3 - note D_, 2 - octave 2 - note D_, 2 - octave 3 - note D_, 2 - octave 2 - note D_, 2 - octave 3 - note D_, 1 - note C#, 1 - note D_, 2 - octave 2 - note D_, 2 - note D_, 2 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - note D_, 2 - octave 3 - note D_, 1 - octave 2 - note A_, 1 - note F#, 1 - note E_, 1 - note C#, 2 - octave 3 - note C#, 2 - octave 2 - note C#, 2 - octave 3 - note C#, 2 - octave 2 - note C#, 2 - octave 3 - note C#, 2 - octave 2 - note C#, 2 - octave 3 - note C#, 1 - note C_, 1 - note C#, 2 - octave 2 - note C#, 2 - note C#, 2 - octave 3 - note C#, 2 - octave 2 - note G#, 2 - note C#, 2 - octave 3 - note C#, 1 - octave 2 - note G#, 1 - note F_, 1 - note D#, 1 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note B_, 2 - octave 1 - note B_, 2 - note B_, 2 - octave 2 - note B_, 2 - note F#, 2 - octave 1 - note B_, 2 - octave 2 - note B_, 1 - note F#, 1 - note D#, 1 - note C#, 1 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - note E_, 2 - note F#, 2 - note E_, 1 - note D_, 1 - octave 1 - note B_, 2 - octave 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - note E_, 2 - note F#, 2 - note E_, 1 - note D_, 1 - octave 1 - note B_, 2 - octave 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - note E_, 2 - note F#, 2 - note E_, 1 - note D_, 1 - octave 1 - note B_, 2 - octave 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - note E_, 2 - note F#, 2 - note D_, 2 - octave 1 - note B_, 2 - octave 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 1 - note B_, 2 - octave 2 - note F#, 2 - note B_, 2 - note F_, 2 - note D#, 2 - note E_, 2 - note D#, 1 - note C#, 1 - octave 1 - note A#, 2 - note B_, 2 - octave 2 - note F#, 2 - octave 1 - note B_, 2 - octave 2 - note F#, 2 - octave 1 - note B_, 2 - octave 2 - note F_, 2 - note B_, 2 - note F_, 2 - octave 1 - note B_, 2 - octave 2 - note F#, 2 - note B_, 2 - note F#, 2 - note D_, 2 - note E_, 2 - note D#, 1 - note C#, 1 - octave 1 - note A#, 2 - note B_, 2 - octave 2 - note F#, 2 - octave 1 - note B_, 2 - octave 2 - note F#, 2 - octave 1 - note B_, 2 - octave 2 - note F_, 2 - note B_, 2 - note F_, 2 - note C#, 2 - note G#, 2 - octave 3 - note C#, 2 - octave 2 - note G#, 2 - note C#, 2 - note D_, 2 - octave 1 - note B_, 2 - octave 2 - note D_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note D_, 2 - octave 1 - note B_, 2 - octave 2 - note D_, 2 - note C#, 2 - note C#, 2 - note __, 2 - note C#, 2 - note __, 2 - note C#, 2 - note __, 2 - note C#, 2 - note __, 2 - note C#, 2 - note __, 2 - note C#, 2 - note C#, 2 - note __, 2 - note C#, 2 - note __, 2 - note G#, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - octave 2 - note F#, 2 - note B_, 2 - note F_, 2 - note A#, 2 - note E_, 2 - note A_, 2 - note D#, 2 - note G#, 2 - note D_, 2 - note G_, 2 - note C#, 2 - note F#, 2 - note G#, 2 - octave 3 - note C#, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - octave 2 - note F#, 2 - note B_, 2 - note F_, 2 - note A#, 2 - note E_, 2 - note A_, 2 - note D#, 2 - note G#, 2 - note D_, 2 - note G_, 2 - note C#, 2 - note F#, 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 2 - octave 2 - note C_, 1 - note __, 1 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note C_, 2 - octave 3 - note C_, 1 - octave 2 - note G_, 1 - note E_, 1 - note D_, 1 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 2 - octave 2 - note C_, 1 - note __, 1 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note C_, 2 - octave 3 - note C_, 1 - octave 2 - note G_, 1 - note E_, 1 - note D_, 1 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 2 - octave 2 - note C_, 1 - note __, 1 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note C_, 2 - octave 3 - note C_, 1 - octave 2 - note G_, 1 - note E_, 1 - note D_, 1 - octave 1 - note A#, 2 - octave 2 - note A#, 2 - octave 1 - note A#, 2 - octave 2 - note A#, 2 - octave 1 - note A#, 2 - octave 2 - note A#, 2 - octave 1 - note A#, 2 - octave 2 - note A#, 1 - note A_, 1 - note A#, 2 - octave 1 - note A#, 2 - note A#, 2 - octave 2 - note A#, 2 - note F_, 2 - octave 1 - note A#, 2 - octave 2 - note A#, 1 - note F_, 1 - note D_, 1 - note C_, 1 - octave 1 - note A_, 2 - octave 2 - note A_, 2 - octave 1 - note A_, 2 - octave 2 - note A_, 2 - octave 1 - note A_, 2 - octave 2 - note A_, 2 - octave 1 - note A_, 2 - octave 2 - note A_, 1 - note G#, 1 - note A_, 2 - octave 1 - note A_, 2 - note A_, 2 - octave 2 - note A_, 2 - note E_, 2 - octave 1 - note A_, 2 - octave 2 - note A_, 1 - note E_, 1 - note C#, 1 - octave 1 - note B_, 1 - note G#, 2 - octave 2 - note G#, 2 - octave 1 - note G#, 2 - octave 2 - note G#, 2 - octave 1 - note G#, 2 - octave 2 - note G#, 2 - octave 1 - note G#, 2 - octave 2 - note G#, 1 - note G_, 1 - note G_, 2 - octave 1 - note G_, 2 - note G_, 2 - octave 2 - note G_, 2 - note D_, 2 - octave 1 - note G_, 2 - octave 2 - note G_, 1 - note D_, 1 - octave 1 - note B_, 1 - note A_, 1 - octave 2 - note G_, 2 - note __, 2 - note D_, 2 - note __, 2 - octave 1 - note B_, 2 - note __, 2 - octave 2 - note D_, 2 - note __, 2 - note F_, 2 - octave 3 - note C_, 2 - note F_, 2 - note C_, 2 - octave 2 - note F_, 2 - octave 3 - note C_, 2 - note F_, 1 - note G_, 1 - note F_, 1 - note C_, 1 - note F_, 2 - octave 2 - note F_, 2 - note __, 2 - octave 3 - note C_, 2 - note __, 2 - note F_, 2 - note __, 2 - note A_, 2 - octave 2 - note F_, 2 - note B_, 2 - octave 3 - note G_, 2 - note D_, 2 - octave 2 - note B_, 2 - note A_, 2 - note B_, 1 - octave 3 - note D_, 1 - octave 2 - note B_, 1 - note A_, 1 - note G_, 2 - note D_, 2 - note __, 2 - note G_, 2 - note __, 2 - note B_, 2 - note __, 2 - octave 3 - note D_, 2 - octave 2 - note E_, 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - note E_, 2 - note B_, 2 - octave 3 - note E_, 1 - note F_, 1 - note E_, 1 - octave 2 - note B_, 1 - note E_, 2 - octave 1 - note B_, 2 - note __, 2 - octave 2 - note E_, 2 - note __, 2 - note G#, 2 - note __, 2 - note B_, 2 - note A_, 2 - octave 3 - note C#, 2 - note A_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 4 - note C#, 1 - note D_, 1 - note C#, 1 - octave 3 - note A_, 1 - octave 2 - note A_, 2 - note E_, 2 - note __, 2 - note A_, 2 - note __, 2 - octave 3 - note C#, 2 - note __, 2 - note E_, 2 - octave 2 - note F_, 2 - octave 3 - note C_, 2 - note F_, 2 - note C_, 2 - octave 2 - note F_, 2 - octave 3 - note C_, 2 - note F_, 1 - note G_, 1 - note F_, 1 - note C_, 1 - note F_, 2 - octave 2 - note F_, 2 - note __, 2 - octave 3 - note C_, 2 - note __, 2 - note F_, 2 - note __, 2 - note A_, 2 - octave 2 - note F#, 2 - octave 3 - note E_, 2 - note F#, 2 - note C_, 2 - octave 2 - note F#, 2 - octave 3 - note C_, 2 - note F#, 1 - note G_, 1 - note F#, 1 - note C_, 1 - note F#, 2 - octave 2 - note A_, 2 - note __, 2 - octave 3 - note C_, 2 - note __, 2 - note E_, 2 - note __, 2 - note A_, 2 - notetype $8, $19 - octave 2 - note F#, 2 - octave 3 - note C_, 2 - note F#, 2 - octave 2 - note F_, 2 - note B_, 2 - octave 3 - note F_, 2 - octave 2 - note E_, 2 - note A#, 2 - octave 3 - note E_, 2 - octave 2 - note D#, 2 - note A_, 2 - octave 3 - note D#, 2 - octave 2 - note D_, 2 - note G#, 2 - octave 3 - note D_, 2 - octave 2 - note C#, 2 - note G_, 2 - octave 3 - note C#, 2 - octave 2 - note C_, 2 - note F#, 2 - octave 3 - note C_, 2 - loopchannel 0, Music_FrontierBrain_Ch3_loop diff --git a/crysaudio/music/DPPt/jubilifecity.asm b/crysaudio/music/DPPt/jubilifecity.asm deleted file mode 100644 index 73cc3c36..00000000 --- a/crysaudio/music/DPPt/jubilifecity.asm +++ /dev/null @@ -1,614 +0,0 @@ -Music_JubilifeCity:: - dbw $C0, Music_JubilifeCity_Ch1 - dbw $01, Music_JubilifeCity_Ch2 - dbw $02, Music_JubilifeCity_Ch3 - dbw $03, Music_JubilifeCity_Ch4 - -Music_JubilifeCity_Ch1: - tempo 140 - stereopanning $f - volume $77 -Music_JubilifeCity_Loop1: - notetype $4, 179 - dutycycle 2 - note __, 16 - note __, 16 - note __, 4 - octave 3 - note A_, 12 - note D_, 12 - octave 2 - note A_, 12 - octave 3 - note D_, 4 - note D_, 8 - note A_, 16 - note __, 16 - note __, 16 - note A_, 12 - note C#, 12 - octave 2 - note A_, 12 - octave 3 - note C#, 4 - note C#, 8 - note F#, 16 - note __, 4 - note E_, 12 - note G_, 12 - note F#, 8 - note D_, 16 - note F#, 12 - note B_, 8 - note E_, 8 - note A#, 16 - note __, 16 - note __, 16 - note __, 8 - octave 4 - note B_, 4 - note A_, 12 - note G_, 12 - note F#, 12 - note E_, 12 - note D_, 12 - octave 3 - note A_, 16 - note __, 16 - octave 4 - note B_, 4 - note A_, 12 - note G_, 12 - note F#, 12 - octave 3 - note D_, 4 - note E_, 4 - note F#, 4 - note G_, 8 - note D_, 8 - octave 4 - note D_, 8 - octave 3 - note G_, 8 - note A_, 8 - octave 4 - note D_, 8 - octave 3 - note G_, 12 - note D_, 12 - octave 2 - note A_, 12 - octave 3 - note C#, 16 - note __, 8 - intensity 181 - note E_, 16 - note __, 8 - octave 2 - note B_, 16 - note __, 8 - octave 3 - note G_, 16 - note __, 8 - note G#, 12 - note D#, 16 - note __, 4 - note D#, 16 - note __, 16 - note __, 8 - note D#, 12 - note G#, 12 - note C_, 8 - note D#, 16 - note __, 8 - note D#, 16 - note __, 16 - note __, 8 - note D#, 12 - note C#, 12 - note F#, 8 - note C#, 16 - note D#, 12 - note C_, 16 - note __, 8 - note D#, 8 - note D#, 12 - note C_, 16 - note __, 16 - note __, 8 - octave 2 - note G_, 8 - note G_, 16 - octave 3 - note C_, 8 - note C_, 12 - note D#, 12 - note D#, 4 - note C_, 8 - note C_, 16 - note D#, 16 - note __, 16 - note __, 16 - note A#, 8 - note A#, 16 - note D#, 16 - note __, 8 - note D_, 16 - note __, 16 - note __, 16 - note __, 12 - note A_, 16 - note __, 8 - note G_, 12 - loopchannel 0, Music_JubilifeCity_Loop1 -Music_JubilifeCity_Ch2: - stereopanning $f0 - vibrato $12, $23 -Music_JubilifeCity_Loop2: - notetype $4, 194 - dutycycle 1 - note __, 12 - octave 4 - note A_, 12 - note D_, 16 - note __, 8 - note G_, 12 - note F#, 12 - note D_, 4 - octave 3 - note A_, 8 - octave 4 - note E_, 16 - note __, 8 - note A_, 12 - note D_, 16 - note __, 8 - note E_, 12 - note D_, 12 - octave 3 - note A_, 4 - note F#, 8 - note B_, 12 - note A_, 8 - octave 4 - note D_, 12 - note D_, 4 - note E_, 8 - note D_, 8 - octave 3 - note A_, 8 - note A#, 8 - note B_, 12 - octave 4 - note D_, 4 - note E_, 4 - octave 3 - note A#, 8 - octave 4 - note G_, 12 - note F#, 8 - note D_, 16 - octave 3 - note G_, 4 - note F#, 8 - octave 4 - note D_, 16 - note __, 16 - note __, 16 - note __, 4 - note D_, 4 - note E_, 4 - note F#, 12 - note D_, 12 - note G_, 4 - note F#, 8 - note D_, 8 - octave 3 - note A_, 4 - octave 4 - note D_, 12 - octave 3 - note A_, 12 - octave 4 - note D_, 12 - note E_, 4 - note F#, 4 - note G_, 4 - note A_, 8 - note D_, 8 - octave 3 - note A_, 8 - octave 4 - note A_, 8 - note D_, 8 - octave 3 - note A_, 8 - octave 4 - note D_, 16 - note __, 8 - note E_, 8 - note E_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - intensity 198 - note C#, 16 - note __, 8 - octave 3 - note B_, 16 - note __, 8 - octave 4 - note C#, 16 - note __, 8 - note D_, 16 - note __, 16 - note __, 4 - note F_, 12 - note D#, 12 - note F_, 4 - note D#, 4 - note G#, 4 - note A#, 8 - note A#, 8 - note G#, 16 - note D#, 4 - octave 3 - note B_, 4 - octave 4 - note C_, 4 - note C#, 4 - note __, 12 - note F_, 12 - note D#, 12 - note F_, 4 - note D#, 4 - note G#, 4 - note A#, 8 - note A#, 8 - note G#, 16 - note D#, 4 - note C_, 4 - note C#, 4 - note D_, 4 - note D#, 8 - note D#, 12 - octave 3 - note G#, 4 - note G#, 16 - octave 4 - note C_, 4 - note C#, 4 - note F_, 8 - note D#, 12 - octave 3 - note G#, 4 - note G#, 8 - octave 4 - note C_, 8 - note C#, 8 - note D#, 16 - note C_, 4 - note D#, 4 - note G#, 16 - note __, 8 - note A#, 16 - note C_, 4 - note D#, 4 - note A#, 12 - note G#, 12 - note G_, 8 - note G#, 12 - note G#, 12 - note G_, 8 - note G#, 4 - note A#, 4 - octave 5 - note C_, 12 - octave 4 - note G_, 8 - note G#, 8 - note G_, 8 - note G#, 4 - note A#, 8 - note G_, 16 - note __, 4 - note C_, 4 - note C_, 16 - note __, 8 - note D_, 4 - note __, 4 - note E_, 4 - note __, 8 - note F#, 4 - note __, 8 - note G_, 4 - note __, 12 - loopchannel 0, Music_JubilifeCity_Loop2 -Music_JubilifeCity_Ch3: - stereopanning $ff - vibrato $8, $23 - notetype $4, $20 -Music_JubilifeCity_Loop3: - octave 3 - note G_, 16 - note G_, 4 - note G_, 16 - note G_, 16 - note G_, 8 - note G_, 16 - note G_, 8 - note G_, 12 - note F#, 16 - note F#, 4 - note F#, 16 - note F#, 16 - note F#, 8 - note F#, 16 - note F#, 8 - note F#, 12 - note E_, 8 - note E_, 16 - note F#, 8 - note F#, 16 - note B_, 8 - note B_, 16 - note A#, 8 - note A#, 16 - note G_, 12 - note G_, 4 - note D_, 8 - note G_, 8 - note G_, 16 - note G_, 12 - note G_, 4 - note D_, 8 - note G_, 8 - note G_, 16 - note F#, 12 - note F#, 4 - note C#, 8 - note F#, 8 - note F#, 16 - note B_, 8 - note B_, 16 - note A#, 8 - note A#, 16 - note G_, 8 - note G_, 8 - note D_, 8 - note G_, 8 - note G_, 8 - note B_, 8 - note G_, 8 - note G_, 12 - note G_, 4 - note A_, 8 - note A_, 12 - note A_, 4 - note D_, 12 - note D_, 12 - note D_, 12 - note D_, 12 - note A_, 12 - note A_, 12 - note A#, 12 - note A#, 12 - note C#, 16 - note C#, 4 - note C#, 16 - note C#, 16 - note C#, 16 - note C#, 16 - note C#, 12 - note C_, 16 - note C_, 4 - note C_, 16 - note C_, 12 - note F_, 8 - note F_, 16 - note D#, 8 - note D#, 16 - note C#, 12 - note C#, 12 - note F_, 12 - note G#, 12 - note C#, 12 - note F_, 12 - note G#, 12 - note F_, 12 - note C_, 8 - note C_, 16 - note D#, 8 - note D#, 16 - note F_, 8 - note F_, 16 - note D#, 8 - note D#, 16 - note C#, 16 - note C#, 16 - note C#, 16 - note C_, 16 - note C_, 8 - note F_, 16 - note F_, 8 - octave 4 - note C_, 16 - note C_, 16 - note C_, 16 - octave 3 - note B_, 12 - note B_, 12 - note A_, 12 - note A_, 12 - loopchannel 0, Music_JubilifeCity_Loop3 -Music_JubilifeCity_Ch4: - notetype $4 - togglenoise 3 -Music_JubilifeCity_Loop4: - note B_, 12 - note G_, 8 - note G#, 4 - note G_, 12 - note G_, 8 - note G#, 4 - note G_, 12 - note G_, 8 - note G#, 4 - note G_, 4 - note B_, 8 - note G#, 8 - note G_, 4 - note B_, 12 - note G_, 8 - note G#, 4 - note G_, 12 - note G_, 8 - note G#, 4 - note G_, 12 - note G_, 8 - note G#, 4 - note G_, 4 - note B_, 8 - note G#, 8 - note G_, 4 - note B_, 8 - note G_, 8 - note G_, 8 - note B_, 8 - note G_, 8 - note G_, 8 - note B_, 12 - note G#, 8 - note G_, 4 - note G#, 12 - note G#, 8 - note G_, 4 - note B_, 12 - note G_, 8 - note G#, 4 - note G_, 12 - note G_, 8 - note G#, 4 - note G_, 12 - note G_, 8 - note G#, 4 - note G_, 4 - note B_, 8 - note G#, 8 - note G_, 4 - note B_, 12 - note G_, 8 - note G#, 4 - note G_, 12 - note G_, 8 - note G#, 4 - note G_, 12 - note G_, 8 - note G#, 4 - note G_, 4 - note B_, 8 - note G#, 8 - note G_, 4 - note G#, 8 - note G_, 4 - note B_, 12 - note G#, 8 - note G_, 4 - note B_, 12 - note B_, 12 - note G#, 8 - note G_, 4 - note G#, 12 - note G#, 8 - note G_, 4 - note D#, 12 - note C#, 8 - note D#, 4 - note D#, 12 - note C#, 8 - note D#, 4 - note D#, 12 - note C#, 8 - note D#, 4 - note G_, 4 - note C#, 4 - note D#, 4 - note G_, 4 - note C#, 4 - note D#, 4 - note D#, 12 - note C#, 8 - note C#, 4 - note D#, 12 - note C#, 8 - note C#, 4 - note D#, 12 - note C#, 8 - note C#, 4 - note D#, 8 - note C#, 4 - note G_, 4 - note C#, 4 - note D#, 4 - note D#, 12 - note C#, 8 - note C#, 4 - note D#, 12 - note C#, 8 - note C#, 4 - note D#, 12 - note C#, 8 - note C#, 4 - note D#, 8 - note C#, 4 - note G_, 4 - note C#, 4 - note D#, 4 - note D#, 8 - note D#, 4 - note C#, 8 - note D#, 4 - note D#, 12 - note C#, 8 - note D#, 4 - note D#, 8 - note D#, 4 - note C#, 8 - note D#, 4 - note D#, 12 - note C#, 8 - note D#, 4 - note D#, 8 - note D#, 4 - note C#, 8 - note C#, 4 - note D#, 12 - note C#, 8 - note C#, 4 - note D#, 8 - note D#, 4 - note C#, 8 - note C#, 4 - note D#, 12 - note C#, 8 - note C#, 4 - note B_, 12 - note C#, 12 - note G#, 12 - note C#, 12 - note G#, 12 - note C#, 12 - note G#, 12 - note C#, 12 - note D#, 12 - note D#, 12 - note D#, 12 - note D#, 8 - note D#, 4 - note D#, 12 - note C#, 8 - note D#, 4 - note D#, 12 - note C#, 8 - note D#, 4 - loopchannel 0, Music_JubilifeCity_Loop4 diff --git a/crysaudio/music/DPPt/pokeradar.asm b/crysaudio/music/DPPt/pokeradar.asm deleted file mode 100644 index 205b1063..00000000 --- a/crysaudio/music/DPPt/pokeradar.asm +++ /dev/null @@ -1,209 +0,0 @@ -Music_PokeRadar:: - dbw $80, Music_PokeRadar_Ch1 - dbw $01, Music_PokeRadar_Ch2 - dbw $02, Music_PokeRadar_Ch3 - -Music_PokeRadar_Ch1: - tempo $68 - volume $77 - tone $0001 - notetype $6, $91 - dutycycle 2 - octave 5 - note F_, 1 - note G_, 1 - note F_, 1 - note G_, 1 - note F_, 9 -Music_PokeRadar_Loop1: - notetype $C, $82 - octave 3 - note A#, 6 - octave 4 - note G#, 10 - octave 3 - note A#, 2 - octave 4 - note G#, 4 - note F_, 2 - intensity $86 - note C#, 12 - note D_, 6 - note D#, 6 - octave 3 - note A#, 6 - intensity $82 - octave 4 - note G#, 10 - octave 3 - note A#, 2 - octave 4 - note G#, 4 - note F_, 2 - intensity $86 - note D_, 12 - note C#, 6 - note E_, 6 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 12 - note E_, 4 - note D#, 4 - note D_, 4 - note C#, 12 - note D#, 4 - note D_, 4 - note C#, 4 - note C_, 12 - intensity $82 - octave 3 - note B_, 4 - intensity $72 - note B_, 4 - intensity $62 - note B_, 4 - intensity $52 - note B_, 4 - intensity $42 - note B_, 4 - intensity $32 - note B_, 14 - note __, 14 - loopchannel 0, Music_PokeRadar_Loop1 -Music_PokeRadar_Ch2: - notetype $6, $C1 - dutycycle 2 - octave 6 - note F_, 1 - note G_, 1 - note F_, 1 - note G_, 1 - notetype $C, $C2 - note F_, 4 -Music_PokeRadar_Loop2: - intensity $C2 - dutycycle 1 - octave 3 - note A#, 6 - octave 4 - note G#, 10 - octave 3 - note A#, 2 - octave 4 - note G#, 4 - note F_, 2 - intensity $C7 - note C#, 12 - note D_, 6 - note D#, 6 - octave 3 - note A#, 6 - intensity $C2 - octave 4 - note G#, 10 - octave 3 - note A#, 2 - octave 4 - note G#, 4 - note F_, 2 - intensity $C7 - note D_, 12 - note C#, 6 - note E_, 6 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 12 - note E_, 4 - note D#, 4 - note D_, 4 - note C#, 12 - note D#, 4 - note D_, 4 - note C#, 4 - note C_, 12 - octave 3 - note B_, 16 - note __, 16 - note __, 16 - loopchannel 0, Music_PokeRadar_Loop2 -Music_PokeRadar_Ch3: - notetype $C, $10 - note __, 6 -Music_PokeRadar_Loop3: - octave 2 - note A#, 6 - octave 3 - note G#, 4 - octave 2 - note A_, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 2 - octave 3 - note G#, 2 - note __, 4 - octave 2 - note A#, 2 - note __, 2 - note A#, 2 - note __, 2 - intensity $20 - note A#, 2 - note __, 2 - note A#, 2 - note __, 2 - intensity $30 - note A#, 2 - intensity $10 - note F_, 6 - note A#, 6 - note F_, 2 - note G#, 1 - note __, 1 - note A_, 1 - note __, 1 - note A#, 10 - note __, 2 - note A#, 2 - note __, 2 - note A#, 2 - note __, 2 - intensity $20 - note A#, 2 - note __, 2 - note A#, 2 - note __, 2 - intensity $30 - note A#, 2 - intensity $10 - note F_, 4 - octave 3 - note C_, 2 - octave 2 - note F_, 10 - octave 3 - note C#, 1 - note __, 1 - note D_, 12 - octave 2 - note E_, 10 - octave 3 - note C_, 1 - note __, 1 - note C#, 12 - octave 2 - note D#, 10 - note B_, 1 - note __, 1 - octave 3 - note C_, 12 - octave 2 - note D#, 2 - note __, 8 - note D#, 12 - note __, 12 - note __, 14 - loopchannel 0, Music_PokeRadar_Loop3 diff --git a/crysaudio/music/DPPt/route201.asm b/crysaudio/music/DPPt/route201.asm deleted file mode 100644 index 3f205ff7..00000000 --- a/crysaudio/music/DPPt/route201.asm +++ /dev/null @@ -1,381 +0,0 @@ -Music_Route201:: - dbw $80, Music_Route201_Ch1 - dbw $01, Music_Route201_Ch2 - dbw $02, Music_Route201_Ch3 - -Music_Route201_Ch1: - tempo $A4 - volume $77 - notetype $C, $A2 - dutycycle 1 - octave 2 - note __, 4 - octave 3 - note E_, 2 - octave 2 - note G_, 6 - octave 3 - note F_, 2 - octave 2 - note A_, 6 -Music_Route201_Ch1_loop: - octave 3 - note G_, 2 - octave 2 - note B_, 6 - octave 3 - note F_, 2 - octave 2 - note A_, 6 - octave 3 - note E_, 2 - octave 2 - note G_, 6 - octave 3 - note E_, 2 - octave 2 - note G_, 6 - octave 3 - note F_, 2 - octave 2 - note A_, 6 - octave 3 - note E_, 2 - octave 2 - note G_, 4 - note A_, 2 - octave 3 - note F_, 2 - octave 2 - note A_, 4 - note G_, 2 - octave 3 - note E_, 2 - octave 2 - note G_, 4 - note A_, 2 - octave 3 - note F_, 2 - note F#, 4 - octave 2 - note G_, 2 - octave 3 - note A_, 2 - note G_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note C_, 2 - note G_, 2 - octave 2 - note G_, 2 - note A_, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note E_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note C_, 2 - octave 2 - note B_, 2 - note G_, 2 - note A_, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note E_, 2 - note C_, 2 - note C_, 6 - note E_, 6 - note D_, 4 - note C_, 2 - note D_, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - octave 2 - note E_, 4 - octave 3 - note C_, 2 - note C_, 6 - note E_, 6 - note D_, 4 - note C_, 2 - octave 2 - note C_, 2 - octave 3 - note C_, 2 - octave 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G_, 2 - note B_, 2 - octave 3 - note C_, 4 - note E_, 2 - octave 2 - note G_, 6 - octave 3 - note F_, 2 - octave 2 - note A_, 6 - loopchannel 0, Music_Route201_Ch1_loop - -Music_Route201_Ch2: - notetype $C, $B1 - octave 4 - note __, 16 -Music_Route201_Ch2_loop: - notetype $C, $B1 - dutycycle 2 - octave 4 - note __, 15 - notetype $6, $B1 - note E_, 1 - note F_, 1 - note G_, 4 - note F_, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note C_, 4 - octave 3 - note G_, 8 - note A_, 4 - note G_, 4 - note A_, 4 - note B_, 4 - octave 4 - note C_, 4 - note G_, 10 - note F_, 1 - note G_, 1 - note A_, 4 - note G_, 4 - note A_, 4 - note B_, 4 - octave 5 - note C_, 4 - octave 4 - note G_, 12 - note F_, 4 - note E_, 4 - note D_, 4 - note C_, 4 - note A_, 8 - note G_, 2 - octave 3 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 8 - note C_, 8 - note C_, 8 - note C_, 8 - note G_, 4 - note F_, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note C_, 4 - octave 2 - note G_, 4 - octave 3 - note D_, 4 - note C_, 8 - note C_, 8 - note C_, 8 - note C_, 8 - octave 2 - note G_, 4 - octave 3 - note D_, 4 - note E_, 4 - note D_, 8 - note C_, 10 - intensity $98 - dutycycle 0 - vibrato $00, $15 - octave 4 - note E_, 1 - note F_, 1 - note G_, 12 - octave 5 - note C_, 12 - octave 4 - note B_, 8 - note A_, 4 - note G_, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note C_, 8 - note A_, 4 - note G_, 12 - octave 5 - note C_, 12 - octave 4 - note B_, 8 - note A_, 4 - note G_, 4 - note E_, 4 - note C_, 8 - octave 3 - note G_, 4 - octave 4 - note D_, 4 - note C_, 16 - intensity $A3 - note C_, 4 - note __, 16 - loopchannel 0, Music_Route201_Ch2_loop - -Music_Route201_Ch3: - notetype $C, $10 - octave 3 - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 -Music_Route201_Ch3_loop: - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 - octave 2 - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 - note E_, 1 - note __, 1 - note E_, 1 - note __, 5 - note F_, 1 - note __, 1 - note F_, 1 - note __, 5 - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 - note F_, 1 - note __, 1 - note F_, 1 - note __, 5 - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 - note F_, 1 - note __, 1 - note F_, 1 - note __, 5 - note G_, 1 - note __, 1 - note G_, 1 - note __, 5 - note F_, 1 - note __, 3 - note F_, 1 - note __, 3 - note C_, 1 - note __, 3 - note C_, 1 - note __, 3 - note G_, 1 - note __, 5 - note G_, 1 - note __, 1 - note C_, 1 - note __, 5 - note C_, 1 - note __, 1 - note F_, 1 - note __, 3 - note F_, 1 - note __, 3 - note C_, 1 - note __, 3 - note C_, 1 - note __, 3 - note G_, 1 - note __, 5 - note G_, 1 - note __, 1 - note C_, 1 - note __, 5 - note C_, 1 - note __, 1 - note F_, 5 - note __, 1 - note F_, 2 - note G_, 1 - note __, 1 - note G_, 3 - note __, 1 - note G_, 2 - note E_, 5 - note __, 1 - note E_, 2 - note C_, 1 - note __, 1 - note C_, 4 - note E_, 2 - note F_, 5 - note __, 1 - note F_, 2 - note C_, 1 - note __, 1 - note C_, 3 - note __, 1 - note C_, 2 - note F_, 5 - note __, 1 - note F_, 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note A_, 1 - note __, 1 - note B_, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 - note C_, 1 - note __, 1 - note C_, 1 - note __, 5 - loopchannel 0, Music_Route201_Ch3_loop diff --git a/crysaudio/music/DPPt/route203.asm b/crysaudio/music/DPPt/route203.asm deleted file mode 100644 index 969429f7..00000000 --- a/crysaudio/music/DPPt/route203.asm +++ /dev/null @@ -1,2014 +0,0 @@ -Music_Route203:: - dbw $C0, Music_Route203_Ch1 - dbw $01, Music_Route203_Ch2 - dbw $02, Music_Route203_Ch3 - dbw $03, Music_Route203_Ch4 - -Music_Route203_Ch1: - tempo $90 - volume $77 - notetype $4, $B1 - dutycycle 1 - octave 3 - note A#, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note C_, 1 - octave 2 - note A#, 2 - note G_, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 1 - octave 3 - note C_, 1 - note D_, 1 - note E_, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 2 - notetype $8, $B1 - octave 4 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - notetype $4, $B1 - note __, 8 - note D#, 1 - note D_, 1 - note C_, 1 - octave 3 - note A#, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - octave 2 - note A#, 1 - note A_, 1 - note A#, 1 - octave 3 - note C_, 1 - note D_, 1 - note D#, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 1 - octave 4 - note C_, 1 - note D_, 1 - note D#, 1 - octave 3 - note F#, 1 - note G#, 1 - note A#, 5 - note A#, 2 - note A#, 2 - note A#, 2 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A_, 4 - note A#, 3 - note F#, 1 - note G#, 1 - note A#, 5 - note A#, 2 - note A#, 2 - note A#, 2 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - octave 4 - note C_, 4 - octave 3 - note A#, 3 - note C#, 1 - note D#, 1 - note F_, 5 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 4 - note F_, 4 - note F_, 4 - note F_, 4 - note F_, 4 - note F_, 4 - note F_, 4 - note G_, 4 - note F_, 4 -Music_Route203_Ch1_loop: - note E_, 4 - note D_, 8 - notetype $C, $B7 - note A_, 12 - notetype $8, $B7 - dutycycle 0 - note F#, 4 - note E_, 4 - note D_, 4 - note C#, 2 - octave 2 - note B_, 10 - octave 3 - note F#, 8 - note E_, 2 - note D_, 2 - note C#, 6 - octave 2 - note A#, 2 - notetype $A, $B7 - note B_, 2 - notetype $C, $B7 - octave 3 - note C#, 1 - note E_, 8 - notetype $8, $B7 - note C#, 4 - note E_, 4 - note C#, 4 - note C#, 2 - octave 2 - note B_, 2 - note __, 2 - note B_, 2 - note __, 6 - note A_, 2 - note __, 2 - note B_, 6 - octave 3 - note F#, 4 - note E_, 4 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - note A_, 4 - note G_, 2 - note __, 2 - note G#, 2 - octave 3 - note F#, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note C#, 2 - note __, 8 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note D#, 2 - note C#, 2 - notetype $A, $B7 - octave 2 - note B_, 16 - notetype $C, $B2 - octave 3 - note B_, 4 - note A_, 4 - note D#, 4 - note F#, 8 - notetype $8, $B2 - dutycycle 1 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - note G_, 2 - note F#, 4 - note G_, 1 - note F#, 1 - note E_, 4 - note F_, 2 - note F#, 2 - note C#, 2 - note __, 2 - note C#, 2 - note __, 2 - note E_, 2 - note D#, 1 - note E_, 1 - intensity $B7 - note D#, 16 - intensity $B2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - note G_, 2 - note A_, 4 - note B_, 1 - note A_, 1 - note G_, 6 - intensity $B4 - note F#, 8 - intensity $B2 - note D#, 2 - note F#, 2 - note A_, 4 - note D#, 2 - note F#, 6 - note D_, 2 - octave 2 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - octave 3 - note D_, 2 - intensity $B4 - octave 2 - note A_, 8 - intensity $B2 - note G_, 2 - note A_, 2 - intensity $B7 - note A#, 12 - octave 3 - note D_, 10 - intensity $B1 - note E_, 1 - note D_, 1 - note C#, 2 - note E_, 2 - intensity $B7 - note G_, 16 - note __, 16 - note __, 12 - dutycycle 2 - note F_, 4 - octave 2 - note F_, 2 - octave 3 - note F_, 4 - octave 2 - note F_, 2 - note E_, 4 - note E_, 2 - octave 3 - note E_, 4 - octave 2 - note E_, 2 - note D#, 4 - note D#, 2 - octave 3 - note C_, 4 - octave 2 - note D#, 2 - note D_, 2 - octave 3 - note D_, 4 - note C_, 4 - octave 2 - note A_, 2 - octave 1 - note A#, 2 - octave 3 - note D_, 2 - octave 1 - note A#, 2 - octave 3 - note D_, 4 - octave 1 - note A#, 2 - octave 3 - note C_, 4 - octave 2 - note C_, 2 - note G_, 4 - note C_, 2 - note C#, 2 - octave 3 - note F_, 2 - octave 2 - note C#, 2 - octave 3 - note F_, 4 - octave 2 - note C#, 2 - note D#, 2 - octave 3 - note G_, 2 - octave 2 - note D#, 2 - octave 3 - note G_, 4 - octave 2 - note D#, 2 - octave 3 - note G#, 4 - octave 2 - note G#, 2 - octave 3 - note G#, 4 - octave 2 - note G#, 2 - note G_, 4 - note G_, 2 - octave 3 - note G_, 4 - octave 2 - note G_, 2 - note F#, 4 - note F#, 2 - octave 3 - note D#, 4 - octave 2 - note F#, 2 - note F_, 2 - octave 3 - note F_, 4 - note D#, 4 - note C_, 2 - octave 2 - note C#, 2 - octave 3 - note F_, 2 - octave 2 - note C#, 2 - octave 3 - note F_, 4 - octave 2 - note C#, 2 - octave 3 - note D#, 4 - octave 2 - note D#, 2 - note A#, 4 - note D#, 2 - note C#, 2 - octave 3 - note F_, 2 - octave 2 - note C#, 2 - octave 3 - note F_, 4 - octave 2 - note C#, 2 - octave 3 - note D#, 4 - octave 2 - note D#, 2 - note A#, 4 - note D#, 2 - note E_, 2 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - octave 3 - note E_, 4 - octave 2 - note E_, 2 - note F#, 2 - octave 3 - note F#, 2 - octave 2 - note F#, 2 - octave 3 - note F#, 4 - octave 2 - note F#, 2 - notetype $C, $B1 - octave 4 - note __, 16 - note __, 16 - note __, 16 - note __, 8 - notetype $4, $B1 - dutycycle 1 - note D#, 1 - note D_, 1 - note C_, 1 - octave 3 - note A#, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - octave 2 - note A#, 1 - note A_, 1 - note A#, 1 - octave 3 - note C_, 1 - note D_, 1 - note D#, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 1 - octave 4 - note C_, 1 - note D_, 1 - note D#, 1 - note F_, 1 - intensity $B7 - note F_, 12 - note D#, 12 - octave 3 - note A#, 8 - octave 4 - note C_, 4 - octave 3 - note A#, 8 - octave 4 - note C_, 16 - note __, 16 - note __, 16 - note __, 16 - octave 3 - note D_, 4 - note D#, 4 - note F_, 4 - note A#, 8 - note G#, 4 - note F_, 8 - note D#, 4 - note D_, 4 - octave 2 - note A#, 8 - octave 3 - note C_, 8 - note D_, 4 - intensity $B1 - octave 4 - note D#, 1 - note D_, 1 - note C_, 1 - octave 3 - note A#, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - octave 2 - note A#, 1 - note A_, 1 - note A#, 1 - octave 3 - note C_, 1 - note D_, 1 - note D#, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 1 - octave 4 - note C_, 1 - note D_, 1 - note F#, 1 - intensity $B7 - note G#, 13 - octave 2 - note A#, 8 - note F_, 4 - note A#, 4 - note G#, 4 - note F_, 4 - note A#, 4 - note G#, 4 - note F_, 4 - note A#, 8 - note F_, 4 - note A#, 8 - octave 3 - note C_, 16 - octave 2 - note A#, 8 - octave 3 - note D_, 8 - note A#, 8 - note G#, 8 - note F_, 8 - note G#, 8 - note F_, 8 - note D#, 4 - note D_, 4 - octave 2 - note A#, 8 - octave 3 - note C_, 8 - note D_, 4 - intensity $B1 - octave 4 - note D#, 1 - note D_, 1 - note C_, 1 - octave 3 - note A#, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - octave 2 - note A#, 1 - note A_, 1 - note A#, 1 - octave 3 - note C_, 1 - note D_, 1 - note D#, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 1 - octave 4 - note C_, 1 - note D_, 1 - note F#, 1 - note G#, 1 - octave 3 - note G#, 1 - note A#, 5 - note A#, 2 - note A#, 2 - note A#, 2 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A_, 4 - note A#, 3 - note F#, 1 - note G#, 1 - note A#, 5 - note A#, 2 - note A#, 2 - note A#, 2 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - octave 4 - note C_, 4 - octave 3 - note A#, 3 - note C#, 1 - note D#, 1 - note F_, 5 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 4 - note F_, 4 - note F_, 4 - note F_, 4 - note F_, 4 - note F_, 4 - note F_, 4 - note G_, 4 - note F_, 4 - loopchannel 0, Music_Route203_Ch1_loop - -Music_Route203_Ch2: - notetype $4, $C1 - dutycycle 1 - octave 4 - note D#, 1 - note D_, 1 - note C_, 1 - octave 3 - note A#, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - octave 2 - note A#, 1 - note A_, 1 - note A#, 1 - octave 3 - note C_, 1 - note D_, 1 - note D#, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 1 - octave 4 - note C_, 1 - note D_, 1 - note D#, 1 - note F_, 1 - notetype $8, $C0 - vibrato $00, $12 - note G_, 16 - intensity $C7 - note G_, 16 - note __, 8 - note G_, 1 - note __, 5 - intensity $C0 - note F_, 16 - intensity $C7 - note F_, 16 - note __, 16 - note __, 2 - intensity $C0 - note G_, 16 - intensity $C7 - note G_, 16 - note __, 8 - note G_, 1 - note __, 5 - intensity $C0 - note F_, 14 - note D_, 12 -Music_Route203_Ch2_loop: - intensity $C1 - vibrato $00, $00 - note E_, 2 - note D_, 2 - note __, 2 - intensity $C7 - note E_, 6 - octave 3 - note F#, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note A_, 4 - note G_, 4 - note F#, 4 - note E_, 2 - note D_, 10 - note A_, 8 - note G_, 2 - note F#, 2 - note E_, 6 - note C#, 2 - note D_, 2 - note E_, 2 - notetype $B, $C7 - note F#, 4 - notetype $D, $C7 - note __, 4 - notetype $8, $C7 - note E_, 4 - note F#, 4 - note E_, 4 - note E_, 2 - note D_, 2 - note __, 2 - note D_, 2 - note __, 6 - note D_, 2 - note __, 2 - note E_, 6 - note A_, 4 - note G_, 4 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 4 - octave 2 - note B_, 2 - note __, 2 - octave 3 - note C_, 2 - note A_, 4 - note G_, 2 - note F#, 2 - note G_, 2 - note E_, 2 - note __, 8 - note D#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 16 - note __, 16 - note __, 16 - note __, 2 - intensity $C2 - dutycycle 2 - note D_, 2 - note G_, 2 - note B_, 2 - note A_, 4 - note B_, 1 - note A_, 1 - note G_, 4 - note G#, 2 - note A_, 2 - note E_, 2 - note __, 2 - note E_, 2 - note __, 2 - note G_, 2 - note F#, 1 - note G_, 1 - intensity $C7 - note F#, 16 - intensity $C2 - note D_, 2 - note G_, 2 - note B_, 2 - octave 4 - note C#, 4 - note D_, 1 - note C#, 1 - octave 3 - note B_, 6 - intensity $C4 - note A_, 8 - intensity $C2 - note G#, 2 - note A_, 2 - note B_, 4 - note F#, 2 - note A_, 2 - note __, 4 - note G_, 2 - octave 2 - note B_, 2 - note __, 2 - note B_, 2 - note __, 2 - notetype $4, $C2 - octave 3 - note F#, 1 - note G_, 3 - intensity $C4 - note C#, 16 - intensity $C2 - octave 2 - note B_, 4 - octave 3 - note C#, 4 - notetype $C, $C7 - note D_, 8 - notetype $A, $C7 - note F_, 8 - notetype $8, $C1 - note G_, 1 - note F_, 1 - note E_, 2 - note G_, 2 - notetype $A, $C7 - note A_, 16 - notetype $8, $C7 - dutycycle 1 - octave 2 - note C_, 2 - note G_, 2 - note E_, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note G_, 2 - octave 4 - note C_, 6 - octave 3 - note A#, 6 - vibrato $00, $34 - note A_, 2 - note A#, 2 - octave 4 - note C_, 1 - note __, 1 - notetype $4, $C7 - octave 3 - note B_, 1 - intensity $C0 - octave 4 - note C_, 16 - note C_, 16 - note C_, 15 - octave 3 - note A_, 4 - octave 4 - note C_, 4 - note C#, 4 - note C#, 1 - note D_, 7 - note C_, 4 - note __, 4 - octave 3 - note A_, 4 - note G_, 4 - note F_, 16 - note G_, 4 - note A_, 4 - note A#, 8 - note G_, 4 - note E_, 8 - note G_, 4 - note __, 4 - note G#, 4 - note __, 4 - note F_, 8 - note G#, 4 - note G_, 4 - note G#, 4 - note A#, 4 - octave 4 - note D_, 1 - note D#, 7 - note C#, 4 - dutycycle 0 - note C_, 4 - note C#, 4 - note D#, 2 - note __, 2 - notetype $B, $C0 - note D#, 16 - notetype $8, $C0 - note D#, 2 - note C_, 2 - notetype $4, $C0 - note D_, 1 - note D#, 7 - note F_, 4 - note __, 4 - note D#, 4 - note __, 4 - note C_, 4 - octave 3 - note A#, 4 - note G#, 16 - note A#, 4 - octave 4 - note C_, 4 - octave 3 - note A#, 8 - note G#, 4 - note G_, 8 - note A#, 4 - note G#, 16 - note A#, 4 - note B_, 4 - octave 4 - note C_, 4 - note __, 4 - note C#, 4 - note D#, 4 - note F_, 4 - note G_, 4 - notetype $C, $C0 - dutycycle 1 - vibrato $00, $12 - note G#, 8 - note A#, 8 - notetype $8, $C0 - octave 5 - note C_, 16 - intensity $C7 - note C_, 16 - note __, 8 - note C_, 1 - note __, 5 - intensity $C0 - note D_, 16 - intensity $C7 - note D_, 16 - note __, 16 - note __, 2 - intensity $C0 - note C_, 16 - intensity $C7 - note C_, 16 - note __, 8 - note C_, 1 - note __, 5 - intensity $C0 - note D_, 16 - intensity $C7 - note D_, 16 - note __, 16 - note __, 2 - intensity $C0 - note C_, 16 - intensity $C7 - note C_, 16 - note __, 8 - note C_, 1 - note __, 5 - intensity $C0 - note D_, 16 - intensity $C7 - note D_, 16 - note __, 16 - note __, 2 - intensity $C0 - note C_, 16 - intensity $C7 - note C_, 16 - note __, 8 - note C_, 1 - note __, 5 - intensity $C0 - octave 4 - note A#, 14 - note G_, 12 - loopchannel 0, Music_Route203_Ch2_loop - -Music_Route203_Ch3: - notetype $8, $13 - octave 1 - note __, 12 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 -Music_Route203_Ch3_loop: - note A_, 2 - octave 2 - note D_, 2 - note __, 2 - note E_, 6 - octave 1 - note A_, 9 - notetype $C, $13 - note __, 2 - octave 2 - note G_, 12 - note __, 4 - note G_, 8 - note A#, 4 - octave 3 - note C#, 4 - octave 2 - note F#, 8 - octave 3 - note C#, 8 - notetype $8, $13 - octave 2 - note B_, 2 - note F#, 2 - note __, 2 - note B_, 2 - note __, 2 - octave 1 - note B_, 2 - octave 2 - note B_, 6 - note A_, 6 - octave 1 - note G_, 2 - note __, 6 - octave 2 - note D_, 2 - note __, 2 - note D_, 2 - note G_, 2 - note __, 2 - note G_, 4 - note G#, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note __, 2 - note E_, 2 - note __, 2 - note C#, 4 - note __, 2 - note A_, 4 - note A#, 2 - note B_, 2 - octave 1 - note B_, 4 - notetype $C, $13 - note B_, 12 - notetype $8, $13 - octave 2 - note B_, 2 - note __, 2 - note B_, 4 - octave 1 - note B_, 2 - note __, 2 - octave 2 - note A_, 2 - note __, 2 - note A_, 2 - note D#, 2 - note F#, 2 - note B_, 2 - octave 3 - note D_, 4 - octave 2 - note D_, 2 - note G_, 2 - note __, 2 - note D_, 2 - note G_, 4 - octave 3 - note C#, 2 - note __, 4 - octave 2 - note E_, 2 - note A_, 2 - note __, 8 - note E_, 2 - note F#, 2 - note __, 2 - note B_, 2 - note __, 4 - note F#, 2 - note E_, 2 - note __, 2 - note E_, 2 - note __, 6 - note E_, 2 - note G_, 2 - note B_, 2 - note __, 2 - note A_, 2 - note E_, 2 - note D_, 2 - note __, 2 - note D_, 2 - note __, 6 - note D#, 2 - note __, 2 - note B_, 2 - note __, 6 - note E_, 2 - note __, 4 - note E_, 2 - note __, 4 - note F#, 2 - note __, 4 - note F#, 2 - note __, 4 - note G_, 2 - note __, 4 - note G_, 2 - note __, 4 - note G_, 2 - note __, 4 - note G_, 2 - note __, 4 - note A_, 2 - note __, 4 - note A_, 2 - note __, 4 - note A_, 2 - note __, 4 - note A_, 2 - note __, 4 - octave 3 - note E_, 8 - note D#, 2 - note E_, 2 - note G_, 6 - note C_, 6 - octave 2 - note F_, 6 - note __, 2 - note A_, 2 - note F_, 2 - note E_, 2 - note __, 8 - note E_, 2 - note D#, 2 - note __, 8 - note D#, 2 - note D_, 2 - note __, 2 - note C_, 2 - note D_, 2 - note __, 2 - note A#, 2 - note F_, 4 - note A#, 2 - note __, 4 - note D_, 2 - note C_, 4 - note G_, 2 - note __, 4 - octave 3 - note C_, 2 - note __, 4 - octave 2 - note G#, 2 - note __, 2 - note F_, 2 - note G#, 2 - note D#, 4 - note A#, 2 - note __, 4 - note G_, 2 - note D#, 6 - note __, 2 - octave 3 - note C_, 2 - octave 2 - note G#, 2 - note G_, 2 - note D#, 2 - note __, 4 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note F#, 2 - note __, 2 - note F#, 2 - note __, 4 - note C_, 2 - note F_, 2 - note __, 2 - note F_, 2 - note F_, 2 - note __, 2 - note G#, 2 - note G#, 2 - note C#, 4 - note __, 4 - note C#, 2 - note D#, 2 - note __, 4 - note G_, 4 - note D#, 2 - note G#, 2 - note __, 2 - note F_, 2 - note C#, 4 - note __, 2 - note D#, 2 - note A#, 2 - note G_, 2 - note __, 4 - note D#, 2 - note E_, 2 - note __, 4 - note E_, 2 - note __, 4 - note F#, 2 - note __, 4 - note D#, 4 - note G_, 2 - note G#, 2 - note __, 2 - note G#, 1 - note __, 1 - octave 3 - note G#, 4 - octave 2 - note G#, 1 - note __, 1 - note G#, 1 - note __, 1 - octave 3 - note G#, 1 - note __, 1 - octave 2 - note G#, 1 - note __, 1 - octave 3 - note G#, 4 - octave 2 - note G#, 1 - note __, 1 - note G#, 2 - note __, 2 - note G#, 1 - note __, 1 - octave 3 - note G#, 4 - octave 2 - note G#, 1 - note __, 1 - note G#, 2 - note __, 2 - note G#, 1 - note __, 1 - octave 3 - note G#, 4 - octave 2 - note G#, 1 - note __, 1 - octave 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - octave 1 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - note A#, 2 - note __, 2 - note A#, 1 - note __, 1 - octave 2 - note A#, 4 - octave 1 - note A#, 1 - note __, 1 - loopchannel 0, Music_Route203_Ch3_loop - -Music_Route203_Ch4: - notetype $8 - togglenoise 3 - note __, 12 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 -Music_Route203_Ch4_loop: - note C#, 2 - note C#, 4 - note B_, 12 - note G_, 6 - note D#, 6 - note G_, 12 - note G_, 4 - note D#, 2 - note D#, 6 - note G_, 6 - note D#, 6 - note G_, 4 - note D#, 2 - note D#, 6 - note G_, 4 - note D#, 2 - note D#, 6 - note G_, 6 - note D#, 6 - note G_, 4 - note D#, 6 - note D#, 2 - note G_, 6 - note D#, 4 - note D#, 2 - note G_, 6 - note D#, 2 - note D#, 4 - note G_, 4 - note D#, 2 - note D#, 4 - note D#, 2 - note G_, 6 - note D#, 2 - note D#, 4 - note G_, 4 - note D#, 2 - note D#, 2 - note D#, 4 - note G_, 6 - note D#, 2 - note D#, 4 - note G_, 4 - note D#, 2 - note D#, 4 - note D#, 2 - note G_, 6 - note D#, 2 - note D#, 4 - note G_, 6 - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note C#, 6 - note C#, 2 - note C#, 4 - note C#, 8 - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note C#, 6 - note C#, 2 - note C#, 4 - note C#, 8 - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note C#, 6 - note C#, 2 - note C#, 4 - note C#, 8 - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 4 - note C#, 2 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note C#, 6 - note C#, 2 - note C#, 4 - note C#, 2 - note B_, 6 - note C#, 6 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note E_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note B_, 6 - note C#, 6 - note B_, 6 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 6 - note G_, 2 - note B_, 2 - note C#, 2 - note C#, 2 - note C#, 4 - note G_, 2 - note B_, 2 - note C#, 2 - loopchannel 0, Music_Route203_Ch4_loop diff --git a/crysaudio/music/DPPt/route205.asm b/crysaudio/music/DPPt/route205.asm deleted file mode 100644 index f00e93fa..00000000 --- a/crysaudio/music/DPPt/route205.asm +++ /dev/null @@ -1,1080 +0,0 @@ -Music_Route205:: - dbw $C0, Music_Route205_Ch1 - dbw $01, Music_Route205_Ch2 - dbw $02, Music_Route205_Ch3 - dbw $03, Music_Route205_Ch4 - -Music_Route205_Ch1: -Music_Route205_Ch1_loop: - tempo $C0 - volume $77 - notetype $C, $B2 - dutycycle 1 - octave 3 - note G_, 2 - note G_, 3 - note D_, 3 - note F_, 2 - note F_, 3 - note C_, 3 - octave 4 - note C_, 2 - note C_, 3 - octave 3 - note F_, 3 - note G_, 2 - note G_, 3 - octave 2 - note B_, 3 - notetype $8, $B2 - octave 3 - note G_, 1 - octave 4 - note D_, 1 - note D_, 1 - octave 3 - note B_, 1 - octave 4 - note D_, 1 - note G_, 1 - octave 5 - note G_, 3 - notetype $C, $B2 - note D_, 1 - note G_, 1 - notetype $8, $B2 - octave 3 - note F_, 1 - octave 4 - note C_, 1 - note C_, 1 - octave 3 - note A_, 1 - octave 4 - note C_, 1 - note F_, 1 - octave 5 - note F_, 3 - notetype $C, $B2 - note C_, 1 - note F_, 1 - octave 3 - note D_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 1 - note D_, 1 - note G_, 1 - note A_, 1 - octave 4 - note C_, 1 - note G_, 1 - note A_, 1 - octave 5 - note C_, 1 - note D_, 1 - octave 6 - note D_, 3 - intensity $B1 - dutycycle 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - note G_, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - note B_, 1 - note G_, 1 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note E_, 2 - octave 4 - note C_, 1 - octave 3 - note E_, 1 - note A_, 2 - octave 2 - note G_, 2 - octave 3 - note E_, 2 - note A_, 1 - note E_, 1 - octave 4 - note C_, 2 - octave 2 - note G_, 2 - note A_, 2 - octave 3 - note F#, 1 - octave 2 - note A_, 1 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note E_, 2 - octave 4 - note C_, 1 - octave 3 - note C_, 1 - note E_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note A_, 1 - octave 3 - note D_, 1 - note F#, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - note B_, 1 - note D_, 1 - note F_, 2 - intensity $B4 - dutycycle 1 - octave 4 - note G_, 4 - octave 5 - note C_, 4 - octave 4 - note B_, 1 - octave 5 - note C_, 1 - octave 4 - note B_, 1 - note G_, 3 - octave 5 - note D_, 2 - note E_, 2 - octave 4 - note G_, 2 - octave 5 - note C_, 1 - octave 4 - note B_, 1 - octave 5 - note C_, 2 - octave 4 - note B_, 3 - note G_, 3 - note D_, 2 - note E_, 3 - note B_, 2 - note G_, 2 - note A_, 1 - note G_, 3 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - note F_, 1 - note E_, 4 - note G_, 4 - note D_, 1 - note G_, 1 - note A_, 2 - octave 5 - note D_, 4 - octave 3 - note A_, 3 - note A_, 3 - note A_, 2 - note A#, 6 - note A#, 1 - octave 4 - note C_, 1 - octave 3 - note A_, 2 - octave 4 - note C_, 2 - note F_, 2 - octave 3 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note A#, 4 - note G_, 1 - note A_, 1 - note F#, 2 - note A_, 2 - note F#, 2 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 1 - note A#, 1 - octave 4 - note C_, 1 - note C_, 1 - note F_, 1 - note F_, 1 - octave 2 - note F_, 4 - octave 4 - note C_, 4 - note D_, 4 - octave 3 - note D_, 4 - octave 4 - note D_, 3 - octave 3 - note G_, 2 - note A_, 2 - note G_, 1 - octave 4 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - octave 3 - note B_, 3 - note D_, 3 - note F#, 1 - note G_, 1 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 4 - note G_, 2 - note E_, 2 - note G_, 4 - note B_, 1 - note B_, 1 - octave 4 - note D_, 1 - note D_, 1 - octave 3 - note G_, 1 - note G_, 1 - note B_, 1 - note B_, 1 - octave 4 - note E_, 1 - note E_, 1 - octave 3 - note B_, 1 - note B_, 1 - octave 4 - note D_, 1 - note D_, 3 - loopchannel 0, Music_Route205_Ch1_loop - -Music_Route205_Ch2: -Music_Route205_Ch2_loop: - notetype $C, $C2 - dutycycle 1 - octave 4 - note G_, 2 - note G_, 3 - octave 3 - note G_, 1 - octave 4 - note D_, 1 - note G_, 1 - note F_, 2 - note F_, 3 - octave 3 - note F_, 1 - octave 4 - note C_, 1 - note F_, 1 - octave 5 - note C_, 1 - octave 4 - note B_, 1 - note G_, 1 - note F_, 1 - note C_, 1 - note F_, 1 - note G_, 1 - octave 5 - note C_, 1 - octave 4 - note B_, 1 - note G_, 1 - note D_, 1 - note C_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - octave 3 - note G_, 1 - note D_, 1 - note D_, 1 - note G_, 1 - octave 4 - note G_, 1 - octave 3 - note G_, 1 - octave 4 - note D_, 1 - octave 3 - note G_, 1 - octave 4 - note G_, 1 - octave 5 - note D_, 1 - octave 3 - note C_, 1 - note F_, 1 - octave 4 - note F_, 1 - octave 3 - note F_, 1 - octave 4 - note C_, 1 - octave 3 - note F_, 1 - octave 4 - note F_, 1 - octave 5 - note C_, 1 - intensity $C7 - octave 4 - note D_, 6 - notetype $8, $C3 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 6 - intensity $C7 - note D_, 6 - intensity $C1 - note D_, 3 - note G_, 3 - notetype $C, $C1 - note F#, 1 - note G_, 1 - note F#, 2 - note D_, 2 - octave 3 - note B_, 2 - octave 4 - note E_, 1 - note D_, 1 - octave 3 - note G_, 2 - note A_, 1 - note B_, 1 - octave 4 - note C_, 2 - octave 3 - note F#, 1 - note G_, 1 - note A_, 2 - octave 4 - note A_, 1 - note B_, 1 - octave 5 - note C_, 2 - octave 4 - note F#, 1 - note G_, 1 - note A_, 2 - note E_, 2 - note A_, 2 - note G#, 1 - note A_, 1 - note G#, 2 - note E_, 2 - note C_, 2 - note G_, 1 - note F#, 1 - octave 3 - note A_, 2 - note B_, 1 - octave 4 - note C_, 1 - note D_, 2 - octave 3 - note F#, 1 - note G_, 1 - note A_, 2 - octave 4 - note B_, 1 - octave 5 - note C_, 1 - note D_, 2 - octave 4 - note F#, 1 - note G_, 1 - note A_, 4 - intensity $C5 - dutycycle 2 - octave 3 - note G_, 1 - note E_, 1 - note G_, 2 - octave 4 - note E_, 2 - note D_, 2 - note E_, 1 - octave 3 - note G_, 2 - note G_, 5 - note G_, 1 - note E_, 1 - note G_, 2 - octave 4 - note G_, 2 - note F#, 1 - note G_, 1 - note F#, 1 - note D_, 2 - octave 3 - note G_, 2 - note D_, 1 - note E_, 3 - note B_, 2 - note G_, 2 - note A_, 1 - note G_, 3 - note D_, 2 - note G_, 2 - note F_, 1 - note E_, 2 - note G_, 2 - note A_, 2 - octave 4 - note D_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note A_, 1 - octave 5 - note D_, 2 - dutycycle 0 - octave 4 - note D_, 1 - note D#, 1 - note F_, 3 - note F_, 3 - note G_, 2 - note F_, 6 - note D_, 1 - note D#, 1 - note F_, 2 - note A#, 2 - note A_, 2 - note F_, 2 - note G_, 2 - note F_, 4 - octave 3 - note A#, 1 - octave 4 - note C_, 1 - note D_, 2 - note D#, 2 - note D_, 2 - octave 3 - note A_, 2 - note A#, 1 - note A#, 1 - octave 4 - note D_, 1 - note D_, 1 - note G_, 1 - note G_, 1 - note A_, 1 - note A_, 1 - note F_, 6 - note E_, 1 - note F_, 1 - note F#, 6 - note F_, 1 - note F#, 1 - note G_, 3 - note D_, 2 - note E_, 2 - note D_, 1 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note D_, 3 - octave 3 - note G_, 3 - note A_, 1 - note B_, 1 - octave 4 - note C_, 2 - octave 3 - note B_, 2 - note A#, 2 - note B_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - octave 4 - note E_, 2 - note D_, 2 - note E_, 2 - note G_, 2 - note A_, 2 - note B_, 1 - note B_, 1 - octave 5 - note C_, 1 - note C_, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D_, 1 - octave 4 - note G_, 1 - note G_, 3 - note A_, 1 - note A_, 3 - loopchannel 0, Music_Route205_Ch2_loop - -Music_Route205_Ch3: -Music_Route205_Ch3_loop: - notetype $C, $13 - octave 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 2 - note G_, 1 - note B_, 1 - octave 3 - note D_, 1 - octave 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 2 - note A_, 1 - octave 3 - note C_, 1 - note F_, 1 - octave 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 2 - octave 3 - note C_, 1 - note F_, 1 - note A_, 1 - octave 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 2 - octave 3 - note D_, 1 - note G_, 1 - note B_, 1 - octave 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - octave 3 - note D_, 1 - octave 2 - note G_, 1 - octave 3 - note D_, 1 - note G_, 1 - octave 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - octave 3 - note C_, 1 - octave 2 - note F_, 1 - octave 3 - note C_, 1 - note F_, 1 - octave 2 - note D_, 1 - note __, 1 - note D_, 1 - note __, 3 - note D_, 1 - note D_, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 3 - note D_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 3 - note G_, 1 - note G_, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 3 - note G_, 1 - note G_, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 2 - note G_, 1 - note A_, 1 - octave 3 - note C_, 1 - octave 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 3 - note G_, 1 - note G_, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 3 - note G_, 1 - note G_, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 3 - note G_, 1 - note G_, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 2 - note G_, 1 - note A_, 1 - octave 3 - note C_, 1 - octave 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 3 - note F_, 1 - note F_, 1 - note C_, 1 - note __, 2 - note C_, 1 - note __, 2 - note G_, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 2 - note B_, 1 - note __, 1 - octave 2 - note G_, 1 - note __, 2 - note C_, 1 - note __, 2 - note C_, 1 - note __, 2 - note E_, 1 - note __, 1 - octave 1 - note B_, 1 - note __, 2 - octave 2 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note D_, 1 - note C_, 1 - note __, 2 - note G_, 1 - octave 1 - note B_, 1 - note __, 2 - octave 2 - note F#, 1 - note E_, 1 - note __, 2 - note E_, 1 - note D_, 1 - note __, 2 - note G_, 1 - octave 3 - note C_, 1 - note C_, 1 - octave 2 - note G_, 1 - octave 3 - note C_, 1 - note C#, 1 - note C#, 1 - octave 2 - note A_, 1 - octave 3 - note C#, 1 - note D_, 1 - note D_, 1 - octave 2 - note A_, 1 - note G_, 1 - note D_, 1 - note __, 3 - note F_, 1 - note __, 1 - note F_, 1 - note F_, 1 - note F_, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 1 - note __, 1 - note A#, 1 - note F_, 1 - note A#, 1 - note A#, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note __, 1 - note F_, 1 - note F_, 1 - note F_, 1 - note F_, 1 - octave 3 - note C_, 1 - octave 2 - note A_, 1 - note A#, 1 - note __, 1 - note A#, 1 - note F_, 1 - octave 3 - note C_, 1 - octave 2 - note A#, 1 - note A_, 1 - note G_, 1 - note A_, 1 - note __, 1 - note D_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - octave 2 - note A#, 1 - note __, 1 - note D_, 1 - note __, 1 - note G_, 1 - note __, 1 - octave 3 - note C_, 1 - note __, 1 - octave 2 - note F_, 1 - note F_, 1 - note __, 1 - octave 3 - note C_, 1 - note C_, 1 - note __, 1 - note F_, 1 - note __, 1 - note D_, 1 - note D_, 1 - note __, 1 - octave 2 - note D_, 1 - note D_, 1 - note __, 1 - note D_, 1 - note D_, 1 - notetype $9, $13 - note G_, 2 - note __, 14 - note G_, 2 - notetype $D, $00 - note __, 6 - notetype $9, $13 - note G_, 2 - notetype $D, $00 - note __, 6 - notetype $9, $13 - note B_, 2 - notetype $F, $00 - note __, 2 - notetype $C, $13 - note E_, 1 - note __, 1 - note E_, 1 - note __, 3 - note E_, 1 - note E_, 1 - octave 1 - note B_, 1 - note __, 1 - note B_, 1 - note __, 3 - note B_, 1 - octave 2 - note C_, 1 - note D_, 1 - note __, 3 - note E_, 1 - note __, 3 - note C_, 1 - note C_, 1 - note __, 2 - note D_, 1 - note D_, 1 - note __, 1 - notetype $D, $13 - note D_, 1 - loopchannel 0, Music_Route205_Ch3_loop - -Music_Route205_Ch4: - togglenoise 3 -Music_Route205_Ch4_loop: - notetype $C - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 2 - 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#, 2 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note C#, 2 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note F#, 2 - note F#, 2 - note C#, 2 - note F#, 2 - note C#, 4 - note C#, 4 - note C#, 2 - note C#, 2 - note C#, 2 - notetype $8 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 3 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 3 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 3 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 3 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 3 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note F#, 12 - note B_, 9 - notetype $C - note F#, 1 - note G_, 1 - note F#, 8 - note B_, 6 - note F#, 1 - note G_, 1 - note F#, 3 - note G_, 1 - note G_, 1 - note F#, 3 - note F#, 3 - note G_, 1 - note G_, 1 - note F#, 2 - note G_, 1 - note F#, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note G_, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note B_, 2 - note C#, 1 - note C#, 1 - note F#, 2 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note F#, 2 - note C#, 1 - note C#, 1 - note C#, 2 - note C#, 2 - note F#, 2 - note C#, 1 - note C#, 1 - note F#, 2 - note C#, 2 - note F#, 2 - note C#, 2 - note F#, 2 - note C#, 1 - note C#, 1 - note F#, 2 - note C#, 2 - note F#, 1 - note C#, 2 - note C#, 1 - note C#, 2 - note C#, 2 - note F#, 1 - note C#, 2 - note C#, 1 - note C#, 2 - note C#, 2 - note C#, 1 - note C#, 2 - note C#, 1 - note C#, 2 - notetype $8 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - notetype $C - note C#, 1 - note C#, 1 - note C#, 2 - notetype $8 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 3 - note C#, 1 - note C#, 1 - notetype $A - note C#, 2 - notetype $C - note C#, 1 - note F#, 2 - note C#, 1 - note C#, 1 - note F#, 2 - notetype $8 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 3 - note C#, 3 - note F#, 3 - note C#, 3 - note F#, 3 - note F#, 3 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - note F#, 3 - note F#, 3 - note C#, 3 - note C#, 1 - note C#, 1 - note C#, 1 - notetype $C - note F#, 1 - note F#, 1 - note C#, 2 - note F#, 1 - note F#, 1 - note C#, 2 - note C#, 1 - note C#, 3 - note C#, 1 - note C#, 3 - loopchannel 0, Music_Route205_Ch4_loop diff --git a/crysaudio/music/DPPt/route206.asm b/crysaudio/music/DPPt/route206.asm deleted file mode 100644 index db6b58cb..00000000 --- a/crysaudio/music/DPPt/route206.asm +++ /dev/null @@ -1,984 +0,0 @@ -Music_Route206:: - dbw $C0, Music_Route206_Ch1 - dbw $01, Music_Route206_Ch2 - dbw $02, Music_Route206_Ch3 - dbw $03, Music_Route206_Ch4 - -Music_Route206_Ch1: - tempo $A0 - volume $77 - notetype $4, $71 - dutycycle 2 - tone $0001 - vibrato $10, $15 - octave 2 - note __, 2 - octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 3 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 2 - note B_, 2 - intensity $A6 - dutycycle 3 - octave 3 - note C#, 16 - octave 2 - note A_, 4 - octave 3 - note C#, 4 - note D#, 16 - octave 2 - note B_, 4 - octave 3 - note D#, 4 - note E_, 16 - note C_, 4 - note E_, 4 - note F#, 16 - note D_, 4 - note F#, 4 - note G#, 4 - octave 2 - note B_, 4 - octave 3 - note E_, 4 - octave 2 - note B_, 12 - octave 3 - note G_, 12 - octave 2 - note B_, 4 - octave 3 - note E_, 4 - note G_, 4 - note E_, 14 - intensity $81 - dutycycle 2 - octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 3 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 2 - note B_, 2 -Music_Route206_Ch1_loop: - note __, 12 - intensity $A4 - dutycycle 3 - octave 4 - note D#, 12 - note F#, 12 - octave 5 - note C#, 12 - octave 4 - note B_, 12 - octave 5 - note E_, 12 - intensity $A6 - octave 4 - note B_, 16 - note __, 16 - note __, 4 - intensity $A4 - note E_, 12 - note A_, 12 - octave 5 - note C#, 12 - octave 4 - note B_, 12 - octave 5 - note E_, 12 - intensity $A6 - octave 4 - note B_, 16 - note __, 16 - note __, 4 - intensity $A4 - note D#, 4 - note F#, 4 - note A_, 4 - octave 5 - note C_, 8 - note C_, 8 - octave 4 - note G#, 16 - note __, 4 - note C#, 4 - note E_, 4 - note G_, 4 - note A#, 8 - octave 5 - note C#, 8 - octave 4 - note F#, 8 - octave 2 - note E_, 4 - note A_, 4 - octave 3 - note C#, 4 - octave 2 - note A_, 4 - octave 3 - note C#, 4 - note E_, 4 - octave 4 - note A_, 8 - note B_, 8 - octave 5 - note F#, 8 - intensity $A1 - octave 2 - note F#, 2 - note B_, 2 - octave 3 - note C#, 2 - note E_, 2 - note C#, 2 - octave 2 - note B_, 2 - note F#, 2 - note B_, 2 - octave 3 - note C#, 2 - note F#, 2 - note B_, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note F#, 2 - note B_, 2 - octave 4 - note C#, 2 - note E_, 2 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note E_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - octave 5 - note D#, 2 - dutycycle 2 - octave 3 - note B_, 2 - note G_, 2 - note E_, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note E_, 2 - note C_, 2 - octave 2 - note G_, 2 - note E_, 2 - note G_, 2 - octave 3 - note C_, 2 - note D_, 2 - note F#, 2 - note A_, 2 - octave 4 - note D_, 2 - note F#, 2 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F#, 2 - note A_, 2 - octave 5 - note D_, 2 - note F#, 2 - note G#, 2 - note E_, 2 - octave 4 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - octave 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 4 - note E_, 2 - note F#, 2 - note A_, 2 - note E_, 2 - note C#, 2 - octave 3 - note A_, 2 - note E_, 2 - note A_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note E_, 2 - note C#, 2 - note E_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - octave 4 - note D#, 2 - note F#, 2 - note B_, 2 - octave 3 - note B_, 2 - octave 4 - note D#, 2 - note F#, 2 - note B_, 2 - octave 5 - note D#, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - octave 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - octave 2 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 3 - note E_, 2 - note G#, 2 - intensity $A6 - dutycycle 3 - octave 2 - note A_, 12 - note B_, 12 - octave 3 - note E_, 12 - octave 2 - note B_, 12 - note G_, 12 - note A_, 12 - note B_, 12 - octave 3 - note C_, 12 - octave 2 - note B_, 16 - note __, 16 - note __, 16 - note __, 14 - intensity $81 - dutycycle 2 - octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 3 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 2 - note B_, 2 - loopchannel 0, Music_Route206_Ch1_loop - -Music_Route206_Ch2: - notetype $4, $91 - dutycycle 2 - vibrato $12, $36 - octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 3 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 2 - note B_, 4 - dutycycle 3 - octave 4 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - intensity $B4 - note E_, 4 - octave 3 - note E_, 4 - note B_, 4 - octave 4 - note E_, 4 - note F#, 8 - octave 3 - note B_, 8 - octave 4 - note F#, 8 - intensity $B1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 1 - note G_, 1 - note A_, 1 - intensity $B4 - note G_, 4 - octave 3 - note G_, 4 - octave 4 - note C_, 4 - note G_, 4 - note A_, 8 - note D_, 8 - note A_, 8 - note B_, 4 - note B_, 4 - octave 5 - note E_, 1 - note F#, 1 - note E_, 6 - octave 4 - note E_, 8 - note G_, 4 - note G_, 4 - octave 5 - note E_, 1 - note F#, 1 - note E_, 6 - octave 3 - note B_, 4 - octave 4 - note G_, 4 - note G#, 12 - intensity $91 - dutycycle 2 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 3 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 2 - note B_, 4 -Music_Route206_Ch2_loop: - intensity $A5 - dutycycle 3 - octave 3 - note B_, 16 - note D#, 4 - octave 4 - note C#, 4 - octave 3 - note B_, 8 - octave 4 - note C#, 8 - note D#, 8 - note F#, 16 - note E_, 4 - octave 3 - note B_, 4 - note G#, 16 - note __, 8 - octave 4 - note C#, 16 - octave 3 - note A_, 4 - octave 4 - note E_, 4 - note D#, 8 - note E_, 8 - note F#, 8 - note A_, 16 - note G#, 4 - note E_, 4 - octave 3 - note B_, 16 - note __, 8 - octave 4 - note D#, 8 - note F#, 8 - note A_, 8 - note G#, 4 - note D#, 4 - note C_, 4 - octave 3 - note G#, 12 - octave 4 - note C#, 8 - note E_, 8 - note G_, 8 - note F#, 4 - note C#, 4 - octave 3 - note A#, 4 - note F#, 8 - note G#, 4 - note A_, 16 - note C#, 4 - note E_, 4 - note A_, 8 - note B_, 8 - octave 4 - note F#, 8 - intensity $B7 - note B_, 16 - intensity $4D - note B_, 16 - intensity $B8 - note B_, 16 - dutycycle 2 - octave 3 - note E_, 16 - note E_, 8 - note F#, 16 - note F#, 8 - note G#, 8 - note E_, 4 - octave 2 - note B_, 16 - note B_, 16 - octave 3 - note B_, 4 - octave 4 - note E_, 4 - note E_, 16 - note E_, 4 - note F#, 4 - note F#, 12 - note E_, 4 - note F#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 3 - note B_, 16 - note B_, 8 - note B_, 12 - intensity $B4 - octave 4 - note E_, 8 - note E_, 16 - note __, 12 - note E_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 3 - note G_, 4 - octave 4 - note E_, 4 - note F#, 4 - octave 3 - note A_, 4 - octave 4 - note F#, 4 - note G_, 4 - octave 3 - note B_, 4 - octave 4 - note G_, 4 - note C_, 4 - note A_, 4 - octave 5 - note C_, 4 - notetype $1, $B1 - forceoctave 27 - note C_, 4 - note D_, 5 - note C_, 5 - note D_, 5 - note C_, 5 - note D_, 4 - note C_, 5 - note D_, 5 - note C_, 5 - note D_, 5 - note C_, 4 - note D_, 5 - note C_, 5 - note D_, 5 - note C_, 5 - note D_, 4 - note C_, 5 - note D_, 5 - note C_, 5 - note D_, 5 - note C_, 4 - note D_, 5 - note C_, 5 - note D_, 5 - note C_, 5 - note D_, 4 - note C_, 5 - note D_, 5 - note C_, 5 - note D_, 5 - note C_, 4 - note D_, 5 - note C_, 5 - note D_, 5 - note C_, 5 - note D_, 4 - note C_, 5 - note D_, 5 - note C_, 5 - note D_, 5 - notetype $4, $B7 - forceoctave 28 - octave 4 - note B_, 12 - intensity $91 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 3 - note B_, 4 - note A_, 4 - note G#, 4 - note E_, 4 - octave 2 - note B_, 4 - loopchannel 0, Music_Route206_Ch2_loop - -Music_Route206_Ch3: - notetype $4, $12 - octave 2 - note __, 16 - note __, 16 - note __, 4 - note A_, 8 - note E_, 4 - note A_, 4 - note C#, 4 - note E_, 4 - note B_, 8 - note F#, 4 - note B_, 4 - note D#, 4 - note F#, 4 - octave 3 - note C_, 8 - octave 2 - note G_, 4 - octave 3 - note C_, 4 - octave 2 - note E_, 4 - note G_, 4 - octave 3 - note D_, 8 - octave 2 - note A_, 4 - octave 3 - note D_, 4 - octave 2 - note F#, 4 - note A_, 4 - note E_, 4 - note B_, 4 - octave 3 - note F#, 4 - note E_, 4 - octave 2 - note B_, 4 - octave 3 - note E_, 4 - octave 2 - note E_, 4 - octave 3 - note F#, 4 - note E_, 4 - octave 2 - note B_, 4 - note G_, 4 - octave 3 - note E_, 4 - octave 2 - note E_, 4 - note B_, 4 - octave 3 - note E_, 4 - octave 2 - note B_, 8 - note B_, 4 - octave 3 - note E_, 12 - octave 2 - note G#, 12 -Music_Route206_Ch3_loop: - note B_, 12 - octave 1 - note B_, 4 - octave 2 - note F#, 4 - note A_, 4 - note B_, 12 - octave 1 - note B_, 12 - octave 2 - note E_, 12 - octave 1 - note B_, 4 - octave 2 - note E_, 4 - note G#, 4 - note B_, 12 - note E_, 12 - note A_, 12 - note C#, 4 - note E_, 4 - note A_, 4 - note B_, 12 - octave 1 - note B_, 12 - octave 2 - note E_, 12 - octave 1 - note B_, 4 - octave 2 - note E_, 4 - note A_, 4 - note G#, 12 - note E_, 12 - note D#, 12 - note C_, 4 - note D#, 4 - note F#, 4 - note G#, 12 - note F#, 4 - note D#, 4 - note C_, 4 - note C#, 12 - note E_, 4 - note G_, 4 - octave 3 - note C#, 4 - octave 2 - note A#, 12 - note F#, 4 - note C#, 4 - note F#, 4 - octave 3 - note C#, 12 - octave 2 - note E_, 12 - note A_, 12 - octave 3 - note C#, 12 - octave 2 - note B_, 16 - note B_, 8 - octave 3 - note E_, 12 - note F#, 12 - octave 2 - note C_, 16 - note C_, 4 - note C_, 4 - note D_, 16 - note D_, 4 - note D_, 4 - note E_, 16 - note E_, 16 - note E_, 4 - note E_, 12 - note A_, 12 - note A_, 12 - note B_, 12 - note B_, 12 - note E_, 12 - note E_, 12 - note G#, 12 - note G#, 12 - note A_, 4 - note A_, 4 - note E_, 4 - note A_, 4 - note A_, 4 - note E_, 4 - octave 3 - note C#, 4 - octave 2 - note A_, 4 - note E_, 4 - note C#, 4 - note E_, 4 - note A_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note A_, 4 - note C_, 4 - note A_, 4 - note B_, 4 - note D_, 4 - note B_, 4 - octave 3 - note C_, 4 - octave 2 - note G_, 4 - octave 3 - note C_, 4 - octave 1 - note B_, 4 - note B_, 4 - octave 2 - note F#, 4 - octave 1 - note B_, 4 - note B_, 4 - octave 2 - note F#, 4 - octave 1 - note B_, 4 - note B_, 4 - octave 2 - note F#, 4 - octave 1 - note B_, 4 - note B_, 4 - octave 2 - note F#, 4 - octave 1 - note B_, 4 - octave 2 - note F#, 4 - note A_, 4 - note B_, 4 - note F#, 4 - note B_, 4 - octave 3 - note E_, 12 - octave 2 - note G#, 12 - loopchannel 0, Music_Route206_Ch3_loop - -Music_Route206_Ch4: - togglenoise 0 - notetype $4 - note __, 16 - note __, 16 - note __, 16 - note C_, 4 - note D#, 2 - note D#, 2 - note D#, 16 - note G#, 16 - note __, 8 - note C_, 2 - note D#, 2 - note D#, 4 - note D#, 16 - note G#, 12 - note C_, 4 - note D#, 2 - note D#, 2 - note D#, 4 - note G#, 12 - note C_, 4 - note D#, 2 - note D#, 2 - note D#, 4 - note G#, 12 - note C_, 4 - note D#, 4 - note D#, 4 - note G#, 16 -Music_Route206_Ch4_loop: - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 4 - note G#, 8 - note D#, 4 - note C_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note G#, 8 - note D#, 4 - note C_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note G#, 8 - note D#, 4 - note C_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - 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 G#, 8 - note D#, 4 - note C_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note G#, 8 - note D#, 4 - note C_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note G#, 8 - note D#, 4 - note C_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note C_, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note G#, 4 - note D#, 2 - note D#, 2 - note D#, 2 - note D#, 2 - note C_, 4 - note D#, 4 - note D#, 4 - note C_, 4 - note D#, 4 - note D#, 4 - note C_, 4 - note D#, 4 - note D#, 4 - note C_, 4 - note D#, 4 - note D#, 4 - note G#, 4 - note D#, 4 - note D#, 4 - note G#, 4 - note D#, 4 - note D#, 4 - note G#, 4 - note D#, 4 - note D#, 4 - note G#, 4 - note D#, 4 - note D#, 4 - note G#, 4 - note D#, 4 - note D#, 4 - note C_, 4 - note D#, 4 - note D#, 4 - note C_, 4 - note D#, 4 - note D#, 4 - note C_, 4 - note D#, 4 - note D#, 4 - note C_, 12 - note G#, 16 - loopchannel 0, Music_Route206_Ch4_loop diff --git a/crysaudio/music/DPPt/sinnohtrainer.asm b/crysaudio/music/DPPt/sinnohtrainer.asm deleted file mode 100644 index 50d27f28..00000000 --- a/crysaudio/music/DPPt/sinnohtrainer.asm +++ /dev/null @@ -1,1623 +0,0 @@ -Music_SinnohTrainerBattle:: - dbw $80, Music_SinnohTrainerBattle_Ch1 - dbw $01, Music_SinnohTrainerBattle_Ch2 - dbw $02, Music_SinnohTrainerBattle_Ch3 - -Music_SinnohTrainerBattle_Ch1: - tempo $68 - volume $77 - notetype $C, $B2 - dutycycle 3 - tone $0002 - vibrato $12, $15 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - octave 3 - note C_, 6 - note C_, 6 - note C_, 4 - note C_, 8 - note C_, 2 - intensity $B7 - note C#, 6 - intensity $B2 - note C_, 6 - note C_, 6 - note C_, 4 - note C_, 8 - note C_, 2 - intensity $B7 - note C#, 6 - intensity $B2 - note G_, 6 - note G_, 6 - note G_, 4 - note G_, 8 - note G_, 2 - intensity $B7 - note G#, 6 - intensity $B2 - note G_, 6 - note G_, 6 - note G_, 4 - note G_, 8 - note G_, 2 - intensity $B7 - note G#, 6 -Music_SinnohTrainerBattle_Ch1_loop: - intensity $B4 - octave 2 - note G_, 6 - octave 3 - note C_, 6 - note G_, 4 - note G_, 4 - note F_, 4 - note E_, 4 - note C_, 2 - note D_, 2 - intensity $B1 - note C_, 3 - note D_, 1 - intensity $B7 - note E_, 8 - intensity $B1 - note D_, 3 - note E_, 1 - intensity $B4 - note F_, 4 - note G#, 4 - note G_, 4 - note F_, 4 - octave 2 - note G_, 6 - octave 3 - note C_, 6 - note G_, 4 - note G_, 4 - note F_, 4 - note E_, 4 - note C_, 2 - note D_, 2 - intensity $B1 - note C_, 3 - note D_, 1 - intensity $B7 - note E_, 8 - intensity $B1 - note G_, 3 - note A_, 1 - intensity $B4 - note A#, 8 - note A_, 4 - note A#, 4 - intensity $B1 - octave 2 - note G_, 3 - note E_, 1 - intensity $B4 - note E_, 4 - intensity $B1 - octave 3 - note C_, 3 - octave 2 - note G_, 1 - intensity $B4 - note G_, 4 - intensity $B1 - octave 3 - note E_, 3 - note C_, 1 - intensity $B7 - note C_, 12 - intensity $B1 - octave 2 - note A#, 3 - note F_, 1 - intensity $B4 - note F_, 4 - intensity $B1 - octave 3 - note D_, 3 - octave 2 - note A#, 1 - intensity $B4 - note A#, 4 - intensity $B1 - octave 3 - note F_, 3 - note D_, 1 - intensity $B7 - note D_, 12 - note G_, 8 - intensity $B1 - note E_, 3 - note F_, 1 - intensity $B4 - note E_, 4 - octave 4 - note C_, 8 - octave 3 - note A_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note D_, 2 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note B_, 2 - intensity $B1 - octave 2 - note A#, 2 - note A#, 2 - note A#, 8 - note A#, 3 - octave 3 - note C#, 1 - intensity $B4 - note D_, 4 - intensity $B2 - note F_, 1 - note A_, 1 - note A#, 1 - octave 4 - note C_, 1 - note D_, 1 - note C_, 1 - octave 3 - note A#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note G_, 1 - note F_, 1 - intensity $B1 - note C_, 2 - note C_, 2 - note C_, 8 - note C_, 3 - note D_, 1 - intensity $B4 - note E_, 4 - intensity $B2 - note G_, 1 - note B_, 1 - octave 4 - note C_, 1 - note D_, 1 - note E_, 1 - note D_, 1 - note C_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note A_, 1 - note G_, 1 - intensity $B1 - note C#, 2 - note C#, 2 - note C#, 8 - note C#, 3 - note D#, 1 - intensity $B4 - note F_, 4 - intensity $B2 - note G#, 1 - octave 4 - note C_, 1 - note C#, 1 - note D#, 1 - note F_, 1 - note D#, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 3 - note A#, 1 - note G#, 1 - intensity $B1 - note D#, 2 - note D#, 2 - note D#, 8 - note D#, 3 - note F_, 1 - intensity $B4 - note G_, 4 - intensity $B2 - note A#, 1 - octave 4 - note D_, 1 - note D#, 1 - note F_, 1 - note G_, 1 - note F_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - octave 3 - note A#, 1 - intensity $B4 - octave 4 - note C_, 16 - note __, 8 - notetype $4, $B4 - octave 3 - note A#, 8 - octave 4 - note C_, 8 - octave 3 - note A#, 8 - notetype $C, $B4 - note A_, 16 - note F_, 16 - note C_, 16 - note __, 16 - note C#, 16 - note __, 16 - octave 2 - note A#, 16 - note __, 16 - octave 3 - note C#, 16 - note __, 16 - note C_, 16 - note __, 16 - note C#, 16 - note __, 16 - note D#, 16 - note __, 16 - note F#, 16 - note __, 16 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 6 - note F#, 4 - note F_, 2 - note D#, 2 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note A#, 2 - octave 4 - note C_, 2 - octave 3 - note F_, 2 - note F#, 2 - note D#, 2 - intensity $B1 - octave 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - intensity $B2 - octave 3 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - loopchannel 0, Music_SinnohTrainerBattle_Ch1_loop - -Music_SinnohTrainerBattle_Ch2: - notetype $C, $C2 - dutycycle 3 - tone $0001 - vibrato $08, $36 - octave 5 - note C_, 2 - octave 4 - note B_, 1 - octave 5 - note C_, 1 - note C#, 4 - note C#, 2 - note C_, 1 - note C#, 1 - note D_, 4 - note D#, 2 - note D_, 1 - note D#, 1 - note E_, 4 - note E_, 2 - note D#, 1 - note E_, 1 - note F_, 4 - octave 4 - note C_, 6 - note C_, 6 - note C_, 4 - note C_, 4 - octave 3 - note G_, 4 - octave 4 - note C_, 2 - note C#, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C_, 6 - note C_, 4 - note C_, 4 - octave 3 - note G_, 4 - octave 4 - note C_, 2 - note C#, 2 - note D#, 2 - note E_, 2 - note G_, 6 - note G_, 6 - note G_, 4 - note G_, 4 - note C_, 4 - note G_, 2 - note G#, 2 - note F_, 2 - note G#, 2 - note G_, 6 - note G_, 6 - note G_, 4 - note G_, 4 - note C_, 4 - note G_, 2 - note G#, 2 - note A#, 2 - note B_, 2 -Music_SinnohTrainerBattle_Ch2_loop: - intensity $C7 - octave 3 - note C_, 6 - note G_, 6 - octave 4 - note C_, 4 - octave 3 - note A#, 4 - note G#, 4 - note G_, 4 - note F_, 4 - intensity $C1 - note E_, 3 - note F_, 1 - intensity $C7 - note G_, 8 - octave 4 - note D_, 4 - octave 3 - note A#, 16 - note C_, 6 - note G_, 6 - octave 4 - note C_, 4 - octave 3 - note A#, 4 - note G#, 4 - note G_, 4 - note F_, 4 - intensity $C1 - note E_, 3 - note F_, 1 - intensity $C7 - note G_, 8 - intensity $C1 - octave 4 - note C_, 3 - note D_, 1 - intensity $C7 - note E_, 8 - note D_, 8 - intensity $C1 - octave 3 - note E_, 3 - note C_, 1 - intensity $C4 - note C_, 4 - intensity $C1 - note G_, 3 - note E_, 1 - intensity $C4 - note E_, 4 - intensity $C1 - octave 4 - note C_, 3 - octave 3 - note G_, 1 - intensity $C4 - note G_, 12 - intensity $C1 - note F_, 3 - note D_, 1 - intensity $C4 - note D_, 4 - intensity $C1 - note A#, 3 - note F_, 1 - intensity $C4 - note F_, 4 - intensity $C1 - octave 4 - note D_, 3 - octave 3 - note A#, 1 - intensity $C7 - note A#, 8 - note B_, 4 - octave 4 - note C_, 12 - octave 3 - note G_, 4 - octave 4 - note E_, 12 - note C_, 4 - note G_, 12 - note F_, 3 - note D#, 1 - note E_, 16 - note G_, 8 - intensity $C2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - intensity $C7 - note D_, 16 - note E_, 8 - intensity $C2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - intensity $C7 - note E_, 16 - notetype $4, $C2 - note F_, 8 - note E_, 8 - note F_, 8 - notetype $C, $C2 - note G#, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note F_, 2 - note G_, 2 - note G#, 2 - note A#, 2 - note G_, 2 - note G#, 2 - note A#, 2 - octave 5 - note C_, 2 - octave 4 - note A#, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note G_, 4 - note F_, 2 - note G_, 2 - note A#, 2 - note G#, 2 - note G_, 2 - note A#, 2 - intensity $C0 - note A_, 16 - note A#, 16 - octave 5 - note C_, 12 - octave 4 - note A#, 4 - note A_, 16 - intensity $C7 - octave 3 - note G_, 16 - note __, 16 - note G#, 16 - note __, 16 - note F_, 16 - note __, 16 - note G#, 16 - note __, 16 - note G_, 16 - note __, 16 - note G#, 16 - note __, 16 - note A#, 16 - note __, 16 - octave 4 - note C#, 16 - note __, 16 - intensity $C4 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 6 - note C#, 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C#, 2 - note C_, 2 - note C#, 2 - note D#, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note C#, 2 - octave 3 - note A#, 2 - intensity $C2 - octave 4 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note F_, 2 - loopchannel 0, Music_SinnohTrainerBattle_Ch2_loop - -Music_SinnohTrainerBattle_Ch3: - notetype $C, $19 - note __, 16 - octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 4 - note C_, 1 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note D#, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note D#, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - note D#, 2 - note C#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note D#, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note A#, 2 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 -Music_SinnohTrainerBattle_Ch3_loop: - octave 3 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note G_, 2 - note C_, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note A#, 2 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - octave 4 - note C_, 2 - octave 3 - note C_, 2 - octave 4 - note C_, 2 - octave 3 - note C_, 2 - octave 4 - note C_, 2 - octave 3 - note C_, 2 - octave 4 - note C_, 2 - octave 3 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note G_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note A_, 4 - note F_, 4 - note A_, 4 - note F_, 4 - note A_, 4 - note F_, 4 - note A_, 4 - note F_, 4 - note C_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - octave 4 - note C_, 2 - note E_, 2 - note F_, 2 - note F_, 2 - octave 3 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note F_, 2 - note A_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note F_, 2 - octave 4 - note C_, 2 - note C_, 2 - octave 3 - note F_, 2 - octave 4 - note C_, 2 - note C_, 2 - octave 3 - note F_, 2 - octave 4 - note C_, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - note D#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - note D#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - octave 3 - note F_, 2 - octave 4 - note C_, 2 - note C_, 2 - octave 3 - note F_, 2 - octave 4 - note C_, 2 - note C_, 2 - octave 3 - note F_, 2 - octave 4 - note C_, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - note D#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - note D#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F#, 2 - note F_, 2 - note D#, 2 - note F#, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note D#, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note A#, 2 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note D#, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note A#, 2 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note D#, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note F_, 2 - note F#, 2 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note A#, 2 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - loopchannel 0, Music_SinnohTrainerBattle_Ch3_loop diff --git a/crysaudio/music/DPPt/sinnohwild.asm b/crysaudio/music/DPPt/sinnohwild.asm deleted file mode 100644 index 0e5805ea..00000000 --- a/crysaudio/music/DPPt/sinnohwild.asm +++ /dev/null @@ -1,1176 +0,0 @@ -Music_SinnohWildBattle:: - dbw $80, Music_SinnohWildBattle_Ch1 - dbw $01, Music_SinnohWildBattle_Ch2 - dbw $02, Music_SinnohWildBattle_Ch3 - -Music_SinnohWildBattle_Ch1: - tempo $68 - volume $77 - notetype $C, $B2 - dutycycle 3 - tone $0002 - vibrato $12, $15 - octave 3 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note C_, 6 - note G_, 6 - note F_, 12 - note C_, 8 - note C#, 6 - note G#, 6 - note G_, 12 - intensity $3F - note C#, 8 - intensity $B2 - octave 3 - note C_, 6 - note G_, 6 - note F_, 12 - note C_, 8 - note C#, 6 - note G#, 6 - note G_, 16 - octave 2 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 -Music_SinnohWildBattle_Ch1_loop: - intensity $B2 - octave 3 - note G_, 2 - note G_, 4 - note G_, 2 - note C_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note C_, 2 - note G_, 4 - note G_, 2 - note G#, 2 - note G#, 4 - note G#, 2 - note C#, 2 - note G#, 4 - note G#, 2 - octave 4 - note C#, 2 - note C#, 4 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note C#, 4 - note C#, 2 - octave 3 - note G_, 2 - note G_, 4 - note G_, 2 - note C_, 2 - note G_, 4 - note G_, 2 - note G_, 2 - note G_, 4 - note G_, 2 - note C_, 2 - note G_, 4 - note G_, 2 - note G#, 2 - note G#, 4 - note G#, 2 - note C#, 2 - note G#, 4 - note G#, 2 - note G#, 2 - note G#, 4 - note G#, 2 - note F_, 2 - note G#, 4 - note G#, 2 - note A_, 2 - note A_, 4 - note A_, 2 - note D_, 2 - note A_, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 2 - note D_, 2 - note A_, 4 - note A_, 2 - note A#, 2 - note A#, 4 - note A#, 2 - note D#, 2 - note A#, 4 - note A#, 2 - octave 4 - note D#, 2 - note D#, 4 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 4 - note D#, 2 - octave 3 - note A_, 2 - note A_, 4 - note A_, 2 - note D_, 2 - note A_, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 2 - note D_, 2 - note A_, 4 - note A_, 2 - note A#, 2 - note A#, 4 - note A#, 2 - note D#, 2 - note A#, 4 - note A#, 2 - note G_, 2 - note A#, 4 - note A#, 2 - note G_, 2 - note A#, 4 - note A#, 2 - intensity $B1 - dutycycle 2 - octave 4 - note A#, 2 - note D#, 2 - note A#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - note D#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - note D#, 2 - note A#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - octave 5 - note D#, 2 - note G_, 2 - note D#, 2 - octave 4 - note A#, 6 - intensity $B5 - note G#, 8 - octave 5 - note C#, 4 - note F_, 4 - note D#, 4 - note C_, 4 - note F_, 4 - intensity $B1 - octave 4 - note A#, 2 - note D#, 2 - note A#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - note D#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - note D#, 2 - note A#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - octave 5 - note D#, 2 - note G_, 2 - note D#, 2 - octave 4 - note A#, 2 - octave 5 - note D#, 2 - octave 4 - note A#, 2 - octave 5 - note D#, 2 - note G_, 2 - note D#, 2 - octave 4 - note A#, 2 - octave 5 - note G_, 2 - note D#, 2 - octave 4 - note A#, 2 - octave 5 - note D#, 2 - note G_, 2 - note D#, 2 - note G_, 2 - note A#, 2 - note G_, 2 - note D#, 2 - dutycycle 0 - note G#, 2 - note C#, 2 - note G#, 2 - octave 6 - note C#, 2 - octave 5 - note G#, 2 - note C#, 2 - octave 6 - note C#, 2 - octave 5 - note G#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - octave 6 - note D_, 2 - octave 5 - note A_, 2 - note D_, 2 - octave 6 - note D_, 2 - octave 5 - note A_, 2 - note A#, 2 - note D#, 2 - note A#, 2 - octave 6 - note D#, 2 - octave 5 - note A#, 2 - note D#, 2 - octave 6 - note D#, 2 - octave 5 - note A#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - octave 6 - note D#, 2 - octave 5 - note A#, 2 - note D#, 2 - octave 6 - note D#, 2 - octave 5 - note A#, 2 - dutycycle 3 - note C_, 2 - octave 4 - note F_, 2 - note G_, 2 - note C#, 2 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note C_, 2 - octave 3 - note G#, 2 - note A#, 2 - note G_, 2 - note G#, 2 - note F_, 2 - note G_, 2 - note D#, 2 - note F_, 2 - note C#, 2 - octave 5 - note C_, 2 - octave 4 - note F_, 2 - note G_, 2 - note C#, 2 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note C_, 2 - octave 3 - note G#, 2 - note A#, 2 - note G_, 2 - note G#, 2 - note F_, 2 - note G_, 2 - note D#, 2 - note F_, 2 - note C#, 2 - octave 6 - note E_, 2 - octave 5 - note A_, 2 - note B_, 2 - note E_, 2 - note G_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - octave 4 - note B_, 2 - octave 5 - note C_, 2 - octave 4 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note F_, 2 - octave 6 - note E_, 2 - octave 5 - note A_, 2 - note B_, 2 - note E_, 2 - note G_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - octave 4 - note B_, 2 - octave 5 - note C_, 2 - octave 4 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note F_, 2 - intensity $B7 - octave 3 - note E_, 10 - note E_, 2 - note D_, 2 - note C_, 2 - octave 2 - note G_, 6 - note C_, 10 - octave 3 - note F_, 10 - note F_, 2 - note D#, 2 - note C#, 2 - octave 2 - note G#, 6 - note C#, 10 - octave 3 - note F#, 10 - note F#, 2 - note E_, 2 - note D_, 2 - octave 2 - note A_, 6 - note D_, 16 - note __, 10 - note A_, 6 - note D_, 10 - loopchannel 0, Music_SinnohWildBattle_Ch1_loop - -Music_SinnohWildBattle_Ch2: - notetype $C, $C2 - dutycycle 3 - tone $0001 - vibrato $08, $36 - octave 5 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 2 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 2 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 2 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 2 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 2 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 2 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 2 - note C_, 1 - octave 4 - note G_, 1 - octave 5 - note C_, 2 - octave 3 - note C_, 6 - note G_, 6 - note F_, 12 - note C_, 8 - note C#, 6 - note G#, 6 - note G_, 12 - intensity $4F - note C#, 8 - intensity $C2 - octave 4 - note C_, 6 - note G_, 6 - note F_, 12 - note C_, 8 - note C#, 6 - note G#, 6 - note G_, 12 - intensity $4F - octave 5 - note C#, 8 -Music_SinnohWildBattle_Ch2_loop: - intensity $C7 - octave 4 - note C_, 10 - intensity $C1 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note G_, 2 - intensity $4F - note G#, 16 - intensity $C7 - note G#, 16 - note C_, 10 - intensity $C1 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - intensity $4F - octave 3 - note A#, 16 - intensity $C7 - note A#, 12 - intensity $C1 - octave 4 - note C#, 4 - intensity $C7 - note D_, 10 - intensity $C1 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - intensity $4F - note A#, 16 - intensity $C7 - note A#, 16 - note D_, 6 - octave 3 - note A_, 4 - note A_, 2 - intensity $C1 - octave 4 - note D_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - intensity $4F - note C_, 16 - intensity $C7 - note C_, 12 - note D#, 4 - octave 3 - note A#, 10 - note A#, 2 - intensity $C1 - note G#, 2 - note G_, 2 - intensity $C7 - note D#, 6 - octave 2 - note A#, 8 - intensity $C1 - note G#, 1 - octave 3 - note C#, 1 - intensity $C7 - note F_, 6 - intensity $C1 - note C#, 1 - note F_, 1 - intensity $C7 - note G#, 6 - intensity $C1 - note F_, 1 - note G#, 1 - intensity $C7 - octave 4 - note C#, 8 - note C_, 8 - intensity $C1 - octave 3 - note A#, 2 - note G#, 2 - note G_, 2 - note G#, 2 - intensity $C7 - note A#, 16 - note __, 8 - intensity $C1 - note A#, 2 - note G#, 2 - note G_, 2 - note G#, 2 - intensity $C7 - note A#, 16 - note __, 8 - intensity $4F - octave 4 - note G#, 16 - intensity $6F - note A_, 16 - intensity $8F - note A#, 16 - intensity $C7 - note A#, 16 - octave 3 - note C_, 6 - note G_, 6 - note F_, 4 - note C#, 16 - note C_, 6 - note G_, 6 - note F_, 4 - note G#, 16 - note E_, 6 - note B_, 6 - note A_, 4 - note F_, 16 - note E_, 6 - note B_, 6 - note A_, 4 - octave 4 - note C_, 12 - note D#, 4 - octave 3 - note G_, 10 - note G_, 2 - note F_, 2 - note E_, 2 - note C_, 6 - octave 2 - note G_, 10 - octave 3 - note G#, 10 - note G#, 2 - note F#, 2 - note F_, 2 - note C#, 6 - octave 2 - note G#, 10 - octave 3 - note A_, 10 - note A_, 2 - note G_, 2 - note F#, 2 - note D_, 6 - octave 2 - note A_, 16 - note __, 10 - octave 3 - note D_, 6 - octave 2 - note A_, 10 - loopchannel 0, Music_SinnohWildBattle_Ch2_loop - -Music_SinnohWildBattle_Ch3: - notetype $C, $13 - octave 2 - note D_, 2 - note D#, 1 - note E_, 1 - note D#, 2 - note E_, 1 - note F_, 1 - note E_, 2 - note F_, 1 - note F#, 1 - note F_, 2 - note F#, 1 - note G_, 1 - note F#, 2 - note G_, 1 - note G#, 1 - note G_, 2 - note G#, 1 - note A_, 1 - note G#, 2 - note D#, 2 - note D_, 2 - note C#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 4 - note G_, 2 - note F_, 2 - note D#, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 4 - note G#, 2 - note G_, 2 - note F_, 2 - note G#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 4 - note G_, 2 - note F_, 2 - note D#, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 4 - note G#, 2 - note G_, 2 - note F_, 2 - note G#, 2 -Music_SinnohWildBattle_Ch3_loop: - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - note G_, 4 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - note F_, 4 - note G_, 2 - note G_, 2 - note F_, 2 - note C#, 2 - note G#, 2 - octave 3 - note G#, 2 - note C#, 4 - octave 2 - note G#, 2 - note F_, 2 - note G#, 2 - note C#, 2 - note G#, 2 - octave 3 - note F_, 2 - note C#, 4 - octave 2 - note G#, 2 - note F_, 2 - note G#, 2 - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - note G_, 4 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - note F_, 4 - note G_, 2 - note G_, 2 - note F_, 2 - note C#, 2 - note G#, 2 - octave 1 - note G#, 2 - octave 2 - note C#, 4 - note G#, 2 - note F_, 2 - note G#, 2 - note C#, 2 - note G#, 2 - octave 3 - note C#, 2 - octave 2 - note G#, 2 - note G#, 2 - octave 3 - note C#, 2 - octave 2 - note C#, 2 - note G#, 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note A_, 4 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note G_, 4 - note A_, 2 - note A_, 2 - note G_, 2 - note D#, 2 - note A#, 2 - octave 3 - note A#, 2 - note D#, 4 - octave 2 - note A#, 2 - note G_, 2 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note G_, 2 - note D#, 4 - octave 2 - note A#, 2 - note G_, 2 - note A#, 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note A_, 4 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note G_, 4 - note A_, 2 - note A_, 2 - note G_, 2 - note D#, 2 - note A#, 2 - octave 3 - note G_, 2 - note D#, 4 - octave 2 - note A#, 2 - note G_, 2 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note G_, 2 - octave 2 - note A#, 2 - note D#, 2 - note G_, 2 - note A#, 2 - octave 3 - note D#, 2 - octave 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note G#, 2 - note C#, 2 - octave 3 - note C#, 4 - octave 2 - note G#, 2 - note C#, 2 - octave 3 - note F_, 4 - octave 2 - note G#, 2 - note C#, 2 - octave 3 - note F_, 2 - octave 2 - note G#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note A#, 2 - note G#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note D#, 2 - octave 2 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note D#, 2 - octave 2 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note B_, 2 - note A_, 1 - note A#, 1 - note B_, 2 - octave 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note G#, 2 - note C#, 2 - note C#, 2 - note G#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note G#, 2 - note C#, 2 - note C#, 2 - note G#, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note A#, 2 - note D#, 2 - note D#, 2 - note A#, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note D#, 2 - note A#, 2 - note D#, 2 - note A#, 2 - note A#, 2 - note D#, 2 - note D#, 2 - note A#, 2 - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - note G_, 4 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - note F_, 4 - note G_, 2 - note G_, 2 - note F_, 2 - note C#, 2 - note G#, 2 - octave 3 - note F_, 2 - note C#, 4 - octave 2 - note G#, 2 - note F_, 2 - note G#, 2 - note C#, 2 - note G#, 2 - octave 3 - note C#, 2 - octave 2 - note G#, 2 - note C#, 2 - note F_, 2 - note G#, 2 - octave 3 - note C#, 2 - octave 2 - note D_, 2 - note A_, 2 - octave 3 - note F#, 2 - note D_, 4 - octave 2 - note A_, 2 - note F#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - note D_, 2 - note F#, 2 - note A_, 2 - octave 3 - note D_, 2 - octave 2 - note D_, 2 - note A_, 2 - octave 3 - note F#, 2 - note D_, 4 - octave 2 - note A_, 2 - note F#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - note A_, 2 - note G_, 2 - loopchannel 0, Music_SinnohWildBattle_Ch3_loop diff --git a/crysaudio/music/RBY/defeatedgymleader.asm b/crysaudio/music/RBY/defeatedgymleader.asm index af981cf7..b6c2018c 100644 --- a/crysaudio/music/RBY/defeatedgymleader.asm +++ b/crysaudio/music/RBY/defeatedgymleader.asm @@ -4,7 +4,7 @@ Music_DefeatedGymLeader: dbw $02, Music_DefeatedGymLeader_Ch3 Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) - ftempo 112 + tempo 112 volume 119 dutycycle 3 vibrato 18, 49 diff --git a/crysaudio/music/RBY/defeatedtrainer.asm b/crysaudio/music/RBY/defeatedtrainer.asm index 9f206ca6..0c2a1d96 100644 --- a/crysaudio/music/RBY/defeatedtrainer.asm +++ b/crysaudio/music/RBY/defeatedtrainer.asm @@ -4,7 +4,7 @@ Music_DefeatedTrainer: dbw $02, Music_DefeatedTrainer_Ch3 Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) - ftempo 224 + tempo 224 volume 119 dutycycle 2 notetype 4, 162 diff --git a/crysaudio/music/RBY/defeatedwildmon.asm b/crysaudio/music/RBY/defeatedwildmon.asm index 1556c9e7..0667018e 100644 --- a/crysaudio/music/RBY/defeatedwildmon.asm +++ b/crysaudio/music/RBY/defeatedwildmon.asm @@ -4,7 +4,7 @@ Music_DefeatedWildMon: dbw $02, Music_DefeatedWildMon_Ch3 Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) - ftempo 112 + tempo 112 volume 119 dutycycle 3 vibrato 6, 52 diff --git a/crysaudio/music/RBY/finalbattle.asm b/crysaudio/music/RBY/finalbattle.asm index 0c9f6af4..e7f2148c 100644 --- a/crysaudio/music/RBY/finalbattle.asm +++ b/crysaudio/music/RBY/finalbattle.asm @@ -4,7 +4,7 @@ Music_FinalBattle: dbw $02, Music_FinalBattle_Ch3 Music_FinalBattle_Ch1: - ftempo 112 + tempo 112 volume 119 dutycycle 3 vibrato $6, $34 diff --git a/crysaudio/music/RBY/gymleaderbattle.asm b/crysaudio/music/RBY/gymleaderbattle.asm index 0af2e0d1..d39b54e2 100644 --- a/crysaudio/music/RBY/gymleaderbattle.asm +++ b/crysaudio/music/RBY/gymleaderbattle.asm @@ -4,7 +4,7 @@ Music_GymLeaderBattle: dbw $02, Music_GymLeaderBattle_Ch3 Music_GymLeaderBattle_Ch1: - ftempo 104 + tempo 104 volume 119 dutycycle 3 vibrato $8, $34 diff --git a/crysaudio/music/RBY/introbattle.asm b/crysaudio/music/RBY/introbattle.asm index b8509488..41c27325 100644 --- a/crysaudio/music/RBY/introbattle.asm +++ b/crysaudio/music/RBY/introbattle.asm @@ -5,7 +5,7 @@ Music_IntroBattle: dbw $03, Music_IntroBattle_Ch4 Music_IntroBattle_Ch1: ; 7f844 (1f:7844) - ftempo 98 + tempo 98 volume 119 dutycycle 3 vibrato 6, 52 diff --git a/crysaudio/music/RBY/jigglypuffsong.asm b/crysaudio/music/RBY/jigglypuffsong.asm index 5ab55c8b..ae70c87e 100644 --- a/crysaudio/music/RBY/jigglypuffsong.asm +++ b/crysaudio/music/RBY/jigglypuffsong.asm @@ -3,11 +3,11 @@ Music_JigglypuffSong: dbw $01, Music_JigglypuffSong_Ch2 Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) - ftempo 144 + tempo 144 volume 119 vibrato 8, 36 dutycycle 2 - unknownmusic0xde 165 + sound_duty 165 notetype 13, 103 octave 4 @@ -28,7 +28,7 @@ Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a) vibrato 5, 21 dutycycle 2 - unknownmusic0xde 10 + sound_duty 10 notetype 12, 167 octave 4 note E_, 8 diff --git a/crysaudio/music/RBY/lavender.asm b/crysaudio/music/RBY/lavender.asm index 4fd3e351..e747188c 100644 --- a/crysaudio/music/RBY/lavender.asm +++ b/crysaudio/music/RBY/lavender.asm @@ -90,7 +90,7 @@ Music_Lavender_Ch3: ; bbae (2:7bae) note __, 16 note __, 16 notetype 12, $2f - db $f3, $21, $E2, $33, $28, $E1, $22, $FF, $EA, $10, $14, $DC, $10, $E3, $41, $51, $73 + load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3 Music_Lavender_branch_bbb9: octave 4 note E_, 16 diff --git a/crysaudio/music/RBY/pkmnhealed.asm b/crysaudio/music/RBY/pkmnhealed.asm index 2e07bc6c..7016a514 100644 --- a/crysaudio/music/RBY/pkmnhealed.asm +++ b/crysaudio/music/RBY/pkmnhealed.asm @@ -4,28 +4,28 @@ Music_PkmnHealed: dbw $02, Music_PkmnHealed_Ch3 Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3) - ftempo 144 + tempo 144 volume 119 - fdutycycle 2 + dutycycle 2 notetype 12, 129 note __, 2 - unknownmusic0xe0 0, $4C + slidepitchto 1, 4, B_ note B_, 2 - unknownmusic0xe0 0, $55 + slidepitchto 1, 5, E_ note B_, 2 - unknownmusic0xe0 0, $45 + slidepitchto 1, 4, E_ note E_, 2 note __, 4 - unknownmusic0xe0 0, $3C + slidepitchto 1, 3, B_ note E_, 4 - unknownmusic0xe0 0, $4C + slidepitchto 1, 4, B_ note B_, 4 endchannel Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4) - fdutycycle 2 + dutycycle 2 notetype 12, 195 octave 4 note B_, 4 diff --git a/crysaudio/music/RBY/pokemontower.asm b/crysaudio/music/RBY/pokemontower.asm index f152ddb6..da595df6 100644 --- a/crysaudio/music/RBY/pokemontower.asm +++ b/crysaudio/music/RBY/pokemontower.asm @@ -408,7 +408,7 @@ Music_PokemonTower_branch_7f1a2: note G_, 1 note __, 15 notetype 12, $1f - db $f3, $21, $E2, $33, $28, $E1, $22, $FF, $22, $F7, $24, $22, $F7, $34, $24, $F7, $44 + load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 2, 2, 15, 7, 2, 4, 2, 2, 15, 7, 3, 4, 2, 4, 15, 7, 4, 4 octave 4 note F#, 1 note __, 3 diff --git a/crysaudio/music/RBY/safarizone.asm b/crysaudio/music/RBY/safarizone.asm index d2fd5714..917c6e4b 100644 --- a/crysaudio/music/RBY/safarizone.asm +++ b/crysaudio/music/RBY/safarizone.asm @@ -4,20 +4,20 @@ Music_SafariZone: dbw $02, Music_SafariZone_Ch3 Music_SafariZone_Ch1: ; bc2e (2:7c2e) - ftempo 132 + tempo 132 volume 119 vibrato 6, 52 dutycycle 2 notetype 12, 146 octave 3 - unknownmusic0xe0 0, $4A + slidepitchto 1, 4, A_ note C_, 1 - unknownmusic0xe0 0, $4A + slidepitchto 1, 4, A_ note G_, 1 - unknownmusic0xe0 0, $4A + slidepitchto 1, 4, A_ note C_, 1 - unknownmusic0xe0 0, $4A + slidepitchto 1, 4, A_ note G_, 1 note __, 4 dutycycle 3 diff --git a/crysaudio/music/RBY/titlescreen.asm b/crysaudio/music/RBY/titlescreen.asm index b09a53ac..2a9dff0d 100644 --- a/crysaudio/music/RBY/titlescreen.asm +++ b/crysaudio/music/RBY/titlescreen.asm @@ -5,7 +5,7 @@ Music_RBYTitleScreen: dbw $03, Music_RBYTitleScreen_Ch4 Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0) - ftempo 144 + tempo 144 volume 119 vibrato 9, 52 dutycycle 3 diff --git a/crysaudio/music/RBY/trainerbattle.asm b/crysaudio/music/RBY/trainerbattle.asm index fa307ca9..8efef03a 100644 --- a/crysaudio/music/RBY/trainerbattle.asm +++ b/crysaudio/music/RBY/trainerbattle.asm @@ -4,7 +4,7 @@ Music_TrainerBattle: dbw $02, Music_TrainerBattle_Ch3 Music_TrainerBattle_Ch1: - ftempo 112 + tempo 112 volume 119 dutycycle 3 vibrato $6, $34 diff --git a/crysaudio/music/RBY/wildbattle.asm b/crysaudio/music/RBY/wildbattle.asm index 7c0f9f4e..70fd2f69 100644 --- a/crysaudio/music/RBY/wildbattle.asm +++ b/crysaudio/music/RBY/wildbattle.asm @@ -4,7 +4,7 @@ Music_WildBattle: dbw $02, Music_WildBattle_Ch3 Music_WildBattle_Ch1: - ftempo 104 + tempo 104 volume 119 dutycycle 3 vibrato $6, $34 diff --git a/crysaudio/music/RBY/yellowintro.asm b/crysaudio/music/RBY/yellowintro.asm index e4dc8650..4b3e56e9 100644 --- a/crysaudio/music/RBY/yellowintro.asm +++ b/crysaudio/music/RBY/yellowintro.asm @@ -4,7 +4,7 @@ Music_YellowIntro: dbw $02, Music_YellowIntro_Ch3 Music_YellowIntro_Ch1: - ftempo 116 + tempo 116 volume 119 dutycycle 3 vibrato $8, $14 diff --git a/crysaudio/music/RBY/yellowunusedsong.asm b/crysaudio/music/RBY/yellowunusedsong.asm index f6175716..a72ecd39 100644 --- a/crysaudio/music/RBY/yellowunusedsong.asm +++ b/crysaudio/music/RBY/yellowunusedsong.asm @@ -5,7 +5,7 @@ Music_YellowUnusedSong: dbw $03, Music_YellowUnusedSong_Ch4 Music_YellowUnusedSong_Ch1: - ftempo 140 + tempo 140 volume 119 dutycycle 3 vibrato $8, $14 diff --git a/crysaudio/music/RSE/frontierbrain.asm b/crysaudio/music/RSE/frontierbrain.asm deleted file mode 100644 index 5fc23bf8..00000000 --- a/crysaudio/music/RSE/frontierbrain.asm +++ /dev/null @@ -1,2418 +0,0 @@ -Music_FrontierBrain: - dbw $80, Music_FrontierBrain_Ch1 - dbw $01, Music_FrontierBrain_Ch2 - dbw $02, Music_FrontierBrain_Ch3 - -Music_FrontierBrain_Ch1: - ftempo $62 - volume $77 - notetype $4, 194 - dutycycle 1 - tone $0002 - note __, 12 - octave 3 - note B_, 4 - octave 4 - note F_, 4 - note B_, 4 - octave 3 - note A#, 4 - octave 4 - note E_, 4 - note A#, 4 - octave 3 - note A_, 4 - octave 4 - note D#, 4 - note A_, 4 - octave 3 - note G#, 4 - octave 4 - note D_, 4 - note G#, 4 - octave 3 - note G_, 4 - octave 4 - note C#, 4 - note G_, 4 - octave 3 - note F#, 4 - octave 4 - note C_, 4 - note F#, 4 - octave 3 - note F_, 4 - note B_, 4 - octave 4 - note F_, 4 -Music_FrontierBrain_Loop1: - intensity 226 - note E_, 3 - note F_, 3 - note E_, 3 - note D_, 3 - note A_, 6 - octave 3 - note A_, 6 - intensity 178 - octave 4 - note A_, 6 - octave 3 - note A_, 6 - intensity 114 - octave 4 - note A_, 6 - octave 3 - note A_, 6 - intensity 82 - octave 4 - note A_, 6 - octave 3 - note A_, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 6 - intensity 209 - octave 4 - note A_, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - intensity 225 - note E_, 3 - note F_, 3 - note E_, 3 - note D_, 3 - intensity 226 - note A_, 6 - octave 3 - note A_, 6 - intensity 178 - octave 4 - note A_, 6 - octave 3 - note A_, 6 - intensity 114 - octave 4 - note A_, 6 - octave 3 - note A_, 6 - intensity 82 - octave 4 - note A_, 6 - octave 3 - note A_, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 6 - intensity 209 - octave 4 - note G#, 4 - note G#, 2 - note G#, 2 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 4 - note G#, 4 - intensity 225 - note G#, 3 - note A_, 3 - note G#, 3 - note F#, 3 - intensity 226 - note B_, 6 - octave 3 - note B_, 6 - intensity 178 - octave 4 - note B_, 6 - octave 3 - note B_, 6 - intensity 114 - octave 4 - note B_, 6 - octave 3 - note B_, 6 - intensity 82 - octave 4 - note B_, 6 - octave 3 - note B_, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 6 - intensity 226 - dutycycle 2 - note B_, 2 - octave 4 - note D#, 2 - note F#, 2 - note A_, 2 - note B_, 2 - octave 5 - note C#, 2 - note D#, 2 - note F#, 2 - note A_, 2 - note B_, 2 - octave 6 - note C#, 2 - note D#, 2 - note F#, 2 - note D#, 2 - note C#, 2 - octave 5 - note B_, 2 - note A_, 2 - note F#, 2 - note D#, 2 - note C#, 2 - octave 4 - note B_, 2 - note A_, 2 - note F#, 2 - note D#, 8 - intensity 228 - dutycycle 1 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - note E_, 12 - note E_, 16 - note __, 2 - note E_, 12 - octave 3 - note B_, 3 - octave 4 - note C#, 3 - octave 3 - note B_, 3 - note A_, 3 - octave 4 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - note E_, 12 - octave 3 - note B_, 3 - octave 4 - note C#, 3 - octave 3 - note B_, 3 - note G#, 9 - octave 4 - note E_, 12 - octave 3 - note B_, 6 - octave 4 - note E_, 6 - octave 3 - note B_, 6 - note G#, 6 - octave 4 - note E_, 12 - note G#, 6 - note E_, 6 - note B_, 6 - note G#, 6 - intensity 212 - octave 5 - note E_, 6 - intensity 228 - octave 4 - note B_, 6 - octave 5 - note G#, 6 - intensity 226 - dutycycle 2 - octave 4 - note E_, 3 - note G_, 3 - note B_, 3 - octave 5 - note E_, 3 - note F#, 3 - note E_, 3 - octave 4 - note B_, 3 - note G_, 3 - note B_, 3 - note G_, 3 - note B_, 3 - octave 5 - note E_, 3 - note F#, 3 - note E_, 3 - octave 4 - note B_, 3 - note G_, 3 - note B_, 3 - note G_, 3 - note B_, 3 - octave 5 - note E_, 3 - note F#, 3 - note G_, 3 - note F#, 3 - note E_, 3 - octave 4 - note B_, 3 - octave 5 - note E_, 3 - octave 4 - note B_, 3 - note G_, 3 - note E_, 3 - octave 3 - note B_, 3 - octave 4 - note E_, 3 - note G_, 3 - note E_, 3 - note G#, 3 - note B_, 3 - octave 5 - note E_, 3 - note F#, 3 - note E_, 3 - octave 4 - note B_, 3 - note G#, 3 - note E_, 3 - note G#, 3 - note B_, 3 - octave 5 - note E_, 3 - note F#, 3 - note E_, 3 - octave 4 - note B_, 3 - note G_, 3 - note E_, 3 - note G#, 3 - note B_, 3 - octave 5 - note E_, 3 - note G#, 3 - note B_, 3 - note G#, 3 - note E_, 3 - octave 4 - note B_, 3 - note G#, 3 - note E_, 3 - octave 5 - note E_, 3 - octave 4 - note B_, 3 - octave 5 - note E_, 3 - note F#, 3 - note G#, 3 - octave 6 - note C_, 3 - octave 5 - note A_, 3 - note G_, 3 - note E_, 3 - note C_, 3 - octave 4 - note A_, 3 - note G_, 3 - note E_, 3 - note C_, 3 - octave 3 - note G_, 3 - octave 4 - note C_, 3 - note E_, 3 - note G_, 3 - octave 5 - note C_, 3 - octave 4 - note G_, 3 - note E_, 3 - octave 3 - note B_, 3 - octave 4 - note D#, 3 - note F#, 3 - note A_, 3 - note B_, 3 - octave 5 - note D#, 3 - octave 4 - note B_, 3 - note F#, 3 - note D#, 3 - note F#, 3 - note B_, 3 - octave 5 - note D#, 3 - note F#, 3 - note D#, 3 - octave 4 - note B_, 3 - note F#, 3 - note C#, 3 - note E_, 3 - note G_, 3 - note G#, 3 - octave 5 - note C#, 3 - note D#, 3 - note E_, 3 - note D#, 3 - note C#, 3 - octave 4 - note G#, 3 - note F#, 3 - note E_, 3 - note C#, 3 - octave 3 - note G#, 3 - note F#, 3 - note E_, 16 - note __, 16 - note __, 13 - intensity 228 - dutycycle 1 - octave 2 - note A_, 3 - octave 3 - note C_, 3 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - octave 2 - note B_, 12 - octave 3 - note D_, 12 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note D_, 12 - octave 2 - note B_, 12 - octave 3 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - octave 2 - note B_, 12 - octave 3 - note D_, 12 - octave 2 - note B_, 16 - note __, 2 - note B_, 16 - note __, 2 - note B_, 16 - note __, 2 - note F#, 16 - note __, 2 - note B_, 12 - octave 3 - note D#, 12 - octave 2 - note B_, 16 - note __, 2 - note B_, 16 - note __, 2 - note B_, 12 - note B_, 16 - note __, 2 - note B_, 16 - note __, 2 - octave 3 - note C_, 12 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note C#, 16 - note __, 2 - note D_, 12 - octave 2 - note B_, 12 - dutycycle 0 - octave 4 - note G#, 6 - note G#, 12 - note G#, 12 - note G#, 12 - note G#, 12 - note G#, 12 - note G#, 6 - note A_, 12 - note G#, 12 - note G_, 6 - note C#, 6 - octave 3 - note G_, 6 - octave 4 - note D_, 6 - note C#, 6 - octave 3 - note G_, 6 - note E_, 6 - octave 4 - note G_, 6 - note F#, 6 - note C#, 6 - octave 3 - note F#, 6 - octave 4 - note C#, 6 - octave 3 - note B_, 6 - note F_, 6 - octave 2 - note B_, 6 - octave 3 - note F#, 6 - octave 4 - note G_, 4 - octave 3 - note B_, 4 - note G_, 4 - octave 4 - note F#, 4 - octave 3 - note A#, 4 - note F#, 4 - octave 4 - note F_, 4 - octave 3 - note A_, 4 - note F_, 4 - octave 4 - note E_, 4 - octave 3 - note G#, 4 - note E_, 4 - intensity 180 - octave 4 - note G_, 3 - note F#, 3 - note F_, 3 - note E_, 3 - note D#, 3 - note D_, 3 - note C#, 3 - note C_, 3 - octave 3 - note B_, 3 - note A#, 3 - note A_, 3 - note G#, 3 - note G_, 3 - note F#, 3 - note E_, 3 - note D_, 9 - intensity 228 - dutycycle 1 - octave 4 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - note C_, 12 - note C_, 16 - note __, 2 - note C_, 12 - octave 3 - note G_, 3 - note A_, 3 - note G_, 3 - note F_, 3 - octave 4 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - note C_, 12 - octave 3 - note G_, 3 - note A_, 3 - note G_, 3 - note E_, 9 - octave 4 - note C_, 12 - octave 3 - note G_, 6 - octave 4 - note C_, 6 - octave 3 - note G_, 6 - note E_, 6 - octave 4 - note C_, 12 - note E_, 6 - note C_, 6 - note G_, 6 - note E_, 6 - intensity 212 - octave 5 - note C_, 6 - intensity 228 - octave 4 - note G_, 6 - intensity 212 - octave 5 - note E_, 6 - intensity 226 - dutycycle 2 - octave 4 - note C_, 3 - note D#, 3 - note G_, 3 - octave 5 - note C_, 3 - note D_, 3 - note C_, 3 - octave 4 - note G_, 3 - note D#, 3 - note G_, 3 - note D#, 3 - note G_, 3 - octave 5 - note C_, 3 - note D_, 3 - note C_, 3 - octave 4 - note G_, 3 - note D#, 3 - note G_, 3 - note D#, 3 - note G_, 3 - octave 5 - note C_, 3 - note D_, 3 - note D#, 3 - note D_, 3 - note C_, 3 - octave 4 - note G_, 3 - octave 5 - note C_, 3 - octave 4 - note G_, 3 - note D#, 3 - note C_, 3 - octave 3 - note G_, 3 - octave 4 - note C_, 3 - note D#, 3 - note C_, 3 - note E_, 3 - note G_, 3 - octave 5 - note C_, 3 - note D_, 3 - note C_, 3 - octave 4 - note G_, 3 - note E_, 3 - note C_, 3 - note E_, 3 - note G_, 3 - octave 5 - note C_, 3 - note D_, 3 - note C_, 3 - octave 4 - note G_, 3 - note D#, 3 - note C_, 3 - note E_, 3 - note G_, 3 - octave 5 - note C_, 3 - note E_, 3 - note G_, 3 - note E_, 3 - note C_, 3 - octave 4 - note G_, 3 - note E_, 3 - note C_, 3 - octave 5 - note C_, 3 - octave 4 - note G_, 3 - octave 5 - note C_, 3 - note D_, 3 - note E_, 3 - note G#, 3 - note F_, 3 - note D#, 3 - note C_, 3 - octave 4 - note G#, 3 - note F_, 3 - note D#, 3 - note C_, 3 - octave 3 - note G#, 3 - note D#, 3 - note G#, 3 - octave 4 - note C_, 3 - note D#, 3 - note G#, 3 - note D#, 3 - note C_, 3 - octave 3 - note G_, 3 - note B_, 3 - octave 4 - note D_, 3 - note F_, 3 - note G_, 3 - note B_, 3 - note G_, 3 - note D_, 3 - octave 3 - note B_, 3 - octave 4 - note D_, 3 - note G_, 3 - note B_, 3 - octave 5 - note D_, 3 - octave 4 - note B_, 3 - note G_, 3 - note D_, 16 - note __, 16 - note __, 16 - note __, 16 - note __, 11 - intensity 215 - dutycycle 1 - octave 3 - note A_, 4 - note __, 5 - note F_, 2 - note __, 1 - octave 4 - note C_, 16 - note __, 16 - note __, 4 - note D_, 12 - note F_, 3 - note G_, 3 - note F_, 3 - note D_, 3 - octave 3 - note B_, 16 - note __, 8 - note G_, 3 - note A_, 3 - note G_, 3 - note F#, 3 - note G_, 16 - note __, 14 - note G_, 2 - note __, 1 - note G_, 2 - note __, 1 - note G_, 16 - note __, 16 - note __, 16 - note B_, 4 - note __, 5 - note G_, 2 - note __, 1 - octave 4 - note D_, 16 - note __, 16 - note __, 4 - note D#, 16 - note __, 8 - note E_, 16 - note __, 16 - note __, 4 - intensity 231 - dutycycle 0 - note C#, 3 - note __, 1 - note C#, 3 - note __, 1 - note C#, 3 - note __, 1 - note C#, 16 - octave 3 - note B_, 3 - note __, 1 - note B_, 3 - note __, 1 - note B_, 16 - note __, 8 - intensity 215 - dutycycle 1 - note F_, 4 - note __, 5 - note C_, 2 - note __, 1 - note A_, 12 - octave 4 - note C_, 4 - note __, 5 - octave 3 - note A_, 2 - note __, 1 - octave 4 - note F_, 16 - note __, 16 - note __, 16 - note __, 6 - note C_, 6 - octave 3 - note F#, 4 - note __, 5 - note C_, 2 - note __, 1 - note A_, 12 - octave 4 - note C_, 4 - note __, 5 - octave 3 - note A_, 2 - note __, 1 - octave 4 - note F#, 16 - note __, 16 - note __, 4 - intensity 231 - octave 5 - note C_, 16 - note __, 8 - intensity 194 - octave 3 - note B_, 4 - octave 4 - note F_, 4 - note B_, 4 - octave 3 - note A#, 4 - octave 4 - note E_, 4 - note A#, 4 - octave 3 - note A_, 4 - octave 4 - note D#, 4 - note A_, 4 - octave 3 - note G#, 4 - octave 4 - note D_, 4 - note G#, 4 - octave 3 - note G_, 4 - octave 4 - note C#, 4 - note G_, 4 - octave 3 - note F#, 4 - octave 4 - note C_, 4 - note F#, 4 - octave 3 - note F_, 4 - note B_, 4 - octave 4 - note F_, 4 - loopchannel 0, Music_FrontierBrain_Loop1 -Music_FrontierBrain_Ch2: - notetype $4, 228 - dutycycle 3 - tone $0001 - octave 3 - note B_, 4 - octave 4 - note F_, 4 - note B_, 4 - octave 5 - note D_, 12 - note C#, 12 - note C_, 12 - octave 4 - note B_, 12 - note A#, 12 - note A_, 12 - note G#, 12 -Music_FrontierBrain_Loop2: - note __, 16 - note __, 8 - intensity 244 - octave 2 - note A_, 6 - note G#, 12 - note B_, 6 - octave 3 - note C_, 16 - note __, 2 - note D_, 6 - note D#, 12 - octave 2 - note B_, 6 - octave 3 - note C_, 6 - octave 2 - note A_, 3 - octave 3 - note C_, 3 - octave 2 - note A#, 6 - octave 3 - note D#, 16 - note __, 2 - note D_, 12 - note C_, 12 - octave 2 - note B_, 6 - note A_, 6 - note G#, 6 - note B_, 6 - note E_, 6 - note F_, 6 - note E_, 6 - note D#, 3 - note F_, 3 - note E_, 6 - note E_, 6 - note F_, 6 - note A_, 6 - note G#, 12 - note B_, 6 - octave 3 - note C_, 16 - note __, 2 - note D#, 6 - note F_, 12 - note D_, 6 - note D#, 6 - note C_, 3 - note D_, 3 - note C#, 6 - note G_, 16 - note __, 2 - note F_, 12 - note D#, 12 - octave 2 - note B_, 6 - note A_, 6 - note G#, 6 - note B_, 6 - note E_, 6 - note F_, 6 - note E_, 6 - note D#, 6 - note E_, 16 - note __, 2 - intensity 183 - octave 3 - note E_, 12 - note __, 12 - note F_, 12 - note __, 12 - note F#, 12 - note __, 12 - note G_, 12 - note __, 6 - note E_, 6 - note __, 6 - note F_, 6 - note __, 6 - note F#, 6 - note __, 6 - note G_, 6 - note __, 6 - note G#, 6 - note __, 6 - note A_, 6 - note __, 6 - note A#, 6 - note __, 6 - note B_, 6 - note __, 6 - intensity 247 - octave 4 - note E_, 16 - note __, 2 - note F#, 6 - note __, 6 - note G#, 6 - note __, 6 - note A_, 6 - note G#, 16 - note __, 2 - note A_, 6 - note __, 6 - note B_, 12 - notetype $8, 247 - note G#, 16 - note __, 8 - note E_, 16 - note __, 8 - notetype $4, 247 - note __, 6 - note E_, 16 - note __, 2 - note F#, 6 - note __, 6 - note G#, 12 - note A_, 6 - note G#, 12 - note A_, 6 - note __, 6 - note B_, 16 - note __, 2 - intensity 226 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - intensity 229 - octave 3 - note B_, 16 - note __, 2 - intensity 226 - octave 4 - note E_, 12 - octave 3 - note B_, 12 - octave 4 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - intensity 229 - octave 3 - note B_, 16 - note __, 2 - intensity 226 - octave 4 - note E_, 12 - note F#, 12 - note E_, 16 - note __, 2 - note E_, 16 - note __, 2 - note D#, 6 - note C#, 12 - intensity 229 - note D#, 16 - note __, 2 - note E_, 6 - note __, 6 - note F#, 12 - notetype $C, 229 - note G#, 16 - notetype $4, 229 - note __, 16 - note __, 16 - note __, 10 - intensity 226 - octave 3 - note C#, 3 - note G_, 3 - note G#, 16 - note __, 2 - note G#, 16 - note __, 2 - note G#, 16 - note __, 2 - note G#, 16 - note __, 2 - note F#, 12 - note A_, 12 - note G#, 16 - note __, 2 - note G#, 16 - note __, 2 - note G#, 16 - note __, 2 - note G#, 16 - note __, 2 - note A_, 12 - note F#, 6 - intensity 231 - octave 4 - note E_, 3 - note F#, 3 - note G#, 6 - note C#, 12 - octave 5 - note C#, 16 - note __, 2 - note E_, 16 - note __, 2 - octave 4 - note E_, 3 - note F#, 3 - note G#, 12 - note F#, 12 - note E_, 12 - note D#, 6 - note E_, 6 - note D#, 6 - note C#, 6 - notetype $C, 231 - note D#, 16 - notetype $4, 231 - note __, 16 - note __, 2 - note D#, 3 - note E_, 3 - note F#, 6 - octave 3 - note B_, 12 - octave 4 - note B_, 16 - note __, 2 - octave 5 - note D#, 16 - note __, 2 - octave 4 - note D#, 3 - note E_, 3 - note F#, 12 - note B_, 12 - note A_, 12 - note G#, 6 - note A_, 6 - note G#, 6 - note F#, 6 - notetype $C, 231 - note G#, 16 - notetype $4, 231 - note __, 16 - note __, 2 - intensity 229 - dutycycle 0 - note G#, 3 - note B_, 3 - octave 5 - note C#, 6 - note C#, 12 - note C#, 12 - note C#, 12 - note C#, 12 - note C#, 12 - note C#, 6 - note E_, 12 - note D#, 12 - note D_, 16 - note __, 8 - note C#, 16 - note __, 8 - note C_, 16 - note __, 8 - octave 4 - note B_, 16 - note __, 8 - octave 5 - note D_, 12 - note C#, 12 - note C_, 12 - octave 4 - note B_, 12 - octave 5 - note D_, 3 - note C#, 3 - note C_, 3 - octave 4 - note B_, 3 - note A#, 3 - note A_, 3 - note G#, 3 - note G_, 3 - note F#, 3 - note F_, 3 - note E_, 3 - note D#, 3 - note D_, 3 - note C#, 3 - octave 3 - note B_, 3 - note G_, 3 - note __, 6 - intensity 231 - dutycycle 3 - octave 4 - note C_, 16 - note __, 2 - note D_, 6 - note __, 6 - note E_, 6 - note __, 6 - note F_, 6 - note E_, 16 - note __, 2 - note F_, 6 - note __, 6 - note G_, 12 - notetype $8, 231 - note E_, 16 - note __, 8 - note C_, 16 - note __, 8 - notetype $4, 231 - note __, 6 - note C_, 16 - note __, 2 - note D_, 6 - note __, 6 - note E_, 12 - note F_, 6 - note E_, 12 - note F_, 6 - note __, 6 - note G_, 16 - note __, 2 - intensity 226 - octave 5 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - intensity 229 - octave 4 - note G_, 16 - note __, 2 - intensity 226 - octave 5 - note C_, 12 - octave 4 - note G_, 12 - octave 5 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - intensity 229 - octave 4 - note G_, 16 - note __, 2 - intensity 226 - octave 5 - note C_, 12 - note D_, 12 - note C_, 16 - note __, 2 - note C_, 16 - note __, 2 - octave 4 - note B_, 6 - note A_, 12 - intensity 229 - note B_, 16 - note __, 2 - octave 5 - note C_, 12 - notetype $8, 229 - note D_, 16 - notetype $4, 229 - note __, 16 - note __, 3 - intensity 241 - octave 4 - note A_, 3 - note B_, 3 - octave 5 - note C_, 3 - note E_, 9 - octave 4 - note A_, 3 - notetype $8, 247 - note A_, 16 - notetype $4, 247 - note __, 4 - octave 5 - note E_, 12 - note D_, 12 - note C_, 12 - note D_, 12 - octave 4 - note B_, 3 - octave 5 - note C_, 3 - octave 4 - note B_, 3 - note A_, 3 - notetype $C, 247 - note B_, 16 - notetype $4, 247 - note __, 16 - note __, 11 - intensity 241 - note G_, 3 - note A_, 3 - note B_, 3 - octave 5 - note D_, 9 - octave 4 - note G_, 3 - intensity 247 - note G_, 16 - note __, 16 - note __, 4 - note B_, 12 - note G_, 12 - octave 5 - note G_, 12 - note F_, 12 - note E_, 3 - note F_, 3 - note E_, 3 - note D_, 3 - note E_, 16 - note __, 8 - intensity 215 - dutycycle 2 - octave 4 - note A_, 2 - note __, 2 - note A_, 2 - note __, 2 - note A_, 2 - note __, 2 - note A_, 16 - note G_, 2 - note __, 2 - note G_, 2 - note __, 2 - note G_, 12 - intensity 241 - dutycycle 3 - note A_, 4 - note B_, 4 - octave 5 - note C_, 4 - note E_, 9 - octave 4 - note A_, 3 - intensity 247 - note A_, 16 - note __, 16 - note __, 4 - intensity 231 - octave 3 - note F_, 6 - note C_, 12 - note F_, 12 - note A_, 6 - intensity 241 - octave 4 - note A_, 4 - note B_, 4 - octave 5 - note C_, 4 - note E_, 9 - octave 4 - note A_, 3 - notetype $8, 247 - note A_, 16 - notetype $4, 247 - note __, 4 - intensity 231 - octave 3 - note F#, 6 - note C_, 12 - note F#, 12 - note A_, 12 - octave 4 - note C_, 6 - octave 5 - notetype $C, 231 - note D_, 16 - notetype $4, 231 - note __, 16 - note __, 16 - note __, 4 - loopchannel 0, Music_FrontierBrain_Loop2 -Music_FrontierBrain_Ch3: - notetype $4, 20 - note __, 12 - octave 2 - note F#, 4 - octave 3 - note C_, 4 - note F#, 4 - octave 2 - note F_, 4 - note B_, 4 - octave 3 - note F_, 4 - octave 2 - note E_, 4 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note D#, 4 - note A_, 4 - octave 3 - note D#, 4 - octave 2 - note D_, 4 - note G#, 4 - octave 3 - note D_, 4 - octave 2 - note C#, 4 - note G_, 4 - octave 3 - note C#, 4 - octave 2 - note C_, 4 - note F#, 4 - octave 3 - note C_, 4 -Music_FrontierBrain_Loop3: - octave 2 - note B_, 3 - octave 3 - note C_, 3 - octave 2 - note B_, 3 - note A#, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note B_, 6 - octave 3 - note D#, 3 - note D_, 3 - note C_, 6 - octave 2 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 9 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - octave 3 - note C_, 3 - note __, 3 - note D_, 6 - note D#, 3 - note D_, 3 - octave 2 - note A#, 9 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note B_, 6 - octave 3 - note D#, 3 - note D_, 3 - note C_, 6 - octave 2 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 9 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - note A_, 3 - note __, 3 - octave 3 - note C_, 3 - note __, 3 - note D_, 6 - note D#, 3 - note D_, 3 - octave 2 - note A#, 6 - note E_, 4 - note __, 2 - note E_, 4 - note __, 2 - octave 3 - note E_, 12 - octave 2 - note E_, 4 - note __, 2 - note E_, 4 - note __, 2 - octave 3 - note F_, 12 - octave 2 - note E_, 4 - note __, 2 - note E_, 4 - note __, 2 - octave 3 - note F#, 12 - octave 2 - note E_, 4 - note __, 2 - note E_, 4 - note __, 2 - octave 3 - note G_, 12 - octave 2 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note F_, 6 - octave 2 - note E_, 6 - octave 3 - note F#, 6 - octave 2 - note E_, 6 - octave 3 - note G_, 6 - octave 2 - note E_, 6 - octave 3 - note G#, 6 - octave 2 - note E_, 6 - octave 3 - note A_, 6 - octave 2 - note E_, 6 - octave 3 - note A#, 6 - octave 2 - note E_, 6 - octave 3 - note B_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 3 - note D#, 3 - note E_, 6 - octave 2 - note E_, 3 - note __, 3 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note B_, 6 - note E_, 6 - octave 3 - note E_, 3 - octave 2 - note B_, 3 - note G#, 3 - note F#, 3 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 3 - note D#, 3 - note E_, 6 - octave 2 - note E_, 3 - note __, 3 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note B_, 6 - note E_, 6 - octave 3 - note E_, 3 - octave 2 - note B_, 3 - note G#, 3 - note F#, 3 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note E_, 6 - octave 3 - note E_, 3 - note D#, 3 - note E_, 6 - octave 2 - note E_, 3 - note __, 3 - note E_, 6 - octave 3 - note E_, 6 - octave 2 - note B_, 6 - note E_, 6 - octave 3 - note E_, 3 - octave 2 - note B_, 3 - note G#, 3 - note F#, 3 - note D_, 6 - octave 3 - note D_, 6 - octave 2 - note D_, 6 - octave 3 - note D_, 6 - octave 2 - note D_, 6 - octave 3 - note D_, 6 - octave 2 - note D_, 6 - octave 3 - note D_, 3 - note C#, 3 - note D_, 6 - octave 2 - note D_, 6 - note D_, 6 - octave 3 - note D_, 6 - octave 2 - note A_, 6 - note D_, 6 - octave 3 - note D_, 3 - octave 2 - note A_, 3 - note F#, 3 - note E_, 3 - note C#, 6 - octave 3 - note C#, 6 - octave 2 - note C#, 6 - octave 3 - note C#, 6 - octave 2 - note C#, 6 - octave 3 - note C#, 6 - octave 2 - note C#, 6 - octave 3 - note C#, 3 - note C_, 3 - note C#, 6 - octave 2 - note C#, 6 - note C#, 6 - octave 3 - note C#, 6 - octave 2 - note G#, 6 - note C#, 6 - octave 3 - note C#, 3 - octave 2 - note G#, 3 - note F_, 3 - note D#, 3 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 3 - octave 2 - note B_, 3 - note B_, 6 - octave 1 - note B_, 6 - note B_, 6 - octave 2 - note B_, 6 - note F#, 6 - octave 1 - note B_, 6 - octave 2 - note B_, 3 - note F#, 3 - note D#, 3 - note C#, 3 - note C#, 6 - note G#, 6 - note C#, 6 - note G#, 6 - note C#, 6 - note G_, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - note C#, 6 - note G_, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - note E_, 6 - note F#, 6 - note E_, 3 - note D_, 3 - octave 1 - note B_, 6 - octave 2 - note C#, 6 - note G#, 6 - note C#, 6 - note G#, 6 - note C#, 6 - note G_, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - note C#, 6 - note G_, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - note E_, 6 - note F#, 6 - note E_, 3 - note D_, 3 - octave 1 - note B_, 6 - octave 2 - note C#, 6 - note G#, 6 - note C#, 6 - note G#, 6 - note C#, 6 - note G_, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - note C#, 6 - note G_, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - note E_, 6 - note F#, 6 - note E_, 3 - note D_, 3 - octave 1 - note B_, 6 - octave 2 - note C#, 6 - note G_, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - note E_, 6 - note F#, 6 - note D_, 6 - octave 1 - note B_, 6 - octave 2 - note C#, 6 - note G#, 6 - note C#, 6 - note G#, 6 - note C#, 6 - note G_, 6 - octave 3 - note D_, 6 - octave 2 - note G_, 6 - octave 1 - note B_, 6 - octave 2 - note F#, 6 - note B_, 6 - note F_, 6 - note D#, 6 - note E_, 6 - note D#, 3 - note C#, 3 - octave 1 - note A#, 6 - note B_, 6 - octave 2 - note F#, 6 - octave 1 - note B_, 6 - octave 2 - note F#, 6 - octave 1 - note B_, 6 - octave 2 - note F_, 6 - note B_, 6 - note F_, 6 - octave 1 - note B_, 6 - octave 2 - note F#, 6 - note B_, 6 - note F#, 6 - note D_, 6 - note E_, 6 - note D#, 3 - note C#, 3 - octave 1 - note A#, 6 - note B_, 6 - octave 2 - note F#, 6 - octave 1 - note B_, 6 - octave 2 - note F#, 6 - octave 1 - note B_, 6 - octave 2 - note F_, 6 - note B_, 6 - note F_, 6 - note C#, 6 - note G#, 6 - octave 3 - note C#, 6 - octave 2 - note G#, 6 - note C#, 6 - note D_, 6 - octave 1 - note B_, 6 - octave 2 - note D_, 6 - note C#, 6 - note G#, 6 - note C#, 6 - note G#, 6 - note C#, 6 - note D_, 6 - octave 1 - note B_, 6 - octave 2 - note D_, 6 - note C#, 6 - note C#, 6 - note __, 6 - note C#, 6 - note __, 6 - note C#, 6 - note __, 6 - note C#, 6 - note __, 6 - note C#, 6 - note __, 6 - note C#, 6 - note C#, 6 - note __, 6 - note C#, 6 - note __, 6 - note G#, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - octave 3 - note C_, 6 - octave 2 - note F#, 6 - note B_, 6 - note F_, 6 - note A#, 6 - note E_, 6 - note A_, 6 - note D#, 6 - note G#, 6 - note D_, 6 - note G_, 6 - note C#, 6 - note F#, 6 - note G#, 6 - octave 3 - note C#, 6 - octave 2 - note G_, 6 - octave 3 - note C_, 6 - octave 2 - note F#, 6 - note B_, 6 - note F_, 6 - note A#, 6 - note E_, 6 - note A_, 6 - note D#, 6 - note G#, 6 - note D_, 6 - note G_, 6 - note C#, 6 - note F#, 6 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 3 - octave 2 - note B_, 3 - octave 3 - note C_, 6 - octave 2 - note C_, 3 - note __, 3 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note G_, 6 - note C_, 6 - octave 3 - note C_, 3 - octave 2 - note G_, 3 - note E_, 3 - note D_, 3 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 3 - octave 2 - note B_, 3 - octave 3 - note C_, 6 - octave 2 - note C_, 3 - note __, 3 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note G_, 6 - note C_, 6 - octave 3 - note C_, 3 - octave 2 - note G_, 3 - note E_, 3 - note D_, 3 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note C_, 6 - octave 3 - note C_, 3 - octave 2 - note B_, 3 - octave 3 - note C_, 6 - octave 2 - note C_, 3 - note __, 3 - note C_, 6 - octave 3 - note C_, 6 - octave 2 - note G_, 6 - note C_, 6 - octave 3 - note C_, 3 - octave 2 - note G_, 3 - note E_, 3 - note D_, 3 - octave 1 - note A#, 6 - octave 2 - note A#, 6 - octave 1 - note A#, 6 - octave 2 - note A#, 6 - octave 1 - note A#, 6 - octave 2 - note A#, 6 - octave 1 - note A#, 6 - octave 2 - note A#, 3 - note A_, 3 - note A#, 6 - octave 1 - note A#, 6 - note A#, 6 - octave 2 - note A#, 6 - note F_, 6 - octave 1 - note A#, 6 - octave 2 - note A#, 3 - note F_, 3 - note D_, 3 - note C_, 3 - octave 1 - note A_, 6 - octave 2 - note A_, 6 - octave 1 - note A_, 6 - octave 2 - note A_, 6 - octave 1 - note A_, 6 - octave 2 - note A_, 6 - octave 1 - note A_, 6 - octave 2 - note A_, 3 - note G#, 3 - note A_, 6 - octave 1 - note A_, 6 - note A_, 6 - octave 2 - note A_, 6 - note E_, 6 - octave 1 - note A_, 6 - octave 2 - note A_, 3 - note E_, 3 - note C#, 3 - octave 1 - note B_, 3 - note G#, 6 - octave 2 - note G#, 6 - octave 1 - note G#, 6 - octave 2 - note G#, 6 - octave 1 - note G#, 6 - octave 2 - note G#, 6 - octave 1 - note G#, 6 - octave 2 - note G#, 3 - note G_, 3 - note G_, 6 - octave 1 - note G_, 6 - note G_, 6 - octave 2 - note G_, 6 - note D_, 6 - octave 1 - note G_, 6 - octave 2 - note G_, 3 - note D_, 3 - octave 1 - note B_, 3 - note A_, 3 - octave 2 - note G_, 6 - note __, 6 - note D_, 6 - note __, 6 - octave 1 - note B_, 6 - note __, 6 - octave 2 - note D_, 6 - note __, 6 - note F_, 6 - octave 3 - note C_, 6 - note F_, 6 - note C_, 6 - octave 2 - note F_, 6 - octave 3 - note C_, 6 - note F_, 3 - note G_, 3 - note F_, 3 - note C_, 3 - note F_, 6 - octave 2 - note F_, 6 - note __, 6 - octave 3 - note C_, 6 - note __, 6 - note F_, 6 - note __, 6 - note A_, 6 - octave 2 - note F_, 6 - note B_, 6 - octave 3 - note G_, 6 - note D_, 6 - octave 2 - note B_, 6 - note A_, 6 - note B_, 3 - octave 3 - note D_, 3 - octave 2 - note B_, 3 - note A_, 3 - note G_, 6 - note D_, 6 - note __, 6 - note G_, 6 - note __, 6 - note B_, 6 - note __, 6 - octave 3 - note D_, 6 - octave 2 - note E_, 6 - note B_, 6 - octave 3 - note E_, 6 - octave 2 - note B_, 6 - note E_, 6 - note B_, 6 - octave 3 - note E_, 3 - note F_, 3 - note E_, 3 - octave 2 - note B_, 3 - note E_, 6 - octave 1 - note B_, 6 - note __, 6 - octave 2 - note E_, 6 - note __, 6 - note G#, 6 - note __, 6 - note B_, 6 - note A_, 6 - octave 3 - note C#, 6 - note A_, 6 - note E_, 6 - octave 2 - note A_, 6 - octave 3 - note E_, 6 - octave 4 - note C#, 3 - note D_, 3 - note C#, 3 - octave 3 - note A_, 3 - octave 2 - note A_, 6 - note E_, 6 - note __, 6 - note A_, 6 - note __, 6 - octave 3 - note C#, 6 - note __, 6 - note E_, 6 - octave 2 - note F_, 6 - octave 3 - note C_, 6 - note F_, 6 - note C_, 6 - octave 2 - note F_, 6 - octave 3 - note C_, 6 - note F_, 3 - note G_, 3 - note F_, 3 - note C_, 3 - note F_, 6 - octave 2 - note F_, 6 - note __, 6 - octave 3 - note C_, 6 - note __, 6 - note F_, 6 - note __, 6 - note A_, 6 - octave 2 - note F#, 6 - octave 3 - note E_, 6 - note F#, 6 - note C_, 6 - octave 2 - note F#, 6 - octave 3 - note C_, 6 - note F#, 3 - note G_, 3 - note F#, 3 - note C_, 3 - note F#, 6 - octave 2 - note A_, 6 - note __, 6 - octave 3 - note C_, 6 - note __, 6 - note E_, 6 - note __, 6 - note A_, 6 - octave 2 - note F#, 4 - octave 3 - note C_, 4 - note F#, 4 - octave 2 - note F_, 4 - note B_, 4 - octave 3 - note F_, 4 - octave 2 - note E_, 4 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note D#, 4 - note A_, 4 - octave 3 - note D#, 4 - octave 2 - note D_, 4 - note G#, 4 - octave 3 - note D_, 4 - octave 2 - note C#, 4 - note G_, 4 - octave 3 - note C#, 4 - octave 2 - note C_, 4 - note F#, 4 - octave 3 - note C_, 4 - loopchannel 0, Music_FrontierBrain_Loop3 diff --git a/crysaudio/music/TCG/battletheme1.asm b/crysaudio/music/TCG/battletheme1.asm deleted file mode 100644 index 48ca7a83..00000000 --- a/crysaudio/music/TCG/battletheme1.asm +++ /dev/null @@ -1,2019 +0,0 @@ - -Music_TCG_BattleTheme1: - dbw $c0, Music_TCG_BattleTheme1_Ch1 - dbw $01, Music_TCG_BattleTheme1_Ch2 - dbw $02, Music_TCG_BattleTheme1_Ch3 - dbw $03, Music_TCG_BattleTheme1_Ch4 - - -Music_TCG_BattleTheme1_Ch1: ; f532a (3d:532a) - stereopanning $f - tone $0002 - notetype $c, $b2 - forceoctave 2 - - tempo 20* 7 - ;musicdc 17 - vibrato 20, 8 - ;musice8 8 - dutycycle 2 -.MainLoop - octave 2 -rept 7 - note __, 16 -endr - note __, 9 -rept 2 - note __, 3 - callchannel Branch_f54f9 - volume 160 - tempo 20* 1 - note F_, 4 - note F#, 3 - ;no_fade - tempo 20* 7 - note F#, 1 - volume 55 - note F#, 1 - decoctave - volume 160 - note A_, 1 - note __, 2 - incoctave - volume 160 - note D_, 10 - volume 55 - note D_, 12 - callchannel Branch_f54f9 - volume 160 - note F#, 2 - volume 55 - note F#, 1 - volume 160 - note A_, 13 - volume 55 - note A_, 10 - volume 160 - note F#, 1 - volume 55 - note F#, 1 - volume 160 - note F#, 1 - note G_, 1 - note A_, 1 - volume 55 - note A_, 1 - volume 160 - tempo 20* 1 - note A#, 4 - note B_, 3 - ;no_fade - tempo 20* 7 - note B_, 15 - volume 55 - note B_, 4 - volume 160 - tempo 20* 1 - note A#, 4 - note B_, 3 - ;no_fade - tempo 20* 7 - note B_, 3 - note A_, 3 - volume 55 - note A_, 1 - volume 160 - note G_, 2 - volume 55 - note G_, 2 - volume 160 - tempo 20* 1 - note G#, 4 - note A_, 3 - ;no_fade - tempo 20* 7 - note A_, 15 - volume 55 - note A_, 4 - volume 160 - tempo 20* 1 - note G#, 4 - note A_, 3 - ;no_fade - tempo 20* 7 - note A_, 3 - note G_, 4 - note F#, 2 - volume 55 - note F#, 2 - volume 160 - tempo 20* 1 - note F#, 4 - note G_, 3 - ;no_fade - tempo 20* 7 - note G_, 15 - volume 55 - note G_, 4 - volume 160 - tempo 20* 1 - note F#, 4 - note G_, 3 - ;no_fade - tempo 20* 7 - note G_, 3 - note F#, 4 - note E_, 3 - volume 55 - note E_, 1 - volume 160 - tempo 20* 1 - note D#, 4 - note E_, 3 - ;no_fade - tempo 20* 7 - note E_, 1 - volume 55 - note E_, 1 - volume 160 - note D_, 13 - volume 55 - note D_, 9 - decoctave -endr - incoctave - dutycycle 1 - volume 160 - tempo 20* 1 - note C#, 4 - note D_, 3 - ;no_fade - tempo 20* 7 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C#, 1 - note __, 1 - callchannel Branch_f5538 - tempo 20* 1 - note G#, 4 - note A_, 3 - ;no_fade - tempo 20* 7 - note A_, 1 - volume 55 - note A_, 1 - volume 160 - note F#, 5 - volume 55 - note F#, 1 - decoctave - volume 160 - note A_, 1 - incoctave - tempo 20* 1 - note D_, 4 - volume 55 - note D_, 3 - volume 160 - note F#, 4 - volume 55 - note F#, 3 - volume 160 - note A_, 4 - volume 55 - note A_, 3 - tempo 20* 7 - note __, 3 - decoctave - dutycycle 1 - volume 160 - ;musice8 8 -rept 3 - note A_, 1 - note __, 2 -endr - incoctave - tempo 20* 1 - note C#, 4 - note D_, 3 - ;no_fade - tempo 20* 7 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note C#, 1 - note __, 1 - callchannel Branch_f5538 - tempo 20* 1 - note G#, 4 - note A_, 3 - ;no_fade - tempo 20* 7 - note A_, 5 - ;no_fade - note A_, 10 - ;no_fade - note A_, 6 - volume 55 - note A_, 2 - incoctave - volume 160 - tempo 20* 1 - note C#, 4 - note D_, 3 - ;no_fade - tempo 20* 7 - note D_, 2 - note C#, 1 - volume 55 - note C#, 2 - decoctave - volume 160 - note B_, 1 - volume 55 - note B_, 1 - volume 160 - tempo 20* 1 - note A#, 4 - note B_, 3 - ;no_fade - tempo 20* 7 - note B_, 1 - volume 55 - note B_, 1 - volume 160 - note A_, 13 - ;no_fade - note A_, 6 - volume 55 - note A_, 2 - decoctave - volume 121 - tempo 20* 1 - note A_, 5 - incoctave - note C#, 5 - note E_, 4 - note A_, 5 - incoctave - note C#, 5 - note E_, 4 - decoctave - note C#, 5 - note E_, 5 - note A_, 4 - incoctave - note C#, 5 - note E_, 5 - note A_, 4 - decoctave - callchannel Branch_f5580 - volume 160 - note A_, 2 - ;no_fade - note A_, 8 - ;no_fade - note A_, 8 - ;no_fade - note A_, 6 - dutycycle 1 - volume 160 - tempo 20* 1 - decoctave - note B_, 4 - incoctave - note C_, 3 - tempo 20* 7 - note C#, 1 - note __, 1 - note C#, 1 - note D_, 2 - note E_, 2 - note G_, 2 - dutycycle 2 - callchannel Branch_f5580 - volume 160 - tempo 20* 1 - note G#, 4 - note A_, 3 - ;no_fade - tempo 20* 7 - note A_, 5 - note G_, 2 - note F#, 2 - volume 55 - note F#, 2 - volume 160 - note E_, 2 - volume 55 - note E_, 2 - volume 160 - tempo 20* 1 - note F#, 4 - note G_, 3 - ;no_fade - tempo 20* 7 - note G_, 5 - note F#, 2 - note E_, 2 - volume 55 - note E_, 2 - volume 160 - note D_, 2 - volume 55 - note D_, 2 - volume 160 - note D_, 8 - ;no_fade - note D_, 8 - note D_, 8 - ;no_fade - note D_, 8 - volume 55 - note D_, 2 - volume 160 - note D_, 12 - volume 55 - note D_, 2 - volume 160 - note D_, 6 - ;no_fade - note D_, 8 - note __, 4 - loopchannel 0, .MainLoop - -Branch_f54f9: - octave 2 - volume 160 - note A_, 1 - note B_, 1 - incoctave - note D_, 1 - volume 55 - note D_, 1 - volume 160 - tempo 20* 1 - note F_, 4 - note F#, 3 - ;no_fade - tempo 20* 7 - note F#, 10 - volume 55 - note F#, 1 - volume 160 - note D_, 3 - volume 55 - note D_, 1 - volume 160 - tempo 20* 1 - note D#, 4 - note E_, 3 - ;no_fade - tempo 20* 7 - note E_, 5 - volume 55 - note E_, 2 - volume 160 - tempo 20* 1 - note F#, 4 - note G_, 3 - ;no_fade - tempo 20* 7 - note G_, 2 - note F#, 1 - volume 55 - note F#, 2 - volume 160 - note E_, 1 - volume 55 - note E_, 1 - endchannel - -Branch_f5538: - note C_, 1 - note __, 2 - decoctave - note G_, 1 - note __, 2 - note G_, 1 - note __, 2 - dutycycle 2 - volume 160 - note G_, 1 - incoctave - tempo 20* 1 - note C_, 4 - volume 55 - note C_, 3 - volume 160 - note E_, 4 - volume 55 - note E_, 3 - volume 160 - note G_, 4 - volume 55 - note G_, 3 - tempo 20* 7 - note __, 3 - dutycycle 1 - volume 160 - ;musice8 8 - decoctave -rept 3 - note G_, 1 - note __, 2 -endr - incoctave - dutycycle 2 - volume 160 - tempo 20* 1 - note A#, 4 - note B_, 3 - ;no_fade - tempo 20* 7 - note B_, 2 - note A_, 1 - volume 55 - note A_, 1 - volume 160 - note G_, 1 - volume 55 - note G_, 1 - volume 160 - endchannel - -Branch_f5580: - tempo 20* 1 - volume 160 - note F_, 4 - note F#, 3 - ;no_fade - tempo 20* 7 - note F#, 9 - volume 55 - note F#, 2 - volume 160 - note G_, 1 - volume 55 - note G_, 1 - volume 160 - note A_, 1 - volume 55 - note A_, 1 - volume 160 - note B_, 2 - volume 55 - note B_, 2 - incoctave - volume 160 - tempo 20* 1 - note F_, 4 - note F#, 3 - ;no_fade - tempo 20* 7 - note F#, 7 - note E_, 1 - volume 55 - note E_, 1 - volume 160 - note D_, 1 - volume 55 - note D_, 1 - volume 160 - note C#, 2 - volume 55 - note C#, 1 - decoctave - volume 160 - note A_, 9 - note F#, 1 - volume 55 - note F#, 1 - volume 160 - tempo 20* 1 - note A#, 4 - note B_, 3 - ;no_fade - tempo 20* 7 - note B_, 8 - volume 55 - note B_, 1 - volume 160 - note A_, 4 - note G_, 4 - note F#, 10 - note G_, 1 - volume 55 - note G_, 1 - volume 160 - note A_, 1 - volume 55 - note A_, 1 - volume 160 - note D_, 10 - note E_, 2 - note F#, 2 - volume 55 - note F#, 2 - endchannel - - -Music_TCG_BattleTheme1_Ch2: ; f55e7 (3d:55e7) - forceoctave 2 - stereopanning $f - tone $0001 - notetype $c, $c2 - tempo 20* 7 - ;musicdc 17 - vibrato $12, $15;vibrato 20, 8 - ;musice8 8 -.MainLoop - dutycycle 1 - volume 144 - octave 2 -rept 4 -rept 3 - note D_, 1 - note __, 2 -endr - note __, 1 - decoctave - note A_, 1 - note __, 1 - note A_, 1 - note B_, 1 - note __, 2 - incoctave -endr -rept 4 - octave 2 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note A_, 2 - callchannel Branch_f59f9 -endr - octave 2 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - incoctave - volume 162 - ;musice8 6 - note D_, 2 - callchannel Branch_f59f9 - octave 2 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - incoctave - volume 162 - ;musice8 6 - note C_, 2 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 3 - decoctave - note A_, 1 - note __, 1 - incoctave - dutycycle 2 - volume 162 - ;musice8 6 - note G_, 1 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note B_, 1 - note __, 2 - incoctave -rept 3 - octave 2 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - incoctave - volume 162 - ;musice8 6 - note D_, 2 - callchannel Branch_f59f9 -endr - octave 2 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - incoctave - volume 162 - ;musice8 6 - note C_, 2 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 3 - decoctave - note A_, 1 - note __, 1 - incoctave - dutycycle 2 - volume 162 - ;musice8 6 - note G_, 1 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note B_, 1 - note __, 2 - incoctave - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - incoctave - volume 162 - ;musice8 6 - note D_, 2 - callchannel Branch_f59f9 - octave 2 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - incoctave - volume 162 - ;musice8 6 - note D_, 2 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 3 - note D_, 1 - note __, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note A_, 2 - dutycycle 1 - volume 144 - ;musice8 8 - note F#, 1 - note __, 1 -rept 2 - note G_, 1 - note __, 2 - note G_, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note G_, 2 - dutycycle 1 - volume 144 - ;musice8 8 - note G_, 1 - note __, 3 - note D_, 1 - note __, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note G_, 1 - dutycycle 1 - volume 144 - ;musice8 8 - note E_, 1 - note __, 2 -endr - note F#, 1 - note __, 2 - note F#, 1 - dutycycle 2 - volume 162 - ;musice8 6 - incoctave - note C#, 2 - callchannel Branch_f5a17 - octave 2 - note F#, 1 - note __, 2 - note F#, 1 - incoctave - dutycycle 2 - volume 162 - ;musice8 6 - note E_, 2 - callchannel Branch_f5a17 - note E_, 1 - note __, 2 - note E_, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note G_, 2 - dutycycle 1 - volume 144 - ;musice8 8 - note E_, 1 - note __, 3 - note E_, 1 - note __, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note B_, 1 - dutycycle 1 - volume 144 - ;musice8 8 - note G_, 1 - note __, 2 - note A_, 1 - note __, 2 - note A_, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note G_, 2 - dutycycle 1 - volume 144 - ;musice8 8 - note A_, 1 - note __, 3 - note E_, 1 - note __, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note A_, 1 - dutycycle 1 - volume 144 - ;musice8 8 - note A_, 1 - note __, 2 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note A_, 2 - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 3 - decoctave - note A_, 1 - note __, 1 - incoctave - dutycycle 2 - volume 162 - ;musice8 6 - note A_, 1 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note B_, 1 - note __, 2 - incoctave - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note A_, 2 - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 3 - decoctave - note A_, 1 - note __, 1 - incoctave - dutycycle 2 - volume 112 - ;musice4 0 - note E_, 1 - note F#, 1 - note A_, 1 - note __, 1 - volume 112 - callchannel Branch_f594d - volume 112 - octave 3 - tempo 20* 1 - note C#, 4 - note D_, 3 - ;no_fade - tempo 20* 7 - note D_, 1 - note __, 1 - decoctave - note F#, 1 - volume 162 - ;musice8 6 - note F#, 2 - volume 112 - ;musice8 8 - note A_, 10 - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - volume 162 - ;musice8 6 - incoctave - note D_, 2 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 3 - decoctave - note A_, 1 - note __, 1 - incoctave - dutycycle 2 - volume 112 - note E_, 1 - note F#, 1 - note A_, 1 - note __, 1 - callchannel Branch_f594d - volume 112 - octave 3 - note D_, 2 - note __, 1 - note F#, 13 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 2 - note D_, 1 - dutycycle 2 - incoctave - volume 162 - ;musice8 6 - note D_, 2 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 3 - incoctave - dutycycle 2 - volume 112 - note D_, 1 - note __, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note __, 1 - tempo 20* 1 - note F#, 4 - note G_, 3 - ;no_fade - tempo 20* 7 - note G_, 15 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note G_, 1 - note __, 2 - note G_, 1 - incoctave - dutycycle 2 - volume 112 - tempo 20* 1 - note F#, 4 - note G_, 3 - ;no_fade - tempo 20* 7 - note G_, 2 - note __, 1 - note F#, 3 - note __, 1 - decoctave - volume 162 - ;musice8 6 - note G_, 1 - dutycycle 1 - volume 144 - ;musice8 8 - note E_, 1 - note __, 2 - incoctave - dutycycle 2 - volume 112 - tempo 20* 1 - note E_, 4 - note F#, 3 - ;no_fade - tempo 20* 7 - note F#, 15 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note F#, 1 - note __, 2 - note F#, 1 - incoctave - dutycycle 2 - volume 112 - tempo 20* 1 - note E_, 4 - note F#, 3 - ;no_fade - tempo 20* 7 - note F#, 2 - note __, 1 - note E_, 3 - note __, 1 - decoctave - volume 162 - ;musice8 6 - note A_, 1 - dutycycle 1 - volume 144 - ;musice8 8 - note E_, 1 - note __, 2 - incoctave - dutycycle 2 - volume 112 - tempo 20* 1 - note D#, 4 - note E_, 3 - ;no_fade - tempo 20* 7 - note E_, 15 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note A_, 1 - note __, 2 - note A_, 1 - dutycycle 2 - volume 112 - tempo 20* 1 - note A#, 4 - note B_, 3 - ;no_fade - tempo 20* 7 - note B_, 2 - note __, 1 - note A_, 3 - note __, 1 - note G_, 3 - note __, 1 - tempo 20* 1 - note F#, 4 - note G_, 3 - ;no_fade - tempo 20* 7 - note G_, 1 - note __, 1 - note F#, 13 - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 2 - note D_, 1 - incoctave - dutycycle 2 - volume 162 - ;musice8 6 - note D_, 2 - decoctave - ;musice4 0 - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 2 - callchannel Branch_f59b4 - octave 3 - tempo 20* 1 - volume 112 - note F_, 4 - note F#, 3 - ;no_fade - tempo 20* 7 - note F#, 1 - note __, 1 - note D_, 5 - note __, 1 - decoctave - note F#, 1 - tempo 20* 1 - note A_, 4 - note __, 3 - incoctave - note D_, 4 - note __, 3 - note F#, 4 - note __, 3 - tempo 20* 7 - note __, 3 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 -rept 3 - note D_, 1 - note __, 2 -endr - callchannel Branch_f59b4 - volume 128 - octave 3 - note D_, 16 - ;no_fade - note D_, 6 - note __, 2 - tempo 20* 1 - note G#, 4 - note A_, 3 - ;no_fade - tempo 20* 7 - note A_, 2 - note A_, 1 - note __, 2 - note A_, 1 - note __, 1 - note D_, 2 - note __, 1 - note D_, 13 - note C#, 6 - note __, 2 - decoctave - volume 121 - tempo 20* 1 - note E_, 5 - note A_, 5 - incoctave - note C#, 4 - note E_, 5 - note A_, 5 - incoctave - note C#, 4 - decoctave - decoctave - note A_, 5 - incoctave - note C#, 5 - note E_, 4 - note A_, 5 - incoctave - note C#, 5 - note E_, 4 - decoctave - tempo 20* 7 - callchannel Branch_f598c - note D_, 8 - ;no_fade - note D_, 8 - note C#, 6 - decoctave - dutycycle 1 - volume 112 - tempo 20* 1 - note G_, 4 - note G#, 3 - tempo 20* 7 - note A_, 1 - note __, 1 - note A_, 1 - note B_, 2 - incoctave - note C#, 2 - note E_, 2 - dutycycle 2 - callchannel Branch_f598c - note D_, 4 - note E_, 2 - note D_, 2 - note __, 2 - note C#, 2 - note __, 2 - note E_, 6 - note D_, 2 - note C#, 2 - note __, 2 - decoctave - note A_, 2 - note __, 2 - note G_, 8 - ;no_fade - note G_, 8 - note F#, 8 - ;no_fade - note F#, 8 - note __, 2 - note G_, 12 - note __, 2 - note G_, 14 - note __, 4 - loopchannel 0, .MainLoop - -Branch_f594d: - octave 3 - tempo 20* 1 - note C#, 4 - note D_, 3 - ;no_fade - tempo 20* 7 - note D_, 9 - decoctave - dutycycle 1 - volume 144 - decoctave - note A_, 1 - note __, 1 - incoctave - dutycycle 2 - volume 112 - note A_, 3 - note __, 1 - incoctave - note C_, 6 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 1 - incoctave - dutycycle 2 - volume 112 - tempo 20* 1 - note D#, 4 - note E_, 3 - ;no_fade - tempo 20* 7 - note E_, 2 - note D_, 1 - decoctave - volume 162 - ;musice8 6 - note G_, 2 - incoctave - volume 112 - ;musice8 8 - note C_, 1 - note __, 1 - endchannel - -Branch_f598c: - volume 128 - note D_, 10 - note __, 2 - note E_, 1 - note __, 1 - note F#, 1 - note __, 1 - note G_, 2 - note __, 2 - incoctave - note D_, 8 - note C#, 1 - note __, 1 - decoctave - note B_, 1 - note __, 1 - note A_, 2 - note __, 1 - note F#, 9 - note D_, 1 - note __, 1 - note G_, 9 - note __, 1 - note F#, 4 - note E_, 4 - note D_, 10 - note E_, 1 - note __, 1 - note F#, 1 - note __, 1 - decoctave - note B_, 10 - incoctave - note C#, 2 - note D_, 2 - note __, 2 - note D_, 2 - ;no_fade - endchannel - -Branch_f59b4: - octave 2 - volume 128 - tempo 20* 1 - note G#, 4 - note A_, 3 - ;no_fade - tempo 20* 7 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note G#, 1 - note __, 1 - note G_, 1 - note __, 2 - note C_, 1 - note __, 2 - note C_, 1 - note __, 2 - dutycycle 2 - volume 112 - note E_, 1 - tempo 20* 1 - note G_, 4 - note __, 3 - incoctave - note C_, 4 - note __, 3 - note E_, 4 - note __, 3 - tempo 20* 7 - note __, 3 - ;musice8 8 - decoctave - dutycycle 1 - volume 128 -rept 3 - note C_, 1 - note __, 2 -endr - incoctave - dutycycle 2 - volume 112 - tempo 20* 1 - note F#, 4 - note G_, 3 - ;no_fade - tempo 20* 7 - note G_, 2 - note F#, 1 - note __, 1 - note E_, 1 - note __, 1 - endchannel - -Branch_f59f9: - octave 2 - dutycycle 1 - volume 144 - ;musice8 8 - note D_, 1 - note __, 3 - decoctave - note A_, 1 - note __, 1 - incoctave - dutycycle 2 - volume 162 - ;musice8 6 - note A_, 1 - decoctave - dutycycle 1 - volume 144 - ;musice8 8 - note B_, 1 - note __, 2 - endchannel - -Branch_f5a17: - octave 2 - dutycycle 1 - volume 144 - ;musice8 8 - note F#, 1 - note __, 3 - note C#, 1 - note __, 1 - dutycycle 2 - volume 162 - ;musice8 6 - note A_, 1 - dutycycle 1 - volume 144 - ;musice8 8 - note E_, 1 - note __, 2 - endchannel - - -Music_TCG_BattleTheme1_Ch3: ; f5a32 (3d:5a32) - notetype $c, $14 - tempo 20* 7 - ;musicdc 17 - volume 32 - ;duty3 4 - ;musice9 96 - ;musice8 8 - octave 1 -.MainLoop -rept 4 -rept 3 - note D_, 1 - note __, 2 -endr - note __, 1 - callchannel Branch_f5c47 -endr -rept 4 - note D_, 1 - note __, 2 - note D_, 1 - incoctave - incoctave - ;musice8 3 - note D_, 2 - decoctave - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 -endr - callchannel Branch_f5b8d - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note F#, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 - note D_, 1 - note __, 2 - note D_, 1 - incoctave - incoctave - ;musice8 3 - note D_, 2 - decoctave - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 - callchannel Branch_f5b8d - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note A_, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note A_, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 2 - note D_, 2 - note __, 1 - note D_, 1 - note __, 1 - note C#, 1 - note __, 1 - callchannel Branch_f5c7e - octave 2 - note C_, 3 - decoctave - note G_, 1 - note __, 1 - incoctave - note C_, 1 - note __, 1 - decoctave -rept 3 - note D_, 1 - note __, 2 -endr - incoctave - note D_, 1 - tempo 20* 1 - note F#, 4 - note __, 3 - note A_, 4 - note __, 3 - incoctave - note D_, 4 - note __, 3 - tempo 20* 7 - note __, 3 - decoctave - decoctave -rept 3 - note D_, 1 - note __, 2 -endr - note D_, 2 - note __, 1 - note D_, 1 - note __, 1 - note C#, 1 - note __, 1 - callchannel Branch_f5c7e - octave 1 - note C_, 3 - note D_, 1 - note __, 1 - note D#, 1 - note __, 1 - callchannel Branch_f5c60 - octave 1 - ;musice8 8 - note E_, 1 - note __, 1 - note E_, 2 - ;musice8 6 - note B_, 2 - callchannel Branch_f5c60 - octave 1 - ;musice8 8 - note F#, 2 - note G_, 2 - ;musice8 6 - note G#, 2 - callchannel Branch_f5c6f - octave 1 - ;musice8 8 - note A_, 1 - note __, 1 - note A_, 2 - ;musice8 6 - note E_, 2 - callchannel Branch_f5c6f - octave 1 - ;musice8 8 - note B_, 2 - incoctave - note C_, 2 - note C#, 2 - decoctave -rept 2 - callchannel Branch_f5c4d - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note E_, 2 - note __, 1 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - ;musice8 7 - note E_, 1 - ;musice8 8 - note E_, 1 - note __, 1 - note E_, 2 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - note F#, 2 - note __, 1 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - ;musice8 7 - note F#, 1 - ;musice8 8 - note F#, 1 - note __, 1 - note F#, 2 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G_, 2 - note __, 1 - note G_, 1 - note __, 1 - note G_, 1 - note __, 1 - ;musice8 7 - note G_, 1 - ;musice8 8 - note F#, 1 - note __, 1 - note E_, 2 - callchannel Branch_f5c4d - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - note B_, 2 - note __, 1 - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - ;musice8 7 - note B_, 1 - ;musice8 8 - note F#, 1 - note __, 1 - note F_, 2 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note E_, 2 - note __, 1 - note E_, 1 - note __, 1 - note E_, 1 - note F#, 2 - note G_, 2 - note G#, 2 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 2 - note __, 1 - note B_, 1 - note __, 1 - note B_, 1 - note A_, 2 - note E_, 2 - note C#, 2 -endr -rept 2 - callchannel Branch_f5c4d -endr - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note D_, 2 - note __, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - ;musice8 7 - note D_, 1 - ;musice8 8 - note D_, 1 - note __, 1 - note A_, 14 - note __, 4 - loopchannel 0, .MainLoop - -Branch_f5b8d: - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note A_, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note G_, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 -rept 3 - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note A_, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 -endr - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note G_, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note A_, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - callchannel Branch_f5c47 - note D_, 1 - note __, 2 - note D_, 1 - incoctave - ;musice8 3 - note A_, 2 - decoctave - ;musice8 8 - note D_, 1 - note __, 3 - note D_, 1 - note __, 1 - note E_, 2 - note F#, 1 - note __, 1 -rept 2 - note G_, 1 - note __, 2 - note G_, 1 - incoctave - ;musice8 3 - note B_, 2 - decoctave - ;musice8 8 - note G_, 1 - note __, 3 - note D_, 1 - note __, 1 - note D_, 1 - note E_, 1 - note __, 2 -endr - note F#, 1 - note __, 2 - note F#, 1 - incoctave - ;musice8 3 - note A_, 2 - decoctave - ;musice8 8 - note F#, 1 - note __, 3 - note C#, 1 - note __, 1 - note C#, 1 - note E_, 1 - note __, 2 - note F#, 1 - note __, 2 - note F#, 1 - incoctave - incoctave - ;musice8 3 - note C#, 2 - decoctave - decoctave - ;musice8 8 - note F#, 1 - note __, 3 - note C#, 1 - note __, 1 - note C#, 1 - note E_, 1 - note __, 2 - note E_, 1 - note __, 2 - note E_, 1 - incoctave - ;musice8 3 - note B_, 2 - decoctave - ;musice8 8 - note E_, 1 - note __, 3 - note E_, 1 - note __, 1 - note F#, 1 - note G_, 1 - note __, 2 - note A_, 1 - note __, 2 - note A_, 1 - incoctave - ;musice8 3 - note B_, 2 - decoctave - ;musice8 8 - note A_, 1 - note __, 3 - note E_, 1 - note __, 1 - note F#, 1 - note A_, 1 - note __, 2 - endchannel - -Branch_f5c47: - note A_, 1 - note __, 1 - note A_, 1 - note B_, 1 - note __, 2 - endchannel - -Branch_f5c4d: - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note D_, 2 - note __, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - ;musice8 7 - note D_, 1 - ;musice8 8 - note D_, 1 - note __, 1 - note D_, 2 - endchannel - -Branch_f5c60: - octave 1 - ;musice8 8 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note E_, 2 - note __, 1 - note E_, 1 - note __, 1 - ;musice8 6 - note E_, 1 - endchannel - -Branch_f5c6f: - octave 1 - ;musice8 8 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A_, 2 - note __, 1 - note A_, 1 - note __, 1 - ;musice8 6 - note A_, 1 - endchannel - -Branch_f5c7e: - octave 1 -rept 3 - note C_, 1 - note __, 2 -endr - incoctave - note C_, 1 - tempo 20* 1 - note E_, 4 - note __, 3 - note G_, 4 - note __, 3 - incoctave - note C_, 4 - note __, 3 - tempo 20* 7 - note __, 3 - decoctave - decoctave -rept 3 - note C_, 1 - note __, 2 -endr - endchannel - - -Music_TCG_BattleTheme1_Ch4: ; f5c9a (3d:5c9a) - togglenoise $0 - notetype $c - tempo 20* 7 - octave 1 -.MainLoop -rept 3 - note C_, 2 - note F_, 1 - note G_, 1 - note F_, 1 - note C_, 1 - note E_, 2 - note F_, 1 - note C_, 1 - note G_, 2 - note D_, 1 - note G_, 1 - note __, 1 - note F_, 1 -endr - note C_, 2 - note F_, 1 - note G_, 1 - note F_, 1 - note C_, 1 - note E_, 2 - note F_, 1 - note D_, 1 - note G_, 1 - tempo 20* 1 - note E_, 4 - note E_, 3 - tempo 20* 7 - note D_, 1 - note D_, 1 - note D_, 2 -rept 3 - callchannel Branch_f5d39 -endr - callchannel Branch_f5d46 -rept 15 - callchannel Branch_f5d39 -endr - callchannel Branch_f5d46 -rept 15 - callchannel Branch_f5d39 -endr - note C_, 2 - note F_, 1 - note G_, 1 - note D_, 2 - note G_, 2 - note F_, 1 - note D_, 1 - note G_, 1 - tempo 20* 1 - note E_, 4 - note E_, 3 - tempo 20* 7 -rept 4 - note D_, 1 -endr -rept 5 - note C_, 1 - note F_, 1 - note G_, 1 - note D_, 1 - note F_, 1 - note C_, 1 - note G_, 2 - note F_, 1 - note C_, 1 - note F_, 2 - note D_, 2 - note G_, 2 -endr - note C_, 2 - note F_, 1 - note D_, 1 - note F_, 1 - note C_, 1 - note G_, 2 - note F_, 1 - note C_, 1 - note G_, 1 - tempo 20* 1 - note E_, 4 - note E_, 3 - tempo 20* 7 -rept 4 - note D_, 1 -endr -rept 3 - callchannel Branch_f5d39 -endr - callchannel Branch_f5d58 -rept 7 - callchannel Branch_f5d39 -endr - callchannel Branch_f5d46 -rept 7 - callchannel Branch_f5d39 -endr - callchannel Branch_f5d58 -rept 2 - callchannel Branch_f5d39 -endr - note C_, 2 - note F_, 1 - note G_, 1 - note D_, 2 - note G_, 2 - note C_, 1 - note F_, 1 - note G_, 2 - note D_, 2 - note A_, 14 - note D_, 4 - loopchannel 0, .MainLoop - -Branch_f5d39: - note C_, 2 - note F_, 1 - note G_, 1 - note D_, 2 - note G_, 2 - note C_, 1 - note F_, 1 - note G_, 2 - note D_, 1 - note G_, 1 - note __, 1 - note F_, 1 - endchannel - -Branch_f5d46: - note C_, 2 - note F_, 1 - note G_, 1 - note D_, 2 - note G_, 2 - note F_, 1 - note D_, 1 - note G_, 1 - tempo 20* 1 - note E_, 4 - note E_, 3 - tempo 20* 7 - note D_, 1 - note D_, 1 - note D_, 2 - endchannel - -Branch_f5d58: - note C_, 2 - note F_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - tempo 20* 1 - note E_, 4 - note E_, 3 - tempo 20* 7 -rept 8 - note D_, 1 -endr - endchannel -; 0xf5d68 diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm index 068c7e40..931b92a4 100644 --- a/crysaudio/music/TCG2/credits.asm +++ b/crysaudio/music/TCG2/credits.asm @@ -3035,7 +3035,7 @@ Music_TCG2Credits_Ch1: Music_TCG2Credits_Ch3: notetype1 10 - db $f3, $cc, $cc, $cc, $cc, $bc, $cc, $bc, $cc, $c0, $00, $00, $00, $00, $00, $00, $0b + load_wave 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11 notetype0 1 notetype1 1 octave 5 diff --git a/crysaudio/music/TCG2/diddly1.asm b/crysaudio/music/TCG2/diddly1.asm index 5d74e97b..a30f026e 100644 --- a/crysaudio/music/TCG2/diddly1.asm +++ b/crysaudio/music/TCG2/diddly1.asm @@ -168,7 +168,7 @@ Music_TCG2Diddly1_Ch1: Music_TCG2Diddly1_Ch3: notetype1 10 - notetype2 15 + load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype0 1 octave 2 notetype1 1 diff --git a/crysaudio/music/TCG2/diddly3.asm b/crysaudio/music/TCG2/diddly3.asm index 63877909..447cb186 100644 --- a/crysaudio/music/TCG2/diddly3.asm +++ b/crysaudio/music/TCG2/diddly3.asm @@ -45,7 +45,7 @@ Music_TCG2Diddly3_Ch1: Music_TCG2Diddly3_Ch3: notetype1 10 - notetype2 15 + load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype0 1 notetype1 2 notetype0 1 diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm index a539f8b6..085478bd 100644 --- a/crysaudio/music/TCG2/diddly6.asm +++ b/crysaudio/music/TCG2/diddly6.asm @@ -192,7 +192,7 @@ Music_TCG2Diddly6_Ch1: Music_TCG2Diddly6_Ch3: notetype1 10 - notetype2 15 + load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype1 1 notetype0 1 note __, 10 diff --git a/crysaudio/music/TCG2/fort2.asm b/crysaudio/music/TCG2/fort2.asm index db2a5da7..5091a0ee 100644 --- a/crysaudio/music/TCG2/fort2.asm +++ b/crysaudio/music/TCG2/fort2.asm @@ -821,7 +821,7 @@ Music_TCG2Fort2_Ch1: Music_TCG2Fort2_Ch3: notetype1 10 - notetype2 15 + load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype1 2 octave 4 octave 3 diff --git a/crysaudio/music/TCG2/grdueltheme2.asm b/crysaudio/music/TCG2/grdueltheme2.asm index bef94fc1..9c4eb47b 100644 --- a/crysaudio/music/TCG2/grdueltheme2.asm +++ b/crysaudio/music/TCG2/grdueltheme2.asm @@ -1471,7 +1471,7 @@ Branch_1efa62: Music_TCG2GRDuelTheme2_Ch3: notetype1 10 - notetype2 15 + load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 notetype0 1 notetype1 1 octave 2 diff --git a/crysaudio/music/aftertherivalfight.asm b/crysaudio/music/aftertherivalfight.asm index 3d06b88d..114a6fd5 100644 --- a/crysaudio/music/aftertherivalfight.asm +++ b/crysaudio/music/aftertherivalfight.asm @@ -1,11 +1,10 @@ -Music_AfterTheRivalFight: ; f5127 - dbw $c0, Music_AfterTheRivalFight_Ch1 - dbw $01, Music_AfterTheRivalFight_Ch2 - dbw $02, Music_AfterTheRivalFight_Ch3 - dbw $03, Music_AfterTheRivalFight_Ch4 -; f5133 +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 -Music_AfterTheRivalFight_Ch1: ; f5133 +Music_AfterTheRivalFight_Ch1: tempo 112 volume $77 dutycycle $0 @@ -23,9 +22,8 @@ Music_AfterTheRivalFight_Ch1: ; f5133 note G#, 2 note G#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f4fb1 -; f5153 -Music_AfterTheRivalFight_Ch2: ; f5153 +Music_AfterTheRivalFight_Ch2: dutycycle $1 vibrato $6, $35 stereopanning $f @@ -39,9 +37,8 @@ Music_AfterTheRivalFight_Ch2: ; f5153 note G#, 2 note G#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f502e -; f516a -Music_AfterTheRivalFight_Ch3: ; f516a +Music_AfterTheRivalFight_Ch3: notetype $c, $28 octave 3 note D#, 2 @@ -53,9 +50,8 @@ Music_AfterTheRivalFight_Ch3: ; f516a note F_, 2 note D#, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f509d -; f517a -Music_AfterTheRivalFight_Ch4: ; f517a +Music_AfterTheRivalFight_Ch4: togglenoise $3 stereopanning $f notetype $c @@ -66,6 +62,3 @@ Music_AfterTheRivalFight_Ch4: ; f517a note D_, 2 note D_, 2 loopchannel 0, Music_AfterTheRivalFight_branch_f5118 -; f518a - - diff --git a/crysaudio/music/azaleatown.asm b/crysaudio/music/azaleatown.asm index 55365d9a..0b230447 100644 --- a/crysaudio/music/azaleatown.asm +++ b/crysaudio/music/azaleatown.asm @@ -1,18 +1,17 @@ -Music_AzaleaTown: ; f57e8 - dbw $c0, Music_AzaleaTown_Ch1 - dbw $01, Music_AzaleaTown_Ch2 - dbw $02, Music_AzaleaTown_Ch3 - dbw $03, Music_AzaleaTown_Ch4 -; f57f4 +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 -Music_AzaleaTown_Ch1: ; f57f4 +Music_AzaleaTown_Ch1: tempo 160 volume $77 dutycycle $2 stereopanning $f notetype $c, $a1 note __, 2 -Music_AzaleaTown_branch_f5801: ; f5801 +Music_AzaleaTown_branch_f5801: intensity $a1 octave 3 note F_, 2 @@ -27,7 +26,7 @@ Music_AzaleaTown_branch_f5801: ; f5801 note F_, 2 note F_, 2 loopchannel 2, Music_AzaleaTown_branch_f5801 -Music_AzaleaTown_branch_f5816: ; f5816 +Music_AzaleaTown_branch_f5816: callchannel Music_AzaleaTown_branch_f588c stereopanning $f0 intensity $a4 @@ -119,9 +118,8 @@ Music_AzaleaTown_branch_f5816: ; f5816 note G#, 14 note __, 2 loopchannel 0, Music_AzaleaTown_branch_f5816 -; f588c -Music_AzaleaTown_branch_f588c: ; f588c +Music_AzaleaTown_branch_f588c: notetype $c, $a1 octave 4 note F_, 2 @@ -219,9 +217,8 @@ Music_AzaleaTown_branch_f588c: ; f588c intensity $61 note C#, 2 endchannel -; f5912 -Music_AzaleaTown_branch_f5912: ; f5912 +Music_AzaleaTown_branch_f5912: intensity $61 note G#, 8 note G#, 8 @@ -230,9 +227,8 @@ Music_AzaleaTown_branch_f5912: ; f5912 intensity $a1 note A_, 8 endchannel -; f591d -Music_AzaleaTown_Ch2: ; f591d +Music_AzaleaTown_Ch2: vibrato $12, $23 dutycycle $2 stereopanning $f0 @@ -268,7 +264,7 @@ Music_AzaleaTown_Ch2: ; f591d dutycycle $1 octave 5 note C_, 1 -Music_AzaleaTown_branch_f5952: ; f5952 +Music_AzaleaTown_branch_f5952: callchannel Music_AzaleaTown_branch_f59c7 note C#, 4 note C_, 2 @@ -366,9 +362,8 @@ Music_AzaleaTown_branch_f5952: ; f5952 octave 5 note C_, 2 loopchannel 0, Music_AzaleaTown_branch_f5952 -; f59c7 -Music_AzaleaTown_branch_f59c7: ; f59c7 +Music_AzaleaTown_branch_f59c7: note C#, 4 octave 4 note G#, 2 @@ -420,9 +415,8 @@ Music_AzaleaTown_branch_f59c7: ; f59c7 note D#, 12 intensity $b4 endchannel -; f5a08 -Music_AzaleaTown_Ch3: ; f5a08 +Music_AzaleaTown_Ch3: stereopanning $ff vibrato $6, $26 notetype $c, $25 @@ -446,7 +440,7 @@ Music_AzaleaTown_Ch3: ; f5a08 note C#, 1 note __, 1 note G#, 4 -Music_AzaleaTown_branch_f5a24: ; f5a24 +Music_AzaleaTown_branch_f5a24: callchannel Music_AzaleaTown_branch_f5a86 note G#, 4 note D#, 2 @@ -534,9 +528,8 @@ Music_AzaleaTown_branch_f5a24: ; f5a24 octave 3 note C_, 1 loopchannel 0, Music_AzaleaTown_branch_f5a24 -; f5a86 -Music_AzaleaTown_branch_f5a86: ; f5a86 +Music_AzaleaTown_branch_f5a86: note C#, 1 note __, 5 note C#, 1 @@ -608,9 +601,8 @@ Music_AzaleaTown_branch_f5a86: ; f5a86 note C_, 1 note __, 1 endchannel -; f5acf -Music_AzaleaTown_branch_f5acf: ; f5acf +Music_AzaleaTown_branch_f5acf: intensity $35 octave 3 note F_, 1 @@ -631,13 +623,12 @@ Music_AzaleaTown_branch_f5acf: ; f5acf note F_, 1 note __, 1 endchannel -; f5ae5 -Music_AzaleaTown_Ch4: ; f5ae5 +Music_AzaleaTown_Ch4: togglenoise $3 notetype $c note F_, 2 -Music_AzaleaTown_branch_f5aea: ; f5aea +Music_AzaleaTown_branch_f5aea: note D#, 2 note F#, 2 note D_, 2 @@ -660,6 +651,3 @@ Music_AzaleaTown_branch_f5aea: ; f5aea note D_, 2 note F#, 2 loopchannel 0, Music_AzaleaTown_branch_f5aea -; f5b03 - - diff --git a/crysaudio/music/battletowerlobby.asm b/crysaudio/music/battletowerlobby.asm index f4031b20..2bf38a83 100644 --- a/crysaudio/music/battletowerlobby.asm +++ b/crysaudio/music/battletowerlobby.asm @@ -1,11 +1,10 @@ -Music_BattleTowerLobby: ; 17948b - dbw $c0, Music_BattleTowerLobby_Ch1 - dbw $01, Music_BattleTowerLobby_Ch2 - dbw $02, Music_BattleTowerLobby_Ch3 - dbw $03, Music_BattleTowerLobby_Ch4 -; 179497 +Music_BattleTowerLobby: + musicheader 4, 1, Music_BattleTowerLobby_Ch1 + musicheader 1, 2, Music_BattleTowerLobby_Ch2 + musicheader 1, 3, Music_BattleTowerLobby_Ch3 + musicheader 1, 4, Music_BattleTowerLobby_Ch4 -Music_BattleTowerLobby_Ch1: ; 179497 +Music_BattleTowerLobby_Ch1: tempo 152 volume $77 dutycycle $3 @@ -13,7 +12,7 @@ Music_BattleTowerLobby_Ch1: ; 179497 vibrato $8, $22 stereopanning $f0 notetype $c, $72 -Music_BattleTowerLobby_branch_1794a9: ; 1794a9 +Music_BattleTowerLobby_branch_1794a9: notetype $c, $72 octave 3 note G#, 2 @@ -116,14 +115,13 @@ Music_BattleTowerLobby_branch_1794a9: ; 1794a9 octave 2 note B_, 4 loopchannel 0, Music_BattleTowerLobby_branch_1794a9 -; 17953a -Music_BattleTowerLobby_Ch2: ; 17953a +Music_BattleTowerLobby_Ch2: dutycycle $2 vibrato $10, $34 stereopanning $f notetype $c, $82 -Music_BattleTowerLobby_branch_179544: ; 179544 +Music_BattleTowerLobby_branch_179544: notetype $c, $82 octave 4 note E_, 2 @@ -201,11 +199,10 @@ Music_BattleTowerLobby_branch_179544: ; 179544 octave 4 note D#, 1 loopchannel 0, Music_BattleTowerLobby_branch_179544 -; 1795ae -Music_BattleTowerLobby_Ch3: ; 1795ae +Music_BattleTowerLobby_Ch3: notetype $c, $11 -Music_BattleTowerLobby_branch_1795b1: ; 1795b1 +Music_BattleTowerLobby_branch_1795b1: octave 2 note B_, 2 octave 3 @@ -298,11 +295,10 @@ Music_BattleTowerLobby_branch_1795b1: ; 1795b1 note D#, 2 note F#, 2 loopchannel 0, Music_BattleTowerLobby_branch_1795b1 -; 179610 -Music_BattleTowerLobby_Ch4: ; 179610 +Music_BattleTowerLobby_Ch4: togglenoise $0 -Music_BattleTowerLobby_branch_179612: ; 179612 +Music_BattleTowerLobby_branch_179612: notetype $c note __, 2 note F_, 4 @@ -310,6 +306,3 @@ Music_BattleTowerLobby_branch_179612: ; 179612 note F_, 2 note F_, 4 loopchannel 0, Music_BattleTowerLobby_branch_179612 -; 17961d - - diff --git a/crysaudio/music/battletowertheme.asm b/crysaudio/music/battletowertheme.asm index 20782b84..18af9586 100644 --- a/crysaudio/music/battletowertheme.asm +++ b/crysaudio/music/battletowertheme.asm @@ -1,18 +1,17 @@ -Music_BattleTowerTheme: ; 178889 - dbw $c0, Music_BattleTowerTheme_Ch1 - dbw $01, Music_BattleTowerTheme_Ch2 - dbw $02, Music_BattleTowerTheme_Ch3 - dbw $03, Music_BattleTowerTheme_Ch4 -; 178895 +Music_BattleTowerTheme: + musicheader 4, 1, Music_BattleTowerTheme_Ch1 + musicheader 1, 2, Music_BattleTowerTheme_Ch2 + musicheader 1, 3, Music_BattleTowerTheme_Ch3 + musicheader 1, 4, Music_BattleTowerTheme_Ch4 -Music_BattleTowerTheme_Ch1: ; 178895 +Music_BattleTowerTheme_Ch1: tempo 141 volume $77 tone $0001 vibrato $12, $34 stereopanning $f notetype $6, $94 -Music_BattleTowerTheme_branch_1788a5: ; 1788a5 +Music_BattleTowerTheme_branch_1788a5: note __, 16 note __, 16 note __, 12 @@ -185,9 +184,8 @@ Music_BattleTowerTheme_branch_1788a5: ; 1788a5 note E_, 4 note __, 12 loopchannel 0, Music_BattleTowerTheme_branch_1788a5 -; 17895e -Music_BattleTowerTheme_branch_17895e: ; 17895e +Music_BattleTowerTheme_branch_17895e: intensity $94 note A_, 2 note __, 2 @@ -202,11 +200,10 @@ Music_BattleTowerTheme_branch_17895e: ; 17895e note __, 4 note A_, 4 endchannel -; 17896d -Music_BattleTowerTheme_Ch2: ; 17896d +Music_BattleTowerTheme_Ch2: vibrato $12, $34 -Music_BattleTowerTheme_branch_178970: ; 178970 +Music_BattleTowerTheme_branch_178970: dutycycle $3 notetype $6, $b8 octave 3 @@ -242,7 +239,7 @@ Music_BattleTowerTheme_branch_178970: ; 178970 note __, 1 note F_, 4 note __, 4 - tone $0000 + tone 0 intensity $b7 note G_, 2 octave 4 @@ -345,9 +342,8 @@ Music_BattleTowerTheme_branch_178970: ; 178970 note D_, 2 note E_, 4 loopchannel 0, Music_BattleTowerTheme_branch_178970 -; 178a15 -Music_BattleTowerTheme_branch_178a15: ; 178a15 +Music_BattleTowerTheme_branch_178a15: note F_, 2 note __, 2 note F_, 8 @@ -359,12 +355,11 @@ Music_BattleTowerTheme_branch_178a15: ; 178a15 note A#, 4 note A_, 4 endchannel -; 178a20 -Music_BattleTowerTheme_Ch3: ; 178a20 +Music_BattleTowerTheme_Ch3: vibrato $12, $34 notetype $6, $16 -Music_BattleTowerTheme_branch_178a26: ; 178a26 +Music_BattleTowerTheme_branch_178a26: stereopanning $ff callchannel Music_BattleTowerTheme_branch_178afe note C_, 2 @@ -569,9 +564,8 @@ Music_BattleTowerTheme_branch_178a26: ; 178a26 note G_, 4 note __, 12 loopchannel 0, Music_BattleTowerTheme_branch_178a26 -; 178afe -Music_BattleTowerTheme_branch_178afe: ; 178afe +Music_BattleTowerTheme_branch_178afe: octave 3 note C_, 2 note __, 2 @@ -587,12 +581,11 @@ Music_BattleTowerTheme_branch_178afe: ; 178afe note C_, 2 note __, 2 endchannel -; 178b0d -Music_BattleTowerTheme_Ch4: ; 178b0d +Music_BattleTowerTheme_Ch4: togglenoise $3 notetype $c -Music_BattleTowerTheme_branch_178b11: ; 178b11 +Music_BattleTowerTheme_branch_178b11: callchannel Music_BattleTowerTheme_branch_178b58 note D_, 2 note D_, 4 @@ -603,7 +596,7 @@ Music_BattleTowerTheme_branch_178b11: ; 178b11 note C#, 1 note D_, 1 note C#, 1 -Music_BattleTowerTheme_branch_178b1d: ; 178b1d +Music_BattleTowerTheme_branch_178b1d: callchannel Music_BattleTowerTheme_branch_178b58 callchannel Music_BattleTowerTheme_branch_178b61 loopchannel 2, Music_BattleTowerTheme_branch_178b1d @@ -615,7 +608,7 @@ Music_BattleTowerTheme_branch_178b1d: ; 178b1d note D_, 1 note D_, 1 note D_, 8 -Music_BattleTowerTheme_branch_178b35: ; 178b35 +Music_BattleTowerTheme_branch_178b35: callchannel Music_BattleTowerTheme_branch_178b76 note D_, 2 note D_, 2 @@ -641,9 +634,8 @@ Music_BattleTowerTheme_branch_178b35: ; 178b35 note D_, 1 note C#, 1 loopchannel 0, Music_BattleTowerTheme_branch_178b11 -; 178b58 -Music_BattleTowerTheme_branch_178b58: ; 178b58 +Music_BattleTowerTheme_branch_178b58: note D_, 2 note D_, 4 note D_, 1 @@ -653,9 +645,8 @@ Music_BattleTowerTheme_branch_178b58: ; 178b58 note D_, 1 note D_, 1 endchannel -; 178b61 -Music_BattleTowerTheme_branch_178b61: ; 178b61 +Music_BattleTowerTheme_branch_178b61: note D_, 2 note D_, 4 note D_, 1 @@ -667,9 +658,8 @@ Music_BattleTowerTheme_branch_178b61: ; 178b61 note D_, 1 note C#, 1 endchannel -; 178b6c -Music_BattleTowerTheme_branch_178b6c: ; 178b6c +Music_BattleTowerTheme_branch_178b6c: note D_, 2 note D_, 4 note D_, 1 @@ -680,9 +670,8 @@ Music_BattleTowerTheme_branch_178b6c: ; 178b6c note D_, 1 note D_, 1 endchannel -; 178b76 -Music_BattleTowerTheme_branch_178b76: ; 178b76 +Music_BattleTowerTheme_branch_178b76: note D_, 2 note C#, 2 note D_, 2 @@ -694,6 +683,3 @@ Music_BattleTowerTheme_branch_178b76: ; 178b76 note D_, 1 note C#, 1 endchannel -; 178b81 - - diff --git a/crysaudio/music/bicycle.asm b/crysaudio/music/bicycle.asm index 0a1a68fd..92a19e81 100644 --- a/crysaudio/music/bicycle.asm +++ b/crysaudio/music/bicycle.asm @@ -1,11 +1,10 @@ -Music_Bicycle: ; ee119 - dbw $c0, Music_Bicycle_Ch1 - dbw $01, Music_Bicycle_Ch2 - dbw $02, Music_Bicycle_Ch3 - dbw $03, Music_Bicycle_Ch4 -; ee125 +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 -Music_Bicycle_Ch1: ; ee125 +Music_Bicycle_Ch1: tempo 140 volume $77 dutycycle $3 @@ -23,7 +22,7 @@ Music_Bicycle_Ch1: ; ee125 note A_, 8 intensity $b2 note F#, 2 -Music_Bicycle_branch_ee144: ; ee144 +Music_Bicycle_branch_ee144: stereopanning $f intensity $b2 note G_, 2 @@ -169,9 +168,8 @@ Music_Bicycle_branch_ee144: ; ee144 note G#, 2 note A_, 2 loopchannel 0, Music_Bicycle_branch_ee144 -; ee1de -Music_Bicycle_Ch2: ; ee1de +Music_Bicycle_Ch2: dutycycle $2 vibrato $10, $24 stereopanning $f0 @@ -195,7 +193,7 @@ Music_Bicycle_Ch2: ; ee1de octave 3 note B_, 2 note A_, 2 -Music_Bicycle_branch_ee1fd: ; ee1fd +Music_Bicycle_branch_ee1fd: stereopanning $ff dutycycle $2 intensity $c3 @@ -273,9 +271,8 @@ Music_Bicycle_branch_ee1fd: ; ee1fd note G_, 2 note F#, 4 loopchannel 0, Music_Bicycle_branch_ee1fd -; ee263 -Music_Bicycle_branch_ee263: ; ee263 +Music_Bicycle_branch_ee263: note G_, 6 note B_, 6 note G_, 4 @@ -286,9 +283,8 @@ Music_Bicycle_branch_ee263: ; ee263 note G_, 6 note E_, 4 endchannel -; ee26d -Music_Bicycle_Ch3: ; ee26d +Music_Bicycle_Ch3: notetype $c, $14 note __, 16 octave 3 @@ -305,7 +301,7 @@ Music_Bicycle_Ch3: ; ee26d octave 3 note A_, 1 note __, 1 -Music_Bicycle_branch_ee27f: ; ee27f +Music_Bicycle_branch_ee27f: callchannel Music_Bicycle_branch_ee333 note E_, 1 note __, 1 @@ -408,7 +404,7 @@ Music_Bicycle_branch_ee27f: ; ee27f note __, 1 note A_, 1 note __, 1 -Music_Bicycle_branch_ee2e9: ; ee2e9 +Music_Bicycle_branch_ee2e9: note G_, 1 note __, 1 note B_, 1 @@ -477,9 +473,8 @@ Music_Bicycle_branch_ee2e9: ; ee2e9 note __, 1 loopchannel 2, Music_Bicycle_branch_ee2e9 loopchannel 0, Music_Bicycle_branch_ee27f -; ee333 -Music_Bicycle_branch_ee333: ; ee333 +Music_Bicycle_branch_ee333: octave 3 note G_, 1 note __, 1 @@ -498,16 +493,15 @@ Music_Bicycle_branch_ee333: ; ee333 note B_, 1 note __, 1 endchannel -; ee345 -Music_Bicycle_Ch4: ; ee345 +Music_Bicycle_Ch4: togglenoise $0 notetype $c note __, 16 note __, 16 -Music_Bicycle_branch_ee34b: ; ee34b +Music_Bicycle_branch_ee34b: note __, 2 -Music_Bicycle_branch_ee34c: ; ee34c +Music_Bicycle_branch_ee34c: stereopanning $f0 note F_, 4 loopchannel 12, Music_Bicycle_branch_ee34c @@ -518,6 +512,3 @@ Music_Bicycle_branch_ee34c: ; ee34c note F_, 2 note F_, 2 loopchannel 0, Music_Bicycle_branch_ee34b -; ee35e - - diff --git a/crysaudio/music/buenaspassword.asm b/crysaudio/music/buenaspassword.asm index 6961159b..316ec9a0 100644 --- a/crysaudio/music/buenaspassword.asm +++ b/crysaudio/music/buenaspassword.asm @@ -1,17 +1,16 @@ -Music_BuenasPassword: ; 178153 - dbw $c0, Music_BuenasPassword_Ch1 - dbw $01, Music_BuenasPassword_Ch2 - dbw $02, Music_BuenasPassword_Ch3 - dbw $03, Music_BuenasPassword_Ch4 -; 17815f +Music_BuenasPassword: + musicheader 4, 1, Music_BuenasPassword_Ch1 + musicheader 1, 2, Music_BuenasPassword_Ch2 + musicheader 1, 3, Music_BuenasPassword_Ch3 + musicheader 1, 4, Music_BuenasPassword_Ch4 -Music_BuenasPassword_Ch1: ; 17815f +Music_BuenasPassword_Ch1: tempo 136 volume $77 tone $0001 notetype $c, $b3 note __, 8 -Music_BuenasPassword_branch_17816b: ; 17816b +Music_BuenasPassword_branch_17816b: stereopanning $ff note __, 16 note __, 16 @@ -138,9 +137,8 @@ Music_BuenasPassword_branch_17816b: ; 17816b note G_, 1 note __, 1 loopchannel 0, Music_BuenasPassword_branch_17816b -; 178204 -Music_BuenasPassword_branch_178204: ; 178204 +Music_BuenasPassword_branch_178204: stereopanning $f notetype $6, $84 octave 4 @@ -162,9 +160,8 @@ Music_BuenasPassword_branch_178204: ; 178204 note __, 1 notetype $c, $84 endchannel -; 178222 -Music_BuenasPassword_branch_178222: ; 178222 +Music_BuenasPassword_branch_178222: octave 3 note D#, 1 note __, 1 @@ -180,16 +177,15 @@ Music_BuenasPassword_branch_178222: ; 178222 note D#, 1 note __, 2 endchannel -; 178231 -Music_BuenasPassword_Ch2: ; 178231 +Music_BuenasPassword_Ch2: vibrato $12, $34 dutycycle $2 notetype $c, $a5 note __, 7 octave 3 note F#, 1 -Music_BuenasPassword_branch_17823c: ; 17823c +Music_BuenasPassword_branch_17823c: stereopanning $ff callchannel Music_BuenasPassword_branch_1782df callchannel Music_BuenasPassword_branch_1782a4 @@ -274,9 +270,8 @@ Music_BuenasPassword_branch_17823c: ; 17823c note __, 1 intensity $a5 loopchannel 0, Music_BuenasPassword_branch_17823c -; 1782a4 -Music_BuenasPassword_branch_1782a4: ; 1782a4 +Music_BuenasPassword_branch_1782a4: octave 3 note G#, 1 note __, 1 @@ -308,9 +303,8 @@ Music_BuenasPassword_branch_1782a4: ; 1782a4 note __, 1 notetype $c, $a5 endchannel -; 1782cc -Music_BuenasPassword_branch_1782cc: ; 1782cc +Music_BuenasPassword_branch_1782cc: octave 4 note G#, 2 note __, 2 @@ -330,9 +324,8 @@ Music_BuenasPassword_branch_1782cc: ; 1782cc note D#, 2 note __, 2 endchannel -; 1782df -Music_BuenasPassword_branch_1782df: ; 1782df +Music_BuenasPassword_branch_1782df: octave 3 note G#, 1 note __, 1 @@ -383,12 +376,11 @@ Music_BuenasPassword_branch_1782df: ; 1782df note B_, 1 note G#, 3 endchannel -; 178311 -Music_BuenasPassword_Ch3: ; 178311 +Music_BuenasPassword_Ch3: notetype $c, $14 note __, 8 -Music_BuenasPassword_branch_178315: ; 178315 +Music_BuenasPassword_branch_178315: callchannel Music_BuenasPassword_branch_1783a7 callchannel Music_BuenasPassword_branch_1783a7 callchannel Music_BuenasPassword_branch_1783a7 @@ -519,9 +511,8 @@ Music_BuenasPassword_branch_178315: ; 178315 note G_, 1 note __, 1 loopchannel 0, Music_BuenasPassword_branch_178315 -; 1783a7 -Music_BuenasPassword_branch_1783a7: ; 1783a7 +Music_BuenasPassword_branch_1783a7: octave 2 note G#, 1 note __, 1 @@ -543,9 +534,8 @@ Music_BuenasPassword_branch_1783a7: ; 1783a7 note F_, 2 note C#, 1 endchannel -; 1783bc -Music_BuenasPassword_branch_1783bc: ; 1783bc +Music_BuenasPassword_branch_1783bc: octave 2 note G#, 1 note __, 1 @@ -566,9 +556,8 @@ Music_BuenasPassword_branch_1783bc: ; 1783bc octave 2 note G#, 2 endchannel -; 1783d0 -Music_BuenasPassword_Ch4: ; 1783d0 +Music_BuenasPassword_Ch4: togglenoise $3 notetype $c note D#, 2 @@ -576,7 +565,7 @@ Music_BuenasPassword_Ch4: ; 1783d0 note D_, 2 note D_, 1 note D_, 1 -Music_BuenasPassword_branch_1783d9: ; 1783d9 +Music_BuenasPassword_branch_1783d9: callchannel Music_BuenasPassword_branch_17840c callchannel Music_BuenasPassword_branch_17840c callchannel Music_BuenasPassword_branch_17840c @@ -602,9 +591,8 @@ Music_BuenasPassword_branch_1783d9: ; 1783d9 note D_, 1 note D_, 1 loopchannel 0, Music_BuenasPassword_branch_1783d9 -; 17840c -Music_BuenasPassword_branch_17840c: ; 17840c +Music_BuenasPassword_branch_17840c: stereopanning $ff note D#, 2 stereopanning $f0 @@ -622,9 +610,8 @@ Music_BuenasPassword_branch_17840c: ; 17840c stereopanning $f note G_, 2 endchannel -; 178424 -Music_BuenasPassword_branch_178424: ; 178424 +Music_BuenasPassword_branch_178424: stereopanning $ff note D#, 2 stereopanning $f0 @@ -642,6 +629,3 @@ Music_BuenasPassword_branch_178424: ; 178424 note D_, 1 note D_, 1 endchannel -; 17843b - - diff --git a/crysaudio/music/bugcatchingcontest.asm b/crysaudio/music/bugcatchingcontest.asm index f52d5045..e77bf550 100644 --- a/crysaudio/music/bugcatchingcontest.asm +++ b/crysaudio/music/bugcatchingcontest.asm @@ -1,11 +1,10 @@ -Music_BugCatchingContest: ; f7c16 - dbw $c0, Music_BugCatchingContest_Ch1 - dbw $01, Music_BugCatchingContest_Ch2 - dbw $02, Music_BugCatchingContest_Ch3 - dbw $03, Music_BugCatchingContest_Ch4 -; f7c22 +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 -Music_BugCatchingContest_Ch1: ; f7c22 +Music_BugCatchingContest_Ch1: tempo 144 volume $77 stereopanning $f @@ -38,14 +37,14 @@ Music_BugCatchingContest_Ch1: ; f7c22 note __, 1 note E_, 1 note E_, 1 -Music_BugCatchingContest_branch_f7c4b: ; f7c4b +Music_BugCatchingContest_branch_f7c4b: notetype $c, $b1 -Music_BugCatchingContest_branch_f7c4e: ; f7c4e +Music_BugCatchingContest_branch_f7c4e: note __, 2 octave 2 note A_, 2 loopchannel 4, Music_BugCatchingContest_branch_f7c4e -Music_BugCatchingContest_branch_f7c55: ; f7c55 +Music_BugCatchingContest_branch_f7c55: note __, 2 note B_, 2 loopchannel 8, Music_BugCatchingContest_branch_f7c55 @@ -61,7 +60,7 @@ Music_BugCatchingContest_branch_f7c55: ; f7c55 note E_, 1 intensity $b1 dutycycle $2 -Music_BugCatchingContest_branch_f7c6b: ; f7c6b +Music_BugCatchingContest_branch_f7c6b: note __, 2 octave 2 note A_, 2 @@ -91,7 +90,7 @@ Music_BugCatchingContest_branch_f7c6b: ; f7c6b note E_, 4 note __, 4 note E_, 4 -Music_BugCatchingContest_branch_f7c8e: ; f7c8e +Music_BugCatchingContest_branch_f7c8e: note __, 4 octave 2 note A_, 4 @@ -187,15 +186,14 @@ Music_BugCatchingContest_branch_f7c8e: ; f7c8e note E_, 2 note E_, 2 loopchannel 0, Music_BugCatchingContest_branch_f7c4b -; f7cf4 -Music_BugCatchingContest_Ch2: ; f7cf4 +Music_BugCatchingContest_Ch2: stereopanning $f0 vibrato $8, $23 dutycycle $1 notetype $c, $c7 note __, 8 -Music_BugCatchingContest_branch_f7cff: ; f7cff +Music_BugCatchingContest_branch_f7cff: octave 4 note A_, 1 note __, 1 @@ -204,7 +202,7 @@ Music_BugCatchingContest_branch_f7cff: ; f7cff note A_, 1 note A_, 1 loopchannel 4, Music_BugCatchingContest_branch_f7cff -Music_BugCatchingContest_branch_f7d0a: ; f7d0a +Music_BugCatchingContest_branch_f7d0a: dutycycle $0 callchannel Music_BugCatchingContest_branch_f7d8e octave 2 @@ -328,9 +326,8 @@ Music_BugCatchingContest_branch_f7d0a: ; f7d0a note __, 3 note A_, 10 loopchannel 0, Music_BugCatchingContest_branch_f7d0a -; f7d8e -Music_BugCatchingContest_branch_f7d8e: ; f7d8e +Music_BugCatchingContest_branch_f7d8e: octave 2 note D_, 2 octave 3 @@ -372,9 +369,8 @@ Music_BugCatchingContest_branch_f7d8e: ; f7d8e note G_, 1 note __, 1 endchannel -; f7db7 -Music_BugCatchingContest_Ch3: ; f7db7 +Music_BugCatchingContest_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $14 @@ -405,7 +401,7 @@ Music_BugCatchingContest_Ch3: ; f7db7 note __, 1 note C#, 1 note C#, 1 -Music_BugCatchingContest_branch_f7dda: ; f7dda +Music_BugCatchingContest_branch_f7dda: notetype $c, $14 note F#, 5 note __, 1 @@ -587,9 +583,8 @@ Music_BugCatchingContest_branch_f7dda: ; f7dda note C#, 2 note C#, 2 loopchannel 0, Music_BugCatchingContest_branch_f7dda -; f7e9a -Music_BugCatchingContest_Ch4: ; f7e9a +Music_BugCatchingContest_Ch4: togglenoise $4 notetype $6 note C#, 1 @@ -607,7 +602,7 @@ Music_BugCatchingContest_Ch4: ; f7e9a note E_, 2 note E_, 2 callchannel Music_BugCatchingContest_branch_f7ee2 -Music_BugCatchingContest_branch_f7eaf: ; f7eaf +Music_BugCatchingContest_branch_f7eaf: note D_, 4 note D_, 4 note D_, 2 @@ -651,9 +646,8 @@ Music_BugCatchingContest_branch_f7eaf: ; f7eaf note D_, 2 callchannel Music_BugCatchingContest_branch_f7ee2 loopchannel 0, Music_BugCatchingContest_branch_f7eaf -; f7ee2 -Music_BugCatchingContest_branch_f7ee2: ; f7ee2 +Music_BugCatchingContest_branch_f7ee2: note D_, 4 note B_, 8 note D_, 2 @@ -671,5 +665,3 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2 note D_, 2 note D_, 2 endchannel -; f7ef3 - diff --git a/crysaudio/music/burnedtower.asm b/crysaudio/music/burnedtower.asm index 358a76c0..723e7814 100644 --- a/crysaudio/music/burnedtower.asm +++ b/crysaudio/music/burnedtower.asm @@ -1,11 +1,10 @@ -Music_BurnedTower: ; f6a99 - dbw $c0, Music_BurnedTower_Ch1 - dbw $01, Music_BurnedTower_Ch2 - dbw $02, Music_BurnedTower_Ch3 - dbw $03, Music_BurnedTower_Ch4 -; f6aa5 +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 -Music_BurnedTower_Ch1: ; f6aa5 +Music_BurnedTower_Ch1: tempo 168 volume $77 dutycycle $1 @@ -27,7 +26,7 @@ Music_BurnedTower_Ch1: ; f6aa5 note D_, 2 intensity $80 note C#, 6 -Music_BurnedTower_branch_f6ac8: ; f6ac8 +Music_BurnedTower_branch_f6ac8: intensity $91 octave 2 note A_, 4 @@ -37,7 +36,7 @@ Music_BurnedTower_branch_f6ac8: ; f6ac8 note A#, 6 loopchannel 2, Music_BurnedTower_branch_f6ac8 tempo 150 -Music_BurnedTower_branch_f6ad8: ; f6ad8 +Music_BurnedTower_branch_f6ad8: intensity $b1 octave 2 note A_, 4 @@ -87,7 +86,7 @@ Music_BurnedTower_branch_f6ad8: ; f6ad8 note E_, 2 intensity $a0 note D#, 6 -Music_BurnedTower_branch_f6b17: ; f6b17 +Music_BurnedTower_branch_f6b17: intensity $b1 octave 2 note B_, 4 @@ -98,16 +97,15 @@ Music_BurnedTower_branch_f6b17: ; f6b17 note C_, 6 loopchannel 2, Music_BurnedTower_branch_f6b17 loopchannel 0, Music_BurnedTower_branch_f6ad8 -; f6b29 -Music_BurnedTower_Ch2: ; f6b29 +Music_BurnedTower_Ch2: dutycycle $2 vibrato $20, $82 tone $0002 notetype $c, $70 callchannel Music_BurnedTower_branch_f6b8e intensity $c5 -Music_BurnedTower_branch_f6b39: ; f6b39 +Music_BurnedTower_branch_f6b39: callchannel Music_BurnedTower_branch_f6b8e intensity $c1 dutycycle $3 @@ -170,9 +168,8 @@ Music_BurnedTower_branch_f6b39: ; f6b39 intensity $b7 note F#, 16 loopchannel 0, Music_BurnedTower_branch_f6b39 -; f6b8e -Music_BurnedTower_branch_f6b8e: ; f6b8e +Music_BurnedTower_branch_f6b8e: octave 3 note E_, 4 note D_, 2 @@ -193,9 +190,8 @@ Music_BurnedTower_branch_f6b8e: ; f6b8e note D_, 4 note E_, 16 endchannel -; f6ba2 -Music_BurnedTower_Ch3: ; f6ba2 +Music_BurnedTower_Ch3: stereopanning $f notetype $c, $14 note __, 16 @@ -204,7 +200,7 @@ Music_BurnedTower_Ch3: ; f6ba2 note __, 12 octave 3 note D#, 4 -Music_BurnedTower_branch_f6bad: ; f6bad +Music_BurnedTower_branch_f6bad: octave 2 note A_, 2 octave 3 @@ -224,7 +220,7 @@ Music_BurnedTower_branch_f6bad: ; f6bad note E_, 2 note D#, 4 loopchannel 4, Music_BurnedTower_branch_f6bad -Music_BurnedTower_branch_f6bc3: ; f6bc3 +Music_BurnedTower_branch_f6bc3: octave 2 note B_, 2 octave 3 @@ -245,16 +241,15 @@ Music_BurnedTower_branch_f6bc3: ; f6bc3 note F_, 4 loopchannel 2, Music_BurnedTower_branch_f6bc3 loopchannel 0, Music_BurnedTower_branch_f6bad -; f6bdd -Music_BurnedTower_Ch4: ; f6bdd +Music_BurnedTower_Ch4: togglenoise $0 notetype $c -Music_BurnedTower_branch_f6be1: ; f6be1 +Music_BurnedTower_branch_f6be1: note __, 16 loopchannel 4, Music_BurnedTower_branch_f6be1 note __, 2 -Music_BurnedTower_branch_f6be7: ; f6be7 +Music_BurnedTower_branch_f6be7: stereopanning $f0 note G_, 2 note G#, 2 @@ -262,6 +257,3 @@ Music_BurnedTower_branch_f6be7: ; f6be7 note G#, 2 note G_, 4 loopchannel 0, Music_BurnedTower_branch_f6be7 -; f6bf2 - - diff --git a/crysaudio/music/celadoncity.asm b/crysaudio/music/celadoncity.asm index 12db4dad..de815cc9 100644 --- a/crysaudio/music/celadoncity.asm +++ b/crysaudio/music/celadoncity.asm @@ -1,14 +1,13 @@ -Music_CeladonCity: ; f435b - dbw $80, Music_CeladonCity_Ch1 - dbw $01, Music_CeladonCity_Ch2 - dbw $02, Music_CeladonCity_Ch3 -; f4364 +Music_CeladonCity: + musicheader 3, 1, Music_CeladonCity_Ch1 + musicheader 1, 2, Music_CeladonCity_Ch2 + musicheader 1, 3, Music_CeladonCity_Ch3 -Music_CeladonCity_Ch1: ; f4364 +Music_CeladonCity_Ch1: tempo 146 volume $77 tone $0001 -Music_CeladonCity_branch_f436c: ; f436c +Music_CeladonCity_branch_f436c: stereopanning $f notetype $c, $a6 octave 3 @@ -20,7 +19,7 @@ Music_CeladonCity_branch_f436c: ; f436c note E_, 2 note F#, 2 callchannel Music_CeladonCity_branch_f43cc -Music_CeladonCity_branch_f437d: ; f437d +Music_CeladonCity_branch_f437d: note D_, 2 note F#, 1 note A_, 1 @@ -84,9 +83,8 @@ Music_CeladonCity_branch_f437d: ; f437d note G_, 1 note A_, 8 loopchannel 0, Music_CeladonCity_branch_f436c -; f43cc -Music_CeladonCity_branch_f43cc: ; f43cc +Music_CeladonCity_branch_f43cc: note D_, 2 note G_, 1 note B_, 1 @@ -105,9 +103,8 @@ Music_CeladonCity_branch_f43cc: ; f43cc octave 3 note A_, 1 endchannel -; f43e1 -Music_CeladonCity_branch_f43e1: ; f43e1 +Music_CeladonCity_branch_f43e1: octave 2 note G_, 2 note B_, 1 @@ -134,17 +131,15 @@ Music_CeladonCity_branch_f43e1: ; f43e1 octave 3 note B_, 1 endchannel -; f43fe -Music_CeladonCity_branch_f43fe: ; f43fe +Music_CeladonCity_branch_f43fe: note D_, 2 note F#, 1 note A_, 1 loopchannel 4, Music_CeladonCity_branch_f43fe endchannel -; f4406 -Music_CeladonCity_Ch2: ; f4406 +Music_CeladonCity_Ch2: vibrato $12, $34 dutycycle $2 stereopanning $f0 @@ -159,7 +154,7 @@ Music_CeladonCity_Ch2: ; f4406 note F#, 1 note G_, 1 note A_, 8 -Music_CeladonCity_branch_f441a: ; f441a +Music_CeladonCity_branch_f441a: callchannel Music_CeladonCity_branch_f4463 note A_, 4 note F#, 4 @@ -218,9 +213,8 @@ Music_CeladonCity_branch_f441a: ; f441a octave 5 note D_, 16 loopchannel 0, Music_CeladonCity_branch_f441a -; f4463 -Music_CeladonCity_branch_f4463: ; f4463 +Music_CeladonCity_branch_f4463: intensity $b2 octave 4 note B_, 4 @@ -237,9 +231,8 @@ Music_CeladonCity_branch_f4463: ; f4463 note B_, 2 note A_, 8 endchannel -; f4474 -Music_CeladonCity_branch_f4474: ; f4474 +Music_CeladonCity_branch_f4474: note G_, 3 note B_, 1 octave 2 @@ -270,11 +263,10 @@ Music_CeladonCity_branch_f4474: ; f4474 note D_, 2 note F#, 4 endchannel -; f4492 -Music_CeladonCity_Ch3: ; f4492 +Music_CeladonCity_Ch3: vibrato $12, $24 -Music_CeladonCity_branch_f4495: ; f4495 +Music_CeladonCity_branch_f4495: notetype $c, $25 octave 3 note A_, 2 @@ -283,7 +275,7 @@ Music_CeladonCity_branch_f4495: ; f4495 note __, 2 note D_, 8 callchannel Music_CeladonCity_branch_f44fd -Music_CeladonCity_branch_f44a1: ; f44a1 +Music_CeladonCity_branch_f44a1: octave 2 note A_, 2 note __, 2 @@ -363,9 +355,8 @@ Music_CeladonCity_branch_f44a1: ; f44a1 note D_, 2 note __, 6 loopchannel 0, Music_CeladonCity_branch_f4495 -; f44fd -Music_CeladonCity_branch_f44fd: ; f44fd +Music_CeladonCity_branch_f44fd: octave 2 note G_, 2 note __, 2 @@ -382,9 +373,8 @@ Music_CeladonCity_branch_f44fd: ; f44fd octave 2 note G#, 1 endchannel -; f4510 -Music_CeladonCity_branch_f4510: ; f4510 +Music_CeladonCity_branch_f4510: octave 5 note D_, 8 note C_, 2 @@ -393,6 +383,3 @@ Music_CeladonCity_branch_f4510: ; f4510 note A_, 2 note B_, 2 endchannel -; f4518 - - diff --git a/crysaudio/music/championbattle.asm b/crysaudio/music/championbattle.asm index b524de44..e732d39c 100644 --- a/crysaudio/music/championbattle.asm +++ b/crysaudio/music/championbattle.asm @@ -1,11 +1,10 @@ -Music_ChampionBattle: ; ea9c1 - dbw $80, Music_ChampionBattle_Ch1 - dbw $01, Music_ChampionBattle_Ch2 - dbw $02, Music_ChampionBattle_Ch3 -; ea9ca +Music_ChampionBattle: + musicheader 3, 1, Music_ChampionBattle_Ch1 + musicheader 1, 2, Music_ChampionBattle_Ch2 + musicheader 1, 3, Music_ChampionBattle_Ch3 -Music_ChampionBattle_Ch1: ; ea9ca - ftempo 98 +Music_ChampionBattle_Ch1: + tempo 98 volume $77 dutycycle $3 tone $0002 @@ -18,7 +17,7 @@ Music_ChampionBattle_Ch1: ; ea9ca note A#, 4 intensity $b7 note B_, 4 -Music_ChampionBattle_branch_ea9e2: ; ea9e2 +Music_ChampionBattle_branch_ea9e2: callchannel Music_ChampionBattle_branch_eaaee octave 3 note D#, 4 @@ -26,11 +25,11 @@ Music_ChampionBattle_branch_ea9e2: ; ea9e2 callchannel Music_ChampionBattle_branch_eaaee octave 3 note E_, 4 -Music_ChampionBattle_branch_ea9f0: ; ea9f0 +Music_ChampionBattle_branch_ea9f0: callchannel Music_ChampionBattle_branch_eaafc loopchannel 3, Music_ChampionBattle_branch_ea9f0 callchannel Music_ChampionBattle_branch_eab06 -Music_ChampionBattle_branch_ea9fa: ; ea9fa +Music_ChampionBattle_branch_ea9fa: callchannel Music_ChampionBattle_branch_eaafc loopchannel 7, Music_ChampionBattle_branch_ea9fa callchannel Music_ChampionBattle_branch_eab06 @@ -73,13 +72,13 @@ Music_ChampionBattle_branch_ea9fa: ; ea9fa octave 4 note C_, 1 note C#, 1 -Music_ChampionBattle_branch_eaa35: ; eaa35 +Music_ChampionBattle_branch_eaa35: callchannel Music_ChampionBattle_branch_eab0f note E_, 2 note E_, 2 intensity $b7 note F#, 4 -Music_ChampionBattle_branch_eaa3d: ; eaa3d +Music_ChampionBattle_branch_eaa3d: intensity $b2 note E_, 2 note E_, 2 @@ -167,7 +166,7 @@ Music_ChampionBattle_branch_eaa3d: ; eaa3d intensity $90 note D#, 16 note C#, 16 -Music_ChampionBattle_branch_eaab1: ; eaab1 +Music_ChampionBattle_branch_eaab1: intensity $b2 octave 2 note A#, 2 @@ -176,7 +175,7 @@ Music_ChampionBattle_branch_eaab1: ; eaab1 octave 3 note D#, 4 loopchannel 4, Music_ChampionBattle_branch_eaab1 -Music_ChampionBattle_branch_eaabe: ; eaabe +Music_ChampionBattle_branch_eaabe: intensity $b2 note C_, 2 note C_, 2 @@ -207,9 +206,8 @@ Music_ChampionBattle_branch_eaabe: ; eaabe octave 4 note D_, 4 loopchannel 0, Music_ChampionBattle_branch_eaa35 -; eaaee -Music_ChampionBattle_branch_eaaee: ; eaaee +Music_ChampionBattle_branch_eaaee: intensity $b2 octave 2 note A#, 2 @@ -222,9 +220,8 @@ Music_ChampionBattle_branch_eaaee: ; eaaee note A#, 2 intensity $b7 endchannel -; eaafc -Music_ChampionBattle_branch_eaafc: ; eaafc +Music_ChampionBattle_branch_eaafc: intensity $b2 octave 2 note A#, 2 @@ -233,9 +230,8 @@ Music_ChampionBattle_branch_eaafc: ; eaafc octave 3 note D#, 4 endchannel -; eab06 -Music_ChampionBattle_branch_eab06: ; eab06 +Music_ChampionBattle_branch_eab06: intensity $b2 octave 2 note A#, 2 @@ -243,9 +239,8 @@ Music_ChampionBattle_branch_eab06: ; eab06 intensity $b7 note B_, 4 endchannel -; eab0f -Music_ChampionBattle_branch_eab0f: ; eab0f +Music_ChampionBattle_branch_eab0f: intensity $b5 octave 3 note D#, 2 @@ -265,9 +260,8 @@ Music_ChampionBattle_branch_eab0f: ; eab0f note G_, 2 intensity $b2 endchannel -; eab24 -Music_ChampionBattle_branch_eab24: ; eab24 +Music_ChampionBattle_branch_eab24: intensity $b2 octave 3 note A#, 2 @@ -279,9 +273,8 @@ Music_ChampionBattle_branch_eab24: ; eab24 note A#, 2 intensity $b7 endchannel -; eab31 -Music_ChampionBattle_branch_eab31: ; eab31 +Music_ChampionBattle_branch_eab31: intensity $b2 note D#, 2 note D#, 2 @@ -300,9 +293,8 @@ Music_ChampionBattle_branch_eab31: ; eab31 note C#, 4 intensity $b2 endchannel -; eab4a -Music_ChampionBattle_Ch2: ; eab4a +Music_ChampionBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -357,7 +349,7 @@ Music_ChampionBattle_Ch2: ; eab4a note E_, 8 intensity $3c note E_, 8 -Music_ChampionBattle_branch_eab9d: ; eab9d +Music_ChampionBattle_branch_eab9d: intensity $c5 note D#, 6 octave 3 @@ -425,7 +417,7 @@ Music_ChampionBattle_branch_eab9d: ; eab9d note F_, 16 note F#, 16 intensity $c4 -Music_ChampionBattle_branch_eabef: ; eabef +Music_ChampionBattle_branch_eabef: octave 5 note D#, 4 note D_, 4 @@ -498,9 +490,8 @@ Music_ChampionBattle_branch_eabef: ; eabef note F#, 8 note G#, 8 loopchannel 0, Music_ChampionBattle_branch_eab9d -; eac4f -Music_ChampionBattle_branch_eac4f: ; eac4f +Music_ChampionBattle_branch_eac4f: intensity $c2 note D#, 2 note D#, 6 @@ -512,9 +503,8 @@ Music_ChampionBattle_branch_eac4f: ; eac4f note D#, 2 intensity $c7 endchannel -; eac5c -Music_ChampionBattle_branch_eac5c: ; eac5c +Music_ChampionBattle_branch_eac5c: intensity $c2 octave 3 note D#, 2 @@ -536,9 +526,8 @@ Music_ChampionBattle_branch_eac5c: ; eac5c note D#, 2 intensity $c7 endchannel -; eac79 -Music_ChampionBattle_branch_eac79: ; eac79 +Music_ChampionBattle_branch_eac79: intensity $c1 note D#, 2 note D#, 4 @@ -549,11 +538,10 @@ Music_ChampionBattle_branch_eac79: ; eac79 note D#, 2 intensity $c5 endchannel -; eac85 -Music_ChampionBattle_Ch3: ; eac85 +Music_ChampionBattle_Ch3: notetype $c, $14 -Music_ChampionBattle_branch_eac88: ; eac88 +Music_ChampionBattle_branch_eac88: octave 3 note D#, 1 note __, 7 @@ -601,11 +589,11 @@ Music_ChampionBattle_branch_eac88: ; eac88 note A#, 2 note F_, 2 note A_, 2 -Music_ChampionBattle_branch_eacc6: ; eacc6 +Music_ChampionBattle_branch_eacc6: note D#, 2 note A#, 2 loopchannel 8, Music_ChampionBattle_branch_eacc6 -Music_ChampionBattle_branch_eaccc: ; eaccc +Music_ChampionBattle_branch_eaccc: note E_, 2 note B_, 2 loopchannel 5, Music_ChampionBattle_branch_eaccc @@ -617,11 +605,11 @@ Music_ChampionBattle_branch_eaccc: ; eaccc note B_, 2 note G_, 2 note A_, 2 -Music_ChampionBattle_branch_eacda: ; eacda +Music_ChampionBattle_branch_eacda: note D#, 2 note A#, 2 loopchannel 8, Music_ChampionBattle_branch_eacda -Music_ChampionBattle_branch_eace0: ; eace0 +Music_ChampionBattle_branch_eace0: note E_, 2 note B_, 2 loopchannel 8, Music_ChampionBattle_branch_eace0 @@ -652,7 +640,7 @@ Music_ChampionBattle_branch_eace0: ; eace0 note D#, 8 note B_, 8 note D#, 8 -Music_ChampionBattle_branch_ead05: ; ead05 +Music_ChampionBattle_branch_ead05: note D#, 2 note F#, 2 loopchannel 16, Music_ChampionBattle_branch_ead05 @@ -670,12 +658,12 @@ Music_ChampionBattle_branch_ead05: ; ead05 note D#, 2 note E_, 2 callchannel Music_ChampionBattle_branch_ead8e -Music_ChampionBattle_branch_ead1d: ; ead1d +Music_ChampionBattle_branch_ead1d: octave 3 note E_, 2 note B_, 2 loopchannel 4, Music_ChampionBattle_branch_ead1d -Music_ChampionBattle_branch_ead24: ; ead24 +Music_ChampionBattle_branch_ead24: note D#, 2 note A#, 2 loopchannel 5, Music_ChampionBattle_branch_ead24 @@ -687,7 +675,7 @@ Music_ChampionBattle_branch_ead24: ; ead24 note __, 2 note D#, 2 note __, 2 -Music_ChampionBattle_branch_ead32: ; ead32 +Music_ChampionBattle_branch_ead32: note E_, 2 note B_, 2 loopchannel 5, Music_ChampionBattle_branch_ead32 @@ -699,17 +687,17 @@ Music_ChampionBattle_branch_ead32: ; ead32 note __, 2 note E_, 2 note __, 2 -Music_ChampionBattle_branch_ead40: ; ead40 +Music_ChampionBattle_branch_ead40: note D#, 2 note G#, 2 loopchannel 8, Music_ChampionBattle_branch_ead40 -Music_ChampionBattle_branch_ead46: ; ead46 +Music_ChampionBattle_branch_ead46: note D#, 2 note A#, 2 loopchannel 7, Music_ChampionBattle_branch_ead46 note B_, 2 note A#, 2 -Music_ChampionBattle_branch_ead4e: ; ead4e +Music_ChampionBattle_branch_ead4e: octave 3 note D#, 2 note A#, 2 @@ -723,9 +711,8 @@ Music_ChampionBattle_branch_ead4e: ; ead4e note A#, 2 note G#, 2 loopchannel 0, Music_ChampionBattle_branch_eacc6 -; ead61 -Music_ChampionBattle_branch_ead61: ; ead61 +Music_ChampionBattle_branch_ead61: note D#, 1 note __, 1 note D#, 1 @@ -737,9 +724,8 @@ Music_ChampionBattle_branch_ead61: ; ead61 note __, 1 note B_, 4 endchannel -; ead6f -Music_ChampionBattle_branch_ead6f: ; ead6f +Music_ChampionBattle_branch_ead6f: note D#, 1 note __, 1 note D#, 1 @@ -760,9 +746,8 @@ Music_ChampionBattle_branch_ead6f: ; ead6f note D#, 1 note __, 1 endchannel -; ead83 -Music_ChampionBattle_branch_ead83: ; ead83 +Music_ChampionBattle_branch_ead83: octave 3 note D#, 2 note F#, 2 @@ -774,9 +759,8 @@ Music_ChampionBattle_branch_ead83: ; ead83 note C#, 2 note C_, 2 endchannel -; ead8e -Music_ChampionBattle_branch_ead8e: ; ead8e +Music_ChampionBattle_branch_ead8e: octave 3 note E_, 2 note B_, 2 @@ -788,6 +772,3 @@ Music_ChampionBattle_branch_ead8e: ; ead8e note D#, 2 note E_, 2 endchannel -; ead99 - - diff --git a/crysaudio/music/cherrygrovecity.asm b/crysaudio/music/cherrygrovecity.asm index 9751bd04..9a7e0980 100644 --- a/crysaudio/music/cherrygrovecity.asm +++ b/crysaudio/music/cherrygrovecity.asm @@ -1,11 +1,10 @@ -Music_CherrygroveCity: ; f5b03 - dbw $c0, Music_CherrygroveCity_Ch1 - dbw $01, Music_CherrygroveCity_Ch2 - dbw $02, Music_CherrygroveCity_Ch3 - dbw $03, Music_CherrygroveCity_Ch4 -; f5b0f +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 -Music_CherrygroveCity_Ch1: ; f5b0f +Music_CherrygroveCity_Ch1: tempo 152 volume $77 dutycycle $3 @@ -18,7 +17,7 @@ Music_CherrygroveCity_Ch1: ; f5b0f note C_, 2 note D_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5b26: ; f5b26 +Music_CherrygroveCity_branch_f5b26: note A_, 4 note G#, 2 note A_, 2 @@ -92,9 +91,8 @@ Music_CherrygroveCity_branch_f5b26: ; f5b26 octave 3 note C_, 4 loopchannel 0, Music_CherrygroveCity_branch_f5b26 -; f5b74 -Music_CherrygroveCity_Ch2: ; f5b74 +Music_CherrygroveCity_Ch2: dutycycle $3 vibrato $10, $36 stereopanning $f @@ -108,7 +106,7 @@ Music_CherrygroveCity_Ch2: ; f5b74 note G_, 2 note A_, 2 note A#, 2 -Music_CherrygroveCity_branch_f5b87: ; f5b87 +Music_CherrygroveCity_branch_f5b87: intensity $c6 octave 4 note C_, 6 @@ -173,9 +171,8 @@ Music_CherrygroveCity_branch_f5b87: ; f5b87 intensity $a7 note F_, 8 loopchannel 0, Music_CherrygroveCity_branch_f5b87 -; f5bd8 -Music_CherrygroveCity_Ch3: ; f5bd8 +Music_CherrygroveCity_Ch3: notetype $c, $16 note __, 4 octave 4 @@ -186,7 +183,7 @@ Music_CherrygroveCity_Ch3: ; f5bd8 note G_, 2 note F_, 2 note E_, 2 -Music_CherrygroveCity_branch_f5be4: ; f5be4 +Music_CherrygroveCity_branch_f5be4: note A_, 2 note F_, 2 note A_, 2 @@ -284,13 +281,12 @@ Music_CherrygroveCity_branch_f5be4: ; f5be4 note F_, 2 note A_, 2 loopchannel 0, Music_CherrygroveCity_branch_f5be4 -; f5c48 -Music_CherrygroveCity_Ch4: ; f5c48 +Music_CherrygroveCity_Ch4: togglenoise $3 notetype $c note __, 16 -Music_CherrygroveCity_branch_f5c4d: ; f5c4d +Music_CherrygroveCity_branch_f5c4d: note C#, 2 note __, 2 note G_, 2 @@ -307,6 +303,3 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d note C#, 2 note G_, 2 loopchannel 0, Music_CherrygroveCity_branch_f5c4d -; f5c60 - - diff --git a/crysaudio/music/clair.asm b/crysaudio/music/clair.asm index 65808d6a..90d676cf 100644 --- a/crysaudio/music/clair.asm +++ b/crysaudio/music/clair.asm @@ -1,11 +1,10 @@ -Music_Clair: ; 1fa8d - dbw $c0, Music_Clair_Ch1 - dbw $01, Music_Clair_Ch2 - dbw $02, Music_Clair_Ch3 - dbw $03, Music_Clair_Ch4 -; 1fa99 +Music_Clair: + musicheader 4, 1, Music_Clair_Ch1 + musicheader 1, 2, Music_Clair_Ch2 + musicheader 1, 3, Music_Clair_Ch3 + musicheader 1, 4, Music_Clair_Ch4 -Music_Clair_Ch1: ; 1fa99 +Music_Clair_Ch1: tempo 136 volume $77 tone $0001 @@ -13,7 +12,7 @@ Music_Clair_Ch1: ; 1fa99 stereopanning $f notetype $c, $93 dutycycle $3 -Music_Clair_branch_1faab: ; 1faab +Music_Clair_branch_1faab: octave 4 note F_, 1 note F#, 1 @@ -37,7 +36,7 @@ Music_Clair_branch_1faab: ; 1faab note D#, 4 note F_, 4 note G_, 4 -Music_Clair_branch_1fac9: ; 1fac9 +Music_Clair_branch_1fac9: intensity $93 callchannel Music_Clair_branch_1fb12 octave 2 @@ -95,9 +94,8 @@ Music_Clair_branch_1fac9: ; 1fac9 octave 4 note D#, 1 loopchannel 0, Music_Clair_branch_1fac9 -; 1fb12 -Music_Clair_branch_1fb12: ; 1fb12 +Music_Clair_branch_1fb12: dutycycle $3 stereopanning $ff octave 3 @@ -122,9 +120,8 @@ Music_Clair_branch_1fb12: ; 1fb12 note C#, 1 note __, 1 endchannel -; 1fb2e -Music_Clair_branch_1fb2e: ; 1fb2e +Music_Clair_branch_1fb2e: octave 4 note F#, 1 note D#, 1 @@ -144,13 +141,12 @@ Music_Clair_branch_1fb2e: ; 1fb2e note D#, 1 note F#, 1 endchannel -; 1fb41 -Music_Clair_Ch2: ; 1fb41 +Music_Clair_Ch2: dutycycle $3 vibrato $12, $34 notetype $6, $b7 -Music_Clair_branch_1fb49: ; 1fb49 +Music_Clair_branch_1fb49: octave 3 note A#, 2 note B_, 2 @@ -189,7 +185,7 @@ Music_Clair_branch_1fb49: ; 1fb49 note G_, 2 note A#, 2 intensity $b7 -Music_Clair_branch_1fb77: ; 1fb77 +Music_Clair_branch_1fb77: callchannel Music_Clair_branch_1fba6 note F#, 2 note __, 4 @@ -207,9 +203,9 @@ Music_Clair_branch_1fb77: ; 1fb77 octave 3 note A#, 16 note __, 4 - forceoctave $c + pitchoffset 0, CC callchannel Music_Clair_branch_1fba6 - forceoctave $0 + pitchoffset 0, C_ octave 5 note F#, 2 note __, 4 @@ -228,9 +224,8 @@ Music_Clair_branch_1fb77: ; 1fb77 note G#, 16 note __, 4 loopchannel 0, Music_Clair_branch_1fb77 -; 1fba6 -Music_Clair_branch_1fba6: ; 1fba6 +Music_Clair_branch_1fba6: octave 4 note F#, 2 note __, 4 @@ -250,11 +245,10 @@ Music_Clair_branch_1fba6: ; 1fba6 note D#, 16 note __, 4 endchannel -; 1fbb9 -Music_Clair_Ch3: ; 1fbb9 +Music_Clair_Ch3: notetype $c, $14 - forceoctave $c + pitchoffset 0, CC octave 3 note C#, 2 note __, 4 @@ -274,7 +268,7 @@ Music_Clair_Ch3: ; 1fbb9 note A#, 4 note G#, 4 note G_, 4 -Music_Clair_branch_1fbd1: ; 1fbd1 +Music_Clair_branch_1fbd1: callchannel Music_Clair_branch_1fc3c octave 2 note C#, 2 @@ -375,9 +369,8 @@ Music_Clair_branch_1fbd1: ; 1fbd1 octave 1 note G#, 1 loopchannel 0, Music_Clair_branch_1fbd1 -; 1fc3c -Music_Clair_branch_1fc3c: ; 1fc3c +Music_Clair_branch_1fc3c: octave 1 note G#, 2 note __, 1 @@ -393,9 +386,8 @@ Music_Clair_branch_1fc3c: ; 1fc3c octave 1 note G#, 2 endchannel -; 1fc4b -Music_Clair_Ch4: ; 1fc4b +Music_Clair_Ch4: togglenoise $3 notetype $c stereopanning $f0 @@ -411,7 +403,7 @@ Music_Clair_Ch4: ; 1fc4b note D_, 2 note D_, 1 note D_, 1 -Music_Clair_branch_1fc5e: ; 1fc5e +Music_Clair_branch_1fc5e: stereopanning $ff callchannel Music_Clair_branch_1fc6e note G_, 1 @@ -419,9 +411,8 @@ Music_Clair_branch_1fc5e: ; 1fc5e callchannel Music_Clair_branch_1fc6e note F#, 1 loopchannel 0, Music_Clair_branch_1fc5e -; 1fc6e -Music_Clair_branch_1fc6e: ; 1fc6e +Music_Clair_branch_1fc6e: note D#, 2 stereopanning $f0 note G_, 2 @@ -440,6 +431,3 @@ Music_Clair_branch_1fc6e: ; 1fc6e stereopanning $f0 note G_, 1 endchannel -; 1fc87 - - diff --git a/crysaudio/music/contestresults.asm b/crysaudio/music/contestresults.asm index 7b0f4815..85d8291e 100644 --- a/crysaudio/music/contestresults.asm +++ b/crysaudio/music/contestresults.asm @@ -1,15 +1,14 @@ -Music_ContestResults: ; efb3e - dbw $c0, Music_ContestResults_Ch1 - dbw $01, Music_ContestResults_Ch2 - dbw $02, Music_ContestResults_Ch3 - dbw $03, Music_ContestResults_Ch4 -; efb4a +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 -Music_ContestResults_Ch1: ; efb4a +Music_ContestResults_Ch1: tempo 144 volume $77 notetype $c, $51 -Music_ContestResults_branch_efb52: ; efb52 +Music_ContestResults_branch_efb52: note __, 2 octave 2 note G_, 1 @@ -48,11 +47,10 @@ Music_ContestResults_branch_efb52: ; efb52 note G_, 1 note __, 1 loopchannel 0, Music_ContestResults_branch_efb52 -; efb7b -Music_ContestResults_Ch2: ; efb7b +Music_ContestResults_Ch2: notetype $c, $61 -Music_ContestResults_branch_efb7e: ; efb7e +Music_ContestResults_branch_efb7e: octave 2 note C_, 2 octave 3 @@ -93,7 +91,7 @@ Music_ContestResults_branch_efb7e: ; efb7e octave 3 note F_, 1 note __, 1 -Music_ContestResults_branch_efba6: ; efba6 +Music_ContestResults_branch_efba6: octave 2 note D_, 2 octave 3 @@ -126,12 +124,11 @@ Music_ContestResults_branch_efba6: ; efba6 note D_, 1 note __, 1 loopchannel 0, Music_ContestResults_branch_efb7e -; efbcc -Music_ContestResults_Ch3: ; efbcc +Music_ContestResults_Ch3: vibrato $8, $24 notetype $c, $23 -Music_ContestResults_branch_efbd2: ; efbd2 +Music_ContestResults_branch_efbd2: octave 4 note E_, 5 note __, 1 @@ -152,12 +149,11 @@ Music_ContestResults_branch_efbd2: ; efbd2 note A_, 8 note G_, 8 loopchannel 0, Music_ContestResults_branch_efbd2 -; efbe9 -Music_ContestResults_Ch4: ; efbe9 +Music_ContestResults_Ch4: togglenoise $4 notetype $6 -Music_ContestResults_branch_efbed: ; efbed +Music_ContestResults_branch_efbed: note C#, 4 note C#, 4 note C#, 2 @@ -175,6 +171,3 @@ Music_ContestResults_branch_efbed: ; efbed note G_, 1 note G_, 1 loopchannel 0, Music_ContestResults_branch_efbed -; efc01 - - diff --git a/crysaudio/music/credits.asm b/crysaudio/music/credits.asm index d721eb77..8d862240 100644 --- a/crysaudio/music/credits.asm +++ b/crysaudio/music/credits.asm @@ -1,12 +1,11 @@ -Music_Credits: ; 1f31c - dbw $c0, Music_Credits_Ch1 - dbw $01, Music_Credits_Ch2 - dbw $02, Music_Credits_Ch3 - dbw $03, Music_Credits_Ch4 -; 1f328 +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 -Music_Credits_Ch1: ; 1f328 - ftempo 139 +Music_Credits_Ch1: + tempo 139 volume $77 stereopanning $f dutycycle $3 @@ -142,12 +141,12 @@ Music_Credits_Ch1: ; 1f328 note E_, 7 octave 3 note __, 1 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Credits_branch_1f483 callchannel Music_Credits_branch_1f4ed callchannel Music_Credits_branch_1f4f8 callchannel Music_Credits_branch_1f559 - forceoctave $0 + pitchoffset 0, C_ octave 3 note A_, 12 notetype $8, $a7 @@ -166,7 +165,7 @@ Music_Credits_Ch1: ; 1f328 octave 4 note C#, 6 callchannel Music_Credits_branch_1f582 - ftempo 143 + tempo 143 octave 4 note D_, 6 octave 3 @@ -174,14 +173,14 @@ Music_Credits_Ch1: ; 1f328 note G_, 6 octave 4 note D_, 6 - ftempo 146 + tempo 146 note E_, 6 note F#, 6 note A_, 6 octave 5 note C#, 6 notetype $c, $a7 -Music_Credits_branch_1f407: ; 1f407 +Music_Credits_branch_1f407: octave 3 note A_, 1 octave 4 @@ -194,7 +193,7 @@ Music_Credits_branch_1f407: ; 1f407 note __, 1 note G#, 1 note __, 1 - ftempo 153 + tempo 153 notetype $c, $a7 octave 3 note C_, 1 @@ -245,7 +244,7 @@ Music_Credits_branch_1f407: ; 1f407 note __, 1 note A_, 1 note __, 1 - ftempo 160 + tempo 160 notetype $c, $a7 octave 2 note G_, 1 @@ -280,9 +279,8 @@ Music_Credits_branch_1f407: ; 1f407 note __, 16 note __, 16 endchannel -; 1f483 -Music_Credits_branch_1f483: ; 1f483 +Music_Credits_branch_1f483: note C_, 16 note F#, 1 note G_, 3 @@ -389,9 +387,8 @@ Music_Credits_branch_1f483: ; 1f483 note C_, 1 note __, 1 endchannel -; 1f4ed -Music_Credits_branch_1f4ed: ; 1f4ed +Music_Credits_branch_1f4ed: octave 4 note C_, 4 octave 3 @@ -403,9 +400,8 @@ Music_Credits_branch_1f4ed: ; 1f4ed note C_, 4 note D#, 4 endchannel -; 1f4f8 -Music_Credits_branch_1f4f8: ; 1f4f8 +Music_Credits_branch_1f4f8: octave 3 note A_, 2 octave 4 @@ -503,9 +499,8 @@ Music_Credits_branch_1f4f8: ; 1f4f8 note C_, 2 note F_, 2 endchannel -; 1f559 -Music_Credits_branch_1f559: ; 1f559 +Music_Credits_branch_1f559: octave 3 note A_, 2 octave 4 @@ -547,9 +542,8 @@ Music_Credits_branch_1f559: ; 1f559 note A#, 2 note A_, 2 endchannel -; 1f582 -Music_Credits_branch_1f582: ; 1f582 +Music_Credits_branch_1f582: note __, 6 octave 3 note D_, 6 @@ -561,9 +555,8 @@ Music_Credits_branch_1f582: ; 1f582 note F#, 6 note C#, 6 endchannel -; 1f58d -Music_Credits_Ch2: ; 1f58d +Music_Credits_Ch2: dutycycle $1 vibrato $14, $23 notetype $c, $2f @@ -664,11 +657,11 @@ Music_Credits_Ch2: ; 1f58d note A_, 4 note G_, 4 notetype $6, $c7 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Credits_branch_1f6cb callchannel Music_Credits_branch_1f73f callchannel Music_Credits_branch_1f748 - forceoctave $0 + pitchoffset 0, C_ octave 5 note C#, 1 note D_, 11 @@ -723,7 +716,7 @@ Music_Credits_Ch2: ; 1f58d octave 2 note F#, 1 note __, 1 -Music_Credits_branch_1f657: ; 1f657 +Music_Credits_branch_1f657: octave 1 note G_, 2 octave 2 @@ -818,9 +811,8 @@ Music_Credits_branch_1f657: ; 1f657 note __, 16 note __, 16 endchannel -; 1f6cb -Music_Credits_branch_1f6cb: ; 1f6cb +Music_Credits_branch_1f6cb: octave 2 note C_, 4 intensity $b1 @@ -931,9 +923,8 @@ Music_Credits_branch_1f6cb: ; 1f6cb octave 3 note C_, 2 endchannel -; 1f73f -Music_Credits_branch_1f73f: ; 1f73f +Music_Credits_branch_1f73f: octave 1 note G_, 4 note __, 4 @@ -943,9 +934,8 @@ Music_Credits_branch_1f73f: ; 1f73f note G_, 12 note F#, 8 endchannel -; 1f748 -Music_Credits_branch_1f748: ; 1f748 +Music_Credits_branch_1f748: octave 4 note A_, 8 note B_, 8 @@ -980,9 +970,8 @@ Music_Credits_branch_1f748: ; 1f748 octave 5 note C_, 4 endchannel -; 1f772 -Music_Credits_Ch3: ; 1f772 +Music_Credits_Ch3: vibrato $16, $23 notetype $c, $34 stereopanning $ff @@ -1139,15 +1128,15 @@ Music_Credits_Ch3: ; 1f772 note F_, 1 note F#, 7 note G_, 8 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Credits_branch_1f8aa callchannel Music_Credits_branch_1f8db - forceoctave $12 + pitchoffset 1, D_ callchannel Music_Credits_branch_1f8e7 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Credits_branch_1f934 callchannel Music_Credits_branch_1f94b - forceoctave $0 + pitchoffset 0, C_ octave 6 note C#, 2 octave 5 @@ -1238,9 +1227,8 @@ Music_Credits_Ch3: ; 1f772 note __, 16 note __, 16 endchannel -; 1f8aa -Music_Credits_branch_1f8aa: ; 1f8aa +Music_Credits_branch_1f8aa: note G_, 16 octave 6 note C#, 1 @@ -1280,9 +1268,8 @@ Music_Credits_branch_1f8aa: ; 1f8aa notetype $c, $14 note D_, 16 endchannel -; 1f8db -Music_Credits_branch_1f8db: ; 1f8db +Music_Credits_branch_1f8db: notetype $6, $14 note F#, 1 note G_, 3 @@ -1293,9 +1280,8 @@ Music_Credits_branch_1f8db: ; 1f8db note G_, 12 note G#, 8 endchannel -; 1f8e7 -Music_Credits_branch_1f8e7: ; 1f8e7 +Music_Credits_branch_1f8e7: octave 3 note F_, 4 note __, 2 @@ -1373,9 +1359,8 @@ Music_Credits_branch_1f8e7: ; 1f8e7 octave 3 note G#, 2 endchannel -; 1f934 -Music_Credits_branch_1f934: ; 1f934 +Music_Credits_branch_1f934: octave 2 note F_, 4 note __, 2 @@ -1399,9 +1384,8 @@ Music_Credits_branch_1f934: ; 1f934 note E_, 2 note F_, 2 endchannel -; 1f94b -Music_Credits_branch_1f94b: ; 1f94b +Music_Credits_branch_1f94b: octave 2 note F#, 4 note __, 2 @@ -1442,9 +1426,8 @@ Music_Credits_branch_1f94b: ; 1f94b note G_, 2 note D_, 2 endchannel -; 1f973 -Music_Credits_Ch4: ; 1f973 +Music_Credits_Ch4: togglenoise $3 notetype $c note G#, 1 @@ -1480,7 +1463,7 @@ Music_Credits_Ch4: ; 1f973 callchannel Music_Credits_branch_1fa4d callchannel Music_Credits_branch_1fa4d callchannel Music_Credits_branch_1fa6d -Music_Credits_branch_1f9a8: ; 1f9a8 +Music_Credits_branch_1f9a8: note A#, 2 note G_, 1 note G_, 1 @@ -1508,7 +1491,7 @@ Music_Credits_branch_1f9a8: ; 1f9a8 note C#, 1 note D_, 1 note D_, 1 -Music_Credits_branch_1f9c6: ; 1f9c6 +Music_Credits_branch_1f9c6: note A#, 2 note G_, 1 note G_, 1 @@ -1542,7 +1525,7 @@ Music_Credits_branch_1f9c6: ; 1f9c6 callchannel Music_Credits_branch_1fa4d callchannel Music_Credits_branch_1fa4d callchannel Music_Credits_branch_1fa6d -Music_Credits_branch_1f9f2: ; 1f9f2 +Music_Credits_branch_1f9f2: note A#, 2 note G_, 1 note G_, 1 @@ -1621,9 +1604,8 @@ Music_Credits_branch_1f9f2: ; 1f9f2 note __, 16 note __, 16 endchannel -; 1fa4d -Music_Credits_branch_1fa4d: ; 1fa4d +Music_Credits_branch_1fa4d: note G#, 1 note G_, 1 note G_, 1 @@ -1656,9 +1638,8 @@ Music_Credits_branch_1fa4d: ; 1fa4d note G_, 1 note F#, 2 endchannel -; 1fa6d -Music_Credits_branch_1fa6d: ; 1fa6d +Music_Credits_branch_1fa6d: note G#, 1 note G_, 1 note G_, 1 @@ -1691,6 +1672,3 @@ Music_Credits_branch_1fa6d: ; 1fa6d note A#, 1 note D_, 1 endchannel -; 1fa8d - - diff --git a/crysaudio/music/crystalopening.asm b/crysaudio/music/crystalopening.asm index dad4fa44..ca2e525d 100644 --- a/crysaudio/music/crystalopening.asm +++ b/crysaudio/music/crystalopening.asm @@ -1,12 +1,11 @@ -Music_CrystalOpening: ; 1786e8 - dbw $c0, Music_CrystalOpening_Ch1 - dbw $01, Music_CrystalOpening_Ch2 - dbw $02, Music_CrystalOpening_Ch3 - dbw $03, Music_CrystalOpening_Ch4 -; 1786f4 +Music_CrystalOpening: + musicheader 4, 1, Music_CrystalOpening_Ch1 + musicheader 1, 2, Music_CrystalOpening_Ch2 + musicheader 1, 3, Music_CrystalOpening_Ch3 + musicheader 1, 4, Music_CrystalOpening_Ch4 -Music_CrystalOpening_Ch1: ; 1786f4 - ftempo 136 +Music_CrystalOpening_Ch1: + tempo 136 volume $77 tone $0002 vibrato $10, $34 @@ -121,9 +120,8 @@ Music_CrystalOpening_Ch1: ; 1786f4 octave 2 note D_, 16 endchannel -; 17877a -Music_CrystalOpening_Ch2: ; 17877a +Music_CrystalOpening_Ch2: notetype $c, $a2 dutycycle $3 vibrato $8, $44 @@ -177,9 +175,8 @@ Music_CrystalOpening_Ch2: ; 17877a octave 3 note D_, 16 endchannel -; 1787c8 -Music_CrystalOpening_Ch3: ; 1787c8 +Music_CrystalOpening_Ch3: notetype $c, $16 octave 1 note B_, 4 @@ -242,9 +239,8 @@ Music_CrystalOpening_Ch3: ; 1787c8 note D_, 1 note __, 15 endchannel -; 178810 -Music_CrystalOpening_Ch4: ; 178810 +Music_CrystalOpening_Ch4: stereopanning $f togglenoise $3 notetype $c @@ -361,6 +357,3 @@ Music_CrystalOpening_Ch4: ; 178810 note __, 16 note __, 16 endchannel -; 178889 - - diff --git a/crysaudio/music/custom/ceruleanGSC.asm b/crysaudio/music/custom/ceruleanGSC.asm deleted file mode 100644 index f9b07bc4..00000000 --- a/crysaudio/music/custom/ceruleanGSC.asm +++ /dev/null @@ -1,948 +0,0 @@ -Music_CeruleanGSC: ; f5127 - dbw $c0, Music_CeruleanGSC_Ch1 - dbw $01, Music_CeruleanGSC_Ch2 - dbw $02, Music_CeruleanGSC_Ch3 - dbw $03, Music_CeruleanGSC_Ch4 - -Music_CeruleanGSC_Ch1: - tempo $94 - volume $77 - notetype $C, $B2 - dutycycle 2 - octave 4 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 -Music_CeruleanGSC_Loop1: - intensity $B1 - octave 3 - note G#, 2 - octave 4 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note B_, 2 - octave 4 - note D#, 2 - octave 3 - note B_, 2 - octave 4 - note D#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - note D#, 2 - note B_, 2 - note D#, 2 - note B_, 2 - octave 3 - note B_, 4 - note B_, 2 - note G#, 1 - note G#, 1 - note E_, 2 - note F#, 2 - intensity $B4 - note G#, 1 - note A_, 1 - note B_, 1 - octave 4 - note C#, 1 - octave 3 - note B_, 6 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note A_, 8 - intensity $B2 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 2 - note G#, 1 - note G#, 1 - note E_, 2 - note F#, 2 - intensity $B4 - note G#, 1 - note A_, 1 - note B_, 1 - octave 4 - note C#, 1 - octave 3 - note B_, 6 - note G#, 1 - note B_, 1 - octave 4 - note D#, 8 - octave 3 - note E_, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note __, 3 - note B_, 4 - note G#, 4 - note B_, 2 - note B_, 1 - octave 4 - note C#, 1 - note D#, 1 - note __, 3 - note D#, 4 - octave 3 - note B_, 4 - note A_, 1 - note G#, 1 - note A_, 1 - note B_, 1 - octave 4 - note C#, 1 - note __, 1 - note C#, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - note D#, 1 - note E_, 1 - note __, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - octave 5 - note B_, 1 - note F#, 1 - note D#, 1 - note C#, 1 - octave 4 - note B_, 1 - octave 5 - note C#, 1 - note D#, 1 - note F#, 1 - note B_, 8 - intensity $B6 - octave 3 - note G#, 8 - note G#, 4 - note B_, 4 - octave 4 - note E_, 4 - note F#, 4 - note G#, 8 -;Channel1_Bar16: - note D#, 8 - octave 3 - note B_, 4 - octave 4 - note B_, 4 -;Channel1_Bar17: - note A_, 4 - note B_, 4 - intensity $B2 - note E_, 2 - note D#, 2 - note C#, 2 - note C_, 2 -;Channel1_Bar18: - loopchannel 0, Music_CeruleanGSC_Loop1 - -Music_CeruleanGSC_Ch2: -;Channel2_Bar1: - vibrato 12,$34 - dutycycle 2 - notetype 2, $C2 - note __, 2 - notetype 12, $C2 - octave 5 - note E_, 2 - note D#, 2 - note C#, 2 - octave 4 - note B_, 2 - note A_, 2 - note B_, 2 - octave 5 - note C#, 2 - notetype 2, $C2 - note D#, 10 -;Channel2_Bar2: -Music_CeruleanGSC_Loop2: - notetype 12, $C2 - note E_, 6 - octave 3 - note E_, 1 - octave 2 - note B_, 1 - octave 3 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 -;Channel2_Bar3: - intensity $C4 - note G#, 6 - note A_, 1 - note G#, 1 - note F#, 14 -;Channel2_Bar4: - intensity $C2 - note E_, 1 - octave 2 - note B_, 1 - octave 3 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 -;Channel2_Bar5: - intensity $C4 - note G#, 6 - note E_, 1 - note G#, 1 - note B_, 14 -;Channel2_Bar6: - intensity $C2 - dutycycle 1 - octave 4 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 -;Channel2_Bar7: - intensity $C4 - note G#, 6 - note A_, 1 - note G#, 1 - note F#, 8 -;Channel2_Bar8: - intensity $C2 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 2 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 -;Channel2_Bar9: - intensity $C4 - note G#, 6 - note E_, 1 - note G#, 1 - note B_, 8 -;Channel2_Bar10: - octave 3 - note C#, 1 - octave 2 - note B_, 1 - octave 3 - note C#, 1 - note D#, 1 - note E_, 1 - note __, 3 - unknownmusic0xde 10 - dutycycle 0 - octave 4 - note G#, 4 - note E_, 4 -;Channel2_Bar11: - unknownmusic0xde 85 - dutycycle 1 - octave 3 - note D#, 1 - note C#, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note __, 3 - unknownmusic0xde 10 - dutycycle 0 - octave 4 - note B_, 4 - note F#, 4 -;Channel2_Bar12: - unknownmusic0xde 85 - dutycycle 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - octave 3 - note C#, 1 - note D#, 1 - note E_, 1 - note __, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note G#, 1 - note __, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note A_, 1 -;Channel2_Bar13: - note B_, 1 - note F#, 1 - note D#, 1 - note C#, 1 - octave 2 - note B_, 1 - octave 3 - note C#, 1 - note D#, 1 - note F#, 1 - note B_, 8 -;Channel2_Bar14: - unknownmusic0xde 10 - intensity $C6 - dutycycle 2 - octave 4 - note E_, 8 - octave 3 - note B_, 4 - octave 4 - note F#, 4 -;Channel2_Bar15: - note G#, 4 - note A_, 4 - note B_, 8 -;Channel2_Bar16: - note B_, 8 - note G#, 4 - octave 5 - note D#, 4 -;Channel2_Bar17: - note C#, 4 - note D#, 4 - unknownmusic0xde 170 - notetype 2, $C2 - note __, 2 - notetype 12, $C2 - note E_, 2 - note D#, 2 - note C#, 2 - notetype 2, $C2 - note D#, 10 -;Channel2_Bar18: - loopchannel 0, Music_CeruleanGSC_Loop2 - -Music_CeruleanGSC_Ch3: - notetype 6, $15 - vibrato 12, $24 -;Channel3_Bar1: - note __, 16 - octave 4 - note E_, 3 - note __, 1 - note D#, 3 - note __, 1 - note C#, 3 - note __, 1 - note C_, 3 - note __, 1 -;Channel3_Bar2: -Music_CeruleanGSC_Loop3: - octave 1 - note E_, 2 - note __, 6 - note E_, 2 - note __, 4 - note E_, 1 - note __, 1 - note E_, 2 - note __, 2 - octave 2 - note E_, 2 - note __, 2 - octave 1 - note E_, 2 - note __, 2 - octave 2 - note E_, 2 - note __, 2 - octave 1 - note F#, 2 - note __, 6 - note F#, 2 - note __, 4 - octave 2 - note C#, 2 - octave 1 - note B_, 2 - note __, 2 - octave 2 - note B_, 2 - note __, 2 - octave 1 - note B_, 2 - note __, 2 - octave 2 - note B_, 2 - note __, 2 - octave 1 - note E_, 2 - note __, 6 - note E_, 2 - note __, 4 - note E_, 1 - note __, 1 - note E_, 2 - note __, 2 - octave 2 - note E_, 2 - note __, 2 - octave 1 - note E_, 2 - note __, 2 - octave 2 - note E_, 2 - note __, 2 - octave 1 - note F#, 2 - note __, 6 - note F#, 2 - note __, 4 - octave 2 - note C#, 2 - octave 1 - note B_, 2 - note __, 2 - octave 2 - note B_, 2 - note __, 2 - octave 1 - note B_, 2 - octave 2 - note B_, 2 - octave 4 - note B_, 2 - octave 3 - note B_, 2 - octave 1 - note E_, 2 - note __, 2 - octave 5 - note G#, 1 - note __, 3 - octave 1 - note E_, 2 - note __, 2 - octave 5 - note G#, 1 - note __, 1 - octave 1 - note E_, 1 - note __, 1 - note E_, 2 - note __, 2 - octave 5 - note G#, 1 - note __, 1 - octave 2 - note E_, 2 - octave 1 - note E_, 2 - octave 2 - note E_, 2 - octave 5 - note G#, 1 - note __, 1 - octave 1 - note E_, 2 - note F#, 2 - note __, 2 - octave 6 - note C#, 1 - note __, 3 - octave 1 - note F#, 2 - note __, 2 - octave 6 - note C#, 1 - note __, 1 - octave 2 - note C#, 2 - octave 1 - note B_, 2 - note __, 2 - octave 6 - note D#, 1 - note __, 1 - octave 2 - note B_, 2 - octave 1 - note B_, 2 - octave 2 - note B_, 2 - octave 6 - note D#, 1 - note __, 1 - octave 1 - note B_, 2 - octave 2 - note E_, 2 - octave 3 - note E_, 2 - octave 4 - note E_, 2 - octave 5 - note E_, 2 - octave 1 - note E_, 2 - note __, 2 - octave 5 - note G#, 1 - note __, 1 - octave 1 - note E_, 1 - note __, 1 - note E_, 2 - note __, 2 - octave 5 - note G#, 1 - note __, 1 - octave 2 - note E_, 2 - octave 1 - note E_, 2 - octave 2 - note E_, 2 - octave 5 - note G#, 1 - note __, 1 - octave 1 - note E_, 2 - note F#, 2 - note __, 2 - octave 5 - note E_, 1 - note __, 3 - octave 1 - note F#, 2 - note __, 2 - octave 5 - note E_, 1 - note __, 1 - octave 2 - note C#, 2 - octave 1 - note B_, 2 - note __, 2 - octave 5 - note F#, 1 - note __, 1 - octave 1 - note B_, 2 - note G#, 2 - octave 4 - note D#, 2 - octave 5 - note G#, 1 - note __, 1 - octave 3 - note G#, 2 - octave 2 - note C#, 2 - note __, 6 - note C#, 2 - note __, 4 - note C#, 1 - note __, 1 - note C#, 2 - note __, 2 - octave 3 - note C#, 2 - note __, 2 - octave 2 - note C#, 2 - note __, 2 - octave 3 - note C#, 2 - note __, 2 - octave 1 - note G#, 2 - note __, 6 - note G#, 2 - note __, 4 - note G#, 1 - note __, 1 - note G#, 2 - note __, 2 - octave 2 - note G#, 2 - note __, 2 - octave 1 - note G#, 2 - note __, 2 - octave 2 - note G#, 2 - note __, 2 - octave 1 - note A_, 4 - octave 2 - note A_, 2 - note __, 2 - octave 1 - note A_, 2 - note __, 2 - note G#, 4 - octave 2 - note G#, 2 - note __, 2 - octave 1 - note G#, 2 - note __, 2 - note F#, 4 - octave 2 - note F#, 2 - note __, 2 - octave 1 - note F#, 2 - note __, 2 - note B_, 2 - note __, 2 - note B_, 8 - note __, 16 - note __, 4 - octave 2 - note E_, 2 - note __, 2 - octave 1 - note E_, 2 - note __, 2 - octave 2 - note E_, 2 - note __, 6 - note E_, 2 - note __, 2 - octave 1 - note E_, 2 - note __, 2 - octave 2 - note E_, 2 - note __, 6 - note F#, 2 - note __, 2 - octave 1 - note F#, 2 - note __, 2 - octave 2 - note F#, 2 - note __, 6 - note F#, 2 - note __, 2 - octave 1 - note F#, 2 - note __, 2 - octave 2 - note F#, 2 - note __, 6 - note G#, 2 - note __, 2 - octave 1 - note G#, 2 - note __, 2 - octave 2 - note G#, 2 - note __, 6 - note G#, 2 - note __, 2 - octave 1 - note G#, 2 - note __, 2 - octave 2 - note G#, 2 - note __, 6 - note A_, 2 - note __, 2 - octave 1 - note A_, 2 - note __, 2 - octave 2 - note A_, 2 - note __, 6 - note A_, 2 - note __, 2 - octave 1 - note A_, 2 - note __, 2 - octave 2 - note A_, 2 - note __, 2 - loopchannel 0, Music_CeruleanGSC_Loop3 - -Music_CeruleanGSC_Ch4: - notetype $C - togglenoise 0 -;Channel4_Bar1: - note __, 16 -;Channel4_Bar2: -Music_CeruleanGSC_Loop4: - 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 -;Channel4_Bar3: - 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 -;Channel4_Bar4: - 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 -;Channel4_Bar5: - 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 F_, 1 -;Channel4_Bar6: - 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 -;Channel4_Bar7: - 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 A#, 2 -;Channel4_Bar8: - note F_, 1 - note F_, 1 - note G_, 1 - note F_, 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 -;Channel4_Bar9: - note A_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A_, 2 - note A#, 2 - note D_, 2 - note D_, 1 - note F_, 1 -;Channel4_Bar10: - 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 -;Channel4_Bar11: - 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 A#, 2 -;Channel4_Bar12: - note A#, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note A_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note A_, 2 - note G_, 1 - note G_, 1 -;Channel4_Bar13: - note D_, 2 - note D_, 2 - note D_, 12 -;Channel4_Bar14: - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 -;Channel4_Bar15: - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 -;Channel4_Bar16: - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 -;Channel4_Bar17: - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 2 - note D_, 2 - note F_, 1 - note F_, 1 -;Channel4_Bar18: - loopchannel 0, Music_CeruleanGSC_Loop4 diff --git a/crysaudio/music/custom/cinnabarGSC.asm b/crysaudio/music/custom/cinnabarGSC.asm deleted file mode 100644 index 567c43a7..00000000 --- a/crysaudio/music/custom/cinnabarGSC.asm +++ /dev/null @@ -1,181 +0,0 @@ -Music_CinnabarGSC: ; f5127 - dbw $40, Music_CinnabarGSC_Ch1 - dbw $01, Music_CinnabarGSC_Ch2 - -Music_CinnabarGSC_Ch1: - tempo $118 - volume $77 - dutycycle 1 - notetype $C, $B6 -;Channel1_Bar1: -Music_CinnabarGSC_Loop1: - note __, 4 - octave 3 - note D_, 4 - note E_, 6 - note C#, 2 -;Channel1_Bar2: - note D_, 4 - note B_, 4 - octave 4 - note C_, 6 - octave 3 - note A_, 2 -;Channel1_Bar3: - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 2 - note F#, 2 -;Channel1_Bar4: - note G_, 8 - note F#, 4 - note E_, 4 -;Channel1_Bar5: - note D_, 4 - note E_, 4 - note F#, 6 - note A_, 2 -;Channel1_Bar6: - note G_, 4 - note B_, 4 - octave 4 - note C_, 6 - octave 3 - note A_, 2 -;Channel1_Bar7: - note B_, 4 - note G_, 4 - note F#, 3 - note E_, 1 - note F#, 2 - note A_, 2 -;Channel1_Bar8: - note G_, 4 - octave 4 - note D_, 1 - note E_, 1 - note D_, 4 - note D_, 1 - note E_, 1 - note D_, 4 -;Channel1_Bar9: - octave 3 - note B_, 6 - note G_, 2 - note E_, 8 -;Channel1_Bar10: - octave 4 - note C_, 6 - octave 3 - note A_, 2 - note F#, 8 -;Channel1_Bar11: - octave 4 - note F#, 6 - note D_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 -;Channel1_Bar12: - note G_, 8 - note F#, 4 - note E_, 4 -;Channel1_Bar13: - loopchannel 0, Music_CinnabarGSC_Loop1 - -Music_CinnabarGSC_Ch2: - dutycycle 1 - notetype $C, $C6 -;Channel2_Bar1: -Music_CinnabarGSC_Loop2: - octave 3 - note G_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 6 - note D_, 1 - note E_, 1 -;Channel2_Bar2: - note D_, 4 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 -;Channel2_Bar3: - note E_, 4 - note D_, 4 - note C_, 3 - octave 3 - note B_, 1 - octave 4 - note C_, 2 - note E_, 2 -;Channel2_Bar4: - note D_, 4 - octave 3 - note B_, 8 - note A_, 4 -;Channel2_Bar5: - note G_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 6 - note D_, 1 - note E_, 1 -;Channel2_Bar6: - note D_, 4 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 -;Channel2_Bar7: - note E_, 4 - note D_, 4 - note C_, 3 - octave 3 - note B_, 1 - octave 4 - note C_, 2 - note D_, 1 - note E_, 1 -;Channel2_Bar8: - note D_, 4 - octave 3 - note A_, 4 - note G_, 4 - note F#, 4 -;Channel2_Bar9: - octave 4 - note D_, 6 - octave 3 - note B_, 2 - note G_, 8 -;Channel2_Bar10: - octave 4 - note E_, 6 - note C_, 2 - octave 3 - note A_, 8 -;Channel2_Bar11: - octave 4 - note A_, 6 - note F#, 2 - note D_, 2 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 -;Channel2_Bar12: - note B_, 4 - octave 4 - note D_, 4 - octave 3 - note B_, 2 - note A_, 6 -;Channel2_Bar13: - loopchannel 0, Music_CinnabarGSC_Loop2 diff --git a/crysaudio/music/custom/cinnabarremix.asm b/crysaudio/music/custom/cinnabarremix.asm deleted file mode 100644 index cfe8883c..00000000 --- a/crysaudio/music/custom/cinnabarremix.asm +++ /dev/null @@ -1,478 +0,0 @@ -Music_CinnabarRemix: - dbw $C0, Music_CinnabarRemix_Ch1 - dbw $01, Music_CinnabarRemix_Ch2 - dbw $02, Music_CinnabarRemix_Ch3 - dbw $03, Music_CinnabarRemix_Ch4 - -Music_CinnabarRemix_Ch1: ; b86d (2:786d) - tempo 144 - volume 119 - dutycycle 2 - -Music_CinnabarRemix_branch_b878: - notetype 12, 181 - note __, 4 - octave 3 - note D_, 4 - note E_, 6 - note C#, 2 - notetype 12, 177 - note D_, 4 - notetype 12, 181 - note B_, 4 - octave 4 - note C_, 6 - octave 3 - note A_, 2 - notetype 12, 177 - note B_, 4 - notetype 12, 181 - note G_, 4 - note F#, 4 - note E_, 2 - note F#, 2 - notetype 12, 177 - note G_, 4 - notetype 12, 181 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note F#, 6 - note A_, 2 - notetype 12, 177 - note G_, 4 - notetype 12, 181 - note B_, 4 - octave 4 - note C_, 6 - octave 3 - note A_, 2 - note B_, 4 - note G_, 4 - note F#, 3 - note E_, 1 - note F#, 2 - note A_, 2 - notetype 12, 162 - note G_, 4 - octave 4 - note D_, 1 - note E_, 1 - note D_, 4 - notetype 12, 114 - note D_, 1 - note E_, 1 - note D_, 4 - notetype 12, 167 - octave 3 - note B_, 6 - note G_, 2 - note E_, 8 - octave 4 - note C_, 6 - octave 3 - note A_, 2 - note F#, 8 - octave 4 - note F#, 6 - note D_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 8 - note F#, 4 - note E_, 4 - loopchannel 0, Music_CinnabarRemix_branch_b878 - - -Music_CinnabarRemix_Ch2: ; b8d4 (2:78d4) - dutycycle 2 - vibrato 12,$34 - -Music_CinnabarRemix_branch_b8d9: - unknownmusic0xde 170 - notetype 12, $C2 - octave 3 - note G_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 6 - note D_, 1 - note E_, 1 - notetype 12, 193 - note D_, 4 - notetype 12, 199 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note D_, 4 - note C_, 3 - octave 3 - note B_, 1 - octave 4 - note C_, 2 - note D_, 1 - note E_, 1 - notetype 12, 193 - note D_, 4 - notetype 12, 199 - octave 3 - note B_, 8 - note A_, 4 - note G_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 6 - note D_, 1 - note E_, 1 - notetype 12, 193 - note D_, 4 - notetype 12, 199 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note D_, 4 - note C_, 3 - octave 3 - note B_, 1 - octave 4 - note C_, 2 - note D_, 1 - note E_, 1 - notetype 12, 193 - note D_, 4 - notetype 12, 199 - octave 3 - note A_, 4 - note G_, 4 - note F#, 4 - notetype 12, 176 - unknownmusic0xde 10 - octave 4 - note D_, 6 - octave 3 - note B_, 2 - note G_, 8 - octave 4 - note E_, 6 - note C_, 2 - octave 3 - note A_, 8 - octave 4 - note A_, 6 - note F#, 2 - note D_, 2 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - note B_, 4 - octave 4 - note D_, 4 - octave 3 - note B_, 2 - note A_, 6 - loopchannel 0, Music_CinnabarRemix_branch_b8d9 - - -Music_CinnabarRemix_Ch3: ; b93d (2:793d) - notetype 6, $25 - vibrato 12, $24 -Music_CinnabarRemix_branch_b93f: - octave 2 - note G_, 1 - note __, 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note F#, 1 - note __, 1 - note G_, 1 - note __, 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note F#, 1 - note __, 1 - note G_, 1 - note __, 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note F#, 1 - note __, 1 - note G_, 1 - note __, 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note A_, 1 - note __, 1 - note G_, 1 - note __, 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note F#, 1 - note __, 1 - note G_, 1 - note __, 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note F#, 1 - note __, 1 - note G_, 1 - note __, 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note F#, 1 - note __, 1 - note G_, 1 - note __, 3 - note B_, 4 - note A_, 1 - note __, 1 - note A_, 1 - note __, 1 - octave 3 - note C_, 4 - octave 2 - note B_, 1 - note __, 3 - octave 3 - note D_, 2 - octave 2 - note B_, 1 - note B_, 1 - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - octave 3 - note C_, 2 - octave 2 - note B_, 1 - note __, 1 - note G_, 1 - note __, 3 - octave 3 - note E_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - note __, 1 - note C_, 1 - note __, 1 - note E_, 2 - note C_, 1 - note __, 1 - octave 2 - note A_, 1 - note __, 3 - octave 3 - note A_, 2 - note F#, 1 - note F#, 1 - note D_, 1 - note __, 1 - note D_, 1 - note __, 1 - note D_, 2 - note C_, 1 - note __, 1 - octave 2 - note B_, 1 - note __, 3 - octave 3 - note D_, 2 - note C_, 1 - note C_, 1 - octave 2 - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - note A_, 2 - octave 3 - note C_, 1 - note __, 1 - loopchannel 0, Music_CinnabarRemix_branch_b93f -; 0xb9eb -Music_CinnabarRemix_Ch4: - notetype $c - togglenoise 0 -Music_CinnabarRemix_Loop4: - 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 - note A#, 4 - note A_, 4 - 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 - note A_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A_, 4 - note A#, 4 - 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 - note A_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A#, 4 - note A_, 4 - 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 - note A_, 2 - note G_, 1 - note G_, 1 - note D_, 2 - note G_, 1 - note G_, 1 - note A_, 4 - note A#, 4 - note A_, 4 - note A#, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 1 - note G_, 1 - note F_, 2 - note G_, 1 - note G_, 1 - note F_, 2 - note G_, 1 - note G_, 1 - note F_, 2 - note G_, 1 - note G_, 1 - loopchannel 0, Music_CinnabarRemix_Loop4 diff --git a/crysaudio/music/custom/johtoGSC.asm b/crysaudio/music/custom/johtoGSC.asm deleted file mode 100644 index f92e608e..00000000 --- a/crysaudio/music/custom/johtoGSC.asm +++ /dev/null @@ -1,2355 +0,0 @@ -Music_JohtoGSC: - dbw $80, Music_JohtoGSC_Ch1 - dbw $01, Music_JohtoGSC_Ch2 - dbw $02, Music_JohtoGSC_Ch3 - -Music_JohtoGSC_Ch1: - ftempo 102 - volume $77 - notetype $C, $C2 - dutycycle 1 - vibrato $12, $24 - note __, 8 - octave 3 - note G#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - octave 3 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - dutycycle 2 - note E_, 6 - note E_, 6 - note E_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 6 - intensity $C7 - note D_, 4 - intensity $C2 - note E_, 6 - note D_, 6 - note E_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 6 - intensity $C7 - note F_, 4 - intensity $C2 - octave 4 - note E_, 6 - note E_, 6 - note E_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - octave 3 - note A_, 2 - note A#, 2 - intensity $C7 - note B_, 4 - intensity $C2 - octave 4 - note E_, 6 - note E_, 6 - note E_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 6 - intensity $C7 - note G_, 4 -Music_JohtoGSC_Loop1: - intensity $C2 - octave 3 - note E_, 2 - note D_, 2 - note E_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note E_, 2 - note F_, 2 - note D_, 2 - intensity $C7 - note A#, 4 - intensity $C2 - note G_, 1 - note F_, 1 - note E_, 1 - note G_, 1 - intensity $C7 - octave 4 - note C_, 4 - intensity $C2 - octave 3 - note A_, 1 - note G_, 1 - note F_, 1 - note A_, 1 - intensity $C7 - octave 4 - note D_, 4 - intensity $C2 - note C_, 1 - octave 3 - note A#, 1 - note A_, 1 - octave 4 - note C_, 1 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - octave 3 - note E_, 2 - note D_, 2 - note E_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note E_, 2 - note F_, 2 - note D_, 2 - intensity $C7 - note F_, 4 - intensity $C2 - note E_, 2 - note F_, 2 - intensity $C7 - octave 4 - note C_, 4 - intensity $C2 - octave 3 - note A#, 2 - octave 4 - note C_, 2 - intensity $C7 - octave 3 - note F_, 16 - note A_, 6 - note E_, 6 - note A#, 4 - octave 4 - note D_, 6 - note F_, 4 - intensity $C2 - note E_, 2 - note D_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C#, 2 - octave 3 - note A#, 2 - note A_, 2 - note A#, 2 - intensity $C7 - note A_, 16 - note E_, 8 - note D_, 8 - note E_, 8 - note F_, 8 - note E_, 8 - note D_, 8 - note G_, 8 - note F_, 8 - note D_, 8 - note C_, 8 - note D_, 8 - note D#, 8 - note D_, 8 - note C_, 8 - note D_, 8 - note D#, 8 - note D_, 8 - note D#, 8 - note E_, 8 - note F_, 8 - intensity $C2 - note G_, 2 - octave 4 - note C_, 2 - octave 3 - note A#, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note F_, 2 - note G_, 2 - octave 4 - note C#, 2 - note C_, 2 - note C#, 2 - note D#, 2 - note C#, 2 - note C_, 2 - octave 3 - note A#, 2 - note D#, 2 - note D_, 2 - note D#, 4 - intensity $C7 - note C_, 8 - note D#, 4 - note D_, 4 - note C_, 4 - note D#, 4 - intensity $C2 - note E_, 2 - note D#, 2 - note E_, 4 - intensity $C7 - note C#, 8 - note F_, 4 - note D#, 4 - note C#, 4 - note F_, 4 - intensity $C2 - note F#, 2 - note F_, 2 - note F#, 4 - intensity $C7 - note D_, 8 - note F#, 4 - note E_, 4 - note D_, 4 - note F#, 4 - note G_, 8 - note D#, 8 - note A#, 8 - note G_, 8 - note D#, 16 - note __, 16 - note F_, 8 - note G_, 4 - note D#, 4 - note F_, 4 - intensity $C2 - note G_, 2 - note D#, 2 - intensity $C7 - note F_, 4 - octave 2 - note A#, 4 - octave 3 - note F_, 8 - note G_, 4 - note D#, 4 - note F_, 4 - intensity $C2 - note G_, 2 - note D#, 2 - intensity $C7 - note F_, 4 - note F_, 4 - note F_, 8 - note G_, 4 - note D#, 4 - note F_, 4 - intensity $C2 - note G_, 2 - note D#, 2 - intensity $C7 - note F_, 4 - octave 2 - note A#, 4 - octave 3 - note F_, 8 - note G_, 4 - note D#, 4 - note F_, 4 - intensity $C2 - note G_, 2 - note D#, 2 - intensity $C7 - note F_, 4 - note F_, 4 - note F_, 8 - note G_, 4 - note D#, 4 - note F_, 4 - intensity $C2 - note G#, 2 - note G_, 2 - intensity $C7 - note F_, 8 - note F_, 8 - note G_, 4 - note D#, 4 - note F_, 4 - intensity $C2 - note G_, 2 - note D#, 2 - intensity $C7 - note F_, 8 - note F_, 8 - note G_, 4 - note D#, 4 - note F_, 4 - intensity $C2 - note G_, 2 - note D#, 2 - intensity $C7 - note G#, 16 - octave 4 - note C_, 16 - intensity $C2 - octave 3 - note D#, 6 - note D#, 6 - note D#, 4 - note D#, 6 - note D#, 6 - note F_, 4 - note D#, 6 - note D#, 6 - note D#, 4 - note D#, 6 - note D#, 6 - note F_, 4 - note G#, 6 - note G_, 6 - note F_, 4 - note D#, 4 - note F_, 4 - note G_, 4 - note D#, 4 - note F_, 4 - octave 4 - note C#, 2 - note C_, 2 - octave 3 - note F_, 4 - octave 4 - note C#, 2 - note C_, 2 - octave 3 - note F_, 2 - note G_, 2 - note G#, 2 - octave 4 - note C_, 2 - note C#, 2 - note C_, 2 - octave 3 - note A#, 2 - note G#, 2 - note G_, 6 - note D#, 6 - note G_, 4 - octave 4 - note C#, 4 - note C_, 4 - octave 3 - note A#, 4 - note G#, 4 - note F_, 4 - note C#, 2 - note D#, 2 - note F_, 4 - note C#, 2 - note D#, 2 - note A#, 4 - note G#, 4 - note G_, 4 - note F_, 4 - intensity $C7 - octave 2 - note A#, 8 - octave 3 - note D#, 8 - octave 2 - note A#, 8 - octave 3 - note G_, 8 - note D#, 8 - note A#, 8 - note G_, 8 - octave 4 - note D#, 8 - octave 3 - note A#, 16 - note G_, 6 - note A#, 6 - intensity $C2 - note G#, 2 - note G_, 2 - intensity $C7 - note D#, 16 - note A#, 6 - intensity $C2 - note G_, 4 - note G_, 2 - intensity $C7 - note A#, 16 - note __, 16 - note __, 4 - octave 4 - note D_, 16 - note F_, 16 - loopchannel 0, Music_JohtoGSC_Loop1 -Music_JohtoGSC_Ch2: - notetype $C, $D2 - dutycycle 1 - vibrato $6, $36 - octave 4 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note G#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note G#, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note G#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note G#, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note G#, 1 - note C_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note G#, 1 - octave 3 - note B_, 1 - note A#, 1 - note B_, 1 - octave 4 - note G#, 1 - octave 3 - note A#, 1 - note A_, 1 - note A#, 1 - intensity $D7 - dutycycle 2 - octave 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note E_, 2 - note G_, 2 - note E_, 2 - note A_, 1 - note A_, 1 - note E_, 2 - note G_, 2 - note E_, 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note E_, 2 - note G_, 2 - note E_, 2 - note A_, 1 - note A_, 1 - note E_, 2 - note G_, 2 - note E_, 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note E_, 2 - note G_, 2 - note E_, 2 - note A_, 1 - note A_, 1 - note E_, 2 - note G_, 2 - note E_, 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note E_, 2 - note G_, 2 - note E_, 2 - note A_, 1 - note A_, 1 - note E_, 2 - note G_, 2 - note G#, 2 - octave 3 - note C_, 1 - octave 2 - note C_, 1 - note G_, 2 - note A#, 2 - note G_, 2 - octave 3 - note C_, 1 - note C_, 1 - octave 2 - note G_, 2 - note A#, 2 - note G_, 2 - octave 3 - note C_, 1 - octave 2 - note C_, 1 - note G_, 2 - note A#, 2 - note G_, 2 - octave 3 - note C_, 1 - note C_, 1 - octave 2 - note G_, 2 - note A#, 2 - note G_, 2 - octave 3 - note C_, 1 - octave 2 - note C_, 1 - note G_, 2 - note A#, 2 - note G_, 2 - octave 3 - note C_, 1 - note C_, 1 - octave 2 - note G_, 2 - note A#, 2 - note G_, 2 - octave 3 - note C_, 1 - octave 2 - note C_, 1 - note G_, 2 - note A#, 2 - note G_, 2 - octave 3 - note C_, 1 - note C_, 1 - octave 2 - note G_, 2 - note A#, 2 - note G_, 2 -Music_JohtoGSC_Loop2: - octave 1 - note A_, 1 - note A_, 1 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note E_, 1 - note E_, 1 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note E_, 1 - note E_, 1 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note F_, 2 - octave 2 - note F_, 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note F_, 2 - octave 2 - note F_, 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note E_, 1 - note E_, 1 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note E_, 1 - note E_, 1 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note F_, 2 - octave 2 - note F_, 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note F_, 2 - octave 2 - note F_, 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note E_, 1 - note E_, 1 - note A_, 1 - note A_, 1 - note E_, 2 - note A_, 2 - note E_, 1 - octave 1 - note E_, 1 - octave 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note E_, 2 - note A_, 2 - note E_, 1 - note E_, 1 - note A_, 1 - note A_, 1 - note E_, 2 - note A_, 2 - note E_, 1 - octave 1 - note E_, 1 - octave 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note E_, 2 - note A_, 2 - note E_, 1 - note E_, 1 - note A_, 1 - note A_, 1 - note E_, 2 - note A_, 2 - note E_, 1 - octave 1 - note E_, 1 - octave 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note E_, 2 - note A_, 2 - note A_, 2 - octave 3 - note F_, 2 - note E_, 2 - note D_, 2 - octave 2 - note A_, 2 - note G#, 2 - note A_, 2 - note A#, 2 - note D_, 1 - note D_, 1 - note A_, 1 - note A_, 1 - note D_, 2 - note A_, 2 - note D_, 1 - octave 1 - note D_, 1 - octave 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note D_, 2 - note A_, 2 - note D_, 1 - note D_, 1 - note A_, 1 - note A_, 1 - note D_, 2 - note A_, 2 - note D_, 1 - octave 1 - note D_, 1 - octave 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note D_, 2 - note A_, 2 - note D_, 1 - note D_, 1 - note A_, 1 - note A_, 1 - note D_, 2 - note A_, 2 - note D_, 1 - octave 1 - note D_, 1 - octave 2 - note A_, 1 - octave 1 - note A_, 1 - octave 2 - note D_, 2 - note A_, 2 - note A_, 2 - octave 3 - note D_, 2 - note C_, 2 - octave 2 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 2 - note C_, 1 - note C_, 1 - note G_, 1 - note G_, 1 - note C_, 2 - note G_, 2 - note C_, 1 - octave 1 - note C_, 1 - octave 2 - note G_, 1 - octave 1 - note G_, 1 - octave 2 - note C_, 2 - note G_, 2 - note C_, 1 - note C_, 1 - note G_, 1 - note G_, 1 - note C_, 2 - note G_, 2 - note C_, 1 - octave 1 - note C_, 1 - octave 2 - note G_, 1 - octave 1 - note G_, 1 - octave 2 - note C_, 2 - note G_, 2 - note C_, 1 - note C_, 1 - note G_, 1 - note G_, 1 - note C_, 2 - note G_, 2 - note C_, 1 - octave 1 - note C_, 1 - octave 2 - note G_, 1 - octave 1 - note G_, 1 - octave 2 - note C_, 2 - note G_, 2 - note G_, 2 - octave 3 - note C_, 2 - octave 2 - note A#, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note D_, 2 - octave 1 - note G_, 1 - note G_, 1 - octave 2 - note G_, 6 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note F_, 6 - octave 1 - note E_, 1 - note E_, 1 - octave 2 - note E_, 6 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 6 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - octave 2 - note D#, 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - octave 2 - note D#, 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note C_, 1 - note C_, 1 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note C_, 2 - octave 1 - note C_, 1 - note C_, 1 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note C_, 2 - octave 1 - note C_, 1 - note C_, 1 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note C_, 2 - octave 1 - note C_, 1 - note C_, 1 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note C_, 2 - octave 1 - note C#, 1 - note C#, 1 - octave 3 - note C#, 2 - octave 2 - note G#, 2 - note C#, 2 - octave 1 - note C#, 1 - note C#, 1 - octave 3 - note C#, 2 - octave 2 - note G#, 2 - note C#, 2 - octave 1 - note C#, 1 - note C#, 1 - octave 3 - note C#, 2 - octave 2 - note G#, 2 - note C#, 2 - octave 1 - note C#, 1 - note C#, 1 - octave 3 - note C#, 2 - octave 2 - note G#, 2 - note C#, 2 - octave 1 - note D_, 1 - note D_, 1 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - note D_, 2 - octave 1 - note D_, 1 - note D_, 1 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - note D_, 2 - octave 1 - note D_, 1 - note D_, 1 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - note D_, 2 - octave 1 - note D_, 1 - note D_, 1 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - note D_, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 2 - octave 2 - note A#, 2 - note D#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 2 - octave 2 - note A#, 2 - note D#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 2 - octave 2 - note A#, 2 - note D#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 3 - note D#, 2 - octave 2 - note A#, 2 - note D#, 2 - note G_, 1 - note G_, 1 - octave 3 - note A#, 2 - note G_, 2 - octave 2 - note A#, 2 - note G_, 1 - note G_, 1 - octave 3 - note A#, 2 - note G_, 2 - octave 2 - note A#, 2 - note G_, 1 - note G_, 1 - octave 3 - note A#, 2 - note G_, 2 - octave 2 - note A#, 2 - note G_, 1 - note G_, 1 - octave 3 - note A#, 2 - note G_, 2 - octave 2 - note A#, 2 - note A#, 1 - note A#, 1 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note A#, 2 - note G#, 2 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note A#, 2 - note D#, 2 - note F_, 1 - note F_, 1 - note __, 1 - note F_, 1 - note F_, 4 - note A#, 1 - note A#, 1 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note A#, 2 - note G#, 2 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note A#, 2 - octave 3 - note C_, 2 - octave 2 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - note A#, 4 - note A#, 1 - note A#, 1 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note A#, 2 - note G#, 2 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note A#, 2 - note D#, 2 - note F_, 1 - note F_, 1 - note __, 1 - note F_, 1 - note F_, 4 - note A#, 1 - note A#, 1 - note A#, 2 - note D#, 2 - note A#, 2 - octave 3 - note C#, 2 - note C_, 2 - octave 2 - note A#, 2 - note G#, 2 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note A#, 2 - octave 3 - note C_, 2 - octave 2 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - note A#, 4 - note C#, 1 - note C#, 1 - octave 3 - note C#, 6 - octave 2 - note C_, 1 - note C_, 1 - octave 3 - note C_, 6 - octave 1 - note A#, 1 - note A#, 1 - octave 2 - note A#, 6 - octave 1 - note G#, 1 - note G#, 1 - octave 2 - note G#, 6 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note F_, 6 - octave 1 - note G_, 1 - note G_, 1 - octave 2 - note G_, 6 - octave 1 - note G#, 1 - note G#, 1 - octave 2 - note G#, 6 - octave 1 - note A#, 1 - note A#, 1 - octave 2 - note A#, 6 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note F_, 6 - octave 1 - note G_, 1 - note G_, 1 - octave 2 - note G_, 6 - octave 1 - note G#, 2 - octave 2 - note G#, 2 - note D#, 2 - note G#, 2 - octave 3 - note C_, 8 - octave 2 - note C_, 2 - octave 3 - note C_, 4 - note D#, 2 - note D#, 8 - octave 2 - note A#, 2 - note G#, 2 - note G_, 2 - note F_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - note A#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - note A#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - note A#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - note A#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - note A#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - note A#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note G#, 1 - note G#, 1 - octave 3 - note C#, 2 - note G#, 2 - note C#, 2 - octave 2 - note G#, 2 - octave 1 - note C#, 1 - note C#, 1 - octave 2 - note G#, 2 - octave 3 - note C#, 2 - octave 1 - note G#, 1 - note G#, 1 - octave 3 - note C#, 2 - note G#, 2 - note C#, 2 - octave 2 - note G#, 2 - octave 1 - note C#, 1 - note C#, 1 - octave 2 - note G#, 2 - octave 3 - note C#, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - note A#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note D#, 2 - note A#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 1 - note G#, 1 - note G#, 1 - octave 3 - note C#, 2 - note G#, 2 - note C#, 2 - octave 2 - note G#, 2 - octave 1 - note C#, 1 - note C#, 1 - octave 2 - note G#, 2 - octave 3 - note C#, 2 - octave 1 - note G#, 1 - note G#, 1 - octave 3 - note C#, 2 - note G#, 2 - note C#, 2 - octave 2 - note G#, 2 - octave 1 - note C#, 1 - note C#, 1 - octave 2 - note G#, 2 - octave 3 - note C#, 2 - octave 1 - note D#, 1 - note D#, 1 - octave 2 - note D#, 6 - octave 1 - note C#, 1 - note C#, 1 - octave 2 - note C#, 6 - octave 1 - note C_, 1 - note C_, 1 - octave 2 - note C_, 7 - octave 1 - note A#, 1 - note A#, 6 - note A#, 1 - note A#, 1 - octave 2 - note A#, 6 - octave 1 - note G#, 1 - note G#, 1 - octave 2 - note G#, 6 - octave 1 - note G_, 1 - note G_, 1 - octave 2 - note G_, 6 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note F_, 6 - octave 3 - note D#, 2 - note D#, 2 - octave 4 - note D#, 6 - octave 2 - note D#, 2 - octave 3 - note D#, 4 - octave 2 - note A#, 2 - note A#, 2 - octave 3 - note A#, 6 - octave 1 - note A#, 2 - octave 2 - note A#, 4 - note G_, 2 - note G_, 2 - octave 3 - note G_, 6 - octave 1 - note G_, 2 - octave 2 - note G_, 4 - note D#, 2 - note D#, 2 - octave 3 - note D#, 6 - octave 1 - note D#, 2 - octave 2 - note D#, 4 - note A_, 2 - note A_, 2 - octave 3 - note A_, 6 - octave 1 - note A_, 2 - octave 2 - note A_, 4 - octave 3 - note C_, 2 - note C_, 2 - octave 4 - note C_, 6 - octave 2 - note C_, 2 - octave 3 - note C_, 4 - octave 2 - note A#, 2 - note A#, 2 - octave 3 - note A#, 6 - octave 1 - note A#, 2 - octave 2 - note A#, 4 - octave 3 - note D_, 2 - note D_, 2 - octave 4 - note D_, 6 - octave 2 - note D_, 2 - octave 3 - note D_, 4 - loopchannel 0, Music_JohtoGSC_Loop2 -Music_JohtoGSC_Ch3: - notetype $C, 21 - vibrato $12, $23 - octave 2 - note D_, 1 - octave 4 - note D_, 1 - octave 3 - note D_, 2 - octave 2 - note C#, 1 - octave 4 - note C#, 1 - octave 3 - note C#, 2 - octave 2 - note C_, 1 - octave 4 - note C_, 1 - octave 3 - note C_, 2 - octave 1 - note B_, 1 - octave 3 - note B_, 1 - octave 2 - note B_, 2 - octave 1 - note A#, 1 - octave 3 - note A#, 1 - octave 2 - note A#, 2 - octave 1 - note A_, 1 - octave 3 - note A_, 1 - octave 2 - note A_, 2 - octave 1 - note G#, 1 - octave 3 - note G#, 1 - octave 2 - note G#, 2 - note G_, 1 - note G#, 1 - note A_, 2 - intensity 24 - octave 5 - note A_, 4 - octave 3 - note A_, 2 - octave 4 - note A_, 4 - octave 3 - note A_, 2 - octave 4 - note A_, 4 - note A_, 2 - octave 3 - note A_, 4 - octave 4 - note A_, 6 - note A#, 4 - note A_, 4 - octave 3 - note A_, 2 - octave 4 - note A_, 4 - octave 3 - note A_, 2 - octave 4 - note A_, 4 - note A_, 2 - octave 3 - note A_, 4 - octave 4 - note A_, 6 - note A#, 4 - octave 6 - note C_, 4 - octave 5 - note C_, 2 - octave 6 - note C_, 4 - octave 5 - note C_, 2 - octave 6 - note C_, 4 - note C_, 2 - octave 5 - note C_, 4 - octave 6 - note C_, 6 - note C#, 4 - intensity 16 - note C_, 2 - octave 4 - note E_, 2 - note A_, 2 - octave 6 - note C_, 2 - octave 4 - note E_, 2 - note A_, 2 - octave 6 - note C_, 2 - octave 4 - note E_, 2 - octave 6 - note C_, 2 - octave 4 - note E_, 2 - note B_, 2 - octave 6 - note C_, 2 - octave 5 - note C_, 2 - note E_, 2 - note B_, 4 -Music_JohtoGSC_Loop3: - intensity 21 - octave 4 - note A_, 6 - octave 5 - note E_, 6 - note D_, 2 - note E_, 2 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note F_, 4 - note __, 2 - note F_, 4 - note __, 2 - note F_, 4 - note A#, 4 - note __, 2 - note A#, 4 - note __, 2 - note A#, 4 - intensity 20 - octave 4 - note A_, 6 - octave 5 - note E_, 6 - note D_, 2 - note E_, 2 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note F_, 4 - note __, 2 - note F_, 4 - note __, 2 - note F_, 4 - note D_, 4 - octave 4 - note A#, 2 - octave 5 - note D_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note A#, 2 - note A_, 2 - note A#, 2 - octave 6 - note D_, 2 - note C#, 12 - octave 5 - note A#, 4 - note A_, 4 - octave 4 - note A_, 2 - octave 5 - note A_, 4 - octave 4 - note A_, 2 - octave 5 - note A_, 4 - note A_, 16 - intensity 16 - octave 4 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 4 - note A_, 2 - note G_, 2 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 4 - note A_, 2 - note G_, 2 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 4 - note A_, 2 - note G_, 2 - note A#, 2 - note A_, 1 - note __, 1 - octave 5 - note D_, 1 - note __, 1 - note C_, 1 - note __, 1 - octave 4 - note A#, 1 - note __, 1 - note A_, 1 - note __, 1 - note G_, 1 - note __, 1 - note A_, 1 - note __, 1 - note A#, 1 - note __, 1 - intensity 21 - note G_, 2 - note F_, 2 - note G_, 2 - note G#, 4 - note G_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note G#, 4 - note G_, 2 - note F_, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note G#, 4 - note G_, 2 - note F_, 2 - note G#, 2 - note F_, 1 - note __, 1 - octave 5 - note C_, 1 - note __, 1 - octave 4 - note A#, 1 - note __, 1 - note G#, 1 - note __, 1 - note G_, 1 - note __, 1 - note F_, 1 - note __, 1 - note G_, 1 - note __, 1 - note G#, 1 - note __, 1 - intensity 24 - note G_, 4 - note D_, 2 - octave 5 - note D_, 6 - note C_, 2 - note D_, 2 - note F_, 4 - note E_, 4 - note D_, 4 - note C_, 4 - note D#, 16 - note G_, 16 - intensity 21 - octave 4 - note F_, 2 - note D#, 2 - note F_, 4 - note D#, 4 - note F_, 4 - note G_, 4 - note F_, 4 - note D#, 4 - note G_, 4 - note G#, 2 - note G_, 2 - note G#, 4 - note F_, 4 - note G_, 4 - note G#, 4 - note G_, 4 - note F_, 4 - note G#, 4 - note A_, 2 - note G#, 2 - note A_, 4 - note F#, 4 - note G#, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note A_, 4 - note A#, 4 - note __, 2 - note A#, 4 - note __, 2 - note A#, 4 - octave 5 - note D#, 4 - note __, 2 - note D#, 4 - note __, 2 - note D#, 4 - intensity 36 - octave 4 - note A#, 1 - octave 3 - note A#, 1 - octave 4 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 4 - note D#, 1 - octave 3 - note A#, 1 - octave 4 - note A#, 1 - octave 3 - note A#, 1 - octave 4 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 4 - note D#, 1 - octave 3 - note A#, 1 - octave 4 - note A#, 1 - octave 3 - note A#, 1 - octave 4 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 4 - note D#, 1 - octave 3 - note A#, 1 - octave 4 - note A#, 1 - octave 3 - note A#, 1 - octave 4 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 4 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - intensity 37 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note D#, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - octave 5 - note G_, 1 - octave 4 - note D#, 1 - note A#, 1 - note D#, 1 - intensity 16 - octave 5 - note F_, 2 - octave 4 - note F_, 2 - note A#, 2 - octave 5 - note F_, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F_, 2 - octave 4 - note A#, 2 - octave 5 - note C_, 8 - note F_, 2 - octave 4 - note F_, 2 - note A#, 2 - octave 5 - note F_, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F_, 2 - note G_, 2 - note F_, 8 - note F_, 2 - octave 4 - note F_, 2 - note A#, 2 - octave 5 - note F_, 2 - note G#, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note F_, 2 - octave 4 - note A#, 2 - octave 5 - note C_, 16 - note D#, 16 - intensity 21 - octave 4 - note G_, 2 - note F_, 2 - note D#, 2 - note G_, 6 - note G_, 4 - note G_, 4 - note D#, 2 - note G_, 6 - note G#, 4 - note G_, 2 - note F_, 2 - note D#, 2 - note G_, 6 - note G_, 4 - note G_, 6 - note G_, 6 - note G#, 4 - intensity 24 - octave 5 - note D#, 2 - octave 4 - note D#, 2 - octave 5 - note D#, 2 - note A#, 6 - note G#, 2 - note G_, 2 - note G#, 2 - octave 4 - note G#, 2 - octave 5 - note G_, 4 - note F_, 4 - note D#, 4 - note F_, 4 - note __, 2 - note F_, 4 - note __, 2 - note F_, 4 - note G#, 4 - note __, 2 - note G#, 4 - note __, 2 - note G#, 4 - note D#, 2 - octave 4 - note D#, 2 - octave 5 - note D#, 2 - note A#, 6 - note G#, 2 - note G_, 2 - note G#, 2 - octave 4 - note G#, 2 - octave 5 - note G_, 4 - note F_, 4 - note D#, 4 - note C#, 4 - note __, 2 - note C#, 4 - note __, 2 - note C#, 4 - note C#, 4 - note C_, 4 - intensity 21 - octave 4 - note A#, 4 - note G#, 4 - note G_, 1 - note __, 1 - note G_, 4 - note D#, 2 - note A#, 8 - note A#, 1 - note __, 1 - note A#, 4 - note G_, 2 - octave 5 - note D#, 8 - note D#, 1 - note __, 1 - note D#, 4 - octave 4 - note A#, 2 - octave 5 - note G_, 8 - note G_, 1 - note __, 1 - note G_, 4 - note D#, 2 - note A#, 8 - note G_, 2 - octave 4 - note G_, 2 - octave 5 - note G_, 2 - note A#, 6 - note G#, 2 - note G_, 2 - note D#, 4 - note __, 2 - note D#, 4 - note __, 2 - note D#, 4 - intensity 20 - note D#, 2 - octave 4 - note D#, 2 - octave 5 - note D#, 2 - note A#, 6 - note G#, 2 - note G_, 2 - note D#, 4 - note __, 2 - note D#, 4 - note __, 2 - note D#, 4 - octave 4 - note A_, 4 - octave 3 - note A_, 2 - octave 5 - note E_, 6 - note D_, 2 - note E_, 2 - note G_, 2 - octave 4 - note G_, 2 - octave 5 - note F#, 4 - note E_, 4 - note D_, 4 - note F_, 4 - note __, 2 - note F_, 4 - note __, 2 - note F_, 4 - note A#, 4 - note __, 2 - note A#, 4 - note __, 2 - note A#, 4 - loopchannel 0, Music_JohtoGSC_Loop3 diff --git a/crysaudio/music/custom/kantogymleaderremix.asm b/crysaudio/music/custom/kantogymleaderremix.asm deleted file mode 100644 index 10164d6c..00000000 --- a/crysaudio/music/custom/kantogymleaderremix.asm +++ /dev/null @@ -1,1059 +0,0 @@ -Music_KantoGymLeaderRemix: - dbw $80, Music_KantoGymLeaderRemix_Ch1 - dbw $01, Music_KantoGymLeaderRemix_Ch2 - dbw $02, Music_KantoGymLeaderRemix_Ch3 - -Music_KantoGymLeaderRemix_Ch1: - ftempo 101 - volume $77 - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b2 - octave 3 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 2 - note A#, 6 - note A#, 2 - note A#, 6 - note A#, 2 - note A#, 8 - intensity $b7 - note B_, 2 - intensity $b2 - note A#, 2 - note A#, 6 - note A#, 2 - note A#, 6 - note A#, 2 - note A#, 8 - intensity $b7 - octave 3 - note E_, 2 - intensity $b2 - octave 2 - note A#, 2 - note A#, 6 - note A#, 2 - note A#, 6 - note A#, 2 - note A#, 8 - intensity $b7 - note B_, 2 - intensity $b2 - note A#, 2 - note A#, 6 - note A#, 2 - note A#, 6 - note A#, 2 - intensity $b4 - octave 3 - note E_, 4 - note E_, 4 - note E_, 2 -Music_KantoGymLeaderRemix_Loop1: - octave 2 - note C#, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - note C#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note G#, 1 - note C#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note __, 4 - octave 1 - note A_, 4 - note __, 4 - note B_, 4 - note __, 4 - note A_, 4 - note __, 2 - note G#, 2 - note __, 4 - note A_, 4 - note __, 4 - note B_, 4 - note __, 4 - note A_, 4 - note __, 4 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note __, 4 - octave 2 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note __, 4 - note G#, 12 - note __, 4 - octave 3 - note E_, 12 - octave 2 - note A#, 4 - note G#, 4 - note A#, 4 - note B_, 2 - octave 3 - note C#, 4 - octave 2 - note F#, 2 - note A#, 2 - octave 3 - note C#, 2 - note F#, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note C#, 2 - note __, 4 - note E_, 12 - octave 2 - note G#, 1 - note F#, 1 - note G#, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - octave 3 - note C#, 1 - note E_, 1 - note D#, 1 - note C#, 1 - note D#, 1 - note C#, 1 - octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note A#, 4 - note B_, 4 - note G#, 2 - note A#, 6 - octave 3 - note C#, 4 - octave 2 - note B_, 2 - note A#, 4 - note G#, 6 - note A#, 4 - note B_, 4 - note G#, 2 - note A#, 6 - octave 3 - note C#, 4 - note E_, 2 - note D#, 4 - octave 2 - note B_, 6 - note A#, 4 - note B_, 4 - note G#, 2 - note A#, 6 - note B_, 4 - note A#, 2 - note G#, 4 - note F#, 6 - note A#, 4 - note B_, 4 - note G#, 2 - note A#, 6 - octave 3 - note C#, 4 - note E_, 2 - note D#, 4 - octave 2 - note B_, 6 - loopchannel 0, Music_KantoGymLeaderRemix_Loop1 - -Music_KantoGymLeaderRemix_Ch2: - dutycycle $3 - vibrato $8, $36 - tone $0001 - notetype $c, $c2 - -Music_KantoGymBattle_branch_ec852R: ; ec852 - octave 4 - note A#, 1 - note G#, 1 - note A#, 1 - octave 5 - note D#, 1 - loopchannel 8, Music_KantoGymBattle_branch_ec852R - octave 3 - -Music_KantoGymBattle_branch_ec85dR: ; ec85d - intensity $c2 - note D#, 2 - note D#, 2 - note F#, 1 - note E_, 1 - note D#, 1 - note F#, 1 - note D#, 2 - note D#, 2 - note A#, 1 - note G#, 1 - note F#, 1 - note A#, 1 - note D#, 2 - note D#, 2 - note B_, 1 - note A#, 1 - note G#, 1 - note B_, 1 - note D_, 2 - intensity $c7 - note E_, 2 - intensity $c2 - note D#, 2 - note D#, 2 - note F#, 1 - note E_, 1 - note D#, 1 - note F#, 1 - note D#, 2 - note D#, 2 - note A#, 1 - note G#, 1 - note F#, 1 - note A#, 1 - note D#, 2 - note D#, 2 - note B_, 1 - note A#, 1 - note G#, 1 - note B_, 1 - note G#, 2 - intensity $c7 - note B_, 2 - intensity $c2 - octave 4 - loopchannel 2, Music_KantoGymBattle_branch_ec85dR -Music_KantoGymLeaderRemix_Loop2: - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - note A_, 4 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - note B_, 4 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - note A_, 4 - note F#, 1 - note __, 1 - note G#, 2 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - note A_, 4 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - note B_, 4 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - note A_, 4 - note F#, 1 - note __, 1 - note F#, 1 - note __, 1 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note F#, 1 - note __, 1 - note F#, 1 - note __, 13 - note F#, 1 - note __, 1 - note F#, 1 - note __, 13 - note F#, 1 - note __, 1 - note F#, 1 - note __, 13 - note F#, 1 - note __, 1 - note F#, 1 - note __, 13 - note F#, 1 - note __, 1 - note F#, 1 - note __, 13 - note F#, 1 - note __, 1 - note F#, 1 - note __, 13 - note F#, 1 - note __, 1 - note F#, 1 - note __, 13 - note F#, 1 - note __, 1 - note F#, 1 - note __, 13 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note G#, 12 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note B_, 12 - note A#, 16 - note F#, 16 - note E_, 1 - note __, 1 - note E_, 1 - note __, 1 - note B_, 12 - note G#, 8 - note B_, 8 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - note B_, 6 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note D_, 6 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - note B_, 6 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note C#, 2 - octave 1 - note F#, 2 - octave 2 - note D_, 6 - loopchannel 0, Music_KantoGymLeaderRemix_Loop2 - -Music_KantoGymLeaderRemix_Ch3: - notetype $c, $19 - octave 2 - note E_, 1 - note __, 1 - -Music_KantoGymBattle_branch_ec934R: ; ec934 - note B_, 3 - note __, 1 - loopchannel 6, Music_KantoGymBattle_branch_ec934R - note B_, 2 - note G#, 2 - note B_, 2 - -Music_KantoGymBattle_branch_ec93dR: ; ec93d - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note F#, 4 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note A#, 4 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note B_, 4 - note D_, 1 - note __, 1 - note F_, 2 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note F#, 4 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note A#, 4 - note D#, 1 - note __, 1 - note D#, 1 - note __, 1 - note B_, 4 - note D#, 1 - note __, 1 - note E_, 2 - loopchannel 2, Music_KantoGymBattle_branch_ec93dR -Music_KantoGymLeaderRemix_Loop3: - - notetype $C, 21 - octave 4 - note A#, 4 - note G#, 4 - note A#, 4 - note B_, 2 - octave 5 - note C#, 4 - octave 4 - note B_, 4 - note A#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A#, 2 - note E_, 8 - note G#, 8 - note B_, 10 - note G#, 6 - note A#, 4 - note G#, 4 - note A#, 4 - note B_, 2 - octave 5 - note C#, 4 - octave 4 - note B_, 4 - note A#, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A#, 2 - note G#, 8 - note F#, 8 - note E_, 8 - note B_, 4 - note B_, 2 - note G#, 2 - note __, 4 - intensity 20 - octave 3 - note A_, 1 - note G_, 1 - note F#, 1 - note A_, 1 - note __, 4 - note B_, 1 - note A_, 1 - note F#, 1 - note B_, 1 - note __, 4 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note F#, 1 - octave 4 - note C#, 1 - note __, 2 - octave 3 - note B_, 1 - note F#, 1 - note B_, 1 - note __, 1 - octave 4 - note C_, 1 - note __, 1 - octave 3 - note A_, 1 - note G#, 1 - note F#, 1 - note A_, 1 - note __, 4 - note B_, 1 - note A_, 1 - note F#, 1 - note B_, 1 - note __, 4 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note F#, 1 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note __, 1 - note G#, 1 - note __, 1 - note A_, 1 - note __, 1 - note G#, 1 - note __, 1 - octave 4 - note C#, 1 - note __, 1 - octave 3 - note B_, 1 - note __, 5 - intensity 21 - octave 4 - note F#, 4 - note G_, 4 - note E_, 4 - note F#, 4 - note G_, 4 - note E_, 4 - note D_, 4 - note C#, 16 - note __, 16 - note __, 4 - note F#, 4 - note G_, 4 - note E_, 4 - note F#, 4 - note G_, 4 - note E_, 4 - note G_, 4 - note F#, 16 - octave 5 - note C#, 16 - note __, 4 - intensity 16 - octave 4 - note E_, 12 - note __, 4 - note G#, 12 - note A#, 16 - note A#, 16 - note __, 4 - note G#, 12 - octave 5 - note E_, 8 - octave 4 - note B_, 8 - octave 5 - note F#, 16 - note F#, 16 - note __, 16 - note __, 12 - intensity 20 - octave 4 - note F#, 1 - note A#, 1 - octave 5 - note C#, 1 - note F_, 1 - note F#, 16 - note C#, 16 - note E_, 16 - note G#, 8 - note __, 2 - note E_, 6 - loopchannel 0, Music_KantoGymLeaderRemix_Loop3 diff --git a/crysaudio/music/custom/naljogymbattle.asm b/crysaudio/music/custom/naljogymbattle.asm deleted file mode 100644 index 5984742f..00000000 --- a/crysaudio/music/custom/naljogymbattle.asm +++ /dev/null @@ -1,1073 +0,0 @@ -;Composed by GRonnoc for Koolboyman's Pokemon Prism -;revised by FroggestSpirit -Music_NaljoGymBattle: - dbw $80, Music_NaljoGymBattle_Ch1 - dbw $01, Music_NaljoGymBattle_Ch2 - dbw $02, Music_NaljoGymBattle_Ch3 - -Music_NaljoGymBattle_Ch1: - ftempo 101 - volume $77 - notetype $c, $b2 - dutycycle $3 - tone $0002 - vibrato $12, $15 - octave 2 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - intensity $b4 - note A_, 6 - intensity $b2 - note A_, 6 - intensity $b4 - note A_, 6 - intensity $b2 - note A_, 6 - intensity $b4 - note G_, 4 - note A#, 4 - note A_, 6 - intensity $b2 - note A_, 6 - intensity $b4 - note A_, 6 - intensity $b2 - note A_, 6 - intensity $b4 - note G_, 4 - intensity $b2 - note A#, 2 - octave 4 - note A_, 1 - octave 5 - note C_, 1 - intensity $b4 - note D_, 6 - intensity $b2 - note D_, 6 - intensity $b4 - note D_, 6 - intensity $b2 - note D_, 6 - intensity $b4 - note C_, 4 - note D#, 4 - note D_, 6 - intensity $b2 - note D_, 6 - intensity $b4 - note D_, 6 - intensity $b2 - note D_, 6 - intensity $b4 - note D#, 4 - note F_, 4 -Music_NaljoGymBattle_Loop1: - intensity $b2 - octave 3 - note F_, 2 - note D_, 2 - note F_, 2 - note A_, 4 - note F_, 2 - note D_, 2 - note D#, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note A_, 2 - octave 5 - note D_, 6 - octave 3 - note D_, 6 - note D_, 6 - note D_, 6 - note C_, 4 - note D#, 4 - note F_, 2 - note D_, 2 - note F_, 2 - note A_, 4 - note D#, 2 - note C_, 2 - note D#, 2 - octave 4 - note D_, 4 - octave 3 - note A_, 2 - octave 4 - note D_, 4 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note D#, 2 - intensity $b7 - note F_, 16 - note __, 12 - intensity $b4 - note C_, 4 - octave 3 - note A#, 6 - note F_, 6 - note D_, 2 - note E_, 2 - note F_, 6 - note A#, 6 - note A#, 2 - octave 4 - note D_, 2 - note F_, 8 - note C_, 8 - note F_, 6 - note C_, 6 - note F_, 4 - intensity $b7 - octave 3 - note A#, 16 - note F_, 16 - octave 4 - note C_, 16 - octave 3 - note E_, 15 - octave 5 - note C_, 1 - note D_, 6 - intensity $b2 - octave 3 - note D_, 6 - intensity $b4 - note D_, 6 - intensity $b2 - note D_, 6 - intensity $b4 - note C_, 4 - note D#, 4 - octave 4 - note D_, 6 - intensity $b2 - octave 3 - note A_, 6 - intensity $b4 - note A_, 6 - intensity $b2 - note A_, 6 - note G_, 2 - note F_, 2 - note E_, 2 - note C_, 2 - intensity $b7 - note D_, 16 - note C_, 16 - octave 2 - note F_, 16 - note E_, 16 - note F_, 16 - note __, 16 - note F_, 16 - note E_, 14 - intensity $b2 - dutycycle $2 - octave 3 - note A_, 1 - octave 4 - note C_, 1 - note D_, 2 - note C_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 4 - note E_, 2 - note F_, 2 - note D_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 4 - note A#, 2 - note A_, 2 - note A#, 2 - intensity $b7 - octave 5 - note C_, 16 - note __, 16 - intensity $b4 - octave 3 - note A_, 8 - note G_, 8 - note F_, 8 - note E_, 8 - note C_, 8 - note D_, 8 - note E_, 8 - note G_, 8 - note A_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 4 - note F_, 2 - note G_, 2 - note A_, 4 - note F_, 4 - note D_, 4 - note A_, 4 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 4 - note G_, 2 - note A_, 2 - note A#, 4 - note F_, 4 - note D_, 4 - note A#, 4 - note A_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 4 - note A_, 4 - octave 4 - note D_, 4 - note E_, 4 - intensity $b7 - note F_, 16 - note E_, 12 - intensity $b2 - dutycycle $3 - note F_, 2 - note E_, 2 - loopchannel 0, Music_NaljoGymBattle_Loop1 -Music_NaljoGymBattle_Ch2: - notetype $c, $c2 - dutycycle $3 - vibrato $8, $36 - tone $0001 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - note D_, 6 - note D_, 6 - note D_, 6 - note D_, 6 - note C_, 4 - note D#, 4 - note D_, 6 - note D_, 6 - note D_, 6 - note D_, 6 - note D#, 4 - note C_, 4 - note A_, 6 - note A_, 6 - note A_, 6 - note A_, 6 - note G_, 4 - note A#, 4 - note A_, 6 - note A_, 6 - note A_, 6 - note A_, 6 - note G_, 4 - note A#, 2 - octave 3 - note A_, 1 - octave 4 - note C_, 1 -Music_NaljoGymBattle_Loop2: - intensity $c7 - note D_, 6 - note D#, 6 - note F_, 4 - note G_, 6 - note A_, 6 - note D#, 4 - note D_, 16 - note __, 14 - octave 3 - note A_, 1 - octave 4 - note C_, 1 - note D_, 6 - note D#, 6 - note F_, 4 - note G_, 6 - note A_, 6 - note A#, 4 - note A_, 16 - note __, 12 - note F_, 2 - note E_, 2 - note D_, 6 - octave 3 - note A#, 6 - note F_, 4 - note A#, 6 - octave 4 - note D_, 6 - note F_, 2 - note G_, 2 - note A_, 4 - note G_, 4 - note F_, 4 - note G_, 4 - note A_, 6 - note G_, 6 - note F_, 4 - note D_, 16 - note __, 14 - note E_, 1 - note F_, 1 - note E_, 16 - note __, 12 - note F_, 2 - note E_, 2 - intensity $c3 - note D_, 6 - octave 3 - note A_, 6 - note A_, 6 - note A_, 6 - note A#, 2 - note A_, 2 - note G_, 2 - note A#, 2 - octave 5 - note D_, 6 - octave 3 - note D_, 6 - note D_, 6 - note D_, 6 - note D#, 4 - note C_, 4 - intensity $c7 - octave 2 - note A_, 16 - note G_, 16 - note A#, 16 - note A_, 12 - note F_, 2 - note G_, 2 - note A_, 16 - note __, 16 - note A_, 16 - note __, 16 - octave 3 - note A_, 8 - note G_, 8 - note F_, 8 - note E_, 8 - note C_, 16 - note __, 4 - intensity $c3 - note D_, 4 - note E_, 4 - note G_, 4 - note A_, 2 - note F_, 2 - note D_, 2 - note A_, 4 - note F_, 2 - note D_, 2 - note A_, 2 - note A#, 2 - note F_, 2 - note D_, 2 - note A#, 4 - note F_, 2 - note D_, 2 - note A#, 2 - octave 4 - note C_, 2 - octave 3 - note G_, 2 - note E_, 2 - octave 4 - note C_, 4 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - note D_, 2 - intensity $c7 - note E_, 16 - note D_, 16 - note D_, 12 - note D_, 2 - note E_, 2 - note F_, 16 - note F_, 12 - note F_, 2 - note G_, 2 - note A_, 16 - note A_, 12 - note A_, 2 - note A#, 2 - note A_, 16 - note G_, 16 - loopchannel 0, Music_NaljoGymBattle_Loop2 -Music_NaljoGymBattle_Ch3: - notetype $4, $19 - octave 3 - note D_, 11 - note __, 1 - note D_, 3 - note __, 1 - note D_, 3 - note __, 1 - note D_, 3 - note __, 1 - note D_, 11 - note __, 1 - note D_, 3 - note __, 1 - note D_, 3 - note __, 1 - note D_, 3 - note __, 1 - notetype $c, $19 - note D_, 8 - note D#, 8 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note A_, 2 - note D_, 2 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - note F_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note A_, 2 - note D_, 2 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - note F_, 2 -Music_NaljoGymBattle_Loop3: - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note A_, 2 - note D_, 2 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - note F_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note C_, 2 - note G_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note B_, 2 - octave 3 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note G_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - octave 1 - note G_, 2 - octave 2 - note C_, 2 - octave 1 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note A_, 2 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - octave 2 - note A_, 2 - note D_, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - octave 3 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note D_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note A_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - note A#, 2 - octave 3 - note F_, 2 - note E_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note D_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - loopchannel 0, Music_NaljoGymBattle_Loop3 diff --git a/crysaudio/music/custom/naljowildbattle.asm b/crysaudio/music/custom/naljowildbattle.asm deleted file mode 100644 index 32a04f25..00000000 --- a/crysaudio/music/custom/naljowildbattle.asm +++ /dev/null @@ -1,810 +0,0 @@ -;Composed by LevusBevus for Koolboyman's Pokemon Prism -;revised by FroggestSpirit -Music_NaljoWildBattle: - dbw $80, Music_NaljoWildBattle_Ch1 - dbw $01, Music_NaljoWildBattle_Ch2 - dbw $02, Music_NaljoWildBattle_Ch3 - - -Music_NaljoWildBattle_Ch1: - ftempo 104 - volume $77 - stereopanning $f - dutycycle $3 - tone $0002 - vibrato $12, $15 - notetype $c, $b2 - octave 4 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - octave 2 - intensity $b4 - note A_, 2 - note __, 2 - note D_, 2 - note F_, 2 - note __, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note __, 2 - note A#, 6 - note A#, 2 - note A#, 4 - note A#, 4 - octave 2 - note A_, 2 - note __, 2 - note D_, 2 - note F_, 2 - note __, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note __, 2 - note A_, 6 - note A_, 2 - note A_, 4 - note A_, 4 - octave 2 - note A_, 2 - note __, 2 - note D_, 2 - note F_, 2 - note __, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note __, 2 - note A#, 6 - note A#, 2 - note A#, 4 - note A#, 4 - octave 2 - note A_, 2 - note __, 2 - note D_, 2 - note F_, 2 - note __, 2 - octave 1 - note A_, 2 - octave 2 - note D_, 2 - note __, 2 - intensity $b7 - note F_, 8 - note A_, 8 - -Music_NaljoWildBattle_branch_19f26b: - note D_, 6 - note G_, 6 - note D_, 4 - note A_, 6 - note G_, 6 - note D_, 4 - note C_, 6 - note G_, 6 - note C_, 4 - note A_, 6 - note G_, 6 - note C_, 4 - note D_, 6 - note G_, 6 - note D_, 4 - note A_, 6 - note G_, 6 - note D_, 4 - octave 1 - note A_, 6 - octave 2 - note C#, 6 - octave 1 - note A_, 4 - octave 2 - note E_, 6 - note C#, 6 - octave 1 - note A_, 4 - octave 2 - note D_, 6 - note G_, 6 - note D_, 4 - note A_, 6 - note G_, 6 - note D_, 4 - note C_, 6 - note G_, 6 - note C_, 4 - note A_, 6 - note G_, 6 - note C_, 4 - note D_, 6 - note G_, 6 - note D_, 4 - note A_, 6 - note G_, 6 - note D_, 4 - note D_, 6 - note G_, 6 - note D_, 4 - note A#, 6 - note G_, 6 - note D_, 4 - intensity $a2 - dutycycle 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note G_, 2 - note __, 2 - octave 4 - note G_, 2 - octave 3 - note G_, 2 - note __, 2 - octave 4 - note G_, 2 - octave 3 - note G_, 2 - octave 4 - note G_, 2 - octave 3 - note G_, 2 - note __, 2 - octave 4 - note G_, 2 - octave 3 - note G_, 2 - note __, 2 - octave 4 - note G_, 2 - octave 3 - note G_, 2 - octave 4 - note G_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note F_, 2 - note __, 2 - octave 4 - note F_, 2 - octave 3 - note F_, 2 - note __, 2 - octave 4 - note F_, 2 - octave 3 - note F_, 2 - octave 4 - note F_, 2 - octave 3 - note F_, 2 - note __, 2 - octave 4 - note F_, 2 - octave 3 - note F_, 2 - note __, 2 - octave 4 - note F_, 2 - octave 3 - note F_, 2 - octave 4 - note F_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - octave 4 - note D_, 2 - intensity $b7 - dutycycle 3 - octave 2 - loopchannel 0, Music_NaljoWildBattle_branch_19f26b - -Music_NaljoWildBattle_Ch2: - dutycycle $3 - tone $0001 - vibrato $8, $36 - notetype $c, $c2 - -Music_NaljoWildBattle_branch_19f11b: - octave 3 - note D_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - loopchannel 8, Music_NaljoWildBattle_branch_19f11b - octave 3 - intensity $c4 - note D_, 2 - note __, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - note __, 2 - note D#, 6 - note D#, 2 - note D#, 4 - note D#, 4 - octave 3 - note D_, 2 - note __, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - note __, 2 - note E_, 6 - note E_, 2 - note E_, 4 - note E_, 4 - octave 3 - note D_, 2 - note __, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - note __, 2 - note D#, 6 - note D#, 2 - note D#, 4 - note D#, 4 - octave 3 - note D_, 2 - note __, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - note __, 2 - octave 2 - note A_, 2 - octave 3 - note D_, 2 - note __, 2 - intensity $c7 - note F_, 8 - note D#, 8 - -Music_NaljoWildBattle_branch_19f167: - note D_, 6 - note A_, 4 - note G_, 1 - note A_, 1 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 4 - octave 4 - note C_, 4 - octave 3 - note A#, 4 - note A_, 16 - note F_, 16 - note D_, 6 - note A_, 4 - note G_, 1 - note A_, 1 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 4 - octave 4 - note C_, 4 - note C#, 4 - octave 3 - note A_, 16 - note E_, 16 - note D_, 6 - note A_, 4 - note G_, 1 - note A_, 1 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 4 - octave 4 - note C_, 4 - octave 3 - note A#, 4 - note A_, 16 - note F_, 16 - note D_, 6 - note A_, 4 - note G_, 1 - note A_, 1 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note A#, 4 - octave 4 - note C_, 4 - note C#, 4 - note D_, 16 - octave 3 - note D_, 16 - octave 4 - intensity $c2 - note D_, 2 - note D_, 2 - octave 3 - intensity $c7 - note A_, 8 - note __, 2 - intensity $c2 - note D#, 2 - note D_, 2 - note D_, 2 - octave 2 - intensity $c7 - note A_, 12 - octave 3 - note D_, 8 - intensity $c2 - note C_, 4 - octave 2 - note A#, 2 - note A#, 1 - note A_, 1 - intensity $c7 - note A#, 16 - octave 4 - intensity $c2 - note D_, 2 - note D_, 2 - octave 3 - intensity $c7 - note A_, 8 - note __, 2 - intensity $c2 - note D#, 2 - note D_, 2 - note D_, 2 - octave 2 - intensity $c7 - note A_, 12 - octave 3 - note C_, 8 - octave 2 - intensity $c2 - note F_, 3 - note G_, 3 - note A_, 2 - intensity $c7 - note G_, 8 - octave 3 - intensity $c2 - note C#, 1 - note D_, 1 - note D#, 1 - note F_, 1 - note G_, 1 - note A_, 1 - note A#, 1 - octave 4 - note C#, 1 - note D_, 2 - octave 3 - note D_, 2 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - note D_, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - intensity $c7 - note F_, 8 - note D#, 8 - loopchannel 0, Music_NaljoWildBattle_branch_19f167 - - -Music_NaljoWildBattle_Ch3: - notetype $c, $14 - octave 4 - note D_, 2 - note D_, 1 - note D_, 1 - note D#, 2 - note D#, 1 - note D_, 1 - note E_, 2 - note E_, 1 - note D#, 1 - note F_, 2 - note F_, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note F_, 1 - note G_, 2 - note G_, 1 - note F#, 1 - note G#, 2 - note G#, 1 - note G_, 1 - note A_, 4 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F_, 2 - note D_, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 2 - note F#, 2 - note D#, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F_, 2 - note D_, 2 - octave 3 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F_, 2 - note D_, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 2 - note F#, 2 - note D#, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F_, 2 - note D_, 2 - note D_, 16 - -Music_NaljoWildBattle_branch_19f3ba: - octave 3 - note A_, 2 - octave 4 - note D_, 2 - loopchannel 8, Music_NaljoWildBattle_branch_19f3ba - -Music_NaljoWildBattle_branch_19f3c2: - note C_, 2 - note F_, 2 - loopchannel 8, Music_NaljoWildBattle_branch_19f3c2 - -Music_NaljoWildBattle_branch_19f3c8: - octave 3 - note A_, 2 - octave 4 - note D_, 2 - loopchannel 8, Music_NaljoWildBattle_branch_19f3c8 - octave 3 - -Music_NaljoWildBattle_branch_19f3d1: - note E_, 2 - note A_, 2 - loopchannel 8, Music_NaljoWildBattle_branch_19f3d1 - -Music_NaljoWildBattle_branch_19f3d7: - octave 3 - note A_, 2 - octave 3 - note D_, 2 - loopchannel 8, Music_NaljoWildBattle_branch_19f3d7 - -Music_NaljoWildBattle_branch_19f3df: - note C_, 2 - note F_, 2 - loopchannel 8, Music_NaljoWildBattle_branch_19f3df - -Music_NaljoWildBattle_branch_19f3e5: - octave 3 - note A_, 2 - octave 4 - note D_, 2 - loopchannel 8, Music_NaljoWildBattle_branch_19f3e5 - -Music_NaljoWildBattle_branch_19f3ed: - note D_, 2 - note G_, 2 - loopchannel 8, Music_NaljoWildBattle_branch_19f3ed - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F_, 2 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note A#, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note A#, 2 - octave 5 - note D_, 2 - octave 4 - note A#, 2 - note G_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F_, 2 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note D_, 2 - octave 3 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note D_, 4 - note D_, 6 - octave 3 - note A_, 2 - note A#, 2 - octave 4 - note C#, 2 - note D_, 16 - loopchannel 0, Music_NaljoWildBattle_branch_19f3ba - diff --git a/crysaudio/music/custom/nuggetbridge.asm b/crysaudio/music/custom/nuggetbridge.asm deleted file mode 100644 index 5a43ddd4..00000000 --- a/crysaudio/music/custom/nuggetbridge.asm +++ /dev/null @@ -1,663 +0,0 @@ -Music_NuggetBridge: - dbw $c0, Music_NuggetBridge_Ch1 - dbw $01, Music_NuggetBridge_Ch2 - dbw $02, Music_NuggetBridge_Ch3 - dbw $03, Music_NuggetBridge_Ch4 - -Music_NuggetBridge_Ch1: - tempo $A8 - volume $77 - dutycycle 1 - notetype $C, $B5 -;Channel1_Bar1: - octave 2 - note G#, 6 - note G#, 1 - note B_, 1 - note A_, 4 - note F#, 2 - octave 3 - note C#, 2 -;Channel1_Bar2: -Music_NuggetBridge_Loop1: - octave 2 - note B_, 3 - note G#, 1 - note A_, 6 - dutycycle 2 - note A_, 1 - note G#, 1 - note F#, 4 -;Channel1_Bar3: - dutycycle 1 - note G#, 6 - note G#, 1 - note B_, 1 - note A_, 4 - note F#, 2 - octave 3 - note C#, 2 -;Channel1_Bar4: - octave 2 - note B_, 3 - note G#, 1 - octave 3 - note E_, 6 - dutycycle 2 - octave 2 - note B_, 1 - octave 3 - note C#, 1 - note D_, 4 -;Channel1_Bar5: - note A_, 2 - note E_, 2 - octave 2 - note A_, 4 - octave 3 - note G#, 2 - note E_, 2 - octave 2 - note G#, 4 -;Channel1_Bar6: - octave 3 - note F#, 2 - note C#, 2 - octave 2 - note F#, 4 - octave 3 - note E_, 2 - note C#, 2 - note D#, 2 - note C#, 2 -;Channel1_Bar7: - octave 2 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 6 - note F#, 2 - octave 3 - note D_, 4 -;Channel1_Bar8: - note E_, 3 - octave 2 - note A_, 1 - note G#, 6 - note E_, 2 - note A_, 2 - note G#, 2 -;Channel1_Bar9: - intensity $B2 - note B_, 2 - note B_, 1 - octave 3 - note C#, 1 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note D_, 2 - note A_, 4 -;Channel1_Bar10: - note G#, 3 - note F#, 1 - note E_, 6 - intensity $B1 - octave 2 - note E_, 1 - note F#, 1 - note G#, 2 - note F#, 1 - note E_, 1 -;Channel1_Bar11: - intensity $B2 - note B_, 2 - note B_, 1 - octave 3 - note C#, 1 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note D_, 2 - note A_, 4 -;Channel1_Bar12: - note G#, 3 - note F#, 1 - note E_, 6 - intensity $B1 - octave 2 - note G#, 1 - note A_, 1 - note B_, 2 - note A_, 1 - note G#, 1 -;Channel1_Bar13: - intensity $B2 - note B_, 2 - note B_, 1 - octave 3 - note C#, 1 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 4 -;Channel1_Bar14: - octave 2 - note B_, 2 - note B_, 1 - octave 3 - note C#, 1 - note D#, 2 - note D#, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - intensity $B5 - note A_, 4 -;Channel1_Bar15: - dutycycle 1 - note G#, 6 - octave 2 - note G#, 1 - note B_, 1 - note A_, 4 - note F#, 2 - octave 3 - note C#, 2 -;Channel1_Bar16: - loopchannel 0, Music_NuggetBridge_Loop1 - -Music_NuggetBridge_Ch2: - dutycycle 1 - notetype $C, $C5 -;Channel2_Bar1: - octave 3 - note E_, 6 - octave 2 - note B_, 1 - octave 3 - note E_, 1 - note F#, 6 - note A_, 2 -;Channel2_Bar2: -Music_NuggetBridge_Loop2: - note G#, 3 - note E_, 1 - note F#, 12 -;Channel2_Bar3: - note E_, 6 - octave 2 - note B_, 1 - octave 3 - note E_, 1 - note F#, 6 - note A_, 2 -;Channel2_Bar4: - note G#, 3 - note E_, 1 - note B_, 12 -;Channel2_Bar5: - dutycycle 0 - octave 4 - note C#, 6 - octave 3 - note B_, 1 - note A_, 1 - note B_, 6 - note A_, 1 - note G#, 1 -;Channel2_Bar6: - note A_, 6 - note G#, 1 - note F#, 1 - note G#, 4 - dutycycle 2 - note F#, 2 - note E_, 2 -;Channel2_Bar7: - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 8 - note A_, 4 -;Channel2_Bar8: - note G#, 3 - note F#, 1 - note E_, 8 - dutycycle 1 - note F#, 2 - note E_, 2 -;Channel2_Bar9: - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 4 - octave 4 - note C#, 4 -;Channel2_Bar10: - octave 3 - note B_, 3 - note A_, 1 - note G#, 12 -;Channel2_Bar11: - dutycycle 0 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 4 - octave 4 - note C#, 4 -;Channel2_Bar12: - octave 3 - note B_, 3 - note A_, 1 - note G#, 12 -;Channel2_Bar13: - dutycycle 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 2 - note A_, 1 - note B_, 1 - octave 4 - note C#, 4 -;Channel2_Bar14: - octave 3 - note D#, 2 - note D#, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 2 - note B_, 1 - octave 4 - note C#, 1 - notetype 6, $C5 - note D#, 4 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note D#, 1 -;Channel2_Bar15: - notetype $C, $C5 - dutycycle 1 - note E_, 6 - octave 2 - note B_, 1 - octave 3 - note E_, 1 - note F#, 6 - note A_, 2 -;Channel2_Bar16: - loopchannel 0, Music_NuggetBridge_Loop2 - -Music_NuggetBridge_Ch3: - notetype $C, $15 -;Channel3_Bar1: - octave 2 - note E_, 4 - note __, 8 - note D_, 4 -;Channel3_Bar2: -Music_NuggetBridge_Loop3: - note E_, 1 - note __, 11 - octave 1 - note B_, 4 -;Channel3_Bar3: - octave 2 - note E_, 4 - note __, 8 - note D_, 4 -;Channel3_Bar4: - note E_, 1 - note __, 11 - note G#, 4 -;Channel3_Bar5: - notetype 4, $24 - octave 3 - note A_, 2 - octave 5 - note C#, 2 - note E_, 2 - note A_, 2 - octave 6 - note C#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C#, 2 - octave 5 - note A_, 2 - note E_, 2 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note B_, 2 - octave 5 - note E_, 2 - note G#, 2 - note B_, 2 - octave 6 - note E_, 2 - note G#, 2 - note E_, 2 - octave 5 - note B_, 2 - note G#, 2 - note E_, 2 - octave 4 - note B_, 2 -;Channel3_Bar6: - octave 3 - note F#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - note F#, 2 - note A_, 2 - octave 6 - note C#, 2 - note F#, 2 - note C#, 2 - octave 5 - note A_, 2 - note F#, 2 - note C#, 2 - octave 4 - note A_, 2 - octave 3 - note C#, 2 - octave 4 - note E_, 2 - note G#, 2 - octave 5 - note C#, 2 - note E_, 2 - note G#, 2 - octave 6 - note C#, 3 - note __, 9 - notetype $C, $15 - callchannel Music_NuggetBridge_Bar7 - callchannel Music_NuggetBridge_Bar7 - callchannel Music_NuggetBridge_Bar7 - callchannel Music_NuggetBridge_Bar7 - callchannel Music_NuggetBridge_Bar8 - callchannel Music_NuggetBridge_Bar8 - callchannel Music_NuggetBridge_Bar8 - callchannel Music_NuggetBridge_Bar8 - callchannel Music_NuggetBridge_Bar9 - callchannel Music_NuggetBridge_Bar9 - callchannel Music_NuggetBridge_Bar9 - callchannel Music_NuggetBridge_Bar9 - callchannel Music_NuggetBridge_Bar10 - callchannel Music_NuggetBridge_Bar10 - callchannel Music_NuggetBridge_Bar10 - callchannel Music_NuggetBridge_Bar10 - callchannel Music_NuggetBridge_Bar11 - callchannel Music_NuggetBridge_Bar11 - callchannel Music_NuggetBridge_Bar11 - callchannel Music_NuggetBridge_Bar11 - callchannel Music_NuggetBridge_Bar12 - callchannel Music_NuggetBridge_Bar12 - callchannel Music_NuggetBridge_Bar12 - callchannel Music_NuggetBridge_Bar12 -;Channel3_Bar13: - notetype 6, $15 - octave 1 - note B_, 2 - note __, 16 - note __, 2 - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - note B_, 6 - note __, 2 -;Channel3_Bar14: - note B_, 2 - note __, 16 - note __, 2 - note B_, 1 - note __, 1 - note B_, 1 - note __, 1 - note B_, 6 - note __, 2 -;Channel3_Bar15: - notetype $C, $15 - octave 2 - note E_, 4 - note __, 8 - note D_, 4 -;Channel3_Bar16: - loopchannel 0, Music_NuggetBridge_Loop3 - -Music_NuggetBridge_Bar7: - octave 2 - note D_, 1 - note __, 1 - intensity $24 - octave 5 - note A_, 1 - octave 4 - note D_, 1 - intensity $15 - endchannel -Music_NuggetBridge_Bar8: - octave 2 - note E_, 1 - note __, 1 - intensity $24 - octave 5 - note B_, 1 - octave 4 - note E_, 1 - intensity $15 - endchannel -Music_NuggetBridge_Bar9: - octave 1 - note B_, 1 - note __, 1 - intensity $24 - octave 6 - note D_, 1 - octave 4 - note F#, 1 - intensity $15 - endchannel -Music_NuggetBridge_Bar10: - octave 2 - note E_, 1 - note __, 1 - intensity $24 - octave 6 - note E_, 1 - octave 4 - note B_, 1 - intensity $15 - endchannel -Music_NuggetBridge_Bar11: - octave 1 - note B_, 1 - intensity $24 - octave 4 - note A_, 1 - octave 6 - note F#, 1 - octave 5 - note D_, 1 - intensity $15 - endchannel -Music_NuggetBridge_Bar12: - octave 2 - note E_, 1 - intensity $24 - octave 4 - note B_, 1 - octave 6 - note G#, 1 - octave 5 - note E_, 1 - intensity $15 - endchannel - -Music_NuggetBridge_Ch4: - notetype 4 - togglenoise 0 -;Channel4_Bar1: - note A_, 16 - note __, 2 - note D_, 3 - note D_, 3 - note D_, 12 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar2: -Music_NuggetBridge_Loop4: - note D_, 16 - note __, 2 - note D_, 3 - note D_, 3 - note D_, 12 - note D_, 3 - note D_, 3 - note D_, 3 - note D_, 3 -;Channel4_Bar3: - note D_, 16 - note __, 2 - note D_, 3 - note D_, 3 - note D_, 12 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar4: - note D_, 16 - note __, 2 - note D_, 3 - note D_, 3 - note D_, 12 - note D_, 3 - note D_, 3 - note D_, 3 - note D_, 3 -;Channel4_Bar5: - note A_, 16 - note __, 16 - note __, 16 -;Channel4_Bar6: - note __, 16 - note __, 16 - note __, 16 -;Channel4_Bar7: - note D_, 12 - note D_, 12 - note D_, 12 - note D_, 6 - note D_, 3 - note D_, 3 -;Channel4_Bar8: - note D_, 12 - note D_, 12 - note D_, 12 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar9: - note D_, 12 - note D_, 12 - note D_, 12 - note D_, 6 - note D_, 3 - note D_, 3 -;Channel4_Bar10: - note D_, 12 - note D_, 12 - note D_, 12 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar11: - note D_, 12 - note D_, 12 - note D_, 12 - note D_, 6 - note D_, 3 - note D_, 3 -;Channel4_Bar12: - note D_, 12 - note D_, 12 - note D_, 6 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 3 - note D_, 3 - note D_, 3 - note D_, 3 -;Channel4_Bar13: - note D_, 16 - note __, 14 - note D_, 3 - note D_, 3 - note A_, 6 - note D_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar14: - note D_, 16 - note __, 14 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 3 - note D_, 3 - note D_, 3 - note D_, 3 -;Channel4_Bar15: - note A_, 16 - note __, 2 - note D_, 3 - note D_, 3 - note D_, 12 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar16: - loopchannel 0, Music_NuggetBridge_Loop4 diff --git a/crysaudio/music/custom/palletbattle.asm b/crysaudio/music/custom/palletbattle.asm deleted file mode 100644 index c915e58e..00000000 --- a/crysaudio/music/custom/palletbattle.asm +++ /dev/null @@ -1,670 +0,0 @@ -;Composed by Cat333Pokemon for Koolboyman's Pokemon Prism -;revised by FroggestSpirit -Music_PalletBattle: ; 1ec454 - dbw $80, Music_PalletBattle_Ch1 - dbw $01, Music_PalletBattle_Ch2 - dbw $02, Music_PalletBattle_Ch3 -; 1ec45d - - -Music_PalletBattle_Ch1: ; 1edb00 - ftempo 96 - volume $77 - stereopanning $f0 - dutycycle $3 - tone $0002 - vibrato $10, $12 - notetype $c, $b2 - octave 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - octave 1 - note B_, 1 - octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 3 - note C_, 1 - -Music_PalletBattle_branch_1edc47: ; 1edc47 - note E_, 4 - octave 2 - note G_, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note E_, 2 - note B_, 2 - note G_, 4 - octave 3 - note D_, 2 - note C_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note F_, 2 - note G_, 2 - note D_, 4 - octave 1 - note B_, 4 - octave 2 - note G_, 4 - note D_, 4 - octave 1 - note G_, 4 - note D_, 4 - note B_, 4 - note G_, 4 - octave 2 - note G_, 4 - octave 3 - note E_, 2 - note D_, 2 - note C_, 2 - octave 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note B_, 4 - octave 3 - note C_, 2 - note D_, 2 - note E_, 2 - note G_, 2 - note G_, 2 - note F_, 2 - note D_, 4 - octave 2 - note B_, 4 - octave 3 - note G_, 4 - note D_, 4 - octave 2 - note B_, 4 - note G_, 4 - octave 3 - note D_, 4 - octave 2 - note G_, 2 - note G_, 2 - octave 3 - note C_, 4 - note D_, 2 - note C_, 2 - octave 2 - note B_, 2 - note G_, 2 - octave 3 - note D_, 2 - note C_, 2 - octave 2 - note B_, 4 - octave 3 - note C_, 2 - octave 2 - note G_, 2 - note G_, 2 - note B_, 2 - octave 3 - note C_, 2 - note D_, 2 - note D_, 4 - octave 2 - note B_, 4 - octave 3 - note G_, 4 - note D_, 4 - octave 2 - note B_, 4 - note G_, 4 - octave 3 - note D_, 4 - octave 2 - note B_, 4 - octave 3 - note G_, 4 - note G_, 2 - note F_, 2 - note E_, 2 - octave 2 - note G_, 2 - note G_, 2 - note B_, 2 - octave 3 - note C_, 4 - note D_, 2 - note C_, 2 - octave 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note G_, 2 - octave 2 - note G_, 4 - note E_, 4 - note C_, 4 - octave 1 - note G_, 4 - octave 2 - note C_, 4 - octave 1 - note G_, 4 - note E_, 4 - note C_, 4 - note __, 16 - note __, 16 - note __, 16 - note __, 16 - octave 3 - note G#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - octave 3 - note D#, 2 - note D#, 2 - octave 2 - note G#, 2 - octave 3 - note D#, 2 - note D#, 2 - octave 2 - note G#, 2 - octave 3 - note D#, 2 - octave 2 - note G#, 2 - octave 3 - note D#, 2 - note D#, 2 - octave 2 - note G#, 2 - octave 3 - note D#, 2 - note D#, 2 - octave 2 - note G#, 2 - octave 3 - note D#, 2 - octave 2 - note G#, 2 - octave 3 - note F_, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F#, 2 - note F#, 2 - note C_, 2 - note F#, 2 - note F#, 2 - note C_, 2 - note F#, 2 - note C_, 2 - note G#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note D#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - note D#, 2 - octave 2 - note A#, 2 - octave 3 - note D#, 2 - octave 2 - note A#, 2 - intensity $b8 - note G_, 16 - note G_, 16 - note D_, 16 - note D_, 16 - note G_, 16 - note G_, 16 - note D_, 16 - note D_, 16 - intensity $b2 - octave 3 - loopchannel 0, Music_PalletBattle_branch_1edc47 - -Music_PalletBattle_Ch2: ; 1edc10 - dutycycle $3 - tone $0001 - vibrato $8, $36 - notetype $c, $c2 - octave 5 - note C#, 1 - note C_, 1 - octave 4 - note A#, 1 - note A_, 1 - note A#, 1 - note A#, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - -Music_PalletBattle_branch_1edb37: ; 1edb37 - note G_, 4 - note C_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - note C_, 4 - note F_, 2 - note E_, 2 - note D_, 2 - note G_, 2 - octave 2 - note A_, 2 - note B_, 2 - intensity $c7 - note G_, 16 - note __, 16 - octave 3 - intensity $c2 - note C_, 4 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note D_, 4 - note E_, 2 - note F_, 2 - note G_, 2 - octave 4 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - intensity $c7 - note G_, 16 - note __, 12 - intensity $c2 - note D_, 2 - note D_, 2 - note E_, 4 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note F_, 2 - note E_, 2 - note D_, 4 - note E_, 2 - note C_, 2 - octave 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - note F_, 2 - intensity $c7 - note G_, 16 - note __, 16 - octave 4 - intensity $c2 - note C_, 4 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note C_, 2 - note D_, 2 - note E_, 4 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 2 - octave 2 - note B_, 2 - octave 3 - intensity $c7 - note C_, 16 - note __, 16 - -Music_PalletBattle_branch_1edb87: ; 1edb87 - octave 4 - intensity $c2 - note C#, 2 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note C#, 2 - octave 3 - note G#, 2 - loopchannel 2, Music_PalletBattle_branch_1edb87 - -Music_PalletBattle_branch_1edb99: ; 1edb99 - note G#, 2 - note G#, 2 - note D#, 2 - note G#, 2 - note G#, 2 - note D#, 2 - note G#, 2 - note D#, 2 - loopchannel 2, Music_PalletBattle_branch_1edb99 - -Music_PalletBattle_branch_1edba5: ; 1edba5 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note C#, 2 - octave 3 - note G#, 2 - loopchannel 2, Music_PalletBattle_branch_1edba5 - -Music_PalletBattle_branch_1edbb7: ; 1edbb7 - note G#, 2 - note G#, 2 - note D#, 2 - note G#, 2 - note G#, 2 - note D#, 2 - note G#, 2 - note D#, 2 - loopchannel 2, Music_PalletBattle_branch_1edbb7 - note A#, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note B_, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 2 - note D#, 2 - octave 3 - note A#, 2 - octave 4 - note D#, 2 - octave 3 - note A#, 2 - -Music_PalletBattle_branch_1edbef: ; 1edbef - octave 3 - intensity $c8 - note C_, 16 - note C_, 16 - octave 2 - note G_, 16 - note G_, 16 - loopchannel 2, Music_PalletBattle_branch_1edbef - intensity $c2 - octave 3 - loopchannel 0, Music_PalletBattle_branch_1edb37 - -Music_PalletBattle_Ch3: ; 1ede10 - notetype $c, $19 - note __, 16 - note __, 16 - -Music_PalletBattle_branch_1ede24: ; 1ede24 - octave 3 - -Music_PalletBattle_branch_1ede25: ; 1ede25 - note C_, 2 - note G_, 2 - loopchannel 8, Music_PalletBattle_branch_1ede25 - -Music_PalletBattle_branch_1ede2b: ; 1ede2b - octave 2 - note G_, 2 - octave 3 - note D_, 2 - loopchannel 8, Music_PalletBattle_branch_1ede2b - octave 3 - -Music_PalletBattle_branch_1ede34: ; 1ede34 - note C_, 2 - note G_, 2 - loopchannel 8, Music_PalletBattle_branch_1ede34 - -Music_PalletBattle_branch_1ede3a: ; 1ede3a - octave 2 - note G_, 2 - octave 3 - note D_, 2 - loopchannel 8, Music_PalletBattle_branch_1ede3a - octave 3 - -Music_PalletBattle_branch_1ede43: ; 1ede43 - note C_, 2 - note G_, 2 - loopchannel 8, Music_PalletBattle_branch_1ede43 - -Music_PalletBattle_branch_1ede49: ; 1ede49 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - loopchannel 8, Music_PalletBattle_branch_1ede49 - octave 3 - -Music_PalletBattle_branch_1ede52: ; 1ede52 - note C_, 2 - note G_, 2 - loopchannel 16, Music_PalletBattle_branch_1ede52 - octave 3 - -Music_PalletBattle_branch_1ede59: ; 1ede59 - note C#, 2 - note G#, 2 - loopchannel 8, Music_PalletBattle_branch_1ede59 - -Music_PalletBattle_branch_1ede5f: ; 1ede5f - octave 2 - note G#, 2 - octave 3 - note D#, 2 - loopchannel 8, Music_PalletBattle_branch_1ede5f - octave 3 - -Music_PalletBattle_branch_1ede68: ; 1ede68 - note C#, 2 - note G#, 2 - loopchannel 8, Music_PalletBattle_branch_1ede68 - -Music_PalletBattle_branch_1ede6e: ; 1ede6e - octave 2 - note G#, 2 - octave 3 - note D#, 2 - loopchannel 8, Music_PalletBattle_branch_1ede6e - -Music_PalletBattle_branch_1ede76: ; 1ede76 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - loopchannel 4, Music_PalletBattle_branch_1ede76 - -Music_PalletBattle_branch_1ede7e: ; 1ede7e - octave 2 - note B_, 2 - octave 3 - note F#, 2 - loopchannel 4, Music_PalletBattle_branch_1ede7e - -Music_PalletBattle_branch_1ede86: ; 1ede86 - octave 3 - note C#, 2 - note G#, 2 - loopchannel 4, Music_PalletBattle_branch_1ede86 - -Music_PalletBattle_branch_1ede8d: ; 1ede8d - note D#, 2 - note A#, 2 - loopchannel 4, Music_PalletBattle_branch_1ede8d - octave 3 - -Music_PalletBattle_branch_1ede94: ; 1ede94 - note C_, 2 - note G_, 2 - loopchannel 8, Music_PalletBattle_branch_1ede94 - -Music_PalletBattle_branch_1ede9a: ; 1ede9a - octave 2 - note G_, 2 - octave 3 - note D_, 2 - loopchannel 8, Music_PalletBattle_branch_1ede9a - octave 3 - -Music_PalletBattle_branch_1edea3: ; 1edea3 - note C_, 2 - note G_, 2 - loopchannel 8, Music_PalletBattle_branch_1edea3 - -Music_PalletBattle_branch_1edea9: ; 1edea9 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - loopchannel 8, Music_PalletBattle_branch_1edea9 - loopchannel 0, Music_PalletBattle_branch_1ede24 -; 1edeb5 diff --git a/crysaudio/music/custom/pokeathelonfinal.asm b/crysaudio/music/custom/pokeathelonfinal.asm deleted file mode 100644 index 8ac83311..00000000 --- a/crysaudio/music/custom/pokeathelonfinal.asm +++ /dev/null @@ -1,2574 +0,0 @@ -Music_PokeathelonFinal: - dbw $C0, Music_PokeathelonFinal_Ch1 - dbw $01, Music_PokeathelonFinal_Ch2 - dbw $02, Music_PokeathelonFinal_Ch3 - dbw $03, Music_PokeathelonFinal_Ch4 - -Music_PokeathelonFinal_Ch1: - tempo $84 - volume $77 - tone $0002 - notetype $2, $C3 - vibrato 8, $24 - dutycycle 2 - - octave 4 - note D#, 1 - note D_, 1 - note C#, 2 - note C_, 1 - octave 3 - note B_, 1 - - note A_, 1 - note G#, 1 - note G_, 2 - note F#, 1 - note F_, 1 - - note D#, 1 - note D_, 1 - note C#, 2 - note C_, 1 - octave 2 - note B_, 1 - - octave 1 - note D_, 1 - note C#, 1 - note C_, 4 - - note D_, 1 - note C#, 1 - note C_, 4 - - octave 4 - note D#, 1 - note D_, 1 - note C#, 2 - note C_, 1 - octave 3 - note B_, 1 - - note A_, 1 - note G#, 1 - note G_, 2 - note F#, 1 - note F_, 1 - - note D#, 1 - note D_, 1 - note C#, 2 - note C_, 1 - octave 2 - note B_, 1 - - octave 1 - note D_, 1 - note C#, 1 - note C_, 4 - - notetype $C, $C3 - note __, 7 - dutycycle 0 - octave 3 - note F_, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note F_, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 -Music_PokeathelonFinal_Loop1: - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note F_, 2 - octave 3 - note F_, 2 - note G_, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note G_, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note G_, 2 - octave 3 - note G_, 2 - note F#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note F#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note F#, 2 - octave 3 - note F#, 2 - note C#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note F_, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note F_, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note F_, 2 - octave 3 - note G_, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note D#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note D#, 2 - octave 3 - note G_, 2 - note A#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note G_, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note G_, 2 - octave 3 - note G_, 2 - note G#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note G#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note G#, 2 - octave 3 - note G#, 2 - note A#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - octave 2 - intensity $C3 - note A#, 2 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $C3 - octave 3 - note A_, 6 - note C#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - intensity $C3 - octave 3 - note C_, 1 - note C#, 2 - note D#, 1 - intensity $81 - octave 2 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - intensity $C3 - octave 3 - note D_, 1 - note D#, 2 - note C#, 1 - intensity $81 - octave 2 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - intensity $C3 - octave 3 - note C_, 1 - note C#, 2 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $C3 - octave 3 - note C_, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - intensity $C3 - octave 3 - note C_, 1 - note C#, 2 - note D#, 1 - intensity $81 - octave 2 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - intensity $C3 - note F#, 1 - note G_, 2 - intensity $81 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - intensity $C3 - octave 3 - note E_, 1 - note F_, 2 - note F#, 1 - intensity $81 - octave 2 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $91 - octave 4 - note A#, 1 - intensity $81 - octave 2 - note A#, 1 - note A#, 1 - note A#, 1 - intensity $C3 - octave 3 - note C#, 1 - intensity $A2 - octave 5 - note F_, 1 - octave 4 - note A#, 1 - octave 5 - note F_, 1 - octave 2 - note F_, 2 - octave 4 - note A#, 1 - octave 5 - note F_, 1 - octave 3 - note A#, 1 - octave 5 - note F_, 1 - octave 2 - note F_, 1 - intensity $C3 - octave 3 - note C_, 1 - note C#, 2 - intensity $A2 - note D#, 1 - octave 5 - note F_, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 4 - note A#, 1 - octave 5 - note D#, 1 - intensity $C3 - octave 2 - note G_, 2 - intensity $A2 - octave 4 - note A#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 2 - note G_, 1 - intensity $C3 - octave 3 - note D_, 1 - note D#, 2 - intensity $A2 - note C#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 4 - note A#, 1 - octave 5 - note D#, 1 - intensity $C3 - octave 2 - note F#, 2 - intensity $A2 - octave 4 - note A#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 2 - note F#, 1 - intensity $C3 - octave 3 - note C_, 1 - note C#, 2 - intensity $A2 - octave 2 - note A#, 1 - intensity $C7 - dutycycle 1 - octave 4 - notetype $6, $C7 - note A#, 1 - note B_, 1 - notetype $C, $C7 - octave 5 - note C_, 6 - note C_, 1 - note C#, 1 - dutycycle 0 - note __, 2 - intensity $C3 - octave 2 - note F_, 4 - note F_, 2 - intensity $A2 - octave 3 - note C#, 1 - octave 5 - note F_, 1 - octave 4 - note A#, 1 - octave 5 - note F_, 1 - intensity $C3 - octave 2 - note C#, 2 - intensity $A2 - octave 4 - note A#, 1 - octave 5 - note F_, 1 - octave 3 - note A#, 1 - octave 5 - note F_, 1 - octave 2 - note C#, 1 - intensity $C3 - octave 3 - note C_, 1 - note C#, 2 - intensity $A2 - note D#, 1 - octave 5 - note F_, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 4 - note A#, 1 - octave 5 - note D#, 1 - intensity $C3 - octave 2 - note D#, 2 - intensity $A2 - octave 4 - note A#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 2 - note D#, 1 - intensity $C3 - octave 3 - note D_, 1 - note D#, 2 - intensity $A2 - note F#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - octave 4 - note A#, 1 - octave 5 - note D#, 1 - intensity $C3 - octave 2 - note F#, 2 - intensity $A2 - octave 4 - note A#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note D#, 1 - intensity $C3 - octave 2 - note F#, 1 - octave 3 - note E_, 1 - note F_, 2 - intensity $A2 - note F#, 1 - octave 5 - note D#, 1 - octave 3 - note A#, 1 - octave 5 - note F#, 1 - octave 4 - note A#, 1 - octave 5 - note F#, 1 - octave 2 - note F#, 2 - octave 4 - note A#, 1 - octave 5 - note F#, 1 - octave 3 - note A#, 1 - octave 5 - note F_, 1 - intensity $C3 - octave 2 - note F_, 2 - intensity $A2 - octave 3 - note A#, 1 - octave 5 - note F_, 1 - intensity $B0 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note D_, 6 - octave 3 - note B_, 6 - octave 4 - note D_, 4 - note C#, 6 - octave 3 - note A_, 6 - note G_, 4 - note F#, 6 - octave 4 - note C#, 6 - note D_, 4 - octave 3 - note E_, 14 - note E_, 1 - note F#, 1 - note G_, 6 - note G_, 6 - note A_, 4 - note F#, 6 - note E_, 6 - note D_, 4 - note E_, 6 - note C_, 6 - note E_, 4 - note F#, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note F#, 4 - intensity $C3 - octave 2 - note G#, 2 - intensity $A1 - note C#, 1 - note C#, 1 - intensity $C3 - dutycycle 1 - note G#, 2 - intensity $A1 - dutycycle 0 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - intensity $C3 - dutycycle 1 - note G#, 2 - intensity $A1 - dutycycle 0 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - intensity $C3 - note B_, 2 - intensity $A1 - octave 1 - note B_, 1 - note B_, 1 - intensity $C3 - dutycycle 1 - octave 2 - note B_, 2 - intensity $A1 - dutycycle 0 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - intensity $C3 - dutycycle 1 - note B_, 2 - intensity $A1 - dutycycle 0 - octave 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - intensity $C3 - octave 2 - note B_, 2 - intensity $A1 - note E_, 1 - note E_, 1 - intensity $C3 - dutycycle 1 - note B_, 2 - intensity $A1 - dutycycle 0 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - intensity $C3 - dutycycle 1 - note B_, 2 - intensity $A1 - dutycycle 0 - octave 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - intensity $C3 - octave 3 - note C#, 2 - intensity $A1 - octave 1 - note A_, 1 - note A_, 1 - intensity $C3 - dutycycle 1 - octave 3 - note C#, 2 - intensity $A1 - dutycycle 0 - octave 1 - note A_, 1 - note A_, 1 - note A_, 1 - note A_, 1 - intensity $C3 - dutycycle 1 - octave 3 - note C#, 2 - intensity $A1 - dutycycle 0 - octave 1 - note A_, 1 - note A_, 1 - note A_, 1 - note A_, 1 - intensity $C3 - octave 2 - note A_, 2 - intensity $A1 - note C#, 1 - note C#, 1 - intensity $C3 - dutycycle 1 - note A_, 2 - intensity $A1 - dutycycle 0 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - intensity $C3 - dutycycle 1 - note A_, 2 - intensity $A1 - dutycycle 0 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - intensity $C3 - note B_, 2 - intensity $A1 - note D#, 1 - note D#, 1 - intensity $C3 - dutycycle 1 - note B_, 2 - intensity $A1 - dutycycle 0 - note D#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - intensity $C3 - dutycycle 1 - note B_, 2 - intensity $A1 - dutycycle 0 - note D#, 1 - note D#, 1 - note D#, 1 - note D#, 1 - intensity $C3 - note G#, 2 - intensity $A1 - note E_, 1 - note E_, 1 - intensity $C3 - dutycycle 1 - note G#, 2 - intensity $A1 - dutycycle 0 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - intensity $C3 - dutycycle 1 - note G#, 2 - intensity $A1 - dutycycle 0 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - intensity $C3 - dutycycle 1 - note G#, 2 - intensity $A1 - dutycycle 0 - octave 1 - note E_, 1 - note E_, 1 - intensity $C3 - dutycycle 1 - octave 2 - note G#, 2 - intensity $A1 - dutycycle 0 - note E_, 1 - note E_, 1 - intensity $C3 - dutycycle 1 - note F_, 2 - intensity $A1 - dutycycle 0 - octave 1 - note A_, 1 - note A_, 1 - intensity $C3 - dutycycle 1 - octave 2 - note F_, 2 - intensity $A1 - dutycycle 0 - octave 1 - note A_, 1 - note A_, 1 - intensity $C3 - dutycycle 1 - octave 3 - note F_, 2 - dutycycle 0 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - dutycycle 1 - octave 2 - intensity $C3 - note F_, 2 - dutycycle 0 - octave 1 - intensity $81 - note A#, 1 - note A#, 1 - loopchannel 0, Music_PokeathelonFinal_Loop1 -Music_PokeathelonFinal_Ch2: - notetype $C, $E2 - tone $0001 - vibrato 8, $24 - dutycycle 1 - octave 3 - note __, 8 - note F_, 1 - note F#, 1 - note G#, 1 - octave 4 - note C_, 1 - note F_, 1 - note D#, 1 - note C#, 1 - note C_, 1 - intensity $C2 - note C#, 8 -Music_PokeathelonFinal_Loop2: - notetype $4, $C2 - note __, 11 - note C_, 1 - notetype $C, $C2 - note C#, 2 - note D#, 10 - notetype $4, $C2 - note __, 11 - note D_, 1 - notetype $C, $C2 - note D#, 2 - note C#, 10 - notetype $4, $C2 - note __, 11 - note C_, 1 - notetype $C, $C2 - note C#, 2 - octave 3 - note A#, 6 - intensity $B1 - dutycycle 2 - octave 4 - note A#, 1 - note F_, 1 - note A#, 1 - octave 5 - note C#, 1 - note F_, 1 - note D#, 1 - note C#, 1 - note C_, 1 - octave 4 - note A#, 1 - note A_, 1 - note A#, 1 - octave 5 - note C_, 1 - intensity $C2 - dutycycle 1 - octave 4 - note C#, 8 - notetype $4, $C2 - note __, 11 - note C_, 1 - notetype $C, $C2 - note C#, 2 - note D#, 10 - notetype $4, $C2 - note __, 11 - note D_, 1 - notetype $C, $C2 - note D#, 2 - note F_, 10 - notetype $4, $C2 - note __, 11 - note E_, 1 - notetype $C, $C2 - note F_, 2 - note F#, 10 - notetype $4, $C2 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note D_, 1 - note E_, 1 - note F_, 1 - note G_, 1 - notetype $C, $C2 - note G#, 6 - intensity $C8 - dutycycle 0 - octave 3 - note A#, 10 - note F_, 2 - note A#, 2 - note G#, 4 - note G_, 4 - note D#, 8 - note D#, 1 - note F_, 1 - note F#, 12 - note G#, 2 - note F_, 6 - intensity $B1 - dutycycle 2 - octave 4 - note A#, 1 - note F_, 1 - note A#, 1 - octave 5 - note C#, 1 - note F_, 1 - note D#, 1 - note C#, 1 - note C_, 1 - octave 4 - note A#, 1 - note A_, 1 - note A#, 1 - octave 5 - note C_, 1 - intensity $C8 - dutycycle 0 - octave 3 - note A#, 10 - note D#, 2 - note A#, 2 - note G#, 8 - note G_, 6 - note D#, 2 - note D#, 1 - note F_, 1 - note F#, 12 - note G#, 2 - note A#, 8 - note A_, 1 - note A#, 1 - octave 4 - note C_, 8 - dutycycle 1 - note A#, 10 - note F_, 2 - note A#, 2 - note G#, 4 - note G_, 4 - note D#, 8 - note D#, 1 - note F_, 1 - note F#, 12 - note G#, 2 - note F_, 10 - octave 5 - note D#, 1 - note F_, 1 - note D#, 1 - note C#, 1 - note C_, 1 - octave 4 - note A#, 1 - note G#, 1 - note F_, 1 - note A#, 10 - note D#, 2 - note A#, 2 - note G#, 8 - note G_, 6 - note D#, 1 - note __, 1 - note D#, 1 - note F_, 1 - note F#, 12 - note G#, 2 - note A#, 8 - intensity $C2 - note A_, 1 - note A#, 1 - octave 5 - note C_, 1 - note C_, 1 - octave 4 - note A_, 1 - note F_, 1 - note C_, 1 - note F_, 1 - dutycycle 2 - octave 3 - note G_, 1 - note A_, 1 - note B_, 2 - dutycycle 1 - note G_, 1 - note D_, 1 - octave 2 - note B_, 1 - octave 3 - note D_, 1 - dutycycle 2 - note G_, 2 - dutycycle 1 - note D_, 1 - octave 2 - note B_, 1 - note G_, 1 - note B_, 1 - dutycycle 2 - octave 3 - note B_, 2 - dutycycle 1 - note G_, 1 - note D_, 1 - dutycycle 2 - note A_, 2 - dutycycle 1 - note E_, 1 - note C#, 1 - octave 2 - note A_, 1 - octave 3 - note C#, 1 - dutycycle 2 - note E_, 2 - dutycycle 1 - note C#, 1 - octave 2 - note A_, 1 - note E_, 1 - note A_, 1 - dutycycle 2 - octave 3 - note E_, 2 - dutycycle 1 - note C#, 1 - octave 2 - note A_, 1 - dutycycle 2 - octave 3 - note D_, 2 - dutycycle 1 - octave 2 - note B_, 1 - note F#, 1 - note D_, 1 - note F#, 1 - dutycycle 2 - octave 3 - note A_, 2 - dutycycle 1 - note F#, 1 - note D_, 1 - octave 2 - note B_, 1 - octave 3 - note D_, 1 - dutycycle 2 - note B_, 2 - dutycycle 1 - note F#, 1 - note D_, 1 - dutycycle 2 - note C#, 2 - dutycycle 1 - octave 2 - note A_, 1 - note F#, 1 - octave 3 - note F#, 1 - note C#, 1 - octave 2 - note A_, 1 - octave 3 - note C#, 1 - note A_, 1 - note F#, 1 - note C#, 1 - note F#, 1 - octave 4 - note C#, 1 - octave 3 - note A_, 1 - dutycycle 2 - note C#, 1 - note D_, 1 - note E_, 2 - dutycycle 1 - note E_, 1 - note C_, 1 - octave 2 - note G_, 1 - octave 3 - note C_, 1 - dutycycle 2 - note E_, 2 - dutycycle 1 - note E_, 1 - note C_, 1 - octave 2 - note G_, 1 - octave 3 - note C_, 1 - dutycycle 2 - note F#, 2 - dutycycle 1 - note C_, 1 - octave 2 - note G_, 1 - dutycycle 2 - octave 3 - note D_, 2 - dutycycle 1 - note D_, 1 - octave 2 - note B_, 1 - note F#, 1 - note B_, 1 - dutycycle 2 - octave 3 - note C#, 2 - dutycycle 1 - octave 2 - note B_, 1 - note F#, 1 - note D_, 1 - note F#, 1 - dutycycle 2 - note B_, 2 - dutycycle 1 - note F#, 1 - note D_, 1 - dutycycle 2 - octave 3 - note C_, 2 - dutycycle 1 - note C_, 1 - octave 2 - note A_, 1 - note E_, 1 - note C_, 1 - dutycycle 2 - note A_, 2 - dutycycle 1 - note E_, 1 - note C_, 1 - note E_, 1 - note A_, 1 - dutycycle 2 - octave 3 - note C_, 2 - dutycycle 1 - octave 2 - note A_, 1 - note E_, 1 - dutycycle 2 - octave 3 - note D_, 2 - dutycycle 1 - octave 2 - note A_, 1 - note F#, 1 - note D_, 1 - note F#, 1 - dutycycle 2 - octave 3 - note E_, 1 - note D_, 1 - intensity $B0 - dutycycle 1 - octave 4 - note C#, 1 - octave 3 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 - note B_, 1 - octave 4 - note C#, 1 - note D#, 1 - note E_, 6 - note C#, 6 - note E_, 4 - note F#, 6 - octave 3 - note B_, 6 - octave 4 - notetype $6, $B0 - note F#, 8 - note G#, 1 - note A_, 11 - notetype $C, $B0 - note G#, 6 - note F#, 4 - note E_, 15 - notetype $6, $B0 - note F#, 1 - note G_, 1 - notetype $C, $B0 - note G#, 6 - note F#, 6 - note B_, 4 - note G#, 6 - note F#, 6 - note E_, 4 - note D#, 16 - note C#, 6 - intensity $C2 - note D#, 1 - note C#, 1 - note C_, 1 - octave 3 - note F_, 1 - note A_, 1 - octave 4 - note C_, 1 - note F_, 1 - note D#, 1 - note C#, 1 - note C_, 1 - note C#, 8 - loopchannel 0, Music_PokeathelonFinal_Loop2 -Music_PokeathelonFinal_Ch3: - notetype $C, $14 - note __, 16 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 -Music_PokeathelonFinal_Loop3: - callchannel Music_PokeathelonFinal_Branch3A - intensity $14 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note F#, 4 - octave 1 - note F_, 1 - note F_, 1 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - callchannel Music_PokeathelonFinal_Branch3A - callchannel Music_PokeathelonFinal_Branch3A - callchannel Music_PokeathelonFinal_Branch3B - intensity $14 - note F_, 1 - intensity $24 - note F_, 1 - intensity $14 - octave 2 - note F_, 1 - intensity $24 - note F_, 1 - intensity $14 - octave 1 - note F_, 1 - intensity $24 - note F_, 1 - intensity $14 - octave 2 - note F_, 1 - intensity $24 - note F_, 1 - intensity $14 - octave 1 - note G_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note G_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 2 - note G_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note G_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note G_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 2 - note G_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note G_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 2 - note G_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 7 - note E_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 7 - note E_, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 6 - note E_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 7 - note E_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 6 - note E_, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 6 - note E_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 7 - note E_, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 7 - note E_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note B_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note B_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note B_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 5 - note A_, 1 - intensity $14 - octave 2 - note F#, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 5 - note A_, 1 - intensity $14 - octave 2 - note F#, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 5 - note A_, 1 - intensity $14 - octave 2 - note F#, 1 - intensity $20 - octave 5 - note A_, 1 - intensity $14 - octave 2 - note C_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note C_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 3 - note C_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 2 - note C_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note C_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 3 - note C_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note C_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 3 - note C_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 2 - note B_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 2 - note B_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note B_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note B_, 1 - intensity $20 - octave 5 - note B_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 5 - note A_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 5 - note A_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 5 - note A_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 6 - note A_, 1 - intensity $14 - octave 2 - note D_, 1 - intensity $20 - octave 6 - note D_, 1 - intensity $14 - octave 2 - note D_, 1 - intensity $20 - octave 7 - note D_, 1 - intensity $14 - octave 3 - note D_, 1 - intensity $20 - octave 7 - note D_, 1 - intensity $14 - octave 2 - note D_, 1 - intensity $20 - octave 6 - note D_, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 6 - note F#, 1 - intensity $14 - octave 3 - note C#, 1 - intensity $20 - octave 6 - note F#, 1 - intensity $14 - octave 3 - note F#, 1 - intensity $20 - octave 2 - note F#, 1 - intensity $14 - note F#, 1 - intensity $20 - note F#, 1 - intensity $14 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 4 - note G#, 1 - intensity $14 - octave 3 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 4 - note G#, 1 - intensity $14 - octave 3 - note C#, 1 - intensity $20 - octave 4 - note G#, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 3 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note D#, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 2 - note D#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 3 - note D#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note D#, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 2 - note D#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 3 - note D#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note D#, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 3 - note D#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note E_, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 2 - note E_, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 3 - note E_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note E_, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 2 - note E_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 3 - note E_, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 2 - note E_, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 3 - note E_, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note A_, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 2 - note A_, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 2 - note F#, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 2 - note F#, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note F#, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 2 - note F#, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 1 - note G#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note G#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note G#, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 1 - note G#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 1 - note G#, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 2 - note G#, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 1 - note G#, 1 - intensity $20 - octave 6 - note B_, 1 - intensity $14 - octave 2 - note G#, 1 - intensity $20 - octave 4 - note B_, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 4 - note G#, 1 - intensity $14 - octave 3 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 4 - note G#, 1 - intensity $14 - octave 3 - note C#, 1 - intensity $20 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note C#, 1 - intensity $20 - octave 4 - note G#, 1 - intensity $14 - octave 3 - note C#, 1 - intensity $20 - octave 4 - note G#, 1 - intensity $14 - octave 1 - note G#, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note G#, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 2 - note G#, 1 - intensity $20 - octave 7 - note C#, 1 - intensity $14 - octave 1 - note G#, 1 - intensity $20 - octave 5 - note C#, 1 - intensity $14 - octave 1 - note F_, 1 - intensity $20 - octave 6 - note F_, 1 - intensity $14 - octave 2 - note F_, 1 - intensity $20 - octave 4 - note F_, 1 - intensity $14 - octave 1 - note F_, 1 - intensity $20 - octave 4 - note F_, 1 - intensity $14 - octave 2 - note F_, 1 - intensity $20 - octave 6 - note F_, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - loopchannel 0, Music_PokeathelonFinal_Loop3 -Music_PokeathelonFinal_Branch3A: - intensity $14 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - loopchannel 7, Music_PokeathelonFinal_Branch3A - db $FF -Music_PokeathelonFinal_Branch3B: - intensity $14 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 2 - note A#, 1 - intensity $24 - note A#, 1 - intensity $14 - octave 1 - note A#, 1 - intensity $24 - note A#, 1 - db $FF -Music_PokeathelonFinal_Ch4: - notetype $C - togglenoise 1 - note F#, 3 - note F#, 3 - note F#, 3 - note D#, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note F#, 2 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 -Music_PokeathelonFinal_Loop4: - callchannel Music_PokeathelonFinal_Branch4A - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note C#, 1 - note C#, 1 - note F#, 2 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note F#, 4 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note F#, 2 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note F#, 2 - note A#, 1 - note A#, 1 - note C#, 1 - note C#, 1 - note F#, 4 - note C#, 1 - note C#, 1 - note F#, 2 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - callchannel Music_PokeathelonFinal_Branch4A - note D_, 1 - note C#, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note E_, 4 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - callchannel Music_PokeathelonFinal_Branch4A - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note C#, 1 - note C#, 1 - note F#, 2 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - callchannel Music_PokeathelonFinal_Branch4A - note D_, 1 - note C#, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note E_, 4 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - callchannel Music_PokeathelonFinal_Branch4A - note C#, 1 - note B_, 1 - note C#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note C#, 1 - note C#, 1 - note F#, 2 - note A_, 2 - note C#, 1 - note B_, 1 - note A_, 2 - callchannel Music_PokeathelonFinal_Branch4B - note B_, 1 - note D_, 1 - note A_, 2 - note C#, 1 - note B_, 1 - note E_, 2 - note B_, 1 - note B_, 1 - note A_, 2 - note C#, 1 - note B_, 1 - note A_, 2 - callchannel Music_PokeathelonFinal_Branch4B - note B_, 1 - note B_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note C#, 2 - note F#, 2 - note G_, 1 - note A_, 1 - note C#, 1 - note B_, 1 - note G_, 1 - note A_, 1 - callchannel Music_PokeathelonFinal_Branch4C - note B_, 1 - note D_, 1 - note G_, 1 - note A_, 1 - note C#, 1 - note B_, 1 - note E_, 2 - note B_, 1 - note B_, 1 - note G_, 1 - note A_, 1 - note C#, 1 - note B_, 1 - note G_, 1 - note A_, 1 - callchannel Music_PokeathelonFinal_Branch4C - note B_, 1 - note B_, 1 - note C#, 1 - note C#, 1 - note C#, 1 - note B_, 1 - note C#, 1 - note C#, 1 - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - loopchannel 0, Music_PokeathelonFinal_Loop4 -Music_PokeathelonFinal_Branch4A: - note B_, 1 - note B_, 1 - note A#, 1 - note A#, 1 - note C#, 1 - note B_, 1 - note A#, 1 - note A#, 1 - loopchannel 6, Music_PokeathelonFinal_Branch4A - db $FF -Music_PokeathelonFinal_Branch4B: - note B_, 1 - note B_, 1 - note A_, 2 - note C#, 1 - note B_, 1 - note A_, 2 - loopchannel 6, Music_PokeathelonFinal_Branch4B - db $FF -Music_PokeathelonFinal_Branch4C: - note B_, 1 - note B_, 1 - note G#, 1 - note A_, 1 - note C#, 1 - note B_, 1 - note G#, 1 - note A_, 1 - loopchannel 6, Music_PokeathelonFinal_Branch4C - db $FF diff --git a/crysaudio/music/custom/shop.asm b/crysaudio/music/custom/shop.asm deleted file mode 100644 index 8b5a79bf..00000000 --- a/crysaudio/music/custom/shop.asm +++ /dev/null @@ -1,1114 +0,0 @@ -Music_Shop: - dbw $c0, Music_Shop_Ch1 - dbw $01, Music_Shop_Ch2 - dbw $02, Music_Shop_Ch3 - dbw $03, Music_Shop_Ch4 - -Music_Shop_Ch1: - tempo $90 - volume $77 - dutycycle 1 - notetype $C, $B2 -;Channel1_Bar1: - octave 4 - note C#, 4 - note C#, 4 - note C_, 2 - note C_, 4 - octave 3 - note B_, 6 -;Channel1_Bar2: - note A#, 12 -;Channel1_Bar3: -Music_Shop_Loop1: - note D#, 4 - octave 2 - note A#, 2 - octave 3 - note D#, 4 - octave 2 - note F#, 4 - octave 3 - note D#, 4 -;Channel1_Bar4: - octave 2 - note F#, 2 - note B_, 2 - note F#, 4 - octave 3 - note D#, 4 - octave 2 - note B_, 2 -;Channel1_Bar5: - note A_, 4 - note F#, 2 - octave 3 - note D#, 4 - octave 2 - note A_, 4 - octave 3 - note D#, 4 -;Channel1_Bar6: - octave 2 - note F#, 2 - note A_, 2 - note F#, 4 - octave 3 - note D#, 4 - octave 2 - note A_, 2 -;Channel1_Bar7: - note G#, 4 - note B_, 2 - note E_, 4 - note B_, 4 - note G#, 4 -;Channel1_Bar8: - note F_, 2 - octave 3 - note D_, 2 - octave 2 - note G#, 4 - octave 3 - note D_, 4 - note F_, 2 -;Channel1_Bar9: - note B_, 4 - note F#, 2 - note B_, 2 - note F#, 2 - intensity $B4 - note F_, 2 - note F#, 2 - note G#, 2 -;Channel1_Bar10: - note A#, 16 -;Channel1_Bar11: - dutycycle 2 - note A#, 4 - note B_, 2 - note D#, 4 - note F#, 4 - note D#, 1 - note F#, 1 -;Channel1_Bar12: - note B_, 2 - note F#, 2 - note B_, 2 - octave 4 - note C#, 4 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 -;Channel1_Bar13: - octave 3 - note A_, 4 - note B_, 2 - note D#, 4 - note F#, 4 - note D#, 1 - note F#, 1 -;Channel1_Bar14: - note A_, 2 - note D#, 2 - note F#, 2 - note B_, 4 - note A_, 4 - note F#, 1 - note A_, 1 -;Channel1_Bar15: - note B_, 4 - note B_, 2 - note E_, 4 - note B_, 4 - note E_, 4 -;Channel1_Bar16: - octave 2 - note F_, 2 - octave 3 - note D_, 2 - note F_, 4 - note D_, 4 - note G#, 2 -;Channel1_Bar17: - note B_, 4 - note F#, 2 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 -;Channel1_Bar18: - note A#, 8 - note E_, 2 - note C#, 2 - note F#, 2 - note E_, 2 -;Channel1_Bar19: - intensity $B1 - dutycycle 0 - note D#, 2 - octave 2 - note G_, 2 - note A#, 2 - note G_, 4 - note A#, 4 - octave 3 - note D#, 4 -;Channel1_Bar20: - octave 2 - note G_, 2 - note A#, 2 - note G_, 4 - octave 3 - note D#, 4 - octave 2 - note A#, 2 -;Channel1_Bar21: - octave 3 - note D#, 2 - octave 2 - note G#, 2 - note B_, 2 - note G#, 4 - octave 3 - note D#, 4 - octave 2 - note B_, 4 -;Channel1_Bar22: - note G#, 2 - note B_, 2 - note G#, 4 - octave 3 - note D#, 4 - octave 2 - note G#, 2 -;Channel1_Bar23: - intensity $B4 - dutycycle 1 - octave 3 - note G_, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note A#, 2 - note A_, 2 - note A#, 2 - octave 4 - note D#, 2 -;Channel1_Bar24: - octave 3 - note D#, 2 - octave 2 - note A#, 2 - octave 4 - note D#, 1 - note D_, 1 - note D#, 2 - note F_, 1 - note E_, 1 - note F_, 2 - note G_, 1 - note F#, 1 - note G_, 2 -;Channel1_Bar25: - note C#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - octave 3 - note B_, 4 - note D#, 4 - note C#, 4 -;Channel1_Bar26: - octave 4 - note C#, 2 - note D#, 2 - octave 3 - note B_, 4 - note D#, 4 - octave 2 - note G#, 2 -;Channel1_Bar27: - intensity $B2 - octave 3 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G#, 4 - note B_, 4 - note D#, 2 -;Channel1_Bar28: - note D_, 2 - octave 2 - note B_, 2 - octave 3 - note D_, 2 - note G#, 4 - note F_, 4 - note D_, 2 -;Channel1_Bar29: - note C#, 2 - octave 2 - note F#, 2 - note A#, 2 - octave 3 - note C#, 2 - note F#, 2 - note B_, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 2 -;Channel1_Bar30: - octave 4 - note C#, 2 - octave 3 - note B_, 4 - note A#, 10 -;Channel1_Bar31: - loopchannel 0, Music_Shop_Loop1 - -Music_Shop_Ch2: - dutycycle 2 - notetype $C, $B1 -;Channel2_Bar1: - octave 4 - note F#, 4 - note F#, 4 - note F#, 2 - note F#, 4 - note F#, 6 -;Channel2_Bar2: - intensity $C5 - note F#, 6 - dutycycle 1 - octave 3 - note F#, 2 - note G#, 2 - note A#, 2 -;Channel2_Bar3: -Music_Shop_Loop2: - octave 4 - note C#, 3 - octave 3 - note F#, 1 - octave 4 - note D#, 2 - octave 3 - note B_, 8 - note B_, 1 - octave 4 - note C#, 1 -;Channel2_Bar4: - note D#, 2 - note D_, 2 - note D#, 2 - note E_, 6 - note D#, 1 - note E_, 1 - note F#, 2 -;Channel2_Bar5: - note C#, 3 - octave 3 - note F#, 1 - octave 4 - note D#, 2 - octave 3 - note B_, 8 - note B_, 1 - octave 4 - note C#, 1 -;Channel2_Bar6: - note D#, 2 - note D_, 2 - note D#, 2 - note G#, 6 - note E_, 1 - note D#, 1 - note C#, 2 -;Channel2_Bar7: - note D#, 3 - octave 3 - note G#, 1 - octave 4 - note E_, 2 - note C#, 12 -;Channel2_Bar8: - octave 3 - note G#, 6 - note A#, 4 - note B_, 4 -;Channel2_Bar9: - octave 4 - note D#, 6 - note E_, 1 - note D#, 1 - note C#, 2 - octave 3 - note B_, 2 - note A#, 2 - note B_, 2 -;Channel2_Bar10: - intensity $C2 - octave 4 - note C#, 8 - note B_, 2 - note F#, 2 - note E_, 2 - note D#, 2 -;Channel2_Bar11: - intensity $C5 - note C#, 3 - octave 3 - note F#, 1 - octave 4 - note D#, 2 - octave 3 - note B_, 8 - note B_, 1 - octave 4 - note C#, 1 -;Channel2_Bar12: - note D#, 6 - note E_, 4 - note D#, 2 - note E_, 2 - note F#, 2 -;Channel2_Bar13: - note C#, 3 - octave 3 - note F#, 1 - octave 4 - note D#, 2 - octave 3 - note B_, 8 - note B_, 1 - octave 4 - note C#, 1 -;Channel2_Bar14: - notetype 6, $C5 - note D#, 11 - note G_, 1 - note G#, 8 - note F#, 8 - octave 3 - note B_, 2 - octave 4 - note C#, 2 -;Channel2_Bar15: - note D#, 6 - octave 3 - note G#, 2 - octave 4 - note E_, 4 - note C#, 16 - note __, 8 -;Channel2_Bar16: - octave 3 - note G#, 4 - note G_, 4 - note G#, 4 - note A#, 4 - note G#, 4 - note A#, 4 - note B_, 3 - octave 4 - note D_, 1 -;Channel2_Bar17: - note D#, 12 - note E_, 2 - note D#, 2 - note C#, 4 - octave 3 - note B_, 4 - note A#, 4 - note B_, 4 -;Channel2_Bar18: - notetype $C, $C5 - octave 4 - note C#, 12 - dutycycle 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 -;Channel2_Bar19: - note D#, 4 - note D#, 4 - note D#, 2 - note D_, 2 - notetype 6, $C5 - note D#, 3 - note G#, 1 - note A#, 12 -;Channel2_Bar20: - note G_, 8 - note D#, 8 - note C#, 8 -;Channel2_Bar21: - note C#, 6 - note C#, 1 - note D_, 1 - note D#, 4 - octave 3 - note B_, 8 - note A#, 4 - note B_, 4 - octave 4 - note C#, 12 -;Channel2_Bar22: - note D#, 4 - note G#, 12 - octave 3 - note B_, 4 - octave 4 - note C#, 4 -;Channel2_Bar23: - note D#, 8 - note D#, 8 - note D#, 4 - note D_, 4 - note D#, 3 - note G#, 1 - note A#, 12 -;Channel2_Bar24: - note G_, 2 - note F#, 2 - note G_, 4 - note G#, 2 - note G_, 2 - note G#, 4 - note A#, 2 - note A_, 2 - note A#, 4 -;Channel2_Bar25: - note A#, 8 - note B_, 4 - note G#, 8 - note G_, 4 - note G#, 4 - note A#, 12 -;Channel2_Bar26: - note B_, 4 - note G#, 7 - dutycycle 0 - octave 5 - note C_, 1 - note C#, 4 - octave 4 - note B_, 4 - note A#, 4 -;Channel2_Bar27: - notetype $C, $C5 - note B_, 15 - notetype 6, $C5 - note G#, 1 - note A#, 1 -;Channel2_Bar28: - notetype $C, $C5 - note B_, 10 - note G#, 2 - note A#, 2 - note B_, 2 -;Channel2_Bar29: - note A#, 10 - note G#, 2 - note A#, 2 - note G#, 2 -;Channel2_Bar30: - note A#, 2 - note G#, 4 - note F#, 10 -;Channel2_Bar31: - dutycycle 1 - loopchannel 0, Music_Shop_Loop2 - -Music_Shop_Ch3: - notetype $C, $14 -;Channel3_Bar1: - octave 4 - note D#, 1 - note __, 3 - note D#, 1 - note __, 3 - note D_, 1 - note __, 1 - note D_, 1 - note __, 3 - note C#, 1 - note __, 5 -;Channel3_Bar2: - octave 3 - note F#, 5 - note __, 7 -;Channel3_Bar3: -Music_Shop_Loop3: - octave 2 - note B_, 4 - note __, 2 - note B_, 1 - note __, 1 - note F#, 4 - note __, 2 - note F#, 1 - note __, 1 -;Channel3_Bar4: - note B_, 4 - note __, 2 - note B_, 1 - note __, 1 - note F#, 4 - note __, 2 - note F#, 1 - note __, 1 -;Channel3_Bar5: - note B_, 4 - note __, 2 - note B_, 1 - note __, 1 - note F#, 4 - note __, 2 - note F#, 1 - note __, 1 -;Channel3_Bar6: - note B_, 4 - note __, 2 - note B_, 1 - note __, 1 - note F#, 4 - note __, 2 - note F#, 1 - note __, 1 -;Channel3_Bar7: - note E_, 4 - note __, 2 - note E_, 1 - note __, 1 - note B_, 4 - note __, 2 - note B_, 1 - note __, 1 -;Channel3_Bar8: - note F_, 4 - note __, 2 - note F_, 1 - note __, 1 - note B_, 4 - note __, 2 - note B_, 1 - note __, 1 -;Channel3_Bar9: - note F#, 4 - note __, 2 - note F#, 1 - note __, 1 - octave 3 - note F#, 4 - note __, 2 - note F#, 1 - note __, 1 -;Channel3_Bar10: - octave 2 - note F#, 2 - note __, 14 - callchannel Music_Shop_Branch - callchannel Music_Shop_Branch - callchannel Music_Shop_Branch - callchannel Music_Shop_Branch -;Channel3_Bar15: - note E_, 4 - intensity $24 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note __, 1 - note E_, 1 - note __, 1 - note B_, 4 - intensity $24 - octave 5 - note G#, 1 - intensity $14 - octave 2 - note __, 1 - note B_, 1 - note __, 1 -;Channel3_Bar16: - note F_, 4 - intensity $24 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note __, 1 - note F_, 1 - note __, 1 - note B_, 4 - intensity $24 - octave 5 - note G#, 1 - intensity $14 - octave 2 - note __, 1 - note B_, 1 - note __, 1 -;Channel3_Bar17: - note F#, 4 - intensity $24 - octave 6 - note F#, 1 - intensity $14 - octave 2 - note __, 1 - note F#, 1 - note __, 1 - octave 3 - note F#, 4 - intensity $24 - octave 5 - note F#, 1 - intensity $14 - octave 2 - note __, 1 - octave 3 - note F#, 1 - octave 2 - note __, 1 -;Channel3_Bar18: - note F#, 2 - note __, 6 - octave 3 - note C#, 4 - octave 2 - note F#, 4 -;Channel3_Bar19: - note D#, 4 - note __, 2 - note D#, 1 - note __, 1 - note G_, 4 - note __, 2 - note G_, 1 - note __, 1 -;Channel3_Bar20: - note A#, 4 - note __, 2 - note A#, 1 - note __, 1 - note D#, 4 - note G_, 4 -;Channel3_Bar21: - note G#, 4 - note __, 2 - note G#, 1 - note __, 1 - note G_, 4 - note __, 2 - note G_, 1 - note __, 1 -;Channel3_Bar22: - note F#, 4 - note __, 2 - note F#, 1 - note __, 1 - note F_, 4 - note E_, 4 -;Channel3_Bar23: - note D#, 4 - octave 4 - note A#, 1 - octave 2 - note __, 1 - note D#, 1 - note __, 1 - note G_, 4 - octave 4 - note G_, 1 - octave 2 - note __, 1 - note G_, 1 - note __, 1 -;Channel3_Bar24: - note A#, 4 - octave 4 - note A#, 1 - octave 2 - note __, 1 - note A#, 1 - note __, 1 - note D#, 4 - note G_, 4 -;Channel3_Bar25: - note G#, 4 - intensity $24 - octave 6 - note D#, 1 - intensity $14 - octave 2 - note __, 1 - note G#, 1 - note __, 1 - note G_, 4 - intensity $24 - octave 6 - note D#, 1 - intensity $14 - octave 2 - note __, 1 - note G_, 1 - note __, 1 -;Channel3_Bar26: - note F#, 4 - intensity $24 - octave 6 - note D#, 1 - intensity $14 - octave 2 - note __, 1 - note F#, 1 - note __, 1 - note F_, 4 - intensity $24 - octave 6 - note D#, 1 - intensity $14 - octave 2 - note __, 1 - note F_, 1 - note __, 1 -;Channel3_Bar27: - note E_, 4 - intensity $24 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note __, 1 - note E_, 1 - note __, 1 - octave 1 - note B_, 4 - intensity $24 - octave 5 - note G#, 1 - intensity $14 - octave 1 - note __, 1 - note B_, 1 - note __, 1 -;Channel3_Bar28: - octave 2 - note F_, 4 - intensity $24 - octave 6 - note G#, 1 - intensity $14 - octave 2 - note __, 1 - note F_, 1 - note __, 1 - octave 1 - note B_, 4 - intensity $24 - octave 6 - note D_, 1 - intensity $14 - octave 1 - note __, 1 - note B_, 1 - note __, 1 -;Channel3_Bar29: - octave 2 - note F#, 4 - intensity $24 - octave 6 - note F#, 1 - intensity $14 - octave 2 - note __, 1 - note F#, 1 - note __, 1 - octave 3 - note C#, 4 - intensity $24 - octave 5 - note F#, 1 - intensity $14 - octave 3 - note __, 1 - note C#, 1 - note __, 1 -;Channel3_Bar30: - octave 2 - note F#, 1 - note __, 1 - note F#, 1 - note __, 3 - note F#, 3 - note __, 1 - note F#, 1 - note __, 1 - note G#, 1 - note __, 1 - note A#, 1 - note __, 1 -;Channel3_Bar31: - loopchannel 0, Music_Shop_Loop3 -Music_Shop_Branch: - note B_, 4 - intensity $24 - octave 6 - note F#, 1 - intensity $14 - octave 2 - note __, 1 - note B_, 1 - note __, 1 - note F#, 4 - intensity $24 - octave 5 - note F#, 1 - intensity $14 - octave 2 - note __, 1 - note F#, 1 - note __, 1 - endchannel - -Music_Shop_Ch4: - notetype $C - togglenoise 0 -;Channel4_Bar1: - note G_, 4 - note G_, 4 - note G_, 2 - note G_, 4 - note G_, 6 -;Channel4_Bar2: - note A#, 12 -;Channel4_Bar3: -Music_Shop_Loop4: - note A#, 4 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar4: - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 -;Channel4_Bar5: - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar6: - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 -;Channel4_Bar7: - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar8: - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 -;Channel4_Bar9: - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar10: - note G_, 16 -;Channel4_Bar11: - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar12: - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 -;Channel4_Bar13: - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar14: - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 -;Channel4_Bar15: - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar16: - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 -;Channel4_Bar17: - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note D_, 2 -;Channel4_Bar18: - note G_, 16 -;Channel4_Bar19: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar20: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar21: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar22: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar23: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar24: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar25: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar26: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar27: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar28: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar29: - note A#, 4 - note G_, 2 - note D_, 2 - note A#, 4 - note G_, 2 - note D_, 2 -;Channel4_Bar30: - note G_, 2 - note A#, 4 - note A#, 4 - note D_, 2 - note G_, 2 - note G_, 2 -;Channel4_Bar31: - loopchannel 0, Music_Shop_Loop4 diff --git a/crysaudio/music/custom/sinnohtrainer.asm b/crysaudio/music/custom/sinnohtrainer.asm deleted file mode 100644 index e69de29b..00000000 diff --git a/crysaudio/music/dancinghall.asm b/crysaudio/music/dancinghall.asm index 2a7e6e51..6884000b 100644 --- a/crysaudio/music/dancinghall.asm +++ b/crysaudio/music/dancinghall.asm @@ -1,20 +1,18 @@ -Music_DancingHall: ; ef9bc - dbw $80, Music_DancingHall_Ch1 - dbw $01, Music_DancingHall_Ch2 - dbw $02, Music_DancingHall_Ch3 -; ef9c5 +Music_DancingHall: + musicheader 3, 1, Music_DancingHall_Ch1 + musicheader 1, 2, Music_DancingHall_Ch2 + musicheader 1, 3, Music_DancingHall_Ch3 + db $3 - - -Music_DancingHall_Ch1: ; ef9c6 +Music_DancingHall_Ch1: tempo 208 volume $77 stereopanning $f notetype $6, $b7 note __, 3 dutycycle $0 -Music_DancingHall_branch_ef9d3: ; ef9d3 +Music_DancingHall_branch_ef9d3: notetype $c, $b7 callchannel Music_DancingHall_branch_efa17 note __, 16 @@ -65,9 +63,8 @@ Music_DancingHall_branch_ef9d3: ; ef9d3 note __, 1 note F_, 2 loopchannel 0, Music_DancingHall_branch_ef9d3 -; efa17 -Music_DancingHall_branch_efa17: ; efa17 +Music_DancingHall_branch_efa17: octave 3 note B_, 1 note __, 1 @@ -89,15 +86,14 @@ Music_DancingHall_branch_efa17: ; efa17 note D_, 1 note __, 1 endchannel -; efa2c -Music_DancingHall_Ch2: ; efa2c +Music_DancingHall_Ch2: stereopanning $f0 notetype $6, $a1 dutycycle $0 vibrato $10, $24 note __, 3 -Music_DancingHall_branch_efa37: ; efa37 +Music_DancingHall_branch_efa37: notetype $6, $a2 callchannel Music_DancingHall_branch_efa7a callchannel Music_DancingHall_branch_efa7a @@ -145,9 +141,8 @@ Music_DancingHall_branch_efa37: ; efa37 note __, 1 note D_, 2 loopchannel 0, Music_DancingHall_branch_efa37 -; efa7a -Music_DancingHall_branch_efa7a: ; efa7a +Music_DancingHall_branch_efa7a: intensity $a1 octave 4 note E_, 4 @@ -223,9 +218,8 @@ Music_DancingHall_branch_efa7a: ; efa7a octave 4 note D_, 1 endchannel -; efad6 -Music_DancingHall_Ch3: ; efad6 +Music_DancingHall_Ch3: stereopanning $ff vibrato $16, $24 notetype $6, $10 @@ -234,7 +228,7 @@ Music_DancingHall_Ch3: ; efad6 note B_, 1 octave 6 note D_, 1 -Music_DancingHall_branch_efae3: ; efae3 +Music_DancingHall_branch_efae3: note E_, 13 note D_, 1 note E_, 1 @@ -309,6 +303,3 @@ Music_DancingHall_branch_efae3: ; efae3 octave 6 note D_, 1 loopchannel 0, Music_DancingHall_branch_efae3 -; efb3e - - diff --git a/crysaudio/music/darkcave.asm b/crysaudio/music/darkcave.asm index 813c9dd5..8d2877d0 100644 --- a/crysaudio/music/darkcave.asm +++ b/crysaudio/music/darkcave.asm @@ -1,11 +1,10 @@ -Music_DarkCave: ; ea2be - dbw $c0, Music_DarkCave_Ch1 - dbw $01, Music_DarkCave_Ch2 - dbw $02, Music_DarkCave_Ch3 - dbw $03, Music_DarkCave_Ch4 -; ea2ca +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 -Music_DarkCave_Ch1: ; ea2ca +Music_DarkCave_Ch1: tempo 128 volume $77 dutycycle $3 @@ -13,7 +12,7 @@ Music_DarkCave_Ch1: ; ea2ca vibrato $11, $15 stereopanning $f0 notetype $c, $a7 -Music_DarkCave_branch_ea2dc: ; ea2dc +Music_DarkCave_branch_ea2dc: note __, 16 loopchannel 4, Music_DarkCave_branch_ea2dc octave 3 @@ -22,7 +21,7 @@ Music_DarkCave_branch_ea2dc: ; ea2dc note C#, 16 note C_, 16 intensity $a3 -Music_DarkCave_branch_ea2e8: ; ea2e8 +Music_DarkCave_branch_ea2e8: callchannel Music_DarkCave_branch_ea333 loopchannel 3, Music_DarkCave_branch_ea2e8 intensity $b7 @@ -43,7 +42,7 @@ Music_DarkCave_branch_ea2e8: ; ea2e8 note D#, 8 note C_, 8 intensity $a3 -Music_DarkCave_branch_ea303: ; ea303 +Music_DarkCave_branch_ea303: callchannel Music_DarkCave_branch_ea333 loopchannel 2, Music_DarkCave_branch_ea303 note __, 16 @@ -74,13 +73,12 @@ Music_DarkCave_branch_ea303: ; ea303 note G_, 2 note G#, 4 intensity $a3 -Music_DarkCave_branch_ea328: ; ea328 +Music_DarkCave_branch_ea328: callchannel Music_DarkCave_branch_ea333 loopchannel 2, Music_DarkCave_branch_ea328 loopchannel 0, Music_DarkCave_branch_ea2e8 -; ea333 -Music_DarkCave_branch_ea333: ; ea333 +Music_DarkCave_branch_ea333: octave 4 note D#, 2 octave 3 @@ -136,14 +134,13 @@ Music_DarkCave_branch_ea333: ; ea333 octave 3 note A#, 2 endchannel -; ea36a -Music_DarkCave_Ch2: ; ea36a +Music_DarkCave_Ch2: dutycycle $1 vibrato $12, $36 stereopanning $f notetype $c, $a7 -Music_DarkCave_branch_ea374: ; ea374 +Music_DarkCave_branch_ea374: note __, 16 loopchannel 4, Music_DarkCave_branch_ea374 octave 3 @@ -151,7 +148,7 @@ Music_DarkCave_branch_ea374: ; ea374 note A#, 16 note F_, 16 note G_, 16 -Music_DarkCave_branch_ea37e: ; ea37e +Music_DarkCave_branch_ea37e: note __, 16 loopchannel 4, Music_DarkCave_branch_ea37e note __, 8 @@ -347,14 +344,13 @@ Music_DarkCave_branch_ea37e: ; ea37e note F_, 16 note D#, 16 loopchannel 0, Music_DarkCave_branch_ea37e -; ea46e -Music_DarkCave_Ch3: ; ea46e +Music_DarkCave_Ch3: notetype $c, $27 -Music_DarkCave_branch_ea471: ; ea471 +Music_DarkCave_branch_ea471: callchannel Music_DarkCave_branch_ea4ce loopchannel 2, Music_DarkCave_branch_ea471 -Music_DarkCave_branch_ea478: ; ea478 +Music_DarkCave_branch_ea478: callchannel Music_DarkCave_branch_ea4ce loopchannel 7, Music_DarkCave_branch_ea478 callchannel Music_DarkCave_branch_ea4c3 @@ -386,9 +382,8 @@ Music_DarkCave_branch_ea478: ; ea478 callchannel Music_DarkCave_branch_ea4a7 callchannel Music_DarkCave_branch_ea4a7 loopchannel 0, Music_DarkCave_branch_ea478 -; ea4a7 -Music_DarkCave_branch_ea4a7: ; ea4a7 +Music_DarkCave_branch_ea4a7: octave 3 note C_, 4 note G_, 2 @@ -417,9 +412,8 @@ Music_DarkCave_branch_ea4a7: ; ea4a7 note C_, 2 note C#, 4 endchannel -; ea4c3 -Music_DarkCave_branch_ea4c3: ; ea4c3 +Music_DarkCave_branch_ea4c3: octave 3 note C_, 4 note G_, 2 @@ -431,9 +425,8 @@ Music_DarkCave_branch_ea4c3: ; ea4c3 octave 2 note A#, 12 endchannel -; ea4ce -Music_DarkCave_branch_ea4ce: ; ea4ce +Music_DarkCave_branch_ea4ce: octave 2 note C_, 4 note G_, 2 @@ -462,12 +455,11 @@ Music_DarkCave_branch_ea4ce: ; ea4ce note C_, 2 note C#, 4 endchannel -; ea4ea -Music_DarkCave_Ch4: ; ea4ea +Music_DarkCave_Ch4: togglenoise $3 notetype $c -Music_DarkCave_branch_ea4ee: ; ea4ee +Music_DarkCave_branch_ea4ee: stereopanning $ff note D#, 8 note D#, 8 @@ -489,6 +481,3 @@ Music_DarkCave_branch_ea4ee: ; ea4ee note C#, 2 note C#, 2 loopchannel 0, Music_DarkCave_branch_ea4ee -; ea50d - - diff --git a/crysaudio/music/dragonsden.asm b/crysaudio/music/dragonsden.asm index 44f3fc5a..2dc0ae09 100644 --- a/crysaudio/music/dragonsden.asm +++ b/crysaudio/music/dragonsden.asm @@ -1,18 +1,17 @@ -Music_DragonsDen: ; eece8 - dbw $c0, Music_DragonsDen_Ch1 - dbw $01, Music_DragonsDen_Ch2 - dbw $02, Music_DragonsDen_Ch3 - dbw $03, Music_DragonsDen_Ch4 -; eecf4 +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 -Music_DragonsDen_Ch1: ; eecf4 +Music_DragonsDen_Ch1: tempo 144 volume $77 dutycycle $0 tone $0004 stereopanning $f0 notetype $c, $80 -Music_DragonsDen_branch_eed03: ; eed03 +Music_DragonsDen_branch_eed03: callchannel Music_DragonsDen_branch_eed1e note __, 16 callchannel Music_DragonsDen_branch_eed2d @@ -25,9 +24,8 @@ Music_DragonsDen_branch_eed03: ; eed03 note __, 10 notetype $c, $b7 loopchannel 0, Music_DragonsDen_branch_eed03 -; eed1e -Music_DragonsDen_branch_eed1e: ; eed1e +Music_DragonsDen_branch_eed1e: octave 3 note A#, 12 note A_, 4 @@ -43,9 +41,8 @@ Music_DragonsDen_branch_eed1e: ; eed1e octave 3 note G#, 16 endchannel -; eed2d -Music_DragonsDen_branch_eed2d: ; eed2d +Music_DragonsDen_branch_eed2d: intensity $b1 note __, 2 octave 4 @@ -60,14 +57,13 @@ Music_DragonsDen_branch_eed2d: ; eed2d note C#, 2 note C#, 2 endchannel -; eed3c -Music_DragonsDen_Ch2: ; eed3c +Music_DragonsDen_Ch2: dutycycle $0 tone $0004 stereopanning $f notetype $c, $90 -Music_DragonsDen_branch_eed46: ; eed46 +Music_DragonsDen_branch_eed46: callchannel Music_DragonsDen_branch_eed5e note __, 16 callchannel Music_DragonsDen_branch_eed6b @@ -77,9 +73,8 @@ Music_DragonsDen_branch_eed46: ; eed46 note __, 16 notetype $c, $c7 loopchannel 0, Music_DragonsDen_branch_eed46 -; eed5e -Music_DragonsDen_branch_eed5e: ; eed5e +Music_DragonsDen_branch_eed5e: octave 4 note D#, 12 note D_, 4 @@ -93,11 +88,10 @@ Music_DragonsDen_branch_eed5e: ; eed5e note G_, 4 note C#, 16 endchannel -; eed6b -Music_DragonsDen_branch_eed6b: ; eed6b +Music_DragonsDen_branch_eed6b: intensity $c1 -Music_DragonsDen_branch_eed6d: ; eed6d +Music_DragonsDen_branch_eed6d: octave 5 note C#, 4 octave 4 @@ -106,10 +100,9 @@ Music_DragonsDen_branch_eed6d: ; eed6d note G#, 4 loopchannel 2, Music_DragonsDen_branch_eed6d endchannel -; eed78 -Music_DragonsDen_Ch3: ; eed78 -Music_DragonsDen_branch_eed78: ; eed78 +Music_DragonsDen_Ch3: +Music_DragonsDen_branch_eed78: notetype $c, $14 octave 4 note C#, 2 @@ -136,7 +129,7 @@ Music_DragonsDen_branch_eed78: ; eed78 loopchannel 15, Music_DragonsDen_branch_eed78 note __, 16 notetype $6, $27 -Music_DragonsDen_branch_eed99: ; eed99 +Music_DragonsDen_branch_eed99: octave 3 note C#, 4 octave 2 @@ -161,14 +154,13 @@ Music_DragonsDen_branch_eed99: ; eed99 note C#, 2 loopchannel 16, Music_DragonsDen_branch_eed99 loopchannel 0, Music_DragonsDen_branch_eed78 -; eedb7 -Music_DragonsDen_Ch4: ; eedb7 +Music_DragonsDen_Ch4: togglenoise $0 notetype $c note __, 16 note __, 16 -Music_DragonsDen_branch_eedbd: ; eedbd +Music_DragonsDen_branch_eedbd: stereopanning $f0 note F_, 4 stereopanning $f @@ -177,6 +169,3 @@ Music_DragonsDen_branch_eedbd: ; eedbd stereopanning $f0 note F#, 4 loopchannel 0, Music_DragonsDen_branch_eedbd -; eedcb - - diff --git a/crysaudio/music/ecruteakcity.asm b/crysaudio/music/ecruteakcity.asm index 20a2c9fc..df60e9eb 100644 --- a/crysaudio/music/ecruteakcity.asm +++ b/crysaudio/music/ecruteakcity.asm @@ -1,16 +1,15 @@ -Music_EcruteakCity: ; ef2d0 - dbw $80, Music_EcruteakCity_Ch1 - dbw $01, Music_EcruteakCity_Ch2 - dbw $02, Music_EcruteakCity_Ch3 -; ef2d9 +Music_EcruteakCity: + musicheader 3, 1, Music_EcruteakCity_Ch1 + musicheader 1, 2, Music_EcruteakCity_Ch2 + musicheader 1, 3, Music_EcruteakCity_Ch3 -Music_EcruteakCity_Ch1: ; ef2d9 +Music_EcruteakCity_Ch1: tempo 197 volume $77 stereopanning $f vibrato $12, $25 dutycycle $2 -Music_EcruteakCity_branch_ef2e5: ; ef2e5 +Music_EcruteakCity_branch_ef2e5: notetype $c, $57 note __, 10 octave 4 @@ -145,9 +144,8 @@ Music_EcruteakCity_branch_ef2e5: ; ef2e5 note C_, 2 callchannel Music_EcruteakCity_branch_ef391 loopchannel 0, Music_EcruteakCity_branch_ef2e5 -; ef37f -Music_EcruteakCity_branch_ef37f: ; ef37f +Music_EcruteakCity_branch_ef37f: octave 5 note E_, 2 note C_, 2 @@ -163,9 +161,8 @@ Music_EcruteakCity_branch_ef37f: ; ef37f note C_, 2 loopchannel 2, Music_EcruteakCity_branch_ef37f endchannel -; ef391 -Music_EcruteakCity_branch_ef391: ; ef391 +Music_EcruteakCity_branch_ef391: octave 5 note D_, 2 octave 4 @@ -211,7 +208,7 @@ Music_EcruteakCity_branch_ef391: ; ef391 note C_, 2 octave 3 note A_, 2 -Music_EcruteakCity_branch_ef3be: ; ef3be +Music_EcruteakCity_branch_ef3be: octave 4 note F_, 2 note A_, 2 @@ -227,7 +224,7 @@ Music_EcruteakCity_branch_ef3be: ; ef3be note C_, 2 note F_, 2 loopchannel 2, Music_EcruteakCity_branch_ef3be -Music_EcruteakCity_branch_ef3d0: ; ef3d0 +Music_EcruteakCity_branch_ef3d0: octave 4 note G_, 2 note B_, 2 @@ -249,13 +246,12 @@ Music_EcruteakCity_branch_ef3d0: ; ef3d0 note G_, 16 dutycycle $2 endchannel -; ef3eb -Music_EcruteakCity_Ch2: ; ef3eb +Music_EcruteakCity_Ch2: vibrato $12, $25 dutycycle $3 stereopanning $f0 -Music_EcruteakCity_branch_ef3f2: ; ef3f2 +Music_EcruteakCity_branch_ef3f2: notetype $6, $67 note __, 16 note __, 5 @@ -472,11 +468,10 @@ Music_EcruteakCity_branch_ef3f2: ; ef3f2 note D_, 2 note E_, 16 loopchannel 0, Music_EcruteakCity_branch_ef3f2 -; ef4e1 -Music_EcruteakCity_Ch3: ; ef4e1 +Music_EcruteakCity_Ch3: stereopanning $ff -Music_EcruteakCity_branch_ef4e3: ; ef4e3 +Music_EcruteakCity_branch_ef4e3: vibrato $12, $25 notetype $c, $25 octave 3 @@ -598,9 +593,8 @@ Music_EcruteakCity_branch_ef4e3: ; ef4e3 note E_, 8 note D_, 8 loopchannel 0, Music_EcruteakCity_branch_ef4e3 -; ef569 -Music_EcruteakCity_branch_ef569: ; ef569 +Music_EcruteakCity_branch_ef569: octave 3 note F_, 4 note __, 2 @@ -671,6 +665,3 @@ Music_EcruteakCity_branch_ef569: ; ef569 note __, 1 note B_, 1 endchannel -; ef5b1 - - diff --git a/crysaudio/music/elmslab.asm b/crysaudio/music/elmslab.asm index 86d8a7b8..38b04b59 100644 --- a/crysaudio/music/elmslab.asm +++ b/crysaudio/music/elmslab.asm @@ -1,11 +1,10 @@ -Music_ElmsLab: ; ea040 - dbw $c0, Music_ElmsLab_Ch1 - dbw $01, Music_ElmsLab_Ch2 - dbw $02, Music_ElmsLab_Ch3 - dbw $03, Music_ElmsLab_Ch4 -; ea04c +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 -Music_ElmsLab_Ch1: ; ea04c +Music_ElmsLab_Ch1: tempo 144 volume $77 dutycycle $3 @@ -34,7 +33,7 @@ Music_ElmsLab_Ch1: ; ea04c note A_, 4 note A_, 4 note A_, 2 -Music_ElmsLab_branch_ea075: ; ea075 +Music_ElmsLab_branch_ea075: note __, 2 note A_, 2 note G#, 2 @@ -182,9 +181,8 @@ Music_ElmsLab_branch_ea075: ; ea075 note F_, 2 note F_, 4 loopchannel 0, Music_ElmsLab_branch_ea075 -; ea128 -Music_ElmsLab_Ch2: ; ea128 +Music_ElmsLab_Ch2: dutycycle $3 vibrato $10, $26 stereopanning $f @@ -214,7 +212,7 @@ Music_ElmsLab_Ch2: ; ea128 note C_, 4 note C_, 2 stereopanning $ff -Music_ElmsLab_branch_ea14f: ; ea14f +Music_ElmsLab_branch_ea14f: intensity $c6 octave 4 note F_, 6 @@ -350,9 +348,8 @@ Music_ElmsLab_branch_ea14f: ; ea14f octave 3 note E_, 2 loopchannel 0, Music_ElmsLab_branch_ea14f -; ea1fd -Music_ElmsLab_Ch3: ; ea1fd +Music_ElmsLab_Ch3: stereopanning $f notetype $c, $25 note __, 8 @@ -375,7 +372,7 @@ Music_ElmsLab_Ch3: ; ea1fd note C_, 2 note D_, 2 note E_, 2 -Music_ElmsLab_branch_ea216: ; ea216 +Music_ElmsLab_branch_ea216: note F_, 2 note A_, 2 note C_, 2 @@ -528,17 +525,13 @@ Music_ElmsLab_branch_ea216: ; ea216 note F_, 2 note A_, 2 loopchannel 0, Music_ElmsLab_branch_ea216 -; ea2b1 -Music_ElmsLab_Ch4: ; ea2b1 +Music_ElmsLab_Ch4: stereopanning $f0 togglenoise $0 notetype $c note __, 16 note __, 2 -Music_ElmsLab_branch_ea2b9: ; ea2b9 +Music_ElmsLab_branch_ea2b9: note G_, 4 loopchannel 0, Music_ElmsLab_branch_ea2b9 -; ea2be - - diff --git a/crysaudio/music/evolution.asm b/crysaudio/music/evolution.asm index 1f9613e6..47e11543 100644 --- a/crysaudio/music/evolution.asm +++ b/crysaudio/music/evolution.asm @@ -1,30 +1,29 @@ -Music_Evolution: ; f06e1 - dbw $c0, Music_Evolution_Ch1 - dbw $01, Music_Evolution_Ch2 - dbw $02, Music_Evolution_Ch3 - dbw $03, Music_Evolution_Ch4 -; f06ed +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 -Music_Evolution_Ch1: ; f06ed - ftempo 132 +Music_Evolution_Ch1: + tempo 132 volume $77 vibrato $6, $34 tone $0001 dutycycle $2 notetype $c, $92 octave 3 - unknownmusic0xe0 $0, $4a + slidepitchto 1, 4, A_ note C_, 1 - unknownmusic0xe0 $0, $4a + slidepitchto 1, 4, A_ note G_, 1 - unknownmusic0xe0 $0, $4a + slidepitchto 1, 4, A_ note C_, 1 - unknownmusic0xe0 $0, $4a + slidepitchto 1, 4, A_ note G_, 1 note __, 4 dutycycle $3 stereopanning $f -Music_Evolution_branch_f0713: ; f0713 +Music_Evolution_branch_f0713: callchannel Music_Evolution_branch_f0737 notetype $c, $a4 note F#, 4 @@ -39,9 +38,8 @@ Music_Evolution_branch_f0713: ; f0713 notetype $c, $a4 note G#, 4 loopchannel 0, Music_Evolution_branch_f0713 -; f0737 -Music_Evolution_branch_f0737: ; f0737 +Music_Evolution_branch_f0737: notetype $c, $a2 octave 3 note C_, 4 @@ -52,9 +50,8 @@ Music_Evolution_branch_f0737: ; f0737 note G_, 4 note C_, 4 endchannel -; f0743 -Music_Evolution_branch_f0743: ; f0743 +Music_Evolution_branch_f0743: notetype $c, $a2 octave 3 note D_, 4 @@ -65,9 +62,8 @@ Music_Evolution_branch_f0743: ; f0743 note A_, 4 note D_, 4 endchannel -; f074f -Music_Evolution_Ch2: ; f074f +Music_Evolution_Ch2: dutycycle $2 vibrato $8, $25 notetype $c, $a2 @@ -79,7 +75,7 @@ Music_Evolution_Ch2: ; f074f note __, 4 dutycycle $3 stereopanning $f0 -Music_Evolution_branch_f0761: ; f0761 +Music_Evolution_branch_f0761: callchannel Music_Evolution_branch_f0787 notetype $c, $b5 note A_, 4 @@ -96,9 +92,8 @@ Music_Evolution_branch_f0761: ; f0761 note C#, 4 octave 3 loopchannel 0, Music_Evolution_branch_f0761 -; f0787 -Music_Evolution_branch_f0787: ; f0787 +Music_Evolution_branch_f0787: notetype $c, $b2 octave 3 note G_, 4 @@ -109,9 +104,8 @@ Music_Evolution_branch_f0787: ; f0787 note D_, 4 note G_, 4 endchannel -; f0793 -Music_Evolution_branch_f0793: ; f0793 +Music_Evolution_branch_f0793: notetype $c, $b2 octave 3 note A_, 4 @@ -122,12 +116,11 @@ Music_Evolution_branch_f0793: ; f0793 note E_, 4 note A_, 4 endchannel -; f079f -Music_Evolution_Ch3: ; f079f +Music_Evolution_Ch3: notetype $c, $16 note __, 8 -Music_Evolution_branch_f07a3: ; f07a3 +Music_Evolution_branch_f07a3: callchannel Music_Evolution_branch_f07bf octave 3 note A_, 4 @@ -142,9 +135,8 @@ Music_Evolution_branch_f07a3: ; f07a3 octave 4 note C#, 4 loopchannel 0, Music_Evolution_branch_f07a3 -; f07bf -Music_Evolution_branch_f07bf: ; f07bf +Music_Evolution_branch_f07bf: octave 2 note A_, 2 note __, 2 @@ -167,9 +159,8 @@ Music_Evolution_branch_f07bf: ; f07bf note A_, 2 note __, 2 endchannel -; f07d5 -Music_Evolution_branch_f07d5: ; f07d5 +Music_Evolution_branch_f07d5: octave 2 note B_, 2 note __, 2 @@ -192,13 +183,12 @@ Music_Evolution_branch_f07d5: ; f07d5 note A_, 2 note __, 2 endchannel -; f07eb -Music_Evolution_Ch4: ; f07eb +Music_Evolution_Ch4: togglenoise $5 notetype $c note __, 8 -Music_Evolution_branch_f07f0: ; f07f0 +Music_Evolution_branch_f07f0: stereopanning $f0 note A#, 6 note A#, 4 @@ -207,6 +197,3 @@ Music_Evolution_branch_f07f0: ; f07f0 note E_, 2 note E_, 2 loopchannel 0, Music_Evolution_branch_f07f0 -; f07fd - - diff --git a/crysaudio/music/gamecorner.asm b/crysaudio/music/gamecorner.asm index 4dd29e0a..d275bc9a 100644 --- a/crysaudio/music/gamecorner.asm +++ b/crysaudio/music/gamecorner.asm @@ -1,17 +1,16 @@ -Music_GameCorner: ; edd6d - dbw $c0, Music_GameCorner_Ch1 - dbw $01, Music_GameCorner_Ch2 - dbw $02, Music_GameCorner_Ch3 - dbw $03, Music_GameCorner_Ch4 -; edd79 +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 -Music_GameCorner_Ch1: ; edd79 +Music_GameCorner_Ch1: tempo 147 volume $77 stereopanning $f notetype $c, $91 note __, 8 -Music_GameCorner_branch_edd84: ; edd84 +Music_GameCorner_branch_edd84: intensity $91 note __, 16 note __, 16 @@ -39,7 +38,7 @@ Music_GameCorner_branch_edd84: ; edd84 note G#, 2 note G_, 2 intensity $71 -Music_GameCorner_branch_eddb1: ; eddb1 +Music_GameCorner_branch_eddb1: octave 4 note G#, 1 octave 5 @@ -47,7 +46,7 @@ Music_GameCorner_branch_eddb1: ; eddb1 note F_, 1 note C_, 1 loopchannel 4, Music_GameCorner_branch_eddb1 -Music_GameCorner_branch_eddbb: ; eddbb +Music_GameCorner_branch_eddbb: octave 4 note A#, 1 octave 5 @@ -55,7 +54,7 @@ Music_GameCorner_branch_eddbb: ; eddbb note G_, 1 note D_, 1 loopchannel 4, Music_GameCorner_branch_eddbb -Music_GameCorner_branch_eddc5: ; eddc5 +Music_GameCorner_branch_eddc5: octave 4 note D#, 1 note G_, 1 @@ -64,7 +63,7 @@ Music_GameCorner_branch_eddc5: ; eddc5 octave 4 note G_, 1 loopchannel 4, Music_GameCorner_branch_eddc5 -Music_GameCorner_branch_eddd0: ; eddd0 +Music_GameCorner_branch_eddd0: octave 4 note F_, 1 note A_, 1 @@ -73,7 +72,7 @@ Music_GameCorner_branch_eddd0: ; eddd0 octave 4 note A_, 1 loopchannel 4, Music_GameCorner_branch_eddd0 -Music_GameCorner_branch_edddb: ; edddb +Music_GameCorner_branch_edddb: octave 4 note G#, 1 octave 5 @@ -81,7 +80,7 @@ Music_GameCorner_branch_edddb: ; edddb note F_, 1 note C_, 1 loopchannel 4, Music_GameCorner_branch_edddb -Music_GameCorner_branch_edde5: ; edde5 +Music_GameCorner_branch_edde5: octave 4 note A#, 1 octave 5 @@ -89,7 +88,7 @@ Music_GameCorner_branch_edde5: ; edde5 note G_, 1 note D_, 1 loopchannel 4, Music_GameCorner_branch_edde5 -Music_GameCorner_branch_eddef: ; eddef +Music_GameCorner_branch_eddef: octave 4 note B_, 1 octave 5 @@ -104,9 +103,8 @@ Music_GameCorner_branch_eddef: ; eddef note F_, 2 note F_, 9 loopchannel 0, Music_GameCorner_branch_edd84 -; ede03 -Music_GameCorner_branch_ede03: ; ede03 +Music_GameCorner_branch_ede03: note __, 2 octave 4 note A#, 3 @@ -123,9 +121,8 @@ Music_GameCorner_branch_ede03: ; ede03 note G#, 1 note A#, 3 endchannel -; ede13 -Music_GameCorner_branch_ede13: ; ede13 +Music_GameCorner_branch_ede13: note __, 2 octave 4 note A#, 3 @@ -135,14 +132,13 @@ Music_GameCorner_branch_ede13: ; ede13 note F_, 3 note F_, 2 endchannel -; ede1c -Music_GameCorner_Ch2: ; ede1c +Music_GameCorner_Ch2: stereopanning $ff vibrato $8, $24 notetype $c, $a1 note __, 8 -Music_GameCorner_branch_ede25: ; ede25 +Music_GameCorner_branch_ede25: intensity $92 dutycycle $1 callchannel Music_GameCorner_branch_ede75 @@ -207,9 +203,8 @@ Music_GameCorner_branch_ede25: ; ede25 note A#, 9 intensity $a4 loopchannel 0, Music_GameCorner_branch_ede25 -; ede75 -Music_GameCorner_branch_ede75: ; ede75 +Music_GameCorner_branch_ede75: octave 1 note C_, 2 octave 3 @@ -319,13 +314,12 @@ Music_GameCorner_branch_ede75: ; ede75 note D_, 2 note D#, 2 endchannel -; edee8 -Music_GameCorner_Ch3: ; edee8 +Music_GameCorner_Ch3: vibrato $8, $22 notetype $c, $14 note __, 8 -Music_GameCorner_branch_edeef: ; edeef +Music_GameCorner_branch_edeef: stereopanning $ff notetype $c, $14 callchannel Music_GameCorner_branch_edfdd @@ -504,9 +498,8 @@ Music_GameCorner_branch_edeef: ; edeef note E_, 1 note D_, 1 loopchannel 0, Music_GameCorner_branch_edeef -; edfdd -Music_GameCorner_branch_edfdd: ; edfdd +Music_GameCorner_branch_edfdd: octave 2 note C_, 1 octave 3 @@ -534,9 +527,8 @@ Music_GameCorner_branch_edfdd: ; edfdd octave 4 note A_, 2 endchannel -; edff8 -Music_GameCorner_branch_edff8: ; edff8 +Music_GameCorner_branch_edff8: octave 2 note C_, 1 octave 3 @@ -557,9 +549,8 @@ Music_GameCorner_branch_edff8: ; edff8 note A_, 1 note __, 1 endchannel -; ee00c -Music_GameCorner_branch_ee00c: ; ee00c +Music_GameCorner_branch_ee00c: octave 2 note F_, 1 octave 3 @@ -584,9 +575,8 @@ Music_GameCorner_branch_ee00c: ; ee00c note C_, 1 note D_, 3 endchannel -; ee024 -Music_GameCorner_branch_ee024: ; ee024 +Music_GameCorner_branch_ee024: octave 2 note F_, 1 octave 3 @@ -614,9 +604,8 @@ Music_GameCorner_branch_ee024: ; ee024 note F_, 1 note __, 1 endchannel -; ee03f -Music_GameCorner_branch_ee03f: ; ee03f +Music_GameCorner_branch_ee03f: octave 2 note F_, 2 note __, 1 @@ -665,9 +654,8 @@ Music_GameCorner_branch_ee03f: ; ee03f octave 3 note D_, 1 endchannel -; ee06f -Music_GameCorner_Ch4: ; ee06f +Music_GameCorner_Ch4: togglenoise $3 notetype $c notetype $8 @@ -680,9 +668,9 @@ Music_GameCorner_Ch4: ; ee06f note D_, 2 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee07f: ; ee07f +Music_GameCorner_branch_ee07f: callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee082: ; ee082 +Music_GameCorner_branch_ee082: note A#, 2 note F#, 2 note D_, 2 @@ -693,7 +681,7 @@ Music_GameCorner_branch_ee082: ; ee082 note F#, 2 loopchannel 6, Music_GameCorner_branch_ee082 callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee091: ; ee091 +Music_GameCorner_branch_ee091: note A#, 2 note F#, 2 note D_, 2 @@ -708,7 +696,7 @@ Music_GameCorner_branch_ee091: ; ee091 note D_, 1 note F#, 2 callchannel Music_GameCorner_branch_ee106 -Music_GameCorner_branch_ee0a4: ; ee0a4 +Music_GameCorner_branch_ee0a4: note A#, 2 note F#, 2 note D_, 2 @@ -719,7 +707,7 @@ Music_GameCorner_branch_ee0a4: ; ee0a4 note F#, 2 loopchannel 6, Music_GameCorner_branch_ee0a4 callchannel Music_GameCorner_branch_ee10f -Music_GameCorner_branch_ee0b3: ; ee0b3 +Music_GameCorner_branch_ee0b3: note A#, 2 note F#, 2 note D_, 2 @@ -739,7 +727,7 @@ Music_GameCorner_branch_ee0b3: ; ee0b3 note D_, 1 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee0c9: ; ee0c9 +Music_GameCorner_branch_ee0c9: note A#, 2 note F#, 1 note D#, 1 @@ -768,7 +756,7 @@ Music_GameCorner_branch_ee0c9: ; ee0c9 note D_, 2 note D_, 1 note D_, 1 -Music_GameCorner_branch_ee0e8: ; ee0e8 +Music_GameCorner_branch_ee0e8: note A#, 2 note F#, 1 note D#, 1 @@ -793,9 +781,8 @@ Music_GameCorner_branch_ee0e8: ; ee0e8 note D_, 1 note D#, 2 loopchannel 0, Music_GameCorner_branch_ee07f -; ee106 -Music_GameCorner_branch_ee106: ; ee106 +Music_GameCorner_branch_ee106: note C_, 2 note F#, 2 note D_, 2 @@ -805,9 +792,8 @@ Music_GameCorner_branch_ee106: ; ee106 note D_, 2 note F#, 2 endchannel -; ee10f -Music_GameCorner_branch_ee10f: ; ee10f +Music_GameCorner_branch_ee10f: note A#, 2 note F#, 2 note D_, 2 @@ -818,6 +804,3 @@ Music_GameCorner_branch_ee10f: ; ee10f note D_, 1 note F#, 2 endchannel -; ee119 - - diff --git a/crysaudio/music/goldenrodcity.asm b/crysaudio/music/goldenrodcity.asm index 0a94a995..42f861e3 100644 --- a/crysaudio/music/goldenrodcity.asm +++ b/crysaudio/music/goldenrodcity.asm @@ -1,11 +1,10 @@ -Music_GoldenrodCity: ; eb453 - dbw $c0, Music_GoldenrodCity_Ch1 - dbw $01, Music_GoldenrodCity_Ch2 - dbw $02, Music_GoldenrodCity_Ch3 - dbw $03, Music_GoldenrodCity_Ch4 -; eb45f +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 -Music_GoldenrodCity_Ch1: ; eb45f +Music_GoldenrodCity_Ch1: stereopanning $f tempo 176 volume $77 @@ -14,7 +13,7 @@ Music_GoldenrodCity_Ch1: ; eb45f note __, 16 note __, 16 note __, 16 -Music_GoldenrodCity_branch_eb46d: ; eb46d +Music_GoldenrodCity_branch_eb46d: dutycycle $0 callchannel Music_GoldenrodCity_branch_eb4a9 octave 3 @@ -56,9 +55,8 @@ Music_GoldenrodCity_branch_eb46d: ; eb46d octave 4 note C_, 2 loopchannel 0, Music_GoldenrodCity_branch_eb46d -; eb4a9 -Music_GoldenrodCity_branch_eb4a9: ; eb4a9 +Music_GoldenrodCity_branch_eb4a9: octave 4 note C#, 2 octave 3 @@ -99,9 +97,8 @@ Music_GoldenrodCity_branch_eb4a9: ; eb4a9 octave 4 note C#, 2 endchannel -; eb4d1 -Music_GoldenrodCity_branch_eb4d1: ; eb4d1 +Music_GoldenrodCity_branch_eb4d1: octave 4 note F_, 1 note C#, 1 @@ -174,14 +171,13 @@ Music_GoldenrodCity_branch_eb4d1: ; eb4d1 note D#, 1 note F#, 1 endchannel -; eb519 -Music_GoldenrodCity_Ch2: ; eb519 +Music_GoldenrodCity_Ch2: stereopanning $f0 vibrato $12, $23 dutycycle $2 notetype $c, $97 -Music_GoldenrodCity_branch_eb523: ; eb523 +Music_GoldenrodCity_branch_eb523: intensity $97 callchannel Music_GoldenrodCity_branch_eb555 octave 4 @@ -216,9 +212,8 @@ Music_GoldenrodCity_branch_eb523: ; eb523 octave 4 note G#, 2 loopchannel 0, Music_GoldenrodCity_branch_eb523 -; eb555 -Music_GoldenrodCity_branch_eb555: ; eb555 +Music_GoldenrodCity_branch_eb555: octave 4 note F_, 4 note C#, 4 @@ -247,9 +242,8 @@ Music_GoldenrodCity_branch_eb555: ; eb555 note F#, 2 dutycycle $1 endchannel -; eb572 -Music_GoldenrodCity_branch_eb572: ; eb572 +Music_GoldenrodCity_branch_eb572: note C#, 6 note F_, 6 note C#, 4 @@ -268,13 +262,12 @@ Music_GoldenrodCity_branch_eb572: ; eb572 note C_, 4 note D#, 2 endchannel -; eb584 -Music_GoldenrodCity_Ch3: ; eb584 +Music_GoldenrodCity_Ch3: stereopanning $ff vibrato $8, $23 notetype $c, $25 -Music_GoldenrodCity_branch_eb58c: ; eb58c +Music_GoldenrodCity_branch_eb58c: callchannel Music_GoldenrodCity_branch_eb5aa callchannel Music_GoldenrodCity_branch_eb5aa callchannel Music_GoldenrodCity_branch_eb5d2 @@ -294,9 +287,8 @@ Music_GoldenrodCity_branch_eb58c: ; eb58c octave 2 note G#, 2 loopchannel 0, Music_GoldenrodCity_branch_eb58c -; eb5aa -Music_GoldenrodCity_branch_eb5aa: ; eb5aa +Music_GoldenrodCity_branch_eb5aa: octave 3 note C#, 4 note __, 2 @@ -337,9 +329,8 @@ Music_GoldenrodCity_branch_eb5aa: ; eb5aa note G#, 1 note __, 1 endchannel -; eb5d2 -Music_GoldenrodCity_branch_eb5d2: ; eb5d2 +Music_GoldenrodCity_branch_eb5d2: note C#, 1 note __, 1 octave 4 @@ -392,9 +383,8 @@ Music_GoldenrodCity_branch_eb5d2: ; eb5d2 note __, 2 note G#, 1 endchannel -; eb606 -Music_GoldenrodCity_Ch4: ; eb606 +Music_GoldenrodCity_Ch4: togglenoise $3 notetype $c note __, 16 @@ -406,7 +396,7 @@ Music_GoldenrodCity_Ch4: ; eb606 note D_, 1 note D_, 1 note F#, 2 -Music_GoldenrodCity_branch_eb613: ; eb613 +Music_GoldenrodCity_branch_eb613: note D#, 2 note F#, 2 note D_, 2 @@ -447,7 +437,7 @@ Music_GoldenrodCity_branch_eb613: ; eb613 note D_, 2 note D_, 1 note D_, 1 -Music_GoldenrodCity_branch_eb650: ; eb650 +Music_GoldenrodCity_branch_eb650: note D#, 2 note F#, 2 note D_, 2 @@ -459,9 +449,8 @@ Music_GoldenrodCity_branch_eb650: ; eb650 loopchannel 3, Music_GoldenrodCity_branch_eb650 callchannel Music_GoldenrodCity_branch_eb663 loopchannel 0, Music_GoldenrodCity_branch_eb613 -; eb663 -Music_GoldenrodCity_branch_eb663: ; eb663 +Music_GoldenrodCity_branch_eb663: note D#, 2 note F#, 2 note D_, 2 @@ -472,9 +461,8 @@ Music_GoldenrodCity_branch_eb663: ; eb663 note D_, 1 note F#, 2 endchannel -; eb66d -Music_GoldenrodCity_branch_eb66d: ; eb66d +Music_GoldenrodCity_branch_eb66d: note D#, 2 note D_, 1 note D#, 3 @@ -484,6 +472,3 @@ Music_GoldenrodCity_branch_eb66d: ; eb66d note G_, 1 note G_, 1 endchannel -; eb676 - - diff --git a/crysaudio/music/goldsilveropening.asm b/crysaudio/music/goldsilveropening.asm index 4459d1ba..a9359f00 100644 --- a/crysaudio/music/goldsilveropening.asm +++ b/crysaudio/music/goldsilveropening.asm @@ -1,11 +1,10 @@ -Music_GoldSilverOpening: ; f7055 - dbw $80, Music_GoldSilverOpening_Ch1 - dbw $01, Music_GoldSilverOpening_Ch2 - dbw $02, Music_GoldSilverOpening_Ch3 -; f705e +Music_GoldSilverOpening: + musicheader 3, 1, Music_GoldSilverOpening_Ch1 + musicheader 1, 2, Music_GoldSilverOpening_Ch2 + musicheader 1, 3, Music_GoldSilverOpening_Ch3 -Music_GoldSilverOpening_Ch1: ; f705e - ftempo 256 +Music_GoldSilverOpening_Ch1: + tempo 256 volume $77 tone $0001 dutycycle $2 @@ -14,7 +13,7 @@ Music_GoldSilverOpening_Ch1: ; f705e octave 1 note G#, 16 note G#, 16 - ftempo 168 + tempo 168 dutycycle $3 notetype $6, $c7 octave 3 @@ -128,9 +127,8 @@ Music_GoldSilverOpening_Ch1: ; f705e note G_, 2 note A_, 16 endchannel -; f70f8 -Music_GoldSilverOpening_Ch2: ; f70f8 +Music_GoldSilverOpening_Ch2: tone $0001 stereopanning $f notetype $c, $b7 @@ -309,9 +307,8 @@ Music_GoldSilverOpening_Ch2: ; f70f8 note C_, 4 note D#, 16 endchannel -; f71c8 -Music_GoldSilverOpening_Ch3: ; f71c8 +Music_GoldSilverOpening_Ch3: notetype $6, $10 octave 2 note D_, 4 @@ -616,6 +613,3 @@ Music_GoldSilverOpening_Ch3: ; f71c8 note C_, 1 note __, 13 endchannel -; f7308 - - diff --git a/crysaudio/music/goldsilveropening2.asm b/crysaudio/music/goldsilveropening2.asm index 005983e9..2dc43e3b 100644 --- a/crysaudio/music/goldsilveropening2.asm +++ b/crysaudio/music/goldsilveropening2.asm @@ -1,12 +1,11 @@ -Music_GoldSilverOpening2: ; f7308 - dbw $c0, Music_GoldSilverOpening2_Ch1 - dbw $01, Music_GoldSilverOpening2_Ch2 - dbw $02, Music_GoldSilverOpening2_Ch3 - dbw $03, Music_GoldSilverOpening2_Ch4 -; f7314 +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 -Music_GoldSilverOpening2_Ch1: ; f7314 - ftempo 92 +Music_GoldSilverOpening2_Ch1: + tempo 92 volume $77 dutycycle $3 tone $0002 @@ -14,7 +13,7 @@ Music_GoldSilverOpening2_Ch1: ; f7314 notetype $c, $3d octave 3 note D#, 8 -Music_GoldSilverOpening2_branch_f7325: ; f7325 +Music_GoldSilverOpening2_branch_f7325: notetype $c, $c1 octave 3 note D_, 2 @@ -52,9 +51,8 @@ Music_GoldSilverOpening2_branch_f7325: ; f7325 octave 4 note D_, 16 endchannel -; f7358 -Music_GoldSilverOpening2_Ch2: ; f7358 +Music_GoldSilverOpening2_Ch2: dutycycle $3 vibrato $14, $14 stereopanning $f0 @@ -105,9 +103,8 @@ Music_GoldSilverOpening2_Ch2: ; f7358 intensity $c2 note D_, 16 endchannel -; f739c -Music_GoldSilverOpening2_Ch3: ; f739c +Music_GoldSilverOpening2_Ch3: notetype $c, $17 note __, 8 octave 2 @@ -184,9 +181,8 @@ Music_GoldSilverOpening2_Ch3: ; f739c note D_, 2 note __, 14 endchannel -; f73ea -Music_GoldSilverOpening2_Ch4: ; f73ea +Music_GoldSilverOpening2_Ch4: togglenoise $0 notetype $6 note D#, 2 @@ -198,7 +194,7 @@ Music_GoldSilverOpening2_Ch4: ; f73ea note D_, 2 note D_, 2 notetype $c -Music_GoldSilverOpening2_branch_f73f8: ; f73f8 +Music_GoldSilverOpening2_branch_f73f8: note D_, 2 note D_, 2 note D_, 2 @@ -219,6 +215,3 @@ Music_GoldSilverOpening2_branch_f73f8: ; f73f8 loopchannel 4, Music_GoldSilverOpening2_branch_f73f8 note C_, 16 endchannel -; f7411 - - diff --git a/crysaudio/music/gym.asm b/crysaudio/music/gym.asm index 089ef90d..acb944ad 100644 --- a/crysaudio/music/gym.asm +++ b/crysaudio/music/gym.asm @@ -1,18 +1,17 @@ -Music_Gym: ; f48ae - dbw $c0, Music_Gym_Ch1 - dbw $01, Music_Gym_Ch2 - dbw $02, Music_Gym_Ch3 - dbw $03, Music_Gym_Ch4 -; f48ba +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 -Music_Gym_Ch1: ; f48ba +Music_Gym_Ch1: tempo 156 volume $77 stereopanning $f vibrato $12, $24 dutycycle $1 notetype $c, $b7 -Music_Gym_branch_f48c9: ; f48c9 +Music_Gym_branch_f48c9: octave 4 note F#, 2 octave 2 @@ -189,12 +188,11 @@ Music_Gym_branch_f48c9: ; f48c9 note F#, 1 note E_, 1 loopchannel 0, Music_Gym_branch_f48c9 -; f497c -Music_Gym_Ch2: ; f497c +Music_Gym_Ch2: dutycycle $1 stereopanning $f0 -Music_Gym_branch_f4980: ; f4980 +Music_Gym_branch_f4980: notetype $c, $c3 octave 2 note D_, 2 @@ -286,9 +284,8 @@ Music_Gym_branch_f4980: ; f4980 note F#, 2 note D_, 2 loopchannel 0, Music_Gym_branch_f4980 -; f49e9 -Music_Gym_branch_f49e9: ; f49e9 +Music_Gym_branch_f49e9: octave 3 note D_, 3 octave 2 @@ -333,9 +330,8 @@ Music_Gym_branch_f49e9: ; f49e9 note C_, 1 note C_, 2 endchannel -; f4a15 -Music_Gym_branch_f4a15: ; f4a15 +Music_Gym_branch_f4a15: octave 2 note D_, 4 note D_, 2 @@ -370,12 +366,11 @@ Music_Gym_branch_f4a15: ; f4a15 note F#, 1 note F#, 1 endchannel -; f4a37 -Music_Gym_Ch3: ; f4a37 +Music_Gym_Ch3: vibrato $14, $23 stereopanning $ff -Music_Gym_branch_f4a3c: ; f4a3c +Music_Gym_branch_f4a3c: notetype $c, $14 octave 6 note D_, 2 @@ -485,9 +480,8 @@ Music_Gym_branch_f4a3c: ; f4a3c note F#, 8 note E_, 4 loopchannel 0, Music_Gym_branch_f4a3c -; f4ab3 -Music_Gym_branch_f4ab3: ; f4ab3 +Music_Gym_branch_f4ab3: octave 5 note A_, 6 octave 6 @@ -506,11 +500,10 @@ Music_Gym_branch_f4ab3: ; f4ab3 note G_, 1 note A_, 4 endchannel -; f4ac5 -Music_Gym_Ch4: ; f4ac5 +Music_Gym_Ch4: togglenoise $4 -Music_Gym_branch_f4ac7: ; f4ac7 +Music_Gym_branch_f4ac7: notetype $c note D_, 2 note C#, 1 @@ -535,7 +528,7 @@ Music_Gym_branch_f4ac7: ; f4ac7 note D_, 1 note D_, 1 notetype $6 -Music_Gym_branch_f4ae1: ; f4ae1 +Music_Gym_branch_f4ae1: note D_, 6 note D_, 6 note D_, 4 @@ -558,7 +551,7 @@ Music_Gym_branch_f4ae1: ; f4ae1 note D_, 4 note B_, 8 loopchannel 4, Music_Gym_branch_f4ae1 -Music_Gym_branch_f4afa: ; f4afa +Music_Gym_branch_f4afa: note D#, 4 note F#, 4 note D_, 4 @@ -571,6 +564,3 @@ Music_Gym_branch_f4afa: ; f4afa note F#, 4 loopchannel 8, Music_Gym_branch_f4afa loopchannel 0, Music_Gym_branch_f4ac7 -; f4b0c - - diff --git a/crysaudio/music/gymleadervictory.asm b/crysaudio/music/gymleadervictory.asm index 59771300..d6a1a36e 100644 --- a/crysaudio/music/gymleadervictory.asm +++ b/crysaudio/music/gymleadervictory.asm @@ -1,12 +1,11 @@ -Music_GymLeaderVictory: ; f462c - dbw $c0, Music_GymLeaderVictory_Ch1 - dbw $01, Music_GymLeaderVictory_Ch2 - dbw $02, Music_GymLeaderVictory_Ch3 - dbw $03, Music_GymLeaderVictory_Ch4 -; f4638 +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 -Music_GymLeaderVictory_Ch1: ; f4638 - ftempo 116 +Music_GymLeaderVictory_Ch1: + tempo 116 volume $77 vibrato $12, $34 dutycycle $3 @@ -27,7 +26,7 @@ Music_GymLeaderVictory_Ch1: ; f4638 octave 5 note D_, 8 stereopanning $f -Music_GymLeaderVictory_branch_f4658: ; f4658 +Music_GymLeaderVictory_branch_f4658: dutycycle $1 callchannel Music_GymLeaderVictory_branch_f4689 octave 4 @@ -59,9 +58,8 @@ Music_GymLeaderVictory_branch_f4658: ; f4658 intensity $87 note F#, 16 loopchannel 0, Music_GymLeaderVictory_branch_f4658 -; f4689 -Music_GymLeaderVictory_branch_f4689: ; f4689 +Music_GymLeaderVictory_branch_f4689: intensity $91 octave 3 note F#, 2 @@ -84,9 +82,8 @@ Music_GymLeaderVictory_branch_f4689: ; f4689 note G_, 1 note D_, 1 endchannel -; f46a0 -Music_GymLeaderVictory_branch_f46a0: ; f46a0 +Music_GymLeaderVictory_branch_f46a0: intensity $87 octave 3 note F#, 14 @@ -115,9 +112,8 @@ Music_GymLeaderVictory_branch_f46a0: ; f46a0 note C#, 1 note E_, 8 endchannel -; f46bd -Music_GymLeaderVictory_Ch2: ; f46bd +Music_GymLeaderVictory_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $d7 @@ -132,7 +128,7 @@ Music_GymLeaderVictory_Ch2: ; f46bd octave 5 note D_, 1 note F#, 16 -Music_GymLeaderVictory_branch_f46d0: ; f46d0 +Music_GymLeaderVictory_branch_f46d0: dutycycle $3 intensity $a1 callchannel Music_GymLeaderVictory_branch_f4711 @@ -175,9 +171,8 @@ Music_GymLeaderVictory_branch_f46d0: ; f46d0 octave 5 note C#, 1 loopchannel 0, Music_GymLeaderVictory_branch_f46d0 -; f4711 -Music_GymLeaderVictory_branch_f4711: ; f4711 +Music_GymLeaderVictory_branch_f4711: octave 5 note D_, 2 note C#, 2 @@ -193,9 +188,8 @@ Music_GymLeaderVictory_branch_f4711: ; f4711 note G_, 2 note F#, 2 endchannel -; f4720 -Music_GymLeaderVictory_branch_f4720: ; f4720 +Music_GymLeaderVictory_branch_f4720: intensity $98 note A_, 6 note F#, 1 @@ -218,9 +212,8 @@ Music_GymLeaderVictory_branch_f4720: ; f4720 note C#, 8 note C#, 8 endchannel -; f4737 -Music_GymLeaderVictory_Ch3: ; f4737 +Music_GymLeaderVictory_Ch3: notetype $c, $25 octave 3 note F#, 16 @@ -231,7 +224,7 @@ Music_GymLeaderVictory_Ch3: ; f4737 octave 3 note C#, 2 stereopanning $f0 -Music_GymLeaderVictory_branch_f4744: ; f4744 +Music_GymLeaderVictory_branch_f4744: note D_, 2 note __, 4 octave 2 @@ -312,9 +305,8 @@ Music_GymLeaderVictory_branch_f4744: ; f4744 octave 3 note C#, 2 loopchannel 0, Music_GymLeaderVictory_branch_f4744 -; f479e -Music_GymLeaderVictory_branch_f479e: ; f479e +Music_GymLeaderVictory_branch_f479e: octave 3 note D_, 2 note __, 2 @@ -386,14 +378,13 @@ Music_GymLeaderVictory_branch_f479e: ; f479e octave 2 note A_, 2 endchannel -; f47e5 -Music_GymLeaderVictory_Ch4: ; f47e5 +Music_GymLeaderVictory_Ch4: togglenoise $4 notetype $c note B_, 16 note B_, 16 -Music_GymLeaderVictory_branch_f47eb: ; f47eb +Music_GymLeaderVictory_branch_f47eb: callchannel Music_GymLeaderVictory_branch_f480b note D#, 6 note D#, 2 @@ -406,7 +397,7 @@ Music_GymLeaderVictory_branch_f47eb: ; f47eb note C#, 1 note C#, 1 note C#, 1 -Music_GymLeaderVictory_branch_f47fb: ; f47fb +Music_GymLeaderVictory_branch_f47fb: note D#, 2 note G_, 2 note D_, 2 @@ -417,9 +408,8 @@ Music_GymLeaderVictory_branch_f47fb: ; f47fb note G_, 2 loopchannel 16, Music_GymLeaderVictory_branch_f47fb loopchannel 0, Music_GymLeaderVictory_branch_f47eb -; f480b -Music_GymLeaderVictory_branch_f480b: ; f480b +Music_GymLeaderVictory_branch_f480b: note D#, 6 note D#, 2 note D#, 4 @@ -427,6 +417,3 @@ Music_GymLeaderVictory_branch_f480b: ; f480b note D#, 2 loopchannel 3, Music_GymLeaderVictory_branch_f480b endchannel -; f4815 - - diff --git a/crysaudio/music/halloffame.asm b/crysaudio/music/halloffame.asm index 26b249a9..2f4c444d 100644 --- a/crysaudio/music/halloffame.asm +++ b/crysaudio/music/halloffame.asm @@ -1,11 +1,10 @@ -Music_HallOfFame: ; f05bf - dbw $c0, Music_HallOfFame_Ch1 - dbw $01, Music_HallOfFame_Ch2 - dbw $02, Music_HallOfFame_Ch3 - dbw $03, Music_HallOfFame_Ch4 -; f05cb +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 -Music_HallOfFame_Ch1: ; f05cb +Music_HallOfFame_Ch1: tempo 112 volume $77 dutycycle $2 @@ -22,7 +21,7 @@ Music_HallOfFame_Ch1: ; f05cb note E_, 1 note F_, 1 note F#, 1 -Music_HallOfFame_branch_f05e6: ; f05e6 +Music_HallOfFame_branch_f05e6: intensity $97 octave 4 note C_, 8 @@ -46,12 +45,11 @@ Music_HallOfFame_branch_f05e6: ; f05e6 note __, 16 note __, 16 loopchannel 0, Music_HallOfFame_branch_f05e6 -; f060b -Music_HallOfFame_Ch2: ; f060b +Music_HallOfFame_Ch2: vibrato $8, $25 dutycycle $3 -Music_HallOfFame_branch_f0610: ; f0610 +Music_HallOfFame_branch_f0610: notetype $c, $c4 octave 3 note G_, 2 @@ -77,12 +75,11 @@ Music_HallOfFame_branch_f0610: ; f0610 note A_, 4 note F_, 2 loopchannel 0, Music_HallOfFame_branch_f0610 -; f062e -Music_HallOfFame_Ch3: ; f062e -Music_HallOfFame_branch_f062e: ; f062e +Music_HallOfFame_Ch3: +Music_HallOfFame_branch_f062e: notetype $c, $28 -Music_HallOfFame_branch_f0631: ; f0631 +Music_HallOfFame_branch_f0631: octave 3 note D_, 2 note G_, 2 @@ -137,9 +134,8 @@ Music_HallOfFame_branch_f0631: ; f0631 note E_, 4 note G_, 4 loopchannel 0, Music_HallOfFame_branch_f062e -; f066d -Music_HallOfFame_Ch4: ; f066d +Music_HallOfFame_Ch4: togglenoise $5 notetype $c note __, 16 @@ -147,7 +143,7 @@ Music_HallOfFame_Ch4: ; f066d note __, 16 note __, 16 notetype $6 -Music_HallOfFame_branch_f0677: ; f0677 +Music_HallOfFame_branch_f0677: stereopanning $f note A#, 4 note A#, 8 @@ -174,6 +170,3 @@ Music_HallOfFame_branch_f0677: ; f0677 note A#, 1 note A#, 1 loopchannel 0, Music_HallOfFame_branch_f0677 -; f0697 - - diff --git a/crysaudio/music/healpokemon.asm b/crysaudio/music/healpokemon.asm index 88aaad8f..6de58bc5 100644 --- a/crysaudio/music/healpokemon.asm +++ b/crysaudio/music/healpokemon.asm @@ -1,32 +1,30 @@ -Music_HealPokemon: ; f0697 - dbw $80, Music_HealPokemon_Ch1 - dbw $01, Music_HealPokemon_Ch2 - dbw $02, Music_HealPokemon_Ch3 -; f06a0 +Music_HealPokemon: + musicheader 3, 1, Music_HealPokemon_Ch1 + musicheader 1, 2, Music_HealPokemon_Ch2 + musicheader 1, 3, Music_HealPokemon_Ch3 -Music_HealPokemon_Ch1: ; f06a0 - ftempo 144 +Music_HealPokemon_Ch1: + tempo 144 volume $77 - fdutycycle $2 + dutycycle $2 tone $0001 notetype $c, $81 note __, 2 - unknownmusic0xe0 $0, $40 + slidepitchto 1, 4, __ note B_, 2 - unknownmusic0xe0 $0, $55 + slidepitchto 1, 5, E_ note B_, 2 - unknownmusic0xe0 $0, $45 + slidepitchto 1, 4, E_ note E_, 2 note __, 4 - unknownmusic0xe0 $0, $30 + slidepitchto 1, 3, __ note E_, 4 - unknownmusic0xe0 $0, $40 + slidepitchto 1, 4, __ note B_, 4 endchannel -; f06c4 -Music_HealPokemon_Ch2: ; f06c4 - fdutycycle $2 +Music_HealPokemon_Ch2: + dutycycle $2 notetype $c, $c3 octave 4 note B_, 4 @@ -37,9 +35,8 @@ Music_HealPokemon_Ch2: ; f06c4 octave 5 note E_, 8 endchannel -; f06d4 -Music_HealPokemon_Ch3: ; f06d4 +Music_HealPokemon_Ch3: notetype $c, $10 octave 4 note E_, 2 @@ -51,6 +48,3 @@ Music_HealPokemon_Ch3: ; f06d4 note E_, 6 note __, 2 endchannel -; f06e1 - - diff --git a/crysaudio/music/indigoplateau.asm b/crysaudio/music/indigoplateau.asm index b76539a9..b56f1b38 100644 --- a/crysaudio/music/indigoplateau.asm +++ b/crysaudio/music/indigoplateau.asm @@ -1,17 +1,16 @@ -Music_IndigoPlateau: ; ee852 - dbw $c0, Music_IndigoPlateau_Ch1 - dbw $01, Music_IndigoPlateau_Ch2 - dbw $02, Music_IndigoPlateau_Ch3 - dbw $03, Music_IndigoPlateau_Ch4 -; ee85e +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 -Music_IndigoPlateau_Ch1: ; ee85e +Music_IndigoPlateau_Ch1: tempo 128 volume $77 dutycycle $3 tone $0002 stereopanning $f -Music_IndigoPlateau_branch_ee86a: ; ee86a +Music_IndigoPlateau_branch_ee86a: callchannel Music_IndigoPlateau_branch_ee881 octave 3 note D_, 4 @@ -24,9 +23,8 @@ Music_IndigoPlateau_branch_ee86a: ; ee86a callchannel Music_IndigoPlateau_branch_ee881 note A#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee86a -; ee881 -Music_IndigoPlateau_branch_ee881: ; ee881 +Music_IndigoPlateau_branch_ee881: notetype $c, $b6 octave 2 note A_, 4 @@ -40,13 +38,12 @@ Music_IndigoPlateau_branch_ee881: ; ee881 note A_, 2 intensity $a0 endchannel -; ee892 -Music_IndigoPlateau_Ch2: ; ee892 +Music_IndigoPlateau_Ch2: dutycycle $3 vibrato $10, $22 stereopanning $f0 -Music_IndigoPlateau_branch_ee899: ; ee899 +Music_IndigoPlateau_branch_ee899: callchannel Music_IndigoPlateau_branch_ee8e9 note A_, 4 callchannel Music_IndigoPlateau_branch_ee8e9 @@ -100,9 +97,8 @@ Music_IndigoPlateau_branch_ee899: ; ee899 callchannel Music_IndigoPlateau_branch_ee8e9 note C#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee899 -; ee8e9 -Music_IndigoPlateau_branch_ee8e9: ; ee8e9 +Music_IndigoPlateau_branch_ee8e9: notetype $c, $c6 octave 3 note D_, 4 @@ -116,11 +112,10 @@ Music_IndigoPlateau_branch_ee8e9: ; ee8e9 note D_, 2 intensity $b0 endchannel -; ee8fa -Music_IndigoPlateau_Ch3: ; ee8fa +Music_IndigoPlateau_Ch3: notetype $c, $19 -Music_IndigoPlateau_branch_ee8fd: ; ee8fd +Music_IndigoPlateau_branch_ee8fd: callchannel Music_IndigoPlateau_branch_ee915 octave 3 note A_, 4 @@ -134,9 +129,8 @@ Music_IndigoPlateau_branch_ee8fd: ; ee8fd octave 3 note F#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee8fd -; ee915 -Music_IndigoPlateau_branch_ee915: ; ee915 +Music_IndigoPlateau_branch_ee915: octave 3 note D_, 1 note __, 3 @@ -152,13 +146,12 @@ Music_IndigoPlateau_branch_ee915: ; ee915 note A_, 1 note __, 3 endchannel -; ee924 -Music_IndigoPlateau_Ch4: ; ee924 +Music_IndigoPlateau_Ch4: stereopanning $f0 togglenoise $0 notetype $c -Music_IndigoPlateau_branch_ee92a: ; ee92a +Music_IndigoPlateau_branch_ee92a: note D#, 4 note D_, 2 note D#, 2 @@ -187,6 +180,3 @@ Music_IndigoPlateau_branch_ee92a: ; ee92a note D_, 2 note C#, 4 loopchannel 0, Music_IndigoPlateau_branch_ee92a -; ee94b - - diff --git a/crysaudio/music/johtogymbattle.asm b/crysaudio/music/johtogymbattle.asm index 0ef75426..2b6e82f0 100644 --- a/crysaudio/music/johtogymbattle.asm +++ b/crysaudio/music/johtogymbattle.asm @@ -1,24 +1,23 @@ -Music_JohtoGymBattle: ; ea50d - dbw $80, Music_JohtoGymBattle_Ch1 - dbw $01, Music_JohtoGymBattle_Ch2 - dbw $02, Music_JohtoGymBattle_Ch3 -; ea516 +Music_JohtoGymBattle: + musicheader 3, 1, Music_JohtoGymBattle_Ch1 + musicheader 1, 2, Music_JohtoGymBattle_Ch2 + musicheader 1, 3, Music_JohtoGymBattle_Ch3 -Music_JohtoGymBattle_Ch1: ; ea516 - ftempo 101 +Music_JohtoGymBattle_Ch1: + tempo 101 volume $77 dutycycle $3 tone $0002 vibrato $12, $15 notetype $c, $b2 -Music_JohtoGymBattle_branch_ea526: ; ea526 +Music_JohtoGymBattle_branch_ea526: octave 3 note A#, 1 note A_, 1 note G#, 1 note A_, 1 loopchannel 4, Music_JohtoGymBattle_branch_ea526 -Music_JohtoGymBattle_branch_ea52f: ; ea52f +Music_JohtoGymBattle_branch_ea52f: note C#, 1 note C_, 1 octave 2 @@ -58,7 +57,7 @@ Music_JohtoGymBattle_branch_ea52f: ; ea52f octave 3 note G#, 2 note F_, 2 -Music_JohtoGymBattle_branch_ea55d: ; ea55d +Music_JohtoGymBattle_branch_ea55d: intensity $b5 note D_, 6 note G_, 6 @@ -286,21 +285,20 @@ Music_JohtoGymBattle_branch_ea55d: ; ea55d note D#, 2 note F#, 2 loopchannel 0, Music_JohtoGymBattle_branch_ea55d -; ea65f -Music_JohtoGymBattle_Ch2: ; ea65f +Music_JohtoGymBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 notetype $c, $c2 -Music_JohtoGymBattle_branch_ea66a: ; ea66a +Music_JohtoGymBattle_branch_ea66a: octave 4 note F#, 1 note F_, 1 note E_, 1 note A#, 1 loopchannel 4, Music_JohtoGymBattle_branch_ea66a -Music_JohtoGymBattle_branch_ea673: ; ea673 +Music_JohtoGymBattle_branch_ea673: note F#, 1 note F_, 1 note F#, 1 @@ -397,7 +395,7 @@ Music_JohtoGymBattle_branch_ea673: ; ea673 octave 3 note G#, 1 note A_, 1 -Music_JohtoGymBattle_branch_ea6ee: ; ea6ee +Music_JohtoGymBattle_branch_ea6ee: intensity $c7 note A#, 8 intensity $c4 @@ -613,9 +611,8 @@ Music_JohtoGymBattle_branch_ea6ee: ; ea6ee note B_, 16 note G_, 16 loopchannel 0, Music_JohtoGymBattle_branch_ea6ee -; ea7f4 -Music_JohtoGymBattle_Ch3: ; ea7f4 +Music_JohtoGymBattle_Ch3: notetype $c, $19 octave 4 note F_, 1 @@ -685,7 +682,7 @@ Music_JohtoGymBattle_Ch3: ; ea7f4 octave 3 note A#, 2 note G#, 2 -Music_JohtoGymBattle_branch_ea83f: ; ea83f +Music_JohtoGymBattle_branch_ea83f: callchannel Music_JohtoGymBattle_branch_ea963 callchannel Music_JohtoGymBattle_branch_ea963 callchannel Music_JohtoGymBattle_branch_ea96a @@ -900,9 +897,8 @@ Music_JohtoGymBattle_branch_ea83f: ; ea83f note F_, 2 note D#, 2 loopchannel 0, Music_JohtoGymBattle_branch_ea83f -; ea952 -Music_JohtoGymBattle_branch_ea952: ; ea952 +Music_JohtoGymBattle_branch_ea952: note G_, 2 note D_, 2 note F_, 2 @@ -920,30 +916,26 @@ Music_JohtoGymBattle_branch_ea952: ; ea952 note D#, 2 note F_, 2 endchannel -; ea963 -Music_JohtoGymBattle_branch_ea963: ; ea963 +Music_JohtoGymBattle_branch_ea963: note D_, 2 note G_, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea963 endchannel -; ea96a -Music_JohtoGymBattle_branch_ea96a: ; ea96a +Music_JohtoGymBattle_branch_ea96a: note C#, 2 note G#, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea96a endchannel -; ea971 -Music_JohtoGymBattle_branch_ea971: ; ea971 +Music_JohtoGymBattle_branch_ea971: note C_, 2 note G_, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea971 endchannel -; ea978 -Music_JohtoGymBattle_branch_ea978: ; ea978 +Music_JohtoGymBattle_branch_ea978: octave 2 note A#, 2 octave 3 @@ -955,9 +947,8 @@ Music_JohtoGymBattle_branch_ea978: ; ea978 octave 2 note A#, 2 endchannel -; ea983 -Music_JohtoGymBattle_branch_ea983: ; ea983 +Music_JohtoGymBattle_branch_ea983: octave 3 note C_, 2 note G_, 2 @@ -971,9 +962,8 @@ Music_JohtoGymBattle_branch_ea983: ; ea983 octave 3 note C_, 2 endchannel -; ea990 -Music_JohtoGymBattle_branch_ea990: ; ea990 +Music_JohtoGymBattle_branch_ea990: note C#, 2 note G#, 2 octave 4 @@ -986,9 +976,8 @@ Music_JohtoGymBattle_branch_ea990: ; ea990 octave 3 note C#, 2 endchannel -; ea99c -Music_JohtoGymBattle_branch_ea99c: ; ea99c +Music_JohtoGymBattle_branch_ea99c: octave 3 note D_, 2 note A_, 2 @@ -1002,24 +991,21 @@ Music_JohtoGymBattle_branch_ea99c: ; ea99c octave 3 note D_, 2 endchannel -; ea9a9 -Music_JohtoGymBattle_branch_ea9a9: ; ea9a9 +Music_JohtoGymBattle_branch_ea9a9: octave 3 note D#, 2 note G#, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea9a9 endchannel -; ea9b1 -Music_JohtoGymBattle_branch_ea9b1: ; ea9b1 +Music_JohtoGymBattle_branch_ea9b1: note C#, 2 note F#, 2 loopchannel 4, Music_JohtoGymBattle_branch_ea9b1 endchannel -; ea9b8 -Music_JohtoGymBattle_branch_ea9b8: ; ea9b8 +Music_JohtoGymBattle_branch_ea9b8: note F_, 2 note C_, 2 note D#, 2 @@ -1029,6 +1015,3 @@ Music_JohtoGymBattle_branch_ea9b8: ; ea9b8 note F_, 2 note D#, 2 endchannel -; ea9c1 - - diff --git a/crysaudio/music/johtotrainerbattle.asm b/crysaudio/music/johtotrainerbattle.asm index 41ea2d06..c235410a 100644 --- a/crysaudio/music/johtotrainerbattle.asm +++ b/crysaudio/music/johtotrainerbattle.asm @@ -1,11 +1,10 @@ -Music_JohtoTrainerBattle: ; f6096 - dbw $80, Music_JohtoTrainerBattle_Ch1 - dbw $01, Music_JohtoTrainerBattle_Ch2 - dbw $02, Music_JohtoTrainerBattle_Ch3 -; f609f +Music_JohtoTrainerBattle: + musicheader 3, 1, Music_JohtoTrainerBattle_Ch1 + musicheader 1, 2, Music_JohtoTrainerBattle_Ch2 + musicheader 1, 3, Music_JohtoTrainerBattle_Ch3 -Music_JohtoTrainerBattle_Ch1: ; f609f - ftempo 102 +Music_JohtoTrainerBattle_Ch1: + tempo 102 volume $77 dutycycle $3 tone $0002 @@ -86,7 +85,7 @@ Music_JohtoTrainerBattle_Ch1: ; f609f note F_, 6 intensity $b7 note G_, 4 -Music_JohtoTrainerBattle_branch_f6102: ; f6102 +Music_JohtoTrainerBattle_branch_f6102: intensity $b4 callchannel Music_JohtoTrainerBattle_branch_f629f intensity $b7 @@ -243,7 +242,7 @@ Music_JohtoTrainerBattle_branch_f6102: ; f6102 intensity $a7 note D#, 12 note __, 16 -Music_JohtoTrainerBattle_branch_f61bd: ; f61bd +Music_JohtoTrainerBattle_branch_f61bd: intensity $b7 note F_, 8 intensity $b4 @@ -428,9 +427,8 @@ Music_JohtoTrainerBattle_branch_f61bd: ; f61bd intensity $a7 note F_, 6 loopchannel 0, Music_JohtoTrainerBattle_branch_f6102 -; f629f -Music_JohtoTrainerBattle_branch_f629f: ; f629f +Music_JohtoTrainerBattle_branch_f629f: octave 3 note E_, 2 note D_, 2 @@ -451,9 +449,8 @@ Music_JohtoTrainerBattle_branch_f629f: ; f629f note F_, 2 note D_, 2 endchannel -; f62b3 -Music_JohtoTrainerBattle_Ch2: ; f62b3 +Music_JohtoTrainerBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -547,7 +544,7 @@ Music_JohtoTrainerBattle_Ch2: ; f62b3 note E_, 2 intensity $c7 note B_, 4 -Music_JohtoTrainerBattle_branch_f632a: ; f632a +Music_JohtoTrainerBattle_branch_f632a: callchannel Music_JohtoTrainerBattle_branch_f64a3 intensity $3e note A#, 8 @@ -584,7 +581,7 @@ Music_JohtoTrainerBattle_branch_f632a: ; f632a note A_, 16 intensity $b7 note A_, 16 -Music_JohtoTrainerBattle_branch_f635a: ; f635a +Music_JohtoTrainerBattle_branch_f635a: intensity $c3 octave 3 note A_, 2 @@ -607,7 +604,7 @@ Music_JohtoTrainerBattle_branch_f635a: ; f635a note G_, 2 note A_, 2 note A#, 2 -Music_JohtoTrainerBattle_branch_f6376: ; f6376 +Music_JohtoTrainerBattle_branch_f6376: note G_, 2 note F_, 2 note G_, 2 @@ -685,7 +682,7 @@ Music_JohtoTrainerBattle_branch_f6376: ; f6376 callchannel Music_JohtoTrainerBattle_branch_f64b6 intensity $a2 callchannel Music_JohtoTrainerBattle_branch_f64b6 -Music_JohtoTrainerBattle_branch_f63dd: ; f63dd +Music_JohtoTrainerBattle_branch_f63dd: octave 4 note D#, 2 octave 3 @@ -829,9 +826,8 @@ Music_JohtoTrainerBattle_branch_f63dd: ; f63dd note D_, 2 note F_, 2 loopchannel 0, Music_JohtoTrainerBattle_branch_f632a -; f649a -Music_JohtoTrainerBattle_branch_f649a: ; f649a +Music_JohtoTrainerBattle_branch_f649a: octave 3 note A_, 6 note A_, 4 @@ -840,9 +836,8 @@ Music_JohtoTrainerBattle_branch_f649a: ; f649a intensity $c7 note A#, 4 endchannel -; f64a3 -Music_JohtoTrainerBattle_branch_f64a3: ; f64a3 +Music_JohtoTrainerBattle_branch_f64a3: intensity $c7 octave 3 note A_, 6 @@ -859,9 +854,8 @@ Music_JohtoTrainerBattle_branch_f64a3: ; f64a3 intensity $b7 note F_, 8 endchannel -; f64b6 -Music_JohtoTrainerBattle_branch_f64b6: ; f64b6 +Music_JohtoTrainerBattle_branch_f64b6: octave 3 note A#, 2 note D#, 2 @@ -870,9 +864,8 @@ Music_JohtoTrainerBattle_branch_f64b6: ; f64b6 octave 3 note D#, 2 endchannel -; f64be -Music_JohtoTrainerBattle_branch_f64be: ; f64be +Music_JohtoTrainerBattle_branch_f64be: intensity $c7 octave 4 note F_, 4 @@ -891,9 +884,8 @@ Music_JohtoTrainerBattle_branch_f64be: ; f64be note D#, 1 note F_, 2 endchannel -; f64d2 -Music_JohtoTrainerBattle_branch_f64d2: ; f64d2 +Music_JohtoTrainerBattle_branch_f64d2: intensity $c7 octave 4 note D#, 6 @@ -905,9 +897,8 @@ Music_JohtoTrainerBattle_branch_f64d2: ; f64d2 note F_, 4 note D#, 4 endchannel -; f64de -Music_JohtoTrainerBattle_Ch3: ; f64de +Music_JohtoTrainerBattle_Ch3: notetype $c, $19 octave 4 note E_, 1 @@ -941,7 +932,7 @@ Music_JohtoTrainerBattle_Ch3: ; f64de note A#, 2 note A_, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6501: ; f6501 +Music_JohtoTrainerBattle_branch_f6501: note A_, 2 note E_, 2 note F#, 2 @@ -983,7 +974,7 @@ Music_JohtoTrainerBattle_branch_f6501: ; f6501 note A_, 2 note A#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f6531: ; f6531 +Music_JohtoTrainerBattle_branch_f6531: callchannel Music_JohtoTrainerBattle_branch_f6681 note E_, 2 callchannel Music_JohtoTrainerBattle_branch_f6692 @@ -1056,7 +1047,7 @@ Music_JohtoTrainerBattle_branch_f6531: ; f6531 note F_, 8 note E_, 8 note D#, 8 -Music_JohtoTrainerBattle_branch_f6591: ; f6591 +Music_JohtoTrainerBattle_branch_f6591: octave 3 note D#, 2 note A#, 2 @@ -1079,13 +1070,13 @@ Music_JohtoTrainerBattle_branch_f6591: ; f6591 note F_, 2 note D#, 2 note G_, 2 -Music_JohtoTrainerBattle_branch_f65ac: ; f65ac +Music_JohtoTrainerBattle_branch_f65ac: note C#, 2 note G#, 2 loopchannel 7, Music_JohtoTrainerBattle_branch_f65ac note B_, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65b4: ; f65b4 +Music_JohtoTrainerBattle_branch_f65b4: note D_, 2 note A_, 2 loopchannel 5, Music_JohtoTrainerBattle_branch_f65b4 @@ -1095,17 +1086,17 @@ Music_JohtoTrainerBattle_branch_f65b4: ; f65b4 note F#, 2 note G#, 2 note A_, 2 -Music_JohtoTrainerBattle_branch_f65c0: ; f65c0 +Music_JohtoTrainerBattle_branch_f65c0: note A#, 4 note D#, 4 loopchannel 4, Music_JohtoTrainerBattle_branch_f65c0 -Music_JohtoTrainerBattle_branch_f65c6: ; f65c6 +Music_JohtoTrainerBattle_branch_f65c6: octave 4 note G_, 4 octave 3 note A#, 4 loopchannel 4, Music_JohtoTrainerBattle_branch_f65c6 -Music_JohtoTrainerBattle_branch_f65ce: ; f65ce +Music_JohtoTrainerBattle_branch_f65ce: callchannel Music_JohtoTrainerBattle_branch_f66b4 note D#, 2 note F_, 8 @@ -1179,11 +1170,11 @@ Music_JohtoTrainerBattle_branch_f65ce: ; f65ce note C_, 2 octave 3 note A#, 2 -Music_JohtoTrainerBattle_branch_f661e: ; f661e +Music_JohtoTrainerBattle_branch_f661e: note D#, 2 note A#, 2 loopchannel 8, Music_JohtoTrainerBattle_branch_f661e -Music_JohtoTrainerBattle_branch_f6624: ; f6624 +Music_JohtoTrainerBattle_branch_f6624: note C#, 2 note G#, 2 loopchannel 6, Music_JohtoTrainerBattle_branch_f6624 @@ -1193,11 +1184,11 @@ Music_JohtoTrainerBattle_branch_f6624: ; f6624 octave 3 note A#, 2 note G#, 2 -Music_JohtoTrainerBattle_branch_f6630: ; f6630 +Music_JohtoTrainerBattle_branch_f6630: note D#, 2 note A#, 2 loopchannel 8, Music_JohtoTrainerBattle_branch_f6630 -Music_JohtoTrainerBattle_branch_f6636: ; f6636 +Music_JohtoTrainerBattle_branch_f6636: note C#, 2 note G#, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f6636 @@ -1256,9 +1247,8 @@ Music_JohtoTrainerBattle_branch_f6636: ; f6636 octave 4 note D_, 2 loopchannel 0, Music_JohtoTrainerBattle_branch_f6531 -; f6676 -Music_JohtoTrainerBattle_branch_f6676: ; f6676 +Music_JohtoTrainerBattle_branch_f6676: octave 4 note C_, 2 octave 3 @@ -1270,9 +1260,8 @@ Music_JohtoTrainerBattle_branch_f6676: ; f6676 note A#, 2 note G_, 2 endchannel -; f6681 -Music_JohtoTrainerBattle_branch_f6681: ; f6681 +Music_JohtoTrainerBattle_branch_f6681: octave 3 note E_, 2 note A_, 2 @@ -1290,9 +1279,8 @@ Music_JohtoTrainerBattle_branch_f6681: ; f6681 note F#, 2 note G_, 2 endchannel -; f6692 -Music_JohtoTrainerBattle_branch_f6692: ; f6692 +Music_JohtoTrainerBattle_branch_f6692: octave 3 note F_, 2 note A#, 2 @@ -1304,32 +1292,28 @@ Music_JohtoTrainerBattle_branch_f6692: ; f6692 octave 4 note D_, 2 endchannel -; f669d -Music_JohtoTrainerBattle_branch_f669d: ; f669d +Music_JohtoTrainerBattle_branch_f669d: octave 3 note E_, 2 note A_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f669d endchannel -; f66a5 -Music_JohtoTrainerBattle_branch_f66a5: ; f66a5 +Music_JohtoTrainerBattle_branch_f66a5: note D_, 2 note A_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f66a5 endchannel -; f66ac -Music_JohtoTrainerBattle_branch_f66ac: ; f66ac +Music_JohtoTrainerBattle_branch_f66ac: octave 3 note C_, 2 note G_, 2 loopchannel 4, Music_JohtoTrainerBattle_branch_f66ac endchannel -; f66b4 -Music_JohtoTrainerBattle_branch_f66b4: ; f66b4 +Music_JohtoTrainerBattle_branch_f66b4: note A#, 4 note D#, 2 note A#, 2 @@ -1345,6 +1329,3 @@ Music_JohtoTrainerBattle_branch_f66b4: ; f66b4 note G#, 1 note A#, 2 endchannel -; f66c3 - - diff --git a/crysaudio/music/johtowildbattle.asm b/crysaudio/music/johtowildbattle.asm index d5ff7d86..3c104e11 100644 --- a/crysaudio/music/johtowildbattle.asm +++ b/crysaudio/music/johtowildbattle.asm @@ -1,16 +1,15 @@ -Music_JohtoWildBattle: ; f5dc5 - dbw $80, Music_JohtoWildBattle_Ch1 - dbw $01, Music_JohtoWildBattle_Ch2 - dbw $02, Music_JohtoWildBattle_Ch3 -; f5dce +Music_JohtoWildBattle: + musicheader 3, 1, Music_JohtoWildBattle_Ch1 + musicheader 1, 2, Music_JohtoWildBattle_Ch2 + musicheader 1, 3, Music_JohtoWildBattle_Ch3 -Music_JohtoWildBattle_Ch1: ; f5dce - ftempo 104 +Music_JohtoWildBattle_Ch1: + tempo 104 volume $77 dutycycle $3 tone $0002 vibrato $12, $15 -Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb +Music_JohtoWildBattleNight_branch_f5ddb: notetype $c, $b2 octave 4 note C_, 1 @@ -87,7 +86,7 @@ Music_JohtoWildBattleNight_branch_f5ddb: ; f5ddb note D_, 4 intensity $6f note D#, 8 -Music_JohtoWildBattle_branch_f5e2d: ; f5e2d +Music_JohtoWildBattle_branch_f5e2d: intensity $b6 octave 3 note D_, 6 @@ -200,9 +199,8 @@ Music_JohtoWildBattle_branch_f5e2d: ; f5e2d note F#, 4 note G_, 16 loopchannel 0, Music_JohtoWildBattle_branch_f5e2d -; f5ea2 -Music_JohtoWildBattle_Ch2: ; f5ea2 +Music_JohtoWildBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -210,7 +208,7 @@ Music_JohtoWildBattle_Ch2: ; f5ea2 notetype $c, $c2 octave 4 note G_, 6 -Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2 +Music_JohtoWildBattleNight_branch_f5eb2: octave 3 note D_, 6 note G_, 4 @@ -239,7 +237,7 @@ Music_JohtoWildBattleNight_branch_f5eb2: ; f5eb2 note G_, 4 intensity $6f note G#, 8 -Music_JohtoWildBattle_branch_f5ed1: ; f5ed1 +Music_JohtoWildBattle_branch_f5ed1: intensity $c4 octave 3 note G_, 6 @@ -363,10 +361,9 @@ Music_JohtoWildBattle_branch_f5ed1: ; f5ed1 note A#, 4 note B_, 16 loopchannel 0, Music_JohtoWildBattle_branch_f5ed1 -; f5f5d -Music_JohtoWildBattleNight_branch_f5f5d: ; f5f5d -Music_JohtoWildBattle_branch_f5f5d: ; f5f5d +Music_JohtoWildBattleNight_branch_f5f5d: +Music_JohtoWildBattle_branch_f5f5d: notetype $c, $c2 octave 4 note F_, 1 @@ -417,11 +414,10 @@ Music_JohtoWildBattle_branch_f5f5d: ; f5f5d octave 5 note G_, 1 endchannel -; f5f91 -Music_JohtoWildBattle_Ch3: ; f5f91 +Music_JohtoWildBattle_Ch3: notetype $c, $14 -Music_JohtoWildBattleNight_branch_f5f94: ; f5f94 +Music_JohtoWildBattleNight_branch_f5f94: octave 4 note G_, 2 octave 5 @@ -470,7 +466,7 @@ Music_JohtoWildBattleNight_branch_f5f94: ; f5f94 note D#, 2 note G_, 2 note F_, 2 -Music_JohtoWildBattle_branch_f5fc6: ; f5fc6 +Music_JohtoWildBattle_branch_f5fc6: note D_, 2 note G_, 2 loopchannel 6, Music_JohtoWildBattle_branch_f5fc6 @@ -487,20 +483,20 @@ Music_JohtoWildBattle_branch_f5fc6: ; f5fc6 note G_, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f5fdb: ; f5fdb +Music_JohtoWildBattle_branch_f5fdb: note D_, 2 note G_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f5fdb note F#, 4 callchannel Music_JohtoWildBattle_branch_f6055 callchannel Music_JohtoWildBattle_branch_f6055 -Music_JohtoWildBattle_branch_f5fe8: ; f5fe8 +Music_JohtoWildBattle_branch_f5fe8: note D_, 2 note G_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f5fe8 note D_, 2 note A_, 2 -Music_JohtoWildBattle_branch_f5ff0: ; f5ff0 +Music_JohtoWildBattle_branch_f5ff0: note C_, 2 note F_, 2 loopchannel 5, Music_JohtoWildBattle_branch_f5ff0 @@ -518,7 +514,7 @@ Music_JohtoWildBattle_branch_f5ff0: ; f5ff0 note D#, 2 note G#, 2 note G_, 4 -Music_JohtoWildBattle_branch_f6006: ; f6006 +Music_JohtoWildBattle_branch_f6006: note E_, 2 note A_, 2 loopchannel 8, Music_JohtoWildBattle_branch_f6006 @@ -547,11 +543,11 @@ Music_JohtoWildBattle_branch_f6006: ; f6006 note F#, 2 note F_, 2 note D#, 2 -Music_JohtoWildBattle_branch_f6027: ; f6027 +Music_JohtoWildBattle_branch_f6027: note D_, 2 note G_, 2 loopchannel 8, Music_JohtoWildBattle_branch_f6027 -Music_JohtoWildBattle_branch_f602d: ; f602d +Music_JohtoWildBattle_branch_f602d: note C_, 2 note F_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f602d @@ -561,17 +557,17 @@ Music_JohtoWildBattle_branch_f602d: ; f602d note G_, 4 note D_, 4 note G_, 4 -Music_JohtoWildBattle_branch_f6039: ; f6039 +Music_JohtoWildBattle_branch_f6039: note D_, 2 note G_, 2 loopchannel 12, Music_JohtoWildBattle_branch_f6039 -Music_JohtoWildBattle_branch_f603f: ; f603f +Music_JohtoWildBattle_branch_f603f: note C_, 2 note E_, 2 loopchannel 7, Music_JohtoWildBattle_branch_f603f note F_, 2 note F#, 2 -Music_JohtoWildBattle_branch_f6047: ; f6047 +Music_JohtoWildBattle_branch_f6047: note D_, 2 note G_, 2 loopchannel 6, Music_JohtoWildBattle_branch_f6047 @@ -580,13 +576,9 @@ Music_JohtoWildBattle_branch_f6047: ; f6047 note F#, 2 note E_, 2 loopchannel 0, Music_JohtoWildBattle_branch_f5fdb -; f6055 -Music_JohtoWildBattle_branch_f6055: ; f6055 +Music_JohtoWildBattle_branch_f6055: note D#, 2 note G#, 2 loopchannel 4, Music_JohtoWildBattle_branch_f6055 endchannel -; f605c - - diff --git a/crysaudio/music/johtowildbattlenight.asm b/crysaudio/music/johtowildbattlenight.asm index 0c5bee45..b4b1651b 100644 --- a/crysaudio/music/johtowildbattlenight.asm +++ b/crysaudio/music/johtowildbattlenight.asm @@ -1,19 +1,17 @@ -Music_JohtoWildBattleNight: ; f605c - dbw $80, Music_JohtoWildBattleNight_Ch1 - dbw $01, Music_JohtoWildBattleNight_Ch2 - dbw $02, Music_JohtoWildBattleNight_Ch3 -; f6065 +Music_JohtoWildBattleNight: + musicheader 3, 1, Music_JohtoWildBattleNight_Ch1 + musicheader 1, 2, Music_JohtoWildBattleNight_Ch2 + musicheader 1, 3, Music_JohtoWildBattleNight_Ch3 -Music_JohtoWildBattleNight_Ch1: ; f6065 - ftempo 107 +Music_JohtoWildBattleNight_Ch1: + tempo 107 volume $77 dutycycle $3 tone $0002 vibrato $10, $25 loopchannel 0, Music_JohtoWildBattleNight_branch_f5ddb -; f6076 -Music_JohtoWildBattleNight_Ch2: ; f6076 +Music_JohtoWildBattleNight_Ch2: dutycycle $3 vibrato $20, $36 tone $0001 @@ -24,11 +22,7 @@ Music_JohtoWildBattleNight_Ch2: ; f6076 tone $0001 dutycycle $2 loopchannel 0, Music_JohtoWildBattleNight_branch_f5eb2 -; f608f -Music_JohtoWildBattleNight_Ch3: ; f608f +Music_JohtoWildBattleNight_Ch3: notetype $c, $11 loopchannel 0, Music_JohtoWildBattleNight_branch_f5f94 -; f6096 - - diff --git a/crysaudio/music/kantogymbattle.asm b/crysaudio/music/kantogymbattle.asm index 3c43a464..7ba65a42 100644 --- a/crysaudio/music/kantogymbattle.asm +++ b/crysaudio/music/kantogymbattle.asm @@ -1,11 +1,10 @@ -Music_KantoGymBattle: ; ec720 - dbw $80, Music_KantoGymBattle_Ch1 - dbw $01, Music_KantoGymBattle_Ch2 - dbw $02, Music_KantoGymBattle_Ch3 -; ec729 +Music_KantoGymBattle: + musicheader 3, 1, Music_KantoGymBattle_Ch1 + musicheader 1, 2, Music_KantoGymBattle_Ch2 + musicheader 1, 3, Music_KantoGymBattle_Ch3 -Music_KantoGymBattle_Ch1: ; ec729 - ftempo 101 +Music_KantoGymBattle_Ch1: + tempo 101 volume $77 dutycycle $3 tone $0002 @@ -86,7 +85,7 @@ Music_KantoGymBattle_Ch1: ; ec729 note E_, 4 note E_, 4 note E_, 2 -Music_KantoGymBattle_branch_ec78b: ; ec78b +Music_KantoGymBattle_branch_ec78b: callchannel Music_KantoGymBattle_branch_ec832 octave 2 note A#, 2 @@ -229,9 +228,8 @@ Music_KantoGymBattle_branch_ec78b: ; ec78b octave 3 note D_, 4 loopchannel 0, Music_KantoGymBattle_branch_ec78b -; ec832 -Music_KantoGymBattle_branch_ec832: ; ec832 +Music_KantoGymBattle_branch_ec832: intensity $b5 note D#, 2 octave 2 @@ -252,14 +250,13 @@ Music_KantoGymBattle_branch_ec832: ; ec832 note D#, 2 note C#, 2 endchannel -; ec847 -Music_KantoGymBattle_Ch2: ; ec847 +Music_KantoGymBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 notetype $c, $c2 -Music_KantoGymBattle_branch_ec852: ; ec852 +Music_KantoGymBattle_branch_ec852: octave 4 note A#, 1 note G#, 1 @@ -268,7 +265,7 @@ Music_KantoGymBattle_branch_ec852: ; ec852 note D#, 1 loopchannel 8, Music_KantoGymBattle_branch_ec852 octave 3 -Music_KantoGymBattle_branch_ec85d: ; ec85d +Music_KantoGymBattle_branch_ec85d: intensity $c2 note D#, 2 note D#, 2 @@ -316,7 +313,7 @@ Music_KantoGymBattle_branch_ec85d: ; ec85d intensity $c2 octave 4 loopchannel 2, Music_KantoGymBattle_branch_ec85d -Music_KantoGymBattle_branch_ec894: ; ec894 +Music_KantoGymBattle_branch_ec894: callchannel Music_KantoGymBattle_branch_ec907 note E_, 8 note G#, 8 @@ -405,9 +402,8 @@ Music_KantoGymBattle_branch_ec894: ; ec894 octave 3 note A_, 4 loopchannel 0, Music_KantoGymBattle_branch_ec894 -; ec907 -Music_KantoGymBattle_branch_ec907: ; ec907 +Music_KantoGymBattle_branch_ec907: dutycycle $2 intensity $d1 octave 3 @@ -437,21 +433,20 @@ Music_KantoGymBattle_branch_ec907: ; ec907 dutycycle $3 intensity $b0 endchannel -; ec92e -Music_KantoGymBattle_Ch3: ; ec92e +Music_KantoGymBattle_Ch3: notetype $c, $19 octave 2 note E_, 1 note __, 1 -Music_KantoGymBattle_branch_ec934: ; ec934 +Music_KantoGymBattle_branch_ec934: note B_, 3 note __, 1 loopchannel 6, Music_KantoGymBattle_branch_ec934 note B_, 2 note G#, 2 note B_, 2 -Music_KantoGymBattle_branch_ec93d: ; ec93d +Music_KantoGymBattle_branch_ec93d: note D#, 1 note __, 1 note D#, 1 @@ -489,12 +484,12 @@ Music_KantoGymBattle_branch_ec93d: ; ec93d note __, 1 note E_, 2 loopchannel 2, Music_KantoGymBattle_branch_ec93d -Music_KantoGymBattle_branch_ec965: ; ec965 +Music_KantoGymBattle_branch_ec965: octave 2 note D#, 2 note A#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec965 -Music_KantoGymBattle_branch_ec96c: ; ec96c +Music_KantoGymBattle_branch_ec96c: note E_, 2 note B_, 2 loopchannel 4, Music_KantoGymBattle_branch_ec96c @@ -511,13 +506,13 @@ Music_KantoGymBattle_branch_ec96c: ; ec96c note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec97f: ; ec97f +Music_KantoGymBattle_branch_ec97f: octave 2 note F#, 2 octave 3 note C#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec97f -Music_KantoGymBattle_branch_ec987: ; ec987 +Music_KantoGymBattle_branch_ec987: octave 2 note E_, 2 note B_, 2 @@ -526,7 +521,7 @@ Music_KantoGymBattle_branch_ec987: ; ec987 note E_, 2 octave 2 note B_, 2 -Music_KantoGymBattle_branch_ec992: ; ec992 +Music_KantoGymBattle_branch_ec992: note D#, 1 note __, 1 note D#, 1 @@ -546,7 +541,7 @@ Music_KantoGymBattle_branch_ec992: ; ec992 note __, 1 note E_, 2 loopchannel 2, Music_KantoGymBattle_branch_ec992 -Music_KantoGymBattle_branch_ec9a8: ; ec9a8 +Music_KantoGymBattle_branch_ec9a8: note D#, 2 note A#, 2 loopchannel 7, Music_KantoGymBattle_branch_ec9a8 @@ -563,12 +558,12 @@ Music_KantoGymBattle_branch_ec9a8: ; ec9a8 note B_, 2 octave 3 note E_, 2 -Music_KantoGymBattle_branch_ec9bb: ; ec9bb +Music_KantoGymBattle_branch_ec9bb: octave 2 note E_, 2 note B_, 2 loopchannel 5, Music_KantoGymBattle_branch_ec9bb -Music_KantoGymBattle_branch_ec9c2: ; ec9c2 +Music_KantoGymBattle_branch_ec9c2: octave 2 note F#, 2 octave 3 @@ -588,16 +583,16 @@ Music_KantoGymBattle_branch_ec9c2: ; ec9c2 note F#, 2 note E_, 2 note C#, 2 -Music_KantoGymBattle_branch_ec9d8: ; ec9d8 +Music_KantoGymBattle_branch_ec9d8: octave 2 note D#, 2 note A#, 2 loopchannel 4, Music_KantoGymBattle_branch_ec9d8 -Music_KantoGymBattle_branch_ec9df: ; ec9df +Music_KantoGymBattle_branch_ec9df: note C#, 2 note G#, 2 loopchannel 8, Music_KantoGymBattle_branch_ec9df -Music_KantoGymBattle_branch_ec9e5: ; ec9e5 +Music_KantoGymBattle_branch_ec9e5: note D#, 2 note A#, 2 loopchannel 4, Music_KantoGymBattle_branch_ec9e5 @@ -613,6 +608,3 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5 note D#, 2 note F_, 2 loopchannel 0, Music_KantoGymBattle_branch_ec965 -; ec9fa - - diff --git a/crysaudio/music/kantotrainerbattle.asm b/crysaudio/music/kantotrainerbattle.asm index eb83243d..511763c9 100644 --- a/crysaudio/music/kantotrainerbattle.asm +++ b/crysaudio/music/kantotrainerbattle.asm @@ -1,16 +1,14 @@ -Music_KantoTrainerBattle: ; ec9fa - dbw $80, Music_KantoTrainerBattle_Ch1 - dbw $01, Music_KantoTrainerBattle_Ch2 - dbw $02, Music_KantoTrainerBattle_Ch3 -; eca03 +Music_KantoTrainerBattle: + musicheader 3, 1, Music_KantoTrainerBattle_Ch1 + musicheader 1, 2, Music_KantoTrainerBattle_Ch2 + musicheader 1, 3, Music_KantoTrainerBattle_Ch3 + db $3 - - -Music_KantoTrainerBattle_Ch1: ; eca04 - ftempo 114 +Music_KantoTrainerBattle_Ch1: + tempo 114 volume $77 - forceoctave $1b + pitchoffset 1, B_ notetype $c, $b3 vibrato $12, $24 dutycycle $1 @@ -128,7 +126,7 @@ Music_KantoTrainerBattle_Ch1: ; eca04 note D#, 2 note F_, 2 note F#, 2 -Music_KantoTrainerBattle_branch_eca88: ; eca88 +Music_KantoTrainerBattle_branch_eca88: notetype $c, $b7 note D#, 4 note __, 2 @@ -427,261 +425,47 @@ Music_KantoTrainerBattle_branch_eca88: ; eca88 note D#, 8 octave 4 note C#, 16 - notetype $c, $b7 - ;ch1 insert - - note C#, 1 - note __, 1 - note D#, 1 - note __, 1 - note F_, 1 - note __, 1 - octave 3 - note G#, 1 - note __, 1 - octave 4 - note F_, 2 - note F#, 2 - note F_, 2 - note F#, 2 - note F_, 2 - note F#, 2 + note C#, 2 + note __, 2 + note D#, 2 + note __, 2 note F_, 2 + note __, 2 octave 3 note G#, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note F#, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note C#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note F#, 2 - intensity 183 - note D#, 16 - note C#, 16 - octave 2 - note B_, 16 - note G#, 12 - octave 3 - note D#, 1 - note F_, 1 - note G#, 1 + note __, 2 octave 4 - note C#, 1 - note D#, 6 - note D#, 2 - note F#, 8 - octave 3 - note B_, 6 - note B_, 2 - octave 4 - note C#, 8 - note D#, 6 - note D#, 2 - note F_, 8 - note F#, 6 + note F_, 2 note F#, 2 - note G#, 8 note F_, 2 - note __, 2 + note D#, 2 note F_, 2 - note F_, 2 - note __, 4 - note F_, 2 - note __, 2 - note F_, 2 - note __, 2 - note F_, 2 - note F_, 2 - note __, 4 - note F_, 2 - note __, 2 - note F_, 2 - note __, 2 - note F_, 2 - note F_, 2 - note __, 4 - note F_, 2 - note __, 2 - note F_, 2 - note __, 2 - note F_, 2 - note F_, 2 - note __, 4 - note F_, 2 - note __, 2 - octave 3 - note D_, 2 - note D#, 4 - note C_, 2 - note D_, 4 - note __, 2 + intensity $67 + note E_, 1 note D_, 1 - note D#, 1 - note F_, 1 - note __, 1 - note D#, 1 - note __, 1 note C_, 1 - note __, 1 - note D_, 1 - note __, 9 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note __, 5 - note D_, 1 - note D#, 1 - note F_, 1 - note __, 1 - note F#, 1 - note __, 1 - note F_, 1 - note __, 1 - note D#, 1 - note __, 1 - note D#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note __, 5 - note D#, 1 - note E_, 1 - note __, 2 - note G_, 2 - note F_, 4 - note E_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note F_, 8 - note G_, 8 - note G#, 8 - octave 4 - note C#, 4 octave 3 - note G#, 1 - note A_, 1 - note A#, 1 note B_, 1 + note A_, 1 + note G_, 1 + intensity $a1 octave 4 + note C#, 2 + octave 2 + note G_, 2 + note G_, 2 + octave 4 + note C#, 2 + octave 2 + note G_, 2 + note G_, 2 + intensity $b7 + octave 4 + note D_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_eca88 -; ecbea -Music_KantoTrainerBattle_Ch2: ; ecbea - forceoctave $1b +Music_KantoTrainerBattle_Ch2: + pitchoffset 1, B_ vibrato $6, $36 dutycycle $1 notetype $c, $d1 @@ -699,7 +483,7 @@ Music_KantoTrainerBattle_Ch2: ; ecbea note F#, 1 dutycycle $3 intensity $62 -Music_KantoTrainerBattle_branch_ecc04: ; ecc04 +Music_KantoTrainerBattle_branch_ecc04: octave 3 note G_, 1 note G#, 1 @@ -756,7 +540,7 @@ Music_KantoTrainerBattle_branch_ecc04: ; ecc04 octave 3 note D_, 1 note F_, 1 -Music_KantoTrainerBattle_branch_ecc41: ; ecc41 +Music_KantoTrainerBattle_branch_ecc41: notetype $c, $d7 octave 2 note C_, 1 @@ -1090,480 +874,50 @@ Music_KantoTrainerBattle_branch_ecc41: ; ecc41 note __, 2 note D#, 2 note __, 2 - ;ch2 insert - forceoctave $00 octave 3 - note E_, 2 - note __, 2 note F_, 2 note __, 2 - note G_, 2 - note __, 2 - note C_, 2 - note __, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note F#, 1 - note E_, 1 - note D#, 1 - note C#, 1 - octave 2 - note B_, 1 - note A#, 1 - notetype $c, $d2 - note G#, 1 - note __, 2 - note G#, 1 - note __, 2 - note E_, 1 - note __, 1 - octave 1 - note A_, 2 - octave 2 - note E_, 2 - octave 1 - note A_, 1 - octave 2 - note A_, 2 - note E_, 1 - octave 1 - note A_, 2 - octave 2 - note F_, 2 - octave 1 - note A_, 1 - octave 2 - note A_, 2 - note F_, 1 - octave 1 - note A_, 1 - note A_, 2 - octave 2 - note F#, 1 - octave 1 - note A_, 2 - octave 2 - note A_, 1 - note F#, 1 - octave 1 - note A_, 2 - octave 2 - note G_, 2 - octave 1 - note A_, 1 - octave 2 - note A_, 2 - note A_, 1 - octave 1 - note A#, 2 - octave 2 - note F_, 2 - octave 1 - note A#, 1 - octave 2 - note A#, 2 - note F_, 1 - octave 1 - note A#, 2 - octave 2 note F#, 2 - octave 1 - note A#, 1 - octave 2 - note A#, 2 - note F#, 1 - octave 1 - note A#, 1 - note A#, 2 - octave 2 - note G_, 1 - octave 1 - note A#, 2 - octave 2 - note A#, 1 - note G_, 1 - octave 1 - note A#, 2 - octave 2 + note __, 2 + note G#, 2 + note __, 2 + note C#, 2 + note __, 2 note G#, 2 - octave 1 - note A#, 1 - octave 2 note A#, 2 - note A#, 1 - octave 1 - note A_, 2 - octave 2 - note E_, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 2 - note A_, 2 - octave 1 - note A_, 2 - octave 2 - note F_, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 2 - note A_, 2 - octave 1 - note A_, 2 - octave 2 + note G#, 2 note F#, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 2 - note A_, 2 - octave 1 - note A_, 2 - octave 2 - note G_, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 2 - note A_, 2 - octave 1 - note A#, 2 - octave 2 - note F_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 2 - note A#, 2 - octave 1 - note A#, 2 - octave 2 - note F_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 2 - note A#, 2 - octave 1 - note A#, 2 - octave 2 - note F_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 2 - note A#, 2 - octave 1 - note A#, 2 - octave 2 - note F_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 2 - note A#, 2 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note F_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note F_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note E_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note E_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note D_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note D_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note E_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note E_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note F_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note F_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note E_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note E_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note D_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note D_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note E_, 4 - octave 1 - note A#, 1 - note A#, 1 - note __, 1 - note A#, 1 - octave 3 - note E_, 4 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note B_, 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note A_, 3 - octave 3 - note E_, 1 - note E_, 2 - octave 2 - note B_, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note E_, 1 - note E_, 1 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note A_, 1 - note A_, 1 - octave 3 - note E_, 2 - octave 2 - note E_, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note E_, 1 - note E_, 1 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note F_, 2 - octave 2 - note F_, 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note A#, 1 - note A#, 1 - octave 3 - note F_, 2 - octave 2 - note F_, 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note F_, 1 - note F_, 1 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 1 - note B_, 1 - note B_, 1 - octave 3 - note F#, 2 - octave 2 - note F#, 2 - note B_, 2 - octave 3 - note F#, 2 - octave 1 - note F#, 1 - note F#, 1 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 1 - note B_, 1 - note B_, 1 - octave 3 - note F#, 2 - octave 2 - note F#, 2 - note B_, 2 - octave 3 - note F#, 2 - octave 1 - note F#, 1 - note F#, 1 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note C_, 1 - note C_, 1 - octave 3 - note G_, 2 - octave 2 - note G_, 2 - octave 3 - note C_, 2 - note G_, 2 - octave 1 - note G_, 1 + note G#, 2 + intensity $72 note G_, 1 + note F_, 1 + note E_, 1 + note D_, 1 + note C_, 1 + octave 2 + note B_, 1 + intensity $c1 octave 3 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C_, 2 - forceoctave $1b - + note B_, 2 + octave 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + octave 3 + note B_, 2 + octave 1 + note F#, 1 + note __, 1 + note F#, 1 + note __, 1 + intensity $d7 + octave 3 + note B_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_ecc41 -; ecdd2 -Music_KantoTrainerBattle_Ch3: ; ecdd2 - forceoctave $1b +Music_KantoTrainerBattle_Ch3: + pitchoffset 1, B_ vibrato $12, $23 notetype $c, $15 octave 2 @@ -1693,7 +1047,7 @@ Music_KantoTrainerBattle_Ch3: ; ecdd2 note G_, 2 note A#, 2 note B_, 2 -Music_KantoTrainerBattle_branch_ece5a: ; ece5a +Music_KantoTrainerBattle_branch_ece5a: notetype $c, $14 octave 6 note C_, 4 @@ -2138,160 +1492,45 @@ Music_KantoTrainerBattle_branch_ece5a: ; ece5a note F_, 1 note F#, 1 note G#, 16 - note F_, 16 - ;ch3 insert - note F_, 16 - note C#, 6 - octave 5 - note A#, 14 - octave 6 - note C#, 4 - octave 5 - note A#, 4 - octave 6 - note C#, 4 - octave 5 - note B_, 4 - octave 6 - notetype $6, $14 - note C_, 1 + note F_, 8 note C#, 1 - note D_, 1 + note __, 1 note D#, 1 - notetype $c, $14 - note F#, 14 + note __, 1 + note F_, 1 + note __, 1 octave 5 - note B_, 4 - intensity $15 - note F#, 4 - note D#, 4 - note C#, 6 - octave 4 - note A#, 14 - octave 5 - note C#, 4 - note F_, 2 - note D#, 2 - note C#, 2 - note F_, 2 - note D#, 2 - octave 4 - note B_, 4 - octave 5 - note F#, 10 - intensity $14 - note G#, 6 - note F#, 6 - note D#, 4 - note F#, 16 - note F_, 16 - note D#, 16 - note F_, 16 - intensity $15 - note F#, 16 - note F_, 16 - note G#, 16 - note F#, 16 - intensity $18 - octave 4 - note B_, 2 - note __, 2 - octave 3 - note B_, 2 - octave 4 - note B_, 2 - note __, 2 - octave 3 - note B_, 2 - octave 4 - note B_, 2 - note __, 2 - note A#, 2 - note __, 2 - octave 3 - note A#, 2 - octave 4 - note A#, 2 - note __, 2 - octave 3 - note A#, 2 - octave 4 - note A#, 2 - note __, 2 - octave 5 - note C#, 2 - note __, 2 - octave 4 - note C#, 2 - octave 5 - note C#, 2 - note __, 2 - octave 4 - note C#, 2 - octave 5 - note C#, 2 - note __, 2 - octave 4 - note B_, 2 - note __, 2 - octave 3 - note B_, 2 - octave 4 - note B_, 2 - note __, 2 - octave 3 - note A#, 2 - octave 4 - note A#, 2 - note __, 2 - intensity $15 - note A#, 4 - octave 5 - note C_, 4 - octave 4 note G#, 1 note __, 1 - note A#, 6 - note __, 4 - octave 5 - note C_, 1 - note C#, 1 - note D_, 2 - note F_, 2 - note D#, 2 - note D_, 1 - note C#, 1 - note C_, 2 - octave 4 - note B_, 16 - note __, 2 - note B_, 2 - octave 5 - note C#, 2 - note F#, 2 - note F_, 2 - note D#, 2 - note C#, 1 - note C_, 1 - octave 4 - note B_, 2 - octave 5 - note C_, 16 - note __, 2 - note C_, 2 - note D_, 2 - note G#, 2 - note G_, 2 - note F_, 2 + octave 6 + note F_, 1 + note F#, 1 + note F_, 1 note D#, 1 - note C#, 1 - note C_, 2 - note C#, 16 + note F_, 1 + notetype $6, $24 + note E_, 1 + note D_, 1 + note C_, 1 + octave 5 + note B_, 1 + note A_, 1 + note G_, 1 intensity $14 - note F_, 8 - note G#, 8 - + note G_, 2 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + octave 5 + note G_, 2 + octave 3 + note G_, 1 + note __, 1 + note G_, 1 + note __, 1 + intensity $14 + octave 5 + note G_, 4 loopchannel 0, Music_KantoTrainerBattle_branch_ece5a -; ed06d - - diff --git a/crysaudio/music/kantowildbattle.asm b/crysaudio/music/kantowildbattle.asm index 6146b53a..c19da00d 100644 --- a/crysaudio/music/kantowildbattle.asm +++ b/crysaudio/music/kantowildbattle.asm @@ -1,14 +1,12 @@ -Music_KantoWildBattle: ; ed06d - dbw $80, Music_KantoWildBattle_Ch1 - dbw $01, Music_KantoWildBattle_Ch2 - dbw $02, Music_KantoWildBattle_Ch3 -; ed076 +Music_KantoWildBattle: + musicheader 3, 1, Music_KantoWildBattle_Ch1 + musicheader 1, 2, Music_KantoWildBattle_Ch2 + musicheader 1, 3, Music_KantoWildBattle_Ch3 + db $3 - - -Music_KantoWildBattle_Ch1: ; ed077 - ftempo 112 +Music_KantoWildBattle_Ch1: + tempo 112 volume $77 vibrato $12, $23 dutycycle $2 @@ -26,7 +24,7 @@ Music_KantoWildBattle_Ch1: ; ed077 note G_, 1 note F#, 1 note F_, 1 -Music_KantoWildBattle_branch_ed091: ; ed091 +Music_KantoWildBattle_branch_ed091: notetype $c, $b7 callchannel Music_KantoWildBattle_branch_ed18a octave 4 @@ -209,7 +207,7 @@ Music_KantoWildBattle_branch_ed091: ; ed091 note D#, 1 note __, 5 note C#, 8 -Music_KantoWildBattle_branch_ed15b: ; ed15b +Music_KantoWildBattle_branch_ed15b: intensity $b1 octave 3 note C_, 1 @@ -217,34 +215,33 @@ Music_KantoWildBattle_branch_ed15b: ; ed15b note D_, 1 note C#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed15b -Music_KantoWildBattle_branch_ed166: ; ed166 +Music_KantoWildBattle_branch_ed166: note C#, 1 note F_, 1 note E_, 1 note D#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed166 -Music_KantoWildBattle_branch_ed16e: ; ed16e +Music_KantoWildBattle_branch_ed16e: note C_, 1 note D#, 1 note D_, 1 note C#, 1 loopchannel 16, Music_KantoWildBattle_branch_ed16e -Music_KantoWildBattle_branch_ed176: ; ed176 +Music_KantoWildBattle_branch_ed176: note C#, 1 note E_, 1 note D#, 1 note D_, 1 loopchannel 8, Music_KantoWildBattle_branch_ed176 -Music_KantoWildBattle_branch_ed17e: ; ed17e +Music_KantoWildBattle_branch_ed17e: note C_, 1 note D#, 1 note D_, 1 note C#, 1 loopchannel 8, Music_KantoWildBattle_branch_ed17e loopchannel 0, Music_KantoWildBattle_branch_ed091 -; ed18a -Music_KantoWildBattle_branch_ed18a: ; ed18a +Music_KantoWildBattle_branch_ed18a: octave 4 note C_, 1 note __, 5 @@ -266,9 +263,8 @@ Music_KantoWildBattle_branch_ed18a: ; ed18a note B_, 1 note __, 3 endchannel -; ed19f -Music_KantoWildBattle_Ch2: ; ed19f +Music_KantoWildBattle_Ch2: dutycycle $1 vibrato $12, $23 notetype $c, $b1 @@ -305,7 +301,7 @@ Music_KantoWildBattle_Ch2: ; ed19f note D#, 1 note D_, 1 note C#, 1 -Music_KantoWildBattle_branch_ed1c8: ; ed1c8 +Music_KantoWildBattle_branch_ed1c8: notetype $c, $b7 callchannel Music_KantoWildBattle_branch_ed2c6 octave 2 @@ -328,18 +324,17 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 notetype $6, $b7 callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307 - forceoctave $1 + pitchoffset 0, C# callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307 - forceoctave $0 + pitchoffset 0, C_ +rept 4 + callchannel Music_KantoWildBattle_branch_ed307 +endr + pitchoffset 0, C# callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - forceoctave $1 - callchannel Music_KantoWildBattle_branch_ed307 - callchannel Music_KantoWildBattle_branch_ed307 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_KantoWildBattle_branch_ed307 callchannel Music_KantoWildBattle_branch_ed307 note __, 16 @@ -386,9 +381,9 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 note G#, 1 notetype $6, $b7 callchannel Music_KantoWildBattle_branch_ed31b - forceoctave $1 + pitchoffset 0, C# callchannel Music_KantoWildBattle_branch_ed31b - forceoctave $0 + pitchoffset 0, C_ callchannel Music_KantoWildBattle_branch_ed340 octave 2 note C_, 2 @@ -452,9 +447,9 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 callchannel Music_KantoWildBattle_branch_ed354 callchannel Music_KantoWildBattle_branch_ed340 callchannel Music_KantoWildBattle_branch_ed354 - forceoctave $1 + pitchoffset 0, C# callchannel Music_KantoWildBattle_branch_ed340 - forceoctave $0 + pitchoffset 0, C_ note C#, 2 note __, 2 octave 3 @@ -495,9 +490,8 @@ Music_KantoWildBattle_branch_ed1c8: ; ed1c8 note C_, 2 note __, 2 loopchannel 0, Music_KantoWildBattle_branch_ed1c8 -; ed2c6 -Music_KantoWildBattle_branch_ed2c6: ; ed2c6 +Music_KantoWildBattle_branch_ed2c6: octave 2 note C_, 1 note __, 2 @@ -563,9 +557,8 @@ Music_KantoWildBattle_branch_ed2c6: ; ed2c6 octave 1 note G_, 2 endchannel -; ed307 -Music_KantoWildBattle_branch_ed307: ; ed307 +Music_KantoWildBattle_branch_ed307: octave 2 note C_, 2 note __, 4 @@ -586,9 +579,8 @@ Music_KantoWildBattle_branch_ed307: ; ed307 octave 2 note C_, 4 endchannel -; ed31b -Music_KantoWildBattle_branch_ed31b: ; ed31b +Music_KantoWildBattle_branch_ed31b: octave 2 note C_, 2 note __, 4 @@ -626,9 +618,8 @@ Music_KantoWildBattle_branch_ed31b: ; ed31b octave 3 note C_, 2 endchannel -; ed340 -Music_KantoWildBattle_branch_ed340: ; ed340 +Music_KantoWildBattle_branch_ed340: octave 3 note G_, 4 octave 2 @@ -649,9 +640,8 @@ Music_KantoWildBattle_branch_ed340: ; ed340 note C_, 2 note __, 2 endchannel -; ed354 -Music_KantoWildBattle_branch_ed354: ; ed354 +Music_KantoWildBattle_branch_ed354: note C_, 2 note __, 2 octave 3 @@ -672,9 +662,8 @@ Music_KantoWildBattle_branch_ed354: ; ed354 note C_, 2 note __, 2 endchannel -; ed368 -Music_KantoWildBattle_Ch3: ; ed368 +Music_KantoWildBattle_Ch3: vibrato $14, $23 notetype $c, $14 octave 3 @@ -725,7 +714,7 @@ Music_KantoWildBattle_Ch3: ; ed368 note G_, 1 octave 4 note G_, 1 -Music_KantoWildBattle_branch_ed39e: ; ed39e +Music_KantoWildBattle_branch_ed39e: notetype $c, $14 octave 5 note G_, 1 @@ -1224,6 +1213,3 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e note G_, 16 note G_, 16 loopchannel 0, Music_KantoWildBattle_branch_ed39e -; ed5c6 - - diff --git a/crysaudio/music/lakeofrage.asm b/crysaudio/music/lakeofrage.asm index 8a57ab38..4f7154fd 100644 --- a/crysaudio/music/lakeofrage.asm +++ b/crysaudio/music/lakeofrage.asm @@ -1,11 +1,10 @@ -Music_LakeOfRage: ; ee6c5 - dbw $c0, Music_LakeOfRage_Ch1 - dbw $01, Music_LakeOfRage_Ch2 - dbw $02, Music_LakeOfRage_Ch3 - dbw $03, Music_LakeOfRage_Ch4 -; ee6d1 +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 -Music_LakeOfRage_Ch1: ; ee6d1 +Music_LakeOfRage_Ch1: tempo 144 volume $77 dutycycle $3 @@ -19,7 +18,7 @@ Music_LakeOfRage_Ch1: ; ee6d1 note D_, 6 note D_, 6 note E_, 4 -Music_LakeOfRage_branch_ee6e9: ; ee6e9 +Music_LakeOfRage_branch_ee6e9: intensity $b5 note F#, 6 note E_, 6 @@ -93,9 +92,8 @@ Music_LakeOfRage_branch_ee6e9: ; ee6e9 intensity $a7 note D_, 6 loopchannel 0, Music_LakeOfRage_branch_ee6e9 -; ee749 -Music_LakeOfRage_Ch2: ; ee749 +Music_LakeOfRage_Ch2: dutycycle $3 vibrato $20, $44 stereopanning $ff @@ -108,7 +106,7 @@ Music_LakeOfRage_Ch2: ; ee749 note A_, 8 intensity $a7 note A_, 8 -Music_LakeOfRage_branch_ee75e: ; ee75e +Music_LakeOfRage_branch_ee75e: notetype $8, $c7 octave 4 note D_, 16 @@ -183,9 +181,8 @@ Music_LakeOfRage_branch_ee75e: ; ee75e notetype $c, $c7 note A_, 16 loopchannel 0, Music_LakeOfRage_branch_ee75e -; ee7c1 -Music_LakeOfRage_Ch3: ; ee7c1 +Music_LakeOfRage_Ch3: stereopanning $f notetype $c, $16 octave 3 @@ -198,7 +195,7 @@ Music_LakeOfRage_Ch3: ; ee7c1 note F#, 4 note __, 2 note E_, 4 -Music_LakeOfRage_branch_ee7d0: ; ee7d0 +Music_LakeOfRage_branch_ee7d0: octave 3 note D_, 4 octave 2 @@ -297,13 +294,12 @@ Music_LakeOfRage_branch_ee7d0: ; ee7d0 octave 2 note A_, 2 loopchannel 0, Music_LakeOfRage_branch_ee7d0 -; ee835 -Music_LakeOfRage_Ch4: ; ee835 +Music_LakeOfRage_Ch4: stereopanning $f0 togglenoise $3 notetype $c -Music_LakeOfRage_branch_ee83b: ; ee83b +Music_LakeOfRage_branch_ee83b: note D_, 2 note D_, 1 note D_, 1 @@ -324,6 +320,3 @@ Music_LakeOfRage_branch_ee83b: ; ee83b note D_, 1 note D_, 1 loopchannel 0, Music_LakeOfRage_branch_ee83b -; ee852 - - diff --git a/crysaudio/music/lakeofragerocketradio.asm b/crysaudio/music/lakeofragerocketradio.asm index 2abd2931..512db764 100644 --- a/crysaudio/music/lakeofragerocketradio.asm +++ b/crysaudio/music/lakeofragerocketradio.asm @@ -1,17 +1,16 @@ -Music_LakeOfRageRocketRadio: ; ef5b1 - dbw $80, Music_LakeOfRageRocketRadio_Ch1 - dbw $01, Music_LakeOfRageRocketRadio_Ch2 - dbw $02, Music_LakeOfRageRocketRadio_Ch3 -; ef5ba +Music_LakeOfRageRocketRadio: + musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1 + musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2 + musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3 -Music_LakeOfRageRocketRadio_Ch1: ; ef5ba +Music_LakeOfRageRocketRadio_Ch1: tempo 160 volume $77 dutycycle $1 tone $1118 vibrato $0, $f0 stereopanning $f0 -Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9 +Music_LakeOfRageRocketRadio_branch_ef5c9: notetype $c, $a7 octave 7 note G_, 4 @@ -20,22 +19,17 @@ Music_LakeOfRageRocketRadio_branch_ef5c9: ; ef5c9 note F#, 4 note __, 16 loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5d6 -Music_LakeOfRageRocketRadio_Ch2: ; ef5d6 +Music_LakeOfRageRocketRadio_Ch2: dutycycle $1 vibrato $13, $e8 notetype $c, $a7 note __, 2 stereopanning $f loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5e5 -Music_LakeOfRageRocketRadio_Ch3: ; ef5e5 +Music_LakeOfRageRocketRadio_Ch3: notetype $c, $26 vibrato $10, $44 note __, 4 loopchannel 0, Music_LakeOfRageRocketRadio_branch_ef5c9 -; ef5f0 - - diff --git a/crysaudio/music/lavendertown.asm b/crysaudio/music/lavendertown.asm index 88aabb03..6384b701 100644 --- a/crysaudio/music/lavendertown.asm +++ b/crysaudio/music/lavendertown.asm @@ -1,13 +1,11 @@ -Music_LavenderTown: ; ef72f - dbw $80, Music_LavenderTown_Ch1 - dbw $01, Music_LavenderTown_Ch2 - dbw $02, Music_LavenderTown_Ch3 -; ef738 +Music_LavenderTown: + musicheader 3, 1, Music_LavenderTown_Ch1 + musicheader 1, 2, Music_LavenderTown_Ch2 + musicheader 1, 3, Music_LavenderTown_Ch3 + db $3 - - -Music_LavenderTown_Ch1: ; ef739 +Music_LavenderTown_Ch1: tempo 160 volume $77 stereopanning $f @@ -18,7 +16,7 @@ Music_LavenderTown_Ch1: ; ef739 note __, 16 note __, 16 note __, 16 -Music_LavenderTown_branch_ef74c: ; ef74c +Music_LavenderTown_branch_ef74c: callchannel Music_LavenderTown_branch_ef7fd intensity $93 octave 5 @@ -104,7 +102,7 @@ Music_LavenderTown_branch_ef74c: ; ef74c octave 3 note A_, 2 note F_, 2 -Music_LavenderTown_branch_ef7ca: ; ef7ca +Music_LavenderTown_branch_ef7ca: octave 3 note C_, 2 note E_, 2 @@ -150,9 +148,8 @@ Music_LavenderTown_branch_ef7ca: ; ef7ca note B_, 8 note B_, 8 loopchannel 0, Music_LavenderTown_branch_ef74c -; ef7fd -Music_LavenderTown_branch_ef7fd: ; ef7fd +Music_LavenderTown_branch_ef7fd: intensity $83 octave 5 note C_, 2 @@ -243,9 +240,8 @@ Music_LavenderTown_branch_ef7fd: ; ef7fd intensity $43 note F_, 2 endchannel -; ef87f -Music_LavenderTown_branch_ef87f: ; ef87f +Music_LavenderTown_branch_ef87f: intensity $93 octave 5 note G_, 2 @@ -264,13 +260,12 @@ Music_LavenderTown_branch_ef87f: ; ef87f intensity $43 note G_, 2 endchannel -; ef899 -Music_LavenderTown_Ch2: ; ef899 +Music_LavenderTown_Ch2: dutycycle $1 vibrato $8, $24 stereopanning $ff -Music_LavenderTown_branch_ef8a0: ; ef8a0 +Music_LavenderTown_branch_ef8a0: notetype $c, $a3 octave 5 note C_, 2 @@ -306,7 +301,7 @@ Music_LavenderTown_branch_ef8a0: ; ef8a0 note D_, 2 intensity $63 note D_, 2 -Music_LavenderTown_branch_ef8d7: ; ef8d7 +Music_LavenderTown_branch_ef8d7: intensity $b5 callchannel Music_LavenderTown_branch_ef915 octave 2 @@ -359,9 +354,8 @@ Music_LavenderTown_branch_ef8d7: ; ef8d7 note F_, 1 note G_, 6 loopchannel 0, Music_LavenderTown_branch_ef8d7 -; ef915 -Music_LavenderTown_branch_ef915: ; ef915 +Music_LavenderTown_branch_ef915: octave 2 note C_, 4 note G_, 4 @@ -391,9 +385,8 @@ Music_LavenderTown_branch_ef915: ; ef915 note A_, 4 note C_, 4 endchannel -; ef932 -Music_LavenderTown_Ch3: ; ef932 +Music_LavenderTown_Ch3: vibrato $12, $24 notetype $c, $13 stereopanning $f0 @@ -404,7 +397,7 @@ Music_LavenderTown_Ch3: ; ef932 octave 5 note E_, 4 note F_, 4 -Music_LavenderTown_branch_ef941: ; ef941 +Music_LavenderTown_branch_ef941: intensity $12 octave 5 note G_, 4 @@ -519,6 +512,3 @@ Music_LavenderTown_branch_ef941: ; ef941 note E_, 2 note F_, 2 loopchannel 0, Music_LavenderTown_branch_ef941 -; ef9bc - - diff --git a/crysaudio/music/lighthouse.asm b/crysaudio/music/lighthouse.asm index 74abfcde..9846e7ec 100644 --- a/crysaudio/music/lighthouse.asm +++ b/crysaudio/music/lighthouse.asm @@ -1,18 +1,17 @@ -Music_Lighthouse: ; ee569 - dbw $c0, Music_Lighthouse_Ch1 - dbw $01, Music_Lighthouse_Ch2 - dbw $02, Music_Lighthouse_Ch3 - dbw $03, Music_Lighthouse_Ch4 -; ee575 +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 -Music_Lighthouse_Ch1: ; ee575 +Music_Lighthouse_Ch1: tempo 144 volume $77 dutycycle $3 tone $0004 vibrato $8, $45 stereopanning $f -Music_Lighthouse_branch_ee584: ; ee584 +Music_Lighthouse_branch_ee584: notetype $c, $b3 octave 3 note C#, 8 @@ -128,13 +127,12 @@ Music_Lighthouse_branch_ee584: ; ee584 note A_, 2 note G#, 8 loopchannel 0, Music_Lighthouse_branch_ee584 -; ee5fc -Music_Lighthouse_Ch2: ; ee5fc +Music_Lighthouse_Ch2: dutycycle $3 tone $0002 vibrato $10, $45 -Music_Lighthouse_branch_ee604: ; ee604 +Music_Lighthouse_branch_ee604: notetype $c, $c5 octave 3 note G#, 12 @@ -211,12 +209,11 @@ Music_Lighthouse_branch_ee604: ; ee604 note C#, 2 note C_, 8 loopchannel 0, Music_Lighthouse_branch_ee604 -; ee656 -Music_Lighthouse_Ch3: ; ee656 +Music_Lighthouse_Ch3: notetype $c, $19 stereopanning $f0 -Music_Lighthouse_branch_ee65b: ; ee65b +Music_Lighthouse_branch_ee65b: octave 2 note G#, 2 note __, 2 @@ -226,7 +223,7 @@ Music_Lighthouse_branch_ee65b: ; ee65b note __, 2 note G_, 2 note __, 2 -Music_Lighthouse_branch_ee664: ; ee664 +Music_Lighthouse_branch_ee664: note G#, 2 note __, 2 note D#, 2 @@ -255,7 +252,7 @@ Music_Lighthouse_branch_ee664: ; ee664 octave 3 note C_, 2 note __, 2 -Music_Lighthouse_branch_ee683: ; ee683 +Music_Lighthouse_branch_ee683: note C#, 2 note __, 2 octave 2 @@ -277,7 +274,7 @@ Music_Lighthouse_branch_ee683: ; ee683 octave 3 note D#, 2 note F#, 2 -Music_Lighthouse_branch_ee69b: ; ee69b +Music_Lighthouse_branch_ee69b: note E_, 2 note __, 2 octave 2 @@ -290,12 +287,11 @@ Music_Lighthouse_branch_ee69b: ; ee69b note __, 2 loopchannel 8, Music_Lighthouse_branch_ee69b loopchannel 0, Music_Lighthouse_branch_ee65b -; ee6ad -Music_Lighthouse_Ch4: ; ee6ad +Music_Lighthouse_Ch4: togglenoise $0 notetype $c -Music_Lighthouse_branch_ee6b1: ; ee6b1 +Music_Lighthouse_branch_ee6b1: stereopanning $f note G#, 4 note F_, 2 @@ -311,6 +307,3 @@ Music_Lighthouse_branch_ee6b1: ; ee6b1 note G#, 2 note A_, 2 loopchannel 0, Music_Lighthouse_branch_ee6b1 -; ee6c5 - - diff --git a/crysaudio/music/lookbeauty.asm b/crysaudio/music/lookbeauty.asm index 7f08f2ff..313f2366 100644 --- a/crysaudio/music/lookbeauty.asm +++ b/crysaudio/music/lookbeauty.asm @@ -1,11 +1,10 @@ -Music_LookBeauty: ; eee3e - dbw $c0, Music_LookBeauty_Ch1 - dbw $01, Music_LookBeauty_Ch2 - dbw $02, Music_LookBeauty_Ch3 - dbw $03, Music_LookBeauty_Ch4 -; eee4a +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 -Music_LookBeauty_Ch1: ; eee4a +Music_LookBeauty_Ch1: stereopanning $f vibrato $12, $25 dutycycle $2 @@ -17,7 +16,7 @@ Music_LookBeauty_Ch1: ; eee4a octave 4 note C_, 8 dutycycle $3 -Music_LookBeauty_branch_eee5f: ; eee5f +Music_LookBeauty_branch_eee5f: note __, 4 octave 3 note D_, 1 @@ -76,9 +75,8 @@ Music_LookBeauty_branch_eee5f: ; eee5f octave 4 note C_, 1 loopchannel 0, Music_LookBeauty_branch_eee5f -; eee9c -Music_LookBeauty_Ch2: ; eee9c +Music_LookBeauty_Ch2: stereopanning $f0 vibrato $10, $23 dutycycle $2 @@ -113,7 +111,7 @@ Music_LookBeauty_Ch2: ; eee9c note F#, 1 note __, 1 dutycycle $3 -Music_LookBeauty_branch_eeec5: ; eeec5 +Music_LookBeauty_branch_eeec5: notetype $c, $c7 note G_, 16 note A_, 8 @@ -154,9 +152,8 @@ Music_LookBeauty_branch_eeec5: ; eeec5 note F#, 8 note A_, 8 loopchannel 0, Music_LookBeauty_branch_eeec5 -; eeefa -Music_LookBeauty_Ch3: ; eeefa +Music_LookBeauty_Ch3: stereopanning $ff vibrato $8, $12 notetype $c, $15 @@ -173,7 +170,7 @@ Music_LookBeauty_Ch3: ; eeefa octave 3 note D_, 7 note F#, 1 -Music_LookBeauty_branch_eef0f: ; eef0f +Music_LookBeauty_branch_eef0f: note G_, 4 octave 4 note B_, 1 @@ -295,22 +292,20 @@ Music_LookBeauty_branch_eef0f: ; eef0f octave 3 note D_, 8 loopchannel 0, Music_LookBeauty_branch_eef0f -; eef8b -Music_LookBeauty_Ch4: ; eef8b +Music_LookBeauty_Ch4: togglenoise $3 notetype $c note __, 16 note __, 16 -Music_LookBeauty_branch_eef91: ; eef91 +Music_LookBeauty_branch_eef91: callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 callchannel Music_LookBeauty_branch_eefa1 loopchannel 0, Music_LookBeauty_branch_eef91 -; eefa1 -Music_LookBeauty_branch_eefa1: ; eefa1 +Music_LookBeauty_branch_eefa1: note F#, 2 note G_, 2 note D_, 2 @@ -328,6 +323,3 @@ Music_LookBeauty_branch_eefa1: ; eefa1 note D_, 2 note G_, 2 endchannel -; eefb2 - - diff --git a/crysaudio/music/lookhiker.asm b/crysaudio/music/lookhiker.asm index a213b49c..9a394eb7 100644 --- a/crysaudio/music/lookhiker.asm +++ b/crysaudio/music/lookhiker.asm @@ -1,11 +1,10 @@ -Music_LookHiker: ; f7411 - dbw $c0, Music_LookHiker_Ch1 - dbw $01, Music_LookHiker_Ch2 - dbw $02, Music_LookHiker_Ch3 - dbw $03, Music_LookHiker_Ch4 -; f741d +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 -Music_LookHiker_Ch1: ; f741d +Music_LookHiker_Ch1: tempo 132 volume $77 tone $0001 @@ -17,7 +16,7 @@ Music_LookHiker_Ch1: ; f741d note F#, 2 note F_, 2 note F#, 8 -Music_LookHiker_branch_f7433: ; f7433 +Music_LookHiker_branch_f7433: note D_, 2 note D#, 2 note E_, 2 @@ -31,9 +30,8 @@ Music_LookHiker_branch_f7433: ; f7433 note F#, 2 note __, 6 loopchannel 0, Music_LookHiker_branch_f7433 -; f7443 -Music_LookHiker_Ch2: ; f7443 +Music_LookHiker_Ch2: dutycycle $0 notetype $c, $a1 note __, 4 @@ -50,7 +48,7 @@ Music_LookHiker_Ch2: ; f7443 note F#, 1 note D_, 1 intensity $a1 -Music_LookHiker_branch_f7457: ; f7457 +Music_LookHiker_branch_f7457: octave 1 note B_, 1 note B_, 2 @@ -68,9 +66,8 @@ Music_LookHiker_branch_f7457: ; f7457 note F#, 1 note D_, 1 loopchannel 0, Music_LookHiker_branch_f7457 -; f746b -Music_LookHiker_Ch3: ; f746b +Music_LookHiker_Ch3: vibrato $12, $24 stereopanning $f0 notetype $c, $14 @@ -78,7 +75,7 @@ Music_LookHiker_Ch3: ; f746b note B_, 2 note A#, 2 note B_, 8 -Music_LookHiker_branch_f7477: ; f7477 +Music_LookHiker_branch_f7477: octave 5 note D#, 2 note D_, 2 @@ -91,9 +88,8 @@ Music_LookHiker_branch_f7477: ; f7477 note A#, 2 callchannel Music_LookHiker_branch_f748a loopchannel 0, Music_LookHiker_branch_f7477 -; f748a -Music_LookHiker_branch_f748a: ; f748a +Music_LookHiker_branch_f748a: octave 4 note B_, 2 note __, 4 @@ -104,19 +100,15 @@ Music_LookHiker_branch_f748a: ; f748a note B_, 2 note __, 6 endchannel -; f7494 -Music_LookHiker_Ch4: ; f7494 +Music_LookHiker_Ch4: togglenoise $3 notetype $c note F_, 4 note __, 16 -Music_LookHiker_branch_f749a: ; f749a +Music_LookHiker_branch_f749a: note D#, 2 note G_, 2 note D_, 2 note G_, 2 loopchannel 0, Music_LookHiker_branch_f749a -; f74a2 - - diff --git a/crysaudio/music/lookkimonogirl.asm b/crysaudio/music/lookkimonogirl.asm index 06e15297..dc1dbee8 100644 --- a/crysaudio/music/lookkimonogirl.asm +++ b/crysaudio/music/lookkimonogirl.asm @@ -1,13 +1,11 @@ -Music_LookKimonoGirl: ; f79b8 - dbw $80, Music_LookKimonoGirl_Ch1 - dbw $01, Music_LookKimonoGirl_Ch2 - dbw $02, Music_LookKimonoGirl_Ch3 -; f79c1 +Music_LookKimonoGirl: + musicheader 3, 1, Music_LookKimonoGirl_Ch1 + musicheader 1, 2, Music_LookKimonoGirl_Ch2 + musicheader 1, 3, Music_LookKimonoGirl_Ch3 + db $3 - - -Music_LookKimonoGirl_Ch1: ; f79c2 +Music_LookKimonoGirl_Ch1: tempo 160 volume $77 stereopanning $f @@ -15,8 +13,8 @@ Music_LookKimonoGirl_Ch1: ; f79c2 notetype $6, $87 tone $0001 callchannel Music_LookKimonoGirl_branch_f7aa8 - tone $0000 -Music_LookKimonoGirl_branch_f79d7: ; f79d7 + tone 0 +Music_LookKimonoGirl_branch_f79d7: notetype $c, $b2 callchannel Music_LookKimonoGirl_branch_f7a13 callchannel Music_LookKimonoGirl_branch_f7a13 @@ -50,9 +48,8 @@ Music_LookKimonoGirl_branch_f79d7: ; f79d7 octave 3 note A_, 1 loopchannel 0, Music_LookKimonoGirl_branch_f79d7 -; f7a13 -Music_LookKimonoGirl_branch_f7a13: ; f7a13 +Music_LookKimonoGirl_branch_f7a13: intensity $b4 octave 2 note F_, 1 @@ -78,9 +75,8 @@ Music_LookKimonoGirl_branch_f7a13: ; f7a13 octave 4 note D_, 1 endchannel -; f7a34 -Music_LookKimonoGirl_branch_f7a34: ; f7a34 +Music_LookKimonoGirl_branch_f7a34: intensity $b4 octave 2 note E_, 1 @@ -106,14 +102,13 @@ Music_LookKimonoGirl_branch_f7a34: ; f7a34 octave 4 note D_, 1 endchannel -; f7a55 -Music_LookKimonoGirl_Ch2: ; f7a55 +Music_LookKimonoGirl_Ch2: dutycycle $0 notetype $6, $a7 stereopanning $f0 callchannel Music_LookKimonoGirl_branch_f7aa8 -Music_LookKimonoGirl_branch_f7a5f: ; f7a5f +Music_LookKimonoGirl_branch_f7a5f: dutycycle $3 notetype $c, $91 octave 5 @@ -157,9 +152,8 @@ Music_LookKimonoGirl_branch_f7a5f: ; f7a5f note D_, 1 callchannel Music_LookKimonoGirl_branch_f7a94 loopchannel 0, Music_LookKimonoGirl_branch_f7a5f -; f7a94 -Music_LookKimonoGirl_branch_f7a94: ; f7a94 +Music_LookKimonoGirl_branch_f7a94: octave 5 note B_, 1 note A_, 1 @@ -180,9 +174,8 @@ Music_LookKimonoGirl_branch_f7a94: ; f7a94 note B_, 1 note E_, 1 endchannel -; f7aa8 -Music_LookKimonoGirl_branch_f7aa8: ; f7aa8 +Music_LookKimonoGirl_branch_f7aa8: octave 4 note E_, 1 octave 5 @@ -216,9 +209,8 @@ Music_LookKimonoGirl_branch_f7aa8: ; f7aa8 note E_, 1 note E_, 1 endchannel -; f7ad4 -Music_LookKimonoGirl_Ch3: ; f7ad4 +Music_LookKimonoGirl_Ch3: stereopanning $ff vibrato $12, $24 notetype $6, $13 @@ -234,7 +226,7 @@ Music_LookKimonoGirl_Ch3: ; f7ad4 octave 5 note D_, 2 note E_, 2 -Music_LookKimonoGirl_branch_f7aec: ; f7aec +Music_LookKimonoGirl_branch_f7aec: octave 5 note D_, 4 note E_, 4 @@ -271,6 +263,3 @@ Music_LookKimonoGirl_branch_f7aec: ; f7aec note D_, 8 note E_, 8 loopchannel 0, Music_LookKimonoGirl_branch_f7aec -; f7b13 - - diff --git a/crysaudio/music/looklass.asm b/crysaudio/music/looklass.asm index 17f44173..802716c1 100644 --- a/crysaudio/music/looklass.asm +++ b/crysaudio/music/looklass.asm @@ -1,11 +1,10 @@ -Music_LookLass: ; ed79b - dbw $c0, Music_LookLass_Ch1 - dbw $01, Music_LookLass_Ch2 - dbw $02, Music_LookLass_Ch3 - dbw $03, Music_LookLass_Ch4 -; ed7a7 +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 -Music_LookLass_Ch1: ; ed7a7 +Music_LookLass_Ch1: tempo 132 volume $77 tone $0001 @@ -18,7 +17,7 @@ Music_LookLass_Ch1: ; ed7a7 note B_, 14 stereopanning $f dutycycle $0 -Music_LookLass_branch_ed7bd: ; ed7bd +Music_LookLass_branch_ed7bd: intensity $a2 octave 3 note E_, 4 @@ -29,14 +28,13 @@ Music_LookLass_branch_ed7bd: ; ed7bd intensity $a3 note B_, 2 loopchannel 0, Music_LookLass_branch_ed7bd -; ed7cd -Music_LookLass_Ch2: ; ed7cd +Music_LookLass_Ch2: stereopanning $f0 dutycycle $0 notetype $c, $83 note __, 16 -Music_LookLass_branch_ed7d5: ; ed7d5 +Music_LookLass_branch_ed7d5: intensity $92 octave 2 note B_, 4 @@ -48,9 +46,8 @@ Music_LookLass_branch_ed7d5: ; ed7d5 octave 3 note G#, 2 loopchannel 0, Music_LookLass_branch_ed7d5 -; ed7e6 -Music_LookLass_Ch3: ; ed7e6 +Music_LookLass_Ch3: notetype $c, $10 note __, 8 octave 6 @@ -58,7 +55,7 @@ Music_LookLass_Ch3: ; ed7e6 note D#, 2 note C#, 2 note C_, 2 -Music_LookLass_branch_ed7ef: ; ed7ef +Music_LookLass_branch_ed7ef: octave 5 note B_, 2 note __, 2 @@ -99,13 +96,12 @@ Music_LookLass_branch_ed7ef: ; ed7ef note G#, 2 note A_, 2 loopchannel 0, Music_LookLass_branch_ed7ef -; ed81a -Music_LookLass_Ch4: ; ed81a +Music_LookLass_Ch4: togglenoise $4 notetype $c note C_, 16 -Music_LookLass_branch_ed81f: ; ed81f +Music_LookLass_branch_ed81f: notetype $6 note D_, 8 note C#, 8 @@ -116,6 +112,3 @@ Music_LookLass_branch_ed81f: ; ed81f note C#, 1 note C#, 1 loopchannel 0, Music_LookLass_branch_ed81f -; ed82d - - diff --git a/crysaudio/music/lookmysticalman.asm b/crysaudio/music/lookmysticalman.asm index 4aac6e69..675c937e 100644 --- a/crysaudio/music/lookmysticalman.asm +++ b/crysaudio/music/lookmysticalman.asm @@ -1,11 +1,10 @@ -Music_LookMysticalMan: ; 17843b - dbw $c0, Music_LookMysticalMan_Ch1 - dbw $01, Music_LookMysticalMan_Ch2 - dbw $02, Music_LookMysticalMan_Ch3 - dbw $03, Music_LookMysticalMan_Ch4 -; 178447 +Music_LookMysticalMan: + musicheader 4, 1, Music_LookMysticalMan_Ch1 + musicheader 1, 2, Music_LookMysticalMan_Ch2 + musicheader 1, 3, Music_LookMysticalMan_Ch3 + musicheader 1, 4, Music_LookMysticalMan_Ch4 -Music_LookMysticalMan_Ch1: ; 178447 +Music_LookMysticalMan_Ch1: tempo 136 volume $77 vibrato $a, $34 @@ -13,7 +12,7 @@ Music_LookMysticalMan_Ch1: ; 178447 stereopanning $f notetype $c, $b3 note __, 8 -Music_LookMysticalMan_branch_178458: ; 178458 +Music_LookMysticalMan_branch_178458: dutycycle $3 notetype $6, $96 octave 3 @@ -94,7 +93,7 @@ Music_LookMysticalMan_branch_178458: ; 178458 note A#, 6 dutycycle $2 intensity $72 -Music_LookMysticalMan_branch_1784b4: ; 1784b4 +Music_LookMysticalMan_branch_1784b4: octave 5 note D_, 2 octave 4 @@ -124,7 +123,7 @@ Music_LookMysticalMan_branch_1784b4: ; 1784b4 note D_, 2 note F#, 2 note B_, 2 -Music_LookMysticalMan_branch_1784d4: ; 1784d4 +Music_LookMysticalMan_branch_1784d4: octave 5 note D_, 2 octave 4 @@ -156,9 +155,8 @@ Music_LookMysticalMan_branch_1784d4: ; 1784d4 note F#, 2 note A#, 2 loopchannel 0, Music_LookMysticalMan_branch_178458 -; 1784f9 -Music_LookMysticalMan_branch_1784f9: ; 1784f9 +Music_LookMysticalMan_branch_1784f9: note D_, 16 octave 4 note D_, 2 @@ -192,14 +190,13 @@ Music_LookMysticalMan_branch_1784f9: ; 1784f9 note B_, 2 note A_, 6 endchannel -; 17851a -Music_LookMysticalMan_Ch2: ; 17851a +Music_LookMysticalMan_Ch2: dutycycle $3 vibrato $a, $34 notetype $c, $b3 note __, 8 -Music_LookMysticalMan_branch_178523: ; 178523 +Music_LookMysticalMan_branch_178523: stereopanning $f0 notetype $6, $b8 octave 3 @@ -297,9 +294,8 @@ Music_LookMysticalMan_branch_178523: ; 178523 note A#, 16 note __, 2 loopchannel 0, Music_LookMysticalMan_branch_178523 -; 17859a -Music_LookMysticalMan_branch_17859a: ; 17859a +Music_LookMysticalMan_branch_17859a: note B_, 2 note __, 2 octave 4 @@ -343,9 +339,8 @@ Music_LookMysticalMan_branch_17859a: ; 17859a note F#, 2 note E_, 6 endchannel -; 1785c8 -Music_LookMysticalMan_branch_1785c8: ; 1785c8 +Music_LookMysticalMan_branch_1785c8: note C#, 8 intensity $88 note C_, 1 @@ -361,12 +356,11 @@ Music_LookMysticalMan_branch_1785c8: ; 1785c8 note __, 1 intensity $b8 endchannel -; 1785db -Music_LookMysticalMan_Ch3: ; 1785db +Music_LookMysticalMan_Ch3: notetype $6, $16 note __, 16 -Music_LookMysticalMan_branch_1785df: ; 1785df +Music_LookMysticalMan_branch_1785df: octave 2 note B_, 4 octave 3 @@ -421,7 +415,7 @@ Music_LookMysticalMan_branch_1785df: ; 1785df note A_, 2 octave 3 note E_, 2 -Music_LookMysticalMan_branch_178615: ; 178615 +Music_LookMysticalMan_branch_178615: octave 2 note F#, 4 note A#, 2 @@ -537,9 +531,8 @@ Music_LookMysticalMan_branch_178615: ; 178615 note B_, 8 note A#, 4 loopchannel 0, Music_LookMysticalMan_branch_1785df -; 17868e -Music_LookMysticalMan_Ch4: ; 17868e +Music_LookMysticalMan_Ch4: togglenoise $3 notetype $c note D#, 2 @@ -547,7 +540,7 @@ Music_LookMysticalMan_Ch4: ; 17868e note D_, 2 note D_, 1 note D_, 1 -Music_LookMysticalMan_branch_178697: ; 178697 +Music_LookMysticalMan_branch_178697: callchannel Music_LookMysticalMan_branch_1786d3 callchannel Music_LookMysticalMan_branch_1786d9 callchannel Music_LookMysticalMan_branch_1786d3 @@ -566,7 +559,7 @@ Music_LookMysticalMan_branch_178697: ; 178697 note D_, 2 note D_, 1 note D_, 1 -Music_LookMysticalMan_branch_1786ba: ; 1786ba +Music_LookMysticalMan_branch_1786ba: note D_, 2 note D#, 2 note D_, 3 @@ -586,27 +579,24 @@ Music_LookMysticalMan_branch_1786ba: ; 1786ba note D_, 1 loopchannel 2, Music_LookMysticalMan_branch_1786ba loopchannel 0, Music_LookMysticalMan_branch_178697 -; 1786d3 -Music_LookMysticalMan_branch_1786d3: ; 1786d3 +Music_LookMysticalMan_branch_1786d3: note D#, 4 note D_, 3 note D#, 3 note D#, 2 note D_, 4 endchannel -; 1786d9 -Music_LookMysticalMan_branch_1786d9: ; 1786d9 +Music_LookMysticalMan_branch_1786d9: note D#, 4 note D_, 3 note D_, 3 note D#, 2 note D_, 4 endchannel -; 1786df -Music_LookMysticalMan_branch_1786df: ; 1786df +Music_LookMysticalMan_branch_1786df: note D#, 4 note D_, 2 note D#, 1 @@ -616,6 +606,3 @@ Music_LookMysticalMan_branch_1786df: ; 1786df note D_, 1 note D_, 1 endchannel -; 1786e8 - - diff --git a/crysaudio/music/lookofficer.asm b/crysaudio/music/lookofficer.asm index 31ff6e67..75e527b7 100644 --- a/crysaudio/music/lookofficer.asm +++ b/crysaudio/music/lookofficer.asm @@ -1,10 +1,9 @@ -Music_LookOfficer: ; ed82d - dbw $80, Music_LookOfficer_Ch1 - dbw $01, Music_LookOfficer_Ch2 - dbw $02, Music_LookOfficer_Ch3 -; ed836 +Music_LookOfficer: + musicheader 3, 1, Music_LookOfficer_Ch1 + musicheader 1, 2, Music_LookOfficer_Ch2 + musicheader 1, 3, Music_LookOfficer_Ch3 -Music_LookOfficer_Ch1: ; ed836 +Music_LookOfficer_Ch1: tempo 116 volume $77 tone $0001 @@ -21,7 +20,7 @@ Music_LookOfficer_Ch1: ; ed836 intensity $2f octave 3 note B_, 16 -Music_LookOfficer_branch_ed852: ; ed852 +Music_LookOfficer_branch_ed852: intensity $82 note __, 4 note B_, 6 @@ -34,9 +33,8 @@ Music_LookOfficer_branch_ed852: ; ed852 note A#, 16 note A_, 16 loopchannel 0, Music_LookOfficer_branch_ed852 -; ed863 -Music_LookOfficer_Ch2: ; ed863 +Music_LookOfficer_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $b7 @@ -61,7 +59,7 @@ Music_LookOfficer_Ch2: ; ed863 note B_, 2 octave 2 note D#, 2 -Music_LookOfficer_branch_ed882: ; ed882 +Music_LookOfficer_branch_ed882: note E_, 2 note G#, 2 octave 3 @@ -73,14 +71,13 @@ Music_LookOfficer_branch_ed882: ; ed882 note E_, 2 note G#, 2 loopchannel 2, Music_LookOfficer_branch_ed882 - forceoctave $1 + pitchoffset 0, C# callchannel Music_LookOfficer_branch_ed89e - forceoctave $0 + pitchoffset 0, C_ callchannel Music_LookOfficer_branch_ed89e loopchannel 0, Music_LookOfficer_branch_ed882 -; ed89e -Music_LookOfficer_branch_ed89e: ; ed89e +Music_LookOfficer_branch_ed89e: octave 1 note A_, 2 octave 2 @@ -96,9 +93,8 @@ Music_LookOfficer_branch_ed89e: ; ed89e octave 2 note C#, 2 endchannel -; ed8ad -Music_LookOfficer_Ch3: ; ed8ad +Music_LookOfficer_Ch3: vibrato $14, $14 stereopanning $f0 notetype $c, $14 @@ -120,7 +116,7 @@ Music_LookOfficer_Ch3: ; ed8ad note C#, 2 note __, 1 note D#, 2 -Music_LookOfficer_branch_ed8c8: ; ed8c8 +Music_LookOfficer_branch_ed8c8: note E_, 6 note D#, 6 note C#, 4 @@ -139,6 +135,3 @@ Music_LookOfficer_branch_ed8c8: ; ed8c8 note E_, 8 note C#, 8 loopchannel 0, Music_LookOfficer_branch_ed8c8 -; ed8dd - - diff --git a/crysaudio/music/lookpokemaniac.asm b/crysaudio/music/lookpokemaniac.asm index 5bbc8639..4c4f8506 100644 --- a/crysaudio/music/lookpokemaniac.asm +++ b/crysaudio/music/lookpokemaniac.asm @@ -1,10 +1,9 @@ -Music_LookPokemaniac: ; ebde1 - dbw $80, Music_LookPokemaniac_Ch1 - dbw $01, Music_LookPokemaniac_Ch2 - dbw $02, Music_LookPokemaniac_Ch3 -; ebdea +Music_LookPokemaniac: + musicheader 3, 1, Music_LookPokemaniac_Ch1 + musicheader 1, 2, Music_LookPokemaniac_Ch2 + musicheader 1, 3, Music_LookPokemaniac_Ch3 -Music_LookPokemaniac_Ch1: ; ebdea +Music_LookPokemaniac_Ch1: stereopanning $f tempo 144 volume $77 @@ -12,7 +11,7 @@ Music_LookPokemaniac_Ch1: ; ebdea tone $0002 notetype $c, $b3 note __, 8 -Music_LookPokemaniac_branch_ebdfb: ; ebdfb +Music_LookPokemaniac_branch_ebdfb: note __, 4 octave 3 note A#, 1 @@ -27,9 +26,8 @@ Music_LookPokemaniac_branch_ebdfb: ; ebdfb note __, 3 loopchannel 4, Music_LookPokemaniac_branch_ebdfb loopchannel 0, Music_LookPokemaniac_branch_ebdfb -; ebe12 -Music_LookPokemaniac_Ch2: ; ebe12 +Music_LookPokemaniac_Ch2: stereopanning $ff vibrato $2, $33 tone $0001 @@ -41,7 +39,7 @@ Music_LookPokemaniac_Ch2: ; ebe12 note C_, 1 octave 1 note A_, 4 -Music_LookPokemaniac_branch_ebe24: ; ebe24 +Music_LookPokemaniac_branch_ebe24: octave 2 note C_, 2 note __, 2 @@ -59,7 +57,7 @@ Music_LookPokemaniac_branch_ebe24: ; ebe24 note D#, 1 note __, 3 loopchannel 2, Music_LookPokemaniac_branch_ebe24 -Music_LookPokemaniac_branch_ebe38: ; ebe38 +Music_LookPokemaniac_branch_ebe38: octave 1 note A_, 2 note __, 2 @@ -79,9 +77,8 @@ Music_LookPokemaniac_branch_ebe38: ; ebe38 note __, 3 loopchannel 2, Music_LookPokemaniac_branch_ebe38 loopchannel 0, Music_LookPokemaniac_branch_ebe24 -; ebe51 -Music_LookPokemaniac_Ch3: ; ebe51 +Music_LookPokemaniac_Ch3: stereopanning $f0 vibrato $6, $33 notetype $c, $15 @@ -93,15 +90,14 @@ Music_LookPokemaniac_Ch3: ; ebe51 octave 5 note C_, 4 intensity $10 -Music_LookPokemaniac_branch_ebe62: ; ebe62 +Music_LookPokemaniac_branch_ebe62: callchannel Music_LookPokemaniac_branch_ebe70 intensity $14 callchannel Music_LookPokemaniac_branch_ebe70 intensity $10 loopchannel 0, Music_LookPokemaniac_branch_ebe62 -; ebe70 -Music_LookPokemaniac_branch_ebe70: ; ebe70 +Music_LookPokemaniac_branch_ebe70: note A#, 6 note A_, 2 note G#, 2 @@ -161,6 +157,3 @@ Music_LookPokemaniac_branch_ebe70: ; ebe70 note C_, 1 note __, 1 endchannel -; ebeab - - diff --git a/crysaudio/music/lookrival.asm b/crysaudio/music/lookrival.asm index d86eb074..5eff9991 100644 --- a/crysaudio/music/lookrival.asm +++ b/crysaudio/music/lookrival.asm @@ -1,11 +1,10 @@ -Music_LookRival: ; f4f79 - dbw $c0, Music_LookRival_Ch1 - dbw $01, Music_LookRival_Ch2 - dbw $02, Music_LookRival_Ch3 - dbw $03, Music_LookRival_Ch4 -; f4f85 +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 -Music_LookRival_Ch1: ; f4f85 +Music_LookRival_Ch1: tempo 112 volume $77 dutycycle $1 @@ -34,8 +33,8 @@ Music_LookRival_Ch1: ; f4f85 note G#, 8 intensity $a6 note F#, 8 -Music_AfterTheRivalFight_branch_f4fb1: ; f4fb1 -Music_LookRival_branch_f4fb1: ; f4fb1 +Music_AfterTheRivalFight_branch_f4fb1: +Music_LookRival_branch_f4fb1: intensity $b5 note F_, 4 note D#, 2 @@ -99,7 +98,7 @@ Music_LookRival_branch_f4fb1: ; f4fb1 note G#, 8 note F_, 6 note C_, 2 -Music_LookRival_branch_f4ff7: ; f4ff7 +Music_LookRival_branch_f4ff7: intensity $b2 note F_, 6 intensity $b7 @@ -115,9 +114,8 @@ Music_LookRival_branch_f4ff7: ; f4ff7 note G#, 6 note F#, 4 loopchannel 0, Music_LookRival_branch_f4fb1 -; f5010 -Music_LookRival_Ch2: ; f5010 +Music_LookRival_Ch2: dutycycle $3 vibrato $8, $36 stereopanning $f0 @@ -138,8 +136,8 @@ Music_LookRival_Ch2: ; f5010 note D#, 10 intensity $b7 note D#, 16 -Music_AfterTheRivalFight_branch_f502e: ; f502e -Music_LookRival_branch_f502e: ; f502e +Music_AfterTheRivalFight_branch_f502e: +Music_LookRival_branch_f502e: intensity $c7 note C_, 12 intensity $c4 @@ -192,7 +190,7 @@ Music_LookRival_branch_f502e: ; f502e note D#, 1 note D_, 1 note D#, 2 -Music_LookRival_branch_f5070: ; f5070 +Music_LookRival_branch_f5070: intensity $c2 note C_, 6 intensity $c7 @@ -205,9 +203,8 @@ Music_LookRival_branch_f5070: ; f5070 intensity $c7 note D#, 10 loopchannel 0, Music_LookRival_branch_f502e -; f5086 -Music_LookRival_Ch3: ; f5086 +Music_LookRival_Ch3: notetype $c, $28 note __, 2 octave 4 @@ -229,8 +226,8 @@ Music_LookRival_Ch3: ; f5086 note C_, 2 note D#, 2 note F#, 2 -Music_AfterTheRivalFight_branch_f509d: ; f509d -Music_LookRival_branch_f509d: ; f509d +Music_AfterTheRivalFight_branch_f509d: +Music_LookRival_branch_f509d: callchannel Music_LookRival_branch_f50ef loopchannel 3, Music_LookRival_branch_f509d note F_, 4 @@ -293,9 +290,8 @@ Music_LookRival_branch_f509d: ; f509d note F#, 2 note E_, 2 loopchannel 0, Music_LookRival_branch_f509d -; f50ef -Music_LookRival_branch_f50ef: ; f50ef +Music_LookRival_branch_f50ef: note F_, 2 note C_, 2 note D_, 2 @@ -304,9 +300,8 @@ Music_LookRival_branch_f50ef: ; f50ef note D_, 2 note D#, 2 endchannel -; f50f7 -Music_LookRival_branch_f50f7: ; f50f7 +Music_LookRival_branch_f50f7: note A#, 2 note F_, 2 note G_, 2 @@ -315,9 +310,8 @@ Music_LookRival_branch_f50f7: ; f50f7 note G_, 2 note G#, 2 endchannel -; f50ff -Music_LookRival_branch_f50ff: ; f50ff +Music_LookRival_branch_f50ff: note A#, 4 note F_, 2 note G#, 4 @@ -325,9 +319,8 @@ Music_LookRival_branch_f50ff: ; f50ff note G_, 2 note G#, 2 endchannel -; f5106 -Music_LookRival_Ch4: ; f5106 +Music_LookRival_Ch4: stereopanning $f0 togglenoise $3 notetype $c @@ -343,8 +336,8 @@ Music_LookRival_Ch4: ; f5106 note D_, 2 note D_, 2 note D_, 2 -Music_AfterTheRivalFight_branch_f5118: ; f5118 -Music_LookRival_branch_f5118: ; f5118 +Music_AfterTheRivalFight_branch_f5118: +Music_LookRival_branch_f5118: note D#, 4 note D_, 2 note D#, 4 @@ -357,6 +350,3 @@ Music_LookRival_branch_f5118: ; f5118 note D_, 2 note D_, 2 loopchannel 0, Music_LookRival_branch_f5118 -; f5127 - - diff --git a/crysaudio/music/lookrocket.asm b/crysaudio/music/lookrocket.asm index d02c7f5f..bd0c0e43 100644 --- a/crysaudio/music/lookrocket.asm +++ b/crysaudio/music/lookrocket.asm @@ -1,14 +1,13 @@ -Music_LookRocket: ; f74a2 - dbw $c0, Music_LookRocket_Ch1 - dbw $01, Music_LookRocket_Ch2 - dbw $02, Music_LookRocket_Ch3 - dbw $03, Music_LookRocket_Ch4 -; f74ae +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 -Music_LookRocket_Ch1: ; f74ae +Music_LookRocket_Ch1: tempo 123 volume $77 - forceoctave $2 + pitchoffset 0, D_ stereopanning $f dutycycle $3 vibrato $5, $64 @@ -18,7 +17,7 @@ Music_LookRocket_Ch1: ; f74ae note D_, 1 callchannel Music_LookRocket_branch_f74e6 dutycycle $1 -Music_LookRocket_branch_f74c7: ; f74c7 +Music_LookRocket_branch_f74c7: intensity $a8 callchannel Music_LookRocket_branch_f74f7 callchannel Music_LookRocket_branch_f758a @@ -33,10 +32,9 @@ Music_LookRocket_branch_f74c7: ; f74c7 callchannel Music_LookRocket_branch_f750c note __, 16 loopchannel 0, Music_LookRocket_branch_f74c7 -; f74e6 -Music_LookRocket_branch_f74e6: ; f74e6 -Music_RocketTheme_branch_f74e6: ; f74e6 +Music_LookRocket_branch_f74e6: +Music_RocketTheme_branch_f74e6: note D#, 1 note __, 1 note D_, 1 @@ -54,10 +52,9 @@ Music_RocketTheme_branch_f74e6: ; f74e6 note F_, 1 note G#, 1 endchannel -; f74f7 -Music_LookRocket_branch_f74f7: ; f74f7 -Music_RocketTheme_branch_f74f7: ; f74f7 +Music_LookRocket_branch_f74f7: +Music_RocketTheme_branch_f74f7: note __, 2 octave 3 note D#, 1 @@ -79,10 +76,9 @@ Music_RocketTheme_branch_f74f7: ; f74f7 note F#, 1 note __, 1 endchannel -; f750c -Music_LookRocket_branch_f750c: ; f750c -Music_RocketTheme_branch_f750c: ; f750c +Music_LookRocket_branch_f750c: +Music_RocketTheme_branch_f750c: note __, 2 octave 2 note B_, 1 @@ -91,10 +87,9 @@ Music_RocketTheme_branch_f750c: ; f750c note C_, 1 note __, 5 endchannel -; f7514 -Music_LookRocket_Ch2: ; f7514 - forceoctave $2 +Music_LookRocket_Ch2: + pitchoffset 0, D_ vibrato $4, $64 dutycycle $3 notetype $c, $b7 @@ -103,7 +98,7 @@ Music_LookRocket_Ch2: ; f7514 note C_, 1 note D_, 1 callchannel Music_LookRocket_branch_f7547 -Music_LookRocket_branch_f7526: ; f7526 +Music_LookRocket_branch_f7526: intensity $b7 callchannel Music_LookRocket_branch_f758a octave 5 @@ -118,10 +113,9 @@ Music_LookRocket_branch_f7526: ; f7526 callchannel Music_LookRocket_branch_f7568 callchannel Music_LookRocket_branch_f756f loopchannel 0, Music_LookRocket_branch_f7526 -; f7547 -Music_LookRocket_branch_f7547: ; f7547 -Music_RocketTheme_branch_f7547: ; f7547 +Music_LookRocket_branch_f7547: +Music_RocketTheme_branch_f7547: note D#, 1 note __, 1 note D_, 1 @@ -134,10 +128,9 @@ Music_RocketTheme_branch_f7547: ; f7547 note B_, 6 dutycycle $0 endchannel -; f7554 -Music_LookRocket_branch_f7554: ; f7554 -Music_RocketTheme_branch_f7554: ; f7554 +Music_LookRocket_branch_f7554: +Music_RocketTheme_branch_f7554: note __, 2 octave 4 note D#, 1 @@ -158,10 +151,9 @@ Music_RocketTheme_branch_f7554: ; f7554 note D#, 1 note __, 1 endchannel -; f7568 -Music_LookRocket_branch_f7568: ; f7568 -Music_RocketTheme_branch_f7568: ; f7568 +Music_LookRocket_branch_f7568: +Music_RocketTheme_branch_f7568: note __, 2 octave 3 note F_, 1 @@ -169,10 +161,9 @@ Music_RocketTheme_branch_f7568: ; f7568 note F#, 1 note __, 5 endchannel -; f756f -Music_LookRocket_branch_f756f: ; f756f -Music_RocketTheme_branch_f756f: ; f756f +Music_LookRocket_branch_f756f: +Music_RocketTheme_branch_f756f: intensity $63 note G#, 1 note F_, 1 @@ -196,10 +187,9 @@ Music_RocketTheme_branch_f756f: ; f756f note F_, 1 note D_, 1 endchannel -; f758a -Music_LookRocket_branch_f758a: ; f758a -Music_RocketTheme_branch_f758a: ; f758a +Music_LookRocket_branch_f758a: +Music_RocketTheme_branch_f758a: octave 3 note __, 2 note G_, 1 @@ -213,16 +203,15 @@ Music_RocketTheme_branch_f758a: ; f758a note A_, 1 note __, 1 endchannel -; f7597 -Music_LookRocket_Ch3: ; f7597 - forceoctave $2 +Music_LookRocket_Ch3: + pitchoffset 0, D_ vibrato $4, $22 notetype $c, $14 stereopanning $f0 note __, 2 callchannel Music_LookRocket_branch_f75bf -Music_LookRocket_branch_f75a5: ; f75a5 +Music_LookRocket_branch_f75a5: callchannel Music_LookRocket_branch_f75fe callchannel Music_LookRocket_branch_f75fe intensity $24 @@ -232,10 +221,9 @@ Music_LookRocket_branch_f75a5: ; f75a5 callchannel Music_LookRocket_branch_f7623 callchannel Music_LookRocket_branch_f75e1 loopchannel 0, Music_LookRocket_branch_f75a5 -; f75bf -Music_LookRocket_branch_f75bf: ; f75bf -Music_RocketTheme_branch_f75bf: ; f75bf +Music_LookRocket_branch_f75bf: +Music_RocketTheme_branch_f75bf: octave 3 note F_, 1 note __, 1 @@ -249,10 +237,9 @@ Music_RocketTheme_branch_f75bf: ; f75bf octave 3 note D_, 6 endchannel -; f75cc -Music_LookRocket_branch_f75cc: ; f75cc -Music_RocketTheme_branch_f75cc: ; f75cc +Music_LookRocket_branch_f75cc: +Music_RocketTheme_branch_f75cc: octave 2 note G#, 1 note __, 1 @@ -274,10 +261,9 @@ Music_RocketTheme_branch_f75cc: ; f75cc note F#, 1 note __, 1 endchannel -; f75e1 -Music_LookRocket_branch_f75e1: ; f75e1 -Music_RocketTheme_branch_f75e1: ; f75e1 +Music_LookRocket_branch_f75e1: +Music_RocketTheme_branch_f75e1: intensity $24 octave 2 note G#, 1 @@ -305,10 +291,9 @@ Music_RocketTheme_branch_f75e1: ; f75e1 note G#, 1 note __, 1 endchannel -; f75fe -Music_LookRocket_branch_f75fe: ; f75fe -Music_RocketTheme_branch_f75fe: ; f75fe +Music_LookRocket_branch_f75fe: +Music_RocketTheme_branch_f75fe: note C_, 1 note __, 1 octave 4 @@ -346,10 +331,9 @@ Music_RocketTheme_branch_f75fe: ; f75fe note A_, 1 note __, 1 endchannel -; f7623 -Music_LookRocket_branch_f7623: ; f7623 -Music_RocketTheme_branch_f7623: ; f7623 +Music_LookRocket_branch_f7623: +Music_RocketTheme_branch_f7623: octave 2 note G#, 1 note __, 1 @@ -371,14 +355,13 @@ Music_RocketTheme_branch_f7623: ; f7623 note D#, 1 note C_, 1 endchannel -; f7638 -Music_LookRocket_Ch4: ; f7638 +Music_LookRocket_Ch4: togglenoise $3 notetype $c note __, 2 callchannel Music_LookRocket_branch_f765c -Music_LookRocket_branch_f7640: ; f7640 +Music_LookRocket_branch_f7640: callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f7664 @@ -388,10 +371,9 @@ Music_LookRocket_branch_f7640: ; f7640 callchannel Music_LookRocket_branch_f7664 callchannel Music_LookRocket_branch_f765c loopchannel 0, Music_LookRocket_branch_f7640 -; f765c -Music_LookRocket_branch_f765c: ; f765c -Music_RocketTheme_branch_f765c: ; f765c +Music_LookRocket_branch_f765c: +Music_RocketTheme_branch_f765c: note C_, 8 note D_, 2 note D#, 2 @@ -400,10 +382,9 @@ Music_RocketTheme_branch_f765c: ; f765c note D_, 1 note D_, 1 endchannel -; f7664 -Music_LookRocket_branch_f7664: ; f7664 -Music_RocketTheme_branch_f7664: ; f7664 +Music_LookRocket_branch_f7664: +Music_RocketTheme_branch_f7664: note D#, 2 note F#, 2 note D_, 2 @@ -413,6 +394,3 @@ Music_RocketTheme_branch_f7664: ; f7664 note D_, 2 note F#, 2 endchannel -; f766d - - diff --git a/crysaudio/music/looksage.asm b/crysaudio/music/looksage.asm index f815d212..e1b51c39 100644 --- a/crysaudio/music/looksage.asm +++ b/crysaudio/music/looksage.asm @@ -1,9 +1,8 @@ -Music_LookSage: ; ee35e - dbw $40, Music_LookSage_Ch1 - dbw $02, Music_LookSage_Ch3 -; ee364 +Music_LookSage: + musicheader 2, 1, Music_LookSage_Ch1 + musicheader 1, 3, Music_LookSage_Ch3 -Music_LookSage_Ch1: ; ee364 +Music_LookSage_Ch1: tempo 144 stereopanning $f volume $77 @@ -29,7 +28,7 @@ Music_LookSage_Ch1: ; ee364 note F_, 2 intensity $93 note F_, 2 -Music_LookSage_branch_ee38e: ; ee38e +Music_LookSage_branch_ee38e: intensity $b3 note D_, 2 intensity $93 @@ -101,9 +100,8 @@ Music_LookSage_branch_ee38e: ; ee38e note B_, 2 callchannel Music_LookSage_branch_ee3fa loopchannel 0, Music_LookSage_branch_ee38e -; ee3fa -Music_LookSage_branch_ee3fa: ; ee3fa +Music_LookSage_branch_ee3fa: intensity $b3 octave 2 note E_, 2 @@ -122,9 +120,8 @@ Music_LookSage_branch_ee3fa: ; ee3fa intensity $93 note A_, 2 endchannel -; ee414 -Music_LookSage_Ch3: ; ee414 +Music_LookSage_Ch3: stereopanning $f0 vibrato $16, $23 notetype $c, $10 @@ -144,7 +141,7 @@ Music_LookSage_Ch3: ; ee414 note E_, 14 note G_, 1 note G#, 1 -Music_LookSage_branch_ee430: ; ee430 +Music_LookSage_branch_ee430: note A_, 12 note B_, 4 note D_, 9 @@ -179,6 +176,3 @@ Music_LookSage_branch_ee430: ; ee430 note G_, 1 note G#, 1 loopchannel 0, Music_LookSage_branch_ee430 -; ee45f - - diff --git a/crysaudio/music/lookyoungster.asm b/crysaudio/music/lookyoungster.asm index ff932f8f..e835d5fe 100644 --- a/crysaudio/music/lookyoungster.asm +++ b/crysaudio/music/lookyoungster.asm @@ -1,10 +1,9 @@ -Music_LookYoungster: ; f66c3 - dbw $80, Music_LookYoungster_Ch1 - dbw $01, Music_LookYoungster_Ch2 - dbw $02, Music_LookYoungster_Ch3 -; f66cc +Music_LookYoungster: + musicheader 3, 1, Music_LookYoungster_Ch1 + musicheader 1, 2, Music_LookYoungster_Ch2 + musicheader 1, 3, Music_LookYoungster_Ch3 -Music_LookYoungster_Ch1: ; f66cc +Music_LookYoungster_Ch1: tempo 118 volume $77 stereopanning $f @@ -25,7 +24,7 @@ Music_LookYoungster_Ch1: ; f66cc note __, 2 note C_, 6 intensity $b3 -Music_LookYoungster_branch_f66ea: ; f66ea +Music_LookYoungster_branch_f66ea: note __, 2 octave 3 note G_, 1 @@ -59,12 +58,10 @@ Music_LookYoungster_branch_f66ea: ; f66ea note __, 1 note __, 16 loopchannel 0, Music_LookYoungster_branch_f66ea -; f670e + db $ff - - -Music_LookYoungster_Ch2: ; f670f +Music_LookYoungster_Ch2: stereopanning $f0 vibrato $12, $26 dutycycle $1 @@ -85,7 +82,7 @@ Music_LookYoungster_Ch2: ; f670f note F_, 4 note __, 2 note F#, 6 -Music_LookYoungster_branch_f672f: ; f672f +Music_LookYoungster_branch_f672f: dutycycle $3 intensity $b3 note __, 2 @@ -159,12 +156,10 @@ Music_LookYoungster_branch_f672f: ; f672f note C_, 1 note __, 1 loopchannel 0, Music_LookYoungster_branch_f672f -; f6783 + db $ff - - -Music_LookYoungster_Ch3: ; f6784 +Music_LookYoungster_Ch3: stereopanning $ff vibrato $2, $24 notetype $c, $25 @@ -200,7 +195,7 @@ Music_LookYoungster_Ch3: ; f6784 note __, 2 note G#, 6 intensity $25 -Music_LookYoungster_branch_f67ae: ; f67ae +Music_LookYoungster_branch_f67ae: octave 2 note G_, 1 note __, 1 @@ -296,9 +291,5 @@ Music_LookYoungster_branch_f67ae: ; f67ae note G#, 1 note __, 1 loopchannel 0, Music_LookYoungster_branch_f67ae -; f6810 - - - - + db $ff diff --git a/crysaudio/music/magnettrain.asm b/crysaudio/music/magnettrain.asm index a3686a89..fd4229cb 100644 --- a/crysaudio/music/magnettrain.asm +++ b/crysaudio/music/magnettrain.asm @@ -1,12 +1,11 @@ -Music_MagnetTrain: ; ef5f0 - dbw $c0, Music_MagnetTrain_Ch1 - dbw $01, Music_MagnetTrain_Ch2 - dbw $02, Music_MagnetTrain_Ch3 - dbw $03, Music_MagnetTrain_Ch4 -; ef5fc +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 -Music_MagnetTrain_Ch1: ; ef5fc - ftempo 110 +Music_MagnetTrain_Ch1: + tempo 110 volume $77 stereopanning $f vibrato $14, $23 @@ -68,9 +67,8 @@ Music_MagnetTrain_Ch1: ; ef5fc notetype $c, $b7 note D_, 16 endchannel -; ef648 -Music_MagnetTrain_Ch2: ; ef648 +Music_MagnetTrain_Ch2: vibrato $14, $23 dutycycle $1 notetype $c, $d2 @@ -107,9 +105,8 @@ Music_MagnetTrain_Ch2: ; ef648 notetype $c, $d7 note A_, 16 endchannel -; ef67d -Music_MagnetTrain_Ch3: ; ef67d +Music_MagnetTrain_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $15 @@ -224,9 +221,8 @@ Music_MagnetTrain_Ch3: ; ef67d octave 2 note D_, 16 endchannel -; ef6f4 -Music_MagnetTrain_Ch4: ; ef6f4 +Music_MagnetTrain_Ch4: togglenoise $3 notetype $c note B_, 12 @@ -248,12 +244,24 @@ Music_MagnetTrain_Ch4: ; ef6f4 notetype $c note B_, 16 endchannel -; ef711 +; 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 - - -Music_MagnetTrain_branch_ef71e: ; ef71e +Music_MagnetTrain_branch_ef71e: note G#, 2 note G_, 2 note G_, 2 @@ -271,6 +279,3 @@ Music_MagnetTrain_branch_ef71e: ; ef71e note G_, 2 note G_, 2 endchannel -; ef72f - - diff --git a/crysaudio/music/mainmenu.asm b/crysaudio/music/mainmenu.asm index 8ed8d4d6..b787a5ea 100644 --- a/crysaudio/music/mainmenu.asm +++ b/crysaudio/music/mainmenu.asm @@ -1,11 +1,10 @@ -Music_MainMenu: ; f78fd - dbw $c0, Music_MainMenu_Ch1 - dbw $01, Music_MainMenu_Ch2 - dbw $02, Music_MainMenu_Ch3 - dbw $03, Music_MainMenu_Ch4 -; f7909 +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 -Music_MainMenu_Ch1: ; f7909 +Music_MainMenu_Ch1: tempo 160 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_MainMenu_Ch1: ; f7909 notetype $c, $f octave 3 note D_, 8 -Music_MainMenu_branch_f791d: ; f791d +Music_MainMenu_branch_f791d: notetype $c, $92 octave 3 note C#, 6 @@ -41,15 +40,14 @@ Music_MainMenu_branch_f791d: ; f791d octave 3 note C_, 4 loopchannel 0, Music_MainMenu_branch_f791d -; f7940 -Music_MainMenu_Ch2: ; f7940 +Music_MainMenu_Ch2: dutycycle $3 stereopanning $f notetype $c, $f octave 3 note G_, 8 -Music_MainMenu_branch_f7949: ; f7949 +Music_MainMenu_branch_f7949: notetype $c, $a2 note F#, 6 note F#, 1 @@ -72,13 +70,12 @@ Music_MainMenu_branch_f7949: ; f7949 notetype $c, $a4 note F_, 4 loopchannel 0, Music_MainMenu_branch_f7949 -; f7969 -Music_MainMenu_Ch3: ; f7969 +Music_MainMenu_Ch3: stereopanning $f0 notetype $c, $25 note __, 8 -Music_MainMenu_branch_f796f: ; f796f +Music_MainMenu_branch_f796f: octave 2 note F#, 1 note __, 5 @@ -112,9 +109,8 @@ Music_MainMenu_branch_f796f: ; f796f note F_, 1 note __, 3 loopchannel 0, Music_MainMenu_branch_f796f -; f7996 -Music_MainMenu_Ch4: ; f7996 +Music_MainMenu_Ch4: stereopanning $f togglenoise $3 notetype $c @@ -127,7 +123,7 @@ Music_MainMenu_Ch4: ; f7996 note D_, 1 note D_, 1 note D_, 1 -Music_MainMenu_branch_f79a5: ; f79a5 +Music_MainMenu_branch_f79a5: note D_, 6 note D_, 1 note D_, 1 @@ -144,6 +140,3 @@ Music_MainMenu_branch_f79a5: ; f79a5 note D_, 1 note D_, 1 loopchannel 0, Music_MainMenu_branch_f79a5 -; f79b8 - - diff --git a/crysaudio/music/mobileadapter.asm b/crysaudio/music/mobileadapter.asm index 6c0c7ca7..26c64cff 100644 --- a/crysaudio/music/mobileadapter.asm +++ b/crysaudio/music/mobileadapter.asm @@ -1,11 +1,10 @@ -Music_MobileAdapter: ; 1fc87 - dbw $c0, Music_MobileAdapter_Ch1 - dbw $01, Music_MobileAdapter_Ch2 - dbw $02, Music_MobileAdapter_Ch3 - dbw $03, Music_MobileAdapter_Ch4 -; 1fc93 +Music_MobileAdapter: + musicheader 4, 1, Music_MobileAdapter_Ch1 + musicheader 1, 2, Music_MobileAdapter_Ch2 + musicheader 1, 3, Music_MobileAdapter_Ch3 + musicheader 1, 4, Music_MobileAdapter_Ch4 -Music_MobileAdapter_Ch1: ; 1fc93 +Music_MobileAdapter_Ch1: tempo 132 volume $77 tone $0001 @@ -23,7 +22,7 @@ Music_MobileAdapter_Ch1: ; 1fc93 note D_, 1 note __, 1 note C#, 4 -Music_MobileAdapter_branch_1fcad: ; 1fcad +Music_MobileAdapter_branch_1fcad: callchannel Music_MobileAdapter_branch_1fd39 note D_, 1 note C#, 1 @@ -147,9 +146,8 @@ Music_MobileAdapter_branch_1fcad: ; 1fcad intensity $77 callchannel Music_MobileAdapter_branch_1ff09 loopchannel 0, Music_MobileAdapter_branch_1fcad -; 1fd39 -Music_MobileAdapter_branch_1fd39: ; 1fd39 +Music_MobileAdapter_branch_1fd39: intensity $94 octave 4 note F#, 1 @@ -190,9 +188,8 @@ Music_MobileAdapter_branch_1fd39: ; 1fd39 octave 4 note C#, 1 endchannel -; 1fd63 -Music_MobileAdapter_Ch2: ; 1fd63 +Music_MobileAdapter_Ch2: notetype $c, $c1 vibrato $10, $23 dutycycle $2 @@ -216,7 +213,7 @@ Music_MobileAdapter_Ch2: ; 1fd63 octave 4 note D_, 1 note F#, 1 -Music_MobileAdapter_branch_1fd80: ; 1fd80 +Music_MobileAdapter_branch_1fd80: callchannel Music_MobileAdapter_branch_1fdfe note A_, 4 note G_, 4 @@ -324,9 +321,8 @@ Music_MobileAdapter_branch_1fd80: ; 1fd80 note D_, 1 note F#, 1 loopchannel 0, Music_MobileAdapter_branch_1fd80 -; 1fdfe -Music_MobileAdapter_branch_1fdfe: ; 1fdfe +Music_MobileAdapter_branch_1fdfe: note A_, 1 note __, 1 note A_, 1 @@ -351,9 +347,8 @@ Music_MobileAdapter_branch_1fdfe: ; 1fdfe octave 4 note B_, 2 endchannel -; 1fe16 -Music_MobileAdapter_branch_1fe16: ; 1fe16 +Music_MobileAdapter_branch_1fe16: octave 5 note F#, 1 note D_, 1 @@ -393,9 +388,8 @@ Music_MobileAdapter_branch_1fe16: ; 1fe16 octave 5 note C#, 4 endchannel -; 1fe3d -Music_MobileAdapter_Ch3: ; 1fe3d +Music_MobileAdapter_Ch3: notetype $c, $14 note __, 2 octave 3 @@ -412,7 +406,7 @@ Music_MobileAdapter_Ch3: ; 1fe3d note E_, 1 note __, 1 note A_, 4 -Music_MobileAdapter_branch_1fe4f: ; 1fe4f +Music_MobileAdapter_branch_1fe4f: callchannel Music_MobileAdapter_branch_1fecf callchannel Music_MobileAdapter_branch_1fee3 callchannel Music_MobileAdapter_branch_1feee @@ -516,16 +510,15 @@ Music_MobileAdapter_branch_1fe4f: ; 1fe4f note D_, 4 callchannel Music_MobileAdapter_branch_1ff09 loopchannel 0, Music_MobileAdapter_branch_1fe4f -; 1fecf -Music_MobileAdapter_branch_1fecf: ; 1fecf +Music_MobileAdapter_branch_1fecf: octave 3 note D_, 1 note __, 1 note A_, 1 note __, 1 loopchannel 4, Music_MobileAdapter_branch_1fecf -Music_MobileAdapter_branch_1fed8: ; 1fed8 +Music_MobileAdapter_branch_1fed8: octave 2 note G_, 1 note __, 1 @@ -534,9 +527,8 @@ Music_MobileAdapter_branch_1fed8: ; 1fed8 note __, 1 loopchannel 4, Music_MobileAdapter_branch_1fed8 endchannel -; 1fee3 -Music_MobileAdapter_branch_1fee3: ; 1fee3 +Music_MobileAdapter_branch_1fee3: octave 2 note A_, 1 note __, 1 @@ -545,9 +537,8 @@ Music_MobileAdapter_branch_1fee3: ; 1fee3 note __, 1 loopchannel 4, Music_MobileAdapter_branch_1fee3 endchannel -; 1feee -Music_MobileAdapter_branch_1feee: ; 1feee +Music_MobileAdapter_branch_1feee: note D_, 1 note __, 1 note A_, 1 @@ -557,9 +548,8 @@ Music_MobileAdapter_branch_1feee: ; 1feee note A_, 1 note __, 1 endchannel -; 1fef7 -Music_MobileAdapter_branch_1fef7: ; 1fef7 +Music_MobileAdapter_branch_1fef7: octave 2 note A_, 1 note __, 1 @@ -578,9 +568,8 @@ Music_MobileAdapter_branch_1fef7: ; 1fef7 octave 2 note A_, 4 endchannel -; 1ff09 -Music_MobileAdapter_branch_1ff09: ; 1ff09 +Music_MobileAdapter_branch_1ff09: octave 2 note A_, 1 note __, 1 @@ -613,9 +602,8 @@ Music_MobileAdapter_branch_1ff09: ; 1ff09 note __, 6 loopchannel 2, Music_MobileAdapter_branch_1ff09 endchannel -; 1ff2c -Music_MobileAdapter_Ch4: ; 1ff2c +Music_MobileAdapter_Ch4: togglenoise $3 stereopanning $f0 notetype $c @@ -625,10 +613,10 @@ Music_MobileAdapter_Ch4: ; 1ff2c note D_, 2 note D_, 1 note D_, 1 -Music_MobileAdapter_branch_1ff38: ; 1ff38 +Music_MobileAdapter_branch_1ff38: callchannel Music_MobileAdapter_branch_1ff60 callchannel Music_MobileAdapter_branch_1ff60 -Music_MobileAdapter_branch_1ff3e: ; 1ff3e +Music_MobileAdapter_branch_1ff3e: note __, 4 note D_, 8 note D_, 8 @@ -637,7 +625,7 @@ Music_MobileAdapter_branch_1ff3e: ; 1ff3e note D_, 3 note D_, 4 loopchannel 2, Music_MobileAdapter_branch_1ff3e -Music_MobileAdapter_branch_1ff49: ; 1ff49 +Music_MobileAdapter_branch_1ff49: note __, 4 note D_, 4 loopchannel 11, Music_MobileAdapter_branch_1ff49 @@ -655,9 +643,8 @@ Music_MobileAdapter_branch_1ff49: ; 1ff49 note D_, 1 note D_, 1 loopchannel 0, Music_MobileAdapter_branch_1ff38 -; 1ff60 -Music_MobileAdapter_branch_1ff60: ; 1ff60 +Music_MobileAdapter_branch_1ff60: note __, 4 note D_, 4 loopchannel 7, Music_MobileAdapter_branch_1ff60 @@ -667,5 +654,3 @@ Music_MobileAdapter_branch_1ff60: ; 1ff60 note D_, 1 note D_, 1 endchannel -; 1ff6c - diff --git a/crysaudio/music/mobileadaptermenu.asm b/crysaudio/music/mobileadaptermenu.asm index 90086aa6..1573076f 100644 --- a/crysaudio/music/mobileadaptermenu.asm +++ b/crysaudio/music/mobileadaptermenu.asm @@ -1,10 +1,9 @@ -Music_MobileAdapterMenu: ; 17801f - dbw $80, Music_MobileAdapterMenu_Ch1 - dbw $01, Music_MobileAdapterMenu_Ch2 - dbw $02, Music_MobileAdapterMenu_Ch3 -; 178028 +Music_MobileAdapterMenu: + musicheader 3, 1, Music_MobileAdapterMenu_Ch1 + musicheader 1, 2, Music_MobileAdapterMenu_Ch2 + musicheader 1, 3, Music_MobileAdapterMenu_Ch3 -Music_MobileAdapterMenu_Ch1: ; 178028 +Music_MobileAdapterMenu_Ch1: tempo 168 volume $77 tone $0001 @@ -12,7 +11,7 @@ Music_MobileAdapterMenu_Ch1: ; 178028 dutycycle $2 notetype $c, $66 note __, 2 -Music_MobileAdapterMenu_branch_178038: ; 178038 +Music_MobileAdapterMenu_branch_178038: callchannel Music_MobileAdapterMenu_branch_178057 callchannel Music_MobileAdapterMenu_branch_178076 octave 3 @@ -33,9 +32,8 @@ Music_MobileAdapterMenu_branch_178038: ; 178038 note D#, 8 callchannel Music_MobileAdapterMenu_branch_178057 loopchannel 0, Music_MobileAdapterMenu_branch_178038 -; 178057 -Music_MobileAdapterMenu_branch_178057: ; 178057 +Music_MobileAdapterMenu_branch_178057: octave 3 note G#, 7 octave 4 @@ -67,9 +65,8 @@ Music_MobileAdapterMenu_branch_178057: ; 178057 note A_, 1 note G#, 8 endchannel -; 178076 -Music_MobileAdapterMenu_branch_178076: ; 178076 +Music_MobileAdapterMenu_branch_178076: note E_, 1 note __, 1 note A_, 1 @@ -84,16 +81,15 @@ Music_MobileAdapterMenu_branch_178076: ; 178076 note __, 1 note C#, 4 endchannel -; 178084 -Music_MobileAdapterMenu_Ch2: ; 178084 +Music_MobileAdapterMenu_Ch2: stereopanning $f0 notetype $c, $84 dutycycle $2 octave 4 note E_, 1 note G#, 1 -Music_MobileAdapterMenu_branch_17808e: ; 17808e +Music_MobileAdapterMenu_branch_17808e: callchannel Music_MobileAdapterMenu_branch_1780ae note E_, 8 callchannel Music_MobileAdapterMenu_branch_1780d7 @@ -115,9 +111,8 @@ Music_MobileAdapterMenu_branch_17808e: ; 17808e note E_, 1 note G#, 1 loopchannel 0, Music_MobileAdapterMenu_branch_17808e -; 1780ae -Music_MobileAdapterMenu_branch_1780ae: ; 1780ae +Music_MobileAdapterMenu_branch_1780ae: octave 4 note B_, 1 note __, 1 @@ -159,9 +154,8 @@ Music_MobileAdapterMenu_branch_1780ae: ; 1780ae note C#, 3 note D#, 1 endchannel -; 1780d7 -Music_MobileAdapterMenu_branch_1780d7: ; 1780d7 +Music_MobileAdapterMenu_branch_1780d7: note A_, 1 note __, 1 note A_, 1 @@ -173,13 +167,12 @@ Music_MobileAdapterMenu_branch_1780d7: ; 1780d7 note __, 1 note E_, 4 endchannel -; 1780e2 -Music_MobileAdapterMenu_Ch3: ; 1780e2 +Music_MobileAdapterMenu_Ch3: vibrato $8, $34 notetype $c, $25 note __, 2 -Music_MobileAdapterMenu_branch_1780e9: ; 1780e9 +Music_MobileAdapterMenu_branch_1780e9: callchannel Music_MobileAdapterMenu_branch_178119 octave 2 note B_, 1 @@ -217,9 +210,8 @@ Music_MobileAdapterMenu_branch_1780e9: ; 1780e9 callchannel Music_MobileAdapterMenu_branch_178119 note __, 2 loopchannel 0, Music_MobileAdapterMenu_branch_1780e9 -; 178119 -Music_MobileAdapterMenu_branch_178119: ; 178119 +Music_MobileAdapterMenu_branch_178119: octave 3 note E_, 2 note __, 2 @@ -263,9 +255,8 @@ Music_MobileAdapterMenu_branch_178119: ; 178119 note E_, 3 intensity $25 endchannel -; 178146 -Music_MobileAdapterMenu_branch_178146: ; 178146 +Music_MobileAdapterMenu_branch_178146: note A_, 2 note __, 2 octave 3 @@ -279,6 +270,3 @@ Music_MobileAdapterMenu_branch_178146: ; 178146 octave 3 note A_, 4 endchannel -; 178153 - - diff --git a/crysaudio/music/mobilecenter.asm b/crysaudio/music/mobilecenter.asm index 0adc750a..0f9d3b9a 100644 --- a/crysaudio/music/mobilecenter.asm +++ b/crysaudio/music/mobilecenter.asm @@ -1,11 +1,10 @@ -Music_MobileCenter: ; 17961d - dbw $c0, Music_MobileCenter_Ch1 - dbw $01, Music_MobileCenter_Ch2 - dbw $02, Music_MobileCenter_Ch3 - dbw $03, Music_MobileCenter_Ch4 -; 179629 +Music_MobileCenter: + musicheader 4, 1, Music_MobileCenter_Ch1 + musicheader 1, 2, Music_MobileCenter_Ch2 + musicheader 1, 3, Music_MobileCenter_Ch3 + musicheader 1, 4, Music_MobileCenter_Ch4 -Music_MobileCenter_Ch1: ; 179629 +Music_MobileCenter_Ch1: tempo 160 volume $77 dutycycle $1 @@ -20,7 +19,7 @@ Music_MobileCenter_Ch1: ; 179629 note G_, 2 note A_, 2 note B_, 4 -Music_MobileCenter_branch_179642: ; 179642 +Music_MobileCenter_branch_179642: octave 3 note E_, 2 note C_, 2 @@ -156,9 +155,8 @@ Music_MobileCenter_branch_179642: ; 179642 note E_, 2 note F_, 2 loopchannel 0, Music_MobileCenter_branch_179642 -; 1796cc -Music_MobileCenter_Ch2: ; 1796cc +Music_MobileCenter_Ch2: notetype $c, $c2 dutycycle $3 note __, 10 @@ -166,7 +164,7 @@ Music_MobileCenter_Ch2: ; 1796cc note G_, 2 note A_, 2 note B_, 2 -Music_MobileCenter_branch_1796d6: ; 1796d6 +Music_MobileCenter_branch_1796d6: octave 2 note C_, 2 note E_, 2 @@ -325,9 +323,8 @@ Music_MobileCenter_branch_1796d6: ; 1796d6 note E_, 2 note D_, 2 loopchannel 0, Music_MobileCenter_branch_1796d6 -; 179777 -Music_MobileCenter_Ch3: ; 179777 +Music_MobileCenter_Ch3: notetype $c, $24 vibrato $10, $34 octave 4 @@ -339,7 +336,7 @@ Music_MobileCenter_Ch3: ; 179777 note C_, 2 note D_, 4 notetype $c, $25 -Music_MobileCenter_branch_179788: ; 179788 +Music_MobileCenter_branch_179788: note C_, 2 octave 4 note G_, 2 @@ -452,9 +449,8 @@ Music_MobileCenter_branch_179788: ; 179788 note C_, 8 vibrato $10, $34 loopchannel 0, Music_MobileCenter_branch_179788 -; 179807 -Music_MobileCenter_Ch4: ; 179807 +Music_MobileCenter_Ch4: togglenoise $3 stereopanning $f notetype $c @@ -464,7 +460,7 @@ Music_MobileCenter_Ch4: ; 179807 note C#, 1 note C#, 1 note C#, 1 -Music_MobileCenter_branch_179813: ; 179813 +Music_MobileCenter_branch_179813: note A_, 2 note C#, 2 note C#, 2 @@ -485,5 +481,3 @@ Music_MobileCenter_branch_179813: ; 179813 note C#, 1 note C#, 1 loopchannel 0, Music_MobileCenter_branch_179813 -; 17982d - diff --git a/crysaudio/music/mom.asm b/crysaudio/music/mom.asm index 5ae89e85..a9bdef9c 100644 --- a/crysaudio/music/mom.asm +++ b/crysaudio/music/mom.asm @@ -1,10 +1,9 @@ -Music_Mom: ; f6bf2 - dbw $81, Music_Mom_Ch2 - dbw $02, Music_Mom_Ch3 - dbw $03, Music_Mom_Ch4 -; f6bfb +Music_Mom: + musicheader 3, 2, Music_Mom_Ch2 + musicheader 1, 3, Music_Mom_Ch3 + musicheader 1, 4, Music_Mom_Ch4 -Music_Mom_Ch2: ; f6bfb +Music_Mom_Ch2: tempo 144 volume $77 stereopanning $f @@ -17,7 +16,7 @@ Music_Mom_Ch2: ; f6bfb note G#, 1 note A_, 1 note B_, 8 -Music_Mom_branch_f6c0e: ; f6c0e +Music_Mom_branch_f6c0e: notetype $c, $b1 note __, 4 octave 3 @@ -31,9 +30,8 @@ Music_Mom_branch_f6c0e: ; f6c0e note A#, 2 note B_, 2 loopchannel 0, Music_Mom_branch_f6c0e -; f6c20 -Music_Mom_Ch3: ; f6c20 +Music_Mom_Ch3: stereopanning $f0 notetype $6, $25 octave 3 @@ -44,7 +42,7 @@ Music_Mom_Ch3: ; f6c20 note G#, 1 note E_, 8 intensity $23 -Music_Mom_branch_f6c2e: ; f6c2e +Music_Mom_branch_f6c2e: octave 2 note A_, 2 note __, 6 @@ -77,13 +75,12 @@ Music_Mom_branch_f6c2e: ; f6c2e note D_, 2 note __, 2 loopchannel 0, Music_Mom_branch_f6c2e -; f6c51 -Music_Mom_Ch4: ; f6c51 +Music_Mom_Ch4: togglenoise $3 notetype $c note __, 6 -Music_Mom_branch_f6c56: ; f6c56 +Music_Mom_branch_f6c56: note D#, 1 note __, 1 note F#, 2 @@ -109,6 +106,3 @@ Music_Mom_branch_f6c56: ; f6c56 note D#, 1 note __, 1 loopchannel 0, Music_Mom_branch_f6c56 -; f6c72 - - diff --git a/crysaudio/music/mtmoon.asm b/crysaudio/music/mtmoon.asm index c697daa7..474335f4 100644 --- a/crysaudio/music/mtmoon.asm +++ b/crysaudio/music/mtmoon.asm @@ -1,11 +1,10 @@ -Music_MtMoon: ; edb29 - dbw $c0, Music_MtMoon_Ch1 - dbw $01, Music_MtMoon_Ch2 - dbw $02, Music_MtMoon_Ch3 - dbw $03, Music_MtMoon_Ch4 -; edb35 +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 -Music_MtMoon_Ch1: ; edb35 +Music_MtMoon_Ch1: tempo 208 volume $77 dutycycle $2 @@ -15,14 +14,13 @@ Music_MtMoon_Ch1: ; edb35 notetype $c, $45 note __, 2 loopchannel 0, Music_MtMoon_branch_edb56 -; edb4c -Music_MtMoon_Ch2: ; edb4c +Music_MtMoon_Ch2: vibrato $b, $15 dutycycle $2 notetype $c, $84 stereopanning $f -Music_MtMoon_branch_edb56: ; edb56 +Music_MtMoon_branch_edb56: octave 4 note D#, 6 note C#, 6 @@ -72,12 +70,11 @@ Music_MtMoon_branch_edb56: ; edb56 note F#, 6 note E_, 4 loopchannel 0, Music_MtMoon_branch_edb56 -; edb8a -Music_MtMoon_Ch3: ; edb8a -Music_MtMoon_branch_edb8a: ; edb8a +Music_MtMoon_Ch3: +Music_MtMoon_branch_edb8a: notetype $c, $28 -Music_MtMoon_branch_edb8d: ; edb8d +Music_MtMoon_branch_edb8d: octave 2 note B_, 2 octave 3 @@ -105,7 +102,7 @@ Music_MtMoon_branch_edb8d: ; edb8d note G_, 2 note D#, 2 note E_, 2 -Music_MtMoon_branch_edbab: ; edbab +Music_MtMoon_branch_edbab: note E_, 2 note G#, 2 octave 4 @@ -120,12 +117,11 @@ Music_MtMoon_branch_edbab: ; edbab note G#, 2 loopchannel 4, Music_MtMoon_branch_edbab loopchannel 0, Music_MtMoon_branch_edb8a -; edbbf -Music_MtMoon_Ch4: ; edbbf +Music_MtMoon_Ch4: togglenoise $5 notetype $c -Music_MtMoon_branch_edbc3: ; edbc3 +Music_MtMoon_branch_edbc3: stereopanning $f note A#, 4 note A#, 8 @@ -140,6 +136,3 @@ Music_MtMoon_branch_edbc3: ; edbc3 stereopanning $f0 note A#, 8 loopchannel 0, Music_MtMoon_branch_edbc3 -; edbd8 - - diff --git a/crysaudio/music/mtmoonsquare.asm b/crysaudio/music/mtmoonsquare.asm index d990cb0f..57d1b0dd 100644 --- a/crysaudio/music/mtmoonsquare.asm +++ b/crysaudio/music/mtmoonsquare.asm @@ -1,17 +1,16 @@ -Music_MtMoonSquare: ; f4815 - dbw $40, Music_MtMoonSquare_Ch1 - dbw $01, Music_MtMoonSquare_Ch2 -; f481b +Music_MtMoonSquare: + musicheader 2, 1, Music_MtMoonSquare_Ch1 + musicheader 1, 2, Music_MtMoonSquare_Ch2 -Music_MtMoonSquare_Ch1: ; f481b +Music_MtMoonSquare_Ch1: tempo 112 volume $77 dutycycle $2 tone $0001 note __, 1 -Music_MtMoonSquare_branch_f4826: ; f4826 +Music_MtMoonSquare_branch_f4826: notetype $c, $44 -Music_MtMoonSquare_branch_f4829: ; f4829 +Music_MtMoonSquare_branch_f4829: octave 4 note D_, 2 note E_, 2 @@ -21,7 +20,7 @@ Music_MtMoonSquare_branch_f4829: ; f4829 octave 5 note D_, 4 loopchannel 2, Music_MtMoonSquare_branch_f4829 -Music_MtMoonSquare_branch_f4835: ; f4835 +Music_MtMoonSquare_branch_f4835: octave 4 note E_, 2 note F#, 2 @@ -31,7 +30,7 @@ Music_MtMoonSquare_branch_f4835: ; f4835 octave 5 note E_, 4 loopchannel 2, Music_MtMoonSquare_branch_f4835 -Music_MtMoonSquare_branch_f4841: ; f4841 +Music_MtMoonSquare_branch_f4841: octave 4 note C#, 2 note D_, 2 @@ -41,7 +40,7 @@ Music_MtMoonSquare_branch_f4841: ; f4841 octave 5 note C#, 4 loopchannel 2, Music_MtMoonSquare_branch_f4841 -Music_MtMoonSquare_branch_f484d: ; f484d +Music_MtMoonSquare_branch_f484d: octave 4 note D_, 2 note E_, 2 @@ -52,14 +51,13 @@ Music_MtMoonSquare_branch_f484d: ; f484d note D_, 4 loopchannel 2, Music_MtMoonSquare_branch_f484d loopchannel 0, Music_MtMoonSquare_branch_f4826 -; f485d -Music_MtMoonSquare_Ch2: ; f485d +Music_MtMoonSquare_Ch2: dutycycle $2 vibrato $18, $24 -Music_MtMoonSquare_branch_f4862: ; f4862 +Music_MtMoonSquare_branch_f4862: notetype $c, $82 -Music_MtMoonSquare_branch_f4865: ; f4865 +Music_MtMoonSquare_branch_f4865: octave 4 note D_, 2 note E_, 2 @@ -71,7 +69,7 @@ Music_MtMoonSquare_branch_f4865: ; f4865 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4865 notetype $c, $82 -Music_MtMoonSquare_branch_f4877: ; f4877 +Music_MtMoonSquare_branch_f4877: octave 4 note E_, 2 note F#, 2 @@ -83,7 +81,7 @@ Music_MtMoonSquare_branch_f4877: ; f4877 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4877 notetype $c, $82 -Music_MtMoonSquare_branch_f4889: ; f4889 +Music_MtMoonSquare_branch_f4889: octave 4 note C#, 2 note D_, 2 @@ -95,7 +93,7 @@ Music_MtMoonSquare_branch_f4889: ; f4889 notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f4889 notetype $c, $82 -Music_MtMoonSquare_branch_f489b: ; f489b +Music_MtMoonSquare_branch_f489b: octave 4 note D_, 2 note E_, 2 @@ -107,6 +105,3 @@ Music_MtMoonSquare_branch_f489b: ; f489b notetype $c, $62 loopchannel 2, Music_MtMoonSquare_branch_f489b loopchannel 0, Music_MtMoonSquare_branch_f4862 -; f48ae - - diff --git a/crysaudio/music/music_labels.txt b/crysaudio/music/music_labels.txt deleted file mode 100644 index f22ed7d9..00000000 --- a/crysaudio/music/music_labels.txt +++ /dev/null @@ -1,103 +0,0 @@ -Music_Nothing -Music_TitleScreen -Music_Route1 -Music_Route3 -Music_Route12 -Music_MagnetTrain -Music_KantoGymLeaderBattle -Music_KantoTrainerBattle -Music_KantoWildPokemonBattle -Music_PokemonCenter -Music_LookHiker -Music_LookLass -Music_LookOfficer -Music_HealPokemon -Music_LavenderTown -Music_Route2 -Music_MtMoon -Music_ShowMeAround -Music_GameCorner -Music_Bicycle -Music_HallOfFame -Music_ViridianCity -Music_CeladonCity -Music_TrainerVictory -Music_WildPokemonVictory -Music_GymLeaderVictory -Music_MtMoonSquare -Music_Gym -Music_PalletTown -Music_ProfOaksPokemonTalk -Music_ProfOak -Music_LookRival -Music_AfterTheRivalFight -Music_Surf -Music_Evolution -Music_NationalPark -Music_Credits -Music_AzaleaTown -Music_CherrygroveCity -Music_LookKimonoGirl -Music_UnionCave -Music_JohtoWildPokemonBattle -Music_JohtoTrainerBatle -Music_Route30 -Music_EcruteakCity -Music_VioletCity -Music_JohtoGymLeaderBattle -Music_ChampionBattle -Music_RivalBattle -Music_RocketBattle -Music_ElmsLab -Music_DarkCave -Music_Route29 -Music_Route36 -Music_SSAqua -Music_LookYoungster -Music_LookBeauty -Music_LookRocket -Music_LookPokemaniac -Music_LookSage -Music_NewBarkTown -Music_GoldenrodCity -Music_VermilionCity -Music_PokemonChannel -Music_PokeFluteChannel -Music_TinTower -Music_SproutTower -Music_BurnedTower -Music_Lighthouse -Music_LakeOfRage -Music_IndigoPlateau -Music_Route37 -Music_RocketHideout -Music_DragonsDen -Music_JohtoWildPokemonBattleNight -Music_RuinsOfAlphRadioSignal -Music_SuccessfulCapture -Music_Route26 -Music_Mom -Music_VictoryRoad -Music_PokemonLullaby -Music_PokemonMarch -Music_GoldSilverOpening -Music_GoldSilverOpening2 -Music_MainMenu -Music_RuinsOfAlphInterior -Music_RocketTheme -Music_DancingHall -Music_BugCatchingContestResults -Music_BugCatchingContest -Music_LakeOfRageRocketsRadioSignal -Music_Printer -Music_PostCredits -Music_Clair -Music_MobileAdapterMenu -Music_MobileAdapter -Music_BuenasPassword -Music_LookMysticalMan -Music_CrystalOpening -Music_BattleTowerTheme -Music_SuicuneBattle -Music_BattleTowerLobby -Music_MobileCenter diff --git a/crysaudio/music/nationalpark.asm b/crysaudio/music/nationalpark.asm index 7e7ccf28..10908638 100644 --- a/crysaudio/music/nationalpark.asm +++ b/crysaudio/music/nationalpark.asm @@ -1,11 +1,10 @@ -Music_NationalPark: ; f54e8 - dbw $c0, Music_NationalPark_Ch1 - dbw $01, Music_NationalPark_Ch2 - dbw $02, Music_NationalPark_Ch3 - dbw $03, Music_NationalPark_Ch4 -; f54f4 +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 -Music_NationalPark_Ch1: ; f54f4 +Music_NationalPark_Ch1: tempo 192 volume $77 stereopanning $f @@ -13,7 +12,7 @@ Music_NationalPark_Ch1: ; f54f4 dutycycle $1 notetype $c, $77 note __, 2 -Music_NationalPark_branch_f5504: ; f5504 +Music_NationalPark_branch_f5504: callchannel Music_NationalPark_branch_f554a callchannel Music_NationalPark_branch_f554a notetype $6, $67 @@ -62,9 +61,8 @@ Music_NationalPark_branch_f5504: ; f5504 notetype $c, $77 note __, 4 loopchannel 0, Music_NationalPark_branch_f5504 -; f554a -Music_NationalPark_branch_f554a: ; f554a +Music_NationalPark_branch_f554a: octave 2 note G#, 6 octave 3 @@ -270,9 +268,8 @@ Music_NationalPark_branch_f554a: ; f554a octave 3 note A#, 2 endchannel -; f563a -Music_NationalPark_branch_f563a: ; f563a +Music_NationalPark_branch_f563a: note __, 16 note __, 3 octave 4 @@ -297,15 +294,14 @@ Music_NationalPark_branch_f563a: ; f563a note A_, 2 note __, 4 endchannel -; f5652 -Music_NationalPark_Ch2: ; f5652 +Music_NationalPark_Ch2: vibrato $14, $24 dutycycle $1 notetype $c, $a7 note __, 2 stereopanning $f0 -Music_NationalPark_branch_f565d: ; f565d +Music_NationalPark_branch_f565d: notetype $c, $a7 callchannel Music_NationalPark_branch_f56b8 octave 3 @@ -373,9 +369,8 @@ Music_NationalPark_branch_f565d: ; f565d note D#, 2 note D_, 2 loopchannel 0, Music_NationalPark_branch_f565d -; f56b8 -Music_NationalPark_branch_f56b8: ; f56b8 +Music_NationalPark_branch_f56b8: octave 2 note C#, 6 note G#, 2 @@ -437,9 +432,8 @@ Music_NationalPark_branch_f56b8: ; f56b8 octave 2 note F_, 2 endchannel -; f56f5 -Music_NationalPark_branch_f56f5: ; f56f5 +Music_NationalPark_branch_f56f5: octave 4 note E_, 1 note F_, 5 @@ -482,16 +476,15 @@ Music_NationalPark_branch_f56f5: ; f56f5 note D_, 2 note C#, 2 endchannel -; f5723 -Music_NationalPark_Ch3: ; f5723 +Music_NationalPark_Ch3: vibrato $16, $24 notetype $c, $11 octave 4 note G#, 1 note A#, 1 stereopanning $ff -Music_NationalPark_branch_f572e: ; f572e +Music_NationalPark_branch_f572e: callchannel Music_NationalPark_branch_f5756 octave 5 note A#, 14 @@ -519,9 +512,8 @@ Music_NationalPark_branch_f572e: ; f572e note G#, 1 note A#, 1 loopchannel 0, Music_NationalPark_branch_f572e -; f5756 -Music_NationalPark_branch_f5756: ; f5756 +Music_NationalPark_branch_f5756: octave 5 note C_, 16 note C#, 14 @@ -579,9 +571,8 @@ Music_NationalPark_branch_f5756: ; f5756 octave 6 note C_, 2 endchannel -; f578f -Music_NationalPark_branch_f578f: ; f578f +Music_NationalPark_branch_f578f: octave 2 note F#, 3 octave 3 @@ -623,13 +614,12 @@ Music_NationalPark_branch_f578f: ; f578f note F_, 1 note __, 1 endchannel -; f57b8 -Music_NationalPark_Ch4: ; f57b8 +Music_NationalPark_Ch4: togglenoise $3 notetype $c note __, 2 -Music_NationalPark_branch_f57bd: ; f57bd +Music_NationalPark_branch_f57bd: note __, 16 loopchannel 23, Music_NationalPark_branch_f57bd note __, 8 @@ -638,7 +628,7 @@ Music_NationalPark_branch_f57bd: ; f57bd note A#, 1 note D_, 1 note B_, 2 -Music_NationalPark_branch_f57c8: ; f57c8 +Music_NationalPark_branch_f57c8: note A#, 2 note G_, 1 note G_, 1 @@ -665,6 +655,3 @@ Music_NationalPark_branch_f57c8: ; f57c8 note A#, 1 note D#, 1 loopchannel 0, Music_NationalPark_branch_f57bd -; f57e8 - - diff --git a/crysaudio/music/newbarktown.asm b/crysaudio/music/newbarktown.asm index 3853132d..0e3b92d3 100644 --- a/crysaudio/music/newbarktown.asm +++ b/crysaudio/music/newbarktown.asm @@ -1,20 +1,18 @@ -Music_NewBarkTown: ; eb2d3 - dbw $80, Music_NewBarkTown_Ch1 - dbw $01, Music_NewBarkTown_Ch2 - dbw $02, Music_NewBarkTown_Ch3 -; eb2dc +Music_NewBarkTown: + musicheader 3, 1, Music_NewBarkTown_Ch1 + musicheader 1, 2, Music_NewBarkTown_Ch2 + musicheader 1, 3, Music_NewBarkTown_Ch3 + db $3 - - -Music_NewBarkTown_Ch1: ; eb2dd +Music_NewBarkTown_Ch1: tempo 187 volume $77 stereopanning $f vibrato $12, $23 notetype $c, $87 note __, 4 -Music_NewBarkTown_branch_eb2eb: ; eb2eb +Music_NewBarkTown_branch_eb2eb: dutycycle $0 callchannel Music_NewBarkTown_branch_eb349 octave 3 @@ -86,9 +84,8 @@ Music_NewBarkTown_branch_eb2eb: ; eb2eb note B_, 2 intensity $87 loopchannel 0, Music_NewBarkTown_branch_eb2eb -; eb349 -Music_NewBarkTown_branch_eb349: ; eb349 +Music_NewBarkTown_branch_eb349: octave 3 note F#, 1 note __, 1 @@ -140,9 +137,8 @@ Music_NewBarkTown_branch_eb349: ; eb349 note B_, 1 note __, 1 endchannel -; eb37c -Music_NewBarkTown_branch_eb37c: ; eb37c +Music_NewBarkTown_branch_eb37c: octave 2 note G_, 2 note B_, 2 @@ -160,14 +156,13 @@ Music_NewBarkTown_branch_eb37c: ; eb37c note A_, 4 note E_, 2 endchannel -; eb38d -Music_NewBarkTown_Ch2: ; eb38d +Music_NewBarkTown_Ch2: stereopanning $ff vibrato $12, $23 notetype $6, $a7 note __, 8 -Music_NewBarkTown_branch_eb396: ; eb396 +Music_NewBarkTown_branch_eb396: dutycycle $2 notetype $6, $a7 callchannel Music_NewBarkTown_branch_eb3bf @@ -191,9 +186,8 @@ Music_NewBarkTown_branch_eb396: ; eb396 note D_, 4 note E_, 16 loopchannel 0, Music_NewBarkTown_branch_eb396 -; eb3bf -Music_NewBarkTown_branch_eb3bf: ; eb3bf +Music_NewBarkTown_branch_eb3bf: octave 2 note D_, 4 note __, 8 @@ -245,9 +239,8 @@ Music_NewBarkTown_branch_eb3bf: ; eb3bf octave 2 note C#, 4 endchannel -; eb3f2 -Music_NewBarkTown_branch_eb3f2: ; eb3f2 +Music_NewBarkTown_branch_eb3f2: notetype $6, $97 dutycycle $2 octave 4 @@ -257,15 +250,14 @@ Music_NewBarkTown_branch_eb3f2: ; eb3f2 notetype $c, $97 note E_, 16 endchannel -; eb400 -Music_NewBarkTown_Ch3: ; eb400 +Music_NewBarkTown_Ch3: stereopanning $f0 notetype $c, $10 octave 5 note D_, 2 note E_, 2 -Music_NewBarkTown_branch_eb408: ; eb408 +Music_NewBarkTown_branch_eb408: vibrato $16, $23 note F#, 4 note A_, 4 @@ -330,6 +322,3 @@ Music_NewBarkTown_branch_eb408: ; eb408 note D_, 1 note E_, 1 loopchannel 0, Music_NewBarkTown_branch_eb408 -; eb453 - - diff --git a/crysaudio/music/nothing.asm b/crysaudio/music/nothing.asm index 1cd93367..59641387 100644 --- a/crysaudio/music/nothing.asm +++ b/crysaudio/music/nothing.asm @@ -1,14 +1,11 @@ -Music_Nothing: ; e91a3 - dbw $c0, Music_Nothing_Ch1 - dbw $01, Music_Nothing_Ch2 - dbw $02, Music_Nothing_Ch3 - dbw $03, Music_Nothing_Ch4 -; e91af +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 -Music_Nothing_Ch1: ; e91af -Music_Nothing_Ch2: ; e91af -Music_Nothing_Ch3: ; e91af -Music_Nothing_Ch4: ; e91af +Music_Nothing_Ch1: +Music_Nothing_Ch2: +Music_Nothing_Ch3: +Music_Nothing_Ch4: endchannel -; e91b0 - diff --git a/crysaudio/music/pallettown.asm b/crysaudio/music/pallettown.asm index 6518cbd9..68585e47 100644 --- a/crysaudio/music/pallettown.asm +++ b/crysaudio/music/pallettown.asm @@ -1,16 +1,15 @@ -Music_PalletTown: ; f4b0c - dbw $80, Music_PalletTown_Ch1 - dbw $01, Music_PalletTown_Ch2 - dbw $02, Music_PalletTown_Ch3 -; f4b15 +Music_PalletTown: + musicheader 3, 1, Music_PalletTown_Ch1 + musicheader 1, 2, Music_PalletTown_Ch2 + musicheader 1, 3, Music_PalletTown_Ch3 -Music_PalletTown_Ch1: ; f4b15 +Music_PalletTown_Ch1: tempo 188 volume $77 vibrato $12, $24 tone $0001 stereopanning $f -Music_PalletTown_branch_f4b22: ; f4b22 +Music_PalletTown_branch_f4b22: dutycycle $2 notetype $c, $78 octave 3 @@ -60,7 +59,7 @@ Music_PalletTown_branch_f4b22: ; f4b22 note B_, 8 intensity $77 note B_, 8 -Music_PalletTown_branch_f4b59: ; f4b59 +Music_PalletTown_branch_f4b59: dutycycle $3 intensity $92 note G_, 2 @@ -118,13 +117,12 @@ Music_PalletTown_branch_f4b59: ; f4b59 intensity $1f note F#, 8 loopchannel 0, Music_PalletTown_branch_f4b22 -; f4ba1 -Music_PalletTown_Ch2: ; f4ba1 +Music_PalletTown_Ch2: vibrato $12, $44 dutycycle $2 stereopanning $f0 -Music_PalletTown_branch_f4ba8: ; f4ba8 +Music_PalletTown_branch_f4ba8: notetype $c, $88 octave 1 note G_, 2 @@ -184,7 +182,7 @@ Music_PalletTown_branch_f4ba8: ; f4ba8 octave 3 note C_, 2 note D_, 2 -Music_PalletTown_branch_f4be5: ; f4be5 +Music_PalletTown_branch_f4be5: intensity $a2 octave 3 note E_, 2 @@ -244,11 +242,10 @@ Music_PalletTown_branch_f4be5: ; f4be5 note B_, 2 note A_, 2 loopchannel 0, Music_PalletTown_branch_f4ba8 -; f4c2a -Music_PalletTown_Ch3: ; f4c2a +Music_PalletTown_Ch3: vibrato $14, $24 -Music_PalletTown_branch_f4c2d: ; f4c2d +Music_PalletTown_branch_f4c2d: notetype $c, $10 octave 6 note D_, 2 @@ -358,6 +355,3 @@ Music_PalletTown_branch_f4c2d: ; f4c2d note B_, 8 note A_, 8 loopchannel 0, Music_PalletTown_branch_f4c2d -; f4c9f - - diff --git a/crysaudio/music/pinball/bluefield.asm b/crysaudio/music/pinball/bluefield.asm index 82d3485b..cd83d5eb 100644 --- a/crysaudio/music/pinball/bluefield.asm +++ b/crysaudio/music/pinball/bluefield.asm @@ -854,7 +854,7 @@ Music_Pinballbluefield_branch_40e75: ; 40e75 ; 4111e Music_Pinballbluefield_Ch3: ; 4111e - forceoctave $10 + pitchoffset 1, C_ notetype $8, $22 octave 3 note F_, 4 diff --git a/crysaudio/music/pinball/diglettstage_dugtrio.asm b/crysaudio/music/pinball/diglettstage_dugtrio.asm index 00925a91..81424f70 100644 --- a/crysaudio/music/pinball/diglettstage_dugtrio.asm +++ b/crysaudio/music/pinball/diglettstage_dugtrio.asm @@ -121,12 +121,12 @@ Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4 callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 panning $ff callchannel Music_Pinballdiglettstage_dugtrio_branch_4529e - forceoctave $4 + pitchoffset 0, E_ panning $f0 callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb panning $f callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 panning $ff callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb @@ -158,11 +158,11 @@ Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4 callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 panning $f callchannel Music_Pinballdiglettstage_dugtrio_branch_4529e - forceoctave $4 + pitchoffset 0, E_ panning $f0 callchannel Music_Pinballdiglettstage_dugtrio_branch_452cb callchannel Music_Pinballdiglettstage_dugtrio_branch_452e4 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45245 panning $ff intensity $83 @@ -198,19 +198,19 @@ Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4 note D#, 1 intensity $53 note D#, 1 - forceoctave $1 + pitchoffset 0, C# callchannel Music_Pinballdiglettstage_dugtrio_branch_45221 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_452fd panning $f0 callchannel Music_Pinballdiglettstage_dugtrio_branch_4532e - forceoctave $e + pitchoffset 0, $e + 1 panning $f callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - forceoctave $a + pitchoffset 0, A# callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 panning $ff - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45345 panning $f0 octave 3 @@ -251,15 +251,15 @@ Music_Pinballdiglettstage_dugtrio_branch_450c4: ; 450c4 note __, 1 note G_, 1 note __, 1 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_452fd callchannel Music_Pinballdiglettstage_dugtrio_branch_4532e panning $f - forceoctave $e + pitchoffset 0, $e + 1 callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - forceoctave $a + pitchoffset 0, A# callchannel Music_Pinballdiglettstage_dugtrio_branch_45213 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45345 panning $ff intensity $83 @@ -703,25 +703,25 @@ Music_Pinballdiglettstage_dugtrio_Ch3: ; 45375 intensity $32 note E_, 1 Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballdiglettstage_dugtrio_branch_454d5 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_454d5 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 intensity $12 octave 1 @@ -781,15 +781,15 @@ Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5 note B_, 1 octave 2 note C_, 1 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballdiglettstage_dugtrio_branch_454fe - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_45556 intensity $22 octave 4 @@ -828,13 +828,13 @@ Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5 note C#, 1 note G_, 1 callchannel Music_Pinballdiglettstage_dugtrio_branch_45565 - forceoctave $4 + pitchoffset 0, E_ callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a - forceoctave $4 + pitchoffset 0, E_ callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a - forceoctave $0 + pitchoffset 0, C_ intensity $12 note F#, 1 note G_, 1 @@ -877,7 +877,7 @@ Music_Pinballdiglettstage_dugtrio_branch_453c5: ; 453c5 octave 2 note A#, 1 note __, 1 - forceoctave $4 + pitchoffset 0, E_ callchannel Music_Pinballdiglettstage_dugtrio_branch_4559a loopchannel 0, Music_Pinballdiglettstage_dugtrio_branch_453c5 ; 454d5 diff --git a/crysaudio/music/pinball/endcredits.asm b/crysaudio/music/pinball/endcredits.asm index d0e1c93d..2e5e5fa1 100644 --- a/crysaudio/music/pinball/endcredits.asm +++ b/crysaudio/music/pinball/endcredits.asm @@ -78,11 +78,11 @@ Music_Pinballendcredits_branch_4cd04: ; 4cd04 intensity $98 callchannel Music_Pinballendcredits_branch_4cef5 Music_Pinballendcredits_branch_4cd2e: ; 4cd2e - forceoctave $1 + pitchoffset 0, C# callchannel Music_Pinballendcredits_branch_4cef5 - forceoctave $5 + pitchoffset 0, F_ callchannel Music_Pinballendcredits_branch_4cef5 - forceoctave $0 + pitchoffset 0, C_ note D_, 2 note __, 2 note D_, 4 @@ -511,7 +511,7 @@ Music_Pinballendcredits_Ch2: ; 4cf03 note G_, 2 callchannel Music_Pinballendcredits_branch_4d1f2 Music_Pinballendcredits_branch_4cf36: ; 4cf36 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballendcredits_branch_4d21e note A_, 2 intensity $28 @@ -535,7 +535,7 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36 note G_, 1 intensity $28 note G_, 1 - forceoctave $5 + pitchoffset 0, F_ callchannel Music_Pinballendcredits_branch_4d21e octave 5 note C_, 2 @@ -553,7 +553,7 @@ Music_Pinballendcredits_branch_4cf36: ; 4cf36 note D_, 1 note C#, 1 note C_, 1 - forceoctave $4 + pitchoffset 0, E_ callchannel Music_Pinballendcredits_branch_4d21e note G_, 1 intensity $28 @@ -1009,7 +1009,7 @@ Music_Pinballendcredits_branch_4d1f2: ; 4d1f2 intensity $28 note G_, 1 intensity $a8 - forceoctave $0 + pitchoffset 0, C_ note G_, 2 intensity $28 note G_, 2 @@ -1047,7 +1047,7 @@ Music_Pinballendcredits_branch_4d21e: ; 4d21e intensity $28 note G_, 1 intensity $a8 - forceoctave $0 + pitchoffset 0, C_ endchannel ; 4d23e diff --git a/crysaudio/music/pinball/gengarstage_hauntergengar.asm b/crysaudio/music/pinball/gengarstage_hauntergengar.asm index b5c6fe95..033a9174 100644 --- a/crysaudio/music/pinball/gengarstage_hauntergengar.asm +++ b/crysaudio/music/pinball/gengarstage_hauntergengar.asm @@ -5,13 +5,13 @@ Music_Pinballgengarstage_haunter: ; 3dffc ; 3e005 Music_Pinballgengarstage_haunter_Ch1: ; 3e005 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballgengarstage_haunter_branch_3ddf3 Music_Pinballgengarstage_haunter_Ch2: ; 3e00a - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballgengarstage_haunter_branch_3de4c Music_Pinballgengarstage_haunter_Ch3: ; 3e00f - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballgengarstage_haunter_branch_3df1f Music_Pinballgengarstage_gengar: ; 3e014 @@ -138,11 +138,11 @@ Music_Pinballgengarstage_haunter_branch_3e081: ; 3e081 note __, 2 loopchannel 2, Music_Pinballgengarstage_haunter_branch_3e081 callchannel Music_Pinballgengarstage_haunter_branch_3e12f - forceoctave $3 + pitchoffset 0, D# callchannel Music_Pinballgengarstage_haunter_branch_3e12f - forceoctave $8 + pitchoffset 0, G# callchannel Music_Pinballgengarstage_haunter_branch_3e12f - forceoctave $0 + pitchoffset 0, C_ intensity $88 octave 4 note C#, 4 @@ -377,11 +377,11 @@ Music_Pinballgengarstage_gengar_branch_3e1a8: ; 3e1a8 note F#, 2 loopchannel 2, Music_Pinballgengarstage_gengar_branch_3e1a8 callchannel Music_Pinballgengarstage_gengar_branch_3e25f - forceoctave $3 + pitchoffset 0, D# callchannel Music_Pinballgengarstage_gengar_branch_3e25f - forceoctave $8 + pitchoffset 0, G# callchannel Music_Pinballgengarstage_gengar_branch_3e25f - forceoctave $0 + pitchoffset 0, C_ intensity $b8 octave 4 note E_, 4 @@ -572,7 +572,7 @@ Music_Pinballgengarstage_gengar_Ch3: ; 3e299 notetype $6, $22 note D#, 16 notetype $6, $12 - forceoctave $28 + pitchoffset 2, G# octave 3 note G#, 1 note G_, 1 @@ -582,7 +582,7 @@ Music_Pinballgengarstage_gengar_Ch3: ; 3e299 note D#, 1 note D_, 1 note C#, 1 - forceoctave $0 + pitchoffset 0, C_ Music_Pinballgengarstage_gengar_branch_3e2db: ; 3e2db notetype $6, $22 octave 1 @@ -624,11 +624,11 @@ Music_Pinballgengarstage_gengar_branch_3e2db: ; 3e2db note __, 2 loopchannel 2, Music_Pinballgengarstage_gengar_branch_3e2db callchannel Music_Pinballgengarstage_gengar_branch_3e36d - forceoctave $3 + pitchoffset 0, D# callchannel Music_Pinballgengarstage_gengar_branch_3e36d - forceoctave $8 + pitchoffset 0, G# callchannel Music_Pinballgengarstage_gengar_branch_3e36d - forceoctave $0 + pitchoffset 0, C_ note E_, 4 octave 2 note F#, 1 diff --git a/crysaudio/music/pinball/hiscorescreen.asm b/crysaudio/music/pinball/hiscorescreen.asm index 98d19dcc..2a0416ff 100644 --- a/crysaudio/music/pinball/hiscorescreen.asm +++ b/crysaudio/music/pinball/hiscorescreen.asm @@ -260,9 +260,9 @@ Music_Pinballhiscorescreen_branch_41e5d: ; 41e5d notetype $8, $a2 callchannel Music_Pinballhiscorescreen_branch_41fd5 callchannel Music_Pinballhiscorescreen_branch_41fd5 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballhiscorescreen_branch_41fd5 - forceoctave $0 + pitchoffset 0, C_ intensity $a2 note E_, 4 note E_, 1 @@ -643,9 +643,9 @@ Music_Pinballhiscorescreen_Ch3: ; 4206b note __, 16 notetype $8, $22 Music_Pinballhiscorescreen_branch_42072: ; 42072 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballhiscorescreen_branch_42153 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballhiscorescreen_branch_42153 callchannel Music_Pinballhiscorescreen_branch_4219a octave 2 @@ -692,9 +692,9 @@ Music_Pinballhiscorescreen_branch_42072: ; 42072 note __, 1 note D_, 1 note __, 1 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballhiscorescreen_branch_42153 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballhiscorescreen_branch_42153 callchannel Music_Pinballhiscorescreen_branch_4219a callchannel Music_Pinballhiscorescreen_branch_421e1 @@ -708,9 +708,9 @@ Music_Pinballhiscorescreen_branch_42072: ; 42072 note E_, 1 note __, 1 notetype $8, $22 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_Pinballhiscorescreen_branch_42153 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballhiscorescreen_branch_42153 callchannel Music_Pinballhiscorescreen_branch_4219a callchannel Music_Pinballhiscorescreen_branch_421e1 diff --git a/crysaudio/music/pinball/meowthstage.asm b/crysaudio/music/pinball/meowthstage.asm index 522616b6..7e208841 100644 --- a/crysaudio/music/pinball/meowthstage.asm +++ b/crysaudio/music/pinball/meowthstage.asm @@ -168,9 +168,9 @@ Music_Pinballmeowthstage_branch_4971a: ; 4971a octave 5 note C#, 10 note __, 4 - forceoctave $c + pitchoffset 0, CC callchannel Music_Pinballmeowthstage_branch_497e7 - forceoctave $0 + pitchoffset 0, C_ loopchannel 0, Music_Pinballmeowthstage_branch_4971a ; 497e7 @@ -431,9 +431,9 @@ Music_Pinballmeowthstage_branch_4984c: ; 4984c intensity $18 note F#, 2 note __, 2 - forceoctave $c + pitchoffset 0, CC callchannel Music_Pinballmeowthstage_branch_4993c - forceoctave $0 + pitchoffset 0, C_ loopchannel 0, Music_Pinballmeowthstage_branch_4984c ; 4993c @@ -798,9 +798,9 @@ Music_Pinballmeowthstage_branch_49a21: ; 49a21 octave 2 note C#, 4 note __, 2 - forceoctave $c + pitchoffset 0, CC callchannel Music_Pinballmeowthstage_branch_49add - forceoctave $0 + pitchoffset 0, C_ loopchannel 0, Music_Pinballmeowthstage_branch_49a21 ; 49add diff --git a/crysaudio/music/pinball/nameentry.asm b/crysaudio/music/pinball/nameentry.asm index f96c822b..34ce4fd4 100644 --- a/crysaudio/music/pinball/nameentry.asm +++ b/crysaudio/music/pinball/nameentry.asm @@ -33,16 +33,16 @@ Music_Pinballnameentry_Ch1: ; 4d538 Music_Pinballnameentry_branch_4d55c: ; 4d55c dutycycle $2 intensity $68 - forceoctave $7 + pitchoffset 0, G_ callchannel Music_Pinballnameentry_branch_4d80d - forceoctave $5 + pitchoffset 0, F_ callchannel Music_Pinballnameentry_branch_4d80d callchannel Music_Pinballnameentry_branch_4d80d Music_Pinballnameentry_branch_4d56d: ; 4d56d - forceoctave $3 + pitchoffset 0, D# callchannel Music_Pinballnameentry_branch_4d80d loopchannel 3, Music_Pinballnameentry_branch_4d56d - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballnameentry_branch_4d80d octave 3 note C#, 4 @@ -911,19 +911,19 @@ Music_Pinballnameentry_branch_4d854: ; 4d854 intensity $78 note G_, 1 vibrato $18, $24 - forceoctave $c + pitchoffset 0, CC callchannel Music_Pinballnameentry_branch_4da64 - forceoctave $0 + pitchoffset 0, C_ octave 5 note F_, 1 note F#, 5 - forceoctave $c + pitchoffset 0, CC callchannel Music_Pinballnameentry_branch_4da8d intensity $28 note A_, 2 octave 5 note __, 2 - forceoctave $0 + pitchoffset 0, C_ intensity $a8 note A_, 2 note G#, 2 diff --git a/crysaudio/music/pinball/seelstage.asm b/crysaudio/music/pinball/seelstage.asm index 2e4ca4de..1e81f217 100644 --- a/crysaudio/music/pinball/seelstage.asm +++ b/crysaudio/music/pinball/seelstage.asm @@ -77,29 +77,29 @@ Music_Pinballseelstage_branch_45615: ; 45615 note __, 16 note __, 1 dutycycle $2 - forceoctave $7 + pitchoffset 0, G_ callchannel Music_Pinballseelstage_branch_4570a - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_456f0 - forceoctave $4 + pitchoffset 0, E_ callchannel Music_Pinballseelstage_branch_4570a - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_4570a - forceoctave $7 + pitchoffset 0, G_ callchannel Music_Pinballseelstage_branch_4570a notetype $8, $b3 note __, 12 note __, 12 note __, 12 - forceoctave $7 + pitchoffset 0, G_ callchannel Music_Pinballseelstage_branch_4570a - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_456f0 - forceoctave $c + pitchoffset 0, CC callchannel Music_Pinballseelstage_branch_4570a - forceoctave $4 + pitchoffset 0, E_ callchannel Music_Pinballseelstage_branch_4570a - forceoctave $0 + pitchoffset 0, C_ notetype $c, $b3 note __, 16 note __, 9 @@ -241,28 +241,28 @@ Music_Pinballseelstage_branch_4573f: ; 4573f note G#, 1 note __, 15 note __, 2 - forceoctave $5 + pitchoffset 0, F_ callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_45935 - forceoctave $3 + pitchoffset 0, D# callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_45969 intensity $b2 octave 3 note C_, 2 intensity $43 callchannel Music_Pinballseelstage_branch_45980 - forceoctave $5 + pitchoffset 0, F_ callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_45935 - forceoctave $7 + pitchoffset 0, G_ callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_45969 intensity $42 octave 3 @@ -291,35 +291,35 @@ Music_Pinballseelstage_branch_4573f: ; 4573f note __, 15 note __, 2 intensity $b1 - forceoctave $5 + pitchoffset 0, F_ callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_45935 - forceoctave $3 + pitchoffset 0, D# callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_45969 - forceoctave $c + pitchoffset 0, CC intensity $a3 octave 3 note C_, 2 callchannel Music_Pinballseelstage_branch_45980 - forceoctave $5 + pitchoffset 0, F_ callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_45935 - forceoctave $7 + pitchoffset 0, G_ callchannel Music_Pinballseelstage_branch_4594f - forceoctave $0 + pitchoffset 0, C_ callchannel Music_Pinballseelstage_branch_45969 intensity $32 - forceoctave $c + pitchoffset 0, CC octave 2 note G_, 2 callchannel Music_Pinballseelstage_branch_459b6 - forceoctave $0 + pitchoffset 0, C_ intensity $b1 octave 2 note B_, 1 diff --git a/crysaudio/music/pokeflutechannel.asm b/crysaudio/music/pokeflutechannel.asm index 9256fe54..e324c559 100644 --- a/crysaudio/music/pokeflutechannel.asm +++ b/crysaudio/music/pokeflutechannel.asm @@ -1,10 +1,9 @@ -Music_PokeFluteChannel: ; f7b13 - dbw $80, Music_PokeFluteChannel_Ch1 - dbw $01, Music_PokeFluteChannel_Ch2 - dbw $02, Music_PokeFluteChannel_Ch3 -; f7b1c +Music_PokeFluteChannel: + musicheader 3, 1, Music_PokeFluteChannel_Ch1 + musicheader 1, 2, Music_PokeFluteChannel_Ch2 + musicheader 1, 3, Music_PokeFluteChannel_Ch3 -Music_PokeFluteChannel_Ch1: ; f7b1c +Music_PokeFluteChannel_Ch1: tempo 240 volume $77 stereopanning $f0 @@ -30,7 +29,7 @@ Music_PokeFluteChannel_Ch1: ; f7b1c octave 2 note G_, 4 note A_, 8 -Music_PokeFluteChannel_branch_f7b40: ; f7b40 +Music_PokeFluteChannel_branch_f7b40: octave 3 note E_, 2 note G_, 2 @@ -68,9 +67,8 @@ Music_PokeFluteChannel_branch_f7b40: ; f7b40 note G_, 4 note A_, 8 loopchannel 0, Music_PokeFluteChannel_branch_f7b40 -; f7b68 -Music_PokeFluteChannel_Ch2: ; f7b68 +Music_PokeFluteChannel_Ch2: stereopanning $f dutycycle $3 tone $0001 @@ -107,7 +105,7 @@ Music_PokeFluteChannel_Ch2: ; f7b68 octave 2 note E_, 2 note G_, 2 -Music_PokeFluteChannel_branch_f7b94: ; f7b94 +Music_PokeFluteChannel_branch_f7b94: octave 3 note C_, 2 note E_, 2 @@ -170,14 +168,13 @@ Music_PokeFluteChannel_branch_f7b94: ; f7b94 note E_, 2 note G_, 2 loopchannel 0, Music_PokeFluteChannel_branch_f7b94 -; f7bd5 -Music_PokeFluteChannel_Ch3: ; f7bd5 +Music_PokeFluteChannel_Ch3: vibrato $10, $14 notetype $c, $10 callchannel Music_PokeFluteChannel_branch_f7c05 callchannel Music_PokeFluteChannel_branch_f7c05 -Music_PokeFluteChannel_branch_f7be1: ; f7be1 +Music_PokeFluteChannel_branch_f7be1: note __, 4 octave 4 note C_, 2 @@ -209,9 +206,8 @@ Music_PokeFluteChannel_branch_f7be1: ; f7be1 note __, 4 callchannel Music_PokeFluteChannel_branch_f7c05 loopchannel 0, Music_PokeFluteChannel_branch_f7be1 -; f7c05 -Music_PokeFluteChannel_branch_f7c05: ; f7c05 +Music_PokeFluteChannel_branch_f7c05: octave 5 note E_, 2 note F_, 2 @@ -229,6 +225,3 @@ Music_PokeFluteChannel_branch_f7c05: ; f7c05 note F_, 2 note G_, 4 endchannel -; f7c16 - - diff --git a/crysaudio/music/pokemoncenter.asm b/crysaudio/music/pokemoncenter.asm index 9ea5c7da..01865045 100644 --- a/crysaudio/music/pokemoncenter.asm +++ b/crysaudio/music/pokemoncenter.asm @@ -1,17 +1,16 @@ -Music_PokemonCenter: ; ed5c6 - dbw $c0, Music_PokemonCenter_Ch1 - dbw $01, Music_PokemonCenter_Ch2 - dbw $02, Music_PokemonCenter_Ch3 - dbw $03, Music_PokemonCenter_Ch4 -; ed5d2 +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 -Music_PokemonCenter_Ch1: ; ed5d2 +Music_PokemonCenter_Ch1: tempo 152 volume $77 dutycycle $2 vibrato $a, $14 tone $0001 -Music_PokemonCenter_branch_ed5df: ; ed5df +Music_PokemonCenter_branch_ed5df: stereopanning $f notetype $c, $83 octave 3 @@ -149,11 +148,10 @@ Music_PokemonCenter_branch_ed5df: ; ed5df note F#, 2 note G_, 2 loopchannel 0, Music_PokemonCenter_branch_ed5df -; ed671 -Music_PokemonCenter_Ch2: ; ed671 +Music_PokemonCenter_Ch2: vibrato $10, $25 -Music_PokemonCenter_branch_ed674: ; ed674 +Music_PokemonCenter_branch_ed674: stereopanning $ff callchannel Music_PokemonCenter_branch_ed6d1 stereopanning $f @@ -218,9 +216,8 @@ Music_PokemonCenter_branch_ed674: ; ed674 note E_, 2 note D_, 8 loopchannel 0, Music_PokemonCenter_branch_ed674 -; ed6d1 -Music_PokemonCenter_branch_ed6d1: ; ed6d1 +Music_PokemonCenter_branch_ed6d1: dutycycle $2 notetype $c, $c2 octave 4 @@ -236,9 +233,8 @@ Music_PokemonCenter_branch_ed6d1: ; ed6d1 note E_, 2 note C#, 6 endchannel -; ed6e4 -Music_PokemonCenter_branch_ed6e4: ; ed6e4 +Music_PokemonCenter_branch_ed6e4: notetype $c, $c2 octave 4 note C#, 2 @@ -251,11 +247,10 @@ Music_PokemonCenter_branch_ed6e4: ; ed6e4 note E_, 4 note C#, 2 endchannel -; ed6f3 -Music_PokemonCenter_Ch3: ; ed6f3 +Music_PokemonCenter_Ch3: notetype $c, $28 -Music_PokemonCenter_branch_ed6f6: ; ed6f6 +Music_PokemonCenter_branch_ed6f6: stereopanning $f0 octave 3 note D_, 1 @@ -360,9 +355,8 @@ Music_PokemonCenter_branch_ed6f6: ; ed6f6 note E_, 1 note __, 1 loopchannel 0, Music_PokemonCenter_branch_ed6f6 -; ed76f -Music_PokemonCenter_branch_ed76f: ; ed76f +Music_PokemonCenter_branch_ed76f: note E_, 1 note __, 5 note A_, 1 @@ -372,9 +366,8 @@ Music_PokemonCenter_branch_ed76f: ; ed76f note A_, 1 note __, 1 endchannel -; ed778 -Music_PokemonCenter_branch_ed778: ; ed778 +Music_PokemonCenter_branch_ed778: note E_, 1 note __, 5 note A_, 1 @@ -386,9 +379,8 @@ Music_PokemonCenter_branch_ed778: ; ed778 note A_, 1 note __, 1 endchannel -; ed783 -Music_PokemonCenter_branch_ed783: ; ed783 +Music_PokemonCenter_branch_ed783: note F#, 1 note __, 5 note A_, 1 @@ -398,19 +390,15 @@ Music_PokemonCenter_branch_ed783: ; ed783 note A_, 1 note __, 1 endchannel -; ed78c -Music_PokemonCenter_Ch4: ; ed78c +Music_PokemonCenter_Ch4: togglenoise $3 notetype $c stereopanning $ff -Music_PokemonCenter_branch_ed792: ; ed792 +Music_PokemonCenter_branch_ed792: note G_, 6 note G_, 4 note G_, 2 note G_, 2 note G_, 2 loopchannel 0, Music_PokemonCenter_branch_ed792 -; ed79b - - diff --git a/crysaudio/music/pokemonchannel.asm b/crysaudio/music/pokemonchannel.asm index 4cab1f28..34d64262 100644 --- a/crysaudio/music/pokemonchannel.asm +++ b/crysaudio/music/pokemonchannel.asm @@ -1,11 +1,10 @@ -Music_PokemonChannel: ; ee45f - dbw $c0, Music_PokemonChannel_Ch1 - dbw $01, Music_PokemonChannel_Ch2 - dbw $02, Music_PokemonChannel_Ch3 - dbw $03, Music_PokemonChannel_Ch4 -; ee46b +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 -Music_PokemonChannel_Ch1: ; ee46b +Music_PokemonChannel_Ch1: tempo 128 volume $77 vibrato $8, $38 @@ -74,9 +73,8 @@ Music_PokemonChannel_Ch1: ; ee46b note D_, 2 note __, 6 endchannel -; ee4be -Music_PokemonChannel_Ch2: ; ee4be +Music_PokemonChannel_Ch2: dutycycle $1 vibrato $8, $38 stereopanning $ff @@ -145,9 +143,8 @@ Music_PokemonChannel_Ch2: ; ee4be note G_, 2 note __, 6 endchannel -; ee50e -Music_PokemonChannel_Ch3: ; ee50e +Music_PokemonChannel_Ch3: vibrato $8, $38 notetype $c, $25 stereopanning $f0 @@ -202,12 +199,11 @@ Music_PokemonChannel_Ch3: ; ee50e note G_, 1 note __, 3 endchannel -; ee549 -Music_PokemonChannel_Ch4: ; ee549 +Music_PokemonChannel_Ch4: togglenoise $3 notetype $c -Music_PokemonChannel_branch_ee54d: ; ee54d +Music_PokemonChannel_branch_ee54d: note A#, 3 note A#, 1 note D_, 2 @@ -233,6 +229,3 @@ Music_PokemonChannel_branch_ee54d: ; ee54d note A#, 4 note A#, 4 endchannel -; ee569 - - diff --git a/crysaudio/music/pokemonlullaby.asm b/crysaudio/music/pokemonlullaby.asm index 7abf53f9..86116a9a 100644 --- a/crysaudio/music/pokemonlullaby.asm +++ b/crysaudio/music/pokemonlullaby.asm @@ -1,15 +1,14 @@ -Music_PokemonLullaby: ; f6d79 - dbw $80, Music_PokemonLullaby_Ch1 - dbw $01, Music_PokemonLullaby_Ch2 - dbw $02, Music_PokemonLullaby_Ch3 -; f6d82 +Music_PokemonLullaby: + musicheader 3, 1, Music_PokemonLullaby_Ch1 + musicheader 1, 2, Music_PokemonLullaby_Ch2 + musicheader 1, 3, Music_PokemonLullaby_Ch3 -Music_PokemonLullaby_Ch1: ; f6d82 +Music_PokemonLullaby_Ch1: tempo 224 volume $77 dutycycle $3 tone $0001 -Music_PokemonLullaby_branch_f6d8c: ; f6d8c +Music_PokemonLullaby_branch_f6d8c: notetype $c, $a7 octave 3 note G_, 16 @@ -53,13 +52,12 @@ Music_PokemonLullaby_branch_f6d8c: ; f6d8c octave 3 note B_, 8 loopchannel 0, Music_PokemonLullaby_branch_f6d8c -; f6dc4 -Music_PokemonLullaby_Ch2: ; f6dc4 +Music_PokemonLullaby_Ch2: vibrato $10, $14 dutycycle $0 notetype $c, $b4 -Music_PokemonLullaby_branch_f6dcc: ; f6dcc +Music_PokemonLullaby_branch_f6dcc: note __, 16 note __, 10 octave 4 @@ -104,11 +102,10 @@ Music_PokemonLullaby_branch_f6dcc: ; f6dcc note E_, 16 note __, 14 loopchannel 0, Music_PokemonLullaby_branch_f6dcc -; f6e03 -Music_PokemonLullaby_Ch3: ; f6e03 +Music_PokemonLullaby_Ch3: notetype $c, $11 -Music_PokemonLullaby_branch_f6e06: ; f6e06 +Music_PokemonLullaby_branch_f6e06: stereopanning $f0 octave 4 note C_, 2 @@ -133,6 +130,3 @@ Music_PokemonLullaby_branch_f6e06: ; f6e06 note B_, 2 note A_, 2 loopchannel 0, Music_PokemonLullaby_branch_f6e06 -; f6e23 - - diff --git a/crysaudio/music/pokemonmarch.asm b/crysaudio/music/pokemonmarch.asm index c939dd88..346e042b 100644 --- a/crysaudio/music/pokemonmarch.asm +++ b/crysaudio/music/pokemonmarch.asm @@ -1,11 +1,10 @@ -Music_PokemonMarch: ; f6e23 - dbw $c0, Music_PokemonMarch_Ch1 - dbw $01, Music_PokemonMarch_Ch2 - dbw $02, Music_PokemonMarch_Ch3 - dbw $03, Music_PokemonMarch_Ch4 -; f6e2f +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 -Music_PokemonMarch_Ch1: ; f6e2f +Music_PokemonMarch_Ch1: tempo 144 volume $77 stereopanning $f0 @@ -21,7 +20,7 @@ Music_PokemonMarch_Ch1: ; f6e2f intensity $a2 note D_, 4 notetype $8, $a2 -Music_PokemonMarch_branch_f6e4c: ; f6e4c +Music_PokemonMarch_branch_f6e4c: callchannel Music_PokemonMarch_branch_f6eae note D#, 2 note C_, 2 @@ -97,9 +96,8 @@ Music_PokemonMarch_branch_f6e4c: ; f6e4c note G_, 4 note A#, 2 loopchannel 0, Music_PokemonMarch_branch_f6e4c -; f6eae -Music_PokemonMarch_branch_f6eae: ; f6eae +Music_PokemonMarch_branch_f6eae: note __, 4 octave 3 note D#, 1 @@ -110,9 +108,8 @@ Music_PokemonMarch_branch_f6eae: ; f6eae note D#, 2 note __, 2 endchannel -; f6eb8 -Music_PokemonMarch_branch_f6eb8: ; f6eb8 +Music_PokemonMarch_branch_f6eb8: note __, 4 note F_, 1 note E_, 1 @@ -122,9 +119,8 @@ Music_PokemonMarch_branch_f6eb8: ; f6eb8 note F_, 2 note __, 2 endchannel -; f6ec1 -Music_PokemonMarch_Ch2: ; f6ec1 +Music_PokemonMarch_Ch2: dutycycle $2 vibrato $10, $22 notetype $c, $b2 @@ -133,7 +129,7 @@ Music_PokemonMarch_Ch2: ; f6ec1 note G_, 4 note G_, 4 note G_, 4 -Music_PokemonMarch_branch_f6ece: ; f6ece +Music_PokemonMarch_branch_f6ece: notetype $c, $b7 octave 3 note G#, 12 @@ -234,14 +230,13 @@ Music_PokemonMarch_branch_f6ece: ; f6ece note G_, 1 note __, 5 loopchannel 0, Music_PokemonMarch_branch_f6ece -; f6f4d -Music_PokemonMarch_Ch3: ; f6f4d +Music_PokemonMarch_Ch3: stereopanning $f notetype $c, $16 note __, 16 notetype $8, $16 -Music_PokemonMarch_branch_f6f56: ; f6f56 +Music_PokemonMarch_branch_f6f56: callchannel Music_PokemonMarch_branch_f6fe8 note __, 2 octave 4 @@ -273,7 +268,7 @@ Music_PokemonMarch_branch_f6f56: ; f6f56 note D#, 2 note G_, 2 note G#, 2 -Music_PokemonMarch_branch_f6f7b: ; f6f7b +Music_PokemonMarch_branch_f6f7b: octave 3 note A#, 2 note __, 2 @@ -377,9 +372,8 @@ Music_PokemonMarch_branch_f6f7b: ; f6f7b note __, 2 note G#, 2 loopchannel 0, Music_PokemonMarch_branch_f6f56 -; f6fe8 -Music_PokemonMarch_branch_f6fe8: ; f6fe8 +Music_PokemonMarch_branch_f6fe8: octave 3 note G#, 2 note __, 2 @@ -398,14 +392,13 @@ Music_PokemonMarch_branch_f6fe8: ; f6fe8 octave 3 note G_, 2 endchannel -; f6ffa -Music_PokemonMarch_Ch4: ; f6ffa +Music_PokemonMarch_Ch4: stereopanning $f0 togglenoise $5 notetype $8 callchannel Music_PokemonMarch_branch_f704c -Music_PokemonMarch_branch_f7003: ; f7003 +Music_PokemonMarch_branch_f7003: callchannel Music_PokemonMarch_branch_f7042 note C_, 4 note C_, 2 @@ -441,9 +434,8 @@ Music_PokemonMarch_branch_f7003: ; f7003 notetype $8 callchannel Music_PokemonMarch_branch_f704c loopchannel 0, Music_PokemonMarch_branch_f7003 -; f7042 -Music_PokemonMarch_branch_f7042: ; f7042 +Music_PokemonMarch_branch_f7042: note C_, 4 note C_, 2 note C_, 4 @@ -454,9 +446,8 @@ Music_PokemonMarch_branch_f7042: ; f7042 note C#, 2 note C#, 2 endchannel -; f704c -Music_PokemonMarch_branch_f704c: ; f704c +Music_PokemonMarch_branch_f704c: note C_, 4 note C_, 2 note C_, 4 @@ -466,6 +457,3 @@ Music_PokemonMarch_branch_f704c: ; f704c note D_, 2 note C#, 2 endchannel -; f7055 - - diff --git a/crysaudio/music/postcredits.asm b/crysaudio/music/postcredits.asm index fd2aa8fe..0997828f 100644 --- a/crysaudio/music/postcredits.asm +++ b/crysaudio/music/postcredits.asm @@ -1,19 +1,17 @@ -Music_PostCredits: ; cfd9e - dbw $40, Music_PostCredits_Ch1 - dbw $01, Music_PostCredits_Ch2 -; cfda4 +Music_PostCredits: + musicheader 2, 1, Music_PostCredits_Ch1 + musicheader 1, 2, Music_PostCredits_Ch2 + db $2 - - -Music_PostCredits_Ch1: ; cfda5 - ftempo 271 +Music_PostCredits_Ch1: + tempo 271 volume $77 - forceoctave $3 + pitchoffset 0, D# dutycycle $2 notetype $c, $93 note __, 8 -Music_PostCredits_branch_cfdb2: ; cfdb2 +Music_PostCredits_branch_cfdb2: octave 3 note C_, 2 note E_, 2 @@ -131,10 +129,9 @@ Music_PostCredits_branch_cfdb2: ; cfdb2 octave 2 note G_, 2 loopchannel 0, Music_PostCredits_branch_cfdb2 -; cfe48 -Music_PostCredits_Ch2: ; cfe48 - forceoctave $3 +Music_PostCredits_Ch2: + pitchoffset 0, D# dutycycle $2 notetype $c, $a3 octave 5 @@ -145,7 +142,7 @@ Music_PostCredits_Ch2: ; cfe48 note F_, 2 intensity $73 note F_, 2 -Music_PostCredits_branch_cfe5a: ; cfe5a +Music_PostCredits_branch_cfe5a: intensity $a3 note G_, 2 intensity $73 @@ -265,5 +262,3 @@ Music_PostCredits_branch_cfe5a: ; cfe5a note E_, 2 note F_, 2 loopchannel 0, Music_PostCredits_branch_cfe5a -; cff04 - diff --git a/crysaudio/music/printer.asm b/crysaudio/music/printer.asm index eed30972..886f6b76 100644 --- a/crysaudio/music/printer.asm +++ b/crysaudio/music/printer.asm @@ -1,8 +1,7 @@ -Music_Printer: ; f07fd - dbw $02, Music_Printer_Ch3 -; f0800 +Music_Printer: + musicheader 1, 3, Music_Printer_Ch3 -Music_Printer_Ch3: ; f0800 +Music_Printer_Ch3: tempo 256 notetype $c, $20 octave 4 @@ -34,7 +33,7 @@ Music_Printer_Ch3: ; f0800 note __, 1 note F#, 1 note __, 1 -Music_Printer_branch_f0823: ; f0823 +Music_Printer_branch_f0823: note E_, 1 note __, 1 note B_, 1 @@ -318,5 +317,3 @@ Music_Printer_branch_f0823: ; f0823 note D#, 1 note __, 1 loopchannel 0, Music_Printer_branch_f0823 -; f0941 - diff --git a/crysaudio/music/profoak.asm b/crysaudio/music/profoak.asm index c2b67608..5e34e2c6 100644 --- a/crysaudio/music/profoak.asm +++ b/crysaudio/music/profoak.asm @@ -1,10 +1,9 @@ -Music_ProfOak: ; f4dea - dbw $80, Music_ProfOak_Ch1 - dbw $01, Music_ProfOak_Ch2 - dbw $02, Music_ProfOak_Ch3 -; f4df3 +Music_ProfOak: + musicheader 3, 1, Music_ProfOak_Ch1 + musicheader 1, 2, Music_ProfOak_Ch2 + musicheader 1, 3, Music_ProfOak_Ch3 -Music_ProfOak_Ch1: ; f4df3 +Music_ProfOak_Ch1: tempo 118 volume $77 vibrato $12, $34 @@ -22,28 +21,27 @@ Music_ProfOak_Ch1: ; f4df3 note G#, 8 intensity $97 note G#, 8 -Music_ProfOak_branch_f4e10: ; f4e10 +Music_ProfOak_branch_f4e10: intensity $91 callchannel Music_ProfOak_branch_f4e42 callchannel Music_ProfOak_branch_f4e42 callchannel Music_ProfOak_branch_f4e4d callchannel Music_ProfOak_branch_f4e4d loopchannel 2, Music_ProfOak_branch_f4e10 -Music_ProfOak_branch_f4e22: ; f4e22 +Music_ProfOak_branch_f4e22: callchannel Music_ProfOak_branch_f4e58 callchannel Music_ProfOak_branch_f4e58 callchannel Music_ProfOak_branch_f4e6c callchannel Music_ProfOak_branch_f4e6c - forceoctave $2 + pitchoffset 0, D_ callchannel Music_ProfOak_branch_f4e58 callchannel Music_ProfOak_branch_f4e58 - forceoctave $0 + pitchoffset 0, C_ callchannel Music_ProfOak_branch_f4e6c callchannel Music_ProfOak_branch_f4e6c loopchannel 0, Music_ProfOak_branch_f4e22 -; f4e42 -Music_ProfOak_branch_f4e42: ; f4e42 +Music_ProfOak_branch_f4e42: octave 2 note B_, 2 octave 3 @@ -55,9 +53,8 @@ Music_ProfOak_branch_f4e42: ; f4e42 note G#, 2 note E_, 2 endchannel -; f4e4d -Music_ProfOak_branch_f4e4d: ; f4e4d +Music_ProfOak_branch_f4e4d: octave 2 note B_, 2 octave 3 @@ -69,9 +66,8 @@ Music_ProfOak_branch_f4e4d: ; f4e4d note F#, 2 note D#, 2 endchannel -; f4e58 -Music_ProfOak_branch_f4e58: ; f4e58 +Music_ProfOak_branch_f4e58: octave 2 note A_, 2 octave 3 @@ -88,9 +84,8 @@ Music_ProfOak_branch_f4e58: ; f4e58 note E_, 2 intensity $91 endchannel -; f4e6c -Music_ProfOak_branch_f4e6c: ; f4e6c +Music_ProfOak_branch_f4e6c: octave 2 note B_, 1 octave 3 @@ -105,9 +100,8 @@ Music_ProfOak_branch_f4e6c: ; f4e6c note B_, 4 intensity $91 endchannel -; f4e7e -Music_ProfOak_Ch2: ; f4e7e +Music_ProfOak_Ch2: vibrato $12, $34 dutycycle $3 notetype $c, $a8 @@ -121,7 +115,7 @@ Music_ProfOak_Ch2: ; f4e7e intensity $a7 note B_, 10 dutycycle $2 -Music_ProfOak_branch_f4e92: ; f4e92 +Music_ProfOak_branch_f4e92: intensity $b2 octave 3 note B_, 2 @@ -159,7 +153,7 @@ Music_ProfOak_branch_f4e92: ; f4e92 loopchannel 2, Music_ProfOak_branch_f4e92 note __, 6 intensity $b4 -Music_ProfOak_branch_f4ebf: ; f4ebf +Music_ProfOak_branch_f4ebf: note C#, 6 octave 3 note A_, 1 @@ -208,9 +202,8 @@ Music_ProfOak_branch_f4ebf: ; f4ebf note E_, 1 note G#, 16 loopchannel 0, Music_ProfOak_branch_f4ebf -; f4ef5 -Music_ProfOak_Ch3: ; f4ef5 +Music_ProfOak_Ch3: stereopanning $f notetype $c, $14 note __, 4 @@ -230,27 +223,26 @@ Music_ProfOak_Ch3: ; f4ef5 note __, 1 note E_, 2 callchannel Music_ProfOak_branch_f4f3d -Music_ProfOak_branch_f4f0d: ; f4f0d +Music_ProfOak_branch_f4f0d: callchannel Music_ProfOak_branch_f4f3d callchannel Music_ProfOak_branch_f4f3d callchannel Music_ProfOak_branch_f4f4c callchannel Music_ProfOak_branch_f4f4c loopchannel 2, Music_ProfOak_branch_f4f0d -Music_ProfOak_branch_f4f1d: ; f4f1d +Music_ProfOak_branch_f4f1d: callchannel Music_ProfOak_branch_f4f5a callchannel Music_ProfOak_branch_f4f5a callchannel Music_ProfOak_branch_f4f69 callchannel Music_ProfOak_branch_f4f69 - forceoctave $2 + pitchoffset 0, D_ callchannel Music_ProfOak_branch_f4f5a callchannel Music_ProfOak_branch_f4f5a - forceoctave $0 + pitchoffset 0, C_ callchannel Music_ProfOak_branch_f4f69 callchannel Music_ProfOak_branch_f4f69 loopchannel 0, Music_ProfOak_branch_f4f1d -; f4f3d -Music_ProfOak_branch_f4f3d: ; f4f3d +Music_ProfOak_branch_f4f3d: note E_, 2 note __, 2 octave 4 @@ -266,9 +258,8 @@ Music_ProfOak_branch_f4f3d: ; f4f3d note __, 1 note E_, 2 endchannel -; f4f4c -Music_ProfOak_branch_f4f4c: ; f4f4c +Music_ProfOak_branch_f4f4c: octave 2 note B_, 2 note __, 2 @@ -283,9 +274,8 @@ Music_ProfOak_branch_f4f4c: ; f4f4c note __, 1 note D#, 2 endchannel -; f4f5a -Music_ProfOak_branch_f4f5a: ; f4f5a +Music_ProfOak_branch_f4f5a: octave 2 note A_, 2 note __, 2 @@ -301,9 +291,8 @@ Music_ProfOak_branch_f4f5a: ; f4f5a note __, 1 note C#, 2 endchannel -; f4f69 -Music_ProfOak_branch_f4f69: ; f4f69 +Music_ProfOak_branch_f4f69: octave 2 note G#, 2 note __, 2 @@ -320,6 +309,3 @@ Music_ProfOak_branch_f4f69: ; f4f69 octave 2 note B_, 2 endchannel -; f4f79 - - diff --git a/crysaudio/music/profoakspokemontalk.asm b/crysaudio/music/profoakspokemontalk.asm index 1678fd46..bd299466 100644 --- a/crysaudio/music/profoakspokemontalk.asm +++ b/crysaudio/music/profoakspokemontalk.asm @@ -1,13 +1,11 @@ -Music_ProfOaksPokemonTalk: ; f4c9f - dbw $80, Music_ProfOaksPokemonTalk_Ch1 - dbw $01, Music_ProfOaksPokemonTalk_Ch2 - dbw $02, Music_ProfOaksPokemonTalk_Ch3 -; f4ca8 +Music_ProfOaksPokemonTalk: + musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1 + musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2 + musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3 + db $3 - - -Music_ProfOaksPokemonTalk_Ch1: ; f4ca9 +Music_ProfOaksPokemonTalk_Ch1: tempo 164 volume $77 stereopanning $f @@ -25,7 +23,7 @@ Music_ProfOaksPokemonTalk_Ch1: ; f4ca9 note D#, 1 note E_, 1 note F#, 1 -Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3 +Music_ProfOaksPokemonTalk_branch_f4cc3: note D#, 6 note C#, 1 octave 3 @@ -133,9 +131,8 @@ Music_ProfOaksPokemonTalk_branch_f4cc3: ; f4cc3 note F#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4cc3 -; f4d31 -Music_ProfOaksPokemonTalk_Ch2: ; f4d31 +Music_ProfOaksPokemonTalk_Ch2: vibrato $8, $24 dutycycle $3 notetype $c, $a7 @@ -158,7 +155,7 @@ Music_ProfOaksPokemonTalk_Ch2: ; f4d31 note F#, 1 note G#, 1 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d +Music_ProfOaksPokemonTalk_branch_f4d4d: note B_, 6 note A#, 1 note G#, 1 @@ -209,9 +206,8 @@ Music_ProfOaksPokemonTalk_branch_f4d4d: ; f4d4d note A#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d4d -; f4d82 -Music_ProfOaksPokemonTalk_Ch3: ; f4d82 +Music_ProfOaksPokemonTalk_Ch3: vibrato $6, $38 notetype $c, $25 stereopanning $f0 @@ -226,7 +222,7 @@ Music_ProfOaksPokemonTalk_Ch3: ; f4d82 note C#, 1 octave 2 note A#, 1 -Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95 +Music_ProfOaksPokemonTalk_branch_f4d95: note B_, 6 octave 3 note D#, 1 @@ -309,6 +305,3 @@ Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95 note A#, 1 note __, 1 loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95 -; f4dea - - diff --git a/crysaudio/music/rivalbattle.asm b/crysaudio/music/rivalbattle.asm index 4be71571..4ba8840b 100644 --- a/crysaudio/music/rivalbattle.asm +++ b/crysaudio/music/rivalbattle.asm @@ -1,11 +1,10 @@ -Music_RivalBattle: ; e974f - dbw $80, Music_RivalBattle_Ch1 - dbw $01, Music_RivalBattle_Ch2 - dbw $02, Music_RivalBattle_Ch3 -; e9758 +Music_RivalBattle: + musicheader 3, 1, Music_RivalBattle_Ch1 + musicheader 1, 2, Music_RivalBattle_Ch2 + musicheader 1, 3, Music_RivalBattle_Ch3 -Music_RivalBattle_Ch1: ; e9758 - ftempo 102 +Music_RivalBattle_Ch1: + tempo 102 volume $77 dutycycle $3 tone $0002 @@ -23,7 +22,7 @@ Music_RivalBattle_Ch1: ; e9758 intensity $b7 note C#, 6 note E_, 4 -Music_RivalBattle_branch_e9777: ; e9777 +Music_RivalBattle_branch_e9777: intensity $b2 octave 2 note A#, 6 @@ -40,7 +39,7 @@ Music_RivalBattle_branch_e9777: ; e9777 note C#, 4 intensity $b7 note C#, 10 -Music_RivalBattle_branch_e978f: ; e978f +Music_RivalBattle_branch_e978f: intensity $b2 octave 3 note G#, 6 @@ -56,7 +55,7 @@ Music_RivalBattle_branch_e978f: ; e978f note B_, 4 intensity $4d note B_, 10 -Music_RivalBattle_branch_e97a6: ; e97a6 +Music_RivalBattle_branch_e97a6: intensity $b7 note A#, 6 note F#, 6 @@ -179,7 +178,7 @@ Music_RivalBattle_branch_e97a6: ; e97a6 note E_, 2 note D#, 2 note C#, 2 -Music_RivalBattle_branch_e9837: ; e9837 +Music_RivalBattle_branch_e9837: octave 3 note A#, 2 note E_, 2 @@ -285,9 +284,8 @@ Music_RivalBattle_branch_e9837: ; e9837 octave 3 note C#, 10 loopchannel 0, Music_RivalBattle_branch_e97a6 -; e98af -Music_RivalBattle_Ch2: ; e98af +Music_RivalBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -337,7 +335,7 @@ Music_RivalBattle_Ch2: ; e98af note F#, 6 intensity $c2 note G#, 4 -Music_RivalBattle_branch_e98ea: ; e98ea +Music_RivalBattle_branch_e98ea: intensity $c2 note D#, 6 intensity $c7 @@ -354,7 +352,7 @@ Music_RivalBattle_branch_e98ea: ; e98ea note B_, 1 octave 4 note C_, 1 -Music_RivalBattle_branch_e9903: ; e9903 +Music_RivalBattle_branch_e9903: intensity $c2 note C#, 6 intensity $c7 @@ -369,7 +367,7 @@ Music_RivalBattle_branch_e9903: ; e9903 note E_, 4 intensity $b7 note E_, 6 -Music_RivalBattle_branch_e991a: ; e991a +Music_RivalBattle_branch_e991a: callchannel Music_RivalBattle_branch_e99e0 intensity $b0 note G#, 8 @@ -474,7 +472,7 @@ Music_RivalBattle_branch_e991a: ; e991a note G#, 8 intensity $c7 note F_, 8 -Music_RivalBattle_branch_e99a6: ; e99a6 +Music_RivalBattle_branch_e99a6: intensity $c2 octave 3 note A#, 6 @@ -493,7 +491,7 @@ Music_RivalBattle_branch_e99a6: ; e99a6 note C#, 6 intensity $9a note C#, 4 -Music_RivalBattle_branch_e99c1: ; e99c1 +Music_RivalBattle_branch_e99c1: intensity $c2 octave 3 note G#, 6 @@ -513,9 +511,8 @@ Music_RivalBattle_branch_e99c1: ; e99c1 octave 4 note D_, 4 loopchannel 0, Music_RivalBattle_branch_e991a -; e99e0 -Music_RivalBattle_branch_e99e0: ; e99e0 +Music_RivalBattle_branch_e99e0: intensity $c7 note D#, 10 intensity $c4 @@ -536,9 +533,8 @@ Music_RivalBattle_branch_e99e0: ; e99e0 intensity $b7 note F_, 8 endchannel -; e99fb -Music_RivalBattle_Ch3: ; e99fb +Music_RivalBattle_Ch3: notetype $c, $19 octave 3 note F#, 2 @@ -554,7 +550,7 @@ Music_RivalBattle_Ch3: ; e99fb octave 3 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a0c: ; e9a0c +Music_RivalBattle_branch_e9a0c: note D#, 2 note C#, 2 note D#, 2 @@ -563,7 +559,7 @@ Music_RivalBattle_branch_e9a0c: ; e9a0c note D#, 2 note C#, 2 loopchannel 4, Music_RivalBattle_branch_e9a0c -Music_RivalBattle_branch_e9a17: ; e9a17 +Music_RivalBattle_branch_e9a17: octave 3 note C#, 2 octave 2 @@ -586,7 +582,7 @@ Music_RivalBattle_branch_e9a17: ; e9a17 note C_, 2 note C#, 2 note D_, 2 -Music_RivalBattle_branch_e9a30: ; e9a30 +Music_RivalBattle_branch_e9a30: callchannel Music_RivalBattle_branch_e9b47 octave 2 note A#, 2 @@ -633,14 +629,14 @@ Music_RivalBattle_branch_e9a30: ; e9a30 octave 3 note F_, 2 callchannel Music_RivalBattle_branch_e9b50 -Music_RivalBattle_branch_e9a66: ; e9a66 +Music_RivalBattle_branch_e9a66: note C#, 2 note G#, 2 loopchannel 4, Music_RivalBattle_branch_e9a66 callchannel Music_RivalBattle_branch_e9b5c note G#, 2 note F#, 2 -Music_RivalBattle_branch_e9a71: ; e9a71 +Music_RivalBattle_branch_e9a71: octave 2 note A#, 2 octave 3 @@ -698,29 +694,29 @@ Music_RivalBattle_branch_e9a71: ; e9a71 note F#, 2 note G_, 2 note G#, 2 -Music_RivalBattle_branch_e9ab3: ; e9ab3 +Music_RivalBattle_branch_e9ab3: note D#, 2 note A#, 2 loopchannel 4, Music_RivalBattle_branch_e9ab3 -Music_RivalBattle_branch_e9ab9: ; e9ab9 +Music_RivalBattle_branch_e9ab9: note D#, 2 note A_, 2 loopchannel 4, Music_RivalBattle_branch_e9ab9 -Music_RivalBattle_branch_e9abf: ; e9abf +Music_RivalBattle_branch_e9abf: note D#, 2 note G#, 2 loopchannel 4, Music_RivalBattle_branch_e9abf -Music_RivalBattle_branch_e9ac5: ; e9ac5 +Music_RivalBattle_branch_e9ac5: note D#, 2 note G_, 2 loopchannel 12, Music_RivalBattle_branch_e9ac5 -Music_RivalBattle_branch_e9acb: ; e9acb +Music_RivalBattle_branch_e9acb: octave 2 note B_, 2 octave 3 note D#, 2 loopchannel 4, Music_RivalBattle_branch_e9acb -Music_RivalBattle_branch_e9ad3: ; e9ad3 +Music_RivalBattle_branch_e9ad3: octave 2 note B_, 2 octave 3 @@ -779,7 +775,7 @@ Music_RivalBattle_branch_e9ad3: ; e9ad3 note C#, 8 note D#, 8 note F_, 8 -Music_RivalBattle_branch_e9b10: ; e9b10 +Music_RivalBattle_branch_e9b10: octave 2 note A#, 2 octave 3 @@ -787,7 +783,7 @@ Music_RivalBattle_branch_e9b10: ; e9b10 loopchannel 7, Music_RivalBattle_branch_e9b10 note E_, 2 note D#, 2 -Music_RivalBattle_branch_e9b1a: ; e9b1a +Music_RivalBattle_branch_e9b1a: octave 2 note A#, 2 octave 3 @@ -799,7 +795,7 @@ Music_RivalBattle_branch_e9b1a: ; e9b1a note F#, 2 note F_, 2 note E_, 2 -Music_RivalBattle_branch_e9b28: ; e9b28 +Music_RivalBattle_branch_e9b28: octave 2 note G#, 2 octave 3 @@ -807,7 +803,7 @@ Music_RivalBattle_branch_e9b28: ; e9b28 loopchannel 7, Music_RivalBattle_branch_e9b28 note D_, 2 note C#, 2 -Music_RivalBattle_branch_e9b32: ; e9b32 +Music_RivalBattle_branch_e9b32: octave 2 note G#, 2 octave 3 @@ -823,18 +819,16 @@ Music_RivalBattle_branch_e9b32: ; e9b32 note D#, 2 note D_, 2 loopchannel 0, Music_RivalBattle_branch_e9a30 -; e9b47 -Music_RivalBattle_branch_e9b47: ; e9b47 +Music_RivalBattle_branch_e9b47: octave 2 note A#, 2 octave 3 note D#, 2 loopchannel 4, Music_RivalBattle_branch_e9b47 endchannel -; e9b50 -Music_RivalBattle_branch_e9b50: ; e9b50 +Music_RivalBattle_branch_e9b50: note C#, 2 note G#, 2 octave 4 @@ -847,18 +841,16 @@ Music_RivalBattle_branch_e9b50: ; e9b50 note C#, 2 note G#, 2 endchannel -; e9b5c -Music_RivalBattle_branch_e9b5c: ; e9b5c +Music_RivalBattle_branch_e9b5c: octave 2 note B_, 2 octave 3 note F#, 2 loopchannel 7, Music_RivalBattle_branch_e9b5c endchannel -; e9b65 -Music_RivalBattle_branch_e9b65: ; e9b65 +Music_RivalBattle_branch_e9b65: octave 3 note D#, 2 note A#, 2 @@ -866,6 +858,3 @@ Music_RivalBattle_branch_e9b65: ; e9b65 note D#, 2 loopchannel 2, Music_RivalBattle_branch_e9b65 endchannel -; e9b6f - - diff --git a/crysaudio/music/rocketbattle.asm b/crysaudio/music/rocketbattle.asm index 495da3c9..30c90b08 100644 --- a/crysaudio/music/rocketbattle.asm +++ b/crysaudio/music/rocketbattle.asm @@ -1,11 +1,10 @@ -Music_RocketBattle: ; e9b6f - dbw $80, Music_RocketBattle_Ch1 - dbw $01, Music_RocketBattle_Ch2 - dbw $02, Music_RocketBattle_Ch3 -; e9b78 +Music_RocketBattle: + musicheader 3, 1, Music_RocketBattle_Ch1 + musicheader 1, 2, Music_RocketBattle_Ch2 + musicheader 1, 3, Music_RocketBattle_Ch3 -Music_RocketBattle_Ch1: ; e9b78 - ftempo 101 +Music_RocketBattle_Ch1: + tempo 101 volume $77 dutycycle $3 tone $0002 @@ -48,7 +47,7 @@ Music_RocketBattle_Ch1: ; e9b78 note C_, 1 octave 2 note B_, 1 -Music_RocketBattle_branch_e9bad: ; e9bad +Music_RocketBattle_branch_e9bad: intensity $b2 octave 3 note C_, 6 @@ -62,7 +61,7 @@ Music_RocketBattle_branch_e9bad: ; e9bad note C_, 6 intensity $b7 note D_, 4 -Music_RocketBattle_branch_e9bc1: ; e9bc1 +Music_RocketBattle_branch_e9bc1: intensity $b2 octave 4 note E_, 6 @@ -116,7 +115,7 @@ Music_RocketBattle_branch_e9bc1: ; e9bc1 note D#, 2 note D_, 2 note F_, 2 -Music_RocketBattle_branch_e9c02: ; e9c02 +Music_RocketBattle_branch_e9c02: octave 4 note E_, 2 octave 3 @@ -291,7 +290,7 @@ Music_RocketBattle_branch_e9c02: ; e9c02 intensity $b7 note A#, 2 note G_, 4 -Music_RocketBattle_branch_e9cc5: ; e9cc5 +Music_RocketBattle_branch_e9cc5: intensity $b2 note F_, 6 note F_, 4 @@ -389,9 +388,8 @@ Music_RocketBattle_branch_e9cc5: ; e9cc5 note D_, 2 note F_, 2 loopchannel 0, Music_RocketBattle_branch_e9c02 -; e9d3e -Music_RocketBattle_Ch2: ; e9d3e +Music_RocketBattle_Ch2: dutycycle $3 vibrato $8, $36 tone $0001 @@ -438,7 +436,7 @@ Music_RocketBattle_Ch2: ; e9d3e note G#, 1 note A_, 1 note G#, 1 -Music_RocketBattle_branch_e9d7b: ; e9d7b +Music_RocketBattle_branch_e9d7b: intensity $c2 octave 3 note A_, 6 @@ -454,7 +452,7 @@ Music_RocketBattle_branch_e9d7b: ; e9d7b note A_, 6 intensity $4a note G#, 4 -Music_RocketBattle_branch_e9d91: ; e9d91 +Music_RocketBattle_branch_e9d91: intensity $c2 octave 4 note A_, 6 @@ -476,7 +474,7 @@ Music_RocketBattle_branch_e9d91: ; e9d91 note F_, 16 intensity $b7 note F_, 16 -Music_RocketBattle_branch_e9db1: ; e9db1 +Music_RocketBattle_branch_e9db1: callchannel Music_RocketBattle_branch_e9ea0 intensity $b0 note F_, 8 @@ -605,7 +603,7 @@ Music_RocketBattle_branch_e9db1: ; e9db1 note G_, 1 note G#, 1 note A_, 8 -Music_RocketBattle_branch_e9e5a: ; e9e5a +Music_RocketBattle_branch_e9e5a: intensity $c2 octave 3 note A#, 6 @@ -657,9 +655,8 @@ Music_RocketBattle_branch_e9e5a: ; e9e5a intensity $c7 note A#, 8 loopchannel 0, Music_RocketBattle_branch_e9db1 -; e9ea0 -Music_RocketBattle_branch_e9ea0: ; e9ea0 +Music_RocketBattle_branch_e9ea0: intensity $c6 octave 4 note A_, 6 @@ -669,9 +666,8 @@ Music_RocketBattle_branch_e9ea0: ; e9ea0 note G#, 6 note E_, 4 endchannel -; e9eaa -Music_RocketBattle_Ch3: ; e9eaa +Music_RocketBattle_Ch3: notetype $c, $19 octave 3 note A_, 2 @@ -704,7 +700,7 @@ Music_RocketBattle_Ch3: ; e9eaa octave 2 note B_, 2 note A#, 2 -Music_RocketBattle_branch_e9ecc: ; e9ecc +Music_RocketBattle_branch_e9ecc: callchannel Music_RocketBattle_branch_e9fe6 loopchannel 3, Music_RocketBattle_branch_e9ecc octave 2 @@ -719,7 +715,7 @@ Music_RocketBattle_branch_e9ecc: ; e9ecc note F_, 2 note E_, 2 note D_, 2 -Music_RocketBattle_branch_e9edf: ; e9edf +Music_RocketBattle_branch_e9edf: callchannel Music_RocketBattle_branch_e9fe6 loopchannel 3, Music_RocketBattle_branch_e9edf octave 2 @@ -740,7 +736,7 @@ Music_RocketBattle_branch_e9edf: ; e9edf octave 3 note F_, 2 callchannel Music_RocketBattle_branch_ea01d -Music_RocketBattle_branch_e9efe: ; e9efe +Music_RocketBattle_branch_e9efe: callchannel Music_RocketBattle_branch_e9ff3 callchannel Music_RocketBattle_branch_ea010 octave 3 @@ -774,7 +770,7 @@ Music_RocketBattle_branch_e9efe: ; e9efe note A_, 2 octave 3 note E_, 2 -Music_RocketBattle_branch_e9f25: ; e9f25 +Music_RocketBattle_branch_e9f25: octave 2 note A#, 2 octave 3 @@ -807,7 +803,7 @@ Music_RocketBattle_branch_e9f25: ; e9f25 note D_, 2 callchannel Music_RocketBattle_branch_ea02a callchannel Music_RocketBattle_branch_ea02a -Music_RocketBattle_branch_e9f4e: ; e9f4e +Music_RocketBattle_branch_e9f4e: octave 2 note A_, 2 octave 3 @@ -833,7 +829,7 @@ Music_RocketBattle_branch_e9f4e: ; e9f4e note A_, 2 note G_, 2 note F_, 2 -Music_RocketBattle_branch_e9f6a: ; e9f6a +Music_RocketBattle_branch_e9f6a: octave 2 note A#, 2 octave 3 @@ -849,7 +845,7 @@ Music_RocketBattle_branch_e9f6a: ; e9f6a note D_, 2 note C#, 2 note D_, 2 -Music_RocketBattle_branch_e9f7c: ; e9f7c +Music_RocketBattle_branch_e9f7c: octave 2 note A_, 2 octave 3 @@ -863,7 +859,7 @@ Music_RocketBattle_branch_e9f7c: ; e9f7c note C_, 2 octave 2 note A#, 2 -Music_RocketBattle_branch_e9f8c: ; e9f8c +Music_RocketBattle_branch_e9f8c: octave 2 note A_, 2 octave 3 @@ -879,7 +875,7 @@ Music_RocketBattle_branch_e9f8c: ; e9f8c note A_, 2 note G_, 2 note A#, 2 -Music_RocketBattle_branch_e9f9e: ; e9f9e +Music_RocketBattle_branch_e9f9e: octave 2 note A#, 2 octave 3 @@ -887,7 +883,7 @@ Music_RocketBattle_branch_e9f9e: ; e9f9e loopchannel 7, Music_RocketBattle_branch_e9f9e note E_, 2 note F_, 2 -Music_RocketBattle_branch_e9fa8: ; e9fa8 +Music_RocketBattle_branch_e9fa8: octave 2 note A#, 2 octave 3 @@ -932,9 +928,8 @@ Music_RocketBattle_branch_e9fa8: ; e9fa8 note F_, 2 callchannel Music_RocketBattle_branch_ea01d loopchannel 0, Music_RocketBattle_branch_e9efe -; e9fe6 -Music_RocketBattle_branch_e9fe6: ; e9fe6 +Music_RocketBattle_branch_e9fe6: octave 2 note A_, 2 octave 3 @@ -948,9 +943,8 @@ Music_RocketBattle_branch_e9fe6: ; e9fe6 note G_, 2 note F_, 2 endchannel -; e9ff3 -Music_RocketBattle_branch_e9ff3: ; e9ff3 +Music_RocketBattle_branch_e9ff3: octave 2 note A_, 2 octave 3 @@ -980,9 +974,8 @@ Music_RocketBattle_branch_e9ff3: ; e9ff3 note D#, 2 note D_, 2 endchannel -; ea010 -Music_RocketBattle_branch_ea010: ; ea010 +Music_RocketBattle_branch_ea010: octave 2 note A#, 2 octave 3 @@ -996,9 +989,8 @@ Music_RocketBattle_branch_ea010: ; ea010 octave 2 note A#, 2 endchannel -; ea01d -Music_RocketBattle_branch_ea01d: ; ea01d +Music_RocketBattle_branch_ea01d: octave 2 note A#, 2 octave 3 @@ -1012,18 +1004,16 @@ Music_RocketBattle_branch_ea01d: ; ea01d octave 3 note F_, 2 endchannel -; ea02a -Music_RocketBattle_branch_ea02a: ; ea02a +Music_RocketBattle_branch_ea02a: octave 2 note A_, 2 octave 3 note E_, 2 loopchannel 4, Music_RocketBattle_branch_ea02a endchannel -; ea033 -Music_RocketBattle_branch_ea033: ; ea033 +Music_RocketBattle_branch_ea033: octave 2 note A_, 2 octave 3 @@ -1037,6 +1027,3 @@ Music_RocketBattle_branch_ea033: ; ea033 octave 2 note A_, 2 endchannel -; ea040 - - diff --git a/crysaudio/music/rockethideout.asm b/crysaudio/music/rockethideout.asm index 90f1fa82..6c3a116a 100644 --- a/crysaudio/music/rockethideout.asm +++ b/crysaudio/music/rockethideout.asm @@ -1,11 +1,10 @@ -Music_RocketHideout: ; eeb75 - dbw $c0, Music_RocketHideout_Ch1 - dbw $01, Music_RocketHideout_Ch2 - dbw $02, Music_RocketHideout_Ch3 - dbw $03, Music_RocketHideout_Ch4 -; eeb81 +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 -Music_RocketHideout_Ch1: ; eeb81 +Music_RocketHideout_Ch1: tempo 144 volume $77 dutycycle $3 @@ -13,10 +12,10 @@ Music_RocketHideout_Ch1: ; eeb81 vibrato $10, $44 notetype $c, $b3 stereopanning $f0 -Music_RocketHideout_branch_eeb93: ; eeb93 +Music_RocketHideout_branch_eeb93: note __, 16 loopchannel 4, Music_RocketHideout_branch_eeb93 -Music_RocketHideout_branch_eeb98: ; eeb98 +Music_RocketHideout_branch_eeb98: octave 2 note D#, 2 note __, 2 @@ -114,19 +113,18 @@ Music_RocketHideout_branch_eeb98: ; eeb98 note __, 16 note A_, 16 intensity $b3 -Music_RocketHideout_branch_eebfe: ; eebfe +Music_RocketHideout_branch_eebfe: note __, 16 loopchannel 4, Music_RocketHideout_branch_eebfe loopchannel 0, Music_RocketHideout_branch_eeb93 -; eec07 -Music_RocketHideout_Ch2: ; eec07 +Music_RocketHideout_Ch2: dutycycle $3 tone $0002 vibrato $0, $f0 notetype $c, $c4 stereopanning $f -Music_RocketHideout_branch_eec14: ; eec14 +Music_RocketHideout_branch_eec14: octave 2 note D#, 2 note __, 2 @@ -221,11 +219,10 @@ Music_RocketHideout_branch_eec14: ; eec14 note G_, 2 note __, 8 loopchannel 0, Music_RocketHideout_branch_eec14 -; eec79 -Music_RocketHideout_Ch3: ; eec79 +Music_RocketHideout_Ch3: notetype $c, $19 -Music_RocketHideout_branch_eec7c: ; eec7c +Music_RocketHideout_branch_eec7c: octave 2 note D#, 2 note __, 2 @@ -237,7 +234,7 @@ Music_RocketHideout_branch_eec7c: ; eec7c note A_, 2 note __, 8 loopchannel 6, Music_RocketHideout_branch_eec7c -Music_RocketHideout_branch_eec8a: ; eec8a +Music_RocketHideout_branch_eec8a: note F_, 2 note __, 2 octave 3 @@ -252,7 +249,7 @@ Music_RocketHideout_branch_eec8a: ; eec8a note B_, 2 note __, 8 loopchannel 2, Music_RocketHideout_branch_eec8a -Music_RocketHideout_branch_eec9b: ; eec9b +Music_RocketHideout_branch_eec9b: note C#, 2 note __, 2 note G#, 4 @@ -261,7 +258,7 @@ Music_RocketHideout_branch_eec9b: ; eec9b octave 3 note C#, 16 loopchannel 2, Music_RocketHideout_branch_eec9b -Music_RocketHideout_branch_eeca6: ; eeca6 +Music_RocketHideout_branch_eeca6: octave 2 note C#, 2 note __, 2 @@ -274,9 +271,8 @@ Music_RocketHideout_branch_eeca6: ; eeca6 note __, 8 loopchannel 2, Music_RocketHideout_branch_eeca6 loopchannel 0, Music_RocketHideout_branch_eec7c -; eecb8 -Music_RocketHideout_Ch4: ; eecb8 +Music_RocketHideout_Ch4: togglenoise $0 notetype $c stereopanning $f @@ -287,7 +283,7 @@ Music_RocketHideout_Ch4: ; eecb8 note D#, 1 note D#, 1 callchannel Music_RocketHideout_branch_eecdb -Music_RocketHideout_branch_eecc7: ; eecc7 +Music_RocketHideout_branch_eecc7: callchannel Music_RocketHideout_branch_eecdb note E_, 4 callchannel Music_RocketHideout_branch_eecdb @@ -297,9 +293,8 @@ Music_RocketHideout_branch_eecc7: ; eecc7 callchannel Music_RocketHideout_branch_eecdb note F#, 4 loopchannel 0, Music_RocketHideout_branch_eecc7 -; eecdb -Music_RocketHideout_branch_eecdb: ; eecdb +Music_RocketHideout_branch_eecdb: stereopanning $f0 note D#, 1 note D#, 1 @@ -310,6 +305,3 @@ Music_RocketHideout_branch_eecdb: ; eecdb stereopanning $f0 note A_, 4 endchannel -; eece8 - - diff --git a/crysaudio/music/rockettheme.asm b/crysaudio/music/rockettheme.asm index 3f53452e..6f13d8b6 100644 --- a/crysaudio/music/rockettheme.asm +++ b/crysaudio/music/rockettheme.asm @@ -1,11 +1,10 @@ -Music_RocketTheme: ; f766d - dbw $c0, Music_RocketTheme_Ch1 - dbw $01, Music_RocketTheme_Ch2 - dbw $02, Music_RocketTheme_Ch3 - dbw $03, Music_RocketTheme_Ch4 -; f7679 +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 -Music_RocketTheme_Ch1: ; f7679 +Music_RocketTheme_Ch1: tempo 128 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_RocketTheme_Ch1: ; f7679 octave 4 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f768b: ; f768b +Music_RocketTheme_branch_f768b: dutycycle $3 notetype $c, $a8 callchannel Music_RocketTheme_branch_f74e6 @@ -87,7 +86,7 @@ Music_RocketTheme_branch_f768b: ; f768b note E_, 2 note D#, 2 note D_, 2 -Music_RocketTheme_branch_f76ef: ; f76ef +Music_RocketTheme_branch_f76ef: note __, 4 note F_, 2 note __, 14 @@ -103,19 +102,19 @@ Music_RocketTheme_branch_f76ef: ; f76ef note __, 2 note D#, 2 note C_, 2 -Music_RocketTheme_branch_f7701: ; f7701 +Music_RocketTheme_branch_f7701: note F#, 2 note A_, 2 loopchannel 4, Music_RocketTheme_branch_f7701 -Music_RocketTheme_branch_f7707: ; f7707 +Music_RocketTheme_branch_f7707: note G_, 2 note A#, 2 loopchannel 4, Music_RocketTheme_branch_f7707 -Music_RocketTheme_branch_f770d: ; f770d +Music_RocketTheme_branch_f770d: note G#, 2 note B_, 2 loopchannel 4, Music_RocketTheme_branch_f770d -Music_RocketTheme_branch_f7713: ; f7713 +Music_RocketTheme_branch_f7713: octave 3 note A_, 2 octave 4 @@ -128,9 +127,8 @@ Music_RocketTheme_branch_f7713: ; f7713 note C_, 1 note D_, 1 loopchannel 0, Music_RocketTheme_branch_f768b -; f7727 -Music_RocketTheme_branch_f7727: ; f7727 +Music_RocketTheme_branch_f7727: note __, 7 note B_, 1 octave 4 @@ -154,9 +152,8 @@ Music_RocketTheme_branch_f7727: ; f7727 note A#, 2 note __, 10 endchannel -; f773e -Music_RocketTheme_Ch2: ; f773e +Music_RocketTheme_Ch2: stereopanning $ff vibrato $4, $64 dutycycle $3 @@ -164,7 +161,7 @@ Music_RocketTheme_Ch2: ; f773e octave 5 note C_, 1 note D_, 1 -Music_RocketTheme_branch_f774b: ; f774b +Music_RocketTheme_branch_f774b: notetype $c, $b7 callchannel Music_RocketTheme_branch_f7547 intensity $b7 @@ -291,9 +288,8 @@ Music_RocketTheme_branch_f774b: ; f774b note C_, 2 note D_, 2 loopchannel 0, Music_RocketTheme_branch_f774b -; f7800 -Music_RocketTheme_branch_f7800: ; f7800 +Music_RocketTheme_branch_f7800: notetype $6, $b7 note __, 7 octave 4 @@ -320,9 +316,8 @@ Music_RocketTheme_branch_f7800: ; f7800 note D#, 2 note __, 2 endchannel -; f781c -Music_RocketTheme_branch_f781c: ; f781c +Music_RocketTheme_branch_f781c: octave 3 note B_, 1 octave 4 @@ -333,14 +328,13 @@ Music_RocketTheme_branch_f781c: ; f781c note F_, 8 note C_, 4 endchannel -; f7826 -Music_RocketTheme_Ch3: ; f7826 +Music_RocketTheme_Ch3: stereopanning $f0 vibrato $4, $22 notetype $c, $14 note __, 2 -Music_RocketTheme_branch_f782f: ; f782f +Music_RocketTheme_branch_f782f: notetype $c, $14 callchannel Music_RocketTheme_branch_f75bf callchannel Music_RocketTheme_branch_f75fe @@ -447,13 +441,12 @@ Music_RocketTheme_branch_f782f: ; f782f note G#, 1 note __, 1 loopchannel 0, Music_RocketTheme_branch_f782f -; f78be -Music_RocketTheme_Ch4: ; f78be +Music_RocketTheme_Ch4: togglenoise $3 notetype $c note __, 2 -Music_RocketTheme_branch_f78c3: ; f78c3 +Music_RocketTheme_branch_f78c3: callchannel Music_RocketTheme_branch_f765c callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f7664 @@ -463,7 +456,7 @@ Music_RocketTheme_branch_f78c3: ; f78c3 callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f7664 callchannel Music_RocketTheme_branch_f765c -Music_RocketTheme_branch_f78de: ; f78de +Music_RocketTheme_branch_f78de: note A#, 2 note F#, 2 note D_, 2 @@ -479,6 +472,3 @@ Music_RocketTheme_branch_f78de: ; f78de callchannel Music_RocketTheme_branch_f765c callchannel Music_RocketTheme_branch_f765c loopchannel 0, Music_RocketTheme_branch_f78c3 -; f78fd - - diff --git a/crysaudio/music/route1.asm b/crysaudio/music/route1.asm index d988c4bc..8a537b9f 100644 --- a/crysaudio/music/route1.asm +++ b/crysaudio/music/route1.asm @@ -1,13 +1,11 @@ -Music_Route1: ; ec000 - dbw $80, Music_Route1_Ch1 - dbw $01, Music_Route1_Ch2 - dbw $02, Music_Route1_Ch3 -; ec009 +Music_Route1: + musicheader 3, 1, Music_Route1_Ch1 + musicheader 1, 2, Music_Route1_Ch2 + musicheader 1, 3, Music_Route1_Ch3 + db $3 - - -Music_Route1_Ch1: ; ec00a +Music_Route1_Ch1: stereopanning $f tempo 184 volume $77 @@ -61,7 +59,7 @@ Music_Route1_Ch1: ; ec00a note D_, 2 intensity $83 note __, 2 -Music_Route1_branch_ec04a: ; ec04a +Music_Route1_branch_ec04a: intensity $83 note __, 2 octave 4 @@ -204,9 +202,8 @@ Music_Route1_branch_ec04a: ; ec04a note D_, 2 note __, 2 loopchannel 0, Music_Route1_branch_ec04a -; ec0eb -Music_Route1_Ch2: ; ec0eb +Music_Route1_Ch2: stereopanning $f0 vibrato $12, $22 dutycycle $2 @@ -233,7 +230,7 @@ Music_Route1_Ch2: ; ec0eb note D_, 1 note E_, 1 dutycycle $2 -Music_Route1_branch_ec112: ; ec112 +Music_Route1_branch_ec112: intensity $82 callchannel Music_Route1_branch_ec188 intensity $81 @@ -324,9 +321,8 @@ Music_Route1_branch_ec112: ; ec112 note D_, 1 note E_, 1 loopchannel 0, Music_Route1_branch_ec112 -; ec188 -Music_Route1_branch_ec188: ; ec188 +Music_Route1_branch_ec188: note F#, 2 note F#, 2 note F#, 2 @@ -343,9 +339,8 @@ Music_Route1_branch_ec188: ; ec188 note F#, 1 note E_, 2 endchannel -; ec198 -Music_Route1_branch_ec198: ; ec198 +Music_Route1_branch_ec198: note A_, 2 note A_, 2 note F#, 2 @@ -364,9 +359,8 @@ Music_Route1_branch_ec198: ; ec198 note F#, 1 note E_, 2 endchannel -; ec1aa -Music_Route1_branch_ec1aa: ; ec1aa +Music_Route1_branch_ec1aa: note A_, 2 note A_, 2 note F#, 2 @@ -381,9 +375,8 @@ Music_Route1_branch_ec1aa: ; ec1aa octave 5 note D_, 2 endchannel -; ec1b8 -Music_Route1_Ch3: ; ec1b8 +Music_Route1_Ch3: stereopanning $ff vibrato $10, $23 notetype $c, $25 @@ -463,7 +456,7 @@ Music_Route1_Ch3: ; ec1b8 note __, 1 note A_, 1 note __, 3 -Music_Route1_branch_ec20c: ; ec20c +Music_Route1_branch_ec20c: octave 3 note D_, 1 note __, 1 @@ -651,6 +644,3 @@ Music_Route1_branch_ec20c: ; ec20c note A_, 1 note __, 3 loopchannel 0, Music_Route1_branch_ec20c -; ec2ca - - diff --git a/crysaudio/music/route12.asm b/crysaudio/music/route12.asm index 0a35ab6b..d94d88c2 100644 --- a/crysaudio/music/route12.asm +++ b/crysaudio/music/route12.asm @@ -1,11 +1,10 @@ -Music_Route12: ; ec506 - dbw $c0, Music_Route12_Ch1 - dbw $01, Music_Route12_Ch2 - dbw $02, Music_Route12_Ch3 - dbw $03, Music_Route12_Ch4 -; ec512 +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 -Music_Route12_Ch1: ; ec512 +Music_Route12_Ch1: tempo 148 volume $77 vibrato $12, $34 @@ -29,7 +28,7 @@ Music_Route12_Ch1: ; ec512 note E_, 1 intensity $97 note D#, 12 -Music_Route12_branch_ec535: ; ec535 +Music_Route12_branch_ec535: dutycycle $2 intensity $96 callchannel Music_Route12_branch_ec5b1 @@ -115,7 +114,7 @@ Music_Route12_branch_ec535: ; ec535 note F#, 8 note D#, 4 note F#, 4 -Music_Route12_branch_ec59b: ; ec59b +Music_Route12_branch_ec59b: intensity $97 note G#, 1 note A_, 1 @@ -131,9 +130,8 @@ Music_Route12_branch_ec59b: ; ec59b note G#, 4 loopchannel 2, Music_Route12_branch_ec59b loopchannel 0, Music_Route12_branch_ec535 -; ec5b1 -Music_Route12_branch_ec5b1: ; ec5b1 +Music_Route12_branch_ec5b1: octave 3 note G#, 1 note __, 1 @@ -148,9 +146,8 @@ Music_Route12_branch_ec5b1: ; ec5b1 note E_, 4 note G#, 4 endchannel -; ec5bf -Music_Route12_branch_ec5bf: ; ec5bf +Music_Route12_branch_ec5bf: note A_, 1 note __, 1 note F#, 1 @@ -162,9 +159,8 @@ Music_Route12_branch_ec5bf: ; ec5bf note A_, 4 note F#, 4 endchannel -; ec5ca -Music_Route12_Ch2: ; ec5ca +Music_Route12_Ch2: dutycycle $3 vibrato $12, $34 notetype $c, $b8 @@ -186,7 +182,7 @@ Music_Route12_Ch2: ; ec5ca note B_, 1 octave 4 note D#, 1 -Music_Route12_branch_ec5e5: ; ec5e5 +Music_Route12_branch_ec5e5: dutycycle $3 intensity $b7 callchannel Music_Route12_branch_ec647 @@ -264,9 +260,8 @@ Music_Route12_branch_ec5e5: ; ec5e5 intensity $a4 note E_, 6 loopchannel 0, Music_Route12_branch_ec5e5 -; ec647 -Music_Route12_branch_ec647: ; ec647 +Music_Route12_branch_ec647: octave 4 note E_, 6 intensity $b1 @@ -281,9 +276,8 @@ Music_Route12_branch_ec647: ; ec647 note G#, 4 note F#, 4 endchannel -; ec657 -Music_Route12_Ch3: ; ec657 +Music_Route12_Ch3: vibrato $12, $54 notetype $c, $16 octave 3 @@ -301,7 +295,7 @@ Music_Route12_Ch3: ; ec657 note F#, 2 note __, 2 note D#, 4 -Music_Route12_branch_ec66c: ; ec66c +Music_Route12_branch_ec66c: callchannel Music_Route12_branch_ec6b4 note F#, 1 note __, 1 @@ -353,7 +347,7 @@ Music_Route12_branch_ec66c: ; ec66c note E_, 8 note F#, 4 note D#, 4 -Music_Route12_branch_ec6a3: ; ec6a3 +Music_Route12_branch_ec6a3: note E_, 1 note __, 1 note E_, 1 @@ -365,9 +359,8 @@ Music_Route12_branch_ec6a3: ; ec6a3 note __, 1 loopchannel 2, Music_Route12_branch_ec6a3 loopchannel 0, Music_Route12_branch_ec66c -; ec6b4 -Music_Route12_branch_ec6b4: ; ec6b4 +Music_Route12_branch_ec6b4: octave 3 note E_, 1 note __, 1 @@ -394,9 +387,8 @@ Music_Route12_branch_ec6b4: ; ec6b4 note G#, 4 note E_, 4 endchannel -; ec6ce -Music_Route12_Ch4: ; ec6ce +Music_Route12_Ch4: togglenoise $4 stereopanning $f0 notetype $c @@ -410,7 +402,7 @@ Music_Route12_Ch4: ; ec6ce note D_, 4 notetype $6 callchannel Music_Route12_branch_ec717 -Music_Route12_branch_ec6e1: ; ec6e1 +Music_Route12_branch_ec6e1: note D_, 4 note D_, 8 note C#, 2 @@ -418,7 +410,7 @@ Music_Route12_branch_ec6e1: ; ec6e1 note D_, 8 callchannel Music_Route12_branch_ec717 loopchannel 8, Music_Route12_branch_ec6e1 -Music_Route12_branch_ec6ed: ; ec6ed +Music_Route12_branch_ec6ed: notetype $c note B_, 10 note D_, 1 @@ -436,7 +428,7 @@ Music_Route12_branch_ec6ed: ; ec6ed callchannel Music_Route12_branch_ec717 callchannel Music_Route12_branch_ec717 note B_, 16 -Music_Route12_branch_ec707: ; ec707 +Music_Route12_branch_ec707: note D_, 4 note D_, 8 note C#, 2 @@ -445,9 +437,8 @@ Music_Route12_branch_ec707: ; ec707 callchannel Music_Route12_branch_ec717 loopchannel 2, Music_Route12_branch_ec707 loopchannel 0, Music_Route12_branch_ec6e1 -; ec717 -Music_Route12_branch_ec717: ; ec717 +Music_Route12_branch_ec717: note C#, 1 note C#, 1 note C#, 1 @@ -457,6 +448,3 @@ Music_Route12_branch_ec717: ; ec717 note C#, 1 note C#, 1 endchannel -; ec720 - - diff --git a/crysaudio/music/route2.asm b/crysaudio/music/route2.asm index bb0ad13b..b5ff1feb 100644 --- a/crysaudio/music/route2.asm +++ b/crysaudio/music/route2.asm @@ -1,11 +1,10 @@ -Music_Route2: ; ed8dd - dbw $c0, Music_Route2_Ch1 - dbw $01, Music_Route2_Ch2 - dbw $02, Music_Route2_Ch3 - dbw $03, Music_Route2_Ch4 -; ed8e9 +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 -Music_Route2_Ch1: ; ed8e9 +Music_Route2_Ch1: tempo 151 volume $77 stereopanning $f @@ -14,7 +13,7 @@ Music_Route2_Ch1: ; ed8e9 note __, 16 note __, 16 callchannel Music_Route2_branch_ed931 -Music_Route2_branch_ed8fb: ; ed8fb +Music_Route2_branch_ed8fb: intensity $b1 octave 3 note B_, 4 @@ -55,9 +54,8 @@ Music_Route2_branch_ed8fb: ; ed8fb note B_, 2 note G_, 2 loopchannel 0, Music_Route2_branch_ed8fb -; ed931 -Music_Route2_branch_ed931: ; ed931 +Music_Route2_branch_ed931: octave 4 note C_, 4 note C_, 4 @@ -71,9 +69,8 @@ Music_Route2_branch_ed931: ; ed931 note B_, 4 intensity $b1 endchannel -; ed940 -Music_Route2_branch_ed940: ; ed940 +Music_Route2_branch_ed940: octave 2 note B_, 2 octave 3 @@ -121,9 +118,8 @@ Music_Route2_branch_ed940: ; ed940 note G_, 2 intensity $b1 endchannel -; ed971 -Music_Route2_branch_ed971: ; ed971 +Music_Route2_branch_ed971: note B_, 2 note G_, 2 note B_, 2 @@ -161,14 +157,13 @@ Music_Route2_branch_ed971: ; ed971 octave 3 note A_, 2 endchannel -; ed996 -Music_Route2_Ch2: ; ed996 +Music_Route2_Ch2: stereopanning $ff vibrato $8, $24 notetype $c, $b2 callchannel Music_Route2_branch_ed9ba -Music_Route2_branch_ed9a1: ; ed9a1 +Music_Route2_branch_ed9a1: intensity $b2 callchannel Music_Route2_branch_ed9ba dutycycle $2 @@ -178,9 +173,8 @@ Music_Route2_branch_ed9a1: ; ed9a1 callchannel Music_Route2_branch_eda02 callchannel Music_Route2_branch_eda02 loopchannel 0, Music_Route2_branch_ed9a1 -; ed9ba -Music_Route2_branch_ed9ba: ; ed9ba +Music_Route2_branch_ed9ba: octave 4 note E_, 4 note E_, 4 @@ -213,9 +207,8 @@ Music_Route2_branch_ed9ba: ; ed9ba note G_, 4 intensity $b2 endchannel -; ed9dc -Music_Route2_branch_ed9dc: ; ed9dc +Music_Route2_branch_ed9dc: octave 2 note C_, 4 note __, 2 @@ -254,9 +247,8 @@ Music_Route2_branch_ed9dc: ; ed9dc note F_, 4 note D_, 4 endchannel -; eda02 -Music_Route2_branch_eda02: ; eda02 +Music_Route2_branch_eda02: octave 2 note E_, 4 note __, 2 @@ -299,9 +291,8 @@ Music_Route2_branch_eda02: ; eda02 note G_, 1 note __, 1 endchannel -; eda2c -Music_Route2_Ch3: ; eda2c +Music_Route2_Ch3: stereopanning $f0 vibrato $16, $15 notetype $c, $14 @@ -326,7 +317,7 @@ Music_Route2_Ch3: ; eda2c callchannel Music_Route2_branch_eda9e octave 3 note D_, 4 -Music_Route2_branch_eda4b: ; eda4b +Music_Route2_branch_eda4b: notetype $c, $15 octave 3 note C_, 4 @@ -391,9 +382,8 @@ Music_Route2_branch_eda4b: ; eda4b note G_, 16 note G_, 15 loopchannel 0, Music_Route2_branch_eda4b -; eda9e -Music_Route2_branch_eda9e: ; eda9e +Music_Route2_branch_eda9e: octave 3 note F_, 4 note __, 2 @@ -411,9 +401,8 @@ Music_Route2_branch_eda9e: ; eda9e note __, 1 note F_, 4 endchannel -; edaaf -Music_Route2_branch_edaaf: ; edaaf +Music_Route2_branch_edaaf: octave 6 note E_, 10 note D_, 2 @@ -440,9 +429,8 @@ Music_Route2_branch_edaaf: ; edaaf note C_, 4 note D_, 4 endchannel -; edacb -Music_Route2_branch_edacb: ; edacb +Music_Route2_branch_edacb: octave 5 note B_, 16 note __, 4 @@ -460,12 +448,11 @@ Music_Route2_branch_edacb: ; edacb note E_, 4 note F_, 16 endchannel -; edadc -Music_Route2_Ch4: ; edadc +Music_Route2_Ch4: togglenoise $5 notetype $c -Music_Route2_branch_edae0: ; edae0 +Music_Route2_branch_edae0: note A_, 4 note A_, 4 note A_, 2 @@ -478,7 +465,7 @@ Music_Route2_branch_edae0: ; edae0 note A_, 2 note A_, 2 note D#, 4 -Music_Route2_branch_edaef: ; edaef +Music_Route2_branch_edaef: note A_, 4 note A_, 4 note A_, 2 @@ -486,7 +473,7 @@ Music_Route2_branch_edaef: ; edaef note B_, 2 note A_, 2 loopchannel 4, Music_Route2_branch_edaef -Music_Route2_branch_edaf9: ; edaf9 +Music_Route2_branch_edaf9: note B_, 4 note A_, 2 note B_, 2 @@ -500,7 +487,7 @@ Music_Route2_branch_edaf9: ; edaf9 note A_, 2 note A_, 2 note D#, 4 -Music_Route2_branch_edb09: ; edb09 +Music_Route2_branch_edb09: note B_, 4 note C_, 4 note B_, 2 @@ -512,7 +499,7 @@ Music_Route2_branch_edb09: ; edb09 note C#, 2 note C_, 2 note C#, 4 -Music_Route2_branch_edb17: ; edb17 +Music_Route2_branch_edb17: note B_, 4 note C_, 4 note B_, 2 @@ -525,6 +512,3 @@ Music_Route2_branch_edb17: ; edb17 note D_, 2 note D#, 4 loopchannel 0, Music_Route2_branch_edaef -; edb29 - - diff --git a/crysaudio/music/route26.asm b/crysaudio/music/route26.asm index 577f7807..fb1a7a8e 100644 --- a/crysaudio/music/route26.asm +++ b/crysaudio/music/route26.asm @@ -1,11 +1,10 @@ -Music_Route26: ; eefb2 - dbw $c0, Music_Route26_Ch1 - dbw $01, Music_Route26_Ch2 - dbw $02, Music_Route26_Ch3 - dbw $03, Music_Route26_Ch4 -; eefbe +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 -Music_Route26_Ch1: ; eefbe +Music_Route26_Ch1: stereopanning $f vibrato $12, $23 tempo 151 @@ -27,7 +26,7 @@ Music_Route26_Ch1: ; eefbe octave 3 note G#, 2 note F#, 2 -Music_Route26_branch_eefe0: ; eefe0 +Music_Route26_branch_eefe0: dutycycle $0 notetype $c, $a7 octave 3 @@ -194,9 +193,8 @@ Music_Route26_branch_eefe0: ; eefe0 note B_, 4 note __, 4 loopchannel 0, Music_Route26_branch_eefe0 -; ef09d -Music_Route26_Ch2: ; ef09d +Music_Route26_Ch2: stereopanning $f0 vibrato $14, $23 dutycycle $2 @@ -234,7 +232,7 @@ Music_Route26_Ch2: ; ef09d octave 2 note C_, 2 note D#, 2 -Music_Route26_branch_ef0ce: ; ef0ce +Music_Route26_branch_ef0ce: dutycycle $2 notetype $c, $c2 octave 2 @@ -283,7 +281,7 @@ Music_Route26_branch_ef0ce: ; ef0ce note D#, 4 note D#, 4 notetype $8, $c2 -Music_Route26_branch_ef10e: ; ef10e +Music_Route26_branch_ef10e: octave 2 note G#, 2 note G#, 2 @@ -339,9 +337,8 @@ Music_Route26_branch_ef10e: ; ef10e note C_, 1 note D#, 1 loopchannel 0, Music_Route26_branch_ef0ce -; ef14e -Music_Route26_branch_ef14e: ; ef14e +Music_Route26_branch_ef14e: note A#, 6 note A#, 1 octave 2 @@ -354,9 +351,8 @@ Music_Route26_branch_ef14e: ; ef14e octave 1 note A#, 2 endchannel -; ef15a -Music_Route26_Ch3: ; ef15a +Music_Route26_Ch3: stereopanning $ff vibrato $12, $23 notetype $c, $14 @@ -392,7 +388,7 @@ Music_Route26_Ch3: ; ef15a note F#, 2 note F_, 2 note D#, 2 -Music_Route26_branch_ef18a: ; ef18a +Music_Route26_branch_ef18a: vibrato $18, $23 notetype $c, $14 octave 5 @@ -538,9 +534,8 @@ Music_Route26_branch_ef18a: ; ef18a octave 3 note C_, 1 loopchannel 0, Music_Route26_branch_ef18a -; ef22f -Music_Route26_branch_ef22f: ; ef22f +Music_Route26_branch_ef22f: octave 5 note F_, 8 note C#, 2 @@ -550,18 +545,17 @@ Music_Route26_branch_ef22f: ; ef22f note C#, 4 note D#, 4 endchannel -; ef238 -Music_Route26_Ch4: ; ef238 +Music_Route26_Ch4: togglenoise $4 notetype $c -Music_Route26_branch_ef23c: ; ef23c +Music_Route26_branch_ef23c: note B_, 6 note D_, 1 note D_, 1 loopchannel 3, Music_Route26_branch_ef23c callchannel Music_Route26_branch_ef2b0 -Music_Route26_branch_ef246: ; ef246 +Music_Route26_branch_ef246: notetype $6 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef29a @@ -580,7 +574,7 @@ Music_Route26_branch_ef246: ; ef246 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef29a notetype $8 -Music_Route26_branch_ef266: ; ef266 +Music_Route26_branch_ef266: note D_, 2 note D_, 2 note D_, 2 @@ -591,7 +585,7 @@ Music_Route26_branch_ef266: ; ef266 callchannel Music_Route26_branch_ef2a8 callchannel Music_Route26_branch_ef29a callchannel Music_Route26_branch_ef2a8 -Music_Route26_branch_ef27c: ; ef27c +Music_Route26_branch_ef27c: notetype $6 note D_, 1 note D_, 1 @@ -611,9 +605,8 @@ Music_Route26_branch_ef27c: ; ef27c note B_, 16 callchannel Music_Route26_branch_ef2b0 loopchannel 0, Music_Route26_branch_ef246 -; ef29a -Music_Route26_branch_ef29a: ; ef29a +Music_Route26_branch_ef29a: note E_, 12 note D_, 2 note D_, 2 @@ -628,9 +621,8 @@ Music_Route26_branch_ef29a: ; ef29a note C#, 1 note C#, 1 endchannel -; ef2a8 -Music_Route26_branch_ef2a8: ; ef2a8 +Music_Route26_branch_ef2a8: note E_, 12 note D_, 2 note D_, 2 @@ -639,9 +631,8 @@ Music_Route26_branch_ef2a8: ; ef2a8 note E_, 4 note D_, 4 endchannel -; ef2b0 -Music_Route26_branch_ef2b0: ; ef2b0 +Music_Route26_branch_ef2b0: notetype $6 note C#, 1 note C#, 1 @@ -672,6 +663,3 @@ Music_Route26_branch_ef2b0: ; ef2b0 note D_, 2 note E_, 2 endchannel -; ef2d0 - - diff --git a/crysaudio/music/route29.asm b/crysaudio/music/route29.asm index 3703e62e..d7cecf4f 100644 --- a/crysaudio/music/route29.asm +++ b/crysaudio/music/route29.asm @@ -1,11 +1,10 @@ -Music_Route29: ; f0386 - dbw $c0, Music_Route29_Ch1 - dbw $01, Music_Route29_Ch2 - dbw $02, Music_Route29_Ch3 - dbw $03, Music_Route29_Ch4 -; f0392 +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 -Music_Route29_Ch1: ; f0392 +Music_Route29_Ch1: tempo 146 volume $77 dutycycle $3 @@ -14,7 +13,7 @@ Music_Route29_Ch1: ; f0392 stereopanning $f notetype $c, $b2 note __, 2 -Music_Route29_branch_f03a5: ; f03a5 +Music_Route29_branch_f03a5: note __, 2 octave 4 note C_, 2 @@ -168,16 +167,15 @@ Music_Route29_branch_f03a5: ; f03a5 note G_, 2 note G_, 4 loopchannel 0, Music_Route29_branch_f03a5 -; f044d -Music_Route29_Ch2: ; f044d +Music_Route29_Ch2: dutycycle $3 vibrato $12, $36 notetype $c, $c2 octave 4 note C_, 1 note D_, 1 -Music_Route29_branch_f0458: ; f0458 +Music_Route29_branch_f0458: callchannel Music_Route29_branch_f04de note F_, 1 note E_, 1 @@ -301,9 +299,8 @@ Music_Route29_branch_f0458: ; f0458 note C_, 1 note D_, 1 loopchannel 0, Music_Route29_branch_f0458 -; f04de -Music_Route29_branch_f04de: ; f04de +Music_Route29_branch_f04de: note E_, 2 note E_, 2 note G_, 2 @@ -333,14 +330,13 @@ Music_Route29_branch_f04de: ; f04de note E_, 2 note C_, 2 endchannel -; f04fb -Music_Route29_Ch3: ; f04fb +Music_Route29_Ch3: stereopanning $f0 notetype $c, $25 vibrato $9, $27 note __, 2 -Music_Route29_branch_f0504: ; f0504 +Music_Route29_branch_f0504: note __, 2 octave 3 note G_, 1 @@ -503,14 +499,13 @@ Music_Route29_branch_f0504: ; f0504 note C_, 1 note __, 3 loopchannel 0, Music_Route29_branch_f0504 -; f05a9 -Music_Route29_Ch4: ; f05a9 +Music_Route29_Ch4: stereopanning $f togglenoise $0 notetype $c note __, 2 -Music_Route29_branch_f05b0: ; f05b0 +Music_Route29_branch_f05b0: note __, 2 note F_, 2 note F_, 6 @@ -523,6 +518,3 @@ Music_Route29_branch_f05b0: ; f05b0 note F_, 2 note F_, 4 loopchannel 0, Music_Route29_branch_f05b0 -; f05bf - - diff --git a/crysaudio/music/route3.asm b/crysaudio/music/route3.asm index 5f7e66d9..f36dbd53 100644 --- a/crysaudio/music/route3.asm +++ b/crysaudio/music/route3.asm @@ -1,11 +1,10 @@ -Music_Route3: ; ec2ca - dbw $c0, Music_Route3_Ch1 - dbw $01, Music_Route3_Ch2 - dbw $02, Music_Route3_Ch3 - dbw $03, Music_Route3_Ch4 -; ec2d6 +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 -Music_Route3_Ch1: ; ec2d6 +Music_Route3_Ch1: stereopanning $f tempo 160 volume $77 @@ -46,7 +45,7 @@ Music_Route3_Ch1: ; ec2d6 note E_, 1 note F#, 1 note G#, 1 -Music_Route3_branch_ec307: ; ec307 +Music_Route3_branch_ec307: callchannel Music_Route3_branch_ec3a4 note G_, 1 note D_, 1 @@ -195,9 +194,8 @@ Music_Route3_branch_ec307: ; ec307 octave 4 note D_, 1 loopchannel 0, Music_Route3_branch_ec307 -; ec3a4 -Music_Route3_branch_ec3a4: ; ec3a4 +Music_Route3_branch_ec3a4: octave 3 note A_, 1 note E_, 1 @@ -208,7 +206,7 @@ Music_Route3_branch_ec3a4: ; ec3a4 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3b1: ; ec3b1 +Music_Route3_branch_ec3b1: note A_, 1 note E_, 1 note C#, 1 @@ -218,7 +216,7 @@ Music_Route3_branch_ec3b1: ; ec3b1 note E_, 1 note C#, 1 note E_, 1 -Music_Route3_branch_ec3bd: ; ec3bd +Music_Route3_branch_ec3bd: note G_, 1 note D_, 1 octave 2 @@ -235,9 +233,8 @@ Music_Route3_branch_ec3bd: ; ec3bd octave 3 note D_, 1 endchannel -; ec3d0 -Music_Route3_Ch2: ; ec3d0 +Music_Route3_Ch2: stereopanning $f0 notetype $c, $5e dutycycle $2 @@ -266,7 +263,7 @@ Music_Route3_Ch2: ; ec3d0 note C#, 1 note E_, 1 note G#, 1 -Music_Route3_branch_ec3f5: ; ec3f5 +Music_Route3_branch_ec3f5: intensity $7d callchannel Music_Route3_branch_ec443 note G_, 1 @@ -328,9 +325,8 @@ Music_Route3_branch_ec3f5: ; ec3f5 note F#, 1 note G#, 1 loopchannel 0, Music_Route3_branch_ec3f5 -; ec443 -Music_Route3_branch_ec443: ; ec443 +Music_Route3_branch_ec443: note A_, 6 note E_, 1 note A_, 1 @@ -353,9 +349,8 @@ Music_Route3_branch_ec443: ; ec443 note G_, 6 note D_, 1 endchannel -; ec45b -Music_Route3_Ch3: ; ec45b +Music_Route3_Ch3: stereopanning $ff vibrato $6, $3 notetype $c, $13 @@ -384,7 +379,7 @@ Music_Route3_Ch3: ; ec45b note __, 1 note G#, 2 callchannel Music_Route3_branch_ec4bd -Music_Route3_branch_ec47f: ; ec47f +Music_Route3_branch_ec47f: intensity $14 callchannel Music_Route3_branch_ec4bd callchannel Music_Route3_branch_ec4bd @@ -431,9 +426,8 @@ Music_Route3_branch_ec47f: ; ec47f note F#, 1 note G#, 1 loopchannel 0, Music_Route3_branch_ec47f -; ec4bd -Music_Route3_branch_ec4bd: ; ec4bd +Music_Route3_branch_ec4bd: octave 3 note A_, 1 note __, 1 @@ -451,9 +445,8 @@ Music_Route3_branch_ec4bd: ; ec4bd octave 2 note G#, 2 endchannel -; ec4ce -Music_Route3_branch_ec4ce: ; ec4ce +Music_Route3_branch_ec4ce: octave 3 note G_, 1 note __, 1 @@ -483,13 +476,12 @@ Music_Route3_branch_ec4ce: ; ec4ce note G#, 2 note B_, 2 endchannel -; ec4eb -Music_Route3_Ch4: ; ec4eb +Music_Route3_Ch4: togglenoise $4 notetype $c note __, 10 -Music_Route3_branch_ec4f0: ; ec4f0 +Music_Route3_branch_ec4f0: notetype $c note D_, 2 note D_, 4 @@ -507,6 +499,3 @@ Music_Route3_branch_ec4f0: ; ec4f0 note C#, 1 note C#, 1 loopchannel 0, Music_Route3_branch_ec4f0 -; ec506 - - diff --git a/crysaudio/music/route30.asm b/crysaudio/music/route30.asm index 0ea33abb..22623579 100644 --- a/crysaudio/music/route30.asm +++ b/crysaudio/music/route30.asm @@ -1,11 +1,10 @@ -Music_Route30: ; efc01 - dbw $c0, Music_Route30_Ch1 - dbw $01, Music_Route30_Ch2 - dbw $02, Music_Route30_Ch3 - dbw $03, Music_Route30_Ch4 -; efc0d +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 -Music_Route30_Ch1: ; efc0d +Music_Route30_Ch1: tempo 144 volume $77 dutycycle $3 @@ -27,7 +26,7 @@ Music_Route30_Ch1: ; efc0d note D_, 2 intensity $4e note C_, 4 -Music_Route30_branch_efc2e: ; efc2e +Music_Route30_branch_efc2e: intensity $b6 note D_, 6 intensity $b4 @@ -183,9 +182,8 @@ Music_Route30_branch_efc2e: ; efc2e octave 4 note D_, 2 loopchannel 0, Music_Route30_branch_efc2e -; efcda -Music_Route30_Ch2: ; efcda +Music_Route30_Ch2: dutycycle $3 vibrato $12, $36 stereopanning $f @@ -207,7 +205,7 @@ Music_Route30_Ch2: ; efcda note E_, 1 note F_, 1 note F#, 1 -Music_Route30_branch_efcf6: ; efcf6 +Music_Route30_branch_efcf6: intensity $c7 note G_, 10 octave 4 @@ -295,9 +293,8 @@ Music_Route30_branch_efcf6: ; efcf6 octave 3 note F#, 2 loopchannel 0, Music_Route30_branch_efcf6 -; efd5f -Music_Route30_Ch3: ; efd5f +Music_Route30_Ch3: notetype $c, $27 octave 2 note G_, 1 @@ -322,7 +319,7 @@ Music_Route30_Ch3: ; efd5f note __, 1 note G_, 1 note __, 1 -Music_Route30_branch_efd79: ; efd79 +Music_Route30_branch_efd79: note G_, 1 note __, 1 note B_, 2 @@ -577,14 +574,13 @@ Music_Route30_branch_efd79: ; efd79 note G_, 1 note __, 1 loopchannel 0, Music_Route30_branch_efd79 -; efe7a -Music_Route30_Ch4: ; efe7a +Music_Route30_Ch4: togglenoise $3 notetype $c callchannel Music_Route30_branch_efeb8 callchannel Music_Route30_branch_efec1 -Music_Route30_branch_efe84: ; efe84 +Music_Route30_branch_efe84: callchannel Music_Route30_branch_efecd callchannel Music_Route30_branch_efed7 callchannel Music_Route30_branch_efed7 @@ -602,9 +598,8 @@ Music_Route30_branch_efe84: ; efe84 callchannel Music_Route30_branch_efecd callchannel Music_Route30_branch_efee1 loopchannel 0, Music_Route30_branch_efe84 -; efeb8 -Music_Route30_branch_efeb8: ; efeb8 +Music_Route30_branch_efeb8: note D_, 2 note F#, 2 note F#, 2 @@ -614,9 +609,8 @@ Music_Route30_branch_efeb8: ; efeb8 note D_, 2 note D_, 4 endchannel -; efec1 -Music_Route30_branch_efec1: ; efec1 +Music_Route30_branch_efec1: note D_, 2 note F#, 2 note F#, 2 @@ -629,9 +623,8 @@ Music_Route30_branch_efec1: ; efec1 note D_, 1 note D_, 1 endchannel -; efecd -Music_Route30_branch_efecd: ; efecd +Music_Route30_branch_efecd: note D_, 2 note F#, 2 note F#, 2 @@ -642,9 +635,8 @@ Music_Route30_branch_efecd: ; efecd note D_, 2 note D_, 2 endchannel -; efed7 -Music_Route30_branch_efed7: ; efed7 +Music_Route30_branch_efed7: note D_, 2 note F#, 2 note F#, 2 @@ -655,9 +647,8 @@ Music_Route30_branch_efed7: ; efed7 note D_, 2 note D_, 2 endchannel -; efee1 -Music_Route30_branch_efee1: ; efee1 +Music_Route30_branch_efee1: note D_, 2 note F#, 2 note F#, 2 @@ -676,5 +667,3 @@ Music_Route30_branch_efee1: ; efee1 note D_, 1 notetype $c endchannel -; efef5 - diff --git a/crysaudio/music/route36.asm b/crysaudio/music/route36.asm index cd605db5..1899116b 100644 --- a/crysaudio/music/route36.asm +++ b/crysaudio/music/route36.asm @@ -1,11 +1,10 @@ -Music_Route36: ; e94e9 - dbw $c0, Music_Route36_Ch1 - dbw $01, Music_Route36_Ch2 - dbw $02, Music_Route36_Ch3 - dbw $03, Music_Route36_Ch4 -; e94f5 +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 -Music_Route36_Ch1: ; e94f5 +Music_Route36_Ch1: tempo 144 volume $77 dutycycle $3 @@ -26,7 +25,7 @@ Music_Route36_Ch1: ; e94f5 note A_, 1 intensity $5d note A#, 4 -Music_Route36_branch_e9517: ; e9517 +Music_Route36_branch_e9517: intensity $b5 note F_, 4 note A_, 2 @@ -163,9 +162,8 @@ Music_Route36_branch_e9517: ; e9517 note D#, 2 note E_, 2 loopchannel 0, Music_Route36_branch_e9517 -; e95af -Music_Route36_Ch2: ; e95af +Music_Route36_Ch2: dutycycle $3 vibrato $10, $36 stereopanning $f0 @@ -188,7 +186,7 @@ Music_Route36_Ch2: ; e95af note F_, 8 octave 3 note G_, 4 -Music_Route36_branch_e95ce: ; e95ce +Music_Route36_branch_e95ce: intensity $c7 octave 4 note C_, 10 @@ -311,9 +309,8 @@ Music_Route36_branch_e95ce: ; e95ce note A_, 1 note B_, 1 loopchannel 0, Music_Route36_branch_e95ce -; e966b -Music_Route36_Ch3: ; e966b +Music_Route36_Ch3: notetype $c, $25 octave 3 note F_, 1 @@ -337,7 +334,7 @@ Music_Route36_Ch3: ; e966b octave 3 note D#, 2 note E_, 2 -Music_Route36_branch_e9684: ; e9684 +Music_Route36_branch_e9684: note F_, 4 note C_, 2 note F_, 4 @@ -468,20 +465,19 @@ Music_Route36_branch_e9684: ; e9684 note D#, 2 note E_, 2 loopchannel 0, Music_Route36_branch_e9684 -; e9709 -Music_Route36_Ch4: ; e9709 +Music_Route36_Ch4: togglenoise $1 notetype $c callchannel Music_Route36_branch_e9734 callchannel Music_Route36_branch_e9741 -Music_Route36_branch_e9713: ; e9713 +Music_Route36_branch_e9713: callchannel Music_Route36_branch_e9734 callchannel Music_Route36_branch_e973b callchannel Music_Route36_branch_e9734 callchannel Music_Route36_branch_e9741 loopchannel 2, Music_Route36_branch_e9713 -Music_Route36_branch_e9723: ; e9723 +Music_Route36_branch_e9723: note A#, 4 note A_, 2 note F_, 4 @@ -491,9 +487,8 @@ Music_Route36_branch_e9723: ; e9723 loopchannel 11, Music_Route36_branch_e9723 callchannel Music_Route36_branch_e9741 loopchannel 0, Music_Route36_branch_e9713 -; e9734 -Music_Route36_branch_e9734: ; e9734 +Music_Route36_branch_e9734: note A_, 4 note A_, 6 note A#, 1 @@ -501,18 +496,16 @@ Music_Route36_branch_e9734: ; e9734 note A_, 2 note A#, 2 endchannel -; e973b -Music_Route36_branch_e973b: ; e973b +Music_Route36_branch_e973b: note A_, 4 note A_, 6 note B_, 1 note A#, 1 note A_, 4 endchannel -; e9741 -Music_Route36_branch_e9741: ; e9741 +Music_Route36_branch_e9741: note A_, 4 note A_, 6 note A#, 1 @@ -525,6 +518,3 @@ Music_Route36_branch_e9741: ; e9741 note A_, 1 notetype $c endchannel -; e974f - - diff --git a/crysaudio/music/route37.asm b/crysaudio/music/route37.asm index a8d40ccf..000db4e3 100644 --- a/crysaudio/music/route37.asm +++ b/crysaudio/music/route37.asm @@ -1,11 +1,10 @@ -Music_Route37: ; ee94b - dbw $c0, Music_Route37_Ch1 - dbw $01, Music_Route37_Ch2 - dbw $02, Music_Route37_Ch3 - dbw $03, Music_Route37_Ch4 -; ee957 +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 -Music_Route37_Ch1: ; ee957 +Music_Route37_Ch1: tempo 144 volume $77 dutycycle $3 @@ -14,7 +13,7 @@ Music_Route37_Ch1: ; ee957 notetype $c, $b3 note __, 16 note __, 16 -Music_Route37_branch_ee969: ; ee969 +Music_Route37_branch_ee969: intensity $b3 note __, 2 octave 2 @@ -68,7 +67,7 @@ Music_Route37_branch_ee969: ; ee969 note E_, 2 note D#, 4 stereopanning $f -Music_Route37_branch_ee9a5: ; ee9a5 +Music_Route37_branch_ee9a5: callchannel Music_Route37_branch_ee9da octave 3 note C#, 4 @@ -97,9 +96,8 @@ Music_Route37_branch_ee9a5: ; ee9a5 callchannel Music_Route37_branch_ee9e9 note __, 4 loopchannel 0, Music_Route37_branch_ee969 -; ee9da -Music_Route37_branch_ee9da: ; ee9da +Music_Route37_branch_ee9da: intensity $c2 octave 2 note A_, 2 @@ -113,9 +111,8 @@ Music_Route37_branch_ee9da: ; ee9da note A_, 2 intensity $b7 endchannel -; ee9e9 -Music_Route37_branch_ee9e9: ; ee9e9 +Music_Route37_branch_ee9e9: intensity $c2 octave 2 note B_, 2 @@ -129,9 +126,8 @@ Music_Route37_branch_ee9e9: ; ee9e9 note B_, 2 intensity $b7 endchannel -; ee9f8 -Music_Route37_Ch2: ; ee9f8 +Music_Route37_Ch2: dutycycle $3 vibrato $1c, $12 notetype $c, $c2 @@ -162,7 +158,7 @@ Music_Route37_Ch2: ; ee9f8 note B_, 1 intensity $c2 note B_, 2 -Music_Route37_branch_eea24: ; eea24 +Music_Route37_branch_eea24: callchannel Music_Route37_branch_eeab7 intensity $c6 octave 4 @@ -274,9 +270,8 @@ Music_Route37_branch_eea24: ; eea24 intensity $c2 note F#, 2 loopchannel 0, Music_Route37_branch_eea24 -; eeab7 -Music_Route37_branch_eeab7: ; eeab7 +Music_Route37_branch_eeab7: intensity $c7 octave 3 note F#, 4 @@ -289,17 +284,16 @@ Music_Route37_branch_eeab7: ; eeab7 note F#, 2 note B_, 2 endchannel -; eeac7 -Music_Route37_Ch3: ; eeac7 +Music_Route37_Ch3: stereopanning $f0 notetype $c, $14 -Music_Route37_branch_eeacc: ; eeacc +Music_Route37_branch_eeacc: octave 2 note F#, 2 note __, 6 loopchannel 4, Music_Route37_branch_eeacc -Music_Route37_branch_eead3: ; eead3 +Music_Route37_branch_eead3: callchannel Music_Route37_branch_eeb32 note A_, 2 octave 3 @@ -311,7 +305,7 @@ Music_Route37_branch_eead3: ; eead3 note A_, 2 note F#, 2 note E_, 2 -Music_Route37_branch_eeae0: ; eeae0 +Music_Route37_branch_eeae0: note D#, 2 note F#, 2 loopchannel 4, Music_Route37_branch_eeae0 @@ -330,13 +324,13 @@ Music_Route37_branch_eeae0: ; eeae0 octave 2 note A_, 2 callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeafb: ; eeafb +Music_Route37_branch_eeafb: octave 2 note B_, 2 octave 3 note D#, 2 loopchannel 4, Music_Route37_branch_eeafb -Music_Route37_branch_eeb03: ; eeb03 +Music_Route37_branch_eeb03: octave 2 note A_, 2 octave 3 @@ -345,13 +339,13 @@ Music_Route37_branch_eeb03: ; eeb03 note E_, 2 note C#, 2 callchannel Music_Route37_branch_eeb3c -Music_Route37_branch_eeb10: ; eeb10 +Music_Route37_branch_eeb10: octave 2 note B_, 2 octave 3 note F#, 2 loopchannel 4, Music_Route37_branch_eeb10 -Music_Route37_branch_eeb18: ; eeb18 +Music_Route37_branch_eeb18: octave 2 note A_, 2 octave 3 @@ -361,14 +355,13 @@ Music_Route37_branch_eeb18: ; eeb18 note C#, 2 callchannel Music_Route37_branch_eeb3c callchannel Music_Route37_branch_eeb32 -Music_Route37_branch_eeb28: ; eeb28 +Music_Route37_branch_eeb28: note F#, 2 note __, 6 loopchannel 4, Music_Route37_branch_eeb28 loopchannel 0, Music_Route37_branch_eead3 -; eeb32 -Music_Route37_branch_eeb32: ; eeb32 +Music_Route37_branch_eeb32: octave 2 note F#, 2 note B_, 2 @@ -379,9 +372,8 @@ Music_Route37_branch_eeb32: ; eeb32 note F#, 2 note B_, 2 endchannel -; eeb3c -Music_Route37_branch_eeb3c: ; eeb3c +Music_Route37_branch_eeb3c: octave 2 note B_, 2 octave 3 @@ -399,12 +391,11 @@ Music_Route37_branch_eeb3c: ; eeb3c octave 3 note D#, 2 endchannel -; eeb4d -Music_Route37_Ch4: ; eeb4d +Music_Route37_Ch4: stereopanning $f togglenoise $0 -Music_Route37_branch_eeb51: ; eeb51 +Music_Route37_branch_eeb51: notetype $c callchannel Music_Route37_branch_eeb6b note D_, 1 @@ -422,9 +413,8 @@ Music_Route37_branch_eeb51: ; eeb51 note D_, 1 note D_, 1 loopchannel 0, Music_Route37_branch_eeb51 -; eeb6b -Music_Route37_branch_eeb6b: ; eeb6b +Music_Route37_branch_eeb6b: note D_, 2 note D#, 1 note D#, 1 @@ -435,6 +425,3 @@ Music_Route37_branch_eeb6b: ; eeb6b note D#, 1 note D#, 1 endchannel -; eeb75 - - diff --git a/crysaudio/music/ruinsofalphinterior.asm b/crysaudio/music/ruinsofalphinterior.asm index 61521126..f353b63a 100644 --- a/crysaudio/music/ruinsofalphinterior.asm +++ b/crysaudio/music/ruinsofalphinterior.asm @@ -1,10 +1,9 @@ -Music_RuinsOfAlphInterior: ; ebd9e - dbw $80, Music_RuinsOfAlphInterior_Ch1 - dbw $01, Music_RuinsOfAlphInterior_Ch2 - dbw $02, Music_RuinsOfAlphInterior_Ch3 -; ebda7 +Music_RuinsOfAlphInterior: + musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1 + musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2 + musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3 -Music_RuinsOfAlphInterior_Ch1: ; ebda7 +Music_RuinsOfAlphInterior_Ch1: tempo 224 volume $77 dutycycle $0 @@ -12,14 +11,13 @@ Music_RuinsOfAlphInterior_Ch1: ; ebda7 notetype $c, $44 note __, 1 loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 -; ebdb8 -Music_RuinsOfAlphInterior_Ch2: ; ebdb8 +Music_RuinsOfAlphInterior_Ch2: tone $0002 dutycycle $0 stereopanning $f notetype $c, $a4 -Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2 +Music_RuinsOfAlphInterior_branch_ebdc2: octave 4 note C_, 4 octave 3 @@ -35,11 +33,10 @@ Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2 octave 3 note A#, 4 loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2 -; ebdd4 -Music_RuinsOfAlphInterior_Ch3: ; ebdd4 +Music_RuinsOfAlphInterior_Ch3: notetype $c, $10 -Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7 +Music_RuinsOfAlphInterior_branch_ebdd7: octave 2 note G#, 2 octave 3 @@ -47,6 +44,3 @@ Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7 note E_, 2 note __, 10 loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7 -; ebde1 - - diff --git a/crysaudio/music/ruinsofalphradio.asm b/crysaudio/music/ruinsofalphradio.asm index a9676b60..5584b279 100644 --- a/crysaudio/music/ruinsofalphradio.asm +++ b/crysaudio/music/ruinsofalphradio.asm @@ -1,17 +1,16 @@ -Music_RuinsOfAlphRadio: ; eedcb - dbw $80, Music_RuinsOfAlphRadio_Ch1 - dbw $01, Music_RuinsOfAlphRadio_Ch2 - dbw $02, Music_RuinsOfAlphRadio_Ch3 -; eedd4 +Music_RuinsOfAlphRadio: + musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1 + musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2 + musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3 -Music_RuinsOfAlphRadio_Ch1: ; eedd4 +Music_RuinsOfAlphRadio_Ch1: tempo 160 volume $77 dutycycle $0 tone $0118 vibrato $0, $f0 stereopanning $f0 -Music_RuinsOfAlphRadio_branch_eede3: ; eede3 +Music_RuinsOfAlphRadio_branch_eede3: notetype $6, $71 callchannel Music_RuinsOfAlphRadio_branch_eee01 notetype $c, $a1 @@ -25,9 +24,8 @@ Music_RuinsOfAlphRadio_branch_eede3: ; eede3 notetype $c, $a1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eede3 -; eee01 -Music_RuinsOfAlphRadio_branch_eee01: ; eee01 +Music_RuinsOfAlphRadio_branch_eee01: octave 4 note G_, 1 note F#, 1 @@ -35,9 +33,8 @@ Music_RuinsOfAlphRadio_branch_eee01: ; eee01 note F#, 1 note C_, 8 endchannel -; eee08 -Music_RuinsOfAlphRadio_branch_eee08: ; eee08 +Music_RuinsOfAlphRadio_branch_eee08: octave 4 note G_, 1 note F#, 1 @@ -48,12 +45,11 @@ Music_RuinsOfAlphRadio_branch_eee08: ; eee08 octave 5 note C_, 8 endchannel -; eee12 -Music_RuinsOfAlphRadio_Ch2: ; eee12 +Music_RuinsOfAlphRadio_Ch2: dutycycle $1 vibrato $1, $e0 -Music_RuinsOfAlphRadio_branch_eee17: ; eee17 +Music_RuinsOfAlphRadio_branch_eee17: stereopanning $f notetype $6, $81 callchannel Music_RuinsOfAlphRadio_branch_eee01 @@ -65,17 +61,13 @@ Music_RuinsOfAlphRadio_branch_eee17: ; eee17 notetype $c, $a1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eee17 -; eee32 -Music_RuinsOfAlphRadio_Ch3: ; eee32 +Music_RuinsOfAlphRadio_Ch3: notetype $6, $26 -Music_RuinsOfAlphRadio_branch_eee35: ; eee35 +Music_RuinsOfAlphRadio_branch_eee35: octave 2 note C_, 1 note C#, 1 note C_, 1 note __, 16 loopchannel 0, Music_RuinsOfAlphRadio_branch_eee35 -; eee3e - - diff --git a/crysaudio/music/showmearound.asm b/crysaudio/music/showmearound.asm index a0fc13fb..344b8fe3 100644 --- a/crysaudio/music/showmearound.asm +++ b/crysaudio/music/showmearound.asm @@ -1,11 +1,10 @@ -Music_ShowMeAround: ; edbd8 - dbw $c0, Music_ShowMeAround_Ch1 - dbw $01, Music_ShowMeAround_Ch2 - dbw $02, Music_ShowMeAround_Ch3 - dbw $03, Music_ShowMeAround_Ch4 -; edbe4 +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 -Music_ShowMeAround_Ch1: ; edbe4 +Music_ShowMeAround_Ch1: tempo 144 volume $77 stereopanning $f @@ -28,7 +27,7 @@ Music_ShowMeAround_Ch1: ; edbe4 note D_, 1 note E_, 1 note G#, 8 -Music_ShowMeAround_branch_edc01: ; edc01 +Music_ShowMeAround_branch_edc01: note __, 16 note __, 16 note __, 16 @@ -38,9 +37,8 @@ Music_ShowMeAround_branch_edc01: ; edc01 callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc15 loopchannel 0, Music_ShowMeAround_branch_edc01 -; edc15 -Music_ShowMeAround_branch_edc15: ; edc15 +Music_ShowMeAround_branch_edc15: note __, 4 octave 3 note C#, 1 @@ -62,9 +60,8 @@ Music_ShowMeAround_branch_edc15: ; edc15 note E_, 1 note __, 3 endchannel -; edc2a -Music_ShowMeAround_Ch2: ; edc2a +Music_ShowMeAround_Ch2: stereopanning $ff dutycycle $2 notetype $c, $b1 @@ -86,7 +83,7 @@ Music_ShowMeAround_Ch2: ; edc2a note D_, 1 note E_, 8 dutycycle $1 -Music_ShowMeAround_branch_edc44: ; edc44 +Music_ShowMeAround_branch_edc44: callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc98 callchannel Music_ShowMeAround_branch_edc86 @@ -138,9 +135,8 @@ Music_ShowMeAround_branch_edc44: ; edc44 note A_, 2 note A_, 4 loopchannel 0, Music_ShowMeAround_branch_edc44 -; edc86 -Music_ShowMeAround_branch_edc86: ; edc86 +Music_ShowMeAround_branch_edc86: octave 3 note A_, 2 octave 4 @@ -149,9 +145,8 @@ Music_ShowMeAround_branch_edc86: ; edc86 note D_, 2 note F#, 2 endchannel -; edc8e -Music_ShowMeAround_branch_edc8e: ; edc8e +Music_ShowMeAround_branch_edc8e: octave 5 note C#, 2 octave 4 @@ -162,9 +157,8 @@ Music_ShowMeAround_branch_edc8e: ; edc8e octave 4 note A_, 2 endchannel -; edc98 -Music_ShowMeAround_branch_edc98: ; edc98 +Music_ShowMeAround_branch_edc98: note __, 4 octave 3 note C#, 1 @@ -182,9 +176,8 @@ Music_ShowMeAround_branch_edc98: ; edc98 note B_, 1 note __, 1 endchannel -; edca9 -Music_ShowMeAround_Ch3: ; edca9 +Music_ShowMeAround_Ch3: stereopanning $f0 vibrato $10, $22 notetype $6, $25 @@ -226,7 +219,7 @@ Music_ShowMeAround_Ch3: ; edca9 note F_, 1 note E_, 2 intensity $14 -Music_ShowMeAround_branch_edcd9: ; edcd9 +Music_ShowMeAround_branch_edcd9: callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edcef @@ -234,9 +227,8 @@ Music_ShowMeAround_branch_edcd9: ; edcd9 callchannel Music_ShowMeAround_branch_edcef callchannel Music_ShowMeAround_branch_edd0f loopchannel 0, Music_ShowMeAround_branch_edcd9 -; edcef -Music_ShowMeAround_branch_edcef: ; edcef +Music_ShowMeAround_branch_edcef: octave 2 note A_, 2 note __, 6 @@ -269,9 +261,8 @@ Music_ShowMeAround_branch_edcef: ; edcef note D_, 2 note __, 2 endchannel -; edd0f -Music_ShowMeAround_branch_edd0f: ; edd0f +Music_ShowMeAround_branch_edd0f: octave 2 note A_, 2 note __, 6 @@ -305,9 +296,8 @@ Music_ShowMeAround_branch_edd0f: ; edd0f note A_, 2 note __, 6 endchannel -; edd30 -Music_ShowMeAround_Ch4: ; edd30 +Music_ShowMeAround_Ch4: togglenoise $3 notetype $c note __, 16 @@ -315,7 +305,7 @@ Music_ShowMeAround_Ch4: ; edd30 note D_, 2 note D#, 2 note F#, 4 -Music_ShowMeAround_branch_edd39: ; edd39 +Music_ShowMeAround_branch_edd39: callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd4f @@ -323,9 +313,8 @@ Music_ShowMeAround_branch_edd39: ; edd39 callchannel Music_ShowMeAround_branch_edd4f callchannel Music_ShowMeAround_branch_edd5e loopchannel 0, Music_ShowMeAround_branch_edd39 -; edd4f -Music_ShowMeAround_branch_edd4f: ; edd4f +Music_ShowMeAround_branch_edd4f: note D#, 2 note F#, 2 note D_, 2 @@ -341,9 +330,8 @@ Music_ShowMeAround_branch_edd4f: ; edd4f note D_, 2 note D#, 2 endchannel -; edd5e -Music_ShowMeAround_branch_edd5e: ; edd5e +Music_ShowMeAround_branch_edd5e: note D#, 2 note F#, 2 note D_, 2 @@ -359,6 +347,3 @@ Music_ShowMeAround_branch_edd5e: ; edd5e note D_, 2 note F#, 2 endchannel -; edd6d - - diff --git a/crysaudio/music/sprouttower.asm b/crysaudio/music/sprouttower.asm index b587ad04..d44de631 100644 --- a/crysaudio/music/sprouttower.asm +++ b/crysaudio/music/sprouttower.asm @@ -1,11 +1,10 @@ -Music_SproutTower: ; f6974 - dbw $c0, Music_SproutTower_Ch1 - dbw $01, Music_SproutTower_Ch2 - dbw $02, Music_SproutTower_Ch3 - dbw $03, Music_SproutTower_Ch4 -; f6980 +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 -Music_SproutTower_Ch1: ; f6980 +Music_SproutTower_Ch1: tempo 176 volume $77 dutycycle $3 @@ -15,7 +14,7 @@ Music_SproutTower_Ch1: ; f6980 notetype $c, $a3 note __, 16 note __, 16 -Music_SproutTower_branch_f6994: ; f6994 +Music_SproutTower_branch_f6994: note __, 6 octave 3 note F_, 2 @@ -61,9 +60,8 @@ Music_SproutTower_branch_f6994: ; f6994 note D#, 4 note D#, 4 loopchannel 0, Music_SproutTower_branch_f6994 -; f69c8 -Music_SproutTower_Ch2: ; f69c8 +Music_SproutTower_Ch2: dutycycle $3 tone $0001 vibrato $8, $48 @@ -77,7 +75,7 @@ Music_SproutTower_Ch2: ; f69c8 note F_, 4 note D#, 4 note D#, 4 -Music_SproutTower_branch_f69dc: ; f69dc +Music_SproutTower_branch_f69dc: intensity $b5 octave 4 note C_, 4 @@ -139,9 +137,8 @@ Music_SproutTower_branch_f69dc: ; f69dc note C_, 16 note __, 16 loopchannel 0, Music_SproutTower_branch_f69dc -; f6a25 -Music_SproutTower_Ch3: ; f6a25 +Music_SproutTower_Ch3: vibrato $14, $e8 notetype $c, $14 octave 3 @@ -162,7 +159,7 @@ Music_SproutTower_Ch3: ; f6a25 note __, 2 note F#, 2 stereopanning $f0 -Music_SproutTower_branch_f6a3e: ; f6a3e +Music_SproutTower_branch_f6a3e: note __, 4 note C_, 2 note F_, 2 @@ -220,13 +217,12 @@ Music_SproutTower_branch_f6a3e: ; f6a3e note __, 2 note F_, 2 loopchannel 0, Music_SproutTower_branch_f6a3e -; f6a7a -Music_SproutTower_Ch4: ; f6a7a +Music_SproutTower_Ch4: togglenoise $0 notetype $c note __, 4 -Music_SproutTower_branch_f6a7f: ; f6a7f +Music_SproutTower_branch_f6a7f: note F#, 4 stereopanning $f0 note D#, 4 @@ -244,6 +240,3 @@ Music_SproutTower_branch_f6a7f: ; f6a7f stereopanning $ff note F#, 4 loopchannel 0, Music_SproutTower_branch_f6a7f -; f6a99 - - diff --git a/crysaudio/music/ssaqua.asm b/crysaudio/music/ssaqua.asm index ae10d639..5b06b27b 100644 --- a/crysaudio/music/ssaqua.asm +++ b/crysaudio/music/ssaqua.asm @@ -1,11 +1,10 @@ -Music_SSAqua: ; ead99 - dbw $c0, Music_SSAqua_Ch1 - dbw $01, Music_SSAqua_Ch2 - dbw $02, Music_SSAqua_Ch3 - dbw $03, Music_SSAqua_Ch4 -; eada5 +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 -Music_SSAqua_Ch1: ; eada5 +Music_SSAqua_Ch1: tempo 117 volume $77 stereopanning $f @@ -18,7 +17,7 @@ Music_SSAqua_Ch1: ; eada5 note __, 1 note G_, 1 note __, 1 -Music_SSAqua_branch_eadbc: ; eadbc +Music_SSAqua_branch_eadbc: octave 2 note G_, 16 note __, 8 @@ -248,15 +247,14 @@ Music_SSAqua_branch_eadbc: ; eadbc note F#, 2 note A_, 2 loopchannel 0, Music_SSAqua_branch_eadbc -; eaeca -Music_SSAqua_Ch2: ; eaeca +Music_SSAqua_Ch2: stereopanning $f0 dutycycle $2 vibrato $8, $33 notetype $c, $b7 note __, 2 -Music_SSAqua_branch_eaed5: ; eaed5 +Music_SSAqua_branch_eaed5: notetype $c, $b7 dutycycle $1 intensity $61 @@ -276,9 +274,9 @@ Music_SSAqua_branch_eaed5: ; eaed5 octave 4 note C#, 1 note E_, 1 - forceoctave $c + pitchoffset 0, CC callchannel Music_SSAqua_branch_eafe0 - forceoctave $0 + pitchoffset 0, C_ octave 3 note B_, 1 note __, 1 @@ -392,9 +390,8 @@ Music_SSAqua_branch_eaed5: ; eaed5 note A_, 8 note __, 8 loopchannel 0, Music_SSAqua_branch_eaed5 -; eaf88 -Music_SSAqua_branch_eaf88: ; eaf88 +Music_SSAqua_branch_eaf88: note D_, 6 octave 3 note B_, 1 @@ -468,9 +465,8 @@ Music_SSAqua_branch_eaf88: ; eaf88 note E_, 2 note F#, 2 endchannel -; eafd5 -Music_SSAqua_branch_eafd5: ; eafd5 +Music_SSAqua_branch_eafd5: notetype $c, $b7 note B_, 10 note F#, 1 @@ -480,9 +476,8 @@ Music_SSAqua_branch_eafd5: ; eafd5 note F#, 1 note __, 1 endchannel -; eafe0 -Music_SSAqua_branch_eafe0: ; eafe0 +Music_SSAqua_branch_eafe0: octave 3 note D_, 10 note E_, 1 @@ -504,9 +499,8 @@ Music_SSAqua_branch_eafe0: ; eafe0 note A_, 1 note __, 1 endchannel -; eaff5 -Music_SSAqua_branch_eaff5: ; eaff5 +Music_SSAqua_branch_eaff5: octave 5 note G_, 1 note D_, 1 @@ -580,9 +574,8 @@ Music_SSAqua_branch_eaff5: ; eaff5 note A_, 1 note G_, 1 endchannel -; eb03e -Music_SSAqua_branch_eb03e: ; eb03e +Music_SSAqua_branch_eb03e: octave 5 note G_, 1 octave 4 @@ -607,9 +600,8 @@ Music_SSAqua_branch_eb03e: ; eb03e octave 3 note G_, 1 endchannel -; eb056 -Music_SSAqua_Ch3: ; eb056 +Music_SSAqua_Ch3: stereopanning $ff vibrato $8, $34 notetype $6, $15 @@ -618,7 +610,7 @@ Music_SSAqua_Ch3: ; eb056 note __, 1 note G_, 1 note __, 1 -Music_SSAqua_branch_eb063: ; eb063 +Music_SSAqua_branch_eb063: note G_, 16 note __, 8 note G_, 2 @@ -651,7 +643,7 @@ Music_SSAqua_branch_eb063: ; eb063 note E_, 1 callchannel Music_SSAqua_branch_eb14d callchannel Music_SSAqua_branch_eb14d -Music_SSAqua_branch_eb08d: ; eb08d +Music_SSAqua_branch_eb08d: note G_, 2 note __, 2 octave 3 @@ -830,9 +822,8 @@ Music_SSAqua_branch_eb08d: ; eb08d note G_, 1 note __, 1 loopchannel 0, Music_SSAqua_branch_eb063 -; eb14d -Music_SSAqua_branch_eb14d: ; eb14d +Music_SSAqua_branch_eb14d: notetype $6, $15 octave 2 note G_, 2 @@ -868,9 +859,8 @@ Music_SSAqua_branch_eb14d: ; eb14d note G_, 1 note __, 1 endchannel -; eb172 -Music_SSAqua_branch_eb172: ; eb172 +Music_SSAqua_branch_eb172: octave 2 note G_, 2 note __, 2 @@ -1061,9 +1051,8 @@ Music_SSAqua_branch_eb172: ; eb172 note F#, 1 note __, 3 endchannel -; eb230 -Music_SSAqua_branch_eb230: ; eb230 +Music_SSAqua_branch_eb230: octave 2 note B_, 2 note __, 2 @@ -1089,13 +1078,12 @@ Music_SSAqua_branch_eb230: ; eb230 note D#, 1 note __, 3 endchannel -; eb249 -Music_SSAqua_Ch4: ; eb249 +Music_SSAqua_Ch4: togglenoise $3 notetype $c note __, 2 -Music_SSAqua_branch_eb24e: ; eb24e +Music_SSAqua_branch_eb24e: note G#, 1 note G_, 1 note G_, 1 @@ -1138,9 +1126,8 @@ Music_SSAqua_branch_eb24e: ; eb24e callchannel Music_SSAqua_branch_eb2ae callchannel Music_SSAqua_branch_eb2c7 loopchannel 0, Music_SSAqua_branch_eb24e -; eb2ae -Music_SSAqua_branch_eb2ae: ; eb2ae +Music_SSAqua_branch_eb2ae: note A#, 2 note G_, 1 note G_, 1 @@ -1154,9 +1141,8 @@ Music_SSAqua_branch_eb2ae: ; eb2ae note G_, 1 note G_, 1 endchannel -; eb2bb -Music_SSAqua_branch_eb2bb: ; eb2bb +Music_SSAqua_branch_eb2bb: note A#, 2 note G_, 1 note G_, 1 @@ -1169,9 +1155,8 @@ Music_SSAqua_branch_eb2bb: ; eb2bb note D_, 2 note F#, 2 endchannel -; eb2c7 -Music_SSAqua_branch_eb2c7: ; eb2c7 +Music_SSAqua_branch_eb2c7: note A#, 2 note G_, 1 note G_, 1 @@ -1184,6 +1169,3 @@ Music_SSAqua_branch_eb2c7: ; eb2c7 note D_, 2 note C_, 2 endchannel -; eb2d3 - - diff --git a/crysaudio/music/successfulcapture.asm b/crysaudio/music/successfulcapture.asm index aa9ea0b4..1b53f4a1 100644 --- a/crysaudio/music/successfulcapture.asm +++ b/crysaudio/music/successfulcapture.asm @@ -1,28 +1,22 @@ -Music_SuccessfulCapture: ; f4602 - dbw $80, Music_SuccessfulCapture_Ch1 - dbw $01, Music_SuccessfulCapture_Ch2 - dbw $02, Music_SuccessfulCapture_Ch3 -; f460b +Music_SuccessfulCapture: + musicheader 3, 1, Music_SuccessfulCapture_Ch1 + musicheader 1, 2, Music_SuccessfulCapture_Ch2 + musicheader 1, 3, Music_SuccessfulCapture_Ch3 -Music_SuccessfulCapture_Ch1: ; f460b - ftempo 126 +Music_SuccessfulCapture_Ch1: + tempo 126 volume $77 - fdutycycle $3 + dutycycle $3 tone $0001 notetype $c, $a1 jumpchannel Music_SuccessfulCapture_branch_f4536 -; f461b -Music_SuccessfulCapture_Ch2: ; f461b +Music_SuccessfulCapture_Ch2: vibrato $12, $24 notetype $c, $c1 - fdutycycle $2 + dutycycle $2 jumpchannel Music_SuccessfulCapture_branch_f4585 -; f4626 -Music_SuccessfulCapture_Ch3: ; f4626 +Music_SuccessfulCapture_Ch3: notetype $c, $25 jumpchannel Music_SuccessfulCapture_branch_f45cf -; f462c - - diff --git a/crysaudio/music/suicunebattle.asm b/crysaudio/music/suicunebattle.asm index 35003a43..189e6b18 100644 --- a/crysaudio/music/suicunebattle.asm +++ b/crysaudio/music/suicunebattle.asm @@ -1,11 +1,10 @@ -Music_SuicuneBattle: ; 178b81 - dbw $80, Music_SuicuneBattle_Ch1 - dbw $01, Music_SuicuneBattle_Ch2 - dbw $02, Music_SuicuneBattle_Ch3 -; 178b8a +Music_SuicuneBattle: + musicheader 3, 1, Music_SuicuneBattle_Ch1 + musicheader 1, 2, Music_SuicuneBattle_Ch2 + musicheader 1, 3, Music_SuicuneBattle_Ch3 -Music_SuicuneBattle_Ch1: ; 178b8a - ftempo 101 +Music_SuicuneBattle_Ch1: + tempo 101 volume $77 dutycycle $3 tone $0002 @@ -95,7 +94,7 @@ Music_SuicuneBattle_Ch1: ; 178b8a octave 3 note E_, 1 note G#, 1 -Music_SuicuneBattle_branch_178bfc: ; 178bfc +Music_SuicuneBattle_branch_178bfc: notetype $c, $b4 octave 2 note A_, 2 @@ -511,9 +510,8 @@ Music_SuicuneBattle_branch_178bfc: ; 178bfc vibrato $12, $15 dutycycle $3 loopchannel 0, Music_SuicuneBattle_branch_178bfc -; 178dec -Music_SuicuneBattle_Ch2: ; 178dec +Music_SuicuneBattle_Ch2: dutycycle $3 vibrato $14, $34 tone $0001 @@ -591,7 +589,7 @@ Music_SuicuneBattle_Ch2: ; 178dec note E_, 8 note E_, 8 note E_, 4 -Music_SuicuneBattle_branch_178e4e: ; 178e4e +Music_SuicuneBattle_branch_178e4e: notetype $c, $c7 octave 3 note A_, 8 @@ -1187,9 +1185,8 @@ Music_SuicuneBattle_branch_178e4e: ; 178e4e note A_, 2 note B_, 2 loopchannel 0, Music_SuicuneBattle_branch_178e4e -; 179122 -Music_SuicuneBattle_Ch3: ; 179122 +Music_SuicuneBattle_Ch3: notetype $c, $18 note __, 16 note __, 4 @@ -1282,7 +1279,7 @@ Music_SuicuneBattle_Ch3: ; 179122 note D_, 2 note E_, 2 notetype $c, $16 -Music_SuicuneBattle_branch_179182: ; 179182 +Music_SuicuneBattle_branch_179182: octave 1 note A_, 2 octave 2 @@ -2057,6 +2054,3 @@ Music_SuicuneBattle_branch_179182: ; 179182 note D_, 2 note E_, 2 loopchannel 0, Music_SuicuneBattle_branch_179182 -; 17948b - - diff --git a/crysaudio/music/surf.asm b/crysaudio/music/surf.asm index 687982c4..c3948f5f 100644 --- a/crysaudio/music/surf.asm +++ b/crysaudio/music/surf.asm @@ -1,18 +1,16 @@ -Music_Surf: ; f518a - dbw $80, Music_Surf_Ch1 - dbw $01, Music_Surf_Ch2 - dbw $02, Music_Surf_Ch3 -; f5193 +Music_Surf: + musicheader 3, 1, Music_Surf_Ch1 + musicheader 1, 2, Music_Surf_Ch2 + musicheader 1, 3, Music_Surf_Ch3 + db $3 - - -Music_Surf_Ch1: ; f5194 +Music_Surf_Ch1: tempo 108 volume $77 notetype $c, $a7 stereopanning $f -Music_Surf_branch_f519e: ; f519e +Music_Surf_branch_f519e: dutycycle $2 vibrato $10, $24 intensity $73 @@ -120,9 +118,8 @@ Music_Surf_branch_f519e: ; f519e octave 3 note D#, 2 loopchannel 0, Music_Surf_branch_f519e -; f5233 -Music_Surf_branch_f5233: ; f5233 +Music_Surf_branch_f5233: notetype $c, $a7 octave 3 note D#, 4 @@ -215,9 +212,8 @@ Music_Surf_branch_f5233: ; f5233 note C#, 4 note D_, 4 endchannel -; f5293 -Music_Surf_branch_f5293: ; f5293 +Music_Surf_branch_f5293: octave 4 note G#, 16 note D#, 4 @@ -282,9 +278,8 @@ Music_Surf_branch_f5293: ; f5293 octave 3 note G_, 2 endchannel -; f52d9 -Music_Surf_branch_f52d9: ; f52d9 +Music_Surf_branch_f52d9: octave 3 note A#, 3 note G_, 3 @@ -342,15 +337,14 @@ Music_Surf_branch_f52d9: ; f52d9 octave 2 note B_, 8 endchannel -; f5317 -Music_Surf_Ch2: ; f5317 -Music_Surf_branch_f5317: ; f5317 +Music_Surf_Ch2: +Music_Surf_branch_f5317: notetype $c, $c2 stereopanning $f0 dutycycle $2 vibrato $14, $23 -Music_Surf_branch_f5321: ; f5321 +Music_Surf_branch_f5321: octave 1 note A#, 4 octave 2 @@ -366,7 +360,7 @@ Music_Surf_branch_f5321: ; f5321 note __, 3 note A#, 1 note __, 3 -Music_Surf_branch_f5333: ; f5333 +Music_Surf_branch_f5333: note D#, 4 note G_, 2 note G#, 2 @@ -426,7 +420,7 @@ Music_Surf_branch_f5333: ; f5333 note B_, 16 octave 4 note C#, 8 - forceoctave $c + pitchoffset 0, CC dutycycle $3 callchannel Music_Surf_branch_f53d6 intensity $b8 @@ -437,7 +431,7 @@ Music_Surf_branch_f5333: ; f5333 intensity $b8 dutycycle $1 callchannel Music_Surf_branch_f5404 - forceoctave $0 + pitchoffset 0, C_ notetype $c, $b8 octave 4 note B_, 12 @@ -449,9 +443,8 @@ Music_Surf_branch_f5333: ; f5333 note A#, 4 note B_, 4 loopchannel 0, Music_Surf_branch_f5317 -; f53b2 -Music_Surf_branch_f53b2: ; f53b2 +Music_Surf_branch_f53b2: octave 1 note G#, 4 octave 3 @@ -488,9 +481,8 @@ Music_Surf_branch_f53b2: ; f53b2 note F_, 4 note G_, 4 endchannel -; f53d6 -Music_Surf_branch_f53d6: ; f53d6 +Music_Surf_branch_f53d6: octave 4 note F_, 4 note D#, 4 @@ -508,9 +500,8 @@ Music_Surf_branch_f53d6: ; f53d6 note B_, 1 note A_, 1 endchannel -; f53e8 -Music_Surf_branch_f53e8: ; f53e8 +Music_Surf_branch_f53e8: note A#, 7 octave 4 note C_, 8 @@ -522,9 +513,8 @@ Music_Surf_branch_f53e8: ; f53e8 note C_, 16 note G_, 8 endchannel -; f53f3 -Music_Surf_branch_f53f3: ; f53f3 +Music_Surf_branch_f53f3: note F#, 1 note G_, 3 note F_, 4 @@ -541,9 +531,8 @@ Music_Surf_branch_f53f3: ; f53f3 octave 3 note B_, 1 endchannel -; f5404 -Music_Surf_branch_f5404: ; f5404 +Music_Surf_branch_f5404: octave 4 note C_, 8 note G_, 4 @@ -552,10 +541,9 @@ Music_Surf_branch_f5404: ; f5404 note G#, 8 note D#, 8 endchannel -; f540c -Music_Surf_Ch3: ; f540c -Music_Surf_branch_f540c: ; f540c +Music_Surf_Ch3: +Music_Surf_branch_f540c: stereopanning $ff notetype $c, $15 vibrato $16, $23 @@ -698,9 +686,8 @@ Music_Surf_branch_f540c: ; f540c octave 2 note B_, 4 loopchannel 0, Music_Surf_branch_f540c -; f54c8 -Music_Surf_branch_f54c8: ; f54c8 +Music_Surf_branch_f54c8: octave 3 note D#, 4 note G_, 1 @@ -733,6 +720,3 @@ Music_Surf_branch_f54c8: ; f54c8 note G#, 1 note __, 3 endchannel -; f54e8 - - diff --git a/crysaudio/music/tintower.asm b/crysaudio/music/tintower.asm index e9dd5c31..3871f4ee 100644 --- a/crysaudio/music/tintower.asm +++ b/crysaudio/music/tintower.asm @@ -1,17 +1,16 @@ -Music_TinTower: ; f6811 - dbw $c0, Music_TinTower_Ch1 - dbw $01, Music_TinTower_Ch2 - dbw $02, Music_TinTower_Ch3 - dbw $03, Music_TinTower_Ch4 -; f681d +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 -Music_TinTower_Ch1: ; f681d +Music_TinTower_Ch1: tempo 208 volume $77 dutycycle $3 tone $0004 vibrato $8, $45 -Music_TinTower_branch_f682a: ; f682a +Music_TinTower_branch_f682a: stereopanning $f0 notetype $c, $a5 octave 3 @@ -95,15 +94,14 @@ Music_TinTower_branch_f682a: ; f682a octave 3 note A#, 4 loopchannel 0, Music_TinTower_branch_f682a -; f688b -Music_TinTower_Ch2: ; f688b +Music_TinTower_Ch2: dutycycle $3 tone $0002 vibrato $18, $44 -Music_TinTower_branch_f6893: ; f6893 +Music_TinTower_branch_f6893: stereopanning $ff -Music_TinTower_branch_f6895: ; f6895 +Music_TinTower_branch_f6895: notetype $c, $b5 octave 4 note C_, 4 @@ -185,11 +183,10 @@ Music_TinTower_branch_f6895: ; f6895 intensity $95 note C#, 2 loopchannel 0, Music_TinTower_branch_f6893 -; f68f8 -Music_TinTower_Ch3: ; f68f8 +Music_TinTower_Ch3: notetype $c, $14 -Music_TinTower_branch_f68fb: ; f68fb +Music_TinTower_branch_f68fb: note __, 16 note __, 16 note __, 16 @@ -260,12 +257,11 @@ Music_TinTower_branch_f68fb: ; f68fb note __, 11 stereopanning $ff loopchannel 0, Music_TinTower_branch_f68fb -; f6948 -Music_TinTower_Ch4: ; f6948 +Music_TinTower_Ch4: togglenoise $0 notetype $c -Music_TinTower_branch_f694c: ; f694c +Music_TinTower_branch_f694c: stereopanning $f note G_, 2 stereopanning $f0 @@ -293,6 +289,3 @@ Music_TinTower_branch_f694c: ; f694c note G_, 2 note F_, 2 loopchannel 0, Music_TinTower_branch_f694c -; f6974 - - diff --git a/crysaudio/music/titlescreen.asm b/crysaudio/music/titlescreen.asm index 87966c58..a59608a4 100644 --- a/crysaudio/music/titlescreen.asm +++ b/crysaudio/music/titlescreen.asm @@ -1,12 +1,11 @@ -Music_TitleScreen: ; eb808 - dbw $c0, Music_TitleScreen_Ch1 - dbw $01, Music_TitleScreen_Ch2 - dbw $02, Music_TitleScreen_Ch3 - dbw $03, Music_TitleScreen_Ch4 -; eb814 +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 -Music_TitleScreen_Ch1: ; eb814 - ftempo 134 +Music_TitleScreen_Ch1: + tempo 134 volume $77 dutycycle $3 tone $0002 @@ -159,7 +158,7 @@ Music_TitleScreen_Ch1: ; eb814 octave 3 note D_, 3 note G_, 3 - ftempo 136 + tempo 136 notetype $8, $b4 note F_, 3 note A_, 3 @@ -167,7 +166,7 @@ Music_TitleScreen_Ch1: ; eb814 octave 4 note C_, 3 note F_, 3 - ftempo 138 + tempo 138 notetype $8, $b4 note D_, 9 note C_, 9 @@ -192,9 +191,9 @@ Music_TitleScreen_Ch1: ; eb814 note G_, 12 octave 4 note C_, 6 - ftempo 136 + tempo 136 note C#, 6 - ftempo 134 + tempo 134 callchannel Music_TitleScreen_branch_eb96d octave 4 note C_, 4 @@ -272,12 +271,11 @@ Music_TitleScreen_Ch1: ; eb814 note G_, 1 note __, 11 endchannel -; eb96d -Music_TitleScreen_branch_eb96d: ; eb96d +Music_TitleScreen_branch_eb96d: notetype $c, $c3 note D_, 1 -Music_TitleScreen_branch_eb971: ; eb971 +Music_TitleScreen_branch_eb971: note __, 1 octave 2 note D_, 1 @@ -292,9 +290,8 @@ Music_TitleScreen_branch_eb971: ; eb971 note A_, 1 notetype $8, $b7 endchannel -; eb984 -Music_TitleScreen_Ch2: ; eb984 +Music_TitleScreen_Ch2: dutycycle $3 vibrato $14, $12 notetype $c, $c7 @@ -490,7 +487,7 @@ Music_TitleScreen_Ch2: ; eb984 octave 4 note A_, 4 stereopanning $ff - tone $0000 + tone 0 notetype $c, $b0 octave 3 note B_, 6 @@ -556,12 +553,11 @@ Music_TitleScreen_Ch2: ; eb984 note G_, 1 note __, 11 endchannel -; ebae7 -Music_TitleScreen_branch_ebae7: ; ebae7 +Music_TitleScreen_branch_ebae7: notetype $c, $b2 note D_, 1 -Music_TitleScreen_branch_ebaeb: ; ebaeb +Music_TitleScreen_branch_ebaeb: octave 3 note A_, 1 octave 4 @@ -579,9 +575,8 @@ Music_TitleScreen_branch_ebaeb: ; ebaeb note C_, 4 note C_, 4 endchannel -; ebb01 -Music_TitleScreen_Ch3: ; ebb01 +Music_TitleScreen_Ch3: stereopanning $f vibrato $10, $14 tone $0001 @@ -775,7 +770,7 @@ Music_TitleScreen_Ch3: ; ebb01 note __, 1 stereopanning $ff notetype $c, $16 - tone $0000 + tone 0 octave 4 note A_, 2 octave 5 @@ -896,9 +891,8 @@ Music_TitleScreen_Ch3: ; ebb01 note G_, 1 note __, 11 endchannel -; ebc5c -Music_TitleScreen_Ch4: ; ebc5c +Music_TitleScreen_Ch4: togglenoise $5 stereopanning $f0 notetype $c @@ -1081,7 +1075,7 @@ Music_TitleScreen_Ch4: ; ebc5c note C#, 1 notetype $c note G#, 16 -Music_TitleScreen_branch_ebd40: ; ebd40 +Music_TitleScreen_branch_ebd40: note __, 16 loopchannel 6, Music_TitleScreen_branch_ebd40 note __, 12 @@ -1129,9 +1123,8 @@ Music_TitleScreen_branch_ebd40: ; ebd40 note C_, 4 note B_, 4 endchannel -; ebd77 -Music_TitleScreen_branch_ebd77: ; ebd77 +Music_TitleScreen_branch_ebd77: note C_, 2 note D#, 2 note C_, 2 @@ -1142,9 +1135,8 @@ Music_TitleScreen_branch_ebd77: ; ebd77 note C_, 2 note D#, 2 endchannel -; ebd81 -Music_TitleScreen_branch_ebd81: ; ebd81 +Music_TitleScreen_branch_ebd81: note C_, 2 note D#, 2 note C_, 2 @@ -1155,17 +1147,15 @@ Music_TitleScreen_branch_ebd81: ; ebd81 note C_, 2 note D#, 2 endchannel -; ebd8b -Music_TitleScreen_branch_ebd8b: ; ebd8b +Music_TitleScreen_branch_ebd8b: note C_, 2 note C_, 1 note C_, 1 loopchannel 4, Music_TitleScreen_branch_ebd8b endchannel -; ebd93 -Music_TitleScreen_branch_ebd93: ; ebd93 +Music_TitleScreen_branch_ebd93: note C_, 2 note C_, 1 note C_, 1 @@ -1176,6 +1166,3 @@ Music_TitleScreen_branch_ebd93: ; ebd93 note C_, 4 note C_, 4 endchannel -; ebd9e - - diff --git a/crysaudio/music/trainervictory.asm b/crysaudio/music/trainervictory.asm index c4394b6b..56b2d847 100644 --- a/crysaudio/music/trainervictory.asm +++ b/crysaudio/music/trainervictory.asm @@ -1,11 +1,10 @@ -Music_TrainerVictory: ; ebeab - dbw $80, Music_TrainerVictory_Ch1 - dbw $01, Music_TrainerVictory_Ch2 - dbw $02, Music_TrainerVictory_Ch3 -; ebeb4 +Music_TrainerVictory: + musicheader 3, 1, Music_TrainerVictory_Ch1 + musicheader 1, 2, Music_TrainerVictory_Ch2 + musicheader 1, 3, Music_TrainerVictory_Ch3 -Music_TrainerVictory_Ch1: ; ebeb4 - ftempo 120 +Music_TrainerVictory_Ch1: + tempo 120 volume $77 dutycycle $2 tone $0001 @@ -20,7 +19,7 @@ Music_TrainerVictory_Ch1: ; ebeb4 intensity $b6 note A_, 12 stereopanning $f -Music_TrainerVictory_branch_ebecd: ; ebecd +Music_TrainerVictory_branch_ebecd: intensity $72 callchannel Music_TrainerVictory_branch_ebf11 intensity $51 @@ -48,7 +47,7 @@ Music_TrainerVictory_branch_ebecd: ; ebecd note __, 2 note G_, 2 note A#, 6 -Music_TrainerVictory_branch_ebef2: ; ebef2 +Music_TrainerVictory_branch_ebef2: intensity $72 octave 4 note D_, 2 @@ -60,7 +59,7 @@ Music_TrainerVictory_branch_ebef2: ; ebef2 note A_, 2 octave 4 note D_, 2 -Music_TrainerVictory_branch_ebf01: ; ebf01 +Music_TrainerVictory_branch_ebf01: octave 4 note C#, 2 octave 3 @@ -71,9 +70,8 @@ Music_TrainerVictory_branch_ebf01: ; ebf01 note F#, 2 note G_, 2 loopchannel 0, Music_TrainerVictory_branch_ebecd -; ebf11 -Music_TrainerVictory_branch_ebf11: ; ebf11 +Music_TrainerVictory_branch_ebf11: octave 3 note F#, 2 note __, 2 @@ -84,9 +82,8 @@ Music_TrainerVictory_branch_ebf11: ; ebf11 note E_, 2 note G_, 6 endchannel -; ebf1b -Music_TrainerVictory_Ch2: ; ebf1b +Music_TrainerVictory_Ch2: vibrato $12, $34 dutycycle $3 notetype $8, $d1 @@ -101,7 +98,7 @@ Music_TrainerVictory_Ch2: ; ebf1b intensity $d6 note D_, 12 stereopanning $f0 -Music_TrainerVictory_branch_ebf30: ; ebf30 +Music_TrainerVictory_branch_ebf30: notetype $8, $82 callchannel Music_TrainerVictory_branch_ebf56 note F#, 2 @@ -126,9 +123,8 @@ Music_TrainerVictory_branch_ebf30: ; ebf30 note F#, 16 note E_, 16 loopchannel 0, Music_TrainerVictory_branch_ebf30 -; ebf56 -Music_TrainerVictory_branch_ebf56: ; ebf56 +Music_TrainerVictory_branch_ebf56: octave 4 note D_, 2 note __, 2 @@ -143,9 +139,8 @@ Music_TrainerVictory_branch_ebf56: ; ebf56 octave 4 note E_, 6 endchannel -; ebf64 -Music_TrainerVictory_Ch3: ; ebf64 +Music_TrainerVictory_Ch3: notetype $8, $25 octave 3 note G_, 6 @@ -160,7 +155,7 @@ Music_TrainerVictory_Ch3: ; ebf64 note C#, 2 octave 2 note B_, 2 -Music_TrainerVictory_branch_ebf74: ; ebf74 +Music_TrainerVictory_branch_ebf74: callchannel Music_TrainerVictory_branch_ebfb1 octave 3 note C#, 2 @@ -212,9 +207,8 @@ Music_TrainerVictory_branch_ebf74: ; ebf74 note E_, 2 note C#, 2 loopchannel 0, Music_TrainerVictory_branch_ebf74 -; ebfb1 -Music_TrainerVictory_branch_ebfb1: ; ebfb1 +Music_TrainerVictory_branch_ebfb1: octave 2 note A_, 2 note __, 2 @@ -233,5 +227,3 @@ Music_TrainerVictory_branch_ebfb1: ; ebfb1 octave 2 note B_, 2 endchannel -; ebfc3 - diff --git a/crysaudio/music/unioncave.asm b/crysaudio/music/unioncave.asm index dc49f102..94c7aec6 100644 --- a/crysaudio/music/unioncave.asm +++ b/crysaudio/music/unioncave.asm @@ -1,23 +1,22 @@ -Music_UnionCave: ; f5c60 - dbw $c0, Music_UnionCave_Ch1 - dbw $01, Music_UnionCave_Ch2 - dbw $02, Music_UnionCave_Ch3 - dbw $03, Music_UnionCave_Ch4 -; f5c6c +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 -Music_UnionCave_Ch1: ; f5c6c +Music_UnionCave_Ch1: tempo 160 volume $77 dutycycle $1 tone $0002 vibrato $18, $34 stereopanning $f -Music_UnionCave_branch_f5c7b: ; f5c7b +Music_UnionCave_branch_f5c7b: notetype $c, $b3 -Music_UnionCave_branch_f5c7e: ; f5c7e +Music_UnionCave_branch_f5c7e: callchannel Music_UnionCave_branch_f5ccf loopchannel 4, Music_UnionCave_branch_f5c7e -Music_UnionCave_branch_f5c85: ; f5c85 +Music_UnionCave_branch_f5c85: octave 2 note G#, 2 octave 3 @@ -27,7 +26,7 @@ Music_UnionCave_branch_f5c85: ; f5c85 note E_, 2 note F_, 4 loopchannel 8, Music_UnionCave_branch_f5c85 -Music_UnionCave_branch_f5c91: ; f5c91 +Music_UnionCave_branch_f5c91: octave 2 note A_, 2 octave 3 @@ -64,21 +63,19 @@ Music_UnionCave_branch_f5c91: ; f5c91 callchannel Music_UnionCave_branch_f5ccf tone $0002 loopchannel 0, Music_UnionCave_branch_f5c7b -; f5ccf -Music_UnionCave_branch_f5ccf: ; f5ccf +Music_UnionCave_branch_f5ccf: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 endchannel -; f5cd5 -Music_UnionCave_Ch2: ; f5cd5 +Music_UnionCave_Ch2: dutycycle $3 vibrato $8, $24 -Music_UnionCave_branch_f5cda: ; f5cda +Music_UnionCave_branch_f5cda: notetype $c, $c4 callchannel Music_UnionCave_branch_f5d34 intensity $c5 @@ -135,9 +132,8 @@ Music_UnionCave_branch_f5cda: ; f5cda callchannel Music_UnionCave_branch_f5d52 vibrato $8, $24 loopchannel 0, Music_UnionCave_branch_f5cda -; f5d34 -Music_UnionCave_branch_f5d34: ; f5d34 +Music_UnionCave_branch_f5d34: octave 4 note C_, 4 octave 3 @@ -168,27 +164,25 @@ Music_UnionCave_branch_f5d34: ; f5d34 note C#, 4 note C_, 4 endchannel -; f5d52 -Music_UnionCave_branch_f5d52: ; f5d52 +Music_UnionCave_branch_f5d52: octave 2 note G#, 2 octave 3 note C#, 2 note E_, 12 endchannel -; f5d58 -Music_UnionCave_Ch3: ; f5d58 +Music_UnionCave_Ch3: notetype $c, $16 stereopanning $f0 -Music_UnionCave_branch_f5d5d: ; f5d5d +Music_UnionCave_branch_f5d5d: note __, 16 loopchannel 7, Music_UnionCave_branch_f5d5d note __, 14 octave 4 note C_, 2 -Music_UnionCave_branch_f5d65: ; f5d65 +Music_UnionCave_branch_f5d65: note __, 2 octave 3 note E_, 2 @@ -200,7 +194,7 @@ Music_UnionCave_branch_f5d65: ; f5d65 octave 4 note C_, 2 loopchannel 4, Music_UnionCave_branch_f5d65 -Music_UnionCave_branch_f5d73: ; f5d73 +Music_UnionCave_branch_f5d73: note __, 2 octave 3 note F_, 2 @@ -224,7 +218,7 @@ Music_UnionCave_branch_f5d73: ; f5d73 octave 3 note B_, 8 note A#, 8 -Music_UnionCave_branch_f5d8d: ; f5d8d +Music_UnionCave_branch_f5d8d: note A_, 4 note G_, 4 note A#, 2 @@ -237,16 +231,15 @@ Music_UnionCave_branch_f5d8d: ; f5d8d note A_, 4 note G_, 4 note A#, 8 -Music_UnionCave_branch_f5d9c: ; f5d9c +Music_UnionCave_branch_f5d9c: note __, 16 loopchannel 4, Music_UnionCave_branch_f5d9c loopchannel 0, Music_UnionCave_branch_f5d5d -; f5da5 -Music_UnionCave_Ch4: ; f5da5 +Music_UnionCave_Ch4: togglenoise $1 notetype $c -Music_UnionCave_branch_f5da9: ; f5da9 +Music_UnionCave_branch_f5da9: stereopanning $f0 note E_, 4 stereopanning $ff @@ -262,9 +255,4 @@ Music_UnionCave_branch_f5da9: ; f5da9 note G#, 4 note __, 8 loopchannel 0, Music_UnionCave_branch_f5da9 -; f5dc1 - - - - - + loopchannel 0, Music_UnionCave_branch_f5da9 ; unused diff --git a/crysaudio/music/vermilioncity.asm b/crysaudio/music/vermilioncity.asm index f7c550f4..ec88085e 100644 --- a/crysaudio/music/vermilioncity.asm +++ b/crysaudio/music/vermilioncity.asm @@ -1,13 +1,11 @@ -Music_VermilionCity: ; eb676 - dbw $80, Music_VermilionCity_Ch1 - dbw $01, Music_VermilionCity_Ch2 - dbw $02, Music_VermilionCity_Ch3 -; eb67f +Music_VermilionCity: + musicheader 3, 1, Music_VermilionCity_Ch1 + musicheader 1, 2, Music_VermilionCity_Ch2 + musicheader 1, 3, Music_VermilionCity_Ch3 + db $3 - - -Music_VermilionCity_Ch1: ; eb680 +Music_VermilionCity_Ch1: stereopanning $f tempo 176 volume $77 @@ -31,7 +29,7 @@ Music_VermilionCity_Ch1: ; eb680 octave 5 note D_, 1 vibrato $10, $23 -Music_VermilionCity_branch_eb6a0: ; eb6a0 +Music_VermilionCity_branch_eb6a0: dutycycle $1 notetype $c, $85 callchannel Music_VermilionCity_branch_eb6f9 @@ -92,9 +90,8 @@ Music_VermilionCity_branch_eb6a0: ; eb6a0 octave 3 note D_, 4 loopchannel 0, Music_VermilionCity_branch_eb6a0 -; eb6f9 -Music_VermilionCity_branch_eb6f9: ; eb6f9 +Music_VermilionCity_branch_eb6f9: octave 3 note C#, 4 note E_, 4 @@ -103,9 +100,8 @@ Music_VermilionCity_branch_eb6f9: ; eb6f9 note E_, 2 note G#, 2 endchannel -; eb701 -Music_VermilionCity_branch_eb701: ; eb701 +Music_VermilionCity_branch_eb701: note D_, 2 note F_, 2 note A_, 2 @@ -117,9 +113,8 @@ Music_VermilionCity_branch_eb701: ; eb701 note A_, 2 note E_, 2 endchannel -; eb70c -Music_VermilionCity_branch_eb70c: ; eb70c +Music_VermilionCity_branch_eb70c: note __, 2 note F#, 2 note A_, 2 @@ -141,9 +136,8 @@ Music_VermilionCity_branch_eb70c: ; eb70c note B_, 2 note G#, 2 endchannel -; eb721 -Music_VermilionCity_Ch2: ; eb721 +Music_VermilionCity_Ch2: stereopanning $ff dutycycle $3 notetype $c, $77 @@ -158,7 +152,7 @@ Music_VermilionCity_Ch2: ; eb721 note E_, 4 note F#, 4 note G#, 4 -Music_VermilionCity_branch_eb735: ; eb735 +Music_VermilionCity_branch_eb735: notetype $c, $97 callchannel Music_VermilionCity_branch_eb768 note G#, 2 @@ -192,9 +186,8 @@ Music_VermilionCity_branch_eb735: ; eb735 octave 5 note E_, 16 loopchannel 0, Music_VermilionCity_branch_eb735 -; eb768 -Music_VermilionCity_branch_eb768: ; eb768 +Music_VermilionCity_branch_eb768: octave 1 note A_, 8 octave 2 @@ -217,9 +210,8 @@ Music_VermilionCity_branch_eb768: ; eb768 octave 1 note A_, 2 endchannel -; eb77e -Music_VermilionCity_branch_eb77e: ; eb77e +Music_VermilionCity_branch_eb77e: note F#, 8 note B_, 8 note A_, 4 @@ -227,9 +219,8 @@ Music_VermilionCity_branch_eb77e: ; eb77e note F#, 4 note E_, 4 endchannel -; eb785 -Music_VermilionCity_Ch3: ; eb785 +Music_VermilionCity_Ch3: stereopanning $f0 vibrato $22, $23 notetype $c, $25 @@ -250,7 +241,7 @@ Music_VermilionCity_Ch3: ; eb785 note D_, 1 octave 2 note B_, 1 -Music_VermilionCity_branch_eb79e: ; eb79e +Music_VermilionCity_branch_eb79e: notetype $c, $22 callchannel Music_VermilionCity_branch_eb7de octave 5 @@ -298,9 +289,8 @@ Music_VermilionCity_branch_eb79e: ; eb79e note E_, 1 note G#, 1 loopchannel 0, Music_VermilionCity_branch_eb79e -; eb7de -Music_VermilionCity_branch_eb7de: ; eb7de +Music_VermilionCity_branch_eb7de: octave 5 note A_, 8 octave 6 @@ -324,9 +314,8 @@ Music_VermilionCity_branch_eb7de: ; eb7de octave 5 note B_, 1 endchannel -; eb7f5 -Music_VermilionCity_branch_eb7f5: ; eb7f5 +Music_VermilionCity_branch_eb7f5: note A_, 1 note __, 1 note A_, 2 @@ -346,6 +335,3 @@ Music_VermilionCity_branch_eb7f5: ; eb7f5 octave 4 note C#, 1 endchannel -; eb808 - - diff --git a/crysaudio/music/victoryroad.asm b/crysaudio/music/victoryroad.asm index babb91de..ea914865 100644 --- a/crysaudio/music/victoryroad.asm +++ b/crysaudio/music/victoryroad.asm @@ -1,21 +1,20 @@ -Music_VictoryRoad: ; f6c72 - dbw $c0, Music_VictoryRoad_Ch1 - dbw $01, Music_VictoryRoad_Ch2 - dbw $02, Music_VictoryRoad_Ch3 - dbw $03, Music_VictoryRoad_Ch4 -; f6c7e +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 -Music_VictoryRoad_Ch1: ; f6c7e +Music_VictoryRoad_Ch1: tempo 144 volume $77 stereopanning $f dutycycle $3 tone $0002 notetype $c, $b3 -Music_VictoryRoad_branch_f6c8d: ; f6c8d +Music_VictoryRoad_branch_f6c8d: callchannel Music_VictoryRoad_branch_f6cb9 loopchannel 6, Music_VictoryRoad_branch_f6c8d -Music_VictoryRoad_branch_f6c94: ; f6c94 +Music_VictoryRoad_branch_f6c94: intensity $b2 octave 2 note A_, 1 @@ -37,13 +36,12 @@ Music_VictoryRoad_branch_f6c94: ; f6c94 octave 3 note G#, 3 loopchannel 2, Music_VictoryRoad_branch_f6c94 -Music_VictoryRoad_branch_f6cae: ; f6cae +Music_VictoryRoad_branch_f6cae: callchannel Music_VictoryRoad_branch_f6cb9 loopchannel 2, Music_VictoryRoad_branch_f6cae loopchannel 0, Music_VictoryRoad_branch_f6c8d -; f6cb9 -Music_VictoryRoad_branch_f6cb9: ; f6cb9 +Music_VictoryRoad_branch_f6cb9: intensity $b2 octave 2 note G_, 1 @@ -63,12 +61,11 @@ Music_VictoryRoad_branch_f6cb9: ; f6cb9 octave 3 note F#, 3 endchannel -; f6cce -Music_VictoryRoad_Ch2: ; f6cce +Music_VictoryRoad_Ch2: dutycycle $3 vibrato $10, $24 -Music_VictoryRoad_branch_f6cd3: ; f6cd3 +Music_VictoryRoad_branch_f6cd3: notetype $c, $c2 callchannel Music_VictoryRoad_branch_f6d1e note __, 2 @@ -119,9 +116,8 @@ Music_VictoryRoad_branch_f6cd3: ; f6cd3 note C#, 1 note D_, 16 loopchannel 0, Music_VictoryRoad_branch_f6cd3 -; f6d1e -Music_VictoryRoad_branch_f6d1e: ; f6d1e +Music_VictoryRoad_branch_f6d1e: octave 3 note E_, 1 note __, 1 @@ -136,15 +132,14 @@ Music_VictoryRoad_branch_f6d1e: ; f6d1e note A_, 1 note A_, 1 endchannel -; f6d2c -Music_VictoryRoad_Ch3: ; f6d2c +Music_VictoryRoad_Ch3: stereopanning $f0 notetype $c, $28 -Music_VictoryRoad_branch_f6d31: ; f6d31 +Music_VictoryRoad_branch_f6d31: callchannel Music_VictoryRoad_branch_f6d52 loopchannel 6, Music_VictoryRoad_branch_f6d31 -Music_VictoryRoad_branch_f6d38: ; f6d38 +Music_VictoryRoad_branch_f6d38: note D_, 1 note __, 1 note B_, 1 @@ -157,13 +152,12 @@ Music_VictoryRoad_branch_f6d38: ; f6d38 note D_, 1 note B_, 3 loopchannel 2, Music_VictoryRoad_branch_f6d38 -Music_VictoryRoad_branch_f6d47: ; f6d47 +Music_VictoryRoad_branch_f6d47: callchannel Music_VictoryRoad_branch_f6d52 loopchannel 2, Music_VictoryRoad_branch_f6d47 loopchannel 0, Music_VictoryRoad_branch_f6d31 -; f6d52 -Music_VictoryRoad_branch_f6d52: ; f6d52 +Music_VictoryRoad_branch_f6d52: octave 3 note C_, 1 note __, 1 @@ -177,12 +171,11 @@ Music_VictoryRoad_branch_f6d52: ; f6d52 note C_, 1 note A_, 3 endchannel -; f6d5f -Music_VictoryRoad_Ch4: ; f6d5f +Music_VictoryRoad_Ch4: togglenoise $0 notetype $c -Music_VictoryRoad_branch_f6d63: ; f6d63 +Music_VictoryRoad_branch_f6d63: note D_, 2 note D_, 2 note D#, 1 @@ -202,6 +195,3 @@ Music_VictoryRoad_branch_f6d63: ; f6d63 note D_, 2 note D#, 1 loopchannel 0, Music_VictoryRoad_branch_f6d63 -; f6d79 - - diff --git a/crysaudio/music/violetcity.asm b/crysaudio/music/violetcity.asm index c8580a2a..a8a89c3c 100644 --- a/crysaudio/music/violetcity.asm +++ b/crysaudio/music/violetcity.asm @@ -1,11 +1,10 @@ -Music_VioletCity: ; f0000 - dbw $c0, Music_VioletCity_Ch1 - dbw $01, Music_VioletCity_Ch2 - dbw $02, Music_VioletCity_Ch3 - dbw $03, Music_VioletCity_Ch4 -; f000c +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 -Music_VioletCity_Ch1: ; f000c +Music_VioletCity_Ch1: tempo 164 volume $77 vibrato $12, $25 @@ -65,7 +64,7 @@ Music_VioletCity_Ch1: ; f000c octave 3 note C#, 12 note __, 8 -Music_VioletCity_branch_f0056: ; f0056 +Music_VioletCity_branch_f0056: notetype $6, $95 note __, 4 octave 2 @@ -296,9 +295,8 @@ Music_VioletCity_branch_f0056: ; f0056 note C#, 4 note __, 4 loopchannel 0, Music_VioletCity_branch_f0056 -; f0162 -Music_VioletCity_Ch2: ; f0162 +Music_VioletCity_Ch2: vibrato $12, $24 dutycycle $2 notetype $c, $c7 @@ -349,7 +347,7 @@ Music_VioletCity_Ch2: ; f0162 note __, 2 note D#, 1 note E_, 1 -Music_VioletCity_branch_f0199: ; f0199 +Music_VioletCity_branch_f0199: intensity $b7 note F#, 4 note __, 2 @@ -503,9 +501,8 @@ Music_VioletCity_branch_f0199: ; f0199 note D#, 1 note E_, 1 loopchannel 0, Music_VioletCity_branch_f0199 -; f0247 -Music_VioletCity_Ch3: ; f0247 +Music_VioletCity_Ch3: notetype $c, $25 note __, 16 note __, 6 @@ -530,7 +527,7 @@ Music_VioletCity_Ch3: ; f0247 note F#, 2 octave 2 note A#, 2 -Music_VioletCity_branch_f0261: ; f0261 +Music_VioletCity_branch_f0261: notetype $c, $25 note B_, 1 note __, 5 @@ -692,9 +689,8 @@ Music_VioletCity_branch_f0261: ; f0261 octave 2 note A#, 4 loopchannel 0, Music_VioletCity_branch_f0261 -; f0311 -Music_VioletCity_branch_f0311: ; f0311 +Music_VioletCity_branch_f0311: note G_, 2 note __, 10 note G_, 2 @@ -708,9 +704,8 @@ Music_VioletCity_branch_f0311: ; f0311 octave 2 note A_, 4 endchannel -; f031e -Music_VioletCity_Ch4: ; f031e +Music_VioletCity_Ch4: togglenoise $3 notetype $c note D#, 2 @@ -729,7 +724,7 @@ Music_VioletCity_Ch4: ; f031e note D_, 2 note C_, 8 note D#, 2 -Music_VioletCity_branch_f0338: ; f0338 +Music_VioletCity_branch_f0338: callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a @@ -747,9 +742,8 @@ Music_VioletCity_branch_f0338: ; f0338 callchannel Music_VioletCity_branch_f037a callchannel Music_VioletCity_branch_f037a loopchannel 0, Music_VioletCity_branch_f0338 -; f036c -Music_VioletCity_branch_f036c: ; f036c +Music_VioletCity_branch_f036c: note D_, 1 note D_, 1 note D#, 1 @@ -764,9 +758,8 @@ Music_VioletCity_branch_f036c: ; f036c note G_, 1 note G_, 1 endchannel -; f037a -Music_VioletCity_branch_f037a: ; f037a +Music_VioletCity_branch_f037a: note D#, 2 note G_, 1 note G_, 1 @@ -779,6 +772,3 @@ Music_VioletCity_branch_f037a: ; f037a note D_, 2 note D#, 2 endchannel -; f0386 - - diff --git a/crysaudio/music/viridiancity.asm b/crysaudio/music/viridiancity.asm index 82236a5f..ea38a0e6 100644 --- a/crysaudio/music/viridiancity.asm +++ b/crysaudio/music/viridiancity.asm @@ -1,11 +1,10 @@ -Music_ViridianCity: ; f4000 - dbw $c0, Music_ViridianCity_Ch1 - dbw $01, Music_ViridianCity_Ch2 - dbw $02, Music_ViridianCity_Ch3 - dbw $03, Music_ViridianCity_Ch4 -; f400c +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 -Music_ViridianCity_Ch1: ; f400c +Music_ViridianCity_Ch1: tempo 157 volume $77 stereopanning $f @@ -42,7 +41,7 @@ Music_ViridianCity_Ch1: ; f400c note __, 4 note G_, 8 note __, 4 -Music_ViridianCity_branch_f4039: ; f4039 +Music_ViridianCity_branch_f4039: callchannel Music_ViridianCity_branch_f40c5 note __, 4 callchannel Music_ViridianCity_branch_f40c5 @@ -170,9 +169,8 @@ Music_ViridianCity_branch_f4039: ; f4039 note G_, 8 note A#, 4 loopchannel 0, Music_ViridianCity_branch_f4039 -; f40c5 -Music_ViridianCity_branch_f40c5: ; f40c5 +Music_ViridianCity_branch_f40c5: octave 3 note A_, 1 note __, 3 @@ -247,9 +245,8 @@ Music_ViridianCity_branch_f40c5: ; f40c5 note __, 4 note G_, 8 endchannel -; f410f -Music_ViridianCity_branch_f410f: ; f410f +Music_ViridianCity_branch_f410f: octave 3 note B_, 2 note D_, 2 @@ -272,9 +269,8 @@ Music_ViridianCity_branch_f410f: ; f410f note G_, 1 note __, 1 endchannel -; f4125 -Music_ViridianCity_Ch2: ; f4125 +Music_ViridianCity_Ch2: vibrato $10, $46 dutycycle $1 notetype $c, $b7 @@ -308,7 +304,7 @@ Music_ViridianCity_Ch2: ; f4125 note __, 4 note E_, 8 note __, 4 -Music_ViridianCity_branch_f414c: ; f414c +Music_ViridianCity_branch_f414c: callchannel Music_ViridianCity_branch_f41c0 note __, 4 callchannel Music_ViridianCity_branch_f41c0 @@ -406,9 +402,8 @@ Music_ViridianCity_branch_f414c: ; f414c octave 1 note A_, 4 loopchannel 0, Music_ViridianCity_branch_f414c -; f41c0 -Music_ViridianCity_branch_f41c0: ; f41c0 +Music_ViridianCity_branch_f41c0: octave 2 note D_, 4 note __, 2 @@ -474,9 +469,8 @@ Music_ViridianCity_branch_f41c0: ; f41c0 note __, 4 note E_, 8 endchannel -; f4201 -Music_ViridianCity_branch_f4201: ; f4201 +Music_ViridianCity_branch_f4201: note G_, 4 note __, 2 octave 3 @@ -487,9 +481,8 @@ Music_ViridianCity_branch_f4201: ; f4201 note F_, 2 note F#, 2 endchannel -; f420b -Music_ViridianCity_branch_f420b: ; f420b +Music_ViridianCity_branch_f420b: note F#, 4 note __, 2 octave 3 @@ -500,9 +493,8 @@ Music_ViridianCity_branch_f420b: ; f420b note E_, 2 note F_, 2 endchannel -; f4215 -Music_ViridianCity_branch_f4215: ; f4215 +Music_ViridianCity_branch_f4215: octave 2 note E_, 4 note __, 2 @@ -512,9 +504,8 @@ Music_ViridianCity_branch_f4215: ; f4215 note D_, 2 note D#, 2 endchannel -; f421e -Music_ViridianCity_Ch3: ; f421e +Music_ViridianCity_Ch3: vibrato $12, $24 notetype $c, $13 stereopanning $ff @@ -550,7 +541,7 @@ Music_ViridianCity_Ch3: ; f421e note D_, 8 note F#, 2 note G_, 2 -Music_ViridianCity_branch_f4246: ; f4246 +Music_ViridianCity_branch_f4246: intensity $13 callchannel Music_ViridianCity_branch_f42a2 octave 5 @@ -632,9 +623,8 @@ Music_ViridianCity_branch_f4246: ; f4246 note D_, 8 note E_, 4 loopchannel 0, Music_ViridianCity_branch_f4246 -; f42a2 -Music_ViridianCity_branch_f42a2: ; f42a2 +Music_ViridianCity_branch_f42a2: octave 5 note A_, 2 note __, 2 @@ -696,14 +686,13 @@ Music_ViridianCity_branch_f42a2: ; f42a2 note __, 4 note D_, 8 endchannel -; f42df -Music_ViridianCity_Ch4: ; f42df +Music_ViridianCity_Ch4: togglenoise $3 notetype $c callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f432c -Music_ViridianCity_branch_f42e9: ; f42e9 +Music_ViridianCity_branch_f42e9: callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f431d callchannel Music_ViridianCity_branch_f431d @@ -721,9 +710,8 @@ Music_ViridianCity_branch_f42e9: ; f42e9 callchannel Music_ViridianCity_branch_f433b callchannel Music_ViridianCity_branch_f433b loopchannel 0, Music_ViridianCity_branch_f42e9 -; f431d -Music_ViridianCity_branch_f431d: ; f431d +Music_ViridianCity_branch_f431d: note E_, 2 note E_, 2 note D_, 2 @@ -739,9 +727,8 @@ Music_ViridianCity_branch_f431d: ; f431d note E_, 2 note F#, 2 endchannel -; f432c -Music_ViridianCity_branch_f432c: ; f432c +Music_ViridianCity_branch_f432c: note E_, 2 note E_, 2 note D_, 2 @@ -757,9 +744,8 @@ Music_ViridianCity_branch_f432c: ; f432c note A#, 2 note A#, 2 endchannel -; f433b -Music_ViridianCity_branch_f433b: ; f433b +Music_ViridianCity_branch_f433b: note D#, 2 note F#, 2 note D_, 2 @@ -776,9 +762,8 @@ Music_ViridianCity_branch_f433b: ; f433b note D_, 2 note D#, 2 endchannel -; f434b -Music_ViridianCity_branch_f434b: ; f434b +Music_ViridianCity_branch_f434b: note D#, 2 note F#, 2 note D_, 2 @@ -795,6 +780,3 @@ Music_ViridianCity_branch_f434b: ; f434b note D_, 2 note F#, 2 endchannel -; f435b - - diff --git a/crysaudio/music/wildpokemonvictory.asm b/crysaudio/music/wildpokemonvictory.asm index df9adc22..f1438dc6 100644 --- a/crysaudio/music/wildpokemonvictory.asm +++ b/crysaudio/music/wildpokemonvictory.asm @@ -1,11 +1,10 @@ -Music_WildPokemonVictory: ; f4518 - dbw $80, Music_WildPokemonVictory_Ch1 - dbw $01, Music_WildPokemonVictory_Ch2 - dbw $02, Music_WildPokemonVictory_Ch3 -; f4521 +Music_WildPokemonVictory: + musicheader 3, 1, Music_WildPokemonVictory_Ch1 + musicheader 1, 2, Music_WildPokemonVictory_Ch2 + musicheader 1, 3, Music_WildPokemonVictory_Ch3 -Music_WildPokemonVictory_Ch1: ; f4521 - ftempo 126 +Music_WildPokemonVictory_Ch1: + tempo 126 volume $77 dutycycle $3 tone $0001 @@ -17,9 +16,9 @@ Music_WildPokemonVictory_Ch1: ; f4521 note F#, 1 intensity $b6 note E_, 12 -Music_SuccessfulCapture_branch_f4536: ; f4536 +Music_SuccessfulCapture_branch_f4536: stereopanning $f -Music_WildPokemonVictory_branch_f4538: ; f4538 +Music_WildPokemonVictory_branch_f4538: callchannel Music_WildPokemonVictory_branch_f455c note F#, 2 note F#, 2 @@ -29,21 +28,20 @@ Music_WildPokemonVictory_branch_f4538: ; f4538 intensity $78 octave 3 note G_, 4 - forceoctave $1 + pitchoffset 0, C# callchannel Music_WildPokemonVictory_branch_f455c note F#, 2 note F#, 2 note F#, 4 callchannel Music_WildPokemonVictory_branch_f455c note G#, 4 - forceoctave $0 + pitchoffset 0, C_ intensity $78 octave 3 note F#, 4 loopchannel 0, Music_WildPokemonVictory_branch_f4538 -; f455c -Music_WildPokemonVictory_branch_f455c: ; f455c +Music_WildPokemonVictory_branch_f455c: intensity $71 octave 3 note G#, 1 @@ -68,9 +66,8 @@ Music_WildPokemonVictory_branch_f455c: ; f455c note E_, 2 note A_, 2 endchannel -; f4575 -Music_WildPokemonVictory_Ch2: ; f4575 +Music_WildPokemonVictory_Ch2: vibrato $12, $24 dutycycle $2 notetype $c, $d1 @@ -81,9 +78,9 @@ Music_WildPokemonVictory_Ch2: ; f4575 note A_, 1 intensity $d6 note B_, 12 -Music_SuccessfulCapture_branch_f4585: ; f4585 +Music_SuccessfulCapture_branch_f4585: stereopanning $f0 -Music_WildPokemonVictory_branch_f4587: ; f4587 +Music_WildPokemonVictory_branch_f4587: callchannel Music_WildPokemonVictory_branch_f45b5 octave 4 note B_, 2 @@ -97,7 +94,7 @@ Music_WildPokemonVictory_branch_f4587: ; f4587 note E_, 1 note G_, 1 note A#, 1 - forceoctave $1 + pitchoffset 0, C# callchannel Music_WildPokemonVictory_branch_f45b5 octave 4 note B_, 2 @@ -106,7 +103,7 @@ Music_WildPokemonVictory_branch_f4587: ; f4587 callchannel Music_WildPokemonVictory_branch_f45b5 octave 4 note B_, 4 - forceoctave $0 + pitchoffset 0, C_ intensity $81 octave 3 note B_, 1 @@ -115,9 +112,8 @@ Music_WildPokemonVictory_branch_f4587: ; f4587 note F#, 1 note A_, 1 loopchannel 0, Music_WildPokemonVictory_branch_f4587 -; f45b5 -Music_WildPokemonVictory_branch_f45b5: ; f45b5 +Music_WildPokemonVictory_branch_f45b5: intensity $81 octave 4 note B_, 2 @@ -132,9 +128,8 @@ Music_WildPokemonVictory_branch_f45b5: ; f45b5 note C#, 2 note C#, 4 endchannel -; f45c4 -Music_WildPokemonVictory_Ch3: ; f45c4 +Music_WildPokemonVictory_Ch3: notetype $c, $20 note __, 6 octave 6 @@ -144,8 +139,8 @@ Music_WildPokemonVictory_Ch3: ; f45c4 note __, 3 note E_, 1 note __, 3 -Music_SuccessfulCapture_branch_f45cf: ; f45cf -Music_WildPokemonVictory_branch_f45cf: ; f45cf +Music_SuccessfulCapture_branch_f45cf: +Music_WildPokemonVictory_branch_f45cf: callchannel Music_WildPokemonVictory_branch_f45f4 note D#, 2 note C#, 2 @@ -156,7 +151,7 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf note E_, 2 note __, 2 note C_, 4 - forceoctave $1 + pitchoffset 0, C# callchannel Music_WildPokemonVictory_branch_f45f4 note D#, 2 note C#, 2 @@ -166,13 +161,12 @@ Music_WildPokemonVictory_branch_f45cf: ; f45cf callchannel Music_WildPokemonVictory_branch_f45f4 note E_, 2 note __, 2 - forceoctave $0 + pitchoffset 0, C_ octave 2 note B_, 4 loopchannel 0, Music_WildPokemonVictory_branch_f45cf -; f45f4 -Music_WildPokemonVictory_branch_f45f4: ; f45f4 +Music_WildPokemonVictory_branch_f45f4: intensity $25 octave 3 note E_, 2 @@ -186,6 +180,3 @@ Music_WildPokemonVictory_branch_f45f4: ; f45f4 note __, 4 note C#, 2 endchannel -; f4602 - - diff --git a/crysaudio/music_pointers.asm b/crysaudio/music_pointers.asm index 63fb8a3c..7efd8c29 100644 --- a/crysaudio/music_pointers.asm +++ b/crysaudio/music_pointers.asm @@ -1,131 +1,120 @@ -; See song sections in main.asm: -; Songs i -; Songs ii -; Songs iii -; Songs I -; Songs II -; Songs III -; Songs IV -; Songs V +; See song sections in audio.asm. -; e906e - dbw BANK(Music_Nothing), Music_Nothing ; 0xe91a3 - dbw BANK(Music_TitleScreen), Music_TitleScreen ; 0xeb808 - dbw BANK(Music_Route1), Music_Route1 ; 0xec000 - dbw BANK(Music_Route3), Music_Route3 ; 0xec2ca - dbw BANK(Music_Route12), Music_Route12 ; 0xec506 - dbw BANK(Music_MagnetTrain), Music_MagnetTrain ; 0xef5f0 - dbw BANK(Music_KantoGymBattle), Music_KantoGymBattle ; 0xec720 - dbw BANK(Music_KantoTrainerBattle), Music_KantoTrainerBattle ; 0xec9fa - dbw BANK(Music_KantoWildBattle), Music_KantoWildBattle ; 0xed06d - dbw BANK(Music_PokemonCenter), Music_PokemonCenter ; 0xed5c6 - dbw BANK(Music_LookHiker), Music_LookHiker ; 0xf7411 - dbw BANK(Music_LookLass), Music_LookLass ; 0xed79b - dbw BANK(Music_LookOfficer), Music_LookOfficer ; 0xed82d - dbw BANK(Music_HealPokemon), Music_HealPokemon ; 0xf0697 - dbw BANK(Music_LavenderTown), Music_LavenderTown ; 0xef72f - dbw BANK(Music_Route2), Music_Route2 ; 0xed8dd - dbw BANK(Music_MtMoon), Music_MtMoon ; 0xedb29 - dbw BANK(Music_ShowMeAround), Music_ShowMeAround ; 0xedbd8 - dbw BANK(Music_GameCorner), Music_GameCorner ; 0xedd6d - dbw BANK(Music_Bicycle), Music_Bicycle ; 0xee119 - dbw BANK(Music_HallOfFame), Music_HallOfFame ; 0xf05bf - dbw BANK(Music_ViridianCity), Music_ViridianCity ; 0xf4000 - dbw BANK(Music_CeladonCity), Music_CeladonCity ; 0xf435b - dbw BANK(Music_TrainerVictory), Music_TrainerVictory ; 0xebeab - dbw BANK(Music_WildPokemonVictory), Music_WildPokemonVictory ; 0xf4518 - dbw BANK(Music_GymLeaderVictory), Music_GymLeaderVictory ; 0xf462c - dbw BANK(Music_MtMoonSquare), Music_MtMoonSquare ; 0xf4815 - dbw BANK(Music_Gym), Music_Gym ; 0xf48ae - dbw BANK(Music_PalletTown), Music_PalletTown ; 0xf4b0c - dbw BANK(Music_ProfOaksPokemonTalk), Music_ProfOaksPokemonTalk ; 0xf4c9f - dbw BANK(Music_ProfOak), Music_ProfOak ; 0xf4dea - dbw BANK(Music_LookRival), Music_LookRival ; 0xf4f79 - dbw BANK(Music_AfterTheRivalFight), Music_AfterTheRivalFight ; 0xf5127 - dbw BANK(Music_Surf), Music_Surf ; 0xf518a - dbw BANK(Music_Evolution), Music_Evolution ; 0xf06e1 - dbw BANK(Music_NationalPark), Music_NationalPark ; 0xf54e8 - dbw BANK(Music_Credits), Music_Credits ; 0x1f31c - dbw BANK(Music_AzaleaTown), Music_AzaleaTown ; 0xf57e8 - dbw BANK(Music_CherrygroveCity), Music_CherrygroveCity ; 0xf5b03 - dbw BANK(Music_LookKimonoGirl), Music_LookKimonoGirl ; 0xf79b8 - dbw BANK(Music_UnionCave), Music_UnionCave ; 0xf5c60 - dbw BANK(Music_JohtoWildBattle), Music_JohtoWildBattle ; 0xf5dc5 - dbw BANK(Music_JohtoTrainerBattle), Music_JohtoTrainerBattle ; 0xf6096 - dbw BANK(Music_Route30), Music_Route30 ; 0xefc01 - dbw BANK(Music_EcruteakCity), Music_EcruteakCity ; 0xef2d0 - dbw BANK(Music_VioletCity), Music_VioletCity ; 0xf0000 - dbw BANK(Music_JohtoGymBattle), Music_JohtoGymBattle ; 0xea50d - dbw BANK(Music_ChampionBattle), Music_ChampionBattle ; 0xea9c1 - dbw BANK(Music_RivalBattle), Music_RivalBattle ; 0xe974f - dbw BANK(Music_RocketBattle), Music_RocketBattle ; 0xe9b6f - dbw BANK(Music_ElmsLab), Music_ElmsLab ; 0xea040 - dbw BANK(Music_DarkCave), Music_DarkCave ; 0xea2be - dbw BANK(Music_Route29), Music_Route29 ; 0xf0386 - dbw BANK(Music_Route36), Music_Route36 ; 0xe94e9 - dbw BANK(Music_SSAqua), Music_SSAqua ; 0xead99 - dbw BANK(Music_LookYoungster), Music_LookYoungster ; 0xf66c3 - dbw BANK(Music_LookBeauty), Music_LookBeauty ; 0xeee3e - dbw BANK(Music_LookRocket), Music_LookRocket ; 0xf74a2 - dbw BANK(Music_LookPokemaniac), Music_LookPokemaniac ; 0xebde1 - dbw BANK(Music_LookSage), Music_LookSage ; 0xee35e - dbw BANK(Music_NewBarkTown), Music_NewBarkTown ; 0xeb2d3 - dbw BANK(Music_GoldenrodCity), Music_GoldenrodCity ; 0xeb453 - dbw BANK(Music_VermilionCity), Music_VermilionCity ; 0xeb676 - dbw BANK(Music_PokemonChannel), Music_PokemonChannel ; 0xee45f - dbw BANK(Music_PokeFluteChannel), Music_PokeFluteChannel ; 0xf7b13 - dbw BANK(Music_TinTower), Music_TinTower ; 0xf6811 - dbw BANK(Music_SproutTower), Music_SproutTower ; 0xf6974 - dbw BANK(Music_BurnedTower), Music_BurnedTower ; 0xf6a99 - dbw BANK(Music_Lighthouse), Music_Lighthouse ; 0xee569 - dbw BANK(Music_LakeOfRage), Music_LakeOfRage ; 0xee6c5 - dbw BANK(Music_IndigoPlateau), Music_IndigoPlateau ; 0xee852 - dbw BANK(Music_Route37), Music_Route37 ; 0xee94b - dbw BANK(Music_RocketHideout), Music_RocketHideout ; 0xeeb75 - dbw BANK(Music_DragonsDen), Music_DragonsDen ; 0xeece8 - dbw BANK(Music_JohtoWildBattleNight), Music_JohtoWildBattleNight ; 0xf605c - dbw BANK(Music_RuinsOfAlphRadio), Music_RuinsOfAlphRadio ; 0xeedcb - dbw BANK(Music_SuccessfulCapture), Music_SuccessfulCapture ; 0xf4602 - dbw BANK(Music_Route26), Music_Route26 ; 0xeefb2 - dbw BANK(Music_Mom), Music_Mom ; 0xf6bf2 - dbw BANK(Music_VictoryRoad), Music_VictoryRoad ; 0xf6c72 - dbw BANK(Music_PokemonLullaby), Music_PokemonLullaby ; 0xf6d79 - dbw BANK(Music_PokemonMarch), Music_PokemonMarch ; 0xf6e23 - dbw BANK(Music_GoldSilverOpening), Music_GoldSilverOpening ; 0xf7055 - dbw BANK(Music_GoldSilverOpening2), Music_GoldSilverOpening2 ; 0xf7308 - dbw BANK(Music_MainMenu), Music_MainMenu ; 0xf78fd - dbw BANK(Music_RuinsOfAlphInterior), Music_RuinsOfAlphInterior ; 0xebd9e - dbw BANK(Music_RocketTheme), Music_RocketTheme ; 0xf766d - dbw BANK(Music_DancingHall), Music_DancingHall ; 0xef9bc - dbw BANK(Music_ContestResults), Music_ContestResults ; 0xefb3e - dbw BANK(Music_BugCatchingContest), Music_BugCatchingContest ; 0xf7c16 - dbw BANK(Music_LakeOfRageRocketRadio), Music_LakeOfRageRocketRadio ; 0xef5b1 - dbw BANK(Music_Printer), Music_Printer ; 0xf07fd - dbw BANK(Music_PostCredits), Music_PostCredits ; 0xcfd9e - -; Crystal adds the following songs: - - dbw BANK(Music_Clair), Music_Clair ; 0x1fa8d - dbw BANK(Music_MobileAdapterMenu), Music_MobileAdapterMenu ; 0x17801f - dbw BANK(Music_MobileAdapter), Music_MobileAdapter ; 0x1fc87 - dbw BANK(Music_BuenasPassword), Music_BuenasPassword ; 0x178153 - dbw BANK(Music_LookMysticalMan), Music_LookMysticalMan ; 0x17843b - dbw BANK(Music_CrystalOpening), Music_CrystalOpening ; 0x1786e8 - dbw BANK(Music_BattleTowerTheme), Music_BattleTowerTheme ; 0x178889 - dbw BANK(Music_SuicuneBattle), Music_SuicuneBattle ; 0x178b81 - dbw BANK(Music_BattleTowerLobby), Music_BattleTowerLobby ; 0x17948b - dbw BANK(Music_MobileCenter), Music_MobileCenter ; 0x17961d - -;Remixes and custom songs: - - dbw BANK(Music_JohtoGSC), Music_JohtoGSC - dbw BANK(Music_CeruleanGSC), Music_CeruleanGSC - dbw BANK(Music_CinnabarGSC), Music_CinnabarGSC - dbw BANK(Music_NuggetBridge), Music_NuggetBridge - dbw BANK(Music_Shop), Music_Shop - dbw BANK(Music_PokeathelonFinal), Music_PokeathelonFinal - dbw BANK(Music_PokeRadar), Music_PokeRadar - dbw BANK(Music_NaljoWildBattle), Music_NaljoWildBattle - dbw BANK(Music_NaljoGymBattle), Music_NaljoGymBattle - dbw BANK(Music_PalletBattle), Music_PalletBattle +Music: +; entries correspond to MUSIC_* constants + dba Music_Nothing + dba Music_TitleScreen + dba Music_Route1 + dba Music_Route3 + dba Music_Route12 + dba Music_MagnetTrain + dba Music_KantoGymBattle + dba Music_KantoTrainerBattle + dba Music_KantoWildBattle + dba Music_PokemonCenter + dba Music_LookHiker + dba Music_LookLass + dba Music_LookOfficer + dba Music_HealPokemon + dba Music_LavenderTown + dba Music_Route2 + dba Music_MtMoon + dba Music_ShowMeAround + dba Music_GameCorner + dba Music_Bicycle + dba Music_HallOfFame + dba Music_ViridianCity + dba Music_CeladonCity + dba Music_TrainerVictory + dba Music_WildPokemonVictory + dba Music_GymLeaderVictory + dba Music_MtMoonSquare + dba Music_Gym + dba Music_PalletTown + dba Music_ProfOaksPokemonTalk + dba Music_ProfOak + dba Music_LookRival + dba Music_AfterTheRivalFight + dba Music_Surf + dba Music_Evolution + dba Music_NationalPark + dba Music_Credits + dba Music_AzaleaTown + dba Music_CherrygroveCity + dba Music_LookKimonoGirl + dba Music_UnionCave + dba Music_JohtoWildBattle + dba Music_JohtoTrainerBattle + dba Music_Route30 + dba Music_EcruteakCity + dba Music_VioletCity + dba Music_JohtoGymBattle + dba Music_ChampionBattle + dba Music_RivalBattle + dba Music_RocketBattle + dba Music_ElmsLab + dba Music_DarkCave + dba Music_Route29 + dba Music_Route36 + dba Music_SSAqua + dba Music_LookYoungster + dba Music_LookBeauty + dba Music_LookRocket + dba Music_LookPokemaniac + dba Music_LookSage + dba Music_NewBarkTown + dba Music_GoldenrodCity + dba Music_VermilionCity + dba Music_PokemonChannel + dba Music_PokeFluteChannel + dba Music_TinTower + dba Music_SproutTower + dba Music_BurnedTower + dba Music_Lighthouse + dba Music_LakeOfRage + dba Music_IndigoPlateau + dba Music_Route37 + dba Music_RocketHideout + dba Music_DragonsDen + dba Music_JohtoWildBattleNight + dba Music_RuinsOfAlphRadio + dba Music_SuccessfulCapture + dba Music_Route26 + dba Music_Mom + dba Music_VictoryRoad + dba Music_PokemonLullaby + dba Music_PokemonMarch + dba Music_GoldSilverOpening + dba Music_GoldSilverOpening2 + dba Music_MainMenu + dba Music_RuinsOfAlphInterior + dba Music_RocketTheme + dba Music_DancingHall + dba Music_ContestResults + dba Music_BugCatchingContest + dba Music_LakeOfRageRocketRadio + dba Music_Printer + dba Music_PostCredits +; new to Crystal + dba Music_Clair + dba Music_MobileAdapterMenu + dba Music_MobileAdapter + dba Music_BuenasPassword + dba Music_LookMysticalMan + dba Music_CrystalOpening + dba Music_BattleTowerTheme + dba Music_SuicuneBattle + dba Music_BattleTowerLobby + dba Music_MobileCenter +; remixes and custom songs + dba Music_JohtoGSC + dba Music_CeruleanGSC + dba Music_CinnabarGSC + dba Music_NuggetBridge + dba Music_Shop + dba Music_PokeathelonFinal + dba Music_PokeRadar + dba Music_NaljoWildBattle + dba Music_NaljoGymBattle + dba Music_PalletBattle diff --git a/crysaudio/notes.asm b/crysaudio/notes.asm new file mode 100644 index 00000000..eeb84959 --- /dev/null +++ b/crysaudio/notes.asm @@ -0,0 +1,26 @@ +FrequencyTable: + dw 0 ; __ + dw $f82c ; C_ + dw $f89d ; C# + dw $f907 ; D_ + dw $f96b ; D# + dw $f9ca ; E_ + dw $fa23 ; F_ + dw $fa77 ; F# + dw $fac7 ; G_ + dw $fb12 ; G# + dw $fb58 ; A_ + dw $fb9b ; A# + dw $fbda ; B_ + dw $fc16 ; C_ + dw $fc4e ; C# + dw $fc83 ; D_ + dw $fcb5 ; D# + dw $fce5 ; E_ + dw $fd11 ; F_ + dw $fd3b ; F# + dw $fd63 ; G_ + dw $fd89 ; G# + dw $fdac ; A_ + dw $fdcd ; A# + dw $fded ; B_ diff --git a/crysaudio/rbsfx.asm b/crysaudio/rbsfx.asm index 214816f9..1213e3e1 100644 --- a/crysaudio/rbsfx.asm +++ b/crysaudio/rbsfx.asm @@ -1,126 +1,118 @@ -; sed 's/(\(.*\) - SFX_Headers_[0-9a-z]*) \/ 3/RB\1/g' - -;02: entire sfx_02_5f.asm -;08: from $40 sfx_08_77.asm -;1f: from $5d sfx_1f_67.asm - -; see music_constants.asm - SFX: -RedSfxHeaderPointers: +; entries correspond to SFX_* constants dbw 0, 0 - dbw BANK(SFX_Get_Item1_1), SFX_Get_Item1_1 + dba SFX_Get_Item1_1 - dbw BANK(SFX_Get_Item2_1), SFX_Get_Item2_1 - dbw BANK(SFX_Tink_1), SFX_Tink_1 - dbw BANK(SFX_Heal_HP_1), SFX_Heal_HP_1 - dbw BANK(SFX_Heal_Ailment_1), SFX_Heal_Ailment_1 - dbw BANK(SFX_Start_Menu_1), SFX_Start_Menu_1 - dbw BANK(SFX_Press_AB_1), SFX_Press_AB_1 + dba SFX_Get_Item2_1 + dba SFX_Tink_1 + dba SFX_Heal_HP_1 + dba SFX_Heal_Ailment_1 + dba SFX_Start_Menu_1 + dba SFX_Press_AB_1 - dbw BANK(SFX_Pokedex_Rating_1), SFX_Pokedex_Rating_1 - dbw BANK(SFX_Get_Key_Item_1), SFX_Get_Key_Item_1 - dbw BANK(SFX_Poisoned_1), SFX_Poisoned_1 - dbw BANK(SFX_Trade_Machine_1), SFX_Trade_Machine_1 - dbw BANK(SFX_Turn_On_PC_1), SFX_Turn_On_PC_1 - dbw BANK(SFX_Turn_Off_PC_1), SFX_Turn_Off_PC_1 - dbw BANK(SFX_Enter_PC_1), SFX_Enter_PC_1 - dbw BANK(SFX_Shrink_1), SFX_Shrink_1 - dbw BANK(SFX_Switch_1), SFX_Switch_1 - dbw BANK(SFX_Healing_Machine_1), SFX_Healing_Machine_1 - dbw BANK(SFX_Teleport_Exit1_1), SFX_Teleport_Exit1_1 - dbw BANK(SFX_Teleport_Enter1_1), SFX_Teleport_Enter1_1 - dbw BANK(SFX_Teleport_Exit2_1), SFX_Teleport_Exit2_1 - dbw BANK(SFX_Ledge_1), SFX_Ledge_1 - dbw BANK(SFX_Teleport_Enter2_1), SFX_Teleport_Enter2_1 - dbw BANK(SFX_Fly_1), SFX_Fly_1 - dbw BANK(SFX_Denied_1), SFX_Denied_1 - dbw BANK(SFX_Arrow_Tiles_1), SFX_Arrow_Tiles_1 - dbw BANK(SFX_Push_Boulder_1), SFX_Push_Boulder_1 - dbw BANK(SFX_SS_Anne_Horn_1), SFX_SS_Anne_Horn_1 - dbw BANK(SFX_Withdraw_Deposit_1), SFX_Withdraw_Deposit_1 - dbw BANK(SFX_Cut_1), SFX_Cut_1 - dbw BANK(SFX_Go_Inside_1), SFX_Go_Inside_1 - dbw BANK(SFX_Swap_1), SFX_Swap_1 - dbw BANK(SFX_59_1), SFX_59_1 - dbw BANK(SFX_Purchase_1), SFX_Purchase_1 - dbw BANK(SFX_Collision_1), SFX_Collision_1 - dbw BANK(SFX_Go_Outside_1), SFX_Go_Outside_1 - dbw BANK(SFX_Save_1), SFX_Save_1 + dba SFX_Pokedex_Rating_1 + dba SFX_Get_Key_Item_1 + dba SFX_Poisoned_1 + dba SFX_Trade_Machine_1 + dba SFX_Turn_On_PC_1 + dba SFX_Turn_Off_PC_1 + dba SFX_Enter_PC_1 + dba SFX_Shrink_1 + dba SFX_Switch_1 + dba SFX_Healing_Machine_1 + dba SFX_Teleport_Exit1_1 + dba SFX_Teleport_Enter1_1 + dba SFX_Teleport_Exit2_1 + dba SFX_Ledge_1 + dba SFX_Teleport_Enter2_1 + dba SFX_Fly_1 + dba SFX_Denied_1 + dba SFX_Arrow_Tiles_1 + dba SFX_Push_Boulder_1 + dba SFX_SS_Anne_Horn_1 + dba SFX_Withdraw_Deposit_1 + dba SFX_Cut_1 + dba SFX_Go_Inside_1 + dba SFX_Swap_1 + dba SFX_59_1 + dba SFX_Purchase_1 + dba SFX_Collision_1 + dba SFX_Go_Outside_1 + dba SFX_Save_1 - dbw BANK(SFX_Pokeflute), SFX_Pokeflute - dbw BANK(SFX_Safari_Zone_PA), SFX_Safari_Zone_PA + dba SFX_Pokeflute + dba SFX_Safari_Zone_PA - dbw BANK(SFX_Level_Up), SFX_Level_Up + dba SFX_Level_Up - dbw BANK(SFX_Ball_Toss), SFX_Ball_Toss - dbw BANK(SFX_Ball_Poof), SFX_Ball_Poof - dbw BANK(SFX_Faint_Thud), SFX_Faint_Thud - dbw BANK(SFX_Run), SFX_Run - dbw BANK(SFX_Dex_Page_Added), SFX_Dex_Page_Added - dbw BANK(SFX_Caught_Mon), SFX_Caught_Mon - dbw BANK(SFX_Peck), SFX_Peck - dbw BANK(SFX_Faint_Fall), SFX_Faint_Fall - dbw BANK(SFX_Battle_09), SFX_Battle_09 - dbw BANK(SFX_Pound), SFX_Pound - dbw BANK(SFX_Battle_0B), SFX_Battle_0B - dbw BANK(SFX_Battle_0C), SFX_Battle_0C - dbw BANK(SFX_Battle_0D), SFX_Battle_0D - dbw BANK(SFX_Battle_0E), SFX_Battle_0E - dbw BANK(SFX_Battle_0F), SFX_Battle_0F - dbw BANK(SFX_Damage), SFX_Damage - dbw BANK(SFX_Not_Very_Effective), SFX_Not_Very_Effective - dbw BANK(SFX_Battle_12), SFX_Battle_12 - dbw BANK(SFX_Battle_13), SFX_Battle_13 - dbw BANK(SFX_Battle_14), SFX_Battle_14 - dbw BANK(SFX_Vine_Whip), SFX_Vine_Whip - dbw BANK(SFX_Battle_16), SFX_Battle_16 - dbw BANK(SFX_Battle_17), SFX_Battle_17 - dbw BANK(SFX_Battle_18), SFX_Battle_18 - dbw BANK(SFX_Battle_19), SFX_Battle_19 - dbw BANK(SFX_Super_Effective), SFX_Super_Effective - dbw BANK(SFX_Battle_1B), SFX_Battle_1B - dbw BANK(SFX_Battle_1C), SFX_Battle_1C - dbw BANK(SFX_Doubleslap), SFX_Doubleslap - dbw BANK(SFX_Battle_1E), SFX_Battle_1E - dbw BANK(SFX_Horn_Drill), SFX_Horn_Drill - dbw BANK(SFX_Battle_20), SFX_Battle_20 - dbw BANK(SFX_Battle_21), SFX_Battle_21 - dbw BANK(SFX_Battle_22), SFX_Battle_22 - dbw BANK(SFX_Battle_23), SFX_Battle_23 - dbw BANK(SFX_Battle_24), SFX_Battle_24 - dbw BANK(SFX_Battle_25), SFX_Battle_25 - dbw BANK(SFX_Battle_26), SFX_Battle_26 - dbw BANK(SFX_Battle_27), SFX_Battle_27 - dbw BANK(SFX_Battle_28), SFX_Battle_28 - dbw BANK(SFX_Battle_29), SFX_Battle_29 - dbw BANK(SFX_Battle_2A), SFX_Battle_2A - dbw BANK(SFX_Battle_2B), SFX_Battle_2B - dbw BANK(SFX_Battle_2C), SFX_Battle_2C - dbw BANK(SFX_Psybeam), SFX_Psybeam - dbw BANK(SFX_Battle_2E), SFX_Battle_2E - dbw BANK(SFX_Battle_2F), SFX_Battle_2F - dbw BANK(SFX_Psychic_M), SFX_Psychic_M - dbw BANK(SFX_Battle_31), SFX_Battle_31 - dbw BANK(SFX_Battle_32), SFX_Battle_32 - dbw BANK(SFX_Battle_33), SFX_Battle_33 - dbw BANK(SFX_Battle_34), SFX_Battle_34 - dbw BANK(SFX_Battle_35), SFX_Battle_35 - dbw BANK(SFX_Battle_36), SFX_Battle_36 - dbw BANK(SFX_Silph_Scope), SFX_Silph_Scope + dba SFX_Ball_Toss + dba SFX_Ball_Poof + dba SFX_Faint_Thud + dba SFX_Run + dba SFX_Dex_Page_Added + dba SFX_Caught_Mon + dba SFX_Peck + dba SFX_Faint_Fall + dba SFX_Battle_09 + dba SFX_Pound + dba SFX_Battle_0B + dba SFX_Battle_0C + dba SFX_Battle_0D + dba SFX_Battle_0E + dba SFX_Battle_0F + dba SFX_Damage + dba SFX_Not_Very_Effective + dba SFX_Battle_12 + dba SFX_Battle_13 + dba SFX_Battle_14 + dba SFX_Vine_Whip + dba SFX_Battle_16 + dba SFX_Battle_17 + dba SFX_Battle_18 + dba SFX_Battle_19 + dba SFX_Super_Effective + dba SFX_Battle_1B + dba SFX_Battle_1C + dba SFX_Doubleslap + dba SFX_Battle_1E + dba SFX_Horn_Drill + dba SFX_Battle_20 + dba SFX_Battle_21 + dba SFX_Battle_22 + dba SFX_Battle_23 + dba SFX_Battle_24 + dba SFX_Battle_25 + dba SFX_Battle_26 + dba SFX_Battle_27 + dba SFX_Battle_28 + dba SFX_Battle_29 + dba SFX_Battle_2A + dba SFX_Battle_2B + dba SFX_Battle_2C + dba SFX_Psybeam + dba SFX_Battle_2E + dba SFX_Battle_2F + dba SFX_Psychic_M + dba SFX_Battle_31 + dba SFX_Battle_32 + dba SFX_Battle_33 + dba SFX_Battle_34 + dba SFX_Battle_35 + dba SFX_Battle_36 + dba SFX_Silph_Scope - dbw BANK(SFX_Intro_Lunge), SFX_Intro_Lunge - dbw BANK(SFX_Intro_Hip), SFX_Intro_Hip - dbw BANK(SFX_Intro_Hop), SFX_Intro_Hop - dbw BANK(SFX_Intro_Raise), SFX_Intro_Raise - dbw BANK(SFX_Intro_Crash), SFX_Intro_Crash - dbw BANK(SFX_Intro_Whoosh), SFX_Intro_Whoosh - dbw BANK(SFX_Slots_Stop_Wheel), SFX_Slots_Stop_Wheel - dbw BANK(SFX_Slots_Reward), SFX_Slots_Reward - dbw BANK(SFX_Slots_New_Spin), SFX_Slots_New_Spin - dbw BANK(SFX_Shooting_Star), SFX_Shooting_Star + dba SFX_Intro_Lunge + dba SFX_Intro_Hip + dba SFX_Intro_Hop + dba SFX_Intro_Raise + dba SFX_Intro_Crash + dba SFX_Intro_Whoosh + dba SFX_Slots_Stop_Wheel + dba SFX_Slots_Reward + dba SFX_Slots_New_Spin + dba SFX_Shooting_Star - dbw BANK(Sfx_NotVeryEffective), Sfx_NotVeryEffective - dbw BANK(Sfx_Damage), Sfx_Damage - dbw BANK(Sfx_SuperEffective), Sfx_SuperEffective + dba Sfx_NotVeryEffective + dba Sfx_Damage + dba Sfx_SuperEffective diff --git a/crysaudio/red_pointers.asm b/crysaudio/red_pointers.asm index 32ca8ab9..f4e41ad9 100644 --- a/crysaudio/red_pointers.asm +++ b/crysaudio/red_pointers.asm @@ -1,50 +1,50 @@ -tbp: MACRO - dbw BANK(\1), \1 - ENDM +; See song sections in audio.asm. - tbp Music_Nothing - tbp Music_RBYPalletTown - tbp Music_Pokecenter - tbp Music_RBYGym - tbp Music_Cities1 - tbp Music_Cities2 - tbp Music_Celadon - tbp Music_Cinnabar - tbp Music_Vermilion - tbp Music_Lavender - tbp Music_SSAnne - tbp Music_MeetProfOak - tbp Music_MeetRival - tbp Music_MuseumGuy - tbp Music_SafariZone - tbp Music_PkmnHealed - tbp Music_Routes1 - tbp Music_Routes2 - tbp Music_Routes3 - tbp Music_Routes4 - tbp Music_RBYIndigoPlateau - tbp Music_GymLeaderBattle - tbp Music_TrainerBattle - tbp Music_WildBattle - tbp Music_FinalBattle - tbp Music_DefeatedTrainer - tbp Music_DefeatedWildMon - tbp Music_DefeatedGymLeader - tbp Music_RBYTitleScreen - tbp Music_RBYCredits - tbp Music_RBYHallOfFame - tbp Music_OaksLab - tbp Music_JigglypuffSong - tbp Music_BikeRiding - tbp Music_Surfing - tbp Music_RBYGameCorner - tbp Music_IntroBattle - tbp Music_Dungeon1 - tbp Music_Dungeon2 - tbp Music_Dungeon3 - tbp Music_CinnabarMansion - tbp Music_PokemonTower - tbp Music_SilphCo - tbp Music_MeetEvilTrainer - tbp Music_MeetFemaleTrainer - tbp Music_MeetMaleTrainer +Music: +; entries correspond to MUSIC_* constants + dba Music_Nothing + dba Music_RBYPalletTown + dba Music_Pokecenter + dba Music_RBYGym + dba Music_Cities1 + dba Music_Cities2 + dba Music_Celadon + dba Music_Cinnabar + dba Music_Vermilion + dba Music_Lavender + dba Music_SSAnne + dba Music_MeetProfOak + dba Music_MeetRival + dba Music_MuseumGuy + dba Music_SafariZone + dba Music_PkmnHealed + dba Music_Routes1 + dba Music_Routes2 + dba Music_Routes3 + dba Music_Routes4 + dba Music_RBYIndigoPlateau + dba Music_GymLeaderBattle + dba Music_TrainerBattle + dba Music_WildBattle + dba Music_FinalBattle + dba Music_DefeatedTrainer + dba Music_DefeatedWildMon + dba Music_DefeatedGymLeader + dba Music_RBYTitleScreen + dba Music_RBYCredits + dba Music_RBYHallOfFame + dba Music_OaksLab + dba Music_JigglypuffSong + dba Music_BikeRiding + dba Music_Surfing + dba Music_RBYGameCorner + dba Music_IntroBattle + dba Music_Dungeon1 + dba Music_Dungeon2 + dba Music_Dungeon3 + dba Music_CinnabarMansion + dba Music_PokemonTower + dba Music_SilphCo + dba Music_MeetEvilTrainer + dba Music_MeetFemaleTrainer + dba Music_MeetMaleTrainer diff --git a/crysaudio/sfx.asm b/crysaudio/sfx.asm index a7bab7e0..d193643a 100644 --- a/crysaudio/sfx.asm +++ b/crysaudio/sfx.asm @@ -1,500 +1,394 @@ -Sfx_PokeballsPlacedOnTable: ; f0941 - dbw $04, Sfx_PokeballsPlacedOnTable_Ch5 -; f0944 +Sfx_PokeballsPlacedOnTable: + musicheader 1, 5, Sfx_PokeballsPlacedOnTable_Ch5 -Sfx_BallWiggle: ; f0944 - dbw $04, Sfx_BallWiggle_Ch5 -; f0947 +Sfx_BallWobble: + musicheader 1, 5, Sfx_BallWobble_Ch5 -Sfx_Potion: ; f0947 - dbw $04, Sfx_Potion_Ch5 -; f094a +Sfx_Potion: + musicheader 1, 5, Sfx_Potion_Ch5 -Sfx_FullHeal: ; f094a - dbw $04, Sfx_FullHeal_Ch5 -; f094d +Sfx_FullHeal: + musicheader 1, 5, Sfx_FullHeal_Ch5 -Sfx_Menu: ; f094d - dbw $07, Sfx_Menu_Ch8 -; f0950 +Sfx_Menu: + musicheader 1, 8, Sfx_Menu_Ch8 -Sfx_ReadText2: ; f0950 -Sfx_ReadText: ; f0950 - dbw $04, Sfx_ReadText2_Ch5 -; f0953 +Sfx_ReadText2: +Sfx_ReadText: + musicheader 1, 5, Sfx_ReadText2_Ch5 -Sfx_Poison: ; f0953 - dbw $04, Sfx_Poison_Ch5 -; f0956 +Sfx_Poison: + musicheader 1, 5, Sfx_Poison_Ch5 -Sfx_GotSafariBalls: ; f0956 - dbw $04, Sfx_GotSafariBalls_Ch5 -; f0959 +Sfx_GotSafariBalls: + musicheader 1, 5, Sfx_GotSafariBalls_Ch5 -Sfx_BootPc: ; f0959 - dbw $04, Sfx_BootPc_Ch5 -; f095c +Sfx_BootPc: + musicheader 1, 5, Sfx_BootPc_Ch5 -Sfx_ShutDownPc: ; f095c - dbw $04, Sfx_ShutDownPc_Ch5 -; f095f +Sfx_ShutDownPc: + musicheader 1, 5, Sfx_ShutDownPc_Ch5 -Sfx_ChoosePcOption: ; f095f - dbw $04, Sfx_ChoosePcOption_Ch5 -; f0962 +Sfx_ChoosePcOption: + musicheader 1, 5, Sfx_ChoosePcOption_Ch5 -Sfx_EscapeRope: ; f0962 - dbw $04, Sfx_EscapeRope_Ch5 -; f0965 +Sfx_EscapeRope: + musicheader 1, 5, Sfx_EscapeRope_Ch5 -Sfx_PushButton: ; f0965 - dbw $04, Sfx_PushButton_Ch5 -; f0968 +Sfx_PushButton: + musicheader 1, 5, Sfx_PushButton_Ch5 -Sfx_SecondPartOfItemfinder: ; f0968 - dbw $04, Sfx_SecondPartOfItemfinder_Ch5 -; f096b +Sfx_SecondPartOfItemfinder: + musicheader 1, 5, Sfx_SecondPartOfItemfinder_Ch5 -Sfx_WarpTo: ; f096b - dbw $04, Sfx_WarpTo_Ch5 -; f096e +Sfx_WarpTo: + musicheader 1, 5, Sfx_WarpTo_Ch5 -Sfx_WarpFrom: ; f096e - dbw $04, Sfx_WarpFrom_Ch5 -; f0971 +Sfx_WarpFrom: + musicheader 1, 5, Sfx_WarpFrom_Ch5 -Sfx_ChangeDexMode: ; f0971 - dbw $04, Sfx_ChangeDexMode_Ch5 -; f0974 +Sfx_ChangeDexMode: + musicheader 1, 5, Sfx_ChangeDexMode_Ch5 -Sfx_JumpOverLedge: ; f0974 - dbw $04, Sfx_JumpOverLedge_Ch5 -; f0977 +Sfx_JumpOverLedge: + musicheader 1, 5, Sfx_JumpOverLedge_Ch5 -Sfx_GrassRustle: ; f0977 - dbw $07, Sfx_GrassRustle_Ch8 -; f097a +Sfx_GrassRustle: + musicheader 1, 8, Sfx_GrassRustle_Ch8 -Sfx_Fly: ; f097a - dbw $07, Sfx_Fly_Ch8 -; f097d +Sfx_Fly: + musicheader 1, 8, Sfx_Fly_Ch8 -Sfx_Wrong: ; f097d - dbw $44, Sfx_Wrong_Ch5 - dbw $05, Sfx_Wrong_Ch6 -; f0983 +Sfx_Wrong: + musicheader 2, 5, Sfx_Wrong_Ch5 + musicheader 1, 6, Sfx_Wrong_Ch6 -Sfx_Squeak: ; f0983 - dbw $04, Sfx_Squeak_Ch5 -; f0986 +Sfx_Squeak: + musicheader 1, 5, Sfx_Squeak_Ch5 -Sfx_Strength: ; f0986 - dbw $07, Sfx_Strength_Ch8 -; f0989 +Sfx_Strength: + musicheader 1, 8, Sfx_Strength_Ch8 -Sfx_Boat: ; f0989 - dbw $44, Sfx_Boat_Ch5 - dbw $05, Sfx_Boat_Ch6 -; f098f +Sfx_Boat: + musicheader 2, 5, Sfx_Boat_Ch5 + musicheader 1, 6, Sfx_Boat_Ch6 -Sfx_WallOpen: ; f098f - dbw $04, Sfx_WallOpen_Ch5 -; f0992 +Sfx_WallOpen: + musicheader 1, 5, Sfx_WallOpen_Ch5 -Sfx_PlacePuzzlePieceDown: ; f0992 - dbw $07, Sfx_PlacePuzzlePieceDown_Ch8 -; f0995 +Sfx_PlacePuzzlePieceDown: + musicheader 1, 8, Sfx_PlacePuzzlePieceDown_Ch8 -Sfx_EnterDoor: ; f0995 - dbw $07, Sfx_EnterDoor_Ch8 -; f0998 +Sfx_EnterDoor: + musicheader 1, 8, Sfx_EnterDoor_Ch8 -Sfx_SwitchPokemon: ; f0998 - dbw $44, Sfx_SwitchPokemon_Ch5 - dbw $05, Sfx_SwitchPokemon_Ch6 -; f099e +Sfx_SwitchPokemon: + musicheader 2, 5, Sfx_SwitchPokemon_Ch5 + musicheader 1, 6, Sfx_SwitchPokemon_Ch6 -Sfx_Tally: ; f099e - dbw $44, Sfx_Tally_Ch5 - dbw $05, Sfx_Tally_Ch6 -; f09a4 +Sfx_Tally: + musicheader 2, 5, Sfx_Tally_Ch5 + musicheader 1, 6, Sfx_Tally_Ch6 -Sfx_Transaction: ; f09a4 - dbw $44, Sfx_Transaction_Ch5 - dbw $05, Sfx_Transaction_Ch6 -; f09aa +Sfx_Transaction: + musicheader 2, 5, Sfx_Transaction_Ch5 + musicheader 1, 6, Sfx_Transaction_Ch6 -Sfx_Bump: ; f09aa - dbw $04, Sfx_Bump_Ch5 -; f09ad +Sfx_Bump: + musicheader 1, 5, Sfx_Bump_Ch5 -Sfx_ExitBuilding: ; f09ad - dbw $07, Sfx_ExitBuilding_Ch8 -; f09b0 +Sfx_ExitBuilding: + musicheader 1, 8, Sfx_ExitBuilding_Ch8 -Sfx_Save: ; f09b0 - dbw $44, Sfx_Save_Ch5 - dbw $05, Sfx_Save_Ch6 -; f09b6 +Sfx_Save: + musicheader 2, 5, Sfx_Save_Ch5 + musicheader 1, 6, Sfx_Save_Ch6 -Sfx_Save_Ch5: ; f09b6 +Sfx_Save_Ch5: dutycycle $2 - sound $2, $f1, $0700 - sound $1, $e1, $0600 - sound $1, $e1, $0680 - sound $1, $e1, $06c0 - sound $2, $e1, $0700 - sound $2, $e1, $07c0 - sound $f, $f2, $07e0 + sound __, 3, $f1, $0700 + sound __, 2, $e1, $0600 + sound __, 2, $e1, $0680 + sound __, 2, $e1, $06c0 + sound __, 3, $e1, $0700 + sound __, 3, $e1, $07c0 + sound __, 16, $f2, $07e0 endchannel -; f09d5 -Sfx_Save_Ch6: ; f09d5 +Sfx_Save_Ch6: dutycycle $2 - sound $2, $8, $0000 - sound $2, $a1, $0701 - sound $1, $91, $0601 - sound $1, $91, $0681 - sound $1, $91, $06c1 - sound $2, $91, $0701 - sound $2, $91, $07c1 - sound $f, $d2, $07e1 + sound __, 3, $8, 0 + sound __, 3, $a1, $0701 + sound __, 2, $91, $0601 + sound __, 2, $91, $0681 + sound __, 2, $91, $06c1 + sound __, 3, $91, $0701 + sound __, 3, $91, $07c1 + sound __, 16, $d2, $07e1 endchannel -; f09f8 - -Sfx_Pokeflute: ; f09f8 - dbw $06, Sfx_Pokeflute_Ch7 -; f09fb - -Sfx_ElevatorEnd: ; f09fb - dbw $04, Sfx_ElevatorEnd_Ch5 -; f09fe - -Sfx_ThrowBall: ; f09fe - dbw $44, Sfx_ThrowBall_Ch5 - dbw $05, Sfx_ThrowBall_Ch6 -; f0a04 -Sfx_BallPoof: ; f0a04 - dbw $44, Sfx_BallPoof_Ch5 - dbw $07, Sfx_BallPoof_Ch8 -; f0a0a - -Sfx_Unknown3A: ; f0a0a - dbw $44, Sfx_Unknown3A_Ch5 - dbw $07, Sfx_Unknown3A_Ch8 -; f0a10 - -Sfx_Run: ; f0a10 - dbw $07, Sfx_Run_Ch8 -; f0a13 - -Sfx_SlotMachineStart: ; f0a13 - dbw $44, Sfx_SlotMachineStart_Ch5 - dbw $05, Sfx_SlotMachineStart_Ch6 -; f0a19 - -Sfx_Call: ; f0a19 - dbw $04, Sfx_Call_Ch5 -; f0a1c - -Sfx_Unknown60: ; f0a1c - dbw $07, Sfx_Unknown60_Ch8 -; f0a1f - -Sfx_Unknown61: ; f0a1f - dbw $07, Sfx_Unknown61_Ch8 -; f0a22 - -Sfx_Unknown62: ; f0a22 - dbw $07, Sfx_Unknown62_Ch8 -; f0a25 - -Sfx_Unknown63: ; f0a25 - dbw $07, Sfx_Unknown63_Ch8 -; f0a28 - -Sfx_Burn: ; f0a28 - dbw $07, Sfx_Burn_Ch8 -; f0a2b - -Sfx_TitleScreenEntrance: ; f0a2b - dbw $07, Sfx_TitleScreenEntrance_Ch8 -; f0a2e - -Sfx_Unknown66: ; f0a2e - dbw $04, Sfx_Unknown66_Ch5 -; f0a31 - -Sfx_GetCoinFromSlots: ; f0a31 - dbw $04, Sfx_GetCoinFromSlots_Ch5 -; f0a34 - -Sfx_PayDay: ; f0a34 - dbw $44, Sfx_PayDay_Ch5 - dbw $05, Sfx_PayDay_Ch6 -; f0a3a - -Sfx_Metronome: ; f0a3a - dbw $04, Sfx_Metronome_Ch5 -; f0a3d - -Sfx_Peck: ; f0a3d - dbw $07, Sfx_Peck_Ch8 -; f0a40 - -Sfx_Kinesis: ; f0a40 - dbw $04, Sfx_Kinesis_Ch5 -; f0a43 - -Sfx_Lick: ; f0a43 - dbw $04, Sfx_Lick_Ch5 -; f0a46 - -Sfx_Pound: ; f0a46 - dbw $07, Sfx_Pound_Ch8 -; f0a49 - -Sfx_MovePuzzlePiece: ; f0a49 - dbw $07, Sfx_MovePuzzlePiece_Ch8 -; f0a4c - -Sfx_CometPunch: ; f0a4c - dbw $07, Sfx_CometPunch_Ch8 -; f0a4f - -Sfx_MegaPunch: ; f0a4f - dbw $07, Sfx_MegaPunch_Ch8 -; f0a52 - -Sfx_Scratch: ; f0a52 - dbw $07, Sfx_Scratch_Ch8 -; f0a55 - -Sfx_Vicegrip: ; f0a55 - dbw $07, Sfx_Vicegrip_Ch8 -; f0a58 - -Sfx_RazorWind: ; f0a58 - dbw $07, Sfx_RazorWind_Ch8 -; f0a5b - -Sfx_Cut: ; f0a5b - dbw $07, Sfx_Cut_Ch8 -; f0a5e - -Sfx_WingAttack: ; f0a5e - dbw $07, Sfx_WingAttack_Ch8 -; f0a61 - -Sfx_Whirlwind: ; f0a61 - dbw $07, Sfx_Whirlwind_Ch8 -; f0a64 - -Sfx_Bind: ; f0a64 - dbw $07, Sfx_Bind_Ch8 -; f0a67 - -Sfx_VineWhip: ; f0a67 - dbw $07, Sfx_VineWhip_Ch8 -; f0a6a - -Sfx_DoubleKick: ; f0a6a - dbw $07, Sfx_DoubleKick_Ch8 -; f0a6d - -Sfx_MegaKick: ; f0a6d - dbw $07, Sfx_MegaKick_Ch8 -; f0a70 - -Sfx_Headbutt: ; f0a70 - dbw $07, Sfx_Headbutt_Ch8 -; f0a73 - -Sfx_HornAttack: ; f0a73 - dbw $07, Sfx_HornAttack_Ch8 -; f0a76 - -Sfx_Tackle: ; f0a76 - dbw $07, Sfx_Tackle_Ch8 -; f0a79 - -Sfx_PoisonSting: ; f0a79 - dbw $07, Sfx_PoisonSting_Ch8 -; f0a7c - -Sfx_Powder: ; f0a7c - dbw $07, Sfx_Powder_Ch8 -; f0a7f - -Sfx_Doubleslap: ; f0a7f - dbw $07, Sfx_Doubleslap_Ch8 -; f0a82 - -Sfx_Bite: ; f0a82 - dbw $44, Sfx_Bite_Ch5 - dbw $07, Sfx_Bite_Ch8 -; f0a88 - -Sfx_JumpKick: ; f0a88 - dbw $07, Sfx_JumpKick_Ch8 -; f0a8b - -Sfx_Stomp: ; f0a8b - dbw $07, Sfx_Stomp_Ch8 -; f0a8e - -Sfx_TailWhip: ; f0a8e - dbw $07, Sfx_TailWhip_Ch8 -; f0a91 - -Sfx_KarateChop: ; f0a91 - dbw $07, Sfx_KarateChop_Ch8 -; f0a94 - -Sfx_Submission: ; f0a94 - dbw $07, Sfx_Submission_Ch8 -; f0a97 - -Sfx_WaterGun: ; f0a97 - dbw $44, Sfx_WaterGun_Ch5 - dbw $07, Sfx_WaterGun_Ch8 -; f0a9d - -Sfx_SwordsDance: ; f0a9d - dbw $07, Sfx_SwordsDance_Ch8 -; f0aa0 - -Sfx_Thunder: ; f0aa0 - dbw $07, Sfx_Thunder_Ch8 -; f0aa3 - -Sfx_Supersonic: ; f0aa3 - dbw $84, Sfx_Supersonic_Ch5 - dbw $05, Sfx_Supersonic_Ch6 - dbw $07, Sfx_Supersonic_Ch8 -; f0aac - -Sfx_Leer: ; f0aac - dbw $84, Sfx_Leer_Ch5 - dbw $05, Sfx_Leer_Ch6 - dbw $07, Sfx_Leer_Ch8 -; f0ab5 - -Sfx_Ember: ; f0ab5 - dbw $44, Sfx_Ember_Ch5 - dbw $07, Sfx_Ember_Ch8 -; f0abb - -Sfx_Bubblebeam: ; f0abb - dbw $84, Sfx_Bubblebeam_Ch5 - dbw $05, Sfx_Bubblebeam_Ch6 - dbw $07, Sfx_Bubblebeam_Ch8 -; f0ac4 - -Sfx_HydroPump: ; f0ac4 - dbw $44, Sfx_HydroPump_Ch5 - dbw $07, Sfx_HydroPump_Ch8 -; f0aca - -Sfx_Surf: ; f0aca - dbw $84, Sfx_Surf_Ch5 - dbw $05, Sfx_Surf_Ch6 - dbw $07, Sfx_Surf_Ch8 -; f0ad3 - -Sfx_Psybeam: ; f0ad3 - dbw $84, Sfx_Psybeam_Ch5 - dbw $05, Sfx_Psybeam_Ch6 - dbw $07, Sfx_Psybeam_Ch8 -; f0adc - -Sfx_Charge: ; f0adc - dbw $84, Sfx_Charge_Ch5 - dbw $05, Sfx_Charge_Ch6 - dbw $07, Sfx_Charge_Ch8 -; f0ae5 - -Sfx_Thundershock: ; f0ae5 - dbw $84, Sfx_Thundershock_Ch5 - dbw $05, Sfx_Thundershock_Ch6 - dbw $07, Sfx_Thundershock_Ch8 -; f0aee - -Sfx_Psychic: ; f0aee - dbw $84, Sfx_Psychic_Ch5 - dbw $05, Sfx_Psychic_Ch6 - dbw $07, Sfx_Psychic_Ch8 -; f0af7 - -Sfx_Screech: ; f0af7 - dbw $44, Sfx_Screech_Ch5 - dbw $05, Sfx_Screech_Ch6 -; f0afd - -Sfx_BoneClub: ; f0afd - dbw $44, Sfx_BoneClub_Ch5 - dbw $05, Sfx_BoneClub_Ch6 -; f0b03 - -Sfx_Sharpen: ; f0b03 - dbw $44, Sfx_Sharpen_Ch5 - dbw $05, Sfx_Sharpen_Ch6 -; f0b09 - -Sfx_EggBomb: ; f0b09 - dbw $84, Sfx_EggBomb_Ch5 - dbw $05, Sfx_EggBomb_Ch6 - dbw $07, Sfx_EggBomb_Ch8 -; f0b12 - -Sfx_Sing: ; f0b12 - dbw $44, Sfx_Sing_Ch5 - dbw $05, Sfx_Sing_Ch6 -; f0b18 - -Sfx_HyperBeam: ; f0b18 - dbw $84, Sfx_HyperBeam_Ch5 - dbw $05, Sfx_HyperBeam_Ch6 - dbw $07, Sfx_HyperBeam_Ch8 -; f0b21 - -Sfx_Shine: ; f0b21 - dbw $04, Sfx_Shine_Ch5 -; f0b24 - -Sfx_Unknown5F: ; f0b24 - dbw $84, Sfx_Unknown5F_Ch5 - dbw $05, Sfx_Unknown5F_Ch6 -Sfx_Sandstorm: ; f0b2a - dbw $07, Sfx_Sandstorm_Ch8 -; f0b2d - -Sfx_HangUp: ; f0b2d - dbw $04, Sfx_HangUp_Ch5 -; f0b30 - -Sfx_NoSignal: ; f0b30 - dbw $04, Sfx_NoSignal_Ch5 -; f0b33 - -Sfx_Elevator: ; f0b33 - dbw $c4, Sfx_Elevator_Ch5 - dbw $05, Sfx_Elevator_Ch6 - dbw $06, Sfx_Elevator_Ch7 - dbw $07, Sfx_Elevator_Ch8 -; f0b3f - -Sfx_DexFanfare5079: ; f0b3f -Sfx_LevelUp: ; f0b3f - dbw $c4, Sfx_DexFanfare5079_Ch5 - dbw $05, Sfx_DexFanfare5079_Ch6 - dbw $06, Sfx_DexFanfare5079_Ch7 - dbw $07, Sfx_DexFanfare5079_Ch8 -; f0b4b - -Sfx_DexFanfare5079_Ch5: ; f0b4b -Sfx_LevelUp_Ch5: ; f0b4b +Sfx_Pokeflute: + musicheader 1, 7, Sfx_Pokeflute_Ch7 + +Sfx_ElevatorEnd: + musicheader 1, 5, Sfx_ElevatorEnd_Ch5 + +Sfx_ThrowBall: + musicheader 2, 5, Sfx_ThrowBall_Ch5 + musicheader 1, 6, Sfx_ThrowBall_Ch6 + +Sfx_BallPoof: + musicheader 2, 5, Sfx_BallPoof_Ch5 + musicheader 1, 8, Sfx_BallPoof_Ch8 + +Sfx_Unknown3A: + musicheader 2, 5, Sfx_Unknown3A_Ch5 + musicheader 1, 8, Sfx_Unknown3A_Ch8 + +Sfx_Run: + musicheader 1, 8, Sfx_Run_Ch8 + +Sfx_SlotMachineStart: + musicheader 2, 5, Sfx_SlotMachineStart_Ch5 + musicheader 1, 6, Sfx_SlotMachineStart_Ch6 + +Sfx_Call: + musicheader 1, 5, Sfx_Call_Ch5 + +Sfx_Unknown60: + musicheader 1, 8, Sfx_Unknown60_Ch8 + +Sfx_Unknown61: + musicheader 1, 8, Sfx_Unknown61_Ch8 + +Sfx_SwitchPockets: + musicheader 1, 8, Sfx_SwitchPockets_Ch8 + +Sfx_Unknown63: + musicheader 1, 8, Sfx_Unknown63_Ch8 + +Sfx_Burn: + musicheader 1, 8, Sfx_Burn_Ch8 + +Sfx_TitleScreenEntrance: + musicheader 1, 8, Sfx_TitleScreenEntrance_Ch8 + +Sfx_Unknown66: + musicheader 1, 5, Sfx_Unknown66_Ch5 + +Sfx_GetCoinFromSlots: + musicheader 1, 5, Sfx_GetCoinFromSlots_Ch5 + +Sfx_PayDay: + musicheader 2, 5, Sfx_PayDay_Ch5 + musicheader 1, 6, Sfx_PayDay_Ch6 + +Sfx_Metronome: + musicheader 1, 5, Sfx_Metronome_Ch5 + +Sfx_Peck: + musicheader 1, 8, Sfx_Peck_Ch8 + +Sfx_Kinesis: + musicheader 1, 5, Sfx_Kinesis_Ch5 + +Sfx_Lick: + musicheader 1, 5, Sfx_Lick_Ch5 + +Sfx_Pound: + musicheader 1, 8, Sfx_Pound_Ch8 + +Sfx_MovePuzzlePiece: + musicheader 1, 8, Sfx_MovePuzzlePiece_Ch8 + +Sfx_CometPunch: + musicheader 1, 8, Sfx_CometPunch_Ch8 + +Sfx_MegaPunch: + musicheader 1, 8, Sfx_MegaPunch_Ch8 + +Sfx_Scratch: + musicheader 1, 8, Sfx_Scratch_Ch8 + +Sfx_Vicegrip: + musicheader 1, 8, Sfx_Vicegrip_Ch8 + +Sfx_RazorWind: + musicheader 1, 8, Sfx_RazorWind_Ch8 + +Sfx_Cut: + musicheader 1, 8, Sfx_Cut_Ch8 + +Sfx_WingAttack: + musicheader 1, 8, Sfx_WingAttack_Ch8 + +Sfx_Whirlwind: + musicheader 1, 8, Sfx_Whirlwind_Ch8 + +Sfx_Bind: + musicheader 1, 8, Sfx_Bind_Ch8 + +Sfx_VineWhip: + musicheader 1, 8, Sfx_VineWhip_Ch8 + +Sfx_DoubleKick: + musicheader 1, 8, Sfx_DoubleKick_Ch8 + +Sfx_MegaKick: + musicheader 1, 8, Sfx_MegaKick_Ch8 + +Sfx_Headbutt: + musicheader 1, 8, Sfx_Headbutt_Ch8 + +Sfx_HornAttack: + musicheader 1, 8, Sfx_HornAttack_Ch8 + +Sfx_Tackle: + musicheader 1, 8, Sfx_Tackle_Ch8 + +Sfx_PoisonSting: + musicheader 1, 8, Sfx_PoisonSting_Ch8 + +Sfx_Powder: + musicheader 1, 8, Sfx_Powder_Ch8 + +Sfx_Doubleslap: + musicheader 1, 8, Sfx_Doubleslap_Ch8 + +Sfx_Bite: + musicheader 2, 5, Sfx_Bite_Ch5 + musicheader 1, 8, Sfx_Bite_Ch8 + +Sfx_JumpKick: + musicheader 1, 8, Sfx_JumpKick_Ch8 + +Sfx_Stomp: + musicheader 1, 8, Sfx_Stomp_Ch8 + +Sfx_TailWhip: + musicheader 1, 8, Sfx_TailWhip_Ch8 + +Sfx_KarateChop: + musicheader 1, 8, Sfx_KarateChop_Ch8 + +Sfx_Submission: + musicheader 1, 8, Sfx_Submission_Ch8 + +Sfx_WaterGun: + musicheader 2, 5, Sfx_WaterGun_Ch5 + musicheader 1, 8, Sfx_WaterGun_Ch8 + +Sfx_SwordsDance: + musicheader 1, 8, Sfx_SwordsDance_Ch8 + +Sfx_Thunder: + musicheader 1, 8, Sfx_Thunder_Ch8 + +Sfx_Supersonic: + musicheader 3, 5, Sfx_Supersonic_Ch5 + musicheader 1, 6, Sfx_Supersonic_Ch6 + musicheader 1, 8, Sfx_Supersonic_Ch8 + +Sfx_Leer: + musicheader 3, 5, Sfx_Leer_Ch5 + musicheader 1, 6, Sfx_Leer_Ch6 + musicheader 1, 8, Sfx_Leer_Ch8 + +Sfx_Ember: + musicheader 2, 5, Sfx_Ember_Ch5 + musicheader 1, 8, Sfx_Ember_Ch8 + +Sfx_Bubblebeam: + musicheader 3, 5, Sfx_Bubblebeam_Ch5 + musicheader 1, 6, Sfx_Bubblebeam_Ch6 + musicheader 1, 8, Sfx_Bubblebeam_Ch8 + +Sfx_HydroPump: + musicheader 2, 5, Sfx_HydroPump_Ch5 + musicheader 1, 8, Sfx_HydroPump_Ch8 + +Sfx_Surf: + musicheader 3, 5, Sfx_Surf_Ch5 + musicheader 1, 6, Sfx_Surf_Ch6 + musicheader 1, 8, Sfx_Surf_Ch8 + +Sfx_Psybeam: + musicheader 3, 5, Sfx_Psybeam_Ch5 + musicheader 1, 6, Sfx_Psybeam_Ch6 + musicheader 1, 8, Sfx_Psybeam_Ch8 + +Sfx_Charge: + musicheader 3, 5, Sfx_Charge_Ch5 + musicheader 1, 6, Sfx_Charge_Ch6 + musicheader 1, 8, Sfx_Charge_Ch8 + +Sfx_Thundershock: + musicheader 3, 5, Sfx_Thundershock_Ch5 + musicheader 1, 6, Sfx_Thundershock_Ch6 + musicheader 1, 8, Sfx_Thundershock_Ch8 + +Sfx_Psychic: + musicheader 3, 5, Sfx_Psychic_Ch5 + musicheader 1, 6, Sfx_Psychic_Ch6 + musicheader 1, 8, Sfx_Psychic_Ch8 + +Sfx_Screech: + musicheader 2, 5, Sfx_Screech_Ch5 + musicheader 1, 6, Sfx_Screech_Ch6 + +Sfx_BoneClub: + musicheader 2, 5, Sfx_BoneClub_Ch5 + musicheader 1, 6, Sfx_BoneClub_Ch6 + +Sfx_Sharpen: + musicheader 2, 5, Sfx_Sharpen_Ch5 + musicheader 1, 6, Sfx_Sharpen_Ch6 + +Sfx_EggBomb: + musicheader 3, 5, Sfx_EggBomb_Ch5 + musicheader 1, 6, Sfx_EggBomb_Ch6 + musicheader 1, 8, Sfx_EggBomb_Ch8 + +Sfx_Sing: + musicheader 2, 5, Sfx_Sing_Ch5 + musicheader 1, 6, Sfx_Sing_Ch6 + +Sfx_HyperBeam: + musicheader 3, 5, Sfx_HyperBeam_Ch5 + musicheader 1, 6, Sfx_HyperBeam_Ch6 + musicheader 1, 8, Sfx_HyperBeam_Ch8 + +Sfx_Shine: + musicheader 1, 5, Sfx_Shine_Ch5 + +Sfx_Unknown5F: + musicheader 3, 5, Sfx_Unknown5F_Ch5 + musicheader 1, 6, Sfx_Unknown5F_Ch6 + +Sfx_Sandstorm: + musicheader 1, 8, Sfx_Sandstorm_Ch8 + +Sfx_HangUp: + musicheader 1, 5, Sfx_HangUp_Ch5 + +Sfx_NoSignal: + musicheader 1, 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 + +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_Ch5: +Sfx_LevelUp_Ch5: togglesfx tempo 120 volume $77 @@ -508,10 +402,9 @@ Sfx_LevelUp_Ch5: ; f0b4b octave 4 note G#, 12 endchannel -; f0b5f -Sfx_DexFanfare5079_Ch6: ; f0b5f -Sfx_LevelUp_Ch6: ; f0b5f +Sfx_DexFanfare5079_Ch6: +Sfx_LevelUp_Ch6: togglesfx dutycycle $2 notetype $8, $c1 @@ -522,10 +415,9 @@ Sfx_LevelUp_Ch6: ; f0b5f intensity $c3 note B_, 12 endchannel -; f0b6d -Sfx_DexFanfare5079_Ch7: ; f0b6d -Sfx_LevelUp_Ch7: ; f0b6d +Sfx_DexFanfare5079_Ch7: +Sfx_LevelUp_Ch7: togglesfx notetype $8, $25 octave 4 @@ -541,25 +433,22 @@ Sfx_LevelUp_Ch7: ; f0b6d note E_, 3 note __, 4 endchannel -; f0b7f -Sfx_DexFanfare5079_Ch8: ; f0b7f -Sfx_LevelUp_Ch8: ; f0b7f +Sfx_DexFanfare5079_Ch8: +Sfx_LevelUp_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 12 endchannel -; f0b86 -Sfx_KeyItem: ; f0b86 - dbw $c4, Sfx_KeyItem_Ch5 - dbw $05, Sfx_KeyItem_Ch6 - dbw $06, Sfx_KeyItem_Ch7 - dbw $07, Sfx_KeyItem_Ch8 -; f0b92 +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 -Sfx_KeyItem_Ch5: ; f0b92 +Sfx_KeyItem_Ch5: togglesfx tempo 120 volume $77 @@ -575,9 +464,8 @@ Sfx_KeyItem_Ch5: ; f0b92 intensity $b3 note G#, 16 endchannel -; f0ba8 -Sfx_KeyItem_Ch6: ; f0ba8 +Sfx_KeyItem_Ch6: togglesfx dutycycle $2 notetype $6, $c1 @@ -590,9 +478,8 @@ Sfx_KeyItem_Ch6: ; f0ba8 intensity $c3 note B_, 16 endchannel -; f0bb8 -Sfx_KeyItem_Ch7: ; f0bb8 +Sfx_KeyItem_Ch7: togglesfx notetype $6, $25 octave 4 @@ -612,24 +499,21 @@ Sfx_KeyItem_Ch7: ; f0bb8 note E_, 4 note __, 4 endchannel -; f0bce -Sfx_KeyItem_Ch8: ; f0bce +Sfx_KeyItem_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 endchannel -; f0bd5 -Sfx_DexFanfare2049: ; f0bd5 - dbw $c4, Sfx_DexFanfare2049_Ch5 - dbw $05, Sfx_DexFanfare2049_Ch6 - dbw $06, Sfx_DexFanfare2049_Ch7 - dbw $07, Sfx_DexFanfare2049_Ch8 -; f0be1 +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 -Sfx_DexFanfare2049_Ch5: ; f0be1 +Sfx_DexFanfare2049_Ch5: togglesfx tempo 104 volume $77 @@ -653,9 +537,8 @@ Sfx_DexFanfare2049_Ch5: ; f0be1 note A_, 2 note __, 6 endchannel -; f0bfe -Sfx_DexFanfare2049_Ch6: ; f0bfe +Sfx_DexFanfare2049_Ch6: togglesfx dutycycle $2 notetype $c, $c1 @@ -674,9 +557,8 @@ Sfx_DexFanfare2049_Ch6: ; f0bfe note G_, 4 note F_, 8 endchannel -; f0c13 -Sfx_DexFanfare2049_Ch7: ; f0c13 +Sfx_DexFanfare2049_Ch7: togglesfx notetype $c, $25 octave 4 @@ -695,25 +577,22 @@ Sfx_DexFanfare2049_Ch7: ; f0c13 note F_, 2 note __, 6 endchannel -; f0c27 -Sfx_DexFanfare2049_Ch8: ; f0c27 +Sfx_DexFanfare2049_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0c2f -Sfx_Item: ; f0c2f - dbw $c4, Sfx_Item_Ch5 - dbw $05, Sfx_Item_Ch6 - dbw $06, Sfx_Item_Ch7 - dbw $07, Sfx_Item_Ch8 -; f0c3b +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 -Sfx_Item_Ch5: ; f0c3b +Sfx_Item_Ch5: togglesfx tempo 108 volume $77 @@ -731,9 +610,8 @@ Sfx_Item_Ch5: ; f0c3b note F_, 12 note __, 12 endchannel -; f0c54 -Sfx_Item_Ch6: ; f0c54 +Sfx_Item_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -749,9 +627,8 @@ Sfx_Item_Ch6: ; f0c54 note A_, 12 note __, 12 endchannel -; f0c68 -Sfx_Item_Ch7: ; f0c68 +Sfx_Item_Ch7: togglesfx notetype $8, $25 octave 4 @@ -774,25 +651,22 @@ Sfx_Item_Ch7: ; f0c68 note F_, 4 note __, 14 endchannel -; f0c81 -Sfx_Item_Ch8: ; f0c81 +Sfx_Item_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0c89 -Sfx_CaughtMon: ; f0c89 - dbw $c4, Sfx_CaughtMon_Ch5 - dbw $05, Sfx_CaughtMon_Ch6 - dbw $06, Sfx_CaughtMon_Ch7 - dbw $07, Sfx_CaughtMon_Ch8 -; f0c95 +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 -Sfx_CaughtMon_Ch5: ; f0c95 +Sfx_CaughtMon_Ch5: togglesfx tempo 112 volume $77 @@ -815,9 +689,8 @@ Sfx_CaughtMon_Ch5: ; f0c95 intensity $b3 note F_, 12 endchannel -; f0cb5 -Sfx_CaughtMon_Ch6: ; f0cb5 +Sfx_CaughtMon_Ch6: togglesfx dutycycle $2 vibrato $8, $27 @@ -836,9 +709,8 @@ Sfx_CaughtMon_Ch6: ; f0cb5 intensity $c3 note A_, 12 endchannel -; f0cce -Sfx_CaughtMon_Ch7: ; f0cce +Sfx_CaughtMon_Ch7: togglesfx notetype $8, $25 octave 3 @@ -856,25 +728,22 @@ Sfx_CaughtMon_Ch7: ; f0cce note A_, 3 note __, 3 endchannel -; f0ce2 -Sfx_CaughtMon_Ch8: ; f0ce2 +Sfx_CaughtMon_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0cea -Sfx_DexFanfare80109: ; f0cea - dbw $c4, Sfx_DexFanfare80109_Ch5 - dbw $05, Sfx_DexFanfare80109_Ch6 - dbw $06, Sfx_DexFanfare80109_Ch7 - dbw $07, Sfx_DexFanfare80109_Ch8 -; f0cf6 +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 -Sfx_DexFanfare80109_Ch5: ; f0cf6 +Sfx_DexFanfare80109_Ch5: togglesfx tempo 112 volume $77 @@ -899,9 +768,8 @@ Sfx_DexFanfare80109_Ch5: ; f0cf6 intensity $a5 note A#, 16 endchannel -; f0d17 -Sfx_DexFanfare80109_Ch6: ; f0d17 +Sfx_DexFanfare80109_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -923,9 +791,8 @@ Sfx_DexFanfare80109_Ch6: ; f0d17 octave 5 note D#, 16 endchannel -; f0d32 -Sfx_DexFanfare80109_Ch7: ; f0d32 +Sfx_DexFanfare80109_Ch7: togglesfx notetype $c, $25 octave 4 @@ -951,31 +818,27 @@ Sfx_DexFanfare80109_Ch7: ; f0d32 note D#, 3 note __, 9 endchannel -; f0d4e -Sfx_DexFanfare80109_Ch8: ; f0d4e +Sfx_DexFanfare80109_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0d56 -Sfx_Fanfare2: ; f0d56 - dbw $84, Sfx_Fanfare2_Ch5 - dbw $05, Sfx_Fanfare2_Ch6 - dbw $07, Sfx_Fanfare2_Ch8 -; f0d5f +Sfx_Fanfare2: + musicheader 3, 5, Sfx_Fanfare2_Ch5 + musicheader 1, 6, Sfx_Fanfare2_Ch6 + musicheader 1, 8, Sfx_Fanfare2_Ch8 -UnknownSfx: ; f0d5f - dbw $c4, UnknownSfx_Ch5 - dbw $05, UnknownSfx_Ch6 - dbw $06, UnknownSfx_Ch7 - dbw $07, UnknownSfx_Ch8 -; f0d6b +UnusedSfx: + musicheader 4, 5, UnusedSfx_Ch5 + musicheader 1, 6, UnusedSfx_Ch6 + musicheader 1, 7, UnusedSfx_Ch7 + musicheader 1, 8, UnusedSfx_Ch8 -UnknownSfx_Ch5: ; f0d6b +UnusedSfx_Ch5: togglesfx tempo 124 volume $77 @@ -998,9 +861,8 @@ UnknownSfx_Ch5: ; f0d6b intensity $a5 note F_, 16 endchannel -; f0d8a -UnknownSfx_Ch6: ; f0d8a +UnusedSfx_Ch6: togglesfx vibrato $8, $27 dutycycle $2 @@ -1023,9 +885,8 @@ UnknownSfx_Ch6: ; f0d8a intensity $b5 note A_, 16 endchannel -; f0da6 -UnknownSfx_Ch7: ; f0da6 +UnusedSfx_Ch7: togglesfx notetype $c, $25 octave 4 @@ -1039,31 +900,27 @@ UnknownSfx_Ch7: ; f0da6 note A_, 3 note __, 9 endchannel -; f0db6 -UnknownSfx_Ch8: ; f0db6 +UnusedSfx_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 16 note __, 16 endchannel -; f0dbe -Sfx_Fanfare: ; f0dbe - dbw $84, Sfx_Fanfare_Ch5 - dbw $05, Sfx_Fanfare_Ch6 - dbw $07, Sfx_Fanfare_Ch8 -; f0dc7 +Sfx_Fanfare: + musicheader 3, 5, Sfx_Fanfare_Ch5 + musicheader 1, 6, Sfx_Fanfare_Ch6 + musicheader 1, 8, Sfx_Fanfare_Ch8 -Sfx_RegisterPhoneNumber: ; f0dc7 - dbw $c4, Sfx_RegisterPhoneNumber_Ch5 - dbw $05, Sfx_RegisterPhoneNumber_Ch6 - dbw $06, Sfx_RegisterPhoneNumber_Ch7 - dbw $07, Sfx_RegisterPhoneNumber_Ch8 -; f0dd3 +Sfx_RegisterPhoneNumber: + musicheader 4, 5, Sfx_RegisterPhoneNumber_Ch5 + musicheader 1, 6, Sfx_RegisterPhoneNumber_Ch6 + musicheader 1, 7, Sfx_RegisterPhoneNumber_Ch7 + musicheader 1, 8, Sfx_RegisterPhoneNumber_Ch8 -Sfx_RegisterPhoneNumber_Ch5: ; f0dd3 +Sfx_RegisterPhoneNumber_Ch5: togglesfx tempo 124 volume $77 @@ -1086,12 +943,8 @@ Sfx_RegisterPhoneNumber_Ch5: ; f0dd3 note C_, 2 note __, 8 endchannel -; f0def - - - -Sfx_RegisterPhoneNumber_Ch6: ; f0df0 +Sfx_RegisterPhoneNumber_Ch6: togglesfx dutycycle $3 notetype $c, $c2 @@ -1112,12 +965,8 @@ Sfx_RegisterPhoneNumber_Ch6: ; f0df0 note G#, 2 note __, 8 endchannel -; f0e07 - - - -Sfx_RegisterPhoneNumber_Ch7: ; f0e08 +Sfx_RegisterPhoneNumber_Ch7: togglesfx notetype $c, $25 note __, 2 @@ -1135,12 +984,8 @@ Sfx_RegisterPhoneNumber_Ch7: ; f0e08 note G#, 2 note __, 8 endchannel -; f0e1b - - - -Sfx_RegisterPhoneNumber_Ch8: ; f0e1c +Sfx_RegisterPhoneNumber_Ch8: togglesfx sfxtogglenoise $4 notetype $c @@ -1148,18 +993,13 @@ Sfx_RegisterPhoneNumber_Ch8: ; f0e1c note __, 16 note __, 16 endchannel -; f0e25 +Sfx_3RdPlace: + musicheader 3, 5, Sfx_3RdPlace_Ch5 + musicheader 1, 6, Sfx_3RdPlace_Ch6 + musicheader 1, 7, Sfx_3RdPlace_Ch7 - - -Sfx_3RdPlace: ; f0e26 - dbw $84, Sfx_3RdPlace_Ch5 - dbw $05, Sfx_3RdPlace_Ch6 - dbw $06, Sfx_3RdPlace_Ch7 -; f0e2f - -Sfx_3RdPlace_Ch5: ; f0e2f +Sfx_3RdPlace_Ch5: togglesfx tempo 120 volume $77 @@ -1175,12 +1015,8 @@ Sfx_3RdPlace_Ch5: ; f0e2f note C_, 1 note D_, 6 endchannel -; f0e44 - - - -Sfx_3RdPlace_Ch6: ; f0e45 +Sfx_3RdPlace_Ch6: togglesfx dutycycle $2 notetype $c, $b4 @@ -1194,12 +1030,8 @@ Sfx_3RdPlace_Ch6: ; f0e45 note F_, 1 note G_, 6 endchannel -; f0e55 - - - -Sfx_3RdPlace_Ch7: ; f0e56 +Sfx_3RdPlace_Ch7: togglesfx notetype $c, $25 octave 3 @@ -1213,21 +1045,16 @@ Sfx_3RdPlace_Ch7: ; f0e56 note A_, 1 note B_, 6 endchannel -; f0e65 +Sfx_GetEggFromDayCareLady: +Sfx_GetEggFromDayCareMan: + musicheader 4, 5, Sfx_GetEggFromDayCareLady_Ch5 + musicheader 1, 6, Sfx_GetEggFromDayCareLady_Ch6 + musicheader 1, 7, Sfx_GetEggFromDayCareLady_Ch7 + musicheader 1, 8, Sfx_GetEggFromDayCareLady_Ch8 - - -Sfx_GetEggFromDaycareLady: ; f0e66 -Sfx_GetEggFromDaycareMan: ; f0e66 - dbw $c4, Sfx_GetEggFromDaycareLady_Ch5 - dbw $05, Sfx_GetEggFromDaycareLady_Ch6 - dbw $06, Sfx_GetEggFromDaycareLady_Ch7 - dbw $07, Sfx_GetEggFromDaycareLady_Ch8 -; f0e72 - -Sfx_GetEggFromDaycareLady_Ch5: ; f0e72 -Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 +Sfx_GetEggFromDayCareLady_Ch5: +Sfx_GetEggFromDayCareMan_Ch5: togglesfx tempo 120 volume $77 @@ -1256,13 +1083,9 @@ Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 note F_, 9 note __, 9 endchannel -; f0e9a - - - -Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b -Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b +Sfx_GetEggFromDayCareLady_Ch6: +Sfx_GetEggFromDayCareMan_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -1288,13 +1111,9 @@ Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b note A_, 9 note __, 9 endchannel -; f0ebd - - - -Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe -Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe +Sfx_GetEggFromDayCareLady_Ch7: +Sfx_GetEggFromDayCareMan_Ch7: togglesfx notetype $8, $25 note __, 2 @@ -1310,13 +1129,9 @@ Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe note A_, 9 note __, 9 endchannel -; f0ecf - - - -Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0 -Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0 +Sfx_GetEggFromDayCareLady_Ch8: +Sfx_GetEggFromDayCareMan_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -1325,19 +1140,14 @@ Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0 note __, 16 note __, 12 endchannel -; f0edb +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 - - -Sfx_MoveDeleted: ; f0edc - dbw $c4, Sfx_MoveDeleted_Ch5 - dbw $05, Sfx_MoveDeleted_Ch6 - dbw $06, Sfx_MoveDeleted_Ch7 - dbw $07, Sfx_MoveDeleted_Ch8 -; f0ee8 - -Sfx_MoveDeleted_Ch5: ; f0ee8 +Sfx_MoveDeleted_Ch5: togglesfx tempo 116 volume $77 @@ -1364,12 +1174,8 @@ Sfx_MoveDeleted_Ch5: ; f0ee8 note D_, 10 note __, 6 endchannel -; f0f0c - - - -Sfx_MoveDeleted_Ch6: ; f0f0d +Sfx_MoveDeleted_Ch6: togglesfx dutycycle $3 vibrato $c, $44 @@ -1402,12 +1208,8 @@ Sfx_MoveDeleted_Ch6: ; f0f0d note F_, 16 note __, 6 endchannel -; f0f36 - - - -Sfx_MoveDeleted_Ch7: ; f0f37 +Sfx_MoveDeleted_Ch7: togglesfx notetype $6, $25 octave 2 @@ -1431,12 +1233,8 @@ Sfx_MoveDeleted_Ch7: ; f0f37 note B_, 16 note __, 6 endchannel -; f0f52 - - - -Sfx_MoveDeleted_Ch8: ; f0f53 +Sfx_MoveDeleted_Ch8: togglesfx sfxtogglenoise $3 notetype $c @@ -1445,19 +1243,14 @@ Sfx_MoveDeleted_Ch8: ; f0f53 note __, 16 note __, 6 endchannel -; f0f5d +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 - - -Sfx_2ndPlace: ; f0f5e - dbw $c4, Sfx_2ndPlace_Ch5 - dbw $05, Sfx_2ndPlace_Ch6 - dbw $06, Sfx_2ndPlace_Ch7 - dbw $07, Sfx_2ndPlace_Ch8 -; f0f6a - -Sfx_2ndPlace_Ch5: ; f0f6a +Sfx_2ndPlace_Ch5: togglesfx tempo 116 volume $77 @@ -1488,12 +1281,8 @@ Sfx_2ndPlace_Ch5: ; f0f6a note B_, 12 note __, 6 endchannel -; f0f91 - - - -Sfx_2ndPlace_Ch6: ; f0f92 +Sfx_2ndPlace_Ch6: togglesfx dutycycle $2 notetype $8, $b1 @@ -1514,12 +1303,8 @@ Sfx_2ndPlace_Ch6: ; f0f92 note D_, 12 note __, 6 endchannel -; f0fac - - - -Sfx_2ndPlace_Ch7: ; f0fad +Sfx_2ndPlace_Ch7: togglesfx notetype $8, $25 octave 3 @@ -1554,36 +1339,27 @@ Sfx_2ndPlace_Ch7: ; f0fad note G_, 12 note __, 6 endchannel -; f0fd1 - - - -Sfx_2ndPlace_Ch8: ; f0fd2 +Sfx_2ndPlace_Ch8: togglesfx sfxtogglenoise $3 notetype $8 -Sfx_2ndPlace_branch_f0fd7: ; f0fd7 +.loop note C#, 1 - loopchannel 6, Sfx_2ndPlace_branch_f0fd7 + loopchannel 6, .loop note B_, 12 note B_, 12 note B_, 12 note __, 6 endchannel -; f0fe1 +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 - - -Sfx_1stPlace: ; f0fe2 - dbw $c4, Sfx_1stPlace_Ch5 - dbw $05, Sfx_1stPlace_Ch6 - dbw $06, Sfx_1stPlace_Ch7 - dbw $07, Sfx_1stPlace_Ch8 -; f0fee - -Sfx_1stPlace_Ch5: ; f0fee +Sfx_1stPlace_Ch5: togglesfx tempo 124 volume $77 @@ -1621,12 +1397,8 @@ Sfx_1stPlace_Ch5: ; f0fee note A_, 10 note __, 6 endchannel -; f101f - - - -Sfx_1stPlace_Ch6: ; f1020 +Sfx_1stPlace_Ch6: togglesfx dutycycle $3 vibrato $c, $34 @@ -1647,12 +1419,8 @@ Sfx_1stPlace_Ch6: ; f1020 note D_, 10 note __, 6 endchannel -; f103c - - - -Sfx_1stPlace_Ch7: ; f103d +Sfx_1stPlace_Ch7: togglesfx notetype $c, $25 octave 2 @@ -1673,12 +1441,8 @@ Sfx_1stPlace_Ch7: ; f103d note D_, 10 note __, 6 endchannel -; f1053 - - - -Sfx_1stPlace_Ch8: ; f1054 +Sfx_1stPlace_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1696,19 +1460,14 @@ Sfx_1stPlace_Ch8: ; f1054 note B_, 10 note __, 6 endchannel -; f1068 +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 - - -Sfx_ChooseACard: ; f1069 - dbw $c4, Sfx_ChooseACard_Ch5 - dbw $05, Sfx_ChooseACard_Ch6 - dbw $06, Sfx_ChooseACard_Ch7 - dbw $07, Sfx_ChooseACard_Ch8 -; f1075 - -Sfx_ChooseACard_Ch5: ; f1075 +Sfx_ChooseACard_Ch5: togglesfx tempo 152 volume $77 @@ -1751,12 +1510,8 @@ Sfx_ChooseACard_Ch5: ; f1075 note E_, 4 note __, 12 endchannel -; f10a8 - - - -Sfx_ChooseACard_Ch6: ; f10a9 +Sfx_ChooseACard_Ch6: togglesfx dutycycle $3 notetype $6, $b4 @@ -1785,12 +1540,8 @@ Sfx_ChooseACard_Ch6: ; f10a9 note A_, 4 note __, 12 endchannel -; f10c8 - - - -Sfx_ChooseACard_Ch7: ; f10c9 +Sfx_ChooseACard_Ch7: togglesfx notetype $6, $25 octave 3 @@ -1823,12 +1574,8 @@ Sfx_ChooseACard_Ch7: ; f10c9 note A_, 4 note __, 12 endchannel -; f10eb - - - -Sfx_ChooseACard_Ch8: ; f10ec +Sfx_ChooseACard_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1850,19 +1597,14 @@ Sfx_ChooseACard_Ch8: ; f10ec note D_, 2 note B_, 16 endchannel -; f1103 +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 - - -Sfx_GetTm: ; f1104 - dbw $c4, Sfx_GetTm_Ch5 - dbw $05, Sfx_GetTm_Ch6 - dbw $06, Sfx_GetTm_Ch7 - dbw $07, Sfx_GetTm_Ch8 -; f1110 - -Sfx_GetTm_Ch5: ; f1110 +Sfx_GetTm_Ch5: togglesfx tempo 144 volume $77 @@ -1885,12 +1627,8 @@ Sfx_GetTm_Ch5: ; f1110 note F#, 8 note __, 6 endchannel -; f1130 - - - -Sfx_GetTm_Ch6: ; f1131 +Sfx_GetTm_Ch6: togglesfx dutycycle $3 vibrato $8, $24 @@ -1910,12 +1648,8 @@ Sfx_GetTm_Ch6: ; f1131 note D_, 8 note __, 6 endchannel -; f114b - - - -Sfx_GetTm_Ch7: ; f114c +Sfx_GetTm_Ch7: togglesfx notetype $6, $25 octave 2 @@ -1943,12 +1677,8 @@ Sfx_GetTm_Ch7: ; f114c note A_, 16 note __, 6 endchannel -; f1169 - - - -Sfx_GetTm_Ch8: ; f116a +Sfx_GetTm_Ch8: togglesfx sfxtogglenoise $4 notetype $6 @@ -1965,19 +1695,14 @@ Sfx_GetTm_Ch8: ; f116a note B_, 16 note __, 6 endchannel -; f117c +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 - - -Sfx_GetBadge: ; f117d - dbw $c4, Sfx_GetBadge_Ch5 - dbw $05, Sfx_GetBadge_Ch6 - dbw $06, Sfx_GetBadge_Ch7 - dbw $07, Sfx_GetBadge_Ch8 -; f1189 - -Sfx_GetBadge_Ch5: ; f1189 +Sfx_GetBadge_Ch5: togglesfx tempo 120 volume $77 @@ -1988,19 +1713,15 @@ Sfx_GetBadge_Ch5: ; f1189 note F_, 3 callchannel Sfx_GetBadge_branch_f11aa note A#, 3 - forceoctave $2 + pitchoffset 0, D_ callchannel Sfx_GetBadge_branch_f11aa - forceoctave $0 + pitchoffset 0, C_ intensity $a7 note A_, 16 note __, 6 endchannel -; f11a9 - - - -Sfx_GetBadge_branch_f11aa: ; f11aa +Sfx_GetBadge_branch_f11aa: note __, 5 octave 3 note F_, 2 @@ -2021,9 +1742,8 @@ Sfx_GetBadge_branch_f11aa: ; f11aa note C#, 2 note F_, 2 endchannel -; f11be -Sfx_GetBadge_Ch6: ; f11be +Sfx_GetBadge_Ch6: togglesfx dutycycle $3 vibrato $8, $24 @@ -2069,12 +1789,8 @@ Sfx_GetBadge_Ch6: ; f11be note F_, 16 note __, 6 endchannel -; f11f4 - - - -Sfx_GetBadge_Ch7: ; f11f5 +Sfx_GetBadge_Ch7: togglesfx notetype $6, $25 octave 2 @@ -2110,16 +1826,12 @@ Sfx_GetBadge_Ch7: ; f11f5 note F_, 16 note __, 6 endchannel -; f121a - - - -Sfx_GetBadge_Ch8: ; f121b +Sfx_GetBadge_Ch8: togglesfx sfxtogglenoise $4 notetype $6 -Sfx_GetBadge_branch_f1220: ; f1220 +.loop note B_, 12 note D_, 1 note D_, 1 @@ -2134,23 +1846,18 @@ Sfx_GetBadge_branch_f1220: ; f1220 note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, Sfx_GetBadge_branch_f1220 + loopchannel 2, .loop note B_, 16 note __, 6 endchannel -; f1235 +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 - - -Sfx_QuitSlots: ; f1236 - dbw $c4, Sfx_QuitSlots_Ch5 - dbw $05, Sfx_QuitSlots_Ch6 - dbw $06, Sfx_QuitSlots_Ch7 - dbw $07, Sfx_QuitSlots_Ch8 -; f1242 - -Sfx_QuitSlots_Ch5: ; f1242 +Sfx_QuitSlots_Ch5: togglesfx tempo 144 volume $77 @@ -2179,12 +1886,8 @@ Sfx_QuitSlots_Ch5: ; f1242 note G#, 14 note __, 6 endchannel -; f1265 - - - -Sfx_QuitSlots_Ch6: ; f1266 +Sfx_QuitSlots_Ch6: togglesfx dutycycle $2 notetype $8, $b3 @@ -2208,12 +1911,8 @@ Sfx_QuitSlots_Ch6: ; f1266 note F_, 14 note __, 6 endchannel -; f1282 - - - -Sfx_QuitSlots_Ch7: ; f1283 +Sfx_QuitSlots_Ch7: togglesfx notetype $8, $25 octave 3 @@ -2241,12 +1940,8 @@ Sfx_QuitSlots_Ch7: ; f1283 note C#, 14 note __, 6 endchannel -; f12a0 - - - -Sfx_QuitSlots_Ch8: ; f12a1 +Sfx_QuitSlots_Ch8: togglesfx sfxtogglenoise $3 notetype $8 @@ -2263,21 +1958,16 @@ Sfx_QuitSlots_Ch8: ; f12a1 note B_, 14 note __, 6 endchannel -; f12b3 +Sfx_Protect: + musicheader 2, 5, Sfx_Protect_Ch5 + musicheader 1, 8, Sfx_Protect_Ch8 - - -Sfx_Protect: ; f12b4 - dbw $44, Sfx_Protect_Ch5 - dbw $07, Sfx_Protect_Ch8 -; f12ba - -Sfx_Protect_Ch5: ; f12ba +Sfx_Protect_Ch5: togglesfx notetype $1, $f1 dutycycle $0 -Sfx_Protect_branch_f12c0: ; f12c0 +.loop octave 5 note F_, 5 note A_, 5 @@ -2290,7 +1980,7 @@ Sfx_Protect_branch_f12c0: ; f12c0 octave 6 note C#, 5 note E_, 5 - loopchannel 3, Sfx_Protect_branch_f12c0 + loopchannel 3, .loop intensity $c1 octave 5 note F_, 5 @@ -2308,144 +1998,120 @@ Sfx_Protect_branch_f12c0: ; f12c0 note C#, 5 note E_, 5 endchannel -; f12e5 -Sfx_Protect_Ch8: ; f12e5 -Sfx_Protect_branch_f12e5: ; f12e5 - noise $9, $9e, $0 - noise $9, $be, $11 - loopchannel 6, Sfx_Protect_branch_f12e5 - noise $9, $a7, $0 - noise $10, $75, $11 +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 -; f12f6 -Sfx_Sketch: ; f12f6 - dbw $04, Sfx_Sketch_Ch5 -; f12f9 +Sfx_Sketch: + musicheader 1, 5, Sfx_Sketch_Ch5 -Sfx_Sketch_Ch5: ; f12f9 +Sfx_Sketch_Ch5: dutycycle $1 soundinput $a5 -Sfx_Sketch_branch_f12fd: ; f12fd - sound $2, $f1, $06e0 - sound $d, $af, $05b0 - sound $4, $0, $0000 - sound $9, $f4, $0718 - loopchannel 3, Sfx_Sketch_branch_f12fd +.loop + sound __, 3, $f1, $06e0 + sound __, 14, $af, $05b0 + sound __, 5, $0, 0 + sound __, 10, $f4, $0718 + loopchannel 3, .loop soundinput $8 endchannel -; f1314 -Sfx_RainDance: ; f1314 - dbw $07, Sfx_RainDance_Ch8 -; f1317 +Sfx_RainDance: + musicheader 1, 8, Sfx_RainDance_Ch8 -Sfx_RainDance_Ch8: ; f1317 -Sfx_RainDance_branch_f1317: ; f1317 - noise $b, $7d, $50 - noise $6, $7d, $4f - noise $b, $7f, $47 - noise $f, $6e, $22 - loopchannel 3, Sfx_RainDance_branch_f1317 - noise $6, $6d, $50 - noise $5, $5d, $4f - noise $5, $4f, $47 - noise $a, $32, $46 +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 -; f1334 -Sfx_Aeroblast: ; f1334 - dbw $44, Sfx_Aeroblast_Ch5 - dbw $07, Sfx_Aeroblast_Ch8 -; f133a +Sfx_Aeroblast: + musicheader 2, 5, Sfx_Aeroblast_Ch5 + musicheader 1, 8, Sfx_Aeroblast_Ch8 -Sfx_Aeroblast_Ch5: ; f133a - unknownmusic0xde $f2 +Sfx_Aeroblast_Ch5: + sound_duty 2, 0, 3, 3 soundinput $f5 - sound $1c, $f8, $0580 + sound C_, 13, $f8, $0580 soundinput $8 endchannel -; f1345 -Sfx_Aeroblast_Ch8: ; f1345 - noise $4, $f8, $6c - noise $4, $c8, $5c - noise $4, $78, $5b - noise $10, $31, $5a +Sfx_Aeroblast_Ch8: + noise __, 5, $f8, $6c + noise __, 5, $c8, $5c + noise __, 5, $78, $5b + noise C_, 1, $31, $5a endchannel -; f1352 -Sfx_Spark: ; f1352 - dbw $07, Sfx_Spark_Ch8 -; f1355 +Sfx_Spark: + musicheader 1, 8, Sfx_Spark_Ch8 -Sfx_Spark_Ch8: ; f1355 -Sfx_Spark_branch_f1355: ; f1355 - noise $4, $f8, $5d - noise $4, $d8, $6f - loopchannel 2, Sfx_Spark_branch_f1355 +Sfx_Spark_Ch8: + noise __, 5, $f8, $5d + noise __, 5, $d8, $6f + loopchannel 2, Sfx_Spark_Ch8 endchannel -; f1360 -Sfx_Curse: ; f1360 - dbw $44, Sfx_Curse_Ch5 - dbw $07, Sfx_Curse_Ch8 -; f1366 +Sfx_Curse: + musicheader 2, 5, Sfx_Curse_Ch5 + musicheader 1, 8, Sfx_Curse_Ch8 -Sfx_Curse_Ch5: ; f1366 +Sfx_Curse_Ch5: dutycycle $3 - sound $4, $f2, $0483 - sound $4, $f2, $0511 - sound $4, $f2, $0589 - sound $4, $f2, $05ed + sound __, 5, $f2, $0483 + sound __, 5, $f2, $0511 + sound __, 5, $f2, $0589 + sound __, 5, $f2, $05ed endchannel -; f1379 -Sfx_Curse_Ch8: ; f1379 - noise $14, $9a, $9 +Sfx_Curse_Ch8: + noise C_, 5, $9a, $9 endchannel -; f137d -Sfx_Rage: ; f137d - dbw $44, Sfx_Rage_Ch5 - dbw $07, Sfx_Rage_Ch8 -; f1383 +Sfx_Rage: + musicheader 2, 5, Sfx_Rage_Ch5 + musicheader 1, 8, Sfx_Rage_Ch8 -Sfx_Rage_Ch5: ; f1383 +Sfx_Rage_Ch5: dutycycle $0 - sound $3, $d1, $07b0 - sound $3, $d1, $07c2 - sound $18, $d2, $07d5 + sound __, 4, $d1, $07b0 + sound __, 4, $d1, $07c2 + sound C_, 9, $d2, $07d5 endchannel -; f1392 -Sfx_Rage_Ch8: ; f1392 - noise $3, $f4, $1a - noise $3, $f4, $19 - noise $18, $f2, $18 +Sfx_Rage_Ch8: + noise __, 4, $f4, $1a + noise __, 4, $f4, $19 + noise C_, 9, $f2, $18 endchannel -; f139c -Sfx_Thief: ; f139c - dbw $07, Sfx_Thief_Ch8 -; f139f +Sfx_Thief: + musicheader 1, 8, Sfx_Thief_Ch8 -Sfx_Thief_Ch8: ; f139f -Sfx_Thief_branch_f139f: ; f139f - noise $0, $0, $0 - noise $4, $e1, $12 - noise $0, $0, $0 - noise $2, $b1, $22 - loopchannel 2, Sfx_Thief_branch_f139f +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 -; f13b0 -Sfx_Thief2: ; f13b0 - dbw $04, Sfx_Thief2_Ch5 -; f13b3 +Sfx_Thief2: + musicheader 1, 5, Sfx_Thief2_Ch5 -Sfx_Thief2_Ch5: ; f13b3 +Sfx_Thief2_Ch5: togglesfx notetype $2, $f4 dutycycle $0 @@ -2463,38 +2129,33 @@ Sfx_Thief2_Ch5: ; f13b3 note A_, 3 togglesfx endchannel -; f13ca -Sfx_SpiderWeb: ; f13ca - dbw $44, Sfx_SpiderWeb_Ch5 - dbw $07, Sfx_SpiderWeb_Ch8 -; f13d0 +Sfx_SpiderWeb: + musicheader 2, 5, Sfx_SpiderWeb_Ch5 + musicheader 1, 8, Sfx_SpiderWeb_Ch8 -Sfx_SpiderWeb_Ch5: ; f13d0 +Sfx_SpiderWeb_Ch5: dutycycle $0 - sound $20, $7f, $0720 + sound C#, 1, $7f, $0720 soundinput $95 - sound $4, $f8, $0620 - sound $4, $e8, $0630 - sound $4, $d8, $0640 - sound $4, $95, $0620 - sound $4, $73, $0630 - sound $4, $51, $0640 + sound __, 5, $f8, $0620 + sound __, 5, $e8, $0630 + sound __, 5, $d8, $0640 + sound __, 5, $95, $0620 + sound __, 5, $73, $0630 + sound __, 5, $51, $0640 soundinput $8 endchannel -; f13f3 -Sfx_SpiderWeb_Ch8: ; f13f3 - noise $20, $ef, $0 +Sfx_SpiderWeb_Ch8: + noise C#, 1, $ef, $0 endchannel -; f13f7 -Sfx_MindReader: ; f13f7 - dbw $44, Sfx_MindReader_Ch5 - dbw $07, Sfx_MindReader_Ch8 -; f13fd +Sfx_MindReader: + musicheader 2, 5, Sfx_MindReader_Ch5 + musicheader 1, 8, Sfx_MindReader_Ch8 -Sfx_MindReader_Ch5: ; f13fd +Sfx_MindReader_Ch5: togglesfx dutycycle $2 notetype $2, $f1 @@ -2512,158 +2173,137 @@ Sfx_MindReader_Ch5: ; f13fd note D_, 3 togglesfx endchannel -; f1416 -Sfx_MindReader_Ch8: ; f1416 - noise $11, $af, $19 - noise $12, $af, $18 +Sfx_MindReader_Ch8: + noise C_, 2, $af, $19 + noise C_, 3, $af, $18 endchannel -; f141d -Sfx_Nightmare: ; f141d - dbw $04, Sfx_Nightmare_Ch5 -; f1420 +Sfx_Nightmare: + musicheader 1, 5, Sfx_Nightmare_Ch5 -Sfx_Nightmare_Ch5: ; f1420 +Sfx_Nightmare_Ch5: dutycycle $0 soundinput $34 -Sfx_Nightmare_branch_f1424: ; f1424 - sound $3, $ba, $0631 - sound $2, $0, $0000 - sound $3, $f8, $0621 - sound $2, $0, $0000 - sound $3, $f8, $0611 - sound $2, $0, $0000 - sound $3, $e8, $0601 - sound $2, $0, $0000 - sound $3, $e8, $05f1 - sound $2, $0, $0000 - loopchannel 2, Sfx_Nightmare_branch_f1424 +.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 -; f1453 -Sfx_Snore: ; f1453 - dbw $07, Sfx_Snore_Ch8 -; f1456 +Sfx_Snore: + musicheader 1, 8, Sfx_Snore_Ch8 -Sfx_Snore_Ch8: ; f1456 - noise $2, $ea, $4b - noise $2, $ea, $5b - noise $2, $0, $0 - noise $4, $ee, $47 - noise $4, $ee, $46 - noise $4, $ee, $45 +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 -; f1469 -Sfx_SweetKiss: ; f1469 - dbw $04, Sfx_SweetKiss_Ch5 -; f146c +Sfx_SweetKiss: + musicheader 1, 5, Sfx_SweetKiss_Ch5 -Sfx_SweetKiss_Ch5: ; f146c +Sfx_SweetKiss_Ch5: dutycycle $2 -Sfx_SweetKiss_branch_f146e: ; f146e - sound $2, $c1, $07c8 - sound $2, $d1, $07da - loopchannel 2, Sfx_SweetKiss_branch_f146e - sound $1a, $f1, $07e2 +.loop + sound __, 3, $c1, $07c8 + sound __, 3, $d1, $07da + loopchannel 2, .loop + sound C_, 11, $f1, $07e2 endchannel -; f147f -Sfx_SweetKiss2: ; f147f - dbw $04, Sfx_SweetKiss2_Ch5 -; f1482 +Sfx_SweetKiss2: + musicheader 1, 5, Sfx_SweetKiss2_Ch5 -Sfx_SweetKiss2_Ch5: ; f1482 +Sfx_SweetKiss2_Ch5: dutycycle $0 soundinput $97 - sound $2, $f4, $0772 - sound $4, $0, $0000 - sound $2, $c4, $0772 - sound $4, $0, $0000 - sound $2, $b4, $0772 - sound $4, $0, $0000 - sound $2, $a1, $0772 + sound __, 3, $f4, $0772 + sound __, 5, $0, 0 + sound __, 3, $c4, $0772 + sound __, 5, $0, 0 + sound __, 3, $b4, $0772 + sound __, 5, $0, 0 + sound __, 3, $a1, $0772 soundinput $8 endchannel -; f14a5 -Sfx_BellyDrum: ; f14a5 - dbw $44, Sfx_BellyDrum_Ch5 - dbw $07, Sfx_BellyDrum_Ch8 -; f14ab +Sfx_BellyDrum: + musicheader 2, 5, Sfx_BellyDrum_Ch5 + musicheader 1, 8, Sfx_BellyDrum_Ch8 -Sfx_BellyDrum_Ch5: ; f14ab +Sfx_BellyDrum_Ch5: dutycycle $2 soundinput $ac - sound $c, $f1, $05a3 + sound __, 13, $f1, $05a3 soundinput $8 endchannel -; f14b6 -Sfx_BellyDrum_Ch8: ; f14b6 - noise $c, $b1, $6c +Sfx_BellyDrum_Ch8: + noise __, 13, $b1, $6c endchannel -; f14ba -Sfx_Unknown7F: ; f14ba - dbw $04, Sfx_Unknown7F_Ch5 -; f14bd +Sfx_Unknown7F: + musicheader 1, 5, Sfx_Unknown7F_Ch5 -Sfx_Unknown7F_Ch5: ; f14bd +Sfx_Unknown7F_Ch5: dutycycle $2 soundinput $95 - sound $2, $c9, $03b3 - sound $5, $f8, $0463 - sound $4, $d1, $0543 + sound __, 3, $c9, $03b3 + sound __, 6, $f8, $0463 + sound __, 5, $d1, $0543 soundinput $8 endchannel -; f14d0 -Sfx_SludgeBomb: ; f14d0 - dbw $44, Sfx_SludgeBomb_Ch5 - dbw $07, Sfx_SludgeBomb_Ch8 -; f14d6 +Sfx_SludgeBomb: + musicheader 2, 5, Sfx_SludgeBomb_Ch5 + musicheader 1, 8, Sfx_SludgeBomb_Ch8 -Sfx_SludgeBomb_Ch5: ; f14d6 +Sfx_SludgeBomb_Ch5: dutycycle $2 soundinput $c5 - sound $3, $f8, $0581 - sound $1, $0, $0000 + sound __, 4, $f8, $0581 + sound __, 2, $0, 0 soundinput $cb - sound $10, $f2, $05d1 + sound C_, 1, $f2, $05d1 soundinput $8 endchannel -; f14eb -Sfx_SludgeBomb_Ch8: ; f14eb - noise $3, $e2, $6e - noise $1, $0, $0 - noise $10, $e2, $6d +Sfx_SludgeBomb_Ch8: + noise __, 4, $e2, $6e + noise __, 2, $0, $0 + noise C_, 1, $e2, $6d endchannel -; f14f5 -Sfx_Foresight: ; f14f5 - dbw $04, Sfx_Foresight_Ch5 -; f14f8 +Sfx_Foresight: + musicheader 1, 5, Sfx_Foresight_Ch5 -Sfx_Foresight_Ch5: ; f14f8 - sound $3, $f4, $07b5 - sound $3, $f5, $07c8 - sound $8, $f4, $07da - sound $2, $0, $0000 - sound $8, $c1, $07da - sound $2, $0, $0000 - sound $8, $91, $07da +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 -; f1515 -Sfx_Spite: ; f1515 - dbw $04, Sfx_Spite_Ch5 -; f1518 +Sfx_Spite: + musicheader 1, 5, Sfx_Spite_Ch5 -Sfx_Spite_Ch5: ; f1518 +Sfx_Spite_Ch5: togglesfx vibrato $0, $12 dutycycle $3 @@ -2688,27 +2328,23 @@ Sfx_Spite_Ch5: ; f1518 soundinput $8 togglesfx endchannel -; f153a -Sfx_Outrage: ; f153a - dbw $07, Sfx_Outrage_Ch8 -; f153d +Sfx_Outrage: + musicheader 1, 8, Sfx_Outrage_Ch8 -Sfx_Outrage_Ch8: ; f153d - noise $b, $ea, $6c - noise $b, $ea, $6b - noise $b, $ea, $6a - noise $b, $ea, $69 - noise $b, $e1, $59 +Sfx_Outrage_Ch8: + noise __, 12, $ea, $6c + noise __, 12, $ea, $6b + noise __, 12, $ea, $6a + noise __, 12, $ea, $69 + noise __, 12, $e1, $59 endchannel -; f154d -Sfx_PerishSong: ; f154d - dbw $44, Sfx_PerishSong_Ch5 - dbw $05, Sfx_PerishSong_Ch6 -; f1553 +Sfx_PerishSong: + musicheader 2, 5, Sfx_PerishSong_Ch5 + musicheader 1, 6, Sfx_PerishSong_Ch6 -Sfx_PerishSong_Ch5: ; f1553 +Sfx_PerishSong_Ch5: togglesfx dutycycle $0 vibrato $12, $53 @@ -2718,9 +2354,8 @@ Sfx_PerishSong_Ch5: ; f1553 note G#, 9 togglesfx endchannel -; f1561 -Sfx_PerishSong_Ch6: ; f1561 +Sfx_PerishSong_Ch6: togglesfx dutycycle $0 vibrato $12, $53 @@ -2731,298 +2366,260 @@ Sfx_PerishSong_Ch6: ; f1561 note B_, 9 togglesfx endchannel -; f1570 -Sfx_GigaDrain: ; f1570 - dbw $44, Sfx_GigaDrain_Ch5 - dbw $07, Sfx_GigaDrain_Ch8 -; f1576 +Sfx_GigaDrain: + musicheader 2, 5, Sfx_GigaDrain_Ch5 + musicheader 1, 8, Sfx_GigaDrain_Ch8 -Sfx_GigaDrain_Ch5: ; f1576 +Sfx_GigaDrain_Ch5: dutycycle $2 soundinput $97 - sound $4, $f8, $0680 - sound $14, $f8, $0680 - sound $14, $c8, $0660 - sound $14, $a8, $0670 - sound $14, $88, $0680 - sound $14, $f8, $0561 - sound $14, $c8, $0541 - sound $14, $a8, $0521 - sound $14, $88, $0511 + sound __, 5, $f8, $0680 + sound C_, 5, $f8, $0680 + sound C_, 5, $c8, $0660 + sound C_, 5, $a8, $0670 + sound C_, 5, $88, $0680 + sound C_, 5, $f8, $0561 + sound C_, 5, $c8, $0541 + sound C_, 5, $a8, $0521 + sound C_, 5, $88, $0511 soundinput $8 endchannel -; f15a1 -Sfx_GigaDrain_Ch8: ; f15a1 - noise $4, $c8, $44 - noise $14, $c8, $50 - noise $14, $c8, $52 - noise $14, $c8, $54 - noise $14, $c8, $56 - noise $40, $c7, $57 +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 -; f15b4 -Sfx_Attract: ; f15b4 - dbw $04, Sfx_Attract_Ch5 -; f15b7 +Sfx_Attract: + musicheader 1, 5, Sfx_Attract_Ch5 -Sfx_Attract_Ch5: ; f15b7 +Sfx_Attract_Ch5: dutycycle $0 soundinput $77 - sound $4, $a9, $06f0 - sound $c, $f8, $0720 + sound __, 5, $a9, $06f0 + sound __, 13, $f8, $0720 soundinput $7f - sound $8, $f1, $0740 + sound __, 9, $f1, $0740 soundinput $8 endchannel -; f15cc -Sfx_Kinesis2: ; f15cc - dbw $04, Sfx_Kinesis2_Ch5 -; f15cf +Sfx_Kinesis2: + musicheader 1, 5, Sfx_Kinesis2_Ch5 -Sfx_Kinesis2_Ch5: ; f15cf +Sfx_Kinesis2_Ch5: dutycycle $0 - sound $2, $f3, $0796 - sound $2, $23, $0796 - sound $14, $f1, $07c4 + sound __, 3, $f3, $0796 + sound __, 3, $23, $0796 + sound C_, 5, $f1, $07c4 endchannel -; f15de -Sfx_ZapCannon: ; f15de - dbw $07, Sfx_ZapCannon_Ch8 -; f15e1 +Sfx_ZapCannon: + musicheader 1, 8, Sfx_ZapCannon_Ch8 -Sfx_ZapCannon_Ch8: ; f15e1 -Sfx_ZapCannon_branch_f15e1: ; f15e1 - noise $2, $e1, $49 - noise $0, $0, $0 - loopchannel 8, Sfx_ZapCannon_branch_f15e1 - noise $8, $e1, $49 +Sfx_ZapCannon_Ch8: + noise __, 3, $e1, $49 + noise __, 1, $0, $0 + loopchannel 8, Sfx_ZapCannon_Ch8 + noise __, 9, $e1, $49 endchannel -; f15ef -Sfx_MeanLook: ; f15ef - dbw $04, Sfx_MeanLook_Ch5 -; f15f2 +Sfx_MeanLook: + musicheader 1, 5, Sfx_MeanLook_Ch5 -Sfx_MeanLook_Ch5: ; f15f2 +Sfx_MeanLook_Ch5: soundinput $77 dutycycle $3 - sound $2, $f8, $0720 -Sfx_MeanLook_branch_f15fa: ; f15fa - sound $1, $88, $0660 - sound $2, $f8, $0790 - loopchannel 5, Sfx_MeanLook_branch_f15fa - sound $c, $f8, $0700 - sound $c, $c8, $0720 - sound $c, $a8, $0700 - sound $c, $78, $0720 - sound $c, $48, $0700 - sound $c, $28, $0720 + 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 -; f1621 -Sfx_HealBell: ; f1621 - dbw $04, Sfx_HealBell_Ch5 -; f1624 +Sfx_HealBell: + musicheader 1, 5, Sfx_HealBell_Ch5 -Sfx_HealBell_Ch5: ; f1624 +Sfx_HealBell_Ch5: dutycycle $1 - sound $1, $f1, $07da - sound $1, $d1, $07d9 - sound $1, $f1, $07da - sound $8, $d1, $07db + sound __, 2, $f1, $07da + sound __, 2, $d1, $07d9 + sound __, 2, $f1, $07da + sound __, 9, $d1, $07db endchannel -; f1637 -Sfx_Return: ; f1637 - dbw $04, Sfx_Return_Ch5 -; f163a +Sfx_Return: + musicheader 1, 5, Sfx_Return_Ch5 -Sfx_Return_Ch5: ; f163a +Sfx_Return_Ch5: dutycycle $0 -Sfx_Return_branch_f163c: ; f163c +.loop soundinput $bf - sound $8, $f1, $0759 + sound __, 9, $f1, $0759 soundinput $57 - sound $8, $f1, $0759 - sound $10, $0, $0000 - loopchannel 2, Sfx_Return_branch_f163c + sound __, 9, $f1, $0759 + sound C_, 1, $0, 0 + loopchannel 2, .loop soundinput $8 endchannel -; f1653 -Sfx_ExpBar: ; f1653 - dbw $04, Sfx_ExpBar_Ch5 -; f1656 +Sfx_ExpBar: + musicheader 1, 5, Sfx_ExpBar_Ch5 -Sfx_ExpBar_Ch5: ; f1656 +Sfx_ExpBar_Ch5: dutycycle $2 soundinput $d7 - sound $8, $e1, $0750 + sound __, 9, $e1, $0750 soundinput $e7 - sound $8, $48, $06e0 - sound $8, $58, $06f8 - sound $8, $68, $0710 - sound $8, $78, $0728 - sound $8, $88, $0740 - sound $8, $98, $0758 - sound $10, $a8, $0770 + sound __, 9, $48, $06e0 + sound __, 9, $58, $06f8 + sound __, 9, $68, $0710 + sound __, 9, $78, $0728 + sound __, 9, $88, $0740 + sound __, 9, $98, $0758 + sound C_, 1, $a8, $0770 soundinput $8 endchannel -; f167f -Sfx_MilkDrink: ; f167f - dbw $04, Sfx_MilkDrink_Ch5 -; f1682 +Sfx_MilkDrink: + musicheader 1, 5, Sfx_MilkDrink_Ch5 -Sfx_MilkDrink_Ch5: ; f1682 +Sfx_MilkDrink_Ch5: dutycycle $2 -Sfx_MilkDrink_branch_f1684: ; f1684 +.loop soundinput $a4 - sound $2, $ea, $04e0 - sound $d, $f7, $0290 + sound __, 3, $ea, $04e0 + sound __, 14, $f7, $0290 soundinput $9e - sound $4, $c9, $05e1 - sound $2, $0, $0000 - loopchannel 6, Sfx_MilkDrink_branch_f1684 + sound __, 5, $c9, $05e1 + sound __, 3, $0, 0 + loopchannel 6, .loop soundinput $8 endchannel -; f169f -Sfx_Present: ; f169f - dbw $04, Sfx_Present_Ch5 -; f16a2 +Sfx_Present: + musicheader 1, 5, Sfx_Present_Ch5 -Sfx_Present_Ch5: ; f16a2 +Sfx_Present_Ch5: dutycycle $2 soundinput $d6 -Sfx_Present_branch_f16a6: ; f16a6 - sound $2, $f1, $0740 - sound $1, $0, $0000 - loopchannel 3, Sfx_Present_branch_f16a6 - sound $10, $f1, $0780 +.loop + sound __, 3, $f1, $0740 + sound __, 2, $0, 0 + loopchannel 3, .loop + sound C_, 1, $f1, $0780 soundinput $8 endchannel -; f16b9 -Sfx_MorningSun: ; f16b9 - dbw $04, Sfx_MorningSun_Ch5 -; f16bc +Sfx_MorningSun: + musicheader 1, 5, Sfx_MorningSun_Ch5 -Sfx_MorningSun_Ch5: ; f16bc +Sfx_MorningSun_Ch5: dutycycle $3 -Sfx_MorningSun_branch_f16be: ; f16be - sound $2, $f1, $07e4 - sound $2, $f1, $07e0 - sound $5, $f2, $07e7 - loopchannel 3, Sfx_MorningSun_branch_f16be - sound $1, $0, $0000 - sound $8, $c2, $07e7 - sound $1, $0, $0000 - sound $8, $82, $07e7 +.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 -; f16df -Sfx_Moonlight: ; f16df - dbw $04, Sfx_Moonlight_Ch5 -; f16e2 +Sfx_Moonlight: + musicheader 1, 5, Sfx_Moonlight_Ch5 -Sfx_Moonlight_Ch5: ; f16e2 +Sfx_Moonlight_Ch5: dutycycle $2 -Sfx_Moonlight_branch_f16e4: ; f16e4 - sound $1, $f8, $07d0 - sound $4, $f1, $07e0 - loopchannel 2, Sfx_Moonlight_branch_f16e4 - sound $10, $f1, $07e0 - sound $10, $d1, $07e0 - sound $10, $81, $07e0 +.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 -; f16fd -Sfx_Encore: ; f16fd - dbw $44, Sfx_Encore_Ch5 - dbw $07, Sfx_Encore_Ch8 -; f1703 +Sfx_Encore: + musicheader 2, 5, Sfx_Encore_Ch5 + musicheader 1, 8, Sfx_Encore_Ch8 -Sfx_Encore_Ch5: ; f1703 +Sfx_Encore_Ch5: dutycycle $2 soundinput $ce - sound $10, $0, $0000 -Sfx_Encore_branch_f170b: ; f170b - sound $2, $f8, $0774 - sound $24, $0, $0000 - loopchannel 2, Sfx_Encore_branch_f170b + sound C_, 1, $0, 0 +.loop + sound __, 3, $f8, $0774 + sound C#, 5, $0, 0 + loopchannel 2, .loop soundinput $8 endchannel -; f171a -Sfx_Encore_Ch8: ; f171a - noise $30, $1f, $36 - noise $30, $76, $36 +Sfx_Encore_Ch8: + noise D_, 1, $1f, $36 + noise D_, 1, $76, $36 endchannel -; f1721 -Sfx_BeatUp: ; f1721 - dbw $07, Sfx_BeatUp_Ch8 -; f1724 +Sfx_BeatUp: + musicheader 1, 8, Sfx_BeatUp_Ch8 -Sfx_BeatUp_Ch8: ; f1724 - noise $2, $e8, $69 - noise $6, $d8, $24 - noise $2, $e8, $6c - noise $4, $c8, $46 - noise $6, $d1, $24 +Sfx_BeatUp_Ch8: + noise __, 3, $e8, $69 + noise __, 7, $d8, $24 + noise __, 3, $e8, $6c + noise __, 5, $c8, $46 + noise __, 7, $d1, $24 endchannel -; f1734 -Sfx_SweetScent: ; f1734 - dbw $04, Sfx_SweetScent_Ch5 -; f1737 +Sfx_SweetScent: + musicheader 1, 5, Sfx_SweetScent_Ch5 -Sfx_SweetScent_Ch5: ; f1737 +Sfx_SweetScent_Ch5: dutycycle $2 soundinput $96 - sound $6, $f8, $0760 - sound $6, $e8, $0720 + sound __, 7, $f8, $0760 + sound __, 7, $e8, $0720 soundinput $df - sound $16, $f1, $0730 + sound C_, 7, $f1, $0730 soundinput $8 endchannel -; f174c -Sfx_BatonPass: ; f174c - dbw $44, Sfx_BatonPass_Ch5 - dbw $07, Sfx_BatonPass_Ch8 -; f1752 +Sfx_BatonPass: + musicheader 2, 5, Sfx_BatonPass_Ch5 + musicheader 1, 8, Sfx_BatonPass_Ch8 -Sfx_BatonPass_Ch5: ; f1752 +Sfx_BatonPass_Ch5: dutycycle $2 soundinput $f7 - sound $20, $f2, $0680 - sound $1, $f1, $0760 - sound $20, $0, $0000 - sound $1, $f1, $0760 - sound $1a, $0, $0000 - sound $1, $f1, $0760 + sound C#, 1, $f2, $0680 + sound __, 2, $f1, $0760 + sound C#, 1, $0, 0 + sound __, 2, $f1, $0760 + sound C_, 11, $0, 0 + sound __, 2, $f1, $0760 soundinput $8 endchannel -; f1771 -Sfx_BatonPass_Ch8: ; f1771 - noise $20, $f2, $20 +Sfx_BatonPass_Ch8: + noise C#, 1, $f2, $20 endchannel -; f1775 -Sfx_EggCrack: ; f1775 - dbw $04, Sfx_EggCrack_Ch5 -; f1778 +Sfx_EggCrack: + musicheader 1, 5, Sfx_EggCrack_Ch5 -Sfx_EggCrack_Ch5: ; f1778 +Sfx_EggCrack_Ch5: togglesfx notetype $1, $f1 dutycycle $0 @@ -3032,13 +2629,11 @@ Sfx_EggCrack_Ch5: ; f1778 note __, 1 note F#, 1 endchannel -; f1784 -Sfx_Evolved: ; f1784 - dbw $04, Sfx_Evolved_Ch5 -; f1787 +Sfx_Evolved: + musicheader 1, 5, Sfx_Evolved_Ch5 -Sfx_Evolved_Ch5: ; f1787 +Sfx_Evolved_Ch5: togglesfx notetype $1, $c1 octave 4 @@ -3057,13 +2652,11 @@ Sfx_Evolved_Ch5: ; f1787 octave 7 note C_, 16 endchannel -; f179b -Sfx_MasterBall: ; f179b - dbw $04, Sfx_MasterBall_Ch5 -; f179e +Sfx_MasterBall: + musicheader 1, 5, Sfx_MasterBall_Ch5 -Sfx_MasterBall_Ch5: ; f179e +Sfx_MasterBall_Ch5: togglesfx dutycycle $1 notetype $2, $e1 @@ -3092,13 +2685,11 @@ Sfx_MasterBall_Ch5: ; f179e note C#, 2 note C_, 2 endchannel -; f17c0 -Sfx_EggHatch: ; f17c0 - dbw $04, Sfx_EggHatch_Ch5 -; f17c3 +Sfx_EggHatch: + musicheader 1, 5, Sfx_EggHatch_Ch5 -Sfx_EggHatch_Ch5: ; f17c3 +Sfx_EggHatch_Ch5: togglesfx notetype $2, $f1 dutycycle $2 @@ -3115,92 +2706,82 @@ Sfx_EggHatch_Ch5: ; f17c3 intensity $42 note B_, 7 endchannel -; f17d9 -Sfx_GsIntroCharizardFireball: ; f17d9 - dbw $07, Sfx_GsIntroCharizardFireball_Ch8 -; f17dc +Sfx_GsIntroCharizardFireball: + musicheader 1, 8, Sfx_GsIntroCharizardFireball_Ch8 -Sfx_GsIntroCharizardFireball_Ch8: ; f17dc - noise $8, $cf, $4d - noise $8, $f1, $37 -Sfx_GsIntroCharizardFireball_branch_f17e2: ; f17e2 - noise $1, $f8, $4f - noise $0, $c8, $26 - noise $1, $d8, $5f - noise $0, $a8, $37 - loopchannel 12, Sfx_GsIntroCharizardFireball_branch_f17e2 - noise $3, $f8, $6f - noise $4, $d8, $5f - noise $c, $d8, $5c - noise $28, $d3, $4f +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 -; f17ff -Sfx_GsIntroPokemonAppears: ; f17ff - dbw $07, Sfx_GsIntroPokemonAppears_Ch8 -; f1802 +Sfx_GsIntroPokemonAppears: + musicheader 1, 8, Sfx_GsIntroPokemonAppears_Ch8 -Sfx_GsIntroPokemonAppears_Ch8: ; f1802 - noise $1, $88, $4f - noise $2, $8f, $2 - noise $2, $5f, $12 - noise $2, $3f, $22 - noise $0, $f8, $27 - noise $1, $f8, $4f - noise $8, $f1, $0 +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 -; f1818 -Sfx_Flash: ; f1818 - dbw $04, Sfx_Flash_Ch5 -; f181b +Sfx_Flash: + musicheader 1, 5, Sfx_Flash_Ch5 -Sfx_Flash_Ch5: ; f181b +Sfx_Flash_Ch5: dutycycle $1 soundinput $ef - sound $1, $40, $07e8 - sound $1, $60, $07e8 - sound $2, $80, $07e8 - sound $5, $a0, $07e8 - sound $6, $a0, $07e8 - sound $7, $80, $07e8 - sound $8, $60, $07e8 - sound $9, $30, $07e8 - sound $f, $12, $07e8 + sound __, 2, $40, $07e8 + sound __, 2, $60, $07e8 + sound __, 3, $80, $07e8 + sound __, 6, $a0, $07e8 + sound __, 7, $a0, $07e8 + sound __, 8, $80, $07e8 + sound __, 9, $60, $07e8 + sound __, 10, $30, $07e8 + sound __, 16, $12, $07e8 soundinput $8 endchannel -; f1846 -Sfx_GameFreakLogoGs: ; f1846 - dbw $04, Sfx_GameFreakLogoGs_Ch5 -; f1849 +Sfx_GameFreakLogoGs: + musicheader 1, 5, Sfx_GameFreakLogoGs_Ch5 -Sfx_GameFreakLogoGs_Ch5: ; f1849 +Sfx_GameFreakLogoGs_Ch5: dutycycle $3 soundinput $7f - sound $4, $55, $07e2 - sound $5, $75, $07e2 - sound $6, $94, $07e2 - sound $7, $b4, $07e2 - sound $8, $b3, $07e2 - sound $9, $93, $07e2 - sound $a, $72, $07e2 - sound $a, $53, $07e2 - sound $a, $34, $07e2 - sound $a, $15, $07e2 + sound __, 5, $55, $07e2 + sound __, 6, $75, $07e2 + sound __, 7, $94, $07e2 + sound __, 8, $b4, $07e2 + sound __, 9, $b3, $07e2 + sound __, 10, $93, $07e2 + sound __, 11, $72, $07e2 + sound __, 11, $53, $07e2 + sound __, 11, $34, $07e2 + sound __, 11, $15, $07e2 soundinput $8 endchannel -; f1878 -Sfx_DexFanfareLessThan20: ; f1878 - dbw $c4, Sfx_DexFanfareLessThan20_Ch5 - dbw $05, Sfx_DexFanfareLessThan20_Ch6 - dbw $06, Sfx_DexFanfareLessThan20_Ch7 - dbw $07, Sfx_DexFanfareLessThan20_Ch8 -; f1884 +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 -Sfx_DexFanfareLessThan20_Ch5: ; f1884 +Sfx_DexFanfareLessThan20_Ch5: togglesfx tempo 124 volume $77 @@ -3218,12 +2799,8 @@ Sfx_DexFanfareLessThan20_Ch5: ; f1884 note E_, 2 note D_, 6 endchannel -; f189a - - - -Sfx_DexFanfareLessThan20_Ch6: ; f189b +Sfx_DexFanfareLessThan20_Ch6: togglesfx notetype $8, $c1 octave 3 @@ -3239,12 +2816,8 @@ Sfx_DexFanfareLessThan20_Ch6: ; f189b note G_, 2 note F#, 6 endchannel -; f18ac - - - -Sfx_DexFanfareLessThan20_Ch7: ; f18ad +Sfx_DexFanfareLessThan20_Ch7: togglesfx notetype $8, $25 octave 4 @@ -3269,12 +2842,8 @@ Sfx_DexFanfareLessThan20_Ch7: ; f18ad note A_, 2 note __, 6 endchannel -; f18c7 - - - -Sfx_DexFanfareLessThan20_Ch8: ; f18c8 +Sfx_DexFanfareLessThan20_Ch8: togglesfx sfxtogglenoise $4 notetype $c @@ -3282,19 +2851,14 @@ Sfx_DexFanfareLessThan20_Ch8: ; f18c8 note __, 16 note __, 12 endchannel -; f18d1 +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 - - -Sfx_DexFanfare140169: ; f18d2 - dbw $c4, Sfx_DexFanfare140169_Ch5 - dbw $05, Sfx_DexFanfare140169_Ch6 - dbw $06, Sfx_DexFanfare140169_Ch7 - dbw $07, Sfx_DexFanfare140169_Ch8 -; f18de - -Sfx_DexFanfare140169_Ch5: ; f18de +Sfx_DexFanfare140169_Ch5: togglesfx tempo 120 volume $77 @@ -3320,12 +2884,8 @@ Sfx_DexFanfare140169_Ch5: ; f18de note B_, 8 note __, 8 endchannel -; f1900 - - - -Sfx_DexFanfare140169_Ch6: ; f1901 +Sfx_DexFanfare140169_Ch6: togglesfx dutycycle $2 vibrato $12, $34 @@ -3348,12 +2908,8 @@ Sfx_DexFanfare140169_Ch6: ; f1901 note G_, 8 note __, 8 endchannel -; f191d - - - -Sfx_DexFanfare140169_Ch7: ; f191e +Sfx_DexFanfare140169_Ch7: togglesfx notetype $c, $25 note __, 4 @@ -3384,38 +2940,29 @@ Sfx_DexFanfare140169_Ch7: ; f191e note G_, 4 note __, 4 endchannel -; f193e - - - -Sfx_DexFanfare140169_Ch8: ; f193f +Sfx_DexFanfare140169_Ch8: togglesfx sfxtogglenoise $4 notetype $c note C_, 4 -Sfx_DexFanfare140169_branch_f1945: ; f1945 +.loop note D_, 4 note C#, 1 note C#, 1 note C#, 1 note C#, 1 - loopchannel 3, Sfx_DexFanfare140169_branch_f1945 + loopchannel 3, .loop note D_, 8 endchannel -; f1950 +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 - - -Sfx_DexFanfare170199: ; f1951 - dbw $c4, Sfx_DexFanfare170199_Ch5 - dbw $05, Sfx_DexFanfare170199_Ch6 - dbw $06, Sfx_DexFanfare170199_Ch7 - dbw $07, Sfx_DexFanfare170199_Ch8 -; f195d - -Sfx_DexFanfare170199_Ch5: ; f195d +Sfx_DexFanfare170199_Ch5: togglesfx tempo 112 volume $77 @@ -3441,12 +2988,8 @@ Sfx_DexFanfare170199_Ch5: ; f195d note A#, 12 note __, 4 endchannel -; f1981 - - - -Sfx_DexFanfare170199_Ch6: ; f1982 +Sfx_DexFanfare170199_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3471,12 +3014,8 @@ Sfx_DexFanfare170199_Ch6: ; f1982 note D_, 12 note __, 4 endchannel -; f19a2 - - - -Sfx_DexFanfare170199_Ch7: ; f19a3 +Sfx_DexFanfare170199_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3501,12 +3040,8 @@ Sfx_DexFanfare170199_Ch7: ; f19a3 note A#, 12 note __, 4 endchannel -; f19bf - - - -Sfx_DexFanfare170199_Ch8: ; f19c0 +Sfx_DexFanfare170199_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -3525,19 +3060,14 @@ Sfx_DexFanfare170199_Ch8: ; f19c0 notetype $c note B_, 16 endchannel -; f19d5 +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 - - -Sfx_DexFanfare200229: ; f19d6 - dbw $c4, Sfx_DexFanfare200229_Ch5 - dbw $05, Sfx_DexFanfare200229_Ch6 - dbw $06, Sfx_DexFanfare200229_Ch7 - dbw $07, Sfx_DexFanfare200229_Ch8 -; f19e2 - -Sfx_DexFanfare200229_Ch5: ; f19e2 +Sfx_DexFanfare200229_Ch5: togglesfx tempo 124 volume $77 @@ -3561,12 +3091,8 @@ Sfx_DexFanfare200229_Ch5: ; f19e2 note F#, 12 note __, 4 endchannel -; f1a03 - - - -Sfx_DexFanfare200229_Ch6: ; f1a04 +Sfx_DexFanfare200229_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3586,12 +3112,8 @@ Sfx_DexFanfare200229_Ch6: ; f1a04 note A_, 12 note __, 4 endchannel -; f1a1e - - - -Sfx_DexFanfare200229_Ch7: ; f1a1f +Sfx_DexFanfare200229_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3632,12 +3154,8 @@ Sfx_DexFanfare200229_Ch7: ; f1a1f note D_, 6 note __, 6 endchannel -; f1a49 - - - -Sfx_DexFanfare200229_Ch8: ; f1a4a +Sfx_DexFanfare200229_Ch8: togglesfx sfxtogglenoise $4 notetype $8 @@ -3663,19 +3181,14 @@ Sfx_DexFanfare200229_Ch8: ; f1a4a note D_, 2 note B_, 12 endchannel -; f1a65 +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 - - -Sfx_DexFanfare230Plus: ; f1a66 - dbw $c4, Sfx_DexFanfare230Plus_Ch5 - dbw $05, Sfx_DexFanfare230Plus_Ch6 - dbw $06, Sfx_DexFanfare230Plus_Ch7 - dbw $07, Sfx_DexFanfare230Plus_Ch8 -; f1a72 - -Sfx_DexFanfare230Plus_Ch5: ; f1a72 +Sfx_DexFanfare230Plus_Ch5: togglesfx tempo 112 volume $77 @@ -3720,12 +3233,8 @@ Sfx_DexFanfare230Plus_Ch5: ; f1a72 note A_, 14 note __, 2 endchannel -; f1ab1 - - - -Sfx_DexFanfare230Plus_Ch6: ; f1ab2 +Sfx_DexFanfare230Plus_Ch6: togglesfx vibrato $12, $34 dutycycle $3 @@ -3757,12 +3266,8 @@ Sfx_DexFanfare230Plus_Ch6: ; f1ab2 note F#, 14 note __, 2 endchannel -; f1ad9 - - - -Sfx_DexFanfare230Plus_Ch7: ; f1ada +Sfx_DexFanfare230Plus_Ch7: togglesfx notetype $8, $25 octave 3 @@ -3808,19 +3313,15 @@ Sfx_DexFanfare230Plus_Ch7: ; f1ada note D_, 14 note __, 2 endchannel -; f1b0b - - - -Sfx_DexFanfare230Plus_Ch8: ; f1b0c +Sfx_DexFanfare230Plus_Ch8: togglesfx sfxtogglenoise $4 notetype $8 note D_, 2 note D_, 2 note D_, 2 -Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 +.loop1 note D_, 6 note D_, 2 note D_, 2 @@ -3832,7 +3333,7 @@ Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 note C#, 1 note C#, 1 note C#, 1 - loopchannel 2, Sfx_DexFanfare230Plus_branch_f1b14 + loopchannel 2, .loop1 note D_, 6 note D_, 2 note D_, 2 @@ -3841,236 +3342,206 @@ Sfx_DexFanfare230Plus_branch_f1b14: ; f1b14 note D_, 4 note D_, 4 note D_, 4 -Sfx_DexFanfare230Plus_branch_f1b2b: ; f1b2b +.loop2 note C#, 1 - loopchannel 18, Sfx_DexFanfare230Plus_branch_f1b2b + loopchannel 18, .loop2 note D_, 6 endchannel -; f1b32 +Sfx_NotVeryEffective: + musicheader 1, 8, Sfx_NotVeryEffective_Ch8 - - -Sfx_NotVeryEffective: ; f1b33 - dbw $07, Sfx_NotVeryEffective_Ch8 -; f1b36 - -Sfx_NotVeryEffective_Ch8: ; f1b36 - noise $4, $f1, $5f - noise $1, $a0, $42 - noise $10, $f1, $53 +Sfx_NotVeryEffective_Ch8: + noise __, 5, $f1, $5f + noise __, 2, $a0, $42 + noise C_, 1, $f1, $53 endchannel -; f1b40 -Sfx_Damage: ; f1b40 - dbw $07, Sfx_Damage_Ch8 -; f1b43 +Sfx_Damage: + musicheader 1, 8, Sfx_Damage_Ch8 -Sfx_Damage_Ch8: ; f1b43 - noise $4, $f1, $5e - noise $1, $a0, $12 - noise $4, $f0, $32 - noise $10, $f1, $44 +Sfx_Damage_Ch8: + noise __, 5, $f1, $5e + noise __, 2, $a0, $12 + noise __, 5, $f0, $32 + noise C_, 1, $f1, $44 endchannel -; f1b50 -Sfx_SuperEffective: ; f1b50 - dbw $07, Sfx_SuperEffective_Ch8 -; f1b53 +Sfx_SuperEffective: + musicheader 1, 8, Sfx_SuperEffective_Ch8 -Sfx_SuperEffective_Ch8: ; f1b53 - noise $3, $f1, $4f - noise $1, $c8, $22 - noise $2, $f8, $3f - noise $3, $d0, $15 - noise $20, $f2, $35 +Sfx_SuperEffective_Ch8: + noise __, 4, $f1, $4f + noise __, 2, $c8, $22 + noise __, 3, $f8, $3f + noise __, 4, $d0, $15 + noise C#, 1, $f2, $35 endchannel -; f1b63 -Sfx_BallBounce: ; f1b63 - dbw $44, Sfx_BallBounce_Ch5 - dbw $05, Sfx_BallBounce_Ch6 -; f1b69 +Sfx_BallBounce: + musicheader 2, 5, Sfx_BallBounce_Ch5 + musicheader 1, 6, Sfx_BallBounce_Ch6 -Sfx_BallBounce_Ch5: ; f1b69 +Sfx_BallBounce_Ch5: dutycycle $2 - sound $8, $e1, $0740 - sound $17, $0, $0000 - sound $8, $b1, $0740 - sound $17, $0, $0000 - sound $8, $81, $0740 - sound $17, $0, $0000 - sound $8, $51, $0740 - sound $17, $0, $0000 + sound __, 9, $e1, $0740 + sound C_, 8, $0, 0 + sound __, 9, $b1, $0740 + sound C_, 8, $0, 0 + sound __, 9, $81, $0740 + sound C_, 8, $0, 0 + sound __, 9, $51, $0740 + sound C_, 8, $0, 0 endchannel -; f1b8c -Sfx_BallBounce_Ch6: ; f1b8c +Sfx_BallBounce_Ch6: dutycycle $2 - sound $2, $8, $0000 - sound $8, $b1, $0741 - sound $17, $0, $0000 - sound $8, $81, $0741 - sound $17, $0, $0000 - sound $8, $51, $0741 - sound $17, $0, $0000 - sound $8, $21, $0741 - sound $17, $0, $0000 + sound __, 3, $8, 0 + sound __, 9, $b1, $0741 + sound C_, 8, $0, 0 + sound __, 9, $81, $0741 + sound C_, 8, $0, 0 + sound __, 9, $51, $0741 + sound C_, 8, $0, 0 + sound __, 9, $21, $0741 + sound C_, 8, $0, 0 endchannel -; f1bb3 -Sfx_SweetScent2: ; f1bb3 - dbw $44, Sfx_SweetScent2_Ch5 - dbw $07, Sfx_SweetScent2_Ch8 -; f1bb9 +Sfx_SweetScent2: + musicheader 2, 5, Sfx_SweetScent2_Ch5 + musicheader 1, 8, Sfx_SweetScent2_Ch8 -Sfx_SweetScent2_Ch5: ; f1bb9 +Sfx_SweetScent2_Ch5: soundinput $af dutycycle $1 - sound $6, $f8, $05f0 - sound $2, $f1, $0620 - sound $10, $f1, $0650 + sound __, 7, $f8, $05f0 + sound __, 3, $f1, $0620 + sound C_, 1, $f1, $0650 soundinput $8 endchannel -; f1bcc -Sfx_SweetScent2_Ch8: ; f1bcc - noise $2, $e8, $22 - noise $11, $aa, $0 -Sfx_SweetScent2_branch_f1bd2: ; f1bd2 - noise $4, $d9, $10 - noise $8, $91, $0 - noise $2, $61, $7 - loopchannel 5, Sfx_SweetScent2_branch_f1bd2 - noise $4, $99, $0 - noise $a, $61, $0 - noise $6, $59, $0 - noise $2, $21, $7 +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 -; f1bec -Sfx_HitEndOfExpBar: ; f1bec - dbw $44, Sfx_HitEndOfExpBar_Ch5 - dbw $05, Sfx_HitEndOfExpBar_Ch6 -; f1bf2 +Sfx_HitEndOfExpBar: + musicheader 2, 5, Sfx_HitEndOfExpBar_Ch5 + musicheader 1, 6, Sfx_HitEndOfExpBar_Ch6 -Sfx_HitEndOfExpBar_Ch5: ; f1bf2 +Sfx_HitEndOfExpBar_Ch5: dutycycle $2 - sound $1, $e1, $0789 - sound $1, $e1, $07a2 - sound $10, $e1, $07b1 + sound __, 2, $e1, $0789 + sound __, 2, $e1, $07a2 + sound C_, 1, $e1, $07b1 endchannel -; f1c01 -Sfx_HitEndOfExpBar_Ch6: ; f1c01 +Sfx_HitEndOfExpBar_Ch6: dutycycle $2 - sound $1, $e1, $07a2 - sound $1, $e1, $07b1 - sound $10, $e1, $07c4 + sound __, 2, $e1, $07a2 + sound __, 2, $e1, $07b1 + sound C_, 1, $e1, $07c4 endchannel -; f1c10 -Sfx_GiveTrademon: ; f1c10 - dbw $04, Sfx_GiveTrademon_Ch5 -; f1c13 +Sfx_GiveTrademon: + musicheader 1, 5, Sfx_GiveTrademon_Ch5 -Sfx_GiveTrademon_Ch5: ; f1c13 - sound $20, $0, $0000 +Sfx_GiveTrademon_Ch5: + sound C#, 1, $0, 0 dutycycle $1 soundinput $a7 - sound $1b, $f4, $0750 - sound $1b, $d4, $0750 - sound $1b, $b4, $0750 - sound $1b, $94, $0750 - sound $1b, $74, $0750 - sound $1b, $54, $0750 - sound $1b, $34, $0750 - sound $1b, $14, $0750 + sound C_, 12, $f4, $0750 + sound C_, 12, $d4, $0750 + sound C_, 12, $b4, $0750 + sound C_, 12, $94, $0750 + sound C_, 12, $74, $0750 + sound C_, 12, $54, $0750 + sound C_, 12, $34, $0750 + sound C_, 12, $14, $0750 soundinput $8 endchannel -; f1c3e -Sfx_GetTrademon: ; f1c3e - dbw $04, Sfx_GetTrademon_Ch5 -; f1c41 +Sfx_GetTrademon: + musicheader 1, 5, Sfx_GetTrademon_Ch5 -Sfx_GetTrademon_Ch5: ; f1c41 - sound $20, $0, $0000 +Sfx_GetTrademon_Ch5: + sound C#, 1, $0, 0 dutycycle $2 soundinput $bf - sound $1b, $14, $07bc - sound $1b, $34, $07bc - sound $1b, $54, $07bc - sound $1b, $74, $07bc - sound $1b, $94, $07bc - sound $1b, $b4, $07bc - sound $1b, $d4, $07bc - sound $1b, $f4, $07bc + sound C_, 12, $14, $07bc + sound C_, 12, $34, $07bc + sound C_, 12, $54, $07bc + sound C_, 12, $74, $07bc + sound C_, 12, $94, $07bc + sound C_, 12, $b4, $07bc + sound C_, 12, $d4, $07bc + sound C_, 12, $f4, $07bc soundinput $8 endchannel -; f1c6c -Sfx_TrainArrived: ; f1c6c - dbw $84, Sfx_TrainArrived_Ch5 - dbw $05, Sfx_TrainArrived_Ch6 - dbw $07, Sfx_TrainArrived_Ch8 -; f1c75 +Sfx_TrainArrived: + musicheader 3, 5, Sfx_TrainArrived_Ch5 + musicheader 1, 6, Sfx_TrainArrived_Ch6 + musicheader 1, 8, Sfx_TrainArrived_Ch8 -Sfx_TrainArrived_Ch6: ; f1c75 +Sfx_TrainArrived_Ch6: tone $0008 - sound $8, $0, $0000 -Sfx_TrainArrived_Ch5: ; f1c7c + sound __, 9, $0, 0 +Sfx_TrainArrived_Ch5: dutycycle $2 - sound $4, $5f, $0691 - sound $4, $6f, $0694 - sound $4, $78, $0697 - sound $4, $7f, $069a - sound $4, $68, $06ae - sound $10, $6f, $06ab - sound $68, $65, $06a8 + sound __, 5, $5f, $0691 + sound __, 5, $6f, $0694 + sound __, 5, $78, $0697 + sound __, 5, $7f, $069a + sound __, 5, $68, $06ae + sound C_, 1, $6f, $06ab + sound F_, 9, $65, $06a8 endchannel -; f1c9b -Sfx_TrainArrived_Ch8: ; f1c9b - noise $5, $af, $10 - noise $4, $9f, $20 - noise $4, $8f, $21 - noise $4, $7f, $22 - noise $4, $8f, $21 - noise $4, $9f, $20 - noise $4, $9f, $10 - noise $68, $a3, $0 +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 -; f1cb4 -Sfx_2Boops: ; f1cb4 - dbw $04, Sfx_2Boops_Ch5 -; f1cb7 +Sfx_2Boops: + musicheader 1, 5, Sfx_2Boops_Ch5 -Sfx_2Boops_Ch5: ; f1cb7 +Sfx_2Boops_Ch5: dutycycle $2 -Sfx_2Boops_branch_f1cb9: ; f1cb9 +.loop soundinput $79 - sound $1, $99, $0563 - sound $4, $f2, $04b5 + sound __, 2, $99, $0563 + sound __, 5, $f2, $04b5 soundinput $43 - sound $10, $f8, $05cd - loopchannel 2, Sfx_2Boops_branch_f1cb9 + sound C_, 1, $f8, $05cd + loopchannel 2, .loop soundinput $8 endchannel -; f1cd0 -Sfx_UnknownCB: ; f1cd0 - dbw $07, Sfx_UnknownCB_Ch8 -; f1cd3 +Sfx_IntroWhoosh: + musicheader 1, 8, Sfx_IntroWhoosh_Ch8 -Sfx_Menu_Ch8: ; f1cd3 - noise $1, $e2, $33 - noise $8, $e1, $22 +Sfx_Menu_Ch8: + noise __, 2, $e2, $33 + noise __, 9, $e1, $22 endchannel -; f1cda -Sfx_Pokeflute_Ch7: ; f1cda +Sfx_Pokeflute_Ch7: tempo 256 volume $77 togglesfx @@ -4094,1087 +3565,942 @@ Sfx_Pokeflute_Ch7: ; f1cda note G_, 8 note __, 12 endchannel -; f1cf8 -Sfx_PlacePuzzlePieceDown_Ch8: ; f1cf8 - noise $2, $f7, $24 - noise $2, $f7, $34 - noise $4, $f7, $44 - noise $8, $f4, $55 - noise $8, $f1, $44 +Sfx_PlacePuzzlePieceDown_Ch8: + noise __, 3, $f7, $24 + noise __, 3, $f7, $34 + noise __, 5, $f7, $44 + noise __, 9, $f4, $55 + noise __, 9, $f1, $44 endchannel -; f1d08 -Sfx_EnterDoor_Ch8: ; f1d08 - noise $9, $f1, $44 - noise $8, $d1, $43 +Sfx_EnterDoor_Ch8: + noise __, 10, $f1, $44 + noise __, 9, $d1, $43 endchannel -; f1d0f -Sfx_SwitchPokemon_Ch5: ; f1d0f +Sfx_SwitchPokemon_Ch5: dutycycle $2 - sound $8, $e1, $0740 + sound __, 9, $e1, $0740 endchannel -; f1d16 -Sfx_SwitchPokemon_Ch6: ; f1d16 +Sfx_SwitchPokemon_Ch6: dutycycle $2 - sound $2, $8, $0000 - sound $8, $b1, $0741 + sound __, 3, $8, 0 + sound __, 9, $b1, $0741 endchannel -; f1d21 -Sfx_PokeballsPlacedOnTable_Ch5: ; f1d21 +Sfx_PokeballsPlacedOnTable_Ch5: dutycycle $2 soundinput $3a - sound $4, $f2, $0200 + sound __, 5, $f2, $0200 soundinput $22 - sound $8, $e2, $0200 + sound __, 9, $e2, $0200 soundinput $8 endchannel -; f1d32 -Sfx_BallWiggle_Ch5: ; f1d32 +Sfx_BallWobble_Ch5: dutycycle $2 soundinput $3a - sound $4, $f2, $0400 + sound __, 5, $f2, $0400 soundinput $22 - sound $8, $e2, $0400 + sound __, 9, $e2, $0400 soundinput $8 endchannel -; f1d43 -Sfx_Tally_Ch5: ; f1d43 +Sfx_Tally_Ch5: dutycycle $2 - sound $4, $f1, $0780 + sound __, 5, $f1, $0780 endchannel -; f1d4a -Sfx_Tally_Ch6: ; f1d4a +Sfx_Tally_Ch6: dutycycle $2 - sound $1, $8, $0000 - sound $4, $a1, $0761 + sound __, 2, $8, 0 + sound __, 5, $a1, $0761 endchannel -; f1d55 -Sfx_Transaction_Ch5: ; f1d55 +Sfx_Transaction_Ch5: dutycycle $2 - sound $4, $e1, $0700 - sound $18, $f2, $07e0 + sound __, 5, $e1, $0700 + sound C_, 9, $f2, $07e0 endchannel -; f1d60 -Sfx_Transaction_Ch6: ; f1d60 +Sfx_Transaction_Ch6: dutycycle $2 - sound $1, $8, $0000 - sound $4, $91, $06c1 - sound $18, $a2, $07a1 + sound __, 2, $8, 0 + sound __, 5, $91, $06c1 + sound C_, 9, $a2, $07a1 endchannel -; f1d6f -Sfx_Bump_Ch5: ; f1d6f +Sfx_Bump_Ch5: dutycycle $2 soundinput $5a - sound $f, $f1, $0300 + sound __, 16, $f1, $0300 soundinput $8 endchannel -; f1d7a -Sfx_ExitBuilding_Ch8: ; f1d7a - noise $2, $f1, $54 - noise $c, $71, $23 - noise $2, $b1, $54 - noise $c, $61, $23 - noise $6, $41, $54 +Sfx_ExitBuilding_Ch8: + noise __, 3, $f1, $54 + noise __, 13, $71, $23 + noise __, 3, $b1, $54 + noise __, 13, $61, $23 + noise __, 7, $41, $54 endchannel -; f1d8a -Sfx_ReadText2_Ch5: ; f1d8a -Sfx_ReadText_Ch5: ; f1d8a +Sfx_ReadText2_Ch5: +Sfx_ReadText_Ch5: dutycycle $2 - sound $0, $91, $07c0 - sound $0, $81, $07d0 - sound $0, $91, $07c0 - sound $c, $a1, $07d0 + sound __, 1, $91, $07c0 + sound __, 1, $81, $07d0 + sound __, 1, $91, $07c0 + sound __, 13, $a1, $07d0 endchannel -; f1d9d -Sfx_Potion_Ch5: ; f1d9d +Sfx_Potion_Ch5: dutycycle $2 soundinput $17 - sound $f, $f0, $04f0 - sound $f, $f2, $0650 + sound __, 16, $f0, $04f0 + sound __, 16, $f2, $0650 soundinput $8 endchannel -; f1dac -Sfx_Poison_Ch5: ; f1dac -Sfx_Poison_branch_f1dac: ; f1dac +Sfx_Poison_Ch5: dutycycle $0 soundinput $14 - sound $4, $f2, $0600 - loopchannel 4, Sfx_Poison_branch_f1dac - sound $f, $f3, $0600 + sound __, 5, $f2, $0600 + loopchannel 4, Sfx_Poison_Ch5 + sound __, 16, $f3, $0600 soundinput $8 endchannel -; f1dbf -Sfx_FullHeal_Ch5: ; f1dbf +Sfx_FullHeal_Ch5: dutycycle $2 soundinput $14 - sound $4, $f2, $0600 - sound $4, $f2, $0600 + sound __, 5, $f2, $0600 + sound __, 5, $f2, $0600 soundinput $17 - sound $f, $f2, $0600 + sound __, 16, $f2, $0600 soundinput $8 endchannel -; f1dd4 -Sfx_GotSafariBalls_Ch5: ; f1dd4 +Sfx_GotSafariBalls_Ch5: dutycycle $2 soundinput $15 - sound $f, $f0, $04f0 - sound $f, $f2, $0650 + sound __, 16, $f0, $04f0 + sound __, 16, $f2, $0650 soundinput $8 endchannel -; f1de3 -Sfx_BootPc_Ch5: ; f1de3 +Sfx_BootPc_Ch5: dutycycle $2 - sound $f, $f2, $07c0 - sound $f, $0, $0000 - sound $3, $a1, $0780 - sound $3, $a1, $0700 - sound $3, $a1, $0740 - sound $3, $a1, $0700 - sound $3, $a1, $0780 - sound $3, $a1, $0700 - sound $3, $a1, $07c0 - sound $8, $a1, $0700 + sound __, 16, $f2, $07c0 + sound __, 16, $0, 0 + sound __, 4, $a1, $0780 + sound __, 4, $a1, $0700 + sound __, 4, $a1, $0740 + sound __, 4, $a1, $0700 + sound __, 4, $a1, $0780 + sound __, 4, $a1, $0700 + sound __, 4, $a1, $07c0 + sound __, 9, $a1, $0700 endchannel -; f1e0e -Sfx_ShutDownPc_Ch5: ; f1e0e +Sfx_ShutDownPc_Ch5: dutycycle $2 - sound $4, $f0, $0600 - sound $4, $f0, $0400 - sound $4, $f0, $0200 - sound $1, $0, $0000 + sound __, 5, $f0, $0600 + sound __, 5, $f0, $0400 + sound __, 5, $f0, $0200 + sound __, 2, $0, 0 endchannel -; f1e21 -Sfx_ChoosePcOption_Ch5: ; f1e21 +Sfx_ChoosePcOption_Ch5: dutycycle $2 - sound $6, $f0, $0700 - sound $4, $0, $0000 - sound $6, $f0, $0700 - sound $1, $0, $0000 + sound __, 7, $f0, $0700 + sound __, 5, $0, 0 + sound __, 7, $f0, $0700 + sound __, 2, $0, 0 endchannel -; f1e34 -Sfx_EscapeRope_Ch5: ; f1e34 +Sfx_EscapeRope_Ch5: dutycycle $1 soundinput $17 - sound $f, $d7, $0600 - sound $f, $b7, $0580 - sound $f, $87, $0500 - sound $f, $47, $0480 - sound $f, $17, $0400 + sound __, 16, $d7, $0600 + sound __, 16, $b7, $0580 + sound __, 16, $87, $0500 + sound __, 16, $47, $0480 + sound __, 16, $17, $0400 soundinput $8 endchannel -; f1e4f -Sfx_PushButton_Ch5: ; f1e4f +Sfx_PushButton_Ch5: dutycycle $2 - sound $4, $0, $0000 - sound $2, $f1, $0680 - sound $1, $0, $0000 - sound $4, $f1, $0780 - sound $4, $0, $0000 + sound __, 5, $0, 0 + sound __, 3, $f1, $0680 + sound __, 2, $0, 0 + sound __, 5, $f1, $0780 + sound __, 5, $0, 0 endchannel -; f1e66 -Sfx_SecondPartOfItemfinder_Ch5: ; f1e66 +Sfx_SecondPartOfItemfinder_Ch5: dutycycle $2 soundinput $2c - sound $4, $f2, $0500 + sound __, 5, $f2, $0500 soundinput $22 - sound $2, $f1, $0500 + sound __, 3, $f1, $0500 soundinput $8 - sound $1, $0, $0000 + sound __, 2, $0, 0 endchannel -; f1e7b -Sfx_WarpTo_Ch5: ; f1e7b +Sfx_WarpTo_Ch5: dutycycle $1 soundinput $17 - sound $f, $d7, $0500 - sound $f, $b7, $0580 - sound $f, $87, $0600 - sound $f, $47, $0680 - sound $f, $17, $0700 + sound __, 16, $d7, $0500 + sound __, 16, $b7, $0580 + sound __, 16, $87, $0600 + sound __, 16, $47, $0680 + sound __, 16, $17, $0700 soundinput $8 endchannel -; f1e96 -Sfx_WarpFrom_Ch5: ; f1e96 +Sfx_WarpFrom_Ch5: dutycycle $1 soundinput $17 - sound $f, $d7, $0700 - sound $f, $b7, $0680 - sound $f, $87, $0600 - sound $f, $47, $0580 - sound $f, $17, $0500 + sound __, 16, $d7, $0700 + sound __, 16, $b7, $0680 + sound __, 16, $87, $0600 + sound __, 16, $47, $0580 + sound __, 16, $17, $0500 soundinput $8 endchannel -; f1eb1 -Sfx_ChangeDexMode_Ch5: ; f1eb1 +Sfx_ChangeDexMode_Ch5: dutycycle $1 soundinput $16 - sound $f, $d2, $0500 + sound __, 16, $d2, $0500 soundinput $8 endchannel -; f1ebc -Sfx_JumpOverLedge_Ch5: ; f1ebc +Sfx_JumpOverLedge_Ch5: dutycycle $2 soundinput $95 - sound $f, $f2, $0400 + sound __, 16, $f2, $0400 soundinput $8 endchannel -; f1ec7 -Sfx_GrassRustle_Ch8: ; f1ec7 - noise $2, $f1, $32 - noise $2, $0, $0 - noise $2, $f1, $22 - noise $1, $0, $0 +Sfx_GrassRustle_Ch8: + noise __, 3, $f1, $32 + noise __, 3, $0, $0 + noise __, 3, $f1, $22 + noise __, 2, $0, $0 endchannel -; f1ed4 -Sfx_Fly_Ch8: ; f1ed4 - noise $2, $f1, $12 - noise $2, $0, $0 - noise $2, $a1, $12 - noise $2, $0, $0 - noise $2, $d1, $12 - noise $2, $0, $0 - noise $2, $81, $12 - noise $2, $0, $0 - noise $2, $b1, $12 - noise $2, $0, $0 - noise $2, $61, $12 - noise $2, $0, $0 - noise $2, $91, $12 - noise $2, $0, $0 - noise $2, $41, $12 - noise $2, $0, $0 +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 -; f1f05 -Sfx_Wrong_Ch5: ; f1f05 +Sfx_Wrong_Ch5: dutycycle $3 soundinput $5a - sound $4, $f0, $0500 + sound __, 5, $f0, $0500 soundinput $8 - sound $4, $0, $0000 - sound $f, $f0, $0500 - sound $1, $0, $0000 + sound __, 5, $0, 0 + sound __, 16, $f0, $0500 + sound __, 2, $0, 0 endchannel -; f1f1c -Sfx_Wrong_Ch6: ; f1f1c +Sfx_Wrong_Ch6: dutycycle $3 - sound $4, $f0, $0401 - sound $4, $0, $0000 - sound $f, $f0, $0401 - sound $1, $0, $0000 + sound __, 5, $f0, $0401 + sound __, 5, $0, 0 + sound __, 16, $f0, $0401 + sound __, 2, $0, 0 endchannel -; f1f2f -Sfx_Squeak_Ch5: ; f1f2f +Sfx_Squeak_Ch5: dutycycle $0 soundinput $17 - sound $f, $d2, $0700 + sound __, 16, $d2, $0700 soundinput $8 endchannel -; f1f3a -Sfx_Strength_Ch8: ; f1f3a - noise $4, $a2, $23 - noise $8, $f1, $34 - noise $f, $0, $0 - noise $2, $f7, $24 - noise $2, $f7, $34 - noise $4, $f7, $44 - noise $8, $f4, $55 - noise $8, $f1, $44 +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 -; f1f53 -Sfx_Boat_Ch5: ; f1f53 +Sfx_Boat_Ch5: dutycycle $2 - sound $f, $f0, $0500 - sound $4, $0, $0000 - sound $f, $f0, $0500 - sound $f, $f0, $0500 - sound $f, $f0, $0500 - sound $f, $f0, $0500 - sound $f, $f2, $0500 + sound __, 16, $f0, $0500 + sound __, 5, $0, 0 + sound __, 16, $f0, $0500 + sound __, 16, $f0, $0500 + sound __, 16, $f0, $0500 + sound __, 16, $f0, $0500 + sound __, 16, $f2, $0500 endchannel -; f1f72 -Sfx_Boat_Ch6: ; f1f72 +Sfx_Boat_Ch6: dutycycle $3 - sound $f, $f0, $0482 - sound $4, $0, $0000 - sound $f, $f0, $0482 - sound $f, $f0, $0482 - sound $f, $f0, $0482 - sound $f, $f0, $0482 - sound $f, $f2, $0482 + sound __, 16, $f0, $0482 + sound __, 5, $0, 0 + sound __, 16, $f0, $0482 + sound __, 16, $f0, $0482 + sound __, 16, $f0, $0482 + sound __, 16, $f0, $0482 + sound __, 16, $f2, $0482 endchannel -; f1f91 -Sfx_WallOpen_Ch5: ; f1f91 +Sfx_WallOpen_Ch5: dutycycle $1 soundinput $3a - sound $4, $f2, $0500 + sound __, 5, $f2, $0500 soundinput $22 - sound $4, $e2, $0500 + sound __, 5, $e2, $0500 soundinput $3a - sound $4, $f2, $0700 + sound __, 5, $f2, $0700 soundinput $22 - sound $f, $e2, $0700 + sound __, 16, $e2, $0700 soundinput $8 endchannel -; f1fae -Sfx_ElevatorEnd_Ch5: ; f1fae +Sfx_ElevatorEnd_Ch5: dutycycle $2 - sound $f, $f3, $0730 - sound $8, $65, $0730 - sound $f, $f4, $0700 - sound $f, $74, $0700 - sound $f, $44, $0700 - sound $f, $24, $0700 + sound __, 16, $f3, $0730 + sound __, 9, $65, $0730 + sound __, 16, $f4, $0700 + sound __, 16, $74, $0700 + sound __, 16, $44, $0700 + sound __, 16, $24, $0700 endchannel -; f1fc9 -Sfx_ThrowBall_Ch5: ; f1fc9 +Sfx_ThrowBall_Ch5: dutycycle $2 soundinput $2f - sound $f, $f2, $0780 + sound __, 16, $f2, $0780 endchannel -; f1fd2 -Sfx_ThrowBall_Ch6: ; f1fd2 +Sfx_ThrowBall_Ch6: dutycycle $2 - sound $f, $c2, $0782 + sound __, 16, $c2, $0782 endchannel -; f1fd9 -Sfx_Shine_Ch5: ; f1fd9 +Sfx_Shine_Ch5: dutycycle $0 - sound $0, $d2, $0700 - sound $0, $d2, $0740 - sound $0, $d2, $0780 - sound $0, $d2, $07c0 - sound $a, $e1, $07e0 - sound $1, $0, $0000 + sound __, 1, $d2, $0700 + sound __, 1, $d2, $0740 + sound __, 1, $d2, $0780 + sound __, 1, $d2, $07c0 + sound __, 11, $e1, $07e0 + sound __, 2, $0, 0 endchannel -; f1ff4 -Sfx_BallPoof_Ch5: ; f1ff4 +Sfx_BallPoof_Ch5: dutycycle $2 soundinput $16 - sound $f, $f2, $0400 + sound __, 16, $f2, $0400 soundinput $8 endchannel -; f1fff -Sfx_BallPoof_Ch8: ; f1fff - noise $f, $a2, $22 +Sfx_BallPoof_Ch8: + noise __, 16, $a2, $22 endchannel -; f2003 -Sfx_Unknown3A_Ch5: ; f2003 - sound $f, $d1, $0200 +Sfx_Unknown3A_Ch5: + sound __, 16, $d1, $0200 soundinput $8 endchannel -; f200a -Sfx_Unknown3A_Ch8: ; f200a - noise $4, $f5, $33 - noise $8, $f4, $22 - noise $f, $f2, $21 +Sfx_Unknown3A_Ch8: + noise __, 5, $f5, $33 + noise __, 9, $f4, $22 + noise __, 16, $f2, $21 endchannel -; f2014 -Sfx_Run_Ch8: ; f2014 - noise $2, $61, $23 - noise $2, $a1, $33 - noise $2, $c1, $33 - noise $2, $51, $11 - noise $2, $f1, $33 - noise $2, $41, $11 - noise $2, $c1, $33 - noise $2, $31, $11 - noise $2, $81, $33 - noise $2, $31, $11 - noise $8, $41, $33 +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 -; f2036 -Sfx_SlotMachineStart_Ch5: ; f2036 +Sfx_SlotMachineStart_Ch5: dutycycle $2 soundinput $44 - sound $f, $f0, $04f0 + sound __, 16, $f0, $04f0 soundinput $17 - sound $f, $f2, $0650 + sound __, 16, $f2, $0650 soundinput $8 endchannel -; f2047 -Sfx_SlotMachineStart_Ch6: ; f2047 +Sfx_SlotMachineStart_Ch6: dutycycle $2 - sound $f, $92, $0600 - sound $f, $92, $0782 + sound __, 16, $92, $0600 + sound __, 16, $92, $0782 endchannel -; f2052 -Sfx_Call_Ch5: ; f2052 +Sfx_Call_Ch5: soundinput $67 - sound $4, $f7, $07a0 - sound $4, $f7, $07a0 - sound $4, $f7, $07a0 - sound $4, $f7, $07a0 - sound $4, $f7, $07a0 + sound __, 5, $f7, $07a0 + sound __, 5, $f7, $07a0 + sound __, 5, $f7, $07a0 + sound __, 5, $f7, $07a0 + sound __, 5, $f7, $07a0 soundinput $8 - sound $4, $0, $0000 + sound __, 5, $0, 0 endchannel -; f206f -Sfx_Peck_Ch8: ; f206f - noise $2, $a1, $12 +Sfx_Peck_Ch8: + noise __, 3, $a1, $12 endchannel -; f2073 -Sfx_Kinesis_Ch5: ; f2073 +Sfx_Kinesis_Ch5: dutycycle $1 soundinput $af - sound $f, $f2, $0780 + sound __, 16, $f2, $0780 soundinput $8 endchannel -; f207e -Sfx_Lick_Ch5: ; f207e +Sfx_Lick_Ch5: dutycycle $1 soundinput $97 - sound $f, $f2, $0500 + sound __, 16, $f2, $0500 soundinput $8 endchannel -; f2089 -Sfx_Pound_Ch8: ; f2089 - noise $2, $a1, $22 +Sfx_Pound_Ch8: + noise __, 3, $a1, $22 endchannel -; f208d -Sfx_MovePuzzlePiece_Ch8: ; f208d - noise $8, $f1, $54 +Sfx_MovePuzzlePiece_Ch8: + noise __, 9, $f1, $54 endchannel -; f2091 -Sfx_CometPunch_Ch8: ; f2091 - noise $f, $8f, $11 - noise $4, $ff, $12 - noise $a, $f1, $55 +Sfx_CometPunch_Ch8: + noise __, 16, $8f, $11 + noise __, 5, $ff, $12 + noise __, 11, $f1, $55 endchannel -; f209b -Sfx_MegaPunch_Ch8: ; f209b - noise $f, $8f, $34 - noise $8, $f2, $35 - noise $a, $f1, $55 +Sfx_MegaPunch_Ch8: + noise __, 16, $8f, $34 + noise __, 9, $f2, $35 + noise __, 11, $f1, $55 endchannel -; f20a5 -Sfx_Scratch_Ch8: ; f20a5 - noise $f, $9f, $23 - noise $8, $f1, $21 +Sfx_Scratch_Ch8: + noise __, 16, $9f, $23 + noise __, 9, $f1, $21 endchannel -; f20ac -Sfx_Vicegrip_Ch8: ; f20ac - noise $2, $e1, $4b - noise $a, $f1, $44 - noise $2, $e1, $3a - noise $6, $f1, $34 +Sfx_Vicegrip_Ch8: + noise __, 3, $e1, $4b + noise __, 11, $f1, $44 + noise __, 3, $e1, $3a + noise __, 7, $f1, $34 endchannel -; f20b9 -Sfx_RazorWind_Ch8: ; f20b9 - noise $2, $f4, $44 - noise $2, $f4, $14 - noise $f, $f1, $32 +Sfx_RazorWind_Ch8: + noise __, 3, $f4, $44 + noise __, 3, $f4, $14 + noise __, 16, $f1, $32 endchannel -; f20c3 -Sfx_Cut_Ch8: ; f20c3 - noise $4, $8f, $55 - noise $2, $f4, $44 - noise $8, $f4, $22 - noise $f, $f2, $21 +Sfx_Cut_Ch8: + noise __, 5, $8f, $55 + noise __, 3, $f4, $44 + noise __, 9, $f4, $22 + noise __, 16, $f2, $21 endchannel -; f20d0 -Sfx_WingAttack_Ch8: ; f20d0 -Sfx_WingAttack_branch_f20d0: ; f20d0 - noise $8, $4f, $23 - noise $4, $c4, $22 - noise $6, $f2, $23 - loopchannel 4, Sfx_WingAttack_branch_f20d0 +Sfx_WingAttack_Ch8: + noise __, 9, $4f, $23 + noise __, 5, $c4, $22 + noise __, 7, $f2, $23 + loopchannel 4, Sfx_WingAttack_Ch8 endchannel -; f20de -Sfx_Whirlwind_Ch8: ; f20de - noise $8, $4f, $33 - noise $4, $c4, $22 - noise $6, $f2, $23 - noise $f, $f2, $22 +Sfx_Whirlwind_Ch8: + noise __, 9, $4f, $33 + noise __, 5, $c4, $22 + noise __, 7, $f2, $23 + noise __, 16, $f2, $22 endchannel -; f20eb -Sfx_Bind_Ch8: ; f20eb - noise $8, $ff, $32 - noise $8, $f4, $43 - noise $8, $f2, $54 - noise $8, $f1, $65 +Sfx_Bind_Ch8: + noise __, 9, $ff, $32 + noise __, 9, $f4, $43 + noise __, 9, $f2, $54 + noise __, 9, $f1, $65 endchannel -; f20f8 -Sfx_VineWhip_Ch8: ; f20f8 - noise $1, $c2, $33 - noise $2, $f2, $21 - noise $1, $e2, $33 - noise $1, $c2, $32 - noise $1, $92, $12 - noise $1, $b2, $31 - noise $c, $91, $10 - noise $8, $f2, $41 +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 -; f2111 -Sfx_DoubleKick_Ch8: ; f2111 - noise $1, $94, $23 - noise $1, $b4, $22 - noise $8, $f1, $44 +Sfx_DoubleKick_Ch8: + noise __, 2, $94, $23 + noise __, 2, $b4, $22 + noise __, 9, $f1, $44 endchannel -; f211b -Sfx_MegaKick_Ch8: ; f211b - noise $2, $94, $33 - noise $4, $b4, $22 - noise $4, $f1, $44 - noise $8, $f1, $55 +Sfx_MegaKick_Ch8: + noise __, 3, $94, $33 + noise __, 5, $b4, $22 + noise __, 5, $f1, $44 + noise __, 9, $f1, $55 endchannel -; f2128 -Sfx_Headbutt_Ch8: ; f2128 - noise $4, $ff, $55 - noise $8, $f1, $65 +Sfx_Headbutt_Ch8: + noise __, 5, $ff, $55 + noise __, 9, $f1, $65 endchannel -; f212f -Sfx_HornAttack_Ch8: ; f212f - noise $2, $84, $43 - noise $2, $c4, $22 - noise $8, $f2, $34 +Sfx_HornAttack_Ch8: + noise __, 3, $84, $43 + noise __, 3, $c4, $22 + noise __, 9, $f2, $34 endchannel -; f2139 -Sfx_Tackle_Ch8: ; f2139 - noise $4, $f1, $34 - noise $f, $f2, $64 +Sfx_Tackle_Ch8: + noise __, 5, $f1, $34 + noise __, 16, $f2, $64 endchannel -; f2140 -Sfx_PoisonSting_Ch8: ; f2140 - noise $2, $f1, $22 - noise $f, $f2, $12 +Sfx_PoisonSting_Ch8: + noise __, 3, $f1, $22 + noise __, 16, $f2, $12 endchannel -; f2147 -Sfx_Powder_Ch8: ; f2147 - noise $2, $c2, $1 - noise $f, $f4, $1 - noise $f, $f2, $1 +Sfx_Powder_Ch8: + noise __, 3, $c2, $1 + noise __, 16, $f4, $1 + noise __, 16, $f2, $1 endchannel -; f2151 -Sfx_Doubleslap_Ch8: ; f2151 - noise $8, $f1, $32 - noise $8, $f1, $33 +Sfx_Doubleslap_Ch8: + noise __, 9, $f1, $32 + noise __, 9, $f1, $33 endchannel -; f2158 -Sfx_Bite_Ch5: ; f2158 +Sfx_Bite_Ch5: dutycycle $0 soundinput $3a - sound $4, $f2, $0200 + sound __, 5, $f2, $0200 soundinput $22 - sound $8, $e2, $0200 + sound __, 9, $e2, $0200 soundinput $8 endchannel -; f2169 -Sfx_Bite_Ch8: ; f2169 - noise $0, $d1, $42 - noise $4, $a1, $32 - noise $0, $d1, $22 - noise $6, $a1, $32 +Sfx_Bite_Ch8: + noise __, 1, $d1, $42 + noise __, 5, $a1, $32 + noise __, 1, $d1, $22 + noise __, 7, $a1, $32 endchannel -; f2176 -Sfx_JumpKick_Ch8: ; f2176 - noise $3, $92, $31 - noise $3, $b2, $32 - noise $3, $c2, $33 - noise $8, $f1, $54 +Sfx_JumpKick_Ch8: + noise __, 4, $92, $31 + noise __, 4, $b2, $32 + noise __, 4, $c2, $33 + noise __, 9, $f1, $54 endchannel -; f2183 -Sfx_Stomp_Ch8: ; f2183 - noise $c, $f1, $54 - noise $8, $f1, $64 +Sfx_Stomp_Ch8: + noise __, 13, $f1, $54 + noise __, 9, $f1, $64 endchannel -; f218a -Sfx_TailWhip_Ch8: ; f218a - noise $2, $f1, $33 - noise $2, $c1, $32 - noise $2, $a1, $31 - noise $f, $82, $32 - noise $8, $f1, $34 +Sfx_TailWhip_Ch8: + noise __, 3, $f1, $33 + noise __, 3, $c1, $32 + noise __, 3, $a1, $31 + noise __, 16, $82, $32 + noise __, 9, $f1, $34 endchannel -; f219a -Sfx_KarateChop_Ch8: ; f219a - noise $2, $d2, $32 - noise $f, $f2, $43 +Sfx_KarateChop_Ch8: + noise __, 3, $d2, $32 + noise __, 16, $f2, $43 endchannel -; f21a1 -Sfx_Submission_Ch8: ; f21a1 - noise $2, $f2, $43 - noise $4, $b5, $32 - noise $9, $86, $31 - noise $7, $64, $0 - noise $f, $f2, $55 +Sfx_Submission_Ch8: + noise __, 3, $f2, $43 + noise __, 5, $b5, $32 + noise __, 10, $86, $31 + noise __, 8, $64, $0 + noise __, 16, $f2, $55 endchannel -; f21b1 -Sfx_WaterGun_Ch5: ; f21b1 +Sfx_WaterGun_Ch5: dutycycle $1 soundinput $97 - sound $f, $f2, $0700 + sound __, 16, $f2, $0700 soundinput $8 endchannel -; f21bc -Sfx_WaterGun_Ch8: ; f21bc - noise $f, $3f, $22 - noise $f, $f2, $21 +Sfx_WaterGun_Ch8: + noise __, 16, $3f, $22 + noise __, 16, $f2, $21 endchannel -; f21c3 -Sfx_SwordsDance_Ch8: ; f21c3 - noise $f, $4f, $41 - noise $8, $8f, $41 - noise $8, $cf, $41 - noise $8, $f2, $42 - noise $f, $f2, $41 +Sfx_SwordsDance_Ch8: + noise __, 16, $4f, $41 + noise __, 9, $8f, $41 + noise __, 9, $cf, $41 + noise __, 9, $f2, $42 + noise __, 16, $f2, $41 endchannel -; f21d3 -Sfx_Thunder_Ch8: ; f21d3 - noise $a, $ff, $50 - noise $f, $ff, $51 - noise $8, $f2, $51 - noise $6, $ff, $52 - noise $6, $ff, $53 - noise $8, $ff, $54 - noise $f, $f2, $54 +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 -; f21e9 -Sfx_Supersonic_Ch5: ; f21e9 +Sfx_Supersonic_Ch5: dutycycle $2 - sound $f, $3f, $07c0 -Sfx_Supersonic_branch_f21ef: ; f21ef - sound $f, $df, $07c0 - loopchannel 4, Sfx_Supersonic_branch_f21ef - sound $f, $d1, $07c0 + sound __, 16, $3f, $07c0 +.loop + sound __, 16, $df, $07c0 + loopchannel 4, .loop + sound __, 16, $d1, $07c0 endchannel -; f21fc -Sfx_Supersonic_Ch6: ; f21fc - unknownmusic0xde $b3 - sound $f, $2f, $07c8 -Sfx_Supersonic_branch_f2202: ; f2202 - sound $f, $cf, $07c7 - loopchannel 4, Sfx_Supersonic_branch_f2202 - sound $f, $c1, $07c8 +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 -; f220f -Sfx_Supersonic_Ch8: ; f220f -Sfx_Supersonic_branch_f220f: ; f220f - noise $3, $97, $12 - noise $3, $a1, $11 - loopchannel 10, Sfx_Supersonic_branch_f220f +Sfx_Supersonic_Ch8: + noise __, 4, $97, $12 + noise __, 4, $a1, $11 + loopchannel 10, Sfx_Supersonic_Ch8 endchannel -; f221a -Sfx_Leer_Ch5: ; f221a -Sfx_Leer_branch_f221a: ; f221a +Sfx_Leer_Ch5: dutycycle $0 - sound $0, $f1, $07c0 - sound $0, $f1, $0700 - loopchannel 12, Sfx_Leer_branch_f221a + sound __, 1, $f1, $07c0 + sound __, 1, $f1, $0700 + loopchannel 12, Sfx_Leer_Ch5 endchannel -; f2229 -Sfx_Leer_Ch6: ; f2229 -Sfx_Leer_branch_f2229: ; f2229 - unknownmusic0xde $b3 - sound $0, $e1, $07c1 - sound $0, $e1, $0701 - loopchannel 12, Sfx_Leer_branch_f2229 +Sfx_Leer_Ch6: + sound_duty 3, 0, 3, 2 + sound __, 1, $e1, $07c1 + sound __, 1, $e1, $0701 + loopchannel 12, Sfx_Leer_Ch6 endchannel -; f2238 -Sfx_Leer_Ch8: ; f2238 -Sfx_Leer_branch_f2238: ; f2238 - noise $1, $d1, $49 - noise $1, $d1, $29 - loopchannel 6, Sfx_Leer_branch_f2238 +Sfx_Leer_Ch8: + noise __, 2, $d1, $49 + noise __, 2, $d1, $29 + loopchannel 6, Sfx_Leer_Ch8 endchannel -; f2243 -Sfx_Ember_Ch5: ; f2243 -Sfx_Ember_branch_f2243: ; f2243 - unknownmusic0xde $c9 - sound $b, $f3, $0120 - sound $9, $d3, $0150 - loopchannel 5, Sfx_Ember_branch_f2243 - sound $8, $e3, $0130 - sound $f, $c2, $0110 +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 -; f225a -Sfx_Ember_Ch8: ; f225a -Sfx_Ember_branch_f225a: ; f225a - noise $a, $f3, $35 - noise $e, $f6, $45 - loopchannel 4, Sfx_Ember_branch_f225a - noise $c, $f4, $bc - noise $c, $f5, $9c - noise $f, $f4, $ac +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 -; f226e -Sfx_Bubblebeam_Ch5: ; f226e -Sfx_Bubblebeam_branch_f226e: ; f226e - unknownmusic0xde $39 - sound $4, $f4, $0600 - sound $3, $c4, $0500 - sound $5, $b5, $0600 - sound $d, $e2, $06c0 - loopchannel 3, Sfx_Bubblebeam_branch_f226e - sound $8, $d1, $0600 +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 -; f2289 -Sfx_Bubblebeam_Ch6: ; f2289 -Sfx_Bubblebeam_branch_f2289: ; f2289 - unknownmusic0xde $8d - sound $5, $e4, $05e0 - sound $4, $b4, $04e0 - sound $6, $a5, $05e8 - sound $e, $d1, $06a0 - loopchannel 3, Sfx_Bubblebeam_branch_f2289 +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 -; f22a0 -Sfx_Bubblebeam_Ch8: ; f22a0 -Sfx_Bubblebeam_branch_f22a0: ; f22a0 - noise $5, $c3, $33 - noise $3, $92, $43 - noise $a, $b5, $33 - noise $f, $c3, $32 - loopchannel 2, Sfx_Bubblebeam_branch_f22a0 +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 -; f22b1 -Sfx_HydroPump_Ch5: ; f22b1 -Sfx_HydroPump_branch_f22b1: ; f22b1 - unknownmusic0xde $d2 - sound $3, $81, $0300 - sound $3, $c1, $0400 - sound $3, $f1, $0500 - sound $3, $b1, $0400 - sound $3, $71, $0300 - loopchannel 5, Sfx_HydroPump_branch_f22b1 - sound $8, $81, $0400 +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 -; f22d0 -Sfx_HydroPump_Ch8: ; f22d0 -Sfx_HydroPump_branch_f22d0: ; f22d0 - noise $3, $62, $22 - noise $3, $a2, $32 - noise $3, $d2, $33 - noise $3, $92, $23 - noise $3, $52, $12 - loopchannel 5, Sfx_HydroPump_branch_f22d0 - noise $8, $81, $12 +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 -; f22e7 -Sfx_Surf_Ch5: ; f22e7 -Sfx_Surf_branch_f22e7: ; f22e7 - unknownmusic0xde $39 - sound $f, $f4, $0500 - sound $f, $c4, $0400 - sound $f, $e2, $05c0 - loopchannel 3, Sfx_Surf_branch_f22e7 +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 -; f22fa -Sfx_Surf_Ch6: ; f22fa -Sfx_Surf_branch_f22fa: ; f22fa - unknownmusic0xde $8d - sound $7, $e4, $0430 - sound $f, $b4, $0330 - sound $f, $a2, $0438 - loopchannel 4, Sfx_Surf_branch_f22fa +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 -; f230d -Sfx_Surf_Ch8: ; f230d -Sfx_Surf_branch_f230d: ; f230d - noise $9, $f4, $44 - noise $9, $f2, $43 - noise $f, $f4, $42 - noise $f, $f4, $41 - loopchannel 3, Sfx_Surf_branch_f230d +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 -; f231e -Sfx_Psybeam_Ch5: ; f231e -Sfx_Psybeam_branch_f231e: ; f231e - unknownmusic0xde $a1 - sound $a, $f1, $0640 - sound $a, $f3, $0680 - sound $a, $f2, $0620 - loopchannel 4, Sfx_Psybeam_branch_f231e - sound $a, $f1, $0640 +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 -; f2335 -Sfx_Psybeam_Ch6: ; f2335 -Sfx_Psybeam_branch_f2335: ; f2335 - unknownmusic0xde $b3 - sound $a, $f3, $0571 - sound $7, $e3, $0531 - sound $a, $f1, $0551 - loopchannel 4, Sfx_Psybeam_branch_f2335 - sound $a, $f1, $0571 +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 -; f234c -Sfx_Psybeam_Ch8: ; f234c -Sfx_Psybeam_branch_f234c: ; f234c - noise $2, $d1, $4a - noise $2, $d2, $2a - loopchannel 21, Sfx_Psybeam_branch_f234c +Sfx_Psybeam_Ch8: + noise __, 3, $d1, $4a + noise __, 3, $d2, $2a + loopchannel 21, Sfx_Psybeam_Ch8 endchannel -; f2357 -Sfx_Charge_Ch5: ; f2357 -Sfx_Charge_branch_f2357: ; f2357 +Sfx_Charge_Ch5: dutycycle $0 - sound $2, $f1, $0200 - sound $3, $f1, $0700 - sound $4, $f1, $0500 - sound $5, $f1, $07f0 - loopchannel 8, Sfx_Charge_branch_f2357 + sound __, 3, $f1, $0200 + sound __, 4, $f1, $0700 + sound __, 5, $f1, $0500 + sound __, 6, $f1, $07f0 + loopchannel 8, Sfx_Charge_Ch5 endchannel -; f236e -Sfx_Charge_Ch6: ; f236e -Sfx_Charge_branch_f236e: ; f236e - unknownmusic0xde $b3 - sound $2, $e1, $0302 - sound $3, $e1, $07f2 - sound $4, $e1, $0602 - sound $5, $e1, $0702 - loopchannel 8, Sfx_Charge_branch_f236e +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 -; f2385 -Sfx_Charge_Ch8: ; f2385 -Sfx_Charge_branch_f2385: ; f2385 - noise $2, $d3, $10 - noise $3, $d3, $11 - noise $2, $d2, $10 - noise $5, $d2, $12 - loopchannel 9, Sfx_Charge_branch_f2385 +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 -; f2396 -Sfx_Thundershock_Ch5: ; f2396 -Sfx_Thundershock_branch_f2396: ; f2396 - unknownmusic0xde $2b - sound $3, $f1, $07f0 - sound $4, $f2, $0200 - loopchannel 8, Sfx_Thundershock_branch_f2396 +Sfx_Thundershock_Ch5: + sound_duty 3, 2, 2, 0 + sound __, 4, $f1, $07f0 + sound __, 5, $f2, $0200 + loopchannel 8, Sfx_Thundershock_Ch5 endchannel -; f23a5 -Sfx_Thundershock_Ch6: ; f23a5 -Sfx_Thundershock_branch_f23a5: ; f23a5 - unknownmusic0xde $b3 - sound $4, $e2, $0202 - sound $4, $e1, $07e2 - loopchannel 9, Sfx_Thundershock_branch_f23a5 +Sfx_Thundershock_Ch6: + sound_duty 3, 0, 3, 2 + sound __, 5, $e2, $0202 + sound __, 5, $e1, $07e2 + loopchannel 9, Sfx_Thundershock_Ch6 endchannel -; f23b4 -Sfx_Thundershock_Ch8: ; f23b4 -Sfx_Thundershock_branch_f23b4: ; f23b4 - noise $4, $ff, $43 - noise $4, $f2, $44 - loopchannel 9, Sfx_Thundershock_branch_f23b4 +Sfx_Thundershock_Ch8: + noise __, 5, $ff, $43 + noise __, 5, $f2, $44 + loopchannel 9, Sfx_Thundershock_Ch8 endchannel -; f23bf -Sfx_Psychic_Ch5: ; f23bf +Sfx_Psychic_Ch5: dutycycle $2 soundinput $f7 - sound $8, $c4, $07bd - sound $8, $c4, $07be - sound $8, $c4, $07bf - sound $8, $c4, $07c0 - sound $f, $c4, $07c1 - sound $f, $f2, $07c0 + sound __, 9, $c4, $07bd + sound __, 9, $c4, $07be + sound __, 9, $c4, $07bf + sound __, 9, $c4, $07c0 + sound __, 16, $c4, $07c1 + sound __, 16, $f2, $07c0 soundinput $8 endchannel -; f23de -Sfx_Psychic_Ch6: ; f23de +Sfx_Psychic_Ch6: dutycycle $2 - sound $8, $c4, $0770 - sound $8, $c4, $0761 - sound $8, $c4, $0762 - sound $8, $c4, $0763 - sound $f, $c4, $0764 - sound $f, $f2, $0764 + sound __, 9, $c4, $0770 + sound __, 9, $c4, $0761 + sound __, 9, $c4, $0762 + sound __, 9, $c4, $0763 + sound __, 16, $c4, $0764 + sound __, 16, $f2, $0764 endchannel -; f23f9 -Sfx_Psychic_Ch8: ; f23f9 - noise $f, $3f, $14 - noise $f, $cf, $13 - noise $f, $cf, $12 - noise $f, $cf, $11 - noise $f, $cf, $10 - noise $f, $c2, $10 +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 -; f240c -Sfx_Screech_Ch5: ; f240c +Sfx_Screech_Ch5: dutycycle $2 - sound $f, $ff, $07e0 - sound $f, $ff, $07e0 - sound $f, $ff, $07e0 - sound $f, $ff, $07e0 - sound $f, $f2, $07e0 + sound __, 16, $ff, $07e0 + sound __, 16, $ff, $07e0 + sound __, 16, $ff, $07e0 + sound __, 16, $ff, $07e0 + sound __, 16, $f2, $07e0 endchannel -; f2423 -Sfx_Screech_Ch6: ; f2423 +Sfx_Screech_Ch6: dutycycle $3 - sound $f, $ff, $07e2 - sound $f, $ff, $07e1 - sound $f, $ff, $07e2 - sound $f, $ff, $07e1 - sound $f, $f2, $07e2 + sound __, 16, $ff, $07e2 + sound __, 16, $ff, $07e1 + sound __, 16, $ff, $07e2 + sound __, 16, $ff, $07e1 + sound __, 16, $f2, $07e2 endchannel -; f243a -Sfx_BoneClub_Ch5: ; f243a +Sfx_BoneClub_Ch5: dutycycle $2 soundinput $af - sound $8, $f1, $0700 + sound __, 9, $f1, $0700 soundinput $8 endchannel -; f2445 -Sfx_BoneClub_Ch6: ; f2445 +Sfx_BoneClub_Ch6: dutycycle $3 - sound $8, $f1, $0701 + sound __, 9, $f1, $0701 endchannel -; f244c -Sfx_Sharpen_Ch5: ; f244c +Sfx_Sharpen_Ch5: dutycycle $2 - sound $6, $f1, $0500 - sound $6, $f1, $0580 - sound $6, $f1, $0600 - sound $6, $f1, $0680 - sound $8, $f1, $0700 + sound __, 7, $f1, $0500 + sound __, 7, $f1, $0580 + sound __, 7, $f1, $0600 + sound __, 7, $f1, $0680 + sound __, 9, $f1, $0700 endchannel -; f2463 -Sfx_Sharpen_Ch6: ; f2463 +Sfx_Sharpen_Ch6: dutycycle $3 - sound $6, $e1, $0510 - sound $6, $e1, $0590 - sound $6, $e1, $0610 - sound $6, $e1, $0690 - sound $8, $e1, $0710 + sound __, 7, $e1, $0510 + sound __, 7, $e1, $0590 + sound __, 7, $e1, $0610 + sound __, 7, $e1, $0690 + sound __, 9, $e1, $0710 endchannel -; f247a -Sfx_EggBomb_Ch5: ; f247a - unknownmusic0xde $ed - sound $8, $ff, $03f8 - sound $f, $ff, $0400 - sound $f, $f3, $0400 +Sfx_EggBomb_Ch5: + sound_duty 1, 3, 2, 3 + sound __, 9, $ff, $03f8 + sound __, 16, $ff, $0400 + sound __, 16, $f3, $0400 endchannel -; f2489 -Sfx_EggBomb_Ch6: ; f2489 - unknownmusic0xde $b4 - sound $8, $ef, $03c0 - sound $f, $ef, $03c0 - sound $f, $e3, $03c0 +Sfx_EggBomb_Ch6: + sound_duty 0, 1, 3, 2 + sound __, 9, $ef, $03c0 + sound __, 16, $ef, $03c0 + sound __, 16, $e3, $03c0 endchannel -; f2498 -Sfx_EggBomb_Ch8: ; f2498 - noise $4, $ff, $51 - noise $8, $ff, $54 - noise $f, $ff, $55 - noise $f, $f3, $56 +Sfx_EggBomb_Ch8: + noise __, 5, $ff, $51 + noise __, 9, $ff, $54 + noise __, 16, $ff, $55 + noise __, 16, $f3, $56 endchannel -; f24a5 -Sfx_Sing_Ch5: ; f24a5 +Sfx_Sing_Ch5: togglesfx vibrato $a, $24 dutycycle $2 @@ -5187,9 +4513,8 @@ Sfx_Sing_Ch5: ; f24a5 octave 5 note G_, 8 endchannel -; f24b6 -Sfx_Sing_Ch6: ; f24b6 +Sfx_Sing_Ch6: togglesfx vibrato $a, $23 dutycycle $2 @@ -5203,180 +4528,160 @@ Sfx_Sing_Ch6: ; f24b6 octave 5 note G_, 8 endchannel -; f24ca -Sfx_HyperBeam_Ch5: ; f24ca +Sfx_HyperBeam_Ch5: dutycycle $0 - sound $2, $f1, $0780 - sound $2, $f1, $0700 - sound $2, $f1, $0790 - sound $2, $f1, $0700 - sound $2, $f1, $07a0 - sound $2, $f1, $0700 - sound $2, $f1, $07b0 - sound $2, $f1, $0700 - sound $2, $f1, $07c0 - sound $2, $f1, $0700 - sound $2, $f1, $07d0 -Sfx_HyperBeam_branch_f24f8: ; f24f8 - sound $2, $f1, $0700 - sound $2, $f1, $07e0 - loopchannel 12, Sfx_HyperBeam_branch_f24f8 - sound $f, $f1, $0700 + 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 -; f2509 -Sfx_HyperBeam_Ch6: ; f2509 - unknownmusic0xde $b3 - sound $2, $f1, $0781 - sound $2, $f1, $0701 - sound $2, $f1, $0791 - sound $2, $f1, $0701 - sound $2, $f1, $07a1 - sound $2, $f1, $0701 - sound $2, $f1, $07b1 - sound $2, $f1, $0701 - sound $2, $f1, $07c1 - sound $2, $f1, $0701 - sound $2, $f1, $07d1 -Sfx_HyperBeam_branch_f2537: ; f2537 - sound $2, $f1, $0701 - sound $2, $f1, $07e1 - loopchannel 12, Sfx_HyperBeam_branch_f2537 - sound $f, $f1, $0701 +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 -; f2548 -Sfx_HyperBeam_Ch8: ; f2548 -Sfx_HyperBeam_branch_f2548: ; f2548 - noise $1, $d1, $49 - noise $1, $d1, $29 - loopchannel 26, Sfx_HyperBeam_branch_f2548 +Sfx_HyperBeam_Ch8: + noise __, 2, $d1, $49 + noise __, 2, $d1, $29 + loopchannel 26, Sfx_HyperBeam_Ch8 endchannel -; f2553 -Sfx_Unknown60_Ch8: ; f2553 - noise $6, $20, $10 - noise $6, $2f, $40 - noise $6, $4f, $41 - noise $6, $8f, $41 - noise $6, $cf, $42 - noise $8, $d7, $42 - noise $f, $e7, $43 - noise $f, $f2, $43 +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 -; f256c -Sfx_UnknownCB_Ch8: ; f256c - noise $1, $10, $10 - noise $2, $20, $10 - noise $2, $30, $20 - noise $2, $40, $20 - noise $2, $50, $21 - noise $2, $60, $22 - noise $4, $70, $22 - noise $8, $80, $22 - noise $f, $94, $22 +Sfx_IntroWhoosh_Ch8: + noise __, 2, $10, $10 + noise __, 3, $20, $10 + noise __, 3, $30, $20 + noise __, 3, $40, $20 + noise __, 3, $50, $21 + noise __, 3, $60, $22 + noise __, 5, $70, $22 + noise __, 9, $80, $22 + noise __, 16, $94, $22 endchannel -; f2588 -Sfx_Unknown61_Ch8: ; f2588 - noise $4, $d1, $41 +Sfx_Unknown61_Ch8: + noise __, 5, $d1, $41 endchannel -; f258c -Sfx_Unknown62_Ch8: ; f258c - noise $4, $c1, $42 +Sfx_SwitchPockets_Ch8: + noise __, 5, $c1, $42 endchannel -; f2590 -Sfx_Unknown63_Ch8: ; f2590 - noise $2, $6f, $21 - noise $2, $af, $31 - noise $f, $f2, $41 +Sfx_Unknown63_Ch8: + noise __, 3, $6f, $21 + noise __, 3, $af, $31 + noise __, 16, $f2, $41 endchannel -; f259a -Sfx_Burn_Ch8: ; f259a - noise $2, $d2, $32 - noise $f, $f2, $43 +Sfx_Burn_Ch8: + noise __, 3, $d2, $32 + noise __, 16, $f2, $43 endchannel -; f25a1 -Sfx_TitleScreenEntrance_Ch8: ; f25a1 - noise $2, $70, $22 - noise $2, $80, $23 - noise $2, $90, $24 - noise $2, $a0, $25 - noise $2, $b0, $26 - noise $f, $c2, $26 +Sfx_TitleScreenEntrance_Ch8: + noise __, 3, $70, $22 + noise __, 3, $80, $23 + noise __, 3, $90, $24 + noise __, 3, $a0, $25 + noise __, 3, $b0, $26 + noise __, 16, $c2, $26 endchannel -; f25b4 -Sfx_Unknown66_Ch5: ; f25b4 +Sfx_Unknown66_Ch5: dutycycle $2 - sound $1, $f2, $06a0 - sound $1, $f2, $06e0 - sound $8, $f1, $0700 + sound __, 2, $f2, $06a0 + sound __, 2, $f2, $06e0 + sound __, 9, $f1, $0700 endchannel -; f25c3 -Sfx_GetCoinFromSlots_Ch5: ; f25c3 +Sfx_GetCoinFromSlots_Ch5: dutycycle $2 - sound $2, $f1, $0700 - sound $8, $81, $07e0 + sound __, 3, $f1, $0700 + sound __, 9, $81, $07e0 endchannel -; f25ce -Sfx_PayDay_Ch5: ; f25ce +Sfx_PayDay_Ch5: dutycycle $3 - sound $5, $e1, $0700 - sound $2, $e1, $0780 - sound $f, $f1, $07c0 + sound __, 6, $e1, $0700 + sound __, 3, $e1, $0780 + sound __, 16, $f1, $07c0 endchannel -; f25dd -Sfx_PayDay_Ch6: ; f25dd +Sfx_PayDay_Ch6: dutycycle $2 - sound $4, $c1, $06c1 - sound $2, $c1, $0741 - sound $f, $d1, $0781 + sound __, 5, $c1, $06c1 + sound __, 3, $c1, $0741 + sound __, 16, $d1, $0781 endchannel -; f25ec -Sfx_Metronome_Ch5: ; f25ec +Sfx_Metronome_Ch5: dutycycle $2 soundinput $5f - sound $4, $40, $07e0 - sound $4, $60, $07e0 - sound $4, $80, $07e0 - sound $8, $a0, $07e0 - sound $8, $a0, $07e0 - sound $8, $80, $07e0 - sound $8, $60, $07e0 - sound $8, $30, $07e0 - sound $f, $12, $07e0 + sound __, 5, $40, $07e0 + sound __, 5, $60, $07e0 + sound __, 5, $80, $07e0 + sound __, 9, $a0, $07e0 + sound __, 9, $a0, $07e0 + sound __, 9, $80, $07e0 + sound __, 9, $60, $07e0 + sound __, 9, $30, $07e0 + sound __, 16, $12, $07e0 soundinput $8 endchannel -; f2617 -Sfx_Unknown5F_Ch5: ; f2617 -Sfx_Unknown5F_branch_f2617: ; f2617 - sound $2, $f7, $0601 - sound $2, $f7, $0701 - loopchannel 8, Sfx_Unknown5F_branch_f2617 +Sfx_Unknown5F_Ch5: + sound __, 3, $f7, $0601 + sound __, 3, $f7, $0701 + loopchannel 8, Sfx_Unknown5F_Ch5 endchannel -; f2624 -Sfx_Unknown5F_Ch6: ; f2624 - sound $1, $f7, $ffff - sound $2, $f7, $0602 - sound $2, $f7, $0702 - loopchannel 8, Sfx_Unknown5F_branch_f2617 +Sfx_Unknown5F_Ch6: + sound __, 2, $f7, $ffff + sound __, 3, $f7, $0602 + sound __, 3, $f7, $0702 + loopchannel 8, Sfx_Unknown5F_Ch5 endchannel -; f2635 -Sfx_Fanfare2_Ch5: ; f2635 +Sfx_Fanfare2_Ch5: togglesfx sfxpriorityon tempo 256 @@ -5400,9 +4705,8 @@ Sfx_Fanfare2_Ch5: ; f2635 note C#, 12 sfxpriorityoff endchannel -; f2658 -Sfx_Fanfare2_Ch6: ; f2658 +Sfx_Fanfare2_Ch6: togglesfx dutycycle $2 notetype $6, $c5 @@ -5421,9 +4725,8 @@ Sfx_Fanfare2_Ch6: ; f2658 notetype $4, $c6 note F_, 12 endchannel -; f2673 -Sfx_Fanfare2_Ch8: ; f2673 +Sfx_Fanfare2_Ch8: togglesfx notetype $6 note C_, 1 @@ -5442,9 +4745,8 @@ Sfx_Fanfare2_Ch8: ; f2673 note F_, 2 note G#, 6 endchannel -; f2687 -Sfx_Fanfare_Ch5: ; f2687 +Sfx_Fanfare_Ch5: togglesfx sfxpriorityon tempo 256 @@ -5473,9 +4775,8 @@ Sfx_Fanfare_Ch5: ; f2687 note C#, 12 sfxpriorityoff endchannel -; f26af -Sfx_Fanfare_Ch6: ; f26af +Sfx_Fanfare_Ch6: togglesfx dutycycle $2 notetype $6, $c4 @@ -5510,9 +4811,8 @@ Sfx_Fanfare_Ch6: ; f26af notetype $4, $c6 note F#, 12 endchannel -; f26d8 -Sfx_Fanfare_Ch8: ; f26d8 +Sfx_Fanfare_Ch8: togglesfx notetype $6 note C_, 1 @@ -5536,100 +4836,83 @@ Sfx_Fanfare_Ch8: ; f26d8 note F_, 4 note F#, 6 endchannel -; f26f1 -Sfx_HangUp_Ch5: ; f26f1 +Sfx_HangUp_Ch5: dutycycle $2 - sound $4, $b8, $077b - sound $2, $21, $077b - sound $10, $0, $0000 -Sfx_HangUp_branch_f26ff: ; f26ff -Sfx_NoSignal_Ch5: ; f26ff -Sfx_NoSignal_branch_f26ff: ; f26ff + sound __, 5, $b8, $077b + sound __, 3, $21, $077b + sound C_, 1, $0, 0 +Sfx_NoSignal_Ch5: dutycycle $2 - sound $14, $e8, $070b - sound $1c, $0, $0000 - loopchannel 3, Sfx_HangUp_branch_f26ff + sound C_, 5, $e8, $070b + sound C_, 13, $0, 0 + loopchannel 3, Sfx_NoSignal_Ch5 endchannel -; f270e -Sfx_Sandstorm_Ch8: ; f270e -Sfx_Sandstorm_branch_f270e: ; f270e -Sfx_Unknown5F_Ch8: ; f270e -Sfx_Unknown5F_branch_f270e: ; f270e - noise $1, $f8, $41 - noise $2, $9c, $24 - noise $0, $0, $0 - noise $3, $59, $16 - noise $2, $0, $0 - loopchannel 3, Sfx_Sandstorm_branch_f270e +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 -; f2722 -Sfx_Elevator_Ch5: ; f2722 +Sfx_Elevator_Ch5: dutycycle $2 soundinput $5a -Sfx_Elevator_branch_f2726: ; f2726 - sound $2, $f1, $0300 - loopchannel 48, Sfx_Elevator_branch_f2726 +.loop + sound __, 3, $f1, $0300 + loopchannel 48, .loop soundinput $8 dutycycle $2 - sound $f, $f3, $0730 - sound $8, $65, $0730 - sound $f, $f4, $0700 - sound $f, $74, $0700 - sound $f, $44, $0700 - sound $f, $24, $0700 + sound __, 16, $f3, $0730 + sound __, 9, $65, $0730 + sound __, 16, $f4, $0700 + sound __, 16, $74, $0700 + sound __, 16, $44, $0700 + sound __, 16, $24, $0700 endchannel -; f274b -Sfx_Elevator_Ch6: ; f274b -Sfx_Elevator_Ch7: ; f274b - sound $60, $0, $0000 - sound $53, $0, $0000 +Sfx_Elevator_Ch6: +Sfx_Elevator_Ch7: + sound F_, 1, $0, 0 + sound E_, 4, $0, 0 endchannel -; f2754 -Sfx_Elevator_Ch8: ; f2754 - noise $60, $0, $0 - noise $53, $0, $0 +Sfx_Elevator_Ch8: + noise F_, 1, $0, $0 + noise E_, 4, $0, $0 endchannel -; f275b -Sfx_StopSlot: ; f275b - dbw $04, Sfx_StopSlot_Ch5 -; f275e +Sfx_StopSlot: + musicheader 1, 5, Sfx_StopSlot_Ch5 -Sfx_StopSlot_Ch5: ; f275e +Sfx_StopSlot_Ch5: dutycycle $2 - sound $1, $f8, $0760 - sound $4, $82, $0760 + sound __, 2, $f8, $0760 + sound __, 5, $82, $0760 endchannel -; f2769 -Sfx_GlassTing: ; f2769 - dbw $04, Sfx_GlassTing_Ch5 -; f276c +Sfx_GlassTing: + musicheader 1, 5, Sfx_GlassTing_Ch5 -Sfx_GlassTing_Ch5: ; f276c +Sfx_GlassTing_Ch5: dutycycle $2 - sound $20, $d1, $07dc + sound C#, 1, $d1, $07dc endchannel -; f2773 -Sfx_GlassTing2: ; f2773 - dbw $44, Sfx_GlassTing2_Ch5 - dbw $05, Sfx_GlassTing2_Ch6 -; f2779 +Sfx_GlassTing2: + musicheader 2, 5, Sfx_GlassTing2_Ch5 + musicheader 1, 6, Sfx_GlassTing2_Ch6 -Sfx_GlassTing2_Ch5: ; f2779 +Sfx_GlassTing2_Ch5: dutycycle $2 - sound $10, $f1, $07dc + sound C_, 1, $f1, $07dc endchannel -; f2780 -Sfx_GlassTing2_Ch6: ; f2780 +Sfx_GlassTing2_Ch6: dutycycle $2 - sound $10, $d1, $07dd + sound C_, 1, $d1, $07dd endchannel -; f2787 diff --git a/crysaudio/sfx_crystal.asm b/crysaudio/sfx_crystal.asm index 08806a7c..0c283123 100644 --- a/crysaudio/sfx_crystal.asm +++ b/crysaudio/sfx_crystal.asm @@ -1,175 +1,152 @@ -Sfx_IntroUnown1: ; 17982d - dbw $04, Sfx_IntroUnown1_Ch5 -; 179830 +Sfx_IntroUnown1: + musicheader 1, 5, Sfx_IntroUnown1_Ch5 -Sfx_IntroUnown1_Ch5: ; 179830 +Sfx_IntroUnown1_Ch5: vibrato $1, $a3 dutycycle $2 - sound $8, $39, $0705 - sound $20, $e2, $0705 + sound __, 9, $39, $0705 + sound C#, 1, $e2, $0705 endchannel -; 17983e -Sfx_IntroUnown2: ; 17983e - dbw $05, Sfx_IntroUnown2_Ch6 -; 179841 +Sfx_IntroUnown2: + musicheader 1, 6, Sfx_IntroUnown2_Ch6 -Sfx_IntroUnown2_Ch6: ; 179841 +Sfx_IntroUnown2_Ch6: vibrato $1, $73 dutycycle $2 - sound $8, $39, $0758 - sound $20, $e2, $0758 + sound __, 9, $39, $0758 + sound C#, 1, $e2, $0758 endchannel -; 17984f -Sfx_IntroUnown3: ; 17984f - dbw $06, Sfx_IntroUnown3_Ch7 -; 179852 +Sfx_IntroUnown3: + musicheader 1, 7, Sfx_IntroUnown3_Ch7 -Sfx_IntroUnown3_Ch7: ; 179852 +Sfx_IntroUnown3_Ch7: vibrato $1, $53 - sound $3, $32, $07c2 - sound $3, $22, $07c2 - sound $3, $12, $07c2 - sound $10, $12, $07c2 - sound $6, $22, $07c2 - sound $6, $32, $07c2 + sound __, 4, $32, $07c2 + sound __, 4, $22, $07c2 + sound __, 4, $12, $07c2 + sound C_, 1, $12, $07c2 + sound __, 7, $22, $07c2 + sound __, 7, $32, $07c2 endchannel -; 17986e -Sfx_DittoPopUp: ; 17986e - dbw $04, Sfx_DittoPopUp_Ch5 -; 179871 +Sfx_DittoPopUp: + musicheader 1, 5, Sfx_DittoPopUp_Ch5 -Sfx_DittoPopUp_Ch5: ; 179871 +Sfx_DittoPopUp_Ch5: dutycycle $2 soundinput $1e - sound $3, $82, $0700 - sound $1, $31, $0701 + sound __, 4, $82, $0700 + sound __, 2, $31, $0701 soundinput $16 - sound $4, $b1, $0640 - sound $10, $31, $0641 + sound __, 5, $b1, $0640 + sound C_, 1, $31, $0641 endchannel -; 179888 -Sfx_DittoTransform: ; 179888 - dbw $04, Sfx_DittoTransform_Ch5 -; 17988b +Sfx_DittoTransform: + musicheader 1, 5, Sfx_DittoTransform_Ch5 -Sfx_DittoTransform_Ch5: ; 17988b +Sfx_DittoTransform_Ch5: dutycycle $1 soundinput $26 - sound $14, $3b, $0440 - sound $4, $97, $04c0 - sound $4, $67, $04c1 - sound $4, $42, $04c2 + sound C_, 5, $3b, $0440 + sound __, 5, $97, $04c0 + sound __, 5, $67, $04c1 + sound __, 5, $42, $04c2 endchannel -; 1798a0 -Sfx_IntroSuicune1: ; 1798a0 - dbw $07, Sfx_IntroSuicune1_Ch8 -; 1798a3 +Sfx_IntroSuicune1: + musicheader 1, 8, Sfx_IntroSuicune1_Ch8 -Sfx_IntroSuicune1_Ch8: ; 1798a3 - noise $1, $58, $59 - noise $2, $91, $23 +Sfx_IntroSuicune1_Ch8: + noise __, 2, $58, $59 + noise __, 3, $91, $23 endchannel -; 1798aa -Sfx_IntroPichu: ; 1798aa - dbw $04, Sfx_IntroPichu_Ch5 -; 1798ad +Sfx_IntroPichu: + musicheader 1, 5, Sfx_IntroPichu_Ch5 -Sfx_IntroPichu_Ch5: ; 1798ad +Sfx_IntroPichu_Ch5: dutycycle $3 soundinput $4d - sound $1, $88, $0770 - sound $3, $0, $0000 + sound __, 2, $88, $0770 + sound __, 4, $0, 0 soundinput $17 - sound $2, $88, $0776 + sound __, 3, $88, $0776 endchannel -; 1798c0 -Sfx_IntroSuicune2: ; 1798c0 - dbw $07, Sfx_IntroSuicune2_Ch8 -; 1798c3 +Sfx_IntroSuicune2: + musicheader 1, 8, Sfx_IntroSuicune2_Ch8 -Sfx_IntroSuicune2_Ch8: ; 1798c3 - noise $1, $a7, $31 - noise $1, $91, $0 - noise $1, $92, $21 - noise $1, $91, $0 - noise $1, $92, $22 - noise $1, $82, $11 - noise $1, $82, $22 - noise $1, $72, $11 - noise $1, $72, $12 - noise $1, $62, $10 - noise $1, $63, $0 - noise $1, $53, $10 - noise $1, $43, $0 - noise $1, $33, $10 - noise $1, $23, $0 - noise $1, $13, $10 +Sfx_IntroSuicune2_Ch8: + noise __, 2, $a7, $31 + noise __, 2, $91, $0 + noise __, 2, $92, $21 + noise __, 2, $91, $0 + noise __, 2, $92, $22 + noise __, 2, $82, $11 + noise __, 2, $82, $22 + noise __, 2, $72, $11 + noise __, 2, $72, $12 + noise __, 2, $62, $10 + noise __, 2, $63, $0 + noise __, 2, $53, $10 + noise __, 2, $43, $0 + noise __, 2, $33, $10 + noise __, 2, $23, $0 + noise __, 2, $13, $10 endchannel -; 1798f4 -Sfx_IntroSuicune3: ; 1798f4 - dbw $07, Sfx_IntroSuicune3_Ch8 -; 1798f7 +Sfx_IntroSuicune3: + musicheader 1, 8, Sfx_IntroSuicune3_Ch8 -Sfx_IntroSuicune3_Ch8: ; 1798f7 - noise $1, $88, $31 - noise $8, $39, $11 - noise $4, $a4, $10 - noise $4, $44, $10 - noise $4, $24, $10 +Sfx_IntroSuicune3_Ch8: + noise __, 2, $88, $31 + noise __, 9, $39, $11 + noise __, 5, $a4, $10 + noise __, 5, $44, $10 + noise __, 5, $24, $10 endchannel -; 179907 -Sfx_DittoBounce: ; 179907 - dbw $04, Sfx_DittoBounce_Ch5 -; 17990a +Sfx_DittoBounce: + musicheader 1, 5, Sfx_DittoBounce_Ch5 -Sfx_DittoBounce_Ch5: ; 17990a +Sfx_DittoBounce_Ch5: dutycycle $2 soundinput $2c - sound $2, $82, $04b0 - sound $0, $31, $04b0 + sound __, 3, $82, $04b0 + sound __, 1, $31, $04b0 soundinput $34 - sound $10, $b1, $0420 + sound C_, 1, $b1, $0420 endchannel -; 17991d -Sfx_IntroSuicune4: ; 17991d - dbw $07, Sfx_IntroSuicune4_Ch8 -; 179920 +Sfx_IntroSuicune4: + musicheader 1, 8, Sfx_IntroSuicune4_Ch8 -Sfx_IntroSuicune4_Ch8: ; 179920 - noise $1, $a1, $5c - noise $0, $0, $0 - noise $1, $c1, $4d - noise $0, $0, $0 - noise $4, $b2, $31 - noise $0, $0, $0 - noise $4, $a2, $2 - noise $0, $0, $0 - noise $4, $92, $1 - noise $0, $0, $0 - noise $20, $72, $0 +Sfx_IntroSuicune4_Ch8: + noise __, 2, $a1, $5c + noise __, 1, $0, $0 + noise __, 2, $c1, $4d + noise __, 1, $0, $0 + noise __, 5, $b2, $31 + noise __, 1, $0, $0 + noise __, 5, $a2, $2 + noise __, 1, $0, $0 + noise __, 5, $92, $1 + noise __, 1, $0, $0 + noise C#, 1, $72, $0 endchannel -; 179942 -Sfx_GameFreakPresents: ; 179942 - dbw $04, Sfx_GameFreakPresents_Ch5 -; 179945 +Sfx_GameFreakPresents: + musicheader 1, 5, Sfx_GameFreakPresents_Ch5 -Sfx_GameFreakPresents_Ch5: ; 179945 +Sfx_GameFreakPresents_Ch5: togglesfx dutycycle $2 notetype $2, $b1 soundinput $ff - forceoctave $1a + pitchoffset 1, A# octave 5 note C_, 2 note E_, 2 @@ -185,18 +162,16 @@ Sfx_GameFreakPresents_Ch5: ; 179945 intensity $31 note G_, 3 endchannel -; 179961 -Sfx_Tingle: ; 179961 - dbw $04, Sfx_Tingle_Ch5 -; 179964 +Sfx_Tingle: + musicheader 1, 5, Sfx_Tingle_Ch5 -Sfx_Tingle_Ch5: ; 179964 +Sfx_Tingle_Ch5: togglesfx dutycycle $1 - forceoctave $b + pitchoffset 0, B_ notetype $1, $b1 -Sfx_Tingle_branch_17996c: ; 17996c +.loop octave 5 note C_, 3 octave 6 @@ -204,37 +179,33 @@ Sfx_Tingle_branch_17996c: ; 17996c octave 5 note C_, 3 note __, 2 - loopchannel 2, Sfx_Tingle_branch_17996c + loopchannel 2, .loop note C_, 2 intensity $a1 note G_, 13 endchannel -; 17997c -Sfx_TwoPcBeeps: ; 17997c - dbw $04, Sfx_TwoPcBeeps_Ch5 -; 17997f +Sfx_TwoPcBeeps: + musicheader 1, 5, Sfx_TwoPcBeeps_Ch5 -Sfx_TwoPcBeeps_Ch5: ; 17997f +Sfx_TwoPcBeeps_Ch5: dutycycle $2 - sound $2, $e8, $07c2 - sound $2, $28, $07c2 - sound $2, $e8, $07c2 - sound $2, $28, $07c2 + sound __, 3, $e8, $07c2 + sound __, 3, $28, $07c2 + sound __, 3, $e8, $07c2 + sound __, 3, $28, $07c2 endchannel -; 179992 -Sfx_4NoteDitty: ; 179992 - dbw $84, Sfx_4NoteDitty_Ch5 - dbw $05, Sfx_4NoteDitty_Ch6 - dbw $06, Sfx_4NoteDitty_Ch7 -; 17999b +Sfx_4NoteDitty: + musicheader 3, 5, Sfx_4NoteDitty_Ch5 + musicheader 1, 6, Sfx_4NoteDitty_Ch6 + musicheader 1, 7, Sfx_4NoteDitty_Ch7 -Sfx_4NoteDitty_Ch5: ; 17999b +Sfx_4NoteDitty_Ch5: togglesfx dutycycle $2 notetype $2, $e8 - forceoctave $2 + pitchoffset 0, D_ octave 4 note C_, 2 intensity $48 @@ -254,32 +225,28 @@ Sfx_4NoteDitty_Ch5: ; 17999b intensity $43 note C_, 16 endchannel -; 1799bd -Sfx_4NoteDitty_Ch6: ; 1799bd +Sfx_4NoteDitty_Ch6: togglesfx notetype $2, $b8 note __, 9 note __, 16 endchannel -; 1799c4 -Sfx_4NoteDitty_Ch7: ; 1799c4 +Sfx_4NoteDitty_Ch7: togglesfx notetype $2, $b8 note __, 9 note __, 16 endchannel -; 1799cb -Sfx_Twinkle: ; 1799cb - dbw $04, Sfx_Twinkle_Ch5 -; 1799ce +Sfx_Twinkle: + musicheader 1, 5, Sfx_Twinkle_Ch5 -Sfx_Twinkle_Ch5: ; 1799ce +Sfx_Twinkle_Ch5: togglesfx dutycycle $0 - forceoctave $2 + pitchoffset 0, D_ notetype $2, $e1 octave 3 note G_, 2 @@ -300,4 +267,3 @@ Sfx_Twinkle_Ch5: ; 1799ce octave 5 note G_, 6 endchannel -; 1799ef diff --git a/crysaudio/sfx_pointers.asm b/crysaudio/sfx_pointers.asm index 807ce2a0..0e066c60 100644 --- a/crysaudio/sfx_pointers.asm +++ b/crysaudio/sfx_pointers.asm @@ -1,214 +1,210 @@ -; e927c -; dbw BANK(Sfx_DexFanfare5079), Sfx_DexFanfare5079 - dbw BANK(Sfx_Item), Sfx_Item - dbw BANK(Sfx_Item), Sfx_Item - dbw BANK(Sfx_CaughtMon), Sfx_CaughtMon - dbw BANK(Sfx_PokeballsPlacedOnTable), Sfx_PokeballsPlacedOnTable - dbw BANK(Sfx_Potion), Sfx_Potion - dbw BANK(Sfx_FullHeal), Sfx_FullHeal - dbw BANK(Sfx_Menu), Sfx_Menu - dbw BANK(Sfx_ReadText), Sfx_ReadText - dbw BANK(Sfx_ReadText2), Sfx_ReadText2 - dbw BANK(Sfx_DexFanfare2049), Sfx_DexFanfare2049 - dbw BANK(Sfx_DexFanfare80109), Sfx_DexFanfare80109 - dbw BANK(Sfx_Poison), Sfx_Poison - dbw BANK(Sfx_GotSafariBalls), Sfx_GotSafariBalls - dbw BANK(Sfx_BootPc), Sfx_BootPc - dbw BANK(Sfx_ShutDownPc), Sfx_ShutDownPc - dbw BANK(Sfx_ChoosePcOption), Sfx_ChoosePcOption - dbw BANK(Sfx_EscapeRope), Sfx_EscapeRope - dbw BANK(Sfx_PushButton), Sfx_PushButton - dbw BANK(Sfx_SecondPartOfItemfinder), Sfx_SecondPartOfItemfinder - dbw BANK(Sfx_WarpTo), Sfx_WarpTo - dbw BANK(Sfx_WarpFrom), Sfx_WarpFrom - dbw BANK(Sfx_ChangeDexMode), Sfx_ChangeDexMode - dbw BANK(Sfx_JumpOverLedge), Sfx_JumpOverLedge - dbw BANK(Sfx_GrassRustle), Sfx_GrassRustle - dbw BANK(Sfx_Fly), Sfx_Fly - dbw BANK(Sfx_Wrong), Sfx_Wrong - dbw BANK(Sfx_Squeak), Sfx_Squeak - dbw BANK(Sfx_Strength), Sfx_Strength - dbw BANK(Sfx_Boat), Sfx_Boat - dbw BANK(Sfx_WallOpen), Sfx_WallOpen - dbw BANK(Sfx_PlacePuzzlePieceDown), Sfx_PlacePuzzlePieceDown - dbw BANK(Sfx_EnterDoor), Sfx_EnterDoor - dbw BANK(Sfx_SwitchPokemon), Sfx_SwitchPokemon - dbw BANK(Sfx_Tally), Sfx_Tally - dbw BANK(Sfx_Transaction), Sfx_Transaction - dbw BANK(Sfx_ExitBuilding), Sfx_ExitBuilding - dbw BANK(Sfx_Bump), Sfx_Bump - dbw BANK(Sfx_Save), Sfx_Save - dbw BANK(Sfx_Pokeflute), Sfx_Pokeflute - dbw BANK(Sfx_ElevatorEnd), Sfx_ElevatorEnd - dbw BANK(Sfx_ThrowBall), Sfx_ThrowBall - dbw BANK(Sfx_BallPoof), Sfx_BallPoof - dbw BANK(Sfx_Unknown3A), Sfx_Unknown3A - dbw BANK(Sfx_Run), Sfx_Run - dbw BANK(Sfx_SlotMachineStart), Sfx_SlotMachineStart - dbw BANK(Sfx_Fanfare), Sfx_Fanfare - dbw BANK(Sfx_Peck), Sfx_Peck - dbw BANK(Sfx_Kinesis), Sfx_Kinesis - dbw BANK(Sfx_Lick), Sfx_Lick - dbw BANK(Sfx_Pound), Sfx_Pound - dbw BANK(Sfx_MovePuzzlePiece), Sfx_MovePuzzlePiece - dbw BANK(Sfx_CometPunch), Sfx_CometPunch - dbw BANK(Sfx_MegaPunch), Sfx_MegaPunch - dbw BANK(Sfx_Scratch), Sfx_Scratch - dbw BANK(Sfx_Vicegrip), Sfx_Vicegrip - dbw BANK(Sfx_RazorWind), Sfx_RazorWind - dbw BANK(Sfx_Cut), Sfx_Cut - dbw BANK(Sfx_WingAttack), Sfx_WingAttack - dbw BANK(Sfx_Whirlwind), Sfx_Whirlwind - dbw BANK(Sfx_Bind), Sfx_Bind - dbw BANK(Sfx_VineWhip), Sfx_VineWhip - dbw BANK(Sfx_DoubleKick), Sfx_DoubleKick - dbw BANK(Sfx_MegaKick), Sfx_MegaKick - dbw BANK(Sfx_Headbutt), Sfx_Headbutt - dbw BANK(Sfx_HornAttack), Sfx_HornAttack - dbw BANK(Sfx_Tackle), Sfx_Tackle - dbw BANK(Sfx_PoisonSting), Sfx_PoisonSting - dbw BANK(Sfx_Powder), Sfx_Powder - dbw BANK(Sfx_Doubleslap), Sfx_Doubleslap - dbw BANK(Sfx_Bite), Sfx_Bite - dbw BANK(Sfx_JumpKick), Sfx_JumpKick - dbw BANK(Sfx_Stomp), Sfx_Stomp - dbw BANK(Sfx_TailWhip), Sfx_TailWhip - dbw BANK(Sfx_KarateChop), Sfx_KarateChop - dbw BANK(Sfx_Submission), Sfx_Submission - dbw BANK(Sfx_WaterGun), Sfx_WaterGun - dbw BANK(Sfx_SwordsDance), Sfx_SwordsDance - dbw BANK(Sfx_Thunder), Sfx_Thunder - dbw BANK(Sfx_Supersonic), Sfx_Supersonic - dbw BANK(Sfx_Leer), Sfx_Leer - dbw BANK(Sfx_Ember), Sfx_Ember - dbw BANK(Sfx_Bubblebeam), Sfx_Bubblebeam - dbw BANK(Sfx_HydroPump), Sfx_HydroPump - dbw BANK(Sfx_Surf), Sfx_Surf - dbw BANK(Sfx_Psybeam), Sfx_Psybeam - dbw BANK(Sfx_Charge), Sfx_Charge - dbw BANK(Sfx_Thundershock), Sfx_Thundershock - dbw BANK(Sfx_Psychic), Sfx_Psychic - dbw BANK(Sfx_Screech), Sfx_Screech - dbw BANK(Sfx_BoneClub), Sfx_BoneClub - dbw BANK(Sfx_Sharpen), Sfx_Sharpen - dbw BANK(Sfx_EggBomb), Sfx_EggBomb - dbw BANK(Sfx_Sing), Sfx_Sing - dbw BANK(Sfx_HyperBeam), Sfx_HyperBeam - dbw BANK(Sfx_Shine), Sfx_Shine - dbw BANK(Sfx_Unknown5F), Sfx_Unknown5F - dbw BANK(Sfx_Unknown60), Sfx_Unknown60 - dbw BANK(Sfx_Unknown61), Sfx_Unknown61 - dbw BANK(Sfx_Unknown62), Sfx_Unknown62 - dbw BANK(Sfx_Unknown63), Sfx_Unknown63 - dbw BANK(Sfx_Burn), Sfx_Burn - dbw BANK(Sfx_TitleScreenEntrance), Sfx_TitleScreenEntrance - dbw BANK(Sfx_Unknown66), Sfx_Unknown66 - dbw BANK(Sfx_GetCoinFromSlots), Sfx_GetCoinFromSlots - dbw BANK(Sfx_PayDay), Sfx_PayDay - dbw BANK(Sfx_Metronome), Sfx_Metronome - dbw BANK(Sfx_Call), Sfx_Call - dbw BANK(Sfx_HangUp), Sfx_HangUp - dbw BANK(Sfx_NoSignal), Sfx_NoSignal - dbw BANK(Sfx_Sandstorm), Sfx_Sandstorm - dbw BANK(Sfx_Elevator), Sfx_Elevator - dbw BANK(Sfx_Protect), Sfx_Protect - dbw BANK(Sfx_Sketch), Sfx_Sketch - dbw BANK(Sfx_RainDance), Sfx_RainDance - dbw BANK(Sfx_Aeroblast), Sfx_Aeroblast - dbw BANK(Sfx_Spark), Sfx_Spark - dbw BANK(Sfx_Curse), Sfx_Curse - dbw BANK(Sfx_Rage), Sfx_Rage - dbw BANK(Sfx_Thief), Sfx_Thief - dbw BANK(Sfx_Thief2), Sfx_Thief2 - dbw BANK(Sfx_SpiderWeb), Sfx_SpiderWeb - dbw BANK(Sfx_MindReader), Sfx_MindReader - dbw BANK(Sfx_Nightmare), Sfx_Nightmare - dbw BANK(Sfx_Snore), Sfx_Snore - dbw BANK(Sfx_SweetKiss), Sfx_SweetKiss - dbw BANK(Sfx_SweetKiss2), Sfx_SweetKiss2 - dbw BANK(Sfx_BellyDrum), Sfx_BellyDrum - dbw BANK(Sfx_Unknown7F), Sfx_Unknown7F - dbw BANK(Sfx_SludgeBomb), Sfx_SludgeBomb - dbw BANK(Sfx_Foresight), Sfx_Foresight - dbw BANK(Sfx_Spite), Sfx_Spite - dbw BANK(Sfx_Outrage), Sfx_Outrage - dbw BANK(Sfx_PerishSong), Sfx_PerishSong - dbw BANK(Sfx_GigaDrain), Sfx_GigaDrain - dbw BANK(Sfx_Attract), Sfx_Attract - dbw BANK(Sfx_Kinesis2), Sfx_Kinesis2 - dbw BANK(Sfx_ZapCannon), Sfx_ZapCannon - dbw BANK(Sfx_MeanLook), Sfx_MeanLook - dbw BANK(Sfx_HealBell), Sfx_HealBell - dbw BANK(Sfx_Return), Sfx_Return - dbw BANK(Sfx_ExpBar), Sfx_ExpBar - dbw BANK(Sfx_MilkDrink), Sfx_MilkDrink - dbw BANK(Sfx_Present), Sfx_Present - dbw BANK(Sfx_MorningSun), Sfx_MorningSun - dbw BANK(Sfx_LevelUp), Sfx_LevelUp - dbw BANK(Sfx_KeyItem), Sfx_KeyItem - dbw BANK(Sfx_Fanfare2), Sfx_Fanfare2 - dbw BANK(Sfx_RegisterPhoneNumber), Sfx_RegisterPhoneNumber - dbw BANK(Sfx_3RdPlace), Sfx_3RdPlace - dbw BANK(Sfx_GetEggFromDaycareMan), Sfx_GetEggFromDaycareMan - dbw BANK(Sfx_GetEggFromDaycareLady), Sfx_GetEggFromDaycareLady - dbw BANK(Sfx_MoveDeleted), Sfx_MoveDeleted - dbw BANK(Sfx_2ndPlace), Sfx_2ndPlace - dbw BANK(Sfx_1stPlace), Sfx_1stPlace - dbw BANK(Sfx_ChooseACard), Sfx_ChooseACard - dbw BANK(Sfx_GetTm), Sfx_GetTm - dbw BANK(Sfx_GetBadge), Sfx_GetBadge - dbw BANK(Sfx_QuitSlots), Sfx_QuitSlots - dbw BANK(Sfx_EggCrack), Sfx_EggCrack - dbw BANK(Sfx_DexFanfareLessThan20), Sfx_DexFanfareLessThan20 - dbw BANK(Sfx_DexFanfare140169), Sfx_DexFanfare140169 - dbw BANK(Sfx_DexFanfare170199), Sfx_DexFanfare170199 - dbw BANK(Sfx_DexFanfare200229), Sfx_DexFanfare200229 - dbw BANK(Sfx_DexFanfare230Plus), Sfx_DexFanfare230Plus - dbw BANK(Sfx_Evolved), Sfx_Evolved - dbw BANK(Sfx_MasterBall), Sfx_MasterBall - dbw BANK(Sfx_EggHatch), Sfx_EggHatch - dbw BANK(Sfx_GsIntroCharizardFireball), Sfx_GsIntroCharizardFireball - dbw BANK(Sfx_GsIntroPokemonAppears), Sfx_GsIntroPokemonAppears - dbw BANK(Sfx_Flash), Sfx_Flash - dbw BANK(Sfx_GameFreakLogoGs), Sfx_GameFreakLogoGs - dbw BANK(Sfx_NotVeryEffective), Sfx_NotVeryEffective - dbw BANK(Sfx_Damage), Sfx_Damage - dbw BANK(Sfx_SuperEffective), Sfx_SuperEffective - dbw BANK(Sfx_BallBounce), Sfx_BallBounce - dbw BANK(Sfx_Moonlight), Sfx_Moonlight - dbw BANK(Sfx_Encore), Sfx_Encore - dbw BANK(Sfx_BeatUp), Sfx_BeatUp - dbw BANK(Sfx_BatonPass), Sfx_BatonPass - dbw BANK(Sfx_BallWiggle), Sfx_BallWiggle - dbw BANK(Sfx_SweetScent), Sfx_SweetScent - dbw BANK(Sfx_SweetScent2), Sfx_SweetScent2 - dbw BANK(Sfx_HitEndOfExpBar), Sfx_HitEndOfExpBar - dbw BANK(Sfx_GiveTrademon), Sfx_GiveTrademon - dbw BANK(Sfx_GetTrademon), Sfx_GetTrademon - dbw BANK(Sfx_TrainArrived), Sfx_TrainArrived - dbw BANK(Sfx_StopSlot), Sfx_StopSlot - dbw BANK(Sfx_2Boops), Sfx_2Boops - dbw BANK(Sfx_GlassTing), Sfx_GlassTing - dbw BANK(Sfx_GlassTing2), Sfx_GlassTing2 - -; Crystal adds the following SFX: - - dbw BANK(Sfx_IntroUnown1), Sfx_IntroUnown1 - dbw BANK(Sfx_IntroUnown2), Sfx_IntroUnown2 - dbw BANK(Sfx_IntroUnown3), Sfx_IntroUnown3 - dbw BANK(Sfx_DittoPopUp), Sfx_DittoPopUp - dbw BANK(Sfx_DittoTransform), Sfx_DittoTransform - dbw BANK(Sfx_IntroSuicune1), Sfx_IntroSuicune1 - dbw BANK(Sfx_IntroPichu), Sfx_IntroPichu - dbw BANK(Sfx_IntroSuicune2), Sfx_IntroSuicune2 - dbw BANK(Sfx_IntroSuicune3), Sfx_IntroSuicune3 - dbw BANK(Sfx_DittoBounce), Sfx_DittoBounce - dbw BANK(Sfx_IntroSuicune4), Sfx_IntroSuicune4 - dbw BANK(Sfx_GameFreakPresents), Sfx_GameFreakPresents - dbw BANK(Sfx_Tingle), Sfx_Tingle - dbw BANK(Sfx_UnknownCB), Sfx_UnknownCB - dbw BANK(Sfx_TwoPcBeeps), Sfx_TwoPcBeeps - dbw BANK(Sfx_4NoteDitty), Sfx_4NoteDitty - dbw BANK(Sfx_Twinkle), Sfx_Twinkle -; e94e9 - +SFX: +; entries correspond to SFX_* constants + dba Sfx_DexFanfare5079 + dba Sfx_Item + dba Sfx_CaughtMon + dba Sfx_PokeballsPlacedOnTable + dba Sfx_Potion + dba Sfx_FullHeal + dba Sfx_Menu + dba Sfx_ReadText + dba Sfx_ReadText2 + dba Sfx_DexFanfare2049 + dba Sfx_DexFanfare80109 + dba Sfx_Poison + dba Sfx_GotSafariBalls + dba Sfx_BootPc + dba Sfx_ShutDownPc + dba Sfx_ChoosePcOption + dba Sfx_EscapeRope + dba Sfx_PushButton + dba Sfx_SecondPartOfItemfinder + dba Sfx_WarpTo + dba Sfx_WarpFrom + dba Sfx_ChangeDexMode + dba Sfx_JumpOverLedge + dba Sfx_GrassRustle + dba Sfx_Fly + dba Sfx_Wrong + dba Sfx_Squeak + dba Sfx_Strength + dba Sfx_Boat + dba Sfx_WallOpen + dba Sfx_PlacePuzzlePieceDown + dba Sfx_EnterDoor + dba Sfx_SwitchPokemon + dba Sfx_Tally + dba Sfx_Transaction + dba Sfx_ExitBuilding + dba Sfx_Bump + dba Sfx_Save + dba Sfx_Pokeflute + dba Sfx_ElevatorEnd + dba Sfx_ThrowBall + dba Sfx_BallPoof + dba Sfx_Unknown3A + dba Sfx_Run + dba Sfx_SlotMachineStart + dba Sfx_Fanfare + dba Sfx_Peck + dba Sfx_Kinesis + dba Sfx_Lick + dba Sfx_Pound + dba Sfx_MovePuzzlePiece + dba Sfx_CometPunch + dba Sfx_MegaPunch + dba Sfx_Scratch + dba Sfx_Vicegrip + dba Sfx_RazorWind + dba Sfx_Cut + dba Sfx_WingAttack + dba Sfx_Whirlwind + dba Sfx_Bind + dba Sfx_VineWhip + dba Sfx_DoubleKick + dba Sfx_MegaKick + dba Sfx_Headbutt + dba Sfx_HornAttack + dba Sfx_Tackle + dba Sfx_PoisonSting + dba Sfx_Powder + dba Sfx_Doubleslap + dba Sfx_Bite + dba Sfx_JumpKick + dba Sfx_Stomp + dba Sfx_TailWhip + dba Sfx_KarateChop + dba Sfx_Submission + dba Sfx_WaterGun + dba Sfx_SwordsDance + dba Sfx_Thunder + dba Sfx_Supersonic + dba Sfx_Leer + dba Sfx_Ember + dba Sfx_Bubblebeam + dba Sfx_HydroPump + dba Sfx_Surf + dba Sfx_Psybeam + dba Sfx_Charge + dba Sfx_Thundershock + dba Sfx_Psychic + dba Sfx_Screech + dba Sfx_BoneClub + dba Sfx_Sharpen + dba Sfx_EggBomb + dba Sfx_Sing + dba Sfx_HyperBeam + dba Sfx_Shine + dba Sfx_Unknown5F + dba Sfx_Unknown60 + dba Sfx_Unknown61 + dba Sfx_SwitchPockets + dba Sfx_Unknown63 + dba Sfx_Burn + dba Sfx_TitleScreenEntrance + dba Sfx_Unknown66 + dba Sfx_GetCoinFromSlots + dba Sfx_PayDay + dba Sfx_Metronome + dba Sfx_Call + dba Sfx_HangUp + dba Sfx_NoSignal + dba Sfx_Sandstorm + dba Sfx_Elevator + dba Sfx_Protect + dba Sfx_Sketch + dba Sfx_RainDance + dba Sfx_Aeroblast + dba Sfx_Spark + dba Sfx_Curse + dba Sfx_Rage + dba Sfx_Thief + dba Sfx_Thief2 + dba Sfx_SpiderWeb + dba Sfx_MindReader + dba Sfx_Nightmare + dba Sfx_Snore + dba Sfx_SweetKiss + dba Sfx_SweetKiss2 + dba Sfx_BellyDrum + dba Sfx_Unknown7F + dba Sfx_SludgeBomb + dba Sfx_Foresight + dba Sfx_Spite + dba Sfx_Outrage + dba Sfx_PerishSong + dba Sfx_GigaDrain + dba Sfx_Attract + dba Sfx_Kinesis2 + dba Sfx_ZapCannon + dba Sfx_MeanLook + dba Sfx_HealBell + dba Sfx_Return + dba Sfx_ExpBar + dba Sfx_MilkDrink + dba Sfx_Present + dba Sfx_MorningSun + dba Sfx_LevelUp + dba Sfx_KeyItem + dba Sfx_Fanfare2 + dba Sfx_RegisterPhoneNumber + dba Sfx_3RdPlace + dba Sfx_GetEggFromDayCareMan + dba Sfx_GetEggFromDayCareLady + dba Sfx_MoveDeleted + dba Sfx_2ndPlace + dba Sfx_1stPlace + dba Sfx_ChooseACard + dba Sfx_GetTm + dba Sfx_GetBadge + dba Sfx_QuitSlots + dba Sfx_EggCrack + dba Sfx_DexFanfareLessThan20 + dba Sfx_DexFanfare140169 + dba Sfx_DexFanfare170199 + dba Sfx_DexFanfare200229 + dba Sfx_DexFanfare230Plus + dba Sfx_Evolved + dba Sfx_MasterBall + dba Sfx_EggHatch + dba Sfx_GsIntroCharizardFireball + dba Sfx_GsIntroPokemonAppears + dba Sfx_Flash + dba Sfx_GameFreakLogoGs + dba Sfx_NotVeryEffective + dba Sfx_Damage + dba Sfx_SuperEffective + dba Sfx_BallBounce + dba Sfx_Moonlight + dba Sfx_Encore + dba Sfx_BeatUp + dba Sfx_BatonPass + dba Sfx_BallWobble + dba Sfx_SweetScent + dba Sfx_SweetScent2 + dba Sfx_HitEndOfExpBar + dba Sfx_GiveTrademon + dba Sfx_GetTrademon + dba Sfx_TrainArrived + dba Sfx_StopSlot + dba Sfx_2Boops + dba Sfx_GlassTing + dba Sfx_GlassTing2 +; new to Crystal + dba Sfx_IntroUnown1 + dba Sfx_IntroUnown2 + dba Sfx_IntroUnown3 + dba Sfx_DittoPopUp + dba Sfx_DittoTransform + dba Sfx_IntroSuicune1 + dba Sfx_IntroPichu + dba Sfx_IntroSuicune2 + dba Sfx_IntroSuicune3 + dba Sfx_DittoBounce + dba Sfx_IntroSuicune4 + dba Sfx_GameFreakPresents + dba Sfx_Tingle + dba Sfx_IntroWhoosh + dba Sfx_TwoPcBeeps + dba Sfx_4NoteDitty + dba Sfx_Twinkle diff --git a/crysaudio/trainer_encounters.asm b/crysaudio/trainer_encounters.asm index de748d26..a64d160f 100644 --- a/crysaudio/trainer_encounters.asm +++ b/crysaudio/trainer_encounters.asm @@ -1,96 +1,75 @@ -; Currently, must be in the same bank as the sound engine. +; What music plays when a trainer notices you -PlayTrainerEncounterMusic:: ; e900a -; input: e = trainer type - ; turn fade off - xor a - ld [MusicFade], a - ; play nothing for one frame - push de - ld de, $0000 ; id: Music_Nothing - call PlayMusic - call DelayFrame - ; play new song - call MaxVolume - pop de - ld d, $00 - ld hl, TrainerEncounterMusic - add hl, de - ld e, [hl] - call PlayMusic - ret -; e9027 - -TrainerEncounterMusic: ; e9027 - db MUSIC_HIKER_ENCOUNTER - db MUSIC_YOUNGSTER_ENCOUNTER ; falkner - db MUSIC_LASS_ENCOUNTER ; whitney - db MUSIC_YOUNGSTER_ENCOUNTER ; bugsy - db MUSIC_OFFICER_ENCOUNTER ; morty - db MUSIC_OFFICER_ENCOUNTER ; pryce - db MUSIC_LASS_ENCOUNTER ; jasmine - db MUSIC_OFFICER_ENCOUNTER ; chuck - db MUSIC_BEAUTY_ENCOUNTER ; clair - db MUSIC_RIVAL_ENCOUNTER ; rival1 - db MUSIC_HIKER_ENCOUNTER ; pokemon_prof - db MUSIC_HIKER_ENCOUNTER ; will - db MUSIC_HIKER_ENCOUNTER ; cal - db MUSIC_OFFICER_ENCOUNTER ; bruno - db MUSIC_HIKER_ENCOUNTER ; karen - db MUSIC_HIKER_ENCOUNTER ; koga - db MUSIC_OFFICER_ENCOUNTER ; champion - db MUSIC_YOUNGSTER_ENCOUNTER ; brock - db MUSIC_LASS_ENCOUNTER ; misty - db MUSIC_OFFICER_ENCOUNTER ; lt_surge - db MUSIC_ROCKET_ENCOUNTER ; scientist - db MUSIC_OFFICER_ENCOUNTER ; erika - db MUSIC_YOUNGSTER_ENCOUNTER ; youngster - db MUSIC_YOUNGSTER_ENCOUNTER ; schoolboy - db MUSIC_YOUNGSTER_ENCOUNTER ; bird_keeper - db MUSIC_LASS_ENCOUNTER ; lass - db MUSIC_LASS_ENCOUNTER ; janine - db MUSIC_HIKER_ENCOUNTER ; cooltrainerm - db MUSIC_BEAUTY_ENCOUNTER ; cooltrainerf - db MUSIC_BEAUTY_ENCOUNTER ; beauty - db MUSIC_POKEMANIAC_ENCOUNTER ; pokemaniac - db MUSIC_ROCKET_ENCOUNTER ; gruntm - db MUSIC_HIKER_ENCOUNTER ; gentleman - db MUSIC_BEAUTY_ENCOUNTER ; skier - db MUSIC_BEAUTY_ENCOUNTER ; teacher - db MUSIC_BEAUTY_ENCOUNTER ; sabrina - db MUSIC_YOUNGSTER_ENCOUNTER ; bug_catcher - db MUSIC_HIKER_ENCOUNTER ; fisher - db MUSIC_HIKER_ENCOUNTER ; swimmerm - db MUSIC_BEAUTY_ENCOUNTER ; swimmerf - db MUSIC_HIKER_ENCOUNTER ; sailor - db MUSIC_POKEMANIAC_ENCOUNTER ; super_nerd - db MUSIC_RIVAL_ENCOUNTER ; rival2 - db MUSIC_HIKER_ENCOUNTER ; guitarist - db MUSIC_HIKER_ENCOUNTER ; hiker - db MUSIC_HIKER_ENCOUNTER ; biker - db MUSIC_OFFICER_ENCOUNTER ; blaine - db MUSIC_POKEMANIAC_ENCOUNTER ; burglar - db MUSIC_HIKER_ENCOUNTER ; firebreather - db MUSIC_POKEMANIAC_ENCOUNTER ; juggler - db MUSIC_HIKER_ENCOUNTER ; blackbelt_t - db MUSIC_ROCKET_ENCOUNTER ; executivem - db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t - db MUSIC_LASS_ENCOUNTER ; picnicker - db MUSIC_YOUNGSTER_ENCOUNTER ; camper - db MUSIC_ROCKET_ENCOUNTER ; executivef - db MUSIC_SAGE_ENCOUNTER ; sage - db MUSIC_SAGE_ENCOUNTER ; medium - db MUSIC_HIKER_ENCOUNTER ; boarder - db MUSIC_HIKER_ENCOUNTER ; pokefanm - db MUSIC_KIMONO_ENCOUNTER ; kimono_girl - db MUSIC_LASS_ENCOUNTER ; twins - db MUSIC_BEAUTY_ENCOUNTER ; pokefanf - db MUSIC_HIKER_ENCOUNTER ; red - db MUSIC_RIVAL_ENCOUNTER ; blue - db MUSIC_HIKER_ENCOUNTER ; officer - db MUSIC_ROCKET_ENCOUNTER ; gruntf - db MUSIC_HIKER_ENCOUNTER ; mysticalman +TrainerEncounterMusic:: +; entries correspond to trainer classes (see constants/trainer_constants.asm) + db MUSIC_HIKER_ENCOUNTER ; none + db MUSIC_YOUNGSTER_ENCOUNTER ; falkner + db MUSIC_LASS_ENCOUNTER ; whitney + db MUSIC_YOUNGSTER_ENCOUNTER ; bugsy + db MUSIC_OFFICER_ENCOUNTER ; morty + db MUSIC_OFFICER_ENCOUNTER ; pryce + db MUSIC_LASS_ENCOUNTER ; jasmine + db MUSIC_OFFICER_ENCOUNTER ; chuck + db MUSIC_BEAUTY_ENCOUNTER ; clair + db MUSIC_RIVAL_ENCOUNTER ; rival1 + db MUSIC_HIKER_ENCOUNTER ; pokemon_prof + db MUSIC_HIKER_ENCOUNTER ; will + db MUSIC_HIKER_ENCOUNTER ; cal + db MUSIC_OFFICER_ENCOUNTER ; bruno + db MUSIC_HIKER_ENCOUNTER ; karen + db MUSIC_HIKER_ENCOUNTER ; koga + db MUSIC_OFFICER_ENCOUNTER ; champion + db MUSIC_YOUNGSTER_ENCOUNTER ; brock + db MUSIC_LASS_ENCOUNTER ; misty + db MUSIC_OFFICER_ENCOUNTER ; lt_surge + db MUSIC_ROCKET_ENCOUNTER ; scientist + db MUSIC_OFFICER_ENCOUNTER ; erika + db MUSIC_YOUNGSTER_ENCOUNTER ; youngster + db MUSIC_YOUNGSTER_ENCOUNTER ; schoolboy + db MUSIC_YOUNGSTER_ENCOUNTER ; bird_keeper + db MUSIC_LASS_ENCOUNTER ; lass + db MUSIC_LASS_ENCOUNTER ; janine + db MUSIC_HIKER_ENCOUNTER ; cooltrainerm + db MUSIC_BEAUTY_ENCOUNTER ; cooltrainerf + db MUSIC_BEAUTY_ENCOUNTER ; beauty + db MUSIC_POKEMANIAC_ENCOUNTER ; pokemaniac + db MUSIC_ROCKET_ENCOUNTER ; gruntm + db MUSIC_HIKER_ENCOUNTER ; gentleman + db MUSIC_BEAUTY_ENCOUNTER ; skier + db MUSIC_BEAUTY_ENCOUNTER ; teacher + db MUSIC_BEAUTY_ENCOUNTER ; sabrina + db MUSIC_YOUNGSTER_ENCOUNTER ; bug_catcher + db MUSIC_HIKER_ENCOUNTER ; fisher + db MUSIC_HIKER_ENCOUNTER ; swimmerm + db MUSIC_BEAUTY_ENCOUNTER ; swimmerf + db MUSIC_HIKER_ENCOUNTER ; sailor + db MUSIC_POKEMANIAC_ENCOUNTER ; super_nerd + db MUSIC_RIVAL_ENCOUNTER ; rival2 + db MUSIC_HIKER_ENCOUNTER ; guitarist + db MUSIC_HIKER_ENCOUNTER ; hiker + db MUSIC_HIKER_ENCOUNTER ; biker + db MUSIC_OFFICER_ENCOUNTER ; blaine + db MUSIC_POKEMANIAC_ENCOUNTER ; burglar + db MUSIC_HIKER_ENCOUNTER ; firebreather + db MUSIC_POKEMANIAC_ENCOUNTER ; juggler + db MUSIC_HIKER_ENCOUNTER ; blackbelt_t + db MUSIC_ROCKET_ENCOUNTER ; executivem + db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t + db MUSIC_LASS_ENCOUNTER ; picnicker + db MUSIC_YOUNGSTER_ENCOUNTER ; camper + db MUSIC_ROCKET_ENCOUNTER ; executivef + db MUSIC_SAGE_ENCOUNTER ; sage + db MUSIC_SAGE_ENCOUNTER ; medium + db MUSIC_HIKER_ENCOUNTER ; boarder + db MUSIC_HIKER_ENCOUNTER ; pokefanm + db MUSIC_KIMONO_ENCOUNTER ; kimono_girl + db MUSIC_LASS_ENCOUNTER ; twins + db MUSIC_BEAUTY_ENCOUNTER ; pokefanf + db MUSIC_HIKER_ENCOUNTER ; red + db MUSIC_RIVAL_ENCOUNTER ; blue + db MUSIC_HIKER_ENCOUNTER ; officer + db MUSIC_ROCKET_ENCOUNTER ; gruntf + db MUSIC_HIKER_ENCOUNTER ; mysticalman db MUSIC_HIKER_ENCOUNTER db MUSIC_HIKER_ENCOUNTER db MUSIC_HIKER_ENCOUNTER -; e906e diff --git a/crysaudio/wave_samples.asm b/crysaudio/wave_samples.asm new file mode 100644 index 00000000..9567aa21 --- /dev/null +++ b/crysaudio/wave_samples.asm @@ -0,0 +1,23 @@ +WaveSamples: + ; These are streams of 32 nybbles (4-bit values) used as wave patterns. + ; Plot them as a line chart to see the wave's shape. + dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 + dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1 + dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1 + dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 + dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0 + dn 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 3, 3, 2, 2, 1, 1, 15, 15, 14, 14, 12, 12, 10, 10, 8, 8, 10, 10, 12, 12, 14, 14 + dn 0, 2, 4, 6, 8, 10, 12, 14, 12, 11, 10, 9, 8, 7, 6, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 1, 1 + dn 12, 0, 10, 9, 8, 7, 15, 5, 15, 15, 15, 14, 14, 13, 13, 12, 4, 4, 3, 3, 2, 2, 15, 1, 0, 2, 4, 6, 8, 10, 12, 14 + dn 4, 4, 3, 3, 2, 2, 1, 15, 0, 0, 4, 6, 8, 10, 12, 14, 15, 8, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5 + dn 1, 1, 0, 0, 0, 0, 0, 8, 0, 0, 1, 3, 5, 7, 9, 10, 11, 4, 11, 10, 10, 9, 9, 8, 8, 7, 6, 5, 4, 3, 2, 1 + dn 7, 9, 11, 13, 15, 15, 15, 15, 15, 15, 15, 15, 15, 13, 11, 9, 7, 5, 3, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 3, 5 + dn 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15 + dn 4, 6, 8, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 10, 8, 6, 4, 2, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 2 + dn 7, 10, 13, 15, 15, 15, 13, 10, 7, 4, 1, 0, 0, 0, 1, 4, 7, 10, 13, 15, 15, 15, 13, 10, 7, 4, 1, 0, 0, 0, 1, 4 + dn 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + ; only indices 0-E are valid - additional waves must be loaded with load_wave +; dn 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3 ; RBY Lavender Town +; dn 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 2, 2, 15, 7, 2, 4, 2, 2, 15, 7, 3, 4, 2, 4, 15, 7, 4, 4 ; RBY Pokemon Tower +; dn 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; TCG2 +; dn 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11 ; TCG2 Credits diff --git a/crysmacros.asm b/crysmacros.asm index b8a65f16..442ae2f8 100644 --- a/crysmacros.asm +++ b/crysmacros.asm @@ -1,29 +1,320 @@ -; rgbds macros +INCLUDE "crysaudio/enum.asm" +maskbits: MACRO +; masks just enough bits to cover the first argument +; the second argument is an optional shift amount +; e.g. "maskbits 26" becomes "and %00011111" (since 26 - 1 = %00011001) +; and "maskbits 3, 2" becomes "and %00001100" (since "maskbits 3" becomes %00000011) +; example usage in rejection sampling: +; .loop +; call Random +; maskbits 26 +; cp 26 +; jr nc, .loop +x = 1 +rept 8 +if x + 1 < (\1) +x = x << 1 | 1 +endc +endr +if _NARG == 2 + and x << (\2) +else + and x +endc +ENDM +musicheader: MACRO + ; number of tracks, track idx, address + dbw ((\1 - 1) << 6) + (\2 - 1), \3 +ENDM note: MACRO - db \1 << 4 + (\2 - 1) - ENDM + dn (\1), (\2) - 1 +ENDM -; pitch -__ EQU 0 -C_ EQU 1 -C# EQU 2 -D_ EQU 3 -D# EQU 4 -E_ EQU 5 -F_ EQU 6 -F# EQU 7 -G_ EQU 8 -G# EQU 9 -A_ EQU 10 -A# EQU 11 -B_ EQU 12 +sound: MACRO + note \1, \2 + db \3 ; intensity + dw \4 ; frequency +ENDM + +noise: MACRO + note \1, \2 ; duration + db \3 ; intensity + db \4 ; frequency +ENDM + +; MusicCommands indexes (see audio/engine.asm) + enum_start $d0, +8 +FIRST_MUSIC_CMD EQU __enum__ + + enum octave_cmd ; $d0 +octave: MACRO + db octave_cmd | 8 - (\1) +ENDM + +__enumdir__ = +1 + + enum notetype_cmd ; $d8 +notetype: MACRO + db notetype_cmd + db \1 ; note_length +if _NARG >= 2 + db \2 ; intensity +endc +ENDM + + enum pitchoffset_cmd ; $d9 +pitchoffset: MACRO + db pitchoffset_cmd + dn \1, \2 - 1 ; octave, key +ENDM + + enum tempo_cmd ; $da +tempo: MACRO + db tempo_cmd + bigdw \1 ; tempo +ENDM + + enum dutycycle_cmd ; $db +dutycycle: MACRO + db dutycycle_cmd + db \1 ; duty_cycle +ENDM + + enum intensity_cmd ; $dc +intensity: MACRO + db intensity_cmd + db \1 ; intensity +ENDM + + enum soundinput_cmd ; $dd +soundinput: MACRO + db soundinput_cmd + db \1 ; input +ENDM + + enum sound_duty_cmd ; $de +sound_duty: MACRO + db sound_duty_cmd +if _NARG == 4 + db \1 | (\2 << 2) | (\3 << 4) | (\4 << 6) ; duty sequence +else + db \1 ; LEGACY: Support for one-byte duty value +endc +ENDM + + enum togglesfx_cmd ; $df +togglesfx: MACRO + db togglesfx_cmd +ENDM + + enum slidepitchto_cmd ; $e0 +slidepitchto: MACRO + db slidepitchto_cmd + db \1 - 1 ; duration + dn \2, \3 ; octave, pitch +ENDM + + enum vibrato_cmd ; $e1 +vibrato: MACRO + db vibrato_cmd + db \1 ; delay + db \2 ; extent +ENDM + + enum unknownmusic0xe2_cmd ; $e2 +unknownmusic0xe2: MACRO + db unknownmusic0xe2_cmd + db \1 ; unknown +ENDM + + enum togglenoise_cmd ; $e3 +togglenoise: MACRO + db togglenoise_cmd + db \1 ; id +ENDM + + enum panning_cmd ; $e4 +panning: MACRO + db panning_cmd + db \1 ; tracks +ENDM + + enum volume_cmd ; $e5 +volume: MACRO + db volume_cmd + db \1 ; volume +ENDM + + enum tone_cmd ; $e6 +tone: MACRO + db tone_cmd + bigdw \1 ; tone +ENDM + + enum unknownmusic0xe7_cmd ; $e7 +unknownmusic0xe7: MACRO + db unknownmusic0xe7_cmd + db \1 ; unknown +ENDM + + enum unknownmusic0xe8_cmd ; $e8 +unknownmusic0xe8: MACRO + db unknownmusic0xe8_cmd + db \1 ; unknown +ENDM + + enum tempo_relative_cmd ; $e9 +tempo_relative: MACRO + db tempo_relative_cmd + bigdw \1 ; value +ENDM + + enum restartchannel_cmd ; $ea +restartchannel: MACRO + db restartchannel_cmd + dw \1 ; address +ENDM + + enum newsong_cmd ; $eb +newsong: MACRO + db newsong_cmd + bigdw \1 ; id +ENDM + + enum sfxpriorityon_cmd ; $ec +sfxpriorityon: MACRO + db sfxpriorityon_cmd +ENDM + + enum sfxpriorityoff_cmd ; $ed +sfxpriorityoff: MACRO + db sfxpriorityoff_cmd +ENDM + + enum unknownmusic0xee_cmd ; $ee +unknownmusic0xee: MACRO + db unknownmusic0xee_cmd + dw \1 ; address +ENDM + + enum stereopanning_cmd ; $ef +stereopanning: MACRO + db stereopanning_cmd + db \1 ; tracks +ENDM + + enum sfxtogglenoise_cmd ; $f0 +sfxtogglenoise: MACRO + db sfxtogglenoise_cmd + db \1 ; id +ENDM + + enum music0xf1_cmd ; $f1 +music0xf1: MACRO + db music0xf1_cmd +ENDM + + enum music0xf2_cmd ; $f2 +music0xf2: MACRO + db music0xf2_cmd +ENDM + + enum music0xf3_cmd ; $f3 +music0xf3: MACRO + db music0xf3_cmd +ENDM + + enum music0xf4_cmd ; $f4 +music0xf4: MACRO + db music0xf4_cmd +ENDM + + enum music0xf5_cmd ; $f5 +music0xf5: MACRO + db music0xf5_cmd +ENDM + + enum music0xf6_cmd ; $f6 +music0xf6: MACRO + db music0xf6_cmd +ENDM + + enum music0xf7_cmd ; $f7 +music0xf7: MACRO + db music0xf7_cmd +ENDM + + enum music0xf8_cmd ; $f8 +music0xf8: MACRO + db music0xf8_cmd +ENDM + + enum unknownmusic0xf9_cmd ; $f9 +unknownmusic0xf9: MACRO + db unknownmusic0xf9_cmd +ENDM + + enum setcondition_cmd ; $fa +setcondition: MACRO + db setcondition_cmd + db \1 ; condition +ENDM + + enum jumpif_cmd ; $fb +jumpif: MACRO + db jumpif_cmd + db \1 ; condition + dw \2 ; address +ENDM + + enum jumpchannel_cmd ; $fc +jumpchannel: MACRO + db jumpchannel_cmd + dw \1 ; address +ENDM + + enum loopchannel_cmd ; $fd +loopchannel: MACRO + db loopchannel_cmd + db \1 ; count + dw \2 ; address +ENDM + + enum callchannel_cmd ; $fe +callchannel: MACRO + db callchannel_cmd + dw \1 ; address +ENDM + + enum endchannel_cmd ; $ff +endchannel: MACRO + db endchannel_cmd +ENDM + +; custom commands: + +load_wave: MACRO + db $f3 + IF _NARG > 16 + REPT 16 + dn \1, \2 + SHIFT + SHIFT + ENDR + ELSE + REPT 16 + db \1 + SHIFT + ENDR + ENDC + ENDM inc_octave: MACRO db $f4 @@ -45,3 +336,7 @@ notetype2: MACRO db $f8, \1 ENDM + +; not reimplemented yet +toggleperfectpitch: MACRO ; XXX + ENDM diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index c2cac383..b03c9186 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -55,7 +55,7 @@ AnimateHealingMachine: ld d, $28 call FlashSprite8Times .waitLoop2 - ld a, [Channel1MusicID] + ld a, [wChannel1MusicID] and a jr nz, .waitLoop2 diff --git a/home.asm b/home.asm index 2e9ffe90..1b29f9b2 100644 --- a/home.asm +++ b/home.asm @@ -3203,7 +3203,7 @@ PlaySoundWaitForCurrent:: WaitForSoundToFinish:: WaitSFX:: ; infinite loop until sfx is done playing - ld a, [Danger] + ld a, [wDanger] and a ret nz ld a, [wSFXDontWait] @@ -3213,19 +3213,19 @@ WaitSFX:: .loop ; ch5 on? - ld hl, Channel5 + Channel1Flags - Channel1 + ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr nz, .loop ; ch6 on? - ld hl, Channel6 + Channel1Flags - Channel1 + ld hl, wChannel6 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr nz, .loop ; ch7 on? - ld hl, Channel7 + Channel1Flags - Channel1 + ld hl, wChannel7 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr nz, .loop ; ch8 on? - ld hl, Channel8 + Channel1Flags - Channel1 + ld hl, wChannel8 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr nz, .loop @@ -3240,19 +3240,19 @@ WaitForSongToFinish:: IsSongPlaying:: ; ch1 on? - ld hl, Channel1 + Channel1Flags - Channel1 + ld hl, wChannel1 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr nz, .playing ; ch2 on? - ld hl, Channel2 + Channel1Flags - Channel1 + ld hl, wChannel2 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr nz, .playing ; ch3 on? - ld hl, Channel3 + Channel1Flags - Channel1 + ld hl, wChannel3 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr nz, .playing ; ch4 on? - ld hl, Channel4 + Channel1Flags - Channel1 + ld hl, wChannel4 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr z, .notPlaying .playing diff --git a/home/audio.asm b/home/audio.asm index b218f89f..cdafc733 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -65,9 +65,9 @@ PlayDefaultMusicCommon:: ld [wLastMusicSoundID], a ld [wNewSoundID], a - ld [MusicFadeID], a + ld [wMusicFadeID], a ld a, 8 - ld [MusicFade], a + ld [wMusicFade], a ;call FadeMusic ; called in updatemusic ret @@ -202,12 +202,12 @@ PlayCry:: push af ; Cry headers are stuck in one bank. - ld a, BANK(CryHeaders) + ld a, BANK(PokemonCries) ld [hROMBank], a ld [$2000], a ; Each header is 6 bytes long: - ld hl, CryHeaders + ld hl, PokemonCries add hl, de add hl, de add hl, de @@ -221,19 +221,19 @@ PlayCry:: inc hl ld a, [hli] - ld [CryPitch], a + ld [wCryPitch], a ld a, [hli] - ld [CryEcho], a + ld [wCryPitch+1], a ld a, [hli] - ld [CryLength], a + ld [wCryLength], a ld a, [hl] - ld [CryLength+1], a + ld [wCryLength+1], a - ld a, BANK(PlayCry_) + ld a, BANK(_PlayCry) ld [hROMBank], a ld [$2000], a - call PlayCry_ + call _PlayCry pop af ld [hROMBank], a @@ -256,7 +256,7 @@ PlaySFX:: ;call CheckSFX ;jr nc, .play ; Does it have priority? - ;ld a, [CurSFX] + ;ld a, [wCurSFX] ;cp e ;jr c, .quit @@ -269,7 +269,7 @@ PlaySFX_play ld [$2000], a ; bankswitch ld a, e - ld [CurSFX], a + ld [wCurSFX], a call _PlaySFX pop af @@ -291,7 +291,7 @@ GLOBAL LoadMusicByte ld [MBC1RomBank], a ld a, [de] - ld [CurMusicByte], a + ld [wCurMusicByte], a ld a, BANK(LoadMusicByte) ld [hROMBank], a diff --git a/home/init.asm b/home/init.asm index 7e4fa82c..8261a8a5 100644 --- a/home/init.asm +++ b/home/init.asm @@ -126,10 +126,7 @@ ClearVram: StopAllSounds:: - call OpenSRAMForSound - ld hl, MusicPlaying - ld bc, (wChannelSelectorSwitches+8) - Crysaudio - call FillMemory + call OpenSRAMForSound ld a, 0 ; BANK(Audio1_UpdateMusic) ld [wAudioROMBank], a diff --git a/home/overworld.asm b/home/overworld.asm index 79a79c56..c799c017 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -772,15 +772,15 @@ HandleBlackOut:: StopMusic:: xor a - ld [MusicFadeID], a + ld [wMusicFadeID], a ld a, 1 - ld [MusicFade], a + ld [wMusicFade], a .wait0 - ld a, [MusicFadeCount] + ld a, [wMusicFadeCount] and a jr z, .wait0 .wait1 - ld a, [MusicFadeCount] + ld a, [wMusicFadeCount] and a jr nz, .wait1 ret @@ -1262,7 +1262,7 @@ CollisionCheckOnLand:: ; curSFX is not cleared for some reason. ; ch5 on? - ld hl, Channel5 + Channel1Flags - Channel1 + ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] jr nz, .setCarry diff --git a/macros/asm_macros.asm b/macros/asm_macros.asm index cb76c65e..50efde33 100755 --- a/macros/asm_macros.asm +++ b/macros/asm_macros.asm @@ -109,7 +109,11 @@ ENDM ; macro for two nibbles dn: MACRO - db (\1 << 4 | \2) +rept _NARG / 2 + db ((\1) << 4) | (\2) + shift + shift +endr ENDM ; macro for putting a byte then a word diff --git a/macros/data_macros.asm b/macros/data_macros.asm index ee5cb8f0..371247d3 100755 --- a/macros/data_macros.asm +++ b/macros/data_macros.asm @@ -1,7 +1,11 @@ ; Constant enumeration is useful for monsters, items, moves, etc. const_def: MACRO +if _NARG >= 1 +const_value = \1 +else const_value = 0 +endc ENDM const: MACRO diff --git a/main.asm b/main.asm index 7f478800..da4e691d 100755 --- a/main.asm +++ b/main.asm @@ -2096,22 +2096,3 @@ INCLUDE "engine/evolution.asm" INCLUDE "engine/overworld/elevator.asm" INCLUDE "engine/items/tm_prices.asm" - -SECTION "bank38",ROMX,BANK[$38] -SpriteBank1: - ds $4000 -SECTION "bank39",ROMX,BANK[$39] -SpriteBank2: - ds $4000 -SECTION "bank3a",ROMX,BANK[$3A] -SpriteBank3: - ds $4000 -SECTION "bank3b",ROMX,BANK[$3b] -SpriteBank4: - ds $4000 -SECTION "bank3e",ROMX,BANK[$3e] -SpriteBank5: - ds $4000 -SECTION "bank3f",ROMX,BANK[$3f] -SpriteBank6: - ds $4000 diff --git a/wram.asm b/wram.asm index 38ad170b..8775f6d7 100755 --- a/wram.asm +++ b/wram.asm @@ -3204,315 +3204,158 @@ INCLUDE "sram.asm" SECTION "crysaudio", SRAM, BANK[0] -Crysaudio:: -MusicPlaying:: ; c100 + +channel_struct: MACRO +; Addreses are wChannel1 (c101). +\1MusicID:: dw +\1MusicBank:: db +\1Flags1:: db ; 0:on/off 1:subroutine 3:sfx 4:noise 5:rest +\1Flags2:: db ; 0:vibrato on/off 2:duty 4:cry pitch +\1Flags3:: db ; 0:vibrato up/down +\1MusicAddress:: dw +\1LastMusicAddress:: dw + dw +\1NoteFlags:: db ; 5:rest +\1Condition:: db ; conditional jumps +\1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%) +\1Intensity:: db ; hi:pressure lo:velocity +\1Frequency:: dw ; 11 bits +\1Pitch:: db ; 0:rest 1-c:note +\1Octave:: db ; 7-0 (0 is highest) +\1PitchOffset:: db ; raises existing octaves (to repeat phrases) +\1NoteDuration:: db ; frames remaining for the current note +\1Field16:: ds 1 + ds 1 +\1LoopCount:: db +\1Tempo:: dw +\1Tracks:: db ; hi:left lo:right +\1SFXDutyLoop:: db +\1VibratoDelayCount:: db ; initialized by \1VibratoDelay +\1VibratoDelay:: db ; number of frames a note plays until vibrato starts +\1VibratoExtent:: db +\1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt +\1PitchWheelTarget:: dw ; frequency endpoint for pitch wheel +\1PitchWheelAmount:: db +\1PitchWheelAmountFraction:: db +\1Field25:: db + ds 1 +\1CryPitch:: dw +\1Field29:: ds 1 +\1Field2a:: ds 2 +\1Field2c:: ds 1 +\1NoteLength:: db ; frames per 16th note +\1Field2e:: ds 1 +\1Field2f:: ds 1 +\1Field30:: ds 1 + ds 1 +ENDM + +wMusic:: + ; nonzero if playing - ds 1 +wMusicPlaying:: db ; c100 -Channels:: -Channel1:: -Channel1MusicID:: ; c101 - ds 2 -Channel1MusicBank:: ; c103 - ds 1 -Channel1Flags:: ; c104 -; 0: on/off -; 1: subroutine -; 2: -; 3: -; 4: noise sampling on/off -; 5: -; 6: -; 7: - ds 1 -Channel1Flags2:: ; c105 -; 0: vibrato on/off -; 1: -; 2: duty cycle on/off -; 3: -; 4: -; 5: -; 6: -; 7: - ds 1 -Channel1Flags3:: ; c106 -; 0: vibrato up/down -; 1: -; 2: -; 3: -; 4: -; 5: -; 6: -; 7: - ds 1 -Channel1MusicAddress:: ; c107 - ds 2 -Channel1LastMusicAddress:: ; c109 - ds 2 -; could have been meant as a third-level address - ds 2 -Channel1NoteFlags:: ; c10d -; 0: -; 1: -; 2: -; 3: -; 4: -; 5: rest -; 6: -; 7: - ds 1 -Channel1Condition:: ; c10e -; used for conditional jumps - ds 1 -Channel1DutyCycle:: ; c10f -; uses top 2 bits only -; 0: 12.5% -; 1: 25% -; 2: 50% -; 3: 75% - ds 1 -Channel1Intensity:: ; c110 -; hi: pressure -; lo: velocity - ds 1 -Channel1Frequency:: -; 11 bits -Channel1FrequencyLo:: ; c111 - ds 1 -Channel1FrequencyHi:: ; c112 - ds 1 -Channel1Pitch:: ; c113 -; 0: rest -; 1: C -; 2: C# -; 3: D -; 4: D# -; 5: E -; 6: F -; 7: F# -; 8: G -; 9: G# -; a: A -; b: A# -; c: B - ds 1 -Channel1Octave:: ; c114 -; 0: highest -; 7: lowest - ds 1 -Channel1StartingOctave:: ; c115 -; raises existing octaves by this value -; used for repeating phrases in a higher octave to save space - ds 1 -Channel1NoteDuration:: ; c116 -; number of frames remaining in the current note - ds 1 -; c117 - ds 1 -; c118 - ds 1 -Channel1LoopCount:: ; c119 - ds 1 -Channel1Tempo:: ; c11a - ds 2 -Channel1Tracks:: ; c11c -; hi: l -; lo: r - ds 1 -; c11d - ds 1 +wChannels:: +wChannel1:: channel_struct wChannel1 ; c101 +wChannel2:: channel_struct wChannel2 ; c133 +wChannel3:: channel_struct wChannel3 ; c165 +wChannel4:: channel_struct wChannel4 ; c197 -Channel1VibratoDelayCount:: ; c11e -; initialized at the value in VibratoDelay -; decrements each frame -; at 0, vibrato starts - ds 1 -Channel1VibratoDelay:: ; c11f -; number of frames a note plays until vibrato starts - ds 1 -Channel1VibratoExtent:: ; c120 -; difference in - ds 1 -Channel1VibratoRate:: ; c121 -; counts down from a max of 15 frames -; over which the pitch is alternated -; hi: init frames -; lo: frame count - ds 1 +wSFXChannels:: +wChannel5:: channel_struct wChannel5 ; c1c9 +wChannel6:: channel_struct wChannel6 ; c1fb +wChannel7:: channel_struct wChannel7 ; c22d +wChannel8:: channel_struct wChannel8 ; c25f -; c122 - ds 1 -; c123 - ds 1 -; c124 - ds 1 -; c125 - ds 1 -; c126 - ds 1 -; c127 - ds 1 -Channel1CryPitch:: ; c128 - ds 1 -Channel1CryEcho:: ; c129 - ds 1 - ds 4 -Channel1NoteLength:: ; c12e -; # frames per 16th note - ds 1 -; c12f - ds 1 -; c130 - ds 1 -; c131 - ds 1 -; c132 - ds 1 -; end + ds 1 ; c291 -Channel2:: ; c133 - ds 50 -Channel3:: ; c165 - ds 50 -Channel4:: ; c197 - ds 50 +wCurTrackDuty:: db +wCurTrackIntensity:: db +wCurTrackFrequency:: dw +wUnusedBCDNumber:: db ; BCD value, dummied out +wCurNoteDuration:: db ; used in MusicE0 and LoadNote -SFXChannels:: -Channel5:: ; c1c9 - ds 50 -Channel6:: ; c1fb - ds 50 -Channel7:: ; c22d - ds 50 -Channel8:: ; c25f - ds 50 - -; c291 - ds 1 -; c292 - ds 1 -; c293 - ds 1 -; c294 - ds 1 -; c295 - ds 1 -; c296 - ds 1 -; c297 - ds 1 - -CurMusicByte:: ; c298 - ds 1 -CurChannel:: ; c299 - ds 1 -Volume:: ; c29a -; corresponds to $ff24 +wCurMusicByte:: db ; c298 +wCurChannel:: db ; c299 +wVolume:: ; c29a +; corresponds to rNR50 ; Channel control / ON-OFF / Volume (R/W) ; bit 7 - Vin->SO2 ON/OFF ; bit 6-4 - SO2 output level (volume) (# 0-7) ; bit 3 - Vin->SO1 ON/OFF ; bit 2-0 - SO1 output level (volume) (# 0-7) - ds 1 -SoundOutput:: ; c29b -; corresponds to $ff25 + db +wSoundOutput:: ; c29b +; corresponds to rNR51 ; bit 4-7: ch1-4 so2 on/off ; bit 0-3: ch1-4 so1 on/off - ds 1 -SoundInput:: ; c29c -; corresponds to $ff26 + db +wSoundInput:: ; c29c +; corresponds to rNR52 ; bit 7: global on/off ; bit 0: ch1 on/off ; bit 1: ch2 on/off ; bit 2: ch3 on/off ; bit 3: ch4 on/off - ds 1 + db -MusicID:: -MusicIDLo:: ; c29d - ds 1 -MusicIDHi:: ; c29e - ds 1 -MusicBank:: ; c29f - ds 1 -NoiseSampleAddress:: -NoiseSampleAddressLo:: ; c2a0 - ds 1 -NoiseSampleAddressHi:: ; c2a1 - ds 1 -; noise delay? ; c2a2 - ds 1 -; c2a3 - ds 1 -MusicNoiseSampleSet:: ; c2a4 - ds 1 -SFXNoiseSampleSet:: ; c2a5 - ds 1 -Danger:: ; c2a6 -wDanger:: ; because i'm dumb +wMusicID:: dw ; c29d +wMusicBank:: db ; c29f +wNoiseSampleAddress:: dw ; c2a0 +wNoiseSampleDelay:: db ; c2a2 + ds 1 ; c2a3 +wMusicNoiseSampleSet:: db ; c2a4 +wSFXNoiseSampleSet:: db ; c2a5 + +;wLowHealthAlarm:: ; c2a6 +wDanger:: ; bit 7: on/off ; bit 4: pitch ; bit 0-3: counter - ds 1 -MusicFade:: ; c2a7 + db + +wMusicFade:: ; c2a7 ; fades volume over x frames ; bit 7: fade in/out ; bit 0-5: number of frames for each volume level ; $00 = none (default) - ds 1 -MusicFadeCount:: ; c2a8 - ds 1 -MusicFadeID:: -MusicFadeIDLo:: ; c2a9 - ds 1 -MusicFadeIDHi:: ; c2aa - ds 1 + db +wMusicFadeCount:: db ; c2a8 +wMusicFadeID:: dw ; c2a9 + ds 5 -CryPitch:: ; c2b0 - ds 1 -CryEcho:: ; c2b1 - ds 1 -CryLength:: ; c2b2 - ds 2 -LastVolume:: ; c2b4 - ds 1 - ds 1 -SFXPriority:: ; c2b6 + +wCryPitch:: dw ; c2b0 +wCryLength:: dw ; c2b2 + +wLastVolume:: db ; c2b4 +wUnusedMusicF9Flag:: db ; c2b5 + +wSFXPriority:: ; c2b6 ; if nonzero, turn off music when playing sfx + db + ds 1 - ds 6 -CryTracks:: ; c2bd + +wChannel1JumpCondition:: db +wChannel2JumpCondition:: db +wChannel3JumpCondition:: db +wChannel4JumpCondition:: db + +wStereoPanningMask:: db ; c2bc + +wCryTracks:: ; c2bd ; plays only in left or right track depending on what side the monster is on ; both tracks active outside of battle - ds 1 - ds 1 -CurSFX:: ; c2bf + db + +wSFXDuration:: db +wCurSFX:: ; c2bf ; id of sfx currently playing - ds 1 -CurMusic:: ; c2c0 -; id of music currently playing - ds 1 + db +wChannelsEnd:: -; misc crys labels -Options:: ds 1 -GBPrinter:: ds 1 -PlayerState:: ds 1 +wMapMusic:: db ; c2c0 -wSongSelection:: ds 2 -wNumNoteLines:: ds 1 -wTmpCh:: ds 1 -wChLastNotes:: ds 3 -wVolTimer:: ds 1 -wC1Vol:: ds 1 -wC1VolSub:: ds 1 -wC2Vol:: ds 1 -wC2VolSub:: ds 1 -wC3Vol:: ds 1 -wC3VolSub:: ds 1 -wC4Vol:: ds 1 -wC4VolSub:: ds 1 -wNoteEnded:: ds 3 -wSelectorTop:: ds 1 -wSelectorCur:: ds 1 -wChannelSelector:: ds 1 -wChannelSelectorSwitches:: ds 8 +;wDontPlayMapMusicOnReload:: db +wMusicEnd:: From c52ab8fb908e030c3d63d732989f6a476a1248b8 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 21 Apr 2019 15:27:10 -0500 Subject: [PATCH 05/33] Fix collision sfx during surfing --- home/overworld.asm | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/home/overworld.asm b/home/overworld.asm index c799c017..0ffb9846 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -771,19 +771,19 @@ HandleBlackOut:: jp SpecialEnterMap StopMusic:: - xor a + xor a ld [wMusicFadeID], a ld a, 1 ld [wMusicFade], a .wait0 - ld a, [wMusicFadeCount] - and a - jr z, .wait0 + ld a, [wMusicFadeCount] + and a + jr z, .wait0 .wait1 - ld a, [wMusicFadeCount] - and a - jr nz, .wait1 - ret + ld a, [wMusicFadeCount] + and a + jr nz, .wait1 + ret ; ld [wAudioFadeOutControl], a ; ld a, $ff ; ld [wNewSoundID], a @@ -1260,11 +1260,11 @@ CollisionCheckOnLand:: ;ld a, [wChannelSoundIDs + Ch4] ;cp SFX_COLLISION ; check if collision sound is already playing ; curSFX is not cleared for some reason. - - ; ch5 on? - ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - + + ; ch5 on? + ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 + bit 0, [hl] + jr nz, .setCarry ld a, SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) @@ -1967,9 +1967,15 @@ CollisionCheckOnWater:: jr z, .stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ld a, [wChannelSoundIDs + Ch4] - cp SFX_COLLISION ; check if collision sound is already playing - jr z, .setCarry + ;ld a, [wChannelSoundIDs + Ch4] + ;cp SFX_COLLISION ; check if collision sound is already playing + ; curSFX is not cleared for some reason. + + ; ch5 on? + ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 + bit 0, [hl] + + jr nz, .setCarry ld a, SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry From e538d1223623ff7abf0604c00fdc887ccd27b2c7 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 21 Apr 2019 19:24:02 -0500 Subject: [PATCH 06/33] Update home/audio.asm from pokecrystal --- audio.asm | 2 +- crysaudio/engine.asm | 3 - engine/battle/animations.asm | 3 - engine/cable_club.asm | 4 +- home.asm | 69 ---------- home/audio.asm | 246 +++++++++++++++++++++++++---------- home/overworld.asm | 2 +- 7 files changed, 179 insertions(+), 150 deletions(-) diff --git a/audio.asm b/audio.asm index ad1b2eb7..cb207997 100644 --- a/audio.asm +++ b/audio.asm @@ -254,7 +254,7 @@ OwnedMonValues: db 10, 40, 60, 90, 120, 150, $ff ; crystal: - + SECTION "Audio Engine 1", ROMX INCLUDE "crysaudio/engine.asm" diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index bc93939a..1e7cef4b 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -2385,9 +2385,6 @@ SetLRTracks: _PlayMusic:: call OpenSRAMForSound - ld a, e - and a - jp z, _MapSetup_Sound_Off cp NUM_SONGS ret nc ; sfx ; load music diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index ff9e8d8a..c03dbf2c 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -3051,6 +3051,3 @@ PlayApplyingAttackSound: ld [wTempoModifier], a ld a, c jp PlaySound - - - diff --git a/engine/cable_club.asm b/engine/cable_club.asm index aeee13f3..2ce923b5 100755 --- a/engine/cable_club.asm +++ b/engine/cable_club.asm @@ -830,7 +830,7 @@ TradeCenter_Trade: ld [wAudioSavedROMBank], a ld a, MUSIC_SAFARI_ZONE ld [wNewSoundID], a - call PlaySound + call PlayMusic ld c, 100 call DelayFrames call ClearScreen @@ -921,7 +921,7 @@ CableClub_Run: ld [wAudioSavedROMBank], a ld a, MUSIC_CELADON ld [wNewSoundID], a - jp PlaySound + jp PlayMusic EmptyFunc3: ret diff --git a/home.asm b/home.asm index 1b29f9b2..898b7608 100644 --- a/home.asm +++ b/home.asm @@ -3193,75 +3193,6 @@ DelayFrames:: jr nz, DelayFrames ret -PlaySoundWaitForCurrent:: - push af - call WaitForSoundToFinish - pop af - jp PlaySound - -; Wait for sound to finish playing -WaitForSoundToFinish:: -WaitSFX:: -; infinite loop until sfx is done playing - ld a, [wDanger] - and a - ret nz - ld a, [wSFXDontWait] - and a - ret nz - push hl - -.loop - ; ch5 on? - ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - jr nz, .loop - ; ch6 on? - ld hl, wChannel6 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - jr nz, .loop - ; ch7 on? - ld hl, wChannel7 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - jr nz, .loop - ; ch8 on? - ld hl, wChannel8 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - jr nz, .loop - - pop hl - ret - -WaitForSongToFinish:: -.loop - call IsSongPlaying - jr c, .loop - ret - -IsSongPlaying:: - ; ch1 on? - ld hl, wChannel1 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - jr nz, .playing - ; ch2 on? - ld hl, wChannel2 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - jr nz, .playing - ; ch3 on? - ld hl, wChannel3 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - jr nz, .playing - ; ch4 on? - ld hl, wChannel4 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 - bit 0, [hl] - jr z, .notPlaying -.playing - scf - ret -.notPlaying - xor a - ret - NamePointers:: dw MonsterNames dw MoveNames diff --git a/home/audio.asm b/home/audio.asm index cdafc733..f0e1ec47 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -50,7 +50,7 @@ PlayDefaultMusicCommon:: .walking ld a, [wMapMusicSoundID] ld b, a - call CompareMapMusicBankWithCurrentBank +; call CompareMapMusicBankWithCurrentBank jr c, .next4 .next3 @@ -71,20 +71,17 @@ PlayDefaultMusicCommon:: ;call FadeMusic ; called in updatemusic ret -UpdateMusic6Times:: - ;jp UpdateSound - ;ret ; XXX UpdateMusic +;UpdateMusic6Times:: +;CompareMapMusicBankWithCurrentBank: +; ret -CompareMapMusicBankWithCurrentBank: - ret - -; plays musicSFX specified by a. If value is $ff, music is stopped +; plays music or SFX specified by a. If value is $ff, music is stopped PlaySound:: push de cp $ff - jr nz, .notff - xor a - call PlayMusic + jr nz, .notff + xor a + call PlayMusic pop de ret .notff @@ -103,7 +100,7 @@ OpenSRAMForSound:: ld [MBC1SRamBank], a ret -;SoundRestart:: +;MapSetup_Sound_Off:: ; push hl ; push de ; push bc @@ -111,16 +108,16 @@ OpenSRAMForSound:: ; ; call OpenSRAMForSound ; -; ld a, [hROMBank] +; ldh a, [hROMBank] ; push af -; ld a, BANK(_SoundRestart) -; ld [hROMBank], a +; ld a, BANK(_MapSetup_Sound_Off) +; ldh [hROMBank], a ; ld [MBC1RomBank], a ; -; call _SoundRestart +; call _MapSetup_Sound_Off ; ; pop af -; ld [hROMBank], a +; ldh [hROMBank], a ; ld [MBC1RomBank], a ; ; pop af @@ -129,26 +126,26 @@ OpenSRAMForSound:: ; pop hl ; ret - UpdateSound:: ; push hl ; push de ; push bc ; push af + ld a, [wHaltAudio] and a ret nz - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, BANK(_UpdateSound) - ld [hROMBank], a + ldh [hROMBank], a ld [MBC1RomBank], a call _UpdateSound pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC1RomBank], a ; pop af @@ -157,6 +154,19 @@ UpdateSound:: ; pop hl ret +_LoadMusicByte:: +; wCurMusicByte = [a:de] + ldh [hROMBank], a + ld [MBC1RomBank], a + + ld a, [de] + ld [wCurMusicByte], a + ld a, BANK(LoadMusicByte) + + ldh [hROMBank], a + ld [MBC1RomBank], a + ret + PlayMusic:: ld e, a xor a @@ -168,28 +178,74 @@ PlayMusic:: push bc push af - ld a, [hROMBank] + ldh a, [hROMBank] push af - ld a, BANK(_PlayMusic) ; and BANK(_SoundRestart) - ld [hROMBank], a + ld a, BANK(_PlayMusic) ; aka BANK(_MapSetup_Sound_Off) + ldh [hROMBank], a ld [MBC1RomBank], a + ld a, e + and a + jr z, .nomusic + call _PlayMusic + jr .end +.nomusic + call _MapSetup_Sound_Off + +.end pop af - ld [hROMBank], a + ldh [hROMBank], a ld [MBC1RomBank], a - jr PopAllRet + pop af + pop bc + pop de + pop hl + ret +;PlayMusic2:: +; ld e, a +; xor a +; ld d, a +; Stop playing music, then play music de. +; +; push hl +; push de +; push bc +; push af +; +; ldh a, [hROMBank] +; push af +; ld a, BANK(_PlayMusic) +; ldh [hROMBank], a +; ld [MBC1RomBank], a +; +; push de +; ld de, MUSIC_NONE +; call _PlayMusic +; call DelayFrame +; pop de +; call _PlayMusic +; +; pop af +; ldh [hROMBank], a +; ld [MBC1RomBank], a +; +; pop af +; pop bc +; pop de +; pop hl +; ret PlayCry:: ; Play monster a's cry. -; Play a cry given parameters in header de push hl push de push bc push af + ld [wd11e], a predef IndexToPokedex ld a, [wd11e] @@ -197,23 +253,18 @@ PlayCry:: ld e, a ld d, 0 -; Save current bank - ld a, [hROMBank] + ldh a, [hROMBank] push af -; Cry headers are stuck in one bank. + ; Cries are stuck in one bank. ld a, BANK(PokemonCries) - ld [hROMBank], a - ld [$2000], a + ldh [hROMBank], a + ld [MBC1RomBank], a -; Each header is 6 bytes long: ld hl, PokemonCries +rept 6 ; sizeof(mon_cry) add hl, de - add hl, de - add hl, de - add hl, de - add hl, de - add hl, de +endr ld e, [hl] inc hl @@ -223,25 +274,29 @@ PlayCry:: ld a, [hli] ld [wCryPitch], a ld a, [hli] - ld [wCryPitch+1], a + ld [wCryPitch + 1], a ld a, [hli] ld [wCryLength], a ld a, [hl] - ld [wCryLength+1], a + ld [wCryLength + 1], a ld a, BANK(_PlayCry) - ld [hROMBank], a - ld [$2000], a + ldh [hROMBank], a + ld [MBC1RomBank], a call _PlayCry pop af - ld [hROMBank], a - ld [$2000], a + ldh [hROMBank], a + ld [MBC1RomBank], a call WaitForSoundToFinish - - jr PopAllRet + + pop af + pop bc + pop de + pop hl + ret PlaySFX:: ; Play sound effect de. @@ -252,48 +307,97 @@ PlaySFX:: push bc push af -; Is something already playing? - ;call CheckSFX - ;jr nc, .play -; Does it have priority? - ;ld a, [wCurSFX] - ;cp e - ;jr c, .quit + ; Is something already playing? +; call CheckSFX +; jr nc, .play + + ; Does it have priority? +; ld a, [wCurSFX] +; cp e +; jr c, .done -PlaySFX_play .play - ld a, [hROMBank] + ldh a, [hROMBank] push af ld a, BANK(_PlaySFX) - ld [hROMBank], a - ld [$2000], a ; bankswitch + ldh [hROMBank], a + ld [MBC1RomBank], a ld a, e ld [wCurSFX], a call _PlaySFX pop af - ld [hROMBank], a - ld [$2000], a ; bankswitch -.quit -PopAllRet: + ldh [hROMBank], a + ld [MBC1RomBank], a + +.done pop af pop bc pop de pop hl ret -_LoadMusicByte:: -; CurMusicByte = [a:de] -GLOBAL LoadMusicByte +PlaySoundWaitForCurrent:: +WaitPlaySFX:: + push af + call WaitForSoundToFinish + pop af + jp PlaySound - ld [hROMBank], a - ld [MBC1RomBank], a +; Wait for sound to finish playing +WaitForSoundToFinish:: +WaitSFX:: + ld a, [wDanger] + and a + ret nz + ld a, [wSFXDontWait] + and a + ret nz - ld a, [de] - ld [wCurMusicByte], a - ld a, BANK(LoadMusicByte) +; infinite loop until sfx is done playing - ld [hROMBank], a - ld [MBC1RomBank], a + push hl + +.wait + ld hl, wChannel5Flags1 + bit 0, [hl] + jr nz, .wait + ld hl, wChannel6Flags1 + bit 0, [hl] + jr nz, .wait + ld hl, wChannel7Flags1 + bit 0, [hl] + jr nz, .wait + ld hl, wChannel8Flags1 + bit 0, [hl] + jr nz, .wait + + pop hl + ret + +WaitForSongToFinish:: +.loop + call IsSongPlaying + jr c, .loop + ret + +IsSongPlaying:: +; Return carry if any song channels are active. + ld a, [wChannel1Flags1] + bit 0, a + jr nz, .playing + ld a, [wChannel2Flags1] + bit 0, a + jr nz, .playing + ld a, [wChannel3Flags1] + bit 0, a + jr nz, .playing + ld a, [wChannel4Flags1] + bit 0, a + jr nz, .playing + and a + ret +.playing + scf ret diff --git a/home/overworld.asm b/home/overworld.asm index 0ffb9846..9053ab19 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -2398,7 +2398,7 @@ LoadMapData:: ld a, [wFlags_D733] bit 1, a jr nz, .restoreRomBank - call UpdateMusic6Times +; call UpdateMusic6Times call PlayDefaultMusicFadeOutCurrent .restoreRomBank pop af From edc9f57ad8b89047d11543ac3444f18e5c1b9bda Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 27 Apr 2019 12:49:40 -0500 Subject: [PATCH 07/33] Update RBY song files --- crysaudio/music/RBY/bikeriding.asm | 123 +++++---- crysaudio/music/RBY/celadon.asm | 46 ++-- crysaudio/music/RBY/cinnabar.asm | 75 +++--- crysaudio/music/RBY/cinnabarmansion.asm | 53 ++-- crysaudio/music/RBY/cities1.asm | 126 +++++---- crysaudio/music/RBY/cities2.asm | 83 +++--- crysaudio/music/RBY/credits.asm | 233 ++++++++-------- crysaudio/music/RBY/defeatedgymleader.asm | 153 +++++------ crysaudio/music/RBY/defeatedtrainer.asm | 57 ++-- crysaudio/music/RBY/defeatedwildmon.asm | 42 +-- crysaudio/music/RBY/dungeon1.asm | 149 ++++++----- crysaudio/music/RBY/dungeon2.asm | 53 ++-- crysaudio/music/RBY/dungeon3.asm | 110 +++++--- crysaudio/music/RBY/finalbattle.asm | 294 ++++++++++---------- crysaudio/music/RBY/gamecorner.asm | 111 ++++---- crysaudio/music/RBY/gym.asm | 85 +++--- crysaudio/music/RBY/gymleaderbattle.asm | 110 ++++---- crysaudio/music/RBY/halloffame.asm | 41 ++- crysaudio/music/RBY/indigoplateau.asm | 107 ++++---- crysaudio/music/RBY/introbattle.asm | 125 +++++---- crysaudio/music/RBY/jigglypuffsong.asm | 29 +- crysaudio/music/RBY/lavender.asm | 47 ++-- crysaudio/music/RBY/meeteviltrainer.asm | 47 ++-- crysaudio/music/RBY/meetfemaletrainer.asm | 39 ++- crysaudio/music/RBY/meetjessiejames.asm | 71 ++--- crysaudio/music/RBY/meetmaletrainer.asm | 41 ++- crysaudio/music/RBY/meetprofoak.asm | 65 +++-- crysaudio/music/RBY/meetrival.asm | 92 +++---- crysaudio/music/RBY/museumguy.asm | 75 +++--- crysaudio/music/RBY/oakslab.asm | 35 ++- crysaudio/music/RBY/pallettown.asm | 59 ++-- crysaudio/music/RBY/pkmnhealed.asm | 38 +-- crysaudio/music/RBY/pokecenter.asm | 75 +++--- crysaudio/music/RBY/pokemontower.asm | 107 ++++---- crysaudio/music/RBY/routes1.asm | 64 +++-- crysaudio/music/RBY/routes2.asm | 44 ++- crysaudio/music/RBY/routes3.asm | 81 +++--- crysaudio/music/RBY/routes4.asm | 127 +++++---- crysaudio/music/RBY/safarizone.asm | 61 +++-- crysaudio/music/RBY/silphco.asm | 164 ++++++------ crysaudio/music/RBY/ssanne.asm | 37 ++- crysaudio/music/RBY/surfing.asm | 61 +++-- crysaudio/music/RBY/surfingpikachu.asm | 87 +++--- crysaudio/music/RBY/titlescreen.asm | 310 +++++++++++----------- crysaudio/music/RBY/trainerbattle.asm | 148 ++++++----- crysaudio/music/RBY/unusedsong.asm | 29 +- crysaudio/music/RBY/vermilion.asm | 45 ++-- crysaudio/music/RBY/wildbattle.asm | 109 ++++---- crysaudio/music/RBY/yellowintro.asm | 84 +++--- crysaudio/music/RBY/yellowunusedsong.asm | 54 ++-- 50 files changed, 2315 insertions(+), 2186 deletions(-) diff --git a/crysaudio/music/RBY/bikeriding.asm b/crysaudio/music/RBY/bikeriding.asm index 76382362..18c3af09 100644 --- a/crysaudio/music/RBY/bikeriding.asm +++ b/crysaudio/music/RBY/bikeriding.asm @@ -1,18 +1,19 @@ -Music_BikeRiding: - dbw $C0, Music_BikeRiding_Ch1 - dbw $01, Music_BikeRiding_Ch2 - dbw $02, Music_BikeRiding_Ch3 - dbw $03, Music_BikeRiding_Ch4 +Music_BikeRiding:: + musicheader 4, 1, Music_BikeRiding_Ch0 + musicheader 1, 2, Music_BikeRiding_Ch1 + musicheader 1, 3, Music_BikeRiding_Ch2 + musicheader 1, 4, Music_BikeRiding_Ch3 -Music_BikeRiding_Ch1: +Music_BikeRiding_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $c, $b5 + vibrato 8, $14 + notetype 12, $b5 octave 3 note G_, 2 -Music_BikeRiding_branch_7dbc9: + +Music_BikeRiding_branch_7dbc9:: octave 4 note C_, 4 note D_, 4 @@ -41,9 +42,9 @@ Music_BikeRiding_branch_7dbc9: note C_, 2 note D_, 2 note E_, 2 - intensity $b6 + notetype 12, $b6 note F_, 10 - intensity $a6 + notetype 12, $a6 note F_, 2 note E_, 2 note F_, 2 @@ -52,7 +53,8 @@ Music_BikeRiding_branch_7dbc9: note D_, 2 note E_, 2 note F_, 6 - intensity $b3 + ;toggleperfectpitch + notetype 12, $b3 note E_, 2 note D_, 2 note D_, 1 @@ -60,19 +62,20 @@ Music_BikeRiding_branch_7dbc9: note F_, 2 note E_, 1 note F_, 1 - intensity $b5 + ;toggleperfectpitch + notetype 12, $b5 note G_, 6 note G_, 6 note A_, 2 note F_, 2 note G_, 6 - intensity $b4 + notetype 12, $b4 note G_, 2 note F_, 4 - intensity $a4 + notetype 12, $a4 note E_, 2 note D_, 2 - intensity $93 + notetype 12, $93 octave 3 note A_, 2 octave 4 @@ -117,9 +120,9 @@ Music_BikeRiding_branch_7dbc9: note B_, 1 octave 4 note C_, 4 - intensity $3d + notetype 12, $3d note C_, 4 - intensity $b4 + notetype 12, $b4 note F_, 6 note G_, 4 note F_, 1 @@ -132,7 +135,7 @@ Music_BikeRiding_branch_7dbc9: note E_, 1 note D_, 2 note C_, 2 - intensity $b5 + notetype 12, $b5 octave 3 note A_, 4 octave 4 @@ -145,22 +148,25 @@ Music_BikeRiding_branch_7dbc9: note F_, 4 note D_, 4 note F#, 4 - vibrato $a, $26 - intensity $80 + vibrato 10, $26 + notetype 12, $80 note G_, 16 note G_, 4 - intensity $87 + notetype 12, $87 note G_, 12 - intensity $b5 - vibrato $8, $14 + notetype 12, $b5 + vibrato 8, $14 loopchannel 0, Music_BikeRiding_branch_7dbc9 -Music_BikeRiding_Ch2: + + +Music_BikeRiding_Ch1:: dutycycle 2 - vibrato $6, $15 - notetype $c, $c3 + vibrato 6, $15 + notetype 12, $c3 octave 4 note C_, 2 -Music_BikeRiding_branch_7dc75: + +Music_BikeRiding_branch_7dc75:: note E_, 4 note F_, 4 note G_, 4 @@ -187,10 +193,10 @@ Music_BikeRiding_branch_7dc75: note A_, 2 note G_, 4 dutycycle 3 - notetype $c, $84 + notetype 12, $84 note A#, 6 dutycycle 2 - notetype $c, $c5 + notetype 12, $c5 octave 5 note C_, 2 octave 4 @@ -207,7 +213,7 @@ Music_BikeRiding_branch_7dc75: note C_, 2 octave 4 note G_, 10 - notetype $c, $c3 + notetype 12, $c3 octave 5 note C_, 4 note E_, 2 @@ -217,18 +223,18 @@ Music_BikeRiding_branch_7dc75: note B_, 2 octave 5 note C_, 2 - notetype $c, $b0 + notetype 12, $b0 note D_, 4 - notetype $c, $c7 + notetype 12, $c7 note D_, 10 note D_, 1 note C_, 1 - notetype $c, $b0 + notetype 12, $b0 octave 4 note B_, 4 - notetype $c, $c7 + notetype 12, $c7 note B_, 12 - notetype $c, $c4 + notetype 12, $c4 note F_, 6 note F_, 2 note G_, 2 @@ -252,12 +258,12 @@ Music_BikeRiding_branch_7dc75: note G_, 4 note F_, 2 note E_, 6 - notetype $6, $c2 + notetype 6, $c2 note F_, 1 note G_, 1 note A_, 1 note B_, 1 - notetype $c, $c3 + notetype 12, $c3 octave 5 note C_, 2 octave 4 @@ -274,7 +280,7 @@ Music_BikeRiding_branch_7dc75: note G_, 4 note F_, 2 note E_, 2 - notetype $8, $c4 + notetype 8, $c4 note A_, 4 note G_, 4 note F_, 4 @@ -290,20 +296,23 @@ Music_BikeRiding_branch_7dc75: note D_, 4 note E_, 4 note C_, 4 - notetype $c, $c7 + notetype 12, $c7 note D_, 12 note C_, 4 - notetype $c, $b0 + notetype 12, $b0 octave 4 note B_, 4 - notetype $c, $c7 + notetype 12, $c7 note B_, 12 - notetype $c, $c3 + notetype 12, $c3 loopchannel 0, Music_BikeRiding_branch_7dc75 -Music_BikeRiding_Ch3: - notetype $c, $13 + + +Music_BikeRiding_Ch2:: + notetype 12, $13 note __, 2 -Music_BikeRiding_branch_7dd17: + +Music_BikeRiding_branch_7dd17:: octave 4 note C_, 1 note __, 1 @@ -638,11 +647,14 @@ Music_BikeRiding_branch_7dd17: note F_, 1 note __, 1 loopchannel 0, Music_BikeRiding_branch_7dd17 -Music_BikeRiding_Ch4: - togglenoise $1 - notetype $c + + +Music_BikeRiding_Ch3:: + togglenoise 1 + notetype 12 note __, 2 -Music_BikeRiding_branch_7de6a: + +Music_BikeRiding_branch_7de6a:: callchannel Music_BikeRiding_branch_7dea7 callchannel Music_BikeRiding_branch_7deb4 callchannel Music_BikeRiding_branch_7dea7 @@ -663,7 +675,8 @@ Music_BikeRiding_branch_7de6a: callchannel Music_BikeRiding_branch_7dea7 callchannel Music_BikeRiding_branch_7dea7 loopchannel 0, Music_BikeRiding_branch_7de6a -Music_BikeRiding_branch_7dea7: + +Music_BikeRiding_branch_7dea7:: note __, 2 note G#, 2 note __, 2 @@ -673,7 +686,8 @@ Music_BikeRiding_branch_7dea7: note __, 2 note G#, 2 endchannel -Music_BikeRiding_branch_7deb4: + +Music_BikeRiding_branch_7deb4:: note __, 2 note G#, 2 note __, 2 @@ -683,7 +697,8 @@ Music_BikeRiding_branch_7deb4: note G#, 2 note G#, 2 endchannel -Music_BikeRiding_branch_7dec2: + +Music_BikeRiding_branch_7dec2:: note __, 2 note G#, 2 note __, 2 diff --git a/crysaudio/music/RBY/celadon.asm b/crysaudio/music/RBY/celadon.asm index 30860ce0..e180ef10 100644 --- a/crysaudio/music/RBY/celadon.asm +++ b/crysaudio/music/RBY/celadon.asm @@ -1,19 +1,21 @@ -Music_Celadon: - dbw $80, Music_Celadon_Ch1 - dbw $01, Music_Celadon_Ch2 - dbw $02, Music_Celadon_Ch3 +Music_Celadon:: + musicheader 3, 1, Music_Celadon_Ch0 + musicheader 1, 2, Music_Celadon_Ch1 + musicheader 1, 3, Music_Celadon_Ch2 -Music_Celadon_Ch1: +Music_Celadon_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - notetype $c, $2f + ;toggleperfectpitch + notetype 12, $2f note __, 8 octave 3 note D_, 8 -Music_Celadon_branch_b6d4: + +Music_Celadon_branch_b6d4:: dutycycle 2 - intensity $b2 + notetype 12, $b2 note G_, 4 note B_, 4 note G_, 2 @@ -74,7 +76,7 @@ Music_Celadon_branch_b6d4: note F#, 1 note G_, 1 note A_, 8 - intensity $94 + notetype 12, $94 note B_, 8 note G_, 4 note D_, 4 @@ -108,9 +110,11 @@ Music_Celadon_branch_b6d4: note F#, 4 note A_, 4 loopchannel 0, Music_Celadon_branch_b6d4 -Music_Celadon_Ch2: + + +Music_Celadon_Ch1:: dutycycle 3 - notetype $c, $c2 + notetype 12, $c2 octave 4 note D_, 1 note C#, 1 @@ -120,11 +124,12 @@ Music_Celadon_Ch2: note E_, 1 note F#, 1 note G_, 1 - intensity $a0 + notetype 12, $a0 note A_, 8 -Music_Celadon_branch_b74a: + +Music_Celadon_branch_b74a:: dutycycle 2 - intensity $c2 + notetype 12, $c2 octave 4 note B_, 4 note G_, 4 @@ -178,7 +183,7 @@ Music_Celadon_branch_b74a: note D_, 8 octave 5 note D_, 8 - intensity $b4 + notetype 12, $b4 octave 4 note D_, 8 note C_, 2 @@ -224,8 +229,10 @@ Music_Celadon_branch_b74a: note E_, 2 note D_, 8 loopchannel 0, Music_Celadon_branch_b74a -Music_Celadon_Ch3: - notetype $c, $13 + + +Music_Celadon_Ch2:: + notetype 12, $13 note __, 8 octave 5 note D_, 1 @@ -236,7 +243,8 @@ Music_Celadon_Ch3: note E_, 1 note F#, 1 note G_, 1 -Music_Celadon_branch_b7c1: + +Music_Celadon_branch_b7c1:: octave 4 note D_, 2 note B_, 2 diff --git a/crysaudio/music/RBY/cinnabar.asm b/crysaudio/music/RBY/cinnabar.asm index d5f832f4..9fadd661 100644 --- a/crysaudio/music/RBY/cinnabar.asm +++ b/crysaudio/music/RBY/cinnabar.asm @@ -1,40 +1,40 @@ -Music_Cinnabar: - dbw $80, Music_Cinnabar_Ch1 - dbw $01, Music_Cinnabar_Ch2 - dbw $02, Music_Cinnabar_Ch3 +Music_Cinnabar:: + musicheader 3, 1, Music_Cinnabar_Ch0 + musicheader 1, 2, Music_Cinnabar_Ch1 + musicheader 1, 3, Music_Cinnabar_Ch2 -Music_Cinnabar_Ch1: ; b86d (2:786d) +Music_Cinnabar_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 52 - + vibrato 12, $34 + ;toggleperfectpitch -Music_Cinnabar_branch_b878: - notetype 12, 181 +Music_Cinnabar_branch_b878:: + notetype 12, $b5 note __, 4 octave 3 note D_, 4 note E_, 6 note C#, 2 - notetype 12, 177 + notetype 12, $b1 note D_, 4 - notetype 12, 181 + notetype 12, $b5 note B_, 4 octave 4 note C_, 6 octave 3 note A_, 2 - notetype 12, 177 + notetype 12, $b1 note B_, 4 - notetype 12, 181 + notetype 12, $b5 note G_, 4 note F#, 4 note E_, 2 note F#, 2 - notetype 12, 177 + notetype 12, $b1 note G_, 4 - notetype 12, 181 + notetype 12, $b5 note G_, 4 note F#, 4 note E_, 4 @@ -42,9 +42,9 @@ Music_Cinnabar_branch_b878: note E_, 4 note F#, 6 note A_, 2 - notetype 12, 177 + notetype 12, $b1 note G_, 4 - notetype 12, 181 + notetype 12, $b5 note B_, 4 octave 4 note C_, 6 @@ -56,17 +56,17 @@ Music_Cinnabar_branch_b878: note E_, 1 note F#, 2 note A_, 2 - notetype 12, 162 + notetype 12, $a2 note G_, 4 octave 4 note D_, 1 note E_, 1 note D_, 4 - notetype 12, 114 + notetype 12, $72 note D_, 1 note E_, 1 note D_, 4 - notetype 12, 167 + notetype 12, $a7 octave 3 note B_, 6 note G_, 2 @@ -90,12 +90,12 @@ Music_Cinnabar_branch_b878: loopchannel 0, Music_Cinnabar_branch_b878 -Music_Cinnabar_Ch2: ; b8d4 (2:78d4) +Music_Cinnabar_Ch1:: dutycycle 3 - vibrato 10, 35 + vibrato 10, $23 -Music_Cinnabar_branch_b8d9: - notetype 12, 199 +Music_Cinnabar_branch_b8d9:: + notetype 12, $c7 octave 3 note G_, 6 note A_, 1 @@ -104,9 +104,9 @@ Music_Cinnabar_branch_b8d9: note C_, 6 note D_, 1 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 4 - notetype 12, 199 + notetype 12, $c7 note G_, 4 note A_, 6 note G_, 1 @@ -120,9 +120,9 @@ Music_Cinnabar_branch_b8d9: note C_, 2 note D_, 1 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 4 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 8 note A_, 4 @@ -133,9 +133,9 @@ Music_Cinnabar_branch_b8d9: note C_, 6 note D_, 1 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 4 - notetype 12, 199 + notetype 12, $c7 note G_, 4 note A_, 6 note G_, 1 @@ -149,14 +149,14 @@ Music_Cinnabar_branch_b8d9: note C_, 2 note D_, 1 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 4 - notetype 12, 199 + notetype 12, $c7 octave 3 note A_, 4 note G_, 4 note F#, 4 - notetype 12, 176 + notetype 12, $b0 octave 4 note D_, 6 octave 3 @@ -184,10 +184,10 @@ Music_Cinnabar_branch_b8d9: loopchannel 0, Music_Cinnabar_branch_b8d9 -Music_Cinnabar_Ch3: ; b93d (2:793d) - notetype 12, 16 +Music_Cinnabar_Ch2:: + notetype 12, $10 -Music_Cinnabar_branch_b93f: +Music_Cinnabar_branch_b93f:: octave 4 note G_, 1 note __, 3 @@ -357,4 +357,3 @@ Music_Cinnabar_branch_b93f: note C_, 1 note __, 1 loopchannel 0, Music_Cinnabar_branch_b93f -; 0xb9eb \ No newline at end of file diff --git a/crysaudio/music/RBY/cinnabarmansion.asm b/crysaudio/music/RBY/cinnabarmansion.asm index d348f954..8b255e29 100644 --- a/crysaudio/music/RBY/cinnabarmansion.asm +++ b/crysaudio/music/RBY/cinnabarmansion.asm @@ -1,17 +1,17 @@ -Music_CinnabarMansion: - dbw $C0, Music_CinnabarMansion_Ch1 - dbw $01, Music_CinnabarMansion_Ch2 - dbw $02, Music_CinnabarMansion_Ch3 - dbw $03, Music_CinnabarMansion_Ch4 +Music_CinnabarMansion:: + musicheader 4, 1, Music_CinnabarMansion_Ch0 + musicheader 1, 2, Music_CinnabarMansion_Ch1 + musicheader 1, 3, Music_CinnabarMansion_Ch2 + musicheader 1, 4, Music_CinnabarMansion_Ch3 -Music_CinnabarMansion_Ch1: ; 7ed0f (1f:6d0f) +Music_CinnabarMansion_Ch0:: tempo 144 - volume 119 - vibrato 11, 37 + volume $77 + vibrato 11, $25 dutycycle 2 -Music_CinnabarMansion_branch_7ed19: - notetype 12, 98 +Music_CinnabarMansion_branch_7ed19:: + notetype 12, $62 octave 5 note E_, 1 note E_, 1 @@ -32,7 +32,7 @@ Music_CinnabarMansion_branch_7ed19: note B_, 1 note __, 2 loopchannel 14, Music_CinnabarMansion_branch_7ed19 - notetype 12, 165 + notetype 12, $a5 note __, 16 note __, 16 note __, 15 @@ -44,21 +44,21 @@ Music_CinnabarMansion_branch_7ed19: loopchannel 0, Music_CinnabarMansion_branch_7ed19 -Music_CinnabarMansion_Ch2: ; 7ed40 (1f:6d40) +Music_CinnabarMansion_Ch1:: dutycycle 2 - - vibrato 10, 36 - notetype 12, 194 + ;toggleperfectpitch + vibrato 10, $24 + notetype 12, $c2 -Music_CinnabarMansion_branch_7ed48: +Music_CinnabarMansion_branch_7ed48:: note __, 16 note __, 16 loopchannel 4, Music_CinnabarMansion_branch_7ed48 -Music_CinnabarMansion_branch_7ed4e: - notetype 12, 194 +Music_CinnabarMansion_branch_7ed4e:: + notetype 12, $c2 -Music_CinnabarMansion_branch_7ed50: +Music_CinnabarMansion_branch_7ed50:: callchannel Music_CinnabarMansion_branch_7ed6c loopchannel 3, Music_CinnabarMansion_branch_7ed50 octave 3 @@ -80,7 +80,7 @@ Music_CinnabarMansion_branch_7ed50: note D#, 4 loopchannel 0, Music_CinnabarMansion_branch_7ed4e -Music_CinnabarMansion_branch_7ed6c: +Music_CinnabarMansion_branch_7ed6c:: octave 3 note E_, 4 note D#, 4 @@ -101,10 +101,10 @@ Music_CinnabarMansion_branch_7ed6c: endchannel -Music_CinnabarMansion_Ch3: ; 7ed7e (1f:6d7e) - notetype 12, 17 +Music_CinnabarMansion_Ch2:: + notetype 12, $11 -Music_CinnabarMansion_branch_7ed80: +Music_CinnabarMansion_branch_7ed80:: octave 2 note B_, 2 note __, 2 @@ -149,15 +149,15 @@ Music_CinnabarMansion_branch_7ed80: loopchannel 0, Music_CinnabarMansion_branch_7ed80 -Music_CinnabarMansion_Ch4: ; 7edb0 (1f:6db0) - notetype 6 +Music_CinnabarMansion_Ch3:: togglenoise 1 + notetype 6 note __, 16 note __, 16 note __, 16 note __, 16 -Music_CinnabarMansion_branch_7edb5: +Music_CinnabarMansion_branch_7edb5:: note E_, 2 note E_, 2 note F_, 4 @@ -177,4 +177,3 @@ Music_CinnabarMansion_branch_7edb5: note __, 8 note F#, 8 loopchannel 0, Music_CinnabarMansion_branch_7edb5 -; 0x7edda \ No newline at end of file diff --git a/crysaudio/music/RBY/cities1.asm b/crysaudio/music/RBY/cities1.asm index ab65f0a2..723de9c1 100644 --- a/crysaudio/music/RBY/cities1.asm +++ b/crysaudio/music/RBY/cities1.asm @@ -1,23 +1,23 @@ -Music_Cities1: - dbw $C0, Music_Cities1_Ch1 - dbw $01, Music_Cities1_Ch2 - dbw $02, Music_Cities1_Ch3 - dbw $03, Music_Cities1_Ch4 +Music_Cities1:: + musicheader 4, 1, Music_Cities1_Ch0 + musicheader 1, 2, Music_Cities1_Ch1 + musicheader 1, 3, Music_Cities1_Ch2 + musicheader 1, 4, Music_Cities1_Ch3 -Music_Cities1_branch_aa6f: +Music_Cities1_branch_aa6f:: tempo 232 loopchannel 0, Music_Cities1_branch_aa79 -Music_Cities1_Ch1: ; aa76 (2:6a76) +Music_Cities1_Ch0:: tempo 144 -Music_Cities1_branch_aa79: - volume 119 - vibrato 8, 36 +Music_Cities1_branch_aa79:: + volume $77 + vibrato 8, $24 dutycycle 3 -Music_Cities1_branch_aa80: - notetype 12, 197 +Music_Cities1_branch_aa80:: + notetype 12, $c5 octave 3 note G#, 4 note F#, 4 @@ -35,7 +35,7 @@ Music_Cities1_branch_aa80: note C#, 2 note E_, 2 note E_, 4 - notetype 12, 165 + notetype 12, $a5 note C#, 4 octave 2 note B_, 6 @@ -44,14 +44,14 @@ Music_Cities1_branch_aa80: note C#, 4 octave 2 note B_, 4 - notetype 12, 197 + notetype 12, $c5 callchannel Music_Cities1_branch_ab7d octave 3 note D#, 6 note E_, 2 octave 2 note B_, 4 - notetype 12, 165 + notetype 12, $a5 octave 3 note C#, 2 octave 2 @@ -66,7 +66,7 @@ Music_Cities1_branch_aa80: note D#, 2 note C#, 2 note D#, 2 - notetype 12, 197 + notetype 12, $c5 note G#, 2 note E_, 2 note F#, 2 @@ -84,7 +84,7 @@ Music_Cities1_branch_aa80: note C#, 2 note E_, 2 note E_, 4 - notetype 12, 165 + notetype 12, $a5 note C#, 2 octave 2 note A_, 2 @@ -95,7 +95,7 @@ Music_Cities1_branch_aa80: octave 2 note B_, 2 note B_, 4 - notetype 12, 197 + notetype 12, $c5 callchannel Music_Cities1_branch_ab7d octave 3 note D#, 4 @@ -111,7 +111,7 @@ Music_Cities1_branch_aa80: note B_, 2 octave 3 note E_, 2 - notetype 12, 165 + notetype 12, $a5 note C#, 4 octave 2 note B_, 2 @@ -119,7 +119,7 @@ Music_Cities1_branch_aa80: note D#, 4 note C#, 2 note E_, 4 - notetype 12, 179 + notetype 12, $b3 callchannel Music_Cities1_branch_ab8a note A_, 2 note B_, 2 @@ -149,7 +149,7 @@ Music_Cities1_branch_aa80: note B_, 2 octave 3 -Music_Cities1_branch_ab12: +Music_Cities1_branch_ab12:: note C#, 2 note D#, 2 note C#, 2 @@ -235,12 +235,12 @@ Music_Cities1_branch_ab12: note B_, 2 octave 3 note D#, 2 - notetype 12, 182 + notetype 12, $b6 note F#, 8 note F#, 4 note D#, 4 note E_, 8 - notetype 12, 132 + notetype 12, $84 octave 2 note B_, 4 octave 3 @@ -248,7 +248,7 @@ Music_Cities1_branch_ab12: note F#, 2 loopchannel 0, Music_Cities1_branch_aa80 -Music_Cities1_branch_ab7d: +Music_Cities1_branch_ab7d:: octave 3 note F#, 2 note D#, 4 @@ -263,7 +263,7 @@ Music_Cities1_branch_ab7d: note C#, 2 endchannel -Music_Cities1_branch_ab8a: +Music_Cities1_branch_ab8a:: note A_, 2 note E_, 2 note C#, 2 @@ -274,14 +274,14 @@ Music_Cities1_branch_ab8a: endchannel -Music_Cities1_Ch2: ; ab92 (2:6b92) - vibrato 5, 21 +Music_Cities1_Ch1:: + vibrato 5, $15 callchannel Music_Cities1_branch_ac00 octave 4 note G#, 2 - notetype 12, 196 + notetype 12, $c4 note E_, 6 - notetype 12, 197 + notetype 12, $c5 dutycycle 3 octave 3 note C#, 4 @@ -292,16 +292,16 @@ Music_Cities1_Ch2: ; ab92 (2:6b92) callchannel Music_Cities1_branch_ac00 octave 4 note G#, 2 - notetype 12, 196 + notetype 12, $c4 note E_, 14 dutycycle 3 octave 3 note E_, 6 note F#, 6 note G#, 4 - notetype 12, 183 + notetype 12, $b7 dutycycle 2 - vibrato 8, 23 + vibrato 8, $17 octave 5 note C#, 12 octave 4 @@ -353,27 +353,27 @@ Music_Cities1_Ch2: ; ab92 (2:6b92) note B_, 4 note A_, 4 note F#, 4 - notetype 12, 183 + notetype 12, $b7 note A_, 8 octave 5 note C_, 8 octave 4 note B_, 14 - notetype 12, 132 + notetype 12, $84 note G#, 1 - notetype 12, 164 + notetype 12, $a4 note A_, 1 - loopchannel 0, Music_Cities1_Ch2 + loopchannel 0, Music_Cities1_Ch1 -Music_Cities1_branch_ac00: +Music_Cities1_branch_ac00:: dutycycle 2 - notetype 12, 195 + notetype 12, $c3 octave 4 note B_, 4 note A_, 4 - notetype 12, 196 + notetype 12, $c4 note G#, 10 - notetype 12, 195 + notetype 12, $c3 note G#, 2 note A_, 2 note B_, 4 @@ -381,23 +381,23 @@ Music_Cities1_branch_ac00: note A_, 2 note G#, 2 note A_, 2 - notetype 12, 196 + notetype 12, $c4 note F#, 10 - notetype 12, 197 + notetype 12, $c5 dutycycle 3 octave 3 note E_, 4 note D#, 8 note E_, 4 note F#, 4 - notetype 12, 195 + notetype 12, $c3 dutycycle 2 octave 4 note A_, 4 note G#, 4 - notetype 12, 196 + notetype 12, $c4 note F#, 10 - notetype 12, 195 + notetype 12, $c3 note F#, 2 note G#, 2 note A_, 4 @@ -407,12 +407,12 @@ Music_Cities1_branch_ac00: endchannel -Music_Cities1_Ch3: ; ac32 (2:6c32) - notetype 12, 17 - +Music_Cities1_Ch2:: + notetype 12, $11 + ;toggleperfectpitch -Music_Cities1_branch_ac35: - vibrato 0, 0 +Music_Cities1_branch_ac35:: + vibrato 0, $00 octave 4 callchannel Music_Cities1_branch_acc5 callchannel Music_Cities1_branch_acc5 @@ -452,7 +452,7 @@ Music_Cities1_branch_ac35: note E_, 2 note B_, 2 note E_, 2 - vibrato 8, 37 + vibrato 8, $25 note A_, 8 note E_, 8 note A_, 8 @@ -538,7 +538,7 @@ Music_Cities1_branch_ac35: note F#, 2 loopchannel 0, Music_Cities1_branch_ac35 -Music_Cities1_branch_acc5: +Music_Cities1_branch_acc5:: note __, 2 note E_, 2 note F#, 2 @@ -549,7 +549,7 @@ Music_Cities1_branch_acc5: note G#, 2 endchannel -Music_Cities1_branch_acce: +Music_Cities1_branch_acce:: note A_, 2 note F#, 2 note G#, 2 @@ -585,13 +585,12 @@ Music_Cities1_branch_acce: endchannel -Music_Cities1_Ch4: ; acef (2:6cef) - notetype 12 +Music_Cities1_Ch3:: togglenoise 0 -Music_Cities1_Loop4: + notetype 12 callchannel Music_Cities1_branch_ad36 -Music_Cities1_branch_acf3: +Music_Cities1_branch_acf3:: callchannel Music_Cities1_branch_ad36 callchannel Music_Cities1_branch_ad45 callchannel Music_Cities1_branch_ad45 @@ -617,9 +616,9 @@ Music_Cities1_branch_acf3: note F_, 6 note G_, 6 note G_, 4 - loopchannel 0, Music_Cities1_Loop4 + loopchannel 0, Music_Cities1_Ch3 -Music_Cities1_branch_ad36: +Music_Cities1_branch_ad36:: note G_, 6 note G_, 6 note G_, 4 @@ -629,7 +628,7 @@ Music_Cities1_branch_ad36: note G_, 2 endchannel -Music_Cities1_branch_ad45: +Music_Cities1_branch_ad45:: note G_, 6 note G_, 6 note G_, 4 @@ -638,7 +637,7 @@ Music_Cities1_branch_ad45: note G_, 4 endchannel -Music_Cities1_branch_ad52: +Music_Cities1_branch_ad52:: note F_, 6 note F_, 6 note F#, 4 @@ -647,7 +646,7 @@ Music_Cities1_branch_ad52: note F#, 4 endchannel -Music_Cities1_branch_ad5f: +Music_Cities1_branch_ad5f:: note F_, 6 note F_, 6 note F#, 4 @@ -657,10 +656,9 @@ Music_Cities1_branch_ad5f: note F_, 2 endchannel -Music_Cities1_branch_ad6e: +Music_Cities1_branch_ad6e:: note F_, 6 note F_, 6 note F#, 2 note F#, 2 endchannel -; 0xad77 \ No newline at end of file diff --git a/crysaudio/music/RBY/cities2.asm b/crysaudio/music/RBY/cities2.asm index 17aa49ed..e42c5b74 100644 --- a/crysaudio/music/RBY/cities2.asm +++ b/crysaudio/music/RBY/cities2.asm @@ -1,15 +1,15 @@ -Music_Cities2: - dbw $80, Music_Cities2_Ch1 - dbw $01, Music_Cities2_Ch2 - dbw $02, Music_Cities2_Ch3 +Music_Cities2:: + musicheader 3, 1, Music_Cities2_Ch0 + musicheader 1, 2, Music_Cities2_Ch1 + musicheader 1, 3, Music_Cities2_Ch2 -Music_Cities2_Ch1: ; b504 (2:7504) +Music_Cities2_Ch0:: tempo 148 - volume 119 + volume $77 dutycycle 3 - vibrato 8, 50 - - notetype 12, 182 + vibrato 8, $32 + ;toggleperfectpitch + notetype 12, $b6 note __, 8 octave 3 note E_, 2 @@ -20,7 +20,7 @@ Music_Cities2_Ch1: ; b504 (2:7504) note B_, 2 note __, 14 -Music_Cities2_branch_b51a: +Music_Cities2_branch_b51a:: octave 3 note B_, 4 octave 4 @@ -99,10 +99,10 @@ Music_Cities2_branch_b51a: loopchannel 0, Music_Cities2_branch_b51a -Music_Cities2_Ch2: ; b569 (2:7569) +Music_Cities2_Ch1:: dutycycle 3 - vibrato 8, 35 - notetype 12, 194 + vibrato 8, $23 + notetype 12, $c2 octave 4 note E_, 2 note D#, 2 @@ -115,7 +115,7 @@ Music_Cities2_Ch2: ; b569 (2:7569) note C#, 2 note D#, 2 note E_, 6 - notetype 12, 194 + notetype 12, $c2 dutycycle 2 octave 4 note E_, 1 @@ -129,15 +129,15 @@ Music_Cities2_Ch2: ; b569 (2:7569) note G#, 1 note A_, 1 -Music_Cities2_branch_b58b: - notetype 12, 166 +Music_Cities2_branch_b58b:: + notetype 12, $a6 note G#, 6 - notetype 12, 194 + notetype 12, $c2 note A_, 1 note G#, 1 - notetype 12, 196 + notetype 12, $c4 note F#, 14 - notetype 12, 194 + notetype 12, $c2 note E_, 1 octave 3 note B_, 1 @@ -148,14 +148,14 @@ Music_Cities2_branch_b58b: note F#, 1 note G#, 1 note A_, 1 - notetype 12, 196 + notetype 12, $c4 note G#, 6 - notetype 12, 194 + notetype 12, $c2 note E_, 1 note G#, 1 - notetype 12, 197 + notetype 12, $c5 note B_, 14 - notetype 12, 194 + notetype 12, $c2 note E_, 1 octave 3 note B_, 1 @@ -166,14 +166,14 @@ Music_Cities2_branch_b58b: note F#, 1 note G#, 1 note A_, 1 - notetype 12, 166 + notetype 12, $a6 note G#, 6 - notetype 12, 194 + notetype 12, $c2 note A_, 1 note G#, 1 - notetype 12, 196 + notetype 12, $c4 note F#, 8 - notetype 12, 161 + notetype 12, $a1 dutycycle 1 octave 3 note G#, 1 @@ -182,7 +182,7 @@ Music_Cities2_branch_b58b: note G#, 1 note G#, 1 note __, 1 - notetype 12, 194 + notetype 12, $c2 dutycycle 2 octave 4 note E_, 1 @@ -195,13 +195,13 @@ Music_Cities2_branch_b58b: note F#, 1 note G#, 1 note A_, 1 - notetype 12, 196 + notetype 12, $c4 note G#, 6 note E_, 1 note G#, 1 - notetype 12, 198 + notetype 12, $c6 note B_, 8 - notetype 12, 194 + notetype 12, $c2 note C#, 1 octave 3 note B_, 1 @@ -209,19 +209,19 @@ Music_Cities2_branch_b58b: note C#, 1 note D#, 1 note E_, 4 - notetype 12, 199 + notetype 12, $c7 note G#, 4 note E_, 4 - notetype 12, 194 + notetype 12, $c2 note D#, 1 note C#, 1 note D#, 1 note E_, 1 note F#, 4 - notetype 12, 199 + notetype 12, $c7 note B_, 4 note F#, 4 - notetype 12, 194 + notetype 12, $c2 note C#, 1 octave 3 note B_, 1 @@ -248,9 +248,9 @@ Music_Cities2_branch_b58b: note C#, 1 note D#, 1 note F#, 1 - notetype 12, 194 + notetype 12, $c2 note B_, 8 - notetype 12, 183 + notetype 12, $b7 octave 3 note E_, 8 octave 2 @@ -270,7 +270,7 @@ Music_Cities2_branch_b58b: note D#, 2 note C#, 2 note D#, 2 - notetype 12, 194 + notetype 12, $c2 note E_, 6 note E_, 1 octave 3 @@ -285,8 +285,8 @@ Music_Cities2_branch_b58b: loopchannel 0, Music_Cities2_branch_b58b -Music_Cities2_Ch3: ; b640 (2:7640) - notetype 12, 17 +Music_Cities2_Ch2:: + notetype 12, $11 note __, 16 octave 4 note E_, 2 @@ -298,7 +298,7 @@ Music_Cities2_Ch3: ; b640 (2:7640) note E_, 2 note G#, 2 -Music_Cities2_branch_b64c: +Music_Cities2_branch_b64c:: note F#, 2 note A_, 2 note F#, 2 @@ -419,4 +419,3 @@ Music_Cities2_branch_b64c: note E_, 2 note G#, 2 loopchannel 0, Music_Cities2_branch_b64c -; 0xb6c7 \ No newline at end of file diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm index 18142f4f..2ee5d47b 100644 --- a/crysaudio/music/RBY/credits.asm +++ b/crysaudio/music/RBY/credits.asm @@ -1,15 +1,15 @@ -Music_RBYCredits: - dbw $80, Music_RBYCredits_Ch1 - dbw $01, Music_RBYCredits_Ch2 - dbw $02, Music_RBYCredits_Ch3 +Music_RBYCredits:: + musicheader 3, 1, Music_RBYCredits_Ch0 + musicheader 1, 2, Music_RBYCredits_Ch1 + musicheader 1, 3, Music_RBYCredits_Ch2 -Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) +Music_RBYCredits_Ch0:: tempo 140 - volume 119 + volume $77 dutycycle 3 - vibrato 8, 52 - - notetype 12, 181 + vibrato 8, $34 + ;toggleperfectpitch + notetype 12, $b5 octave 4 note E_, 6 octave 3 @@ -57,7 +57,7 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note E_, 1 note F#, 1 note G_, 1 - notetype 12, 182 + notetype 12, $b6 note A_, 4 note E_, 2 note A_, 2 @@ -142,12 +142,12 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note F#, 2 note E_, 2 note D_, 2 - notetype 12, 183 + notetype 12, $b7 note E_, 6 note A_, 2 note G_, 4 note F#, 4 - notetype 12, 199 + notetype 12, $c7 note A_, 4 note B_, 4 octave 4 @@ -162,7 +162,7 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note F#, 2 note G_, 2 note A_, 2 - notetype 12, 144 + notetype 12, $90 note G_, 8 note F#, 8 note E_, 8 @@ -170,13 +170,13 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note __, 16 note __, 16 note __, 8 - notetype 12, 182 + notetype 12, $b6 note E_, 6 note D#, 1 note D_, 1 - notetype 12, 160 + notetype 12, $a0 note C#, 8 - notetype 12, 167 + notetype 12, $a7 note C#, 8 note __, 16 note __, 16 @@ -184,37 +184,37 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note E_, 6 note C#, 1 note E_, 1 - notetype 12, 160 + notetype 12, $a0 note A_, 8 - notetype 12, 167 + notetype 12, $a7 note A_, 8 - notetype 12, 182 + notetype 12, $b6 note G_, 6 note D_, 4 note G_, 2 note B_, 4 - notetype 12, 183 + notetype 12, $b7 note G_, 8 note F#, 4 note G#, 4 - notetype 12, 144 + notetype 12, $90 note A_, 8 note F#, 8 note E_, 8 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note D_, 8 note C#, 8 octave 2 note B_, 8 octave 3 note D_, 8 - notetype 12, 144 + notetype 12, $90 note E_, 8 note D_, 8 note F#, 8 note E_, 8 - notetype 12, 160 + notetype 12, $a0 note D_, 8 note E_, 8 note D_, 8 @@ -223,27 +223,27 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note F_, 8 note E_, 8 note D_, 8 - notetype 12, 160 + notetype 12, $a0 note C#, 6 - notetype 12, 167 + notetype 12, $a7 note C#, 6 - notetype 12, 183 + notetype 12, $b7 note D_, 4 note E_, 8 note G_, 6 note F#, 1 note F_, 1 - notetype 12, 160 + notetype 12, $a0 note E_, 6 - notetype 12, 167 + notetype 12, $a7 note E_, 6 - notetype 12, 183 + notetype 12, $b7 note D_, 4 - notetype 12, 160 + notetype 12, $a0 note C#, 8 - notetype 12, 167 + notetype 12, $a7 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note E_, 6 note D_, 2 note G_, 4 @@ -260,9 +260,9 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note C#, 4 note E_, 4 note F#, 4 - notetype 12, 160 + notetype 12, $a0 note E_, 6 - notetype 12, 183 + notetype 12, $b7 note D_, 2 note G_, 4 note F#, 4 @@ -270,13 +270,13 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note F#, 4 note A_, 4 note B_, 4 - notetype 12, 160 + notetype 12, $a0 octave 4 note C#, 16 note C#, 8 - notetype 12, 167 + notetype 12, $a7 note C#, 8 - notetype 12, 181 + notetype 12, $b5 octave 3 note A_, 1 note __, 1 @@ -284,15 +284,15 @@ Music_RBYCredits_Ch1: ; 7fc1f (1f:7c1f) note __, 3 note A_, 1 note A_, 1 - notetype 12, 177 + notetype 12, $b1 note A_, 8 endchannel -Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) +Music_RBYCredits_Ch1:: dutycycle 3 - vibrato 10, 37 - notetype 12, 197 + vibrato 10, $25 + notetype 12, $c5 octave 4 note A_, 6 note E_, 1 @@ -300,14 +300,14 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note G_, 6 note D_, 1 note G_, 1 - notetype 12, 199 + notetype 12, $c7 note F#, 12 note G#, 2 note E_, 1 note G#, 1 - notetype 12, 194 + notetype 12, $c2 note A_, 2 - notetype 12, 193 + notetype 12, $c1 octave 3 note A_, 4 note A_, 1 @@ -321,12 +321,12 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note A_, 1 note A_, 2 note A_, 2 - notetype 12, 196 + notetype 12, $c4 note A_, 1 note F#, 1 note A_, 1 note B_, 1 - notetype 12, 199 + notetype 12, $c7 octave 4 note C#, 6 note C#, 1 @@ -364,10 +364,10 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) octave 3 note A_, 6 note E_, 2 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 8 - notetype 12, 199 + notetype 12, $c7 note D_, 6 octave 3 note B_, 2 @@ -377,17 +377,17 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note G_, 6 note D_, 2 note B_, 8 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 6 - notetype 12, 183 + notetype 12, $b7 note C#, 6 note D_, 4 - notetype 12, 160 + notetype 12, $a0 note E_, 8 - notetype 12, 167 + notetype 12, $a7 note E_, 8 - notetype 12, 199 + notetype 12, $c7 note D_, 6 octave 3 note B_, 2 @@ -397,55 +397,55 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note G_, 6 note D_, 2 note B_, 8 - notetype 12, 176 + notetype 12, $b0 octave 4 note E_, 7 - notetype 12, 183 + notetype 12, $b7 note E_, 7 - notetype 12, 195 + notetype 12, $c3 note E_, 1 note G#, 1 - notetype 12, 176 + notetype 12, $b0 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note A_, 8 - notetype 12, 198 + notetype 12, $c6 note G_, 4 note F#, 4 note E_, 4 note D_, 4 - notetype 12, 160 + notetype 12, $a0 note C#, 8 - notetype 12, 167 + notetype 12, $a7 note C#, 8 - notetype 12, 144 + notetype 12, $90 octave 3 note A_, 8 - notetype 12, 151 + notetype 12, $97 note A_, 8 - notetype 12, 176 + notetype 12, $b0 note E_, 8 - notetype 12, 183 + notetype 12, $b7 note E_, 8 - notetype 12, 199 + notetype 12, $c7 note D_, 8 note G_, 6 note F#, 1 note F_, 1 note E_, 8 - notetype 12, 183 + notetype 12, $b7 note G_, 6 note F#, 1 note F_, 1 - notetype 12, 176 + notetype 12, $b0 note E_, 8 - notetype 12, 183 + notetype 12, $b7 note E_, 8 - notetype 12, 176 + notetype 12, $b0 note D_, 8 - notetype 12, 183 + notetype 12, $b7 note D_, 8 - notetype 12, 199 + notetype 12, $c7 octave 2 note B_, 8 octave 3 @@ -456,16 +456,16 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note B_, 6 note G_, 1 note B_, 1 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note C#, 8 - notetype 12, 176 + notetype 12, $b0 note D_, 8 - notetype 12, 183 + notetype 12, $b7 note D_, 8 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 8 octave 4 @@ -474,67 +474,67 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) note B_, 1 octave 4 note D_, 1 - notetype 12, 176 + notetype 12, $b0 note C#, 6 - notetype 12, 183 + notetype 12, $b7 note C#, 6 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 4 - notetype 12, 176 + notetype 12, $b0 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note A_, 8 - notetype 12, 176 + notetype 12, $b0 note F#, 6 - notetype 12, 183 + notetype 12, $b7 note F#, 6 - notetype 12, 199 + notetype 12, $c7 note G#, 4 note A_, 8 note F#, 8 - notetype 12, 176 + notetype 12, $b0 note G#, 6 - notetype 12, 183 + notetype 12, $b7 note G#, 6 - notetype 12, 199 + notetype 12, $c7 note A_, 4 note B_, 8 note G#, 8 - notetype 12, 176 + notetype 12, $b0 note A_, 6 - notetype 12, 183 + notetype 12, $b7 note A_, 6 - notetype 12, 199 + notetype 12, $c7 note B_, 4 octave 4 note C_, 8 octave 3 note A_, 8 - notetype 12, 176 + notetype 12, $b0 note B_, 6 - notetype 12, 183 + notetype 12, $b7 note B_, 6 - notetype 12, 199 + notetype 12, $c7 octave 4 note C_, 4 - notetype 12, 176 + notetype 12, $b0 note D_, 8 octave 3 note B_, 8 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 16 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note C#, 8 - notetype 12, 176 + notetype 12, $b0 octave 3 note A_, 16 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note A_, 8 - notetype 12, 199 + notetype 12, $c7 note G_, 6 note B_, 2 octave 4 @@ -563,24 +563,24 @@ Music_RBYCredits_Ch2: ; 7fd5f (1f:7d5f) octave 4 note D_, 2 note G_, 8 - notetype 12, 176 + notetype 12, $b0 note A_, 16 - notetype 12, 160 + notetype 12, $a0 note A_, 8 - notetype 12, 167 + notetype 12, $a7 note A_, 8 - notetype 12, 193 + notetype 12, $c1 note A_, 2 note A_, 4 note A_, 1 note A_, 1 - notetype 12, 193 + notetype 12, $c1 note A_, 8 endchannel -Music_RBYCredits_Ch3: ; 7fec2 (1f:7ec2) - notetype 12, 16 +Music_RBYCredits_Ch2:: + notetype 12, $10 octave 5 note C#, 6 octave 4 @@ -722,7 +722,7 @@ Music_RBYCredits_Ch3: ; 7fec2 (1f:7ec2) note __, 7 endchannel -Music_RBYCredits_branch_7ffa4: +Music_RBYCredits_branch_7ffa4:: octave 4 note E_, 2 note A_, 2 @@ -734,7 +734,7 @@ Music_RBYCredits_branch_7ffa4: note A_, 2 endchannel -Music_RBYCredits_branch_7ffae: +Music_RBYCredits_branch_7ffae:: octave 4 note D_, 2 note G_, 2 @@ -746,7 +746,7 @@ Music_RBYCredits_branch_7ffae: note G_, 2 endchannel -Music_RBYCredits_branch_7ffb8: +Music_RBYCredits_branch_7ffb8:: note G_, 2 note B_, 2 note G_, 2 @@ -757,7 +757,7 @@ Music_RBYCredits_branch_7ffb8: note B_, 2 endchannel -Music_RBYCredits_branch_7ffc1: +Music_RBYCredits_branch_7ffc1:: octave 4 note A_, 2 octave 5 @@ -776,7 +776,7 @@ Music_RBYCredits_branch_7ffc1: note C#, 2 endchannel -Music_RBYCredits_branch_7ffd2: +Music_RBYCredits_branch_7ffd2:: note D_, 2 note A_, 2 note D_, 2 @@ -787,7 +787,7 @@ Music_RBYCredits_branch_7ffd2: note A_, 2 endchannel -Music_RBYCredits_branch_7ffdb: +Music_RBYCredits_branch_7ffdb:: note E_, 2 note G#, 2 note E_, 2 @@ -798,7 +798,7 @@ Music_RBYCredits_branch_7ffdb: note G#, 2 endchannel -Music_RBYCredits_branch_7ffe4: +Music_RBYCredits_branch_7ffe4:: note E_, 2 note B_, 2 note E_, 2 @@ -809,7 +809,7 @@ Music_RBYCredits_branch_7ffe4: note B_, 2 endchannel -Music_RBYCredits_branch_7ffed: +Music_RBYCredits_branch_7ffed:: note A_, 1 note __, 1 note A_, 1 @@ -823,4 +823,3 @@ Music_RBYCredits_branch_7ffed: note A_, 1 note __, 3 endchannel -; 0x7fffa \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedgymleader.asm b/crysaudio/music/RBY/defeatedgymleader.asm index b6c2018c..4dd1c30f 100644 --- a/crysaudio/music/RBY/defeatedgymleader.asm +++ b/crysaudio/music/RBY/defeatedgymleader.asm @@ -1,14 +1,16 @@ -Music_DefeatedGymLeader: - dbw $80, Music_DefeatedGymLeader_Ch1 - dbw $01, Music_DefeatedGymLeader_Ch2 - dbw $02, Music_DefeatedGymLeader_Ch3 +Music_DefeatedGymLeader:: + musicheader 3, 1, Music_DefeatedGymLeader_Ch0 + musicheader 1, 2, Music_DefeatedGymLeader_Ch1 + musicheader 1, 3, Music_DefeatedGymLeader_Ch2 -Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) +Music_DefeatedGymLeader_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato 18, 49 - notetype 12, 166 + vibrato 18, $31 + ;toggleperfectpitch + tempo 112 + notetype 12, $a6 octave 4 note D_, 6 octave 3 @@ -18,13 +20,13 @@ Music_DefeatedGymLeader_Ch1: ; 23cad (8:7cad) note F#, 6 note D_, 1 note F#, 1 - notetype 12, 160 + notetype 12, $a0 note A_, 8 - notetype 12, 167 + notetype 12, $a7 note A_, 8 -Music_DefeatedGymLeader_branch_23ccc: - notetype 12, 178 +Music_DefeatedGymLeader_branch_23ccc:: + notetype 12, $b2 octave 3 note A_, 2 note A_, 2 @@ -48,10 +50,10 @@ Music_DefeatedGymLeader_branch_23ccc: note E_, 2 note D_, 2 note C#, 2 - notetype 12, 177 + notetype 12, $b1 octave 2 note B_, 8 - notetype 12, 178 + notetype 12, $b2 octave 3 note A_, 2 note A_, 2 @@ -75,10 +77,10 @@ Music_DefeatedGymLeader_branch_23ccc: note E_, 2 note D_, 2 note C#, 2 - notetype 12, 177 + notetype 12, $b1 octave 2 note B_, 8 - notetype 12, 151 + notetype 12, $97 octave 3 note D_, 6 octave 2 @@ -86,89 +88,89 @@ Music_DefeatedGymLeader_branch_23ccc: octave 3 note D_, 1 note F#, 8 - notetype 12, 176 + notetype 12, $b0 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, 151 + notetype 12, $97 note E_, 6 note C#, 1 note E_, 1 note G#, 8 - notetype 12, 176 + notetype 12, $b0 note G#, 6 note E_, 1 note G#, 1 note B_, 8 - notetype 12, 151 + notetype 12, $97 note C#, 6 octave 2 note A_, 1 octave 3 note C#, 1 note E_, 8 - notetype 12, 176 + notetype 12, $b0 note E_, 6 note C#, 1 note E_, 1 note E_, 4 note G_, 4 - notetype 12, 144 + notetype 12, $90 note F#, 8 note E_, 8 note D_, 8 note C#, 8 - notetype 12, 151 + notetype 12, $97 note D_, 6 octave 2 note A_, 1 octave 3 note D_, 1 note F#, 8 - notetype 12, 176 + notetype 12, $b0 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, 151 + notetype 12, $97 note E_, 6 note C#, 1 note E_, 1 note G#, 8 - notetype 12, 176 + notetype 12, $b0 note G#, 6 note E_, 1 note G#, 1 note B_, 8 - notetype 12, 151 + notetype 12, $97 note C#, 6 octave 2 note A_, 1 octave 3 note C#, 1 note E_, 8 - notetype 12, 176 + notetype 12, $b0 note E_, 6 note C#, 1 note E_, 1 note E_, 4 note G_, 4 - notetype 12, 151 + notetype 12, $97 note F#, 6 note E_, 1 note F#, 1 note A_, 8 - notetype 12, 167 + notetype 12, $a7 note G_, 8 note E_, 8 loopchannel 0, Music_DefeatedGymLeader_branch_23ccc -Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d) +Music_DefeatedGymLeader_Ch1:: dutycycle 2 - vibrato 24, 36 - notetype 12, 196 + vibrato 24, $24 + notetype 12, $c4 octave 4 note A_, 6 note F#, 1 @@ -179,13 +181,13 @@ Music_DefeatedGymLeader_Ch2: ; 23d6d (8:7d6d) note A_, 1 octave 5 note D_, 1 - notetype 12, 176 + notetype 12, $b0 note F#, 8 - notetype 12, 183 + notetype 12, $b7 note F#, 8 -Music_DefeatedGymLeader_branch_23d84: - notetype 12, 194 +Music_DefeatedGymLeader_branch_23d84:: + notetype 12, $c2 octave 4 note D_, 2 note C#, 2 @@ -200,10 +202,10 @@ Music_DefeatedGymLeader_branch_23d84: note A_, 2 note G_, 2 note F#, 2 - notetype 12, 196 + notetype 12, $c4 note A_, 4 note A_, 4 - notetype 12, 194 + notetype 12, $c2 octave 4 note D_, 2 note C#, 2 @@ -218,15 +220,15 @@ Music_DefeatedGymLeader_branch_23d84: note A_, 2 note G_, 2 note F#, 2 - notetype 12, 193 + notetype 12, $c1 note D_, 6 - notetype 6, 194 + notetype 6, $c2 note G_, 1 note A_, 1 note B_, 1 octave 4 note C#, 1 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note C#, 2 octave 3 @@ -240,14 +242,14 @@ Music_DefeatedGymLeader_branch_23d84: note A_, 2 note G_, 2 note F#, 2 - notetype 12, 196 + notetype 12, $c4 note A_, 4 note A_, 3 - notetype 6, 194 + notetype 6, $c2 note B_, 1 octave 4 note C#, 1 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note C#, 2 octave 3 @@ -261,91 +263,91 @@ Music_DefeatedGymLeader_branch_23d84: note A_, 2 note G_, 2 note F#, 2 - notetype 12, 193 + notetype 12, $c1 note D_, 8 - notetype 12, 199 + notetype 12, $c7 note A_, 6 note F#, 1 note A_, 1 - notetype 12, 176 + notetype 12, $b0 octave 4 note D_, 8 - notetype 12, 160 + notetype 12, $a0 note D_, 8 - notetype 12, 151 + notetype 12, $97 note D_, 8 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 6 note G#, 1 note B_, 1 - notetype 12, 128 + notetype 12, $80 octave 4 note E_, 8 - notetype 12, 160 + notetype 12, $a0 note E_, 8 - notetype 12, 199 + notetype 12, $c7 note E_, 8 octave 3 note G_, 6 note E_, 1 note G_, 1 - notetype 12, 111 + notetype 12, $6f octave 4 note C#, 8 - notetype 12, 199 + notetype 12, $c7 note C#, 8 note F#, 4 note E_, 4 - notetype 12, 176 + notetype 12, $b0 note D_, 14 octave 3 note B_, 2 - notetype 12, 160 + notetype 12, $a0 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note A_, 8 - notetype 12, 199 + notetype 12, $c7 note A_, 6 note F#, 1 note A_, 1 - notetype 12, 176 + notetype 12, $b0 octave 4 note D_, 8 - notetype 12, 160 + notetype 12, $a0 note D_, 8 - notetype 12, 151 + notetype 12, $97 note D_, 8 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 6 note G#, 1 note B_, 1 - notetype 12, 79 + notetype 12, $4f octave 4 note E_, 8 - notetype 12, 176 + notetype 12, $b0 note E_, 8 - notetype 12, 199 + notetype 12, $c7 note E_, 8 octave 3 note G_, 6 note E_, 1 note G_, 1 - notetype 12, 176 + notetype 12, $b0 octave 4 note C#, 8 - notetype 12, 183 + notetype 12, $b7 note C#, 8 octave 3 note A_, 4 octave 4 note C#, 4 - notetype 12, 176 + notetype 12, $b0 note D_, 14 note E_, 2 note D_, 12 - notetype 12, 194 + notetype 12, $c2 octave 3 note G_, 1 note A_, 1 @@ -355,9 +357,9 @@ Music_DefeatedGymLeader_branch_23d84: loopchannel 0, Music_DefeatedGymLeader_branch_23d84 -Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52) - notetype 12, 16 - vibrato 16, 18 +Music_DefeatedGymLeader_Ch2:: + notetype 12, $10 + vibrato 16, $12 octave 4 note F#, 6 note D_, 1 @@ -373,7 +375,7 @@ Music_DefeatedGymLeader_Ch3: ; 23e52 (8:7e52) note D_, 1 note F#, 8 -Music_DefeatedGymLeader_branch_23e65: +Music_DefeatedGymLeader_branch_23e65:: octave 4 note F#, 1 note __, 1 @@ -608,4 +610,3 @@ Music_DefeatedGymLeader_branch_23e65: note G_, 2 note E_, 2 loopchannel 0, Music_DefeatedGymLeader_branch_23e65 -; 0x23f52 \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedtrainer.asm b/crysaudio/music/RBY/defeatedtrainer.asm index 0c2a1d96..597aaa8e 100644 --- a/crysaudio/music/RBY/defeatedtrainer.asm +++ b/crysaudio/music/RBY/defeatedtrainer.asm @@ -1,16 +1,19 @@ -Music_DefeatedTrainer: - dbw $80, Music_DefeatedTrainer_Ch1 - dbw $01, Music_DefeatedTrainer_Ch2 - dbw $02, Music_DefeatedTrainer_Ch3 +Music_DefeatedTrainer:: + musicheader 3, 1, Music_DefeatedTrainer_Ch0 + musicheader 1, 2, Music_DefeatedTrainer_Ch1 + musicheader 1, 3, Music_DefeatedTrainer_Ch2 -Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) +Music_DefeatedTrainer_Ch0:: tempo 224 - volume 119 + volume $77 dutycycle 2 - notetype 4, 162 + ;toggleperfectpitch + tempo 224 + notetype 4, $a2 octave 4 note D_, 2 - notetype 4, 162 + tempo 224 + notetype 4, $a2 note D_, 2 note D_, 2 note D_, 2 @@ -18,12 +21,13 @@ Music_DefeatedTrainer_Ch1: ; 23a53 (8:7a53) note A_, 2 octave 4 note D_, 2 - notetype 4, 179 + notetype 4, $b3 note F#, 12 dutycycle 1 + tempo 224 -Music_DefeatedTrainer_branch_23a76: - notetype 4, 99 +Music_DefeatedTrainer_branch_23a76:: + notetype 4, $63 octave 3 note A_, 6 note F#, 3 @@ -96,23 +100,23 @@ Music_DefeatedTrainer_branch_23a76: loopchannel 0, Music_DefeatedTrainer_branch_23a76 -Music_DefeatedTrainer_Ch2: ; 23ac1 (8:7ac1) +Music_DefeatedTrainer_Ch1:: dutycycle 2 - notetype 4, 195 + notetype 4, $c3 octave 4 note A_, 2 - notetype 4, 195 + notetype 4, $c3 note A_, 2 note A_, 2 note A_, 2 note B_, 2 octave 5 note C#, 2 - notetype 4, 196 + notetype 4, $c4 note D_, 12 -Music_DefeatedTrainer_branch_23ad2: - notetype 4, 133 +Music_DefeatedTrainer_branch_23ad2:: + notetype 4, $85 octave 4 note D_, 6 octave 3 @@ -162,22 +166,22 @@ Music_DefeatedTrainer_branch_23ad2: note G_, 3 note D_, 3 note G_, 6 - notetype 4, 112 + notetype 4, $70 note F#, 12 - notetype 4, 119 + notetype 4, $77 note F#, 12 - notetype 4, 96 + notetype 4, $60 note E_, 12 - notetype 4, 103 + notetype 4, $67 note E_, 12 loopchannel 0, Music_DefeatedTrainer_branch_23ad2 -Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15) - notetype 4, 16 +Music_DefeatedTrainer_Ch2:: + notetype 4, $10 octave 5 note D_, 2 - notetype 4, 16 + notetype 4, $10 note D_, 2 note D_, 2 octave 4 @@ -185,9 +189,9 @@ Music_DefeatedTrainer_Ch3: ; 23b15 (8:7b15) note A_, 2 note G_, 2 note A_, 12 - notetype 4, 33 + notetype 4, $21 -Music_DefeatedTrainer_branch_23b24: +Music_DefeatedTrainer_branch_23b24:: note F#, 3 note __, 3 note F#, 3 @@ -265,4 +269,3 @@ Music_DefeatedTrainer_branch_23b24: octave 4 note A_, 3 loopchannel 0, Music_DefeatedTrainer_branch_23b24 -; 0x23b74 \ No newline at end of file diff --git a/crysaudio/music/RBY/defeatedwildmon.asm b/crysaudio/music/RBY/defeatedwildmon.asm index 0667018e..a81ec045 100644 --- a/crysaudio/music/RBY/defeatedwildmon.asm +++ b/crysaudio/music/RBY/defeatedwildmon.asm @@ -1,14 +1,17 @@ -Music_DefeatedWildMon: - dbw $80, Music_DefeatedWildMon_Ch1 - dbw $01, Music_DefeatedWildMon_Ch2 - dbw $02, Music_DefeatedWildMon_Ch3 +Music_DefeatedWildMon:: + musicheader 3, 1, Music_DefeatedWildMon_Ch0 + musicheader 1, 2, Music_DefeatedWildMon_Ch1 + musicheader 1, 3, Music_DefeatedWildMon_Ch2 -Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) +Music_DefeatedWildMon_Ch0:: tempo 112 - volume 119 + volume $77 + ;executemusic dutycycle 3 - vibrato 6, 52 - notetype 12, 183 + vibrato 6, $34 + ;toggleperfectpitch + tempo 112 + notetype 12, $b7 octave 3 note B_, 1 note A_, 1 @@ -16,8 +19,8 @@ Music_DefeatedWildMon_Ch1: ; 23b74 (8:7b74) note F#, 1 note E_, 12 -Music_DefeatedWildMon_branch_23b8b: - notetype 12, 98 +Music_DefeatedWildMon_branch_23b8b:: + notetype 12, $62 note E_, 2 note F#, 2 note E_, 2 @@ -69,19 +72,20 @@ Music_DefeatedWildMon_branch_23b8b: loopchannel 0, Music_DefeatedWildMon_branch_23b8b -Music_DefeatedWildMon_Ch2: ; 23bc1 (8:7bc1) +Music_DefeatedWildMon_Ch1:: + ;executemusic dutycycle 2 - notetype 12, 195 + notetype 12, $c3 octave 4 note E_, 1 note F#, 1 note G#, 1 note A_, 1 - notetype 12, 199 + notetype 12, $c7 note B_, 12 -Music_DefeatedWildMon_branch_23bce: - notetype 12, 130 +Music_DefeatedWildMon_branch_23bce:: + notetype 12, $82 octave 3 note B_, 2 note A_, 2 @@ -143,8 +147,9 @@ Music_DefeatedWildMon_branch_23bce: loopchannel 0, Music_DefeatedWildMon_branch_23bce -Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) - notetype 12, 32 +Music_DefeatedWildMon_Ch2:: + ;executemusic + notetype 12, $20 octave 5 note E_, 1 note __, 1 @@ -162,7 +167,7 @@ Music_DefeatedWildMon_Ch3: ; 23c0e (8:7c0e) note E_, 1 note __, 3 -Music_DefeatedWildMon_branch_23c21: +Music_DefeatedWildMon_branch_23c21:: octave 4 note E_, 1 note __, 1 @@ -300,4 +305,3 @@ Music_DefeatedWildMon_branch_23c21: octave 4 note D#, 4 loopchannel 0, Music_DefeatedWildMon_branch_23c21 -; 0x23cad \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon1.asm b/crysaudio/music/RBY/dungeon1.asm index fc7c0677..04b6d27b 100644 --- a/crysaudio/music/RBY/dungeon1.asm +++ b/crysaudio/music/RBY/dungeon1.asm @@ -1,26 +1,28 @@ -Music_Dungeon1: - dbw $C0, Music_Dungeon1_Ch1 - dbw $01, Music_Dungeon1_Ch2 - dbw $02, Music_Dungeon1_Ch3 - dbw $03, Music_Dungeon1_Ch4 +Music_Dungeon1:: + musicheader 4, 1, Music_Dungeon1_Ch0 + musicheader 1, 2, Music_Dungeon1_Ch1 + musicheader 1, 3, Music_Dungeon1_Ch2 + musicheader 1, 4, Music_Dungeon1_Ch3 -Music_Dungeon1_Ch1: ; 7ded1 (1f:5ed1) +Music_Dungeon1_Ch0:: tempo 144 - volume 119 - dutycycle 3 - vibrato 10, 20 - notetype 12, 77 + volume $77 + dutycycle 3 + ;toggleperfectpitch + vibrato 10, $14 + notetype 12, $4d note __, 8 - unknownmusic0xee 237 + ;stereopanning 237 + stereopanning $0f octave 4 note F#, 8 - unknownmusic0xee 255 + stereopanning $ff -Music_Dungeon1_branch_7dee5: - notetype 12, 178 +Music_Dungeon1_branch_7dee5:: + notetype 12, $b2 octave 3 -Music_Dungeon1_branch_7dee8: +Music_Dungeon1_branch_7dee8:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 3, Music_Dungeon1_branch_7dee8 note E_, 1 @@ -40,7 +42,7 @@ Music_Dungeon1_branch_7dee8: note A_, 1 note A#, 1 -Music_Dungeon1_branch_7deff: +Music_Dungeon1_branch_7deff:: callchannel Music_Dungeon1_branch_7dfaa loopchannel 4, Music_Dungeon1_branch_7deff callchannel Music_Dungeon1_branch_7dfd5 @@ -61,12 +63,12 @@ Music_Dungeon1_branch_7deff: note A_, 1 note G_, 1 note F#, 1 - notetype 12, 195 + notetype 12, $c3 note G_, 4 note F#, 4 note E_, 4 note D#, 4 - notetype 12, 194 + notetype 12, $c2 callchannel Music_Dungeon1_branch_7dfc5 octave 3 note B_, 3 @@ -74,7 +76,7 @@ Music_Dungeon1_branch_7deff: note C_, 3 callchannel Music_Dungeon1_branch_7dfc5 note C#, 3 - notetype 12, 195 + notetype 12, $c3 octave 3 note G_, 4 note F#, 4 @@ -85,7 +87,7 @@ Music_Dungeon1_branch_7deff: note C_, 4 octave 2 note B_, 4 - notetype 12, 194 + notetype 12, $c2 note B_, 1 note A#, 1 note G_, 1 @@ -132,10 +134,10 @@ Music_Dungeon1_branch_7deff: octave 3 note C#, 1 -Music_Dungeon1_branch_7df6e: +Music_Dungeon1_branch_7df6e:: note __, 16 loopchannel 8, Music_Dungeon1_branch_7df6e - notetype 12, 195 + notetype 12, $c3 callchannel Music_Dungeon1_branch_7dfbb note B_, 2 note G_, 2 @@ -153,7 +155,7 @@ Music_Dungeon1_branch_7df6e: note F#, 2 note G_, 2 note D#, 2 - notetype 12, 194 + notetype 12, $c2 callchannel Music_Dungeon1_branch_7dfc5 octave 3 note B_, 3 @@ -161,16 +163,16 @@ Music_Dungeon1_branch_7df6e: note C_, 3 callchannel Music_Dungeon1_branch_7dfc5 note C#, 3 - notetype 12, 199 + notetype 12, $c7 octave 3 note F#, 8 note D#, 8 - notetype 12, 194 + notetype 12, $c2 callchannel Music_Dungeon1_branch_7dfaa callchannel Music_Dungeon1_branch_7dfaa loopchannel 0, Music_Dungeon1_branch_7dee5 -Music_Dungeon1_branch_7dfaa: +Music_Dungeon1_branch_7dfaa:: note E_, 1 note D#, 1 note B_, 1 @@ -189,7 +191,7 @@ Music_Dungeon1_branch_7dfaa: note A#, 1 endchannel -Music_Dungeon1_branch_7dfbb: +Music_Dungeon1_branch_7dfbb:: octave 2 note G_, 2 note A#, 4 @@ -201,7 +203,7 @@ Music_Dungeon1_branch_7dfbb: note A#, 2 endchannel -Music_Dungeon1_branch_7dfc5: +Music_Dungeon1_branch_7dfc5:: octave 3 note E_, 1 note E_, 1 @@ -219,7 +221,7 @@ Music_Dungeon1_branch_7dfc5: note C_, 1 endchannel -Music_Dungeon1_branch_7dfd5: +Music_Dungeon1_branch_7dfd5:: note E_, 1 note E_, 1 note __, 4 @@ -231,20 +233,22 @@ Music_Dungeon1_branch_7dfd5: endchannel -Music_Dungeon1_Ch2: ; 7dfde (1f:5fde) - vibrato 11, 21 +Music_Dungeon1_Ch1:: + vibrato 11, $15 dutycycle 3 - notetype 12, 15 + notetype 12, $0f octave 4 note G#, 8 - notetype 12, 77 + stereopanning $f0 + notetype 12, $4d octave 5 note D_, 8 + stereopanning $ff -Music_Dungeon1_branch_7dfeb: - notetype 12, 194 +Music_Dungeon1_branch_7dfeb:: + notetype 12, $c2 -Music_Dungeon1_branch_7dfed: +Music_Dungeon1_branch_7dfed:: callchannel Music_Dungeon1_branch_7e097 loopchannel 3, Music_Dungeon1_branch_7dfed octave 2 @@ -266,7 +270,7 @@ Music_Dungeon1_branch_7dfed: note G_, 1 note D#, 1 -Music_Dungeon1_branch_7e006: +Music_Dungeon1_branch_7e006:: callchannel Music_Dungeon1_branch_7e097 loopchannel 4, Music_Dungeon1_branch_7e006 note __, 2 @@ -279,14 +283,14 @@ Music_Dungeon1_branch_7e006: callchannel Music_Dungeon1_branch_7e0ab octave 3 note D#, 4 - notetype 12, 211 + notetype 12, $d3 octave 4 note E_, 4 note D#, 4 note C_, 4 octave 3 note B_, 4 - notetype 12, 210 + notetype 12, $d2 callchannel Music_Dungeon1_branch_7e0b5 octave 3 note F#, 4 @@ -296,7 +300,7 @@ Music_Dungeon1_branch_7e006: callchannel Music_Dungeon1_branch_7e0b5 octave 3 note A#, 4 - notetype 12, 211 + notetype 12, $d3 octave 4 note E_, 4 note D#, 4 @@ -309,12 +313,12 @@ Music_Dungeon1_branch_7e006: note B_, 4 note G_, 4 note F#, 2 - notetype 12, 214 + notetype 12, $d6 note E_, 8 note F_, 8 note F#, 8 note G_, 8 - notetype 12, 210 + notetype 12, $d2 callchannel Music_Dungeon1_branch_7e0ba note __, 10 note E_, 1 @@ -325,13 +329,13 @@ Music_Dungeon1_branch_7e006: note __, 12 callchannel Music_Dungeon1_branch_7e0ba note __, 14 - notetype 12, 211 + notetype 12, $d3 callchannel Music_Dungeon1_branch_7e0cd note D#, 4 callchannel Music_Dungeon1_branch_7e0cd note D#, 2 note __, 2 - notetype 12, 210 + notetype 12, $d2 callchannel Music_Dungeon1_branch_7e0c0 note __, 2 octave 3 @@ -355,16 +359,16 @@ Music_Dungeon1_branch_7e006: callchannel Music_Dungeon1_branch_7e0c0 octave 3 note A#, 4 - notetype 12, 214 + notetype 12, $d6 note B_, 8 octave 4 note D#, 8 - notetype 12, 210 + notetype 12, $d2 callchannel Music_Dungeon1_branch_7e097 callchannel Music_Dungeon1_branch_7e097 loopchannel 0, Music_Dungeon1_branch_7dfeb -Music_Dungeon1_branch_7e097: +Music_Dungeon1_branch_7e097:: octave 2 note E_, 1 note E_, 1 @@ -386,7 +390,7 @@ Music_Dungeon1_branch_7e097: note B_, 1 endchannel -Music_Dungeon1_branch_7e0ab: +Music_Dungeon1_branch_7e0ab:: octave 2 note E_, 1 note E_, 1 @@ -398,14 +402,14 @@ Music_Dungeon1_branch_7e0ab: note __, 3 endchannel -Music_Dungeon1_branch_7e0b5: +Music_Dungeon1_branch_7e0b5:: octave 2 note E_, 1 note E_, 1 note __, 10 endchannel -Music_Dungeon1_branch_7e0ba: +Music_Dungeon1_branch_7e0ba:: octave 1 note E_, 1 note G_, 1 @@ -413,7 +417,7 @@ Music_Dungeon1_branch_7e0ba: note D#, 1 endchannel -Music_Dungeon1_branch_7e0c0: +Music_Dungeon1_branch_7e0c0:: octave 2 note E_, 1 note E_, 1 @@ -428,7 +432,7 @@ Music_Dungeon1_branch_7e0c0: note C_, 1 endchannel -Music_Dungeon1_branch_7e0cd: +Music_Dungeon1_branch_7e0cd:: octave 3 note E_, 6 note G_, 6 @@ -446,15 +450,15 @@ Music_Dungeon1_branch_7e0cd: endchannel -Music_Dungeon1_Ch3: ; 7e0dc (1f:60dc) - notetype 12, 17 - vibrato 8, 38 +Music_Dungeon1_Ch2:: + notetype 12, $11 + vibrato 8, $26 note __, 14 octave 4 note D_, 1 note D#, 1 -Music_Dungeon1_branch_7e0e5: +Music_Dungeon1_branch_7e0e5:: callchannel Music_Dungeon1_branch_7e140 callchannel Music_Dungeon1_branch_7e140 octave 5 @@ -516,7 +520,7 @@ Music_Dungeon1_branch_7e0e5: note __, 16 loopchannel 0, Music_Dungeon1_branch_7e0e5 -Music_Dungeon1_branch_7e140: +Music_Dungeon1_branch_7e140:: octave 5 note E_, 4 note B_, 4 @@ -538,7 +542,7 @@ Music_Dungeon1_branch_7e140: note D#, 4 endchannel -Music_Dungeon1_branch_7e154: +Music_Dungeon1_branch_7e154:: octave 6 note E_, 1 note E_, 1 @@ -550,7 +554,7 @@ Music_Dungeon1_branch_7e154: note __, 1 endchannel -Music_Dungeon1_branch_7e15e: +Music_Dungeon1_branch_7e15e:: octave 3 note E_, 1 note G_, 1 @@ -558,7 +562,7 @@ Music_Dungeon1_branch_7e15e: note D#, 1 endchannel -Music_Dungeon1_branch_7e164: +Music_Dungeon1_branch_7e164:: note E_, 4 note B_, 4 note A#, 4 @@ -579,7 +583,7 @@ Music_Dungeon1_branch_7e164: note D#, 4 endchannel -Music_Dungeon1_branch_7e177: +Music_Dungeon1_branch_7e177:: octave 4 note E_, 1 note __, 3 @@ -601,14 +605,14 @@ Music_Dungeon1_branch_7e177: endchannel -Music_Dungeon1_Ch4: ; 7e18a (1f:618a) - notetype 12 +Music_Dungeon1_Ch3:: togglenoise 1 + notetype 12 note __, 14 note E_, 1 note E_, 1 -Music_Dungeon1_branch_7e190: +Music_Dungeon1_branch_7e190:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e190 note F_, 4 @@ -617,7 +621,7 @@ Music_Dungeon1_branch_7e190: note E_, 2 note E_, 2 -Music_Dungeon1_branch_7e1a1: +Music_Dungeon1_branch_7e1a1:: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 3, Music_Dungeon1_branch_7e1a1 note F_, 4 @@ -625,12 +629,12 @@ Music_Dungeon1_branch_7e1a1: note F_, 4 note F_, 4 -Music_Dungeon1_branch_7e1b0: +Music_Dungeon1_branch_7e1b0:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1b0 callchannel Music_Dungeon1_branch_7e202 -Music_Dungeon1_branch_7e1ba: +Music_Dungeon1_branch_7e1ba:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1ba callchannel Music_Dungeon1_branch_7e202 @@ -641,12 +645,12 @@ Music_Dungeon1_branch_7e1ba: note C#, 2 note F_, 4 -Music_Dungeon1_branch_7e1cf: +Music_Dungeon1_branch_7e1cf:: note __, 16 loopchannel 13, Music_Dungeon1_branch_7e1cf note __, 12 -Music_Dungeon1_branch_7e1d5: +Music_Dungeon1_branch_7e1d5:: callchannel Music_Dungeon1_branch_7e1fa loopchannel 3, Music_Dungeon1_branch_7e1d5 note E_, 4 @@ -659,24 +663,23 @@ Music_Dungeon1_branch_7e1d5: callchannel Music_Dungeon1_branch_7e1f1 loopchannel 0, Music_Dungeon1_branch_7e190 -Music_Dungeon1_branch_7e1f1: +Music_Dungeon1_branch_7e1f1:: note F_, 4 note E_, 4 note F_, 4 note E_, 4 endchannel -Music_Dungeon1_branch_7e1fa: +Music_Dungeon1_branch_7e1fa:: note E_, 1 note E_, 1 note __, 10 note F#, 4 endchannel -Music_Dungeon1_branch_7e202: +Music_Dungeon1_branch_7e202:: note C#, 4 note D_, 4 note D_, 4 note D#, 4 endchannel -; 0x7e20b \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon2.asm b/crysaudio/music/RBY/dungeon2.asm index 9d8043aa..42623ced 100644 --- a/crysaudio/music/RBY/dungeon2.asm +++ b/crysaudio/music/RBY/dungeon2.asm @@ -1,18 +1,18 @@ -Music_Dungeon2: - dbw $C0, Music_Dungeon2_Ch1 - dbw $01, Music_Dungeon2_Ch2 - dbw $02, Music_Dungeon2_Ch3 - dbw $03, Music_Dungeon2_Ch4 +Music_Dungeon2:: + musicheader 4, 1, Music_Dungeon2_Ch0 + musicheader 1, 2, Music_Dungeon2_Ch1 + musicheader 1, 3, Music_Dungeon2_Ch2 + musicheader 1, 4, Music_Dungeon2_Ch3 -Music_Dungeon2_Ch1: ; 7e887 (1f:6887) +Music_Dungeon2_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - - vibrato 10, 20 + ;toggleperfectpitch + vibrato 10, $14 -Music_Dungeon2_branch_7e892: - notetype 12, 178 +Music_Dungeon2_branch_7e892:: + notetype 12, $b2 octave 4 note E_, 4 note E_, 4 @@ -58,7 +58,7 @@ Music_Dungeon2_branch_7e892: note A_, 4 note F#, 2 loopchannel 2, Music_Dungeon2_branch_7e892 - notetype 12, 31 + notetype 12, $1f octave 3 note E_, 16 note C_, 16 @@ -76,12 +76,12 @@ Music_Dungeon2_branch_7e892: loopchannel 0, Music_Dungeon2_branch_7e892 -Music_Dungeon2_Ch2: ; 7e8d8 (1f:68d8) - vibrato 11, 21 +Music_Dungeon2_Ch1:: + vibrato 11, $15 -Music_Dungeon2_branch_7e8db: +Music_Dungeon2_branch_7e8db:: dutycycle 3 - notetype 12, 194 + notetype 12, $c2 octave 3 note E_, 4 note E_, 4 @@ -158,7 +158,7 @@ Music_Dungeon2_branch_7e8db: note __, 16 note __, 16 note __, 16 - notetype 12, 199 + notetype 12, $c7 dutycycle 1 octave 4 note E_, 16 @@ -168,11 +168,11 @@ Music_Dungeon2_branch_7e8db: loopchannel 0, Music_Dungeon2_branch_7e8db -Music_Dungeon2_Ch3: ; 7e93b (1f:693b) - notetype 12, 19 - vibrato 8, 38 +Music_Dungeon2_Ch2:: + notetype 12, $13 + vibrato 8, $26 -Music_Dungeon2_branch_7e940: +Music_Dungeon2_branch_7e940:: callchannel Music_Dungeon2_branch_7e9d1 loopchannel 16, Music_Dungeon2_branch_7e940 note E_, 4 @@ -193,7 +193,7 @@ Music_Dungeon2_branch_7e940: note __, 4 note A#, 4 -Music_Dungeon2_branch_7e958: +Music_Dungeon2_branch_7e958:: octave 5 note E_, 2 note __, 2 @@ -294,7 +294,7 @@ Music_Dungeon2_branch_7e958: note __, 2 endchannel -Music_Dungeon2_branch_7e9d1: +Music_Dungeon2_branch_7e9d1:: octave 4 note E_, 2 note __, 4 @@ -308,11 +308,11 @@ Music_Dungeon2_branch_7e9d1: endchannel -Music_Dungeon2_Ch4: ; 7e9dc (1f:69dc) - notetype 12 +Music_Dungeon2_Ch3:: togglenoise 1 + notetype 12 -Music_Dungeon2_branch_7e9dd: +Music_Dungeon2_branch_7e9dd:: note E_, 4 note F_, 4 note E_, 4 @@ -322,4 +322,3 @@ Music_Dungeon2_branch_7e9dd: note D#, 4 note C#, 4 loopchannel 0, Music_Dungeon2_branch_7e9dd -; 0x7e9f1 \ No newline at end of file diff --git a/crysaudio/music/RBY/dungeon3.asm b/crysaudio/music/RBY/dungeon3.asm index 12322487..ab63f4db 100644 --- a/crysaudio/music/RBY/dungeon3.asm +++ b/crysaudio/music/RBY/dungeon3.asm @@ -1,19 +1,20 @@ -Music_Dungeon3: - dbw $80, Music_Dungeon3_Ch1 - dbw $01, Music_Dungeon3_Ch2 - dbw $02, Music_Dungeon3_Ch3 +Music_Dungeon3:: + musicheader 4, 1, Music_Dungeon3_Ch0 + musicheader 1, 2, Music_Dungeon3_Ch1 + musicheader 1, 3, Music_Dungeon3_Ch2 + musicheader 1, 4, Music_Dungeon3_Ch3 -Music_Dungeon3_Ch1: ; 7e9f1 (1f:69f1) +Music_Dungeon3_Ch0:: tempo 160 - volume 119 + volume $77 dutycycle 3 - - vibrato 8, 20 + ;toggleperfectpitch + vibrato 8, $14 -Music_Dungeon3_branch_7e9fc: - notetype 12, 195 +Music_Dungeon3_branch_7e9fc:: + notetype 12, $c3 -Music_Dungeon3_branch_7e9fe: +Music_Dungeon3_branch_7e9fe:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 3, Music_Dungeon3_branch_7e9fe octave 2 @@ -29,11 +30,11 @@ Music_Dungeon3_branch_7e9fe: note D#, 2 note E_, 2 -Music_Dungeon3_branch_7ea11: +Music_Dungeon3_branch_7ea11:: callchannel Music_Dungeon3_branch_7eac1 loopchannel 4, Music_Dungeon3_branch_7ea11 -Music_Dungeon3_branch_7ea18: +Music_Dungeon3_branch_7ea18:: callchannel Music_Dungeon3_branch_7eab2 loopchannel 4, Music_Dungeon3_branch_7ea18 octave 4 @@ -64,11 +65,11 @@ Music_Dungeon3_branch_7ea18: note F_, 2 note F_, 2 -Music_Dungeon3_branch_7ea3c: +Music_Dungeon3_branch_7ea3c:: callchannel Music_Dungeon3_branch_7eace loopchannel 4, Music_Dungeon3_branch_7ea3c -Music_Dungeon3_branch_7ea43: +Music_Dungeon3_branch_7ea43:: callchannel Music_Dungeon3_branch_7eadd loopchannel 3, Music_Dungeon3_branch_7ea43 octave 3 @@ -161,7 +162,7 @@ Music_Dungeon3_branch_7ea43: note __, 16 loopchannel 0, Music_Dungeon3_branch_7e9fc -Music_Dungeon3_branch_7eab2: +Music_Dungeon3_branch_7eab2:: octave 2 note B_, 2 octave 3 @@ -178,7 +179,7 @@ Music_Dungeon3_branch_7eab2: note D#, 2 endchannel -Music_Dungeon3_branch_7eac1: +Music_Dungeon3_branch_7eac1:: note E_, 2 note G#, 2 octave 4 @@ -193,7 +194,7 @@ Music_Dungeon3_branch_7eac1: note G#, 2 endchannel -Music_Dungeon3_branch_7eace: +Music_Dungeon3_branch_7eace:: octave 3 note D#, 2 octave 2 @@ -210,7 +211,7 @@ Music_Dungeon3_branch_7eace: note B_, 2 endchannel -Music_Dungeon3_branch_7eadd: +Music_Dungeon3_branch_7eadd:: note A_, 2 note F_, 2 octave 3 @@ -225,7 +226,7 @@ Music_Dungeon3_branch_7eadd: note F_, 2 endchannel -Music_Dungeon3_branch_7eaea: +Music_Dungeon3_branch_7eaea:: octave 3 note G#, 2 note E_, 2 @@ -240,14 +241,14 @@ Music_Dungeon3_branch_7eaea: note C_, 2 endchannel -Music_Dungeon3_branch_7eaf7: +Music_Dungeon3_branch_7eaf7:: note D#, 2 note G_, 2 note D#, 2 note C#, 6 endchannel -Music_Dungeon3_branch_7eafc: +Music_Dungeon3_branch_7eafc:: tempo 168 octave 1 note A#, 1 @@ -340,12 +341,12 @@ Music_Dungeon3_branch_7eafc: endchannel -Music_Dungeon3_Ch2: ; 7eb68 (1f:6b68) - vibrato 11, 21 +Music_Dungeon3_Ch1:: + vibrato 11, $15 dutycycle 3 -Music_Dungeon3_branch_7eb6d: - notetype 12, 211 +Music_Dungeon3_branch_7eb6d:: + notetype 12, $d3 octave 4 note D#, 6 note C#, 6 @@ -612,8 +613,8 @@ Music_Dungeon3_branch_7eb6d: loopchannel 0, Music_Dungeon3_branch_7eb6d -Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) - notetype 12, 18 +Music_Dungeon3_Ch2:: + notetype 12, $12 note __, 16 note __, 16 note __, 16 @@ -626,7 +627,7 @@ Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) note __, 16 note __, 16 note __, 12 - notetype 6, 16 + notetype 6, $10 octave 3 note B_, 1 octave 4 @@ -690,7 +691,7 @@ Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) note B_, 1 note __, 10 note __, 16 - notetype 12, 16 + notetype 12, $10 note __, 16 note __, 16 note __, 16 @@ -712,4 +713,51 @@ Music_Dungeon3_Ch3: ; 7ec7a (1f:6c7a) note __, 16 note __, 16 note __, 10 - loopchannel 0, Music_Dungeon3_Ch3 + loopchannel 0, Music_Dungeon3_Ch2 + + +Music_Dungeon3_Ch3:: + togglenoise 0 + notetype 12 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 16 + note __, 10 + endchannel diff --git a/crysaudio/music/RBY/finalbattle.asm b/crysaudio/music/RBY/finalbattle.asm index e7f2148c..35c3813c 100644 --- a/crysaudio/music/RBY/finalbattle.asm +++ b/crysaudio/music/RBY/finalbattle.asm @@ -1,14 +1,15 @@ -Music_FinalBattle: - dbw $80, Music_FinalBattle_Ch1 - dbw $01, Music_FinalBattle_Ch2 - dbw $02, Music_FinalBattle_Ch3 +Music_FinalBattle:: + musicheader 3, 1, Music_FinalBattle_Ch0 + musicheader 1, 2, Music_FinalBattle_Ch1 + musicheader 1, 3, Music_FinalBattle_Ch2 -Music_FinalBattle_Ch1: +Music_FinalBattle_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato $6, $34 - notetype $c, $b2 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b2 octave 3 note F#, 1 note F_, 1 @@ -18,7 +19,7 @@ Music_FinalBattle_Ch1: note G_, 1 note G#, 1 note G_, 1 - intensity $a2 + notetype 12, $a2 note G#, 1 note A_, 1 note G#, 1 @@ -27,7 +28,7 @@ Music_FinalBattle_Ch1: note A_, 1 note A#, 1 note B_, 1 - intensity $92 + notetype 12, $92 note A#, 1 note B_, 1 octave 4 @@ -39,7 +40,7 @@ Music_FinalBattle_Ch1: note C#, 1 note C_, 1 note C#, 1 - intensity $82 + notetype 12, $82 note D_, 1 note C#, 1 note D_, 1 @@ -48,7 +49,7 @@ Music_FinalBattle_Ch1: note D#, 1 note E_, 1 note D#, 1 - intensity $c1 + notetype 12, $c1 octave 3 note E_, 1 note E_, 7 @@ -67,48 +68,49 @@ Music_FinalBattle_Ch1: note G#, 1 note G#, 3 note D#, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 3 - intensity $b3 + notetype 12, $b3 note E_, 4 - intensity $c1 + notetype 12, $c1 note F_, 1 note F_, 3 - intensity $b3 + notetype 12, $b3 note F_, 4 - intensity $c1 + notetype 12, $c1 note G_, 1 note G_, 3 - intensity $b3 + notetype 12, $b3 note G_, 4 - intensity $c1 + notetype 12, $c1 note F_, 1 note F_, 3 - intensity $b3 + notetype 12, $b3 note F_, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 3 - intensity $b3 + notetype 12, $b3 note E_, 4 - intensity $c1 + notetype 12, $c1 note F_, 1 note F_, 3 - intensity $b3 + notetype 12, $b3 note F_, 4 - intensity $c1 + notetype 12, $c1 note G_, 1 note G_, 3 - intensity $b3 + notetype 12, $b3 note G_, 4 - intensity $c1 + notetype 12, $c1 note G#, 1 note G#, 3 - intensity $b7 + notetype 12, $b7 note D#, 4 -Music_FinalBattle_branch_23429: - intensity $b7 + +Music_FinalBattle_branch_23429:: + notetype 12, $b7 octave 3 note E_, 4 note B_, 4 @@ -122,20 +124,20 @@ Music_FinalBattle_branch_23429: note F#, 4 note F_, 4 note F#, 4 - intensity $b1 + notetype 12, $b1 note F#, 2 note F_, 1 note F#, 1 note A_, 1 note F#, 2 note F#, 1 - intensity $b7 + notetype 12, $b7 octave 2 note B_, 6 - intensity $a0 + notetype 12, $a0 octave 3 note D_, 6 - intensity $b7 + notetype 12, $b7 note F#, 4 note E_, 4 note B_, 4 @@ -150,9 +152,9 @@ Music_FinalBattle_branch_23429: note F_, 4 note F#, 12 note A#, 4 - intensity $5e + notetype 12, $5e note B_, 12 - intensity $b2 + notetype 12, $b2 note E_, 3 note E_, 3 note E_, 2 @@ -173,16 +175,16 @@ Music_FinalBattle_branch_23429: note F#, 1 note B_, 1 note F#, 1 - intensity $c2 + notetype 12, $c2 note E_, 1 note F#, 1 note B_, 1 note F#, 1 - intensity $d2 + notetype 12, $d2 note E_, 1 note F#, 1 note B_, 1 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 7 note E_, 1 @@ -193,23 +195,23 @@ Music_FinalBattle_branch_23429: note E_, 7 note E_, 1 note E_, 3 - intensity $b5 + notetype 12, $b5 note D_, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 3 - intensity $b5 + notetype 12, $b5 note F_, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 note E_, 3 - intensity $b5 + notetype 12, $b5 note D_, 4 - intensity $c1 + notetype 12, $c1 note E_, 1 - intensity $b7 + notetype 12, $b7 note E_, 7 - intensity $c1 + notetype 12, $c1 note E_, 2 note B_, 1 note A_, 1 @@ -292,35 +294,35 @@ Music_FinalBattle_branch_23429: note F_, 3 note F#, 1 note F_, 3 - intensity $b7 + notetype 12, $b7 octave 4 note C_, 2 - intensity $b0 + notetype 12, $b0 note C#, 8 - intensity $b7 + notetype 12, $b7 note C#, 8 - intensity $a0 + notetype 12, $a0 octave 3 note F#, 8 note F#, 8 - intensity $b0 + notetype 12, $b0 octave 3 note A_, 8 - intensity $b7 + notetype 12, $b7 note A_, 8 note G_, 4 note B_, 12 - intensity $b0 + notetype 12, $b0 note A_, 8 - intensity $b7 + notetype 12, $b7 note A_, 8 - intensity $b0 + notetype 12, $b0 note E_, 8 - intensity $b7 + notetype 12, $b7 note E_, 8 - intensity $b0 + notetype 12, $b0 note A#, 8 - intensity $b7 + notetype 12, $b7 note A#, 8 octave 4 note F_, 8 @@ -333,10 +335,10 @@ Music_FinalBattle_branch_23429: note A_, 4 octave 4 note C#, 12 - intensity $40 + notetype 12, $40 callchannel Music_FinalBattle_branch_23710 callchannel Music_FinalBattle_branch_23710 - intensity $b7 + notetype 12, $b7 octave 3 note E_, 4 note B_, 4 @@ -350,10 +352,10 @@ Music_FinalBattle_branch_23429: note F#, 4 note F_, 4 note F#, 12 - intensity $b0 + notetype 12, $b0 note A_, 8 note G_, 8 - intensity $b7 + notetype 12, $b7 note E_, 4 note B_, 4 note D#, 4 @@ -366,26 +368,28 @@ Music_FinalBattle_branch_23429: note F#, 4 note F_, 4 note F#, 12 - intensity $b0 + notetype 12, $b0 note A_, 8 - intensity $b7 + notetype 12, $b7 octave 4 note C_, 8 - intensity $b0 + notetype 12, $b0 octave 3 note B_, 8 - intensity $b7 + notetype 12, $b7 note B_, 8 - intensity $b0 + notetype 12, $b0 octave 4 note E_, 8 - intensity $b7 + notetype 12, $b7 note E_, 8 loopchannel 0, Music_FinalBattle_branch_23429 -Music_FinalBattle_Ch2: + + +Music_FinalBattle_Ch1:: dutycycle 3 - vibrato $8, $25 - notetype $c, $c2 + vibrato 8, $25 + notetype 12, $c2 octave 5 note C_, 1 octave 4 @@ -430,7 +434,7 @@ Music_FinalBattle_Ch2: note E_, 1 octave 5 note C_, 1 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 7 @@ -442,28 +446,28 @@ Music_FinalBattle_Ch2: note E_, 7 note E_, 1 note E_, 3 - intensity $c2 + notetype 12, $c2 octave 5 note E_, 4 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 3 - intensity $c2 + notetype 12, $c2 octave 5 note E_, 4 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 3 - intensity $c2 + notetype 12, $c2 octave 5 note E_, 4 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 3 - intensity $c2 + notetype 12, $c2 note D#, 4 callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 @@ -472,25 +476,26 @@ Music_FinalBattle_Ch2: callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 callchannel Music_FinalBattle_branch_23704 - intensity $c1 + notetype 12, $c1 octave 4 note E_, 1 note E_, 3 - intensity $4a + notetype 12, $4a octave 3 note G#, 4 -Music_FinalBattle_branch_235e6: - intensity $d7 + +Music_FinalBattle_branch_235e6:: + notetype 12, $d7 octave 4 note E_, 8 note D#, 8 note D_, 8 octave 3 note B_, 8 - intensity $d7 + notetype 12, $d7 note A#, 4 note B_, 12 - intensity $b1 + notetype 12, $b1 note F_, 2 note F#, 3 note A_, 1 @@ -505,56 +510,56 @@ Music_FinalBattle_branch_235e6: note B_, 1 note A_, 1 note A#, 1 - intensity $d7 + notetype 12, $d7 octave 4 note E_, 8 note D#, 8 note D_, 8 octave 3 note B_, 8 - intensity $d7 + notetype 12, $d7 note A#, 4 note B_, 12 octave 4 note D#, 4 note E_, 12 - intensity $a0 + notetype 12, $a0 octave 3 note B_, 8 octave 4 note D_, 8 note F_, 8 note D_, 8 - intensity $d1 + notetype 12, $d1 note E_, 1 note E_, 3 - intensity $c4 + notetype 12, $c4 octave 3 note D_, 4 - intensity $d1 + notetype 12, $d1 octave 4 note E_, 1 note E_, 3 - intensity $c4 + notetype 12, $c4 octave 3 note F_, 4 - intensity $d1 + notetype 12, $d1 octave 4 note E_, 1 note E_, 3 - intensity $c4 + notetype 12, $c4 octave 3 note D_, 4 - intensity $d1 + notetype 12, $d1 octave 4 note E_, 1 note E_, 1 - intensity $c4 + notetype 12, $c4 octave 2 note B_, 4 octave 3 note D_, 2 - intensity $c2 + notetype 12, $c2 octave 4 note E_, 1 note E_, 1 @@ -582,99 +587,99 @@ Music_FinalBattle_branch_235e6: note D#, 1 note E_, 1 note E_, 1 - intensity $c4 + notetype 12, $c4 octave 2 note B_, 4 octave 3 note D_, 2 - intensity $d7 + notetype 12, $d7 octave 4 note E_, 4 note F_, 2 note F#, 12 - intensity $c2 + notetype 12, $c2 octave 3 note B_, 2 note B_, 4 note B_, 2 note B_, 4 note B_, 2 - intensity $d7 + notetype 12, $d7 octave 4 note F_, 4 note F#, 2 note G_, 12 - intensity $c2 + notetype 12, $c2 note C_, 2 note C_, 4 note C_, 2 note C_, 4 note C_, 2 - intensity $d7 + notetype 12, $d7 note F#, 4 note G_, 2 note G#, 12 - intensity $82 + notetype 12, $82 note C#, 2 note C#, 4 - intensity $a2 + notetype 12, $a2 note C#, 2 note C#, 4 note C#, 4 - intensity $d2 + notetype 12, $d2 note C#, 2 note C#, 4 - intensity $f2 + notetype 12, $f2 note C#, 2 note C#, 4 - intensity $c4 + notetype 12, $c4 note E_, 1 note F_, 1 - intensity $c0 + notetype 12, $c0 note F#, 12 - intensity $c7 + notetype 12, $c7 note F#, 4 - intensity $1f + notetype 12, $1f octave 3 note F#, 8 - intensity $90 + notetype 12, $90 note F#, 8 - intensity $c7 + notetype 12, $c7 octave 4 note C#, 4 - intensity $c0 + notetype 12, $c0 note D_, 12 note D_, 8 - intensity $c7 + notetype 12, $c7 note D_, 8 - intensity $c0 + notetype 12, $c0 note E_, 8 - intensity $c7 + notetype 12, $c7 note E_, 8 - intensity $c0 + notetype 12, $c0 octave 3 note A_, 8 - intensity $c7 + notetype 12, $c7 note A_, 8 - intensity $c0 + notetype 12, $c0 octave 4 note F_, 8 - intensity $c7 + notetype 12, $c7 note F_, 8 octave 5 note C_, 8 octave 4 note A#, 8 - intensity $c0 + notetype 12, $c0 note A_, 16 note A_, 8 - intensity $c7 + notetype 12, $c7 note A_, 8 - intensity $c5 + notetype 12, $c5 callchannel Music_FinalBattle_branch_23710 - intensity $b1 + notetype 12, $b1 callchannel Music_FinalBattle_branch_23710 - intensity $d7 + notetype 12, $d7 octave 4 note E_, 8 note D#, 8 @@ -683,12 +688,12 @@ Music_FinalBattle_branch_235e6: note B_, 8 note A#, 4 note B_, 12 - intensity $c7 + notetype 12, $c7 octave 4 note D_, 8 - intensity $4c + notetype 12, $4c note C_, 8 - intensity $d7 + notetype 12, $d7 note E_, 8 note D#, 8 note D_, 8 @@ -696,19 +701,20 @@ Music_FinalBattle_branch_235e6: note B_, 8 note A#, 4 note B_, 12 - intensity $5d + notetype 12, $5d octave 4 note D_, 8 - intensity $c0 + notetype 12, $c0 note F_, 8 - intensity $c0 + notetype 12, $c0 note E_, 8 - intensity $c7 + notetype 12, $c7 note E_, 8 note A#, 4 note B_, 12 loopchannel 0, Music_FinalBattle_branch_235e6 -Music_FinalBattle_branch_23704: + +Music_FinalBattle_branch_23704:: octave 4 note E_, 1 note E_, 1 @@ -721,7 +727,8 @@ Music_FinalBattle_branch_23704: note G_, 1 note F_, 1 endchannel -Music_FinalBattle_branch_23710: + +Music_FinalBattle_branch_23710:: octave 4 note D_, 2 note C#, 2 @@ -734,8 +741,10 @@ Music_FinalBattle_branch_23710: note F#, 2 note D_, 2 endchannel -Music_FinalBattle_Ch3: - notetype $c, $11 + + +Music_FinalBattle_Ch2:: + notetype 12, $11 octave 4 note E_, 4 octave 5 @@ -831,7 +840,8 @@ Music_FinalBattle_Ch3: note D#, 1 note E_, 1 note G_, 1 -Music_FinalBattle_branch_2377d: + +Music_FinalBattle_branch_2377d:: octave 4 note E_, 1 octave 3 @@ -1299,7 +1309,8 @@ Music_FinalBattle_branch_2377d: note A_, 2 note B_, 4 loopchannel 0, Music_FinalBattle_branch_2377d -Music_FinalBattle_branch_2395b: + +Music_FinalBattle_branch_2395b:: octave 4 note F#, 2 octave 5 @@ -1317,7 +1328,8 @@ Music_FinalBattle_branch_2395b: octave 5 note C#, 2 endchannel -Music_FinalBattle_branch_2396c: + +Music_FinalBattle_branch_2396c:: octave 4 note A_, 2 octave 5 diff --git a/crysaudio/music/RBY/gamecorner.asm b/crysaudio/music/RBY/gamecorner.asm index 75a63183..c30cf042 100644 --- a/crysaudio/music/RBY/gamecorner.asm +++ b/crysaudio/music/RBY/gamecorner.asm @@ -1,18 +1,18 @@ -Music_RBYGameCorner: - dbw $80, Music_RBYGameCorner_Ch1 - dbw $01, Music_RBYGameCorner_Ch2 - dbw $02, Music_RBYGameCorner_Ch3 +Music_RBYGameCorner:: + musicheader 3, 1, Music_RBYGameCorner_Ch0 + musicheader 1, 2, Music_RBYGameCorner_Ch1 + musicheader 1, 3, Music_RBYGameCorner_Ch2 -Music_RBYGameCorner_Ch1: ; 7e20b (1f:620b) +Music_RBYGameCorner_Ch0:: tempo 120 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 52 - - notetype 12, 181 + vibrato 12, $34 + ;toggleperfectpitch + notetype 12, $b5 octave 3 note A_, 6 - notetype 12, 177 + notetype 12, $b1 note G#, 2 note F#, 2 note E_, 2 @@ -20,8 +20,8 @@ Music_RBYGameCorner_Ch1: ; 7e20b (1f:620b) note C#, 2 note D#, 16 -Music_RBYGameCorner_branch_7e222: - notetype 12, 181 +Music_RBYGameCorner_branch_7e222:: + notetype 12, $b5 octave 3 note C#, 4 octave 2 @@ -33,21 +33,21 @@ Music_RBYGameCorner_branch_7e222: octave 3 note A_, 2 note G#, 8 - notetype 12, 167 + notetype 12, $a7 note G#, 2 note A_, 2 note B_, 2 - notetype 12, 181 + notetype 12, $b5 note G#, 6 note E_, 2 note F#, 2 note E_, 2 note D#, 2 note E_, 2 - notetype 12, 167 + notetype 12, $a7 note F#, 8 note D#, 8 - notetype 12, 181 + notetype 12, $b5 note D#, 4 octave 2 note B_, 4 @@ -56,7 +56,7 @@ Music_RBYGameCorner_branch_7e222: note D#, 4 note B_, 2 note A_, 8 - notetype 12, 183 + notetype 12, $b7 octave 4 note E_, 2 note D#, 2 @@ -69,15 +69,15 @@ Music_RBYGameCorner_branch_7e222: note F#, 2 note G_, 2 note G#, 2 - notetype 12, 151 + notetype 12, $97 note G#, 1 note G_, 1 note G#, 1 note G_, 1 note G#, 2 - notetype 12, 183 + notetype 12, $b7 note F#, 8 - notetype 12, 181 + notetype 12, $b5 note C#, 4 octave 2 note G#, 4 @@ -88,7 +88,7 @@ Music_RBYGameCorner_branch_7e222: octave 3 note A_, 2 note G#, 8 - notetype 12, 183 + notetype 12, $b7 note G#, 2 note A_, 2 note B_, 2 @@ -99,10 +99,10 @@ Music_RBYGameCorner_branch_7e222: note D#, 2 note E_, 2 note F#, 8 - notetype 12, 151 + notetype 12, $97 note D#, 4 note C#, 4 - notetype 12, 181 + notetype 12, $b5 note D#, 4 octave 2 note B_, 4 @@ -111,7 +111,7 @@ Music_RBYGameCorner_branch_7e222: note D#, 4 note B_, 2 note A_, 8 - notetype 12, 183 + notetype 12, $b7 note F#, 2 note G#, 2 note A_, 2 @@ -121,7 +121,7 @@ Music_RBYGameCorner_branch_7e222: note A_, 2 note G#, 2 note F#, 2 - notetype 12, 194 + notetype 12, $c2 note E_, 4 octave 2 note B_, 4 @@ -129,7 +129,7 @@ Music_RBYGameCorner_branch_7e222: note E_, 2 note E_, 4 note E_, 4 - notetype 12, 183 + notetype 12, $b7 octave 2 note B_, 2 octave 3 @@ -142,21 +142,21 @@ Music_RBYGameCorner_branch_7e222: note C#, 2 note D#, 2 note E_, 8 - notetype 12, 181 + notetype 12, $b5 octave 4 note D#, 4 octave 3 note B_, 4 note F#, 4 note D#, 4 - notetype 12, 183 + notetype 12, $b7 note E_, 3 note D#, 1 - notetype 12, 178 + notetype 12, $b2 note C#, 2 note D#, 2 note E_, 10 - notetype 12, 183 + notetype 12, $b7 octave 2 note B_, 2 octave 3 @@ -169,14 +169,14 @@ Music_RBYGameCorner_branch_7e222: note C#, 2 note D#, 2 note E_, 8 - notetype 12, 181 + notetype 12, $b5 octave 4 note D#, 4 octave 3 note B_, 4 note F#, 4 note A_, 4 - notetype 12, 183 + notetype 12, $b7 note G#, 2 note G#, 1 note G_, 1 @@ -188,13 +188,13 @@ Music_RBYGameCorner_branch_7e222: loopchannel 0, Music_RBYGameCorner_branch_7e222 -Music_RBYGameCorner_Ch2: ; 7e2df (1f:62df) +Music_RBYGameCorner_Ch1:: dutycycle 2 - vibrato 10, 35 - notetype 12, 198 + vibrato 10, $23 + notetype 12, $c6 octave 4 note C#, 6 - notetype 12, 193 + notetype 12, $c1 octave 3 note B_, 2 note A_, 2 @@ -211,9 +211,9 @@ Music_RBYGameCorner_Ch2: ; 7e2df (1f:62df) note A#, 1 note B_, 8 -Music_RBYGameCorner_branch_7e2fa: +Music_RBYGameCorner_branch_7e2fa:: dutycycle 2 - notetype 12, 199 + notetype 12, $c7 octave 3 note E_, 4 octave 2 @@ -281,9 +281,9 @@ Music_RBYGameCorner_branch_7e2fa: note E_, 2 note F#, 2 note G#, 2 - notetype 12, 193 + notetype 12, $c1 note E_, 2 - notetype 12, 161 + notetype 12, $a1 note E_, 1 note D#, 1 note E_, 1 @@ -291,7 +291,7 @@ Music_RBYGameCorner_branch_7e2fa: note E_, 1 note D#, 1 note E_, 2 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 2 octave 4 @@ -309,7 +309,7 @@ Music_RBYGameCorner_branch_7e2fa: octave 4 note C#, 2 note D#, 2 - notetype 12, 197 + notetype 12, $c5 note F#, 4 note D#, 4 octave 3 @@ -318,11 +318,11 @@ Music_RBYGameCorner_branch_7e2fa: note A_, 4 note G#, 3 note A_, 1 - notetype 12, 194 + notetype 12, $c2 note G#, 2 note F#, 2 note E_, 2 - notetype 12, 199 + notetype 12, $c7 octave 3 note B_, 2 octave 4 @@ -348,8 +348,8 @@ Music_RBYGameCorner_branch_7e2fa: loopchannel 0, Music_RBYGameCorner_branch_7e2fa -Music_RBYGameCorner_Ch3: ; 7e38b (1f:638b) - notetype 12, 19 +Music_RBYGameCorner_Ch2:: + notetype 12, $13 octave 5 note C#, 1 note __, 5 @@ -375,7 +375,7 @@ Music_RBYGameCorner_Ch3: ; 7e38b (1f:638b) note D#, 1 note __, 1 -Music_RBYGameCorner_branch_7e3a5: +Music_RBYGameCorner_branch_7e3a5:: callchannel Music_RBYGameCorner_branch_7e418 callchannel Music_RBYGameCorner_branch_7e42d callchannel Music_RBYGameCorner_branch_7e442 @@ -447,7 +447,7 @@ Music_RBYGameCorner_branch_7e3a5: callchannel Music_RBYGameCorner_branch_7e42d loopchannel 0, Music_RBYGameCorner_branch_7e3a5 -Music_RBYGameCorner_branch_7e418: +Music_RBYGameCorner_branch_7e418:: note E_, 1 note __, 1 note G#, 1 @@ -470,7 +470,7 @@ Music_RBYGameCorner_branch_7e418: note __, 1 endchannel -Music_RBYGameCorner_branch_7e42d: +Music_RBYGameCorner_branch_7e42d:: note E_, 1 note __, 1 note G#, 1 @@ -493,7 +493,7 @@ Music_RBYGameCorner_branch_7e42d: note __, 1 endchannel -Music_RBYGameCorner_branch_7e442: +Music_RBYGameCorner_branch_7e442:: note E_, 1 note __, 1 note B_, 1 @@ -516,7 +516,7 @@ Music_RBYGameCorner_branch_7e442: note __, 1 endchannel -Music_RBYGameCorner_branch_7e457: +Music_RBYGameCorner_branch_7e457:: note D#, 1 note __, 1 note A_, 1 @@ -539,7 +539,7 @@ Music_RBYGameCorner_branch_7e457: note __, 1 endchannel -Music_RBYGameCorner_branch_7e46c: +Music_RBYGameCorner_branch_7e46c:: note D#, 1 note __, 1 note F#, 1 @@ -562,7 +562,7 @@ Music_RBYGameCorner_branch_7e46c: note __, 1 endchannel -Music_RBYGameCorner_branch_7e481: +Music_RBYGameCorner_branch_7e481:: note D#, 1 note __, 1 note F#, 1 @@ -585,7 +585,7 @@ Music_RBYGameCorner_branch_7e481: note __, 1 endchannel -Music_RBYGameCorner_branch_7e496: +Music_RBYGameCorner_branch_7e496:: note F#, 1 note __, 1 note B_, 1 @@ -608,7 +608,7 @@ Music_RBYGameCorner_branch_7e496: note __, 1 endchannel -Music_RBYGameCorner_branch_7e4ab: +Music_RBYGameCorner_branch_7e4ab:: note F#, 1 note __, 1 note A_, 1 @@ -630,4 +630,3 @@ Music_RBYGameCorner_branch_7e4ab: note A_, 1 note __, 1 endchannel -; 0x7e4c0 \ No newline at end of file diff --git a/crysaudio/music/RBY/gym.asm b/crysaudio/music/RBY/gym.asm index 6281b143..51ffc721 100644 --- a/crysaudio/music/RBY/gym.asm +++ b/crysaudio/music/RBY/gym.asm @@ -1,15 +1,15 @@ -Music_RBYGym: - dbw $80, Music_RBYGym_Ch1 - dbw $01, Music_RBYGym_Ch2 - dbw $02, Music_RBYGym_Ch3 +Music_RBYGym:: + musicheader 3, 1, Music_RBYGym_Ch0 + musicheader 1, 2, Music_RBYGym_Ch1 + musicheader 1, 3, Music_RBYGym_Ch2 -Music_RBYGym_Ch1: ; bcbb (2:7cbb) +Music_RBYGym_Ch0:: tempo 138 - volume 119 + volume $77 dutycycle 3 - vibrato 8, 34 - - notetype 12, 181 + vibrato 8, $22 + ;toggleperfectpitch + notetype 12, $b5 octave 3 note G_, 6 note C_, 1 @@ -27,7 +27,7 @@ Music_RBYGym_Ch1: ; bcbb (2:7cbb) note F_, 4 note G_, 4 -Music_RBYGym_branch_bcd8: +Music_RBYGym_branch_bcd8:: note E_, 4 note F_, 2 note G_, 2 @@ -35,9 +35,9 @@ Music_RBYGym_branch_bcd8: note E_, 2 note D_, 2 note C_, 2 - notetype 12, 177 + notetype 12, $b1 note D_, 3 - notetype 12, 181 + notetype 12, $b5 note E_, 1 note F_, 4 note E_, 2 @@ -70,9 +70,9 @@ Music_RBYGym_branch_bcd8: note A_, 2 note G_, 2 note F_, 2 - notetype 12, 177 + notetype 12, $b1 note A#, 3 - notetype 12, 181 + notetype 12, $b5 note F_, 1 note F_, 4 note E_, 2 @@ -170,10 +170,10 @@ Music_RBYGym_branch_bcd8: loopchannel 0, Music_RBYGym_branch_bcd8 -Music_RBYGym_Ch2: ; bd6b (2:7d6b) +Music_RBYGym_Ch1:: dutycycle 3 - vibrato 10, 37 - notetype 12, 199 + vibrato 10, $25 + notetype 12, $c7 octave 4 note C_, 6 octave 3 @@ -184,23 +184,23 @@ Music_RBYGym_Ch2: ; bd6b (2:7d6b) note A#, 6 note F_, 1 note A#, 1 - notetype 12, 160 + notetype 12, $a0 note A_, 12 - notetype 12, 199 + notetype 12, $c7 note B_, 4 -Music_RBYGym_branch_bd82: +Music_RBYGym_branch_bd82:: octave 4 note C_, 12 octave 3 note G_, 2 octave 4 note C_, 2 - notetype 12, 194 + notetype 12, $c2 note D_, 3 octave 3 note A#, 1 - notetype 12, 199 + notetype 12, $c7 note A#, 12 octave 4 note C_, 12 @@ -208,10 +208,10 @@ Music_RBYGym_branch_bd82: note G_, 2 octave 4 note C_, 2 - notetype 12, 196 + notetype 12, $c4 octave 3 note A#, 2 - notetype 12, 199 + notetype 12, $c7 note A#, 1 octave 4 note C_, 1 @@ -219,15 +219,15 @@ Music_RBYGym_branch_bd82: note E_, 12 note D_, 2 note E_, 2 - notetype 12, 194 + notetype 12, $c2 note F_, 3 note D_, 1 - notetype 12, 199 + notetype 12, $c7 note D_, 4 - notetype 12, 194 + notetype 12, $c2 note A#, 3 note F_, 1 - notetype 12, 199 + notetype 12, $c7 note F_, 4 note E_, 12 note D_, 2 @@ -246,9 +246,9 @@ Music_RBYGym_branch_bd82: note A_, 4 note G_, 4 note F_, 4 - notetype 12, 195 + notetype 12, $c3 note E_, 2 - notetype 12, 199 + notetype 12, $c7 note E_, 1 note F_, 1 note G_, 6 @@ -271,30 +271,30 @@ Music_RBYGym_branch_bd82: note A_, 4 note G_, 4 note F_, 4 - notetype 12, 195 + notetype 12, $c3 note E_, 2 - notetype 12, 199 + notetype 12, $c7 note E_, 1 note F_, 1 note G_, 4 - notetype 12, 195 + notetype 12, $c3 note G_, 2 - notetype 12, 199 + notetype 12, $c7 note G_, 1 note A_, 1 note A#, 4 - notetype 12, 196 + notetype 12, $c4 octave 4 note C_, 2 - notetype 12, 199 + notetype 12, $c7 note C_, 1 note D_, 1 note E_, 12 loopchannel 0, Music_RBYGym_branch_bd82 -Music_RBYGym_Ch3: ; bdfa (2:7dfa) - notetype 12, 17 +Music_RBYGym_Ch2:: + notetype 12, $11 note __, 16 note __, 10 octave 4 @@ -302,7 +302,7 @@ Music_RBYGym_Ch3: ; bdfa (2:7dfa) note F_, 2 note D_, 2 -Music_RBYGym_branch_be02: +Music_RBYGym_branch_be02:: callchannel Music_RBYGym_branch_be3b callchannel Music_RBYGym_branch_be44 callchannel Music_RBYGym_branch_be3b @@ -328,7 +328,7 @@ Music_RBYGym_branch_be02: note F_, 2 loopchannel 0, Music_RBYGym_branch_be02 -Music_RBYGym_branch_be3b: +Music_RBYGym_branch_be3b:: note E_, 2 note G_, 2 note E_, 2 @@ -339,7 +339,7 @@ Music_RBYGym_branch_be3b: note G_, 2 endchannel -Music_RBYGym_branch_be44: +Music_RBYGym_branch_be44:: note D_, 2 note F_, 2 note D_, 2 @@ -350,7 +350,7 @@ Music_RBYGym_branch_be44: note F_, 2 endchannel -Music_RBYGym_branch_be4d: +Music_RBYGym_branch_be4d:: note F_, 2 note A#, 2 note F_, 2 @@ -360,4 +360,3 @@ Music_RBYGym_branch_be4d: note F_, 2 note A#, 2 endchannel -; 0xbe56 \ No newline at end of file diff --git a/crysaudio/music/RBY/gymleaderbattle.asm b/crysaudio/music/RBY/gymleaderbattle.asm index d39b54e2..2cd305ef 100644 --- a/crysaudio/music/RBY/gymleaderbattle.asm +++ b/crysaudio/music/RBY/gymleaderbattle.asm @@ -1,14 +1,15 @@ -Music_GymLeaderBattle: - dbw $80, Music_GymLeaderBattle_Ch1 - dbw $01, Music_GymLeaderBattle_Ch2 - dbw $02, Music_GymLeaderBattle_Ch3 +Music_GymLeaderBattle:: + musicheader 3, 1, Music_GymLeaderBattle_Ch0 + musicheader 1, 2, Music_GymLeaderBattle_Ch1 + musicheader 1, 3, Music_GymLeaderBattle_Ch2 -Music_GymLeaderBattle_Ch1: +Music_GymLeaderBattle_Ch0:: tempo 104 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $34 - notetype $c, $b3 + vibrato 8, $34 + ;toggleperfectpitch + notetype 12, $b3 note __, 6 octave 3 note F#, 1 @@ -60,7 +61,8 @@ Music_GymLeaderBattle_Ch1: note F#, 1 note __, 9 note A_, 6 -Music_GymLeaderBattle_branch_223b0: + +Music_GymLeaderBattle_branch_223b0:: note F#, 1 octave 3 note C#, 1 @@ -463,19 +465,19 @@ Music_GymLeaderBattle_branch_223b0: note __, 1 note A_, 1 note __, 1 - intensity $b5 + notetype 12, $b5 octave 3 note C#, 12 - intensity $b3 + notetype 12, $b3 octave 1 note A_, 1 note __, 1 note A_, 1 note __, 1 - intensity $b5 + notetype 12, $b5 octave 3 note A_, 12 - intensity $b3 + notetype 12, $b3 note D#, 4 note C#, 4 note D#, 4 @@ -495,10 +497,10 @@ Music_GymLeaderBattle_branch_223b0: note __, 1 note A_, 1 note __, 1 - intensity $b5 + notetype 12, $b5 octave 3 note A_, 12 - intensity $b3 + notetype 12, $b3 note C#, 1 octave 2 note B_, 1 @@ -517,7 +519,7 @@ Music_GymLeaderBattle_branch_223b0: note E_, 1 note D#, 1 note C#, 1 - intensity $b5 + notetype 12, $b5 note D#, 4 note E_, 4 note C#, 2 @@ -548,10 +550,12 @@ Music_GymLeaderBattle_branch_223b0: note G#, 4 note E_, 6 loopchannel 0, Music_GymLeaderBattle_branch_223b0 -Music_GymLeaderBattle_Ch2: + + +Music_GymLeaderBattle_Ch1:: dutycycle 3 - vibrato $8, $25 - notetype $c, $c3 + vibrato 8, $25 + notetype 12, $c3 octave 4 note F_, 1 note E_, 1 @@ -608,8 +612,9 @@ Music_GymLeaderBattle_Ch2: note __, 9 octave 4 note C#, 6 -Music_GymLeaderBattle_branch_225e0: - intensity $c5 + +Music_GymLeaderBattle_branch_225e0:: + notetype 12, $c5 note D#, 4 note C#, 4 note D#, 4 @@ -623,7 +628,7 @@ Music_GymLeaderBattle_branch_225e0: octave 4 note C#, 2 note D#, 2 - intensity $b7 + notetype 12, $b7 dutycycle 2 octave 3 note A_, 8 @@ -631,7 +636,7 @@ Music_GymLeaderBattle_branch_225e0: note C#, 8 note E_, 8 note C#, 8 - intensity $c5 + notetype 12, $c5 dutycycle 3 note D#, 4 note C#, 4 @@ -646,18 +651,18 @@ Music_GymLeaderBattle_branch_225e0: octave 4 note C#, 2 note D#, 2 - intensity $b7 + notetype 12, $b7 dutycycle 2 note C#, 8 octave 3 note B_, 8 note A_, 8 - intensity $c3 + notetype 12, $c3 octave 4 note E_, 4 note E_, 2 note C#, 2 - intensity $c5 + notetype 12, $c5 dutycycle 3 octave 1 note B_, 1 @@ -723,7 +728,7 @@ Music_GymLeaderBattle_branch_225e0: note __, 1 note B_, 1 note __, 1 - intensity $b0 + notetype 12, $b0 octave 3 note B_, 4 octave 4 @@ -736,11 +741,11 @@ Music_GymLeaderBattle_branch_225e0: octave 3 note A_, 4 note G_, 4 - intensity $b0 + notetype 12, $b0 note F#, 8 - intensity $b7 + notetype 12, $b7 note F#, 8 - intensity $c3 + notetype 12, $c3 note C_, 1 note C#, 1 note D_, 1 @@ -762,7 +767,7 @@ Music_GymLeaderBattle_branch_225e0: note G_, 1 note A_, 1 note B_, 1 - intensity $b0 + notetype 12, $b0 octave 3 note B_, 4 octave 4 @@ -776,51 +781,51 @@ Music_GymLeaderBattle_branch_225e0: note A_, 4 octave 4 note C_, 4 - intensity $b0 + notetype 12, $b0 octave 3 note B_, 16 - intensity $3f + notetype 12, $3f octave 4 note F#, 16 - intensity $c3 + notetype 12, $c3 dutycycle 3 octave 1 note A_, 1 note __, 1 note A_, 1 note __, 1 - intensity $c7 + notetype 12, $c7 octave 3 note A_, 12 - intensity $c3 + notetype 12, $c3 octave 1 note A_, 1 note __, 1 note A_, 1 note __, 1 - intensity $c7 + notetype 12, $c7 octave 4 note C#, 12 - intensity $b0 + notetype 12, $b0 note D#, 16 - intensity $b7 + notetype 12, $b7 note D#, 16 - intensity $c3 + notetype 12, $c3 octave 1 note A_, 1 note __, 1 note A_, 1 note __, 1 - intensity $c7 + notetype 12, $c7 octave 4 note C#, 12 - intensity $c0 + notetype 12, $c0 note A_, 8 note E_, 8 note B_, 16 - intensity $c7 + notetype 12, $c7 note B_, 16 - intensity $c4 + notetype 12, $c4 octave 3 note D#, 4 note E_, 4 @@ -835,20 +840,22 @@ Music_GymLeaderBattle_branch_225e0: note D#, 1 note F#, 1 note A#, 1 - intensity $c0 + notetype 12, $c0 note B_, 16 note F#, 16 note A_, 16 octave 5 note C#, 8 note __, 2 - intensity $c3 + notetype 12, $c3 octave 4 note A_, 6 loopchannel 0, Music_GymLeaderBattle_branch_225e0 -Music_GymLeaderBattle_Ch3: - vibrato $0, $20 - notetype $c, $13 + + +Music_GymLeaderBattle_Ch2:: + vibrato 0, $20 + notetype 12, $13 note __, 12 octave 3 note B_, 1 @@ -1036,8 +1043,9 @@ Music_GymLeaderBattle_Ch3: note __, 1 octave 4 note C#, 6 - intensity $14 -Music_GymLeaderBattle_branch_227b1: + notetype 12, $14 + +Music_GymLeaderBattle_branch_227b1:: octave 3 note B_, 2 octave 4 diff --git a/crysaudio/music/RBY/halloffame.asm b/crysaudio/music/RBY/halloffame.asm index 95a879cd..cce7c36c 100644 --- a/crysaudio/music/RBY/halloffame.asm +++ b/crysaudio/music/RBY/halloffame.asm @@ -1,15 +1,15 @@ -Music_RBYHallOfFame: - dbw $80, Music_RBYHallOfFame_Ch1 - dbw $01, Music_RBYHallOfFame_Ch2 - dbw $02, Music_RBYHallOfFame_Ch3 +Music_RBYHallOfFame:: + musicheader 3, 1, Music_RBYHallOfFame_Ch0 + musicheader 1, 2, Music_RBYHallOfFame_Ch1 + musicheader 1, 3, Music_RBYHallOfFame_Ch2 -Music_RBYHallOfFame_Ch1: ; 7fbaf (1f:7baf) +Music_RBYHallOfFame_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 34 - - notetype 12, 179 + vibrato 12, $22 + ;toggleperfectpitch + notetype 12, $b3 note __, 16 note __, 16 note __, 16 @@ -20,13 +20,13 @@ Music_RBYHallOfFame_Ch1: ; 7fbaf (1f:7baf) note F_, 1 note F#, 1 -Music_RBYHallOfFame_branch_7fbc5: - notetype 12, 128 +Music_RBYHallOfFame_branch_7fbc5:: + notetype 12, $80 octave 4 note C_, 16 note E_, 16 note F#, 16 - notetype 12, 96 + notetype 12, $60 note F_, 16 loopchannel 3, Music_RBYHallOfFame_branch_7fbc5 note __, 16 @@ -36,12 +36,12 @@ Music_RBYHallOfFame_branch_7fbc5: loopchannel 0, Music_RBYHallOfFame_branch_7fbc5 -Music_RBYHallOfFame_Ch2: ; 7fbda (1f:7bda) - vibrato 8, 37 +Music_RBYHallOfFame_Ch1:: + vibrato 8, $25 dutycycle 3 -Music_RBYHallOfFame_branch_7fbdf: - notetype 12, 196 +Music_RBYHallOfFame_branch_7fbdf:: + notetype 12, $c4 octave 3 note G_, 2 note D_, 2 @@ -68,10 +68,10 @@ Music_RBYHallOfFame_branch_7fbdf: loopchannel 0, Music_RBYHallOfFame_branch_7fbdf -Music_RBYHallOfFame_Ch3: ; 7fbfc (1f:7bfc) - notetype 12, 18 +Music_RBYHallOfFame_Ch2:: + notetype 12, $12 -Music_RBYHallOfFame_branch_7fbfe: +Music_RBYHallOfFame_branch_7fbfe:: octave 4 note D_, 2 note G_, 2 @@ -98,5 +98,4 @@ Music_RBYHallOfFame_branch_7fbfe: note G_, 4 note E_, 4 note G_, 4 - loopchannel 0, Music_RBYHallOfFame_Ch3 -; 0x7fc1f \ No newline at end of file + loopchannel 0, Music_RBYHallOfFame_Ch2 diff --git a/crysaudio/music/RBY/indigoplateau.asm b/crysaudio/music/RBY/indigoplateau.asm index b535054b..976bf0b4 100644 --- a/crysaudio/music/RBY/indigoplateau.asm +++ b/crysaudio/music/RBY/indigoplateau.asm @@ -1,46 +1,46 @@ -Music_RBYIndigoPlateau: - dbw $C0, Music_RBYIndigoPlateau_Ch1 - dbw $01, Music_RBYIndigoPlateau_Ch2 - dbw $02, Music_RBYIndigoPlateau_Ch3 - dbw $03, Music_RBYIndigoPlateau_Ch4 +Music_RBYIndigoPlateau:: + musicheader 4, 1, Music_RBYIndigoPlateau_Ch0 + musicheader 1, 2, Music_RBYIndigoPlateau_Ch1 + musicheader 1, 3, Music_RBYIndigoPlateau_Ch2 + musicheader 1, 4, Music_RBYIndigoPlateau_Ch3 -Music_RBYIndigoPlateau_Ch1: ; a5f0 (2:65f0) +Music_RBYIndigoPlateau_Ch0:: tempo 132 - volume 119 + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 178 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b2 octave 2 note A_, 8 note A_, 8 note A_, 8 note A_, 4 - notetype 12, 164 + notetype 12, $a4 note A#, 4 -Music_RBYIndigoPlateau_branch_a605: +Music_RBYIndigoPlateau_branch_a605:: callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 180 + notetype 12, $b4 octave 3 note D#, 4 callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 160 + notetype 12, $a0 octave 2 note A#, 4 callchannel Music_RBYIndigoPlateau_branch_a659 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 212 + notetype 12, $d4 octave 3 note A_, 4 note A_, 4 @@ -49,10 +49,10 @@ Music_RBYIndigoPlateau_branch_a605: note A_, 4 note A_, 4 note A_, 4 - notetype 12, 180 + notetype 12, $b4 octave 3 note D#, 4 - notetype 12, 212 + notetype 12, $d4 octave 3 note A#, 4 note A#, 4 @@ -61,26 +61,26 @@ Music_RBYIndigoPlateau_branch_a605: note A#, 4 note A#, 4 note A#, 4 - notetype 12, 180 + notetype 12, $b4 octave 3 note F_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note G_, 2 - notetype 12, 176 + notetype 12, $b0 note A_, 8 octave 2 note A_, 8 - notetype 12, 183 + notetype 12, $b7 octave 3 note F_, 8 - notetype 12, 78 + notetype 12, $4e octave 2 note A#, 8 loopchannel 0, Music_RBYIndigoPlateau_branch_a605 -Music_RBYIndigoPlateau_branch_a659: - notetype 12, 178 +Music_RBYIndigoPlateau_branch_a659:: + notetype 12, $b2 octave 2 note A_, 4 note A_, 4 @@ -92,42 +92,42 @@ Music_RBYIndigoPlateau_branch_a659: endchannel -Music_RBYIndigoPlateau_Ch2: ; a664 (2:6664) +Music_RBYIndigoPlateau_Ch1:: dutycycle 3 - vibrato 8, 37 - notetype 12, 194 + vibrato 8, $25 + notetype 12, $c2 octave 3 note D_, 8 note D_, 8 note D_, 8 note D_, 4 - notetype 12, 90 + notetype 12, $5a note D#, 4 -Music_RBYIndigoPlateau_branch_a673: +Music_RBYIndigoPlateau_branch_a673:: callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A_, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A#, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A_, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 199 + notetype 12, $c7 note C#, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A_, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 note A#, 4 callchannel Music_RBYIndigoPlateau_branch_a6af - notetype 12, 197 + notetype 12, $c5 octave 4 note C_, 2 - notetype 12, 199 + notetype 12, $c7 octave 4 note C#, 2 note D_, 8 @@ -135,13 +135,13 @@ Music_RBYIndigoPlateau_branch_a673: note D_, 8 octave 4 note C_, 8 - notetype 12, 77 + notetype 12, $4d octave 4 note D#, 8 loopchannel 0, Music_RBYIndigoPlateau_branch_a673 -Music_RBYIndigoPlateau_branch_a6af: - notetype 12, 194 +Music_RBYIndigoPlateau_branch_a6af:: + notetype 12, $c2 octave 3 note D_, 4 note D_, 4 @@ -153,8 +153,8 @@ Music_RBYIndigoPlateau_branch_a6af: endchannel -Music_RBYIndigoPlateau_Ch3: ; a6ba (2:66ba) - notetype 12, 16 +Music_RBYIndigoPlateau_Ch2:: + notetype 12, $10 octave 4 note D_, 2 note __, 6 @@ -166,7 +166,7 @@ Music_RBYIndigoPlateau_Ch3: ; a6ba (2:66ba) note __, 2 note D#, 4 -Music_RBYIndigoPlateau_branch_a6c6: +Music_RBYIndigoPlateau_branch_a6c6:: callchannel Music_RBYIndigoPlateau_branch_a6fe callchannel Music_RBYIndigoPlateau_branch_a6fe callchannel Music_RBYIndigoPlateau_branch_a6fe @@ -211,7 +211,7 @@ Music_RBYIndigoPlateau_branch_a6c6: note D#, 8 loopchannel 0, Music_RBYIndigoPlateau_branch_a6c6 -Music_RBYIndigoPlateau_branch_a6fe: +Music_RBYIndigoPlateau_branch_a6fe:: octave 4 note D_, 2 note __, 2 @@ -231,9 +231,9 @@ Music_RBYIndigoPlateau_branch_a6fe: endchannel -Music_RBYIndigoPlateau_Ch4: ; a70f (2:670f) - notetype 6 +Music_RBYIndigoPlateau_Ch3:: togglenoise 1 + notetype 6 note A_, 16 note A_, 16 note A_, 16 @@ -247,7 +247,7 @@ Music_RBYIndigoPlateau_Ch4: ; a70f (2:670f) note A#, 1 note A#, 1 -Music_RBYIndigoPlateau_branch_a728: +Music_RBYIndigoPlateau_branch_a728:: callchannel Music_RBYIndigoPlateau_branch_a791 callchannel Music_RBYIndigoPlateau_branch_a77e callchannel Music_RBYIndigoPlateau_branch_a791 @@ -284,7 +284,7 @@ Music_RBYIndigoPlateau_branch_a728: note A_, 1 loopchannel 0, Music_RBYIndigoPlateau_branch_a728 -Music_RBYIndigoPlateau_branch_a77e: +Music_RBYIndigoPlateau_branch_a77e:: note A_, 4 note A#, 4 note B_, 4 @@ -296,7 +296,7 @@ Music_RBYIndigoPlateau_branch_a77e: note A#, 2 endchannel -Music_RBYIndigoPlateau_branch_a791: +Music_RBYIndigoPlateau_branch_a791:: note A_, 4 note A#, 4 note B_, 4 @@ -310,7 +310,7 @@ Music_RBYIndigoPlateau_branch_a791: note A#, 1 endchannel -Music_RBYIndigoPlateau_branch_a7a8: +Music_RBYIndigoPlateau_branch_a7a8:: note A_, 4 note A#, 4 note A_, 4 @@ -326,4 +326,3 @@ Music_RBYIndigoPlateau_branch_a7a8: note A#, 1 note A#, 1 endchannel -; 0xa7c5 \ No newline at end of file diff --git a/crysaudio/music/RBY/introbattle.asm b/crysaudio/music/RBY/introbattle.asm index 41c27325..68b0a3b2 100644 --- a/crysaudio/music/RBY/introbattle.asm +++ b/crysaudio/music/RBY/introbattle.asm @@ -1,136 +1,136 @@ -Music_IntroBattle: - dbw $C0, Music_IntroBattle_Ch1 - dbw $01, Music_IntroBattle_Ch2 - dbw $02, Music_IntroBattle_Ch3 - dbw $03, Music_IntroBattle_Ch4 +Music_IntroBattle:: + musicheader 4, 1, Music_IntroBattle_Ch0 + musicheader 1, 2, Music_IntroBattle_Ch1 + musicheader 1, 3, Music_IntroBattle_Ch2 + musicheader 1, 4, Music_IntroBattle_Ch3 -Music_IntroBattle_Ch1: ; 7f844 (1f:7844) +Music_IntroBattle_Ch0:: tempo 98 - volume 119 + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 177 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b1 note __, 8 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D#, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 160 + notetype 12, $a0 note A#, 4 - notetype 12, 177 + notetype 12, $b1 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 41 + notetype 12, $29 octave 3 note G_, 4 - notetype 12, 176 + notetype 12, $b0 note A_, 8 octave 2 note A_, 8 - notetype 12, 183 + notetype 12, $b7 octave 3 note F_, 8 - notetype 12, 79 + notetype 12, $4f octave 2 note F_, 8 - notetype 12, 177 + notetype 12, $b1 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note D#, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note F_, 4 - notetype 12, 177 + notetype 12, $b1 octave 2 note A_, 2 note A_, 2 - notetype 12, 180 + notetype 12, $b4 octave 3 note G_, 4 - notetype 12, 176 + notetype 12, $b0 note F#, 16 - notetype 12, 177 + notetype 12, $b1 octave 4 note D_, 16 endchannel -Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc) +Music_IntroBattle_Ch1:: dutycycle 3 - vibrato 8, 37 - notetype 12, 194 + vibrato 8, $25 + notetype 12, $c2 note __, 8 octave 3 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A_, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A#, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A_, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 183 + notetype 12, $b7 note C#, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A_, 4 - notetype 12, 194 + notetype 12, $c2 octave 3 note D_, 2 note D_, 2 - notetype 12, 199 + notetype 12, $c7 octave 4 note C#, 4 note D_, 8 @@ -140,39 +140,39 @@ Music_IntroBattle_Ch2: ; 7f8bc (1f:78bc) note C_, 8 octave 3 note C_, 8 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A_, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 note A#, 4 - notetype 12, 194 + notetype 12, $c2 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 octave 4 note C_, 4 - notetype 12, 194 + notetype 12, $c2 octave 3 note D_, 2 note D_, 2 - notetype 12, 197 + notetype 12, $c5 octave 4 note C#, 4 - notetype 12, 47 + notetype 12, $2f note D_, 16 - notetype 12, 193 + notetype 12, $c1 octave 5 note D_, 16 endchannel -Music_IntroBattle_Ch3: ; 7f91d (1f:791d) - notetype 12, 16 +Music_IntroBattle_Ch2:: + notetype 12, $10 note __, 8 octave 4 note D_, 1 @@ -235,9 +235,9 @@ Music_IntroBattle_Ch3: ; 7f91d (1f:791d) endchannel -Music_IntroBattle_Ch4: ; 7f95b (1f:795b) - notetype 6 +Music_IntroBattle_Ch3:: togglenoise 1 + notetype 6 note B_, 1 note B_, 1 note B_, 1 @@ -334,4 +334,3 @@ Music_IntroBattle_Ch4: ; 7f95b (1f:795b) note __, 16 note __, 14 endchannel -; 0x7fa19 \ No newline at end of file diff --git a/crysaudio/music/RBY/jigglypuffsong.asm b/crysaudio/music/RBY/jigglypuffsong.asm index ae70c87e..541b81ee 100644 --- a/crysaudio/music/RBY/jigglypuffsong.asm +++ b/crysaudio/music/RBY/jigglypuffsong.asm @@ -1,18 +1,18 @@ -Music_JigglypuffSong: - dbw $40, Music_JigglypuffSong_Ch1 - dbw $01, Music_JigglypuffSong_Ch2 +Music_JigglypuffSong:: + musicheader 2, 1, Music_JigglypuffSong_Ch0 + musicheader 1, 2, Music_JigglypuffSong_Ch1 -Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) +Music_JigglypuffSong_Ch0:: tempo 144 - volume 119 - vibrato 8, 36 + volume $77 + vibrato 8, $24 dutycycle 2 - sound_duty 165 - - notetype 13, 103 + sound_duty 1, 1, 2, 2 + ;toggleperfectpitch + notetype 13, $67 octave 4 note E_, 8 - notetype 12, 103 + notetype 12, $67 note B_, 2 note G#, 6 note F#, 8 @@ -25,11 +25,11 @@ Music_JigglypuffSong_Ch1: ; 7fb7d (1f:7b7d) endchannel -Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a) - vibrato 5, 21 +Music_JigglypuffSong_Ch1:: + vibrato 5, $15 dutycycle 2 - sound_duty 10 - notetype 12, 167 + sound_duty 2, 2, 0, 0 + notetype 12, $a7 octave 4 note E_, 8 note B_, 2 @@ -42,4 +42,3 @@ Music_JigglypuffSong_Ch2: ; 7fb9a (1f:7b9a) note G#, 4 note E_, 10 endchannel -; 0x7fbaf \ No newline at end of file diff --git a/crysaudio/music/RBY/lavender.asm b/crysaudio/music/RBY/lavender.asm index e747188c..60d01507 100644 --- a/crysaudio/music/RBY/lavender.asm +++ b/crysaudio/music/RBY/lavender.asm @@ -1,23 +1,23 @@ -Music_Lavender: - dbw $C0, Music_Lavender_Ch1 - dbw $01, Music_Lavender_Ch2 - dbw $02, Music_Lavender_Ch3 - dbw $03, Music_Lavender_Ch4 +Music_Lavender:: + musicheader 4, 1, Music_Lavender_Ch0 + musicheader 1, 2, Music_Lavender_Ch1 + musicheader 1, 3, Music_Lavender_Ch2 + musicheader 1, 4, Music_Lavender_Ch3 -Music_Lavender_Ch1: ; bb58 (2:7b58) +Music_Lavender_Ch0:: tempo 152 - volume 119 + volume $77 dutycycle 1 - - vibrato 0, 136 - notetype 12, 135 + ;toggleperfectpitch + vibrato 0, $88 + notetype 12, $87 note __, 16 note __, 16 note __, 16 note __, 16 - notetype 12, 167 + notetype 12, $a7 -Music_Lavender_branch_bb6b: +Music_Lavender_branch_bb6b:: octave 3 note G_, 8 note G_, 8 @@ -68,12 +68,12 @@ Music_Lavender_branch_bb6b: loopchannel 0, Music_Lavender_branch_bb6b -Music_Lavender_Ch2: ; bb9e (2:7b9e) - vibrato 0, 52 +Music_Lavender_Ch1:: + vibrato 0, $34 dutycycle 3 - notetype 12, 145 + notetype 12, $91 -Music_Lavender_branch_bba5: +Music_Lavender_branch_bba5:: octave 5 note C_, 4 note G_, 4 @@ -82,8 +82,8 @@ Music_Lavender_branch_bba5: loopchannel 0, Music_Lavender_branch_bba5 -Music_Lavender_Ch3: ; bbae (2:7bae) - vibrato 4, 17 +Music_Lavender_Ch2:: + vibrato 4, $11 notetype 12, $3f note __, 16 note __, 16 @@ -91,7 +91,8 @@ Music_Lavender_Ch3: ; bbae (2:7bae) note __, 16 notetype 12, $2f load_wave 2, 1, 14, 2, 3, 3, 2, 8, 14, 1, 2, 2, 15, 15, 14, 10, 1, 0, 1, 4, 13, 12, 1, 0, 14, 3, 4, 1, 5, 1, 7, 3 -Music_Lavender_branch_bbb9: + +Music_Lavender_branch_bbb9:: octave 4 note E_, 16 note D_, 16 @@ -191,16 +192,16 @@ Music_Lavender_branch_bbb9: note B_, 4 loopchannel 0, Music_Lavender_branch_bbb9 -Music_Lavender_Ch4: ; bc21 (2:7c21) - notetype 12 + +Music_Lavender_Ch3:: togglenoise 0 + notetype 12 note __, 16 note __, 16 note __, 16 note __, 16 -Music_Lavender_branch_bc26: +Music_Lavender_branch_bc26:: note F#, 8 note F#, 8 loopchannel 0, Music_Lavender_branch_bc26 -; 0xbc2e \ No newline at end of file diff --git a/crysaudio/music/RBY/meeteviltrainer.asm b/crysaudio/music/RBY/meeteviltrainer.asm index 4e9071b3..aa7cd9be 100644 --- a/crysaudio/music/RBY/meeteviltrainer.asm +++ b/crysaudio/music/RBY/meeteviltrainer.asm @@ -1,41 +1,41 @@ -Music_MeetEvilTrainer: - dbw $80, Music_MeetEvilTrainer_Ch1 - dbw $01, Music_MeetEvilTrainer_Ch2 - dbw $02, Music_MeetEvilTrainer_Ch3 +Music_MeetEvilTrainer:: + musicheader 3, 1, Music_MeetEvilTrainer_Ch0 + musicheader 1, 2, Music_MeetEvilTrainer_Ch1 + musicheader 1, 3, Music_MeetEvilTrainer_Ch2 -Music_MeetEvilTrainer_Ch1: ; 7f69d (1f:769d) +Music_MeetEvilTrainer_Ch0:: tempo 124 - volume 119 + volume $77 dutycycle 2 - - notetype 12, 177 + ;toggleperfectpitch + notetype 12, $b1 note __, 4 octave 3 note D_, 2 note C#, 2 - notetype 12, 79 + notetype 12, $4f note D_, 4 -Music_MeetEvilTrainer_branch_7f6ae: - notetype 12, 161 +Music_MeetEvilTrainer_branch_7f6ae:: + notetype 12, $a1 note D_, 4 note D_, 4 note D_, 4 - notetype 12, 112 + notetype 12, $70 note D_, 4 loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae -Music_MeetEvilTrainer_Ch2: ; 7f6ba (1f:76ba) +Music_MeetEvilTrainer_Ch1:: dutycycle 1 - notetype 12, 182 + notetype 12, $b6 octave 3 note B_, 2 note A#, 2 note B_, 8 -Music_MeetEvilTrainer_branch_7f6c2: - notetype 12, 194 +Music_MeetEvilTrainer_branch_7f6c2:: + notetype 12, $c2 octave 4 note D#, 2 note D_, 2 @@ -47,9 +47,9 @@ Music_MeetEvilTrainer_branch_7f6c2: note B_, 4 note B_, 4 note B_, 4 - notetype 12, 79 + notetype 12, $4f note A#, 4 - notetype 12, 194 + notetype 12, $c2 note G_, 2 note G#, 2 note A_, 2 @@ -59,14 +59,14 @@ Music_MeetEvilTrainer_branch_7f6c2: note B_, 4 note B_, 4 note B_, 4 - notetype 12, 63 + notetype 12, $3f note A#, 4 - notetype 12, 194 + notetype 12, $c2 loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2 -Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6) - notetype 12, 16 +Music_MeetEvilTrainer_Ch2:: + notetype 12, $10 note __, 8 octave 4 note F#, 1 @@ -74,7 +74,7 @@ Music_MeetEvilTrainer_Ch3: ; 7f6e6 (1f:76e6) note F_, 1 note __, 1 -Music_MeetEvilTrainer_branch_7f6ee: +Music_MeetEvilTrainer_branch_7f6ee:: note F#, 1 note __, 3 note F#, 1 @@ -83,4 +83,3 @@ Music_MeetEvilTrainer_branch_7f6ee: note __, 3 note A#, 4 loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee -; 0x7f6f9 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetfemaletrainer.asm b/crysaudio/music/RBY/meetfemaletrainer.asm index 8a959d31..a252ea1b 100644 --- a/crysaudio/music/RBY/meetfemaletrainer.asm +++ b/crysaudio/music/RBY/meetfemaletrainer.asm @@ -1,14 +1,14 @@ -Music_MeetFemaleTrainer: - dbw $80, Music_MeetFemaleTrainer_Ch1 - dbw $01, Music_MeetFemaleTrainer_Ch2 - dbw $02, Music_MeetFemaleTrainer_Ch3 +Music_MeetFemaleTrainer:: + musicheader 3, 1, Music_MeetFemaleTrainer_Ch0 + musicheader 1, 2, Music_MeetFemaleTrainer_Ch1 + musicheader 1, 3, Music_MeetFemaleTrainer_Ch2 -Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) +Music_MeetFemaleTrainer_Ch0:: tempo 124 - volume 119 + volume $77 dutycycle 1 - - notetype 12, 178 + ;toggleperfectpitch + notetype 12, $b2 octave 3 note G#, 6 octave 4 @@ -16,9 +16,9 @@ Music_MeetFemaleTrainer_Ch1: ; 7f6f9 (1f:76f9) note D#, 2 note C#, 2 note C_, 2 - notetype 12, 129 + notetype 12, $81 -Music_MeetFemaleTrainer_branch_7f70c: +Music_MeetFemaleTrainer_branch_7f70c:: octave 3 note E_, 4 loopchannel 12, Music_MeetFemaleTrainer_branch_7f70c @@ -31,17 +31,17 @@ Music_MeetFemaleTrainer_branch_7f70c: loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c -Music_MeetFemaleTrainer_Ch2: ; 7f71c (1f:771c) +Music_MeetFemaleTrainer_Ch1:: dutycycle 2 - notetype 12, 194 + notetype 12, $c2 octave 3 note B_, 2 - notetype 12, 199 + notetype 12, $c7 octave 4 note B_, 12 -Music_MeetFemaleTrainer_branch_7f726: - notetype 12, 194 +Music_MeetFemaleTrainer_branch_7f726:: + notetype 12, $c2 octave 3 note B_, 4 octave 4 @@ -76,8 +76,8 @@ Music_MeetFemaleTrainer_branch_7f726: loopchannel 0, Music_MeetFemaleTrainer_branch_7f726 -Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b) - notetype 12, 16 +Music_MeetFemaleTrainer_Ch2:: + notetype 12, $10 note __, 8 octave 5 note C#, 1 @@ -88,7 +88,7 @@ Music_MeetFemaleTrainer_Ch3: ; 7f74b (1f:774b) note A_, 1 note __, 1 -Music_MeetFemaleTrainer_branch_7f756: +Music_MeetFemaleTrainer_branch_7f756:: callchannel Music_MeetFemaleTrainer_branch_7f770 note G#, 1 note __, 3 @@ -109,7 +109,7 @@ Music_MeetFemaleTrainer_branch_7f756: note __, 3 loopchannel 0, Music_MeetFemaleTrainer_branch_7f756 -Music_MeetFemaleTrainer_branch_7f770: +Music_MeetFemaleTrainer_branch_7f770:: note G#, 1 note __, 3 note E_, 1 @@ -121,4 +121,3 @@ Music_MeetFemaleTrainer_branch_7f770: note F#, 1 note __, 1 endchannel -; 0x7f77b \ No newline at end of file diff --git a/crysaudio/music/RBY/meetjessiejames.asm b/crysaudio/music/RBY/meetjessiejames.asm index dd9d660e..92667ec8 100644 --- a/crysaudio/music/RBY/meetjessiejames.asm +++ b/crysaudio/music/RBY/meetjessiejames.asm @@ -1,14 +1,14 @@ -Music_MeetJessieJames: - dbw $80, Music_MeetJessieJames_Ch1 - dbw $01, Music_MeetJessieJames_Ch2 - dbw $02, Music_MeetJessieJames_Ch3 +Music_MeetJessieJames:: + musicheader 3, 1, Music_MeetJessieJames_Ch1 + musicheader 1, 2, Music_MeetJessieJames_Ch2 + musicheader 1, 3, Music_MeetJessieJames_Ch3 -Music_MeetJessieJames_Ch1: +Music_MeetJessieJames_Ch1:: tempo 144 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $c, $b2 + vibrato 8, $14 + notetype 12, $b2 octave 3 note G#, 1 note G_, 1 @@ -19,20 +19,21 @@ Music_MeetJessieJames_Ch1: note D_, 2 note C#, 2 note C_, 2 - notetype $c, $b6 + notetype 12, $b6 note D#, 12 note C_, 4 -Music_MeetJessieJames_branch_83187: - notetype $c, $b2 + +Music_MeetJessieJames_branch_83187:: + notetype 12, $b2 octave 4 note D_, 16 note __, 12 - notetype $c, $b4 + notetype 12, $b4 octave 3 note A#, 4 note __, 16 note __, 8 - notetype $c, $b2 + notetype 12, $b2 octave 2 note A_, 2 octave 3 @@ -54,10 +55,10 @@ Music_MeetJessieJames_branch_83187: note D_, 2 octave 2 note A#, 4 - notetype $c, $b4 + notetype 12, $b4 octave 3 note B_, 4 - notetype $c, $b2 + notetype 12, $b2 note D_, 1 note D#, 1 note D#, 2 @@ -76,13 +77,15 @@ Music_MeetJessieJames_branch_83187: note A#, 2 octave 3 note B_, 2 - notetype $c, $b4 + notetype 12, $b4 note A#, 4 loopchannel 0, Music_MeetJessieJames_branch_83187 -Music_MeetJessieJames_Ch2: + + +Music_MeetJessieJames_Ch2:: dutycycle 3 - vibrato $6, $15 - notetype $c, $c2 + vibrato 6, $15 + notetype 12, $c2 octave 4 note D_, 1 note C#, 1 @@ -94,12 +97,13 @@ Music_MeetJessieJames_Ch2: note G#, 2 note G_, 2 note F#, 2 - notetype $c, $c7 + notetype 12, $c7 note A_, 12 octave 4 note C#, 4 -Music_MeetJessieJames_branch_831df: - notetype $c, $c2 + +Music_MeetJessieJames_branch_831df:: + notetype 12, $c2 octave 3 note C#, 1 note D_, 1 @@ -117,10 +121,10 @@ Music_MeetJessieJames_branch_831df: note C#, 2 octave 2 note A_, 4 - notetype $c, $c5 + notetype 12, $c5 octave 4 note C#, 4 - notetype $c, $c2 + notetype 12, $c2 note D_, 1 octave 3 note D_, 1 @@ -136,10 +140,10 @@ Music_MeetJessieJames_branch_831df: note D_, 2 note D_, 2 note C#, 2 - notetype $c, $c6 + notetype 12, $c6 octave 4 note D_, 8 - notetype $c, $c2 + notetype 12, $c2 note D#, 6 note F_, 4 note D#, 4 @@ -149,9 +153,9 @@ Music_MeetJessieJames_branch_831df: note D#, 6 note F_, 4 note D#, 2 - notetype $c, $c5 + notetype 12, $c5 note D_, 4 - notetype $c, $c2 + notetype 12, $c2 note D#, 6 note F_, 4 note D#, 4 @@ -160,11 +164,13 @@ Music_MeetJessieJames_branch_831df: octave 4 note D#, 4 note F_, 4 - notetype $c, $c5 + notetype 12, $c5 note D#, 8 loopchannel 0, Music_MeetJessieJames_branch_831df -Music_MeetJessieJames_Ch3: - notetype $c, $10 + + +Music_MeetJessieJames_Ch3:: + notetype 12, $10 note __, 16 note __, 8 octave 4 @@ -174,7 +180,8 @@ Music_MeetJessieJames_Ch3: octave 4 note C_, 2 note D#, 2 -Music_MeetJessieJames_branch_83235: + +Music_MeetJessieJames_branch_83235:: note D_, 1 note __, 1 note A_, 1 diff --git a/crysaudio/music/RBY/meetmaletrainer.asm b/crysaudio/music/RBY/meetmaletrainer.asm index 18eb3fbf..c993ba8c 100644 --- a/crysaudio/music/RBY/meetmaletrainer.asm +++ b/crysaudio/music/RBY/meetmaletrainer.asm @@ -1,15 +1,15 @@ -Music_MeetMaleTrainer: - dbw $80, Music_MeetMaleTrainer_Ch1 - dbw $01, Music_MeetMaleTrainer_Ch2 - dbw $02, Music_MeetMaleTrainer_Ch3 +Music_MeetMaleTrainer:: + musicheader 3, 1, Music_MeetMaleTrainer_Ch0 + musicheader 1, 2, Music_MeetMaleTrainer_Ch1 + musicheader 1, 3, Music_MeetMaleTrainer_Ch2 -Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) +Music_MeetMaleTrainer_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato 20, 51 - - notetype 12, 180 + vibrato 20, $33 + ;toggleperfectpitch + notetype 12, $b4 octave 3 note C#, 1 note D_, 1 @@ -18,7 +18,7 @@ Music_MeetMaleTrainer_Ch1: ; 7f77b (1f:777b) note F_, 12 note __, 16 -Music_MeetMaleTrainer_branch_7f78f: +Music_MeetMaleTrainer_branch_7f78f:: octave 3 note B_, 4 note A_, 4 @@ -37,10 +37,10 @@ Music_MeetMaleTrainer_branch_7f78f: loopchannel 0, Music_MeetMaleTrainer_branch_7f78f -Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2) +Music_MeetMaleTrainer_Ch1:: dutycycle 3 - vibrato 24, 34 - notetype 12, 196 + vibrato 24, $22 + notetype 12, $c4 octave 4 note E_, 1 note D#, 1 @@ -54,8 +54,8 @@ Music_MeetMaleTrainer_Ch2: ; 7f7a2 (1f:77a2) note E_, 1 note __, 9 -Music_MeetMaleTrainer_branch_7f7b5: - notetype 12, 196 +Music_MeetMaleTrainer_branch_7f7b5:: + notetype 12, $c4 octave 4 note E_, 6 note D#, 6 @@ -70,9 +70,9 @@ Music_MeetMaleTrainer_branch_7f7b5: note B_, 2 octave 4 note C#, 2 - notetype 12, 199 + notetype 12, $c7 note F_, 16 - notetype 12, 197 + notetype 12, $c5 octave 3 note F#, 8 octave 4 @@ -80,8 +80,8 @@ Music_MeetMaleTrainer_branch_7f7b5: loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5 -Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2) - notetype 12, 16 +Music_MeetMaleTrainer_Ch2:: + notetype 12, $10 note __, 6 octave 4 note B_, 1 @@ -105,7 +105,7 @@ Music_MeetMaleTrainer_Ch3: ; 7f7d2 (1f:77d2) note F#, 1 note __, 1 -Music_MeetMaleTrainer_branch_7f7ea: +Music_MeetMaleTrainer_branch_7f7ea:: note E_, 1 note __, 1 note B_, 1 @@ -193,4 +193,3 @@ Music_MeetMaleTrainer_branch_7f7ea: note D#, 1 note __, 1 loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea -; 0x7f844 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetprofoak.asm b/crysaudio/music/RBY/meetprofoak.asm index 1d49409e..7d3da517 100644 --- a/crysaudio/music/RBY/meetprofoak.asm +++ b/crysaudio/music/RBY/meetprofoak.asm @@ -1,14 +1,14 @@ -Music_MeetProfOak: - dbw $80, Music_MeetProfOak_Ch1 - dbw $01, Music_MeetProfOak_Ch2 - dbw $02, Music_MeetProfOak_Ch3 +Music_MeetProfOak:: + musicheader 3, 1, Music_MeetProfOak_Ch0 + musicheader 1, 2, Music_MeetProfOak_Ch1 + musicheader 1, 3, Music_MeetProfOak_Ch2 -Music_MeetProfOak_Ch1: ; af59 (2:6f59) +Music_MeetProfOak_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - - notetype 12, 180 + ;toggleperfectpitch + notetype 12, $b4 octave 3 note F#, 1 note B_, 1 @@ -16,7 +16,7 @@ Music_MeetProfOak_Ch1: ; af59 (2:6f59) note D#, 1 note E_, 1 note F#, 12 - notetype 12, 162 + notetype 12, $a2 octave 3 note E_, 6 note B_, 10 @@ -43,7 +43,7 @@ Music_MeetProfOak_Ch1: ; af59 (2:6f59) note F#, 2 note F#, 4 -Music_MeetProfOak_branch_af85: +Music_MeetProfOak_branch_af85:: note F#, 6 note E_, 4 note A_, 2 @@ -79,10 +79,10 @@ Music_MeetProfOak_branch_af85: loopchannel 0, Music_MeetProfOak_branch_af85 -Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) - vibrato 8, 17 +Music_MeetProfOak_Ch1:: + vibrato 8, $11 dutycycle 2 - notetype 12, 196 + notetype 12, $c4 octave 3 note B_, 1 octave 4 @@ -90,7 +90,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note F#, 1 note A#, 1 note B_, 12 - notetype 12, 178 + notetype 12, $b2 octave 3 note B_, 2 octave 4 @@ -99,7 +99,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note E_, 4 note D#, 2 note C#, 4 - notetype 12, 100 + notetype 12, $64 octave 4 note B_, 2 octave 5 @@ -108,7 +108,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note E_, 4 note D#, 2 note C#, 4 - notetype 12, 178 + notetype 12, $b2 octave 3 note B_, 2 note A_, 2 @@ -116,7 +116,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note A_, 4 note B_, 2 note B_, 4 - notetype 12, 129 + notetype 12, $81 octave 4 note B_, 2 note A_, 2 @@ -124,7 +124,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note A_, 4 note B_, 2 note B_, 4 - notetype 12, 178 + notetype 12, $b2 octave 3 note B_, 2 octave 4 @@ -133,7 +133,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note E_, 4 note D#, 2 note C#, 4 - notetype 12, 100 + notetype 12, $64 octave 4 note B_, 2 octave 5 @@ -142,7 +142,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note E_, 4 note D#, 2 note C#, 4 - notetype 12, 178 + notetype 12, $b2 octave 3 note B_, 2 note A_, 2 @@ -150,7 +150,7 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note A_, 4 note B_, 2 note B_, 4 - notetype 12, 129 + notetype 12, $81 octave 4 note B_, 2 note A_, 2 @@ -158,9 +158,9 @@ Music_MeetProfOak_Ch2: ; afa9 (2:6fa9) note A_, 4 note B_, 2 note B_, 4 - notetype 12, 181 + notetype 12, $b5 -Music_MeetProfOak_branch_b005: +Music_MeetProfOak_branch_b005:: octave 4 note C#, 6 octave 3 @@ -180,14 +180,14 @@ Music_MeetProfOak_branch_b005: note B_, 1 octave 4 note E_, 8 - notetype 12, 101 + notetype 12, $65 octave 4 note B_, 6 note G#, 1 note B_, 1 octave 5 note E_, 8 - notetype 12, 181 + notetype 12, $b5 octave 3 note A_, 6 note F#, 1 @@ -208,13 +208,13 @@ Music_MeetProfOak_branch_b005: note B_, 1 octave 4 note E_, 1 - notetype 12, 183 + notetype 12, $b7 note G#, 16 loopchannel 0, Music_MeetProfOak_branch_b005 -Music_MeetProfOak_Ch3: ; b03d (2:703d) - notetype 12, 18 +Music_MeetProfOak_Ch2:: + notetype 12, $12 note __, 10 octave 4 note F#, 1 @@ -341,7 +341,7 @@ Music_MeetProfOak_Ch3: ; b03d (2:703d) note G#, 1 note __, 1 -Music_MeetProfOak_branch_b0bc: +Music_MeetProfOak_branch_b0bc:: octave 4 note A_, 1 note __, 1 @@ -368,7 +368,7 @@ Music_MeetProfOak_branch_b0bc: note __, 1 loopchannel 2, Music_MeetProfOak_branch_b0bc -Music_MeetProfOak_branch_b0d8: +Music_MeetProfOak_branch_b0d8:: octave 4 note G#, 1 note __, 1 @@ -388,7 +388,7 @@ Music_MeetProfOak_branch_b0d8: note __, 1 loopchannel 2, Music_MeetProfOak_branch_b0d8 -Music_MeetProfOak_branch_b0ed: +Music_MeetProfOak_branch_b0ed:: note F#, 1 note __, 1 note A_, 1 @@ -407,7 +407,7 @@ Music_MeetProfOak_branch_b0ed: note __, 1 loopchannel 2, Music_MeetProfOak_branch_b0ed -Music_MeetProfOak_branch_b101: +Music_MeetProfOak_branch_b101:: note G#, 1 note __, 1 note B_, 1 @@ -426,4 +426,3 @@ Music_MeetProfOak_branch_b101: note __, 1 loopchannel 2, Music_MeetProfOak_branch_b101 loopchannel 0, Music_MeetProfOak_branch_b0bc -; 0xb119 \ No newline at end of file diff --git a/crysaudio/music/RBY/meetrival.asm b/crysaudio/music/RBY/meetrival.asm index 01cac238..baca30e4 100644 --- a/crysaudio/music/RBY/meetrival.asm +++ b/crysaudio/music/RBY/meetrival.asm @@ -1,25 +1,26 @@ -Music_MeetRival: - dbw $80, Music_MeetRival_Ch1 - dbw $01, Music_MeetRival_Ch2 - dbw $02, Music_MeetRival_Ch3 -Music_FarewellRival: - dbw $80, Music_FarewellRival_Ch1 - dbw $01, Music_FarewellRival_Ch2 - dbw $02, Music_FarewellRival_Ch3 +Music_MeetRival:: + musicheader 3, 1, Music_MeetRival_Ch0 + musicheader 1, 2, Music_MeetRival_Ch1 + musicheader 1, 3, Music_MeetRival_Ch2 -Music_MeetRival_branch_b119: +Music_FarewellRival: + musicheader 3, 1, Music_MeetRival_branch_b1a2 + musicheader 1, 2, Music_MeetRival_branch_b21d + musicheader 1, 3, Music_MeetRival_branch_b2b5 + +Music_MeetRival_branch_b119:: tempo 100 loopchannel 0, Music_MeetRival_branch_b123 -Music_MeetRival_Ch1: ; b120 (2:7120) +Music_MeetRival_Ch0:: tempo 112 -Music_MeetRival_branch_b123: - volume 119 +Music_MeetRival_branch_b123:: + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 179 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b3 octave 4 note D_, 1 note C#, 1 @@ -40,7 +41,7 @@ Music_MeetRival_branch_b123: note G_, 2 note A_, 2 -Music_MeetRival_branch_b140: +Music_MeetRival_branch_b140:: note B_, 4 note A#, 2 note A_, 4 @@ -113,7 +114,7 @@ Music_MeetRival_branch_b140: note A#, 2 octave 4 note C_, 2 - notetype 12, 183 + notetype 12, $b7 octave 3 note G_, 4 note D_, 2 @@ -122,25 +123,25 @@ Music_MeetRival_branch_b140: note D_, 2 note __, 4 note D_, 4 - notetype 12, 179 + notetype 12, $b3 note A_, 2 note G_, 2 note A_, 2 loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_branch_b19b: +Music_MeetRival_branch_b19b:: tempo 100 loopchannel 0, Music_MeetRival_branch_b1a5 -Music_FarewellRival_Ch1: +Music_MeetRival_branch_b1a2:: tempo 112 -Music_MeetRival_branch_b1a5: - volume 119 +Music_MeetRival_branch_b1a5:: + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 179 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b3 octave 3 note D_, 1 note __, 3 @@ -152,10 +153,10 @@ Music_MeetRival_branch_b1a5: loopchannel 0, Music_MeetRival_branch_b140 -Music_MeetRival_Ch2: ; b1bb (2:71bb) +Music_MeetRival_Ch1:: dutycycle 3 - vibrato 10, 38 - notetype 12, 199 + vibrato 10, $26 + notetype 12, $c7 octave 4 note B_, 1 note A#, 1 @@ -179,8 +180,8 @@ Music_MeetRival_Ch2: ; b1bb (2:71bb) note F_, 2 note F#, 2 -Music_MeetRival_branch_b1d8: - notetype 12, 199 +Music_MeetRival_branch_b1d8:: + notetype 12, $c7 note G_, 4 note D_, 2 note F_, 6 @@ -206,18 +207,18 @@ Music_MeetRival_branch_b1d8: note B_, 2 octave 5 note C_, 2 - notetype 12, 176 + notetype 12, $b0 note D_, 16 - notetype 12, 181 + notetype 12, $b5 note D_, 6 - notetype 12, 199 + notetype 12, $c7 note F_, 4 note D_, 2 note C_, 2 note D_, 2 - notetype 12, 176 + notetype 12, $b0 note C_, 8 - notetype 12, 199 + notetype 12, $c7 note C_, 8 octave 4 note C_, 2 @@ -225,9 +226,9 @@ Music_MeetRival_branch_b1d8: note A#, 4 note G_, 2 note F_, 2 - notetype 12, 176 + notetype 12, $b0 note G_, 16 - notetype 12, 179 + notetype 12, $b3 note G_, 2 octave 3 note G_, 2 @@ -239,10 +240,10 @@ Music_MeetRival_branch_b1d8: note F#, 2 loopchannel 0, Music_MeetRival_branch_b1d8 -Music_FarewellRival_Ch2: +Music_MeetRival_branch_b21d:: dutycycle 3 - vibrato 10, 38 - notetype 12, 199 + vibrato 10, $26 + notetype 12, $c7 octave 3 note G_, 1 note __, 3 @@ -257,8 +258,8 @@ Music_FarewellRival_Ch2: loopchannel 0, Music_MeetRival_branch_b1d8 -Music_MeetRival_Ch3: ; b233 (2:7233) - notetype 12, 20 +Music_MeetRival_Ch2:: + notetype 12, $14 octave 5 note D_, 2 note __, 2 @@ -282,7 +283,7 @@ Music_MeetRival_Ch3: ; b233 (2:7233) note G_, 1 note __, 1 -Music_MeetRival_branch_b24b: +Music_MeetRival_branch_b24b:: note G_, 2 octave 5 note D_, 2 @@ -387,8 +388,8 @@ Music_MeetRival_branch_b24b: note D_, 2 loopchannel 0, Music_MeetRival_branch_b24b -Music_FarewellRival_Ch3: - notetype 12, 20 +Music_MeetRival_branch_b2b5:: + notetype 12, $14 octave 4 note G_, 1 note __, 3 @@ -403,4 +404,3 @@ Music_FarewellRival_Ch3: note G_, 1 note __, 1 loopchannel 0, Music_MeetRival_branch_b24b -; 0xb2c8 \ No newline at end of file diff --git a/crysaudio/music/RBY/museumguy.asm b/crysaudio/music/RBY/museumguy.asm index dc634208..ac32e923 100644 --- a/crysaudio/music/RBY/museumguy.asm +++ b/crysaudio/music/RBY/museumguy.asm @@ -1,15 +1,15 @@ -Music_MuseumGuy: - dbw $C0, Music_MuseumGuy_Ch1 - dbw $01, Music_MuseumGuy_Ch2 - dbw $02, Music_MuseumGuy_Ch3 - dbw $03, Music_MuseumGuy_Ch4 +Music_MuseumGuy:: + musicheader 4, 1, Music_MuseumGuy_Ch0 + musicheader 1, 2, Music_MuseumGuy_Ch1 + musicheader 1, 3, Music_MuseumGuy_Ch2 + musicheader 1, 4, Music_MuseumGuy_Ch3 -Music_MuseumGuy_Ch1: ; adae (2:6dae) +Music_MuseumGuy_Ch0:: tempo 128 - volume 119 + volume $77 dutycycle 2 - - notetype 12, 177 + ;toggleperfectpitch + notetype 12, $b1 octave 3 note B_, 2 note A_, 2 @@ -35,7 +35,7 @@ Music_MuseumGuy_Ch1: ; adae (2:6dae) note E_, 2 note E_, 6 -Music_MuseumGuy_branch_add6: +Music_MuseumGuy_branch_add6:: callchannel Music_MuseumGuy_branch_ade7 callchannel Music_MuseumGuy_branch_adec callchannel Music_MuseumGuy_branch_ade7 @@ -45,14 +45,14 @@ Music_MuseumGuy_branch_add6: note E_, 6 loopchannel 0, Music_MuseumGuy_branch_add6 -Music_MuseumGuy_branch_ade7: +Music_MuseumGuy_branch_ade7:: note E_, 2 note E_, 6 note F#, 2 note F#, 6 endchannel -Music_MuseumGuy_branch_adec: +Music_MuseumGuy_branch_adec:: note E_, 2 note E_, 6 note D_, 2 @@ -60,9 +60,9 @@ Music_MuseumGuy_branch_adec: endchannel -Music_MuseumGuy_Ch2: ; adf1 (2:6df1) +Music_MuseumGuy_Ch1:: dutycycle 2 - notetype 12, 193 + notetype 12, $c1 octave 4 note E_, 2 note D_, 2 @@ -113,21 +113,21 @@ Music_MuseumGuy_Ch2: ; adf1 (2:6df1) note A_, 2 note A_, 4 -Music_MuseumGuy_branch_ae26: +Music_MuseumGuy_branch_ae26:: octave 3 note A_, 2 octave 4 note C#, 2 note E_, 3 - notetype 12, 129 + notetype 12, $81 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 2 note F#, 2 note A_, 3 - notetype 12, 145 + notetype 12, $91 note A_, 1 - notetype 12, 193 + notetype 12, $c1 octave 3 note A_, 2 octave 4 @@ -139,31 +139,31 @@ Music_MuseumGuy_branch_ae26: octave 3 note B_, 1 note B_, 3 - notetype 12, 161 + notetype 12, $a1 note G#, 1 - notetype 12, 193 + notetype 12, $c1 note A_, 2 octave 4 note C#, 2 note E_, 3 - notetype 12, 145 + notetype 12, $91 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note D_, 2 note F#, 2 note A_, 3 - notetype 12, 129 + notetype 12, $81 note A_, 1 - notetype 12, 193 + notetype 12, $c1 note G#, 2 note E_, 1 - notetype 12, 129 + notetype 12, $81 note E_, 1 - notetype 12, 193 + notetype 12, $c1 note F#, 2 - notetype 12, 129 + notetype 12, $81 note F#, 1 - notetype 12, 193 + notetype 12, $c1 note G#, 1 note A_, 2 note A_, 2 @@ -171,8 +171,8 @@ Music_MuseumGuy_branch_ae26: loopchannel 0, Music_MuseumGuy_branch_ae26 -Music_MuseumGuy_Ch3: ; ae6e (2:6e6e) - notetype 12, 16 +Music_MuseumGuy_Ch2:: + notetype 12, $10 note __, 16 octave 4 note E_, 1 @@ -200,7 +200,7 @@ Music_MuseumGuy_Ch3: ; ae6e (2:6e6e) note A_, 1 note __, 3 -Music_MuseumGuy_branch_ae8e: +Music_MuseumGuy_branch_ae8e:: callchannel Music_MuseumGuy_branch_aec1 note __, 3 octave 6 @@ -237,7 +237,7 @@ Music_MuseumGuy_branch_ae8e: note __, 3 loopchannel 0, Music_MuseumGuy_branch_ae8e -Music_MuseumGuy_branch_aeb8: +Music_MuseumGuy_branch_aeb8:: note A_, 1 note __, 1 note A_, 1 @@ -248,7 +248,7 @@ Music_MuseumGuy_branch_aeb8: note __, 5 endchannel -Music_MuseumGuy_branch_aec1: +Music_MuseumGuy_branch_aec1:: octave 6 note C#, 1 note __, 1 @@ -267,9 +267,9 @@ Music_MuseumGuy_branch_aec1: endchannel -Music_MuseumGuy_Ch4: ; aed1 (2:6ed1) - notetype 12 +Music_MuseumGuy_Ch3:: togglenoise 1 + notetype 12 note __, 16 note __, 16 note __, 16 @@ -282,7 +282,7 @@ Music_MuseumGuy_Ch4: ; aed1 (2:6ed1) note A#, 1 note A#, 1 -Music_MuseumGuy_branch_aee1: +Music_MuseumGuy_branch_aee1:: note A_, 4 note A_, 6 note A_, 2 @@ -342,4 +342,3 @@ Music_MuseumGuy_branch_aee1: note A#, 1 note A#, 1 loopchannel 0, Music_MuseumGuy_branch_aee1 -; 0xaf59 \ No newline at end of file diff --git a/crysaudio/music/RBY/oakslab.asm b/crysaudio/music/RBY/oakslab.asm index 4c9d3446..7355a26a 100644 --- a/crysaudio/music/RBY/oakslab.asm +++ b/crysaudio/music/RBY/oakslab.asm @@ -1,15 +1,15 @@ -Music_OaksLab: - dbw $80, Music_OaksLab_Ch1 - dbw $01, Music_OaksLab_Ch2 - dbw $02, Music_OaksLab_Ch3 +Music_OaksLab:: + musicheader 3, 1, Music_OaksLab_Ch0 + musicheader 1, 2, Music_OaksLab_Ch1 + musicheader 1, 3, Music_OaksLab_Ch2 -Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) +Music_OaksLab_Ch0:: tempo 140 - volume 119 + volume $77 dutycycle 3 - vibrato 16, 18 - - notetype 12, 179 + vibrato 16, $12 + ;toggleperfectpitch + notetype 12, $b3 octave 2 note B_, 1 octave 3 @@ -21,7 +21,7 @@ Music_OaksLab_Ch1: ; 7eeb9 (1f:6eb9) note A_, 1 note B_, 1 -Music_OaksLab_branch_7eed0: +Music_OaksLab_branch_7eed0:: octave 4 note C#, 4 octave 3 @@ -74,10 +74,10 @@ Music_OaksLab_branch_7eed0: loopchannel 0, Music_OaksLab_branch_7eed0 -Music_OaksLab_Ch2: ; 7ef05 (1f:6f05) +Music_OaksLab_Ch1:: dutycycle 3 - vibrato 10, 37 - notetype 12, 196 + vibrato 10, $25 + notetype 12, $c4 octave 3 note G#, 1 note A_, 1 @@ -89,7 +89,7 @@ Music_OaksLab_Ch2: ; 7ef05 (1f:6f05) note F#, 1 note G#, 1 -Music_OaksLab_branch_7ef16: +Music_OaksLab_branch_7ef16:: note A_, 6 note G#, 1 note F#, 1 @@ -149,8 +149,8 @@ Music_OaksLab_branch_7ef16: loopchannel 0, Music_OaksLab_branch_7ef16 -Music_OaksLab_Ch3: ; 7ef52 (1f:6f52) - notetype 12, 17 +Music_OaksLab_Ch2:: + notetype 12, $11 note __, 2 octave 4 note G#, 1 @@ -160,7 +160,7 @@ Music_OaksLab_Ch3: ; 7ef52 (1f:6f52) note E_, 1 note __, 1 -Music_OaksLab_branch_7ef5c: +Music_OaksLab_branch_7ef5c:: note C#, 1 note __, 1 note A_, 1 @@ -396,4 +396,3 @@ Music_OaksLab_branch_7ef5c: note E_, 1 note __, 3 loopchannel 0, Music_OaksLab_branch_7ef5c -; 0x7f04a \ No newline at end of file diff --git a/crysaudio/music/RBY/pallettown.asm b/crysaudio/music/RBY/pallettown.asm index 64dfe7d4..0254dc21 100644 --- a/crysaudio/music/RBY/pallettown.asm +++ b/crysaudio/music/RBY/pallettown.asm @@ -1,15 +1,15 @@ -Music_RBYPalletTown: - dbw $80, Music_RBYPalletTown_Ch1 - dbw $01, Music_RBYPalletTown_Ch2 - dbw $02, Music_RBYPalletTown_Ch3 +Music_RBYPalletTown:: + musicheader 3, 1, Music_RBYPalletTown_Ch0 + musicheader 1, 2, Music_RBYPalletTown_Ch1 + musicheader 1, 3, Music_RBYPalletTown_Ch2 -Music_RBYPalletTown_Ch1: ; a7c5 (2:67c5) +Music_RBYPalletTown_Ch0:: tempo 160 - volume 119 + volume $77 dutycycle 2 - notetype 12, 195 + notetype 12, $c3 -Music_RBYPalletTown_branch_a7ce: +Music_RBYPalletTown_branch_a7ce:: octave 3 note B_, 4 octave 4 @@ -88,7 +88,7 @@ Music_RBYPalletTown_branch_a7ce: note A_, 2 note F#, 2 note A_, 2 - notetype 12, 179 + notetype 12, $b3 note B_, 2 note G_, 2 note D_, 2 @@ -153,26 +153,26 @@ Music_RBYPalletTown_branch_a7ce: endchannel -Music_RBYPalletTown_Ch2: ; a85f (2:685f) +Music_RBYPalletTown_Ch1:: dutycycle 2 -Music_RBYPalletTown_branch_a861: - notetype 12, 211 +Music_RBYPalletTown_branch_a861:: + notetype 12, $d3 octave 5 note D_, 2 - notetype 12, 163 + notetype 12, $a3 note C_, 2 - notetype 12, 211 + notetype 12, $d3 octave 4 note B_, 2 - notetype 12, 179 + notetype 12, $b3 note A_, 2 - notetype 12, 211 + notetype 12, $d3 octave 5 note G_, 2 - notetype 12, 179 + notetype 12, $b3 note E_, 2 - notetype 12, 211 + notetype 12, $d3 note F#, 2 note E_, 2 note D_, 6 @@ -196,21 +196,21 @@ Music_RBYPalletTown_branch_a861: note A_, 8 octave 5 note D_, 2 - notetype 12, 163 + notetype 12, $a3 note C_, 2 - notetype 12, 211 + notetype 12, $d3 octave 4 note B_, 2 - notetype 12, 179 + notetype 12, $b3 octave 5 note D_, 2 - notetype 12, 211 + notetype 12, $d3 note G_, 2 - notetype 12, 163 + notetype 12, $a3 note F#, 2 - notetype 12, 179 + notetype 12, $b3 note F#, 2 - notetype 12, 211 + notetype 12, $d3 note G_, 2 note E_, 6 note D_, 2 @@ -267,11 +267,11 @@ Music_RBYPalletTown_branch_a861: endchannel -Music_RBYPalletTown_Ch3: ; a8de (2:68de) - vibrato 24, 40 - notetype 12, 18 +Music_RBYPalletTown_Ch2:: + vibrato 24, $28 + notetype 12, $12 -Music_RBYPalletTown_branch_a8e3: +Music_RBYPalletTown_branch_a8e3:: octave 4 note G_, 6 note E_, 6 @@ -317,4 +317,3 @@ Music_RBYPalletTown_branch_a8e3: note F#, 8 loopchannel 0, Music_RBYPalletTown_branch_a8e3 endchannel -; 0xa913 \ No newline at end of file diff --git a/crysaudio/music/RBY/pkmnhealed.asm b/crysaudio/music/RBY/pkmnhealed.asm index 7016a514..09f69cc1 100644 --- a/crysaudio/music/RBY/pkmnhealed.asm +++ b/crysaudio/music/RBY/pkmnhealed.asm @@ -1,45 +1,46 @@ -Music_PkmnHealed: - dbw $80, Music_PkmnHealed_Ch1 - dbw $01, Music_PkmnHealed_Ch2 - dbw $02, Music_PkmnHealed_Ch3 +Music_PkmnHealed:: + musicheader 3, 1, Music_PkmnHealed_Ch0 + musicheader 1, 2, Music_PkmnHealed_Ch1 + musicheader 1, 3, Music_PkmnHealed_Ch2 -Music_PkmnHealed_Ch1: ; 9ba3 (2:5ba3) +Music_PkmnHealed_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 2 - - notetype 12, 129 + ;toggleperfectpitch + notetype 12, $81 note __, 2 - slidepitchto 1, 4, B_ + octave 3 + slidepitchto 1, 4, A# note B_, 2 - slidepitchto 1, 5, E_ + slidepitchto 1, 5, D# note B_, 2 - slidepitchto 1, 4, E_ + slidepitchto 1, 4, D# note E_, 2 note __, 4 - slidepitchto 1, 3, B_ + slidepitchto 1, 3, A# note E_, 4 - slidepitchto 1, 4, B_ + slidepitchto 1, 4, A# note B_, 4 endchannel -Music_PkmnHealed_Ch2: ; 9bc4 (2:5bc4) +Music_PkmnHealed_Ch1:: dutycycle 2 - notetype 12, 195 + notetype 12, $c3 octave 4 note B_, 4 note B_, 4 note B_, 2 note G#, 2 - notetype 12, 196 + notetype 12, $c4 octave 5 note E_, 8 endchannel -Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2) - notetype 12, 16 +Music_PkmnHealed_Ch2:: + notetype 12, $10 octave 4 note E_, 2 note __, 2 @@ -50,4 +51,3 @@ Music_PkmnHealed_Ch3: ; 9bd2 (2:5bd2) note E_, 6 note __, 2 endchannel -; 0x9bde \ No newline at end of file diff --git a/crysaudio/music/RBY/pokecenter.asm b/crysaudio/music/RBY/pokecenter.asm index 95b6cfd2..eb3b9405 100644 --- a/crysaudio/music/RBY/pokecenter.asm +++ b/crysaudio/music/RBY/pokecenter.asm @@ -1,22 +1,22 @@ -Music_Pokecenter: - dbw $80, Music_Pokecenter_Ch1 - dbw $01, Music_Pokecenter_Ch2 - dbw $02, Music_Pokecenter_Ch3 +Music_Pokecenter:: + musicheader 3, 1, Music_Pokecenter_Ch0 + musicheader 1, 2, Music_Pokecenter_Ch1 + musicheader 1, 3, Music_Pokecenter_Ch2 -Music_Pokecenter_Ch1: ; be56 (2:7e56) +Music_Pokecenter_Ch0:: tempo 144 - volume 119 + volume $77 dutycycle 3 - vibrato 10, 34 - + vibrato 10, $22 + ;toggleperfectpitch -Music_Pokecenter_branch_be61: - notetype 12, 163 +Music_Pokecenter_branch_be61:: + notetype 12, $a3 octave 3 note F#, 2 note F_, 2 note F#, 2 - notetype 12, 181 + notetype 12, $b5 octave 4 note D_, 4 note C#, 2 @@ -31,11 +31,11 @@ Music_Pokecenter_branch_be61: note F#, 2 note G_, 2 note A_, 2 - notetype 12, 163 + notetype 12, $a3 note A_, 2 note E_, 2 note A_, 2 - notetype 12, 181 + notetype 12, $b5 octave 4 note C#, 4 octave 3 @@ -52,11 +52,11 @@ Music_Pokecenter_branch_be61: octave 3 note B_, 2 note A_, 2 - notetype 12, 163 + notetype 12, $a3 note F#, 2 note F_, 2 note F#, 2 - notetype 12, 181 + notetype 12, $b5 octave 4 note D_, 4 note C#, 2 @@ -71,11 +71,11 @@ Music_Pokecenter_branch_be61: note F#, 2 note G_, 2 note A_, 2 - notetype 12, 163 + notetype 12, $a3 note A_, 2 note E_, 2 note A_, 2 - notetype 12, 181 + notetype 12, $b5 octave 4 note C#, 4 octave 3 @@ -154,13 +154,13 @@ Music_Pokecenter_branch_be61: loopchannel 0, Music_Pokecenter_branch_be61 -Music_Pokecenter_Ch2: ; bef9 (2:7ef9) - vibrato 8, 37 +Music_Pokecenter_Ch1:: + vibrato 8, $25 -Music_Pokecenter_branch_befc: +Music_Pokecenter_branch_befc:: callchannel Music_Pokecenter_branch_bf4e dutycycle 3 - notetype 12, 165 + notetype 12, $a5 octave 3 note A_, 4 note E_, 4 @@ -168,25 +168,25 @@ Music_Pokecenter_branch_befc: note D_, 2 note F#, 6 dutycycle 3 - notetype 12, 165 + notetype 12, $a5 octave 3 note A_, 4 note E_, 4 callchannel Music_Pokecenter_branch_bf4e dutycycle 3 - notetype 12, 165 + notetype 12, $a5 octave 3 note A_, 4 note E_, 4 callchannel Music_Pokecenter_branch_bf60 note D_, 8 dutycycle 3 - notetype 12, 165 + notetype 12, $a5 octave 3 note D_, 4 note E_, 4 dutycycle 2 - notetype 12, 198 + notetype 12, $c6 octave 4 note F#, 8 note A_, 8 @@ -220,16 +220,16 @@ Music_Pokecenter_branch_befc: note D_, 8 loopchannel 0, Music_Pokecenter_branch_befc -Music_Pokecenter_branch_bf4e: +Music_Pokecenter_branch_bf4e:: dutycycle 2 - notetype 12, 194 + notetype 12, $c2 octave 4 note D_, 2 octave 3 note A_, 2 octave 4 note D_, 2 - notetype 12, 195 + notetype 12, $c3 note A_, 4 note G_, 4 note F#, 2 @@ -237,26 +237,26 @@ Music_Pokecenter_branch_bf4e: note C#, 6 endchannel -Music_Pokecenter_branch_bf60: +Music_Pokecenter_branch_bf60:: dutycycle 2 - notetype 12, 194 + notetype 12, $c2 octave 4 note C#, 2 octave 3 note A_, 2 octave 4 note C#, 2 - notetype 12, 195 + notetype 12, $c3 note F#, 4 note E_, 4 note C#, 2 endchannel -Music_Pokecenter_Ch3: ; bf70 (2:7f70) - notetype 12, 16 +Music_Pokecenter_Ch2:: + notetype 12, $10 -Music_Pokecenter_branch_bf72: +Music_Pokecenter_branch_bf72:: octave 4 note D_, 2 note F#, 2 @@ -346,7 +346,7 @@ Music_Pokecenter_branch_bf72: note E_, 2 loopchannel 0, Music_Pokecenter_branch_bf72 -Music_Pokecenter_branch_bfd9: +Music_Pokecenter_branch_bfd9:: note E_, 2 note A_, 2 note E_, 2 @@ -357,7 +357,7 @@ Music_Pokecenter_branch_bfd9: note A_, 2 endchannel -Music_Pokecenter_branch_bfe2: +Music_Pokecenter_branch_bfe2:: note E_, 2 note A_, 2 note E_, 2 @@ -368,7 +368,7 @@ Music_Pokecenter_branch_bfe2: note A_, 2 endchannel -Music_Pokecenter_branch_bfeb: +Music_Pokecenter_branch_bfeb:: note F#, 2 note A_, 2 note F#, 2 @@ -378,4 +378,3 @@ Music_Pokecenter_branch_bfeb: note F#, 2 note A_, 2 endchannel -; 0xbff4 \ No newline at end of file diff --git a/crysaudio/music/RBY/pokemontower.asm b/crysaudio/music/RBY/pokemontower.asm index da595df6..78727e0d 100644 --- a/crysaudio/music/RBY/pokemontower.asm +++ b/crysaudio/music/RBY/pokemontower.asm @@ -1,21 +1,21 @@ -Music_PokemonTower: - dbw $80, Music_PokemonTower_Ch1 - dbw $01, Music_PokemonTower_Ch2 - dbw $02, Music_PokemonTower_Ch3 +Music_PokemonTower:: + musicheader 3, 1, Music_PokemonTower_Ch0 + musicheader 1, 2, Music_PokemonTower_Ch1 + musicheader 1, 3, Music_PokemonTower_Ch2 -Music_PokemonTower_Ch1: ; 7f04a (1f:704a) +Music_PokemonTower_Ch0:: tempo 152 - volume 119 + volume $77 dutycycle 3 - - vibrato 12, 35 - notetype 12, 128 + ;toggleperfectpitch + vibrato 12, $23 + notetype 12, $80 note __, 4 octave 4 note B_, 12 -Music_PokemonTower_branch_7f05a: - notetype 12, 180 +Music_PokemonTower_branch_7f05a:: + notetype 12, $b4 octave 4 note G_, 1 note __, 7 @@ -89,10 +89,10 @@ Music_PokemonTower_branch_7f05a: note __, 7 note C_, 1 note __, 3 - notetype 12, 132 + notetype 12, $84 note C_, 1 note __, 3 - notetype 12, 180 + notetype 12, $b4 note D_, 1 note __, 7 note D_, 1 @@ -102,7 +102,7 @@ Music_PokemonTower_branch_7f05a: note __, 7 note A_, 1 note __, 7 - notetype 12, 167 + notetype 12, $a7 note B_, 8 note B_, 8 octave 4 @@ -110,13 +110,13 @@ Music_PokemonTower_branch_7f05a: note C_, 8 note C#, 8 note C#, 8 - notetype 12, 166 + notetype 12, $a6 note D_, 16 note __, 16 note __, 16 note __, 16 note __, 16 - notetype 12, 146 + notetype 12, $92 note B_, 4 octave 5 note E_, 4 @@ -145,27 +145,27 @@ Music_PokemonTower_branch_7f05a: loopchannel 0, Music_PokemonTower_branch_7f05a -Music_PokemonTower_Ch2: ; 7f0e3 (1f:70e3) - vibrato 20, 52 +Music_PokemonTower_Ch1:: + vibrato 20, $34 dutycycle 3 - notetype 12, 160 + notetype 12, $a0 octave 5 note C_, 12 octave 4 note E_, 4 -Music_PokemonTower_branch_7f0ee: - notetype 12, 193 +Music_PokemonTower_branch_7f0ee:: + notetype 12, $c1 octave 5 note C_, 8 octave 4 note B_, 4 - notetype 12, 196 + notetype 12, $c4 note G_, 1 note F#, 1 note E_, 1 note D#, 1 - notetype 12, 176 + notetype 12, $b0 note G_, 8 octave 5 note C_, 8 @@ -176,18 +176,18 @@ Music_PokemonTower_branch_7f0ee: note G_, 4 octave 5 note C_, 8 - notetype 12, 183 + notetype 12, $b7 note C_, 8 - notetype 12, 194 + notetype 12, $c2 octave 4 note G_, 1 note F#, 1 note E_, 1 note __, 1 - notetype 12, 150 + notetype 12, $96 octave 3 note G_, 4 - notetype 12, 199 + notetype 12, $c7 note G_, 4 note B_, 4 note G_, 4 @@ -196,13 +196,13 @@ Music_PokemonTower_branch_7f0ee: note C_, 4 octave 3 note B_, 4 - notetype 12, 176 + notetype 12, $b0 octave 4 note C_, 16 note E_, 8 - notetype 12, 183 + notetype 12, $b7 note E_, 12 - notetype 12, 197 + notetype 12, $c5 octave 5 note C_, 4 octave 4 @@ -212,39 +212,39 @@ Music_PokemonTower_branch_7f0ee: note G_, 4 note F#, 4 note E_, 4 - notetype 12, 176 + notetype 12, $b0 note F#, 12 note G_, 4 - notetype 12, 176 + notetype 12, $b0 note F#, 8 - notetype 12, 183 + notetype 12, $b7 note F#, 8 - notetype 12, 176 + notetype 12, $b0 note B_, 4 note G_, 4 note F#, 4 note E_, 4 note B_, 16 - notetype 12, 176 + notetype 12, $b0 octave 5 note C_, 4 octave 4 note G_, 4 note F#, 4 note E_, 4 - notetype 12, 144 + notetype 12, $90 octave 5 note C_, 16 - notetype 12, 176 + notetype 12, $b0 note D_, 4 octave 4 note A_, 4 note G#, 4 note F#, 4 - notetype 12, 47 + notetype 12, $2f octave 5 note D_, 16 - notetype 12, 192 + notetype 12, $c0 note E_, 4 octave 4 note B_, 4 @@ -266,20 +266,20 @@ Music_PokemonTower_branch_7f0ee: note F#, 4 note E_, 4 note D_, 4 - notetype 12, 176 + notetype 12, $b0 note C_, 8 - notetype 12, 144 + notetype 12, $90 note C_, 8 - notetype 12, 128 + notetype 12, $80 note C_, 8 - notetype 12, 112 + notetype 12, $70 note C_, 8 - notetype 12, 96 + notetype 12, $60 note C_, 8 - notetype 12, 103 + notetype 12, $67 note C_, 8 note __, 16 - notetype 12, 160 + notetype 12, $a0 octave 5 note G_, 16 octave 6 @@ -291,20 +291,20 @@ Music_PokemonTower_branch_7f0ee: note G_, 8 octave 6 note C_, 16 - vibrato 0, 52 - notetype 12, 167 + vibrato 0, $34 + notetype 12, $a7 note C_, 16 loopchannel 0, Music_PokemonTower_branch_7f0ee -Music_PokemonTower_Ch3: ; 7f19a (1f:719a) - vibrato 4, 17 - notetype 12, 19 +Music_PokemonTower_Ch2:: + vibrato 4, $11 + notetype 12, $13 note __, 8 octave 5 note G_, 8 -Music_PokemonTower_branch_7f1a2: +Music_PokemonTower_branch_7f1a2:: note E_, 1 note __, 7 note E_, 1 @@ -430,7 +430,7 @@ Music_PokemonTower_branch_7f1a2: note __, 3 note F#, 1 note __, 7 - notetype 12, 19 + notetype 12, $13 octave 6 note E_, 1 note __, 1 @@ -462,4 +462,3 @@ Music_PokemonTower_branch_7f1a2: note D#, 1 note __, 1 loopchannel 0, Music_PokemonTower_branch_7f1a2 -; 0x7f243 \ No newline at end of file diff --git a/crysaudio/music/RBY/routes1.asm b/crysaudio/music/RBY/routes1.asm index 96c21130..398c93cd 100644 --- a/crysaudio/music/RBY/routes1.asm +++ b/crysaudio/music/RBY/routes1.asm @@ -1,18 +1,18 @@ -Music_Routes1: - dbw $C0, Music_Routes1_Ch1 - dbw $01, Music_Routes1_Ch2 - dbw $02, Music_Routes1_Ch3 - dbw $03, Music_Routes1_Ch4 +Music_Routes1:: + musicheader 4, 1, Music_Routes1_Ch0 + musicheader 1, 2, Music_Routes1_Ch1 + musicheader 1, 3, Music_Routes1_Ch2 + musicheader 1, 4, Music_Routes1_Ch3 -Music_Routes1_Ch1: ; 9bde (2:5bde) +Music_Routes1_Ch0:: tempo 152 - volume 119 - vibrato 4, 35 + volume $77 + vibrato 4, $23 dutycycle 2 - + ;toggleperfectpitch -Music_Routes1_branch_9be9: - notetype 12, 161 +Music_Routes1_branch_9be9:: + notetype 12, $a1 note __, 4 octave 4 note D_, 2 @@ -69,12 +69,12 @@ Music_Routes1_branch_9be9: note E_, 2 octave 3 note A_, 2 - notetype 12, 162 + notetype 12, $a2 octave 4 note G_, 4 note E_, 4 note F#, 2 - notetype 12, 161 + notetype 12, $a1 octave 3 note A_, 2 note A_, 6 @@ -112,18 +112,18 @@ Music_Routes1_branch_9be9: endchannel -Music_Routes1_Ch2: ; 9c51 (2:5c51) +Music_Routes1_Ch1:: dutycycle 2 -Music_Routes1_branch_9c53: - notetype 12, 209 +Music_Routes1_branch_9c53:: + notetype 12, $d1 callchannel Music_Routes1_branch_9c65 callchannel Music_Routes1_branch_9c78 callchannel Music_Routes1_branch_9c65 callchannel Music_Routes1_branch_9c8d loopchannel 0, Music_Routes1_branch_9c53 -Music_Routes1_branch_9c65: +Music_Routes1_branch_9c65:: octave 4 note D_, 1 note E_, 1 @@ -144,7 +144,7 @@ Music_Routes1_branch_9c65: note E_, 6 endchannel -Music_Routes1_branch_9c78: +Music_Routes1_branch_9c78:: note C#, 1 note D_, 1 note E_, 2 @@ -167,7 +167,7 @@ Music_Routes1_branch_9c78: note F#, 2 endchannel -Music_Routes1_branch_9c8d: +Music_Routes1_branch_9c8d:: note C#, 1 note D_, 1 note E_, 2 @@ -180,21 +180,21 @@ Music_Routes1_branch_9c8d: note B_, 2 octave 4 note C#, 2 - notetype 12, 210 + notetype 12, $d2 note B_, 4 - notetype 6, 209 + notetype 6, $d1 octave 3 note B_, 1 octave 4 note C#, 1 - notetype 12, 209 + notetype 12, $d1 octave 3 note B_, 1 note A_, 1 octave 4 note C#, 1 note D_, 6 - notetype 12, 210 + notetype 12, $d2 note F#, 1 note G_, 1 note A_, 2 @@ -232,7 +232,7 @@ Music_Routes1_branch_9c8d: note C#, 2 note E_, 2 note D_, 2 - notetype 12, 209 + notetype 12, $d1 octave 4 note D_, 2 note D_, 2 @@ -240,11 +240,11 @@ Music_Routes1_branch_9c8d: endchannel -Music_Routes1_Ch3: ; 9cd8 (2:5cd8) - vibrato 8, 37 - notetype 12, 19 +Music_Routes1_Ch2:: + vibrato 8, $25 + notetype 12, $13 -Music_Routes1_branch_9cdd: +Music_Routes1_branch_9cdd:: note __, 2 octave 4 note D_, 4 @@ -315,10 +315,9 @@ Music_Routes1_branch_9cdd: endchannel -Music_Routes1_Ch4: ; 9d24 (2:5d24) - notetype 12 +Music_Routes1_Ch3:: togglenoise 1 -Music_Routes1_Loop4: + notetype 12 note __, 4 note G_, 2 note __, 2 @@ -408,6 +407,5 @@ Music_Routes1_Loop4: note __, 2 note G_, 2 note G_, 2 - loopchannel 0, Music_Routes1_Loop4 + loopchannel 0, Music_Routes1_Ch3 endchannel -; 0x9db9 \ No newline at end of file diff --git a/crysaudio/music/RBY/routes2.asm b/crysaudio/music/RBY/routes2.asm index 7428d060..6bcc041b 100644 --- a/crysaudio/music/RBY/routes2.asm +++ b/crysaudio/music/RBY/routes2.asm @@ -1,17 +1,17 @@ -Music_Routes2: - dbw $C0, Music_Routes2_Ch1 - dbw $01, Music_Routes2_Ch2 - dbw $02, Music_Routes2_Ch3 - dbw $03, Music_Routes2_Ch4 +Music_Routes2:: + musicheader 4, 1, Music_Routes2_Ch0 + musicheader 1, 2, Music_Routes2_Ch1 + musicheader 1, 3, Music_Routes2_Ch2 + musicheader 1, 4, Music_Routes2_Ch3 -Music_Routes2_Ch1: ; 9db9 (2:5db9) +Music_Routes2_Ch0:: tempo 152 - volume 119 - vibrato 9, 37 + volume $77 + vibrato 9, $25 dutycycle 1 -Music_Routes2_branch_9dc3: - notetype 12, 178 +Music_Routes2_branch_9dc3:: + notetype 12, $b2 octave 2 note B_, 4 octave 3 @@ -44,7 +44,7 @@ Music_Routes2_branch_9dc3: note A_, 2 note G#, 4 note B_, 4 - notetype 8, 178 + notetype 8, $b2 octave 4 note E_, 2 octave 3 @@ -148,12 +148,12 @@ Music_Routes2_branch_9dc3: endchannel -Music_Routes2_Ch2: ; 9e4f (2:5e4f) - vibrato 8, 38 +Music_Routes2_Ch1:: + vibrato 8, $26 dutycycle 3 -Music_Routes2_branch_9e54: - notetype 12, 212 +Music_Routes2_branch_9e54:: + notetype 12, $d4 octave 4 note E_, 6 octave 3 @@ -222,11 +222,11 @@ Music_Routes2_branch_9e54: endchannel -Music_Routes2_Ch3: ; 9e9b (2:5e9b) - vibrato 9, 40 +Music_Routes2_Ch2:: + vibrato 9, $28 -Music_Routes2_branch_9e9e: - notetype 12, 17 +Music_Routes2_branch_9e9e:: + notetype 12, $11 octave 3 note E_, 2 note __, 2 @@ -330,9 +330,8 @@ Music_Routes2_branch_9e9e: endchannel -Music_Routes2_Ch4: ; 9f08 (2:5f08) +Music_Routes2_Ch3:: togglenoise 0 -Music_Routes2_Loop4: notetype 12 note D_, 2 note __, 2 @@ -429,6 +428,5 @@ Music_Routes2_Loop4: note __, 3 note D_, 3 note __, 3 - loopchannel 0, Music_Routes2_Loop4 + loopchannel 0, Music_Routes2_Ch3 endchannel -; 0x9fad \ No newline at end of file diff --git a/crysaudio/music/RBY/routes3.asm b/crysaudio/music/RBY/routes3.asm index 144f4e52..a6c22731 100644 --- a/crysaudio/music/RBY/routes3.asm +++ b/crysaudio/music/RBY/routes3.asm @@ -1,16 +1,16 @@ -Music_Routes3: - dbw $C0, Music_Routes3_Ch1 - dbw $01, Music_Routes3_Ch2 - dbw $02, Music_Routes3_Ch3 - dbw $03, Music_Routes3_Ch4 +Music_Routes3:: + musicheader 4, 1, Music_Routes3_Ch0 + musicheader 1, 2, Music_Routes3_Ch1 + musicheader 1, 3, Music_Routes3_Ch2 + musicheader 1, 4, Music_Routes3_Ch3 -Music_Routes3_Ch1: ; 9fad (2:5fad) +Music_Routes3_Ch0:: tempo 148 - volume 119 + volume $77 dutycycle 3 - vibrato 6, 52 - - notetype 12, 181 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b5 octave 3 note E_, 1 note F#, 1 @@ -21,8 +21,8 @@ Music_Routes3_Ch1: ; 9fad (2:5fad) note __, 16 note __, 15 -Music_Routes3_branch_9fc3: - notetype 12, 181 +Music_Routes3_branch_9fc3:: + notetype 12, $b5 note E_, 6 note D_, 1 note E_, 1 @@ -35,12 +35,12 @@ Music_Routes3_branch_9fc3: note G_, 2 note G_, 2 note A_, 2 - notetype 12, 167 + notetype 12, $a7 note A#, 8 note F_, 8 note D_, 8 note F_, 8 - notetype 12, 181 + notetype 12, $b5 note E_, 6 note D_, 1 note E_, 1 @@ -53,12 +53,12 @@ Music_Routes3_branch_9fc3: note G_, 2 note G_, 2 note A_, 2 - notetype 12, 167 + notetype 12, $a7 note A#, 8 note A#, 8 note D_, 8 note F_, 8 - notetype 12, 181 + notetype 12, $b5 note E_, 4 note E_, 2 note F_, 2 @@ -71,22 +71,22 @@ Music_Routes3_branch_9fc3: octave 3 note B_, 8 note A_, 2 - notetype 8, 195 + notetype 8, $c3 note A_, 4 note F_, 4 note A_, 4 - notetype 8, 79 + notetype 8, $4f note A_, 12 - notetype 8, 144 + notetype 8, $90 note F_, 12 note G_, 12 loopchannel 0, Music_Routes3_branch_9fc3 -Music_Routes3_Ch2: ; a009 (2:6009) - vibrato 8, 35 +Music_Routes3_Ch1:: + vibrato 8, $23 dutycycle 2 - notetype 12, 199 + notetype 12, $c7 octave 3 note G_, 1 note A#, 1 @@ -98,8 +98,8 @@ Music_Routes3_Ch2: ; a009 (2:6009) note __, 15 note __, 16 -Music_Routes3_branch_a01a: - notetype 12, 199 +Music_Routes3_branch_a01a:: + notetype 12, $c7 dutycycle 2 octave 4 note C_, 6 @@ -119,12 +119,12 @@ Music_Routes3_branch_a01a: note C_, 2 note D_, 8 note F_, 8 - notetype 12, 197 + notetype 12, $c5 dutycycle 3 octave 3 note A#, 8 note A_, 8 - notetype 12, 199 + notetype 12, $c7 dutycycle 2 octave 4 note C_, 6 @@ -144,13 +144,13 @@ Music_Routes3_branch_a01a: note C_, 2 note D_, 8 note F_, 8 - notetype 12, 197 + notetype 12, $c5 dutycycle 3 octave 3 note A#, 8 octave 4 note D_, 6 - notetype 12, 199 + notetype 12, $c7 dutycycle 2 note C_, 1 note D_, 1 @@ -169,14 +169,14 @@ Music_Routes3_branch_a01a: note G_, 8 note F_, 1 note E_, 1 - notetype 8, 211 + notetype 8, $d3 note F_, 4 note E_, 4 - notetype 8, 196 + notetype 8, $c4 note C_, 4 - notetype 8, 197 + notetype 8, $c5 note C_, 12 - notetype 12, 160 + notetype 12, $a0 dutycycle 3 octave 3 note A_, 8 @@ -184,9 +184,9 @@ Music_Routes3_branch_a01a: loopchannel 0, Music_Routes3_branch_a01a -Music_Routes3_Ch3: ; a07f (2:607f) - vibrato 4, 16 - notetype 6, 18 +Music_Routes3_Ch2:: + vibrato 4, $10 + notetype 6, $12 octave 4 note G_, 2 note A#, 2 @@ -219,8 +219,8 @@ Music_Routes3_Ch3: ; a07f (2:607f) note __, 2 note G_, 8 -Music_Routes3_branch_a0a3: - notetype 12, 18 +Music_Routes3_branch_a0a3:: + notetype 12, $12 note E_, 1 note __, 1 note G_, 4 @@ -360,9 +360,9 @@ Music_Routes3_branch_a0a3: loopchannel 0, Music_Routes3_branch_a0a3 -Music_Routes3_Ch4: ; a131 (2:6131) - notetype 6 +Music_Routes3_Ch3:: togglenoise 1 + notetype 6 note B_, 1 note B_, 1 note A#, 1 @@ -400,7 +400,7 @@ Music_Routes3_Ch4: ; a131 (2:6131) note A#, 1 note A#, 1 -Music_Routes3_branch_a17a: +Music_Routes3_branch_a17a:: note A_, 12 note A_, 2 note A#, 2 @@ -520,4 +520,3 @@ Music_Routes3_branch_a17a: note A#, 1 note A#, 1 loopchannel 0, Music_Routes3_branch_a17a -; 0xa26a \ No newline at end of file diff --git a/crysaudio/music/RBY/routes4.asm b/crysaudio/music/RBY/routes4.asm index 0be763ea..eef93c63 100644 --- a/crysaudio/music/RBY/routes4.asm +++ b/crysaudio/music/RBY/routes4.asm @@ -1,35 +1,35 @@ -Music_Routes4: - dbw $C0, Music_Routes4_Ch1 - dbw $01, Music_Routes4_Ch2 - dbw $02, Music_Routes4_Ch3 - dbw $03, Music_Routes4_Ch4 +Music_Routes4:: + musicheader 4, 1, Music_Routes4_Ch0 + musicheader 1, 2, Music_Routes4_Ch1 + musicheader 1, 3, Music_Routes4_Ch2 + musicheader 1, 4, Music_Routes4_Ch3 -Music_Routes4_Ch1: ; a26a (2:626a) +Music_Routes4_Ch0:: tempo 148 - volume 119 + volume $77 dutycycle 3 - vibrato 10, 52 - - notetype 12, 162 + vibrato 10, $34 + ;toggleperfectpitch + notetype 12, $a2 octave 2 note G#, 4 note G#, 4 note G#, 4 - notetype 12, 127 + notetype 12, $7f note G#, 4 - notetype 12, 162 + notetype 12, $a2 note G#, 4 note G#, 4 note G#, 4 - notetype 12, 183 + notetype 12, $b7 note B_, 1 octave 3 note E_, 1 note F#, 1 note B_, 1 -Music_Routes4_branch_a28a: - notetype 12, 183 +Music_Routes4_branch_a28a:: + notetype 12, $b7 note B_, 6 note E_, 2 note E_, 4 @@ -40,9 +40,9 @@ Music_Routes4_branch_a28a: octave 3 note B_, 4 note A_, 4 - notetype 12, 177 + notetype 12, $b1 note G#, 3 - notetype 12, 183 + notetype 12, $b7 note E_, 1 note F#, 12 note E_, 8 @@ -59,9 +59,9 @@ Music_Routes4_branch_a28a: note B_, 4 octave 4 note C#, 4 - notetype 12, 177 + notetype 12, $b1 note E_, 3 - notetype 12, 183 + notetype 12, $b7 note D#, 1 note E_, 12 octave 3 @@ -107,7 +107,7 @@ Music_Routes4_branch_a28a: note F#, 2 note G#, 2 note B_, 2 - notetype 8, 181 + notetype 8, $b5 note A_, 4 note G#, 4 note F#, 4 @@ -144,25 +144,25 @@ Music_Routes4_branch_a28a: loopchannel 0, Music_Routes4_branch_a28a -Music_Routes4_Ch2: ; a304 (2:6304) - vibrato 12, 36 +Music_Routes4_Ch1:: + vibrato 12, $24 dutycycle 1 - notetype 12, 146 + notetype 12, $92 octave 3 note E_, 3 note F#, 1 - notetype 12, 144 + notetype 12, $90 note E_, 12 - notetype 12, 146 + notetype 12, $92 octave 2 note B_, 3 octave 3 note C_, 1 - notetype 12, 144 + notetype 12, $90 octave 2 note B_, 8 dutycycle 3 - notetype 12, 199 + notetype 12, $c7 octave 3 note E_, 1 note F#, 1 @@ -170,8 +170,8 @@ Music_Routes4_Ch2: ; a304 (2:6304) octave 4 note D#, 1 -Music_Routes4_branch_a325: - notetype 12, 199 +Music_Routes4_branch_a325:: + notetype 12, $c7 note E_, 6 octave 3 note B_, 2 @@ -185,17 +185,17 @@ Music_Routes4_branch_a325: note A_, 1 note G#, 1 note F#, 1 - notetype 12, 194 + notetype 12, $c2 note G#, 3 note E_, 1 - notetype 12, 160 + notetype 12, $a0 octave 3 note B_, 12 dutycycle 0 - notetype 12, 194 + notetype 12, $c2 octave 2 note B_, 3 - notetype 12, 199 + notetype 12, $c7 octave 3 note C_, 1 octave 2 @@ -219,83 +219,83 @@ Music_Routes4_branch_a325: octave 4 note B_, 1 note A_, 1 - notetype 12, 194 + notetype 12, $c2 note B_, 3 - notetype 12, 199 + notetype 12, $c7 note A_, 1 - notetype 12, 176 + notetype 12, $b0 note G#, 6 - notetype 12, 144 + notetype 12, $90 note G#, 6 - notetype 12, 112 + notetype 12, $70 note G#, 6 - notetype 12, 111 + notetype 12, $6f note G#, 6 - notetype 12, 199 + notetype 12, $c7 note G#, 4 - notetype 8, 195 + notetype 8, $c3 note A_, 4 note G#, 4 note F#, 4 - notetype 8, 144 + notetype 8, $90 note F#, 6 - notetype 8, 127 + notetype 8, $7f note F#, 6 dutycycle 0 - notetype 8, 144 + notetype 8, $90 octave 3 note F#, 4 note E_, 4 note F#, 4 note A_, 6 dutycycle 3 - notetype 8, 199 + notetype 8, $c7 octave 4 note F#, 6 note G#, 4 note F#, 4 - notetype 8, 196 + notetype 8, $c4 note E_, 4 - notetype 8, 160 + notetype 8, $a0 note E_, 12 dutycycle 0 - notetype 8, 144 + notetype 8, $90 octave 3 note E_, 4 note D#, 4 note E_, 4 note G#, 6 dutycycle 3 - notetype 8, 199 + notetype 8, $c7 octave 4 note E_, 6 note F#, 4 note D#, 4 octave 3 note B_, 4 - notetype 8, 160 + notetype 8, $a0 octave 4 note B_, 16 - notetype 8, 167 + notetype 8, $a7 note B_, 8 - notetype 8, 176 + notetype 8, $b0 note A_, 6 - notetype 8, 183 + notetype 8, $b7 note A_, 6 - notetype 12, 167 + notetype 12, $a7 note G#, 1 note F#, 1 - notetype 12, 176 + notetype 12, $b0 note E_, 12 - notetype 12, 160 + notetype 12, $a0 note E_, 8 - notetype 12, 167 + notetype 12, $a7 note E_, 10 loopchannel 0, Music_Routes4_branch_a325 -Music_Routes4_Ch3: ; a3c4 (2:63c4) - notetype 12, 16 +Music_Routes4_Ch2:: + notetype 12, $10 octave 4 note E_, 1 note __, 3 @@ -314,7 +314,7 @@ Music_Routes4_Ch3: ; a3c4 (2:63c4) note D#, 1 note __, 3 -Music_Routes4_branch_a3d7: +Music_Routes4_branch_a3d7:: note E_, 1 note __, 3 note E_, 1 @@ -512,9 +512,9 @@ Music_Routes4_branch_a3d7: loopchannel 0, Music_Routes4_branch_a3d7 -Music_Routes4_Ch4: ; a49d (2:649d) - notetype 12 +Music_Routes4_Ch3:: togglenoise 1 + notetype 12 note __, 16 note __, 12 note B_, 1 @@ -522,7 +522,7 @@ Music_Routes4_Ch4: ; a49d (2:649d) note A#, 1 note A#, 1 -Music_Routes4_branch_a4a8: +Music_Routes4_branch_a4a8:: note A_, 4 note B_, 1 note B_, 1 @@ -686,4 +686,3 @@ Music_Routes4_branch_a4a8: note A_, 2 note A_, 2 loopchannel 0, Music_Routes4_branch_a4a8 -; 0xa5f0 \ No newline at end of file diff --git a/crysaudio/music/RBY/safarizone.asm b/crysaudio/music/RBY/safarizone.asm index 917c6e4b..c44f8e2e 100644 --- a/crysaudio/music/RBY/safarizone.asm +++ b/crysaudio/music/RBY/safarizone.asm @@ -1,38 +1,38 @@ -Music_SafariZone: - dbw $80, Music_SafariZone_Ch1 - dbw $01, Music_SafariZone_Ch2 - dbw $02, Music_SafariZone_Ch3 +Music_SafariZone:: + musicheader 3, 1, Music_SafariZone_Ch0 + musicheader 1, 2, Music_SafariZone_Ch1 + musicheader 1, 3, Music_SafariZone_Ch2 -Music_SafariZone_Ch1: ; bc2e (2:7c2e) +Music_SafariZone_Ch0:: tempo 132 - volume 119 - vibrato 6, 52 - + volume $77 + vibrato 6, $34 + ;toggleperfectpitch dutycycle 2 - notetype 12, 146 + notetype 12, $92 octave 3 - slidepitchto 1, 4, A_ + slidepitchto 1, 4, G# note C_, 1 - slidepitchto 1, 4, A_ + slidepitchto 1, 4, G# note G_, 1 - slidepitchto 1, 4, A_ + slidepitchto 1, 4, G# note C_, 1 - slidepitchto 1, 4, A_ + slidepitchto 1, 4, G# note G_, 1 note __, 4 dutycycle 3 -Music_SafariZone_branch_bc4f: +Music_SafariZone_branch_bc4f:: callchannel Music_SafariZone_branch_bc5f - notetype 12, 164 + notetype 12, $a4 note F#, 4 callchannel Music_SafariZone_branch_bc5f - notetype 12, 164 + notetype 12, $a4 note F#, 4 loopchannel 0, Music_SafariZone_branch_bc4f -Music_SafariZone_branch_bc5f: - notetype 12, 162 +Music_SafariZone_branch_bc5f:: + notetype 12, $a2 octave 3 note C_, 4 note G_, 4 @@ -44,10 +44,10 @@ Music_SafariZone_branch_bc5f: endchannel -Music_SafariZone_Ch2: ; bc6a (2:7c6a) +Music_SafariZone_Ch1:: dutycycle 2 - vibrato 8, 37 - notetype 12, 162 + vibrato 8, $25 + notetype 12, $a2 octave 4 note G_, 1 note D_, 1 @@ -56,17 +56,17 @@ Music_SafariZone_Ch2: ; bc6a (2:7c6a) note __, 4 dutycycle 3 -Music_SafariZone_branch_bc79: +Music_SafariZone_branch_bc79:: callchannel Music_SafariZone_branch_bc89 - notetype 12, 181 + notetype 12, $b5 note A_, 4 callchannel Music_SafariZone_branch_bc89 - notetype 12, 181 + notetype 12, $b5 note B_, 4 loopchannel 0, Music_SafariZone_branch_bc79 -Music_SafariZone_branch_bc89: - notetype 12, 178 +Music_SafariZone_branch_bc89:: + notetype 12, $b2 octave 3 note G_, 4 note D_, 4 @@ -78,11 +78,11 @@ Music_SafariZone_branch_bc89: endchannel -Music_SafariZone_Ch3: ; bc94 (2:7c94) - notetype 12, 16 +Music_SafariZone_Ch2:: + notetype 12, $10 note __, 8 -Music_SafariZone_branch_bc97: +Music_SafariZone_branch_bc97:: callchannel Music_SafariZone_branch_bca5 octave 4 note A_, 4 @@ -91,7 +91,7 @@ Music_SafariZone_branch_bc97: note B_, 4 loopchannel 0, Music_SafariZone_branch_bc97 -Music_SafariZone_branch_bca5: +Music_SafariZone_branch_bca5:: octave 3 note A_, 2 note __, 2 @@ -114,4 +114,3 @@ Music_SafariZone_branch_bca5: note A_, 2 note __, 2 endchannel -; 0xbcbb \ No newline at end of file diff --git a/crysaudio/music/RBY/silphco.asm b/crysaudio/music/RBY/silphco.asm index 19507778..83398588 100644 --- a/crysaudio/music/RBY/silphco.asm +++ b/crysaudio/music/RBY/silphco.asm @@ -1,14 +1,15 @@ -Music_SilphCo: - dbw $80, Music_SilphCo_Ch1 - dbw $01, Music_SilphCo_Ch2 - dbw $02, Music_SilphCo_Ch3 +Music_SilphCo:: + musicheader 3, 1, Music_SilphCo_Ch0 + musicheader 1, 2, Music_SilphCo_Ch1 + musicheader 1, 3, Music_SilphCo_Ch2 -Music_SilphCo_Ch1: ; 7f243 (1f:7243) +Music_SilphCo_Ch0:: tempo 160 - volume 119 + volume $77 dutycycle 3 - vibrato 8, 34 - notetype 6, 179 + ;toggleperfectpitch + vibrato 8, $22 + notetype 6, $b3 octave 2 note E_, 1 note F#, 1 @@ -16,9 +17,9 @@ Music_SilphCo_Ch1: ; 7f243 (1f:7243) note A#, 1 octave 3 note C_, 1 - notetype 6, 160 + notetype 6, $a0 note C_, 12 - notetype 6, 179 + notetype 6, $b3 note C_, 2 octave 2 note B_, 1 @@ -37,7 +38,7 @@ Music_SilphCo_Ch1: ; 7f243 (1f:7243) note B_, 2 note __, 2 -Music_SilphCo_branch_7f26d: +Music_SilphCo_branch_7f26d:: note G_, 2 note __, 2 note B_, 2 @@ -74,9 +75,9 @@ Music_SilphCo_branch_7f26d: note F#, 1 note G#, 1 note A_, 1 - notetype 6, 160 + notetype 6, $a0 note B_, 12 - notetype 6, 179 + notetype 6, $b3 note B_, 1 note A_, 1 note G_, 1 @@ -87,10 +88,10 @@ Music_SilphCo_branch_7f26d: note G#, 1 note A#, 1 note B_, 1 - notetype 6, 160 + notetype 6, $a0 octave 3 note C_, 12 - notetype 6, 179 + notetype 6, $b3 note C_, 1 octave 2 note B_, 1 @@ -103,9 +104,9 @@ Music_SilphCo_branch_7f26d: octave 3 note C_, 1 note C#, 1 - notetype 6, 160 + notetype 6, $a0 note D_, 12 - notetype 6, 179 + notetype 6, $b3 note D_, 1 note C_, 1 octave 2 @@ -117,10 +118,10 @@ Music_SilphCo_branch_7f26d: note G#, 1 note A#, 1 note B_, 1 - notetype 6, 160 + notetype 6, $a0 octave 3 note C_, 12 - notetype 6, 179 + notetype 6, $b3 note C_, 1 octave 2 note B_, 1 @@ -128,13 +129,13 @@ Music_SilphCo_branch_7f26d: note F_, 1 note E_, 1 note __, 7 - notetype 6, 128 + notetype 6, $80 note B_, 16 - notetype 6, 176 + notetype 6, $b0 octave 3 note E_, 8 tempo 124 - notetype 6, 179 + notetype 6, $b3 octave 2 note B_, 2 note __, 10 @@ -286,41 +287,41 @@ Music_SilphCo_branch_7f26d: note G#, 1 note F#, 1 note E_, 1 - notetype 6, 96 + notetype 6, $60 note E_, 16 note E_, 11 - notetype 6, 179 + notetype 6, $b3 note E_, 1 note F#, 1 note G#, 1 note A#, 1 octave 3 note C_, 1 - notetype 6, 63 + notetype 6, $3f note C_, 16 - notetype 6, 160 + notetype 6, $a0 note C_, 11 - notetype 6, 147 + notetype 6, $93 octave 2 note B_, 1 note A#, 1 note G#, 1 note F#, 1 note E_, 1 - notetype 6, 63 + notetype 6, $3f note E_, 16 - notetype 6, 144 + notetype 6, $90 note E_, 11 - notetype 6, 179 + notetype 6, $b3 note F_, 1 note G_, 1 note A#, 1 octave 3 note C_, 1 note D_, 1 - notetype 6, 63 + notetype 6, $3f note D_, 16 - notetype 6, 167 + notetype 6, $a7 note D_, 11 note __, 4 note __, 4 @@ -348,19 +349,19 @@ Music_SilphCo_branch_7f26d: note __, 4 tempo 160 note __, 4 - notetype 6, 67 + notetype 6, $43 octave 2 note B_, 2 note __, 6 - notetype 6, 99 + notetype 6, $63 note B_, 2 note __, 6 - notetype 6, 131 + notetype 6, $83 note B_, 2 note __, 6 - notetype 6, 80 + notetype 6, $50 note B_, 8 - notetype 6, 179 + notetype 6, $b3 note B_, 2 note __, 6 note B_, 2 @@ -371,7 +372,7 @@ Music_SilphCo_branch_7f26d: note __, 2 loopchannel 0, Music_SilphCo_branch_7f26d -Music_SilphCo_branch_7f3f0: +Music_SilphCo_branch_7f3f0:: octave 2 note B_, 2 note A#, 2 @@ -399,10 +400,10 @@ Music_SilphCo_branch_7f3f0: endchannel -Music_SilphCo_Ch2: ; 7f409 (1f:7409) - vibrato 10, 50 +Music_SilphCo_Ch1:: + vibrato 10, $32 dutycycle 3 - notetype 6, 195 + notetype 6, $c3 octave 3 note E_, 1 note F#, 1 @@ -410,9 +411,9 @@ Music_SilphCo_Ch2: ; 7f409 (1f:7409) note A#, 1 octave 4 note C_, 1 - notetype 6, 176 + notetype 6, $b0 note C_, 12 - notetype 6, 195 + notetype 6, $c3 note C_, 2 octave 3 note B_, 1 @@ -432,7 +433,7 @@ Music_SilphCo_Ch2: ; 7f409 (1f:7409) note G#, 2 note __, 2 -Music_SilphCo_branch_7f42e: +Music_SilphCo_branch_7f42e:: note E_, 2 note __, 2 note G_, 2 @@ -461,7 +462,7 @@ Music_SilphCo_branch_7f42e: note __, 6 note G#, 2 note __, 2 - notetype 6, 183 + notetype 6, $b7 dutycycle 2 octave 4 note E_, 8 @@ -481,11 +482,11 @@ Music_SilphCo_branch_7f42e: note D_, 8 note D#, 8 dutycycle 3 - notetype 6, 111 + notetype 6, $6f note E_, 16 - notetype 6, 192 + notetype 6, $c0 note B_, 16 - notetype 6, 196 + notetype 6, $c4 octave 3 note E_, 4 note D#, 4 @@ -503,7 +504,7 @@ Music_SilphCo_branch_7f42e: note D#, 4 note D_, 4 note D#, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 octave 4 note E_, 4 @@ -515,7 +516,7 @@ Music_SilphCo_branch_7f42e: note D_, 4 note D#, 4 note E_, 4 - notetype 6, 196 + notetype 6, $c4 dutycycle 3 octave 3 note F_, 4 @@ -528,32 +529,32 @@ Music_SilphCo_branch_7f42e: note E_, 4 note D#, 4 note E_, 4 - notetype 6, 192 + notetype 6, $c0 note F_, 8 - notetype 6, 183 + notetype 6, $b7 note F_, 8 - notetype 6, 138 + notetype 6, $8a note F_, 4 - notetype 6, 196 + notetype 6, $c4 dutycycle 3 note F_, 4 note E_, 4 note F_, 4 - notetype 6, 160 + notetype 6, $a0 note F#, 8 - notetype 6, 176 + notetype 6, $b0 note F#, 8 - notetype 6, 153 + notetype 6, $99 note F#, 4 - notetype 6, 196 + notetype 6, $c4 note F#, 4 note F_, 4 note F#, 4 - notetype 6, 144 + notetype 6, $90 note G_, 12 - notetype 6, 89 + notetype 6, $59 note G_, 8 - notetype 6, 196 + notetype 6, $c4 note G_, 4 note F#, 4 note G_, 4 @@ -570,43 +571,43 @@ Music_SilphCo_branch_7f42e: note D_, 4 note D#, 4 note D_, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note A_, 4 - notetype 6, 180 + notetype 6, $b4 dutycycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note A#, 4 - notetype 6, 180 + notetype 6, $b4 dutycycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 note F_, 4 note F#, 4 note G_, 4 note G#, 4 note B_, 4 - notetype 6, 180 + notetype 6, $b4 dutycycle 3 note D#, 4 note D_, 4 note D#, 4 - notetype 6, 194 + notetype 6, $c2 dutycycle 1 note F_, 4 note F#, 4 @@ -614,7 +615,7 @@ Music_SilphCo_branch_7f42e: note G#, 4 octave 4 note C_, 4 - notetype 6, 180 + notetype 6, $b4 dutycycle 3 octave 3 note D#, 4 @@ -741,7 +742,7 @@ Music_SilphCo_branch_7f42e: octave 3 note G_, 2 note __, 2 - notetype 6, 135 + notetype 6, $87 octave 5 note E_, 4 note D#, 4 @@ -760,19 +761,19 @@ Music_SilphCo_branch_7f42e: note D_, 4 note D#, 4 note __, 4 - notetype 6, 67 + notetype 6, $43 octave 2 note G_, 2 note __, 6 - notetype 6, 99 + notetype 6, $63 note F#, 2 note __, 6 - notetype 6, 131 + notetype 6, $83 note G_, 2 note __, 6 - notetype 6, 79 + notetype 6, $4f note G#, 8 - notetype 6, 180 + notetype 6, $b4 note G_, 2 note __, 6 note F#, 2 @@ -784,9 +785,9 @@ Music_SilphCo_branch_7f42e: loopchannel 0, Music_SilphCo_branch_7f42e -Music_SilphCo_Ch3: ; 7f5be (1f:75be) - vibrato 8, 17 - notetype 12, 17 +Music_SilphCo_Ch2:: + vibrato 8, $11 + notetype 12, $11 note __, 12 octave 5 note E_, 4 @@ -794,7 +795,7 @@ Music_SilphCo_Ch3: ; 7f5be (1f:75be) note E_, 4 note F_, 4 -Music_SilphCo_branch_7f5c9: +Music_SilphCo_branch_7f5c9:: note E_, 4 note D#, 4 note D_, 4 @@ -974,7 +975,7 @@ Music_SilphCo_branch_7f5c9: note D#, 4 note D_, 4 note D#, 4 - notetype 6, 17 + notetype 6, $11 note __, 4 note __, 4 note __, 4 @@ -991,7 +992,7 @@ Music_SilphCo_branch_7f5c9: note __, 4 note __, 4 note __, 4 - notetype 12, 17 + notetype 12, $11 note __, 4 note __, 4 note __, 4 @@ -1002,4 +1003,3 @@ Music_SilphCo_branch_7f5c9: note E_, 4 note F_, 4 loopchannel 0, Music_SilphCo_branch_7f5c9 -; 0x7f69d \ No newline at end of file diff --git a/crysaudio/music/RBY/ssanne.asm b/crysaudio/music/RBY/ssanne.asm index 886f5a31..a65095da 100644 --- a/crysaudio/music/RBY/ssanne.asm +++ b/crysaudio/music/RBY/ssanne.asm @@ -1,17 +1,17 @@ -Music_SSAnne: - dbw $80, Music_SSAnne_Ch1 - dbw $01, Music_SSAnne_Ch2 - dbw $02, Music_SSAnne_Ch3 +Music_SSAnne:: + musicheader 3, 1, Music_SSAnne_Ch0 + musicheader 1, 2, Music_SSAnne_Ch1 + musicheader 1, 3, Music_SSAnne_Ch2 -Music_SSAnne_Ch1: ; b3a7 (2:73a7) +Music_SSAnne_Ch0:: tempo 128 - volume 119 + volume $77 dutycycle 1 - vibrato 8, 52 - + vibrato 8, $34 + ;toggleperfectpitch -Music_SSAnne_branch_b3b2: - notetype 12, 164 +Music_SSAnne_branch_b3b2:: + notetype 12, $a4 note __, 12 octave 3 note E_, 2 @@ -112,12 +112,12 @@ Music_SSAnne_branch_b3b2: loopchannel 0, Music_SSAnne_branch_b3b2 -Music_SSAnne_Ch2: ; b419 (2:7419) +Music_SSAnne_Ch1:: dutycycle 0 - vibrato 12, 36 + vibrato 12, $24 -Music_SSAnne_branch_b41e: - notetype 12, 197 +Music_SSAnne_branch_b41e:: + notetype 12, $c5 octave 3 note A_, 2 note E_, 2 @@ -125,7 +125,7 @@ Music_SSAnne_branch_b41e: note B_, 4 octave 4 note D_, 4 - notetype 8, 197 + notetype 8, $c5 note C#, 2 note D_, 2 note C#, 2 @@ -287,8 +287,8 @@ Music_SSAnne_branch_b41e: loopchannel 0, Music_SSAnne_branch_b41e -Music_SSAnne_Ch3: ; b4cb (2:74cb) - notetype 12, 19 +Music_SSAnne_Ch2:: + notetype 12, $13 note __, 16 note __, 12 octave 4 @@ -340,5 +340,4 @@ Music_SSAnne_Ch3: ; b4cb (2:74cb) note F#, 8 note G#, 8 note B_, 8 - loopchannel 0, Music_SSAnne_Ch3 -; 0xb504 \ No newline at end of file + loopchannel 0, Music_SSAnne_Ch2 diff --git a/crysaudio/music/RBY/surfing.asm b/crysaudio/music/RBY/surfing.asm index 7c384ba6..66052f42 100644 --- a/crysaudio/music/RBY/surfing.asm +++ b/crysaudio/music/RBY/surfing.asm @@ -1,15 +1,15 @@ -Music_Surfing: - dbw $80, Music_Surfing_Ch1 - dbw $01, Music_Surfing_Ch2 - dbw $02, Music_Surfing_Ch3 +Music_Surfing:: + musicheader 3, 1, Music_Surfing_Ch0 + musicheader 1, 2, Music_Surfing_Ch1 + musicheader 1, 3, Music_Surfing_Ch2 -Music_Surfing_Ch1: ; 7fa19 (1f:7a19) +Music_Surfing_Ch0:: tempo 160 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 52 - - notetype 12, 181 + vibrato 12, $34 + ;toggleperfectpitch + notetype 12, $b5 note __, 6 octave 2 note A_, 2 @@ -21,8 +21,8 @@ Music_Surfing_Ch1: ; 7fa19 (1f:7a19) note F#, 2 note G#, 4 -Music_Surfing_branch_7fa30: - notetype 12, 178 +Music_Surfing_branch_7fa30:: + notetype 12, $b2 note E_, 2 note E_, 4 note E_, 2 @@ -33,9 +33,9 @@ Music_Surfing_branch_7fa30: note D_, 4 note D_, 2 note D_, 4 - notetype 12, 177 + notetype 12, $b1 note F#, 3 - notetype 12, 178 + notetype 12, $b2 note D_, 3 note E_, 2 note E_, 4 @@ -51,18 +51,18 @@ Music_Surfing_branch_7fa30: note E_, 4 note G#, 2 note G#, 4 - notetype 12, 177 + notetype 12, $b1 note F#, 3 - notetype 12, 178 + notetype 12, $b2 note G#, 1 - notetype 12, 180 + notetype 12, $b4 note A_, 2 note B_, 2 octave 4 note C_, 2 - notetype 12, 183 + notetype 12, $b7 note C#, 6 - notetype 12, 179 + notetype 12, $b3 note D_, 2 note C#, 2 octave 3 @@ -121,10 +121,10 @@ Music_Surfing_branch_7fa30: loopchannel 0, Music_Surfing_branch_7fa30 -Music_Surfing_Ch2: ; 7fa9c (1f:7a9c) +Music_Surfing_Ch1:: dutycycle 3 - vibrato 16, 37 - notetype 12, 198 + vibrato 16, $25 + notetype 12, $c6 octave 3 note A_, 2 note G#, 3 @@ -137,8 +137,8 @@ Music_Surfing_Ch2: ; 7fa9c (1f:7a9c) octave 3 note B_, 2 -Music_Surfing_branch_7faae: - notetype 12, 198 +Music_Surfing_branch_7faae:: + notetype 12, $c6 octave 4 note E_, 6 note C#, 5 @@ -150,10 +150,10 @@ Music_Surfing_branch_7faae: note D_, 6 octave 3 note B_, 2 - notetype 12, 193 + notetype 12, $c1 octave 4 note F#, 3 - notetype 12, 198 + notetype 12, $c6 note D_, 1 note E_, 6 note C#, 6 @@ -164,9 +164,9 @@ Music_Surfing_branch_7faae: note D_, 6 note F#, 6 note E_, 2 - notetype 12, 193 + notetype 12, $c1 note F#, 3 - notetype 12, 198 + notetype 12, $c6 note E_, 1 note A_, 6 note A_, 6 @@ -208,8 +208,8 @@ Music_Surfing_branch_7faae: loopchannel 0, Music_Surfing_branch_7faae -Music_Surfing_Ch3: ; 7fafa (1f:7afa) - notetype 12, 16 +Music_Surfing_Ch2:: + notetype 12, $10 note __, 12 octave 5 note E_, 6 @@ -218,7 +218,7 @@ Music_Surfing_Ch3: ; 7fafa (1f:7afa) note F#, 2 note G#, 2 -Music_Surfing_branch_7fb03: +Music_Surfing_branch_7fb03:: octave 3 note A_, 2 octave 4 @@ -338,4 +338,3 @@ Music_Surfing_branch_7fb03: note D_, 2 note E_, 2 loopchannel 0, Music_Surfing_branch_7fb03 -; 0x7fb7d \ No newline at end of file diff --git a/crysaudio/music/RBY/surfingpikachu.asm b/crysaudio/music/RBY/surfingpikachu.asm index c26295a1..fdcd1ea0 100644 --- a/crysaudio/music/RBY/surfingpikachu.asm +++ b/crysaudio/music/RBY/surfingpikachu.asm @@ -1,32 +1,32 @@ -Music_SurfingPikachu: - dbw $80, Music_SurfingPikachu_Ch1 - dbw $01, Music_SurfingPikachu_Ch2 - dbw $02, Music_SurfingPikachu_Ch3 +Music_SurfingPikachu:: + musicheader 3, 1, Music_SurfingPikachu_Ch1 + musicheader 1, 2, Music_SurfingPikachu_Ch2 + musicheader 1, 3, Music_SurfingPikachu_Ch3 -Music_SurfingPikachu_Ch1: +Music_SurfingPikachu_Ch1:: tempo 117 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $c, $b3 + vibrato 8, $14 + notetype 12, $b3 octave 3 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note F#, 2 - notetype $c, $b3 + notetype 12, $b3 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note F#, 16 note __, 2 - notetype $c, $b3 + notetype 12, $b3 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note A_, 2 - notetype $c, $b3 + notetype 12, $b3 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note A_, 14 - notetype $c, $b2 + notetype 12, $b2 note D#, 2 note C#, 1 note D#, 1 @@ -39,8 +39,9 @@ Music_SurfingPikachu_Ch1: note G#, 4 note G#, 4 note G#, 2 -Music_SurfingPikachu_branch_82d1a: - notetype $c, $b3 + +Music_SurfingPikachu_branch_82d1a:: + notetype 12, $b3 octave 3 note G#, 4 note E_, 4 @@ -82,7 +83,7 @@ Music_SurfingPikachu_branch_82d1a: note __, 3 note A_, 4 dutycycle 0 - notetype $c, $b2 + notetype 12, $b2 note G#, 1 note F#, 1 note G#, 2 @@ -164,22 +165,24 @@ Music_SurfingPikachu_branch_82d1a: note E_, 8 dutycycle 3 loopchannel 0, Music_SurfingPikachu_branch_82d1a -Music_SurfingPikachu_Ch2: + + +Music_SurfingPikachu_Ch2:: dutycycle 3 - vibrato $6, $15 - notetype $c, $c4 + vibrato 6, $15 + notetype 12, $c4 octave 3 note B_, 6 - notetype $c, $c2 + notetype 12, $c2 octave 4 note E_, 2 - notetype $c, $c4 + notetype 12, $c4 octave 3 note B_, 6 - notetype $c, $c2 + notetype 12, $c2 octave 4 note E_, 2 - notetype $c, $b2 + notetype 12, $b2 octave 3 note B_, 2 octave 4 @@ -191,16 +194,16 @@ Music_SurfingPikachu_Ch2: note A_, 2 note G#, 2 note F#, 2 - notetype $c, $c4 + notetype 12, $c4 octave 4 note C#, 6 - notetype $c, $c2 + notetype 12, $c2 note F#, 2 - notetype $c, $c4 + notetype 12, $c4 note C#, 6 - notetype $c, $c2 + notetype 12, $c2 note F#, 2 - notetype $c, $b2 + notetype 12, $b2 note C#, 2 note D#, 2 note E_, 2 @@ -210,7 +213,7 @@ Music_SurfingPikachu_Ch2: note B_, 2 note A_, 2 note G#, 2 - notetype $c, $c2 + notetype 12, $c2 note E_, 6 note B_, 4 note B_, 4 @@ -218,8 +221,9 @@ Music_SurfingPikachu_Ch2: note B_, 4 note B_, 4 note B_, 2 -Music_SurfingPikachu_branch_82de0: - notetype $c, $c6 + +Music_SurfingPikachu_branch_82de0:: + notetype 12, $c6 octave 4 note E_, 4 octave 3 @@ -257,7 +261,7 @@ Music_SurfingPikachu_branch_82de0: note __, 3 note F#, 4 note E_, 10 - notetype $c, $c6 + notetype 12, $c6 dutycycle 2 note E_, 2 note D#, 2 @@ -299,10 +303,10 @@ Music_SurfingPikachu_branch_82de0: note C#, 4 octave 4 note B_, 8 - notetype $c, $c2 + notetype 12, $c2 octave 5 note E_, 4 - notetype $c, $c6 + notetype 12, $c6 dutycycle 3 octave 3 note B_, 1 @@ -311,8 +315,10 @@ Music_SurfingPikachu_branch_82de0: octave 4 note C#, 1 loopchannel 0, Music_SurfingPikachu_branch_82de0 -Music_SurfingPikachu_Ch3: - notetype $c, $10 + + +Music_SurfingPikachu_Ch3:: + notetype 12, $10 octave 4 note B_, 6 octave 5 @@ -402,7 +408,8 @@ Music_SurfingPikachu_Ch3: note __, 1 note D#, 1 note __, 1 -Music_SurfingPikachu_branch_82ea0: + +Music_SurfingPikachu_branch_82ea0:: note E_, 1 note __, 1 note B_, 1 diff --git a/crysaudio/music/RBY/titlescreen.asm b/crysaudio/music/RBY/titlescreen.asm index 2a9dff0d..81d02f16 100644 --- a/crysaudio/music/RBY/titlescreen.asm +++ b/crysaudio/music/RBY/titlescreen.asm @@ -1,15 +1,15 @@ -Music_RBYTitleScreen: - dbw $C0, Music_RBYTitleScreen_Ch1 - dbw $01, Music_RBYTitleScreen_Ch2 - dbw $02, Music_RBYTitleScreen_Ch3 - dbw $03, Music_RBYTitleScreen_Ch4 +Music_RBYTitleScreen:: + musicheader 4, 1, Music_RBYTitleScreen_Ch0 + musicheader 1, 2, Music_RBYTitleScreen_Ch1 + musicheader 1, 3, Music_RBYTitleScreen_Ch2 + musicheader 1, 4, Music_RBYTitleScreen_Ch3 -Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0) +Music_RBYTitleScreen_Ch0:: tempo 144 - volume 119 - vibrato 9, 52 + volume $77 + vibrato 9, $34 dutycycle 3 - notetype 12, 193 + notetype 12, $c1 octave 2 note E_, 1 note G_, 1 @@ -24,7 +24,7 @@ Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0) note G_, 4 note G_, 4 note G_, 4 - notetype 8, 193 + notetype 8, $c1 note A_, 2 note A_, 2 note A_, 2 @@ -32,27 +32,27 @@ Music_RBYTitleScreen_Ch1: ; 7e4c0 (1f:64c0) note A_, 2 note F#, 2 -Music_RBYTitleScreen_branch_7e4e2: +Music_RBYTitleScreen_branch_7e4e2:: callchannel Music_RBYTitleScreen_branch_7e541 callchannel Music_RBYTitleScreen_branch_7e54a callchannel Music_RBYTitleScreen_branch_7e541 octave 3 note C_, 8 - notetype 8, 198 + notetype 8, $c6 note E_, 4 note E_, 4 note C_, 4 - notetype 12, 198 + notetype 12, $c6 octave 2 note B_, 8 - notetype 8, 231 + notetype 8, $e7 octave 3 note F_, 4 note E_, 4 note C_, 4 - notetype 12, 231 + notetype 12, $e7 note D_, 10 - notetype 12, 198 + notetype 12, $c6 octave 2 note B_, 2 octave 3 @@ -84,26 +84,26 @@ Music_RBYTitleScreen_branch_7e4e2: note E_, 12 note F_, 4 note G_, 8 - notetype 12, 182 + notetype 12, $b6 octave 4 note C_, 4 note C#, 4 callchannel Music_RBYTitleScreen_branch_7e55c - notetype 8, 180 + notetype 8, $b4 octave 4 note C_, 4 note C_, 4 note C#, 4 callchannel Music_RBYTitleScreen_branch_7e55c - notetype 8, 178 + notetype 8, $b2 octave 3 note E_, 4 note E_, 4 note C#, 4 loopchannel 0, Music_RBYTitleScreen_branch_7e4e2 -Music_RBYTitleScreen_branch_7e541: - notetype 12, 198 +Music_RBYTitleScreen_branch_7e541:: + notetype 12, $c6 octave 3 note D_, 6 octave 2 @@ -112,17 +112,17 @@ Music_RBYTitleScreen_branch_7e541: note D_, 8 endchannel -Music_RBYTitleScreen_branch_7e54a: +Music_RBYTitleScreen_branch_7e54a:: note C_, 6 note F_, 6 note C_, 4 note D_, 8 - notetype 12, 231 + notetype 12, $e7 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype 8, 198 + notetype 8, $c6 note C_, 4 octave 2 note B_, 4 @@ -130,8 +130,8 @@ Music_RBYTitleScreen_branch_7e54a: note C_, 4 endchannel -Music_RBYTitleScreen_branch_7e55c: - notetype 12, 193 +Music_RBYTitleScreen_branch_7e55c:: + notetype 12, $c1 note D_, 1 note __, 1 octave 2 @@ -160,10 +160,10 @@ Music_RBYTitleScreen_branch_7e55c: endchannel -Music_RBYTitleScreen_Ch2: ; 7e578 (1f:6578) - vibrato 16, 70 +Music_RBYTitleScreen_Ch1:: + vibrato 16, $46 dutycycle 1 - notetype 12, 225 + notetype 12, $e1 octave 2 note G_, 1 note B_, 1 @@ -177,7 +177,7 @@ Music_RBYTitleScreen_Ch2: ; 7e578 (1f:6578) note G_, 4 note G_, 4 note G_, 4 - notetype 8, 225 + notetype 8, $e1 note F_, 2 note F_, 2 note F_, 2 @@ -185,8 +185,8 @@ Music_RBYTitleScreen_Ch2: ; 7e578 (1f:6578) note F_, 2 note F#, 2 -Music_RBYTitleScreen_branch_7e594: - vibrato 16, 70 +Music_RBYTitleScreen_branch_7e594:: + vibrato 16, $46 callchannel Music_RBYTitleScreen_branch_7e622 octave 2 note A_, 4 @@ -199,16 +199,16 @@ Music_RBYTitleScreen_branch_7e594: octave 2 note A_, 6 note F_, 2 - notetype 8, 231 + notetype 8, $e7 octave 4 note C_, 4 octave 3 note B_, 4 octave 4 note C_, 4 - notetype 12, 231 + notetype 12, $e7 note D_, 8 - notetype 12, 149 + notetype 12, $95 octave 2 note D_, 6 note D_, 1 @@ -227,28 +227,28 @@ Music_RBYTitleScreen_branch_7e594: note G_, 2 note F_, 8 callchannel Music_RBYTitleScreen_branch_7e622 - notetype 8, 149 + notetype 8, $95 octave 2 note G_, 4 note F_, 5 note A_, 3 - notetype 8, 230 + notetype 8, $e6 octave 4 note F_, 4 note E_, 4 note F_, 4 - notetype 12, 231 + notetype 12, $e7 note G_, 6 note A#, 2 note G_, 8 - vibrato 16, 38 + vibrato 16, $26 dutycycle 3 - notetype 12, 11 + notetype 12, $0b note G_, 8 - notetype 12, 231 + notetype 12, $e7 note A_, 8 dutycycle 1 - notetype 12, 231 + notetype 12, $e7 note A#, 6 note F_, 2 note F_, 8 @@ -264,7 +264,7 @@ Music_RBYTitleScreen_branch_7e594: note G_, 8 octave 3 note E_, 8 - notetype 12, 215 + notetype 12, $d7 octave 5 note C_, 4 note C#, 4 @@ -273,7 +273,7 @@ Music_RBYTitleScreen_branch_7e594: note D_, 1 note __, 3 note D_, 1 - notetype 8, 229 + notetype 8, $e5 octave 5 note C_, 4 note C_, 4 @@ -284,7 +284,7 @@ Music_RBYTitleScreen_branch_7e594: note D_, 1 note __, 3 note D_, 1 - notetype 8, 227 + notetype 8, $e3 octave 5 note C_, 4 note C_, 4 @@ -292,28 +292,28 @@ Music_RBYTitleScreen_branch_7e594: note B_, 4 loopchannel 0, Music_RBYTitleScreen_branch_7e594 -Music_RBYTitleScreen_branch_7e622: - notetype 12, 231 +Music_RBYTitleScreen_branch_7e622:: + notetype 12, $e7 octave 3 note G_, 6 note B_, 2 octave 4 note D_, 8 - notetype 12, 149 + notetype 12, $95 endchannel -Music_RBYTitleScreen_branch_7e62c: - notetype 12, 231 +Music_RBYTitleScreen_branch_7e62c:: + notetype 12, $e7 octave 4 note F_, 6 note E_, 1 note D#, 1 note D_, 8 - notetype 12, 149 + notetype 12, $95 endchannel -Music_RBYTitleScreen_branch_7e636: - notetype 12, 225 +Music_RBYTitleScreen_branch_7e636:: + notetype 12, $e1 note D_, 1 note __, 2 octave 4 @@ -327,8 +327,8 @@ Music_RBYTitleScreen_branch_7e636: endchannel -Music_RBYTitleScreen_Ch3: ; 7e643 (1f:6643) - notetype 12, 16 +Music_RBYTitleScreen_Ch2:: + notetype 12, $10 octave 3 note G_, 1 note __, 1 @@ -346,7 +346,7 @@ Music_RBYTitleScreen_Ch3: ; 7e643 (1f:6643) note __, 3 note G_, 1 note __, 3 - notetype 8, 16 + notetype 8, $10 note F_, 2 note F_, 2 note F_, 2 @@ -354,11 +354,11 @@ Music_RBYTitleScreen_Ch3: ; 7e643 (1f:6643) note F_, 2 note A_, 2 -Music_RBYTitleScreen_branch_7e65e: +Music_RBYTitleScreen_branch_7e65e:: callchannel Music_RBYTitleScreen_branch_7e6c9 callchannel Music_RBYTitleScreen_branch_7e6d0 -Music_RBYTitleScreen_branch_7e664: +Music_RBYTitleScreen_branch_7e664:: callchannel Music_RBYTitleScreen_branch_7e6c9 callchannel Music_RBYTitleScreen_branch_7e6c9 callchannel Music_RBYTitleScreen_branch_7e6c9 @@ -388,102 +388,117 @@ Music_RBYTitleScreen_branch_7e664: octave 3 note A_, 3 callchannel Music_RBYTitleScreen_branch_7e6e5 - notetype 3, 16 octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - note __, 16 + ;slidepitchto 1, 3, C# + ;note D_, 4 + ;note __, 4 + notetype 3, $10 ; XXX + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 4 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX + note __, 16 ; XXX octave 6 - note D_, 1 - note C#, 1 - note C_, 1 + ;slidepitchto 1, 2, C# + ;note D_, 4 + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 5 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX octave 5 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 - octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - note __, 8 - notetype 8, 16 + ;slidepitchto 1, 3, C# + ;note D_, 4 + ;note __, 2 + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 4 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX + note __, 8 ; XXX + notetype 8, $10 octave 4 note C_, 4 note C_, 4 note C#, 4 callchannel Music_RBYTitleScreen_branch_7e6e5 octave 6 - notetype 3, 16 - note D_, 1 - note C#, 1 - note C_, 1 + ;slidepitchto 1, 2, C# + ;note D_, 4 + ;note __, 4 + notetype 3, $10 ; XXX + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 5 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX + note __, 16 ; XXX octave 5 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - note __, 16 - octave 5 - note D_, 1 - note C#, 1 - note C_, 1 + ;slidepitchto 1, 3, C# + ;note D_, 4 + ;note __, 6 + note D_, 1 ; XXX + note C#, 1 ; XXX + note C_, 1 ; XXX + octave 4 ; XXX + note B_, 1 ; XXX + note A#, 1 ; XXX + note A_, 1 ; XXX + note G#, 1 ; XXX + note G_, 1 ; XXX + note F#, 1 ; XXX + note F_, 1 ; XXX + note E_, 1 ; XXX + note D#, 1 ; XXX + note D_, 4 ; XXX + note __, 12 ; XXX + note __, 12 ; XXX + notetype 8, $10 octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 4 - notetype 8, 16 - octave 4 - note __, 9 note C_, 4 note C_, 4 octave 3 note B_, 4 loopchannel 0, Music_RBYTitleScreen_branch_7e65e -Music_RBYTitleScreen_branch_7e6c9: +Music_RBYTitleScreen_branch_7e6c9:: note G_, 6 note D_, 3 note G_, 6 @@ -492,7 +507,7 @@ Music_RBYTitleScreen_branch_7e6c9: note D_, 3 endchannel -Music_RBYTitleScreen_branch_7e6d0: +Music_RBYTitleScreen_branch_7e6d0:: note F_, 6 note C_, 3 note F_, 6 @@ -501,14 +516,14 @@ Music_RBYTitleScreen_branch_7e6d0: note C_, 3 endchannel -Music_RBYTitleScreen_branch_7e6d7: +Music_RBYTitleScreen_branch_7e6d7:: note A#, 6 note F_, 3 note A#, 6 note F_, 3 endchannel -Music_RBYTitleScreen_branch_7e6dc: +Music_RBYTitleScreen_branch_7e6dc:: octave 4 note C_, 6 octave 3 @@ -519,17 +534,17 @@ Music_RBYTitleScreen_branch_7e6dc: note G_, 3 endchannel -Music_RBYTitleScreen_branch_7e6e5: - notetype 12, 16 +Music_RBYTitleScreen_branch_7e6e5:: + notetype 12, $10 octave 4 note D_, 1 note __, 5 endchannel -Music_RBYTitleScreen_Ch4: ; 7e6eb (1f:66eb) - notetype 6 +Music_RBYTitleScreen_Ch3:: togglenoise 0 + notetype 6 note __, 4 note D_, 1 note D_, 1 @@ -556,7 +571,7 @@ Music_RBYTitleScreen_Ch4: ; 7e6eb (1f:66eb) note C#, 2 note C_, 2 -Music_RBYTitleScreen_branch_7e716: +Music_RBYTitleScreen_branch_7e716:: notetype 12 note C#, 1 note __, 3 @@ -723,7 +738,7 @@ Music_RBYTitleScreen_branch_7e716: note C#, 4 loopchannel 0, Music_RBYTitleScreen_branch_7e716 -Music_RBYTitleScreen_branch_7e834: +Music_RBYTitleScreen_branch_7e834:: note C#, 1 note __, 3 note C#, 1 @@ -734,7 +749,7 @@ Music_RBYTitleScreen_branch_7e834: note __, 3 endchannel -Music_RBYTitleScreen_branch_7e842: +Music_RBYTitleScreen_branch_7e842:: note C#, 1 note __, 3 note C#, 1 @@ -744,4 +759,3 @@ Music_RBYTitleScreen_branch_7e842: note C#, 1 note __, 3 endchannel -; 0x7e850 \ No newline at end of file diff --git a/crysaudio/music/RBY/trainerbattle.asm b/crysaudio/music/RBY/trainerbattle.asm index 8efef03a..351c2b47 100644 --- a/crysaudio/music/RBY/trainerbattle.asm +++ b/crysaudio/music/RBY/trainerbattle.asm @@ -1,14 +1,15 @@ -Music_TrainerBattle: - dbw $80, Music_TrainerBattle_Ch1 - dbw $01, Music_TrainerBattle_Ch2 - dbw $02, Music_TrainerBattle_Ch3 +Music_TrainerBattle:: + musicheader 3, 1, Music_TrainerBattle_Ch0 + musicheader 1, 2, Music_TrainerBattle_Ch1 + musicheader 1, 3, Music_TrainerBattle_Ch2 -Music_TrainerBattle_Ch1: +Music_TrainerBattle_Ch0:: tempo 112 - volume 119 + volume $77 dutycycle 3 - vibrato $6, $34 - notetype $c, $b2 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b2 note __, 8 octave 3 note F_, 1 @@ -69,8 +70,9 @@ Music_TrainerBattle_Ch1: note F_, 6 note C_, 2 note C#, 2 -Music_TrainerBattle_branch_22962: - intensity $b5 + +Music_TrainerBattle_branch_22962:: + notetype 12, $b5 note D_, 2 note E_, 4 note C#, 2 @@ -85,7 +87,7 @@ Music_TrainerBattle_branch_22962: note D_, 2 note E_, 2 note F_, 8 - intensity $b2 + notetype 12, $b2 note C_, 1 note C#, 1 note D_, 1 @@ -110,7 +112,7 @@ Music_TrainerBattle_branch_22962: note D#, 1 note D_, 1 note C_, 1 - intensity $b5 + notetype 12, $b5 note D_, 2 note E_, 4 note C#, 2 @@ -126,14 +128,14 @@ Music_TrainerBattle_branch_22962: note B_, 2 octave 3 note C#, 2 - intensity $a7 + notetype 12, $a7 note D_, 8 note C#, 8 octave 2 note B_, 8 octave 3 note C#, 8 - intensity $b5 + notetype 12, $b5 note D_, 2 note C#, 2 octave 2 @@ -650,10 +652,12 @@ Music_TrainerBattle_branch_22962: note A_, 1 note A#, 1 loopchannel 0, Music_TrainerBattle_branch_22962 -Music_TrainerBattle_Ch2: + + +Music_TrainerBattle_Ch1:: dutycycle 3 - vibrato $a, $25 - notetype $c, $c2 + vibrato 10, $25 + notetype 12, $c2 octave 4 note A_, 1 note G#, 1 @@ -690,15 +694,15 @@ Music_TrainerBattle_Ch2: note C_, 1 octave 3 note B_, 1 - intensity $e1 + notetype 12, $e1 octave 4 note B_, 16 note __, 16 - intensity $d1 + notetype 12, $d1 note B_, 16 note __, 12 note A_, 4 - intensity $c2 + notetype 12, $c2 octave 3 note B_, 6 octave 4 @@ -722,22 +726,23 @@ Music_TrainerBattle_Ch2: note D_, 6 octave 4 note A_, 4 -Music_TrainerBattle_branch_22bfc: - intensity $c7 + +Music_TrainerBattle_branch_22bfc:: + notetype 12, $c7 octave 3 note B_, 6 note F#, 14 note B_, 4 note F#, 4 note B_, 4 - intensity $50 + notetype 12, $50 octave 4 note C_, 8 - intensity $30 + notetype 12, $30 note C_, 8 - intensity $4d + notetype 12, $4e note C_, 8 - intensity $c7 + notetype 12, $c7 note C_, 8 octave 3 note B_, 6 @@ -745,35 +750,35 @@ Music_TrainerBattle_branch_22bfc: note B_, 4 note F#, 4 note B_, 4 - intensity $90 + notetype 12, $90 note A_, 8 - intensity $50 + notetype 12, $50 note A_, 8 - intensity $40 + notetype 12, $40 note A_, 8 - intensity $30 + notetype 12, $30 note A_, 8 - intensity $c7 + notetype 12, $c7 note G_, 16 octave 4 note D_, 8 octave 3 note G_, 8 - intensity $80 + notetype 12, $80 note A_, 8 - intensity $50 + notetype 12, $50 note A_, 8 - intensity $40 + notetype 12, $40 note A_, 8 - intensity $60 + notetype 12, $60 note A_, 8 - intensity $c7 + notetype 12, $c7 note G_, 16 octave 4 note E_, 8 note F#, 8 note E_, 16 - intensity $c5 + notetype 12, $c5 note G_, 4 note A_, 2 note G_, 2 @@ -781,73 +786,73 @@ Music_TrainerBattle_branch_22bfc: note E_, 2 note D_, 2 note E_, 2 - intensity $b7 + notetype 12, $b7 note F#, 8 - intensity $50 + notetype 12, $50 note F#, 8 - intensity $60 + notetype 12, $60 note F#, 8 - intensity $70 + notetype 12, $70 note F#, 8 - intensity $a0 + notetype 12, $a0 note G_, 8 - intensity $a7 + notetype 12, $a7 note G_, 8 - intensity $b7 + notetype 12, $b7 note G_, 4 - intensity $c5 + notetype 12, $c5 note A_, 2 note G_, 2 note G_, 2 note F#, 2 note E_, 2 note F#, 2 - intensity $a0 + notetype 12, $a0 note G#, 8 - intensity $70 + notetype 12, $70 note G#, 8 - intensity $80 + notetype 12, $80 note G#, 8 - intensity $60 + notetype 12, $60 note G#, 8 - intensity $a0 + notetype 12, $a0 note A_, 16 - intensity $b0 + notetype 12, $b0 octave 5 note C#, 8 note E_, 8 - intensity $c0 + notetype 12, $c0 note D_, 4 octave 4 note A_, 4 octave 5 note C_, 2 - intensity $c7 + notetype 12, $c7 octave 4 note B_, 8 - intensity $60 + notetype 12, $60 note B_, 8 - intensity $69 + notetype 12, $69 note B_, 6 - intensity $96 + notetype 12, $96 note B_, 6 note __, 2 - intensity $c0 + notetype 12, $c0 octave 5 note D_, 4 octave 4 note A_, 4 note A#, 2 - intensity $b0 + notetype 12, $b0 octave 5 note F_, 14 - intensity $60 + notetype 12, $60 note G_, 16 - intensity $50 + notetype 12, $50 note E_, 16 - intensity $40 + notetype 12, $40 note E_, 16 - intensity $c7 + notetype 12, $c7 octave 4 note C_, 6 octave 3 @@ -884,18 +889,18 @@ Music_TrainerBattle_branch_22bfc: note G_, 6 note F_, 6 note D_, 4 - intensity $b0 + notetype 12, $b0 note F_, 16 note E_, 16 note D_, 16 note E_, 16 - intensity $a0 + notetype 12, $a0 octave 5 note F_, 16 note E_, 16 note G_, 16 note F_, 16 - intensity $d1 + notetype 12, $d1 octave 3 note A#, 6 note A#, 6 @@ -911,7 +916,7 @@ Music_TrainerBattle_branch_22bfc: note A#, 6 note A#, 6 note A_, 4 - intensity $c7 + notetype 12, $c7 note A_, 4 note B_, 4 note G_, 2 @@ -951,9 +956,11 @@ Music_TrainerBattle_branch_22bfc: note E_, 8 note G_, 8 loopchannel 0, Music_TrainerBattle_branch_22bfc -Music_TrainerBattle_Ch3: - vibrato $0, $20 - notetype $c, $14 + + +Music_TrainerBattle_Ch2:: + vibrato 0, $20 + notetype 12, $14 octave 3 note B_, 1 note A#, 1 @@ -1089,7 +1096,8 @@ Music_TrainerBattle_Ch3: note A#, 2 octave 3 note C_, 2 -Music_TrainerBattle_branch_22d9c: + +Music_TrainerBattle_branch_22d9c:: octave 2 note A#, 1 note B_, 1 diff --git a/crysaudio/music/RBY/unusedsong.asm b/crysaudio/music/RBY/unusedsong.asm index d1641074..8d523ebd 100644 --- a/crysaudio/music/RBY/unusedsong.asm +++ b/crysaudio/music/RBY/unusedsong.asm @@ -1,14 +1,14 @@ -Music_UnusedSong: - dbw $40, Music_UnusedSong_Ch1 - dbw $01, Music_UnusedSong_Ch2 +Music_UnusedSong:: + musicheader 2, 1, Music_UnusedSong_Ch0 + musicheader 1, 2, Music_UnusedSong_Ch1 -Music_UnusedSong_Ch1: ; a913 (2:6913) +Music_UnusedSong_Ch0:: tempo 144 - volume 119 - vibrato 5, 22 + volume $77 + vibrato 5, $16 -Music_UnusedSong_branch_a91b: - notetype 12, 16 +Music_UnusedSong_branch_a91b:: + notetype 12, $10 octave 6 note E_, 1 note __, 1 @@ -186,14 +186,14 @@ Music_UnusedSong_branch_a91b: endchannel -Music_UnusedSong_Ch2: ; a9cf (2:69cf) +Music_UnusedSong_Ch1:: tempo 144 - volume 119 - - vibrato 6, 21 + volume $77 + ;toggleperfectpitch + vibrato 6, $15 -Music_UnusedSong_branch_a9d8: - notetype 12, 16 +Music_UnusedSong_branch_a9d8:: + notetype 12, $10 octave 6 note E_, 1 note __, 1 @@ -340,4 +340,3 @@ Music_UnusedSong_branch_a9d8: note __, 6 loopchannel 0, Music_UnusedSong_branch_a9d8 endchannel -; 0xaa6f \ No newline at end of file diff --git a/crysaudio/music/RBY/vermilion.asm b/crysaudio/music/RBY/vermilion.asm index 4cc38373..ca7bfe84 100644 --- a/crysaudio/music/RBY/vermilion.asm +++ b/crysaudio/music/RBY/vermilion.asm @@ -1,18 +1,18 @@ -Music_Vermilion: - dbw $C0, Music_Vermilion_Ch1 - dbw $01, Music_Vermilion_Ch2 - dbw $02, Music_Vermilion_Ch3 - dbw $03, Music_Vermilion_Ch4 +Music_Vermilion:: + musicheader 4, 1, Music_Vermilion_Ch0 + musicheader 1, 2, Music_Vermilion_Ch1 + musicheader 1, 3, Music_Vermilion_Ch2 + musicheader 1, 4, Music_Vermilion_Ch3 -Music_Vermilion_Ch1: ; b9eb (2:79eb) +Music_Vermilion_Ch0:: tempo 156 - volume 119 + volume $77 dutycycle 3 - vibrato 12, 52 - + vibrato 12, $34 + ;toggleperfectpitch -Music_Vermilion_branch_b9f6: - notetype 12, 181 +Music_Vermilion_branch_b9f6:: + notetype 12, $b5 octave 3 note E_, 4 note C#, 1 @@ -117,12 +117,12 @@ Music_Vermilion_branch_b9f6: loopchannel 0, Music_Vermilion_branch_b9f6 -Music_Vermilion_Ch2: ; ba61 (2:7a61) +Music_Vermilion_Ch1:: dutycycle 3 - vibrato 10, 35 + vibrato 10, $23 -Music_Vermilion_branch_ba66: - notetype 12, 199 +Music_Vermilion_branch_ba66:: + notetype 12, $c7 octave 3 note A_, 8 octave 4 @@ -184,10 +184,10 @@ Music_Vermilion_branch_ba66: loopchannel 0, Music_Vermilion_branch_ba66 -Music_Vermilion_Ch3: ; baa6 (2:7aa6) - notetype 12, 16 +Music_Vermilion_Ch2:: + notetype 12, $10 -Music_Vermilion_branch_baa8: +Music_Vermilion_branch_baa8:: octave 4 note A_, 2 note E_, 2 @@ -288,11 +288,11 @@ Music_Vermilion_branch_baa8: loopchannel 0, Music_Vermilion_branch_baa8 -Music_Vermilion_Ch4: ; bb0d (2:7b0d) - notetype 12 +Music_Vermilion_Ch3:: togglenoise 0 + notetype 12 -Music_Vermilion_branch_bb0e: +Music_Vermilion_branch_bb0e:: callchannel Music_Vermilion_branch_bb3f note F_, 2 note F_, 1 @@ -314,7 +314,7 @@ Music_Vermilion_branch_bb0e: callchannel Music_Vermilion_branch_bb3f loopchannel 0, Music_Vermilion_branch_bb0e -Music_Vermilion_branch_bb3f: +Music_Vermilion_branch_bb3f:: note F_, 2 note F_, 1 note F_, 1 @@ -328,4 +328,3 @@ Music_Vermilion_branch_bb3f: note F_, 1 note F_, 1 endchannel -; 0xbb58 \ No newline at end of file diff --git a/crysaudio/music/RBY/wildbattle.asm b/crysaudio/music/RBY/wildbattle.asm index 70fd2f69..8836f8f4 100644 --- a/crysaudio/music/RBY/wildbattle.asm +++ b/crysaudio/music/RBY/wildbattle.asm @@ -1,14 +1,15 @@ -Music_WildBattle: - dbw $80, Music_WildBattle_Ch1 - dbw $01, Music_WildBattle_Ch2 - dbw $02, Music_WildBattle_Ch3 +Music_WildBattle:: + musicheader 3, 1, Music_WildBattle_Ch0 + musicheader 1, 2, Music_WildBattle_Ch1 + musicheader 1, 3, Music_WildBattle_Ch2 -Music_WildBattle_Ch1: +Music_WildBattle_Ch0:: tempo 104 - volume 119 + volume $77 dutycycle 3 - vibrato $6, $34 - notetype $c, $b3 + vibrato 6, $34 + ;toggleperfectpitch + notetype 12, $b3 octave 4 note C_, 1 octave 3 @@ -47,16 +48,16 @@ Music_WildBattle_Ch1: octave 3 note C_, 1 note C#, 1 - intensity $b1 + notetype 12, $b1 note G_, 6 note E_, 6 note D#, 12 note C#, 14 note E_, 6 note D#, 10 - intensity $4f + notetype 12, $4f note C#, 10 - intensity $b1 + notetype 12, $b1 note G_, 6 note E_, 6 note D#, 12 @@ -64,8 +65,9 @@ Music_WildBattle_Ch1: note E_, 6 note D#, 10 note C#, 10 -Music_WildBattle_branch_230e0: - intensity $b3 + +Music_WildBattle_branch_230e0:: + notetype 12, $b3 note C#, 1 note D_, 1 note C#, 1 @@ -260,7 +262,7 @@ Music_WildBattle_branch_230e0: note F#, 1 note G_, 1 note G#, 1 - intensity $b5 + notetype 12, $b5 note D_, 4 note C_, 4 note D_, 4 @@ -268,10 +270,10 @@ Music_WildBattle_branch_230e0: note E_, 6 note D_, 6 note F_, 4 - intensity $b7 + notetype 12, $b7 note A_, 16 note G_, 16 - intensity $b5 + notetype 12, $b5 note D_, 4 note C_, 4 note D_, 4 @@ -279,12 +281,12 @@ Music_WildBattle_branch_230e0: note G_, 6 note A_, 6 note B_, 4 - intensity $b7 + notetype 12, $b7 octave 4 note C_, 16 - intensity $3f + notetype 12, $3f note G_, 16 - intensity $b5 + notetype 12, $b5 octave 3 note C_, 12 note C_, 2 @@ -296,15 +298,17 @@ Music_WildBattle_branch_230e0: note C#, 2 note __, 2 note F_, 2 - intensity $a3 + notetype 12, $a3 note D#, 6 - intensity $a7 + notetype 12, $a7 note C#, 8 loopchannel 0, Music_WildBattle_branch_230e0 -Music_WildBattle_Ch2: + + +Music_WildBattle_Ch1:: dutycycle 3 - vibrato $8, $25 - notetype $c, $c3 + vibrato 8, $25 + notetype 12, $c3 octave 4 note G_, 1 note F#, 1 @@ -353,7 +357,7 @@ Music_WildBattle_Ch2: note F_, 1 octave 5 note G_, 1 - intensity $c2 + notetype 12, $c2 octave 4 note G_, 6 octave 3 @@ -362,9 +366,9 @@ Music_WildBattle_Ch2: note G_, 14 note G_, 6 note G_, 10 - intensity $90 + notetype 12, $90 note F#, 10 - intensity $c2 + notetype 12, $c2 note G_, 6 note G_, 6 note G_, 12 @@ -372,8 +376,9 @@ Music_WildBattle_Ch2: note G_, 6 note G_, 10 note G_, 10 -Music_WildBattle_branch_23225: - intensity $c5 + +Music_WildBattle_branch_23225:: + notetype 12, $c5 note G_, 6 note F#, 6 note E_, 4 @@ -387,10 +392,10 @@ Music_WildBattle_branch_23225: note G#, 2 note G_, 2 note __, 4 - intensity $b7 + notetype 12, $b7 octave 5 note C#, 8 - intensity $c5 + notetype 12, $c5 octave 4 note C_, 6 octave 3 @@ -405,20 +410,20 @@ Music_WildBattle_branch_23225: note F_, 6 note E_, 6 note D_, 4 - intensity $c7 + notetype 12, $c7 octave 3 note A#, 4 octave 4 note C_, 4 note D_, 4 note F_, 4 - intensity $c0 + notetype 12, $c0 note G#, 16 - intensity $b0 + notetype 12, $b0 note G#, 16 - intensity $4e + notetype 12, $4e note G_, 16 - intensity $c7 + notetype 12, $c7 note G_, 16 octave 3 note F_, 8 @@ -426,9 +431,9 @@ Music_WildBattle_branch_23225: octave 4 note D_, 8 note F_, 8 - intensity $c0 + notetype 12, $c0 note E_, 16 - intensity $c7 + notetype 12, $c7 note E_, 16 octave 3 note F_, 8 @@ -436,33 +441,35 @@ Music_WildBattle_branch_23225: octave 4 note D_, 8 note F_, 8 - intensity $c0 + notetype 12, $c0 note G_, 16 - intensity $3f + notetype 12, $3f octave 5 note C_, 16 - intensity $c5 + notetype 12, $c5 octave 4 note E_, 12 note E_, 2 note __, 2 note F_, 2 - intensity $c1 + notetype 12, $c1 note E_, 4 - intensity $c5 + notetype 12, $c5 note __, 10 note F_, 12 note F_, 2 note __, 2 note G#, 2 - intensity $a3 + notetype 12, $a3 note G_, 6 - intensity $c7 + notetype 12, $c7 note F_, 8 loopchannel 0, Music_WildBattle_branch_23225 -Music_WildBattle_Ch3: - vibrato $0, $20 - notetype $c, $11 + + +Music_WildBattle_Ch2:: + vibrato 0, $20 + notetype 12, $11 octave 4 note C#, 1 note __, 1 @@ -495,7 +502,8 @@ Music_WildBattle_Ch3: octave 3 note A#, 2 note B_, 2 -Music_WildBattle_branch_232b5: + +Music_WildBattle_branch_232b5:: octave 4 note C_, 2 note G_, 2 @@ -528,7 +536,8 @@ Music_WildBattle_branch_232b5: note G#, 2 note F_, 2 loopchannel 2, Music_WildBattle_branch_232b5 -Music_WildBattle_branch_232d8: + +Music_WildBattle_branch_232d8:: note C_, 2 note G_, 2 note C_, 2 diff --git a/crysaudio/music/RBY/yellowintro.asm b/crysaudio/music/RBY/yellowintro.asm index 4b3e56e9..2b1ba6b5 100644 --- a/crysaudio/music/RBY/yellowintro.asm +++ b/crysaudio/music/RBY/yellowintro.asm @@ -1,14 +1,14 @@ -Music_YellowIntro: - dbw $80, Music_YellowIntro_Ch1 - dbw $01, Music_YellowIntro_Ch2 - dbw $02, Music_YellowIntro_Ch3 +Music_YellowIntro:: + musicheader 3, 1, Music_YellowIntro_Ch1 + musicheader 1, 2, Music_YellowIntro_Ch2 + musicheader 1, 3, Music_YellowIntro_Ch3 -Music_YellowIntro_Ch1: +Music_YellowIntro_Ch1:: tempo 116 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $c, $b2 + vibrato 8, $14 + notetype 12, $b2 octave 3 note G#, 2 note B_, 4 @@ -20,7 +20,7 @@ Music_YellowIntro_Ch1: note A#, 1 note B_, 2 note B_, 10 - notetype $c, $b6 + notetype 12, $b6 octave 4 note C#, 1 note C_, 1 @@ -42,22 +42,22 @@ Music_YellowIntro_Ch1: octave 3 note B_, 4 note G#, 6 - notetype $c, $b2 + notetype 12, $b2 note B_, 2 - notetype $c, $b6 + notetype 12, $b6 note G#, 6 - notetype $c, $b2 + notetype 12, $b2 note B_, 2 - notetype $c, $b6 + notetype 12, $b6 octave 4 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note G#, 2 - notetype $c, $b6 + notetype 12, $b6 note E_, 6 - notetype $c, $b2 + notetype 12, $b2 note G#, 2 - notetype $c, $b6 + notetype 12, $b6 octave 3 note A_, 4 note F#, 4 @@ -69,7 +69,7 @@ Music_YellowIntro_Ch1: note G#, 2 note F#, 2 note D#, 2 - notetype $c, $b3 + notetype 12, $b3 note B_, 2 octave 4 note E_, 4 @@ -82,7 +82,7 @@ Music_YellowIntro_Ch1: note D#, 1 note F#, 2 note F#, 8 - notetype $c, $b6 + notetype 12, $b6 note F#, 1 note F_, 1 note F#, 8 @@ -94,19 +94,21 @@ Music_YellowIntro_Ch1: note F#, 1 note F_, 1 note F#, 2 - notetype $c, $b3 + notetype 12, $b3 note F#, 1 note E_, 1 note D#, 1 note C#, 1 - notetype $c, $b2 + notetype 12, $b2 octave 3 note B_, 16 endchannel -Music_YellowIntro_Ch2: + + +Music_YellowIntro_Ch2:: dutycycle 2 - vibrato $6, $15 - notetype $c, $c2 + vibrato 6, $15 + notetype 12, $c2 octave 3 note B_, 2 octave 4 @@ -119,7 +121,7 @@ Music_YellowIntro_Ch2: note D#, 1 note E_, 2 note E_, 4 - notetype $c, $c5 + notetype 12, $c5 note G#, 1 note G_, 1 note G#, 10 @@ -127,7 +129,7 @@ Music_YellowIntro_Ch2: note B_, 1 note A#, 1 note B_, 6 - notetype $c, $c7 + notetype 12, $c7 octave 4 note E_, 4 note G#, 4 @@ -141,24 +143,24 @@ Music_YellowIntro_Ch2: note E_, 4 octave 3 note B_, 6 - notetype $c, $c2 + notetype 12, $c2 octave 4 note E_, 2 - notetype $c, $c7 + notetype 12, $c7 octave 3 note B_, 6 - notetype $c, $c2 + notetype 12, $c2 octave 4 note E_, 2 - notetype $c, $c7 + notetype 12, $c7 note G#, 6 - notetype $c, $c2 + notetype 12, $c2 note B_, 2 - notetype $c, $c7 + notetype 12, $c7 note G#, 6 - notetype $c, $c2 + notetype 12, $c2 note B_, 2 - notetype $c, $c7 + notetype 12, $c7 note C#, 4 octave 3 note A_, 4 @@ -173,7 +175,7 @@ Music_YellowIntro_Ch2: note C#, 2 octave 3 note B_, 2 - notetype $c, $c3 + notetype 12, $c3 octave 4 note E_, 2 note G#, 4 @@ -186,7 +188,7 @@ Music_YellowIntro_Ch2: note F#, 1 note A_, 2 note A_, 4 - notetype $c, $c7 + notetype 12, $c7 note B_, 1 note A#, 1 note B_, 8 @@ -196,16 +198,18 @@ Music_YellowIntro_Ch2: note B_, 1 note A#, 1 note B_, 6 - notetype $c, $c3 + notetype 12, $c3 note B_, 1 note A_, 1 note G#, 1 note F#, 1 - notetype $c, $c2 + notetype 12, $c2 note E_, 16 endchannel -Music_YellowIntro_Ch3: - notetype $c, $10 + + +Music_YellowIntro_Ch3:: + notetype 12, $10 octave 4 note E_, 1 note __, 1 diff --git a/crysaudio/music/RBY/yellowunusedsong.asm b/crysaudio/music/RBY/yellowunusedsong.asm index a72ecd39..0ffad520 100644 --- a/crysaudio/music/RBY/yellowunusedsong.asm +++ b/crysaudio/music/RBY/yellowunusedsong.asm @@ -1,15 +1,15 @@ -Music_YellowUnusedSong: - dbw $C0, Music_YellowUnusedSong_Ch1 - dbw $01, Music_YellowUnusedSong_Ch2 - dbw $02, Music_YellowUnusedSong_Ch3 - dbw $03, Music_YellowUnusedSong_Ch4 +Music_YellowUnusedSong:: + musicheader 4, 1, Music_YellowUnusedSong_Ch1 + musicheader 1, 2, Music_YellowUnusedSong_Ch2 + musicheader 1, 3, Music_YellowUnusedSong_Ch3 + musicheader 1, 4, Music_YellowUnusedSong_Ch4 -Music_YellowUnusedSong_Ch1: +Music_YellowUnusedSong_Ch1:: tempo 140 - volume 119 + volume $77 dutycycle 3 - vibrato $8, $14 - notetype $8, $b2 + vibrato 8, $14 + notetype 8, $b2 octave 3 note A_, 6 note A_, 2 @@ -30,7 +30,8 @@ Music_YellowUnusedSong_Ch1: note A_, 6 note G_, 6 note A_, 12 -Music_YellowUnusedSong_branch_82fde: + +Music_YellowUnusedSong_branch_82fde:: note A_, 6 note A_, 2 note A_, 2 @@ -78,9 +79,11 @@ Music_YellowUnusedSong_branch_82fde: note G_, 6 note A_, 12 loopchannel 0, Music_YellowUnusedSong_branch_82fde -Music_YellowUnusedSong_Ch2: + + +Music_YellowUnusedSong_Ch2:: dutycycle 2 - notetype $8, $c2 + notetype 8, $c2 octave 4 note D_, 6 note D_, 2 @@ -103,7 +106,8 @@ Music_YellowUnusedSong_Ch2: note D_, 6 note A#, 6 note A_, 12 -Music_YellowUnusedSong_branch_8302a: + +Music_YellowUnusedSong_branch_8302a:: note D_, 6 note D_, 2 note D_, 2 @@ -125,7 +129,7 @@ Music_YellowUnusedSong_branch_8302a: note C_, 6 note G#, 6 note G_, 12 - notetype $8, $90 + notetype 8, $90 octave 3 note D#, 16 note D#, 8 @@ -137,7 +141,7 @@ Music_YellowUnusedSong_branch_8302a: octave 3 note D#, 12 note F_, 12 - notetype $8, $c2 + notetype 8, $c2 octave 4 note D_, 6 note D_, 2 @@ -161,9 +165,11 @@ Music_YellowUnusedSong_branch_8302a: note A#, 6 note A_, 12 loopchannel 0, Music_YellowUnusedSong_branch_8302a -Music_YellowUnusedSong_Ch3: - notetype $c, $10 - vibrato $2, $15 + + +Music_YellowUnusedSong_Ch3:: + notetype 12, $10 + vibrato 2, $15 note __, 16 note __, 12 octave 4 @@ -172,7 +178,8 @@ Music_YellowUnusedSong_Ch3: note D#, 8 note G_, 8 note A#, 8 -Music_YellowUnusedSong_branch_83075: + +Music_YellowUnusedSong_branch_83075:: note A_, 8 note A#, 8 note G_, 8 @@ -199,9 +206,11 @@ Music_YellowUnusedSong_branch_83075: note G_, 8 note A#, 8 loopchannel 0, Music_YellowUnusedSong_branch_83075 -Music_YellowUnusedSong_Ch4: - notetype 12 + + +Music_YellowUnusedSong_Ch4:: togglenoise 0 + notetype 12 note D_, 4 notetype 8 note D_, 2 @@ -228,7 +237,8 @@ Music_YellowUnusedSong_Ch4: note D_, 2 note D_, 4 note D_, 4 -Music_YellowUnusedSong_branch_830c3: + +Music_YellowUnusedSong_branch_830c3:: note D_, 4 notetype 8 note D_, 2 From 459b5bd615de3ec807b3f67259e459905ec4360f Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 28 Mar 2021 02:23:54 -0500 Subject: [PATCH 08/33] Misc clean up and small improvements --- audio.asm | 141 +++++++++++++++--------- audio/alternate_tempo.asm | 46 +++++--- audio/engine_2.asm | 4 +- audio/low_health_alarm.asm | 8 +- audio/play_battle_music.asm | 4 +- audio/pokedex_rating_sfx.asm | 14 +-- crysaudio/engine.asm | 6 +- crysaudio/macros.asm | 2 +- crysaudio/music/pinball/mewtwostage.asm | 22 ++-- crysaudio/sfx.asm | 118 ++++++++++++++++++++ data/predef_pointers.asm | 2 +- engine/battle/animations.asm | 2 +- engine/battle/core.asm | 10 +- engine/battle/end_of_battle.asm | 2 +- engine/items/item_effects.asm | 4 +- engine/movie/evolution.asm | 2 +- engine/movie/oak_speech/oak_speech.asm | 12 +- engine/movie/title.asm | 3 - engine/overworld/healing_machine.asm | 6 +- home.asm | 2 +- home/audio.asm | 14 +-- home/overworld.asm | 3 +- home/pokemon.asm | 52 +++++---- home/vblank.asm | 2 +- wram.asm | 5 +- 25 files changed, 326 insertions(+), 160 deletions(-) diff --git a/audio.asm b/audio.asm index 2a3258c2..1b8ef00d 100644 --- a/audio.asm +++ b/audio.asm @@ -13,18 +13,24 @@ INCLUDE "audio/headers/sfxheaders2.asm" SECTION "Sound Effect Headers 3", ROMX INCLUDE "audio/headers/sfxheaders3.asm" + SECTION "Sound Effects 1", ROMX -INCLUDE "audio/sfx/get_item1_1.asm" -INCLUDE "audio/sfx/get_item2_1.asm" -INCLUDE "audio/sfx/tink_1.asm" -INCLUDE "audio/sfx/heal_hp_1.asm" -INCLUDE "audio/sfx/heal_ailment_1.asm" INCLUDE "audio/sfx/start_menu_1.asm" +INCLUDE "audio/sfx/pokeflute.asm" +INCLUDE "audio/sfx/cut_1.asm" +INCLUDE "audio/sfx/go_inside_1.asm" +INCLUDE "audio/sfx/swap_1.asm" +INCLUDE "audio/sfx/tink_1.asm" +INCLUDE "audio/sfx/59_1.asm" +INCLUDE "audio/sfx/purchase_1.asm" +INCLUDE "audio/sfx/collision_1.asm" +INCLUDE "audio/sfx/go_outside_1.asm" INCLUDE "audio/sfx/press_ab_1.asm" -INCLUDE "audio/sfx/pokedex_rating_1.asm" -INCLUDE "audio/sfx/get_key_item_1.asm" +INCLUDE "audio/sfx/save_1.asm" +INCLUDE "audio/sfx/heal_hp_1.asm" INCLUDE "audio/sfx/poisoned_1.asm" +INCLUDE "audio/sfx/heal_ailment_1.asm" INCLUDE "audio/sfx/trade_machine_1.asm" INCLUDE "audio/sfx/turn_on_pc_1.asm" INCLUDE "audio/sfx/turn_off_pc_1.asm" @@ -43,26 +49,22 @@ INCLUDE "audio/sfx/arrow_tiles_1.asm" INCLUDE "audio/sfx/push_boulder_1.asm" INCLUDE "audio/sfx/ss_anne_horn_1.asm" INCLUDE "audio/sfx/withdraw_deposit_1.asm" -INCLUDE "audio/sfx/cut_1.asm" -INCLUDE "audio/sfx/go_inside_1.asm" -INCLUDE "audio/sfx/swap_1.asm" -INCLUDE "audio/sfx/59_1.asm" -INCLUDE "audio/sfx/purchase_1.asm" -INCLUDE "audio/sfx/collision_1.asm" -INCLUDE "audio/sfx/go_outside_1.asm" -INCLUDE "audio/sfx/save_1.asm" -INCLUDE "audio/sfx/pokeflute.asm" INCLUDE "audio/sfx/safari_zone_pa.asm" +INCLUDE "audio/sfx/get_item1_1.asm" +INCLUDE "audio/sfx/pokedex_rating_1.asm" +INCLUDE "audio/sfx/get_item2_1.asm" +INCLUDE "audio/sfx/get_key_item_1.asm" + + SECTION "Sound Effects 2", ROMX -INCLUDE "audio/sfx/level_up.asm" +INCLUDE "audio/sfx/silph_scope.asm" INCLUDE "audio/sfx/ball_toss.asm" INCLUDE "audio/sfx/ball_poof.asm" INCLUDE "audio/sfx/faint_thud.asm" INCLUDE "audio/sfx/run.asm" INCLUDE "audio/sfx/dex_page_added.asm" -INCLUDE "audio/sfx/caught_mon.asm" INCLUDE "audio/sfx/peck.asm" INCLUDE "audio/sfx/faint_fall.asm" INCLUDE "audio/sfx/battle_09.asm" @@ -111,7 +113,10 @@ INCLUDE "audio/sfx/battle_33.asm" INCLUDE "audio/sfx/battle_34.asm" INCLUDE "audio/sfx/battle_35.asm" INCLUDE "audio/sfx/battle_36.asm" -INCLUDE "audio/sfx/silph_scope.asm" + +INCLUDE "audio/sfx/level_up.asm" +INCLUDE "audio/sfx/caught_mon.asm" + SECTION "Sound Effects 3", ROMX @@ -184,6 +189,7 @@ SECTION "Songs 2", ROMX inc_section "crysaudio/music/route3.asm" inc_section "crysaudio/music/route12.asm" inc_section "crysaudio/music/kantogymbattle.asm" + inc_section "crysaudio/music/kantotrainerbattle.asm" inc_section "crysaudio/music/kantowildbattle.asm" inc_section "crysaudio/music/pokemoncenter.asm" inc_section "crysaudio/music/looklass.asm" @@ -278,7 +284,6 @@ SECTION "Songs 5", ROMX inc_section "crysaudio/music/suicunebattle.asm" inc_section "crysaudio/music/battletowerlobby.asm" inc_section "crysaudio/music/mobilecenter.asm" - inc_section "crysaudio/music/kantotrainerbattle.asm" SECTION "Extra Songs 1", ROMX @@ -287,6 +292,7 @@ SECTION "Extra Songs 1", ROMX inc_section "crysaudio/music/clair.asm" inc_section "crysaudio/music/mobileadapter.asm" + SECTION "Extra Songs 2", ROMX inc_section "crysaudio/music/postcredits.asm" @@ -294,35 +300,6 @@ SECTION "Extra Songs 2", ROMX SECTION "RBY Songs 1", ROMX - inc_section "crysaudio/music/RBY/bikeriding.asm" - inc_section "crysaudio/music/RBY/dungeon1.asm" - inc_section "crysaudio/music/RBY/gamecorner.asm" - inc_section "crysaudio/music/RBY/titlescreen.asm" - inc_section "crysaudio/music/RBY/dungeon2.asm" - inc_section "crysaudio/music/RBY/dungeon3.asm" - inc_section "crysaudio/music/RBY/cinnabarmansion.asm" - inc_section "crysaudio/music/RBY/oakslab.asm" - inc_section "crysaudio/music/RBY/pokemontower.asm" - inc_section "crysaudio/music/RBY/silphco.asm" - inc_section "crysaudio/music/RBY/meeteviltrainer.asm" - inc_section "crysaudio/music/RBY/meetfemaletrainer.asm" - inc_section "crysaudio/music/RBY/meetmaletrainer.asm" - inc_section "crysaudio/music/RBY/introbattle.asm" - inc_section "crysaudio/music/RBY/surfing.asm" - inc_section "crysaudio/music/RBY/jigglypuffsong.asm" - inc_section "crysaudio/music/RBY/halloffame.asm" - inc_section "crysaudio/music/RBY/credits.asm" - inc_section "crysaudio/music/RBY/gymleaderbattle.asm" - inc_section "crysaudio/music/RBY/trainerbattle.asm" - inc_section "crysaudio/music/RBY/wildbattle.asm" - inc_section "crysaudio/music/RBY/finalbattle.asm" - - -SECTION "RBY Songs 2", ROMX - - inc_section "crysaudio/music/RBY/defeatedtrainer.asm" - inc_section "crysaudio/music/RBY/defeatedwildmon.asm" - inc_section "crysaudio/music/RBY/defeatedgymleader.asm" inc_section "crysaudio/music/RBY/pkmnhealed.asm" inc_section "crysaudio/music/RBY/routes1.asm" inc_section "crysaudio/music/RBY/routes2.asm" @@ -344,13 +321,51 @@ SECTION "RBY Songs 2", ROMX inc_section "crysaudio/music/RBY/safarizone.asm" inc_section "crysaudio/music/RBY/gym.asm" inc_section "crysaudio/music/RBY/pokecenter.asm" + + +SECTION "RBY Songs 2", ROMX + + inc_section "crysaudio/music/RBY/gymleaderbattle.asm" + inc_section "crysaudio/music/RBY/trainerbattle.asm" + inc_section "crysaudio/music/RBY/wildbattle.asm" + inc_section "crysaudio/music/RBY/finalbattle.asm" + inc_section "crysaudio/music/RBY/defeatedtrainer.asm" + inc_section "crysaudio/music/RBY/defeatedwildmon.asm" + inc_section "crysaudio/music/RBY/defeatedgymleader.asm" + + +SECTION "RBY Songs 3", ROMX + + inc_section "crysaudio/music/RBY/bikeriding.asm" + inc_section "crysaudio/music/RBY/dungeon1.asm" + inc_section "crysaudio/music/RBY/gamecorner.asm" + inc_section "crysaudio/music/RBY/titlescreen.asm" + inc_section "crysaudio/music/RBY/dungeon2.asm" + inc_section "crysaudio/music/RBY/dungeon3.asm" + inc_section "crysaudio/music/RBY/cinnabarmansion.asm" + inc_section "crysaudio/music/RBY/oakslab.asm" + inc_section "crysaudio/music/RBY/pokemontower.asm" + inc_section "crysaudio/music/RBY/silphco.asm" + inc_section "crysaudio/music/RBY/meeteviltrainer.asm" + inc_section "crysaudio/music/RBY/meetfemaletrainer.asm" + inc_section "crysaudio/music/RBY/meetmaletrainer.asm" + inc_section "crysaudio/music/RBY/introbattle.asm" + inc_section "crysaudio/music/RBY/surfing.asm" + inc_section "crysaudio/music/RBY/jigglypuffsong.asm" + inc_section "crysaudio/music/RBY/halloffame.asm" + inc_section "crysaudio/music/RBY/credits.asm" + + +SECTION "RBY Songs 4", ROMX + inc_section "crysaudio/music/RBY/yellowintro.asm" inc_section "crysaudio/music/RBY/surfingpikachu.asm" - inc_section "crysaudio/music/RBY/meetjessiejames.asm" inc_section "crysaudio/music/RBY/yellowunusedsong.asm" + inc_section "crysaudio/music/RBY/meetjessiejames.asm" SECTION "TCG Songs 1", ROMX + inc_section "crysaudio/music/TCG/titlescreen.asm" inc_section "crysaudio/music/TCG/dueltheme1.asm" inc_section "crysaudio/music/TCG/dueltheme2.asm" @@ -368,6 +383,7 @@ SECTION "TCG Songs 1", ROMX SECTION "TCG Songs 2", ROMX + inc_section "crysaudio/music/TCG/ronald.asm" inc_section "crysaudio/music/TCG/imakuni.asm" inc_section "crysaudio/music/TCG/hallofhonor.asm" @@ -383,6 +399,7 @@ SECTION "TCG Songs 2", ROMX SECTION "TCG2 Songs 1", ROMX + inc_section "crysaudio/music/TCG2/titlescreen.asm" inc_section "crysaudio/music/TCG2/herecomesgr.asm" inc_section "crysaudio/music/TCG2/groverworld.asm" @@ -395,6 +412,7 @@ SECTION "TCG2 Songs 1", ROMX SECTION "TCG2 Songs 2", ROMX + inc_section "crysaudio/music/TCG2/gamecorner.asm" inc_section "crysaudio/music/TCG2/grblimp.asm" inc_section "crysaudio/music/TCG2/grdueltheme1.asm" @@ -404,6 +422,7 @@ SECTION "TCG2 Songs 2", ROMX SECTION "TCG2 Songs 3", ROMX + inc_section "crysaudio/music/TCG2/imakuni2.asm" inc_section "crysaudio/music/TCG2/credits.asm" inc_section "crysaudio/music/TCG2/diddly1.asm" @@ -414,7 +433,8 @@ SECTION "TCG2 Songs 3", ROMX inc_section "crysaudio/music/TCG2/diddly6.asm" -SECTION "Pinball Songs", ROMX +SECTION "Pinball Songs 1", ROMX + inc_section "crysaudio/music/pinball/redfield.asm" inc_section "crysaudio/music/pinball/catchemred.asm" inc_section "crysaudio/music/pinball/hurryupred.asm" @@ -423,22 +443,35 @@ SECTION "Gastly and Haunter Graveyard", ROMX INCLUDE "crysaudio/music/pinball/gastlyinthegraveyard.asm" INCLUDE "crysaudio/music/pinball/haunterinthegraveyard.asm" inc_section "crysaudio/music/pinball/gengarinthegraveyard.asm" + + +SECTION "Pinball Songs 2", ROMX + inc_section "crysaudio/music/pinball/bluefield.asm" inc_section "crysaudio/music/pinball/catchemblue.asm" inc_section "crysaudio/music/pinball/hurryupblue.asm" inc_section "crysaudio/music/pinball/hiscore.asm" inc_section "crysaudio/music/pinball/gameover.asm" + + +SECTION "Pinball Songs 3", ROMX + inc_section "crysaudio/music/pinball/whackthediglett.asm" inc_section "crysaudio/music/pinball/whackthedugtrio.asm" - - -SECTION "Pinball Songs 2", ROMX inc_section "crysaudio/music/pinball/seelstage.asm" inc_section "crysaudio/music/pinball/title.asm" + + +SECTION "Pinball Songs 4", ROMX + inc_section "crysaudio/music/pinball/mewtwostage.asm" inc_section "crysaudio/music/pinball/options.asm" inc_section "crysaudio/music/pinball/fieldselect.asm" inc_section "crysaudio/music/pinball/meowthstage.asm" + + +SECTION "Pinball Songs 5", ROMX + inc_section "crysaudio/music/pinball/endcredits.asm" inc_section "crysaudio/music/pinball/nameentry.asm" diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm index 24c3dd9e..d6b70ad6 100644 --- a/audio/alternate_tempo.asm +++ b/audio/alternate_tempo.asm @@ -1,29 +1,40 @@ ; an alternate start for MeetRival which has a different first measure Music_RivalAlternateStart:: + ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL jp PlayMusic - ;ld hl, wChannelCommandPointers - ;ld de, Music_MeetRival_branch_b1a2 - ;call Audio1_OverwriteChannelPointer - ;ld de, Music_MeetRival_branch_b21d - ;call Audio1_OverwriteChannelPointer - ;ld de, Music_MeetRival_branch_b2b5 +; call PlayMusic +; ld hl, wChannelCommandPointers +; ld de, Music_MeetRival_branch_b1a2 +; call Audio1_OverwriteChannelPointer +; ld de, Music_MeetRival_branch_b21d +; call Audio1_OverwriteChannelPointer +; ld de, Music_MeetRival_branch_b2b5 + +;Audio1_OverwriteChannelPointer: +; ld a, e +; ld [hli], a +; ld a, d +; ld [hli], a +; ret ; an alternate tempo for MeetRival which is slightly slower Music_RivalAlternateTempo:: - ld c, BANK(Music_MeetRival) + ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL jp PlayMusic - ;ld hl, wChannelCommandPointers - ;ld de, Music_MeetRival_branch_b119 - ;jp Audio1_OverwriteChannelPointer +; call PlayMusic +; ld hl, wChannelCommandPointers +; ld de, Music_MeetRival_branch_b119 +; jp Audio1_OverwriteChannelPointer ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo:: jp Music_RivalAlternateStart - ;ld hl, wChannelCommandPointers - ;ld de, Music_MeetRival_branch_b19b - ;jp Audio1_OverwriteChannelPointer +; call Music_RivalAlternateStart +; ld hl, wChannelCommandPointers +; ld de, Music_MeetRival_branch_b19b +; jp Audio1_OverwriteChannelPointer ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo:: @@ -34,9 +45,10 @@ Music_Cities1AlternateTempo:: ld [wAudioFadeOutControl], a ld c, 100 call DelayFrames ; wait for the fade-out to finish - ld c, BANK(Music_Cities1) + ld c, 0 ; BANK(Music_Cities1) ld a, MUSIC_CITIES1 jp PlayMusic - ;ld hl, wChannelCommandPointers - ;ld de, Music_Cities1_branch_aa6f - ;jp Audio1_OverwriteChannelPointer +; call PlayMusic +; ld hl, wChannelCommandPointers +; ld de, Music_Cities1_branch_aa6f +; jp Audio1_OverwriteChannelPointer diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 51a5d7c4..3de43a70 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -163,7 +163,7 @@ Audio2_PlayNextNote: ld a, c cp Ch5 jr nz, .beginChecks - ld a, [wLowHealthAlarm] ; low health alarm enabled? + ld a, [wLowHealthAlarmOrig] ; low health alarm enabled? bit 7, a ret nz .beginChecks @@ -976,7 +976,7 @@ Audio2_ResetCryModifiers: ld a, c cp Ch5 jr nz, .skip - ld a, [wLowHealthAlarm] + ld a, [wLowHealthAlarmOrig] bit 7, a jr z, .skip xor a diff --git a/audio/low_health_alarm.asm b/audio/low_health_alarm.asm index a550cf70..6584a889 100644 --- a/audio/low_health_alarm.asm +++ b/audio/low_health_alarm.asm @@ -1,5 +1,5 @@ Music_DoLowHealthAlarm:: - ld a, [wLowHealthAlarm] + ld a, [wLowHealthAlarmOrig] cp $ff jr z, .disableAlarm @@ -21,19 +21,19 @@ Music_DoLowHealthAlarm:: .asm_2138a ld a, $86 ld [wChannelSoundIDs + Ch5], a ;disable sound channel? - ld a, [wLowHealthAlarm] + ld a, [wLowHealthAlarmOrig] and $7f ;decrement alarm timer. dec a .asm_21395 ; reset the timer and enable flag. set 7, a - ld [wLowHealthAlarm], a + ld [wLowHealthAlarmOrig], a ret .disableAlarm xor a - ld [wLowHealthAlarm], a ;disable alarm + ld [wLowHealthAlarmOrig], a ;disable alarm ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 9b399a24..6fbdb315 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -1,13 +1,13 @@ PlayBattleMusic:: xor a ld [wAudioFadeOutControl], a - ld [wLowHealthAlarm], a + ld [wLowHealthAlarmOrig], a ld [wMusicFade], a dec a ; SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlayMusic call DelayFrame - ;ld c, BANK(Music_GymLeaderBattle) + ld c, 0 ; BANK(Music_GymLeaderBattle) ld a, [wGymLeaderNo] and a jr z, .notGymLeaderBattle diff --git a/audio/pokedex_rating_sfx.asm b/audio/pokedex_rating_sfx.asm index b1eeced7..4fa8cc04 100644 --- a/audio/pokedex_rating_sfx.asm +++ b/audio/pokedex_rating_sfx.asm @@ -25,13 +25,13 @@ PlayPokedexRatingSfx:: jp PlayDefaultMusic PokedexRatingSfxPointers: - db SFX_DENIED, BANK(SFX_Denied_1) - db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1) - db SFX_GET_ITEM_1, BANK(SFX_Get_Item1_1) - db SFX_CAUGHT_MON, BANK(SFX_Caught_Mon) - db SFX_LEVEL_UP, BANK(SFX_Level_Up) - db SFX_GET_KEY_ITEM, BANK(SFX_Get_Key_Item_1) - db SFX_GET_ITEM_2, BANK(SFX_Get_Item2_1) + db SFX_DENIED, 0 ; BANK(SFX_Denied_1) + db SFX_POKEDEX_RATING, 0 ; BANK(SFX_Pokedex_Rating_1) + db SFX_GET_ITEM_1, 0 ; BANK(SFX_Get_Item1_1) + db SFX_CAUGHT_MON, 0 ; BANK(SFX_Caught_Mon) + db SFX_LEVEL_UP, 0 ; BANK(SFX_Level_Up) + db SFX_GET_KEY_ITEM, 0 ; BANK(SFX_Get_Key_Item_1) + db SFX_GET_ITEM_2, 0 ; BANK(SFX_Get_Item2_1) OwnedMonValues: db 10, 40, 60, 90, 120, 150, $ff diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index 93101c94..978963be 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -236,7 +236,7 @@ UpdateChannels: dw .Channel8 .Channel1: - ld a, [wDanger] ; XXX + ld a, [wLowHealthAlarm] bit DANGER_ON_F, a ret nz .Channel5: @@ -527,7 +527,7 @@ _CheckSFX: ret PlayDanger: - ld a, [wDanger] ; XXX + ld a, [wLowHealthAlarm] bit DANGER_ON_F, a ret z @@ -575,7 +575,7 @@ PlayDanger: .noreset ; Make sure the danger sound is kept on or 1 << DANGER_ON_F - ld [wDanger], a ; XXX + ld [wLowHealthAlarm], a ; Enable channel 1 if it's off ld a, [wSoundOutput] diff --git a/crysaudio/macros.asm b/crysaudio/macros.asm index fcfa08dc..e41059a1 100644 --- a/crysaudio/macros.asm +++ b/crysaudio/macros.asm @@ -106,7 +106,7 @@ FIRST_MUSIC_CMD EQU const_value const octave_cmd ; $d0 octave: MACRO - assert 0 < (\1) && (\1) <= 8, "octave must be 1-8" + assert 1 <= (\1) && (\1) <= 8, "octave must be 1-8" db octave_cmd | 8 - (\1) ; octave ENDM diff --git a/crysaudio/music/pinball/mewtwostage.asm b/crysaudio/music/pinball/mewtwostage.asm index 6b5bdd95..85dca944 100644 --- a/crysaudio/music/pinball/mewtwostage.asm +++ b/crysaudio/music/pinball/mewtwostage.asm @@ -633,17 +633,17 @@ Music_MewtwoStage_branch_49043: sound_ret ; unreferenced -; note_type 2, 12, 8 -; octave 3 -; note B_, 1 -; volume_envelope 10, 8 -; note G_, 1 -; volume_envelope 7, 8 -; note D#, 1 -; volume_envelope 4, 8 -; octave 2 -; note B_, 1 -; sound_ret + note_type 2, 12, 8 + octave 3 + note B_, 1 + volume_envelope 10, 8 + note G_, 1 + volume_envelope 7, 8 + note D#, 1 + volume_envelope 4, 8 + octave 2 + note B_, 1 + sound_ret Music_MewtwoStage_branch_49062: note_type 3, 12, 8 diff --git a/crysaudio/sfx.asm b/crysaudio/sfx.asm index 4b9b7169..83dd5f6d 100644 --- a/crysaudio/sfx.asm +++ b/crysaudio/sfx.asm @@ -1063,6 +1063,8 @@ Sfx_RegisterPhoneNumber_Ch5: rest 8 sound_ret + toggle_sfx ; unused + Sfx_RegisterPhoneNumber_Ch6: toggle_sfx duty_cycle 3 @@ -1085,6 +1087,8 @@ Sfx_RegisterPhoneNumber_Ch6: rest 8 sound_ret + toggle_sfx ; unused + Sfx_RegisterPhoneNumber_Ch7: toggle_sfx note_type 12, 2, 5 @@ -1104,6 +1108,8 @@ Sfx_RegisterPhoneNumber_Ch7: rest 8 sound_ret + toggle_sfx ; unused + Sfx_RegisterPhoneNumber_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -1113,6 +1119,8 @@ Sfx_RegisterPhoneNumber_Ch8: rest 16 sound_ret + toggle_sfx ; unused + Sfx_3rdPlace: channel_count 3 channel 5, Sfx_3rdPlace_Ch5 @@ -1136,6 +1144,8 @@ Sfx_3rdPlace_Ch5: note D_, 6 sound_ret + toggle_sfx ; unused + Sfx_3rdPlace_Ch6: toggle_sfx duty_cycle 2 @@ -1151,6 +1161,8 @@ Sfx_3rdPlace_Ch6: note G_, 6 sound_ret + toggle_sfx ; unused + Sfx_3rdPlace_Ch7: toggle_sfx note_type 12, 2, 5 @@ -1166,6 +1178,8 @@ Sfx_3rdPlace_Ch7: note B_, 6 sound_ret + toggle_sfx ; unused + Sfx_GetEgg: channel_count 4 channel 5, Sfx_GetEgg_Ch5 @@ -1203,6 +1217,8 @@ Sfx_GetEgg_Ch5: rest 9 sound_ret + toggle_sfx ; unused + Sfx_GetEgg_Ch6: toggle_sfx vibrato 18, 3, 4 @@ -1230,6 +1246,8 @@ Sfx_GetEgg_Ch6: rest 9 sound_ret + toggle_sfx ; unused + Sfx_GetEgg_Ch7: toggle_sfx note_type 8, 2, 5 @@ -1247,6 +1265,8 @@ Sfx_GetEgg_Ch7: rest 9 sound_ret + toggle_sfx ; unused + Sfx_GetEgg_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -1257,6 +1277,8 @@ Sfx_GetEgg_Ch8: rest 12 sound_ret + toggle_sfx ; unused + Sfx_MoveDeleted: channel_count 4 channel 5, Sfx_MoveDeleted_Ch5 @@ -1292,6 +1314,8 @@ Sfx_MoveDeleted_Ch5: rest 6 sound_ret + toggle_sfx ; unused + Sfx_MoveDeleted_Ch6: toggle_sfx duty_cycle 3 @@ -1326,6 +1350,8 @@ Sfx_MoveDeleted_Ch6: rest 6 sound_ret + toggle_sfx ; unused + Sfx_MoveDeleted_Ch7: toggle_sfx note_type 6, 2, 5 @@ -1351,6 +1377,8 @@ Sfx_MoveDeleted_Ch7: rest 6 sound_ret + toggle_sfx ; unused + Sfx_MoveDeleted_Ch8: toggle_sfx sfx_toggle_noise 3 @@ -1361,6 +1389,8 @@ Sfx_MoveDeleted_Ch8: rest 6 sound_ret + toggle_sfx ; unused + Sfx_2ndPlace: channel_count 4 channel 5, Sfx_2ndPlace_Ch5 @@ -1400,6 +1430,8 @@ Sfx_2ndPlace_Ch5: rest 6 sound_ret + toggle_sfx ; unused + Sfx_2ndPlace_Ch6: toggle_sfx duty_cycle 2 @@ -1422,6 +1454,8 @@ Sfx_2ndPlace_Ch6: rest 6 sound_ret + toggle_sfx ; unused + Sfx_2ndPlace_Ch7: toggle_sfx note_type 8, 2, 5 @@ -1458,6 +1492,8 @@ Sfx_2ndPlace_Ch7: rest 6 sound_ret + toggle_sfx ; unused + Sfx_2ndPlace_Ch8: toggle_sfx sfx_toggle_noise 3 @@ -1471,6 +1507,8 @@ Sfx_2ndPlace_Ch8: rest 6 sound_ret + toggle_sfx ; unused + Sfx_1stPlace: channel_count 4 channel 5, Sfx_1stPlace_Ch5 @@ -1517,6 +1555,8 @@ Sfx_1stPlace_Ch5: rest 6 sound_ret + toggle_sfx ; unused + Sfx_1stPlace_Ch6: toggle_sfx duty_cycle 3 @@ -1539,6 +1579,8 @@ Sfx_1stPlace_Ch6: rest 6 sound_ret + toggle_sfx ; unused + Sfx_1stPlace_Ch7: toggle_sfx note_type 12, 2, 5 @@ -1561,6 +1603,8 @@ Sfx_1stPlace_Ch7: rest 6 sound_ret + toggle_sfx ; unused + Sfx_1stPlace_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -1580,6 +1624,8 @@ Sfx_1stPlace_Ch8: rest 6 sound_ret + toggle_sfx ; unused + Sfx_ChooseACard: channel_count 4 channel 5, Sfx_ChooseACard_Ch5 @@ -1631,6 +1677,8 @@ Sfx_ChooseACard_Ch5: rest 12 sound_ret + toggle_sfx ; unused + Sfx_ChooseACard_Ch6: toggle_sfx duty_cycle 3 @@ -1661,6 +1709,8 @@ Sfx_ChooseACard_Ch6: rest 12 sound_ret + toggle_sfx ; unused + Sfx_ChooseACard_Ch7: toggle_sfx note_type 6, 2, 5 @@ -1695,6 +1745,8 @@ Sfx_ChooseACard_Ch7: rest 12 sound_ret + toggle_sfx ; unused + Sfx_ChooseACard_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -1718,6 +1770,8 @@ Sfx_ChooseACard_Ch8: note B_, 16 sound_ret + toggle_sfx ; unused + Sfx_GetTm: channel_count 4 channel 5, Sfx_GetTm_Ch5 @@ -1749,6 +1803,8 @@ Sfx_GetTm_Ch5: rest 6 sound_ret + toggle_sfx ; unused + Sfx_GetTm_Ch6: toggle_sfx duty_cycle 3 @@ -1770,6 +1826,8 @@ Sfx_GetTm_Ch6: rest 6 sound_ret + toggle_sfx ; unused + Sfx_GetTm_Ch7: toggle_sfx note_type 6, 2, 5 @@ -1799,6 +1857,8 @@ Sfx_GetTm_Ch7: rest 6 sound_ret + toggle_sfx ; unused + Sfx_GetTm_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -1817,6 +1877,8 @@ Sfx_GetTm_Ch8: rest 6 sound_ret + toggle_sfx ; unused + Sfx_GetBadge: channel_count 4 channel 5, Sfx_GetBadge_Ch5 @@ -1843,6 +1905,8 @@ Sfx_GetBadge_Ch5: rest 6 sound_ret + toggle_sfx ; unused + .sub1: rest 5 octave 3 @@ -1912,6 +1976,8 @@ Sfx_GetBadge_Ch6: rest 6 sound_ret + toggle_sfx ; unused + Sfx_GetBadge_Ch7: toggle_sfx note_type 6, 2, 5 @@ -1949,6 +2015,8 @@ Sfx_GetBadge_Ch7: rest 6 sound_ret + toggle_sfx ; unused + Sfx_GetBadge_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -1973,6 +2041,8 @@ Sfx_GetBadge_Ch8: rest 6 sound_ret + toggle_sfx ; unused + Sfx_QuitSlots: channel_count 4 channel 5, Sfx_QuitSlots_Ch5 @@ -2010,6 +2080,8 @@ Sfx_QuitSlots_Ch5: rest 6 sound_ret + toggle_sfx ; unused + Sfx_QuitSlots_Ch6: toggle_sfx duty_cycle 2 @@ -2035,6 +2107,8 @@ Sfx_QuitSlots_Ch6: rest 6 sound_ret + toggle_sfx ; unused + Sfx_QuitSlots_Ch7: toggle_sfx note_type 8, 2, 5 @@ -2064,6 +2138,8 @@ Sfx_QuitSlots_Ch7: rest 6 sound_ret + toggle_sfx ; unused + Sfx_QuitSlots_Ch8: toggle_sfx sfx_toggle_noise 3 @@ -2082,6 +2158,8 @@ Sfx_QuitSlots_Ch8: rest 6 sound_ret + toggle_sfx ; unused + Sfx_Protect: channel_count 2 channel 5, Sfx_Protect_Ch5 @@ -2970,6 +3048,8 @@ Sfx_DexFanfareLessThan20_Ch5: note D_, 6 sound_ret + toggle_sfx ; unused + Sfx_DexFanfareLessThan20_Ch6: toggle_sfx note_type 8, 12, 1 @@ -2987,6 +3067,8 @@ Sfx_DexFanfareLessThan20_Ch6: note F#, 6 sound_ret + toggle_sfx ; unused + Sfx_DexFanfareLessThan20_Ch7: toggle_sfx note_type 8, 2, 5 @@ -3013,6 +3095,8 @@ Sfx_DexFanfareLessThan20_Ch7: rest 6 sound_ret + toggle_sfx ; unused + Sfx_DexFanfareLessThan20_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -3022,6 +3106,8 @@ Sfx_DexFanfareLessThan20_Ch8: rest 12 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare140169: channel_count 4 channel 5, Sfx_DexFanfare140169_Ch5 @@ -3056,6 +3142,8 @@ Sfx_DexFanfare140169_Ch5: rest 8 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare140169_Ch6: toggle_sfx duty_cycle 2 @@ -3080,6 +3168,8 @@ Sfx_DexFanfare140169_Ch6: rest 8 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare140169_Ch7: toggle_sfx note_type 12, 2, 5 @@ -3112,6 +3202,8 @@ Sfx_DexFanfare140169_Ch7: rest 4 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare140169_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -3127,6 +3219,8 @@ Sfx_DexFanfare140169_Ch8: note D_, 8 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare170199: channel_count 4 channel 5, Sfx_DexFanfare170199_Ch5 @@ -3161,6 +3255,8 @@ Sfx_DexFanfare170199_Ch5: rest 4 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare170199_Ch6: toggle_sfx vibrato 18, 3, 4 @@ -3187,6 +3283,8 @@ Sfx_DexFanfare170199_Ch6: rest 4 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare170199_Ch7: toggle_sfx note_type 8, 2, 5 @@ -3213,6 +3311,8 @@ Sfx_DexFanfare170199_Ch7: rest 4 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare170199_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -3233,6 +3333,8 @@ Sfx_DexFanfare170199_Ch8: note B_, 16 sound_ret + db sound_loop_cmd ; unused + Sfx_DexFanfare200229: channel_count 4 channel 5, Sfx_DexFanfare200229_Ch5 @@ -3265,6 +3367,8 @@ Sfx_DexFanfare200229_Ch5: rest 4 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare200229_Ch6: toggle_sfx vibrato 18, 3, 4 @@ -3286,6 +3390,8 @@ Sfx_DexFanfare200229_Ch6: rest 4 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare200229_Ch7: toggle_sfx note_type 8, 2, 5 @@ -3328,6 +3434,8 @@ Sfx_DexFanfare200229_Ch7: rest 6 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare200229_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -3355,6 +3463,8 @@ Sfx_DexFanfare200229_Ch8: note B_, 12 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare230Plus: channel_count 4 channel 5, Sfx_DexFanfare230Plus_Ch5 @@ -3408,6 +3518,8 @@ Sfx_DexFanfare230Plus_Ch5: rest 2 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare230Plus_Ch6: toggle_sfx vibrato 18, 3, 4 @@ -3441,6 +3553,8 @@ Sfx_DexFanfare230Plus_Ch6: rest 2 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare230Plus_Ch7: toggle_sfx note_type 8, 2, 5 @@ -3488,6 +3602,8 @@ Sfx_DexFanfare230Plus_Ch7: rest 2 sound_ret + toggle_sfx ; unused + Sfx_DexFanfare230Plus_Ch8: toggle_sfx sfx_toggle_noise 4 @@ -3522,6 +3638,8 @@ Sfx_DexFanfare230Plus_Ch8: note D_, 6 sound_ret + toggle_sfx ; unused + Sfx_NotVeryEffective: channel_count 1 channel 8, Sfx_NotVeryEffective_Ch8 diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 99492a9d..b8911f3c 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -16,7 +16,7 @@ PredefPointers:: add_predef ScaleSpriteByTwo add_predef LoadMonBackPic add_predef CopyDownscaledMonTiles - add_predef LoadMissableObjects ; add_predef JumpMoveEffect, $03 ; wrong bank + add_predef JumpMoveEffect, $03 ; wrong bank add_predef HealParty add_predef MoveAnimation add_predef DivideBCDPredef diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index fa7d92f8..7456970f 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2618,7 +2618,7 @@ PlayApplyingAttackSound: ; play a different sound depending if move is not very effective, neutral, or super-effective ; don't play any sound at all if move is ineffective call WaitForSoundToFinish - ld a, [wDamageMultipliers] ; effectiveness + ld a, [wDamageMultipliers] and $7f ret z cp 10 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 375b2f4c..6ec79349 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -865,7 +865,7 @@ EndLowHealthAlarm: ; This function is called when the player has the won the battle. It turns off ; the low health alarm and prevents it from reactivating until the next battle. xor a - ld [wDanger], a ; turn off low health alarm + ld [wLowHealthAlarm], a ; turn off low health alarm ld [wChannelSoundIDs + Ch5], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating @@ -1008,11 +1008,11 @@ RemoveFaintedPlayerMon: predef FlagActionPredef ; clear gain exp flag for fainted mon ld hl, wEnemyBattleStatus1 res 2, [hl] ; reset "attacking multiple times" flag - ld a, [wDanger] + ld a, [wLowHealthAlarm] bit 7, a ; skip sound flag (red bar (?)) jr z, .skipWaitForSound ld a, $ff - ld [wDanger], a ;disable low health alarm + ld [wLowHealthAlarm], a ;disable low health alarm call WaitForSoundToFinish .skipWaitForSound ; a is 0, so this zeroes the enemy's accumulated damage. @@ -1859,7 +1859,7 @@ DrawPlayerHUDAndHPBar: cp HP_BAR_RED jr z, .setLowHealthAlarm .fainted - ld hl, wDanger + ld hl, wLowHealthAlarm bit 7, [hl] ;low health alarm enabled? ld [hl], $0 ret z @@ -1867,7 +1867,7 @@ DrawPlayerHUDAndHPBar: ld [wChannelSoundIDs + Ch5], a ret .setLowHealthAlarm - ld hl, wDanger + ld hl, wLowHealthAlarm set 7, [hl] ;enable low health alarm ret diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index 39304fe0..bd4a1901 100644 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -45,7 +45,7 @@ EndOfBattle: predef EvolutionAfterBattle .resetVariables xor a - ld [wDanger], a ;disable low health alarm + ld [wLowHealthAlarm], a ;disable low health alarm ld [wChannelSoundIDs + Ch5], a ld [wIsInBattle], a ld [wBattleType], a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index a02c47e6..7ba1080f 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -990,7 +990,7 @@ ItemUseMedicine: jp .cureStatusAilment .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a - ld [wDanger], a ;disable low health alarm + ld [wLowHealthAlarm], a ;disable low health alarm ld [wChannelSoundIDs + Ch5], a push hl push de @@ -1731,7 +1731,7 @@ ItemUsePokeflute: ; if some pokemon were asleep ld hl, PlayedFluteHadEffectText call PrintText - ld a, [wDanger] + ld a, [wLowHealthAlarm] and $80 jr nz, .skipMusic call WaitForSoundToFinish ; wait for sound to end diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm index 734b1ffc..4c60cbdb 100644 --- a/engine/movie/evolution.asm +++ b/engine/movie/evolution.asm @@ -7,7 +7,7 @@ EvolveMon: ld a, [wd0b5] push af xor a - ld [wDanger], a + ld [wLowHealthAlarm], a ld [wChannelSoundIDs + Ch5], a dec a ; SFX_STOP_ALL_MUSIC ld [wNewSoundID], a diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index a7515a4e..333639af 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -131,11 +131,15 @@ OakSpeech: ld a, 0 ; BANK(Music_PalletTown) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a + ld a, 10 - ld [wAudioFadeOutControl], a - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound + call StopMusic +; ld a, 10 +; ld [wAudioFadeOutControl], a +; ld a, SFX_STOP_ALL_MUSIC +; ld [wNewSoundID], a +; call PlaySound + pop af ldh [hLoadedROMBank], a ld [MBC1RomBank], a diff --git a/engine/movie/title.asm b/engine/movie/title.asm index a544895f..fa489cf8 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -182,9 +182,6 @@ ENDC ret .finishedBouncingPokemonLogo - xor a - ldh [hSCY], a - call LoadScreenTilesFromBuffer1 ld c, 36 call DelayFrames diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 80dc93c7..94b5755d 100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -1,7 +1,4 @@ AnimateHealingMachine: - xor a - call PlayMusic - ld de, PokeCenterFlashingMonitorAndHealBall ld hl, vChars0 tile $7c lb bc, BANK(PokeCenterFlashingMonitorAndHealBall), 3 ; should be 2 @@ -19,6 +16,9 @@ AnimateHealingMachine: ld de, PokeCenterOAMData call CopyHealingMachineOAM + ld a, 4 + call StopMusic + call WaitForSongToFinish ; ld a, 4 ; ld [wAudioFadeOutControl], a ; ld a, SFX_STOP_ALL_MUSIC diff --git a/home.asm b/home.asm index ee507c21..8bcc03e0 100644 --- a/home.asm +++ b/home.asm @@ -44,7 +44,7 @@ INCLUDE "data/items/marts.asm" INCLUDE "home/overworld_text.asm" INCLUDE "home/uncompress.asm" INCLUDE "home/reset_player_sprite.asm" -INCLUDE "home/fade_audio.asm" +;INCLUDE "home/fade_audio.asm" INCLUDE "home/text_script.asm" INCLUDE "home/start_menu.asm" INCLUDE "home/count_set_bits.asm" diff --git a/home/audio.asm b/home/audio.asm index d2c69bf7..d42cd1ff 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -51,7 +51,7 @@ PlayDefaultMusicCommon:: ld a, [wMapMusicSoundID] ld b, a ; call CompareMapMusicBankWithCurrentBank - jr c, .next4 +; jr c, .next4 .next3 ld a, [wLastMusicSoundID] @@ -100,7 +100,7 @@ OpenSRAMForSound:: ld [MBC1SRamBank], a ret -;MapSetup_Sound_Off:: +;InitSound:: ; push hl ; push de ; push bc @@ -110,11 +110,11 @@ OpenSRAMForSound:: ; ; ldh a, [hLoadedROMBank] ; push af -; ld a, BANK(_MapSetup_Sound_Off) +; ld a, BANK(_InitSound) ; ldh [hLoadedROMBank], a ; ld [MBC1RomBank], a ; -; call _MapSetup_Sound_Off +; call _InitSound ; ; pop af ; ldh [hLoadedROMBank], a @@ -155,7 +155,7 @@ UpdateSound:: ret _LoadMusicByte:: -; wCurMusicByte = [a:de] +; [wCurMusicByte] = [a:de] ldh [hLoadedROMBank], a ld [MBC1RomBank], a @@ -300,7 +300,7 @@ endr PlaySFX:: ; Play sound effect de. -; Sound effects are ordered by priority (lowest to highest) +; Sound effects are ordered by priority (highest to lowest) push hl push de @@ -348,7 +348,7 @@ WaitPlaySFX:: ; Wait for sound to finish playing WaitForSoundToFinish:: WaitSFX:: - ld a, [wDanger] + ld a, [wLowHealthAlarm] and a ret nz ld a, [wSFXDontWait] diff --git a/home/overworld.asm b/home/overworld.asm index c7f161ee..b3d964df 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -771,10 +771,9 @@ HandleBlackOut:: jp SpecialEnterMap StopMusic:: + ld [wMusicFade], a xor a ld [wMusicFadeID], a - ld a, 1 - ld [wMusicFade], a .wait0 ld a, [wMusicFadeCount] and a diff --git a/home/pokemon.asm b/home/pokemon.asm index 1f3112df..196407a9 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -138,37 +138,41 @@ LoadFrontSpriteByMonIndex:: ret -; PlayCry +;PlayCry:: +; Play monster a's cry. +; call GetCryData +; call PlaySound +; jp WaitForSoundToFinish -GetCryData:: +;GetCryData:: ; Load cry data for monster a. - dec a - ld c, a - ld b, 0 - ld hl, CryData - add hl, bc - add hl, bc - add hl, bc +; dec a +; ld c, a +; ld b, 0 +; ld hl, CryData +; add hl, bc +; add hl, bc +; add hl, bc - ld a, BANK(CryData) - call BankswitchHome - ld a, [hli] - ld b, a ; cry id - ld a, [hli] - ld [wFrequencyModifier], a - ld a, [hl] - ld [wTempoModifier], a - call BankswitchBack +; ld a, BANK(CryData) +; call BankswitchHome +; ld a, [hli] +; ld b, a ; cry id +; ld a, [hli] +; ld [wFrequencyModifier], a +; ld a, [hl] +; ld [wTempoModifier], a +; call BankswitchBack ; Cry headers have 3 channels, ; and start from index CRY_SFX_START, ; so add 3 times the cry id. - ld a, b - ld c, $14 ; CRY_SFX_START - rlca ; * 2 - add b - add c - ret +; ld a, b +; ld c, CRY_SFX_START +; rlca ; * 2 +; add b +; add c +; ret DisplayPartyMenu:: ldh a, [hTileAnimations] diff --git a/home/vblank.asm b/home/vblank.asm index bb645a44..40c01647 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -50,9 +50,9 @@ VBlank:: ldh [hFrameCounter], a .skipDec + call UpdateSound ; call FadeOutAudio - call UpdateSound ; ld a, [wAudioROMBank] ; music ROM bank ; ldh [hLoadedROMBank], a ; ld [MBC1RomBank], a diff --git a/wram.asm b/wram.asm index 57b44196..b12489ca 100644 --- a/wram.asm +++ b/wram.asm @@ -1756,7 +1756,7 @@ wBaseCoordY:: ; low health alarm counter/enable ; high bit = enable, others = timer to cycle frequencies -wLowHealthAlarm:: ds 1 +wLowHealthAlarmOrig:: ds 1 wFBTileCounter:: ; counts how many tiles of the current frame block have been drawn @@ -3254,8 +3254,7 @@ wNoiseSampleDelay:: db wMusicNoiseSampleSet:: db wSFXNoiseSampleSet:: db -;wLowHealthAlarm:: -wDanger:: +wLowHealthAlarm:: ; bit 7: on/off ; bit 4: pitch ; bit 0-3: counter From baf447a260a743e963e329e69dc06b4217409b28 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 28 Mar 2021 12:19:18 -0500 Subject: [PATCH 09/33] Fix channel 4 loop points --- crysaudio/music/RBY/cities1.asm | 3 ++- crysaudio/music/RBY/routes1.asm | 3 ++- crysaudio/music/RBY/routes2.asm | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/crysaudio/music/RBY/cities1.asm b/crysaudio/music/RBY/cities1.asm index dbd83d29..a6be6ebd 100644 --- a/crysaudio/music/RBY/cities1.asm +++ b/crysaudio/music/RBY/cities1.asm @@ -588,6 +588,7 @@ Music_Cities1_branch_acce:: Music_Cities1_Ch4:: toggle_noise 0 +Music_Cities1_Ch4_MainLoop:: drum_speed 12 sound_call Music_Cities1_branch_ad36 @@ -617,7 +618,7 @@ Music_Cities1_branch_acf3:: drum_note 6, 6 drum_note 8, 6 drum_note 8, 4 - sound_loop 0, Music_Cities1_Ch4 + sound_loop 0, Music_Cities1_Ch4_MainLoop Music_Cities1_branch_ad36:: drum_note 8, 6 diff --git a/crysaudio/music/RBY/routes1.asm b/crysaudio/music/RBY/routes1.asm index e0bc11db..dddea279 100644 --- a/crysaudio/music/RBY/routes1.asm +++ b/crysaudio/music/RBY/routes1.asm @@ -318,6 +318,7 @@ Music_Routes1_branch_9cdd:: Music_Routes1_Ch4:: toggle_noise 1 +Music_Routes1_Ch4_MainLoop:: drum_speed 12 rest 4 drum_note 8, 2 @@ -408,5 +409,5 @@ Music_Routes1_Ch4:: rest 2 drum_note 8, 2 drum_note 8, 2 - sound_loop 0, Music_Routes1_Ch4 + sound_loop 0, Music_Routes1_Ch4_MainLoop sound_ret diff --git a/crysaudio/music/RBY/routes2.asm b/crysaudio/music/RBY/routes2.asm index 6dfced01..9abb2513 100644 --- a/crysaudio/music/RBY/routes2.asm +++ b/crysaudio/music/RBY/routes2.asm @@ -333,6 +333,7 @@ Music_Routes2_branch_9e9e:: Music_Routes2_Ch4:: toggle_noise 0 +Music_Routes2_Ch4_MainLoop:: drum_speed 12 drum_note 3, 2 rest 2 @@ -429,5 +430,5 @@ Music_Routes2_Ch4:: rest 3 drum_note 3, 3 rest 3 - sound_loop 0, Music_Routes2_Ch4 + sound_loop 0, Music_Routes2_Ch4_MainLoop sound_ret From 5f87413b237afec3ccb88aaf79cf9a42a8883daa Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 28 Mar 2021 12:26:46 -0500 Subject: [PATCH 10/33] Move crysaudio ram from sram to wram --- crysaudio/engine.asm | 80 ++++++- engine/battle/core.asm | 12 +- engine/battle/end_of_battle.asm | 2 +- engine/items/item_effects.asm | 10 +- engine/menus/save.asm | 53 +---- engine/movie/evolution.asm | 2 +- engine/overworld/elevator.asm | 8 +- engine/slots/slot_machine.asm | 4 +- home/audio.asm | 14 -- home/init.asm | 2 - macros/wram.asm | 44 ++++ wram.asm | 401 ++++++++++---------------------- 12 files changed, 253 insertions(+), 379 deletions(-) diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index 978963be..ee1e4a59 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -48,6 +48,28 @@ _InitSound:: or d jr nz, .clearaudio +; channels 5 and 6 + ld hl, wChannel5 + ld de, CHANNEL_STRUCT_LENGTH * 2 +.clearaudio2 + xor a + ld [hli], a + dec de + ld a, e + or d + jr nz, .clearaudio2 + +; channels 7 and 8 + ld hl, wChannel7 + ld de, CHANNEL_STRUCT_LENGTH * 2 +.clearaudio3 + xor a + ld [hli], a + dec de + ld a, e + or d + jr nz, .clearaudio3 + ld a, MAX_VOLUME ld [wVolume], a call MusicOn @@ -81,7 +103,6 @@ MusicOff: ret _UpdateSound:: - call OpenSRAMForSound ; called once per frame ; no use updating audio if it's not playing ld a, [wMusicPlaying] @@ -170,8 +191,25 @@ _UpdateSound:: ld a, [wCurChannel] cp NUM_MUSIC_CHANS jr nc, .sfx_channel - ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1 + + push af + push bc + add 4 ; corresponding sfx channel + ld c, a + ld b, 0 + ld hl, ChannelPointers add hl, bc + add hl, bc + ld c, [hl] + inc hl + ld b, [hl] ; bc = channel pointer + ld hl, CHANNEL_FLAGS1 + add hl, bc + pop bc + pop af +; ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1 +; add hl, bc + bit SOUND_CHANNEL_ON, [hl] jr nz, .sound_channel_on .sfx_channel @@ -189,12 +227,22 @@ _UpdateSound:: ld [hl], a .nextchannel ; next channel - ld hl, CHANNEL_STRUCT_LENGTH - add hl, bc - ld c, l - ld b, h +; ld hl, CHANNEL_STRUCT_LENGTH +; add hl, bc +; ld c, l +; ld b, h ld a, [wCurChannel] inc a + + ld c, a + ld b, 0 + ld hl, ChannelPointers + add hl, bc + add hl, bc + ld c, [hl] + inc hl + ld b, [hl] ; bc = channel pointer + ld [wCurChannel], a cp NUM_CHANNELS ; are we done? jp nz, .loop ; do it all again @@ -1210,8 +1258,25 @@ ParseMusic: cp CHAN5 jr nc, .chan_5to8 ; ???? - ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1 + + push af + push bc + add 4 ; corresponding sfx channel + ld c, a + ld b, 0 + ld hl, ChannelPointers add hl, bc + add hl, bc + ld c, [hl] + inc hl + ld b, [hl] ; bc = channel pointer + ld hl, CHANNEL_FLAGS1 + add hl, bc + pop bc + pop af +; ld hl, CHANNEL_STRUCT_LENGTH * NUM_MUSIC_CHANS + CHANNEL_FLAGS1 +; add hl, bc + bit SOUND_CHANNEL_ON, [hl] jr nz, .ok .chan_5to8 @@ -2377,7 +2442,6 @@ SetLRTracks: ret _PlayMusic:: - call OpenSRAMForSound cp NUM_SONGS ret nc ; sfx ; load music diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 6ec79349..4c55450e 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -781,10 +781,10 @@ FaintEnemyPokemon: ld [wTempoModifier], a ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent -.sfxwait - ld a, [wChannelSoundIDs + Ch5] - cp SFX_FAINT_FALL - jr z, .sfxwait +;.sfxwait +; ld a, [wChannelSoundIDs + Ch5] +; cp SFX_FAINT_FALL +; jr z, .sfxwait ld a, SFX_FAINT_THUD call PlaySound call WaitForSoundToFinish @@ -866,7 +866,7 @@ EndLowHealthAlarm: ; the low health alarm and prevents it from reactivating until the next battle. xor a ld [wLowHealthAlarm], a ; turn off low health alarm - ld [wChannelSoundIDs + Ch5], a +; ld [wChannelSoundIDs + Ch5], a inc a ld [wLowHealthAlarmDisabled], a ; prevent it from reactivating ret @@ -1864,7 +1864,7 @@ DrawPlayerHUDAndHPBar: ld [hl], $0 ret z xor a - ld [wChannelSoundIDs + Ch5], a +; ld [wChannelSoundIDs + Ch5], a ret .setLowHealthAlarm ld hl, wLowHealthAlarm diff --git a/engine/battle/end_of_battle.asm b/engine/battle/end_of_battle.asm index bd4a1901..cb84abcd 100644 --- a/engine/battle/end_of_battle.asm +++ b/engine/battle/end_of_battle.asm @@ -46,7 +46,7 @@ EndOfBattle: .resetVariables xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + Ch5], a +; ld [wChannelSoundIDs + Ch5], a ld [wIsInBattle], a ld [wBattleType], a ld [wMoveMissed], a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 7ba1080f..c49cc54b 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -991,7 +991,7 @@ ItemUseMedicine: .notFullHP ; if the pokemon's current HP doesn't equal its max HP xor a ld [wLowHealthAlarm], a ;disable low health alarm - ld [wChannelSoundIDs + Ch5], a +; ld [wChannelSoundIDs + Ch5], a push hl push de ld bc, wPartyMon1MaxHP - (wPartyMon1HP + 1) @@ -1736,10 +1736,10 @@ ItemUsePokeflute: jr nz, .skipMusic call WaitForSoundToFinish ; wait for sound to end ;farcall Music_PokeFluteInBattle ; play in-battle pokeflute music ; XXX -.musicWaitLoop ; wait for music to finish playing - ld a, [wChannelSoundIDs + Ch7] - and a ; music off? - jr nz, .musicWaitLoop +;.musicWaitLoop ; wait for music to finish playing +; ld a, [wChannelSoundIDs + Ch7] +; and a ; music off? +; jr nz, .musicWaitLoop .skipMusic ld hl, FluteWokeUpText jp PrintText diff --git a/engine/menus/save.asm b/engine/menus/save.asm index 2f8191df..dc2e27c2 100644 --- a/engine/menus/save.asm +++ b/engine/menus/save.asm @@ -4,10 +4,6 @@ LoadSAV: call ClearScreen call LoadFontTilePatterns call LoadTextBoxTilePatterns - - ld a, 1 - ld [wHaltAudio], a - call LoadSAV0 jr c, .badsum call LoadSAV1 @@ -29,9 +25,6 @@ LoadSAV: ld a, $1 ; bad checksum .goodsum ld [wSaveFileStatus], a - - ld a, 0 - ld [wHaltAudio], a ret FileDataDestroyedText: @@ -281,18 +274,9 @@ SaveSAVtoSRAM2: SaveSAVtoSRAM:: ld a, $2 ld [wSaveFileStatus], a - - ld a, 1 - ld [wHaltAudio], a - call SaveSAVtoSRAM0 call SaveSAVtoSRAM1 - call SaveSAVtoSRAM2 - - ld a, 0 - ld [wHaltAudio], a - - ret + jp SaveSAVtoSRAM2 SAVCheckSum: ;Check Sum (result[1 byte] is complemented) @@ -407,9 +391,6 @@ WhenYouChangeBoxText: CopyBoxToOrFromSRAM: ; copy an entire box from hl to de with b as the SRAM bank - ld a, 1 - ld [wHaltAudio], a - push hl ld a, SRAM_ENABLE ld [MBC1SRamEnable], a @@ -435,9 +416,6 @@ CopyBoxToOrFromSRAM: xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a - - xor a - ld [wHaltAudio], a ret DisplayChangeBoxMenu: @@ -535,9 +513,6 @@ BoxNoText: EmptyAllSRAMBoxes: ; marks all boxes in SRAM as empty (initialisation for the first time the ; player changes the box) - ld a, 1 - ld [wHaltAudio], a - ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -551,9 +526,6 @@ EmptyAllSRAMBoxes: xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a - - xor a - ld [wHaltAudio], a ret EmptySRAMBoxesInBank: @@ -585,9 +557,6 @@ EmptySRAMBox: ret GetMonCountsForAllBoxes: - ld a, 1 - ld [wHaltAudio], a - ld hl, wBoxMonCounts push hl ld a, SRAM_ENABLE @@ -614,8 +583,6 @@ GetMonCountsForAllBoxes: ld a, [wNumInBox] ld [hl], a - xor a - ld [wHaltAudio], a ret GetMonCountsForBoxesInBank: @@ -637,9 +604,6 @@ SAVCheckRandomID: ; checks if Sav file is the same by checking player's name 1st letter ; and the two random numbers generated at game beginning ; (which are stored at wPlayerID)s - ld a, 1 - ld [wHaltAudio], a - ld a, $0a ld [MBC1SRamEnable], a ld a, $01 @@ -668,9 +632,6 @@ SAVCheckRandomID: ld a, $00 ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a - - xor a - ld [wHaltAudio], a ret SaveHallOfFameTeams: @@ -709,9 +670,6 @@ LoadHallOfFameTeams: ; fallthrough HallOfFame_Copy: - ld a, 1 - ld [wHaltAudio], a - ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -722,15 +680,9 @@ HallOfFame_Copy: xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a - - xor a - ld [wHaltAudio], a ret ClearSAV: - ld a, 1 - ld [wHaltAudio], a - ld a, SRAM_ENABLE ld [MBC1SRamEnable], a ld a, $1 @@ -746,9 +698,6 @@ ClearSAV: xor a ld [MBC1SRamBankingMode], a ld [MBC1SRamEnable], a - - xor a - ld [wHaltAudio], a ret PadSRAM_FF: diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm index 4c60cbdb..0c24e885 100644 --- a/engine/movie/evolution.asm +++ b/engine/movie/evolution.asm @@ -8,7 +8,7 @@ EvolveMon: push af xor a ld [wLowHealthAlarm], a - ld [wChannelSoundIDs + Ch5], a +; ld [wChannelSoundIDs + Ch5], a dec a ; SFX_STOP_ALL_MUSIC ld [wNewSoundID], a call PlaySound diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index 97cbbd8f..e4294dc9 100644 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -32,10 +32,10 @@ ShakeElevator:: ld c, 0 ; BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlaySound -.musicLoop - ld a, [wChannelSoundIDs + Ch5] - cp SFX_SAFARI_ZONE_PA - jr z, .musicLoop +;.musicLoop +; ld a, [wChannelSoundIDs + Ch5] +; cp SFX_SAFARI_ZONE_PA +; jr z, .musicLoop call UpdateSprites jp PlayDefaultMusic diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index fe137632..d508d0ac 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -411,7 +411,7 @@ SlotMachine_CheckForMatches: call PrintText .done xor a - ld [wMuteAudioAndPauseMusic], a +; ld [wMuteAudioAndPauseMusic], a ret .rollWheel3DownByOneSymbol call SlotMachine_AnimWheel3 @@ -655,7 +655,7 @@ SlotMachine_PrintPayoutCoins: SlotMachine_PayCoinsToPlayer: ld a, $1 - ld [wMuteAudioAndPauseMusic], a +; ld [wMuteAudioAndPauseMusic], a call WaitForSoundToFinish ; Put 1 in the temp coins variable. This value is added to the player's coins diff --git a/home/audio.asm b/home/audio.asm index d42cd1ff..50e88208 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -92,22 +92,12 @@ PlaySound:: pop de ret -OpenSRAMForSound:: - ld a, SRAM_ENABLE - ld [MBC1SRamEnable], a - xor a - ld [MBC1SRamBankingMode], a - ld [MBC1SRamBank], a - ret - ;InitSound:: ; push hl ; push de ; push bc ; push af ; -; call OpenSRAMForSound -; ; ldh a, [hLoadedROMBank] ; push af ; ld a, BANK(_InitSound) @@ -132,10 +122,6 @@ UpdateSound:: ; push bc ; push af - ld a, [wHaltAudio] - and a - ret nz - ldh a, [hLoadedROMBank] push af ld a, BANK(_UpdateSound) diff --git a/home/init.asm b/home/init.asm index 6d29a739..5a0ab53d 100644 --- a/home/init.asm +++ b/home/init.asm @@ -126,8 +126,6 @@ ClearVram:: StopAllSounds:: - call OpenSRAMForSound - ld a, 0 ; BANK("Audio Engine 1") ld [wAudioROMBank], a ld [wAudioSavedROMBank], a diff --git a/macros/wram.asm b/macros/wram.asm index 41fd1dad..4d73b7cf 100644 --- a/macros/wram.asm +++ b/macros/wram.asm @@ -95,3 +95,47 @@ spritestatedata2: MACRO ds 1 \1End:: ENDM + +channel_struct: MACRO +\1MusicID:: dw +\1MusicBank:: db +\1Flags1:: db ; 0:on/off 1:subroutine 2:looping 3:sfx 4:noise 5:rest +\1Flags2:: db ; 0:vibrato on/off 1:pitch slide 2:duty cycle pattern 4:pitch offset +\1Flags3:: db ; 0:vibrato up/down 1:pitch slide direction +\1MusicAddress:: dw +\1LastMusicAddress:: dw + dw +\1NoteFlags:: db ; 5:rest +\1Condition:: db ; conditional jumps +\1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%) +\1VolumeEnvelope:: db ; hi:volume lo:fade +\1Frequency:: dw ; 11 bits +\1Pitch:: db ; 0:rest 1-c:note +\1Octave:: db ; 7-0 (0 is highest) +\1Transposition:: db ; raises existing octaves (to repeat phrases) +\1NoteDuration:: db ; frames remaining for the current note +\1Field16:: ds 1 + ds 1 +\1LoopCount:: db +\1Tempo:: dw +\1Tracks:: db ; hi:left lo:right +\1DutyCyclePattern:: db +\1VibratoDelayCount:: db ; initialized by \1VibratoDelay +\1VibratoDelay:: db ; number of frames a note plays until vibrato starts +\1VibratoExtent:: db +\1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt +\1PitchSlideTarget:: dw ; frequency endpoint for pitch slide +\1PitchSlideAmount:: db +\1PitchSlideAmountFraction:: db +\1Field25:: db + ds 1 +\1PitchOffset:: dw +\1Field29:: ds 1 +\1Field2a:: ds 2 +\1Field2c:: ds 1 +\1NoteLength:: db ; frames per 16th note +\1Field2e:: ds 1 +\1Field2f:: ds 1 +\1Field30:: ds 1 + ds 1 +ENDM diff --git a/wram.asm b/wram.asm index b12489ca..cdc76e35 100644 --- a/wram.asm +++ b/wram.asm @@ -8,130 +8,6 @@ INCLUDE "vram.asm" SECTION "WRAM", WRAM0 -wUnusedC000:: - ds 1 - -wSoundID:: - ds 1 - -wMuteAudioAndPauseMusic:: -; bit 7: whether sound has been muted -; all bits: whether the effective is active -; Store 1 to activate effect (any value in the range [1, 127] works). -; All audio is muted and music is paused. Sfx continues playing until it -; ends normally. -; Store 0 to resume music. - ds 1 - -wDisableChannelOutputWhenSfxEnds:: - ds 1 - -wStereoPanning:: - ds 1 - -wSavedVolume:: - ds 1 - -wChannelCommandPointers:: - ds 16 - -wChannelReturnAddresses:: - ds 16 - -wChannelSoundIDs:: - ds 8 - -wChannelFlags1:: - ds 8 - -wChannelFlags2:: - ds 8 - -wChannelDutyCycles:: - ds 8 - -wChannelDutyCyclePatterns:: - ds 8 - -wChannelVibratoDelayCounters:: -; reloaded at the beginning of a note. counts down until the vibrato begins. - ds 8 - -wChannelVibratoExtents:: - ds 8 - -wChannelVibratoRates:: -; high nybble is rate (counter reload value) and low nybble is counter. -; time between applications of vibrato. - ds 8 - -wChannelFrequencyLowBytes:: - ds 8 - -wChannelVibratoDelayCounterReloadValues:: -; delay of the beginning of the vibrato from the start of the note - ds 8 - -wChannelPitchSlideLengthModifiers:: - ds 8 - -wChannelPitchSlideFrequencySteps:: - ds 8 - -wChannelPitchSlideFrequencyStepsFractionalPart:: - ds 8 - -wChannelPitchSlideCurrentFrequencyFractionalPart:: - ds 8 - -wChannelPitchSlideCurrentFrequencyHighBytes:: - ds 8 - -wChannelPitchSlideCurrentFrequencyLowBytes:: - ds 8 - -wChannelPitchSlideTargetFrequencyHighBytes:: - ds 8 - -wChannelPitchSlideTargetFrequencyLowBytes:: - ds 8 - -wChannelNoteDelayCounters:: -; Note delays are stored as 16-bit fixed-point numbers where the integer part -; is 8 bits and the fractional part is 8 bits. - ds 8 - -wChannelLoopCounters:: - ds 8 - -wChannelNoteSpeeds:: - ds 8 - -wChannelNoteDelayCountersFractionalPart:: - ds 8 - -wChannelOctaves:: - ds 8 - -wChannelVolumes:: -; also includes fade for hardware channels that support it - ds 8 - -wMusicWaveInstrument:: - ds 1 - -wSfxWaveInstrument:: - ds 1 - -wMusicTempo:: - ds 2 - -wSfxTempo:: - ds 2 - -wSfxHeaderPointer:: - ds 2 - wNewSoundID:: ds 1 @@ -147,11 +23,112 @@ wFrequencyModifier:: wTempoModifier:: ds 1 - ds 11 - -wHaltAudio:: ds 1 wSFXDontWait:: ds 1 +wMusic:: + +; nonzero if playing +wMusicPlaying:: db + +wAudio:: +wChannel1:: channel_struct wChannel1 +wChannel2:: channel_struct wChannel2 +wChannel3:: channel_struct wChannel3 +wChannel4:: channel_struct wChannel4 + + ds 1 + +wCurTrackDuty:: db +wCurTrackVolumeEnvelope:: db +wCurTrackFrequency:: dw +wUnusedBCDNumber:: db ; BCD value, dummied out +wCurNoteDuration:: db ; used in MusicE0 and LoadNote + +wCurMusicByte:: db +wCurChannel:: db +wVolume:: +; corresponds to rNR50 +; Channel control / ON-OFF / Volume (R/W) +; bit 7 - Vin->SO2 ON/OFF +; bit 6-4 - SO2 output level (volume) (# 0-7) +; bit 3 - Vin->SO1 ON/OFF +; bit 2-0 - SO1 output level (volume) (# 0-7) + db +wSoundOutput:: +; corresponds to rNR51 +; bit 4-7: ch1-4 so2 on/off +; bit 0-3: ch1-4 so1 on/off + db +wPitchSweep:: +; corresponds to rNR10 +; bit 7: unused +; bit 4-6: sweep time +; bit 3: sweep direction +; but 0-2: sweep shift + db + +wMusicID:: dw +wMusicBank:: db +wNoiseSampleAddress:: dw +wNoiseSampleDelay:: db + ds 1 +wMusicNoiseSampleSet:: db +wSFXNoiseSampleSet:: db + +wLowHealthAlarm:: +; bit 7: on/off +; bit 4: pitch +; bit 0-3: counter + db + +wMusicFade:: +; fades volume over x frames +; bit 7: fade in/out +; bit 0-5: number of frames for each volume level +; $00 = none (default) + db +wMusicFadeCount:: db +wMusicFadeID:: dw + + ds 5 + +wCryPitch:: dw +wCryLength:: dw + +wLastVolume:: db +wUnusedMusicF9Flag:: db + +wSFXPriority:: +; if nonzero, turn off music when playing sfx + db + + ds 1 + +wChannel1JumpCondition:: db +wChannel2JumpCondition:: db +wChannel3JumpCondition:: db +wChannel4JumpCondition:: db + +wStereoPanningMask:: db + +wCryTracks:: +; plays only in left or right track depending on what side the monster is on +; both tracks active outside of battle + db + +wSFXDuration:: db +wCurSFX:: +; id of sfx currently playing + db + +wAudioEnd:: + +wMapMusic:: db + +;wDontPlayMapMusicOnReload:: db +wMusicEnd:: + + SECTION "Sprite State Data", WRAM0 wSpriteDataStart:: @@ -2485,7 +2462,12 @@ wDestinationWarpID:: ; if $ff, the player's coordinates are not updated when entering the map ds 1 +UNION ds 128 +NEXTU +wChannel5:: channel_struct wChannel5 +wChannel6:: channel_struct wChannel6 +ENDU wNumSigns:: ; number of signs in the current map (up to 16) @@ -2609,7 +2591,7 @@ wMissableObjectList:: ds 17 * 2 wGameProgressFlags:: -; $c8 bytes +; $80 bytes wOaksLabCurScript:: ds 1 wPalletTownCurScript:: @@ -2819,10 +2801,15 @@ wSeafoamIslandsB4FCurScript:: wRoute18Gate1FCurScript:: ds 1 - ds 78 + ds 6 wGameProgressFlagsEnd:: - ds 56 +UNION + ds 128 +NEXTU +wChannel7:: channel_struct wChannel7 +wChannel8:: channel_struct wChannel8 +ENDU wObtainedHiddenItemsFlags:: ds 14 @@ -3152,157 +3139,3 @@ wStack:: INCLUDE "sram.asm" INCLUDE "hram.asm" - - -SECTION "crysaudio", SRAM, BANK[0] - -channel_struct: MACRO -\1MusicID:: dw -\1MusicBank:: db -\1Flags1:: db ; 0:on/off 1:subroutine 2:looping 3:sfx 4:noise 5:rest -\1Flags2:: db ; 0:vibrato on/off 1:pitch slide 2:duty cycle pattern 4:pitch offset -\1Flags3:: db ; 0:vibrato up/down 1:pitch slide direction -\1MusicAddress:: dw -\1LastMusicAddress:: dw - dw -\1NoteFlags:: db ; 5:rest -\1Condition:: db ; conditional jumps -\1DutyCycle:: db ; bits 6-7 (0:12.5% 1:25% 2:50% 3:75%) -\1VolumeEnvelope:: db ; hi:volume lo:fade -\1Frequency:: dw ; 11 bits -\1Pitch:: db ; 0:rest 1-c:note -\1Octave:: db ; 7-0 (0 is highest) -\1Transposition:: db ; raises existing octaves (to repeat phrases) -\1NoteDuration:: db ; frames remaining for the current note -\1Field16:: ds 1 - ds 1 -\1LoopCount:: db -\1Tempo:: dw -\1Tracks:: db ; hi:left lo:right -\1DutyCyclePattern:: db -\1VibratoDelayCount:: db ; initialized by \1VibratoDelay -\1VibratoDelay:: db ; number of frames a note plays until vibrato starts -\1VibratoExtent:: db -\1VibratoRate:: db ; hi:frames for each alt lo:frames to the next alt -\1PitchSlideTarget:: dw ; frequency endpoint for pitch slide -\1PitchSlideAmount:: db -\1PitchSlideAmountFraction:: db -\1Field25:: db - ds 1 -\1PitchOffset:: dw -\1Field29:: ds 1 -\1Field2a:: ds 2 -\1Field2c:: ds 1 -\1NoteLength:: db ; frames per 16th note -\1Field2e:: ds 1 -\1Field2f:: ds 1 -\1Field30:: ds 1 - ds 1 -ENDM - -wMusic:: - -; nonzero if playing -wMusicPlaying:: db - -wAudio:: -wChannel1:: channel_struct wChannel1 -wChannel2:: channel_struct wChannel2 -wChannel3:: channel_struct wChannel3 -wChannel4:: channel_struct wChannel4 -wChannel5:: channel_struct wChannel5 -wChannel6:: channel_struct wChannel6 -wChannel7:: channel_struct wChannel7 -wChannel8:: channel_struct wChannel8 - - ds 1 - -wCurTrackDuty:: db -wCurTrackVolumeEnvelope:: db -wCurTrackFrequency:: dw -wUnusedBCDNumber:: db ; BCD value, dummied out -wCurNoteDuration:: db ; used in MusicE0 and LoadNote - -wCurMusicByte:: db -wCurChannel:: db -wVolume:: -; corresponds to rNR50 -; Channel control / ON-OFF / Volume (R/W) -; bit 7 - Vin->SO2 ON/OFF -; bit 6-4 - SO2 output level (volume) (# 0-7) -; bit 3 - Vin->SO1 ON/OFF -; bit 2-0 - SO1 output level (volume) (# 0-7) - db -wSoundOutput:: -; corresponds to rNR51 -; bit 4-7: ch1-4 so2 on/off -; bit 0-3: ch1-4 so1 on/off - db -wPitchSweep:: -; corresponds to rNR10 -; bit 7: unused -; bit 4-6: sweep time -; bit 3: sweep direction -; but 0-2: sweep shift - db - -wMusicID:: dw -wMusicBank:: db -wNoiseSampleAddress:: dw -wNoiseSampleDelay:: db - ds 1 -wMusicNoiseSampleSet:: db -wSFXNoiseSampleSet:: db - -wLowHealthAlarm:: -; bit 7: on/off -; bit 4: pitch -; bit 0-3: counter - db - -wMusicFade:: -; fades volume over x frames -; bit 7: fade in/out -; bit 0-5: number of frames for each volume level -; $00 = none (default) - db -wMusicFadeCount:: db -wMusicFadeID:: dw - - ds 5 - -wCryPitch:: dw -wCryLength:: dw - -wLastVolume:: db -wUnusedMusicF9Flag:: db - -wSFXPriority:: -; if nonzero, turn off music when playing sfx - db - - ds 1 - -wChannel1JumpCondition:: db -wChannel2JumpCondition:: db -wChannel3JumpCondition:: db -wChannel4JumpCondition:: db - -wStereoPanningMask:: db - -wCryTracks:: -; plays only in left or right track depending on what side the monster is on -; both tracks active outside of battle - db - -wSFXDuration:: db -wCurSFX:: -; id of sfx currently playing - db - -wAudioEnd:: - -wMapMusic:: db - -;wDontPlayMapMusicOnReload:: db -wMusicEnd:: From c1278c478efc2b264b73199c54e250a256c3a54b Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 28 Mar 2021 23:23:45 -0500 Subject: [PATCH 11/33] Fix pokeflute in battle sfx and other small improvements --- audio.asm | 8 +- audio/engine_2.asm | 4 +- audio/headers/sfxheaders2.asm | 3 + audio/low_health_alarm.asm | 8 +- audio/play_battle_music.asm | 2 +- audio/pokedex_rating_sfx.asm | 1 - audio/sfx/pokeflute_ch5_ch6.asm | 4 +- audio/sfx/pokeflute_ch7.asm | 2 +- constants/music_constants.asm | 2 + crysaudio/engine.asm | 6 +- crysaudio/music/RBY/pkmnhealed.asm | 1 - ...ed_pointers.asm => music_pointers_red.asm} | 0 crysaudio/{rbsfx.asm => sfx_pointers_red.asm} | 2 + crysaudio/trainer_encounters.asm | 75 ------------------- engine/battle/animations.asm | 26 ++++--- engine/battle/core.asm | 6 ++ engine/events/hidden_objects/safari_game.asm | 5 ++ engine/items/item_effects.asm | 7 +- engine/menus/pokedex.asm | 2 + engine/overworld/healing_machine.asm | 3 + engine/overworld/player_animations.asm | 1 + engine/pokemon/bills_pc.asm | 14 ++-- home/audio.asm | 10 ++- home/overworld.asm | 23 +++--- scripts/PewterPokecenter.asm | 5 ++ scripts/RedsHouse1F.asm | 6 ++ scripts/SSAnneCaptainsRoom.asm | 6 ++ wram.asm | 7 +- 28 files changed, 108 insertions(+), 131 deletions(-) rename crysaudio/{red_pointers.asm => music_pointers_red.asm} (100%) rename crysaudio/{rbsfx.asm => sfx_pointers_red.asm} (98%) delete mode 100644 crysaudio/trainer_encounters.asm diff --git a/audio.asm b/audio.asm index 1b8ef00d..01ec22ec 100644 --- a/audio.asm +++ b/audio.asm @@ -117,6 +117,9 @@ INCLUDE "audio/sfx/battle_36.asm" INCLUDE "audio/sfx/level_up.asm" INCLUDE "audio/sfx/caught_mon.asm" +INCLUDE "audio/sfx/pokeflute_ch5_ch6.asm" +INCLUDE "audio/sfx/pokeflute_ch7.asm" + SECTION "Sound Effects 3", ROMX @@ -151,16 +154,15 @@ INCLUDE "audio/pokedex_rating_sfx.asm" SECTION "Audio Engine 1", ROMX INCLUDE "crysaudio/engine.asm" -;INCLUDE "crysaudio/trainer_encounters.asm" -INCLUDE "crysaudio/red_pointers.asm" +INCLUDE "crysaudio/music_pointers_red.asm" ;INCLUDE "crysaudio/music_pointers.asm" INCLUDE "crysaudio/music/nothing.asm" INCLUDE "crysaudio/cry_pointers.asm" -INCLUDE "crysaudio/rbsfx.asm" +INCLUDE "crysaudio/sfx_pointers_red.asm" ;INCLUDE "crysaudio/sfx_pointers.asm" diff --git a/audio/engine_2.asm b/audio/engine_2.asm index 3de43a70..51a5d7c4 100644 --- a/audio/engine_2.asm +++ b/audio/engine_2.asm @@ -163,7 +163,7 @@ Audio2_PlayNextNote: ld a, c cp Ch5 jr nz, .beginChecks - ld a, [wLowHealthAlarmOrig] ; low health alarm enabled? + ld a, [wLowHealthAlarm] ; low health alarm enabled? bit 7, a ret nz .beginChecks @@ -976,7 +976,7 @@ Audio2_ResetCryModifiers: ld a, c cp Ch5 jr nz, .skip - ld a, [wLowHealthAlarmOrig] + ld a, [wLowHealthAlarm] bit 7, a jr z, .skip xor a diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index 0836a8e5..1acdd2fe 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -165,3 +165,6 @@ SFX_Battle_36:: SFX_Silph_Scope:: audio_header SFX_Silph_Scope, Ch5 + +SFX_PokefluteInBattle:: + audio_header SFX_PokefluteInBattle, Ch5, Ch6, Ch7 diff --git a/audio/low_health_alarm.asm b/audio/low_health_alarm.asm index 6584a889..a550cf70 100644 --- a/audio/low_health_alarm.asm +++ b/audio/low_health_alarm.asm @@ -1,5 +1,5 @@ Music_DoLowHealthAlarm:: - ld a, [wLowHealthAlarmOrig] + ld a, [wLowHealthAlarm] cp $ff jr z, .disableAlarm @@ -21,19 +21,19 @@ Music_DoLowHealthAlarm:: .asm_2138a ld a, $86 ld [wChannelSoundIDs + Ch5], a ;disable sound channel? - ld a, [wLowHealthAlarmOrig] + ld a, [wLowHealthAlarm] and $7f ;decrement alarm timer. dec a .asm_21395 ; reset the timer and enable flag. set 7, a - ld [wLowHealthAlarmOrig], a + ld [wLowHealthAlarm], a ret .disableAlarm xor a - ld [wLowHealthAlarmOrig], a ;disable alarm + ld [wLowHealthAlarm], a ;disable alarm ld [wChannelSoundIDs + Ch5], a ;re-enable sound channel? ld de, .toneDataSilence jr .playTone diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 6fbdb315..3f5ef611 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -1,7 +1,7 @@ PlayBattleMusic:: xor a ld [wAudioFadeOutControl], a - ld [wLowHealthAlarmOrig], a + ld [wLowHealthAlarm], a ld [wMusicFade], a dec a ; SFX_STOP_ALL_MUSIC ld [wNewSoundID], a diff --git a/audio/pokedex_rating_sfx.asm b/audio/pokedex_rating_sfx.asm index 4fa8cc04..2e0266f9 100644 --- a/audio/pokedex_rating_sfx.asm +++ b/audio/pokedex_rating_sfx.asm @@ -21,7 +21,6 @@ PlayPokedexRatingSfx:: ld a, [hli] ld c, [hl] call PlaySound - call WaitForSoundToFinish jp PlayDefaultMusic PokedexRatingSfxPointers: diff --git a/audio/sfx/pokeflute_ch5_ch6.asm b/audio/sfx/pokeflute_ch5_ch6.asm index 4f0e96a8..e28b9274 100644 --- a/audio/sfx/pokeflute_ch5_ch6.asm +++ b/audio/sfx/pokeflute_ch5_ch6.asm @@ -1,8 +1,8 @@ -SFX_Pokeflute_Ch5: +SFX_PokefluteInBattle_Ch5: tempo 256 -SFX_Pokeflute_Ch6: +SFX_PokefluteInBattle_Ch6: execute_music note_type 8, 0, 0 rest 5 diff --git a/audio/sfx/pokeflute_ch7.asm b/audio/sfx/pokeflute_ch7.asm index 4435c0fb..c8048899 100644 --- a/audio/sfx/pokeflute_ch7.asm +++ b/audio/sfx/pokeflute_ch7.asm @@ -1,4 +1,4 @@ -SFX_Pokeflute_Ch7: +SFX_PokefluteInBattle_Ch7: execute_music vibrato 16, 1, 4 note_type 8, 1, 0 diff --git a/constants/music_constants.asm b/constants/music_constants.asm index c99e60bc..730c0b3e 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -214,6 +214,8 @@ const_value = 1 const SFX_SLOTS_NEW_SPIN const SFX_SHOOTING_STAR + const SFX_POKEFLUTE_IN_BATTLE + const GSSFX_NOT_VERY_EFFECTIVE const GSSFX_DAMAGE const GSSFX_SUPER_EFFECTIVE diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index ee1e4a59..76dda12b 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -692,9 +692,9 @@ FadeMusic: xor a ld [wVolume], a ; did we just get on a bike? - ld a, [wWalkBikeSurfState] ; XXX - cp 1 ; PLAYER_BIKE - jr z, .bicycle +; ld a, [wPlayerState] +; cp PLAYER_BIKE +; jr z, .bicycle push bc ; restart sound call MusicFadeRestart diff --git a/crysaudio/music/RBY/pkmnhealed.asm b/crysaudio/music/RBY/pkmnhealed.asm index ae025ac7..d9b2d4b0 100644 --- a/crysaudio/music/RBY/pkmnhealed.asm +++ b/crysaudio/music/RBY/pkmnhealed.asm @@ -11,7 +11,6 @@ Music_PkmnHealed_Ch1:: ;toggle_perfect_pitch note_type 12, 8, 1 rest 2 - octave 3 pitch_slide 1, 4, B_ note B_, 2 pitch_slide 1, 3, E_ diff --git a/crysaudio/red_pointers.asm b/crysaudio/music_pointers_red.asm similarity index 100% rename from crysaudio/red_pointers.asm rename to crysaudio/music_pointers_red.asm diff --git a/crysaudio/rbsfx.asm b/crysaudio/sfx_pointers_red.asm similarity index 98% rename from crysaudio/rbsfx.asm rename to crysaudio/sfx_pointers_red.asm index 1213e3e1..f00e2a4d 100644 --- a/crysaudio/rbsfx.asm +++ b/crysaudio/sfx_pointers_red.asm @@ -112,6 +112,8 @@ SFX: dba SFX_Slots_New_Spin dba SFX_Shooting_Star + dba SFX_PokefluteInBattle + dba Sfx_NotVeryEffective dba Sfx_Damage dba Sfx_SuperEffective diff --git a/crysaudio/trainer_encounters.asm b/crysaudio/trainer_encounters.asm deleted file mode 100644 index 2634e99d..00000000 --- a/crysaudio/trainer_encounters.asm +++ /dev/null @@ -1,75 +0,0 @@ -; What music plays when a trainer notices you - -TrainerEncounterMusic:: -; entries correspond to trainer classes (see constants/trainer_constants.asm) - db MUSIC_HIKER_ENCOUNTER ; none - db MUSIC_YOUNGSTER_ENCOUNTER ; falkner - db MUSIC_LASS_ENCOUNTER ; whitney - db MUSIC_YOUNGSTER_ENCOUNTER ; bugsy - db MUSIC_OFFICER_ENCOUNTER ; morty - db MUSIC_OFFICER_ENCOUNTER ; pryce - db MUSIC_LASS_ENCOUNTER ; jasmine - db MUSIC_OFFICER_ENCOUNTER ; chuck - db MUSIC_BEAUTY_ENCOUNTER ; clair - db MUSIC_RIVAL_ENCOUNTER ; rival1 - db MUSIC_HIKER_ENCOUNTER ; pokemon_prof - db MUSIC_HIKER_ENCOUNTER ; will - db MUSIC_HIKER_ENCOUNTER ; cal - db MUSIC_OFFICER_ENCOUNTER ; bruno - db MUSIC_HIKER_ENCOUNTER ; karen - db MUSIC_HIKER_ENCOUNTER ; koga - db MUSIC_OFFICER_ENCOUNTER ; champion - db MUSIC_YOUNGSTER_ENCOUNTER ; brock - db MUSIC_LASS_ENCOUNTER ; misty - db MUSIC_OFFICER_ENCOUNTER ; lt_surge - db MUSIC_ROCKET_ENCOUNTER ; scientist - db MUSIC_OFFICER_ENCOUNTER ; erika - db MUSIC_YOUNGSTER_ENCOUNTER ; youngster - db MUSIC_YOUNGSTER_ENCOUNTER ; schoolboy - db MUSIC_YOUNGSTER_ENCOUNTER ; bird_keeper - db MUSIC_LASS_ENCOUNTER ; lass - db MUSIC_LASS_ENCOUNTER ; janine - db MUSIC_HIKER_ENCOUNTER ; cooltrainerm - db MUSIC_BEAUTY_ENCOUNTER ; cooltrainerf - db MUSIC_BEAUTY_ENCOUNTER ; beauty - db MUSIC_POKEMANIAC_ENCOUNTER ; pokemaniac - db MUSIC_ROCKET_ENCOUNTER ; gruntm - db MUSIC_HIKER_ENCOUNTER ; gentleman - db MUSIC_BEAUTY_ENCOUNTER ; skier - db MUSIC_BEAUTY_ENCOUNTER ; teacher - db MUSIC_BEAUTY_ENCOUNTER ; sabrina - db MUSIC_YOUNGSTER_ENCOUNTER ; bug_catcher - db MUSIC_HIKER_ENCOUNTER ; fisher - db MUSIC_HIKER_ENCOUNTER ; swimmerm - db MUSIC_BEAUTY_ENCOUNTER ; swimmerf - db MUSIC_HIKER_ENCOUNTER ; sailor - db MUSIC_POKEMANIAC_ENCOUNTER ; super_nerd - db MUSIC_RIVAL_ENCOUNTER ; rival2 - db MUSIC_HIKER_ENCOUNTER ; guitarist - db MUSIC_HIKER_ENCOUNTER ; hiker - db MUSIC_HIKER_ENCOUNTER ; biker - db MUSIC_OFFICER_ENCOUNTER ; blaine - db MUSIC_POKEMANIAC_ENCOUNTER ; burglar - db MUSIC_HIKER_ENCOUNTER ; firebreather - db MUSIC_POKEMANIAC_ENCOUNTER ; juggler - db MUSIC_HIKER_ENCOUNTER ; blackbelt_t - db MUSIC_ROCKET_ENCOUNTER ; executivem - db MUSIC_YOUNGSTER_ENCOUNTER ; psychic_t - db MUSIC_LASS_ENCOUNTER ; picnicker - db MUSIC_YOUNGSTER_ENCOUNTER ; camper - db MUSIC_ROCKET_ENCOUNTER ; executivef - db MUSIC_SAGE_ENCOUNTER ; sage - db MUSIC_SAGE_ENCOUNTER ; medium - db MUSIC_HIKER_ENCOUNTER ; boarder - db MUSIC_HIKER_ENCOUNTER ; pokefanm - db MUSIC_KIMONO_ENCOUNTER ; kimono_girl - db MUSIC_LASS_ENCOUNTER ; twins - db MUSIC_BEAUTY_ENCOUNTER ; pokefanf - db MUSIC_HIKER_ENCOUNTER ; red - db MUSIC_RIVAL_ENCOUNTER ; blue - db MUSIC_HIKER_ENCOUNTER ; officer - db MUSIC_ROCKET_ENCOUNTER ; gruntf - db MUSIC_HIKER_ENCOUNTER ; mysticalman - db MUSIC_HIKER_ENCOUNTER ; unused - db MUSIC_HIKER_ENCOUNTER ; unused - db MUSIC_HIKER_ENCOUNTER ; unused diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 7456970f..ea7e7b02 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2183,6 +2183,7 @@ GetMoveSound: .next ld a, [wEnemyMonSpecies] .Continue + push af ld a, 1 ld [wSFXDontWait], a @@ -2193,18 +2194,19 @@ GetMoveSound: ld a, b scf ret - ;push hl - ;call GetCryData - ;ld b, a - ;pop hl - ;ld a, [wFrequencyModifier] - ;add [hl] - ;ld [wFrequencyModifier], a - ;inc hl - ;ld a, [wTempoModifier] - ;add [hl] - ;ld [wTempoModifier], a - ;jr .done +; push hl +; call GetCryData +; ld b, a +; pop hl +; ld a, [wFrequencyModifier] +; add [hl] +; ld [wFrequencyModifier], a +; inc hl +; ld a, [wTempoModifier] +; add [hl] +; ld [wTempoModifier], a +; jr .done + .NotCryMove ld a, [hli] ld [wFrequencyModifier], a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4c55450e..08a05d3e 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -781,10 +781,16 @@ FaintEnemyPokemon: ld [wTempoModifier], a ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent + +; using WaitForSoundToFinish causes a noticeable delay +; so use a smaller hard-coded delay for now + ld c, 10 + call DelayFrames ;.sfxwait ; ld a, [wChannelSoundIDs + Ch5] ; cp SFX_FAINT_FALL ; jr z, .sfxwait + ld a, SFX_FAINT_THUD call PlaySound call WaitForSoundToFinish diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm index f49cab97..bbb81a2c 100644 --- a/engine/events/hidden_objects/safari_game.asm +++ b/engine/events/hidden_objects/safari_game.asm @@ -36,7 +36,12 @@ SafariZoneGameOver: ld c, 0 ; BANK(SFX_Safari_Zone_PA) ld a, SFX_SAFARI_ZONE_PA call PlaySound + call WaitForSoundToFinish +;.waitForMusicToPlay +; ld a, [wChannelSoundIDs + Ch5] +; cp SFX_SAFARI_ZONE_PA +; jr nz, .waitForMusicToPlay ld a, TEXT_SAFARI_GAME_OVER ldh [hSpriteIndexOrTextID], a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index c49cc54b..204049a9 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1735,11 +1735,16 @@ ItemUsePokeflute: and $80 jr nz, .skipMusic call WaitForSoundToFinish ; wait for sound to end - ;farcall Music_PokeFluteInBattle ; play in-battle pokeflute music ; XXX + + ld a, SFX_POKEFLUTE_IN_BATTLE + call PlaySound + call WaitForSoundToFinish +; farcall Music_PokeFluteInBattle ; play in-battle pokeflute music ;.musicWaitLoop ; wait for music to finish playing ; ld a, [wChannelSoundIDs + Ch7] ; and a ; music off? ; jr nz, .musicWaitLoop + .skipMusic ld hl, FluteWokeUpText jp PrintText diff --git a/engine/menus/pokedex.asm b/engine/menus/pokedex.asm index 651534a2..8dda4d1c 100644 --- a/engine/menus/pokedex.asm +++ b/engine/menus/pokedex.asm @@ -147,6 +147,8 @@ HandlePokedexSideMenu: call PlayCry pop af ld [wd11e], a +; call GetCryData +; call PlaySound jr .handleMenuInput .choseArea diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 94b5755d..8dfc8058 100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -58,6 +58,9 @@ AnimateHealingMachine: ld a, [wChannel1MusicID] and a jr nz, .waitLoop2 +; ld a, [wChannelSoundIDs] +; cp MUSIC_PKMN_HEALED ; is the healed music still playing? +; jr z, .waitLoop2 ; if so, check gain ld c, 32 call DelayFrames diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index c458a013..2723bf9c 100644 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -122,6 +122,7 @@ _LeaveMapAnim:: .playerNotStandingOnWarpPadOrHole ld a, $4 call StopMusic + call WaitForSongToFinish ld a, [wd732] bit 6, a ; is the last used pokemon center the destination? jr z, .flyAnimation diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index 0b8fca3a..da10c686 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -224,11 +224,12 @@ BillsPCDeposit: jp c, BillsPCMenu call DisplayDepositWithdrawMenu jp nc, BillsPCMenu - call WaitForSoundToFinish ld a, [wcf91] + call PlayCry - ;call GetCryData - ;call PlaySoundWaitForCurrent +; call GetCryData +; call PlaySoundWaitForCurrent + ld a, PARTY_TO_BOX ld [wMoveMonType], a call MoveMon @@ -278,11 +279,12 @@ BillsPCWithdraw: ld a, [wWhichPokemon] ld hl, wBoxMonNicks call GetPartyMonName - call WaitForSoundToFinish ld a, [wcf91] + call PlayCry - ;call GetCryData - ;call PlaySoundWaitForCurrent +; call GetCryData +; call PlaySoundWaitForCurrent + xor a ; BOX_TO_PARTY ld [wMoveMonType], a call MoveMon diff --git a/home/audio.asm b/home/audio.asm index 50e88208..3dadf1fd 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -61,14 +61,16 @@ PlayDefaultMusicCommon:: .next4 ld a, c ld [wAudioFadeOutControl], a + and a + jr nz, .next5 + inc a +.next5 + ld [wMusicFade], a + ld a, b ld [wLastMusicSoundID], a ld [wNewSoundID], a - ld [wMusicFadeID], a - ld a, 8 - ld [wMusicFade], a - ;call FadeMusic ; called in updatemusic ret ;UpdateMusic6Times:: diff --git a/home/overworld.asm b/home/overworld.asm index b3d964df..67c6067d 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -760,6 +760,7 @@ HandleBlackOut:: call GBFadeOutToBlack ld a, $08 call StopMusic + call WaitForSongToFinish ld hl, wd72e res 5, [hl] ld a, BANK(ResetStatusAndHalveMoneyOnBlackout) ; also BANK(SpecialWarpIn) and BANK(SpecialEnterMap) @@ -1256,17 +1257,16 @@ CollisionCheckOnLand:: call CheckTilePassable jr nc, .noCollision .collision - ;ld a, [wChannelSoundIDs + Ch5] - ;cp SFX_COLLISION ; check if collision sound is already playing - ;jr z, .setCarry - ; curSFX is not cleared for some reason. +; ld a, [wChannelSoundIDs + Ch5] +; cp SFX_COLLISION ; check if collision sound is already playing +; jr z, .setCarry ; ch5 on? ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] - jr nz, .setCarry + ld a, SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry @@ -1945,17 +1945,16 @@ CollisionCheckOnWater:: jr z, .stopSurfing ; stop surfing if the tile is passable jr .loop .collision - ;ld a, [wChannelSoundIDs + Ch5] - ;cp SFX_COLLISION ; check if collision sound is already playing - ;jr z, .setCarry - ; curSFX is not cleared for some reason. +; ld a, [wChannelSoundIDs + Ch5] +; cp SFX_COLLISION ; check if collision sound is already playing +; jr z, .setCarry ; ch5 on? ld hl, wChannel5 + wChannel1Flags1 - wChannel1 ; + CHANNEL_FLAGS1 bit 0, [hl] - jr nz, .setCarry + ld a, SFX_COLLISION call PlaySound ; play collision sound (if it's not already playing) .setCarry @@ -2307,6 +2306,10 @@ LoadMapHeader:: ld a, [hli] ld [wMapMusicSoundID], a ; music 1 ld a, [hl] + +; give vanilla red a fair shot at running our savs + ld a, BANK("Audio Engine 1") + ld [wMapMusicROMBank], a ; music 2 pop af ldh [hLoadedROMBank], a diff --git a/scripts/PewterPokecenter.asm b/scripts/PewterPokecenter.asm index 0687b845..4cb7b8b8 100644 --- a/scripts/PewterPokecenter.asm +++ b/scripts/PewterPokecenter.asm @@ -65,6 +65,11 @@ PewterJigglypuffText: call IsSongPlaying pop hl jr c, .spinMovementLoop +; ld a, [wChannelSoundIDs] +; ld b, a +; ld a, [wChannelSoundIDs + Ch2] +; or b +; jr nz, .spinMovementLoop ld c, 48 call DelayFrames diff --git a/scripts/RedsHouse1F.asm b/scripts/RedsHouse1F.asm index 57d50cab..e353e7f1 100644 --- a/scripts/RedsHouse1F.asm +++ b/scripts/RedsHouse1F.asm @@ -31,7 +31,13 @@ MomHealPokemon: ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a call PlayMusic + call WaitForSongToFinish +;.next +; ld a, [wChannelSoundIDs] +; cp MUSIC_PKMN_HEALED +; jr z, .next + ld a, [wMapMusicSoundID] ld [wNewSoundID], a call PlayMusic diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm index 8b458cc4..967b812b 100644 --- a/scripts/SSAnneCaptainsRoom.asm +++ b/scripts/SSAnneCaptainsRoom.asm @@ -57,7 +57,13 @@ SSAnne7RubText: ld a, MUSIC_PKMN_HEALED ld [wNewSoundID], a call PlayMusic + call WaitForSongToFinish +;.asm_61910 +; ld a, [wChannelSoundIDs] +; cp MUSIC_PKMN_HEALED +; jr z, .asm_61910 + call PlayDefaultMusic SetEvent EVENT_RUBBED_CAPTAINS_BACK ld hl, wd72d diff --git a/wram.asm b/wram.asm index cdc76e35..0cf09860 100644 --- a/wram.asm +++ b/wram.asm @@ -25,7 +25,7 @@ wTempoModifier:: wSFXDontWait:: ds 1 -wMusic:: +; crysaudio start ; nonzero if playing wMusicPlaying:: db @@ -123,10 +123,7 @@ wCurSFX:: wAudioEnd:: -wMapMusic:: db - -;wDontPlayMapMusicOnReload:: db -wMusicEnd:: +; crysaudio end SECTION "Sprite State Data", WRAM0 From 3508dc8e1de5133fc8062d906be1b7892bbeea98 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Mon, 29 Mar 2021 00:42:28 -0500 Subject: [PATCH 12/33] Remove last few red audio variables --- audio/play_battle_music.asm | 2 +- audio/pokedex_rating_sfx.asm | 2 +- engine/battle/animations.asm | 10 +++++---- engine/battle/common_text.asm | 8 +++---- engine/battle/core.asm | 12 +++++----- .../events/hidden_objects/bills_house_pc.asm | 2 +- engine/events/pokecenter.asm | 6 ++--- engine/items/item_effects.asm | 5 ++++- engine/link/cable_club.asm | 12 +++++----- engine/movie/evolution.asm | 4 ++-- engine/movie/intro.asm | 8 +++---- engine/movie/oak_speech/oak_speech.asm | 6 ++--- engine/movie/title.asm | 8 +++---- engine/overworld/auto_movement.asm | 16 +++++++------- engine/overworld/healing_machine.asm | 22 +++++++++---------- home/audio.asm | 16 +++++++------- home/init.asm | 14 ++++++------ home/trainers.asm | 8 +++---- scripts/CeruleanCity.asm | 4 ++-- scripts/OaksLab.asm | 4 ++-- scripts/PokemonTower2F.asm | 4 ++-- scripts/RedsHouse1F.asm | 4 ++-- scripts/Route22.asm | 10 ++++----- scripts/SSAnne2F.asm | 4 ++-- scripts/SSAnneCaptainsRoom.asm | 22 +++++++++---------- scripts/SilphCo7F.asm | 4 ++-- scripts/VermilionDock.asm | 2 +- wram.asm | 19 ++-------------- 28 files changed, 114 insertions(+), 124 deletions(-) diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 3f5ef611..0e90971f 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -4,7 +4,7 @@ PlayBattleMusic:: ld [wLowHealthAlarm], a ld [wMusicFade], a dec a ; SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic call DelayFrame ld c, 0 ; BANK(Music_GymLeaderBattle) diff --git a/audio/pokedex_rating_sfx.asm b/audio/pokedex_rating_sfx.asm index 2e0266f9..c8fd3d3b 100644 --- a/audio/pokedex_rating_sfx.asm +++ b/audio/pokedex_rating_sfx.asm @@ -11,7 +11,7 @@ PlayPokedexRatingSfx:: .gotSfxPointer push bc ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySoundWaitForCurrent pop bc ld b, $0 diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index ea7e7b02..a1157d9b 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2208,10 +2208,11 @@ GetMoveSound: ; jr .done .NotCryMove +; todo: fix sound modifiers ld a, [hli] - ld [wFrequencyModifier], a +; ld [wFrequencyModifier], a ld a, [hli] - ld [wTempoModifier], a +; ld [wTempoModifier], a .done ld a, b ret @@ -2636,8 +2637,9 @@ PlayApplyingAttackSound: ld b, $1 ld c, GSSFX_NOT_VERY_EFFECTIVE ; SFX_NOT_VERY_EFFECTIVE .playSound - ld [wFrequencyModifier], a +; todo: fix sound modifiers +; ld [wFrequencyModifier], a ld a, b - ld [wTempoModifier], a +; ld [wTempoModifier], a ld a, c jp PlaySound diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 0e270424..e65c3988 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -60,10 +60,10 @@ PrintBeginningBattleText: call PrintText .playSFX - xor a - ld [wFrequencyModifier], a - ld a, $80 - ld [wTempoModifier], a +; xor a +; ld [wFrequencyModifier], a +; ld a, $80 +; ld [wTempoModifier], a ld a, SFX_SILPH_SCOPE call PlaySound jp WaitForSoundToFinish diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 08a05d3e..03df62df 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -776,9 +776,9 @@ FaintEnemyPokemon: ld a, [wIsInBattle] dec a jr z, .wild_win - xor a - ld [wFrequencyModifier], a - ld [wTempoModifier], a +; xor a +; ld [wFrequencyModifier], a +; ld [wTempoModifier], a ld a, SFX_FAINT_FALL call PlaySoundWaitForCurrent @@ -965,7 +965,7 @@ TrainerDefeatedText: PlayBattleVictoryMusic: push af ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySoundWaitForCurrent ld c, 0 ; BANK(Music_DefeatedTrainer) pop af @@ -6899,8 +6899,8 @@ _LoadTrainerPic: ; unreferenced ResetCryModifiers: xor a - ld [wFrequencyModifier], a - ld [wTempoModifier], a +; ld [wFrequencyModifier], a +; ld [wTempoModifier], a jp PlaySound ; animates the mon "growing" out of the pokeball diff --git a/engine/events/hidden_objects/bills_house_pc.asm b/engine/events/hidden_objects/bills_house_pc.asm index a73596b4..59553db7 100644 --- a/engine/events/hidden_objects/bills_house_pc.asm +++ b/engine/events/hidden_objects/bills_house_pc.asm @@ -53,7 +53,7 @@ BillsHouseInitiatedText:: text_promptbutton text_asm ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound ld c, 16 call DelayFrames diff --git a/engine/events/pokecenter.asm b/engine/events/pokecenter.asm index a0da8eb3..b10de887 100644 --- a/engine/events/pokecenter.asm +++ b/engine/events/pokecenter.asm @@ -25,11 +25,11 @@ DisplayPokemonCenterDialogue_:: farcall AnimateHealingMachine ; do the healing machine animation xor a ld [wAudioFadeOutControl], a - ld a, [wAudioSavedROMBank] - ld [wAudioROMBank], a +; ld a, [wAudioSavedROMBank] +; ld [wAudioROMBank], a ld a, [wMapMusicSoundID] ld [wLastMusicSoundID], a - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic ld hl, PokemonFightingFitText call PrintText diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 204049a9..50266cee 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1808,7 +1808,10 @@ PlayedFluteHadEffectText: ld a, SFX_POKEFLUTE ld c, 0 ; BANK(SFX_Pokeflute) call PlaySound - call WaitForSoundToFinish +;.musicWaitLoop ; wait for music to finish playing +; ld a, [wChannelSoundIDs + Ch3] +; cp SFX_POKEFLUTE +; jr z, .musicWaitLoop call PlayDefaultMusic ; start playing normal music again .done jp TextScriptEnd ; end text diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index 97b917b5..4ebbc44b 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -826,10 +826,10 @@ TradeCenter_Trade: ld [wTradedEnemyMonSpecies], a ld a, 10 ld [wAudioFadeOutControl], a - ld a, 0 ; BANK(Music_SafariZone) - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(Music_SafariZone) +; ld [wAudioSavedROMBank], a ld a, MUSIC_SAFARI_ZONE - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic ld c, 100 call DelayFrames @@ -917,10 +917,10 @@ CableClub_Run: ldh [hJoy5], a ld a, 10 ld [wAudioFadeOutControl], a - ld a, 0 ; BANK(Music_Celadon) - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(Music_Celadon) +; ld [wAudioSavedROMBank], a ld a, MUSIC_CELADON - ld [wNewSoundID], a +; ld [wNewSoundID], a jp PlayMusic EmptyFunc: diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm index 0c24e885..7d698e68 100644 --- a/engine/movie/evolution.asm +++ b/engine/movie/evolution.asm @@ -10,7 +10,7 @@ EvolveMon: ld [wLowHealthAlarm], a ; ld [wChannelSoundIDs + Ch5], a dec a ; SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound ld a, $1 ldh [hAutoBGTransferEnabled], a @@ -68,7 +68,7 @@ EvolveMon: .done ld [wWholeScreenPaletteMonSpecies], a ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound ld a, [wWholeScreenPaletteMonSpecies] call PlayCry diff --git a/engine/movie/intro.asm b/engine/movie/intro.asm index 08487936..a84e150a 100644 --- a/engine/movie/intro.asm +++ b/engine/movie/intro.asm @@ -330,11 +330,11 @@ PlayShootingStar: ld c, 40 call DelayFrames .next - ld a, 0 ; BANK(Music_IntroBattle) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(Music_IntroBattle) +; ld [wAudioROMBank], a +; ld [wAudioSavedROMBank], a ld a, MUSIC_INTRO_BATTLE - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic call IntroClearMiddleOfScreen call ClearSprites diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 333639af..225723c0 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -128,9 +128,9 @@ OakSpeech: call ResetPlayerSpriteData ldh a, [hLoadedROMBank] push af - ld a, 0 ; BANK(Music_PalletTown) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(Music_PalletTown) +; ld [wAudioROMBank], a +; ld [wAudioSavedROMBank], a ld a, 10 call StopMusic diff --git a/engine/movie/title.asm b/engine/movie/title.asm index fa489cf8..822cd9c2 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -17,9 +17,9 @@ SetDefaultNamesBeforeTitlescreen:: ld [hli], a ld [hli], a ld [hl], a - ld a, 0 ; BANK(Music_TitleScreen) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(Music_TitleScreen) +; ld [wAudioROMBank], a +; ld [wAudioSavedROMBank], a DisplayTitleScreen: call GBPalWhiteOut @@ -213,7 +213,7 @@ ENDC call Delay3 call WaitForSoundToFinish ld a, MUSIC_TITLE_SCREEN - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic xor a ld [wUnusedCC5B], a diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 0ffaf5d7..e68f484c 100644 --- a/engine/overworld/auto_movement.asm +++ b/engine/overworld/auto_movement.asm @@ -162,11 +162,11 @@ PewterMuseumGuyMovementScriptPointerTable:: dw PewterMovementScript_Done PewterMovementScript_WalkToMuseum: - ld a, 0 ; BANK(Music_MuseumGuy) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(Music_MuseumGuy) +; ld [wAudioROMBank], a +; ld [wAudioSavedROMBank], a ld a, MUSIC_MUSEUM_GUY - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic ld a, [wSpriteIndex] swap a @@ -218,11 +218,11 @@ PewterGymGuyMovementScriptPointerTable:: dw PewterMovementScript_Done PewterMovementScript_WalkToGym: - ld a, 0 ; BANK(Music_MuseumGuy) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(Music_MuseumGuy) +; ld [wAudioROMBank], a +; ld [wAudioSavedROMBank], a ld a, MUSIC_MUSEUM_GUY - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic ld a, [wSpriteIndex] swap a diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 8dfc8058..f2561b53 100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -39,18 +39,18 @@ AnimateHealingMachine: call DelayFrames dec b jr nz, .partyLoop - ld a, [wAudioROMBank] - cp $1f ; BANK("Audio Engine 3") - ld [wAudioSavedROMBank], a - jr nz, .next - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound - ld a, 0 ; BANK(Music_PkmnHealed) - ld [wAudioROMBank], a -.next +; ld a, [wAudioROMBank] +; cp BANK("Audio Engine 3") +; ld [wAudioSavedROMBank], a +; jr nz, .next +; ld a, SFX_STOP_ALL_MUSIC +; ld [wNewSoundID], a +; call PlaySound +; ld a, 0 ; BANK(Music_PkmnHealed) +; ld [wAudioROMBank], a +;.next ld a, MUSIC_PKMN_HEALED - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic ld d, $28 call FlashSprite8Times diff --git a/home/audio.asm b/home/audio.asm index 3dadf1fd..e69fa461 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -32,19 +32,19 @@ PlayDefaultMusicCommon:: .next ld b, a - ld a, d - and a ; should current music be faded out first? - ld a, 0 ; BANK(Music_BikeRiding) - jr nz, .next2 +; ld a, d +; and a ; should current music be faded out first? +; ld a, 0 ; BANK(Music_BikeRiding) +; jr nz, .next2 ; Only change the audio ROM bank if the current music isn't going to be faded ; out before the default music begins. - ld [wAudioROMBank], a +; ld [wAudioROMBank], a -.next2 +;.next2 ; [wAudioSavedROMBank] will be copied to [wAudioROMBank] after fading out the ; current music (if the current music is faded out). - ld [wAudioSavedROMBank], a +; ld [wAudioSavedROMBank], a jr .next3 .walking @@ -69,7 +69,7 @@ PlayDefaultMusicCommon:: ld a, b ld [wLastMusicSoundID], a - ld [wNewSoundID], a +; ld [wNewSoundID], a ld [wMusicFadeID], a ret diff --git a/home/init.asm b/home/init.asm index 5a0ab53d..357cb6d2 100644 --- a/home/init.asm +++ b/home/init.asm @@ -97,9 +97,9 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB - ld a, 0 ; BANK(SFX_Shooting_Star) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(SFX_Shooting_Star) +; ld [wAudioROMBank], a +; ld [wAudioSavedROMBank], a ld a, $9c ldh [hAutoBGTransferDest + 1], a xor a @@ -126,12 +126,12 @@ ClearVram:: StopAllSounds:: - ld a, 0 ; BANK("Audio Engine 1") - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK("Audio Engine 1") +; ld [wAudioROMBank], a +; ld [wAudioSavedROMBank], a xor a ld [wAudioFadeOutControl], a - ld [wNewSoundID], a +; ld [wNewSoundID], a ld [wLastMusicSoundID], a dec a jp PlaySound diff --git a/home/trainers.asm b/home/trainers.asm index 4a0a16f6..ea1781fc 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -409,9 +409,9 @@ PlayTrainerMusic:: ld [wAudioFadeOutControl], a ld a, SFX_STOP_ALL_MUSIC call PlaySound - ld a, 0 ; BANK(Music_MeetEvilTrainer) - ld [wAudioROMBank], a - ld [wAudioSavedROMBank], a +; ld a, 0 ; BANK(Music_MeetEvilTrainer) +; ld [wAudioROMBank], a +; ld [wAudioSavedROMBank], a ld a, [wEngagedTrainerClass] ld b, a ld hl, EvilTrainerList @@ -436,7 +436,7 @@ PlayTrainerMusic:: .maleTrainer ld a, MUSIC_MEET_MALE_TRAINER .PlaySound - ld [wNewSoundID], a +; ld [wNewSoundID], a jp PlayMusic INCLUDE "data/trainers/encounter_types.asm" diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index fb332e58..4ac0ebeb 100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -69,7 +69,7 @@ ENDC and a jr z, .asm_19512 ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound .asm_19512 ld c, 0 ; BANK(Music_MeetRival) @@ -176,7 +176,7 @@ CeruleanCityScript2: ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart ld a, $1 diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 9d6f8c3b..b6e31973 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -511,7 +511,7 @@ OaksLabScript15: ldh [hJoyHeld], a call EnableAutoTextBoxDrawing ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart ld a, $15 @@ -612,7 +612,7 @@ OaksLabScript16: call FillMemory ld [hl], $ff ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart ld a, $1 diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm index 0ec03f90..f128ed03 100644 --- a/scripts/PokemonTower2F.asm +++ b/scripts/PokemonTower2F.asm @@ -27,7 +27,7 @@ ENDC call ArePlayerCoordsInArray ret nc ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -81,7 +81,7 @@ PokemonTower2Script1: ldh [hSpriteIndex], a call MoveSprite ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart ld a, $2 diff --git a/scripts/RedsHouse1F.asm b/scripts/RedsHouse1F.asm index e353e7f1..f96209a9 100644 --- a/scripts/RedsHouse1F.asm +++ b/scripts/RedsHouse1F.asm @@ -29,7 +29,7 @@ MomHealPokemon: call ReloadMapData predef HealParty ld a, MUSIC_PKMN_HEALED - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic call WaitForSongToFinish @@ -39,7 +39,7 @@ MomHealPokemon: ; jr z, .next ld a, [wMapMusicSoundID] - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic call GBFadeInFromWhite ld hl, MomHealText2 diff --git a/scripts/Route22.asm b/scripts/Route22.asm index dfd2b2cb..38678089 100644 --- a/scripts/Route22.asm +++ b/scripts/Route22.asm @@ -89,7 +89,7 @@ Route22Script0: and a jr z, .asm_50f4e ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound .asm_50f4e ld c, 0 ; BANK(Music_MeetRival) @@ -168,7 +168,7 @@ Route22Script2: ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart ld a, [wcf0d] @@ -242,11 +242,11 @@ Route22Script_5104e: and a jr z, .skipYVisibilityTesta ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound .skipYVisibilityTesta ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateTempo ld a, $2 @@ -327,7 +327,7 @@ Route22Script5: ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStartAndTempo ld a, [wcf0d] diff --git a/scripts/SSAnne2F.asm b/scripts/SSAnne2F.asm index 1311477c..2ba54f08 100644 --- a/scripts/SSAnne2F.asm +++ b/scripts/SSAnne2F.asm @@ -25,7 +25,7 @@ SSAnne2Script0: call ArePlayerCoordsInArray ret nc ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -145,7 +145,7 @@ SSAnne2Script2: ldh [hSpriteIndex], a call MoveSprite ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart ld a, $3 diff --git a/scripts/SSAnneCaptainsRoom.asm b/scripts/SSAnneCaptainsRoom.asm index 967b812b..58539f1e 100644 --- a/scripts/SSAnneCaptainsRoom.asm +++ b/scripts/SSAnneCaptainsRoom.asm @@ -44,18 +44,18 @@ SSAnne7Text1: SSAnne7RubText: text_far _SSAnne7RubText text_asm - ld a, [wAudioROMBank] - cp $1f ; BANK("Audio Engine 3") - ld [wAudioSavedROMBank], a - jr nz, .asm_61908 - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound - ld a, 0 ; BANK(Music_PkmnHealed) - ld [wAudioROMBank], a -.asm_61908 +; ld a, [wAudioROMBank] +; cp BANK("Audio Engine 3") +; ld [wAudioSavedROMBank], a +; jr nz, .asm_61908 +; ld a, SFX_STOP_ALL_MUSIC +; ld [wNewSoundID], a +; call PlaySound +; ld a, 0 ; BANK(Music_PkmnHealed) +; ld [wAudioROMBank], a +;.asm_61908 ld a, MUSIC_PKMN_HEALED - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlayMusic call WaitForSongToFinish diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm index 1f15ae12..f5fd8c53 100644 --- a/scripts/SilphCo7F.asm +++ b/scripts/SilphCo7F.asm @@ -131,7 +131,7 @@ SilphCo7Script0: ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL @@ -220,7 +220,7 @@ SilphCo7Script4: ldh [hSpriteIndexOrTextID], a call DisplayTextID ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound farcall Music_RivalAlternateStart ld de, MovementData_51d1d diff --git a/scripts/VermilionDock.asm b/scripts/VermilionDock.asm index ae81b448..7bbe4e84 100644 --- a/scripts/VermilionDock.asm +++ b/scripts/VermilionDock.asm @@ -40,7 +40,7 @@ VermilionDock_1db9b: SetEventForceReuseHL EVENT_SS_ANNE_LEFT ld a, SFX_STOP_ALL_MUSIC ld [wJoyIgnore], a - ld [wNewSoundID], a +; ld [wNewSoundID], a call PlaySound ld c, 0 ; BANK(Music_Surfing) ld a, MUSIC_SURFING diff --git a/wram.asm b/wram.asm index 0cf09860..b60d1586 100644 --- a/wram.asm +++ b/wram.asm @@ -8,23 +8,6 @@ INCLUDE "vram.asm" SECTION "WRAM", WRAM0 -wNewSoundID:: - ds 1 - -wAudioROMBank:: - ds 1 - -wAudioSavedROMBank:: - ds 1 - -wFrequencyModifier:: - ds 1 - -wTempoModifier:: - ds 1 - -wSFXDontWait:: ds 1 - ; crysaudio start ; nonzero if playing @@ -121,6 +104,8 @@ wCurSFX:: ; id of sfx currently playing db +wSFXDontWait:: ds 1 + wAudioEnd:: ; crysaudio end From 37d3ba4b39645e545b2025151dabf91d99e47f92 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Mon, 29 Mar 2021 22:30:01 -0500 Subject: [PATCH 13/33] Fix alternate starts/tempos --- audio/alternate_tempo.asm | 61 ++++++++++++++----------------- crysaudio/music/RBY/meetrival.asm | 6 --- 2 files changed, 28 insertions(+), 39 deletions(-) diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm index d6b70ad6..301eb969 100644 --- a/audio/alternate_tempo.asm +++ b/audio/alternate_tempo.asm @@ -2,53 +2,48 @@ Music_RivalAlternateStart:: ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL - jp PlayMusic -; call PlayMusic -; ld hl, wChannelCommandPointers -; ld de, Music_MeetRival_branch_b1a2 -; call Audio1_OverwriteChannelPointer -; ld de, Music_MeetRival_branch_b21d -; call Audio1_OverwriteChannelPointer -; ld de, Music_MeetRival_branch_b2b5 + call PlayMusic + ld hl, wChannel1MusicAddress + ld de, Music_MeetRival_branch_b1a2 + call Audio1_OverwriteChannelPointer + ld hl, wChannel2MusicAddress + ld de, Music_MeetRival_branch_b21d + call Audio1_OverwriteChannelPointer + ld hl, wChannel3MusicAddress + ld de, Music_MeetRival_branch_b2b5 -;Audio1_OverwriteChannelPointer: -; ld a, e -; ld [hli], a -; ld a, d -; ld [hli], a -; ret +Audio1_OverwriteChannelPointer: + ld a, e + ld [hli], a + ld a, d + ld [hli], a + ret ; an alternate tempo for MeetRival which is slightly slower Music_RivalAlternateTempo:: ld c, 0 ; BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL - jp PlayMusic -; call PlayMusic -; ld hl, wChannelCommandPointers -; ld de, Music_MeetRival_branch_b119 -; jp Audio1_OverwriteChannelPointer + call PlayMusic + ld hl, wChannel1MusicAddress + ld de, Music_MeetRival_branch_b119 + jp Audio1_OverwriteChannelPointer ; applies both the alternate start and alternate tempo Music_RivalAlternateStartAndTempo:: - jp Music_RivalAlternateStart -; call Music_RivalAlternateStart -; ld hl, wChannelCommandPointers -; ld de, Music_MeetRival_branch_b19b -; jp Audio1_OverwriteChannelPointer + call Music_RivalAlternateStart + ld hl, wChannel1MusicAddress + ld de, Music_MeetRival_branch_b19b + jp Audio1_OverwriteChannelPointer ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo:: ld a, 10 - ld [wAudioFadeOutCounterReloadValue], a - ld [wAudioFadeOutCounter], a - ld a, $ff ; stop playing music after the fade-out is finished - ld [wAudioFadeOutControl], a + call StopMusic ld c, 100 call DelayFrames ; wait for the fade-out to finish ld c, 0 ; BANK(Music_Cities1) ld a, MUSIC_CITIES1 - jp PlayMusic -; call PlayMusic -; ld hl, wChannelCommandPointers -; ld de, Music_Cities1_branch_aa6f -; jp Audio1_OverwriteChannelPointer + call PlayMusic + ld hl, wChannel1MusicAddress + ld de, Music_Cities1_branch_aa6f + jp Audio1_OverwriteChannelPointer diff --git a/crysaudio/music/RBY/meetrival.asm b/crysaudio/music/RBY/meetrival.asm index a0d7dd0f..f88d593b 100644 --- a/crysaudio/music/RBY/meetrival.asm +++ b/crysaudio/music/RBY/meetrival.asm @@ -4,12 +4,6 @@ Music_MeetRival:: channel 2, Music_MeetRival_Ch2 channel 3, Music_MeetRival_Ch3 -Music_FarewellRival: - channel_count 3 - channel 1, Music_MeetRival_branch_b1a2 - channel 2, Music_MeetRival_branch_b21d - channel 3, Music_MeetRival_branch_b2b5 - Music_MeetRival_branch_b119:: tempo 100 sound_loop 0, Music_MeetRival_branch_b123 From b2afaae7abb27b62ce376e52ad508f33cf97d042 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Tue, 30 Mar 2021 01:06:32 -0500 Subject: [PATCH 14/33] Fix remaining uses of fade --- audio/alternate_tempo.asm | 4 +++- audio/play_battle_music.asm | 3 +-- engine/battle/animations.asm | 2 +- engine/events/hidden_objects/safari_game.asm | 2 +- engine/events/pokecenter.asm | 2 +- engine/link/cable_club.asm | 13 ++++++------ engine/movie/hall_of_fame.asm | 7 +++---- engine/movie/oak_speech/oak_speech.asm | 9 +++----- engine/overworld/healing_machine.asm | 18 +++++++--------- engine/overworld/player_animations.asm | 1 - home/audio.asm | 16 +++++++------- home/init.asm | 4 ++-- home/overworld.asm | 22 ++++---------------- home/trainers.asm | 2 +- 14 files changed, 43 insertions(+), 62 deletions(-) diff --git a/audio/alternate_tempo.asm b/audio/alternate_tempo.asm index 301eb969..1548607d 100644 --- a/audio/alternate_tempo.asm +++ b/audio/alternate_tempo.asm @@ -38,7 +38,9 @@ Music_RivalAlternateStartAndTempo:: ; an alternate tempo for Cities1 which is used for the Hall of Fame room Music_Cities1AlternateTempo:: ld a, 10 - call StopMusic + ld [wMusicFade], a + xor a + ld [wMusicFadeID], a ld c, 100 call DelayFrames ; wait for the fade-out to finish ld c, 0 ; BANK(Music_Cities1) diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index 0e90971f..f3ef8dd3 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -1,8 +1,7 @@ PlayBattleMusic:: xor a - ld [wAudioFadeOutControl], a - ld [wLowHealthAlarm], a ld [wMusicFade], a + ld [wLowHealthAlarm], a dec a ; SFX_STOP_ALL_MUSIC ; ld [wNewSoundID], a call PlayMusic diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index a1157d9b..06034684 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -884,7 +884,7 @@ TradeJumpPokeball: cp $ff jr nz, .skipPlayingSound .playSound ; play sound if next move distance is 12 or this is the last one - ld a, SFX_BATTLE_18 + ld a, SFX_SWAP call PlaySound .skipPlayingSound push bc diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm index bbb81a2c..9cba8afa 100644 --- a/engine/events/hidden_objects/safari_game.asm +++ b/engine/events/hidden_objects/safari_game.asm @@ -30,7 +30,7 @@ SafariZoneGameStillGoing: SafariZoneGameOver: call EnableAutoTextBoxDrawing xor a - ld [wAudioFadeOutControl], a + ld [wMusicFade], a dec a ; SFX_STOP_ALL_MUSIC call PlaySound ld c, 0 ; BANK(SFX_Safari_Zone_PA) diff --git a/engine/events/pokecenter.asm b/engine/events/pokecenter.asm index b10de887..a3d16595 100644 --- a/engine/events/pokecenter.asm +++ b/engine/events/pokecenter.asm @@ -24,7 +24,7 @@ DisplayPokemonCenterDialogue_:: predef HealParty farcall AnimateHealingMachine ; do the healing machine animation xor a - ld [wAudioFadeOutControl], a + ld [wMusicFade], a ; ld a, [wAudioSavedROMBank] ; ld [wAudioROMBank], a ld a, [wMapMusicSoundID] diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index 4ebbc44b..173d6060 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -825,12 +825,12 @@ TradeCenter_Trade: ld a, [hl] ld [wTradedEnemyMonSpecies], a ld a, 10 - ld [wAudioFadeOutControl], a + ld [wMusicFade], a ; ld a, 0 ; BANK(Music_SafariZone) ; ld [wAudioSavedROMBank], a ld a, MUSIC_SAFARI_ZONE -; ld [wNewSoundID], a - call PlayMusic + ld [wMusicFadeID], a +; call PlayMusic ld c, 100 call DelayFrames call ClearScreen @@ -916,12 +916,13 @@ CableClub_Run: ld [wLinkState], a ldh [hJoy5], a ld a, 10 - ld [wAudioFadeOutControl], a + ld [wMusicFade], a ; ld a, 0 ; BANK(Music_Celadon) ; ld [wAudioSavedROMBank], a ld a, MUSIC_CELADON -; ld [wNewSoundID], a - jp PlayMusic + ld [wMusicFadeID], a +; jp PlayMusic + ret EmptyFunc: ret diff --git a/engine/movie/hall_of_fame.asm b/engine/movie/hall_of_fame.asm index 0f5ea6f1..cfcb9d99 100644 --- a/engine/movie/hall_of_fame.asm +++ b/engine/movie/hall_of_fame.asm @@ -281,8 +281,7 @@ HoFRecordMonInfo: HoFFadeOutScreenAndMusic: ld a, 10 - ld [wAudioFadeOutCounterReloadValue], a - ld [wAudioFadeOutCounter], a - ld a, $ff - ld [wAudioFadeOutControl], a + ld [wMusicFade], a + xor a + ld [wMusicFadeID], a jp GBFadeOutToWhite diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm index 225723c0..ed89b12d 100644 --- a/engine/movie/oak_speech/oak_speech.asm +++ b/engine/movie/oak_speech/oak_speech.asm @@ -133,12 +133,9 @@ OakSpeech: ; ld [wAudioSavedROMBank], a ld a, 10 - call StopMusic -; ld a, 10 -; ld [wAudioFadeOutControl], a -; ld a, SFX_STOP_ALL_MUSIC -; ld [wNewSoundID], a -; call PlaySound + ld [wMusicFade], a + xor a + ld [wMusicFadeID], a pop af ldh [hLoadedROMBank], a diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index f2561b53..7d034ebe 100644 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -17,17 +17,13 @@ AnimateHealingMachine: call CopyHealingMachineOAM ld a, 4 - call StopMusic - call WaitForSongToFinish -; ld a, 4 -; ld [wAudioFadeOutControl], a -; ld a, SFX_STOP_ALL_MUSIC -; ld [wNewSoundID], a -; call PlaySound -;.waitLoop -; ld a, [wAudioFadeOutControl] -; and a ; is fade-out finished? -; jr nz, .waitLoop ; if not, check again + ld [wMusicFade], a + xor a + ld [wMusicFadeID], a +.waitLoop + ld a, [wMusicFade] + and a ; is fade-out finished? + jr nz, .waitLoop ; if not, check again ld a, [wPartyCount] ld b, a diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 2723bf9c..c458a013 100644 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -122,7 +122,6 @@ _LeaveMapAnim:: .playerNotStandingOnWarpPadOrHole ld a, $4 call StopMusic - call WaitForSongToFinish ld a, [wd732] bit 6, a ; is the last used pokemon center the destination? jr z, .flyAnimation diff --git a/home/audio.asm b/home/audio.asm index e69fa461..d07e7296 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -60,17 +60,19 @@ PlayDefaultMusicCommon:: .next4 ld a, c - ld [wAudioFadeOutControl], a - and a - jr nz, .next5 - inc a -.next5 ld [wMusicFade], a - ld a, b ld [wLastMusicSoundID], a -; ld [wNewSoundID], a ld [wMusicFadeID], a + +; if no fade, play immediately + ld a, [wMusicFade] + and a + jr nz, .next5 + ld a, b + call PlayMusic +.next5 + ret ;UpdateMusic6Times:: diff --git a/home/init.asm b/home/init.asm index 357cb6d2..a2744ca7 100644 --- a/home/init.asm +++ b/home/init.asm @@ -130,8 +130,8 @@ StopAllSounds:: ; ld [wAudioROMBank], a ; ld [wAudioSavedROMBank], a xor a - ld [wAudioFadeOutControl], a -; ld [wNewSoundID], a + ld [wMusicFade], a + ld [wMusicFadeID], a ld [wLastMusicSoundID], a dec a jp PlaySound diff --git a/home/overworld.asm b/home/overworld.asm index 67c6067d..e0a55c01 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -760,7 +760,6 @@ HandleBlackOut:: call GBFadeOutToBlack ld a, $08 call StopMusic - call WaitForSongToFinish ld hl, wd72e res 5, [hl] ld a, BANK(ResetStatusAndHalveMoneyOnBlackout) ; also BANK(SpecialWarpIn) and BANK(SpecialEnterMap) @@ -775,24 +774,11 @@ StopMusic:: ld [wMusicFade], a xor a ld [wMusicFadeID], a -.wait0 - ld a, [wMusicFadeCount] +.wait + ld a, [wMusicFade] and a - jr z, .wait0 -.wait1 - ld a, [wMusicFadeCount] - and a - jr nz, .wait1 - ret -; ld [wAudioFadeOutControl], a -; ld a, SFX_STOP_ALL_MUSIC -; ld [wNewSoundID], a -; call PlaySound -;.wait -; ld a, [wAudioFadeOutControl] -; and a -; jr nz, .wait -; jp StopAllSounds + jr nz, .wait + jp StopAllSounds HandleFlyWarpOrDungeonWarp:: call UpdateSprites diff --git a/home/trainers.asm b/home/trainers.asm index ea1781fc..3619b2e5 100644 --- a/home/trainers.asm +++ b/home/trainers.asm @@ -406,7 +406,7 @@ PlayTrainerMusic:: and a ret nz xor a - ld [wAudioFadeOutControl], a + ld [wMusicFade], a ld a, SFX_STOP_ALL_MUSIC call PlaySound ; ld a, 0 ; BANK(Music_MeetEvilTrainer) From 17044ab7eb622f89123a512ed7f8e5a7d9506739 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 3 Apr 2021 13:02:22 -0500 Subject: [PATCH 15/33] Fix battle sound pitch/tempo modifiers --- constants/music_constants.asm | 4 -- crysaudio/engine.asm | 125 +++++++++++++++++++++++++++++++++ crysaudio/sfx_pointers_red.asm | 5 -- engine/battle/animations.asm | 52 +++++++------- engine/battle/core.asm | 15 ++-- home/audio.asm | 42 +++++++++++ 6 files changed, 200 insertions(+), 43 deletions(-) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index 730c0b3e..f253deef 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -216,8 +216,4 @@ const_value = 1 const SFX_POKEFLUTE_IN_BATTLE - const GSSFX_NOT_VERY_EFFECTIVE - const GSSFX_DAMAGE - const GSSFX_SUPER_EFFECTIVE - SFX_STOP_ALL_MUSIC EQU $ff diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index 76dda12b..e274e1b1 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -2605,6 +2605,131 @@ _PlayCry:: call MusicOn ret +_PlayBattleSound:: +; clear channels if they aren't already + call MusicOff + ld hl, wChannel5Flags1 + bit SOUND_CHANNEL_ON, [hl] ; ch5 on? + jr z, .ch6 + res SOUND_CHANNEL_ON, [hl] ; turn it off + xor a + ldh [rNR11], a ; length/wavepattern = 0 + ld a, $8 + ldh [rNR12], a ; envelope = 0 + xor a + ldh [rNR13], a ; frequency lo = 0 + ld a, $80 + ldh [rNR14], a ; restart sound (freq hi = 0) + xor a + ld [wPitchSweep], a ; pitch sweep off + ldh [rNR10], a ; pitch sweep off +.ch6 + ld hl, wChannel6Flags1 + bit SOUND_CHANNEL_ON, [hl] + jr z, .ch7 + res SOUND_CHANNEL_ON, [hl] ; turn it off + xor a + ldh [rNR21], a ; length/wavepattern = 0 + ld a, $8 + ldh [rNR22], a ; envelope = 0 + xor a + ldh [rNR23], a ; frequency lo = 0 + ld a, $80 + ldh [rNR24], a ; restart sound (freq hi = 0) +.ch7 + ld hl, wChannel7Flags1 + bit SOUND_CHANNEL_ON, [hl] + jr z, .ch8 + res SOUND_CHANNEL_ON, [hl] ; turn it off + xor a + ldh [rNR30], a ; sound mode #3 off + ldh [rNR31], a ; length/wavepattern = 0 + ld a, $8 + ldh [rNR32], a ; envelope = 0 + xor a + ldh [rNR33], a ; frequency lo = 0 + ld a, $80 + ldh [rNR34], a ; restart sound (freq hi = 0) +.ch8 + ld hl, wChannel8Flags1 + bit SOUND_CHANNEL_ON, [hl] + jr z, .chscleared + res SOUND_CHANNEL_ON, [hl] ; turn it off + xor a + ldh [rNR41], a ; length/wavepattern = 0 + ld a, $8 + ldh [rNR42], a ; envelope = 0 + xor a + ldh [rNR43], a ; frequency lo = 0 + ld a, $80 + ldh [rNR44], a ; restart sound (freq hi = 0) + xor a + ld [wNoiseSampleAddress], a + ld [wNoiseSampleAddress + 1], a +.chscleared +; start reading sfx header for # chs + ld hl, wMusicID + ld [hl], e + inc hl + ld [hl], d + ld hl, SFX + add hl, de ; three + add hl, de ; byte + add hl, de ; pointers + ; get bank + ld a, [hli] + ld [wMusicBank], a + ; get address + ld e, [hl] + inc hl + ld d, [hl] + ; get # channels + call LoadMusicByte + rlca ; top 2 + rlca ; bits + maskbits NUM_MUSIC_CHANS + inc a ; # channels -> # loops +.startchannels + push af + call LoadChannel ; bc = current channel + ld hl, CHANNEL_FLAGS1 + add hl, bc + set SOUND_SFX, [hl] + + ld hl, CHANNEL_FLAGS2 + add hl, bc + set SOUND_PITCH_OFFSET, [hl] + + ld hl, CHANNEL_PITCH_OFFSET + add hl, bc + ld a, [wCryPitch] + ld [hli], a + ld a, [wCryPitch + 1] + ld [hl], a + +; No tempo for channel 4 + ld a, [wCurChannel] + maskbits NUM_MUSIC_CHANS + cp CHAN4 + jr nc, .start + +; Tempo is effectively length + ld hl, CHANNEL_TEMPO + add hl, bc + ld a, [wCryLength] + ld [hli], a + ld a, [wCryLength + 1] + ld [hl], a +.start + call StartChannel + pop af + dec a + jr nz, .startchannels + call MusicOn + xor a + ld [wSFXPriority], a + ret + _PlaySFX:: ; clear channels if they aren't already call MusicOff diff --git a/crysaudio/sfx_pointers_red.asm b/crysaudio/sfx_pointers_red.asm index f00e2a4d..892b6eb3 100644 --- a/crysaudio/sfx_pointers_red.asm +++ b/crysaudio/sfx_pointers_red.asm @@ -113,8 +113,3 @@ SFX: dba SFX_Shooting_Star dba SFX_PokefluteInBattle - - dba Sfx_NotVeryEffective - dba Sfx_Damage - dba Sfx_SuperEffective - diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index 06034684..a729f174 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -200,7 +200,7 @@ PlayAnimation: push hl push de call GetMoveSound - call nc, AnimPlaySFX + call nc, PlayBattleSound pop de pop hl .skipPlayingSound @@ -256,15 +256,6 @@ PlayAnimation: .AnimationOver ret -AnimPlaySFX: - push de - ld e, a - xor a - ld d, a - call PlaySFX - pop de - ret - LoadSubanimation: ld a, [wSubAnimAddrPtr + 1] ld h, a @@ -560,7 +551,7 @@ PlaySubanimation: cp NO_MOVE - 1 jr z, .skipPlayingSound call GetMoveSound - call nc, AnimPlaySFX + call nc, PlayBattleSound .skipPlayingSound ld hl, wOAMBuffer ; base address of OAM buffer ld a, l @@ -2208,13 +2199,19 @@ GetMoveSound: ; jr .done .NotCryMove -; todo: fix sound modifiers + push bc ld a, [hli] -; ld [wFrequencyModifier], a + ld c, a + ld b, 0 ld a, [hli] -; ld [wTempoModifier], a + add $80 + ld e, a + ld a, 0 + adc 0 + ld d, a + pop af .done - ld a, b + and a ret IsCryMove: @@ -2625,21 +2622,20 @@ PlayApplyingAttackSound: and $7f ret z cp 10 - ld a, $20 - ld b, $30 - ld c, GSSFX_DAMAGE ; SFX_DAMAGE + ld bc, $20 + ld de, $30 + $80 + ld a, SFX_DAMAGE jr z, .playSound - ld a, $e0 - ld b, $ff - ld c, GSSFX_SUPER_EFFECTIVE ; SFX_SUPER_EFFECTIVE + ld bc, $e0 + ld de, $ff + $80 + ld a, SFX_SUPER_EFFECTIVE jr nc, .playSound - ld a, $50 - ld b, $1 - ld c, GSSFX_NOT_VERY_EFFECTIVE ; SFX_NOT_VERY_EFFECTIVE + ld bc, $50 + ld de, $1 + $80 + ld a, SFX_NOT_VERY_EFFECTIVE .playSound -; todo: fix sound modifiers ; ld [wFrequencyModifier], a - ld a, b +; ld a, b ; ld [wTempoModifier], a - ld a, c - jp PlaySound +; ld a, c + jp PlayBattleSound diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 03df62df..51e519db 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -776,16 +776,19 @@ FaintEnemyPokemon: ld a, [wIsInBattle] dec a jr z, .wild_win + + call WaitForSoundToFinish + ld bc, $00 + ld de, $80 + ld a, SFX_FAINT_FALL + call PlayBattleSound ; xor a ; ld [wFrequencyModifier], a ; ld [wTempoModifier], a - ld a, SFX_FAINT_FALL - call PlaySoundWaitForCurrent +; ld a, SFX_FAINT_FALL +; call PlaySoundWaitForCurrent -; using WaitForSoundToFinish causes a noticeable delay -; so use a smaller hard-coded delay for now - ld c, 10 - call DelayFrames + call WaitForSoundToFinish ;.sfxwait ; ld a, [wChannelSoundIDs + Ch5] ; cp SFX_FAINT_FALL diff --git a/home/audio.asm b/home/audio.asm index d07e7296..d074547d 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -288,6 +288,48 @@ endr pop hl ret +PlayBattleSound:: + push hl + push de + push bc + push af + + push af + ld a, c + ld [wCryPitch], a + ld a, b + ld [wCryPitch + 1], a + ld a, e + ld [wCryLength], a + ld a, d + ld [wCryLength + 1], a + pop af + + ld e, a + xor a + ld d, a + + ldh a, [hLoadedROMBank] + push af + + ld a, BANK(_PlayBattleSound) + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + + ld a, e + ld [wCurSFX], a + call _PlayBattleSound + + pop af + ldh [hLoadedROMBank], a + ld [MBC1RomBank], a + + pop af + pop bc + pop de + pop hl + ret + PlaySFX:: ; Play sound effect de. ; Sound effects are ordered by priority (highest to lowest) From 63c3f5221bbd06ac111cca2bfe56b4e492028870 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 3 Apr 2021 15:18:48 -0500 Subject: [PATCH 16/33] Fix slots reward sfx priority --- engine/slots/slot_machine.asm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engine/slots/slot_machine.asm b/engine/slots/slot_machine.asm index d508d0ac..f91f5a56 100644 --- a/engine/slots/slot_machine.asm +++ b/engine/slots/slot_machine.asm @@ -411,6 +411,7 @@ SlotMachine_CheckForMatches: call PrintText .done xor a + ld [wSFXPriority], a ; ld [wMuteAudioAndPauseMusic], a ret .rollWheel3DownByOneSymbol @@ -692,6 +693,8 @@ SlotMachine_PayCoinsToPlayer: call SlotMachine_PrintPayoutCoins ld a, SFX_SLOTS_REWARD call PlaySound + ld a, 1 + ld [wSFXPriority], a ld a, [wAnimCounter] dec a jr nz, .skip1 From a3bfcb1abfa0e041c2f64bc5a757600dfc402911 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 3 Apr 2021 17:45:32 -0500 Subject: [PATCH 17/33] Restore toggle_perfect_pitch --- crysaudio/macros.asm | 6 +----- crysaudio/music/RBY/bikeriding.asm | 3 ++- crysaudio/music/RBY/celadon.asm | 2 +- crysaudio/music/RBY/cinnabar.asm | 2 +- crysaudio/music/RBY/cinnabarmansion.asm | 2 +- crysaudio/music/RBY/cities1.asm | 2 +- crysaudio/music/RBY/cities2.asm | 2 +- crysaudio/music/RBY/credits.asm | 2 +- crysaudio/music/RBY/defeatedgymleader.asm | 2 +- crysaudio/music/RBY/defeatedtrainer.asm | 2 +- crysaudio/music/RBY/defeatedwildmon.asm | 2 +- crysaudio/music/RBY/dungeon1.asm | 2 +- crysaudio/music/RBY/dungeon2.asm | 2 +- crysaudio/music/RBY/dungeon3.asm | 2 +- crysaudio/music/RBY/finalbattle.asm | 2 +- crysaudio/music/RBY/gamecorner.asm | 2 +- crysaudio/music/RBY/gym.asm | 2 +- crysaudio/music/RBY/gymleaderbattle.asm | 2 +- crysaudio/music/RBY/halloffame.asm | 2 +- crysaudio/music/RBY/indigoplateau.asm | 2 +- crysaudio/music/RBY/introbattle.asm | 2 +- crysaudio/music/RBY/jigglypuffsong.asm | 2 +- crysaudio/music/RBY/lavender.asm | 2 +- crysaudio/music/RBY/meeteviltrainer.asm | 2 +- crysaudio/music/RBY/meetfemaletrainer.asm | 2 +- crysaudio/music/RBY/meetmaletrainer.asm | 2 +- crysaudio/music/RBY/meetprofoak.asm | 2 +- crysaudio/music/RBY/meetrival.asm | 4 ++-- crysaudio/music/RBY/museumguy.asm | 2 +- crysaudio/music/RBY/oakslab.asm | 2 +- crysaudio/music/RBY/pkmnhealed.asm | 2 +- crysaudio/music/RBY/pokecenter.asm | 2 +- crysaudio/music/RBY/pokemontower.asm | 2 +- crysaudio/music/RBY/routes1.asm | 2 +- crysaudio/music/RBY/routes3.asm | 2 +- crysaudio/music/RBY/routes4.asm | 2 +- crysaudio/music/RBY/safarizone.asm | 2 +- crysaudio/music/RBY/silphco.asm | 2 +- crysaudio/music/RBY/ssanne.asm | 2 +- crysaudio/music/RBY/surfing.asm | 2 +- crysaudio/music/RBY/trainerbattle.asm | 2 +- crysaudio/music/RBY/vermilion.asm | 2 +- crysaudio/music/RBY/wildbattle.asm | 2 +- 43 files changed, 45 insertions(+), 48 deletions(-) diff --git a/crysaudio/macros.asm b/crysaudio/macros.asm index e41059a1..d42bdb7a 100644 --- a/crysaudio/macros.asm +++ b/crysaudio/macros.asm @@ -233,6 +233,7 @@ pitch_offset: MACRO db pitch_offset_cmd bigdw \1 ; pitch offset ENDM +toggle_perfect_pitch EQUS "pitch_offset 1" const unknownmusic0xe7_cmd ; $e7 unknownmusic0xe7: MACRO @@ -413,8 +414,3 @@ ENDM notetype2: MACRO db $f8, \1 ENDM - - -; not reimplemented yet -toggle_perfect_pitch: MACRO -ENDM diff --git a/crysaudio/music/RBY/bikeriding.asm b/crysaudio/music/RBY/bikeriding.asm index 93e1a5a4..61de7fb1 100644 --- a/crysaudio/music/RBY/bikeriding.asm +++ b/crysaudio/music/RBY/bikeriding.asm @@ -54,7 +54,7 @@ Music_BikeRiding_branch_7dbc9:: note D_, 2 note E_, 2 note F_, 6 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 3 note E_, 2 note D_, 2 @@ -64,6 +64,7 @@ Music_BikeRiding_branch_7dbc9:: note E_, 1 note F_, 1 ;toggle_perfect_pitch + pitch_offset 0 note_type 12, 11, 5 note G_, 6 note G_, 6 diff --git a/crysaudio/music/RBY/celadon.asm b/crysaudio/music/RBY/celadon.asm index bb050e94..858cb46e 100644 --- a/crysaudio/music/RBY/celadon.asm +++ b/crysaudio/music/RBY/celadon.asm @@ -8,7 +8,7 @@ Music_Celadon_Ch1:: tempo 144 volume 7, 7 duty_cycle 3 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 2, -7 rest 8 octave 3 diff --git a/crysaudio/music/RBY/cinnabar.asm b/crysaudio/music/RBY/cinnabar.asm index 40a13cd9..e8ea9004 100644 --- a/crysaudio/music/RBY/cinnabar.asm +++ b/crysaudio/music/RBY/cinnabar.asm @@ -9,7 +9,7 @@ Music_Cinnabar_Ch1:: volume 7, 7 duty_cycle 3 vibrato 12, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch Music_Cinnabar_branch_b878:: note_type 12, 11, 5 diff --git a/crysaudio/music/RBY/cinnabarmansion.asm b/crysaudio/music/RBY/cinnabarmansion.asm index 572d9c84..de76206d 100644 --- a/crysaudio/music/RBY/cinnabarmansion.asm +++ b/crysaudio/music/RBY/cinnabarmansion.asm @@ -47,7 +47,7 @@ Music_CinnabarMansion_branch_7ed19:: Music_CinnabarMansion_Ch2:: duty_cycle 2 - ;toggle_perfect_pitch + toggle_perfect_pitch vibrato 10, 2, 4 note_type 12, 12, 2 diff --git a/crysaudio/music/RBY/cities1.asm b/crysaudio/music/RBY/cities1.asm index a6be6ebd..8ca6e3dc 100644 --- a/crysaudio/music/RBY/cities1.asm +++ b/crysaudio/music/RBY/cities1.asm @@ -410,7 +410,7 @@ Music_Cities1_branch_ac00:: Music_Cities1_Ch3:: note_type 12, 1, 1 - ;toggle_perfect_pitch + toggle_perfect_pitch Music_Cities1_branch_ac35:: vibrato 0, 0, 0 diff --git a/crysaudio/music/RBY/cities2.asm b/crysaudio/music/RBY/cities2.asm index 9063d106..05c71a6f 100644 --- a/crysaudio/music/RBY/cities2.asm +++ b/crysaudio/music/RBY/cities2.asm @@ -9,7 +9,7 @@ Music_Cities2_Ch1:: volume 7, 7 duty_cycle 3 vibrato 8, 3, 2 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 6 rest 8 octave 3 diff --git a/crysaudio/music/RBY/credits.asm b/crysaudio/music/RBY/credits.asm index 25a960a5..5abc11a3 100644 --- a/crysaudio/music/RBY/credits.asm +++ b/crysaudio/music/RBY/credits.asm @@ -9,7 +9,7 @@ Music_RBYCredits_Ch1:: volume 7, 7 duty_cycle 3 vibrato 8, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 5 octave 4 note E_, 6 diff --git a/crysaudio/music/RBY/defeatedgymleader.asm b/crysaudio/music/RBY/defeatedgymleader.asm index 48a65ad5..159a2d82 100644 --- a/crysaudio/music/RBY/defeatedgymleader.asm +++ b/crysaudio/music/RBY/defeatedgymleader.asm @@ -9,7 +9,7 @@ Music_DefeatedGymLeader_Ch1:: volume 7, 7 duty_cycle 3 vibrato 18, 3, 1 - ;toggle_perfect_pitch + toggle_perfect_pitch tempo 112 note_type 12, 10, 6 octave 4 diff --git a/crysaudio/music/RBY/defeatedtrainer.asm b/crysaudio/music/RBY/defeatedtrainer.asm index fbb3994b..0c339e42 100644 --- a/crysaudio/music/RBY/defeatedtrainer.asm +++ b/crysaudio/music/RBY/defeatedtrainer.asm @@ -8,7 +8,7 @@ Music_DefeatedTrainer_Ch1:: tempo 224 volume 7, 7 duty_cycle 2 - ;toggle_perfect_pitch + toggle_perfect_pitch tempo 224 note_type 4, 10, 2 octave 4 diff --git a/crysaudio/music/RBY/defeatedwildmon.asm b/crysaudio/music/RBY/defeatedwildmon.asm index dee90553..69345d96 100644 --- a/crysaudio/music/RBY/defeatedwildmon.asm +++ b/crysaudio/music/RBY/defeatedwildmon.asm @@ -10,7 +10,7 @@ Music_DefeatedWildMon_Ch1:: ;execute_music duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch tempo 112 note_type 12, 11, 7 octave 3 diff --git a/crysaudio/music/RBY/dungeon1.asm b/crysaudio/music/RBY/dungeon1.asm index 0e02edde..8d1eb7b8 100644 --- a/crysaudio/music/RBY/dungeon1.asm +++ b/crysaudio/music/RBY/dungeon1.asm @@ -9,7 +9,7 @@ Music_Dungeon1_Ch1:: tempo 144 volume 7, 7 duty_cycle 3 - ;toggle_perfect_pitch + toggle_perfect_pitch vibrato 10, 1, 4 note_type 12, 4, -5 rest 8 diff --git a/crysaudio/music/RBY/dungeon2.asm b/crysaudio/music/RBY/dungeon2.asm index 51b0dce6..035a26ee 100644 --- a/crysaudio/music/RBY/dungeon2.asm +++ b/crysaudio/music/RBY/dungeon2.asm @@ -9,7 +9,7 @@ Music_Dungeon2_Ch1:: tempo 144 volume 7, 7 duty_cycle 3 - ;toggle_perfect_pitch + toggle_perfect_pitch vibrato 10, 1, 4 Music_Dungeon2_branch_7e892:: diff --git a/crysaudio/music/RBY/dungeon3.asm b/crysaudio/music/RBY/dungeon3.asm index d9b77522..0e7ee4f7 100644 --- a/crysaudio/music/RBY/dungeon3.asm +++ b/crysaudio/music/RBY/dungeon3.asm @@ -9,7 +9,7 @@ Music_Dungeon3_Ch1:: tempo 160 volume 7, 7 duty_cycle 3 - ;toggle_perfect_pitch + toggle_perfect_pitch vibrato 8, 1, 4 Music_Dungeon3_branch_7e9fc:: diff --git a/crysaudio/music/RBY/finalbattle.asm b/crysaudio/music/RBY/finalbattle.asm index 0daac932..805abc89 100644 --- a/crysaudio/music/RBY/finalbattle.asm +++ b/crysaudio/music/RBY/finalbattle.asm @@ -9,7 +9,7 @@ Music_FinalBattle_Ch1:: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 2 octave 3 note F#, 1 diff --git a/crysaudio/music/RBY/gamecorner.asm b/crysaudio/music/RBY/gamecorner.asm index f50e11b0..5c755823 100644 --- a/crysaudio/music/RBY/gamecorner.asm +++ b/crysaudio/music/RBY/gamecorner.asm @@ -9,7 +9,7 @@ Music_RBYGameCorner_Ch1:: volume 7, 7 duty_cycle 3 vibrato 12, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 5 octave 3 note A_, 6 diff --git a/crysaudio/music/RBY/gym.asm b/crysaudio/music/RBY/gym.asm index 4cc62a6b..2bca11bd 100644 --- a/crysaudio/music/RBY/gym.asm +++ b/crysaudio/music/RBY/gym.asm @@ -9,7 +9,7 @@ Music_RBYGym_Ch1:: volume 7, 7 duty_cycle 3 vibrato 8, 2, 2 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 5 octave 3 note G_, 6 diff --git a/crysaudio/music/RBY/gymleaderbattle.asm b/crysaudio/music/RBY/gymleaderbattle.asm index 76742532..a8186cd3 100644 --- a/crysaudio/music/RBY/gymleaderbattle.asm +++ b/crysaudio/music/RBY/gymleaderbattle.asm @@ -9,7 +9,7 @@ Music_GymLeaderBattle_Ch1:: volume 7, 7 duty_cycle 3 vibrato 8, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 3 rest 6 octave 3 diff --git a/crysaudio/music/RBY/halloffame.asm b/crysaudio/music/RBY/halloffame.asm index 9707d6bc..199b458b 100644 --- a/crysaudio/music/RBY/halloffame.asm +++ b/crysaudio/music/RBY/halloffame.asm @@ -9,7 +9,7 @@ Music_RBYHallOfFame_Ch1:: volume 7, 7 duty_cycle 3 vibrato 12, 2, 2 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 3 rest 16 rest 16 diff --git a/crysaudio/music/RBY/indigoplateau.asm b/crysaudio/music/RBY/indigoplateau.asm index fd79121e..a95d6765 100644 --- a/crysaudio/music/RBY/indigoplateau.asm +++ b/crysaudio/music/RBY/indigoplateau.asm @@ -10,7 +10,7 @@ Music_RBYIndigoPlateau_Ch1:: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 2 octave 2 note A_, 8 diff --git a/crysaudio/music/RBY/introbattle.asm b/crysaudio/music/RBY/introbattle.asm index 514e3a4b..403dcd8e 100644 --- a/crysaudio/music/RBY/introbattle.asm +++ b/crysaudio/music/RBY/introbattle.asm @@ -10,7 +10,7 @@ Music_IntroBattle_Ch1:: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 1 rest 8 octave 2 diff --git a/crysaudio/music/RBY/jigglypuffsong.asm b/crysaudio/music/RBY/jigglypuffsong.asm index 98a4d6db..668a3d47 100644 --- a/crysaudio/music/RBY/jigglypuffsong.asm +++ b/crysaudio/music/RBY/jigglypuffsong.asm @@ -9,7 +9,7 @@ Music_JigglypuffSong_Ch1:: vibrato 8, 2, 4 duty_cycle 2 duty_cycle_pattern 2, 2, 1, 1 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 13, 6, 7 octave 4 note E_, 8 diff --git a/crysaudio/music/RBY/lavender.asm b/crysaudio/music/RBY/lavender.asm index 3efe199e..8e21420d 100644 --- a/crysaudio/music/RBY/lavender.asm +++ b/crysaudio/music/RBY/lavender.asm @@ -9,7 +9,7 @@ Music_Lavender_Ch1:: tempo 152 volume 7, 7 duty_cycle 1 - ;toggle_perfect_pitch + toggle_perfect_pitch vibrato 0, 8, 8 note_type 12, 8, 7 rest 16 diff --git a/crysaudio/music/RBY/meeteviltrainer.asm b/crysaudio/music/RBY/meeteviltrainer.asm index 6925954d..12454863 100644 --- a/crysaudio/music/RBY/meeteviltrainer.asm +++ b/crysaudio/music/RBY/meeteviltrainer.asm @@ -8,7 +8,7 @@ Music_MeetEvilTrainer_Ch1:: tempo 124 volume 7, 7 duty_cycle 2 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 1 rest 4 octave 3 diff --git a/crysaudio/music/RBY/meetfemaletrainer.asm b/crysaudio/music/RBY/meetfemaletrainer.asm index 8e8459b6..c4c8a10a 100644 --- a/crysaudio/music/RBY/meetfemaletrainer.asm +++ b/crysaudio/music/RBY/meetfemaletrainer.asm @@ -8,7 +8,7 @@ Music_MeetFemaleTrainer_Ch1:: tempo 124 volume 7, 7 duty_cycle 1 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 2 octave 3 note G#, 6 diff --git a/crysaudio/music/RBY/meetmaletrainer.asm b/crysaudio/music/RBY/meetmaletrainer.asm index a4190068..f27ab410 100644 --- a/crysaudio/music/RBY/meetmaletrainer.asm +++ b/crysaudio/music/RBY/meetmaletrainer.asm @@ -9,7 +9,7 @@ Music_MeetMaleTrainer_Ch1:: volume 7, 7 duty_cycle 3 vibrato 20, 3, 3 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 4 octave 3 note C#, 1 diff --git a/crysaudio/music/RBY/meetprofoak.asm b/crysaudio/music/RBY/meetprofoak.asm index 09913ddd..09da5234 100644 --- a/crysaudio/music/RBY/meetprofoak.asm +++ b/crysaudio/music/RBY/meetprofoak.asm @@ -8,7 +8,7 @@ Music_MeetProfOak_Ch1:: tempo 112 volume 7, 7 duty_cycle 3 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 4 octave 3 note F#, 1 diff --git a/crysaudio/music/RBY/meetrival.asm b/crysaudio/music/RBY/meetrival.asm index f88d593b..b40722e8 100644 --- a/crysaudio/music/RBY/meetrival.asm +++ b/crysaudio/music/RBY/meetrival.asm @@ -15,7 +15,7 @@ Music_MeetRival_branch_b123:: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 3 octave 4 note D_, 1 @@ -136,7 +136,7 @@ Music_MeetRival_branch_b1a5:: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 3 octave 3 note D_, 1 diff --git a/crysaudio/music/RBY/museumguy.asm b/crysaudio/music/RBY/museumguy.asm index 5f460ac2..b1f85547 100644 --- a/crysaudio/music/RBY/museumguy.asm +++ b/crysaudio/music/RBY/museumguy.asm @@ -9,7 +9,7 @@ Music_MuseumGuy_Ch1:: tempo 128 volume 7, 7 duty_cycle 2 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 1 octave 3 note B_, 2 diff --git a/crysaudio/music/RBY/oakslab.asm b/crysaudio/music/RBY/oakslab.asm index c17b9665..b3728a42 100644 --- a/crysaudio/music/RBY/oakslab.asm +++ b/crysaudio/music/RBY/oakslab.asm @@ -9,7 +9,7 @@ Music_OaksLab_Ch1:: volume 7, 7 duty_cycle 3 vibrato 16, 1, 2 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 3 octave 2 note B_, 1 diff --git a/crysaudio/music/RBY/pkmnhealed.asm b/crysaudio/music/RBY/pkmnhealed.asm index d9b2d4b0..e28948fb 100644 --- a/crysaudio/music/RBY/pkmnhealed.asm +++ b/crysaudio/music/RBY/pkmnhealed.asm @@ -8,7 +8,7 @@ Music_PkmnHealed_Ch1:: tempo 144 volume 7, 7 duty_cycle 2 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 8, 1 rest 2 pitch_slide 1, 4, B_ diff --git a/crysaudio/music/RBY/pokecenter.asm b/crysaudio/music/RBY/pokecenter.asm index 57ee3f6a..d6d20d6e 100644 --- a/crysaudio/music/RBY/pokecenter.asm +++ b/crysaudio/music/RBY/pokecenter.asm @@ -9,7 +9,7 @@ Music_Pokecenter_Ch1:: volume 7, 7 duty_cycle 3 vibrato 10, 2, 2 - ;toggle_perfect_pitch + toggle_perfect_pitch Music_Pokecenter_branch_be61:: note_type 12, 10, 3 diff --git a/crysaudio/music/RBY/pokemontower.asm b/crysaudio/music/RBY/pokemontower.asm index 1f4a044f..865fc6d2 100644 --- a/crysaudio/music/RBY/pokemontower.asm +++ b/crysaudio/music/RBY/pokemontower.asm @@ -8,7 +8,7 @@ Music_PokemonTower_Ch1:: tempo 152 volume 7, 7 duty_cycle 3 - ;toggle_perfect_pitch + toggle_perfect_pitch vibrato 12, 2, 3 note_type 12, 8, 0 rest 4 diff --git a/crysaudio/music/RBY/routes1.asm b/crysaudio/music/RBY/routes1.asm index dddea279..2c12d83e 100644 --- a/crysaudio/music/RBY/routes1.asm +++ b/crysaudio/music/RBY/routes1.asm @@ -10,7 +10,7 @@ Music_Routes1_Ch1:: volume 7, 7 vibrato 4, 2, 3 duty_cycle 2 - ;toggle_perfect_pitch + toggle_perfect_pitch Music_Routes1_branch_9be9:: note_type 12, 10, 1 diff --git a/crysaudio/music/RBY/routes3.asm b/crysaudio/music/RBY/routes3.asm index a538e2d0..62a08f73 100644 --- a/crysaudio/music/RBY/routes3.asm +++ b/crysaudio/music/RBY/routes3.asm @@ -10,7 +10,7 @@ Music_Routes3_Ch1:: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 5 octave 3 note E_, 1 diff --git a/crysaudio/music/RBY/routes4.asm b/crysaudio/music/RBY/routes4.asm index bad933c5..ed5b827e 100644 --- a/crysaudio/music/RBY/routes4.asm +++ b/crysaudio/music/RBY/routes4.asm @@ -10,7 +10,7 @@ Music_Routes4_Ch1:: volume 7, 7 duty_cycle 3 vibrato 10, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 10, 2 octave 2 note G#, 4 diff --git a/crysaudio/music/RBY/safarizone.asm b/crysaudio/music/RBY/safarizone.asm index 9f4a0ba4..7ad8ff74 100644 --- a/crysaudio/music/RBY/safarizone.asm +++ b/crysaudio/music/RBY/safarizone.asm @@ -8,7 +8,7 @@ Music_SafariZone_Ch1:: tempo 132 volume 7, 7 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch duty_cycle 2 note_type 12, 9, 2 octave 3 diff --git a/crysaudio/music/RBY/silphco.asm b/crysaudio/music/RBY/silphco.asm index 984eb19d..2577058c 100644 --- a/crysaudio/music/RBY/silphco.asm +++ b/crysaudio/music/RBY/silphco.asm @@ -8,7 +8,7 @@ Music_SilphCo_Ch1:: tempo 160 volume 7, 7 duty_cycle 3 - ;toggle_perfect_pitch + toggle_perfect_pitch vibrato 8, 2, 2 note_type 6, 11, 3 octave 2 diff --git a/crysaudio/music/RBY/ssanne.asm b/crysaudio/music/RBY/ssanne.asm index b098cc4d..b0a27225 100644 --- a/crysaudio/music/RBY/ssanne.asm +++ b/crysaudio/music/RBY/ssanne.asm @@ -9,7 +9,7 @@ Music_SSAnne_Ch1:: volume 7, 7 duty_cycle 1 vibrato 8, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch Music_SSAnne_branch_b3b2:: note_type 12, 10, 4 diff --git a/crysaudio/music/RBY/surfing.asm b/crysaudio/music/RBY/surfing.asm index 05e422ee..1847f876 100644 --- a/crysaudio/music/RBY/surfing.asm +++ b/crysaudio/music/RBY/surfing.asm @@ -9,7 +9,7 @@ Music_Surfing_Ch1:: volume 7, 7 duty_cycle 3 vibrato 12, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 5 rest 6 octave 2 diff --git a/crysaudio/music/RBY/trainerbattle.asm b/crysaudio/music/RBY/trainerbattle.asm index 5b177730..c33973b5 100644 --- a/crysaudio/music/RBY/trainerbattle.asm +++ b/crysaudio/music/RBY/trainerbattle.asm @@ -9,7 +9,7 @@ Music_TrainerBattle_Ch1:: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 2 rest 8 octave 3 diff --git a/crysaudio/music/RBY/vermilion.asm b/crysaudio/music/RBY/vermilion.asm index c3156806..35ba8c8a 100644 --- a/crysaudio/music/RBY/vermilion.asm +++ b/crysaudio/music/RBY/vermilion.asm @@ -10,7 +10,7 @@ Music_Vermilion_Ch1:: volume 7, 7 duty_cycle 3 vibrato 12, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch Music_Vermilion_branch_b9f6:: note_type 12, 11, 5 diff --git a/crysaudio/music/RBY/wildbattle.asm b/crysaudio/music/RBY/wildbattle.asm index 638041df..29d09f6c 100644 --- a/crysaudio/music/RBY/wildbattle.asm +++ b/crysaudio/music/RBY/wildbattle.asm @@ -9,7 +9,7 @@ Music_WildBattle_Ch1:: volume 7, 7 duty_cycle 3 vibrato 6, 3, 4 - ;toggle_perfect_pitch + toggle_perfect_pitch note_type 12, 11, 3 octave 4 note C_, 1 From e2220aaa57bb3d9537e7c7f5096cc149d85d8db0 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 3 Apr 2021 20:15:12 -0500 Subject: [PATCH 18/33] Don't include old audio constants --- constants.asm | 2 +- constants/audio_constants.asm | 32 ++++++++++++++++---------------- constants/music_constants.asm | 9 ++++++--- crysaudio/audio_constants.asm | 9 +++++++++ 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/constants.asm b/constants.asm index 36a7acf5..7f22e80d 100644 --- a/constants.asm +++ b/constants.asm @@ -29,7 +29,7 @@ INCLUDE "constants/map_data_constants.asm" INCLUDE "constants/map_object_constants.asm" INCLUDE "constants/hide_show_constants.asm" INCLUDE "constants/credits_constants.asm" -INCLUDE "constants/audio_constants.asm" +;INCLUDE "constants/audio_constants.asm" INCLUDE "constants/music_constants.asm" INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/event_constants.asm" diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm index ea2732fd..e36d2d5f 100644 --- a/constants/audio_constants.asm +++ b/constants/audio_constants.asm @@ -1,18 +1,18 @@ ; pitch ; Audio[1|2|3]_Pitches indexes (see audio/notes.asm) -; const_def -; const C_ ; 0 -; const C# ; 1 -; const D_ ; 2 -; const D# ; 3 -; const E_ ; 4 -; const F_ ; 5 -; const F# ; 6 -; const G_ ; 7 -; const G# ; 8 -; const A_ ; 9 -; const A# ; A -; const B_ ; B + const_def + const C_ ; 0 + const C# ; 1 + const D_ ; 2 + const D# ; 3 + const E_ ; 4 + const F_ ; 5 + const F# ; 6 + const G_ ; 7 + const G# ; 8 + const A_ ; 9 + const A# ; A + const B_ ; B ; channel ; Audio[1|2|3]_HWChannelBaseAddresses, Audio[1|2|3]_HWChannelDisableMasks, @@ -22,13 +22,13 @@ const Ch2 ; 1 const Ch3 ; 2 const Ch4 ; 3 -;NUM_MUSIC_CHANS EQU const_value +NUM_MUSIC_CHANS EQU const_value const Ch5 ; 4 const Ch6 ; 5 const Ch7 ; 6 const Ch8 ; 7 -;NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS -;NUM_CHANNELS EQU const_value +NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS +NUM_CHANNELS EQU const_value ; HW sound channel register base addresses HW_CH1_BASE EQU LOW(rNR10) diff --git a/constants/music_constants.asm b/constants/music_constants.asm index f253deef..b28c3ae1 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -2,9 +2,10 @@ ; SFX_Headers_(1|2|3) indexes (see audio/headers/*.asm) ;music_const: MACRO -;\1 EQUS "RB(\2)" +;\1 EQUS "((\2 - SFX_Headers_1) / 3)" ;ENDM -const_value = 1 + + const_def 1 const MUSIC_PALLET_TOWN const MUSIC_POKECENTER @@ -57,6 +58,7 @@ const_value = 1 const NUM_SONGS const_def + const SFX_CRY_00 const SFX_CRY_01 const SFX_CRY_02 @@ -96,7 +98,8 @@ const_value = 1 const SFX_CRY_24 const SFX_CRY_25 -const_value = 1 + const_def 1 + ; AUDIO_1 AUDIO_3 const SFX_GET_ITEM_1 diff --git a/crysaudio/audio_constants.asm b/crysaudio/audio_constants.asm index f5895dd9..0d854ae5 100644 --- a/crysaudio/audio_constants.asm +++ b/crysaudio/audio_constants.asm @@ -29,6 +29,15 @@ NUM_MUSIC_CHANS EQU const_value NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS NUM_CHANNELS EQU const_value +Ch1 EQU CHAN1 +Ch2 EQU CHAN2 +Ch3 EQU CHAN3 +Ch4 EQU CHAN4 +Ch5 EQU CHAN5 +Ch6 EQU CHAN6 +Ch7 EQU CHAN7 +Ch8 EQU CHAN8 + ; channel_struct members (see macros/wram.asm) CHANNEL_MUSIC_ID EQUS "(wChannel1MusicID - wChannel1)" CHANNEL_MUSIC_BANK EQUS "(wChannel1MusicBank - wChannel1)" From 218993bd194fffa44ca806a71124d96afe5a8c25 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 11 Apr 2021 12:14:22 -0500 Subject: [PATCH 19/33] Fix sound reset in PlayBattleMusic the id check bandaid in _PlayMusic is no longer necessary --- audio/play_battle_music.asm | 2 +- crysaudio/engine.asm | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/audio/play_battle_music.asm b/audio/play_battle_music.asm index f3ef8dd3..e802f37b 100644 --- a/audio/play_battle_music.asm +++ b/audio/play_battle_music.asm @@ -4,7 +4,7 @@ PlayBattleMusic:: ld [wLowHealthAlarm], a dec a ; SFX_STOP_ALL_MUSIC ; ld [wNewSoundID], a - call PlayMusic + call PlaySound call DelayFrame ld c, 0 ; BANK(Music_GymLeaderBattle) ld a, [wGymLeaderNo] diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index e274e1b1..a1306def 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -2442,8 +2442,6 @@ SetLRTracks: ret _PlayMusic:: - cp NUM_SONGS - ret nc ; sfx ; load music call MusicOff ld hl, wMusicID From 7c1825158f001eb4e658570342f9572462bb0a8e Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 17 Apr 2021 22:23:17 -0500 Subject: [PATCH 20/33] Remove noise instrument copies --- audio/sfx/noise_instrument01_1.asm | 3 --- audio/sfx/noise_instrument01_2.asm | 3 --- audio/sfx/noise_instrument01_3.asm | 3 --- audio/sfx/noise_instrument02_1.asm | 3 --- audio/sfx/noise_instrument02_2.asm | 3 --- audio/sfx/noise_instrument02_3.asm | 3 --- audio/sfx/noise_instrument03_1.asm | 3 --- audio/sfx/noise_instrument03_2.asm | 3 --- audio/sfx/noise_instrument03_3.asm | 3 --- audio/sfx/noise_instrument04_1.asm | 3 --- audio/sfx/noise_instrument04_2.asm | 3 --- audio/sfx/noise_instrument04_3.asm | 3 --- audio/sfx/noise_instrument05_1.asm | 8 -------- audio/sfx/noise_instrument05_2.asm | 8 -------- audio/sfx/noise_instrument05_3.asm | 8 -------- audio/sfx/noise_instrument06_1.asm | 3 --- audio/sfx/noise_instrument06_2.asm | 3 --- audio/sfx/noise_instrument06_3.asm | 3 --- audio/sfx/noise_instrument07_1.asm | 4 ---- audio/sfx/noise_instrument07_2.asm | 4 ---- audio/sfx/noise_instrument07_3.asm | 4 ---- audio/sfx/noise_instrument08_1.asm | 3 --- audio/sfx/noise_instrument08_2.asm | 3 --- audio/sfx/noise_instrument08_3.asm | 3 --- audio/sfx/noise_instrument09_1.asm | 3 --- audio/sfx/noise_instrument09_2.asm | 3 --- audio/sfx/noise_instrument09_3.asm | 3 --- audio/sfx/noise_instrument10_1.asm | 3 --- audio/sfx/noise_instrument10_2.asm | 3 --- audio/sfx/noise_instrument10_3.asm | 3 --- audio/sfx/noise_instrument11_1.asm | 3 --- audio/sfx/noise_instrument11_2.asm | 3 --- audio/sfx/noise_instrument11_3.asm | 3 --- audio/sfx/noise_instrument12_1.asm | 3 --- audio/sfx/noise_instrument12_2.asm | 3 --- audio/sfx/noise_instrument12_3.asm | 3 --- audio/sfx/noise_instrument13_1.asm | 3 --- audio/sfx/noise_instrument13_2.asm | 3 --- audio/sfx/noise_instrument13_3.asm | 3 --- audio/sfx/noise_instrument14_1.asm | 3 --- audio/sfx/noise_instrument14_2.asm | 3 --- audio/sfx/noise_instrument14_3.asm | 3 --- audio/sfx/noise_instrument15_1.asm | 4 ---- audio/sfx/noise_instrument15_2.asm | 4 ---- audio/sfx/noise_instrument15_3.asm | 4 ---- audio/sfx/noise_instrument16_1.asm | 4 ---- audio/sfx/noise_instrument16_2.asm | 4 ---- audio/sfx/noise_instrument16_3.asm | 4 ---- audio/sfx/noise_instrument17_1.asm | 3 --- audio/sfx/noise_instrument17_2.asm | 3 --- audio/sfx/noise_instrument17_3.asm | 3 --- audio/sfx/noise_instrument18_1.asm | 3 --- audio/sfx/noise_instrument18_2.asm | 3 --- audio/sfx/noise_instrument18_3.asm | 3 --- audio/sfx/noise_instrument19_1.asm | 3 --- audio/sfx/noise_instrument19_2.asm | 3 --- audio/sfx/noise_instrument19_3.asm | 3 --- 57 files changed, 195 deletions(-) delete mode 100644 audio/sfx/noise_instrument01_1.asm delete mode 100644 audio/sfx/noise_instrument01_2.asm delete mode 100644 audio/sfx/noise_instrument01_3.asm delete mode 100644 audio/sfx/noise_instrument02_1.asm delete mode 100644 audio/sfx/noise_instrument02_2.asm delete mode 100644 audio/sfx/noise_instrument02_3.asm delete mode 100644 audio/sfx/noise_instrument03_1.asm delete mode 100644 audio/sfx/noise_instrument03_2.asm delete mode 100644 audio/sfx/noise_instrument03_3.asm delete mode 100644 audio/sfx/noise_instrument04_1.asm delete mode 100644 audio/sfx/noise_instrument04_2.asm delete mode 100644 audio/sfx/noise_instrument04_3.asm delete mode 100644 audio/sfx/noise_instrument05_1.asm delete mode 100644 audio/sfx/noise_instrument05_2.asm delete mode 100644 audio/sfx/noise_instrument05_3.asm delete mode 100644 audio/sfx/noise_instrument06_1.asm delete mode 100644 audio/sfx/noise_instrument06_2.asm delete mode 100644 audio/sfx/noise_instrument06_3.asm delete mode 100644 audio/sfx/noise_instrument07_1.asm delete mode 100644 audio/sfx/noise_instrument07_2.asm delete mode 100644 audio/sfx/noise_instrument07_3.asm delete mode 100644 audio/sfx/noise_instrument08_1.asm delete mode 100644 audio/sfx/noise_instrument08_2.asm delete mode 100644 audio/sfx/noise_instrument08_3.asm delete mode 100644 audio/sfx/noise_instrument09_1.asm delete mode 100644 audio/sfx/noise_instrument09_2.asm delete mode 100644 audio/sfx/noise_instrument09_3.asm delete mode 100644 audio/sfx/noise_instrument10_1.asm delete mode 100644 audio/sfx/noise_instrument10_2.asm delete mode 100644 audio/sfx/noise_instrument10_3.asm delete mode 100644 audio/sfx/noise_instrument11_1.asm delete mode 100644 audio/sfx/noise_instrument11_2.asm delete mode 100644 audio/sfx/noise_instrument11_3.asm delete mode 100644 audio/sfx/noise_instrument12_1.asm delete mode 100644 audio/sfx/noise_instrument12_2.asm delete mode 100644 audio/sfx/noise_instrument12_3.asm delete mode 100644 audio/sfx/noise_instrument13_1.asm delete mode 100644 audio/sfx/noise_instrument13_2.asm delete mode 100644 audio/sfx/noise_instrument13_3.asm delete mode 100644 audio/sfx/noise_instrument14_1.asm delete mode 100644 audio/sfx/noise_instrument14_2.asm delete mode 100644 audio/sfx/noise_instrument14_3.asm delete mode 100644 audio/sfx/noise_instrument15_1.asm delete mode 100644 audio/sfx/noise_instrument15_2.asm delete mode 100644 audio/sfx/noise_instrument15_3.asm delete mode 100644 audio/sfx/noise_instrument16_1.asm delete mode 100644 audio/sfx/noise_instrument16_2.asm delete mode 100644 audio/sfx/noise_instrument16_3.asm delete mode 100644 audio/sfx/noise_instrument17_1.asm delete mode 100644 audio/sfx/noise_instrument17_2.asm delete mode 100644 audio/sfx/noise_instrument17_3.asm delete mode 100644 audio/sfx/noise_instrument18_1.asm delete mode 100644 audio/sfx/noise_instrument18_2.asm delete mode 100644 audio/sfx/noise_instrument18_3.asm delete mode 100644 audio/sfx/noise_instrument19_1.asm delete mode 100644 audio/sfx/noise_instrument19_2.asm delete mode 100644 audio/sfx/noise_instrument19_3.asm diff --git a/audio/sfx/noise_instrument01_1.asm b/audio/sfx/noise_instrument01_1.asm deleted file mode 100644 index e545b030..00000000 --- a/audio/sfx/noise_instrument01_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument01_1_Ch8: - noise_note 0, 12, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument01_2.asm b/audio/sfx/noise_instrument01_2.asm deleted file mode 100644 index 3f4d2bb0..00000000 --- a/audio/sfx/noise_instrument01_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument01_2_Ch8: - noise_note 0, 12, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument01_3.asm b/audio/sfx/noise_instrument01_3.asm deleted file mode 100644 index ac360f2e..00000000 --- a/audio/sfx/noise_instrument01_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument01_3_Ch8: - noise_note 0, 12, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument02_1.asm b/audio/sfx/noise_instrument02_1.asm deleted file mode 100644 index 12a7d226..00000000 --- a/audio/sfx/noise_instrument02_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument02_1_Ch8: - noise_note 0, 11, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument02_2.asm b/audio/sfx/noise_instrument02_2.asm deleted file mode 100644 index 354bbdbc..00000000 --- a/audio/sfx/noise_instrument02_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument02_2_Ch8: - noise_note 0, 11, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument02_3.asm b/audio/sfx/noise_instrument02_3.asm deleted file mode 100644 index 2f7f0d6f..00000000 --- a/audio/sfx/noise_instrument02_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument02_3_Ch8: - noise_note 0, 11, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument03_1.asm b/audio/sfx/noise_instrument03_1.asm deleted file mode 100644 index b75b6479..00000000 --- a/audio/sfx/noise_instrument03_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument03_1_Ch8: - noise_note 0, 10, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument03_2.asm b/audio/sfx/noise_instrument03_2.asm deleted file mode 100644 index 3551baef..00000000 --- a/audio/sfx/noise_instrument03_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument03_2_Ch8: - noise_note 0, 10, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument03_3.asm b/audio/sfx/noise_instrument03_3.asm deleted file mode 100644 index c132ab64..00000000 --- a/audio/sfx/noise_instrument03_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument03_3_Ch8: - noise_note 0, 10, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument04_1.asm b/audio/sfx/noise_instrument04_1.asm deleted file mode 100644 index 303f1f1f..00000000 --- a/audio/sfx/noise_instrument04_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument04_1_Ch8: - noise_note 0, 8, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument04_2.asm b/audio/sfx/noise_instrument04_2.asm deleted file mode 100644 index b43ae39d..00000000 --- a/audio/sfx/noise_instrument04_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument04_2_Ch8: - noise_note 0, 8, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument04_3.asm b/audio/sfx/noise_instrument04_3.asm deleted file mode 100644 index fcd27433..00000000 --- a/audio/sfx/noise_instrument04_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument04_3_Ch8: - noise_note 0, 8, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument05_1.asm b/audio/sfx/noise_instrument05_1.asm deleted file mode 100644 index d119b958..00000000 --- a/audio/sfx/noise_instrument05_1.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Noise_Instrument05_1_Ch8: - noise_note 7, 8, 4, 55 - noise_note 6, 8, 4, 54 - noise_note 5, 8, 3, 53 - noise_note 4, 8, 3, 52 - noise_note 3, 8, 2, 51 - noise_note 2, 8, 1, 50 - sound_ret diff --git a/audio/sfx/noise_instrument05_2.asm b/audio/sfx/noise_instrument05_2.asm deleted file mode 100644 index 1a0e63b5..00000000 --- a/audio/sfx/noise_instrument05_2.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Noise_Instrument05_2_Ch8: - noise_note 7, 8, 4, 55 - noise_note 6, 8, 4, 54 - noise_note 5, 8, 3, 53 - noise_note 4, 8, 3, 52 - noise_note 3, 8, 2, 51 - noise_note 2, 8, 1, 50 - sound_ret diff --git a/audio/sfx/noise_instrument05_3.asm b/audio/sfx/noise_instrument05_3.asm deleted file mode 100644 index a0fec98f..00000000 --- a/audio/sfx/noise_instrument05_3.asm +++ /dev/null @@ -1,8 +0,0 @@ -SFX_Noise_Instrument05_3_Ch8: - noise_note 7, 8, 4, 55 - noise_note 6, 8, 4, 54 - noise_note 5, 8, 3, 53 - noise_note 4, 8, 3, 52 - noise_note 3, 8, 2, 51 - noise_note 2, 8, 1, 50 - sound_ret diff --git a/audio/sfx/noise_instrument06_1.asm b/audio/sfx/noise_instrument06_1.asm deleted file mode 100644 index 1412fc39..00000000 --- a/audio/sfx/noise_instrument06_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument06_1_Ch8: - noise_note 0, 5, 1, 42 - sound_ret diff --git a/audio/sfx/noise_instrument06_2.asm b/audio/sfx/noise_instrument06_2.asm deleted file mode 100644 index bb591031..00000000 --- a/audio/sfx/noise_instrument06_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument06_2_Ch8: - noise_note 0, 5, 1, 42 - sound_ret diff --git a/audio/sfx/noise_instrument06_3.asm b/audio/sfx/noise_instrument06_3.asm deleted file mode 100644 index b5110d40..00000000 --- a/audio/sfx/noise_instrument06_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument06_3_Ch8: - noise_note 0, 5, 1, 42 - sound_ret diff --git a/audio/sfx/noise_instrument07_1.asm b/audio/sfx/noise_instrument07_1.asm deleted file mode 100644 index 24f481bc..00000000 --- a/audio/sfx/noise_instrument07_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument07_1_Ch8: - noise_note 1, 4, 1, 43 - noise_note 0, 6, 1, 42 - sound_ret diff --git a/audio/sfx/noise_instrument07_2.asm b/audio/sfx/noise_instrument07_2.asm deleted file mode 100644 index 87057ed1..00000000 --- a/audio/sfx/noise_instrument07_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument07_2_Ch8: - noise_note 1, 4, 1, 43 - noise_note 0, 6, 1, 42 - sound_ret diff --git a/audio/sfx/noise_instrument07_3.asm b/audio/sfx/noise_instrument07_3.asm deleted file mode 100644 index 3beb3f2c..00000000 --- a/audio/sfx/noise_instrument07_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument07_3_Ch8: - noise_note 1, 4, 1, 43 - noise_note 0, 6, 1, 42 - sound_ret diff --git a/audio/sfx/noise_instrument08_1.asm b/audio/sfx/noise_instrument08_1.asm deleted file mode 100644 index 60db9e0f..00000000 --- a/audio/sfx/noise_instrument08_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument08_1_Ch8: - noise_note 0, 8, 1, 16 - sound_ret diff --git a/audio/sfx/noise_instrument08_2.asm b/audio/sfx/noise_instrument08_2.asm deleted file mode 100644 index 89e5b445..00000000 --- a/audio/sfx/noise_instrument08_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument08_2_Ch8: - noise_note 0, 8, 1, 16 - sound_ret diff --git a/audio/sfx/noise_instrument08_3.asm b/audio/sfx/noise_instrument08_3.asm deleted file mode 100644 index c63be9b4..00000000 --- a/audio/sfx/noise_instrument08_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument08_3_Ch8: - noise_note 0, 8, 1, 16 - sound_ret diff --git a/audio/sfx/noise_instrument09_1.asm b/audio/sfx/noise_instrument09_1.asm deleted file mode 100644 index 047f5469..00000000 --- a/audio/sfx/noise_instrument09_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument09_1_Ch8: - noise_note 0, 8, 2, 35 - sound_ret diff --git a/audio/sfx/noise_instrument09_2.asm b/audio/sfx/noise_instrument09_2.asm deleted file mode 100644 index 093f912e..00000000 --- a/audio/sfx/noise_instrument09_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument09_2_Ch8: - noise_note 0, 8, 2, 35 - sound_ret diff --git a/audio/sfx/noise_instrument09_3.asm b/audio/sfx/noise_instrument09_3.asm deleted file mode 100644 index 2ab061db..00000000 --- a/audio/sfx/noise_instrument09_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument09_3_Ch8: - noise_note 0, 8, 2, 35 - sound_ret diff --git a/audio/sfx/noise_instrument10_1.asm b/audio/sfx/noise_instrument10_1.asm deleted file mode 100644 index 1628fb88..00000000 --- a/audio/sfx/noise_instrument10_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument10_1_Ch8: - noise_note 0, 8, 2, 37 - sound_ret diff --git a/audio/sfx/noise_instrument10_2.asm b/audio/sfx/noise_instrument10_2.asm deleted file mode 100644 index e1ed23ce..00000000 --- a/audio/sfx/noise_instrument10_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument10_2_Ch8: - noise_note 0, 8, 2, 37 - sound_ret diff --git a/audio/sfx/noise_instrument10_3.asm b/audio/sfx/noise_instrument10_3.asm deleted file mode 100644 index a175ad17..00000000 --- a/audio/sfx/noise_instrument10_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument10_3_Ch8: - noise_note 0, 8, 2, 37 - sound_ret diff --git a/audio/sfx/noise_instrument11_1.asm b/audio/sfx/noise_instrument11_1.asm deleted file mode 100644 index e2f8729e..00000000 --- a/audio/sfx/noise_instrument11_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument11_1_Ch8: - noise_note 0, 8, 2, 38 - sound_ret diff --git a/audio/sfx/noise_instrument11_2.asm b/audio/sfx/noise_instrument11_2.asm deleted file mode 100644 index 925c421a..00000000 --- a/audio/sfx/noise_instrument11_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument11_2_Ch8: - noise_note 0, 8, 2, 38 - sound_ret diff --git a/audio/sfx/noise_instrument11_3.asm b/audio/sfx/noise_instrument11_3.asm deleted file mode 100644 index 72f54e99..00000000 --- a/audio/sfx/noise_instrument11_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument11_3_Ch8: - noise_note 0, 8, 2, 38 - sound_ret diff --git a/audio/sfx/noise_instrument12_1.asm b/audio/sfx/noise_instrument12_1.asm deleted file mode 100644 index f1e6379a..00000000 --- a/audio/sfx/noise_instrument12_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument12_1_Ch8: - noise_note 0, 10, 1, 16 - sound_ret diff --git a/audio/sfx/noise_instrument12_2.asm b/audio/sfx/noise_instrument12_2.asm deleted file mode 100644 index f9c2e1a9..00000000 --- a/audio/sfx/noise_instrument12_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument12_2_Ch8: - noise_note 0, 10, 1, 16 - sound_ret diff --git a/audio/sfx/noise_instrument12_3.asm b/audio/sfx/noise_instrument12_3.asm deleted file mode 100644 index b5347639..00000000 --- a/audio/sfx/noise_instrument12_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument12_3_Ch8: - noise_note 0, 10, 1, 16 - sound_ret diff --git a/audio/sfx/noise_instrument13_1.asm b/audio/sfx/noise_instrument13_1.asm deleted file mode 100644 index 50569b26..00000000 --- a/audio/sfx/noise_instrument13_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument13_1_Ch8: - noise_note 0, 10, 2, 17 - sound_ret diff --git a/audio/sfx/noise_instrument13_2.asm b/audio/sfx/noise_instrument13_2.asm deleted file mode 100644 index 5a5120f6..00000000 --- a/audio/sfx/noise_instrument13_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument13_2_Ch8: - noise_note 0, 10, 2, 17 - sound_ret diff --git a/audio/sfx/noise_instrument13_3.asm b/audio/sfx/noise_instrument13_3.asm deleted file mode 100644 index 848746d7..00000000 --- a/audio/sfx/noise_instrument13_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument13_3_Ch8: - noise_note 0, 10, 2, 17 - sound_ret diff --git a/audio/sfx/noise_instrument14_1.asm b/audio/sfx/noise_instrument14_1.asm deleted file mode 100644 index 9621ef42..00000000 --- a/audio/sfx/noise_instrument14_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument14_1_Ch8: - noise_note 0, 10, 2, 80 - sound_ret diff --git a/audio/sfx/noise_instrument14_2.asm b/audio/sfx/noise_instrument14_2.asm deleted file mode 100644 index d413fb1f..00000000 --- a/audio/sfx/noise_instrument14_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument14_2_Ch8: - noise_note 0, 10, 2, 80 - sound_ret diff --git a/audio/sfx/noise_instrument14_3.asm b/audio/sfx/noise_instrument14_3.asm deleted file mode 100644 index bc115181..00000000 --- a/audio/sfx/noise_instrument14_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument14_3_Ch8: - noise_note 0, 10, 2, 80 - sound_ret diff --git a/audio/sfx/noise_instrument15_1.asm b/audio/sfx/noise_instrument15_1.asm deleted file mode 100644 index 308746c0..00000000 --- a/audio/sfx/noise_instrument15_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument15_1_Ch8: - noise_note 0, 10, 1, 24 - noise_note 0, 3, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument15_2.asm b/audio/sfx/noise_instrument15_2.asm deleted file mode 100644 index c1f63942..00000000 --- a/audio/sfx/noise_instrument15_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument15_2_Ch8: - noise_note 0, 10, 1, 24 - noise_note 0, 3, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument15_3.asm b/audio/sfx/noise_instrument15_3.asm deleted file mode 100644 index f77872ae..00000000 --- a/audio/sfx/noise_instrument15_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument15_3_Ch8: - noise_note 0, 10, 1, 24 - noise_note 0, 3, 1, 51 - sound_ret diff --git a/audio/sfx/noise_instrument16_1.asm b/audio/sfx/noise_instrument16_1.asm deleted file mode 100644 index ac830985..00000000 --- a/audio/sfx/noise_instrument16_1.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument16_1_Ch8: - noise_note 2, 9, 1, 40 - noise_note 0, 7, 1, 24 - sound_ret diff --git a/audio/sfx/noise_instrument16_2.asm b/audio/sfx/noise_instrument16_2.asm deleted file mode 100644 index e61531bf..00000000 --- a/audio/sfx/noise_instrument16_2.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument16_2_Ch8: - noise_note 2, 9, 1, 40 - noise_note 0, 7, 1, 24 - sound_ret diff --git a/audio/sfx/noise_instrument16_3.asm b/audio/sfx/noise_instrument16_3.asm deleted file mode 100644 index 99dbca77..00000000 --- a/audio/sfx/noise_instrument16_3.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Noise_Instrument16_3_Ch8: - noise_note 2, 9, 1, 40 - noise_note 0, 7, 1, 24 - sound_ret diff --git a/audio/sfx/noise_instrument17_1.asm b/audio/sfx/noise_instrument17_1.asm deleted file mode 100644 index 41565402..00000000 --- a/audio/sfx/noise_instrument17_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument17_1_Ch8: - noise_note 0, 9, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument17_2.asm b/audio/sfx/noise_instrument17_2.asm deleted file mode 100644 index f89ec777..00000000 --- a/audio/sfx/noise_instrument17_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument17_2_Ch8: - noise_note 0, 9, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument17_3.asm b/audio/sfx/noise_instrument17_3.asm deleted file mode 100644 index 9330fbc0..00000000 --- a/audio/sfx/noise_instrument17_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument17_3_Ch8: - noise_note 0, 9, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument18_1.asm b/audio/sfx/noise_instrument18_1.asm deleted file mode 100644 index e77e331d..00000000 --- a/audio/sfx/noise_instrument18_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument18_1_Ch8: - noise_note 0, 7, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument18_2.asm b/audio/sfx/noise_instrument18_2.asm deleted file mode 100644 index e937f9f6..00000000 --- a/audio/sfx/noise_instrument18_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument18_2_Ch8: - noise_note 0, 7, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument18_3.asm b/audio/sfx/noise_instrument18_3.asm deleted file mode 100644 index 59a5d069..00000000 --- a/audio/sfx/noise_instrument18_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument18_3_Ch8: - noise_note 0, 7, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument19_1.asm b/audio/sfx/noise_instrument19_1.asm deleted file mode 100644 index 2fa183d6..00000000 --- a/audio/sfx/noise_instrument19_1.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument19_1_Ch8: - noise_note 0, 6, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument19_2.asm b/audio/sfx/noise_instrument19_2.asm deleted file mode 100644 index 49d09fcc..00000000 --- a/audio/sfx/noise_instrument19_2.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument19_2_Ch8: - noise_note 0, 6, 1, 34 - sound_ret diff --git a/audio/sfx/noise_instrument19_3.asm b/audio/sfx/noise_instrument19_3.asm deleted file mode 100644 index a90b3e4b..00000000 --- a/audio/sfx/noise_instrument19_3.asm +++ /dev/null @@ -1,3 +0,0 @@ -SFX_Noise_Instrument19_3_Ch8: - noise_note 0, 6, 1, 34 - sound_ret From ae3c5e4239448cf738c70772c7efd7f6880de00c Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 11 Jun 2022 12:57:39 -0500 Subject: [PATCH 21/33] Fix channel 3 wave 9 id --- crysaudio/music/indigoplateau.asm | 2 +- crysaudio/music/johtogymbattle.asm | 2 +- crysaudio/music/johtotrainerbattle.asm | 2 +- crysaudio/music/kantogymbattle.asm | 2 +- crysaudio/music/lighthouse.asm | 2 +- crysaudio/music/rivalbattle.asm | 2 +- crysaudio/music/rocketbattle.asm | 2 +- crysaudio/music/rockethideout.asm | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/crysaudio/music/indigoplateau.asm b/crysaudio/music/indigoplateau.asm index 371b970d..189cbb2a 100644 --- a/crysaudio/music/indigoplateau.asm +++ b/crysaudio/music/indigoplateau.asm @@ -115,7 +115,7 @@ Music_IndigoPlateau_Ch2: sound_ret Music_IndigoPlateau_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 .mainloop: sound_call .sub1 octave 3 diff --git a/crysaudio/music/johtogymbattle.asm b/crysaudio/music/johtogymbattle.asm index fadf4d83..2c29e79b 100644 --- a/crysaudio/music/johtogymbattle.asm +++ b/crysaudio/music/johtogymbattle.asm @@ -614,7 +614,7 @@ Music_JohtoGymBattle_Ch2: sound_loop 0, .mainloop Music_JohtoGymBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 4 note F_, 1 rest 1 diff --git a/crysaudio/music/johtotrainerbattle.asm b/crysaudio/music/johtotrainerbattle.asm index cb512bcb..e2142086 100644 --- a/crysaudio/music/johtotrainerbattle.asm +++ b/crysaudio/music/johtotrainerbattle.asm @@ -900,7 +900,7 @@ Music_JohtoTrainerBattle_Ch2: sound_ret Music_JohtoTrainerBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 4 note E_, 1 note D#, 1 diff --git a/crysaudio/music/kantogymbattle.asm b/crysaudio/music/kantogymbattle.asm index b70f4344..3c9d3a5c 100644 --- a/crysaudio/music/kantogymbattle.asm +++ b/crysaudio/music/kantogymbattle.asm @@ -436,7 +436,7 @@ Music_KantoGymBattle_Ch2: sound_ret Music_KantoGymBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 2 note E_, 1 rest 1 diff --git a/crysaudio/music/lighthouse.asm b/crysaudio/music/lighthouse.asm index 2cc3b451..6e2a28a5 100644 --- a/crysaudio/music/lighthouse.asm +++ b/crysaudio/music/lighthouse.asm @@ -212,7 +212,7 @@ Music_Lighthouse_Ch2: sound_loop 0, .mainloop Music_Lighthouse_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 stereo_panning TRUE, FALSE .mainloop: octave 2 diff --git a/crysaudio/music/rivalbattle.asm b/crysaudio/music/rivalbattle.asm index 655164c4..9ac57199 100644 --- a/crysaudio/music/rivalbattle.asm +++ b/crysaudio/music/rivalbattle.asm @@ -536,7 +536,7 @@ Music_RivalBattle_Ch2: sound_ret Music_RivalBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 3 note F#, 2 note A#, 2 diff --git a/crysaudio/music/rocketbattle.asm b/crysaudio/music/rocketbattle.asm index b95f2a89..6fa39f38 100644 --- a/crysaudio/music/rocketbattle.asm +++ b/crysaudio/music/rocketbattle.asm @@ -669,7 +669,7 @@ Music_RocketBattle_Ch2: sound_ret Music_RocketBattle_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 octave 3 note A_, 2 octave 4 diff --git a/crysaudio/music/rockethideout.asm b/crysaudio/music/rockethideout.asm index 850eb29d..424c9910 100644 --- a/crysaudio/music/rockethideout.asm +++ b/crysaudio/music/rockethideout.asm @@ -223,7 +223,7 @@ Music_RocketHideout_Ch2: sound_loop 0, .mainloop Music_RocketHideout_Ch3: - note_type 12, 1, -1 + note_type 12, 1, 9 .mainloop: .loop1: octave 2 From 1115a3fe6c45fd258cc098e38cc51abe4c6c528a Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 25 Dec 2022 13:12:32 -0600 Subject: [PATCH 22/33] Unroll repts in tcg songs --- crysaudio/music/TCG/credits.asm | 98 +++++-- crysaudio/music/TCG/dueltheme1.asm | 20 +- crysaudio/music/TCG/dueltheme2.asm | 76 +++++- crysaudio/music/TCG/dueltheme3.asm | 396 +++++++++++++++++++++++++---- crysaudio/music/TCG/imakuni.asm | 24 +- crysaudio/music/TCG/pausemenu.asm | 112 +++++++- crysaudio/music/TCG/ronald.asm | 89 ++++++- 7 files changed, 709 insertions(+), 106 deletions(-) diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm index be7dd53c..1e639714 100644 --- a/crysaudio/music/TCG/credits.asm +++ b/crysaudio/music/TCG/credits.asm @@ -2907,10 +2907,13 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) sound_call Branch_fbd47 octave 2 .Loop2 - rept 2 + ;rept 2 note B_, 6 rest 7 - endr + ;--- + note B_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 @@ -2920,10 +2923,13 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 sound_loop 2, .Loop2 .Loop3 - rept 2 + ;rept 2 note A_, 6 rest 7 - endr + ;--- + note A_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -2933,10 +2939,13 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 sound_loop 2, .Loop3 .Loop4 - rept 2 + ;rept 2 note G#, 6 rest 7 - endr + ;--- + note G#, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3153,10 +3162,13 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) Branch_fbd47: octave 3 .Loop12 - rept 2 + ;rept 2 note C_, 6 rest 7 - endr + ;--- + note C_, 6 + rest 7 + ;endr ;cutoff 4 note G_, 13 ;cutoff 8 @@ -3168,10 +3180,13 @@ Branch_fbd47: Branch_fbd58: octave 2 .Loop13 - rept 2 + ;rept 2 note B_, 6 rest 7 - endr + ;--- + note B_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 @@ -3185,10 +3200,13 @@ Branch_fbd58: Branch_fbd6b: octave 2 .Loop14 - rept 2 + ;rept 2 note A_, 6 rest 7 - endr + ;--- + note A_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 @@ -3202,10 +3220,13 @@ Branch_fbd6b: Branch_fbd7e: octave 2 .Loop15 - rept 2 + ;rept 2 note G_, 6 rest 7 - endr + ;--- + note G_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 @@ -3219,10 +3240,13 @@ Branch_fbd7e: Branch_fbd91: octave 2 .Loop16 - rept 2 + ;rept 2 note F_, 6 rest 7 - endr + ;--- + note F_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3236,10 +3260,13 @@ Branch_fbd91: Branch_fbda4: octave 2 .Loop17 - rept 2 + ;rept 2 note E_, 6 rest 7 - endr + ;--- + note E_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note E_, 13 @@ -3253,10 +3280,13 @@ Branch_fbda4: Branch_fbdb7: octave 2 .Loop18 - rept 2 + ;rept 2 note D_, 6 rest 7 - endr + ;--- + note D_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3270,10 +3300,13 @@ Branch_fbdb7: Branch_fbdca: octave 2 .Loop19 - rept 2 + ;rept 2 note G_, 6 rest 7 - endr + ;--- + note G_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3287,10 +3320,13 @@ Branch_fbdca: Branch_fbddd: octave 2 .Loop20 - rept 2 + ;rept 2 note F_, 6 rest 7 - endr + ;--- + note F_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G#, 13 @@ -3304,10 +3340,13 @@ Branch_fbddd: Branch_fbdf0: octave 2 .Loop21 - rept 2 + ;rept 2 note A#, 6 rest 7 - endr + ;--- + note A#, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note F_, 13 @@ -3336,10 +3375,13 @@ Branch_fbe03: Branch_fbe10: octave 2 .Loop22 - rept 2 + ;rept 2 note E_, 6 rest 7 - endr + ;--- + note E_, 6 + rest 7 + ;endr inc_octave ;cutoff 4 note G_, 13 diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index 10af9830..12eab8cf 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -527,10 +527,16 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) notetype1 9 octave 2 .Loop1 - rept 3 + ;rept 3 note D_, 1 rest 2 - endr + ;--- + note D_, 1 + rest 2 + ;--- + note D_, 1 + rest 2 + ;endr rest 1 dec_octave note A_, 1 @@ -1336,10 +1342,16 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) octave 2 .MainLoop .Loop1 - rept 3 + ;rept 3 note D_, 1 rest 2 - endr + ;--- + note D_, 1 + rest 2 + ;--- + note D_, 1 + rest 2 + ;endr rest 1 sound_call Branch_f5c47 sound_loop 4, .Loop1 diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm index 442718a8..a8493ac3 100644 --- a/crysaudio/music/TCG/dueltheme2.asm +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -423,10 +423,22 @@ Branch_f5f90: notetype1 9 octave 1 note D_, 1 - rept 5 + ;rept 5 note D_, 2 note D_, 1 - endr + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;endr note D_, 2 duty_cycle 1 notetype1 10 @@ -834,10 +846,22 @@ Branch_f618f: dec_octave dec_octave note D_, 1 - rept 5 + ;rept 5 note D_, 2 note D_, 1 - endr + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;--- + note D_, 2 + note D_, 1 + ;endr note D_, 2 notetype1 7 ;frequency_offset 0 @@ -864,9 +888,13 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 44, .Loop2 .Loop3 - rept 3 + ;rept 3 sound_call Branch_f62e5 - endr + ;--- + sound_call Branch_f62e5 + ;--- + sound_call Branch_f62e5 + ;endr octave 2 ;cutoff 4 note D_, 2 @@ -1056,9 +1084,13 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 2, .Loop16 .Loop17 - rept 3 + ;rept 3 sound_call Branch_f62e5 - endr + ;--- + sound_call Branch_f62e5 + ;--- + sound_call Branch_f62e5 + ;endr octave 2 ;cutoff 4 note D_, 2 @@ -1136,9 +1168,19 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) sound_call Branch_f6396 .Loop6 sound_call Branch_f637c - rept 6 + ;rept 6 drum_note 2, 1 - endr + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;endr drum_note 2, 2 drum_note 6, 3 drum_note 2, 1 @@ -1187,9 +1229,19 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) sound_call Branch_f6396 .Loop10 sound_call Branch_f637c - rept 6 + ;rept 6 drum_note 2, 1 - endr + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;--- + drum_note 2, 1 + ;endr drum_note 2, 2 drum_note 6, 3 drum_note 2, 1 diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm index 049ac5d8..f8b2974b 100644 --- a/crysaudio/music/TCG/dueltheme3.asm +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -15,11 +15,23 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) octave 2 duty_cycle 0 .Loop1 - rept 4 + ;rept 4 notetype1 9 note F#, 2 rest 1 - endr + ;--- + notetype1 9 + note F#, 2 + rest 1 + ;--- + notetype1 9 + note F#, 2 + rest 1 + ;--- + notetype1 9 + note F#, 2 + rest 1 + ;endr notetype1 9 note E_, 2 notetype1 9 @@ -181,13 +193,31 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) duty_cycle 0 octave 2 .Loop8 - rept 4 + ;rept 4 notetype1 9 note F#, 1 notetype1 3 note F#, 1 rest 1 - endr + ;--- + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + rest 1 + ;--- + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + rest 1 + ;--- + notetype1 9 + note F#, 1 + notetype1 3 + note F#, 1 + rest 1 + ;endr notetype1 9 note F#, 1 notetype1 3 @@ -196,13 +226,31 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note F#, 1 notetype1 3 note F#, 1 - rept 4 + ;rept 4 notetype1 9 note G_, 1 notetype1 3 note G_, 1 rest 1 - endr + ;--- + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + rest 1 + ;--- + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + rest 1 + ;--- + notetype1 9 + note G_, 1 + notetype1 3 + note G_, 1 + rest 1 + ;endr notetype1 9 note A_, 1 notetype1 3 @@ -321,13 +369,31 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note E_, 2 duty_cycle 1 .Loop9 - rept 4 + ;rept 4 notetype1 9 note G#, 1 notetype1 3 note G#, 1 rest 1 - endr + ;--- + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + rest 1 + ;--- + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + rest 1 + ;--- + notetype1 9 + note G#, 1 + notetype1 3 + note G#, 1 + rest 1 + ;endr notetype1 9 note G#, 1 notetype1 3 @@ -336,13 +402,31 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note G#, 1 notetype1 3 note G#, 1 - rept 4 + ;rept 4 notetype1 9 note A_, 1 notetype1 3 note A_, 1 rest 1 - endr + ;--- + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + rest 1 + ;--- + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + rest 1 + ;--- + notetype1 9 + note A_, 1 + notetype1 3 + note A_, 1 + rest 1 + ;endr notetype1 9 note A_, 1 notetype1 3 @@ -491,11 +575,23 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) duty_cycle 0 ;frequency_offset 3 .Loop1 - rept 4 + ;rept 4 notetype1 8 note F#, 2 rest 1 - endr + ;--- + notetype1 8 + note F#, 2 + rest 1 + ;--- + notetype1 8 + note F#, 2 + rest 1 + ;--- + notetype1 8 + note F#, 2 + rest 1 + ;endr notetype1 8 note E_, 2 notetype1 8 @@ -512,12 +608,16 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) rest 8 sound_loop 4, .Loop2 .Loop3 - rept 2 + ;rept 2 sound_call Branch_f67b2 - endr - rept 2 + ;--- + sound_call Branch_f67b2 + ;endr + ;rept 2 sound_call Branch_f680a - endr + ;--- + sound_call Branch_f680a + ;endr sound_loop 2, .Loop3 octave 2 notetype1 10 @@ -551,12 +651,16 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) duty_cycle 0 notetype1 9 .Loop4 - rept 2 + ;rept 2 sound_call Branch_f67b2 - endr - rept 2 + ;--- + sound_call Branch_f67b2 + ;endr + ;rept 2 sound_call Branch_f680a - endr + ;--- + sound_call Branch_f680a + ;endr sound_loop 2, .Loop4 vibrato 10, 3, 3 .Loop5 @@ -650,13 +754,31 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) note E_, 4 octave 3 .Loop6 - rept 4 + ;rept 4 notetype1 9 note C#, 1 notetype1 3 note C#, 1 rest 1 - endr + ;--- + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + rest 1 + ;--- + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + rest 1 + ;--- + notetype1 9 + note C#, 1 + notetype1 3 + note C#, 1 + rest 1 + ;endr notetype1 9 note C#, 1 notetype1 3 @@ -665,13 +787,31 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) note C#, 1 notetype1 3 note C#, 1 - rept 4 + ;rept 4 notetype1 9 note D_, 1 notetype1 3 note D_, 1 rest 1 - endr + ;--- + notetype1 9 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;--- + notetype1 9 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;--- + notetype1 9 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;endr notetype1 9 note E_, 1 notetype1 3 @@ -684,13 +824,31 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) duty_cycle 1 inc_octave .Loop7 - rept 4 + ;rept 4 notetype1 8 note E_, 1 notetype1 3 note E_, 1 rest 1 - endr + ;--- + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + rest 1 + ;--- + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + rest 1 + ;--- + notetype1 8 + note E_, 1 + notetype1 3 + note E_, 1 + rest 1 + ;endr notetype1 8 note E_, 1 notetype1 3 @@ -699,13 +857,31 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) note E_, 1 notetype1 3 note E_, 1 - rept 4 + ;rept 4 notetype1 8 note D_, 1 notetype1 3 note D_, 1 rest 1 - endr + ;--- + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;--- + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;--- + notetype1 8 + note D_, 1 + notetype1 3 + note D_, 1 + rest 1 + ;endr notetype1 8 note D_, 1 notetype1 3 @@ -926,11 +1102,23 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) .MainLoop octave 2 .Loop1 - rept 4 + ;rept 4 ;cutoff 4 note F#, 2 rest 1 - endr + ;--- + ;cutoff 4 + note F#, 2 + rest 1 + ;--- + ;cutoff 4 + note F#, 2 + rest 1 + ;--- + ;cutoff 4 + note F#, 2 + rest 1 + ;endr ;cutoff 8 note E_, 2 note F_, 2 @@ -944,16 +1132,34 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) sound_loop 2, .Loop3 octave 2 .Loop4 - rept 4 + ;rept 4 note F#, 1 rest 2 - endr - note G_, 2 - note G_, 2 - rept 4 + ;--- note F#, 1 rest 2 - endr + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;endr + note G_, 2 + note G_, 2 + ;rept 4 + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;endr note E_, 2 note F_, 2 sound_loop 2, .Loop4 @@ -1000,29 +1206,65 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) note E_, 4 dec_octave .Loop7 - rept 4 + ;rept 4 note F#, 1 rest 2 - endr + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;--- + note F#, 1 + rest 2 + ;endr note F#, 2 note F_, 2 - rept 4 + ;rept 4 note E_, 1 rest 2 - endr + ;--- + note E_, 1 + rest 2 + ;--- + note E_, 1 + rest 2 + ;--- + note E_, 1 + rest 2 + ;endr note E_, 2 note F_, 2 sound_loop 6, .Loop7 ;cutoff 7 .Loop8 inc_octave - rept 4 + ;rept 4 note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - endr + ;--- + note F#, 1 + dec_octave + note F#, 1 + note F#, 1 + inc_octave + ;--- + note F#, 1 + dec_octave + note F#, 1 + note F#, 1 + inc_octave + ;--- + note F#, 1 + dec_octave + note F#, 1 + note F#, 1 + inc_octave + ;endr note F#, 1 dec_octave note F#, 1 @@ -1031,13 +1273,31 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) dec_octave note F#, 1 inc_octave - rept 4 + ;rept 4 note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - endr + ;--- + note E_, 1 + dec_octave + note E_, 1 + note E_, 1 + inc_octave + ;--- + note E_, 1 + dec_octave + note E_, 1 + note E_, 1 + inc_octave + ;--- + note E_, 1 + dec_octave + note E_, 1 + note E_, 1 + inc_octave + ;endr note E_, 1 dec_octave note E_, 1 @@ -1232,11 +1492,23 @@ Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f) drum_speed 11 .MainLoop .Loop1 - rept 4 + ;rept 4 drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - endr + ;--- + drum_note 5, 1 + drum_note 4, 1 + drum_note 4, 1 + ;--- + drum_note 5, 1 + drum_note 4, 1 + drum_note 4, 1 + ;--- + drum_note 5, 1 + drum_note 4, 1 + drum_note 4, 1 + ;endr drum_note 5, 1 drum_note 4, 1 drum_note 5, 1 @@ -1516,14 +1788,42 @@ Branch_f6b7e: Branch_f6b9a: drum_speed 11 .Loop9 - rept 5 + ;rept 5 drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - endr + ;--- + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_speed 1 + drum_note 4, 5 + drum_note 3, 6 + drum_speed 11 + drum_note 2, 1 + ;endr drum_note 1, 1 sound_loop 3, .Loop9 .Loop10 diff --git a/crysaudio/music/TCG/imakuni.asm b/crysaudio/music/TCG/imakuni.asm index ee7e1406..255e4f59 100644 --- a/crysaudio/music/TCG/imakuni.asm +++ b/crysaudio/music/TCG/imakuni.asm @@ -203,13 +203,19 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) sound_call Branch_faea5 sound_loop 6, .Loop1 .Loop2 - rept 2 + ;rept 2 notetype0 3 rest 10 notetype0 1 note C_, 7 rest 8 - endr + ;--- + notetype0 3 + rest 10 + notetype0 1 + note C_, 7 + rest 8 + ;endr rest 15 note C_, 7 rest 8 @@ -264,9 +270,11 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) .Loop4 note D_, 7 rest 8 - rept 2 + ;rept 2 rest 15 - endr + ;--- + rest 15 + ;endr sound_loop 4, .Loop4 note D_, 7 rest 8 @@ -284,11 +292,15 @@ Branch_faea5: notetype0 6 rest 10 notetype0 1 - rept 2 + ;rept 2 rest 15 note C#, 7 rest 8 - endr + ;--- + rest 15 + note C#, 7 + rest 8 + ;endr vibrato 8, 3, 3 notetype0 9 rest 10 diff --git a/crysaudio/music/TCG/pausemenu.asm b/crysaudio/music/TCG/pausemenu.asm index 9149baae..00a6ddf0 100644 --- a/crysaudio/music/TCG/pausemenu.asm +++ b/crysaudio/music/TCG/pausemenu.asm @@ -557,7 +557,7 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) octave 1 .MainLoop .Loop1 - rept 7 + ;rept 7 drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -572,7 +572,97 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - endr + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;--- + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 3, 1 + drum_note 1, 1 + drum_note 4, 1 + drum_note 5, 2 + drum_note 2, 1 + drum_note 4, 1 + drum_note 5, 1 + drum_note 2, 1 + ;endr drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -583,9 +673,23 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 3, 4 drum_note 3, 3 drum_speed 7 - rept 8 + ;rept 8 drum_note 2, 1 - endr + ;--- + 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 + ;endr sound_loop 2, .Loop1 sound_loop 0, .MainLoop ; 0xf6ef1 diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm index 2f3f5c82..7cf909d6 100644 --- a/crysaudio/music/TCG/ronald.asm +++ b/crysaudio/music/TCG/ronald.asm @@ -1162,7 +1162,7 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 7 sound_loop 2, .Loop2 .Loop3 - rept 7 + ;rept 7 sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1174,16 +1174,97 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - endr + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;--- + sound_call Branch_fad46 + drum_note 4, 13 + sound_call Branch_fad4f + drum_note 3, 7 + drum_note 1, 6 + drum_note 3, 7 + drum_note 5, 6 + drum_note 1, 7 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 7 + ;endr sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f drum_note 3, 3 drum_note 3, 4 - rept 4 + ;rept 4 drum_note 2, 6 drum_note 2, 7 - endr + ;--- + drum_note 2, 6 + drum_note 2, 7 + ;--- + drum_note 2, 6 + drum_note 2, 7 + ;--- + drum_note 2, 6 + drum_note 2, 7 + ;endr sound_loop 2, .Loop3 .Loop4 sound_call Branch_fad46 From fc07fb1f9b9c85b78dae2e3e1cf6f8ddc644afd3 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 25 Dec 2022 13:19:49 -0600 Subject: [PATCH 23/33] Rename tcg extension macros --- crysaudio/engine.asm | 6 +- crysaudio/macros.asm | 6 +- crysaudio/music/TCG/boosterpack.asm | 70 +- crysaudio/music/TCG/cardpop.asm | 100 +- crysaudio/music/TCG/challengehall.asm | 536 +++---- crysaudio/music/TCG/club1.asm | 250 +-- crysaudio/music/TCG/club2.asm | 110 +- crysaudio/music/TCG/club3.asm | 494 +++--- crysaudio/music/TCG/credits.asm | 1904 +++++++++++------------ crysaudio/music/TCG/deckmachine.asm | 88 +- crysaudio/music/TCG/dueltheme1.asm | 740 ++++----- crysaudio/music/TCG/dueltheme2.asm | 346 ++-- crysaudio/music/TCG/dueltheme3.asm | 770 ++++----- crysaudio/music/TCG/hallofhonor.asm | 142 +- crysaudio/music/TCG/imakuni.asm | 128 +- crysaudio/music/TCG/matchdraw.asm | 46 +- crysaudio/music/TCG/matchloss.asm | 76 +- crysaudio/music/TCG/matchstart1.asm | 10 +- crysaudio/music/TCG/matchstart2.asm | 18 +- crysaudio/music/TCG/matchstart3.asm | 18 +- crysaudio/music/TCG/matchvictory.asm | 104 +- crysaudio/music/TCG/medal.asm | 86 +- crysaudio/music/TCG/overworld.asm | 520 +++---- crysaudio/music/TCG/pausemenu.asm | 446 +++--- crysaudio/music/TCG/pcmainmenu.asm | 174 +-- crysaudio/music/TCG/pokemondome.asm | 350 ++--- crysaudio/music/TCG/ronald.asm | 306 ++-- crysaudio/music/TCG/titlescreen.asm | 312 ++-- crysaudio/music/TCG2/credits.asm | 238 +-- crysaudio/music/TCG2/diddly1.asm | 24 +- crysaudio/music/TCG2/diddly2.asm | 32 +- crysaudio/music/TCG2/diddly3.asm | 20 +- crysaudio/music/TCG2/diddly4.asm | 18 +- crysaudio/music/TCG2/diddly5.asm | 8 +- crysaudio/music/TCG2/diddly6.asm | 28 +- crysaudio/music/TCG2/fort1.asm | 20 +- crysaudio/music/TCG2/fort2.asm | 30 +- crysaudio/music/TCG2/fort3.asm | 42 +- crysaudio/music/TCG2/fort4.asm | 364 ++--- crysaudio/music/TCG2/gamecorner.asm | 18 +- crysaudio/music/TCG2/grblimp.asm | 68 +- crysaudio/music/TCG2/grcastle.asm | 52 +- crysaudio/music/TCG2/grchallengecup.asm | 62 +- crysaudio/music/TCG2/grdueltheme1.asm | 294 ++-- crysaudio/music/TCG2/grdueltheme2.asm | 16 +- crysaudio/music/TCG2/grdueltheme3.asm | 40 +- crysaudio/music/TCG2/groverworld.asm | 90 +- crysaudio/music/TCG2/herecomesgr.asm | 202 +-- crysaudio/music/TCG2/imakuni2.asm | 100 +- crysaudio/music/TCG2/ishihara.asm | 20 +- crysaudio/music/TCG2/titlescreen.asm | 162 +- 51 files changed, 5052 insertions(+), 5052 deletions(-) diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index a1306def..e4726126 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -1517,7 +1517,7 @@ MusicF5: ret MusicF6: -;notetype0 +;speed call GetMusicByte ld hl, CHANNEL_NOTE_LENGTH add hl, bc @@ -1525,7 +1525,7 @@ MusicF6: ret MusicF7: -;notetype1 +;channel_volume call GetMusicByte ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc @@ -1544,7 +1544,7 @@ MusicF7: ret MusicF8: -;notetype2 +;fade_wave call GetMusicByte ld hl, CHANNEL_VOLUME_ENVELOPE add hl, bc diff --git a/crysaudio/macros.asm b/crysaudio/macros.asm index d42bdb7a..14651239 100644 --- a/crysaudio/macros.asm +++ b/crysaudio/macros.asm @@ -403,14 +403,14 @@ dec_octave: MACRO db $f5 ENDM -notetype0: MACRO +speed: MACRO db $f6, \1 ENDM -notetype1: MACRO +channel_volume: MACRO db $f7, \1 ENDM -notetype2: MACRO +fade_wave: MACRO db $f8, \1 ENDM diff --git a/crysaudio/music/TCG/boosterpack.asm b/crysaudio/music/TCG/boosterpack.asm index d120c5d9..b73378c9 100644 --- a/crysaudio/music/TCG/boosterpack.asm +++ b/crysaudio/music/TCG/boosterpack.asm @@ -8,43 +8,43 @@ Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 4 duty_cycle 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note D#, 5 - notetype1 3 + channel_volume 3 note D#, 1 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note A#, 5 - notetype1 3 + channel_volume 3 note A#, 2 - notetype1 10 + channel_volume 10 note F_, 5 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 3 + channel_volume 3 note A_, 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 5 - notetype1 3 + channel_volume 3 note C_, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 16 ;tie note B_, 16 ;tie note B_, 6 - notetype1 3 + channel_volume 3 note B_, 9 sound_ret @@ -53,54 +53,54 @@ Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 1 - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note A#, 5 - notetype1 2 + channel_volume 2 note A#, 1 inc_octave - notetype1 9 + channel_volume 9 note D#, 5 - notetype1 2 + channel_volume 2 note D#, 1 - notetype1 9 + channel_volume 9 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 2 - notetype1 9 + channel_volume 9 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 9 + channel_volume 9 note F_, 5 - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 9 + channel_volume 9 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 2 - notetype1 9 + channel_volume 9 note G_, 16 ;tie note G_, 16 ;tie note G_, 6 - notetype1 2 + channel_volume 2 note G_, 9 sound_ret Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 0 octave 2 - notetype0 1 + speed 1 note D#, 6 note A#, 6 inc_octave diff --git a/crysaudio/music/TCG/cardpop.asm b/crysaudio/music/TCG/cardpop.asm index 489e8a48..77612bfe 100644 --- a/crysaudio/music/TCG/cardpop.asm +++ b/crysaudio/music/TCG/cardpop.asm @@ -6,11 +6,11 @@ Music_CardPop: channel 4, Music_CardPop_Ch4 Music_CardPop_Ch1: ; f703a (3d:703a) - notetype0 4 + speed 4 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 - notetype1 9 + channel_volume 9 .MainLoop .Loop1 rest 16 @@ -18,50 +18,50 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 14 .Loop2 octave 5 - notetype2 8 + fade_wave 8 note F#, 1 note G_, 1 - notetype2 6 + fade_wave 6 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note F#, 1 dec_octave - notetype1 9 + channel_volume 9 note A_, 1 inc_octave - notetype1 3 + channel_volume 3 note D_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 inc_octave note D_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 note F#, 1 @@ -69,57 +69,57 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 16 rest 14 octave 5 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 note F_, 1 - notetype2 6 + fade_wave 6 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note E_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 inc_octave - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note E_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 inc_octave note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note F_, 1 rest 1 note E_, 1 rest 12 rest 16 - notetype1 9 + channel_volume 9 rest 14 sound_loop 2, .Loop2 rest 2 @@ -127,12 +127,12 @@ Music_CardPop_Ch1: ; f703a (3d:703a) Music_CardPop_Ch2: ; f70df (3d:70df) - notetype0 4 + speed 4 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 - notetype1 6 - notetype2 3 + channel_volume 6 + fade_wave 3 .Loop1 octave 2 note A_, 2 @@ -213,10 +213,10 @@ Music_CardPop_Ch2: ; f70df (3d:70df) Music_CardPop_Ch3: ; f713a (3d:713a) - notetype0 4 - notetype2 11 + speed 4 + fade_wave 11 ;stereo_panning 1, 1 - notetype1 1 + channel_volume 1 ;echo 0 ;cutoff 8 sound_call Branch_f715b diff --git a/crysaudio/music/TCG/challengehall.asm b/crysaudio/music/TCG/challengehall.asm index e9b27ec5..615f85a0 100644 --- a/crysaudio/music/TCG/challengehall.asm +++ b/crysaudio/music/TCG/challengehall.asm @@ -9,64 +9,64 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 15, 3, 3 - notetype2 7 + fade_wave 7 octave 3 duty_cycle 2 - notetype1 8 - notetype2 8 - notetype0 1 + channel_volume 8 + fade_wave 8 + speed 1 note A_, 7 note G#, 4 - notetype1 1 + channel_volume 1 note G#, 4 - notetype1 8 + channel_volume 8 note A_, 4 - notetype1 1 + channel_volume 1 note A_, 3 - notetype1 8 + channel_volume 8 note B_, 4 - notetype1 1 + channel_volume 1 note B_, 4 inc_octave - notetype1 8 + channel_volume 8 note C#, 7 note C_, 4 - notetype1 1 + channel_volume 1 note C_, 4 - notetype1 8 + channel_volume 8 note C#, 4 - notetype1 1 + channel_volume 1 note C#, 3 - notetype1 8 + channel_volume 8 note D_, 4 - notetype1 1 + channel_volume 1 note D_, 4 - notetype1 8 + channel_volume 8 note E_, 7 note D#, 4 - notetype1 1 + channel_volume 1 note D#, 4 - notetype1 8 + channel_volume 8 note E_, 4 - notetype1 1 + channel_volume 1 note E_, 3 - notetype1 8 + channel_volume 8 note F#, 4 - notetype1 1 + channel_volume 1 note F#, 4 - notetype1 8 + channel_volume 8 note G#, 4 - notetype1 1 + channel_volume 1 note G#, 3 - notetype1 8 + channel_volume 8 note A_, 8 note B_, 7 inc_octave note C#, 4 note D_, 4 .MainLoop - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 octave 5 .Loop1 note E_, 4 @@ -75,278 +75,278 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) note F#, 4 sound_loop 8, .Loop1 duty_cycle 1 - notetype1 8 + channel_volume 8 dec_octave dec_octave dec_octave note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 dec_octave - notetype1 8 + channel_volume 8 note B_, 7 note B_, 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 - notetype1 8 + channel_volume 8 note B_, 15 inc_octave note D_, 15 note E_, 15 inc_octave duty_cycle 0 - notetype1 10 + channel_volume 10 sound_call Branch_f9848 - notetype1 10 + channel_volume 10 note D_, 8 - notetype0 10 + speed 10 note C#, 6 ;tie note C#, 6 - notetype1 3 - notetype0 1 + channel_volume 3 + speed 1 note C#, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 rest 15 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 rest 15 - notetype1 8 + channel_volume 8 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 rest 15 - notetype1 8 + channel_volume 8 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 duty_cycle 0 - notetype1 10 + channel_volume 10 sound_call Branch_f9848 - notetype1 10 + channel_volume 10 note C#, 8 dec_octave - notetype0 10 + speed 10 note A_, 6 ;tie note A_, 6 - notetype1 3 - notetype0 1 + channel_volume 3 + speed 1 note A_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 inc_octave note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 rest 15 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 rest 15 - notetype1 8 + channel_volume 8 note C#, 15 note D_, 15 note E_, 15 - notetype1 2 + channel_volume 2 note E_, 15 duty_cycle 0 - notetype1 10 + channel_volume 10 note F#, 7 note F_, 7 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note F#, 7 note F_, 8 note F#, 7 note G#, 7 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note A_, 3 ;tie - notetype0 1 + speed 1 note A_, 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 duty_cycle 0 - notetype1 10 + channel_volume 10 rest 15 inc_octave note E_, 7 note D#, 7 - notetype1 3 + channel_volume 3 note D#, 1 - notetype1 10 + channel_volume 10 note E_, 7 note D#, 8 note E_, 7 note G#, 7 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 10 - notetype0 9 + channel_volume 10 + speed 9 note A_, 5 - notetype0 1 + speed 1 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 duty_cycle 0 - notetype1 10 + channel_volume 10 rest 15 inc_octave note D_, 7 note C#, 8 note D_, 7 - notetype1 3 + channel_volume 3 note D_, 8 - notetype1 10 + channel_volume 10 note A_, 7 - notetype1 3 + channel_volume 3 note A_, 8 - notetype1 10 + channel_volume 10 note G#, 15 ;tie note G#, 7 - notetype1 3 + channel_volume 3 note G#, 8 - notetype1 10 + channel_volume 10 note F#, 15 - notetype1 3 + channel_volume 3 note F#, 7 - notetype1 10 + channel_volume 10 note G#, 8 - notetype0 10 + speed 10 note E_, 6 - notetype0 1 - notetype1 3 + speed 1 + channel_volume 3 note E_, 15 - notetype1 10 + channel_volume 10 note C#, 15 note D_, 15 note E_, 15 - notetype1 3 + channel_volume 3 note E_, 15 - notetype1 10 + channel_volume 10 note F#, 7 note F_, 7 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note F#, 7 note F_, 8 note F#, 6 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 2 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note A_, 3 - notetype0 1 + speed 1 note G#, 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 7 inc_octave duty_cycle 0 - notetype1 10 + channel_volume 10 note F#, 6 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 + channel_volume 10 note E_, 15 - notetype1 3 + channel_volume 3 note E_, 15 - notetype1 10 + channel_volume 10 note B_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 dec_octave note B_, 7 inc_octave duty_cycle 0 - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 2 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note A_, 3 - notetype0 1 - notetype1 3 + speed 1 + channel_volume 3 note A_, 15 - notetype1 10 + channel_volume 10 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 10 + channel_volume 10 note C#, 6 - notetype1 3 + channel_volume 3 note C#, 2 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note D_, 3 - notetype0 1 - notetype1 3 + speed 1 + channel_volume 3 note D_, 15 dec_octave - notetype1 10 + channel_volume 10 note F#, 6 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 2 - notetype1 10 + channel_volume 10 note A_, 15 - notetype1 3 + channel_volume 3 note A_, 15 - notetype1 10 + channel_volume 10 note G#, 11 - notetype1 3 + channel_volume 3 note G#, 4 rest 7 - notetype1 10 + channel_volume 10 note A_, 7 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 - notetype0 10 + channel_volume 10 + speed 10 note A_, 6 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 inc_octave note C#, 7 note C_, 8 @@ -364,44 +364,44 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) Branch_f9848: note C#, 15 - notetype1 3 + channel_volume 3 note C#, 15 - notetype1 10 + channel_volume 10 note E_, 15 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 10 + channel_volume 10 note C#, 8 note D_, 15 - notetype1 3 + channel_volume 3 note D_, 15 - notetype1 10 + channel_volume 10 note F#, 15 - notetype1 3 + channel_volume 3 note F#, 7 - notetype1 10 + channel_volume 10 note D_, 8 note E_, 7 - notetype1 3 + channel_volume 3 note E_, 8 - notetype1 10 + channel_volume 10 note A_, 15 note G#, 7 - notetype1 3 + channel_volume 3 note G#, 8 - notetype1 10 + channel_volume 10 note F#, 7 - notetype1 3 + channel_volume 3 note F#, 8 - notetype1 10 + channel_volume 10 note E_, 15 note D_, 7 - notetype1 3 + channel_volume 3 note D_, 8 dec_octave - notetype1 10 + channel_volume 10 note B_, 15 - notetype1 3 + channel_volume 3 note B_, 7 inc_octave sound_ret @@ -411,151 +411,151 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 15, 3, 3 - notetype2 7 + fade_wave 7 octave 3 - notetype0 10 + speed 10 .Loop1 rest 6 sound_loop 2, .Loop1 .MainLoop duty_cycle 1 - notetype1 9 - notetype2 8 - notetype0 10 + channel_volume 9 + fade_wave 8 + speed 10 note E_, 6 ;tie note E_, 6 - notetype0 1 + speed 1 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave - notetype1 8 + channel_volume 8 note E_, 7 note E_, 8 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 8 + channel_volume 8 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 8 + channel_volume 8 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 8 + channel_volume 8 note E_, 15 note F#, 15 note G#, 15 sound_call Branch_f9a28 note B_, 8 - notetype0 10 + speed 10 note A_, 6 ;tie note A_, 6 - notetype0 1 + speed 1 rest 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 rest 15 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 sound_call Branch_f9a28 note G#, 8 - notetype0 10 + speed 10 note E_, 6 ;tie note E_, 6 - notetype0 1 + speed 1 rest 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 - notetype1 8 + channel_volume 8 note A_, 15 note B_, 15 inc_octave note C#, 15 - notetype1 2 + channel_volume 2 note C#, 15 - notetype1 8 + channel_volume 8 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 rest 15 dec_octave - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 rest 15 inc_octave - notetype1 8 + channel_volume 8 note D_, 7 duty_cycle 2 - notetype1 6 + channel_volume 6 inc_octave note D_, 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 6 + channel_volume 6 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 - notetype1 6 + channel_volume 6 .Loop2 note E_, 4 note F#, 3 note E_, 4 note F#, 4 sound_loop 4, .Loop2 - notetype1 2 + channel_volume 2 note F#, 5 rest 10 dec_octave dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note C#, 7 inc_octave duty_cycle 2 - notetype1 6 + channel_volume 6 note E_, 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 6 + channel_volume 6 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 - notetype1 5 + channel_volume 5 .Loop3 note D_, 4 note E_, 3 @@ -566,63 +566,63 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note B_, 15 inc_octave note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 - notetype1 5 + channel_volume 5 note C#, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 octave 2 note B_, 7 inc_octave inc_octave ;vibrato_type 1 duty_cycle 2 - notetype1 5 + channel_volume 5 note B_, 8 inc_octave - notetype0 10 + speed 10 note C#, 6 - notetype1 2 - notetype0 1 + channel_volume 2 + speed 1 note C#, 15 ;vibrato_type 8 duty_cycle 0 - notetype1 7 + channel_volume 7 octave 2 note E_, 15 note F#, 15 note A#, 15 rest 15 duty_cycle 1 - notetype1 8 + channel_volume 8 inc_octave note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 rest 15 dec_octave - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 rest 15 inc_octave - notetype1 8 + channel_volume 8 note D_, 7 inc_octave duty_cycle 2 - notetype1 6 + channel_volume 6 note D_, 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 6 + channel_volume 6 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 - notetype1 6 + channel_volume 6 .Loop4 note E_, 4 note F#, 3 @@ -630,162 +630,162 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note F#, 4 sound_loop 2, .Loop4 duty_cycle 0 - notetype1 7 + channel_volume 7 dec_octave dec_octave note F_, 15 rest 7 note F_, 6 rest 2 - notetype0 10 + speed 10 note F#, 3 - notetype0 1 + speed 1 rest 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note C#, 7 duty_cycle 0 - notetype1 7 + channel_volume 7 note E_, 6 rest 2 - notetype0 10 + speed 10 note F#, 3 - notetype0 1 + speed 1 rest 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 7 inc_octave duty_cycle 0 - notetype1 7 + channel_volume 7 note D_, 6 rest 2 note E_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 duty_cycle 0 - notetype1 7 + channel_volume 7 note D_, 11 rest 4 duty_cycle 1 - notetype1 8 + channel_volume 8 dec_octave note B_, 7 inc_octave duty_cycle 0 - notetype1 7 + channel_volume 7 note D_, 6 rest 2 note C#, 15 duty_cycle 1 - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C#, 5 note C#, 5 note C#, 5 - notetype2 8 + fade_wave 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 duty_cycle 0 - notetype1 10 + channel_volume 10 note A_, 7 - notetype1 3 + channel_volume 3 note A_, 8 rest 15 - notetype0 10 + speed 10 rest 3 sound_loop 0, .MainLoop Branch_f9a28: duty_cycle 0 - notetype1 7 + channel_volume 7 note A_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 8 duty_cycle 0 - notetype1 7 + channel_volume 7 inc_octave note C#, 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note A_, 7 duty_cycle 0 - notetype1 7 + channel_volume 7 note A_, 8 note B_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 7 - notetype1 2 + channel_volume 2 note B_, 8 duty_cycle 0 - notetype1 7 + channel_volume 7 inc_octave note D_, 15 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 7 duty_cycle 0 - notetype1 7 + channel_volume 7 note B_, 8 inc_octave note C#, 7 - notetype1 3 + channel_volume 3 note C#, 8 duty_cycle 1 - notetype1 8 + channel_volume 8 note C#, 7 - notetype1 2 + channel_volume 2 note C#, 8 duty_cycle 0 - notetype1 7 + channel_volume 7 note E_, 7 rest 8 note E_, 7 rest 8 - notetype1 7 + channel_volume 7 note D_, 15 duty_cycle 1 - notetype1 8 + channel_volume 8 note D_, 7 - notetype1 2 + channel_volume 2 note D_, 8 dec_octave duty_cycle 0 - notetype1 7 + channel_volume 7 note G#, 15 inc_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note D_, 7 dec_octave duty_cycle 0 - notetype1 7 + channel_volume 7 sound_ret Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 0 ;cutoff 8 ;cutoff 8 - notetype0 10 + speed 10 .Loop1 rest 6 sound_loop 2, .Loop1 @@ -795,7 +795,7 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) note E_, 6 ;tie note E_, 6 - notetype0 1 + speed 1 inc_octave note E_, 7 rest 8 @@ -984,7 +984,7 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) note A_, 7 rest 8 rest 15 - notetype0 10 + speed 10 rest 3 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/club1.asm b/crysaudio/music/TCG/club1.asm index 8405c309..ec58ab53 100644 --- a/crysaudio/music/TCG/club1.asm +++ b/crysaudio/music/TCG/club1.asm @@ -6,15 +6,15 @@ Music_Club1: channel 4, Music_Club1_Ch4 Music_Club1_Ch1: ; f9be5 (3e:5be5) - notetype0 5 + speed 5 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 0 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note C#, 2 dec_octave note A_, 2 @@ -22,22 +22,22 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 2 note A_, 2 duty_cycle 2 - notetype1 7 + channel_volume 7 inc_octave - notetype0 1 + speed 1 note C#, 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 6 + channel_volume 6 note A_, 4 - notetype1 7 + channel_volume 7 note A_, 4 - notetype1 2 + channel_volume 2 note A_, 2 dec_octave duty_cycle 0 - notetype1 9 - notetype0 5 + channel_volume 9 + speed 5 note C#, 2 dec_octave note A#, 2 @@ -45,14 +45,14 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 2 note A#, 2 duty_cycle 2 - notetype1 7 + channel_volume 7 inc_octave - notetype0 1 + speed 1 note C#, 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype0 5 - notetype1 8 + speed 5 + channel_volume 8 dec_octave note B_, 1 inc_octave @@ -68,17 +68,17 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 4 dec_octave note B_, 2 - notetype1 2 + channel_volume 2 note B_, 2 rest 2 duty_cycle 0 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 6 rest 2 .MainLoop duty_cycle 0 - notetype1 10 + channel_volume 10 octave 3 rest 6 note A_, 4 @@ -88,44 +88,44 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) inc_octave note C_, 4 note C#, 8 - notetype1 4 + channel_volume 4 note C#, 4 - notetype1 10 + channel_volume 10 note C#, 2 note D_, 4 note E_, 2 - notetype1 4 + channel_volume 4 note E_, 2 rest 2 - notetype1 10 + channel_volume 10 note D#, 1 note E_, 7 note D_, 6 dec_octave note A_, 4 note F#, 2 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note C#, 3 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 2 note C_, 4 dec_octave note B_, 6 - notetype1 9 + channel_volume 9 note D_, 4 rest 2 dec_octave note A_, 2 ;vibrato_type 1 duty_cycle 2 - notetype1 5 + channel_volume 5 inc_octave inc_octave inc_octave @@ -135,7 +135,7 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) dec_octave ;vibrato_type 8 duty_cycle 0 - notetype1 10 + channel_volume 10 note A_, 4 note E_, 2 note A_, 4 @@ -145,88 +145,88 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 6 dec_octave dec_octave - notetype1 9 + channel_volume 9 note A#, 1 rest 5 inc_octave inc_octave - notetype1 10 + channel_volume 10 note C#, 2 note D_, 4 note E_, 2 - notetype1 4 + channel_volume 4 note E_, 2 rest 2 - notetype1 10 + channel_volume 10 note D#, 1 note E_, 7 note D_, 6 dec_octave note A_, 4 note F#, 2 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 - notetype1 10 + channel_volume 10 inc_octave note C_, 1 note C#, 3 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 2 note C_, 4 dec_octave note B_, 8 - notetype1 4 + channel_volume 4 note B_, 4 - notetype1 10 + channel_volume 10 note E_, 2 note F_, 1 note F#, 5 note A_, 6 note B_, 4 note A_, 2 - notetype1 4 + channel_volume 4 note A_, 2 rest 2 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 7 note A_, 6 note B_, 4 note A_, 2 - notetype1 4 + channel_volume 4 note A_, 2 rest 2 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note C#, 5 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 4 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 4 note C_, 2 note C#, 4 dec_octave note F#, 2 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 inc_octave - notetype1 10 + channel_volume 10 note D#, 1 note E_, 5 note D_, 6 note C#, 4 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C_, 1 note C#, 7 dec_octave @@ -234,10 +234,10 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note F#, 2 note A_, 4 note F#, 2 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 - notetype1 10 + channel_volume 10 inc_octave note C_, 1 note C#, 5 @@ -248,20 +248,20 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note F#, 2 note A_, 4 note F#, 2 - notetype1 4 + channel_volume 4 note F#, 2 rest 2 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note C#, 5 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 4 - notetype1 4 + channel_volume 4 note C#, 2 - notetype1 10 + channel_volume 10 note C#, 4 dec_octave note A_, 2 @@ -270,58 +270,58 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) dec_octave note B_, 14 duty_cycle 2 - notetype1 6 + channel_volume 6 note G#, 2 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 6 + channel_volume 6 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 6 + channel_volume 6 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 6 + channel_volume 6 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 6 + channel_volume 6 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 sound_loop 0, .MainLoop Music_Club1_Ch2: ; f9d5f (3e:5d5f) - notetype0 5 + speed 5 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 7 + fade_wave 7 octave 2 duty_cycle 0 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note A_, 2 note E_, 2 note A_, 2 inc_octave note C#, 2 duty_cycle 2 - notetype1 5 - notetype0 1 + channel_volume 5 + speed 1 note A_, 8 rest 2 inc_octave note C#, 8 rest 2 - notetype0 5 + speed 5 duty_cycle 0 - notetype1 9 + channel_volume 9 dec_octave dec_octave note A#, 2 @@ -330,14 +330,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) inc_octave note C#, 2 duty_cycle 2 - notetype1 5 - notetype0 1 + channel_volume 5 + speed 1 note A#, 8 rest 2 dec_octave - notetype0 5 + speed 5 duty_cycle 0 - notetype1 9 + channel_volume 9 note G_, 1 note G#, 1 note A_, 2 @@ -347,14 +347,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note F#, 2 note G#, 3 rest 3 - notetype1 9 + channel_volume 9 note B_, 6 rest 2 .MainLoop octave 2 rest 4 inc_octave - notetype1 9 + channel_volume 9 note C#, 5 rest 7 note C#, 4 @@ -364,7 +364,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) dec_octave note A#, 2 duty_cycle 2 - notetype1 5 + channel_volume 5 octave 5 note C#, 1 note D_, 3 @@ -373,21 +373,21 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note A#, 4 dec_octave duty_cycle 0 - notetype1 9 + channel_volume 9 note E_, 4 rest 2 ;vibrato_type 1 duty_cycle 2 - notetype1 5 + channel_volume 5 octave 5 note C_, 1 note C#, 5 duty_cycle 0 - notetype1 9 + channel_volume 9 octave 3 note D_, 2 duty_cycle 2 - notetype1 5 + channel_volume 5 inc_octave note A_, 4 note F#, 2 @@ -405,28 +405,28 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note A_, 2 rest 2 duty_cycle 0 - notetype1 9 + channel_volume 9 rest 2 dec_octave note C#, 2 - notetype1 6 + channel_volume 6 note C#, 4 - notetype1 3 + channel_volume 3 note C#, 4 rest 2 - notetype1 9 + channel_volume 9 note C#, 2 ;vibrato_type 8 - notetype1 6 + channel_volume 6 note D#, 4 note E_, 6 - notetype1 3 + channel_volume 3 note E_, 2 inc_octave inc_octave ;vibrato_type 1 duty_cycle 2 - notetype1 5 + channel_volume 5 note C#, 1 note D_, 3 note C#, 2 @@ -440,10 +440,10 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) dec_octave dec_octave duty_cycle 0 - notetype1 9 + channel_volume 9 note D_, 2 duty_cycle 2 - notetype1 5 + channel_volume 5 inc_octave note A_, 4 note F#, 2 @@ -458,7 +458,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note D_, 6 dec_octave duty_cycle 0 - notetype1 9 + channel_volume 9 note D_, 4 rest 2 dec_octave @@ -466,7 +466,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) rest 4 note A_, 2 duty_cycle 2 - notetype1 5 + channel_volume 5 inc_octave inc_octave note F_, 1 @@ -475,7 +475,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note C#, 4 dec_octave duty_cycle 0 - notetype1 9 + channel_volume 9 note D_, 4 rest 2 dec_octave @@ -485,14 +485,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) inc_octave inc_octave duty_cycle 2 - notetype1 5 + channel_volume 5 note E_, 1 note F_, 3 note D_, 2 note C#, 4 dec_octave duty_cycle 0 - notetype1 9 + channel_volume 9 note D_, 4 rest 2 dec_octave @@ -501,7 +501,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note B_, 2 inc_octave duty_cycle 2 - notetype1 5 + channel_volume 5 note E_, 4 note G#, 2 note B_, 4 @@ -511,13 +511,13 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) dec_octave ;vibrato_type 8 duty_cycle 0 - notetype1 6 + channel_volume 6 note A#, 2 - notetype1 3 + channel_volume 3 note A#, 2 rest 2 inc_octave - notetype1 6 + channel_volume 6 note C_, 1 note C#, 5 dec_octave @@ -526,49 +526,49 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) rest 2 note G#, 1 note A_, 5 - notetype1 9 + channel_volume 9 note D_, 2 - notetype1 6 + channel_volume 6 note F#, 4 note D_, 2 note F#, 4 dec_octave - notetype1 9 + channel_volume 9 note A_, 4 rest 2 - notetype1 6 + channel_volume 6 inc_octave note G#, 1 note A_, 5 - notetype1 9 + channel_volume 9 note D_, 2 - notetype1 6 + channel_volume 6 note F#, 4 note D_, 2 note F#, 4 dec_octave - notetype1 9 + channel_volume 9 note A_, 4 rest 2 inc_octave - notetype1 6 + channel_volume 6 note G#, 1 note A_, 5 - notetype1 9 + channel_volume 9 note D_, 2 - notetype1 6 + channel_volume 6 note A_, 4 rest 2 note A_, 4 dec_octave - notetype1 9 + channel_volume 9 note A_, 2 inc_octave - notetype1 6 + channel_volume 6 note A_, 4 note G#, 12 dec_octave - notetype1 9 + channel_volume 9 note A_, 4 rest 2 note B_, 4 @@ -579,10 +579,10 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) Music_Club1_Ch3: ; f9ec4 (3e:5ec4) - notetype0 5 + speed 5 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 96 ;cutoff 7 octave 2 diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm index 5706dc9b..6a404acd 100644 --- a/crysaudio/music/TCG/club2.asm +++ b/crysaudio/music/TCG/club2.asm @@ -5,58 +5,58 @@ Music_Club2: channel 3, Music_Club2_Ch3 Music_Club2_Ch1: ; fa077 (3e:6077) - notetype0 6 + speed 6 duty_cycle 2 ;stereo_panning 1, 1 - notetype2 6 + fade_wave 6 .MainLoop octave 4 .Loop1 - notetype1 7 + channel_volume 7 note G_, 4 note E_, 4 note C_, 4 - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note F#, 4 ;tie - notetype2 6 + fade_wave 6 note F#, 16 - notetype1 7 + channel_volume 7 note G_, 4 note A_, 4 note B_, 4 - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note F#, 4 ;tie - notetype2 6 + fade_wave 6 note F#, 16 sound_loop 8, .Loop1 - notetype1 7 + channel_volume 7 note G_, 4 note D_, 4 dec_octave note B_, 4 inc_octave - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note B_, 4 ;tie - notetype2 6 + fade_wave 6 note B_, 16 - notetype1 7 + channel_volume 7 note G_, 4 note D_, 4 note C_, 4 - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note B_, 4 ;tie - notetype2 6 + fade_wave 6 note B_, 16 dec_octave - notetype1 7 + channel_volume 7 note F#, 4 dec_octave note D_, 4 @@ -92,92 +92,92 @@ Music_Club2_Ch1: ; fa077 (3e:6077) note A_, 4 note A_, 3 ;tie - notetype0 1 + speed 1 note A_, 3 inc_octave - notetype1 7 + channel_volume 7 rest 4 note D_, 5 ;tie - notetype0 6 - notetype2 0 + speed 6 + fade_wave 0 note D_, 15 ;tie - notetype2 6 + fade_wave 6 note D_, 16 sound_loop 0, .MainLoop Music_Club2_Ch2: ; fa0e3 (3e:60e3) - notetype0 6 + speed 6 duty_cycle 2 ;stereo_panning 1, 1 - notetype2 6 + fade_wave 6 .MainLoop octave 2 .Loop1 - notetype1 7 + channel_volume 7 note C_, 4 note G_, 4 inc_octave note G_, 4 inc_octave - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note D_, 4 ;tie - notetype2 6 + fade_wave 6 note D_, 16 dec_octave dec_octave - notetype1 7 + channel_volume 7 note C_, 4 note G_, 4 inc_octave inc_octave note C_, 4 - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note D_, 4 ;tie - notetype2 6 + fade_wave 6 note D_, 16 dec_octave dec_octave sound_loop 8, .Loop1 dec_octave - notetype1 7 + channel_volume 7 note B_, 4 inc_octave note G_, 4 inc_octave note G_, 4 inc_octave - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note G_, 4 ;tie - notetype2 6 + fade_wave 6 note G_, 16 dec_octave dec_octave dec_octave - notetype1 7 + channel_volume 7 note A_, 4 inc_octave note A_, 4 inc_octave note A_, 4 inc_octave - notetype1 7 - notetype2 0 + channel_volume 7 + fade_wave 0 note C_, 4 ;tie - notetype2 6 + fade_wave 6 note C_, 16 dec_octave dec_octave - notetype1 7 + channel_volume 7 note D_, 4 octave 2 note F#, 4 @@ -214,35 +214,35 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) note D_, 4 note E_, 3 ;tie - notetype0 1 + speed 1 note E_, 3 dec_octave - notetype1 7 + channel_volume 7 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note F#, 7 ;tie - notetype0 6 - notetype2 0 + speed 6 + fade_wave 0 note F#, 14 ;tie - notetype2 6 + fade_wave 6 note F#, 16 sound_loop 0, .MainLoop Music_Club2_Ch3: ; fa164 (3e:6164) - notetype0 6 - notetype1 1 + speed 6 + channel_volume 1 ;stereo_panning 1, 1 - notetype2 10 + fade_wave 10 ;vibrato_type 4 vibrato 35, 3, 3 ;cutoff 6 ;echo 64 .MainLoop - notetype1 3 + channel_volume 3 ;cutoff 8 rest 2 octave 5 @@ -258,7 +258,7 @@ Music_Club2_Ch3: ; fa164 (3e:6164) note F#, 2 rest 2 rest 14 - notetype1 2 + channel_volume 2 ;echo 96 sound_call Branch_fa1cf octave 5 @@ -266,7 +266,7 @@ Music_Club2_Ch3: ; fa164 (3e:6164) note G_, 8 sound_call Branch_fa1cf ;echo 64 - notetype1 1 + channel_volume 1 octave 4 ;cutoff 8 note G_, 8 diff --git a/crysaudio/music/TCG/club3.asm b/crysaudio/music/TCG/club3.asm index b3f81b42..2ff0b16c 100644 --- a/crysaudio/music/TCG/club3.asm +++ b/crysaudio/music/TCG/club3.asm @@ -6,59 +6,59 @@ Music_Club3: channel 4, Music_Club3_Ch4 Music_Club3_Ch1: ; fa210 (3e:6210) - notetype0 9 + speed 9 ;stereo_panning 1, 1 ;vibrato_type 5 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop duty_cycle 0 .Loop1 octave 2 - notetype1 9 + channel_volume 9 rest 4 note G_, 2 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 2 dec_octave - notetype1 9 + channel_volume 9 note A#, 6 ;tie note A#, 12 - notetype1 3 + channel_volume 3 note A#, 4 rest 4 - notetype1 9 + channel_volume 9 note G_, 2 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 9 - notetype0 1 + channel_volume 9 + speed 1 note C_, 5 ;tie note C#, 4 ;tie - notetype0 9 + speed 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note A#, 6 ;tie note A#, 12 - notetype1 3 + channel_volume 3 note A#, 4 sound_loop 2, .Loop1 duty_cycle 1 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 sound_call Branch_fa330 sound_call Branch_fa403 note A#, 1 @@ -86,19 +86,19 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 note G_, 1 inc_octave - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 4 - notetype0 9 - notetype1 8 + speed 9 + channel_volume 8 note C#, 1 note C_, 1 dec_octave note A#, 1 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 sound_call Branch_fa330 sound_call Branch_fa403 inc_octave @@ -129,9 +129,9 @@ Music_Club3_Ch1: ; fa210 (3e:6210) note G_, 1 octave 4 duty_cycle 2 - notetype1 7 - notetype0 1 - notetype2 8 + channel_volume 7 + speed 1 + fade_wave 8 note G_, 5 note C#, 4 note C_, 5 @@ -143,8 +143,8 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave note A#, 4 duty_cycle 1 - notetype2 7 - notetype0 9 + fade_wave 7 + speed 9 sound_call Branch_fa370 sound_call Branch_fa403 note A#, 1 @@ -172,13 +172,13 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 note G_, 1 inc_octave - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 4 - notetype0 9 - notetype1 8 + speed 9 + channel_volume 8 note C#, 1 note C_, 1 dec_octave @@ -213,9 +213,9 @@ Music_Club3_Ch1: ; fa210 (3e:6210) note A#, 1 inc_octave duty_cycle 2 - notetype0 1 - notetype2 8 - notetype1 7 + speed 1 + fade_wave 8 + channel_volume 7 note G_, 5 note C#, 4 note C_, 5 @@ -226,8 +226,8 @@ Music_Club3_Ch1: ; fa210 (3e:6210) note C_, 5 dec_octave note A#, 4 - notetype0 9 - notetype2 8 + speed 9 + fade_wave 8 sound_loop 0, .MainLoop Branch_fa330: @@ -251,12 +251,12 @@ Branch_fa330: inc_octave note A#, 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F_, 5 note F#, 4 - notetype0 9 - notetype2 7 + speed 9 + fade_wave 7 note G_, 1 inc_octave note E_, 1 @@ -294,8 +294,8 @@ Branch_fa330: Branch_fa370: octave 2 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 1 inc_octave note D_, 1 @@ -315,55 +315,55 @@ Branch_fa370: inc_octave note A#, 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F_, 5 note F#, 4 octave 4 duty_cycle 2 - notetype1 7 + channel_volume 7 note G_, 3 - notetype1 1 + channel_volume 1 note G_, 2 inc_octave - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 1 + channel_volume 1 dec_octave note G_, 2 inc_octave - notetype1 7 + channel_volume 7 note G_, 3 - notetype1 1 + channel_volume 1 note D_, 2 - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 2 dec_octave - notetype1 7 + channel_volume 7 note G_, 3 - notetype1 1 + channel_volume 1 inc_octave note D_, 2 - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 1 + channel_volume 1 dec_octave note G_, 2 inc_octave - notetype1 7 + channel_volume 7 note G_, 3 - notetype1 1 + channel_volume 1 note D_, 2 - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 2 - notetype0 9 + speed 9 duty_cycle 1 - notetype2 7 - notetype1 9 + fade_wave 7 + channel_volume 9 octave 2 note G_, 1 inc_octave @@ -388,9 +388,9 @@ Branch_fa370: note G_, 1 octave 5 duty_cycle 2 - notetype0 1 - notetype2 8 - notetype1 7 + speed 1 + fade_wave 8 + channel_volume 7 octave 5 note G_, 5 note C#, 4 @@ -402,10 +402,10 @@ Branch_fa370: note C_, 5 dec_octave note A#, 4 - notetype0 9 + speed 9 duty_cycle 1 - notetype2 7 - notetype1 9 + fade_wave 7 + channel_volume 9 sound_ret Branch_fa403: @@ -429,271 +429,271 @@ Branch_fa403: inc_octave note A#, 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F_, 5 note F#, 4 - notetype0 9 - notetype2 7 + speed 9 + fade_wave 7 note G_, 1 sound_ret Music_Club3_Ch2: ; fa423 (3e:6423) - notetype0 9 + speed 9 ;stereo_panning 1, 1 ;vibrato_type 5 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop duty_cycle 0 .Loop1 octave 2 - notetype1 7 + channel_volume 7 rest 4 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 7 + channel_volume 7 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 7 + channel_volume 7 note E_, 6 ;tie note E_, 12 - notetype1 3 + channel_volume 3 note E_, 4 rest 4 - notetype1 7 + channel_volume 7 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F_, 5 ;tie note F#, 4 - notetype0 9 + speed 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 7 + channel_volume 7 note E_, 6 ;tie note E_, 12 - notetype1 3 + channel_volume 3 note E_, 4 sound_loop 2, .Loop1 duty_cycle 1 .Loop2 sound_call Branch_fa5a6 - notetype0 9 + speed 9 rest 1 inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype2 8 - notetype1 8 + speed 1 + fade_wave 8 + channel_volume 8 note F_, 5 note F#, 4 inc_octave - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 2 dec_octave - notetype1 9 + channel_volume 9 note D_, 1 inc_octave inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype1 9 - notetype0 9 + channel_volume 9 + speed 9 rest 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note G_, 5 note D_, 4 dec_octave note A#, 5 - notetype1 3 + channel_volume 3 note A#, 4 inc_octave inc_octave - notetype1 9 + channel_volume 9 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 8 + speed 9 + channel_volume 8 rest 1 dec_octave - notetype0 1 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype2 8 - notetype1 8 + speed 1 + fade_wave 8 + channel_volume 8 note F_, 5 note F#, 4 inc_octave - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 2 inc_octave - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 5 - notetype1 3 + channel_volume 3 note C_, 4 - notetype0 9 + speed 9 rest 1 dec_octave - notetype1 8 - notetype2 8 + channel_volume 8 + fade_wave 8 note A#, 1 note B_, 1 inc_octave note C_, 1 sound_call Branch_fa5a6 - notetype0 9 + speed 9 rest 1 inc_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype2 8 - notetype1 8 + speed 1 + fade_wave 8 + channel_volume 8 note F_, 5 note F#, 4 inc_octave - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 9 + channel_volume 9 note D_, 1 inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 4 - notetype0 9 + speed 9 rest 1 dec_octave dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 4 inc_octave - notetype1 8 + channel_volume 8 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 + speed 9 rest 1 rest 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype2 8 - notetype1 8 + speed 1 + fade_wave 8 + channel_volume 8 note F_, 5 note F#, 4 inc_octave inc_octave - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 2 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note F_, 5 - notetype1 3 + channel_volume 3 note F_, 4 - notetype1 8 - notetype0 9 + channel_volume 8 + speed 9 rest 1 dec_octave - notetype2 8 + fade_wave 8 note D_, 1 note D#, 1 note E_, 1 @@ -703,113 +703,113 @@ Music_Club3_Ch2: ; fa423 (3e:6423) Branch_fa5a6: octave 3 rest 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype1 8 - notetype2 8 + speed 1 + channel_volume 8 + fade_wave 8 note F_, 5 note F#, 4 inc_octave - notetype0 9 - notetype2 7 - notetype1 9 + speed 9 + fade_wave 7 + channel_volume 9 note G_, 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 9 + channel_volume 9 note E_, 1 inc_octave - notetype1 8 - notetype2 8 - notetype0 1 + channel_volume 8 + fade_wave 8 + speed 1 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype1 8 - notetype0 9 + channel_volume 8 + speed 9 rest 1 dec_octave - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note G_, 5 note D_, 4 dec_octave note A#, 5 - notetype1 3 + channel_volume 3 note A#, 4 - notetype1 8 + channel_volume 8 inc_octave inc_octave note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 + speed 9 rest 1 dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 4 - notetype0 9 - notetype1 9 - notetype2 7 + speed 9 + channel_volume 9 + fade_wave 7 note G_, 1 dec_octave - notetype0 1 - notetype1 8 - notetype2 8 + speed 1 + channel_volume 8 + fade_wave 8 note F_, 5 note F#, 4 - notetype0 9 + speed 9 inc_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 2 inc_octave - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 dec_octave - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave - notetype1 9 + channel_volume 9 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 1 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 2 sound_ret Music_Club3_Ch3: ; fa63e (3e:663e) - notetype0 9 + speed 9 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 0 ;cutoff 8 .Loop1 diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm index 1e639714..82c1a641 100644 --- a/crysaudio/music/TCG/credits.asm +++ b/crysaudio/music/TCG/credits.asm @@ -6,269 +6,269 @@ Music_TCGCredits: channel 4, Music_TCGCredits_Ch4 Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) - notetype0 13 + speed 13 ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 2 duty_cycle 1 - notetype1 5 + channel_volume 5 note F_, 1 - notetype1 6 + channel_volume 6 note F_, 2 ;tie - notetype0 1 + speed 1 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype0 13 - notetype1 7 + speed 13 + channel_volume 7 note G_, 1 - notetype1 7 + channel_volume 7 note G_, 2 ;tie - notetype0 1 + speed 1 note G_, 6 - notetype1 4 + channel_volume 4 note G_, 7 - notetype0 13 - notetype1 7 + speed 13 + channel_volume 7 note A_, 1 - notetype1 8 + channel_volume 8 note A_, 2 ;tie - notetype0 1 + speed 1 note A_, 6 - notetype1 4 + channel_volume 4 note A_, 7 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note B_, 3 - notetype1 4 + channel_volume 4 note B_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 sound_call Branch_fb5bc octave 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 ; ;sound_call Branch_fb36b - notetype0 13 + speed 13 octave 2 - notetype1 8 + channel_volume 8 note A_, 1 rest 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 8 + channel_volume 8 note A_, 1 note B_, 1 inc_octave note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 rest 1 sound_call Branch_fb5bc octave 2 note A_, 2 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 8 + channel_volume 8 note B_, 1 inc_octave sound_call Branch_fb5e4 octave 4 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 10 + channel_volume 10 note G_, 4 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 2 note E_, 1 ;tie - notetype0 1 + speed 1 note E_, 6 note F_, 4 note E_, 3 note D_, 13 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 2 sound_call Branch_fb5e4 octave 4 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 dec_octave - notetype1 10 + channel_volume 10 note G_, 4 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 + channel_volume 10 note G_, 3 note G#, 10 ;tie note G#, 13 - notetype1 3 + channel_volume 3 note G#, 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 8 sound_call Branch_fb60c - notetype0 13 + speed 13 octave 4 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 3 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note E_, 13 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note E_, 6 note F_, 7 note E_, 13 dec_octave note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 inc_octave - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 13 rest 7 - notetype1 10 + channel_volume 10 note A_, 13 inc_octave note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 ;tie note E_, 13 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype1 10 + channel_volume 10 note E_, 6 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie @@ -279,117 +279,117 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note B_, 13 inc_octave note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 - notetype0 13 + channel_volume 10 + speed 13 note E_, 5 sound_call Branch_fb60c - notetype0 13 + speed 13 octave 4 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype0 1 + speed 1 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 - notetype1 10 + channel_volume 10 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 7 - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 - notetype1 3 + channel_volume 3 note C_, 13 dec_octave - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note E_, 13 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie note F_, 13 note E_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 rest 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 dec_octave note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 inc_octave - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie note F_, 13 note E_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 7 rest 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 rest 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave dec_octave - notetype1 8 + channel_volume 8 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 - notetype1 8 + channel_volume 8 note B_, 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note G_, 3 note A_, 3 note B_, 3 @@ -401,453 +401,453 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note G_, 4 sound_call Branch_fb651 octave 3 - notetype1 10 + channel_volume 10 note G#, 3 note A_, 10 ;tie note A_, 13 - notetype1 3 + channel_volume 3 note A_, 13 - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie note G_, 13 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note D_, 13 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 1 dec_octave - notetype1 8 + channel_volume 8 note G_, 1 - notetype0 1 + speed 1 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 - notetype1 8 + channel_volume 8 note B_, 6 - notetype1 2 + channel_volume 2 note B_, 7 sound_call Branch_fb651 octave 3 - notetype1 10 + channel_volume 10 note G_, 3 note G#, 10 ;tie note G#, 13 - notetype1 3 + channel_volume 3 note G#, 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 ; octave 4 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype0 1 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 8 - notetype0 13 - notetype1 10 + speed 13 + channel_volume 10 note E_, 5 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype0 1 + speed 1 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 8 - notetype0 13 - notetype1 10 + speed 13 + channel_volume 10 note C_, 5 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 13 rest 7 inc_octave - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 10 + channel_volume 10 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype0 1 + speed 1 note A_, 5 - notetype1 3 + channel_volume 3 note A_, 8 - notetype1 10 + channel_volume 10 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 8 - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 2 ;tie - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 dec_octave - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 8 - notetype1 10 + channel_volume 10 note E_, 5 - notetype1 3 + channel_volume 3 note E_, 8 - notetype0 13 - notetype1 10 + speed 13 + channel_volume 10 note F_, 3 note E_, 1 - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 dec_octave - notetype1 10 + channel_volume 10 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 13 rest 7 - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 2 ;tie - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 8 ;tie note C_, 8 ;tie note C_, 8 - notetype1 3 + channel_volume 3 note C_, 1 ; ;sound_call Branch_fb36b - notetype0 13 + speed 13 octave 2 - notetype1 8 + channel_volume 8 note A_, 1 rest 1 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 8 + channel_volume 8 note A_, 1 note B_, 1 inc_octave note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 rest 1 sound_call Branch_fb5bc octave 2 note A_, 2 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 8 + channel_volume 8 note B_, 1 inc_octave sound_call Branch_fb5e4 octave 4 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave - notetype1 10 + channel_volume 10 note G_, 4 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 2 note E_, 1 ;tie - notetype0 1 + speed 1 note E_, 6 note F_, 4 note E_, 3 note D_, 13 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 2 sound_call Branch_fb5e4 octave 4 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 dec_octave - notetype1 10 + channel_volume 10 note G_, 4 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 + channel_volume 10 note G_, 3 note G#, 10 ;tie note G#, 13 - notetype1 3 + channel_volume 3 note G#, 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 8 sound_call Branch_fb60c - notetype0 13 + speed 13 octave 4 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 3 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note E_, 13 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note E_, 6 note F_, 7 note E_, 13 dec_octave note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 inc_octave - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 13 rest 7 - notetype1 10 + channel_volume 10 note A_, 13 inc_octave note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 ;tie note E_, 13 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype1 10 + channel_volume 10 note E_, 6 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie @@ -858,117 +858,117 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note B_, 13 inc_octave note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 7 - notetype1 10 - notetype0 13 + channel_volume 10 + speed 13 note E_, 5 sound_call Branch_fb60c - notetype0 13 + speed 13 octave 4 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype0 1 + speed 1 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 - notetype1 10 + channel_volume 10 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 7 - notetype1 10 + channel_volume 10 note B_, 3 inc_octave note C_, 10 - notetype1 3 + channel_volume 3 note C_, 13 dec_octave - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note E_, 13 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie note F_, 13 note E_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 rest 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 dec_octave note A_, 6 - notetype1 3 + channel_volume 3 note A_, 7 inc_octave - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie note F_, 13 note E_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 dec_octave - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 7 rest 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 rest 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 dec_octave dec_octave - notetype1 8 + channel_volume 8 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 - notetype1 8 + channel_volume 8 note B_, 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note G_, 3 note A_, 3 note B_, 3 @@ -980,136 +980,136 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note G_, 4 sound_call Branch_fb651 octave 3 - notetype1 10 + channel_volume 10 note G#, 3 note A_, 10 ;tie note A_, 13 - notetype1 3 + channel_volume 3 note A_, 13 - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie note G_, 13 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 13 - notetype1 10 + channel_volume 10 note D_, 13 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 1 dec_octave - notetype1 8 + channel_volume 8 note G_, 1 - notetype0 1 + speed 1 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 - notetype1 8 + channel_volume 8 note B_, 6 - notetype1 2 + channel_volume 2 note B_, 7 sound_call Branch_fb651 octave 3 - notetype1 10 + channel_volume 10 note G_, 3 note G#, 10 ;tie note G#, 13 - notetype1 3 + channel_volume 3 note G#, 13 inc_octave - notetype1 10 + channel_volume 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 note C_, 13 - notetype1 3 + channel_volume 3 note C_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 2 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 ; octave 4 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 4 - notetype1 3 + channel_volume 3 note D#, 1 - notetype1 10 + channel_volume 10 note D_, 1 - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype1 10 + channel_volume 10 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 3 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note D#, 1 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note F#, 3 note G_, 10 ;tie - notetype0 13 + speed 13 note G_, 4 dec_octave dec_octave - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note E_, 6 note A_, 7 inc_octave @@ -1121,42 +1121,42 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note C_, 7 note F_, 6 note D_, 7 - notetype0 13 + speed 13 note E_, 8 ;tie note E_, 1 - notetype1 3 + channel_volume 3 note E_, 2 sound_ret Branch_fb5bc: octave 2 - notetype0 13 + speed 13 rest 2 - notetype1 8 + channel_volume 8 note G_, 1 inc_octave note C_, 1 rest 1 dec_octave note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 2 - notetype1 8 + channel_volume 8 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 8 + channel_volume 8 note A_, 1 rest 1 inc_octave note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 rest 3 dec_octave - notetype1 8 + channel_volume 8 note G_, 1 inc_octave note C_, 1 @@ -1165,78 +1165,78 @@ Branch_fb5bc: Branch_fb5e4: octave 3 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 3 note G_, 10 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 1 sound_ret Branch_fb60c: octave 4 - notetype0 13 - notetype1 3 + speed 13 + channel_volume 3 note E_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 - notetype0 13 - notetype1 3 + speed 13 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 3 note A_, 10 ;tie - notetype0 13 + speed 13 note A_, 8 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 3 note A_, 10 - notetype1 3 + channel_volume 3 note A_, 13 - notetype1 10 + channel_volume 10 note G_, 13 - notetype1 3 + channel_volume 3 note G_, 13 - notetype1 10 + channel_volume 10 note F_, 13 - notetype1 3 + channel_volume 3 note F_, 13 - notetype1 10 + channel_volume 10 note F#, 3 note G_, 10 ;tie @@ -1244,46 +1244,46 @@ Branch_fb60c: Branch_fb651: octave 3 - notetype1 10 + channel_volume 10 note D#, 3 note E_, 10 note F_, 6 - notetype1 3 + channel_volume 3 note F_, 7 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 8 inc_octave - notetype1 10 + channel_volume 10 note C#, 3 note D_, 10 ;tie note D_, 13 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 13 rest 7 dec_octave - notetype0 13 - notetype1 10 + speed 13 + channel_volume 10 note G_, 6 ;tie note G_, 6 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 note F_, 5 - notetype1 3 + channel_volume 3 note F_, 8 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 8 sound_ret @@ -1292,96 +1292,96 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 1 octave 2 - notetype0 13 - notetype1 4 + speed 13 + channel_volume 4 note A_, 1 - notetype1 7 + channel_volume 7 note A_, 2 ;tie - notetype0 1 + speed 1 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note B_, 1 - notetype1 8 + channel_volume 8 note B_, 2 ;tie - notetype0 1 + speed 1 note B_, 6 - notetype1 3 + channel_volume 3 note B_, 7 inc_octave - notetype0 13 - notetype1 6 + speed 13 + channel_volume 6 note C_, 1 - notetype1 9 + channel_volume 9 note C_, 2 ;tie - notetype0 1 + speed 1 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 7 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 ; ;sound_call Branch_fb79e - notetype0 13 + speed 13 octave 3 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 sound_call Branch_fba68 octave 2 - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 note D_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 sound_call Branch_fba68 - notetype1 9 + channel_volume 9 octave 3 - notetype0 1 + speed 1 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 9 + channel_volume 9 note D_, 3 - notetype1 9 + channel_volume 9 duty_cycle 1 .Loop1 rest 2 @@ -1399,7 +1399,7 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_call Branch_fba9d rest 2 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 3 note C_, 1 rest 1 @@ -1410,29 +1410,29 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_loop 4, .Loop3 rest 2 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 3 note F_, 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave - notetype1 9 + channel_volume 9 duty_cycle 1 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 3 note F_, 10 ;tie @@ -1442,53 +1442,53 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note E_, 4 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 duty_cycle 2 - notetype1 7 + channel_volume 7 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note C#, 3 note D_, 10 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 rest 13 dec_octave - notetype1 8 + channel_volume 8 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 3 rest 1 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 10 ;tie - notetype0 13 + speed 13 note B_, 4 rest 1 inc_octave note C_, 1 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 8 + channel_volume 8 note E_, 5 rest 1 sound_call Branch_fba9d @@ -1496,237 +1496,237 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) octave 3 note C_, 1 note D_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 rest 1 note F_, 1 rest 1 note G#, 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 1 inc_octave - notetype1 8 + channel_volume 8 note G#, 1 note A#, 1 dec_octave - notetype1 9 + channel_volume 9 note G#, 1 inc_octave inc_octave - notetype1 8 + channel_volume 8 note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note F#, 3 note G_, 10 inc_octave - notetype0 13 - notetype2 4 + speed 13 + fade_wave 4 note C_, 1 dec_octave note B_, 1 - notetype2 8 + fade_wave 8 note A#, 1 rest 1 sound_call Branch_fbacb octave 3 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note B_, 3 inc_octave note C_, 10 - notetype0 13 + speed 13 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 note C_, 1 dec_octave - notetype2 4 + fade_wave 4 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note D_, 1 rest 1 - notetype2 8 + fade_wave 8 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 2 - notetype2 4 + fade_wave 4 note D_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note A_, 1 rest 1 - notetype2 8 + fade_wave 8 note B_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note A_, 1 - notetype2 8 + fade_wave 8 note G_, 1 - notetype2 4 + fade_wave 4 note A_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 2 dec_octave - notetype0 1 + speed 1 note B_, 3 inc_octave note C_, 10 dec_octave - notetype0 13 - notetype2 4 + speed 13 + fade_wave 4 note B_, 1 - notetype2 6 + fade_wave 6 note A#, 2 sound_call Branch_fbacb octave 4 note G_, 1 - notetype2 8 + fade_wave 8 note E_, 1 - notetype0 13 + speed 13 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note F_, 1 rest 1 - notetype2 8 + fade_wave 8 note A_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note F_, 1 rest 1 note G#, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 3 rest 1 dec_octave note A_, 1 inc_octave - notetype2 4 + fade_wave 4 note C_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 10 rest 13 dec_octave - notetype1 9 + channel_volume 9 note A#, 3 note B_, 10 - notetype1 2 + channel_volume 2 note B_, 13 inc_octave - notetype1 9 + channel_volume 9 note C_, 13 - notetype1 2 + channel_volume 2 note C_, 13 - notetype1 9 - notetype0 13 + channel_volume 9 + speed 13 note D_, 2 - notetype1 2 + channel_volume 2 note D_, 1 sound_call Branch_fbb10 rest 1 @@ -1736,83 +1736,83 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note B_, 1 note A_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 2 rest 1 note C_, 1 rest 1 dec_octave - notetype2 7 + fade_wave 7 note G_, 1 - notetype2 8 + fade_wave 8 note G_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 rest 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F_, 13 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 inc_octave - notetype1 7 + channel_volume 7 note C_, 6 - notetype1 2 + channel_volume 2 note C_, 7 - notetype1 7 + channel_volume 7 note E_, 6 - notetype1 2 + channel_volume 2 note E_, 7 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 7 + channel_volume 7 note D_, 5 - notetype1 2 + channel_volume 2 note D_, 8 - notetype0 13 + speed 13 rest 1 dec_octave dec_octave - notetype1 9 + channel_volume 9 duty_cycle 1 note B_, 1 inc_octave - notetype0 1 + speed 1 note C_, 6 - notetype1 2 + channel_volume 2 note C_, 7 - notetype1 9 + channel_volume 9 note D_, 6 - notetype1 2 + channel_volume 2 note D_, 7 sound_call Branch_fbb10 octave 3 @@ -1821,24 +1821,24 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) rest 1 note G#, 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 1 - notetype0 1 + speed 1 rest 6 - notetype1 9 + channel_volume 9 note G#, 7 inc_octave note C_, 6 @@ -1847,147 +1847,147 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note A#, 7 ; octave 4 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 2 inc_octave - notetype1 8 + channel_volume 8 note D_, 1 - notetype2 4 + fade_wave 4 note E_, 1 - notetype2 8 + fade_wave 8 note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note D_, 1 rest 2 inc_octave - notetype1 8 + channel_volume 8 note D_, 1 - notetype2 4 + fade_wave 4 note E_, 1 dec_octave - notetype2 8 + fade_wave 8 note A_, 3 - notetype1 9 + channel_volume 9 note C_, 1 rest 2 - notetype2 4 - notetype1 8 + fade_wave 4 + channel_volume 8 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note G#, 3 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note G#, 1 rest 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 3 - notetype1 9 + channel_volume 9 note D_, 1 rest 1 dec_octave - notetype1 8 + channel_volume 8 note B_, 1 inc_octave - notetype2 4 + fade_wave 4 note C_, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 - notetype1 8 + channel_volume 8 note E_, 3 - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 + channel_volume 8 note E_, 1 - notetype2 4 + fade_wave 4 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note A_, 3 - notetype1 9 + channel_volume 9 note C_, 1 - notetype2 4 + fade_wave 4 note A_, 1 rest 1 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note A_, 3 - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 + channel_volume 8 note G#, 3 rest 1 ; ;sound_call Branch_fb79e - notetype0 13 + speed 13 octave 3 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 sound_call Branch_fba68 octave 2 - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 note D_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 sound_call Branch_fba68 - notetype1 9 + channel_volume 9 octave 3 - notetype0 1 + speed 1 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 9 + channel_volume 9 note D_, 3 - notetype1 9 + channel_volume 9 duty_cycle 1 .Loop4 rest 2 @@ -2005,7 +2005,7 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_call Branch_fba9d rest 2 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 3 note C_, 1 rest 1 @@ -2016,29 +2016,29 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_loop 4, .Loop6 rest 2 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 3 note F_, 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave - notetype1 9 + channel_volume 9 duty_cycle 1 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 3 note F_, 10 ;tie @@ -2048,53 +2048,53 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note E_, 4 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 duty_cycle 2 - notetype1 7 + channel_volume 7 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 8 inc_octave - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note C#, 3 note D_, 10 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 rest 13 dec_octave - notetype1 8 + channel_volume 8 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 3 rest 1 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 10 ;tie - notetype0 13 + speed 13 note B_, 4 rest 1 inc_octave note C_, 1 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 8 + channel_volume 8 note E_, 5 rest 1 sound_call Branch_fba9d @@ -2102,237 +2102,237 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) octave 3 note C_, 1 note D_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 rest 1 note F_, 1 rest 1 note G#, 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 1 inc_octave - notetype1 8 + channel_volume 8 note G#, 1 note A#, 1 dec_octave - notetype1 9 + channel_volume 9 note G#, 1 inc_octave inc_octave - notetype1 8 + channel_volume 8 note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note F#, 3 note G_, 10 inc_octave - notetype0 13 - notetype2 4 + speed 13 + fade_wave 4 note C_, 1 dec_octave note B_, 1 - notetype2 8 + fade_wave 8 note A#, 1 rest 1 sound_call Branch_fbacb octave 3 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note B_, 3 inc_octave note C_, 10 - notetype0 13 + speed 13 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 note C_, 1 dec_octave - notetype2 4 + fade_wave 4 note F_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note D_, 1 rest 1 - notetype2 8 + fade_wave 8 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 2 - notetype2 4 + fade_wave 4 note D_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note A_, 1 rest 1 - notetype2 8 + fade_wave 8 note B_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note A_, 1 - notetype2 8 + fade_wave 8 note G_, 1 - notetype2 4 + fade_wave 4 note A_, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 2 dec_octave - notetype0 1 + speed 1 note B_, 3 inc_octave note C_, 10 dec_octave - notetype0 13 - notetype2 4 + speed 13 + fade_wave 4 note B_, 1 - notetype2 6 + fade_wave 6 note A#, 2 sound_call Branch_fbacb octave 4 note G_, 1 - notetype2 8 + fade_wave 8 note E_, 1 - notetype0 13 + speed 13 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 rest 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note F_, 1 rest 1 - notetype2 8 + fade_wave 8 note A_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 - notetype2 7 + channel_volume 8 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 - notetype2 4 + channel_volume 8 + fade_wave 4 note F_, 1 rest 1 note G#, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note B_, 3 inc_octave note C_, 10 ;tie - notetype0 13 + speed 13 note C_, 3 rest 1 dec_octave note A_, 1 inc_octave - notetype2 4 + fade_wave 4 note C_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 10 rest 13 dec_octave - notetype1 9 + channel_volume 9 note A#, 3 note B_, 10 - notetype1 2 + channel_volume 2 note B_, 13 inc_octave - notetype1 9 + channel_volume 9 note C_, 13 - notetype1 2 + channel_volume 2 note C_, 13 - notetype1 9 - notetype0 13 + channel_volume 9 + speed 13 note D_, 2 - notetype1 2 + channel_volume 2 note D_, 1 sound_call Branch_fbb10 rest 1 @@ -2342,83 +2342,83 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note B_, 1 note A_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 2 rest 1 note C_, 1 rest 1 dec_octave - notetype2 7 + fade_wave 7 note G_, 1 - notetype2 8 + fade_wave 8 note G_, 1 inc_octave - notetype1 9 + channel_volume 9 note C_, 1 dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 3 note F_, 10 ;tie - notetype0 13 + speed 13 note F_, 1 rest 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F_, 13 note A_, 6 - notetype1 2 + channel_volume 2 note A_, 7 inc_octave - notetype1 7 + channel_volume 7 note C_, 6 - notetype1 2 + channel_volume 2 note C_, 7 - notetype1 7 + channel_volume 7 note E_, 6 - notetype1 2 + channel_volume 2 note E_, 7 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 1 note F_, 1 - notetype0 1 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 7 + channel_volume 7 note D_, 5 - notetype1 2 + channel_volume 2 note D_, 8 - notetype0 13 + speed 13 rest 1 dec_octave dec_octave - notetype1 9 + channel_volume 9 duty_cycle 1 note B_, 1 inc_octave - notetype0 1 + speed 1 note C_, 6 - notetype1 2 + channel_volume 2 note C_, 7 - notetype1 9 + channel_volume 9 note D_, 6 - notetype1 2 + channel_volume 2 note D_, 7 sound_call Branch_fbb10 octave 3 @@ -2427,24 +2427,24 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) rest 1 note G#, 1 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 3 note D#, 10 ;tie - notetype0 13 + speed 13 note D#, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 1 - notetype0 1 + speed 1 rest 6 - notetype1 9 + channel_volume 9 note G#, 7 inc_octave note C_, 6 @@ -2453,48 +2453,48 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note A#, 7 ; octave 4 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note C_, 1 ;tie note C_, 2 dec_octave dec_octave - notetype1 9 + channel_volume 9 note G#, 1 rest 2 inc_octave - notetype1 8 + channel_volume 8 note A#, 1 dec_octave - notetype1 9 + channel_volume 9 note G#, 1 inc_octave inc_octave - notetype1 8 + channel_volume 8 note C_, 1 ;tie note C_, 2 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 1 inc_octave - notetype1 8 + channel_volume 8 note C_, 1 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 inc_octave - notetype1 8 + channel_volume 8 note E_, 1 ;tie note E_, 4 dec_octave dec_octave - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note C_, 6 note F_, 7 note A_, 6 @@ -2506,90 +2506,90 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) dec_octave note B_, 7 inc_octave - notetype0 13 + speed 13 note C_, 8 ;tie note C_, 1 - notetype1 2 + channel_volume 2 note C_, 2 sound_ret Branch_fba68: octave 3 - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 9 + channel_volume 9 note C_, 1 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 3 + channel_volume 3 note F_, 1 rest 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 1 - notetype1 9 + channel_volume 9 note C_, 1 - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 9 + channel_volume 9 note C_, 1 note E_, 1 - notetype1 9 + channel_volume 9 note C_, 1 sound_ret Branch_fba9d: octave 4 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F#, 3 note G_, 10 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 7 + channel_volume 7 note E_, 3 note F_, 10 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave - notetype0 13 + speed 13 duty_cycle 1 - notetype1 9 + channel_volume 9 note C_, 1 duty_cycle 2 - notetype1 7 + channel_volume 7 note G_, 1 sound_ret Branch_fbacb: octave 3 - notetype2 8 + fade_wave 8 .Loop4 note A#, 1 rest 1 @@ -2597,156 +2597,156 @@ Branch_fbacb: inc_octave note C_, 3 dec_octave - notetype1 9 + channel_volume 9 note C_, 1 rest 1 - notetype1 8 + channel_volume 8 note A_, 1 inc_octave - notetype2 4 + fade_wave 4 note C_, 1 dec_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note A#, 3 note B_, 16 rest 7 note A#, 3 note B_, 10 dec_octave - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note B_, 1 inc_octave - notetype1 8 + channel_volume 8 note B_, 1 rest 1 note A_, 1 dec_octave - notetype1 9 + channel_volume 9 note B_, 1 inc_octave - notetype1 8 + channel_volume 8 note B_, 3 - notetype1 9 + channel_volume 9 note D_, 1 rest 1 - notetype1 8 + channel_volume 8 note B_, 1 inc_octave - notetype2 4 + fade_wave 4 note D_, 1 sound_ret Branch_fbb10: octave 3 - notetype0 13 - notetype1 8 + speed 13 + channel_volume 8 note C_, 1 - notetype2 3 + fade_wave 3 note D_, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note C_, 1 - notetype1 8 + channel_volume 8 note B_, 2 - notetype2 3 + fade_wave 3 note A_, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note C_, 1 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D#, 3 note E_, 10 ;tie - notetype0 13 + speed 13 note E_, 2 - notetype1 9 + channel_volume 9 note D_, 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 8 - notetype1 7 + channel_volume 7 note F_, 5 note G_, 4 note F_, 4 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 note D_, 13 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 - notetype1 7 + channel_volume 7 note D_, 13 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 8 - notetype1 7 + channel_volume 7 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 dec_octave - notetype0 13 - notetype1 7 + speed 13 + channel_volume 7 note E_, 4 inc_octave inc_octave - notetype0 1 + speed 1 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 dec_octave - notetype1 7 + channel_volume 7 note B_, 13 inc_octave note C_, 5 - notetype1 2 + channel_volume 2 note C_, 8 dec_octave - notetype1 7 + channel_volume 7 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 8 - notetype1 7 + channel_volume 7 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 8 dec_octave dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note B_, 3 inc_octave note C_, 10 - notetype0 13 - notetype2 3 + speed 13 + fade_wave 3 note D_, 1 note E_, 1 - notetype2 8 + fade_wave 8 note F_, 2 sound_ret Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 96 ;cutoff 8 octave 2 @@ -2765,7 +2765,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note G_, 7 ; ;sound_call Branch_fbc46 - notetype0 1 + speed 1 octave 3 sound_call Branch_fbd47 sound_call Branch_fbe23 @@ -2812,10 +2812,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) ;cutoff 8 note G_, 13 ;tie - notetype0 13 + speed 13 note G_, 7 rest 1 - notetype0 1 + speed 1 sound_call Branch_fbd47 sound_call Branch_fbd58 sound_call Branch_fbd6b @@ -2859,10 +2859,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 note A_, 6 rest 7 - notetype0 13 + speed 13 note B_, 2 note G_, 1 - notetype0 1 + speed 1 sound_call Branch_fbd47 sound_call Branch_fbd58 sound_call Branch_fbd6b @@ -2962,7 +2962,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note B_, 13 ; ;sound_call Branch_fbc46 - notetype0 1 + speed 1 octave 3 sound_call Branch_fbd47 sound_call Branch_fbe23 @@ -3009,10 +3009,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) ;cutoff 8 note G_, 13 ;tie - notetype0 13 + speed 13 note G_, 7 rest 1 - notetype0 1 + speed 1 sound_call Branch_fbd47 sound_call Branch_fbd58 sound_call Branch_fbd6b @@ -3056,10 +3056,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 note A_, 6 rest 7 - notetype0 13 + speed 13 note B_, 2 note G_, 1 - notetype0 1 + speed 1 sound_call Branch_fbd47 sound_call Branch_fbd58 sound_call Branch_fbd6b @@ -3101,7 +3101,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note A#, 6 rest 7 ; - notetype0 1 + speed 1 octave 2 .Loop5 note G#, 6 @@ -3152,7 +3152,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 note G_, 6 rest 7 - notetype0 13 + speed 13 note C_, 8 ;tie note C_, 1 diff --git a/crysaudio/music/TCG/deckmachine.asm b/crysaudio/music/TCG/deckmachine.asm index 3c4f29f6..cf1ff9b5 100644 --- a/crysaudio/music/TCG/deckmachine.asm +++ b/crysaudio/music/TCG/deckmachine.asm @@ -7,112 +7,112 @@ Music_DeckMachine: Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 3 .MainLoop octave 5 - notetype0 1 + speed 1 .Loop1 - notetype2 6 - notetype1 9 + fade_wave 6 + channel_volume 9 note C_, 7 - notetype1 3 + channel_volume 3 note C_, 8 - notetype1 4 + channel_volume 4 note C_, 8 - notetype1 9 + channel_volume 9 note G_, 7 - notetype1 3 + channel_volume 3 note G_, 8 - notetype1 4 + channel_volume 4 note C_, 7 - notetype1 9 + channel_volume 9 note E_, 7 - notetype1 3 + channel_volume 3 note E_, 8 - notetype1 4 + channel_volume 4 note E_, 8 - notetype1 9 + channel_volume 9 note C_, 7 - notetype1 3 + channel_volume 3 note C_, 8 - notetype1 4 + channel_volume 4 note C_, 7 - notetype1 9 + channel_volume 9 note G_, 7 - notetype1 3 + channel_volume 3 note G_, 8 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 7 - notetype2 5 - notetype1 4 + fade_wave 5 + channel_volume 4 note G_, 8 sound_loop 9, .Loop1 - notetype1 9 + channel_volume 9 note C_, 7 - notetype1 3 + channel_volume 3 note C_, 8 - notetype1 4 + channel_volume 4 note C_, 15 - notetype0 10 + speed 10 rest 9 sound_loop 0, .MainLoop Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 1 - notetype2 7 + fade_wave 7 .MainLoop octave 3 - notetype0 1 + speed 1 .Loop1 rest 15 - notetype1 11 + channel_volume 11 rest 7 note C_, 8 - notetype1 2 + channel_volume 2 note C_, 8 rest 7 - notetype1 11 + channel_volume 11 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 8 rest 7 - notetype1 11 + channel_volume 11 dec_octave note A_, 8 - notetype1 2 + channel_volume 2 note A_, 8 rest 7 inc_octave - notetype1 11 + channel_volume 11 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 8 rest 15 sound_loop 9, .Loop1 - notetype1 11 + channel_volume 11 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 8 rest 15 - notetype0 10 + speed 10 rest 9 sound_loop 0, .MainLoop Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 96 ;cutoff 8 .MainLoop octave 3 - notetype0 1 + speed 1 .Loop1 note C_, 7 rest 8 @@ -217,9 +217,9 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 note C_, 15 rest 15 - notetype0 10 + speed 10 rest 3 - notetype0 1 + speed 1 rest 7 dec_octave note G_, 15 diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index 12eab8cf..e9529cd8 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -6,11 +6,11 @@ Music_DuelTheme1: channel 4, Music_DuelTheme1_Ch4 Music_DuelTheme1_Ch1: ; f532a (3d:532a) - notetype0 7 + speed 7 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 2 .MainLoop octave 2 @@ -21,129 +21,129 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) .Loop2 rest 3 sound_call Branch_f54f9 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 1 rest 2 inc_octave - notetype1 10 + channel_volume 10 note D_, 10 - notetype1 3 + channel_volume 3 note D_, 12 sound_call Branch_f54f9 - notetype1 10 + channel_volume 10 note F#, 2 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note A_, 13 - notetype1 3 + channel_volume 3 note A_, 10 - notetype1 10 + channel_volume 10 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note F#, 1 note G_, 1 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 15 - notetype1 3 + channel_volume 3 note B_, 4 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 3 note A_, 3 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note G_, 2 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 15 - notetype1 3 + channel_volume 3 note A_, 4 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 3 note G_, 4 note F#, 2 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 15 - notetype1 3 + channel_volume 3 note G_, 4 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 3 note F#, 4 note E_, 3 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 4 note E_, 3 ;tie - notetype0 7 + speed 7 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note D_, 13 - notetype1 3 + channel_volume 3 note D_, 9 dec_octave sound_loop 2, .Loop2 inc_octave duty_cycle 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 1 rest 1 note D_, 1 @@ -151,50 +151,50 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note C#, 1 rest 1 sound_call Branch_f5538 - notetype0 1 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note F#, 5 - notetype1 3 + channel_volume 3 note F#, 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 1 inc_octave - notetype0 1 + speed 1 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 10 + channel_volume 10 note F#, 4 - notetype1 3 + channel_volume 3 note F#, 3 - notetype1 10 + channel_volume 10 note A_, 4 - notetype1 3 + channel_volume 3 note A_, 3 - notetype0 7 + speed 7 rest 3 dec_octave duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 .Loop3 note A_, 1 rest 2 sound_loop 3, .Loop3 inc_octave - notetype0 1 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 1 rest 1 note D_, 1 @@ -202,52 +202,52 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note C#, 1 rest 1 sound_call Branch_f5538 - notetype0 1 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 5 ;tie note A_, 10 ;tie note A_, 6 - notetype1 3 + channel_volume 3 note A_, 2 inc_octave - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 2 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 10 + channel_volume 10 note A_, 13 ;tie note A_, 6 - notetype1 3 + channel_volume 3 note A_, 2 dec_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note A_, 5 inc_octave note C#, 5 @@ -266,7 +266,7 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note A_, 4 dec_octave sound_call Branch_f5580 - notetype1 10 + channel_volume 10 note A_, 2 ;tie note A_, 8 @@ -275,13 +275,13 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) ;tie note A_, 6 duty_cycle 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 dec_octave note B_, 4 inc_octave note C_, 3 - notetype0 7 + speed 7 note C#, 1 rest 1 note C#, 1 @@ -290,50 +290,50 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note G_, 2 duty_cycle 2 sound_call Branch_f5580 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 5 note G_, 2 note F#, 2 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 + channel_volume 10 note E_, 2 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 5 note F#, 2 note E_, 2 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note D_, 2 - notetype1 3 + channel_volume 3 note D_, 2 - notetype1 10 + channel_volume 10 note D_, 8 ;tie note D_, 8 note D_, 8 ;tie note D_, 8 - notetype1 3 + channel_volume 3 note D_, 2 - notetype1 10 + channel_volume 10 note D_, 12 - notetype1 3 + channel_volume 3 note D_, 2 - notetype1 10 + channel_volume 10 note D_, 6 ;tie note D_, 8 @@ -342,48 +342,48 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) Branch_f54f9: octave 2 - notetype1 10 + channel_volume 10 note A_, 1 note B_, 1 inc_octave note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 10 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 + channel_volume 10 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 4 note E_, 3 ;tie - notetype0 7 + speed 7 note E_, 5 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 2 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 sound_ret @@ -396,26 +396,26 @@ Branch_f5538: note G_, 1 rest 2 duty_cycle 2 - notetype1 10 + channel_volume 10 note G_, 1 inc_octave - notetype0 1 + speed 1 note C_, 4 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 10 + channel_volume 10 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 10 + channel_volume 10 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype0 7 + speed 7 rest 3 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 dec_octave .Loop4 note G_, 1 @@ -423,108 +423,108 @@ Branch_f5538: sound_loop 3, .Loop4 inc_octave duty_cycle 2 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 2 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 sound_ret Branch_f5580: - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 9 - notetype1 3 + channel_volume 3 note F#, 2 - notetype1 10 + channel_volume 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note B_, 2 - notetype1 3 + channel_volume 3 note B_, 2 inc_octave - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 7 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C#, 2 - notetype1 3 + channel_volume 3 note C#, 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 8 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 10 + channel_volume 10 note A_, 4 note G_, 4 note F#, 10 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note D_, 10 note E_, 2 note F#, 2 - notetype1 3 + channel_volume 3 note F#, 2 sound_ret Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) - notetype0 7 + speed 7 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop duty_cycle 1 - notetype1 9 + channel_volume 9 octave 2 .Loop1 ;rept 3 @@ -552,8 +552,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note D_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 2 sound_call Branch_f59f9 sound_loop 4, .Loop2 @@ -563,8 +563,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 sound_call Branch_f59f9 octave 2 @@ -573,13 +573,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note C_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -587,13 +587,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 1 rest 2 inc_octave @@ -604,8 +604,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 sound_call Branch_f59f9 sound_loop 3, .Loop3 @@ -615,13 +615,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note C_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -629,13 +629,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 1 rest 2 inc_octave @@ -644,8 +644,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 sound_call Branch_f59f9 octave 2 @@ -654,24 +654,24 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note F#, 1 rest 1 .Loop4 @@ -679,23 +679,23 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note G_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note G_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 2 sound_loop 2, .Loop4 @@ -703,8 +703,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note F#, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 inc_octave note C#, 2 sound_call Branch_f5a17 @@ -714,66 +714,66 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note F#, 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note E_, 2 sound_call Branch_f5a17 note E_, 1 rest 2 note E_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note B_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note G_, 1 rest 2 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note A_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note A_, 1 rest 2 note D_, 1 rest 2 note D_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -781,13 +781,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 1 rest 2 inc_octave @@ -795,12 +795,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note D_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -808,46 +808,46 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 ;frequency_offset 0 note E_, 1 note F#, 1 note A_, 1 rest 1 - notetype1 7 + channel_volume 7 sound_call Branch_f594d - notetype1 7 + channel_volume 7 octave 3 - notetype0 1 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 1 rest 1 dec_octave note F#, 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 2 - notetype1 7 - notetype2 8 + channel_volume 7 + fade_wave 8 note A_, 10 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 inc_octave note D_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -855,185 +855,185 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 1 note F#, 1 note A_, 1 rest 1 sound_call Branch_f594d - notetype1 7 + channel_volume 7 octave 3 note D_, 2 rest 1 note F#, 13 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 inc_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note D_, 1 rest 1 note D_, 1 note E_, 1 note F#, 1 rest 1 - notetype0 1 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 15 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note G_, 1 rest 2 note G_, 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 2 rest 1 note F#, 3 rest 1 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 15 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note F#, 1 rest 2 note F#, 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 2 rest 1 note E_, 3 rest 1 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note D#, 4 note E_, 3 ;tie - notetype0 7 + speed 7 note E_, 15 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note A#, 4 note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 2 rest 1 note A_, 3 rest 1 note G_, 3 rest 1 - notetype0 1 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 1 rest 1 note F#, 13 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 2 note D_, 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 2 dec_octave ;frequency_offset 0 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 2 sound_call Branch_f59b4 octave 3 - notetype0 1 - notetype1 7 + speed 1 + channel_volume 7 note F_, 4 note F#, 3 ;tie - notetype0 7 + speed 7 note F#, 1 rest 1 note D_, 5 rest 1 dec_octave note F#, 1 - notetype0 1 + speed 1 note A_, 4 rest 3 inc_octave @@ -1041,28 +1041,28 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 3 note F#, 4 rest 3 - notetype0 7 + speed 7 rest 3 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 .Loop5 note D_, 1 rest 2 sound_loop 3, .Loop5 sound_call Branch_f59b4 - notetype1 8 + channel_volume 8 octave 3 note D_, 16 ;tie note D_, 6 rest 2 - notetype0 1 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 2 note A_, 1 rest 2 @@ -1074,8 +1074,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note C#, 6 rest 2 dec_octave - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note E_, 5 note A_, 5 inc_octave @@ -1095,7 +1095,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note C#, 5 note E_, 4 dec_octave - notetype0 7 + speed 7 sound_call Branch_f598c note D_, 8 ;tie @@ -1103,11 +1103,11 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note C#, 6 dec_octave duty_cycle 1 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 4 note G#, 3 - notetype0 7 + speed 7 note A_, 1 rest 1 note A_, 1 @@ -1145,54 +1145,54 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) Branch_f594d: octave 3 - notetype0 1 + speed 1 note C#, 4 note D_, 3 ;tie - notetype0 7 + speed 7 note D_, 9 dec_octave duty_cycle 1 - notetype1 9 + channel_volume 9 dec_octave note A_, 1 rest 1 inc_octave duty_cycle 2 - notetype1 7 + channel_volume 7 note A_, 3 rest 1 inc_octave note C_, 6 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 1 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note D#, 4 note E_, 3 ;tie - notetype0 7 + speed 7 note E_, 2 note D_, 1 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 2 inc_octave - notetype1 7 - notetype2 8 + channel_volume 7 + fade_wave 8 note C_, 1 rest 1 sound_ret Branch_f598c: - notetype1 8 + channel_volume 8 note D_, 10 rest 2 note E_, 1 @@ -1234,12 +1234,12 @@ Branch_f598c: Branch_f59b4: octave 2 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note G#, 4 note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 1 rest 1 note A_, 1 @@ -1253,9 +1253,9 @@ Branch_f59b4: note C_, 1 rest 2 duty_cycle 2 - notetype1 7 + channel_volume 7 note E_, 1 - notetype0 1 + speed 1 note G_, 4 rest 3 inc_octave @@ -1263,24 +1263,24 @@ Branch_f59b4: rest 3 note E_, 4 rest 3 - notetype0 7 + speed 7 rest 3 - notetype2 8 + fade_wave 8 dec_octave duty_cycle 1 - notetype1 8 + channel_volume 8 .Loop6 note C_, 1 rest 2 sound_loop 3, .Loop6 inc_octave duty_cycle 2 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F#, 4 note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 2 note F#, 1 rest 1 @@ -1291,8 +1291,8 @@ Branch_f59b4: Branch_f59f9: octave 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 1 rest 3 dec_octave @@ -1300,13 +1300,13 @@ Branch_f59f9: rest 1 inc_octave duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 dec_octave duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 1 rest 2 sound_ret @@ -1314,29 +1314,29 @@ Branch_f59f9: Branch_f5a17: octave 2 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note F#, 1 rest 3 note C#, 1 rest 1 duty_cycle 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 1 rest 2 sound_ret Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype1 1 - notetype2 14 + channel_volume 1 + fade_wave 14 ;echo 96 ;cutoff 8 octave 2 @@ -1439,7 +1439,7 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) sound_loop 3, .Loop3 inc_octave note D_, 1 - notetype0 1 + speed 1 note F#, 4 rest 3 note A_, 4 @@ -1447,7 +1447,7 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) inc_octave note D_, 4 rest 3 - notetype0 7 + speed 7 rest 3 dec_octave dec_octave @@ -1867,7 +1867,7 @@ Branch_f5c7e: sound_loop 3, .Loop9 inc_octave note C_, 1 - notetype0 1 + speed 1 note E_, 4 rest 3 note G_, 4 @@ -1875,7 +1875,7 @@ Branch_f5c7e: inc_octave note C_, 4 rest 3 - notetype0 7 + speed 7 rest 3 dec_octave dec_octave diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm index a8493ac3..826f97fe 100644 --- a/crysaudio/music/TCG/dueltheme2.asm +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -6,14 +6,14 @@ Music_DuelTheme2: channel 4, Music_DuelTheme2_Ch4 Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) - notetype0 9 + speed 9 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 1 duty_cycle 1 - notetype1 9 + channel_volume 9 .Loop1 note D_, 2 note D_, 1 @@ -25,10 +25,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 23, .Loop2 duty_cycle 1 - notetype1 10 + channel_volume 10 inc_octave inc_octave - notetype0 1 + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -38,62 +38,62 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note B_, 3 inc_octave note C_, 3 - notetype0 9 + speed 9 sound_call Branch_f5f3d note C_, 6 ;tie - notetype0 1 + speed 1 note C_, 12 - notetype1 3 + channel_volume 3 note C_, 6 - notetype1 10 + channel_volume 10 dec_octave note B_, 12 - notetype1 3 + channel_volume 3 note B_, 6 - notetype1 10 + channel_volume 10 note G_, 12 - notetype1 3 + channel_volume 3 note G_, 6 - notetype0 9 - notetype1 10 - notetype2 8 + speed 9 + channel_volume 10 + fade_wave 8 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note D_, 9 ;tie note D_, 9 - notetype1 4 + channel_volume 4 note D_, 3 duty_cycle 2 - notetype2 8 - notetype1 3 + fade_wave 8 + channel_volume 3 note E_, 4 - notetype1 6 + channel_volume 6 note E_, 7 - notetype1 2 + channel_volume 2 note E_, 1 - notetype1 6 + channel_volume 6 note G_, 4 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note G_, 12 - notetype1 2 + channel_volume 2 note G_, 6 inc_octave - notetype0 9 - notetype1 8 - notetype2 8 + speed 9 + channel_volume 8 + fade_wave 8 note C_, 3 duty_cycle 1 - notetype1 10 + channel_volume 10 dec_octave - notetype0 1 + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -103,63 +103,63 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note B_, 3 inc_octave note C_, 3 - notetype0 9 + speed 9 sound_call Branch_f5f3d - notetype2 8 + fade_wave 8 note C_, 4 ;tie - notetype0 1 + speed 1 note C_, 4 note E_, 5 note F_, 4 note F#, 5 note G_, 12 - notetype1 3 + channel_volume 3 note G_, 6 - notetype1 10 + channel_volume 10 note E_, 12 - notetype1 3 + channel_volume 3 note E_, 6 - notetype0 9 - notetype1 10 - notetype2 8 + speed 9 + channel_volume 10 + fade_wave 8 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note A_, 1 inc_octave - notetype2 8 + fade_wave 8 note D_, 9 ;tie note D_, 10 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 - notetype0 1 - notetype2 8 + channel_volume 10 + speed 1 + fade_wave 8 note D_, 4 note D#, 5 - notetype0 9 + speed 9 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 inc_octave - notetype2 8 + fade_wave 8 note C_, 3 dec_octave - notetype0 1 + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -171,10 +171,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 sound_call Branch_f5f90 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 1 note D_, 1 .Loop3 @@ -182,7 +182,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 3, .Loop3 duty_cycle 2 - notetype1 7 + channel_volume 7 inc_octave inc_octave note G_, 1 @@ -197,104 +197,104 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 note B_, 1 duty_cycle 1 - notetype1 10 + channel_volume 10 sound_call Branch_f5f62 octave 4 - notetype1 4 + channel_volume 4 note F#, 12 - notetype1 10 + channel_volume 10 note C#, 9 - notetype1 4 + channel_volume 4 note C#, 1 - notetype1 10 + channel_volume 10 note C#, 1 note D_, 1 note E_, 3 note D_, 3 note C#, 3 dec_octave - notetype2 6 + fade_wave 6 note B_, 3 - notetype2 8 + fade_wave 8 note B_, 4 - notetype1 4 + channel_volume 4 note B_, 1 inc_octave - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note C#, 4 dec_octave note B_, 5 - notetype0 9 + speed 9 note A_, 6 - notetype1 4 + channel_volume 4 note A_, 1 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 2 note D_, 2 rest 2 note C#, 2 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 sound_call Branch_f5f62 octave 4 - notetype1 4 + channel_volume 4 note F#, 6 dec_octave - notetype1 10 + channel_volume 10 note B_, 2 inc_octave note C#, 2 note D_, 1 - notetype1 4 + channel_volume 4 note D_, 1 - notetype1 10 + channel_volume 10 note D_, 9 - notetype1 4 + channel_volume 4 note D_, 1 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 note C#, 1 note D_, 1 - notetype2 8 + fade_wave 8 note E_, 3 note D_, 3 note C#, 3 dec_octave - notetype2 6 + fade_wave 6 note A_, 3 inc_octave - notetype2 8 + fade_wave 8 note F_, 10 - notetype2 7 + fade_wave 7 note E_, 1 note F_, 1 - notetype2 8 + fade_wave 8 note G_, 3 note F_, 3 note E_, 3 - notetype0 1 + speed 1 note C_, 2 ;tie note C_, 16 - notetype1 4 + channel_volume 4 note C_, 9 - notetype0 9 - notetype1 10 - notetype2 8 + speed 9 + channel_volume 10 + fade_wave 8 note A_, 10 - notetype2 7 + fade_wave 7 note G_, 1 note F_, 1 - notetype2 8 + fade_wave 8 note G_, 6 inc_octave note C_, 3 dec_octave - notetype0 1 + speed 1 note C_, 3 note D_, 4 note E_, 3 @@ -306,10 +306,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 sound_call Branch_f5f90 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 1 note D_, 1 .Loop4 @@ -317,8 +317,8 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 3, .Loop4 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 octave 5 note D_, 1 note C_, 1 @@ -339,42 +339,42 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) ;tie note D_, 12 duty_cycle 1 - notetype1 9 + channel_volume 9 sound_loop 0, .MainLoop Branch_f5f3d: - notetype2 8 + fade_wave 8 note D_, 12 ;tie note D_, 4 ;tie - notetype0 1 + speed 1 note D_, 7 - notetype1 4 + channel_volume 4 note D_, 2 ;tie - notetype0 9 + speed 9 note D_, 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 4 ;tie - notetype0 1 + speed 1 note A_, 7 - notetype1 4 + channel_volume 4 note A_, 2 ;tie - notetype0 9 + speed 9 note A_, 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 12 ;tie sound_ret Branch_f5f62: octave 3 - notetype0 1 + speed 1 note C#, 3 note D_, 4 note E_, 3 @@ -384,16 +384,16 @@ Branch_f5f62: note B_, 3 inc_octave note C#, 3 - notetype0 9 + speed 9 note D_, 2 note C#, 2 dec_octave note A_, 2 note F#, 5 - notetype1 4 + channel_volume 4 note F#, 1 inc_octave - notetype1 10 + channel_volume 10 note D_, 2 note C#, 2 dec_octave @@ -402,25 +402,25 @@ Branch_f5f62: note G_, 2 note A_, 2 note B_, 1 - notetype1 4 + channel_volume 4 note B_, 1 - notetype1 10 + channel_volume 10 inc_octave - notetype2 6 + fade_wave 6 note F#, 1 - notetype2 8 + fade_wave 8 note F#, 9 sound_ret Branch_f5f90: octave 5 - notetype0 9 + speed 9 .Loop5 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 1 note D_, 1 ;rept 5 @@ -441,7 +441,7 @@ Branch_f5f90: ;endr note D_, 2 duty_cycle 1 - notetype1 10 + channel_volume 10 octave 5 note C_, 4 sound_loop 3, .Loop5 @@ -449,14 +449,14 @@ Branch_f5f90: Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) - notetype0 9 + speed 9 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 15, 3, 3 - notetype2 8 + fade_wave 8 octave 2 duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 .Loop1 note D_, 2 @@ -468,7 +468,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 sound_loop 24, .Loop2 duty_cycle 2 - notetype1 7 + channel_volume 7 ;frequency_offset 0 .Loop3 inc_octave @@ -489,17 +489,17 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note C_, 1 note G_, 1 duty_cycle 1 - notetype1 7 + channel_volume 7 dec_octave note D_, 1 rest 1 dec_octave - notetype2 6 + fade_wave 6 note A_, 1 - notetype2 8 + fade_wave 8 note A_, 9 duty_cycle 2 - notetype1 7 + channel_volume 7 .Loop5 note A_, 1 note D_, 1 @@ -507,25 +507,25 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) sound_loop 4, .Loop5 duty_cycle 2 inc_octave - notetype2 8 - notetype1 3 + fade_wave 8 + channel_volume 3 note C_, 4 - notetype1 6 + channel_volume 6 note C_, 7 rest 1 - notetype1 6 + channel_volume 6 note E_, 4 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note E_, 12 rest 6 - notetype0 9 - notetype1 8 + speed 9 + channel_volume 8 note G_, 3 dec_octave duty_cycle 1 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 3 note A_, 4 note B_, 3 @@ -535,9 +535,9 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note E_, 4 note F_, 3 note G_, 3 - notetype0 9 + speed 9 duty_cycle 2 - notetype1 7 + channel_volume 7 .Loop6 note A_, 1 note D_, 1 @@ -552,42 +552,42 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note G_, 1 note C_, 1 sound_loop 8, .Loop8 - notetype0 1 + speed 1 note G_, 4 duty_cycle 1 - notetype1 7 + channel_volume 7 inc_octave note C_, 5 note D_, 4 note D#, 5 - notetype0 1 + speed 1 note E_, 12 rest 6 note C_, 12 rest 6 - notetype0 9 + speed 9 dec_octave note G_, 1 rest 1 note A_, 1 rest 1 - notetype2 6 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note A_, 9 duty_cycle 2 - notetype1 7 + channel_volume 7 .Loop9 note A_, 1 note D_, 1 sound_loop 5, .Loop9 note A_, 1 duty_cycle 1 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note A#, 4 note B_, 5 - notetype0 9 + speed 9 inc_octave note C_, 11 rest 1 @@ -595,7 +595,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) rest 1 note G_, 3 dec_octave - notetype0 1 + speed 1 note G_, 3 note A_, 4 note B_, 3 @@ -609,7 +609,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 1 rest 1 duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 dec_octave dec_octave @@ -619,7 +619,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 sound_loop 3, .Loop10 duty_cycle 2 - notetype1 7 + channel_volume 7 ;frequency_offset 0 inc_octave note E_, 1 @@ -638,7 +638,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave note C#, 1 duty_cycle 2 - notetype1 7 + channel_volume 7 sound_call Branch_f6173 octave 4 .Loop11 @@ -666,21 +666,21 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave sound_loop 2, .Loop12 duty_cycle 1 - notetype1 9 + channel_volume 9 octave 2 rest 1 - notetype2 8 + fade_wave 8 note B_, 2 note B_, 2 rest 2 note A_, 2 inc_octave - notetype2 8 + fade_wave 8 note C#, 1 note D_, 1 note E_, 1 duty_cycle 2 - notetype1 7 + channel_volume 7 sound_call Branch_f6173 octave 3 .Loop13 @@ -768,9 +768,9 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave note C_, 1 duty_cycle 1 - notetype1 7 + channel_volume 7 dec_octave - notetype0 1 + speed 1 note G_, 3 note A_, 4 note B_, 3 @@ -784,7 +784,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 1 rest 1 duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 dec_octave dec_octave @@ -795,7 +795,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) sound_loop 3, .Loop17 rest 12 duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 0 inc_octave note A_, 12 @@ -803,7 +803,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 12 dec_octave duty_cycle 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 sound_loop 0, .MainLoop @@ -837,11 +837,11 @@ Branch_f6173: Branch_f618f: octave 4 - notetype0 9 + speed 9 .Loop20 note A_, 1 rest 1 - notetype1 7 + channel_volume 7 ;frequency_offset 5 dec_octave dec_octave @@ -863,7 +863,7 @@ Branch_f618f: note D_, 1 ;endr note D_, 2 - notetype1 7 + channel_volume 7 ;frequency_offset 0 inc_octave inc_octave @@ -873,10 +873,10 @@ Branch_f618f: Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) - notetype0 9 + speed 9 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 64 ;cutoff 7 octave 2 diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm index f8b2974b..283c8ce6 100644 --- a/crysaudio/music/TCG/dueltheme3.asm +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -6,102 +6,102 @@ Music_DuelTheme3: channel 4, Music_DuelTheme3_Ch4 Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) - notetype0 11 + speed 11 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop octave 2 duty_cycle 0 .Loop1 ;rept 4 - notetype1 9 + channel_volume 9 note F#, 2 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 2 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 2 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 2 rest 1 ;endr - notetype1 9 + channel_volume 9 note E_, 2 - notetype1 9 + channel_volume 9 note F_, 2 sound_loop 4, .Loop1 .Loop2 sound_call Branch_f67b2 sound_loop 4, .Loop2 duty_cycle 1 - notetype1 10 + channel_volume 10 .Loop3 octave 3 note C#, 1 note F#, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 sound_call Branch_f65a7 octave 3 note D_, 1 note F#, 1 - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 sound_call Branch_f65a7 sound_loop 2, .Loop3 duty_cycle 0 - notetype1 10 + channel_volume 10 dec_octave rest 2 - notetype0 1 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 sound_call Branch_f65cf note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype0 11 + speed 11 rest 1 dec_octave duty_cycle 0 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 sound_call Branch_f65cf - notetype0 11 + speed 11 duty_cycle 1 - notetype1 10 + channel_volume 10 .Loop4 octave 3 note C#, 1 note F#, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 sound_call Branch_f65a7 octave 3 note D_, 1 note F#, 1 - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype1 10 + channel_volume 10 sound_call Branch_f65a7 sound_loop 2, .Loop4 vibrato 10, 3, 3 @@ -109,380 +109,380 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) .Loop5 octave 2 rest 4 - notetype1 9 + channel_volume 9 note F#, 2 - notetype1 2 + channel_volume 2 note F#, 2 rest 2 - notetype1 9 + channel_volume 9 note E_, 2 - notetype1 2 + channel_volume 2 note E_, 4 - notetype1 9 + channel_volume 9 note D#, 2 - notetype1 2 + channel_volume 2 note D#, 4 - notetype1 9 + channel_volume 9 note D_, 2 note C#, 2 sound_loop 2, .Loop5 vibrato 20, 3, 3 duty_cycle 2 - notetype2 6 + fade_wave 6 .Loop6 sound_call Branch_f661d sound_loop 4, .Loop6 octave 4 - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 .Loop7 sound_call Branch_f661d sound_loop 3, .Loop7 octave 4 - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 inc_octave - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 dec_octave - notetype0 11 + speed 11 duty_cycle 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note D_, 2 note C#, 2 dec_octave note F#, 3 inc_octave - notetype0 1 + speed 1 note D_, 3 note D#, 2 note E_, 3 note F_, 3 - notetype0 11 + speed 11 note F#, 4 dec_octave note G#, 3 inc_octave - notetype0 1 + speed 1 note E_, 3 note F_, 2 note F#, 3 note G_, 3 - notetype0 11 + speed 11 note G#, 4 duty_cycle 0 octave 2 .Loop8 ;rept 4 - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 - notetype1 9 + channel_volume 9 note F#, 1 - notetype1 3 + channel_volume 3 note F#, 1 ;rept 4 - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 9 + channel_volume 9 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 sound_loop 2, .Loop8 duty_cycle 1 - notetype1 10 + channel_volume 10 octave 3 note C#, 1 note F#, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 sound_call Branch_f65a7 octave 3 note C#, 1 note F#, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 inc_octave - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note C#, 9 - notetype1 3 + channel_volume 3 note C#, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 1 inc_octave note C#, 1 note F#, 1 note C#, 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype0 11 - notetype1 10 + speed 11 + channel_volume 10 note F#, 9 - notetype1 3 + channel_volume 3 note F#, 4 - notetype1 10 + channel_volume 10 note G#, 1 note A_, 1 - notetype0 1 + speed 1 note G#, 5 - notetype1 3 + channel_volume 3 note G#, 6 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note B_, 8 - notetype1 3 + channel_volume 3 note B_, 1 - notetype1 10 + channel_volume 10 note A_, 2 note B_, 1 ;tie - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype0 11 + speed 11 inc_octave - notetype1 10 + channel_volume 10 note C#, 1 note D_, 1 - notetype0 1 + speed 1 note C#, 5 - notetype1 3 + channel_volume 3 note C#, 6 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note D_, 1 - notetype0 1 + speed 1 note C#, 8 - notetype1 3 + channel_volume 3 note C#, 3 dec_octave - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note B_, 1 inc_octave note C#, 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype0 11 - notetype1 10 + speed 11 + channel_volume 10 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 2 + channel_volume 2 note A_, 3 - notetype1 6 + channel_volume 6 note A_, 5 inc_octave - notetype1 4 + channel_volume 4 note E_, 3 - notetype1 8 + channel_volume 8 note E_, 3 - notetype1 10 + channel_volume 10 note E_, 2 duty_cycle 1 .Loop9 ;rept 4 - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 9 + channel_volume 9 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 1 ;rept 4 - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 9 + channel_volume 9 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 sound_loop 4, .Loop9 sound_loop 0, .MainLoop Branch_f65a7: - notetype0 11 + speed 11 octave 4 - notetype1 10 + channel_volume 10 note C#, 5 ;tie note C#, 4 - notetype1 3 + channel_volume 3 note C#, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 1 inc_octave note C#, 1 note F#, 1 note C#, 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 6 - notetype0 11 - notetype1 10 + speed 11 + channel_volume 10 inc_octave note C#, 5 ;tie note C#, 4 - notetype1 3 + channel_volume 3 note C#, 4 - notetype1 10 + channel_volume 10 sound_ret Branch_f65cf: octave 3 .Loop10 - notetype0 11 + speed 11 rest 2 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 sound_loop 3, .Loop10 duty_cycle 2 - notetype1 8 + channel_volume 8 note D_, 5 note G_, 6 note B_, 5 @@ -495,29 +495,29 @@ Branch_f65cf: note D_, 5 note G_, 6 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 duty_cycle 0 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 dec_octave - notetype0 1 + speed 1 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 .Loop11 - notetype0 11 + speed 11 rest 2 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note E_, 5 - notetype1 2 + channel_volume 2 note E_, 6 sound_loop 3, .Loop11 dec_octave duty_cycle 2 - notetype1 8 + channel_volume 8 note B_, 5 inc_octave note E_, 6 @@ -532,78 +532,78 @@ Branch_f65cf: Branch_f661d: octave 4 - notetype0 1 - notetype1 7 + speed 1 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 inc_octave - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 inc_octave - notetype1 7 + channel_volume 7 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave - notetype1 7 + channel_volume 7 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 sound_ret Music_DuelTheme3_Ch2: ; f6649 (3d:6649) - notetype0 11 + speed 11 ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 .MainLoop octave 2 duty_cycle 0 ;frequency_offset 3 .Loop1 ;rept 4 - notetype1 8 + channel_volume 8 note F#, 2 rest 1 ;--- - notetype1 8 + channel_volume 8 note F#, 2 rest 1 ;--- - notetype1 8 + channel_volume 8 note F#, 2 rest 1 ;--- - notetype1 8 + channel_volume 8 note F#, 2 rest 1 ;endr - notetype1 8 + channel_volume 8 note E_, 2 - notetype1 8 + channel_volume 8 note F_, 2 sound_loop 4, .Loop1 ;frequency_offset 0 octave 3 .Loop2 rest 6 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 2 + channel_volume 2 note E_, 1 rest 8 sound_loop 4, .Loop2 @@ -620,36 +620,36 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) ;endr sound_loop 2, .Loop3 octave 2 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 - notetype0 1 + speed 1 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 sound_call Branch_f6866 octave 4 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave dec_octave duty_cycle 0 - notetype1 10 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 sound_call Branch_f6866 duty_cycle 0 - notetype1 9 + channel_volume 9 .Loop4 ;rept 2 sound_call Branch_f67b2 @@ -664,378 +664,378 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) sound_loop 2, .Loop4 vibrato 10, 3, 3 .Loop5 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 1 note F#, 1 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype2 6 - notetype0 11 + channel_volume 10 + fade_wave 6 + speed 11 note F#, 1 inc_octave - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note C#, 2 dec_octave - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 1 note F#, 1 - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype2 6 - notetype0 11 + channel_volume 10 + fade_wave 6 + speed 11 note F#, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 1 note F#, 1 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype2 6 - notetype0 11 + channel_volume 10 + fade_wave 6 + speed 11 note F#, 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note B_, 2 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F#, 1 note F#, 1 - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype2 6 - notetype0 11 + channel_volume 10 + fade_wave 6 + speed 11 note F#, 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note A_, 2 note G#, 2 sound_loop 4, .Loop5 vibrato 20, 3, 3 note D_, 3 - notetype0 1 + speed 1 note A#, 3 note B_, 2 inc_octave note C_, 3 note C#, 3 - notetype0 11 + speed 11 note D_, 4 dec_octave note E_, 3 inc_octave - notetype0 1 + speed 1 note C_, 3 note C#, 2 note D_, 3 note D#, 3 - notetype0 11 + speed 11 note E_, 4 octave 3 .Loop6 ;rept 4 - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 - notetype1 9 + channel_volume 9 note C#, 1 - notetype1 3 + channel_volume 3 note C#, 1 ;rept 4 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;endr - notetype1 9 + channel_volume 9 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 9 + channel_volume 9 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 sound_loop 6, .Loop6 duty_cycle 1 inc_octave .Loop7 ;rept 4 - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 ;endr - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 8 + channel_volume 8 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 ;rept 4 - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;--- - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 ;endr - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 8 + channel_volume 8 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 sound_loop 4, .Loop7 sound_loop 0, .MainLoop Branch_f67b2: octave 2 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 - notetype0 1 + speed 1 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 - notetype1 10 + channel_volume 10 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 - notetype0 1 + speed 1 note F#, 5 - notetype1 3 + channel_volume 3 note F#, 6 inc_octave - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note C_, 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 - notetype1 10 + channel_volume 10 note A_, 4 note B_, 4 note A_, 3 note F#, 5 - notetype1 2 + channel_volume 2 note F#, 6 - notetype0 11 - notetype1 9 + speed 11 + channel_volume 9 note E_, 1 - notetype1 10 + channel_volume 10 note F_, 1 sound_ret Branch_f680a: octave 2 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 - notetype0 1 + speed 1 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 6 - notetype1 10 + channel_volume 10 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 6 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 6 inc_octave - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 note C#, 1 - notetype0 1 + speed 1 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 6 - notetype1 10 - notetype0 11 + channel_volume 10 + speed 11 rest 1 dec_octave - notetype0 1 + speed 1 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 - notetype0 11 + speed 11 rest 1 inc_octave - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave - notetype1 10 + channel_volume 10 note B_, 4 inc_octave note C#, 4 dec_octave note B_, 3 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 6 - notetype0 11 - notetype1 9 + speed 11 + channel_volume 9 note B_, 1 - notetype1 10 + channel_volume 10 note G_, 1 sound_ret Branch_f6866: octave 2 .Loop8 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 sound_loop 3, .Loop8 duty_cycle 2 - notetype1 7 + channel_volume 7 note B_, 5 inc_octave note D_, 6 @@ -1047,34 +1047,34 @@ Branch_f6866: inc_octave note D_, 6 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 dec_octave dec_octave duty_cycle 0 - notetype1 10 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 .Loop9 - notetype0 11 + speed 11 rest 1 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note C#, 5 - notetype1 2 + channel_volume 2 note C#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 2 + channel_volume 2 note A_, 6 sound_loop 3, .Loop9 duty_cycle 2 - notetype1 7 + channel_volume 7 note G_, 5 note B_, 6 inc_octave @@ -1091,10 +1091,10 @@ Branch_f6866: Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) - notetype0 11 + speed 11 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 96 ;vibrato_type 8 vibrato 0, 3, 3 @@ -1171,7 +1171,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) octave 2 .Loop6 sound_call Branch_f69f0 - notetype0 11 + speed 11 octave 4 ;cutoff 8 note D_, 2 @@ -1186,23 +1186,23 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) note E_, 2 vibrato 0, 3, 3 note D_, 3 - notetype0 1 + speed 1 note A#, 3 note B_, 2 inc_octave note C_, 3 note C#, 3 - notetype0 11 + speed 11 note D_, 4 dec_octave note E_, 3 inc_octave - notetype0 1 + speed 1 note C_, 3 note C#, 2 note D_, 3 note D#, 3 - notetype0 11 + speed 11 note E_, 4 dec_octave .Loop7 diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm index e8535181..82a3f802 100644 --- a/crysaudio/music/TCG/hallofhonor.asm +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -5,9 +5,9 @@ Music_HallOfHonor: channel 3, Music_HallOfHonor_Ch3 Music_HallOfHonor_Ch1: ; fafea (3e:6fea) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 .Loop1 sound_call Branch_fb016 @@ -17,15 +17,15 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) sound_call Branch_fb016 sound_loop 8, .Loop2 octave 4 - notetype1 5 + channel_volume 5 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 sound_call Branch_fb044 .Loop3 - notetype1 5 + channel_volume 5 note C_, 1 - notetype1 2 + channel_volume 2 note G_, 1 sound_call Branch_fb044 sound_loop 23, .Loop3 @@ -33,82 +33,82 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) Branch_fb016: octave 4 - notetype1 6 + channel_volume 6 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 6 + channel_volume 6 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 6 + channel_volume 6 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 - notetype1 6 + channel_volume 6 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 1 inc_octave - notetype1 6 + channel_volume 6 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 dec_octave - notetype1 6 + channel_volume 6 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 6 + channel_volume 6 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 sound_ret Branch_fb044: octave 4 - notetype1 5 + channel_volume 5 note F_, 1 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 5 + channel_volume 5 note G_, 1 - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 5 + channel_volume 5 note F_, 1 - notetype1 2 + channel_volume 2 note G_, 1 inc_octave - notetype1 5 + channel_volume 5 note C_, 1 dec_octave - notetype1 2 + channel_volume 2 note F_, 1 - notetype1 5 + channel_volume 5 note F_, 1 inc_octave - notetype1 2 + channel_volume 2 note C_, 1 dec_octave - notetype1 5 + channel_volume 5 note G_, 1 - notetype1 2 + channel_volume 2 note F_, 1 sound_ret Music_HallOfHonor_Ch2: ; fb06e (3e:706e) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 ;frequency_offset -1 rest 2 - notetype0 1 + speed 1 rest 4 - notetype0 7 - notetype1 1 + speed 7 + channel_volume 1 .Loop1 sound_call Branch_fb1ec sound_loop 3, .Loop1 @@ -126,9 +126,9 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) rest 1 dec_octave note F_, 1 - notetype0 1 + speed 1 rest 3 - notetype0 7 + speed 7 ;frequency_offset 0 .MainLoop octave 1 @@ -136,18 +136,18 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) .Loop2 sound_call Branch_fb0bb octave 1 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 13 + channel_volume 13 note E_, 11 ;tie note E_, 12 sound_loop 3, .Loop2 sound_call Branch_fb0bb octave 1 - notetype1 7 + channel_volume 7 note G_, 5 - notetype1 13 + channel_volume 13 note G_, 11 ;tie note G_, 12 @@ -155,21 +155,21 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) Branch_fb0bb: octave 1 - notetype1 7 + channel_volume 7 note F_, 5 - notetype1 13 + channel_volume 13 note F_, 11 ;tie note F_, 12 - notetype1 7 + channel_volume 7 note E_, 5 - notetype1 13 + channel_volume 13 note E_, 11 ;tie note E_, 12 - notetype1 7 + channel_volume 7 note D_, 5 - notetype1 13 + channel_volume 13 note D_, 11 ;tie note D_, 12 @@ -177,16 +177,16 @@ Branch_fb0bb: Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) - notetype0 7 - notetype1 2 + speed 7 + channel_volume 2 ;stereo_panning 1, 1 - notetype2 12 + fade_wave 12 ;vibrato_type 4 vibrato 35, 2, 4 ;cutoff 6 ;echo 64 rest 3 - notetype1 3 + channel_volume 3 ;cutoff 8 ;frequency_offset -1 .Loop1 @@ -210,16 +210,16 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) rest 1 dec_octave note F_, 1 - notetype1 1 + channel_volume 1 ;frequency_offset 0 octave 5 - notetype0 1 + speed 1 ;cutoff 6 note B_, 3 inc_octave note C_, 4 ;tie - notetype0 7 + speed 7 note C_, 15 ;tie note C_, 8 @@ -233,14 +233,14 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 10 ;tie note C_, 12 - notetype0 1 + speed 1 ;cutoff 8 note B_, 3 inc_octave ;cutoff 6 note C_, 4 ;tie - notetype0 7 + speed 7 note C_, 15 ;tie note C_, 6 @@ -252,13 +252,13 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) ;cutoff 4 note D_, 2 dec_octave - notetype0 1 + speed 1 ;cutoff 8 note F#, 3 ;cutoff 6 note G_, 4 ;tie - notetype0 7 + speed 7 note G_, 15 ;tie note G_, 6 @@ -267,13 +267,13 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note A_, 2 ;cutoff 4 note B_, 2 - notetype0 1 + speed 1 ;cutoff 8 note B_, 3 inc_octave note C_, 4 ;tie - notetype0 7 + speed 7 note C_, 15 ;tie note C_, 8 @@ -284,13 +284,13 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) ;cutoff 6 note G_, 6 ;cutoff 8 - notetype0 1 + speed 1 note B_, 3 inc_octave ;cutoff 6 note C_, 4 ;tie - notetype0 7 + speed 7 note C_, 9 ;tie note C_, 6 @@ -301,12 +301,12 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 2 ;cutoff 4 note E_, 2 - notetype0 1 + speed 1 ;cutoff 8 note E_, 3 note F_, 4 ;tie - notetype0 7 + speed 7 note F_, 1 note E_, 2 ;cutoff 4 @@ -317,12 +317,12 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 10 ;cutoff 4 note E_, 2 - notetype0 1 + speed 1 ;cutoff 8 note E_, 3 note F_, 4 ;tie - notetype0 7 + speed 7 note F_, 1 note E_, 2 ;cutoff 4 @@ -331,13 +331,13 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) note C_, 10 ;tie note C_, 12 - notetype0 1 + speed 1 ;cutoff 8 note F#, 3 ;cutoff 7 note G_, 4 ;tie - notetype0 7 + speed 7 note G_, 15 ;tie note G_, 8 @@ -377,7 +377,7 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) ;tie note C_, 12 rest 3 - notetype1 3 + channel_volume 3 ;frequency_offset -1 ;cutoff 8 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/imakuni.asm b/crysaudio/music/TCG/imakuni.asm index 255e4f59..0b2886a5 100644 --- a/crysaudio/music/TCG/imakuni.asm +++ b/crysaudio/music/TCG/imakuni.asm @@ -6,13 +6,13 @@ Music_Imakuni: channel 4, Music_Imakuni_Ch4 Music_Imakuni_Ch1: ; fad55 (3e:6d55) - notetype0 3 + speed 3 ;stereo_panning 1, 1 ;vibrato_type 5 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 2 - notetype1 10 + channel_volume 10 .MainLoop .Loop1 rest 10 @@ -25,17 +25,17 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) rest 8 note G_, 7 rest 8 - notetype0 9 + speed 9 note F_, 10 ;tie - notetype0 1 + speed 1 note F_, 7 rest 8 - notetype0 9 + speed 9 rest 10 sound_call Branch_fadf9 sound_call Branch_fae1d - notetype0 1 + speed 1 octave 4 note E_, 7 rest 15 @@ -47,9 +47,9 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note G#, 15 note A_, 7 rest 8 - notetype0 3 + speed 3 rest 15 - notetype0 1 + speed 1 rest 15 rest 15 inc_octave @@ -73,14 +73,14 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) dec_octave note G#, 7 rest 8 - notetype0 7 + speed 7 note F#, 15 - notetype0 9 + speed 9 rest 10 sound_call Branch_fadf9 sound_call Branch_fae1d dec_octave - notetype0 1 + speed 1 note F_, 7 rest 8 note B_, 7 @@ -97,9 +97,9 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) dec_octave note G#, 7 note A_, 8 - notetype0 3 + speed 3 note F_, 10 - notetype0 1 + speed 1 note D#, 7 rest 8 note A_, 7 @@ -112,9 +112,9 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note A#, 8 note F#, 7 note G_, 8 - notetype0 3 + speed 3 note D#, 10 - notetype0 1 + speed 1 .Loop2 note D_, 7 dec_octave @@ -131,13 +131,13 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note D_, 7 note A_, 8 vibrato 5, 3, 3 - notetype0 3 + speed 3 note D_, 10 vibrato 20, 3, 3 sound_loop 0, .MainLoop Branch_fadf9: - notetype0 1 + speed 1 octave 4 note C#, 7 rest 15 @@ -150,9 +150,9 @@ Branch_fadf9: inc_octave note D_, 7 rest 8 - notetype0 5 + speed 5 rest 9 - notetype0 1 + speed 1 rest 15 rest 15 note D_, 7 @@ -181,13 +181,13 @@ Branch_fae1d: inc_octave note G_, 7 rest 8 - notetype0 9 + speed 9 note F_, 10 ;tie - notetype0 1 + speed 1 note F_, 7 rest 8 - notetype0 9 + speed 9 rest 10 sound_ret @@ -196,36 +196,36 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) ;stereo_panning 1, 1 ;vibrato_type 0 vibrato 0, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 1 - notetype1 10 + channel_volume 10 .Loop1 sound_call Branch_faea5 sound_loop 6, .Loop1 .Loop2 ;rept 2 - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 note C_, 7 rest 8 ;--- - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 note C_, 7 rest 8 ;endr rest 15 note C_, 7 rest 8 - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 note C_, 7 rest 8 rest 15 - notetype0 3 + speed 3 rest 10 vibrato 8, 3, 3 note C_, 10 @@ -234,7 +234,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) .Loop3 sound_call Branch_faea5 sound_loop 2, .Loop3 - notetype0 1 + speed 1 octave 2 note F_, 15 ;tie @@ -248,9 +248,9 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) note A_, 8 note F_, 7 note D#, 8 - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 dec_octave note D#, 15 ;tie @@ -264,9 +264,9 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) note G_, 8 note D#, 7 note C#, 8 - notetype0 3 + speed 3 rest 10 - notetype0 1 + speed 1 .Loop4 note D_, 7 rest 8 @@ -289,9 +289,9 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) Branch_faea5: octave 3 - notetype0 6 + speed 6 rest 10 - notetype0 1 + speed 1 ;rept 2 rest 15 note C#, 7 @@ -302,9 +302,9 @@ Branch_faea5: rest 8 ;endr vibrato 8, 3, 3 - notetype0 9 + speed 9 rest 10 - notetype0 3 + speed 3 note C#, 10 vibrato 0, 3, 3 sound_ret @@ -312,8 +312,8 @@ Branch_faea5: Music_Imakuni_Ch3: ; faebc (3e:6ebc) ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;vibrato_type 6 vibrato 0, 3, 3 ;echo 0 @@ -321,7 +321,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) .MainLoop sound_call Branch_faf7d vibrato 8, 3, 3 - notetype0 1 + speed 1 note D_, 15 ;tie note D_, 7 @@ -344,34 +344,34 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) sound_loop 4, .Loop1 .Loop2 octave 3 - notetype0 3 + speed 3 note C_, 5 rest 5 inc_octave - notetype0 1 + speed 1 note E_, 7 rest 8 dec_octave - notetype0 3 + speed 3 note G#, 5 note A_, 5 inc_octave - notetype0 1 + speed 1 note D#, 7 rest 8 rest 15 note D#, 7 rest 8 - notetype0 3 + speed 3 rest 5 dec_octave note C_, 5 inc_octave - notetype0 1 + speed 1 note E_, 7 rest 8 dec_octave - notetype0 3 + speed 3 note G#, 5 note A_, 5 rest 5 @@ -386,7 +386,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note D_, 10 vibrato 0, 3, 3 sound_loop 2, .Loop3 - notetype0 1 + speed 1 octave 2 note F_, 15 ;tie @@ -402,10 +402,10 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note F_, 7 note D#, 8 vibrato 5, 3, 3 - notetype0 3 + speed 3 note F_, 10 vibrato 0, 3, 3 - notetype0 1 + speed 1 dec_octave note D#, 15 ;tie @@ -421,10 +421,10 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note D#, 7 note C#, 8 vibrato 5, 3, 3 - notetype0 3 + speed 3 note D#, 10 vibrato 0, 3, 3 - notetype0 1 + speed 1 .Loop4 octave 4 note C_, 7 @@ -453,37 +453,37 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) note G_, 2 dec_octave note G_, 3 - notetype0 8 + speed 8 sound_loop 0, .MainLoop Branch_faf7d: - notetype0 3 + speed 3 octave 2 note G_, 5 rest 5 inc_octave - notetype0 1 + speed 1 note G_, 7 rest 8 - notetype0 3 + speed 3 note C#, 5 note D_, 5 inc_octave - notetype0 1 + speed 1 note D_, 7 rest 8 rest 15 note D_, 7 rest 8 - notetype0 3 + speed 3 rest 5 octave 2 note G_, 5 inc_octave - notetype0 1 + speed 1 note G_, 7 rest 8 - notetype0 3 + speed 3 note C#, 5 note D_, 5 rest 5 diff --git a/crysaudio/music/TCG/matchdraw.asm b/crysaudio/music/TCG/matchdraw.asm index 1c1222ad..64beceaf 100644 --- a/crysaudio/music/TCG/matchdraw.asm +++ b/crysaudio/music/TCG/matchdraw.asm @@ -5,12 +5,12 @@ Music_MatchDraw: channel 3, Music_MatchDraw_Ch3 Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) - notetype0 3 + speed 3 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 4 duty_cycle 1 - notetype1 11 + channel_volume 11 note C_, 4 dec_octave note B_, 2 @@ -29,35 +29,35 @@ Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) note B_, 2 note A#, 4 note B_, 2 - notetype1 2 + channel_volume 2 note B_, 2 - notetype1 11 + channel_volume 11 note F#, 4 note G_, 2 - notetype1 2 + channel_volume 2 note G_, 2 - notetype1 11 + channel_volume 11 note C_, 2 - notetype1 2 + channel_volume 2 note C_, 4 inc_octave - notetype1 11 + channel_volume 11 note E_, 1 note G_, 1 inc_octave note C_, 2 - notetype1 2 + channel_volume 2 note C_, 2 sound_ret Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) - notetype0 3 + speed 3 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 1 - notetype1 11 + channel_volume 11 rest 16 note C_, 4 dec_octave @@ -69,32 +69,32 @@ Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) note F#, 2 note F_, 4 note F#, 2 - notetype1 2 + channel_volume 2 note F#, 2 - notetype1 11 + channel_volume 11 note C#, 4 note D_, 2 - notetype1 2 + channel_volume 2 note D_, 2 dec_octave - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 2 + channel_volume 2 note G_, 6 inc_octave inc_octave - notetype1 11 + channel_volume 11 note E_, 2 - notetype1 2 + channel_volume 2 note E_, 2 sound_ret Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) - notetype0 6 + speed 6 ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 0 octave 2 diff --git a/crysaudio/music/TCG/matchloss.asm b/crysaudio/music/TCG/matchloss.asm index cbce6207..f9621ff4 100644 --- a/crysaudio/music/TCG/matchloss.asm +++ b/crysaudio/music/TCG/matchloss.asm @@ -8,64 +8,64 @@ Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 4 duty_cycle 2 - notetype1 11 - notetype0 1 + channel_volume 11 + speed 1 note E_, 3 note F_, 2 ;tie - notetype0 5 + speed 5 note F_, 3 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 10 + channel_volume 10 note A#, 1 - notetype1 3 + channel_volume 3 note A#, 3 inc_octave - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note D_, 3 note D#, 2 ;tie note D#, 16 dec_octave note A#, 6 - notetype1 3 + channel_volume 3 note A#, 16 - notetype1 10 + channel_volume 10 note G#, 6 - notetype1 3 + channel_volume 3 note G#, 16 inc_octave - notetype1 10 + channel_volume 10 note C_, 3 note C#, 8 ;tie note C#, 12 dec_octave - notetype0 6 + speed 6 note G#, 1 - notetype1 3 + channel_volume 3 note G#, 3 - notetype1 10 + channel_volume 10 note F#, 1 - notetype0 7 - notetype1 3 + speed 7 + channel_volume 3 note F#, 3 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note B_, 5 inc_octave note C_, 4 ;tie - notetype0 9 + speed 9 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 2 sound_ret @@ -74,34 +74,34 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) ;stereo_panning 1, 1 ;vibrato_type 5 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 2 - notetype1 9 - notetype0 9 + channel_volume 9 + speed 9 rest 9 - notetype0 11 + speed 11 rest 5 - notetype0 1 + speed 1 rest 8 - notetype0 9 + speed 9 rest 6 note G_, 6 ;tie note G_, 6 - notetype1 3 + channel_volume 3 note G_, 2 sound_ret Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 64 octave 2 - notetype0 5 + speed 5 note A#, 4 inc_octave ;cutoff 4 @@ -109,27 +109,27 @@ Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) note A#, 4 dec_octave ;cutoff 8 - notetype0 7 + speed 7 note G#, 3 inc_octave ;cutoff 4 - notetype0 2 + speed 2 note D#, 11 note G#, 11 dec_octave ;cutoff 8 - notetype0 1 + speed 1 note F#, 11 ;tie note F#, 12 inc_octave ;cutoff 4 - notetype0 12 + speed 12 note C#, 2 - notetype0 2 + speed 2 note F#, 13 dec_octave - notetype0 9 + speed 9 ;cutoff 8 note F_, 12 sound_ret diff --git a/crysaudio/music/TCG/matchstart1.asm b/crysaudio/music/TCG/matchstart1.asm index 2be4cd86..0248bbb8 100644 --- a/crysaudio/music/TCG/matchstart1.asm +++ b/crysaudio/music/TCG/matchstart1.asm @@ -3,12 +3,12 @@ Music_MatchStart1: channel 1, Music_MatchStart1_Ch1 Music_MatchStart1_Ch1: ; f7919 (3d:7919) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 .Loop1 duty_cycle 2 - notetype1 15 + channel_volume 15 octave 3 note C_, 1 inc_octave @@ -44,12 +44,12 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919) note A_, 1 sound_loop 3, .Loop1 octave 4 - notetype1 6 + channel_volume 6 note E_, 1 inc_octave note E_, 1 octave 4 - notetype1 2 + channel_volume 2 dec_octave note B_, 1 inc_octave diff --git a/crysaudio/music/TCG/matchstart2.asm b/crysaudio/music/TCG/matchstart2.asm index 951b6ec4..4f01e850 100644 --- a/crysaudio/music/TCG/matchstart2.asm +++ b/crysaudio/music/TCG/matchstart2.asm @@ -4,11 +4,11 @@ Music_MatchStart2: channel 2, Music_MatchStart2_Ch2 Music_MatchStart2_Ch1: ; f7956 (3d:7956) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 2 - notetype1 15 + channel_volume 15 duty_cycle 0 note C_, 1 note E_, 1 @@ -78,14 +78,14 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) note F_, 1 note B_, 1 dec_octave - notetype1 6 + channel_volume 6 note E_, 1 note G_, 1 note B_, 1 inc_octave note C_, 1 note E_, 1 - notetype1 2 + channel_volume 2 note G_, 1 note B_, 1 inc_octave @@ -94,13 +94,13 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 ;frequency_offset 6 rest 4 octave 2 - notetype1 6 + channel_volume 6 duty_cycle 0 note C_, 1 note E_, 1 @@ -170,7 +170,7 @@ Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) note F_, 1 note B_, 1 dec_octave - notetype1 2 + channel_volume 2 note E_, 1 note G_, 1 note B_, 1 diff --git a/crysaudio/music/TCG/matchstart3.asm b/crysaudio/music/TCG/matchstart3.asm index 03c535a7..c7baa4e6 100644 --- a/crysaudio/music/TCG/matchstart3.asm +++ b/crysaudio/music/TCG/matchstart3.asm @@ -4,11 +4,11 @@ Music_MatchStart3: channel 2, Music_MatchStart3_Ch2 Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 2 - notetype1 15 + channel_volume 15 duty_cycle 1 note C_, 1 note E_, 1 @@ -153,14 +153,14 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) note D_, 1 dec_octave octave 4 - notetype1 6 + channel_volume 6 note F_, 1 note A_, 1 inc_octave note C_, 1 dec_octave octave 5 - notetype1 2 + channel_volume 2 note G_, 1 note B_, 1 inc_octave @@ -169,13 +169,13 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) Music_MatchStart3_Ch2: ; f7aba (3d:7aba) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 ;frequency_offset 6 rest 4 octave 2 - notetype1 6 + channel_volume 6 duty_cycle 1 note C_, 1 note E_, 1 @@ -320,7 +320,7 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) note D_, 1 dec_octave octave 4 - notetype1 2 + channel_volume 2 note F_, 1 note A_, 1 inc_octave diff --git a/crysaudio/music/TCG/matchvictory.asm b/crysaudio/music/TCG/matchvictory.asm index a57d6505..3743739a 100644 --- a/crysaudio/music/TCG/matchvictory.asm +++ b/crysaudio/music/TCG/matchvictory.asm @@ -8,53 +8,53 @@ Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 0 - notetype1 11 - notetype0 1 + channel_volume 11 + speed 1 note A_, 15 ;tie note A_, 9 - notetype1 2 + channel_volume 2 note A_, 5 - notetype1 11 + channel_volume 11 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 3 - notetype1 11 + channel_volume 11 note F_, 7 - notetype1 2 + channel_volume 2 note F_, 3 - notetype1 11 + channel_volume 11 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 2 - notetype1 11 + channel_volume 11 note B_, 11 - notetype1 2 + channel_volume 2 note B_, 10 inc_octave - notetype1 11 + channel_volume 11 note C_, 10 - notetype1 2 + channel_volume 2 note C_, 11 - notetype1 11 + channel_volume 11 note D_, 10 - notetype1 2 + channel_volume 2 note D_, 10 - notetype1 11 + channel_volume 11 note C#, 8 - notetype1 2 + channel_volume 2 note C#, 13 - notetype1 11 + channel_volume 11 note D_, 5 - notetype1 2 + channel_volume 2 note D_, 6 - notetype1 11 - notetype0 8 + channel_volume 11 + speed 8 note E_, 12 - notetype1 2 + channel_volume 2 note E_, 4 sound_ret @@ -63,73 +63,73 @@ Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 0 - notetype1 11 - notetype0 1 + channel_volume 11 + speed 1 note F_, 5 - notetype1 2 + channel_volume 2 note F_, 5 dec_octave - notetype1 11 + channel_volume 11 note A_, 5 inc_octave note C_, 5 note F_, 5 - notetype1 2 + channel_volume 2 note F_, 4 - notetype1 11 + channel_volume 11 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 3 dec_octave - notetype1 11 + channel_volume 11 note A_, 7 - notetype1 2 + channel_volume 2 note A_, 3 inc_octave - notetype1 11 + channel_volume 11 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 2 - notetype1 11 + channel_volume 11 note G_, 11 - notetype1 2 + channel_volume 2 note G_, 10 - notetype1 11 + channel_volume 11 note A_, 10 - notetype1 2 + channel_volume 2 note A_, 11 - notetype1 11 + channel_volume 11 note B_, 10 - notetype1 2 + channel_volume 2 note B_, 10 - notetype1 11 + channel_volume 11 note A_, 8 - notetype1 2 + channel_volume 2 note A_, 13 - notetype1 11 + channel_volume 11 note B_, 5 - notetype1 2 + channel_volume 2 note B_, 6 inc_octave - notetype1 11 - notetype0 8 + channel_volume 11 + speed 8 note C#, 12 - notetype1 2 + channel_volume 2 note C#, 4 sound_ret Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 0 octave 2 - notetype0 1 + speed 1 note F_, 15 ;tie note F_, 9 @@ -150,7 +150,7 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) rest 13 note E_, 5 rest 6 - notetype0 8 + speed 8 note A_, 12 sound_ret ; 0xf7c2e diff --git a/crysaudio/music/TCG/medal.asm b/crysaudio/music/TCG/medal.asm index 2c6de78d..32839d02 100644 --- a/crysaudio/music/TCG/medal.asm +++ b/crysaudio/music/TCG/medal.asm @@ -8,11 +8,11 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 2 duty_cycle 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 5 note A_, 5 inc_octave @@ -31,39 +31,39 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) inc_octave note C#, 5 note E_, 5 - notetype0 15 + speed 15 note A_, 2 ;tie - notetype0 1 + speed 1 note A_, 10 - notetype1 3 + channel_volume 3 note A_, 5 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 note A_, 5 note A_, 5 note A_, 5 - notetype2 8 + fade_wave 8 note A_, 15 - notetype1 3 + channel_volume 3 note A_, 5 - notetype1 10 + channel_volume 10 note A_, 16 - notetype1 3 + channel_volume 3 note A_, 5 - notetype1 10 + channel_volume 10 note A_, 16 - notetype1 3 + channel_volume 3 note A_, 6 - notetype1 10 - notetype0 9 + channel_volume 10 + speed 9 note A_, 5 ;tie note A_, 8 ;tie - notetype0 1 + speed 1 note A_, 2 - notetype1 3 + channel_volume 3 note A_, 16 sound_ret @@ -72,11 +72,11 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 1 duty_cycle 0 - notetype1 9 - notetype0 1 + channel_volume 9 + speed 1 note A_, 5 inc_octave note C#, 5 @@ -94,56 +94,56 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) note E_, 5 note A_, 5 inc_octave - notetype0 15 + speed 15 note C_, 2 ;tie - notetype0 1 + speed 1 note C_, 10 - notetype1 2 + channel_volume 2 note C_, 5 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 note C_, 5 note C_, 5 note C_, 5 - notetype2 8 + fade_wave 8 note D_, 15 - notetype1 3 + channel_volume 3 note D_, 5 - notetype1 9 + channel_volume 9 note D_, 16 - notetype1 2 + channel_volume 2 note D_, 5 - notetype1 9 + channel_volume 9 note D_, 16 - notetype1 3 + channel_volume 3 note D_, 6 - notetype1 9 - notetype0 9 + channel_volume 9 + speed 9 note C#, 5 ;tie note C#, 8 ;tie - notetype0 1 + speed 1 note C#, 2 - notetype1 2 + channel_volume 2 note C#, 16 sound_ret Music_Medal_Ch3: ; f7e9d (3d:7e9d) ;stereo_panning 1, 1 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;cutoff 8 ;echo 0 octave 2 - notetype0 1 - notetype0 15 + speed 1 + speed 15 rest 4 note F_, 2 ;tie - notetype0 1 + speed 1 note F_, 10 rest 5 ;cutoff 7 @@ -157,10 +157,10 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) rest 5 note A#, 16 rest 6 - notetype0 9 + speed 9 note A_, 13 ;tie - notetype0 1 + speed 1 note A_, 2 sound_ret ; 0xf7ec8 diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm index 1e912814..fbbe2103 100644 --- a/crysaudio/music/TCG/overworld.asm +++ b/crysaudio/music/TCG/overworld.asm @@ -6,13 +6,13 @@ Music_Overworld: channel 4, Music_Overworld_Ch4 Music_Overworld_Ch1: ; f71a0 (3d:71a0) - notetype0 7 + speed 7 duty_cycle 0 ;stereo_panning 1, 1 ;vibrato_type 9 vibrato 25, 3, 3 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 octave 3 rest 3 sound_call Branch_f72ba @@ -20,116 +20,116 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) .MainLoop sound_call Branch_f72ba duty_cycle 1 - notetype2 8 + fade_wave 8 octave 3 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 3 + channel_volume 3 note A_, 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 5 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note F_, 3 - notetype0 1 + speed 1 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 - notetype1 10 - notetype0 7 + channel_volume 10 + speed 7 note G_, 3 - notetype0 1 + speed 1 note F_, 11 - notetype1 3 + channel_volume 3 note F_, 10 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note C_, 12 - notetype1 3 + channel_volume 3 note C_, 2 duty_cycle 0 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 3 note E_, 4 note E_, 3 note E_, 3 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 sound_call Branch_f72fb note C_, 6 - notetype1 3 + channel_volume 3 note C_, 6 - notetype1 10 + channel_volume 10 note C_, 3 note D_, 3 note E_, 3 note G_, 6 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 10 + channel_volume 10 note F_, 4 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 10 + channel_volume 10 note C_, 3 dec_octave note A_, 6 note A#, 9 - notetype1 3 + channel_volume 3 note A#, 6 - notetype1 10 + channel_volume 10 note A#, 3 inc_octave note D_, 3 note F_, 3 note A_, 3 - notetype1 3 + channel_volume 3 note A_, 6 - notetype1 10 + channel_volume 10 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 10 + channel_volume 10 note E_, 3 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 10 + channel_volume 10 note E_, 2 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 note C_, 9 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 10 + channel_volume 10 dec_octave note A_, 3 inc_octave - notetype0 1 + speed 1 note C_, 11 - notetype1 4 + channel_volume 4 note C_, 10 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note G_, 3 - notetype0 1 + speed 1 note F_, 11 - notetype1 4 + channel_volume 4 note F_, 10 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note C_, 12 - notetype1 3 + channel_volume 3 note C_, 6 duty_cycle 2 - notetype2 8 - notetype1 6 + fade_wave 8 + channel_volume 6 octave 4 note G_, 1 ;tie @@ -144,44 +144,44 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) ;tie note C_, 1 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 sound_call Branch_f72fb note C_, 6 - notetype1 3 + channel_volume 3 note C_, 6 - notetype1 10 + channel_volume 10 note C_, 3 note D_, 3 note E_, 3 note F_, 9 - notetype1 3 + channel_volume 3 note F_, 12 - notetype1 10 + channel_volume 10 note F_, 2 note G_, 1 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 2 - notetype1 10 + channel_volume 10 note A_, 12 - notetype1 3 + channel_volume 3 note A_, 3 - notetype1 10 + channel_volume 10 note D_, 3 note A_, 3 note A#, 9 - notetype1 3 + channel_volume 3 note A#, 6 - notetype1 10 + channel_volume 10 note A_, 5 - notetype1 3 + channel_volume 3 note A_, 1 - notetype1 10 + channel_volume 10 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 9 + channel_volume 9 note F_, 8 ;tie note F_, 8 @@ -193,11 +193,11 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) note F_, 8 ;tie note F_, 8 - notetype1 3 + channel_volume 3 note F_, 3 duty_cycle 0 - notetype1 10 - notetype2 7 + channel_volume 10 + fade_wave 7 sound_loop 0, .MainLoop Branch_f72ba: @@ -206,23 +206,23 @@ Branch_f72ba: note F_, 2 note A_, 1 inc_octave - notetype1 10 - notetype2 4 + channel_volume 10 + fade_wave 4 note C_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 3 note A#, 1 inc_octave - notetype1 10 - notetype2 4 + channel_volume 10 + fade_wave 4 note D_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note A#, 3 rest 3 @@ -230,22 +230,22 @@ Branch_f72ba: note A_, 2 inc_octave note C_, 1 - notetype1 10 - notetype2 4 + channel_volume 10 + fade_wave 4 note C_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 3 note A#, 1 inc_octave - notetype1 10 - notetype2 4 + channel_volume 10 + fade_wave 4 note D_, 1 rest 2 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C_, 3 dec_octave note A#, 3 @@ -253,83 +253,83 @@ Branch_f72ba: Branch_f72fb: octave 4 - notetype1 10 + channel_volume 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note F_, 5 - notetype1 3 + channel_volume 3 note F_, 1 - notetype1 10 + channel_volume 10 note A_, 3 - notetype0 1 + speed 1 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 10 - notetype0 7 + speed 7 inc_octave - notetype1 10 + channel_volume 10 note C_, 3 dec_octave - notetype0 1 + speed 1 note A#, 11 - notetype1 3 + channel_volume 3 note A#, 10 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note C#, 12 - notetype1 3 + channel_volume 3 note C#, 6 - notetype1 10 + channel_volume 10 note D#, 3 - notetype0 1 + speed 1 note C#, 11 - notetype1 3 + channel_volume 3 note C#, 10 - notetype1 10 - notetype0 7 + channel_volume 10 + speed 7 sound_ret Music_Overworld_Ch2: ; f7334 (3d:7334) - notetype0 7 + speed 7 duty_cycle 0 ;stereo_panning 1, 1 ;vibrato_type 9 vibrato 30, 3, 3 - notetype2 7 + fade_wave 7 octave 3 sound_call Branch_f7535 .MainLoop sound_call Branch_f7535 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 rest 3 note C_, 5 note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C_, 4 note C_, 3 note C_, 3 rest 3 note C_, 5 note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note G_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note D_, 4 note D_, 3 note C_, 3 @@ -338,14 +338,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note D_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C_, 4 note C_, 3 dec_octave @@ -354,14 +354,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note C#, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C#, 4 dec_octave note F_, 3 @@ -371,40 +371,40 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note C_, 3 note E_, 2 note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note G_, 1 - notetype2 7 - notetype1 6 - notetype2 8 + fade_wave 7 + channel_volume 6 + fade_wave 8 octave 3 note E_, 3 note F_, 3 note G_, 3 - notetype2 7 + fade_wave 7 note A#, 6 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 3 note D_, 3 - notetype1 6 - notetype2 8 + channel_volume 6 + fade_wave 8 octave 3 note A_, 3 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 2 note A_, 2 inc_octave inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 dec_octave rest 2 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note D_, 4 note D_, 3 dec_octave @@ -415,16 +415,16 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note D_, 2 dec_octave note A#, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave inc_octave note F_, 1 rest 2 dec_octave dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 4 note A#, 3 note A#, 3 @@ -434,14 +434,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note D_, 2 dec_octave note A#, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note A_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 6 inc_octave note D_, 1 @@ -451,13 +451,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave note C_, 5 note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 dec_octave note C_, 4 note C_, 3 @@ -465,18 +465,18 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) rest 3 note C_, 5 note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note G_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note D_, 4 duty_cycle 2 - notetype1 6 - notetype2 8 + channel_volume 6 + fade_wave 8 octave 4 note C_, 1 ;tie @@ -492,21 +492,21 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) ;tie note E_, 1 duty_cycle 0 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 2 rest 3 note A#, 5 inc_octave note D_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C_, 4 note C_, 3 dec_octave @@ -515,14 +515,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note C#, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C#, 4 note C#, 3 note C#, 3 @@ -532,14 +532,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A_, 2 inc_octave note C_, 3 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note G_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note C_, 4 note E_, 3 note C_, 3 @@ -549,208 +549,208 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note B_, 2 inc_octave inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 rest 2 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note D_, 4 - notetype1 6 - notetype2 8 + channel_volume 6 + fade_wave 8 octave 4 note D_, 2 note E_, 1 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 2 - notetype1 6 + channel_volume 6 note F_, 11 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 4 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 rest 2 dec_octave dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note A#, 1 - notetype1 6 - notetype2 8 + channel_volume 6 + fade_wave 8 octave 3 note A#, 3 inc_octave note F_, 3 note G_, 9 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 3 note D_, 2 dec_octave note A#, 3 inc_octave inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 - notetype2 8 - notetype1 6 + fade_wave 8 + channel_volume 6 octave 4 note C_, 5 - notetype1 2 + channel_volume 2 note C_, 1 dec_octave - notetype1 9 + channel_volume 9 note A#, 5 - notetype1 2 + channel_volume 2 note A#, 1 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 octave 3 rest 3 note F_, 3 note C_, 2 note F_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note G_, 3 - notetype0 1 - notetype1 9 - notetype2 8 + speed 1 + channel_volume 9 + fade_wave 8 inc_octave note F_, 4 note C_, 3 - notetype0 7 + speed 7 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note E_, 3 note G_, 2 inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 dec_octave rest 3 note A_, 3 note F_, 2 note A_, 1 inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note G_, 3 - notetype0 1 - notetype1 9 - notetype2 8 + speed 1 + channel_volume 9 + fade_wave 8 inc_octave note F_, 4 note C_, 3 dec_octave - notetype0 7 - notetype1 9 - notetype2 7 + speed 7 + channel_volume 9 + fade_wave 7 note A_, 3 note G_, 2 inc_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 sound_loop 0, .MainLoop Branch_f7535: octave 3 - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 rest 3 note C_, 3 note C_, 2 note F_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note G_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 inc_octave note F_, 4 note C_, 3 - notetype0 7 - notetype1 9 - notetype2 7 + speed 7 + channel_volume 9 + fade_wave 7 dec_octave note E_, 3 note G_, 2 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 dec_octave rest 3 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note F_, 3 note F_, 2 note A_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype1 9 - notetype2 7 + channel_volume 9 + fade_wave 7 note G_, 3 note G_, 1 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 rest 1 dec_octave - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 inc_octave note F_, 4 note C_, 3 - notetype0 7 - notetype1 9 - notetype2 7 + speed 7 + channel_volume 9 + fade_wave 7 dec_octave note A_, 3 note G_, 2 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 inc_octave note F_, 1 dec_octave @@ -758,10 +758,10 @@ Branch_f7535: Music_Overworld_Ch3: ; f75a1 (3d:75a1) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 64 ;cutoff 7 octave 2 diff --git a/crysaudio/music/TCG/pausemenu.asm b/crysaudio/music/TCG/pausemenu.asm index 00a6ddf0..5ca8a900 100644 --- a/crysaudio/music/TCG/pausemenu.asm +++ b/crysaudio/music/TCG/pausemenu.asm @@ -6,211 +6,211 @@ Music_PauseMenu: channel 4, Music_PauseMenu_Ch4 Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 .MainLoop - notetype1 7 + channel_volume 7 .Loop1 rest 16 sound_loop 4, .Loop1 - notetype0 1 + speed 1 octave 6 note C_, 4 dec_octave rest 3 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note D_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_call Branch_f6c24 sound_call Branch_f6c60 - notetype1 7 + channel_volume 7 octave 6 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note D_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_call Branch_f6c24 sound_call Branch_f6c60 octave 6 - notetype1 6 + channel_volume 6 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note E_, 3 sound_call Branch_f6ce9 sound_call Branch_f6c80 .Loop2 octave 6 - notetype2 4 + fade_wave 4 note C_, 1 sound_call Branch_f6ce9 sound_call Branch_f6c80 sound_loop 3, .Loop2 - notetype2 8 + fade_wave 8 sound_loop 0, .MainLoop Branch_f6c24: .Loop3 octave 6 - notetype1 7 + channel_volume 7 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 7 + channel_volume 7 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note D_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_loop 3, .Loop3 inc_octave - notetype1 7 + channel_volume 7 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 7 + channel_volume 7 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note E_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_ret Branch_f6c60: .Loop4 octave 6 - notetype1 7 + channel_volume 7 note C_, 4 dec_octave - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 dec_octave - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note B_, 3 - notetype1 7 + channel_volume 7 note E_, 4 - notetype1 3 + channel_volume 3 note G_, 3 sound_loop 3, .Loop4 sound_ret Branch_f6c80: octave 6 - notetype2 4 + fade_wave 4 note C_, 1 octave 3 - notetype1 7 - notetype2 8 - notetype0 1 + channel_volume 7 + fade_wave 8 + speed 1 note C_, 4 - notetype1 2 + channel_volume 2 note C_, 3 - notetype1 6 - notetype0 7 + channel_volume 6 + speed 7 octave 5 - notetype2 4 + fade_wave 4 note G_, 1 note E_, 1 octave 3 - notetype2 8 - notetype1 7 - notetype0 1 + fade_wave 8 + channel_volume 7 + speed 1 note E_, 4 - notetype1 2 + channel_volume 2 note E_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note B_, 1 note G_, 1 dec_octave - notetype1 7 - notetype2 8 - notetype0 1 + channel_volume 7 + fade_wave 8 + speed 1 note C_, 4 - notetype1 2 + channel_volume 2 note C_, 3 - notetype1 6 - notetype0 7 + channel_volume 6 + speed 7 octave 6 - notetype2 4 + fade_wave 4 note C_, 1 octave 3 - notetype2 8 - notetype1 7 - notetype0 1 + fade_wave 8 + channel_volume 7 + speed 1 note C_, 4 - notetype1 2 + channel_volume 2 note C_, 3 - notetype0 7 + speed 7 octave 5 - notetype1 6 - notetype2 4 + channel_volume 6 + fade_wave 4 note G_, 1 note E_, 1 - notetype1 7 + channel_volume 7 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note E_, 4 - notetype1 2 + channel_volume 2 note E_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note B_, 1 note G_, 1 note E_, 1 @@ -218,67 +218,67 @@ Branch_f6c80: Branch_f6ce9: octave 2 - notetype0 1 - notetype2 8 - notetype1 7 + speed 1 + fade_wave 8 + channel_volume 7 note B_, 4 - notetype1 2 + channel_volume 2 note B_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note G_, 1 note D_, 1 octave 3 - notetype1 7 - notetype2 8 - notetype0 1 + channel_volume 7 + fade_wave 8 + speed 1 note D_, 4 - notetype1 2 + channel_volume 2 note D_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note B_, 1 note G_, 1 - notetype1 7 + channel_volume 7 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note B_, 4 - notetype1 2 + channel_volume 2 note B_, 3 - notetype1 6 - notetype0 7 + channel_volume 6 + speed 7 octave 6 - notetype2 4 + fade_wave 4 note C_, 1 - notetype1 7 + channel_volume 7 octave 2 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note B_, 4 - notetype1 2 + channel_volume 2 note B_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note G_, 1 note D_, 1 - notetype1 7 + channel_volume 7 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note D_, 4 - notetype1 2 + channel_volume 2 note D_, 3 - notetype0 7 - notetype1 6 + speed 7 + channel_volume 6 octave 5 - notetype2 4 + fade_wave 4 note B_, 1 note G_, 1 note D_, 1 @@ -286,18 +286,18 @@ Branch_f6ce9: Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 duty_cycle 2 .MainLoop - notetype1 8 + channel_volume 8 .Loop1 rest 16 sound_loop 7, .Loop1 octave 5 rest 8 - notetype0 1 + speed 1 .Loop2 note B_, 4 note G_, 3 @@ -305,69 +305,69 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) note C_, 3 dec_octave sound_loop 4, .Loop2 - notetype0 7 + speed 7 .Loop3 octave 1 - notetype1 13 + channel_volume 13 note G_, 1 octave 3 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note D_, 4 - notetype1 2 + channel_volume 2 note D_, 3 - notetype1 13 - notetype0 7 + channel_volume 13 + speed 7 octave 1 - notetype2 6 + fade_wave 6 note G_, 1 - notetype2 4 + fade_wave 4 note G_, 1 octave 3 - notetype2 8 - notetype1 7 - notetype0 1 + fade_wave 8 + channel_volume 7 + speed 1 note F#, 4 - notetype1 2 + channel_volume 2 note F#, 3 dec_octave - notetype1 13 - notetype0 7 + channel_volume 13 + speed 7 note D_, 1 note G_, 1 octave 4 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note F#, 4 - notetype1 2 + channel_volume 2 note F#, 3 - notetype0 7 + speed 7 octave 1 - notetype1 13 - notetype2 8 + channel_volume 13 + fade_wave 8 note G_, 1 octave 3 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note D_, 4 - notetype1 2 + channel_volume 2 note D_, 3 - notetype0 7 - notetype1 13 + speed 7 + channel_volume 13 octave 1 - notetype2 6 + fade_wave 6 note G_, 1 - notetype2 4 + fade_wave 4 note G_, 1 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note F#, 4 - notetype1 2 + channel_volume 2 note F#, 3 - notetype0 7 + speed 7 octave 1 - notetype1 13 + channel_volume 13 note B_, 1 inc_octave note C_, 1 @@ -375,62 +375,62 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) dec_octave note D_, 1 octave 3 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 4 - notetype1 2 + channel_volume 2 note E_, 3 - notetype1 13 - notetype0 7 + channel_volume 13 + speed 7 octave 1 - notetype2 6 + fade_wave 6 note D_, 1 - notetype2 4 + fade_wave 4 note D_, 1 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 3 - notetype0 7 + speed 7 dec_octave - notetype1 13 + channel_volume 13 note C_, 1 note D_, 1 octave 4 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 3 - notetype0 7 + speed 7 octave 1 - notetype1 13 - notetype2 8 + channel_volume 13 + fade_wave 8 note D_, 1 octave 3 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note E_, 4 - notetype1 2 + channel_volume 2 note E_, 3 - notetype0 7 - notetype1 13 - notetype2 6 + speed 7 + channel_volume 13 + fade_wave 6 octave 1 note D_, 1 - notetype2 4 + fade_wave 4 note D_, 1 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 3 - notetype0 7 + speed 7 octave 1 - notetype1 13 + channel_volume 13 note C_, 1 note C#, 1 inc_octave @@ -440,113 +440,113 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) - notetype0 1 - notetype2 13 + speed 1 + fade_wave 13 ;stereo_panning 1, 1 - notetype1 2 + channel_volume 2 ;echo 96 ;cutoff 4 octave 5 note G_, 7 ;cutoff 8 note F#, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note D_, 4 - notetype1 3 + channel_volume 3 note F#, 3 dec_octave - notetype1 2 + channel_volume 2 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note D_, 3 .MainLoop octave 5 .Loop1 - notetype1 2 + channel_volume 2 note G_, 4 dec_octave - notetype1 3 + channel_volume 3 note B_, 3 inc_octave - notetype1 2 + channel_volume 2 note F#, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note D_, 4 - notetype1 3 + channel_volume 3 note F#, 3 dec_octave - notetype1 2 + channel_volume 2 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note D_, 3 sound_loop 3, .Loop1 - notetype1 2 + channel_volume 2 note G_, 4 dec_octave - notetype1 3 + channel_volume 3 note B_, 3 inc_octave - notetype1 2 + channel_volume 2 note E_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note C_, 4 - notetype1 3 + channel_volume 3 note E_, 3 dec_octave - notetype1 2 + channel_volume 2 note A_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 .Loop2 - notetype1 2 + channel_volume 2 note G_, 4 dec_octave - notetype1 3 + channel_volume 3 note A_, 3 inc_octave - notetype1 2 + channel_volume 2 note E_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note C_, 4 - notetype1 3 + channel_volume 3 note E_, 3 dec_octave - notetype1 2 + channel_volume 2 note A_, 4 inc_octave - notetype1 3 + channel_volume 3 note C_, 3 sound_loop 3, .Loop2 - notetype1 2 + channel_volume 2 note G_, 4 dec_octave - notetype1 3 + channel_volume 3 note A_, 3 inc_octave - notetype1 2 + channel_volume 2 note F#, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 2 + channel_volume 2 note D_, 4 - notetype1 3 + channel_volume 3 note F#, 3 dec_octave - notetype1 2 + channel_volume 2 note B_, 4 inc_octave - notetype1 3 + channel_volume 3 note D_, 3 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/pcmainmenu.asm b/crysaudio/music/TCG/pcmainmenu.asm index 519977df..6d6f3c76 100644 --- a/crysaudio/music/TCG/pcmainmenu.asm +++ b/crysaudio/music/TCG/pcmainmenu.asm @@ -6,9 +6,9 @@ Music_PCMainMenu: channel 4, Music_PCMainMenu_Ch4 Music_PCMainMenu_Ch1: ; f9052 (3e:5052) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 2 .MainLoop @@ -16,66 +16,66 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) rest 4 dec_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note F_, 1 rest 1 duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note A_, 1 - notetype1 3 + channel_volume 3 note A_, 1 rest 2 inc_octave - notetype1 12 + channel_volume 12 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 dec_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note F_, 1 rest 1 duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 1 sound_call Branch_f90c2 rest 4 dec_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note F_, 1 rest 1 inc_octave duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 2 - notetype1 12 + channel_volume 12 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 dec_octave note F_, 1 rest 1 inc_octave duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 sound_loop 0, .MainLoop @@ -83,38 +83,38 @@ Branch_f90c2: octave 3 rest 4 duty_cycle 1 - notetype1 6 - notetype2 5 + channel_volume 6 + fade_wave 5 note G_, 1 rest 3 - notetype2 8 + fade_wave 8 duty_cycle 2 - notetype1 12 + channel_volume 12 note B_, 2 inc_octave note D_, 1 - notetype1 2 + channel_volume 2 note D_, 1 dec_octave duty_cycle 1 - notetype1 6 - notetype2 5 + channel_volume 6 + fade_wave 5 note G_, 1 rest 1 inc_octave duty_cycle 2 - notetype2 8 - notetype1 12 + fade_wave 8 + channel_volume 12 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 sound_ret Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype2 8 + fade_wave 8 octave 3 duty_cycle 2 .MainLoop @@ -122,67 +122,67 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) rest 4 inc_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note C_, 1 rest 1 dec_octave duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note F_, 1 - notetype1 2 + channel_volume 2 note F_, 1 rest 2 - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 inc_octave note C_, 1 rest 1 dec_octave duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 sound_call Branch_f915e rest 4 inc_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note C_, 1 rest 1 duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 rest 2 dec_octave - notetype1 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 duty_cycle 1 inc_octave - notetype1 6 - notetype2 5 + channel_volume 6 + fade_wave 5 note C_, 1 rest 1 dec_octave duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note B_, 1 - notetype1 2 + channel_volume 2 note B_, 1 sound_loop 0, .MainLoop @@ -190,39 +190,39 @@ Branch_f915e: octave 4 rest 4 duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note D_, 1 rest 3 duty_cycle 2 - notetype2 8 + fade_wave 8 dec_octave - notetype1 8 + channel_volume 8 note G_, 2 note B_, 1 - notetype1 2 + channel_volume 2 note B_, 1 inc_octave duty_cycle 1 - notetype2 5 - notetype1 6 + fade_wave 5 + channel_volume 6 note D_, 1 rest 1 dec_octave duty_cycle 2 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 sound_ret Music_PCMainMenu_Ch3: ; f9189 (3e:5189) - notetype0 7 - notetype1 1 + speed 7 + channel_volume 1 ;stereo_panning 1, 1 - notetype2 11 + fade_wave 11 ;cutoff 7 ;echo 0 .MainLoop @@ -233,12 +233,12 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) ;cutoff 8 note G_, 1 rest 1 - notetype0 1 + speed 1 note A#, 4 ;tie note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 1 rest 1 ;cutoff 4 @@ -259,12 +259,12 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) ;cutoff 8 note F_, 1 rest 1 - notetype0 1 + speed 1 note G#, 4 ;tie note A_, 3 ;tie - notetype0 7 + speed 7 note A_, 1 rest 1 ;cutoff 4 @@ -285,12 +285,12 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) ;cutoff 8 note G_, 1 rest 1 - notetype0 1 + speed 1 note A#, 4 ;tie note B_, 3 ;tie - notetype0 7 + speed 7 note B_, 1 rest 1 ;cutoff 4 @@ -311,29 +311,29 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) ;cutoff 8 note F_, 1 rest 1 - notetype0 1 + speed 1 note B_, 4 ;tie inc_octave note C_, 3 ;tie - notetype0 7 + speed 7 note C_, 1 rest 1 ;cutoff 8 - notetype0 1 + speed 1 note F#, 4 ;tie note G_, 3 ;tie - notetype0 7 + speed 7 note G_, 1 ;cutoff 4 note F_, 1 ;cutoff 8 note C_, 2 note F_, 2 - notetype0 1 + speed 1 note C_, 3 ;tie dec_octave @@ -344,7 +344,7 @@ Music_PCMainMenu_Ch3: ; f9189 (3e:5189) note A_, 3 ;tie note G#, 2 - notetype0 7 + speed 7 sound_loop 0, .MainLoop diff --git a/crysaudio/music/TCG/pokemondome.asm b/crysaudio/music/TCG/pokemondome.asm index 9fdae5fb..f81b20da 100644 --- a/crysaudio/music/TCG/pokemondome.asm +++ b/crysaudio/music/TCG/pokemondome.asm @@ -6,15 +6,15 @@ Music_PokemonDome: channel 4, Music_PokemonDome_Ch4 Music_PokemonDome_Ch1: ; f9251 (3e:5251) - notetype0 7 + speed 7 ;stereo_panning 1, 1 ;vibrato_type 9 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 2 duty_cycle 0 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note G_, 5 note A_, 5 note B_, 4 @@ -44,129 +44,129 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note F_, 5 note G_, 4 duty_cycle 1 - notetype1 8 + channel_volume 8 dec_octave - notetype0 1 + speed 1 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 8 + channel_volume 8 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 10 rest 7 - notetype1 8 + channel_volume 8 note C_, 4 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 8 + channel_volume 8 note C_, 4 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 8 + channel_volume 8 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 3 - notetype1 8 + channel_volume 8 note C_, 11 - notetype1 3 + channel_volume 3 note C_, 10 - notetype0 7 + speed 7 rest 3 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 10 rest 7 - notetype1 8 + channel_volume 8 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 .MainLoop - notetype0 7 + speed 7 duty_cycle 1 - notetype1 10 + channel_volume 10 octave 2 note G_, 4 inc_octave duty_cycle 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 rest 7 - notetype1 8 + channel_volume 8 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 8 + channel_volume 8 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 8 + channel_volume 8 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 8 + channel_volume 8 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 - notetype0 7 + speed 7 rest 3 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 10 rest 7 - notetype0 1 - notetype1 8 + speed 1 + channel_volume 8 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 4 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 - notetype1 8 + channel_volume 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 3 duty_cycle 0 - notetype1 10 + channel_volume 10 dec_octave - notetype0 1 + speed 1 note B_, 4 inc_octave note C_, 3 @@ -176,75 +176,75 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note G_, 3 note A_, 4 note B_, 3 - notetype0 7 + speed 7 inc_octave note C_, 12 dec_octave note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note D_, 10 - notetype1 3 + channel_volume 3 note D_, 2 - notetype1 10 + channel_volume 10 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note F_, 10 - notetype1 3 + channel_volume 3 note F_, 2 - notetype1 10 + channel_volume 10 note C_, 3 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note F_, 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note E_, 12 dec_octave note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note D_, 8 dec_octave note A_, 4 inc_octave note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 14 - notetype1 3 + channel_volume 3 note C_, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 10 - notetype1 3 + channel_volume 3 note B_, 2 - notetype1 10 + channel_volume 10 note G_, 4 note A_, 12 note B_, 1 - notetype1 3 + channel_volume 3 note B_, 2 inc_octave - notetype1 10 + channel_volume 10 note C_, 1 note D_, 8 note E_, 4 @@ -254,54 +254,54 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note G_, 8 ;tie note G_, 8 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 + channel_volume 10 note F_, 2 note E_, 2 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note E_, 5 - notetype1 3 + channel_volume 3 note E_, 2 - notetype0 7 - notetype1 10 + speed 7 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 1 inc_octave note C_, 8 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 + channel_volume 10 note F_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 dec_octave - notetype1 10 + channel_volume 10 note A_, 1 inc_octave note C_, 8 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 + channel_volume 10 note F_, 1 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 dec_octave - notetype1 10 + channel_volume 10 note G#, 1 inc_octave note C_, 12 @@ -317,15 +317,15 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) - notetype0 7 + speed 7 ;stereo_panning 1, 1 ;vibrato_type 9 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 octave 1 duty_cycle 0 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note B_, 5 inc_octave note C_, 5 @@ -356,71 +356,71 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note B_, 4 .MainLoop duty_cycle 1 - notetype1 7 + channel_volume 7 octave 3 - notetype0 1 + speed 1 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 rest 7 - notetype1 7 + channel_volume 7 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note E_, 4 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 3 - notetype1 7 + channel_volume 7 note E_, 11 - notetype1 3 + channel_volume 3 note E_, 10 - notetype0 7 + speed 7 rest 3 sound_call Branch_f9554 - notetype0 7 + speed 7 rest 4 - notetype1 7 - notetype0 1 + channel_volume 7 + speed 1 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 7 + channel_volume 7 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 10 rest 7 - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 7 + channel_volume 7 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 7 + channel_volume 7 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 3 - notetype1 7 + channel_volume 7 note G_, 11 - notetype1 3 + channel_volume 3 note G_, 10 - notetype0 7 + speed 7 rest 3 sound_call Branch_f9554 duty_cycle 0 - notetype1 8 + channel_volume 8 dec_octave - notetype0 1 + speed 1 note G_, 4 note A_, 3 note B_, 4 @@ -430,15 +430,15 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note E_, 3 note F_, 4 note F#, 3 - notetype0 7 + speed 7 note G_, 10 note F_, 1 rest 1 note E_, 1 - notetype1 2 + channel_volume 2 note E_, 1 rest 1 - notetype1 7 + channel_volume 7 note G_, 1 note G_, 10 note A_, 2 @@ -462,13 +462,13 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note E_, 4 note F#, 8 note F#, 4 - notetype2 6 + fade_wave 6 note F#, 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 note F#, 5 rest 2 - notetype0 7 + speed 7 note F_, 14 rest 2 dec_octave @@ -492,8 +492,8 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note A_, 1 note B_, 1 duty_cycle 1 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 .Loop1 note F_, 5 note C_, 5 @@ -546,31 +546,31 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) inc_octave note C#, 4 duty_cycle 0 - notetype1 8 - notetype0 7 + channel_volume 8 + speed 7 .Loop5 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 rest 1 - notetype1 7 + channel_volume 7 dec_octave note F_, 1 note A_, 8 inc_octave note E_, 1 - notetype1 2 + channel_volume 2 note E_, 1 rest 1 - notetype1 7 + channel_volume 7 note D_, 1 sound_loop 2, .Loop5 note C_, 1 - notetype1 2 + channel_volume 2 note C_, 1 rest 1 dec_octave - notetype1 7 + channel_volume 7 note F_, 1 note G#, 12 note C_, 1 @@ -598,50 +598,50 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) sound_loop 0, .MainLoop Branch_f9554: - notetype0 1 - notetype1 7 + speed 1 + channel_volume 7 note F_, 11 - notetype1 3 + channel_volume 3 note F_, 3 - notetype1 7 + channel_volume 7 note F_, 11 - notetype1 3 + channel_volume 3 note F_, 10 rest 7 - notetype1 7 + channel_volume 7 note F_, 4 - notetype1 3 + channel_volume 3 note F_, 3 - notetype1 7 + channel_volume 7 note F_, 4 - notetype1 3 + channel_volume 3 note F_, 3 .Loop6 - notetype1 7 + channel_volume 7 note F_, 11 - notetype1 3 + channel_volume 3 note F_, 3 sound_loop 2, .Loop6 sound_ret Music_PokemonDome_Ch3: ; f9579 (3e:5579) - notetype0 7 + speed 7 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 64 ;cutoff 6 octave 2 ;cutoff 4 - notetype0 1 + speed 1 .Loop1 note G_, 5 note G_, 5 note G_, 4 sound_loop 8, .Loop1 ;cutoff 6 - notetype0 7 + speed 7 .MainLoop inc_octave note C_, 2 diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm index 7cf909d6..54e52aec 100644 --- a/crysaudio/music/TCG/ronald.asm +++ b/crysaudio/music/TCG/ronald.asm @@ -9,17 +9,17 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 12, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 0 .MainLoop octave 3 - notetype0 13 + speed 13 .Loop1 - notetype1 9 - notetype2 3 + channel_volume 9 + fade_wave 3 note D_, 1 note D_, 1 - notetype2 4 + fade_wave 4 note F_, 1 rest 2 note D_, 1 @@ -30,17 +30,17 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 note F_, 1 rest 1 - notetype1 9 - notetype2 8 + channel_volume 9 + fade_wave 8 note E_, 2 rest 1 dec_octave - notetype1 9 - notetype2 3 + channel_volume 9 + fade_wave 3 note G_, 1 inc_octave note D_, 1 - notetype2 4 + fade_wave 4 note F_, 1 rest 2 note F_, 1 @@ -51,20 +51,20 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 note A_, 1 rest 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note G_, 2 rest 1 sound_loop 2, .Loop1 .Loop2 vibrato 20, 3, 3 sound_call Branch_fa9aa - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 2 vibrato 12, 3, 3 sound_call Branch_fa9ec @@ -72,28 +72,28 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) .Loop3 vibrato 20, 3, 3 sound_call Branch_fa9cb - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 2 vibrato 12, 3, 3 sound_call Branch_fa9ec sound_loop 2, .Loop3 sound_call Branch_fa9aa vibrato 20, 3, 3 - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 3 rest 7 duty_cycle 2 - notetype1 9 + channel_volume 9 rest 6 dec_octave - notetype2 4 + fade_wave 4 note G_, 7 inc_octave note F_, 6 @@ -108,12 +108,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note G_, 7 inc_octave - notetype2 8 + fade_wave 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - notetype2 4 + fade_wave 4 note A#, 6 inc_octave note C_, 7 @@ -122,22 +122,22 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note G_, 7 note F_, 6 note F#, 7 - notetype2 8 + fade_wave 8 note G_, 6 - notetype2 4 + fade_wave 4 note C#, 7 note C_, 6 dec_octave note A#, 7 inc_octave - notetype2 8 + fade_wave 8 note C_, 4 note C#, 4 note C_, 5 dec_octave note A#, 6 inc_octave - notetype2 4 + fade_wave 4 note C_, 7 dec_octave note A#, 6 @@ -145,23 +145,23 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 6 note F#, 7 note G_, 6 - notetype2 8 + fade_wave 8 note A#, 7 inc_octave note C_, 6 note D_, 7 - notetype0 13 + speed 13 sound_call Branch_fa9aa - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 3 rest 7 duty_cycle 2 - notetype1 9 + channel_volume 9 rest 6 dec_octave - notetype2 4 + fade_wave 4 note G_, 7 inc_octave note F_, 6 @@ -176,12 +176,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note G_, 7 inc_octave - notetype2 8 + fade_wave 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - notetype2 4 + fade_wave 4 note A#, 6 inc_octave note C_, 7 @@ -191,20 +191,20 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 6 note F#, 7 note G_, 6 - notetype2 8 + fade_wave 8 note A#, 7 inc_octave - notetype2 4 + fade_wave 4 note C_, 6 dec_octave note A#, 7 inc_octave - notetype2 8 + fade_wave 8 note C#, 4 note C_, 4 dec_octave note A#, 5 - notetype2 4 + fade_wave 4 note G_, 6 note F_, 7 note G_, 6 @@ -213,37 +213,37 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note A#, 7 inc_octave - notetype2 8 + fade_wave 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - notetype2 4 + fade_wave 4 note A#, 6 note G_, 7 - notetype2 8 + fade_wave 8 sound_call Branch_fa9cb - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 3 rest 7 duty_cycle 2 - notetype1 9 + channel_volume 9 rest 13 - notetype2 4 + fade_wave 4 note F_, 6 rest 7 - notetype2 8 + fade_wave 8 note E_, 4 note F_, 4 note E_, 5 - notetype2 4 + fade_wave 4 note D_, 6 rest 7 - notetype2 8 + fade_wave 8 note E_, 6 - notetype2 4 + fade_wave 4 note C_, 7 dec_octave note G_, 6 @@ -252,43 +252,43 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note C#, 6 note D_, 7 dec_octave - notetype2 8 + fade_wave 8 note A#, 6 - notetype2 4 + fade_wave 4 note G_, 7 rest 6 note F_, 7 - notetype2 8 + fade_wave 8 note F#, 6 - notetype2 4 + fade_wave 4 note G_, 7 - notetype2 8 + fade_wave 8 note A#, 6 - notetype2 4 + fade_wave 4 note G_, 7 note A#, 6 inc_octave note C_, 7 - notetype2 8 + fade_wave 8 note C#, 6 - notetype2 4 + fade_wave 4 note D_, 7 note F_, 6 note D_, 7 - notetype2 8 + fade_wave 8 note F_, 6 dec_octave - notetype2 4 + fade_wave 4 note G_, 7 dec_octave note G_, 6 inc_octave note D_, 7 duty_cycle 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 sound_call Branch_fa9cb - notetype0 1 + speed 1 octave 4 note C#, 3 note D_, 3 @@ -299,11 +299,11 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note G#, 10 note G_, 3 rest 10 - notetype0 13 + speed 13 note F_, 4 vibrato 12, 3, 3 - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note C_, 6 rest 7 rest 13 @@ -313,13 +313,13 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note A_, 6 rest 7 rest 13 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note G_, 2 rest 1 vibrato 20, 3, 3 - notetype0 1 - notetype1 10 + speed 1 + channel_volume 10 note F#, 3 note G_, 10 note A#, 3 @@ -396,10 +396,10 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 10 note G_, 3 rest 10 - notetype0 13 + speed 13 note A#, 3 rest 4 - notetype0 1 + speed 1 note B_, 3 inc_octave note C_, 16 @@ -414,7 +414,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note C#, 3 note D_, 10 ;tie - notetype0 13 + speed 13 note D_, 5 rest 1 dec_octave @@ -427,9 +427,9 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) Branch_fa9aa: octave 4 duty_cycle 1 - notetype1 10 + channel_volume 10 rest 2 - notetype0 1 + speed 1 note G#, 3 note A_, 3 rest 7 @@ -440,10 +440,10 @@ Branch_fa9aa: rest 13 note E_, 6 rest 7 - notetype0 13 + speed 13 rest 1 note F_, 1 - notetype0 1 + speed 1 note G_, 3 rest 10 note E_, 6 @@ -457,8 +457,8 @@ Branch_fa9aa: Branch_fa9cb: octave 4 duty_cycle 1 - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 note D#, 3 note E_, 10 note F_, 3 @@ -489,26 +489,26 @@ Branch_fa9cb: Branch_fa9ec: octave 3 duty_cycle 0 - notetype1 9 - notetype0 1 + channel_volume 9 + speed 1 note F_, 6 rest 7 - notetype0 13 + speed 13 rest 2 - notetype0 1 + speed 1 note F_, 6 rest 7 - notetype0 13 + speed 13 rest 3 - notetype0 1 + speed 1 note F_, 6 rest 7 rest 13 note A_, 6 rest 7 rest 13 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note G_, 2 rest 1 sound_ret @@ -518,13 +518,13 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) ;stereo_panning 1, 1 ;vibrato_type 8 vibrato 12, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 0 .MainLoop octave 2 .Loop1 - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note G_, 3 rest 3 note G_, 3 @@ -558,13 +558,13 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) note D_, 6 rest 7 rest 13 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note C_, 2 rest 1 dec_octave - notetype0 1 - notetype1 9 + speed 1 + channel_volume 9 note D_, 3 rest 3 note G_, 3 @@ -602,54 +602,54 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) note F_, 6 rest 7 rest 13 - notetype0 13 - notetype1 9 + speed 13 + channel_volume 9 note E_, 2 rest 1 dec_octave sound_loop 2, .Loop1 .Loop2 sound_call Branch_fab76 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note C_, 2 rest 1 sound_call Branch_fab76 - notetype2 8 - notetype1 8 + fade_wave 8 + channel_volume 8 note E_, 2 rest 1 sound_loop 4, .Loop2 .Loop3 vibrato 20, 3, 3 - notetype1 8 - notetype0 13 + channel_volume 8 + speed 13 duty_cycle 1 octave 4 rest 2 - notetype2 4 + fade_wave 4 note F_, 1 rest 1 - notetype2 8 + fade_wave 8 note D_, 1 dec_octave dec_octave - notetype2 4 + fade_wave 4 duty_cycle 0 - notetype1 9 + channel_volume 9 note A#, 1 rest 1 inc_octave inc_octave duty_cycle 1 - notetype1 8 + channel_volume 8 note C_, 1 rest 1 - notetype2 8 + fade_wave 8 note D_, 1 - notetype2 3 + fade_wave 3 note E_, 1 - notetype2 4 + fade_wave 4 note C_, 1 rest 1 dec_octave @@ -659,7 +659,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 2 vibrato 12, 3, 3 duty_cycle 0 - notetype1 9 + channel_volume 9 note F_, 1 rest 2 note F_, 1 @@ -672,8 +672,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note G_, 2 rest 1 sound_loop 2, .Loop3 @@ -683,8 +683,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 2 vibrato 12, 3, 3 duty_cycle 0 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note F_, 1 rest 2 note F_, 1 @@ -697,27 +697,27 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note G_, 2 rest 1 vibrato 20, 3, 3 sound_call Branch_fab8a octave 3 rest 1 - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note E_, 3 note F_, 10 note E_, 3 rest 10 - notetype0 13 + speed 13 note D_, 4 dec_octave vibrato 12, 3, 3 duty_cycle 0 - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note G_, 1 rest 1 inc_octave @@ -725,26 +725,26 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note D_, 1 rest 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note E_, 2 rest 1 sound_call Branch_fabb1 rest 1 - notetype2 4 + fade_wave 4 octave 2 note A#, 1 rest 1 note A#, 1 rest 1 inc_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 2 rest 1 - notetype1 9 + channel_volume 9 rest 2 - notetype2 4 + fade_wave 4 note F_, 1 rest 2 note F_, 1 @@ -755,35 +755,35 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note F_, 2 rest 1 sound_call Branch_fabb1 rest 1 octave 2 - notetype2 4 + fade_wave 4 note G_, 1 rest 1 note G_, 1 rest 1 inc_octave - notetype2 8 - notetype1 9 + fade_wave 8 + channel_volume 9 note C_, 2 rest 1 rest 2 dec_octave - notetype1 9 - notetype2 4 + channel_volume 9 + fade_wave 4 note G_, 1 rest 2 note G_, 1 rest 1 vibrato 20, 3, 3 - notetype2 8 + fade_wave 8 duty_cycle 1 - notetype1 7 + channel_volume 7 note F#, 8 rest 1 duty_cycle 0 @@ -792,10 +792,10 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) Branch_fab76: octave 2 - notetype1 9 - notetype0 13 + channel_volume 9 + speed 13 rest 2 - notetype2 4 + fade_wave 4 note A#, 1 rest 2 note A#, 1 @@ -812,13 +812,13 @@ Branch_fab76: Branch_fab8a: octave 4 duty_cycle 1 - notetype1 8 - notetype0 13 + channel_volume 8 + speed 13 note C_, 1 - notetype2 3 + fade_wave 3 note D_, 1 note E_, 1 - notetype2 4 + fade_wave 4 note C_, 1 rest 1 dec_octave @@ -827,15 +827,15 @@ Branch_fab8a: note A#, 1 rest 1 inc_octave - notetype2 8 + fade_wave 8 note C_, 1 - notetype2 3 + fade_wave 3 note D_, 1 note E_, 1 - notetype2 8 + fade_wave 8 note C_, 1 dec_octave - notetype2 4 + fade_wave 4 note A_, 1 rest 1 note A#, 1 @@ -843,10 +843,10 @@ Branch_fab8a: Branch_fabb1: octave 2 - notetype1 9 - notetype0 13 + channel_volume 9 + speed 13 rest 2 - notetype2 4 + fade_wave 4 note A#, 1 rest 2 note A#, 1 @@ -857,10 +857,10 @@ Branch_fabb1: Music_Ronald_Ch3: ; fabc0 (3e:6bc0) - notetype0 1 + speed 1 ;stereo_panning 1, 1 - notetype1 1 - notetype2 11 + channel_volume 1 + fade_wave 11 ;echo 0 ;cutoff 8 .MainLoop @@ -1042,10 +1042,10 @@ Music_Ronald_Ch3: ; fabc0 (3e:6bc0) dec_octave note A_, 6 rest 7 - notetype0 13 + speed 13 note G#, 8 rest 1 - notetype0 1 + speed 1 sound_loop 0, .MainLoop Branch_fac94: diff --git a/crysaudio/music/TCG/titlescreen.asm b/crysaudio/music/TCG/titlescreen.asm index 58e89095..951dfe42 100644 --- a/crysaudio/music/TCG/titlescreen.asm +++ b/crysaudio/music/TCG/titlescreen.asm @@ -6,270 +6,270 @@ Music_TCGTitleScreen: channel 4, Music_TCGTitleScreen_Ch4 Music_TCGTitleScreen_Ch1: ; f5052 (3d:5052) - notetype0 7 + speed 7 duty_cycle 0 ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 octave 3 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F_, 1 - notetype2 8 + fade_wave 8 note E_, 3 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 10 + channel_volume 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 13 - notetype2 6 + channel_volume 13 + fade_wave 6 note C_, 2 dec_octave - notetype2 8 + fade_wave 8 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 13 + channel_volume 13 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 - notetype2 8 + fade_wave 8 note G_, 5 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F_, 2 - notetype2 8 + fade_wave 8 note F_, 2 - notetype0 1 + speed 1 note E_, 5 ;tie note F_, 4 ;tie note E_, 5 - notetype0 7 + speed 7 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 - notetype2 8 + channel_volume 10 + fade_wave 8 note D_, 11 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 13 + channel_volume 13 note G_, 1 - notetype1 3 + channel_volume 3 note G_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note F_, 1 - notetype2 8 + fade_wave 8 note E_, 3 - notetype1 3 + channel_volume 3 note E_, 1 - notetype1 10 + channel_volume 10 note G_, 3 - notetype1 3 + channel_volume 3 note G_, 1 inc_octave - notetype1 10 + channel_volume 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 13 - notetype2 6 + channel_volume 13 + fade_wave 6 note E_, 2 dec_octave - notetype2 8 + fade_wave 8 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 13 + channel_volume 13 note E_, 2 note F_, 2 note G_, 2 note G#, 3 - notetype1 3 + channel_volume 3 note G#, 1 - notetype1 13 + channel_volume 13 inc_octave note C_, 3 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note D_, 5 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 13 - notetype2 6 + channel_volume 13 + fade_wave 6 note C_, 2 - notetype2 8 + fade_wave 8 note G_, 9 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 13 + channel_volume 13 note F_, 2 note C_, 2 note D_, 2 .Loop1 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note E_, 1 - notetype1 3 + channel_volume 3 note E_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note E_, 1 - notetype2 8 + fade_wave 8 sound_loop 2, .Loop1 note E_, 12 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note D_, 1 note C_, 1 note D_, 1 - notetype1 3 + channel_volume 3 note D_, 1 rest 1 - notetype1 10 - notetype2 6 + channel_volume 10 + fade_wave 6 note G_, 1 - notetype2 8 + fade_wave 8 note G_, 8 - notetype1 3 + channel_volume 3 note G_, 2 - notetype1 10 - notetype0 1 - notetype2 7 + channel_volume 10 + speed 1 + fade_wave 7 note G_, 5 note G_, 4 note G_, 5 - notetype2 8 - notetype0 7 + fade_wave 8 + speed 7 note G_, 9 - notetype1 3 + channel_volume 3 note G_, 1 - notetype1 10 + channel_volume 10 note F_, 2 note C_, 2 note D_, 2 note E_, 10 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note C_, 1 - notetype1 3 + channel_volume 3 note C_, 1 rest 1 - notetype2 6 - notetype1 10 + fade_wave 6 + channel_volume 10 note E_, 1 - notetype2 8 + fade_wave 8 note E_, 6 - notetype1 3 + channel_volume 3 note E_, 2 - notetype1 10 + channel_volume 10 note D_, 3 - notetype1 3 + channel_volume 3 note D_, 1 - notetype1 10 + channel_volume 10 note C_, 3 - notetype1 3 + channel_volume 3 note C_, 1 - notetype1 10 + channel_volume 10 note C_, 6 - notetype1 3 + channel_volume 3 note C_, 2 dec_octave - notetype1 10 + channel_volume 10 note B_, 5 - notetype1 3 + channel_volume 3 note B_, 2 - notetype1 10 + channel_volume 10 inc_octave - notetype2 6 + fade_wave 6 note C_, 1 - notetype2 8 + fade_wave 8 note C_, 8 ;tie note C_, 8 ;tie note C_, 8 - notetype1 3 + channel_volume 3 note C_, 8 sound_ret Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) - notetype0 7 + speed 7 duty_cycle 0 ;stereo_panning 1, 1 ;vibrato_type 1 vibrato 20, 3, 3 - notetype1 8 - notetype2 8 + channel_volume 8 + fade_wave 8 octave 2 note B_, 1 - notetype1 2 + channel_volume 2 note B_, 1 rest 1 inc_octave - notetype1 8 - notetype2 6 + channel_volume 8 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note C_, 3 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 3 rest 1 note G_, 5 rest 1 - notetype2 6 + fade_wave 6 note G_, 2 - notetype2 8 + fade_wave 8 note E_, 10 rest 2 note C_, 1 rest 2 - notetype2 6 + fade_wave 6 note E_, 1 - notetype2 8 + fade_wave 8 note F_, 5 rest 1 - notetype2 6 + fade_wave 6 note C_, 2 - notetype2 7 + fade_wave 7 note C_, 2 - notetype2 8 + fade_wave 8 note C_, 2 dec_octave note G_, 1 @@ -280,29 +280,29 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) note A_, 1 rest 2 inc_octave - notetype2 6 + fade_wave 6 note C_, 1 dec_octave - notetype2 8 + fade_wave 8 note B_, 3 rest 1 note B_, 1 rest 2 inc_octave - notetype2 6 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note C_, 3 - notetype1 2 + channel_volume 2 note C_, 1 - notetype1 8 + channel_volume 8 note E_, 3 rest 1 note G_, 5 rest 1 - notetype2 6 + fade_wave 6 note G_, 2 - notetype2 8 + fade_wave 8 note E_, 8 rest 2 note C_, 2 @@ -314,9 +314,9 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 1 note G#, 5 rest 1 - notetype2 6 + fade_wave 6 note F_, 2 - notetype2 8 + fade_wave 8 note G#, 9 rest 1 note G#, 2 @@ -327,64 +327,64 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 2 dec_octave note A_, 1 - notetype1 2 + channel_volume 2 note A_, 1 rest 1 - notetype1 8 + channel_volume 8 inc_octave - notetype2 6 + fade_wave 6 note C_, 1 - notetype2 8 + fade_wave 8 dec_octave note B_, 10 rest 2 note G_, 1 - notetype1 2 + channel_volume 2 note G_, 1 rest 1 - notetype1 8 - notetype2 6 + channel_volume 8 + fade_wave 6 note B_, 1 - notetype2 8 + fade_wave 8 note A_, 12 - notetype1 2 + channel_volume 2 note A_, 2 - notetype1 8 + channel_volume 8 note B_, 1 note A_, 1 note B_, 1 - notetype1 2 + channel_volume 2 note B_, 1 rest 1 - notetype1 8 + channel_volume 8 inc_octave - notetype2 6 + fade_wave 6 note D_, 1 - notetype2 8 + fade_wave 8 note D_, 8 rest 2 - notetype0 1 - notetype2 7 + speed 1 + fade_wave 7 note D_, 5 note D_, 4 note D_, 5 - notetype0 7 - notetype2 8 + speed 7 + fade_wave 8 note C_, 9 rest 1 note C_, 2 dec_octave - notetype2 7 + fade_wave 7 note G#, 2 - notetype2 8 + fade_wave 8 note G#, 2 note G_, 10 rest 2 note G_, 1 rest 2 - notetype2 6 + fade_wave 6 note G_, 1 - notetype2 8 + fade_wave 8 note A_, 6 rest 2 note F#, 3 @@ -395,30 +395,30 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 2 note F_, 5 rest 2 - notetype2 6 + fade_wave 6 note F_, 1 - notetype2 8 + fade_wave 8 note F_, 7 rest 1 - notetype0 1 - notetype2 8 + speed 1 + fade_wave 8 note F_, 14 rest 5 note D_, 13 rest 5 note F_, 14 rest 5 - notetype0 7 + speed 7 note E_, 8 - notetype1 2 + channel_volume 2 note E_, 8 sound_ret Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) - notetype0 7 - notetype2 14 - notetype1 1 + speed 7 + fade_wave 14 + channel_volume 1 ;echo 0 ;stereo_panning 1, 1 ;cutoff 6 @@ -484,7 +484,7 @@ Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) inc_octave note C_, 4 note C_, 4 - notetype0 1 + speed 1 note C_, 9 ;tie note C_, 10 @@ -495,7 +495,7 @@ Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) note G_, 9 ;tie note G_, 10 - notetype0 7 + speed 7 ;cutoff 8 note C_, 8 sound_ret diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm index fb710bae..4b9e154c 100644 --- a/crysaudio/music/TCG2/credits.asm +++ b/crysaudio/music/TCG2/credits.asm @@ -6,10 +6,10 @@ Music_TCG2Credits: channel 4, Music_TCG2Credits_Ch4 Music_TCG2Credits_Ch2: ; 1de32a (77:632a) - notetype1 10 + channel_volume 10 duty_cycle 2 - notetype1 15 - notetype0 1 + channel_volume 15 + speed 1 ;musicdc 255 octave 1 note G_, 16 @@ -136,7 +136,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 16 ;tie note G_, 4 - notetype1 13 + channel_volume 13 rest 15 inc_octave note D_, 14 @@ -409,7 +409,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 14 duty_cycle 1 octave 2 - notetype1 10 + channel_volume 10 ;musice4 203 note D_, 4 ;tie @@ -422,7 +422,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;musice4 242 note D_, 3 ;musice4 0 - notetype1 14 + channel_volume 14 note D_, 4 ;tie note D_, 3 @@ -525,9 +525,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;vibrato_type 5 vibrato 29, 3, 3 octave 1 - notetype1 10 + channel_volume 10 note G_, 15 - notetype1 14 + channel_volume 14 note G_, 14 ;tie note G_, 15 @@ -578,9 +578,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note D_, 7 - notetype1 10 + channel_volume 10 note G_, 15 - notetype1 14 + channel_volume 14 note G_, 14 ;tie note G_, 15 @@ -623,7 +623,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie note C_, 15 note G_, 14 - notetype1 10 + channel_volume 10 inc_octave ;musice4 196 note C_, 4 @@ -637,7 +637,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;musice4 241 note C_, 3 ;musice4 0 - notetype1 14 + channel_volume 14 note C_, 14 ;tie note C_, 15 @@ -677,14 +677,14 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note A_, 3 - notetype0 4 + speed 4 note E_, 15 ;tie note E_, 14 note A_, 15 ;tie note A_, 14 - notetype0 1 + speed 1 inc_octave ;musice4 203 note D_, 4 @@ -736,22 +736,22 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 15 note A_, 4 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 ;musicdc 255 vibrato 0, 3, 3 octave 2 note B_, 10 inc_octave - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 - notetype0 1 + speed 1 duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note C_, 15 ;tie @@ -775,11 +775,11 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;musice4 0 note G_, 7 inc_octave - notetype0 4 + speed 4 note C_, 15 ;tie note C_, 14 - notetype0 1 + speed 1 dec_octave note B_, 15 ;tie @@ -806,11 +806,11 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note A_, 3 - notetype0 4 + speed 4 note E_, 15 ;tie note E_, 14 - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 14 @@ -918,7 +918,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note G_, 7 - notetype0 4 + speed 4 note C_, 15 ;tie note C_, 14 @@ -928,7 +928,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A#, 15 ;tie note A#, 14 - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 14 @@ -1013,9 +1013,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) ;tie ;musice4 0 note D_, 7 - notetype1 10 + channel_volume 10 note G_, 15 - notetype1 14 + channel_volume 14 note G_, 14 ;tie note G_, 15 @@ -1041,12 +1041,12 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 3 ;musice4 0 dec_octave - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 ;tie - notetype0 1 + speed 1 note G_, 15 ;tie note G_, 14 @@ -1061,7 +1061,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A_, 15 note B_, 14 inc_octave - notetype0 4 + speed 4 note C_, 15 ;tie note C_, 14 @@ -1069,7 +1069,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note B_, 15 ;tie note B_, 14 - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 14 @@ -1103,7 +1103,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 note E_, 15 note F#, 14 - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 @@ -1116,7 +1116,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note E_, 15 ;tie note E_, 14 - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 14 @@ -1158,9 +1158,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note C_, 15 ;tie note C_, 14 - notetype1 10 + channel_volume 10 note D_, 15 - notetype1 14 + channel_volume 14 note D_, 14 ;tie note D_, 15 @@ -1192,7 +1192,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note G_, 15 ;tie @@ -1204,8 +1204,8 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 rest 15 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 vibrato 0, 3, 3 octave 3 rest 4 @@ -1228,7 +1228,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note D_, 14 octave 1 @@ -1242,8 +1242,8 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 rest 15 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 vibrato 0, 3, 3 octave 3 rest 4 @@ -1259,7 +1259,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note A#, 4 ;tie @@ -1285,8 +1285,8 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 rest 15 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 vibrato 0, 3, 3 octave 3 rest 4 @@ -1309,7 +1309,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) duty_cycle 1 ;vibrato_type 5 vibrato 29, 3, 3 - notetype1 14 + channel_volume 14 octave 1 note D_, 14 note G_, 15 @@ -1475,11 +1475,11 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A_, 15 note B_, 14 inc_octave - notetype1 7 + channel_volume 7 note C_, 15 ;tie note C_, 14 - notetype1 14 + channel_volume 14 note C_, 15 ;tie note C_, 14 @@ -1673,7 +1673,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 4 note C#, 11 rest 3 - notetype0 2 + speed 2 note D_, 15 ;tie note D_, 14 @@ -1681,7 +1681,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 15 ;tie note D_, 14 - notetype0 1 + speed 1 .Loop6 rept 4 note G_, 11 @@ -1703,20 +1703,20 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 3 sound_loop 4, .Loop7 ;musicf1 102 - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 - notetype0 2 + speed 2 note G_, 14 sound_ret Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) - notetype1 10 + channel_volume 10 duty_cycle 2 - notetype1 13 - notetype0 1 + channel_volume 13 + speed 1 ;musicdc 255 rest 15 octave 2 @@ -1834,7 +1834,7 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note C_, 16 ;tie note C_, 4 - notetype1 13 + channel_volume 13 dec_octave dec_octave note G_, 16 @@ -2333,14 +2333,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 15 inc_octave note C_, 10 - notetype1 13 + channel_volume 13 note D_, 4 ;tie - notetype0 4 + speed 4 note D_, 15 ;tie note G_, 14 - notetype0 1 + speed 1 ;musicf0 5 ;musicf1 71 octave 3 @@ -3053,11 +3053,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 7 ;tie - notetype0 3 + speed 3 note F_, 15 ;tie note F_, 14 - notetype0 1 + speed 1 rest 15 rest 14 rest 15 @@ -3074,11 +3074,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 7 ;tie - notetype0 3 + speed 3 note F_, 15 ;tie note F_, 14 - notetype0 1 + speed 1 rest 15 rest 14 rest 15 @@ -3095,11 +3095,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 7 ;tie - notetype0 3 + speed 3 note F_, 15 ;tie note F_, 14 - notetype0 1 + speed 1 rest 15 rest 14 rest 15 @@ -3116,11 +3116,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 7 ;tie - notetype0 3 + speed 3 note F_, 15 ;tie note F_, 14 - notetype0 1 + speed 1 rest 15 rest 14 octave 1 @@ -4045,24 +4045,24 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G_, 15 ;tie note G_, 14 - notetype0 2 + speed 2 note G_, 14 sound_ret Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) - notetype1 10 - ;notetype2 16 + channel_volume 10 + ;fade_wave 16 load_wave 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11 ;musicdc 255 - notetype0 1 - notetype1 1 + speed 1 + channel_volume 1 ;musice9 96 octave 5 ;musice8 8 ;vibrato_type 3 vibrato 15, 3, 3 - notetype1 2 + channel_volume 2 ;musice8 8 note G#, 3 note A_, 12 @@ -4113,17 +4113,17 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;musice8 1 note G_, 14 ;tie - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 ;tie - notetype0 2 + speed 2 note G_, 15 ;tie note G_, 14 ;musice8 8 - notetype0 1 + speed 1 note G#, 3 note A_, 12 ;tie @@ -4173,19 +4173,19 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;musice8 1 note G_, 14 ;tie - notetype0 4 + speed 4 note G_, 15 ;tie note G_, 14 ;tie - notetype0 1 + speed 1 note G_, 2 ;tie - notetype0 3 + speed 3 note G_, 9 - notetype0 1 + speed 1 ;musice8 8 - notetype1 1 + channel_volume 1 rest 15 rest 14 rest 15 @@ -4303,19 +4303,19 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note A_, 14 vibrato 0, 3, 3 ;musice8 8 - notetype1 2 + channel_volume 2 note B_, 15 ;tie note B_, 14 ;tie note B_, 15 dec_octave - notetype1 1 + channel_volume 1 sound_call Branch_1dfa9d sound_call Branch_1dfb57 - notetype0 2 + speed 2 note G_, 14 - notetype0 1 + speed 1 rest 1 rest 15 rest 14 @@ -4569,23 +4569,23 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;musice8 1 note D_, 14 ;tie - notetype0 4 + speed 4 note D_, 15 ;tie note D_, 14 ;tie - notetype0 2 + speed 2 note D_, 15 ;tie note D_, 14 ;tie - notetype0 1 + speed 1 note D_, 1 ;tie - notetype0 2 + speed 2 note D_, 14 ;musice8 8 - notetype0 1 + speed 1 vibrato 0, 3, 3 note C#, 3 note D_, 12 @@ -4628,15 +4628,15 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note G_, 15 vibrato 14, 3, 3 ;musice8 1 - notetype0 1 + speed 1 note D_, 14 ;tie - notetype0 4 + speed 4 note D_, 15 ;tie note D_, 14 ;tie - notetype0 1 + speed 1 note D_, 15 ;tie note D_, 14 @@ -4696,20 +4696,20 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note A_, 15 vibrato 0, 3, 3 - notetype1 2 + channel_volume 2 inc_octave ;musice8 1 note C_, 7 ;tie - notetype0 2 + speed 2 note C_, 11 - notetype0 8 - notetype0 1 + speed 8 + speed 1 note E_, 7 ;tie - notetype0 2 + speed 2 note E_, 11 - notetype0 1 + speed 1 ;musice8 8 note D_, 14 ;tie @@ -4723,7 +4723,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note F#, 14 inc_octave ;musice8 8 - notetype1 1 + channel_volume 1 note C#, 3 note D_, 12 note C_, 14 @@ -4782,7 +4782,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note D_, 15 vibrato 0, 3, 3 dec_octave - notetype1 2 + channel_volume 2 note B_, 3 inc_octave note C_, 11 @@ -4796,7 +4796,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note F_, 15 inc_octave ;musice8 8 - notetype1 1 + channel_volume 1 note C_, 14 dec_octave note B_, 15 @@ -4879,7 +4879,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note G_, 15 dec_octave note G_, 7 - notetype1 2 + channel_volume 2 note G_, 7 ;tie note G_, 15 @@ -4890,7 +4890,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note G_, 14 ;tie - notetype1 2 + channel_volume 2 ;musice8 1 note G_, 15 ;tie @@ -4903,7 +4903,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) rest 14 rest 8 octave 3 - notetype1 2 + channel_volume 2 ;musice4 253 note D_, 14 note G_, 15 @@ -4913,9 +4913,9 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) dec_octave note G_, 7 ;musice4 0 - notetype1 1 + channel_volume 1 note G_, 7 - notetype1 2 + channel_volume 2 note G_, 7 ;tie note G_, 15 @@ -4926,7 +4926,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note G_, 14 ;tie - notetype1 2 + channel_volume 2 ;musice8 1 note G_, 15 ;tie @@ -4939,7 +4939,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) rest 14 rest 8 octave 3 - notetype1 2 + channel_volume 2 ;musice4 253 note D_, 14 note G_, 15 @@ -4950,9 +4950,9 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note G_, 7 ;musice4 0 inc_octave - notetype1 1 + channel_volume 1 note C_, 7 - notetype1 2 + channel_volume 2 note C_, 7 ;tie note C_, 15 @@ -4966,11 +4966,11 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note C_, 15 ;tie note C_, 14 - notetype1 3 + channel_volume 3 note C_, 15 vibrato 0, 3, 3 rest 14 - notetype1 1 + channel_volume 1 rest 15 rest 14 rest 15 @@ -5029,9 +5029,9 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note F_, 1 ;tie - notetype0 2 + speed 2 note F_, 14 - notetype0 1 + speed 1 ;musice8 8 vibrato 29, 3, 3 note F#, 15 @@ -5147,9 +5147,9 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) ;tie note G_, 1 ;tie - notetype0 2 + speed 2 note G_, 14 - notetype0 1 + speed 1 vibrato 0, 3, 3 ;musice8 8 note F#, 3 @@ -5317,10 +5317,10 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note B_, 14 vibrato 0, 3, 3 ;musice8 1 - notetype0 1 - notetype1 2 + speed 1 + channel_volume 2 note B_, 14 - notetype1 3 + channel_volume 3 note B_, 7 rest 7 sound_ret diff --git a/crysaudio/music/TCG2/diddly1.asm b/crysaudio/music/TCG2/diddly1.asm index 08150658..3f6e739e 100644 --- a/crysaudio/music/TCG2/diddly1.asm +++ b/crysaudio/music/TCG2/diddly1.asm @@ -5,9 +5,9 @@ Music_Diddly1: channel 3, Music_Diddly1_Ch3 Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 octave 2 note D#, 2 note E_, 3 @@ -92,9 +92,9 @@ Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 octave 1 ;musicef 1 note G_, 2 @@ -184,16 +184,16 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype0 1 + speed 1 ;musicdc 255 octave 2 - notetype1 1 + channel_volume 1 note C_, 2 note C#, 3 - notetype1 2 + channel_volume 2 ;musicef 252 note C_, 3 note C#, 3 @@ -212,7 +212,7 @@ Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) note E_, 2 note G_, 3 note A#, 3 - notetype1 1 + channel_volume 1 inc_octave note C_, 3 dec_octave @@ -243,14 +243,14 @@ Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) note C_, 3 note E_, 3 dec_octave - notetype1 2 + channel_volume 2 note G_, 2 note A#, 3 inc_octave note C_, 3 note E_, 3 dec_octave - notetype1 128 + channel_volume 128 note G_, 2 note A#, 3 inc_octave diff --git a/crysaudio/music/TCG2/diddly2.asm b/crysaudio/music/TCG2/diddly2.asm index c579bcfe..f4d5d82c 100644 --- a/crysaudio/music/TCG2/diddly2.asm +++ b/crysaudio/music/TCG2/diddly2.asm @@ -5,9 +5,9 @@ Music_Diddly2: channel 3, Music_Diddly2_Ch3 Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 octave 2 note B_, 5 @@ -75,9 +75,9 @@ Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67) Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 octave 2 note F_, 4 @@ -173,16 +173,16 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) - notetype1 10 - notetype2 14 - notetype0 1 + channel_volume 10 + fade_wave 14 + speed 1 ;musice9 128 ;musicdc 255 ;musice8 7 - notetype1 1 + channel_volume 1 octave 2 note G_, 5 - notetype1 2 + channel_volume 2 note G_, 4 note G_, 4 note G_, 4 @@ -194,23 +194,23 @@ Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) note G_, 4 note G_, 4 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 5 note G_, 4 note G_, 4 note G_, 4 note G_, 4 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 5 note G_, 4 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 4 note G_, 4 - notetype1 1 + channel_volume 1 note G_, 5 note G_, 4 note G_, 4 @@ -218,14 +218,14 @@ Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) note G_, 4 note G_, 4 note G_, 4 - notetype1 2 + channel_volume 2 note G_, 5 note G_, 4 note G_, 4 note G_, 4 note G_, 4 note G_, 4 - notetype1 3 + channel_volume 3 note G_, 5 note G_, 4 note G_, 4 diff --git a/crysaudio/music/TCG2/diddly3.asm b/crysaudio/music/TCG2/diddly3.asm index 591ae08d..1558f770 100644 --- a/crysaudio/music/TCG2/diddly3.asm +++ b/crysaudio/music/TCG2/diddly3.asm @@ -5,9 +5,9 @@ Music_Diddly3: channel 3, Music_Diddly3_Ch3 Music_Diddly3_Ch2: ; 1ebe5d (7a:7e5d) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 octave 5 note C_, 3 @@ -28,9 +28,9 @@ Music_Diddly3_Ch2: ; 1ebe5d (7a:7e5d) Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 253 rest 1 @@ -53,14 +53,14 @@ Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76) Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype0 1 - notetype1 2 + speed 1 + channel_volume 2 ;musice9 128 ;musicdc 255 - notetype0 1 + speed 1 ;musice8 7 octave 5 note G_, 3 @@ -72,7 +72,7 @@ Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) note E_, 3 inc_octave note C_, 4 - notetype1 128 + channel_volume 128 note C_, 4 sound_ret ; 0x1ebeae diff --git a/crysaudio/music/TCG2/diddly4.asm b/crysaudio/music/TCG2/diddly4.asm index 27424bf2..57c9f15c 100644 --- a/crysaudio/music/TCG2/diddly4.asm +++ b/crysaudio/music/TCG2/diddly4.asm @@ -5,9 +5,9 @@ Music_Diddly4: channel 3, Music_Diddly4_Ch3 Music_Diddly4_Ch2: ; 1ebeae (7a:7eae) - notetype1 10 + channel_volume 10 ;musicf0 0 - notetype0 1 + speed 1 ;musicdc 255 octave 3 ;musicf1 87 @@ -30,9 +30,9 @@ Music_Diddly4_Ch2: ; 1ebeae (7a:7eae) Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) - notetype1 10 + channel_volume 10 ;musicf0 0 - notetype0 1 + speed 1 ;musicdc 255 octave 2 ;musicf1 87 @@ -55,13 +55,13 @@ Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) Music_Diddly4_Ch3: ; 1ebee0 (7a:7ee0) - notetype1 10 - notetype2 14 - notetype0 1 - notetype1 2 + channel_volume 10 + fade_wave 14 + speed 1 + channel_volume 2 ;musice9 128 ;musicdc 255 - notetype0 1 + speed 1 ;musice8 1 rest 6 rest 5 diff --git a/crysaudio/music/TCG2/diddly5.asm b/crysaudio/music/TCG2/diddly5.asm index 1f230cb1..28c68703 100644 --- a/crysaudio/music/TCG2/diddly5.asm +++ b/crysaudio/music/TCG2/diddly5.asm @@ -4,9 +4,9 @@ Music_Diddly5: channel 2, Music_Diddly5_Ch2 Music_Diddly5_Ch2: ; 1ebefa (7a:7efa) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 octave 3 note G_, 2 @@ -37,9 +37,9 @@ Music_Diddly5_Ch2: ; 1ebefa (7a:7efa) Music_Diddly5_Ch1: ; 1ebf1b (7a:7f1b) - notetype1 10 + channel_volume 10 ;musicf0 2 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 254 octave 2 diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm index df4019c1..d024c2b5 100644 --- a/crysaudio/music/TCG2/diddly6.asm +++ b/crysaudio/music/TCG2/diddly6.asm @@ -6,9 +6,9 @@ Music_Diddly6: channel 4, Music_Diddly6_Ch4 Music_Diddly6_Ch2: ; 1f76dc (7d:76dc) - notetype1 10 + channel_volume 10 ;musicf0 34 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 252 octave 3 @@ -79,15 +79,15 @@ Music_Diddly6_Ch2: ; 1f76dc (7d:76dc) note B_, 16 ;tie note B_, 2 - notetype0 2 + speed 2 note B_, 10 sound_ret Music_Diddly6_Ch1: ; 1f7731 (7d:7731) - notetype1 10 + channel_volume 10 ;musicf0 23 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 252 octave 3 @@ -227,18 +227,18 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731) note G_, 16 ;tie note G_, 2 - notetype0 2 + speed 2 note G_, 10 sound_ret Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype1 1 + channel_volume 1 ;musice9 96 - notetype0 1 + speed 1 ;musicdc 17 rest 10 rest 10 @@ -268,12 +268,12 @@ Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) note D_, 2 .Loop1 ;musice8 4 - notetype0 7 + speed 7 note G_, 3 - notetype0 10 + speed 10 note D_, 2 sound_loop 4, .Loop1 - notetype0 1 + speed 1 note G_, 16 ;tie note G_, 16 @@ -285,7 +285,7 @@ Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) note G_, 16 ;tie note G_, 2 - notetype0 2 + speed 2 ;musice8 1 note G_, 10 sound_ret diff --git a/crysaudio/music/TCG2/fort1.asm b/crysaudio/music/TCG2/fort1.asm index 9d165c69..f9b9d3ef 100644 --- a/crysaudio/music/TCG2/fort1.asm +++ b/crysaudio/music/TCG2/fort1.asm @@ -6,8 +6,8 @@ Music_Fort1: channel 4, Music_Fort1_Ch4 Music_Fort1_Ch2: ; 1ed6cc (7b:56cc) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 ;musicf0 16 octave 2 @@ -466,10 +466,10 @@ Branch_1ed8a8: Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 duty_cycle 0 - notetype1 9 + channel_volume 9 ;musicdc 17 ;vibrato_type 10 vibrato 18, 3, 3 @@ -517,7 +517,7 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) note C#, 10 rest 15 ;musicf3 - notetype1 8 + channel_volume 8 note D#, 3 note E_, 13 ;tie @@ -1004,10 +1004,10 @@ Branch_1edb5a: Music_Fort1_Ch3: ; 1edb66 (7b:5b66) - notetype1 10 - notetype0 1 - notetype2 14 - notetype1 1 + channel_volume 10 + speed 1 + fade_wave 14 + channel_volume 1 ;musice9 96 ;musicdc 17 octave 2 diff --git a/crysaudio/music/TCG2/fort2.asm b/crysaudio/music/TCG2/fort2.asm index a638e27a..6a379992 100644 --- a/crysaudio/music/TCG2/fort2.asm +++ b/crysaudio/music/TCG2/fort2.asm @@ -6,8 +6,8 @@ Music_Fort2: channel 4, Music_Fort2_Ch4 Music_Fort2_Ch2: ; 1edefc (7b:5efc) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 .MainLoop octave 3 @@ -545,8 +545,8 @@ Branch_1ee109: Music_Fort2_Ch1: ; 1ee12f (7b:612f) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 .MainLoop ;musicf0 23 @@ -996,16 +996,16 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) Music_Fort2_Ch3: ; 1ee319 (7b:6319) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype1 2 + channel_volume 2 ;musice9 0 ;musicdc 17 octave 4 ;musicf3 octave 3 - notetype0 1 + speed 1 rest 15 rest 15 octave 4 @@ -1054,7 +1054,7 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note D_, 4 rest 4 rest 7 - notetype1 1 + channel_volume 1 ;musice8 8 octave 2 note A_, 2 @@ -1725,9 +1725,9 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) ;tie note F#, 8 octave 4 - notetype1 2 + channel_volume 2 note E_, 7 - notetype1 1 + channel_volume 1 octave 3 note E_, 8 note F_, 7 @@ -1736,17 +1736,17 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note F#, 7 note B_, 8 octave 4 - notetype1 2 + channel_volume 2 note D_, 7 octave 3 - notetype1 2 + channel_volume 2 note A_, 8 note A#, 7 note B_, 8 - notetype1 2 + channel_volume 2 octave 5 note D_, 7 - notetype1 1 + channel_volume 1 octave 2 note E_, 8 rest 7 diff --git a/crysaudio/music/TCG2/fort3.asm b/crysaudio/music/TCG2/fort3.asm index 8c3826b1..59d89274 100644 --- a/crysaudio/music/TCG2/fort3.asm +++ b/crysaudio/music/TCG2/fort3.asm @@ -6,8 +6,8 @@ Music_Fort3: channel 4, Music_Fort3_Ch4 Music_Fort3_Ch2: ; 1ee797 (7b:6797) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 14 .MainLoop ;musicf0 9 @@ -713,8 +713,8 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 14 .MainLoop ;musicf0 9 @@ -1291,11 +1291,11 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) - notetype1 10 - notetype0 1 - notetype2 11 + channel_volume 10 + speed 1 + fade_wave 11 ;musicdc 255 - notetype1 1 + channel_volume 1 ;musice9 96 ;musicec 244 octave 3 @@ -1310,7 +1310,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;musice8 4 note D_, 14 ;musice8 8 - notetype1 2 + channel_volume 2 note F_, 4 ;tie note F#, 4 @@ -1337,10 +1337,10 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note F_, 15 ;tie note F_, 14 - notetype1 3 + channel_volume 3 note F_, 15 dec_octave - notetype1 1 + channel_volume 1 note F_, 7 note F#, 7 note G_, 15 @@ -1348,7 +1348,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;musice8 4 note D_, 14 ;musice8 8 - notetype1 2 + channel_volume 2 note D#, 4 ;tie note E_, 4 @@ -1375,10 +1375,10 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note D#, 15 ;tie note D#, 14 - notetype1 3 + channel_volume 3 note D#, 15 dec_octave - notetype1 1 + channel_volume 1 note F_, 7 note F#, 7 note G_, 15 @@ -1386,7 +1386,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;musice8 4 note D_, 14 ;musice8 8 - notetype1 2 + channel_volume 2 note F_, 4 ;tie note F#, 4 @@ -1413,10 +1413,10 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note F_, 15 ;tie note F_, 14 - notetype1 3 + channel_volume 3 note F_, 15 dec_octave - notetype1 1 + channel_volume 1 note F_, 7 note F#, 7 note G_, 15 @@ -1424,7 +1424,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;musice8 4 note D_, 14 ;musice8 8 - notetype1 2 + channel_volume 2 note D#, 4 ;tie note E_, 4 @@ -1446,7 +1446,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) ;tie note D#, 15 dec_octave - notetype1 1 + channel_volume 1 note F_, 7 ;musice8 3 note G_, 15 @@ -1995,12 +1995,12 @@ Branch_1ef040: sound_ret Branch_1ef06a: - notetype1 1 + channel_volume 1 vibrato 12, 3, 3 sound_ret Branch_1ef06f: - notetype1 1 + channel_volume 1 vibrato 0, 3, 3 sound_ret diff --git a/crysaudio/music/TCG2/fort4.asm b/crysaudio/music/TCG2/fort4.asm index 912374d6..2db9ca63 100644 --- a/crysaudio/music/TCG2/fort4.asm +++ b/crysaudio/music/TCG2/fort4.asm @@ -6,21 +6,21 @@ Music_Fort4: channel 4, Music_Fort4_Ch4 Music_Fort4_Ch2: ; 1f16cc (7c:56cc) - notetype1 10 + channel_volume 10 ;musicf0 22 - notetype0 1 + speed 1 ;musicdc 255 octave 2 note C_, 16 .MainLoop ;musicf0 9 - notetype0 1 + speed 1 ;musicdc 255 ;musicef 255 ;musicf1 71 octave 2 - notetype0 4 - notetype2 7 + speed 4 + fade_wave 7 ;musicf2 .Loop1 note D_, 1 @@ -45,13 +45,13 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) sound_loop 4, .Loop1 duty_cycle 1 octave 3 - notetype2 8 - notetype0 8 + fade_wave 8 + speed 8 ;musicf1 103 ;musicf3 - notetype1 2 + channel_volume 2 note E_, 14 - notetype1 11 + channel_volume 11 ;vibrato_type 5 vibrato 1, 3, 3 ;musicf2 @@ -68,20 +68,20 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note E_, 4 note E_, 2 ;musicf3 - notetype1 1 + channel_volume 1 note D_, 10 - notetype1 11 + channel_volume 11 ;musicf2 note D_, 14 note D_, 2 ;musicf3 - notetype1 11 + channel_volume 11 note D_, 4 note D_, 2 ;musicf3 - notetype1 2 + channel_volume 2 note G_, 10 - notetype1 11 + channel_volume 11 ;musicf2 note G_, 6 note G_, 2 @@ -90,12 +90,12 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note C_, 3 note F_, 2 vibrato 40, 3, 3 - notetype0 1 + speed 1 note E_, 4 - notetype0 8 - notetype0 1 + speed 8 + speed 1 note F_, 4 - notetype0 8 + speed 8 ;musicf2 note E_, 5 ;tie @@ -104,9 +104,9 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note E_, 12 note E_, 4 ;musicf3 - notetype1 2 + channel_volume 2 note E_, 14 - notetype1 11 + channel_volume 11 ;vibrato_type 5 vibrato 1, 3, 3 ;musicf2 @@ -123,83 +123,83 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note A_, 4 note A_, 2 ;musicf3 - notetype1 1 + channel_volume 1 note G_, 10 - notetype1 11 + channel_volume 11 ;musicf2 note G_, 14 note G_, 2 ;musicf3 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 ;musicf2 note A_, 4 note A_, 2 - notetype1 11 + channel_volume 11 ;musicf3 note G_, 6 ;musicf2 note D_, 2 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 6 note G_, 2 ;musicf3 note F_, 4 - notetype1 11 + channel_volume 11 note G_, 3 - notetype0 4 + speed 4 note F_, 1 note G_, 1 - notetype0 8 + speed 8 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 note F_, 7 - notetype1 11 + channel_volume 11 vibrato 1, 3, 3 note F_, 8 vibrato 0, 3, 3 - notetype0 4 + speed 4 note E_, 1 note F_, 1 - notetype0 8 + speed 8 vibrato 48, 3, 3 note E_, 8 - notetype1 1 + channel_volume 1 note F_, 4 - notetype1 11 + channel_volume 11 note G_, 4 - notetype1 1 + channel_volume 1 note A_, 6 - notetype1 11 + channel_volume 11 note A_, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 inc_octave note C_, 6 - notetype1 11 + channel_volume 11 note C_, 2 dec_octave - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 12 + channel_volume 12 ;musicf2 note A_, 1 note A_, 1 rest 2 ;musicf3 ;musicf0 9 - notetype0 1 + speed 1 ;musicdc 255 octave 3 ;musicf1 96 - notetype0 4 - notetype2 7 + speed 4 + fade_wave 7 ;musicf2 note E_, 1 rest 1 @@ -239,41 +239,41 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) sound_loop 3, .Loop2 duty_cycle 1 octave 3 - notetype2 8 + fade_wave 8 vibrato 0, 3, 3 - notetype0 8 + speed 8 ;musicf1 103 ;musicf3 .Loop3 - notetype1 1 + channel_volume 1 note A_, 6 - notetype1 11 + channel_volume 11 note A_, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 inc_octave note C_, 6 - notetype1 11 + channel_volume 11 note C_, 2 dec_octave - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 sound_loop 2, .Loop3 - notetype1 8 - notetype0 1 + channel_volume 8 + speed 1 note A_, 4 - notetype0 8 - notetype0 1 - notetype1 9 + speed 8 + speed 1 + channel_volume 9 note A#, 4 - notetype0 8 + speed 8 vibrato 40, 3, 3 - notetype1 8 + channel_volume 8 note A_, 15 note A_, 16 ;tie @@ -282,8 +282,8 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note A_, 8 note A_, 1 dec_octave - notetype0 1 - notetype1 12 + speed 1 + channel_volume 12 ;musicf1 102 ;musicf3 note A#, 8 @@ -307,13 +307,13 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) Music_Fort4_Ch1: ; 1f1852 (7c:5852) - notetype1 10 - notetype1 15 + channel_volume 10 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 3 ;musicef 250 note G_, 5 @@ -321,19 +321,19 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note G_, 5 ;musicef 4 note G_, 6 - notetype0 8 + speed 8 note G_, 4 ;musicee 0 rest 12 .MainLoop ;musicee 0 - notetype0 8 + speed 8 rest 16 rest 16 rest 16 ;musicf0 23 ;musicf1 23 - notetype0 4 + speed 4 octave 4 ;musicf3 rest 1 @@ -982,62 +982,62 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 duty_cycle 1 octave 3 - notetype2 8 - notetype0 8 + fade_wave 8 + speed 8 ;musicf1 103 ;musicf3 octave 3 - notetype1 1 + channel_volume 1 note F_, 6 - notetype1 11 + channel_volume 11 note F_, 2 - notetype1 1 + channel_volume 1 note D_, 6 - notetype1 11 + channel_volume 11 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 note D_, 6 - notetype1 11 + channel_volume 11 note D_, 2 - notetype1 12 + channel_volume 12 ;musicf2 note E_, 1 note E_, 1 rest 1 ;musicf3 - notetype1 15 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 3 ;musicef 250 note G_, 4 ;musicef 2 note G_, 4 ;musicef 4 - notetype0 8 + speed 8 note G_, 4 rest 4 inc_octave note C_, 4 dec_octave .Loop4 - notetype0 8 + speed 8 rest 3 - notetype0 1 + speed 1 octave 3 ;musicef 250 note G_, 4 ;musicef 2 note G_, 4 ;musicef 4 - notetype0 8 + speed 8 note G_, 4 inc_octave rest 4 @@ -1047,58 +1047,58 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) ;musicee 0 duty_cycle 1 octave 3 - notetype2 8 - notetype0 8 + fade_wave 8 + speed 8 ;musicf1 103 ;musicf3 octave 3 - notetype1 1 + channel_volume 1 note D#, 6 - notetype1 11 + channel_volume 11 note D#, 2 - notetype1 1 + channel_volume 1 note C#, 6 - notetype1 11 + channel_volume 11 note C#, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 note C#, 6 sound_call Branch_1f1c7c duty_cycle 1 octave 3 - notetype2 8 - notetype0 8 + fade_wave 8 + speed 8 ;musicf1 103 ;musicf3 octave 3 - notetype1 1 + channel_volume 1 note E_, 6 - notetype1 11 + channel_volume 11 note E_, 2 - notetype1 1 + channel_volume 1 note D_, 6 - notetype1 11 + channel_volume 11 note D_, 2 - notetype1 1 + channel_volume 1 note G_, 6 - notetype1 11 + channel_volume 11 note G_, 2 - notetype1 1 + channel_volume 1 note D_, 6 - notetype1 11 + channel_volume 11 note D_, 2 ;musicee 0 ;musicf0 4 octave 3 ;musicf1 80 ;musicf3 - notetype0 1 + speed 1 note E_, 4 note F_, 4 - notetype0 8 + speed 8 note E_, 5 sound_call Branch_1f1c69 ;musicf0 4 @@ -1138,10 +1138,10 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note F_, 1 note F_, 2 ;musicf3 - notetype0 1 + speed 1 note E_, 4 note F_, 4 - notetype0 8 + speed 8 note E_, 5 sound_call Branch_1f1c69 ;musicf0 4 @@ -1162,15 +1162,15 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note D_, 1 note D_, 2 ;musicf3 - notetype0 1 + speed 1 note C#, 4 note D_, 4 - notetype0 8 + speed 8 ;musicf2 note C#, 7 note C#, 1 ;musicf3 - notetype0 1 + speed 1 octave 2 note G_, 8 ;musicf2 @@ -1189,30 +1189,30 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note C#, 5 note C#, 3 ;musicf3 - notetype0 8 + speed 8 rest 16 sound_loop 0, .MainLoop Branch_1f1c69: - notetype1 15 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 3 note G_, 16 ;musicee 0 - notetype0 8 + speed 8 sound_ret Branch_1f1c7c: - notetype1 15 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 3 ;musicef 250 note G_, 5 @@ -1221,30 +1221,30 @@ Branch_1f1c7c: ;musicef 2 note G_, 6 ;musicee 0 - notetype0 8 + speed 8 sound_ret Branch_1f1c97: - notetype1 15 + channel_volume 15 duty_cycle 2 ;musicee 28 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 octave 4 note G_, 8 ;musicee 0 - notetype0 8 + speed 8 sound_ret Music_Fort4_Ch3: ; 1f1caa (7c:5caa) - notetype1 10 - notetype2 11 - notetype1 1 + channel_volume 10 + fade_wave 11 + channel_volume 1 ;musice9 96 ;musicdc 255 - notetype0 1 + speed 1 octave 2 note C_, 16 .MainLoop @@ -1256,7 +1256,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1271,14 +1271,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1298,7 +1298,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop1 .Loop2 @@ -1308,7 +1308,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G#, 4 rest 4 @@ -1323,14 +1323,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G#, 4 rest 4 @@ -1350,7 +1350,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop2 .Loop3 @@ -1360,7 +1360,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1375,14 +1375,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1402,7 +1402,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop3 ;musice8 6 @@ -1411,7 +1411,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1426,14 +1426,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1453,7 +1453,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 ;musice8 6 note D_, 16 @@ -1461,7 +1461,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1476,14 +1476,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1491,7 +1491,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note G#, 4 ;tie note A_, 4 @@ -1510,7 +1510,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1525,14 +1525,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note A_, 4 rest 4 @@ -1552,7 +1552,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop4 .Loop5 @@ -1562,7 +1562,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1577,14 +1577,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1604,7 +1604,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 sound_loop 2, .Loop5 ;musice8 6 @@ -1613,7 +1613,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1628,14 +1628,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1655,7 +1655,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note C_, 16 ;musice8 6 note D_, 16 @@ -1663,7 +1663,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1678,14 +1678,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note D_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note G_, 4 rest 4 @@ -1705,7 +1705,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note G_, 16 ;musice8 6 note A_, 16 @@ -1713,7 +1713,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note F_, 4 rest 4 @@ -1728,14 +1728,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note A_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note F_, 4 rest 4 @@ -1755,7 +1755,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note G_, 16 ;musice8 6 note A_, 16 @@ -1763,7 +1763,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note E_, 4 rest 4 @@ -1778,14 +1778,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 ;musice8 6 note A_, 16 ;musice8 8 inc_octave inc_octave inc_octave - notetype1 2 + channel_volume 2 ;musice8 7 note E_, 4 rest 4 @@ -1805,7 +1805,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave dec_octave - notetype1 1 + channel_volume 1 note G_, 8 note A_, 8 ;vibrato_type 5 @@ -1854,14 +1854,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) sound_call Branch_1f1ff8 ;vibrato_type 5 vibrato 48, 3, 3 - notetype0 8 + speed 8 note D#, 16 ;tie note D#, 16 note E_, 16 ;tie note E_, 16 - notetype0 1 + speed 1 ;musice8 6 note A_, 16 rest 16 @@ -1942,10 +1942,10 @@ Branch_1f1ff8: ;musice8 7 note F_, 5 rest 3 - notetype1 2 + channel_volume 2 note F_, 5 rest 3 - notetype1 1 + channel_volume 1 ;musice8 6 dec_octave dec_octave @@ -1955,10 +1955,10 @@ Branch_1f1ff8: ;musice8 7 note A_, 5 rest 3 - notetype1 2 + channel_volume 2 note A_, 5 rest 3 - notetype1 1 + channel_volume 1 ;musice8 6 dec_octave rest 16 @@ -1973,10 +1973,10 @@ Branch_1f1ff8: ;musice8 7 note F_, 5 rest 3 - notetype1 2 + channel_volume 2 note F_, 5 rest 3 - notetype1 1 + channel_volume 1 ;musice8 6 dec_octave dec_octave @@ -1986,10 +1986,10 @@ Branch_1f1ff8: ;musice8 7 note A_, 5 rest 3 - notetype1 2 + channel_volume 2 note A_, 5 rest 3 - notetype1 1 + channel_volume 1 ;musice8 6 dec_octave rest 16 diff --git a/crysaudio/music/TCG2/gamecorner.asm b/crysaudio/music/TCG2/gamecorner.asm index fb425859..dea37aeb 100644 --- a/crysaudio/music/TCG2/gamecorner.asm +++ b/crysaudio/music/TCG2/gamecorner.asm @@ -6,13 +6,13 @@ Music_TCG2GameCorner: channel 4, Music_TCG2GameCorner_Ch4 Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 17 octave 1 ;musicf3 vibrato 1, 3, 3 - notetype0 1 + speed 1 .Loop1 note A_, 1 ;tie @@ -372,14 +372,14 @@ Branch_1e75c7: Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c) - notetype1 10 + channel_volume 10 .MainLoop - notetype1 12 + channel_volume 12 duty_cycle 2 ;musicee 30 ;musicdc 255 vibrato 0, 3, 3 - notetype0 1 + speed 1 .Loop1 octave 4 rest 16 @@ -829,11 +829,11 @@ Branch_1e778f: Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) - notetype1 10 - notetype2 11 - notetype1 1 + channel_volume 10 + fade_wave 11 + channel_volume 1 ;musice9 64 - notetype0 1 + speed 1 ;musicdc 255 .MainLoop octave 2 diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm index 8ce64198..a14ea62b 100644 --- a/crysaudio/music/TCG2/grblimp.asm +++ b/crysaudio/music/TCG2/grblimp.asm @@ -6,14 +6,14 @@ Music_GRBlimp: channel 4, Music_GRBlimp_Ch4 Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) - notetype1 10 + channel_volume 10 ;musicdc 17 ;vibrato_type 1 vibrato 28, 3, 3 - notetype2 8 + fade_wave 8 octave 4 duty_cycle 2 - notetype1 7 + channel_volume 7 vibrato 28, 3, 3 ;musicf0 0 ;musicdc 255 @@ -40,9 +40,9 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note A#, 5 note D#, 14 note G_, 4 - notetype0 6 + speed 6 note F_, 14 - notetype0 1 + speed 1 note F_, 14 sound_call Branch_1e7cf5 note G#, 16 @@ -67,13 +67,13 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note A#, 14 note A#, 4 inc_octave - notetype0 6 + speed 6 note C_, 14 - notetype0 1 + speed 1 note C_, 14 ;musicf0 2 ;musicf3 - notetype0 1 + speed 1 note C_, 5 note C#, 5 note D#, 4 @@ -215,25 +215,25 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) inc_octave vibrato 28, 3, 3 ;musicf1 70 - notetype0 7 + speed 7 note D_, 16 note D_, 2 sound_ret Branch_1e7cf5: octave 4 - notetype0 1 + speed 1 ;musicf2 note C_, 4 note C_, 3 note D_, 4 note C_, 3 ;musicf1 69 - notetype0 7 + speed 7 note D#, 10 note D#, 2 ;musicf1 48 - notetype0 1 + speed 1 note D_, 4 note D_, 3 note C_, 4 @@ -245,12 +245,12 @@ Branch_1e7cf5: note D_, 4 dec_octave note A#, 3 - notetype0 7 + speed 7 inc_octave note C_, 12 note C_, 2 dec_octave - notetype0 1 + speed 1 note A_, 4 note A_, 3 note A_, 4 @@ -292,11 +292,11 @@ Branch_1e7cf5: note C_, 3 note D_, 4 note C_, 3 - notetype0 7 + speed 7 note D#, 10 note D#, 2 ;musicf1 64 - notetype0 1 + speed 1 note D_, 4 note D_, 3 note C_, 4 @@ -333,12 +333,12 @@ Branch_1e7cf5: Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) - notetype1 10 + channel_volume 10 ;musicdc 17 ;vibrato_type 1 vibrato 28, 3, 3 - notetype2 8 - notetype0 7 + fade_wave 8 + speed 7 octave 3 ;musicf0 1 ;musicf1 64 @@ -590,7 +590,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note D#, 4 vibrato 28, 3, 3 ;musicf1 70 - notetype0 7 + speed 7 note A#, 16 note A#, 2 sound_ret @@ -598,15 +598,15 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) Branch_1e7e8a: octave 3 ;musicf2 - notetype0 1 + speed 1 note A_, 4 note A_, 3 note A_, 4 note A_, 3 - notetype0 7 + speed 7 note A#, 10 note A#, 2 - notetype0 1 + speed 1 ;musicf1 64 note A#, 4 note A#, 3 @@ -616,10 +616,10 @@ Branch_1e7e8a: note A#, 3 note A#, 4 note G_, 3 - notetype0 7 + speed 7 note A_, 12 note A_, 2 - notetype0 1 + speed 1 note F_, 4 note F_, 3 note F_, 4 @@ -656,10 +656,10 @@ Branch_1e7e8a: note A_, 3 note A_, 4 note A_, 3 - notetype0 7 + speed 7 note A#, 10 note A#, 2 - notetype0 1 + speed 1 ;musicf1 64 note A#, 4 note A#, 3 @@ -689,16 +689,16 @@ Branch_1e7e8a: Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) - notetype1 10 + channel_volume 10 ;musicdc 17 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;musice8 3 ;musice9 96 octave 2 - notetype0 1 + speed 1 rest 14 - notetype0 7 + speed 7 .Loop1 note F_, 4 note C_, 4 @@ -754,7 +754,7 @@ Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) note D#, 4 note A#, 4 ;musice8 2 - notetype0 1 + speed 1 note G#, 10 ;tie note G#, 9 @@ -771,7 +771,7 @@ Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) ;tie note A#, 6 ;tie - notetype0 7 + speed 7 note A#, 14 ;tie note A#, 2 diff --git a/crysaudio/music/TCG2/grcastle.asm b/crysaudio/music/TCG2/grcastle.asm index 3edd1cf4..38032b6c 100644 --- a/crysaudio/music/TCG2/grcastle.asm +++ b/crysaudio/music/TCG2/grcastle.asm @@ -6,8 +6,8 @@ Music_GRCastle: channel 4, Music_GRCastle_Ch4 Music_GRCastle_Ch2: ; 1f213c (7c:613c) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 12 ;musicf0 8 octave 1 @@ -93,11 +93,11 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) ;musicf0 0 ;musicf3 octave 2 - notetype1 7 + channel_volume 7 note E_, 16 ;tie note E_, 9 - notetype1 11 + channel_volume 11 note E_, 16 ;tie note E_, 9 @@ -521,7 +521,7 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) ;musicf1 71 ;musicf3 octave 2 - notetype1 8 + channel_volume 8 note B_, 16 ;tie note B_, 9 @@ -903,8 +903,8 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) Music_GRCastle_Ch1: ; 1f2525 (7c:6525) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 12 ;musicf0 8 octave 1 @@ -1818,12 +1818,12 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) Music_GRCastle_Ch3: ; 1f2903 (7c:6903) - notetype1 10 - notetype2 11 - notetype1 1 + channel_volume 10 + fade_wave 11 + channel_volume 1 ;musice9 96 ;musicdc 255 - notetype0 1 + speed 1 rest 12 ;vibrato_type 5 vibrato 0, 3, 3 @@ -2328,7 +2328,7 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) vibrato 50, 3, 3 ;musicec 244 octave 2 - notetype0 10 + speed 10 note E_, 10 ;tie note E_, 10 @@ -2341,12 +2341,12 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) ;tie note E_, 10 ;tie - notetype0 5 - notetype1 3 + speed 5 + channel_volume 3 note E_, 15 - notetype1 1 + channel_volume 1 ;musicec 0 - notetype0 1 + speed 1 note D_, 13 note E_, 12 rest 13 @@ -2366,7 +2366,7 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) sound_loop 0, .MainLoop Branch_1f2b72: - notetype1 2 + channel_volume 2 octave 2 note B_, 2 rest 2 @@ -2379,13 +2379,13 @@ Branch_1f2b72: ;tie note B_, 12 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 octave 2 ;musicec 0 sound_ret Branch_1f2b88: - notetype1 2 + channel_volume 2 octave 3 note C_, 2 rest 1 @@ -2398,24 +2398,24 @@ Branch_1f2b88: ;tie note F_, 12 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 octave 2 ;musicec 0 sound_ret Branch_1f2b9e: - notetype1 2 + channel_volume 2 octave 3 note D_, 12 ;tie note D_, 13 - notetype1 1 + channel_volume 1 octave 2 ;musicec 0 sound_ret Branch_1f2baa: - notetype1 2 + channel_volume 2 octave 2 note B_, 13 note B_, 2 @@ -2429,12 +2429,12 @@ Branch_1f2baa: ;tie note B_, 12 vibrato 0, 3, 3 - notetype1 1 + channel_volume 1 octave 2 sound_ret Branch_1f2bbf: - notetype1 2 + channel_volume 2 octave 2 note B_, 2 rest 3 @@ -2442,7 +2442,7 @@ Branch_1f2bbf: rest 3 note B_, 1 rest 3 - notetype1 1 + channel_volume 1 sound_ret diff --git a/crysaudio/music/TCG2/grchallengecup.asm b/crysaudio/music/TCG2/grchallengecup.asm index 732b99d0..6d9ce1c7 100644 --- a/crysaudio/music/TCG2/grchallengecup.asm +++ b/crysaudio/music/TCG2/grchallengecup.asm @@ -7,8 +7,8 @@ Music_GRChallengeCup: Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) ;.MainLoop - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 ;musicf0 0 octave 4 @@ -70,16 +70,16 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note B_, 15 note B_, 5 ;musicef 250 - notetype1 2 + channel_volume 2 ;musicf3 - notetype0 6 + speed 6 note A_, 10 ;tie - notetype0 1 + speed 1 note A_, 15 ;tie note A_, 10 - notetype1 10 + channel_volume 10 ;musicf1 54 note A_, 5 note A_, 15 @@ -91,7 +91,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) .Loop1 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note E_, 5 note E_, 10 note E_, 5 @@ -113,7 +113,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) .Loop2 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note F_, 5 note F_, 10 note F_, 5 @@ -131,7 +131,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) .Loop3 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note F#, 5 note F#, 10 note F#, 5 @@ -148,7 +148,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) sound_loop 2, .Loop3 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note F_, 5 note F_, 10 note F_, 5 @@ -164,7 +164,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note F_, 2 octave 2 ;musicf2 - notetype2 8 + fade_wave 8 note F_, 5 note F_, 10 note F_, 5 @@ -482,8 +482,8 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) ;.MainLoop - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 17 ;musicf0 1 ;musicef 255 @@ -550,16 +550,16 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note D_, 15 note D_, 5 ;musicef 250 - notetype1 2 + channel_volume 2 ;musicf3 - notetype0 6 + speed 6 note C#, 10 ;tie - notetype0 1 + speed 1 note C#, 15 ;tie note C#, 10 - notetype1 9 + channel_volume 9 ;musicf1 54 note C#, 5 note C#, 15 @@ -570,7 +570,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) .Loop1 octave 1 ;musicf2 - notetype2 8 + fade_wave 8 note A_, 5 note A_, 10 note A_, 5 @@ -592,7 +592,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) .Loop2 octave 1 ;musicf2 - notetype2 8 + fade_wave 8 note A_, 5 note A_, 10 note A_, 5 @@ -611,7 +611,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) sound_loop 5, .Loop2 octave 1 ;musicf2 - notetype2 8 + fade_wave 8 note A_, 5 note A_, 10 note A_, 5 @@ -625,7 +625,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note B_, 8 dec_octave ;musicf0 21 - notetype1 8 + channel_volume 8 octave 2 note A_, 5 rest 2 @@ -820,11 +820,11 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) ;tie note E_, 15 inc_octave - notetype1 6 + channel_volume 6 note D_, 15 ;tie note D_, 15 - notetype1 6 + channel_volume 6 note C#, 15 ;tie note C#, 15 @@ -872,7 +872,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) ;musicf3 note B_, 15 ;musicf2 - notetype2 8 + fade_wave 8 note E_, 5 note E_, 3 note E_, 5 @@ -910,17 +910,17 @@ Branch_1f3150: note G_, 4 note G_, 3 ;musicf0 21 - notetype1 8 + channel_volume 8 octave 3 ;musicf3 sound_ret Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) - notetype1 10 - notetype0 1 - notetype2 11 - notetype1 1 + channel_volume 10 + speed 1 + fade_wave 11 + channel_volume 1 ;musice9 96 ;musicdc 17 octave 5 @@ -1290,10 +1290,10 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) Branch_1f333b: octave 3 - notetype1 2 + channel_volume 2 ;musice8 8 note A_, 15 - notetype1 1 + channel_volume 1 ;musice8 4 ;musicec 0 octave 2 diff --git a/crysaudio/music/TCG2/grdueltheme1.asm b/crysaudio/music/TCG2/grdueltheme1.asm index 49dd84b0..9a5399f6 100644 --- a/crysaudio/music/TCG2/grdueltheme1.asm +++ b/crysaudio/music/TCG2/grdueltheme1.asm @@ -6,9 +6,9 @@ Music_GRDuelTheme1: channel 4, Music_GRDuelTheme1_Ch4 Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) - notetype1 10 + channel_volume 10 ;musicdc 255 - notetype0 1 + speed 1 ;musicf0 16 octave 3 ;musicf1 54 @@ -906,9 +906,9 @@ Branch_1f5ae8: Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) - notetype1 10 + channel_volume 10 ;musicdc 255 - notetype0 1 + speed 1 ;musicf0 16 ;musicef 255 octave 3 @@ -1871,7 +1871,7 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) ;musicf0 16 octave 3 ;musicf1 53 - notetype1 7 + channel_volume 7 .Loop6 note C#, 15 ;tie @@ -1914,10 +1914,10 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) - notetype1 10 - notetype0 1 - notetype2 11 - notetype1 1 + channel_volume 10 + speed 1 + fade_wave 11 + channel_volume 1 ;musice9 64 ;musicdc 17 octave 3 @@ -1931,388 +1931,388 @@ Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) .Loop2 sound_call Branch_1f6313 sound_loop 6, .Loop2 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note C_, 2 - notetype0 1 + speed 1 note C#, 14 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 inc_octave - notetype0 1 + speed 1 note C_, 14 dec_octave - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note F#, 14 - notetype0 11 + speed 11 note F_, 2 inc_octave note C_, 2 - notetype0 1 + speed 1 note F_, 14 dec_octave - notetype0 11 + speed 11 note F_, 2 inc_octave note C_, 2 dec_octave dec_octave - notetype0 1 + speed 1 note A_, 14 - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note A#, 14 dec_octave - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note E_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 - notetype0 1 + speed 1 note D#, 14 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note G_, 2 inc_octave note D_, 2 - notetype0 1 + speed 1 note G_, 14 dec_octave - notetype0 11 + speed 11 note G_, 2 inc_octave note D_, 2 - notetype0 1 + speed 1 note C#, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 inc_octave - notetype0 1 + speed 1 note C_, 14 dec_octave - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note A#, 14 - notetype0 11 + speed 11 note G#, 2 inc_octave note D#, 2 dec_octave - notetype0 1 + speed 1 note D#, 14 - notetype0 11 + speed 11 note G#, 2 inc_octave note D#, 2 dec_octave - notetype0 1 + speed 1 note G#, 14 sound_call Branch_1f6313 sound_call Branch_1f6313 sound_call Branch_1f6313 sound_call Branch_1f6313 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note C_, 2 - notetype0 1 + speed 1 note C#, 14 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 inc_octave - notetype0 1 + speed 1 note C_, 14 dec_octave - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note F#, 14 - notetype0 11 + speed 11 note F_, 2 inc_octave note C_, 2 - notetype0 1 + speed 1 note F_, 14 dec_octave - notetype0 11 + speed 11 note F_, 2 inc_octave note C_, 2 dec_octave dec_octave - notetype0 1 + speed 1 note A_, 14 - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note A#, 14 dec_octave - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note E_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 inc_octave - notetype0 1 + speed 1 note D#, 14 dec_octave - notetype0 11 + speed 11 note D#, 2 note A#, 2 - notetype0 1 + speed 1 note D#, 14 - notetype0 11 + speed 11 note D_, 2 note A_, 2 inc_octave - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 dec_octave - notetype0 11 + speed 11 note G_, 2 inc_octave note D_, 2 - notetype0 1 + speed 1 note G_, 14 dec_octave - notetype0 11 + speed 11 note G_, 2 inc_octave note D_, 2 - notetype0 1 + speed 1 note C#, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 inc_octave - notetype0 1 + speed 1 note C_, 14 dec_octave - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note A#, 14 - notetype0 11 + speed 11 note G#, 2 inc_octave note D#, 2 dec_octave - notetype0 1 + speed 1 note D#, 14 - notetype0 11 + speed 11 note G#, 2 inc_octave note D#, 2 dec_octave - notetype0 1 + speed 1 note G#, 14 sound_call Branch_1f6313 sound_call Branch_1f6313 sound_call Branch_1f6313 - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 note D#, 16 ;tie note D#, 13 rest 16 rest 13 - notetype0 1 + speed 1 note G_, 15 note A_, 14 note A#, 15 @@ -2401,55 +2401,55 @@ Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) sound_call Branch_1f6313 sound_call Branch_1f6313 sound_call Branch_1f6313 - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note C_, 14 - notetype0 11 + speed 11 note A#, 2 note F_, 2 - notetype0 1 + speed 1 note A#, 14 - notetype0 11 + speed 11 note A_, 2 note E_, 2 - notetype0 1 + speed 1 note A_, 14 - notetype0 11 + speed 11 note G_, 2 note D_, 2 - notetype0 1 + speed 1 note G_, 14 - notetype0 11 + speed 11 note C_, 2 note G_, 2 - notetype0 1 + speed 1 note C_, 14 - notetype0 11 + speed 11 note F_, 2 note C_, 2 dec_octave - notetype0 1 + speed 1 note B_, 14 - notetype0 11 + speed 11 note A#, 2 inc_octave note F_, 2 - notetype0 1 + speed 1 note A#, 14 - notetype0 11 + speed 11 note G_, 2 note D_, 2 - notetype0 1 + speed 1 note G_, 14 ;musice8 7 - notetype0 1 + speed 1 note D#, 16 ;tie note D#, 13 @@ -2465,15 +2465,15 @@ Branch_1f6313: octave 3 ;musicec 244 ;musice8 7 - notetype0 11 + speed 11 note D_, 2 note A_, 2 - notetype0 1 + speed 1 note D_, 14 - notetype0 11 + speed 11 note D#, 2 note A#, 2 - notetype0 1 + speed 1 note D#, 14 sound_ret diff --git a/crysaudio/music/TCG2/grdueltheme2.asm b/crysaudio/music/TCG2/grdueltheme2.asm index a725bebe..8e910231 100644 --- a/crysaudio/music/TCG2/grdueltheme2.asm +++ b/crysaudio/music/TCG2/grdueltheme2.asm @@ -6,10 +6,10 @@ Music_GRDuelTheme2: channel 4, Music_GRDuelTheme2_Ch4 Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) - notetype1 10 + channel_volume 10 ;musicf0 0 octave 3 - notetype0 1 + speed 1 ;musicdc 255 ;musicf1 71 ;musicf3 @@ -1107,10 +1107,10 @@ Branch_1ef628: Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) - notetype1 10 + channel_volume 10 ;musicf0 9 octave 2 - notetype0 1 + speed 1 ;musicdc 255 octave 3 note E_, 14 @@ -2148,11 +2148,11 @@ Branch_1efa62: Music_GRDuelTheme2_Ch3: ; 1efa74 (7b:7a74) - notetype1 10 - ;notetype2 15 + channel_volume 10 + ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - notetype0 1 - notetype1 1 + speed 1 + channel_volume 1 ;musice9 96 ;musicdc 255 octave 2 diff --git a/crysaudio/music/TCG2/grdueltheme3.asm b/crysaudio/music/TCG2/grdueltheme3.asm index 1edac673..8ac2eabb 100644 --- a/crysaudio/music/TCG2/grdueltheme3.asm +++ b/crysaudio/music/TCG2/grdueltheme3.asm @@ -6,12 +6,12 @@ Music_GRDuelTheme3: channel 4, Music_GRDuelTheme3_Ch4 Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 27 ;musicdc 255 ;musicf3 - notetype0 1 + speed 1 ;musicef 1 .Loop1 octave 3 @@ -797,12 +797,12 @@ Branch_1f672f: Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 27 ;musicef 255 ;musicdc 255 - notetype0 1 + speed 1 ;musicf1 80 .Loop1 octave 2 @@ -2146,11 +2146,11 @@ Branch_1f6df4: Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) - notetype1 10 - notetype2 11 + channel_volume 10 + fade_wave 11 ;musicdc 255 - notetype0 1 - notetype1 1 + speed 1 + channel_volume 1 ;musice9 96 .MainLoop octave 3 @@ -2191,9 +2191,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 ;tie note E_, 7 - notetype1 3 + channel_volume 3 note E_, 6 - notetype1 1 + channel_volume 1 sound_loop 3, .Loop1 note D_, 14 ;tie @@ -2220,9 +2220,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 ;tie note E_, 13 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 1 + channel_volume 1 inc_octave note D_, 7 note E_, 7 @@ -2268,9 +2268,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 ;tie note E_, 7 - notetype1 3 + channel_volume 3 note E_, 6 - notetype1 1 + channel_volume 1 note D_, 14 ;tie note D_, 7 @@ -2296,9 +2296,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 ;tie note E_, 13 - notetype1 3 + channel_volume 3 note E_, 7 - notetype1 1 + channel_volume 1 note B_, 7 inc_octave note D_, 7 @@ -2343,9 +2343,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note F_, 14 ;tie note F_, 7 - notetype1 3 + channel_volume 3 note F_, 6 - notetype1 1 + channel_volume 1 vibrato 48, 3, 3 note F#, 14 ;tie @@ -2369,9 +2369,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note B_, 14 ;tie note B_, 13 - notetype1 3 + channel_volume 3 note B_, 7 - notetype1 1 + channel_volume 1 note B_, 7 inc_octave note D_, 7 diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm index 46954b4d..d9db8ccd 100644 --- a/crysaudio/music/TCG2/groverworld.asm +++ b/crysaudio/music/TCG2/groverworld.asm @@ -6,7 +6,7 @@ Music_GROverworld: channel 4, Music_GROverworld_Ch4 Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) - notetype1 10 + channel_volume 10 .MainLoop sound_call Branch_1eae1e note A#, 16 @@ -25,10 +25,10 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note A_, 6 note F_, 16 note F_, 6 - notetype0 11 + speed 11 note G_, 12 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -244,15 +244,15 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note A#, 16 note A#, 6 ;musicf3 - notetype0 11 + speed 11 note A#, 6 note A_, 6 note G_, 6 - notetype0 1 - notetype0 11 + speed 1 + speed 11 note F_, 3 ;tie - notetype0 1 + speed 1 note F_, 1 ;tie note F_, 16 @@ -261,7 +261,7 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) Branch_1eae1e: ;musicf0 13 octave 3 - notetype0 1 + speed 1 ;musicdc 17 vibrato 33, 3, 3 ;musicef 1 @@ -401,12 +401,12 @@ Branch_1eae1e: Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 rest 16 .MainLoop ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -561,7 +561,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) rest 1 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note B_, 5 @@ -570,7 +570,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 5 note C_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -632,7 +632,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note A_, 5 @@ -641,7 +641,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 5 note C_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -697,7 +697,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note B_, 5 @@ -706,7 +706,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 5 note D_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -768,13 +768,13 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 ;musicf0 15 octave 3 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note C_, 8 note C_, 8 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -830,7 +830,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note B_, 5 @@ -839,7 +839,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 5 note C_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -901,7 +901,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note A_, 5 @@ -910,7 +910,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 5 note C_, 3 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -966,7 +966,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 4 ;musicf0 15 octave 2 - notetype2 8 + fade_wave 8 ;musicf1 48 ;musicf2 note B_, 5 @@ -990,11 +990,11 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note E_, 16 note E_, 6 ;musicf3 - notetype0 11 + speed 11 note G_, 6 note F#, 3 ;musicef 2 - notetype0 1 + speed 1 ;musicf0 14 ;musicef 254 octave 2 @@ -1006,7 +1006,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note A#, 5 ;musicef 2 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -1079,7 +1079,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note D_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -1147,7 +1147,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 4 note A_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -1219,7 +1219,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note C_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf1 70 @@ -1290,7 +1290,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note D_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -1355,7 +1355,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 note G_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 4 ;musicf1 70 @@ -1418,7 +1418,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note F_, 4 ;musicf0 11 - notetype0 1 + speed 1 ;musicdc 17 octave 3 ;musicf1 70 @@ -1490,13 +1490,13 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) ;musicf0 14 octave 3 ;musicf3 - notetype0 11 + speed 11 note F_, 12 note D#, 6 - notetype0 11 + speed 11 note C_, 3 ;tie - notetype0 1 + speed 1 note C_, 1 ;tie note C_, 16 @@ -1505,13 +1505,13 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) - notetype1 10 + channel_volume 10 ;musicdc 17 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;musice8 1 ;musice9 96 - notetype0 1 + speed 1 rest 16 .MainLoop ;musice8 1 @@ -1735,7 +1735,7 @@ Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) ;tie note C_, 8 ;musice8 1 - notetype0 1 + speed 1 note D_, 16 ;tie note D_, 16 @@ -1930,14 +1930,14 @@ Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) ;musice8 8 ;vibrato_type 5 vibrato 32, 3, 3 - notetype0 11 + speed 11 note F_, 3 ;tie note F_, 3 ;tie note F_, 3 ;tie - notetype0 1 + speed 1 note F_, 16 ;tie note A#, 4 @@ -1946,14 +1946,14 @@ Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) ;tie inc_octave note C_, 9 - notetype0 11 + speed 11 note F_, 3 ;tie note F_, 3 ;tie note F_, 3 ;tie - notetype0 1 + speed 1 note F_, 16 rest 16 rest 1 diff --git a/crysaudio/music/TCG2/herecomesgr.asm b/crysaudio/music/TCG2/herecomesgr.asm index e69920e9..20d004a3 100644 --- a/crysaudio/music/TCG2/herecomesgr.asm +++ b/crysaudio/music/TCG2/herecomesgr.asm @@ -6,9 +6,9 @@ Music_HereComesGR: channel 4, Music_HereComesGR_Ch4 Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) - notetype1 10 + channel_volume 10 .MainLoop - notetype0 1 + speed 1 ;musicdc 17 ;musicf0 8 ;musicf1 55 @@ -87,7 +87,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) sound_call Branch_1ea5ed ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note D_, 10 note D_, 11 @@ -101,7 +101,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicef 254 .Loop1 note G_, 3 @@ -124,7 +124,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) sound_call Branch_1ea5ed ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf1 55 ;musicf2 note D_, 10 @@ -133,7 +133,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 10 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note B_, 6 ;tie inc_octave @@ -155,7 +155,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) sound_call Branch_1ea5ed ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note D_, 10 note D_, 11 @@ -169,7 +169,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicef 254 .Loop2 note G_, 3 @@ -191,14 +191,14 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf1 55 sound_call Branch_1ea5ed ;musicf0 9 - notetype2 4 - notetype2 4 + fade_wave 4 + fade_wave 4 octave 4 ;musicf2 note G_, 10 note G_, 11 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 3 ;musicf2 note G_, 10 @@ -228,11 +228,11 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note D_, 11 ;musicf0 9 octave 3 - notetype2 8 + fade_wave 8 note C#, 10 ;musicf2 note D_, 6 @@ -264,7 +264,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf0 9 ;musicf1 16 octave 4 - notetype2 6 + fade_wave 6 ;musicf3 note F_, 10 rest 11 @@ -272,7 +272,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 11 ;musicef 1 ;musicf1 55 - notetype2 8 + fade_wave 8 ;musicf3 octave 3 note C#, 10 @@ -303,11 +303,11 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note D_, 11 ;musicf0 9 octave 3 - notetype2 8 + fade_wave 8 note C#, 10 ;musicf2 note D_, 6 @@ -359,13 +359,13 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musice4 0 note G#, 1 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note A#, 16 ;tie note A#, 5 ;musicf0 9 - notetype2 8 + fade_wave 8 ;musicef 2 octave 1 note A_, 3 @@ -400,7 +400,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicf1 103 note G_, 5 rest 6 @@ -411,13 +411,13 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicef 252 ;musicf1 39 octave 3 - notetype2 4 + fade_wave 4 rest 11 ;musicf2 note F_, 10 note F_, 11 ;musicf3 - notetype2 8 + fade_wave 8 ;musicef 4 ;musicf1 55 ;musicf3 @@ -429,7 +429,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 1 note C_, 1 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note B_, 6 ;tie @@ -448,7 +448,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) octave 3 note C_, 11 ;musicf0 9 - notetype2 8 + fade_wave 8 inc_octave ;musicf2 note F_, 4 @@ -463,14 +463,14 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) inc_octave inc_octave ;musicf0 9 - notetype2 8 + fade_wave 8 ;musicf2 note E_, 4 note E_, 7 dec_octave dec_octave ;musicf0 8 - notetype2 8 + fade_wave 8 note B_, 5 note B_, 5 ;musicf3 @@ -478,7 +478,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf0 9 inc_octave inc_octave - notetype2 8 + fade_wave 8 ;musicf2 note D#, 4 note D#, 6 @@ -486,7 +486,7 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) dec_octave ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note A#, 5 note A#, 6 ;musicf3 @@ -494,14 +494,14 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) ;musicf0 9 inc_octave inc_octave - notetype2 8 + fade_wave 8 ;musicf2 note C#, 4 note C#, 7 dec_octave dec_octave ;musicf0 8 - notetype2 8 + fade_wave 8 note G#, 5 note G#, 5 ;musicf3 @@ -557,14 +557,14 @@ Branch_1ea603: ;musicf3 ;musicf0 9 octave 4 - notetype2 8 + fade_wave 8 ;musicf2 note C_, 4 note C_, 6 ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicf1 55 note G_, 5 rest 6 @@ -575,12 +575,12 @@ Branch_1ea603: ;musicef 252 ;musicf1 39 octave 3 - notetype2 4 + fade_wave 4 rest 11 ;musicf2 note F_, 10 note F_, 11 - notetype2 8 + fade_wave 8 ;musicf3 ;musicef 4 ;musicf1 55 @@ -604,7 +604,7 @@ Branch_1ea603: Branch_1ea64e: ;musicf0 8 - notetype2 8 + fade_wave 8 octave 3 ;musicef 255 note G#, 16 @@ -635,7 +635,7 @@ Branch_1ea64e: Branch_1ea66f: ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note E_, 16 ;tie @@ -651,9 +651,9 @@ Branch_1ea66f: Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) - notetype1 10 + channel_volume 10 .MainLoop - notetype0 1 + speed 1 ;musicdc 17 octave 2 ;musicf0 8 @@ -723,7 +723,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) sound_call Branch_1ea5f8 ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note C_, 10 note C_, 11 @@ -732,14 +732,14 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 11 dec_octave ;musicef 252 - notetype2 4 + fade_wave 4 note A#, 10 ;musicef 4 ;musicf1 55 ;musicf3 ;musicf0 9 octave 1 - notetype2 8 + fade_wave 8 ;musicef 254 .Loop1 note D_, 2 @@ -757,7 +757,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) sound_call Branch_1ea5f8 ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note C_, 10 note C_, 11 @@ -765,7 +765,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note F#, 6 ;tie note G_, 5 @@ -785,7 +785,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) sound_call Branch_1ea5f8 ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note C_, 10 note C_, 11 @@ -800,7 +800,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 ;musicef 254 .Loop2 note D_, 2 @@ -817,14 +817,14 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) sound_call Branch_1ea5f8 ;musicf0 9 octave 4 - notetype2 4 + fade_wave 4 ;musicf2 note C_, 10 note C_, 11 ;musicf3 ;musicf0 8 octave 3 - notetype2 8 + fade_wave 8 note C_, 10 dec_octave rest 11 @@ -842,7 +842,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note G#, 5 note G_, 10 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note A#, 11 note G_, 10 @@ -859,19 +859,19 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 5 octave 4 rest 11 - notetype2 4 + fade_wave 4 note C_, 10 rest 11 dec_octave ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note F_, 10 sound_call Branch_1ea5ed rest 10 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note G_, 16 ;tie note G_, 5 @@ -888,7 +888,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 5 rest 11 ;musicf0 9 - notetype2 6 + fade_wave 6 ;musicf1 16 octave 3 ;musicf3 @@ -900,7 +900,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 ;musicf1 55 - notetype2 8 + fade_wave 8 octave 2 note G_, 10 note F_, 11 @@ -911,7 +911,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note D_, 10 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note G_, 11 ;tie note G_, 10 @@ -928,13 +928,13 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 5 octave 4 rest 11 - notetype2 4 + fade_wave 4 note C_, 10 rest 11 dec_octave ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note F_, 10 ;musicf2 note G_, 8 @@ -949,7 +949,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note G_, 16 ;tie note G_, 5 @@ -1018,7 +1018,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) octave 2 sound_call Branch_1ea5ed ;musicf0 9 - notetype2 4 + fade_wave 4 octave 3 ;musicf2 note A#, 10 @@ -1026,18 +1026,18 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) ;musicf3 ;musicf0 8 octave 1 - notetype2 8 + fade_wave 8 rest 10 ;musicf0 9 ;musicef 252 ;musicf1 55 octave 2 - notetype2 4 + fade_wave 4 rest 11 note A#, 10 note A#, 11 ;musicf3 - notetype2 8 + fade_wave 8 ;musicef 4 ;musicf1 55 ;musicf3 @@ -1049,7 +1049,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 1 note C_, 1 ;musicf0 8 - notetype2 8 + fade_wave 8 octave 2 note F#, 6 ;tie @@ -1067,7 +1067,7 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) octave 2 note G_, 11 ;musicf0 9 - notetype2 8 + fade_wave 8 inc_octave inc_octave ;musicf2 @@ -1082,40 +1082,40 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note F#, 10 inc_octave ;musicf0 9 - notetype2 8 + fade_wave 8 ;musicf2 note B_, 4 note B_, 7 dec_octave ;musicf0 8 - notetype2 8 + fade_wave 8 note F#, 5 note F#, 5 ;musicf3 note F_, 11 ;musicf0 9 inc_octave - notetype2 8 + fade_wave 8 ;musicf2 note A#, 4 note A#, 6 dec_octave ;musicf0 8 octave 2 - notetype2 8 + fade_wave 8 note F_, 5 note F_, 6 ;musicf3 note D#, 10 ;musicf0 9 inc_octave - notetype2 8 + fade_wave 8 ;musicf2 note G#, 4 note G#, 7 dec_octave ;musicf0 8 - notetype2 8 + fade_wave 8 note D#, 5 note D#, 5 ;musicf3 @@ -1143,18 +1143,18 @@ Branch_1ea8d3: note G_, 11 ;musicf0 9 octave 3 - notetype2 4 + fade_wave 4 note A#, 10 note A#, 11 ;musicf3 rest 10 ;musicef 252 octave 2 - notetype2 4 + fade_wave 4 rest 11 note A#, 10 rest 11 - notetype2 8 + fade_wave 8 ;musicef 4 ;musicf1 55 ;musicf3 @@ -1217,10 +1217,10 @@ Branch_1ea90c: Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) - notetype1 10 - notetype0 1 - notetype2 11 - notetype1 1 + channel_volume 10 + speed 1 + fade_wave 11 + channel_volume 1 ;musice9 128 ;musicdc 17 .MainLoop @@ -1295,11 +1295,11 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note C#, 10 note D_, 11 inc_octave - notetype1 2 + channel_volume 2 ;musice8 8 note C_, 10 ;musice8 8 - notetype1 1 + channel_volume 1 dec_octave note C#, 11 note C_, 10 @@ -1310,7 +1310,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) dec_octave note F_, 11 note G#, 10 - notetype1 1 + channel_volume 1 octave 2 note G_, 8 rest 3 @@ -1321,11 +1321,11 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) octave 5 ;musice8 4 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 11 ;musice8 8 octave 2 - notetype1 2 + channel_volume 2 note F_, 10 note G_, 11 octave 5 @@ -1333,7 +1333,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note F_, 10 ;musice8 8 octave 2 - notetype1 1 + channel_volume 1 rest 10 rest 11 note C_, 5 @@ -1344,7 +1344,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note F_, 16 ;tie note F_, 5 - notetype1 1 + channel_volume 1 octave 2 note G_, 8 rest 3 @@ -1355,10 +1355,10 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) octave 5 ;musice8 4 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 11 ;musice8 8 - notetype1 1 + channel_volume 1 octave 2 rest 10 note G#, 6 @@ -1373,7 +1373,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note A_, 16 ;tie note A_, 10 - notetype1 1 + channel_volume 1 octave 2 note G_, 8 rest 3 @@ -1384,18 +1384,18 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) octave 5 ;musice8 4 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 11 ;musice8 8 octave 2 - notetype1 2 + channel_volume 2 note F_, 10 note G_, 11 octave 5 ;musice8 4 note F_, 10 ;musice8 8 - notetype1 1 + channel_volume 1 octave 2 rest 10 rest 11 @@ -1497,12 +1497,12 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) inc_octave ;musice8 4 note F_, 10 - notetype1 3 + channel_volume 3 note F_, 11 ;musice8 8 dec_octave dec_octave - notetype1 2 + channel_volume 2 dec_octave note C_, 10 note D_, 8 @@ -1513,7 +1513,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) dec_octave note G_, 3 rest 7 - notetype1 1 + channel_volume 1 note C_, 16 ;tie note C_, 5 @@ -1532,12 +1532,12 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) inc_octave ;musice8 4 note F_, 10 - notetype1 3 + channel_volume 3 note F_, 11 ;musice8 8 dec_octave dec_octave - notetype1 2 + channel_volume 2 dec_octave note C_, 10 note D_, 8 @@ -1548,7 +1548,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) dec_octave note G_, 3 rest 7 - notetype1 1 + channel_volume 1 note C#, 6 ;tie note D_, 5 @@ -1568,12 +1568,12 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) inc_octave ;musice8 4 note F_, 10 - notetype1 3 + channel_volume 3 note F_, 11 ;musice8 8 dec_octave dec_octave - notetype1 2 + channel_volume 2 dec_octave note C_, 10 note D_, 8 @@ -1584,7 +1584,7 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) dec_octave note G_, 3 rest 7 - notetype1 1 + channel_volume 1 note C_, 16 ;tie note C_, 5 @@ -1656,7 +1656,7 @@ Branch_1eaaf6: note F#, 16 ;tie note F#, 5 - notetype1 1 + channel_volume 1 octave 2 note G_, 8 rest 3 @@ -1667,11 +1667,11 @@ Branch_1eaaf6: octave 5 ;musice8 4 note G_, 10 - notetype1 3 + channel_volume 3 note G_, 11 ;musice8 8 octave 2 - notetype1 1 + channel_volume 1 rest 10 rest 16 rest 16 diff --git a/crysaudio/music/TCG2/imakuni2.asm b/crysaudio/music/TCG2/imakuni2.asm index c43a54db..0a1707af 100644 --- a/crysaudio/music/TCG2/imakuni2.asm +++ b/crysaudio/music/TCG2/imakuni2.asm @@ -6,12 +6,12 @@ Music_Imakuni2: channel 4, Music_Imakuni2_Ch4 Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 31 ;musicf3 ;musicdc 255 - notetype0 1 + speed 1 octave 2 ;musicf0 31 note A_, 9 @@ -230,7 +230,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) dec_octave note A_, 5 rest 12 - notetype1 9 + channel_volume 9 note G_, 16 ;tie note G_, 9 @@ -335,7 +335,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) inc_octave note A_, 5 rest 12 - notetype1 8 + channel_volume 8 note G_, 16 ;tie note G_, 9 @@ -449,7 +449,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) dec_octave note A#, 5 rest 12 - notetype1 9 + channel_volume 9 note G#, 16 ;tie note G#, 9 @@ -543,7 +543,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) inc_octave note A_, 5 rest 12 - notetype1 8 + channel_volume 8 note G_, 16 ;tie note G_, 9 @@ -749,7 +749,7 @@ Branch_1f3762: ;musicf1 101 ;musicf3 ;musicdc 255 - notetype0 1 + speed 1 ;musicef 255 octave 4 note C#, 5 @@ -767,13 +767,13 @@ Branch_1f3762: Music_Imakuni2_Ch1: ; 1f377a (7c:777a) - notetype1 10 + channel_volume 10 .MainLoop ;musicf0 9 ;musicf1 103 ;musicf3 ;musicdc 255 - notetype0 1 + speed 1 ;musicef 255 octave 4 rest 9 @@ -1371,7 +1371,7 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) note C_, 8 dec_octave note F_, 8 - notetype1 4 + channel_volume 4 note E_, 16 ;tie note E_, 16 @@ -1415,11 +1415,11 @@ Branch_1f3a58: Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) - notetype1 10 - notetype0 1 - notetype2 11 + channel_volume 10 + speed 1 + fade_wave 11 ;musicdc 255 - notetype1 1 + channel_volume 1 ;musice9 96 .MainLoop ;musice8 8 @@ -1436,10 +1436,10 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 16 rest 9 dec_octave - notetype1 2 + channel_volume 2 note G_, 16 note A_, 9 - notetype1 1 + channel_volume 1 rest 16 rest 8 rest 9 @@ -1465,13 +1465,13 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 9 rest 8 dec_octave - notetype1 2 + channel_volume 2 note G_, 16 note A_, 9 - notetype1 1 + channel_volume 1 sound_call Branch_1f3d18 octave 2 - notetype1 1 + channel_volume 1 rest 8 note E_, 8 rest 8 @@ -1503,10 +1503,10 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 9 rest 8 dec_octave - notetype1 2 + channel_volume 2 note G_, 16 note A_, 9 - notetype1 1 + channel_volume 1 rest 16 rest 8 rest 9 @@ -1538,7 +1538,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 8 rest 16 octave 2 - notetype1 1 + channel_volume 1 note A_, 9 ;tie note A#, 16 @@ -1560,9 +1560,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1610,9 +1610,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1620,7 +1620,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note A_, 9 sound_call Branch_1f3d18 octave 2 - notetype1 1 + channel_volume 1 rest 8 note E_, 8 rest 8 @@ -1657,9 +1657,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1705,9 +1705,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1766,9 +1766,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note G#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note F#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave note C#, 16 @@ -1814,9 +1814,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note G#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note F#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave note C#, 16 @@ -1825,7 +1825,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) sound_call Branch_1f3d18 ;musicec 0 octave 2 - notetype1 1 + channel_volume 1 rest 16 rest 8 note A_, 9 @@ -1849,9 +1849,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -1899,9 +1899,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D#, 5 rest 3 rest 8 - notetype1 2 + channel_volume 2 note C#, 2 - notetype1 1 + channel_volume 1 rest 15 dec_octave dec_octave @@ -2014,14 +2014,14 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note D_, 4 note E_, 9 rest 2 - notetype1 2 + channel_volume 2 note E_, 4 rest 6 - notetype1 3 + channel_volume 3 note E_, 4 rest 6 rest 2 - notetype1 1 + channel_volume 1 dec_octave note G_, 16 ;tie @@ -2042,29 +2042,29 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) Branch_1f3d18: ;musice8 1 - notetype1 1 + channel_volume 1 .Loop1 - notetype1 1 + channel_volume 1 octave 7 note C#, 1 - notetype1 3 + channel_volume 3 dec_octave note C#, 7 sound_loop 2, .Loop1 rest 8 octave 7 - notetype1 1 + channel_volume 1 note C#, 1 - notetype1 3 + channel_volume 3 dec_octave note C#, 7 rest 1 rest 16 .Loop2 - notetype1 1 + channel_volume 1 octave 7 note C#, 1 - notetype1 3 + channel_volume 3 dec_octave note C#, 7 sound_loop 2, .Loop2 diff --git a/crysaudio/music/TCG2/ishihara.asm b/crysaudio/music/TCG2/ishihara.asm index 5a6c5e26..fd995579 100644 --- a/crysaudio/music/TCG2/ishihara.asm +++ b/crysaudio/music/TCG2/ishihara.asm @@ -6,8 +6,8 @@ Music_Ishihara: channel 4, Music_Ishihara_Ch4 Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 255 rest 13 rest 14 @@ -747,8 +747,8 @@ Branch_1dd880: Music_Ishihara_Ch1: ; 1dd9de (77:59de) - notetype1 10 - notetype0 1 + channel_volume 10 + speed 1 ;musicdc 255 ;musicf1 86 rest 13 @@ -1729,12 +1729,12 @@ Branch_1ddc75: Music_Ishihara_Ch3: ; 1dde54 (77:5e54) - notetype1 10 - notetype2 11 - notetype1 1 + channel_volume 10 + fade_wave 11 + channel_volume 1 ;musice9 96 ;musicdc 255 - notetype0 1 + speed 1 rest 13 octave 2 note C_, 14 @@ -2282,10 +2282,10 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) inc_octave inc_octave note F_, 7 - notetype1 3 + channel_volume 3 note F_, 7 rest 13 - notetype1 1 + channel_volume 1 sound_loop 0, .MainLoop Branch_1de0c5: diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm index c5b59274..3303cc5f 100644 --- a/crysaudio/music/TCG2/titlescreen.asm +++ b/crysaudio/music/TCG2/titlescreen.asm @@ -6,10 +6,10 @@ Music_TCG2TitleScreen: channel 4, Music_TCG2TitleScreen_Ch4 Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) - notetype1 10 + channel_volume 10 ;musicf0 0 octave 3 - notetype0 1 + speed 1 ;musicdc 17 note G_, 3 note A_, 4 @@ -45,18 +45,18 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note G_, 4 note A_, 4 sound_loop 8, .Loop2 - notetype0 10 + speed 10 note G_, 3 octave 2 - notetype2 4 + fade_wave 4 duty_cycle 2 ;musicef 252 note F_, 3 note E_, 3 ;musicf0 0 octave 3 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 ;musicf1 101 ;musicf2 note G_, 8 @@ -67,7 +67,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicdc 17 note F_, 5 note F_, 2 - notetype0 5 + speed 5 note E_, 3 ;musicdc 1 note E_, 3 @@ -81,20 +81,20 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note D_, 6 ;musicdc 1 note D_, 3 - notetype0 1 + speed 1 ;musicdc 17 note C_, 7 ;musicdc 1 note C_, 8 dec_octave vibrato 30, 3, 3 - notetype0 10 + speed 10 ;musicdc 17 note G_, 6 ;musicdc 1 note G_, 3 ;musicdc 17 - notetype0 1 + speed 1 note E_, 8 ;musicdc 1 note E_, 15 @@ -149,7 +149,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicdc 1 note F_, 2 ;musicdc 17 - notetype0 5 + speed 5 note E_, 3 ;musicdc 1 note E_, 3 @@ -163,24 +163,24 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note D_, 6 ;musicdc 1 note D_, 3 - notetype0 1 + speed 1 ;musicdc 17 note E_, 8 ;musicdc 1 note E_, 7 dec_octave vibrato 30, 3, 3 - notetype0 10 + speed 10 ;musicdc 17 note G_, 6 ;musicdc 1 - notetype0 5 + speed 5 note G_, 3 ;musicdc 17 ;musicf3 note E_, 3 note F_, 3 - notetype0 1 + speed 1 ;musicf1 101 ;musicf2 note G_, 8 @@ -480,7 +480,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicdc 1 note D#, 4 ;musicdc 17 - notetype0 5 + speed 5 note G_, 12 ;tie note G_, 6 @@ -493,7 +493,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note G_, 1 note A_, 1 note B_, 1 - notetype0 1 + speed 1 vibrato 20, 3, 3 inc_octave note C_, 15 @@ -591,7 +591,7 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicf0 7 ;musicf1 80 ;musicf2 - notetype2 8 + fade_wave 8 octave 3 note D_, 8 ;musicdc 1 @@ -759,10 +759,10 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) - notetype1 10 + channel_volume 10 ;musicf0 1 octave 3 - notetype0 1 + speed 1 ;musice4 255 ;musicef 252 rest 2 @@ -834,17 +834,17 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicdc 17 sound_loop 3, .Loop4 vibrato 28, 3, 3 - notetype0 10 + speed 10 note G_, 12 ;tie note G_, 3 rest 3 rest 3 - notetype0 1 + speed 1 octave 2 octave 2 - notetype2 8 - notetype0 1 + fade_wave 8 + speed 1 ;musicf2 note B_, 8 ;musicdc 16 @@ -855,7 +855,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note D_, 5 ;musicdc 16 note D_, 2 - notetype0 5 + speed 5 ;musicdc 17 note C_, 3 ;musicdc 16 @@ -869,7 +869,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note G_, 6 ;musicdc 16 note G_, 3 - notetype0 1 + speed 1 ;musicdc 17 note G_, 8 ;musicdc 16 @@ -899,7 +899,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note A_, 4 sound_loop 2, .Loop5 ;musicf0 1 - notetype0 1 + speed 1 ;musicf1 85 ;musicf2 octave 3 @@ -990,7 +990,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 1 ;musicf3 octave 3 - notetype0 5 + speed 5 ;musicdc 17 ;musicf2 note C_, 3 @@ -1005,7 +1005,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note G_, 6 ;musicdc 16 note G_, 3 - notetype0 1 + speed 1 ;musicdc 17 note G_, 8 ;musicdc 16 @@ -1035,7 +1035,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicef 255 note A_, 4 ;musicf0 1 - notetype0 1 + speed 1 ;musicf3 ;musicdc 17 octave 3 @@ -1065,7 +1065,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf1 87 ;musicf2 octave 3 - notetype0 1 + speed 1 ;musicdc 17 note G#, 16 ;tie @@ -1144,7 +1144,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicdc 16 note G#, 2 ;musicf3 - notetype1 3 + channel_volume 3 ;musicdc 16 note C_, 3 ;musicf1 39 @@ -1155,7 +1155,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 12 ;musicf3 ;musicdc 17 - notetype0 1 + speed 1 octave 3 ;musicf1 55 ;musicf2 @@ -1626,7 +1626,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 0 ;musicf3 octave 4 - notetype2 8 + fade_wave 8 ;musicdc 17 note E_, 16 ;tie @@ -1634,7 +1634,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 7 ;musicf1 80 ;musicf2 - notetype2 8 + fade_wave 8 octave 3 note C_, 8 ;musicdc 1 @@ -1642,7 +1642,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) dec_octave ;musicf1 39 ;musicf2 - notetype2 8 + fade_wave 8 ;musicdc 17 note E_, 5 ;musicdc 16 @@ -1660,7 +1660,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) inc_octave ;musicf1 64 ;musicf2 - notetype2 8 + fade_wave 8 ;musicdc 17 note C_, 8 ;musicdc 1 @@ -1671,14 +1671,14 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicdc 17 octave 4 ;musicf2 - notetype2 8 + fade_wave 8 note E_, 5 note E_, 2 sound_loop 2, .Loop6 ;musicf0 0 ;musicf3 octave 4 - notetype2 8 + fade_wave 8 ;musicdc 17 note E_, 16 ;tie @@ -1686,7 +1686,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 7 ;musicf1 80 ;musicf2 - notetype2 8 + fade_wave 8 octave 3 note C_, 8 ;musicdc 1 @@ -1694,7 +1694,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) dec_octave ;musicf1 55 ;musicf2 - notetype2 8 + fade_wave 8 ;musicdc 17 note F_, 5 ;musicdc 16 @@ -1710,7 +1710,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf0 0 ;musicf1 85 octave 4 - notetype2 8 + fade_wave 8 ;musicdc 17 note E_, 8 ;musicdc 16 @@ -1719,7 +1719,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf1 80 ;musicf2 octave 3 - notetype2 8 + fade_wave 8 ;musicdc 17 note C_, 8 ;musicdc 1 @@ -1729,7 +1729,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) ;musicf2 ;musicdc 17 octave 4 - notetype2 8 + fade_wave 8 note D_, 5 ;musicdc 16 note D_, 3 @@ -1917,16 +1917,16 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) - notetype1 10 + channel_volume 10 ;musicdc 17 - notetype2 11 - notetype1 1 + fade_wave 11 + channel_volume 1 ;musice8 3 ;musice9 96 - notetype0 1 + speed 1 rest 14 rest 14 - notetype0 5 + speed 5 octave 3 ;musice8 6 note D_, 9 @@ -1953,7 +1953,7 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note A_, 1 note A_, 1 note A_, 1 - notetype0 10 + speed 10 ;musice8 1 note G_, 12 ;tie @@ -1962,7 +1962,7 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note F_, 3 note E_, 3 note D_, 3 - notetype0 5 + speed 5 octave 3 note C_, 6 note C_, 6 @@ -2002,16 +2002,16 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note A#, 6 note A#, 6 note A_, 6 - notetype0 5 + speed 5 ;musice8 6 note G#, 3 ;musice8 4 note G#, 6 - notetype0 1 + speed 1 ;musice8 4 note G#, 7 note G#, 8 - notetype0 5 + speed 5 ;musice8 6 note G#, 3 ;musice8 4 @@ -2022,11 +2022,11 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note G_, 3 ;musice8 4 note G_, 6 - notetype0 1 + speed 1 ;musice8 4 note G_, 7 note G_, 8 - notetype0 5 + speed 5 ;musice8 6 note G_, 3 ;musice8 4 @@ -2037,11 +2037,11 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note F_, 3 ;musice8 4 note F_, 6 - notetype0 1 + speed 1 ;musice8 4 note F_, 7 note F_, 8 - notetype0 5 + speed 5 ;musice8 6 note A#, 3 ;musice8 4 @@ -2052,11 +2052,11 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note D#, 3 ;musice8 4 note D#, 6 - notetype0 1 + speed 1 ;musice8 4 note D#, 7 note D#, 8 - notetype0 5 + speed 5 ;musice8 6 note D#, 3 ;musice8 8 @@ -2079,62 +2079,62 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note G_, 6 note G_, 6 note G_, 6 - notetype0 5 + speed 5 ;musice8 7 octave 2 .Loop1 - notetype0 5 + speed 5 ;musice8 7 note A_, 3 note A_, 3 sound_call Branch_1ea254 - notetype0 1 + speed 1 ;musice8 4 note A_, 7 note A_, 8 sound_loop 2, .Loop1 .Loop2 - notetype0 5 + speed 5 ;musice8 7 note G_, 3 note G_, 3 sound_call Branch_1ea254 - notetype0 1 + speed 1 ;musice8 4 note G_, 7 note G_, 8 sound_loop 2, .Loop2 .Loop3 - notetype0 5 + speed 5 ;musice8 7 note F_, 3 note F_, 3 sound_call Branch_1ea254 - notetype0 1 + speed 1 ;musice8 4 note F_, 7 note F_, 8 sound_loop 2, .Loop3 - notetype0 5 + speed 5 ;musice8 7 note E_, 3 note E_, 3 sound_call Branch_1ea254 - notetype0 1 + speed 1 ;musice8 4 note E_, 7 note E_, 8 - notetype0 5 + speed 5 ;musice8 7 note E_, 3 note E_, 3 sound_call Branch_1ea26d - notetype0 1 + speed 1 ;musice8 4 note E_, 7 note E_, 8 ;musice8 4 - notetype0 5 + speed 5 octave 2 note G#, 6 note G#, 6 @@ -2168,40 +2168,40 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note G_, 4 note G_, 4 ;musice8 6 - notetype0 10 + speed 10 note C_, 12 sound_ret Branch_1ea254: - notetype0 1 + speed 1 octave 4 ;musice8 4 ;musicdc 17 ;musice8 6 - notetype1 1 + channel_volume 1 note E_, 8 ;musicdc 16 - notetype1 3 + channel_volume 3 note E_, 7 ;musicdc 17 - notetype1 1 + channel_volume 1 octave 2 ;musice8 7 sound_ret Branch_1ea26d: - notetype0 1 + speed 1 octave 4 ;musice8 4 ;musicdc 17 ;musice8 6 - notetype1 1 + channel_volume 1 note G_, 8 ;musicdc 16 - notetype1 3 + channel_volume 3 note G_, 7 ;musicdc 17 - notetype1 1 + channel_volume 1 octave 2 ;musice8 7 sound_ret From 37a2367547c9d69ca68eedf48f5314c73216826b Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 25 Dec 2022 13:25:51 -0600 Subject: [PATCH 24/33] Unroll repts in tcg2 songs --- crysaudio/music/TCG2/credits.asm | 38 +++++++++++++++++++++++++--- crysaudio/music/TCG2/diddly6.asm | 16 ++++++++++-- crysaudio/music/TCG2/grblimp.asm | 20 ++++++++++++--- crysaudio/music/TCG2/groverworld.asm | 10 ++++++-- crysaudio/music/TCG2/titlescreen.asm | 23 ++++++++++++++--- 5 files changed, 91 insertions(+), 16 deletions(-) diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm index 4b9e154c..ad071dde 100644 --- a/crysaudio/music/TCG2/credits.asm +++ b/crysaudio/music/TCG2/credits.asm @@ -1683,18 +1683,48 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 speed 1 .Loop6 - rept 4 + ;rept 4 note G_, 11 rest 4 note G_, 11 rest 3 - endr - rept 4 + ;--- + note G_, 11 + rest 4 + note G_, 11 + rest 3 + ;--- + note G_, 11 + rest 4 + note G_, 11 + rest 3 + ;--- + note G_, 11 + rest 4 + note G_, 11 + rest 3 + ;endr + ;rept 4 note D_, 11 rest 4 note D_, 11 rest 3 - endr + ;--- + note D_, 11 + rest 4 + note D_, 11 + rest 3 + ;--- + note D_, 11 + rest 4 + note D_, 11 + rest 3 + ;--- + note D_, 11 + rest 4 + note D_, 11 + rest 3 + ;endr sound_loop 3, .Loop6 .Loop7 note G_, 11 diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm index d024c2b5..bc39c1f2 100644 --- a/crysaudio/music/TCG2/diddly6.asm +++ b/crysaudio/music/TCG2/diddly6.asm @@ -306,9 +306,21 @@ Music_Diddly6_Ch4: ; 1f7812 (7d:7812) sound_loop 7, .Loop1 .Loop2 drum_note 3, 6 - rept 7 + ;rept 7 drum_note 3, 5 - endr + ;--- + drum_note 3, 5 + ;--- + drum_note 3, 5 + ;--- + drum_note 3, 5 + ;--- + drum_note 3, 5 + ;--- + drum_note 3, 5 + ;--- + drum_note 3, 5 + ;endr sound_loop 3, .Loop2 ;musicef 0 .Loop3 diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm index a14ea62b..0f8dad10 100644 --- a/crysaudio/music/TCG2/grblimp.asm +++ b/crysaudio/music/TCG2/grblimp.asm @@ -805,10 +805,16 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50) drum_note 3, 3 ;musicef 253 drum_note 3, 4 - rept 3 + ;rept 3 drum_note 3, 3 drum_note 3, 4 - endr + ;--- + drum_note 3, 3 + drum_note 3, 4 + ;--- + drum_note 3, 3 + drum_note 3, 4 + ;endr ;musicef 0 drum_note 2, 14 drum_note 2, 14 @@ -826,10 +832,16 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50) drum_note 3, 3 ;musicef 253 drum_note 3, 4 - rept 3 + ;rept 3 drum_note 3, 3 drum_note 3, 4 - endr + ;--- + drum_note 3, 3 + drum_note 3, 4 + ;--- + drum_note 3, 3 + drum_note 3, 4 + ;endr ;musicef 0 sound_loop 11, .Loop1 drum_note 2, 14 diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm index d9db8ccd..b00a9383 100644 --- a/crysaudio/music/TCG2/groverworld.asm +++ b/crysaudio/music/TCG2/groverworld.asm @@ -2024,13 +2024,19 @@ Music_GROverworld_Ch4: ; 1eb5e4 (7a:75e4) drum_note 3, 6 drum_note 3, 5 drum_note 3, 5 - rept 2 + ;rept 2 ;musicef 254 drum_note 2, 16 rest 1 ;musicef 2 drum_note 2, 16 - endr + ;--- + ;musicef 254 + drum_note 2, 16 + rest 1 + ;musicef 2 + drum_note 2, 16 + ;endr ;musicef 0 drum_note 2, 16 rest 1 diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm index 3303cc5f..9e990dcf 100644 --- a/crysaudio/music/TCG2/titlescreen.asm +++ b/crysaudio/music/TCG2/titlescreen.asm @@ -30,12 +30,22 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) ;musicdc 1 note G_, 15 ;musicdc 17 - rept 3 + ;rept 3 note G_, 4 ;musicdc 1 note G_, 1 ;musicdc 17 - endr + ;--- + note G_, 4 + ;musicdc 1 + note G_, 1 + ;musicdc 17 + ;--- + note G_, 4 + ;musicdc 1 + note G_, 1 + ;musicdc 17 + ;endr sound_loop 4, .Loop1 ;musicf3 ;musicdc 17 @@ -1651,12 +1661,17 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note E_, 5 ;musicdc 16 note E_, 2 - rept 2 + ;rept 2 ;musicdc 17 note E_, 8 ;musicdc 16 note E_, 7 - endr + ;--- + ;musicdc 17 + note E_, 8 + ;musicdc 16 + note E_, 7 + ;endr inc_octave ;musicf1 64 ;musicf2 From 4a10ab5b8fe75fd7dd1da470e737e0ba18d4aec1 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 25 Dec 2022 14:14:27 -0600 Subject: [PATCH 25/33] Fix tcg2 channel 3 initial volume --- crysaudio/music/TCG2/credits.asm | 2 +- crysaudio/music/TCG2/diddly1.asm | 4 ++-- crysaudio/music/TCG2/diddly2.asm | 2 +- crysaudio/music/TCG2/diddly3.asm | 4 ++-- crysaudio/music/TCG2/diddly4.asm | 2 +- crysaudio/music/TCG2/diddly6.asm | 2 +- crysaudio/music/TCG2/fort1.asm | 2 +- crysaudio/music/TCG2/fort2.asm | 2 +- crysaudio/music/TCG2/fort3.asm | 2 +- crysaudio/music/TCG2/fort4.asm | 2 +- crysaudio/music/TCG2/gamecorner.asm | 2 +- crysaudio/music/TCG2/grblimp.asm | 2 +- crysaudio/music/TCG2/grcastle.asm | 2 +- crysaudio/music/TCG2/grchallengecup.asm | 2 +- crysaudio/music/TCG2/grdueltheme1.asm | 2 +- crysaudio/music/TCG2/grdueltheme2.asm | 2 +- crysaudio/music/TCG2/grdueltheme3.asm | 2 +- crysaudio/music/TCG2/groverworld.asm | 2 +- crysaudio/music/TCG2/herecomesgr.asm | 2 +- crysaudio/music/TCG2/imakuni2.asm | 2 +- crysaudio/music/TCG2/ishihara.asm | 2 +- crysaudio/music/TCG2/titlescreen.asm | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm index ad071dde..5a1b04b7 100644 --- a/crysaudio/music/TCG2/credits.asm +++ b/crysaudio/music/TCG2/credits.asm @@ -4081,7 +4081,7 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) - channel_volume 10 + channel_volume 1 ;fade_wave 16 load_wave 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11 ;musicdc 255 diff --git a/crysaudio/music/TCG2/diddly1.asm b/crysaudio/music/TCG2/diddly1.asm index 3f6e739e..24535165 100644 --- a/crysaudio/music/TCG2/diddly1.asm +++ b/crysaudio/music/TCG2/diddly1.asm @@ -184,7 +184,7 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 @@ -250,7 +250,7 @@ Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) note C_, 3 note E_, 3 dec_octave - channel_volume 128 + channel_volume 3 note G_, 2 note A#, 3 inc_octave diff --git a/crysaudio/music/TCG2/diddly2.asm b/crysaudio/music/TCG2/diddly2.asm index f4d5d82c..41a57b37 100644 --- a/crysaudio/music/TCG2/diddly2.asm +++ b/crysaudio/music/TCG2/diddly2.asm @@ -173,7 +173,7 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) - channel_volume 10 + channel_volume 1 fade_wave 14 speed 1 ;musice9 128 diff --git a/crysaudio/music/TCG2/diddly3.asm b/crysaudio/music/TCG2/diddly3.asm index 1558f770..15b4db12 100644 --- a/crysaudio/music/TCG2/diddly3.asm +++ b/crysaudio/music/TCG2/diddly3.asm @@ -53,7 +53,7 @@ Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76) Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 @@ -72,7 +72,7 @@ Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) note E_, 3 inc_octave note C_, 4 - channel_volume 128 + channel_volume 3 note C_, 4 sound_ret ; 0x1ebeae diff --git a/crysaudio/music/TCG2/diddly4.asm b/crysaudio/music/TCG2/diddly4.asm index 57c9f15c..688b9f10 100644 --- a/crysaudio/music/TCG2/diddly4.asm +++ b/crysaudio/music/TCG2/diddly4.asm @@ -55,7 +55,7 @@ Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) Music_Diddly4_Ch3: ; 1ebee0 (7a:7ee0) - channel_volume 10 + channel_volume 1 fade_wave 14 speed 1 channel_volume 2 diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/diddly6.asm index bc39c1f2..a85f9899 100644 --- a/crysaudio/music/TCG2/diddly6.asm +++ b/crysaudio/music/TCG2/diddly6.asm @@ -233,7 +233,7 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731) Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 channel_volume 1 diff --git a/crysaudio/music/TCG2/fort1.asm b/crysaudio/music/TCG2/fort1.asm index f9b9d3ef..1ba03df1 100644 --- a/crysaudio/music/TCG2/fort1.asm +++ b/crysaudio/music/TCG2/fort1.asm @@ -1004,7 +1004,7 @@ Branch_1edb5a: Music_Fort1_Ch3: ; 1edb66 (7b:5b66) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 14 channel_volume 1 diff --git a/crysaudio/music/TCG2/fort2.asm b/crysaudio/music/TCG2/fort2.asm index 6a379992..d5dd73f6 100644 --- a/crysaudio/music/TCG2/fort2.asm +++ b/crysaudio/music/TCG2/fort2.asm @@ -996,7 +996,7 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) Music_Fort2_Ch3: ; 1ee319 (7b:6319) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 channel_volume 2 diff --git a/crysaudio/music/TCG2/fort3.asm b/crysaudio/music/TCG2/fort3.asm index 59d89274..c61dfbad 100644 --- a/crysaudio/music/TCG2/fort3.asm +++ b/crysaudio/music/TCG2/fort3.asm @@ -1291,7 +1291,7 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 ;musicdc 255 diff --git a/crysaudio/music/TCG2/fort4.asm b/crysaudio/music/TCG2/fort4.asm index 2db9ca63..bf806bbc 100644 --- a/crysaudio/music/TCG2/fort4.asm +++ b/crysaudio/music/TCG2/fort4.asm @@ -1239,7 +1239,7 @@ Branch_1f1c97: Music_Fort4_Ch3: ; 1f1caa (7c:5caa) - channel_volume 10 + channel_volume 1 fade_wave 11 channel_volume 1 ;musice9 96 diff --git a/crysaudio/music/TCG2/gamecorner.asm b/crysaudio/music/TCG2/gamecorner.asm index dea37aeb..8c87bbb4 100644 --- a/crysaudio/music/TCG2/gamecorner.asm +++ b/crysaudio/music/TCG2/gamecorner.asm @@ -829,7 +829,7 @@ Branch_1e778f: Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) - channel_volume 10 + channel_volume 1 fade_wave 11 channel_volume 1 ;musice9 64 diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm index 0f8dad10..e061e034 100644 --- a/crysaudio/music/TCG2/grblimp.asm +++ b/crysaudio/music/TCG2/grblimp.asm @@ -689,7 +689,7 @@ Branch_1e7e8a: Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) - channel_volume 10 + channel_volume 1 ;musicdc 17 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/grcastle.asm b/crysaudio/music/TCG2/grcastle.asm index 38032b6c..abb414a0 100644 --- a/crysaudio/music/TCG2/grcastle.asm +++ b/crysaudio/music/TCG2/grcastle.asm @@ -1818,7 +1818,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) Music_GRCastle_Ch3: ; 1f2903 (7c:6903) - channel_volume 10 + channel_volume 1 fade_wave 11 channel_volume 1 ;musice9 96 diff --git a/crysaudio/music/TCG2/grchallengecup.asm b/crysaudio/music/TCG2/grchallengecup.asm index 6d9ce1c7..596f2ba4 100644 --- a/crysaudio/music/TCG2/grchallengecup.asm +++ b/crysaudio/music/TCG2/grchallengecup.asm @@ -917,7 +917,7 @@ Branch_1f3150: Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/grdueltheme1.asm b/crysaudio/music/TCG2/grdueltheme1.asm index 9a5399f6..80bb6553 100644 --- a/crysaudio/music/TCG2/grdueltheme1.asm +++ b/crysaudio/music/TCG2/grdueltheme1.asm @@ -1914,7 +1914,7 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/grdueltheme2.asm b/crysaudio/music/TCG2/grdueltheme2.asm index 8e910231..8acb5ce1 100644 --- a/crysaudio/music/TCG2/grdueltheme2.asm +++ b/crysaudio/music/TCG2/grdueltheme2.asm @@ -2148,7 +2148,7 @@ Branch_1efa62: Music_GRDuelTheme2_Ch3: ; 1efa74 (7b:7a74) - channel_volume 10 + channel_volume 1 ;fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 diff --git a/crysaudio/music/TCG2/grdueltheme3.asm b/crysaudio/music/TCG2/grdueltheme3.asm index 8ac2eabb..60d3ea93 100644 --- a/crysaudio/music/TCG2/grdueltheme3.asm +++ b/crysaudio/music/TCG2/grdueltheme3.asm @@ -2146,7 +2146,7 @@ Branch_1f6df4: Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) - channel_volume 10 + channel_volume 1 fade_wave 11 ;musicdc 255 speed 1 diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm index b00a9383..6f268f35 100644 --- a/crysaudio/music/TCG2/groverworld.asm +++ b/crysaudio/music/TCG2/groverworld.asm @@ -1505,7 +1505,7 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) - channel_volume 10 + channel_volume 1 ;musicdc 17 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/herecomesgr.asm b/crysaudio/music/TCG2/herecomesgr.asm index 20d004a3..6651fab5 100644 --- a/crysaudio/music/TCG2/herecomesgr.asm +++ b/crysaudio/music/TCG2/herecomesgr.asm @@ -1217,7 +1217,7 @@ Branch_1ea90c: Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 channel_volume 1 diff --git a/crysaudio/music/TCG2/imakuni2.asm b/crysaudio/music/TCG2/imakuni2.asm index 0a1707af..faf3f644 100644 --- a/crysaudio/music/TCG2/imakuni2.asm +++ b/crysaudio/music/TCG2/imakuni2.asm @@ -1415,7 +1415,7 @@ Branch_1f3a58: Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) - channel_volume 10 + channel_volume 1 speed 1 fade_wave 11 ;musicdc 255 diff --git a/crysaudio/music/TCG2/ishihara.asm b/crysaudio/music/TCG2/ishihara.asm index fd995579..83677042 100644 --- a/crysaudio/music/TCG2/ishihara.asm +++ b/crysaudio/music/TCG2/ishihara.asm @@ -1729,7 +1729,7 @@ Branch_1ddc75: Music_Ishihara_Ch3: ; 1dde54 (77:5e54) - channel_volume 10 + channel_volume 1 fade_wave 11 channel_volume 1 ;musice9 96 diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm index 9e990dcf..cbd32867 100644 --- a/crysaudio/music/TCG2/titlescreen.asm +++ b/crysaudio/music/TCG2/titlescreen.asm @@ -1932,7 +1932,7 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) - channel_volume 10 + channel_volume 1 ;musicdc 17 fade_wave 11 channel_volume 1 From ebeb442fef07babae756532b2dcd670923bf0e2e Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Wed, 28 Dec 2022 20:49:24 -0600 Subject: [PATCH 26/33] Remove even more unnecessary original audio files to avoid any possible confusion --- audio/engine_1.asm | 1726 --------------------------- audio/engine_2.asm | 1789 ---------------------------- audio/engine_3.asm | 1726 --------------------------- audio/headers/musicheaders1.asm | 135 --- audio/headers/musicheaders2.asm | 41 - audio/headers/musicheaders3.asm | 116 -- audio/low_health_alarm.asm | 80 -- audio/music/bikeriding.asm | 697 ----------- audio/music/celadon.asm | 406 ------- audio/music/cinnabar.asm | 349 ------ audio/music/cinnabarmansion.asm | 165 --- audio/music/cities1.asm | 651 ---------- audio/music/cities2.asm | 411 ------- audio/music/credits.asm | 818 ------------- audio/music/defeatedgymleader.asm | 602 ---------- audio/music/defeatedtrainer.asm | 261 ---- audio/music/defeatedwildmon.asm | 297 ----- audio/music/dungeon1.asm | 659 ---------- audio/music/dungeon2.asm | 314 ----- audio/music/dungeon3.asm | 747 ------------ audio/music/finalbattle.asm | 1339 --------------------- audio/music/gamecorner.asm | 622 ---------- audio/music/gym.asm | 352 ------ audio/music/gymleaderbattle.asm | 1395 ---------------------- audio/music/halloffame.asm | 93 -- audio/music/indigoplateau.asm | 314 ----- audio/music/introbattle.asm | 326 ----- audio/music/jigglypuffsong.asm | 39 - audio/music/lavender.asm | 192 --- audio/music/meeteviltrainer.asm | 75 -- audio/music/meetfemaletrainer.asm | 114 -- audio/music/meetmaletrainer.asm | 185 --- audio/music/meetprofoak.asm | 416 ------- audio/music/meetrival.asm | 389 ------ audio/music/museumguy.asm | 330 ----- audio/music/oakslab.asm | 388 ------ audio/music/pallettown.asm | 312 ----- audio/music/pkmnhealed.asm | 45 - audio/music/pokecenter.asm | 370 ------ audio/music/pokemontower.asm | 453 ------- audio/music/routes1.asm | 403 ------- audio/music/routes2.asm | 424 ------- audio/music/routes3.asm | 508 -------- audio/music/routes4.asm | 674 ----------- audio/music/safarizone.asm | 106 -- audio/music/silphco.asm | 995 ---------------- audio/music/ssanne.asm | 335 ------ audio/music/surfing.asm | 330 ----- audio/music/titlescreen.asm | 669 ----------- audio/music/trainerbattle.asm | 1852 ----------------------------- audio/music/unusedsong.asm | 337 ------ audio/music/vermilion.asm | 317 ----- audio/music/wildbattle.asm | 732 ------------ audio/notes.asm | 16 - audio/poke_flute.asm | 18 - audio/wave_samples.asm | 33 - constants/audio_constants.asm | 68 -- home/fade_audio.asm | 48 - macros/scripts/audio.asm | 230 ---- 59 files changed, 27834 deletions(-) delete mode 100644 audio/engine_1.asm delete mode 100644 audio/engine_2.asm delete mode 100644 audio/engine_3.asm delete mode 100644 audio/headers/musicheaders1.asm delete mode 100644 audio/headers/musicheaders2.asm delete mode 100644 audio/headers/musicheaders3.asm delete mode 100644 audio/low_health_alarm.asm delete mode 100644 audio/music/bikeriding.asm delete mode 100644 audio/music/celadon.asm delete mode 100644 audio/music/cinnabar.asm delete mode 100644 audio/music/cinnabarmansion.asm delete mode 100644 audio/music/cities1.asm delete mode 100644 audio/music/cities2.asm delete mode 100644 audio/music/credits.asm delete mode 100644 audio/music/defeatedgymleader.asm delete mode 100644 audio/music/defeatedtrainer.asm delete mode 100644 audio/music/defeatedwildmon.asm delete mode 100644 audio/music/dungeon1.asm delete mode 100644 audio/music/dungeon2.asm delete mode 100644 audio/music/dungeon3.asm delete mode 100644 audio/music/finalbattle.asm delete mode 100644 audio/music/gamecorner.asm delete mode 100644 audio/music/gym.asm delete mode 100644 audio/music/gymleaderbattle.asm delete mode 100644 audio/music/halloffame.asm delete mode 100644 audio/music/indigoplateau.asm delete mode 100644 audio/music/introbattle.asm delete mode 100644 audio/music/jigglypuffsong.asm delete mode 100644 audio/music/lavender.asm delete mode 100644 audio/music/meeteviltrainer.asm delete mode 100644 audio/music/meetfemaletrainer.asm delete mode 100644 audio/music/meetmaletrainer.asm delete mode 100644 audio/music/meetprofoak.asm delete mode 100644 audio/music/meetrival.asm delete mode 100644 audio/music/museumguy.asm delete mode 100644 audio/music/oakslab.asm delete mode 100644 audio/music/pallettown.asm delete mode 100644 audio/music/pkmnhealed.asm delete mode 100644 audio/music/pokecenter.asm delete mode 100644 audio/music/pokemontower.asm delete mode 100644 audio/music/routes1.asm delete mode 100644 audio/music/routes2.asm delete mode 100644 audio/music/routes3.asm delete mode 100644 audio/music/routes4.asm delete mode 100644 audio/music/safarizone.asm delete mode 100644 audio/music/silphco.asm delete mode 100644 audio/music/ssanne.asm delete mode 100644 audio/music/surfing.asm delete mode 100644 audio/music/titlescreen.asm delete mode 100644 audio/music/trainerbattle.asm delete mode 100644 audio/music/unusedsong.asm delete mode 100644 audio/music/vermilion.asm delete mode 100644 audio/music/wildbattle.asm delete mode 100644 audio/notes.asm delete mode 100644 audio/poke_flute.asm delete mode 100644 audio/wave_samples.asm delete mode 100644 constants/audio_constants.asm delete mode 100644 home/fade_audio.asm delete mode 100644 macros/scripts/audio.asm diff --git a/audio/engine_1.asm b/audio/engine_1.asm deleted file mode 100644 index 8b30fb1a..00000000 --- a/audio/engine_1.asm +++ /dev/null @@ -1,1726 +0,0 @@ -; The first of three duplicated sound engines. - -Audio1_UpdateMusic:: - ld c, CHAN1 -.loop - ld b, 0 - ld hl, wChannelSoundIDs - add hl, bc - ld a, [hl] - and a - jr z, .nextChannel - ld a, c - cp CHAN5 - jr nc, .applyAffects ; if sfx channel - ld a, [wMuteAudioAndPauseMusic] - and a - jr z, .applyAffects - bit 7, a - jr nz, .nextChannel - set 7, a - ld [wMuteAudioAndPauseMusic], a - xor a ; disable all channels' output - ldh [rNR51], a - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a - jr .nextChannel -.applyAffects - call Audio1_ApplyMusicAffects -.nextChannel - ld a, c - inc c ; inc channel number - cp CHAN8 - jr nz, .loop - ret - -; this routine checks flags for music effects currently applied -; to the channel and calls certain functions based on flags. -Audio1_ApplyMusicAffects: - ld b, $0 - ld hl, wChannelNoteDelayCounters ; delay until next note - add hl, bc - ld a, [hl] - cp 1 ; if the delay is 1, play next note - jp z, Audio1_PlayNextNote - dec a ; otherwise, decrease the delay timer - ld [hl], a - ld a, c - cp CHAN5 - jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr z, .startChecks - ret -.startChecks - ld hl, wChannelFlags1 - add hl, bc - bit BIT_ROTATE_DUTY_CYCLE, [hl] - jr z, .checkForExecuteMusic - call Audio1_ApplyDutyCyclePattern -.checkForExecuteMusic - ld b, 0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, .checkForPitchSlide - ld hl, wChannelFlags1 - add hl, bc - bit BIT_NOISE_OR_SFX, [hl] - jr nz, .skipPitchSlideVibrato -.checkForPitchSlide - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_ON, [hl] - jr z, .checkVibratoDelay - jp Audio1_ApplyPitchSlide -.checkVibratoDelay - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld a, [hl] - and a ; check if delay is over - jr z, .checkForVibrato - dec [hl] ; otherwise, dec delay -.skipPitchSlideVibrato - ret -.checkForVibrato - ld hl, wChannelVibratoExtents - add hl, bc - ld a, [hl] - and a - jr nz, .vibrato - ret ; no vibrato -.vibrato - ld d, a - ld hl, wChannelVibratoRates - add hl, bc - ld a, [hl] - and $f - and a - jr z, .applyVibrato - dec [hl] ; decrement counter - ret -.applyVibrato - ld a, [hl] - swap [hl] - or [hl] - ld [hl], a ; reload the counter - ld hl, wChannelFrequencyLowBytes - add hl, bc - ld e, [hl] ; get note pitch - ld hl, wChannelFlags1 - add hl, bc -; This is the only code that sets/resets the vibrato direction bit, so it -; continuously alternates which path it takes. - bit BIT_VIBRATO_DIRECTION, [hl] - jr z, .unset - res BIT_VIBRATO_DIRECTION, [hl] - ld a, d - and $f - ld d, a - ld a, e - sub d - jr nc, .noCarry - ld a, 0 -.noCarry - jr .done -.unset - set BIT_VIBRATO_DIRECTION, [hl] - ld a, d - and $f0 - swap a - add e - jr nc, .done - ld a, $ff -.done - ld d, a - ld b, REG_FREQUENCY_LO - call Audio1_GetRegisterPointer - ld [hl], d - ret - -; this routine executes all music commands that take up no time, -; like tempo changes, duty cycle changes etc. and doesn't return -; until the first note is reached -Audio1_PlayNextNote: -; reload the vibrato delay counter - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, bc - ld a, [hl] - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld [hl], a - - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_ON, [hl] - res BIT_PITCH_SLIDE_DECREASING, [hl] - call Audio1_sound_ret - ret - -Audio1_sound_ret: - call Audio1_GetNextMusicByte - ld d, a - cp sound_ret_cmd - jp nz, Audio1_sound_call - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_SOUND_CALL, [hl] - jr nz, .returnFromCall - ld a, c - cp CHAN4 - jr nc, .noiseOrSfxChannel - jr .disableChannelOutput -.noiseOrSfxChannel - res BIT_NOISE_OR_SFX, [hl] - ld hl, wChannelFlags2 - add hl, bc - res BIT_EXECUTE_MUSIC, [hl] - cp CHAN7 - jr nz, .skipSfxChannel3 -; restart hardware channel 3 (wave channel) output - ld a, $0 - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a -.skipSfxChannel3 - jr nz, .dontDisable - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr z, .dontDisable - xor a - ld [wDisableChannelOutputWhenSfxEnds], a - jr .disableChannelOutput -.dontDisable - jr .afterDisable -.returnFromCall - res 1, [hl] - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - push hl ; store current channel address - ld hl, wChannelReturnAddresses - add hl, de - ld e, l - ld d, h - pop hl - ld a, [de] - ld [hli], a - inc de - ld a, [de] - ld [hl], a ; loads channel address to return to - jp Audio1_sound_ret -.disableChannelOutput - ld hl, Audio1_HWChannelDisableMasks - add hl, bc - ldh a, [rNR51] - and [hl] - ldh [rNR51], a -.afterDisable - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_START - jr nc, .maybeCry - jr .skipCry -.maybeCry - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_END - jr z, .skipCry - jr c, .cry - jr .skipCry -.cry - ld a, c - cp CHAN5 - jr z, .skipRewind - call Audio1_GoBackOneCommandIfCry - ret c -.skipRewind - ld a, [wSavedVolume] - ldh [rNR50], a - xor a - ld [wSavedVolume], a -.skipCry - ld hl, wChannelSoundIDs - add hl, bc - ld [hl], b - ret - -Audio1_sound_call: - cp sound_call_cmd - jp nz, Audio1_sound_loop - call Audio1_GetNextMusicByte - push af - call Audio1_GetNextMusicByte - ld d, a - pop af - ld e, a - push de ; store pointer - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - push hl - ld hl, wChannelReturnAddresses - add hl, de - ld e, l - ld d, h - pop hl - ld a, [hli] - ld [de], a - inc de - ld a, [hld] - ld [de], a ; copy current channel address - pop de - ld [hl], e - inc hl - ld [hl], d ; overwrite current address with pointer - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_SOUND_CALL, [hl] ; set the call flag - jp Audio1_sound_ret - -Audio1_sound_loop: - cp sound_loop_cmd - jp nz, Audio1_note_type - call Audio1_GetNextMusicByte - ld e, a - and a - jr z, .infiniteLoop - ld b, 0 - ld hl, wChannelLoopCounters - add hl, bc - ld a, [hl] - cp e - jr nz, .loopAgain - ld a, $1 ; if no more loops to make, - ld [hl], a - call Audio1_GetNextMusicByte ; skip pointer - call Audio1_GetNextMusicByte - jp Audio1_sound_ret -.loopAgain ; inc loop count - inc a - ld [hl], a - ; fall through -.infiniteLoop ; overwrite current address with pointer - call Audio1_GetNextMusicByte - push af - call Audio1_GetNextMusicByte - ld b, a - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - pop af - ld [hli], a - ld [hl], b - jp Audio1_sound_ret - -Audio1_note_type: - and $f0 - cp note_type_cmd - jp nz, Audio1_toggle_perfect_pitch - ld a, d - and $f - ld b, $0 - ld hl, wChannelNoteSpeeds - add hl, bc - ld [hl], a ; store low nibble as speed - ld a, c - cp CHAN4 - jr z, .noiseChannel ; noise channel has 0 params - call Audio1_GetNextMusicByte - ld d, a - ld a, c - cp CHAN3 - jr z, .musicChannel3 - cp CHAN7 - jr nz, .skipChannel3 - ld hl, wSfxWaveInstrument - jr .channel3 -.musicChannel3 - ld hl, wMusicWaveInstrument -.channel3 - ld a, d - and $f - ld [hl], a ; store low nibble of param as wave instrument - ld a, d - and $30 - sla a - ld d, a - ; fall through - - ; if channel 3, store high nibble as volume - ; else, store volume (high nibble) and fade (low nibble) -.skipChannel3 - ld b, 0 - ld hl, wChannelVolumes - add hl, bc - ld [hl], d -.noiseChannel - jp Audio1_sound_ret - -Audio1_toggle_perfect_pitch: - ld a, d - cp toggle_perfect_pitch_cmd - jr nz, Audio1_vibrato - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - ld a, [hl] - xor $1 - ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio1_sound_ret - -Audio1_vibrato: - cp vibrato_cmd - jr nz, Audio1_pitch_slide - call Audio1_GetNextMusicByte - ld b, 0 - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld [hl], a ; store delay - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, bc - ld [hl], a ; store delay - call Audio1_GetNextMusicByte - ld d, a - -; The high nybble of the command byte is the extent of the vibrato. -; Let n be the extent. -; The upper nybble of the channel's byte in the wChannelVibratoExtents -; array will store the extent above the note: (n / 2) + (n % 2). -; The lower nybble will store the extent below the note: (n / 2). -; These two values add to the total extent, n. - and $f0 - swap a - ld b, 0 - ld hl, wChannelVibratoExtents - add hl, bc - srl a - ld e, a - adc b - swap a - or e - ld [hl], a - -; The low nybble of the command byte is the rate of the vibrato. -; The high and low nybbles of the channel's byte in the wChannelVibratoRates -; array are both initialised to this value because the high nybble is the -; counter reload value and the low nybble is the counter itself, which should -; start at its value upon reload. - ld a, d - and $f - ld d, a - ld hl, wChannelVibratoRates - add hl, bc - swap a - or d - ld [hl], a - - jp Audio1_sound_ret - -Audio1_pitch_slide: - cp pitch_slide_cmd - jr nz, Audio1_duty_cycle - call Audio1_GetNextMusicByte - ld b, 0 - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc - ld [hl], a - call Audio1_GetNextMusicByte - ld d, a - and $f0 - swap a - ld b, a - ld a, d - and $f - call Audio1_CalculateFrequency - ld b, 0 - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld [hl], d - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld [hl], e - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_PITCH_SLIDE_ON, [hl] - call Audio1_GetNextMusicByte - ld d, a - jp Audio1_note_length - -Audio1_duty_cycle: - cp duty_cycle_cmd - jr nz, Audio1_tempo - call Audio1_GetNextMusicByte - rrca - rrca - and $c0 - ld b, 0 - ld hl, wChannelDutyCycles - add hl, bc - ld [hl], a ; store duty cycle - jp Audio1_sound_ret - -Audio1_tempo: - cp tempo_cmd - jr nz, Audio1_stereo_panning - ld a, c - cp CHAN5 - jr nc, .sfxChannel - call Audio1_GetNextMusicByte - ld [wMusicTempo], a ; store first param - call Audio1_GetNextMusicByte - ld [wMusicTempo + 1], a ; store second param - xor a - ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM - ld [wChannelNoteDelayCountersFractionalPart + 1], a - ld [wChannelNoteDelayCountersFractionalPart + 2], a - ld [wChannelNoteDelayCountersFractionalPart + 3], a - jr .musicChannelDone -.sfxChannel - call Audio1_GetNextMusicByte - ld [wSfxTempo], a ; store first param - call Audio1_GetNextMusicByte - ld [wSfxTempo + 1], a ; store second param - xor a - ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM - ld [wChannelNoteDelayCountersFractionalPart + 5], a - ld [wChannelNoteDelayCountersFractionalPart + 6], a - ld [wChannelNoteDelayCountersFractionalPart + 7], a -.musicChannelDone - jp Audio1_sound_ret - -Audio1_stereo_panning: - cp stereo_panning_cmd - jr nz, Audio1_unknownmusic0xef - call Audio1_GetNextMusicByte - ld [wStereoPanning], a ; store panning - jp Audio1_sound_ret - -; this appears to never be used -Audio1_unknownmusic0xef: - cp unknownmusic0xef_cmd - jr nz, Audio1_duty_cycle_pattern - call Audio1_GetNextMusicByte - push bc - call Audio1_PlaySound - pop bc - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr nz, .skip - ld a, [wChannelSoundIDs + CHAN8] - ld [wDisableChannelOutputWhenSfxEnds], a - xor a - ld [wChannelSoundIDs + CHAN8], a -.skip - jp Audio1_sound_ret - -Audio1_duty_cycle_pattern: - cp duty_cycle_pattern_cmd - jr nz, Audio1_volume - call Audio1_GetNextMusicByte - ld b, 0 - ld hl, wChannelDutyCyclePatterns - add hl, bc - ld [hl], a ; store full pattern - and %11000000 - ld hl, wChannelDutyCycles - add hl, bc - ld [hl], a ; store first duty cycle - ld hl, wChannelFlags1 - add hl, bc - set BIT_ROTATE_DUTY_CYCLE, [hl] - jp Audio1_sound_ret - -Audio1_volume: - cp volume_cmd - jr nz, Audio1_execute_music - call Audio1_GetNextMusicByte - ldh [rNR50], a ; store volume - jp Audio1_sound_ret - -Audio1_execute_music: - cp execute_music_cmd - jr nz, Audio1_octave - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - set BIT_EXECUTE_MUSIC, [hl] - jp Audio1_sound_ret - -Audio1_octave: - and $f0 - cp octave_cmd - jr nz, Audio1_sfx_note - ld hl, wChannelOctaves - ld b, 0 - add hl, bc - ld a, d - and $f - ld [hl], a ; store low nibble as octave - jp Audio1_sound_ret - -; sfx_note is either square_note or noise_note depending on the channel -Audio1_sfx_note: - cp sfx_note_cmd - jr nz, Audio1_pitch_sweep - ld a, c - cp CHAN4 ; is this a noise or sfx channel? - jr c, Audio1_pitch_sweep ; no - ld b, 0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? - jr nz, Audio1_pitch_sweep ; yes - call Audio1_note_length - -; This code seems to do the same thing as what Audio1_ApplyDutyCycleAndSoundLength -; does below. - ld d, a - ld b, 0 - ld hl, wChannelDutyCycles - add hl, bc - ld a, [hl] - or d - ld d, a - ld b, REG_DUTY_SOUND_LEN - call Audio1_GetRegisterPointer - ld [hl], d - - call Audio1_GetNextMusicByte - ld d, a - ld b, REG_VOLUME_ENVELOPE - call Audio1_GetRegisterPointer - ld [hl], d - call Audio1_GetNextMusicByte - ld e, a - ld a, c - cp CHAN8 - ld a, 0 - jr z, .skip -; Channels 1 through 3 have 2 registers that control frequency, but the noise -; channel a single register (the polynomial counter) that controls frequency, -; so this command has one less byte on the noise channel. - push de - call Audio1_GetNextMusicByte - pop de -.skip - ld d, a - push de - call Audio1_ApplyDutyCycleAndSoundLength - call Audio1_EnableChannelOutput - pop de - call Audio1_ApplyWavePatternAndFrequency - ret - -Audio1_pitch_sweep: - ld a, c - cp CHAN5 - jr c, Audio1_note ; if not a sfx - ld a, d - cp pitch_sweep_cmd - jr nz, Audio1_note - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio1_note ; no - call Audio1_GetNextMusicByte - ldh [rNR10], a - jp Audio1_sound_ret - -Audio1_note: - ld a, c - cp CHAN4 - jr nz, Audio1_note_length ; if not noise channel - ld a, d - and $f0 - cp drum_note_cmd - jr z, .drum_note - jr nc, Audio1_note_length - - ; this executes when on the noise channel and - ; the command id is less than drum_note_cmd ($b0) - ; in this case, the upper nybble is used as the noise instrument ($1-$a) - ; and the lower nybble is the length minus 1 (0-15) - ; however, this doesn't work for instrument #2 because the command id - ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a drum_note command that is only 1 byte - ; instead of 2 and can only be used with instruments 1 and 3 through 10 - ; this is unused by the game - swap a - ld b, a - ld a, d - and $f - ld d, a - ld a, b - push de - push bc - jr .playDnote - -.drum_note - ld a, d - and $f - push af - push bc - call Audio1_GetNextMusicByte ; get drum_note instrument -.playDnote - ld d, a - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr nz, .skipDnote - ld a, d - call Audio1_PlaySound -.skipDnote - pop bc - pop de - -Audio1_note_length: - ld a, d - push af - and $f - inc a - ld b, 0 - ld e, a ; store note length (in 16ths) - ld d, b - ld hl, wChannelNoteSpeeds - add hl, bc - ld a, [hl] - ld l, b - call Audio1_MultiplyAdd - ld a, c - cp CHAN5 - jr nc, .sfxChannel - ld a, [wMusicTempo] - ld d, a - ld a, [wMusicTempo + 1] - ld e, a - jr .skip -.sfxChannel - ld d, $1 - ld e, $0 - cp CHAN8 - jr z, .skip ; if noise channel - call Audio1_SetSfxTempo - ld a, [wSfxTempo] - ld d, a - ld a, [wSfxTempo + 1] - ld e, a -.skip - ld a, l ; a = note_length * note_speed - ld b, 0 - ld hl, wChannelNoteDelayCountersFractionalPart - add hl, bc - ld l, [hl] - call Audio1_MultiplyAdd - ld e, l - ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) - ld hl, wChannelNoteDelayCountersFractionalPart - add hl, bc - ld [hl], e - ld a, d - ld hl, wChannelNoteDelayCounters - add hl, bc - ld [hl], a - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio1_note_pitch - ld hl, wChannelFlags1 - add hl, bc - bit BIT_NOISE_OR_SFX, [hl] - jr z, Audio1_note_pitch - pop hl - ret - -Audio1_note_pitch: - pop af - and $f0 - cp rest_cmd - jr nz, .notRest - ld a, c - cp CHAN5 - jr nc, .next -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr nz, .done - ; fall through -.next - ld a, c - cp CHAN3 - jr z, .channel3 - cp CHAN7 - jr nz, .notChannel3 -.channel3 - ld b, 0 - ld hl, Audio1_HWChannelDisableMasks - add hl, bc - ldh a, [rNR51] - and [hl] - ldh [rNR51], a ; disable hardware channel 3's output - jr .done -.notChannel3 - ld b, REG_VOLUME_ENVELOPE - call Audio1_GetRegisterPointer - ld a, $8 ; fade in sound - ld [hli], a - inc hl - ld a, $80 ; restart sound - ld [hl], a -.done - ret -.notRest - swap a - ld b, 0 - ld hl, wChannelOctaves - add hl, bc - ld b, [hl] - call Audio1_CalculateFrequency - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_ON, [hl] - jr z, .skipPitchSlide - call Audio1_InitPitchSlideVars -.skipPitchSlide - push de - ld a, c - cp CHAN5 - jr nc, .sfxChannel ; if sfx channel -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - ld d, 0 - ld e, a - add hl, de - ld a, [hl] - and a - jr nz, .noSfx - jr .sfxChannel -.noSfx - pop de - ret -.sfxChannel - ld b, 0 - ld hl, wChannelVolumes - add hl, bc - ld d, [hl] - ld b, REG_VOLUME_ENVELOPE - call Audio1_GetRegisterPointer - ld [hl], d - call Audio1_ApplyDutyCycleAndSoundLength - call Audio1_EnableChannelOutput - pop de - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used? - jr z, .skipFrequencyInc - inc e ; if yes, increment the frequency by 1 - jr nc, .skipFrequencyInc - inc d -.skipFrequencyInc - ld hl, wChannelFrequencyLowBytes - add hl, bc - ld [hl], e - call Audio1_ApplyWavePatternAndFrequency - ret - -Audio1_EnableChannelOutput: - ld b, 0 - ld hl, Audio1_HWChannelEnableMasks - add hl, bc - ldh a, [rNR51] - or [hl] ; set this channel's bits - ld d, a - ld a, c - cp CHAN8 - jr z, .noiseChannelOrNoSfx - cp CHAN5 - jr nc, .skip ; if sfx channel -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr nz, .skip -.noiseChannelOrNoSfx -; If this is the SFX noise channel or a music channel whose corresponding -; SFX channel is off, apply stereo panning. - ld a, [wStereoPanning] - ld hl, Audio1_HWChannelEnableMasks - add hl, bc - and [hl] - ld d, a - ldh a, [rNR51] - ld hl, Audio1_HWChannelDisableMasks - add hl, bc - and [hl] ; reset this channel's output bits - or d ; set this channel's output bits that enabled in [wStereoPanning] - ld d, a -.skip - ld a, d - ldh [rNR51], a - ret - -Audio1_ApplyDutyCycleAndSoundLength: - ld b, 0 - ld hl, wChannelNoteDelayCounters ; use the note delay as sound length - add hl, bc - ld d, [hl] - ld a, c - cp CHAN3 - jr z, .skipDuty ; if music channel 3 - cp CHAN7 - jr z, .skipDuty ; if sfx channel 3 -; include duty cycle (except on channel 3 which doesn't have it) - ld a, d - and $3f - ld d, a - ld hl, wChannelDutyCycles - add hl, bc - ld a, [hl] - or d - ld d, a -.skipDuty - ld b, REG_DUTY_SOUND_LEN - call Audio1_GetRegisterPointer - ld [hl], d - ret - -Audio1_ApplyWavePatternAndFrequency: - ld a, c - cp CHAN3 - jr z, .channel3 - cp CHAN7 - jr nz, .notChannel3 - ; fall through -.channel3 - push de - ld de, wMusicWaveInstrument - cp CHAN3 - jr z, .next - ld de, wSfxWaveInstrument -.next - ld a, [de] - add a - ld d, 0 - ld e, a - ld hl, Audio1_WavePointers - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld hl, rWave_0 - ld b, $f - ld a, $0 ; stop hardware channel 3 - ldh [rNR30], a -.loop - ld a, [de] - inc de - ld [hli], a - ld a, b - dec b - and a - jr nz, .loop - ld a, $80 ; start hardware channel 3 - ldh [rNR30], a - pop de -.notChannel3 - ld a, d - or $80 ; use counter mode (i.e. disable output when the counter reaches 0) - and $c7 ; zero the unused bits in the register - ld d, a - ld b, REG_FREQUENCY_LO - call Audio1_GetRegisterPointer - ld [hl], e ; store frequency low byte - inc hl - ld [hl], d ; store frequency high byte - call Audio1_ApplyFrequencyModifier - ret - -Audio1_SetSfxTempo: - call Audio1_IsCry - jr nc, .notCry - ld d, 0 - ld a, [wTempoModifier] - add $80 - jr nc, .next - inc d -.next - ld [wSfxTempo + 1], a - ld a, d - ld [wSfxTempo], a - jr .done -.notCry - xor a - ld [wSfxTempo + 1], a - ld a, $1 - ld [wSfxTempo], a -.done - ret - -Audio1_ApplyFrequencyModifier: - call Audio1_IsCry - jr nc, .done -; if playing a cry, add the cry's frequency modifier - ld a, [wFrequencyModifier] - add e - jr nc, .noCarry - inc d -.noCarry - dec hl - ld e, a - ld [hl], e - inc hl - ld [hl], d -.done - ret - -Audio1_GoBackOneCommandIfCry: - call Audio1_IsCry - jr nc, .done - ld hl, wChannelCommandPointers - ld e, c - ld d, 0 - sla e - rl d - add hl, de - ld a, [hl] - sub 1 - ld [hl], a - inc hl - ld a, [hl] - sbc 0 - ld [hl], a - scf - ret -.done - scf - ccf - ret - -Audio1_IsCry: -; Returns whether the currently playing audio is a cry in carry. - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_START - jr nc, .next - jr .no -.next - cp CRY_SFX_END - jr z, .no - jr c, .yes -.no - scf - ccf - ret -.yes - scf - ret - -Audio1_ApplyPitchSlide: - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_DECREASING, [hl] - jp nz, .frequencyDecreasing -; frequency increasing - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld e, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld l, [hl] - ld h, b - add hl, de - ld d, h - ld e, l - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, bc - push hl - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld a, [hl] - pop hl - add [hl] - ld [hl], a - ld a, 0 - adc e - ld e, a - ld a, 0 - adc d - ld d, a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, [hl] - cp d - jp c, .reachedTargetFrequency - jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, [hl] - cp e - jp c, .reachedTargetFrequency - jr .applyUpdatedFrequency -.frequencyDecreasing - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld a, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld e, [hl] - sub e - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld a, [hl] - add a - ld [hl], a - ld a, e - sbc b - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, d - cp [hl] - jr c, .reachedTargetFrequency - jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, e - cp [hl] - jr c, .reachedTargetFrequency -.applyUpdatedFrequency - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld [hl], e - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld [hl], d - ld b, REG_FREQUENCY_LO - call Audio1_GetRegisterPointer - ld a, e - ld [hli], a - ld [hl], d - ret -.reachedTargetFrequency -; Turn off pitch slide when the target frequency has been reached. - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_ON, [hl] - res BIT_PITCH_SLIDE_DECREASING, [hl] - ret - -Audio1_InitPitchSlideVars: - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld [hl], d - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld [hl], e - ld hl, wChannelNoteDelayCounters - add hl, bc - ld a, [hl] - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc - sub [hl] - jr nc, .next - ld a, 1 -.next - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, e - sub [hl] - ld e, a - ld a, d - sbc b - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - sub [hl] - jr c, .targetFrequencyGreater - ld d, a - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_PITCH_SLIDE_DECREASING, [hl] - jr .next2 -.targetFrequencyGreater -; If the target frequency is greater, subtract the current frequency from -; the target frequency to get the absolute difference. - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld e, [hl] - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, [hl] - sub e - ld e, a - -; Bug. Instead of borrowing from the high byte of the target frequency as it -; should, it borrows from the high byte of the current frequency instead. -; This means that the result will be 0x200 greater than it should be if the -; low byte of the current frequency is greater than the low byte of the -; target frequency. - ld a, d - sbc b - ld d, a - - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, [hl] - sub d - ld d, a - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_DECREASING, [hl] - -.next2 - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc -.divideLoop - inc b - ld a, e - sub [hl] - ld e, a - jr nc, .divideLoop - ld a, d - and a - jr z, .doneDividing - dec a - ld d, a - jr .divideLoop -.doneDividing - ld a, e ; a = remainder - dividend - add [hl] - ld d, b ; d = quotient + 1 - ld b, 0 - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld [hl], d ; store quotient + 1 - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld [hl], a ; store remainder - dividend - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, bc - ld [hl], a ; store remainder - dividend - ret - -Audio1_ApplyDutyCyclePattern: - ld b, 0 - ld hl, wChannelDutyCyclePatterns - add hl, bc - ld a, [hl] - rlca - rlca - ld [hl], a - and $c0 - ld d, a - ld b, REG_DUTY_SOUND_LEN - call Audio1_GetRegisterPointer - ld a, [hl] - and $3f - or d - ld [hl], a - ret - -Audio1_GetNextMusicByte: - ld d, 0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - ld a, [hli] - ld e, a - ld a, [hld] - ld d, a - ld a, [de] ; get next music command - inc de - ld [hl], e ; store address of next command - inc hl - ld [hl], d - ret - -Audio1_GetRegisterPointer: -; hl = address of hardware sound register b for software channel c - ld a, c - ld hl, Audio1_HWChannelBaseAddresses - add l - jr nc, .noCarry - inc h -.noCarry - ld l, a - ld a, [hl] - add b - ld l, a - ld h, $ff - ret - -Audio1_MultiplyAdd: -; hl = l + (a * de) - ld h, 0 -.loop - srl a - jr nc, .skipAdd - add hl, de -.skipAdd - sla e - rl d - and a - jr z, .done - jr .loop -.done - ret - -Audio1_CalculateFrequency: -; return the frequency for note a, octave b in de - ld h, 0 - ld l, a - add hl, hl - ld d, h - ld e, l - ld hl, Audio1_Pitches - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld a, b -.loop - cp 7 - jr z, .done - sra d - rr e - inc a - jr .loop -.done - ld a, 8 - add d - ld d, a - ret - -Audio1_PlaySound:: - ld [wSoundID], a - cp SFX_STOP_ALL_MUSIC - jp z, .stopAllAudio - cp MAX_SFX_ID_1 - jp z, .playSfx - jp c, .playSfx - cp $fe - jr z, .playMusic - jp nc, .playSfx - -.playMusic - xor a - ld [wUnusedC000], a - ld [wDisableChannelOutputWhenSfxEnds], a - ld [wMusicTempo + 1], a - ld [wMusicWaveInstrument], a - ld [wSfxWaveInstrument], a - ld d, NUM_CHANNELS - ld hl, wChannelReturnAddresses - call .FillMem - ld hl, wChannelCommandPointers - call .FillMem - ld d, NUM_MUSIC_CHANS - ld hl, wChannelSoundIDs - call .FillMem - ld hl, wChannelFlags1 - call .FillMem - ld hl, wChannelDutyCycles - call .FillMem - ld hl, wChannelDutyCyclePatterns - call .FillMem - ld hl, wChannelVibratoDelayCounters - call .FillMem - ld hl, wChannelVibratoExtents - call .FillMem - ld hl, wChannelVibratoRates - call .FillMem - ld hl, wChannelFrequencyLowBytes - call .FillMem - ld hl, wChannelVibratoDelayCounterReloadValues - call .FillMem - ld hl, wChannelFlags2 - call .FillMem - ld hl, wChannelPitchSlideLengthModifiers - call .FillMem - ld hl, wChannelPitchSlideFrequencySteps - call .FillMem - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - call .FillMem - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - call .FillMem - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - call .FillMem - ld a, $1 - ld hl, wChannelLoopCounters - call .FillMem - ld hl, wChannelNoteDelayCounters - call .FillMem - ld hl, wChannelNoteSpeeds - call .FillMem - ld [wMusicTempo], a - ld a, $ff - ld [wStereoPanning], a - xor a - ldh [rNR50], a - ld a, $8 - ldh [rNR10], a - ld a, 0 - ldh [rNR51], a - xor a - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a - ld a, $77 - ldh [rNR50], a - jp .playSoundCommon - -.playSfx - ld l, a - ld e, a - ld h, 0 - ld d, h - add hl, hl - add hl, de - ld de, SFX_Headers_1 - add hl, de - ld a, h - ld [wSfxHeaderPointer], a - ld a, l - ld [wSfxHeaderPointer + 1], a - ld a, [hl] - and $c0 - rlca - rlca - ld c, a -.sfxChannelLoop - ld d, c - ld a, c - add a - add c - ld c, a - ld b, 0 - ld a, [wSfxHeaderPointer] - ld h, a - ld a, [wSfxHeaderPointer + 1] - ld l, a - add hl, bc - ld c, d - ld a, [hl] - and $f - ld e, a ; software channel ID - ld d, 0 - ld hl, wChannelSoundIDs - add hl, de - ld a, [hl] - and a - jr z, .playChannel - ld a, e - cp CHAN8 - jr nz, .notNoiseChannel - ld a, [wSoundID] - cp NOISE_INSTRUMENTS_END - jr nc, .notNoiseInstrument - ret -.notNoiseInstrument - ld a, [hl] - cp NOISE_INSTRUMENTS_END - jr z, .playChannel - jr c, .playChannel -.notNoiseChannel - ld a, [wSoundID] - cp [hl] - jr z, .playChannel - jr c, .playChannel - ret -.playChannel - xor a - push de - ld h, d - ld l, e - add hl, hl - ld d, h - ld e, l - ld hl, wChannelReturnAddresses - add hl, de - ld [hli], a - ld [hl], a - ld hl, wChannelCommandPointers - add hl, de - ld [hli], a - ld [hl], a - pop de - ld hl, wChannelSoundIDs - add hl, de - ld [hl], a - ld hl, wChannelFlags1 - add hl, de - ld [hl], a - ld hl, wChannelDutyCycles - add hl, de - ld [hl], a - ld hl, wChannelDutyCyclePatterns - add hl, de - ld [hl], a - ld hl, wChannelVibratoDelayCounters - add hl, de - ld [hl], a - ld hl, wChannelVibratoExtents - add hl, de - ld [hl], a - ld hl, wChannelVibratoRates - add hl, de - ld [hl], a - ld hl, wChannelFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideLengthModifiers - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideFrequencySteps - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelFlags2 - add hl, de - ld [hl], a - ld a, $1 - ld hl, wChannelLoopCounters - add hl, de - ld [hl], a - ld hl, wChannelNoteDelayCounters - add hl, de - ld [hl], a - ld hl, wChannelNoteSpeeds - add hl, de - ld [hl], a - ld a, e - cp CHAN5 - jr nz, .skipSweepDisable - ld a, $8 - ldh [rNR10], a ; sweep off -.skipSweepDisable - ld a, c - and a - jp z, .playSoundCommon - dec c - jp .sfxChannelLoop - -.stopAllAudio - ld a, $80 - ldh [rNR52], a ; sound hardware on - ldh [rNR30], a ; wave playback on - xor a - ldh [rNR51], a ; no sound output - ldh [rNR32], a ; mute channel 3 (wave channel) - ld a, $8 - ldh [rNR10], a ; sweep off - ldh [rNR12], a ; mute channel 1 (pulse channel 1) - ldh [rNR22], a ; mute channel 2 (pulse channel 2) - ldh [rNR42], a ; mute channel 4 (noise channel) - ld a, $40 - ldh [rNR14], a ; counter mode - ldh [rNR24], a - ldh [rNR44], a - ld a, $77 - ldh [rNR50], a ; full volume - xor a - ld [wUnusedC000], a - ld [wDisableChannelOutputWhenSfxEnds], a - ld [wMuteAudioAndPauseMusic], a - ld [wMusicTempo + 1], a - ld [wSfxTempo + 1], a - ld [wMusicWaveInstrument], a - ld [wSfxWaveInstrument], a - ld d, $a0 - ld hl, wChannelCommandPointers - call .FillMem - ld a, $1 - ld d, $18 - ld hl, wChannelNoteDelayCounters - call .FillMem - ld [wMusicTempo], a - ld [wSfxTempo], a - ld a, $ff - ld [wStereoPanning], a - ret - -; fills d bytes at hl with a -.FillMem - ld b, d -.loop - ld [hli], a - dec b - jr nz, .loop - ret - -.playSoundCommon - ld a, [wSoundID] - ld l, a - ld e, a - ld h, 0 - ld d, h - add hl, hl - add hl, de - ld de, SFX_Headers_1 - add hl, de - ld e, l - ld d, h - ld hl, wChannelCommandPointers - ld a, [de] ; get channel number - ld b, a - rlca - rlca - and $3 - ld c, a - ld a, b - and $f - ld b, c - inc b - inc de - ld c, 0 -.commandPointerLoop - cp c - jr z, .next - inc c - inc hl - inc hl - jr .commandPointerLoop -.next - push hl - push bc - push af - ld b, 0 - ld c, a - ld hl, wChannelSoundIDs - add hl, bc - ld a, [wSoundID] - ld [hl], a - pop af - cp CHAN4 - jr c, .skipSettingFlag - ld hl, wChannelFlags1 - add hl, bc - set BIT_NOISE_OR_SFX, [hl] -.skipSettingFlag - pop bc - pop hl - ld a, [de] ; get channel pointer - ld [hli], a - inc de - ld a, [de] - ld [hli], a - inc de - inc c - dec b - ld a, b - and a - ld a, [de] - inc de - jr nz, .commandPointerLoop - ld a, [wSoundID] - cp CRY_SFX_START - jr nc, .maybeCry - jr .done -.maybeCry - ld a, [wSoundID] - cp CRY_SFX_END - jr z, .done - jr c, .cry - jr .done -.cry - ld hl, wChannelSoundIDs + CHAN5 - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - ld hl, wChannelCommandPointers + CHAN7 * 2 ; sfx wave channel pointer - ld de, Audio1_CryRet - ld [hl], e - inc hl - ld [hl], d ; overwrite pointer to point to sound_ret - ld a, [wSavedVolume] - and a - jr nz, .done - ldh a, [rNR50] - ld [wSavedVolume], a - ld a, $77 - ldh [rNR50], a ; full volume -.done - ret - -Audio1_CryRet: - sound_ret - -Audio1_HWChannelBaseAddresses: -; the low bytes of each HW channel's base address - db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 - db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 - -Audio1_HWChannelDisableMasks: - db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 - db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 - -Audio1_HWChannelEnableMasks: - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 - -Audio1_Pitches: -INCLUDE "audio/notes.asm" diff --git a/audio/engine_2.asm b/audio/engine_2.asm deleted file mode 100644 index 8783c4c6..00000000 --- a/audio/engine_2.asm +++ /dev/null @@ -1,1789 +0,0 @@ -; The second of three duplicated sound engines. -; This copy has a few differences relating to battle sound effects -; and the low health alarm that plays in battle - -Audio2_UpdateMusic:: - ld c, CHAN1 -.loop - ld b, 0 - ld hl, wChannelSoundIDs - add hl, bc - ld a, [hl] - and a - jr z, .nextChannel - ld a, c - cp CHAN5 - jr nc, .applyAffects ; if sfx channel - ld a, [wMuteAudioAndPauseMusic] - and a - jr z, .applyAffects - bit 7, a - jr nz, .nextChannel - set 7, a - ld [wMuteAudioAndPauseMusic], a - xor a ; disable all channels' output - ldh [rNR51], a - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a - jr .nextChannel -.applyAffects - call Audio2_ApplyMusicAffects -.nextChannel - ld a, c - inc c ; inc channel number - cp CHAN8 - jr nz, .loop - ret - -; this routine checks flags for music effects currently applied -; to the channel and calls certain functions based on flags. -Audio2_ApplyMusicAffects: - ld b, $0 - ld hl, wChannelNoteDelayCounters ; delay until next note - add hl, bc - ld a, [hl] - cp 1 ; if the delay is 1, play next note - jp z, Audio2_PlayNextNote - dec a ; otherwise, decrease the delay timer - ld [hl], a - ld a, c - cp CHAN5 - jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr z, .startChecks - ret -.startChecks - ld hl, wChannelFlags1 - add hl, bc - bit BIT_ROTATE_DUTY_CYCLE, [hl] - jr z, .checkForExecuteMusic - call Audio2_ApplyDutyCyclePattern -.checkForExecuteMusic - ld b, 0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, .checkForPitchSlide - ld hl, wChannelFlags1 - add hl, bc - bit BIT_NOISE_OR_SFX, [hl] - jr nz, .skipPitchSlideVibrato -.checkForPitchSlide - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_ON, [hl] - jr z, .checkVibratoDelay - jp Audio2_ApplyPitchSlide -.checkVibratoDelay - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld a, [hl] - and a ; check if delay is over - jr z, .checkForVibrato - dec [hl] ; otherwise, dec delay -.skipPitchSlideVibrato - ret -.checkForVibrato - ld hl, wChannelVibratoExtents - add hl, bc - ld a, [hl] - and a - jr nz, .vibrato - ret ; no vibrato -.vibrato - ld d, a - ld hl, wChannelVibratoRates - add hl, bc - ld a, [hl] - and $f - and a - jr z, .applyVibrato - dec [hl] ; decrement counter - ret -.applyVibrato - ld a, [hl] - swap [hl] - or [hl] - ld [hl], a ; reload the counter - ld hl, wChannelFrequencyLowBytes - add hl, bc - ld e, [hl] ; get note pitch - ld hl, wChannelFlags1 - add hl, bc -; This is the only code that sets/resets the vibrato direction bit, so it -; continuously alternates which path it takes. - bit BIT_VIBRATO_DIRECTION, [hl] - jr z, .unset - res BIT_VIBRATO_DIRECTION, [hl] - ld a, d - and $f - ld d, a - ld a, e - sub d - jr nc, .noCarry - ld a, 0 -.noCarry - jr .done -.unset - set BIT_VIBRATO_DIRECTION, [hl] - ld a, d - and $f0 - swap a - add e - jr nc, .done - ld a, $ff -.done - ld d, a - ld b, REG_FREQUENCY_LO - call Audio2_GetRegisterPointer - ld [hl], d - ret - -; this routine executes all music commands that take up no time, -; like tempo changes, duty cycle changes etc. and doesn't return -; until the first note is reached -Audio2_PlayNextNote: -; reload the vibrato delay counter - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, bc - ld a, [hl] - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld [hl], a - - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_ON, [hl] - res BIT_PITCH_SLIDE_DECREASING, [hl] - ; --- this section is only present in this copy of the sound engine - ld a, c - cp CHAN5 - jr nz, .beginChecks - ld a, [wLowHealthAlarm] ; low health alarm enabled? - bit 7, a - ret nz -.beginChecks - ; --- - call Audio2_sound_ret - ret - -Audio2_sound_ret: - call Audio2_GetNextMusicByte - ld d, a - cp sound_ret_cmd - jp nz, Audio2_sound_call - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_SOUND_CALL, [hl] - jr nz, .returnFromCall - ld a, c - cp CHAN4 - jr nc, .noiseOrSfxChannel - jr .disableChannelOutput -.noiseOrSfxChannel - res BIT_NOISE_OR_SFX, [hl] - ld hl, wChannelFlags2 - add hl, bc - res BIT_EXECUTE_MUSIC, [hl] - cp CHAN7 - jr nz, .skipSfxChannel3 -; restart hardware channel 3 (wave channel) output - ld a, $0 - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a -.skipSfxChannel3 - jr nz, .dontDisable - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr z, .dontDisable - xor a - ld [wDisableChannelOutputWhenSfxEnds], a - jr .disableChannelOutput -.dontDisable - jr .afterDisable -.returnFromCall - res 1, [hl] - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - push hl ; store current channel address - ld hl, wChannelReturnAddresses - add hl, de - ld e, l - ld d, h - pop hl - ld a, [de] - ld [hli], a - inc de - ld a, [de] - ld [hl], a ; loads channel address to return to - jp Audio2_sound_ret -.disableChannelOutput - ld hl, Audio2_HWChannelDisableMasks - add hl, bc - ldh a, [rNR51] - and [hl] - ldh [rNR51], a -.afterDisable - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_START - jr nc, .maybeCry - jr .skipCry -.maybeCry - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_END - jr z, .skipCry - jr c, .cry - jr .skipCry -.cry - ld a, c - cp CHAN5 - jr z, .skipRewind - call Audio2_GoBackOneCommandIfCry - ret c -.skipRewind - ld a, [wSavedVolume] - ldh [rNR50], a - xor a - ld [wSavedVolume], a -.skipCry - ld hl, wChannelSoundIDs - add hl, bc - ld [hl], b - ret - -Audio2_sound_call: - cp sound_call_cmd - jp nz, Audio2_sound_loop - call Audio2_GetNextMusicByte - push af - call Audio2_GetNextMusicByte - ld d, a - pop af - ld e, a - push de ; store pointer - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - push hl - ld hl, wChannelReturnAddresses - add hl, de - ld e, l - ld d, h - pop hl - ld a, [hli] - ld [de], a - inc de - ld a, [hld] - ld [de], a ; copy current channel address - pop de - ld [hl], e - inc hl - ld [hl], d ; overwrite current address with pointer - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_SOUND_CALL, [hl] ; set the call flag - jp Audio2_sound_ret - -Audio2_sound_loop: - cp sound_loop_cmd - jp nz, Audio2_note_type - call Audio2_GetNextMusicByte - ld e, a - and a - jr z, .infiniteLoop - ld b, 0 - ld hl, wChannelLoopCounters - add hl, bc - ld a, [hl] - cp e - jr nz, .loopAgain - ld a, $1 ; if no more loops to make, - ld [hl], a - call Audio2_GetNextMusicByte ; skip pointer - call Audio2_GetNextMusicByte - jp Audio2_sound_ret -.loopAgain ; inc loop count - inc a - ld [hl], a - ; fall through -.infiniteLoop ; overwrite current address with pointer - call Audio2_GetNextMusicByte - push af - call Audio2_GetNextMusicByte - ld b, a - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - pop af - ld [hli], a - ld [hl], b - jp Audio2_sound_ret - -Audio2_note_type: - and $f0 - cp note_type_cmd - jp nz, Audio2_toggle_perfect_pitch - ld a, d - and $f - ld b, $0 - ld hl, wChannelNoteSpeeds - add hl, bc - ld [hl], a ; store low nibble as speed - ld a, c - cp CHAN4 - jr z, .noiseChannel ; noise channel has 0 params - call Audio2_GetNextMusicByte - ld d, a - ld a, c - cp CHAN3 - jr z, .musicChannel3 - cp CHAN7 - jr nz, .skipChannel3 - ld hl, wSfxWaveInstrument - jr .channel3 -.musicChannel3 - ld hl, wMusicWaveInstrument -.channel3 - ld a, d - and $f - ld [hl], a ; store low nibble of param as wave instrument - ld a, d - and $30 - sla a - ld d, a - ; fall through - - ; if channel 3, store high nibble as volume - ; else, store volume (high nibble) and fade (low nibble) -.skipChannel3 - ld b, 0 - ld hl, wChannelVolumes - add hl, bc - ld [hl], d -.noiseChannel - jp Audio2_sound_ret - -Audio2_toggle_perfect_pitch: - ld a, d - cp toggle_perfect_pitch_cmd - jr nz, Audio2_vibrato - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - ld a, [hl] - xor $1 - ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio2_sound_ret - -Audio2_vibrato: - cp vibrato_cmd - jr nz, Audio2_pitch_slide - call Audio2_GetNextMusicByte - ld b, 0 - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld [hl], a ; store delay - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, bc - ld [hl], a ; store delay - call Audio2_GetNextMusicByte - ld d, a - -; The high nybble of the command byte is the extent of the vibrato. -; Let n be the extent. -; The upper nybble of the channel's byte in the wChannelVibratoExtents -; array will store the extent above the note: (n / 2) + (n % 2). -; The lower nybble will store the extent below the note: (n / 2). -; These two values add to the total extent, n. - and $f0 - swap a - ld b, 0 - ld hl, wChannelVibratoExtents - add hl, bc - srl a - ld e, a - adc b - swap a - or e - ld [hl], a - -; The low nybble of the command byte is the rate of the vibrato. -; The high and low nybbles of the channel's byte in the wChannelVibratoRates -; array are both initialised to this value because the high nybble is the -; counter reload value and the low nybble is the counter itself, which should -; start at its value upon reload. - ld a, d - and $f - ld d, a - ld hl, wChannelVibratoRates - add hl, bc - swap a - or d - ld [hl], a - - jp Audio2_sound_ret - -Audio2_pitch_slide: - cp pitch_slide_cmd - jr nz, Audio2_duty_cycle - call Audio2_GetNextMusicByte - ld b, 0 - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc - ld [hl], a - call Audio2_GetNextMusicByte - ld d, a - and $f0 - swap a - ld b, a - ld a, d - and $f - call Audio2_CalculateFrequency - ld b, 0 - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld [hl], d - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld [hl], e - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_PITCH_SLIDE_ON, [hl] - call Audio2_GetNextMusicByte - ld d, a - jp Audio2_note_length - -Audio2_duty_cycle: - cp duty_cycle_cmd - jr nz, Audio2_tempo - call Audio2_GetNextMusicByte - rrca - rrca - and $c0 - ld b, 0 - ld hl, wChannelDutyCycles - add hl, bc - ld [hl], a ; store duty cycle - jp Audio2_sound_ret - -Audio2_tempo: - cp tempo_cmd - jr nz, Audio2_stereo_panning - ld a, c - cp CHAN5 - jr nc, .sfxChannel - call Audio2_GetNextMusicByte - ld [wMusicTempo], a ; store first param - call Audio2_GetNextMusicByte - ld [wMusicTempo + 1], a ; store second param - xor a - ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM - ld [wChannelNoteDelayCountersFractionalPart + 1], a - ld [wChannelNoteDelayCountersFractionalPart + 2], a - ld [wChannelNoteDelayCountersFractionalPart + 3], a - jr .musicChannelDone -.sfxChannel - call Audio2_GetNextMusicByte - ld [wSfxTempo], a ; store first param - call Audio2_GetNextMusicByte - ld [wSfxTempo + 1], a ; store second param - xor a - ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM - ld [wChannelNoteDelayCountersFractionalPart + 5], a - ld [wChannelNoteDelayCountersFractionalPart + 6], a - ld [wChannelNoteDelayCountersFractionalPart + 7], a -.musicChannelDone - jp Audio2_sound_ret - -Audio2_stereo_panning: - cp stereo_panning_cmd - jr nz, Audio2_unknownmusic0xef - call Audio2_GetNextMusicByte - ld [wStereoPanning], a ; store panning - jp Audio2_sound_ret - -; this appears to never be used -Audio2_unknownmusic0xef: - cp unknownmusic0xef_cmd - jr nz, Audio2_duty_cycle_pattern - call Audio2_GetNextMusicByte - push bc - call Audio2_PlaySound - pop bc - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr nz, .skip - ld a, [wChannelSoundIDs + CHAN8] - ld [wDisableChannelOutputWhenSfxEnds], a - xor a - ld [wChannelSoundIDs + CHAN8], a -.skip - jp Audio2_sound_ret - -Audio2_duty_cycle_pattern: - cp duty_cycle_pattern_cmd - jr nz, Audio2_volume - call Audio2_GetNextMusicByte - ld b, 0 - ld hl, wChannelDutyCyclePatterns - add hl, bc - ld [hl], a ; store full pattern - and %11000000 - ld hl, wChannelDutyCycles - add hl, bc - ld [hl], a ; store first duty cycle - ld hl, wChannelFlags1 - add hl, bc - set BIT_ROTATE_DUTY_CYCLE, [hl] - jp Audio2_sound_ret - -Audio2_volume: - cp volume_cmd - jr nz, Audio2_execute_music - call Audio2_GetNextMusicByte - ldh [rNR50], a ; store volume - jp Audio2_sound_ret - -Audio2_execute_music: - cp execute_music_cmd - jr nz, Audio2_octave - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - set BIT_EXECUTE_MUSIC, [hl] - jp Audio2_sound_ret - -Audio2_octave: - and $f0 - cp octave_cmd - jr nz, Audio2_sfx_note - ld hl, wChannelOctaves - ld b, 0 - add hl, bc - ld a, d - and $f - ld [hl], a ; store low nibble as octave - jp Audio2_sound_ret - -; sfx_note is either square_note or noise_note depending on the channel -Audio2_sfx_note: - cp sfx_note_cmd - jr nz, Audio2_pitch_sweep - ld a, c - cp CHAN4 ; is this a noise or sfx channel? - jr c, Audio2_pitch_sweep ; no - ld b, 0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? - jr nz, Audio2_pitch_sweep ; yes - call Audio2_note_length - -; This code seems to do the same thing as what Audio2_ApplyDutyCycleAndSoundLength -; does below. - ld d, a - ld b, 0 - ld hl, wChannelDutyCycles - add hl, bc - ld a, [hl] - or d - ld d, a - ld b, REG_DUTY_SOUND_LEN - call Audio2_GetRegisterPointer - ld [hl], d - - call Audio2_GetNextMusicByte - ld d, a - ld b, REG_VOLUME_ENVELOPE - call Audio2_GetRegisterPointer - ld [hl], d - call Audio2_GetNextMusicByte - ld e, a - ld a, c - cp CHAN8 - ld a, 0 - jr z, .skip -; Channels 1 through 3 have 2 registers that control frequency, but the noise -; channel a single register (the polynomial counter) that controls frequency, -; so this command has one less byte on the noise channel. - push de - call Audio2_GetNextMusicByte - pop de -.skip - ld d, a - push de - call Audio2_ApplyDutyCycleAndSoundLength - call Audio2_EnableChannelOutput - pop de - call Audio2_ApplyWavePatternAndFrequency - ret - -Audio2_pitch_sweep: - ld a, c - cp CHAN5 - jr c, Audio2_note ; if not a sfx - ld a, d - cp pitch_sweep_cmd - jr nz, Audio2_note - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio2_note ; no - call Audio2_GetNextMusicByte - ldh [rNR10], a - jp Audio2_sound_ret - -Audio2_note: - ld a, c - cp CHAN4 - jr nz, Audio2_note_length ; if not noise channel - ld a, d - and $f0 - cp drum_note_cmd - jr z, .drum_note - jr nc, Audio2_note_length - - ; this executes when on the noise channel and - ; the command id is less than drum_note_cmd ($b0) - ; in this case, the upper nybble is used as the noise instrument ($1-$a) - ; and the lower nybble is the length minus 1 (0-15) - ; however, this doesn't work for instrument #2 because the command id - ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a drum_note command that is only 1 byte - ; instead of 2 and can only be used with instruments 1 and 3 through 10 - ; this is unused by the game - swap a - ld b, a - ld a, d - and $f - ld d, a - ld a, b - push de - push bc - jr .playDnote - -.drum_note - ld a, d - and $f - push af - push bc - call Audio2_GetNextMusicByte ; get drum_note instrument -.playDnote - ld d, a - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr nz, .skipDnote - ld a, d - call Audio2_PlaySound -.skipDnote - pop bc - pop de - -Audio2_note_length: - ld a, d - push af - and $f - inc a - ld b, 0 - ld e, a ; store note length (in 16ths) - ld d, b - ld hl, wChannelNoteSpeeds - add hl, bc - ld a, [hl] - ld l, b - call Audio2_MultiplyAdd - ld a, c - cp CHAN5 - jr nc, .sfxChannel - ld a, [wMusicTempo] - ld d, a - ld a, [wMusicTempo + 1] - ld e, a - jr .skip -.sfxChannel - ld d, $1 - ld e, $0 - cp CHAN8 - jr z, .skip ; if noise channel - call Audio2_SetSfxTempo - ld a, [wSfxTempo] - ld d, a - ld a, [wSfxTempo + 1] - ld e, a -.skip - ld a, l ; a = note_length * note_speed - ld b, 0 - ld hl, wChannelNoteDelayCountersFractionalPart - add hl, bc - ld l, [hl] - call Audio2_MultiplyAdd - ld e, l - ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) - ld hl, wChannelNoteDelayCountersFractionalPart - add hl, bc - ld [hl], e - ld a, d - ld hl, wChannelNoteDelayCounters - add hl, bc - ld [hl], a - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio2_note_pitch - ld hl, wChannelFlags1 - add hl, bc - bit BIT_NOISE_OR_SFX, [hl] - jr z, Audio2_note_pitch - pop hl - ret - -Audio2_note_pitch: - pop af - and $f0 - cp rest_cmd - jr nz, .notRest - ld a, c - cp CHAN5 - jr nc, .next -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr nz, .done - ; fall through -.next - ld a, c - cp CHAN3 - jr z, .channel3 - cp CHAN7 - jr nz, .notChannel3 -.channel3 - ld b, 0 - ld hl, Audio2_HWChannelDisableMasks - add hl, bc - ldh a, [rNR51] - and [hl] - ldh [rNR51], a ; disable hardware channel 3's output - jr .done -.notChannel3 - ld b, REG_VOLUME_ENVELOPE - call Audio2_GetRegisterPointer - ld a, $8 ; fade in sound - ld [hli], a - inc hl - ld a, $80 ; restart sound - ld [hl], a -.done - ret -.notRest - swap a - ld b, 0 - ld hl, wChannelOctaves - add hl, bc - ld b, [hl] - call Audio2_CalculateFrequency - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_ON, [hl] - jr z, .skipPitchSlide - call Audio2_InitPitchSlideVars -.skipPitchSlide - push de - ld a, c - cp CHAN5 - jr nc, .sfxChannel ; if sfx channel -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - ld d, 0 - ld e, a - add hl, de - ld a, [hl] - and a - jr nz, .noSfx - jr .sfxChannel -.noSfx - pop de - ret -.sfxChannel - ld b, 0 - ld hl, wChannelVolumes - add hl, bc - ld d, [hl] - ld b, REG_VOLUME_ENVELOPE - call Audio2_GetRegisterPointer - ld [hl], d - call Audio2_ApplyDutyCycleAndSoundLength - call Audio2_EnableChannelOutput - pop de - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used? - jr z, .skipFrequencyInc - inc e ; if yes, increment the frequency by 1 - jr nc, .skipFrequencyInc - inc d -.skipFrequencyInc - ld hl, wChannelFrequencyLowBytes - add hl, bc - ld [hl], e - call Audio2_ApplyWavePatternAndFrequency - ret - -Audio2_EnableChannelOutput: - ld b, 0 - ld hl, Audio2_HWChannelEnableMasks - add hl, bc - ldh a, [rNR51] - or [hl] ; set this channel's bits - ld d, a - ld a, c - cp CHAN8 - jr z, .noiseChannelOrNoSfx - cp CHAN5 - jr nc, .skip ; if sfx channel -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr nz, .skip -.noiseChannelOrNoSfx -; If this is the SFX noise channel or a music channel whose corresponding -; SFX channel is off, apply stereo panning. - ld a, [wStereoPanning] - ld hl, Audio2_HWChannelEnableMasks - add hl, bc - and [hl] - ld d, a - ldh a, [rNR51] - ld hl, Audio2_HWChannelDisableMasks - add hl, bc - and [hl] ; reset this channel's output bits - or d ; set this channel's output bits that enabled in [wStereoPanning] - ld d, a -.skip - ld a, d - ldh [rNR51], a - ret - -Audio2_ApplyDutyCycleAndSoundLength: - ld b, 0 - ld hl, wChannelNoteDelayCounters ; use the note delay as sound length - add hl, bc - ld d, [hl] - ld a, c - cp CHAN3 - jr z, .skipDuty ; if music channel 3 - cp CHAN7 - jr z, .skipDuty ; if sfx channel 3 -; include duty cycle (except on channel 3 which doesn't have it) - ld a, d - and $3f - ld d, a - ld hl, wChannelDutyCycles - add hl, bc - ld a, [hl] - or d - ld d, a -.skipDuty - ld b, REG_DUTY_SOUND_LEN - call Audio2_GetRegisterPointer - ld [hl], d - ret - -Audio2_ApplyWavePatternAndFrequency: - ld a, c - cp CHAN3 - jr z, .channel3 - cp CHAN7 - jr nz, .notChannel3 - ; fall through -.channel3 - push de - ld de, wMusicWaveInstrument - cp CHAN3 - jr z, .next - ld de, wSfxWaveInstrument -.next - ld a, [de] - add a - ld d, 0 - ld e, a - ld hl, Audio2_WavePointers - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld hl, rWave_0 - ld b, $f - ld a, $0 ; stop hardware channel 3 - ldh [rNR30], a -.loop - ld a, [de] - inc de - ld [hli], a - ld a, b - dec b - and a - jr nz, .loop - ld a, $80 ; start hardware channel 3 - ldh [rNR30], a - pop de -.notChannel3 - ld a, d - or $80 ; use counter mode (i.e. disable output when the counter reaches 0) - and $c7 ; zero the unused bits in the register - ld d, a - ld b, REG_FREQUENCY_LO - call Audio2_GetRegisterPointer - ld [hl], e ; store frequency low byte - inc hl - ld [hl], d ; store frequency high byte - ; --- this section is only present in this copy of the sound engine - ld a, c - cp CHAN5 - jr c, .musicChannel - call Audio2_ApplyFrequencyModifier -.musicChannel - ; --- - ret - -; --- this section is only present in this copy of the sound engine -; unused -Audio2_ResetCryModifiers: - ld a, c - cp CHAN5 - jr nz, .skip - ld a, [wLowHealthAlarm] - bit 7, a - jr z, .skip - xor a - ld [wFrequencyModifier], a - ld a, $80 - ld [wTempoModifier], a -.skip - ret -; --- - -Audio2_SetSfxTempo: - call Audio2_IsCry - jr c, .skipCryCheck - call Audio2_IsBattleSFX - jr nc, .notCry -.skipCryCheck - ld d, 0 - ld a, [wTempoModifier] - add $80 - jr nc, .next - inc d -.next - ld [wSfxTempo + 1], a - ld a, d - ld [wSfxTempo], a - jr .done -.notCry - xor a - ld [wSfxTempo + 1], a - ld a, $1 - ld [wSfxTempo], a -.done - ret - -Audio2_ApplyFrequencyModifier: - call Audio2_IsCry - jr c, .skipCryCheck - call Audio2_IsBattleSFX - jr nc, .done -.skipCryCheck -; if playing a cry, add the cry's frequency modifier - ld a, [wFrequencyModifier] - add e - jr nc, .noCarry - inc d -.noCarry - dec hl - ld e, a - ld [hl], e - inc hl - ld [hl], d -.done - ret - -Audio2_GoBackOneCommandIfCry: - call Audio2_IsCry - jr nc, .done - ld hl, wChannelCommandPointers - ld e, c - ld d, 0 - sla e - rl d - add hl, de - ld a, [hl] - sub 1 - ld [hl], a - inc hl - ld a, [hl] - sbc 0 - ld [hl], a - scf - ret -.done - scf - ccf - ret - -Audio2_IsCry: -; Returns whether the currently playing audio is a cry in carry. - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_START - jr nc, .next - jr .no -.next - cp CRY_SFX_END - jr z, .no - jr c, .yes -.no - scf - ccf - ret -.yes - scf - ret - -; --- this section is only present in this copy of the sound engine -Audio2_IsBattleSFX: -; Returns whether the currently playing audio is a battle sfx in carry. - ld a, [wChannelSoundIDs + CHAN8] - ld b, a - ld a, [wChannelSoundIDs + CHAN5] - or b - cp BATTLE_SFX_START - jr nc, .next - jr .no -.next - cp BATTLE_SFX_END - jr z, .no - jr c, .yes -.no - scf - ccf - ret -.yes - scf - ret -; --- - -Audio2_ApplyPitchSlide: - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_DECREASING, [hl] - jp nz, .frequencyDecreasing -; frequency increasing - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld e, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld l, [hl] - ld h, b - add hl, de - ld d, h - ld e, l - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, bc - push hl - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld a, [hl] - pop hl - add [hl] - ld [hl], a - ld a, 0 - adc e - ld e, a - ld a, 0 - adc d - ld d, a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, [hl] - cp d - jp c, .reachedTargetFrequency - jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, [hl] - cp e - jp c, .reachedTargetFrequency - jr .applyUpdatedFrequency -.frequencyDecreasing - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld a, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld e, [hl] - sub e - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld a, [hl] - add a - ld [hl], a - ld a, e - sbc b - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, d - cp [hl] - jr c, .reachedTargetFrequency - jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, e - cp [hl] - jr c, .reachedTargetFrequency -.applyUpdatedFrequency - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld [hl], e - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld [hl], d - ld b, REG_FREQUENCY_LO - call Audio2_GetRegisterPointer - ld a, e - ld [hli], a - ld [hl], d - ret -.reachedTargetFrequency -; Turn off pitch slide when the target frequency has been reached. - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_ON, [hl] - res BIT_PITCH_SLIDE_DECREASING, [hl] - ret - -Audio2_InitPitchSlideVars: - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld [hl], d - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld [hl], e - ld hl, wChannelNoteDelayCounters - add hl, bc - ld a, [hl] - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc - sub [hl] - jr nc, .next - ld a, 1 -.next - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, e - sub [hl] - ld e, a - ld a, d - sbc b - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - sub [hl] - jr c, .targetFrequencyGreater - ld d, a - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_PITCH_SLIDE_DECREASING, [hl] - jr .next2 -.targetFrequencyGreater -; If the target frequency is greater, subtract the current frequency from -; the target frequency to get the absolute difference. - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld e, [hl] - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, [hl] - sub e - ld e, a - -; Bug. Instead of borrowing from the high byte of the target frequency as it -; should, it borrows from the high byte of the current frequency instead. -; This means that the result will be 0x200 greater than it should be if the -; low byte of the current frequency is greater than the low byte of the -; target frequency. - ld a, d - sbc b - ld d, a - - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, [hl] - sub d - ld d, a - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_DECREASING, [hl] - -.next2 - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc -.divideLoop - inc b - ld a, e - sub [hl] - ld e, a - jr nc, .divideLoop - ld a, d - and a - jr z, .doneDividing - dec a - ld d, a - jr .divideLoop -.doneDividing - ld a, e ; a = remainder - dividend - add [hl] - ld d, b ; d = quotient + 1 - ld b, 0 - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld [hl], d ; store quotient + 1 - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld [hl], a ; store remainder - dividend - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, bc - ld [hl], a ; store remainder - dividend - ret - -Audio2_ApplyDutyCyclePattern: - ld b, 0 - ld hl, wChannelDutyCyclePatterns - add hl, bc - ld a, [hl] - rlca - rlca - ld [hl], a - and $c0 - ld d, a - ld b, REG_DUTY_SOUND_LEN - call Audio2_GetRegisterPointer - ld a, [hl] - and $3f - or d - ld [hl], a - ret - -Audio2_GetNextMusicByte: - ld d, 0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - ld a, [hli] - ld e, a - ld a, [hld] - ld d, a - ld a, [de] ; get next music command - inc de - ld [hl], e ; store address of next command - inc hl - ld [hl], d - ret - -Audio2_GetRegisterPointer: -; hl = address of hardware sound register b for software channel c - ld a, c - ld hl, Audio2_HWChannelBaseAddresses - add l - jr nc, .noCarry - inc h -.noCarry - ld l, a - ld a, [hl] - add b - ld l, a - ld h, $ff - ret - -Audio2_MultiplyAdd: -; hl = l + (a * de) - ld h, 0 -.loop - srl a - jr nc, .skipAdd - add hl, de -.skipAdd - sla e - rl d - and a - jr z, .done - jr .loop -.done - ret - -Audio2_CalculateFrequency: -; return the frequency for note a, octave b in de - ld h, 0 - ld l, a - add hl, hl - ld d, h - ld e, l - ld hl, Audio2_Pitches - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld a, b -.loop - cp 7 - jr z, .done - sra d - rr e - inc a - jr .loop -.done - ld a, 8 - add d - ld d, a - ret - -Audio2_PlaySound:: - ld [wSoundID], a - cp SFX_STOP_ALL_MUSIC - jp z, .stopAllAudio - cp MAX_SFX_ID_2 - jp z, .playSfx - jp c, .playSfx - cp $fe - jr z, .playMusic - jp nc, .playSfx - -.playMusic - xor a - ld [wUnusedC000], a - ld [wDisableChannelOutputWhenSfxEnds], a - ld [wMusicTempo + 1], a - ld [wMusicWaveInstrument], a - ld [wSfxWaveInstrument], a - ld d, NUM_CHANNELS - ld hl, wChannelReturnAddresses - call .FillMem - ld hl, wChannelCommandPointers - call .FillMem - ld d, NUM_MUSIC_CHANS - ld hl, wChannelSoundIDs - call .FillMem - ld hl, wChannelFlags1 - call .FillMem - ld hl, wChannelDutyCycles - call .FillMem - ld hl, wChannelDutyCyclePatterns - call .FillMem - ld hl, wChannelVibratoDelayCounters - call .FillMem - ld hl, wChannelVibratoExtents - call .FillMem - ld hl, wChannelVibratoRates - call .FillMem - ld hl, wChannelFrequencyLowBytes - call .FillMem - ld hl, wChannelVibratoDelayCounterReloadValues - call .FillMem - ld hl, wChannelFlags2 - call .FillMem - ld hl, wChannelPitchSlideLengthModifiers - call .FillMem - ld hl, wChannelPitchSlideFrequencySteps - call .FillMem - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - call .FillMem - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - call .FillMem - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - call .FillMem - ld a, $1 - ld hl, wChannelLoopCounters - call .FillMem - ld hl, wChannelNoteDelayCounters - call .FillMem - ld hl, wChannelNoteSpeeds - call .FillMem - ld [wMusicTempo], a - ld a, $ff - ld [wStereoPanning], a - xor a - ldh [rNR50], a - ld a, $8 - ldh [rNR10], a - ld a, 0 - ldh [rNR51], a - xor a - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a - ld a, $77 - ldh [rNR50], a - jp .playSoundCommon - -.playSfx - ld l, a - ld e, a - ld h, 0 - ld d, h - add hl, hl - add hl, de - ld de, SFX_Headers_2 - add hl, de - ld a, h - ld [wSfxHeaderPointer], a - ld a, l - ld [wSfxHeaderPointer + 1], a - ld a, [hl] - and $c0 - rlca - rlca - ld c, a -.sfxChannelLoop - ld d, c - ld a, c - add a - add c - ld c, a - ld b, 0 - ld a, [wSfxHeaderPointer] - ld h, a - ld a, [wSfxHeaderPointer + 1] - ld l, a - add hl, bc - ld c, d - ld a, [hl] - and $f - ld e, a ; software channel ID - ld d, 0 - ld hl, wChannelSoundIDs - add hl, de - ld a, [hl] - and a - jr z, .playChannel - ld a, e - cp CHAN8 - jr nz, .notNoiseChannel - ld a, [wSoundID] - cp NOISE_INSTRUMENTS_END - jr nc, .notNoiseInstrument - ret -.notNoiseInstrument - ld a, [hl] - cp NOISE_INSTRUMENTS_END - jr z, .playChannel - jr c, .playChannel -.notNoiseChannel - ld a, [wSoundID] - cp [hl] - jr z, .playChannel - jr c, .playChannel - ret -.playChannel - xor a - push de - ld h, d - ld l, e - add hl, hl - ld d, h - ld e, l - ld hl, wChannelReturnAddresses - add hl, de - ld [hli], a - ld [hl], a - ld hl, wChannelCommandPointers - add hl, de - ld [hli], a - ld [hl], a - pop de - ld hl, wChannelSoundIDs - add hl, de - ld [hl], a - ld hl, wChannelFlags1 - add hl, de - ld [hl], a - ld hl, wChannelDutyCycles - add hl, de - ld [hl], a - ld hl, wChannelDutyCyclePatterns - add hl, de - ld [hl], a - ld hl, wChannelVibratoDelayCounters - add hl, de - ld [hl], a - ld hl, wChannelVibratoExtents - add hl, de - ld [hl], a - ld hl, wChannelVibratoRates - add hl, de - ld [hl], a - ld hl, wChannelFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideLengthModifiers - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideFrequencySteps - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelFlags2 - add hl, de - ld [hl], a - ld a, $1 - ld hl, wChannelLoopCounters - add hl, de - ld [hl], a - ld hl, wChannelNoteDelayCounters - add hl, de - ld [hl], a - ld hl, wChannelNoteSpeeds - add hl, de - ld [hl], a - ld a, e - cp CHAN5 - jr nz, .skipSweepDisable - ld a, $8 - ldh [rNR10], a ; sweep off -.skipSweepDisable - ld a, c - and a - jp z, .playSoundCommon - dec c - jp .sfxChannelLoop - -.stopAllAudio - ld a, $80 - ldh [rNR52], a ; sound hardware on - ldh [rNR30], a ; wave playback on - xor a - ldh [rNR51], a ; no sound output - ldh [rNR32], a ; mute channel 3 (wave channel) - ld a, $8 - ldh [rNR10], a ; sweep off - ldh [rNR12], a ; mute channel 1 (pulse channel 1) - ldh [rNR22], a ; mute channel 2 (pulse channel 2) - ldh [rNR42], a ; mute channel 4 (noise channel) - ld a, $40 - ldh [rNR14], a ; counter mode - ldh [rNR24], a - ldh [rNR44], a - ld a, $77 - ldh [rNR50], a ; full volume - xor a - ld [wUnusedC000], a - ld [wDisableChannelOutputWhenSfxEnds], a - ld [wMuteAudioAndPauseMusic], a - ld [wMusicTempo + 1], a - ld [wSfxTempo + 1], a - ld [wMusicWaveInstrument], a - ld [wSfxWaveInstrument], a - ld d, $a0 - ld hl, wChannelCommandPointers - call .FillMem - ld a, $1 - ld d, $18 - ld hl, wChannelNoteDelayCounters - call .FillMem - ld [wMusicTempo], a - ld [wSfxTempo], a - ld a, $ff - ld [wStereoPanning], a - ret - -; fills d bytes at hl with a -.FillMem - ld b, d -.loop - ld [hli], a - dec b - jr nz, .loop - ret - -.playSoundCommon - ld a, [wSoundID] - ld l, a - ld e, a - ld h, 0 - ld d, h - add hl, hl - add hl, de - ld de, SFX_Headers_2 - add hl, de - ld e, l - ld d, h - ld hl, wChannelCommandPointers - ld a, [de] ; get channel number - ld b, a - rlca - rlca - and $3 - ld c, a - ld a, b - and $f - ld b, c - inc b - inc de - ld c, 0 -.commandPointerLoop - cp c - jr z, .next - inc c - inc hl - inc hl - jr .commandPointerLoop -.next - push hl - push bc - push af - ld b, 0 - ld c, a - ld hl, wChannelSoundIDs - add hl, bc - ld a, [wSoundID] - ld [hl], a - pop af - cp CHAN4 - jr c, .skipSettingFlag - ld hl, wChannelFlags1 - add hl, bc - set BIT_NOISE_OR_SFX, [hl] -.skipSettingFlag - pop bc - pop hl - ld a, [de] ; get channel pointer - ld [hli], a - inc de - ld a, [de] - ld [hli], a - inc de - inc c - dec b - ld a, b - and a - ld a, [de] - inc de - jr nz, .commandPointerLoop - ld a, [wSoundID] - cp CRY_SFX_START - jr nc, .maybeCry - jr .done -.maybeCry - ld a, [wSoundID] - cp CRY_SFX_END - jr z, .done - jr c, .cry - jr .done -.cry - ld hl, wChannelSoundIDs + CHAN5 - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - ld hl, wChannelCommandPointers + CHAN7 * 2 ; sfx wave channel pointer - ld de, Audio2_CryRet - ld [hl], e - inc hl - ld [hl], d ; overwrite pointer to point to sound_ret - ld a, [wSavedVolume] - and a - jr nz, .done - ldh a, [rNR50] - ld [wSavedVolume], a - ld a, $77 - ldh [rNR50], a ; full volume -.done - ret - -Audio2_CryRet: - sound_ret - -Audio2_HWChannelBaseAddresses: -; the low bytes of each HW channel's base address - db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 - db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 - -Audio2_HWChannelDisableMasks: - db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 - db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 - -Audio2_HWChannelEnableMasks: - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 - -Audio2_Pitches: -INCLUDE "audio/notes.asm" diff --git a/audio/engine_3.asm b/audio/engine_3.asm deleted file mode 100644 index 404e6e7c..00000000 --- a/audio/engine_3.asm +++ /dev/null @@ -1,1726 +0,0 @@ -; The third of three duplicated sound engines. - -Audio3_UpdateMusic:: - ld c, CHAN1 -.loop - ld b, 0 - ld hl, wChannelSoundIDs - add hl, bc - ld a, [hl] - and a - jr z, .nextChannel - ld a, c - cp CHAN5 - jr nc, .applyAffects ; if sfx channel - ld a, [wMuteAudioAndPauseMusic] - and a - jr z, .applyAffects - bit 7, a - jr nz, .nextChannel - set 7, a - ld [wMuteAudioAndPauseMusic], a - xor a ; disable all channels' output - ldh [rNR51], a - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a - jr .nextChannel -.applyAffects - call Audio3_ApplyMusicAffects -.nextChannel - ld a, c - inc c ; inc channel number - cp CHAN8 - jr nz, .loop - ret - -; this routine checks flags for music effects currently applied -; to the channel and calls certain functions based on flags. -Audio3_ApplyMusicAffects: - ld b, $0 - ld hl, wChannelNoteDelayCounters ; delay until next note - add hl, bc - ld a, [hl] - cp 1 ; if the delay is 1, play next note - jp z, Audio3_PlayNextNote - dec a ; otherwise, decrease the delay timer - ld [hl], a - ld a, c - cp CHAN5 - jr nc, .startChecks ; if a sfx channel - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr z, .startChecks - ret -.startChecks - ld hl, wChannelFlags1 - add hl, bc - bit BIT_ROTATE_DUTY_CYCLE, [hl] - jr z, .checkForExecuteMusic - call Audio3_ApplyDutyCyclePattern -.checkForExecuteMusic - ld b, 0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, .checkForPitchSlide - ld hl, wChannelFlags1 - add hl, bc - bit BIT_NOISE_OR_SFX, [hl] - jr nz, .skipPitchSlideVibrato -.checkForPitchSlide - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_ON, [hl] - jr z, .checkVibratoDelay - jp Audio3_ApplyPitchSlide -.checkVibratoDelay - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld a, [hl] - and a ; check if delay is over - jr z, .checkForVibrato - dec [hl] ; otherwise, dec delay -.skipPitchSlideVibrato - ret -.checkForVibrato - ld hl, wChannelVibratoExtents - add hl, bc - ld a, [hl] - and a - jr nz, .vibrato - ret ; no vibrato -.vibrato - ld d, a - ld hl, wChannelVibratoRates - add hl, bc - ld a, [hl] - and $f - and a - jr z, .applyVibrato - dec [hl] ; decrement counter - ret -.applyVibrato - ld a, [hl] - swap [hl] - or [hl] - ld [hl], a ; reload the counter - ld hl, wChannelFrequencyLowBytes - add hl, bc - ld e, [hl] ; get note pitch - ld hl, wChannelFlags1 - add hl, bc -; This is the only code that sets/resets the vibrato direction bit, so it -; continuously alternates which path it takes. - bit BIT_VIBRATO_DIRECTION, [hl] - jr z, .unset - res BIT_VIBRATO_DIRECTION, [hl] - ld a, d - and $f - ld d, a - ld a, e - sub d - jr nc, .noCarry - ld a, 0 -.noCarry - jr .done -.unset - set BIT_VIBRATO_DIRECTION, [hl] - ld a, d - and $f0 - swap a - add e - jr nc, .done - ld a, $ff -.done - ld d, a - ld b, REG_FREQUENCY_LO - call Audio3_GetRegisterPointer - ld [hl], d - ret - -; this routine executes all music commands that take up no time, -; like tempo changes, duty cycle changes etc. and doesn't return -; until the first note is reached -Audio3_PlayNextNote: -; reload the vibrato delay counter - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, bc - ld a, [hl] - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld [hl], a - - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_ON, [hl] - res BIT_PITCH_SLIDE_DECREASING, [hl] - call Audio3_sound_ret - ret - -Audio3_sound_ret: - call Audio3_GetNextMusicByte - ld d, a - cp sound_ret_cmd - jp nz, Audio3_sound_call - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_SOUND_CALL, [hl] - jr nz, .returnFromCall - ld a, c - cp CHAN4 - jr nc, .noiseOrSfxChannel - jr .disableChannelOutput -.noiseOrSfxChannel - res BIT_NOISE_OR_SFX, [hl] - ld hl, wChannelFlags2 - add hl, bc - res BIT_EXECUTE_MUSIC, [hl] - cp CHAN7 - jr nz, .skipSfxChannel3 -; restart hardware channel 3 (wave channel) output - ld a, $0 - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a -.skipSfxChannel3 - jr nz, .dontDisable - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr z, .dontDisable - xor a - ld [wDisableChannelOutputWhenSfxEnds], a - jr .disableChannelOutput -.dontDisable - jr .afterDisable -.returnFromCall - res 1, [hl] - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - push hl ; store current channel address - ld hl, wChannelReturnAddresses - add hl, de - ld e, l - ld d, h - pop hl - ld a, [de] - ld [hli], a - inc de - ld a, [de] - ld [hl], a ; loads channel address to return to - jp Audio3_sound_ret -.disableChannelOutput - ld hl, Audio3_HWChannelDisableMasks - add hl, bc - ldh a, [rNR51] - and [hl] - ldh [rNR51], a -.afterDisable - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_START - jr nc, .maybeCry - jr .skipCry -.maybeCry - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_END - jr z, .skipCry - jr c, .cry - jr .skipCry -.cry - ld a, c - cp CHAN5 - jr z, .skipRewind - call Audio3_GoBackOneCommandIfCry - ret c -.skipRewind - ld a, [wSavedVolume] - ldh [rNR50], a - xor a - ld [wSavedVolume], a -.skipCry - ld hl, wChannelSoundIDs - add hl, bc - ld [hl], b - ret - -Audio3_sound_call: - cp sound_call_cmd - jp nz, Audio3_sound_loop - call Audio3_GetNextMusicByte - push af - call Audio3_GetNextMusicByte - ld d, a - pop af - ld e, a - push de ; store pointer - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - push hl - ld hl, wChannelReturnAddresses - add hl, de - ld e, l - ld d, h - pop hl - ld a, [hli] - ld [de], a - inc de - ld a, [hld] - ld [de], a ; copy current channel address - pop de - ld [hl], e - inc hl - ld [hl], d ; overwrite current address with pointer - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_SOUND_CALL, [hl] ; set the call flag - jp Audio3_sound_ret - -Audio3_sound_loop: - cp sound_loop_cmd - jp nz, Audio3_note_type - call Audio3_GetNextMusicByte - ld e, a - and a - jr z, .infiniteLoop - ld b, 0 - ld hl, wChannelLoopCounters - add hl, bc - ld a, [hl] - cp e - jr nz, .loopAgain - ld a, $1 ; if no more loops to make, - ld [hl], a - call Audio3_GetNextMusicByte ; skip pointer - call Audio3_GetNextMusicByte - jp Audio3_sound_ret -.loopAgain ; inc loop count - inc a - ld [hl], a - ; fall through -.infiniteLoop ; overwrite current address with pointer - call Audio3_GetNextMusicByte - push af - call Audio3_GetNextMusicByte - ld b, a - ld d, $0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - pop af - ld [hli], a - ld [hl], b - jp Audio3_sound_ret - -Audio3_note_type: - and $f0 - cp note_type_cmd - jp nz, Audio3_toggle_perfect_pitch - ld a, d - and $f - ld b, $0 - ld hl, wChannelNoteSpeeds - add hl, bc - ld [hl], a ; store low nibble as speed - ld a, c - cp CHAN4 - jr z, .noiseChannel ; noise channel has 0 params - call Audio3_GetNextMusicByte - ld d, a - ld a, c - cp CHAN3 - jr z, .musicChannel3 - cp CHAN7 - jr nz, .skipChannel3 - ld hl, wSfxWaveInstrument - jr .channel3 -.musicChannel3 - ld hl, wMusicWaveInstrument -.channel3 - ld a, d - and $f - ld [hl], a ; store low nibble of param as wave instrument - ld a, d - and $30 - sla a - ld d, a - ; fall through - - ; if channel 3, store high nibble as volume - ; else, store volume (high nibble) and fade (low nibble) -.skipChannel3 - ld b, 0 - ld hl, wChannelVolumes - add hl, bc - ld [hl], d -.noiseChannel - jp Audio3_sound_ret - -Audio3_toggle_perfect_pitch: - ld a, d - cp toggle_perfect_pitch_cmd - jr nz, Audio3_vibrato - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - ld a, [hl] - xor $1 - ld [hl], a ; flip bit 0 of wChannelFlags1 - jp Audio3_sound_ret - -Audio3_vibrato: - cp vibrato_cmd - jr nz, Audio3_pitch_slide - call Audio3_GetNextMusicByte - ld b, 0 - ld hl, wChannelVibratoDelayCounters - add hl, bc - ld [hl], a ; store delay - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, bc - ld [hl], a ; store delay - call Audio3_GetNextMusicByte - ld d, a - -; The high nybble of the command byte is the extent of the vibrato. -; Let n be the extent. -; The upper nybble of the channel's byte in the wChannelVibratoExtents -; array will store the extent above the note: (n / 2) + (n % 2). -; The lower nybble will store the extent below the note: (n / 2). -; These two values add to the total extent, n. - and $f0 - swap a - ld b, 0 - ld hl, wChannelVibratoExtents - add hl, bc - srl a - ld e, a - adc b - swap a - or e - ld [hl], a - -; The low nybble of the command byte is the rate of the vibrato. -; The high and low nybbles of the channel's byte in the wChannelVibratoRates -; array are both initialised to this value because the high nybble is the -; counter reload value and the low nybble is the counter itself, which should -; start at its value upon reload. - ld a, d - and $f - ld d, a - ld hl, wChannelVibratoRates - add hl, bc - swap a - or d - ld [hl], a - - jp Audio3_sound_ret - -Audio3_pitch_slide: - cp pitch_slide_cmd - jr nz, Audio3_duty_cycle - call Audio3_GetNextMusicByte - ld b, 0 - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc - ld [hl], a - call Audio3_GetNextMusicByte - ld d, a - and $f0 - swap a - ld b, a - ld a, d - and $f - call Audio3_CalculateFrequency - ld b, 0 - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld [hl], d - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld [hl], e - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_PITCH_SLIDE_ON, [hl] - call Audio3_GetNextMusicByte - ld d, a - jp Audio3_note_length - -Audio3_duty_cycle: - cp duty_cycle_cmd - jr nz, Audio3_tempo - call Audio3_GetNextMusicByte - rrca - rrca - and $c0 - ld b, 0 - ld hl, wChannelDutyCycles - add hl, bc - ld [hl], a ; store duty cycle - jp Audio3_sound_ret - -Audio3_tempo: - cp tempo_cmd - jr nz, Audio3_stereo_panning - ld a, c - cp CHAN5 - jr nc, .sfxChannel - call Audio3_GetNextMusicByte - ld [wMusicTempo], a ; store first param - call Audio3_GetNextMusicByte - ld [wMusicTempo + 1], a ; store second param - xor a - ld [wChannelNoteDelayCountersFractionalPart], a ; clear RAM - ld [wChannelNoteDelayCountersFractionalPart + 1], a - ld [wChannelNoteDelayCountersFractionalPart + 2], a - ld [wChannelNoteDelayCountersFractionalPart + 3], a - jr .musicChannelDone -.sfxChannel - call Audio3_GetNextMusicByte - ld [wSfxTempo], a ; store first param - call Audio3_GetNextMusicByte - ld [wSfxTempo + 1], a ; store second param - xor a - ld [wChannelNoteDelayCountersFractionalPart + 4], a ; clear RAM - ld [wChannelNoteDelayCountersFractionalPart + 5], a - ld [wChannelNoteDelayCountersFractionalPart + 6], a - ld [wChannelNoteDelayCountersFractionalPart + 7], a -.musicChannelDone - jp Audio3_sound_ret - -Audio3_stereo_panning: - cp stereo_panning_cmd - jr nz, Audio3_unknownmusic0xef - call Audio3_GetNextMusicByte - ld [wStereoPanning], a ; store panning - jp Audio3_sound_ret - -; this appears to never be used -Audio3_unknownmusic0xef: - cp unknownmusic0xef_cmd - jr nz, Audio3_duty_cycle_pattern - call Audio3_GetNextMusicByte - push bc - call Audio3_PlaySound - pop bc - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr nz, .skip - ld a, [wChannelSoundIDs + CHAN8] - ld [wDisableChannelOutputWhenSfxEnds], a - xor a - ld [wChannelSoundIDs + CHAN8], a -.skip - jp Audio3_sound_ret - -Audio3_duty_cycle_pattern: - cp duty_cycle_pattern_cmd - jr nz, Audio3_volume - call Audio3_GetNextMusicByte - ld b, 0 - ld hl, wChannelDutyCyclePatterns - add hl, bc - ld [hl], a ; store full pattern - and %11000000 - ld hl, wChannelDutyCycles - add hl, bc - ld [hl], a ; store first duty cycle - ld hl, wChannelFlags1 - add hl, bc - set BIT_ROTATE_DUTY_CYCLE, [hl] - jp Audio3_sound_ret - -Audio3_volume: - cp volume_cmd - jr nz, Audio3_execute_music - call Audio3_GetNextMusicByte - ldh [rNR50], a ; store volume - jp Audio3_sound_ret - -Audio3_execute_music: - cp execute_music_cmd - jr nz, Audio3_octave - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - set BIT_EXECUTE_MUSIC, [hl] - jp Audio3_sound_ret - -Audio3_octave: - and $f0 - cp octave_cmd - jr nz, Audio3_sfx_note - ld hl, wChannelOctaves - ld b, 0 - add hl, bc - ld a, d - and $f - ld [hl], a ; store low nibble as octave - jp Audio3_sound_ret - -; sfx_note is either square_note or noise_note depending on the channel -Audio3_sfx_note: - cp sfx_note_cmd - jr nz, Audio3_pitch_sweep - ld a, c - cp CHAN4 ; is this a noise or sfx channel? - jr c, Audio3_pitch_sweep ; no - ld b, 0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] ; is execute_music being used? - jr nz, Audio3_pitch_sweep ; yes - call Audio3_note_length - -; This code seems to do the same thing as what Audio3_ApplyDutyCycleAndSoundLength -; does below. - ld d, a - ld b, 0 - ld hl, wChannelDutyCycles - add hl, bc - ld a, [hl] - or d - ld d, a - ld b, REG_DUTY_SOUND_LEN - call Audio3_GetRegisterPointer - ld [hl], d - - call Audio3_GetNextMusicByte - ld d, a - ld b, REG_VOLUME_ENVELOPE - call Audio3_GetRegisterPointer - ld [hl], d - call Audio3_GetNextMusicByte - ld e, a - ld a, c - cp CHAN8 - ld a, 0 - jr z, .skip -; Channels 1 through 3 have 2 registers that control frequency, but the noise -; channel a single register (the polynomial counter) that controls frequency, -; so this command has one less byte on the noise channel. - push de - call Audio3_GetNextMusicByte - pop de -.skip - ld d, a - push de - call Audio3_ApplyDutyCycleAndSoundLength - call Audio3_EnableChannelOutput - pop de - call Audio3_ApplyWavePatternAndFrequency - ret - -Audio3_pitch_sweep: - ld a, c - cp CHAN5 - jr c, Audio3_note ; if not a sfx - ld a, d - cp pitch_sweep_cmd - jr nz, Audio3_note - ld b, $0 - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio3_note ; no - call Audio3_GetNextMusicByte - ldh [rNR10], a - jp Audio3_sound_ret - -Audio3_note: - ld a, c - cp CHAN4 - jr nz, Audio3_note_length ; if not noise channel - ld a, d - and $f0 - cp drum_note_cmd - jr z, .drum_note - jr nc, Audio3_note_length - - ; this executes when on the noise channel and - ; the command id is less than drum_note_cmd ($b0) - ; in this case, the upper nybble is used as the noise instrument ($1-$a) - ; and the lower nybble is the length minus 1 (0-15) - ; however, this doesn't work for instrument #2 because the command id - ; is captured by the noise_note command (command id $2x) - ; this essentially acts like a drum_note command that is only 1 byte - ; instead of 2 and can only be used with instruments 1 and 3 through 10 - ; this is unused by the game - swap a - ld b, a - ld a, d - and $f - ld d, a - ld a, b - push de - push bc - jr .playDnote - -.drum_note - ld a, d - and $f - push af - push bc - call Audio3_GetNextMusicByte ; get drum_note instrument -.playDnote - ld d, a - ld a, [wDisableChannelOutputWhenSfxEnds] - and a - jr nz, .skipDnote - ld a, d - call Audio3_PlaySound -.skipDnote - pop bc - pop de - -Audio3_note_length: - ld a, d - push af - and $f - inc a - ld b, 0 - ld e, a ; store note length (in 16ths) - ld d, b - ld hl, wChannelNoteSpeeds - add hl, bc - ld a, [hl] - ld l, b - call Audio3_MultiplyAdd - ld a, c - cp CHAN5 - jr nc, .sfxChannel - ld a, [wMusicTempo] - ld d, a - ld a, [wMusicTempo + 1] - ld e, a - jr .skip -.sfxChannel - ld d, $1 - ld e, $0 - cp CHAN8 - jr z, .skip ; if noise channel - call Audio3_SetSfxTempo - ld a, [wSfxTempo] - ld d, a - ld a, [wSfxTempo + 1] - ld e, a -.skip - ld a, l ; a = note_length * note_speed - ld b, 0 - ld hl, wChannelNoteDelayCountersFractionalPart - add hl, bc - ld l, [hl] - call Audio3_MultiplyAdd - ld e, l - ld d, h ; de = note_delay_frac_part + (note_length * note_speed * tempo) - ld hl, wChannelNoteDelayCountersFractionalPart - add hl, bc - ld [hl], e - ld a, d - ld hl, wChannelNoteDelayCounters - add hl, bc - ld [hl], a - ld hl, wChannelFlags2 - add hl, bc - bit BIT_EXECUTE_MUSIC, [hl] - jr nz, Audio3_note_pitch - ld hl, wChannelFlags1 - add hl, bc - bit BIT_NOISE_OR_SFX, [hl] - jr z, Audio3_note_pitch - pop hl - ret - -Audio3_note_pitch: - pop af - and $f0 - cp rest_cmd - jr nz, .notRest - ld a, c - cp CHAN5 - jr nc, .next -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr nz, .done - ; fall through -.next - ld a, c - cp CHAN3 - jr z, .channel3 - cp CHAN7 - jr nz, .notChannel3 -.channel3 - ld b, 0 - ld hl, Audio3_HWChannelDisableMasks - add hl, bc - ldh a, [rNR51] - and [hl] - ldh [rNR51], a ; disable hardware channel 3's output - jr .done -.notChannel3 - ld b, REG_VOLUME_ENVELOPE - call Audio3_GetRegisterPointer - ld a, $8 ; fade in sound - ld [hli], a - inc hl - ld a, $80 ; restart sound - ld [hl], a -.done - ret -.notRest - swap a - ld b, 0 - ld hl, wChannelOctaves - add hl, bc - ld b, [hl] - call Audio3_CalculateFrequency - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_ON, [hl] - jr z, .skipPitchSlide - call Audio3_InitPitchSlideVars -.skipPitchSlide - push de - ld a, c - cp CHAN5 - jr nc, .sfxChannel ; if sfx channel -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - ld d, 0 - ld e, a - add hl, de - ld a, [hl] - and a - jr nz, .noSfx - jr .sfxChannel -.noSfx - pop de - ret -.sfxChannel - ld b, 0 - ld hl, wChannelVolumes - add hl, bc - ld d, [hl] - ld b, REG_VOLUME_ENVELOPE - call Audio3_GetRegisterPointer - ld [hl], d - call Audio3_ApplyDutyCycleAndSoundLength - call Audio3_EnableChannelOutput - pop de - ld b, $0 - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PERFECT_PITCH, [hl] ; has toggle_perfect_pitch been used? - jr z, .skipFrequencyInc - inc e ; if yes, increment the frequency by 1 - jr nc, .skipFrequencyInc - inc d -.skipFrequencyInc - ld hl, wChannelFrequencyLowBytes - add hl, bc - ld [hl], e - call Audio3_ApplyWavePatternAndFrequency - ret - -Audio3_EnableChannelOutput: - ld b, 0 - ld hl, Audio3_HWChannelEnableMasks - add hl, bc - ldh a, [rNR51] - or [hl] ; set this channel's bits - ld d, a - ld a, c - cp CHAN8 - jr z, .noiseChannelOrNoSfx - cp CHAN5 - jr nc, .skip ; if sfx channel -; If this isn't an SFX channel, try the corresponding SFX channel. - ld hl, wChannelSoundIDs + CHAN5 - add hl, bc - ld a, [hl] - and a - jr nz, .skip -.noiseChannelOrNoSfx -; If this is the SFX noise channel or a music channel whose corresponding -; SFX channel is off, apply stereo panning. - ld a, [wStereoPanning] - ld hl, Audio3_HWChannelEnableMasks - add hl, bc - and [hl] - ld d, a - ldh a, [rNR51] - ld hl, Audio3_HWChannelDisableMasks - add hl, bc - and [hl] ; reset this channel's output bits - or d ; set this channel's output bits that enabled in [wStereoPanning] - ld d, a -.skip - ld a, d - ldh [rNR51], a - ret - -Audio3_ApplyDutyCycleAndSoundLength: - ld b, 0 - ld hl, wChannelNoteDelayCounters ; use the note delay as sound length - add hl, bc - ld d, [hl] - ld a, c - cp CHAN3 - jr z, .skipDuty ; if music channel 3 - cp CHAN7 - jr z, .skipDuty ; if sfx channel 3 -; include duty cycle (except on channel 3 which doesn't have it) - ld a, d - and $3f - ld d, a - ld hl, wChannelDutyCycles - add hl, bc - ld a, [hl] - or d - ld d, a -.skipDuty - ld b, REG_DUTY_SOUND_LEN - call Audio3_GetRegisterPointer - ld [hl], d - ret - -Audio3_ApplyWavePatternAndFrequency: - ld a, c - cp CHAN3 - jr z, .channel3 - cp CHAN7 - jr nz, .notChannel3 - ; fall through -.channel3 - push de - ld de, wMusicWaveInstrument - cp CHAN3 - jr z, .next - ld de, wSfxWaveInstrument -.next - ld a, [de] - add a - ld d, 0 - ld e, a - ld hl, Audio3_WavePointers - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld hl, rWave_0 - ld b, $f - ld a, $0 ; stop hardware channel 3 - ldh [rNR30], a -.loop - ld a, [de] - inc de - ld [hli], a - ld a, b - dec b - and a - jr nz, .loop - ld a, $80 ; start hardware channel 3 - ldh [rNR30], a - pop de -.notChannel3 - ld a, d - or $80 ; use counter mode (i.e. disable output when the counter reaches 0) - and $c7 ; zero the unused bits in the register - ld d, a - ld b, REG_FREQUENCY_LO - call Audio3_GetRegisterPointer - ld [hl], e ; store frequency low byte - inc hl - ld [hl], d ; store frequency high byte - call Audio3_ApplyFrequencyModifier - ret - -Audio3_SetSfxTempo: - call Audio3_IsCry - jr nc, .notCry - ld d, 0 - ld a, [wTempoModifier] - add $80 - jr nc, .next - inc d -.next - ld [wSfxTempo + 1], a - ld a, d - ld [wSfxTempo], a - jr .done -.notCry - xor a - ld [wSfxTempo + 1], a - ld a, $1 - ld [wSfxTempo], a -.done - ret - -Audio3_ApplyFrequencyModifier: - call Audio3_IsCry - jr nc, .done -; if playing a cry, add the cry's frequency modifier - ld a, [wFrequencyModifier] - add e - jr nc, .noCarry - inc d -.noCarry - dec hl - ld e, a - ld [hl], e - inc hl - ld [hl], d -.done - ret - -Audio3_GoBackOneCommandIfCry: - call Audio3_IsCry - jr nc, .done - ld hl, wChannelCommandPointers - ld e, c - ld d, 0 - sla e - rl d - add hl, de - ld a, [hl] - sub 1 - ld [hl], a - inc hl - ld a, [hl] - sbc 0 - ld [hl], a - scf - ret -.done - scf - ccf - ret - -Audio3_IsCry: -; Returns whether the currently playing audio is a cry in carry. - ld a, [wChannelSoundIDs + CHAN5] - cp CRY_SFX_START - jr nc, .next - jr .no -.next - cp CRY_SFX_END - jr z, .no - jr c, .yes -.no - scf - ccf - ret -.yes - scf - ret - -Audio3_ApplyPitchSlide: - ld hl, wChannelFlags1 - add hl, bc - bit BIT_PITCH_SLIDE_DECREASING, [hl] - jp nz, .frequencyDecreasing -; frequency increasing - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld e, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld l, [hl] - ld h, b - add hl, de - ld d, h - ld e, l - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, bc - push hl - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld a, [hl] - pop hl - add [hl] - ld [hl], a - ld a, 0 - adc e - ld e, a - ld a, 0 - adc d - ld d, a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, [hl] - cp d - jp c, .reachedTargetFrequency - jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, [hl] - cp e - jp c, .reachedTargetFrequency - jr .applyUpdatedFrequency -.frequencyDecreasing - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld a, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld e, [hl] - sub e - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld a, [hl] - add a - ld [hl], a - ld a, e - sbc b - ld e, a - ld a, d - sbc b - ld d, a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, d - cp [hl] - jr c, .reachedTargetFrequency - jr nz, .applyUpdatedFrequency - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, e - cp [hl] - jr c, .reachedTargetFrequency -.applyUpdatedFrequency - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld [hl], e - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld [hl], d - ld b, REG_FREQUENCY_LO - call Audio3_GetRegisterPointer - ld a, e - ld [hli], a - ld [hl], d - ret -.reachedTargetFrequency -; Turn off pitch slide when the target frequency has been reached. - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_ON, [hl] - res BIT_PITCH_SLIDE_DECREASING, [hl] - ret - -Audio3_InitPitchSlideVars: - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld [hl], d - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld [hl], e - ld hl, wChannelNoteDelayCounters - add hl, bc - ld a, [hl] - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc - sub [hl] - jr nc, .next - ld a, 1 -.next - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, e - sub [hl] - ld e, a - ld a, d - sbc b - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - sub [hl] - jr c, .targetFrequencyGreater - ld d, a - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - set BIT_PITCH_SLIDE_DECREASING, [hl] - jr .next2 -.targetFrequencyGreater -; If the target frequency is greater, subtract the current frequency from -; the target frequency to get the absolute difference. - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, bc - ld d, [hl] - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, bc - ld e, [hl] - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, bc - ld a, [hl] - sub e - ld e, a - -; Bug. Instead of borrowing from the high byte of the target frequency as it -; should, it borrows from the high byte of the current frequency instead. -; This means that the result will be 0x200 greater than it should be if the -; low byte of the current frequency is greater than the low byte of the -; target frequency. - ld a, d - sbc b - ld d, a - - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, bc - ld a, [hl] - sub d - ld d, a - ld b, 0 - ld hl, wChannelFlags1 - add hl, bc - res BIT_PITCH_SLIDE_DECREASING, [hl] - -.next2 - ld hl, wChannelPitchSlideLengthModifiers - add hl, bc -.divideLoop - inc b - ld a, e - sub [hl] - ld e, a - jr nc, .divideLoop - ld a, d - and a - jr z, .doneDividing - dec a - ld d, a - jr .divideLoop -.doneDividing - ld a, e ; a = remainder - dividend - add [hl] - ld d, b ; d = quotient + 1 - ld b, 0 - ld hl, wChannelPitchSlideFrequencySteps - add hl, bc - ld [hl], d ; store quotient + 1 - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, bc - ld [hl], a ; store remainder - dividend - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, bc - ld [hl], a ; store remainder - dividend - ret - -Audio3_ApplyDutyCyclePattern: - ld b, 0 - ld hl, wChannelDutyCyclePatterns - add hl, bc - ld a, [hl] - rlca - rlca - ld [hl], a - and $c0 - ld d, a - ld b, REG_DUTY_SOUND_LEN - call Audio3_GetRegisterPointer - ld a, [hl] - and $3f - or d - ld [hl], a - ret - -Audio3_GetNextMusicByte: - ld d, 0 - ld a, c - add a - ld e, a - ld hl, wChannelCommandPointers - add hl, de - ld a, [hli] - ld e, a - ld a, [hld] - ld d, a - ld a, [de] ; get next music command - inc de - ld [hl], e ; store address of next command - inc hl - ld [hl], d - ret - -Audio3_GetRegisterPointer: -; hl = address of hardware sound register b for software channel c - ld a, c - ld hl, Audio3_HWChannelBaseAddresses - add l - jr nc, .noCarry - inc h -.noCarry - ld l, a - ld a, [hl] - add b - ld l, a - ld h, $ff - ret - -Audio3_MultiplyAdd: -; hl = l + (a * de) - ld h, 0 -.loop - srl a - jr nc, .skipAdd - add hl, de -.skipAdd - sla e - rl d - and a - jr z, .done - jr .loop -.done - ret - -Audio3_CalculateFrequency: -; return the frequency for note a, octave b in de - ld h, 0 - ld l, a - add hl, hl - ld d, h - ld e, l - ld hl, Audio3_Pitches - add hl, de - ld e, [hl] - inc hl - ld d, [hl] - ld a, b -.loop - cp 7 - jr z, .done - sra d - rr e - inc a - jr .loop -.done - ld a, 8 - add d - ld d, a - ret - -Audio3_PlaySound:: - ld [wSoundID], a - cp SFX_STOP_ALL_MUSIC - jp z, .stopAllAudio - cp MAX_SFX_ID_3 - jp z, .playSfx - jp c, .playSfx - cp $fe - jr z, .playMusic - jp nc, .playSfx - -.playMusic - xor a - ld [wUnusedC000], a - ld [wDisableChannelOutputWhenSfxEnds], a - ld [wMusicTempo + 1], a - ld [wMusicWaveInstrument], a - ld [wSfxWaveInstrument], a - ld d, NUM_CHANNELS - ld hl, wChannelReturnAddresses - call .FillMem - ld hl, wChannelCommandPointers - call .FillMem - ld d, NUM_MUSIC_CHANS - ld hl, wChannelSoundIDs - call .FillMem - ld hl, wChannelFlags1 - call .FillMem - ld hl, wChannelDutyCycles - call .FillMem - ld hl, wChannelDutyCyclePatterns - call .FillMem - ld hl, wChannelVibratoDelayCounters - call .FillMem - ld hl, wChannelVibratoExtents - call .FillMem - ld hl, wChannelVibratoRates - call .FillMem - ld hl, wChannelFrequencyLowBytes - call .FillMem - ld hl, wChannelVibratoDelayCounterReloadValues - call .FillMem - ld hl, wChannelFlags2 - call .FillMem - ld hl, wChannelPitchSlideLengthModifiers - call .FillMem - ld hl, wChannelPitchSlideFrequencySteps - call .FillMem - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - call .FillMem - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - call .FillMem - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - call .FillMem - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - call .FillMem - ld a, $1 - ld hl, wChannelLoopCounters - call .FillMem - ld hl, wChannelNoteDelayCounters - call .FillMem - ld hl, wChannelNoteSpeeds - call .FillMem - ld [wMusicTempo], a - ld a, $ff - ld [wStereoPanning], a - xor a - ldh [rNR50], a - ld a, $8 - ldh [rNR10], a - ld a, 0 - ldh [rNR51], a - xor a - ldh [rNR30], a - ld a, $80 - ldh [rNR30], a - ld a, $77 - ldh [rNR50], a - jp .playSoundCommon - -.playSfx - ld l, a - ld e, a - ld h, 0 - ld d, h - add hl, hl - add hl, de - ld de, SFX_Headers_3 - add hl, de - ld a, h - ld [wSfxHeaderPointer], a - ld a, l - ld [wSfxHeaderPointer + 1], a - ld a, [hl] - and $c0 - rlca - rlca - ld c, a -.sfxChannelLoop - ld d, c - ld a, c - add a - add c - ld c, a - ld b, 0 - ld a, [wSfxHeaderPointer] - ld h, a - ld a, [wSfxHeaderPointer + 1] - ld l, a - add hl, bc - ld c, d - ld a, [hl] - and $f - ld e, a ; software channel ID - ld d, 0 - ld hl, wChannelSoundIDs - add hl, de - ld a, [hl] - and a - jr z, .playChannel - ld a, e - cp CHAN8 - jr nz, .notNoiseChannel - ld a, [wSoundID] - cp NOISE_INSTRUMENTS_END - jr nc, .notNoiseInstrument - ret -.notNoiseInstrument - ld a, [hl] - cp NOISE_INSTRUMENTS_END - jr z, .playChannel - jr c, .playChannel -.notNoiseChannel - ld a, [wSoundID] - cp [hl] - jr z, .playChannel - jr c, .playChannel - ret -.playChannel - xor a - push de - ld h, d - ld l, e - add hl, hl - ld d, h - ld e, l - ld hl, wChannelReturnAddresses - add hl, de - ld [hli], a - ld [hl], a - ld hl, wChannelCommandPointers - add hl, de - ld [hli], a - ld [hl], a - pop de - ld hl, wChannelSoundIDs - add hl, de - ld [hl], a - ld hl, wChannelFlags1 - add hl, de - ld [hl], a - ld hl, wChannelDutyCycles - add hl, de - ld [hl], a - ld hl, wChannelDutyCyclePatterns - add hl, de - ld [hl], a - ld hl, wChannelVibratoDelayCounters - add hl, de - ld [hl], a - ld hl, wChannelVibratoExtents - add hl, de - ld [hl], a - ld hl, wChannelVibratoRates - add hl, de - ld [hl], a - ld hl, wChannelFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelVibratoDelayCounterReloadValues - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideLengthModifiers - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideFrequencySteps - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideFrequencyStepsFractionalPart - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyFractionalPart - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyHighBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideCurrentFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyHighBytes - add hl, de - ld [hl], a - ld hl, wChannelPitchSlideTargetFrequencyLowBytes - add hl, de - ld [hl], a - ld hl, wChannelFlags2 - add hl, de - ld [hl], a - ld a, $1 - ld hl, wChannelLoopCounters - add hl, de - ld [hl], a - ld hl, wChannelNoteDelayCounters - add hl, de - ld [hl], a - ld hl, wChannelNoteSpeeds - add hl, de - ld [hl], a - ld a, e - cp CHAN5 - jr nz, .skipSweepDisable - ld a, $8 - ldh [rNR10], a ; sweep off -.skipSweepDisable - ld a, c - and a - jp z, .playSoundCommon - dec c - jp .sfxChannelLoop - -.stopAllAudio - ld a, $80 - ldh [rNR52], a ; sound hardware on - ldh [rNR30], a ; wave playback on - xor a - ldh [rNR51], a ; no sound output - ldh [rNR32], a ; mute channel 3 (wave channel) - ld a, $8 - ldh [rNR10], a ; sweep off - ldh [rNR12], a ; mute channel 1 (pulse channel 1) - ldh [rNR22], a ; mute channel 2 (pulse channel 2) - ldh [rNR42], a ; mute channel 4 (noise channel) - ld a, $40 - ldh [rNR14], a ; counter mode - ldh [rNR24], a - ldh [rNR44], a - ld a, $77 - ldh [rNR50], a ; full volume - xor a - ld [wUnusedC000], a - ld [wDisableChannelOutputWhenSfxEnds], a - ld [wMuteAudioAndPauseMusic], a - ld [wMusicTempo + 1], a - ld [wSfxTempo + 1], a - ld [wMusicWaveInstrument], a - ld [wSfxWaveInstrument], a - ld d, $a0 - ld hl, wChannelCommandPointers - call .FillMem - ld a, $1 - ld d, $18 - ld hl, wChannelNoteDelayCounters - call .FillMem - ld [wMusicTempo], a - ld [wSfxTempo], a - ld a, $ff - ld [wStereoPanning], a - ret - -; fills d bytes at hl with a -.FillMem - ld b, d -.loop - ld [hli], a - dec b - jr nz, .loop - ret - -.playSoundCommon - ld a, [wSoundID] - ld l, a - ld e, a - ld h, 0 - ld d, h - add hl, hl - add hl, de - ld de, SFX_Headers_3 - add hl, de - ld e, l - ld d, h - ld hl, wChannelCommandPointers - ld a, [de] ; get channel number - ld b, a - rlca - rlca - and $3 - ld c, a - ld a, b - and $f - ld b, c - inc b - inc de - ld c, 0 -.commandPointerLoop - cp c - jr z, .next - inc c - inc hl - inc hl - jr .commandPointerLoop -.next - push hl - push bc - push af - ld b, 0 - ld c, a - ld hl, wChannelSoundIDs - add hl, bc - ld a, [wSoundID] - ld [hl], a - pop af - cp CHAN4 - jr c, .skipSettingFlag - ld hl, wChannelFlags1 - add hl, bc - set BIT_NOISE_OR_SFX, [hl] -.skipSettingFlag - pop bc - pop hl - ld a, [de] ; get channel pointer - ld [hli], a - inc de - ld a, [de] - ld [hli], a - inc de - inc c - dec b - ld a, b - and a - ld a, [de] - inc de - jr nz, .commandPointerLoop - ld a, [wSoundID] - cp CRY_SFX_START - jr nc, .maybeCry - jr .done -.maybeCry - ld a, [wSoundID] - cp CRY_SFX_END - jr z, .done - jr c, .cry - jr .done -.cry - ld hl, wChannelSoundIDs + CHAN5 - ld [hli], a - ld [hli], a - ld [hli], a - ld [hl], a - ld hl, wChannelCommandPointers + CHAN7 * 2 ; sfx wave channel pointer - ld de, Audio3_CryRet - ld [hl], e - inc hl - ld [hl], d ; overwrite pointer to point to sound_ret - ld a, [wSavedVolume] - and a - jr nz, .done - ldh a, [rNR50] - ld [wSavedVolume], a - ld a, $77 - ldh [rNR50], a ; full volume -.done - ret - -Audio3_CryRet: - sound_ret - -Audio3_HWChannelBaseAddresses: -; the low bytes of each HW channel's base address - db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 0-3 - db HW_CH1_BASE, HW_CH2_BASE, HW_CH3_BASE, HW_CH4_BASE ; channels 4-7 - -Audio3_HWChannelDisableMasks: - db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 0-3 - db HW_CH1_DISABLE_MASK, HW_CH2_DISABLE_MASK, HW_CH3_DISABLE_MASK, HW_CH4_DISABLE_MASK ; channels 4-7 - -Audio3_HWChannelEnableMasks: - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 0-3 - db HW_CH1_ENABLE_MASK, HW_CH2_ENABLE_MASK, HW_CH3_ENABLE_MASK, HW_CH4_ENABLE_MASK ; channels 4-7 - -Audio3_Pitches: -INCLUDE "audio/notes.asm" diff --git a/audio/headers/musicheaders1.asm b/audio/headers/musicheaders1.asm deleted file mode 100644 index fb387671..00000000 --- a/audio/headers/musicheaders1.asm +++ /dev/null @@ -1,135 +0,0 @@ -Music_PalletTown:: - channel_count 3 - channel 1, Music_PalletTown_Ch1 - channel 2, Music_PalletTown_Ch2 - channel 3, Music_PalletTown_Ch3 - -Music_Pokecenter:: - channel_count 3 - channel 1, Music_Pokecenter_Ch1 - channel 2, Music_Pokecenter_Ch2 - channel 3, Music_Pokecenter_Ch3 - -Music_Gym:: - channel_count 3 - channel 1, Music_Gym_Ch1 - channel 2, Music_Gym_Ch2 - channel 3, Music_Gym_Ch3 - -; Viridian City, Pewter City, Saffron City -Music_Cities1:: - channel_count 4 - channel 1, Music_Cities1_Ch1 - channel 2, Music_Cities1_Ch2 - channel 3, Music_Cities1_Ch3 - channel 4, Music_Cities1_Ch4 - -; Cerulean City, Fuchsia City -Music_Cities2:: - channel_count 3 - channel 1, Music_Cities2_Ch1 - channel 2, Music_Cities2_Ch2 - channel 3, Music_Cities2_Ch3 - -Music_Celadon:: - channel_count 3 - channel 1, Music_Celadon_Ch1 - channel 2, Music_Celadon_Ch2 - channel 3, Music_Celadon_Ch3 - -Music_Cinnabar:: - channel_count 3 - channel 1, Music_Cinnabar_Ch1 - channel 2, Music_Cinnabar_Ch2 - channel 3, Music_Cinnabar_Ch3 - -Music_Vermilion:: - channel_count 4 - channel 1, Music_Vermilion_Ch1 - channel 2, Music_Vermilion_Ch2 - channel 3, Music_Vermilion_Ch3 - channel 4, Music_Vermilion_Ch4 - -Music_Lavender:: - channel_count 4 - channel 1, Music_Lavender_Ch1 - channel 2, Music_Lavender_Ch2 - channel 3, Music_Lavender_Ch3 - channel 4, Music_Lavender_Ch4 - -Music_SSAnne:: - channel_count 3 - channel 1, Music_SSAnne_Ch1 - channel 2, Music_SSAnne_Ch2 - channel 3, Music_SSAnne_Ch3 - -Music_MeetProfOak:: - channel_count 3 - channel 1, Music_MeetProfOak_Ch1 - channel 2, Music_MeetProfOak_Ch2 - channel 3, Music_MeetProfOak_Ch3 - -Music_MeetRival:: - channel_count 3 - channel 1, Music_MeetRival_Ch1 - channel 2, Music_MeetRival_Ch2 - channel 3, Music_MeetRival_Ch3 - -Music_MuseumGuy:: - channel_count 4 - channel 1, Music_MuseumGuy_Ch1 - channel 2, Music_MuseumGuy_Ch2 - channel 3, Music_MuseumGuy_Ch3 - channel 4, Music_MuseumGuy_Ch4 - -Music_SafariZone:: - channel_count 3 - channel 1, Music_SafariZone_Ch1 - channel 2, Music_SafariZone_Ch2 - channel 3, Music_SafariZone_Ch3 - -Music_PkmnHealed:: - channel_count 3 - channel 1, Music_PkmnHealed_Ch1 - channel 2, Music_PkmnHealed_Ch2 - channel 3, Music_PkmnHealed_Ch3 - -; Routes 1 and 2 -Music_Routes1:: - channel_count 4 - channel 1, Music_Routes1_Ch1 - channel 2, Music_Routes1_Ch2 - channel 3, Music_Routes1_Ch3 - channel 4, Music_Routes1_Ch4 - -; Routes 24 and 25 -Music_Routes2:: - channel_count 4 - channel 1, Music_Routes2_Ch1 - channel 2, Music_Routes2_Ch2 - channel 3, Music_Routes2_Ch3 - channel 4, Music_Routes2_Ch4 - -; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22 -Music_Routes3:: - channel_count 4 - channel 1, Music_Routes3_Ch1 - channel 2, Music_Routes3_Ch2 - channel 3, Music_Routes3_Ch3 - channel 4, Music_Routes3_Ch4 - -; Routes 11, 12, 13, 14, 15 -Music_Routes4:: - channel_count 4 - channel 1, Music_Routes4_Ch1 - channel 2, Music_Routes4_Ch2 - channel 3, Music_Routes4_Ch3 - channel 4, Music_Routes4_Ch4 - -; Route 23, Indigo Plateau -Music_IndigoPlateau:: - channel_count 4 - channel 1, Music_IndigoPlateau_Ch1 - channel 2, Music_IndigoPlateau_Ch2 - channel 3, Music_IndigoPlateau_Ch3 - channel 4, Music_IndigoPlateau_Ch4 diff --git a/audio/headers/musicheaders2.asm b/audio/headers/musicheaders2.asm deleted file mode 100644 index c24c08d6..00000000 --- a/audio/headers/musicheaders2.asm +++ /dev/null @@ -1,41 +0,0 @@ -Music_GymLeaderBattle:: - channel_count 3 - channel 1, Music_GymLeaderBattle_Ch1 - channel 2, Music_GymLeaderBattle_Ch2 - channel 3, Music_GymLeaderBattle_Ch3 - -Music_TrainerBattle:: - channel_count 3 - channel 1, Music_TrainerBattle_Ch1 - channel 2, Music_TrainerBattle_Ch2 - channel 3, Music_TrainerBattle_Ch3 - -Music_WildBattle:: - channel_count 3 - channel 1, Music_WildBattle_Ch1 - channel 2, Music_WildBattle_Ch2 - channel 3, Music_WildBattle_Ch3 - -Music_FinalBattle:: - channel_count 3 - channel 1, Music_FinalBattle_Ch1 - channel 2, Music_FinalBattle_Ch2 - channel 3, Music_FinalBattle_Ch3 - -Music_DefeatedTrainer:: - channel_count 3 - channel 1, Music_DefeatedTrainer_Ch1 - channel 2, Music_DefeatedTrainer_Ch2 - channel 3, Music_DefeatedTrainer_Ch3 - -Music_DefeatedWildMon:: - channel_count 3 - channel 1, Music_DefeatedWildMon_Ch1 - channel 2, Music_DefeatedWildMon_Ch2 - channel 3, Music_DefeatedWildMon_Ch3 - -Music_DefeatedGymLeader:: - channel_count 3 - channel 1, Music_DefeatedGymLeader_Ch1 - channel 2, Music_DefeatedGymLeader_Ch2 - channel 3, Music_DefeatedGymLeader_Ch3 diff --git a/audio/headers/musicheaders3.asm b/audio/headers/musicheaders3.asm deleted file mode 100644 index 82699f8e..00000000 --- a/audio/headers/musicheaders3.asm +++ /dev/null @@ -1,116 +0,0 @@ -Music_TitleScreen:: - channel_count 4 - channel 1, Music_TitleScreen_Ch1 - channel 2, Music_TitleScreen_Ch2 - channel 3, Music_TitleScreen_Ch3 - channel 4, Music_TitleScreen_Ch4 - -Music_Credits:: - channel_count 3 - channel 1, Music_Credits_Ch1 - channel 2, Music_Credits_Ch2 - channel 3, Music_Credits_Ch3 - -Music_HallOfFame:: - channel_count 3 - channel 1, Music_HallOfFame_Ch1 - channel 2, Music_HallOfFame_Ch2 - channel 3, Music_HallOfFame_Ch3 - -Music_OaksLab:: - channel_count 3 - channel 1, Music_OaksLab_Ch1 - channel 2, Music_OaksLab_Ch2 - channel 3, Music_OaksLab_Ch3 - -Music_JigglypuffSong:: - channel_count 2 - channel 1, Music_JigglypuffSong_Ch1 - channel 2, Music_JigglypuffSong_Ch2 - -Music_BikeRiding:: - channel_count 4 - channel 1, Music_BikeRiding_Ch1 - channel 2, Music_BikeRiding_Ch2 - channel 3, Music_BikeRiding_Ch3 - channel 4, Music_BikeRiding_Ch4 - -Music_Surfing:: - channel_count 3 - channel 1, Music_Surfing_Ch1 - channel 2, Music_Surfing_Ch2 - channel 3, Music_Surfing_Ch3 - -Music_GameCorner:: - channel_count 3 - channel 1, Music_GameCorner_Ch1 - channel 2, Music_GameCorner_Ch2 - channel 3, Music_GameCorner_Ch3 - -Music_IntroBattle:: - channel_count 4 - channel 1, Music_IntroBattle_Ch1 - channel 2, Music_IntroBattle_Ch2 - channel 3, Music_IntroBattle_Ch3 - channel 4, Music_IntroBattle_Ch4 - -; Power Plant, Cerulean Cave, Rocket HQ -Music_Dungeon1:: - channel_count 4 - channel 1, Music_Dungeon1_Ch1 - channel 2, Music_Dungeon1_Ch2 - channel 3, Music_Dungeon1_Ch3 - channel 4, Music_Dungeon1_Ch4 - -; Viridian Forest, Seafoam Islands -Music_Dungeon2:: - channel_count 4 - channel 1, Music_Dungeon2_Ch1 - channel 2, Music_Dungeon2_Ch2 - channel 3, Music_Dungeon2_Ch3 - channel 4, Music_Dungeon2_Ch4 - -; Mt. Moon, Rock Tunnel, Victory Road -Music_Dungeon3:: - channel_count 4 - channel 1, Music_Dungeon3_Ch1 - channel 2, Music_Dungeon3_Ch2 - channel 3, Music_Dungeon3_Ch3 - channel 4, Music_Dungeon3_Ch4 - -Music_CinnabarMansion:: - channel_count 4 - channel 1, Music_CinnabarMansion_Ch1 - channel 2, Music_CinnabarMansion_Ch2 - channel 3, Music_CinnabarMansion_Ch3 - channel 4, Music_CinnabarMansion_Ch4 - -Music_PokemonTower:: - channel_count 3 - channel 1, Music_PokemonTower_Ch1 - channel 2, Music_PokemonTower_Ch2 - channel 3, Music_PokemonTower_Ch3 - -Music_SilphCo:: - channel_count 3 - channel 1, Music_SilphCo_Ch1 - channel 2, Music_SilphCo_Ch2 - channel 3, Music_SilphCo_Ch3 - -Music_MeetEvilTrainer:: - channel_count 3 - channel 1, Music_MeetEvilTrainer_Ch1 - channel 2, Music_MeetEvilTrainer_Ch2 - channel 3, Music_MeetEvilTrainer_Ch3 - -Music_MeetFemaleTrainer:: - channel_count 3 - channel 1, Music_MeetFemaleTrainer_Ch1 - channel 2, Music_MeetFemaleTrainer_Ch2 - channel 3, Music_MeetFemaleTrainer_Ch3 - -Music_MeetMaleTrainer:: - channel_count 3 - channel 1, Music_MeetMaleTrainer_Ch1 - channel 2, Music_MeetMaleTrainer_Ch2 - channel 3, Music_MeetMaleTrainer_Ch3 diff --git a/audio/low_health_alarm.asm b/audio/low_health_alarm.asm deleted file mode 100644 index 35fe1815..00000000 --- a/audio/low_health_alarm.asm +++ /dev/null @@ -1,80 +0,0 @@ -Music_DoLowHealthAlarm:: - ld a, [wLowHealthAlarm] - cp $ff - jr z, .disableAlarm - - bit 7, a ;alarm enabled? - ret z ;nope - - and $7f ;low 7 bits are the timer. - jr nz, .notToneHi ;if timer > 0, play low tone. - - call .playToneHi - ld a, 30 ;keep this tone for 30 frames. - jr .resetTimer - -.notToneHi - cp 20 - jr nz, .noTone ;if timer == 20, - call .playToneLo ;actually set the sound registers. - -.noTone - ld a, $86 - ld [wChannelSoundIDs + CHAN5], a ;disable sound channel? - ld a, [wLowHealthAlarm] - and $7f ;decrement alarm timer. - dec a - -.resetTimer - ; reset the timer and enable flag. - set 7, a - ld [wLowHealthAlarm], a - ret - -.disableAlarm - xor a - ld [wLowHealthAlarm], a ;disable alarm - ld [wChannelSoundIDs + CHAN5], a ;re-enable sound channel? - ld de, .toneDataSilence - jr .playTone - -;update the sound registers to change the frequency. -;the tone set here stays until we change it. -.playToneHi - ld de, .toneDataHi - jr .playTone - -.playToneLo - ld de, .toneDataLo - -;update sound channel 1 to play the alarm, overriding all other sounds. -.playTone - ld hl, rNR10 ;channel 1 sound register - ld c, $5 - xor a - -.copyLoop - ld [hli], a - ld a, [de] - inc de - dec c - jr nz, .copyLoop - ret - -MACRO alarm_tone - db \1 ; length - db \2 ; envelope - dw \3 ; frequency -ENDM - -;bytes to write to sound channel 1 registers for health alarm. -;starting at FF11 (FF10 is always zeroed). -.toneDataHi - alarm_tone $A0, $E2, $8750 - -.toneDataLo - alarm_tone $B0, $E2, $86EE - -;written to stop the alarm -.toneDataSilence - alarm_tone $00, $00, $8000 diff --git a/audio/music/bikeriding.asm b/audio/music/bikeriding.asm deleted file mode 100644 index 5ee7ba85..00000000 --- a/audio/music/bikeriding.asm +++ /dev/null @@ -1,697 +0,0 @@ -Music_BikeRiding_Ch1:: - tempo 144 - volume 7, 7 - duty_cycle 3 - vibrato 8, 1, 4 - note_type 12, 11, 5 - octave 3 - note G_, 2 -.mainloop: - octave 4 - note C_, 4 - note D_, 4 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note F_, 4 - note E_, 2 - note D_, 2 - note F_, 4 - note D_, 4 - octave 3 - note B_, 2 - octave 4 - note F_, 4 - note D_, 4 - note E_, 2 - note F_, 2 - note G_, 2 - note C_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 - note_type 12, 11, 6 - note F_, 10 - note_type 12, 10, 6 - note F_, 2 - note E_, 2 - note F_, 2 - note G_, 10 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 6 - toggle_perfect_pitch - note_type 12, 11, 3 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 2 - note E_, 1 - note F_, 1 - toggle_perfect_pitch - note_type 12, 11, 5 - note G_, 6 - note G_, 6 - note A_, 2 - note F_, 2 - note G_, 6 - note_type 12, 11, 4 - note G_, 2 - note F_, 4 - note_type 12, 10, 4 - note E_, 2 - note D_, 2 - note_type 12, 9, 3 - octave 3 - note A_, 2 - octave 4 - note C_, 4 - note C_, 2 - octave 3 - note B_, 2 - note A_, 1 - note B_, 1 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note C_, 4 - note C_, 2 - octave 3 - note A_, 2 - note B_, 2 - note B_, 2 - note A_, 2 - octave 4 - note C_, 4 - octave 3 - note A_, 2 - note B_, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 2 - octave 4 - note D_, 4 - octave 3 - note B_, 2 - octave 4 - note C_, 4 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note D_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 4 - note_type 12, 3, -5 - note C_, 4 - note_type 12, 11, 4 - note F_, 6 - note G_, 4 - note F_, 1 - note G_, 1 - note F_, 4 - note E_, 6 - note F_, 2 - note E_, 2 - note D_, 1 - note E_, 1 - note D_, 2 - note C_, 2 - note_type 12, 11, 5 - octave 3 - note A_, 4 - octave 4 - note D_, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 4 - note C_, 4 - note F_, 4 - note D_, 4 - note F#, 4 - vibrato 10, 2, 6 - note_type 12, 8, 0 - note G_, 16 - note G_, 4 - note_type 12, 8, 7 - note G_, 12 - note_type 12, 11, 5 - vibrato 8, 1, 4 - sound_loop 0, .mainloop - -Music_BikeRiding_Ch2:: - duty_cycle 2 - vibrato 6, 1, 5 - note_type 12, 12, 3 - octave 4 - note C_, 2 -.mainloop: - note E_, 4 - note F_, 4 - note G_, 4 - octave 5 - note C_, 4 - octave 4 - note B_, 6 - note A_, 1 - note B_, 1 - note A_, 10 - note F_, 2 - note G_, 2 - note A_, 2 - octave 5 - note D_, 2 - note C_, 2 - octave 4 - note B_, 2 - note A_, 1 - note B_, 1 - octave 5 - note C_, 6 - octave 4 - note A_, 2 - note G_, 4 - duty_cycle 3 - note_type 12, 8, 4 - note A#, 6 - duty_cycle 2 - note_type 12, 12, 5 - octave 5 - note C_, 2 - octave 4 - note B_, 2 - octave 5 - note C_, 2 - octave 4 - note A_, 10 - octave 5 - note C_, 2 - octave 4 - note B_, 2 - octave 5 - note C_, 2 - octave 4 - note G_, 10 - note_type 12, 12, 3 - octave 5 - note C_, 4 - note E_, 2 - note D_, 2 - note C_, 2 - octave 4 - note B_, 2 - octave 5 - note C_, 2 - note_type 12, 11, 0 - note D_, 4 - note_type 12, 12, 7 - note D_, 10 - note D_, 1 - note C_, 1 - note_type 12, 11, 0 - octave 4 - note B_, 4 - note_type 12, 12, 7 - note B_, 12 - note_type 12, 12, 4 - note F_, 6 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 6 - note E_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note F_, 2 - note G_, 4 - note A_, 2 - note F_, 2 - note E_, 2 - note G_, 4 - note F_, 2 - note E_, 6 - note_type 6, 12, 2 - note F_, 1 - note G_, 1 - note A_, 1 - note B_, 1 - note_type 12, 12, 3 - octave 5 - note C_, 2 - octave 4 - note B_, 2 - note A_, 2 - octave 5 - note C_, 2 - octave 4 - note B_, 4 - note A_, 4 - note G_, 2 - note A#, 4 - note A_, 2 - note G_, 4 - note F_, 2 - note E_, 2 - note_type 8, 12, 4 - note A_, 4 - note G_, 4 - note F_, 4 - note B_, 4 - note A_, 4 - note G_, 4 - octave 5 - note C_, 4 - octave 4 - note B_, 4 - note A_, 4 - octave 5 - note D_, 4 - note E_, 4 - note C_, 4 - note_type 12, 12, 7 - note D_, 12 - note C_, 4 - note_type 12, 11, 0 - octave 4 - note B_, 4 - note_type 12, 12, 7 - note B_, 12 - note_type 12, 12, 3 - sound_loop 0, .mainloop - -Music_BikeRiding_Ch3:: - note_type 12, 1, 3 - rest 2 -.mainloop: - octave 4 - note C_, 1 - rest 1 - note E_, 1 - rest 1 - octave 3 - note G_, 1 - rest 1 - octave 4 - note E_, 1 - rest 1 - note C_, 1 - rest 1 - note E_, 1 - rest 1 - note C_, 1 - rest 1 - note G_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 1 - rest 1 - note C_, 1 - rest 1 - note A_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - note E_, 1 - rest 1 - note F_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note C_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 1 - rest 1 - note C_, 1 - rest 1 - note A_, 1 - rest 1 - note F_, 1 - rest 1 - note G_, 1 - rest 1 - note A_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note C_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - note G_, 1 - rest 1 - note C_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note C_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note E_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - note E_, 1 - rest 1 - note C_, 1 - rest 1 - note G_, 1 - rest 1 - note C_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 1 - rest 1 - note C_, 1 - rest 1 - note A_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note F_, 1 - rest 1 - note G_, 1 - rest 1 - note A#, 1 - rest 1 - note E_, 1 - rest 1 - note A#, 1 - rest 1 - note G_, 1 - rest 1 - note A#, 1 - rest 1 - note A#, 1 - rest 1 - note G_, 1 - rest 1 - note F_, 1 - rest 1 - note D_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 1 - note B_, 1 - rest 1 - note A_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - note G_, 1 - rest 1 - octave 5 - note C_, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - octave 5 - note C_, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - octave 5 - note C_, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - octave 5 - note C_, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - note B_, 1 - rest 1 - note G_, 1 - rest 1 - note B_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F_, 1 - rest 1 - sound_loop 0, .mainloop - -Music_BikeRiding_Ch4:: - drum_speed 12 - rest 2 -.mainloop: - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub3 - sound_call .sub2 - sound_call .sub2 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub3 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_loop 0, .mainloop - -.sub1: - rest 2 - drum_note 16, 2 - rest 2 - drum_note 16, 2 - rest 2 - drum_note 16, 2 - rest 2 - drum_note 16, 2 - sound_ret - -.sub2: - rest 2 - drum_note 16, 2 - rest 2 - drum_note 16, 2 - rest 2 - drum_note 16, 2 - drum_note 16, 2 - drum_note 16, 2 - sound_ret - -.sub3: - rest 2 - drum_note 16, 2 - rest 2 - drum_note 16, 2 - rest 2 - drum_note 16, 2 - rest 2 - drum_note 16, 1 - drum_note 16, 1 - sound_ret diff --git a/audio/music/celadon.asm b/audio/music/celadon.asm deleted file mode 100644 index 30723112..00000000 --- a/audio/music/celadon.asm +++ /dev/null @@ -1,406 +0,0 @@ -Music_Celadon_Ch1:: - tempo 144 - volume 7, 7 - duty_cycle 3 - toggle_perfect_pitch - note_type 12, 2, -7 - rest 8 - octave 3 - note D_, 8 -.mainloop: - duty_cycle 2 - note_type 12, 11, 2 - note G_, 4 - note B_, 4 - note G_, 2 - note B_, 4 - note G_, 2 - note E_, 1 - note E_, 1 - note G_, 1 - note E_, 1 - note B_, 2 - octave 4 - note C_, 2 - octave 3 - note A_, 8 - note F#, 4 - note A_, 4 - note F#, 2 - note A_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note A_, 2 - note B_, 2 - note G_, 4 - octave 4 - note G_, 4 - octave 3 - note G_, 4 - note B_, 4 - note G_, 2 - note B_, 4 - note G_, 2 - note E_, 1 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 2 - octave 4 - note C_, 2 - octave 3 - note A_, 8 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note F#, 4 - note D_, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note A_, 8 - note_type 12, 9, 4 - note B_, 8 - note G_, 4 - note D_, 4 - note G_, 4 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note B_, 8 - note A_, 8 - note F#, 4 - note G_, 4 - note A_, 4 - note G_, 4 - note F#, 4 - note A_, 4 - note B_, 8 - note G_, 4 - note D_, 4 - note G_, 4 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note B_, 8 - note A_, 8 - note F#, 4 - note G_, 4 - note A_, 4 - note G_, 4 - note F#, 4 - note A_, 4 - sound_loop 0, .mainloop - -Music_Celadon_Ch2:: - duty_cycle 3 - note_type 12, 12, 2 - octave 4 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note_type 12, 10, 0 - note A_, 8 -.mainloop: - duty_cycle 2 - note_type 12, 12, 2 - octave 4 - note B_, 4 - note G_, 4 - note B_, 2 - note G_, 6 - note B_, 1 - note G_, 1 - note A_, 1 - note B_, 1 - octave 5 - note C_, 2 - octave 4 - note B_, 2 - note A_, 8 - note A_, 4 - note F#, 4 - note A_, 2 - note F#, 6 - note A_, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note A_, 2 - note B_, 2 - note G_, 4 - note B_, 4 - note B_, 4 - note G_, 4 - note B_, 2 - note G_, 4 - octave 3 - note B_, 2 - octave 4 - note B_, 1 - note G_, 1 - note A_, 1 - note B_, 1 - octave 5 - note C_, 2 - octave 4 - note B_, 2 - note A_, 8 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 8 - octave 5 - note D_, 8 - note_type 12, 11, 4 - octave 4 - note D_, 8 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - octave 4 - note E_, 4 - note F#, 4 - note D_, 8 - note C_, 8 - octave 3 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 - note D_, 8 - note D_, 8 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - octave 4 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 8 - note C_, 8 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 8 - sound_loop 0, .mainloop - -Music_Celadon_Ch3:: - note_type 12, 1, 3 - rest 8 - octave 5 - note D_, 1 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note G_, 1 -.mainloop: - octave 4 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note B_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note C#, 2 - note D_, 2 - rest 6 - note F#, 2 - rest 4 - note F#, 2 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - note B_, 2 - note G_, 2 - octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - octave 4 - note B_, 2 - note G_, 2 - octave 5 - note C_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - octave 4 - note B_, 2 - note A_, 2 - octave 5 - note C_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - note B_, 2 - note G_, 2 - octave 5 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - octave 4 - note B_, 2 - note G_, 2 - octave 5 - note C_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - note C_, 2 - octave 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - sound_loop 0, .mainloop diff --git a/audio/music/cinnabar.asm b/audio/music/cinnabar.asm deleted file mode 100644 index b0c69ce2..00000000 --- a/audio/music/cinnabar.asm +++ /dev/null @@ -1,349 +0,0 @@ -Music_Cinnabar_Ch1:: - tempo 144 - volume 7, 7 - duty_cycle 3 - vibrato 12, 3, 4 - toggle_perfect_pitch -.mainloop: - note_type 12, 11, 5 - rest 4 - octave 3 - note D_, 4 - note E_, 6 - note C#, 2 - note_type 12, 11, 1 - note D_, 4 - note_type 12, 11, 5 - note B_, 4 - octave 4 - note C_, 6 - octave 3 - note A_, 2 - note_type 12, 11, 1 - note B_, 4 - note_type 12, 11, 5 - note G_, 4 - note F#, 4 - note E_, 2 - note F#, 2 - note_type 12, 11, 1 - note G_, 4 - note_type 12, 11, 5 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note F#, 6 - note A_, 2 - note_type 12, 11, 1 - note G_, 4 - note_type 12, 11, 5 - note B_, 4 - octave 4 - note C_, 6 - octave 3 - note A_, 2 - note B_, 4 - note G_, 4 - note F#, 3 - note E_, 1 - note F#, 2 - note A_, 2 - note_type 12, 10, 2 - note G_, 4 - octave 4 - note D_, 1 - note E_, 1 - note D_, 4 - note_type 12, 7, 2 - note D_, 1 - note E_, 1 - note D_, 4 - note_type 12, 10, 7 - octave 3 - note B_, 6 - note G_, 2 - note E_, 8 - octave 4 - note C_, 6 - octave 3 - note A_, 2 - note F#, 8 - octave 4 - note F#, 6 - note D_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 8 - note F#, 4 - note E_, 4 - sound_loop 0, .mainloop - -Music_Cinnabar_Ch2:: - duty_cycle 3 - vibrato 10, 2, 3 -.mainloop: - note_type 12, 12, 7 - octave 3 - note G_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 6 - note D_, 1 - note E_, 1 - note_type 12, 12, 1 - note D_, 4 - note_type 12, 12, 7 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note D_, 4 - note C_, 3 - octave 3 - note B_, 1 - octave 4 - note C_, 2 - note D_, 1 - note E_, 1 - note_type 12, 12, 1 - note D_, 4 - note_type 12, 12, 7 - octave 3 - note B_, 8 - note A_, 4 - note G_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 6 - note D_, 1 - note E_, 1 - note_type 12, 12, 1 - note D_, 4 - note_type 12, 12, 7 - note G_, 4 - note A_, 6 - note G_, 1 - note F#, 1 - note E_, 4 - note D_, 4 - note C_, 3 - octave 3 - note B_, 1 - octave 4 - note C_, 2 - note D_, 1 - note E_, 1 - note_type 12, 12, 1 - note D_, 4 - note_type 12, 12, 7 - octave 3 - note A_, 4 - note G_, 4 - note F#, 4 - note_type 12, 11, 0 - octave 4 - note D_, 6 - octave 3 - note B_, 2 - note G_, 8 - octave 4 - note E_, 6 - note C_, 2 - octave 3 - note A_, 8 - octave 4 - note A_, 6 - note F#, 2 - note D_, 2 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - note B_, 4 - octave 4 - note D_, 4 - octave 3 - note B_, 2 - note A_, 6 - sound_loop 0, .mainloop - -Music_Cinnabar_Ch3:: - note_type 12, 1, 0 -.mainloop: - octave 4 - note G_, 1 - rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 2 - octave 4 - note F#, 1 - rest 1 - note G_, 1 - rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 2 - octave 4 - note F#, 1 - rest 1 - note G_, 1 - rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 2 - octave 4 - note F#, 1 - rest 1 - note G_, 1 - rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 2 - octave 4 - note A_, 1 - rest 1 - note G_, 1 - rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 2 - octave 4 - note F#, 1 - rest 1 - note G_, 1 - rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 2 - octave 4 - note F#, 1 - rest 1 - note G_, 1 - rest 3 - note B_, 2 - note G_, 1 - note G_, 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 2 - octave 4 - note F#, 1 - rest 1 - note G_, 1 - rest 3 - note B_, 4 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 5 - note C_, 4 - octave 4 - note B_, 1 - rest 3 - octave 5 - note D_, 2 - octave 4 - note B_, 1 - note B_, 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 5 - note C_, 2 - octave 4 - note B_, 1 - rest 1 - note G_, 1 - rest 3 - octave 5 - note E_, 2 - note C_, 1 - note C_, 1 - note C_, 1 - rest 1 - note C_, 1 - rest 1 - note E_, 2 - note C_, 1 - rest 1 - octave 4 - note A_, 1 - rest 3 - octave 5 - note A_, 2 - note F#, 1 - note F#, 1 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note D_, 2 - note C_, 1 - rest 1 - octave 4 - note B_, 1 - rest 3 - octave 5 - note D_, 2 - note C_, 1 - note C_, 1 - octave 4 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - note A_, 2 - octave 5 - note C_, 1 - rest 1 - sound_loop 0, .mainloop diff --git a/audio/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm deleted file mode 100644 index 426715d6..00000000 --- a/audio/music/cinnabarmansion.asm +++ /dev/null @@ -1,165 +0,0 @@ -Music_CinnabarMansion_Ch1:: - tempo 144 - volume 7, 7 - vibrato 11, 2, 5 - duty_cycle 2 -.mainloop: -.loop1: - note_type 12, 6, 2 - octave 5 - note E_, 1 - note E_, 1 - octave 4 - note B_, 1 - note B_, 1 - note C_, 1 - rest 2 - octave 5 - note B_, 2 - note E_, 2 - octave 4 - note C_, 2 - note B_, 2 - note E_, 2 - note C_, 1 - octave 5 - note B_, 1 - rest 2 - sound_loop 14, .loop1 - note_type 12, 10, 5 - rest 16 - rest 16 - rest 15 - octave 4 - note C_, 1 - octave 5 - note B_, 1 - note B_, 2 - sound_loop 0, .mainloop - -Music_CinnabarMansion_Ch2:: - duty_cycle 2 - toggle_perfect_pitch - vibrato 10, 2, 4 - note_type 12, 12, 2 -.introloop: - rest 16 - rest 16 - sound_loop 4, .introloop -.mainloop: - note_type 12, 12, 2 -.loop1: - sound_call .sub1 - sound_loop 3, .loop1 - octave 3 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 - rest 4 - note A#, 4 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 - note G_, 4 - note D#, 4 - sound_loop 0, .mainloop - -.sub1: - octave 3 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 - note A_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note G#, 4 - rest 4 - note A#, 4 - sound_ret - -Music_CinnabarMansion_Ch3:: - note_type 12, 1, 1 -.mainloop: -.loop1: - octave 2 - note B_, 2 - rest 2 - octave 3 - note E_, 2 - rest 2 - note E_, 2 - rest 2 - note E_, 2 - rest 2 - note E_, 2 - rest 2 - note E_, 2 - rest 2 - note E_, 2 - rest 2 - note E_, 2 - rest 2 - note C_, 2 - rest 2 - octave 3 - note D#, 2 - rest 2 - note D#, 2 - rest 2 - note D#, 2 - rest 2 - note D#, 2 - rest 2 - note D#, 2 - rest 2 - note D#, 2 - rest 2 - note D#, 2 - rest 2 - sound_loop 8, .loop1 - note E_, 16 - note D#, 16 - note G_, 16 - note G#, 8 - note D#, 8 - sound_loop 0, .mainloop - -Music_CinnabarMansion_Ch4:: - drum_speed 6 - rest 16 - rest 16 - rest 16 - rest 16 -.mainloop: - drum_note 12, 2 - drum_note 12, 2 - drum_note 13, 4 - drum_note 12, 2 - drum_note 12, 2 - drum_note 13, 4 - drum_note 12, 2 - drum_note 12, 2 - drum_note 13, 4 - drum_note 12, 2 - drum_note 12, 2 - drum_note 14, 4 - drum_note 12, 2 - drum_note 12, 2 - rest 2 - rest 10 - rest 8 - drum_note 14, 8 - sound_loop 0, .mainloop diff --git a/audio/music/cities1.asm b/audio/music/cities1.asm deleted file mode 100644 index f2c654a7..00000000 --- a/audio/music/cities1.asm +++ /dev/null @@ -1,651 +0,0 @@ -Music_Cities1_Ch1_AlternateTempo:: - tempo 232 - sound_loop 0, Music_Cities1_Ch1.body - -Music_Cities1_Ch1:: - tempo 144 -.body: - volume 7, 7 - vibrato 8, 2, 4 - duty_cycle 3 -.mainloop: - note_type 12, 12, 5 - octave 3 - note G#, 4 - note F#, 4 - note E_, 2 - note E_, 2 - note F#, 2 - note D#, 2 - note E_, 2 - note E_, 2 - note D#, 2 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 4 - note C#, 2 - note E_, 2 - note E_, 4 - note_type 12, 10, 5 - note C#, 4 - octave 2 - note B_, 6 - octave 3 - note C#, 2 - note C#, 4 - octave 2 - note B_, 4 - note_type 12, 12, 5 - sound_call .sub1 - octave 3 - note D#, 6 - note E_, 2 - octave 2 - note B_, 4 - note_type 12, 10, 5 - octave 3 - note C#, 2 - octave 2 - note B_, 2 - note A_, 4 - note B_, 4 - note B_, 2 - octave 3 - note C#, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 2 - note_type 12, 12, 5 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note E_, 4 - note F#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note C#, 2 - note E_, 2 - note E_, 4 - note_type 12, 10, 5 - note C#, 2 - octave 2 - note A_, 2 - note B_, 6 - octave 3 - note C#, 2 - note C#, 2 - octave 2 - note B_, 2 - note B_, 4 - note_type 12, 12, 5 - sound_call .sub1 - octave 3 - note D#, 4 - note D#, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note G#, 2 - note E_, 4 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - note_type 12, 10, 5 - note C#, 4 - octave 2 - note B_, 2 - octave 3 - note D#, 4 - note C#, 2 - note E_, 4 - note_type 12, 11, 3 - sound_call .sub2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note F#, 4 - note G#, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 4 - note G#, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - octave 2 - note B_, 2 - octave 3 -.loop1: - note C#, 2 - note D#, 2 - note C#, 2 - octave 2 - note B_, 4 - note B_, 2 - octave 3 - note C#, 2 - note D#, 2 - sound_loop 2, .loop1 - note E_, 2 - octave 2 - note B_, 4 - octave 3 - note E_, 4 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note G#, 2 - note G#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - sound_call .sub2 - note A_, 2 - note E_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note F#, 2 - note G#, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note D#, 2 - note B_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 4 - note G#, 2 - note F#, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 4 - note F#, 2 - note D#, 2 - note D#, 2 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - octave 2 - note B_, 2 - note B_, 2 - octave 3 - note D#, 2 - note_type 12, 11, 6 - note F#, 8 - note F#, 4 - note D#, 4 - note E_, 8 - note_type 12, 8, 4 - octave 2 - note B_, 4 - octave 3 - note E_, 2 - note F#, 2 - sound_loop 0, .mainloop - -.sub1: - octave 3 - note F#, 2 - note D#, 4 - note E_, 2 - note D#, 4 - note C#, 4 - octave 2 - note B_, 4 - octave 3 - note C#, 2 - note D#, 2 - note C#, 2 - sound_ret - -.sub2: - note A_, 2 - note E_, 2 - note C#, 2 - note E_, 4 - note A_, 2 - note C#, 2 - note E_, 2 - sound_ret - -Music_Cities1_Ch2:: -.mainloop: - vibrato 5, 1, 5 - sound_call .sub1 - octave 4 - note G#, 2 - note_type 12, 12, 4 - note E_, 6 - note_type 12, 12, 5 - duty_cycle 3 - octave 3 - note C#, 4 - note D#, 4 - note E_, 6 - note F#, 6 - note G#, 4 - sound_call .sub1 - octave 4 - note G#, 2 - note_type 12, 12, 4 - note E_, 14 - duty_cycle 3 - octave 3 - note E_, 6 - note F#, 6 - note G#, 4 - note_type 12, 11, 7 - duty_cycle 2 - vibrato 8, 1, 7 - octave 5 - note C#, 12 - octave 4 - note A_, 4 - octave 5 - note E_, 8 - note F#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - octave 4 - note B_, 12 - note G#, 4 - note B_, 16 - note F#, 12 - note G#, 2 - note A_, 2 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note G#, 12 - note E_, 4 - note B_, 16 - octave 5 - note C#, 12 - note D#, 2 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 4 - note C#, 4 - octave 4 - note B_, 12 - octave 5 - note C#, 2 - note D#, 2 - note C#, 4 - octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note A_, 12 - note B_, 2 - octave 5 - note C_, 2 - note C_, 4 - octave 4 - note B_, 4 - note A_, 4 - note F#, 4 - note_type 12, 11, 7 - note A_, 8 - octave 5 - note C_, 8 - octave 4 - note B_, 14 - note_type 12, 8, 4 - note G#, 1 - note_type 12, 10, 4 - note A_, 1 - sound_loop 0, .mainloop - -.sub1: - duty_cycle 2 - note_type 12, 12, 3 - octave 4 - note B_, 4 - note A_, 4 - note_type 12, 12, 4 - note G#, 10 - note_type 12, 12, 3 - note G#, 2 - note A_, 2 - note B_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note_type 12, 12, 4 - note F#, 10 - note_type 12, 12, 5 - duty_cycle 3 - octave 3 - note E_, 4 - note D#, 8 - note E_, 4 - note F#, 4 - note_type 12, 12, 3 - duty_cycle 2 - octave 4 - note A_, 4 - note G#, 4 - note_type 12, 12, 4 - note F#, 10 - note_type 12, 12, 3 - note F#, 2 - note G#, 2 - note A_, 4 - note A_, 2 - note G#, 2 - note F#, 2 - sound_ret - -Music_Cities1_Ch3:: - note_type 12, 1, 1 - toggle_perfect_pitch -.mainloop: - vibrato 0, 0, 0 - octave 4 - sound_call .sub1 - sound_call .sub1 - sound_call .sub2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - sound_call .sub1 - note B_, 2 - note E_, 2 - note F#, 2 - note G#, 2 - rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - sound_call .sub1 - sound_call .sub2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - rest 2 - note G#, 2 - note E_, 2 - note B_, 2 - rest 2 - note E_, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - vibrato 8, 2, 5 - note A_, 8 - note E_, 8 - note A_, 8 - note F#, 8 - note G#, 8 - note E_, 8 - note G#, 12 - note E_, 4 - note F#, 2 - note F#, 2 - note D#, 2 - note E_, 4 - note F#, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note F#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 - rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note A_, 8 - note E_, 8 - note A_, 8 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 8 - note E_, 8 - note B_, 4 - note E_, 4 - note F#, 4 - note G#, 4 - rest 2 - note D#, 2 - note E_, 2 - note F#, 2 - rest 2 - note F#, 2 - note B_, 2 - note A_, 2 - note A_, 4 - note G#, 4 - note F#, 2 - note D#, 2 - note A_, 2 - note F#, 2 - rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - rest 2 - note E_, 2 - note F#, 1 - note G#, 1 - note E_, 1 - note F#, 1 - note G#, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - sound_loop 0, .mainloop - -.sub1: - rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - rest 2 - note E_, 2 - note F#, 2 - note G#, 2 - sound_ret - -.sub2: - note A_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - rest 2 - note A_, 2 - note G#, 2 - note F#, 2 - rest 2 - note F#, 2 - note G#, 2 - note A_, 2 - rest 2 - note A_, 2 - note G#, 2 - note F#, 2 - note D#, 2 - note D#, 2 - note E_, 2 - note F#, 2 - rest 2 - note D#, 2 - note E_, 2 - note F#, 2 - rest 2 - note D#, 2 - note E_, 2 - note F#, 2 - rest 2 - note D#, 2 - note E_, 2 - note F#, 2 - sound_ret - -Music_Cities1_Ch4:: -.mainloop: - drum_speed 12 - sound_call .sub1 -.loop1: - sound_call .sub1 - sound_call .sub2 - sound_call .sub2 - sound_loop 2, .loop1 - sound_call .sub1 - sound_call .sub4 - sound_call .sub3 - drum_note 6, 6 - drum_note 6, 6 - drum_note 7, 4 - sound_call .sub5 - sound_call .sub4 - sound_call .sub3 - sound_call .sub5 - sound_call .sub3 - drum_note 6, 6 - drum_note 6, 6 - drum_note 7, 2 - drum_note 6, 2 - drum_note 6, 6 - drum_note 6, 6 - drum_note 6, 4 - drum_note 6, 6 - drum_note 8, 6 - drum_note 8, 4 - sound_loop 0, .mainloop - -.sub1: - drum_note 8, 6 - drum_note 8, 6 - drum_note 8, 4 - drum_note 8, 6 - drum_note 8, 6 - drum_note 8, 2 - drum_note 8, 2 - sound_ret - -.sub2: - drum_note 8, 6 - drum_note 8, 6 - drum_note 8, 4 - drum_note 8, 6 - drum_note 8, 6 - drum_note 8, 4 - sound_ret - -.sub3: - drum_note 6, 6 - drum_note 6, 6 - drum_note 7, 4 - drum_note 6, 6 - drum_note 6, 6 - drum_note 7, 4 - sound_ret - -.sub4: - drum_note 6, 6 - drum_note 6, 6 - drum_note 7, 4 - drum_note 6, 6 - drum_note 6, 6 - drum_note 7, 2 - drum_note 6, 2 - sound_ret - -.sub5: - drum_note 6, 6 - drum_note 6, 6 - drum_note 7, 2 - drum_note 7, 2 - sound_ret diff --git a/audio/music/cities2.asm b/audio/music/cities2.asm deleted file mode 100644 index dad0cebd..00000000 --- a/audio/music/cities2.asm +++ /dev/null @@ -1,411 +0,0 @@ -Music_Cities2_Ch1:: - tempo 148 - volume 7, 7 - duty_cycle 3 - vibrato 8, 3, 2 - toggle_perfect_pitch - note_type 12, 11, 6 - rest 8 - octave 3 - note E_, 2 - note D#, 2 - note C#, 2 - note C_, 2 - octave 2 - note B_, 2 - rest 14 -.mainloop: - octave 3 - note B_, 4 - octave 4 - note C#, 2 - note D#, 1 - note D_, 1 - note C#, 4 - octave 3 - note B_, 4 - note G#, 8 - note E_, 8 - note A_, 4 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 - rest 16 - note C#, 4 - octave 3 - note B_, 2 - octave 4 - note C#, 1 - note D#, 1 - note C#, 4 - octave 3 - note B_, 4 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - rest 3 - note G#, 8 - note B_, 4 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note E_, 2 - note F#, 2 - note G#, 2 - rest 2 - octave 4 - note E_, 4 - octave 3 - note B_, 4 - note F#, 2 - note G#, 2 - note A_, 2 - rest 2 - octave 4 - note F#, 4 - note D#, 4 - octave 3 - note E_, 2 - rest 4 - note F#, 2 - rest 4 - note A_, 2 - rest 2 - note B_, 2 - rest 16 - rest 16 - rest 14 - note E_, 16 - note F#, 8 - note G#, 4 - note F#, 4 - note E_, 2 - rest 14 - sound_loop 0, .mainloop - -Music_Cities2_Ch2:: - duty_cycle 3 - vibrato 8, 2, 3 - note_type 12, 12, 2 - octave 4 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note E_, 6 - note_type 12, 12, 2 - duty_cycle 2 - octave 4 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 -.mainloop: - note_type 12, 10, 6 - note G#, 6 - note_type 12, 12, 2 - note A_, 1 - note G#, 1 - note_type 12, 12, 4 - note F#, 14 - note_type 12, 12, 2 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - note_type 12, 12, 4 - note G#, 6 - note_type 12, 12, 2 - note E_, 1 - note G#, 1 - note_type 12, 12, 5 - note B_, 14 - note_type 12, 12, 2 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - note_type 12, 10, 6 - note G#, 6 - note_type 12, 12, 2 - note A_, 1 - note G#, 1 - note_type 12, 12, 4 - note F#, 8 - note_type 12, 10, 1 - duty_cycle 1 - octave 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - rest 1 - note_type 12, 12, 2 - duty_cycle 2 - octave 4 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - note_type 12, 12, 4 - note G#, 6 - note E_, 1 - note G#, 1 - note_type 12, 12, 6 - note B_, 8 - note_type 12, 12, 2 - note C#, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - note D#, 1 - note E_, 4 - note_type 12, 12, 7 - note G#, 4 - note E_, 4 - note_type 12, 12, 2 - note D#, 1 - note C#, 1 - note D#, 1 - note E_, 1 - note F#, 4 - note_type 12, 12, 7 - note B_, 4 - note F#, 4 - note_type 12, 12, 2 - note C#, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - note D#, 1 - note E_, 2 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note G#, 2 - note G#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note B_, 1 - note F#, 1 - note D#, 1 - note C#, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - note D#, 1 - note F#, 1 - note_type 12, 12, 2 - note B_, 8 - note_type 12, 11, 7 - octave 3 - note E_, 8 - octave 2 - note B_, 4 - octave 3 - note F#, 4 - note G#, 4 - note A_, 4 - note B_, 8 - note B_, 8 - note G#, 4 - octave 4 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 2 - note_type 12, 12, 2 - note E_, 6 - note E_, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 2 - note D#, 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - sound_loop 0, .mainloop - -Music_Cities2_Ch3:: - note_type 12, 1, 1 - rest 16 - octave 4 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 -.mainloop: - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - rest 2 - note E_, 4 - note G#, 4 - note F#, 2 - note A_, 2 - note F#, 2 - rest 2 - note F#, 4 - note A_, 4 - note C#, 2 - rest 4 - note E_, 2 - rest 4 - note G#, 2 - note A_, 2 - note B_, 2 - rest 8 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - sound_loop 0, .mainloop diff --git a/audio/music/credits.asm b/audio/music/credits.asm deleted file mode 100644 index 7fa036f9..00000000 --- a/audio/music/credits.asm +++ /dev/null @@ -1,818 +0,0 @@ -Music_Credits_Ch1:: - tempo 140 - volume 7, 7 - duty_cycle 3 - vibrato 8, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 5 - octave 4 - note E_, 6 - octave 3 - note A_, 1 - octave 4 - note E_, 1 - note D_, 6 - octave 3 - note G_, 1 - octave 4 - note D_, 1 - note C#, 6 - octave 3 - note F#, 1 - octave 4 - note C#, 1 - note D_, 4 - note E_, 2 - note C#, 1 - note E_, 1 - note C#, 1 - rest 1 - octave 3 - note E_, 1 - rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note E_, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note_type 12, 11, 6 - note A_, 4 - note E_, 2 - note A_, 2 - note G_, 4 - note A_, 2 - note G_, 2 - note B_, 4 - note A_, 4 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 6 - note E_, 2 - note A_, 4 - note C#, 4 - note E_, 4 - note D_, 2 - note C#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note A_, 4 - note E_, 2 - note A_, 2 - note G_, 4 - note A_, 2 - note G_, 2 - note B_, 4 - note A_, 4 - note G_, 2 - note A_, 2 - note F#, 2 - note D_, 2 - note E_, 6 - note C#, 2 - note A_, 4 - note C#, 4 - note E_, 4 - note D_, 2 - note C#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note G_, 4 - note D_, 2 - note G_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 6 - note A_, 2 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note G_, 4 - note D_, 2 - note G_, 2 - note B_, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note_type 12, 11, 7 - note E_, 6 - note A_, 2 - note G_, 4 - note F#, 4 - note_type 12, 12, 7 - note A_, 4 - note B_, 4 - octave 4 - note C#, 4 - note D_, 4 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note_type 12, 9, 0 - note G_, 8 - note F#, 8 - note E_, 8 - note D_, 8 - rest 16 - rest 16 - rest 8 - note_type 12, 11, 6 - note E_, 6 - note D#, 1 - note D_, 1 - note_type 12, 10, 0 - note C#, 8 - note_type 12, 10, 7 - note C#, 8 - rest 16 - rest 16 - rest 8 - note E_, 6 - note C#, 1 - note E_, 1 - note_type 12, 10, 0 - note A_, 8 - note_type 12, 10, 7 - note A_, 8 - note_type 12, 11, 6 - note G_, 6 - note D_, 4 - note G_, 2 - note B_, 4 - note_type 12, 11, 7 - note G_, 8 - note F#, 4 - note G#, 4 - note_type 12, 9, 0 - note A_, 8 - note F#, 8 - note E_, 8 - note C#, 8 - note_type 12, 11, 7 - note D_, 8 - note C#, 8 - octave 2 - note B_, 8 - octave 3 - note D_, 8 - note_type 12, 9, 0 - note E_, 8 - note D_, 8 - note F#, 8 - note E_, 8 - note_type 12, 10, 0 - note D_, 8 - note E_, 8 - note D_, 8 - note C_, 8 - note G_, 8 - note F_, 8 - note E_, 8 - note D_, 8 - note_type 12, 10, 0 - note C#, 6 - note_type 12, 10, 7 - note C#, 6 - note_type 12, 11, 7 - note D_, 4 - note E_, 8 - note G_, 6 - note F#, 1 - note F_, 1 - note_type 12, 10, 0 - note E_, 6 - note_type 12, 10, 7 - note E_, 6 - note_type 12, 11, 7 - note D_, 4 - note_type 12, 10, 0 - note C#, 8 - note_type 12, 10, 7 - note C#, 8 - note_type 12, 11, 7 - note E_, 6 - note D_, 2 - note G_, 4 - note F#, 4 - note E_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 4 - note D_, 4 - note C#, 4 - note C#, 4 - note E_, 4 - note F#, 4 - note_type 12, 10, 0 - note E_, 6 - note_type 12, 11, 7 - note D_, 2 - note G_, 4 - note F#, 4 - note E_, 4 - note F#, 4 - note A_, 4 - note B_, 4 - note_type 12, 10, 0 - octave 4 - note C#, 16 - note C#, 8 - note_type 12, 10, 7 - note C#, 8 - note_type 12, 11, 5 - octave 3 - note A_, 1 - rest 1 - note A_, 1 - rest 3 - note A_, 1 - note A_, 1 - note_type 12, 11, 1 - note A_, 8 - sound_ret - -Music_Credits_Ch2:: - duty_cycle 3 - vibrato 10, 2, 5 - note_type 12, 12, 5 - octave 4 - note A_, 6 - note E_, 1 - note A_, 1 - note G_, 6 - note D_, 1 - note G_, 1 - note_type 12, 12, 7 - note F#, 12 - note G#, 2 - note E_, 1 - note G#, 1 - note_type 12, 12, 2 - note A_, 2 - note_type 12, 12, 1 - octave 3 - note A_, 4 - note A_, 1 - note A_, 1 - note A_, 2 - note A_, 2 - note A_, 4 - note A_, 2 - note A_, 4 - note A_, 1 - note A_, 1 - note A_, 2 - note A_, 2 - note_type 12, 12, 4 - note A_, 1 - note F#, 1 - note A_, 1 - note B_, 1 - note_type 12, 12, 7 - octave 4 - note C#, 6 - note C#, 1 - note D_, 1 - note E_, 4 - note C#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note C#, 6 - octave 3 - note A_, 2 - octave 4 - note E_, 8 - octave 3 - note A_, 6 - note E_, 2 - octave 4 - note C#, 8 - note C#, 6 - note C#, 1 - note D_, 1 - note E_, 4 - note C#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note C#, 6 - octave 3 - note A_, 2 - octave 4 - note E_, 8 - octave 3 - note A_, 6 - note E_, 2 - note_type 12, 11, 0 - octave 4 - note C#, 8 - note_type 12, 12, 7 - note D_, 6 - octave 3 - note B_, 2 - octave 4 - note G_, 8 - octave 3 - note G_, 6 - note D_, 2 - note B_, 8 - note_type 12, 11, 0 - octave 4 - note C#, 6 - note_type 12, 11, 7 - note C#, 6 - note D_, 4 - note_type 12, 10, 0 - note E_, 8 - note_type 12, 10, 7 - note E_, 8 - note_type 12, 12, 7 - note D_, 6 - octave 3 - note B_, 2 - octave 4 - note G_, 8 - octave 3 - note G_, 6 - note D_, 2 - note B_, 8 - note_type 12, 11, 0 - octave 4 - note E_, 7 - note_type 12, 11, 7 - note E_, 7 - note_type 12, 12, 3 - note E_, 1 - note G#, 1 - note_type 12, 11, 0 - note A_, 8 - note_type 12, 11, 7 - note A_, 8 - note_type 12, 12, 6 - note G_, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note_type 12, 10, 0 - note C#, 8 - note_type 12, 10, 7 - note C#, 8 - note_type 12, 9, 0 - octave 3 - note A_, 8 - note_type 12, 9, 7 - note A_, 8 - note_type 12, 11, 0 - note E_, 8 - note_type 12, 11, 7 - note E_, 8 - note_type 12, 12, 7 - note D_, 8 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 - note_type 12, 11, 7 - note G_, 6 - note F#, 1 - note F_, 1 - note_type 12, 11, 0 - note E_, 8 - note_type 12, 11, 7 - note E_, 8 - note_type 12, 11, 0 - note D_, 8 - note_type 12, 11, 7 - note D_, 8 - note_type 12, 12, 7 - octave 2 - note B_, 8 - octave 3 - note F#, 6 - note D_, 1 - note F#, 1 - note E_, 8 - note B_, 6 - note G_, 1 - note B_, 1 - note_type 12, 11, 0 - octave 4 - note C#, 8 - note_type 12, 11, 7 - note C#, 8 - note_type 12, 11, 0 - note D_, 8 - note_type 12, 11, 7 - note D_, 8 - note_type 12, 12, 7 - octave 3 - note B_, 8 - octave 4 - note D_, 6 - octave 3 - note B_, 1 - octave 4 - note D_, 1 - note_type 12, 11, 0 - note C#, 6 - note_type 12, 11, 7 - note C#, 6 - note_type 12, 12, 7 - octave 3 - note B_, 4 - note_type 12, 11, 0 - note A_, 8 - note_type 12, 11, 7 - note A_, 8 - note_type 12, 11, 0 - note F#, 6 - note_type 12, 11, 7 - note F#, 6 - note_type 12, 12, 7 - note G#, 4 - note A_, 8 - note F#, 8 - note_type 12, 11, 0 - note G#, 6 - note_type 12, 11, 7 - note G#, 6 - note_type 12, 12, 7 - note A_, 4 - note B_, 8 - note G#, 8 - note_type 12, 11, 0 - note A_, 6 - note_type 12, 11, 7 - note A_, 6 - note_type 12, 12, 7 - note B_, 4 - octave 4 - note C_, 8 - octave 3 - note A_, 8 - note_type 12, 11, 0 - note B_, 6 - note_type 12, 11, 7 - note B_, 6 - note_type 12, 12, 7 - octave 4 - note C_, 4 - note_type 12, 11, 0 - note D_, 8 - octave 3 - note B_, 8 - note_type 12, 11, 0 - octave 4 - note C#, 16 - note C#, 8 - note_type 12, 11, 7 - note C#, 8 - note_type 12, 11, 0 - octave 3 - note A_, 16 - note A_, 8 - note_type 12, 11, 7 - note A_, 8 - note_type 12, 12, 7 - note G_, 6 - note B_, 2 - octave 4 - note D_, 8 - octave 3 - note B_, 6 - octave 4 - note D_, 2 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 - octave 3 - note G_, 6 - note F#, 1 - note F_, 1 - note E_, 8 - note C#, 4 - note D_, 4 - note G_, 6 - note B_, 2 - octave 4 - note D_, 8 - octave 3 - note B_, 6 - octave 4 - note D_, 2 - note G_, 8 - note_type 12, 11, 0 - note A_, 16 - note_type 12, 10, 0 - note A_, 8 - note_type 12, 10, 7 - note A_, 8 - note_type 12, 12, 1 - note A_, 2 - note A_, 4 - note A_, 1 - note A_, 1 - note_type 12, 12, 1 - note A_, 8 - sound_ret - -Music_Credits_Ch3:: - note_type 12, 1, 0 - octave 5 - note C#, 6 - octave 4 - note A_, 1 - octave 5 - note C#, 1 - note D_, 6 - octave 4 - note B_, 1 - octave 5 - note D_, 1 - note F#, 6 - note D_, 1 - note F#, 1 - note A_, 4 - note G#, 2 - note E_, 1 - note G#, 1 - note A_, 1 - rest 15 - rest 16 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - octave 4 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub1 - sound_call .sub3 - sound_call .sub3 - sound_call .sub4 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note B_, 2 - note A_, 2 - sound_call .sub3 - sound_call .sub3 - sound_call .sub4 - sound_call .sub4 - octave 4 - note G_, 4 - note A_, 4 - note B_, 4 - octave 5 - note D_, 4 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub2 - sound_call .sub2 - sound_call .sub1 - note E_, 4 - note A_, 2 - note E_, 4 - note A_, 2 - note E_, 2 - note A_, 2 - sound_call .sub2 - sound_call .sub2 - sound_call .sub1 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - sound_call .sub5 - sound_call .sub5 - sound_call .sub6 - sound_call .sub6 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - sound_call .sub3 - sound_call .sub3 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note A_, 4 - sound_call .sub1 - sound_call .sub1 - sound_call .sub7 - sound_call .sub7 - sound_call .sub1 - sound_call .sub1 - sound_call .sub3 - sound_call .sub3 - sound_call .sub8 - sound_call .sub8 - note A_, 1 - rest 1 - note A_, 1 - rest 3 - note A_, 1 - note A_, 1 - note A_, 1 - rest 7 - sound_ret - -.sub1: - octave 4 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - sound_ret - -.sub2: - octave 4 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - sound_ret - -.sub3: - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - sound_ret - -.sub4: - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - sound_ret - -.sub5: - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - sound_ret - -.sub6: - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - sound_ret - -.sub7: - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - sound_ret - -.sub8: - note A_, 1 - rest 1 - note A_, 1 - rest 3 - note A_, 1 - note A_, 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note A_, 1 - rest 3 - sound_ret diff --git a/audio/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm deleted file mode 100644 index 6a71afcc..00000000 --- a/audio/music/defeatedgymleader.asm +++ /dev/null @@ -1,602 +0,0 @@ -Music_DefeatedGymLeader_Ch1:: - tempo 112 - volume 7, 7 - duty_cycle 3 - vibrato 18, 3, 1 - toggle_perfect_pitch - tempo 112 - note_type 12, 10, 6 - octave 4 - note D_, 6 - octave 3 - note A_, 1 - octave 4 - note D_, 1 - note F#, 6 - note D_, 1 - note F#, 1 - note_type 12, 10, 0 - note A_, 8 - note_type 12, 10, 7 - note A_, 8 -.mainloop: - note_type 12, 11, 2 - octave 3 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 4 - note D_, 4 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 2 - note_type 12, 11, 1 - octave 2 - note B_, 8 - note_type 12, 11, 2 - octave 3 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 4 - note D_, 4 - note A_, 2 - note A_, 2 - note F#, 4 - note G_, 2 - note G_, 2 - note E_, 4 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 2 - note_type 12, 11, 1 - octave 2 - note B_, 8 - note_type 12, 9, 7 - octave 3 - note D_, 6 - octave 2 - note A_, 1 - octave 3 - note D_, 1 - note F#, 8 - note_type 12, 11, 0 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 - note_type 12, 9, 7 - note E_, 6 - note C#, 1 - note E_, 1 - note G#, 8 - note_type 12, 11, 0 - note G#, 6 - note E_, 1 - note G#, 1 - note B_, 8 - note_type 12, 9, 7 - note C#, 6 - octave 2 - note A_, 1 - octave 3 - note C#, 1 - note E_, 8 - note_type 12, 11, 0 - note E_, 6 - note C#, 1 - note E_, 1 - note E_, 4 - note G_, 4 - note_type 12, 9, 0 - note F#, 8 - note E_, 8 - note D_, 8 - note C#, 8 - note_type 12, 9, 7 - note D_, 6 - octave 2 - note A_, 1 - octave 3 - note D_, 1 - note F#, 8 - note_type 12, 11, 0 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 - note_type 12, 9, 7 - note E_, 6 - note C#, 1 - note E_, 1 - note G#, 8 - note_type 12, 11, 0 - note G#, 6 - note E_, 1 - note G#, 1 - note B_, 8 - note_type 12, 9, 7 - note C#, 6 - octave 2 - note A_, 1 - octave 3 - note C#, 1 - note E_, 8 - note_type 12, 11, 0 - note E_, 6 - note C#, 1 - note E_, 1 - note E_, 4 - note G_, 4 - note_type 12, 9, 7 - note F#, 6 - note E_, 1 - note F#, 1 - note A_, 8 - note_type 12, 10, 7 - note G_, 8 - note E_, 8 - sound_loop 0, .mainloop - -Music_DefeatedGymLeader_Ch2:: - duty_cycle 2 - vibrato 24, 2, 4 - note_type 12, 12, 4 - octave 4 - note A_, 6 - note F#, 1 - note A_, 1 - octave 5 - note D_, 6 - octave 4 - note A_, 1 - octave 5 - note D_, 1 - note_type 12, 11, 0 - note F#, 8 - note_type 12, 11, 7 - note F#, 8 -.mainloop: - note_type 12, 12, 2 - octave 4 - note D_, 2 - note C#, 2 - octave 3 - note B_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note_type 12, 12, 4 - note A_, 4 - note A_, 4 - note_type 12, 12, 2 - octave 4 - note D_, 2 - note C#, 2 - octave 3 - note B_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note_type 12, 12, 1 - note D_, 6 - note_type 6, 12, 2 - note G_, 1 - note A_, 1 - note B_, 1 - octave 4 - note C#, 1 - note_type 12, 12, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note_type 12, 12, 4 - note A_, 4 - note A_, 3 - note_type 6, 12, 2 - note B_, 1 - octave 4 - note C#, 1 - note_type 12, 12, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note_type 12, 12, 1 - note D_, 8 - note_type 12, 12, 7 - note A_, 6 - note F#, 1 - note A_, 1 - note_type 12, 11, 0 - octave 4 - note D_, 8 - note_type 12, 10, 0 - note D_, 8 - note_type 12, 9, 7 - note D_, 8 - note_type 12, 12, 7 - octave 3 - note B_, 6 - note G#, 1 - note B_, 1 - note_type 12, 8, 0 - octave 4 - note E_, 8 - note_type 12, 10, 0 - note E_, 8 - note_type 12, 12, 7 - note E_, 8 - octave 3 - note G_, 6 - note E_, 1 - note G_, 1 - note_type 12, 6, -7 - octave 4 - note C#, 8 - note_type 12, 12, 7 - note C#, 8 - note F#, 4 - note E_, 4 - note_type 12, 11, 0 - note D_, 14 - octave 3 - note B_, 2 - note_type 12, 10, 0 - note A_, 8 - note_type 12, 11, 7 - note A_, 8 - note_type 12, 12, 7 - note A_, 6 - note F#, 1 - note A_, 1 - note_type 12, 11, 0 - octave 4 - note D_, 8 - note_type 12, 10, 0 - note D_, 8 - note_type 12, 9, 7 - note D_, 8 - note_type 12, 12, 7 - octave 3 - note B_, 6 - note G#, 1 - note B_, 1 - note_type 12, 4, -7 - octave 4 - note E_, 8 - note_type 12, 11, 0 - note E_, 8 - note_type 12, 12, 7 - note E_, 8 - octave 3 - note G_, 6 - note E_, 1 - note G_, 1 - note_type 12, 11, 0 - octave 4 - note C#, 8 - note_type 12, 11, 7 - note C#, 8 - octave 3 - note A_, 4 - octave 4 - note C#, 4 - note_type 12, 11, 0 - note D_, 14 - note E_, 2 - note D_, 12 - note_type 12, 12, 2 - octave 3 - note G_, 1 - note A_, 1 - note B_, 1 - octave 4 - note C#, 1 - sound_loop 0, .mainloop - -Music_DefeatedGymLeader_Ch3:: - note_type 12, 1, 0 - vibrato 16, 1, 2 - octave 4 - note F#, 6 - note D_, 1 - note F#, 1 - note A_, 6 - note F#, 1 - note A_, 1 - octave 5 - note D_, 6 - octave 4 - note A_, 1 - octave 5 - note D_, 1 - note F#, 8 -.mainloop: - octave 4 - note F#, 1 - rest 1 - note F#, 1 - rest 1 - note F#, 1 - rest 3 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - note G_, 1 - rest 3 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note G_, 1 - rest 1 - note F#, 3 - rest 1 - note F#, 3 - rest 1 - note F#, 1 - rest 1 - note F#, 1 - rest 1 - note F#, 1 - rest 3 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note F#, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note D_, 1 - rest 5 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 3 - rest 1 - note D_, 3 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 7 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note E_, 2 - sound_loop 0, .mainloop diff --git a/audio/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm deleted file mode 100644 index a035df11..00000000 --- a/audio/music/defeatedtrainer.asm +++ /dev/null @@ -1,261 +0,0 @@ -Music_DefeatedTrainer_Ch1:: - tempo 224 - volume 7, 7 - duty_cycle 2 - toggle_perfect_pitch - tempo 224 - note_type 4, 10, 2 - octave 4 - note D_, 2 - tempo 224 - note_type 4, 10, 2 - note D_, 2 - note D_, 2 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note_type 4, 11, 3 - note F#, 12 - duty_cycle 1 - tempo 224 -.mainloop: - note_type 4, 6, 3 - octave 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 - octave 4 - note C#, 3 - octave 3 - note B_, 3 - note A_, 3 - note G_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note G_, 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 - octave 4 - note C#, 3 - note D_, 3 - note E_, 3 - note F#, 3 - note C#, 3 - octave 3 - note B_, 3 - note A_, 3 - octave 4 - note C#, 3 - octave 3 - note A_, 6 - note F#, 3 - note A_, 3 - note B_, 6 - note G#, 3 - note B_, 3 - octave 4 - note C_, 6 - octave 3 - note A_, 3 - octave 4 - note C_, 3 - note D_, 3 - octave 3 - note B_, 3 - octave 4 - note D_, 6 - note C#, 3 - octave 3 - note B_, 3 - note A_, 3 - note G_, 3 - note F#, 3 - note G_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note G_, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 3 - note B_, 3 - sound_loop 0, .mainloop - -Music_DefeatedTrainer_Ch2:: - duty_cycle 2 - note_type 4, 12, 3 - octave 4 - note A_, 2 - note_type 4, 12, 3 - note A_, 2 - note A_, 2 - note A_, 2 - note B_, 2 - octave 5 - note C#, 2 - note_type 4, 12, 4 - note D_, 12 -.mainloop: - note_type 4, 8, 5 - octave 4 - note D_, 6 - octave 3 - note A_, 3 - octave 4 - note D_, 3 - note E_, 6 - octave 3 - note B_, 3 - octave 4 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 6 - note E_, 3 - note F#, 3 - note G_, 6 - note D_, 6 - octave 3 - note A_, 3 - octave 4 - note D_, 3 - note E_, 6 - octave 3 - note B_, 3 - octave 4 - note E_, 3 - note F#, 3 - note G_, 3 - note A_, 6 - note F#, 3 - note G_, 3 - note A_, 6 - note D_, 6 - octave 3 - note A_, 3 - octave 4 - note D_, 3 - note E_, 6 - octave 3 - note B_, 3 - octave 4 - note E_, 3 - note F_, 6 - note C_, 3 - note F_, 3 - note G_, 3 - note D_, 3 - note G_, 6 - note_type 4, 7, 0 - note F#, 12 - note_type 4, 7, 7 - note F#, 12 - note_type 4, 6, 0 - note E_, 12 - note_type 4, 6, 7 - note E_, 12 - sound_loop 0, .mainloop - -Music_DefeatedTrainer_Ch3:: - note_type 4, 1, 0 - octave 5 - note D_, 2 - note_type 4, 1, 0 - note D_, 2 - note D_, 2 - octave 4 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 12 - note_type 4, 2, 1 -.mainloop: - note F#, 3 - rest 3 - note F#, 3 - rest 3 - note G#, 3 - rest 3 - note G#, 3 - rest 3 - note A_, 3 - rest 3 - note A_, 3 - rest 3 - note B_, 3 - rest 3 - note B_, 3 - rest 3 - note F#, 3 - rest 3 - note F#, 3 - rest 3 - note G#, 3 - rest 3 - note G#, 3 - rest 3 - note A_, 3 - rest 3 - note A_, 3 - rest 3 - octave 5 - note C#, 3 - rest 3 - note C#, 3 - octave 4 - note A_, 3 - note F#, 3 - octave 5 - note D_, 3 - octave 4 - note F#, 3 - rest 3 - note G#, 3 - octave 5 - note E_, 3 - octave 4 - note G#, 3 - rest 3 - note A_, 3 - octave 5 - note F_, 3 - octave 4 - note A_, 3 - rest 3 - note B_, 3 - octave 5 - note G_, 3 - octave 4 - note B_, 3 - note A#, 3 - note A_, 3 - rest 3 - note A_, 3 - rest 3 - note A_, 3 - rest 3 - note A_, 3 - octave 5 - note C_, 3 - note C#, 3 - rest 3 - note C#, 3 - rest 3 - note C#, 3 - rest 3 - note C#, 3 - octave 4 - note A_, 3 - sound_loop 0, .mainloop diff --git a/audio/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm deleted file mode 100644 index 83b1c909..00000000 --- a/audio/music/defeatedwildmon.asm +++ /dev/null @@ -1,297 +0,0 @@ -Music_DefeatedWildMon_Ch1:: - tempo 112 - volume 7, 7 - execute_music - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - tempo 112 - note_type 12, 11, 7 - octave 3 - note B_, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note E_, 12 -.mainloop: - note_type 12, 6, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note G#, 2 - note G#, 2 - note G#, 4 - note E_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note G#, 2 - note G#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note G#, 8 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A#, 2 - note A#, 2 - note A#, 4 - note A_, 2 - note A_, 2 - note A_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note A_, 2 - note A_, 4 - note A#, 2 - note A#, 2 - note A#, 4 - note A_, 8 - sound_loop 0, .mainloop - -Music_DefeatedWildMon_Ch2:: - execute_music - duty_cycle 2 - note_type 12, 12, 3 - octave 4 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - note_type 12, 12, 7 - note B_, 12 -.mainloop: - note_type 12, 8, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 - octave 4 - note C#, 2 - note C#, 2 - note C#, 4 - octave 3 - note B_, 2 - note B_, 2 - note B_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note B_, 2 - note B_, 4 - octave 4 - note C#, 2 - note C#, 2 - note C#, 4 - octave 3 - note B_, 8 - octave 4 - note C_, 2 - octave 3 - note A#, 2 - note A_, 2 - note A#, 2 - octave 4 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 2 - note C_, 2 - note C_, 4 - note C_, 2 - octave 3 - note A#, 2 - note A_, 2 - note A#, 2 - octave 4 - note C_, 2 - note C_, 2 - note C_, 4 - note D_, 2 - note D_, 2 - note D_, 4 - note C_, 8 - sound_loop 0, .mainloop - -Music_DefeatedWildMon_Ch3:: - execute_music - note_type 12, 2, 0 - octave 5 - note E_, 1 - rest 1 - octave 6 - note C#, 1 - rest 1 - octave 5 - note B_, 1 - rest 1 - octave 6 - note D#, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - rest 3 -.mainloop: - octave 4 - note E_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note E_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note E_, 1 - rest 3 - octave 5 - note E_, 1 - rest 3 - octave 4 - note F#, 1 - rest 1 - octave 5 - note F#, 1 - rest 1 - octave 4 - note F#, 1 - rest 3 - note F#, 1 - rest 1 - octave 5 - note D#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note E_, 1 - rest 1 - octave 5 - note E_, 1 - rest 1 - octave 4 - note E_, 1 - rest 3 - octave 5 - note E_, 1 - rest 3 - octave 4 - note F#, 1 - rest 1 - octave 5 - note F#, 1 - rest 1 - octave 4 - note F#, 1 - rest 3 - octave 5 - note E_, 1 - rest 3 - octave 4 - note D#, 4 - octave 4 - note F_, 1 - rest 1 - octave 5 - note F_, 1 - rest 1 - octave 4 - note F_, 1 - rest 1 - octave 5 - note F_, 1 - rest 1 - octave 4 - note F_, 1 - rest 3 - octave 5 - note F_, 1 - rest 3 - octave 4 - note G_, 1 - rest 1 - octave 5 - note G_, 1 - rest 1 - octave 4 - note G_, 1 - rest 3 - note F_, 1 - rest 1 - octave 5 - note F_, 1 - rest 1 - octave 4 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - octave 5 - note F_, 1 - rest 1 - octave 4 - note F_, 1 - rest 1 - octave 5 - note F_, 1 - rest 1 - octave 4 - note F_, 1 - rest 3 - octave 5 - note F_, 1 - rest 3 - octave 4 - note G_, 1 - rest 1 - octave 5 - note G_, 1 - rest 1 - octave 4 - note G_, 1 - rest 3 - octave 5 - note F_, 1 - rest 3 - octave 4 - note D#, 4 - sound_loop 0, .mainloop diff --git a/audio/music/dungeon1.asm b/audio/music/dungeon1.asm deleted file mode 100644 index 50a9ee04..00000000 --- a/audio/music/dungeon1.asm +++ /dev/null @@ -1,659 +0,0 @@ -Music_Dungeon1_Ch1:: - tempo 144 - volume 7, 7 - duty_cycle 3 - toggle_perfect_pitch - vibrato 10, 1, 4 - note_type 12, 4, -5 - rest 8 - stereo_panning %1110, %1101 - octave 4 - note F#, 8 - stereo_panning %1111, %1111 -.mainloop: - note_type 12, 11, 2 - octave 3 -.loop1: - sound_call .sub1 - sound_loop 3, .loop1 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 - rest 1 - note A#, 1 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 -.loop2: - sound_call .sub1 - sound_loop 4, .loop2 - sound_call .sub4 - octave 3 - note G_, 1 - note F#, 1 - note E_, 1 - note G_, 1 - sound_call .sub4 - octave 3 - note A_, 1 - note G_, 1 - note E_, 1 - note A_, 1 - sound_call .sub4 - octave 3 - note B_, 1 - note A_, 1 - note G_, 1 - note F#, 1 - note_type 12, 12, 3 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 - note_type 12, 12, 2 - sound_call .sub3 - octave 3 - note B_, 3 - sound_call .sub3 - note C_, 3 - sound_call .sub3 - note C#, 3 - note_type 12, 12, 3 - octave 3 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 - note E_, 4 - note D#, 4 - note C_, 4 - octave 2 - note B_, 4 - note_type 12, 12, 2 - note B_, 1 - note A#, 1 - note G_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note A#, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note G#, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note G#, 1 - note B_, 1 - octave 3 - note C#, 1 - note C_, 1 - octave 2 - note A_, 1 - octave 3 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note A_, 1 - octave 3 - note C_, 1 - note D_, 1 - note C#, 1 - octave 2 - note A#, 1 - octave 3 - note C#, 1 - note D_, 1 - note C#, 1 - octave 2 - note A#, 1 - octave 3 - note C#, 1 -.loop3: - rest 16 - sound_loop 8, .loop3 - note_type 12, 12, 3 - sound_call .sub2 - note B_, 2 - note G_, 2 - octave 3 - note C#, 4 - octave 2 - note G_, 2 - note A_, 4 - note F#, 2 - sound_call .sub2 - note A#, 2 - note G_, 2 - note B_, 4 - note G_, 2 - note F#, 2 - note G_, 2 - note D#, 2 - note_type 12, 12, 2 - sound_call .sub3 - octave 3 - note B_, 3 - sound_call .sub3 - note C_, 3 - sound_call .sub3 - note C#, 3 - note_type 12, 12, 7 - octave 3 - note F#, 8 - note D#, 8 - note_type 12, 12, 2 - sound_call .sub1 - sound_call .sub1 - sound_loop 0, .mainloop - -.sub1: - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 - rest 1 - note A#, 1 - note E_, 1 - note D#, 1 - note B_, 1 - note A#, 1 - note G_, 1 - note G#, 1 - rest 1 - note A#, 1 - sound_ret - -.sub2: - octave 2 - note G_, 2 - note A#, 4 - note G_, 2 - octave 3 - note C#, 4 - octave 2 - note G_, 2 - note A#, 2 - sound_ret - -.sub3: - octave 3 - note E_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note G_, 1 - note E_, 1 - note A_, 1 - note E_, 1 - note A#, 1 - note E_, 1 - note B_, 1 - note E_, 1 - octave 4 - note C_, 1 - sound_ret - -.sub4: - note E_, 1 - note E_, 1 - rest 4 - octave 1 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - sound_ret - -Music_Dungeon1_Ch2:: - vibrato 11, 1, 5 - duty_cycle 3 - note_type 12, 0, -7 - octave 4 - note G#, 8 - note_type 12, 4, -5 - octave 5 - note D_, 8 -.mainloop: - note_type 12, 12, 2 -.loop1: - sound_call .sub1 - sound_loop 3, .loop1 - octave 2 - note E_, 1 - note E_, 1 - note B_, 1 - octave 3 - note C_, 1 - rest 2 - note C_, 1 - octave 2 - note B_, 1 - note E_, 1 - note E_, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note D#, 1 -.loop2: - sound_call .sub1 - sound_loop 4, .loop2 - rest 2 - sound_call .sub2 - octave 3 - note C_, 4 - sound_call .sub2 - octave 3 - note C#, 4 - sound_call .sub2 - octave 3 - note D#, 4 - note_type 12, 13, 3 - octave 4 - note E_, 4 - note D#, 4 - note C_, 4 - octave 3 - note B_, 4 - note_type 12, 13, 2 - sound_call .sub3 - octave 3 - note F#, 4 - sound_call .sub3 - octave 3 - note G_, 4 - sound_call .sub3 - octave 3 - note A#, 4 - note_type 12, 13, 3 - octave 4 - note E_, 4 - note D#, 4 - note C_, 4 - octave 3 - note B_, 4 - octave 4 - note C_, 4 - octave 3 - note B_, 4 - note G_, 4 - note F#, 2 - note_type 12, 13, 6 - note E_, 8 - note F_, 8 - note F#, 8 - note G_, 8 - note_type 12, 13, 2 - sound_call .sub4 - rest 10 - note E_, 1 - rest 1 - sound_call .sub4 - rest 12 - sound_call .sub4 - rest 12 - sound_call .sub4 - rest 14 - note_type 12, 13, 3 - sound_call .sub6 - note D#, 4 - sound_call .sub6 - note D#, 2 - rest 2 - note_type 12, 13, 2 - sound_call .sub5 - rest 2 - octave 3 - note F#, 4 - octave 2 - note E_, 1 - note E_, 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C_, 1 - rest 1 - note C#, 1 - rest 1 - note D_, 1 - note C#, 1 - rest 2 - octave 3 - note G_, 4 - sound_call .sub5 - octave 3 - note A#, 4 - note_type 12, 13, 6 - note B_, 8 - octave 4 - note D#, 8 - note_type 12, 13, 2 - sound_call .sub1 - sound_call .sub1 - sound_loop 0, .mainloop - -.sub1: - octave 2 - note E_, 1 - note E_, 1 - note B_, 1 - octave 3 - note C_, 1 - rest 2 - note C_, 1 - octave 2 - note B_, 1 - note E_, 1 - note E_, 1 - note B_, 1 - octave 3 - note C_, 1 - rest 2 - note C_, 1 - octave 2 - note B_, 1 - sound_ret - -.sub2: - octave 2 - note E_, 1 - note E_, 1 - rest 2 - octave 1 - note E_, 1 - rest 3 - note E_, 1 - rest 3 - sound_ret - -.sub3: - octave 2 - note E_, 1 - note E_, 1 - rest 10 - sound_ret - -.sub4: - octave 1 - note E_, 1 - note G_, 1 - note E_, 1 - note D#, 1 - sound_ret - -.sub5: - octave 2 - note E_, 1 - note E_, 1 - octave 4 - note E_, 1 - rest 1 - note D#, 1 - rest 1 - note D_, 1 - rest 1 - note C#, 1 - note C_, 1 - sound_ret - -.sub6: - octave 3 - note E_, 6 - note G_, 6 - note E_, 4 - note A_, 6 - octave 4 - note C_, 6 - octave 3 - note B_, 4 - note G_, 6 - note A#, 6 - note F#, 4 - note E_, 6 - note F#, 6 - sound_ret - -Music_Dungeon1_Ch3:: - note_type 12, 1, 1 - vibrato 8, 2, 6 - rest 14 - octave 4 - note D_, 1 - note D#, 1 -.mainloop: - sound_call .sub1 - sound_call .sub1 - octave 5 - note E_, 2 - rest 4 - octave 3 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - octave 4 - note F#, 4 - sound_call .sub2 - octave 4 - note G_, 4 - sound_call .sub2 - octave 4 - note A_, 4 - note B_, 4 - note A#, 4 - note G_, 4 - note F#, 4 - rest 6 - sound_call .sub5 - note B_, 4 - note A#, 4 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note D#, 4 - sound_call .sub3 - rest 12 - sound_call .sub3 - rest 12 - sound_call .sub3 - rest 10 - note E_, 1 - rest 1 - sound_call .sub3 - rest 12 - sound_call .sub3 - rest 12 - sound_call .sub3 - rest 10 - note D_, 1 - note D#, 1 - sound_call .sub4 - sound_call .sub4 - note E_, 2 - rest 4 - sound_call .sub5 - note B_, 8 - note F#, 6 - note D_, 1 - note D#, 1 - rest 16 - rest 16 - sound_loop 0, .mainloop - -.sub1: - octave 5 - note E_, 4 - note B_, 4 - note A#, 4 - octave 6 - note D_, 4 - note C#, 4 - octave 5 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 - sound_ret - -.sub2: - octave 6 - note E_, 1 - note E_, 1 - rest 4 - octave 3 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - sound_ret - -.sub3: - octave 3 - note E_, 1 - note G_, 1 - note E_, 1 - note D#, 1 - sound_ret - -.sub4: - note E_, 4 - note B_, 4 - note A#, 4 - octave 4 - note D_, 4 - note C#, 4 - octave 3 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 - sound_ret - -.sub5: - octave 4 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - note F#, 4 - rest 6 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - note G_, 4 - rest 6 - note E_, 1 - rest 3 - note E_, 1 - note E_, 1 - note A#, 4 - sound_ret - -Music_Dungeon1_Ch4:: - drum_speed 12 - rest 14 - drum_note 12, 1 - drum_note 12, 1 -.mainloop: -.loop1: - sound_call .sub1 - sound_loop 3, .loop1 - drum_note 13, 4 - drum_note 12, 4 - drum_note 13, 4 - drum_note 12, 2 - drum_note 12, 2 -.loop2: - sound_call .sub1 - sound_loop 3, .loop2 - drum_note 13, 4 - drum_note 12, 4 - drum_note 13, 4 - drum_note 13, 4 -.loop3: - sound_call .sub2 - sound_loop 3, .loop3 - sound_call .sub3 -.loop4: - sound_call .sub2 - sound_loop 3, .loop4 - sound_call .sub3 - drum_note 9, 4 - drum_note 10, 4 - drum_note 10, 4 - rest 2 - drum_note 9, 2 - drum_note 13, 4 -.loop5: - rest 16 - sound_loop 13, .loop5 - rest 12 -.loop6: - sound_call .sub2 - sound_loop 3, .loop6 - drum_note 12, 4 - drum_note 12, 4 - drum_note 12, 4 - rest 2 - drum_note 12, 1 - drum_note 12, 1 - sound_call .sub1 - sound_call .sub1 - sound_loop 0, .mainloop - -.sub1: - drum_note 13, 4 - drum_note 12, 4 - drum_note 13, 4 - drum_note 12, 4 - sound_ret - -.sub2: - drum_note 12, 1 - drum_note 12, 1 - rest 10 - drum_note 14, 4 - sound_ret - -.sub3: - drum_note 9, 4 - drum_note 10, 4 - drum_note 10, 4 - drum_note 11, 4 - sound_ret diff --git a/audio/music/dungeon2.asm b/audio/music/dungeon2.asm deleted file mode 100644 index 890f9cbe..00000000 --- a/audio/music/dungeon2.asm +++ /dev/null @@ -1,314 +0,0 @@ -Music_Dungeon2_Ch1:: - tempo 144 - volume 7, 7 - duty_cycle 3 - toggle_perfect_pitch - vibrato 10, 1, 4 -.mainloop: -.loop1: - note_type 12, 11, 2 - octave 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - octave 5 - note C#, 4 - note C#, 4 - note C#, 4 - note C#, 4 - octave 3 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - octave 2 - note G_, 2 - note A#, 4 - note G_, 2 - octave 3 - note C#, 4 - octave 2 - note G_, 2 - note A#, 2 - note B_, 2 - note G_, 2 - octave 3 - note C#, 4 - octave 2 - note G_, 2 - note A_, 4 - note F#, 2 - sound_loop 2, .loop1 - note_type 12, 1, -7 - octave 3 - note E_, 16 - note C_, 16 - note D_, 16 - octave 2 - note A#, 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - sound_loop 0, .mainloop - -Music_Dungeon2_Ch2:: - vibrato 11, 1, 5 -.mainloop: -.loop1: - duty_cycle 3 - note_type 12, 12, 2 - octave 3 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note E_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note C_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - octave 4 - note F#, 4 - note F#, 4 - note F#, 4 - note F#, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note G_, 4 - note G_, 4 - note G_, 4 - note F#, 4 - sound_loop 2, .loop1 - octave 3 - note E_, 2 - note G_, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note E_, 2 - octave 5 - note E_, 2 - rest 2 - note D#, 2 - rest 2 - note D_, 2 - rest 2 - note C#, 2 - note C_, 2 - octave 4 - note E_, 2 - note G_, 2 - octave 3 - note A#, 2 - note C#, 2 - note A#, 2 - note A_, 2 - note A#, 2 - note G_, 2 - octave 5 - note G_, 2 - rest 2 - note F#, 2 - rest 2 - note F_, 2 - rest 2 - note E_, 2 - note D#, 2 - note D_, 2 - note C#, 2 - rest 16 - rest 16 - rest 16 - rest 16 - note_type 12, 12, 7 - duty_cycle 1 - octave 4 - note E_, 16 - note D_, 16 - note C_, 16 - note D_, 16 - sound_loop 0, .mainloop - -Music_Dungeon2_Ch3:: - note_type 12, 1, 3 - vibrato 8, 2, 6 -.mainloop: -.loop1: - sound_call .sub2 - sound_loop 16, .loop1 - note E_, 4 - rest 4 - rest 4 - note E_, 4 - note C_, 4 - rest 4 - rest 4 - note C_, 4 - note D_, 4 - rest 4 - rest 4 - note D_, 4 - octave 3 - note A#, 4 - rest 4 - rest 4 - note A#, 4 -.loop2: - octave 5 - note E_, 2 - rest 2 - note B_, 2 - rest 2 - note A#, 2 - rest 2 - octave 6 - note D_, 2 - rest 2 - note C#, 2 - rest 2 - octave 5 - note G#, 2 - rest 2 - note G_, 2 - rest 2 - note B_, 2 - rest 2 - note A#, 2 - rest 2 - note E_, 2 - rest 2 - note D#, 2 - rest 2 - note A_, 2 - rest 2 - note G#, 2 - rest 2 - note E_, 2 - rest 2 - note F#, 2 - rest 2 - note D#, 2 - rest 2 - sound_loop 3, .loop2 - octave 4 - note E_, 4 - note B_, 4 - note A#, 4 - octave 5 - note D_, 4 - note C#, 4 - octave 4 - note G#, 4 - note G_, 4 - note B_, 4 - note A#, 4 - note E_, 4 - note D#, 4 - note A_, 4 - note G#, 4 - note E_, 4 - note F#, 4 - note D#, 4 - octave 3 - note E_, 16 - note C_, 16 - note D_, 16 - octave 2 - note A#, 16 - octave 3 - note E_, 16 - note F_, 16 - note G_, 16 - octave 3 - note B_, 16 - rest 16 - rest 16 - rest 16 - rest 16 - 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 - -.sub1: ; unreferenced - octave 2 - note G_, 2 - note A#, 4 - note G_, 2 - octave 3 - note C#, 4 - octave 2 - note G_, 2 - note A_, 2 - note A#, 2 - note G_, 2 - octave 3 - note C#, 4 - octave 2 - note G_, 2 - note A#, 2 - note G_, 2 - rest 2 - sound_ret - -.sub2: - octave 4 - note E_, 2 - rest 4 - octave 3 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - octave 4 - note F#, 4 - sound_ret - -Music_Dungeon2_Ch4:: - drum_speed 12 -.mainloop: - drum_note 12, 4 - drum_note 13, 4 - drum_note 12, 4 - drum_note 10, 4 - drum_note 12, 4 - drum_note 13, 4 - drum_note 11, 4 - drum_note 9, 4 - sound_loop 0, .mainloop diff --git a/audio/music/dungeon3.asm b/audio/music/dungeon3.asm deleted file mode 100644 index 881bc82a..00000000 --- a/audio/music/dungeon3.asm +++ /dev/null @@ -1,747 +0,0 @@ -Music_Dungeon3_Ch1:: - tempo 160 - volume 7, 7 - duty_cycle 3 - toggle_perfect_pitch - vibrato 8, 1, 4 -.mainloop: - note_type 12, 12, 3 -.loop1: - sound_call .sub1 - sound_loop 3, .loop1 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - note D#, 2 - note E_, 2 -.loop2: - sound_call .sub2 - sound_loop 4, .loop2 -.loop3: - sound_call .sub1 - sound_loop 4, .loop3 - octave 4 - note F_, 2 - note F_, 2 - rest 2 - note F_, 2 - note E_, 2 - note E_, 2 - note D#, 2 - note D#, 2 - rest 2 - note D#, 2 - note D_, 2 - note D_, 2 - sound_call .sub7 - octave 4 - note D_, 2 - note D_, 2 - rest 2 - note D_, 2 - note D#, 2 - note D#, 2 - note E_, 2 - note E_, 2 - rest 2 - note E_, 2 - note F_, 2 - note F_, 2 -.loop4: - sound_call .sub3 - sound_loop 4, .loop4 -.loop5: - sound_call .sub4 - sound_loop 3, .loop5 - octave 3 - note C#, 2 - octave 2 - note A_, 2 - note F_, 2 - octave 3 - note C#, 2 - octave 2 - note A_, 2 - note F_, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note F_, 2 - note A_, 2 - note F_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note F_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note F_, 2 - note G#, 2 - note E_, 2 - octave 4 - note C_, 2 - octave 3 - note G#, 2 - note E_, 2 - octave 4 - note C_, 2 - sound_call .sub5 - sound_call .sub5 - octave 3 - note G#, 2 - note E_, 2 - octave 4 - note C_, 2 - octave 3 - note G#, 2 - note E_, 2 - octave 4 - note C_, 2 - octave 3 - note G#, 2 - note E_, 2 - rest 16 - rest 8 - sound_call .sub6 - sound_call .sub6 - sound_call .sub6 - sound_call .sub6 - note D#, 2 - rest 16 - rest 16 - sound_loop 0, .mainloop - -.sub1: - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - sound_ret - -.sub2: - note E_, 2 - note G#, 2 - octave 4 - note C_, 2 - octave 3 - note E_, 2 - note G#, 2 - octave 4 - note C_, 2 - octave 3 - note E_, 2 - note G#, 2 - sound_ret - -.sub3: - octave 3 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - note D#, 2 - octave 2 - note B_, 2 - sound_ret - -.sub4: - note A_, 2 - note F_, 2 - octave 3 - note C#, 2 - octave 2 - note A_, 2 - note F_, 2 - octave 3 - note C#, 2 - octave 2 - note A_, 2 - note F_, 2 - sound_ret - -.sub5: - octave 3 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - octave 4 - note C_, 2 - octave 3 - note G#, 2 - note E_, 2 - octave 4 - note C_, 2 - sound_ret - -.sub6: - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - sound_ret - -.sub7: - tempo 168 - octave 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - tempo 176 - octave 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - tempo 184 - octave 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - tempo 192 - octave 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - tempo 200 - octave 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - tempo 208 - octave 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - note C#, 1 - note D_, 1 - tempo 216 - octave 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - note C#, 1 - tempo 224 - octave 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 2 - note C_, 1 - tempo 160 - sound_ret - -Music_Dungeon3_Ch2:: - vibrato 11, 1, 5 - duty_cycle 3 -.mainloop: - note_type 12, 13, 3 - octave 4 - note D#, 6 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - note A#, 2 - note B_, 6 - octave 4 - note C#, 8 - rest 2 - note G#, 6 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 - octave 5 - note C_, 2 - octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 - octave 5 - note C_, 2 - octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note D#, 2 - note E_, 6 - note F#, 6 - note E_, 4 - note D#, 6 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - note A#, 2 - note B_, 6 - octave 4 - note C#, 8 - rest 2 - note G#, 2 - note G#, 2 - rest 2 - note G#, 2 - note A_, 2 - note A_, 2 - note A#, 2 - note A#, 2 - rest 2 - note A#, 2 - note B_, 2 - note B_, 2 - rest 8 - rest 8 - rest 8 - rest 8 - rest 8 - rest 8 - rest 8 - rest 8 - octave 4 - note B_, 2 - note B_, 2 - rest 2 - note B_, 2 - note A#, 2 - note A#, 2 - note A_, 2 - note A_, 2 - rest 2 - note A_, 2 - note G#, 2 - note G#, 2 - note C#, 8 - rest 2 - octave 3 - note B_, 6 - note A#, 2 - note B_, 2 - octave 4 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 6 - note G_, 6 - octave 3 - note G_, 8 - rest 2 - note F_, 6 - note E_, 2 - note F_, 2 - note A_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note G_, 6 - note F_, 2 - note G_, 2 - note A_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - note G_, 6 - note A_, 6 - octave 4 - note C#, 6 - note G_, 8 - rest 2 - note F_, 6 - note E_, 2 - note F_, 2 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - note G_, 6 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - note G_, 6 - note A_, 6 - octave 5 - note C#, 6 - octave 4 - note F#, 8 - rest 2 - note E_, 6 - note D#, 2 - note E_, 2 - note G#, 2 - octave 5 - note C_, 2 - octave 4 - note G#, 2 - note F#, 6 - note E_, 2 - note F#, 2 - note G#, 2 - octave 5 - note C_, 2 - octave 4 - note G#, 2 - note F#, 6 - note G#, 6 - octave 5 - note C_, 6 - octave 3 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - note D#, 2 - note G_, 2 - note D#, 2 - note C#, 6 - octave 2 - note E_, 2 - note G#, 2 - octave 3 - note C_, 2 - note E_, 2 - note G#, 2 - octave 4 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note E_, 2 - note G#, 2 - note C_, 2 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note D#, 2 - sound_loop 0, .mainloop - -Music_Dungeon3_Ch3:: -.mainloop: - note_type 12, 1, 2 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 12 - note_type 6, 1, 0 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - rest 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - rest 16 - rest 16 - rest 10 - octave 5 - note E_, 8 - octave 4 - note B_, 8 - octave 5 - note D#, 8 - octave 4 - note A#, 8 - octave 5 - note D_, 8 - octave 4 - note A_, 8 - octave 5 - note C#, 8 - octave 4 - note G#, 8 - octave 5 - note C_, 8 - octave 4 - note G_, 8 - note B_, 8 - note F#, 8 - note A#, 8 - note F_, 8 - note A_, 8 - note E_, 8 - rest 16 - rest 16 - rest 8 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - rest 2 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - rest 10 - rest 16 - note_type 12, 1, 0 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 10 - sound_loop 0, .mainloop - -Music_Dungeon3_Ch4:: - drum_speed 12 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 10 - sound_ret diff --git a/audio/music/finalbattle.asm b/audio/music/finalbattle.asm deleted file mode 100644 index 032c129e..00000000 --- a/audio/music/finalbattle.asm +++ /dev/null @@ -1,1339 +0,0 @@ -Music_FinalBattle_Ch1:: - tempo 112 - volume 7, 7 - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 2 - octave 3 - note F#, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note_type 12, 10, 2 - note G#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - note_type 12, 9, 2 - note A#, 1 - note B_, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note_type 12, 8, 2 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note_type 12, 12, 1 - octave 3 - note E_, 1 - note E_, 7 - note F_, 1 - note F_, 7 - note G_, 1 - note G_, 7 - note F_, 1 - note F_, 7 - note E_, 1 - note E_, 7 - note F_, 1 - note F_, 7 - note G_, 1 - note G_, 7 - note G#, 1 - note G#, 3 - note D#, 4 - note_type 12, 12, 1 - note E_, 1 - note E_, 3 - note_type 12, 11, 3 - note E_, 4 - note_type 12, 12, 1 - note F_, 1 - note F_, 3 - note_type 12, 11, 3 - note F_, 4 - note_type 12, 12, 1 - note G_, 1 - note G_, 3 - note_type 12, 11, 3 - note G_, 4 - note_type 12, 12, 1 - note F_, 1 - note F_, 3 - note_type 12, 11, 3 - note F_, 4 - note_type 12, 12, 1 - note E_, 1 - note E_, 3 - note_type 12, 11, 3 - note E_, 4 - note_type 12, 12, 1 - note F_, 1 - note F_, 3 - note_type 12, 11, 3 - note F_, 4 - note_type 12, 12, 1 - note G_, 1 - note G_, 3 - note_type 12, 11, 3 - note G_, 4 - note_type 12, 12, 1 - note G#, 1 - note G#, 3 - note_type 12, 11, 7 - note D#, 4 -.mainloop: - note_type 12, 11, 7 - octave 3 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 - octave 2 - note B_, 4 - octave 3 - note F#, 4 - note F_, 4 - note F#, 4 - note_type 12, 11, 1 - note F#, 2 - note F_, 1 - note F#, 1 - note A_, 1 - note F#, 2 - note F#, 1 - note_type 12, 11, 7 - octave 2 - note B_, 6 - note_type 12, 10, 0 - octave 3 - note D_, 6 - note_type 12, 11, 7 - note F#, 4 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 - octave 2 - note B_, 4 - octave 3 - note F#, 4 - note F_, 4 - note F#, 12 - note A#, 4 - note_type 12, 5, -6 - note B_, 12 - note_type 12, 11, 2 - note E_, 3 - note E_, 3 - note E_, 2 - note E_, 1 - note F#, 1 - note E_, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 - note_type 12, 12, 2 - note E_, 1 - note F#, 1 - note B_, 1 - note F#, 1 - note_type 12, 13, 2 - note E_, 1 - note F#, 1 - note B_, 1 - note_type 12, 12, 1 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 3 - note_type 12, 11, 5 - note D_, 4 - note_type 12, 12, 1 - note E_, 1 - note E_, 3 - note_type 12, 11, 5 - note F_, 4 - note_type 12, 12, 1 - note E_, 1 - note E_, 3 - note_type 12, 11, 5 - note D_, 4 - note_type 12, 12, 1 - note E_, 1 - note_type 12, 11, 7 - note E_, 7 - note_type 12, 12, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 1 - note E_, 2 - note B_, 1 - note A_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 3 - note E_, 1 - note D_, 1 - note F_, 2 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note F_, 2 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note F_, 2 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note F_, 2 - octave 4 - note C_, 1 - octave 3 - note B_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 3 - note F_, 1 - note E_, 1 - note F#, 2 - octave 4 - note C#, 1 - note C_, 1 - octave 3 - note F#, 2 - octave 4 - note C#, 1 - note C_, 1 - octave 3 - note F#, 2 - octave 4 - note C#, 1 - note C_, 1 - octave 3 - note F#, 2 - octave 4 - note C#, 1 - note C_, 3 - octave 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note F#, 1 - note F_, 3 - note_type 12, 11, 7 - octave 4 - note C_, 2 - note_type 12, 11, 0 - note C#, 8 - note_type 12, 11, 7 - note C#, 8 - note_type 12, 10, 0 - octave 3 - note F#, 8 - note F#, 8 - note_type 12, 11, 0 - octave 3 - note A_, 8 - note_type 12, 11, 7 - note A_, 8 - note G_, 4 - note B_, 12 - note_type 12, 11, 0 - note A_, 8 - note_type 12, 11, 7 - note A_, 8 - note_type 12, 11, 0 - note E_, 8 - note_type 12, 11, 7 - note E_, 8 - note_type 12, 11, 0 - note A#, 8 - note_type 12, 11, 7 - note A#, 8 - octave 4 - note F_, 8 - octave 3 - note A#, 8 - octave 4 - note C#, 4 - note E_, 12 - octave 3 - note A_, 4 - octave 4 - note C#, 12 - note_type 12, 4, 0 - sound_call Music_FinalBattle_Ch2.sub2 - sound_call Music_FinalBattle_Ch2.sub2 - note_type 12, 11, 7 - octave 3 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 - octave 2 - note B_, 4 - octave 3 - note F#, 4 - note F_, 4 - note F#, 12 - note_type 12, 11, 0 - note A_, 8 - note G_, 8 - note_type 12, 11, 7 - note E_, 4 - note B_, 4 - note D#, 4 - note A#, 4 - note D_, 4 - note A_, 4 - octave 2 - note B_, 4 - octave 3 - note F#, 4 - note F_, 4 - note F#, 12 - note_type 12, 11, 0 - note A_, 8 - note_type 12, 11, 7 - octave 4 - note C_, 8 - note_type 12, 11, 0 - octave 3 - note B_, 8 - note_type 12, 11, 7 - note B_, 8 - note_type 12, 11, 0 - octave 4 - note E_, 8 - note_type 12, 11, 7 - note E_, 8 - sound_loop 0, .mainloop - -Music_FinalBattle_Ch2:: - duty_cycle 3 - vibrato 8, 2, 5 - note_type 12, 12, 2 - octave 5 - note C_, 1 - octave 4 - note G#, 1 - note B_, 1 - note F#, 1 - note A_, 1 - note E_, 1 - note G_, 1 - octave 5 - note C_, 1 - octave 4 - note F_, 1 - note C#, 1 - note E_, 1 - note C_, 1 - note D#, 1 - octave 3 - note B_, 1 - octave 4 - note D_, 1 - octave 5 - note C_, 1 - octave 4 - note C_, 1 - octave 3 - note G#, 1 - note B_, 1 - note F#, 1 - note A#, 1 - note F_, 1 - note A_, 1 - octave 5 - note C_, 1 - octave 3 - note G#, 1 - note D#, 1 - note G_, 1 - note D_, 1 - note F_, 1 - note C#, 1 - note E_, 1 - octave 5 - note C_, 1 - note_type 12, 12, 1 - octave 4 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 7 - note E_, 1 - note E_, 3 - note_type 12, 12, 2 - octave 5 - note E_, 4 - note_type 12, 12, 1 - octave 4 - note E_, 1 - note E_, 3 - note_type 12, 12, 2 - octave 5 - note E_, 4 - note_type 12, 12, 1 - octave 4 - note E_, 1 - note E_, 3 - note_type 12, 12, 2 - octave 5 - note E_, 4 - note_type 12, 12, 1 - octave 4 - note E_, 1 - note E_, 3 - note_type 12, 12, 2 - note D#, 4 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - note_type 12, 12, 1 - octave 4 - note E_, 1 - note E_, 3 - note_type 12, 4, -2 - octave 3 - note G#, 4 -.mainloop: - note_type 12, 13, 7 - octave 4 - note E_, 8 - note D#, 8 - note D_, 8 - octave 3 - note B_, 8 - note_type 12, 13, 7 - note A#, 4 - note B_, 12 - note_type 12, 11, 1 - note F_, 2 - note F#, 3 - note A_, 1 - note B_, 1 - note A_, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 2 - note A_, 1 - note B_, 1 - note B_, 1 - note A_, 1 - note A#, 1 - note_type 12, 13, 7 - octave 4 - note E_, 8 - note D#, 8 - note D_, 8 - octave 3 - note B_, 8 - note_type 12, 13, 7 - note A#, 4 - note B_, 12 - octave 4 - note D#, 4 - note E_, 12 - note_type 12, 10, 0 - octave 3 - note B_, 8 - octave 4 - note D_, 8 - note F_, 8 - note D_, 8 - note_type 12, 13, 1 - note E_, 1 - note E_, 3 - note_type 12, 12, 4 - octave 3 - note D_, 4 - note_type 12, 13, 1 - octave 4 - note E_, 1 - note E_, 3 - note_type 12, 12, 4 - octave 3 - note F_, 4 - note_type 12, 13, 1 - octave 4 - note E_, 1 - note E_, 3 - note_type 12, 12, 4 - octave 3 - note D_, 4 - note_type 12, 13, 1 - octave 4 - note E_, 1 - note E_, 1 - note_type 12, 12, 4 - octave 2 - note B_, 4 - octave 3 - note D_, 2 - note_type 12, 12, 2 - octave 4 - note E_, 1 - note E_, 1 - note D_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note F_, 1 - note E_, 1 - note E_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note E_, 1 - note_type 12, 12, 4 - octave 2 - note B_, 4 - octave 3 - note D_, 2 - note_type 12, 13, 7 - octave 4 - note E_, 4 - note F_, 2 - note F#, 12 - note_type 12, 12, 2 - octave 3 - note B_, 2 - note B_, 4 - note B_, 2 - note B_, 4 - note B_, 2 - note_type 12, 13, 7 - octave 4 - note F_, 4 - note F#, 2 - note G_, 12 - note_type 12, 12, 2 - note C_, 2 - note C_, 4 - note C_, 2 - note C_, 4 - note C_, 2 - note_type 12, 13, 7 - note F#, 4 - note G_, 2 - note G#, 12 - note_type 12, 8, 2 - note C#, 2 - note C#, 4 - note_type 12, 10, 2 - note C#, 2 - note C#, 4 - note C#, 4 - note_type 12, 13, 2 - note C#, 2 - note C#, 4 - note_type 12, 15, 2 - note C#, 2 - note C#, 4 - note_type 12, 12, 4 - note E_, 1 - note F_, 1 - note_type 12, 12, 0 - note F#, 12 - note_type 12, 12, 7 - note F#, 4 - note_type 12, 1, -7 - octave 3 - note F#, 8 - note_type 12, 9, 0 - note F#, 8 - note_type 12, 12, 7 - octave 4 - note C#, 4 - note_type 12, 12, 0 - note D_, 12 - note D_, 8 - note_type 12, 12, 7 - note D_, 8 - note_type 12, 12, 0 - note E_, 8 - note_type 12, 12, 7 - note E_, 8 - note_type 12, 12, 0 - octave 3 - note A_, 8 - note_type 12, 12, 7 - note A_, 8 - note_type 12, 12, 0 - octave 4 - note F_, 8 - note_type 12, 12, 7 - note F_, 8 - octave 5 - note C_, 8 - octave 4 - note A#, 8 - note_type 12, 12, 0 - note A_, 16 - note A_, 8 - note_type 12, 12, 7 - note A_, 8 - note_type 12, 12, 5 - sound_call .sub2 - note_type 12, 11, 1 - sound_call .sub2 - note_type 12, 13, 7 - octave 4 - note E_, 8 - note D#, 8 - note D_, 8 - octave 3 - note B_, 8 - note A#, 4 - note B_, 12 - note_type 12, 12, 7 - octave 4 - note D_, 8 - note_type 12, 4, -4 - note C_, 8 - note_type 12, 13, 7 - note E_, 8 - note D#, 8 - note D_, 8 - octave 3 - note B_, 8 - note A#, 4 - note B_, 12 - note_type 12, 5, -5 - octave 4 - note D_, 8 - note_type 12, 12, 0 - note F_, 8 - note_type 12, 12, 0 - note E_, 8 - note_type 12, 12, 7 - note E_, 8 - note A#, 4 - note B_, 12 - sound_loop 0, .mainloop - -.sub1: - octave 4 - note E_, 1 - note E_, 1 - note G_, 1 - octave 5 - note C_, 1 - note E_, 1 - note C_, 1 - octave 4 - note G_, 1 - note F_, 1 - sound_ret - -.sub2: - octave 4 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D_, 2 - note C#, 2 - note F#, 2 - note D_, 2 - sound_ret - -Music_FinalBattle_Ch3:: - note_type 12, 1, 1 - octave 4 - note E_, 4 - octave 5 - note E_, 4 - octave 4 - note F_, 4 - octave 5 - note D#, 4 - octave 4 - note G_, 4 - octave 5 - note D_, 4 - octave 4 - note G#, 4 - note B_, 4 - note E_, 1 - note E_, 1 - rest 6 - note E_, 1 - note E_, 1 - rest 6 - note E_, 1 - note E_, 1 - rest 6 - note E_, 1 - note E_, 1 - rest 2 - note D#, 4 - note E_, 1 - note E_, 1 - rest 2 - note B_, 4 - note E_, 1 - note E_, 1 - rest 2 - octave 5 - note C_, 4 - octave 4 - note E_, 1 - note E_, 1 - rest 2 - octave 5 - note D_, 4 - octave 4 - note E_, 1 - note E_, 1 - octave 5 - note C_, 4 - octave 4 - note A#, 2 - note E_, 1 - note E_, 1 - rest 2 - note B_, 4 - note E_, 1 - note E_, 1 - rest 2 - octave 5 - note C_, 4 - octave 4 - note E_, 1 - note E_, 1 - rest 2 - octave 5 - note D_, 4 - octave 4 - note E_, 1 - note E_, 1 - octave 5 - note C_, 4 - note D_, 2 - octave 4 - note E_, 1 - note E_, 1 - rest 2 - note B_, 4 - note E_, 1 - note E_, 1 - rest 2 - octave 5 - note C_, 4 - octave 4 - note E_, 1 - note E_, 1 - rest 2 - octave 5 - note D_, 4 - octave 4 - note E_, 1 - note E_, 1 - rest 2 - note E_, 1 - note D#, 1 - note E_, 1 - note G_, 1 -.mainloop: - octave 4 - note E_, 1 - octave 3 - note E_, 1 - rest 2 - octave 4 - note F#, 4 - note D#, 1 - octave 3 - note D#, 1 - rest 2 - octave 4 - note F_, 4 - note D_, 1 - octave 3 - note D_, 1 - rest 2 - octave 4 - note E_, 4 - note F#, 1 - octave 3 - note F#, 1 - rest 2 - octave 4 - note F#, 4 - note F_, 4 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - note E_, 1 - octave 3 - note E_, 1 - rest 2 - octave 4 - note F#, 4 - note D#, 1 - octave 3 - note D#, 1 - rest 2 - octave 4 - note F_, 4 - note D_, 1 - octave 3 - note D_, 1 - rest 2 - octave 4 - note E_, 4 - note F#, 1 - octave 3 - note F#, 1 - rest 2 - octave 4 - note F#, 4 - note F_, 4 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 1 - note E_, 1 - rest 2 - note D_, 4 - note E_, 1 - note E_, 1 - rest 2 - note F_, 4 - note E_, 1 - note E_, 1 - rest 2 - note D_, 4 - note E_, 1 - note E_, 1 - octave 3 - note B_, 6 - octave 4 - note E_, 1 - note E_, 1 - rest 2 - note D_, 4 - note E_, 1 - note E_, 1 - rest 2 - note F_, 4 - note E_, 1 - note E_, 1 - rest 2 - note D_, 4 - note E_, 1 - note E_, 1 - octave 3 - note B_, 6 - octave 4 - note E_, 2 - octave 5 - note D_, 2 - octave 4 - note E_, 2 - octave 5 - note D_, 2 - octave 4 - note E_, 2 - octave 5 - note D_, 2 - octave 4 - note E_, 2 - octave 5 - note D_, 2 - octave 4 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - octave 5 - note C#, 2 - octave 4 - note B_, 2 - note F_, 2 - octave 5 - note D#, 2 - octave 4 - note F_, 2 - octave 5 - note D#, 2 - octave 4 - note F_, 2 - octave 5 - note D#, 2 - octave 4 - note F_, 2 - octave 5 - note D#, 2 - octave 4 - note F_, 2 - octave 5 - note C_, 2 - note C_, 2 - octave 4 - note F_, 2 - octave 5 - note C_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - octave 4 - note F#, 2 - octave 5 - note E_, 2 - octave 4 - note F#, 2 - octave 5 - note E_, 2 - octave 4 - note F#, 2 - octave 5 - note E_, 2 - octave 4 - note F#, 2 - octave 5 - note E_, 2 - octave 4 - note F#, 2 - octave 5 - note C#, 2 - note C#, 2 - octave 4 - note F#, 2 - octave 5 - note C#, 2 - note C#, 2 - note E_, 2 - note C#, 2 - octave 4 - note F#, 2 - octave 5 - note C#, 2 - note C#, 2 - octave 4 - note F#, 2 - octave 5 - note C#, 2 - note C#, 2 - note E_, 2 - note C#, 2 - sound_call .sub1 - sound_call .sub1 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - sound_call .sub2 - sound_call .sub2 - octave 4 - note A#, 2 - octave 5 - note F_, 2 - octave 4 - note A#, 2 - octave 5 - note F_, 2 - octave 4 - note A#, 2 - octave 5 - note F_, 2 - octave 4 - note A#, 2 - octave 5 - note F_, 2 - octave 4 - note A#, 2 - octave 5 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C#, 2 - octave 4 - note A#, 2 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - note G#, 2 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note D#, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note F#, 2 - note F_, 2 - note E_, 2 - note B_, 2 - octave 5 - note E_, 4 - octave 4 - note E_, 2 - note B_, 2 - octave 5 - note D#, 4 - octave 4 - note E_, 2 - note B_, 2 - octave 5 - note D_, 4 - octave 4 - note E_, 2 - note A_, 2 - note B_, 4 - sound_loop 0, .mainloop - -.sub1: - octave 4 - note F#, 2 - octave 5 - note C#, 2 - octave 4 - note F#, 2 - octave 5 - note C#, 2 - octave 4 - note F#, 2 - octave 5 - note C#, 2 - octave 4 - note F#, 2 - octave 5 - note C#, 2 - sound_ret - -.sub2: - octave 4 - note A_, 2 - octave 5 - note E_, 2 - octave 4 - note A_, 2 - octave 5 - note E_, 2 - octave 4 - note A_, 2 - octave 5 - note E_, 2 - octave 4 - note A_, 2 - octave 5 - note E_, 2 - sound_ret diff --git a/audio/music/gamecorner.asm b/audio/music/gamecorner.asm deleted file mode 100644 index c0f8fc83..00000000 --- a/audio/music/gamecorner.asm +++ /dev/null @@ -1,622 +0,0 @@ -Music_GameCorner_Ch1:: - tempo 120 - volume 7, 7 - duty_cycle 3 - vibrato 12, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 5 - octave 3 - note A_, 6 - note_type 12, 11, 1 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note C#, 2 - note D#, 16 -.mainloop: - note_type 12, 11, 5 - octave 3 - note C#, 4 - octave 2 - note G#, 4 - octave 3 - note E_, 4 - octave 2 - note B_, 4 - octave 3 - note A_, 2 - note G#, 8 - note_type 12, 10, 7 - note G#, 2 - note A_, 2 - note B_, 2 - note_type 12, 11, 5 - note G#, 6 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note_type 12, 10, 7 - note F#, 8 - note D#, 8 - note_type 12, 11, 5 - note D#, 4 - octave 2 - note B_, 4 - octave 3 - note F#, 4 - note D#, 4 - note B_, 2 - note A_, 8 - note_type 12, 11, 7 - octave 4 - note E_, 2 - note D#, 2 - note E_, 2 - note D#, 6 - note C#, 2 - octave 3 - note D#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note G#, 2 - note_type 12, 9, 7 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 2 - note_type 12, 11, 7 - note F#, 8 - note_type 12, 11, 5 - note C#, 4 - octave 2 - note G#, 4 - octave 3 - note E_, 4 - octave 2 - note B_, 4 - octave 3 - note A_, 2 - note G#, 8 - note_type 12, 11, 7 - note G#, 2 - note A_, 2 - note B_, 2 - note G#, 6 - note E_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 8 - note_type 12, 9, 7 - note D#, 4 - note C#, 4 - note_type 12, 11, 5 - note D#, 4 - octave 2 - note B_, 4 - octave 3 - note F#, 4 - note D#, 4 - note B_, 2 - note A_, 8 - note_type 12, 11, 7 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 4 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note_type 12, 12, 2 - note E_, 4 - octave 2 - note B_, 4 - octave 3 - note E_, 2 - note E_, 4 - note E_, 4 - note_type 12, 11, 7 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note D_, 2 - note D#, 10 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note D#, 2 - note E_, 8 - note_type 12, 11, 5 - octave 4 - note D#, 4 - octave 3 - note B_, 4 - note F#, 4 - note D#, 4 - note_type 12, 11, 7 - note E_, 3 - note D#, 1 - note_type 12, 11, 2 - note C#, 2 - note D#, 2 - note E_, 10 - note_type 12, 11, 7 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note D_, 2 - note D#, 10 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note D#, 2 - note E_, 8 - note_type 12, 11, 5 - octave 4 - note D#, 4 - octave 3 - note B_, 4 - note F#, 4 - note A_, 4 - note_type 12, 11, 7 - note G#, 2 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note G#, 8 - sound_loop 0, .mainloop - -Music_GameCorner_Ch2:: - duty_cycle 2 - vibrato 10, 2, 3 - note_type 12, 12, 6 - octave 4 - note C#, 6 - note_type 12, 12, 1 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - duty_cycle 3 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 8 -.mainloop: - duty_cycle 2 - note_type 12, 12, 7 - octave 3 - note E_, 4 - octave 2 - note B_, 4 - octave 3 - note G#, 4 - note E_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 14 - octave 4 - note E_, 6 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 16 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - octave 4 - note D#, 2 - note C#, 14 - note F#, 6 - note E_, 2 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A#, 2 - note B_, 16 - note E_, 4 - octave 2 - note B_, 4 - octave 3 - note G#, 4 - note E_, 4 - octave 4 - note C#, 2 - octave 3 - note B_, 14 - octave 4 - note E_, 6 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 16 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - octave 4 - note D#, 2 - note C#, 14 - note F#, 6 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note_type 12, 12, 1 - note E_, 2 - note_type 12, 10, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 2 - note_type 12, 12, 7 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D_, 2 - note D#, 10 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note E_, 10 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note_type 12, 12, 5 - note F#, 4 - note D#, 4 - octave 3 - note B_, 4 - octave 4 - note A_, 4 - note G#, 3 - note A_, 1 - note_type 12, 12, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note_type 12, 12, 7 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D_, 2 - note D#, 10 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note E_, 10 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note F#, 4 - note D#, 4 - note A_, 4 - note F#, 4 - note B_, 16 - sound_loop 0, .mainloop - -Music_GameCorner_Ch3:: - note_type 12, 1, 3 - octave 5 - note C#, 1 - rest 5 - octave 4 - note F#, 1 - rest 1 - note G#, 1 - rest 1 - note A_, 1 - rest 1 - note A#, 1 - rest 1 - note A#, 1 - rest 1 - note B_, 1 - rest 9 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C#, 1 - rest 1 - note D#, 1 - rest 1 -.mainloop: - sound_call .sub1 - sound_call .sub2 - sound_call .sub3 - sound_call .sub4 - sound_call .sub5 - sound_call .sub6 - sound_call .sub7 - note D#, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - note D#, 1 - rest 1 - note A_, 1 - rest 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - sound_call .sub1 - sound_call .sub2 - sound_call .sub3 - sound_call .sub4 - sound_call .sub5 - sound_call .sub6 - sound_call .sub7 - note E_, 1 - rest 3 - octave 3 - note B_, 1 - rest 3 - octave 4 - note E_, 1 - rest 1 - note E_, 1 - rest 3 - note B_, 1 - rest 1 - sound_call .sub5 - sound_call .sub1 - sound_call .sub8 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - sound_call .sub5 - sound_call .sub1 - sound_call .sub8 - sound_call .sub2 - sound_loop 0, .mainloop - -.sub1: - note E_, 1 - rest 1 - note G#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - sound_ret - -.sub2: - note E_, 1 - rest 1 - note G#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - sound_ret - -.sub3: - note E_, 1 - rest 1 - note B_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - sound_ret - -.sub4: - note D#, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - note D#, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - sound_ret - -.sub5: - note D#, 1 - rest 1 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - note D#, 1 - rest 1 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - sound_ret - -.sub6: - note D#, 1 - rest 1 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - note D#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - sound_ret - -.sub7: - note F#, 1 - rest 1 - note B_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - sound_ret - -.sub8: - note F#, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - sound_ret diff --git a/audio/music/gym.asm b/audio/music/gym.asm deleted file mode 100644 index da6a5bab..00000000 --- a/audio/music/gym.asm +++ /dev/null @@ -1,352 +0,0 @@ -Music_Gym_Ch1:: - tempo 138 - volume 7, 7 - duty_cycle 3 - vibrato 8, 2, 2 - toggle_perfect_pitch - note_type 12, 11, 5 - octave 3 - note G_, 6 - note C_, 1 - note G_, 1 - note F_, 6 - octave 2 - note A#, 1 - octave 3 - note F_, 1 - note E_, 6 - octave 2 - note A_, 1 - octave 3 - note E_, 1 - note F_, 4 - note G_, 4 -.mainloop: - note E_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note_type 12, 11, 1 - note D_, 3 - note_type 12, 11, 5 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note E_, 4 - note F_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - octave 4 - note C_, 4 - octave 3 - note A#, 2 - octave 4 - note C_, 2 - octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note_type 12, 11, 1 - note A#, 3 - note_type 12, 11, 5 - note F_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - octave 4 - note C_, 4 - octave 3 - note A#, 2 - octave 4 - note C_, 2 - octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F_, 4 - note A#, 2 - note F_, 1 - note A#, 1 - octave 4 - note D_, 4 - octave 3 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note C_, 1 - note D_, 1 - note E_, 4 - note C_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note E_, 2 - note C_, 1 - note E_, 1 - note F_, 4 - note E_, 2 - note D_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note E_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note C_, 2 - note C_, 1 - note D_, 1 - note E_, 4 - note D_, 2 - note E_, 2 - note F_, 2 - note F_, 2 - note G_, 2 - note E_, 1 - note G_, 1 - note A#, 2 - octave 4 - note C_, 2 - octave 3 - note A#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - sound_loop 0, .mainloop - -Music_Gym_Ch2:: - duty_cycle 3 - vibrato 10, 2, 5 - note_type 12, 12, 7 - octave 4 - note C_, 6 - octave 3 - note G_, 1 - octave 4 - note C_, 1 - octave 3 - note A#, 6 - note F_, 1 - note A#, 1 - note_type 12, 10, 0 - note A_, 12 - note_type 12, 12, 7 - note B_, 4 -.mainloop: - octave 4 - note C_, 12 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - note_type 12, 12, 2 - note D_, 3 - octave 3 - note A#, 1 - note_type 12, 12, 7 - note A#, 12 - octave 4 - note C_, 12 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - note_type 12, 12, 4 - octave 3 - note A#, 2 - note_type 12, 12, 7 - note A#, 1 - octave 4 - note C_, 1 - note D_, 12 - note E_, 12 - note D_, 2 - note E_, 2 - note_type 12, 12, 2 - note F_, 3 - note D_, 1 - note_type 12, 12, 7 - note D_, 4 - note_type 12, 12, 2 - note A#, 3 - note F_, 1 - note_type 12, 12, 7 - note F_, 4 - note E_, 12 - note D_, 2 - note E_, 2 - note F_, 2 - note D_, 1 - note F_, 1 - note A#, 12 - octave 3 - note G_, 6 - octave 4 - note C_, 6 - octave 3 - note G_, 4 - note A#, 4 - note A_, 4 - note G_, 4 - note F_, 4 - note_type 12, 12, 3 - note E_, 2 - note_type 12, 12, 7 - note E_, 1 - note F_, 1 - note G_, 6 - note G_, 2 - octave 4 - note C_, 2 - octave 3 - note G_, 2 - note A#, 4 - note A_, 4 - note G_, 4 - note C_, 2 - note D_, 2 - note G_, 6 - octave 4 - note C_, 6 - octave 3 - note G_, 4 - note A#, 4 - note A_, 4 - note G_, 4 - note F_, 4 - note_type 12, 12, 3 - note E_, 2 - note_type 12, 12, 7 - note E_, 1 - note F_, 1 - note G_, 4 - note_type 12, 12, 3 - note G_, 2 - note_type 12, 12, 7 - note G_, 1 - note A_, 1 - note A#, 4 - note_type 12, 12, 4 - octave 4 - note C_, 2 - note_type 12, 12, 7 - note C_, 1 - note D_, 1 - note E_, 12 - sound_loop 0, .mainloop - -Music_Gym_Ch3:: - note_type 12, 1, 1 - rest 16 - rest 10 - octave 4 - note G_, 2 - note F_, 2 - note D_, 2 -.mainloop: - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub3 - sound_call .sub1 - sound_call .sub3 - sound_call .sub1 - sound_call .sub3 - sound_call .sub1 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note A_, 2 - note F_, 2 - sound_loop 0, .mainloop - -.sub1: - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - sound_ret - -.sub2: - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - sound_ret - -.sub3: - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - note F_, 2 - note A#, 2 - sound_ret diff --git a/audio/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm deleted file mode 100644 index 1d7dae9a..00000000 --- a/audio/music/gymleaderbattle.asm +++ /dev/null @@ -1,1395 +0,0 @@ -Music_GymLeaderBattle_Ch1:: - tempo 104 - volume 7, 7 - duty_cycle 3 - vibrato 8, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 3 - rest 6 - octave 3 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 1 - note G#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note B_, 1 - octave 2 - note F#, 1 - rest 15 - note F#, 1 - rest 9 - note G_, 6 - note F#, 1 - rest 15 - note F#, 1 - rest 9 - note F_, 6 - note F#, 1 - rest 15 - note F#, 1 - rest 9 - note G_, 6 - note F#, 1 - rest 15 - note F#, 1 - rest 9 - note A_, 6 -.mainloop: - note F#, 1 - octave 3 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - octave 2 - note E_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - note F#, 1 - octave 3 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - note C#, 1 - octave 2 - note E_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - octave 3 - note C#, 1 - octave 2 - note B_, 1 - note A_, 1 - rest 2 - octave 1 - note B_, 1 - rest 1 - octave 2 - note D_, 4 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 2 - note E_, 4 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 2 - note D_, 4 - octave 1 - note B_, 1 - rest 1 - octave 2 - note C#, 2 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 2 - note D_, 4 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 2 - note E_, 4 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 2 - note D_, 4 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 2 - note C#, 2 - octave 1 - note B_, 2 - note A_, 2 - octave 2 - note C#, 2 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - rest 16 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note B_, 1 - octave 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note_type 12, 11, 5 - octave 3 - note C#, 12 - note_type 12, 11, 3 - octave 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note_type 12, 11, 5 - octave 3 - note A_, 12 - note_type 12, 11, 3 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note F#, 2 - note B_, 2 - note F#, 2 - note D#, 2 - note F#, 2 - octave 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note_type 12, 11, 5 - octave 3 - note A_, 12 - note_type 12, 11, 3 - note C#, 1 - octave 2 - note B_, 1 - octave 3 - note C#, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F#, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note F#, 1 - note E_, 1 - note D#, 1 - note C#, 1 - note_type 12, 11, 5 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note E_, 2 - note D#, 4 - note C#, 6 - rest 16 - rest 10 - note E_, 6 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note E_, 4 - note D#, 2 - note C#, 4 - octave 2 - note B_, 6 - octave 3 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note A_, 2 - note G#, 4 - note E_, 6 - sound_loop 0, .mainloop - -Music_GymLeaderBattle_Ch2:: - duty_cycle 3 - vibrato 8, 2, 5 - note_type 12, 12, 3 - octave 4 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - rest 5 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note B_, 1 - rest 15 - note B_, 1 - rest 9 - octave 4 - note C_, 6 - octave 3 - note B_, 1 - rest 15 - note B_, 1 - rest 9 - note A#, 6 - octave 3 - note B_, 1 - rest 15 - note B_, 1 - rest 9 - octave 4 - note C_, 6 - octave 3 - note B_, 1 - rest 15 - note B_, 1 - rest 9 - octave 4 - note C#, 6 -.mainloop: - note_type 12, 12, 5 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note_type 12, 11, 7 - duty_cycle 2 - octave 3 - note A_, 8 - octave 4 - note C#, 8 - note E_, 8 - note C#, 8 - note_type 12, 12, 5 - duty_cycle 3 - note D#, 4 - note C#, 4 - note D#, 4 - note E_, 2 - note F#, 4 - note E_, 4 - note D#, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note_type 12, 11, 7 - duty_cycle 2 - note C#, 8 - octave 3 - note B_, 8 - note A_, 8 - note_type 12, 12, 3 - octave 4 - note E_, 4 - note E_, 2 - note C#, 2 - note_type 12, 12, 5 - duty_cycle 3 - octave 1 - note B_, 1 - rest 3 - octave 3 - note D_, 1 - note C#, 1 - octave 2 - note B_, 1 - octave 3 - note D_, 1 - rest 4 - note E_, 1 - note D_, 1 - octave 2 - note B_, 1 - octave 3 - note E_, 1 - rest 4 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - rest 2 - note E_, 1 - note C#, 1 - note E_, 1 - rest 1 - note F_, 1 - rest 1 - note D_, 1 - note C#, 1 - octave 2 - note B_, 1 - octave 3 - note D_, 1 - rest 4 - note E_, 1 - note D_, 1 - octave 2 - note B_, 1 - octave 3 - note E_, 1 - rest 4 - note F#, 1 - note E_, 1 - note C#, 1 - note F#, 1 - note E_, 1 - rest 1 - note C#, 1 - rest 1 - note D_, 1 - rest 1 - note C#, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - octave 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - note_type 12, 11, 0 - octave 3 - note B_, 4 - octave 4 - note C_, 4 - octave 3 - note A_, 4 - note B_, 4 - octave 4 - note C_, 4 - octave 3 - note A_, 4 - note G_, 4 - note_type 12, 11, 0 - note F#, 8 - note_type 12, 11, 7 - note F#, 8 - note_type 12, 12, 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 - note_type 12, 11, 0 - octave 3 - note B_, 4 - octave 4 - note C_, 4 - octave 3 - note A_, 4 - note B_, 4 - octave 4 - note C_, 4 - octave 3 - note A_, 4 - octave 4 - note C_, 4 - note_type 12, 11, 0 - octave 3 - note B_, 16 - note_type 12, 3, -7 - octave 4 - note F#, 16 - note_type 12, 12, 3 - duty_cycle 3 - octave 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note_type 12, 12, 7 - octave 3 - note A_, 12 - note_type 12, 12, 3 - octave 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note_type 12, 12, 7 - octave 4 - note C#, 12 - note_type 12, 11, 0 - note D#, 16 - note_type 12, 11, 7 - note D#, 16 - note_type 12, 12, 3 - octave 1 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - note_type 12, 12, 7 - octave 4 - note C#, 12 - note_type 12, 12, 0 - note A_, 8 - note E_, 8 - note B_, 16 - note_type 12, 12, 7 - note B_, 16 - note_type 12, 12, 4 - octave 3 - note D#, 4 - note E_, 4 - note C#, 2 - note D#, 6 - note F#, 4 - note A_, 2 - note G#, 4 - rest 2 - note B_, 1 - octave 4 - note D#, 1 - note F#, 1 - note A#, 1 - note_type 12, 12, 0 - note B_, 16 - note F#, 16 - note A_, 16 - octave 5 - note C#, 8 - rest 2 - note_type 12, 12, 3 - octave 4 - note A_, 6 - sound_loop 0, .mainloop - -Music_GymLeaderBattle_Ch3:: - vibrato 0, 2, 0 - note_type 12, 1, 3 - rest 12 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C_, 6 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F_, 6 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C_, 6 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C#, 6 - note_type 12, 1, 4 -.mainloop: - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 4 - note D_, 4 - octave 3 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 4 - note E_, 4 - octave 3 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 4 - note D_, 4 - octave 3 - note B_, 1 - rest 1 - octave 4 - note C#, 2 - octave 3 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 4 - note D_, 4 - octave 3 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 4 - note E_, 4 - octave 3 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 4 - note D_, 4 - octave 3 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 1 - rest 1 - note B_, 1 - rest 13 - note B_, 1 - rest 1 - note B_, 1 - rest 13 - note B_, 1 - rest 1 - note B_, 1 - rest 13 - note B_, 1 - rest 1 - note B_, 1 - rest 13 - note B_, 1 - rest 1 - note B_, 1 - rest 13 - note B_, 1 - rest 1 - note B_, 1 - rest 13 - note B_, 1 - rest 1 - note B_, 1 - rest 13 - note B_, 1 - rest 1 - note B_, 1 - rest 13 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 4 - note C#, 12 - octave 3 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 4 - note E_, 12 - note D#, 16 - octave 3 - note B_, 16 - note A_, 1 - rest 1 - note A_, 1 - rest 1 - octave 4 - note E_, 12 - note C#, 8 - note E_, 8 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note E_, 6 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note G_, 6 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note C_, 6 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note F#, 2 - octave 3 - note B_, 2 - octave 4 - note G_, 6 - sound_loop 0, .mainloop diff --git a/audio/music/halloffame.asm b/audio/music/halloffame.asm deleted file mode 100644 index f568b2e2..00000000 --- a/audio/music/halloffame.asm +++ /dev/null @@ -1,93 +0,0 @@ -Music_HallOfFame_Ch1:: - tempo 112 - volume 7, 7 - duty_cycle 3 - vibrato 12, 2, 2 - toggle_perfect_pitch - note_type 12, 11, 3 - rest 16 - rest 16 - rest 16 - rest 12 - octave 3 - note D_, 1 - note E_, 1 - note F_, 1 - note F#, 1 -.mainloop: -.loop1: - note_type 12, 8, 0 - octave 4 - note C_, 16 - note E_, 16 - note F#, 16 - note_type 12, 6, 0 - note F_, 16 - sound_loop 3, .loop1 - rest 16 - rest 16 - rest 16 - rest 16 - sound_loop 0, .mainloop - -Music_HallOfFame_Ch2:: - vibrato 8, 2, 5 - duty_cycle 3 -.mainloop: - note_type 12, 12, 4 - octave 3 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 10 - note G_, 2 - note D_, 2 - note G_, 2 - octave 4 - note C_, 4 - octave 3 - note B_, 4 - note A_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 10 - note F_, 2 - note C_, 2 - note F_, 2 - note A#, 4 - note A_, 4 - note F_, 2 - sound_loop 0, .mainloop - -Music_HallOfFame_Ch3:: -.mainloop: - note_type 12, 1, 2 -.loop1: - octave 4 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - sound_loop 12, .loop1 - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 - note E_, 4 - note G_, 4 - note E_, 4 - note G_, 4 - note F#, 4 - note A_, 4 - note F#, 4 - note A_, 4 - note E_, 4 - note G_, 4 - note E_, 4 - note G_, 4 - sound_loop 0, .mainloop diff --git a/audio/music/indigoplateau.asm b/audio/music/indigoplateau.asm deleted file mode 100644 index c93fd859..00000000 --- a/audio/music/indigoplateau.asm +++ /dev/null @@ -1,314 +0,0 @@ -Music_IndigoPlateau_Ch1:: - tempo 132 - volume 7, 7 - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 2 - octave 2 - note A_, 8 - note A_, 8 - note A_, 8 - note A_, 4 - note_type 12, 10, 4 - note A#, 4 -.mainloop: - sound_call .sub1 - note_type 12, 11, 4 - octave 3 - note D_, 4 - sound_call .sub1 - note_type 12, 11, 4 - octave 3 - note D#, 4 - sound_call .sub1 - note_type 12, 11, 4 - octave 3 - note D_, 4 - sound_call .sub1 - note_type 12, 10, 0 - octave 2 - note A#, 4 - sound_call .sub1 - note_type 12, 11, 4 - octave 3 - note D_, 4 - note_type 12, 13, 4 - octave 3 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note_type 12, 11, 4 - octave 3 - note D#, 4 - note_type 12, 13, 4 - octave 3 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note A#, 4 - note_type 12, 11, 4 - octave 3 - note F_, 2 - note_type 12, 11, 4 - octave 3 - note G_, 2 - note_type 12, 11, 0 - note A_, 8 - octave 2 - note A_, 8 - note_type 12, 11, 7 - octave 3 - note F_, 8 - note_type 12, 4, -6 - octave 2 - note A#, 8 - sound_loop 0, .mainloop - -.sub1: - note_type 12, 11, 2 - octave 2 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - note A_, 4 - sound_ret - -Music_IndigoPlateau_Ch2:: - duty_cycle 3 - vibrato 8, 2, 5 - note_type 12, 12, 2 - octave 3 - note D_, 8 - note D_, 8 - note D_, 8 - note D_, 4 - note_type 12, 5, -2 - note D#, 4 -.mainloop: - sound_call .sub1 - note_type 12, 12, 5 - note A_, 4 - sound_call .sub1 - note_type 12, 12, 5 - note A#, 4 - sound_call .sub1 - note_type 12, 12, 5 - note A_, 4 - sound_call .sub1 - note_type 12, 12, 7 - note C#, 4 - sound_call .sub1 - note_type 12, 12, 5 - note A_, 4 - sound_call .sub1 - note_type 12, 12, 5 - note A#, 4 - sound_call .sub1 - note_type 12, 12, 5 - octave 4 - note C_, 2 - note_type 12, 12, 7 - octave 4 - note C#, 2 - note D_, 8 - octave 3 - note D_, 8 - octave 4 - note C_, 8 - note_type 12, 4, -5 - octave 4 - note D#, 8 - sound_loop 0, .mainloop - -.sub1: - note_type 12, 12, 2 - octave 3 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - note D_, 4 - sound_ret - -Music_IndigoPlateau_Ch3:: - note_type 12, 1, 0 - octave 4 - note D_, 2 - rest 6 - note D_, 2 - rest 6 - note D_, 2 - rest 6 - note D_, 2 - rest 2 - note D#, 4 -.mainloop: - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note F#, 4 - sound_call .sub1 - sound_call .sub1 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note A#, 1 - rest 1 - note A#, 1 - rest 1 - note A_, 8 - note D_, 8 - note A#, 8 - note D#, 8 - sound_loop 0, .mainloop - -.sub1: - octave 4 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note D_, 2 - rest 2 - note A_, 4 - sound_ret - -Music_IndigoPlateau_Ch4:: - drum_speed 6 - drum_note 17, 16 - drum_note 17, 16 - drum_note 17, 16 - drum_note 17, 8 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 -.mainloop: - sound_call .sub2 - sound_call .sub1 - sound_call .sub2 - sound_call .sub3 - sound_call .sub2 - sound_call .sub1 - sound_call .sub2 - sound_call .sub3 - sound_call .sub2 - sound_call .sub1 - sound_call .sub2 - sound_call .sub3 - sound_call .sub1 - sound_call .sub3 - drum_note 17, 16 - drum_note 17, 8 - drum_note 18, 8 - drum_note 17, 16 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 1 - drum_note 17, 1 - drum_note 17, 1 - drum_note 17, 1 - sound_loop 0, .mainloop - -.sub1: - drum_note 17, 4 - drum_note 18, 4 - drum_note 19, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 18, 4 - drum_note 19, 4 - drum_note 19, 2 - drum_note 18, 2 - sound_ret - -.sub2: - drum_note 17, 4 - drum_note 18, 4 - drum_note 19, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 18, 4 - drum_note 19, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - sound_ret - -.sub3: - drum_note 17, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - sound_ret diff --git a/audio/music/introbattle.asm b/audio/music/introbattle.asm deleted file mode 100644 index 0bd844eb..00000000 --- a/audio/music/introbattle.asm +++ /dev/null @@ -1,326 +0,0 @@ -Music_IntroBattle_Ch1:: - tempo 98 - volume 7, 7 - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 1 - rest 8 - octave 2 - note A_, 2 - note A_, 2 - note_type 12, 11, 4 - octave 3 - note D_, 4 - note_type 12, 11, 1 - octave 2 - note A_, 2 - note A_, 2 - note_type 12, 11, 4 - octave 3 - note D#, 4 - note_type 12, 11, 1 - octave 2 - note A_, 2 - note A_, 2 - note_type 12, 11, 4 - octave 3 - note D_, 4 - note_type 12, 11, 1 - octave 2 - note A_, 2 - note A_, 2 - note_type 12, 10, 0 - note A#, 4 - note_type 12, 11, 1 - note A_, 2 - note A_, 2 - note_type 12, 11, 4 - octave 3 - note D_, 4 - note_type 12, 11, 1 - octave 2 - note A_, 2 - note A_, 2 - note_type 12, 2, -1 - octave 3 - note G_, 4 - note_type 12, 11, 0 - note A_, 8 - octave 2 - note A_, 8 - note_type 12, 11, 7 - octave 3 - note F_, 8 - note_type 12, 4, -7 - octave 2 - note F_, 8 - note_type 12, 11, 1 - note A_, 2 - note A_, 2 - note_type 12, 11, 4 - octave 3 - note D_, 4 - note_type 12, 11, 1 - octave 2 - note A_, 2 - note A_, 2 - note_type 12, 11, 4 - octave 3 - note D#, 4 - note_type 12, 11, 1 - octave 2 - note A_, 2 - note A_, 2 - note_type 12, 11, 4 - octave 3 - note F_, 4 - note_type 12, 11, 1 - octave 2 - note A_, 2 - note A_, 2 - note_type 12, 11, 4 - octave 3 - note G_, 4 - note_type 12, 11, 0 - note F#, 16 - note_type 12, 11, 1 - octave 4 - note D_, 16 - sound_ret - -Music_IntroBattle_Ch2:: - duty_cycle 3 - vibrato 8, 2, 5 - note_type 12, 12, 2 - rest 8 - octave 3 - note D_, 2 - note D_, 2 - note_type 12, 12, 5 - note A_, 4 - note_type 12, 12, 2 - note D_, 2 - note D_, 2 - note_type 12, 12, 5 - note A#, 4 - note_type 12, 12, 2 - note D_, 2 - note D_, 2 - note_type 12, 12, 5 - note A_, 4 - note_type 12, 12, 2 - note D_, 2 - note D_, 2 - note_type 12, 11, 7 - note C#, 4 - note_type 12, 12, 2 - note D_, 2 - note D_, 2 - note_type 12, 12, 5 - note A_, 4 - note_type 12, 12, 2 - octave 3 - note D_, 2 - note D_, 2 - note_type 12, 12, 7 - octave 4 - note C#, 4 - note D_, 8 - octave 3 - note D_, 8 - octave 4 - note C_, 8 - octave 3 - note C_, 8 - note_type 12, 12, 2 - note D_, 2 - note D_, 2 - note_type 12, 12, 5 - note A_, 4 - note_type 12, 12, 2 - note D_, 2 - note D_, 2 - note_type 12, 12, 5 - note A#, 4 - note_type 12, 12, 2 - note D_, 2 - note D_, 2 - note_type 12, 12, 5 - octave 4 - note C_, 4 - note_type 12, 12, 2 - octave 3 - note D_, 2 - note D_, 2 - note_type 12, 12, 5 - octave 4 - note C#, 4 - note_type 12, 2, -7 - note D_, 16 - note_type 12, 12, 1 - octave 5 - note D_, 16 - sound_ret - -Music_IntroBattle_Ch3:: - note_type 12, 1, 0 - rest 8 - octave 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A#, 4 - note A_, 8 - note D_, 8 - note A#, 8 - note D_, 8 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A_, 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A#, 4 - note D_, 1 - rest 1 - note D_, 1 - rest 1 - note A#, 4 - note A_, 16 - note D_, 1 - rest 15 - sound_ret - -Music_IntroBattle_Ch4:: - drum_speed 6 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 1 - drum_note 17, 1 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 17, 4 - drum_note 17, 8 - drum_note 17, 4 - drum_note 17, 4 - drum_note 17, 8 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 17, 4 - drum_note 17, 8 - drum_note 17, 4 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 16 - drum_note 17, 16 - drum_note 17, 16 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 1 - drum_note 17, 1 - drum_note 17, 1 - drum_note 17, 1 - drum_note 17, 4 - drum_note 17, 4 - drum_note 17, 8 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 17, 4 - drum_note 17, 8 - drum_note 17, 4 - drum_note 17, 8 - drum_note 17, 4 - drum_note 17, 16 - drum_note 17, 16 - drum_note 17, 2 - rest 16 - rest 14 - sound_ret diff --git a/audio/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm deleted file mode 100644 index bd6a9771..00000000 --- a/audio/music/jigglypuffsong.asm +++ /dev/null @@ -1,39 +0,0 @@ -Music_JigglypuffSong_Ch1:: - tempo 144 - volume 7, 7 - vibrato 8, 2, 4 - duty_cycle 2 - duty_cycle_pattern 2, 2, 1, 1 - toggle_perfect_pitch - note_type 13, 6, 7 - octave 4 - note E_, 8 - note_type 12, 6, 7 - note B_, 2 - note G#, 6 - note F#, 8 - note G#, 2 - note A_, 6 - note G#, 8 - note F#, 4 - note G#, 4 - note E_, 10 - sound_ret - -Music_JigglypuffSong_Ch2:: - vibrato 5, 1, 5 - duty_cycle 2 - duty_cycle_pattern 0, 0, 2, 2 - note_type 12, 10, 7 - octave 4 - note E_, 8 - note B_, 2 - note G#, 6 - note F#, 8 - note G#, 2 - note A_, 6 - note G#, 8 - note F#, 4 - note G#, 4 - note E_, 10 - sound_ret diff --git a/audio/music/lavender.asm b/audio/music/lavender.asm deleted file mode 100644 index 5822ff3e..00000000 --- a/audio/music/lavender.asm +++ /dev/null @@ -1,192 +0,0 @@ -Music_Lavender_Ch1:: - tempo 152 - volume 7, 7 - duty_cycle 1 - toggle_perfect_pitch - vibrato 0, 8, 8 - note_type 12, 8, 7 - rest 16 - rest 16 - rest 16 - rest 16 - note_type 12, 10, 7 -.mainloop: - octave 3 - note G_, 8 - note G_, 8 - note E_, 8 - note E_, 8 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 4 - note C#, 8 - note C#, 8 - note G_, 8 - note G_, 8 - note F#, 8 - note F#, 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - octave 4 - note C_, 8 - note C_, 8 - octave 3 - note G_, 8 - note G_, 8 - note E_, 8 - note E_, 8 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 4 - note C#, 8 - note C#, 8 - note G_, 8 - note G_, 8 - note F#, 8 - note F#, 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - note C_, 8 - note C_, 8 - rest 16 - rest 16 - rest 16 - rest 16 - sound_loop 0, .mainloop - -Music_Lavender_Ch2:: - vibrato 0, 3, 4 - duty_cycle 3 - note_type 12, 9, 1 -.mainloop: - octave 5 - note C_, 4 - note G_, 4 - note B_, 4 - note F#, 4 - sound_loop 0, .mainloop - -Music_Lavender_Ch3:: - vibrato 4, 1, 1 - note_type 12, 3, 5 - rest 16 - rest 16 - rest 16 - rest 16 - note_type 12, 2, 5 -.mainloop: - octave 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 4 - note_type 12, 3, 5 - octave 6 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - note_type 12, 2, 5 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - octave 7 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - octave 4 - note E_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 4 - note E_, 16 - note D_, 16 - note C_, 16 - note E_, 4 - note C_, 4 - octave 3 - note B_, 4 - octave 4 - note E_, 4 - note_type 12, 2, 5 - octave 6 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - octave 7 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - octave 8 - note B_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - octave 4 - note E_, 4 - note G_, 4 - note F#, 4 - note B_, 4 - sound_loop 0, .mainloop - -Music_Lavender_Ch4:: - drum_speed 12 - rest 16 - rest 16 - rest 16 - rest 16 -.mainloop: - drum_note 7, 8 - drum_note 7, 8 - sound_loop 0, .mainloop diff --git a/audio/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm deleted file mode 100644 index 3e465720..00000000 --- a/audio/music/meeteviltrainer.asm +++ /dev/null @@ -1,75 +0,0 @@ -Music_MeetEvilTrainer_Ch1:: - tempo 124 - volume 7, 7 - duty_cycle 2 - toggle_perfect_pitch - note_type 12, 11, 1 - rest 4 - octave 3 - note D_, 2 - note C#, 2 - note_type 12, 4, -7 - note D_, 4 -.mainloop: - note_type 12, 10, 1 - note D_, 4 - note D_, 4 - note D_, 4 - note_type 12, 7, 0 - note D_, 4 - sound_loop 0, .mainloop - -Music_MeetEvilTrainer_Ch2:: - duty_cycle 1 - note_type 12, 11, 6 - octave 3 - note B_, 2 - note A#, 2 - note B_, 8 -.mainloop: - note_type 12, 12, 2 - octave 4 - note D#, 2 - note D_, 2 - note C#, 2 - note C_, 2 - octave 3 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note_type 12, 4, -7 - note A#, 4 - note_type 12, 12, 2 - note G_, 2 - note G#, 2 - note A_, 2 - note A#, 2 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note B_, 4 - note_type 12, 3, -7 - note A#, 4 - note_type 12, 12, 2 - sound_loop 0, .mainloop - -Music_MeetEvilTrainer_Ch3:: - note_type 12, 1, 0 - rest 8 - octave 4 - note F#, 1 - rest 1 - note F_, 1 - rest 1 -.mainloop: - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note A#, 4 - sound_loop 0, .mainloop diff --git a/audio/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm deleted file mode 100644 index 876c3441..00000000 --- a/audio/music/meetfemaletrainer.asm +++ /dev/null @@ -1,114 +0,0 @@ -Music_MeetFemaleTrainer_Ch1:: - tempo 124 - volume 7, 7 - duty_cycle 1 - toggle_perfect_pitch - note_type 12, 11, 2 - octave 3 - note G#, 6 - octave 4 - note E_, 2 - note D#, 2 - note C#, 2 - note C_, 2 - note_type 12, 8, 1 -.mainloop: -.loop1: - octave 3 - note E_, 4 - sound_loop 12, .loop1 - note E_, 4 - octave 2 - note B_, 4 - note B_, 4 - octave 3 - note E_, 4 - sound_loop 0, .mainloop - -Music_MeetFemaleTrainer_Ch2:: - duty_cycle 2 - note_type 12, 12, 2 - octave 3 - note B_, 2 - note_type 12, 12, 7 - octave 4 - note B_, 12 -.mainloop: - note_type 12, 12, 2 - octave 3 - note B_, 4 - octave 4 - note D#, 4 - note E_, 4 - note D#, 4 - note C#, 2 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note A#, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 4 - octave 4 - note C#, 4 - octave 3 - note B_, 4 - note A_, 4 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - sound_loop 0, .mainloop - -Music_MeetFemaleTrainer_Ch3:: - note_type 12, 1, 0 - rest 8 - octave 5 - note C#, 1 - rest 1 - octave 4 - note B_, 1 - rest 1 - note A_, 1 - rest 1 -.mainloop: - sound_call .sub1 - note G#, 1 - rest 3 - note E_, 1 - rest 3 - note G#, 1 - rest 3 - note E_, 1 - rest 3 - sound_call .sub1 - note G#, 1 - rest 3 - note E_, 1 - rest 3 - note G#, 1 - rest 3 - note B_, 1 - rest 3 - sound_loop 0, .mainloop - -.sub1: - note G#, 1 - rest 3 - note E_, 1 - rest 3 - note G#, 1 - rest 3 - note E_, 1 - rest 1 - note F#, 1 - rest 1 - sound_ret diff --git a/audio/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm deleted file mode 100644 index 79775d6d..00000000 --- a/audio/music/meetmaletrainer.asm +++ /dev/null @@ -1,185 +0,0 @@ -Music_MeetMaleTrainer_Ch1:: - tempo 112 - volume 7, 7 - duty_cycle 3 - vibrato 20, 3, 3 - toggle_perfect_pitch - note_type 12, 11, 4 - octave 3 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 12 - rest 16 -.mainloop: - octave 3 - note B_, 4 - note A_, 4 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note F#, 4 - note E_, 6 - note F_, 2 - note F#, 4 - note G_, 8 - octave 4 - note D_, 8 - note E_, 16 - sound_loop 0, .mainloop - -Music_MeetMaleTrainer_Ch2:: - duty_cycle 3 - vibrato 24, 2, 2 - note_type 12, 12, 4 - octave 4 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - octave 3 - note B_, 12 - rest 2 - note E_, 1 - rest 3 - note E_, 1 - rest 9 -.mainloop: - note_type 12, 12, 4 - octave 4 - note E_, 6 - note D#, 6 - note C#, 4 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 - note_type 12, 12, 7 - note F_, 16 - note_type 12, 12, 5 - octave 3 - note F#, 8 - octave 4 - note C#, 8 - sound_loop 0, .mainloop - -Music_MeetMaleTrainer_Ch3:: - note_type 12, 1, 0 - rest 6 - octave 4 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 3 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 3 - note B_, 1 - rest 3 - note E_, 1 - rest 1 - note F_, 1 - rest 1 - note F#, 1 - rest 1 -.mainloop: - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - octave 5 - note D_, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - octave 5 - note D_, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - octave 5 - note D_, 1 - rest 1 - octave 4 - note G_, 1 - rest 1 - octave 5 - note D_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - note D#, 1 - rest 1 - sound_loop 0, .mainloop diff --git a/audio/music/meetprofoak.asm b/audio/music/meetprofoak.asm deleted file mode 100644 index f8cf4715..00000000 --- a/audio/music/meetprofoak.asm +++ /dev/null @@ -1,416 +0,0 @@ -Music_MeetProfOak_Ch1:: - tempo 112 - volume 7, 7 - duty_cycle 3 - toggle_perfect_pitch - note_type 12, 11, 4 - octave 3 - note F#, 1 - note B_, 1 - octave 4 - note D#, 1 - note E_, 1 - note F#, 12 - note_type 12, 10, 2 - octave 3 - note E_, 6 - note B_, 10 - note E_, 6 - note B_, 10 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note B_, 10 - note E_, 6 - note B_, 10 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 -.mainloop: - note F#, 6 - note E_, 4 - note A_, 2 - note A_, 4 - note F#, 6 - note E_, 4 - note A_, 2 - note A_, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note E_, 6 - note D#, 4 - note F#, 2 - note F#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - note F#, 6 - note E_, 4 - note G#, 2 - note G#, 4 - sound_loop 0, .mainloop - -Music_MeetProfOak_Ch2:: - vibrato 8, 1, 1 - duty_cycle 2 - note_type 12, 12, 4 - octave 3 - note B_, 1 - octave 4 - note D#, 1 - note F#, 1 - note A#, 1 - note B_, 12 - note_type 12, 11, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 - note_type 12, 6, 4 - octave 4 - note B_, 2 - octave 5 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 - note_type 12, 11, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 - note_type 12, 8, 1 - octave 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 - note_type 12, 11, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 - note_type 12, 6, 4 - octave 4 - note B_, 2 - octave 5 - note C#, 2 - note D#, 2 - note E_, 4 - note D#, 2 - note C#, 4 - note_type 12, 11, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 - note_type 12, 8, 1 - octave 4 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 4 - note B_, 2 - note B_, 4 - note_type 12, 11, 5 -.mainloop: - octave 4 - note C#, 6 - octave 3 - note A_, 1 - octave 4 - note C#, 1 - note E_, 6 - note C#, 1 - note E_, 1 - note F#, 4 - note E_, 4 - note D#, 4 - note C#, 4 - octave 3 - note B_, 6 - note G#, 1 - note B_, 1 - octave 4 - note E_, 8 - note_type 12, 6, 5 - octave 4 - note B_, 6 - note G#, 1 - note B_, 1 - octave 5 - note E_, 8 - note_type 12, 11, 5 - octave 3 - note A_, 6 - note F#, 1 - note A_, 1 - octave 4 - note D#, 8 - note E_, 4 - note D#, 4 - note C#, 4 - note C_, 4 - octave 3 - note B_, 6 - note G#, 1 - note B_, 1 - octave 4 - note E_, 6 - octave 3 - note B_, 1 - octave 4 - note E_, 1 - note_type 12, 11, 7 - note G#, 16 - sound_loop 0, .mainloop - -Music_MeetProfOak_Ch3:: - note_type 12, 1, 2 - rest 10 - octave 4 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note B_, 1 - rest 5 - octave 5 - note E_, 4 - rest 6 - octave 4 - note B_, 1 - rest 5 - octave 5 - note E_, 4 - octave 4 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note B_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 1 - rest 1 - note G_, 1 - rest 1 - note G#, 1 - rest 1 -.mainloop: -.loop1: - octave 4 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - octave 4 - note A_, 1 - rest 1 - octave 5 - note C#, 1 - rest 1 - sound_loop 2, .loop1 -.loop2: - octave 4 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - sound_loop 2, .loop2 -.loop3: - note F#, 1 - rest 1 - note A_, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - rest 1 - sound_loop 2, .loop3 -.loop4: - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - sound_loop 2, .loop4 - sound_loop 0, .mainloop diff --git a/audio/music/meetrival.asm b/audio/music/meetrival.asm deleted file mode 100644 index 32dfe153..00000000 --- a/audio/music/meetrival.asm +++ /dev/null @@ -1,389 +0,0 @@ -Music_MeetRival_Ch1_AlternateTempo:: - tempo 100 - sound_loop 0, Music_MeetRival_Ch1.body - -Music_MeetRival_Ch1:: - tempo 112 -.body: - volume 7, 7 - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 3 - octave 4 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 2 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 6 - note D_, 1 - rest 3 - note D_, 1 - rest 5 - note A_, 2 - note G_, 2 - note A_, 2 -.mainloop: - note B_, 4 - note A#, 2 - note A_, 4 - note G_, 2 - octave 4 - note C_, 4 - note D_, 2 - rest 4 - note D_, 4 - note C#, 2 - note C_, 2 - octave 3 - note B_, 2 - octave 4 - note C_, 4 - note E_, 2 - note D_, 4 - note C_, 2 - octave 3 - note B_, 4 - octave 4 - note C_, 2 - rest 4 - note G_, 4 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note F#, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note F#, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note D_, 2 - octave 4 - note D_, 2 - rest 2 - octave 3 - note D_, 2 - octave 4 - note C_, 4 - octave 3 - note B_, 2 - note A#, 2 - note B_, 2 - octave 4 - note C_, 2 - note F_, 2 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - note F_, 2 - note D#, 2 - note C_, 2 - octave 3 - note A#, 2 - note G_, 2 - rest 4 - note A#, 4 - octave 4 - note C_, 2 - octave 3 - note A#, 2 - octave 4 - note C_, 2 - note_type 12, 11, 7 - octave 3 - note G_, 4 - note D_, 2 - note F_, 6 - note F#, 4 - note D_, 2 - rest 4 - note D_, 4 - note_type 12, 11, 3 - note A_, 2 - note G_, 2 - note A_, 2 - sound_loop 0, .mainloop - -Music_MeetRival_Ch1_AlternateStartAndTempo:: - tempo 100 - sound_loop 0, Music_MeetRival_Ch1_AlternateStart.body - -Music_MeetRival_Ch1_AlternateStart:: - tempo 112 -.body: - volume 7, 7 - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 3 - octave 3 - note D_, 1 - rest 3 - note D_, 1 - rest 5 - note A_, 2 - note G_, 2 - note A_, 2 - sound_loop 0, Music_MeetRival_Ch1.mainloop - -Music_MeetRival_Ch2:: - duty_cycle 3 - vibrato 10, 2, 6 - note_type 12, 12, 7 - octave 4 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 2 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 6 - octave 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note D_, 1 - rest 1 - octave 4 - note D_, 2 - note F_, 2 - note F#, 2 -.mainloop: - note_type 12, 12, 7 - note G_, 4 - note D_, 2 - note F_, 6 - note F#, 4 - note G_, 2 - rest 4 - note G_, 4 - note G_, 2 - note A#, 2 - note B_, 2 - octave 5 - note C_, 4 - octave 4 - note G_, 2 - note A#, 6 - note B_, 4 - octave 5 - note C_, 2 - rest 4 - note C_, 4 - note C_, 2 - octave 4 - note B_, 2 - octave 5 - note C_, 2 - note_type 12, 11, 0 - note D_, 16 - note_type 12, 11, 5 - note D_, 6 - note_type 12, 12, 7 - note F_, 4 - note D_, 2 - note C_, 2 - note D_, 2 - note_type 12, 11, 0 - note C_, 8 - note_type 12, 12, 7 - note C_, 8 - octave 4 - note C_, 2 - rest 4 - note A#, 4 - note G_, 2 - note F_, 2 - note_type 12, 11, 0 - note G_, 16 - note_type 12, 11, 3 - note G_, 2 - octave 3 - note G_, 2 - rest 4 - note G_, 4 - octave 4 - note D_, 2 - note F_, 2 - note F#, 2 - sound_loop 0, .mainloop - -Music_MeetRival_Ch2_AlternateStart:: - duty_cycle 3 - vibrato 10, 2, 6 - note_type 12, 12, 7 - octave 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note D_, 1 - rest 1 - octave 4 - note D_, 2 - note F_, 2 - note F#, 2 - sound_loop 0, Music_MeetRival_Ch2.mainloop - -Music_MeetRival_Ch3:: - note_type 12, 1, 4 - octave 5 - note D_, 2 - rest 2 - note C#, 2 - rest 2 - note C_, 2 - rest 2 - octave 4 - note B_, 2 - rest 2 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - note G_, 1 - rest 1 -.mainloop: - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - rest 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - rest 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - rest 4 - octave 5 - note D_, 4 - octave 4 - note G_, 2 - note A#, 2 - note B_, 2 - note G_, 2 - octave 5 - note C_, 2 - octave 4 - note G_, 2 - rest 2 - octave 5 - note C_, 2 - octave 4 - note G_, 2 - rest 2 - note B_, 2 - octave 5 - note C_, 2 - rest 4 - note C_, 4 - note C_, 2 - octave 4 - note B_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - rest 2 - note F#, 2 - note A_, 2 - note F#, 2 - rest 2 - note A_, 2 - note F#, 2 - note A_, 2 - rest 2 - note F#, 2 - note A_, 2 - note F#, 2 - octave 5 - note D_, 2 - octave 4 - note A_, 2 - note E_, 2 - octave 5 - note C_, 2 - rest 2 - octave 4 - note E_, 2 - octave 5 - note C_, 2 - octave 4 - note E_, 2 - note F_, 2 - note G_, 2 - note E_, 2 - rest 4 - note E_, 2 - octave 5 - note C_, 2 - octave 4 - note B_, 2 - note A#, 2 - note A_, 2 - note G_, 2 - note A#, 2 - rest 2 - note G_, 2 - note A#, 2 - note G_, 2 - rest 2 - note A#, 2 - note G_, 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - rest 2 - octave 5 - note D_, 2 - octave 4 - note G_, 2 - rest 2 - octave 5 - note D_, 2 - sound_loop 0, .mainloop - -Music_MeetRival_Ch3_AlternateStart:: - note_type 12, 1, 4 - octave 4 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - sound_loop 0, Music_MeetRival_Ch3.mainloop diff --git a/audio/music/museumguy.asm b/audio/music/museumguy.asm deleted file mode 100644 index 1577d466..00000000 --- a/audio/music/museumguy.asm +++ /dev/null @@ -1,330 +0,0 @@ -Music_MuseumGuy_Ch1:: - tempo 128 - volume 7, 7 - duty_cycle 2 - toggle_perfect_pitch - note_type 12, 11, 1 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note D#, 2 - octave 2 - note B_, 4 - note B_, 1 - octave 3 - note D#, 1 - note E_, 1 - note G#, 1 - note B_, 10 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - note E_, 4 - note E_, 4 - note E_, 2 - note E_, 6 -.mainloop: - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - note E_, 4 - note E_, 4 - note E_, 2 - note E_, 6 - sound_loop 0, .mainloop - -.sub1: - note E_, 2 - note E_, 6 - note F#, 2 - note F#, 6 - sound_ret - -.sub2: - note E_, 2 - note E_, 6 - note D_, 2 - note D_, 6 - sound_ret - -Music_MuseumGuy_Ch2:: - duty_cycle 2 - note_type 12, 12, 1 - octave 4 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 4 - note E_, 1 - note G#, 1 - note B_, 1 - octave 4 - note D#, 1 - note E_, 8 - octave 3 - note A_, 2 - octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note F#, 2 - note A_, 4 - octave 3 - note A_, 2 - octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note C#, 2 - octave 3 - note B_, 4 - note A_, 2 - octave 4 - note C#, 2 - note E_, 4 - note D_, 2 - note F#, 2 - note A_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note A_, 4 -.mainloop: - octave 3 - note A_, 2 - octave 4 - note C#, 2 - note E_, 3 - note_type 12, 8, 1 - note E_, 1 - note_type 12, 12, 1 - note D_, 2 - note F#, 2 - note A_, 3 - note_type 12, 9, 1 - note A_, 1 - note_type 12, 12, 1 - octave 3 - note A_, 2 - octave 4 - note C#, 2 - note E_, 4 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note B_, 3 - note_type 12, 10, 1 - note G#, 1 - note_type 12, 12, 1 - note A_, 2 - octave 4 - note C#, 2 - note E_, 3 - note_type 12, 9, 1 - note E_, 1 - note_type 12, 12, 1 - note D_, 2 - note F#, 2 - note A_, 3 - note_type 12, 8, 1 - note A_, 1 - note_type 12, 12, 1 - note G#, 2 - note E_, 1 - note_type 12, 8, 1 - note E_, 1 - note_type 12, 12, 1 - note F#, 2 - note_type 12, 8, 1 - note F#, 1 - note_type 12, 12, 1 - note G#, 1 - note A_, 2 - note A_, 2 - note A_, 4 - sound_loop 0, .mainloop - -Music_MuseumGuy_Ch3:: - note_type 12, 1, 0 - rest 16 - octave 4 - note E_, 1 - rest 3 - note E_, 1 - rest 3 - note E_, 1 - rest 9 - sound_call .sub1 - note A_, 1 - rest 1 - note A_, 1 - rest 5 - note G#, 1 - rest 1 - note G#, 1 - rest 5 - sound_call .sub1 - note B_, 1 - rest 3 - note G#, 1 - rest 3 - note A_, 1 - rest 1 - note A_, 1 - rest 3 -.mainloop: - sound_call .sub2 - rest 3 - octave 6 - note E_, 1 - rest 1 - octave 5 - note A_, 1 - rest 1 - note A_, 1 - rest 3 - note B_, 1 - rest 1 - note G#, 1 - rest 1 - note G#, 1 - rest 3 - sound_call .sub2 - rest 1 - octave 6 - note E_, 1 - rest 1 - note D_, 1 - rest 1 - octave 5 - note B_, 1 - rest 1 - note A_, 1 - rest 1 - note G#, 1 - rest 3 - note A_, 1 - rest 1 - note A_, 1 - rest 3 - sound_loop 0, .mainloop - -.sub1: - note A_, 1 - rest 1 - note A_, 1 - rest 5 - note A_, 1 - rest 1 - note A_, 1 - rest 5 - sound_ret - -.sub2: - octave 6 - note C#, 1 - rest 1 - octave 5 - note A_, 1 - rest 1 - note A_, 1 - rest 3 - octave 6 - note F#, 1 - rest 1 - octave 5 - note A_, 1 - rest 1 - note A_, 1 - sound_ret - -Music_MuseumGuy_Ch4:: - drum_speed 12 - rest 16 - rest 16 - rest 16 - rest 16 - rest 16 - rest 14 - drum_speed 6 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 -.mainloop: - drum_note 17, 4 - drum_note 17, 6 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 6 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 4 - drum_note 17, 6 - drum_note 17, 2 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 6 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 2 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 4 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 6 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - sound_loop 0, .mainloop diff --git a/audio/music/oakslab.asm b/audio/music/oakslab.asm deleted file mode 100644 index fc9974fd..00000000 --- a/audio/music/oakslab.asm +++ /dev/null @@ -1,388 +0,0 @@ -Music_OaksLab_Ch1:: - tempo 140 - volume 7, 7 - duty_cycle 3 - vibrato 16, 1, 2 - toggle_perfect_pitch - note_type 12, 11, 3 - octave 2 - note B_, 1 - octave 3 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - note B_, 1 -.mainloop: - octave 4 - note C#, 4 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 4 - note G#, 2 - note A_, 2 - note B_, 1 - rest 3 - note A_, 6 - note G#, 1 - note B_, 1 - octave 4 - note C#, 4 - octave 3 - note A_, 4 - note G#, 2 - note A_, 2 - note F#, 4 - note E_, 2 - note F#, 2 - note G#, 1 - rest 3 - note F#, 8 - note E_, 4 - note A_, 6 - note E_, 1 - note A_, 1 - octave 4 - note D_, 8 - note C#, 6 - octave 3 - note A_, 1 - octave 4 - note C#, 1 - note E_, 8 - note D_, 4 - note C#, 4 - octave 3 - note B_, 4 - note A_, 4 - note G#, 1 - rest 3 - note E_, 4 - note F#, 4 - note G#, 4 - sound_loop 0, .mainloop - -Music_OaksLab_Ch2:: - duty_cycle 3 - vibrato 10, 2, 5 - note_type 12, 12, 4 - octave 3 - note G#, 1 - note A_, 1 - note B_, 1 - octave 4 - note C#, 1 - note D_, 1 - note E_, 1 - note F#, 1 - note G#, 1 -.mainloop: - note A_, 6 - note G#, 1 - note F#, 1 - note E_, 6 - note D#, 1 - note E_, 1 - note F#, 1 - rest 3 - note E_, 8 - note E_, 4 - note F#, 6 - note E_, 1 - note D_, 1 - note C#, 6 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - note D_, 1 - rest 3 - note C#, 8 - note C#, 4 - note D_, 6 - octave 3 - note A_, 1 - octave 4 - note D_, 1 - note F#, 8 - note E_, 6 - note C#, 1 - note E_, 1 - note A_, 8 - note G#, 4 - note A_, 2 - note G#, 2 - note F#, 4 - note G#, 2 - note F#, 2 - note E_, 1 - rest 1 - octave 3 - note G#, 1 - rest 1 - note A_, 1 - rest 1 - note B_, 1 - rest 1 - octave 4 - note C#, 1 - rest 1 - note D_, 1 - rest 1 - note E_, 1 - rest 1 - note F#, 1 - rest 1 - sound_loop 0, .mainloop - -Music_OaksLab_Ch3:: - note_type 12, 1, 1 - rest 2 - octave 4 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 -.mainloop: - note C#, 1 - rest 1 - note A_, 1 - rest 3 - note A_, 1 - rest 3 - note A_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 3 - note A_, 1 - rest 3 - note A_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note F#, 1 - rest 1 - note C#, 1 - rest 1 - note F#, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note F#, 1 - rest 1 - note C#, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 3 - note A_, 1 - rest 3 - note A_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 3 - note G#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - rest 1 - note E_, 1 - rest 5 - note G#, 1 - rest 3 - note F#, 1 - rest 3 - note E_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - note C#, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - note C#, 1 - rest 1 - note F#, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - octave 3 - note A_, 1 - rest 1 - octave 4 - note F#, 1 - rest 1 - note C#, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - octave 3 - note B_, 1 - rest 1 - octave 4 - note G#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note D_, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 3 - note G#, 1 - rest 3 - note F#, 1 - rest 3 - note E_, 1 - rest 3 - sound_loop 0, .mainloop diff --git a/audio/music/pallettown.asm b/audio/music/pallettown.asm deleted file mode 100644 index 9d1aff7a..00000000 --- a/audio/music/pallettown.asm +++ /dev/null @@ -1,312 +0,0 @@ -Music_PalletTown_Ch1:: - tempo 160 - volume 7, 7 - duty_cycle 2 - note_type 12, 12, 3 -.mainloop: - octave 3 - note B_, 4 - octave 4 - note C_, 2 - note D_, 4 - note G_, 2 - note D_, 2 - note C_, 2 - octave 3 - note B_, 4 - note G_, 2 - octave 4 - note D_, 4 - note D_, 2 - note C_, 2 - octave 3 - note B_, 2 - rest 2 - note B_, 2 - octave 4 - note C_, 2 - octave 3 - note B_, 2 - octave 4 - note C_, 8 - rest 2 - octave 3 - note B_, 2 - octave 4 - note C_, 2 - octave 3 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note F#, 2 - note B_, 4 - octave 4 - note C_, 2 - note D_, 4 - note G_, 2 - note D_, 2 - note C_, 2 - octave 3 - note B_, 4 - note G_, 2 - octave 4 - note D_, 4 - note D_, 2 - note G_, 2 - note F#, 2 - note E_, 4 - note D_, 2 - note C_, 4 - octave 3 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note D_, 2 - note C_, 2 - octave 3 - note B_, 2 - note A_, 2 - note G_, 4 - note F#, 4 - octave 4 - note C_, 2 - octave 3 - note G_, 2 - note E_, 2 - note G_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - note F#, 2 - note A_, 2 - note_type 12, 11, 3 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - octave 4 - note C_, 2 - octave 3 - note G_, 2 - note E_, 2 - note G_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note D_, 2 - note G_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note F#, 2 - note D_, 2 - note C_, 2 - note D_, 2 - note G_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note C_, 2 - note E_, 2 - note F#, 2 - note D_, 2 - note C_, 2 - note D_, 2 - sound_loop 0, .mainloop - - sound_ret ; unused - -Music_PalletTown_Ch2:: - duty_cycle 2 -.mainloop: - note_type 12, 13, 3 - octave 5 - note D_, 2 - note_type 12, 10, 3 - note C_, 2 - note_type 12, 13, 3 - octave 4 - note B_, 2 - note_type 12, 11, 3 - note A_, 2 - note_type 12, 13, 3 - octave 5 - note G_, 2 - note_type 12, 11, 3 - note E_, 2 - note_type 12, 13, 3 - note F#, 2 - note E_, 2 - note D_, 6 - octave 4 - note B_, 2 - note G_, 2 - note G_, 2 - note A_, 2 - note B_, 2 - octave 5 - note C_, 10 - octave 4 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 6 - octave 5 - note C_, 1 - octave 4 - note B_, 1 - note A_, 8 - octave 5 - note D_, 2 - note_type 12, 10, 3 - note C_, 2 - note_type 12, 13, 3 - octave 4 - note B_, 2 - note_type 12, 11, 3 - octave 5 - note D_, 2 - note_type 12, 13, 3 - note G_, 2 - note_type 12, 10, 3 - note F#, 2 - note_type 12, 11, 3 - note F#, 2 - note_type 12, 13, 3 - note G_, 2 - note E_, 6 - note D_, 2 - note D_, 8 - note C_, 2 - octave 4 - note B_, 2 - note A_, 2 - note G_, 2 - octave 5 - note D_, 2 - note C_, 2 - octave 4 - note B_, 2 - note A_, 2 - note G_, 10 - note G_, 2 - note A_, 2 - note B_, 2 - octave 5 - note C_, 8 - note D_, 6 - note C_, 2 - octave 4 - note B_, 8 - rest 2 - note G_, 2 - note A_, 2 - note B_, 2 - octave 5 - note C_, 4 - note C_, 4 - note D_, 6 - note C_, 1 - note D_, 1 - octave 4 - note B_, 8 - rest 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 8 - note E_, 4 - note B_, 4 - note A_, 8 - note G_, 4 - note E_, 4 - note F#, 8 - note G_, 4 - note B_, 4 - note B_, 8 - note A_, 8 - sound_loop 0, .mainloop - - sound_ret ; unused - -Music_PalletTown_Ch3:: - vibrato 24, 2, 8 - note_type 12, 1, 2 -.mainloop: - octave 4 - note G_, 6 - note E_, 6 - note F#, 4 - note G_, 6 - note A_, 6 - note G_, 4 - note E_, 6 - note F#, 6 - note E_, 4 - note G_, 6 - note E_, 6 - note D_, 4 - note G_, 6 - note E_, 6 - note F#, 4 - note G_, 6 - note A_, 6 - note G_, 4 - note E_, 6 - note F#, 6 - note A_, 4 - note G_, 6 - note E_, 6 - note D_, 4 - note C_, 8 - note D_, 8 - note G_, 8 - note E_, 4 - note D_, 4 - note C_, 8 - note D_, 8 - note G_, 8 - note A_, 4 - note G_, 4 - note E_, 8 - note A_, 8 - note E_, 8 - note G_, 8 - note F#, 8 - note E_, 8 - note E_, 8 - note F#, 8 - sound_loop 0, .mainloop - - sound_ret ; unused diff --git a/audio/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm deleted file mode 100644 index cb858110..00000000 --- a/audio/music/pkmnhealed.asm +++ /dev/null @@ -1,45 +0,0 @@ -Music_PkmnHealed_Ch1:: - tempo 144 - volume 7, 7 - duty_cycle 2 - toggle_perfect_pitch - note_type 12, 8, 1 - rest 2 - pitch_slide 1, 4, B_ - note B_, 2 - pitch_slide 1, 3, E_ - note B_, 2 - pitch_slide 1, 4, E_ - note E_, 2 - rest 4 - pitch_slide 1, 5, B_ - note E_, 4 - pitch_slide 1, 4, B_ - note B_, 4 - sound_ret - -Music_PkmnHealed_Ch2:: - duty_cycle 2 - note_type 12, 12, 3 - octave 4 - note B_, 4 - note B_, 4 - note B_, 2 - note G#, 2 - note_type 12, 12, 4 - octave 5 - note E_, 8 - sound_ret - -Music_PkmnHealed_Ch3:: - note_type 12, 1, 0 - octave 4 - note E_, 2 - rest 2 - note E_, 2 - rest 2 - note E_, 2 - note G#, 2 - note E_, 6 - rest 2 - sound_ret diff --git a/audio/music/pokecenter.asm b/audio/music/pokecenter.asm deleted file mode 100644 index cdfa1188..00000000 --- a/audio/music/pokecenter.asm +++ /dev/null @@ -1,370 +0,0 @@ -Music_Pokecenter_Ch1:: - tempo 144 - volume 7, 7 - duty_cycle 3 - vibrato 10, 2, 2 - toggle_perfect_pitch -.mainloop: - note_type 12, 10, 3 - octave 3 - note F#, 2 - note F_, 2 - note F#, 2 - note_type 12, 11, 5 - octave 4 - note D_, 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note_type 12, 10, 3 - note A_, 2 - note E_, 2 - note A_, 2 - note_type 12, 11, 5 - octave 4 - note C#, 4 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note_type 12, 10, 3 - note F#, 2 - note F_, 2 - note F#, 2 - note_type 12, 11, 5 - octave 4 - note D_, 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note_type 12, 10, 3 - note A_, 2 - note E_, 2 - note A_, 2 - note_type 12, 11, 5 - octave 4 - note C#, 4 - octave 3 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note F#, 2 - note E_, 2 - note D_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 4 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 8 - octave 4 - note D_, 2 - note C#, 2 - octave 3 - note B_, 4 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 - note D_, 2 - note E_, 2 - note D_, 2 - note C#, 4 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D_, 2 - note E_, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 4 - note G_, 2 - note A_, 2 - note B_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - sound_loop 0, .mainloop - -Music_Pokecenter_Ch2:: - vibrato 8, 2, 5 -.mainloop: - sound_call .sub1 - duty_cycle 3 - note_type 12, 10, 5 - octave 3 - note A_, 4 - note E_, 4 - sound_call .sub2 - note D_, 2 - note F#, 6 - duty_cycle 3 - note_type 12, 10, 5 - octave 3 - note A_, 4 - note E_, 4 - sound_call .sub1 - duty_cycle 3 - note_type 12, 10, 5 - octave 3 - note A_, 4 - note E_, 4 - sound_call .sub2 - note D_, 8 - duty_cycle 3 - note_type 12, 10, 5 - octave 3 - note D_, 4 - note E_, 4 - duty_cycle 2 - note_type 12, 12, 6 - octave 4 - note F#, 8 - note A_, 8 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 8 - note C#, 8 - note E_, 8 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 8 - note F#, 8 - note A_, 8 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 8 - note A_, 4 - note G_, 2 - note F#, 2 - note G_, 8 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 8 - sound_loop 0, .mainloop - -.sub1: - duty_cycle 2 - note_type 12, 12, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - note_type 12, 12, 3 - note A_, 4 - note G_, 4 - note F#, 2 - note E_, 2 - note C#, 6 - sound_ret - -.sub2: - duty_cycle 2 - note_type 12, 12, 2 - octave 4 - note C#, 2 - octave 3 - note A_, 2 - octave 4 - note C#, 2 - note_type 12, 12, 3 - note F#, 4 - note E_, 4 - note C#, 2 - sound_ret - -Music_Pokecenter_Ch3:: - note_type 12, 1, 0 -.mainloop: - octave 4 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - sound_call .sub1 - sound_call .sub2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - sound_call .sub1 - sound_call .sub2 - note D_, 2 - note F#, 2 - note D_, 2 - note F#, 2 - note D_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - sound_call .sub3 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note A_, 2 - sound_call .sub3 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note G_, 2 - note B_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - sound_loop 0, .mainloop - -.sub1: - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - sound_ret - -.sub2: - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - sound_ret - -.sub3: - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note A_, 2 - sound_ret diff --git a/audio/music/pokemontower.asm b/audio/music/pokemontower.asm deleted file mode 100644 index 0126acad..00000000 --- a/audio/music/pokemontower.asm +++ /dev/null @@ -1,453 +0,0 @@ -Music_PokemonTower_Ch1:: - tempo 152 - volume 7, 7 - duty_cycle 3 - toggle_perfect_pitch - vibrato 12, 2, 3 - note_type 12, 8, 0 - rest 4 - octave 4 - note B_, 12 -.mainloop: - note_type 12, 11, 4 - octave 4 - note G_, 1 - rest 7 - note G_, 1 - rest 7 - octave 3 - note B_, 1 - rest 7 - note B_, 1 - rest 3 - note B_, 1 - rest 3 - note B_, 1 - rest 7 - note B_, 1 - rest 7 - note B_, 1 - rest 7 - octave 4 - note F#, 1 - rest 7 - note C_, 1 - octave 3 - note B_, 1 - note G_, 1 - rest 5 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note F#, 1 - rest 7 - note E_, 1 - rest 7 - note G_, 1 - rest 7 - note G_, 1 - rest 7 - note F#, 1 - rest 7 - note F#, 1 - rest 7 - note G_, 1 - rest 7 - note E_, 1 - rest 7 - note D_, 1 - rest 7 - note E_, 1 - rest 7 - note G_, 1 - rest 7 - note G_, 1 - rest 7 - note F#, 1 - rest 7 - note B_, 1 - rest 7 - note B_, 1 - rest 7 - octave 4 - note C_, 1 - rest 7 - note C_, 1 - rest 7 - note C#, 1 - rest 7 - note C#, 1 - rest 7 - note C_, 1 - rest 7 - note C_, 1 - rest 3 - note_type 12, 8, 4 - note C_, 1 - rest 3 - note_type 12, 11, 4 - note D_, 1 - rest 7 - note D_, 1 - rest 7 - octave 3 - note A_, 1 - rest 7 - note A_, 1 - rest 7 - note_type 12, 10, 7 - note B_, 8 - note B_, 8 - octave 4 - note C_, 8 - note C_, 8 - note C#, 8 - note C#, 8 - note_type 12, 10, 6 - note D_, 16 - rest 16 - rest 16 - rest 16 - rest 16 - note_type 12, 9, 2 - note B_, 4 - octave 5 - note E_, 4 - note D_, 4 - note C_, 4 - octave 4 - note B_, 4 - octave 5 - note E_, 4 - note D_, 4 - note C_, 4 - octave 4 - note B_, 4 - octave 5 - note E_, 4 - note D_, 4 - note C_, 4 - octave 4 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 - octave 5 - note C_, 16 - note C_, 16 - sound_loop 0, .mainloop - -Music_PokemonTower_Ch2:: - vibrato 20, 3, 4 - duty_cycle 3 - note_type 12, 10, 0 - octave 5 - note C_, 12 - octave 4 - note E_, 4 -.mainloop: - note_type 12, 12, 1 - octave 5 - note C_, 8 - octave 4 - note B_, 4 - note_type 12, 12, 4 - note G_, 1 - note F#, 1 - note E_, 1 - note D#, 1 - note_type 12, 11, 0 - note G_, 8 - octave 5 - note C_, 8 - octave 4 - note B_, 4 - note G_, 4 - note E_, 4 - note G_, 4 - octave 5 - note C_, 8 - note_type 12, 11, 7 - note C_, 8 - note_type 12, 12, 2 - octave 4 - note G_, 1 - note F#, 1 - note E_, 1 - rest 1 - note_type 12, 9, 6 - octave 3 - note G_, 4 - note_type 12, 12, 7 - note G_, 4 - note B_, 4 - note G_, 4 - note B_, 4 - octave 4 - note C_, 4 - octave 3 - note B_, 4 - note_type 12, 11, 0 - octave 4 - note C_, 16 - note E_, 8 - note_type 12, 11, 7 - note E_, 12 - note_type 12, 12, 5 - octave 5 - note C_, 4 - octave 4 - note B_, 4 - note G_, 4 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note_type 12, 11, 0 - note F#, 12 - note G_, 4 - note_type 12, 11, 0 - note F#, 8 - note_type 12, 11, 7 - note F#, 8 - note_type 12, 11, 0 - note B_, 4 - note G_, 4 - note F#, 4 - note E_, 4 - note B_, 16 - note_type 12, 11, 0 - octave 5 - note C_, 4 - octave 4 - note G_, 4 - note F#, 4 - note E_, 4 - note_type 12, 9, 0 - octave 5 - note C_, 16 - note_type 12, 11, 0 - note D_, 4 - octave 4 - note A_, 4 - note G#, 4 - note F#, 4 - note_type 12, 2, -7 - octave 5 - note D_, 16 - note_type 12, 12, 0 - note E_, 4 - octave 4 - note B_, 4 - note A_, 4 - note G_, 4 - octave 5 - note F_, 4 - note C_, 4 - octave 4 - note A#, 4 - note G#, 4 - octave 5 - note F#, 4 - note D_, 4 - note C_, 4 - octave 4 - note A#, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note D_, 4 - note_type 12, 11, 0 - note C_, 8 - note_type 12, 9, 0 - note C_, 8 - note_type 12, 8, 0 - note C_, 8 - note_type 12, 7, 0 - note C_, 8 - note_type 12, 6, 0 - note C_, 8 - note_type 12, 6, 7 - note C_, 8 - rest 16 - note_type 12, 10, 0 - octave 5 - note G_, 16 - octave 6 - note C_, 16 - octave 5 - note B_, 8 - note G_, 8 - note E_, 8 - note G_, 8 - octave 6 - note C_, 16 - vibrato 0, 3, 4 - note_type 12, 10, 7 - note C_, 16 - sound_loop 0, .mainloop - -Music_PokemonTower_Ch3:: - vibrato 4, 1, 1 - note_type 12, 1, 3 - rest 8 - octave 5 - note G_, 8 -.mainloop: - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 3 - note E_, 1 - note D#, 1 - note F#, 1 - note D#, 1 - note E_, 1 - rest 7 - note G_, 1 - rest 7 - note E_, 1 - rest 7 - note B_, 1 - rest 7 - note E_, 1 - note D#, 1 - octave 4 - note B_, 1 - rest 5 - note B_, 1 - rest 7 - note B_, 1 - rest 7 - note B_, 1 - rest 7 - octave 5 - note C_, 1 - rest 7 - note C_, 1 - rest 7 - note C_, 1 - rest 7 - note C_, 1 - rest 7 - octave 4 - note B_, 1 - rest 7 - note B_, 1 - rest 7 - note B_, 1 - rest 7 - note B_, 1 - rest 7 - octave 5 - note C_, 1 - rest 7 - note C_, 1 - rest 7 - note C_, 1 - rest 7 - note C_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note E_, 1 - rest 3 - note G_, 1 - rest 3 - note F#, 1 - rest 7 - note F#, 1 - rest 7 - note D_, 1 - rest 7 - note D_, 1 - rest 3 - note D_, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - rest 7 - note E_, 1 - rest 7 - note F_, 1 - rest 7 - note F_, 1 - rest 7 - note F#, 1 - rest 7 - note F#, 1 - rest 7 - note G_, 1 - rest 15 - note_type 12, 1, 5 - octave 4 - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note G_, 1 - rest 3 - note F#, 1 - rest 3 - note F#, 1 - rest 15 - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note G_, 1 - rest 3 - note F#, 1 - rest 3 - note F#, 1 - rest 7 - note_type 12, 1, 3 - octave 6 - note E_, 1 - rest 1 - note D#, 1 - rest 1 - note F#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - rest 15 - note E_, 1 - rest 15 - note E_, 1 - rest 15 - note E_, 1 - rest 15 - note E_, 1 - rest 15 - note E_, 1 - rest 7 - octave 5 - note E_, 1 - rest 1 - note D#, 1 - rest 1 - note F#, 1 - rest 1 - note D#, 1 - rest 1 - sound_loop 0, .mainloop diff --git a/audio/music/routes1.asm b/audio/music/routes1.asm deleted file mode 100644 index b4c8377d..00000000 --- a/audio/music/routes1.asm +++ /dev/null @@ -1,403 +0,0 @@ -Music_Routes1_Ch1:: - tempo 152 - volume 7, 7 - vibrato 4, 2, 3 - duty_cycle 2 - toggle_perfect_pitch -.mainloop: - note_type 12, 10, 1 - rest 4 - octave 4 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 1 - note C#, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - octave 3 - note A_, 2 - note A_, 2 - note A_, 6 - octave 4 - note C#, 2 - note C#, 6 - note C#, 2 - note C#, 4 - octave 3 - note A_, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 4 - octave 3 - note A_, 2 - note A_, 6 - octave 4 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 6 - note D_, 2 - note D_, 1 - note E_, 1 - note D_, 1 - note C#, 1 - octave 3 - note B_, 2 - note A_, 2 - note A_, 6 - octave 4 - note C#, 2 - note C#, 6 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - note_type 12, 10, 2 - octave 4 - note G_, 4 - note E_, 4 - note F#, 2 - note_type 12, 10, 1 - octave 3 - note A_, 2 - note A_, 6 - note A_, 2 - note F#, 2 - note A_, 4 - note B_, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 4 - note A_, 2 - note F#, 2 - note A_, 4 - note G_, 2 - note E_, 2 - note C#, 4 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note A_, 4 - note B_, 2 - note G_, 2 - note B_, 4 - octave 4 - note D_, 2 - note E_, 2 - note C#, 2 - note D_, 2 - octave 3 - note A_, 2 - note A_, 2 - sound_loop 0, .mainloop - - sound_ret ; unused - -Music_Routes1_Ch2:: - duty_cycle 2 -.mainloop: - note_type 12, 13, 1 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - sound_call .sub3 - sound_loop 0, .mainloop - -.sub1: - octave 4 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note F#, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 2 - note G_, 3 - note F#, 1 - note E_, 6 - sound_ret - -.sub2: - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note E_, 2 - note C#, 1 - note D_, 1 - note E_, 2 - note E_, 2 - note F#, 1 - note E_, 1 - note E_, 1 - note F#, 1 - note D_, 4 - note F#, 2 - sound_ret - -.sub3: - note C#, 1 - note D_, 1 - note E_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note_type 12, 13, 2 - note B_, 4 - note_type 6, 13, 1 - octave 3 - note B_, 1 - octave 4 - note C#, 1 - note_type 12, 13, 1 - octave 3 - note B_, 1 - note A_, 1 - octave 4 - note C#, 1 - note D_, 6 - note_type 12, 13, 2 - note F#, 1 - note G_, 1 - note A_, 2 - note A_, 2 - note F#, 2 - note D_, 2 - octave 5 - note D_, 2 - note C#, 2 - octave 4 - note B_, 2 - octave 5 - note C#, 2 - octave 4 - note A_, 2 - note F#, 2 - note D_, 3 - note F#, 1 - note E_, 6 - note F#, 1 - note G_, 1 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - octave 5 - note D_, 2 - note C#, 2 - octave 4 - note B_, 3 - note G_, 1 - note A_, 2 - octave 5 - note D_, 2 - note C#, 2 - note E_, 2 - note D_, 2 - note_type 12, 13, 1 - octave 4 - note D_, 2 - note D_, 2 - sound_ret - - sound_ret ; unused - -Music_Routes1_Ch3:: - vibrato 8, 2, 5 - note_type 12, 1, 3 -.mainloop: - rest 2 - octave 4 - note D_, 4 - note C#, 4 - octave 3 - note B_, 4 - note A_, 4 - octave 4 - note D_, 4 - octave 3 - note A_, 4 - note B_, 4 - note A_, 4 - octave 4 - note C#, 4 - octave 3 - note A_, 4 - note B_, 4 - octave 4 - note C_, 4 - note C#, 4 - octave 3 - note A_, 4 - octave 4 - note D_, 4 - octave 3 - note A_, 4 - octave 4 - note D_, 4 - note C#, 4 - octave 3 - note B_, 4 - note A_, 4 - octave 4 - note D_, 4 - octave 3 - note A_, 4 - note B_, 4 - note A_, 4 - octave 4 - note C#, 4 - octave 3 - note B_, 4 - note A_, 4 - note B_, 4 - octave 4 - note C#, 4 - octave 3 - note A_, 4 - octave 4 - note D_, 4 - octave 3 - note A_, 4 - octave 4 - note D_, 8 - octave 3 - note G_, 8 - note A_, 8 - octave 4 - note C#, 8 - note D_, 8 - octave 3 - note G_, 8 - note A_, 8 - octave 4 - note D_, 6 - sound_loop 0, .mainloop - - sound_ret ; unused - -Music_Routes1_Ch4:: -.mainloop: - drum_speed 12 - rest 4 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - rest 4 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - drum_note 15, 2 - drum_note 15, 2 - rest 4 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - rest 4 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - rest 4 - drum_note 15, 2 - drum_note 15, 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - rest 4 - drum_note 15, 2 - drum_note 15, 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - rest 4 - drum_note 15, 2 - drum_note 15, 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - drum_note 15, 2 - rest 2 - drum_note 15, 2 - drum_note 15, 2 - sound_loop 0, .mainloop - - sound_ret ; unused diff --git a/audio/music/routes2.asm b/audio/music/routes2.asm deleted file mode 100644 index d60d6cb3..00000000 --- a/audio/music/routes2.asm +++ /dev/null @@ -1,424 +0,0 @@ -Music_Routes2_Ch1:: - tempo 152 - volume 7, 7 - vibrato 9, 2, 5 - duty_cycle 1 -.mainloop: - note_type 12, 11, 2 - octave 2 - note B_, 4 - octave 3 - note G#, 6 - note F#, 2 - note E_, 2 - note D#, 1 - note F#, 1 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - note A_, 2 - note G#, 4 - note F#, 4 - octave 2 - note B_, 4 - octave 3 - note G#, 6 - note F#, 2 - note E_, 2 - note D#, 1 - note F#, 1 - note B_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - note A_, 2 - note G#, 4 - note B_, 4 - note_type 8, 11, 2 - octave 4 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note E_, 2 - note D#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - note D#, 2 - octave 3 - note G#, 2 - octave 4 - note D#, 2 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - note C#, 2 - octave 3 - note F#, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note A_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - note D_, 2 - octave 3 - note B_, 2 - octave 4 - note D_, 2 - note F#, 2 - note E_, 2 - note D#, 2 - note E_, 2 - octave 3 - note B_, 2 - octave 4 - note E_, 2 - note E_, 2 - octave 3 - note B_, 2 - octave 4 - note E_, 2 - note E_, 2 - octave 3 - note B_, 2 - octave 4 - note E_, 2 - note E_, 2 - octave 3 - note B_, 2 - octave 4 - note E_, 2 - sound_loop 0, .mainloop - - sound_ret ; unused - -Music_Routes2_Ch2:: - vibrato 8, 2, 6 - duty_cycle 3 -.mainloop: - note_type 12, 13, 4 - octave 4 - note E_, 6 - octave 3 - note B_, 1 - octave 4 - note E_, 1 - note F#, 6 - note A_, 2 - note G#, 3 - note E_, 1 - note F#, 8 - octave 3 - note D#, 4 - octave 4 - note E_, 6 - octave 3 - note B_, 1 - octave 4 - note E_, 1 - note F#, 6 - note A_, 2 - note G#, 3 - note E_, 1 - note B_, 8 - octave 3 - note G#, 4 - octave 5 - note C#, 6 - octave 4 - note B_, 1 - note A_, 1 - note B_, 6 - note A_, 1 - note G#, 1 - note A_, 6 - note G#, 1 - note F#, 1 - note G#, 4 - note F#, 2 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 8 - note A_, 4 - note G#, 3 - note F#, 1 - note E_, 8 - note F#, 2 - note E_, 2 - note D_, 2 - note D_, 1 - note E_, 1 - note F#, 2 - note F#, 1 - note G#, 1 - note A_, 4 - octave 5 - note C#, 4 - octave 4 - note B_, 3 - note A_, 1 - note G#, 8 - rest 4 - sound_loop 0, .mainloop - - sound_ret ; unused - -Music_Routes2_Ch3:: - vibrato 9, 2, 8 -.mainloop: - note_type 12, 1, 1 - octave 3 - note E_, 2 - rest 2 - octave 2 - note B_, 6 - octave 3 - note D_, 1 - note C#, 1 - note D_, 2 - note D#, 2 - note E_, 2 - rest 2 - octave 2 - note B_, 6 - octave 3 - note D_, 1 - note C#, 1 - octave 2 - note A_, 2 - octave 3 - note C#, 2 - note E_, 2 - rest 2 - octave 2 - note B_, 6 - octave 3 - note D_, 1 - note C#, 1 - note D_, 2 - note D#, 2 - note E_, 2 - rest 2 - octave 2 - note B_, 4 - octave 3 - note C#, 2 - octave 2 - note B_, 2 - octave 3 - note D_, 2 - note F#, 2 - note E_, 2 - rest 2 - octave 2 - note A_, 2 - rest 2 - octave 3 - note D#, 2 - rest 2 - octave 2 - note G#, 2 - rest 2 - octave 3 - note C#, 2 - rest 2 - octave 2 - note F#, 2 - rest 2 - note B_, 2 - rest 2 - note E_, 2 - note G#, 2 - note F#, 2 - rest 2 - note A_, 2 - rest 2 - note F#, 2 - rest 2 - note A_, 2 - rest 2 - note G#, 2 - rest 2 - note B_, 2 - rest 2 - note G#, 2 - rest 2 - note B_, 2 - rest 2 - note F#, 2 - rest 2 - note A_, 2 - rest 2 - octave 3 - note C#, 2 - rest 2 - octave 2 - note A_, 2 - octave 3 - note C#, 2 - octave 2 - note B_, 2 - rest 2 - octave 3 - note E_, 2 - rest 2 - note G#, 2 - rest 2 - note E_, 2 - rest 2 - sound_loop 0, .mainloop - - sound_ret ; unused - -Music_Routes2_Ch4:: -.mainloop: - drum_speed 12 - drum_note 3, 2 - rest 2 - drum_note 3, 1 - rest 5 - drum_note 3, 1 - drum_note 3, 1 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - rest 2 - drum_speed 8 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 3 - drum_note 3, 3 - drum_speed 12 - drum_note 3, 1 - rest 3 - drum_note 3, 2 - rest 2 - drum_note 3, 2 - rest 4 - drum_note 3, 1 - drum_note 3, 1 - drum_note 3, 2 - rest 2 - drum_note 3, 2 - rest 2 - drum_speed 8 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 3 - drum_note 3, 3 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 3 - rest 3 - drum_speed 12 - drum_note 3, 1 - rest 5 - drum_note 3, 1 - drum_note 3, 1 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - rest 2 - drum_speed 8 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 3 - rest 3 - drum_speed 12 - drum_note 3, 1 - rest 3 - drum_note 3, 2 - rest 2 - drum_note 3, 2 - rest 4 - drum_note 3, 1 - drum_note 3, 1 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - rest 2 - drum_speed 8 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 3 - rest 3 - drum_note 3, 3 - drum_note 3, 3 - drum_note 3, 3 - rest 3 - drum_speed 12 - drum_note 3, 1 - rest 5 - drum_note 3, 1 - drum_note 3, 1 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - rest 2 - drum_speed 8 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 2 - drum_note 3, 3 - rest 3 - drum_note 3, 3 - rest 3 - sound_loop 0, .mainloop - - sound_ret ; unused diff --git a/audio/music/routes3.asm b/audio/music/routes3.asm deleted file mode 100644 index d7140c6c..00000000 --- a/audio/music/routes3.asm +++ /dev/null @@ -1,508 +0,0 @@ -Music_Routes3_Ch1:: - tempo 148 - volume 7, 7 - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 5 - octave 3 - note E_, 1 - note F#, 1 - note G_, 6 - note F_, 1 - note G_, 1 - note E_, 1 - rest 16 - rest 15 -.mainloop: - note_type 12, 11, 5 - note E_, 6 - note D_, 1 - note E_, 1 - note C_, 4 - note E_, 4 - note C_, 6 - note D_, 1 - note E_, 1 - note F_, 2 - note G_, 2 - note G_, 2 - note A_, 2 - note_type 12, 10, 7 - note A#, 8 - note F_, 8 - note D_, 8 - note F_, 8 - note_type 12, 11, 5 - note E_, 6 - note D_, 1 - note E_, 1 - note C_, 4 - note E_, 4 - note C_, 6 - note D_, 1 - note E_, 1 - note F_, 2 - note G_, 2 - note G_, 2 - note A_, 2 - note_type 12, 10, 7 - note A#, 8 - note A#, 8 - note D_, 8 - note F_, 8 - note_type 12, 11, 5 - note E_, 4 - note E_, 2 - note F_, 2 - note G_, 4 - note F_, 2 - note E_, 2 - note B_, 2 - octave 2 - note G_, 4 - octave 3 - note B_, 8 - note A_, 2 - note_type 8, 12, 3 - note A_, 4 - note F_, 4 - note A_, 4 - note_type 8, 4, -7 - note A_, 12 - note_type 8, 9, 0 - note F_, 12 - note G_, 12 - sound_loop 0, .mainloop - -Music_Routes3_Ch2:: - vibrato 8, 2, 3 - duty_cycle 2 - note_type 12, 12, 7 - octave 3 - note G_, 1 - note A#, 1 - note B_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C_, 1 - rest 15 - rest 16 -.mainloop: - note_type 12, 12, 7 - duty_cycle 2 - octave 4 - note C_, 6 - octave 3 - note G_, 1 - octave 4 - note C_, 1 - note E_, 10 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 8 - note F_, 8 - note_type 12, 12, 5 - duty_cycle 3 - octave 3 - note A#, 8 - note A_, 8 - note_type 12, 12, 7 - duty_cycle 2 - octave 4 - note C_, 6 - octave 3 - note G_, 1 - octave 4 - note C_, 1 - note E_, 10 - octave 3 - note G_, 2 - octave 4 - note C_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - note D_, 8 - note F_, 8 - note_type 12, 12, 5 - duty_cycle 3 - octave 3 - note A#, 8 - octave 4 - note D_, 6 - note_type 12, 12, 7 - duty_cycle 2 - note C_, 1 - note D_, 1 - note E_, 2 - note D_, 2 - note E_, 2 - note C_, 8 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - note D_, 2 - octave 3 - note G_, 4 - octave 4 - note G_, 8 - note F_, 1 - note E_, 1 - note_type 8, 13, 3 - note F_, 4 - note E_, 4 - note_type 8, 12, 4 - note C_, 4 - note_type 8, 12, 5 - note C_, 12 - note_type 12, 10, 0 - duty_cycle 3 - octave 3 - note A_, 8 - note B_, 8 - sound_loop 0, .mainloop - -Music_Routes3_Ch3:: - vibrato 4, 1, 0 - note_type 6, 1, 2 - octave 4 - note G_, 2 - note A#, 2 - note B_, 8 - note A_, 8 - note G_, 2 - rest 2 - note G_, 7 - rest 1 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - note G_, 2 - rest 2 - note G_, 2 - rest 2 - note G_, 8 - note G_, 2 - rest 2 - note G_, 7 - rest 1 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - note G_, 2 - rest 2 - note G_, 2 - rest 2 - note G_, 8 -.mainloop: - note_type 12, 1, 2 - note E_, 1 - rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 4 - note E_, 1 - rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 2 - note A_, 2 - note F_, 1 - rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note A#, 4 - note F_, 1 - rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note A#, 2 - note F_, 2 - note E_, 1 - rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 4 - note E_, 1 - rest 1 - note G_, 4 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 2 - note A_, 2 - note F_, 1 - rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note A#, 4 - note F_, 1 - rest 1 - note A#, 4 - note F_, 1 - note F_, 1 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note A#, 2 - note A_, 2 - note G_, 1 - rest 1 - octave 5 - note C_, 4 - octave 4 - note G_, 1 - note G_, 1 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - octave 5 - note C_, 4 - octave 4 - note G_, 1 - rest 1 - octave 5 - note D_, 4 - octave 4 - note G_, 1 - note G_, 1 - note G_, 1 - rest 1 - note G_, 1 - rest 1 - octave 5 - note D_, 4 - octave 4 - note F_, 1 - rest 1 - octave 5 - note C_, 4 - octave 4 - note F_, 1 - note F_, 1 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - octave 5 - note C_, 4 - octave 4 - note F_, 1 - rest 1 - note A_, 4 - note F_, 1 - note F_, 1 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note A_, 4 - sound_loop 0, .mainloop - -Music_Routes3_Ch4:: - drum_speed 6 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 8 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 18, 2 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 18, 2 - drum_note 17, 4 - drum_note 18, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 -.mainloop: - drum_note 17, 12 - drum_note 17, 2 - drum_note 18, 2 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 8 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 18, 2 - drum_note 17, 4 - drum_note 17, 10 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 19, 2 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 8 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 10 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 8 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 10 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 8 - drum_note 18, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 8 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 12 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 4 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - sound_loop 0, .mainloop diff --git a/audio/music/routes4.asm b/audio/music/routes4.asm deleted file mode 100644 index 98e1455a..00000000 --- a/audio/music/routes4.asm +++ /dev/null @@ -1,674 +0,0 @@ -Music_Routes4_Ch1:: - tempo 148 - volume 7, 7 - duty_cycle 3 - vibrato 10, 3, 4 - toggle_perfect_pitch - note_type 12, 10, 2 - octave 2 - note G#, 4 - note G#, 4 - note G#, 4 - note_type 12, 7, -7 - note G#, 4 - note_type 12, 10, 2 - note G#, 4 - note G#, 4 - note G#, 4 - note_type 12, 11, 7 - note B_, 1 - octave 3 - note E_, 1 - note F#, 1 - note B_, 1 -.mainloop: - note_type 12, 11, 7 - note B_, 6 - note E_, 2 - note E_, 4 - octave 4 - note E_, 4 - note D_, 4 - note C#, 4 - octave 3 - note B_, 4 - note A_, 4 - note_type 12, 11, 1 - note G#, 3 - note_type 12, 11, 7 - note E_, 1 - note F#, 12 - note E_, 8 - note D#, 4 - note F#, 4 - note B_, 6 - note E_, 2 - note E_, 4 - octave 4 - note E_, 4 - note D_, 4 - note C#, 4 - octave 3 - note B_, 4 - octave 4 - note C#, 4 - note_type 12, 11, 1 - note E_, 3 - note_type 12, 11, 7 - note D#, 1 - note E_, 12 - octave 3 - note B_, 3 - note A_, 1 - note G#, 8 - octave 4 - note E_, 4 - octave 3 - note D_, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 4 - note C#, 2 - note D_, 2 - note D_, 2 - octave 3 - note A_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 4 - note D#, 2 - note E_, 2 - octave 3 - note B_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 - note_type 8, 11, 5 - note A_, 4 - note G#, 4 - note F#, 4 - octave 4 - note E_, 4 - note D#, 4 - note C#, 4 - note C#, 4 - octave 3 - note B_, 4 - note A_, 4 - note B_, 4 - octave 4 - note C#, 4 - note D#, 4 - octave 3 - note E_, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note B_, 4 - octave 4 - note C#, 4 - note D#, 4 - note E_, 3 - octave 3 - note B_, 3 - note G#, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note A_, 3 - sound_loop 0, .mainloop - -Music_Routes4_Ch2:: - vibrato 12, 2, 4 - duty_cycle 1 - note_type 12, 9, 2 - octave 3 - note E_, 3 - note F#, 1 - note_type 12, 9, 0 - note E_, 12 - note_type 12, 9, 2 - octave 2 - note B_, 3 - octave 3 - note C_, 1 - note_type 12, 9, 0 - octave 2 - note B_, 8 - duty_cycle 3 - note_type 12, 12, 7 - octave 3 - note E_, 1 - note F#, 1 - note B_, 1 - octave 4 - note D#, 1 -.mainloop: - note_type 12, 12, 7 - note E_, 6 - octave 3 - note B_, 2 - note B_, 4 - octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note F#, 1 - note A_, 1 - note G#, 1 - note F#, 1 - note_type 12, 12, 2 - note G#, 3 - note E_, 1 - note_type 12, 10, 0 - octave 3 - note B_, 12 - duty_cycle 0 - note_type 12, 12, 2 - octave 2 - note B_, 3 - note_type 12, 12, 7 - octave 3 - note C_, 1 - octave 2 - note B_, 8 - octave 3 - note D#, 4 - duty_cycle 3 - octave 4 - note E_, 6 - octave 3 - note B_, 2 - note B_, 4 - octave 4 - note B_, 4 - note A_, 4 - note G#, 4 - note F#, 4 - note A_, 1 - octave 5 - note C#, 1 - octave 4 - note B_, 1 - note A_, 1 - note_type 12, 12, 2 - note B_, 3 - note_type 12, 12, 7 - note A_, 1 - note_type 12, 11, 0 - note G#, 6 - note_type 12, 9, 0 - note G#, 6 - note_type 12, 7, 0 - note G#, 6 - note_type 12, 6, -7 - note G#, 6 - note_type 12, 12, 7 - note G#, 4 - note_type 8, 12, 3 - note A_, 4 - note G#, 4 - note F#, 4 - note_type 8, 9, 0 - note F#, 6 - note_type 8, 7, -7 - note F#, 6 - duty_cycle 0 - note_type 8, 9, 0 - octave 3 - note F#, 4 - note E_, 4 - note F#, 4 - note A_, 6 - duty_cycle 3 - note_type 8, 12, 7 - octave 4 - note F#, 6 - note G#, 4 - note F#, 4 - note_type 8, 12, 4 - note E_, 4 - note_type 8, 10, 0 - note E_, 12 - duty_cycle 0 - note_type 8, 9, 0 - octave 3 - note E_, 4 - note D#, 4 - note E_, 4 - note G#, 6 - duty_cycle 3 - note_type 8, 12, 7 - octave 4 - note E_, 6 - note F#, 4 - note D#, 4 - octave 3 - note B_, 4 - note_type 8, 10, 0 - octave 4 - note B_, 16 - note_type 8, 10, 7 - note B_, 8 - note_type 8, 11, 0 - note A_, 6 - note_type 8, 11, 7 - note A_, 6 - note_type 12, 10, 7 - note G#, 1 - note F#, 1 - note_type 12, 11, 0 - note E_, 12 - note_type 12, 10, 0 - note E_, 8 - note_type 12, 10, 7 - note E_, 10 - sound_loop 0, .mainloop - -Music_Routes4_Ch3:: - note_type 12, 1, 0 - octave 4 - note E_, 1 - rest 3 - note E_, 1 - rest 3 - note E_, 1 - rest 3 - note E_, 1 - rest 3 - note E_, 1 - rest 3 - note E_, 1 - rest 3 - note E_, 1 - rest 3 - note D#, 1 - rest 3 -.mainloop: - note E_, 1 - rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - rest 1 - note F#, 1 - rest 3 - note A_, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - rest 1 - note F#, 1 - rest 3 - note A_, 1 - rest 1 - note B_, 1 - rest 3 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - rest 1 - note B_, 1 - rest 3 - note B_, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note E_, 1 - rest 1 - note A_, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - rest 1 - note D_, 1 - rest 3 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - note D_, 1 - rest 1 - note D_, 1 - rest 3 - note D_, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - note F#, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - rest 1 - note B_, 1 - rest 3 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - note B_, 1 - rest 1 - note B_, 1 - rest 3 - note B_, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - note G#, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - rest 1 - note E_, 1 - rest 3 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - note E_, 1 - rest 1 - note E_, 1 - rest 3 - note D#, 1 - rest 1 - sound_loop 0, .mainloop - -Music_Routes4_Ch4:: - drum_speed 12 - rest 16 - rest 12 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 -.mainloop: - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 18, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 17, 2 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 18, 1 - drum_note 18, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 17, 2 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 17, 2 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 17, 2 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 2 - drum_note 19, 1 - drum_note 18, 1 - drum_note 17, 4 - drum_note 19, 1 - drum_note 19, 1 - drum_note 18, 1 - drum_note 18, 1 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 2 - drum_note 17, 2 - sound_loop 0, .mainloop diff --git a/audio/music/safarizone.asm b/audio/music/safarizone.asm deleted file mode 100644 index 505dd130..00000000 --- a/audio/music/safarizone.asm +++ /dev/null @@ -1,106 +0,0 @@ -Music_SafariZone_Ch1:: - tempo 132 - volume 7, 7 - vibrato 6, 3, 4 - toggle_perfect_pitch - duty_cycle 2 - note_type 12, 9, 2 - octave 3 - pitch_slide 1, 4, A_ - note C_, 1 - pitch_slide 1, 4, A_ - note G_, 1 - pitch_slide 1, 4, A_ - note C_, 1 - pitch_slide 1, 4, A_ - note G_, 1 - rest 4 - duty_cycle 3 -.mainloop: - sound_call .sub1 - note_type 12, 10, 4 - note F#, 4 - sound_call .sub1 - note_type 12, 10, 4 - note F#, 4 - sound_loop 0, .mainloop - -.sub1: - note_type 12, 10, 2 - octave 3 - note C_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note C_, 4 - note G_, 4 - note C_, 4 - sound_ret - -Music_SafariZone_Ch2:: - 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 - rest 4 - duty_cycle 3 -.mainloop: - sound_call .sub1 - note_type 12, 11, 5 - note A_, 4 - sound_call .sub1 - note_type 12, 11, 5 - note B_, 4 - sound_loop 0, .mainloop - -.sub1: - note_type 12, 11, 2 - octave 3 - note G_, 4 - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 - note D_, 4 - note G_, 4 - sound_ret - -Music_SafariZone_Ch3:: - note_type 12, 1, 0 - rest 8 -.mainloop: - sound_call .sub1 - octave 4 - note A_, 4 - sound_call .sub1 - octave 4 - note B_, 4 - sound_loop 0, .mainloop - -.sub1: - octave 3 - note A_, 2 - rest 2 - octave 4 - note D_, 2 - rest 2 - octave 3 - note A_, 2 - rest 2 - octave 4 - note D_, 2 - rest 2 - octave 3 - note A_, 2 - rest 2 - octave 4 - note D_, 2 - rest 2 - octave 3 - note A_, 2 - rest 2 - sound_ret diff --git a/audio/music/silphco.asm b/audio/music/silphco.asm deleted file mode 100644 index 9e4265f9..00000000 --- a/audio/music/silphco.asm +++ /dev/null @@ -1,995 +0,0 @@ -Music_SilphCo_Ch1:: - tempo 160 - volume 7, 7 - duty_cycle 3 - toggle_perfect_pitch - vibrato 8, 2, 2 - note_type 6, 11, 3 - octave 2 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 - octave 3 - note C_, 1 - note_type 6, 10, 0 - note C_, 12 - note_type 6, 11, 3 - note C_, 2 - octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note E_, 2 - rest 2 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 2 -.mainloop: - note G_, 2 - rest 2 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note A#, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 2 - octave 3 - note C_, 2 - rest 2 - note C_, 2 - rest 6 - note C_, 2 - rest 6 - note C_, 2 - rest 6 - note C_, 2 - rest 6 - octave 2 - note A#, 2 - rest 6 - note B_, 2 - rest 2 - note G_, 2 - rest 10 - note E_, 1 - note F#, 1 - note G#, 1 - note A_, 1 - note_type 6, 10, 0 - note B_, 12 - note_type 6, 11, 3 - note B_, 1 - note A_, 1 - note G_, 1 - note F_, 1 - note E_, 1 - rest 11 - note F_, 1 - note G#, 1 - note A#, 1 - note B_, 1 - note_type 6, 10, 0 - octave 3 - note C_, 12 - note_type 6, 11, 3 - note C_, 1 - octave 2 - note B_, 1 - note A_, 1 - note G_, 1 - note F_, 1 - rest 11 - note F#, 1 - note B_, 1 - octave 3 - note C_, 1 - note C#, 1 - note_type 6, 10, 0 - note D_, 12 - note_type 6, 11, 3 - note D_, 1 - note C_, 1 - octave 2 - note A#, 1 - note G_, 1 - note F_, 1 - rest 11 - note F_, 1 - note G#, 1 - note A#, 1 - note B_, 1 - note_type 6, 10, 0 - octave 3 - note C_, 12 - note_type 6, 11, 3 - note C_, 1 - octave 2 - note B_, 1 - note G#, 1 - note F_, 1 - note E_, 1 - rest 7 - note_type 6, 8, 0 - note B_, 16 - note_type 6, 11, 0 - octave 3 - note E_, 8 - tempo 124 - note_type 6, 11, 3 - octave 2 - note B_, 2 - rest 10 - note B_, 2 - rest 10 - note B_, 2 - rest 6 - note B_, 2 - rest 16 - rest 6 - note A_, 2 - rest 6 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - note A_, 2 - note A#, 2 - note B_, 2 - note A#, 2 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - rest 4 - note C_, 2 - rest 6 - note C_, 2 - rest 6 - note C_, 2 - rest 6 - octave 2 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note A#, 2 - rest 6 - note A_, 2 - rest 6 - note A_, 2 - rest 6 - note A_, 2 - rest 6 - note A_, 2 - rest 6 - note A_, 2 - rest 6 - note A_, 2 - rest 6 - note A#, 2 - rest 6 - note A#, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - octave 3 - note C_, 2 - rest 6 - note C_, 2 - rest 6 - octave 2 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - octave 3 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - octave 4 - note C_, 2 - rest 6 - note C_, 2 - rest 6 - octave 2 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - octave 4 - note E_, 2 - rest 6 - note E_, 2 - rest 6 - note D#, 2 - rest 6 - note D#, 2 - rest 2 - octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note_type 6, 6, 0 - note E_, 16 - note E_, 11 - note_type 6, 11, 3 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 - octave 3 - note C_, 1 - note_type 6, 3, -7 - note C_, 16 - note_type 6, 10, 0 - note C_, 11 - note_type 6, 9, 3 - octave 2 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note_type 6, 3, -7 - note E_, 16 - note_type 6, 9, 0 - note E_, 11 - note_type 6, 11, 3 - note F_, 1 - note G_, 1 - note A#, 1 - octave 3 - note C_, 1 - note D_, 1 - note_type 6, 3, -7 - note D_, 16 - note_type 6, 10, 7 - note D_, 11 - rest 4 - rest 4 - tempo 128 - rest 4 - rest 4 - tempo 136 - rest 4 - rest 4 - tempo 144 - rest 4 - rest 4 - tempo 160 - rest 4 - rest 4 - tempo 192 - rest 4 - rest 4 - tempo 288 - rest 4 - rest 4 - tempo 416 - rest 4 - tempo 1024 - rest 4 - tempo 160 - rest 4 - note_type 6, 4, 3 - octave 2 - note B_, 2 - rest 6 - note_type 6, 6, 3 - note B_, 2 - rest 6 - note_type 6, 8, 3 - note B_, 2 - rest 6 - note_type 6, 5, 0 - note B_, 8 - note_type 6, 11, 3 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 2 - sound_loop 0, .mainloop - -.sub1: - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 3 - note C_, 2 - sound_ret - -Music_SilphCo_Ch2:: - vibrato 10, 3, 2 - duty_cycle 3 - note_type 6, 12, 3 - octave 3 - note E_, 1 - note F#, 1 - note G#, 1 - note A#, 1 - octave 4 - note C_, 1 - note_type 6, 11, 0 - note C_, 12 - note_type 6, 12, 3 - note C_, 2 - octave 3 - note B_, 1 - note A#, 1 - note G#, 1 - note F#, 1 - note E_, 1 - note E_, 2 - rest 2 - octave 2 - note G_, 2 - rest 6 - note F#, 2 - rest 6 - note G_, 2 - rest 6 - note G#, 2 - rest 2 -.mainloop: - note E_, 2 - rest 2 - note G_, 2 - rest 6 - note G_, 2 - rest 6 - note G_, 2 - rest 6 - note F#, 2 - rest 6 - note G_, 2 - rest 6 - note G#, 2 - rest 2 - note E_, 2 - rest 2 - note G#, 2 - rest 6 - note G#, 2 - rest 6 - note G#, 2 - rest 6 - note G#, 2 - rest 6 - note G#, 2 - rest 6 - note G#, 2 - rest 2 - note_type 6, 11, 7 - duty_cycle 2 - octave 4 - note E_, 8 - note D#, 8 - note E_, 8 - note F_, 8 - note E_, 8 - note D#, 8 - note D_, 8 - note D#, 8 - note E_, 8 - note F_, 8 - note F#, 8 - note G_, 8 - note G#, 8 - note D#, 8 - note D_, 8 - note D#, 8 - duty_cycle 3 - note_type 6, 6, -7 - note E_, 16 - note_type 6, 12, 0 - note B_, 16 - note_type 6, 12, 4 - octave 3 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note_type 6, 12, 2 - duty_cycle 1 - octave 4 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note_type 6, 12, 4 - duty_cycle 3 - octave 3 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note D#, 4 - note E_, 4 - note_type 6, 12, 0 - note F_, 8 - note_type 6, 11, 7 - note F_, 8 - note_type 6, 8, -2 - note F_, 4 - note_type 6, 12, 4 - duty_cycle 3 - note F_, 4 - note E_, 4 - note F_, 4 - note_type 6, 10, 0 - note F#, 8 - note_type 6, 11, 0 - note F#, 8 - note_type 6, 9, -1 - note F#, 4 - note_type 6, 12, 4 - note F#, 4 - note F_, 4 - note F#, 4 - note_type 6, 9, 0 - note G_, 12 - note_type 6, 5, -1 - note G_, 8 - note_type 6, 12, 4 - note G_, 4 - note F#, 4 - note G_, 4 - note F#, 4 - note F_, 4 - note F#, 4 - note F_, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note C#, 4 - note D_, 4 - note D#, 4 - note D_, 4 - note_type 6, 12, 2 - duty_cycle 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A_, 4 - note_type 6, 11, 4 - duty_cycle 3 - note D#, 4 - note D_, 4 - note D#, 4 - note_type 6, 12, 2 - duty_cycle 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A#, 4 - note_type 6, 11, 4 - duty_cycle 3 - note D#, 4 - note D_, 4 - note D#, 4 - note_type 6, 12, 2 - duty_cycle 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note B_, 4 - note_type 6, 11, 4 - duty_cycle 3 - note D#, 4 - note D_, 4 - note D#, 4 - note_type 6, 12, 2 - duty_cycle 1 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - octave 4 - note C_, 4 - note_type 6, 11, 4 - duty_cycle 3 - octave 3 - note D#, 4 - note D_, 4 - note D#, 4 - rest 4 - note G_, 2 - rest 6 - note G_, 2 - rest 6 - note G_, 2 - rest 6 - note G_, 2 - rest 2 - duty_cycle 0 - octave 4 - note E_, 2 - rest 2 - note G#, 2 - rest 6 - note G#, 2 - rest 6 - note G#, 2 - rest 6 - note G#, 2 - rest 6 - duty_cycle 3 - octave 3 - note G_, 2 - rest 6 - note G_, 2 - rest 6 - note G_, 2 - rest 6 - note G_, 2 - rest 2 - duty_cycle 0 - octave 4 - note E_, 2 - rest 2 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - note B_, 2 - rest 2 - duty_cycle 3 - octave 3 - note G_, 2 - rest 2 - note G_, 2 - rest 2 - note B_, 2 - rest 2 - note G_, 2 - rest 2 - note B_, 2 - rest 2 - note G_, 2 - rest 2 - note B_, 2 - rest 2 - note G_, 2 - rest 2 - octave 4 - note C_, 2 - rest 2 - octave 3 - note G_, 2 - rest 2 - octave 4 - note C_, 2 - rest 2 - octave 3 - note G_, 2 - rest 2 - octave 4 - note C_, 2 - rest 2 - octave 3 - note G_, 2 - rest 2 - octave 4 - note C_, 2 - rest 2 - octave 3 - note G_, 2 - rest 2 - note B_, 2 - rest 2 - note G_, 2 - rest 2 - note B_, 2 - rest 2 - note G_, 2 - rest 2 - note B_, 2 - rest 2 - note G_, 2 - rest 2 - note E_, 2 - rest 2 - note G_, 2 - rest 2 - octave 4 - note C_, 2 - rest 2 - octave 3 - note G_, 2 - rest 2 - note E_, 2 - rest 2 - note G_, 2 - rest 2 - note B_, 2 - rest 2 - note G_, 2 - rest 2 - octave 4 - note C_, 2 - rest 2 - octave 3 - note G_, 2 - rest 2 - note_type 6, 8, 7 - octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - rest 4 - note_type 6, 4, 3 - octave 2 - note G_, 2 - rest 6 - note_type 6, 6, 3 - note F#, 2 - rest 6 - note_type 6, 8, 3 - note G_, 2 - rest 6 - note_type 6, 4, -7 - note G#, 8 - note_type 6, 11, 4 - note G_, 2 - rest 6 - note F#, 2 - rest 6 - note G_, 2 - rest 6 - note G#, 2 - rest 2 - sound_loop 0, .mainloop - -Music_SilphCo_Ch3:: - vibrato 8, 1, 1 - note_type 12, 1, 1 - rest 12 - octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 -.mainloop: - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 1 - rest 1 - note G_, 1 - rest 3 - note F#, 1 - rest 3 - note G_, 1 - rest 3 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - note G_, 1 - rest 3 - note G#, 1 - rest 3 - note G_, 1 - rest 3 - note F#, 1 - rest 3 - note G_, 1 - rest 3 - note G#, 1 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - rest 3 - note G#, 1 - rest 3 - note G_, 1 - rest 3 - note G#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 1 - octave 4 - note E_, 1 - rest 5 - note F_, 1 - rest 5 - note F_, 1 - rest 3 - note E_, 1 - rest 11 - note D#, 1 - rest 3 - note E_, 1 - rest 5 - note F_, 1 - rest 5 - note F_, 1 - rest 3 - note E_, 1 - rest 11 - note D#, 1 - rest 3 - note E_, 1 - rest 1 - note F_, 1 - rest 3 - note F_, 1 - rest 3 - note F_, 1 - rest 3 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note F#, 1 - rest 3 - note F#, 1 - rest 1 - note F#, 1 - rest 1 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note F#, 1 - rest 3 - note F_, 1 - rest 3 - note E_, 1 - rest 3 - note F_, 1 - rest 3 - note E_, 1 - rest 3 - note D#, 1 - rest 3 - note D_, 1 - rest 1 - note D_, 8 - note F_, 8 - note D_, 8 - note F#, 8 - note D_, 8 - note G_, 8 - note D_, 8 - note A_, 8 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - octave 5 - note E_, 2 - note D#, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note D#, 2 - note D_, 2 - note D#, 2 - octave 4 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - octave 5 - note E_, 2 - note F_, 2 - note F#, 2 - note G_, 2 - note G#, 2 - note D#, 2 - note D_, 2 - note D#, 2 - octave 6 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note E_, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note D#, 4 - note D_, 4 - note D#, 4 - note_type 6, 1, 1 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - rest 4 - note_type 12, 1, 1 - rest 4 - rest 4 - rest 4 - rest 4 - octave 5 - note E_, 4 - note D#, 4 - note E_, 4 - note F_, 4 - sound_loop 0, .mainloop diff --git a/audio/music/ssanne.asm b/audio/music/ssanne.asm deleted file mode 100644 index 61f4237e..00000000 --- a/audio/music/ssanne.asm +++ /dev/null @@ -1,335 +0,0 @@ -Music_SSAnne_Ch1:: - tempo 128 - volume 7, 7 - duty_cycle 1 - vibrato 8, 3, 4 - toggle_perfect_pitch -.mainloop: - note_type 12, 10, 4 - rest 12 - octave 3 - note E_, 2 - note F#, 2 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 - rest 4 - note E_, 4 - note G#, 4 - rest 4 - note C#, 2 - note E_, 2 - note F#, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note F#, 4 - rest 4 - note C#, 2 - note E_, 2 - note F#, 4 - note D_, 4 - note E_, 4 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - rest 2 - note E_, 4 - note F#, 2 - note D_, 2 - note E_, 4 - note F#, 4 - note G#, 4 - note F#, 8 - note G#, 4 - note E_, 4 - rest 4 - note E_, 4 - note F#, 2 - note E_, 2 - note D_, 4 - rest 4 - note D_, 4 - note E_, 4 - note C#, 4 - rest 4 - note C#, 4 - note D_, 2 - note C#, 2 - octave 2 - note B_, 4 - note E_, 4 - note B_, 4 - octave 3 - note D_, 2 - octave 2 - note B_, 2 - note A_, 4 - rest 4 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 4 - rest 4 - note C#, 4 - note G#, 4 - note A_, 4 - rest 4 - note A_, 4 - note B_, 4 - note B_, 4 - rest 4 - octave 3 - note D_, 8 - sound_loop 0, .mainloop - -Music_SSAnne_Ch2:: - duty_cycle 0 - vibrato 12, 2, 4 -.mainloop: - note_type 12, 12, 5 - octave 3 - note A_, 2 - note E_, 2 - note A_, 4 - note B_, 4 - octave 4 - note D_, 4 - note_type 8, 12, 5 - note C#, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 - octave 4 - note C#, 6 - note D_, 6 - note C#, 3 - octave 3 - note B_, 3 - octave 4 - note E_, 6 - note D_, 3 - note C#, 3 - octave 3 - note B_, 6 - octave 4 - note C#, 3 - octave 3 - note B_, 3 - note A_, 3 - note E_, 3 - note A_, 6 - note B_, 6 - octave 4 - note D_, 6 - note C#, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 - octave 4 - note C#, 6 - note D_, 6 - note C#, 3 - octave 3 - note B_, 3 - octave 4 - note E_, 6 - note D_, 3 - note C#, 3 - octave 3 - note B_, 12 - note A_, 3 - note E_, 3 - note A_, 6 - note B_, 6 - octave 4 - note D_, 6 - note C#, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 3 - note A_, 3 - note B_, 6 - note G#, 6 - note A_, 3 - note B_, 3 - octave 4 - note C#, 6 - note D_, 6 - note C#, 3 - octave 3 - note B_, 3 - octave 4 - note E_, 6 - note D_, 3 - note C#, 3 - octave 3 - note B_, 12 - rest 3 - octave 4 - note C#, 3 - octave 3 - note B_, 3 - octave 4 - note C#, 3 - note C#, 3 - note D_, 3 - note C#, 3 - note D_, 3 - note E_, 3 - octave 3 - note B_, 3 - note G#, 3 - note F#, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note B_, 3 - rest 3 - note A_, 3 - note G#, 3 - note A_, 3 - note A_, 3 - note B_, 3 - note A_, 3 - note B_, 3 - octave 4 - note C#, 3 - octave 3 - note G#, 3 - note F#, 3 - note E_, 3 - note E_, 3 - note F#, 3 - note G#, 3 - note B_, 3 - rest 3 - note F#, 3 - note E_, 3 - note F#, 3 - note F#, 3 - note G#, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note E_, 3 - note C#, 3 - octave 2 - note B_, 3 - note A_, 3 - note B_, 3 - octave 3 - note C#, 3 - note E_, 3 - rest 3 - note F#, 3 - note E_, 3 - note F#, 3 - note F#, 3 - note G#, 3 - note A_, 3 - note B_, 3 - octave 4 - note C#, 3 - note D_, 3 - note C#, 3 - octave 3 - note B_, 3 - octave 4 - note E_, 3 - note D_, 3 - note C#, 3 - octave 3 - note B_, 3 - sound_loop 0, .mainloop - -Music_SSAnne_Ch3:: -.mainloop: - note_type 12, 1, 3 - rest 16 - rest 12 - octave 4 - note B_, 2 - note G#, 2 - note A_, 8 - note F#, 8 - note G#, 4 - rest 4 - note B_, 8 - note A_, 8 - note B_, 8 - note A_, 8 - note G#, 8 - note A_, 8 - note F#, 8 - note G#, 8 - note B_, 8 - note A_, 4 - note E_, 4 - note B_, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note G#, 4 - note E_, 4 - note A_, 4 - note E_, 4 - note F#, 4 - note G_, 4 - note G#, 4 - note A_, 4 - octave 5 - note D_, 8 - note C#, 8 - note C#, 8 - octave 4 - note B_, 8 - note B_, 8 - note A_, 8 - note A_, 8 - note G#, 8 - note G#, 8 - note F#, 8 - note F#, 8 - note E_, 8 - note E_, 8 - note F#, 8 - note F#, 8 - note G#, 8 - note B_, 8 - sound_loop 0, .mainloop diff --git a/audio/music/surfing.asm b/audio/music/surfing.asm deleted file mode 100644 index 03636ef1..00000000 --- a/audio/music/surfing.asm +++ /dev/null @@ -1,330 +0,0 @@ -Music_Surfing_Ch1:: - tempo 160 - volume 7, 7 - duty_cycle 3 - vibrato 12, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 5 - rest 6 - octave 2 - note A_, 2 - note G#, 3 - note F#, 1 - note E_, 6 - octave 3 - note G#, 2 - note F#, 2 - note G#, 4 -.mainloop: - note_type 12, 11, 2 - note E_, 2 - note E_, 4 - note E_, 2 - note E_, 4 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 4 - note D_, 2 - note D_, 4 - note_type 12, 11, 1 - note F#, 3 - note_type 12, 11, 2 - note D_, 3 - note E_, 2 - note E_, 4 - note E_, 2 - note E_, 4 - note A_, 2 - note A_, 4 - note G#, 2 - note G#, 4 - note F#, 2 - note F#, 4 - note E_, 2 - note E_, 4 - note G#, 2 - note G#, 4 - note_type 12, 11, 1 - note F#, 3 - note_type 12, 11, 2 - note G#, 1 - note_type 12, 11, 4 - note A_, 2 - note B_, 2 - octave 4 - note C_, 2 - note_type 12, 11, 7 - note C#, 6 - note_type 12, 11, 3 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note B_, 2 - octave 4 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note B_, 2 - octave 4 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - octave 4 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 4 - sound_loop 0, .mainloop - -Music_Surfing_Ch2:: - duty_cycle 3 - vibrato 16, 2, 5 - note_type 12, 12, 6 - octave 3 - note A_, 2 - note G#, 3 - note F#, 1 - note E_, 6 - note G#, 6 - octave 4 - note E_, 2 - note D_, 2 - octave 3 - note B_, 2 -.mainloop: - note_type 12, 12, 6 - octave 4 - note E_, 6 - note C#, 5 - note E_, 1 - note D_, 6 - octave 3 - note B_, 6 - octave 4 - note D_, 6 - octave 3 - note B_, 2 - note_type 12, 12, 1 - octave 4 - note F#, 3 - note_type 12, 12, 6 - note D_, 1 - note E_, 6 - note C#, 6 - note E_, 6 - note C#, 5 - note E_, 1 - note F#, 6 - note D_, 6 - note F#, 6 - note E_, 2 - note_type 12, 12, 1 - note F#, 3 - note_type 12, 12, 6 - note E_, 1 - note A_, 6 - note A_, 6 - note B_, 2 - note A_, 3 - note D_, 1 - note F#, 6 - note E_, 2 - note F#, 3 - note E_, 1 - note C#, 6 - note D_, 2 - note C#, 3 - octave 3 - note B_, 1 - octave 4 - note F#, 6 - note E_, 2 - note D#, 3 - note E_, 1 - note A_, 6 - note B_, 2 - note A_, 3 - note D_, 1 - note F#, 6 - note E_, 2 - note F#, 3 - note G#, 1 - note A_, 6 - note G#, 2 - note F#, 3 - note E_, 1 - note G#, 6 - note A_, 2 - note G#, 3 - note A_, 1 - octave 5 - note C#, 6 - sound_loop 0, .mainloop - -Music_Surfing_Ch3:: - note_type 12, 1, 0 - rest 12 - octave 5 - note E_, 6 - octave 4 - note E_, 2 - note F#, 2 - note G#, 2 -.mainloop: - octave 3 - note A_, 2 - octave 4 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 1 - rest 2 - note E_, 1 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note G#, 1 - rest 2 - note E_, 1 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note F#, 2 - octave 3 - note A_, 2 - octave 4 - note F#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - octave 3 - note A_, 2 - octave 4 - note A_, 2 - note A_, 2 - note D_, 2 - note F#, 2 - note F#, 2 - octave 3 - note A_, 2 - octave 4 - note F#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note A_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note G#, 2 - octave 3 - note B_, 2 - octave 4 - note G#, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note A_, 2 - note C#, 2 - note D_, 2 - note E_, 2 - sound_loop 0, .mainloop diff --git a/audio/music/titlescreen.asm b/audio/music/titlescreen.asm deleted file mode 100644 index 624fc064..00000000 --- a/audio/music/titlescreen.asm +++ /dev/null @@ -1,669 +0,0 @@ -Music_TitleScreen_Ch1:: - tempo 144 - volume 7, 7 - vibrato 9, 3, 4 - duty_cycle 3 - note_type 12, 12, 1 - octave 2 - note E_, 1 - note G_, 1 - note B_, 1 - octave 3 - note D_, 1 - octave 2 - note G_, 4 - note G_, 6 - note G_, 1 - note G_, 1 - note G_, 4 - note G_, 4 - note G_, 4 - note_type 8, 12, 1 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note A_, 2 - note F#, 2 -.mainloop: - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - octave 3 - note C_, 8 - note_type 8, 12, 6 - note E_, 4 - note E_, 4 - note C_, 4 - note_type 12, 12, 6 - octave 2 - note B_, 8 - note_type 8, 14, 7 - octave 3 - note F_, 4 - note E_, 4 - note C_, 4 - note_type 12, 14, 7 - note D_, 10 - note_type 12, 12, 6 - octave 2 - note B_, 2 - octave 3 - note C_, 2 - note D_, 2 - sound_call .sub1 - sound_call .sub2 - sound_call .sub1 - note C_, 6 - note C_, 6 - note E_, 4 - note D_, 6 - note F_, 2 - note G_, 2 - note D_, 4 - note G_, 2 - note G_, 6 - note A_, 4 - note F_, 2 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note D_, 12 - note E_, 4 - note F_, 8 - note G_, 4 - note F_, 4 - note E_, 12 - note F_, 4 - note G_, 8 - note_type 12, 11, 6 - octave 4 - note C_, 4 - note C#, 4 - sound_call .sub3 - note_type 8, 11, 4 - octave 4 - note C_, 4 - note C_, 4 - note C#, 4 - sound_call .sub3 - note_type 8, 11, 2 - octave 3 - note E_, 4 - note E_, 4 - note C#, 4 - sound_loop 0, .mainloop - -.sub1: - note_type 12, 12, 6 - octave 3 - note D_, 6 - octave 2 - note B_, 2 - octave 3 - note D_, 8 - sound_ret - -.sub2: - note C_, 6 - note F_, 6 - note C_, 4 - note D_, 8 - note_type 12, 14, 7 - note F_, 6 - note E_, 1 - note D#, 1 - note D_, 8 - note_type 8, 12, 6 - note C_, 4 - octave 2 - note B_, 4 - octave 3 - note C_, 4 - sound_ret - -.sub3: - note_type 12, 12, 1 - note D_, 1 - rest 1 - octave 2 - note D_, 1 - note D_, 1 - note D_, 1 - rest 1 - note D_, 1 - note D_, 1 - note D_, 1 - rest 1 - note D_, 1 - note D_, 1 - note D_, 1 - rest 1 - note D_, 1 - note D_, 1 - note D_, 1 - rest 1 - note D_, 1 - note D_, 1 - note D_, 1 - rest 1 - note D_, 1 - note D_, 1 - sound_ret - -Music_TitleScreen_Ch2:: - vibrato 16, 4, 6 - duty_cycle 1 - note_type 12, 14, 1 - octave 2 - note G_, 1 - note B_, 1 - octave 3 - note D_, 1 - note F#, 1 - note G_, 4 - note G_, 6 - note G_, 1 - note G_, 1 - note G_, 4 - note G_, 4 - note G_, 4 - note_type 8, 14, 1 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F#, 2 -.mainloop: - vibrato 16, 4, 6 - sound_call .sub1 - octave 2 - note A_, 4 - note F_, 4 - sound_call .sub2 - octave 2 - note A_, 8 - note B_, 16 - sound_call .sub1 - octave 2 - note A_, 6 - note F_, 2 - note_type 8, 14, 7 - octave 4 - note C_, 4 - octave 3 - note B_, 4 - octave 4 - note C_, 4 - note_type 12, 14, 7 - note D_, 8 - note_type 12, 9, 5 - octave 2 - note D_, 6 - note D_, 1 - note F#, 1 - note G_, 16 - sound_call .sub1 - octave 2 - note A_, 2 - note F_, 6 - sound_call .sub2 - octave 3 - note C_, 2 - octave 2 - note A_, 6 - note B_, 6 - note G_, 2 - note F_, 8 - sound_call .sub1 - note_type 8, 9, 5 - octave 2 - note G_, 4 - note F_, 5 - note A_, 3 - note_type 8, 14, 6 - octave 4 - note F_, 4 - note E_, 4 - note F_, 4 - note_type 12, 14, 7 - note G_, 6 - note A#, 2 - note G_, 8 - vibrato 16, 2, 6 - duty_cycle 3 - note_type 12, 0, -3 - note G_, 8 - note_type 12, 14, 7 - note A_, 8 - duty_cycle 1 - note_type 12, 14, 7 - note A#, 6 - note F_, 2 - note F_, 8 - octave 3 - note D_, 8 - octave 4 - note A#, 4 - note B_, 4 - octave 5 - note C_, 6 - octave 4 - note G_, 2 - note G_, 8 - octave 3 - note E_, 8 - note_type 12, 13, 7 - octave 5 - note C_, 4 - note C#, 4 - sound_call .sub3 - rest 3 - note D_, 1 - rest 3 - note D_, 1 - note_type 8, 14, 5 - octave 5 - note C_, 4 - note C_, 4 - note C#, 4 - sound_call .sub3 - note D_, 1 - rest 2 - note D_, 1 - rest 3 - note D_, 1 - note_type 8, 14, 3 - octave 5 - note C_, 4 - note C_, 4 - octave 4 - note B_, 4 - sound_loop 0, .mainloop - -.sub1: - note_type 12, 14, 7 - octave 3 - note G_, 6 - note B_, 2 - octave 4 - note D_, 8 - note_type 12, 9, 5 - sound_ret - -.sub2: - note_type 12, 14, 7 - octave 4 - note F_, 6 - note E_, 1 - note D#, 1 - note D_, 8 - note_type 12, 9, 5 - sound_ret - -.sub3: - note_type 12, 14, 1 - note D_, 1 - rest 2 - octave 4 - note D_, 1 - rest 3 - note D_, 1 - rest 3 - note D_, 1 - rest 3 - note D_, 1 - sound_ret - -Music_TitleScreen_Ch3:: - note_type 12, 1, 0 - octave 3 - note G_, 1 - rest 1 - note D_, 1 - rest 1 - note G_, 1 - rest 3 - note G_, 1 - rest 5 - note G_, 1 - note G_, 1 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note G_, 1 - rest 3 - note_type 8, 1, 0 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note F_, 2 - note A_, 2 -.mainloop: - sound_call .sub1 - sound_call .sub2 -.loop1: - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub2 - sound_loop 3, .loop1 - sound_call .sub1 - note G_, 6 - note D_, 3 - note A_, 6 - note F_, 3 - note A_, 3 - note F_, 3 - sound_call .sub3 - note A#, 3 - note F_, 3 - sound_call .sub3 - note B_, 3 - note G_, 3 - sound_call .sub4 - octave 4 - note C_, 3 - octave 3 - note G_, 3 - sound_call .sub4 - octave 4 - note C#, 3 - octave 3 - note A_, 3 - sound_call .sub5 - octave 5 - pitch_slide 1, 4, D_ - note D_, 4 - rest 4 - octave 6 - pitch_slide 1, 5, D_ - note D_, 4 - octave 5 - pitch_slide 1, 4, D_ - note D_, 4 - rest 2 - note_type 8, 1, 0 - octave 4 - note C_, 4 - note C_, 4 - note C#, 4 - sound_call .sub5 - octave 6 - pitch_slide 1, 5, D_ - note D_, 4 - rest 4 - octave 5 - pitch_slide 1, 4, D_ - note D_, 4 - rest 6 - note_type 8, 1, 0 - octave 4 - note C_, 4 - note C_, 4 - octave 3 - note B_, 4 - sound_loop 0, .mainloop - -.sub1: - note G_, 6 - note D_, 3 - note G_, 6 - note D_, 3 - note G_, 3 - note D_, 3 - sound_ret - -.sub2: - note F_, 6 - note C_, 3 - note F_, 6 - note C_, 3 - note F_, 3 - note C_, 3 - sound_ret - -.sub3: - note A#, 6 - note F_, 3 - note A#, 6 - note F_, 3 - sound_ret - -.sub4: - octave 4 - note C_, 6 - octave 3 - note G_, 3 - octave 4 - note C_, 6 - octave 3 - note G_, 3 - sound_ret - -.sub5: - note_type 12, 1, 0 - octave 4 - note D_, 1 - rest 5 - sound_ret - -Music_TitleScreen_Ch4:: - drum_speed 6 - rest 4 - drum_note 3, 1 - drum_note 3, 1 - drum_note 4, 1 - drum_note 4, 1 - drum_speed 12 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 2, 1 - drum_note 2, 1 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 3 - drum_speed 8 - drum_note 3, 2 - drum_note 4, 2 - drum_note 2, 2 - drum_note 3, 2 - drum_note 2, 2 - drum_note 1, 2 -.mainloop: - drum_speed 12 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 2, 1 - drum_note 2, 1 - drum_note 3, 1 - rest 3 - sound_call .sub1 - sound_call .sub1 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 2, 1 - drum_note 2, 1 - drum_note 3, 1 - rest 1 - drum_note 3, 1 - drum_note 2, 1 - sound_call .sub2 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 2, 1 - drum_note 3, 1 - drum_note 2, 1 - rest 1 - drum_note 2, 1 - rest 1 - sound_call .sub2 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 2, 1 - drum_note 3, 1 - drum_note 2, 1 - rest 1 - drum_speed 6 - drum_note 3, 1 - drum_note 3, 1 - drum_note 4, 1 - drum_note 4, 1 - drum_speed 12 - sound_call .sub1 - sound_call .sub2 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 2, 1 - drum_note 3, 1 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 3, 1 - drum_note 2, 1 - drum_note 2, 1 - rest 1 - drum_note 3, 1 - drum_note 2, 1 - sound_call .sub1 - sound_call .sub2 - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 3, 1 - drum_note 2, 1 - drum_note 2, 1 - rest 1 - drum_note 4, 1 - drum_note 3, 1 - drum_note 2, 1 - rest 3 - drum_note 3, 1 - rest 5 - drum_note 2, 1 - drum_note 4, 1 - drum_note 2, 1 - rest 1 - drum_speed 6 - drum_note 3, 1 - drum_note 3, 1 - drum_note 4, 1 - drum_note 4, 1 - drum_speed 12 - drum_note 1, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 3, 1 - drum_note 2, 1 - drum_note 1, 1 - rest 3 - drum_note 2, 1 - rest 3 - drum_note 3, 1 - rest 5 - drum_note 3, 1 - drum_note 2, 1 - drum_note 3, 1 - rest 3 - drum_note 2, 1 - rest 3 - drum_note 3, 1 - rest 5 - drum_note 2, 1 - drum_note 3, 1 - drum_note 4, 1 - rest 1 - drum_note 3, 1 - drum_note 2, 1 - drum_note 2, 1 - rest 3 - drum_note 3, 1 - rest 5 - drum_note 2, 1 - drum_note 3, 1 - drum_note 2, 1 - rest 3 - drum_note 5, 1 - rest 5 - drum_note 2, 1 - rest 3 - drum_note 3, 1 - drum_note 2, 1 - drum_note 1, 1 - rest 5 - drum_note 2, 1 - drum_note 3, 1 - drum_note 2, 1 - rest 1 - drum_note 1, 1 - rest 1 - drum_speed 8 - drum_note 2, 4 - drum_note 3, 4 - drum_note 1, 4 - drum_speed 12 - drum_note 5, 1 - rest 5 - drum_note 2, 1 - rest 3 - drum_note 3, 1 - drum_note 2, 1 - drum_note 3, 1 - rest 5 - drum_note 2, 1 - drum_note 3, 1 - drum_note 1, 1 - rest 1 - drum_note 3, 1 - drum_note 2, 1 - drum_speed 8 - drum_note 2, 4 - drum_note 3, 4 - drum_note 2, 4 - sound_loop 0, .mainloop - -.sub1: - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 2, 1 - drum_note 3, 1 - drum_note 2, 1 - rest 3 - sound_ret - -.sub2: - drum_note 2, 1 - rest 3 - drum_note 2, 1 - rest 5 - drum_note 3, 1 - drum_note 2, 1 - drum_note 2, 1 - rest 3 - sound_ret diff --git a/audio/music/trainerbattle.asm b/audio/music/trainerbattle.asm deleted file mode 100644 index 08df5fb5..00000000 --- a/audio/music/trainerbattle.asm +++ /dev/null @@ -1,1852 +0,0 @@ -Music_TrainerBattle_Ch1:: - tempo 112 - volume 7, 7 - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 2 - rest 8 - octave 3 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - octave 3 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 4 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 2 - note C#, 2 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 4 - note D_, 6 - note E_, 6 - note F_, 4 - note D_, 2 - note E_, 4 - note F_, 6 - note C_, 2 - note C#, 2 -.mainloop: - note_type 12, 11, 5 - note D_, 2 - note E_, 4 - note C#, 2 - note D_, 4 - octave 2 - note B_, 4 - note F#, 4 - octave 3 - note E_, 2 - note D_, 4 - note C#, 2 - note D_, 2 - note E_, 2 - note F_, 8 - note_type 12, 11, 2 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C_, 1 - note_type 12, 11, 5 - note D_, 2 - note E_, 4 - note C#, 2 - note D_, 4 - octave 2 - note B_, 4 - note F#, 4 - octave 3 - note E_, 2 - note D_, 4 - note C#, 2 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note_type 12, 10, 7 - note D_, 8 - note C#, 8 - octave 2 - note B_, 8 - octave 3 - note C#, 8 - note_type 12, 11, 5 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - note A_, 2 - note G_, 2 - rest 2 - octave 3 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - note A_, 2 - note G_, 2 - rest 2 - octave 3 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - octave 3 - note C#, 2 - note E_, 4 - octave 2 - note G_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C#, 1 - note D_, 4 - octave 2 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C#, 4 - octave 2 - note G_, 1 - note A_, 1 - note B_, 1 - octave 3 - note C#, 1 - note D_, 4 - octave 2 - note F#, 1 - note G_, 1 - note A_, 1 - note B_, 1 - octave 3 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - note A_, 2 - note G_, 2 - rest 2 - octave 3 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - note A_, 2 - note B_, 2 - note G_, 2 - octave 3 - note D_, 2 - note E_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note A_, 2 - rest 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note G_, 2 - note A_, 2 - note E_, 2 - note G_, 2 - note F#, 2 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note B_, 1 - octave 4 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - octave 3 - note A_, 4 - octave 4 - note D_, 4 - octave 3 - note A_, 2 - note D_, 1 - note E_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A#, 1 - note B_, 2 - octave 4 - note C_, 2 - octave 3 - note A_, 2 - octave 4 - note C_, 2 - octave 3 - note G_, 2 - note B_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - octave 4 - note C_, 2 - note D_, 2 - rest 2 - octave 3 - note A_, 4 - octave 4 - note C_, 4 - note D_, 2 - octave 3 - note F_, 1 - note G_, 1 - note A_, 1 - note B_, 1 - octave 4 - note C_, 1 - note D_, 1 - note E_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note D_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - note F_, 2 - note E_, 2 - octave 3 - note B_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note C_, 2 - note E_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note D_, 2 - note F_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note C_, 2 - octave 2 - note A_, 2 - octave 3 - note C_, 2 - note E_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note D_, 2 - note F_, 2 - note D_, 16 - note C_, 16 - octave 2 - note A#, 16 - note G_, 12 - octave 3 - note D_, 1 - note E_, 1 - note G_, 1 - octave 4 - note C_, 1 - note D_, 8 - note F_, 8 - octave 3 - note A#, 8 - octave 4 - note C_, 8 - note D_, 8 - note E_, 8 - note F_, 8 - note G_, 8 - note E_, 2 - rest 4 - note E_, 2 - rest 4 - note E_, 2 - rest 2 - note E_, 2 - rest 4 - note E_, 2 - rest 4 - note E_, 2 - rest 2 - note E_, 2 - rest 4 - note E_, 2 - rest 4 - note E_, 2 - rest 2 - note E_, 2 - rest 4 - note E_, 2 - rest 4 - note E_, 2 - rest 2 - octave 3 - note C_, 2 - note D_, 4 - octave 2 - note B_, 2 - octave 3 - note C#, 4 - rest 2 - note C#, 1 - note D_, 1 - note E_, 1 - rest 1 - note D_, 1 - rest 1 - octave 2 - note B_, 1 - rest 1 - octave 3 - note C#, 1 - rest 9 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - rest 5 - note C#, 1 - note D_, 1 - note E_, 1 - rest 1 - note F_, 1 - rest 1 - note E_, 1 - rest 1 - note D_, 1 - rest 1 - note D_, 2 - note E_, 2 - note F_, 2 - note G_, 2 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - rest 9 - note F#, 2 - note E_, 4 - note D#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note E_, 8 - note F#, 8 - note G_, 8 - octave 4 - note C_, 4 - octave 3 - note G_, 1 - note G#, 1 - note A_, 1 - note A#, 1 - sound_loop 0, .mainloop - -Music_TrainerBattle_Ch2:: - duty_cycle 3 - vibrato 10, 2, 5 - note_type 12, 12, 2 - octave 4 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note A_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note A_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note A_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note A_, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note A_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note A_, 1 - note C_, 1 - note C#, 1 - note C_, 1 - note A_, 1 - octave 3 - note B_, 1 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note_type 12, 14, 1 - octave 4 - note B_, 16 - rest 16 - note_type 12, 13, 1 - note B_, 16 - rest 12 - note A_, 4 - note_type 12, 12, 2 - octave 3 - note B_, 6 - octave 4 - note C#, 6 - note D_, 4 - octave 3 - note B_, 2 - octave 4 - note C#, 4 - note D_, 6 - note A_, 2 - note A#, 2 - note B_, 6 - octave 5 - note C#, 6 - note D_, 4 - octave 4 - note B_, 2 - octave 5 - note C#, 4 - note D_, 6 - octave 4 - note A_, 4 -.mainloop: - note_type 12, 12, 7 - octave 3 - note B_, 6 - note F#, 14 - note B_, 4 - note F#, 4 - note B_, 4 - note_type 12, 5, 0 - octave 4 - note C_, 8 - note_type 12, 3, 0 - note C_, 8 - note_type 12, 4, -6 - note C_, 8 - note_type 12, 12, 7 - note C_, 8 - octave 3 - note B_, 6 - note F#, 14 - note B_, 4 - note F#, 4 - note B_, 4 - note_type 12, 9, 0 - note A_, 8 - note_type 12, 5, 0 - note A_, 8 - note_type 12, 4, 0 - note A_, 8 - note_type 12, 3, 0 - note A_, 8 - note_type 12, 12, 7 - note G_, 16 - octave 4 - note D_, 8 - octave 3 - note G_, 8 - note_type 12, 8, 0 - note A_, 8 - note_type 12, 5, 0 - note A_, 8 - note_type 12, 4, 0 - note A_, 8 - note_type 12, 6, 0 - note A_, 8 - note_type 12, 12, 7 - note G_, 16 - octave 4 - note E_, 8 - note F#, 8 - note E_, 16 - note_type 12, 12, 5 - note G_, 4 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note E_, 2 - note_type 12, 11, 7 - note F#, 8 - note_type 12, 5, 0 - note F#, 8 - note_type 12, 6, 0 - note F#, 8 - note_type 12, 7, 0 - note F#, 8 - note_type 12, 10, 0 - note G_, 8 - note_type 12, 10, 7 - note G_, 8 - note_type 12, 11, 7 - note G_, 4 - note_type 12, 12, 5 - note A_, 2 - note G_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note_type 12, 10, 0 - note G#, 8 - note_type 12, 7, 0 - note G#, 8 - note_type 12, 8, 0 - note G#, 8 - note_type 12, 6, 0 - note G#, 8 - note_type 12, 10, 0 - note A_, 16 - note_type 12, 11, 0 - octave 5 - note C#, 8 - note E_, 8 - note_type 12, 12, 0 - note D_, 4 - octave 4 - note A_, 4 - octave 5 - note C_, 2 - note_type 12, 12, 7 - octave 4 - note B_, 8 - note_type 12, 6, 0 - note B_, 8 - note_type 12, 6, -1 - note B_, 6 - note_type 12, 9, 6 - note B_, 6 - rest 2 - note_type 12, 12, 0 - octave 5 - note D_, 4 - octave 4 - note A_, 4 - note A#, 2 - note_type 12, 11, 0 - octave 5 - note F_, 14 - note_type 12, 6, 0 - note G_, 16 - note_type 12, 5, 0 - note E_, 16 - note_type 12, 4, 0 - note E_, 16 - note_type 12, 12, 7 - octave 4 - note C_, 6 - octave 3 - note A_, 14 - octave 4 - note C_, 4 - octave 3 - note A_, 4 - octave 4 - note C_, 4 - octave 3 - note A#, 6 - octave 4 - note F_, 14 - octave 3 - note A#, 4 - octave 4 - note F_, 4 - note D_, 4 - note C_, 6 - octave 3 - note A_, 14 - octave 4 - note C_, 4 - note E_, 2 - note D_, 2 - note C_, 2 - note E_, 2 - note D_, 2 - octave 3 - note A#, 4 - octave 4 - note F_, 10 - note G_, 6 - note F_, 6 - note D_, 4 - note_type 12, 11, 0 - note F_, 16 - note E_, 16 - note D_, 16 - note E_, 16 - note_type 12, 10, 0 - octave 5 - note F_, 16 - note E_, 16 - note G_, 16 - note F_, 16 - note_type 12, 13, 1 - octave 3 - note A#, 6 - note A#, 6 - note A#, 4 - note A_, 6 - note A_, 6 - note A_, 4 - octave 4 - note C_, 6 - note C_, 6 - note C_, 4 - octave 3 - note A#, 6 - note A#, 6 - note A_, 4 - note_type 12, 12, 7 - note A_, 4 - note B_, 4 - note G_, 2 - note A_, 10 - note B_, 2 - octave 4 - note C#, 2 - note E_, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - note A#, 16 - rest 2 - note A#, 2 - octave 4 - note C_, 2 - note F_, 2 - note E_, 2 - note D_, 2 - note C_, 2 - octave 3 - note A#, 2 - note B_, 16 - rest 2 - note B_, 2 - octave 4 - note C#, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - octave 3 - note B_, 2 - octave 4 - note C_, 16 - note E_, 8 - note G_, 8 - sound_loop 0, .mainloop - -Music_TrainerBattle_Ch3:: - vibrato 0, 2, 0 - note_type 12, 1, 4 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note B_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note A_, 2 - note A#, 2 - note B_, 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note F_, 2 - note E_, 2 - note D_, 2 - octave 2 - note B_, 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note F_, 2 - note E_, 2 - note D_, 2 - octave 2 - note B_, 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note F_, 2 - note E_, 2 - note D_, 2 - octave 2 - note B_, 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note C_, 2 - octave 2 - note B_, 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note F_, 2 - note E_, 2 - note D_, 2 - octave 2 - note B_, 2 - note B_, 2 - octave 3 - note D_, 2 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note D_, 2 - octave 2 - note A#, 2 - octave 3 - note C_, 2 -.mainloop: - octave 2 - note A#, 1 - note B_, 1 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C_, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note D_, 2 - note C#, 2 - note D_, 2 - note C#, 2 - octave 2 - note A_, 2 - note G#, 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - note G#, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - octave 3 - note D_, 2 - octave 2 - note G_, 2 - note G#, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note D_, 2 - note C#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note F#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note D#, 2 - note F_, 2 - note G_, 2 - note F_, 2 - note D#, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note D_, 2 - note A_, 2 - note F_, 2 - note G_, 2 - note A_, 2 - note G_, 2 - note F_, 2 - note E_, 2 - note D_, 4 - octave 2 - note A_, 4 - octave 3 - note C_, 2 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - octave 2 - note B_, 2 - octave 3 - note G_, 2 - note D_, 4 - octave 2 - note A_, 4 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note B_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 4 - octave 3 - note F_, 4 - octave 2 - note A#, 4 - octave 3 - note F_, 4 - octave 2 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note A#, 4 - octave 3 - note D_, 4 - octave 2 - note A#, 4 - octave 3 - note D_, 4 - octave 2 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note A#, 4 - octave 3 - note F_, 4 - octave 2 - note A#, 4 - octave 3 - note F_, 4 - octave 2 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note A#, 4 - octave 3 - note D_, 4 - octave 2 - note A#, 4 - octave 3 - note D_, 4 - octave 2 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note A#, 4 - octave 3 - note E_, 4 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note B_, 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - note E_, 2 - octave 2 - note B_, 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A_, 2 - octave 3 - note E_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note A#, 2 - octave 3 - note F_, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - octave 2 - note B_, 2 - octave 3 - note F#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note D_, 2 - note C_, 2 - sound_loop 0, .mainloop diff --git a/audio/music/unusedsong.asm b/audio/music/unusedsong.asm deleted file mode 100644 index ce343441..00000000 --- a/audio/music/unusedsong.asm +++ /dev/null @@ -1,337 +0,0 @@ -Music_UnusedSong_Ch1:: - tempo 144 - volume 7, 7 - vibrato 5, 1, 6 -.mainloop: - note_type 12, 1, 0 - octave 6 - note E_, 1 - rest 1 - octave 5 - note B_, 1 - rest 1 - octave 6 - note C#, 1 - rest 1 - octave 5 - note B_, 1 - octave 6 - note E_, 1 - rest 4 - note E_, 2 - rest 2 - note D#, 1 - rest 1 - octave 5 - note B_, 1 - rest 1 - octave 6 - note C#, 1 - rest 1 - octave 5 - note B_, 1 - octave 6 - note D#, 1 - rest 8 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note C#, 1 - octave 5 - note B_, 1 - rest 2 - octave 6 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note C#, 1 - octave 5 - note B_, 1 - rest 2 - octave 6 - note D#, 4 - note C#, 4 - note D#, 1 - note E_, 1 - rest 1 - note F#, 1 - rest 1 - octave 5 - note B_, 2 - rest 1 - octave 6 - note E_, 1 - rest 1 - octave 5 - note B_, 1 - rest 1 - octave 6 - note C#, 1 - rest 1 - octave 5 - note B_, 1 - octave 6 - note E_, 1 - rest 8 - note D#, 1 - rest 1 - octave 5 - note B_, 1 - rest 1 - octave 6 - note C#, 1 - rest 1 - octave 5 - note B_, 1 - octave 6 - note D#, 1 - rest 4 - octave 5 - note B_, 2 - rest 2 - octave 6 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note C#, 1 - octave 5 - note B_, 1 - rest 2 - octave 6 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note D#, 2 - rest 3 - octave 5 - note A_, 2 - rest 2 - note B_, 2 - rest 2 - octave 6 - note C#, 2 - rest 2 - note E_, 2 - note F#, 8 - rest 2 - note E_, 2 - note D#, 2 - note C#, 2 - rest 2 - octave 5 - note G#, 2 - rest 2 - note A_, 2 - rest 2 - note B_, 2 - rest 2 - octave 6 - note D#, 2 - note E_, 8 - rest 2 - note D#, 2 - note C#, 2 - note D#, 2 - octave 5 - note A_, 2 - note G#, 2 - note A_, 2 - note A#, 1 - note B_, 1 - rest 4 - note F#, 2 - rest 2 - note B_, 2 - note A#, 2 - note B_, 2 - octave 6 - note C_, 1 - note C#, 1 - rest 8 - octave 5 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - octave 6 - note E_, 2 - note D#, 2 - note C#, 2 - octave 5 - note B_, 2 - rest 6 - note B_, 2 - rest 6 - sound_loop 0, .mainloop - - sound_ret ; unused - -Music_UnusedSong_Ch2:: - tempo 144 - volume 7, 7 - toggle_perfect_pitch - vibrato 6, 1, 5 -.mainloop: - note_type 12, 1, 0 - octave 6 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - note G#, 1 - rest 8 - note D#, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - note F#, 1 - rest 4 - octave 5 - note B_, 2 - rest 2 - octave 6 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note D#, 2 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - rest 1 - note F#, 1 - rest 1 - note A_, 1 - note G#, 1 - rest 4 - note E_, 2 - rest 2 - note D#, 1 - rest 1 - note F#, 1 - rest 1 - note E_, 1 - rest 1 - note G#, 1 - note F#, 1 - rest 8 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 - note C#, 1 - rest 1 - note D#, 1 - rest 1 - note E_, 1 - note F#, 1 - rest 2 - note F#, 4 - note E_, 4 - note F#, 1 - note G#, 1 - rest 1 - note B_, 1 - rest 1 - note F#, 2 - rest 1 - note C#, 2 - rest 2 - note D#, 2 - rest 2 - note E_, 2 - rest 2 - note G#, 2 - rest 2 - note D#, 8 - rest 2 - note E_, 2 - note D#, 2 - note C#, 2 - octave 5 - note B_, 2 - rest 2 - octave 6 - note C#, 2 - rest 2 - note D#, 2 - rest 2 - note F#, 2 - rest 2 - note C#, 8 - rest 2 - note D#, 2 - note C#, 2 - octave 5 - note B_, 2 - note A_, 2 - note G#, 2 - note A_, 2 - note G#, 1 - note F#, 1 - rest 8 - note B_, 2 - note A#, 2 - note B_, 2 - note A_, 1 - note G#, 1 - rest 4 - note G#, 2 - rest 2 - note F#, 2 - note F_, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note C#, 2 - note E_, 2 - note F#, 2 - rest 6 - note D#, 2 - rest 6 - sound_loop 0, .mainloop - - sound_ret ; unused diff --git a/audio/music/vermilion.asm b/audio/music/vermilion.asm deleted file mode 100644 index ed0bc846..00000000 --- a/audio/music/vermilion.asm +++ /dev/null @@ -1,317 +0,0 @@ -Music_Vermilion_Ch1:: - tempo 156 - volume 7, 7 - duty_cycle 3 - vibrato 12, 3, 4 - toggle_perfect_pitch -.mainloop: - note_type 12, 11, 5 - octave 3 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note A_, 4 - note F#, 1 - note G#, 1 - note A_, 2 - note E_, 4 - note C#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note C#, 2 - note D_, 2 - note E_, 2 - note F#, 2 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 4 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note A_, 4 - note F#, 1 - note G#, 1 - note A_, 2 - note E_, 4 - note C#, 1 - note D_, 1 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note F#, 4 - note E_, 4 - note F#, 2 - note G#, 2 - note F#, 2 - note A_, 2 - note G#, 2 - note B_, 2 - note A_, 2 - octave 4 - note C#, 2 - note D_, 2 - note C#, 2 - octave 3 - note B_, 2 - note A_, 2 - note G#, 1 - note A_, 1 - note B_, 2 - octave 4 - note C#, 2 - note E_, 2 - octave 3 - note A_, 2 - octave 4 - note D_, 2 - octave 3 - note G#, 2 - octave 4 - note C#, 2 - octave 3 - note F#, 2 - note B_, 2 - note G#, 2 - note A_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note F#, 2 - note G#, 2 - note B_, 2 - sound_loop 0, .mainloop - -Music_Vermilion_Ch2:: - duty_cycle 3 - vibrato 10, 2, 3 -.mainloop: - note_type 12, 12, 7 - octave 3 - note A_, 8 - octave 4 - note D_, 4 - note C#, 4 - octave 3 - note B_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C#, 8 - octave 3 - note A_, 8 - octave 4 - note D_, 4 - note C#, 4 - octave 3 - note B_, 6 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note A_, 8 - note A_, 8 - octave 4 - note D_, 4 - note C#, 4 - octave 3 - note B_, 6 - note A_, 1 - note B_, 1 - octave 4 - note C#, 8 - octave 3 - note A_, 8 - octave 4 - note D_, 4 - note C#, 4 - octave 3 - note B_, 6 - octave 4 - note C#, 1 - octave 3 - note B_, 1 - note A_, 8 - note B_, 4 - octave 4 - note C#, 4 - note D_, 4 - note E_, 4 - note F#, 8 - note B_, 8 - note A_, 4 - note G#, 4 - note F#, 4 - note E_, 4 - note F#, 8 - note E_, 8 - sound_loop 0, .mainloop - -Music_Vermilion_Ch3:: - note_type 12, 1, 0 -.mainloop: - octave 4 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note G#, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note B_, 2 - note A_, 2 - note G#, 2 - note F#, 2 - note F#, 2 - note E_, 2 - note G#, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note B_, 2 - note E_, 2 - note A_, 2 - note E_, 2 - note G#, 2 - note E_, 2 - sound_loop 0, .mainloop - -Music_Vermilion_Ch4:: - drum_speed 12 -.mainloop: -.loop1: - sound_call .sub1 - drum_note 6, 2 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 2 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 2 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 1 - sound_loop 4, .loop1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_call .sub1 - sound_loop 0, .mainloop - -.sub1: - drum_note 6, 2 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 2 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 2 - drum_note 6, 1 - drum_note 6, 1 - drum_note 6, 2 - drum_note 6, 1 - drum_note 6, 1 - sound_ret diff --git a/audio/music/wildbattle.asm b/audio/music/wildbattle.asm deleted file mode 100644 index c8ebf562..00000000 --- a/audio/music/wildbattle.asm +++ /dev/null @@ -1,732 +0,0 @@ -Music_WildBattle_Ch1:: - tempo 104 - volume 7, 7 - duty_cycle 3 - vibrato 6, 3, 4 - toggle_perfect_pitch - note_type 12, 11, 3 - octave 4 - note C_, 1 - octave 3 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - octave 2 - note B_, 1 - note A#, 1 - note A_, 1 - note A#, 1 - note B_, 1 - octave 3 - note C_, 1 - note C#, 1 - note_type 12, 11, 1 - note G_, 6 - note E_, 6 - note D#, 12 - note C#, 14 - note E_, 6 - note D#, 10 - note_type 12, 4, -7 - note C#, 10 - note_type 12, 11, 1 - note G_, 6 - note E_, 6 - note D#, 12 - note C#, 14 - note E_, 6 - note D#, 10 - note C#, 10 -.mainloop: - note_type 12, 11, 3 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note C_, 1 - octave 2 - note B_, 1 - octave 3 - note C_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note A_, 1 - note G#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note D_, 1 - note C#, 1 - note D_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note F#, 1 - note F_, 1 - note E_, 1 - note D#, 1 - note E_, 1 - note F_, 1 - note F#, 1 - note G_, 1 - note G#, 1 - note_type 12, 11, 5 - note D_, 4 - note C_, 4 - note D_, 4 - note F_, 4 - note E_, 6 - note D_, 6 - note F_, 4 - note_type 12, 11, 7 - note A_, 16 - note G_, 16 - note_type 12, 11, 5 - note D_, 4 - note C_, 4 - note D_, 4 - note F_, 4 - note G_, 6 - note A_, 6 - note B_, 4 - note_type 12, 11, 7 - octave 4 - note C_, 16 - note_type 12, 3, -7 - note G_, 16 - note_type 12, 11, 5 - octave 3 - note C_, 12 - note C_, 2 - rest 2 - note D_, 2 - note C_, 2 - rest 12 - note C#, 12 - note C#, 2 - rest 2 - note F_, 2 - note_type 12, 10, 3 - note D#, 6 - note_type 12, 10, 7 - note C#, 8 - sound_loop 0, .mainloop - -Music_WildBattle_Ch2:: - duty_cycle 3 - vibrato 8, 2, 5 - note_type 12, 12, 3 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - octave 5 - note G_, 1 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - octave 5 - note G_, 1 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - octave 5 - note G_, 1 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - octave 5 - note G_, 1 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - octave 5 - note G_, 1 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - octave 5 - note G_, 1 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - octave 5 - note G_, 1 - octave 4 - note G_, 1 - note F#, 1 - note F_, 1 - octave 5 - note G_, 1 - note_type 12, 12, 2 - octave 4 - note G_, 6 - octave 3 - note G_, 6 - note G_, 12 - note G_, 14 - note G_, 6 - note G_, 10 - note_type 12, 9, 0 - note F#, 10 - note_type 12, 12, 2 - note G_, 6 - note G_, 6 - note G_, 12 - note G_, 14 - note G_, 6 - note G_, 10 - note G_, 10 -.mainloop: - note_type 12, 12, 5 - note G_, 6 - note F#, 6 - note E_, 4 - note G_, 6 - note A_, 6 - note G_, 4 - octave 4 - note G#, 12 - note G_, 2 - rest 2 - note G#, 2 - note G_, 2 - rest 4 - note_type 12, 11, 7 - octave 5 - note C#, 8 - note_type 12, 12, 5 - octave 4 - note C_, 6 - octave 3 - note A#, 6 - note G#, 4 - octave 4 - note C#, 6 - note C_, 6 - octave 3 - note A#, 4 - octave 4 - note F_, 6 - note E_, 6 - note D_, 4 - note_type 12, 12, 7 - octave 3 - note A#, 4 - octave 4 - note C_, 4 - note D_, 4 - note F_, 4 - note_type 12, 12, 0 - note G#, 16 - note_type 12, 11, 0 - note G#, 16 - note_type 12, 4, -6 - note G_, 16 - note_type 12, 12, 7 - note G_, 16 - octave 3 - note F_, 8 - note A#, 8 - octave 4 - note D_, 8 - note F_, 8 - note_type 12, 12, 0 - note E_, 16 - note_type 12, 12, 7 - note E_, 16 - octave 3 - note F_, 8 - note A#, 8 - octave 4 - note D_, 8 - note F_, 8 - note_type 12, 12, 0 - note G_, 16 - note_type 12, 3, -7 - octave 5 - note C_, 16 - note_type 12, 12, 5 - octave 4 - note E_, 12 - note E_, 2 - rest 2 - note F_, 2 - note_type 12, 12, 1 - note E_, 4 - note_type 12, 12, 5 - rest 10 - note F_, 12 - note F_, 2 - rest 2 - note G#, 2 - note_type 12, 10, 3 - note G_, 6 - note_type 12, 12, 7 - note F_, 8 - sound_loop 0, .mainloop - -Music_WildBattle_Ch3:: - vibrato 0, 2, 0 - note_type 12, 1, 1 - octave 4 - note C#, 1 - rest 1 - note C#, 1 - note C_, 1 - note D_, 1 - rest 1 - note D_, 1 - note C_, 1 - note D#, 1 - rest 1 - note D#, 1 - note C_, 1 - note E_, 1 - rest 1 - note E_, 1 - note C_, 1 - note F_, 1 - rest 1 - note F_, 1 - note C_, 1 - note F#, 1 - rest 1 - note F#, 1 - note C_, 1 - note G_, 1 - rest 1 - note G_, 1 - note C_, 1 - octave 3 - note A#, 2 - note B_, 2 -.introloop: - octave 4 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 4 - note G#, 2 - note A#, 2 - note G#, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 4 - note G#, 2 - note A#, 2 - note G#, 2 - note F_, 2 - sound_loop 2, .introloop -.mainloop: - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note G#, 12 - note G_, 2 - rest 2 - note G#, 2 - note G_, 2 - rest 4 - note F_, 2 - note E_, 2 - note D_, 2 - note C#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - octave 3 - note A#, 2 - octave 4 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note F_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C_, 2 - note G_, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - note C#, 2 - note G#, 2 - sound_loop 0, .mainloop diff --git a/audio/notes.asm b/audio/notes.asm deleted file mode 100644 index ac4b3eb0..00000000 --- a/audio/notes.asm +++ /dev/null @@ -1,16 +0,0 @@ -; This file is INCLUDEd three times, once in each audio engine. - - table_width 2 - dw $F82C ; C_ - dw $F89D ; C# - dw $F907 ; D_ - dw $F96B ; D# - dw $F9CA ; E_ - dw $FA23 ; F_ - dw $FA77 ; F# - dw $FAC7 ; G_ - dw $FB12 ; G# - dw $FB58 ; A_ - dw $FB9B ; A# - dw $FBDA ; B_ - assert_table_length NUM_NOTES diff --git a/audio/poke_flute.asm b/audio/poke_flute.asm deleted file mode 100644 index 1c0caab1..00000000 --- a/audio/poke_flute.asm +++ /dev/null @@ -1,18 +0,0 @@ -Music_PokeFluteInBattle:: - ; begin playing the "caught mon" sound effect - ld a, SFX_CAUGHT_MON - call PlaySoundWaitForCurrent - ; then immediately overwrite the channel pointers - ld hl, wChannelCommandPointers + CHAN5 * 2 - ld de, SFX_Pokeflute_Ch5 - call Audio2_OverwriteChannelPointer - ld de, SFX_Pokeflute_Ch6 - call Audio2_OverwriteChannelPointer - ld de, SFX_Pokeflute_Ch7 - -Audio2_OverwriteChannelPointer: - ld a, e - ld [hli], a - ld a, d - ld [hli], a - ret diff --git a/audio/wave_samples.asm b/audio/wave_samples.asm deleted file mode 100644 index 15376004..00000000 --- a/audio/wave_samples.asm +++ /dev/null @@ -1,33 +0,0 @@ -; This file is INCLUDEd three times, once for each audio engine. - - dw .wave0 - dw .wave1 - dw .wave2 - dw .wave3 - dw .wave4 - dw .wave5 ; used in the Lavender Town and Pokemon Tower themes - dw .wave5 ; unused - dw .wave5 ; unused - dw .wave5 ; unused - -; these are the definitions for the channel 3 instruments -; each instrument definition is made up of 32 points (nibbles) that form -; the graph of the wave -; the current instrument is copied to rWave_0--rWave_f -.wave0 - dn 0, 2, 4, 6, 8, 10, 12, 14, 15, 15, 15, 14, 14, 13, 13, 12, 12, 11, 10, 9, 8, 7, 6, 5, 4, 4, 3, 3, 2, 2, 1, 1 - -.wave1 - dn 0, 2, 4, 6, 8, 10, 12, 14, 14, 15, 15, 15, 15, 14, 14, 14, 13, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 2, 1, 1 - -.wave2 - dn 1, 3, 6, 9, 11, 13, 14, 14, 14, 14, 15, 15, 15, 15, 14, 13, 13, 14, 15, 15, 15, 15, 14, 14, 14, 14, 13, 11, 9, 6, 3, 1 - -.wave3 - dn 0, 2, 4, 6, 8, 10, 12, 13, 14, 15, 15, 14, 13, 14, 15, 15, 14, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 - -.wave4 - dn 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 13, 14, 14, 15, 7, 7, 15, 14, 14, 13, 12, 10, 8, 7, 6, 5, 4, 3, 2, 1, 0 - -; duty 5 reads from sfx data -.wave5 diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm deleted file mode 100644 index a8903052..00000000 --- a/constants/audio_constants.asm +++ /dev/null @@ -1,68 +0,0 @@ -; pitch -; Audio[1|2|3]_Pitches indexes (see audio/notes.asm) - const_def - const C_ ; 0 - const C# ; 1 - const D_ ; 2 - const D# ; 3 - const E_ ; 4 - const F_ ; 5 - const F# ; 6 - const G_ ; 7 - const G# ; 8 - const A_ ; 9 - const A# ; A - const B_ ; B -DEF NUM_NOTES EQU const_value - -; channel -; Audio[1|2|3]_HWChannelBaseAddresses, Audio[1|2|3]_HWChannelDisableMasks, -; and Audio[1|2|3]_HWChannelEnableMasks indexes (see audio/engine_[1|2|3].asm) - const_def - const CHAN1 ; 0 - const CHAN2 ; 1 - const CHAN3 ; 2 - const CHAN4 ; 3 -DEF NUM_MUSIC_CHANS EQU const_value - const CHAN5 ; 4 - const CHAN6 ; 5 - const CHAN7 ; 6 - const CHAN8 ; 7 -DEF NUM_NOISE_CHANS EQU const_value - NUM_MUSIC_CHANS -DEF NUM_CHANNELS EQU const_value - -; HW sound channel register base addresses -DEF HW_CH1_BASE EQU LOW(rNR10) -DEF HW_CH2_BASE EQU LOW(rNR21) - 1 -DEF HW_CH3_BASE EQU LOW(rNR30) -DEF HW_CH4_BASE EQU LOW(rNR41) - 1 - -; HW sound channel enable bit masks -DEF HW_CH1_ENABLE_MASK EQU %00010001 -DEF HW_CH2_ENABLE_MASK EQU %00100010 -DEF HW_CH3_ENABLE_MASK EQU %01000100 -DEF HW_CH4_ENABLE_MASK EQU %10001000 - -; HW sound channel disable bit masks -DEF HW_CH1_DISABLE_MASK EQU (~HW_CH1_ENABLE_MASK & $ff) -DEF HW_CH2_DISABLE_MASK EQU (~HW_CH2_ENABLE_MASK & $ff) -DEF HW_CH3_DISABLE_MASK EQU (~HW_CH3_ENABLE_MASK & $ff) -DEF HW_CH4_DISABLE_MASK EQU (~HW_CH4_ENABLE_MASK & $ff) - - const_def 1 - const REG_DUTY_SOUND_LEN ; 1 - const REG_VOLUME_ENVELOPE ; 2 - const REG_FREQUENCY_LO ; 3 - -; wChannelFlags1 constants - const_def - const BIT_PERFECT_PITCH ; 0 ; controlled by toggle_perfect_pitch command - const BIT_SOUND_CALL ; 1 ; if in sound call - const BIT_NOISE_OR_SFX ; 2 ; if channel is the music noise channel or an SFX channel - const BIT_VIBRATO_DIRECTION ; 3 ; if the pitch is above or below normal (cycles) - const BIT_PITCH_SLIDE_ON ; 4 ; if pitch slide is active - const BIT_PITCH_SLIDE_DECREASING ; 5 ; if the pitch slide frequency is decreasing (instead of increasing) - const BIT_ROTATE_DUTY_CYCLE ; 6 ; if rotating duty cycle - -; wChannelFlags2 constant (only has one flag) -DEF BIT_EXECUTE_MUSIC EQU 0 ; if in execute music diff --git a/home/fade_audio.asm b/home/fade_audio.asm deleted file mode 100644 index 4ad2607d..00000000 --- a/home/fade_audio.asm +++ /dev/null @@ -1,48 +0,0 @@ -FadeOutAudio:: - ld a, [wAudioFadeOutControl] - and a ; currently fading out audio? - jr nz, .fadingOut - ld a, [wd72c] - bit 1, a - ret nz - ld a, $77 - ldh [rNR50], a - ret -.fadingOut - ld a, [wAudioFadeOutCounter] - and a - jr z, .counterReachedZero - dec a - ld [wAudioFadeOutCounter], a - ret -.counterReachedZero - ld a, [wAudioFadeOutCounterReloadValue] - ld [wAudioFadeOutCounter], a - ldh a, [rNR50] - and a ; has the volume reached 0? - jr z, .fadeOutComplete - ld b, a - and $f - dec a - ld c, a - ld a, b - and $f0 - swap a - dec a - swap a - or c - ldh [rNR50], a - ret -.fadeOutComplete - ld a, [wAudioFadeOutControl] - ld b, a - xor a - ld [wAudioFadeOutControl], a - ld a, SFX_STOP_ALL_MUSIC - ld [wNewSoundID], a - call PlaySound - ld a, [wAudioSavedROMBank] - ld [wAudioROMBank], a - ld a, b - ld [wNewSoundID], a - jp PlaySound diff --git a/macros/scripts/audio.asm b/macros/scripts/audio.asm deleted file mode 100644 index 6b8a650a..00000000 --- a/macros/scripts/audio.asm +++ /dev/null @@ -1,230 +0,0 @@ -MACRO channel_count - ASSERT 0 < (\1) && (\1) <= NUM_MUSIC_CHANS, \ - "channel_count must be 1-{d:NUM_MUSIC_CHANS}" - DEF _num_channels = \1 - 1 -ENDM - -MACRO channel - ASSERT 0 < (\1) && (\1) <= NUM_CHANNELS, \ - "channel id must be 1-{d:NUM_CHANNELS}" - dn (_num_channels << 2), \1 - 1 ; channel id - dw \2 ; address - DEF _num_channels = 0 -ENDM - - const_def $10 - -; arguments: length [0, 7], pitch change [-7, 7] -; length: length of time between pitch shifts -; sometimes used with a value >7 in which case the MSB is ignored -; pitch change: positive value means increase in pitch, negative value means decrease in pitch -; small magnitude means quick change, large magnitude means slow change -; in signed magnitude representation, so a value of 8 is the same as (negative) 0 - const pitch_sweep_cmd ; $10 -MACRO pitch_sweep - db pitch_sweep_cmd - IF \2 < 0 - dn \1, %1000 | (\2 * -1) - ELSE - dn \1, \2 - ENDC -ENDM - - const_next $20 - - const sfx_note_cmd ; $20 - -; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency -; fade: positive value means decrease in volume, negative value means increase in volume -; small magnitude means quick change, large magnitude means slow change -; in signed magnitude representation, so a value of 8 is the same as (negative) 0 -DEF square_note_cmd EQU sfx_note_cmd ; $20 -MACRO square_note - db square_note_cmd | \1 - IF \3 < 0 - dn \2, %1000 | (\3 * -1) - ELSE - dn \2, \3 - ENDC - dw \4 -ENDM - -; arguments: length [0, 15], volume [0, 15], fade [-7, 7], frequency -; fade: positive value means decrease in volume, negative value means increase in volume -; small magnitude means quick change, large magnitude means slow change -; in signed magnitude representation, so a value of 8 is the same as (negative) 0 -DEF noise_note_cmd EQU sfx_note_cmd ; $20 -MACRO noise_note - db noise_note_cmd | \1 - IF \3 < 0 - dn \2, %1000 | (\3 * -1) - ELSE - dn \2, \3 - ENDC - db \4 -ENDM - -; arguments: pitch, length [1, 16] -MACRO note - dn \1, \2 - 1 -ENDM - - const_next $b0 - -; arguments: instrument [1, 19], length [1, 16] - const drum_note_cmd ; $b0 -MACRO drum_note - db drum_note_cmd | (\2 - 1) - db \1 -ENDM - -; arguments: instrument, length [1, 16] -; like drum_note but one 1 byte instead of 2 -; can only be used with instruments 1-10, excluding 2 -; unused -MACRO drum_note_short - note \1, \2 -ENDM - - const_next $c0 - -; arguments: length [1, 16] - const rest_cmd ; $c0 -MACRO rest - db rest_cmd | (\1 - 1) -ENDM - - const_next $d0 - -; arguments: speed [0, 15], volume [0, 15], fade [-7, 7] -; fade: positive value means decrease in volume, negative value means increase in volume -; small magnitude means quick change, large magnitude means slow change -; in signed magnitude representation, so a value of 8 is the same as (negative) 0 - const note_type_cmd ; $d0 -MACRO note_type - db note_type_cmd | \1 - IF \3 < 0 - dn \2, %1000 | (\3 * -1) - ELSE - dn \2, \3 - ENDC -ENDM - -; arguments: speed [0, 15] -DEF drum_speed_cmd EQU note_type_cmd ; $d0 -MACRO drum_speed - db drum_speed_cmd | \1 -ENDM - - const_next $e0 - -; arguments: octave [1, 8] - const octave_cmd ; $e0 -MACRO octave - db octave_cmd | (8 - \1) -ENDM - - const_next $e8 - -; when enabled, effective frequency used is incremented by 1 - const toggle_perfect_pitch_cmd ; $e8 -MACRO toggle_perfect_pitch - db toggle_perfect_pitch_cmd -ENDM - - const_skip ; $e9 - -; arguments: delay [0, 255], depth [0, 15], rate [0, 15] -; delay: time delay until vibrato effect begins -; depth: amplitude of vibrato wave -; rate: frequency of vibrato wave - const vibrato_cmd ; $ea -MACRO vibrato - db vibrato_cmd - db \1 - dn \2, \3 -ENDM - -; arguments: length [1, 256], octave [1, 8], pitch - const pitch_slide_cmd ; $eb -MACRO pitch_slide - db pitch_slide_cmd - db \1 - 1 - dn 8 - \2, \3 -ENDM - -; arguments: duty cycle [0, 3] (12.5%, 25%, 50%, 75%) - const duty_cycle_cmd ; $ec -MACRO duty_cycle - db duty_cycle_cmd - db \1 -ENDM - -; arguments: tempo [0, $ffff] -; used to calculate note delay counters -; so a smaller value means music plays faster -; ideally should be set to $100 or less to guarantee no overflow -; if larger than $100, large note speed or note length values might cause overflow -; stored in big endian - const tempo_cmd ; $ed -MACRO tempo - db tempo_cmd - db HIGH(\1), LOW(\1) -ENDM - -; arguments: left output enable mask, right output enable mask - const stereo_panning_cmd ; $ee -MACRO stereo_panning - db stereo_panning_cmd - dn \1, \2 -ENDM - - const unknownmusic0xef_cmd ; $ef -MACRO unknownmusic0xef - db unknownmusic0xef_cmd - db \1 -ENDM - -; arguments: left master volume [0, 7], right master volume [0, 7] - const volume_cmd ; $f0 -MACRO volume - db volume_cmd - dn \1, \2 -ENDM - - const_next $f8 - -; when enabled, the sfx data is interpreted as music data - const execute_music_cmd ; $f8 -MACRO execute_music - db execute_music_cmd -ENDM - - const_next $fc - -; arguments: duty cycle 1, duty cycle 2, duty cycle 3, duty cycle 4 - const duty_cycle_pattern_cmd ; $fc -MACRO duty_cycle_pattern - db duty_cycle_pattern_cmd - db \1 << 6 | \2 << 4 | \3 << 2 | \4 -ENDM - -; arguments: address - const sound_call_cmd ; $fd -MACRO sound_call - db sound_call_cmd - dw \1 -ENDM - -; arguments: count, address - const sound_loop_cmd ; $fe -MACRO sound_loop - db sound_loop_cmd - db \1 - dw \2 -ENDM - - const sound_ret_cmd ; $ff -MACRO sound_ret - db sound_ret_cmd -ENDM From fc059d36afb615b0859547bd088c8c82637bd32d Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Wed, 28 Dec 2022 21:25:19 -0600 Subject: [PATCH 27/33] Remove the inc_section macro the idea is nice, but it thwarts make's dependency change detection --- audio.asm | 466 ++++++++++++++++++++++--------------------- crysaudio/macros.asm | 5 - 2 files changed, 238 insertions(+), 233 deletions(-) diff --git a/audio.asm b/audio.asm index 042a97a4..22d65d4e 100644 --- a/audio.asm +++ b/audio.asm @@ -167,314 +167,324 @@ INCLUDE "crysaudio/sfx_pointers_red.asm" SECTION "Songs 1", ROMX - inc_section "crysaudio/music/route36.asm" - inc_section "crysaudio/music/rivalbattle.asm" - inc_section "crysaudio/music/rocketbattle.asm" - inc_section "crysaudio/music/elmslab.asm" - inc_section "crysaudio/music/darkcave.asm" - inc_section "crysaudio/music/johtogymbattle.asm" - inc_section "crysaudio/music/championbattle.asm" - inc_section "crysaudio/music/ssaqua.asm" - inc_section "crysaudio/music/newbarktown.asm" - inc_section "crysaudio/music/goldenrodcity.asm" - inc_section "crysaudio/music/vermilioncity.asm" - inc_section "crysaudio/music/titlescreen.asm" - inc_section "crysaudio/music/ruinsofalphinterior.asm" - inc_section "crysaudio/music/lookpokemaniac.asm" - inc_section "crysaudio/music/trainervictory.asm" +INCLUDE "crysaudio/music/route36.asm" +INCLUDE "crysaudio/music/rivalbattle.asm" +INCLUDE "crysaudio/music/rocketbattle.asm" +INCLUDE "crysaudio/music/elmslab.asm" +INCLUDE "crysaudio/music/darkcave.asm" +INCLUDE "crysaudio/music/johtogymbattle.asm" +INCLUDE "crysaudio/music/championbattle.asm" +INCLUDE "crysaudio/music/ssaqua.asm" +INCLUDE "crysaudio/music/newbarktown.asm" +INCLUDE "crysaudio/music/goldenrodcity.asm" +INCLUDE "crysaudio/music/vermilioncity.asm" +INCLUDE "crysaudio/music/titlescreen.asm" +INCLUDE "crysaudio/music/ruinsofalphinterior.asm" +INCLUDE "crysaudio/music/lookpokemaniac.asm" +INCLUDE "crysaudio/music/trainervictory.asm" SECTION "Songs 2", ROMX - inc_section "crysaudio/music/route1.asm" - inc_section "crysaudio/music/route3.asm" - inc_section "crysaudio/music/route12.asm" - inc_section "crysaudio/music/kantogymbattle.asm" - inc_section "crysaudio/music/kantotrainerbattle.asm" - inc_section "crysaudio/music/kantowildbattle.asm" - inc_section "crysaudio/music/pokemoncenter.asm" - inc_section "crysaudio/music/looklass.asm" - inc_section "crysaudio/music/lookofficer.asm" - inc_section "crysaudio/music/route2.asm" - inc_section "crysaudio/music/mtmoon.asm" - inc_section "crysaudio/music/showmearound.asm" - inc_section "crysaudio/music/gamecorner.asm" - inc_section "crysaudio/music/bicycle.asm" - inc_section "crysaudio/music/looksage.asm" - inc_section "crysaudio/music/pokemonchannel.asm" - inc_section "crysaudio/music/lighthouse.asm" - inc_section "crysaudio/music/lakeofrage.asm" - inc_section "crysaudio/music/indigoplateau.asm" - inc_section "crysaudio/music/route37.asm" - inc_section "crysaudio/music/rockethideout.asm" - inc_section "crysaudio/music/dragonsden.asm" - inc_section "crysaudio/music/ruinsofalphradio.asm" - inc_section "crysaudio/music/lookbeauty.asm" - inc_section "crysaudio/music/route26.asm" - inc_section "crysaudio/music/ecruteakcity.asm" - inc_section "crysaudio/music/lakeofragerocketradio.asm" - inc_section "crysaudio/music/magnettrain.asm" - inc_section "crysaudio/music/lavendertown.asm" - inc_section "crysaudio/music/dancinghall.asm" - inc_section "crysaudio/music/contestresults.asm" - inc_section "crysaudio/music/route30.asm" +INCLUDE "crysaudio/music/route1.asm" +INCLUDE "crysaudio/music/route3.asm" +INCLUDE "crysaudio/music/route12.asm" +INCLUDE "crysaudio/music/kantogymbattle.asm" +INCLUDE "crysaudio/music/kantotrainerbattle.asm" +INCLUDE "crysaudio/music/kantowildbattle.asm" +INCLUDE "crysaudio/music/pokemoncenter.asm" +INCLUDE "crysaudio/music/looklass.asm" +INCLUDE "crysaudio/music/lookofficer.asm" +INCLUDE "crysaudio/music/route2.asm" +INCLUDE "crysaudio/music/mtmoon.asm" +INCLUDE "crysaudio/music/showmearound.asm" +INCLUDE "crysaudio/music/gamecorner.asm" +INCLUDE "crysaudio/music/bicycle.asm" +INCLUDE "crysaudio/music/looksage.asm" +INCLUDE "crysaudio/music/pokemonchannel.asm" +INCLUDE "crysaudio/music/lighthouse.asm" +INCLUDE "crysaudio/music/lakeofrage.asm" +INCLUDE "crysaudio/music/indigoplateau.asm" +INCLUDE "crysaudio/music/route37.asm" +INCLUDE "crysaudio/music/rockethideout.asm" +INCLUDE "crysaudio/music/dragonsden.asm" +INCLUDE "crysaudio/music/ruinsofalphradio.asm" +INCLUDE "crysaudio/music/lookbeauty.asm" +INCLUDE "crysaudio/music/route26.asm" +INCLUDE "crysaudio/music/ecruteakcity.asm" +INCLUDE "crysaudio/music/lakeofragerocketradio.asm" +INCLUDE "crysaudio/music/magnettrain.asm" +INCLUDE "crysaudio/music/lavendertown.asm" +INCLUDE "crysaudio/music/dancinghall.asm" +INCLUDE "crysaudio/music/contestresults.asm" +INCLUDE "crysaudio/music/route30.asm" SECTION "Songs 3", ROMX - inc_section "crysaudio/music/violetcity.asm" - inc_section "crysaudio/music/route29.asm" - inc_section "crysaudio/music/halloffame.asm" - inc_section "crysaudio/music/healpokemon.asm" - inc_section "crysaudio/music/evolution.asm" - inc_section "crysaudio/music/printer.asm" +INCLUDE "crysaudio/music/violetcity.asm" +INCLUDE "crysaudio/music/route29.asm" +INCLUDE "crysaudio/music/halloffame.asm" +INCLUDE "crysaudio/music/healpokemon.asm" +INCLUDE "crysaudio/music/evolution.asm" +INCLUDE "crysaudio/music/printer.asm" SECTION "Songs 4", ROMX - inc_section "crysaudio/music/viridiancity.asm" - inc_section "crysaudio/music/celadoncity.asm" -SECTION "Wild Pokemon Victory and Successful Capture", ROMX - INCLUDE "crysaudio/music/wildpokemonvictory.asm" - INCLUDE "crysaudio/music/successfulcapture.asm" - inc_section "crysaudio/music/gymleadervictory.asm" - inc_section "crysaudio/music/mtmoonsquare.asm" - inc_section "crysaudio/music/gym.asm" - inc_section "crysaudio/music/pallettown.asm" - inc_section "crysaudio/music/profoakspokemontalk.asm" - inc_section "crysaudio/music/profoak.asm" -SECTION "Johto Rival", ROMX - INCLUDE "crysaudio/music/lookrival.asm" - INCLUDE "crysaudio/music/aftertherivalfight.asm" - inc_section "crysaudio/music/surf.asm" - inc_section "crysaudio/music/nationalpark.asm" - inc_section "crysaudio/music/azaleatown.asm" - inc_section "crysaudio/music/cherrygrovecity.asm" - inc_section "crysaudio/music/unioncave.asm" -SECTION "Johto Wild Battle", ROMX - INCLUDE "crysaudio/music/johtowildbattle.asm" - INCLUDE "crysaudio/music/johtowildbattlenight.asm" - inc_section "crysaudio/music/johtotrainerbattle.asm" - inc_section "crysaudio/music/lookyoungster.asm" - inc_section "crysaudio/music/tintower.asm" - inc_section "crysaudio/music/sprouttower.asm" - inc_section "crysaudio/music/burnedtower.asm" - inc_section "crysaudio/music/mom.asm" - inc_section "crysaudio/music/victoryroad.asm" - inc_section "crysaudio/music/pokemonlullaby.asm" - inc_section "crysaudio/music/pokemonmarch.asm" - inc_section "crysaudio/music/goldsilveropening.asm" - inc_section "crysaudio/music/goldsilveropening2.asm" - inc_section "crysaudio/music/lookhiker.asm" -SECTION "Johto Rocket Themes", ROMX - INCLUDE "crysaudio/music/lookrocket.asm" - INCLUDE "crysaudio/music/rockettheme.asm" - inc_section "crysaudio/music/mainmenu.asm" - inc_section "crysaudio/music/lookkimonogirl.asm" - inc_section "crysaudio/music/pokeflutechannel.asm" - inc_section "crysaudio/music/bugcatchingcontest.asm" +INCLUDE "crysaudio/music/viridiancity.asm" +INCLUDE "crysaudio/music/celadoncity.asm" + +INCLUDE "crysaudio/music/wildpokemonvictory.asm" +INCLUDE "crysaudio/music/successfulcapture.asm" +assert BANK(Music_WildPokemonVictory) == BANK(Music_SuccessfulCapture) + +INCLUDE "crysaudio/music/gymleadervictory.asm" +INCLUDE "crysaudio/music/mtmoonsquare.asm" +INCLUDE "crysaudio/music/gym.asm" +INCLUDE "crysaudio/music/pallettown.asm" +INCLUDE "crysaudio/music/profoakspokemontalk.asm" +INCLUDE "crysaudio/music/profoak.asm" + +INCLUDE "crysaudio/music/lookrival.asm" +INCLUDE "crysaudio/music/aftertherivalfight.asm" +assert BANK(Music_LookRival) == BANK(Music_AfterTheRivalFight) + +INCLUDE "crysaudio/music/surf.asm" +INCLUDE "crysaudio/music/nationalpark.asm" +INCLUDE "crysaudio/music/azaleatown.asm" +INCLUDE "crysaudio/music/cherrygrovecity.asm" +INCLUDE "crysaudio/music/unioncave.asm" + +INCLUDE "crysaudio/music/johtowildbattle.asm" +INCLUDE "crysaudio/music/johtowildbattlenight.asm" +assert BANK(Music_JohtoWildBattle) == BANK(Music_JohtoWildBattleNight) + +INCLUDE "crysaudio/music/johtotrainerbattle.asm" +INCLUDE "crysaudio/music/lookyoungster.asm" +INCLUDE "crysaudio/music/tintower.asm" +INCLUDE "crysaudio/music/sprouttower.asm" +INCLUDE "crysaudio/music/burnedtower.asm" +INCLUDE "crysaudio/music/mom.asm" +INCLUDE "crysaudio/music/victoryroad.asm" +INCLUDE "crysaudio/music/pokemonlullaby.asm" +INCLUDE "crysaudio/music/pokemonmarch.asm" +INCLUDE "crysaudio/music/goldsilveropening.asm" +INCLUDE "crysaudio/music/goldsilveropening2.asm" +INCLUDE "crysaudio/music/lookhiker.asm" + +INCLUDE "crysaudio/music/lookrocket.asm" +INCLUDE "crysaudio/music/rockettheme.asm" +assert BANK(Music_LookRocket) == BANK(Music_RocketTheme) + +INCLUDE "crysaudio/music/mainmenu.asm" +INCLUDE "crysaudio/music/lookkimonogirl.asm" +INCLUDE "crysaudio/music/pokeflutechannel.asm" +INCLUDE "crysaudio/music/bugcatchingcontest.asm" SECTION "Songs 5", ROMX - inc_section "crysaudio/music/mobileadaptermenu.asm" - inc_section "crysaudio/music/buenaspassword.asm" - inc_section "crysaudio/music/lookmysticalman.asm" - inc_section "crysaudio/music/crystalopening.asm" - inc_section "crysaudio/music/battletowertheme.asm" - inc_section "crysaudio/music/suicunebattle.asm" - inc_section "crysaudio/music/battletowerlobby.asm" - inc_section "crysaudio/music/mobilecenter.asm" +INCLUDE "crysaudio/music/mobileadaptermenu.asm" +INCLUDE "crysaudio/music/buenaspassword.asm" +INCLUDE "crysaudio/music/lookmysticalman.asm" +INCLUDE "crysaudio/music/crystalopening.asm" +INCLUDE "crysaudio/music/battletowertheme.asm" +INCLUDE "crysaudio/music/suicunebattle.asm" +INCLUDE "crysaudio/music/battletowerlobby.asm" +INCLUDE "crysaudio/music/mobilecenter.asm" SECTION "Extra Songs 1", ROMX - inc_section "crysaudio/music/credits.asm" - inc_section "crysaudio/music/clair.asm" - inc_section "crysaudio/music/mobileadapter.asm" +INCLUDE "crysaudio/music/credits.asm" +INCLUDE "crysaudio/music/clair.asm" +INCLUDE "crysaudio/music/mobileadapter.asm" SECTION "Extra Songs 2", ROMX - inc_section "crysaudio/music/postcredits.asm" +INCLUDE "crysaudio/music/postcredits.asm" SECTION "RBY Songs 1", ROMX - inc_section "crysaudio/music/RBY/pkmnhealed.asm" - inc_section "crysaudio/music/RBY/routes1.asm" - inc_section "crysaudio/music/RBY/routes2.asm" - inc_section "crysaudio/music/RBY/routes3.asm" - inc_section "crysaudio/music/RBY/routes4.asm" - inc_section "crysaudio/music/RBY/indigoplateau.asm" - inc_section "crysaudio/music/RBY/pallettown.asm" - inc_section "crysaudio/music/RBY/unusedsong.asm" - inc_section "crysaudio/music/RBY/cities1.asm" - inc_section "crysaudio/music/RBY/museumguy.asm" - inc_section "crysaudio/music/RBY/meetprofoak.asm" - inc_section "crysaudio/music/RBY/meetrival.asm" - inc_section "crysaudio/music/RBY/ssanne.asm" - inc_section "crysaudio/music/RBY/cities2.asm" - inc_section "crysaudio/music/RBY/celadon.asm" - inc_section "crysaudio/music/RBY/cinnabar.asm" - inc_section "crysaudio/music/RBY/vermilion.asm" - inc_section "crysaudio/music/RBY/lavender.asm" - inc_section "crysaudio/music/RBY/safarizone.asm" - inc_section "crysaudio/music/RBY/gym.asm" - inc_section "crysaudio/music/RBY/pokecenter.asm" +INCLUDE "crysaudio/music/RBY/pkmnhealed.asm" +INCLUDE "crysaudio/music/RBY/routes1.asm" +INCLUDE "crysaudio/music/RBY/routes2.asm" +INCLUDE "crysaudio/music/RBY/routes3.asm" +INCLUDE "crysaudio/music/RBY/routes4.asm" +INCLUDE "crysaudio/music/RBY/indigoplateau.asm" +INCLUDE "crysaudio/music/RBY/pallettown.asm" +INCLUDE "crysaudio/music/RBY/unusedsong.asm" +INCLUDE "crysaudio/music/RBY/cities1.asm" +INCLUDE "crysaudio/music/RBY/museumguy.asm" +INCLUDE "crysaudio/music/RBY/meetprofoak.asm" +INCLUDE "crysaudio/music/RBY/meetrival.asm" +INCLUDE "crysaudio/music/RBY/ssanne.asm" +INCLUDE "crysaudio/music/RBY/cities2.asm" +INCLUDE "crysaudio/music/RBY/celadon.asm" +INCLUDE "crysaudio/music/RBY/cinnabar.asm" +INCLUDE "crysaudio/music/RBY/vermilion.asm" +INCLUDE "crysaudio/music/RBY/lavender.asm" +INCLUDE "crysaudio/music/RBY/safarizone.asm" +INCLUDE "crysaudio/music/RBY/gym.asm" +INCLUDE "crysaudio/music/RBY/pokecenter.asm" SECTION "RBY Songs 2", ROMX - inc_section "crysaudio/music/RBY/gymleaderbattle.asm" - inc_section "crysaudio/music/RBY/trainerbattle.asm" - inc_section "crysaudio/music/RBY/wildbattle.asm" - inc_section "crysaudio/music/RBY/finalbattle.asm" - inc_section "crysaudio/music/RBY/defeatedtrainer.asm" - inc_section "crysaudio/music/RBY/defeatedwildmon.asm" - inc_section "crysaudio/music/RBY/defeatedgymleader.asm" +INCLUDE "crysaudio/music/RBY/gymleaderbattle.asm" +INCLUDE "crysaudio/music/RBY/trainerbattle.asm" +INCLUDE "crysaudio/music/RBY/wildbattle.asm" +INCLUDE "crysaudio/music/RBY/finalbattle.asm" +INCLUDE "crysaudio/music/RBY/defeatedtrainer.asm" +INCLUDE "crysaudio/music/RBY/defeatedwildmon.asm" +INCLUDE "crysaudio/music/RBY/defeatedgymleader.asm" SECTION "RBY Songs 3", ROMX - inc_section "crysaudio/music/RBY/bikeriding.asm" - inc_section "crysaudio/music/RBY/dungeon1.asm" - inc_section "crysaudio/music/RBY/gamecorner.asm" - inc_section "crysaudio/music/RBY/titlescreen.asm" - inc_section "crysaudio/music/RBY/dungeon2.asm" - inc_section "crysaudio/music/RBY/dungeon3.asm" - inc_section "crysaudio/music/RBY/cinnabarmansion.asm" - inc_section "crysaudio/music/RBY/oakslab.asm" - inc_section "crysaudio/music/RBY/pokemontower.asm" - inc_section "crysaudio/music/RBY/silphco.asm" - inc_section "crysaudio/music/RBY/meeteviltrainer.asm" - inc_section "crysaudio/music/RBY/meetfemaletrainer.asm" - inc_section "crysaudio/music/RBY/meetmaletrainer.asm" - inc_section "crysaudio/music/RBY/introbattle.asm" - inc_section "crysaudio/music/RBY/surfing.asm" - inc_section "crysaudio/music/RBY/jigglypuffsong.asm" - inc_section "crysaudio/music/RBY/halloffame.asm" - inc_section "crysaudio/music/RBY/credits.asm" +INCLUDE "crysaudio/music/RBY/bikeriding.asm" +INCLUDE "crysaudio/music/RBY/dungeon1.asm" +INCLUDE "crysaudio/music/RBY/gamecorner.asm" +INCLUDE "crysaudio/music/RBY/titlescreen.asm" +INCLUDE "crysaudio/music/RBY/dungeon2.asm" +INCLUDE "crysaudio/music/RBY/dungeon3.asm" +INCLUDE "crysaudio/music/RBY/cinnabarmansion.asm" +INCLUDE "crysaudio/music/RBY/oakslab.asm" +INCLUDE "crysaudio/music/RBY/pokemontower.asm" +INCLUDE "crysaudio/music/RBY/silphco.asm" +INCLUDE "crysaudio/music/RBY/meeteviltrainer.asm" +INCLUDE "crysaudio/music/RBY/meetfemaletrainer.asm" +INCLUDE "crysaudio/music/RBY/meetmaletrainer.asm" +INCLUDE "crysaudio/music/RBY/introbattle.asm" +INCLUDE "crysaudio/music/RBY/surfing.asm" +INCLUDE "crysaudio/music/RBY/jigglypuffsong.asm" +INCLUDE "crysaudio/music/RBY/halloffame.asm" +INCLUDE "crysaudio/music/RBY/credits.asm" SECTION "RBY Songs 4", ROMX - inc_section "crysaudio/music/RBY/yellowintro.asm" - inc_section "crysaudio/music/RBY/surfingpikachu.asm" - inc_section "crysaudio/music/RBY/yellowunusedsong.asm" - inc_section "crysaudio/music/RBY/meetjessiejames.asm" +INCLUDE "crysaudio/music/RBY/yellowintro.asm" +INCLUDE "crysaudio/music/RBY/surfingpikachu.asm" +INCLUDE "crysaudio/music/RBY/yellowunusedsong.asm" +INCLUDE "crysaudio/music/RBY/meetjessiejames.asm" SECTION "TCG Songs 1", ROMX - inc_section "crysaudio/music/TCG/titlescreen.asm" - inc_section "crysaudio/music/TCG/dueltheme1.asm" - inc_section "crysaudio/music/TCG/dueltheme2.asm" - inc_section "crysaudio/music/TCG/dueltheme3.asm" - inc_section "crysaudio/music/TCG/pausemenu.asm" - inc_section "crysaudio/music/TCG/pcmainmenu.asm" - inc_section "crysaudio/music/TCG/deckmachine.asm" - inc_section "crysaudio/music/TCG/cardpop.asm" - inc_section "crysaudio/music/TCG/overworld.asm" - inc_section "crysaudio/music/TCG/pokemondome.asm" - inc_section "crysaudio/music/TCG/challengehall.asm" - inc_section "crysaudio/music/TCG/club1.asm" - inc_section "crysaudio/music/TCG/club2.asm" - inc_section "crysaudio/music/TCG/club3.asm" +INCLUDE "crysaudio/music/TCG/titlescreen.asm" +INCLUDE "crysaudio/music/TCG/dueltheme1.asm" +INCLUDE "crysaudio/music/TCG/dueltheme2.asm" +INCLUDE "crysaudio/music/TCG/dueltheme3.asm" +INCLUDE "crysaudio/music/TCG/pausemenu.asm" +INCLUDE "crysaudio/music/TCG/pcmainmenu.asm" +INCLUDE "crysaudio/music/TCG/deckmachine.asm" +INCLUDE "crysaudio/music/TCG/cardpop.asm" +INCLUDE "crysaudio/music/TCG/overworld.asm" +INCLUDE "crysaudio/music/TCG/pokemondome.asm" +INCLUDE "crysaudio/music/TCG/challengehall.asm" +INCLUDE "crysaudio/music/TCG/club1.asm" +INCLUDE "crysaudio/music/TCG/club2.asm" +INCLUDE "crysaudio/music/TCG/club3.asm" SECTION "TCG Songs 2", ROMX - inc_section "crysaudio/music/TCG/ronald.asm" - inc_section "crysaudio/music/TCG/imakuni.asm" - inc_section "crysaudio/music/TCG/hallofhonor.asm" - inc_section "crysaudio/music/TCG/credits.asm" - inc_section "crysaudio/music/TCG/matchstart1.asm" - inc_section "crysaudio/music/TCG/matchstart2.asm" - inc_section "crysaudio/music/TCG/matchstart3.asm" - inc_section "crysaudio/music/TCG/matchvictory.asm" - inc_section "crysaudio/music/TCG/matchloss.asm" - inc_section "crysaudio/music/TCG/matchdraw.asm" - inc_section "crysaudio/music/TCG/boosterpack.asm" - inc_section "crysaudio/music/TCG/medal.asm" +INCLUDE "crysaudio/music/TCG/ronald.asm" +INCLUDE "crysaudio/music/TCG/imakuni.asm" +INCLUDE "crysaudio/music/TCG/hallofhonor.asm" +INCLUDE "crysaudio/music/TCG/credits.asm" +INCLUDE "crysaudio/music/TCG/matchstart1.asm" +INCLUDE "crysaudio/music/TCG/matchstart2.asm" +INCLUDE "crysaudio/music/TCG/matchstart3.asm" +INCLUDE "crysaudio/music/TCG/matchvictory.asm" +INCLUDE "crysaudio/music/TCG/matchloss.asm" +INCLUDE "crysaudio/music/TCG/matchdraw.asm" +INCLUDE "crysaudio/music/TCG/boosterpack.asm" +INCLUDE "crysaudio/music/TCG/medal.asm" SECTION "TCG2 Songs 1", ROMX - inc_section "crysaudio/music/TCG2/titlescreen.asm" - inc_section "crysaudio/music/TCG2/herecomesgr.asm" - inc_section "crysaudio/music/TCG2/groverworld.asm" - inc_section "crysaudio/music/TCG2/fort1.asm" - inc_section "crysaudio/music/TCG2/fort2.asm" - inc_section "crysaudio/music/TCG2/fort3.asm" - inc_section "crysaudio/music/TCG2/fort4.asm" - inc_section "crysaudio/music/TCG2/grcastle.asm" - inc_section "crysaudio/music/TCG2/grchallengecup.asm" +INCLUDE "crysaudio/music/TCG2/titlescreen.asm" +INCLUDE "crysaudio/music/TCG2/herecomesgr.asm" +INCLUDE "crysaudio/music/TCG2/groverworld.asm" +INCLUDE "crysaudio/music/TCG2/fort1.asm" +INCLUDE "crysaudio/music/TCG2/fort2.asm" +INCLUDE "crysaudio/music/TCG2/fort3.asm" +INCLUDE "crysaudio/music/TCG2/fort4.asm" +INCLUDE "crysaudio/music/TCG2/grcastle.asm" +INCLUDE "crysaudio/music/TCG2/grchallengecup.asm" SECTION "TCG2 Songs 2", ROMX - inc_section "crysaudio/music/TCG2/gamecorner.asm" - inc_section "crysaudio/music/TCG2/grblimp.asm" - inc_section "crysaudio/music/TCG2/grdueltheme1.asm" - inc_section "crysaudio/music/TCG2/grdueltheme2.asm" - inc_section "crysaudio/music/TCG2/grdueltheme3.asm" - inc_section "crysaudio/music/TCG2/ishihara.asm" +INCLUDE "crysaudio/music/TCG2/gamecorner.asm" +INCLUDE "crysaudio/music/TCG2/grblimp.asm" +INCLUDE "crysaudio/music/TCG2/grdueltheme1.asm" +INCLUDE "crysaudio/music/TCG2/grdueltheme2.asm" +INCLUDE "crysaudio/music/TCG2/grdueltheme3.asm" +INCLUDE "crysaudio/music/TCG2/ishihara.asm" SECTION "TCG2 Songs 3", ROMX - inc_section "crysaudio/music/TCG2/imakuni2.asm" - inc_section "crysaudio/music/TCG2/credits.asm" - inc_section "crysaudio/music/TCG2/diddly1.asm" - inc_section "crysaudio/music/TCG2/diddly2.asm" - inc_section "crysaudio/music/TCG2/diddly3.asm" - inc_section "crysaudio/music/TCG2/diddly4.asm" - inc_section "crysaudio/music/TCG2/diddly5.asm" - inc_section "crysaudio/music/TCG2/diddly6.asm" +INCLUDE "crysaudio/music/TCG2/imakuni2.asm" +INCLUDE "crysaudio/music/TCG2/credits.asm" +INCLUDE "crysaudio/music/TCG2/diddly1.asm" +INCLUDE "crysaudio/music/TCG2/diddly2.asm" +INCLUDE "crysaudio/music/TCG2/diddly3.asm" +INCLUDE "crysaudio/music/TCG2/diddly4.asm" +INCLUDE "crysaudio/music/TCG2/diddly5.asm" +INCLUDE "crysaudio/music/TCG2/diddly6.asm" SECTION "Pinball Songs 1", ROMX - inc_section "crysaudio/music/pinball/redfield.asm" - inc_section "crysaudio/music/pinball/catchemred.asm" - inc_section "crysaudio/music/pinball/hurryupred.asm" - inc_section "crysaudio/music/pinball/pokedex.asm" -SECTION "Gastly and Haunter Graveyard", ROMX - INCLUDE "crysaudio/music/pinball/gastlyinthegraveyard.asm" - INCLUDE "crysaudio/music/pinball/haunterinthegraveyard.asm" - inc_section "crysaudio/music/pinball/gengarinthegraveyard.asm" +INCLUDE "crysaudio/music/pinball/redfield.asm" +INCLUDE "crysaudio/music/pinball/catchemred.asm" +INCLUDE "crysaudio/music/pinball/hurryupred.asm" +INCLUDE "crysaudio/music/pinball/pokedex.asm" + +INCLUDE "crysaudio/music/pinball/gastlyinthegraveyard.asm" +INCLUDE "crysaudio/music/pinball/haunterinthegraveyard.asm" +assert BANK(Music_GastlyInTheGraveyard) == BANK(Music_HaunterInTheGraveyard) + +INCLUDE "crysaudio/music/pinball/gengarinthegraveyard.asm" SECTION "Pinball Songs 2", ROMX - inc_section "crysaudio/music/pinball/bluefield.asm" - inc_section "crysaudio/music/pinball/catchemblue.asm" - inc_section "crysaudio/music/pinball/hurryupblue.asm" - inc_section "crysaudio/music/pinball/hiscore.asm" - inc_section "crysaudio/music/pinball/gameover.asm" +INCLUDE "crysaudio/music/pinball/bluefield.asm" +INCLUDE "crysaudio/music/pinball/catchemblue.asm" +INCLUDE "crysaudio/music/pinball/hurryupblue.asm" +INCLUDE "crysaudio/music/pinball/hiscore.asm" +INCLUDE "crysaudio/music/pinball/gameover.asm" SECTION "Pinball Songs 3", ROMX - inc_section "crysaudio/music/pinball/whackthediglett.asm" - inc_section "crysaudio/music/pinball/whackthedugtrio.asm" - inc_section "crysaudio/music/pinball/seelstage.asm" - inc_section "crysaudio/music/pinball/title.asm" +INCLUDE "crysaudio/music/pinball/whackthediglett.asm" +INCLUDE "crysaudio/music/pinball/whackthedugtrio.asm" +INCLUDE "crysaudio/music/pinball/seelstage.asm" +INCLUDE "crysaudio/music/pinball/title.asm" SECTION "Pinball Songs 4", ROMX - inc_section "crysaudio/music/pinball/mewtwostage.asm" - inc_section "crysaudio/music/pinball/options.asm" - inc_section "crysaudio/music/pinball/fieldselect.asm" - inc_section "crysaudio/music/pinball/meowthstage.asm" +INCLUDE "crysaudio/music/pinball/mewtwostage.asm" +INCLUDE "crysaudio/music/pinball/options.asm" +INCLUDE "crysaudio/music/pinball/fieldselect.asm" +INCLUDE "crysaudio/music/pinball/meowthstage.asm" SECTION "Pinball Songs 5", ROMX - inc_section "crysaudio/music/pinball/endcredits.asm" - inc_section "crysaudio/music/pinball/nameentry.asm" +INCLUDE "crysaudio/music/pinball/endcredits.asm" +INCLUDE "crysaudio/music/pinball/nameentry.asm" SECTION "Sound Effects", ROMX diff --git a/crysaudio/macros.asm b/crysaudio/macros.asm index e423131f..cd3463c2 100644 --- a/crysaudio/macros.asm +++ b/crysaudio/macros.asm @@ -2,11 +2,6 @@ MACRO bigdw ; big-endian word db HIGH(\1), LOW(\1) ENDM -MACRO inc_section - SECTION \1, ROMX - include \1 ; "" ; trick scan_includes to ignore -ENDM - MACRO maskbits ; masks just enough bits to cover values 0 to \1 - 1 ; \2 is an optional shift amount From 610521f77a1a974b27961ada65cba683b1bd3709 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 1 Jan 2023 19:54:26 -0600 Subject: [PATCH 28/33] Fix pitch_slide on channel 2 and 3 thanks to TempoQuill --- crysaudio/engine.asm | 8 ++- crysaudio/music/RBY/titlescreen.asm | 105 ++++------------------------ 2 files changed, 20 insertions(+), 93 deletions(-) diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index e4726126..18866b8d 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -363,6 +363,8 @@ UpdateChannels: jr nz, .ch2_rest bit NOTE_NOISE_SAMPLING, [hl] jr nz, .ch2_noise_sampling + bit NOTE_FREQ_OVERRIDE, [hl] + jr nz, .ch2_frequency_override bit NOTE_VIBRATO_OVERRIDE, [hl] jr nz, .ch2_vibrato_override bit NOTE_DUTY_OVERRIDE, [hl] @@ -375,7 +377,7 @@ UpdateChannels: ldh [rNR21], a ret -.ch2_frequency_override ; unreferenced +.ch2_frequency_override ld a, [wCurTrackFrequency] ldh [rNR23], a ld a, [wCurTrackFrequency + 1] @@ -423,11 +425,13 @@ UpdateChannels: jr nz, .ch3_rest bit NOTE_NOISE_SAMPLING, [hl] jr nz, .ch3_noise_sampling + bit NOTE_FREQ_OVERRIDE, [hl] + jr nz, .ch3_frequency_override bit NOTE_VIBRATO_OVERRIDE, [hl] jr nz, .ch3_vibrato_override ret -.ch3_frequency_override ; unreferenced +.ch3_frequency_override ld a, [wCurTrackFrequency] ldh [rNR33], a ld a, [wCurTrackFrequency + 1] diff --git a/crysaudio/music/RBY/titlescreen.asm b/crysaudio/music/RBY/titlescreen.asm index 44c73b16..21a2c88c 100644 --- a/crysaudio/music/RBY/titlescreen.asm +++ b/crysaudio/music/RBY/titlescreen.asm @@ -390,61 +390,16 @@ Music_RBYTitleScreen_branch_7e664:: note A_, 3 sound_call Music_RBYTitleScreen_branch_7e6e5 octave 5 - ;pitch_slide 1, 4, D_ - ;note D_, 4 - ;rest 4 - note_type 3, 1, 0 ; XXX - note D_, 1 ; XXX - note C#, 1 ; XXX - note C_, 1 ; XXX - octave 4 ; XXX - note B_, 1 ; XXX - note A#, 1 ; XXX - note A_, 1 ; XXX - note G#, 1 ; XXX - note G_, 1 ; XXX - note F#, 1 ; XXX - note F_, 1 ; XXX - note E_, 1 ; XXX - note D#, 1 ; XXX - note D_, 4 ; XXX - rest 16 ; XXX + pitch_slide 1, 4, D_ + note D_, 4 + rest 4 octave 6 - ;pitch_slide 1, 5, D_ - ;note D_, 4 - note D_, 1 ; XXX - note C#, 1 ; XXX - note C_, 1 ; XXX - octave 5 ; XXX - note B_, 1 ; XXX - note A#, 1 ; XXX - note A_, 1 ; XXX - note G#, 1 ; XXX - note G_, 1 ; XXX - note F#, 1 ; XXX - note F_, 1 ; XXX - note E_, 1 ; XXX - note D#, 1 ; XXX - note D_, 4 ; XXX + pitch_slide 1, 5, D_ + note D_, 4 octave 5 - ;pitch_slide 1, 4, D_ - ;note D_, 4 - ;rest 2 - note D_, 1 ; XXX - note C#, 1 ; XXX - note C_, 1 ; XXX - octave 4 ; XXX - note B_, 1 ; XXX - note A#, 1 ; XXX - note A_, 1 ; XXX - note G#, 1 ; XXX - note G_, 1 ; XXX - note F#, 1 ; XXX - note F_, 1 ; XXX - note E_, 1 ; XXX - note D#, 1 ; XXX - note D_, 4 ; XXX - rest 8 ; XXX + pitch_slide 1, 4, D_ + note D_, 4 + rest 2 note_type 8, 1, 0 octave 4 note C_, 4 @@ -452,45 +407,13 @@ Music_RBYTitleScreen_branch_7e664:: note C#, 4 sound_call Music_RBYTitleScreen_branch_7e6e5 octave 6 - ;pitch_slide 1, 5, D_ - ;note D_, 4 - ;rest 4 - note_type 3, 1, 0 ; XXX - note D_, 1 ; XXX - note C#, 1 ; XXX - note C_, 1 ; XXX - octave 5 ; XXX - note B_, 1 ; XXX - note A#, 1 ; XXX - note A_, 1 ; XXX - note G#, 1 ; XXX - note G_, 1 ; XXX - note F#, 1 ; XXX - note F_, 1 ; XXX - note E_, 1 ; XXX - note D#, 1 ; XXX - note D_, 4 ; XXX - rest 16 ; XXX + pitch_slide 1, 5, D_ + note D_, 4 + rest 4 octave 5 - ;pitch_slide 1, 4, D_ - ;note D_, 4 - ;rest 6 - note D_, 1 ; XXX - note C#, 1 ; XXX - note C_, 1 ; XXX - octave 4 ; XXX - note B_, 1 ; XXX - note A#, 1 ; XXX - note A_, 1 ; XXX - note G#, 1 ; XXX - note G_, 1 ; XXX - note F#, 1 ; XXX - note F_, 1 ; XXX - note E_, 1 ; XXX - note D#, 1 ; XXX - note D_, 4 ; XXX - rest 12 ; XXX - rest 12 ; XXX + pitch_slide 1, 4, D_ + note D_, 4 + rest 6 note_type 8, 1, 0 octave 4 note C_, 4 From cf42c6ee654c788884e2c1bacf31b123f9950193 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sun, 1 Jan 2023 20:33:32 -0600 Subject: [PATCH 29/33] Fix pitch_slide on channel 2 and 3, part 2 --- crysaudio/engine.asm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/crysaudio/engine.asm b/crysaudio/engine.asm index 18866b8d..cf313e22 100644 --- a/crysaudio/engine.asm +++ b/crysaudio/engine.asm @@ -367,6 +367,14 @@ UpdateChannels: jr nz, .ch2_frequency_override bit NOTE_VIBRATO_OVERRIDE, [hl] jr nz, .ch2_vibrato_override + jr .ch2_check_duty_override + +.ch2_frequency_override + ld a, [wCurTrackFrequency] + ldh [rNR23], a + ld a, [wCurTrackFrequency + 1] + ldh [rNR24], a +.ch2_check_duty_override bit NOTE_DUTY_OVERRIDE, [hl] ret z ld a, [wCurTrackDuty] @@ -377,13 +385,6 @@ UpdateChannels: ldh [rNR21], a ret -.ch2_frequency_override - ld a, [wCurTrackFrequency] - ldh [rNR23], a - ld a, [wCurTrackFrequency + 1] - ldh [rNR24], a - ret - .ch2_vibrato_override ld a, [wCurTrackDuty] ld d, a From aab4d2088195f8abdefde83d62e86a770ecd2d77 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Fri, 13 Jan 2023 21:07:04 -0600 Subject: [PATCH 30/33] Update TCG songs --- crysaudio/music/TCG/boosterpack.asm | 93 +- crysaudio/music/TCG/cardpop.asm | 112 +- crysaudio/music/TCG/challengehall.asm | 513 ++- crysaudio/music/TCG/club1.asm | 423 +- crysaudio/music/TCG/club2.asm | 181 +- crysaudio/music/TCG/club3.asm | 475 ++- crysaudio/music/TCG/credits.asm | 5635 +++++++++++++------------ crysaudio/music/TCG/deckmachine.asm | 137 +- crysaudio/music/TCG/dueltheme1.asm | 816 ++-- crysaudio/music/TCG/dueltheme2.asm | 417 +- crysaudio/music/TCG/dueltheme3.asm | 848 ++-- crysaudio/music/TCG/hallofhonor.asm | 247 +- crysaudio/music/TCG/imakuni.asm | 67 +- crysaudio/music/TCG/matchdraw.asm | 53 +- crysaudio/music/TCG/matchloss.asm | 81 +- crysaudio/music/TCG/matchstart1.asm | 13 +- crysaudio/music/TCG/matchstart2.asm | 25 +- crysaudio/music/TCG/matchstart3.asm | 25 +- crysaudio/music/TCG/matchvictory.asm | 113 +- crysaudio/music/TCG/medal.asm | 93 +- crysaudio/music/TCG/overworld.asm | 795 ++-- crysaudio/music/TCG/pausemenu.asm | 314 +- crysaudio/music/TCG/pcmainmenu.asm | 227 +- crysaudio/music/TCG/pokemondome.asm | 327 +- crysaudio/music/TCG/ronald.asm | 269 +- crysaudio/music/TCG/titlescreen.asm | 321 +- 26 files changed, 6386 insertions(+), 6234 deletions(-) diff --git a/crysaudio/music/TCG/boosterpack.asm b/crysaudio/music/TCG/boosterpack.asm index b73378c9..b9b491b3 100644 --- a/crysaudio/music/TCG/boosterpack.asm +++ b/crysaudio/music/TCG/boosterpack.asm @@ -4,101 +4,101 @@ Music_BoosterPack: channel 2, Music_BoosterPack_Ch2 channel 3, Music_BoosterPack_Ch3 -Music_BoosterPack_Ch1: ; f7d60 (3d:7d60) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_BoosterPack_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 4 duty_cycle 1 speed 1 - channel_volume 10 + volume_envelope 10, 0 note D#, 5 - channel_volume 3 + volume_envelope 3, 7 note D#, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note A#, 5 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 - channel_volume 10 + volume_envelope 10, 0 note F_, 5 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 5 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 5 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 6 - channel_volume 3 + volume_envelope 3, 7 note B_, 9 sound_ret -Music_BoosterPack_Ch2: ; f7d9e (3d:7d9e) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_BoosterPack_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 1 speed 1 - channel_volume 9 + volume_envelope 9, 0 note A#, 5 - channel_volume 2 + volume_envelope 2, 7 note A#, 1 inc_octave - channel_volume 9 + volume_envelope 9, 0 note D#, 5 - channel_volume 2 + volume_envelope 2, 7 note D#, 1 - channel_volume 9 + volume_envelope 9, 0 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 2 - channel_volume 9 + volume_envelope 9, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 9 + volume_envelope 9, 0 note F_, 5 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 9 + volume_envelope 9, 0 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 2 - channel_volume 9 + volume_envelope 9, 0 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 6 - channel_volume 2 + volume_envelope 2, 7 note G_, 9 sound_ret -Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) - ;stereo_panning 1, 1 +Music_BoosterPack_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 0 +; cutoff 8 +; echo 0 octave 2 speed 1 note D#, 6 @@ -112,9 +112,8 @@ Music_BoosterPack_Ch3: ; f7ddb (3d:7ddb) note F_, 7 dec_octave note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 6 sound_ret -; 0xf7df8 diff --git a/crysaudio/music/TCG/cardpop.asm b/crysaudio/music/TCG/cardpop.asm index 77612bfe..2d8f3963 100644 --- a/crysaudio/music/TCG/cardpop.asm +++ b/crysaudio/music/TCG/cardpop.asm @@ -5,12 +5,12 @@ Music_CardPop: channel 3, Music_CardPop_Ch3 channel 4, Music_CardPop_Ch4 -Music_CardPop_Ch1: ; f703a (3d:703a) +Music_CardPop_Ch1: speed 4 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 .MainLoop .Loop1 rest 16 @@ -18,50 +18,50 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 14 .Loop2 octave 5 - fade_wave 8 +; cutoff 8 note F#, 1 note G_, 1 - fade_wave 6 +; cutoff 6 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A_, 1 inc_octave - channel_volume 3 + volume_envelope 3, 7 note D_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 inc_octave note D_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 note F#, 1 @@ -69,70 +69,70 @@ Music_CardPop_Ch1: ; f703a (3d:703a) rest 16 rest 14 octave 5 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 note F_, 1 - fade_wave 6 +; cutoff 6 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 9 + volume_envelope 9, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note G_, 1 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 9 + volume_envelope 9, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 inc_octave note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 rest 1 note E_, 1 rest 12 rest 16 - channel_volume 9 + volume_envelope 9, 0 rest 14 sound_loop 2, .Loop2 rest 2 sound_loop 0, .MainLoop -Music_CardPop_Ch2: ; f70df (3d:70df) +Music_CardPop_Ch2: speed 4 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 - channel_volume 6 - fade_wave 3 + volume_envelope 6, 0 +; cutoff 3 .Loop1 octave 2 note A_, 2 @@ -212,13 +212,13 @@ Music_CardPop_Ch2: ; f70df (3d:70df) sound_loop 0, Music_CardPop_Ch2 -Music_CardPop_Ch3: ; f713a (3d:713a) +Music_CardPop_Ch3: speed 4 fade_wave 11 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 - ;echo 0 - ;cutoff 8 +; echo 0 +; cutoff 8 sound_call Branch_f715b note C_, 2 note C#, 2 @@ -272,9 +272,8 @@ Branch_f716c: sound_ret -Music_CardPop_Ch4: ; f717d (3d:717d) +Music_CardPop_Ch4: toggle_noise 6 -.MainLoop drum_speed 4 octave 1 .Loop1 @@ -292,7 +291,7 @@ Music_CardPop_Ch4: ; f717d (3d:717d) .Loop2 drum_note 2, 2 sound_loop 4, .Loop2 - sound_loop 0, .MainLoop + sound_loop 0, Music_CardPop_Ch4 Branch_f7196: drum_note 1, 2 @@ -305,4 +304,3 @@ Branch_f7196: drum_note 1, 2 drum_note 2, 2 sound_ret -; 0xf71a0 diff --git a/crysaudio/music/TCG/challengehall.asm b/crysaudio/music/TCG/challengehall.asm index 615f85a0..5429450f 100644 --- a/crysaudio/music/TCG/challengehall.asm +++ b/crysaudio/music/TCG/challengehall.asm @@ -5,67 +5,67 @@ Music_ChallengeHall: channel 3, Music_ChallengeHall_Ch3 channel 4, Music_ChallengeHall_Ch4 -Music_ChallengeHall_Ch1: ; f9646 (3e:5646) - ;stereo_panning 1, 1 - ;vibrato_type 8 +Music_ChallengeHall_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 15, 3, 3 - fade_wave 7 +; cutoff 7 octave 3 duty_cycle 2 - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 speed 1 note A_, 7 note G#, 4 - channel_volume 1 + volume_envelope 1, 7 note G#, 4 - channel_volume 8 + volume_envelope 8, 0 note A_, 4 - channel_volume 1 + volume_envelope 1, 7 note A_, 3 - channel_volume 8 + volume_envelope 8, 0 note B_, 4 - channel_volume 1 + volume_envelope 1, 7 note B_, 4 inc_octave - channel_volume 8 + volume_envelope 8, 0 note C#, 7 note C_, 4 - channel_volume 1 + volume_envelope 1, 7 note C_, 4 - channel_volume 8 + volume_envelope 8, 0 note C#, 4 - channel_volume 1 + volume_envelope 1, 7 note C#, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 1 + volume_envelope 1, 7 note D_, 4 - channel_volume 8 + volume_envelope 8, 0 note E_, 7 note D#, 4 - channel_volume 1 + volume_envelope 1, 7 note D#, 4 - channel_volume 8 + volume_envelope 8, 0 note E_, 4 - channel_volume 1 + volume_envelope 1, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 note F#, 4 - channel_volume 1 + volume_envelope 1, 7 note F#, 4 - channel_volume 8 + volume_envelope 8, 0 note G#, 4 - channel_volume 1 + volume_envelope 1, 7 note G#, 3 - channel_volume 8 + volume_envelope 8, 0 note A_, 8 note B_, 7 inc_octave note C#, 4 note D_, 4 .MainLoop - channel_volume 7 + volume_envelope 7, 0 speed 1 octave 5 .Loop1 @@ -75,277 +75,277 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) note F#, 4 sound_loop 8, .Loop1 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 dec_octave dec_octave dec_octave note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 dec_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 7 note B_, 8 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 - channel_volume 8 + volume_envelope 8, 0 note B_, 15 inc_octave note D_, 15 note E_, 15 inc_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 sound_call Branch_f9848 - channel_volume 10 + volume_envelope 10, 0 note D_, 8 speed 10 note C#, 6 - ;tie +; tie note C#, 6 - channel_volume 3 + volume_envelope 3, 7 speed 1 note C#, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 sound_call Branch_f9848 - channel_volume 10 + volume_envelope 10, 0 note C#, 8 dec_octave speed 10 note A_, 6 - ;tie +; tie note A_, 6 - channel_volume 3 + volume_envelope 3, 7 speed 1 note A_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 inc_octave note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note C#, 15 note D_, 15 note E_, 15 - channel_volume 2 + volume_envelope 2, 7 note E_, 15 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 note F_, 7 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 note F_, 8 note F#, 7 note G#, 7 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 10 + volume_envelope 10, 0 speed 10 note A_, 3 - ;tie +; tie speed 1 note A_, 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 rest 15 inc_octave note E_, 7 note D#, 7 - channel_volume 3 + volume_envelope 3, 7 note D#, 1 - channel_volume 10 + volume_envelope 10, 0 note E_, 7 note D#, 8 note E_, 7 note G#, 7 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 10 + volume_envelope 10, 0 speed 9 note A_, 5 speed 1 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 rest 15 inc_octave note D_, 7 note C#, 8 note D_, 7 - channel_volume 3 + volume_envelope 3, 7 note D_, 8 - channel_volume 10 + volume_envelope 10, 0 note A_, 7 - channel_volume 3 + volume_envelope 3, 7 note A_, 8 - channel_volume 10 + volume_envelope 10, 0 note G#, 15 - ;tie +; tie note G#, 7 - channel_volume 3 + volume_envelope 3, 7 note G#, 8 - channel_volume 10 + volume_envelope 10, 0 note F#, 15 - channel_volume 3 + volume_envelope 3, 7 note F#, 7 - channel_volume 10 + volume_envelope 10, 0 note G#, 8 speed 10 note E_, 6 speed 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 15 - channel_volume 10 + volume_envelope 10, 0 note C#, 15 note D_, 15 note E_, 15 - channel_volume 3 + volume_envelope 3, 7 note E_, 15 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 note F_, 7 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 note F_, 8 note F#, 6 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note G#, 6 - channel_volume 3 + volume_envelope 3, 7 note G#, 2 - channel_volume 10 + volume_envelope 10, 0 speed 10 note A_, 3 speed 1 note G#, 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 inc_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note F#, 6 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 15 - channel_volume 3 + volume_envelope 3, 7 note E_, 15 - channel_volume 10 + volume_envelope 10, 0 note B_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 dec_octave note B_, 7 inc_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note G#, 6 - channel_volume 3 + volume_envelope 3, 7 note G#, 2 - channel_volume 10 + volume_envelope 10, 0 speed 10 note A_, 3 speed 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 15 - channel_volume 10 + volume_envelope 10, 0 note B_, 6 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 6 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 speed 10 note D_, 3 speed 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 15 dec_octave - channel_volume 10 + volume_envelope 10, 0 note F#, 6 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note B_, 6 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 - channel_volume 10 + volume_envelope 10, 0 note A_, 15 - channel_volume 3 + volume_envelope 3, 7 note A_, 15 - channel_volume 10 + volume_envelope 10, 0 note G#, 11 - channel_volume 3 + volume_envelope 3, 7 note G#, 4 rest 7 - channel_volume 10 + volume_envelope 10, 0 note A_, 7 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 10 note A_, 6 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 inc_octave note C#, 7 @@ -364,54 +364,54 @@ Music_ChallengeHall_Ch1: ; f9646 (3e:5646) Branch_f9848: note C#, 15 - channel_volume 3 + volume_envelope 3, 7 note C#, 15 - channel_volume 10 + volume_envelope 10, 0 note E_, 15 - channel_volume 3 + volume_envelope 3, 7 note E_, 7 - channel_volume 10 + volume_envelope 10, 0 note C#, 8 note D_, 15 - channel_volume 3 + volume_envelope 3, 7 note D_, 15 - channel_volume 10 + volume_envelope 10, 0 note F#, 15 - channel_volume 3 + volume_envelope 3, 7 note F#, 7 - channel_volume 10 + volume_envelope 10, 0 note D_, 8 note E_, 7 - channel_volume 3 + volume_envelope 3, 7 note E_, 8 - channel_volume 10 + volume_envelope 10, 0 note A_, 15 note G#, 7 - channel_volume 3 + volume_envelope 3, 7 note G#, 8 - channel_volume 10 + volume_envelope 10, 0 note F#, 7 - channel_volume 3 + volume_envelope 3, 7 note F#, 8 - channel_volume 10 + volume_envelope 10, 0 note E_, 15 note D_, 7 - channel_volume 3 + volume_envelope 3, 7 note D_, 8 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 15 - channel_volume 3 + volume_envelope 3, 7 note B_, 7 inc_octave sound_ret -Music_ChallengeHall_Ch2: ; f9883 (3e:5883) - ;stereo_panning 1, 1 - ;vibrato_type 8 +Music_ChallengeHall_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 15, 3, 3 - fade_wave 7 +; cutoff 7 octave 3 speed 10 .Loop1 @@ -419,32 +419,32 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) sound_loop 2, .Loop1 .MainLoop duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 speed 10 note E_, 6 - ;tie +; tie note E_, 6 speed 1 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 dec_octave - channel_volume 8 + volume_envelope 8, 0 note E_, 7 note E_, 8 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 8 + volume_envelope 8, 0 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 8 + volume_envelope 8, 0 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 8 + volume_envelope 8, 0 note E_, 15 note F#, 15 note G#, 15 @@ -452,110 +452,110 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note B_, 8 speed 10 note A_, 6 - ;tie +; tie note A_, 6 speed 1 rest 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 sound_call Branch_f9a28 note G#, 8 speed 10 note E_, 6 - ;tie +; tie note E_, 6 speed 1 rest 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 - channel_volume 8 + volume_envelope 8, 0 note A_, 15 note B_, 15 inc_octave note C#, 15 - channel_volume 2 + volume_envelope 2, 7 note C#, 15 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 rest 15 dec_octave - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 15 inc_octave - channel_volume 8 + volume_envelope 8, 0 note D_, 7 duty_cycle 2 - channel_volume 6 + volume_envelope 6, 0 inc_octave note D_, 8 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 6 + volume_envelope 6, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 - channel_volume 6 + volume_envelope 6, 0 .Loop2 note E_, 4 note F#, 3 note E_, 4 note F#, 4 sound_loop 4, .Loop2 - channel_volume 2 + volume_envelope 2, 7 note F#, 5 rest 10 dec_octave dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 inc_octave duty_cycle 2 - channel_volume 6 + volume_envelope 6, 0 note E_, 8 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 6 + volume_envelope 6, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 - channel_volume 5 + volume_envelope 5, 0 .Loop3 note D_, 4 note E_, 3 @@ -566,63 +566,63 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note B_, 15 inc_octave note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 - channel_volume 5 + volume_envelope 5, 0 note C#, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 octave 2 note B_, 7 inc_octave inc_octave - ;vibrato_type 1 +; vibrato_type 1 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 note B_, 8 inc_octave speed 10 note C#, 6 - channel_volume 2 + volume_envelope 2, 7 speed 1 note C#, 15 - ;vibrato_type 8 +; vibrato_type 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 octave 2 note E_, 15 note F#, 15 note A#, 15 rest 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 inc_octave note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 rest 15 dec_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 rest 15 inc_octave - channel_volume 8 + volume_envelope 8, 0 note D_, 7 inc_octave duty_cycle 2 - channel_volume 6 + volume_envelope 6, 0 note D_, 8 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 6 + volume_envelope 6, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 - channel_volume 6 + volume_envelope 6, 0 .Loop4 note E_, 4 note F#, 3 @@ -630,7 +630,7 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) note F#, 4 sound_loop 2, .Loop4 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 dec_octave dec_octave note F_, 15 @@ -642,10 +642,10 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) speed 1 rest 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note E_, 6 rest 2 speed 10 @@ -654,51 +654,51 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) rest 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 inc_octave duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note D_, 6 rest 2 note E_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note D_, 11 rest 4 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 dec_octave note B_, 7 inc_octave duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note D_, 6 rest 2 note C#, 15 duty_cycle 1 - channel_volume 8 - fade_wave 7 + volume_envelope 8, 0 +; cutoff 7 note C#, 5 note C#, 5 note C#, 5 - fade_wave 8 +; cutoff 8 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note A_, 7 - channel_volume 3 + volume_envelope 3, 7 note A_, 8 rest 15 speed 10 @@ -707,103 +707,103 @@ Music_ChallengeHall_Ch2: ; f9883 (3e:5883) Branch_f9a28: duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note A_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 inc_octave note C#, 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 7 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note A_, 8 note B_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 inc_octave note D_, 15 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 7 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note B_, 8 inc_octave note C#, 7 - channel_volume 3 + volume_envelope 3, 7 note C#, 8 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C#, 7 - channel_volume 2 + volume_envelope 2, 7 note C#, 8 duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note E_, 7 rest 8 note E_, 7 rest 8 - channel_volume 7 + volume_envelope 7, 0 note D_, 15 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 - channel_volume 2 + volume_envelope 2, 7 note D_, 8 dec_octave duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 note G#, 15 inc_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 7 dec_octave duty_cycle 0 - channel_volume 7 + volume_envelope 7, 0 sound_ret -Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) - ;stereo_panning 1, 1 +Music_ChallengeHall_Ch3: + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 0 - ;cutoff 8 - ;cutoff 8 +; echo 0 +; cutoff 8 +; cutoff 8 speed 10 .Loop1 rest 6 sound_loop 2, .Loop1 .MainLoop octave 2 - ;cutoff 8 +; cutoff 8 note E_, 6 - ;tie +; tie note E_, 6 speed 1 inc_octave note E_, 7 rest 8 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 7 note E_, 8 - ;cutoff 8 +; cutoff 8 note E_, 7 rest 8 note E_, 7 @@ -972,11 +972,11 @@ Music_ChallengeHall_Ch3: ; f9a92 (3e:5a92) dec_octave note A_, 7 rest 8 - ;cutoff 7 +; cutoff 7 note A_, 5 note A_, 5 note A_, 5 - ;cutoff 8 +; cutoff 8 note A_, 7 rest 8 note A_, 7 @@ -1037,7 +1037,7 @@ Branch_f9b92: sound_ret -Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) +Music_ChallengeHall_Ch4: toggle_noise 6 drum_speed 1 drum_speed 10 @@ -1092,4 +1092,3 @@ Music_ChallengeHall_Ch4: ; f9ba9 (3e:5ba9) drum_note 2, 3 rest 3 sound_loop 0, .MainLoop -; 0xf9be5 diff --git a/crysaudio/music/TCG/club1.asm b/crysaudio/music/TCG/club1.asm index ec58ab53..fe1d174d 100644 --- a/crysaudio/music/TCG/club1.asm +++ b/crysaudio/music/TCG/club1.asm @@ -5,16 +5,16 @@ Music_Club1: channel 3, Music_Club1_Ch3 channel 4, Music_Club1_Ch4 -Music_Club1_Ch1: ; f9be5 (3e:5be5) +Music_Club1_Ch1: speed 5 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 0 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 2 +; cutoff 8 note C#, 2 dec_octave note A_, 2 @@ -22,21 +22,21 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 2 note A_, 2 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 inc_octave speed 1 note C#, 8 - channel_volume 2 + volume_envelope 2, 7 note C#, 2 - channel_volume 6 + volume_envelope 5, -2 note A_, 4 - channel_volume 7 + volume_envelope 7, 0 note A_, 4 - channel_volume 2 + volume_envelope 2, 7 note A_, 2 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 speed 5 note C#, 2 dec_octave @@ -45,40 +45,40 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 2 note A#, 2 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 inc_octave speed 1 note C#, 8 - channel_volume 2 + volume_envelope 2, 7 note C#, 2 speed 5 - channel_volume 8 + volume_envelope 8, 0 dec_octave note B_, 1 inc_octave note C_, 1 - ;vibrato_type 1 +; vibrato_type 1 vibrato 10, 3, 3 note C#, 4 dec_octave - ;vibrato_type 8 +; vibrato_type 8 vibrato 20, 3, 3 note A_, 2 inc_octave note C#, 4 dec_octave note B_, 2 - channel_volume 2 + volume_envelope 2, 7 note B_, 2 rest 2 duty_cycle 0 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 4 +; cutoff 8 note E_, 6 rest 2 .MainLoop duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 octave 3 rest 6 note A_, 4 @@ -88,44 +88,44 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) inc_octave note C_, 4 note C#, 8 - channel_volume 4 + volume_envelope 4, 7 note C#, 4 - channel_volume 10 + volume_envelope 10, 0 note C#, 2 note D_, 4 note E_, 2 - channel_volume 4 + volume_envelope 4, 7 note E_, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 note D#, 1 note E_, 7 note D_, 6 dec_octave note A_, 4 note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note C#, 3 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 2 note C_, 4 dec_octave note B_, 6 - channel_volume 9 + volume_envelope 9, 3 note D_, 4 rest 2 dec_octave note A_, 2 - ;vibrato_type 1 +; vibrato_type 1 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 inc_octave inc_octave inc_octave @@ -133,9 +133,9 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 5 dec_octave dec_octave - ;vibrato_type 8 +; vibrato_type 8 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 note A_, 4 note E_, 2 note A_, 4 @@ -145,88 +145,88 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note C#, 6 dec_octave dec_octave - channel_volume 9 + volume_envelope 9, 3 note A#, 1 rest 5 inc_octave inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 2 note D_, 4 note E_, 2 - channel_volume 4 + volume_envelope 4, 7 note E_, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 note D#, 1 note E_, 7 note D_, 6 dec_octave note A_, 4 note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 inc_octave note C_, 1 note C#, 3 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 2 note C_, 4 dec_octave note B_, 8 - channel_volume 4 + volume_envelope 4, 7 note B_, 4 - channel_volume 10 + volume_envelope 10, 0 note E_, 2 note F_, 1 note F#, 5 note A_, 6 note B_, 4 note A_, 2 - channel_volume 4 + volume_envelope 4, 7 note A_, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 1 note F_, 7 note A_, 6 note B_, 4 note A_, 2 - channel_volume 4 + volume_envelope 4, 7 note A_, 2 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note C#, 5 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 4 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 4 note C_, 2 note C#, 4 dec_octave note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D#, 1 note E_, 5 note D_, 6 note C#, 4 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note C#, 7 dec_octave @@ -234,10 +234,10 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note F#, 2 note A_, 4 note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 - channel_volume 10 + volume_envelope 10, 0 inc_octave note C_, 1 note C#, 5 @@ -248,20 +248,20 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) note F#, 2 note A_, 4 note F#, 2 - channel_volume 4 + volume_envelope 4, 7 note F#, 2 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note C#, 5 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 4 - channel_volume 4 + volume_envelope 4, 7 note C#, 2 - channel_volume 10 + volume_envelope 10, 0 note C#, 4 dec_octave note A_, 2 @@ -270,49 +270,49 @@ Music_Club1_Ch1: ; f9be5 (3e:5be5) dec_octave note B_, 14 duty_cycle 2 - channel_volume 6 + volume_envelope 6, 0 note G#, 2 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 inc_octave - channel_volume 6 + volume_envelope 6, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 6 + volume_envelope 6, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 6 + volume_envelope 6, 0 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 inc_octave - channel_volume 6 + volume_envelope 6, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 sound_loop 0, .MainLoop -Music_Club1_Ch2: ; f9d5f (3e:5d5f) +Music_Club1_Ch2: speed 5 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 7 +; cutoff 7 octave 2 duty_cycle 0 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 2 +; cutoff 8 note A_, 2 note E_, 2 note A_, 2 inc_octave note C#, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 speed 1 note A_, 8 rest 2 @@ -321,7 +321,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) rest 2 speed 5 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 dec_octave dec_octave note A#, 2 @@ -330,14 +330,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) inc_octave note C#, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 speed 1 note A#, 8 rest 2 dec_octave speed 5 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 note G_, 1 note G#, 1 note A_, 2 @@ -347,14 +347,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note F#, 2 note G#, 3 rest 3 - channel_volume 9 + volume_envelope 9, 4 note B_, 6 rest 2 .MainLoop octave 2 rest 4 inc_octave - channel_volume 9 + volume_envelope 9, 3 note C#, 5 rest 7 note C#, 4 @@ -364,7 +364,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) dec_octave note A#, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 octave 5 note C#, 1 note D_, 3 @@ -373,21 +373,21 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note A#, 4 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note E_, 4 rest 2 - ;vibrato_type 1 +; vibrato_type 1 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 octave 5 note C_, 1 note C#, 5 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 octave 3 note D_, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 inc_octave note A_, 4 note F#, 2 @@ -405,28 +405,28 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note A_, 2 rest 2 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 rest 2 dec_octave note C#, 2 - channel_volume 6 + volume_envelope 6, 0 note C#, 4 - channel_volume 3 + volume_envelope 3, 7 note C#, 4 rest 2 - channel_volume 9 + volume_envelope 9, 3 note C#, 2 - ;vibrato_type 8 - channel_volume 6 +; vibrato_type 8 + volume_envelope 6, 0 note D#, 4 note E_, 6 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 inc_octave inc_octave - ;vibrato_type 1 +; vibrato_type 1 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 note C#, 1 note D_, 3 note C#, 2 @@ -440,10 +440,10 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) dec_octave dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note D_, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 inc_octave note A_, 4 note F#, 2 @@ -458,7 +458,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note D_, 6 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note D_, 4 rest 2 dec_octave @@ -466,7 +466,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) rest 4 note A_, 2 duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 inc_octave inc_octave note F_, 1 @@ -475,7 +475,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note C#, 4 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note D_, 4 rest 2 dec_octave @@ -485,14 +485,14 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) inc_octave inc_octave duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 note E_, 1 note F_, 3 note D_, 2 note C#, 4 dec_octave duty_cycle 0 - channel_volume 9 + volume_envelope 9, 3 note D_, 4 rest 2 dec_octave @@ -501,7 +501,7 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note B_, 2 inc_octave duty_cycle 2 - channel_volume 5 + volume_envelope 5, 0 note E_, 4 note G#, 2 note B_, 4 @@ -509,15 +509,15 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) note E_, 2 rest 4 dec_octave - ;vibrato_type 8 +; vibrato_type 8 duty_cycle 0 - channel_volume 6 + volume_envelope 6, 0 note A#, 2 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 rest 2 inc_octave - channel_volume 6 + volume_envelope 6, 0 note C_, 1 note C#, 5 dec_octave @@ -526,49 +526,49 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) rest 2 note G#, 1 note A_, 5 - channel_volume 9 + volume_envelope 9, 3 note D_, 2 - channel_volume 6 + volume_envelope 6, 0 note F#, 4 note D_, 2 note F#, 4 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A_, 4 rest 2 - channel_volume 6 + volume_envelope 6, 0 inc_octave note G#, 1 note A_, 5 - channel_volume 9 + volume_envelope 9, 3 note D_, 2 - channel_volume 6 + volume_envelope 6, 0 note F#, 4 note D_, 2 note F#, 4 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A_, 4 rest 2 inc_octave - channel_volume 6 + volume_envelope 6, 0 note G#, 1 note A_, 5 - channel_volume 9 + volume_envelope 9, 3 note D_, 2 - channel_volume 6 + volume_envelope 6, 0 note A_, 4 rest 2 note A_, 4 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A_, 2 inc_octave - channel_volume 6 + volume_envelope 6, 0 note A_, 4 note G#, 12 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A_, 4 rest 2 note B_, 4 @@ -578,13 +578,13 @@ Music_Club1_Ch2: ; f9d5f (3e:5d5f) sound_loop 0, .MainLoop -Music_Club1_Ch3: ; f9ec4 (3e:5ec4) +Music_Club1_Ch3: speed 5 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 96 - ;cutoff 7 +; echo 96 +; cutoff 7 octave 2 note A_, 2 rest 2 @@ -597,16 +597,16 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4) note A#, 2 rest 4 note B_, 2 - ;cutoff 4 +; cutoff 4 note B_, 2 - ;cutoff 7 +; cutoff 7 note F#, 2 note F_, 2 inc_octave - ;cutoff 4 +; cutoff 4 note D_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 2 rest 4 inc_octave @@ -617,267 +617,267 @@ Music_Club1_Ch3: ; f9ec4 (3e:5ec4) octave 2 note A_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 6 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 - ;cutoff 7 +; cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note C#, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 sound_call Branch_fa01a octave 2 - ;cutoff 7 +; cutoff 7 note A_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 6 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F_, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note C#, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note F#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 - ;cutoff 7 +; cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 sound_call Branch_fa01a octave 2 - ;cutoff 7 +; cutoff 7 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 rest 2 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 rest 2 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note E_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 6 note E_, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note F_, 6 note F#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A#, 2 - ;cutoff 7 +; cutoff 7 note C#, 6 dec_octave note A#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 note B_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 note A_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note A#, 4 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note D_, 2 dec_octave dec_octave - ;cutoff 7 +; cutoff 7 note B_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 6 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 6 +; cutoff 6 note E_, 6 - ;cutoff 7 +; cutoff 7 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 - ;cutoff 7 +; cutoff 7 note E_, 4 - ;cutoff 4 +; cutoff 4 note G#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note F#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note G#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note G#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note B_, 2 - ;cutoff 7 +; cutoff 7 sound_loop 0, .MainLoop Branch_fa01a: octave 2 note B_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note A_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note C#, 6 note D_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F#, 2 dec_octave - ;cutoff 7 +; cutoff 7 note D#, 6 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note B_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note B_, 6 note G#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note B_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note E_, 4 inc_octave - ;cutoff 4 +; cutoff 4 note E_, 2 sound_ret -Music_Club1_Ch4: ; fa044 (3e:6044) +Music_Club1_Ch4: toggle_noise 6 drum_speed 5 octave 1 @@ -925,4 +925,3 @@ Branch_fa06f: drum_note 4, 2 sound_loop 15, .Loop2 sound_ret -; 0xfa077 diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm index 6a404acd..0e574ad4 100644 --- a/crysaudio/music/TCG/club2.asm +++ b/crysaudio/music/TCG/club2.asm @@ -4,59 +4,51 @@ Music_Club2: channel 2, Music_Club2_Ch2 channel 3, Music_Club2_Ch3 -Music_Club2_Ch1: ; fa077 (3e:6077) +Music_Club2_Ch1: speed 6 duty_cycle 2 - ;stereo_panning 1, 1 - fade_wave 6 + stereo_panning TRUE, TRUE +; cutoff 8 .MainLoop octave 4 .Loop1 - channel_volume 7 + volume_envelope 7, 5 note G_, 4 note E_, 4 note C_, 4 - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note F#, 4 - ;tie - fade_wave 6 +; tie note F#, 16 - channel_volume 7 + volume_envelope 7, 5 note G_, 4 note A_, 4 note B_, 4 - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note F#, 4 - ;tie - fade_wave 6 +; tie note F#, 16 sound_loop 8, .Loop1 - channel_volume 7 + volume_envelope 7, 5 note G_, 4 note D_, 4 dec_octave note B_, 4 inc_octave - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note B_, 4 - ;tie - fade_wave 6 +; tie note B_, 16 - channel_volume 7 + volume_envelope 7, 5 note G_, 4 note D_, 4 note C_, 4 - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note B_, 4 - ;tie - fade_wave 6 +; tie note B_, 16 dec_octave - channel_volume 7 + volume_envelope 7, 5 note F#, 4 dec_octave note D_, 4 @@ -91,93 +83,83 @@ Music_Club2_Ch1: ; fa077 (3e:6077) note F#, 4 note A_, 4 note A_, 3 - ;tie +; tie speed 1 note A_, 3 inc_octave - channel_volume 7 + volume_envelope 7, 7 rest 4 note D_, 5 - ;tie +; tie speed 6 - fade_wave 0 note D_, 15 - ;tie - fade_wave 6 +; tie note D_, 16 sound_loop 0, .MainLoop -Music_Club2_Ch2: ; fa0e3 (3e:60e3) +Music_Club2_Ch2: speed 6 duty_cycle 2 - ;stereo_panning 1, 1 - fade_wave 6 + stereo_panning TRUE, TRUE +; cutoff 8 .MainLoop octave 2 .Loop1 - channel_volume 7 + volume_envelope 7, 5 note C_, 4 note G_, 4 inc_octave note G_, 4 inc_octave - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note D_, 4 - ;tie - fade_wave 6 +; tie note D_, 16 dec_octave dec_octave - channel_volume 7 + volume_envelope 7, 5 note C_, 4 note G_, 4 inc_octave inc_octave note C_, 4 - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note D_, 4 - ;tie - fade_wave 6 +; tie note D_, 16 dec_octave dec_octave sound_loop 8, .Loop1 dec_octave - channel_volume 7 + volume_envelope 7, 5 note B_, 4 inc_octave note G_, 4 inc_octave note G_, 4 inc_octave - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note G_, 4 - ;tie - fade_wave 6 +; tie note G_, 16 dec_octave dec_octave dec_octave - channel_volume 7 + volume_envelope 7, 5 note A_, 4 inc_octave note A_, 4 inc_octave note A_, 4 inc_octave - channel_volume 7 - fade_wave 0 + volume_envelope 7, 7 note C_, 4 - ;tie - fade_wave 6 +; tie note C_, 16 dec_octave dec_octave - channel_volume 7 + volume_envelope 7, 5 note D_, 4 octave 2 note F#, 4 @@ -213,37 +195,35 @@ Music_Club2_Ch2: ; fa0e3 (3e:60e3) inc_octave note D_, 4 note E_, 3 - ;tie +; tie speed 1 note E_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 4 note A_, 8 inc_octave - channel_volume 7 + volume_envelope 7, 7 note F#, 7 - ;tie +; tie speed 6 - fade_wave 0 note F#, 14 - ;tie - fade_wave 6 +; tie note F#, 16 sound_loop 0, .MainLoop -Music_Club2_Ch3: ; fa164 (3e:6164) +Music_Club2_Ch3: speed 6 channel_volume 1 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE fade_wave 10 - ;vibrato_type 4 +; vibrato_type 4 vibrato 35, 3, 3 - ;cutoff 6 - ;echo 64 +; cutoff 6 +; echo 64 .MainLoop channel_volume 3 - ;cutoff 8 +; cutoff 8 rest 2 octave 5 note G_, 4 @@ -259,89 +239,89 @@ Music_Club2_Ch3: ; fa164 (3e:6164) rest 2 rest 14 channel_volume 2 - ;echo 96 +; echo 96 sound_call Branch_fa1cf octave 5 - ;cutoff 8 +; cutoff 8 note G_, 8 sound_call Branch_fa1cf - ;echo 64 +; echo 64 channel_volume 1 octave 4 - ;cutoff 8 +; cutoff 8 note G_, 8 sound_call Branch_fa1f3 octave 4 note G_, 16 - ;tie +; tie note G_, 12 rest 16 rest 8 - ;cutoff 8 +; cutoff 8 note E_, 8 sound_call Branch_fa1f3 octave 4 note G_, 16 - ;tie +; tie note G_, 12 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 8 rest 4 - ;cutoff 8 +; cutoff 8 note A_, 2 note G_, 2 - ;cutoff 6 +; cutoff 6 note F#, 16 - ;tie +; tie note F#, 12 rest 4 note F#, 1 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 12 rest 4 note G#, 1 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 16 rest 16 rest 16 - ;echo 96 +; echo 96 sound_loop 0, .MainLoop Branch_fa1cf: - ;cutoff 6 +; cutoff 6 octave 6 note C#, 1 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 12 - ;cutoff 8 +; cutoff 8 note C_, 2 dec_octave note B_, 2 - ;cutoff 6 +; cutoff 6 note G_, 16 - ;tie +; tie note G_, 8 rest 4 - ;cutoff 8 +; cutoff 8 note E_, 4 note B_, 4 inc_octave note C_, 4 dec_octave note B_, 4 - ;cutoff 6 +; cutoff 6 note A_, 16 - ;tie +; tie note A_, 8 - ;tie +; tie note A_, 16 rest 4 sound_ret @@ -349,21 +329,21 @@ Branch_fa1cf: Branch_fa1f3: octave 5 note C#, 1 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 4 note E_, 4 dec_octave note B_, 4 inc_octave note C_, 4 - ;cutoff 6 +; cutoff 6 note D_, 16 - ;tie +; tie note D_, 8 rest 4 - ;cutoff 8 +; cutoff 8 note C_, 2 dec_octave note B_, 2 @@ -371,6 +351,5 @@ Branch_fa1f3: note C_, 2 dec_octave note B_, 2 - ;cutoff 6 +; cutoff 6 sound_ret -; 0xfa210 diff --git a/crysaudio/music/TCG/club3.asm b/crysaudio/music/TCG/club3.asm index 2ff0b16c..3b2cf004 100644 --- a/crysaudio/music/TCG/club3.asm +++ b/crysaudio/music/TCG/club3.asm @@ -5,60 +5,60 @@ Music_Club3: channel 3, Music_Club3_Ch3 channel 4, Music_Club3_Ch4 -Music_Club3_Ch1: ; fa210 (3e:6210) +Music_Club3_Ch1: speed 9 - ;stereo_panning 1, 1 - ;vibrato_type 5 + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop duty_cycle 0 .Loop1 octave 2 - channel_volume 9 + volume_envelope 9, 0 rest 4 note G_, 2 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 9 + volume_envelope 9, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A#, 6 - ;tie +; tie note A#, 12 - channel_volume 3 + volume_envelope 3, 7 note A#, 4 rest 4 - channel_volume 9 + volume_envelope 9, 0 note G_, 2 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 9 + volume_envelope 9, 0 speed 1 note C_, 5 - ;tie +; tie note C#, 4 - ;tie +; tie speed 9 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A#, 6 - ;tie +; tie note A#, 12 - channel_volume 3 + volume_envelope 3, 7 note A#, 4 sound_loop 2, .Loop1 duty_cycle 1 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 sound_call Branch_fa330 sound_call Branch_fa403 note A#, 1 @@ -86,19 +86,19 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 note G_, 1 inc_octave - fade_wave 8 +; cutoff 8 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 speed 9 - channel_volume 8 + volume_envelope 8, 0 note C#, 1 note C_, 1 dec_octave note A#, 1 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 sound_call Branch_fa330 sound_call Branch_fa403 inc_octave @@ -129,9 +129,9 @@ Music_Club3_Ch1: ; fa210 (3e:6210) note G_, 1 octave 4 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 - fade_wave 8 +; cutoff 8 note G_, 5 note C#, 4 note C_, 5 @@ -143,7 +143,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave note A#, 4 duty_cycle 1 - fade_wave 7 +; cutoff 7 speed 9 sound_call Branch_fa370 sound_call Branch_fa403 @@ -172,13 +172,13 @@ Music_Club3_Ch1: ; fa210 (3e:6210) octave 2 note G_, 1 inc_octave - fade_wave 8 +; cutoff 8 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 speed 9 - channel_volume 8 + volume_envelope 8, 0 note C#, 1 note C_, 1 dec_octave @@ -214,8 +214,8 @@ Music_Club3_Ch1: ; fa210 (3e:6210) inc_octave duty_cycle 2 speed 1 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 note G_, 5 note C#, 4 note C_, 5 @@ -227,7 +227,7 @@ Music_Club3_Ch1: ; fa210 (3e:6210) dec_octave note A#, 4 speed 9 - fade_wave 8 +; cutoff 8 sound_loop 0, .MainLoop Branch_fa330: @@ -252,11 +252,11 @@ Branch_fa330: note A#, 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note F_, 5 note F#, 4 speed 9 - fade_wave 7 +; cutoff 7 note G_, 1 inc_octave note E_, 1 @@ -294,8 +294,8 @@ Branch_fa330: Branch_fa370: octave 2 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 inc_octave note D_, 1 @@ -316,54 +316,54 @@ Branch_fa370: note A#, 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note F_, 5 note F#, 4 octave 4 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note G_, 3 - channel_volume 1 + volume_envelope 1, 7 note G_, 2 inc_octave - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, 7 dec_octave note G_, 2 inc_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 3 - channel_volume 1 + volume_envelope 1, 7 note D_, 2 - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, 7 note G_, 2 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 3 - channel_volume 1 + volume_envelope 1, 7 inc_octave note D_, 2 - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, 7 dec_octave note G_, 2 inc_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 3 - channel_volume 1 + volume_envelope 1, 7 note D_, 2 - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, 7 note G_, 2 speed 9 duty_cycle 1 - fade_wave 7 - channel_volume 9 +; cutoff 7 + volume_envelope 9, 3 octave 2 note G_, 1 inc_octave @@ -389,8 +389,8 @@ Branch_fa370: octave 5 duty_cycle 2 speed 1 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 octave 5 note G_, 5 note C#, 4 @@ -404,8 +404,8 @@ Branch_fa370: note A#, 4 speed 9 duty_cycle 1 - fade_wave 7 - channel_volume 9 +; cutoff 7 + volume_envelope 9, 3 sound_ret Branch_fa403: @@ -430,59 +430,59 @@ Branch_fa403: note A#, 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note F_, 5 note F#, 4 speed 9 - fade_wave 7 +; cutoff 7 note G_, 1 sound_ret -Music_Club3_Ch2: ; fa423 (3e:6423) +Music_Club3_Ch2: speed 9 - ;stereo_panning 1, 1 - ;vibrato_type 5 + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop duty_cycle 0 .Loop1 octave 2 - channel_volume 7 + volume_envelope 7, 0 rest 4 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 7 + volume_envelope 7, 0 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 6 - ;tie +; tie note E_, 12 - channel_volume 3 + volume_envelope 3, 7 note E_, 4 rest 4 - channel_volume 7 + volume_envelope 7, 0 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F_, 5 - ;tie +; tie note F#, 4 speed 9 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 7 + volume_envelope 7, 0 note E_, 6 - ;tie +; tie note E_, 12 - channel_volume 3 + volume_envelope 3, 7 note E_, 4 sound_loop 2, .Loop1 duty_cycle 1 @@ -491,107 +491,107 @@ Music_Club3_Ch2: ; fa423 (3e:6423) speed 9 rest 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note F_, 5 note F#, 4 inc_octave speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 3 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 dec_octave - channel_volume 9 + volume_envelope 9, 3 note D_, 1 inc_octave inc_octave - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 - channel_volume 9 + volume_envelope 9, 3 speed 9 rest 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note G_, 5 note D_, 4 dec_octave note A#, 5 - channel_volume 3 + volume_envelope 3, 7 note A#, 4 inc_octave inc_octave - channel_volume 9 + volume_envelope 9, 3 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 8 + volume_envelope 8, 0 rest 1 dec_octave speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note F_, 5 note F#, 4 inc_octave speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 inc_octave - channel_volume 9 + volume_envelope 9, 3 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 dec_octave - channel_volume 9 + volume_envelope 9, 3 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 dec_octave speed 1 - channel_volume 8 + volume_envelope 8, 0 note A#, 5 - channel_volume 3 + volume_envelope 3, 7 note C_, 4 speed 9 rest 1 dec_octave - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 note A#, 1 note B_, 1 inc_octave @@ -601,99 +601,99 @@ Music_Club3_Ch2: ; fa423 (3e:6423) rest 1 inc_octave speed 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note F_, 5 note F#, 4 inc_octave speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 3 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 9 + volume_envelope 9, 3 note D_, 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 speed 9 rest 1 dec_octave dec_octave speed 1 - channel_volume 8 + volume_envelope 8, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 inc_octave - channel_volume 8 + volume_envelope 8, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 rest 1 rest 1 speed 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note F_, 5 note F#, 4 inc_octave inc_octave speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 - channel_volume 9 + volume_envelope 9, 3 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 3 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 8 + volume_envelope 8, 0 speed 1 note F_, 5 - channel_volume 3 + volume_envelope 3, 7 note F_, 4 - channel_volume 8 + volume_envelope 8, 0 speed 9 rest 1 dec_octave - fade_wave 8 +; cutoff 8 note D_, 1 note D#, 1 note E_, 1 @@ -703,115 +703,115 @@ Music_Club3_Ch2: ; fa423 (3e:6423) Branch_fa5a6: octave 3 rest 1 - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 note F_, 5 note F#, 4 inc_octave speed 9 - fade_wave 7 - channel_volume 9 +; cutoff 7 + volume_envelope 9, 3 note G_, 1 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 3 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 9 + volume_envelope 9, 3 note E_, 1 inc_octave - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 speed 1 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 - channel_volume 8 + volume_envelope 8, 0 speed 9 rest 1 dec_octave speed 1 - fade_wave 8 +; cutoff 8 note G_, 5 note D_, 4 dec_octave note A#, 5 - channel_volume 3 + volume_envelope 3, 7 note A#, 4 - channel_volume 8 + volume_envelope 8, 0 inc_octave inc_octave note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 rest 1 dec_octave speed 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 4 speed 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note G_, 1 dec_octave speed 1 - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 note F_, 5 note F#, 4 speed 9 inc_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 3 +; cutoff 7 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 inc_octave - channel_volume 9 + volume_envelope 9, 3 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 dec_octave - channel_volume 9 + volume_envelope 9, 3 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 3 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 1 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 2 sound_ret -Music_Club3_Ch3: ; fa63e (3e:663e) +Music_Club3_Ch3: speed 9 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 0 - ;cutoff 8 +; echo 0 +; cutoff 8 .Loop1 octave 2 note G_, 1 @@ -836,11 +836,11 @@ Music_Club3_Ch3: ; fa63e (3e:663e) octave 2 note G_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 inc_octave note F_, 1 @@ -853,25 +853,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note G_, 1 rest 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 note F_, 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 inc_octave note F_, 1 @@ -884,21 +884,21 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note G_, 1 rest 1 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note E_, 1 octave 2 note F_, 1 note F#, 1 note D#, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note D#, 1 inc_octave note D_, 1 @@ -911,25 +911,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note D#, 1 rest 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 note C#, 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note D#, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note D#, 1 inc_octave note D_, 1 @@ -942,22 +942,22 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note D#, 1 rest 1 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 1 rest 1 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 note D#, 1 note E_, 1 dec_octave note C_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 note A#, 1 inc_octave @@ -970,25 +970,25 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note C_, 1 rest 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 note A#, 1 octave 5 - ;cutoff 4 +; cutoff 4 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 note A#, 1 inc_octave @@ -1001,21 +1001,21 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note C_, 1 rest 1 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note E_, 1 octave 2 note A#, 1 note B_, 1 note D_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note D_, 1 inc_octave note C_, 1 @@ -1028,23 +1028,23 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note D_, 1 rest 1 octave 5 - ;cutoff 4 +; cutoff 4 note C_, 1 rest 1 octave 3 - ;cutoff 6 +; cutoff 6 note A#, 1 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 note C#, 1 note D_, 1 octave 4 - ;cutoff 4 +; cutoff 4 note G_, 1 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note D_, 1 inc_octave note C_, 1 @@ -1056,11 +1056,11 @@ Music_Club3_Ch3: ; fa63e (3e:663e) note F_, 1 rest 1 inc_octave - ;cutoff 4 +; cutoff 4 note A#, 1 rest 1 dec_octave - ;cutoff 8 +; cutoff 8 note A#, 1 note B_, 1 inc_octave @@ -1069,7 +1069,7 @@ Music_Club3_Ch3: ; fa63e (3e:663e) sound_loop 0, Music_Club3_Ch3 -Music_Club3_Ch4: ; fa772 (3e:6772) +Music_Club3_Ch4: toggle_noise 6 drum_speed 9 octave 1 @@ -1107,4 +1107,3 @@ Branch_fa796: drum_note 5, 1 drum_note 1, 1 sound_ret -; 0xfa7a0 diff --git a/crysaudio/music/TCG/credits.asm b/crysaudio/music/TCG/credits.asm index 82c1a641..7b839002 100644 --- a/crysaudio/music/TCG/credits.asm +++ b/crysaudio/music/TCG/credits.asm @@ -5,1111 +5,245 @@ Music_TCGCredits: channel 3, Music_TCGCredits_Ch3 channel 4, Music_TCGCredits_Ch4 -Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) +Music_TCGCredits_Ch1: speed 13 - ;stereo_panning 1, 1 - ;vibrato_type 1 + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 2 duty_cycle 1 - channel_volume 5 + volume_envelope 4, -7 note F_, 1 - channel_volume 6 + volume_envelope 6, 0 note F_, 2 - ;tie +; tie speed 1 note F_, 6 - channel_volume 3 + volume_envelope 3, 7 note F_, 7 speed 13 - channel_volume 7 + volume_envelope 6, -7 note G_, 1 - channel_volume 7 + volume_envelope 7, 0 note G_, 2 - ;tie +; tie speed 1 note G_, 6 - channel_volume 4 + volume_envelope 4, 7 note G_, 7 speed 13 - channel_volume 7 + volume_envelope 6, -7 note A_, 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 2 - ;tie +; tie speed 1 note A_, 6 - channel_volume 4 + volume_envelope 4, 7 note A_, 7 speed 13 - channel_volume 8 + volume_envelope 8, 0 note B_, 3 - channel_volume 4 + volume_envelope 4, 7 note B_, 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 sound_call Branch_fb5bc octave 2 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - ; - ;sound_call Branch_fb36b - speed 13 - octave 2 - channel_volume 8 - note A_, 1 - rest 1 - note G_, 1 - channel_volume 3 - note G_, 1 - channel_volume 8 - note A_, 1 - note B_, 1 - inc_octave - note C_, 1 - channel_volume 3 - note C_, 1 - rest 1 - sound_call Branch_fb5bc - octave 2 - note A_, 2 - note A_, 1 - channel_volume 3 - note A_, 1 - channel_volume 8 - note A_, 1 - channel_volume 3 - note A_, 1 - channel_volume 8 - note B_, 1 - inc_octave - sound_call Branch_fb5e4 + sound_call Branch_fb36b octave 4 - channel_volume 10 - note C_, 1 - channel_volume 3 - note C_, 1 - dec_octave - channel_volume 10 - note G_, 4 - ;tie - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - note E_, 1 - note F_, 1 - speed 1 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 4 - channel_volume 3 - note G_, 1 - channel_volume 10 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - speed 1 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 2 - note E_, 1 - ;tie - speed 1 - note E_, 6 - note F_, 4 - note E_, 3 - note D_, 13 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - speed 13 - note D_, 4 - ;tie - note D_, 8 - channel_volume 3 - note D_, 2 - sound_call Branch_fb5e4 - octave 4 - channel_volume 10 - note E_, 1 - channel_volume 3 - note E_, 1 - dec_octave - channel_volume 10 - note G_, 4 - ;tie - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - note E_, 1 - note F_, 1 - speed 1 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - note G_, 3 - note G#, 10 - ;tie - note G#, 13 - channel_volume 3 - note G#, 13 - inc_octave - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 2 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - note C_, 1 - note D_, 1 - channel_volume 3 - note D_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 3 note E_, 10 - ;tie - speed 13 - note E_, 8 - sound_call Branch_fb60c - speed 13 - octave 4 - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - speed 1 - note F#, 3 - note G_, 10 - channel_volume 3 - note G_, 13 - channel_volume 10 - note F_, 13 - channel_volume 3 - note F_, 13 - channel_volume 10 - note E_, 13 - channel_volume 3 - note E_, 13 - channel_volume 10 - note E_, 6 - note F_, 7 - note E_, 13 - dec_octave - note A_, 6 - channel_volume 3 - note A_, 7 - inc_octave - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note F_, 6 - channel_volume 3 - note F_, 13 - rest 7 - channel_volume 10 - note A_, 13 - inc_octave - note C_, 6 - channel_volume 3 - note C_, 7 - channel_volume 10 - note D#, 3 - note E_, 10 - ;tie - note E_, 13 - note F_, 6 - channel_volume 3 - note F_, 7 - channel_volume 10 - note E_, 6 - channel_volume 3 - note E_, 7 - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 13 - rest 7 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - note D_, 13 - note C#, 6 - note C_, 7 - dec_octave - note B_, 13 - inc_octave - note C_, 6 - channel_volume 3 - note C_, 7 - channel_volume 10 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - speed 13 - note E_, 5 - sound_call Branch_fb60c - speed 13 - octave 4 - note G_, 3 - channel_volume 3 - note G_, 1 - channel_volume 10 - note G_, 1 - speed 1 - note A_, 6 - channel_volume 3 - note A_, 7 - channel_volume 10 - note B_, 6 - channel_volume 3 - note B_, 7 - channel_volume 10 - note B_, 3 - inc_octave - note C_, 10 - channel_volume 3 - note C_, 13 - dec_octave - channel_volume 10 - note F#, 3 - note G_, 10 - channel_volume 3 - note G_, 13 - channel_volume 10 - note F_, 13 - channel_volume 3 - note F_, 13 - channel_volume 10 - note E_, 13 - channel_volume 3 - note E_, 13 - channel_volume 10 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 13 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note A_, 6 - channel_volume 3 - note A_, 7 - rest 13 - inc_octave - channel_volume 10 - note C_, 13 - dec_octave - note A_, 6 - channel_volume 3 - note A_, 7 - inc_octave - channel_volume 10 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 13 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note G#, 6 - channel_volume 3 - note G#, 7 - rest 13 - inc_octave - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 7 - rest 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 8 - channel_volume 3 - note G_, 1 - dec_octave - dec_octave - channel_volume 8 - note G_, 1 - channel_volume 2 - note G_, 1 - channel_volume 8 - note A_, 1 - channel_volume 2 - note A_, 1 - channel_volume 8 - note B_, 1 - speed 1 - channel_volume 10 - note G_, 3 - note A_, 3 - note B_, 3 - inc_octave - note C_, 4 - note D_, 3 - note E_, 3 - note F_, 3 - note G_, 4 - sound_call Branch_fb651 - octave 3 - channel_volume 10 - note G#, 3 - note A_, 10 - ;tie - note A_, 13 - channel_volume 3 - note A_, 13 - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - note G_, 13 - channel_volume 3 - note G_, 13 - channel_volume 10 - note D#, 3 - note E_, 10 - channel_volume 3 - note E_, 13 - channel_volume 10 - note D_, 13 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - speed 13 - note D_, 4 - ;tie - note D_, 8 - channel_volume 3 - note D_, 1 - dec_octave - channel_volume 8 - note G_, 1 - speed 1 - note A_, 6 - channel_volume 2 - note A_, 7 - channel_volume 8 - note B_, 6 - channel_volume 2 - note B_, 7 - sound_call Branch_fb651 - octave 3 - channel_volume 10 - note G_, 3 - note G#, 10 - ;tie - note G#, 13 - channel_volume 3 - note G#, 13 - inc_octave - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 2 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - note C_, 1 - note D_, 1 - channel_volume 3 - note D_, 1 - ; - octave 4 - channel_volume 10 - speed 1 - note D#, 3 - note E_, 10 - ;tie +; tie speed 13 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 8 speed 13 - channel_volume 10 + volume_envelope 10, 0 note E_, 5 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 speed 1 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 8 speed 13 - channel_volume 10 + volume_envelope 10, 0 note C_, 5 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave speed 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 6 - channel_volume 3 + volume_envelope 3, 7 note A_, 13 rest 7 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 3 note G_, 10 - ;tie +; tie speed 13 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 speed 1 note A_, 5 - channel_volume 3 + volume_envelope 3, 7 note A_, 8 - channel_volume 10 + volume_envelope 10, 0 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 8 - channel_volume 10 + volume_envelope 10, 0 note B_, 3 inc_octave note C_, 10 - ;tie +; tie speed 13 note C_, 2 - ;tie +; tie speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 13 rest 7 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 3 inc_octave note C_, 10 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 8 - channel_volume 10 + volume_envelope 10, 0 note E_, 5 - channel_volume 3 + volume_envelope 3, 7 note E_, 8 speed 13 - channel_volume 10 + volume_envelope 10, 0 note F_, 3 note E_, 1 speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 13 rest 7 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 6 - channel_volume 3 + volume_envelope 3, 7 note A_, 13 rest 7 - channel_volume 10 + volume_envelope 10, 0 note B_, 3 inc_octave note C_, 10 - ;tie +; tie speed 13 note C_, 2 - ;tie +; tie speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 13 rest 7 - channel_volume 10 + volume_envelope 10, 0 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 8 - ;tie +; tie note C_, 8 - ;tie +; tie note C_, 8 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - ; - ;sound_call Branch_fb36b - speed 13 - octave 2 - channel_volume 8 - note A_, 1 - rest 1 - note G_, 1 - channel_volume 3 - note G_, 1 - channel_volume 8 - note A_, 1 - note B_, 1 - inc_octave - note C_, 1 - channel_volume 3 - note C_, 1 - rest 1 - sound_call Branch_fb5bc - octave 2 - note A_, 2 - note A_, 1 - channel_volume 3 - note A_, 1 - channel_volume 8 - note A_, 1 - channel_volume 3 - note A_, 1 - channel_volume 8 - note B_, 1 - inc_octave - sound_call Branch_fb5e4 - octave 4 - channel_volume 10 - note C_, 1 - channel_volume 3 - note C_, 1 - dec_octave - channel_volume 10 - note G_, 4 - ;tie - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - note E_, 1 - note F_, 1 - speed 1 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 4 - channel_volume 3 - note G_, 1 - channel_volume 10 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - speed 1 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 2 - note E_, 1 - ;tie - speed 1 - note E_, 6 - note F_, 4 - note E_, 3 - note D_, 13 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - speed 13 - note D_, 4 - ;tie - note D_, 8 - channel_volume 3 - note D_, 2 - sound_call Branch_fb5e4 - octave 4 - channel_volume 10 - note E_, 1 - channel_volume 3 - note E_, 1 - dec_octave - channel_volume 10 - note G_, 4 - ;tie - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - note E_, 1 - note F_, 1 - speed 1 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - note G_, 3 - note G#, 10 - ;tie - note G#, 13 - channel_volume 3 - note G#, 13 - inc_octave - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 2 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - note C_, 1 - note D_, 1 - channel_volume 3 - note D_, 1 - channel_volume 10 - speed 1 - note D#, 3 - note E_, 10 - ;tie - speed 13 - note E_, 8 - sound_call Branch_fb60c - speed 13 - octave 4 - note G_, 8 - channel_volume 3 - note G_, 1 - channel_volume 10 - speed 1 - note F#, 3 - note G_, 10 - channel_volume 3 - note G_, 13 - channel_volume 10 - note F_, 13 - channel_volume 3 - note F_, 13 - channel_volume 10 - note E_, 13 - channel_volume 3 - note E_, 13 - channel_volume 10 - note E_, 6 - note F_, 7 - note E_, 13 - dec_octave - note A_, 6 - channel_volume 3 - note A_, 7 - inc_octave - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note F_, 6 - channel_volume 3 - note F_, 13 - rest 7 - channel_volume 10 - note A_, 13 - inc_octave - note C_, 6 - channel_volume 3 - note C_, 7 - channel_volume 10 - note D#, 3 - note E_, 10 - ;tie - note E_, 13 - note F_, 6 - channel_volume 3 - note F_, 7 - channel_volume 10 - note E_, 6 - channel_volume 3 - note E_, 7 - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 13 - rest 7 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - note D_, 13 - note C#, 6 - note C_, 7 - dec_octave - note B_, 13 - inc_octave - note C_, 6 - channel_volume 3 - note C_, 7 - channel_volume 10 - note G_, 6 - channel_volume 3 - note G_, 7 - channel_volume 10 - speed 13 - note E_, 5 - sound_call Branch_fb60c - speed 13 - octave 4 - note G_, 3 - channel_volume 3 - note G_, 1 - channel_volume 10 - note G_, 1 - speed 1 - note A_, 6 - channel_volume 3 - note A_, 7 - channel_volume 10 - note B_, 6 - channel_volume 3 - note B_, 7 - channel_volume 10 - note B_, 3 - inc_octave - note C_, 10 - channel_volume 3 - note C_, 13 - dec_octave - channel_volume 10 - note F#, 3 - note G_, 10 - channel_volume 3 - note G_, 13 - channel_volume 10 - note F_, 13 - channel_volume 3 - note F_, 13 - channel_volume 10 - note E_, 13 - channel_volume 3 - note E_, 13 - channel_volume 10 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 13 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note A_, 6 - channel_volume 3 - note A_, 7 - rest 13 - inc_octave - channel_volume 10 - note C_, 13 - dec_octave - note A_, 6 - channel_volume 3 - note A_, 7 - inc_octave - channel_volume 10 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 13 - note C_, 6 - channel_volume 3 - note C_, 7 - dec_octave - channel_volume 10 - note G#, 6 - channel_volume 3 - note G#, 7 - rest 13 - inc_octave - channel_volume 10 - note C_, 6 - channel_volume 3 - note C_, 7 - rest 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 8 - channel_volume 3 - note G_, 1 - dec_octave - dec_octave - channel_volume 8 - note G_, 1 - channel_volume 2 - note G_, 1 - channel_volume 8 - note A_, 1 - channel_volume 2 - note A_, 1 - channel_volume 8 - note B_, 1 - speed 1 - channel_volume 10 - note G_, 3 - note A_, 3 - note B_, 3 - inc_octave - note C_, 4 - note D_, 3 - note E_, 3 - note F_, 3 - note G_, 4 - sound_call Branch_fb651 - octave 3 - channel_volume 10 - note G#, 3 - note A_, 10 - ;tie - note A_, 13 - channel_volume 3 - note A_, 13 - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - note G_, 13 - channel_volume 3 - note G_, 13 - channel_volume 10 - note D#, 3 - note E_, 10 - channel_volume 3 - note E_, 13 - channel_volume 10 - note D_, 13 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - ;tie - speed 13 - note D_, 4 - ;tie - note D_, 8 - channel_volume 3 - note D_, 1 - dec_octave - channel_volume 8 - note G_, 1 - speed 1 - note A_, 6 - channel_volume 2 - note A_, 7 - channel_volume 8 - note B_, 6 - channel_volume 2 - note B_, 7 - sound_call Branch_fb651 - octave 3 - channel_volume 10 - note G_, 3 - note G#, 10 - ;tie - note G#, 13 - channel_volume 3 - note G#, 13 - inc_octave - channel_volume 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note C#, 3 - note D_, 10 - note C_, 13 - channel_volume 3 - note C_, 13 - channel_volume 10 - note F#, 3 - note G_, 10 - ;tie - speed 13 - note G_, 2 - note F_, 1 - channel_volume 3 - note F_, 1 - channel_volume 10 - note C_, 1 - note D_, 1 - channel_volume 3 - note D_, 1 - ; + sound_call Branch_fb36b octave 4 speed 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 note D#, 10 - ;tie +; tie speed 13 note D#, 4 - channel_volume 3 + volume_envelope 3, 7 note D#, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 7 - channel_volume 10 + volume_envelope 10, 0 note E_, 3 note F_, 10 - ;tie +; tie speed 13 note F_, 3 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note D#, 1 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 speed 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 3 note G_, 10 - ;tie +; tie speed 13 note G_, 4 dec_octave dec_octave speed 1 - channel_volume 9 + volume_envelope 9, 0 note E_, 6 note A_, 7 inc_octave @@ -1123,40 +257,742 @@ Music_TCGCredits_Ch1: ; fb1fe (3e:71fe) note D_, 7 speed 13 note E_, 8 - ;tie +; tie note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 sound_ret -Branch_fb5bc: +Branch_fb36b: + speed 13 + octave 2 + volume_envelope 8, 0 + note A_, 1 + rest 1 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 8, 0 + note A_, 1 + note B_, 1 + inc_octave + note C_, 1 + volume_envelope 3, 7 + note C_, 1 + rest 1 +; sound_call Branch_fb5bc octave 2 speed 13 rest 2 - channel_volume 8 + volume_envelope 8, 0 note G_, 1 inc_octave note C_, 1 rest 1 dec_octave note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 2 - channel_volume 8 + volume_envelope 8, 0 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 1 rest 1 inc_octave note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 rest 3 dec_octave - channel_volume 8 + volume_envelope 8, 0 + note G_, 1 + inc_octave + note C_, 1 + rest 1 +; sound_ret + octave 2 + note A_, 2 + note A_, 1 + volume_envelope 3, 7 + note A_, 1 + volume_envelope 8, 0 + note A_, 1 + volume_envelope 3, 7 + note A_, 1 + volume_envelope 8, 0 + note B_, 1 + inc_octave +; sound_call Branch_fb5e4 + octave 3 + volume_envelope 10, 0 + speed 1 + note F#, 3 + note G_, 10 + note F_, 6 + volume_envelope 3, 7 + note F_, 7 + speed 13 + volume_envelope 8, 0 + note E_, 4 + volume_envelope 3, 7 + note E_, 1 + volume_envelope 10, 0 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + inc_octave + volume_envelope 10, 0 + speed 1 + note C#, 3 + note D_, 10 +; tie + speed 13 + note D_, 4 + volume_envelope 3, 7 + note D_, 1 +; sound_ret + octave 4 + volume_envelope 10, 0 + note C_, 1 + volume_envelope 3, 7 + note C_, 1 + dec_octave + volume_envelope 10, 0 + note G_, 4 +; tie + note G_, 8 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + note E_, 1 + note F_, 1 + speed 1 + note G_, 6 + volume_envelope 3, 7 + note G_, 7 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie + speed 13 + note G_, 4 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + volume_envelope 10, 0 + speed 1 + note E_, 3 + note F_, 10 +; tie + speed 13 + note F_, 2 + note E_, 1 +; tie + speed 1 + note E_, 6 + note F_, 4 + note E_, 3 + note D_, 13 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 +; tie + speed 13 + note D_, 4 +; tie + note D_, 8 + volume_envelope 3, 7 + note D_, 2 +; sound_call Branch_fb5e4 + octave 3 + volume_envelope 10, 0 + speed 1 + note F#, 3 + note G_, 10 + note F_, 6 + volume_envelope 3, 7 + note F_, 7 + speed 13 + volume_envelope 8, 0 + note E_, 4 + volume_envelope 3, 7 + note E_, 1 + volume_envelope 10, 0 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + inc_octave + volume_envelope 10, 0 + speed 1 + note C#, 3 + note D_, 10 +; tie + speed 13 + note D_, 4 + volume_envelope 3, 7 + note D_, 1 +; sound_ret + octave 4 + volume_envelope 10, 0 + note E_, 1 + volume_envelope 3, 7 + note E_, 1 + dec_octave + volume_envelope 10, 0 + note G_, 4 +; tie + note G_, 8 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + note E_, 1 + note F_, 1 + speed 1 + note G_, 6 + volume_envelope 3, 7 + note G_, 7 + volume_envelope 10, 0 + note G_, 3 + note G#, 10 +; tie + note G#, 13 + volume_envelope 3, 7 + note G#, 13 + inc_octave + volume_envelope 10, 0 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie + speed 13 + note G_, 2 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + volume_envelope 10, 0 + note C_, 1 + note D_, 1 + volume_envelope 3, 7 + note D_, 1 + volume_envelope 10, 0 + speed 1 + note D#, 3 + note E_, 10 +; tie + speed 13 + note E_, 8 +; sound_call Branch_fb60c + octave 4 + speed 13 + volume_envelope 3, 7 + note E_, 1 + volume_envelope 10, 0 + speed 1 + note D#, 3 + note E_, 10 + speed 13 + volume_envelope 3, 7 + note E_, 1 + volume_envelope 10, 0 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + volume_envelope 10, 0 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + speed 1 + note G#, 3 + note A_, 10 +; tie + speed 13 + note A_, 8 + volume_envelope 3, 7 + note A_, 1 + volume_envelope 10, 0 + speed 1 + note G#, 3 + note A_, 10 + volume_envelope 3, 7 + note A_, 13 + volume_envelope 10, 0 + note G_, 13 + volume_envelope 3, 7 + note G_, 13 + volume_envelope 10, 0 + note F_, 13 + volume_envelope 3, 7 + note F_, 13 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie +; sound_ret + speed 13 + octave 4 + note G_, 8 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + speed 1 + note F#, 3 + note G_, 10 + volume_envelope 3, 7 + note G_, 13 + volume_envelope 10, 0 + note F_, 13 + volume_envelope 3, 7 + note F_, 13 + volume_envelope 10, 0 + note E_, 13 + volume_envelope 3, 7 + note E_, 13 + volume_envelope 10, 0 + note E_, 6 + note F_, 7 + note E_, 13 + dec_octave + note A_, 6 + volume_envelope 3, 7 + note A_, 7 + inc_octave + volume_envelope 10, 0 + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + dec_octave + volume_envelope 10, 0 + note F_, 6 + volume_envelope 3, 7 + note F_, 13 + rest 7 + volume_envelope 10, 0 + note A_, 13 + inc_octave + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + volume_envelope 10, 0 + note D#, 3 + note E_, 10 +; tie + note E_, 13 + note F_, 6 + volume_envelope 3, 7 + note F_, 7 + volume_envelope 10, 0 + note E_, 6 + volume_envelope 3, 7 + note E_, 7 + volume_envelope 10, 0 + note C_, 6 + volume_envelope 3, 7 + note C_, 13 + rest 7 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 +; tie + note D_, 13 + note C#, 6 + note C_, 7 + dec_octave + note B_, 13 + inc_octave + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + volume_envelope 10, 0 + note G_, 6 + volume_envelope 3, 7 + note G_, 7 + volume_envelope 10, 0 + speed 13 + note E_, 5 +; sound_call Branch_fb60c + octave 4 + speed 13 + volume_envelope 3, 7 + note E_, 1 + volume_envelope 10, 0 + speed 1 + note D#, 3 + note E_, 10 + speed 13 + volume_envelope 3, 7 + note E_, 1 + volume_envelope 10, 0 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + volume_envelope 10, 0 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + speed 1 + note G#, 3 + note A_, 10 +; tie + speed 13 + note A_, 8 + volume_envelope 3, 7 + note A_, 1 + volume_envelope 10, 0 + speed 1 + note G#, 3 + note A_, 10 + volume_envelope 3, 7 + note A_, 13 + volume_envelope 10, 0 + note G_, 13 + volume_envelope 3, 7 + note G_, 13 + volume_envelope 10, 0 + note F_, 13 + volume_envelope 3, 7 + note F_, 13 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie +; sound_ret + speed 13 + octave 4 + note G_, 3 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + note G_, 1 + speed 1 + note A_, 6 + volume_envelope 3, 7 + note A_, 7 + volume_envelope 10, 0 + note B_, 6 + volume_envelope 3, 7 + note B_, 7 + volume_envelope 10, 0 + note B_, 3 + inc_octave + note C_, 10 + volume_envelope 3, 7 + note C_, 13 + dec_octave + volume_envelope 10, 0 + note F#, 3 + note G_, 10 + volume_envelope 3, 7 + note G_, 13 + volume_envelope 10, 0 + note F_, 13 + volume_envelope 3, 7 + note F_, 13 + volume_envelope 10, 0 + note E_, 13 + volume_envelope 3, 7 + note E_, 13 + volume_envelope 10, 0 + note E_, 3 + note F_, 10 +; tie + note F_, 13 + note E_, 13 + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + dec_octave + volume_envelope 10, 0 + note A_, 6 + volume_envelope 3, 7 + note A_, 7 + rest 13 + inc_octave + volume_envelope 10, 0 + note C_, 13 + dec_octave + note A_, 6 + volume_envelope 3, 7 + note A_, 7 + inc_octave + volume_envelope 10, 0 + note E_, 3 + note F_, 10 +; tie + note F_, 13 + note E_, 13 + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + dec_octave + volume_envelope 10, 0 + note G#, 6 + volume_envelope 3, 7 + note G#, 7 + rest 13 + inc_octave + volume_envelope 10, 0 + note C_, 6 + volume_envelope 3, 7 + note C_, 7 + rest 13 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie + speed 13 + note G_, 8 + volume_envelope 3, 7 + note G_, 1 + dec_octave + dec_octave + volume_envelope 8, 0 + note G_, 1 + volume_envelope 2, 7 + note G_, 1 + volume_envelope 8, 0 + note A_, 1 + volume_envelope 2, 7 + note A_, 1 + volume_envelope 8, 0 + note B_, 1 + speed 1 + volume_envelope 10, 0 + note G_, 3 + note A_, 3 + note B_, 3 + inc_octave + note C_, 4 + note D_, 3 + note E_, 3 + note F_, 3 + note G_, 4 +; sound_call Branch_fb651 + octave 3 + volume_envelope 10, 0 + note D#, 3 + note E_, 10 + note F_, 6 + volume_envelope 3, 7 + note F_, 7 + volume_envelope 10, 0 + note G_, 5 + volume_envelope 3, 7 + note G_, 8 + inc_octave + volume_envelope 10, 0 + note C#, 3 + note D_, 10 +; tie + note D_, 13 + note C_, 6 + volume_envelope 3, 7 + note C_, 13 + rest 7 + dec_octave + speed 13 + volume_envelope 10, 0 + note G_, 6 +; tie + note G_, 6 +; tie + note G_, 8 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + speed 1 + note D#, 3 + note E_, 10 + note F_, 5 + volume_envelope 3, 7 + note F_, 8 + volume_envelope 10, 0 + note G_, 5 + volume_envelope 3, 7 + note G_, 8 +; sound_ret + octave 3 + volume_envelope 10, 0 + note G#, 3 + note A_, 10 +; tie + note A_, 13 + volume_envelope 3, 7 + note A_, 13 + volume_envelope 10, 0 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie + note G_, 13 + volume_envelope 3, 7 + note G_, 13 + volume_envelope 10, 0 + note D#, 3 + note E_, 10 + volume_envelope 3, 7 + note E_, 13 + volume_envelope 10, 0 + note D_, 13 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 +; tie + speed 13 + note D_, 4 +; tie + note D_, 8 + volume_envelope 3, 7 + note D_, 1 + dec_octave + volume_envelope 8, 0 + note G_, 1 + speed 1 + note A_, 6 + volume_envelope 2, 7 + note A_, 7 + volume_envelope 8, 0 + note B_, 6 + volume_envelope 2, 7 + note B_, 7 +; sound_call Branch_fb651 + octave 3 + volume_envelope 10, 0 + note D#, 3 + note E_, 10 + note F_, 6 + volume_envelope 3, 7 + note F_, 7 + volume_envelope 10, 0 + note G_, 5 + volume_envelope 3, 7 + note G_, 8 + inc_octave + volume_envelope 10, 0 + note C#, 3 + note D_, 10 +; tie + note D_, 13 + note C_, 6 + volume_envelope 3, 7 + note C_, 13 + rest 7 + dec_octave + speed 13 + volume_envelope 10, 0 + note G_, 6 +; tie + note G_, 6 +; tie + note G_, 8 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 10, 0 + speed 1 + note D#, 3 + note E_, 10 + note F_, 5 + volume_envelope 3, 7 + note F_, 8 + volume_envelope 10, 0 + note G_, 5 + volume_envelope 3, 7 + note G_, 8 +; sound_ret + octave 3 + volume_envelope 10, 0 + note G_, 3 + note G#, 10 +; tie + note G#, 13 + volume_envelope 3, 7 + note G#, 13 + inc_octave + volume_envelope 10, 0 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note C#, 3 + note D_, 10 + note C_, 13 + volume_envelope 3, 7 + note C_, 13 + volume_envelope 10, 0 + note F#, 3 + note G_, 10 +; tie + speed 13 + note G_, 2 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + volume_envelope 10, 0 + note C_, 1 + note D_, 1 + volume_envelope 3, 7 + note D_, 1 + sound_ret + +Branch_fb5bc: + octave 2 + speed 13 + rest 2 + volume_envelope 8, 0 + note G_, 1 + inc_octave + note C_, 1 + rest 1 + dec_octave + note A_, 1 + volume_envelope 3, 7 + note A_, 1 + rest 2 + volume_envelope 8, 0 + note B_, 1 + volume_envelope 3, 7 + note B_, 1 + volume_envelope 8, 0 + note A_, 1 + rest 1 + inc_octave + note C_, 1 + volume_envelope 3, 7 + note C_, 1 + rest 3 + dec_octave + volume_envelope 8, 0 note G_, 1 inc_octave note C_, 1 @@ -1165,223 +1001,453 @@ Branch_fb5bc: Branch_fb5e4: octave 3 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 3 note G_, 10 note F_, 6 - channel_volume 3 + volume_envelope 3, 7 note F_, 7 speed 13 - channel_volume 8 + volume_envelope 8, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 1 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 sound_ret Branch_fb60c: octave 4 speed 13 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 3 note E_, 10 speed 13 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 3 note A_, 10 - ;tie +; tie speed 13 note A_, 8 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 3 note A_, 10 - channel_volume 3 + volume_envelope 3, 7 note A_, 13 - channel_volume 10 + volume_envelope 10, 0 note G_, 13 - channel_volume 3 + volume_envelope 3, 7 note G_, 13 - channel_volume 10 + volume_envelope 10, 0 note F_, 13 - channel_volume 3 + volume_envelope 3, 7 note F_, 13 - channel_volume 10 + volume_envelope 10, 0 note F#, 3 note G_, 10 - ;tie +; tie sound_ret Branch_fb651: octave 3 - channel_volume 10 + volume_envelope 10, 0 note D#, 3 note E_, 10 note F_, 6 - channel_volume 3 + volume_envelope 3, 7 note F_, 7 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 8 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 3 note D_, 10 - ;tie +; tie note D_, 13 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 13 rest 7 dec_octave speed 13 - channel_volume 10 + volume_envelope 10, 0 note G_, 6 - ;tie +; tie note G_, 6 - ;tie +; tie note G_, 8 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 3 note E_, 10 note F_, 5 - channel_volume 3 + volume_envelope 3, 7 note F_, 8 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 8 sound_ret -Music_TCGCredits_Ch2: ; fb68a (3e:768a) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_TCGCredits_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 1 octave 2 speed 13 - channel_volume 4 + volume_envelope 3, -7 note A_, 1 - channel_volume 7 + volume_envelope 7, 0 note A_, 2 - ;tie +; tie speed 1 note A_, 6 - channel_volume 2 + volume_envelope 2, 7 note A_, 7 speed 13 - channel_volume 8 + volume_envelope 7, -7 note B_, 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 2 - ;tie +; tie speed 1 note B_, 6 - channel_volume 3 + volume_envelope 3, 7 note B_, 7 inc_octave speed 13 - channel_volume 6 + volume_envelope 5, -7 note C_, 1 - channel_volume 9 + volume_envelope 9, 0 note C_, 2 - ;tie +; tie speed 1 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 7 speed 13 - channel_volume 9 + volume_envelope 9, 0 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - ; - ;sound_call Branch_fb79e + sound_call Branch_fb79e + octave 4 speed 13 - octave 3 - channel_volume 9 - note E_, 1 - channel_volume 3 - note E_, 1 - sound_call Branch_fba68 - octave 2 - channel_volume 9 - note A_, 1 - channel_volume 3 - note A_, 1 - inc_octave - channel_volume 9 + volume_envelope 8, 0 + note C_, 3 + dec_octave + volume_envelope 9, 2 + note C_, 1 + rest 2 + inc_octave + volume_envelope 8, 0 + note D_, 1 +; cutoff 4 + note E_, 1 +; cutoff 8 + note C_, 3 + dec_octave + volume_envelope 9, 2 + note D_, 1 + rest 2 + inc_octave + volume_envelope 8, 0 + note D_, 1 +; cutoff 4 + note E_, 1 + dec_octave +; cutoff 8 + note A_, 3 + volume_envelope 9, 2 + note C_, 1 + rest 2 +; cutoff 4 + volume_envelope 8, 0 + note F_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note G#, 3 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note G#, 1 + rest 1 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note E_, 3 + volume_envelope 9, 2 + note D_, 1 + rest 1 + dec_octave + volume_envelope 8, 0 + note B_, 1 + inc_octave +; cutoff 4 + note C_, 1 + volume_envelope 9, 2 +; cutoff 8 + note D_, 1 + volume_envelope 8, 0 + note E_, 3 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 8, 0 + note E_, 1 +; cutoff 4 + note F_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note A_, 3 + volume_envelope 9, 2 + note C_, 1 +; cutoff 4 + note A_, 1 + rest 1 + note F_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note A_, 3 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 8, 0 + note G#, 3 + rest 1 + sound_call Branch_fb79e + octave 4 + speed 13 + volume_envelope 8, 0 + note C_, 1 +; tie + note C_, 2 + dec_octave + dec_octave + volume_envelope 9, 2 + note G#, 1 + rest 2 + inc_octave + volume_envelope 8, 0 + note A#, 1 + dec_octave + volume_envelope 9, 2 + note G#, 1 + inc_octave + inc_octave + volume_envelope 8, 0 + note C_, 1 +; tie + note C_, 2 + dec_octave + volume_envelope 9, 2 + note C_, 1 + rest 1 + inc_octave + volume_envelope 8, 0 note C_, 1 - channel_volume 9 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note E_, 1 +; tie + note E_, 4 + dec_octave + dec_octave + speed 1 + volume_envelope 8, 0 + note C_, 6 + note F_, 7 + note A_, 6 + note F_, 7 + note E_, 6 + note G_, 7 + inc_octave + note D_, 6 + dec_octave + note B_, 7 + inc_octave + speed 13 + note C_, 8 +; tie + note C_, 1 + volume_envelope 2, 7 + note C_, 2 + sound_ret + +Branch_fb79e: + speed 13 + octave 3 + volume_envelope 9, 0 + note E_, 1 + volume_envelope 3, 7 + note E_, 1 +; sound_call Branch_fba68 + octave 3 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 9, 0 + note C_, 1 + note E_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + rest 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 9, 0 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note E_, 1 + volume_envelope 3, 7 + note E_, 1 + rest 1 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 9, 0 + note C_, 1 + note E_, 1 + volume_envelope 9, 2 + note C_, 1 +; sound_ret + octave 2 + volume_envelope 9, 0 + note A_, 1 + volume_envelope 3, 7 + note A_, 1 + inc_octave + volume_envelope 9, 0 + note C_, 1 + volume_envelope 9, 2 + note C_, 1 + dec_octave + volume_envelope 9, 0 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 inc_octave - channel_volume 9 + volume_envelope 9, 0 note C_, 1 note D_, 1 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - sound_call Branch_fba68 - channel_volume 9 +; sound_call Branch_fba68 + octave 3 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 9, 0 + note C_, 1 + note E_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + rest 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 9, 0 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note E_, 1 + volume_envelope 3, 7 + note E_, 1 + rest 1 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 9, 0 + note C_, 1 + note E_, 1 + volume_envelope 9, 2 + note C_, 1 +; sound_ret + volume_envelope 9, 0 octave 3 speed 1 note E_, 3 note F_, 10 - ;tie +; tie speed 13 note F_, 1 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 9 + volume_envelope 9, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 9 + volume_envelope 9, 0 note D_, 3 - channel_volume 9 + volume_envelope 9, 2 duty_cycle 1 .Loop1 rest 2 @@ -1396,10 +1462,41 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) rest 2 note C_, 1 rest 2 - sound_call Branch_fba9d +; sound_call Branch_fba9d + octave 4 + duty_cycle 2 + volume_envelope 7, 0 + speed 1 + note F#, 3 + note G_, 10 + dec_octave + duty_cycle 1 + volume_envelope 9, 2 + note C_, 13 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + volume_envelope 7, 0 + note E_, 3 + note F_, 10 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + dec_octave + speed 13 + duty_cycle 1 + volume_envelope 9, 2 + note C_, 1 + duty_cycle 2 + volume_envelope 7, 0 + note G_, 1 +; sound_ret rest 2 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 octave 3 note C_, 1 rest 1 @@ -1410,75 +1507,75 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) sound_loop 4, .Loop3 rest 2 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 3 note F_, 10 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 - channel_volume 7 + volume_envelope 7, 0 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 dec_octave - channel_volume 9 + volume_envelope 9, 2 duty_cycle 1 note C_, 13 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 3 note F_, 10 - ;tie +; tie note F_, 13 note E_, 5 note F_, 4 note E_, 4 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 13 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 - channel_volume 7 + volume_envelope 7, 0 note C#, 3 note D_, 10 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 13 rest 13 dec_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 3 inc_octave note C_, 10 - ;tie +; tie speed 13 note C_, 3 rest 1 note E_, 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 1 speed 1 - channel_volume 8 + volume_envelope 8, 0 note A#, 3 note B_, 10 - ;tie +; tie speed 13 note B_, 4 rest 1 @@ -1486,1110 +1583,107 @@ Music_TCGCredits_Ch2: ; fb68a (3e:768a) note C_, 1 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note D_, 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 5 rest 1 - sound_call Branch_fba9d - duty_cycle 1 - octave 3 - note C_, 1 - note D_, 1 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - speed 1 - note D_, 3 - note D#, 10 - ;tie - speed 13 - note D#, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 1 - inc_octave - channel_volume 8 - note G#, 1 - note A#, 1 - dec_octave - channel_volume 9 - note G#, 1 - inc_octave - inc_octave - channel_volume 8 - note C_, 3 - dec_octave - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 8 - speed 1 - note F#, 3 - note G_, 10 - inc_octave - speed 13 - fade_wave 4 - note C_, 1 - dec_octave - note B_, 1 - fade_wave 8 - note A#, 1 - rest 1 - sound_call Branch_fbacb - octave 3 - channel_volume 9 - fade_wave 8 - note D_, 1 - speed 1 - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - speed 13 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - note C_, 1 - dec_octave - fade_wave 4 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note D_, 1 - rest 1 - fade_wave 8 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 2 - fade_wave 4 - note D_, 1 - dec_octave - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note A_, 1 - rest 1 - fade_wave 8 - note B_, 1 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note A_, 1 - fade_wave 8 - note G_, 1 - fade_wave 4 - note A_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 2 - dec_octave - speed 1 - note B_, 3 - inc_octave - note C_, 10 - dec_octave - speed 13 - fade_wave 4 - note B_, 1 - fade_wave 6 - note A#, 2 - sound_call Branch_fbacb - octave 4 - note G_, 1 - fade_wave 8 - note E_, 1 - speed 13 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - fade_wave 7 - note C_, 2 - fade_wave 8 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note F_, 1 - rest 1 - fade_wave 8 - note A_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - fade_wave 7 - note C_, 2 - fade_wave 8 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note F_, 1 - rest 1 - note G#, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - ;tie - speed 13 - note C_, 3 - rest 1 - dec_octave - note A_, 1 - inc_octave - fade_wave 4 - note C_, 1 - dec_octave - fade_wave 8 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note A#, 3 - note B_, 10 - rest 13 - dec_octave - channel_volume 9 - note A#, 3 - note B_, 10 - channel_volume 2 - note B_, 13 - inc_octave - channel_volume 9 - note C_, 13 - channel_volume 2 - note C_, 13 - channel_volume 9 - speed 13 - note D_, 2 - channel_volume 2 - note D_, 1 - sound_call Branch_fbb10 - rest 1 - octave 2 - note A_, 1 - rest 1 - note B_, 1 - note A_, 1 - inc_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - note E_, 2 - rest 1 - note C_, 1 - rest 1 - dec_octave - fade_wave 7 - note G_, 1 - fade_wave 8 - note G_, 1 - inc_octave - channel_volume 9 - note C_, 1 - dec_octave - speed 1 - channel_volume 8 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - rest 1 - inc_octave - duty_cycle 2 - channel_volume 7 - speed 1 - note F_, 13 - note A_, 6 - channel_volume 2 - note A_, 7 - inc_octave - channel_volume 7 - note C_, 6 - channel_volume 2 - note C_, 7 - channel_volume 7 - note E_, 6 - channel_volume 2 - note E_, 7 - dec_octave - duty_cycle 1 - channel_volume 9 - note C_, 13 - inc_octave - duty_cycle 2 - channel_volume 7 - note D#, 3 - note E_, 10 - ;tie - speed 13 - note E_, 1 - note F_, 1 - speed 1 - note E_, 5 - channel_volume 2 - note E_, 8 - channel_volume 7 - note D_, 5 - channel_volume 2 - note D_, 8 - speed 13 - rest 1 - dec_octave - dec_octave - channel_volume 9 - duty_cycle 1 - note B_, 1 - inc_octave - speed 1 - note C_, 6 - channel_volume 2 - note C_, 7 - channel_volume 9 - note D_, 6 - channel_volume 2 - note D_, 7 - sound_call Branch_fbb10 - octave 3 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - speed 1 - channel_volume 8 - note D_, 3 - note D#, 10 - ;tie - speed 13 - note D#, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 1 - speed 1 - rest 6 - channel_volume 9 - note G#, 7 - inc_octave - note C_, 6 - note D#, 7 - note G_, 6 - note A#, 7 - ; - octave 4 - speed 13 - channel_volume 8 - note C_, 3 - dec_octave - channel_volume 9 - note C_, 1 - rest 2 - inc_octave - channel_volume 8 - note D_, 1 - fade_wave 4 - note E_, 1 - fade_wave 8 - note C_, 3 - dec_octave - channel_volume 9 - note D_, 1 - rest 2 - inc_octave - channel_volume 8 - note D_, 1 - fade_wave 4 - note E_, 1 - dec_octave - fade_wave 8 - note A_, 3 - channel_volume 9 - note C_, 1 - rest 2 - fade_wave 4 - channel_volume 8 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - note G#, 3 - channel_volume 9 - note C_, 1 - channel_volume 8 - note G#, 1 - rest 1 - note F_, 1 - channel_volume 9 - note C_, 1 - channel_volume 8 - note E_, 3 - channel_volume 9 - note D_, 1 - rest 1 - dec_octave - channel_volume 8 - note B_, 1 - inc_octave - fade_wave 4 - note C_, 1 - channel_volume 9 - fade_wave 8 - note D_, 1 - channel_volume 8 - note E_, 3 - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 8 - note E_, 1 - fade_wave 4 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - note A_, 3 - channel_volume 9 - note C_, 1 - fade_wave 4 - note A_, 1 - rest 1 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - note A_, 3 - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 8 - note G#, 3 - rest 1 - ; - ;sound_call Branch_fb79e - speed 13 - octave 3 - channel_volume 9 - note E_, 1 - channel_volume 3 - note E_, 1 - sound_call Branch_fba68 - octave 2 - channel_volume 9 - note A_, 1 - channel_volume 3 - note A_, 1 - inc_octave - channel_volume 9 - note C_, 1 - channel_volume 9 - note C_, 1 - dec_octave - channel_volume 9 - note B_, 1 - channel_volume 3 - note B_, 1 - inc_octave - channel_volume 9 - note C_, 1 - note D_, 1 - note E_, 1 - channel_volume 3 - note E_, 1 - rest 1 - sound_call Branch_fba68 - channel_volume 9 - octave 3 - speed 1 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - note E_, 1 - channel_volume 3 - note E_, 1 - channel_volume 9 - note C_, 1 - channel_volume 3 - note C_, 1 - channel_volume 9 - note D_, 3 - channel_volume 9 - duty_cycle 1 -.Loop4 - rest 2 - note C_, 1 - rest 1 - sound_loop 2, .Loop4 -.Loop5 - rest 2 - note D_, 1 - rest 1 - sound_loop 2, .Loop5 - rest 2 - note C_, 1 - rest 2 - sound_call Branch_fba9d - rest 2 - duty_cycle 1 - channel_volume 9 - octave 3 - note C_, 1 - rest 1 -.Loop6 - rest 2 - note C_, 1 - rest 1 - sound_loop 4, .Loop6 - rest 2 - duty_cycle 2 - channel_volume 7 - speed 1 - note E_, 3 - note F_, 10 - note A_, 5 - channel_volume 2 - note A_, 8 - inc_octave - channel_volume 7 - note C_, 5 - channel_volume 2 - note C_, 8 - channel_volume 7 - note E_, 5 - channel_volume 2 - note E_, 8 - dec_octave - channel_volume 9 - duty_cycle 1 - note C_, 13 - inc_octave - duty_cycle 2 - channel_volume 7 - note E_, 3 - note F_, 10 - ;tie - note F_, 13 - note E_, 5 - note F_, 4 - note E_, 4 - dec_octave - duty_cycle 1 - channel_volume 9 - note C_, 13 - duty_cycle 2 - channel_volume 7 - note A_, 5 - channel_volume 2 - note A_, 8 - inc_octave - channel_volume 7 - note C_, 5 - channel_volume 2 - note C_, 8 - channel_volume 7 - note C#, 3 - note D_, 10 - dec_octave - duty_cycle 1 - channel_volume 9 - note C_, 13 - rest 13 - dec_octave - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - ;tie - speed 13 - note C_, 3 - rest 1 - note E_, 1 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note A#, 3 - note B_, 10 - ;tie - speed 13 - note B_, 4 - rest 1 - inc_octave - note C_, 1 - dec_octave - duty_cycle 1 - channel_volume 9 - note D_, 1 - channel_volume 8 - note E_, 5 - rest 1 - sound_call Branch_fba9d - duty_cycle 1 - octave 3 - note C_, 1 - note D_, 1 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - speed 1 - note D_, 3 - note D#, 10 - ;tie - speed 13 - note D#, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 1 - inc_octave - channel_volume 8 - note G#, 1 - note A#, 1 - dec_octave - channel_volume 9 - note G#, 1 - inc_octave - inc_octave - channel_volume 8 - note C_, 3 - dec_octave - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 8 - speed 1 - note F#, 3 - note G_, 10 - inc_octave - speed 13 - fade_wave 4 - note C_, 1 - dec_octave - note B_, 1 - fade_wave 8 - note A#, 1 - rest 1 - sound_call Branch_fbacb - octave 3 - channel_volume 9 - fade_wave 8 - note D_, 1 - speed 1 - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - speed 13 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - note C_, 1 - dec_octave - fade_wave 4 - note F_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note D_, 1 - rest 1 - fade_wave 8 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 2 - fade_wave 4 - note D_, 1 - dec_octave - fade_wave 8 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note A_, 1 - rest 1 - fade_wave 8 - note B_, 1 - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note A_, 1 - fade_wave 8 - note G_, 1 - fade_wave 4 - note A_, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 2 - dec_octave - speed 1 - note B_, 3 - inc_octave - note C_, 10 - dec_octave - speed 13 - fade_wave 4 - note B_, 1 - fade_wave 6 - note A#, 2 - sound_call Branch_fbacb - octave 4 - note G_, 1 - fade_wave 8 - note E_, 1 - speed 13 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note C_, 1 - rest 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - fade_wave 7 - note C_, 2 - fade_wave 8 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note F_, 1 - rest 1 - fade_wave 8 - note A_, 1 - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - fade_wave 7 - note C_, 2 - fade_wave 8 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - fade_wave 4 - note F_, 1 - rest 1 - note G#, 1 - fade_wave 8 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note B_, 3 - inc_octave - note C_, 10 - ;tie - speed 13 - note C_, 3 - rest 1 - dec_octave - note A_, 1 - inc_octave - fade_wave 4 - note C_, 1 - dec_octave - fade_wave 8 - channel_volume 9 - note C_, 1 - speed 1 - channel_volume 8 - note A#, 3 - note B_, 10 - rest 13 - dec_octave - channel_volume 9 - note A#, 3 - note B_, 10 - channel_volume 2 - note B_, 13 - inc_octave - channel_volume 9 - note C_, 13 - channel_volume 2 - note C_, 13 - channel_volume 9 - speed 13 - note D_, 2 - channel_volume 2 - note D_, 1 - sound_call Branch_fbb10 - rest 1 - octave 2 - note A_, 1 - rest 1 - note B_, 1 - note A_, 1 - inc_octave - channel_volume 9 - note C_, 1 - channel_volume 8 - note E_, 2 - rest 1 - note C_, 1 - rest 1 - dec_octave - fade_wave 7 - note G_, 1 - fade_wave 8 - note G_, 1 - inc_octave - channel_volume 9 - note C_, 1 - dec_octave - speed 1 - channel_volume 8 - note E_, 3 - note F_, 10 - ;tie - speed 13 - note F_, 1 - rest 1 - inc_octave - duty_cycle 2 - channel_volume 7 - speed 1 - note F_, 13 - note A_, 6 - channel_volume 2 - note A_, 7 - inc_octave - channel_volume 7 - note C_, 6 - channel_volume 2 - note C_, 7 - channel_volume 7 - note E_, 6 - channel_volume 2 - note E_, 7 - dec_octave - duty_cycle 1 - channel_volume 9 - note C_, 13 - inc_octave - duty_cycle 2 - channel_volume 7 - note D#, 3 - note E_, 10 - ;tie - speed 13 - note E_, 1 - note F_, 1 - speed 1 - note E_, 5 - channel_volume 2 - note E_, 8 - channel_volume 7 - note D_, 5 - channel_volume 2 - note D_, 8 - speed 13 - rest 1 - dec_octave - dec_octave - channel_volume 9 - duty_cycle 1 - note B_, 1 - inc_octave - speed 1 - note C_, 6 - channel_volume 2 - note C_, 7 - channel_volume 9 - note D_, 6 - channel_volume 2 - note D_, 7 - sound_call Branch_fbb10 - octave 3 - rest 1 - note F_, 1 - rest 1 - note G#, 1 - note F_, 1 - channel_volume 9 - note C_, 1 - inc_octave - speed 1 - channel_volume 8 - note D_, 3 - note D#, 10 - ;tie - speed 13 - note D#, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 1 - speed 1 - rest 6 - channel_volume 9 - note G#, 7 - inc_octave - note C_, 6 - note D#, 7 - note G_, 6 - note A#, 7 - ; - octave 4 - speed 13 - channel_volume 8 - note C_, 1 - ;tie - note C_, 2 - dec_octave - dec_octave - channel_volume 9 - note G#, 1 - rest 2 - inc_octave - channel_volume 8 - note A#, 1 - dec_octave - channel_volume 9 - note G#, 1 - inc_octave - inc_octave - channel_volume 8 - note C_, 1 - ;tie - note C_, 2 - dec_octave - channel_volume 9 - note C_, 1 - rest 1 - inc_octave - channel_volume 8 - note C_, 1 - note C_, 1 - dec_octave - channel_volume 9 - note C_, 1 - inc_octave - channel_volume 8 - note E_, 1 - ;tie - note E_, 4 - dec_octave - dec_octave - speed 1 - channel_volume 8 - note C_, 6 - note F_, 7 - note A_, 6 - note F_, 7 - note E_, 6 - note G_, 7 - inc_octave - note D_, 6 - dec_octave - note B_, 7 - inc_octave - speed 13 - note C_, 8 - ;tie - note C_, 1 - channel_volume 2 - note C_, 2 - sound_ret - -Branch_fba68: - octave 3 - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 9 - note C_, 1 - note E_, 1 - channel_volume 9 - note C_, 1 - channel_volume 9 - note F_, 1 - channel_volume 3 - note F_, 1 - rest 1 - channel_volume 9 - note C_, 1 - channel_volume 9 - note G_, 1 - channel_volume 3 - note G_, 1 - channel_volume 9 - note F_, 1 - channel_volume 9 - note C_, 1 - channel_volume 9 - note E_, 1 - channel_volume 3 - note E_, 1 - rest 1 - channel_volume 9 - note C_, 1 - rest 1 - channel_volume 9 - note C_, 1 - note E_, 1 - channel_volume 9 - note C_, 1 - sound_ret - -Branch_fba9d: +; sound_call Branch_fba9d octave 4 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F#, 3 note G_, 10 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 13 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 7 + volume_envelope 7, 0 note E_, 3 note F_, 10 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 dec_octave speed 13 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note C_, 1 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note G_, 1 - sound_ret - -Branch_fbacb: +; sound_ret + duty_cycle 1 octave 3 - fade_wave 8 + note C_, 1 + note D_, 1 + volume_envelope 9, 2 + note C_, 1 + speed 1 + volume_envelope 8, 0 + note E_, 3 + note F_, 10 +; tie + speed 13 + note F_, 1 + rest 1 + note F_, 1 + rest 1 + note G#, 1 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + speed 1 + note D_, 3 + note D#, 10 +; tie + speed 13 + note D#, 2 + dec_octave + dec_octave + volume_envelope 9, 2 + note G#, 1 + rest 1 + inc_octave + volume_envelope 8, 0 + note G#, 1 + note A#, 1 + dec_octave + volume_envelope 9, 3 + note G#, 1 + inc_octave + inc_octave + volume_envelope 8, 0 + note C_, 3 + dec_octave + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 8, 0 + speed 1 + note F#, 3 + note G_, 10 + inc_octave + speed 13 +; cutoff 4 + note C_, 1 + dec_octave + note B_, 1 +; cutoff 8 + note A#, 1 + rest 1 +; sound_call Branch_fbacb + octave 3 +; cutoff 8 .Loop4 note A#, 1 rest 1 @@ -2597,20 +1691,20 @@ Branch_fbacb: inc_octave note C_, 3 dec_octave - channel_volume 9 + volume_envelope 9, 2 note C_, 1 rest 1 - channel_volume 8 + volume_envelope 8, 0 note A_, 1 inc_octave - fade_wave 4 +; cutoff 4 note C_, 1 dec_octave - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 2 note C_, 1 speed 1 - channel_volume 8 + volume_envelope 8, 0 note A#, 3 note B_, 16 rest 7 @@ -2618,137 +1712,804 @@ Branch_fbacb: note B_, 10 dec_octave speed 13 - channel_volume 9 + volume_envelope 9, 2 note B_, 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 1 rest 1 note A_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 2 note B_, 1 inc_octave - channel_volume 8 + volume_envelope 8, 0 note B_, 3 - channel_volume 9 + volume_envelope 9, 2 note D_, 1 rest 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 1 inc_octave - fade_wave 4 +; cutoff 4 + note D_, 1 +; sound_ret + octave 3 + volume_envelope 9, 2 +; cutoff 8 + note D_, 1 + speed 1 + volume_envelope 8, 0 + note B_, 3 + inc_octave + note C_, 10 + speed 13 + rest 1 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 1 + rest 1 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 1 + note C_, 1 + dec_octave +; cutoff 4 + note F_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note D_, 1 + rest 1 +; cutoff 8 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 2 +; cutoff 4 + note D_, 1 + dec_octave +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note A_, 1 + rest 1 +; cutoff 8 + note B_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note A_, 1 +; cutoff 8 + note G_, 1 +; cutoff 4 + note A_, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 2 + dec_octave + speed 1 + note B_, 3 + inc_octave + note C_, 10 + dec_octave + speed 13 +; cutoff 4 + note B_, 1 +; cutoff 6 + note A#, 2 +; sound_call Branch_fbacb + octave 3 +; cutoff 8 +.Loop5 + note A#, 1 + rest 1 + sound_loop 3, .Loop5 + inc_octave + note C_, 3 + dec_octave + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 8, 0 + note A_, 1 + inc_octave +; cutoff 4 + note C_, 1 + dec_octave +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + speed 1 + volume_envelope 8, 0 + note A#, 3 + note B_, 16 + rest 7 + note A#, 3 + note B_, 10 + dec_octave + speed 13 + volume_envelope 9, 2 + note B_, 1 + inc_octave + volume_envelope 8, 0 + note B_, 1 + rest 1 + note A_, 1 + dec_octave + volume_envelope 9, 2 + note B_, 1 + inc_octave + volume_envelope 8, 0 + note B_, 3 + volume_envelope 9, 2 + note D_, 1 + rest 1 + volume_envelope 8, 0 + note B_, 1 + inc_octave +; cutoff 4 + note D_, 1 +; sound_ret + octave 4 + note G_, 1 +; cutoff 8 + note E_, 1 + speed 13 + rest 1 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 + note C_, 1 + rest 1 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 +; cutoff 7 + note C_, 2 +; cutoff 8 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note F_, 1 + rest 1 +; cutoff 8 + note A_, 1 + volume_envelope 9, 2 + note C_, 1 + inc_octave + volume_envelope 8, 0 +; cutoff 7 + note C_, 2 +; cutoff 8 + note C_, 1 + dec_octave + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 +; cutoff 4 + note F_, 1 + rest 1 + note G#, 1 +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + speed 1 + volume_envelope 8, 0 + note B_, 3 + inc_octave + note C_, 10 +; tie + speed 13 + note C_, 3 + rest 1 + dec_octave + note A_, 1 + inc_octave +; cutoff 4 + note C_, 1 + dec_octave +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + speed 1 + volume_envelope 8, 0 + note A#, 3 + note B_, 10 + rest 13 + dec_octave + volume_envelope 9, 0 + note A#, 3 + note B_, 10 + volume_envelope 2, 7 + note B_, 13 + inc_octave + volume_envelope 9, 0 + note C_, 13 + volume_envelope 2, 7 + note C_, 13 + volume_envelope 9, 0 + speed 13 + note D_, 2 + volume_envelope 2, 7 + note D_, 1 +; sound_call Branch_fbb10 + octave 3 + speed 13 + volume_envelope 8, 0 + note C_, 1 +; cutoff 3 + note D_, 1 + volume_envelope 9, 2 +; cutoff 8 + note C_, 1 + volume_envelope 8, 0 + note B_, 2 +; cutoff 3 + note A_, 1 + volume_envelope 9, 3 +; cutoff 8 + note C_, 1 + speed 1 + volume_envelope 8, 0 + note D#, 3 + note E_, 10 +; tie + speed 13 + note E_, 2 + volume_envelope 9, 2 + note D_, 1 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + speed 1 + note G_, 5 + volume_envelope 2, 7 + note G_, 8 + volume_envelope 7, 0 + note F_, 5 + note G_, 4 + note F_, 4 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + dec_octave + duty_cycle 1 + volume_envelope 9, 2 + note D_, 13 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + note C_, 5 + volume_envelope 2, 7 + note C_, 8 + volume_envelope 7, 0 + note D_, 13 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + volume_envelope 7, 0 + note C_, 5 + volume_envelope 2, 7 + note C_, 8 + dec_octave + speed 13 + volume_envelope 7, 0 + note E_, 4 + inc_octave + inc_octave + speed 1 + note C_, 5 + volume_envelope 2, 7 + note C_, 8 + dec_octave + volume_envelope 7, 0 + note B_, 13 + inc_octave + note C_, 5 + volume_envelope 2, 7 + note C_, 8 + dec_octave + volume_envelope 7, 0 + note B_, 5 + volume_envelope 2, 7 + note B_, 8 + volume_envelope 7, 0 + note G_, 5 + volume_envelope 2, 7 + note G_, 8 + dec_octave + dec_octave + duty_cycle 1 + volume_envelope 8, 0 + note B_, 3 + inc_octave + note C_, 10 + speed 13 +; cutoff 3 + note D_, 1 + note E_, 1 +; cutoff 8 + note F_, 2 +; sound_ret + rest 1 + octave 2 + note A_, 1 + rest 1 + note B_, 1 + note A_, 1 + inc_octave + volume_envelope 9, 2 + note C_, 1 + volume_envelope 8, 0 + note E_, 2 + rest 1 + note C_, 1 + rest 1 + dec_octave +; cutoff 7 + note G_, 1 +; cutoff 8 + note G_, 1 + inc_octave + volume_envelope 9, 2 + note C_, 1 + dec_octave + speed 1 + volume_envelope 8, 0 + note E_, 3 + note F_, 10 +; tie + speed 13 + note F_, 1 + rest 1 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + speed 1 + note F_, 13 + note A_, 6 + volume_envelope 2, 7 + note A_, 7 + inc_octave + volume_envelope 7, 0 + note C_, 6 + volume_envelope 2, 7 + note C_, 7 + volume_envelope 7, 0 + note E_, 6 + volume_envelope 2, 7 + note E_, 7 + dec_octave + duty_cycle 1 + volume_envelope 9, 2 + note C_, 13 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + note D#, 3 + note E_, 10 +; tie + speed 13 + note E_, 1 + note F_, 1 + speed 1 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + volume_envelope 7, 0 + note D_, 5 + volume_envelope 2, 7 + note D_, 8 + speed 13 + rest 1 + dec_octave + dec_octave + volume_envelope 9, 0 + duty_cycle 1 + note B_, 1 + inc_octave + speed 1 + note C_, 6 + volume_envelope 2, 7 + note C_, 7 + volume_envelope 9, 0 + note D_, 6 + volume_envelope 2, 7 + note D_, 7 +; sound_call Branch_fbb10 + octave 3 + speed 13 + volume_envelope 8, 0 + note C_, 1 +; cutoff 3 + note D_, 1 + volume_envelope 9, 2 +; cutoff 8 + note C_, 1 + volume_envelope 8, 0 + note B_, 2 +; cutoff 3 + note A_, 1 + volume_envelope 9, 3 +; cutoff 8 + note C_, 1 + speed 1 + volume_envelope 8, 0 + note D#, 3 + note E_, 10 +; tie + speed 13 + note E_, 2 + volume_envelope 9, 2 + note D_, 1 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + speed 1 + note G_, 5 + volume_envelope 2, 7 + note G_, 8 + volume_envelope 7, 0 + note F_, 5 + note G_, 4 + note F_, 4 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + dec_octave + duty_cycle 1 + volume_envelope 9, 2 + note D_, 13 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + note C_, 5 + volume_envelope 2, 7 + note C_, 8 + volume_envelope 7, 0 + note D_, 13 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + volume_envelope 7, 0 + note C_, 5 + volume_envelope 2, 7 + note C_, 8 + dec_octave + speed 13 + volume_envelope 7, 0 + note E_, 4 + inc_octave + inc_octave + speed 1 + note C_, 5 + volume_envelope 2, 7 + note C_, 8 + dec_octave + volume_envelope 7, 0 + note B_, 13 + inc_octave + note C_, 5 + volume_envelope 2, 7 + note C_, 8 + dec_octave + volume_envelope 7, 0 + note B_, 5 + volume_envelope 2, 7 + note B_, 8 + volume_envelope 7, 0 + note G_, 5 + volume_envelope 2, 7 + note G_, 8 + dec_octave + dec_octave + duty_cycle 1 + volume_envelope 8, 0 + note B_, 3 + inc_octave + note C_, 10 + speed 13 +; cutoff 3 + note D_, 1 + note E_, 1 +; cutoff 8 + note F_, 2 +; sound_ret + octave 3 + rest 1 + note F_, 1 + rest 1 + note G#, 1 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + inc_octave + speed 1 + volume_envelope 8, 0 + note D_, 3 + note D#, 10 +; tie + speed 13 + note D#, 2 + dec_octave + dec_octave + volume_envelope 9, 2 + note G#, 1 + rest 1 + speed 1 + rest 6 + volume_envelope 9, 0 + note G#, 7 + inc_octave + note C_, 6 + note D#, 7 + note G_, 6 + note A#, 7 + sound_ret + +Branch_fba68: + octave 3 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 9, 0 + note C_, 1 + note E_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note F_, 1 + volume_envelope 3, 7 + note F_, 1 + rest 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note G_, 1 + volume_envelope 3, 7 + note G_, 1 + volume_envelope 9, 0 + note F_, 1 + volume_envelope 9, 2 + note C_, 1 + volume_envelope 9, 0 + note E_, 1 + volume_envelope 3, 7 + note E_, 1 + rest 1 + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 9, 0 + note C_, 1 + note E_, 1 + volume_envelope 9, 2 + note C_, 1 + sound_ret + +Branch_fba9d: + octave 4 + duty_cycle 2 + volume_envelope 7, 0 + speed 1 + note F#, 3 + note G_, 10 + dec_octave + duty_cycle 1 + volume_envelope 9, 2 + note C_, 13 + inc_octave + duty_cycle 2 + volume_envelope 7, 0 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + volume_envelope 7, 0 + note E_, 3 + note F_, 10 + note E_, 5 + volume_envelope 2, 7 + note E_, 8 + dec_octave + speed 13 + duty_cycle 1 + volume_envelope 9, 2 + note C_, 1 + duty_cycle 2 + volume_envelope 7, 0 + note G_, 1 + sound_ret + +Branch_fbacb: + octave 3 +; cutoff 8 +.Loop4 + note A#, 1 + rest 1 + sound_loop 3, .Loop4 + inc_octave + note C_, 3 + dec_octave + volume_envelope 9, 2 + note C_, 1 + rest 1 + volume_envelope 8, 0 + note A_, 1 + inc_octave +; cutoff 4 + note C_, 1 + dec_octave +; cutoff 8 + volume_envelope 9, 2 + note C_, 1 + speed 1 + volume_envelope 8, 0 + note A#, 3 + note B_, 16 + rest 7 + note A#, 3 + note B_, 10 + dec_octave + speed 13 + volume_envelope 9, 2 + note B_, 1 + inc_octave + volume_envelope 8, 0 + note B_, 1 + rest 1 + note A_, 1 + dec_octave + volume_envelope 9, 2 + note B_, 1 + inc_octave + volume_envelope 8, 0 + note B_, 3 + volume_envelope 9, 2 + note D_, 1 + rest 1 + volume_envelope 8, 0 + note B_, 1 + inc_octave +; cutoff 4 note D_, 1 sound_ret Branch_fbb10: octave 3 speed 13 - channel_volume 8 + volume_envelope 8, 0 note C_, 1 - fade_wave 3 +; cutoff 3 note D_, 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 2 +; cutoff 8 note C_, 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 2 - fade_wave 3 +; cutoff 3 note A_, 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 3 +; cutoff 8 note C_, 1 speed 1 - channel_volume 8 + volume_envelope 8, 0 note D#, 3 note E_, 10 - ;tie +; tie speed 13 note E_, 2 - channel_volume 9 + volume_envelope 9, 2 note D_, 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 8 - channel_volume 7 + volume_envelope 7, 0 note F_, 5 note G_, 4 note F_, 4 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 2 note D_, 13 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 - channel_volume 7 + volume_envelope 7, 0 note D_, 13 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 - channel_volume 7 + volume_envelope 7, 0 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 dec_octave speed 13 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 inc_octave inc_octave speed 1 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 dec_octave - channel_volume 7 + volume_envelope 7, 0 note B_, 13 inc_octave note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 dec_octave - channel_volume 7 + volume_envelope 7, 0 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 8 - channel_volume 7 + volume_envelope 7, 0 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 8 dec_octave dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note B_, 3 inc_octave note C_, 10 speed 13 - fade_wave 3 +; cutoff 3 note D_, 1 note E_, 1 - fade_wave 8 +; cutoff 8 note F_, 2 sound_ret -Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) +Music_TCGCredits_Ch3: speed 1 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 96 - ;cutoff 8 +; echo 96 +; cutoff 8 octave 2 .Loop1 note G_, 6 @@ -2763,194 +2524,45 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note E_, 7 note F_, 6 note G_, 7 - ; - ;sound_call Branch_fbc46 - speed 1 - octave 3 - sound_call Branch_fbd47 - sound_call Branch_fbe23 - sound_call Branch_fbd47 -.Loop7 - note C_, 6 - rest 7 - sound_loop 2, .Loop7 - ;cutoff 4 - note A_, 13 - ;cutoff 8 - note C_, 6 - rest 7 -.Loop8 - note C_, 6 - rest 7 - sound_loop 2, .Loop8 - inc_octave - ;cutoff 4 - note C_, 13 - dec_octave - ;cutoff 8 - note C_, 6 - rest 7 - sound_call Branch_fbd47 - sound_call Branch_fbe23 - octave 3 -.Loop9 - note C_, 6 - rest 7 - sound_loop 2, .Loop9 - ;cutoff 4 - note G_, 13 - ;cutoff 8 - note C_, 6 - rest 7 -.Loop10 - note C_, 6 - rest 7 - sound_loop 2, .Loop10 - ;cutoff 4 - note G_, 13 - dec_octave - ;cutoff 8 - note G_, 13 - ;tie - speed 13 - note G_, 7 - rest 1 - speed 1 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbd91 - sound_call Branch_fbda4 - sound_call Branch_fbdb7 - sound_call Branch_fbdca - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbddd - sound_call Branch_fbdf0 - sound_call Branch_fbd47 - sound_call Branch_fbe03 - sound_call Branch_fbd91 - sound_call Branch_fbdca - sound_call Branch_fbe10 - sound_call Branch_fbd6b - sound_call Branch_fbdb7 - sound_call Branch_fbdca - sound_call Branch_fbd47 - sound_call Branch_fbe03 - sound_call Branch_fbd91 - sound_call Branch_fbdca - sound_call Branch_fbe10 - sound_call Branch_fbd6b - sound_call Branch_fbdb7 - sound_call Branch_fbdf0 - sound_call Branch_fbdca - octave 2 - note G_, 6 - rest 7 - note G_, 13 - inc_octave - note G_, 6 - rest 7 - dec_octave - note A_, 6 - rest 7 - note A_, 6 - rest 7 - speed 13 - note B_, 2 - note G_, 1 - speed 1 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbd91 - sound_call Branch_fbda4 - sound_call Branch_fbdb7 - sound_call Branch_fbe3d - octave 2 - note B_, 6 - rest 7 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbddd - octave 2 -.Loop11 - note A#, 6 - rest 7 - sound_loop 2, .Loop11 - inc_octave - ;cutoff 4 - note F_, 13 - dec_octave - ;cutoff 8 - note A#, 6 - rest 7 - note A#, 6 - inc_octave - note F_, 7 - note G#, 6 - inc_octave - note C_, 7 - note D#, 6 - note G_, 7 - dec_octave - dec_octave - note A#, 6 - rest 7 - ; + sound_call Branch_fbc46 sound_call Branch_fbd47 octave 2 .Loop2 - ;rept 2 note B_, 6 rest 7 - ;--- note B_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop2 .Loop3 - ;rept 2 note A_, 6 rest 7 - ;--- note A_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop3 .Loop4 - ;rept 2 note G#, 6 rest 7 - ;--- note G#, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note G#, 6 rest 7 sound_loop 2, .Loop4 @@ -2960,147 +2572,7 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) sound_call Branch_fbe3d octave 2 note B_, 13 - ; - ;sound_call Branch_fbc46 - speed 1 - octave 3 - sound_call Branch_fbd47 - sound_call Branch_fbe23 - sound_call Branch_fbd47 -.Loop12 - note C_, 6 - rest 7 - sound_loop 2, .Loop12 - ;cutoff 4 - note A_, 13 - ;cutoff 8 - note C_, 6 - rest 7 -.Loop13 - note C_, 6 - rest 7 - sound_loop 2, .Loop13 - inc_octave - ;cutoff 4 - note C_, 13 - dec_octave - ;cutoff 8 - note C_, 6 - rest 7 - sound_call Branch_fbd47 - sound_call Branch_fbe23 - octave 3 -.Loop14 - note C_, 6 - rest 7 - sound_loop 2, .Loop14 - ;cutoff 4 - note G_, 13 - ;cutoff 8 - note C_, 6 - rest 7 -.Loop15 - note C_, 6 - rest 7 - sound_loop 2, .Loop15 - ;cutoff 4 - note G_, 13 - dec_octave - ;cutoff 8 - note G_, 13 - ;tie - speed 13 - note G_, 7 - rest 1 - speed 1 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbd91 - sound_call Branch_fbda4 - sound_call Branch_fbdb7 - sound_call Branch_fbdca - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbddd - sound_call Branch_fbdf0 - sound_call Branch_fbd47 - sound_call Branch_fbe03 - sound_call Branch_fbd91 - sound_call Branch_fbdca - sound_call Branch_fbe10 - sound_call Branch_fbd6b - sound_call Branch_fbdb7 - sound_call Branch_fbdca - sound_call Branch_fbd47 - sound_call Branch_fbe03 - sound_call Branch_fbd91 - sound_call Branch_fbdca - sound_call Branch_fbe10 - sound_call Branch_fbd6b - sound_call Branch_fbdb7 - sound_call Branch_fbdf0 - sound_call Branch_fbdca - octave 2 - note G_, 6 - rest 7 - note G_, 13 - inc_octave - note G_, 6 - rest 7 - dec_octave - note A_, 6 - rest 7 - note A_, 6 - rest 7 - speed 13 - note B_, 2 - note G_, 1 - speed 1 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbd91 - sound_call Branch_fbda4 - sound_call Branch_fbdb7 - sound_call Branch_fbe3d - octave 2 - note B_, 6 - rest 7 - sound_call Branch_fbd47 - sound_call Branch_fbd58 - sound_call Branch_fbd6b - sound_call Branch_fbd7e - sound_call Branch_fbddd - octave 2 -.Loop16 - note A#, 6 - rest 7 - sound_loop 2, .Loop16 - inc_octave - ;cutoff 4 - note F_, 13 - dec_octave - ;cutoff 8 - note A#, 6 - rest 7 - note A#, 6 - inc_octave - note F_, 7 - note G#, 6 - inc_octave - note C_, 7 - note D#, 6 - note G_, 7 - dec_octave - dec_octave - note A#, 6 - rest 7 - ; + sound_call Branch_fbc46 speed 1 octave 2 .Loop5 @@ -3110,11 +2582,11 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note D#, 13 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G#, 6 rest 7 sound_loop 2, .Loop5 @@ -3125,10 +2597,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note C#, 6 rest 7 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note C#, 6 rest 7 sound_loop 2, .Loop6 @@ -3137,10 +2609,10 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) note C_, 6 rest 7 inc_octave - ;cutoff 4 +; cutoff 4 note C_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 6 rest 7 note C_, 6 @@ -3154,24 +2626,887 @@ Music_TCGCredits_Ch3: ; fbb9d (3e:7b9d) rest 7 speed 13 note C_, 8 - ;tie +; tie note C_, 1 rest 2 sound_ret +Branch_fbc46: + speed 1 + octave 3 +; sound_call Branch_fbd47 + octave 3 +.Loop7 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop7 +; sound_ret +; sound_call Branch_fbe23 + octave 3 +.Loop8 + note C_, 6 + rest 7 + sound_loop 2, .Loop8 +; cutoff 4 + note A_, 13 +; cutoff 8 + note C_, 6 + rest 7 +.Loop9 + note C_, 6 + rest 7 + sound_loop 2, .Loop9 +; cutoff 4 + note F_, 13 +; cutoff 8 + note C_, 6 + rest 7 +; sound_ret +; sound_call Branch_fbd47 + octave 3 +.Loop10 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop10 +; sound_ret +.Loop11 + note C_, 6 + rest 7 + sound_loop 2, .Loop11 +; cutoff 4 + note A_, 13 +; cutoff 8 + note C_, 6 + rest 7 +.Loop12 + note C_, 6 + rest 7 + sound_loop 2, .Loop12 + inc_octave +; cutoff 4 + note C_, 13 + dec_octave +; cutoff 8 + note C_, 6 + rest 7 +; sound_call Branch_fbd47 + octave 3 +.Loop13 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop13 +; sound_ret +; sound_call Branch_fbe23 + octave 3 +.Loop14 + note C_, 6 + rest 7 + sound_loop 2, .Loop14 +; cutoff 4 + note A_, 13 +; cutoff 8 + note C_, 6 + rest 7 +.Loop15 + note C_, 6 + rest 7 + sound_loop 2, .Loop15 +; cutoff 4 + note F_, 13 +; cutoff 8 + note C_, 6 + rest 7 +; sound_ret + octave 3 +.Loop16 + note C_, 6 + rest 7 + sound_loop 2, .Loop16 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 +.Loop17 + note C_, 6 + rest 7 + sound_loop 2, .Loop17 +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note G_, 13 +; tie + speed 13 + note G_, 7 + rest 1 + speed 1 +; sound_call Branch_fbd47 + octave 3 +.Loop18 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop18 +; sound_ret +; sound_call Branch_fbd58 + octave 2 +.Loop19 + note B_, 6 + rest 7 + note B_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note B_, 6 + rest 7 + sound_loop 2, .Loop19 +; sound_ret +; sound_call Branch_fbd6b + octave 2 +.Loop20 + note A_, 6 + rest 7 + note A_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note A_, 6 + rest 7 + sound_loop 2, .Loop20 +; sound_ret +; sound_call Branch_fbd7e + octave 2 +.Loop21 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop21 +; sound_ret +; sound_call Branch_fbd91 + octave 2 +.Loop22 + note F_, 6 + rest 7 + note F_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note F_, 6 + rest 7 + sound_loop 2, .Loop22 +; sound_ret +; sound_call Branch_fbda4 + octave 2 +.Loop23 + note E_, 6 + rest 7 + note E_, 6 + rest 7 + inc_octave +; cutoff 4 + note E_, 13 + dec_octave +; cutoff 8 + note E_, 6 + rest 7 + sound_loop 2, .Loop23 +; sound_ret +; sound_call Branch_fbdb7 + octave 2 +.Loop24 + note D_, 6 + rest 7 + note D_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note D_, 6 + rest 7 + sound_loop 2, .Loop24 +; sound_ret +; sound_call Branch_fbdca + octave 2 +.Loop25 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop25 +; sound_ret +; sound_call Branch_fbd47 + octave 3 +.Loop26 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop26 +; sound_ret +; sound_call Branch_fbd58 + octave 2 +.Loop27 + note B_, 6 + rest 7 + note B_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note B_, 6 + rest 7 + sound_loop 2, .Loop27 +; sound_ret +; sound_call Branch_fbd6b + octave 2 +.Loop28 + note A_, 6 + rest 7 + note A_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note A_, 6 + rest 7 + sound_loop 2, .Loop28 +; sound_ret +; sound_call Branch_fbd7e + octave 2 +.Loop29 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop29 +; sound_ret +; sound_call Branch_fbddd + octave 2 +.Loop30 + note F_, 6 + rest 7 + note F_, 6 + rest 7 + inc_octave +; cutoff 4 + note G#, 13 + dec_octave +; cutoff 8 + note F_, 6 + rest 7 + sound_loop 2, .Loop30 +; sound_ret +; sound_call Branch_fbdf0 + octave 2 +.Loop31 + note A#, 6 + rest 7 + note A#, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note A#, 6 + rest 7 + sound_loop 2, .Loop31 +; sound_ret +; sound_call Branch_fbd47 + octave 3 +.Loop32 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop32 +; sound_ret +; sound_call Branch_fbe03 + octave 3 + note C_, 6 + rest 7 + dec_octave + note C_, 13 + rest 13 + note D_, 13 + rest 13 + note E_, 13 + rest 13 + note C_, 6 + rest 7 +; sound_ret +; sound_call Branch_fbd91 + octave 2 +.Loop33 + note F_, 6 + rest 7 + note F_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note F_, 6 + rest 7 + sound_loop 2, .Loop33 +; sound_ret +; sound_call Branch_fbdca + octave 2 +.Loop34 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop34 +; sound_ret +; sound_call Branch_fbe10 + octave 2 +.Loop35 + note E_, 6 + rest 7 + note E_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note E_, 6 + rest 7 + sound_loop 2, .Loop35 +; sound_ret +; sound_call Branch_fbd6b + octave 2 +.Loop36 + note A_, 6 + rest 7 + note A_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note A_, 6 + rest 7 + sound_loop 2, .Loop36 +; sound_ret +; sound_call Branch_fbdb7 + octave 2 +.Loop37 + note D_, 6 + rest 7 + note D_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note D_, 6 + rest 7 + sound_loop 2, .Loop37 +; sound_ret +; sound_call Branch_fbdca + octave 2 +.Loop38 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop38 +; sound_ret +; sound_call Branch_fbd47 + octave 3 +.Loop39 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop39 +; sound_ret +; sound_call Branch_fbe03 + octave 3 + note C_, 6 + rest 7 + dec_octave + note C_, 13 + rest 13 + note D_, 13 + rest 13 + note E_, 13 + rest 13 + note C_, 6 + rest 7 +; sound_ret +; sound_call Branch_fbd91 + octave 2 +.Loop40 + note F_, 6 + rest 7 + note F_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note F_, 6 + rest 7 + sound_loop 2, .Loop40 +; sound_ret +; sound_call Branch_fbdca + octave 2 +.Loop41 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop41 +; sound_ret +; sound_call Branch_fbe10 + octave 2 +.Loop42 + note E_, 6 + rest 7 + note E_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note E_, 6 + rest 7 + sound_loop 2, .Loop42 +; sound_ret +; sound_call Branch_fbd6b + octave 2 +.Loop43 + note A_, 6 + rest 7 + note A_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note A_, 6 + rest 7 + sound_loop 2, .Loop43 +; sound_ret +; sound_call Branch_fbdb7 + octave 2 +.Loop44 + note D_, 6 + rest 7 + note D_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note D_, 6 + rest 7 + sound_loop 2, .Loop44 +; sound_ret +; sound_call Branch_fbdf0 + octave 2 +.Loop45 + note A#, 6 + rest 7 + note A#, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note A#, 6 + rest 7 + sound_loop 2, .Loop45 +; sound_ret +; sound_call Branch_fbdca + octave 2 +.Loop46 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop46 +; sound_ret + octave 2 + note G_, 6 + rest 7 + note G_, 13 + inc_octave + note G_, 6 + rest 7 + dec_octave + note A_, 6 + rest 7 + note A_, 6 + rest 7 + speed 13 + note B_, 2 + note G_, 1 + speed 1 +; sound_call Branch_fbd47 + octave 3 +.Loop47 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop47 +; sound_ret +; sound_call Branch_fbd58 + octave 2 +.Loop48 + note B_, 6 + rest 7 + note B_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note B_, 6 + rest 7 + sound_loop 2, .Loop48 +; sound_ret +; sound_call Branch_fbd6b + octave 2 +.Loop49 + note A_, 6 + rest 7 + note A_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note A_, 6 + rest 7 + sound_loop 2, .Loop49 +; sound_ret +; sound_call Branch_fbd7e + octave 2 +.Loop50 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop50 +; sound_ret +; sound_call Branch_fbd91 + octave 2 +.Loop51 + note F_, 6 + rest 7 + note F_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note F_, 6 + rest 7 + sound_loop 2, .Loop51 +; sound_ret +; sound_call Branch_fbda4 + octave 2 +.Loop52 + note E_, 6 + rest 7 + note E_, 6 + rest 7 + inc_octave +; cutoff 4 + note E_, 13 + dec_octave +; cutoff 8 + note E_, 6 + rest 7 + sound_loop 2, .Loop52 +; sound_ret +; sound_call Branch_fbdb7 + octave 2 +.Loop53 + note D_, 6 + rest 7 + note D_, 6 + rest 7 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note D_, 6 + rest 7 + sound_loop 2, .Loop53 +; sound_ret +; sound_call Branch_fbe3d + octave 2 +.Loop54 + note G_, 6 + rest 7 + sound_loop 2, .Loop54 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + note G_, 13 + note A_, 13 +; sound_ret + octave 2 + note B_, 6 + rest 7 +; sound_call Branch_fbd47 + octave 3 +.Loop55 + note C_, 6 + rest 7 + note C_, 6 + rest 7 +; cutoff 4 + note G_, 13 +; cutoff 8 + note C_, 6 + rest 7 + sound_loop 2, .Loop55 +; sound_ret +; sound_call Branch_fbd58 + octave 2 +.Loop56 + note B_, 6 + rest 7 + note B_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note B_, 6 + rest 7 + sound_loop 2, .Loop56 +; sound_ret +; sound_call Branch_fbd6b + octave 2 +.Loop57 + note A_, 6 + rest 7 + note A_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note A_, 6 + rest 7 + sound_loop 2, .Loop57 +; sound_ret +; sound_call Branch_fbd7e + octave 2 +.Loop58 + note G_, 6 + rest 7 + note G_, 6 + rest 7 + inc_octave +; cutoff 4 + note G_, 13 + dec_octave +; cutoff 8 + note G_, 6 + rest 7 + sound_loop 2, .Loop58 +; sound_ret +; sound_call Branch_fbddd + octave 2 +.Loop59 + note F_, 6 + rest 7 + note F_, 6 + rest 7 + inc_octave +; cutoff 4 + note G#, 13 + dec_octave +; cutoff 8 + note F_, 6 + rest 7 + sound_loop 2, .Loop59 +; sound_ret + octave 2 +.Loop60 + note A#, 6 + rest 7 + sound_loop 2, .Loop60 + inc_octave +; cutoff 4 + note F_, 13 + dec_octave +; cutoff 8 + note A#, 6 + rest 7 + note A#, 6 + inc_octave + note F_, 7 + note G#, 6 + inc_octave + note C_, 7 + note D#, 6 + note G_, 7 + dec_octave + dec_octave + note A#, 6 + rest 7 + sound_ret + Branch_fbd47: octave 3 .Loop12 - ;rept 2 note C_, 6 rest 7 - ;--- note C_, 6 rest 7 - ;endr - ;cutoff 4 +; cutoff 4 note G_, 13 - ;cutoff 8 +; cutoff 8 note C_, 6 rest 7 sound_loop 2, .Loop12 @@ -3180,18 +3515,15 @@ Branch_fbd47: Branch_fbd58: octave 2 .Loop13 - ;rept 2 note B_, 6 rest 7 - ;--- note B_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note B_, 6 rest 7 sound_loop 2, .Loop13 @@ -3200,18 +3532,15 @@ Branch_fbd58: Branch_fbd6b: octave 2 .Loop14 - ;rept 2 note A_, 6 rest 7 - ;--- note A_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note A_, 6 rest 7 sound_loop 2, .Loop14 @@ -3220,18 +3549,15 @@ Branch_fbd6b: Branch_fbd7e: octave 2 .Loop15 - ;rept 2 note G_, 6 rest 7 - ;--- note G_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop15 @@ -3240,18 +3566,15 @@ Branch_fbd7e: Branch_fbd91: octave 2 .Loop16 - ;rept 2 note F_, 6 rest 7 - ;--- note F_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop16 @@ -3260,18 +3583,15 @@ Branch_fbd91: Branch_fbda4: octave 2 .Loop17 - ;rept 2 note E_, 6 rest 7 - ;--- note E_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note E_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop17 @@ -3280,18 +3600,15 @@ Branch_fbda4: Branch_fbdb7: octave 2 .Loop18 - ;rept 2 note D_, 6 rest 7 - ;--- note D_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 6 rest 7 sound_loop 2, .Loop18 @@ -3300,18 +3617,15 @@ Branch_fbdb7: Branch_fbdca: octave 2 .Loop19 - ;rept 2 note G_, 6 rest 7 - ;--- note G_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 6 rest 7 sound_loop 2, .Loop19 @@ -3320,18 +3634,15 @@ Branch_fbdca: Branch_fbddd: octave 2 .Loop20 - ;rept 2 note F_, 6 rest 7 - ;--- note F_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G#, 13 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 6 rest 7 sound_loop 2, .Loop20 @@ -3340,18 +3651,15 @@ Branch_fbddd: Branch_fbdf0: octave 2 .Loop21 - ;rept 2 note A#, 6 rest 7 - ;--- note A#, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note A#, 6 rest 7 sound_loop 2, .Loop21 @@ -3375,18 +3683,15 @@ Branch_fbe03: Branch_fbe10: octave 2 .Loop22 - ;rept 2 note E_, 6 rest 7 - ;--- note E_, 6 rest 7 - ;endr inc_octave - ;cutoff 4 +; cutoff 4 note G_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 6 rest 7 sound_loop 2, .Loop22 @@ -3398,18 +3703,18 @@ Branch_fbe23: note C_, 6 rest 7 sound_loop 2, .Loop23 - ;cutoff 4 +; cutoff 4 note A_, 13 - ;cutoff 8 +; cutoff 8 note C_, 6 rest 7 .Loop24 note C_, 6 rest 7 sound_loop 2, .Loop24 - ;cutoff 4 +; cutoff 4 note F_, 13 - ;cutoff 8 +; cutoff 8 note C_, 6 rest 7 sound_ret @@ -3421,10 +3726,10 @@ Branch_fbe3d: rest 7 sound_loop 2, .Loop25 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 13 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 6 rest 7 note G_, 6 @@ -3434,7 +3739,7 @@ Branch_fbe3d: sound_ret -Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) +Music_TCGCredits_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -3448,10 +3753,43 @@ Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) drum_note 2, 6 drum_note 2, 7 sound_loop 4, .Loop3 - ; - ;sound_call Branch_fbe86 -.Loop7 + sound_call Branch_fbe86 +.Loop4 sound_call Branch_fbed1 + sound_loop 7, .Loop4 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 4 + drum_note 3, 3 +.Loop5 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 4, .Loop5 + sound_call Branch_fbe86 +.Loop6 + sound_call Branch_fbed1 + sound_loop 2, .Loop6 + sound_call Branch_fbeea + drum_speed 13 + drum_note 6, 8 + rest 3 + sound_ret + +Branch_fbe86: +.Loop7 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 5, 13 +; sound_ret sound_loop 6, .Loop7 drum_note 1, 13 drum_note 4, 13 @@ -3466,55 +3804,89 @@ Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) drum_note 2, 2 drum_speed 1 .Loop8 - sound_call Branch_fbed1 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 5, 13 +; sound_ret sound_loop 15, .Loop8 - sound_call Branch_fbedb +; sound_call Branch_fbedb + drum_note 1, 13 + drum_note 4, 6 + drum_note 3, 7 + drum_note 2, 6 + drum_note 2, 7 .Loop9 - sound_call Branch_fbed1 - sound_loop 7, .Loop9 - sound_call Branch_fbedb + drum_note 2, 6 + drum_note 3, 4 + drum_note 3, 3 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 2, .Loop9 + drum_note 2, 13 +; sound_ret .Loop10 - sound_call Branch_fbed1 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 5, 13 +; sound_ret sound_loop 7, .Loop10 - sound_call Branch_fbeea +; sound_call Branch_fbedb + drum_note 1, 13 + drum_note 4, 6 + drum_note 3, 7 + drum_note 2, 6 + drum_note 2, 7 .Loop11 - sound_call Branch_fbed1 - sound_loop 7, .Loop11 - drum_note 1, 13 - drum_note 4, 13 - drum_note 2, 13 - drum_note 4, 6 - drum_note 4, 7 - drum_note 1, 13 - drum_note 4, 6 + drum_note 2, 6 drum_note 3, 4 drum_note 3, 3 drum_note 2, 6 drum_note 2, 7 + sound_loop 2, .Loop11 drum_note 2, 13 +; sound_ret .Loop12 - sound_call Branch_fbed1 - sound_loop 5, .Loop12 - sound_call Branch_fbeea - ; -.Loop4 - sound_call Branch_fbed1 - sound_loop 7, .Loop4 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 5, 13 +; sound_ret + sound_loop 7, .Loop12 +; sound_call Branch_fbeea drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 drum_note 4, 6 drum_note 3, 4 drum_note 3, 3 -.Loop5 - drum_note 2, 6 - drum_note 2, 7 - sound_loop 4, .Loop5 - ; - ;sound_call Branch_fbe86 .Loop13 - sound_call Branch_fbed1 - sound_loop 6, .Loop13 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 3, .Loop13 + drum_note 2, 13 +; sound_ret +.Loop14 +; sound_call Branch_fbed1 drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3523,25 +3895,9 @@ Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 - drum_speed 13 - drum_note 6, 7 - drum_note 2, 2 - drum_speed 1 -.Loop14 - sound_call Branch_fbed1 - sound_loop 15, .Loop14 - sound_call Branch_fbedb -.Loop15 - sound_call Branch_fbed1 - sound_loop 7, .Loop15 - sound_call Branch_fbedb -.Loop16 - sound_call Branch_fbed1 - sound_loop 7, .Loop16 - sound_call Branch_fbeea -.Loop17 - sound_call Branch_fbed1 - sound_loop 7, .Loop17 + drum_note 5, 13 +; sound_ret + sound_loop 7, .Loop14 drum_note 1, 13 drum_note 4, 13 drum_note 2, 13 @@ -3554,18 +3910,32 @@ Music_TCGCredits_Ch4: ; fbe51 (3e:7e51) drum_note 2, 6 drum_note 2, 7 drum_note 2, 13 -.Loop18 - sound_call Branch_fbed1 - sound_loop 5, .Loop18 - sound_call Branch_fbeea - ; -.Loop6 - sound_call Branch_fbed1 - sound_loop 2, .Loop6 - sound_call Branch_fbeea - drum_speed 13 - drum_note 6, 8 - rest 3 +.Loop15 +; sound_call Branch_fbed1 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 4, 7 + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 5, 13 +; sound_ret + sound_loop 5, .Loop15 +; sound_call Branch_fbeea + drum_note 1, 13 + drum_note 4, 13 + drum_note 2, 13 + drum_note 4, 6 + drum_note 3, 4 + drum_note 3, 3 +.Loop16 + drum_note 2, 6 + drum_note 2, 7 + sound_loop 3, .Loop16 + drum_note 2, 13 +; sound_ret sound_ret Branch_fbed1: @@ -3609,4 +3979,3 @@ Branch_fbeea: sound_loop 3, .Loop14 drum_note 2, 13 sound_ret -; 0xfbef7 diff --git a/crysaudio/music/TCG/deckmachine.asm b/crysaudio/music/TCG/deckmachine.asm index cf1ff9b5..3ef8127a 100644 --- a/crysaudio/music/TCG/deckmachine.asm +++ b/crysaudio/music/TCG/deckmachine.asm @@ -5,98 +5,98 @@ Music_DeckMachine: channel 3, Music_DeckMachine_Ch3 channel 4, Music_DeckMachine_Ch4 -Music_DeckMachine_Ch1: ; f6ef1 (3d:6ef1) - ;stereo_panning 1, 1 - fade_wave 8 +Music_DeckMachine_Ch1: + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 3 .MainLoop octave 5 speed 1 .Loop1 - fade_wave 6 - channel_volume 9 +; cutoff 6 + volume_envelope 9, 1 note C_, 7 - channel_volume 3 + volume_envelope 3, 1 note C_, 8 - channel_volume 4 + volume_envelope 4, 1 note C_, 8 - channel_volume 9 + volume_envelope 9, 1 note G_, 7 - channel_volume 3 + volume_envelope 3, 1 note G_, 8 - channel_volume 4 + volume_envelope 4, 1 note C_, 7 - channel_volume 9 + volume_envelope 9, 1 note E_, 7 - channel_volume 3 + volume_envelope 3, 1 note E_, 8 - channel_volume 4 + volume_envelope 4, 1 note E_, 8 - channel_volume 9 + volume_envelope 9, 1 note C_, 7 - channel_volume 3 + volume_envelope 3, 1 note C_, 8 - channel_volume 4 + volume_envelope 4, 1 note C_, 7 - channel_volume 9 + volume_envelope 9, 1 note G_, 7 - channel_volume 3 + volume_envelope 3, 1 note G_, 8 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 1 +; cutoff 4 note F_, 7 - fade_wave 5 - channel_volume 4 +; cutoff 5 + volume_envelope 4, 1 note G_, 8 sound_loop 9, .Loop1 - channel_volume 9 + volume_envelope 9, 1 note C_, 7 - channel_volume 3 + volume_envelope 3, 1 note C_, 8 - channel_volume 4 + volume_envelope 4, 1 note C_, 15 speed 10 rest 9 sound_loop 0, .MainLoop -Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) - ;stereo_panning 1, 1 - fade_wave 8 +Music_DeckMachine_Ch2: + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 1 - fade_wave 7 +; cutoff 7 .MainLoop octave 3 speed 1 .Loop1 rest 15 - channel_volume 11 + volume_envelope 11, 2 rest 7 note C_, 8 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 rest 7 - channel_volume 11 + volume_envelope 11, 2 note C_, 7 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 rest 7 - channel_volume 11 + volume_envelope 11, 2 dec_octave note A_, 8 - channel_volume 2 + volume_envelope 2, 7 note A_, 8 rest 7 inc_octave - channel_volume 11 + volume_envelope 11, 2 note C_, 7 - channel_volume 2 + volume_envelope 2, 7 note C_, 8 rest 15 sound_loop 9, .Loop1 - channel_volume 11 + volume_envelope 11, 2 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 rest 15 speed 10 @@ -104,12 +104,12 @@ Music_DeckMachine_Ch2: ; f6f41 (3d:6f41) sound_loop 0, .MainLoop -Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) - ;stereo_panning 1, 1 +Music_DeckMachine_Ch3: + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 96 - ;cutoff 8 +; echo 96 +; cutoff 8 .MainLoop octave 3 speed 1 @@ -118,32 +118,32 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 note G_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 8 - ;cutoff 8 +; cutoff 8 rest 7 dec_octave note C_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note E_, 7 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 8 note D_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note C_, 8 dec_octave rest 7 - ;cutoff 8 +; cutoff 8 note A_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 7 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note A_, 8 inc_octave note D_, 7 @@ -152,31 +152,31 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 note G_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 8 rest 7 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note E_, 7 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 8 note F_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note C_, 8 rest 7 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 7 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 8 note D_, 7 rest 8 @@ -185,33 +185,33 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) rest 8 note G_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 8 rest 7 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note E_, 7 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G_, 8 inc_octave note C_, 7 inc_octave - ;cutoff 5 +; cutoff 5 note C_, 8 rest 7 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 8 inc_octave - ;cutoff 5 +; cutoff 5 note G_, 7 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 8 note D_, 7 rest 8 @@ -231,7 +231,7 @@ Music_DeckMachine_Ch3: ; f6f7b (3d:6f7b) sound_loop 0, .MainLoop -Music_DeckMachine_Ch4: ; f7018 (3d:7018) +Music_DeckMachine_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -263,4 +263,3 @@ Branch_f7031: drum_note 1, 7 drum_note 4, 8 sound_ret -; 0xf703a diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index e9529cd8..3903a442 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -5,12 +5,12 @@ Music_DuelTheme1: channel 3, Music_DuelTheme1_Ch3 channel 4, Music_DuelTheme1_Ch4 -Music_DuelTheme1_Ch1: ; f532a (3d:532a) +Music_DuelTheme1_Ch1: speed 7 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 2 .MainLoop octave 2 @@ -21,128 +21,128 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) .Loop2 rest 3 sound_call Branch_f54f9 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 1 rest 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D_, 10 - channel_volume 3 + volume_envelope 3, 7 note D_, 12 sound_call Branch_f54f9 - channel_volume 10 + volume_envelope 10, 0 note F#, 2 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 13 - channel_volume 3 + volume_envelope 3, 7 note A_, 10 - channel_volume 10 + volume_envelope 10, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 1 note G_, 1 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 15 - channel_volume 3 + volume_envelope 3, 7 note B_, 4 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 3 note A_, 3 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 2 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 15 - channel_volume 3 + volume_envelope 3, 7 note A_, 4 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 3 note G_, 4 note F#, 2 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 15 - channel_volume 3 + volume_envelope 3, 7 note G_, 4 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 3 note F#, 4 note E_, 3 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 4 note E_, 3 - ;tie +; tie speed 7 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 13 - channel_volume 3 + volume_envelope 3, 7 note D_, 9 dec_octave sound_loop 2, .Loop2 inc_octave duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 1 rest 1 @@ -154,37 +154,37 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 5 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 1 inc_octave speed 1 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 10 + volume_envelope 10, 0 note F#, 4 - channel_volume 3 + volume_envelope 3, 7 note F#, 3 - channel_volume 10 + volume_envelope 10, 0 note A_, 4 - channel_volume 3 + volume_envelope 3, 7 note A_, 3 speed 7 rest 3 dec_octave duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 .Loop3 note A_, 1 rest 2 @@ -193,7 +193,7 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 1 rest 1 @@ -205,48 +205,48 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 5 - ;tie +; tie note A_, 10 - ;tie +; tie note A_, 6 - channel_volume 3 + volume_envelope 3, 7 note A_, 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 2 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 13 - ;tie +; tie note A_, 6 - channel_volume 3 + volume_envelope 3, 7 note A_, 2 dec_octave - channel_volume 8 + volume_envelope 7, -1 speed 1 note A_, 5 inc_octave @@ -266,16 +266,16 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note A_, 4 dec_octave sound_call Branch_f5580 - channel_volume 10 + volume_envelope 10, 0 note A_, 2 - ;tie +; tie note A_, 8 - ;tie +; tie note A_, 8 - ;tie +; tie note A_, 6 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 dec_octave note B_, 4 @@ -290,100 +290,100 @@ Music_DuelTheme1_Ch1: ; f532a (3d:532a) note G_, 2 duty_cycle 2 sound_call Branch_f5580 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 5 note G_, 2 note F#, 2 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 2 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 5 note F#, 2 note E_, 2 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 2 - channel_volume 3 + volume_envelope 3, 7 note D_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 8 - ;tie +; tie note D_, 8 note D_, 8 - ;tie +; tie note D_, 8 - channel_volume 3 + volume_envelope 3, 7 note D_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 12 - channel_volume 3 + volume_envelope 3, 7 note D_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 6 - ;tie +; tie note D_, 8 rest 4 sound_loop 0, .MainLoop Branch_f54f9: octave 2 - channel_volume 10 + volume_envelope 10, 0 note A_, 1 note B_, 1 inc_octave note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 10 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 4 note E_, 3 - ;tie +; tie speed 7 note E_, 5 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 2 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 sound_ret @@ -396,26 +396,26 @@ Branch_f5538: note G_, 1 rest 2 duty_cycle 2 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 inc_octave speed 1 note C_, 4 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 10 + volume_envelope 10, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 10 + volume_envelope 10, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 speed 7 rest 3 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 dec_octave .Loop4 note G_, 1 @@ -423,120 +423,116 @@ Branch_f5538: sound_loop 3, .Loop4 inc_octave duty_cycle 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 2 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 sound_ret Branch_f5580: speed 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 9 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 - channel_volume 10 + volume_envelope 10, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note B_, 2 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 1 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 7 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C#, 2 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 9 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 8 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 4 note G_, 4 note F#, 10 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 10 note E_, 2 note F#, 2 - channel_volume 3 + volume_envelope 3, 7 note F#, 2 sound_ret -Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) +Music_DuelTheme1_Ch2: speed 7 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop duty_cycle 1 - channel_volume 9 + volume_envelope 9, 0 octave 2 .Loop1 - ;rept 3 note D_, 1 rest 2 - ;--- note D_, 1 rest 2 - ;--- note D_, 1 rest 2 - ;endr rest 1 dec_octave note A_, 1 @@ -552,8 +548,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note D_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 2 sound_call Branch_f59f9 sound_loop 4, .Loop2 @@ -563,8 +559,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 sound_call Branch_f59f9 octave 2 @@ -573,13 +569,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note C_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -587,13 +583,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 1 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 1 rest 2 inc_octave @@ -604,8 +600,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 sound_call Branch_f59f9 sound_loop 3, .Loop3 @@ -615,13 +611,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note C_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -629,13 +625,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 1 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 1 rest 2 inc_octave @@ -644,8 +640,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 sound_call Branch_f59f9 octave 2 @@ -654,24 +650,24 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note F#, 1 rest 1 .Loop4 @@ -679,23 +675,23 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note G_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note G_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 2 sound_loop 2, .Loop4 @@ -703,8 +699,8 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note F#, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 inc_octave note C#, 2 sound_call Branch_f5a17 @@ -714,66 +710,66 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note F#, 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note E_, 2 sound_call Branch_f5a17 note E_, 1 rest 2 note E_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note B_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note G_, 1 rest 2 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note A_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note A_, 1 rest 2 note D_, 1 rest 2 note D_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -781,13 +777,13 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 1 rest 2 inc_octave @@ -795,12 +791,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 2 note D_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -808,46 +804,46 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 7, 0 +; frequency_offset 0 note E_, 1 note F#, 1 note A_, 1 rest 1 - channel_volume 7 + volume_envelope 7, 0 sound_call Branch_f594d - channel_volume 7 + volume_envelope 7, 0 octave 3 speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 1 rest 1 dec_octave note F#, 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note F#, 2 - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 note A_, 10 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 inc_octave note D_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -855,38 +851,38 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 1 note F#, 1 note A_, 1 rest 1 sound_call Branch_f594d - channel_volume 7 + volume_envelope 7, 0 octave 3 note D_, 2 rest 1 note F#, 13 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 inc_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note D_, 1 rest 1 note D_, 1 @@ -896,96 +892,96 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 15 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note G_, 1 rest 2 note G_, 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 2 rest 1 note F#, 3 rest 1 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 15 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note F#, 1 rest 2 note F#, 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 2 rest 1 note E_, 3 rest 1 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note D#, 4 note E_, 3 - ;tie +; tie speed 7 note E_, 15 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note A#, 4 note B_, 3 - ;tie +; tie speed 7 note B_, 2 rest 1 @@ -996,36 +992,36 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 1 rest 1 note F#, 13 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 2 note D_, 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note D_, 2 dec_octave - ;frequency_offset 0 +; frequency_offset 0 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 2 sound_call Branch_f59b4 octave 3 speed 1 - channel_volume 7 + volume_envelope 7, 0 note F_, 4 note F#, 3 - ;tie +; tie speed 7 note F#, 1 rest 1 @@ -1045,23 +1041,23 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) rest 3 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 .Loop5 note D_, 1 rest 2 sound_loop 3, .Loop5 sound_call Branch_f59b4 - channel_volume 8 + volume_envelope 8, 0 octave 3 note D_, 16 - ;tie +; tie note D_, 6 rest 2 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 2 note A_, 1 @@ -1074,7 +1070,7 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note C#, 6 rest 2 dec_octave - channel_volume 8 + volume_envelope 7, -1 speed 1 note E_, 5 note A_, 5 @@ -1098,12 +1094,12 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) speed 7 sound_call Branch_f598c note D_, 8 - ;tie +; tie note D_, 8 note C#, 6 dec_octave duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 4 note G#, 3 @@ -1131,10 +1127,10 @@ Music_DuelTheme1_Ch2: ; f55e7 (3d:55e7) note A_, 2 rest 2 note G_, 8 - ;tie +; tie note G_, 8 note F#, 8 - ;tie +; tie note F#, 8 rest 2 note G_, 12 @@ -1148,51 +1144,51 @@ Branch_f594d: speed 1 note C#, 4 note D_, 3 - ;tie +; tie speed 7 note D_, 9 dec_octave duty_cycle 1 - channel_volume 9 + volume_envelope 9, 0 dec_octave note A_, 1 rest 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note A_, 3 rest 1 inc_octave note C_, 6 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 1 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note D#, 4 note E_, 3 - ;tie +; tie speed 7 note E_, 2 note D_, 1 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note G_, 2 inc_octave - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 note C_, 1 rest 1 sound_ret Branch_f598c: - channel_volume 8 + volume_envelope 8, 0 note D_, 10 rest 2 note E_, 1 @@ -1229,16 +1225,16 @@ Branch_f598c: note D_, 2 rest 2 note D_, 2 - ;tie +; tie sound_ret Branch_f59b4: octave 2 - channel_volume 8 + volume_envelope 8, 0 speed 1 note G#, 4 note A_, 3 - ;tie +; tie speed 7 note A_, 1 rest 1 @@ -1253,7 +1249,7 @@ Branch_f59b4: note C_, 1 rest 2 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note E_, 1 speed 1 note G_, 4 @@ -1265,21 +1261,21 @@ Branch_f59b4: rest 3 speed 7 rest 3 - fade_wave 8 +; cutoff 8 dec_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 .Loop6 note C_, 1 rest 2 sound_loop 3, .Loop6 inc_octave duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F#, 4 note G_, 3 - ;tie +; tie speed 7 note G_, 2 note F#, 1 @@ -1291,8 +1287,8 @@ Branch_f59b4: Branch_f59f9: octave 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 1 rest 3 dec_octave @@ -1300,13 +1296,13 @@ Branch_f59f9: rest 1 inc_octave duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 dec_octave duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 1 rest 2 sound_ret @@ -1314,44 +1310,40 @@ Branch_f59f9: Branch_f5a17: octave 2 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note F#, 1 rest 3 note C#, 1 rest 1 duty_cycle 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 2 +; cutoff 6 note A_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 1 rest 2 sound_ret -Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) +Music_DuelTheme1_Ch3: speed 7 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 14 - ;echo 96 - ;cutoff 8 +; echo 96 +; cutoff 8 octave 2 .MainLoop .Loop1 - ;rept 3 note D_, 1 rest 2 - ;--- note D_, 1 rest 2 - ;--- note D_, 1 rest 2 - ;endr rest 1 sound_call Branch_f5c47 sound_loop 4, .Loop1 @@ -1361,11 +1353,11 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 inc_octave inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1375,10 +1367,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note F#, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1387,11 +1379,11 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) note D_, 1 inc_octave inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1400,10 +1392,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1411,10 +1403,10 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 2 note D_, 2 @@ -1470,30 +1462,30 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 sound_call Branch_f5c60 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 rest 1 note E_, 2 - ;cutoff 6 +; cutoff 6 note B_, 2 sound_call Branch_f5c60 octave 2 - ;cutoff 8 +; cutoff 8 note F#, 2 note G_, 2 - ;cutoff 6 +; cutoff 6 note G#, 2 sound_call Branch_f5c6f octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 rest 1 note A_, 2 - ;cutoff 6 +; cutoff 6 note E_, 2 sound_call Branch_f5c6f octave 2 - ;cutoff 8 +; cutoff 8 note B_, 2 inc_octave note C_, 2 @@ -1511,9 +1503,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note E_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note E_, 1 - ;cutoff 8 +; cutoff 8 note E_, 1 rest 1 note E_, 2 @@ -1527,9 +1519,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note F#, 1 rest 1 - ;cutoff 7 +; cutoff 7 note F#, 1 - ;cutoff 8 +; cutoff 8 note F#, 1 rest 1 note F#, 2 @@ -1543,9 +1535,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note G_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note G_, 1 - ;cutoff 8 +; cutoff 8 note F#, 1 rest 1 note E_, 2 @@ -1560,9 +1552,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note B_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note B_, 1 - ;cutoff 8 +; cutoff 8 note F#, 1 rest 1 note F_, 2 @@ -1604,9 +1596,9 @@ Music_DuelTheme1_Ch3: ; f5a32 (3d:5a32) rest 1 note D_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note D_, 1 - ;cutoff 8 +; cutoff 8 note D_, 1 rest 1 note A_, 14 @@ -1618,102 +1610,97 @@ Branch_f5b8d: rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 - ; +; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 - ; +; sound_ret .Loop7 note D_, 1 rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 - ; +; sound_ret sound_loop 3, .Loop7 note D_, 1 rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 - ; +; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 - ; - ;sound_call Branch_f5c47 +; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 - ; +; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 3 note D_, 1 @@ -1726,10 +1713,10 @@ Branch_f5b8d: rest 2 note G_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note B_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 rest 3 note D_, 1 @@ -1742,10 +1729,10 @@ Branch_f5b8d: rest 2 note F#, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F#, 1 rest 3 note C#, 1 @@ -1758,11 +1745,11 @@ Branch_f5b8d: note F#, 1 inc_octave inc_octave - ;cutoff 3 +; cutoff 3 note C#, 2 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note F#, 1 rest 3 note C#, 1 @@ -1774,10 +1761,10 @@ Branch_f5b8d: rest 2 note E_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note B_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 1 rest 3 note E_, 1 @@ -1789,10 +1776,10 @@ Branch_f5b8d: rest 2 note A_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note B_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note A_, 1 rest 3 note E_, 1 @@ -1821,9 +1808,9 @@ Branch_f5c4d: rest 1 note D_, 1 rest 1 - ;cutoff 7 +; cutoff 7 note D_, 1 - ;cutoff 8 +; cutoff 8 note D_, 1 rest 1 note D_, 2 @@ -1831,7 +1818,7 @@ Branch_f5c4d: Branch_f5c60: octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 rest 1 note E_, 1 @@ -1840,13 +1827,13 @@ Branch_f5c60: rest 1 note E_, 1 rest 1 - ;cutoff 6 +; cutoff 6 note E_, 1 sound_ret Branch_f5c6f: octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 rest 1 note A_, 1 @@ -1855,7 +1842,7 @@ Branch_f5c6f: rest 1 note A_, 1 rest 1 - ;cutoff 6 +; cutoff 6 note A_, 1 sound_ret @@ -1886,7 +1873,7 @@ Branch_f5c7e: sound_ret -Music_DuelTheme1_Ch4: ; f5c9a (3d:5c9a) +Music_DuelTheme1_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -2053,4 +2040,3 @@ Branch_f5d58: drum_note 2, 1 sound_loop 8, .Loop12 sound_ret -; 0xf5d68 diff --git a/crysaudio/music/TCG/dueltheme2.asm b/crysaudio/music/TCG/dueltheme2.asm index 826f97fe..8a10752e 100644 --- a/crysaudio/music/TCG/dueltheme2.asm +++ b/crysaudio/music/TCG/dueltheme2.asm @@ -5,15 +5,15 @@ Music_DuelTheme2: channel 3, Music_DuelTheme2_Ch3 channel 4, Music_DuelTheme2_Ch4 -Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) +Music_DuelTheme2_Ch1: speed 9 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 1 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 .Loop1 note D_, 2 note D_, 1 @@ -25,7 +25,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 23, .Loop2 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 inc_octave inc_octave speed 1 @@ -41,57 +41,57 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) speed 9 sound_call Branch_f5f3d note C_, 6 - ;tie +; tie speed 1 note C_, 12 - channel_volume 3 + volume_envelope 3, 7 note C_, 6 - channel_volume 10 + volume_envelope 10, 0 dec_octave note B_, 12 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 - channel_volume 10 + volume_envelope 10, 0 note G_, 12 - channel_volume 3 + volume_envelope 3, 7 note G_, 6 speed 9 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note D_, 9 - ;tie +; tie note D_, 9 - channel_volume 4 + volume_envelope 4, 7 note D_, 3 duty_cycle 2 - fade_wave 8 - channel_volume 3 +; cutoff 8 + volume_envelope 2, -7 note E_, 4 - channel_volume 6 + volume_envelope 6, 0 note E_, 7 - channel_volume 2 + volume_envelope 2, 7 note E_, 1 - channel_volume 6 + volume_envelope 5, -7 note G_, 4 - channel_volume 8 + volume_envelope 8, 0 speed 1 note G_, 12 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 inc_octave speed 9 - channel_volume 8 - fade_wave 8 + volume_envelope 7, -7 +; cutoff 8 note C_, 3 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 dec_octave speed 1 note C_, 3 @@ -105,58 +105,58 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 speed 9 sound_call Branch_f5f3d - fade_wave 8 +; cutoff 8 note C_, 4 - ;tie +; tie speed 1 note C_, 4 note E_, 5 note F_, 4 note F#, 5 note G_, 12 - channel_volume 3 + volume_envelope 3, 7 note G_, 6 - channel_volume 10 + volume_envelope 10, 0 note E_, 12 - channel_volume 3 + volume_envelope 3, 7 note E_, 6 speed 9 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note A_, 1 inc_octave - fade_wave 8 +; cutoff 8 note D_, 9 - ;tie +; tie note D_, 10 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 - fade_wave 8 +; cutoff 8 note D_, 4 note D#, 5 speed 9 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 inc_octave - fade_wave 8 +; cutoff 8 note C_, 3 dec_octave speed 1 @@ -171,10 +171,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 sound_call Branch_f5f90 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 octave 1 note D_, 1 .Loop3 @@ -182,7 +182,7 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 3, .Loop3 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 inc_octave inc_octave note G_, 1 @@ -197,99 +197,99 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 note B_, 1 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 sound_call Branch_f5f62 octave 4 - channel_volume 4 + volume_envelope 4, 7 note F#, 12 - channel_volume 10 + volume_envelope 10, 0 note C#, 9 - channel_volume 4 + volume_envelope 4, 7 note C#, 1 - channel_volume 10 + volume_envelope 10, 0 note C#, 1 note D_, 1 note E_, 3 note D_, 3 note C#, 3 dec_octave - fade_wave 6 +; cutoff 6 note B_, 3 - fade_wave 8 +; cutoff 8 note B_, 4 - channel_volume 4 + volume_envelope 4, 7 note B_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 1 note C#, 4 dec_octave note B_, 5 speed 9 note A_, 6 - channel_volume 4 + volume_envelope 4, 7 note A_, 1 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 3 +; cutoff 8 note D_, 2 note D_, 2 rest 2 note C#, 2 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 sound_call Branch_f5f62 octave 4 - channel_volume 4 + volume_envelope 4, 7 note F#, 6 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 2 inc_octave note C#, 2 note D_, 1 - channel_volume 4 + volume_envelope 4, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 9 - channel_volume 4 + volume_envelope 4, 7 note D_, 1 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 0 +; cutoff 7 note C#, 1 note D_, 1 - fade_wave 8 +; cutoff 8 note E_, 3 note D_, 3 note C#, 3 dec_octave - fade_wave 6 +; cutoff 6 note A_, 3 inc_octave - fade_wave 8 +; cutoff 8 note F_, 10 - fade_wave 7 +; cutoff 7 note E_, 1 note F_, 1 - fade_wave 8 +; cutoff 8 note G_, 3 note F_, 3 note E_, 3 speed 1 note C_, 2 - ;tie +; tie note C_, 16 - channel_volume 4 + volume_envelope 4, 7 note C_, 9 speed 9 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note A_, 10 - fade_wave 7 +; cutoff 7 note G_, 1 note F_, 1 - fade_wave 8 +; cutoff 8 note G_, 6 inc_octave note C_, 3 @@ -306,10 +306,10 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note C_, 3 sound_call Branch_f5f90 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 octave 1 note D_, 1 .Loop4 @@ -317,8 +317,8 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note D_, 1 sound_loop 3, .Loop4 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 octave 5 note D_, 1 note C_, 1 @@ -336,40 +336,40 @@ Music_DuelTheme2_Ch1: ; f5d68 (3d:5d68) note F_, 1 note C_, 1 note D_, 12 - ;tie +; tie note D_, 12 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 sound_loop 0, .MainLoop Branch_f5f3d: - fade_wave 8 +; cutoff 8 note D_, 12 - ;tie +; tie note D_, 4 - ;tie +; tie speed 1 note D_, 7 - channel_volume 4 + volume_envelope 4, 7 note D_, 2 - ;tie +; tie speed 9 note D_, 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 4 - ;tie +; tie speed 1 note A_, 7 - channel_volume 4 + volume_envelope 4, 7 note A_, 2 - ;tie +; tie speed 9 note A_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 12 - ;tie +; tie sound_ret Branch_f5f62: @@ -390,10 +390,10 @@ Branch_f5f62: dec_octave note A_, 2 note F#, 5 - channel_volume 4 + volume_envelope 4, 7 note F#, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D_, 2 note C#, 2 dec_octave @@ -402,13 +402,13 @@ Branch_f5f62: note G_, 2 note A_, 2 note B_, 1 - channel_volume 4 + volume_envelope 4, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 inc_octave - fade_wave 6 +; cutoff 6 note F#, 1 - fade_wave 8 +; cutoff 8 note F#, 9 sound_ret @@ -417,47 +417,41 @@ Branch_f5f90: speed 9 .Loop5 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 4 octave 1 note D_, 1 - ;rept 5 note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;endr note D_, 2 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 octave 5 note C_, 4 sound_loop 3, .Loop5 sound_ret -Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) +Music_DuelTheme2_Ch2: speed 9 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 15, 3, 3 - fade_wave 8 +; cutoff 8 octave 2 duty_cycle 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 .Loop1 note D_, 2 note D_, 1 @@ -468,8 +462,8 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 sound_loop 24, .Loop2 duty_cycle 2 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 6, -3 +; frequency_offset 0 .Loop3 inc_octave note D_, 1 @@ -489,17 +483,17 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note C_, 1 note G_, 1 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 dec_octave note D_, 1 rest 1 dec_octave - fade_wave 6 +; cutoff 6 note A_, 1 - fade_wave 8 +; cutoff 8 note A_, 9 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 .Loop5 note A_, 1 note D_, 1 @@ -507,24 +501,24 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) sound_loop 4, .Loop5 duty_cycle 2 inc_octave - fade_wave 8 - channel_volume 3 +; cutoff 8 + volume_envelope 2, -7 note C_, 4 - channel_volume 6 + volume_envelope 6, 0 note C_, 7 rest 1 - channel_volume 6 + volume_envelope 5, -7 note E_, 4 speed 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 12 rest 6 speed 9 - channel_volume 8 + volume_envelope 7, -7 note G_, 3 dec_octave duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 3 note A_, 4 @@ -537,7 +531,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note G_, 3 speed 9 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 .Loop6 note A_, 1 note D_, 1 @@ -555,7 +549,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) speed 1 note G_, 4 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 inc_octave note C_, 5 note D_, 4 @@ -571,19 +565,19 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) rest 1 note A_, 1 rest 1 - fade_wave 6 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note A_, 9 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 .Loop9 note A_, 1 note D_, 1 sound_loop 5, .Loop9 note A_, 1 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 speed 1 note A#, 4 note B_, 5 @@ -609,8 +603,8 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 1 rest 1 duty_cycle 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 dec_octave dec_octave note D_, 1 @@ -619,8 +613,8 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note D_, 1 sound_loop 3, .Loop10 duty_cycle 2 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 6, -3 +; frequency_offset 0 inc_octave note E_, 1 rest 1 @@ -638,7 +632,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave note C#, 1 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 sound_call Branch_f6173 octave 4 .Loop11 @@ -666,21 +660,21 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave sound_loop 2, .Loop12 duty_cycle 1 - channel_volume 9 + volume_envelope 9, 3 octave 2 rest 1 - fade_wave 8 +; cutoff 8 note B_, 2 note B_, 2 rest 2 note A_, 2 inc_octave - fade_wave 8 +; cutoff 8 note C#, 1 note D_, 1 note E_, 1 duty_cycle 2 - channel_volume 7 + volume_envelope 6, -3 sound_call Branch_f6173 octave 3 .Loop13 @@ -768,7 +762,7 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) inc_octave note C_, 1 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 dec_octave speed 1 note G_, 3 @@ -784,8 +778,8 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) note A_, 1 rest 1 duty_cycle 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 dec_octave dec_octave note D_, 1 @@ -795,16 +789,16 @@ Music_DuelTheme2_Ch2: ; f5fad (3d:5fad) sound_loop 3, .Loop17 rest 12 duty_cycle 1 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 7, 0 +; frequency_offset 0 inc_octave note A_, 12 - ;tie +; tie note A_, 12 dec_octave duty_cycle 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 sound_loop 0, .MainLoop Branch_f6173: @@ -841,30 +835,24 @@ Branch_f618f: .Loop20 note A_, 1 rest 1 - channel_volume 7 - ;frequency_offset 5 + volume_envelope 7, 4 +; frequency_offset 5 dec_octave dec_octave note D_, 1 - ;rept 5 note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;--- note D_, 2 note D_, 1 - ;endr note D_, 2 - channel_volume 7 - ;frequency_offset 0 + volume_envelope 7, 0 +; frequency_offset 0 inc_octave inc_octave note G_, 4 @@ -872,13 +860,13 @@ Branch_f618f: sound_ret -Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) +Music_DuelTheme2_Ch3: speed 9 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 64 - ;cutoff 7 +; echo 64 +; cutoff 7 octave 2 .Loop1 sound_call Branch_f62e5 @@ -888,17 +876,13 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 44, .Loop2 .Loop3 - ;rept 3 sound_call Branch_f62e5 - ;--- sound_call Branch_f62e5 - ;--- sound_call Branch_f62e5 - ;endr octave 2 - ;cutoff 4 +; cutoff 4 note D_, 2 - ;cutoff 7 +; cutoff 7 note C_, 3 note E_, 1 sound_loop 3, .Loop3 @@ -906,7 +890,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 2, .Loop4 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 inc_octave note E_, 1 @@ -932,9 +916,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 4, .Loop5 octave 2 .Loop6 - ;cutoff 4 +; cutoff 4 note E_, 2 - ;cutoff 7 +; cutoff 7 note E_, 1 inc_octave note E_, 1 @@ -945,9 +929,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 4, .Loop6 .Loop7 - ;cutoff 4 +; cutoff 4 note A_, 2 - ;cutoff 7 +; cutoff 7 note A_, 1 inc_octave note A_, 1 @@ -961,7 +945,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 2, .Loop8 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 inc_octave note E_, 1 @@ -990,9 +974,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 4, .Loop9 octave 2 .Loop10 - ;cutoff 4 +; cutoff 4 note E_, 2 - ;cutoff 7 +; cutoff 7 note E_, 1 inc_octave note E_, 1 @@ -1003,9 +987,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 4, .Loop10 .Loop11 - ;cutoff 4 +; cutoff 4 note G_, 2 - ;cutoff 7 +; cutoff 7 note G_, 1 inc_octave note G_, 1 @@ -1016,9 +1000,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 2, .Loop11 .Loop12 - ;cutoff 4 +; cutoff 4 note A_, 2 - ;cutoff 7 +; cutoff 7 note A_, 1 inc_octave note A_, 1 @@ -1029,9 +1013,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 2, .Loop12 .Loop13 - ;cutoff 4 +; cutoff 4 note A#, 2 - ;cutoff 7 +; cutoff 7 note A#, 1 inc_octave note A#, 1 @@ -1043,9 +1027,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 2, .Loop13 inc_octave .Loop14 - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 7 +; cutoff 7 note C_, 1 inc_octave note C_, 1 @@ -1057,9 +1041,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 2, .Loop14 dec_octave .Loop15 - ;cutoff 4 +; cutoff 4 note A#, 2 - ;cutoff 7 +; cutoff 7 note A#, 1 inc_octave note A#, 1 @@ -1071,9 +1055,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_loop 2, .Loop15 inc_octave .Loop16 - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 7 +; cutoff 7 note C_, 1 inc_octave note C_, 1 @@ -1084,17 +1068,13 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) dec_octave sound_loop 2, .Loop16 .Loop17 - ;rept 3 sound_call Branch_f62e5 - ;--- sound_call Branch_f62e5 - ;--- sound_call Branch_f62e5 - ;endr octave 2 - ;cutoff 4 +; cutoff 4 note D_, 2 - ;cutoff 7 +; cutoff 7 note C_, 3 note E_, 1 sound_loop 3, .Loop17 @@ -1102,7 +1082,7 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) sound_call Branch_f62e5 sound_loop 2, .Loop18 octave 3 - ;cutoff 8 +; cutoff 8 note D_, 1 note C_, 1 dec_octave @@ -1125,9 +1105,9 @@ Music_DuelTheme2_Ch3: ; f61ac (3d:61ac) Branch_f62e5: octave 2 - ;cutoff 4 +; cutoff 4 note D_, 2 - ;cutoff 7 +; cutoff 7 note D_, 1 inc_octave note D_, 1 @@ -1138,7 +1118,7 @@ Branch_f62e5: sound_ret -Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) +Music_DuelTheme2_Ch4: toggle_noise 6 drum_speed 9 .Loop1 @@ -1168,19 +1148,12 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) sound_call Branch_f6396 .Loop6 sound_call Branch_f637c - ;rept 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 - ;endr drum_note 2, 2 drum_note 6, 3 drum_note 2, 1 @@ -1229,19 +1202,12 @@ Music_DuelTheme2_Ch4: ; f62f3 (3d:62f3) sound_call Branch_f6396 .Loop10 sound_call Branch_f637c - ;rept 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 - ;endr drum_note 2, 2 drum_note 6, 3 drum_note 2, 1 @@ -1295,4 +1261,3 @@ Branch_f6396: drum_note 2, 1 sound_loop 6, .Loop12 sound_ret -; 0xf63a1 diff --git a/crysaudio/music/TCG/dueltheme3.asm b/crysaudio/music/TCG/dueltheme3.asm index 283c8ce6..17f23730 100644 --- a/crysaudio/music/TCG/dueltheme3.asm +++ b/crysaudio/music/TCG/dueltheme3.asm @@ -5,50 +5,45 @@ Music_DuelTheme3: channel 3, Music_DuelTheme3_Ch3 channel 4, Music_DuelTheme3_Ch4 -Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) +Music_DuelTheme3_Ch1: speed 11 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop octave 2 duty_cycle 0 .Loop1 - ;rept 4 - channel_volume 9 + volume_envelope 9, 2 note F#, 2 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 2 note F#, 2 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 2 note F#, 2 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 2 note F#, 2 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note E_, 2 - channel_volume 9 + volume_envelope 9, 5 note F_, 2 sound_loop 4, .Loop1 .Loop2 sound_call Branch_f67b2 sound_loop 4, .Loop2 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 .Loop3 octave 3 note C#, 1 note F#, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 sound_call Branch_f65a7 octave 3 @@ -56,42 +51,42 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note F#, 1 speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 sound_call Branch_f65a7 sound_loop 2, .Loop3 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 dec_octave rest 2 speed 1 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 sound_call Branch_f65cf note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 speed 11 rest 1 dec_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 speed 1 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 sound_call Branch_f65cf speed 11 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 .Loop4 octave 3 note C#, 1 note F#, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 sound_call Branch_f65a7 octave 3 @@ -99,9 +94,9 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note F#, 1 speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 - channel_volume 10 + volume_envelope 10, 0 sound_call Branch_f65a7 sound_loop 2, .Loop4 vibrato 10, 3, 3 @@ -109,65 +104,65 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) .Loop5 octave 2 rest 4 - channel_volume 9 + volume_envelope 9, 0 note F#, 2 - channel_volume 2 + volume_envelope 2, 7 note F#, 2 rest 2 - channel_volume 9 + volume_envelope 9, 0 note E_, 2 - channel_volume 2 + volume_envelope 2, 7 note E_, 4 - channel_volume 9 + volume_envelope 9, 0 note D#, 2 - channel_volume 2 + volume_envelope 2, 7 note D#, 4 - channel_volume 9 + volume_envelope 9, 0 note D_, 2 note C#, 2 sound_loop 2, .Loop5 vibrato 20, 3, 3 duty_cycle 2 - fade_wave 6 +; cutoff 6 .Loop6 sound_call Branch_f661d sound_loop 4, .Loop6 octave 4 - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 .Loop7 sound_call Branch_f661d sound_loop 3, .Loop7 octave 4 - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 dec_octave speed 11 duty_cycle 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note D_, 2 note C#, 2 dec_octave @@ -193,81 +188,71 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) duty_cycle 0 octave 2 .Loop8 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - channel_volume 9 + volume_envelope 9, 0 note F#, 1 - channel_volume 3 + volume_envelope 3, 7 note F#, 1 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 9 + volume_envelope 9, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 sound_loop 2, .Loop8 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 octave 3 note C#, 1 note F#, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 sound_call Branch_f65a7 octave 3 @@ -275,16 +260,16 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) note F#, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 inc_octave - channel_volume 10 + volume_envelope 10, 0 speed 11 note C#, 9 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 1 inc_octave note C#, 1 @@ -293,55 +278,55 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) dec_octave speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 speed 11 - channel_volume 10 + volume_envelope 10, 0 note F#, 9 - channel_volume 3 + volume_envelope 3, 7 note F#, 4 - channel_volume 10 + volume_envelope 10, 0 note G#, 1 note A_, 1 speed 1 note G#, 5 - channel_volume 3 + volume_envelope 3, 7 note G#, 6 - channel_volume 10 + volume_envelope 10, 0 speed 11 note B_, 8 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 2 note B_, 1 - ;tie +; tie speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 speed 11 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C#, 1 note D_, 1 speed 1 note C#, 5 - channel_volume 3 + volume_envelope 3, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 0 speed 11 note E_, 10 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 speed 1 note C#, 8 - channel_volume 3 + volume_envelope 3, 7 note C#, 3 dec_octave - channel_volume 10 + volume_envelope 10, 0 speed 11 note B_, 1 inc_octave @@ -349,91 +334,81 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) dec_octave speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 speed 11 - channel_volume 10 + volume_envelope 10, 0 note E_, 10 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 2 + volume_envelope 1, -7 note A_, 3 - channel_volume 6 + volume_envelope 6, 0 note A_, 5 inc_octave - channel_volume 4 + volume_envelope 3, -7 note E_, 3 - channel_volume 8 + volume_envelope 7, -7 note E_, 3 - channel_volume 10 + volume_envelope 10, 0 note E_, 2 duty_cycle 1 .Loop9 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 9 + volume_envelope 9, 0 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 9 + volume_envelope 9, 0 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 sound_loop 4, .Loop9 sound_loop 0, .MainLoop @@ -441,14 +416,14 @@ Music_DuelTheme3_Ch1: ; f63a1 (3d:63a1) Branch_f65a7: speed 11 octave 4 - channel_volume 10 + volume_envelope 10, 0 note C#, 5 - ;tie +; tie note C#, 4 - channel_volume 3 + volume_envelope 3, 7 note C#, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 1 inc_octave note C#, 1 @@ -457,17 +432,17 @@ Branch_f65a7: dec_octave speed 1 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 6 speed 11 - channel_volume 10 + volume_envelope 10, 0 inc_octave note C#, 5 - ;tie +; tie note C#, 4 - channel_volume 3 + volume_envelope 3, 7 note C#, 4 - channel_volume 10 + volume_envelope 10, 0 sound_ret Branch_f65cf: @@ -476,13 +451,13 @@ Branch_f65cf: speed 11 rest 2 speed 1 - channel_volume 10 + volume_envelope 10, 3 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 sound_loop 3, .Loop10 duty_cycle 2 - channel_volume 8 + volume_envelope 8, 0 note D_, 5 note G_, 6 note B_, 5 @@ -495,29 +470,29 @@ Branch_f65cf: note D_, 5 note G_, 6 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 dec_octave speed 1 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 .Loop11 speed 11 rest 2 speed 1 - channel_volume 10 + volume_envelope 10, 3 note E_, 5 - channel_volume 2 + volume_envelope 2, 7 note E_, 6 sound_loop 3, .Loop11 dec_octave duty_cycle 2 - channel_volume 8 + volume_envelope 8, 0 note B_, 5 inc_octave note E_, 6 @@ -533,202 +508,185 @@ Branch_f65cf: Branch_f661d: octave 4 speed 1 - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave - channel_volume 7 + volume_envelope 7, 0 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 sound_ret -Music_DuelTheme3_Ch2: ; f6649 (3d:6649) +Music_DuelTheme3_Ch2: speed 11 - ;stereo_panning 1, 1 - ;vibrato_type 8 + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 .MainLoop octave 2 duty_cycle 0 - ;frequency_offset 3 +; frequency_offset 3 .Loop1 - ;rept 4 - channel_volume 8 + volume_envelope 8, 2 note F#, 2 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 2 note F#, 2 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 2 note F#, 2 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 2 note F#, 2 rest 1 - ;endr - channel_volume 8 + volume_envelope 8, 0 note E_, 2 - channel_volume 8 + volume_envelope 8, 5 note F_, 2 sound_loop 4, .Loop1 - ;frequency_offset 0 +; frequency_offset 0 octave 3 .Loop2 rest 6 - channel_volume 10 + volume_envelope 10, 3 note E_, 1 - channel_volume 2 + volume_envelope 2, 7 note E_, 1 rest 8 sound_loop 4, .Loop2 .Loop3 - ;rept 2 sound_call Branch_f67b2 - ;--- sound_call Branch_f67b2 - ;endr - ;rept 2 sound_call Branch_f680a - ;--- sound_call Branch_f680a - ;endr sound_loop 2, .Loop3 octave 2 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 speed 1 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 sound_call Branch_f6866 octave 4 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave dec_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 sound_call Branch_f6866 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 0 .Loop4 - ;rept 2 sound_call Branch_f67b2 - ;--- sound_call Branch_f67b2 - ;endr - ;rept 2 sound_call Branch_f680a - ;--- sound_call Branch_f680a - ;endr sound_loop 2, .Loop4 vibrato 10, 3, 3 .Loop5 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 note F#, 1 note F#, 1 - fade_wave 8 +; cutoff 8 speed 1 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 speed 11 note F#, 1 inc_octave - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note C#, 2 dec_octave - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 note F#, 1 note F#, 1 speed 1 - fade_wave 8 +; cutoff 8 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 speed 11 note F#, 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 note F#, 1 note F#, 1 - fade_wave 8 +; cutoff 8 speed 1 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 speed 11 note F#, 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note B_, 2 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 note F#, 1 note F#, 1 speed 1 - fade_wave 8 +; cutoff 8 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 3 +; cutoff 6 speed 11 note F#, 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note A_, 2 note G#, 2 sound_loop 4, .Loop5 @@ -754,268 +712,248 @@ Music_DuelTheme3_Ch2: ; f6649 (3d:6649) note E_, 4 octave 3 .Loop6 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 - channel_volume 9 + volume_envelope 9, 0 note C#, 1 - channel_volume 3 + volume_envelope 3, 7 note C#, 1 - ;rept 4 - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;endr - channel_volume 9 + volume_envelope 9, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 9 + volume_envelope 9, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 sound_loop 6, .Loop6 duty_cycle 1 inc_octave .Loop7 - ;rept 4 - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - ;endr - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - ;rept 4 - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;--- - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - ;endr - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 sound_loop 4, .Loop7 sound_loop 0, .MainLoop Branch_f67b2: octave 2 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 speed 1 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 - channel_volume 10 + volume_envelope 10, 3 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 speed 1 note F#, 5 - channel_volume 3 + volume_envelope 3, 7 note F#, 6 inc_octave - channel_volume 10 + volume_envelope 10, 3 speed 11 note C_, 1 dec_octave speed 1 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 4 note B_, 4 note A_, 3 note F#, 5 - channel_volume 2 + volume_envelope 2, 7 note F#, 6 speed 11 - channel_volume 9 + volume_envelope 9, 0 note E_, 1 - channel_volume 10 + volume_envelope 10, 3 note F_, 1 sound_ret Branch_f680a: octave 2 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 speed 1 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 - channel_volume 10 + volume_envelope 10, 3 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 - channel_volume 10 + volume_envelope 10, 3 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 inc_octave - channel_volume 10 + volume_envelope 10, 3 speed 11 note C#, 1 speed 1 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 6 - channel_volume 10 + volume_envelope 10, 3 speed 11 rest 1 dec_octave speed 1 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 speed 11 rest 1 inc_octave speed 1 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave - channel_volume 10 + volume_envelope 10, 3 note B_, 4 inc_octave note C#, 4 dec_octave note B_, 3 note G_, 5 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 speed 11 - channel_volume 9 + volume_envelope 9, 0 note B_, 1 - channel_volume 10 + volume_envelope 10, 3 note G_, 1 sound_ret @@ -1025,17 +963,17 @@ Branch_f6866: speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 sound_loop 3, .Loop8 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note B_, 5 inc_octave note D_, 6 @@ -1047,34 +985,34 @@ Branch_f6866: inc_octave note D_, 6 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 dec_octave dec_octave duty_cycle 0 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 .Loop9 speed 11 rest 1 speed 1 - channel_volume 10 + volume_envelope 10, 3 note C#, 5 - channel_volume 2 + volume_envelope 2, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 3 note A_, 5 - channel_volume 2 + volume_envelope 2, 7 note A_, 6 sound_loop 3, .Loop9 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 0 note G_, 5 note B_, 6 inc_octave @@ -1090,36 +1028,31 @@ Branch_f6866: sound_ret -Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) +Music_DuelTheme3_Ch3: speed 11 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 96 - ;vibrato_type 8 +; echo 96 +; vibrato_type 8 vibrato 0, 3, 3 - ;cutoff 8 +; cutoff 8 .MainLoop octave 2 .Loop1 - ;rept 4 - ;cutoff 4 +; cutoff 4 note F#, 2 rest 1 - ;--- - ;cutoff 4 +; cutoff 4 note F#, 2 rest 1 - ;--- - ;cutoff 4 +; cutoff 4 note F#, 2 rest 1 - ;--- - ;cutoff 4 +; cutoff 4 note F#, 2 rest 1 - ;endr - ;cutoff 8 +; cutoff 8 note E_, 2 note F_, 2 sound_loop 4, .Loop1 @@ -1127,44 +1060,32 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) sound_call Branch_f6973 sound_loop 4, .Loop2 .Loop3 - sound_call Branch_f6973 sound_call Branch_f6992 sound_loop 2, .Loop3 octave 2 .Loop4 - ;rept 4 note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;endr note G_, 2 note G_, 2 - ;rept 4 note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;endr note E_, 2 note F_, 2 sound_loop 2, .Loop4 .Loop5 - sound_call Branch_f6973 sound_call Branch_f6992 sound_loop 2, .Loop5 vibrato 10, 3, 3 @@ -1173,7 +1094,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) sound_call Branch_f69f0 speed 11 octave 4 - ;cutoff 8 +; cutoff 8 note D_, 2 note C#, 2 dec_octave @@ -1181,7 +1102,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) sound_loop 3, .Loop6 sound_call Branch_f69f0 octave 2 - ;cutoff 8 +; cutoff 8 note F#, 2 note E_, 2 vibrato 0, 3, 3 @@ -1206,65 +1127,50 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) note E_, 4 dec_octave .Loop7 - ;rept 4 note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;--- note F#, 1 rest 2 - ;endr note F#, 2 note F_, 2 - ;rept 4 note E_, 1 rest 2 - ;--- note E_, 1 rest 2 - ;--- note E_, 1 rest 2 - ;--- note E_, 1 rest 2 - ;endr note E_, 2 note F_, 2 sound_loop 6, .Loop7 - ;cutoff 7 +; cutoff 7 .Loop8 inc_octave - ;rept 4 note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - ;--- note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - ;--- note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - ;--- note F#, 1 dec_octave note F#, 1 note F#, 1 inc_octave - ;endr note F#, 1 dec_octave note F#, 1 @@ -1273,31 +1179,26 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) dec_octave note F#, 1 inc_octave - ;rept 4 note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - ;--- note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - ;--- note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - ;--- note E_, 1 dec_octave note E_, 1 note E_, 1 inc_octave - ;endr note E_, 1 dec_octave note E_, 1 @@ -1306,7 +1207,7 @@ Music_DuelTheme3_Ch3: ; f68c2 (3d:68c2) dec_octave note E_, 1 sound_loop 4, .Loop8 - ;cutoff 8 +; cutoff 8 sound_loop 0, .MainLoop Branch_f6973: @@ -1315,11 +1216,11 @@ Branch_f6973: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note F#, 1 rest 2 note F#, 1 @@ -1329,27 +1230,28 @@ Branch_f6973: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note E_, 2 note F_, 2 sound_ret Branch_f6992: octave 2 - ;sound_call Branch_f6973 +; sound_call Branch_f6973 + octave 2 note F#, 1 rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note F#, 1 rest 2 note F#, 1 @@ -1359,11 +1261,37 @@ Branch_f6992: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note E_, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 + note E_, 2 + note F_, 2 +; sound_ret + note F#, 1 + rest 1 + inc_octave + inc_octave +; cutoff 4 + note E_, 1 + dec_octave + dec_octave +; cutoff 8 + note F#, 1 + rest 2 + note F#, 1 + rest 1 + rest 1 + note F#, 1 + rest 1 + inc_octave + inc_octave +; cutoff 4 + note E_, 1 + dec_octave + dec_octave +; cutoff 8 note F#, 1 rest 1 note F#, 2 @@ -1371,11 +1299,11 @@ Branch_f6992: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note F#, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 rest 2 note G_, 1 @@ -1385,22 +1313,22 @@ Branch_f6992: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note F#, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note F_, 2 note F#, 2 note G_, 1 rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note F#, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 rest 2 note G_, 1 @@ -1410,11 +1338,11 @@ Branch_f6992: rest 1 inc_octave inc_octave - ;cutoff 4 +; cutoff 4 note F#, 1 dec_octave dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 rest 1 note F_, 2 @@ -1422,93 +1350,88 @@ Branch_f6992: Branch_f69f0: octave 2 - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave - ;cutoff 4 +; cutoff 4 note C#, 1 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave inc_octave - ;cutoff 8 +; cutoff 8 note F#, 2 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave - ;cutoff 4 +; cutoff 4 note C#, 1 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave inc_octave - ;cutoff 8 +; cutoff 8 note E_, 2 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave - ;cutoff 4 +; cutoff 4 note C#, 1 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave inc_octave - ;cutoff 8 +; cutoff 8 note D#, 2 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 inc_octave note C#, 1 inc_octave - ;cutoff 4 +; cutoff 4 note C#, 1 dec_octave dec_octave - ;cutoff 6 +; cutoff 6 note F#, 1 sound_ret -Music_DuelTheme3_Ch4: ; f6a3f (3d:6a3f) +Music_DuelTheme3_Ch4: toggle_noise 6 drum_speed 11 .MainLoop .Loop1 - ;rept 4 drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - ;--- drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - ;--- drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - ;--- drum_note 5, 1 drum_note 4, 1 drum_note 4, 1 - ;endr drum_note 5, 1 drum_note 4, 1 drum_note 5, 1 @@ -1788,42 +1711,36 @@ Branch_f6b7e: Branch_f6b9a: drum_speed 11 .Loop9 - ;rept 5 drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;--- drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;--- drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;--- drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;--- drum_note 1, 1 drum_speed 1 drum_note 4, 5 drum_note 3, 6 drum_speed 11 drum_note 2, 1 - ;endr drum_note 1, 1 sound_loop 3, .Loop9 .Loop10 @@ -1835,4 +1752,3 @@ Branch_f6b9a: drum_note 2, 1 sound_loop 4, .Loop10 sound_ret -; 0xf6bb7 diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm index 82a3f802..00a69b1a 100644 --- a/crysaudio/music/TCG/hallofhonor.asm +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -4,10 +4,10 @@ Music_HallOfHonor: channel 2, Music_HallOfHonor_Ch2 channel 3, Music_HallOfHonor_Ch3 -Music_HallOfHonor_Ch1: ; fafea (3e:6fea) +Music_HallOfHonor_Ch1: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 .Loop1 sound_call Branch_fb016 @@ -17,15 +17,15 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) sound_call Branch_fb016 sound_loop 8, .Loop2 octave 4 - channel_volume 5 + volume_envelope 5, 5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 sound_call Branch_fb044 .Loop3 - channel_volume 5 + volume_envelope 5, 5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 sound_call Branch_fb044 sound_loop 23, .Loop3 @@ -33,82 +33,82 @@ Music_HallOfHonor_Ch1: ; fafea (3e:6fea) Branch_fb016: octave 4 - channel_volume 6 + volume_envelope 6, 5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 6 + volume_envelope 6, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 6 + volume_envelope 6, 5 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 - channel_volume 6 + volume_envelope 6, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 inc_octave - channel_volume 6 + volume_envelope 6, 5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 dec_octave - channel_volume 6 + volume_envelope 6, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 6 + volume_envelope 6, 5 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 sound_ret Branch_fb044: octave 4 - channel_volume 5 + volume_envelope 5, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 5 + volume_envelope 5, 5 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 5 + volume_envelope 5, 5 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 inc_octave - channel_volume 5 + volume_envelope 5, 5 note C_, 1 dec_octave - channel_volume 2 + volume_envelope 2, 7 note F_, 1 - channel_volume 5 + volume_envelope 5, 5 note F_, 1 inc_octave - channel_volume 2 + volume_envelope 2, 7 note C_, 1 dec_octave - channel_volume 5 + volume_envelope 5, 5 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 sound_ret -Music_HallOfHonor_Ch2: ; fb06e (3e:706e) +Music_HallOfHonor_Ch2: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 - ;frequency_offset -1 +; frequency_offset -1 rest 2 speed 1 rest 4 speed 7 - channel_volume 1 + volume_envelope 1, 7 .Loop1 sound_call Branch_fb1ec sound_loop 3, .Loop1 @@ -129,66 +129,66 @@ Music_HallOfHonor_Ch2: ; fb06e (3e:706e) speed 1 rest 3 speed 7 - ;frequency_offset 0 +; frequency_offset 0 .MainLoop octave 1 duty_cycle 1 .Loop2 sound_call Branch_fb0bb octave 1 - channel_volume 7 + volume_envelope 6, -5 note E_, 5 - channel_volume 13 + volume_envelope 13, 0 note E_, 11 - ;tie +; tie note E_, 12 sound_loop 3, .Loop2 sound_call Branch_fb0bb octave 1 - channel_volume 7 + volume_envelope 6, -5 note G_, 5 - channel_volume 13 + volume_envelope 13, 0 note G_, 11 - ;tie +; tie note G_, 12 sound_loop 0, .MainLoop Branch_fb0bb: octave 1 - channel_volume 7 + volume_envelope 6, -5 note F_, 5 - channel_volume 13 + volume_envelope 13, 0 note F_, 11 - ;tie +; tie note F_, 12 - channel_volume 7 + volume_envelope 6, -5 note E_, 5 - channel_volume 13 + volume_envelope 13, 0 note E_, 11 - ;tie +; tie note E_, 12 - channel_volume 7 + volume_envelope 6, -5 note D_, 5 - channel_volume 13 + volume_envelope 13, 0 note D_, 11 - ;tie +; tie note D_, 12 sound_ret -Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) +Music_HallOfHonor_Ch3: speed 7 channel_volume 2 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE fade_wave 12 - ;vibrato_type 4 +; vibrato_type 4 vibrato 35, 2, 4 - ;cutoff 6 - ;echo 64 +; cutoff 6 +; echo 64 rest 3 channel_volume 3 - ;cutoff 8 - ;frequency_offset -1 +; cutoff 8 +; frequency_offset -1 .Loop1 rest 14 sound_loop 4, .Loop1 @@ -211,175 +211,175 @@ Music_HallOfHonor_Ch3: ; fb0d5 (3e:70d5) dec_octave note F_, 1 channel_volume 1 - ;frequency_offset 0 +; frequency_offset 0 octave 5 speed 1 - ;cutoff 6 +; cutoff 6 note B_, 3 inc_octave note C_, 4 - ;tie +; tie speed 7 note C_, 15 - ;tie +; tie note C_, 8 dec_octave - ;cutoff 8 +; cutoff 8 note B_, 2 - ;cutoff 4 +; cutoff 4 note A_, 2 - ;cutoff 6 +; cutoff 6 note G_, 6 note C_, 10 - ;tie +; tie note C_, 12 speed 1 - ;cutoff 8 +; cutoff 8 note B_, 3 inc_octave - ;cutoff 6 +; cutoff 6 note C_, 4 - ;tie +; tie speed 7 note C_, 15 - ;tie +; tie note C_, 6 dec_octave - ;cutoff 8 +; cutoff 8 note B_, 2 inc_octave note C_, 2 - ;cutoff 4 +; cutoff 4 note D_, 2 dec_octave speed 1 - ;cutoff 8 +; cutoff 8 note F#, 3 - ;cutoff 6 +; cutoff 6 note G_, 4 - ;tie +; tie speed 7 note G_, 15 - ;tie +; tie note G_, 6 - ;cutoff 8 +; cutoff 8 note G_, 2 note A_, 2 - ;cutoff 4 +; cutoff 4 note B_, 2 speed 1 - ;cutoff 8 +; cutoff 8 note B_, 3 inc_octave note C_, 4 - ;tie +; tie speed 7 note C_, 15 - ;tie +; tie note C_, 8 dec_octave note B_, 2 - ;cutoff 4 +; cutoff 4 note A_, 2 - ;cutoff 6 +; cutoff 6 note G_, 6 - ;cutoff 8 +; cutoff 8 speed 1 note B_, 3 inc_octave - ;cutoff 6 +; cutoff 6 note C_, 4 - ;tie +; tie speed 7 note C_, 9 - ;tie +; tie note C_, 6 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 2 inc_octave note C_, 2 - ;cutoff 4 +; cutoff 4 note E_, 2 speed 1 - ;cutoff 8 +; cutoff 8 note E_, 3 note F_, 4 - ;tie +; tie speed 7 note F_, 1 note E_, 2 - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 7 +; cutoff 7 note C_, 10 - ;tie +; tie note C_, 10 - ;cutoff 4 +; cutoff 4 note E_, 2 speed 1 - ;cutoff 8 +; cutoff 8 note E_, 3 note F_, 4 - ;tie +; tie speed 7 note F_, 1 note E_, 2 - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 6 +; cutoff 6 note C_, 10 - ;tie +; tie note C_, 12 speed 1 - ;cutoff 8 +; cutoff 8 note F#, 3 - ;cutoff 7 +; cutoff 7 note G_, 4 - ;tie +; tie speed 7 note G_, 15 - ;tie +; tie note G_, 8 - ;cutoff 8 +; cutoff 8 note F_, 2 - ;cutoff 4 +; cutoff 4 note E_, 2 - ;cutoff 8 +; cutoff 8 note F_, 2 - ;cutoff 4 +; cutoff 4 note E_, 2 note C_, 2 dec_octave - ;cutoff 7 +; cutoff 7 note G_, 10 - ;tie +; tie note G_, 10 - ;cutoff 8 +; cutoff 8 note E_, 2 note F_, 2 inc_octave - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 7 +; cutoff 7 note C_, 12 - ;tie +; tie note C_, 10 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 2 note F_, 2 inc_octave - ;cutoff 4 +; cutoff 4 note C_, 2 - ;cutoff 6 +; cutoff 6 note C_, 12 - ;tie +; tie note C_, 12 rest 3 channel_volume 3 - ;frequency_offset -1 - ;cutoff 8 +; frequency_offset -1 +; cutoff 8 sound_loop 0, .MainLoop Branch_fb1ec: @@ -401,4 +401,3 @@ Branch_fb1ec: note G_, 1 rest 1 sound_ret -; 0xfb1fe diff --git a/crysaudio/music/TCG/imakuni.asm b/crysaudio/music/TCG/imakuni.asm index 0b2886a5..d6925016 100644 --- a/crysaudio/music/TCG/imakuni.asm +++ b/crysaudio/music/TCG/imakuni.asm @@ -5,14 +5,14 @@ Music_Imakuni: channel 3, Music_Imakuni_Ch3 channel 4, Music_Imakuni_Ch4 -Music_Imakuni_Ch1: ; fad55 (3e:6d55) +Music_Imakuni_Ch1: speed 3 - ;stereo_panning 1, 1 - ;vibrato_type 5 + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 2 - channel_volume 10 + volume_envelope 10, 0 .MainLoop .Loop1 rest 10 @@ -27,7 +27,7 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) rest 8 speed 9 note F_, 10 - ;tie +; tie speed 1 note F_, 7 rest 8 @@ -58,7 +58,7 @@ Music_Imakuni_Ch1: ; fad55 (3e:6d55) note F#, 7 rest 8 note G_, 15 - ;tie +; tie note G_, 7 note F#, 3 note G_, 2 @@ -160,7 +160,7 @@ Branch_fadf9: note E_, 7 rest 8 note F_, 15 - ;tie +; tie note F_, 7 note E_, 3 note F_, 2 @@ -183,7 +183,7 @@ Branch_fae1d: rest 8 speed 9 note F_, 10 - ;tie +; tie speed 1 note F_, 7 rest 8 @@ -192,30 +192,27 @@ Branch_fae1d: sound_ret -Music_Imakuni_Ch2: ; fae32 (3e:6e32) - ;stereo_panning 1, 1 - ;vibrato_type 0 +Music_Imakuni_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 0 vibrato 0, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 .Loop1 sound_call Branch_faea5 sound_loop 6, .Loop1 .Loop2 - ;rept 2 speed 3 rest 10 speed 1 note C_, 7 rest 8 - ;--- speed 3 rest 10 speed 1 note C_, 7 rest 8 - ;endr rest 15 note C_, 7 rest 8 @@ -237,7 +234,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) speed 1 octave 2 note F_, 15 - ;tie +; tie note F_, 7 inc_octave note F_, 8 @@ -253,7 +250,7 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) speed 1 dec_octave note D#, 15 - ;tie +; tie note D#, 7 inc_octave note D#, 8 @@ -270,18 +267,15 @@ Music_Imakuni_Ch2: ; fae32 (3e:6e32) .Loop4 note D_, 7 rest 8 - ;rept 2 rest 15 - ;--- rest 15 - ;endr sound_loop 4, .Loop4 note D_, 7 rest 8 rest 15 vibrato 5, 3, 3 note D_, 15 - ;tie +; tie note D_, 7 rest 8 vibrato 0, 3, 3 @@ -292,15 +286,12 @@ Branch_faea5: speed 6 rest 10 speed 1 - ;rept 2 rest 15 note C#, 7 rest 8 - ;--- rest 15 note C#, 7 rest 8 - ;endr vibrato 8, 3, 3 speed 9 rest 10 @@ -310,20 +301,20 @@ Branch_faea5: sound_ret -Music_Imakuni_Ch3: ; faebc (3e:6ebc) - ;stereo_panning 1, 1 +Music_Imakuni_Ch3: + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;vibrato_type 6 +; vibrato_type 6 vibrato 0, 3, 3 - ;echo 0 - ;cutoff 8 +; echo 0 +; cutoff 8 .MainLoop sound_call Branch_faf7d vibrato 8, 3, 3 speed 1 note D_, 15 - ;tie +; tie note D_, 7 inc_octave vibrato 0, 3, 3 @@ -389,7 +380,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) speed 1 octave 2 note F_, 15 - ;tie +; tie note F_, 7 inc_octave note F_, 8 @@ -408,7 +399,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) speed 1 dec_octave note D#, 15 - ;tie +; tie note D#, 7 inc_octave note D#, 8 @@ -444,7 +435,7 @@ Music_Imakuni_Ch3: ; faebc (3e:6ebc) octave 4 vibrato 5, 3, 3 note C_, 15 - ;tie +; tie note C_, 7 inc_octave vibrato 0, 3, 3 @@ -491,9 +482,8 @@ Branch_faf7d: sound_ret -Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) +Music_Imakuni_Ch4: toggle_noise 6 -.MainLoop drum_speed 1 octave 1 .Loop1 @@ -556,5 +546,4 @@ Music_Imakuni_Ch4: ; fafa4 (3e:6fa4) drum_note 2, 7 drum_note 2, 15 drum_note 2, 15 - sound_loop 0, .MainLoop -; 0xfafea + sound_loop 0, Music_Imakuni_Ch4 diff --git a/crysaudio/music/TCG/matchdraw.asm b/crysaudio/music/TCG/matchdraw.asm index 64beceaf..8963cbbd 100644 --- a/crysaudio/music/TCG/matchdraw.asm +++ b/crysaudio/music/TCG/matchdraw.asm @@ -4,13 +4,13 @@ Music_MatchDraw: channel 2, Music_MatchDraw_Ch2 channel 3, Music_MatchDraw_Ch3 -Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) +Music_MatchDraw_Ch1: speed 3 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 4 duty_cycle 1 - channel_volume 11 + volume_envelope 11, 0 note C_, 4 dec_octave note B_, 2 @@ -29,35 +29,35 @@ Music_MatchDraw_Ch1: ; f7cdf (3d:7cdf) note B_, 2 note A#, 4 note B_, 2 - channel_volume 2 + volume_envelope 2, 7 note B_, 2 - channel_volume 11 + volume_envelope 11, 0 note F#, 4 note G_, 2 - channel_volume 2 + volume_envelope 2, 7 note G_, 2 - channel_volume 11 + volume_envelope 11, 0 note C_, 2 - channel_volume 2 + volume_envelope 2, 7 note C_, 4 inc_octave - channel_volume 11 + volume_envelope 11, 0 note E_, 1 note G_, 1 inc_octave note C_, 2 - channel_volume 2 + volume_envelope 2, 7 note C_, 2 sound_ret -Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) +Music_MatchDraw_Ch2: speed 3 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 3 duty_cycle 1 - channel_volume 11 + volume_envelope 11, 0 rest 16 note C_, 4 dec_octave @@ -69,34 +69,34 @@ Music_MatchDraw_Ch2: ; f7d17 (3d:7d17) note F#, 2 note F_, 4 note F#, 2 - channel_volume 2 + volume_envelope 2, 7 note F#, 2 - channel_volume 11 + volume_envelope 11, 0 note C#, 4 note D_, 2 - channel_volume 2 + volume_envelope 2, 7 note D_, 2 dec_octave - channel_volume 11 + volume_envelope 11, 0 note G_, 2 - channel_volume 2 + volume_envelope 2, 7 note G_, 6 inc_octave inc_octave - channel_volume 11 + volume_envelope 11, 0 note E_, 2 - channel_volume 2 + volume_envelope 2, 7 note E_, 2 sound_ret -Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) +Music_MatchDraw_Ch3: speed 6 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 0 +; cutoff 8 +; echo 0 octave 2 rest 16 note G_, 2 @@ -110,4 +110,3 @@ Music_MatchDraw_Ch3: ; f7d47 (3d:7d47) inc_octave note C_, 1 sound_ret -; 0xf7d60 diff --git a/crysaudio/music/TCG/matchloss.asm b/crysaudio/music/TCG/matchloss.asm index f9621ff4..eab3b5bb 100644 --- a/crysaudio/music/TCG/matchloss.asm +++ b/crysaudio/music/TCG/matchloss.asm @@ -4,80 +4,80 @@ Music_MatchLoss: channel 2, Music_MatchLoss_Ch2 channel 3, Music_MatchLoss_Ch3 -Music_MatchLoss_Ch1: ; f7c2e (3d:7c2e) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_MatchLoss_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 4 duty_cycle 2 - channel_volume 11 + volume_envelope 11, 0 speed 1 note E_, 3 note F_, 2 - ;tie +; tie speed 5 note F_, 3 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A#, 1 - channel_volume 3 + volume_envelope 3, 7 note A#, 3 inc_octave speed 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 note D#, 2 - ;tie +; tie note D#, 16 dec_octave note A#, 6 - channel_volume 3 + volume_envelope 3, 7 note A#, 16 - channel_volume 10 + volume_envelope 10, 0 note G#, 6 - channel_volume 3 + volume_envelope 3, 7 note G#, 16 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 3 note C#, 8 - ;tie +; tie note C#, 12 dec_octave speed 6 note G#, 1 - channel_volume 3 + volume_envelope 3, 7 note G#, 3 - channel_volume 10 + volume_envelope 10, 0 note F#, 1 speed 7 - channel_volume 3 + volume_envelope 3, 7 note F#, 3 speed 1 - channel_volume 10 + volume_envelope 10, 0 note B_, 5 inc_octave note C_, 4 - ;tie +; tie speed 9 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 sound_ret -Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) - ;stereo_panning 1, 1 - ;vibrato_type 5 +Music_MatchLoss_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 speed 9 rest 9 speed 11 @@ -87,50 +87,49 @@ Music_MatchLoss_Ch2: ; f7c87 (3d:7c87) speed 9 rest 6 note G_, 6 - ;tie +; tie note G_, 6 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 sound_ret -Music_MatchLoss_Ch3: ; f7ca7 (3d:7ca7) - ;stereo_panning 1, 1 +Music_MatchLoss_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 64 +; cutoff 8 +; echo 64 octave 2 speed 5 note A#, 4 inc_octave - ;cutoff 4 +; cutoff 4 note F_, 4 note A#, 4 dec_octave - ;cutoff 8 +; cutoff 8 speed 7 note G#, 3 inc_octave - ;cutoff 4 +; cutoff 4 speed 2 note D#, 11 note G#, 11 dec_octave - ;cutoff 8 +; cutoff 8 speed 1 note F#, 11 - ;tie +; tie note F#, 12 inc_octave - ;cutoff 4 +; cutoff 4 speed 12 note C#, 2 speed 2 note F#, 13 dec_octave speed 9 - ;cutoff 8 +; cutoff 8 note F_, 12 sound_ret -; 0xf7cdf diff --git a/crysaudio/music/TCG/matchstart1.asm b/crysaudio/music/TCG/matchstart1.asm index 0248bbb8..9434e605 100644 --- a/crysaudio/music/TCG/matchstart1.asm +++ b/crysaudio/music/TCG/matchstart1.asm @@ -2,13 +2,13 @@ Music_MatchStart1: channel_count 1 channel 1, Music_MatchStart1_Ch1 -Music_MatchStart1_Ch1: ; f7919 (3d:7919) +Music_MatchStart1_Ch1: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 .Loop1 duty_cycle 2 - channel_volume 15 + volume_envelope 15, 0 octave 3 note C_, 1 inc_octave @@ -44,15 +44,14 @@ Music_MatchStart1_Ch1: ; f7919 (3d:7919) note A_, 1 sound_loop 3, .Loop1 octave 4 - channel_volume 6 + volume_envelope 6, 0 note E_, 1 inc_octave note E_, 1 octave 4 - channel_volume 2 + volume_envelope 2, 0 dec_octave note B_, 1 inc_octave note B_, 1 sound_ret -; 0xf7956 diff --git a/crysaudio/music/TCG/matchstart2.asm b/crysaudio/music/TCG/matchstart2.asm index 4f01e850..66ef0bae 100644 --- a/crysaudio/music/TCG/matchstart2.asm +++ b/crysaudio/music/TCG/matchstart2.asm @@ -3,12 +3,12 @@ Music_MatchStart2: channel 1, Music_MatchStart2_Ch1 channel 2, Music_MatchStart2_Ch2 -Music_MatchStart2_Ch1: ; f7956 (3d:7956) +Music_MatchStart2_Ch1: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 2 - channel_volume 15 + volume_envelope 15, 0 duty_cycle 0 note C_, 1 note E_, 1 @@ -78,14 +78,14 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) note F_, 1 note B_, 1 dec_octave - channel_volume 6 + volume_envelope 6, 0 note E_, 1 note G_, 1 note B_, 1 inc_octave note C_, 1 note E_, 1 - channel_volume 2 + volume_envelope 2, 0 note G_, 1 note B_, 1 inc_octave @@ -93,14 +93,14 @@ Music_MatchStart2_Ch1: ; f7956 (3d:7956) sound_ret -Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) +Music_MatchStart2_Ch2: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 - ;frequency_offset 6 + stereo_panning TRUE, TRUE +; cutoff 8 +; frequency_offset 6 rest 4 octave 2 - channel_volume 6 + volume_envelope 6, 0 duty_cycle 0 note C_, 1 note E_, 1 @@ -170,7 +170,7 @@ Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) note F_, 1 note B_, 1 dec_octave - channel_volume 2 + volume_envelope 2, 0 note E_, 1 note G_, 1 note B_, 1 @@ -178,4 +178,3 @@ Music_MatchStart2_Ch2: ; f79b4 (3d:79b4) note C_, 1 note E_, 1 sound_ret -; 0xf7a0f diff --git a/crysaudio/music/TCG/matchstart3.asm b/crysaudio/music/TCG/matchstart3.asm index c7baa4e6..f946c0be 100644 --- a/crysaudio/music/TCG/matchstart3.asm +++ b/crysaudio/music/TCG/matchstart3.asm @@ -3,12 +3,12 @@ Music_MatchStart3: channel 1, Music_MatchStart3_Ch1 channel 2, Music_MatchStart3_Ch2 -Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) +Music_MatchStart3_Ch1: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 2 - channel_volume 15 + volume_envelope 15, 0 duty_cycle 1 note C_, 1 note E_, 1 @@ -153,14 +153,14 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) note D_, 1 dec_octave octave 4 - channel_volume 6 + volume_envelope 6, 0 note F_, 1 note A_, 1 inc_octave note C_, 1 dec_octave octave 5 - channel_volume 2 + volume_envelope 2, 0 note G_, 1 note B_, 1 inc_octave @@ -168,14 +168,14 @@ Music_MatchStart3_Ch1: ; f7a0f (3d:7a0f) sound_ret -Music_MatchStart3_Ch2: ; f7aba (3d:7aba) +Music_MatchStart3_Ch2: speed 1 - ;stereo_panning 1, 1 - fade_wave 8 - ;frequency_offset 6 + stereo_panning TRUE, TRUE +; cutoff 8 +; frequency_offset 6 rest 4 octave 2 - channel_volume 6 + volume_envelope 6, 0 duty_cycle 1 note C_, 1 note E_, 1 @@ -320,11 +320,10 @@ Music_MatchStart3_Ch2: ; f7aba (3d:7aba) note D_, 1 dec_octave octave 4 - channel_volume 2 + volume_envelope 2, 0 note F_, 1 note A_, 1 inc_octave note C_, 1 dec_octave sound_ret -; 0xf7b61 diff --git a/crysaudio/music/TCG/matchvictory.asm b/crysaudio/music/TCG/matchvictory.asm index 3743739a..69e6f96d 100644 --- a/crysaudio/music/TCG/matchvictory.asm +++ b/crysaudio/music/TCG/matchvictory.asm @@ -4,134 +4,134 @@ Music_MatchVictory: channel 2, Music_MatchVictory_Ch2 channel 3, Music_MatchVictory_Ch3 -Music_MatchVictory_Ch1: ; f7b61 (3d:7b61) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_MatchVictory_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 0 - channel_volume 11 + volume_envelope 11, 0 speed 1 note A_, 15 - ;tie +; tie note A_, 9 - channel_volume 2 + volume_envelope 2, 7 note A_, 5 - channel_volume 11 + volume_envelope 11, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 3 - channel_volume 11 + volume_envelope 11, 0 note F_, 7 - channel_volume 2 + volume_envelope 2, 7 note F_, 3 - channel_volume 11 + volume_envelope 11, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 2 - channel_volume 11 + volume_envelope 11, 0 note B_, 11 - channel_volume 2 + volume_envelope 2, 7 note B_, 10 inc_octave - channel_volume 11 + volume_envelope 11, 0 note C_, 10 - channel_volume 2 + volume_envelope 2, 7 note C_, 11 - channel_volume 11 + volume_envelope 11, 0 note D_, 10 - channel_volume 2 + volume_envelope 2, 7 note D_, 10 - channel_volume 11 + volume_envelope 11, 0 note C#, 8 - channel_volume 2 + volume_envelope 2, 7 note C#, 13 - channel_volume 11 + volume_envelope 11, 0 note D_, 5 - channel_volume 2 + volume_envelope 2, 7 note D_, 6 - channel_volume 11 + volume_envelope 11, 0 speed 8 note E_, 12 - channel_volume 2 + volume_envelope 2, 7 note E_, 4 sound_ret -Music_MatchVictory_Ch2: ; f7bb0 (3d:7bb0) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_MatchVictory_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 3 duty_cycle 0 - channel_volume 11 + volume_envelope 11, 0 speed 1 note F_, 5 - channel_volume 2 + volume_envelope 2, 7 note F_, 5 dec_octave - channel_volume 11 + volume_envelope 11, 0 note A_, 5 inc_octave note C_, 5 note F_, 5 - channel_volume 2 + volume_envelope 2, 7 note F_, 4 - channel_volume 11 + volume_envelope 11, 0 note C_, 7 - channel_volume 2 + volume_envelope 2, 7 note C_, 3 dec_octave - channel_volume 11 + volume_envelope 11, 0 note A_, 7 - channel_volume 2 + volume_envelope 2, 7 note A_, 3 inc_octave - channel_volume 11 + volume_envelope 11, 0 note C_, 7 - channel_volume 2 + volume_envelope 2, 7 note C_, 2 - channel_volume 11 + volume_envelope 11, 0 note G_, 11 - channel_volume 2 + volume_envelope 2, 7 note G_, 10 - channel_volume 11 + volume_envelope 11, 0 note A_, 10 - channel_volume 2 + volume_envelope 2, 7 note A_, 11 - channel_volume 11 + volume_envelope 11, 0 note B_, 10 - channel_volume 2 + volume_envelope 2, 7 note B_, 10 - channel_volume 11 + volume_envelope 11, 0 note A_, 8 - channel_volume 2 + volume_envelope 2, 7 note A_, 13 - channel_volume 11 + volume_envelope 11, 0 note B_, 5 - channel_volume 2 + volume_envelope 2, 7 note B_, 6 inc_octave - channel_volume 11 + volume_envelope 11, 0 speed 8 note C#, 12 - channel_volume 2 + volume_envelope 2, 7 note C#, 4 sound_ret -Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) - ;stereo_panning 1, 1 +Music_MatchVictory_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 0 +; cutoff 8 +; echo 0 octave 2 speed 1 note F_, 15 - ;tie +; tie note F_, 9 rest 5 note F_, 7 @@ -153,4 +153,3 @@ Music_MatchVictory_Ch3: ; f7c09 (3d:7c09) speed 8 note A_, 12 sound_ret -; 0xf7c2e diff --git a/crysaudio/music/TCG/medal.asm b/crysaudio/music/TCG/medal.asm index 32839d02..a78e973d 100644 --- a/crysaudio/music/TCG/medal.asm +++ b/crysaudio/music/TCG/medal.asm @@ -4,14 +4,14 @@ Music_Medal: channel 2, Music_Medal_Ch2 channel 3, Music_Medal_Ch3 -Music_Medal_Ch1: ; f7df8 (3d:7df8) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_Medal_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 2 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note E_, 5 note A_, 5 @@ -33,49 +33,49 @@ Music_Medal_Ch1: ; f7df8 (3d:7df8) note E_, 5 speed 15 note A_, 2 - ;tie +; tie speed 1 note A_, 10 - channel_volume 3 + volume_envelope 3, 7 note A_, 5 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 0 +; cutoff 7 note A_, 5 note A_, 5 note A_, 5 - fade_wave 8 +; cutoff 8 note A_, 15 - channel_volume 3 + volume_envelope 3, 7 note A_, 5 - channel_volume 10 + volume_envelope 10, 0 note A_, 16 - channel_volume 3 + volume_envelope 3, 7 note A_, 5 - channel_volume 10 + volume_envelope 10, 0 note A_, 16 - channel_volume 3 + volume_envelope 3, 7 note A_, 6 - channel_volume 10 + volume_envelope 10, 0 speed 9 note A_, 5 - ;tie +; tie note A_, 8 - ;tie +; tie speed 1 note A_, 2 - channel_volume 3 + volume_envelope 3, 7 note A_, 16 sound_ret -Music_Medal_Ch2: ; f7e4b (3d:7e4b) - ;stereo_panning 1, 1 - ;vibrato_type 1 +Music_Medal_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 1 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 0 speed 1 note A_, 5 inc_octave @@ -96,61 +96,61 @@ Music_Medal_Ch2: ; f7e4b (3d:7e4b) inc_octave speed 15 note C_, 2 - ;tie +; tie speed 1 note C_, 10 - channel_volume 2 + volume_envelope 2, 7 note C_, 5 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 0 +; cutoff 7 note C_, 5 note C_, 5 note C_, 5 - fade_wave 8 +; cutoff 8 note D_, 15 - channel_volume 3 + volume_envelope 3, 7 note D_, 5 - channel_volume 9 + volume_envelope 9, 0 note D_, 16 - channel_volume 2 + volume_envelope 2, 7 note D_, 5 - channel_volume 9 + volume_envelope 9, 0 note D_, 16 - channel_volume 3 + volume_envelope 3, 7 note D_, 6 - channel_volume 9 + volume_envelope 9, 0 speed 9 note C#, 5 - ;tie +; tie note C#, 8 - ;tie +; tie speed 1 note C#, 2 - channel_volume 2 + volume_envelope 2, 7 note C#, 16 sound_ret -Music_Medal_Ch3: ; f7e9d (3d:7e9d) - ;stereo_panning 1, 1 +Music_Medal_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;cutoff 8 - ;echo 0 +; cutoff 8 +; echo 0 octave 2 speed 1 speed 15 rest 4 note F_, 2 - ;tie +; tie speed 1 note F_, 10 rest 5 - ;cutoff 7 +; cutoff 7 note F_, 5 note F_, 5 note F_, 5 - ;cutoff 8 +; cutoff 8 note A#, 15 rest 5 note A#, 16 @@ -159,8 +159,7 @@ Music_Medal_Ch3: ; f7e9d (3d:7e9d) rest 6 speed 9 note A_, 13 - ;tie +; tie speed 1 note A_, 2 sound_ret -; 0xf7ec8 diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm index fbbe2103..ee0ecc4b 100644 --- a/crysaudio/music/TCG/overworld.asm +++ b/crysaudio/music/TCG/overworld.asm @@ -5,14 +5,14 @@ Music_Overworld: channel 3, Music_Overworld_Ch3 channel 4, Music_Overworld_Ch4 -Music_Overworld_Ch1: ; f71a0 (3d:71a0) +Music_Overworld_Ch1: speed 7 duty_cycle 0 - ;stereo_panning 1, 1 - ;vibrato_type 9 + stereo_panning TRUE, TRUE +; vibrato_type 9 vibrato 25, 3, 3 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 2 +; cutoff 7 octave 3 rest 3 sound_call Branch_f72ba @@ -20,184 +20,184 @@ Music_Overworld_Ch1: ; f71a0 (3d:71a0) .MainLoop sound_call Branch_f72ba duty_cycle 1 - fade_wave 8 +; cutoff 8 octave 3 - channel_volume 10 + volume_envelope 10, 0 note A_, 5 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 5 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 3 speed 1 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 - channel_volume 10 + volume_envelope 10, 0 speed 7 note G_, 3 speed 1 note F_, 11 - channel_volume 3 + volume_envelope 3, 7 note F_, 10 speed 7 - channel_volume 10 + volume_envelope 10, 0 note C_, 12 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 duty_cycle 0 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 3 note E_, 4 note E_, 3 note E_, 3 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 sound_call Branch_f72fb note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 6 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 note D_, 3 note E_, 3 note G_, 6 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 10 + volume_envelope 10, 0 note F_, 4 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 dec_octave note A_, 6 note A#, 9 - channel_volume 3 + volume_envelope 3, 7 note A#, 6 - channel_volume 10 + volume_envelope 10, 0 note A#, 3 inc_octave note D_, 3 note F_, 3 note A_, 3 - channel_volume 3 + volume_envelope 3, 7 note A_, 6 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 10 + volume_envelope 10, 0 note E_, 3 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 10 + volume_envelope 10, 0 note E_, 2 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note C_, 9 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 10 + volume_envelope 10, 0 dec_octave note A_, 3 inc_octave speed 1 note C_, 11 - channel_volume 4 + volume_envelope 4, 0 note C_, 10 speed 7 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 speed 1 note F_, 11 - channel_volume 4 + volume_envelope 4, 0 note F_, 10 speed 7 - channel_volume 10 + volume_envelope 10, 0 note C_, 12 - channel_volume 3 + volume_envelope 3, 7 note C_, 6 duty_cycle 2 - fade_wave 8 - channel_volume 6 +; cutoff 8 + volume_envelope 5, -7 octave 4 note G_, 1 - ;tie +; tie note E_, 1 - ;tie +; tie note C_, 1 - ;tie +; tie dec_octave note G_, 1 - ;tie +; tie note E_, 1 - ;tie +; tie note C_, 1 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 sound_call Branch_f72fb note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 6 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 note D_, 3 note E_, 3 note F_, 9 - channel_volume 3 + volume_envelope 3, 7 note F_, 12 - channel_volume 10 + volume_envelope 10, 0 note F_, 2 note G_, 1 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 2 - channel_volume 10 + volume_envelope 10, 0 note A_, 12 - channel_volume 3 + volume_envelope 3, 7 note A_, 3 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 note A_, 3 note A#, 9 - channel_volume 3 + volume_envelope 3, 7 note A#, 6 - channel_volume 10 + volume_envelope 10, 0 note A_, 5 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 9 + volume_envelope 9, 0 note F_, 8 - ;tie +; tie note F_, 8 - ;tie +; tie note F_, 8 - ;tie +; tie note F_, 8 - ;tie +; tie note F_, 8 - ;tie +; tie note F_, 8 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 duty_cycle 0 - channel_volume 10 - fade_wave 7 + volume_envelope 10, 2 +; cutoff 7 sound_loop 0, .MainLoop Branch_f72ba: @@ -206,23 +206,23 @@ Branch_f72ba: note F_, 2 note A_, 1 inc_octave - channel_volume 10 - fade_wave 4 + volume_envelope 10, 0 +; cutoff 4 note C_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 3 note A#, 1 inc_octave - channel_volume 10 - fade_wave 4 + volume_envelope 10, 0 +; cutoff 4 note D_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note A#, 3 rest 3 @@ -230,22 +230,22 @@ Branch_f72ba: note A_, 2 inc_octave note C_, 1 - channel_volume 10 - fade_wave 4 + volume_envelope 10, 0 +; cutoff 4 note C_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 3 note A#, 1 inc_octave - channel_volume 10 - fade_wave 4 + volume_envelope 10, 0 +; cutoff 4 note D_, 1 rest 2 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 3 dec_octave note A#, 3 @@ -253,83 +253,83 @@ Branch_f72ba: Branch_f72fb: octave 4 - channel_volume 10 + volume_envelope 10, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 5 - channel_volume 3 + volume_envelope 3, 7 note F_, 1 - channel_volume 10 + volume_envelope 10, 0 note A_, 3 speed 1 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 10 speed 7 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 3 dec_octave speed 1 note A#, 11 - channel_volume 3 + volume_envelope 3, 7 note A#, 10 speed 7 - channel_volume 10 + volume_envelope 10, 0 note C#, 12 - channel_volume 3 + volume_envelope 3, 7 note C#, 6 - channel_volume 10 + volume_envelope 10, 0 note D#, 3 speed 1 note C#, 11 - channel_volume 3 + volume_envelope 3, 7 note C#, 10 - channel_volume 10 + volume_envelope 10, 0 speed 7 sound_ret -Music_Overworld_Ch2: ; f7334 (3d:7334) +Music_Overworld_Ch2: speed 7 duty_cycle 0 - ;stereo_panning 1, 1 - ;vibrato_type 9 + stereo_panning TRUE, TRUE +; vibrato_type 9 vibrato 30, 3, 3 - fade_wave 7 +; cutoff 7 octave 3 sound_call Branch_f7535 .MainLoop sound_call Branch_f7535 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 rest 3 note C_, 5 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 4 note C_, 3 note C_, 3 rest 3 note C_, 5 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note G_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note D_, 4 note D_, 3 note C_, 3 @@ -338,14 +338,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note D_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 4 note C_, 3 dec_octave @@ -354,14 +354,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note C#, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C#, 4 dec_octave note F_, 3 @@ -371,40 +371,40 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note C_, 3 note E_, 2 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note G_, 1 - fade_wave 7 - channel_volume 6 - fade_wave 8 +; cutoff 7 + volume_envelope 6, 0 +; cutoff 8 octave 3 note E_, 3 note F_, 3 note G_, 3 - fade_wave 7 +; cutoff 7 note A#, 6 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 3 note D_, 3 - channel_volume 6 - fade_wave 8 + volume_envelope 6, 0 +; cutoff 8 octave 3 note A_, 3 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 2 note A_, 2 inc_octave inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 dec_octave rest 2 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note D_, 4 note D_, 3 dec_octave @@ -415,16 +415,16 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note D_, 2 dec_octave note A#, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave inc_octave note F_, 1 rest 2 dec_octave dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 4 note A#, 3 note A#, 3 @@ -434,14 +434,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note D_, 2 dec_octave note A#, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note A_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 6 inc_octave note D_, 1 @@ -451,13 +451,13 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) inc_octave note C_, 5 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 dec_octave note C_, 4 note C_, 3 @@ -465,48 +465,48 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) rest 3 note C_, 5 note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note G_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note D_, 4 duty_cycle 2 - channel_volume 6 - fade_wave 8 + volume_envelope 5, -7 +; cutoff 8 octave 4 note C_, 1 - ;tie +; tie dec_octave note G_, 1 - ;tie +; tie note E_, 1 - ;tie +; tie note C_, 1 - ;tie +; tie dec_octave note G_, 1 - ;tie +; tie note E_, 1 duty_cycle 0 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 2 rest 3 note A#, 5 inc_octave note D_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 4 note C_, 3 dec_octave @@ -515,14 +515,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A#, 5 inc_octave note C#, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C#, 4 note C#, 3 note C#, 3 @@ -532,14 +532,14 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note A_, 2 inc_octave note C_, 3 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note G_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note C_, 4 note E_, 3 note C_, 3 @@ -549,221 +549,221 @@ Music_Overworld_Ch2: ; f7334 (3d:7334) note B_, 2 inc_octave inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 rest 2 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note D_, 4 - channel_volume 6 - fade_wave 8 + volume_envelope 6, 0 +; cutoff 8 octave 4 note D_, 2 note E_, 1 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 2 - channel_volume 6 + volume_envelope 6, 0 note F_, 11 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 4 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 rest 2 dec_octave dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A#, 1 - channel_volume 6 - fade_wave 8 + volume_envelope 6, 0 +; cutoff 8 octave 3 note A#, 3 inc_octave note F_, 3 note G_, 9 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 3 note D_, 2 dec_octave note A#, 3 inc_octave inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 - fade_wave 8 - channel_volume 6 +; cutoff 8 + volume_envelope 6, 0 octave 4 note C_, 5 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 dec_octave - channel_volume 9 + volume_envelope 9, 0 note A#, 5 - channel_volume 2 + volume_envelope 2, 7 note A#, 1 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 octave 3 rest 3 note F_, 3 note C_, 2 note F_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note G_, 3 speed 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 inc_octave note F_, 4 note C_, 3 speed 7 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note E_, 3 note G_, 2 inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 dec_octave rest 3 note A_, 3 note F_, 2 note A_, 1 inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note G_, 3 speed 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 inc_octave note F_, 4 note C_, 3 dec_octave speed 7 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note A_, 3 note G_, 2 inc_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 note F_, 1 sound_loop 0, .MainLoop Branch_f7535: octave 3 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 rest 3 note C_, 3 note C_, 2 note F_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note G_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - fade_wave 8 +; cutoff 8 speed 1 inc_octave note F_, 4 note C_, 3 speed 7 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 dec_octave note E_, 3 note G_, 2 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 dec_octave rest 3 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 2 +; cutoff 8 note F_, 3 note F_, 2 note A_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 note G_, 3 note G_, 1 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 rest 1 dec_octave - fade_wave 8 +; cutoff 8 speed 1 inc_octave note F_, 4 note C_, 3 speed 7 - channel_volume 9 - fade_wave 7 + volume_envelope 9, 2 +; cutoff 7 dec_octave note A_, 3 note G_, 2 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 0 +; cutoff 4 inc_octave note F_, 1 dec_octave sound_ret -Music_Overworld_Ch3: ; f75a1 (3d:75a1) +Music_Overworld_Ch3: speed 7 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 64 - ;cutoff 7 +; echo 64 +; cutoff 7 octave 2 sound_call Branch_f77f8 note F_, 2 @@ -774,71 +774,71 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note F_, 3 sound_call Branch_f7826 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 note A#, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note C#, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note A#, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 inc_octave note C#, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 note F_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note A#, 2 dec_octave - ;cutoff 8 +; cutoff 8 note A#, 1 octave 4 - ;cutoff 3 +; cutoff 3 note C#, 2 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 note A_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note E_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note G_, 2 - ;cutoff 7 +; cutoff 7 note E_, 1 - ;cutoff 8 +; cutoff 8 dec_octave note E_, 1 rest 1 inc_octave inc_octave - ;cutoff 3 +; cutoff 3 note E_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 rest 1 inc_octave @@ -859,240 +859,240 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note D_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 inc_octave note D_, 2 dec_octave note A_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 inc_octave note C_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note D_, 2 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note D_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 - ;cutoff 8 +; cutoff 8 octave 2 note A_, 1 note G_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 - ;cutoff 7 +; cutoff 7 note D_, 1 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 rest 1 - ;cutoff 3 +; cutoff 3 inc_octave note A#, 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 rest 1 dec_octave - ;cutoff 8 +; cutoff 8 note D_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 - ;cutoff 8 +; cutoff 8 dec_octave note D_, 1 note C_, 2 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 - ;cutoff 7 +; cutoff 7 note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 1 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 inc_octave note C_, 1 rest 1 inc_octave - ;cutoff 7 +; cutoff 7 note F_, 1 - ;cutoff 3 +; cutoff 3 note E_, 2 - ;cutoff 8 +; cutoff 8 octave 2 note E_, 1 sound_call Branch_f7826 - ;cutoff 8 +; cutoff 8 octave 3 note C_, 1 note C#, 2 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note C#, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G#, 1 inc_octave note C#, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 inc_octave note C#, 1 octave 3 - ;cutoff 8 +; cutoff 8 note C#, 1 rest 1 inc_octave note G_, 1 dec_octave - ;cutoff 8 +; cutoff 8 note C#, 1 rest 1 dec_octave note G#, 1 octave 4 - ;cutoff 3 +; cutoff 3 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C#, 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G#, 1 inc_octave note C_, 2 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note E_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note G_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note C_, 2 - ;cutoff 7 +; cutoff 7 note E_, 1 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 1 rest 1 octave 5 - ;cutoff 3 +; cutoff 3 note E_, 1 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note E_, 2 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note E_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 note B_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note B_, 2 note F_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 inc_octave note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note B_, 2 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note B_, 2 note F_, 1 @@ -1102,27 +1102,27 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note A#, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note A#, 2 note F_, 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 inc_octave note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 2 note A#, 2 @@ -1133,33 +1133,33 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note C_, 2 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 - ;cutoff 7 +; cutoff 7 note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 octave 5 - ;cutoff 3 +; cutoff 3 note D_, 1 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note D_, 2 rest 1 octave 2 - ;cutoff 8 +; cutoff 8 note E_, 1 inc_octave note C_, 1 @@ -1171,13 +1171,13 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) note E_, 1 note F_, 3 octave 4 - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 5 +; cutoff 5 note F_, 2 note A_, 1 inc_octave @@ -1193,24 +1193,24 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) rest 2 note G_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 5 +; cutoff 5 note A#, 2 inc_octave note C_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 3 octave 5 - ;cutoff 3 +; cutoff 3 note C_, 2 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 5 +; cutoff 5 note A_, 2 inc_octave note C_, 1 @@ -1225,13 +1225,13 @@ Music_Overworld_Ch3: ; f75a1 (3d:75a1) rest 2 note C_, 2 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 inc_octave - ;cutoff 5 +; cutoff 5 note A#, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 sound_loop 0, .MainLoop @@ -1239,10 +1239,10 @@ Branch_f77f8: octave 2 note F_, 3 octave 4 - ;cutoff 3 +; cutoff 3 note A_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 note F_, 2 note C_, 1 @@ -1261,10 +1261,10 @@ Branch_f77f8: dec_octave note F_, 3 octave 5 - ;cutoff 3 +; cutoff 3 note C_, 2 octave 3 - ;cutoff 8 +; cutoff 8 note C_, 1 note F_, 2 note C_, 1 @@ -1284,68 +1284,68 @@ Branch_f7826: note F_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note F_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note C_, 1 note F_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 inc_octave note C_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note G_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 rest 1 note C_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note G_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note F_, 1 octave 4 - ;cutoff 7 +; cutoff 7 note F_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note G_, 1 note A_, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note E_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note E_, 1 note A_, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note E_, 2 rest 1 inc_octave note C_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A_, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note E_, 1 octave 2 - ;cutoff 8 +; cutoff 8 .Loop1 note A_, 1 rest 1 @@ -1356,44 +1356,44 @@ Branch_f7826: note A#, 2 rest 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 dec_octave - ;cutoff 8 +; cutoff 8 note F_, 1 note A#, 1 rest 1 inc_octave - ;cutoff 3 +; cutoff 3 note F_, 2 rest 1 inc_octave note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 octave 4 - ;cutoff 7 +; cutoff 7 note D_, 1 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 rest 1 note F_, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 octave 2 - ;cutoff 8 +; cutoff 8 note A#, 1 octave 4 - ;cutoff 3 +; cutoff 3 note D_, 2 sound_ret -Music_Overworld_Ch4: ; f78af (3d:78af) +Music_Overworld_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -1478,4 +1478,3 @@ Branch_f790a: drum_note 2, 2 drum_note 2, 1 sound_ret -; 0xf7919 diff --git a/crysaudio/music/TCG/pausemenu.asm b/crysaudio/music/TCG/pausemenu.asm index 5ca8a900..327ca4c1 100644 --- a/crysaudio/music/TCG/pausemenu.asm +++ b/crysaudio/music/TCG/pausemenu.asm @@ -5,13 +5,13 @@ Music_PauseMenu: channel 3, Music_PauseMenu_Ch3 channel 4, Music_PauseMenu_Ch4 -Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) +Music_PauseMenu_Ch2: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 .MainLoop - channel_volume 7 + volume_envelope 7, 0 .Loop1 rest 16 sound_loop 4, .Loop1 @@ -22,195 +22,195 @@ Music_PauseMenu_Ch2: ; f6bb7 (3d:6bb7) rest 3 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_call Branch_f6c24 sound_call Branch_f6c60 - channel_volume 7 + volume_envelope 7, 0 octave 6 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_call Branch_f6c24 sound_call Branch_f6c60 octave 6 - channel_volume 6 + volume_envelope 6, 0 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note E_, 3 sound_call Branch_f6ce9 sound_call Branch_f6c80 .Loop2 octave 6 - fade_wave 4 +; cutoff 4 note C_, 1 sound_call Branch_f6ce9 sound_call Branch_f6c80 sound_loop 3, .Loop2 - fade_wave 8 +; cutoff 8 sound_loop 0, .MainLoop Branch_f6c24: .Loop3 octave 6 - channel_volume 7 + volume_envelope 7, 0 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 7 + volume_envelope 7, 0 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_loop 3, .Loop3 inc_octave - channel_volume 7 + volume_envelope 7, 0 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 7 + volume_envelope 7, 0 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_ret Branch_f6c60: .Loop4 octave 6 - channel_volume 7 + volume_envelope 7, 0 note C_, 4 dec_octave - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note B_, 4 inc_octave - channel_volume 3 + volume_envelope 3, 7 note C_, 3 dec_octave - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note B_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 sound_loop 3, .Loop4 sound_ret Branch_f6c80: octave 6 - fade_wave 4 +; cutoff 4 note C_, 1 octave 3 - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 speed 1 note C_, 4 - channel_volume 2 + volume_envelope 2, 7 note C_, 3 - channel_volume 6 + volume_envelope 6, 0 speed 7 octave 5 - fade_wave 4 +; cutoff 4 note G_, 1 note E_, 1 octave 3 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 speed 1 note E_, 4 - channel_volume 2 + volume_envelope 2, 7 note E_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note B_, 1 note G_, 1 dec_octave - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 speed 1 note C_, 4 - channel_volume 2 + volume_envelope 2, 7 note C_, 3 - channel_volume 6 + volume_envelope 6, 0 speed 7 octave 6 - fade_wave 4 +; cutoff 4 note C_, 1 octave 3 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 speed 1 note C_, 4 - channel_volume 2 + volume_envelope 2, 7 note C_, 3 speed 7 octave 5 - channel_volume 6 - fade_wave 4 + volume_envelope 6, 0 +; cutoff 4 note G_, 1 note E_, 1 - channel_volume 7 + volume_envelope 7, 0 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note E_, 4 - channel_volume 2 + volume_envelope 2, 7 note E_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note B_, 1 note G_, 1 note E_, 1 @@ -219,79 +219,79 @@ Branch_f6c80: Branch_f6ce9: octave 2 speed 1 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 note B_, 4 - channel_volume 2 + volume_envelope 2, 7 note B_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note G_, 1 note D_, 1 octave 3 - channel_volume 7 - fade_wave 8 + volume_envelope 7, 0 +; cutoff 8 speed 1 note D_, 4 - channel_volume 2 + volume_envelope 2, 7 note D_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note B_, 1 note G_, 1 - channel_volume 7 + volume_envelope 7, 0 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note B_, 4 - channel_volume 2 + volume_envelope 2, 7 note B_, 3 - channel_volume 6 + volume_envelope 6, 0 speed 7 octave 6 - fade_wave 4 +; cutoff 4 note C_, 1 - channel_volume 7 + volume_envelope 7, 0 octave 2 - fade_wave 8 +; cutoff 8 speed 1 note B_, 4 - channel_volume 2 + volume_envelope 2, 7 note B_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note G_, 1 note D_, 1 - channel_volume 7 + volume_envelope 7, 0 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note D_, 4 - channel_volume 2 + volume_envelope 2, 7 note D_, 3 speed 7 - channel_volume 6 + volume_envelope 6, 0 octave 5 - fade_wave 4 +; cutoff 4 note B_, 1 note G_, 1 note D_, 1 sound_ret -Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) +Music_PauseMenu_Ch1: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 duty_cycle 2 .MainLoop - channel_volume 8 + volume_envelope 8, 0 .Loop1 rest 16 sound_loop 7, .Loop1 @@ -308,66 +308,66 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) speed 7 .Loop3 octave 1 - channel_volume 13 + volume_envelope 13, 0 note G_, 1 octave 3 - channel_volume 7 + volume_envelope 7, 0 speed 1 note D_, 4 - channel_volume 2 + volume_envelope 2, 7 note D_, 3 - channel_volume 13 + volume_envelope 13, 0 speed 7 octave 1 - fade_wave 6 +; cutoff 6 note G_, 1 - fade_wave 4 +; cutoff 4 note G_, 1 octave 3 - fade_wave 8 - channel_volume 7 +; cutoff 8 + volume_envelope 7, 0 speed 1 note F#, 4 - channel_volume 2 + volume_envelope 2, 7 note F#, 3 dec_octave - channel_volume 13 + volume_envelope 13, 0 speed 7 note D_, 1 note G_, 1 octave 4 - channel_volume 7 + volume_envelope 7, 0 speed 1 note F#, 4 - channel_volume 2 + volume_envelope 2, 7 note F#, 3 speed 7 octave 1 - channel_volume 13 - fade_wave 8 + volume_envelope 13, 0 +; cutoff 8 note G_, 1 octave 3 - channel_volume 7 + volume_envelope 7, 0 speed 1 note D_, 4 - channel_volume 2 + volume_envelope 2, 7 note D_, 3 speed 7 - channel_volume 13 + volume_envelope 13, 0 octave 1 - fade_wave 6 +; cutoff 6 note G_, 1 - fade_wave 4 +; cutoff 4 note G_, 1 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note F#, 4 - channel_volume 2 + volume_envelope 2, 7 note F#, 3 speed 7 octave 1 - channel_volume 13 + volume_envelope 13, 0 note B_, 1 inc_octave note C_, 1 @@ -375,62 +375,62 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) dec_octave note D_, 1 octave 3 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 4 - channel_volume 2 + volume_envelope 2, 7 note E_, 3 - channel_volume 13 + volume_envelope 13, 0 speed 7 octave 1 - fade_wave 6 +; cutoff 6 note D_, 1 - fade_wave 4 +; cutoff 4 note D_, 1 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note G_, 4 - channel_volume 2 + volume_envelope 2, 7 note G_, 3 speed 7 dec_octave - channel_volume 13 + volume_envelope 13, 0 note C_, 1 note D_, 1 octave 4 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 4 - channel_volume 2 + volume_envelope 2, 7 note G_, 3 speed 7 octave 1 - channel_volume 13 - fade_wave 8 + volume_envelope 13, 0 +; cutoff 8 note D_, 1 octave 3 - channel_volume 7 + volume_envelope 7, 0 speed 1 note E_, 4 - channel_volume 2 + volume_envelope 2, 7 note E_, 3 speed 7 - channel_volume 13 - fade_wave 6 + volume_envelope 13, 0 +; cutoff 6 octave 1 note D_, 1 - fade_wave 4 +; cutoff 4 note D_, 1 octave 3 - fade_wave 8 +; cutoff 8 speed 1 note G_, 4 - channel_volume 2 + volume_envelope 2, 7 note G_, 3 speed 7 octave 1 - channel_volume 13 + volume_envelope 13, 0 note C_, 1 note C#, 1 inc_octave @@ -439,16 +439,16 @@ Music_PauseMenu_Ch1: ; f6d4e (3d:6d4e) sound_loop 0, .MainLoop -Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) +Music_PauseMenu_Ch3: speed 1 fade_wave 13 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 2 - ;echo 96 - ;cutoff 4 +; echo 96 +; cutoff 4 octave 5 note G_, 7 - ;cutoff 8 +; cutoff 8 note F#, 4 channel_volume 3 note G_, 3 @@ -551,13 +551,12 @@ Music_PauseMenu_Ch3: ; f6e2d (3d:6e2d) sound_loop 0, .MainLoop -Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) +Music_PauseMenu_Ch4: toggle_noise 6 drum_speed 7 octave 1 .MainLoop .Loop1 - ;rept 7 drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -572,7 +571,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -587,7 +585,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -602,7 +599,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -617,7 +613,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -632,7 +627,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -647,7 +641,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;--- drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -662,7 +655,6 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 4, 1 drum_note 5, 1 drum_note 2, 1 - ;endr drum_note 1, 1 drum_note 4, 1 drum_note 5, 2 @@ -673,23 +665,13 @@ Music_PauseMenu_Ch4: ; f6ec8 (3d:6ec8) drum_note 3, 4 drum_note 3, 3 drum_speed 7 - ;rept 8 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 - ;endr sound_loop 2, .Loop1 sound_loop 0, .MainLoop -; 0xf6ef1 diff --git a/crysaudio/music/TCG/pcmainmenu.asm b/crysaudio/music/TCG/pcmainmenu.asm index 6d6f3c76..825d1611 100644 --- a/crysaudio/music/TCG/pcmainmenu.asm +++ b/crysaudio/music/TCG/pcmainmenu.asm @@ -5,10 +5,10 @@ Music_PCMainMenu: channel 3, Music_PCMainMenu_Ch3 channel 4, Music_PCMainMenu_Ch4 -Music_PCMainMenu_Ch1: ; f9052 (3e:5052) +Music_PCMainMenu_Ch1: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 3 duty_cycle 2 .MainLoop @@ -16,66 +16,66 @@ Music_PCMainMenu_Ch1: ; f9052 (3e:5052) rest 4 dec_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note F_, 1 rest 1 duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note A_, 1 - channel_volume 3 + volume_envelope 3, 7 note A_, 1 rest 2 inc_octave - channel_volume 12 + volume_envelope 11, 4 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 dec_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note F_, 1 rest 1 duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 1 sound_call Branch_f90c2 rest 4 dec_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note F_, 1 rest 1 inc_octave duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 2 - channel_volume 12 + volume_envelope 11, 4 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 dec_octave note F_, 1 rest 1 inc_octave duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 sound_loop 0, .MainLoop @@ -83,38 +83,38 @@ Branch_f90c2: octave 3 rest 4 duty_cycle 1 - channel_volume 6 - fade_wave 5 + volume_envelope 6, 1 +; cutoff 5 note G_, 1 rest 3 - fade_wave 8 +; cutoff 8 duty_cycle 2 - channel_volume 12 + volume_envelope 11, 4 note B_, 2 inc_octave note D_, 1 - channel_volume 2 + volume_envelope 2, 7 note D_, 1 dec_octave duty_cycle 1 - channel_volume 6 - fade_wave 5 + volume_envelope 6, 1 +; cutoff 5 note G_, 1 rest 1 inc_octave duty_cycle 2 - fade_wave 8 - channel_volume 12 +; cutoff 8 + volume_envelope 11, 4 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 sound_ret -Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) +Music_PCMainMenu_Ch2: speed 7 - ;stereo_panning 1, 1 - fade_wave 8 + stereo_panning TRUE, TRUE +; cutoff 8 octave 3 duty_cycle 2 .MainLoop @@ -122,67 +122,67 @@ Music_PCMainMenu_Ch2: ; f90ed (3e:50ed) rest 4 inc_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note C_, 1 rest 1 dec_octave duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note F_, 1 - channel_volume 2 + volume_envelope 2, 7 note F_, 1 rest 2 - channel_volume 8 + volume_envelope 8, 4 note A_, 1 - channel_volume 2 + volume_envelope 2, 7 note A_, 1 duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 inc_octave note C_, 1 rest 1 dec_octave duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 sound_call Branch_f915e rest 4 inc_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note C_, 1 rest 1 duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 rest 2 dec_octave - channel_volume 8 + volume_envelope 8, 4 note A_, 1 - channel_volume 2 + volume_envelope 2, 7 note A_, 1 duty_cycle 1 inc_octave - channel_volume 6 - fade_wave 5 + volume_envelope 6, 1 +; cutoff 5 note C_, 1 rest 1 dec_octave duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note B_, 1 - channel_volume 2 + volume_envelope 2, 7 note B_, 1 sound_loop 0, .MainLoop @@ -190,165 +190,165 @@ Branch_f915e: octave 4 rest 4 duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note D_, 1 rest 3 duty_cycle 2 - fade_wave 8 +; cutoff 8 dec_octave - channel_volume 8 + volume_envelope 8, 4 note G_, 2 note B_, 1 - channel_volume 2 + volume_envelope 2, 7 note B_, 1 inc_octave duty_cycle 1 - fade_wave 5 - channel_volume 6 +; cutoff 5 + volume_envelope 6, 1 note D_, 1 rest 1 dec_octave duty_cycle 2 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 4 note A_, 1 - channel_volume 2 + volume_envelope 2, 7 note A_, 1 sound_ret -Music_PCMainMenu_Ch3: ; f9189 (3e:5189) +Music_PCMainMenu_Ch3: speed 7 channel_volume 1 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE fade_wave 11 - ;cutoff 7 - ;echo 0 +; cutoff 7 +; echo 0 .MainLoop octave 2 - ;cutoff 7 +; cutoff 7 note G_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note G_, 1 rest 1 speed 1 note A#, 4 - ;tie +; tie note B_, 3 - ;tie +; tie speed 7 note B_, 1 rest 1 - ;cutoff 4 +; cutoff 4 inc_octave note C_, 1 rest 1 note C_, 1 - ;cutoff 8 +; cutoff 8 note C#, 2 note D_, 2 dec_octave note G_, 1 - ;tie +; tie note F#, 1 - ;cutoff 7 +; cutoff 7 note F_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note F_, 1 rest 1 speed 1 note G#, 4 - ;tie +; tie note A_, 3 - ;tie +; tie speed 7 note A_, 1 rest 1 - ;cutoff 4 +; cutoff 4 note A#, 1 rest 1 note A#, 1 - ;cutoff 8 +; cutoff 8 note B_, 2 inc_octave note C_, 2 dec_octave note F_, 1 - ;tie +; tie note F#, 1 - ;cutoff 7 +; cutoff 7 note G_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note G_, 1 rest 1 speed 1 note A#, 4 - ;tie +; tie note B_, 3 - ;tie +; tie speed 7 note B_, 1 rest 1 - ;cutoff 4 +; cutoff 4 inc_octave note C_, 1 rest 1 note C_, 1 - ;cutoff 8 +; cutoff 8 note C#, 2 note D_, 2 dec_octave note G_, 1 - ;tie +; tie note F#, 1 - ;cutoff 7 +; cutoff 7 note F_, 1 rest 1 - ;cutoff 8 +; cutoff 8 note F_, 1 rest 1 speed 1 note B_, 4 - ;tie +; tie inc_octave note C_, 3 - ;tie +; tie speed 7 note C_, 1 rest 1 - ;cutoff 8 +; cutoff 8 speed 1 note F#, 4 - ;tie +; tie note G_, 3 - ;tie +; tie speed 7 note G_, 1 - ;cutoff 4 +; cutoff 4 note F_, 1 - ;cutoff 8 +; cutoff 8 note C_, 2 note F_, 2 speed 1 note C_, 3 - ;tie +; tie dec_octave note B_, 3 - ;tie +; tie note A#, 3 - ;tie +; tie note A_, 3 - ;tie +; tie note G#, 2 speed 7 sound_loop 0, .MainLoop -Music_PCMainMenu_Ch4: ; f922b (3e:522b) +Music_PCMainMenu_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -382,4 +382,3 @@ Branch_f9248: drum_note 1, 1 drum_note 3, 1 sound_ret -; 0xf9251 diff --git a/crysaudio/music/TCG/pokemondome.asm b/crysaudio/music/TCG/pokemondome.asm index f81b20da..a7653d8f 100644 --- a/crysaudio/music/TCG/pokemondome.asm +++ b/crysaudio/music/TCG/pokemondome.asm @@ -5,15 +5,15 @@ Music_PokemonDome: channel 3, Music_PokemonDome_Ch3 channel 4, Music_PokemonDome_Ch4 -Music_PokemonDome_Ch1: ; f9251 (3e:5251) +Music_PokemonDome_Ch1: speed 7 - ;stereo_panning 1, 1 - ;vibrato_type 9 + stereo_panning TRUE, TRUE +; vibrato_type 9 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 2 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 speed 1 note G_, 5 note A_, 5 @@ -44,127 +44,127 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note F_, 5 note G_, 4 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 dec_octave speed 1 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 8 + volume_envelope 8, 0 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 10 rest 7 - channel_volume 8 + volume_envelope 8, 0 note C_, 4 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 8 + volume_envelope 8, 0 note C_, 4 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 8 + volume_envelope 8, 0 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 3 - channel_volume 8 + volume_envelope 8, 0 note C_, 11 - channel_volume 3 + volume_envelope 3, 7 note C_, 10 speed 7 rest 3 - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 10 rest 7 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 .MainLoop speed 7 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 4 octave 2 note G_, 4 inc_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 speed 1 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 speed 1 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 rest 7 - channel_volume 8 + volume_envelope 8, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 8 + volume_envelope 8, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 speed 7 rest 3 - channel_volume 8 + volume_envelope 8, 0 speed 1 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 10 rest 7 speed 1 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 4 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 - channel_volume 8 + volume_envelope 8, 0 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 3 duty_cycle 0 - channel_volume 10 + volume_envelope 10, 0 dec_octave speed 1 note B_, 4 @@ -181,150 +181,150 @@ Music_PokemonDome_Ch1: ; f9251 (3e:5251) note C_, 12 dec_octave note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note D_, 10 - channel_volume 3 + volume_envelope 3, 7 note D_, 2 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 10 - channel_volume 3 + volume_envelope 3, 7 note F_, 2 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 10 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note E_, 12 dec_octave note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note D_, 8 dec_octave note A_, 4 inc_octave note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 14 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 10 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 - channel_volume 10 + volume_envelope 10, 0 note G_, 4 note A_, 12 note B_, 1 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 inc_octave - channel_volume 10 + volume_envelope 10, 0 note C_, 1 note D_, 8 note E_, 4 note F_, 4 note G_, 8 - ;tie +; tie note G_, 8 - ;tie +; tie note G_, 8 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 note F_, 2 note E_, 2 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note E_, 5 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 speed 7 - channel_volume 10 + volume_envelope 10, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 1 inc_octave note C_, 8 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note A_, 1 inc_octave note C_, 8 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 note F_, 1 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 dec_octave - channel_volume 10 + volume_envelope 10, 0 note G#, 1 inc_octave note C_, 12 - ;tie +; tie note C_, 8 note D_, 8 note C_, 8 - ;tie +; tie note C_, 8 - ;tie +; tie note C_, 12 sound_loop 0, .MainLoop -Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) +Music_PokemonDome_Ch2: speed 7 - ;stereo_panning 1, 1 - ;vibrato_type 9 + stereo_panning TRUE, TRUE +; vibrato_type 9 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 octave 1 duty_cycle 0 - channel_volume 8 + volume_envelope 8, 0 speed 1 note B_, 5 inc_octave @@ -356,69 +356,69 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note B_, 4 .MainLoop duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 octave 3 speed 1 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 rest 7 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 4 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 3 - channel_volume 7 + volume_envelope 7, 0 note E_, 11 - channel_volume 3 + volume_envelope 3, 7 note E_, 10 speed 7 rest 3 sound_call Branch_f9554 speed 7 rest 4 - channel_volume 7 + volume_envelope 7, 0 speed 1 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 7 + volume_envelope 7, 0 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 10 rest 7 - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 7 + volume_envelope 7, 0 note G_, 4 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 7 + volume_envelope 7, 0 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 3 - channel_volume 7 + volume_envelope 7, 0 note G_, 11 - channel_volume 3 + volume_envelope 3, 7 note G_, 10 speed 7 rest 3 sound_call Branch_f9554 duty_cycle 0 - channel_volume 8 + volume_envelope 8, 0 dec_octave speed 1 note G_, 4 @@ -435,10 +435,10 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note F_, 1 rest 1 note E_, 1 - channel_volume 2 + volume_envelope 2, 7 note E_, 1 rest 1 - channel_volume 7 + volume_envelope 7, 0 note G_, 1 note G_, 10 note A_, 2 @@ -462,9 +462,9 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note E_, 4 note F#, 8 note F#, 4 - fade_wave 6 +; cutoff 6 note F#, 3 - fade_wave 8 +; cutoff 8 speed 1 note F#, 5 rest 2 @@ -492,7 +492,7 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) note A_, 1 note B_, 1 duty_cycle 1 - channel_volume 8 + volume_envelope 7, -7 speed 1 .Loop1 note F_, 5 @@ -546,31 +546,31 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) inc_octave note C#, 4 duty_cycle 0 - channel_volume 8 + volume_envelope 8, 0 speed 7 .Loop5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 rest 1 - channel_volume 7 + volume_envelope 7, 0 dec_octave note F_, 1 note A_, 8 inc_octave note E_, 1 - channel_volume 2 + volume_envelope 2, 7 note E_, 1 rest 1 - channel_volume 7 + volume_envelope 7, 0 note D_, 1 sound_loop 2, .Loop5 note C_, 1 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 rest 1 dec_octave - channel_volume 7 + volume_envelope 7, 0 note F_, 1 note G#, 12 note C_, 1 @@ -599,48 +599,48 @@ Music_PokemonDome_Ch2: ; f93f8 (3e:53f8) Branch_f9554: speed 1 - channel_volume 7 + volume_envelope 7, 0 note F_, 11 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 - channel_volume 7 + volume_envelope 7, 0 note F_, 11 - channel_volume 3 + volume_envelope 3, 7 note F_, 10 rest 7 - channel_volume 7 + volume_envelope 7, 0 note F_, 4 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 - channel_volume 7 + volume_envelope 7, 0 note F_, 4 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 .Loop6 - channel_volume 7 + volume_envelope 7, 0 note F_, 11 - channel_volume 3 + volume_envelope 3, 7 note F_, 3 sound_loop 2, .Loop6 sound_ret -Music_PokemonDome_Ch3: ; f9579 (3e:5579) +Music_PokemonDome_Ch3: speed 7 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 64 - ;cutoff 6 +; echo 64 +; cutoff 6 octave 2 - ;cutoff 4 +; cutoff 4 speed 1 .Loop1 note G_, 5 note G_, 5 note G_, 4 sound_loop 8, .Loop1 - ;cutoff 6 +; cutoff 6 speed 7 .MainLoop inc_octave @@ -651,10 +651,10 @@ Music_PokemonDome_Ch3: ; f9579 (3e:5579) note C_, 1 sound_call Branch_f9613 octave 2 - ;cutoff 4 +; cutoff 4 note C_, 2 inc_octave - ;cutoff 6 +; cutoff 6 note C_, 2 rest 2 note C_, 1 @@ -772,14 +772,14 @@ Branch_f9613: note C_, 2 note C_, 2 dec_octave - ;cutoff 4 +; cutoff 4 note G_, 2 - ;cutoff 6 +; cutoff 6 note G_, 2 sound_ret -Music_PokemonDome_Ch4: ; f9629 (3e:5629) +Music_PokemonDome_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -804,4 +804,3 @@ Music_PokemonDome_Ch4: ; f9629 (3e:5629) drum_note 3, 3 sound_loop 2, .Loop2 sound_loop 0, .MainLoop -; 0xf9646 diff --git a/crysaudio/music/TCG/ronald.asm b/crysaudio/music/TCG/ronald.asm index 54e52aec..a2263db7 100644 --- a/crysaudio/music/TCG/ronald.asm +++ b/crysaudio/music/TCG/ronald.asm @@ -5,21 +5,21 @@ Music_Ronald: channel 3, Music_Ronald_Ch3 channel 4, Music_Ronald_Ch4 -Music_Ronald_Ch1: ; fa7a0 (3e:67a0) - ;stereo_panning 1, 1 - ;vibrato_type 8 +Music_Ronald_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 12, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 0 .MainLoop octave 3 speed 13 .Loop1 - channel_volume 9 - fade_wave 3 + volume_envelope 9, 2 +; cutoff 3 note D_, 1 note D_, 1 - fade_wave 4 +; cutoff 4 note F_, 1 rest 2 note D_, 1 @@ -30,17 +30,17 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 note F_, 1 rest 1 - channel_volume 9 - fade_wave 8 + volume_envelope 9, 0 +; cutoff 8 note E_, 2 rest 1 dec_octave - channel_volume 9 - fade_wave 3 + volume_envelope 9, 2 +; cutoff 3 note G_, 1 inc_octave note D_, 1 - fade_wave 4 +; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -51,8 +51,8 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 1 note A_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note G_, 2 rest 1 sound_loop 2, .Loop1 @@ -63,7 +63,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) octave 4 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 2 vibrato 12, 3, 3 @@ -76,7 +76,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) octave 4 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 2 vibrato 12, 3, 3 @@ -90,10 +90,10 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note D_, 3 rest 7 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 rest 6 dec_octave - fade_wave 4 +; cutoff 4 note G_, 7 inc_octave note F_, 6 @@ -108,12 +108,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note G_, 7 inc_octave - fade_wave 8 +; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - fade_wave 4 +; cutoff 4 note A#, 6 inc_octave note C_, 7 @@ -122,22 +122,22 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note G_, 7 note F_, 6 note F#, 7 - fade_wave 8 +; cutoff 8 note G_, 6 - fade_wave 4 +; cutoff 4 note C#, 7 note C_, 6 dec_octave note A#, 7 inc_octave - fade_wave 8 +; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave note A#, 6 inc_octave - fade_wave 4 +; cutoff 4 note C_, 7 dec_octave note A#, 6 @@ -145,7 +145,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 6 note F#, 7 note G_, 6 - fade_wave 8 +; cutoff 8 note A#, 7 inc_octave note C_, 6 @@ -158,10 +158,10 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note D_, 3 rest 7 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 rest 6 dec_octave - fade_wave 4 +; cutoff 4 note G_, 7 inc_octave note F_, 6 @@ -176,12 +176,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note G_, 7 inc_octave - fade_wave 8 +; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - fade_wave 4 +; cutoff 4 note A#, 6 inc_octave note C_, 7 @@ -191,20 +191,20 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 6 note F#, 7 note G_, 6 - fade_wave 8 +; cutoff 8 note A#, 7 inc_octave - fade_wave 4 +; cutoff 4 note C_, 6 dec_octave note A#, 7 inc_octave - fade_wave 8 +; cutoff 8 note C#, 4 note C_, 4 dec_octave note A#, 5 - fade_wave 4 +; cutoff 4 note G_, 6 note F_, 7 note G_, 6 @@ -213,15 +213,15 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) dec_octave note A#, 7 inc_octave - fade_wave 8 +; cutoff 8 note C_, 4 note C#, 4 note C_, 5 dec_octave - fade_wave 4 +; cutoff 4 note A#, 6 note G_, 7 - fade_wave 8 +; cutoff 8 sound_call Branch_fa9cb speed 1 octave 4 @@ -229,21 +229,21 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note D_, 3 rest 7 duty_cycle 2 - channel_volume 9 + volume_envelope 9, 0 rest 13 - fade_wave 4 +; cutoff 4 note F_, 6 rest 7 - fade_wave 8 +; cutoff 8 note E_, 4 note F_, 4 note E_, 5 - fade_wave 4 +; cutoff 4 note D_, 6 rest 7 - fade_wave 8 +; cutoff 8 note E_, 6 - fade_wave 4 +; cutoff 4 note C_, 7 dec_octave note G_, 6 @@ -252,41 +252,41 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note C#, 6 note D_, 7 dec_octave - fade_wave 8 +; cutoff 8 note A#, 6 - fade_wave 4 +; cutoff 4 note G_, 7 rest 6 note F_, 7 - fade_wave 8 +; cutoff 8 note F#, 6 - fade_wave 4 +; cutoff 4 note G_, 7 - fade_wave 8 +; cutoff 8 note A#, 6 - fade_wave 4 +; cutoff 4 note G_, 7 note A#, 6 inc_octave note C_, 7 - fade_wave 8 +; cutoff 8 note C#, 6 - fade_wave 4 +; cutoff 4 note D_, 7 note F_, 6 note D_, 7 - fade_wave 8 +; cutoff 8 note F_, 6 dec_octave - fade_wave 4 +; cutoff 4 note G_, 7 dec_octave note G_, 6 inc_octave note D_, 7 duty_cycle 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 sound_call Branch_fa9cb speed 1 octave 4 @@ -303,7 +303,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) note F_, 4 vibrato 12, 3, 3 speed 1 - channel_volume 9 + volume_envelope 9, 3 note C_, 6 rest 7 rest 13 @@ -314,12 +314,12 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 7 rest 13 speed 13 - channel_volume 9 + volume_envelope 9, 0 note G_, 2 rest 1 vibrato 20, 3, 3 speed 1 - channel_volume 10 + volume_envelope 10, 0 note F#, 3 note G_, 10 note A#, 3 @@ -413,7 +413,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) rest 7 note C#, 3 note D_, 10 - ;tie +; tie speed 13 note D_, 5 rest 1 @@ -427,7 +427,7 @@ Music_Ronald_Ch1: ; fa7a0 (3e:67a0) Branch_fa9aa: octave 4 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 rest 2 speed 1 note G#, 3 @@ -457,7 +457,7 @@ Branch_fa9aa: Branch_fa9cb: octave 4 duty_cycle 1 - channel_volume 10 + volume_envelope 10, 0 speed 1 note D#, 3 note E_, 10 @@ -489,7 +489,7 @@ Branch_fa9cb: Branch_fa9ec: octave 3 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 speed 1 note F_, 6 rest 7 @@ -508,23 +508,23 @@ Branch_fa9ec: rest 7 rest 13 speed 13 - channel_volume 9 + volume_envelope 9, 0 note G_, 2 rest 1 sound_ret -Music_Ronald_Ch2: ; faa0e (3e:6a0e) - ;stereo_panning 1, 1 - ;vibrato_type 8 +Music_Ronald_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 8 vibrato 12, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 0 .MainLoop octave 2 .Loop1 speed 1 - channel_volume 9 + volume_envelope 9, 2 note G_, 3 rest 3 note G_, 3 @@ -559,12 +559,12 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 7 rest 13 speed 13 - channel_volume 9 + volume_envelope 9, 0 note C_, 2 rest 1 dec_octave speed 1 - channel_volume 9 + volume_envelope 9, 2 note D_, 3 rest 3 note G_, 3 @@ -603,53 +603,53 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 7 rest 13 speed 13 - channel_volume 9 + volume_envelope 9, 0 note E_, 2 rest 1 dec_octave sound_loop 2, .Loop1 .Loop2 sound_call Branch_fab76 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note C_, 2 rest 1 sound_call Branch_fab76 - fade_wave 8 - channel_volume 8 +; cutoff 8 + volume_envelope 8, 0 note E_, 2 rest 1 sound_loop 4, .Loop2 .Loop3 vibrato 20, 3, 3 - channel_volume 8 + volume_envelope 8, 0 speed 13 duty_cycle 1 octave 4 rest 2 - fade_wave 4 +; cutoff 4 note F_, 1 rest 1 - fade_wave 8 +; cutoff 8 note D_, 1 dec_octave dec_octave - fade_wave 4 +; cutoff 4 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 note A#, 1 rest 1 inc_octave inc_octave duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 note C_, 1 rest 1 - fade_wave 8 +; cutoff 8 note D_, 1 - fade_wave 3 +; cutoff 3 note E_, 1 - fade_wave 4 +; cutoff 4 note C_, 1 rest 1 dec_octave @@ -659,7 +659,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 2 vibrato 12, 3, 3 duty_cycle 0 - channel_volume 9 + volume_envelope 9, 2 note F_, 1 rest 2 note F_, 1 @@ -672,8 +672,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note G_, 2 rest 1 sound_loop 2, .Loop3 @@ -683,8 +683,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 2 vibrato 12, 3, 3 duty_cycle 0 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 2 +; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -697,8 +697,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note G_, 2 rest 1 vibrato 20, 3, 3 @@ -706,7 +706,7 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) octave 3 rest 1 speed 1 - fade_wave 8 +; cutoff 8 note E_, 3 note F_, 10 note E_, 3 @@ -716,8 +716,8 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) dec_octave vibrato 12, 3, 3 duty_cycle 0 - channel_volume 9 - fade_wave 4 + volume_envelope 9, 2 +; cutoff 4 note G_, 1 rest 1 inc_octave @@ -725,26 +725,26 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note D_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note E_, 2 rest 1 sound_call Branch_fabb1 rest 1 - fade_wave 4 +; cutoff 4 octave 2 note A#, 1 rest 1 note A#, 1 rest 1 inc_octave - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note C_, 2 rest 1 - channel_volume 9 + volume_envelope 9, 2 rest 2 - fade_wave 4 +; cutoff 4 note F_, 1 rest 2 note F_, 1 @@ -755,35 +755,35 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) rest 1 note A_, 1 rest 1 - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note F_, 2 rest 1 sound_call Branch_fabb1 rest 1 octave 2 - fade_wave 4 +; cutoff 4 note G_, 1 rest 1 note G_, 1 rest 1 inc_octave - fade_wave 8 - channel_volume 9 +; cutoff 8 + volume_envelope 9, 0 note C_, 2 rest 1 rest 2 dec_octave - channel_volume 9 - fade_wave 4 + volume_envelope 9, 2 +; cutoff 4 note G_, 1 rest 2 note G_, 1 rest 1 vibrato 20, 3, 3 - fade_wave 8 +; cutoff 8 duty_cycle 1 - channel_volume 7 + volume_envelope 7, 0 note F#, 8 rest 1 duty_cycle 0 @@ -792,10 +792,10 @@ Music_Ronald_Ch2: ; faa0e (3e:6a0e) Branch_fab76: octave 2 - channel_volume 9 + volume_envelope 9, 2 speed 13 rest 2 - fade_wave 4 +; cutoff 4 note A#, 1 rest 2 note A#, 1 @@ -812,13 +812,13 @@ Branch_fab76: Branch_fab8a: octave 4 duty_cycle 1 - channel_volume 8 + volume_envelope 8, 0 speed 13 note C_, 1 - fade_wave 3 +; cutoff 3 note D_, 1 note E_, 1 - fade_wave 4 +; cutoff 4 note C_, 1 rest 1 dec_octave @@ -827,15 +827,15 @@ Branch_fab8a: note A#, 1 rest 1 inc_octave - fade_wave 8 +; cutoff 8 note C_, 1 - fade_wave 3 +; cutoff 3 note D_, 1 note E_, 1 - fade_wave 8 +; cutoff 8 note C_, 1 dec_octave - fade_wave 4 +; cutoff 4 note A_, 1 rest 1 note A#, 1 @@ -843,10 +843,10 @@ Branch_fab8a: Branch_fabb1: octave 2 - channel_volume 9 + volume_envelope 9, 2 speed 13 rest 2 - fade_wave 4 +; cutoff 4 note A#, 1 rest 2 note A#, 1 @@ -856,13 +856,13 @@ Branch_fabb1: sound_ret -Music_Ronald_Ch3: ; fabc0 (3e:6bc0) +Music_Ronald_Ch3: speed 1 - ;stereo_panning 1, 1 + stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 - ;echo 0 - ;cutoff 8 +; echo 0 +; cutoff 8 .MainLoop octave 2 .Loop1 @@ -1131,7 +1131,7 @@ Branch_facc5: sound_ret -Music_Ronald_Ch4: ; face0 (3e:6ce0) +Music_Ronald_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -1162,7 +1162,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 7 sound_loop 2, .Loop2 .Loop3 - ;rept 7 sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1174,7 +1173,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1186,7 +1184,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1198,7 +1195,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1210,7 +1206,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1222,7 +1217,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1234,7 +1228,6 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;--- sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f @@ -1246,25 +1239,19 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) drum_note 2, 13 drum_note 4, 6 drum_note 3, 7 - ;endr sound_call Branch_fad46 drum_note 4, 13 sound_call Branch_fad4f drum_note 3, 3 drum_note 3, 4 - ;rept 4 drum_note 2, 6 drum_note 2, 7 - ;--- drum_note 2, 6 drum_note 2, 7 - ;--- drum_note 2, 6 drum_note 2, 7 - ;--- drum_note 2, 6 drum_note 2, 7 - ;endr sound_loop 2, .Loop3 .Loop4 sound_call Branch_fad46 @@ -1288,14 +1275,13 @@ Music_Ronald_Ch4: ; face0 (3e:6ce0) sound_loop 0, .MainLoop Branch_fad46: - ; - ;sound_call Branch_fad4f +; sound_call Branch_fad4f drum_note 1, 13 drum_note 5, 6 drum_note 1, 7 drum_note 2, 13 drum_note 1, 6 - ; +; sound_ret drum_note 3, 7 drum_note 1, 13 drum_note 5, 6 @@ -1310,4 +1296,3 @@ Branch_fad4f: drum_note 2, 13 drum_note 1, 6 sound_ret -; 0xfad55 diff --git a/crysaudio/music/TCG/titlescreen.asm b/crysaudio/music/TCG/titlescreen.asm index 951dfe42..51c66894 100644 --- a/crysaudio/music/TCG/titlescreen.asm +++ b/crysaudio/music/TCG/titlescreen.asm @@ -5,271 +5,271 @@ Music_TCGTitleScreen: channel 3, Music_TCGTitleScreen_Ch3 channel 4, Music_TCGTitleScreen_Ch4 -Music_TCGTitleScreen_Ch1: ; f5052 (3d:5052) +Music_TCGTitleScreen_Ch1: speed 7 duty_cycle 0 - ;stereo_panning 1, 1 - ;vibrato_type 1 + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 octave 3 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note F_, 1 - fade_wave 8 +; cutoff 8 note E_, 3 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 13 - fade_wave 6 + volume_envelope 13, 0 +; cutoff 6 note C_, 2 dec_octave - fade_wave 8 +; cutoff 8 note G_, 10 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 13 + volume_envelope 13, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note G_, 1 - fade_wave 8 +; cutoff 8 note G_, 5 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note F_, 2 - fade_wave 8 +; cutoff 8 note F_, 2 speed 1 note E_, 5 - ;tie +; tie note F_, 4 - ;tie +; tie note E_, 5 speed 7 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 - fade_wave 8 + volume_envelope 10, 0 +; cutoff 8 note D_, 11 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 13 + volume_envelope 13, 0 note G_, 1 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note F_, 1 - fade_wave 8 +; cutoff 8 note E_, 3 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 - channel_volume 10 + volume_envelope 10, 0 note G_, 3 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 inc_octave - channel_volume 10 + volume_envelope 10, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 13 - fade_wave 6 + volume_envelope 13, 0 +; cutoff 6 note E_, 2 dec_octave - fade_wave 8 +; cutoff 8 note G_, 8 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 13 + volume_envelope 13, 0 note E_, 2 note F_, 2 note G_, 2 note G#, 3 - channel_volume 3 + volume_envelope 3, 7 note G#, 1 - channel_volume 13 + volume_envelope 13, 0 inc_octave note C_, 3 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note D_, 5 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 13 - fade_wave 6 + volume_envelope 13, 0 +; cutoff 6 note C_, 2 - fade_wave 8 +; cutoff 8 note G_, 9 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 13 + volume_envelope 13, 0 note F_, 2 note C_, 2 note D_, 2 .Loop1 note E_, 10 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note E_, 1 - channel_volume 3 + volume_envelope 3, 7 note E_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note E_, 1 - fade_wave 8 +; cutoff 8 sound_loop 2, .Loop1 note E_, 12 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 1 note C_, 1 note D_, 1 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 rest 1 - channel_volume 10 - fade_wave 6 + volume_envelope 10, 0 +; cutoff 6 note G_, 1 - fade_wave 8 +; cutoff 8 note G_, 8 - channel_volume 3 + volume_envelope 3, 7 note G_, 2 - channel_volume 10 + volume_envelope 10, 0 speed 1 - fade_wave 7 +; cutoff 7 note G_, 5 note G_, 4 note G_, 5 - fade_wave 8 +; cutoff 8 speed 7 note G_, 9 - channel_volume 3 + volume_envelope 3, 7 note G_, 1 - channel_volume 10 + volume_envelope 10, 0 note F_, 2 note C_, 2 note D_, 2 note E_, 10 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note C_, 1 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 rest 1 - fade_wave 6 - channel_volume 10 +; cutoff 6 + volume_envelope 10, 0 note E_, 1 - fade_wave 8 +; cutoff 8 note E_, 6 - channel_volume 3 + volume_envelope 3, 7 note E_, 2 - channel_volume 10 + volume_envelope 10, 0 note D_, 3 - channel_volume 3 + volume_envelope 3, 7 note D_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 3 - channel_volume 3 + volume_envelope 3, 7 note C_, 1 - channel_volume 10 + volume_envelope 10, 0 note C_, 6 - channel_volume 3 + volume_envelope 3, 7 note C_, 2 dec_octave - channel_volume 10 + volume_envelope 10, 0 note B_, 5 - channel_volume 3 + volume_envelope 3, 7 note B_, 2 - channel_volume 10 + volume_envelope 10, 0 inc_octave - fade_wave 6 +; cutoff 6 note C_, 1 - fade_wave 8 +; cutoff 8 note C_, 8 - ;tie +; tie note C_, 8 - ;tie +; tie note C_, 8 - channel_volume 3 + volume_envelope 3, 7 note C_, 8 sound_ret -Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) +Music_TCGTitleScreen_Ch2: speed 7 duty_cycle 0 - ;stereo_panning 1, 1 - ;vibrato_type 1 + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 20, 3, 3 - channel_volume 8 - fade_wave 8 + volume_envelope 8, 0 +; cutoff 8 octave 2 note B_, 1 - channel_volume 2 + volume_envelope 2, 7 note B_, 1 rest 1 inc_octave - channel_volume 8 - fade_wave 6 + volume_envelope 8, 0 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note C_, 3 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 3 rest 1 note G_, 5 rest 1 - fade_wave 6 +; cutoff 6 note G_, 2 - fade_wave 8 +; cutoff 8 note E_, 10 rest 2 note C_, 1 rest 2 - fade_wave 6 +; cutoff 6 note E_, 1 - fade_wave 8 +; cutoff 8 note F_, 5 rest 1 - fade_wave 6 +; cutoff 6 note C_, 2 - fade_wave 7 +; cutoff 7 note C_, 2 - fade_wave 8 +; cutoff 8 note C_, 2 dec_octave note G_, 1 @@ -280,29 +280,29 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) note A_, 1 rest 2 inc_octave - fade_wave 6 +; cutoff 6 note C_, 1 dec_octave - fade_wave 8 +; cutoff 8 note B_, 3 rest 1 note B_, 1 rest 2 inc_octave - fade_wave 6 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note C_, 3 - channel_volume 2 + volume_envelope 2, 7 note C_, 1 - channel_volume 8 + volume_envelope 8, 0 note E_, 3 rest 1 note G_, 5 rest 1 - fade_wave 6 +; cutoff 6 note G_, 2 - fade_wave 8 +; cutoff 8 note E_, 8 rest 2 note C_, 2 @@ -314,9 +314,9 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 1 note G#, 5 rest 1 - fade_wave 6 +; cutoff 6 note F_, 2 - fade_wave 8 +; cutoff 8 note G#, 9 rest 1 note G#, 2 @@ -327,64 +327,64 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 2 dec_octave note A_, 1 - channel_volume 2 + volume_envelope 2, 7 note A_, 1 rest 1 - channel_volume 8 + volume_envelope 8, 0 inc_octave - fade_wave 6 +; cutoff 6 note C_, 1 - fade_wave 8 +; cutoff 8 dec_octave note B_, 10 rest 2 note G_, 1 - channel_volume 2 + volume_envelope 2, 7 note G_, 1 rest 1 - channel_volume 8 - fade_wave 6 + volume_envelope 8, 0 +; cutoff 6 note B_, 1 - fade_wave 8 +; cutoff 8 note A_, 12 - channel_volume 2 + volume_envelope 2, 7 note A_, 2 - channel_volume 8 + volume_envelope 8, 0 note B_, 1 note A_, 1 note B_, 1 - channel_volume 2 + volume_envelope 2, 7 note B_, 1 rest 1 - channel_volume 8 + volume_envelope 8, 0 inc_octave - fade_wave 6 +; cutoff 6 note D_, 1 - fade_wave 8 +; cutoff 8 note D_, 8 rest 2 speed 1 - fade_wave 7 +; cutoff 7 note D_, 5 note D_, 4 note D_, 5 speed 7 - fade_wave 8 +; cutoff 8 note C_, 9 rest 1 note C_, 2 dec_octave - fade_wave 7 +; cutoff 7 note G#, 2 - fade_wave 8 +; cutoff 8 note G#, 2 note G_, 10 rest 2 note G_, 1 rest 2 - fade_wave 6 +; cutoff 6 note G_, 1 - fade_wave 8 +; cutoff 8 note A_, 6 rest 2 note F#, 3 @@ -395,13 +395,13 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 2 note F_, 5 rest 2 - fade_wave 6 +; cutoff 6 note F_, 1 - fade_wave 8 +; cutoff 8 note F_, 7 rest 1 speed 1 - fade_wave 8 +; cutoff 8 note F_, 14 rest 5 note D_, 13 @@ -410,18 +410,18 @@ Music_TCGTitleScreen_Ch2: ; f5193 (3d:5193) rest 5 speed 7 note E_, 8 - channel_volume 2 + volume_envelope 2, 7 note E_, 8 sound_ret -Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) +Music_TCGTitleScreen_Ch3: speed 7 fade_wave 14 channel_volume 1 - ;echo 0 - ;stereo_panning 1, 1 - ;cutoff 6 +; echo 0 + stereo_panning TRUE, TRUE +; cutoff 6 octave 3 rest 4 sound_call Branch_f52f0 @@ -486,17 +486,17 @@ Music_TCGTitleScreen_Ch3: ; f5286 (3d:5286) note C_, 4 speed 1 note C_, 9 - ;tie +; tie note C_, 10 dec_octave note G_, 9 - ;tie +; tie note G_, 9 note G_, 9 - ;tie +; tie note G_, 10 speed 7 - ;cutoff 8 +; cutoff 8 note C_, 8 sound_ret @@ -513,7 +513,7 @@ Branch_f52f0: sound_ret -Music_TCGTitleScreen_Ch4: ; f52fa (3d:52fa) +Music_TCGTitleScreen_Ch4: toggle_noise 6 drum_speed 7 octave 1 @@ -553,4 +553,3 @@ Branch_f531e: drum_note 3, 4 drum_note 3, 3 sound_ret -; 0xf532a From 867f70ab1ebb2842aaab05b738bc5583ae5c6444 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Fri, 13 Jan 2023 21:58:00 -0600 Subject: [PATCH 31/33] Update TCG songs --- crysaudio/music/TCG/club2.asm | 87 +--- crysaudio/music/TCG/dueltheme1.asm | 610 ++++++++++------------------ crysaudio/music/TCG/hallofhonor.asm | 153 ++----- crysaudio/music/TCG/medal.asm | 48 +-- crysaudio/music/TCG/overworld.asm | 422 ++++--------------- 5 files changed, 385 insertions(+), 935 deletions(-) diff --git a/crysaudio/music/TCG/club2.asm b/crysaudio/music/TCG/club2.asm index 0e574ad4..089c6b4d 100644 --- a/crysaudio/music/TCG/club2.asm +++ b/crysaudio/music/TCG/club2.asm @@ -8,26 +8,23 @@ Music_Club2_Ch1: speed 6 duty_cycle 2 stereo_panning TRUE, TRUE -; cutoff 8 -.MainLoop +.MainLoop: octave 4 -.Loop1 +.Loop1: volume_envelope 7, 5 note G_, 4 note E_, 4 note C_, 4 volume_envelope 7, 7 - note F#, 4 -; tie note F#, 16 + rest 4 volume_envelope 7, 5 note G_, 4 note A_, 4 note B_, 4 volume_envelope 7, 7 - note F#, 4 -; tie note F#, 16 + rest 4 sound_loop 8, .Loop1 volume_envelope 7, 5 note G_, 4 @@ -36,17 +33,15 @@ Music_Club2_Ch1: note B_, 4 inc_octave volume_envelope 7, 7 - note B_, 4 -; tie note B_, 16 + rest 4 volume_envelope 7, 5 note G_, 4 note D_, 4 note C_, 4 volume_envelope 7, 7 - note B_, 4 -; tie note B_, 16 + rest 4 dec_octave volume_envelope 7, 5 note F#, 4 @@ -83,29 +78,24 @@ Music_Club2_Ch1: note F#, 4 note A_, 4 note A_, 3 -; tie speed 1 note A_, 3 inc_octave volume_envelope 7, 7 rest 4 note D_, 5 -; tie speed 6 - note D_, 15 -; tie note D_, 16 + rest 15 sound_loop 0, .MainLoop - Music_Club2_Ch2: speed 6 duty_cycle 2 stereo_panning TRUE, TRUE -; cutoff 8 -.MainLoop +.MainLoop: octave 2 -.Loop1 +.Loop1: volume_envelope 7, 5 note C_, 4 note G_, 4 @@ -113,9 +103,8 @@ Music_Club2_Ch2: note G_, 4 inc_octave volume_envelope 7, 7 - note D_, 4 -; tie note D_, 16 + rest 4 dec_octave dec_octave volume_envelope 7, 5 @@ -125,9 +114,8 @@ Music_Club2_Ch2: inc_octave note C_, 4 volume_envelope 7, 7 - note D_, 4 -; tie note D_, 16 + rest 4 dec_octave dec_octave sound_loop 8, .Loop1 @@ -140,9 +128,8 @@ Music_Club2_Ch2: note G_, 4 inc_octave volume_envelope 7, 7 - note G_, 4 -; tie note G_, 16 + rest 4 dec_octave dec_octave dec_octave @@ -154,9 +141,8 @@ Music_Club2_Ch2: note A_, 4 inc_octave volume_envelope 7, 7 - note C_, 4 -; tie note C_, 16 + rest 4 dec_octave dec_octave volume_envelope 7, 5 @@ -195,7 +181,6 @@ Music_Club2_Ch2: inc_octave note D_, 4 note E_, 3 -; tie speed 1 note E_, 3 dec_octave @@ -204,26 +189,19 @@ Music_Club2_Ch2: inc_octave volume_envelope 7, 7 note F#, 7 -; tie speed 6 - note F#, 14 -; tie - note F#, 16 + note F#, 15 + rest 15 sound_loop 0, .MainLoop - Music_Club2_Ch3: speed 6 channel_volume 1 stereo_panning TRUE, TRUE fade_wave 10 -; vibrato_type 4 vibrato 35, 3, 3 -; cutoff 6 -; echo 64 -.MainLoop +.MainLoop: channel_volume 3 -; cutoff 8 rest 2 octave 5 note G_, 4 @@ -239,89 +217,62 @@ Music_Club2_Ch3: rest 2 rest 14 channel_volume 2 -; echo 96 sound_call Branch_fa1cf octave 5 -; cutoff 8 note G_, 8 sound_call Branch_fa1cf -; echo 64 channel_volume 1 octave 4 -; cutoff 8 note G_, 8 sound_call Branch_fa1f3 octave 4 note G_, 16 -; tie note G_, 12 rest 16 rest 8 -; cutoff 8 note E_, 8 sound_call Branch_fa1f3 octave 4 note G_, 16 -; tie note G_, 12 -; tie note G_, 16 -; tie note G_, 8 rest 4 -; cutoff 8 note A_, 2 note G_, 2 -; cutoff 6 note F#, 16 -; tie note F#, 12 rest 4 note F#, 1 -; tie note G_, 15 -; tie note G_, 12 rest 4 note G#, 1 -; tie note A_, 15 -; tie note A_, 16 rest 16 rest 16 -; echo 96 sound_loop 0, .MainLoop Branch_fa1cf: -; cutoff 6 octave 6 note C#, 1 -; tie note D_, 15 -; tie note D_, 12 -; cutoff 8 note C_, 2 dec_octave note B_, 2 -; cutoff 6 note G_, 16 -; tie note G_, 8 rest 4 -; cutoff 8 note E_, 4 note B_, 4 inc_octave note C_, 4 dec_octave note B_, 4 -; cutoff 6 note A_, 16 -; tie note A_, 8 -; tie note A_, 16 rest 4 sound_ret @@ -329,21 +280,16 @@ Branch_fa1cf: Branch_fa1f3: octave 5 note C#, 1 -; tie note D_, 15 -; tie note D_, 4 note E_, 4 dec_octave note B_, 4 inc_octave note C_, 4 -; cutoff 6 note D_, 16 -; tie note D_, 8 rest 4 -; cutoff 8 note C_, 2 dec_octave note B_, 2 @@ -351,5 +297,4 @@ Branch_fa1f3: note C_, 2 dec_octave note B_, 2 -; cutoff 6 sound_ret diff --git a/crysaudio/music/TCG/dueltheme1.asm b/crysaudio/music/TCG/dueltheme1.asm index 3903a442..d1e51f12 100644 --- a/crysaudio/music/TCG/dueltheme1.asm +++ b/crysaudio/music/TCG/dueltheme1.asm @@ -8,129 +8,119 @@ Music_DuelTheme1: Music_DuelTheme1_Ch1: speed 7 stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 20, 3, 3 -; cutoff 8 duty_cycle 2 -.MainLoop +.MainLoop: octave 2 -.Loop1 +.Loop1: rest 16 sound_loop 7, .Loop1 rest 9 -.Loop2 +.Loop2: rest 3 sound_call Branch_f54f9 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F_, 4 note F#, 3 -; tie speed 7 note F#, 1 volume_envelope 3, 7 note F#, 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 rest 2 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 10 volume_envelope 3, 7 note D_, 12 sound_call Branch_f54f9 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 2 volume_envelope 3, 7 note F#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 13 volume_envelope 3, 7 note A_, 10 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 1 volume_envelope 3, 7 note F#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 1 note G_, 1 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 15 volume_envelope 3, 7 note B_, 4 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 3 note A_, 3 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 2 volume_envelope 3, 7 note G_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 15 volume_envelope 3, 7 note A_, 4 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 3 note G_, 4 note F#, 2 volume_envelope 3, 7 note F#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 15 volume_envelope 3, 7 note G_, 4 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 3 note F#, 4 note E_, 3 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 4 note E_, 3 -; tie speed 7 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 13 volume_envelope 3, 7 note D_, 9 @@ -138,11 +128,10 @@ Music_DuelTheme1_Ch1: sound_loop 2, .Loop2 inc_octave duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 1 rest 1 @@ -154,28 +143,27 @@ Music_DuelTheme1_Ch1: speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 5 volume_envelope 3, 7 note F#, 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 inc_octave speed 1 note D_, 4 volume_envelope 3, 7 note D_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note F#, 4 volume_envelope 3, 7 note F#, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 4 volume_envelope 3, 7 note A_, 3 @@ -183,9 +171,8 @@ Music_DuelTheme1_Ch1: rest 3 dec_octave duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 -.Loop3 + volume_envelope 10, 8 +.Loop3: note A_, 1 rest 2 sound_loop 3, .Loop3 @@ -193,7 +180,6 @@ Music_DuelTheme1_Ch1: speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 1 rest 1 @@ -205,43 +191,37 @@ Music_DuelTheme1_Ch1: speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 5 -; tie note A_, 10 -; tie note A_, 6 volume_envelope 3, 7 note A_, 2 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 2 note C#, 1 volume_envelope 3, 7 note C#, 2 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 1 volume_envelope 3, 7 note B_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 1 volume_envelope 3, 7 note B_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 13 -; tie note A_, 6 volume_envelope 3, 7 note A_, 2 @@ -266,16 +246,13 @@ Music_DuelTheme1_Ch1: note A_, 4 dec_octave sound_call Branch_f5580 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 2 -; tie note A_, 8 -; tie note A_, 8 -; tie note A_, 6 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 dec_octave note B_, 4 @@ -290,98 +267,90 @@ Music_DuelTheme1_Ch1: note G_, 2 duty_cycle 2 sound_call Branch_f5580 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 5 note G_, 2 note F#, 2 volume_envelope 3, 7 note F#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 2 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 5 note F#, 2 note E_, 2 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 2 volume_envelope 3, 7 note D_, 2 - volume_envelope 10, 0 - note D_, 8 -; tie + volume_envelope 10, 8 + note D_, 8 note D_, 8 note D_, 8 -; tie note D_, 8 volume_envelope 3, 7 note D_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 12 volume_envelope 3, 7 note D_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 6 -; tie note D_, 8 rest 4 sound_loop 0, .MainLoop Branch_f54f9: octave 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 note B_, 1 inc_octave note D_, 1 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F_, 4 note F#, 3 -; tie speed 7 note F#, 10 volume_envelope 3, 7 note F#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 3 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note D#, 4 note E_, 3 -; tie speed 7 note E_, 5 volume_envelope 3, 7 note E_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 2 note F#, 1 volume_envelope 3, 7 note F#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 1 volume_envelope 3, 7 note E_, 1 @@ -396,118 +365,113 @@ Branch_f5538: note G_, 1 rest 2 duty_cycle 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 inc_octave speed 1 note C_, 4 volume_envelope 3, 7 note C_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 4 volume_envelope 3, 7 note E_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 4 volume_envelope 3, 7 note G_, 3 speed 7 rest 3 duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 dec_octave -.Loop4 +.Loop4: note G_, 1 rest 2 sound_loop 3, .Loop4 inc_octave duty_cycle 2 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 2 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 sound_ret Branch_f5580: speed 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 4 note F#, 3 -; tie speed 7 note F#, 9 volume_envelope 3, 7 note F#, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note B_, 2 volume_envelope 3, 7 note B_, 2 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note F_, 4 note F#, 3 -; tie speed 7 note F#, 7 note E_, 1 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 1 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 2 volume_envelope 3, 7 note C#, 1 dec_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 9 note F#, 1 volume_envelope 3, 7 note F#, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 8 volume_envelope 3, 7 note B_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 4 note G_, 4 note F#, 10 note G_, 1 volume_envelope 3, 7 note G_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 1 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 10 note E_, 2 note F#, 2 @@ -515,25 +479,21 @@ Branch_f5580: note F#, 2 sound_ret - Music_DuelTheme1_Ch2: speed 7 stereo_panning TRUE, TRUE -; vibrato_type 8 vibrato 20, 3, 3 -; cutoff 8 -.MainLoop +.MainLoop: duty_cycle 1 - volume_envelope 9, 0 + volume_envelope 9, 8 octave 2 -.Loop1 +.Loop1: note D_, 1 rest 2 note D_, 1 rest 2 note D_, 1 - rest 2 - rest 1 + rest 3 dec_octave note A_, 1 rest 1 @@ -542,15 +502,15 @@ Music_DuelTheme1_Ch2: rest 2 inc_octave sound_loop 4, .Loop1 -.Loop2 +.Loop2: octave 2 note D_, 1 rest 2 note D_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note A_, 2 + note A_, 1 + rest 1 sound_call Branch_f59f9 sound_loop 4, .Loop2 octave 2 @@ -560,8 +520,8 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 sound_call Branch_f59f9 octave 2 note D_, 1 @@ -570,12 +530,11 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note C_, 2 + note C_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -584,16 +543,14 @@ Music_DuelTheme1_Ch2: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note G_, 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 1 rest 2 inc_octave -.Loop3 +.Loop3: octave 2 note D_, 1 rest 2 @@ -601,8 +558,8 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 sound_call Branch_f59f9 sound_loop 3, .Loop3 octave 2 @@ -612,12 +569,11 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note C_, 2 + note C_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -626,12 +582,10 @@ Music_DuelTheme1_Ch2: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note G_, 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 1 rest 2 inc_octave @@ -641,8 +595,8 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 sound_call Branch_f59f9 octave 2 note D_, 1 @@ -651,47 +605,41 @@ Music_DuelTheme1_Ch2: duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 2 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note F#, 1 rest 1 -.Loop4 +.Loop4: note G_, 1 rest 2 note G_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note G_, 2 + note G_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note G_, 1 rest 3 note D_, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note G_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 2 sound_loop 2, .Loop4 @@ -700,9 +648,9 @@ Music_DuelTheme1_Ch2: note F#, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 inc_octave - note C#, 2 + note C#, 1 + rest 1 sound_call Branch_f5a17 octave 2 note F#, 1 @@ -711,30 +659,27 @@ Music_DuelTheme1_Ch2: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note E_, 2 + note E_, 1 + rest 1 sound_call Branch_f5a17 note E_, 1 rest 2 note E_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note G_, 2 + note G_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note B_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note G_, 1 rest 2 note A_, 1 @@ -742,22 +687,19 @@ Music_DuelTheme1_Ch2: note A_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note G_, 2 + note G_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note A_, 1 rest 3 note E_, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note A_, 1 rest 2 note D_, 1 @@ -765,11 +707,10 @@ Music_DuelTheme1_Ch2: note D_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note A_, 2 + note A_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -778,12 +719,10 @@ Music_DuelTheme1_Ch2: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 1 rest 2 inc_octave @@ -792,11 +731,10 @@ Music_DuelTheme1_Ch2: note D_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note A_, 2 + note A_, 1 + rest 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -804,46 +742,41 @@ Music_DuelTheme1_Ch2: rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 -; frequency_offset 0 + volume_envelope 7, 8 note E_, 1 note F#, 1 note A_, 1 rest 1 - volume_envelope 7, 0 + volume_envelope 7, 8 sound_call Branch_f594d - volume_envelope 7, 0 + volume_envelope 7, 8 octave 3 speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 1 rest 1 dec_octave note F#, 1 volume_envelope 10, 2 -; cutoff 6 - note F#, 2 - volume_envelope 7, 0 -; cutoff 8 + note F#, 1 + rest 1 + volume_envelope 7, 8 note A_, 10 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 inc_octave - note D_, 2 + note D_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -851,38 +784,36 @@ Music_DuelTheme1_Ch2: rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 1 note F#, 1 note A_, 1 rest 1 sound_call Branch_f594d - volume_envelope 7, 0 + volume_envelope 7, 8 octave 3 note D_, 2 rest 1 note F#, 13 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 2 note D_, 1 duty_cycle 2 inc_octave volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note D_, 1 rest 1 note D_, 1 @@ -892,23 +823,20 @@ Music_DuelTheme1_Ch2: speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 15 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note G_, 1 rest 2 note G_, 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 2 rest 1 @@ -916,36 +844,31 @@ Music_DuelTheme1_Ch2: rest 1 dec_octave volume_envelope 10, 2 -; cutoff 6 note G_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note E_, 4 note F#, 3 -; tie speed 7 note F#, 15 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note F#, 1 rest 2 note F#, 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note E_, 4 note F#, 3 -; tie speed 7 note F#, 2 rest 1 @@ -953,35 +876,30 @@ Music_DuelTheme1_Ch2: rest 1 dec_octave volume_envelope 10, 2 -; cutoff 6 note A_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 2 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note D#, 4 note E_, 3 -; tie speed 7 note E_, 15 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note A_, 1 rest 2 note A_, 1 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note A#, 4 note B_, 3 -; tie speed 7 note B_, 2 rest 1 @@ -992,36 +910,31 @@ Music_DuelTheme1_Ch2: speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 1 rest 1 note F#, 13 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 2 note D_, 1 inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 - note D_, 2 + note D_, 1 + rest 1 dec_octave -; frequency_offset 0 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 2 sound_call Branch_f59b4 octave 3 speed 1 - volume_envelope 7, 0 + volume_envelope 7, 8 note F_, 4 note F#, 3 -; tie speed 7 note F#, 1 rest 1 @@ -1041,23 +954,20 @@ Music_DuelTheme1_Ch2: rest 3 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 -.Loop5 + volume_envelope 9, 8 +.Loop5: note D_, 1 rest 2 sound_loop 3, .Loop5 sound_call Branch_f59b4 - volume_envelope 8, 0 + volume_envelope 8, 8 octave 3 note D_, 16 -; tie note D_, 6 rest 2 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 2 note A_, 1 @@ -1094,12 +1004,11 @@ Music_DuelTheme1_Ch2: speed 7 sound_call Branch_f598c note D_, 8 -; tie note D_, 8 note C#, 6 dec_octave duty_cycle 1 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note G_, 4 note G#, 3 @@ -1127,10 +1036,8 @@ Music_DuelTheme1_Ch2: note A_, 2 rest 2 note G_, 8 -; tie note G_, 8 note F#, 8 -; tie note F#, 8 rest 2 note G_, 12 @@ -1144,51 +1051,46 @@ Branch_f594d: speed 1 note C#, 4 note D_, 3 -; tie speed 7 note D_, 9 dec_octave duty_cycle 1 - volume_envelope 9, 0 + volume_envelope 9, 8 dec_octave note A_, 1 rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note A_, 3 rest 1 inc_octave note C_, 6 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 1 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note D#, 4 note E_, 3 -; tie speed 7 note E_, 2 note D_, 1 dec_octave volume_envelope 10, 2 -; cutoff 6 note G_, 2 inc_octave - volume_envelope 7, 0 -; cutoff 8 + volume_envelope 7, 8 note C_, 1 rest 1 sound_ret Branch_f598c: - volume_envelope 8, 0 + volume_envelope 8, 8 note D_, 10 rest 2 note E_, 1 @@ -1225,16 +1127,14 @@ Branch_f598c: note D_, 2 rest 2 note D_, 2 -; tie sound_ret Branch_f59b4: octave 2 - volume_envelope 8, 0 + volume_envelope 8, 8 speed 1 note G#, 4 note A_, 3 -; tie speed 7 note A_, 1 rest 1 @@ -1249,7 +1149,7 @@ Branch_f59b4: note C_, 1 rest 2 duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 note E_, 1 speed 1 note G_, 4 @@ -1261,21 +1161,19 @@ Branch_f59b4: rest 3 speed 7 rest 3 -; cutoff 8 dec_octave duty_cycle 1 - volume_envelope 8, 0 -.Loop6 + volume_envelope 8, 8 +.Loop6: note C_, 1 rest 2 sound_loop 3, .Loop6 inc_octave duty_cycle 2 - volume_envelope 7, 0 + volume_envelope 7, 8 speed 1 note F#, 4 note G_, 3 -; tie speed 7 note G_, 2 note F#, 1 @@ -1287,8 +1185,7 @@ Branch_f59b4: Branch_f59f9: octave 2 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note D_, 1 rest 3 dec_octave @@ -1297,12 +1194,10 @@ Branch_f59f9: inc_octave duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 1 dec_octave duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note B_, 1 rest 2 sound_ret @@ -1310,54 +1205,46 @@ Branch_f59f9: Branch_f5a17: octave 2 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note F#, 1 rest 3 note C#, 1 rest 1 duty_cycle 2 volume_envelope 10, 2 -; cutoff 6 note A_, 1 duty_cycle 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 note E_, 1 rest 2 sound_ret - Music_DuelTheme1_Ch3: speed 7 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 14 -; echo 96 -; cutoff 8 octave 2 -.MainLoop -.Loop1 +.MainLoop: +.Loop1: note D_, 1 rest 2 note D_, 1 rest 2 note D_, 1 - rest 2 - rest 1 + rest 3 sound_call Branch_f5c47 sound_loop 4, .Loop1 -.Loop2 +.Loop2: note D_, 1 rest 2 note D_, 1 inc_octave inc_octave -; cutoff 3 - note D_, 2 + note D_, 1 + rest 1 dec_octave dec_octave -; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1367,10 +1254,9 @@ Music_DuelTheme1_Ch3: rest 2 note D_, 1 inc_octave -; cutoff 3 - note F#, 2 + note F#, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1379,11 +1265,10 @@ Music_DuelTheme1_Ch3: note D_, 1 inc_octave inc_octave -; cutoff 3 - note D_, 2 + note D_, 1 + rest 1 dec_octave dec_octave -; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1392,10 +1277,9 @@ Music_DuelTheme1_Ch3: rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 sound_call Branch_f5c47 @@ -1403,10 +1287,9 @@ Music_DuelTheme1_Ch3: rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 2 note D_, 2 @@ -1425,7 +1308,7 @@ Music_DuelTheme1_Ch3: note C_, 1 rest 1 dec_octave -.Loop3 +.Loop3: note D_, 1 rest 2 sound_loop 3, .Loop3 @@ -1443,7 +1326,7 @@ Music_DuelTheme1_Ch3: rest 3 dec_octave dec_octave -.Loop4 +.Loop4: note D_, 1 rest 2 sound_loop 3, .Loop4 @@ -1462,36 +1345,29 @@ Music_DuelTheme1_Ch3: rest 1 sound_call Branch_f5c60 octave 2 -; cutoff 8 note E_, 1 rest 1 note E_, 2 -; cutoff 6 note B_, 2 sound_call Branch_f5c60 octave 2 -; cutoff 8 note F#, 2 note G_, 2 -; cutoff 6 note G#, 2 sound_call Branch_f5c6f octave 2 -; cutoff 8 note A_, 1 rest 1 note A_, 2 -; cutoff 6 note E_, 2 sound_call Branch_f5c6f octave 2 -; cutoff 8 note B_, 2 inc_octave note C_, 2 note C#, 2 dec_octave -.Loop5 +.Loop5: sound_call Branch_f5c4d note E_, 1 rest 1 @@ -1503,9 +1379,7 @@ Music_DuelTheme1_Ch3: rest 1 note E_, 1 rest 1 -; cutoff 7 note E_, 1 -; cutoff 8 note E_, 1 rest 1 note E_, 2 @@ -1519,9 +1393,7 @@ Music_DuelTheme1_Ch3: rest 1 note F#, 1 rest 1 -; cutoff 7 note F#, 1 -; cutoff 8 note F#, 1 rest 1 note F#, 2 @@ -1535,9 +1407,7 @@ Music_DuelTheme1_Ch3: rest 1 note G_, 1 rest 1 -; cutoff 7 note G_, 1 -; cutoff 8 note F#, 1 rest 1 note E_, 2 @@ -1552,9 +1422,7 @@ Music_DuelTheme1_Ch3: rest 1 note B_, 1 rest 1 -; cutoff 7 note B_, 1 -; cutoff 8 note F#, 1 rest 1 note F_, 2 @@ -1583,7 +1451,7 @@ Music_DuelTheme1_Ch3: note E_, 2 note C#, 2 sound_loop 2, .Loop5 -.Loop6 +.Loop6: sound_call Branch_f5c4d sound_loop 2, .Loop6 note D_, 1 @@ -1596,9 +1464,7 @@ Music_DuelTheme1_Ch3: rest 1 note D_, 1 rest 1 -; cutoff 7 note D_, 1 -; cutoff 8 note D_, 1 rest 1 note A_, 14 @@ -1610,97 +1476,81 @@ Branch_f5b8d: rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note G_, 2 + note G_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret -.Loop7 +.Loop7: note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret sound_loop 3, .Loop7 note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note G_, 2 + note G_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 -; sound_call Branch_f5c47 note A_, 1 rest 1 note A_, 1 note B_, 1 rest 2 -; sound_ret note D_, 1 rest 2 note D_, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note D_, 1 rest 3 note D_, 1 @@ -1708,15 +1558,14 @@ Branch_f5b8d: note E_, 2 note F#, 1 rest 1 -.Loop8 +.Loop8: note G_, 1 rest 2 note G_, 1 inc_octave -; cutoff 3 - note B_, 2 + note B_, 1 + rest 1 dec_octave -; cutoff 8 note G_, 1 rest 3 note D_, 1 @@ -1729,10 +1578,9 @@ Branch_f5b8d: rest 2 note F#, 1 inc_octave -; cutoff 3 - note A_, 2 + note A_, 1 + rest 1 dec_octave -; cutoff 8 note F#, 1 rest 3 note C#, 1 @@ -1745,11 +1593,10 @@ Branch_f5b8d: note F#, 1 inc_octave inc_octave -; cutoff 3 - note C#, 2 + note C#, 1 + rest 1 dec_octave dec_octave -; cutoff 8 note F#, 1 rest 3 note C#, 1 @@ -1761,10 +1608,9 @@ Branch_f5b8d: rest 2 note E_, 1 inc_octave -; cutoff 3 - note B_, 2 + note B_, 1 + rest 1 dec_octave -; cutoff 8 note E_, 1 rest 3 note E_, 1 @@ -1776,10 +1622,9 @@ Branch_f5b8d: rest 2 note A_, 1 inc_octave -; cutoff 3 - note B_, 2 + note B_, 1 + rest 1 dec_octave -; cutoff 8 note A_, 1 rest 3 note E_, 1 @@ -1808,9 +1653,7 @@ Branch_f5c4d: rest 1 note D_, 1 rest 1 -; cutoff 7 note D_, 1 -; cutoff 8 note D_, 1 rest 1 note D_, 2 @@ -1818,7 +1661,6 @@ Branch_f5c4d: Branch_f5c60: octave 2 -; cutoff 8 note E_, 1 rest 1 note E_, 1 @@ -1827,13 +1669,11 @@ Branch_f5c60: rest 1 note E_, 1 rest 1 -; cutoff 6 note E_, 1 sound_ret Branch_f5c6f: octave 2 -; cutoff 8 note A_, 1 rest 1 note A_, 1 @@ -1842,13 +1682,12 @@ Branch_f5c6f: rest 1 note A_, 1 rest 1 -; cutoff 6 note A_, 1 sound_ret Branch_f5c7e: octave 2 -.Loop9 +.Loop9: note C_, 1 rest 2 sound_loop 3, .Loop9 @@ -1866,19 +1705,18 @@ Branch_f5c7e: rest 3 dec_octave dec_octave -.Loop10 +.Loop10: note C_, 1 rest 2 sound_loop 3, .Loop10 sound_ret - Music_DuelTheme1_Ch4: toggle_noise 6 drum_speed 7 octave 1 -.MainLoop -.Loop1 +.MainLoop: +.Loop1: drum_note 1, 2 drum_note 4, 1 drum_note 5, 1 @@ -1909,15 +1747,15 @@ Music_DuelTheme1_Ch4: drum_note 2, 1 drum_note 2, 1 drum_note 2, 2 -.Loop2 +.Loop2: sound_call Branch_f5d39 sound_loop 3, .Loop2 sound_call Branch_f5d46 -.Loop3 +.Loop3: sound_call Branch_f5d39 sound_loop 15, .Loop3 sound_call Branch_f5d46 -.Loop4 +.Loop4: sound_call Branch_f5d39 sound_loop 15, .Loop4 drum_note 1, 2 @@ -1932,10 +1770,10 @@ Music_DuelTheme1_Ch4: drum_note 3, 4 drum_note 3, 3 drum_speed 7 -.Loop5 +.Loop5: drum_note 2, 1 sound_loop 4, .Loop5 -.Loop6 +.Loop6: drum_note 1, 1 drum_note 4, 1 drum_note 5, 1 @@ -1962,22 +1800,22 @@ Music_DuelTheme1_Ch4: drum_note 3, 4 drum_note 3, 3 drum_speed 7 -.Loop7 +.Loop7: drum_note 2, 1 sound_loop 4, .Loop7 -.Loop8 +.Loop8: sound_call Branch_f5d39 sound_loop 3, .Loop8 sound_call Branch_f5d58 -.Loop9 +.Loop9: sound_call Branch_f5d39 sound_loop 7, .Loop9 sound_call Branch_f5d46 -.Loop10 +.Loop10: sound_call Branch_f5d39 sound_loop 7, .Loop10 sound_call Branch_f5d58 -.Loop11 +.Loop11: sound_call Branch_f5d39 sound_loop 2, .Loop11 drum_note 1, 2 @@ -2036,7 +1874,7 @@ Branch_f5d58: drum_note 3, 4 drum_note 3, 3 drum_speed 7 -.Loop12 +.Loop12: drum_note 2, 1 sound_loop 8, .Loop12 sound_ret diff --git a/crysaudio/music/TCG/hallofhonor.asm b/crysaudio/music/TCG/hallofhonor.asm index 00a69b1a..d3fd1a0d 100644 --- a/crysaudio/music/TCG/hallofhonor.asm +++ b/crysaudio/music/TCG/hallofhonor.asm @@ -7,13 +7,12 @@ Music_HallOfHonor: Music_HallOfHonor_Ch1: speed 7 stereo_panning TRUE, TRUE -; cutoff 8 duty_cycle 2 -.Loop1 +.Loop1: sound_call Branch_fb016 sound_loop 4, .Loop1 -.MainLoop -.Loop2 +.MainLoop: +.Loop2: sound_call Branch_fb016 sound_loop 8, .Loop2 octave 4 @@ -22,7 +21,7 @@ Music_HallOfHonor_Ch1: volume_envelope 2, 7 note C_, 1 sound_call Branch_fb044 -.Loop3 +.Loop3: volume_envelope 5, 5 note C_, 1 volume_envelope 2, 7 @@ -97,20 +96,17 @@ Branch_fb044: note F_, 1 sound_ret - Music_HallOfHonor_Ch2: speed 7 stereo_panning TRUE, TRUE -; cutoff 8 duty_cycle 2 -; frequency_offset -1 rest 2 speed 1 rest 4 speed 7 volume_envelope 1, 7 -.Loop1 - sound_call Branch_fb1ec +.Loop1: + sound_call Branch_fb1ec_Ch2 sound_loop 3, .Loop1 octave 4 note C_, 1 @@ -129,72 +125,75 @@ Music_HallOfHonor_Ch2: speed 1 rest 3 speed 7 -; frequency_offset 0 -.MainLoop +.MainLoop: octave 1 duty_cycle 1 -.Loop2 +.Loop2: sound_call Branch_fb0bb octave 1 volume_envelope 6, -5 - note E_, 5 - volume_envelope 13, 0 - note E_, 11 -; tie - note E_, 12 + note E_, 14 + volume_envelope 13, 8 + note E_, 14 sound_loop 3, .Loop2 sound_call Branch_fb0bb octave 1 volume_envelope 6, -5 - note G_, 5 - volume_envelope 13, 0 - note G_, 11 -; tie - note G_, 12 + note G_, 14 + volume_envelope 13, 8 + note G_, 14 sound_loop 0, .MainLoop Branch_fb0bb: octave 1 volume_envelope 6, -5 - note F_, 5 - volume_envelope 13, 0 - note F_, 11 -; tie - note F_, 12 + note F_, 14 + volume_envelope 13, 8 + note F_, 14 volume_envelope 6, -5 - note E_, 5 - volume_envelope 13, 0 - note E_, 11 -; tie - note E_, 12 + note E_, 14 + volume_envelope 13, 8 + note E_, 14 volume_envelope 6, -5 - note D_, 5 - volume_envelope 13, 0 - note D_, 11 -; tie - note D_, 12 + note D_, 14 + volume_envelope 13, 8 + note D_, 14 sound_ret +Branch_fb1ec_Ch2: + octave 5 + note C_, 1 + rest 1 + note F_, 1 + rest 1 + note G_, 1 + rest 1 + note F_, 1 + rest 1 + inc_octave + note C_, 1 + rest 1 + dec_octave + note F_, 1 + rest 1 + note G_, 1 + rest 1 + sound_ret Music_HallOfHonor_Ch3: speed 7 channel_volume 2 stereo_panning TRUE, TRUE fade_wave 12 -; vibrato_type 4 vibrato 35, 2, 4 -; cutoff 6 -; echo 64 rest 3 channel_volume 3 -; cutoff 8 -; frequency_offset -1 -.Loop1 +.Loop1: rest 14 sound_loop 4, .Loop1 -.MainLoop +.MainLoop: octave 6 -.Loop2 +.Loop2: sound_call Branch_fb1ec sound_loop 7, .Loop2 note C_, 1 @@ -211,175 +210,113 @@ Music_HallOfHonor_Ch3: dec_octave note F_, 1 channel_volume 1 -; frequency_offset 0 octave 5 speed 1 -; cutoff 6 note B_, 3 inc_octave note C_, 4 -; tie speed 7 note C_, 15 -; tie note C_, 8 dec_octave -; cutoff 8 note B_, 2 -; cutoff 4 note A_, 2 -; cutoff 6 note G_, 6 note C_, 10 -; tie note C_, 12 speed 1 -; cutoff 8 note B_, 3 inc_octave -; cutoff 6 note C_, 4 -; tie speed 7 note C_, 15 -; tie note C_, 6 dec_octave -; cutoff 8 note B_, 2 inc_octave note C_, 2 -; cutoff 4 note D_, 2 dec_octave speed 1 -; cutoff 8 note F#, 3 -; cutoff 6 note G_, 4 -; tie speed 7 note G_, 15 -; tie note G_, 6 -; cutoff 8 note G_, 2 note A_, 2 -; cutoff 4 note B_, 2 speed 1 -; cutoff 8 note B_, 3 inc_octave note C_, 4 -; tie speed 7 note C_, 15 -; tie note C_, 8 dec_octave note B_, 2 -; cutoff 4 note A_, 2 -; cutoff 6 note G_, 6 -; cutoff 8 speed 1 note B_, 3 inc_octave -; cutoff 6 note C_, 4 -; tie speed 7 note C_, 9 -; tie note C_, 6 dec_octave -; cutoff 8 note G_, 2 inc_octave note C_, 2 -; cutoff 4 note E_, 2 speed 1 -; cutoff 8 note E_, 3 note F_, 4 -; tie speed 7 note F_, 1 note E_, 2 -; cutoff 4 note C_, 2 -; cutoff 7 note C_, 10 -; tie note C_, 10 -; cutoff 4 note E_, 2 speed 1 -; cutoff 8 note E_, 3 note F_, 4 -; tie speed 7 note F_, 1 note E_, 2 -; cutoff 4 note C_, 2 -; cutoff 6 note C_, 10 -; tie note C_, 12 speed 1 -; cutoff 8 note F#, 3 -; cutoff 7 note G_, 4 -; tie speed 7 note G_, 15 -; tie note G_, 8 -; cutoff 8 note F_, 2 -; cutoff 4 note E_, 2 -; cutoff 8 note F_, 2 -; cutoff 4 note E_, 2 note C_, 2 dec_octave -; cutoff 7 note G_, 10 -; tie note G_, 10 -; cutoff 8 note E_, 2 note F_, 2 inc_octave -; cutoff 4 note C_, 2 -; cutoff 7 note C_, 12 -; tie note C_, 10 dec_octave -; cutoff 8 note E_, 2 note F_, 2 inc_octave -; cutoff 4 note C_, 2 -; cutoff 6 note C_, 12 -; tie note C_, 12 rest 3 channel_volume 3 -; frequency_offset -1 -; cutoff 8 sound_loop 0, .MainLoop Branch_fb1ec: diff --git a/crysaudio/music/TCG/medal.asm b/crysaudio/music/TCG/medal.asm index a78e973d..f4840946 100644 --- a/crysaudio/music/TCG/medal.asm +++ b/crysaudio/music/TCG/medal.asm @@ -6,12 +6,10 @@ Music_Medal: Music_Medal_Ch1: stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 octave 2 duty_cycle 1 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 1 note E_, 5 note A_, 5 @@ -33,49 +31,40 @@ Music_Medal_Ch1: note E_, 5 speed 15 note A_, 2 -; tie speed 1 note A_, 10 volume_envelope 3, 7 note A_, 5 - volume_envelope 10, 0 -; cutoff 7 + volume_envelope 10, 8 note A_, 5 note A_, 5 note A_, 5 -; cutoff 8 note A_, 15 volume_envelope 3, 7 note A_, 5 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 16 volume_envelope 3, 7 note A_, 5 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 16 volume_envelope 3, 7 note A_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 9 - note A_, 5 -; tie - note A_, 8 -; tie + note A_, 13 speed 1 note A_, 2 volume_envelope 3, 7 note A_, 16 sound_ret - Music_Medal_Ch2: stereo_panning TRUE, TRUE -; vibrato_type 1 vibrato 20, 3, 3 -; cutoff 8 octave 1 duty_cycle 0 - volume_envelope 9, 0 + volume_envelope 9, 8 speed 1 note A_, 5 inc_octave @@ -96,61 +85,49 @@ Music_Medal_Ch2: inc_octave speed 15 note C_, 2 -; tie speed 1 note C_, 10 volume_envelope 2, 7 note C_, 5 - volume_envelope 10, 0 -; cutoff 7 + volume_envelope 10, 8 note C_, 5 note C_, 5 note C_, 5 -; cutoff 8 note D_, 15 volume_envelope 3, 7 note D_, 5 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 16 volume_envelope 2, 7 note D_, 5 - volume_envelope 9, 0 + volume_envelope 9, 8 note D_, 16 volume_envelope 3, 7 note D_, 6 - volume_envelope 9, 0 + volume_envelope 9, 8 speed 9 - note C#, 5 -; tie - note C#, 8 -; tie + note C#, 13 speed 1 note C#, 2 volume_envelope 2, 7 note C#, 16 sound_ret - Music_Medal_Ch3: stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 -; cutoff 8 -; echo 0 octave 2 speed 1 speed 15 rest 4 note F_, 2 -; tie speed 1 note F_, 10 rest 5 -; cutoff 7 note F_, 5 note F_, 5 note F_, 5 -; cutoff 8 note A#, 15 rest 5 note A#, 16 @@ -159,7 +136,6 @@ Music_Medal_Ch3: rest 6 speed 9 note A_, 13 -; tie speed 1 note A_, 2 sound_ret diff --git a/crysaudio/music/TCG/overworld.asm b/crysaudio/music/TCG/overworld.asm index ee0ecc4b..149f4e7d 100644 --- a/crysaudio/music/TCG/overworld.asm +++ b/crysaudio/music/TCG/overworld.asm @@ -9,35 +9,32 @@ Music_Overworld_Ch1: speed 7 duty_cycle 0 stereo_panning TRUE, TRUE -; vibrato_type 9 vibrato 25, 3, 3 volume_envelope 10, 2 -; cutoff 7 octave 3 rest 3 sound_call Branch_f72ba rest 3 -.MainLoop +.MainLoop: sound_call Branch_f72ba duty_cycle 1 -; cutoff 8 octave 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 5 volume_envelope 3, 7 note A_, 1 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 5 volume_envelope 3, 7 note C_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 3 speed 1 note E_, 11 volume_envelope 3, 7 note E_, 10 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 7 note G_, 3 speed 1 @@ -45,43 +42,41 @@ Music_Overworld_Ch1: volume_envelope 3, 7 note F_, 10 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 12 volume_envelope 3, 7 note C_, 2 duty_cycle 0 volume_envelope 9, 2 -; cutoff 7 octave 3 note E_, 4 note E_, 3 note E_, 3 duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 sound_call Branch_f72fb note C_, 6 volume_envelope 3, 7 note C_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 note D_, 3 note E_, 3 note G_, 6 volume_envelope 3, 7 note G_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 4 volume_envelope 3, 7 note F_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 dec_octave note A_, 6 note A#, 9 volume_envelope 3, 7 note A#, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note A#, 3 inc_octave note D_, 3 @@ -89,115 +84,101 @@ Music_Overworld_Ch1: note A_, 3 volume_envelope 3, 7 note A_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 volume_envelope 3, 7 note G_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 3 note D_, 3 volume_envelope 3, 7 note D_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note E_, 2 volume_envelope 3, 7 note E_, 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 note C_, 9 volume_envelope 3, 7 note C_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 dec_octave note A_, 3 inc_octave speed 1 note C_, 11 - volume_envelope 4, 0 + volume_envelope 4, 8 note C_, 10 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 3 speed 1 note F_, 11 - volume_envelope 4, 0 + volume_envelope 4, 8 note F_, 10 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 12 volume_envelope 3, 7 note C_, 6 duty_cycle 2 -; cutoff 8 volume_envelope 5, -7 octave 4 note G_, 1 -; tie note E_, 1 -; tie note C_, 1 -; tie dec_octave note G_, 1 -; tie note E_, 1 -; tie note C_, 1 duty_cycle 1 - volume_envelope 10, 0 -; cutoff 8 + volume_envelope 10, 8 sound_call Branch_f72fb note C_, 6 volume_envelope 3, 7 note C_, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 note D_, 3 note E_, 3 note F_, 9 volume_envelope 3, 7 note F_, 12 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 2 note G_, 1 note A_, 1 volume_envelope 3, 7 note A_, 2 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 12 volume_envelope 3, 7 note A_, 3 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 3 note A_, 3 note A#, 9 volume_envelope 3, 7 note A#, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 5 volume_envelope 3, 7 note A_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note G_, 5 volume_envelope 3, 7 note G_, 1 - volume_envelope 9, 0 + volume_envelope 9, 8 note F_, 8 -; tie note F_, 8 -; tie note F_, 8 -; tie note F_, 8 -; tie note F_, 8 -; tie note F_, 8 volume_envelope 3, 7 note F_, 3 duty_cycle 0 volume_envelope 10, 2 -; cutoff 7 sound_loop 0, .MainLoop Branch_f72ba: @@ -206,23 +187,20 @@ Branch_f72ba: note F_, 2 note A_, 1 inc_octave - volume_envelope 10, 0 -; cutoff 4 + volume_envelope 10, 8 note C_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 - note A#, 3 + note A#, 2 + rest 1 note A#, 1 inc_octave - volume_envelope 10, 0 -; cutoff 4 + volume_envelope 10, 8 note D_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note G_, 3 note A#, 3 rest 3 @@ -230,22 +208,19 @@ Branch_f72ba: note A_, 2 inc_octave note C_, 1 - volume_envelope 10, 0 -; cutoff 4 + volume_envelope 10, 8 note C_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 - note A#, 3 + note A#, 2 + rest 1 note A#, 1 inc_octave - volume_envelope 10, 0 -; cutoff 4 + volume_envelope 10, 8 note D_, 1 rest 2 volume_envelope 9, 2 -; cutoff 7 note C_, 3 dec_octave note A#, 3 @@ -253,15 +228,15 @@ Branch_f72ba: Branch_f72fb: octave 4 - volume_envelope 10, 0 + volume_envelope 10, 8 note D_, 5 volume_envelope 3, 7 note D_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note F_, 5 volume_envelope 3, 7 note F_, 1 - volume_envelope 10, 0 + volume_envelope 10, 8 note A_, 3 speed 1 note G_, 11 @@ -269,7 +244,7 @@ Branch_f72fb: note G_, 10 speed 7 inc_octave - volume_envelope 10, 0 + volume_envelope 10, 8 note C_, 3 dec_octave speed 1 @@ -277,59 +252,51 @@ Branch_f72fb: volume_envelope 3, 7 note A#, 10 speed 7 - volume_envelope 10, 0 + volume_envelope 10, 8 note C#, 12 volume_envelope 3, 7 note C#, 6 - volume_envelope 10, 0 + volume_envelope 10, 8 note D#, 3 speed 1 note C#, 11 volume_envelope 3, 7 note C#, 10 - volume_envelope 10, 0 + volume_envelope 10, 8 speed 7 sound_ret - Music_Overworld_Ch2: speed 7 duty_cycle 0 stereo_panning TRUE, TRUE -; vibrato_type 9 vibrato 30, 3, 3 -; cutoff 7 octave 3 sound_call Branch_f7535 -.MainLoop +.MainLoop: sound_call Branch_f7535 volume_envelope 9, 2 -; cutoff 7 rest 3 note C_, 5 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C_, 4 note C_, 3 note C_, 3 rest 3 note C_, 5 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note G_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note D_, 4 note D_, 3 note C_, 3 @@ -338,14 +305,12 @@ Music_Overworld_Ch2: note A#, 5 inc_octave note D_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C_, 4 note C_, 3 dec_octave @@ -354,14 +319,12 @@ Music_Overworld_Ch2: note A#, 5 inc_octave note C#, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C#, 4 dec_octave note F_, 3 @@ -371,40 +334,29 @@ Music_Overworld_Ch2: note C_, 3 note E_, 2 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note G_, 1 -; cutoff 7 - volume_envelope 6, 0 -; cutoff 8 + volume_envelope 6, 8 octave 3 note E_, 3 note F_, 3 note G_, 3 -; cutoff 7 note A#, 6 volume_envelope 9, 2 -; cutoff 7 - octave 3 note D_, 3 - volume_envelope 6, 0 -; cutoff 8 - octave 3 + volume_envelope 6, 8 note A_, 3 volume_envelope 9, 2 -; cutoff 7 octave 2 note A_, 2 inc_octave inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 dec_octave rest 2 volume_envelope 9, 2 -; cutoff 7 note D_, 4 note D_, 3 dec_octave @@ -415,8 +367,7 @@ Music_Overworld_Ch2: note D_, 2 dec_octave note A#, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave inc_octave note F_, 1 @@ -424,7 +375,6 @@ Music_Overworld_Ch2: dec_octave dec_octave volume_envelope 9, 2 -; cutoff 7 note A#, 4 note A#, 3 note A#, 3 @@ -434,14 +384,12 @@ Music_Overworld_Ch2: note D_, 2 dec_octave note A#, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note A_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note A#, 6 inc_octave note D_, 1 @@ -451,13 +399,11 @@ Music_Overworld_Ch2: inc_octave note C_, 5 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 volume_envelope 9, 2 -; cutoff 7 dec_octave note C_, 4 note C_, 3 @@ -465,48 +411,37 @@ Music_Overworld_Ch2: rest 3 note C_, 5 note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note G_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note D_, 4 duty_cycle 2 volume_envelope 5, -7 -; cutoff 8 octave 4 note C_, 1 -; tie dec_octave note G_, 1 -; tie note E_, 1 -; tie note C_, 1 -; tie dec_octave note G_, 1 -; tie note E_, 1 duty_cycle 0 volume_envelope 9, 2 -; cutoff 7 octave 2 rest 3 note A#, 5 inc_octave note D_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C_, 4 note C_, 3 dec_octave @@ -515,14 +450,12 @@ Music_Overworld_Ch2: note A#, 5 inc_octave note C#, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C#, 4 note C#, 3 note C#, 3 @@ -532,14 +465,12 @@ Music_Overworld_Ch2: note A_, 2 inc_octave note C_, 3 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note G_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note C_, 4 note E_, 3 note C_, 3 @@ -549,296 +480,240 @@ Music_Overworld_Ch2: note B_, 2 inc_octave inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 rest 2 dec_octave volume_envelope 9, 2 -; cutoff 7 note D_, 4 - volume_envelope 6, 0 -; cutoff 8 + volume_envelope 6, 8 octave 4 note D_, 2 note E_, 1 note F_, 1 volume_envelope 2, 7 note F_, 2 - volume_envelope 6, 0 + volume_envelope 6, 8 note F_, 11 volume_envelope 9, 2 -; cutoff 7 - octave 4 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 rest 2 dec_octave dec_octave volume_envelope 9, 2 -; cutoff 7 note A#, 1 - volume_envelope 6, 0 -; cutoff 8 + volume_envelope 6, 8 octave 3 note A#, 3 inc_octave note F_, 3 note G_, 9 volume_envelope 9, 2 -; cutoff 7 octave 3 note D_, 2 dec_octave note A#, 3 inc_octave inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 -; cutoff 8 - volume_envelope 6, 0 + volume_envelope 6, 8 octave 4 note C_, 5 volume_envelope 2, 7 note C_, 1 dec_octave - volume_envelope 9, 0 + volume_envelope 9, 8 note A#, 5 volume_envelope 2, 7 note A#, 1 volume_envelope 9, 2 -; cutoff 7 octave 3 rest 3 note F_, 3 note C_, 2 note F_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 note G_, 3 note G_, 3 speed 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 inc_octave note F_, 4 note C_, 3 speed 7 dec_octave volume_envelope 9, 2 -; cutoff 7 note E_, 3 note G_, 2 inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 volume_envelope 9, 2 -; cutoff 7 dec_octave rest 3 note A_, 3 note F_, 2 note A_, 1 inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 note G_, 3 note G_, 3 speed 1 - volume_envelope 9, 0 -; cutoff 8 + volume_envelope 9, 8 inc_octave note F_, 4 note C_, 3 dec_octave speed 7 volume_envelope 9, 2 -; cutoff 7 note A_, 3 note G_, 2 inc_octave - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 note F_, 1 sound_loop 0, .MainLoop Branch_f7535: octave 3 volume_envelope 9, 2 -; cutoff 7 rest 3 note C_, 3 note C_, 2 note F_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 - note G_, 3 + note G_, 2 + rest 1 note G_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave -; cutoff 8 speed 1 inc_octave note F_, 4 note C_, 3 speed 7 volume_envelope 9, 2 -; cutoff 7 dec_octave note E_, 3 note G_, 2 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 dec_octave rest 3 volume_envelope 9, 2 -; cutoff 8 note F_, 3 note F_, 2 note A_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave volume_envelope 9, 2 -; cutoff 7 - note G_, 3 + note G_, 2 + rest 1 note G_, 1 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 rest 1 dec_octave -; cutoff 8 speed 1 inc_octave note F_, 4 note C_, 3 speed 7 volume_envelope 9, 2 -; cutoff 7 dec_octave note A_, 3 note G_, 2 - volume_envelope 9, 0 -; cutoff 4 + volume_envelope 9, 8 inc_octave note F_, 1 dec_octave sound_ret - Music_Overworld_Ch3: speed 7 stereo_panning TRUE, TRUE channel_volume 1 fade_wave 11 -; echo 64 -; cutoff 7 octave 2 sound_call Branch_f77f8 note F_, 2 inc_octave note C_, 1 -.MainLoop +.MainLoop: sound_call Branch_f77f8 note F_, 3 sound_call Branch_f7826 octave 2 -; cutoff 8 note F_, 1 note A#, 2 rest 1 octave 4 -; cutoff 3 note C#, 2 dec_octave -; cutoff 8 note F_, 1 note A#, 1 rest 1 inc_octave -; cutoff 3 note F_, 2 rest 1 inc_octave note C#, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 octave 4 -; cutoff 7 note G_, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 note F_, 1 inc_octave -; cutoff 3 note A#, 2 dec_octave -; cutoff 8 note A#, 1 octave 4 -; cutoff 3 note C#, 2 octave 2 -; cutoff 8 note F_, 1 note A_, 2 rest 1 octave 4 -; cutoff 3 note E_, 2 octave 2 -; cutoff 8 note A_, 1 octave 4 -; cutoff 3 note G_, 2 -; cutoff 7 note E_, 1 -; cutoff 8 dec_octave note E_, 1 rest 1 inc_octave inc_octave -; cutoff 3 note E_, 1 octave 2 -; cutoff 8 note A_, 1 rest 1 inc_octave @@ -859,240 +734,176 @@ Music_Overworld_Ch3: note D_, 2 rest 1 octave 4 -; cutoff 3 note F_, 2 octave 2 -; cutoff 8 note A_, 1 inc_octave note D_, 2 dec_octave note A_, 1 octave 4 -; cutoff 3 note D_, 2 inc_octave note C_, 1 octave 2 -; cutoff 8 note D_, 2 octave 4 -; cutoff 3 note F_, 2 rest 1 octave 2 -; cutoff 8 note A_, 1 octave 4 -; cutoff 3 note F_, 2 octave 2 -; cutoff 8 note D_, 1 octave 4 -; cutoff 3 note D_, 2 -; cutoff 8 octave 2 note A_, 1 note G_, 2 rest 1 octave 4 -; cutoff 3 note D_, 2 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note F_, 2 -; cutoff 7 note D_, 1 dec_octave -; cutoff 8 note D_, 1 rest 1 -; cutoff 3 inc_octave note A#, 1 octave 2 -; cutoff 8 note G_, 1 rest 1 octave 4 -; cutoff 3 note D_, 2 rest 1 dec_octave -; cutoff 8 note D_, 1 inc_octave -; cutoff 3 note F_, 2 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note D_, 2 -; cutoff 8 dec_octave note D_, 1 note C_, 2 rest 1 inc_octave -; cutoff 3 note D_, 2 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note F_, 2 -; cutoff 7 note D_, 1 octave 2 -; cutoff 8 note C_, 1 rest 1 octave 4 -; cutoff 3 note F_, 1 dec_octave -; cutoff 8 note C_, 1 rest 1 inc_octave -; cutoff 3 note D_, 2 rest 1 octave 2 -; cutoff 8 note E_, 1 inc_octave note C_, 1 rest 1 inc_octave -; cutoff 7 note F_, 1 -; cutoff 3 note E_, 2 -; cutoff 8 octave 2 note E_, 1 sound_call Branch_f7826 -; cutoff 8 octave 3 note C_, 1 note C#, 2 rest 1 inc_octave -; cutoff 3 note C#, 2 octave 2 -; cutoff 8 note G#, 1 inc_octave note C#, 1 rest 1 inc_octave -; cutoff 3 note F_, 2 rest 1 inc_octave note C#, 1 octave 3 -; cutoff 8 note C#, 1 rest 1 inc_octave note G_, 1 dec_octave -; cutoff 8 note C#, 1 rest 1 dec_octave note G#, 1 octave 4 -; cutoff 3 note G_, 2 dec_octave -; cutoff 8 note C#, 1 inc_octave -; cutoff 3 note F_, 2 octave 2 -; cutoff 8 note G#, 1 inc_octave note C_, 2 rest 1 inc_octave -; cutoff 3 note E_, 2 dec_octave -; cutoff 8 note G_, 1 inc_octave -; cutoff 3 note C_, 2 -; cutoff 7 note E_, 1 dec_octave -; cutoff 8 note E_, 1 rest 1 octave 5 -; cutoff 3 note E_, 1 octave 3 -; cutoff 8 note C_, 1 rest 1 inc_octave -; cutoff 3 note E_, 2 rest 1 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note G_, 2 dec_octave -; cutoff 8 note C_, 1 inc_octave -; cutoff 3 note E_, 2 octave 2 -; cutoff 8 note G_, 1 note B_, 2 rest 1 octave 4 -; cutoff 3 note F_, 2 dec_octave -; cutoff 8 note F_, 1 note B_, 2 note F_, 1 inc_octave -; cutoff 3 note D_, 2 inc_octave note D_, 1 octave 2 -; cutoff 8 note B_, 2 octave 4 -; cutoff 3 note F_, 2 rest 1 dec_octave -; cutoff 8 note F_, 1 note B_, 2 note F_, 1 @@ -1102,27 +913,21 @@ Music_Overworld_Ch3: note A#, 2 rest 1 octave 4 -; cutoff 3 note D_, 2 dec_octave -; cutoff 8 note F_, 1 note A#, 2 note F_, 1 inc_octave -; cutoff 3 note F_, 2 inc_octave note D_, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 octave 4 -; cutoff 7 note D_, 1 octave 2 -; cutoff 8 note A#, 1 rest 2 note A#, 2 @@ -1133,33 +938,24 @@ Music_Overworld_Ch3: note C_, 2 rest 1 inc_octave -; cutoff 3 note D_, 2 octave 2 -; cutoff 8 note G_, 1 octave 4 -; cutoff 3 note F_, 2 -; cutoff 7 note D_, 1 octave 2 -; cutoff 8 note C_, 1 rest 1 octave 5 -; cutoff 3 note D_, 1 octave 3 -; cutoff 8 note C_, 1 rest 1 inc_octave -; cutoff 3 note D_, 2 rest 1 octave 2 -; cutoff 8 note E_, 1 inc_octave note C_, 1 @@ -1171,13 +967,10 @@ Music_Overworld_Ch3: note E_, 1 note F_, 3 octave 4 -; cutoff 3 note A_, 2 dec_octave -; cutoff 8 note C_, 1 inc_octave -; cutoff 5 note F_, 2 note A_, 1 inc_octave @@ -1193,24 +986,18 @@ Music_Overworld_Ch3: rest 2 note G_, 2 dec_octave -; cutoff 8 note C_, 1 inc_octave -; cutoff 5 note A#, 2 inc_octave note C_, 1 octave 2 -; cutoff 8 note F_, 3 octave 5 -; cutoff 3 note C_, 2 octave 3 -; cutoff 8 note C_, 1 inc_octave -; cutoff 5 note A_, 2 inc_octave note C_, 1 @@ -1225,13 +1012,10 @@ Music_Overworld_Ch3: rest 2 note C_, 2 octave 3 -; cutoff 8 note C_, 1 inc_octave -; cutoff 5 note A#, 2 dec_octave -; cutoff 8 note C_, 1 sound_loop 0, .MainLoop @@ -1239,10 +1023,8 @@ Branch_f77f8: octave 2 note F_, 3 octave 4 -; cutoff 3 note A_, 2 dec_octave -; cutoff 8 note C_, 1 note F_, 2 note C_, 1 @@ -1261,10 +1043,8 @@ Branch_f77f8: dec_octave note F_, 3 octave 5 -; cutoff 3 note C_, 2 octave 3 -; cutoff 8 note C_, 1 note F_, 2 note C_, 1 @@ -1284,69 +1064,53 @@ Branch_f7826: note F_, 2 rest 1 octave 4 -; cutoff 3 note F_, 2 dec_octave -; cutoff 8 note C_, 1 note F_, 1 rest 1 inc_octave -; cutoff 3 note F_, 2 rest 1 inc_octave note C_, 1 octave 2 -; cutoff 8 note F_, 1 rest 1 octave 4 -; cutoff 7 note G_, 1 octave 2 -; cutoff 8 note F_, 1 rest 1 note C_, 1 octave 4 -; cutoff 3 note G_, 2 octave 2 -; cutoff 8 note F_, 1 octave 4 -; cutoff 7 note F_, 2 octave 2 -; cutoff 8 note G_, 1 note A_, 2 rest 1 octave 4 -; cutoff 3 note E_, 2 dec_octave -; cutoff 8 note E_, 1 note A_, 1 rest 1 inc_octave -; cutoff 3 note E_, 2 rest 1 inc_octave note C_, 1 octave 2 -; cutoff 8 note A_, 1 rest 1 octave 4 -; cutoff 7 note E_, 1 octave 2 -; cutoff 8 -.Loop1 +.Loop1: note A_, 1 rest 1 note E_, 1 @@ -1356,50 +1120,40 @@ Branch_f7826: note A#, 2 rest 1 octave 4 -; cutoff 3 note D_, 2 dec_octave -; cutoff 8 note F_, 1 note A#, 1 rest 1 inc_octave -; cutoff 3 note F_, 2 rest 1 inc_octave note D_, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 octave 4 -; cutoff 7 note D_, 1 octave 2 -; cutoff 8 note A#, 1 rest 1 note F_, 1 octave 4 -; cutoff 3 note D_, 2 octave 2 -; cutoff 8 note A#, 1 octave 4 -; cutoff 3 note D_, 2 sound_ret - Music_Overworld_Ch4: toggle_noise 6 drum_speed 7 octave 1 sound_call Branch_f78ee sound_call Branch_f78fb -.MainLoop +.MainLoop: sound_call Branch_f78ee drum_note 1, 3 drum_note 4, 2 @@ -1414,13 +1168,13 @@ Music_Overworld_Ch4: drum_note 4, 1 drum_note 4, 1 drum_note 2, 3 -.Loop1 +.Loop1: sound_call Branch_f78ee sound_call Branch_f78fb sound_loop 3, .Loop1 sound_call Branch_f78ee sound_call Branch_f790a -.Loop2 +.Loop2: sound_call Branch_f78ee sound_call Branch_f78fb sound_loop 3, .Loop2 From 5357fee84fb96604b27abc83bc21cf149c32ef95 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 14 Jan 2023 00:08:49 -0600 Subject: [PATCH 32/33] Update TCG2 songs they actually don't sound half bad now! --- audio.asm | 18 +- crysaudio/music/TCG2/credits.asm | 3345 +++++++++-------- .../music/TCG2/{diddly1.asm => ditty1.asm} | 68 +- .../music/TCG2/{diddly2.asm => ditty2.asm} | 52 +- .../music/TCG2/{diddly3.asm => ditty3.asm} | 54 +- .../music/TCG2/{diddly4.asm => ditty4.asm} | 46 +- .../music/TCG2/{diddly5.asm => ditty5.asm} | 33 +- .../music/TCG2/{diddly6.asm => ditty6.asm} | 187 +- crysaudio/music/TCG2/fort1.asm | 922 ++--- crysaudio/music/TCG2/fort2.asm | 519 +-- crysaudio/music/TCG2/fort3.asm | 1055 +++--- crysaudio/music/TCG2/fort4.asm | 1064 +++--- crysaudio/music/TCG2/gamecorner.asm | 428 ++- crysaudio/music/TCG2/grblimp.asm | 345 +- crysaudio/music/TCG2/grcastle.asm | 1486 ++++---- crysaudio/music/TCG2/grchallengecup.asm | 624 +-- crysaudio/music/TCG2/grdueltheme1.asm | 1113 +++--- crysaudio/music/TCG2/grdueltheme2.asm | 2931 +++++++++------ crysaudio/music/TCG2/grdueltheme3.asm | 1555 ++++---- crysaudio/music/TCG2/groverworld.asm | 1375 ++++--- crysaudio/music/TCG2/herecomesgr.asm | 1345 ++++--- crysaudio/music/TCG2/imakuni2.asm | 1053 ++++-- crysaudio/music/TCG2/ishihara.asm | 1146 +++--- crysaudio/music/TCG2/titlescreen.asm | 2103 ++++++----- 24 files changed, 12553 insertions(+), 10314 deletions(-) rename crysaudio/music/TCG2/{diddly1.asm => ditty1.asm} (82%) rename crysaudio/music/TCG2/{diddly2.asm => ditty2.asm} (84%) rename crysaudio/music/TCG2/{diddly3.asm => ditty3.asm} (57%) rename crysaudio/music/TCG2/{diddly4.asm => ditty4.asm} (57%) rename crysaudio/music/TCG2/{diddly5.asm => ditty5.asm} (65%) rename crysaudio/music/TCG2/{diddly6.asm => ditty6.asm} (72%) diff --git a/audio.asm b/audio.asm index 22d65d4e..02eee18b 100644 --- a/audio.asm +++ b/audio.asm @@ -416,6 +416,9 @@ INCLUDE "crysaudio/music/TCG2/fort1.asm" INCLUDE "crysaudio/music/TCG2/fort2.asm" INCLUDE "crysaudio/music/TCG2/fort3.asm" INCLUDE "crysaudio/music/TCG2/fort4.asm" + +SECTION "TCG2 Songs 1b", ROMX + INCLUDE "crysaudio/music/TCG2/grcastle.asm" INCLUDE "crysaudio/music/TCG2/grchallengecup.asm" @@ -427,6 +430,9 @@ INCLUDE "crysaudio/music/TCG2/grblimp.asm" INCLUDE "crysaudio/music/TCG2/grdueltheme1.asm" INCLUDE "crysaudio/music/TCG2/grdueltheme2.asm" INCLUDE "crysaudio/music/TCG2/grdueltheme3.asm" + +SECTION "TCG2 Songs 2b", ROMX + INCLUDE "crysaudio/music/TCG2/ishihara.asm" @@ -434,12 +440,12 @@ SECTION "TCG2 Songs 3", ROMX INCLUDE "crysaudio/music/TCG2/imakuni2.asm" INCLUDE "crysaudio/music/TCG2/credits.asm" -INCLUDE "crysaudio/music/TCG2/diddly1.asm" -INCLUDE "crysaudio/music/TCG2/diddly2.asm" -INCLUDE "crysaudio/music/TCG2/diddly3.asm" -INCLUDE "crysaudio/music/TCG2/diddly4.asm" -INCLUDE "crysaudio/music/TCG2/diddly5.asm" -INCLUDE "crysaudio/music/TCG2/diddly6.asm" +INCLUDE "crysaudio/music/TCG2/ditty1.asm" +INCLUDE "crysaudio/music/TCG2/ditty2.asm" +INCLUDE "crysaudio/music/TCG2/ditty3.asm" +INCLUDE "crysaudio/music/TCG2/ditty4.asm" +INCLUDE "crysaudio/music/TCG2/ditty5.asm" +INCLUDE "crysaudio/music/TCG2/ditty6.asm" SECTION "Pinball Songs 1", ROMX diff --git a/crysaudio/music/TCG2/credits.asm b/crysaudio/music/TCG2/credits.asm index 5a1b04b7..8ddb4768 100644 --- a/crysaudio/music/TCG2/credits.asm +++ b/crysaudio/music/TCG2/credits.asm @@ -5,730 +5,732 @@ Music_TCG2Credits: channel 3, Music_TCG2Credits_Ch3 channel 4, Music_TCG2Credits_Ch4 -Music_TCG2Credits_Ch2: ; 1de32a (77:632a) - channel_volume 10 +Music_TCG2Credits_Ch2: duty_cycle 2 - channel_volume 15 + volume_envelope 15, 7 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 1 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 - channel_volume 13 + volume_envelope 12, 6 rest 15 inc_octave note D_, 14 - ;tie +; tie note D_, 15 note D_, 14 - ;tie +; tie note D_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 - ;tie +; tie note A_, 15 inc_octave note D_, 14 - ;tie +; tie note D_, 15 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave note A_, 14 - ;tie +; tie note A_, 15 inc_octave note E_, 14 - ;tie +; tie note E_, 15 - ;musicef 252 +; musicef -4 note B_, 14 - ;tie +; tie note B_, 15 inc_octave note G_, 14 - ;tie +; tie note G_, 15 - ;musicef 4 +; musicef 4 dec_octave note D_, 14 - ;tie +; tie note D_, 15 note A_, 14 - ;tie +; tie note A_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 - ;tie +; tie note A_, 15 inc_octave note D_, 14 - ;tie +; tie note D_, 15 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave note A_, 14 - ;tie +; tie note A_, 15 inc_octave note E_, 14 - ;tie +; tie note E_, 15 - ;musicef 252 +; musicef -4 note B_, 14 - ;tie +; tie note B_, 15 inc_octave note G_, 14 - ;tie +; tie note G_, 15 - ;musicef 4 +; musicef 4 dec_octave note D_, 14 - ;tie +; tie note D_, 15 note D_, 14 - ;tie +; tie note D_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 - ;tie +; tie note A_, 15 inc_octave note D_, 14 - ;tie +; tie note D_, 15 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave note A_, 14 - ;tie +; tie note A_, 15 inc_octave note E_, 14 - ;tie +; tie note E_, 15 - ;musicef 252 +; musicef -4 note B_, 14 - ;tie +; tie note B_, 15 inc_octave note G_, 14 - ;tie +; tie note G_, 15 - ;musicef 4 +; musicef 4 dec_octave note D_, 14 - ;tie +; tie note D_, 15 note A_, 14 - ;tie +; tie note A_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 - ;tie +; tie note A_, 15 inc_octave note D_, 14 - ;tie +; tie note D_, 15 - ;musicef 4 +; musicef 4 dec_octave dec_octave note D_, 14 - ;tie +; tie note D_, 15 note A_, 14 - ;tie +; tie note A_, 15 inc_octave - ;musicef 252 +; musicef -4 note F_, 14 - ;tie +; tie note F_, 15 note D#, 14 - ;tie +; tie note D#, 15 - ;musicef 4 +; musicef 4 dec_octave note G_, 14 - ;tie +; tie note G_, 15 inc_octave note E_, 14 - ;tie +; tie note E_, 15 inc_octave - ;musicef 252 +; musicef -4 note D_, 14 - ;tie +; tie note D_, 15 dec_octave note G_, 14 - ;tie +; tie note G_, 15 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 14 - ;tie +; tie note G_, 15 inc_octave note D#, 14 - ;tie +; tie note D#, 15 inc_octave - ;musicef 252 +; musicef -4 note D_, 14 - ;tie +; tie note D_, 15 dec_octave note C_, 14 rest 15 - ;musicef 4 +; musicef 4 note F#, 14 - ;tie +; tie note F#, 15 inc_octave note C#, 14 - ;tie +; tie note C#, 15 - ;musicef 252 +; musicef -4 note A_, 14 - ;tie +; tie note A_, 15 inc_octave note F#, 14 - ;tie +; tie note F#, 15 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave note B_, 14 - ;tie +; tie note B_, 15 inc_octave note G_, 14 - ;tie +; tie note G_, 15 - ;musicef 252 +; musicef -4 note B_, 14 - ;tie +; tie note B_, 15 inc_octave note G_, 14 - ;tie +; tie note G_, 15 dec_octave - ;musicef 4 +; musicef 4 note E_, 14 - ;tie +; tie note E_, 15 inc_octave note C_, 14 - ;tie +; tie note C_, 15 - ;musicef 252 +; musicef -4 note E_, 14 - ;tie +; tie note E_, 15 note C_, 14 - ;tie +; tie note C_, 15 dec_octave - ;musicef 4 +; musicef 4 note E_, 14 - ;tie +; tie note E_, 15 inc_octave note C_, 14 - ;tie +; tie note C_, 15 - ;musicef 252 +; musicef -4 note E_, 14 - ;tie +; tie note E_, 15 note C_, 14 - ;tie +; tie note C_, 15 dec_octave - ;musicef 4 +; musicef 4 note G_, 14 - ;tie +; tie note G_, 15 inc_octave note G_, 14 - ;tie +; tie note G_, 15 inc_octave - ;musicef 252 +; musicef -4 note C_, 14 - ;tie +; tie note C_, 15 dec_octave note D#, 14 - ;tie +; tie note D#, 15 - ;musicef 4 +; musicef 4 dec_octave note A_, 14 - ;tie +; tie note A_, 15 inc_octave note G_, 14 duty_cycle 1 octave 2 - channel_volume 10 - ;musice4 203 + volume_envelope 9, -4 +; frequency_offset -53 note D_, 4 - ;tie - ;musice4 214 +; tie +; frequency_offset -42 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 4 - ;tie - ;musice4 242 +; tie +; frequency_offset -14 note D_, 3 - ;musice4 0 - channel_volume 14 +; frequency_offset 0 + volume_envelope 14, 0 note D_, 4 - ;tie +; tie note D_, 3 - ;tie +; tie note D_, 4 - ;tie +; tie note D_, 3 - ;tie +; tie note D_, 4 - ;tie +; tie note D_, 4 - ;tie +; tie note D_, 4 - ;tie +; tie note D_, 3 - ;tie +; tie note D_, 4 - ;tie - ;musice4 227 +; tie +; frequency_offset -29 note D_, 3 - ;tie - ;musice4 203 +; tie +; frequency_offset -53 note D_, 4 - ;tie - ;musice4 180 +; tie +; frequency_offset -76 note D_, 2 - ;tie - ;musice4 147 +; tie +; frequency_offset -109 note D_, 1 - ;musice4 0 +; frequency_offset 0 octave 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 29, 3, 3 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 4 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 87 - ;musicf3 +; musicf1 87 +; musicf3 note B_, 3 inc_octave note C_, 11 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 dec_octave note A_, 15 - ;musicf2 +; musicf2 note F_, 14 note F_, 15 inc_octave note C_, 14 note C_, 15 dec_octave - ;musicf3 +; musicf3 note B_, 14 duty_cycle 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 29, 3, 3 octave 1 - channel_volume 10 + volume_envelope 9, -4 note G_, 15 - channel_volume 14 + volume_envelope 14, 0 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 4 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 inc_octave - ;musice4 204 +; frequency_offset -52 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 7 - channel_volume 10 + volume_envelope 9, -4 note G_, 15 - channel_volume 14 + volume_envelope 14, 0 note G_, 14 - ;tie +; tie note G_, 15 - ;musice4 215 +; frequency_offset -41 note G_, 4 - ;tie - ;musice4 236 +; tie +; frequency_offset -20 note G_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G_, 7 - ;tie +; tie note G_, 15 note D_, 14 dec_octave note G_, 15 - ;tie - ;musice4 217 +; tie +; frequency_offset -39 note G_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F#, 3 - ;tie - ;musice4 213 +; tie +; frequency_offset -43 note F#, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 3 note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 note G_, 14 - channel_volume 10 + volume_envelope 9, -4 inc_octave - ;musice4 196 +; frequency_offset -60 note C_, 4 - ;tie - ;musice4 211 +; tie +; frequency_offset -45 note C_, 4 - ;tie - ;musice4 226 +; tie +; frequency_offset -30 note C_, 4 - ;tie - ;musice4 241 +; tie +; frequency_offset -15 note C_, 3 - ;musice4 0 - channel_volume 14 +; frequency_offset 0 + volume_envelope 14, 0 note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 dec_octave note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie - ;musice4 224 +; tie +; frequency_offset -32 note B_, 4 - ;tie - ;musice4 192 +; tie +; frequency_offset -64 note B_, 3 - ;tie - ;musice4 222 +; tie +; frequency_offset -34 note A#, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 3 speed 4 note E_, 15 - ;tie +; tie note E_, 14 note A_, 15 - ;tie +; tie note A_, 14 speed 1 inc_octave - ;musice4 203 +; frequency_offset -53 note D_, 4 - ;tie - ;musice4 214 +; tie +; frequency_offset -42 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 4 - ;tie - ;musice4 242 +; tie +; frequency_offset -14 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 14 - ;tie +; tie note D_, 15 - ;tie - ;musice4 242 +; tie +; frequency_offset -14 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 4 - ;tie - ;musice4 214 +; tie +; frequency_offset -42 note D_, 4 - ;tie - ;musice4 203 +; tie +; frequency_offset -53 note D_, 3 - ;musice4 0 +; frequency_offset 0 dec_octave note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 note G_, 15 inc_octave @@ -736,227 +738,227 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 15 note A_, 4 duty_cycle 2 - channel_volume 13 + volume_envelope 12, 7 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE vibrato 0, 3, 3 octave 2 note B_, 10 inc_octave speed 4 note G_, 15 - ;tie +; tie note G_, 14 speed 1 duty_cycle 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 29, 3, 3 - channel_volume 14 + volume_envelope 14, 0 octave 1 note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;musice4 178 +; frequency_offset -78 note G_, 4 - ;tie - ;musice4 217 +; tie +; frequency_offset -39 note G_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G_, 7 inc_octave speed 4 note C_, 15 - ;tie +; tie note C_, 14 speed 1 dec_octave note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie - ;musice4 224 +; tie +; frequency_offset -32 note B_, 4 - ;tie - ;musice4 192 +; tie +; frequency_offset -64 note B_, 3 - ;tie - ;musice4 222 +; tie +; frequency_offset -34 note A#, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 3 speed 4 note E_, 15 - ;tie +; tie note E_, 14 speed 1 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 note B_, 14 inc_octave note C_, 15 note C#, 14 - ;musice4 203 +; frequency_offset -53 note D_, 4 - ;tie - ;musice4 214 +; tie +; frequency_offset -42 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 4 - ;tie - ;musice4 242 +; tie +; frequency_offset -14 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 14 - ;tie +; tie note D_, 15 - ;tie - ;musice4 242 +; tie +; frequency_offset -14 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 4 - ;tie - ;musice4 214 +; tie +; frequency_offset -42 note D_, 4 - ;tie - ;musice4 203 +; tie +; frequency_offset -53 note D_, 3 - ;musice4 0 +; frequency_offset 0 dec_octave note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie - ;musice4 217 +; tie +; frequency_offset -39 note G_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F#, 4 - ;tie - ;musice4 213 +; tie +; frequency_offset -43 note F#, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 3 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 note A_, 14 rest 15 note B_, 14 - ;tie +; tie note B_, 15 note G_, 14 inc_octave note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 dec_octave note F#, 4 - ;tie - ;musice4 217 +; tie +; frequency_offset -39 note G_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G_, 7 speed 4 note C_, 15 - ;tie +; tie note C_, 14 note B_, 15 - ;tie +; tie note B_, 14 note A#, 15 - ;tie +; tie note A#, 14 speed 1 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 inc_octave note D#, 4 - ;tie - ;musice4 232 +; tie +; frequency_offset -24 note E_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note E_, 7 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 note E_, 14 - ;tie +; tie note E_, 15 dec_octave note A_, 14 @@ -964,213 +966,213 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note E_, 15 note D#, 14 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 dec_octave note A_, 14 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 14 note F#, 15 - ;tie +; tie note F#, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 inc_octave - ;musice4 204 +; frequency_offset -52 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 7 - channel_volume 10 + volume_envelope 9, -4 note G_, 15 - channel_volume 14 + volume_envelope 14, 0 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie - ;musice4 236 +; tie +; frequency_offset -20 note G_, 4 - ;tie - ;musice4 215 +; tie +; frequency_offset -41 note G_, 3 - ;tie - ;musice4 194 +; tie +; frequency_offset -62 note G_, 4 - ;tie - ;musice4 174 +; tie +; frequency_offset -82 note G_, 3 - ;musice4 0 +; frequency_offset 0 dec_octave speed 4 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie speed 1 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 note A_, 15 note B_, 14 inc_octave speed 4 note C_, 15 - ;tie +; tie note C_, 14 dec_octave note B_, 15 - ;tie +; tie note B_, 14 speed 1 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 inc_octave note C_, 14 note C#, 15 - ;musice4 204 +; frequency_offset -52 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 7 - ;tie +; tie note D_, 14 dec_octave note A_, 14 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 note E_, 15 note F#, 14 speed 4 note G_, 15 - ;tie +; tie note G_, 14 note F#, 15 - ;tie +; tie note F#, 14 note F_, 15 - ;tie +; tie note F_, 14 note E_, 15 - ;tie +; tie note E_, 14 speed 1 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 note B_, 14 inc_octave note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie - ;musice4 226 +; tie +; frequency_offset -30 note C_, 4 - ;tie - ;musice4 196 +; tie +; frequency_offset -60 note C_, 3 - ;tie - ;musice4 163 +; tie +; frequency_offset -93 note C_, 4 - ;tie - ;musice4 133 +; tie +; frequency_offset -123 note C_, 3 - ;musice4 0 +; frequency_offset 0 dec_octave note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - channel_volume 10 + volume_envelope 9, -4 note D_, 15 - channel_volume 14 + volume_envelope 14, 0 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 note A_, 14 inc_octave @@ -1190,85 +1192,85 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note C_, 7 rest 7 duty_cycle 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 29, 3, 3 - channel_volume 14 + volume_envelope 14, 0 octave 1 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 rest 15 duty_cycle 2 - channel_volume 13 + volume_envelope 12, 7 speed 1 vibrato 0, 3, 3 octave 3 rest 4 note C_, 3 - ;tie +; tie note C_, 7 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 rest 15 duty_cycle 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 29, 3, 3 - channel_volume 14 + volume_envelope 14, 0 octave 1 note D_, 14 octave 1 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 rest 15 duty_cycle 2 - channel_volume 13 + volume_envelope 12, 7 speed 1 vibrato 0, 3, 3 octave 3 rest 4 note C_, 3 - ;tie +; tie note C_, 7 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 duty_cycle 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 29, 3, 3 - channel_volume 14 + volume_envelope 14, 0 octave 1 note A#, 4 - ;tie - ;musice4 224 +; tie +; frequency_offset -32 note B_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 7 - ;tie +; tie note B_, 15 inc_octave note C_, 14 @@ -1276,46 +1278,46 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 14 octave 1 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 note D_, 14 note G_, 15 note D_, 14 rest 15 duty_cycle 2 - channel_volume 13 + volume_envelope 12, 7 speed 1 vibrato 0, 3, 3 octave 3 rest 4 note C_, 3 - ;tie +; tie note C_, 7 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 rest 15 duty_cycle 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 29, 3, 3 - channel_volume 14 + volume_envelope 14, 0 octave 1 note D_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 note D_, 14 note G_, 15 @@ -1323,22 +1325,22 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 15 note F_, 14 note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 note A#, 4 - ;tie - ;musice4 193 +; tie +; frequency_offset -63 note B_, 3 - ;tie - ;musice4 224 +; tie +; frequency_offset -32 note B_, 4 - ;tie - ;musice4 240 +; tie +; frequency_offset -16 note B_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 15 inc_octave note C_, 7 @@ -1348,9 +1350,9 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 3 dec_octave note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 note D_, 14 note G_, 15 @@ -1358,33 +1360,33 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 15 note C_, 14 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 inc_octave - ;musice4 147 +; frequency_offset -109 note D_, 4 - ;tie - ;musice4 181 +; tie +; frequency_offset -75 note D_, 3 - ;tie - ;musice4 203 +; tie +; frequency_offset -53 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 15 dec_octave note A_, 14 note D_, 15 note A_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 inc_octave note G_, 14 @@ -1397,28 +1399,28 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A_, 14 inc_octave note C_, 15 - ;musice4 147 +; frequency_offset -109 note D_, 4 - ;tie - ;musice4 181 +; tie +; frequency_offset -75 note D_, 3 - ;tie - ;musice4 203 +; tie +; frequency_offset -53 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 15 dec_octave note A_, 14 note D_, 15 note A_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 note D_, 14 note G_, 15 @@ -1426,33 +1428,33 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 15 note C_, 14 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 inc_octave - ;musice4 147 +; frequency_offset -109 note D_, 4 - ;tie - ;musice4 181 +; tie +; frequency_offset -75 note D_, 3 - ;tie - ;musice4 203 +; tie +; frequency_offset -53 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 15 dec_octave note A_, 14 note D_, 15 note A_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 inc_octave note G_, 14 @@ -1462,7 +1464,7 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note G_, 15 note D_, 14 note G_, 15 - ;tie +; tie note G_, 14 inc_octave inc_octave @@ -1475,40 +1477,40 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A_, 15 note B_, 14 inc_octave - channel_volume 7 + volume_envelope 6, -4 note C_, 15 - ;tie +; tie note C_, 14 - channel_volume 14 + volume_envelope 14, 0 note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 dec_octave note G_, 14 - ;tie +; tie note G_, 15 inc_octave - ;musice4 147 +; frequency_offset -109 note D_, 4 - ;tie - ;musice4 180 +; tie +; frequency_offset -76 note D_, 3 - ;tie - ;musice4 203 +; tie +; frequency_offset -53 note D_, 4 - ;tie - ;musice4 229 +; tie +; frequency_offset -27 note D_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 15 note C_, 14 dec_octave note G_, 15 note C_, 14 - ;tie +; tie note C_, 15 inc_octave note C_, 14 @@ -1516,23 +1518,23 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note A_, 15 note A#, 14 note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 8 rest 7 note A#, 4 - ;tie - ;musice4 222 +; tie +; frequency_offset -34 note A#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 4 - ;tie - ;musice4 224 +; tie +; frequency_offset -32 note B_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 15 note F#, 14 note F_, 15 @@ -1542,17 +1544,17 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) inc_octave note D_, 15 note E_, 14 - ;tie +; tie note E_, 15 dec_octave note B_, 14 note E_, 15 - ;tie +; tie note E_, 14 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 note E_, 14 note A_, 15 @@ -1564,13 +1566,13 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) inc_octave note C_, 15 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 dec_octave note D_, 15 - ;tie +; tie note D_, 14 .Loop1 note G#, 11 @@ -1675,56 +1677,46 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) rest 3 speed 2 note D_, 15 - ;tie +; tie note D_, 14 dec_octave note D_, 15 - ;tie +; tie note D_, 14 speed 1 .Loop6 - ;rept 4 note G_, 11 rest 4 note G_, 11 rest 3 - ;--- note G_, 11 rest 4 note G_, 11 rest 3 - ;--- note G_, 11 rest 4 note G_, 11 rest 3 - ;--- note G_, 11 rest 4 note G_, 11 rest 3 - ;endr - ;rept 4 note D_, 11 rest 4 note D_, 11 rest 3 - ;--- note D_, 11 rest 4 note D_, 11 rest 3 - ;--- note D_, 11 rest 4 note D_, 11 rest 3 - ;--- note D_, 11 rest 4 note D_, 11 rest 3 - ;endr sound_loop 3, .Loop6 .Loop7 note G_, 11 @@ -1732,426 +1724,425 @@ Music_TCG2Credits_Ch2: ; 1de32a (77:632a) note D_, 11 rest 3 sound_loop 4, .Loop7 - ;musicf1 102 +; musicf1 102 speed 4 note G_, 15 - ;tie +; tie note G_, 14 speed 2 note G_, 14 sound_ret -Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) - channel_volume 10 +Music_TCG2Credits_Ch1: duty_cycle 2 - channel_volume 13 + volume_envelope 12, 7 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE rest 15 octave 2 note D_, 14 note A_, 15 note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 4 rest 15 note E_, 14 note G_, 15 inc_octave note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 4 rest 15 dec_octave note D_, 14 note A_, 15 note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 4 rest 15 note E_, 14 note G_, 15 inc_octave note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 4 - channel_volume 13 + volume_envelope 12, 6 dec_octave dec_octave note G_, 16 - ;tie +; tie note G_, 13 inc_octave note G_, 16 - ;tie +; tie note G_, 13 note G_, 16 - ;tie +; tie note G_, 13 inc_octave - ;musicef 252 +; musicef -4 note B_, 16 - ;tie +; tie note B_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note D_, 16 - ;tie +; tie note D_, 13 inc_octave note D_, 16 - ;tie +; tie note D_, 13 note F_, 16 - ;tie +; tie note F_, 13 inc_octave - ;musicef 252 +; musicef -4 note C_, 16 - ;tie +; tie note C_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 16 - ;tie +; tie note G_, 13 inc_octave note G_, 16 - ;tie +; tie note G_, 13 note B_, 16 - ;tie +; tie note B_, 13 inc_octave - ;musicef 252 +; musicef -4 note B_, 16 - ;tie +; tie note B_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note D_, 16 - ;tie +; tie note D_, 13 inc_octave note D_, 16 - ;tie +; tie note D_, 13 note F_, 16 - ;tie +; tie note F_, 13 inc_octave - ;musicef 252 +; musicef -4 note C_, 16 - ;tie +; tie note C_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 16 - ;tie +; tie note G_, 13 inc_octave note G_, 16 - ;tie +; tie note G_, 13 note G_, 16 - ;tie +; tie note G_, 13 inc_octave - ;musicef 252 +; musicef -4 note B_, 16 - ;tie +; tie note B_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note D_, 16 - ;tie +; tie note D_, 13 inc_octave note D_, 16 - ;tie +; tie note D_, 13 note F_, 16 - ;tie +; tie note F_, 13 inc_octave - ;musicef 252 +; musicef -4 note C_, 16 - ;tie +; tie note C_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 16 - ;tie +; tie note G_, 13 inc_octave note G_, 16 - ;tie +; tie note G_, 13 note B_, 16 - ;tie +; tie note B_, 13 inc_octave - ;musicef 252 +; musicef -4 note B_, 16 - ;tie +; tie note B_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 16 - ;tie +; tie note G_, 13 inc_octave note F_, 16 - ;tie +; tie note F_, 13 note B_, 16 - ;tie +; tie note B_, 13 inc_octave - ;musicef 252 +; musicef -4 note D_, 16 - ;tie +; tie note D_, 13 - ;musicef 4 +; musicef 4 dec_octave note C_, 16 - ;tie +; tie note C_, 13 inc_octave note D_, 16 - ;tie +; tie note D_, 13 - ;musicef 252 +; musicef -4 note G_, 16 - ;tie +; tie note G_, 13 inc_octave note C_, 16 - ;tie +; tie note C_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave note C_, 16 - ;tie +; tie note C_, 13 inc_octave note D_, 16 - ;tie +; tie note D_, 13 note G_, 16 - ;tie +; tie note G_, 13 inc_octave - ;musicef 252 +; musicef -4 note C_, 16 - ;tie +; tie note C_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note B_, 16 - ;tie +; tie note B_, 13 inc_octave note A_, 16 - ;tie +; tie note A_, 13 inc_octave note D_, 16 - ;tie +; tie note D_, 13 inc_octave - ;musicef 252 +; musicef -4 note D_, 16 - ;tie +; tie note D_, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave note E_, 16 - ;tie +; tie note E_, 13 inc_octave note F#, 16 - ;tie +; tie note F#, 13 inc_octave note D_, 16 - ;tie +; tie note D_, 13 - ;musicef 252 +; musicef -4 note F#, 16 - ;tie +; tie note F#, 13 - ;musicef 4 +; musicef 4 dec_octave dec_octave note A_, 16 - ;tie +; tie note A_, 13 inc_octave note B_, 16 - ;tie +; tie note B_, 13 inc_octave - ;musicef 252 +; musicef -4 note G_, 16 - ;tie +; tie note G_, 13 dec_octave note B_, 16 - ;tie +; tie note B_, 13 - ;musicef 4 +; musicef 4 dec_octave note A_, 16 - ;tie +; tie note A_, 13 inc_octave note B_, 16 - ;tie +; tie note B_, 13 inc_octave - ;musicef 252 +; musicef -4 note G_, 16 - ;tie +; tie note G_, 13 dec_octave note B_, 16 - ;tie +; tie note B_, 13 - ;musicef 4 +; musicef 4 note C_, 16 - ;tie +; tie note C_, 13 inc_octave note D#, 16 - ;tie +; tie note D#, 13 inc_octave - ;musicef 252 +; musicef -4 note D_, 16 - ;tie +; tie note D_, 13 dec_octave note D_, 16 - ;tie +; tie note D_, 13 - ;musicef 4 +; musicef 4 dec_octave note D_, 16 - ;tie +; tie note D_, 13 inc_octave note E_, 16 - ;tie +; tie note E_, 13 note F#, 15 - ;musicef 252 +; musicef -4 note D_, 14 note C_, 15 dec_octave note A_, 14 - ;musicef 4 +; musicef 4 dec_octave note G_, 15 inc_octave @@ -2160,12 +2151,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 14 note G_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 note B_, 15 inc_octave note D_, 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave @@ -2175,12 +2166,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 15 note E_, 14 note F_, 15 - ;musicef 252 +; musicef -4 note B_, 14 inc_octave note C_, 15 note G_, 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 15 @@ -2190,11 +2181,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 14 note B_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 note B_, 15 rest 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave note D_, 15 @@ -2203,12 +2194,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 15 note E_, 14 note F_, 15 - ;musicef 252 +; musicef -4 note B_, 14 inc_octave note C_, 15 rest 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 15 @@ -2218,12 +2209,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 14 note G_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 note B_, 15 inc_octave note D_, 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave @@ -2233,12 +2224,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 15 note E_, 14 note F_, 15 - ;musicef 252 +; musicef -4 note B_, 14 inc_octave note C_, 15 note G_, 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 15 @@ -2248,12 +2239,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 14 note B_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 note B_, 15 inc_octave note D_, 14 - ;musicef 4 +; musicef 4 rest 15 dec_octave dec_octave @@ -2262,25 +2253,25 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 14 note B_, 15 inc_octave - ;musicef 252 +; musicef -4 note F_, 14 note D_, 15 note D#, 14 - ;musicef 4 +; musicef 4 dec_octave note C_, 15 note G_, 14 inc_octave note D_, 15 note E_, 14 - ;musicef 252 +; musicef -4 note G_, 15 inc_octave note D_, 14 note C_, 15 dec_octave note G_, 14 - ;musicef 4 +; musicef 4 rest 15 dec_octave note G_, 14 @@ -2289,10 +2280,10 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D#, 14 note G_, 15 inc_octave - ;musicef 252 +; musicef -4 note D_, 14 note C_, 15 - ;musicef 4 +; musicef 4 dec_octave note C_, 14 rest 15 @@ -2317,12 +2308,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note D_, 15 dec_octave - ;musicef 252 +; musicef -4 note B_, 14 inc_octave note F#, 15 note G_, 14 - ;musicef 4 +; musicef 4 rest 15 dec_octave note E_, 14 @@ -2332,23 +2323,23 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note B_, 14 inc_octave note C_, 15 - ;musicef 252 +; musicef -4 note G_, 14 note C_, 15 dec_octave note B_, 14 - ;musicef 4 +; musicef 4 rest 15 note A_, 14 inc_octave note C_, 15 note G_, 14 note F#, 15 - ;musicef 252 +; musicef -4 note D_, 14 note C_, 15 note D_, 14 - ;musicef 4 +; musicef 4 rest 15 dec_octave note A_, 14 @@ -2363,18 +2354,21 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 15 inc_octave note C_, 10 - channel_volume 13 + volume_envelope 12, 7 note D_, 4 - ;tie +; tie speed 4 note D_, 15 - ;tie +; tie note G_, 14 speed 1 - ;musicf0 5 - ;musicf1 71 +; preset 5 + volume_envelope 10, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 3 - ;musicf2 +; musicf2 note C_, 8 note C_, 7 note E_, 7 @@ -2687,10 +2681,13 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 7 note D_, 7 note F#, 7 - ;musicf0 29 +; preset 29 + volume_envelope 12, 7 + duty_cycle 2 + vibrato 0, 3, 3 octave 2 - ;musicef 255 - ;musicf1 71 +; musicef -1 +; musicf1 71 note D_, 4 note E_, 4 note F#, 4 @@ -2700,15 +2697,18 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note C_, 4 note D_, 3 - ;tie - ;musicf2 +; tie +; musicf2 note D_, 8 note D_, 7 - ;musicf0 5 - ;musicf1 71 +; preset 5 + volume_envelope 10, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 note D_, 7 rest 7 - ;musicf2 +; musicf2 note G_, 8 note D_, 7 note D_, 7 @@ -2721,14 +2721,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 7 note D_, 7 note B_, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note D_, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note F#, 8 note D_, 7 note D_, 7 @@ -2744,15 +2744,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 7 inc_octave note D_, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note D_, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note F_, 8 note D_, 7 note D_, 7 @@ -2768,15 +2768,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 7 inc_octave note D_, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note D_, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note F_, 8 note D_, 7 note D_, 7 @@ -2789,14 +2789,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 7 note D_, 7 note B_, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note D_, 7 - ;musicef 3 +; musicef 3 note E_, 7 rest 7 - ;musicf2 +; musicf2 note G_, 8 note E_, 7 note E_, 7 @@ -2809,14 +2809,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note E_, 7 note E_, 7 note B_, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note E_, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note G_, 8 note D_, 7 note D_, 7 @@ -2829,14 +2829,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 7 note D_, 7 note B_, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note D_, 7 - ;musicef 3 +; musicef 3 note E_, 7 rest 7 - ;musicf2 +; musicf2 note G_, 8 note E_, 7 inc_octave @@ -2852,11 +2852,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note E_, 8 inc_octave note G_, 7 - ;musicf3 +; musicf3 note F_, 3 - ;musicf2 +; musicf2 note F#, 11 - ;tie +; tie note F#, 8 note F#, 7 note E_, 7 @@ -2876,14 +2876,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 7 note A_, 7 note G_, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note A_, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note G_, 8 note D_, 7 note D_, 7 @@ -2896,14 +2896,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 7 note D_, 7 note B_, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note D_, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note F#, 8 note D_, 7 note D_, 7 @@ -2919,15 +2919,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 7 inc_octave note D_, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note D_, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note F_, 8 note D_, 7 inc_octave @@ -2943,11 +2943,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 8 inc_octave note F_, 7 - ;musicf3 +; musicf3 note D#, 3 - ;musicf2 +; musicf2 note E_, 11 - ;tie +; tie note E_, 8 note E_, 7 note D_, 7 @@ -2967,14 +2967,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G#, 7 note B_, 7 note A_, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note B_, 7 - ;musicef 3 +; musicef 3 note E_, 7 rest 7 - ;musicf2 +; musicf2 note G_, 8 note E_, 7 note E_, 7 @@ -2992,15 +2992,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note E_, 7 inc_octave note E_, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note E_, 7 - ;musicef 3 +; musicef 3 note D#, 7 rest 7 - ;musicf2 +; musicf2 note A_, 8 note D#, 7 note D#, 7 @@ -3018,15 +3018,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D#, 7 inc_octave note D#, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note D#, 7 - ;musicef 3 +; musicef 3 note A_, 7 rest 7 - ;musicf2 +; musicf2 inc_octave note C_, 8 dec_octave @@ -3043,10 +3043,10 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G_, 8 note C_, 7 note C_, 7 - ;musicf3 +; musicf3 note F#, 4 note G_, 3 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 note E_, 7 @@ -3066,8 +3066,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 7 note F#, 7 note G_, 7 - ;musicf0 29 - ;musicf3 +; preset 29 + volume_envelope 12, 7 + duty_cycle 2 + vibrato 0, 3, 3 +; musicf3 octave 3 rest 15 dec_octave @@ -3082,10 +3085,10 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note F_, 7 inc_octave note F_, 7 - ;tie +; tie speed 3 note F_, 15 - ;tie +; tie note F_, 14 speed 1 rest 15 @@ -3103,10 +3106,10 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note F_, 7 inc_octave note F_, 7 - ;tie +; tie speed 3 note F_, 15 - ;tie +; tie note F_, 14 speed 1 rest 15 @@ -3124,10 +3127,10 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note F_, 7 inc_octave note F_, 7 - ;tie +; tie speed 3 note F_, 15 - ;tie +; tie note F_, 14 speed 1 rest 15 @@ -3145,10 +3148,10 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note F_, 7 inc_octave note F_, 7 - ;tie +; tie speed 3 note F_, 15 - ;tie +; tie note F_, 14 speed 1 rest 15 @@ -3161,12 +3164,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 14 note G_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 note B_, 15 inc_octave note D_, 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave @@ -3176,12 +3179,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 15 note E_, 14 note F_, 15 - ;musicef 252 +; musicef -4 note B_, 14 inc_octave note C_, 15 note G_, 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 15 @@ -3191,19 +3194,22 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 14 note B_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 note B_, 15 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 87 - ;musicf3 +; musicf1 87 +; musicf3 note B_, 3 inc_octave note C_, 11 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 dec_octave note A_, 15 @@ -3214,8 +3220,11 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) rest 15 dec_octave note B_, 14 - ;musicf0 29 - ;musicf3 +; preset 29 + volume_envelope 12, 7 + duty_cycle 2 + vibrato 0, 3, 3 +; musicf3 vibrato 0, 3, 3 octave 1 note G_, 15 @@ -3225,12 +3234,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 14 note G_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 note B_, 15 inc_octave note D_, 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave dec_octave @@ -3240,12 +3249,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 15 note E_, 14 note F_, 15 - ;musicef 252 +; musicef -4 note B_, 14 inc_octave note C_, 15 note G_, 14 - ;musicef 4 +; musicef 4 dec_octave dec_octave note G_, 15 @@ -3255,12 +3264,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 14 note B_, 15 inc_octave - ;musicef 252 +; musicef -4 note A_, 14 note B_, 15 inc_octave note D_, 14 - ;musicef 4 +; musicef 4 rest 15 dec_octave dec_octave @@ -3269,25 +3278,25 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 14 note B_, 15 inc_octave - ;musicef 252 +; musicef -4 note F_, 14 note D_, 15 note D#, 14 - ;musicef 4 +; musicef 4 dec_octave note C_, 15 note G_, 14 inc_octave note D_, 15 note E_, 14 - ;musicef 252 +; musicef -4 note G_, 15 inc_octave note D_, 14 note C_, 15 dec_octave note G_, 14 - ;musicef 4 +; musicef 4 rest 15 dec_octave note G_, 14 @@ -3296,34 +3305,52 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D#, 14 note G_, 15 inc_octave - ;musicef 252 +; musicef -4 note D_, 14 note C_, 15 - ;musicef 4 +; musicef 4 dec_octave note C_, 14 rest 15 dec_octave note F#, 14 note A_, 15 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note F#, 14 - ;musicf0 29 +; preset 29 + volume_envelope 12, 7 + duty_cycle 2 + vibrato 0, 3, 3 octave 3 note D_, 15 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note E_, 14 - ;musicf0 29 +; preset 29 + volume_envelope 12, 7 + duty_cycle 2 + vibrato 0, 3, 3 octave 3 note D_, 15 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note B_, 14 - ;tie +; tie note B_, 15 - ;musicf0 29 +; preset 29 + volume_envelope 12, 7 + duty_cycle 2 + vibrato 0, 3, 3 octave 1 note B_, 14 inc_octave @@ -3332,12 +3359,12 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note D_, 15 dec_octave - ;musicef 252 +; musicef -4 note B_, 14 inc_octave note F#, 15 note G_, 14 - ;musicef 4 +; musicef 4 rest 15 dec_octave note E_, 14 @@ -3347,30 +3374,33 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note B_, 14 inc_octave note C_, 15 - ;musicef 252 +; musicef -4 note G_, 14 note C_, 15 dec_octave note B_, 14 - ;musicef 4 +; musicef 4 rest 15 note A_, 14 inc_octave note C_, 15 note G_, 14 note F#, 15 - ;musicef 252 +; musicef -4 note D_, 14 note C_, 15 note D_, 14 - ;musicef 4 - ;musicf0 5 - ;musicf1 71 +; musicef 4 +; preset 5 + volume_envelope 10, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 3 rest 15 note C_, 7 rest 7 - ;musicf2 +; musicf2 note D#, 8 note C_, 7 note C_, 7 @@ -3383,14 +3413,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D#, 7 note D#, 7 note A#, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note D#, 7 - ;musicef 3 +; musicef 3 note C_, 7 rest 7 - ;musicf2 +; musicf2 note D#, 8 note C_, 7 note C_, 7 @@ -3403,14 +3433,14 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D#, 7 note D#, 7 note A#, 7 - ;musicf3 +; musicf3 rest 8 - ;musicef 253 +; musicef -3 note D#, 7 - ;musicef 3 +; musicef 3 note F_, 7 rest 7 - ;musicf2 +; musicf2 note G#, 8 note F_, 7 note F_, 7 @@ -3428,15 +3458,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G#, 7 inc_octave note D#, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note G#, 7 - ;musicef 3 +; musicef 3 note F_, 7 rest 7 - ;musicf2 +; musicf2 note G#, 8 note F_, 7 note F_, 7 @@ -3454,15 +3484,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G#, 7 inc_octave note D#, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note G#, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note F#, 8 note D_, 7 note D_, 7 @@ -3478,15 +3508,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note F#, 7 inc_octave note D_, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note F#, 7 - ;musicef 3 +; musicef 3 note D_, 7 rest 7 - ;musicf2 +; musicf2 note F#, 8 note D_, 7 note D_, 7 @@ -3502,15 +3532,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note F#, 7 inc_octave note D_, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note F#, 7 - ;musicef 3 +; musicef 3 note E_, 7 rest 7 - ;musicf2 +; musicf2 note G_, 8 note E_, 7 note E_, 7 @@ -3526,15 +3556,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G_, 7 inc_octave note E_, 7 - ;musicf3 +; musicf3 rest 8 dec_octave - ;musicef 253 +; musicef -3 note G_, 7 - ;musicef 3 +; musicef 3 note E_, 7 rest 7 - ;musicf2 +; musicf2 note G_, 8 note E_, 7 note E_, 7 @@ -3550,15 +3580,21 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G_, 7 inc_octave note E_, 7 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 - ;musicf3 +; musicf3 note F#, 15 - ;musicf0 5 - ;musicf1 71 +; preset 5 + volume_envelope 10, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 3 - ;musicf2 +; musicf2 note F#, 4 note D_, 3 note D_, 4 @@ -3569,29 +3605,41 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note D_, 4 dec_octave note A_, 3 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note D_, 14 - ;musicf0 5 +; preset 5 + volume_envelope 10, 7 + duty_cycle 2 + vibrato 28, 3, 3 octave 5 - ;musicf1 71 - ;musicf2 +; musicf1 71 +; musicf2 note D_, 4 dec_octave note A_, 4 note A_, 4 inc_octave note D_, 3 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note B_, 14 note E_, 15 - ;musicf0 5 - ;musicf1 71 +; preset 5 + volume_envelope 10, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 3 - ;musicf2 +; musicf2 note B_, 4 note E_, 3 note E_, 4 @@ -3602,38 +3650,50 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note E_, 4 dec_octave note B_, 3 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note D_, 14 - ;musicf0 5 +; preset 5 + volume_envelope 10, 7 + duty_cycle 2 + vibrato 28, 3, 3 octave 5 - ;musicf1 71 - ;musicf2 +; musicf1 71 +; musicf2 note E_, 4 dec_octave note B_, 4 note B_, 4 inc_octave note E_, 3 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note G_, 14 note A_, 4 - ;musicf0 5 - ;musicf1 71 - ;musicf3 - ;musicef 253 +; preset 5 + volume_envelope 10, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 +; musicef -3 octave 4 note E_, 4 rest 7 - ;musicef 3 +; musicef 3 octave 3 note G_, 7 rest 7 inc_octave - ;musicf2 +; musicf2 note C_, 8 dec_octave note G_, 7 @@ -3646,10 +3706,13 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G_, 7 inc_octave note G_, 7 - ;musicf0 26 - ;musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 octave 3 - ;musicef 1 +; musicef 1 note C_, 4 note D_, 4 note E_, 4 @@ -3658,29 +3721,29 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note A_, 3 note A#, 4 note B_, 3 - ;musicef 1 - ;musicf1 70 +; musicef 1 +; musicf1 70 inc_octave note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 note C_, 14 dec_octave note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 note A_, 14 - ;musicef 4 - ;musicf1 80 +; musicef 4 +; musicf1 80 rest 8 octave 2 note B_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -3700,15 +3763,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note G_, 4 note D_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note G_, 4 - ;musicef 4 +; musicef 4 dec_octave note B_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -3728,15 +3791,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note G_, 4 note D_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note G_, 4 - ;musicef 4 +; musicef 4 dec_octave note A_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note C_, 4 dec_octave @@ -3756,15 +3819,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 4 note C_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note F_, 4 - ;musicef 4 +; musicef 4 dec_octave note A_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note C_, 4 dec_octave @@ -3784,15 +3847,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 4 note C_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note F_, 4 - ;musicef 4 +; musicef 4 dec_octave note B_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -3812,15 +3875,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note G_, 4 note D_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note G_, 4 - ;musicef 4 +; musicef 4 dec_octave note B_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -3840,15 +3903,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note G_, 4 note D_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note G_, 4 - ;musicef 4 +; musicef 4 dec_octave note A_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note C_, 4 dec_octave @@ -3868,15 +3931,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 4 note C_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note F_, 4 - ;musicef 4 +; musicef 4 dec_octave note A_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note C_, 4 dec_octave @@ -3896,15 +3959,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 4 note C_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note F_, 4 - ;musicef 4 +; musicef 4 dec_octave note B_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -3924,15 +3987,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note G_, 4 note D_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note G_, 4 - ;musicef 4 +; musicef 4 dec_octave note B_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -3952,15 +4015,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note G_, 4 note D_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note G_, 4 - ;musicef 4 +; musicef 4 dec_octave note A_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note C_, 4 dec_octave @@ -3980,15 +4043,15 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) inc_octave note F_, 4 note C_, 3 - ;musicf3 +; musicf3 rest 4 - ;musicef 252 +; musicef -4 note F_, 4 - ;musicef 4 +; musicef 4 dec_octave note A_, 4 rest 3 - ;musicf2 +; musicf2 inc_octave note C_, 4 dec_octave @@ -4047,7 +4110,7 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G_, 3 dec_octave dec_octave - ;musicf3 +; musicf3 note A_, 4 note B_, 4 inc_octave @@ -4059,285 +4122,284 @@ Music_TCG2Credits_Ch1: ; 1deabb (77:6abb) note G_, 4 note A_, 3 inc_octave - ;musicf1 68 +; musicf1 68 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 speed 2 note G_, 14 sound_ret -Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) - channel_volume 1 - ;fade_wave 16 +Music_TCG2Credits_Ch3: + fade_wave 15 load_wave 12, 12, 12, 12, 12, 12, 12, 12, 11, 12, 12, 12, 11, 12, 12, 12, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11 - ;musicdc 255 + stereo_panning TRUE, TRUE speed 1 channel_volume 1 - ;musice9 96 +; echo 96 octave 5 - ;musice8 8 - ;vibrato_type 3 +; cutoff 8 +; vibrato_type 3 vibrato 15, 3, 3 channel_volume 2 - ;musice8 8 +; cutoff 8 note G#, 3 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 vibrato 0, 3, 3 note D_, 15 - ;tie +; tie note D_, 14 note G#, 3 vibrato 10, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;musice8 8 +; cutoff 8 vibrato 0, 3, 3 note G_, 15 - ;tie +; tie note G_, 5 note A_, 9 - ;tie +; tie note A_, 15 - ;musice8 4 +; cutoff 4 note B_, 14 - ;musice8 8 +; cutoff 8 note B_, 3 inc_octave note C_, 5 - ;tie +; tie note C_, 14 dec_octave note B_, 7 - ;tie +; tie note B_, 15 vibrato 16, 3, 3 - ;musice8 1 +; cutoff 1 note G_, 14 - ;tie +; tie speed 4 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie speed 2 note G_, 15 - ;tie +; tie note G_, 14 - ;musice8 8 +; cutoff 8 speed 1 note G#, 3 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 vibrato 0, 3, 3 note D_, 15 - ;tie +; tie note D_, 14 note G#, 3 vibrato 10, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note G_, 14 - ;tie +; tie note G_, 15 note A_, 14 note B_, 15 inc_octave - ;musice8 4 +; cutoff 4 note C_, 14 - ;musice8 8 +; cutoff 8 note C#, 3 note D_, 5 - ;tie +; tie note D_, 14 note C_, 7 - ;tie +; tie note C_, 15 dec_octave note B_, 14 - ;tie +; tie note B_, 15 vibrato 16, 3, 3 - ;musice8 1 +; cutoff 1 note G_, 14 - ;tie +; tie speed 4 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie speed 1 note G_, 2 - ;tie +; tie speed 3 note G_, 9 speed 1 - ;musice8 8 +; cutoff 8 channel_volume 1 rest 15 rest 14 rest 15 sound_call Branch_1dfa9d note B_, 15 - ;tie +; tie note B_, 14 vibrato 0, 3, 3 inc_octave note D_, 15 - ;musice8 1 +; cutoff 1 note F#, 14 - ;tie +; tie note F#, 15 note G_, 14 - ;tie +; tie note G_, 15 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note C#, 3 note D_, 12 - ;tie +; tie note D_, 7 note C_, 15 - ;tie +; tie note C_, 7 dec_octave - ;musice8 4 +; cutoff 4 note B_, 14 - ;musice8 8 +; cutoff 8 note B_, 15 - ;tie +; tie note B_, 14 inc_octave note C_, 15 dec_octave vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 inc_octave note C#, 3 note D_, 12 - ;tie +; tie note D_, 7 note C_, 15 - ;tie +; tie note C_, 7 dec_octave - ;musice8 4 +; cutoff 4 note B_, 14 - ;musice8 8 +; cutoff 8 note B_, 15 - ;tie +; tie note B_, 14 inc_octave note C_, 15 dec_octave vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 vibrato 15, 3, 3 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;musice8 1 +; cutoff 1 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 channel_volume 2 note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 dec_octave channel_volume 1 @@ -4354,267 +4416,267 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) rest 15 rest 14 note D#, 3 - ;musice8 8 +; cutoff 8 vibrato 12, 3, 3 note E_, 12 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 vibrato 0, 3, 3 - ;musice8 4 +; cutoff 4 note C_, 14 - ;musice8 8 +; cutoff 8 note E_, 15 - ;tie +; tie note E_, 14 note A#, 3 note B_, 12 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;musice8 8 +; cutoff 8 vibrato 0, 3, 3 note F_, 3 note F#, 11 - ;tie +; tie note F#, 15 note E_, 14 - ;tie +; tie note E_, 15 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note D_, 14 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 vibrato 0, 3, 3 dec_octave - ;musice8 8 +; cutoff 8 note B_, 14 inc_octave note D_, 15 note A_, 14 note F#, 15 - ;musice8 1 +; cutoff 1 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 vibrato 0, 3, 3 note D_, 14 - ;tie +; tie note D_, 15 dec_octave note B_, 14 - ;tie +; tie note B_, 15 - ;musice8 8 +; cutoff 8 note B_, 3 inc_octave vibrato 14, 3, 3 note C_, 11 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 vibrato 0, 3, 3 - ;musice8 3 +; cutoff 3 note G_, 15 - ;musice8 1 +; cutoff 1 note G_, 14 - ;tie +; tie note G_, 15 note C_, 14 - ;tie +; tie note C_, 15 vibrato 14, 3, 3 - ;musice8 8 +; cutoff 8 dec_octave note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 vibrato 0, 3, 3 note A_, 15 - ;tie +; tie note A_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;musice8 1 +; cutoff 1 note A_, 15 - ;tie +; tie note G_, 14 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 inc_octave note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 dec_octave - ;musice8 8 +; cutoff 8 note A#, 3 vibrato 12, 3, 3 - ;musice8 1 +; cutoff 1 note B_, 12 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 7 - ;tie +; tie note B_, 7 - ;musice8 8 +; cutoff 8 rest 15 rest 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 inc_octave note D#, 3 vibrato 12, 3, 3 note E_, 12 note E_, 14 - ;tie +; tie note E_, 15 vibrato 0, 3, 3 - ;musice8 4 +; cutoff 4 note C_, 14 - ;musice8 8 +; cutoff 8 note E_, 15 - ;tie +; tie note E_, 14 note A#, 3 note B_, 12 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 vibrato 0, 3, 3 note B_, 14 - ;tie +; tie note B_, 15 inc_octave note C_, 14 - ;tie +; tie note C_, 15 vibrato 14, 3, 3 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note C#, 2 note D_, 12 - ;tie +; tie note D_, 15 note E_, 14 note F#, 15 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 vibrato 0, 3, 3 note F#, 14 - ;tie +; tie note F#, 15 note E_, 14 - ;tie +; tie note E_, 15 vibrato 14, 3, 3 note D_, 14 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 4 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;musice8 8 +; cutoff 8 vibrato 0, 3, 3 note F#, 3 note G_, 11 note F#, 15 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note D_, 14 - ;tie +; tie speed 4 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie speed 2 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie speed 1 note D_, 1 - ;tie +; tie speed 2 note D_, 14 - ;musice8 8 +; cutoff 8 speed 1 vibrato 0, 3, 3 note C#, 3 @@ -4622,129 +4684,129 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note C_, 14 dec_octave vibrato 15, 3, 3 - ;musice8 1 +; cutoff 1 note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 vibrato 0, 3, 3 inc_octave note D_, 14 - ;tie +; tie note D_, 15 - ;musice8 8 +; cutoff 8 note G#, 3 vibrato 11, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 11 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 vibrato 0, 3, 3 note G_, 14 - ;tie +; tie note G_, 15 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 speed 1 note D_, 14 - ;tie +; tie speed 4 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie speed 1 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 vibrato 0, 3, 3 dec_octave - ;musice8 8 +; cutoff 8 note B_, 15 inc_octave note C_, 14 - ;musice8 3 +; cutoff 3 note D_, 15 - ;musice8 1 +; cutoff 1 vibrato 14, 3, 3 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 vibrato 0, 3, 3 note C_, 14 - ;tie +; tie note C_, 15 dec_octave vibrato 14, 3, 3 - ;musice8 8 +; cutoff 8 note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 vibrato 0, 3, 3 note A_, 15 - ;tie +; tie note A_, 14 note G_, 15 - ;musice8 1 +; cutoff 1 note B_, 14 - ;tie +; tie note B_, 15 vibrato 14, 3, 3 - ;musice8 8 +; cutoff 8 note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 vibrato 0, 3, 3 channel_volume 2 inc_octave - ;musice8 1 +; cutoff 1 note C_, 7 - ;tie +; tie speed 2 note C_, 11 speed 8 speed 1 note E_, 7 - ;tie +; tie speed 2 note E_, 11 speed 1 - ;musice8 8 +; cutoff 8 note D_, 14 - ;tie +; tie note D_, 15 - ;musice8 4 +; cutoff 4 note C_, 14 dec_octave note B_, 15 @@ -4752,63 +4814,63 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note G_, 15 note F#, 14 inc_octave - ;musice8 8 +; cutoff 8 channel_volume 1 note C#, 3 note D_, 12 note C_, 14 - ;musice8 1 +; cutoff 1 dec_octave vibrato 14, 3, 3 note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 vibrato 0, 3, 3 inc_octave note D_, 14 - ;tie +; tie note D_, 15 - ;musice8 8 +; cutoff 8 note G#, 3 vibrato 11, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 11 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 vibrato 0, 3, 3 note B_, 14 - ;tie +; tie note B_, 15 vibrato 14, 3, 3 - ;musice8 8 +; cutoff 8 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 vibrato 0, 3, 3 dec_octave @@ -4816,16 +4878,16 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note B_, 3 inc_octave note C_, 11 - ;tie +; tie note C_, 15 dec_octave - ;musice8 4 +; cutoff 4 note B_, 14 note A_, 15 note G#, 14 note F_, 15 inc_octave - ;musice8 8 +; cutoff 8 channel_volume 1 note C_, 14 dec_octave @@ -4833,108 +4895,108 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) inc_octave note C_, 14 note C_, 15 - ;tie +; tie note C_, 14 - ;musice8 4 +; cutoff 4 note G_, 15 - ;musice8 1 +; cutoff 1 note G_, 14 - ;tie +; tie note G_, 15 note C_, 14 - ;tie +; tie note C_, 15 dec_octave - ;musice8 8 +; cutoff 8 note A#, 3 vibrato 11, 3, 3 note B_, 11 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 vibrato 0, 3, 3 note A_, 15 - ;tie +; tie note A_, 14 note G_, 15 - ;tie +; tie note G_, 14 note A_, 15 - ;tie +; tie note A_, 7 note G_, 4 note A_, 3 vibrato 15, 3, 3 note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 dec_octave note G_, 7 channel_volume 2 note G_, 7 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie channel_volume 2 - ;musice8 1 +; cutoff 1 note G_, 15 - ;tie +; tie note G_, 14 rest 15 rest 14 - ;musice8 8 +; cutoff 8 .Loop1 rest 15 rest 14 rest 8 octave 3 channel_volume 2 - ;musice4 253 +; frequency_offset -3 note D_, 14 note G_, 15 note B_, 14 @@ -4942,26 +5004,26 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note D_, 15 dec_octave note G_, 7 - ;musice4 0 +; frequency_offset 0 channel_volume 1 note G_, 7 channel_volume 2 note G_, 7 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie channel_volume 2 - ;musice8 1 +; cutoff 1 note G_, 15 - ;tie +; tie note G_, 14 - ;musice8 8 +; cutoff 8 rest 15 rest 14 sound_loop 2, .Loop1 @@ -4970,7 +5032,7 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) rest 8 octave 3 channel_volume 2 - ;musice4 253 +; frequency_offset -3 note D_, 14 note G_, 15 note B_, 14 @@ -4978,23 +5040,23 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note D_, 15 dec_octave note G_, 7 - ;musice4 0 +; frequency_offset 0 inc_octave channel_volume 1 note C_, 7 channel_volume 2 note C_, 7 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 channel_volume 3 note C_, 15 @@ -5007,20 +5069,20 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) sound_call Branch_1dfa9d sound_call Branch_1dfb57 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 inc_octave note C_, 4 note D_, 3 @@ -5029,104 +5091,104 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note F#, 3 vibrato 26, 3, 3 note G_, 12 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 vibrato 29, 3, 3 - ;musice8 1 +; cutoff 1 note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 1 - ;tie +; tie speed 2 note F_, 14 speed 1 - ;musice8 8 +; cutoff 8 vibrato 29, 3, 3 note F#, 15 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 15 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 15 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 15 - ;tie +; tie note F#, 14 - ;musice8 1 +; cutoff 1 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;musice8 8 +; cutoff 8 note F#, 4 note G_, 3 note A_, 4 note A#, 3 note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;musice8 1 +; cutoff 1 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 note B_, 4 @@ -5138,23 +5200,23 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note G_, 4 note G#, 3 note G#, 3 - ;musice8 1 +; cutoff 1 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 note F#, 14 - ;tie +; tie note F#, 15 - ;musice8 8 +; cutoff 8 note D_, 14 note F#, 3 vibrato 12, 3, 3 note G_, 12 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 vibrato 0, 3, 3 note F#, 14 @@ -5163,190 +5225,190 @@ Music_TCG2Credits_Ch3: ; 1df4a3 (77:74a3) note B_, 14 inc_octave note C_, 15 - ;musice8 4 +; cutoff 4 note G_, 14 - ;musice8 1 +; cutoff 1 vibrato 15, 3, 3 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 1 - ;tie +; tie speed 2 note G_, 14 speed 1 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note F#, 3 vibrato 12, 3, 3 - ;musice8 1 +; cutoff 1 note G_, 12 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 vibrato 15, 3, 3 note F#, 15 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 15 - ;tie +; tie note F#, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note G#, 3 - ;musice8 1 +; cutoff 1 vibrato 12, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 vibrato 0, 3, 3 vibrato 15, 3, 3 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note G#, 3 vibrato 12, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 vibrato 0, 3, 3 vibrato 15, 3, 3 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note G#, 3 vibrato 12, 3, 3 - ;musice8 1 +; cutoff 1 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note A#, 3 vibrato 26, 3, 3 note B_, 12 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 vibrato 0, 3, 3 - ;musice8 1 +; cutoff 1 speed 1 channel_volume 2 note B_, 14 @@ -5363,65 +5425,65 @@ Branch_1dfa9d: note D_, 14 note G_, 15 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 vibrato 0, 3, 3 note A_, 14 - ;tie +; tie note A_, 15 inc_octave note C_, 14 - ;tie +; tie note C_, 15 dec_octave - ;musice8 8 +; cutoff 8 vibrato 14, 3, 3 note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 vibrato 0, 3, 3 note G_, 15 - ;musice8 1 +; cutoff 1 note D_, 14 - ;tie +; tie note D_, 15 note B_, 14 - ;tie +; tie note B_, 15 vibrato 14, 3, 3 - ;musice8 8 +; cutoff 8 note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 vibrato 0, 3, 3 note F_, 15 - ;musice8 1 +; cutoff 1 note C_, 14 - ;tie +; tie note C_, 15 note A_, 14 - ;tie +; tie note A_, 15 vibrato 14, 3, 3 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 dec_octave note A_, 14 note B_, 15 @@ -5429,184 +5491,184 @@ Branch_1dfa9d: note D_, 14 note G_, 15 note F_, 14 - ;tie +; tie note F_, 15 - ;musice8 1 +; cutoff 1 note A_, 14 - ;tie +; tie note A_, 15 inc_octave note C_, 14 - ;tie +; tie note C_, 15 note E_, 14 - ;tie +; tie note E_, 15 vibrato 14, 3, 3 - ;musice8 8 +; cutoff 8 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 vibrato 0, 3, 3 dec_octave note B_, 15 - ;musice8 1 +; cutoff 1 note G_, 14 - ;tie +; tie note G_, 15 note F#, 14 - ;tie +; tie note F#, 15 vibrato 14, 3, 3 note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note D#, 14 - ;musice8 1 +; cutoff 1 note E_, 15 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 note B_, 14 - ;tie +; tie note B_, 15 note A_, 14 - ;tie +; tie note A_, 15 vibrato 14, 3, 3 note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note G#, 3 note A_, 11 - ;tie +; tie note A_, 15 note G_, 14 - ;musice8 4 +; cutoff 4 note A_, 15 - ;musice8 8 +; cutoff 8 note A#, 3 vibrato 11, 3, 3 note B_, 11 - ;tie +; tie sound_ret Branch_1dfb57: octave 4 - ;musice8 8 +; cutoff 8 note B_, 15 - ;tie +; tie note B_, 14 vibrato 0, 3, 3 inc_octave note D_, 15 - ;musice8 1 +; cutoff 1 note A_, 14 - ;tie +; tie note A_, 15 note G_, 14 - ;tie +; tie note G_, 15 vibrato 14, 3, 3 note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 vibrato 0, 3, 3 - ;musice8 8 +; cutoff 8 note C#, 3 note D_, 12 - ;tie +; tie note D_, 7 note C_, 15 - ;tie +; tie note C_, 7 dec_octave - ;musice8 4 +; cutoff 4 note B_, 14 - ;musice8 8 +; cutoff 8 note B_, 15 - ;tie +; tie note B_, 14 inc_octave note C_, 15 dec_octave note E_, 14 - ;tie +; tie note E_, 15 note G#, 3 note A_, 11 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 4 note G_, 5 note A_, 5 note G_, 15 - ;tie +; tie note G_, 14 note F#, 15 - ;tie +; tie note F#, 14 note E_, 15 note F#, 14 - ;tie +; tie note F#, 15 vibrato 14, 3, 3 - ;musice8 1 +; cutoff 1 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie sound_ret -Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) +Music_TCG2Credits_Ch4: toggle_noise 6 octave 1 - ;musicdc 255 + stereo_panning TRUE, TRUE drum_speed 4 .Loop1 rest 15 @@ -5629,12 +5691,12 @@ Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) rest 14 rest 15 rest 14 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 3 - ;musicef 0 +; musicef 0 drum_note 3, 4 drum_note 3, 3 drum_note 3, 4 @@ -5657,12 +5719,12 @@ Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) drum_note 4, 15 drum_note 2, 14 drum_note 5, 15 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 15 drum_note 2, 14 drum_note 4, 15 @@ -5677,12 +5739,12 @@ Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) drum_note 1, 15 drum_note 2, 14 drum_note 5, 15 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 15 drum_note 2, 14 drum_note 5, 15 @@ -5695,21 +5757,21 @@ Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) drum_note 2, 15 drum_note 1, 14 drum_note 4, 15 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 sound_call Branch_1dfd61 drum_note 4, 15 drum_note 2, 14 drum_note 4, 15 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 15 drum_note 2, 14 drum_note 5, 15 @@ -5722,31 +5784,31 @@ Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) drum_note 2, 15 drum_note 1, 14 drum_note 4, 15 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 1, 15 drum_note 2, 14 drum_note 5, 15 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 15 drum_note 1, 14 drum_note 1, 15 drum_speed 6 - ;musicef 2 +; musicef 2 drum_note 6, 9 drum_speed 1 rest 4 rest 14 rest 15 - ;musicef 0 +; musicef 0 drum_note 4, 14 drum_speed 4 drum_note 5, 7 @@ -5792,12 +5854,12 @@ Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) drum_note 1, 15 drum_note 2, 14 drum_note 5, 15 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 15 drum_note 2, 14 drum_note 1, 15 @@ -5830,11 +5892,11 @@ Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) drum_note 2, 7 drum_note 2, 15 drum_note 5, 4 - ;musicef 250 +; musicef -6 drum_note 2, 5 - ;musicef 252 +; musicef -4 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 drum_note 5, 14 @@ -5864,11 +5926,11 @@ Music_TCG2Credits_Ch4: ; 1dfbb7 (77:7bb7) drum_note 1, 8 drum_note 2, 7 drum_note 4, 7 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 drum_note 2, 14 @@ -5954,11 +6016,11 @@ Branch_1dfd7a: drum_note 2, 15 drum_note 1, 14 drum_note 4, 15 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 sound_ret Branch_1dfd8d: @@ -5973,4 +6035,3 @@ Branch_1dfd8d: drum_note 2, 15 drum_note 5, 14 sound_ret -; 0x1dfd99 diff --git a/crysaudio/music/TCG2/diddly1.asm b/crysaudio/music/TCG2/ditty1.asm similarity index 82% rename from crysaudio/music/TCG2/diddly1.asm rename to crysaudio/music/TCG2/ditty1.asm index 24535165..b78125c3 100644 --- a/crysaudio/music/TCG2/diddly1.asm +++ b/crysaudio/music/TCG2/ditty1.asm @@ -1,28 +1,30 @@ -Music_Diddly1: +Music_Ditty1: channel_count 3 - channel 1, Music_Diddly1_Ch1 - channel 2, Music_Diddly1_Ch2 - channel 3, Music_Diddly1_Ch3 + channel 1, Music_Ditty1_Ch1 + channel 2, Music_Ditty1_Ch2 + channel 3, Music_Ditty1_Ch3 -Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) - channel_volume 10 - ;musicf0 2 +Music_Ditty1_Ch2: +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 speed 1 octave 2 note D#, 2 note E_, 3 note D#, 3 note E_, 3 - ;musicef 254 +; musicef -2 note D#, 2 note E_, 3 - ;musicef 255 +; musicef -1 note D#, 3 note E_, 3 - ;musicef 1 +; musicef 1 note D#, 2 note E_, 3 - ;musicef 1 +; musicef 1 note D#, 3 note E_, 3 note D#, 2 @@ -55,13 +57,13 @@ Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) note D_, 3 dec_octave note G#, 2 - ;musicef 1 +; musicef 1 note B_, 3 inc_octave note D_, 3 note F_, 3 dec_octave - ;musicef 253 +; musicef -3 note G#, 2 note B_, 3 inc_octave @@ -69,20 +71,20 @@ Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) note F_, 3 dec_octave note G#, 2 - ;musicef 255 +; musicef -1 note B_, 3 inc_octave note D_, 3 note F_, 3 dec_octave - ;musicef 254 +; musicef -2 note G#, 2 note B_, 3 inc_octave note D_, 3 note F_, 3 dec_octave - ;musicef 255 +; musicef -1 note G#, 2 note B_, 3 inc_octave @@ -91,25 +93,27 @@ Music_Diddly1_Ch2: ; 1ebc57 (7a:7c57) sound_ret -Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) - channel_volume 10 - ;musicf0 2 +Music_Ditty1_Ch1: +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 speed 1 octave 1 - ;musicef 1 +; musicef 1 note G_, 2 note G#, 3 note G_, 3 note G#, 3 - ;musicef 254 +; musicef -2 note G_, 2 note G#, 3 - ;musicef 255 +; musicef -1 note G_, 3 note G#, 3 note G_, 2 note G#, 3 - ;musicef 1 +; musicef 1 note G_, 3 note G#, 3 note G_, 2 @@ -152,28 +156,28 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) dec_octave note G#, 3 note A#, 3 - ;musicef 253 +; musicef -3 note A#, 2 inc_octave note D_, 3 dec_octave note G#, 3 note A#, 3 - ;musicef 254 +; musicef -2 note A#, 2 inc_octave note D_, 3 dec_octave note G#, 3 note A#, 3 - ;musicef 254 +; musicef -2 note A#, 2 inc_octave note D_, 3 dec_octave note G#, 3 note A#, 3 - ;musicef 255 +; musicef -1 note A#, 2 inc_octave note D_, 3 @@ -183,18 +187,17 @@ Music_Diddly1_Ch1: ; 1ebcb5 (7a:7cb5) sound_ret -Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) - channel_volume 1 - ;fade_wave 15 +Music_Ditty1_Ch3: + fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 2 channel_volume 1 note C_, 2 note C#, 3 channel_volume 2 - ;musicef 252 +; musicef -4 note C_, 3 note C#, 3 note C_, 2 @@ -257,4 +260,3 @@ Music_Diddly1_Ch3: ; 1ebd17 (7a:7d17) note C_, 3 note E_, 3 sound_ret -; 0x1ebd67 diff --git a/crysaudio/music/TCG2/diddly2.asm b/crysaudio/music/TCG2/ditty2.asm similarity index 84% rename from crysaudio/music/TCG2/diddly2.asm rename to crysaudio/music/TCG2/ditty2.asm index 41a57b37..32ccdf11 100644 --- a/crysaudio/music/TCG2/diddly2.asm +++ b/crysaudio/music/TCG2/ditty2.asm @@ -1,14 +1,16 @@ -Music_Diddly2: +Music_Ditty2: channel_count 3 - channel 1, Music_Diddly2_Ch1 - channel 2, Music_Diddly2_Ch2 - channel 3, Music_Diddly2_Ch3 + channel 1, Music_Ditty2_Ch1 + channel 2, Music_Ditty2_Ch2 + channel 3, Music_Ditty2_Ch3 -Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67) - channel_volume 10 - ;musicf0 2 +Music_Ditty2_Ch2: +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 2 note B_, 5 note D_, 4 @@ -58,27 +60,29 @@ Music_Diddly2_Ch2: ; 1ebd67 (7a:7d67) note G#, 3 note G_, 3 note G#, 3 - ;musicef 254 +; musicef -2 note G_, 4 note G#, 3 note G_, 3 note G#, 3 - ;musicef 254 +; musicef -2 note G_, 3 note G#, 3 note G_, 3 - ;musicef 255 +; musicef -1 note G#, 3 note G_, 4 note G#, 3 sound_ret -Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) - channel_volume 10 - ;musicf0 2 +Music_Ditty2_Ch1: +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 2 note F_, 4 dec_octave @@ -147,13 +151,13 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) inc_octave note C_, 3 dec_octave - ;musicef 254 +; musicef -2 note B_, 4 inc_octave note C_, 3 dec_octave note B_, 3 - ;musicef 254 +; musicef -2 inc_octave note C_, 3 dec_octave @@ -161,7 +165,7 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) inc_octave note C_, 3 dec_octave - ;musicef 255 +; musicef -1 note B_, 3 inc_octave note C_, 3 @@ -172,13 +176,12 @@ Music_Diddly2_Ch1: ; 1ebdaf (7a:7daf) sound_ret -Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) - channel_volume 1 +Music_Ditty2_Ch3: fade_wave 14 speed 1 - ;musice9 128 - ;musicdc 255 - ;musice8 7 +; echo 128 + stereo_panning TRUE, TRUE +; cutoff 7 channel_volume 1 octave 2 note G_, 5 @@ -214,7 +217,7 @@ Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) note G_, 5 note G_, 4 note G_, 4 - ;musicf1 64 +; musicf1 64 note G_, 4 note G_, 4 note G_, 4 @@ -233,4 +236,3 @@ Music_Diddly2_Ch3: ; 1ebe13 (7a:7e13) note G_, 4 note G_, 4 sound_ret -; 0x1ebe5d diff --git a/crysaudio/music/TCG2/diddly3.asm b/crysaudio/music/TCG2/ditty3.asm similarity index 57% rename from crysaudio/music/TCG2/diddly3.asm rename to crysaudio/music/TCG2/ditty3.asm index 15b4db12..35277664 100644 --- a/crysaudio/music/TCG2/diddly3.asm +++ b/crysaudio/music/TCG2/ditty3.asm @@ -1,67 +1,70 @@ -Music_Diddly3: +Music_Ditty3: channel_count 3 - channel 1, Music_Diddly3_Ch1 - channel 2, Music_Diddly3_Ch2 - channel 3, Music_Diddly3_Ch3 + channel 1, Music_Ditty3_Ch1 + channel 2, Music_Ditty3_Ch2 + channel 3, Music_Ditty3_Ch3 -Music_Diddly3_Ch2: ; 1ebe5d (7a:7e5d) - channel_volume 10 - ;musicf0 2 +Music_Ditty3_Ch2: +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 5 note C_, 3 dec_octave - ;musicf1 48 +; musicf1 48 note C_, 2 note C_, 1 - ;musicf1 0 +; musicf1 0 note G_, 3 inc_octave note C_, 3 note G_, 3 inc_octave - ;musicf1 48 +; musicf1 48 note C_, 5 note C_, 6 sound_ret -Music_Diddly3_Ch1: ; 1ebe76 (7a:7e76) - channel_volume 10 - ;musicf0 2 +Music_Ditty3_Ch1: +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 - ;musicef 253 + stereo_panning TRUE, TRUE +; musicef -3 rest 1 octave 5 note C_, 3 dec_octave - ;musicf1 48 +; musicf1 48 note C_, 2 note C_, 1 - ;musicf1 0 +; musicf1 0 note G_, 3 inc_octave note C_, 3 note G_, 3 inc_octave - ;musicf1 48 +; musicf1 48 note C_, 5 note C_, 6 sound_ret -Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) - channel_volume 1 - ;fade_wave 15 +Music_Ditty3_Ch3: + fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 channel_volume 2 - ;musice9 128 - ;musicdc 255 +; echo 128 + stereo_panning TRUE, TRUE speed 1 - ;musice8 7 +; cutoff 7 octave 5 note G_, 3 dec_octave @@ -75,4 +78,3 @@ Music_Diddly3_Ch3: ; 1ebe92 (7a:7e92) channel_volume 3 note C_, 4 sound_ret -; 0x1ebeae diff --git a/crysaudio/music/TCG2/diddly4.asm b/crysaudio/music/TCG2/ditty4.asm similarity index 57% rename from crysaudio/music/TCG2/diddly4.asm rename to crysaudio/music/TCG2/ditty4.asm index 688b9f10..19966272 100644 --- a/crysaudio/music/TCG2/diddly4.asm +++ b/crysaudio/music/TCG2/ditty4.asm @@ -1,16 +1,18 @@ -Music_Diddly4: +Music_Ditty4: channel_count 3 - channel 1, Music_Diddly4_Ch1 - channel 2, Music_Diddly4_Ch2 - channel 3, Music_Diddly4_Ch3 + channel 1, Music_Ditty4_Ch1 + channel 2, Music_Ditty4_Ch2 + channel 3, Music_Ditty4_Ch3 -Music_Diddly4_Ch2: ; 1ebeae (7a:7eae) - channel_volume 10 - ;musicf0 0 +Music_Ditty4_Ch2: +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 87 +; musicf1 87 note C_, 4 note C_, 2 note A_, 4 @@ -29,13 +31,15 @@ Music_Diddly4_Ch2: ; 1ebeae (7a:7eae) sound_ret -Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) - channel_volume 10 - ;musicf0 0 +Music_Ditty4_Ch1: +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 2 - ;musicf1 87 +; musicf1 87 note A_, 4 note A_, 2 inc_octave @@ -54,24 +58,22 @@ Music_Diddly4_Ch1: ; 1ebec7 (7a:7ec7) sound_ret -Music_Diddly4_Ch3: ; 1ebee0 (7a:7ee0) - channel_volume 1 +Music_Ditty4_Ch3: fade_wave 14 speed 1 channel_volume 2 - ;musice9 128 - ;musicdc 255 +; echo 128 + stereo_panning TRUE, TRUE speed 1 - ;musice8 1 +; cutoff 1 rest 6 rest 5 rest 6 rest 5 rest 6 - ;musicf1 128 +; musicf1 128 octave 4 note F_, 16 - ;tie +; tie note F_, 6 sound_ret -; 0x1ebefa diff --git a/crysaudio/music/TCG2/diddly5.asm b/crysaudio/music/TCG2/ditty5.asm similarity index 65% rename from crysaudio/music/TCG2/diddly5.asm rename to crysaudio/music/TCG2/ditty5.asm index 28c68703..22297da2 100644 --- a/crysaudio/music/TCG2/diddly5.asm +++ b/crysaudio/music/TCG2/ditty5.asm @@ -1,13 +1,15 @@ -Music_Diddly5: +Music_Ditty5: channel_count 2 - channel 1, Music_Diddly5_Ch1 - channel 2, Music_Diddly5_Ch2 + channel 1, Music_Ditty5_Ch1 + channel 2, Music_Ditty5_Ch2 -Music_Diddly5_Ch2: ; 1ebefa (7a:7efa) - channel_volume 10 - ;musicf0 2 +Music_Ditty5_Ch2: +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 3 note G_, 2 note B_, 3 @@ -31,17 +33,19 @@ Music_Diddly5_Ch2: ; 1ebefa (7a:7efa) inc_octave note D_, 3 note G_, 3 - ;musicef 252 +; musicef -4 note G_, 3 sound_ret -Music_Diddly5_Ch1: ; 1ebf1b (7a:7f1b) - channel_volume 10 - ;musicf0 2 +Music_Ditty5_Ch1: +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 - ;musicef 254 + stereo_panning TRUE, TRUE +; musicef -2 octave 2 note B_, 2 inc_octave @@ -65,7 +69,6 @@ Music_Diddly5_Ch1: ; 1ebf1b (7a:7f1b) note D_, 3 note G_, 3 note B_, 3 - ;musicef 252 +; musicef -4 note B_, 3 sound_ret -; 0x1ebf3e diff --git a/crysaudio/music/TCG2/diddly6.asm b/crysaudio/music/TCG2/ditty6.asm similarity index 72% rename from crysaudio/music/TCG2/diddly6.asm rename to crysaudio/music/TCG2/ditty6.asm index a85f9899..2607ddb7 100644 --- a/crysaudio/music/TCG2/diddly6.asm +++ b/crysaudio/music/TCG2/ditty6.asm @@ -1,104 +1,108 @@ -Music_Diddly6: +Music_Ditty6: channel_count 4 - channel 1, Music_Diddly6_Ch1 - channel 2, Music_Diddly6_Ch2 - channel 3, Music_Diddly6_Ch3 - channel 4, Music_Diddly6_Ch4 + channel 1, Music_Ditty6_Ch1 + channel 2, Music_Ditty6_Ch2 + channel 3, Music_Ditty6_Ch3 + channel 4, Music_Ditty6_Ch4 -Music_Diddly6_Ch2: ; 1f76dc (7d:76dc) - channel_volume 10 - ;musicf0 34 +Music_Ditty6_Ch2: +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 - ;musicef 252 + stereo_panning TRUE, TRUE +; musicef -4 octave 3 note F_, 2 - ;musicef 1 +; musicef 1 note G_, 3 - ;musicef 1 +; musicef 1 note A_, 2 - ;musicef 1 +; musicef 1 note B_, 3 inc_octave - ;musicef 1 +; musicef 1 note C_, 2 note D_, 3 note E_, 2 note F_, 3 - ;musicf1 87 +; musicf1 87 note G_, 16 - ;tie +; tie note G_, 14 note G_, 11 note A#, 16 - ;tie +; tie note A#, 5 note A#, 10 note G_, 6 note A#, 4 note A_, 16 - ;tie +; tie note A_, 14 note A_, 11 inc_octave note C_, 16 - ;tie +; tie note C_, 14 note C_, 11 dec_octave note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 7 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 2 speed 2 note B_, 10 sound_ret -Music_Diddly6_Ch1: ; 1f7731 (7d:7731) - channel_volume 10 - ;musicf0 23 +Music_Ditty6_Ch1: +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 speed 1 - ;musicdc 255 - ;musicef 252 + stereo_panning TRUE, TRUE +; musicef -4 octave 3 note C_, 2 - ;musicef 1 +; musicef 1 note D_, 3 - ;musicef 1 +; musicef 1 note E_, 2 - ;musicef 1 +; musicef 1 note F_, 3 - ;musicef 1 +; musicef 1 note G_, 2 note A_, 3 note B_, 2 @@ -161,11 +165,17 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731) note C_, 5 note A_, 5 octave 4 - ;musicf0 34 - ;musicef 253 +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -3 note D_, 6 octave 4 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note G_, 5 note D_, 5 note B_, 5 @@ -214,60 +224,62 @@ Music_Diddly6_Ch1: ; 1f7731 (7d:7731) note B_, 5 inc_octave note D_, 5 - ;musicf0 26 - ;musicf1 87 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 87 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 2 speed 2 note G_, 10 sound_ret -Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) - channel_volume 1 - ;fade_wave 15 +Music_Ditty6_Ch3: + fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 channel_volume 1 - ;musice9 96 +; echo 96 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE rest 10 rest 10 octave 2 - ;musice8 4 +; cutoff 4 note D#, 16 - ;tie +; tie note D#, 16 - ;tie +; tie note D#, 16 - ;tie +; tie note D#, 16 - ;tie +; tie note D#, 16 - ;tie +; tie note D#, 2 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 2 .Loop1 - ;musice8 4 +; cutoff 4 speed 7 note G_, 3 speed 10 @@ -275,62 +287,53 @@ Music_Diddly6_Ch3: ; 1f77cf (7d:77cf) sound_loop 4, .Loop1 speed 1 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 2 speed 2 - ;musice8 1 +; cutoff 1 note G_, 10 sound_ret -Music_Diddly6_Ch4: ; 1f7812 (7d:7812) +Music_Ditty6_Ch4: toggle_noise 6 octave 1 drum_speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE rest 10 rest 10 - ;musicef 1 +; musicef 1 drum_note 2, 6 - ;musicef 254 +; musicef -2 .Loop1 drum_note 3, 5 sound_loop 7, .Loop1 .Loop2 drum_note 3, 6 - ;rept 7 drum_note 3, 5 - ;--- drum_note 3, 5 - ;--- drum_note 3, 5 - ;--- drum_note 3, 5 - ;--- drum_note 3, 5 - ;--- drum_note 3, 5 - ;--- drum_note 3, 5 - ;endr sound_loop 3, .Loop2 - ;musicef 0 +; musicef 0 .Loop3 drum_speed 7 drum_note 2, 3 drum_speed 10 drum_note 2, 2 sound_loop 4, .Loop3 - ;musicef 2 +; musicef 2 drum_speed 7 drum_note 6, 12 sound_ret -; 0x1f783b diff --git a/crysaudio/music/TCG2/fort1.asm b/crysaudio/music/TCG2/fort1.asm index 1ba03df1..99dc988a 100644 --- a/crysaudio/music/TCG2/fort1.asm +++ b/crysaudio/music/TCG2/fort1.asm @@ -5,47 +5,52 @@ Music_Fort1: channel 3, Music_Fort1_Ch3 channel 4, Music_Fort1_Ch4 -Music_Fort1_Ch2: ; 1ed6cc (7b:56cc) - channel_volume 10 +Music_Fort1_Ch2: speed 1 - ;musicdc 17 - ;musicf0 16 + stereo_panning TRUE, TRUE +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 2 note A#, 3 note B_, 3 inc_octave note C_, 3 - ;musicf1 69 +; musicf1 69 note C#, 6 note C#, 2 - ;tie +; tie note C#, 16 rest 7 note E_, 6 note E_, 16 rest 2 - ;musicf1 70 - ;musicf0 2 - ;musicf3 +; musicf1 70 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf3 vibrato 16, 3, 3 octave 4 note D#, 3 note E_, 4 .MainLoop sound_call Branch_1ed865 - ;musicf3 +; musicf3 note C#, 16 - ;tie +; tie note C#, 15 note E_, 2 - ;musicf2 +; musicf2 note F#, 14 - ;tie +; tie note F#, 8 note F#, 7 - ;musicf3 +; musicf3 sound_call Branch_1ed865 - ;musicf3 +; musicf3 note C#, 16 note D#, 15 note E_, 16 @@ -54,235 +59,235 @@ Music_Fort1_Ch2: ; 1ed6cc (7b:56cc) note G_, 16 note F#, 15 note E_, 16 - ;musicf2 +; musicf2 note D_, 8 note D_, 15 - ;tie +; tie note D_, 8 dec_octave note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 inc_octave - ;musicf3 +; musicf3 note D#, 3 - ;musicf2 +; musicf2 note E_, 12 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 note E_, 15 - ;musicf3 +; musicf3 note D#, 2 note E_, 14 - ;tie +; tie note E_, 15 note F#, 16 - ;tie +; tie note F#, 15 sound_call Branch_1ed8a8 note G_, 16 note F#, 15 note E_, 16 - ;musicf2 +; musicf2 note D_, 8 note D_, 15 - ;tie +; tie note D_, 8 dec_octave note B_, 8 note B_, 7 inc_octave - ;musicf3 +; musicf3 note D#, 2 - ;musicf2 +; musicf2 note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 13 note E_, 2 - ;musicf1 53 +; musicf1 53 note D#, 6 note D#, 16 rest 9 note D#, 6 note D#, 16 rest 9 - ;musicf1 70 - ;musicf3 +; musicf1 70 +; musicf3 note F#, 16 - ;musicf2 +; musicf2 note G#, 8 note G#, 7 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1edb5a octave 4 - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 note D#, 8 note D#, 7 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1edb5a octave 4 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 - ;tie +; tie note F#, 16 note E_, 8 note E_, 7 note E_, 16 - ;tie +; tie note E_, 8 note E_, 7 - ;musicf3 +; musicf3 note E_, 16 note D#, 15 note E_, 16 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 - ;musicf3 +; musicf3 note F#, 16 - ;musicf2 +; musicf2 note G#, 8 note G#, 7 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1edb5a octave 4 - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 note D#, 8 note D#, 7 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1edb5a octave 4 note D#, 2 note E_, 13 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 sound_call Branch_1edb5a octave 4 note E_, 15 - ;tie +; tie note E_, 16 note D#, 15 note E_, 16 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 - ;musicf3 +; musicf3 note F#, 16 - ;musicf2 +; musicf2 note G#, 8 note G#, 7 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1edb5a octave 4 - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 note D#, 8 note D#, 7 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1edb5a octave 4 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 - ;tie +; tie note F#, 16 note E_, 8 note E_, 7 note E_, 16 - ;tie +; tie note E_, 8 note E_, 7 - ;musicf3 +; musicf3 note E_, 16 note D#, 15 note E_, 16 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 - ;musicf3 +; musicf3 note F#, 16 - ;musicf2 +; musicf2 note G#, 8 note G#, 7 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1edb5a octave 4 - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 note D#, 8 note D#, 7 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1edb5a octave 4 note D#, 2 note E_, 13 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 sound_call Branch_1edb5a octave 4 note E_, 15 - ;tie +; tie note E_, 16 note D#, 15 note E_, 16 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 - ;musicf3 +; musicf3 note F#, 16 - ;musicf2 +; musicf2 note G_, 8 note G_, 7 sound_call Branch_1edb5a octave 4 - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 note G_, 8 note G_, 7 @@ -290,69 +295,69 @@ Music_Fort1_Ch2: ; 1ed6cc (7b:56cc) octave 4 note G_, 2 note A_, 13 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 15 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1edb5a octave 4 note F#, 15 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 15 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1edb5a octave 4 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 - ;musicf3 +; musicf3 note G_, 16 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 note E_, 8 note E_, 8 note D_, 8 note D_, 15 - ;tie +; tie note D_, 8 dec_octave note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 - ;musicf3 +; musicf3 inc_octave note D#, 2 - ;musicf2 +; musicf2 note E_, 13 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 16 note E_, 15 - ;musicf1 53 +; musicf1 53 .Loop1 note D#, 6 note D#, 16 @@ -361,122 +366,130 @@ Music_Fort1_Ch2: ; 1ed6cc (7b:56cc) sound_loop 0, .MainLoop Branch_1ed865: - ;musicf0 2 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 octave 4 - ;musicf1 70 - ;musicf3 +; musicf1 70 +; musicf3 note D#, 16 note C#, 15 note D#, 16 - ;musicf2 +; musicf2 note G#, 8 note G#, 15 - ;tie +; tie note G#, 8 dec_octave note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 - ;musicf3 +; musicf3 inc_octave note D_, 2 - ;musicf2 +; musicf2 note D#, 6 note D#, 7 - ;tie +; tie note D#, 16 note C#, 8 note C#, 7 note C#, 16 - ;tie +; tie note C#, 8 note C#, 7 - ;musicf3 +; musicf3 note C#, 16 note D#, 15 note E_, 16 - ;musicf2 +; musicf2 note F#, 8 note F#, 7 - ;musicf3 +; musicf3 note D#, 16 note C#, 15 note D#, 16 - ;musicf2 +; musicf2 note G#, 8 note G#, 15 - ;tie +; tie note G#, 8 dec_octave note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 inc_octave - ;musicf3 +; musicf3 note C_, 2 - ;musicf2 +; musicf2 note C#, 13 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 16 note C#, 15 sound_ret Branch_1ed8a8: - ;musicf0 2 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 octave 4 - ;musicf1 70 - ;musicf3 +; musicf1 70 +; musicf3 note G_, 16 note F#, 15 note G_, 16 - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 note G_, 8 note G_, 15 - ;tie +; tie note G_, 8 - ;musicf3 +; musicf3 note G#, 3 - ;musicf2 +; musicf2 note A_, 12 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 15 note A_, 16 note F#, 15 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 15 note F#, 16 note F#, 8 note F#, 7 - ;musicf3 +; musicf3 sound_ret -Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) - channel_volume 10 +Music_Fort1_Ch1: speed 1 duty_cycle 0 - channel_volume 9 - ;musicdc 17 - ;vibrato_type 10 + volume_envelope 9, 0 + stereo_panning TRUE, TRUE +; vibrato_type 10 vibrato 18, 3, 3 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 2 rest 9 - ;musicf1 69 +; musicf1 69 note A_, 6 note A_, 16 rest 9 @@ -485,11 +498,14 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) note C#, 10 rest 8 rest 7 - ;musicf1 70 +; musicf1 70 .MainLoop - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf1 70 +; musicf1 70 .Loop1 rest 16 rest 15 @@ -516,21 +532,24 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) note C#, 6 note C#, 10 rest 15 - ;musicf3 - channel_volume 8 +; musicf3 + volume_envelope 8, 0 note D#, 3 note E_, 13 - ;tie +; tie note E_, 15 note D#, 16 - ;tie +; tie note D#, 15 dec_octave note B_, 16 - ;tie +; tie note B_, 15 - ;musicf0 16 - ;musicf1 70 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicf1 70 octave 3 note D#, 6 note D#, 10 @@ -556,13 +575,16 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) sound_loop 2, .Loop5 rest 16 rest 15 - ;musicf3 +; musicf3 note C#, 6 note C#, 10 rest 8 - ;musicf0 30 +; preset 30 + volume_envelope 5, 0 + duty_cycle 3 + vibrato 28, 3, 3 octave 4 - ;musicf3 +; musicf3 note D_, 3 note D#, 4 note E_, 16 @@ -575,136 +597,142 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) note D_, 15 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note G_, 8 note G_, 15 - ;tie +; tie note G_, 8 note E_, 8 note E_, 7 sound_call Branch_1edb4e octave 4 note F#, 15 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 15 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e inc_octave note D_, 15 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 15 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note D_, 8 note D_, 7 note E_, 16 note D_, 15 - ;musicec 252 +; pitch_offset 252 sound_call Branch_1edb4e - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 note G_, 8 note G_, 7 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e octave 4 note C_, 15 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 15 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e octave 4 rest 15 note C_, 16 - ;tie +; tie note C_, 15 note D_, 16 - ;tie +; tie note D_, 15 note E_, 16 note D_, 15 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note G_, 8 note G_, 15 - ;tie +; tie note G_, 8 note E_, 8 note E_, 7 sound_call Branch_1edb4e octave 4 note F#, 15 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 15 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e octave 4 note D_, 15 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 15 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note D_, 8 note D_, 7 - ;musicf3 +; musicf3 note E_, 16 note D_, 15 note C_, 16 dec_octave - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf2 +; musicf2 note D_, 6 note D_, 9 - ;musicf0 30 - ;musicf3 - ;musicef 2 - ;musicf2 +; preset 30 + volume_envelope 5, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf3 +; musicef 2 +; musicf2 inc_octave note C_, 16 - ;tie +; tie note C_, 15 note C_, 16 dec_octave - ;musicf1 69 +; musicf1 69 note G_, 8 note G_, 7 note A_, 16 - ;tie +; tie note A_, 15 note A_, 16 note B_, 8 note B_, 7 - ;musicf3 +; musicf3 inc_octave note C_, 16 - ;tie +; tie note C_, 15 dec_octave - ;musicef 2 +; musicef 2 note D_, 4 note E_, 4 note F_, 4 @@ -715,44 +743,44 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) note C_, 4 note D_, 3 dec_octave - ;musicef 254 - ;musicf1 53 +; musicef -2 +; musicf1 53 note A_, 6 note A_, 16 rest 9 note A_, 6 note A_, 16 rest 9 - ;musicf3 - ;musicef 254 - ;musicf1 70 +; musicf3 +; musicef -2 +; musicf1 70 inc_octave note D#, 16 - ;musicf2 +; musicf2 note E_, 8 note E_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note G#, 8 note G#, 15 - ;tie +; tie note G#, 8 dec_octave note B_, 8 note B_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note D#, 8 note D#, 7 - ;tie +; tie note D#, 16 note C#, 8 note C#, 7 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1edb4e rest 8 rest 7 @@ -760,78 +788,78 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) note C#, 16 dec_octave note B_, 15 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note D#, 8 note D#, 7 - ;musicf3 +; musicf3 note D#, 16 - ;musicf2 +; musicf2 note E_, 8 note E_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note G#, 8 note G#, 15 - ;tie +; tie note G#, 8 dec_octave note B_, 8 note B_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 note C#, 15 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 15 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1edb4e octave 3 - ;musicf2 +; musicf2 note A_, 15 - ;tie +; tie note A_, 8 note A_, 8 note A_, 15 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note D#, 8 note D#, 7 - ;musicf3 +; musicf3 note D#, 16 - ;musicf2 +; musicf2 note E_, 8 note E_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note G#, 8 note G#, 15 - ;tie +; tie note G#, 8 dec_octave note B_, 8 note B_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note D#, 8 note D#, 7 - ;tie +; tie note D#, 16 note C#, 8 note C#, 7 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1edb4e rest 8 rest 7 @@ -839,126 +867,126 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) note C#, 16 dec_octave note B_, 15 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note D#, 8 note D#, 7 - ;musicf3 +; musicf3 note D#, 16 - ;musicf2 +; musicf2 note E_, 8 note E_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note G#, 8 note G#, 15 - ;tie +; tie note G#, 8 dec_octave note B_, 8 note B_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 note C#, 15 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 15 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1edb4e octave 3 - ;musicf2 +; musicf2 note A_, 15 - ;tie +; tie note A_, 8 note A_, 8 note A_, 15 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1edb4e octave 3 note A_, 15 inc_octave note D_, 16 - ;musicf2 +; musicf2 note E_, 8 note E_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note G_, 8 note G_, 15 - ;tie +; tie note G_, 8 note E_, 8 note E_, 7 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1edb4e octave 4 note F#, 15 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 15 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e octave 4 note D_, 15 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 15 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note D_, 8 note D_, 7 - ;musicf3 +; musicf3 note E_, 16 - ;musicf2 +; musicf2 note D_, 8 note D_, 7 - ;musicec 252 +; pitch_offset 252 sound_call Branch_1edb4e octave 3 - ;musicf2 +; musicf2 note B_, 8 note B_, 15 - ;tie +; tie note B_, 8 note G_, 8 note G_, 7 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1edb4e octave 4 - ;musicf2 +; musicf2 note C_, 15 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 15 note C_, 16 dec_octave - ;musicef 2 - ;musicf1 69 +; musicef 2 +; musicf1 69 note G_, 8 note G_, 7 note A_, 16 - ;tie +; tie note A_, 15 note A_, 16 note B_, 8 note B_, 7 - ;musicf3 +; musicf3 inc_octave note C_, 16 - ;tie +; tie note C_, 15 dec_octave note D_, 4 @@ -970,67 +998,78 @@ Music_Fort1_Ch1: ; 1ed8cd (7b:58cd) inc_octave note C_, 4 note D_, 3 - ;musicf1 53 +; musicf1 53 dec_octave .Loop6 note A_, 6 note A_, 16 rest 9 sound_loop 2, .Loop6 - ;musicef 254 +; musicef -2 sound_loop 0, .MainLoop Branch_1edb4e: - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf2 +; musicf2 note E_, 6 note E_, 10 - ;musicf0 30 - ;musicf3 - ;musicec 0 +; preset 30 + volume_envelope 5, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf3 +; pitch_offset 0 sound_ret Branch_1edb5a: - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf2 +; musicf2 note E_, 6 note E_, 10 - ;musicf0 2 - ;musicf3 - ;musicec 0 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf3 +; pitch_offset 0 sound_ret -Music_Fort1_Ch3: ; 1edb66 (7b:5b66) - channel_volume 1 +Music_Fort1_Ch3: speed 1 fade_wave 14 channel_volume 1 - ;musice9 96 - ;musicdc 17 +; echo 96 + stereo_panning TRUE, TRUE octave 2 - ;musice8 1 +; cutoff 1 rest 9 note F#, 6 - ;tie +; tie note F#, 16 rest 9 note B_, 6 - ;tie +; tie note B_, 16 rest 9 .MainLoop octave 2 - ;musice8 7 +; cutoff 7 note E_, 16 - ;tie +; tie note E_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note B_, 15 inc_octave @@ -1038,32 +1077,32 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) dec_octave note E_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note E_, 15 note A_, 16 note A_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note A_, 15 rest 16 note E_, 15 - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note A_, 15 note E_, 16 - ;tie +; tie note E_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note B_, 15 inc_octave @@ -1071,32 +1110,32 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) dec_octave note E_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note E_, 15 note A_, 16 note A_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note A_, 15 dec_octave note A_, 16 - ;tie +; tie note A_, 15 note B_, 16 - ;tie +; tie note B_, 15 note E_, 16 - ;tie +; tie note E_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note B_, 15 inc_octave @@ -1104,32 +1143,32 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) dec_octave note E_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note E_, 15 note A_, 16 note A_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note A_, 15 rest 16 note E_, 15 - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note A_, 15 note E_, 16 - ;tie +; tie note E_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note B_, 15 inc_octave @@ -1137,105 +1176,105 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) dec_octave note E_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 dec_octave note E_, 15 note A_, 16 note A_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note A_, 15 dec_octave note A_, 16 - ;tie +; tie note A_, 15 note B_, 16 - ;tie +; tie note B_, 15 inc_octave note C_, 16 - ;tie +; tie note C_, 15 - ;musice8 3 +; cutoff 3 note B_, 16 - ;musice8 7 +; cutoff 7 dec_octave note G_, 15 inc_octave note C_, 16 dec_octave note G_, 15 - ;musice8 3 +; cutoff 3 inc_octave note B_, 16 - ;musice8 7 +; cutoff 7 dec_octave note B_, 15 - ;tie +; tie note B_, 8 rest 8 note B_, 15 inc_octave - ;musice8 3 +; cutoff 3 note A_, 16 - ;musice8 7 +; cutoff 7 note B_, 15 rest 16 note F#, 15 - ;musice8 3 +; cutoff 3 note A_, 16 - ;musice8 7 +; cutoff 7 dec_octave note B_, 15 note A_, 8 rest 8 note A_, 15 inc_octave - ;musice8 3 +; cutoff 3 note G_, 16 - ;musice8 7 +; cutoff 7 dec_octave note A_, 15 note B_, 8 rest 8 note B_, 15 inc_octave - ;musice8 3 +; cutoff 3 note A_, 16 - ;musice8 7 +; cutoff 7 dec_octave note B_, 4 - ;tie +; tie inc_octave note C_, 11 - ;tie +; tie note C_, 16 note C_, 15 - ;musice8 3 +; cutoff 3 note B_, 16 - ;musice8 7 +; cutoff 7 dec_octave note G_, 15 inc_octave note C_, 16 - ;tie +; tie note C_, 15 dec_octave note B_, 16 - ;tie +; tie note B_, 15 note A_, 16 - ;tie +; tie note A_, 15 inc_octave inc_octave - ;musice8 3 +; cutoff 3 note C_, 16 - ;musice8 7 +; cutoff 7 dec_octave dec_octave note E_, 15 @@ -1243,26 +1282,26 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 15 inc_octave inc_octave - ;musice8 3 +; cutoff 3 note C_, 16 - ;musice8 7 +; cutoff 7 dec_octave dec_octave note B_, 15 - ;tie +; tie note B_, 8 rest 8 note B_, 15 inc_octave - ;musice8 3 +; cutoff 3 note A_, 16 - ;musice8 7 +; cutoff 7 note B_, 15 rest 16 note F#, 15 - ;musice8 3 +; cutoff 3 note A_, 16 - ;musice8 7 +; cutoff 7 dec_octave note B_, 15 inc_octave @@ -1271,9 +1310,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note G_, 8 rest 7 inc_octave - ;musice8 3 +; cutoff 3 note G_, 16 - ;musice8 7 +; cutoff 7 dec_octave dec_octave note B_, 8 @@ -1281,19 +1320,19 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) inc_octave note F#, 8 rest 8 - ;musice8 6 +; cutoff 6 note F#, 8 rest 7 - ;musice8 7 +; cutoff 7 dec_octave note F_, 8 rest 8 note F_, 8 rest 7 inc_octave - ;musice8 3 +; cutoff 3 note C_, 16 - ;musice8 7 +; cutoff 7 dec_octave note F_, 8 rest 7 @@ -1302,9 +1341,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note F_, 8 rest 7 inc_octave - ;musice8 3 +; cutoff 3 note C_, 16 - ;musice8 7 +; cutoff 7 dec_octave note F_, 8 rest 7 @@ -1313,9 +1352,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note F_, 8 rest 7 inc_octave - ;musice8 3 +; cutoff 3 note C_, 16 - ;musice8 8 +; cutoff 8 note F_, 8 rest 7 dec_octave @@ -1330,9 +1369,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1341,9 +1380,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1352,9 +1391,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note A_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1363,9 +1402,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note A_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1374,9 +1413,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1385,9 +1424,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1396,9 +1435,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note A_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1407,9 +1446,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note B_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note A_, 16 - ;musice8 7 +; cutoff 7 note F#, 8 rest 7 dec_octave @@ -1418,9 +1457,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1429,9 +1468,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1440,9 +1479,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note A_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1451,9 +1490,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note A_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1462,9 +1501,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1473,9 +1512,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note E_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1484,9 +1523,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note A_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note G#, 16 - ;musice8 7 +; cutoff 7 note E_, 8 rest 7 dec_octave @@ -1495,27 +1534,27 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note B_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note A_, 16 - ;musice8 7 +; cutoff 7 note F#, 8 rest 7 note C_, 8 rest 8 note C_, 7 rest 8 - ;musice8 3 +; cutoff 3 note G_, 16 - ;musice8 7 +; cutoff 7 note G_, 8 rest 7 note C_, 8 rest 8 note C_, 7 rest 8 - ;musice8 3 +; cutoff 3 note G_, 16 - ;musice8 7 +; cutoff 7 note G_, 8 rest 7 dec_octave @@ -1524,9 +1563,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note G_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note B_, 16 - ;musice8 7 +; cutoff 7 note D_, 8 rest 7 dec_octave @@ -1535,9 +1574,9 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note G_, 7 rest 8 inc_octave - ;musice8 3 +; cutoff 3 note B_, 16 - ;musice8 7 +; cutoff 7 note D_, 8 rest 7 dec_octave @@ -1546,18 +1585,18 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) inc_octave note E_, 8 rest 7 - ;musice8 3 +; cutoff 3 note G_, 16 - ;musice8 7 +; cutoff 7 dec_octave - ;musice8 2 +; cutoff 2 note B_, 15 - ;tie +; tie note B_, 16 - ;musice8 3 +; cutoff 3 inc_octave note A_, 15 - ;musice8 7 +; cutoff 7 note F#, 8 rest 8 dec_octave @@ -1588,16 +1627,16 @@ Music_Fort1_Ch3: ; 1edb66 (7b:5b66) note F_, 8 rest 7 .Loop1 - ;musice8 1 +; cutoff 1 note B_, 7 - ;tie +; tie note B_, 16 rest 8 sound_loop 2, .Loop1 sound_loop 0, .MainLoop -Music_Fort1_Ch4: ; 1ede26 (7b:5e26) +Music_Fort1_Ch4: toggle_noise 6 drum_speed 1 rest 1 @@ -1642,11 +1681,11 @@ Music_Fort1_Ch4: ; 1ede26 (7b:5e26) drum_note 3, 5 drum_note 3, 5 drum_note 3, 16 - ;musicef 254 +; musicef -2 drum_note 4, 5 - ;musicef 255 +; musicef -1 drum_note 4, 5 - ;musicef 0 +; musicef 0 drum_note 4, 5 drum_note 3, 16 rest 15 @@ -1673,11 +1712,11 @@ Music_Fort1_Ch4: ; 1ede26 (7b:5e26) drum_note 3, 16 drum_note 3, 15 drum_note 1, 16 - ;musicef 254 +; musicef -2 drum_note 3, 5 - ;musicef 255 +; musicef -1 drum_note 3, 5 - ;musicef 0 +; musicef 0 drum_note 3, 5 drum_note 3, 16 drum_note 4, 15 @@ -1697,11 +1736,11 @@ Music_Fort1_Ch4: ; 1ede26 (7b:5e26) drum_note 3, 5 drum_note 3, 5 drum_note 3, 16 - ;musicef 254 +; musicef -2 drum_note 4, 5 - ;musicef 255 +; musicef -1 drum_note 4, 5 - ;musicef 0 +; musicef 0 drum_note 4, 5 drum_note 3, 16 rest 15 @@ -1776,4 +1815,3 @@ Branch_1edeef: drum_note 3, 16 drum_note 5, 15 sound_ret -; 0x1edefc diff --git a/crysaudio/music/TCG2/fort2.asm b/crysaudio/music/TCG2/fort2.asm index d5dd73f6..fa26c721 100644 --- a/crysaudio/music/TCG2/fort2.asm +++ b/crysaudio/music/TCG2/fort2.asm @@ -5,14 +5,16 @@ Music_Fort2: channel 3, Music_Fort2_Ch3 channel 4, Music_Fort2_Ch4 -Music_Fort2_Ch2: ; 1edefc (7b:5efc) - channel_volume 10 +Music_Fort2_Ch2: speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE .MainLoop octave 3 - ;musicf0 16 - ;musicf3 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicf3 .Loop1 rest 8 sound_call Branch_1ee109 @@ -25,329 +27,338 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) note F#, 3 note G_, 4 sound_loop 4, .Loop1 - ;musicf0 0 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 vibrato 30, 3, 3 octave 2 - ;musicef 2 - ;musicf1 64 - ;musicf3 +; musicef 2 +; musicf1 64 +; musicf3 note B_, 15 inc_octave - ;musicf2 +; musicf2 note D_, 8 note D_, 7 - ;musicf3 +; musicf3 note F#, 15 - ;musicf2 +; musicf2 note E_, 8 note E_, 7 - ;musicf3 +; musicf3 note G#, 2 note A_, 15 - ;tie +; tie note A_, 6 - ;musicf2 +; musicf2 note G_, 7 note G_, 15 note C#, 15 - ;tie +; tie note C#, 10 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 5 note C#, 15 note C#, 4 note C#, 11 note D_, 4 note D_, 11 - ;musicf3 +; musicf3 note C#, 5 note D_, 5 note C#, 5 dec_octave - ;musicf2 +; musicf2 note A_, 8 note A_, 7 - ;musicf3 +; musicf3 note A#, 3 - ;musicf2 +; musicf2 note B_, 5 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 10 note B_, 15 rest 8 - ;musicf3 +; musicf3 note A_, 3 note A#, 4 note B_, 15 inc_octave - ;musicf2 +; musicf2 note D_, 8 note D_, 7 - ;musicf3 +; musicf3 note F#, 15 - ;musicf2 +; musicf2 note E_, 8 note E_, 7 - ;musicf3 +; musicf3 note G#, 2 note A_, 15 - ;tie +; tie note A_, 6 - ;musicf2 +; musicf2 note G_, 7 note G_, 15 note C_, 15 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 note C_, 10 - ;musicf3 +; musicf3 dec_octave note B_, 5 inc_octave note C_, 5 dec_octave note B_, 5 - ;musicf2 +; musicf2 note G_, 8 note G_, 7 - ;musicf3 +; musicf3 note G#, 2 note A_, 16 - ;tie +; tie note A_, 5 inc_octave - ;musicf2 +; musicf2 note D_, 1 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 10 note D_, 8 - ;musicf0 9 - ;musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf3 octave 3 note D#, 15 - ;musicf0 0 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 vibrato 30, 3, 3 octave 2 note A_, 3 note A#, 4 - ;musicef 2 - ;musicf1 64 - ;musicf3 +; musicef 2 +; musicf1 64 +; musicf3 note B_, 15 inc_octave - ;musicf2 +; musicf2 note D_, 8 note D_, 7 - ;musicf3 +; musicf3 note F#, 15 - ;musicf2 +; musicf2 note E_, 8 note E_, 7 - ;musicf3 +; musicf3 note G#, 2 note A_, 15 - ;tie +; tie note A_, 6 - ;musicf2 +; musicf2 note G_, 7 note G_, 15 note C#, 15 - ;tie +; tie note C#, 8 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 5 note C#, 15 note C#, 4 note C#, 11 note D_, 4 note D_, 11 - ;musicf3 +; musicf3 note C#, 5 note D_, 5 note C#, 5 dec_octave - ;musicf2 +; musicf2 note A_, 8 note A_, 7 - ;musicf3 +; musicf3 note A#, 3 - ;musicf2 +; musicf2 note B_, 5 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 15 note B_, 8 inc_octave - ;musicf3 +; musicf3 note E_, 3 note F_, 4 note F#, 15 - ;musicf2 +; musicf2 note G_, 8 note G_, 7 - ;musicf3 +; musicf3 note A_, 15 - ;musicf2 +; musicf2 note B_, 8 note B_, 7 - ;musicf3 +; musicf3 note F_, 2 note F#, 16 - ;tie +; tie note F#, 5 - ;musicf2 +; musicf2 note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 5 - ;tie +; tie note E_, 15 note E_, 15 - ;musicf3 +; musicf3 note G#, 2 note A_, 16 - ;tie +; tie note A_, 5 note G#, 3 note G_, 4 - ;musicf2 +; musicf2 note F#, 15 - ;tie +; tie note F#, 15 - ;tie +; tie note F#, 15 note F#, 15 note F#, 4 note F#, 11 note G_, 4 note G_, 11 - ;musicf3 +; musicf3 note F#, 5 note G_, 5 note F#, 5 - ;musicf2 +; musicf2 note D_, 8 note D_, 7 - ;musicf3 +; musicf3 note F_, 3 note F#, 16 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 5 - ;musicf2 +; musicf2 note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 10 note E_, 15 - ;tie +; tie note E_, 15 .Loop2 - ;musicf3 +; musicf3 octave 2 note A#, 8 inc_octave note C_, 7 note F_, 8 - ;musicf2 +; musicf2 note A#, 5 note A#, 10 note A_, 5 @@ -358,12 +369,12 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) note G_, 10 note C_, 3 note C_, 4 - ;musicf3 +; musicf3 vibrato 8, 3, 3 note C_, 8 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 7 vibrato 0, 3, 3 dec_octave @@ -371,7 +382,7 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) inc_octave note C_, 7 note F_, 8 - ;musicf2 +; musicf2 note A#, 5 note A#, 10 note A_, 5 @@ -383,12 +394,12 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) inc_octave note C_, 3 note C_, 4 - ;musicf3 +; musicf3 vibrato 8, 3, 3 note C_, 8 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 7 vibrato 0, 3, 3 sound_loop 2, .Loop2 @@ -397,7 +408,7 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) note D#, 7 note G#, 8 inc_octave - ;musicf2 +; musicf2 note C#, 5 note C#, 10 note C_, 5 @@ -409,19 +420,19 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) note A#, 10 note D#, 3 note D#, 4 - ;musicf3 +; musicf3 vibrato 8, 3, 3 note D#, 8 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 7 vibrato 0, 3, 3 note C#, 8 note D#, 7 note G#, 8 inc_octave - ;musicf2 +; musicf2 note C#, 5 note C#, 10 note C_, 5 @@ -434,12 +445,12 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) inc_octave note D#, 3 note D#, 4 - ;musicf3 +; musicf3 vibrato 8, 3, 3 note D#, 8 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 7 vibrato 0, 3, 3 octave 3 @@ -447,7 +458,7 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) note D#, 7 note G#, 8 inc_octave - ;musicf2 +; musicf2 note C#, 5 note C#, 10 note C_, 5 @@ -459,19 +470,19 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) note A#, 10 note D#, 3 note D#, 4 - ;musicf3 +; musicf3 vibrato 8, 3, 3 note D#, 8 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 7 vibrato 0, 3, 3 note C#, 8 note D#, 7 note G#, 8 inc_octave - ;musicf2 +; musicf2 note C#, 5 note C#, 10 note C_, 5 @@ -479,27 +490,27 @@ Music_Fort2_Ch2: ; 1edefc (7b:5efc) dec_octave note G#, 3 note G#, 4 - ;musicf3 +; musicf3 note G_, 2 - ;musicf2 +; musicf2 note G#, 13 note G#, 8 note A#, 15 note A#, 7 vibrato 15, 3, 3 note B_, 15 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 15 note B_, 15 - ;musicf3 +; musicf3 note A#, 2 vibrato 2, 3, 3 note B_, 13 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 15 sound_loop 0, .MainLoop @@ -544,15 +555,17 @@ Branch_1ee109: sound_ret -Music_Fort2_Ch1: ; 1ee12f (7b:612f) - channel_volume 10 +Music_Fort2_Ch1: speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE .MainLoop - ;musicf0 23 - ;musicf1 71 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 3 - ;musicef 254 +; musicef -2 note E_, 4 note E_, 4 inc_octave @@ -666,8 +679,11 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) dec_octave note E_, 4 sound_loop 14, .Loop1 - ;musicf0 16 - ;musicf3 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicf3 .Loop2 rest 8 sound_call Branch_1ee109 @@ -763,16 +779,22 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) rest 4 inc_octave note D_, 4 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 note G_, 7 - ;tie +; tie note G_, 8 note G_, 3 rest 4 - ;musicf0 16 - ;musicf3 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicf3 .Loop3 octave 2 rest 8 @@ -844,7 +866,7 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) note F#, 3 note G_, 4 .Loop4 - ;musicf1 32 +; musicf1 32 note F_, 4 note F_, 4 note F_, 3 @@ -877,15 +899,15 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) note F_, 12 note F_, 3 note F_, 4 - ;musicf3 +; musicf3 vibrato 8, 3, 3 note G_, 14 - ;tie +; tie note G_, 16 vibrato 0, 3, 3 sound_loop 2, .Loop4 - ;musicec 1 - ;musicf1 32 +; pitch_offset 1 +; musicf1 32 note F_, 4 note F_, 4 note F_, 3 @@ -918,13 +940,13 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) note F_, 12 note F_, 3 note F_, 4 - ;musicf3 +; musicf3 vibrato 8, 3, 3 note G_, 14 - ;tie +; tie note G_, 16 vibrato 0, 3, 3 - ;musicf1 32 +; musicf1 32 note F_, 4 note F_, 4 note F_, 3 @@ -953,20 +975,23 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) note F_, 12 note C_, 3 note C_, 4 - ;musicec 0 - ;musicf0 9 - ;musicef 1 +; pitch_offset 0 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef 1 note C_, 2 - ;musicf1 64 +; musicf1 64 note C#, 13 note C#, 8 note D#, 15 note D#, 7 - ;musicf3 +; musicf3 note E_, 15 - ;tie +; tie note E_, 8 - ;musicf1 80 +; musicf1 80 note A_, 5 note A_, 2 note D_, 4 @@ -995,15 +1020,14 @@ Music_Fort2_Ch1: ; 1ee12f (7b:612f) sound_loop 0, .MainLoop -Music_Fort2_Ch3: ; 1ee319 (7b:6319) - channel_volume 1 - ;fade_wave 15 +Music_Fort2_Ch3: + fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 channel_volume 2 - ;musice9 0 - ;musicdc 17 +; echo 0 + stereo_panning TRUE, TRUE octave 4 - ;musicf3 +; musicf3 octave 3 speed 1 rest 15 @@ -1055,12 +1079,12 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) rest 4 rest 7 channel_volume 1 - ;musice8 8 +; cutoff 8 octave 2 note A_, 2 - ;tie +; tie note A#, 2 - ;tie +; tie note B_, 11 .Loop2 octave 2 @@ -1319,11 +1343,11 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note B_, 7 rest 8 octave 2 - ;musice8 7 +; cutoff 7 note E_, 2 - ;tie +; tie note F_, 13 - ;musice8 8 +; cutoff 8 note F#, 4 rest 3 octave 2 @@ -1587,7 +1611,7 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) rest 4 octave 3 note E_, 7 - ;musice8 8 +; cutoff 8 octave 2 .Loop3 note C_, 15 @@ -1608,10 +1632,10 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note C_, 8 note C_, 4 rest 3 - ;musice8 7 +; cutoff 7 note D_, 15 note D_, 15 - ;musice8 8 +; cutoff 8 note C_, 15 rest 8 note C_, 4 @@ -1630,11 +1654,11 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note C_, 8 note C_, 4 rest 3 - ;musice8 7 +; cutoff 7 note D_, 15 - ;tie +; tie note D_, 15 - ;musice8 8 +; cutoff 8 sound_loop 2, .Loop3 octave 2 note D#, 15 @@ -1655,10 +1679,10 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note D#, 8 note D#, 4 rest 3 - ;musice8 7 +; cutoff 7 note F_, 15 note F_, 15 - ;musice8 8 +; cutoff 8 note D#, 15 rest 8 note D#, 4 @@ -1677,11 +1701,11 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note D#, 8 note D#, 4 rest 3 - ;musice8 7 +; cutoff 7 note F_, 15 - ;tie +; tie note F_, 15 - ;musice8 8 +; cutoff 8 note D#, 15 rest 8 note D#, 4 @@ -1700,11 +1724,11 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note D#, 8 note D#, 4 rest 3 - ;musice8 7 +; cutoff 7 note F_, 15 note F_, 15 - ;musice8 8 - ;musicec 0 +; cutoff 8 +; pitch_offset 0 note D#, 15 rest 8 note D#, 4 @@ -1719,10 +1743,10 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) note D#, 15 rest 8 note F_, 15 - ;tie +; tie note F_, 7 note F#, 15 - ;tie +; tie note F#, 8 octave 4 channel_volume 2 @@ -1768,7 +1792,7 @@ Music_Fort2_Ch3: ; 1ee319 (7b:6319) sound_loop 0, .MainLoop -Music_Fort2_Ch4: ; 1ee637 (7b:6637) +Music_Fort2_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -1802,11 +1826,11 @@ Music_Fort2_Ch4: ; 1ee637 (7b:6637) drum_note 1, 8 drum_note 4, 7 drum_note 5, 8 - ;musicef 253 +; musicef -3 drum_note 2, 3 - ;musicef 2 +; musicef 2 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 drum_note 1, 8 @@ -1843,40 +1867,40 @@ Music_Fort2_Ch4: ; 1ee637 (7b:6637) drum_note 2, 8 drum_note 4, 7 drum_note 4, 8 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 8 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 8 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 8 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 .Loop2 sound_call Branch_1ee771 sound_loop 7, .Loop2 @@ -1914,40 +1938,40 @@ Music_Fort2_Ch4: ; 1ee637 (7b:6637) drum_note 2, 8 drum_note 4, 7 drum_note 4, 8 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 8 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 8 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 8 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 sound_call Branch_1ee785 drum_note 1, 8 drum_note 4, 7 @@ -2071,4 +2095,3 @@ Branch_1ee785: drum_note 2, 15 drum_note 2, 15 sound_ret -; 0x1ee797 diff --git a/crysaudio/music/TCG2/fort3.asm b/crysaudio/music/TCG2/fort3.asm index c61dfbad..6097aba0 100644 --- a/crysaudio/music/TCG2/fort3.asm +++ b/crysaudio/music/TCG2/fort3.asm @@ -5,151 +5,153 @@ Music_Fort3: channel 3, Music_Fort3_Ch3 channel 4, Music_Fort3_Ch4 -Music_Fort3_Ch2: ; 1ee797 (7b:6797) - channel_volume 10 +Music_Fort3_Ch2: speed 1 rest 14 .MainLoop - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicdc 255 - ;musicf1 87 - ;musicf3 - ;vibrato_type 5 + stereo_panning TRUE, TRUE +; musicf1 87 +; musicf3 +; vibrato_type 5 vibrato 60, 3, 3 rest 15 rest 14 note C_, 4 - ;tie +; tie note C#, 4 - ;tie +; tie note D_, 14 - ;musicf2 +; musicf2 note C_, 7 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 note C_, 15 - ;tie +; tie note C_, 14 - ;musicf3 +; musicf3 rest 15 rest 14 dec_octave note A#, 4 - ;tie +; tie inc_octave note C_, 4 - ;tie +; tie note C_, 14 dec_octave - ;musicf2 +; musicf2 note A#, 7 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 note A#, 15 - ;tie +; tie note A#, 14 inc_octave - ;musicf3 +; musicf3 rest 15 rest 14 note C_, 4 - ;tie +; tie note C#, 4 - ;tie +; tie note D_, 14 - ;musicf2 +; musicf2 note C_, 7 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 note C_, 15 - ;tie +; tie note C_, 14 - ;musicf3 +; musicf3 rest 15 rest 14 dec_octave note A#, 4 - ;tie +; tie inc_octave note C_, 4 - ;tie +; tie note C_, 14 dec_octave - ;musicf2 +; musicf2 note A#, 7 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 note A#, 8 - ;musicf3 +; musicf3 inc_octave note C_, 4 note C#, 3 @@ -162,194 +164,200 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) note A#, 7 note G_, 7 note F_, 7 - ;musicf0 33 - ;musicef 1 - ;musicf1 87 - ;musicf3 +; preset 33 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicef 1 +; musicf1 87 +; musicf3 octave 3 note G_, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note G_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G#, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note G#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 14 inc_octave note C_, 15 dec_octave - ;musicf2 +; musicf2 note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 note F_, 15 - ;tie +; tie note F_, 14 - ;musicf3 +; musicf3 note E_, 8 note F_, 7 note E_, 7 note C_, 7 - ;musicf2 +; musicf2 note D_, 15 - ;tie +; tie note D_, 14 note D_, 15 note F_, 4 - ;tie - ;musice4 4 +; tie +; frequency_offset 4 note F_, 3 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note F_, 4 - ;tie - ;musice4 13 +; tie +; frequency_offset 13 note F_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F#, 4 - ;tie - ;musice4 4 +; tie +; frequency_offset 4 note F#, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note F#, 4 - ;tie - ;musice4 13 +; tie +; frequency_offset 13 note F#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;musicf3 - ;musicf0 33 +; musicf3 +; preset 33 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note G_, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note G_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G#, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note G#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 14 inc_octave note C_, 15 dec_octave - ;musicf2 +; musicf2 note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 note F_, 15 - ;tie +; tie note F_, 14 - ;musicf3 +; musicf3 note E_, 8 note F_, 7 note E_, 7 note C_, 7 - ;musicf2 +; musicf2 note D_, 15 - ;tie +; tie note D_, 14 note D_, 15 dec_octave note F_, 4 - ;tie - ;musice4 14 +; tie +; frequency_offset 14 note F_, 3 - ;tie - ;musice4 28 +; tie +; frequency_offset 28 note F_, 4 - ;tie - ;musice4 43 +; tie +; frequency_offset 43 note F_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F#, 4 - ;tie - ;musice4 14 +; tie +; frequency_offset 14 note F#, 4 - ;tie - ;musice4 28 +; tie +; frequency_offset 28 note F#, 4 - ;tie - ;musice4 43 +; tie +; frequency_offset 43 note F#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;musicf3 +; musicf3 note G_, 8 note A_, 7 note A#, 7 @@ -357,83 +365,83 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) note C_, 7 vibrato 11, 3, 3 note C_, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note C_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note C#, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note C#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 14 vibrato 0, 3, 3 note C_, 15 vibrato 29, 3, 3 - ;musicf2 +; musicf2 note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 note F_, 15 - ;musicf3 +; musicf3 note D#, 14 note D_, 15 - ;musicf2 +; musicf2 note C_, 7 note C_, 7 vibrato 11, 3, 3 note C_, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note C_, 4 - ;tie +; tie note C#, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note C#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 14 note D_, 15 dec_octave vibrato 29, 3, 3 note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 14 note G_, 15 - ;tie +; tie note G_, 14 - ;musicf3 +; musicf3 note G_, 8 note A_, 7 note A#, 7 @@ -441,101 +449,104 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) note C_, 7 vibrato 11, 3, 3 note C_, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note C_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note C#, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note C#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 14 vibrato 0, 3, 3 note C_, 15 vibrato 29, 3, 3 - ;musicf2 +; musicf2 note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 note F_, 15 - ;musicf3 +; musicf3 note D#, 14 note D_, 15 - ;musicf2 +; musicf2 note C_, 7 note C_, 7 vibrato 11, 3, 3 note C_, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note C_, 4 - ;tie - ;musice4 19 +; tie +; frequency_offset 19 note C_, 4 - ;tie - ;musice4 28 +; tie +; frequency_offset 28 note C_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note C#, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note C#, 3 - ;tie - ;musice4 19 +; tie +; frequency_offset 19 note C#, 4 - ;tie - ;musice4 28 +; tie +; frequency_offset 28 note C#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 vibrato 30, 3, 3 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 14 note D_, 15 - ;tie +; tie note D_, 14 - ;musicf0 9 - ;musicf1 64 - ;musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf1 64 +; musicf3 .Loop1 octave 1 note G_, 15 @@ -546,7 +557,7 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) rest 3 inc_octave note F_, 7 - ;musicf2 +; musicf2 note G_, 4 note F_, 3 dec_octave @@ -560,12 +571,12 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) rest 3 rest 4 rest 3 - ;musicf1 32 +; musicf1 32 note F_, 4 note F_, 11 - ;musicf3 +; musicf3 note F_, 7 - ;musicf1 64 +; musicf1 64 note G_, 4 note F_, 3 dec_octave @@ -590,9 +601,9 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) inc_octave inc_octave note G_, 3 - ;musicf3 +; musicf3 note F_, 7 - ;musicf2 +; musicf2 note G_, 4 note F_, 3 dec_octave @@ -601,30 +612,30 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) inc_octave inc_octave note G_, 4 - ;musicf1 96 +; musicf1 96 note G_, 4 rest 3 rest 4 rest 3 note G_, 4 rest 3 - ;musicf3 +; musicf3 note B_, 4 - ;tie - ;musice4 7 +; tie +; frequency_offset 7 note B_, 4 - ;tie +; tie inc_octave - ;musice4 0 +; frequency_offset 0 note C_, 7 dec_octave note A#, 14 - ;musicf1 64 +; musicf1 64 dec_octave dec_octave note G_, 15 rest 7 - ;musicf3 +; musicf3 note G_, 4 rest 3 rest 8 @@ -632,7 +643,7 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) rest 3 inc_octave note F_, 7 - ;musicf2 +; musicf2 note G_, 4 note F_, 3 dec_octave @@ -644,14 +655,14 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) rest 3 note F_, 4 rest 10 - ;musicf1 32 +; musicf1 32 note F_, 4 rest 4 note F_, 4 rest 3 - ;musicf3 +; musicf3 note F_, 7 - ;musicf1 64 +; musicf1 64 note G_, 4 note F_, 3 dec_octave @@ -661,11 +672,11 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) inc_octave note G_, 4 dec_octave - ;musicf3 +; musicf3 note G_, 4 rest 3 dec_octave - ;musicf2 +; musicf2 note G_, 1 rest 2 inc_octave @@ -673,21 +684,21 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) dec_octave note G_, 4 rest 3 - ;musicf3 +; musicf3 inc_octave inc_octave note G_, 4 rest 4 dec_octave dec_octave - ;musicf2 +; musicf2 note G_, 4 inc_octave inc_octave note G_, 3 - ;musicf3 +; musicf3 note F_, 7 - ;musicf2 +; musicf2 note G_, 4 note F_, 3 dec_octave @@ -696,7 +707,7 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) inc_octave inc_octave note G_, 4 - ;musicf3 +; musicf3 note C_, 4 note C#, 3 note C_, 7 @@ -712,151 +723,153 @@ Music_Fort3_Ch2: ; 1ee797 (7b:6797) sound_loop 0, .MainLoop -Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) - channel_volume 10 +Music_Fort3_Ch1: speed 1 rest 14 .MainLoop - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicdc 255 - ;vibrato_type 5 + stereo_panning TRUE, TRUE +; vibrato_type 5 vibrato 60, 3, 3 - ;musicec 251 - ;musicf1 87 - ;musicf3 +; pitch_offset 251 +; musicf1 87 +; musicf3 rest 15 rest 14 note C_, 4 - ;tie +; tie note C#, 4 - ;tie +; tie note D_, 14 - ;musicf2 +; musicf2 note C_, 7 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 note C_, 15 - ;tie +; tie note C_, 14 - ;musicf3 +; musicf3 rest 15 rest 14 dec_octave note A#, 4 - ;tie +; tie inc_octave note C_, 4 - ;tie +; tie note C_, 14 dec_octave - ;musicf2 +; musicf2 note A#, 7 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 note A#, 15 - ;tie +; tie note A#, 14 inc_octave - ;musicf3 +; musicf3 rest 15 rest 14 note C_, 4 - ;tie +; tie note C#, 4 - ;tie +; tie note D_, 14 - ;musicf2 +; musicf2 note C_, 7 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 note C_, 15 - ;tie +; tie note C_, 14 - ;musicf3 +; musicf3 rest 15 rest 14 dec_octave note A#, 4 - ;tie +; tie inc_octave note C_, 4 - ;tie +; tie note C_, 14 dec_octave note A#, 7 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;musicef 252 - ;musicec 0 +; musicef -4 +; pitch_offset 0 octave 2 note A#, 8 rest 7 @@ -867,20 +880,20 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) rest 7 inc_octave note C_, 7 - ;musicef 4 - ;vibrato_type 5 +; musicef 4 +; vibrato_type 5 vibrato 12, 3, 3 octave 2 .Loop1 rest 15 rest 14 note G#, 4 - ;tie +; tie note A_, 4 - ;tie +; tie note A#, 7 note A_, 14 - ;tie +; tie note A_, 8 note A_, 4 rest 3 @@ -896,34 +909,34 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) inc_octave note E_, 4 note F_, 4 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 7 rest 8 dec_octave note A_, 7 rest 14 note A_, 4 - ;tie - ;musice4 17 +; tie +; frequency_offset 17 note A_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 7 note A_, 7 rest 7 rest 15 rest 14 note A#, 4 - ;tie +; tie note B_, 4 - ;tie +; tie inc_octave note C_, 7 dec_octave note A#, 14 - ;tie +; tie note A#, 8 inc_octave note C_, 4 @@ -942,21 +955,21 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) inc_octave note C#, 4 note D_, 4 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 7 rest 8 dec_octave note A_, 7 rest 14 note B_, 4 - ;tie - ;musice4 15 +; tie +; frequency_offset 15 note B_, 4 - ;tie +; tie inc_octave - ;musice4 0 +; frequency_offset 0 note C_, 7 dec_octave note A#, 7 @@ -965,14 +978,14 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) rest 15 rest 14 note A#, 4 - ;tie +; tie note B_, 4 - ;tie +; tie inc_octave note C_, 7 dec_octave note G#, 14 - ;tie +; tie note G#, 8 inc_octave note G_, 4 @@ -990,34 +1003,34 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) note D#, 5 note A_, 4 note A#, 4 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 7 rest 8 note F_, 7 rest 14 dec_octave note A_, 4 - ;tie - ;musice4 17 +; tie +; frequency_offset 17 note A_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 7 note F_, 7 rest 7 rest 15 rest 14 note A#, 4 - ;tie +; tie note B_, 4 - ;tie +; tie inc_octave note C_, 7 dec_octave note A#, 14 - ;tie +; tie note A#, 8 inc_octave note D_, 4 @@ -1037,21 +1050,21 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) inc_octave note C#, 4 note D_, 4 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 7 rest 8 dec_octave note A_, 7 rest 14 note B_, 4 - ;tie - ;musice4 15 +; tie +; frequency_offset 15 note B_, 4 - ;tie +; tie inc_octave - ;musice4 0 +; frequency_offset 0 note C_, 7 dec_octave note A#, 7 @@ -1059,14 +1072,14 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) rest 15 rest 14 note A#, 4 - ;tie +; tie note B_, 4 - ;tie +; tie inc_octave note C_, 7 dec_octave note G#, 14 - ;tie +; tie note G#, 8 inc_octave note G_, 4 @@ -1084,20 +1097,20 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) note D#, 5 note A_, 4 note A#, 4 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 7 rest 8 note F_, 7 rest 14 dec_octave note A_, 4 - ;tie - ;musice4 17 +; tie +; frequency_offset 17 note A_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 7 note F_, 7 rest 7 @@ -1105,12 +1118,12 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) rest 14 inc_octave note C_, 4 - ;tie +; tie note C#, 4 - ;tie +; tie note D_, 7 note C_, 14 - ;tie +; tie note C_, 8 dec_octave note G_, 4 @@ -1126,7 +1139,7 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) rest 14 note G_, 4 note G_, 4 - ;tie +; tie note G_, 7 rest 7 note G_, 4 @@ -1136,11 +1149,11 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) rest 3 rest 14 note A_, 4 - ;tie - ;musice4 9 +; tie +; frequency_offset 9 note A_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 7 note F_, 7 rest 7 @@ -1176,11 +1189,11 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) rest 3 rest 14 note F#, 4 - ;tie - ;musice4 10 +; tie +; frequency_offset 10 note F#, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G_, 7 note F_, 14 rest 15 @@ -1247,11 +1260,11 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) rest 3 rest 14 note F#, 4 - ;tie - ;musice4 10 +; tie +; frequency_offset 10 note F#, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G_, 7 note F_, 14 rest 15 @@ -1290,52 +1303,51 @@ Music_Fort3_Ch1: ; 1eeaa0 (7b:6aa0) sound_loop 0, .MainLoop -Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) - channel_volume 1 +Music_Fort3_Ch3: speed 1 fade_wave 11 - ;musicdc 255 + stereo_panning TRUE, TRUE channel_volume 1 - ;musice9 96 - ;musicec 244 +; echo 96 +; pitch_offset 244 octave 3 note F_, 7 note F#, 7 .MainLoop - ;vibrato_type 5 +; vibrato_type 5 vibrato 60, 3, 3 octave 3 note G_, 15 inc_octave - ;musice8 4 +; cutoff 4 note D_, 14 - ;musice8 8 +; cutoff 8 channel_volume 2 note F_, 4 - ;tie +; tie note F#, 4 - ;tie +; tie note G_, 14 note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 7 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 channel_volume 3 note F_, 15 @@ -1345,35 +1357,35 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note F#, 7 note G_, 15 inc_octave - ;musice8 4 +; cutoff 4 note D_, 14 - ;musice8 8 +; cutoff 8 channel_volume 2 note D#, 4 - ;tie +; tie note E_, 4 - ;tie +; tie note F_, 14 note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 7 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 channel_volume 3 note D#, 15 @@ -1383,35 +1395,35 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note F#, 7 note G_, 15 inc_octave - ;musice8 4 +; cutoff 4 note D_, 14 - ;musice8 8 +; cutoff 8 channel_volume 2 note F_, 4 - ;tie +; tie note F#, 4 - ;tie +; tie note G_, 14 note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 7 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 channel_volume 3 note F_, 15 @@ -1421,36 +1433,36 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note F#, 7 note G_, 15 inc_octave - ;musice8 4 +; cutoff 4 note D_, 14 - ;musice8 8 +; cutoff 8 channel_volume 2 note D#, 4 - ;tie +; tie note E_, 4 - ;tie +; tie note F_, 14 note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 7 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 dec_octave channel_volume 1 note F_, 7 - ;musice8 3 +; cutoff 3 note G_, 15 - ;musice8 8 +; cutoff 8 inc_octave note C#, 7 note C_, 7 @@ -1469,9 +1481,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 7 sound_call Branch_1ef06a note F_, 4 - ;tie +; tie note F#, 4 - ;tie +; tie note G_, 7 note F_, 14 sound_call Branch_1ef06f @@ -1500,7 +1512,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) inc_octave sound_call Branch_1ef06a note C_, 15 - ;tie +; tie note C_, 14 sound_call Branch_1ef06f dec_octave @@ -1522,9 +1534,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 7 sound_call Branch_1ef06a note F_, 4 - ;tie +; tie note F#, 4 - ;tie +; tie note G_, 7 note F_, 14 sound_call Branch_1ef06f @@ -1552,7 +1564,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) inc_octave sound_call Branch_1ef06a note A_, 15 - ;tie +; tie note A_, 14 sound_call Branch_1ef06f dec_octave @@ -1576,9 +1588,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 7 sound_call Branch_1ef06a note F#, 4 - ;tie +; tie note G_, 4 - ;tie +; tie note G#, 7 sound_call Branch_1ef06f inc_octave @@ -1609,7 +1621,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) inc_octave sound_call Branch_1ef06a note G_, 15 - ;tie +; tie note G_, 14 sound_call Branch_1ef06f dec_octave @@ -1633,9 +1645,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 7 sound_call Branch_1ef06a note F_, 4 - ;tie +; tie note F#, 4 - ;tie +; tie note G_, 7 note F_, 14 sound_call Branch_1ef06f @@ -1663,7 +1675,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) inc_octave sound_call Branch_1ef06a note A_, 15 - ;tie +; tie note A_, 14 sound_call Branch_1ef06f dec_octave @@ -1686,9 +1698,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 7 sound_call Branch_1ef06a note F#, 4 - ;tie +; tie note G_, 4 - ;tie +; tie note G#, 7 sound_call Branch_1ef06f inc_octave @@ -1719,7 +1731,7 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) inc_octave sound_call Branch_1ef06a note G_, 15 - ;tie +; tie note G_, 14 sound_call Branch_1ef06f dec_octave @@ -1743,9 +1755,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 7 sound_call Branch_1ef06a note A#, 4 - ;tie +; tie note B_, 4 - ;tie +; tie inc_octave note C_, 7 dec_octave @@ -1811,11 +1823,11 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 3 inc_octave note E_, 4 - ;tie - ;musice4 12 +; tie +; frequency_offset 12 note E_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 7 sound_call Branch_1ef06f dec_octave @@ -1826,9 +1838,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) note G_, 3 rest 12 inc_octave - ;musice8 2 +; cutoff 2 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 3 rest 12 @@ -1836,27 +1848,27 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 3 inc_octave note F_, 7 - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 3 rest 12 inc_octave inc_octave - ;musice8 3 +; cutoff 3 note D_, 7 - ;musice8 8 +; cutoff 8 dec_octave note D_, 4 rest 3 inc_octave - ;musice8 4 +; cutoff 4 note F_, 8 note F#, 7 - ;musice8 2 +; cutoff 2 note G_, 14 - ;musice8 8 +; cutoff 8 sound_call Branch_1ef040 octave 2 note G_, 3 @@ -1869,35 +1881,35 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 3 inc_octave note F_, 7 - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 3 rest 12 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note D_, 7 - ;musice8 8 +; cutoff 8 dec_octave note D_, 4 rest 3 inc_octave - ;musice8 4 +; cutoff 4 note F_, 8 note F#, 7 - ;musice8 2 +; cutoff 2 note G_, 14 - ;musice8 8 +; cutoff 8 sound_call Branch_1ef040 octave 2 note G_, 3 rest 12 inc_octave - ;musice8 2 +; cutoff 2 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 3 rest 12 @@ -1905,34 +1917,34 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 3 inc_octave note F_, 7 - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 3 rest 12 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note D_, 7 - ;musice8 8 +; cutoff 8 dec_octave note D_, 4 rest 3 inc_octave - ;musice8 4 +; cutoff 4 note F_, 8 note F#, 7 - ;musice8 2 +; cutoff 2 note G_, 14 sound_call Branch_1ef040 octave 2 note G_, 3 rest 12 inc_octave - ;musice8 2 +; cutoff 2 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 3 rest 12 @@ -1940,9 +1952,9 @@ Music_Fort3_Ch3: ; 1eecfb (7b:6cfb) rest 3 inc_octave note F_, 7 - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 4 rest 4 @@ -1963,26 +1975,26 @@ Branch_1ef040: note G_, 4 rest 3 inc_octave - ;musice8 2 +; cutoff 2 note G_, 8 - ;musice8 8 +; cutoff 8 dec_octave note G_, 4 rest 3 inc_octave note F_, 7 - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 2 rest 6 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note A#, 7 note D_, 7 - ;musice8 8 +; cutoff 8 dec_octave note D_, 4 rest 3 @@ -2005,11 +2017,11 @@ Branch_1ef06f: sound_ret -Music_Fort3_Ch4: ; 1ef074 (7b:7074) +Music_Fort3_Ch4: toggle_noise 6 drum_speed 1 octave 1 - ;musicdc 255 + stereo_panning TRUE, TRUE rest 14 .MainLoop drum_note 1, 15 @@ -2336,11 +2348,11 @@ Music_Fort3_Ch4: ; 1ef074 (7b:7074) drum_note 4, 7 drum_note 3, 7 drum_note 4, 8 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 2, 8 @@ -2363,4 +2375,3 @@ Branch_1ef1de: drum_note 4, 15 drum_note 10, 14 sound_ret -; 0x1ef1ec diff --git a/crysaudio/music/TCG2/fort4.asm b/crysaudio/music/TCG2/fort4.asm index bf806bbc..e0fdd1cc 100644 --- a/crysaudio/music/TCG2/fort4.asm +++ b/crysaudio/music/TCG2/fort4.asm @@ -5,23 +5,28 @@ Music_Fort4: channel 3, Music_Fort4_Ch3 channel 4, Music_Fort4_Ch4 -Music_Fort4_Ch2: ; 1f16cc (7c:56cc) - channel_volume 10 - ;musicf0 22 +Music_Fort4_Ch2: +; preset 22 + volume_envelope 9, 0 + duty_cycle 0 + vibrato 80, 3, 3 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 2 note C_, 16 .MainLoop - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 speed 1 - ;musicdc 255 - ;musicef 255 - ;musicf1 71 + stereo_panning TRUE, TRUE +; musicef -1 +; musicf1 71 octave 2 speed 4 - fade_wave 7 - ;musicf2 +; cutoff 7 +; musicf2 .Loop1 note D_, 1 note D_, 3 @@ -45,47 +50,47 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) sound_loop 4, .Loop1 duty_cycle 1 octave 3 - fade_wave 8 +; cutoff 8 speed 8 - ;musicf1 103 - ;musicf3 - channel_volume 2 +; musicf1 103 +; musicf3 + volume_envelope 1, -6 note E_, 14 - channel_volume 11 - ;vibrato_type 5 + volume_envelope 11, 0 +; vibrato_type 5 vibrato 1, 3, 3 - ;musicf2 +; musicf2 note E_, 2 - ;tie +; tie note E_, 6 note E_, 2 - ;musicf3 +; musicf3 note D_, 2 note E_, 2 note F_, 2 note G_, 2 - ;musicf2 +; musicf2 note E_, 4 note E_, 2 - ;musicf3 - channel_volume 1 +; musicf3 + volume_envelope 1, -5 note D_, 10 - channel_volume 11 - ;musicf2 + volume_envelope 11, 0 +; musicf2 note D_, 14 note D_, 2 - ;musicf3 - channel_volume 11 +; musicf3 + volume_envelope 11, 0 note D_, 4 note D_, 2 - ;musicf3 - channel_volume 2 +; musicf3 + volume_envelope 1, -6 note G_, 10 - channel_volume 11 - ;musicf2 + volume_envelope 11, 0 +; musicf2 note G_, 6 note G_, 2 - ;musicf3 +; musicf3 note F_, 3 note C_, 3 note F_, 2 @@ -96,66 +101,66 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) speed 1 note F_, 4 speed 8 - ;musicf2 +; musicf2 note E_, 5 - ;tie +; tie note E_, 10 - ;tie +; tie note E_, 12 note E_, 4 - ;musicf3 - channel_volume 2 +; musicf3 + volume_envelope 1, -6 note E_, 14 - channel_volume 11 - ;vibrato_type 5 + volume_envelope 11, 0 +; vibrato_type 5 vibrato 1, 3, 3 - ;musicf2 +; musicf2 note E_, 2 - ;tie +; tie note E_, 6 note E_, 2 - ;musicf3 +; musicf3 note D_, 2 note E_, 2 note F_, 2 note G_, 2 - ;musicf2 +; musicf2 note A_, 4 note A_, 2 - ;musicf3 - channel_volume 1 +; musicf3 + volume_envelope 1, -5 note G_, 10 - channel_volume 11 - ;musicf2 + volume_envelope 11, 0 +; musicf2 note G_, 14 note G_, 2 - ;musicf3 +; musicf3 vibrato 0, 3, 3 - channel_volume 1 - ;musicf2 + volume_envelope 1, -4 +; musicf2 note A_, 4 note A_, 2 - channel_volume 11 - ;musicf3 + volume_envelope 11, 0 +; musicf3 note G_, 6 - ;musicf2 +; musicf2 note D_, 2 note D_, 2 - channel_volume 1 + volume_envelope 1, -4 note G_, 6 note G_, 2 - ;musicf3 +; musicf3 note F_, 4 - channel_volume 11 + volume_envelope 11, 0 note G_, 3 speed 4 note F_, 1 note G_, 1 speed 8 vibrato 0, 3, 3 - channel_volume 1 + volume_envelope 1, -5 note F_, 7 - channel_volume 11 + volume_envelope 11, 0 vibrato 1, 3, 3 note F_, 8 vibrato 0, 3, 3 @@ -165,42 +170,45 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) speed 8 vibrato 48, 3, 3 note E_, 8 - channel_volume 1 + volume_envelope 1, -3 note F_, 4 - channel_volume 11 + volume_envelope 11, 0 note G_, 4 - channel_volume 1 + volume_envelope 1, -5 note A_, 6 - channel_volume 11 + volume_envelope 11, 0 note A_, 2 - channel_volume 1 + volume_envelope 1, -5 note G_, 6 - channel_volume 11 + volume_envelope 11, 0 note G_, 2 - channel_volume 1 + volume_envelope 1, -5 inc_octave note C_, 6 - channel_volume 11 + volume_envelope 11, 0 note C_, 2 dec_octave - channel_volume 1 + volume_envelope 1, -5 note G_, 6 - channel_volume 11 + volume_envelope 11, 0 note G_, 2 - channel_volume 12 - ;musicf2 + volume_envelope 12, 0 +; musicf2 note A_, 1 note A_, 1 rest 2 - ;musicf3 - ;musicf0 9 +; musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 96 +; musicf1 96 speed 4 - fade_wave 7 - ;musicf2 +; cutoff 7 +; musicf2 note E_, 1 rest 1 note E_, 1 @@ -239,56 +247,56 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) sound_loop 3, .Loop2 duty_cycle 1 octave 3 - fade_wave 8 +; cutoff 8 vibrato 0, 3, 3 speed 8 - ;musicf1 103 - ;musicf3 +; musicf1 103 +; musicf3 .Loop3 - channel_volume 1 + volume_envelope 1, -5 note A_, 6 - channel_volume 11 + volume_envelope 11, 0 note A_, 2 - channel_volume 1 + volume_envelope 1, -5 note G_, 6 - channel_volume 11 + volume_envelope 11, 0 note G_, 2 - channel_volume 1 + volume_envelope 1, -5 inc_octave note C_, 6 - channel_volume 11 + volume_envelope 11, 0 note C_, 2 dec_octave - channel_volume 1 + volume_envelope 1, -5 note G_, 6 - channel_volume 11 + volume_envelope 11, 0 note G_, 2 sound_loop 2, .Loop3 - channel_volume 8 + volume_envelope 8, 0 speed 1 note A_, 4 speed 8 speed 1 - channel_volume 9 + volume_envelope 9, 0 note A#, 4 speed 8 vibrato 40, 3, 3 - channel_volume 8 + volume_envelope 8, 0 note A_, 15 note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 8 note A_, 1 dec_octave speed 1 - channel_volume 12 - ;musicf1 102 - ;musicf3 + volume_envelope 12, 0 +; musicf1 102 +; musicf3 note A#, 8 inc_octave - ;musicf2 +; musicf2 note C#, 5 note C#, 3 note E_, 5 @@ -302,45 +310,47 @@ Music_Fort4_Ch2: ; 1f16cc (7c:56cc) note C#, 3 note E_, 5 note E_, 3 - ;musicf3 +; musicf3 sound_loop 0, .MainLoop -Music_Fort4_Ch1: ; 1f1852 (7c:5852) - channel_volume 10 - channel_volume 15 +Music_Fort4_Ch1: + volume_envelope 15, 1 duty_cycle 2 - ;musicee 28 - ;musicdc 255 +; musicee 28 + stereo_panning TRUE, TRUE vibrato 0, 3, 3 speed 1 octave 3 - ;musicef 250 +; musicef -6 note G_, 5 - ;musicef 2 +; musicef 2 note G_, 5 - ;musicef 4 +; musicef 4 note G_, 6 speed 8 note G_, 4 - ;musicee 0 +; musicee 0 rest 12 .MainLoop - ;musicee 0 +; musicee 0 speed 8 rest 16 rest 16 rest 16 - ;musicf0 23 - ;musicf1 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 23 speed 4 octave 4 - ;musicf3 +; musicf3 rest 1 rest 1 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -358,17 +368,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) dec_octave note A_, 1 note A_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 inc_octave note A_, 1 rest 1 dec_octave note A_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -387,16 +403,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note A_, 1 inc_octave - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 dec_octave note A_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -414,17 +436,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) dec_octave note A_, 1 note A_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 inc_octave note A_, 1 rest 1 dec_octave note A_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -443,16 +471,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note A_, 1 inc_octave - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 dec_octave note A_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note G#, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -469,16 +503,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note G#, 1 note D_, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note G#, 1 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note G#, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -495,16 +535,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note G#, 1 note D_, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note G#, 1 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note G#, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -521,16 +567,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note G#, 1 note D_, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note G#, 1 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note G#, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -547,17 +599,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note G#, 1 note D_, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note G#, 1 .Loop1 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note G_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D#, 1 dec_octave @@ -574,16 +632,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A#, 1 note D#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A#, 1 rest 1 note F_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 dec_octave note G_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D#, 1 dec_octave @@ -600,17 +664,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A#, 1 note D#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A#, 1 sound_loop 2, .Loop1 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -628,17 +698,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) dec_octave note A_, 1 note A_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 inc_octave note A_, 1 rest 1 dec_octave note A_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -657,17 +733,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note A_, 1 inc_octave - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 .Loop2 rest 1 dec_octave note A_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -686,16 +768,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note A_, 1 inc_octave - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 dec_octave note A_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -714,17 +802,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note A_, 1 inc_octave - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 sound_loop 3, .Loop2 rest 1 dec_octave note A_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note G_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D#, 1 dec_octave @@ -741,16 +835,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A#, 1 note D#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A#, 1 rest 1 note F_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 dec_octave note G_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D#, 1 dec_octave @@ -767,16 +867,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A#, 1 note D#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A#, 1 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note G_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D#, 1 dec_octave @@ -793,16 +899,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A#, 1 note D#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A#, 1 rest 1 note F_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 dec_octave note G_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D#, 1 dec_octave @@ -819,17 +931,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A#, 1 note D#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A#, 1 .Loop3 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note B_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -846,16 +964,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note D_, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 note F_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 dec_octave note B_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note D_, 1 dec_octave @@ -872,17 +996,23 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note D_, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 sound_loop 2, .Loop3 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A#, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note C#, 1 dec_octave @@ -899,16 +1029,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note C#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 note F_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 dec_octave note A#, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note C#, 1 dec_octave @@ -925,16 +1061,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note C#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 note F_, 1 dec_octave - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note C#, 1 dec_octave @@ -951,16 +1093,22 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note C#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 rest 1 note F_, 1 - ;musicf0 23 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 dec_octave note A_, 1 rest 1 - ;musicf2 +; musicf2 inc_octave note C#, 1 dec_octave @@ -977,50 +1125,53 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note A_, 1 note C#, 1 note F_, 1 - ;musicf3 - ;musicf0 24 +; musicf3 +; preset 24 + volume_envelope 2, 6 + duty_cycle 2 + vibrato 28, 3, 3 note A_, 1 duty_cycle 1 octave 3 - fade_wave 8 +; cutoff 8 speed 8 - ;musicf1 103 - ;musicf3 +; musicf1 103 +; musicf3 octave 3 - channel_volume 1 + volume_envelope 1, -5 note F_, 6 - channel_volume 11 + volume_envelope 11, 0 note F_, 2 - channel_volume 1 + volume_envelope 1, -5 note D_, 6 - channel_volume 11 + volume_envelope 11, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, -5 note G_, 6 - channel_volume 11 + volume_envelope 11, 0 note G_, 2 - channel_volume 1 + volume_envelope 1, -5 note D_, 6 - channel_volume 11 + volume_envelope 11, 0 note D_, 2 - channel_volume 12 - ;musicf2 + volume_envelope 12, 0 +; musicf2 note E_, 1 note E_, 1 rest 1 - ;musicf3 - channel_volume 15 +; musicf3 + volume_envelope 15, 1 duty_cycle 2 - ;musicee 28 - ;musicdc 255 +; musicee 28 + stereo_panning TRUE, TRUE vibrato 0, 3, 3 speed 1 octave 3 - ;musicef 250 +; musicef -6 note G_, 4 - ;musicef 2 +; musicef 2 note G_, 4 - ;musicef 4 +; musicef 4 speed 8 note G_, 4 rest 4 @@ -1032,11 +1183,11 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) rest 3 speed 1 octave 3 - ;musicef 250 +; musicef -6 note G_, 4 - ;musicef 2 +; musicef 2 note G_, 4 - ;musicef 4 +; musicef 4 speed 8 note G_, 4 inc_octave @@ -1044,136 +1195,157 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) note C_, 4 dec_octave sound_loop 3, .Loop4 - ;musicee 0 +; musicee 0 duty_cycle 1 octave 3 - fade_wave 8 +; cutoff 8 speed 8 - ;musicf1 103 - ;musicf3 +; musicf1 103 +; musicf3 octave 3 - channel_volume 1 + volume_envelope 1, -5 note D#, 6 - channel_volume 11 + volume_envelope 11, 0 note D#, 2 - channel_volume 1 + volume_envelope 1, -5 note C#, 6 - channel_volume 11 + volume_envelope 11, 0 note C#, 2 - channel_volume 1 + volume_envelope 1, -5 note G_, 6 - channel_volume 11 + volume_envelope 11, 0 note G_, 2 - channel_volume 1 + volume_envelope 1, -5 note C#, 6 sound_call Branch_1f1c7c duty_cycle 1 octave 3 - fade_wave 8 +; cutoff 8 speed 8 - ;musicf1 103 - ;musicf3 +; musicf1 103 +; musicf3 octave 3 - channel_volume 1 + volume_envelope 1, -5 note E_, 6 - channel_volume 11 + volume_envelope 11, 0 note E_, 2 - channel_volume 1 + volume_envelope 1, -5 note D_, 6 - channel_volume 11 + volume_envelope 11, 0 note D_, 2 - channel_volume 1 + volume_envelope 1, -5 note G_, 6 - channel_volume 11 + volume_envelope 11, 0 note G_, 2 - channel_volume 1 + volume_envelope 1, -5 note D_, 6 - channel_volume 11 + volume_envelope 11, 0 note D_, 2 - ;musicee 0 - ;musicf0 4 +; musicee 0 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 80 - ;musicf3 +; musicf1 80 +; musicf3 speed 1 note E_, 4 note F_, 4 speed 8 note E_, 5 sound_call Branch_1f1c69 - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 80 - ;musicf3 - ;musicef 252 +; musicf1 80 +; musicf3 +; musicef -4 note E_, 2 - ;musicef 4 - ;musicf2 +; musicef 4 +; musicf2 note D_, 1 note D_, 1 - ;musicf3 +; musicf3 sound_call Branch_1f1c97 - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 80 +; musicf1 80 note E_, 1 note E_, 2 - ;musicf3 +; musicf3 note F_, 6 sound_call Branch_1f1c69 - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 87 - ;musicf3 - ;musicef 252 +; musicf1 87 +; musicf3 +; musicef -4 note F_, 2 - ;musicef 4 - ;musicf2 +; musicef 4 +; musicf2 note G_, 1 note G_, 1 sound_call Branch_1f1c97 - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 87 +; musicf1 87 note F_, 1 note F_, 2 - ;musicf3 +; musicf3 speed 1 note E_, 4 note F_, 4 speed 8 note E_, 5 sound_call Branch_1f1c69 - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 80 - ;musicf3 - ;musicef 252 +; musicf1 80 +; musicf3 +; musicef -4 note E_, 2 - ;musicef 4 +; musicef 4 dec_octave - ;musicf2 +; musicf2 note B_, 1 note B_, 1 sound_call Branch_1f1c97 - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 80 +; musicf1 80 note D_, 1 note D_, 2 - ;musicf3 +; musicf3 speed 1 note C#, 4 note D_, 4 speed 8 - ;musicf2 +; musicf2 note C#, 7 note C#, 1 - ;musicf3 +; musicf3 speed 1 octave 2 note G_, 8 - ;musicf2 +; musicf2 note A#, 5 note A#, 3 inc_octave @@ -1188,76 +1360,75 @@ Music_Fort4_Ch1: ; 1f1852 (7c:5852) inc_octave note C#, 5 note C#, 3 - ;musicf3 +; musicf3 speed 8 rest 16 sound_loop 0, .MainLoop Branch_1f1c69: - channel_volume 15 + volume_envelope 15, 1 duty_cycle 2 - ;musicee 28 - ;musicdc 255 +; musicee 28 + stereo_panning TRUE, TRUE vibrato 0, 3, 3 speed 1 octave 3 note G_, 16 - ;musicee 0 +; musicee 0 speed 8 sound_ret Branch_1f1c7c: - channel_volume 15 + volume_envelope 15, 1 duty_cycle 2 - ;musicee 28 - ;musicdc 255 +; musicee 28 + stereo_panning TRUE, TRUE vibrato 0, 3, 3 speed 1 octave 3 - ;musicef 250 +; musicef -6 note G_, 5 - ;musicef 4 +; musicef 4 note G_, 5 - ;musicef 2 +; musicef 2 note G_, 6 - ;musicee 0 +; musicee 0 speed 8 sound_ret Branch_1f1c97: - channel_volume 15 + volume_envelope 15, 1 duty_cycle 2 - ;musicee 28 - ;musicdc 255 +; musicee 28 + stereo_panning TRUE, TRUE vibrato 0, 3, 3 speed 1 octave 4 note G_, 8 - ;musicee 0 +; musicee 0 speed 8 sound_ret -Music_Fort4_Ch3: ; 1f1caa (7c:5caa) - channel_volume 1 +Music_Fort4_Ch3: fade_wave 11 channel_volume 1 - ;musice9 96 - ;musicdc 255 +; echo 96 + stereo_panning TRUE, TRUE speed 1 octave 2 note C_, 16 .MainLoop sound_call Branch_1f1ff8 .Loop1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note A_, 4 rest 4 note D_, 4 @@ -1272,14 +1443,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note A_, 4 rest 4 note D_, 4 @@ -1294,7 +1465,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note A_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave @@ -1302,14 +1473,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) note C_, 16 sound_loop 2, .Loop1 .Loop2 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G#, 4 rest 4 note D_, 4 @@ -1324,14 +1495,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G#, 4 rest 4 note D_, 4 @@ -1346,7 +1517,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note G#, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave @@ -1354,14 +1525,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) note C_, 16 sound_loop 2, .Loop2 .Loop3 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G_, 4 rest 4 note D#, 4 @@ -1376,14 +1547,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G_, 4 rest 4 note D#, 4 @@ -1398,21 +1569,21 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note G_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave channel_volume 1 note C_, 16 sound_loop 2, .Loop3 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note A_, 4 rest 4 note D_, 4 @@ -1427,14 +1598,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note A_, 4 rest 4 note D_, 4 @@ -1449,20 +1620,20 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note A_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave channel_volume 1 note C_, 16 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note A_, 4 rest 4 note D_, 4 @@ -1477,23 +1648,23 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note A_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave channel_volume 1 note G#, 4 - ;tie +; tie note A_, 4 inc_octave note C_, 8 @@ -1504,14 +1675,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) note G_, 8 note C_, 8 .Loop4 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note A_, 4 rest 4 note D_, 4 @@ -1526,14 +1697,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note A_, 4 rest 4 note D_, 4 @@ -1548,7 +1719,7 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note A_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave @@ -1556,14 +1727,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) note C_, 16 sound_loop 2, .Loop4 .Loop5 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G_, 4 rest 4 note D#, 4 @@ -1578,14 +1749,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G_, 4 rest 4 note D#, 4 @@ -1600,21 +1771,21 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note G_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave channel_volume 1 note C_, 16 sound_loop 2, .Loop5 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G_, 4 rest 4 note D_, 4 @@ -1629,14 +1800,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G_, 4 rest 4 note D_, 4 @@ -1651,20 +1822,20 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note G_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave channel_volume 1 note C_, 16 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G_, 4 rest 4 note D_, 4 @@ -1679,14 +1850,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note D_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note G_, 4 rest 4 note D_, 4 @@ -1701,20 +1872,20 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note G_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave channel_volume 1 note G_, 16 - ;musice8 6 +; cutoff 6 note A_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note F_, 4 rest 4 note C#, 4 @@ -1729,14 +1900,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note A_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note F_, 4 rest 4 note C#, 4 @@ -1751,20 +1922,20 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note F_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave channel_volume 1 note G_, 16 - ;musice8 6 +; cutoff 6 note A_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note E_, 4 rest 4 note C#, 4 @@ -1779,14 +1950,14 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) dec_octave dec_octave channel_volume 1 - ;musice8 6 +; cutoff 6 note A_, 16 - ;musice8 8 +; cutoff 8 inc_octave inc_octave inc_octave channel_volume 2 - ;musice8 7 +; cutoff 7 note E_, 4 rest 4 note C#, 4 @@ -1801,117 +1972,117 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) rest 4 note E_, 4 rest 4 - ;musice8 8 +; cutoff 8 dec_octave dec_octave dec_octave channel_volume 1 note G_, 8 note A_, 8 - ;vibrato_type 5 +; vibrato_type 5 vibrato 48, 3, 3 note A_, 4 - ;tie - ;musice4 17 +; tie +; frequency_offset 17 note A_, 4 - ;tie - ;musice4 34 +; tie +; frequency_offset 34 note A_, 4 - ;tie - ;musice4 51 +; tie +; frequency_offset 51 note A_, 4 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 sound_call Branch_1f1ff8 - ;vibrato_type 5 +; vibrato_type 5 vibrato 48, 3, 3 speed 8 note D#, 16 - ;tie +; tie note D#, 16 note E_, 16 - ;tie +; tie note E_, 16 speed 1 - ;musice8 6 +; cutoff 6 note A_, 16 rest 16 inc_octave - ;musice8 4 +; cutoff 4 note A_, 16 - ;musice8 6 +; cutoff 6 dec_octave note A_, 16 rest 16 rest 16 rest 16 - ;musice8 8 +; cutoff 8 note E_, 16 - ;musice8 6 +; cutoff 6 note A#, 16 rest 16 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note D_, 16 - ;musice8 6 +; cutoff 6 dec_octave dec_octave note A#, 16 rest 16 rest 16 rest 16 - ;musice8 8 +; cutoff 8 note G_, 16 - ;musice8 6 +; cutoff 6 note A_, 16 rest 16 inc_octave - ;musice8 4 +; cutoff 4 note A_, 16 - ;musice8 6 +; cutoff 6 dec_octave note A_, 16 rest 16 rest 16 rest 16 - ;musice8 8 +; cutoff 8 note G_, 16 note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 16 rest 8 note A_, 8 @@ -1933,73 +2104,73 @@ Music_Fort4_Ch3: ; 1f1caa (7c:5caa) Branch_1f1ff8: octave 2 .Loop6 - ;musice8 6 +; cutoff 6 note D_, 8 rest 8 rest 16 inc_octave inc_octave - ;musice8 7 +; cutoff 7 note F_, 5 rest 3 channel_volume 2 note F_, 5 rest 3 channel_volume 1 - ;musice8 6 +; cutoff 6 dec_octave dec_octave note D_, 16 rest 16 inc_octave - ;musice8 7 +; cutoff 7 note A_, 5 rest 3 channel_volume 2 note A_, 5 rest 3 channel_volume 1 - ;musice8 6 +; cutoff 6 dec_octave rest 16 - ;musice8 8 +; cutoff 8 note C_, 16 sound_loop 3, .Loop6 - ;musice8 6 +; cutoff 6 note D_, 16 rest 16 inc_octave inc_octave - ;musice8 7 +; cutoff 7 note F_, 5 rest 3 channel_volume 2 note F_, 5 rest 3 channel_volume 1 - ;musice8 6 +; cutoff 6 dec_octave dec_octave note D_, 16 rest 16 inc_octave - ;musice8 7 +; cutoff 7 note A_, 5 rest 3 channel_volume 2 note A_, 5 rest 3 channel_volume 1 - ;musice8 6 +; cutoff 6 dec_octave rest 16 - ;musice8 8 +; cutoff 8 note C_, 8 note C#, 8 sound_ret -Music_Fort4_Ch4: ; 1f204f (7c:604f) +Music_Fort4_Ch4: toggle_noise 6 drum_speed 8 rest 2 @@ -2092,11 +2263,11 @@ Music_Fort4_Ch4: ; 1f204f (7c:604f) drum_note 2, 1 drum_note 2, 1 drum_note 2, 1 - ;musicef 2 +; musicef 2 drum_note 8, 16 - ;tie +; tie rest 16 - ;musicef 0 +; musicef 0 drum_note 1, 2 drum_note 4, 1 drum_note 7, 1 @@ -2138,15 +2309,15 @@ Music_Fort4_Ch4: ; 1f204f (7c:604f) drum_note 2, 2 drum_note 2, 1 drum_note 2, 1 - ;musicef 1 +; musicef 1 drum_note 8, 16 - ;tie +; tie rest 16 - ;musicef 1 +; musicef 1 drum_note 8, 16 - ;tie +; tie rest 16 - ;musicef 0 +; musicef 0 drum_note 1, 2 drum_note 4, 1 drum_note 7, 1 @@ -2177,9 +2348,9 @@ Music_Fort4_Ch4: ; 1f204f (7c:604f) drum_note 4, 2 drum_note 7, 2 drum_note 2, 2 - ;musicef 1 +; musicef 1 drum_note 8, 9 - ;musicef 0 +; musicef 0 drum_speed 1 drum_note 2, 4 drum_note 2, 4 @@ -2204,4 +2375,3 @@ Branch_1f2131: drum_note 7, 2 drum_note 5, 2 sound_ret -; 0x1f213c diff --git a/crysaudio/music/TCG2/gamecorner.asm b/crysaudio/music/TCG2/gamecorner.asm index 8c87bbb4..629e7f40 100644 --- a/crysaudio/music/TCG2/gamecorner.asm +++ b/crysaudio/music/TCG2/gamecorner.asm @@ -5,37 +5,39 @@ Music_TCG2GameCorner: channel 3, Music_TCG2GameCorner_Ch3 channel 4, Music_TCG2GameCorner_Ch4 -Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) - channel_volume 10 +Music_TCG2GameCorner_Ch2: .MainLoop - ;musicf0 17 +; preset 17 + volume_envelope 15, 1 + duty_cycle 1 + vibrato 28, 3, 3 octave 1 - ;musicf3 +; musicf3 vibrato 1, 3, 3 speed 1 .Loop1 note A_, 1 - ;tie +; tie note G#, 1 - ;tie +; tie note G_, 1 - ;tie +; tie note F#, 1 - ;tie +; tie note F_, 1 - ;tie +; tie note E_, 1 - ;tie +; tie note D#, 1 - ;tie +; tie note D_, 1 - ;tie +; tie note D#, 1 - ;tie +; tie note D_, 1 - ;tie +; tie note C#, 1 - ;tie +; tie note C_, 1 rest 12 rest 3 @@ -43,11 +45,14 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) rest 16 rest 11 sound_call Branch_1e75c7 - ;musicf0 20 +; preset 20 + volume_envelope 12, 1 + duty_cycle 1 + vibrato 1, 3, 3 octave 4 note A_, 7 rest 6 - ;musicf1 33 +; musicf1 33 .Loop2 rest 14 octave 2 @@ -58,16 +63,22 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) note A_, 7 rest 13 sound_call Branch_1e75c7 - ;musicf0 20 +; preset 20 + volume_envelope 12, 1 + duty_cycle 1 + vibrato 1, 3, 3 octave 4 note A_, 7 - ;musicf0 18 - octave 4 - ;vibrato_type 18 +; preset 18 + volume_envelope 7, -4 + duty_cycle 2 vibrato 1, 3, 3 - ;musicef 1 + octave 4 +; vibrato_type 18 + vibrato 1, 3, 3 +; musicef 1 note C_, 6 - ;musicf1 39 +; musicf1 39 note C#, 7 note C#, 7 note C#, 7 @@ -84,9 +95,9 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) note D_, 6 note C#, 14 note C#, 7 - ;musicf3 +; musicf3 note C_, 6 - ;musicf2 +; musicf2 note C#, 7 note C#, 7 dec_octave @@ -97,16 +108,16 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) note A_, 7 note A_, 6 note E_, 14 - ;tie +; tie note E_, 13 note E_, 7 - ;musicf3 +; musicf3 note A_, 7 - ;tie +; tie note B_, 7 inc_octave note C_, 6 - ;musicf2 +; musicf2 note C#, 7 note C#, 7 note C#, 7 @@ -123,32 +134,32 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) note D_, 6 note C#, 14 note C#, 7 - ;musicf3 +; musicf3 note C_, 6 - ;musicf2 - ;musicef 255 - ;musicf1 146 +; musicf2 +; musicef -1 +; musicf1 146 note C#, 14 - ;tie +; tie note C#, 13 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 13 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 7 note C#, 13 - ;musicef 1 - ;musicf3 - ;musicef 1 +; musicef 1 +; musicf3 +; musicef 1 note C#, 7 - ;tie +; tie note D_, 7 - ;musicef 255 +; musicef -1 note D#, 6 - ;musicf1 39 +; musicf1 39 note E_, 7 note E_, 7 note E_, 7 @@ -173,11 +184,11 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) note C#, 7 note D_, 7 note D_, 6 - ;musicf3 +; musicf3 note F_, 14 - ;tie +; tie note F_, 13 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 note D_, 7 @@ -189,11 +200,11 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) note A_, 6 note E_, 14 note E_, 7 - ;musicf3 +; musicf3 inc_octave note C#, 6 dec_octave - ;musicf2 +; musicf2 note B_, 7 note B_, 7 note G#, 7 @@ -202,11 +213,14 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) note E_, 7 note B_, 7 note B_, 6 - ;musicef 1 +; musicef 1 note A_, 12 note A_, 2 - ;musicf0 20 - ;musicf3 +; preset 20 + volume_envelope 12, 1 + duty_cycle 1 + vibrato 1, 3, 3 +; musicf3 octave 3 note A_, 7 note C_, 6 @@ -227,10 +241,13 @@ Music_TCG2GameCorner_Ch2: ; 1e74d4 (79:74d4) sound_loop 0, .MainLoop Branch_1e75c7: - ;musicf0 18 - ;musicf1 39 - ;musicf3 - ;vibrato_type 18 +; preset 18 + volume_envelope 7, -4 + duty_cycle 2 + vibrato 1, 3, 3 +; musicf1 39 +; musicf3 +; vibrato_type 18 vibrato 1, 3, 3 octave 4 rest 7 @@ -238,104 +255,104 @@ Branch_1e75c7: note D_, 7 note D#, 6 .Loop3 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 note E_, 7 note E_, 6 - ;musicf3 +; musicf3 note F#, 7 - ;tie +; tie note E_, 7 note D#, 7 - ;tie +; tie note F#, 6 sound_loop 2, .Loop3 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 note A_, 7 note A_, 6 note G#, 14 note G#, 7 - ;musicf3 +; musicf3 note F#, 6 - ;musicf2 +; musicf2 note D_, 14 - ;tie +; tie note D_, 13 note D_, 14 - ;musicf3 +; musicf3 dec_octave note B_, 7 inc_octave note C#, 6 .Loop4 - ;musicf2 +; musicf2 note D_, 7 note D_, 7 note D_, 7 note D_, 6 - ;musicf3 +; musicf3 note E_, 7 - ;tie +; tie note D_, 7 note C#, 7 - ;tie +; tie note E_, 6 sound_loop 2, .Loop4 - ;musicf2 +; musicf2 note D_, 7 note D_, 7 note G#, 7 note G#, 6 note F#, 14 note F#, 7 - ;musicf3 +; musicf3 note E_, 6 - ;musicf2 +; musicf2 note C#, 14 - ;tie +; tie note C#, 13 note C#, 7 - ;musicf3 +; musicf3 note C#, 7 - ;tie +; tie note D_, 7 note D#, 6 .Loop5 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 note E_, 7 note E_, 6 - ;musicf3 +; musicf3 note F#, 7 - ;tie +; tie note E_, 7 note D#, 7 - ;tie +; tie note F#, 6 sound_loop 2, .Loop5 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 note A_, 7 note A_, 6 note B_, 14 note B_, 7 - ;musicf3 +; musicf3 note A_, 6 - ;musicf2 +; musicf2 note F#, 14 - ;tie +; tie note F#, 13 note F#, 14 - ;musicf3 +; musicf3 note F#, 7 - ;tie +; tie note G#, 6 - ;musicf2 +; musicf2 note A_, 7 note A_, 7 note A_, 7 @@ -364,20 +381,19 @@ Branch_1e75c7: note G#, 7 note G#, 6 note A_, 14 - ;tie +; tie note A_, 13 note A_, 14 - ;musicf3 +; musicf3 sound_ret -Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c) - channel_volume 10 +Music_TCG2GameCorner_Ch1: .MainLoop - channel_volume 12 + volume_envelope 12, 2 duty_cycle 2 - ;musicee 30 - ;musicdc 255 +; musicee 30 + stereo_panning TRUE, TRUE vibrato 0, 3, 3 speed 1 .Loop1 @@ -388,10 +404,10 @@ Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c) rest 7 rest 7 note D_, 6 - ;tie +; tie note D_, 7 note D_, 7 - ;tie +; tie note D_, 7 dec_octave note G_, 6 @@ -408,9 +424,12 @@ Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c) rest 11 rest 16 rest 11 - ;musicee 0 - ;musicf0 20 - ;musicf3 +; musicee 0 +; preset 20 + volume_envelope 12, 1 + duty_cycle 1 + vibrato 1, 3, 3 +; musicf3 sound_call Branch_1e778f octave 3 note D#, 7 @@ -442,19 +461,19 @@ Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c) note E_, 7 rest 6 sound_loop 14, .Loop2 - ;musicf3 +; musicf3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 - ;tie +; tie note E_, 6 - ;musicf1 33 +; musicf1 33 note F#, 7 note F#, 7 note G#, 7 note G#, 6 - ;musicf3 +; musicf3 sound_call Branch_1e778f octave 3 note D#, 7 @@ -667,8 +686,11 @@ Music_TCG2GameCorner_Ch1: ; 1e765c (79:765c) sound_loop 0, .MainLoop Branch_1e778f: - ;musicf0 20 - ;musicf3 +; preset 20 + volume_envelope 12, 1 + duty_cycle 1 + vibrato 1, 3, 3 +; musicf3 octave 2 note A_, 6 rest 8 @@ -828,13 +850,12 @@ Branch_1e778f: sound_ret -Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) - channel_volume 1 +Music_TCG2GameCorner_Ch3: fade_wave 11 channel_volume 1 - ;musice9 64 +; echo 64 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE .MainLoop octave 2 note A_, 11 @@ -868,7 +889,7 @@ Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) note A_, 4 rest 3 note E_, 16 - ;tie +; tie note E_, 4 note F#, 7 rest 7 @@ -1071,7 +1092,7 @@ Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) note A_, 4 rest 3 note E_, 16 - ;tie +; tie note E_, 4 note F#, 7 rest 7 @@ -1379,41 +1400,41 @@ Music_TCG2GameCorner_Ch3: ; 1e782f (79:782f) sound_loop 0, .MainLoop -Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) +Music_TCG2GameCorner_Ch4: toggle_noise 6 .MainLoop octave 1 drum_speed 1 .Loop1 - ;musicef 251 +; musicef -5 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 6 sound_loop 13, .Loop1 - ;musicef 251 +; musicef -5 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 6 - ;musicef 1 +; musicef 1 drum_note 2, 14 rest 13 rest 14 rest 13 - ;musicef 0 +; musicef 0 .Loop2 drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 14 drum_note 2, 13 @@ -1424,26 +1445,26 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 2, 14 drum_note 2, 7 - ;musicef 255 +; musicef -1 drum_note 2, 6 - ;musicef 0 +; musicef 0 drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 14 drum_note 2, 13 @@ -1453,9 +1474,9 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 14 drum_note 2, 13 @@ -1464,44 +1485,44 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 2, 13 .Loop3 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 6 - ;musicef 0 +; musicef 0 sound_loop 5, .Loop3 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 14 drum_note 2, 13 drum_note 2, 14 - ;musicef 1 +; musicef 1 drum_note 6, 13 - ;musicef 0 +; musicef 0 .Loop4 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 6 - ;musicef 0 +; musicef 0 sound_loop 14, .Loop4 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 6 drum_note 2, 14 @@ -1511,9 +1532,9 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 14 drum_note 2, 13 @@ -1524,24 +1545,24 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 drum_note 2, 7 drum_note 2, 13 drum_note 2, 14 - ;musicef 255 +; musicef -1 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 6 drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 14 drum_note 2, 13 @@ -1551,9 +1572,9 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 14 drum_note 2, 13 @@ -1562,55 +1583,55 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 2, 13 .Loop6 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 6 - ;musicef 0 +; musicef 0 sound_loop 5, .Loop6 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 14 drum_note 2, 13 drum_note 2, 14 - ;musicef 1 +; musicef 1 drum_note 10, 13 - ;musicef 0 +; musicef 0 .Loop7 drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 6 sound_loop 3, .Loop7 drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 drum_note 2, 7 @@ -1620,64 +1641,64 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 2, 5 drum_note 2, 5 drum_note 2, 4 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 - ;musicef 255 +; musicef -1 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 6 drum_note 1, 14 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 1, 7 - ;musicef 255 +; musicef -1 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 6 drum_note 2, 14 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 11, 7 drum_note 1, 6 drum_note 2, 14 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 5, 13 @@ -1685,20 +1706,19 @@ Music_TCG2GameCorner_Ch4: ; 1e7a57 (79:7a57) drum_note 2, 7 drum_note 2, 6 drum_note 1, 7 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 6 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 13 drum_note 2, 14 - ;musicef 1 +; musicef 1 drum_note 10, 13 - ;musicef 0 +; musicef 0 sound_loop 0, .MainLoop -; 0x1e7bfa diff --git a/crysaudio/music/TCG2/grblimp.asm b/crysaudio/music/TCG2/grblimp.asm index e061e034..84913062 100644 --- a/crysaudio/music/TCG2/grblimp.asm +++ b/crysaudio/music/TCG2/grblimp.asm @@ -5,35 +5,37 @@ Music_GRBlimp: channel 3, Music_GRBlimp_Ch3 channel 4, Music_GRBlimp_Ch4 -Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) - channel_volume 10 - ;musicdc 17 - ;vibrato_type 1 +Music_GRBlimp_Ch2: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 28, 3, 3 - fade_wave 8 +; cutoff 8 octave 4 duty_cycle 2 - channel_volume 7 + volume_envelope 7, 5 vibrato 28, 3, 3 - ;musicf0 0 - ;musicdc 255 - ;musicf1 48 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf1 48 sound_call Branch_1e7cf5 note G#, 16 - ;tie +; tie note G#, 5 note G#, 7 inc_octave note C_, 16 - ;tie +; tie note C_, 5 dec_octave - ;musicf3 +; musicf3 note A#, 4 inc_octave note C_, 3 dec_octave - ;musicf1 69 +; musicf1 69 note A#, 14 note A#, 5 note G_, 14 @@ -46,20 +48,20 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note F_, 14 sound_call Branch_1e7cf5 note G#, 16 - ;tie +; tie note G#, 5 note G#, 7 inc_octave note C_, 16 - ;tie +; tie note C_, 5 dec_octave - ;musicf3 +; musicf3 note A#, 4 inc_octave note C_, 3 dec_octave - ;musicf1 69 +; musicf1 69 note A#, 14 note A#, 5 note F_, 14 @@ -71,29 +73,32 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note C_, 14 speed 1 note C_, 14 - ;musicf0 2 - ;musicf3 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf3 speed 1 note C_, 5 note C#, 5 note D#, 4 - ;musicf1 68 +; musicf1 68 note F_, 16 - ;tie +; tie note F_, 12 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 12 note F_, 14 - ;musicf3 +; musicf3 note F_, 14 - ;musicf1 64 +; musicf1 64 note D#, 14 note D#, 7 - ;musicf3 +; musicf3 note C#, 7 - ;musicf1 64 +; musicf1 64 note C_, 7 note C#, 7 rest 7 @@ -104,37 +109,37 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) dec_octave vibrato 14, 3, 3 note A#, 14 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 10 note A#, 14 - ;musicf3 +; musicf3 note A#, 5 inc_octave note C_, 5 note C#, 4 vibrato 28, 3, 3 - ;musicf1 64 +; musicf1 64 note D#, 16 - ;tie +; tie note D#, 12 - ;tie +; tie note D#, 16 - ;tie +; tie note D#, 12 note D#, 14 - ;musicf3 +; musicf3 note D#, 14 - ;musicf1 64 +; musicf1 64 note C#, 14 note D#, 7 dec_octave - ;musicf3 +; musicf3 note B_, 7 - ;musicf1 64 +; musicf1 64 note A#, 7 note B_, 7 rest 7 @@ -142,51 +147,51 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note B_, 3 vibrato 14, 3, 3 note G#, 14 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 10 note G#, 14 - ;musicf3 +; musicf3 note G#, 5 note A#, 5 note B_, 4 inc_octave vibrato 28, 3, 3 note C#, 16 - ;tie +; tie note C#, 12 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 10 dec_octave - ;musicf1 64 +; musicf1 64 note B_, 7 inc_octave note C#, 7 dec_octave - ;musicf3 +; musicf3 note F#, 14 - ;musicf1 64 +; musicf1 64 note B_, 7 note F#, 7 inc_octave note C#, 16 - ;tie +; tie note C#, 12 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 10 note C#, 14 - ;musicf1 64 +; musicf1 64 note C#, 5 note C#, 5 note D#, 4 @@ -194,15 +199,15 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note E_, 5 note D#, 4 note D#, 16 - ;tie +; tie note D#, 12 - ;tie +; tie note D#, 14 - ;musicf3 +; musicf3 note C#, 5 note D#, 5 note C#, 4 - ;musicf1 64 +; musicf1 64 note C_, 14 note C_, 5 dec_octave @@ -214,7 +219,7 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) note G#, 4 inc_octave vibrato 28, 3, 3 - ;musicf1 70 +; musicf1 70 speed 7 note D_, 16 note D_, 2 @@ -223,16 +228,16 @@ Music_GRBlimp_Ch2: ; 1e7bfa (79:7bfa) Branch_1e7cf5: octave 4 speed 1 - ;musicf2 +; musicf2 note C_, 4 note C_, 3 note D_, 4 note C_, 3 - ;musicf1 69 +; musicf1 69 speed 7 note D#, 10 note D#, 2 - ;musicf1 48 +; musicf1 48 speed 1 note D_, 4 note D_, 3 @@ -256,11 +261,11 @@ Branch_1e7cf5: note A_, 4 note A_, 3 note A#, 16 - ;tie +; tie note A#, 5 note A#, 7 note G_, 16 - ;tie +; tie note G_, 5 note G_, 7 note D#, 14 @@ -280,11 +285,11 @@ Branch_1e7cf5: note C_, 3 dec_octave note F_, 16 - ;tie +; tie note F_, 12 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 12 note F_, 14 inc_octave @@ -295,7 +300,7 @@ Branch_1e7cf5: speed 7 note D#, 10 note D#, 2 - ;musicf1 64 +; musicf1 64 speed 1 note D_, 4 note D_, 3 @@ -318,11 +323,11 @@ Branch_1e7cf5: note C_, 3 dec_octave note F_, 16 - ;tie +; tie note F_, 12 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 12 note F_, 14 note F_, 4 @@ -332,23 +337,25 @@ Branch_1e7cf5: sound_ret -Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) - channel_volume 10 - ;musicdc 17 - ;vibrato_type 1 +Music_GRBlimp_Ch1: + stereo_panning TRUE, TRUE +; vibrato_type 1 vibrato 28, 3, 3 - fade_wave 8 +; cutoff 8 speed 7 octave 3 - ;musicf0 1 - ;musicf1 64 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 64 sound_call Branch_1e7e8a note C#, 14 - ;tie +; tie note C#, 7 note C#, 7 note F_, 14 - ;tie +; tie note F_, 7 note F_, 7 note G_, 14 @@ -361,27 +368,27 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note D#, 4 dec_octave note A#, 14 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 14 - ;musicf3 +; musicf3 note A_, 4 note A#, 3 note G_, 4 note A_, 3 - ;musicf2 +; musicf2 note A_, 14 - ;tie +; tie note A_, 14 note A_, 14 sound_call Branch_1e7e8a note D#, 16 - ;tie +; tie note D#, 5 note D#, 7 note G#, 16 - ;tie +; tie note G#, 5 note G#, 7 note F_, 14 @@ -391,17 +398,17 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note F_, 14 note F_, 4 note F_, 16 - ;tie +; tie note F_, 12 - ;tie +; tie note F_, 16 - ;musicf3 +; musicf3 note E_, 4 note F_, 3 note E_, 4 note D_, 3 note E_, 16 - ;tie +; tie note E_, 12 dec_octave note D_, 4 @@ -417,7 +424,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) vibrato 28, 3, 3 note C#, 14 dec_octave - ;musicf1 65 +; musicf1 65 note C#, 3 inc_octave note C#, 4 @@ -432,7 +439,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note C#, 4 vibrato 7, 3, 3 note G#, 7 - ;tie +; tie note G#, 14 note G#, 7 inc_octave @@ -463,9 +470,9 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note A#, 4 inc_octave note F#, 7 - ;tie +; tie note F#, 16 - ;tie +; tie note F#, 5 note F#, 14 note F#, 7 @@ -473,7 +480,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) vibrato 28, 3, 3 note B_, 14 dec_octave - ;musicf1 65 +; musicf1 65 note B_, 3 inc_octave note B_, 4 @@ -493,7 +500,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) inc_octave vibrato 7, 3, 3 note F#, 7 - ;tie +; tie note F#, 14 note F#, 7 note A#, 7 @@ -518,9 +525,9 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note G#, 4 inc_octave note E_, 7 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 4 note E_, 14 dec_octave @@ -529,7 +536,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) vibrato 28, 3, 3 inc_octave note E_, 14 - ;musicf1 65 +; musicf1 65 note C#, 3 note E_, 4 note C#, 3 @@ -541,16 +548,16 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note E_, 5 note C#, 4 note A_, 14 - ;musicf1 65 +; musicf1 65 note G#, 7 note A_, 7 - ;musicf3 +; musicf3 note D#, 14 - ;musicf1 65 +; musicf1 65 note G#, 7 note D#, 7 note A_, 14 - ;musicf1 65 +; musicf1 65 note C#, 3 note A_, 4 note C#, 3 @@ -562,7 +569,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note E_, 5 note C#, 4 note A_, 7 - ;tie +; tie note A_, 14 note A_, 7 note A_, 5 @@ -575,9 +582,9 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note A_, 4 vibrato 14, 3, 3 note A#, 14 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 5 note A#, 7 note A#, 7 @@ -589,7 +596,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) note G#, 14 note D#, 4 vibrato 28, 3, 3 - ;musicf1 70 +; musicf1 70 speed 7 note A#, 16 note A#, 2 @@ -597,7 +604,7 @@ Music_GRBlimp_Ch1: ; 1e7d6c (79:7d6c) Branch_1e7e8a: octave 3 - ;musicf2 +; musicf2 speed 1 note A_, 4 note A_, 3 @@ -607,7 +614,7 @@ Branch_1e7e8a: note A#, 10 note A#, 2 speed 1 - ;musicf1 64 +; musicf1 64 note A#, 4 note A#, 3 note A#, 4 @@ -625,11 +632,11 @@ Branch_1e7e8a: note F_, 4 note F_, 3 note G_, 16 - ;tie +; tie note G_, 5 note G_, 7 note D#, 16 - ;tie +; tie note D#, 5 note D#, 7 dec_octave @@ -645,11 +652,11 @@ Branch_1e7e8a: note C_, 4 note F_, 3 note C_, 16 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 12 note C_, 14 note A_, 4 @@ -660,7 +667,7 @@ Branch_1e7e8a: note A#, 10 note A#, 2 speed 1 - ;musicf1 64 +; musicf1 64 note A#, 4 note A#, 3 note A#, 4 @@ -674,11 +681,11 @@ Branch_1e7e8a: note C_, 4 note F_, 3 note C_, 16 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 12 note C_, 14 note C_, 4 @@ -688,13 +695,12 @@ Branch_1e7e8a: sound_ret -Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) - channel_volume 1 - ;musicdc 17 +Music_GRBlimp_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;musice8 3 - ;musice9 96 +; cutoff 3 +; echo 96 octave 2 speed 1 rest 14 @@ -753,32 +759,32 @@ Music_GRBlimp_Ch3: ; 1e7eed (79:7eed) note E_, 4 note D#, 4 note A#, 4 - ;musice8 2 +; cutoff 2 speed 1 note G#, 10 - ;tie +; tie note G#, 9 note D#, 10 - ;tie +; tie note D#, 9 note G#, 10 - ;tie +; tie note G#, 8 - ;musice8 1 +; cutoff 1 note G#, 4 - ;tie +; tie note A_, 4 - ;tie +; tie note A#, 6 - ;tie +; tie speed 7 note A#, 14 - ;tie +; tie note A#, 2 sound_ret -Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50) +Music_GRBlimp_Ch4: toggle_noise 6 drum_speed 9 octave 1 @@ -786,108 +792,99 @@ Music_GRBlimp_Ch4: ; 1e7f50 (79:7f50) rest 14 .Loop1 drum_note 2, 14 - ;musicef 253 +; musicef -3 drum_note 2, 14 - ;musicef 0 +; musicef 0 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 3 drum_note 3, 4 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 14 - ;musicef 253 +; musicef -3 drum_note 2, 14 - ;musicef 0 +; musicef 0 drum_note 3, 3 - ;musicef 253 +; musicef -3 drum_note 3, 4 - ;rept 3 drum_note 3, 3 drum_note 3, 4 - ;--- drum_note 3, 3 drum_note 3, 4 - ;--- drum_note 3, 3 drum_note 3, 4 - ;endr - ;musicef 0 +; musicef 0 drum_note 2, 14 drum_note 2, 14 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 14 - ;musicef 253 +; musicef -3 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 14 - ;musicef 253 +; musicef -3 drum_note 2, 14 - ;musicef 0 +; musicef 0 drum_note 3, 3 - ;musicef 253 +; musicef -3 drum_note 3, 4 - ;rept 3 drum_note 3, 3 drum_note 3, 4 - ;--- drum_note 3, 3 drum_note 3, 4 - ;--- drum_note 3, 3 drum_note 3, 4 - ;endr - ;musicef 0 +; musicef 0 sound_loop 11, .Loop1 drum_note 2, 14 - ;musicef 253 +; musicef -3 drum_note 2, 14 - ;musicef 0 +; musicef 0 drum_note 3, 3 - ;musicef 253 +; musicef -3 drum_note 3, 4 drum_note 3, 3 drum_note 3, 4 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 3, 3 - ;musicef 253 +; musicef -3 drum_note 3, 4 drum_note 3, 3 drum_note 3, 4 - ;musicef 255 +; musicef -1 drum_note 2, 5 - ;musicef 1 +; musicef 1 drum_note 2, 16 - ;tie +; tie rest 3 drum_note 2, 16 - ;tie +; tie rest 2 drum_note 3, 3 - ;musicef 251 +; musicef -5 drum_note 3, 4 .Loop2 drum_note 3, 3 drum_note 3, 4 sound_loop 5, .Loop2 - ;musicef 252 +; musicef -4 .Loop3 drum_note 3, 3 drum_note 3, 4 sound_loop 5, .Loop3 - ;musicef 253 +; musicef -3 .Loop4 drum_note 3, 3 drum_note 3, 4 sound_loop 5, .Loop4 - ;musicef 2 +; musicef 2 drum_note 3, 14 sound_ret -; 0x1e7fd6 diff --git a/crysaudio/music/TCG2/grcastle.asm b/crysaudio/music/TCG2/grcastle.asm index abb414a0..293bcf43 100644 --- a/crysaudio/music/TCG2/grcastle.asm +++ b/crysaudio/music/TCG2/grcastle.asm @@ -5,17 +5,19 @@ Music_GRCastle: channel 3, Music_GRCastle_Ch3 channel 4, Music_GRCastle_Ch4 -Music_GRCastle_Ch2: ; 1f213c (7c:613c) - channel_volume 10 +Music_GRCastle_Ch2: speed 1 rest 12 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 1, 3, 3 - ;musicf1 80 - ;musicf3 - ;musice4 0 +; musicf1 80 +; musicf3 +; frequency_offset 0 note B_, 9 rest 4 note B_, 9 @@ -30,7 +32,7 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) rest 3 vibrato 7, 3, 3 note E_, 13 - ;tie +; tie note E_, 12 vibrato 0, 3, 3 note D_, 13 @@ -42,10 +44,10 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) note E_, 1 rest 3 inc_octave - ;musicf2 +; musicf2 note E_, 12 note E_, 13 - ;musicf3 +; musicf3 dec_octave note E_, 2 rest 4 @@ -69,7 +71,7 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) rest 3 vibrato 7, 3, 3 note E_, 13 - ;tie +; tie note E_, 12 vibrato 0, 3, 3 note D_, 13 @@ -81,735 +83,753 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) note E_, 1 rest 3 note A_, 3 - ;tie - ;musice4 17 +; tie +; frequency_offset 17 note A_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 6 note A_, 13 note G_, 12 .MainLoop - ;musicf0 0 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 2 - channel_volume 7 + volume_envelope 6, -4 note E_, 16 - ;tie +; tie note E_, 9 - channel_volume 11 + volume_envelope 11, 0 note E_, 16 - ;tie +; tie note E_, 9 - ;musicf0 0 - ;musicef 2 - ;musicf1 119 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef 2 +; musicf1 119 octave 2 - ;vibrato_type 5 +; vibrato_type 5 vibrato 37, 3, 3 note A_, 4 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note A_, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note A_, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note A_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 3 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note A#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note A#, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note A#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 9 note B_, 16 - ;musicf3 +; musicf3 note A_, 13 note B_, 12 vibrato 25, 3, 3 inc_octave - ;musicf2 +; musicf2 note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 note C_, 12 vibrato 29, 3, 3 - ;musicf3 +; musicf3 note C_, 4 - ;tie - ;musice4 7 +; tie +; frequency_offset 7 note C_, 3 - ;tie - ;musice4 14 +; tie +; frequency_offset 14 note C_, 3 - ;tie - ;musice4 22 +; tie +; frequency_offset 22 note C_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note C#, 3 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note C#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note C#, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note C#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 13 - ;tie +; tie note D_, 12 vibrato 13, 3, 3 - ;musicf2 +; musicf2 note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 note C_, 12 vibrato 25, 3, 3 dec_octave - ;musicf3 +; musicf3 note A_, 4 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note A_, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note A_, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note A_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 3 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note A#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note A#, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note A#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 13 inc_octave note C_, 12 dec_octave - ;musicf2 +; musicf2 note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 note B_, 13 - ;tie +; tie note B_, 12 vibrato 37, 3, 3 note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 note A_, 12 - ;musicf3 +; musicf3 inc_octave note C_, 4 - ;tie - ;musice4 7 +; tie +; frequency_offset 7 note C_, 3 - ;tie - ;musice4 14 +; tie +; frequency_offset 14 note C_, 3 - ;tie - ;musice4 22 +; tie +; frequency_offset 22 note C_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note C#, 3 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note C#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note C#, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note C#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 13 dec_octave note A_, 12 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 inc_octave - ;musicf2 +; musicf2 note D_, 13 note D_, 12 dec_octave note A_, 4 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note A_, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note A_, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note A_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 3 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note A#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note A#, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note A#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 9 note B_, 16 - ;musicf3 +; musicf3 note A_, 13 note B_, 12 vibrato 25, 3, 3 inc_octave - ;musicf2 +; musicf2 note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 note C_, 12 note C_, 4 - ;tie - ;musice4 7 +; tie +; frequency_offset 7 note C_, 3 - ;tie - ;musice4 14 +; tie +; frequency_offset 14 note C_, 3 - ;tie - ;musice4 22 +; tie +; frequency_offset 22 note C_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note C#, 3 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note C#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note C#, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note C#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 13 - ;tie +; tie note D_, 12 vibrato 13, 3, 3 - ;musicf2 +; musicf2 note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 note E_, 12 vibrato 25, 3, 3 - ;musicf3 +; musicf3 note E_, 4 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note E_, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note E_, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note E_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 3 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note F_, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note F_, 3 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note F_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F#, 13 note G_, 12 - ;musicf2 +; musicf2 note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;musicf3 +; musicf3 note F_, 4 note E_, 4 note D#, 4 note D_, 16 - ;tie +; tie note D_, 9 - ;musicf2 +; musicf2 note F#, 13 note F#, 12 - ;musicf3 +; musicf3 note F_, 4 - ;musicf2 +; musicf2 note F#, 9 - ;tie +; tie note F#, 12 note F#, 13 - ;musicf3 +; musicf3 note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 9 - ;tie +; tie note E_, 4 - ;tie - ;musice4 249 +; tie +; frequency_offset -7 note E_, 3 - ;tie - ;musice4 242 +; tie +; frequency_offset -14 note E_, 3 - ;tie - ;musice4 235 +; tie +; frequency_offset -21 note E_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D#, 3 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note D#, 3 - ;tie - ;musice4 244 +; tie +; frequency_offset -12 note D#, 3 - ;tie - ;musice4 240 +; tie +; frequency_offset -16 note D#, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 1 - ;musicf0 14 - ;musicf1 71 - ;musicf3 +; preset 14 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 2 - channel_volume 8 + volume_envelope 7, -4 note B_, 16 - ;tie +; tie note B_, 9 - ;musicf0 14 +; preset 14 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 note B_, 3 inc_octave - ;musicef 1 +; musicef 1 note D_, 16 - ;tie +; tie note D_, 6 note D#, 4 - ;musicef 1 +; musicef 1 note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 9 note A#, 3 vibrato 25, 3, 3 - ;musicf2 +; musicf2 note B_, 9 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 note B_, 12 - ;musicf3 +; musicf3 note A_, 16 - ;tie +; tie note A_, 9 note G_, 16 - ;tie +; tie note G_, 9 note F#, 13 note G_, 12 note F#, 13 note D_, 12 - ;tie +; tie note D_, 13 note C_, 4 dec_octave note B_, 4 note A#, 4 - ;musicf2 +; musicf2 note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 note A_, 12 - ;musicf3 +; musicf3 note F#, 13 - ;tie +; tie note F#, 12 note G_, 13 - ;tie +; tie note G_, 12 - ;tie +; tie note G_, 13 inc_octave note D#, 3 - ;musicf2 +; musicf2 note E_, 9 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 note E_, 12 - ;musicf3 +; musicf3 note D#, 4 note E_, 15 note F#, 6 - ;tie +; tie note F#, 13 note G_, 12 note F#, 4 note G_, 3 note F#, 6 - ;tie +; tie note F#, 12 note D_, 13 dec_octave note A#, 6 - ;musicf2 +; musicf2 note B_, 6 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 note B_, 12 - ;musicf3 +; musicf3 inc_octave note C_, 16 - ;tie +; tie note C_, 9 note D_, 16 - ;tie +; tie note D_, 9 note D#, 4 note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 9 note A#, 3 vibrato 25, 3, 3 - ;musicf2 +; musicf2 note B_, 9 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 note B_, 12 - ;musicf3 +; musicf3 note A_, 16 - ;tie +; tie note A_, 9 note G_, 16 - ;tie +; tie note G_, 9 note F#, 13 note G_, 12 note F#, 13 note G#, 3 note A_, 9 - ;tie +; tie note A_, 13 note G_, 4 note F#, 4 note E_, 4 - ;musicf2 +; musicf2 note D_, 13 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 13 note D_, 12 - ;musicf3 +; musicf3 dec_octave note A#, 4 note B_, 9 - ;tie +; tie note B_, 12 inc_octave note D_, 13 - ;tie +; tie note D_, 12 note D#, 4 note E_, 9 - ;tie +; tie note E_, 12 note D_, 13 - ;musicf2 +; musicf2 note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 note E_, 12 - ;musicf3 +; musicf3 note E_, 13 - ;tie +; tie note E_, 6 note A_, 6 - ;tie +; tie note A_, 13 note G_, 12 note F#, 4 note G_, 3 - ;musicf2 +; musicf2 note F#, 6 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 - ;tie +; tie note F#, 13 note F#, 12 - ;musicf3 +; musicf3 octave 1 - ;musicf0 8 - ;vibrato_type 5 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; vibrato_type 5 vibrato 50, 3, 3 - ;musice4 247 +; frequency_offset -9 .Loop1 note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie sound_loop 4, .Loop1 note E_, 16 - ;musice4 0 - ;musicf0 23 +; frequency_offset 0 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 32 - ;musicf2 +; musicf1 32 +; musicf2 note E_, 7 note B_, 6 note A_, 6 @@ -898,21 +918,23 @@ Music_GRCastle_Ch2: ; 1f213c (7c:613c) note G_, 6 note D_, 6 dec_octave - ;musicf3 +; musicf3 sound_loop 0, .MainLoop -Music_GRCastle_Ch1: ; 1f2525 (7c:6525) - channel_volume 10 +Music_GRCastle_Ch1: speed 1 rest 12 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 1 - ;vibrato_type 5 +; vibrato_type 5 vibrato 1, 3, 3 - ;musicf1 80 - ;musicf3 - ;musice4 0 +; musicf1 80 +; musicf3 +; frequency_offset 0 rest 13 rest 12 rest 13 @@ -924,17 +946,17 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note B_, 13 - ;tie +; tie note B_, 12 vibrato 0, 3, 3 note A_, 13 note B_, 12 rest 13 inc_octave - ;musicf2 +; musicf2 note B_, 12 note B_, 13 - ;musicf3 +; musicf3 rest 12 note D_, 7 rest 6 @@ -955,7 +977,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note B_, 13 - ;tie +; tie note B_, 12 vibrato 0, 3, 3 note A_, 13 @@ -968,11 +990,11 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 inc_octave note E_, 3 - ;tie - ;musice4 22 +; tie +; frequency_offset 22 note E_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 6 note E_, 13 note D_, 12 @@ -982,19 +1004,22 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note A_, 13 note A#, 12 .MainLoop - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - ;vibrato_type 5 +; vibrato_type 5 vibrato 0, 3, 3 - ;musicf1 80 +; musicf1 80 note E_, 9 rest 4 - ;musicf2 +; musicf2 note E_, 9 rest 3 note E_, 9 rest 4 - ;musicf3 +; musicf3 note E_, 2 rest 2 note E_, 1 @@ -1003,7 +1028,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note E_, 13 - ;tie +; tie note E_, 12 vibrato 0, 3, 3 note D_, 13 @@ -1016,7 +1041,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note G_, 12 - ;tie +; tie note G_, 13 vibrato 0, 3, 3 note G_, 2 @@ -1030,12 +1055,12 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note D_, 12 note F_, 9 rest 4 - ;musicf2 +; musicf2 note F_, 9 rest 3 note F_, 9 rest 4 - ;musicf3 +; musicf3 note F_, 2 rest 2 note F_, 1 @@ -1044,7 +1069,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note F_, 13 - ;tie +; tie note F_, 12 vibrato 0, 3, 3 note E_, 13 @@ -1057,7 +1082,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note A_, 12 - ;tie +; tie note A_, 13 vibrato 0, 3, 3 note F_, 2 @@ -1071,12 +1096,12 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note F_, 12 note E_, 9 rest 4 - ;musicf2 +; musicf2 note E_, 9 rest 3 note E_, 9 rest 4 - ;musicf3 +; musicf3 note E_, 2 rest 2 note E_, 1 @@ -1085,7 +1110,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note E_, 13 - ;tie +; tie note E_, 12 vibrato 0, 3, 3 note D_, 13 @@ -1098,7 +1123,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note G_, 12 - ;tie +; tie note G_, 13 vibrato 0, 3, 3 note G_, 2 @@ -1112,12 +1137,12 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note D_, 12 note F_, 9 rest 4 - ;musicf2 +; musicf2 note F_, 9 rest 3 note F_, 9 rest 4 - ;musicf3 +; musicf3 note F_, 2 rest 2 note F_, 1 @@ -1127,7 +1152,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) vibrato 7, 3, 3 inc_octave note C_, 13 - ;tie +; tie note C_, 12 dec_octave vibrato 0, 3, 3 @@ -1141,7 +1166,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note A_, 12 - ;tie +; tie note A_, 13 vibrato 0, 3, 3 note A_, 2 @@ -1155,12 +1180,12 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note A_, 12 note E_, 9 rest 4 - ;musicf2 +; musicf2 note E_, 9 rest 3 note E_, 9 rest 4 - ;musicf3 +; musicf3 note E_, 2 rest 2 note E_, 1 @@ -1169,7 +1194,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note E_, 13 - ;tie +; tie note E_, 12 vibrato 0, 3, 3 note D_, 13 @@ -1182,7 +1207,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note G_, 12 - ;tie +; tie note G_, 13 vibrato 0, 3, 3 note G_, 2 @@ -1196,12 +1221,12 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note D_, 12 note F_, 9 rest 4 - ;musicf2 +; musicf2 note F_, 9 rest 3 note F_, 9 rest 4 - ;musicf3 +; musicf3 note F_, 2 rest 2 note F_, 1 @@ -1210,7 +1235,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note F_, 13 - ;tie +; tie note F_, 12 vibrato 0, 3, 3 note E_, 13 @@ -1223,7 +1248,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note A_, 12 - ;tie +; tie note A_, 13 vibrato 0, 3, 3 note F_, 2 @@ -1237,12 +1262,12 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note F_, 12 note E_, 9 rest 4 - ;musicf2 +; musicf2 note E_, 9 rest 3 note E_, 9 rest 4 - ;musicf3 +; musicf3 note E_, 2 rest 2 note E_, 1 @@ -1251,7 +1276,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note E_, 13 - ;tie +; tie note E_, 12 vibrato 0, 3, 3 note D_, 13 @@ -1264,7 +1289,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) rest 3 vibrato 7, 3, 3 note G_, 12 - ;tie +; tie note G_, 13 vibrato 0, 3, 3 note G_, 2 @@ -1288,7 +1313,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note E_, 1 rest 3 note B_, 13 - ;tie +; tie note B_, 12 note A_, 13 note B_, 12 @@ -1310,111 +1335,111 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) dec_octave note A_, 12 octave 2 - ;musicef 254 +; musicef -2 note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 note A#, 3 note B_, 9 note B_, 13 - ;tie +; tie note B_, 12 inc_octave note D_, 4 - ;tie - ;musice4 6 +; tie +; frequency_offset 6 note D_, 3 - ;tie - ;musice4 12 +; tie +; frequency_offset 12 note D_, 3 - ;tie - ;musice4 15 +; tie +; frequency_offset 15 note D_, 3 - ;tie - ;musice4 254 +; tie +; frequency_offset -2 note D#, 3 - ;tie - ;musice4 5 +; tie +; frequency_offset 5 note D#, 3 - ;tie - ;musice4 10 +; tie +; frequency_offset 10 note D#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note D#, 3 - ;tie - ;musice4 255 +; tie +; frequency_offset -1 note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 note F#, 16 - ;tie +; tie note F#, 9 note E_, 13 - ;tie +; tie note E_, 12 note D_, 13 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 13 note G#, 3 note A_, 9 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 vibrato 25, 3, 3 note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 vibrato 0, 3, 3 dec_octave note B_, 13 - ;tie +; tie note B_, 12 inc_octave note E_, 13 - ;tie +; tie note E_, 12 note C#, 4 note D_, 9 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 13 dec_octave note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 vibrato 25, 3, 3 inc_octave note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 vibrato 0, 3, 3 dec_octave @@ -1424,201 +1449,204 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note A_, 13 note F#, 12 note D_, 13 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 13 note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 vibrato 25, 3, 3 - ;musicf2 +; musicf2 note D_, 13 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 13 note D_, 12 - ;musicf3 +; musicf3 vibrato 0, 3, 3 dec_octave dec_octave - ;musicef 3 +; musicef 3 note B_, 13 - ;tie +; tie note B_, 12 note A_, 13 - ;tie +; tie note A_, 12 - ;musicef 253 +; musicef -3 inc_octave note G_, 13 - ;tie +; tie note G_, 12 - ;tie +; tie note G_, 13 note A#, 3 note B_, 9 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 inc_octave note D_, 4 - ;tie - ;musice4 6 +; tie +; frequency_offset 6 note D_, 3 - ;tie - ;musice4 12 +; tie +; frequency_offset 12 note D_, 3 - ;tie - ;musice4 15 +; tie +; frequency_offset 15 note D_, 3 - ;tie - ;musice4 254 +; tie +; frequency_offset -2 note D#, 3 - ;tie - ;musice4 5 +; tie +; frequency_offset 5 note D#, 3 - ;tie - ;musice4 10 +; tie +; frequency_offset 10 note D#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note D#, 3 - ;tie - ;musice4 255 +; tie +; frequency_offset -1 note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 note F#, 16 - ;tie +; tie note F#, 9 note E_, 13 - ;tie +; tie note E_, 12 note D_, 13 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 13 note F_, 3 note F#, 9 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 dec_octave vibrato 25, 3, 3 - ;musicf2 +; musicf2 note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 note A_, 12 - ;musicf3 +; musicf3 vibrato 0, 3, 3 note A_, 13 - ;tie +; tie note A_, 12 note B_, 13 - ;tie +; tie note B_, 12 inc_octave note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 note F#, 3 note G_, 9 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 12 dec_octave vibrato 25, 3, 3 note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 12 note A_, 13 - ;tie +; tie note A_, 12 inc_octave note C_, 13 - ;tie +; tie note C_, 12 dec_octave note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 inc_octave note D_, 3 - ;tie - ;musice4 6 +; tie +; frequency_offset 6 note D_, 3 - ;tie - ;musice4 253 +; tie +; frequency_offset -3 note D#, 3 - ;tie - ;musice4 13 +; tie +; frequency_offset 13 note D#, 3 - ;tie - ;musice4 254 +; tie +; frequency_offset -2 note E_, 13 - ;tie +; tie note E_, 12 note C#, 13 - ;tie +; tie note C#, 12 - ;musicf2 +; musicf2 note D#, 13 - ;tie +; tie note D#, 12 - ;tie +; tie note D#, 13 - ;tie +; tie note D#, 12 - ;tie +; tie note D#, 13 - ;tie +; tie note D#, 12 note D#, 13 - ;tie +; tie note D#, 12 - ;musicf3 - ;musicf0 23 - ;musicf1 32 - ;musicf3 +; musicf3 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf3 octave 3 note E_, 7 rest 6 - ;musicf2 +; musicf2 note A_, 6 note E_, 6 inc_octave @@ -1718,10 +1746,10 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) note B_, 6 note F#, 6 octave 3 - ;musicf3 +; musicf3 note A_, 7 rest 6 - ;musicf2 +; musicf2 inc_octave note D_, 6 dec_octave @@ -1800,7 +1828,7 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) dec_octave note G_, 6 dec_octave - ;musicef 2 +; musicef 2 note G_, 7 inc_octave note G_, 6 @@ -1813,19 +1841,18 @@ Music_GRCastle_Ch1: ; 1f2525 (7c:6525) dec_octave note B_, 6 note F#, 6 - ;musicf3 +; musicf3 sound_loop 0, .MainLoop -Music_GRCastle_Ch3: ; 1f2903 (7c:6903) - channel_volume 1 +Music_GRCastle_Ch3: fade_wave 11 channel_volume 1 - ;musice9 96 - ;musicdc 255 +; echo 96 + stereo_panning TRUE, TRUE speed 1 rest 12 - ;vibrato_type 5 +; vibrato_type 5 vibrato 0, 3, 3 octave 2 note E_, 9 @@ -1857,7 +1884,7 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) rest 13 rest 12 note E_, 16 - ;tie +; tie note E_, 9 note D_, 13 note E_, 9 @@ -1894,13 +1921,13 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) note E_, 9 rest 3 rest 13 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f2b72 note D_, 13 note E_, 9 rest 3 rest 13 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f2b9e note B_, 9 rest 3 @@ -1967,13 +1994,13 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) note E_, 9 rest 3 rest 13 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f2b72 note D_, 13 note E_, 9 rest 3 rest 13 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f2b9e note B_, 9 rest 3 @@ -2019,342 +2046,342 @@ Music_GRCastle_Ch3: ; 1f2903 (7c:6903) note D_, 12 vibrato 0, 3, 3 note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 note G_, 12 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 12 vibrato 25, 3, 3 note B_, 7 - ;tie +; tie inc_octave note C_, 16 - ;tie +; tie note C_, 2 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 note D_, 16 - ;tie +; tie note D_, 9 note C_, 16 - ;tie +; tie note C_, 9 vibrato 0, 3, 3 dec_octave note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 vibrato 25, 3, 3 note A_, 3 - ;tie +; tie note A#, 3 - ;tie - ;musice4 22 +; tie +; frequency_offset 22 note A#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 3 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 note F#, 16 - ;tie +; tie note F#, 9 note B_, 16 - ;tie +; tie note B_, 9 note A_, 13 - ;tie +; tie note A_, 12 - ;tie +; tie note A_, 13 note E_, 12 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 12 note G_, 4 - ;tie +; tie note G#, 3 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 2 note A_, 13 note G_, 12 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 12 note F#, 16 - ;tie +; tie note F#, 9 note G_, 16 - ;tie +; tie note G_, 9 note E_, 13 - ;tie +; tie note E_, 12 - ;tie +; tie note E_, 13 note A_, 3 - ;tie +; tie note A#, 3 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 15 inc_octave note D_, 4 - ;tie +; tie note D#, 3 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 2 - ;tie +; tie note E_, 13 dec_octave note A#, 3 - ;tie +; tie note B_, 9 inc_octave note E_, 13 dec_octave note B_, 12 note E_, 16 - ;tie +; tie note E_, 9 note D_, 16 - ;tie +; tie note D_, 9 note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 note G_, 12 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 12 vibrato 25, 3, 3 note B_, 7 - ;tie +; tie inc_octave note C_, 16 - ;tie +; tie note C_, 2 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 note D_, 16 - ;tie +; tie note D_, 9 note C_, 16 - ;tie +; tie note C_, 9 vibrato 0, 3, 3 dec_octave note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 vibrato 25, 3, 3 note A_, 3 - ;tie +; tie note A#, 3 - ;tie - ;musice4 22 +; tie +; frequency_offset 22 note A#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 3 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 12 note F#, 16 - ;tie +; tie note F#, 9 note B_, 16 - ;tie +; tie note B_, 9 note F_, 13 - ;tie +; tie note F_, 12 - ;tie +; tie note F_, 13 inc_octave note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 note D#, 4 - ;tie - ;musice4 24 +; tie +; frequency_offset 24 note D#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note E_, 3 - ;tie - ;musice4 22 +; tie +; frequency_offset 22 note E_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 12 - ;tie +; tie note F_, 13 note C_, 12 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 12 dec_octave note F_, 16 - ;tie +; tie note F_, 9 inc_octave note C_, 16 - ;tie +; tie note C_, 9 dec_octave note B_, 13 - ;tie +; tie note B_, 12 - ;tie +; tie note B_, 13 inc_octave note F#, 12 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 12 vibrato 40, 3, 3 note A_, 4 - ;tie - ;musice4 17 +; tie +; frequency_offset 17 note A_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 3 - ;tie - ;musice4 16 +; tie +; frequency_offset 16 note A#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 12 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 16 - ;tie +; tie note B_, 2 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note B_, 3 - ;tie - ;musice4 244 +; tie +; frequency_offset -12 note B_, 2 - ;tie - ;musice4 238 +; tie +; frequency_offset -18 note B_, 2 - ;tie - ;musice4 232 +; tie +; frequency_offset -24 note B_, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 2 - ;tie - ;musice4 248 +; tie +; frequency_offset -8 note A#, 2 - ;tie - ;musice4 240 +; tie +; frequency_offset -16 note A#, 2 - ;tie - ;musice4 232 +; tie +; frequency_offset -24 note A#, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 1 vibrato 50, 3, 3 - ;musicec 244 +; pitch_offset 244 octave 2 speed 10 note E_, 10 - ;tie +; tie note E_, 10 - ;tie +; tie note E_, 10 - ;tie +; tie note E_, 10 - ;tie +; tie note E_, 10 - ;tie +; tie note E_, 10 - ;tie +; tie speed 5 channel_volume 3 note E_, 15 channel_volume 1 - ;musicec 0 +; pitch_offset 0 speed 1 note D_, 13 note E_, 12 rest 13 inc_octave note D_, 3 - ;tie +; tie note D#, 3 - ;tie +; tie note E_, 6 note D_, 13 dec_octave @@ -2376,12 +2403,12 @@ Branch_1f2b72: rest 3 vibrato 7, 3, 3 note B_, 13 - ;tie +; tie note B_, 12 vibrato 0, 3, 3 channel_volume 1 octave 2 - ;musicec 0 +; pitch_offset 0 sound_ret Branch_1f2b88: @@ -2395,23 +2422,23 @@ Branch_1f2b88: rest 3 vibrato 7, 3, 3 note F_, 13 - ;tie +; tie note F_, 12 vibrato 0, 3, 3 channel_volume 1 octave 2 - ;musicec 0 +; pitch_offset 0 sound_ret Branch_1f2b9e: channel_volume 2 octave 3 note D_, 12 - ;tie +; tie note D_, 13 channel_volume 1 octave 2 - ;musicec 0 +; pitch_offset 0 sound_ret Branch_1f2baa: @@ -2426,7 +2453,7 @@ Branch_1f2baa: rest 3 vibrato 7, 3, 3 note B_, 13 - ;tie +; tie note B_, 12 vibrato 0, 3, 3 channel_volume 1 @@ -2446,16 +2473,16 @@ Branch_1f2bbf: sound_ret -Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) +Music_GRCastle_Ch4: toggle_noise 6 drum_speed 1 octave 1 - ;musicdc 255 - ;musicef 251 + stereo_panning TRUE, TRUE +; musicef -5 drum_note 2, 4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 1, 16 rest 9 drum_note 4, 13 @@ -2472,10 +2499,10 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) rest 9 drum_note 1, 13 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 1, 13 drum_note 1, 12 drum_note 2, 13 @@ -2494,10 +2521,10 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) drum_note 2, 6 drum_note 2, 13 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 .MainLoop .Loop1 drum_note 1, 13 @@ -2516,10 +2543,10 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) rest 9 drum_note 1, 13 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 sound_loop 3, .Loop1 drum_note 1, 13 drum_note 1, 12 @@ -2537,10 +2564,10 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) drum_note 2, 12 drum_note 1, 13 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 .Loop2 drum_note 1, 13 drum_note 1, 12 @@ -2558,10 +2585,10 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) rest 9 drum_note 1, 13 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 sound_loop 3, .Loop2 drum_note 1, 13 drum_note 1, 12 @@ -2583,11 +2610,11 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) drum_note 2, 6 drum_note 2, 13 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 - ;musicef 0 +; musicef 0 sound_call Branch_1f2d0c sound_call Branch_1f2d18 sound_call Branch_1f2d0c @@ -2641,18 +2668,18 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) drum_note 2, 13 drum_note 1, 12 drum_note 5, 13 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 - ;musicef 1 +; musicef 1 drum_speed 6 drum_note 8, 16 drum_speed 1 rest 4 - ;musicef 0 +; musicef 0 rest 16 rest 16 rest 16 @@ -2673,11 +2700,11 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) rest 16 rest 16 rest 8 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 1, 16 rest 9 drum_note 4, 13 @@ -2694,10 +2721,10 @@ Music_GRCastle_Ch4: ; 1f2bcb (7c:6bcb) rest 9 drum_note 1, 13 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 1, 16 rest 9 drum_note 4, 13 @@ -2743,4 +2770,3 @@ Branch_1f2d18: drum_note 4, 4 drum_note 4, 4 sound_ret -; 0x1f2d24 diff --git a/crysaudio/music/TCG2/grchallengecup.asm b/crysaudio/music/TCG2/grchallengecup.asm index 596f2ba4..b16e10f4 100644 --- a/crysaudio/music/TCG2/grchallengecup.asm +++ b/crysaudio/music/TCG2/grchallengecup.asm @@ -5,24 +5,25 @@ Music_GRChallengeCup: channel 3, Music_GRChallengeCup_Ch3 channel 4, Music_GRChallengeCup_Ch4 -Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) -;.MainLoop - channel_volume 10 +Music_GRChallengeCup_Ch2: speed 1 - ;musicdc 17 - ;musicf0 0 + stereo_panning TRUE, TRUE +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 4 vibrato 24, 3, 3 - ;musicef 255 +; musicef -1 note C_, 4 note C#, 4 note D_, 4 note D#, 4 - ;musicf1 69 +; musicf1 69 note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 8 note E_, 7 note E_, 5 @@ -36,9 +37,9 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note D_, 15 note D_, 5 note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 8 note E_, 7 note E_, 5 @@ -54,7 +55,7 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note D_, 15 note D_, 5 note E_, 15 - ;tie +; tie note E_, 8 note E_, 7 note A_, 5 @@ -69,60 +70,66 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note G_, 5 note B_, 15 note B_, 5 - ;musicef 250 - channel_volume 2 - ;musicf3 +; musicef -6 + volume_envelope 1, -6 +; musicf3 speed 6 note A_, 10 - ;tie +; tie speed 1 note A_, 15 - ;tie +; tie note A_, 10 - channel_volume 10 - ;musicf1 54 + volume_envelope 10, 0 +; musicf1 54 note A_, 5 note A_, 15 - ;tie +; tie note A_, 15 - ;musicf0 8 - ;musicef 255 - ;musicf1 67 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -1 +; musicf1 67 .Loop1 octave 2 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note E_, 5 note E_, 10 note E_, 5 note E_, 3 note E_, 5 note E_, 2 - ;musicf3 +; musicf3 note E_, 15 - ;musicf2 +; musicf2 note E_, 5 note E_, 3 note E_, 5 note E_, 2 sound_loop 2, .Loop1 .MainLoop - ;musicf0 8 - ;musicef 255 - ;musicf1 67 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -1 +; musicf1 67 .Loop2 octave 2 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note F_, 5 note F_, 10 note F_, 5 note F_, 3 note F_, 5 note F_, 2 - ;musicf3 +; musicf3 note F_, 15 - ;musicf2 +; musicf2 note F_, 5 note F_, 3 note F_, 5 @@ -130,55 +137,58 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) sound_loop 2, .Loop2 .Loop3 octave 2 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note F#, 5 note F#, 10 note F#, 5 note F#, 3 note F#, 5 note F#, 2 - ;musicf3 +; musicf3 note F#, 15 - ;musicf2 +; musicf2 note F#, 5 note F#, 3 note F#, 5 note F#, 2 sound_loop 2, .Loop3 octave 2 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note F_, 5 note F_, 10 note F_, 5 note F_, 3 note F_, 5 note F_, 2 - ;musicf3 +; musicf3 note F_, 15 - ;musicf2 +; musicf2 note F_, 5 note F_, 3 note F_, 5 note F_, 2 octave 2 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note F_, 5 note F_, 10 note F_, 5 note F_, 3 note F_, 5 note F_, 2 - ;musicf3 - ;musicf0 0 - ;musicef 1 - ;vibrato_type 1 +; musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef 1 +; vibrato_type 1 vibrato 15, 3, 3 octave 3 - ;musice4 0 - ;musicf1 70 +; frequency_offset 0 +; musicf1 70 note E_, 15 note E_, 8 note E_, 5 @@ -186,50 +196,50 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) inc_octave vibrato 30, 3, 3 note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 8 note E_, 7 dec_octave - ;musicf3 +; musicf3 note A_, 15 note B_, 15 inc_octave note C_, 15 - ;musicf1 70 +; musicf1 70 vibrato 15, 3, 3 note D_, 15 - ;tie +; tie note D_, 15 note D_, 15 note C_, 8 note D_, 7 note C_, 15 - ;tie +; tie note C_, 15 note C_, 15 dec_octave - ;musicf3 +; musicf3 note A_, 8 note B_, 7 - ;musicf1 70 +; musicf1 70 inc_octave note C_, 15 - ;tie +; tie note C_, 15 note C_, 15 vibrato 0, 3, 3 note C_, 8 note C_, 7 dec_octave - ;musicf3 +; musicf3 note B_, 15 - ;musicf1 70 +; musicf1 70 note A_, 8 note B_, 7 note G_, 8 @@ -238,13 +248,13 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note G_, 7 vibrato 30, 3, 3 note A_, 15 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 15 note A_, 15 note E_, 15 @@ -253,46 +263,46 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note E_, 2 inc_octave note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 8 note E_, 7 - ;musicf3 +; musicf3 dec_octave note A_, 15 note B_, 15 inc_octave note C_, 15 - ;musicf1 70 +; musicf1 70 vibrato 15, 3, 3 note D_, 15 - ;tie +; tie note D_, 15 note D_, 15 note C_, 8 note D_, 7 note C_, 15 - ;tie +; tie note C_, 15 note C_, 15 dec_octave - ;musicf3 +; musicf3 note A_, 8 note B_, 7 - ;musicf1 70 +; musicf1 70 vibrato 0, 3, 3 inc_octave note C_, 15 - ;tie +; tie note C_, 8 note C_, 7 note E_, 15 - ;tie +; tie note E_, 8 note E_, 7 note D_, 15 @@ -302,32 +312,32 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note D_, 15 note D_, 5 vibrato 15, 3, 3 - ;musicf3 +; musicf3 note F_, 15 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 15 - ;musicf1 70 +; musicf1 70 note E_, 8 note F_, 7 note E_, 15 - ;tie +; tie note E_, 15 note E_, 15 - ;musicf3 +; musicf3 note F_, 8 note G_, 7 - ;musicf1 70 +; musicf1 70 note A_, 15 - ;tie +; tie note A_, 15 note A_, 15 note A_, 8 note A_, 7 - ;musicf3 +; musicf3 note A_, 15 - ;musicf1 70 +; musicf1 70 note G_, 8 note A_, 7 note F_, 8 @@ -340,27 +350,27 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note G_, 2 vibrato 0, 3, 3 note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 note C_, 15 - ;musicf3 +; musicf3 note D_, 8 note E_, 7 - ;musicf1 70 +; musicf1 70 vibrato 15, 3, 3 note F_, 15 - ;tie +; tie note F_, 15 note F_, 15 note F_, 8 note F_, 7 - ;musicf3 +; musicf3 note F_, 15 - ;musicf1 70 +; musicf1 70 note E_, 8 note F_, 7 note D_, 8 @@ -368,32 +378,32 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note F_, 8 note D_, 7 note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 note E_, 15 dec_octave - ;musicf3 +; musicf3 note A_, 8 note B_, 7 - ;musicf1 70 +; musicf1 70 inc_octave note C_, 15 - ;tie +; tie note C_, 15 note C_, 15 note C_, 8 note C_, 7 - ;musicf1 70 +; musicf1 70 note D_, 15 - ;musicf1 70 +; musicf1 70 note C_, 8 note D_, 7 dec_octave @@ -406,26 +416,26 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note G_, 15 note G_, 15 inc_octave - ;musicf3 +; musicf3 note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;musicf1 70 +; musicf1 70 note F_, 15 note F_, 8 note E_, 5 note F_, 2 note E_, 15 - ;tie +; tie note E_, 15 note E_, 8 - ;musicf3 +; musicf3 note F_, 7 - ;musicf1 70 +; musicf1 70 note E_, 5 note F_, 3 note C_, 5 @@ -438,11 +448,11 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) note D_, 5 note D_, 15 note D_, 5 - ;musicf3 +; musicf3 note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 dec_octave note B_, 4 @@ -451,42 +461,43 @@ Music_GRChallengeCup_Ch2: ; 1f2d24 (7c:6d24) dec_octave note B_, 4 note A_, 3 - ;musicf1 70 +; musicf1 70 note B_, 15 - ;tie +; tie note B_, 15 note B_, 15 inc_octave - ;musicf3 +; musicf3 note C_, 8 note D_, 7 vibrato 30, 3, 3 - ;musicef 255 +; musicef -1 note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 15 sound_loop 0, .MainLoop -Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) -;.MainLoop - channel_volume 10 +Music_GRChallengeCup_Ch1: speed 1 - ;musicdc 17 - ;musicf0 1 - ;musicef 255 + stereo_panning TRUE, TRUE +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -1 octave 3 vibrato 24, 3, 3 note G_, 4 @@ -494,11 +505,11 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note A_, 4 note A#, 4 inc_octave - ;musicf1 53 +; musicf1 53 note C#, 15 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 8 note C#, 7 note C#, 5 @@ -514,9 +525,9 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note A#, 5 inc_octave note C#, 15 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 8 note C#, 7 note C#, 5 @@ -532,7 +543,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note B_, 5 inc_octave note C_, 15 - ;tie +; tie note C_, 8 note C_, 7 note C_, 5 @@ -549,129 +560,135 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) inc_octave note D_, 15 note D_, 5 - ;musicef 250 - channel_volume 2 - ;musicf3 +; musicef -6 + volume_envelope 1, -6 +; musicf3 speed 6 note C#, 10 - ;tie +; tie speed 1 note C#, 15 - ;tie +; tie note C#, 10 - channel_volume 9 - ;musicf1 54 + volume_envelope 9, 0 +; musicf1 54 note C#, 5 note C#, 15 - ;tie +; tie note C#, 15 - ;musicf0 8 - ;musicf1 67 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 67 .Loop1 octave 1 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note A_, 5 note A_, 10 note A_, 5 note A_, 3 note A_, 5 note A_, 2 - ;musicf3 +; musicf3 inc_octave note B_, 15 dec_octave - ;musicf2 +; musicf2 note A_, 5 note A_, 3 note A_, 5 note A_, 2 sound_loop 2, .Loop1 .MainLoop - ;musicf1 67 +; musicf1 67 .Loop2 octave 1 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note A_, 5 note A_, 10 note A_, 5 note A_, 3 note A_, 5 note A_, 2 - ;musicf3 +; musicf3 inc_octave note B_, 15 dec_octave - ;musicf2 +; musicf2 note A_, 5 note A_, 3 note A_, 5 note A_, 2 sound_loop 5, .Loop2 octave 1 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note A_, 5 note A_, 10 note A_, 5 note A_, 3 note A_, 5 note A_, 2 - ;musicf3 +; musicf3 inc_octave note B_, 15 - ;tie +; tie note B_, 8 dec_octave - ;musicf0 21 - channel_volume 8 +; preset 21 + volume_envelope 8, 7 + duty_cycle 2 + vibrato 15, 3, 3 + volume_envelope 8, 0 octave 2 note A_, 5 rest 2 inc_octave note A_, 15 - ;tie +; tie note A_, 15 sound_call Branch_1f3140 rest 15 rest 15 note E_, 15 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f3140 note G_, 15 note F#, 15 - ;tie +; tie note F#, 15 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1f3140 note F#, 8 rest 7 note F#, 15 - ;tie +; tie note F#, 15 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1f3140 note F#, 5 rest 3 note F#, 5 rest 2 note F_, 15 - ;tie +; tie note F_, 15 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f3140 note F_, 8 rest 7 note D_, 15 note C_, 8 rest 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f3140 note D_, 8 rest 7 note E_, 15 - ;tie +; tie note E_, 15 sound_call Branch_1f3140 rest 15 @@ -684,66 +701,66 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note A_, 7 inc_octave note A_, 15 - ;tie +; tie note A_, 15 sound_call Branch_1f3140 rest 15 rest 15 note E_, 15 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f3140 note G_, 15 note F#, 15 - ;tie +; tie note F#, 15 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1f3140 note F#, 8 rest 7 note F#, 15 - ;tie +; tie note F#, 15 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1f3140 note F#, 5 rest 3 note F#, 5 rest 2 note F_, 15 - ;tie +; tie note F_, 8 rest 7 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f3140 rest 8 rest 7 note B_, 15 rest 5 note B_, 10 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f3140 rest 15 inc_octave note C_, 15 - ;tie +; tie note C_, 15 - ;musicec 8 +; pitch_offset 8 sound_call Branch_1f3140 octave 3 note G_, 8 note F_, 7 note G_, 15 - ;tie +; tie note G_, 15 - ;musicec 6 +; pitch_offset 6 sound_call Branch_1f3140 note A_, 8 note A#, 7 inc_octave note C_, 15 - ;tie +; tie note C_, 15 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f3140 octave 4 note C_, 8 @@ -752,7 +769,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note B_, 15 note B_, 8 rest 7 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f3140 octave 4 note D_, 8 @@ -763,22 +780,22 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note G_, 5 rest 2 note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 8 sound_call Branch_1f3150 rest 8 rest 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f3140 octave 3 note F_, 8 note G_, 7 note A_, 15 - ;tie +; tie note A_, 15 - ;musicec 5 +; pitch_offset 5 sound_call Branch_1f3140 note A_, 8 rest 7 @@ -786,93 +803,96 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) rest 2 note G#, 8 rest 7 - ;musicec 4 +; pitch_offset 4 sound_call Branch_1f3140 note G#, 8 rest 7 note A_, 15 - ;tie +; tie note A_, 15 sound_call Branch_1f3140 rest 15 rest 8 sound_call Branch_1f3150 rest 15 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f3140 note E_, 8 note G_, 7 note A_, 15 - ;tie +; tie note A_, 15 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f3140 note A_, 8 rest 7 note B_, 15 note A_, 5 rest 10 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f3140 note F_, 8 rest 7 note E_, 15 - ;tie +; tie note E_, 15 inc_octave - channel_volume 6 + volume_envelope 5, -7 note D_, 15 - ;tie +; tie note D_, 15 - channel_volume 6 + volume_envelope 6, 0 note C#, 15 - ;tie +; tie note C#, 15 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f3140 rest 8 dec_octave note G_, 5 rest 2 note A_, 15 - ;tie +; tie note A_, 15 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f3140 note A_, 8 note F_, 7 note D_, 15 rest 5 note F_, 10 - ;musicec 4 +; pitch_offset 4 sound_call Branch_1f3140 rest 15 note G_, 15 - ;tie +; tie note G_, 15 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1f3140 note G_, 4 note D_, 4 note C_, 4 note D_, 3 note D_, 15 - ;tie +; tie note D_, 15 rest 15 note G#, 8 note B_, 7 note A_, 15 - ;tie +; tie note A_, 15 - ;musicf0 8 - ;musicef 255 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -1 octave 2 - ;musicf1 67 - ;musicf3 +; musicf1 67 +; musicf3 note B_, 15 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note E_, 5 note E_, 3 note E_, 5 @@ -883,7 +903,7 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) note E_, 3 note E_, 5 note E_, 2 - ;musicf3 +; musicf3 note B_, 15 note E_, 5 note E_, 3 @@ -892,44 +912,55 @@ Music_GRChallengeCup_Ch1: ; 1f2f36 (7c:6f36) sound_loop 0, .MainLoop Branch_1f3140: - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - ;musicef 255 +; musicef -1 note E_, 15 - ;musicef 1 - ;musicf0 21 - ;musicf1 128 +; musicef 1 +; preset 21 + volume_envelope 8, 7 + duty_cycle 2 + vibrato 15, 3, 3 +; musicf1 128 octave 3 - ;musicec 0 +; pitch_offset 0 sound_ret Branch_1f3150: - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - ;musicf2 +; musicf2 note G_, 4 note G_, 3 - ;musicf0 21 - channel_volume 8 +; preset 21 + volume_envelope 8, 7 + duty_cycle 2 + vibrato 15, 3, 3 + volume_envelope 8, 0 octave 3 - ;musicf3 +; musicf3 sound_ret -Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) - channel_volume 1 +Music_GRChallengeCup_Ch3: speed 1 fade_wave 11 channel_volume 1 - ;musice9 96 - ;musicdc 17 +; echo 96 + stereo_panning TRUE, TRUE octave 5 rest 16 octave 2 note A_, 15 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 8 rest 7 note A_, 5 @@ -943,9 +974,9 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note A#, 15 rest 5 note A_, 15 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 8 rest 7 note A_, 5 @@ -959,9 +990,9 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note G_, 15 rest 5 note F_, 15 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 8 rest 7 note F_, 5 @@ -975,19 +1006,19 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note G_, 15 rest 5 note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 10 rest 16 rest 14 - ;musice8 4 +; cutoff 4 note A_, 15 note A_, 8 note A_, 7 @@ -1003,7 +1034,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note A_, 8 note A_, 7 .MainLoop - ;musice8 4 +; cutoff 4 octave 2 .Loop1 note A_, 15 @@ -1030,7 +1061,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note A_, 15 note A_, 8 note A_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note A_, 8 note A_, 7 @@ -1049,14 +1080,14 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note A_, 15 note A_, 8 note A_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note A_, 8 note A_, 7 note A_, 15 note A_, 8 note A_, 7 - ;musicec 5 +; pitch_offset 5 sound_call Branch_1f333b note A_, 8 note A_, 7 @@ -1068,16 +1099,16 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note A_, 7 note A_, 8 octave 4 - ;musice8 4 +; cutoff 4 note C_, 4 rest 3 - ;musice8 8 +; cutoff 8 octave 2 - ;musice8 8 +; cutoff 8 note F#, 15 note G_, 15 note G#, 15 - ;musice8 4 +; cutoff 4 note A_, 15 note A_, 8 note A_, 7 @@ -1087,7 +1118,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note A_, 15 note A_, 8 note A_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note A_, 8 note A_, 7 @@ -1106,14 +1137,14 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note A_, 15 note A_, 8 note A_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note A_, 8 note A_, 7 note B_, 15 note B_, 8 note B_, 7 - ;musicec 5 +; pitch_offset 5 sound_call Branch_1f333b note B_, 8 note B_, 7 @@ -1121,7 +1152,7 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note C_, 15 note C_, 8 note C_, 7 - ;musicec 8 +; pitch_offset 8 sound_call Branch_1f333b octave 3 note C_, 8 @@ -1130,22 +1161,22 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note C_, 8 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note E_, 4 rest 3 - ;musice8 4 +; cutoff 4 dec_octave dec_octave note C_, 8 note C_, 7 - ;musice8 8 +; cutoff 8 note D_, 15 note E_, 15 - ;musice8 4 +; cutoff 4 note F_, 15 note F_, 8 note F_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note F_, 8 note F_, 7 @@ -1158,35 +1189,35 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) note E_, 15 note E_, 8 note E_, 7 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1f333b note E_, 8 note E_, 7 note E_, 8 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note C_, 4 rest 3 dec_octave dec_octave note E_, 8 note E_, 7 - ;musicec 5 +; pitch_offset 5 sound_call Branch_1f333b note E_, 8 note E_, 7 note D_, 15 note D_, 8 note D_, 7 - ;musicec 5 +; pitch_offset 5 sound_call Branch_1f333b note D_, 8 note D_, 7 note E_, 15 note E_, 8 note E_, 7 - ;musicec 7 +; pitch_offset 7 sound_call Branch_1f333b note E_, 8 note E_, 7 @@ -1205,28 +1236,28 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) dec_octave note G_, 8 note G_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note G_, 8 note G_, 7 note F_, 15 note F_, 8 note F_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note F_, 8 note F_, 7 note F_, 15 note F_, 8 note F_, 7 - ;musicec 5 +; pitch_offset 5 sound_call Branch_1f333b note F_, 8 note F_, 7 note E_, 15 note E_, 8 note E_, 7 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1f333b note E_, 8 note E_, 7 @@ -1239,40 +1270,40 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) dec_octave note D#, 8 note D#, 7 - ;musicec 4 +; pitch_offset 4 sound_call Branch_1f333b note D#, 8 note D#, 7 note D_, 15 note D_, 8 note D_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note D_, 8 note D_, 7 note D_, 15 note D_, 8 note D_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b note D_, 8 note D_, 7 note G_, 15 note G_, 8 note G_, 7 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1f333b inc_octave note D_, 8 note D_, 7 - ;musice8 8 +; cutoff 8 note G_, 15 dec_octave note G_, 15 note G#, 15 inc_octave note G#, 15 - ;musice8 4 +; cutoff 4 dec_octave note A_, 15 note A_, 8 @@ -1291,16 +1322,16 @@ Music_GRChallengeCup_Ch3: ; 1f315d (7c:715d) Branch_1f333b: octave 3 channel_volume 2 - ;musice8 8 +; cutoff 8 note A_, 15 channel_volume 1 - ;musice8 4 - ;musicec 0 +; cutoff 4 +; pitch_offset 0 octave 2 sound_ret -Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349) +Music_GRChallengeCup_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -1310,10 +1341,10 @@ Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349) rest 16 rest 13 drum_note 2, 5 - ;musicef 254 +; musicef -2 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 16 rest 4 drum_note 2, 16 @@ -1339,17 +1370,17 @@ Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349) drum_note 2, 8 drum_note 4, 7 drum_note 4, 8 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 drum_note 4, 8 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 drum_note 2, 8 @@ -1387,10 +1418,10 @@ Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349) drum_note 1, 8 drum_note 2, 7 drum_note 4, 8 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 drum_note 2, 8 @@ -1407,10 +1438,10 @@ Music_GRChallengeCup_Ch4: ; 1f3349 (7c:7349) drum_note 2, 8 drum_note 4, 7 drum_note 4, 8 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 7 drum_note 2, 8 @@ -1463,4 +1494,3 @@ Branch_1f33fd: drum_note 5, 8 drum_note 2, 7 sound_ret -; 0x1f3411 diff --git a/crysaudio/music/TCG2/grdueltheme1.asm b/crysaudio/music/TCG2/grdueltheme1.asm index 80bb6553..45d906c1 100644 --- a/crysaudio/music/TCG2/grdueltheme1.asm +++ b/crysaudio/music/TCG2/grdueltheme1.asm @@ -5,26 +5,28 @@ Music_GRDuelTheme1: channel 3, Music_GRDuelTheme1_Ch3 channel 4, Music_GRDuelTheme1_Ch4 -Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) - channel_volume 10 - ;musicdc 255 +Music_GRDuelTheme1_Ch2: + stereo_panning TRUE, TRUE speed 1 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf1 54 +; musicf1 54 rest 15 octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -33,15 +35,15 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note G_, 7 note G_, 7 - ;tie +; tie note G_, 8 note G_, 7 note G_, 7 - ;tie +; tie note G_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -52,15 +54,15 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -69,15 +71,15 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note G_, 7 note G_, 7 - ;tie +; tie note G_, 8 note G_, 7 note G_, 7 - ;tie +; tie note G_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -87,15 +89,15 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -104,34 +106,37 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note G_, 7 note G_, 7 - ;tie +; tie note G_, 8 note G_, 7 note G_, 7 - ;tie +; tie note G_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 rest 7 sound_call Branch_1f5ae8 - ;musicf0 16 - ;musicf1 54 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicf1 54 octave 3 note G_, 7 note G_, 7 - ;tie +; tie note G_, 8 note G_, 7 note G_, 7 - ;tie +; tie note G_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -140,15 +145,15 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -157,34 +162,37 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note G_, 7 note G_, 7 - ;tie +; tie note G_, 8 note G_, 7 note G_, 7 - ;tie +; tie note G_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 rest 7 sound_call Branch_1f5ae8 - ;musicf0 16 - ;musicf1 54 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicf1 54 octave 3 note G_, 7 note G_, 7 - ;tie +; tie note G_, 8 note G_, 7 note G_, 7 - ;tie +; tie note G_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -193,15 +201,15 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -210,15 +218,18 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) octave 3 note G_, 7 note G_, 7 - ;tie +; tie note G_, 8 note G_, 7 note G_, 7 - ;tie +; tie note G_, 7 note F_, 8 - ;musicf0 4 - ;musicf3 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 octave 2 note A_, 7 note A#, 7 @@ -230,7 +241,7 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note A_, 7 note A#, 3 rest 4 - ;musicf1 71 +; musicf1 71 inc_octave note C_, 15 note C_, 7 @@ -241,41 +252,41 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note A_, 9 note F_, 4 note F_, 3 - ;musicf3 +; musicf3 note C#, 15 - ;tie +; tie note C#, 14 note G_, 15 - ;tie +; tie note G_, 7 note F#, 4 note F_, 3 note E_, 9 - ;musicf1 71 +; musicf1 71 note F_, 5 note F_, 5 note G_, 5 note G_, 5 - ;musicf3 +; musicf3 note E_, 9 - ;musicf1 71 +; musicf1 71 note C_, 5 note C_, 5 dec_octave note G_, 5 note G_, 5 - ;musicf3 +; musicf3 note A_, 15 - ;tie +; tie note A_, 14 inc_octave - ;musicf1 71 +; musicf1 71 note D_, 15 - ;tie +; tie note D_, 7 note D_, 7 note G_, 3 - ;musicf1 71 +; musicf1 71 note A_, 12 note A_, 7 note G_, 7 @@ -283,36 +294,36 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note D_, 7 note D_, 7 dec_octave - ;musicf3 +; musicf3 note A#, 7 inc_octave - ;musicf3 +; musicf3 note F_, 15 - ;tie +; tie note F_, 14 note G_, 15 - ;tie +; tie note G_, 7 note F#, 4 note F_, 3 - ;musicf1 71 +; musicf1 71 note E_, 15 - ;tie +; tie note E_, 14 note E_, 8 - ;musicf3 +; musicf3 note F_, 7 - ;musicf1 71 +; musicf1 71 note E_, 7 note E_, 7 note D_, 15 - ;tie +; tie note D_, 7 note D_, 7 - ;musicf3 +; musicf3 note C#, 3 note D_, 12 - ;musicf1 71 +; musicf1 71 note F_, 7 note F_, 7 inc_octave @@ -325,75 +336,78 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note A_, 9 note F_, 3 note F_, 4 - ;musicf3 +; musicf3 note C#, 15 - ;tie +; tie note C#, 14 note G_, 15 - ;tie +; tie note G_, 8 note F#, 3 note F_, 3 note E_, 9 - ;musicf1 71 +; musicf1 71 note F_, 5 note F_, 5 note G_, 5 note G_, 5 - ;musicf3 +; musicf3 note E_, 9 - ;musicf1 71 +; musicf1 71 note C_, 5 note C_, 5 dec_octave note G_, 5 note G_, 5 - ;musicf3 +; musicf3 note A_, 15 - ;tie +; tie note A_, 14 inc_octave - ;musicf1 71 +; musicf1 71 note D_, 15 - ;tie +; tie note D_, 7 note D_, 7 note A_, 15 - ;tie +; tie note A_, 14 note A_, 8 note G_, 7 note G_, 14 - ;musicf3 +; musicf3 note B_, 3 inc_octave - ;musicf1 71 +; musicf1 71 note C_, 12 note C_, 7 dec_octave - ;musicf3 +; musicf3 note A_, 15 note A#, 7 - ;musicf1 71 +; musicf1 71 note A_, 3 note A_, 4 note G_, 3 note G_, 4 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 7 note A_, 7 .Loop2 - ;musicf0 0 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 2 note A_, 5 note A#, 5 @@ -404,7 +418,7 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note G_, 4 inc_octave note D#, 3 - ;musicf1 70 +; musicf1 70 note E_, 12 note E_, 7 note C_, 7 @@ -415,43 +429,43 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note F_, 4 note F_, 3 note G_, 15 - ;tie +; tie note G_, 4 note G_, 7 note B_, 3 - ;musicf3 +; musicf3 inc_octave note C_, 15 dec_octave - ;musicf1 70 +; musicf1 70 note A#, 7 note A#, 7 - ;musicf1 70 +; musicf1 70 note A_, 15 note A_, 7 - ;musicf3 +; musicf3 note F_, 7 - ;tie +; tie note F_, 15 - ;musicf1 70 +; musicf1 70 note G_, 7 note G_, 7 - ;musicf3 +; musicf3 note G#, 3 note A_, 12 - ;tie +; tie note A_, 7 - ;musicf1 70 +; musicf1 70 note G_, 7 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 7 note G_, 7 inc_octave - ;musicf3 +; musicf3 note D#, 3 - ;musicf1 70 +; musicf1 70 note E_, 12 note E_, 7 note C_, 7 @@ -462,30 +476,30 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note F_, 4 note F_, 3 note G_, 15 - ;tie +; tie note G_, 4 note G_, 7 - ;musicf3 +; musicf3 note B_, 3 inc_octave note C_, 15 dec_octave - ;musicf1 70 +; musicf1 70 note A#, 7 note A#, 7 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 sound_loop 2, .Loop2 - ;musicf3 +; musicf3 octave 2 note A_, 5 note A#, 5 @@ -494,47 +508,53 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note E_, 5 note F_, 5 note G_, 4 - ;musicf0 4 - ;musicf3 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 note G#, 3 note A_, 12 - ;tie +; tie note A_, 7 note G_, 15 - ;tie +; tie note G_, 7 - ;musicf1 70 +; musicf1 70 note D_, 5 note D_, 9 - ;musicf3 +; musicf3 note C#, 15 - ;tie +; tie note C#, 14 note G_, 15 - ;tie +; tie note G_, 8 note F#, 3 note F_, 3 note E_, 9 - ;musicf1 71 +; musicf1 71 note F_, 5 note F_, 5 note G_, 5 note G_, 5 - ;musicf3 +; musicf3 note E_, 9 - ;musicf1 71 +; musicf1 71 note C_, 5 note C_, 5 dec_octave note G_, 5 note G_, 5 - ;musicf3 +; musicf3 note A_, 15 - ;tie +; tie note A_, 14 - ;musicf0 0 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 2 note G_, 5 note A_, 5 @@ -544,61 +564,64 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) note D_, 5 note E_, 4 note A_, 15 - ;tie +; tie note A_, 7 - ;musicf1 70 +; musicf1 70 note G_, 7 note G_, 8 note D_, 5 note D_, 9 dec_octave - ;musicf3 +; musicf3 note A#, 7 inc_octave note E_, 3 - ;musicf1 70 +; musicf1 70 note F_, 12 - ;tie +; tie note F_, 7 note F_, 7 - ;musicf3 +; musicf3 note G_, 15 - ;tie +; tie note G_, 8 note F#, 3 note F_, 3 - ;musicf1 87 +; musicf1 87 note E_, 15 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 14 note E_, 15 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf1 54 +; musicf1 54 octave 3 note G_, 7 note G_, 7 - ;tie +; tie note G_, 8 note G_, 7 note G_, 7 - ;tie +; tie note G_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 @@ -606,180 +629,189 @@ Music_GRDuelTheme1_Ch2: ; 1f5865 (7d:5865) sound_loop 0, .MainLoop Branch_1f5ae8: - ;musicf3 - ;musicf0 0 - ;musicef 1 +; musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef 1 octave 2 note A#, 3 note B_, 4 vibrato 19, 3, 3 - ;musicf1 55 +; musicf1 55 inc_octave note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 note C_, 8 - ;musicf3 +; musicf3 note E_, 7 - ;musicf2 +; musicf2 note G_, 7 note G_, 7 - ;musicf3 +; musicf3 note A#, 3 note B_, 12 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;musicf2 +; musicf2 note A_, 7 note A_, 7 - ;musicf3 +; musicf3 inc_octave note D_, 15 note C_, 14 dec_octave - ;musicf2 +; musicf2 note B_, 5 note B_, 5 - ;musicf3 +; musicf3 note G_, 9 note A_, 10 - ;musicf2 +; musicf2 note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 note A#, 8 - ;musicf3 +; musicf3 note B_, 3 inc_octave note C_, 4 - ;tie +; tie note C_, 14 dec_octave - ;musicf2 +; musicf2 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 note A_, 8 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicef 1 - ;musicf1 54 +; musicef 1 +; musicf1 54 note F_, 7 note F_, 14 - ;musicf0 0 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - ;musicef 1 - ;musicf1 55 +; musicef 1 +; musicf1 55 note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 14 note C_, 8 note E_, 7 - ;musicf2 +; musicf2 note G_, 7 note G_, 7 - ;musicf3 +; musicf3 note A#, 3 note B_, 12 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;musicf2 +; musicf2 note A_, 7 note A_, 7 - ;musicf3 +; musicf3 inc_octave note D_, 15 note C_, 14 dec_octave - ;musicf2 +; musicf2 note B_, 5 note B_, 5 - ;musicf3 +; musicf3 note G_, 9 note A_, 10 - ;musicf2 +; musicf2 note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 - ;tie +; tie note A#, 14 note A#, 8 - ;musicf3 +; musicf3 inc_octave note C_, 14 - ;tie +; tie note C_, 7 note C#, 3 note D_, 12 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 note C_, 7 dec_octave note A#, 7 - ;musicf2 +; musicf2 note A_, 15 note A_, 7 - ;musicf3 +; musicf3 note B_, 4 inc_octave note C_, 15 - ;tie +; tie note C_, 3 dec_octave - ;musicf2 +; musicf2 note A#, 7 note A#, 7 - ;musicf2 +; musicf2 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;musicf2 +; musicf2 note A#, 7 note A#, 7 note A_, 15 @@ -788,63 +820,63 @@ Branch_1f5ae8: note F_, 7 note G_, 7 note G_, 7 - ;musicf3 +; musicf3 note G#, 3 - ;musicf2 +; musicf2 note A_, 12 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 7 note A_, 7 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 note G_, 14 - ;musicf3 +; musicf3 note G_, 15 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;musicf2 +; musicf2 note F_, 7 note F_, 7 - ;musicf3 +; musicf3 note B_, 2 inc_octave note C_, 13 dec_octave - ;musicf2 +; musicf2 note G_, 14 note G_, 8 note F_, 7 note F_, 7 note C_, 4 note C_, 3 - ;musicf3 +; musicf3 note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 note F_, 15 - ;tie +; tie note F_, 8 note E_, 3 note D#, 3 note D_, 15 - ;musicf2 +; musicf2 note D#, 7 note D#, 7 note G_, 8 @@ -852,80 +884,82 @@ Branch_1f5ae8: note A#, 5 note A#, 9 inc_octave - ;musicf3 +; musicf3 note D_, 15 - ;tie +; tie note D_, 7 - ;musicf2 +; musicf2 note C_, 7 note C_, 15 - ;musicf3 +; musicf3 note E_, 3 - ;musicf2 +; musicf2 note F_, 7 note F_, 4 - ;musicf3 +; musicf3 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;musicf2 +; musicf2 note D#, 7 note D#, 7 - ;musicf3 +; musicf3 note D_, 15 - ;musicf2 +; musicf2 note C_, 7 note C_, 7 - ;musicf3 +; musicf3 dec_octave note F#, 15 inc_octave - ;musicf2 +; musicf2 note C_, 7 note C_, 7 dec_octave note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 note A_, 15 sound_ret -Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) - channel_volume 10 - ;musicdc 255 +Music_GRDuelTheme1_Ch1: + stereo_panning TRUE, TRUE speed 1 - ;musicf0 16 - ;musicef 255 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicef -1 octave 3 - ;musicf1 54 +; musicf1 54 rest 15 octave 3 note C_, 7 note C_, 7 - ;tie +; tie note C_, 8 note C_, 7 note C_, 7 - ;tie +; tie note C_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 @@ -934,15 +968,15 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 @@ -953,15 +987,15 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note C_, 7 note C_, 7 - ;tie +; tie note C_, 8 note C_, 7 note C_, 7 - ;tie +; tie note C_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 @@ -970,22 +1004,22 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 rest 14 sound_loop 3, .Loop1 octave 3 - ;musicef 1 +; musicef 1 .Loop2 rest 15 note E_, 7 @@ -1118,33 +1152,33 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note F_, 8 note F_, 7 - ;tie +; tie note F_, 7 note F_, 7 note F_, 15 rest 14 - ;musicef 255 +; musicef -1 rest 15 octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 @@ -1153,15 +1187,15 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note C_, 7 note C_, 7 - ;tie +; tie note C_, 8 note C_, 7 note C_, 7 - ;tie +; tie note C_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 @@ -1170,185 +1204,194 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 rest 7 - ;musicf0 1 - ;musicef 255 - ;musicf1 55 - ;musicf3 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -1 +; musicf1 55 +; musicf3 octave 2 note G_, 3 note G#, 4 vibrato 19, 3, 3 - ;musicf2 +; musicf2 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 note A_, 8 - ;musicf3 +; musicf3 inc_octave note C_, 7 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 - ;musicf3 +; musicf3 note F#, 3 note G_, 12 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 - ;musicf3 +; musicf3 note B_, 15 note A_, 14 - ;musicf3 +; musicf3 note G_, 10 - ;musicf2 +; musicf2 note E_, 5 note E_, 5 note C_, 5 note C_, 4 - ;musicf3 - ;musicf2 +; musicf3 +; musicf2 note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 7 note F_, 15 - ;musicf3 +; musicf3 note G_, 7 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 14 note F_, 8 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf1 54 +; musicf1 54 note C#, 7 note C#, 14 - ;musicf0 1 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - ;musicef 255 - ;musicf1 55 +; musicef -1 +; musicf1 55 note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 14 note A_, 8 inc_octave - ;musicf3 +; musicf3 note C_, 7 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 - ;musicf3 +; musicf3 note F#, 3 note G_, 12 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 15 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 - ;musicf3 +; musicf3 note B_, 15 note A_, 14 - ;musicf3 +; musicf3 note G_, 10 - ;musicf2 +; musicf2 note E_, 5 note E_, 5 note C_, 5 note C_, 4 - ;musicf2 +; musicf2 note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 14 note D#, 8 - ;musicf3 +; musicf3 note G_, 14 - ;tie +; tie note G_, 7 note A#, 15 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 15 note A_, 7 note G_, 7 - ;musicf2 +; musicf2 note F_, 15 note F_, 7 - ;musicf3 +; musicf3 note A_, 15 - ;tie +; tie note A_, 7 - ;musicf2 +; musicf2 note G_, 7 note G_, 7 - ;musicf2 +; musicf2 note F_, 15 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 15 - ;musicf2 +; musicf2 note F_, 7 note F_, 7 note F_, 15 @@ -1357,35 +1400,35 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) note D_, 7 note D_, 7 note D_, 7 - ;musicf1 38 +; musicf1 38 note C#, 15 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 7 note C#, 7 - ;musicf3 +; musicf3 note C_, 15 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 15 - ;musicf2 +; musicf2 note C_, 7 note C_, 7 - ;musicf3 +; musicf3 note A_, 15 - ;musicf2 +; musicf2 note D_, 14 note D_, 8 note C_, 7 @@ -1393,25 +1436,25 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) dec_octave note G_, 4 note G_, 3 - ;musicf2 +; musicf2 note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 7 note B_, 7 - ;musicf3 +; musicf3 note B_, 15 - ;tie +; tie note B_, 14 note A#, 15 - ;musicf2 +; musicf2 note A#, 7 note A#, 7 inc_octave @@ -1419,43 +1462,46 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) note D#, 7 note G_, 5 note G_, 9 - ;musicf3 +; musicf3 note A#, 15 - ;tie +; tie note A#, 7 - ;musicf2 +; musicf2 note A_, 7 note A_, 15 - ;musicf3 - ;musicf2 +; musicf3 +; musicf2 inc_octave note D_, 10 note D_, 4 dec_octave - ;musicf3 +; musicf3 note F#, 15 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 15 - ;musicf2 +; musicf2 note F#, 7 note F#, 7 - ;musicf3 +; musicf3 note F#, 15 - ;musicf2 +; musicf2 note F#, 7 note F#, 7 - ;musicf3 +; musicf3 note C_, 15 - ;musicf2 +; musicf2 note F#, 7 note F#, 7 note E_, 15 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicef 255 - ;musicf1 54 +; musicef -1 +; musicf1 54 octave 3 note E_, 7 note E_, 15 @@ -1470,15 +1516,15 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 @@ -1487,15 +1533,15 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note C_, 7 note C_, 7 - ;tie +; tie note C_, 8 note C_, 7 note C_, 7 - ;tie +; tie note C_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 @@ -1504,18 +1550,21 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note C#, 8 - ;musicf0 4 - ;musicef 251 - ;musice4 254 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicef -5 +; frequency_offset -2 rest 7 - ;musicf3 +; musicf3 octave 2 note A_, 7 note A#, 7 @@ -1527,147 +1576,153 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) note A_, 7 note A#, 4 rest 4 - ;musicf0 16 - ;musicef 1 - ;musice4 0 - ;musicf1 70 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicef 1 +; frequency_offset 0 +; musicf1 70 rest 7 note D_, 7 note D_, 7 - ;tie +; tie note D_, 8 note D_, 7 note D_, 7 - ;tie +; tie note D_, 7 rest 15 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 rest 15 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 rest 15 note C_, 7 note C_, 7 - ;tie +; tie note C_, 8 note C_, 7 note C_, 7 - ;tie +; tie note C_, 7 dec_octave rest 15 note A_, 7 note A_, 7 - ;tie +; tie note A_, 8 note A_, 7 note A_, 7 - ;tie +; tie note A_, 7 rest 15 note A#, 7 note A#, 7 - ;tie +; tie note A#, 8 note A#, 7 note A#, 7 - ;tie +; tie note A#, 7 inc_octave rest 15 note C_, 7 note C_, 7 - ;tie +; tie note C_, 8 note C_, 7 note C_, 7 - ;tie +; tie note C_, 7 rest 15 dec_octave note A#, 7 note A#, 7 - ;tie +; tie note A#, 8 note A#, 7 note A#, 7 - ;tie +; tie note A#, 7 inc_octave rest 15 note D_, 7 note D_, 7 - ;tie +; tie note D_, 8 note D_, 7 note D_, 7 - ;tie +; tie note D_, 7 rest 15 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 rest 15 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 rest 15 note C_, 7 note C_, 7 - ;tie +; tie note C_, 8 note C_, 7 note C_, 7 - ;tie +; tie note C_, 7 .Loop5 rest 15 note C#, 7 note C#, 7 - ;tie +; tie note C#, 8 note C#, 7 note C#, 7 - ;tie +; tie note C#, 7 sound_loop 2, .Loop5 rest 15 note D_, 7 note D_, 7 - ;tie +; tie note D_, 8 note D_, 7 note D_, 7 - ;tie +; tie note D_, 7 rest 15 note C#, 7 note C#, 7 - ;musicf0 1 - ;musicf3 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 2 note F_, 5 note G_, 5 @@ -1677,7 +1732,7 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) note C#, 5 note E_, 4 inc_octave - ;musicf1 70 +; musicf1 70 note C_, 15 note C_, 7 dec_octave @@ -1691,31 +1746,31 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) note C#, 7 note G_, 15 note G_, 7 - ;musicf1 70 +; musicf1 70 note G_, 7 note G_, 7 note E_, 15 note E_, 7 - ;musicf3 +; musicf3 note C_, 15 - ;tie +; tie note C_, 7 - ;musicf1 70 +; musicf1 70 note C_, 7 note C_, 7 - ;musicf3 +; musicf3 note C#, 15 - ;tie +; tie note C#, 7 - ;musicf2 +; musicf2 note C#, 7 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 7 note C#, 7 inc_octave - ;musicf1 70 +; musicf1 70 note C_, 15 note C_, 7 dec_octave @@ -1731,25 +1786,25 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) inc_octave note G_, 15 note G_, 7 - ;musicf1 70 +; musicf1 70 note G_, 7 note G_, 7 note E_, 15 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 15 - ;tie +; tie note E_, 7 note E_, 7 note F_, 15 - ;tie +; tie note F_, 14 note A_, 15 - ;tie +; tie note A_, 14 inc_octave - ;musicf1 70 +; musicf1 70 note C_, 15 note C_, 7 dec_octave @@ -1763,31 +1818,31 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) note C#, 7 note G_, 15 note G_, 7 - ;musicf1 70 +; musicf1 70 note G_, 7 note G_, 7 note E_, 15 note E_, 7 - ;musicf3 +; musicf3 note C_, 15 - ;tie +; tie note C_, 7 - ;musicf1 70 +; musicf1 70 note C_, 7 note C_, 7 - ;musicf3 +; musicf3 note C#, 15 - ;tie +; tie note C#, 7 - ;musicf2 +; musicf2 note C#, 7 - ;tie +; tie note C#, 15 - ;tie +; tie note C#, 7 note C#, 7 inc_octave - ;musicf1 70 +; musicf1 70 note C_, 15 note C_, 7 dec_octave @@ -1803,20 +1858,20 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) inc_octave note G_, 15 note G_, 7 - ;musicf1 70 +; musicf1 70 note G_, 7 note G_, 7 note D_, 15 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 15 - ;tie +; tie note D_, 7 note D_, 7 - ;musicf3 +; musicf3 note C#, 15 - ;tie +; tie note C#, 14 octave 2 note F_, 5 @@ -1826,9 +1881,12 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) inc_octave note C#, 5 note E_, 4 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf1 54 +; musicf1 54 rest 15 note F_, 7 note F_, 15 @@ -1848,40 +1906,49 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) note F_, 8 note F_, 14 note F_, 7 - ;musicf0 4 - ;musicf3 - ;musicef 254 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 +; musicef -2 octave 3 - ;musicf1 71 +; musicf1 71 note D_, 15 - ;tie +; tie note D_, 7 note D_, 7 note F_, 15 - ;tie +; tie note F_, 7 - ;musicf1 70 +; musicf1 70 note E_, 7 note E_, 8 dec_octave note A#, 5 note A#, 9 - ;musicf3 +; musicf3 note G_, 7 - ;musicf0 16 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 octave 3 - ;musicf1 53 - channel_volume 7 +; musicf1 53 + volume_envelope 7, 0 .Loop6 note C#, 15 - ;tie +; tie note C#, 7 note C#, 7 sound_loop 2, .Loop6 - ;musicf0 16 - ;musicef 255 +; preset 16 + volume_envelope 8, 7 + duty_cycle 1 + vibrato 28, 3, 3 +; musicef -1 octave 3 - ;musicf1 54 +; musicf1 54 rest 15 octave 3 note E_, 7 @@ -1897,15 +1964,15 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) octave 3 note E_, 7 note E_, 7 - ;tie +; tie note E_, 8 note E_, 7 note E_, 7 - ;tie +; tie note E_, 7 note C#, 8 note C#, 7 - ;tie +; tie note C#, 7 note C#, 7 note C#, 15 @@ -1913,16 +1980,15 @@ Music_GRDuelTheme1_Ch1: ; 1f5c1b (7d:5c1b) sound_loop 0, .MainLoop -Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) - channel_volume 1 +Music_GRDuelTheme1_Ch3: speed 1 fade_wave 11 channel_volume 1 - ;musice9 64 - ;musicdc 17 +; echo 64 + stereo_panning TRUE, TRUE octave 3 - ;musice8 7 - ;musicec 244 +; cutoff 7 +; pitch_offset 244 .Loop1 sound_call Branch_1f6313 sound_loop 2, .Loop1 @@ -2308,7 +2374,7 @@ Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) speed 1 note D_, 14 note D#, 16 - ;tie +; tie note D#, 13 rest 16 rest 13 @@ -2448,23 +2514,23 @@ Music_GRDuelTheme1_Ch3: ; 1f603f (7d:603f) note D_, 2 speed 1 note G_, 14 - ;musice8 7 +; cutoff 7 speed 1 note D#, 16 - ;tie +; tie note D#, 13 note D#, 16 - ;tie +; tie note D#, 13 - ;musice8 7 +; cutoff 7 sound_call Branch_1f6313 sound_call Branch_1f6313 sound_loop 0, .MainLoop Branch_1f6313: octave 3 - ;musicec 244 - ;musice8 7 +; pitch_offset 244 +; cutoff 7 speed 11 note D_, 2 note A_, 2 @@ -2478,7 +2544,7 @@ Branch_1f6313: sound_ret -Music_GRDuelTheme1_Ch4: ; 1f6327 (7d:6327) +Music_GRDuelTheme1_Ch4: toggle_noise 6 drum_speed 1 octave 1 @@ -2824,13 +2890,13 @@ Music_GRDuelTheme1_Ch4: ; 1f6327 (7d:6327) drum_note 4, 7 drum_note 7, 7 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 5 - ;musicef 253 +; musicef -3 drum_note 2, 5 - ;musicef 254 +; musicef -2 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 5 drum_note 2, 5 .Loop3 @@ -2885,13 +2951,13 @@ Music_GRDuelTheme1_Ch4: ; 1f6327 (7d:6327) drum_note 2, 7 drum_note 4, 8 drum_note 2, 7 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 5 - ;musicef 255 +; musicef -1 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 1, 15 drum_note 2, 14 drum_note 4, 8 @@ -2953,4 +3019,3 @@ Branch_1f6503: drum_note 5, 7 drum_note 4, 7 sound_ret -; 0x1f6517 diff --git a/crysaudio/music/TCG2/grdueltheme2.asm b/crysaudio/music/TCG2/grdueltheme2.asm index 8acb5ce1..abf3fb76 100644 --- a/crysaudio/music/TCG2/grdueltheme2.asm +++ b/crysaudio/music/TCG2/grdueltheme2.asm @@ -5,16 +5,18 @@ Music_GRDuelTheme2: channel 3, Music_GRDuelTheme2_Ch3 channel 4, Music_GRDuelTheme2_Ch4 -Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) - channel_volume 10 - ;musicf0 0 +Music_GRDuelTheme2_Ch2: +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 speed 1 - ;musicdc 255 - ;musicf1 71 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf1 71 +; musicf3 note G#, 3 - ;musicf2 +; musicf2 note A_, 11 note A_, 7 note G_, 13 @@ -23,52 +25,64 @@ Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) note E_, 7 note D_, 4 note E_, 3 - ;musicf3 +; musicf3 note D#, 7 note E_, 6 note C_, 7 dec_octave note A_, 7 - ;musicf2 +; musicf2 note G_, 4 note A_, 3 note G#, 3 note G_, 3 note A_, 7 note A_, 7 - ;musicf3 - ;musicf0 1 - ;vibrato_type 5 +; musicf3 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; vibrato_type 5 vibrato 27, 3, 3 octave 3 note C_, 7 note G_, 6 - ;musicf0 0 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 4 note D#, 4 - ;musicf2 +; musicf2 note E_, 3 - ;tie +; tie note E_, 7 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 note E_, 13 .MainLoop - ;musicf0 0 - ;musicf1 71 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 octave 3 note A_, 7 note A_, 7 sound_call Branch_1ef490 - ;musicf0 0 - ;musicf1 71 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note C_, 5 note D_, 5 @@ -77,210 +91,95 @@ Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) note G_, 4 note G#, 4 octave 3 - ;musicf2 +; musicf2 note A_, 7 note A_, 7 sound_call Branch_1ef490 - ; - ;sound_call Branch_1ef4d1 - ;musicf0 34 - ;musicf1 71 - ;musicf3 - octave 2 - note G_, 5 - note G#, 5 - note A_, 5 - inc_octave - note C_, 4 - note D_, 4 - note D#, 4 - note E_, 14 - ;tie - note E_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note E_, 7 - note F#, 6 - note G_, 14 - note F#, 7 - note E_, 6 - note D_, 4 - rest 3 - note F#, 14 - ;tie - note F#, 6 - note E_, 14 - ;tie - note E_, 7 - note C_, 6 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - rest 7 - sound_call Branch_1ef602 - ;musicf0 34 - note E_, 14 - ;tie - note E_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note E_, 7 - note F#, 6 - note G_, 14 - note F#, 7 - note E_, 6 - note D_, 4 - rest 3 - note F#, 14 - ;tie - note F#, 6 - note B_, 14 - ;tie - note B_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 34 - ;musicf1 71 - ;musicf2 - note A_, 13 - ;tie + sound_call Branch_1ef4d1 note A_, 14 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 - ;tie - note A_, 13 - ;tie - ; - note A_, 14 - ;tie - note A_, 13 - ;tie - note A_, 14 - ;tie +; tie note A_, 13 rest 7 sound_call Branch_1ef615 - ;musicf0 35 - ;musicf1 71 - ;musicf3 +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note G_, 3 note G#, 3 note A_, 14 - ;tie +; tie note A_, 7 note G_, 6 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1ef5f5 - ;musicec 0 - ;musicf0 35 +; pitch_offset 0 +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 note D_, 13 note F_, 14 - ;tie +; tie note F_, 7 note G_, 13 - ;tie +; tie note G_, 7 - ;musicf2 +; musicf2 note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 note E_, 14 - ;musicf3 +; musicf3 note F_, 13 note G_, 14 note A_, 13 note E_, 14 - ;tie +; tie note E_, 7 note C_, 6 sound_call Branch_1ef5f5 - ;musicf0 35 +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 note D_, 13 dec_octave note A_, 14 - ;tie +; tie note A_, 7 inc_octave note D#, 3 note E_, 3 - ;tie +; tie note E_, 14 - ;musicf2 +; musicf2 note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 note C_, 13 - ;musicf3 +; musicf3 note D_, 5 note E_, 5 note F_, 5 @@ -288,421 +187,186 @@ Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) note G_, 4 note G#, 4 note A_, 14 - ;tie +; tie note A_, 7 note G_, 6 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1ef5f5 - ;musicec 0 - ;musicf0 35 +; pitch_offset 0 +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 note D_, 13 note F_, 14 - ;tie +; tie note F_, 7 note G_, 13 - ;tie +; tie note G_, 7 - ;musicf2 +; musicf2 note F_, 7 note F_, 6 - ;musicf3 +; musicf3 note A#, 3 inc_octave note C_, 4 - ;tie +; tie note C_, 14 dec_octave note A#, 6 - ;musicec 8 +; pitch_offset 8 sound_call Branch_1ef5f5 - ;musicec 0 - ;musicf0 35 +; pitch_offset 0 +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 note F_, 13 note G#, 14 - ;tie +; tie note G#, 13 note A#, 14 - ;tie +; tie note A#, 7 note A_, 3 note G#, 3 - ;musicf2 +; musicf2 note G_, 14 - ;tie +; tie note G_, 13 note G_, 14 note A_, 13 - ;tie +; tie note A_, 14 note A_, 13 inc_octave note C_, 14 - ;tie +; tie note C_, 13 note C_, 14 dec_octave note B_, 13 - ;tie +; tie note B_, 14 note B_, 13 note G_, 7 note G_, 7 rest 13 - ; - ;sound_call Branch_1ef4d1 - ;musicf0 34 - ;musicf1 71 - ;musicf3 - octave 2 - note G_, 5 - note G#, 5 - note A_, 5 - inc_octave - note C_, 4 - note D_, 4 - note D#, 4 - note E_, 14 - ;tie - note E_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note E_, 7 - note F#, 6 - note G_, 14 - note F#, 7 - note E_, 6 - note D_, 4 - rest 3 - note F#, 14 - ;tie - note F#, 6 - note E_, 14 - ;tie - note E_, 7 - note C_, 6 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - rest 7 - sound_call Branch_1ef602 - ;musicf0 34 - note E_, 14 - ;tie - note E_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1ef5f5 - ;musicf0 34 - octave 3 - note E_, 7 - note F#, 6 - note G_, 14 - note F#, 7 - note E_, 6 - note D_, 4 - rest 3 - note F#, 14 - ;tie - note F#, 6 - note B_, 14 - ;tie - note B_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 34 - ;musicf1 71 - ;musicf2 - note A_, 13 - ;tie + sound_call Branch_1ef4d1 note A_, 14 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 - ;tie - note A_, 13 - ;tie - ; - note A_, 14 - ;tie - note A_, 13 - ;tie - note A_, 14 - ;tie +; tie note A_, 13 note A_, 7 - ;musicf3 +; musicf3 sound_call Branch_1ef628 - ; - ;sound_call Branch_1ef564 - ;musicf0 35 - ;musicf1 71 - ;musicf3 - octave 2 - note G_, 5 - note G#, 5 - note A_, 5 - inc_octave - note C_, 4 - note D_, 4 - note D#, 4 - note E_, 14 - ;tie - note E_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 35 - octave 3 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1ef5f5 - ;musicf0 35 - octave 3 - note E_, 7 - note F#, 6 - note G_, 14 - note F#, 7 - note E_, 6 - note D_, 4 - rest 3 - note F#, 14 - ;tie - note F#, 6 - note E_, 14 - ;tie - note E_, 7 - note C_, 6 - sound_call Branch_1ef5f5 - ;musicf0 35 - octave 3 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 13 - rest 7 - sound_call Branch_1ef602 - ;musicf0 35 - note E_, 14 - ;tie - note E_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 35 - octave 3 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1ef5f5 - ;musicf0 35 - octave 3 - note E_, 7 - note F#, 6 - note G_, 14 - note F#, 7 - note E_, 6 - note D_, 4 - rest 3 - note F#, 14 - ;tie - note F#, 6 - note B_, 14 - ;tie - note B_, 7 - note G_, 6 - sound_call Branch_1ef5f5 - ;musicf0 35 - ;musicf2 - note A_, 13 - ;tie + sound_call Branch_1ef564 note A_, 14 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 13 - ;tie - ; - note A_, 14 - ;tie - note A_, 13 - ;tie - note A_, 14 - ;tie - note A_, 13 - ;musicf3 - ;musicf0 34 - ;musicf1 71 - ;musicf3 +; musicf3 +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 2 note G_, 4 inc_octave note C_, 5 note F_, 5 - ;musicf2 +; musicf2 note G_, 13 note G_, 7 note A_, 14 note A_, 6 - ;musicf3 +; musicf3 note A_, 4 - ;musicf2 +; musicf2 note A#, 16 - ;tie +; tie note A#, 7 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 13 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 13 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 13 - ;tie +; tie note A#, 14 - ;tie +; tie note A#, 13 note A#, 14 note G_, 7 note A#, 6 - ;musicf3 +; musicf3 inc_octave note C#, 3 note D_, 4 - ;tie +; tie note D_, 14 note C_, 6 - ;tie +; tie note C_, 14 dec_octave - ;musicf2 +; musicf2 note A#, 7 inc_octave note C_, 6 dec_octave - ;musicf3 +; musicf3 note A_, 14 - ;tie +; tie note A_, 7 - ;musicf2 +; musicf2 note A#, 6 note A_, 7 - ;tie +; tie note A#, 7 inc_octave note C_, 7 note C_, 6 dec_octave - ;musicf3 +; musicf3 note A_, 14 - ;tie +; tie note A_, 7 note F_, 6 - ;tie +; tie note F_, 14 - ;musicf2 +; musicf2 note D_, 7 note F_, 6 - ;musicf3 +; musicf3 note G#, 3 note A_, 11 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note A#, 13 inc_octave @@ -710,148 +374,163 @@ Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) note D_, 10 dec_octave note A#, 13 - ;musicf0 34 +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - ;musicf2 +; musicf2 note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 note G_, 14 note D#, 13 note D#, 7 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 - ;musicf1 48 - ;musicf2 +; musicf1 48 +; musicf2 note A#, 5 note A#, 2 - ;musicf3 - ;musicf0 34 +; musicf3 +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - ;musicf1 71 - ;musicf2 +; musicf1 71 +; musicf2 note A#, 7 note A#, 13 inc_octave note C_, 14 note C_, 6 - ;musicf3 +; musicf3 dec_octave note A_, 14 - ;tie +; tie note A_, 7 - ;musicf2 +; musicf2 note A#, 6 note A_, 7 - ;tie +; tie note A#, 7 note A_, 7 note A_, 6 - ;musicf3 +; musicf3 note F_, 14 - ;tie +; tie note F_, 7 - ;musicf2 +; musicf2 note D_, 6 note F_, 7 - ;tie +; tie note D_, 7 - ;musicf3 +; musicf3 note G#, 3 note A_, 10 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 13 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note G_, 14 note A_, 13 - ;musicf0 35 +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 87 +; musicf1 87 note G_, 14 - ;tie +; tie note G_, 7 - ;musicf2 +; musicf2 note A_, 6 note G_, 7 - ;tie +; tie note A_, 7 note A#, 7 note G_, 6 - ;musicf3 +; musicf3 note B_, 4 vibrato 14, 3, 3 - ;musicf2 +; musicf2 inc_octave note C_, 10 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 13 vibrato 0, 3, 3 note C_, 14 - ;tie +; tie note C_, 7 dec_octave note A#, 6 inc_octave note C_, 7 - ;tie +; tie dec_octave note A#, 7 note F#, 7 note A#, 6 - ;musicf3 +; musicf3 note D_, 14 - ;tie +; tie note D_, 7 note A_, 3 note A#, 3 - ;tie +; tie note A#, 14 - ;musicf2 +; musicf2 note F#, 7 note F#, 6 - ;musicf3 +; musicf3 note G#, 4 vibrato 10, 3, 3 note A_, 10 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 vibrato 0, 3, 3 - ;musicf2 +; musicf2 note G_, 13 - ;tie +; tie note G_, 7 note G_, 7 note D_, 13 @@ -859,90 +538,99 @@ Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) note E_, 14 note E_, 6 note F_, 14 - ;tie +; tie note F_, 8 note F_, 5 - ;musicf3 - ;musicf0 9 +; musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 - ;musicf2 +; musicf1 48 +; musicf2 note C#, 5 note C#, 9 - ;musicf3 - ;musicf0 35 - ;musicf1 71 - ;musicf3 +; musicf3 +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 note G_, 13 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note A_, 13 note A_, 7 note A#, 14 note A#, 6 inc_octave note C_, 14 - ;tie +; tie note C_, 13 note C_, 14 vibrato 27, 3, 3 note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 note D_, 14 - ;tie +; tie note D_, 13 note C_, 14 - ;tie +; tie note C_, 13 note C_, 14 note D_, 13 - ;tie +; tie note D_, 14 note D_, 13 note D_, 14 - ;tie +; tie note D_, 13 note D_, 14 - ;musicf3 +; musicf3 note D#, 3 - ;musicf2 +; musicf2 note E_, 10 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 8 note E_, 5 - ;musicf3 - ;musicf0 1 - ;musicef 2 - ;musicf1 71 +; musicf3 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef 2 +; musicf1 71 octave 3 note E_, 4 note E_, 3 - ;musicf3 +; musicf3 inc_octave note D_, 7 - ;musicf2 +; musicf2 dec_octave note B_, 4 inc_octave @@ -950,9 +638,9 @@ Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) dec_octave note G_, 3 note B_, 3 - ;musicf3 +; musicf3 note B_, 7 - ;musicf2 +; musicf2 note G_, 4 note B_, 3 note D_, 4 @@ -968,9 +656,12 @@ Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) note C_, 13 rest 14 sound_call Branch_1ef490 - ;musicf0 0 - ;musicf1 71 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note C_, 5 note D_, 5 @@ -981,10 +672,13 @@ Music_GRDuelTheme2_Ch2: ; 1ef1ec (7b:71ec) sound_loop 0, .MainLoop Branch_1ef490: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 - ;musicf2 +; musicf1 48 +; musicf2 note C_, 5 note C_, 8 rest 7 @@ -995,11 +689,11 @@ Branch_1ef490: note C_, 5 note C_, 9 rest 6 - ;musicf3 +; musicf3 note D_, 14 note C_, 13 rest 14 - ;musicf2 +; musicf2 note C_, 5 note C_, 8 rest 7 @@ -1010,13 +704,13 @@ Branch_1ef490: note C_, 5 note C_, 9 rest 6 - ;musicf3 +; musicf3 dec_octave note B_, 14 inc_octave note C_, 13 rest 14 - ;musicf2 +; musicf2 note C_, 5 note C_, 8 rest 7 @@ -1027,11 +721,11 @@ Branch_1ef490: note C_, 5 note C_, 9 rest 6 - ;musicf3 +; musicf3 note D_, 14 note C_, 13 rest 14 - ;musicf2 +; musicf2 note C_, 5 note C_, 8 rest 7 @@ -1042,26 +736,138 @@ Branch_1ef490: note C_, 5 note C_, 9 rest 6 - ;musicf3 +; musicf3 sound_ret -Branch_1ef5f5: - ;musicf0 9 +Branch_1ef4d1: +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 2 - ;musicf1 48 + note G_, 5 + note G#, 5 + note A_, 5 + inc_octave + note C_, 4 + note D_, 4 + note D#, 4 + note E_, 14 +; tie + note E_, 7 + note G_, 6 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 octave 3 - ;musicf2 +; musicf2 note C_, 5 note C_, 9 - ;musicf1 71 - ;musicf3 - sound_ret - -Branch_1ef602: - ;musicf0 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - ;musicf1 48 - ;musicf3 + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + rest 3 + note F#, 14 +; tie + note F#, 6 + note E_, 14 +; tie + note E_, 7 + note C_, 6 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 + octave 3 + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 13 + rest 7 +; sound_call Branch_1ef602 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 3 +; musicf1 48 +; musicf3 note E_, 7 dec_octave note G_, 4 @@ -1071,15 +877,403 @@ Branch_1ef602: note D_, 14 note C_, 13 octave 3 - ;musicf1 71 - ;musicf3 +; musicf1 71 +; musicf3 +; sound_ret +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 + note E_, 14 +; tie + note E_, 7 + note G_, 6 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 + octave 3 + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + rest 3 + note F#, 14 +; tie + note F#, 6 + note B_, 14 +; tie + note B_, 7 + note G_, 6 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 34 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 +; musicf2 + note A_, 13 +; tie + note A_, 14 +; tie + note A_, 13 +; tie + note A_, 14 +; tie + note A_, 13 +; tie + sound_ret + +Branch_1ef564: +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 + octave 2 + note G_, 5 + note G#, 5 + note A_, 5 + inc_octave + note C_, 4 + note D_, 4 + note D#, 4 + note E_, 14 +; tie + note E_, 7 + note G_, 6 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 + octave 3 + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + rest 3 + note F#, 14 +; tie + note F#, 6 + note E_, 14 +; tie + note E_, 7 + note C_, 6 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 + octave 3 + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 13 + rest 7 +; sound_call Branch_1ef602 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 3 +; musicf1 48 +; musicf3 + note E_, 7 + dec_octave + note G_, 4 + note A_, 4 + note G_, 5 + inc_octave + note D_, 14 + note C_, 13 + octave 3 +; musicf1 71 +; musicf3 +; sound_ret +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 + note E_, 14 +; tie + note E_, 7 + note G_, 6 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 + octave 3 + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 + octave 3 + note E_, 7 + note F#, 6 + note G_, 14 + note F#, 7 + note E_, 6 + note D_, 4 + rest 3 + note F#, 14 +; tie + note F#, 6 + note B_, 14 +; tie + note B_, 7 + note G_, 6 +; sound_call Branch_1ef5f5 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 +; sound_ret +; preset 35 + volume_envelope 11, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf2 + note A_, 13 +; tie + note A_, 14 +; tie + note A_, 13 +; tie + note A_, 14 +; tie + note A_, 13 +; tie + sound_ret + +Branch_1ef5f5: +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note C_, 5 + note C_, 9 +; musicf1 71 +; musicf3 + sound_ret + +Branch_1ef602: +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 3 +; musicf1 48 +; musicf3 + note E_, 7 + dec_octave + note G_, 4 + note A_, 4 + note G_, 5 + inc_octave + note D_, 14 + note C_, 13 + octave 3 +; musicf1 71 +; musicf3 sound_ret Branch_1ef615: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 - ;musicf3 +; musicf1 48 +; musicf3 note E_, 7 dec_octave note G_, 4 @@ -1089,15 +1283,18 @@ Branch_1ef615: note D_, 14 note C_, 7 octave 3 - ;musicf1 71 - ;musicf3 +; musicf1 71 +; musicf3 sound_ret Branch_1ef628: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 - ;musicf3 +; musicf1 48 +; musicf3 note E_, 7 dec_octave note G_, 4 @@ -1106,12 +1303,14 @@ Branch_1ef628: sound_ret -Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) - channel_volume 10 - ;musicf0 9 +Music_GRDuelTheme2_Ch1: +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 3 note E_, 14 rest 7 @@ -1135,174 +1334,79 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) rest 2 note E_, 7 rest 7 - ;musicf0 1 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 rest 3 note E_, 7 note B_, 3 - ;musicf1 71 - ;musicf2 +; musicf1 71 +; musicf2 note G#, 14 - ;tie +; tie note G#, 13 - ;tie +; tie note G#, 14 - ;tie +; tie note G#, 13 - ;tie +; tie note G#, 14 note G#, 13 .MainLoop .Loop1 - ;musicf0 0 - ;musicf1 71 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 octave 3 - ;musicf2 +; musicf2 note E_, 7 note E_, 7 sound_call Branch_1ef8d6 rest 14 sound_call Branch_1ef8f0 sound_loop 2, .Loop1 - ; - ;sound_call Branch_1ef90b - ;musicf0 7 - ;musicf3 + sound_call Branch_1ef90b +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicef -3 octave 3 - note C_, 14 - ;tie - note C_, 7 - note E_, 6 - sound_call Branch_1efa34 - ;musicf0 7 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 7 - sound_call Branch_1efa41 - ;musicf0 7 - ;musicef 253 - note D_, 14 - ;tie - note D_, 13 - sound_call Branch_1efa34 - ;musicf0 7 - note C_, 7 - note D_, 6 - note E_, 14 - note D_, 7 - note C_, 6 - dec_octave - note B_, 4 - rest 3 - inc_octave - note D_, 14 - ;tie - note D_, 6 - note C_, 14 - ;tie - note C_, 7 - dec_octave - note A_, 6 - sound_call Branch_1efa34 - ;musicf0 7 - octave 2 - note F#, 13 - ;tie note F#, 14 - ;tie +; tie note F#, 13 - sound_call Branch_1efa4a - ;musicf0 7 - octave 2 - ;musicef 253 +; tie note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie +; tie note F#, 13 rest 7 sound_call Branch_1efa51 - ;musicf0 7 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - note C_, 14 - ;tie - note C_, 7 - note E_, 6 - sound_call Branch_1efa34 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 7 - sound_call Branch_1efa41 - ;musicf0 7 - ;musicef 253 - note D_, 14 - ;tie - note D_, 13 - sound_call Branch_1efa34 - ;musicf0 7 - note C_, 7 - note D_, 6 - note E_, 14 - note D_, 7 - note C_, 6 - dec_octave - note B_, 4 - rest 3 - inc_octave - note D_, 14 - ;tie - note D_, 6 - note G_, 14 - ;tie - note G_, 7 - note E_, 6 - sound_call Branch_1efa34 - ;musicf0 7 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1efa4a - ; - ;musicf0 7 - ;musicef 253 - octave 3 - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - rest 7 - sound_call Branch_1efa51 - ;musicf0 9 - octave 3 - ;musicf1 48 +; musicf1 48 rest 14 rest 13 - ;musicf2 +; musicf2 note D_, 5 note D_, 9 rest 13 rest 7 note D_, 5 note D_, 2 - ;musicf3 +; musicf3 note D_, 13 note F_, 14 dec_octave note A#, 13 rest 14 rest 13 - ;musicf2 +; musicf2 note A#, 5 note A#, 9 rest 13 @@ -1310,21 +1414,21 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) rest 7 note D_, 5 note D_, 2 - ;musicf3 +; musicf3 note D_, 13 note E_, 14 note F_, 13 .Loop2 rest 14 rest 13 - ;musicf2 +; musicf2 note E_, 5 note E_, 9 rest 13 rest 7 note E_, 5 note E_, 2 - ;musicf3 +; musicf3 dec_octave note A_, 13 inc_octave @@ -1335,14 +1439,14 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) sound_loop 2, .Loop2 rest 14 rest 13 - ;musicf2 +; musicf2 note D_, 5 note D_, 9 rest 13 rest 7 note D_, 5 note D_, 2 - ;musicf3 +; musicf3 note D_, 13 note F_, 14 dec_octave @@ -1350,14 +1454,14 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) inc_octave rest 14 rest 13 - ;musicf2 +; musicf2 note C#, 5 note C#, 9 rest 13 rest 7 note G#, 5 note G#, 2 - ;musicf3 +; musicf3 note F_, 13 dec_octave note A_, 5 @@ -1367,282 +1471,70 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) note D_, 4 note E_, 4 note F_, 4 - ;musicf0 1 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - ;musicf1 71 +; musicf1 71 note C_, 14 - ;tie +; tie note C_, 13 note C_, 14 note D_, 13 - ;tie +; tie note D_, 14 note D_, 13 note F_, 14 - ;tie +; tie note F_, 13 note F_, 14 note E_, 13 - ;tie +; tie note E_, 14 note E_, 13 note C_, 7 note C_, 14 - ;tie +; tie note C_, 6 - ;musicf3 - ;musicf0 0 - ;musicf0 4 - ;musicf1 71 - ;musicf2 +; musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf2 note G#, 7 note G#, 14 rest 6 - ;musicf3 - ; - ;sound_call Branch_1ef90b - ;musicf0 7 - ;musicf3 - octave 3 - note C_, 14 - ;tie - note C_, 7 - note E_, 6 - sound_call Branch_1efa34 - ;musicf0 7 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 7 - sound_call Branch_1efa41 - ;musicf0 7 - ;musicef 253 - note D_, 14 - ;tie - note D_, 13 - sound_call Branch_1efa34 - ;musicf0 7 - note C_, 7 - note D_, 6 - note E_, 14 - note D_, 7 - note C_, 6 - dec_octave - note B_, 4 - rest 3 - inc_octave - note D_, 14 - ;tie - note D_, 6 - note C_, 14 - ;tie - note C_, 7 - dec_octave - note A_, 6 - sound_call Branch_1efa34 - ;musicf0 7 - octave 2 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1efa4a - ;musicf0 7 - octave 2 - ;musicef 253 - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - rest 7 - sound_call Branch_1efa51 - ;musicf0 7 - octave 3 - note C_, 14 - ;tie - note C_, 7 - note E_, 6 - sound_call Branch_1efa34 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 7 - sound_call Branch_1efa41 - ;musicf0 7 - ;musicef 253 - note D_, 14 - ;tie - note D_, 13 - sound_call Branch_1efa34 - ;musicf0 7 - note C_, 7 - note D_, 6 - note E_, 14 - note D_, 7 - note C_, 6 - dec_octave - note B_, 4 - rest 3 - inc_octave - note D_, 14 - ;tie - note D_, 6 - note G_, 14 - ;tie - note G_, 7 - note E_, 6 - sound_call Branch_1efa34 - ;musicf0 7 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1efa4a - ; - ;musicf0 7 - ;musicef 253 +; musicf3 + sound_call Branch_1ef90b +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicef -3 octave 3 note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 rest 7 sound_call Branch_1efa62 - ; - ;sound_call Branch_1ef997 - ;musicf0 1 - ;musicf1 71 - ;musicf3 - octave 2 - note A_, 14 - ;tie - note A_, 7 - inc_octave - note C_, 6 - sound_call Branch_1efa34 - ;musicf0 1 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 7 - sound_call Branch_1efa41 - ;musicf0 1 - ;musicef 253 - note D_, 14 - ;tie - note D_, 13 - sound_call Branch_1efa34 - ;musicf0 1 - octave 2 - note A_, 7 - note B_, 6 - inc_octave - note C_, 14 - dec_octave - note B_, 7 - note A_, 6 - ;musicf2 - note G_, 4 - note G_, 3 - ;musicf3 - note B_, 14 - ;tie - note B_, 6 - note A_, 14 - ;tie - note A_, 7 - dec_octave - note E_, 6 - sound_call Branch_1efa34 - ;musicf0 1 - octave 2 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1efa4a - ;musicf0 1 - ;musicef 253 - octave 2 - ;musicf1 71 - note F#, 14 - ;tie - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - note F#, 7 - sound_call Branch_1efa51 - ;musicf0 1 - octave 2 - note A_, 14 - ;tie - note A_, 7 - inc_octave - note C_, 6 - sound_call Branch_1efa34 - ;musicf0 1 - note D_, 13 - ;tie - note D_, 14 - ;tie - note D_, 7 - sound_call Branch_1efa41 - ;musicf0 1 - ;musicef 253 - note D_, 14 - ;tie - note D_, 13 - sound_call Branch_1efa34 - octave 2 - ;musicf0 1 - note A_, 7 - note B_, 6 - inc_octave - note C_, 14 - dec_octave - note B_, 7 - note A_, 6 - ;musicf2 - note G_, 4 - note G_, 3 - ;musicf3 - note B_, 14 - ;tie - note B_, 6 - inc_octave - note D_, 14 - ;tie - note D_, 7 - dec_octave - note A_, 6 - sound_call Branch_1efa34 - ;musicf0 1 - octave 2 - note F#, 13 - ;tie - note F#, 14 - ;tie - note F#, 13 - sound_call Branch_1efa4a - ; - ;musicf0 9 + sound_call Branch_1ef997 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 - ;musicf2 +; musicf1 48 +; musicf2 rest 7 note E_, 5 note E_, 9 @@ -1652,24 +1544,32 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) rest 13 note C_, 5 note C_, 9 - ;musicf3 - ;musicf0 0 - ;musicf1 71 +; musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 octave 3 note E_, 13 note E_, 7 note F_, 14 note E_, 6 - ;musicf0 7 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 - ;musicf1 48 - ;musicf3 +; musicf1 48 +; musicf3 note D#, 14 - ;tie +; tie note D#, 13 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 - ;musicf2 +; musicf2 note A#, 5 note A#, 9 rest 13 @@ -1677,89 +1577,114 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) octave 3 note D#, 5 note D#, 9 - ;musicf3 +; musicf3 dec_octave note G_, 6 note A#, 14 note G_, 13 - ;musicf0 7 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note D#, 14 - ;tie +; tie note D#, 13 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 - ;musicf2 +; musicf2 note A#, 5 note A#, 9 - ;musicf3 - ;musicf0 7 +; musicf3 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note D_, 7 rest 6 note A#, 14 - ;tie +; tie note A#, 7 note A_, 13 - ;tie +; tie note A_, 7 note G_, 7 rest 6 note F_, 14 - ;tie +; tie note F_, 7 note G_, 6 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf2 +; musicf2 note D_, 5 note D_, 9 - ;musicf3 - ;musicf0 7 +; musicf3 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note A_, 7 rest 6 note F_, 14 - ;tie +; tie note F_, 7 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note A#, 6 inc_octave note D_, 14 dec_octave note A#, 13 - ;musicf0 7 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 7 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf2 +; musicf2 note F_, 5 note F_, 2 - ;musicf3 +; musicf3 dec_octave note G_, 13 note A#, 4 rest 3 rest 7 note G_, 13 - ;musicf0 7 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note D#, 14 - ;tie +; tie note D#, 13 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 - ;musicf2 +; musicf2 note A#, 5 note A#, 9 rest 13 @@ -1767,96 +1692,124 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) octave 3 note D#, 5 note D#, 9 - ;musicf3 +; musicf3 dec_octave note G_, 6 note A#, 14 note G_, 13 - ;musicf0 7 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note D#, 14 - ;tie +; tie note D#, 13 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 - ;musicf2 +; musicf2 note A#, 5 note A#, 9 - ;musicf3 - ;musicf0 7 +; musicf3 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note C_, 13 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf2 +; musicf2 note D#, 5 note D#, 9 - ;musicf3 - ;musicf0 7 +; musicf3 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note G_, 7 rest 13 note A_, 14 rest 6 note F_, 14 - ;tie +; tie note F_, 7 note G_, 6 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf2 +; musicf2 note D_, 5 note D_, 9 - ;musicf3 - ;musicf0 7 +; musicf3 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note F_, 7 rest 6 note D_, 14 - ;tie +; tie note D_, 7 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note F_, 6 note A_, 14 note F_, 13 - ;musicf0 7 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 octave 3 note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 7 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf2 +; musicf2 note D_, 5 note D_, 2 - ;musicf3 +; musicf3 dec_octave note F_, 4 note G_, 3 - ;tie +; tie note G_, 6 note D#, 14 note F_, 13 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 +; musicf1 48 rest 14 rest 13 - ;musicf2 +; musicf2 note C_, 5 note C_, 9 rest 13 rest 7 note F_, 5 note F_, 9 - ;musicf3 +; musicf3 dec_octave note G_, 6 note A#, 14 @@ -1864,20 +1817,20 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) inc_octave rest 14 rest 13 - ;musicf2 +; musicf2 note F_, 5 note F_, 9 rest 13 rest 7 note A#, 5 note A#, 2 - ;musicf3 +; musicf3 note C_, 13 note D#, 14 note F_, 13 rest 14 rest 13 - ;musicf2 +; musicf2 octave 2 note A#, 5 note A#, 9 @@ -1885,25 +1838,28 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) rest 7 note A#, 5 note A#, 9 - ;musicf3 +; musicf3 note F_, 6 note A#, 14 note F_, 13 inc_octave rest 14 rest 13 - ;musicf2 +; musicf2 note F_, 5 note F_, 9 rest 13 rest 7 note F_, 5 note F_, 9 - ;musicf3 +; musicf3 dec_octave note A#, 6 - ;musicf0 0 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 2 note A_, 5 note A#, 5 @@ -1912,40 +1868,46 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) note D_, 4 note E_, 4 note F_, 4 - ;musicf1 71 +; musicf1 71 note F_, 14 - ;tie +; tie note F_, 7 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 +; musicf1 48 note F_, 6 note F_, 14 - ;musicf0 0 - ;musicf1 71 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 7 note G_, 6 - ;musicf3 +; musicf3 note D_, 5 note E_, 5 note F_, 5 @@ -1953,60 +1915,75 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) note A_, 4 note B_, 4 note F_, 14 - ;tie +; tie note F_, 7 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 - ;musicf2 +; musicf1 48 +; musicf2 note F_, 6 note F_, 14 - ;musicf0 0 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 3 note G_, 13 - ;tie +; tie note G_, 7 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - ;musicf1 48 +; musicf1 48 note G_, 5 note G_, 9 rest 6 - ;musicf0 0 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - ;musicf1 71 +; musicf1 71 note G#, 14 - ;tie +; tie note G#, 7 note G#, 6 - ;tie +; tie note G#, 14 note A_, 13 - ;tie +; tie note A_, 14 note A_, 7 - ;musicf0 1 - ;musicef 2 - ;musicf1 71 - ;musicf3 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef 2 +; musicf1 71 +; musicf3 note D_, 3 note D#, 3 dec_octave - ;musicf2 +; musicf2 note B_, 4 note B_, 3 - ;musicf3 +; musicf3 inc_octave note B_, 7 - ;musicf2 +; musicf2 note G_, 4 note B_, 3 note D_, 3 note G_, 3 - ;musicf3 +; musicf3 note G_, 7 - ;musicf2 +; musicf2 note D_, 4 note G_, 3 dec_octave @@ -2029,9 +2006,12 @@ Music_GRDuelTheme2_Ch1: ; 1ef634 (7b:7634) sound_loop 0, .MainLoop Branch_1ef8d6: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 - ;musicf3 +; musicf3 rest 13 rest 14 rest 13 @@ -2042,7 +2022,7 @@ Branch_1ef8d6: rest 14 rest 13 rest 7 - ;musicf2 +; musicf2 note G_, 5 note G_, 9 rest 6 @@ -2050,15 +2030,18 @@ Branch_1ef8d6: note G_, 5 note G_, 9 rest 6 - ;musicf3 +; musicf3 note F#, 14 note G_, 13 sound_ret Branch_1ef8f0: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 - ;musicf3 +; musicf3 rest 13 rest 14 rest 13 @@ -2068,7 +2051,7 @@ Branch_1ef8f0: note G_, 13 rest 14 rest 13 - ;musicf2 +; musicf2 rest 7 note G_, 5 note G_, 9 @@ -2077,84 +2060,649 @@ Branch_1ef8f0: note G_, 5 note G_, 9 rest 6 - ;musicf3 +; musicf3 note B_, 14 inc_octave note C_, 13 sound_ret -Branch_1efa34: - ;musicf0 9 - octave 2 - ;musicf1 48 +Branch_1ef90b: +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicf3 octave 3 - ;musicf2 + note C_, 14 +; tie + note C_, 7 + note E_, 6 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 note E_, 5 note E_, 9 - ;musicf3 - ;musicf1 71 +; musicf3 +; musicf1 71 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 7 +; sound_call Branch_1efa41 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 + octave 3 +; musicf3 + note C_, 6 + note D_, 14 + note C_, 13 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicef -3 + note D_, 14 +; tie + note D_, 13 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 + note C_, 7 + note D_, 6 + note E_, 14 + note D_, 7 + note C_, 6 + dec_octave + note B_, 4 + rest 3 + inc_octave + note D_, 14 +; tie + note D_, 6 + note C_, 14 +; tie + note C_, 7 + dec_octave + note A_, 6 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 + octave 2 + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; sound_call Branch_1efa4a +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf3 + note A_, 14 + note G_, 13 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 + octave 2 +; musicef -3 + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 + rest 7 +; sound_call Branch_1efa51 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf1 48 +; musicf2 + octave 2 + note G_, 5 + inc_octave + note C_, 9 + dec_octave + rest 6 +; musicf3 + note A_, 14 + note G_, 13 +; musicf1 71 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 + octave 3 + note C_, 14 +; tie + note C_, 7 + note E_, 6 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 7 +; sound_call Branch_1efa41 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 + octave 3 +; musicf3 + note C_, 6 + note D_, 14 + note C_, 13 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicef -3 + note D_, 14 +; tie + note D_, 13 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 + note C_, 7 + note D_, 6 + note E_, 14 + note D_, 7 + note C_, 6 + dec_octave + note B_, 4 + rest 3 + inc_octave + note D_, 14 +; tie + note D_, 6 + note G_, 14 +; tie + note G_, 7 + note E_, 6 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; sound_call Branch_1efa4a +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf3 + note A_, 14 + note G_, 13 +; sound_ret + sound_ret + +Branch_1ef997: +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 + octave 2 + note A_, 14 +; tie + note A_, 7 + inc_octave + note C_, 6 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 7 +; sound_call Branch_1efa41 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 + octave 3 +; musicf3 + note C_, 6 + note D_, 14 + note C_, 13 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -3 + note D_, 14 +; tie + note D_, 13 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 + octave 2 + note A_, 7 + note B_, 6 + inc_octave + note C_, 14 + dec_octave + note B_, 7 + note A_, 6 +; musicf2 + note G_, 4 + note G_, 3 +; musicf3 + note B_, 14 +; tie + note B_, 6 + note A_, 14 +; tie + note A_, 7 + dec_octave + note E_, 6 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 + octave 2 + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; sound_call Branch_1efa4a +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf3 + note A_, 14 + note G_, 13 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -3 + octave 2 +; musicf1 71 + note F#, 14 +; tie + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 + note F#, 7 +; sound_call Branch_1efa51 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf1 48 +; musicf2 + octave 2 + note G_, 5 + inc_octave + note C_, 9 + dec_octave + rest 6 +; musicf3 + note A_, 14 + note G_, 13 +; musicf1 71 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 + octave 2 + note A_, 14 +; tie + note A_, 7 + inc_octave + note C_, 6 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 + note D_, 13 +; tie + note D_, 14 +; tie + note D_, 7 +; sound_call Branch_1efa41 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 + octave 3 +; musicf3 + note C_, 6 + note D_, 14 + note C_, 13 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef -3 + note D_, 14 +; tie + note D_, 13 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret + octave 2 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 + note A_, 7 + note B_, 6 + inc_octave + note C_, 14 + dec_octave + note B_, 7 + note A_, 6 +; musicf2 + note G_, 4 + note G_, 3 +; musicf3 + note B_, 14 +; tie + note B_, 6 + inc_octave + note D_, 14 +; tie + note D_, 7 + dec_octave + note A_, 6 +; sound_call Branch_1efa34 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 +; sound_ret +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 + octave 2 + note F#, 13 +; tie + note F#, 14 +; tie + note F#, 13 +; sound_call Branch_1efa4a +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf3 + note A_, 14 + note G_, 13 +; sound_ret + sound_ret + +Branch_1efa34: +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 + octave 2 +; musicf1 48 + octave 3 +; musicf2 + note E_, 5 + note E_, 9 +; musicf3 +; musicf1 71 sound_ret Branch_1efa41: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 octave 3 - ;musicf3 +; musicf3 note C_, 6 note D_, 14 note C_, 13 sound_ret Branch_1efa4a: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 - ;musicf3 +; musicf3 note A_, 14 note G_, 13 sound_ret Branch_1efa51: - ;musicf0 9 - ;musicf1 48 - ;musicf2 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf1 48 +; musicf2 octave 2 note G_, 5 inc_octave note C_, 9 dec_octave rest 6 - ;musicf3 +; musicf3 note A_, 14 note G_, 13 - ;musicf1 71 +; musicf1 71 sound_ret Branch_1efa62: - ;musicf0 9 - ;musicf1 48 - ;musicf2 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf1 48 +; musicf2 octave 2 note G_, 5 inc_octave note C_, 9 dec_octave rest 6 - ;musicf3 +; musicf3 inc_octave note D_, 14 note C_, 13 - ;musicf1 71 +; musicf1 71 sound_ret -Music_GRDuelTheme2_Ch3: ; 1efa74 (7b:7a74) - channel_volume 1 - ;fade_wave 15 +Music_GRDuelTheme2_Ch3: + fade_wave 15 load_wave 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 12, 11, 2, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 speed 1 channel_volume 1 - ;musice9 96 - ;musicdc 255 +; echo 96 + stereo_panning TRUE, TRUE octave 2 note A_, 14 note A_, 4 @@ -2180,7 +2728,7 @@ Music_GRDuelTheme2_Ch3: ; 1efa74 (7b:7a74) rest 16 rest 4 note A#, 14 - ;tie +; tie note A#, 7 note A#, 3 rest 3 @@ -2973,7 +3521,7 @@ Branch_1efdd9: sound_ret -Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) +Music_GRDuelTheme2_Ch4: toggle_noise 6 octave 1 drum_speed 1 @@ -2999,15 +3547,15 @@ Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) drum_note 1, 7 drum_note 2, 6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 1, 13 @@ -3030,36 +3578,36 @@ Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) sound_call Branch_1effeb sound_call Branch_1effdc sound_call Branch_1effeb - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 250 +; musicef -6 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 250 +; musicef -6 drum_note 2, 6 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 - ;musicef 250 +; musicef -6 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 6 - ;musicef 250 +; musicef -6 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 7 - ;musicef 250 +; musicef -6 drum_note 2, 7 - ;musicef 252 +; musicef -4 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 - ;musicef 250 +; musicef -6 drum_note 2, 7 - ;musicef 0 +; musicef 0 drum_note 2, 6 sound_call Branch_1effeb sound_call Branch_1effdc @@ -3077,10 +3625,10 @@ Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) drum_note 1, 7 drum_note 2, 7 drum_note 5, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 1, 7 @@ -3139,20 +3687,20 @@ Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) drum_note 1, 6 drum_note 2, 14 drum_note 4, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 4 - ;musicef 253 +; musicef -3 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 4 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 4, 6 @@ -3194,10 +3742,10 @@ Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) drum_note 1, 7 drum_note 2, 7 drum_note 5, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 4, 7 @@ -3210,10 +3758,10 @@ Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) drum_note 1, 6 drum_note 2, 15 drum_note 4, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 2, 7 @@ -3263,15 +3811,15 @@ Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) drum_note 2, 7 drum_note 1, 6 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 4 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 4, 7 @@ -3326,10 +3874,10 @@ Music_GRDuelTheme2_Ch4: ; 1efdf4 (7b:7df4) drum_note 4, 7 drum_note 5, 7 drum_note 4, 7 - ;musicef 253 +; musicef -3 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 7 drum_note 2, 7 drum_note 2, 7 @@ -3372,4 +3920,3 @@ Branch_1effeb: drum_note 1, 7 drum_note 5, 13 sound_ret -; 0x1efff9 diff --git a/crysaudio/music/TCG2/grdueltheme3.asm b/crysaudio/music/TCG2/grdueltheme3.asm index 60d3ea93..af2b93d2 100644 --- a/crysaudio/music/TCG2/grdueltheme3.asm +++ b/crysaudio/music/TCG2/grdueltheme3.asm @@ -5,14 +5,16 @@ Music_GRDuelTheme3: channel 3, Music_GRDuelTheme3_Ch3 channel 4, Music_GRDuelTheme3_Ch4 -Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) - channel_volume 10 +Music_GRDuelTheme3_Ch2: .MainLoop - ;musicf0 27 - ;musicdc 255 - ;musicf3 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf3 speed 1 - ;musicef 1 +; musicef 1 .Loop1 octave 3 note D_, 3 @@ -117,10 +119,13 @@ Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) dec_octave sound_call Branch_1f672f note B_, 13 - ;musicf0 27 - ;musicef 1 - ;musicf1 87 - ;musicf3 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicef 1 +; musicf1 87 +; musicf3 .Loop2 octave 3 note D_, 3 @@ -139,17 +144,23 @@ Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) note E_, 3 rest 4 inc_octave - ;musicf0 9 - ;musicef 254 - ;musicf1 64 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -2 +; musicf1 64 octave 4 - ;musicf2 +; musicf2 note D_, 3 note D_, 4 - ;musicf3 +; musicf3 dec_octave rest 7 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 1 note B_, 3 rest 3 @@ -197,17 +208,23 @@ Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) note E_, 3 rest 4 inc_octave - ;musicf0 9 - ;musicef 254 - ;musicf1 64 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -2 +; musicf1 64 octave 4 - ;musicf2 +; musicf2 note D_, 3 note D_, 4 - ;musicf3 +; musicf3 dec_octave rest 7 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 1 note B_, 3 rest 3 @@ -236,10 +253,13 @@ Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) rest 4 dec_octave sound_call Branch_1f672f - ;musicf3 - ;musicf0 0 +; musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - ;musicef 2 +; musicef 2 vibrato 58, 3, 3 note E_, 4 note F#, 3 @@ -247,209 +267,209 @@ Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) note A_, 3 note A#, 3 note B_, 4 - ;tie +; tie note B_, 14 inc_octave - ;musicf1 87 +; musicf1 87 note C_, 6 note C_, 14 dec_octave note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 note E_, 13 - ;musicf3 +; musicf3 note D#, 3 note E_, 4 - ;tie +; tie note E_, 14 note F#, 6 - ;tie +; tie note F#, 14 - ;musicf2 +; musicf2 note G_, 7 note G_, 6 - ;musicf3 +; musicf3 note G#, 3 note A_, 4 - ;tie +; tie note A_, 14 note G_, 6 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 vibrato 27, 3, 3 note F#, 7 note F#, 6 note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 note D_, 14 - ;tie +; tie note D_, 13 - ;musicf3 +; musicf3 dec_octave note B_, 14 - ;tie +; tie note B_, 7 inc_octave - ;musicf2 +; musicf2 note C_, 6 note C_, 14 - ;musicf3 +; musicf3 vibrato 52, 3, 3 note F#, 3 - ;musicf2 +; musicf2 note G_, 10 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 note G_, 14 note E_, 7 note E_, 6 - ;musicf3 +; musicf3 note A#, 3 note B_, 11 - ;tie +; tie note B_, 7 note A_, 6 - ;tie +; tie note A_, 14 - ;musicf2 +; musicf2 note G_, 7 note G_, 6 - ;musicf3 +; musicf3 note G#, 3 note A_, 4 - ;tie +; tie note A_, 14 inc_octave - ;musicf2 +; musicf2 note D_, 6 note D_, 14 dec_octave note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 note F#, 13 - ;tie +; tie note F#, 14 - ;musicf3 +; musicf3 note G_, 7 note F#, 6 note E_, 14 - ;tie +; tie note E_, 7 - ;musicf2 +; musicf2 note C_, 6 note C_, 14 - ;musicf3 +; musicf3 note F#, 3 note G_, 10 note E_, 14 - ;tie +; tie note E_, 7 note A#, 3 note B_, 3 - ;tie +; tie note B_, 14 - ;musicf2 +; musicf2 note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 note G_, 13 - ;tie +; tie note G_, 14 - ;musicf3 +; musicf3 note G_, 7 note A_, 6 note A#, 3 note B_, 4 - ;tie +; tie note B_, 14 inc_octave note D_, 6 - ;tie +; tie note D_, 14 note C_, 13 dec_octave note B_, 14 - ;tie +; tie note B_, 7 note E_, 6 - ;tie +; tie note E_, 14 note G#, 3 - ;musicf2 +; musicf2 note A_, 10 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 - ;tie +; tie note A_, 13 note A_, 14 note G_, 7 @@ -457,29 +477,29 @@ Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) note A_, 7 note A_, 13 note F#, 14 - ;tie +; tie note F#, 13 note F#, 14 note F#, 13 - ;tie +; tie note F#, 14 note F#, 13 - ;musicf3 +; musicf3 note F#, 3 - ;musicf2 +; musicf2 note G_, 11 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 note G_, 13 - ;musicf3 +; musicf3 note F#, 14 - ;musicf2 +; musicf2 note G_, 7 note G_, 6 note A_, 7 @@ -487,323 +507,328 @@ Music_GRDuelTheme3_Ch2: ; 1f6517 (7d:6517) note B_, 7 note B_, 6 note F#, 14 - ;tie +; tie note F#, 13 note F#, 14 note F#, 13 - ;tie +; tie note F#, 14 note F#, 13 - ;musicf3 +; musicf3 note F#, 3 - ;musicf2 +; musicf2 note G_, 11 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 13 note G_, 14 - ;tie +; tie note G_, 13 sound_loop 0, .MainLoop Branch_1f672f: - ;musicf0 0 - ;musicef 2 - ;musicf1 87 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef 2 +; musicf1 87 +; musicf3 octave 3 note E_, 3 note F_, 3 vibrato 40, 3, 3 - ;musicf2 +; musicf2 note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 note F#, 13 - ;musicf3 +; musicf3 note F_, 3 note F#, 11 - ;tie +; tie note F#, 7 - ;musicf2 +; musicf2 note D_, 6 note D_, 14 dec_octave - ;musicf3 +; musicf3 note B_, 13 inc_octave note D#, 3 - ;musicf2 +; musicf2 note E_, 11 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 note E_, 14 - ;tie +; tie note E_, 13 - ;musicf3 +; musicf3 note F_, 3 - ;musicf2 +; musicf2 note F#, 11 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 note F#, 13 - ;musicf3 +; musicf3 note F#, 14 - ;tie +; tie note F#, 7 note G_, 13 - ;tie +; tie note G_, 7 - ;musicf2 +; musicf2 note A_, 7 note A_, 6 - ;musicf3 +; musicf3 note F_, 3 - ;musicf2 +; musicf2 note F#, 11 - ;tie +; tie note F#, 13 note F#, 14 vibrato 28, 3, 3 note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 note E_, 14 - ;tie +; tie note E_, 13 - ;musicf3 +; musicf3 note D#, 3 - ;musicf2 +; musicf2 note E_, 11 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 note E_, 14 - ;musicf3 +; musicf3 note F#, 13 note F#, 7 note G_, 14 note G_, 6 - ;musicf3 +; musicf3 note G#, 3 - ;musicf2 +; musicf2 note A_, 11 note A_, 7 - ;musicf3 +; musicf3 note G_, 6 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note F#, 7 note F#, 6 note E_, 14 note E_, 7 - ;musicf3 +; musicf3 note F#, 6 - ;tie +; tie note F#, 14 dec_octave - ;musicf2 +; musicf2 note B_, 7 note B_, 6 inc_octave note D_, 14 - ;tie +; tie note D_, 13 note D_, 14 - ;musicf3 +; musicf3 note F_, 3 - ;musicf2 +; musicf2 note F#, 10 - ;tie +; tie note F#, 14 note F#, 13 dec_octave note B_, 14 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 13 note B_, 14 - ;tie +; tie note B_, 13 - ;musicf3 +; musicf3 inc_octave note D#, 3 vibrato 11, 3, 3 - ;musicf2 +; musicf2 note E_, 11 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 note E_, 14 note F#, 13 note F#, 7 note G_, 14 note G_, 6 - ;musicf3 +; musicf3 note G#, 3 - ;musicf2 +; musicf2 note A_, 11 - ;tie +; tie note A_, 13 note A_, 14 - ;musicf3 +; musicf3 note A#, 3 note B_, 10 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 13 - ;musicf2 +; musicf2 note G_, 14 note G_, 13 - ;musicf3 +; musicf3 note G#, 3 - ;musicf2 +; musicf2 note A_, 11 - ;tie +; tie note A_, 13 note A_, 14 - ;musicf3 +; musicf3 note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;musicf2 +; musicf2 note G_, 14 note G_, 13 - ;musicf3 +; musicf3 note G#, 3 - ;musicf2 +; musicf2 note A_, 11 - ;tie +; tie note A_, 13 - ;tie +; tie note A_, 14 note A_, 13 note B_, 14 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 14 sound_ret -Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) - channel_volume 10 +Music_GRDuelTheme3_Ch1: .MainLoop - ;musicf0 27 - ;musicef 255 - ;musicdc 255 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicef -1 + stereo_panning TRUE, TRUE speed 1 - ;musicf1 80 +; musicf1 80 .Loop1 octave 2 note A_, 3 @@ -894,9 +919,9 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note D_, 3 rest 4 dec_octave - ;musicf3 +; musicf3 octave 1 - ;musicef 1 +; musicef 1 note G_, 3 rest 3 .Loop2 @@ -1369,8 +1394,11 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note F#, 3 rest 3 .Loop8 - ;musicf0 27 - ;musicf1 96 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 96 octave 2 note A_, 3 rest 4 @@ -1386,17 +1414,23 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note D_, 3 rest 4 dec_octave - ;musicf0 9 - ;musicef 254 - ;musicf1 64 - ;musicf2 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -2 +; musicf1 64 +; musicf2 octave 3 note B_, 3 note B_, 4 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 rest 13 octave 2 - ;musicf2 +; musicf2 note B_, 3 rest 4 inc_octave @@ -1420,8 +1454,11 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) rest 3 rest 3 sound_loop 7, .Loop8 - ;musicf0 27 - ;musicf1 96 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 96 octave 2 note A_, 3 rest 4 @@ -1437,69 +1474,84 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note D_, 3 rest 4 dec_octave - ;musicf0 9 - ;musicef 254 - ;musicf1 64 - ;musicf2 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -2 +; musicf1 64 +; musicf2 octave 3 note B_, 3 note B_, 4 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 rest 13 octave 2 - ;musicf2 +; musicf2 note B_, 3 rest 4 - ;musicf0 9 - ;musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf3 octave 2 note A_, 7 - ;musicf2 +; musicf2 note A#, 4 note A#, 3 note B_, 4 note B_, 2 - ;musicf3 +; musicf3 inc_octave note D_, 7 dec_octave - ;musicf2 +; musicf2 note B_, 4 note B_, 3 note A_, 4 note A_, 3 - ;musicf3 - ;musicf0 27 +; musicf3 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 1 note B_, 3 rest 3 octave 3 - ;musicf0 26 - ;musicef 1 - ;musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicef 1 +; musicf3 vibrato 0, 3, 3 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 rest 13 note D_, 14 - ;tie +; tie note D_, 4 rest 3 dec_octave @@ -1508,90 +1560,90 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note G_, 13 inc_octave note C#, 16 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 12 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 13 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 13 rest 7 sound_call Branch_1f6dd9 octave 3 - ;musicf3 +; musicf3 vibrato 0, 3, 3 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 rest 13 note D_, 14 - ;tie +; tie note D_, 4 rest 3 note D_, 6 - ;tie +; tie note D_, 11 rest 3 note D_, 13 note C#, 14 - ;tie +; tie note C#, 13 rest 14 note C#, 13 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 13 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 13 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 13 - ;tie +; tie note C#, 14 - ;tie +; tie note C#, 13 rest 7 sound_call Branch_1f6dd9 octave 3 note C_, 14 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 14 rest 14 note C_, 13 @@ -1601,7 +1653,7 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note C_, 14 rest 7 note C_, 6 - ;tie +; tie note C_, 11 rest 3 note C_, 7 @@ -1614,35 +1666,35 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note G_, 7 rest 6 note B_, 14 - ;tie +; tie note B_, 13 rest 14 inc_octave note D_, 13 - ;tie +; tie note D_, 14 rest 13 dec_octave note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 rest 7 sound_call Branch_1f6df4 octave 3 note C_, 14 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 13 rest 14 note D_, 13 @@ -1650,39 +1702,42 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note E_, 13 rest 6 note D#, 14 - ;tie +; tie note D#, 13 rest 14 note G_, 13 - ;tie +; tie note G_, 14 - ;tie +; tie note G_, 12 rest 1 note D#, 14 rest 13 note E_, 14 - ;tie +; tie note E_, 13 rest 14 dec_octave note B_, 13 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 13 inc_octave note E_, 14 rest 13 note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 rest 13 note D#, 7 - ;musicf0 9 - ;musicef 255 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -1 octave 2 note A_, 3 rest 4 @@ -1700,342 +1755,525 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) rest 3 note D#, 3 rest 3 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note G_, 14 - ;tie +; tie note G_, 7 note A_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 4 rest 3 - ;musicec 0 +; pitch_offset 0 sound_call Branch_1f6dbf - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note C_, 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 4 rest 3 rest 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note C#, 3 note D_, 11 dec_octave note B_, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note C_, 14 - ;tie +; tie note C_, 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 4 rest 3 - ;musicec 0 +; pitch_offset 0 sound_call Branch_1f6dbf - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note C_, 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 4 rest 3 rest 7 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note D_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note A_, 14 note B_, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note F#, 14 - ;tie +; tie note F#, 7 note E_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1f6dbf - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 dec_octave note A_, 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 rest 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 3 note G_, 11 note F#, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 dec_octave note A_, 14 - ;tie +; tie note A_, 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1f6dbf rest 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 rest 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 note G_, 5 note F#, 5 note D_, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 dec_octave note G_, 14 - ;tie +; tie note G_, 7 note A_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 4 rest 3 - ;musicec 0 +; pitch_offset 0 sound_call Branch_1f6dbf - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note E_, 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 4 rest 3 rest 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note C#, 3 note D_, 11 dec_octave note B_, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note E_, 14 - ;tie +; tie note E_, 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 4 rest 3 - ;musicec 0 +; pitch_offset 0 sound_call Branch_1f6dbf - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note G_, 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 4 rest 3 rest 7 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note F#, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note A_, 14 note B_, 13 - ;tie - ;musicf0 26 +; tie +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note D_, 14 - ;tie +; tie note D_, 7 note C_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1f6dbf - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note C_, 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 rest 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 3 note G_, 11 note F#, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note D_, 14 - ;tie +; tie note D_, 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 - ;musicec 2 +; pitch_offset 2 sound_call Branch_1f6dbf rest 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 rest 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 note G_, 5 note F#, 5 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note E_, 7 note D#, 6 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note C_, 14 - ;tie +; tie note C_, 7 dec_octave note A_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note C_, 4 rest 3 rest 7 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note E_, 13 note C_, 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note C_, 4 rest 3 rest 7 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note G_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 3 inc_octave note C_, 11 dec_octave note A_, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note E_, 14 - ;tie +; tie note E_, 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note E_, 4 rest 10 rest 13 rest 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note E_, 4 rest 3 rest 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 3 inc_octave note C_, 11 dec_octave note A_, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note G_, 14 - ;tie +; tie note G_, 7 note A_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note G_, 4 rest 3 rest 7 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note A_, 13 note G_, 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note G_, 4 rest 3 rest 7 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note C_, 6 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note B_, 3 inc_octave note C_, 11 dec_octave note A_, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note F#, 14 - ;tie +; tie note F#, 13 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note F#, 4 rest 10 rest 13 rest 7 - ;musicf0 28 +; preset 28 + volume_envelope 8, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note F#, 4 rest 3 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note E_, 7 rest 6 rest 7 note F#, 7 rest 13 - ;musicef 2 - ;musicf1 54 +; musicef 2 +; musicf1 54 note D_, 14 - ;tie +; tie note D_, 13 note D_, 14 note D_, 13 - ;tie +; tie note D_, 14 note D_, 13 note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 note E_, 13 - ;musicf3 +; musicf3 note D_, 14 - ;musicf2 +; musicf2 note E_, 7 note E_, 6 note F#, 7 @@ -2043,55 +2281,61 @@ Music_GRDuelTheme3_Ch1: ; 1f6849 (7d:6849) note G_, 7 note G_, 6 note D_, 14 - ;tie +; tie note D_, 13 note D_, 14 note D_, 13 - ;tie +; tie note D_, 14 note D_, 13 note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 note E_, 14 - ;tie +; tie note E_, 13 sound_loop 0, .MainLoop Branch_1f6dbf: octave 3 - ;musicf0 12 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 note G_, 4 - ;musicef 251 +; musicef -5 note G_, 3 - ;musicef 5 +; musicef 5 inc_octave note G_, 4 - ;musicef 251 +; musicef -5 note G_, 3 - ;musicef 5 +; musicef 5 dec_octave note G_, 3 - ;musicef 251 +; musicef -5 note G_, 3 - ;musicef 5 - ;musicec 0 +; musicef 5 +; pitch_offset 0 sound_ret Branch_1f6dd9: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note C#, 4 rest 3 @@ -2111,13 +2355,19 @@ Branch_1f6dd9: rest 3 note C#, 3 rest 3 - ;musicf0 26 - ;musicf3 - ;musicef 2 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 +; musicef 2 sound_ret Branch_1f6df4: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 1 note B_, 4 rest 3 @@ -2139,86 +2389,88 @@ Branch_1f6df4: dec_octave note B_, 3 rest 3 - ;musicf0 26 - ;musicf3 - ;musicef 2 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 +; musicef 2 sound_ret -Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) - channel_volume 1 +Music_GRDuelTheme3_Ch3: fade_wave 11 - ;musicdc 255 + stereo_panning TRUE, TRUE speed 1 channel_volume 1 - ;musice9 96 +; echo 96 .MainLoop octave 3 - ;musicec 244 - ;vibrato_type 16 +; pitch_offset 244 +; vibrato_type 16 vibrato 48, 3, 3 .Loop1 note D_, 14 - ;tie +; tie note D_, 7 - ;tie +; tie note E_, 6 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 7 channel_volume 3 note E_, 6 channel_volume 1 sound_loop 3, .Loop1 note D_, 14 - ;tie +; tie note D_, 7 - ;tie +; tie note E_, 6 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 channel_volume 3 note E_, 7 @@ -2236,65 +2488,65 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note G_, 6 .Loop2 note D_, 14 - ;tie +; tie note D_, 7 - ;tie +; tie note E_, 6 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 7 channel_volume 3 note E_, 6 channel_volume 1 note D_, 14 - ;tie +; tie note D_, 7 - ;tie +; tie note E_, 6 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 channel_volume 3 note E_, 7 @@ -2311,63 +2563,63 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 3 sound_loop 3, .Loop2 note D_, 14 - ;tie +; tie note D_, 7 - ;tie +; tie note E_, 6 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 - ;tie +; tie note E_, 14 - ;tie +; tie note E_, 13 vibrato 0, 3, 3 note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 7 channel_volume 3 note F_, 6 channel_volume 1 vibrato 48, 3, 3 note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 - ;tie +; tie note F#, 14 - ;tie +; tie note F#, 13 note B_, 14 - ;tie +; tie note B_, 13 - ;tie +; tie note B_, 14 - ;tie +; tie note B_, 13 channel_volume 3 note B_, 7 @@ -2384,21 +2636,21 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 3 .Loop3 note D_, 14 - ;tie +; tie note D_, 7 - ;musice8 4 +; cutoff 4 note E_, 6 - ;musice8 8 +; cutoff 8 note E_, 3 rest 4 inc_octave inc_octave inc_octave - ;musice9 64 - ;musice8 4 +; echo 64 +; cutoff 4 note E_, 7 - ;musice8 8 - ;musice9 96 +; cutoff 8 +; echo 96 dec_octave dec_octave note D_, 5 @@ -2423,21 +2675,21 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 3 rest 3 note D_, 14 - ;tie +; tie note D_, 7 - ;musice8 4 +; cutoff 4 note E_, 6 - ;musice8 8 +; cutoff 8 note E_, 3 rest 4 inc_octave inc_octave inc_octave - ;musice9 64 - ;musice8 4 +; echo 64 +; cutoff 4 note E_, 7 - ;musice8 8 - ;musice9 96 +; cutoff 8 +; echo 96 dec_octave dec_octave note D_, 5 @@ -2464,7 +2716,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 3 sound_loop 4, .Loop3 note D_, 14 - ;tie +; tie note D_, 7 note E_, 6 inc_octave @@ -2485,7 +2737,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 14 note D#, 13 note E_, 14 - ;tie +; tie note E_, 7 note E_, 6 inc_octave @@ -2508,7 +2760,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note B_, 13 inc_octave note D_, 14 - ;tie +; tie note D_, 7 note E_, 6 inc_octave @@ -2529,7 +2781,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 14 note D#, 13 note E_, 14 - ;tie +; tie note E_, 7 note E_, 6 inc_octave @@ -2557,7 +2809,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note F#, 4 rest 2 note D_, 14 - ;tie +; tie note D_, 7 note E_, 6 inc_octave @@ -2578,7 +2830,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 14 note D#, 13 note E_, 14 - ;tie +; tie note E_, 7 note E_, 6 inc_octave @@ -2601,7 +2853,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note B_, 13 inc_octave note D_, 14 - ;tie +; tie note D_, 7 note E_, 6 inc_octave @@ -2642,7 +2894,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note F#, 3 rest 3 note D_, 14 - ;tie +; tie note D_, 7 note E_, 6 inc_octave @@ -2663,7 +2915,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 14 note D#, 13 note E_, 14 - ;tie +; tie note E_, 7 note E_, 6 inc_octave @@ -2686,7 +2938,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note B_, 13 inc_octave note D_, 14 - ;tie +; tie note D_, 7 note E_, 6 inc_octave @@ -2707,7 +2959,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 14 note D#, 13 note E_, 14 - ;tie +; tie note E_, 7 note E_, 6 inc_octave @@ -2735,7 +2987,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note F#, 4 rest 2 note D_, 14 - ;tie +; tie note D_, 7 note E_, 6 inc_octave @@ -2756,7 +3008,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 14 note E_, 13 note F_, 14 - ;tie +; tie note F_, 7 note F_, 6 inc_octave @@ -2775,7 +3027,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D#, 14 note F_, 13 note F#, 14 - ;tie +; tie note F#, 7 note F#, 6 inc_octave @@ -2794,7 +3046,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note E_, 14 note C#, 13 note B_, 14 - ;tie +; tie note B_, 7 note B_, 6 inc_octave @@ -2808,7 +3060,7 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note B_, 4 rest 3 inc_octave - ;musice8 4 +; cutoff 4 note F#, 7 note A_, 7 inc_octave @@ -2818,16 +3070,16 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note A_, 7 inc_octave note C_, 6 - ;musice8 8 +; cutoff 8 octave 3 note C_, 14 note C_, 2 rest 5 note C_, 6 inc_octave - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 4 rest 3 @@ -2837,9 +3089,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note C_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 7 note C_, 3 @@ -2853,9 +3105,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note C_, 6 inc_octave - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 4 rest 3 @@ -2865,9 +3117,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note C_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 7 note C_, 3 @@ -2881,11 +3133,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note C_, 6 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 rest 3 @@ -2897,11 +3149,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note C_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 note C_, 3 @@ -2913,11 +3165,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note C_, 6 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 rest 3 @@ -2929,11 +3181,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note C_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 note C_, 3 @@ -2945,9 +3197,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note C_, 6 inc_octave - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 4 rest 3 @@ -2957,9 +3209,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note C_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 7 note C_, 3 @@ -2973,9 +3225,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note C_, 6 inc_octave - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 4 rest 3 @@ -2985,9 +3237,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note C_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 note G_, 7 - ;musice8 8 +; cutoff 8 dec_octave note G_, 7 note C_, 3 @@ -3001,11 +3253,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note C_, 6 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 rest 3 @@ -3017,11 +3269,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note C_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 note C_, 3 @@ -3033,11 +3285,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note C_, 6 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 rest 3 @@ -3049,11 +3301,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note C_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 note C_, 3 @@ -3065,9 +3317,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note D_, 6 inc_octave - ;musice8 4 +; cutoff 4 note A_, 7 - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 rest 3 @@ -3079,9 +3331,9 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 note A_, 7 - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 note F_, 3 @@ -3093,11 +3345,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note D_, 6 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note C_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 rest 3 @@ -3109,11 +3361,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note C_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 note F_, 3 @@ -3125,11 +3377,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note D_, 6 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note C_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 rest 3 @@ -3141,11 +3393,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note C_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 note F_, 3 @@ -3157,11 +3409,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) rest 5 note D_, 6 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 4 rest 3 @@ -3173,11 +3425,11 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 3 rest 4 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note D_, 7 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 note F_, 3 @@ -3185,90 +3437,90 @@ Music_GRDuelTheme3_Ch3: ; 1f6e11 (7d:6e11) note D_, 14 note D_, 13 sound_call Branch_1f72b7 - ;musice8 8 +; cutoff 8 note D_, 14 - ;musice8 5 +; cutoff 5 note D_, 7 - ;musice8 6 +; cutoff 6 note D_, 6 - ;musice8 8 +; cutoff 8 note D_, 7 inc_octave - ;musice8 6 +; cutoff 6 note D_, 7 note C_, 7 - ;musice8 6 +; cutoff 6 note D_, 6 dec_octave - ;musice8 8 +; cutoff 8 note A_, 7 - ;musice8 6 +; cutoff 6 note E_, 7 note C_, 7 - ;musice8 7 +; cutoff 7 note C#, 6 - ;musice8 8 +; cutoff 8 note D_, 14 - ;musice8 5 +; cutoff 5 note A_, 13 inc_octave note C_, 14 note D_, 13 sound_call Branch_1f72b7 note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 - ;tie +; tie note D_, 14 - ;tie +; tie note D_, 13 sound_loop 0, .MainLoop Branch_1f72b7: octave 3 - ;musice8 8 +; cutoff 8 note E_, 7 inc_octave - ;musice8 5 +; cutoff 5 note E_, 7 note D_, 7 note E_, 6 dec_octave note B_, 7 note D_, 7 - ;musice8 8 +; cutoff 8 note E_, 7 - ;musice8 6 +; cutoff 6 inc_octave note E_, 6 - ;musice8 5 +; cutoff 5 note D_, 7 note E_, 7 dec_octave note B_, 7 - ;musice8 6 +; cutoff 6 note E_, 6 sound_ret -Music_GRDuelTheme3_Ch4: ; 1f72d5 (7d:72d5) +Music_GRDuelTheme3_Ch4: toggle_noise 6 .MainLoop drum_speed 1 octave 1 - ;musicdc 255 + stereo_panning TRUE, TRUE drum_note 4, 7 drum_note 4, 7 drum_note 5, 7 @@ -4292,4 +4544,3 @@ Music_GRDuelTheme3_Ch4: ; 1f72d5 (7d:72d5) drum_note 2, 7 drum_note 2, 6 sound_loop 0, .MainLoop -; 0x1f76dc diff --git a/crysaudio/music/TCG2/groverworld.asm b/crysaudio/music/TCG2/groverworld.asm index 6f268f35..a41c6a3f 100644 --- a/crysaudio/music/TCG2/groverworld.asm +++ b/crysaudio/music/TCG2/groverworld.asm @@ -5,17 +5,16 @@ Music_GROverworld: channel 3, Music_GROverworld_Ch3 channel 4, Music_GROverworld_Ch4 -Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) - channel_volume 10 +Music_GROverworld_Ch2: .MainLoop sound_call Branch_1eae1e note A#, 16 - ;tie +; tie note A#, 9 note A#, 8 inc_octave note D_, 16 - ;tie +; tie note D_, 9 note D_, 8 note C_, 16 @@ -27,12 +26,14 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note F_, 6 speed 11 note G_, 12 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 2 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note B_, 9 note B_, 16 rest 8 @@ -50,12 +51,12 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) rest 1 sound_call Branch_1eae1e note A#, 16 - ;tie +; tie note A#, 9 note A#, 8 inc_octave note D_, 16 - ;tie +; tie note D_, 9 note D_, 8 note C_, 16 @@ -66,46 +67,49 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) inc_octave note C_, 16 note C_, 6 - ;musicf1 103 - ;musicf2 +; musicf1 103 +; musicf2 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 12 - ;tie +; tie note D_, 8 note D_, 16 - ;musicf0 14 - ;musicf1 70 - ;musicef 2 - ;musicf2 +; preset 14 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 70 +; musicef 2 +; musicf2 octave 3 note D_, 4 note D_, 4 note F_, 5 note F_, 3 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 3 note G_, 16 note A_, 7 note G_, 8 - ;tie +; tie note A_, 8 rest 2 note A#, 5 @@ -119,16 +123,16 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note F_, 5 note A_, 3 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 3 note D_, 16 note C_, 7 note D_, 8 - ;tie +; tie note C_, 8 rest 2 dec_octave @@ -138,19 +142,19 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note C_, 7 dec_octave note A#, 8 - ;tie +; tie inc_octave note C_, 8 rest 2 note F_, 5 note F_, 3 note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 16 - ;musicf1 54 - ;musicf2 +; musicf1 54 +; musicf2 note D#, 8 note D#, 8 dec_octave @@ -159,8 +163,8 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) inc_octave note D#, 8 note D#, 8 - ;musicf1 86 - ;musicf2 +; musicf1 86 +; musicf2 note D_, 8 note D_, 1 note D#, 7 @@ -170,59 +174,59 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note C_, 5 note D_, 3 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 3 note D_, 16 - ;musicf1 160 - ;musicf2 +; musicf1 160 +; musicf2 note D#, 16 note D#, 1 note F_, 15 note F_, 1 - ;musicf1 86 - ;musicf2 +; musicf1 86 +; musicf2 note G_, 7 note F_, 8 - ;tie +; tie note G_, 8 inc_octave rest 2 note D_, 5 note D_, 3 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 3 note D_, 16 note C_, 9 note D_, 8 note D_, 8 note C_, 8 - ;musicf1 86 - ;musicf2 +; musicf1 86 +; musicf2 note F_, 6 note D_, 5 - ;musicf3 +; musicf3 note C_, 11 note D_, 11 dec_octave - ;musicf1 86 - ;musicf2 +; musicf1 86 +; musicf2 note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 2 note A_, 16 note G_, 5 @@ -230,9 +234,9 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note F_, 5 note G_, 3 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 2 note G_, 16 note D_, 8 @@ -243,7 +247,7 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) note A_, 6 note A#, 16 note A#, 6 - ;musicf3 +; musicf3 speed 11 note A#, 6 note A_, 6 @@ -251,37 +255,40 @@ Music_GROverworld_Ch2: ; 1ead0d (7a:6d0d) speed 1 speed 11 note F_, 3 - ;tie +; tie speed 1 note F_, 1 - ;tie +; tie note F_, 16 sound_loop 0, .MainLoop Branch_1eae1e: - ;musicf0 13 +; preset 13 + volume_envelope 11, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE vibrato 33, 3, 3 - ;musicef 1 - ;musicf1 48 - ;musicf2 +; musicef 1 +; musicf1 48 +; musicf2 octave 3 note D_, 5 note D_, 3 note E_, 5 note E_, 3 note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 3 note F_, 16 note E_, 5 @@ -294,20 +301,20 @@ Branch_1eae1e: note D_, 3 note D_, 7 note E_, 8 - ;tie +; tie note D_, 8 rest 2 dec_octave note G_, 5 note G_, 3 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 3 note G_, 16 note G_, 5 @@ -315,20 +322,20 @@ Branch_1eae1e: note G_, 5 note G_, 3 note F_, 16 - ;tie +; tie note F_, 9 note F_, 8 note A_, 16 - ;tie +; tie note A_, 9 note A_, 8 inc_octave note C_, 16 - ;tie +; tie note C_, 9 note C_, 8 note E_, 16 - ;tie +; tie note E_, 9 note E_, 8 note D_, 7 @@ -341,13 +348,13 @@ Branch_1eae1e: note D_, 3 dec_octave note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 3 note G_, 16 inc_octave @@ -356,15 +363,15 @@ Branch_1eae1e: note E_, 5 note D_, 3 note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 16 - ;tie +; tie note F_, 3 note F_, 16 note E_, 5 @@ -377,21 +384,21 @@ Branch_1eae1e: note D_, 3 note D_, 7 note E_, 8 - ;tie +; tie note D_, 8 rest 2 dec_octave note G_, 5 note G_, 3 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 16 note G_, 16 - ;tie +; tie note G_, 3 note G_, 5 note G_, 3 @@ -400,17 +407,18 @@ Branch_1eae1e: sound_ret -Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) - channel_volume 10 +Music_GROverworld_Ch1: speed 1 rest 16 .MainLoop - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note C_, 9 note C_, 16 rest 8 @@ -559,27 +567,35 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note G_, 6 rest 16 rest 1 - ;musicf0 15 +; preset 15 + volume_envelope 9, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 - ;musicf1 48 - ;musicf2 +; cutoff 8 +; musicf1 48 +; musicf2 note B_, 5 note B_, 3 inc_octave note C_, 5 note C_, 3 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note C_, 8 note C_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 @@ -594,9 +610,11 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 inc_octave note C_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note C_, 6 note C_, 2 @@ -604,22 +622,30 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 2 note C_, 8 note C_, 1 - ;musicf3 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; musicf3 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note C_, 7 note C_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 @@ -630,27 +656,35 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 inc_octave note C_, 4 - ;musicf0 15 +; preset 15 + volume_envelope 9, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 - ;musicf1 48 - ;musicf2 +; cutoff 8 +; musicf1 48 +; musicf2 note A_, 5 note A_, 3 inc_octave note C_, 5 note C_, 3 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 2 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note B_, 8 note B_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 @@ -662,9 +696,11 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 4 note D_, 4 note B_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note B_, 6 note B_, 2 @@ -672,22 +708,30 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 2 note B_, 8 note B_, 1 - ;musicf3 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; musicf3 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note B_, 7 note B_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 @@ -695,27 +739,35 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 5 note D_, 4 note B_, 4 - ;musicf0 15 +; preset 15 + volume_envelope 9, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 - ;musicf1 48 - ;musicf2 +; cutoff 8 +; musicf1 48 +; musicf2 note B_, 5 note B_, 3 inc_octave note D_, 5 note D_, 3 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note C_, 8 note C_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 @@ -730,9 +782,11 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 inc_octave note C_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note F_, 6 note F_, 2 @@ -740,22 +794,30 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note F_, 2 note A_, 8 note A_, 1 - ;musicf3 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; musicf3 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note A_, 7 note A_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 @@ -766,24 +828,32 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 inc_octave note C_, 4 - ;musicf0 15 +; preset 15 + volume_envelope 9, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - fade_wave 8 - ;musicf1 48 - ;musicf2 +; cutoff 8 +; musicf1 48 +; musicf2 note C_, 8 note C_, 8 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 2 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note B_, 8 note B_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 @@ -795,9 +865,11 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 4 note D_, 4 note D_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note B_, 6 note B_, 2 @@ -805,22 +877,30 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 2 note B_, 8 note B_, 1 - ;musicf3 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; musicf3 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note B_, 7 note B_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 @@ -828,27 +908,35 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 5 note D_, 4 note B_, 4 - ;musicf0 15 +; preset 15 + volume_envelope 9, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 - ;musicf1 48 - ;musicf2 +; cutoff 8 +; musicf1 48 +; musicf2 note B_, 5 note B_, 3 inc_octave note C_, 5 note C_, 3 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note C_, 8 note C_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 @@ -863,9 +951,11 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 inc_octave note C_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note C_, 6 note C_, 2 @@ -873,22 +963,30 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 2 note C_, 8 note C_, 1 - ;musicf3 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; musicf3 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note C_, 7 note C_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note C_, 4 note C_, 4 @@ -899,27 +997,35 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 inc_octave note C_, 4 - ;musicf0 15 +; preset 15 + volume_envelope 9, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 - ;musicf1 48 - ;musicf2 +; cutoff 8 +; musicf1 48 +; musicf2 note A_, 5 note A_, 3 inc_octave note C_, 5 note C_, 3 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 2 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note B_, 8 note B_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 @@ -931,9 +1037,11 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 4 note D_, 4 note B_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note B_, 6 note B_, 2 @@ -941,22 +1049,30 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note B_, 2 note B_, 8 note B_, 1 - ;musicf3 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; musicf3 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note B_, 7 note B_, 1 - ;musicf0 23 - ;musicf1 32 - ;musicf2 +; preset 23 + volume_envelope 6, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 +; musicf2 octave 5 note D_, 4 note D_, 4 @@ -964,23 +1080,26 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D_, 5 note D_, 4 note B_, 4 - ;musicf0 15 +; preset 15 + volume_envelope 9, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 - ;musicf1 48 - ;musicf2 +; cutoff 8 +; musicf1 48 +; musicf2 note B_, 5 note B_, 3 inc_octave note C_, 5 note C_, 3 - ;musicef 254 +; musicef -2 note D_, 16 - ;tie +; tie note D_, 9 note D_, 8 note F_, 16 - ;tie +; tie note F_, 9 note F_, 8 note E_, 16 @@ -989,14 +1108,17 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 6 note E_, 16 note E_, 6 - ;musicf3 +; musicf3 speed 11 note G_, 6 note F#, 3 - ;musicef 2 +; musicef 2 speed 1 - ;musicf0 14 - ;musicef 254 +; preset 14 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicef -2 octave 2 note D_, 6 note D#, 6 @@ -1004,22 +1126,27 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note G_, 6 note A_, 5 note A#, 5 - ;musicef 2 - ;musicf0 11 +; musicef 2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note D_, 8 note D_, 1 - ;musicf0 12 - ;musicf1 71 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 2 - ;musicf3 +; musicf3 note G_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -1033,19 +1160,24 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note D_, 4 note G_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note D_, 6 note D_, 2 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note G_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note D_, 5 dec_octave @@ -1053,19 +1185,24 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note G_, 4 inc_octave note D_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note D_, 7 note D_, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note D_, 4 rest 4 - ;musicf2 +; musicf2 note G_, 5 note D_, 4 dec_octave @@ -1078,21 +1215,26 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note G_, 4 inc_octave note D_, 4 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note F_, 8 note F_, 1 - ;musicf0 12 - ;musicf1 71 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 3 - ;musicf3 +; musicf3 note D_, 4 rest 4 - ;musicf2 +; musicf2 note A_, 4 note D_, 4 note D_, 4 @@ -1104,36 +1246,46 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note A_, 4 inc_octave note D_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note D_, 6 note D_, 2 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 4 note D_, 4 rest 4 - ;musicf2 +; musicf2 note A_, 5 note D_, 4 note D_, 4 note A_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 2 note A_, 7 note A_, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note A_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note D_, 5 dec_octave @@ -1146,21 +1298,26 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note F_, 4 note D_, 4 note A_, 4 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 2 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note G#, 8 note G#, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 2 note F_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note C_, 4 dec_octave @@ -1174,19 +1331,24 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note C_, 4 note F_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note C_, 6 note C_, 2 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note F_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note C_, 5 dec_octave @@ -1194,18 +1356,23 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note F_, 4 inc_octave note C_, 4 - ;musicf0 11 - ;musicf1 70 - ;musicf2 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 +; musicf2 octave 3 note F_, 7 note F_, 1 - ;musicf0 12 - ;musicf1 71 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 3 note C_, 4 rest 4 - ;musicf2 +; musicf2 note F_, 5 note C_, 4 dec_octave @@ -1218,21 +1385,26 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note F_, 4 inc_octave note C_, 4 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 2 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note A#, 8 note A#, 1 - ;musicf0 12 - ;musicf1 71 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 octave 2 - ;musicf3 +; musicf3 note A#, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -1246,18 +1418,23 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note D_, 4 note F_, 4 - ;musicf0 11 - ;musicf1 70 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 octave 2 note A#, 6 note A#, 2 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note F_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note D_, 5 dec_octave @@ -1265,18 +1442,23 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note F_, 4 inc_octave note D_, 4 - ;musicf0 11 - ;musicf1 70 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 octave 2 note A#, 7 note A#, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note D_, 4 rest 4 - ;musicf2 +; musicf2 note F_, 5 note D_, 4 dec_octave @@ -1289,20 +1471,25 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note F_, 4 inc_octave note D_, 4 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 70 +; musicf1 70 note C_, 8 note C_, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note C_, 4 rest 4 - ;musicf2 +; musicf2 note G_, 4 note C_, 4 note C_, 4 @@ -1314,34 +1501,44 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note G_, 4 inc_octave note C_, 4 - ;musicf0 11 - ;musicf1 70 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 octave 3 note G_, 6 note G_, 2 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 4 note C_, 4 rest 4 - ;musicf2 +; musicf2 note G_, 5 note C_, 4 note C_, 4 note G_, 4 - ;musicf0 11 - ;musicf1 70 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 octave 3 note G_, 7 note G_, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note G_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note C_, 5 dec_octave @@ -1354,20 +1551,25 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note D#, 4 note C_, 4 note G_, 4 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 4 - ;musicf1 70 +; musicf1 70 note C_, 8 note C_, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note C_, 4 rest 4 - ;musicf2 +; musicf2 note F_, 4 note C_, 4 note C_, 4 @@ -1376,18 +1578,23 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note C_, 4 note F_, 4 note A_, 4 - ;musicf0 11 - ;musicf1 70 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 octave 3 note F_, 6 note F_, 2 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note A_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note F_, 5 dec_octave @@ -1395,18 +1602,23 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note A_, 4 inc_octave note F_, 4 - ;musicf0 11 - ;musicf1 70 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 octave 3 note C_, 7 note C_, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note F_, 4 rest 4 - ;musicf2 +; musicf2 note A_, 5 note F_, 4 note C_, 4 @@ -1417,20 +1629,25 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note A_, 4 inc_octave note F_, 4 - ;musicf0 11 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 3 - ;musicf1 70 +; musicf1 70 note D#, 8 note D#, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 2 note G_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note D_, 4 dec_octave @@ -1444,18 +1661,23 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) inc_octave note D_, 4 note G_, 4 - ;musicf0 11 - ;musicf1 70 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 octave 2 note A#, 6 note A#, 2 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note G_, 4 rest 4 - ;musicf2 +; musicf2 inc_octave note D_, 5 dec_octave @@ -1463,18 +1685,23 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note G_, 4 inc_octave note D_, 4 - ;musicf0 11 - ;musicf1 70 +; preset 11 + volume_envelope 9, 5 + duty_cycle 1 +; musicf1 70 octave 3 note D#, 7 note D#, 1 - ;musicf0 12 - ;musicf1 71 - ;musicf3 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 71 +; musicf3 octave 3 note D_, 4 rest 4 - ;musicf2 +; musicf2 note G_, 5 note D_, 4 dec_octave @@ -1487,362 +1714,364 @@ Music_GROverworld_Ch1: ; 1eaeaf (7a:6eaf) note G_, 4 inc_octave note D_, 4 - ;musicf0 14 +; preset 14 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf3 +; musicf3 speed 11 note F_, 12 note D#, 6 speed 11 note C_, 3 - ;tie +; tie speed 1 note C_, 1 - ;tie +; tie note C_, 16 rest 16 sound_loop 0, .MainLoop -Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) - channel_volume 1 - ;musicdc 17 +Music_GROverworld_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;musice8 1 - ;musice9 96 +; cutoff 1 +; echo 96 speed 1 rest 16 .MainLoop - ;musice8 1 +; cutoff 1 .Loop1 octave 2 note G_, 9 - ;tie +; tie note G_, 16 rest 8 rest 9 rest 8 - ;musice8 4 +; cutoff 4 note G_, 8 note G_, 8 - ;musice8 1 +; cutoff 1 note G_, 6 - ;tie +; tie note G_, 11 - ;musice8 4 +; cutoff 4 note G_, 16 - ;musice8 1 +; cutoff 1 rest 16 rest 1 rest 16 sound_loop 3, .Loop1 octave 2 note G_, 9 - ;tie +; tie note G_, 16 rest 8 rest 9 rest 8 - ;musice8 5 +; cutoff 5 note G_, 8 note G_, 8 - ;musice8 1 +; cutoff 1 note G_, 6 - ;tie +; tie note G_, 11 - ;musice8 4 +; cutoff 4 note G_, 16 rest 16 rest 1 - ;musice8 1 +; cutoff 1 note D_, 8 - ;tie +; tie note D_, 8 .Loop2 octave 2 note G_, 9 - ;tie +; tie note G_, 16 rest 8 rest 9 rest 8 - ;musice8 5 +; cutoff 5 note G_, 8 note G_, 8 - ;musice8 1 +; cutoff 1 note G_, 6 - ;tie +; tie note G_, 11 - ;musice8 4 +; cutoff 4 note G_, 16 - ;musice8 1 +; cutoff 1 rest 16 rest 1 rest 16 sound_loop 2, .Loop2 octave 2 note D#, 9 - ;tie +; tie note D#, 16 rest 8 rest 9 rest 8 - ;musice8 5 +; cutoff 5 note D#, 8 note D#, 8 - ;musice8 1 +; cutoff 1 note F_, 6 - ;tie +; tie note F_, 11 - ;musice8 4 +; cutoff 4 note F_, 16 rest 16 rest 1 - ;musice8 1 +; cutoff 1 note F_, 8 - ;tie +; tie note F_, 8 octave 2 note G_, 9 - ;tie +; tie note G_, 16 rest 8 rest 9 rest 8 - ;musice8 4 +; cutoff 4 note G_, 8 note G_, 8 - ;musice8 1 +; cutoff 1 note G_, 6 - ;tie +; tie note G_, 11 note G_, 8 - ;tie +; tie note G_, 8 rest 16 rest 1 rest 16 octave 2 note G_, 9 - ;tie +; tie note G_, 16 rest 8 rest 9 rest 8 - ;musice8 4 +; cutoff 4 note G_, 8 note G_, 8 - ;musice8 1 +; cutoff 1 note G_, 6 - ;tie +; tie note G_, 11 note G_, 8 - ;tie +; tie note G_, 8 rest 16 rest 1 note D_, 8 - ;tie +; tie note D_, 8 .Loop3 octave 2 note G_, 9 - ;tie +; tie note G_, 16 rest 8 rest 9 rest 8 - ;musice8 4 +; cutoff 4 note G_, 8 note G_, 8 - ;musice8 1 +; cutoff 1 note G_, 6 - ;tie +; tie note G_, 11 - ;musice8 4 +; cutoff 4 note G_, 16 - ;musice8 1 +; cutoff 1 rest 16 rest 1 rest 16 sound_loop 3, .Loop3 octave 2 note G_, 9 - ;tie +; tie note G_, 16 rest 8 rest 9 rest 8 - ;musice8 5 +; cutoff 5 note G_, 8 note G_, 8 - ;musice8 1 +; cutoff 1 note G_, 6 - ;tie +; tie note G_, 11 - ;musice8 4 +; cutoff 4 note G_, 16 rest 16 rest 1 - ;musice8 1 +; cutoff 1 note D_, 8 - ;tie +; tie note D_, 8 .Loop4 octave 2 note G_, 9 - ;tie +; tie note G_, 16 rest 8 rest 9 rest 8 - ;musice8 5 +; cutoff 5 note G_, 8 note G_, 8 - ;musice8 1 +; cutoff 1 note G_, 6 - ;tie +; tie note G_, 11 - ;musice8 4 +; cutoff 4 note G_, 16 - ;musice8 1 +; cutoff 1 rest 16 rest 1 rest 16 sound_loop 2, .Loop4 octave 2 note A#, 9 - ;tie +; tie note A#, 16 rest 8 rest 9 rest 8 - ;musice8 5 +; cutoff 5 note A#, 8 note A#, 8 inc_octave - ;musice8 1 +; cutoff 1 note C_, 6 - ;tie +; tie note C_, 11 - ;musice8 4 +; cutoff 4 note C_, 16 rest 16 rest 1 - ;musice8 1 +; cutoff 1 note C_, 8 - ;tie +; tie note C_, 8 - ;musice8 1 +; cutoff 1 speed 1 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 9 - ;tie +; tie note D_, 8 - ;musice8 4 +; cutoff 4 note D_, 9 dec_octave note A_, 8 - ;musice8 7 +; cutoff 7 note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 2 octave 2 - ;musice8 1 +; cutoff 1 note D#, 9 - ;tie +; tie note D#, 16 rest 8 rest 9 rest 8 note D#, 5 - ;tie +; tie note D#, 11 rest 16 rest 1 - ;musice8 8 +; cutoff 8 note D#, 5 - ;tie +; tie note D#, 11 - ;tie +; tie note D#, 16 - ;tie +; tie note D#, 1 - ;musice8 1 +; cutoff 1 note A_, 8 - ;tie +; tie note A_, 8 octave 2 note A#, 9 - ;tie +; tie note A#, 16 rest 8 rest 9 rest 8 note A#, 5 - ;tie +; tie note A#, 11 rest 16 rest 1 - ;musice8 8 +; cutoff 8 note A#, 5 - ;tie +; tie note A#, 11 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 1 - ;musice8 1 +; cutoff 1 note A#, 8 - ;tie +; tie note A#, 8 octave 2 note C#, 9 - ;tie +; tie note C#, 16 rest 8 rest 9 rest 8 note C#, 5 - ;tie +; tie note C#, 11 rest 16 rest 1 - ;musice8 8 +; cutoff 8 note C#, 5 - ;tie +; tie note C#, 11 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 1 - ;musice8 1 +; cutoff 1 note C#, 8 - ;tie +; tie note C#, 8 octave 2 note C_, 9 - ;tie +; tie note C_, 16 rest 8 rest 9 rest 8 note C_, 5 - ;tie +; tie note C_, 11 rest 9 inc_octave - ;musice8 5 +; cutoff 5 note G_, 8 inc_octave note C_, 8 @@ -1855,104 +2084,104 @@ Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) note A#, 8 note F_, 8 octave 2 - ;musice8 1 +; cutoff 1 note G#, 9 - ;tie +; tie note G#, 16 rest 8 rest 9 rest 8 note G#, 5 - ;tie +; tie note G#, 11 rest 16 rest 1 - ;musice8 8 +; cutoff 8 note G#, 5 - ;tie +; tie note G#, 11 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 1 - ;musice8 1 +; cutoff 1 note G#, 8 - ;tie +; tie note G#, 8 octave 2 note D_, 9 - ;tie +; tie note D_, 16 rest 8 rest 9 rest 8 note D_, 5 - ;tie +; tie note D_, 11 rest 16 rest 1 - ;musice8 8 +; cutoff 8 note D_, 5 - ;tie +; tie note D_, 11 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 1 - ;musice8 1 +; cutoff 1 note D_, 8 - ;tie +; tie note D_, 8 octave 2 note D#, 9 - ;tie +; tie note D#, 16 rest 8 rest 9 rest 8 note D#, 5 - ;tie +; tie note D#, 11 rest 16 rest 1 - ;musice8 8 +; cutoff 8 note D#, 5 - ;tie +; tie note D#, 11 - ;tie +; tie note D#, 16 - ;tie +; tie note D#, 1 - ;musice8 1 +; cutoff 1 note D#, 8 - ;tie +; tie note D#, 8 - ;musice8 8 - ;vibrato_type 5 +; cutoff 8 +; vibrato_type 5 vibrato 32, 3, 3 speed 11 note F_, 3 - ;tie +; tie note F_, 3 - ;tie +; tie note F_, 3 - ;tie +; tie speed 1 note F_, 16 - ;tie +; tie note A#, 4 - ;tie +; tie note B_, 4 - ;tie +; tie inc_octave note C_, 9 speed 11 note F_, 3 - ;tie +; tie note F_, 3 - ;tie +; tie note F_, 3 - ;tie +; tie speed 1 note F_, 16 rest 16 @@ -1961,7 +2190,7 @@ Music_GROverworld_Ch3: ; 1eb3d6 (7a:73d6) sound_ret -Music_GROverworld_Ch4: ; 1eb5e4 (7a:75e4) +Music_GROverworld_Ch4: toggle_noise 6 drum_speed 1 rest 16 @@ -1970,77 +2199,74 @@ Music_GROverworld_Ch4: ; 1eb5e4 (7a:75e4) drum_speed 1 .Loop1 drum_note 2, 9 - ;musicef 250 +; musicef -6 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 3, 6 drum_note 3, 5 drum_note 3, 5 - ;musicef 0 +; musicef 0 drum_note 2, 16 rest 1 drum_note 2, 16 - ;musicef 253 +; musicef -3 drum_note 3, 6 drum_note 3, 6 drum_note 3, 5 - ;musicef 0 +; musicef 0 drum_note 2, 16 - ;musicef 253 +; musicef -3 drum_note 2, 16 rest 1 - ;musicef 0 +; musicef 0 drum_note 2, 16 sound_loop 16, .Loop1 drum_note 2, 9 - ;musicef 250 +; musicef -6 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 3, 6 drum_note 3, 5 drum_note 3, 5 - ;musicef 0 +; musicef 0 drum_note 2, 16 rest 1 drum_note 2, 16 - ;musicef 253 +; musicef -3 drum_note 2, 9 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 16 drum_note 3, 6 - ;musicef 253 +; musicef -3 drum_note 3, 6 drum_note 3, 5 drum_note 3, 6 drum_note 3, 5 drum_note 3, 5 .Loop2 - ;musicef 0 +; musicef 0 drum_note 2, 9 - ;musicef 250 +; musicef -6 drum_note 2, 8 - ;musicef 253 +; musicef -3 drum_note 3, 6 drum_note 3, 5 drum_note 3, 5 - ;rept 2 - ;musicef 254 +; musicef -2 drum_note 2, 16 rest 1 - ;musicef 2 +; musicef 2 drum_note 2, 16 - ;--- - ;musicef 254 +; musicef -2 drum_note 2, 16 rest 1 - ;musicef 2 +; musicef 2 drum_note 2, 16 - ;endr - ;musicef 0 +; musicef 0 drum_note 2, 16 rest 1 - ;musicef 253 +; musicef -3 drum_note 3, 6 drum_note 3, 5 drum_note 3, 5 @@ -2049,4 +2275,3 @@ Music_GROverworld_Ch4: ; 1eb5e4 (7a:75e4) drum_note 6, 12 rest 12 sound_loop 0, .MainLoop -; 0x1eb64e diff --git a/crysaudio/music/TCG2/herecomesgr.asm b/crysaudio/music/TCG2/herecomesgr.asm index 6651fab5..a75f3893 100644 --- a/crysaudio/music/TCG2/herecomesgr.asm +++ b/crysaudio/music/TCG2/herecomesgr.asm @@ -5,13 +5,15 @@ Music_HereComesGR: channel 3, Music_HereComesGR_Ch3 channel 4, Music_HereComesGR_Ch4 -Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) - channel_volume 10 +Music_HereComesGR_Ch2: .MainLoop speed 1 - ;musicdc 17 - ;musicf0 8 - ;musicf1 55 + stereo_panning TRUE, TRUE +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 55 octave 2 sound_call Branch_1ea5ed rest 10 @@ -21,32 +23,32 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 16 rest 10 note C_, 6 - ;tie +; tie note C#, 5 - ;tie +; tie note D_, 10 note F_, 16 - ;tie +; tie note F_, 5 sound_call Branch_1ea5ed rest 10 rest 11 rest 10 note B_, 6 - ;tie +; tie inc_octave note C_, 5 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 15 note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie dec_octave note B_, 5 - ;tie +; tie note A#, 5 octave 2 sound_call Branch_1ea5ed @@ -57,12 +59,12 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 16 rest 10 note C_, 6 - ;tie +; tie note C#, 5 - ;tie +; tie note D_, 10 note F_, 16 - ;tie +; tie note F_, 5 sound_call Branch_1ea5ed rest 10 @@ -70,10 +72,10 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) rest 10 note G_, 11 inc_octave - ;musicf2 +; musicf2 note G_, 5 note G_, 5 - ;musicf3 +; musicf3 note C#, 11 note C_, 5 note C#, 5 @@ -82,172 +84,217 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) note A#, 10 note F_, 11 note G#, 10 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5ed - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - fade_wave 4 - ;musicf2 +; cutoff 4 +; musicf2 note D_, 10 note D_, 11 - ;musicf3 +; musicf3 rest 10 rest 11 - ;musicef 252 +; musicef -4 note C_, 10 - ;musicef 4 - ;musicf1 55 - ;musicf3 - ;musicf0 8 +; musicef 4 +; musicf1 55 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 1 - fade_wave 8 - ;musicef 254 +; cutoff 8 +; musicef -2 .Loop1 note G_, 3 rest 1 note G_, 2 rest 1 sound_loop 3, .Loop1 - ;musicef 2 +; musicef 2 inc_octave note C#, 6 - ;tie +; tie note D_, 5 - ;tie +; tie note D_, 10 note F_, 16 - ;tie +; tie note F_, 5 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5ed - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - fade_wave 4 - ;musicf1 55 - ;musicf2 +; cutoff 4 +; musicf1 55 +; musicf2 note D_, 10 note D_, 11 - ;musicf3 +; musicf3 rest 10 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note B_, 6 - ;tie +; tie inc_octave note C_, 5 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 15 note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie dec_octave note B_, 5 - ;tie +; tie note A#, 5 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5ed - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - fade_wave 4 - ;musicf2 +; cutoff 4 +; musicf2 note D_, 10 note D_, 11 - ;musicf3 +; musicf3 rest 10 rest 11 - ;musicef 252 +; musicef -4 note C_, 10 - ;musicef 4 - ;musicf1 55 - ;musicf3 - ;musicf0 8 +; musicef 4 +; musicf1 55 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 1 - fade_wave 8 - ;musicef 254 +; cutoff 8 +; musicef -2 .Loop2 note G_, 3 rest 1 note G_, 2 rest 1 sound_loop 3, .Loop2 - ;musicef 2 +; musicef 2 inc_octave note C#, 6 - ;tie +; tie note D_, 5 - ;tie +; tie note D_, 10 note F_, 16 - ;tie +; tie note F_, 5 octave 2 - ;musicf1 55 +; musicf1 55 sound_call Branch_1ea5ed - ;musicf0 9 - fade_wave 4 - fade_wave 4 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; cutoff 4 +; cutoff 4 octave 4 - ;musicf2 +; musicf2 note G_, 10 note G_, 11 - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 octave 3 - ;musicf2 +; musicf2 note G_, 10 note G_, 11 - ;musicf3 +; musicf3 note C_, 5 note C#, 5 - ;musicf2 +; musicf2 note D_, 6 note D_, 5 note F_, 5 note F_, 5 - ;musicf3 +; musicf3 note C_, 6 note C#, 5 note C_, 10 sound_call Branch_1ea90c sound_call Branch_1ea66f - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5ed - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - ;musicf2 +; musicf2 note D_, 4 note D_, 6 - ;musicf3 - ;musicf0 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note D_, 11 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - fade_wave 8 +; cutoff 8 note C#, 10 - ;musicf2 +; musicf2 note D_, 6 note D_, 5 note F_, 5 note F_, 5 - ;musicf3 +; musicf3 note C_, 4 note C#, 3 note C_, 4 dec_octave - ;musicf2 +; musicf2 note A#, 5 note A#, 5 - ;musicf3 +; musicf3 inc_octave note C_, 11 dec_octave @@ -258,71 +305,89 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) note A#, 4 sound_call Branch_1ea90c sound_call Branch_1ea66f - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5ed - ;musicf0 9 - ;musicf1 16 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf1 16 octave 4 - fade_wave 6 - ;musicf3 +; cutoff 6 +; musicf3 note F_, 10 rest 11 note G_, 10 rest 11 - ;musicef 1 - ;musicf1 55 - fade_wave 8 - ;musicf3 +; musicef 1 +; musicf1 55 +; cutoff 8 +; musicf3 octave 3 note C#, 10 - ;musicf2 +; musicf2 note D_, 6 note D_, 5 note F_, 5 note F_, 5 - ;musicf3 +; musicf3 note C_, 3 note C#, 4 note C_, 4 dec_octave - ;musicf2 +; musicf2 note A#, 5 note A#, 5 - ;musicf3 +; musicf3 sound_call Branch_1ea90c sound_call Branch_1ea66f - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5ed - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - ;musicf2 +; musicf2 note D_, 4 note D_, 6 - ;musicf3 - ;musicf0 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note D_, 11 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - fade_wave 8 +; cutoff 8 note C#, 10 - ;musicf2 +; musicf2 note D_, 6 note D_, 5 note F_, 5 note D_, 5 - ;musicf3 +; musicf3 note C_, 4 note C#, 3 note C_, 4 dec_octave - ;musicf2 +; musicf2 note A#, 5 note A#, 5 - ;musicf3 +; musicf3 inc_octave note C_, 11 dec_octave @@ -333,40 +398,46 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) note A#, 4 sound_call Branch_1ea90c note C_, 11 - ;tie +; tie dec_octave - ;musice4 15 +; frequency_offset 15 note B_, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note B_, 2 - ;tie - ;musice4 13 +; tie +; frequency_offset 13 note A#, 1 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A#, 1 - ;tie - ;musice4 14 +; tie +; frequency_offset 14 note A_, 1 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 1 - ;tie - ;musice4 17 +; tie +; frequency_offset 17 note G#, 1 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note G#, 1 - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 octave 2 note A#, 16 - ;tie +; tie note A#, 5 - ;musicf0 9 - fade_wave 8 - ;musicef 2 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; cutoff 8 +; musicef 2 octave 1 note A_, 3 note B_, 3 @@ -380,47 +451,56 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) note A_, 2 sound_call Branch_1ea603 octave 3 - ;musicf2 +; musicf2 note C_, 8 note C_, 3 - ;musicf3 +; musicf3 note C_, 10 dec_octave note A#, 11 inc_octave - ;musicf2 +; musicf2 note C_, 10 note C_, 11 - ;musicf3 - ;musicf0 9 +; musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - ;musicf2 +; musicf2 note C_, 4 note C_, 6 - ;musicf3 - ;musicf0 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 1 - fade_wave 8 - ;musicf1 103 +; cutoff 8 +; musicf1 103 note G_, 5 rest 6 note G_, 5 rest 5 - ;musicf3 - ;musicf0 9 - ;musicef 252 - ;musicf1 39 +; musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -4 +; musicf1 39 octave 3 - fade_wave 4 +; cutoff 4 rest 11 - ;musicf2 +; musicf2 note F_, 10 note F_, 11 - ;musicf3 - fade_wave 8 - ;musicef 4 - ;musicf1 55 - ;musicf3 +; musicf3 +; cutoff 8 +; musicef 4 +; musicf1 55 +; musicf3 note C_, 2 rest 1 note C_, 1 @@ -428,163 +508,205 @@ Music_HereComesGR_Ch2: ; 1ea368 (7a:6368) note C_, 2 rest 1 note C_, 1 - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 octave 2 note B_, 6 - ;tie +; tie inc_octave note C_, 5 - ;tie +; tie note C#, 16 - ;tie +; tie note C#, 5 - ;tie +; tie note C#, 10 sound_call Branch_1ea603 - ;musicf1 55 - ;musicf3 - ;musicf0 8 +; musicf1 55 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 note C_, 11 - ;musicf0 9 - fade_wave 8 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; cutoff 8 inc_octave - ;musicf2 +; musicf2 note F_, 4 note F_, 6 dec_octave - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 note C_, 5 note C_, 6 dec_octave - ;musicf3 +; musicf3 note B_, 10 inc_octave inc_octave - ;musicf0 9 - fade_wave 8 - ;musicf2 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; cutoff 8 +; musicf2 note E_, 4 note E_, 7 dec_octave dec_octave - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 note B_, 5 note B_, 5 - ;musicf3 +; musicf3 note A#, 11 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave inc_octave - fade_wave 8 - ;musicf2 +; cutoff 8 +; musicf2 note D#, 4 note D#, 6 dec_octave dec_octave - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note A#, 5 note A#, 6 - ;musicf3 +; musicf3 note G#, 10 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave inc_octave - fade_wave 8 - ;musicf2 +; cutoff 8 +; musicf2 note C#, 4 note C#, 7 dec_octave dec_octave - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 note G#, 5 note G#, 5 - ;musicf3 +; musicf3 note F_, 16 - ;tie +; tie note F_, 5 note F#, 16 - ;tie +; tie note F#, 5 sound_loop 0, .MainLoop Branch_1ea5ed: - ;musicf2 +; musicf2 note G_, 8 note G_, 3 - ;musicf3 +; musicf3 note G_, 10 note F_, 11 - ;musicf2 +; musicf2 note G_, 10 note G_, 11 - ;musicf3 +; musicf3 sound_ret Branch_1ea5f8: - ;musicf2 +; musicf2 note D_, 8 note D_, 3 - ;musicf3 +; musicf3 note D_, 10 note C_, 11 - ;musicf2 +; musicf2 note D_, 10 note D_, 11 - ;musicf3 +; musicf3 sound_ret Branch_1ea603: - ;musicf0 8 - ;musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 3 - ;musicf2 +; musicf2 note C_, 8 note C_, 3 - ;musicf3 +; musicf3 note C_, 10 dec_octave note A#, 11 - ;musicf2 +; musicf2 inc_octave note C_, 10 note C_, 11 - ;musicf3 - ;musicf0 9 +; musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - fade_wave 8 - ;musicf2 +; cutoff 8 +; musicf2 note C_, 4 note C_, 6 - ;musicf3 - ;musicf0 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 1 - fade_wave 8 - ;musicf1 55 +; cutoff 8 +; musicf1 55 note G_, 5 rest 6 note G_, 5 rest 5 - ;musicf3 - ;musicf0 9 - ;musicef 252 - ;musicf1 39 +; musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -4 +; musicf1 39 octave 3 - fade_wave 4 +; cutoff 4 rest 11 - ;musicf2 +; musicf2 note F_, 10 note F_, 11 - fade_wave 8 - ;musicf3 - ;musicef 4 - ;musicf1 55 - ;musicf3 +; cutoff 8 +; musicf3 +; musicef 4 +; musicf1 55 +; musicf3 note C_, 2 rest 1 note C_, 1 @@ -592,27 +714,33 @@ Branch_1ea603: note C_, 2 rest 1 note C_, 1 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 note A#, 16 - ;tie +; tie note A#, 5 note B_, 16 - ;tie +; tie note B_, 5 sound_ret Branch_1ea64e: - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 octave 3 - ;musicef 255 +; musicef -1 note G#, 16 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 10 - ;musicef 1 +; musicef 1 note G#, 2 rest 4 note G#, 1 @@ -622,42 +750,47 @@ Branch_1ea64e: note G#, 1 rest 3 note G_, 16 - ;tie +; tie note G_, 5 - ;tie +; tie note G_, 11 - ;tie +; tie note F#, 5 - ;tie +; tie note F_, 5 dec_octave sound_ret Branch_1ea66f: - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 octave 2 note E_, 16 - ;tie +; tie note E_, 5 note F_, 16 - ;tie +; tie note F_, 5 note F#, 16 - ;tie +; tie note F#, 5 sound_ret sound_ret -Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) - channel_volume 10 +Music_HereComesGR_Ch1: .MainLoop speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE octave 2 - ;musicf0 8 - ;musicf1 55 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 55 octave 2 sound_call Branch_1ea5f8 rest 10 @@ -676,18 +809,18 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 11 rest 10 note F#, 6 - ;tie +; tie note G_, 5 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 15 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note F#, 5 - ;tie +; tie note F_, 5 octave 2 sound_call Branch_1ea5f8 @@ -718,131 +851,167 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note F_, 10 note C_, 11 note C#, 10 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5f8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - fade_wave 4 - ;musicf2 +; cutoff 4 +; musicf2 note C_, 10 note C_, 11 - ;musicf3 +; musicf3 rest 10 rest 11 dec_octave - ;musicef 252 - fade_wave 4 +; musicef -4 +; cutoff 4 note A#, 10 - ;musicef 4 - ;musicf1 55 - ;musicf3 - ;musicf0 9 +; musicef 4 +; musicf1 55 +; musicf3 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 1 - fade_wave 8 - ;musicef 254 +; cutoff 8 +; musicef -2 .Loop1 note D_, 2 rest 1 note D_, 2 rest 2 sound_loop 3, .Loop1 - ;musicef 2 +; musicef 2 rest 11 rest 10 rest 11 rest 10 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5f8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - fade_wave 4 - ;musicf2 +; cutoff 4 +; musicf2 note C_, 10 note C_, 11 rest 10 - ;musicf3 - ;musicf0 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note F#, 6 - ;tie +; tie note G_, 5 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 15 note G_, 16 - ;tie +; tie note G_, 16 - ;tie +; tie note F#, 5 - ;tie +; tie note F_, 5 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 sound_call Branch_1ea5f8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - fade_wave 4 - ;musicf2 +; cutoff 4 +; musicf2 note C_, 10 note C_, 11 - ;musicf3 +; musicf3 rest 10 rest 11 dec_octave - ;musicef 252 +; musicef -4 note A#, 10 - ;musicef 4 - ;musicf1 55 - ;musicf3 - ;musicf0 8 +; musicef 4 +; musicf1 55 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 1 - fade_wave 8 - ;musicef 254 +; cutoff 8 +; musicef -2 .Loop2 note D_, 2 rest 1 note D_, 2 rest 2 sound_loop 3, .Loop2 - ;musicef 2 +; musicef 2 rest 11 rest 10 rest 11 rest 10 octave 2 sound_call Branch_1ea5f8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 4 - fade_wave 4 - ;musicf2 +; cutoff 4 +; musicf2 note C_, 10 note C_, 11 - ;musicf3 - ;musicf0 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - fade_wave 8 +; cutoff 8 note C_, 10 dec_octave rest 11 note G_, 5 note G#, 5 - ;musicf2 +; musicf2 note A_, 6 note A_, 5 inc_octave note C_, 5 note C_, 5 - ;musicf3 +; musicf3 dec_octave note G_, 6 note G#, 5 note G_, 10 - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 octave 2 note A#, 11 note G_, 10 @@ -859,21 +1028,27 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 5 octave 4 rest 11 - fade_wave 4 +; cutoff 4 note C_, 10 rest 11 dec_octave - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note F_, 10 sound_call Branch_1ea5ed rest 10 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note G_, 16 - ;tie +; tie note G_, 5 sound_call Branch_1ea64e rest 16 @@ -887,33 +1062,42 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 16 rest 5 rest 11 - ;musicf0 9 - fade_wave 6 - ;musicf1 16 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; cutoff 6 +; musicf1 16 octave 3 - ;musicf3 +; musicf3 note A#, 10 rest 11 inc_octave note C_, 10 rest 11 - ;musicf3 - ;musicf0 8 - ;musicf1 55 - fade_wave 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 55 +; cutoff 8 octave 2 note G_, 10 note F_, 11 - ;musicf2 +; musicf2 note G_, 10 note G_, 11 - ;musicf3 +; musicf3 note D_, 10 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note G_, 11 - ;tie +; tie note G_, 10 sound_call Branch_1ea64e rest 16 @@ -928,39 +1112,45 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) rest 5 octave 4 rest 11 - fade_wave 4 +; cutoff 4 note C_, 10 rest 11 dec_octave - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note F_, 10 - ;musicf2 +; musicf2 note G_, 8 note G_, 3 - ;musicf3 +; musicf3 note G_, 10 note F_, 11 - ;musicf2 +; musicf2 note G_, 10 note G_, 11 rest 10 - ;musicf3 - ;musicf0 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note G_, 16 - ;tie +; tie note G_, 5 - ;musicef 255 +; musicef -1 octave 3 note G#, 16 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 10 - ;musicef 1 +; musicef 1 note G#, 2 rest 4 note G#, 1 @@ -970,22 +1160,24 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note G#, 1 rest 3 note G_, 16 - ;tie +; tie note G_, 5 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 5 dec_octave note F_, 6 - ;tie +; tie note F#, 5 - ;tie +; tie note G_, 10 - ;musicf0 10 - ;musicf1 144 - ;musicef 253 - ;musicf2 +; preset 10 + volume_envelope 13, 0 + duty_cycle 3 +; musicf1 144 +; musicef -3 +; musicf2 octave 3 note G_, 3 note G_, 3 @@ -1013,34 +1205,43 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) inc_octave note F#, 3 note C#, 2 - ;musicf1 55 +; musicf1 55 sound_call Branch_1ea8d3 octave 2 sound_call Branch_1ea5ed - ;musicf0 9 - fade_wave 4 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; cutoff 4 octave 3 - ;musicf2 +; musicf2 note A#, 10 note A#, 11 - ;musicf3 - ;musicf0 8 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 1 - fade_wave 8 +; cutoff 8 rest 10 - ;musicf0 9 - ;musicef 252 - ;musicf1 55 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -4 +; musicf1 55 octave 2 - fade_wave 4 +; cutoff 4 rest 11 note A#, 10 note A#, 11 - ;musicf3 - fade_wave 8 - ;musicef 4 - ;musicf1 55 - ;musicf3 +; musicf3 +; cutoff 8 +; musicef 4 +; musicf1 55 +; musicf3 note C_, 2 rest 1 note C_, 2 @@ -1048,116 +1249,152 @@ Music_HereComesGR_Ch1: ; 1ea67f (7a:667f) note C_, 2 rest 1 note C_, 1 - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 octave 2 note F#, 6 - ;tie +; tie note G_, 5 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 5 - ;tie +; tie note G#, 10 sound_call Branch_1ea8d3 - ;musicf1 55 - ;musicf3 - ;musicf0 8 +; musicf1 55 +; musicf3 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 note G_, 11 - ;musicf0 9 - fade_wave 8 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; cutoff 8 inc_octave inc_octave - ;musicf2 +; musicf2 note C_, 4 note C_, 6 dec_octave dec_octave - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 note G_, 5 note G_, 6 - ;musicf3 +; musicf3 note F#, 10 inc_octave - ;musicf0 9 - fade_wave 8 - ;musicf2 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; cutoff 8 +; musicf2 note B_, 4 note B_, 7 dec_octave - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 note F#, 5 note F#, 5 - ;musicf3 +; musicf3 note F_, 11 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave - fade_wave 8 - ;musicf2 +; cutoff 8 +; musicf2 note A#, 4 note A#, 6 dec_octave - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 - fade_wave 8 +; cutoff 8 note F_, 5 note F_, 6 - ;musicf3 +; musicf3 note D#, 10 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave - fade_wave 8 - ;musicf2 +; cutoff 8 +; musicf2 note G#, 4 note G#, 7 dec_octave - ;musicf0 8 - fade_wave 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; cutoff 8 note D#, 5 note D#, 5 - ;musicf3 +; musicf3 note C_, 16 - ;tie +; tie note C_, 5 note C#, 16 - ;tie +; tie note C#, 5 sound_loop 0, .MainLoop Branch_1ea8d3: - ;musicf0 8 - ;musicdc 17 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE octave 2 - ;musicf1 55 - ;musicf2 +; musicf1 55 +; musicf2 note G_, 8 note G_, 3 - ;musicf3 +; musicf3 note G_, 10 note F_, 11 - ;musicf2 +; musicf2 note G_, 10 note G_, 11 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 - fade_wave 4 +; cutoff 4 note A#, 10 note A#, 11 - ;musicf3 +; musicf3 rest 10 - ;musicef 252 +; musicef -4 octave 2 - fade_wave 4 +; cutoff 4 rest 11 note A#, 10 rest 11 - fade_wave 8 - ;musicef 4 - ;musicf1 55 - ;musicf3 +; cutoff 8 +; musicef 4 +; musicf1 55 +; musicf3 note G_, 2 rest 1 note G_, 2 @@ -1165,18 +1402,24 @@ Branch_1ea8d3: note G_, 2 rest 1 note G_, 1 - ;musicf0 8 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 2 note F_, 16 - ;tie +; tie note F_, 5 note F#, 16 - ;tie +; tie note F#, 5 sound_ret Branch_1ea90c: - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 vibrato 11, 3, 3 octave 1 note A_, 4 @@ -1190,9 +1433,9 @@ Branch_1ea90c: note F_, 2 note G_, 2 note A#, 10 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 16 dec_octave note C_, 4 @@ -1207,22 +1450,21 @@ Branch_1ea90c: note B_, 2 inc_octave note C_, 11 - ;tie +; tie note C_, 10 - ;tie +; tie note C_, 11 - ;tie +; tie note C_, 10 sound_ret -Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) - channel_volume 1 +Music_HereComesGR_Ch3: speed 1 fade_wave 11 channel_volume 1 - ;musice9 128 - ;musicdc 17 +; echo 128 + stereo_panning TRUE, TRUE .MainLoop octave 5 octave 2 @@ -1238,12 +1480,12 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 16 rest 10 note C_, 5 - ;tie +; tie note C#, 6 - ;tie +; tie note D_, 10 note F_, 16 - ;tie +; tie note F_, 5 note G_, 8 rest 3 @@ -1254,16 +1496,16 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 16 rest 10 note G#, 6 - ;tie +; tie note A_, 5 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 15 note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 10 note G_, 8 rest 3 @@ -1277,12 +1519,12 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 16 rest 10 note C_, 5 - ;tie +; tie note C#, 6 - ;tie +; tie note D_, 10 note F_, 16 - ;tie +; tie note F_, 5 note G_, 8 rest 3 @@ -1296,9 +1538,9 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note D_, 11 inc_octave channel_volume 2 - ;musice8 8 +; cutoff 8 note C_, 10 - ;musice8 8 +; cutoff 8 channel_volume 1 dec_octave note C#, 11 @@ -1319,30 +1561,30 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note G_, 10 rest 11 octave 5 - ;musice8 4 +; cutoff 4 note G_, 10 channel_volume 3 note G_, 11 - ;musice8 8 +; cutoff 8 octave 2 channel_volume 2 note F_, 10 note G_, 11 octave 5 - ;musice8 4 +; cutoff 4 note F_, 10 - ;musice8 8 +; cutoff 8 octave 2 channel_volume 1 rest 10 rest 11 note C_, 5 - ;tie +; tie note C#, 6 - ;tie +; tie note D_, 10 note F_, 16 - ;tie +; tie note F_, 5 channel_volume 1 octave 2 @@ -1353,25 +1595,25 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note G_, 10 rest 11 octave 5 - ;musice8 4 +; cutoff 4 note G_, 10 channel_volume 3 note G_, 11 - ;musice8 8 +; cutoff 8 channel_volume 1 octave 2 rest 10 note G#, 6 - ;tie +; tie note A_, 5 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 15 note A_, 16 - ;tie +; tie note A_, 16 - ;tie +; tie note A_, 10 channel_volume 1 octave 2 @@ -1382,30 +1624,30 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note G_, 10 rest 11 octave 5 - ;musice8 4 +; cutoff 4 note G_, 10 channel_volume 3 note G_, 11 - ;musice8 8 +; cutoff 8 octave 2 channel_volume 2 note F_, 10 note G_, 11 octave 5 - ;musice8 4 +; cutoff 4 note F_, 10 - ;musice8 8 +; cutoff 8 channel_volume 1 octave 2 rest 10 rest 11 note C_, 5 - ;tie +; tie note C#, 6 - ;tie +; tie note D_, 10 note F_, 16 - ;tie +; tie note F_, 5 note G_, 8 rest 3 @@ -1435,13 +1677,13 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) note G_, 5 rest 5 note E_, 16 - ;tie +; tie note E_, 5 note F_, 16 - ;tie +; tie note F_, 5 note F#, 16 - ;tie +; tie note F#, 5 note G_, 8 rest 3 @@ -1466,28 +1708,28 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 11 octave 2 note G#, 5 - ;tie +; tie note A_, 5 inc_octave note C_, 11 note D_, 5 rest 5 note F#, 6 - ;tie +; tie note G_, 5 note A#, 10 inc_octave note C_, 6 - ;tie +; tie note C_, 5 - ;tie +; tie dec_octave note B_, 5 - ;tie +; tie note A#, 5 octave 2 note D_, 16 - ;tie +; tie note D_, 16 inc_octave note D_, 8 @@ -1495,11 +1737,11 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 11 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note F_, 10 channel_volume 3 note F_, 11 - ;musice8 8 +; cutoff 8 dec_octave dec_octave channel_volume 2 @@ -1515,14 +1757,14 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 7 channel_volume 1 note C_, 16 - ;tie +; tie note C_, 5 note C#, 16 - ;tie +; tie note C#, 5 octave 2 note D_, 16 - ;tie +; tie note D_, 16 inc_octave note D_, 8 @@ -1530,11 +1772,11 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 11 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note F_, 10 channel_volume 3 note F_, 11 - ;musice8 8 +; cutoff 8 dec_octave dec_octave channel_volume 2 @@ -1550,15 +1792,15 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 7 channel_volume 1 note C#, 6 - ;tie +; tie note D_, 5 - ;tie +; tie note D#, 16 - ;tie +; tie note D#, 15 octave 2 note D_, 16 - ;tie +; tie note D_, 16 inc_octave note D_, 8 @@ -1566,11 +1808,11 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 11 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note F_, 10 channel_volume 3 note F_, 11 - ;musice8 8 +; cutoff 8 dec_octave dec_octave channel_volume 2 @@ -1586,46 +1828,46 @@ Music_HereComesGR_Ch3: ; 1ea934 (7a:6934) rest 7 channel_volume 1 note C_, 16 - ;tie +; tie note C_, 5 note C#, 16 - ;tie +; tie note C#, 5 note D_, 16 - ;tie +; tie note D_, 5 note D_, 2 rest 9 note C#, 16 - ;tie +; tie note C#, 5 note C#, 2 rest 8 note C_, 16 - ;tie +; tie note C_, 5 rest 11 note G#, 2 - ;tie +; tie note A_, 3 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 10 note F_, 16 - ;tie +; tie note F_, 5 note F#, 16 - ;tie +; tie note F#, 5 sound_loop 0, .MainLoop Branch_1eaaf6: - ;vibrato_type 1 +; vibrato_type 1 vibrato 11, 3, 3 octave 2 note A#, 11 - ;tie +; tie note A#, 7 rest 3 note A#, 2 @@ -1639,9 +1881,9 @@ Branch_1eaaf6: note G#, 5 rest 5 note G#, 6 - ;tie +; tie note A_, 5 - ;tie +; tie note A_, 10 rest 11 inc_octave @@ -1651,10 +1893,10 @@ Branch_1eaaf6: note A_, 11 note E_, 10 note F_, 16 - ;tie +; tie note F_, 5 note F#, 16 - ;tie +; tie note F#, 5 channel_volume 1 octave 2 @@ -1665,11 +1907,11 @@ Branch_1eaaf6: note G_, 10 rest 11 octave 5 - ;musice8 4 +; cutoff 4 note G_, 10 channel_volume 3 note G_, 11 - ;musice8 8 +; cutoff 8 octave 2 channel_volume 1 rest 10 @@ -1681,7 +1923,7 @@ Branch_1eaaf6: note F_, 11 note G_, 10 note A#, 11 - ;tie +; tie note A#, 7 rest 3 note A#, 2 @@ -1695,15 +1937,15 @@ Branch_1eaaf6: note B_, 5 rest 5 note A#, 6 - ;tie +; tie note B_, 5 - ;tie +; tie inc_octave note C_, 10 sound_ret -Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) +Music_HereComesGR_Ch4: toggle_noise 6 .MainLoop drum_speed 1 @@ -1718,11 +1960,11 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 2, 10 drum_note 4, 11 - ;musicef 253 +; musicef -3 drum_note 2, 3 - ;musicef 255 +; musicef -1 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 4 sound_call Branch_1eacf7 drum_note 4, 11 @@ -1731,7 +1973,7 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 1, 7 drum_note 1, 7 drum_note 2, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 2, 10 @@ -1760,12 +2002,12 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 3 drum_note 2, 3 drum_note 1, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 1, 10 drum_note 2, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 1, 5 @@ -1793,9 +2035,9 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 1, 10 drum_note 4, 11 drum_note 1, 4 - ;musicef 254 +; musicef -2 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 3 drum_note 1, 11 drum_note 1, 10 @@ -1824,7 +2066,7 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 1, 10 drum_note 5, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 2, 10 @@ -1842,27 +2084,27 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 5, 10 drum_note 1, 11 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 1, 11 drum_note 2, 10 drum_note 5, 11 - ;musicef 253 +; musicef -3 drum_note 2, 5 - ;musicef 254 +; musicef -2 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 11 drum_note 2, 10 drum_note 1, 11 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 3 drum_note 1, 11 drum_note 4, 10 @@ -1872,7 +2114,7 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 1, 10 drum_note 2, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 2, 10 @@ -1884,7 +2126,7 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 2, 10 drum_note 1, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 1, 10 @@ -1909,7 +2151,7 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 1, 10 drum_note 5, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 2, 10 @@ -1927,27 +2169,27 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 5, 10 drum_note 1, 11 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 3 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 1, 11 drum_note 2, 10 drum_note 5, 11 - ;musicef 253 +; musicef -3 drum_note 2, 5 - ;musicef 254 +; musicef -2 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 11 drum_note 2, 10 drum_note 1, 11 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 3 drum_note 1, 11 drum_note 4, 10 @@ -1957,7 +2199,7 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 1, 10 drum_note 2, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 2, 10 @@ -1968,12 +2210,12 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 5 drum_note 2, 5 drum_note 2, 11 - ;musicef 253 +; musicef -3 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 5 drum_note 1, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 1, 4 @@ -1986,11 +2228,11 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 4, 11 drum_note 1, 10 drum_note 5, 11 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 3 drum_note 2, 11 drum_note 2, 10 @@ -1998,7 +2240,7 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 5 drum_note 2, 5 drum_note 1, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 1, 4 @@ -2013,19 +2255,19 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 5, 11 drum_note 1, 5 drum_note 1, 5 - ;musicef 1 +; musicef 1 drum_speed 2 drum_note 8, 15 drum_speed 1 rest 1 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 3 drum_note 1, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 1, 4 @@ -2038,11 +2280,11 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 4, 11 drum_note 1, 10 drum_note 5, 11 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 3 drum_note 2, 11 drum_note 4, 5 @@ -2064,27 +2306,27 @@ Music_HereComesGR_Ch4: ; 1eab4d (7a:6b4d) drum_note 2, 11 drum_note 4, 5 drum_note 2, 5 - ;musicef 254 +; musicef -2 drum_note 2, 4 - ;musicef 253 +; musicef -3 drum_note 2, 4 drum_note 2, 3 - ;musicef 254 +; musicef -2 drum_note 2, 4 - ;musicef 255 +; musicef -1 drum_note 2, 3 - ;musicef 0 +; musicef 0 drum_note 2, 3 sound_loop 0, .MainLoop Branch_1eacf7: drum_note 1, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 1, 10 drum_note 2, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 1, 10 @@ -2097,9 +2339,8 @@ Branch_1ead02: drum_note 1, 5 drum_note 1, 5 drum_note 2, 16 - ;tie +; tie rest 5 drum_note 4, 11 drum_note 2, 10 sound_ret -; 0x1ead0d diff --git a/crysaudio/music/TCG2/imakuni2.asm b/crysaudio/music/TCG2/imakuni2.asm index faf3f644..e948099b 100644 --- a/crysaudio/music/TCG2/imakuni2.asm +++ b/crysaudio/music/TCG2/imakuni2.asm @@ -5,19 +5,27 @@ Music_Imakuni2: channel 3, Music_Imakuni2_Ch3 channel 4, Music_Imakuni2_Ch4 -Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) - channel_volume 10 +Music_Imakuni2_Ch2: .MainLoop - ;musicf0 31 - ;musicf3 - ;musicdc 255 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicf3 + stereo_panning TRUE, TRUE speed 1 octave 2 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave note A_, 3 inc_octave @@ -26,23 +34,29 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note A_, 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 rest 5 rest 12 dec_octave - ;musicef 254 +; musicef -2 note E_, 5 rest 11 inc_octave rest 9 rest 8 - ;musicef 254 +; musicef -2 note C_, 16 note C#, 5 rest 12 @@ -50,7 +64,10 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note E_, 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 @@ -60,7 +77,10 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave note A_, 3 inc_octave @@ -69,45 +89,57 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note A_, 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 rest 5 rest 12 dec_octave - ;musicef 254 +; musicef -2 note E_, 5 rest 11 rest 9 sound_call Branch_1f3762 rest 8 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 octave 2 note E_, 16 note G_, 16 - ;tie +; tie note G_, 5 - ;tie - ;musice4 19 +; tie +; frequency_offset 19 note G_, 4 - ;tie - ;musice4 3 +; tie +; frequency_offset 3 note G#, 4 - ;tie - ;musice4 27 +; tie +; frequency_offset 27 note G#, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 2 octave 2 note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave note A_, 3 inc_octave @@ -116,23 +148,29 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note A_, 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 rest 5 rest 12 dec_octave - ;musicef 254 +; musicef -2 note E_, 5 rest 11 inc_octave rest 9 rest 8 - ;musicef 254 +; musicef -2 note C_, 16 note C#, 5 rest 12 @@ -140,7 +178,10 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note E_, 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 @@ -150,7 +191,10 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave note A_, 3 inc_octave @@ -159,17 +203,26 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note A_, 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 rest 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note G_, 16 note A_, 9 inc_octave @@ -178,14 +231,20 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) rest 8 octave 3 rest 16 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note D#, 9 - ;tie +; tie note E_, 8 - ;tie +; tie note E_, 16 - ;musicf0 18 - ;vibrato_type 17 +; preset 18 + volume_envelope 7, -4 + duty_cycle 2 + vibrato 1, 3, 3 +; vibrato_type 17 vibrato 1, 3, 3 octave 4 note D#, 5 @@ -195,7 +254,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note E_, 3 note D#, 2 note C_, 9 - ;tie +; tie note C_, 8 note C#, 16 note E_, 5 @@ -213,7 +272,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note F#, 5 rest 11 note G_, 9 - ;tie +; tie note G_, 16 note F#, 3 note G_, 3 @@ -223,73 +282,79 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note D#, 5 rest 11 note E_, 9 - ;tie +; tie note E_, 8 note C#, 5 rest 11 dec_octave note A_, 5 rest 12 - channel_volume 9 + volume_envelope 9, 0 note G_, 16 - ;tie +; tie note G_, 9 - ;tie +; tie note G_, 8 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 - ;tie - ;musice4 254 +; tie +; frequency_offset -2 note G_, 5 - ;tie - ;musice4 252 +; tie +; frequency_offset -4 note G_, 4 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note G_, 4 - ;tie - ;musice4 248 +; tie +; frequency_offset -8 note G_, 4 - ;tie - ;musice4 255 +; tie +; frequency_offset -1 note F#, 4 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note F#, 4 - ;tie - ;musice4 247 +; tie +; frequency_offset -9 note F#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 1 rest 9 sound_call Branch_1f3762 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 rest 8 octave 2 note E_, 16 note G_, 9 - ;tie +; tie note G_, 8 - ;tie +; tie note G_, 5 - ;tie - ;musice4 19 +; tie +; frequency_offset 19 note G_, 4 - ;tie - ;musice4 3 +; tie +; frequency_offset 3 note G#, 4 - ;tie - ;musice4 27 +; tie +; frequency_offset 27 note G#, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 1 - ;musicf0 18 - ;vibrato_type 17 +; preset 18 + volume_envelope 7, -4 + duty_cycle 2 + vibrato 1, 3, 3 +; vibrato_type 17 vibrato 1, 3, 3 octave 4 note D#, 5 @@ -299,7 +364,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note E_, 3 note D#, 2 note C_, 9 - ;tie +; tie note C_, 8 note C#, 16 note E_, 5 @@ -317,7 +382,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note F#, 5 rest 11 note G_, 9 - ;tie +; tie note G_, 16 note F#, 3 note G_, 3 @@ -327,7 +392,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note D#, 5 rest 11 note E_, 9 - ;tie +; tie note E_, 8 dec_octave note A_, 5 @@ -335,41 +400,44 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) inc_octave note A_, 5 rest 12 - channel_volume 8 + volume_envelope 8, 0 note G_, 16 - ;tie +; tie note G_, 9 - ;tie +; tie note G_, 8 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 - ;tie - ;musice4 254 +; tie +; frequency_offset -2 note G_, 5 - ;tie - ;musice4 252 +; tie +; frequency_offset -4 note G_, 4 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note G_, 4 - ;tie - ;musice4 248 +; tie +; frequency_offset -8 note G_, 4 - ;tie - ;musice4 255 +; tie +; frequency_offset -1 note F#, 4 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note F#, 4 - ;tie - ;musice4 247 +; tie +; frequency_offset -9 note F#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 1 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note A_, 9 inc_octave @@ -387,22 +455,28 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note A_, 5 rest 4 rest 8 - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 rest 8 - ;musicef 251 +; musicef -5 note A_, 8 - ;musicef 2 +; musicef 2 note G#, 9 - ;musicef 2 +; musicef 2 note A_, 8 - ;musicef 2 +; musicef 2 inc_octave note E_, 8 note F_, 8 - ;musicef 0 - ;musicf0 18 - ;vibrato_type 17 +; musicef 0 +; preset 18 + volume_envelope 7, -4 + duty_cycle 2 + vibrato 1, 3, 3 +; vibrato_type 17 vibrato 1, 3, 3 octave 4 note F#, 5 @@ -412,7 +486,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note D_, 3 note F#, 2 note D_, 9 - ;tie +; tie note D_, 8 dec_octave note A#, 16 @@ -432,7 +506,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note G#, 5 rest 11 note A_, 9 - ;tie +; tie note A_, 16 note G#, 3 note A_, 3 @@ -442,62 +516,68 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note F_, 5 rest 11 note F#, 9 - ;tie +; tie note F#, 8 note D_, 5 rest 11 dec_octave note A#, 5 rest 12 - channel_volume 9 + volume_envelope 9, 0 note G#, 16 - ;tie +; tie note G#, 9 - ;tie +; tie note G#, 8 - ;tie +; tie note G#, 16 - ;tie +; tie note G#, 5 - ;tie - ;musice4 254 +; tie +; frequency_offset -2 note G#, 4 - ;tie - ;musice4 252 +; tie +; frequency_offset -4 note G#, 4 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note G#, 4 - ;tie - ;musice4 248 +; tie +; frequency_offset -8 note G#, 4 - ;tie - ;musice4 255 +; tie +; frequency_offset -1 note G_, 4 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note G_, 4 - ;tie - ;musice4 247 +; tie +; frequency_offset -9 note G_, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F#, 1 rest 9 - ;musicec 5 +; pitch_offset 5 sound_call Branch_1f3762 - ;musicec 0 +; pitch_offset 0 rest 8 rest 16 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 note D#, 9 - ;tie +; tie note E_, 8 - ;tie +; tie note E_, 16 - ;musicf0 18 - ;vibrato_type 17 +; preset 18 + volume_envelope 7, -4 + duty_cycle 2 + vibrato 1, 3, 3 +; vibrato_type 17 vibrato 1, 3, 3 octave 4 note D#, 5 @@ -507,7 +587,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note E_, 3 note D#, 2 note C_, 9 - ;tie +; tie note C_, 8 note C#, 16 note E_, 5 @@ -525,7 +605,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note F#, 5 rest 11 note G_, 9 - ;tie +; tie note G_, 16 note F#, 3 note G_, 3 @@ -535,7 +615,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note D#, 5 rest 11 note E_, 9 - ;tie +; tie note E_, 8 dec_octave note A_, 5 @@ -543,45 +623,51 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) inc_octave note A_, 5 rest 12 - channel_volume 8 + volume_envelope 8, 0 note G_, 16 - ;tie +; tie note G_, 9 - ;tie +; tie note G_, 8 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 4 - ;tie - ;musice4 254 +; tie +; frequency_offset -2 note G_, 5 - ;tie - ;musice4 252 +; tie +; frequency_offset -4 note G_, 4 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note G_, 4 - ;tie - ;musice4 248 +; tie +; frequency_offset -8 note G_, 4 - ;tie - ;musice4 255 +; tie +; frequency_offset -1 note F#, 4 - ;tie - ;musice4 250 +; tie +; frequency_offset -6 note F#, 4 - ;tie - ;musice4 247 +; tie +; frequency_offset -9 note F#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note F_, 1 octave 2 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note A_, 9 inc_octave - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note C#, 5 rest 3 rest 16 @@ -598,9 +684,12 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) rest 4 rest 8 rest 16 - ;musicf0 8 - ;musice4 0 - ;musicef 2 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; frequency_offset 0 +; musicef 2 octave 3 note B_, 5 note A_, 4 @@ -614,13 +703,13 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note B_, 4 inc_octave note D#, 5 - ;tie +; tie note E_, 4 note G#, 8 note B_, 8 inc_octave note D_, 8 - ;tie +; tie note D_, 9 note C#, 8 dec_octave @@ -641,13 +730,13 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note D_, 4 dec_octave note C#, 5 - ;tie +; tie note D_, 4 note F#, 8 note A_, 8 inc_octave note C_, 8 - ;tie +; tie note C_, 9 dec_octave note B_, 8 @@ -674,13 +763,13 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) note C_, 4 dec_octave note D#, 5 - ;tie +; tie note E_, 4 note G#, 8 note B_, 8 inc_octave note D_, 8 - ;tie +; tie note D_, 9 note C#, 8 dec_octave @@ -691,7 +780,7 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) inc_octave note C_, 8 note D#, 8 - ;tie +; tie note D#, 9 note D_, 8 note C_, 8 @@ -723,34 +812,40 @@ Music_Imakuni2_Ch2: ; 1f3411 (7c:7411) .Loop1 note E_, 5 rest 6 - ;musicef 253 +; musicef -3 sound_loop 3, .Loop1 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note G_, 16 - ;tie +; tie note G_, 5 - ;tie - ;musice4 19 +; tie +; frequency_offset 19 note G_, 4 - ;tie - ;musice4 3 +; tie +; frequency_offset 3 note G#, 4 - ;tie - ;musice4 27 +; tie +; frequency_offset 27 note G#, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 2 sound_loop 0, .MainLoop Branch_1f3762: - ;musicf0 9 - ;musicf1 101 - ;musicf3 - ;musicdc 255 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf1 101 +; musicf3 + stereo_panning TRUE, TRUE speed 1 - ;musicef 255 +; musicef -1 octave 4 note C#, 5 rest 3 @@ -766,15 +861,17 @@ Branch_1f3762: sound_ret -Music_Imakuni2_Ch1: ; 1f377a (7c:777a) - channel_volume 10 +Music_Imakuni2_Ch1: .MainLoop - ;musicf0 9 - ;musicf1 103 - ;musicf3 - ;musicdc 255 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicf1 103 +; musicf3 + stereo_panning TRUE, TRUE speed 1 - ;musicef 255 +; musicef -1 octave 4 rest 9 rest 8 @@ -791,12 +888,12 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) dec_octave rest 9 rest 8 - ;musicef 254 +; musicef -2 note D#, 5 rest 11 rest 9 rest 8 - ;musicef 254 +; musicef -2 note G#, 16 note A_, 5 rest 12 @@ -809,7 +906,7 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) rest 8 rest 8 rest 8 - ;musicef 4 +; musicef 4 inc_octave rest 9 rest 8 @@ -826,10 +923,10 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) dec_octave rest 9 rest 8 - ;musicef 254 +; musicef -2 note D#, 5 rest 11 - ;musicef 2 +; musicef 2 inc_octave inc_octave rest 9 @@ -866,12 +963,12 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) dec_octave rest 9 rest 8 - ;musicef 254 +; musicef -2 note D#, 5 rest 11 rest 9 rest 8 - ;musicef 254 +; musicef -2 note G#, 16 note A_, 5 rest 12 @@ -884,7 +981,7 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) rest 8 rest 8 rest 8 - ;musicef 4 +; musicef 4 inc_octave rest 9 rest 8 @@ -901,10 +998,10 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) dec_octave rest 9 rest 8 - ;musicef 254 +; musicef -2 note E_, 5 rest 11 - ;musicef 2 +; musicef 2 inc_octave inc_octave rest 9 @@ -923,40 +1020,58 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) dec_octave rest 16 note G_, 9 - ;tie +; tie note G#, 8 - ;tie +; tie note G#, 16 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 octave 2 note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 rest 12 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 - ;musicf0 31 - ;musicef 254 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicef -2 note C#, 2 rest 15 - ;musicef 2 +; musicef 2 dec_octave note E_, 5 rest 11 note A_, 9 inc_octave - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note C#, 5 rest 3 rest 16 @@ -975,72 +1090,105 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) rest 4 rest 8 sound_call Branch_1f3a58 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 octave 2 note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 rest 12 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 - ;musicf0 31 - ;musicef 254 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicef -2 note C#, 2 rest 15 - ;musicef 2 +; musicef 2 dec_octave note E_, 5 rest 11 rest 9 - ;musicec 255 +; pitch_offset 255 sound_call Branch_1f3762 - ;musicec 0 +; pitch_offset 0 rest 8 rest 16 rest 9 rest 8 rest 16 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 octave 2 note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 rest 12 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 - ;musicf0 31 - ;musicef 254 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicef -2 note C#, 2 rest 15 - ;musicef 2 +; musicef 2 dec_octave note E_, 5 rest 11 note A_, 9 inc_octave - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note C#, 5 rest 3 rest 16 @@ -1059,35 +1207,53 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) rest 4 rest 8 sound_call Branch_1f3a58 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 octave 2 note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 rest 12 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 - ;musicf0 31 - ;musicef 254 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicef -2 note C#, 2 rest 15 - ;musicef 2 +; musicef 2 dec_octave note E_, 5 rest 11 - ;musicf0 9 - ;musicef 255 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 +; musicef -1 rest 9 inc_octave rest 5 @@ -1105,12 +1271,18 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) dec_octave note A_, 8 sound_call Branch_1f3a58 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 octave 3 note D_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note D_, 3 note F#, 3 note A_, 2 @@ -1118,22 +1290,34 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) note D_, 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note A#, 16 note B_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note A_, 5 rest 11 - ;musicf0 31 - ;musicef 254 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicef -2 note F#, 2 rest 15 - ;musicef 2 +; musicef 2 note C#, 5 rest 11 note D_, 9 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note F#, 5 rest 3 rest 16 @@ -1152,10 +1336,13 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) note D_, 5 rest 4 rest 8 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1f3a58 - ;musicec 0 - ;musicf0 9 +; pitch_offset 0 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 3 rest 9 rest 8 @@ -1167,62 +1354,92 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) note D_, 5 rest 12 dec_octave - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note A#, 16 note B_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note A_, 5 rest 11 - ;musicf0 31 - ;musicef 254 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicef -2 note F#, 2 rest 15 - ;musicef 2 +; musicef 2 note C#, 5 rest 11 rest 9 - ;musicec 6 +; pitch_offset 6 sound_call Branch_1f3762 - ;musicec 0 +; pitch_offset 0 rest 8 rest 16 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 octave 2 note G_, 9 - ;tie +; tie note G#, 8 - ;tie +; tie note G#, 16 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 octave 2 note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 rest 12 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 - ;musicf0 31 - ;musicef 254 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicef -2 note C#, 2 rest 15 - ;musicef 2 +; musicef 2 dec_octave note E_, 5 rest 11 note A_, 9 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 inc_octave note C#, 5 rest 3 @@ -1242,34 +1459,52 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) rest 4 rest 8 sound_call Branch_1f3a58 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 octave 2 note A_, 9 rest 8 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note A_, 3 inc_octave note C#, 3 note E_, 2 note A_, 5 rest 12 - ;musicf0 31 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 note F#, 16 note G_, 9 rest 8 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 note E_, 5 rest 11 - ;musicf0 31 - ;musicef 254 +; preset 31 + volume_envelope 7, 0 + duty_cycle 1 + vibrato 0, 3, 3 +; musicef -2 note C#, 2 rest 15 - ;musicef 2 +; musicef 2 dec_octave note E_, 5 rest 11 - ;musicf0 9 +; preset 9 + volume_envelope 9, 0 + duty_cycle 1 + vibrato 11, 3, 3 rest 9 inc_octave note C_, 5 @@ -1291,11 +1526,11 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) rest 8 inc_octave note C_, 9 - ;tie +; tie note C_, 8 note D_, 8 rest 8 - ;vibrato_type 5 +; vibrato_type 5 vibrato 1, 3, 3 octave 3 note E_, 9 @@ -1371,23 +1606,26 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) note C_, 8 dec_octave note F_, 8 - channel_volume 4 + volume_envelope 3, -4 note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 2 - ;musicf0 8 - ;musicef 2 - ;musice4 0 +; preset 8 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicef 2 +; frequency_offset 0 .Loop1 note B_, 5 rest 6 - ;musicef 253 +; musicef -3 sound_loop 3, .Loop1 note B_, 5 rest 6 @@ -1398,31 +1636,33 @@ Music_Imakuni2_Ch1: ; 1f377a (7c:777a) sound_loop 0, .MainLoop Branch_1f3a58: - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 - ;musicef 251 +; musicef -5 note C_, 8 - ;musicef 2 +; musicef 2 note C#, 8 - ;musicef 2 +; musicef 2 note C_, 9 - ;musicef 2 +; musicef 2 note C#, 8 note C_, 8 note C#, 8 - ;musicef 0 +; musicef 0 sound_ret -Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) - channel_volume 1 +Music_Imakuni2_Ch3: speed 1 fade_wave 11 - ;musicdc 255 + stereo_panning TRUE, TRUE channel_volume 1 - ;musice9 96 +; echo 96 .MainLoop - ;musice8 8 +; cutoff 8 octave 2 note A_, 9 rest 16 @@ -1476,19 +1716,19 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note E_, 8 rest 8 note G_, 16 - ;tie +; tie note G_, 5 - ;tie - ;musice4 38 +; tie +; frequency_offset 38 note G_, 4 - ;tie - ;musice4 6 +; tie +; frequency_offset 6 note G#, 4 - ;tie - ;musice4 52 +; tie +; frequency_offset 52 note G#, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 2 note A_, 9 rest 16 @@ -1540,9 +1780,9 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) octave 2 channel_volume 1 note A_, 9 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 8 note A_, 9 rest 16 @@ -1589,7 +1829,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note E_, 5 rest 11 note G_, 9 - ;tie +; tie note G_, 8 note G#, 16 note A_, 9 @@ -1625,21 +1865,21 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note E_, 8 rest 8 note G_, 9 - ;tie +; tie note G_, 8 - ;tie +; tie note G_, 4 - ;tie - ;musice4 38 +; tie +; frequency_offset 38 note G_, 4 - ;tie - ;musice4 6 +; tie +; frequency_offset 6 note G#, 4 - ;tie - ;musice4 52 +; tie +; frequency_offset 52 note G#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 1 note A_, 9 rest 16 @@ -1686,7 +1926,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note E_, 5 rest 11 note G_, 9 - ;tie +; tie note G_, 8 note G#, 16 note A_, 9 @@ -1735,21 +1975,21 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 11 inc_octave note C_, 9 - ;tie +; tie note C_, 8 - ;tie +; tie note C_, 4 - ;tie - ;musice4 28 +; tie +; frequency_offset 28 note C_, 4 - ;tie - ;musice4 8 +; tie +; frequency_offset 8 note C#, 4 - ;tie - ;musice4 37 +; tie +; frequency_offset 37 note C#, 3 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note D_, 1 note D_, 9 rest 16 @@ -1796,7 +2036,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 11 inc_octave note C_, 9 - ;tie +; tie note C_, 8 note C#, 16 note D_, 9 @@ -1821,17 +2061,17 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) dec_octave note C#, 16 note D_, 9 - ;musicec 7 +; pitch_offset 7 sound_call Branch_1f3d18 - ;musicec 0 +; pitch_offset 0 octave 2 channel_volume 1 rest 16 rest 8 note A_, 9 - ;tie +; tie note A#, 16 - ;tie +; tie note A#, 8 note A_, 9 rest 16 @@ -1878,7 +2118,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) note E_, 5 rest 11 note G_, 9 - ;tie +; tie note G_, 8 note G#, 16 note A_, 9 @@ -1924,13 +2164,13 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 8 inc_octave note C_, 9 - ;tie +; tie note C_, 8 note D_, 8 rest 8 dec_octave note E_, 9 - ;tie +; tie note E_, 8 rest 8 inc_octave @@ -1947,11 +2187,11 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 8 dec_octave note E_, 9 - ;tie +; tie note E_, 8 note D#, 16 note D_, 9 - ;tie +; tie note D_, 8 rest 8 inc_octave @@ -1968,7 +2208,7 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) rest 8 dec_octave note D_, 9 - ;tie +; tie note D_, 8 note D#, 16 note E_, 9 @@ -2024,24 +2264,24 @@ Music_Imakuni2_Ch3: ; 1f3a6c (7c:7a6c) channel_volume 1 dec_octave note G_, 16 - ;tie +; tie note G_, 5 - ;tie - ;musice4 38 +; tie +; frequency_offset 38 note G_, 4 - ;tie - ;musice4 6 +; tie +; frequency_offset 6 note G#, 4 - ;tie - ;musice4 52 +; tie +; frequency_offset 52 note G#, 2 - ;tie - ;musice4 0 +; tie +; frequency_offset 0 note A_, 2 sound_loop 0, .MainLoop Branch_1f3d18: - ;musice8 1 +; cutoff 1 channel_volume 1 .Loop1 channel_volume 1 @@ -2069,11 +2309,11 @@ Branch_1f3d18: note C#, 7 sound_loop 2, .Loop2 rest 1 - ;musice8 8 +; cutoff 8 sound_ret -Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) +Music_Imakuni2_Ch4: toggle_noise 6 .MainLoop drum_speed 1 @@ -2116,11 +2356,11 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 4, 16 rest 1 drum_note 5, 8 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 9 drum_note 9, 8 drum_note 9, 16 @@ -2133,12 +2373,12 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 2, 16 drum_note 2, 16 rest 1 - ;musicef 250 +; musicef -6 drum_note 2, 6 - ;musicef 252 +; musicef -4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 1, 16 rest 1 drum_note 4, 8 @@ -2176,13 +2416,13 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 5, 16 drum_note 2, 16 rest 1 - ;musicef 250 +; musicef -6 drum_note 2, 4 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 9 drum_note 9, 8 drum_note 9, 16 @@ -2235,13 +2475,13 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 5, 16 drum_note 4, 16 rest 1 - ;musicef 250 +; musicef -6 drum_note 2, 4 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 9 drum_note 9, 8 drum_note 9, 16 @@ -2254,12 +2494,12 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 2, 16 drum_note 2, 16 rest 1 - ;musicef 250 +; musicef -6 drum_note 2, 6 - ;musicef 252 +; musicef -4 drum_note 2, 5 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 1, 16 rest 1 drum_note 4, 8 @@ -2298,13 +2538,13 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 5, 16 drum_note 4, 16 rest 1 - ;musicef 250 +; musicef -6 drum_note 2, 4 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 1, 16 rest 1 drum_note 4, 16 @@ -2356,13 +2596,13 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 5, 16 drum_note 4, 16 rest 1 - ;musicef 250 +; musicef -6 drum_note 2, 4 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 9 drum_note 9, 8 drum_note 9, 16 @@ -2415,13 +2655,13 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 5, 16 drum_note 4, 16 rest 1 - ;musicef 250 +; musicef -6 drum_note 2, 4 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 1, 16 rest 1 drum_note 4, 16 @@ -2433,14 +2673,14 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) rest 1 drum_note 5, 16 drum_note 2, 9 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 drum_note 2, 8 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 drum_note 1, 16 rest 1 @@ -2453,9 +2693,9 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 1, 9 drum_note 2, 8 drum_note 5, 8 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 drum_note 2, 9 drum_note 2, 8 @@ -2469,9 +2709,9 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) rest 1 drum_note 1, 8 drum_note 2, 8 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 drum_note 1, 9 drum_note 2, 8 @@ -2498,34 +2738,34 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_note 2, 8 drum_note 5, 8 drum_note 4, 9 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 8 drum_note 2, 8 drum_note 2, 9 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 drum_note 2, 8 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 drum_note 2, 9 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 drum_note 2, 4 - ;musicef 250 +; musicef -6 drum_note 2, 4 - ;musicef 252 +; musicef -4 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 4 drum_note 2, 16 rest 1 @@ -2535,4 +2775,3 @@ Music_Imakuni2_Ch4: ; 1f3d41 (7c:7d41) drum_speed 1 rest 1 sound_loop 0, .MainLoop -; 0x1f3f40 diff --git a/crysaudio/music/TCG2/ishihara.asm b/crysaudio/music/TCG2/ishihara.asm index 83677042..8c5ec37e 100644 --- a/crysaudio/music/TCG2/ishihara.asm +++ b/crysaudio/music/TCG2/ishihara.asm @@ -5,18 +5,20 @@ Music_Ishihara: channel 3, Music_Ishihara_Ch3 channel 4, Music_Ishihara_Ch4 -Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) - channel_volume 10 +Music_Ishihara_Ch2: speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE rest 13 rest 14 rest 13 .MainLoop - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf1 87 - ;musicf3 +; musicf1 87 +; musicf3 note F_, 5 rest 9 note F_, 5 @@ -46,7 +48,7 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) note D#, 5 rest 8 note G_, 16 - ;tie +; tie note G_, 11 note F_, 5 rest 9 @@ -64,47 +66,53 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) rest 9 note G_, 5 rest 8 - ;musicf2 +; musicf2 note F_, 5 rest 2 note F_, 5 rest 2 - ;musicf3 - ;musicf0 3 - ;musicef 254 - ;musicf1 69 +; musicf3 +; preset 3 + volume_envelope 9, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicef -2 +; musicf1 69 octave 4 - ;musicf3 +; musicf3 note G#, 13 - ;musicf2 +; musicf2 note A_, 5 rest 2 note A_, 7 - ;musicf3 +; musicf3 dec_octave note B_, 13 inc_octave - ;musicf2 +; musicf2 note C_, 5 rest 2 note C_, 7 - ;musicf3 +; musicf3 dec_octave note G#, 13 - ;musicf2 +; musicf2 note A_, 2 rest 5 note A_, 7 - ;musicf3 +; musicf3 note E_, 13 - ;musicf2 +; musicf2 note F_, 5 rest 2 note F_, 7 - ;musicf3 - ;musicf0 27 +; musicf3 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf3 +; musicf3 note C_, 5 rest 8 note A_, 5 @@ -132,7 +140,7 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) note D#, 5 rest 8 note G_, 16 - ;tie +; tie note G_, 11 note F_, 5 rest 9 @@ -150,7 +158,7 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) rest 9 note G_, 5 rest 8 - ;musicf2 +; musicf2 note F_, 5 rest 2 note F_, 5 @@ -164,16 +172,16 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) rest 13 sound_call Branch_1dd880 note C#, 14 - ;musicf2 +; musicf2 note F_, 7 note C#, 6 note G#, 7 note F_, 7 - ;musicf3 +; musicf3 note B_, 4 inc_octave note C_, 9 - ;tie +; tie note C_, 14 dec_octave note A#, 4 @@ -181,24 +189,24 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) note C_, 4 dec_octave note A#, 5 - ;musicf2 +; musicf2 note A_, 7 note G#, 7 note G_, 7 note A_, 6 - ;musicf3 +; musicf3 sound_call Branch_1dd880 note C#, 14 - ;musicf2 +; musicf2 note F_, 7 note C#, 6 note G#, 7 note F_, 7 - ;musicf3 +; musicf3 note B_, 4 inc_octave note C_, 9 - ;tie +; tie note C_, 14 dec_octave note A#, 4 @@ -206,63 +214,87 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) note C_, 4 dec_octave note A#, 5 - ;musicf2 +; musicf2 note G#, 7 note A#, 7 note G_, 7 note G#, 6 - ;musicf0 32 - ;musicf1 55 +; preset 32 + volume_envelope 7, 0 + duty_cycle 2 + vibrato 24, 3, 3 +; musicf1 55 sound_call Branch_1dd809 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf3 +; musicf3 note A_, 13 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1ddc41 - ;musicf0 32 - ;musicf1 55 +; preset 32 + volume_envelope 7, 0 + duty_cycle 2 + vibrato 24, 3, 3 +; musicf1 55 sound_call Branch_1dd849 note F_, 13 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 13 - ;tie +; tie note F_, 14 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf3 +; musicf3 note A_, 13 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1ddc41 sound_call Branch_1ddc4e - ;musicf0 2 - ;musicf1 55 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf1 55 sound_call Branch_1dd809 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 note A_, 13 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1ddc41 - ;musicf0 2 - ;musicf1 55 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf1 55 sound_call Branch_1dd849 note E_, 3 - ;tie +; tie note F_, 10 - ;tie +; tie note F_, 14 - ;musicf0 27 - ;musicf1 32 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 octave 3 - ;musicf3 +; musicf3 note F_, 13 - ;musicf2 +; musicf2 note A_, 5 note A_, 9 inc_octave @@ -270,12 +302,12 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) note C_, 8 note F_, 5 note F_, 9 - ;musicf3 +; musicf3 note F_, 4 note A_, 4 inc_octave note C_, 5 - ;musicf2 +; musicf2 note F_, 5 note F_, 9 rest 13 @@ -283,7 +315,7 @@ Music_Ishihara_Ch2: ; 1dd6cc (77:56cc) Branch_1dd809: octave 4 - ;musicf2 +; musicf2 note F_, 7 rest 7 note F_, 7 @@ -292,42 +324,42 @@ Branch_1dd809: rest 7 note C#, 7 rest 6 - ;musicf3 +; musicf3 note F_, 14 - ;musicf2 +; musicf2 note G_, 7 note F_, 6 note G#, 7 note G_, 7 - ;musicf3 +; musicf3 note A_, 3 note A#, 10 - ;tie +; tie note A#, 14 - ;musicf2 +; musicf2 note G_, 7 note A_, 6 note F_, 7 note G_, 7 note D#, 13 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 13 note D#, 14 note C_, 7 note C_, 6 note C#, 7 note C_, 7 - ;tie +; tie note C#, 7 rest 6 - ;musicf3 +; musicf3 note F_, 14 - ;musicf2 +; musicf2 note D#, 7 note F_, 6 - ;tie +; tie note D#, 7 rest 7 note C#, 7 @@ -335,15 +367,15 @@ Branch_1dd809: note C#, 7 rest 7 note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 sound_ret @@ -351,98 +383,101 @@ Branch_1dd849: octave 4 note C_, 7 note C_, 6 - ;musicf3 +; musicf3 note C_, 14 - ;musicf2 +; musicf2 note C#, 7 note C_, 6 note F_, 7 note C#, 7 - ;musicf3 +; musicf3 note G_, 3 note G#, 10 - ;tie +; tie note G#, 14 - ;musicf2 +; musicf2 note G_, 7 note G#, 6 note F_, 7 note G_, 7 - ;musicf3 +; musicf3 note F#, 3 note G_, 10 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note A#, 7 note G_, 6 note F_, 7 note A#, 7 note D#, 13 - ;tie +; tie note D#, 14 - ;tie +; tie note D#, 13 note D#, 14 note D#, 7 note D#, 6 - ;musicf3 +; musicf3 note F_, 14 - ;musicf2 +; musicf2 note G_, 7 note F_, 6 note G#, 7 note G_, 7 note G_, 13 - ;tie +; tie note G_, 7 note G_, 7 - ;musicf3 +; musicf3 note D#, 13 - ;musicf2 +; musicf2 note G_, 7 note D#, 7 sound_ret Branch_1dd880: - ;musicf0 32 - ;musicf1 39 +; preset 32 + volume_envelope 7, 0 + duty_cycle 2 + vibrato 24, 3, 3 +; musicf1 39 octave 4 note E_, 4 - ;tie +; tie note F_, 3 rest 7 note E_, 4 - ;tie +; tie note F_, 3 rest 6 note A_, 7 rest 7 note A_, 7 rest 6 - ;musicf3 +; musicf3 note D#, 14 - ;musicf2 +; musicf2 note F_, 7 note D#, 6 note G_, 7 note F_, 7 note F_, 7 note G_, 6 - ;tie +; tie note F_, 7 rest 7 note C_, 7 rest 6 note C_, 7 rest 7 - ;musicf3 +; musicf3 note D_, 3 - ;tie +; tie note D#, 10 - ;tie +; tie note D#, 14 - ;musicf2 +; musicf2 note D_, 7 note D#, 6 dec_octave @@ -455,7 +490,7 @@ Branch_1dd880: inc_octave note C_, 7 note D_, 7 - ;tie +; tie note C_, 7 rest 6 dec_octave @@ -463,17 +498,20 @@ Branch_1dd880: rest 7 note F_, 7 rest 6 - ;musicf3 +; musicf3 note D#, 14 - ;musicf2 +; musicf2 note F_, 7 note D#, 6 note G_, 7 note F_, 7 note F_, 7 note G_, 6 - ;musicf0 27 - ;musicf1 32 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 octave 2 note A_, 5 rest 2 @@ -489,11 +527,11 @@ Branch_1dd880: rest 2 note A_, 5 rest 2 - ;musicf3 +; musicf3 note A#, 13 - ;tie +; tie note A#, 14 - ;musicf2 +; musicf2 inc_octave note D_, 5 rest 2 @@ -509,8 +547,11 @@ Branch_1dd880: rest 2 note D_, 5 rest 1 - ;musicf0 32 - ;musicf1 39 +; preset 32 + volume_envelope 7, 0 + duty_cycle 2 + vibrato 24, 3, 3 +; musicf1 39 octave 4 note A_, 7 rest 7 @@ -522,29 +563,29 @@ Branch_1dd880: note C_, 7 rest 6 dec_octave - ;musicf3 +; musicf3 note G_, 14 - ;musicf2 +; musicf2 note A_, 7 note G_, 6 note A#, 7 note A_, 7 note A_, 7 note A#, 6 - ;tie +; tie note A_, 7 rest 7 note F_, 7 rest 6 note F_, 7 rest 7 - ;musicf3 +; musicf3 note F#, 3 - ;tie +; tie note G_, 10 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note F_, 7 note G_, 6 note D_, 7 @@ -553,7 +594,7 @@ Branch_1dd880: note D_, 6 note D#, 7 note F_, 7 - ;tie +; tie note D#, 7 rest 6 dec_octave @@ -561,9 +602,9 @@ Branch_1dd880: rest 7 note A_, 7 rest 6 - ;musicf3 +; musicf3 note A#, 14 - ;musicf2 +; musicf2 inc_octave note C_, 7 dec_octave @@ -573,10 +614,13 @@ Branch_1dd880: note C_, 7 note F_, 7 note D_, 6 - ;musicf0 27 - ;musicf1 32 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 octave 2 - ;musicf2 +; musicf2 note F_, 5 rest 2 note F_, 5 @@ -594,74 +638,77 @@ Branch_1dd880: note A#, 5 rest 2 note A#, 6 - ;tie +; tie note A#, 14 - ;musicf3 +; musicf3 inc_octave note C_, 13 - ;tie +; tie note C_, 14 - ;musicf2 +; musicf2 dec_octave note F_, 5 rest 2 note F_, 5 rest 1 - ;musicf0 2 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 octave 4 - ;musicef 255 - ;musicf1 39 - ;musicf3 +; musicef -1 +; musicf1 39 +; musicf3 note D_, 14 - ;musicf2 +; musicf2 note E_, 7 note D_, 6 note F_, 7 note E_, 7 - ;musicf3 +; musicf3 note F#, 4 note G_, 9 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note E_, 7 note G_, 6 note D_, 7 note E_, 7 note E_, 7 note D_, 6 - ;musicf3 +; musicf3 note C_, 14 dec_octave - ;musicf2 +; musicf2 note A_, 7 inc_octave note C_, 6 - ;musicf3 +; musicf3 note F#, 3 note G_, 11 - ;musicf2 +; musicf2 note F_, 13 - ;tie +; tie note F_, 14 - ;tie +; tie note F_, 13 note F_, 14 note C_, 7 note F_, 6 - ;musicf3 +; musicf3 note D_, 14 - ;musicf2 +; musicf2 note E_, 7 note D_, 6 note F_, 7 note E_, 7 - ;musicf3 +; musicf3 note G#, 4 note A_, 9 - ;tie +; tie note A_, 14 - ;musicf2 +; musicf2 note G_, 7 note A_, 6 note E_, 7 @@ -669,88 +716,87 @@ Branch_1dd880: note D_, 7 note E_, 6 note C_, 14 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 13 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 13 note C_, 14 - ;musicf3 +; musicf3 rest 13 note D_, 14 - ;musicf2 +; musicf2 note E_, 7 note D_, 6 note F_, 7 note E_, 7 - ;musicf3 +; musicf3 note F#, 4 note G_, 9 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note E_, 7 note G_, 6 note D_, 7 note E_, 7 note E_, 7 note D_, 6 - ;musicf3 +; musicf3 note C_, 14 - ;musicf2 +; musicf2 note D_, 7 note C_, 6 note E_, 7 note D_, 7 - ;musicf3 +; musicf3 note F_, 13 - ;tie +; tie note F_, 14 - ;musicf2 +; musicf2 note C_, 7 note F_, 6 dec_octave note A_, 7 inc_octave note C_, 7 - ;musicf3 +; musicf3 dec_octave note A#, 13 - ;tie +; tie note A#, 14 inc_octave - ;musicf2 +; musicf2 note D_, 7 dec_octave note A#, 6 inc_octave note F_, 7 note D_, 7 - ;musicf3 +; musicf3 note C_, 13 - ;tie +; tie note C_, 14 - ;musicf2 +; musicf2 note E_, 7 note C_, 6 note G_, 7 note E_, 7 - ;musicf3 +; musicf3 note C#, 13 - ;tie +; tie sound_ret -Music_Ishihara_Ch1: ; 1dd9de (77:59de) - channel_volume 10 +Music_Ishihara_Ch1: speed 1 - ;musicdc 255 - ;musicf1 86 + stereo_panning TRUE, TRUE +; musicf1 86 rest 13 rest 14 rest 13 @@ -766,41 +812,47 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) rest 13 sound_loop 3, .Loop1 rest 14 - ;musicf0 3 - ;musicef 254 - ;musicf1 69 +; preset 3 + volume_envelope 9, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicef -2 +; musicf1 69 octave 4 - ;musicf3 +; musicf3 note E_, 13 - ;musicf2 +; musicf2 note F_, 5 rest 2 note F_, 7 - ;musicf3 +; musicf3 dec_octave note G#, 13 - ;musicf2 +; musicf2 note A_, 5 rest 2 note A_, 7 - ;musicf3 +; musicf3 note E_, 13 - ;musicf2 +; musicf2 note F_, 5 rest 2 note F_, 7 - ;musicf3 +; musicf3 dec_octave note A#, 13 - ;musicf2 +; musicf2 note A_, 5 rest 2 note A_, 5 rest 2 - ;musicf3 - ;musicf0 27 +; musicf3 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf3 +; musicf3 note C_, 5 rest 8 note F_, 5 @@ -832,7 +884,7 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) rest 8 inc_octave note D#, 16 - ;tie +; tie note D#, 11 note C_, 5 rest 9 @@ -852,7 +904,7 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) rest 9 note D#, 5 rest 8 - ;musicf2 +; musicf2 note C_, 5 rest 2 note C_, 5 @@ -866,20 +918,23 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) rest 13 sound_call Branch_1ddc75 note F_, 14 - ;musicf2 +; musicf2 note C#, 7 note C#, 6 note F_, 7 note F_, 7 - ;musicf3 +; musicf3 note G_, 3 note G#, 10 - ;tie +; tie note G#, 14 note G_, 4 note G#, 4 note G_, 5 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 note F_, 4 note G_, 3 @@ -892,46 +947,58 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) note E_, 3 sound_call Branch_1ddc75 note F_, 14 - ;musicf2 +; musicf2 note C#, 7 note C#, 6 note F_, 7 note F_, 7 - ;musicf3 +; musicf3 note G_, 3 note G#, 10 - ;tie +; tie note G#, 14 note G_, 4 note G#, 4 note G_, 5 note F_, 14 - ;musicf0 36 +; preset 36 + volume_envelope 7, 0 + duty_cycle 3 + vibrato 28, 3, 3 octave 2 - ;musicf3 +; musicf3 note G#, 4 note A#, 3 note B_, 3 inc_octave note C_, 3 - ;musicf0 1 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - ;musicf2 +; musicf2 note G#, 7 note G#, 7 - ;musicf3 +; musicf3 rest 13 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 32 - ;musicec 1 +; musicf1 32 +; pitch_offset 1 sound_call Branch_1ddc41 - ;musicec 249 +; pitch_offset 249 sound_call Branch_1ddc4e rest 14 - ;musicf0 36 - ;musicf1 69 - ;musicf3 +; preset 36 + volume_envelope 7, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf1 69 +; musicf3 octave 3 note D#, 13 note F_, 7 @@ -939,29 +1006,29 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) note F#, 3 vibrato 3, 3, 3 note G_, 10 - ;tie +; tie note G_, 14 vibrato 0, 3, 3 note D#, 7 rest 6 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1ddc41 vibrato 7, 3, 3 note C_, 7 - ;tie +; tie note C_, 6 - ;tie +; tie note C_, 14 vibrato 0, 3, 3 - ;musicec 252 +; pitch_offset 252 sound_call Branch_1ddc4e - ;musicec 3 +; pitch_offset 3 sound_call Branch_1ddc41 - ;musicec 253 +; pitch_offset 253 sound_call Branch_1ddc4e rest 14 note C#, 13 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1ddc41 note F_, 7 rest 6 @@ -972,7 +1039,7 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) rest 7 vibrato 7, 3, 3 note A_, 13 - ;tie +; tie note A_, 14 vibrato 0, 3, 3 note F_, 7 @@ -982,22 +1049,25 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) note A#, 7 rest 6 note A_, 14 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf3 +; musicf3 note F_, 13 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1ddc41 sound_call Branch_1ddc4e note C_, 3 vibrato 3, 3, 3 note C#, 11 - ;tie +; tie note C#, 13 vibrato 0, 3, 3 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1ddc41 - ;musicec 249 +; pitch_offset 249 sound_call Branch_1ddc4e rest 14 note F_, 7 @@ -1007,45 +1077,45 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) note A_, 3 vibrato 7, 3, 3 note A#, 10 - ;tie +; tie note A#, 14 vibrato 0, 3, 3 note G_, 7 rest 6 - ;musicec 254 +; pitch_offset 254 sound_call Branch_1ddc41 dec_octave vibrato 7, 3, 3 note A#, 13 - ;tie +; tie note A#, 14 vibrato 0, 3, 3 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1ddc4e - ;musicec 3 +; pitch_offset 3 sound_call Branch_1ddc41 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1ddc4e octave 3 note C#, 14 note D#, 7 rest 6 - ;musicec 252 +; pitch_offset 252 sound_call Branch_1ddc41 note D#, 13 - ;tie +; tie note D#, 7 rest 7 dec_octave note A#, 7 rest 6 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1ddc41 octave 2 note A_, 3 vibrato 7, 3, 3 note A#, 10 - ;tie +; tie note A#, 14 vibrato 0, 3, 3 inc_octave @@ -1056,7 +1126,7 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) note A#, 7 rest 6 note A_, 14 - ;musicec 249 +; pitch_offset 249 sound_call Branch_1ddc4e octave 2 note C#, 4 @@ -1070,37 +1140,40 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) note C_, 3 vibrato 7, 3, 3 note C#, 14 - ;tie +; tie note C#, 13 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf3 +; musicf3 note G#, 7 rest 7 - ;musicec 249 +; pitch_offset 249 sound_call Branch_1ddc68 octave 4 note C#, 14 - ;musicec 249 +; pitch_offset 249 sound_call Branch_1ddc68 octave 4 note F_, 7 rest 7 note F#, 3 note G_, 10 - ;tie +; tie note G_, 14 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1ddc68 octave 3 note G#, 7 rest 7 note G_, 13 - ;tie +; tie note G_, 14 - ;musicec 252 +; pitch_offset 252 sound_call Branch_1ddc68 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1ddc5b octave 3 note A_, 7 @@ -1124,12 +1197,15 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) note G_, 7 rest 7 note A_, 13 - ;tie +; tie note A_, 14 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 note F_, 13 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1ddc5b octave 3 note A_, 7 @@ -1138,16 +1214,16 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) rest 2 note G#, 7 rest 6 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1ddc5b octave 4 note E_, 3 note F_, 10 - ;tie +; tie note F_, 14 note D#, 7 rest 6 - ;musicec 1 +; pitch_offset 1 sound_call Branch_1ddc5b octave 4 note D_, 3 @@ -1155,58 +1231,73 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) note D#, 14 note G_, 7 rest 6 - ;musicec 3 +; pitch_offset 3 sound_call Branch_1ddc5b octave 3 note G_, 13 - ;tie +; tie note G_, 14 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1ddc4e - ;musicec 3 +; pitch_offset 3 sound_call Branch_1ddc41 - ;musicec 251 +; pitch_offset 251 sound_call Branch_1ddc4e inc_octave note C#, 14 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 note C#, 4 note G#, 4 inc_octave note C#, 5 inc_octave - ;musicf2 +; musicf2 note C#, 5 note C#, 9 - ;musicf0 26 - ;musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 octave 4 note D#, 13 rest 14 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 note D#, 4 note A#, 4 inc_octave note D#, 5 inc_octave - ;musicf2 +; musicf2 note D#, 5 note D#, 9 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note A_, 13 - ;tie +; tie note A_, 14 - ;musicf0 27 - ;musicf1 32 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 octave 3 - ;musicef 254 - ;musicf3 +; musicef -2 +; musicf3 note C_, 13 - ;musicf2 +; musicf2 note F_, 5 note F_, 9 note A_, 5 @@ -1214,9 +1305,9 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) inc_octave note C_, 5 note C_, 9 - ;musicf3 +; musicf3 rest 13 - ;musicf2 +; musicf2 inc_octave note C_, 5 note C_, 9 @@ -1224,54 +1315,81 @@ Music_Ishihara_Ch1: ; 1dd9de (77:59de) sound_loop 0, .MainLoop Branch_1ddc41: - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 32 +; musicf1 32 note C_, 5 note C_, 9 - ;musicec 0 - ;musicf0 36 - ;musicf3 +; pitch_offset 0 +; preset 36 + volume_envelope 7, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf3 sound_ret Branch_1ddc4e: - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 32 +; musicf1 32 note C_, 5 note C_, 8 - ;musicec 0 - ;musicf0 36 - ;musicf3 +; pitch_offset 0 +; preset 36 + volume_envelope 7, 0 + duty_cycle 3 + vibrato 28, 3, 3 +; musicf3 sound_ret Branch_1ddc5b: - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 32 +; musicf1 32 note C_, 5 note C_, 9 - ;musicec 0 - ;musicf0 26 - ;musicf3 +; pitch_offset 0 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 sound_ret Branch_1ddc68: - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf1 32 +; musicf1 32 note C_, 5 note C_, 8 - ;musicec 0 - ;musicf0 26 - ;musicf3 +; pitch_offset 0 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 sound_ret Branch_1ddc75: - ;musicf0 27 - ;musicf1 32 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 octave 2 - ;musicf2 +; musicf2 note A_, 5 rest 2 note A_, 5 @@ -1333,7 +1451,7 @@ Branch_1ddc75: note G_, 5 rest 1 note A#, 14 - ;tie +; tie note A#, 5 note A#, 8 note A_, 5 @@ -1373,11 +1491,11 @@ Branch_1ddc75: rest 14 rest 13 rest 14 - ;musicf3 +; musicf3 note G_, 13 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note A#, 5 rest 2 note A#, 5 @@ -1390,21 +1508,30 @@ Branch_1ddc75: rest 2 note A#, 5 rest 1 - ;musicf0 26 - ;musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 octave 4 note E_, 4 note F_, 3 rest 7 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf2 +; musicf2 note A_, 5 rest 2 note A_, 5 rest 1 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note A_, 7 rest 16 @@ -1412,69 +1539,99 @@ Branch_1ddc75: note D#, 14 note F_, 7 rest 6 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf2 +; musicf2 note G_, 5 rest 2 note G_, 5 rest 2 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note F_, 7 rest 6 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf2 +; musicf2 note A_, 5 rest 2 note A_, 5 rest 2 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note C_, 7 rest 6 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 - ;musicf2 +; musicf2 note C_, 5 rest 2 note C_, 5 rest 2 - ;musicf0 26 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 - ;musicf3 +; musicf3 note D_, 3 note D#, 10 - ;tie +; tie note D#, 14 note D_, 7 rest 6 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf2 +; musicf2 note G_, 5 rest 2 note G_, 5 rest 2 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note D_, 7 rest 6 note C_, 7 rest 7 - ;musicf0 2 +; preset 2 + volume_envelope 9, 0 + duty_cycle 3 + vibrato 28, 3, 3 octave 2 - ;musicf2 +; musicf2 note A_, 5 rest 2 note A_, 5 rest 1 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 3 note F_, 7 rest 7 @@ -1483,36 +1640,48 @@ Branch_1ddc75: note G_, 14 note A_, 7 rest 6 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf2 +; musicf2 note G_, 5 rest 2 rest 5 rest 2 - ;musicf3 - ;musicf0 26 +; musicf3 +; preset 26 + volume_envelope 6, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 4 note C_, 7 rest 6 - ;musicf0 27 - ;musicf1 32 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf1 32 octave 2 - ;musicf2 +; musicf2 rest 14 rest 13 rest 14 note F_, 5 rest 2 note F_, 6 - ;tie +; tie note F_, 14 note G_, 5 rest 2 note G_, 5 rest 1 - ;musicf0 0 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 2 note C_, 4 note D_, 3 @@ -1523,9 +1692,12 @@ Branch_1ddc75: note A#, 3 inc_octave note C_, 3 - ;musicf0 27 +; preset 27 + volume_envelope 9, 0 + duty_cycle 2 + vibrato 28, 3, 3 octave 2 - ;musicf2 +; musicf2 rest 14 note F_, 5 rest 2 @@ -1636,10 +1808,10 @@ Branch_1ddc75: rest 9 rest 5 dec_octave - ;musicf3 +; musicf3 note A_, 13 note A#, 14 - ;musicf2 +; musicf2 inc_octave note C_, 5 rest 2 @@ -1678,19 +1850,19 @@ Branch_1ddc75: note G_, 5 rest 1 rest 14 - ;musicf3 +; musicf3 note B_, 13 - ;musicf2 +; musicf2 inc_octave note C#, 5 rest 2 note C#, 5 rest 2 - ;musicf3 +; musicf3 note D_, 13 - ;tie +; tie note D_, 14 - ;musicf2 +; musicf2 dec_octave note A_, 5 rest 2 @@ -1701,50 +1873,49 @@ Branch_1ddc75: rest 2 note C_, 5 rest 2 - ;musicf3 +; musicf3 note D_, 13 - ;musicf2 - ;musicf3 +; musicf2 +; musicf3 note D_, 14 dec_octave - ;musicf2 +; musicf2 note A#, 7 note A#, 6 inc_octave note D_, 7 note D_, 7 - ;musicf3 +; musicf3 note E_, 13 - ;tie +; tie note E_, 14 - ;musicf2 +; musicf2 note C_, 7 note C_, 6 note E_, 7 note E_, 7 - ;musicf3 +; musicf3 note F_, 13 - ;tie +; tie sound_ret -Music_Ishihara_Ch3: ; 1dde54 (77:5e54) - channel_volume 1 +Music_Ishihara_Ch3: fade_wave 11 channel_volume 1 - ;musice9 96 - ;musicdc 255 +; echo 96 + stereo_panning TRUE, TRUE speed 1 rest 13 octave 2 note C_, 14 - ;tie +; tie note C#, 4 - ;tie +; tie note D_, 3 - ;tie +; tie note D#, 3 - ;tie +; tie note E_, 3 .MainLoop octave 2 @@ -1880,10 +2051,10 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) inc_octave note C_, 7 rest 6 - ;vibrato_type 5 +; vibrato_type 5 vibrato 7, 3, 3 note D#, 7 - ;tie +; tie note D#, 7 vibrato 0, 3, 3 note C_, 7 @@ -1900,7 +2071,7 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note A#, 7 rest 7 note D#, 13 - ;tie +; tie note D#, 14 dec_octave note A#, 13 @@ -1915,7 +2086,7 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note A#, 7 rest 7 note D#, 13 - ;tie +; tie note D#, 14 dec_octave note A#, 13 @@ -1927,9 +2098,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note G#, 14 - ;musice8 8 +; cutoff 8 dec_octave note G#, 7 rest 6 @@ -1939,9 +2110,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note C#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note G_, 7 @@ -1952,9 +2123,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note C_, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note D#, 7 @@ -1964,9 +2135,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note G#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 rest 6 @@ -1975,9 +2146,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note A#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note B_, 7 rest 6 @@ -1987,9 +2158,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note D#, 14 - ;musice8 8 +; cutoff 8 dec_octave note C_, 7 rest 6 @@ -1999,9 +2170,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note F_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note F_, 7 rest 6 @@ -2017,9 +2188,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note G#, 14 - ;musice8 8 +; cutoff 8 dec_octave note G#, 7 rest 6 @@ -2029,9 +2200,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note C#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note C#, 7 @@ -2042,9 +2213,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note D#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note G_, 7 @@ -2054,9 +2225,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note G_, 7 rest 6 @@ -2066,9 +2237,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note C#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note F_, 7 @@ -2078,20 +2249,20 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note F_, 13 - ;tie +; tie note F_, 7 rest 7 note F_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note C_, 7 rest 6 @@ -2109,9 +2280,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note C#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note G#, 7 @@ -2122,9 +2293,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note C#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note G_, 7 @@ -2135,9 +2306,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note D#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note D#, 7 @@ -2147,9 +2318,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note G#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 rest 6 @@ -2159,9 +2330,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note C#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note B_, 7 @@ -2172,10 +2343,10 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note D#, 14 dec_octave - ;musice8 8 +; cutoff 8 note C_, 7 rest 6 dec_octave @@ -2184,9 +2355,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note F_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note F_, 7 rest 6 @@ -2202,9 +2373,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note G#, 14 - ;musice8 8 +; cutoff 8 dec_octave note G#, 7 rest 6 @@ -2213,9 +2384,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note G#, 14 - ;musice8 8 +; cutoff 8 dec_octave note G#, 7 rest 6 @@ -2224,9 +2395,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note G_, 7 rest 6 @@ -2235,9 +2406,9 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) note C_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note G_, 7 rest 6 @@ -2247,26 +2418,26 @@ Music_Ishihara_Ch3: ; 1dde54 (77:5e54) rest 6 inc_octave inc_octave - ;musice8 2 +; cutoff 2 note G#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note C_, 13 - ;tie +; tie note C_, 7 rest 7 inc_octave note C_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note F_, 13 - ;tie +; tie note F_, 7 rest 7 note F_, 13 @@ -2354,7 +2525,7 @@ Branch_1de0c5: rest 7 dec_octave note C_, 13 - ;tie +; tie note C_, 7 rest 7 note C_, 7 @@ -2367,9 +2538,9 @@ Branch_1de0c5: note F_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note F_, 14 - ;musice8 8 +; cutoff 8 dec_octave note F_, 7 rest 6 @@ -2378,9 +2549,9 @@ Branch_1de0c5: note D#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note D#, 7 rest 6 @@ -2389,9 +2560,9 @@ Branch_1de0c5: note F_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A_, 14 - ;musice8 8 +; cutoff 8 dec_octave note F_, 7 rest 6 @@ -2400,9 +2571,9 @@ Branch_1de0c5: note C_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note C_, 7 rest 6 @@ -2411,9 +2582,9 @@ Branch_1de0c5: note F_, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A_, 14 - ;musice8 8 +; cutoff 8 dec_octave note F_, 7 rest 6 @@ -2422,9 +2593,9 @@ Branch_1de0c5: note D#, 7 rest 6 inc_octave - ;musice8 2 +; cutoff 2 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note D#, 7 rest 6 @@ -2439,7 +2610,7 @@ Branch_1de0c5: note G_, 13 rest 14 note A_, 13 - ;tie +; tie note A_, 14 note F_, 7 rest 6 @@ -2448,19 +2619,19 @@ Branch_1de0c5: note A#, 7 rest 6 inc_octave - ;musice8 4 +; cutoff 4 note A_, 14 note A_, 13 - ;musice8 8 +; cutoff 8 dec_octave note A#, 7 rest 7 note A#, 7 rest 6 inc_octave - ;musice8 4 +; cutoff 4 note A_, 14 - ;musice8 8 +; cutoff 8 dec_octave note A#, 7 rest 6 @@ -2469,19 +2640,19 @@ Branch_1de0c5: note A_, 7 rest 6 inc_octave - ;musice8 4 +; cutoff 4 note A_, 14 note A_, 13 - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 rest 7 note A_, 7 rest 6 inc_octave - ;musice8 4 +; cutoff 4 note A_, 14 - ;musice8 8 +; cutoff 8 dec_octave note A_, 7 rest 6 @@ -2490,19 +2661,19 @@ Branch_1de0c5: note G_, 7 rest 6 inc_octave - ;musice8 4 +; cutoff 4 note A#, 14 note A#, 13 - ;musice8 8 +; cutoff 8 dec_octave note C_, 7 rest 7 note C_, 7 rest 6 inc_octave - ;musice8 8 +; cutoff 8 note A#, 14 - ;musice8 8 +; cutoff 8 dec_octave note C_, 7 rest 6 @@ -2511,10 +2682,10 @@ Branch_1de0c5: note F_, 7 rest 6 inc_octave - ;musice8 4 +; cutoff 4 note A_, 14 note A_, 13 - ;musice8 8 +; cutoff 8 dec_octave note F_, 7 rest 7 @@ -2527,10 +2698,10 @@ Branch_1de0c5: note A#, 7 rest 6 inc_octave - ;musice8 4 +; cutoff 4 note A_, 14 note A_, 13 - ;musice8 8 +; cutoff 8 dec_octave note A#, 7 rest 7 @@ -2538,9 +2709,9 @@ Branch_1de0c5: rest 6 inc_octave inc_octave - ;musice8 4 +; cutoff 4 note C_, 14 - ;musice8 8 +; cutoff 8 dec_octave dec_octave note A#, 7 @@ -2553,20 +2724,20 @@ Branch_1de0c5: note C#, 7 rest 7 note D_, 13 - ;tie +; tie note D_, 14 dec_octave note D_, 7 rest 6 inc_octave - ;musice8 4 +; cutoff 4 inc_octave note C_, 14 dec_octave - ;musice8 8 +; cutoff 8 dec_octave note G_, 13 - ;tie +; tie note G_, 14 inc_octave note D_, 13 @@ -2574,7 +2745,7 @@ Branch_1de0c5: rest 7 dec_octave note A_, 13 - ;tie +; tie note A_, 14 inc_octave note E_, 13 @@ -2582,14 +2753,14 @@ Branch_1de0c5: rest 7 dec_octave note A#, 13 - ;tie +; tie sound_ret -Music_Ishihara_Ch4: ; 1de20c (77:620c) +Music_Ishihara_Ch4: toggle_noise 6 drum_speed 1 - ;musicdc 255 + stereo_panning TRUE, TRUE octave 1 drum_note 4, 13 drum_speed 9 @@ -2682,7 +2853,7 @@ Music_Ishihara_Ch4: ; 1de20c (77:620c) drum_note 2, 13 drum_note 2, 14 drum_note 5, 13 - ;tie +; tie rest 14 drum_note 2, 13 drum_note 2, 14 @@ -2691,18 +2862,18 @@ Music_Ishihara_Ch4: ; 1de20c (77:620c) drum_note 2, 13 drum_note 2, 14 drum_note 1, 13 - ;tie +; tie rest 14 drum_note 2, 13 drum_note 2, 14 drum_note 1, 13 rest 14 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 4 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 14 drum_note 2, 13 sound_loop 2, .Loop1 @@ -2727,15 +2898,15 @@ Music_Ishihara_Ch4: ; 1de20c (77:620c) drum_note 2, 13 drum_note 2, 14 drum_note 5, 13 - ;tie +; tie rest 14 - ;musicef 252 +; musicef -4 drum_note 2, 4 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 14 drum_note 2, 13 drum_note 2, 14 @@ -2751,13 +2922,13 @@ Music_Ishihara_Ch4: ; 1de20c (77:620c) drum_note 2, 14 drum_note 2, 13 drum_note 1, 14 - ;musicef 253 +; musicef -3 drum_note 2, 4 - ;musicef 254 +; musicef -2 drum_note 2, 4 - ;musicef 255 +; musicef -1 drum_note 2, 5 - ;musicef 0 +; musicef 0 drum_note 2, 14 drum_note 2, 13 sound_call Branch_1de321 @@ -2771,20 +2942,20 @@ Music_Ishihara_Ch4: ; 1de20c (77:620c) drum_note 2, 14 drum_note 2, 13 drum_note 1, 14 - ;musicef 253 +; musicef -3 drum_note 2, 5 - ;musicef 254 +; musicef -2 drum_note 2, 4 - ;musicef 255 +; musicef -1 drum_note 2, 4 - ;musicef 0 +; musicef 0 drum_note 2, 14 drum_note 1, 13 drum_note 4, 14 drum_note 2, 13 drum_note 2, 14 drum_note 1, 13 - ;tie +; tie rest 14 drum_note 2, 13 drum_note 2, 14 @@ -2808,4 +2979,3 @@ Branch_1de321: drum_note 2, 14 drum_note 5, 13 sound_ret -; 0x1de32a diff --git a/crysaudio/music/TCG2/titlescreen.asm b/crysaudio/music/TCG2/titlescreen.asm index cbd32867..8d254deb 100644 --- a/crysaudio/music/TCG2/titlescreen.asm +++ b/crysaudio/music/TCG2/titlescreen.asm @@ -5,12 +5,14 @@ Music_TCG2TitleScreen: channel 3, Music_TCG2TitleScreen_Ch3 channel 4, Music_TCG2TitleScreen_Ch4 -Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) - channel_volume 10 - ;musicf0 0 +Music_TCG2TitleScreen_Ch2: +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 3 note A_, 4 note B_, 3 @@ -20,35 +22,31 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) note E_, 4 note F_, 3 note F#, 4 - ;musicf1 101 - ;musicf2 +; musicf1 101 +; musicf2 vibrato 0, 3, 3 .Loop1 note G_, 16 - ;tie +; tie note G_, 14 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 15 - ;musicdc 17 - ;rept 3 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 1 - ;musicdc 17 - ;--- + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 1 - ;musicdc 17 - ;--- + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 1 - ;musicdc 17 - ;endr + stereo_panning TRUE, TRUE sound_loop 4, .Loop1 - ;musicf3 - ;musicdc 17 +; musicf3 + stereo_panning TRUE, TRUE .Loop2 note G_, 3 note A_, 4 @@ -58,447 +56,456 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) speed 10 note G_, 3 octave 2 - fade_wave 4 +; cutoff 4 duty_cycle 2 - ;musicef 252 +; musicef -4 note F_, 3 note E_, 3 - ;musicf0 0 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 - fade_wave 8 +; cutoff 8 speed 1 - ;musicf1 101 - ;musicf2 +; musicf1 101 +; musicf2 note G_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 7 - ;musicdc 0 + stereo_panning FALSE, FALSE rest 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 5 note F_, 2 speed 5 note E_, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note E_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 3 inc_octave - ;musicdc 17 + stereo_panning TRUE, TRUE vibrato 15, 3, 3 note D_, 6 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 8 dec_octave vibrato 30, 3, 3 speed 10 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 6 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE speed 1 note E_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note E_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 5 note G_, 2 - ;musicf2 +; musicf2 note G_, 15 - ;tie +; tie note G_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note F_, 15 note E_, 5 note F_, 5 note E_, 5 - ;musicf1 101 - ;musicf2 +; musicf1 101 +; musicf2 note D_, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 15 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 16 - ;tie +; tie note D_, 12 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 7 - ;musicdc 0 + stereo_panning FALSE, FALSE rest 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE speed 5 note E_, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note E_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 3 inc_octave - ;musicdc 17 + stereo_panning TRUE, TRUE vibrato 15, 3, 3 note D_, 6 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note E_, 7 dec_octave vibrato 30, 3, 3 speed 10 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 6 - ;musicdc 1 + stereo_panning FALSE, TRUE speed 5 note G_, 3 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note E_, 3 note F_, 3 speed 1 - ;musicf1 101 - ;musicf2 +; musicf1 101 +; musicf2 note G_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 15 - ;tie +; tie note G#, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G#, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 15 - ;tie +; tie note C_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE vibrato 15, 3, 3 note D_, 15 - ;tie +; tie note D_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note F#, 4 vibrato 25, 3, 3 note G_, 11 - ;tie +; tie note G_, 15 note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;musicf1 101 - ;musicf2 +; musicf1 101 +; musicf2 note F_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note C_, 15 - ;musicf2 +; musicf2 note D_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 7 - ;musicf0 4 +; preset 4 + volume_envelope 10, 0 + duty_cycle 2 + vibrato 28, 3, 3 vibrato 26, 3, 3 - ;musicdc 17 - ;musicf1 87 + stereo_panning TRUE, TRUE +; musicf1 87 octave 4 note D_, 4 - ;musicf2 +; musicf2 note D#, 11 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 15 - ;tie +; tie note D#, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 15 - ;musicf2 - ;musicdc 17 +; musicf2 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 8 - ;musicf2 +; musicf2 note D#, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 4 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 4 inc_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE vibrato 15, 3, 3 note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G#, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note G#, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE dec_octave note A#, 7 - ;tie +; tie inc_octave note C_, 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 15 - ;tie +; tie note G_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 15 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note F_, 8 note G_, 7 - ;musicf2 +; musicf2 note A#, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note A#, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 3 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note D_, 8 - ;musicf2 +; musicf2 note D#, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE dec_octave note A#, 4 inc_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE dec_octave note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note G#, 2 inc_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 15 - ;tie +; tie note C_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 3 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note B_, 15 inc_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 8 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note F#, 4 note G_, 15 - ;tie +; tie note G_, 3 - ;musicf2 +; musicf2 note F_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 7 - ;musicf1 64 - ;musicf2 - ;musicdc 17 +; musicf1 64 +; musicf2 + stereo_panning TRUE, TRUE note D_, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 7 - ;musicdc 1 + stereo_panning FALSE, TRUE note A#, 3 - ;musicdc 17 - ;musicf1 71 - ;musicf2 + stereo_panning TRUE, TRUE +; musicf1 71 +; musicf2 note D#, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 8 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note C_, 15 - ;musicf2 +; musicf2 note D_, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 4 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note G_, 15 - ;tie +; tie note G_, 16 - ;tie +; tie note G_, 14 - ;musicf2 +; musicf2 note F_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 8 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note A_, 3 note A#, 12 - ;musicf2 +; musicf2 note G#, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note A#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note A#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE speed 5 note G_, 12 - ;tie +; tie note G_, 6 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 3 - ;musicdc 17 - ;musicf0 0 - ;musicf3 + stereo_panning TRUE, TRUE +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 4 note G_, 1 note A_, 1 @@ -507,211 +514,216 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) vibrato 20, 3, 3 inc_octave note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 dec_octave - ;musicf1 101 - ;musicf2 +; musicf1 101 +; musicf2 note B_, 8 inc_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 15 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note A_, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note B_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note E_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note A_, 15 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 15 - ;tie +; tie note A_, 15 - ;musicf1 80 - ;musicf2 +; musicf1 80 +; musicf2 note G_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note A_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note A_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note G_, 8 - ;musicf1 71 - ;musicf2 +; musicf1 71 +; musicf2 note A_, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note A_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 3 - ;musicdc 1 + stereo_panning FALSE, TRUE note G_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;musicf0 7 - ;musicf1 80 - ;musicf2 - fade_wave 8 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicf1 80 +; musicf2 +; cutoff 8 octave 3 note D_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 7 - ;musicf0 0 - ;musicf1 101 - ;musicf2 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 101 +; musicf2 octave 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 2 - ;musicf2 - ;musicdc 17 +; musicf2 + stereo_panning TRUE, TRUE note F_, 15 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 15 - ;tie +; tie note F_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note E_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE dec_octave note G_, 5 - ;musicdc 1 + stereo_panning FALSE, TRUE inc_octave note E_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 15 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note A_, 5 inc_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 5 dec_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note A_, 2 inc_octave vibrato 0, 3, 3 - ;musicdc 17 - ;musicdc 17 + stereo_panning TRUE, TRUE + stereo_panning TRUE, TRUE note D_, 16 - ;tie +; tie note D_, 14 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 15 - ;musicf3 - ;musicdc 17 +; musicf3 + stereo_panning TRUE, TRUE note D_, 8 note E_, 7 - ;musicf2 +; musicf2 note D_, 15 - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 8 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 dec_octave note A_, 16 - ;tie +; tie note A_, 7 inc_octave - ;musicf2 +; musicf2 note C_, 8 dec_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note A_, 7 inc_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 16 - ;tie +; tie note C_, 14 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 15 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 dec_octave note B_, 4 inc_octave @@ -719,390 +731,419 @@ Music_TCG2TitleScreen_Ch2: ; 1e96cc (7a:56cc) dec_octave note B_, 3 note A_, 4 - ;musicf2 +; musicf2 note B_, 16 - ;tie +; tie note B_, 14 - ;musicdc 1 + stereo_panning FALSE, TRUE note B_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 8 dec_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note B_, 7 inc_octave - ;musicf1 101 - ;musicf2 +; musicf1 101 +; musicf2 vibrato 30, 3, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 16 - ;tie +; tie note C_, 14 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 10 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 16 - ;tie +; tie note C_, 12 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 12 sound_ret -Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) - channel_volume 10 - ;musicf0 1 +Music_TCG2TitleScreen_Ch1: +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 octave 3 speed 1 - ;musice4 255 - ;musicef 252 +; frequency_offset -1 +; musicef -4 rest 2 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 3 note A_, 4 note B_, 3 inc_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 4 note D_, 3 note E_, 4 - ;musicdc 1 + stereo_panning FALSE, TRUE note F_, 3 note F#, 2 - ;musice4 0 - ;musicef 4 +; frequency_offset 0 +; musicef 4 vibrato 0, 3, 3 - ;musicdc 17 - ;musicf1 85 - ;musicf2 + stereo_panning TRUE, TRUE +; musicf1 85 +; musicf2 note D_, 16 - ;tie +; tie note D_, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE .Loop1 note D_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 1 - ;musicdc 17 + stereo_panning TRUE, TRUE sound_loop 3, .Loop1 note C_, 16 - ;tie +; tie note C_, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE .Loop2 note C_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 1 - ;musicdc 17 + stereo_panning TRUE, TRUE sound_loop 3, .Loop2 dec_octave note B_, 16 - ;tie +; tie note B_, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note B_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE .Loop3 note B_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note B_, 1 - ;musicdc 17 + stereo_panning TRUE, TRUE sound_loop 3, .Loop3 note A_, 16 - ;tie +; tie note A_, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note A_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE .Loop4 note A_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note A_, 1 - ;musicdc 17 + stereo_panning TRUE, TRUE sound_loop 3, .Loop4 vibrato 28, 3, 3 speed 10 note G_, 12 - ;tie +; tie note G_, 3 rest 3 rest 3 speed 1 octave 2 octave 2 - fade_wave 8 +; cutoff 8 speed 1 - ;musicf2 +; musicf2 note B_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note B_, 7 rest 8 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note D_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 2 speed 5 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE vibrato 15, 3, 3 note G_, 6 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 3 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 15 - ;musicf0 3 - ;musicf3 +; preset 3 + volume_envelope 9, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 octave 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 8 inc_octave note C_, 7 - ;musicf2 +; musicf2 note D_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note C_, 8 note D_, 7 - ;musicef 255 +; musicef -1 .Loop5 note G_, 4 note A_, 4 note G_, 3 note A_, 4 sound_loop 2, .Loop5 - ;musicf0 1 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 speed 1 - ;musicf1 85 - ;musicf2 +; musicf1 85 +; musicf2 octave 3 note C_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 rest 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 2 vibrato 0, 3, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 15 - ;tie +; tie note F_, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 15 dec_octave - ;musicf2 +; musicf2 note A_, 8 inc_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note A_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicf0 3 - ;musicf3 +; preset 3 + volume_envelope 9, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 octave 2 note A_, 7 - ;musicf2 +; musicf2 note B_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note A_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 4 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note B_, 3 inc_octave - ;musicf3 - ;musicdc 17 +; musicf3 + stereo_panning TRUE, TRUE note D_, 8 - ;musicf2 +; musicf2 note F_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note A_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 4 inc_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 4 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note A_, 3 - ;musicf3 - ;musicdc 17 +; musicf3 + stereo_panning TRUE, TRUE note B_, 15 note A_, 5 note B_, 5 note A_, 5 - ;musicf2 +; musicf2 note E_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note A_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 7 - ;musicf0 1 - ;musicf3 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 3 speed 5 - ;musicdc 17 - ;musicf2 + stereo_panning TRUE, TRUE +; musicf2 note C_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE vibrato 15, 3, 3 note G_, 6 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 3 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 15 - ;musicf0 3 - ;musicf3 +; preset 3 + volume_envelope 9, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 octave 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 8 inc_octave note C_, 7 - ;musicf2 - ;musicf1 87 +; musicf2 +; musicf1 87 note D_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note C_, 8 note D_, 7 - ;musicef 255 +; musicef -1 note G_, 4 note A_, 4 note G_, 3 - ;musicef 255 +; musicef -1 note A_, 4 - ;musicf0 1 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 speed 1 - ;musicf3 - ;musicdc 17 +; musicf3 + stereo_panning TRUE, TRUE octave 3 note C_, 15 note D_, 15 - ;musicdc 17 - ;musicf2 + stereo_panning TRUE, TRUE +; musicf2 note E_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 15 - ;musicf0 3 - ;musicf3 +; preset 3 + volume_envelope 9, 7 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 octave 3 note C_, 8 note F_, 7 - ;musicf2 +; musicf2 note G#, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note F_, 8 note G#, 7 - ;musicf0 1 - ;musicf1 87 - ;musicf2 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 87 +; musicf2 octave 3 speed 1 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 16 - ;tie +; tie note G#, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note D#, 15 - ;musicf0 3 - ;musicdc 17 - ;musicf3 +; preset 3 + volume_envelope 9, 7 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf3 octave 3 note F_, 8 note G#, 7 inc_octave - ;musicf1 87 - ;musicf2 +; musicf1 87 +; musicf2 note C_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 dec_octave note G#, 8 inc_octave @@ -1111,516 +1152,564 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note D#, 4 dec_octave note F_, 7 - ;musicf1 70 - ;musicf2 +; musicf1 70 +; musicf2 note G#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 4 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 2 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 inc_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 3 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 2 inc_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 3 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 2 - ;musicf3 - channel_volume 3 - ;musicdc 16 +; musicf3 + volume_envelope 3, 7 + stereo_panning TRUE, FALSE note C_, 3 - ;musicf1 39 - ;musicf2 +; musicf1 39 +; musicf2 dec_octave note G#, 3 rest 2 - ;musicf0 12 - ;musicf3 - ;musicdc 17 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 + stereo_panning TRUE, TRUE speed 1 octave 3 - ;musicf1 55 - ;musicf2 +; musicf1 55 +; musicf2 note G#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 4 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note C_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave - ;musicf0 6 - ;musicf3 - ;musicdc 16 +; preset 6 + volume_envelope 3, 6 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 + stereo_panning TRUE, FALSE note G_, 8 dec_octave note G#, 4 - ;musicf0 12 - ;musicdc 17 - ;musicf2 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf2 note G#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note C_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note G_, 4 - ;musicf0 6 - ;musicf3 - ;musicdc 16 +; preset 6 + volume_envelope 3, 6 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 + stereo_panning TRUE, FALSE note G_, 4 dec_octave note G#, 4 - ;musicf0 12 - ;musicdc 17 - ;musicf2 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf2 note D_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note A#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note D_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note D_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave - ;musicf0 6 - ;musicf3 - ;musicdc 16 +; preset 6 + volume_envelope 3, 6 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 + stereo_panning TRUE, FALSE note D_, 8 dec_octave note D_, 4 - ;musicf0 12 - ;musicdc 17 - ;musicf2 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf2 note D_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note A#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note D_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note D_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note D_, 4 - ;musicf0 6 - ;musicf3 - ;musicdc 16 +; preset 6 + volume_envelope 3, 6 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 + stereo_panning TRUE, FALSE note D_, 4 dec_octave note D_, 4 - ;musicf0 12 - ;musicdc 17 - ;musicf2 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf2 note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note F_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note C_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note F_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave - ;musicf0 6 - ;musicf3 - ;musicdc 16 +; preset 6 + volume_envelope 3, 6 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 + stereo_panning TRUE, FALSE note D#, 8 dec_octave note F_, 4 - ;musicf0 12 - ;musicdc 17 - ;musicf2 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf2 note F_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note F_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note C_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note F_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note D#, 4 - ;musicf0 6 - ;musicf3 - ;musicdc 16 +; preset 6 + volume_envelope 3, 6 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 + stereo_panning TRUE, FALSE note D#, 4 dec_octave note F_, 4 - ;musicf0 12 - ;musicdc 17 - ;musicf2 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf2 note D#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D#, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note A#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note D_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave - ;musicf0 6 - ;musicf3 - ;musicdc 16 +; preset 6 + volume_envelope 3, 6 + duty_cycle 2 + vibrato 28, 3, 3 +; musicf3 + stereo_panning TRUE, FALSE note D_, 8 dec_octave note D#, 4 - ;musicf0 12 - ;musicdc 17 - ;musicf2 +; preset 12 + volume_envelope 7, 4 + duty_cycle 2 + vibrato 28, 3, 3 + stereo_panning TRUE, TRUE +; musicf2 note D#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D#, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note D#, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note D#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE note A#, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE dec_octave note E_, 4 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 3 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note C_, 4 - ;musicf0 1 - ;musicf1 80 - ;musicf2 - ;musicdc 17 +; preset 1 + volume_envelope 8, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 80 +; musicf2 + stereo_panning TRUE, TRUE octave 3 note D#, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note D#, 7 - ;musicf3 - ;musicdc 17 +; musicf3 + stereo_panning TRUE, TRUE note C_, 5 note D#, 5 note G#, 5 - ;musicf2 +; musicf2 inc_octave note C_, 8 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note G#, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note G#, 5 inc_octave note C_, 5 note D#, 5 note F#, 15 - ;musicf2 +; musicf2 note D#, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F#, 7 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note B_, 8 inc_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note D#, 7 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note G#, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note B_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note A#, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note A#, 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 7 - ;musicdc 16 + stereo_panning TRUE, FALSE note A#, 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note F#, 2 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note A#, 8 - ;musicf2 +; musicf2 note F_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note A#, 2 vibrato 8, 3, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 8 - ;tie +; tie note G_, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 8 - ;tie +; tie note C_, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note C_, 5 note F_, 5 note A_, 5 - ;musicf2 +; musicf2 inc_octave note C_, 8 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note A_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note F_, 5 note A_, 5 inc_octave note C_, 5 note F_, 15 - ;musicf2 +; musicf2 note C_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE dec_octave note A_, 8 inc_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 7 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note A_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note D_, 5 note G_, 5 note B_, 5 inc_octave - ;musicf2 +; musicf2 note D_, 8 dec_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note B_, 7 - ;musicdc 17 - ;musicf3 + stereo_panning TRUE, TRUE +; musicf3 note B_, 5 inc_octave note D_, 5 note G_, 5 note B_, 8 - ;tie +; tie note B_, 15 - ;tie +; tie note B_, 7 dec_octave dec_octave dec_octave - ;musicf3 - ;musicdc 17 +; musicf3 + stereo_panning TRUE, TRUE note B_, 3 inc_octave note D_, 4 @@ -1633,146 +1722,164 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) note D_, 4 note E_, 4 .Loop6 - ;musicf0 0 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 4 - fade_wave 8 - ;musicdc 17 +; cutoff 8 + stereo_panning TRUE, TRUE note E_, 16 - ;tie +; tie note E_, 14 - ;musicf0 7 - ;musicf1 80 - ;musicf2 - fade_wave 8 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicf1 80 +; musicf2 +; cutoff 8 octave 3 note C_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 7 dec_octave - ;musicf1 39 - ;musicf2 - fade_wave 8 - ;musicdc 17 +; musicf1 39 +; musicf2 +; cutoff 8 + stereo_panning TRUE, TRUE note E_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 2 - ;rept 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 7 - ;--- - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 7 - ;endr inc_octave - ;musicf1 64 - ;musicf2 - fade_wave 8 - ;musicdc 17 +; musicf1 64 +; musicf2 +; cutoff 8 + stereo_panning TRUE, TRUE note C_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 7 rest 8 - ;musicf0 0 - ;musicf1 101 - ;musicdc 17 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 101 + stereo_panning TRUE, TRUE octave 4 - ;musicf2 - fade_wave 8 +; musicf2 +; cutoff 8 note E_, 5 note E_, 2 sound_loop 2, .Loop6 - ;musicf0 0 - ;musicf3 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf3 octave 4 - fade_wave 8 - ;musicdc 17 +; cutoff 8 + stereo_panning TRUE, TRUE note E_, 16 - ;tie +; tie note E_, 14 - ;musicf0 7 - ;musicf1 80 - ;musicf2 - fade_wave 8 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicf1 80 +; musicf2 +; cutoff 8 octave 3 note C_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 7 dec_octave - ;musicf1 55 - ;musicf2 - fade_wave 8 - ;musicdc 17 +; musicf1 55 +; musicf2 +; cutoff 8 + stereo_panning TRUE, TRUE note F_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 7 - ;musicf0 0 - ;musicf1 85 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 85 octave 4 - fade_wave 8 - ;musicdc 17 +; cutoff 8 + stereo_panning TRUE, TRUE note E_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 7 - ;musicf0 7 - ;musicf1 80 - ;musicf2 +; preset 7 + volume_envelope 10, 0 + duty_cycle 2 +; musicf1 80 +; musicf2 octave 3 - fade_wave 8 - ;musicdc 17 +; cutoff 8 + stereo_panning TRUE, TRUE note C_, 8 - ;musicdc 1 + stereo_panning FALSE, TRUE note C_, 7 - ;musicf0 0 - ;musicf1 85 - ;musicf2 - ;musicdc 17 +; preset 0 + volume_envelope 10, 0 + duty_cycle 0 + vibrato 28, 3, 3 +; musicf1 85 +; musicf2 + stereo_panning TRUE, TRUE octave 4 - fade_wave 8 +; cutoff 8 note D_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 4 rest 11 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 4 inc_octave - ;musicdc 1 + stereo_panning FALSE, TRUE note D_, 3 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;musicf3 +; musicf3 dec_octave note B_, 3 inc_octave @@ -1786,194 +1893,193 @@ Music_TCG2TitleScreen_Ch1: ; 1e9abd (7a:5abd) vibrato 30, 3, 3 inc_octave note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;tie +; tie note C_, 15 - ;musicf2 +; musicf2 dec_octave note G#, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE inc_octave note C_, 7 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note A#, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE inc_octave note C_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note C_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 15 dec_octave - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 5 inc_octave - ;musicdc 16 + stereo_panning TRUE, FALSE note C_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE dec_octave note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;tie +; tie note G_, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note E_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note G_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note G_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note F#, 16 - ;tie +; tie note F#, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note F#, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note F#, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note F#, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note F#, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note F#, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note F#, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note F#, 8 - ;musicdc 17 + stereo_panning TRUE, TRUE note F#, 16 - ;tie +; tie note F#, 4 - ;musicdc 16 + stereo_panning TRUE, FALSE note F#, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note F#, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F#, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 16 - ;tie +; tie note F_, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 16 - ;tie +; tie note F_, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 16 - ;tie +; tie note F_, 14 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 15 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 3 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 5 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 2 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 5 - ;musicdc 17 + stereo_panning TRUE, TRUE note D_, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note F_, 5 - ;musicdc 17 + stereo_panning TRUE, TRUE note F_, 15 - ;musicdc 16 + stereo_panning TRUE, FALSE note D_, 5 - ;musicdc 17 - ;musicf1 55 + stereo_panning TRUE, TRUE +; musicf1 55 note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 16 - ;tie +; tie note E_, 10 - ;musicdc 16 + stereo_panning TRUE, FALSE note E_, 12 sound_ret -Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) - channel_volume 1 - ;musicdc 17 +Music_TCG2TitleScreen_Ch3: + stereo_panning TRUE, TRUE fade_wave 11 channel_volume 1 - ;musice8 3 - ;musice9 96 +; cutoff 3 +; echo 96 speed 1 rest 14 rest 14 speed 5 octave 3 - ;musice8 6 +; cutoff 6 note D_, 9 - ;musice8 7 +; cutoff 7 note D_, 1 note D_, 1 note D_, 1 - ;musice8 6 +; cutoff 6 note C_, 9 - ;musice8 7 +; cutoff 7 note C_, 1 note C_, 1 note C_, 1 - ;musice8 6 +; cutoff 6 dec_octave note B_, 9 - ;musice8 7 +; cutoff 7 note B_, 1 note B_, 1 note B_, 1 - ;musice8 6 +; cutoff 6 note A_, 9 - ;musice8 7 +; cutoff 7 note A_, 1 note A_, 1 note A_, 1 speed 10 - ;musice8 1 +; cutoff 1 note G_, 12 - ;tie +; tie note G_, 3 - ;musice8 4 +; cutoff 4 note F_, 3 note E_, 3 note D_, 3 @@ -1995,10 +2101,10 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note D_, 6 note D_, 6 note G_, 6 - ;musice8 8 +; cutoff 8 note A_, 3 note B_, 3 - ;musice8 4 +; cutoff 4 inc_octave note C_, 6 note C_, 6 @@ -2018,66 +2124,66 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note A#, 6 note A_, 6 speed 5 - ;musice8 6 +; cutoff 6 note G#, 3 - ;musice8 4 +; cutoff 4 note G#, 6 speed 1 - ;musice8 4 +; cutoff 4 note G#, 7 note G#, 8 speed 5 - ;musice8 6 +; cutoff 6 note G#, 3 - ;musice8 4 +; cutoff 4 note G#, 6 - ;musice8 8 +; cutoff 8 note G#, 3 - ;musice8 6 +; cutoff 6 note G_, 3 - ;musice8 4 +; cutoff 4 note G_, 6 speed 1 - ;musice8 4 +; cutoff 4 note G_, 7 note G_, 8 speed 5 - ;musice8 6 +; cutoff 6 note G_, 3 - ;musice8 4 +; cutoff 4 note G_, 6 - ;musice8 8 +; cutoff 8 note G_, 3 - ;musice8 6 +; cutoff 6 note F_, 3 - ;musice8 4 +; cutoff 4 note F_, 6 speed 1 - ;musice8 4 +; cutoff 4 note F_, 7 note F_, 8 speed 5 - ;musice8 6 +; cutoff 6 note A#, 3 - ;musice8 4 +; cutoff 4 note A#, 6 - ;musice8 8 +; cutoff 8 note E_, 3 - ;musice8 6 +; cutoff 6 note D#, 3 - ;musice8 4 +; cutoff 4 note D#, 6 speed 1 - ;musice8 4 +; cutoff 4 note D#, 7 note D#, 8 speed 5 - ;musice8 6 +; cutoff 6 note D#, 3 - ;musice8 8 +; cutoff 8 note D#, 3 note E_, 6 - ;musice8 4 +; cutoff 4 note F_, 6 note F_, 6 note G#, 6 @@ -2095,60 +2201,60 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note G_, 6 note G_, 6 speed 5 - ;musice8 7 +; cutoff 7 octave 2 .Loop1 speed 5 - ;musice8 7 +; cutoff 7 note A_, 3 note A_, 3 sound_call Branch_1ea254 speed 1 - ;musice8 4 +; cutoff 4 note A_, 7 note A_, 8 sound_loop 2, .Loop1 .Loop2 speed 5 - ;musice8 7 +; cutoff 7 note G_, 3 note G_, 3 sound_call Branch_1ea254 speed 1 - ;musice8 4 +; cutoff 4 note G_, 7 note G_, 8 sound_loop 2, .Loop2 .Loop3 speed 5 - ;musice8 7 +; cutoff 7 note F_, 3 note F_, 3 sound_call Branch_1ea254 speed 1 - ;musice8 4 +; cutoff 4 note F_, 7 note F_, 8 sound_loop 2, .Loop3 speed 5 - ;musice8 7 +; cutoff 7 note E_, 3 note E_, 3 sound_call Branch_1ea254 speed 1 - ;musice8 4 +; cutoff 4 note E_, 7 note E_, 8 speed 5 - ;musice8 7 +; cutoff 7 note E_, 3 note E_, 3 sound_call Branch_1ea26d speed 1 - ;musice8 4 +; cutoff 4 note E_, 7 note E_, 8 - ;musice8 4 +; cutoff 4 speed 5 octave 2 note G#, 6 @@ -2167,7 +2273,7 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) note G_, 6 note G_, 6 note G_, 6 - ;musice8 3 +; cutoff 3 inc_octave note C_, 3 dec_octave @@ -2177,12 +2283,12 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) dec_octave note G_, 3 inc_octave - ;musice8 5 +; cutoff 5 note C_, 4 dec_octave note G_, 4 note G_, 4 - ;musice8 6 +; cutoff 6 speed 10 note C_, 12 sound_ret @@ -2190,49 +2296,49 @@ Music_TCG2TitleScreen_Ch3: ; 1ea0f8 (7a:60f8) Branch_1ea254: speed 1 octave 4 - ;musice8 4 - ;musicdc 17 - ;musice8 6 +; cutoff 4 + stereo_panning TRUE, TRUE +; cutoff 6 channel_volume 1 note E_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE channel_volume 3 note E_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE channel_volume 1 octave 2 - ;musice8 7 +; cutoff 7 sound_ret Branch_1ea26d: speed 1 octave 4 - ;musice8 4 - ;musicdc 17 - ;musice8 6 +; cutoff 4 + stereo_panning TRUE, TRUE +; cutoff 6 channel_volume 1 note G_, 8 - ;musicdc 16 + stereo_panning TRUE, FALSE channel_volume 3 note G_, 7 - ;musicdc 17 + stereo_panning TRUE, TRUE channel_volume 1 octave 2 - ;musice8 7 +; cutoff 7 sound_ret -Music_TCG2TitleScreen_Ch4: ; 1ea286 (7a:6286) +Music_TCG2TitleScreen_Ch4: toggle_noise 6 octave 1 drum_speed 1 - ;musicef 252 +; musicef -4 drum_note 3, 3 drum_note 3, 4 - ;musicef 254 +; musicef -2 drum_note 3, 3 drum_note 3, 4 - ;musicef 0 +; musicef 0 drum_note 3, 3 drum_note 3, 4 drum_note 3, 3 @@ -2241,42 +2347,42 @@ Music_TCG2TitleScreen_Ch4: ; 1ea286 (7a:6286) .Loop1 drum_note 6, 9 drum_note 2, 1 - ;musicef 252 +; musicef -4 drum_note 2, 1 drum_note 2, 1 - ;musicef 0 +; musicef 0 sound_loop 4, .Loop1 drum_speed 1 drum_note 3, 5 - ;musicef 252 +; musicef -4 .Loop2 drum_note 3, 5 sound_loop 23, .Loop2 drum_speed 10 - ;musicef 2 +; musicef 2 drum_note 6, 12 - ;musicef 0 +; musicef 0 drum_speed 1 .Loop3 drum_note 2, 15 - ;musicef 252 +; musicef -4 drum_note 2, 15 - ;musicef 0 +; musicef 0 drum_note 2, 15 - ;musicef 254 +; musicef -2 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 sound_loop 15, .Loop3 drum_note 2, 15 - ;musicef 252 +; musicef -4 drum_note 2, 15 - ;musicef 0 +; musicef 0 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 @@ -2284,24 +2390,24 @@ Music_TCG2TitleScreen_Ch4: ; 1ea286 (7a:6286) drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 .Loop4 drum_note 2, 15 drum_note 2, 15 - ;musicef 2 +; musicef 2 drum_note 5, 15 - ;musicef 0 +; musicef 0 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 sound_loop 7, .Loop4 drum_note 2, 15 drum_note 2, 15 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 @@ -2309,27 +2415,27 @@ Music_TCG2TitleScreen_Ch4: ; 1ea286 (7a:6286) drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 .Loop5 drum_note 2, 15 - ;musicef 252 +; musicef -4 drum_note 2, 15 - ;musicef 0 +; musicef 0 drum_note 2, 15 - ;musicef 254 +; musicef -2 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 sound_loop 7, .Loop5 drum_note 2, 15 - ;musicef 252 +; musicef -4 drum_note 2, 15 - ;musicef 0 +; musicef 0 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 @@ -2337,58 +2443,57 @@ Music_TCG2TitleScreen_Ch4: ; 1ea286 (7a:6286) drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 .Loop6 drum_note 2, 15 drum_note 2, 16 - ;tie +; tie drum_note 2, 14 - ;musicef 252 +; musicef -4 drum_note 3, 3 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 sound_loop 8, .Loop6 .Loop7 drum_note 2, 15 - ;musicef 252 +; musicef -4 drum_note 2, 15 - ;musicef 0 +; musicef 0 drum_note 2, 15 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 sound_loop 8, .Loop7 - ;musicef 1 +; musicef 1 drum_note 2, 15 drum_note 3, 3 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 drum_note 2, 15 - ;musicef 250 +; musicef -6 drum_note 3, 3 drum_note 3, 4 - ;musicef 252 +; musicef -4 drum_note 3, 4 drum_note 3, 4 - ;musicef 254 +; musicef -2 drum_note 3, 3 drum_note 3, 4 drum_note 3, 4 drum_note 3, 4 - ;musicef 0 +; musicef 0 drum_note 2, 5 drum_speed 5 drum_note 2, 4 drum_note 2, 4 - ;musicef 2 +; musicef 2 drum_note 6, 12 sound_ret -; 0x1ea368 From e3a3e6dbd6488e2d820eff0f815277a406c64895 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Thu, 16 Mar 2023 00:00:46 -0500 Subject: [PATCH 33/33] Fix Drumkit6 --- crysaudio/drumkits.asm | 1 + 1 file changed, 1 insertion(+) diff --git a/crysaudio/drumkits.asm b/crysaudio/drumkits.asm index 1d6abf5a..b1f775dd 100644 --- a/crysaudio/drumkits.asm +++ b/crysaudio/drumkits.asm @@ -104,6 +104,7 @@ Drumkit6: dw Snare9 dw Snare9 dw Snare9 + dw Snare9 Drum00: noise_note 32, 1, 1, 0