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] 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::